diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 8aa26455..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) [year] [fullname]
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/add.txt b/add.txt
index 14b6fefe..8bd5bb1d 100644
--- a/add.txt
+++ b/add.txt
@@ -26,11 +26,9 @@ MainContentContainer
 
 
 
-TODO
-    待同步
+TODO 
+    待同步 
     1、timer图标样式更换
     index.html
     WebSSHTimer.css
-    WebSSHTimer.js
-
-		
+    WebSSHTimer.js
\ No newline at end of file
diff --git a/config/env.js b/config/env.js
index ae1edea6..8e68efe0 100644
--- a/config/env.js
+++ b/config/env.js
@@ -76,7 +76,7 @@ function getClientEnvironment(publicUrl) {
 				// For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
 				// This should only be used as an escape hatch. Normally you would put
 				// images into the `src` and `import` them in code to get their paths.
-				PUBLIC_URL: '/react/build/.',
+				PUBLIC_URL: publicUrl,
 			}
 		);
 	// Stringify all values so we can feed into Webpack DefinePlugin
diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
index 85aa92b9..17446b8c 100644
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -7,32 +7,41 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
 const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
 const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
-const eslintFormatter = require('react-dev-utils/eslintFormatter');
 const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
-// const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
+const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
 const getClientEnvironment = require('./env');
 const paths = require('./paths');
 
-// Webpack uses `publicPath` to determine where the app is being served from.
-// In development, we always serve from the root. This makes config easier.
 const publicPath = '/';
-// `publicUrl` is just like `publicPath`, but we will provide it to our app
-// as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
-// Omit trailing slash as %PUBLIC_PATH%/xyz looks better than %PUBLIC_PATH%xyz.
-const publicUrl = '';
-// Get environment variables to inject into our app.
-const env = getClientEnvironment(publicUrl);
+const env = getClientEnvironment('/');
 
-// This is the development configuration.
-// It is focused on developer experience and fast rebuilds.
-// The production configuration is different and lives in a separate file.
-// 测试用的
 module.exports = {
-  // You may want 'eval' instead if you prefer to see the compiled output in DevTools.
-  // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
-	 //devtool: "cheap-module-eval-source-map",
+  optimization: {
+    splitChunks: {
+      chunks: 'async',
+      // 大于30KB才单独分离成chunk
+      minSize: 30000,
+      maxAsyncRequests: 5,
+      maxInitialRequests: 3,
+      name: true,
+      cacheGroups: {
+        default: {
+          priority: -20,
+          reuseExistingChunk: true,
+        },
+        vendors: {
+          name: 'vendors',
+          test: /[\\/]node_modules[\\/]/,
+          priority: -10,
+          chunks: "all"
+        }
+      }
+    },
+    runtimeChunk: true
+  },
+  mode: 'development',
   // 开启调试
-	devtool: "source-map",  // 开启调试
+  devtool: "source-map",  // 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.
@@ -59,6 +68,7 @@ module.exports = {
   output: {
     // Add /* filename */ comments to generated require()s in the output.
     pathinfo: true,
+    globalObject: 'this',
     // This does not produce a real file. It's just the virtual path that is
     // served by WebpackDevServer in development. This is the JS bundle
     // containing code from all our entry points, and the Webpack runtime.
@@ -66,7 +76,7 @@ module.exports = {
     // There are also additional JS chunk files if you use code splitting.
     chunkFilename: 'static/js/[name].chunk.js',
     // This is the URL that app is served from. We use "/" in development.
-    publicPath: publicPath,
+    publicPath,
     // Point sourcemap entries to original disk location (format as URL on Windows)
     devtoolModuleFilenameTemplate: info =>
       path.resolve(info.absoluteResourcePath).replace(/\\/g, '/'),
@@ -101,36 +111,11 @@ module.exports = {
       // 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]),
-      // MonacoEditor
-      // https://github.com/Microsoft/monaco-editor/blob/master/docs/integrate-esm.md
-      // https://github.com/Microsoft/monaco-editor-webpack-plugin/issues/56
-      // new MonacoWebpackPlugin(),
     ],
   },
   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
@@ -151,13 +136,20 @@ module.exports = {
           {
             test: /\.(js|jsx|mjs)$/,
             include: paths.appSrc,
+            exclude: /node_modules/,
             loader: require.resolve('babel-loader'),
             options: {
-
-							// This is a feature of `babel-loader` for webpack (not Babel itself).
+              // This is a feature of `babel-loader` for webpack (not Babel itself).
               // It enables caching results in ./node_modules/.cache/babel-loader/
               // directory for faster rebuilds.
               cacheDirectory: true,
+              "plugins": [
+                ["import", {
+                  "libraryName": "antd",
+                  "libraryDirectory": "es",
+                  "style": "css"
+                }]
+              ]
             },
           },
           // "postcss" loader applies autoprefixer to our CSS.
@@ -200,7 +192,7 @@ module.exports = {
           {
             test: /\.scss$/,
             use: [
-              require.resolve("style-loader"),
+              require.resolve('style-loader'),
               {
                 loader: require.resolve("css-loader"),
                 options: {
@@ -239,12 +231,13 @@ module.exports = {
     // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
     // <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
     // In development, this will be an empty string.
-    new InterpolateHtmlPlugin(env.raw),
     // Generates an `index.html` file with the <script> injected.
     new HtmlWebpackPlugin({
-      inject: true,
+      inject: false,
       template: paths.appHtml,
     }),
+    new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
+
     // Add module names to factory functions so they appear in browser profiler.
     new webpack.NamedModulesPlugin(),
     // Makes some environment variables available to the JS code, for example:
@@ -267,8 +260,10 @@ module.exports = {
     // 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$/),
-    // new MonacoWebpackPlugin(),
-	],
+    new MonacoWebpackPlugin({
+      features: ['!gotoSymbol'],
+    })
+  ],
   // 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: {
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index 838ce28a..8954be74 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -1,89 +1,76 @@
 'use strict';
-// extract-css-assets-webpack-plugin
 const autoprefixer = require('autoprefixer');
 const path = require('path');
 const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const ManifestPlugin = require('webpack-manifest-plugin');
 const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
 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 MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
-// const TerserPlugin = require('terser-webpack-plugin');
+const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
+
+const TerserJSPlugin = require('terser-webpack-plugin');
+const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 
 const paths = require('./paths');
 const getClientEnvironment = require('./env');
 
-// Webpack uses `publicPath` to determine where the app is being served from.
-// It requires a trailing slash, or the file assets will get an incorrect path.
-const publicPath = paths.servedPath;
 // Some apps do not use client-side routing with pushState.
 // For these, "homepage" can be set to "." to enable relative asset paths.
-const shouldUseRelativeAssetPaths = publicPath === './';
-// Source maps are resource heavy and can cause out of memory issue for large source files.
-const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
-// `publicUrl` is just like `publicPath`, but we will provide it to our app
-// as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
-// Omit trailing slash as %PUBLIC_URL%/xyz looks better than %PUBLIC_URL%xyz.
-const publicUrl = publicPath.slice(0, -1);
-// Get environment variables to inject into our app.
-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.');
+let publicPath = '/react/build/';
+let nodeEnv = process.env.NODE_ENV
+if (nodeEnv === 'testBuild') {
+	publicPath = 'https://testali-cdn.educoder.net/react/build/';
 }
-
-// Note: defined here because it will be used more than once.
-const cssFilename = './static/css/[name].[contenthash:8].css';
-
-// ExtractTextPlugin expects the build output to be flat.
-// (See https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/27)
-// 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('../') }
-	: {};
+if (nodeEnv === 'production') {
+	publicPath = 'https://ali-cdn.educoder.net/react/build/';
+}
+const publicUrl = publicPath.slice(0, -1);
+const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
+const env = getClientEnvironment(publicPath);
 
 // This is the production configuration.
 // It compiles slowly and is focused on producing a fast and minimal bundle.
 // The development configuration is different and lives in a separate file.
 // 上线用的
-// console.log('publicPath ', publicPath)
 module.exports = {
-	// optimization: {
-  //   minimize: true,
-  //   minimizer: [new TerserPlugin()],
-  // },
-	// externals: {
-	//   'react': 'window.React'
-	// },
-	// Don't attempt to continue if there are any errors.
+	optimization: {
+		minimizer: [new TerserJSPlugin({}), new OptimizeCSSAssetsPlugin({})],
+		splitChunks: {
+			chunks: 'async',
+			// 大于30KB才单独分离成chunk
+			minSize: 30000,
+			maxAsyncRequests: 5,
+			maxInitialRequests: 3,
+			name: true,
+			cacheGroups: {
+				default: {
+					minChunks: 2,
+					priority: -20,
+					reuseExistingChunk: true,
+				},
+				vendors: {
+					name: 'vendors',
+					test: /[\\/]node_modules[\\/]/,
+					priority: -10,
+					chunks: "all"
+				}
+			}
+		},
+		runtimeChunk: true
+	},
 	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.
+	mode: 'production',
+	devtool: false,//测试版
 	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
+		globalObject: 'this',
+		filename: './static/js/[name].[contenthash:8].js',
+		chunkFilename: './static/js/[name].[contenthash:8].chunk.js',
+		publicPath,
 
 		// Point sourcemap entries to original disk location (format as URL on Windows)
 		devtoolModuleFilenameTemplate: info =>
@@ -125,12 +112,6 @@ module.exports = {
 	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',
@@ -165,86 +146,74 @@ module.exports = {
 					{
 						test: /\.(js|jsx|mjs)$/,
 						include: paths.appSrc,
+						exclude: /node_modules/,
 						loader: require.resolve('babel-loader'),
 						options: {
-
 							compact: true,
+							"plugins": [
+								["import", {
+									"libraryName": "antd",
+									"libraryDirectory": "es",
+									"style": "css"
+								}]
+							]
 						},
 					},
-					// 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`.
+
+						use: [{
+							loader: MiniCssExtractPlugin.loader,
+							options: {
+								publicPath
+							},
+						},
+						{
+							loader: require.resolve("css-loader"),
+							options: {
+								importLoaders: 1,
+								sourceMap: shouldUseSourceMap,
+							},
+						},
+						{
+							loader: require.resolve('postcss-loader'),
+							options: {
+								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',
+									}),
+								],
+							},
+						}
+						]
 					},
 					{
 						test: /\.scss$/,
-						use: [
-							require.resolve("style-loader"),
-							{
-								loader: require.resolve("css-loader"),
-								options: {
-									importLoaders: 1,
-									minimize: true,
-									sourceMap: shouldUseSourceMap,
-								},
+						use: [{
+							loader: MiniCssExtractPlugin.loader,
+							options: {
+								publicPath
 							},
-							{
-								loader: require.resolve("sass-loader")
-							}
+						},
+						{
+							loader: require.resolve("css-loader"),
+							options: {
+								importLoaders: 1,
+								sourceMap: shouldUseSourceMap,
+							},
+						},
+						{
+							loader: require.resolve("sass-loader")
+						}
 						],
 					},
 					// "file" loader makes sure assets end up in the `build` folder.
@@ -259,7 +228,7 @@ module.exports = {
 						// by webpacks internal loaders.
 						exclude: [/\.(js|jsx|mjs)$/, /\.html$/, /\.json$/],
 						options: {
-							name: 'static/media/[name].[hash:8].[ext]',
+							name: 'static/media/[name].[contenthash:8].[ext]',
 						},
 					},
 					// ** STOP ** Are you adding a new loader?
@@ -274,10 +243,9 @@ module.exports = {
 		// <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,
+			inject: false,
 			template: paths.appHtml,
 			minify: {
 				removeComments: true,
@@ -292,48 +260,16 @@ module.exports = {
 				minifyURLs: true,
 			},
 		}),
+		new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
 		// 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
-		// 		},
-		// 		compress: {
-		// 			drop_debugger: true,
-		// 			drop_console: true
-		// 		}
-		// 	}
-		// }),
-		// Note: this won't work without ExtractTextPlugin.extract(..) in `loaders`.
-		new ExtractTextPlugin({
-			filename: cssFilename,
+
+		new MiniCssExtractPlugin({
+			filename: 'static/css/[name].[contenthash:8].css',
+			chunkFilename: 'static/css/[name].[contenthash:8].chunk.css',
 		}),
 		// 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
@@ -377,7 +313,11 @@ module.exports = {
 		// 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$/),
-		// new MonacoWebpackPlugin(),
+		new MonacoWebpackPlugin({
+			features: ['!gotoSymbol'],
+		}),
+		new webpack.NamedChunksPlugin(),
+		new webpack.HashedModuleIdsPlugin()
 	],
 	// 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.
diff --git a/index.js b/index.js
deleted file mode 100644
index cb8cb4f9..00000000
--- a/index.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-
-import './index.css';
-import './indexPlus.css';
-import App from './App';
-
-// 加之前main.js 18.1MB
-// import { message } from 'antd';
-import message from 'antd/lib/message';
-import 'antd/lib/message/style/css';
-
-import { AppContainer } from 'react-hot-loader';
-
-import registerServiceWorker from './registerServiceWorker';
-
-import { configureUrlQuery } from 'react-url-query';
-
-import history from './history';
-
-// link the history used in our app to url-query so it can update the URL with it.
-configureUrlQuery({ history });
-// -----------------------------------------------------------------------------------	请求配置
-
-window.__useKindEditor = false;
-
-
-const render = (Component) => {
-  ReactDOM.render(
-    <AppContainer {...this.props}  {...this.state}>
-      <Component {...this.props} {...this.state}/>
-    </AppContainer>,
-    document.getElementById('root')
-  );
-}
-
-
-// ReactDOM.render(
-// 	,
-// 	document.getElementById('root'));
-// registerServiceWorker();
-
-render(App);
-if (module.hot) {
-  module.hot.accept('./App', () => { render(App) });
-}
diff --git a/package-lock.json b/package-lock.json
index 9acf0bcf..4615ef61 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,16 +6,16 @@
   "dependencies": {
     "@ant-design/colors": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz",
-      "integrity": "sha512-YKgNbG2dlzqMhA9NtI3/pbY16m3Yl/EeWBRa+lB1X1YaYxHrxNexiQYCLTWO/uDvAjLFMEDU+zR901waBtMtjQ==",
+      "resolved": "https://registry.npm.taobao.org/@ant-design/colors/download/@ant-design/colors-3.2.2.tgz",
+      "integrity": "sha1-WtQ9YZ6RHzSI66wwPWBuZqhCOQM=",
       "requires": {
         "tinycolor2": "^1.4.1"
       }
     },
     "@ant-design/create-react-context": {
       "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@ant-design/create-react-context/-/create-react-context-0.2.5.tgz",
-      "integrity": "sha512-1rMAa4qgP2lfl/QBH9i78+Gjxtj9FTMpMyDGZsEBW5Kih72EuUo9958mV8PgpRkh4uwPSQ7vVZWXeyNZXVAFDg==",
+      "resolved": "https://registry.npm.taobao.org/@ant-design/create-react-context/download/@ant-design/create-react-context-0.2.5.tgz",
+      "integrity": "sha1-9fWpFjtHcgl3EoNzl60w4i55+Fg=",
       "requires": {
         "gud": "^1.0.0",
         "warning": "^4.0.3"
@@ -23,8 +23,8 @@
       "dependencies": {
         "warning": {
           "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+          "resolved": "https://registry.npm.taobao.org/warning/download/warning-4.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwarning%2Fdownload%2Fwarning-4.0.3.tgz",
+          "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=",
           "requires": {
             "loose-envify": "^1.0.0"
           }
@@ -33,13 +33,13 @@
     },
     "@ant-design/icons": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-2.1.1.tgz",
-      "integrity": "sha512-jCH+k2Vjlno4YWl6g535nHR09PwCEmTBKAG6VqF+rhkrSPRLfgpU2maagwbZPLjaHuU5Jd1DFQ2KJpQuI6uG8w=="
+      "resolved": "https://registry.npm.taobao.org/@ant-design/icons/download/@ant-design/icons-2.1.1.tgz",
+      "integrity": "sha1-e5wI3/1PXUHbZn2dvl4BB9C9mko="
     },
     "@ant-design/icons-react": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@ant-design/icons-react/-/icons-react-2.0.1.tgz",
-      "integrity": "sha512-r1QfoltMuruJZqdiKcbPim3d8LNsVPB733U0gZEUSxBLuqilwsW28K2rCTWSMTjmFX7Mfpf+v/wdiFe/XCqThw==",
+      "resolved": "https://registry.npm.taobao.org/@ant-design/icons-react/download/@ant-design/icons-react-2.0.1.tgz",
+      "integrity": "sha1-F6JRNXGrMXrKKSfljOol3THlNvs=",
       "requires": {
         "@ant-design/colors": "^3.1.0",
         "babel-runtime": "^6.26.0"
@@ -47,24 +47,24 @@
     },
     "@antv/adjust": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@antv/adjust/-/adjust-0.1.1.tgz",
-      "integrity": "sha512-9FaMOyBlM4AgoRL0b5o0VhEKAYkexBNUrxV8XmpHU/9NBPJONBOB/NZUlQDqxtLItrt91tCfbAuMQmF529UX2Q==",
+      "resolved": "https://registry.npm.taobao.org/@antv/adjust/download/@antv/adjust-0.1.1.tgz?cache=0&sync_timestamp=1582683792170&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40antv%2Fadjust%2Fdownload%2F%40antv%2Fadjust-0.1.1.tgz",
+      "integrity": "sha1-4mOrDhoZQaZIhC/Ahs9lp+O3Xpg=",
       "requires": {
         "@antv/util": "~1.3.1"
       }
     },
     "@antv/attr": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@antv/attr/-/attr-0.1.2.tgz",
-      "integrity": "sha512-QXjP+T2I+pJQcwZx1oCA4tipG43vgeCeKcGGKahlcxb71OBAzjJZm1QbF4frKXcnOqRkxVXtCr70X9TRair3Ew==",
+      "resolved": "https://registry.npm.taobao.org/@antv/attr/download/@antv/attr-0.1.2.tgz?cache=0&sync_timestamp=1580873452521&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40antv%2Fattr%2Fdownload%2F%40antv%2Fattr-0.1.2.tgz",
+      "integrity": "sha1-LusSL8qvhRoth0mrx8YFGdP3fjc=",
       "requires": {
         "@antv/util": "~1.3.1"
       }
     },
     "@antv/component": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/@antv/component/-/component-0.3.8.tgz",
-      "integrity": "sha512-1WN3FzeRyJ1jraS/2og5gnm2ragnwtRMVQMiLolztWaUgC++F/B1CcSrPYfV1WvYrfuwbpX/QQxo3HL9aS+YJA==",
+      "version": "0.3.9",
+      "resolved": "https://registry.npm.taobao.org/@antv/component/download/@antv/component-0.3.9.tgz?cache=0&sync_timestamp=1586244917924&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40antv%2Fcomponent%2Fdownload%2F%40antv%2Fcomponent-0.3.9.tgz",
+      "integrity": "sha1-7VYcY5t3OM4D/2OoZvWeJR3oKhc=",
       "requires": {
         "@antv/attr": "~0.1.2",
         "@antv/g": "~3.3.5",
@@ -74,16 +74,16 @@
     },
     "@antv/coord": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@antv/coord/-/coord-0.1.0.tgz",
-      "integrity": "sha512-W1R8h3Jfb3AfMBVfCreFPMVetgEYuwHBIGn0+d3EgYXe2ckOF8XWjkpGF1fZhOMHREMr+Gt27NGiQh8yBdLUgg==",
+      "resolved": "https://registry.npm.taobao.org/@antv/coord/download/@antv/coord-0.1.0.tgz?cache=0&sync_timestamp=1582009349071&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40antv%2Fcoord%2Fdownload%2F%40antv%2Fcoord-0.1.0.tgz",
+      "integrity": "sha1-SKgK420HVS+WZX5/gJUifGPwwKk=",
       "requires": {
         "@antv/util": "~1.3.1"
       }
     },
     "@antv/g": {
       "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/@antv/g/-/g-3.3.6.tgz",
-      "integrity": "sha512-2GtyTz++s0BbN6s0ZL2/nrqGYCkd52pVoNH92YkrTdTOvpO6Z4DNoo6jGVgZdPX6Nzwli6yduC8MinVAhE8X6g==",
+      "resolved": "https://registry.npm.taobao.org/@antv/g/download/@antv/g-3.3.6.tgz?cache=0&sync_timestamp=1583075793392&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40antv%2Fg%2Fdownload%2F%40antv%2Fg-3.3.6.tgz",
+      "integrity": "sha1-Ef7Z3cntTloqokS3yKu5gqAD8gE=",
       "requires": {
         "@antv/gl-matrix": "~2.7.1",
         "@antv/util": "~1.3.1",
@@ -94,9 +94,9 @@
       }
     },
     "@antv/g2": {
-      "version": "3.5.9",
-      "resolved": "https://registry.npmjs.org/@antv/g2/-/g2-3.5.9.tgz",
-      "integrity": "sha512-AS0Exn9Khhx4Xp8JViv37/wjJbiC9zVY02hIdvUeTx4SaKC0nhE0euPfmthen1cQw7nVlGLYEGoav/qxpLAhiw==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npm.taobao.org/@antv/g2/download/@antv/g2-3.5.13.tgz?cache=0&sync_timestamp=1587089841344&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40antv%2Fg2%2Fdownload%2F%40antv%2Fg2-3.5.13.tgz",
+      "integrity": "sha1-KwNlQG6JhV5q80zTdLyzB6DtrUI=",
       "requires": {
         "@antv/adjust": "~0.1.0",
         "@antv/attr": "~0.1.2",
@@ -111,13 +111,13 @@
     },
     "@antv/gl-matrix": {
       "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/@antv/gl-matrix/-/gl-matrix-2.7.1.tgz",
-      "integrity": "sha512-oOWcVNlpELIKi9x+Mm1Vwbz8pXfkbJKykoCIOJ/dNK79hSIANbpXJ5d3Rra9/wZqK6MC961B7sybFhPlLraT3Q=="
+      "resolved": "https://registry.npm.taobao.org/@antv/gl-matrix/download/@antv/gl-matrix-2.7.1.tgz",
+      "integrity": "sha1-rLjjf3qz3wE0WrpDcteUK+QuuhQ="
     },
     "@antv/scale": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@antv/scale/-/scale-0.1.3.tgz",
-      "integrity": "sha512-oknlOg4OUqIh8LygrfQttx+OAnNJm2fQ81si4g8aby1WJJwj/TU1gCr+J3loIpKBtBK4VpP/OzTTqg1Ym67SOQ==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npm.taobao.org/@antv/scale/download/@antv/scale-0.1.5.tgz",
+      "integrity": "sha1-JDJm6LkEfPZLL9/ED5g0zwhGSW4=",
       "requires": {
         "@antv/util": "~1.3.1",
         "fecha": "~2.3.3"
@@ -125,18 +125,133 @@
     },
     "@antv/util": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@antv/util/-/util-1.3.1.tgz",
-      "integrity": "sha512-cbUta0hIJrKEaW3eKoGarz3Ita+9qUPF2YzTj8A6wds/nNiy20G26ztIWHU+5ThLc13B1n5Ik52LbaCaeg9enA==",
+      "resolved": "https://registry.npm.taobao.org/@antv/util/download/@antv/util-1.3.1.tgz?cache=0&sync_timestamp=1572438102677&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40antv%2Futil%2Fdownload%2F%40antv%2Futil-1.3.1.tgz",
+      "integrity": "sha1-MKNLIB/5Em7A1YxyyBZqnD5kTM0=",
       "requires": {
         "@antv/gl-matrix": "^2.7.1"
       }
     },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.0.0",
-      "resolved": "http://registry.npm.taobao.org/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.0.0.tgz",
-      "integrity": "sha1-Mj053QtQ4Qx8Bsp9djjmhk2MXDI=",
+    "@babel/code-frame": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.5.5.tgz",
+      "integrity": "sha1-vAeC9tafe31JUxIZaZuYj2aaj50=",
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/highlight": "^7.0.0"
+      }
+    },
+    "@babel/generator": {
+      "version": "7.9.5",
+      "resolved": "https://registry.npm.taobao.org/@babel/generator/download/@babel/generator-7.9.5.tgz",
+      "integrity": "sha1-J/CRd0GsxB5uqs7W1o+Ww/qa+vk=",
+      "requires": {
+        "@babel/types": "^7.9.5",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "@babel/types": {
+          "version": "7.9.5",
+          "resolved": "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.9.5.tgz",
+          "integrity": "sha1-iSMfgpFailZqcDs7IBM/c9prlEQ=",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.5",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "jsesc": {
+          "version": "2.5.2",
+          "resolved": "https://registry.npm.taobao.org/jsesc/download/jsesc-2.5.2.tgz",
+          "integrity": "sha1-gFZNLkg9rPbo7yCWUKZ98/DCg6Q="
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
+        }
+      }
+    },
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npm.taobao.org/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.8.3.tgz",
+      "integrity": "sha1-YLwLxlf2Ogkk/5pLSgskoTz03u4=",
+      "requires": {
+        "@babel/types": "^7.8.3"
+      },
+      "dependencies": {
+        "@babel/types": {
+          "version": "7.9.5",
+          "resolved": "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.9.5.tgz",
+          "integrity": "sha1-iSMfgpFailZqcDs7IBM/c9prlEQ=",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.5",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
+        }
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.9.5",
+      "resolved": "https://registry.npm.taobao.org/@babel/helper-function-name/download/@babel/helper-function-name-7.9.5.tgz",
+      "integrity": "sha1-K1OCDTUnUSDhh0qC5aq+E3aSClw=",
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/types": "^7.9.5"
+      },
+      "dependencies": {
+        "@babel/types": {
+          "version": "7.9.5",
+          "resolved": "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.9.5.tgz",
+          "integrity": "sha1-iSMfgpFailZqcDs7IBM/c9prlEQ=",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.5",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
+        }
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npm.taobao.org/@babel/helper-get-function-arity/download/@babel/helper-get-function-arity-7.8.3.tgz",
+      "integrity": "sha1-uJS5R70AQ4HOY+odufCFR+kgq9U=",
+      "requires": {
+        "@babel/types": "^7.8.3"
+      },
+      "dependencies": {
+        "@babel/types": {
+          "version": "7.9.5",
+          "resolved": "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.9.5.tgz",
+          "integrity": "sha1-iSMfgpFailZqcDs7IBM/c9prlEQ=",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.5",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
+        }
       }
     },
     "@babel/helper-module-imports": {
@@ -147,6 +262,63 @@
         "@babel/types": "^7.0.0"
       }
     },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npm.taobao.org/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.8.3.tgz",
+      "integrity": "sha1-ManzAHD5E2inGCzwX4MXgQZfx6k=",
+      "requires": {
+        "@babel/types": "^7.8.3"
+      },
+      "dependencies": {
+        "@babel/types": {
+          "version": "7.9.5",
+          "resolved": "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.9.5.tgz",
+          "integrity": "sha1-iSMfgpFailZqcDs7IBM/c9prlEQ=",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.5",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
+        }
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.9.5",
+      "resolved": "https://registry.npm.taobao.org/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.9.5.tgz",
+      "integrity": "sha1-kJd6jm+/a0MafcMXUu7iM78FLYA="
+    },
+    "@babel/highlight": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npm.taobao.org/@babel/highlight/download/@babel/highlight-7.9.0.tgz",
+      "integrity": "sha1-TptFzLgreWBycbKXmtgse2gWMHk=",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.9.0",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        }
+      }
+    },
+    "@babel/parser": {
+      "version": "7.9.4",
+      "resolved": "https://registry.npm.taobao.org/@babel/parser/download/@babel/parser-7.9.4.tgz",
+      "integrity": "sha1-aKNeawMZu8AURlvkOCgwARPy8ug="
+    },
     "@babel/runtime": {
       "version": "7.0.0-beta.51",
       "resolved": "http://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.0.0-beta.51.tgz",
@@ -173,6 +345,95 @@
         }
       }
     },
+    "@babel/template": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npm.taobao.org/@babel/template/download/@babel/template-7.8.6.tgz",
+      "integrity": "sha1-hrIq8V+CjfsIZHT5ZNzD45xDzis=",
+      "requires": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/parser": "^7.8.6",
+        "@babel/types": "^7.8.6"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.8.3.tgz",
+          "integrity": "sha1-M+JZA9dIEYFTThLsCiXxa2/PQZ4=",
+          "requires": {
+            "@babel/highlight": "^7.8.3"
+          }
+        },
+        "@babel/types": {
+          "version": "7.9.5",
+          "resolved": "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.9.5.tgz",
+          "integrity": "sha1-iSMfgpFailZqcDs7IBM/c9prlEQ=",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.5",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
+        }
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.9.5",
+      "resolved": "https://registry.npm.taobao.org/@babel/traverse/download/@babel/traverse-7.9.5.tgz",
+      "integrity": "sha1-bnxWtE4qxwEalIwh4oPd2dnbl6I=",
+      "requires": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.9.5",
+        "@babel/helper-function-name": "^7.9.5",
+        "@babel/helper-split-export-declaration": "^7.8.3",
+        "@babel/parser": "^7.9.0",
+        "@babel/types": "^7.9.5",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.13"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.8.3.tgz",
+          "integrity": "sha1-M+JZA9dIEYFTThLsCiXxa2/PQZ4=",
+          "requires": {
+            "@babel/highlight": "^7.8.3"
+          }
+        },
+        "@babel/types": {
+          "version": "7.9.5",
+          "resolved": "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.9.5.tgz",
+          "integrity": "sha1-iSMfgpFailZqcDs7IBM/c9prlEQ=",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.5",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.1.1.tgz",
+          "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "globals": {
+          "version": "11.12.0",
+          "resolved": "https://registry.npm.taobao.org/globals/download/globals-11.12.0.tgz",
+          "integrity": "sha1-q4eVM4hooLq9hSV1gBjCp+uVxC4="
+        },
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
+        }
+      }
+    },
     "@babel/types": {
       "version": "7.4.0",
       "resolved": "http://registry.npm.taobao.org/@babel/types/download/@babel/types-7.4.0.tgz",
@@ -191,51 +452,71 @@
       }
     },
     "@emotion/is-prop-valid": {
-      "version": "0.7.3",
-      "resolved": "http://registry.npm.taobao.org/@emotion/is-prop-valid/download/@emotion/is-prop-valid-0.7.3.tgz",
-      "integrity": "sha1-pr9PpTh8u6WdROaYpGgPSBqNpsw=",
+      "version": "0.8.8",
+      "resolved": "https://registry.npm.taobao.org/@emotion/is-prop-valid/download/@emotion/is-prop-valid-0.8.8.tgz",
+      "integrity": "sha1-2yixxDaKJZtgqXMR1qlS1P0BrBo=",
       "requires": {
-        "@emotion/memoize": "0.7.1"
+        "@emotion/memoize": "0.7.4"
       }
     },
     "@emotion/memoize": {
-      "version": "0.7.1",
-      "resolved": "http://registry.npm.taobao.org/@emotion/memoize/download/@emotion/memoize-0.7.1.tgz",
-      "integrity": "sha1-6TwTlCWSz17wGqgpdETcGSvu5S8="
+      "version": "0.7.4",
+      "resolved": "https://registry.npm.taobao.org/@emotion/memoize/download/@emotion/memoize-0.7.4.tgz",
+      "integrity": "sha1-Gb8PWvGRSREcQNmLsM+CEZ9dnus="
     },
     "@emotion/unitless": {
-      "version": "0.7.3",
-      "resolved": "http://registry.npm.taobao.org/@emotion/unitless/download/@emotion/unitless-0.7.3.tgz",
-      "integrity": "sha1-YxCgR/EtIaEDb7AxMXIZiSRAQW8="
-    },
-    "@icedesign/base": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npm.taobao.org/@icedesign/base/download/@icedesign/base-0.2.8.tgz",
-      "integrity": "sha512-cqDkY9MIwApqNafLz2CHdANwPsCkUoG0m+xljj2NOpDJFdqFiufjTfquvIeFPlA5Egcv4Phv31l76bo79wYxqA==",
-      "requires": {
-        "async-validator": "^1.6.7",
-        "classnames": "^2.2.3",
-        "cropperjs": "^0.7.1",
-        "enquire.js": "^2.1.6",
-        "object-assign": "^4.1.0",
-        "prop-types": "^15.5.10",
-        "react-transition-group": "^1.2.1"
-      }
-    },
-    "@icons/material": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz",
-      "integrity": "sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw=="
+      "version": "0.7.5",
+      "resolved": "https://registry.npm.taobao.org/@emotion/unitless/download/@emotion/unitless-0.7.5.tgz",
+      "integrity": "sha1-dyESkcGQCnALinjPr9oxYNdpSe0="
     },
     "@monaco-editor/react": {
       "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-2.6.1.tgz",
-      "integrity": "sha512-nppV3QtwKh2c+J8Mdw/YZhHkdNTGmhwnkG824wSq3QiyOyfPKbThIWxkuRa2L8gcmWy0RLlIzJfQzLFeXyf1/w=="
+      "resolved": "https://registry.npm.taobao.org/@monaco-editor/react/download/@monaco-editor/react-2.6.1.tgz",
+      "integrity": "sha1-rlhUQj7QntU4dJip5/IOJg//WRk="
+    },
+    "@mrmlnc/readdir-enhanced": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npm.taobao.org/@mrmlnc/readdir-enhanced/download/@mrmlnc/readdir-enhanced-2.2.1.tgz",
+      "integrity": "sha1-UkryQNGjYFJ7cwR17PoTRKpUDd4=",
+      "requires": {
+        "call-me-maybe": "^1.0.1",
+        "glob-to-regexp": "^0.3.0"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npm.taobao.org/@nodelib/fs.stat/download/@nodelib/fs.stat-1.1.3.tgz",
+      "integrity": "sha1-K1o6s/kYzKSKjHVMCBaOPwPrphs="
     },
     "@novnc/novnc": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@novnc/novnc/-/novnc-1.1.0.tgz",
-      "integrity": "sha512-W90Q79EuCYT++39aT/VKGyk7hUt2gPN3rN+ifPUvY4rdjgZlfwdCg9q7yzj04hke/zgdHsbXFfyFijBvrRuU5A=="
+      "resolved": "https://registry.npm.taobao.org/@novnc/novnc/download/@novnc/novnc-1.1.0.tgz",
+      "integrity": "sha1-OCe2I+niAe4eHIph0QfFHL+uuHE="
+    },
+    "@types/anymatch": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npm.taobao.org/@types/anymatch/download/@types/anymatch-1.3.1.tgz?cache=0&sync_timestamp=1563089138491&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fanymatch%2Fdownload%2F%40types%2Fanymatch-1.3.1.tgz",
+      "integrity": "sha1-M2utwb7sudrMOL6izzKt9ieoQho="
+    },
+    "@types/events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npm.taobao.org/@types/events/download/@types/events-3.0.0.tgz",
+      "integrity": "sha1-KGLz9Yqaf3w+eNefEw3U1xwlwqc="
+    },
+    "@types/glob": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npm.taobao.org/@types/glob/download/@types/glob-7.1.1.tgz",
+      "integrity": "sha1-qlmhxuP7xCHgfM0xqUTDDrpSFXU=",
+      "requires": {
+        "@types/events": "*",
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/html-minifier-terser": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npm.taobao.org/@types/html-minifier-terser/download/@types/html-minifier-terser-5.0.0.tgz",
+      "integrity": "sha1-dTJEDBOGBc7RtVWTXDEV3dIOi+8="
     },
     "@types/jss": {
       "version": "9.5.8",
@@ -246,6 +527,16 @@
         "indefinite-observable": "^1.0.1"
       }
     },
+    "@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npm.taobao.org/@types/minimatch/download/@types/minimatch-3.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fminimatch%2Fdownload%2F%40types%2Fminimatch-3.0.3.tgz",
+      "integrity": "sha1-PcoOPzOyAPx9ETnAzZbBJoyt/Z0="
+    },
+    "@types/node": {
+      "version": "13.13.1",
+      "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-13.13.1.tgz",
+      "integrity": "sha1-G6lMWhd6FpJRi/x7Qa7AqhoUNU4="
+    },
     "@types/prop-types": {
       "version": "15.7.0",
       "resolved": "http://registry.npm.taobao.org/@types/prop-types/download/@types/prop-types-15.7.0.tgz",
@@ -262,8 +553,8 @@
     },
     "@types/react-slick": {
       "version": "0.23.4",
-      "resolved": "https://registry.npmjs.org/@types/react-slick/-/react-slick-0.23.4.tgz",
-      "integrity": "sha512-vXoIy4GUfB7/YgqubR4H7RALo+pRdMYCeLgWwV3MPwl5pggTlEkFBTF19R7u+LJc85uMqC7RfsbkqPLMQ4ab+A==",
+      "resolved": "https://registry.npm.taobao.org/@types/react-slick/download/@types/react-slick-0.23.4.tgz",
+      "integrity": "sha1-yX4qnn49GTPGhZO46CdS+rHozlM=",
       "requires": {
         "@types/react": "*"
       }
@@ -276,6 +567,234 @@
         "@types/react": "*"
       }
     },
+    "@types/source-list-map": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npm.taobao.org/@types/source-list-map/download/@types/source-list-map-0.1.2.tgz",
+      "integrity": "sha1-AHiDYGP/rxdBI0m7o2QIfgrALsk="
+    },
+    "@types/tapable": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npm.taobao.org/@types/tapable/download/@types/tapable-1.0.5.tgz",
+      "integrity": "sha1-mtvBKVBYKqZerXa//fOf4MJ6PAI="
+    },
+    "@types/uglify-js": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npm.taobao.org/@types/uglify-js/download/@types/uglify-js-3.0.5.tgz",
+      "integrity": "sha1-LHDVxo9uAC47Lk+EmtxfFiVG9jM=",
+      "requires": {
+        "source-map": "^0.6.1"
+      }
+    },
+    "@types/webpack": {
+      "version": "4.41.10",
+      "resolved": "https://registry.npm.taobao.org/@types/webpack/download/@types/webpack-4.41.10.tgz",
+      "integrity": "sha1-Lh9rNQiiSYVO/j3MdpCQWsXuEL4=",
+      "requires": {
+        "@types/anymatch": "*",
+        "@types/node": "*",
+        "@types/tapable": "*",
+        "@types/uglify-js": "*",
+        "@types/webpack-sources": "*",
+        "source-map": "^0.6.0"
+      }
+    },
+    "@types/webpack-sources": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npm.taobao.org/@types/webpack-sources/download/@types/webpack-sources-0.1.7.tgz",
+      "integrity": "sha1-CjMKlFYRNBDHSl1kGArwy8oAcUE=",
+      "requires": {
+        "@types/node": "*",
+        "@types/source-list-map": "*",
+        "source-map": "^0.6.1"
+      }
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/ast/download/@webassemblyjs/ast-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.9.0.tgz",
+      "integrity": "sha1-vYUGBLQEJFmlpBzX0zjL7Wle2WQ=",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Ffloating-point-hex-parser%2Fdownload%2F%40webassemblyjs%2Ffloating-point-hex-parser-1.9.0.tgz",
+      "integrity": "sha1-PD07Jxvd/ITesA9xNEQ4MR1S/7Q=",
+      "dev": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fhelper-api-error%2Fdownload%2F%40webassemblyjs%2Fhelper-api-error-1.9.0.tgz",
+      "integrity": "sha1-ID9nbjM7lsnaLuqzzO8zxFkotqI=",
+      "dev": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fhelper-buffer%2Fdownload%2F%40webassemblyjs%2Fhelper-buffer-1.9.0.tgz",
+      "integrity": "sha1-oUQtJpxf6yP8vJ73WdrDVH8p3gA=",
+      "dev": true
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/helper-code-frame/download/@webassemblyjs/helper-code-frame-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fhelper-code-frame%2Fdownload%2F%40webassemblyjs%2Fhelper-code-frame-1.9.0.tgz",
+      "integrity": "sha1-ZH+Iks0gQ6gqwMjF51w28dkVnyc=",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/helper-fsm/download/@webassemblyjs/helper-fsm-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fhelper-fsm%2Fdownload%2F%40webassemblyjs%2Fhelper-fsm-1.9.0.tgz",
+      "integrity": "sha1-wFJWtxJEIUZx9LCOwQitY7cO3bg=",
+      "dev": true
+    },
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/helper-module-context/download/@webassemblyjs/helper-module-context-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fhelper-module-context%2Fdownload%2F%40webassemblyjs%2Fhelper-module-context-1.9.0.tgz",
+      "integrity": "sha1-JdiIS3aDmHGgimxvgGw5ee9xLwc=",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fhelper-wasm-bytecode%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-bytecode-1.9.0.tgz",
+      "integrity": "sha1-T+2L6sm4wU+MWLcNEk1UndH+V5A=",
+      "dev": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/helper-wasm-section/download/@webassemblyjs/helper-wasm-section-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fhelper-wasm-section%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-section-1.9.0.tgz",
+      "integrity": "sha1-WkE41aYpK6GLBMWuSXF+QWeWU0Y=",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/ieee754/download/@webassemblyjs/ieee754-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fieee754%2Fdownload%2F%40webassemblyjs%2Fieee754-1.9.0.tgz",
+      "integrity": "sha1-Fceg+6roP7JhQ7us9tbfFwKtOeQ=",
+      "dev": true,
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/leb128/download/@webassemblyjs/leb128-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fleb128%2Fdownload%2F%40webassemblyjs%2Fleb128-1.9.0.tgz",
+      "integrity": "sha1-8Zygt2ptxVYjoJz/p2noOPoeHJU=",
+      "dev": true,
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Futf8%2Fdownload%2F%40webassemblyjs%2Futf8-1.9.0.tgz",
+      "integrity": "sha1-BNM7Y2945qaBMifoJAL3Y3tiKas=",
+      "dev": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fwasm-edit%2Fdownload%2F%40webassemblyjs%2Fwasm-edit-1.9.0.tgz",
+      "integrity": "sha1-P+bXnT8PkiGDqoYALELdJWz+6c8=",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/helper-wasm-section": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-opt": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fwasm-gen%2Fdownload%2F%40webassemblyjs%2Fwasm-gen-1.9.0.tgz",
+      "integrity": "sha1-ULxw7Gje2OJ2OwGhQYv0NJGnpJw=",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fwasm-opt%2Fdownload%2F%40webassemblyjs%2Fwasm-opt-1.9.0.tgz",
+      "integrity": "sha1-IhEYHlsxMmRDzIES658LkChyGmE=",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/wasm-parser/download/@webassemblyjs/wasm-parser-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fwasm-parser%2Fdownload%2F%40webassemblyjs%2Fwasm-parser-1.9.0.tgz",
+      "integrity": "sha1-nUjkSCbfSmWYKUqmyHRp1kL/9l4=",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/wast-parser/download/@webassemblyjs/wast-parser-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fwast-parser%2Fdownload%2F%40webassemblyjs%2Fwast-parser-1.9.0.tgz",
+      "integrity": "sha1-MDERXXmsW9JhVWzsw/qQo+9FGRQ=",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-code-frame": "1.9.0",
+        "@webassemblyjs/helper-fsm": "1.9.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/@webassemblyjs/wast-printer/download/@webassemblyjs/wast-printer-1.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40webassemblyjs%2Fwast-printer%2Fdownload%2F%40webassemblyjs%2Fwast-printer-1.9.0.tgz",
+      "integrity": "sha1-STXVTIX+9jewDOn1I3dFHQDUeJk=",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/@xtuc/ieee754/download/@xtuc/ieee754-1.2.0.tgz",
+      "integrity": "sha1-7vAUoxRa5Hehy8AM0eVSM23Ot5A=",
+      "dev": true
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npm.taobao.org/@xtuc/long/download/@xtuc/long-4.2.2.tgz",
+      "integrity": "sha1-0pHGpOl5ibXGHZrPOWrk/hM6cY0=",
+      "dev": true
+    },
     "abab": {
       "version": "1.0.4",
       "resolved": "http://registry.npm.taobao.org/abab/download/abab-1.0.4.tgz",
@@ -283,9 +802,8 @@
     },
     "abbrev": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
+      "resolved": "https://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz",
+      "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
     },
     "accepts": {
       "version": "1.3.5",
@@ -301,21 +819,6 @@
       "resolved": "http://registry.npm.taobao.org/acorn/download/acorn-5.7.3.tgz",
       "integrity": "sha1-Z6ojG/iBKXS4UjWpZ3Hra9B+onk="
     },
-    "acorn-dynamic-import": {
-      "version": "2.0.2",
-      "resolved": "http://registry.npm.taobao.org/acorn-dynamic-import/download/acorn-dynamic-import-2.0.2.tgz",
-      "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
-      "requires": {
-        "acorn": "^4.0.3"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "4.0.13",
-          "resolved": "http://registry.npm.taobao.org/acorn/download/acorn-4.0.13.tgz",
-          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
-        }
-      }
-    },
     "acorn-globals": {
       "version": "3.1.0",
       "resolved": "http://registry.npm.taobao.org/acorn-globals/download/acorn-globals-3.1.0.tgz",
@@ -347,9 +850,9 @@
       }
     },
     "acorn-walk": {
-      "version": "6.1.1",
-      "resolved": "http://registry.npm.taobao.org/acorn-walk/download/acorn-walk-6.1.1.tgz",
-      "integrity": "sha1-02O2b1+sXwGP+cOh57b44xDMORM=",
+      "version": "7.1.1",
+      "resolved": "https://registry.npm.taobao.org/acorn-walk/download/acorn-walk-7.1.1.tgz?cache=0&sync_timestamp=1581612804260&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn-walk%2Fdownload%2Facorn-walk-7.1.1.tgz",
+      "integrity": "sha1-NF8N/61cc15zc9L+yaECPmpEuD4=",
       "dev": true
     },
     "add-dom-event-listener": {
@@ -361,9 +864,9 @@
       }
     },
     "address": {
-      "version": "1.0.3",
-      "resolved": "http://registry.npm.taobao.org/address/download/address-1.0.3.tgz",
-      "integrity": "sha1-tfUGMfjWzsi9IMljljr7VeBsvOk="
+      "version": "1.1.2",
+      "resolved": "https://registry.npm.taobao.org/address/download/address-1.1.2.tgz",
+      "integrity": "sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY="
     },
     "ajv": {
       "version": "5.5.2",
@@ -376,6 +879,11 @@
         "json-schema-traverse": "^0.3.0"
       }
     },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/ajv-errors/download/ajv-errors-1.0.1.tgz",
+      "integrity": "sha1-81mGrOuRr63sQQL72FAUlQzvpk0="
+    },
     "ajv-keywords": {
       "version": "3.4.0",
       "resolved": "http://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.4.0.tgz",
@@ -391,14 +899,9 @@
         "repeat-string": "^1.5.2"
       }
     },
-    "alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "http://registry.npm.taobao.org/alphanum-sort/download/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
-    },
     "amdefine": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/amdefine/download/amdefine-1.0.1.tgz",
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
     },
     "ansi-align": {
@@ -409,6 +912,11 @@
         "string-width": "^2.0.0"
       }
     },
+    "ansi-colors": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npm.taobao.org/ansi-colors/download/ansi-colors-3.2.4.tgz",
+      "integrity": "sha1-46PaS/uubIapwoViXeEkojQCb78="
+    },
     "ansi-escapes": {
       "version": "3.2.0",
       "resolved": "http://registry.npm.taobao.org/ansi-escapes/download/ansi-escapes-3.2.0.tgz",
@@ -433,9 +941,9 @@
       }
     },
     "antd": {
-      "version": "3.26.9",
-      "resolved": "https://registry.npmjs.org/antd/-/antd-3.26.9.tgz",
-      "integrity": "sha512-youf+hBJHB4nuhV7yEbm2VQSMtX9RxrNQvjlc+iIPj4FeJsuTQXIfSSAc5GhwDeVAI4+nuapCv7XLFIQ+f2ZFg==",
+      "version": "3.26.15",
+      "resolved": "https://registry.npm.taobao.org/antd/download/antd-3.26.15.tgz?cache=0&sync_timestamp=1587232621284&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fantd%2Fdownload%2Fantd-3.26.15.tgz",
+      "integrity": "sha1-xfTlYoUC+c37DDUccTINXA4kIb4=",
       "requires": {
         "@ant-design/create-react-context": "^0.2.4",
         "@ant-design/icons": "~2.1.1",
@@ -495,26 +1003,26 @@
       "dependencies": {
         "async-validator": {
           "version": "1.11.5",
-          "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.11.5.tgz",
-          "integrity": "sha512-XNtCsMAeAH1pdLMEg1z8/Bb3a8cdCbui9QbJATRFHHHW5kT6+NPI3zSVQUXgikTFITzsg+kYY5NTWhM2Orwt9w=="
+          "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.11.5.tgz?cache=0&sync_timestamp=1575620555389&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-1.11.5.tgz",
+          "integrity": "sha1-nUPPSe9rt2vlRCOI0Z+5puR1l+o="
         },
         "lodash": {
           "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+          "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz",
+          "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg="
         },
         "raf": {
           "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-          "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+          "resolved": "https://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fraf%2Fdownload%2Fraf-3.4.1.tgz",
+          "integrity": "sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=",
           "requires": {
             "performance-now": "^2.1.0"
           }
         },
         "rc-animate": {
-          "version": "2.10.2",
-          "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.10.2.tgz",
-          "integrity": "sha512-cE/A7piAzoWFSgUD69NmmMraqCeqVBa51UErod8NS3LUEqWfppSVagHfa0qHAlwPVPiIBg3emRONyny3eiH0Dg==",
+          "version": "2.10.3",
+          "resolved": "https://registry.npm.taobao.org/rc-animate/download/rc-animate-2.10.3.tgz",
+          "integrity": "sha1-Fj1eKSgaT/gtU+55GO7qyFa3Vvk=",
           "requires": {
             "babel-runtime": "6.x",
             "classnames": "^2.2.6",
@@ -527,8 +1035,8 @@
         },
         "rc-form": {
           "version": "2.4.11",
-          "resolved": "https://registry.npmjs.org/rc-form/-/rc-form-2.4.11.tgz",
-          "integrity": "sha512-8BL+FNlFLTOY/A5X6tU35GQJLSIpsmqpwn/tFAYQTczXc4dMJ33ggtH248Cum8+LS0jLTsJKG2L4Qp+1CkY+sA==",
+          "resolved": "https://registry.npm.taobao.org/rc-form/download/rc-form-2.4.11.tgz",
+          "integrity": "sha1-Ye465XklloSuMPLEj1Xw8jpdPQg=",
           "requires": {
             "async-validator": "~1.11.3",
             "babel-runtime": "6.x",
@@ -542,8 +1050,8 @@
         },
         "rc-menu": {
           "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-7.5.5.tgz",
-          "integrity": "sha512-4YJXJgrpUGEA1rMftXN7bDhrV5rPB8oBJoHqT+GVXtIWCanfQxEnM3fmhHQhatL59JoAFMZhJaNzhJIk4FUWCQ==",
+          "resolved": "https://registry.npm.taobao.org/rc-menu/download/rc-menu-7.5.5.tgz?cache=0&sync_timestamp=1582808203113&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-menu%2Fdownload%2Frc-menu-7.5.5.tgz",
+          "integrity": "sha1-eM3IF9hvw1OhQwuGTT2Wx0iWAMo=",
           "requires": {
             "classnames": "2.x",
             "dom-scroll-into-view": "1.x",
@@ -558,8 +1066,8 @@
         },
         "rc-pagination": {
           "version": "1.20.14",
-          "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-1.20.14.tgz",
-          "integrity": "sha512-sNKwbFrxiqATqcIIShfrFs8BT03n4UUwTAMYae+JhHTmILQmXdvimEnZbVuWcno6G02DAJcLrFpmkn1h2tmEJw==",
+          "resolved": "https://registry.npm.taobao.org/rc-pagination/download/rc-pagination-1.20.14.tgz",
+          "integrity": "sha1-mBwSXr7b5/5ngr0xH4u5yZ6wze0=",
           "requires": {
             "babel-runtime": "6.x",
             "classnames": "^2.2.6",
@@ -567,10 +1075,21 @@
             "react-lifecycles-compat": "^3.0.4"
           }
         },
+        "rc-rate": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npm.taobao.org/rc-rate/download/rc-rate-2.5.1.tgz?cache=0&sync_timestamp=1587022209816&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-rate%2Fdownload%2Frc-rate-2.5.1.tgz",
+          "integrity": "sha1-Vfxf0j6p3MciULmoiYA0efSEKWE=",
+          "requires": {
+            "classnames": "^2.2.5",
+            "prop-types": "^15.5.8",
+            "rc-util": "^4.3.0",
+            "react-lifecycles-compat": "^3.0.4"
+          }
+        },
         "rc-select": {
           "version": "9.2.3",
-          "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-9.2.3.tgz",
-          "integrity": "sha512-WhswxOMWiNnkXRbxyrj0kiIvyCfo/BaRPaYbsDetSIAU2yEDwKHF798blCP5u86KLOBKBvtxWLFCkSsQw1so5w==",
+          "resolved": "https://registry.npm.taobao.org/rc-select/download/rc-select-9.2.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-select%2Fdownload%2Frc-select-9.2.3.tgz",
+          "integrity": "sha1-ZDQOLW72TovDz8b0aP/ShiVYmsI=",
           "requires": {
             "babel-runtime": "^6.23.0",
             "classnames": "2.x",
@@ -588,8 +1107,8 @@
         },
         "rc-tree": {
           "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-2.1.3.tgz",
-          "integrity": "sha512-COvV65spQ6omrHBUhHRKqKNL5+ddXjlS+qWZchaL9FFuQNvjM5pjp9RnmMWK4fJJ5kBhhpLneh6wh9Vh3kSMXQ==",
+          "resolved": "https://registry.npm.taobao.org/rc-tree/download/rc-tree-2.1.3.tgz",
+          "integrity": "sha1-UhSrGyGhhI65ot3LkZ47xG1tOQs=",
           "requires": {
             "@ant-design/create-react-context": "^0.2.4",
             "classnames": "2.x",
@@ -602,8 +1121,8 @@
         },
         "rc-upload": {
           "version": "2.9.4",
-          "resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-2.9.4.tgz",
-          "integrity": "sha512-WXt0HGxXyzLrPV6iec/96Rbl/6dyrAW8pKuY6wwD7yFYwfU5bjgKjv7vC8KNMJ6wzitFrZjnoiogNL3dF9dj3Q==",
+          "resolved": "https://registry.npm.taobao.org/rc-upload/download/rc-upload-2.9.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-upload%2Fdownload%2Frc-upload-2.9.4.tgz",
+          "integrity": "sha1-jjSnOkaNeQf+MZgsOBAORZOFfTI=",
           "requires": {
             "babel-runtime": "6.x",
             "classnames": "^2.2.5",
@@ -612,21 +1131,26 @@
           }
         },
         "rc-util": {
-          "version": "4.19.0",
-          "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.19.0.tgz",
-          "integrity": "sha512-mptALlLwpeczS3nrv83DbwJNeupolbuvlIEjcvimSiWI8NUBjpF0HgG3kWp1RymiuiRCNm9yhaXqDz0a99dpgQ==",
+          "version": "4.20.3",
+          "resolved": "https://registry.npm.taobao.org/rc-util/download/rc-util-4.20.3.tgz",
+          "integrity": "sha1-xNTuYXHPaF3HVXJ1KnZDEDJYiNM=",
           "requires": {
             "add-dom-event-listener": "^1.1.0",
-            "babel-runtime": "6.x",
             "prop-types": "^15.5.10",
+            "react-is": "^16.12.0",
             "react-lifecycles-compat": "^3.0.4",
             "shallowequal": "^1.1.0"
           }
         },
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npm.taobao.org/react-is/download/react-is-16.13.1.tgz?cache=0&sync_timestamp=1586484576689&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-is%2Fdownload%2Freact-is-16.13.1.tgz",
+          "integrity": "sha1-eJcppNw23imZ3BVt1sHZwYzqVqQ="
+        },
         "warning": {
           "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+          "resolved": "https://registry.npm.taobao.org/warning/download/warning-4.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwarning%2Fdownload%2Fwarning-4.0.3.tgz",
+          "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=",
           "requires": {
             "loose-envify": "^1.0.0"
           }
@@ -652,15 +1176,13 @@
     },
     "aproba": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
+      "resolved": "https://registry.npm.taobao.org/aproba/download/aproba-1.2.0.tgz",
+      "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo="
     },
     "are-we-there-yet": {
       "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "dev": true,
+      "resolved": "https://registry.npm.taobao.org/are-we-there-yet/download/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=",
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -706,11 +1228,6 @@
       "resolved": "http://registry.npm.taobao.org/array-equal/download/array-equal-1.0.0.tgz",
       "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
     },
-    "array-filter": {
-      "version": "0.0.1",
-      "resolved": "http://registry.npm.taobao.org/array-filter/download/array-filter-0.0.1.tgz",
-      "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw="
-    },
     "array-find-index": {
       "version": "1.0.2",
       "resolved": "http://registry.npm.taobao.org/array-find-index/download/array-find-index-1.0.2.tgz",
@@ -730,20 +1247,10 @@
         "es-abstract": "^1.7.0"
       }
     },
-    "array-map": {
-      "version": "0.0.0",
-      "resolved": "http://registry.npm.taobao.org/array-map/download/array-map-0.0.0.tgz",
-      "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
-    },
-    "array-reduce": {
-      "version": "0.0.0",
-      "resolved": "http://registry.npm.taobao.org/array-reduce/download/array-reduce-0.0.0.tgz",
-      "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys="
-    },
     "array-tree-filter": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
-      "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw=="
+      "resolved": "https://registry.npm.taobao.org/array-tree-filter/download/array-tree-filter-2.1.0.tgz",
+      "integrity": "sha1-hzrAD+yDdJ8lWsjdCDgUtPYykZA="
     },
     "array-union": {
       "version": "1.0.2",
@@ -785,6 +1292,7 @@
       "version": "4.10.1",
       "resolved": "http://registry.npm.taobao.org/asn1.js/download/asn1.js-4.10.1.tgz",
       "integrity": "sha1-ucK/WAXx5kqt7tbfOiv6+1pz9aA=",
+      "dev": true,
       "requires": {
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
@@ -792,22 +1300,26 @@
       }
     },
     "assert": {
-      "version": "1.4.1",
-      "resolved": "http://registry.npm.taobao.org/assert/download/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npm.taobao.org/assert/download/assert-1.5.0.tgz",
+      "integrity": "sha1-VcEJqvbgrv2z3EtxJAxwv1dLGOs=",
+      "dev": true,
       "requires": {
+        "object-assign": "^4.1.1",
         "util": "0.10.3"
       },
       "dependencies": {
         "inherits": {
           "version": "2.0.1",
           "resolved": "http://registry.npm.taobao.org/inherits/download/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
         },
         "util": {
           "version": "0.10.3",
           "resolved": "http://registry.npm.taobao.org/util/download/util-0.10.3.tgz",
           "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
           "requires": {
             "inherits": "2.0.1"
           }
@@ -838,32 +1350,31 @@
       }
     },
     "async-each": {
-      "version": "1.0.2",
-      "resolved": "http://registry.npm.taobao.org/async-each/download/async-each-1.0.2.tgz",
-      "integrity": "sha1-i4p8oqZY+Sfp8wfW0aQvQZnw9zU="
+      "version": "1.0.3",
+      "resolved": "https://registry.npm.taobao.org/async-each/download/async-each-1.0.3.tgz",
+      "integrity": "sha1-tyfb+H12UWAvBvTUrDh/R9kbDL8="
     },
     "async-foreach": {
       "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz",
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
       "dev": true
     },
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/async-limiter/download/async-limiter-1.0.0.tgz",
-      "integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg=",
-      "dev": true
-    },
-    "async-validator": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.12.2.tgz",
-      "integrity": "sha512-57EETfCPFiB7M4QscvQzWSGNsmtkjjzZv318SK1CBlstk+hycV72ocjriMOOM48HjvmoAoJGpJNjC7Z76RlnZA=="
+      "integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg="
     },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "http://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz",
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
+    "at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/at-least-node/download/at-least-node-1.0.0.tgz",
+      "integrity": "sha1-YCzUtG6EStTv/JKoARo8RuAjjcI="
+    },
     "atob": {
       "version": "2.1.2",
       "resolved": "http://registry.npm.taobao.org/atob/download/atob-2.1.2.tgz",
@@ -894,8 +1405,8 @@
     },
     "axios": {
       "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz",
-      "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==",
+      "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.18.1.tgz",
+      "integrity": "sha1-/z8N4ue10YDnV62YAA8Qgbh7zqM=",
       "requires": {
         "follow-redirects": "1.5.10",
         "is-buffer": "^2.0.2"
@@ -903,28 +1414,28 @@
       "dependencies": {
         "debug": {
           "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.1.0.tgz",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "requires": {
             "ms": "2.0.0"
           }
         },
         "follow-redirects": {
           "version": "1.5.10",
-          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-          "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+          "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.5.10.tgz?cache=0&sync_timestamp=1585479417937&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.5.10.tgz",
+          "integrity": "sha1-e3qfmuov3/NnhqlP9kPtB/T/Xio=",
           "requires": {
             "debug": "=3.1.0"
           }
         },
         "is-buffer": {
           "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
+          "resolved": "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.4.tgz",
+          "integrity": "sha1-PlcvI8hBGlz9lVfISeNmXgspBiM="
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         }
       }
@@ -1215,9 +1726,9 @@
       }
     },
     "babel-plugin-import": {
-      "version": "1.11.0",
-      "resolved": "http://registry.npm.taobao.org/babel-plugin-import/download/babel-plugin-import-1.11.0.tgz",
-      "integrity": "sha1-eKyQjmsiUga6u3NOGerl941tEDU=",
+      "version": "1.13.0",
+      "resolved": "https://registry.npm.taobao.org/babel-plugin-import/download/babel-plugin-import-1.13.0.tgz?cache=0&sync_timestamp=1574676418803&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-import%2Fdownload%2Fbabel-plugin-import-1.13.0.tgz",
+      "integrity": "sha1-xTL9Uz3521O0fU1Ns2dgkPxcB6U=",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
@@ -1225,18 +1736,18 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.4.3",
-          "resolved": "http://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.4.3.tgz",
-          "integrity": "sha1-eYiORSA0IjrZYJGHoK0f4NKtS9w=",
+          "version": "7.9.2",
+          "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.9.2.tgz",
+          "integrity": "sha1-2Q3wWDo6JS8JqqYZZlNnuuUY2wY=",
           "dev": true,
           "requires": {
-            "regenerator-runtime": "^0.13.2"
+            "regenerator-runtime": "^0.13.4"
           }
         },
         "regenerator-runtime": {
-          "version": "0.13.2",
-          "resolved": "http://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.2.tgz",
-          "integrity": "sha1-MuWcmm+5saSv8JtJMMotRHc0NEc=",
+          "version": "0.13.5",
+          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.5.tgz?cache=0&sync_timestamp=1584052597708&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.5.tgz",
+          "integrity": "sha1-2Hih0JS0MG0QuQlkhLM+vVXiZpc=",
           "dev": true
         }
       }
@@ -1258,14 +1769,14 @@
       "integrity": "sha1-r+3IU70/jcNUjqZx++adA8wsF2c="
     },
     "babel-plugin-styled-components": {
-      "version": "1.10.0",
-      "resolved": "http://registry.npm.taobao.org/babel-plugin-styled-components/download/babel-plugin-styled-components-1.10.0.tgz",
-      "integrity": "sha1-/x9CrSzHjCHya2Ima49WTbyGKTk=",
+      "version": "1.10.7",
+      "resolved": "https://registry.npm.taobao.org/babel-plugin-styled-components/download/babel-plugin-styled-components-1.10.7.tgz?cache=0&sync_timestamp=1580231472248&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-styled-components%2Fdownload%2Fbabel-plugin-styled-components-1.10.7.tgz",
+      "integrity": "sha1-NJTneRTpmJszzC17OylSepSdY1w=",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.0.0",
         "@babel/helper-module-imports": "^7.0.0",
         "babel-plugin-syntax-jsx": "^6.18.0",
-        "lodash": "^4.17.10"
+        "lodash": "^4.17.11"
       }
     },
     "babel-plugin-syntax-async-functions": {
@@ -1736,21 +2247,6 @@
         "lodash": "^4.17.4",
         "mkdirp": "^0.5.1",
         "source-map-support": "^0.4.15"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "source-map-support": {
-          "version": "0.4.18",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-          "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-          "requires": {
-            "source-map": "^0.5.6"
-          }
-        }
       }
     },
     "babel-runtime": {
@@ -1840,55 +2336,18 @@
         "pascalcase": "^0.1.1"
       },
       "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/define-property/download/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "http://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz",
-          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
         "isobject": {
           "version": "3.0.1",
           "resolved": "http://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz",
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": ""
         }
       }
     },
     "base64-js": {
-      "version": "1.3.0",
-      "resolved": "http://registry.npm.taobao.org/base64-js/download/base64-js-1.3.0.tgz",
-      "integrity": "sha1-yrHmEY8FEJXli1KBrqjBzSK/wOM="
+      "version": "1.3.1",
+      "resolved": "https://registry.npm.taobao.org/base64-js/download/base64-js-1.3.1.tgz",
+      "integrity": "sha1-WOzoy3XdB+ce0IxzarxfrE2/jfE=",
+      "dev": true
     },
     "batch": {
       "version": "0.6.1",
@@ -1904,15 +2363,23 @@
       }
     },
     "bfj": {
-      "version": "6.1.1",
-      "resolved": "http://registry.npm.taobao.org/bfj/download/bfj-6.1.1.tgz",
-      "integrity": "sha1-BaO3eE+9cs+jwi5WAC75kzZRbEg=",
+      "version": "6.1.2",
+      "resolved": "https://registry.npm.taobao.org/bfj/download/bfj-6.1.2.tgz",
+      "integrity": "sha1-MlyGGoIryzWKQceKM7jm4ght3n8=",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.1",
-        "check-types": "^7.3.0",
-        "hoopy": "^0.1.2",
-        "tryer": "^1.0.0"
+        "bluebird": "^3.5.5",
+        "check-types": "^8.0.3",
+        "hoopy": "^0.1.4",
+        "tryer": "^1.0.1"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.7.2",
+          "resolved": "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz",
+          "integrity": "sha1-nyKcFb4nJFT/qXOs4NvueaGww28=",
+          "dev": true
+        }
       }
     },
     "big.js": {
@@ -1925,22 +2392,47 @@
       "resolved": "http://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.13.1.tgz",
       "integrity": "sha1-WYr+VHVbKGilMw0q/51Ou1Mgm2U="
     },
-    "bizcharts": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/bizcharts/-/bizcharts-3.5.6.tgz",
-      "integrity": "sha512-N9MVybqfqAEPmZwITyWu/bTZldK4sJHqg9nmTZ6bh6c+YUNs7OAGcjIxyrNfh4HOlxl6+8Jy5Vi55zCeOHxa9w==",
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npm.taobao.org/bindings/download/bindings-1.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbindings%2Fdownload%2Fbindings-1.5.0.tgz",
+      "integrity": "sha1-EDU8npRTNLwFEabZCzj7x8nFBN8=",
+      "optional": true,
       "requires": {
-        "@antv/g2": "3.5.9",
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "bizcharts": {
+      "version": "3.5.8",
+      "resolved": "https://registry.npm.taobao.org/bizcharts/download/bizcharts-3.5.8.tgz?cache=0&sync_timestamp=1587438711701&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbizcharts%2Fdownload%2Fbizcharts-3.5.8.tgz",
+      "integrity": "sha1-UKvLSWCJGq2myjUxiveR3WjYWCU=",
+      "requires": {
+        "@antv/g2": "3.5.13",
+        "@babel/runtime": "^7.7.6",
         "invariant": "^2.2.2",
         "lodash.debounce": "^4.0.8",
         "prop-types": "^15.6.0",
         "resize-observer-polyfill": "^1.5.1",
         "warning": "^3.0.0"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.9.2",
+          "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.9.2.tgz",
+          "integrity": "sha1-2Q3wWDo6JS8JqqYZZlNnuuUY2wY=",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.5",
+          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.5.tgz?cache=0&sync_timestamp=1584052597708&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.5.tgz",
+          "integrity": "sha1-2Hih0JS0MG0QuQlkhLM+vVXiZpc="
+        }
       }
     },
     "block-stream": {
       "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "resolved": "https://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz",
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
       "requires": {
@@ -1950,55 +2442,59 @@
     "bluebird": {
       "version": "3.5.4",
       "resolved": "http://registry.npm.taobao.org/bluebird/download/bluebird-3.5.4.tgz",
-      "integrity": "sha1-1sxmFZXeMNWzr1/O3TwLPvbsVxQ="
+      "integrity": "sha1-1sxmFZXeMNWzr1/O3TwLPvbsVxQ=",
+      "dev": true
     },
     "bn.js": {
       "version": "4.11.8",
       "resolved": "http://registry.npm.taobao.org/bn.js/download/bn.js-4.11.8.tgz",
-      "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8="
+      "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=",
+      "dev": true
     },
     "body-parser": {
-      "version": "1.18.3",
-      "resolved": "http://registry.npm.taobao.org/body-parser/download/body-parser-1.18.3.tgz",
-      "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
+      "version": "1.19.0",
+      "resolved": "https://registry.npm.taobao.org/body-parser/download/body-parser-1.19.0.tgz",
+      "integrity": "sha1-lrJwnlfJxOCab9Zqj9l5hE9p8Io=",
+      "dev": true,
       "requires": {
-        "bytes": "3.0.0",
+        "bytes": "3.1.0",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
         "depd": "~1.1.2",
-        "http-errors": "~1.6.3",
-        "iconv-lite": "0.4.23",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
         "on-finished": "~2.3.0",
-        "qs": "6.5.2",
-        "raw-body": "2.3.3",
-        "type-is": "~1.6.16"
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
       },
       "dependencies": {
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npm.taobao.org/bytes/download/bytes-3.1.0.tgz",
+          "integrity": "sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY=",
+          "dev": true
+        },
         "debug": {
           "version": "2.6.9",
           "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
           "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
         },
-        "iconv-lite": {
-          "version": "0.4.23",
-          "resolved": "http://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.23.tgz",
-          "integrity": "sha1-KXhx9jvlB63Pv8pxXQzQ7thOmmM=",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         },
         "qs": {
-          "version": "6.5.2",
-          "resolved": "http://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz",
-          "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY="
+          "version": "6.7.0",
+          "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz",
+          "integrity": "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw=",
+          "dev": true
         }
       }
     },
@@ -2078,7 +2574,13 @@
     "brorand": {
       "version": "1.1.0",
       "resolved": "http://registry.npm.taobao.org/brorand/download/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/browser-process-hrtime/download/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha1-PJtLfXgsgSHlbxAQbYTA0P/JRiY="
     },
     "browser-resolve": {
       "version": "1.11.3",
@@ -2099,6 +2601,7 @@
       "version": "1.2.0",
       "resolved": "http://registry.npm.taobao.org/browserify-aes/download/browserify-aes-1.2.0.tgz",
       "integrity": "sha1-Mmc0ZC9APavDADIJhTu3CtQo70g=",
+      "dev": true,
       "requires": {
         "buffer-xor": "^1.0.3",
         "cipher-base": "^1.0.0",
@@ -2112,6 +2615,7 @@
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/browserify-cipher/download/browserify-cipher-1.0.1.tgz",
       "integrity": "sha1-jWR0wbhwv9q807z8wZNKEOlPFfA=",
+      "dev": true,
       "requires": {
         "browserify-aes": "^1.0.4",
         "browserify-des": "^1.0.0",
@@ -2122,6 +2626,7 @@
       "version": "1.0.2",
       "resolved": "http://registry.npm.taobao.org/browserify-des/download/browserify-des-1.0.2.tgz",
       "integrity": "sha1-OvTx9Zg5QDVy8cZiBDdfen9wPpw=",
+      "dev": true,
       "requires": {
         "cipher-base": "^1.0.1",
         "des.js": "^1.0.0",
@@ -2133,6 +2638,7 @@
       "version": "4.0.1",
       "resolved": "http://registry.npm.taobao.org/browserify-rsa/download/browserify-rsa-4.0.1.tgz",
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
       "requires": {
         "bn.js": "^4.1.0",
         "randombytes": "^2.0.1"
@@ -2142,6 +2648,7 @@
       "version": "4.0.4",
       "resolved": "http://registry.npm.taobao.org/browserify-sign/download/browserify-sign-4.0.4.tgz",
       "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
       "requires": {
         "bn.js": "^4.1.1",
         "browserify-rsa": "^4.0.0",
@@ -2156,6 +2663,7 @@
       "version": "0.2.0",
       "resolved": "http://registry.npm.taobao.org/browserify-zlib/download/browserify-zlib-0.2.0.tgz",
       "integrity": "sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=",
+      "dev": true,
       "requires": {
         "pako": "~1.0.5"
       }
@@ -2178,9 +2686,10 @@
       }
     },
     "buffer": {
-      "version": "4.9.1",
-      "resolved": "http://registry.npm.taobao.org/buffer/download/buffer-4.9.1.tgz",
-      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "version": "4.9.2",
+      "resolved": "https://registry.npm.taobao.org/buffer/download/buffer-4.9.2.tgz",
+      "integrity": "sha1-Iw6tNEACmIZEhBqwJEr4xEu+Pvg=",
+      "dev": true,
       "requires": {
         "base64-js": "^1.0.2",
         "ieee754": "^1.1.4",
@@ -2200,7 +2709,8 @@
     "buffer-xor": {
       "version": "1.0.3",
       "resolved": "http://registry.npm.taobao.org/buffer-xor/download/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
     },
     "builtin-modules": {
       "version": "1.1.1",
@@ -2210,7 +2720,8 @@
     "builtin-status-codes": {
       "version": "3.0.0",
       "resolved": "http://registry.npm.taobao.org/builtin-status-codes/download/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
     },
     "bundle-loader": {
       "version": "0.5.6",
@@ -2227,8 +2738,8 @@
     },
     "cacache": {
       "version": "10.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
-      "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+      "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-10.0.4.tgz",
+      "integrity": "sha1-ZFI2eZnv+dQYiu/ZoU6dfGomNGA=",
       "dev": true,
       "requires": {
         "bluebird": "^3.5.1",
@@ -2248,8 +2759,8 @@
       "dependencies": {
         "y18n": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "resolved": "https://registry.npm.taobao.org/y18n/download/y18n-4.0.0.tgz",
+          "integrity": "sha1-le+U+F7MgdAHwmThkKEg8KPIVms=",
           "dev": true
         }
       }
@@ -2277,6 +2788,11 @@
         }
       }
     },
+    "call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/call-me-maybe/download/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
+    },
     "caller-path": {
       "version": "0.1.0",
       "resolved": "http://registry.npm.taobao.org/caller-path/download/caller-path-0.1.0.tgz",
@@ -2291,12 +2807,12 @@
       "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo="
     },
     "camel-case": {
-      "version": "3.0.0",
-      "resolved": "http://registry.npm.taobao.org/camel-case/download/camel-case-3.0.0.tgz",
-      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "version": "4.1.1",
+      "resolved": "https://registry.npm.taobao.org/camel-case/download/camel-case-4.1.1.tgz?cache=0&sync_timestamp=1576748709736&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamel-case%2Fdownload%2Fcamel-case-4.1.1.tgz",
+      "integrity": "sha1-H8QchU8A4vfQE53+uhVC1olv5Uc=",
       "requires": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
+        "pascal-case": "^3.1.1",
+        "tslib": "^1.10.0"
       }
     },
     "camelcase": {
@@ -2325,33 +2841,6 @@
       "resolved": "http://registry.npm.taobao.org/camelize/download/camelize-1.0.0.tgz",
       "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
     },
-    "caniuse-api": {
-      "version": "1.6.1",
-      "resolved": "http://registry.npm.taobao.org/caniuse-api/download/caniuse-api-1.6.1.tgz",
-      "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
-      "requires": {
-        "browserslist": "^1.3.6",
-        "caniuse-db": "^1.0.30000529",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "1.7.7",
-          "resolved": "http://registry.npm.taobao.org/browserslist/download/browserslist-1.7.7.tgz",
-          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-          "requires": {
-            "caniuse-db": "^1.0.30000639",
-            "electron-to-chromium": "^1.2.7"
-          }
-        }
-      }
-    },
-    "caniuse-db": {
-      "version": "1.0.30000957",
-      "resolved": "http://registry.npm.taobao.org/caniuse-db/download/caniuse-db-1.0.30000957.tgz",
-      "integrity": "sha1-MR6G5sfRkv19efqAzWmHnkHQGFI="
-    },
     "caniuse-lite": {
       "version": "1.0.30000957",
       "resolved": "http://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30000957.tgz",
@@ -2381,11 +2870,6 @@
         "lazy-cache": "^1.0.3"
       }
     },
-    "chain-function": {
-      "version": "1.0.1",
-      "resolved": "http://registry.npm.taobao.org/chain-function/download/chain-function-1.0.1.tgz",
-      "integrity": "sha1-xjBF5bS2Y/uG8cbhhq2vHeQCocw="
-    },
     "chalk": {
       "version": "1.1.3",
       "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz",
@@ -2422,19 +2906,19 @@
     },
     "charenc": {
       "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/charenc/download/charenc-0.0.2.tgz",
       "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
     },
     "check-types": {
-      "version": "7.4.0",
-      "resolved": "http://registry.npm.taobao.org/check-types/download/check-types-7.4.0.tgz",
-      "integrity": "sha1-A3jsG5YW7HH3dJMaPGUW+tjBUvQ=",
+      "version": "8.0.3",
+      "resolved": "https://registry.npm.taobao.org/check-types/download/check-types-8.0.3.tgz",
+      "integrity": "sha1-M1bMoZyIlUTy16le1JzlCKDs9VI=",
       "dev": true
     },
     "chokidar": {
-      "version": "2.1.5",
-      "resolved": "http://registry.npm.taobao.org/chokidar/download/chokidar-2.1.5.tgz",
-      "integrity": "sha1-CuhDTZYigaX1bHKGnnnLbZ2GrU0=",
+      "version": "2.1.8",
+      "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-2.1.8.tgz?cache=0&sync_timestamp=1584609518131&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-2.1.8.tgz",
+      "integrity": "sha1-gEs6e2qZNYw8XGHnHYco8EHP+Rc=",
       "requires": {
         "anymatch": "^2.0.0",
         "async-each": "^1.0.1",
@@ -2496,6 +2980,14 @@
             "to-regex": "^3.0.1"
           },
           "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
             "extend-shallow": {
               "version": "2.0.1",
               "resolved": "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
@@ -2503,6 +2995,248 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-0.1.6.tgz",
+              "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
+              "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz",
+              "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0="
+            },
+            "regex-not": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npm.taobao.org/regex-not/download/regex-not-1.0.2.tgz",
+              "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=",
+              "requires": {
+                "extend-shallow": "^3.0.2",
+                "safe-regex": "^1.1.0"
+              },
+              "dependencies": {
+                "extend-shallow": {
+                  "version": "3.0.2",
+                  "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+                  "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+                  "requires": {
+                    "assign-symbols": "^1.0.0",
+                    "is-extendable": "^1.0.1"
+                  }
+                },
+                "is-extendable": {
+                  "version": "1.0.1",
+                  "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+                  "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+                  "requires": {
+                    "is-plain-object": "^2.0.4"
+                  }
+                }
+              }
+            },
+            "snapdragon": {
+              "version": "0.8.2",
+              "resolved": "https://registry.npm.taobao.org/snapdragon/download/snapdragon-0.8.2.tgz",
+              "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=",
+              "requires": {
+                "base": "^0.11.1",
+                "debug": "^2.2.0",
+                "define-property": "^0.2.5",
+                "extend-shallow": "^2.0.1",
+                "map-cache": "^0.2.2",
+                "source-map": "^0.5.6",
+                "source-map-resolve": "^0.5.0",
+                "use": "^3.1.0"
+              }
+            },
+            "snapdragon-node": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npm.taobao.org/snapdragon-node/download/snapdragon-node-2.1.1.tgz",
+              "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
+              "requires": {
+                "define-property": "^1.0.0",
+                "isobject": "^3.0.0",
+                "snapdragon-util": "^3.0.1"
+              },
+              "dependencies": {
+                "define-property": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-1.0.0.tgz",
+                  "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+                  "requires": {
+                    "is-descriptor": "^1.0.0"
+                  }
+                },
+                "is-accessor-descriptor": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz",
+                  "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+                  "requires": {
+                    "kind-of": "^6.0.0"
+                  }
+                },
+                "is-data-descriptor": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz",
+                  "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+                  "requires": {
+                    "kind-of": "^6.0.0"
+                  }
+                },
+                "is-descriptor": {
+                  "version": "1.0.2",
+                  "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz",
+                  "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+                  "requires": {
+                    "is-accessor-descriptor": "^1.0.0",
+                    "is-data-descriptor": "^1.0.0",
+                    "kind-of": "^6.0.2"
+                  }
+                },
+                "kind-of": {
+                  "version": "6.0.3",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+                  "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
+                }
+              }
+            },
+            "split-string": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npm.taobao.org/split-string/download/split-string-3.1.0.tgz",
+              "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
+              "requires": {
+                "extend-shallow": "^3.0.0"
+              },
+              "dependencies": {
+                "extend-shallow": {
+                  "version": "3.0.2",
+                  "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+                  "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+                  "requires": {
+                    "assign-symbols": "^1.0.0",
+                    "is-extendable": "^1.0.1"
+                  }
+                },
+                "is-extendable": {
+                  "version": "1.0.1",
+                  "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+                  "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+                  "requires": {
+                    "is-plain-object": "^2.0.4"
+                  }
+                }
+              }
+            },
+            "to-regex": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npm.taobao.org/to-regex/download/to-regex-3.0.2.tgz",
+              "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=",
+              "requires": {
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "regex-not": "^1.0.2",
+                "safe-regex": "^1.1.0"
+              },
+              "dependencies": {
+                "define-property": {
+                  "version": "2.0.2",
+                  "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
+                  "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+                  "requires": {
+                    "is-descriptor": "^1.0.2",
+                    "isobject": "^3.0.1"
+                  }
+                },
+                "extend-shallow": {
+                  "version": "3.0.2",
+                  "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+                  "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+                  "requires": {
+                    "assign-symbols": "^1.0.0",
+                    "is-extendable": "^1.0.1"
+                  }
+                },
+                "is-accessor-descriptor": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz",
+                  "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+                  "requires": {
+                    "kind-of": "^6.0.0"
+                  }
+                },
+                "is-data-descriptor": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz",
+                  "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+                  "requires": {
+                    "kind-of": "^6.0.0"
+                  }
+                },
+                "is-descriptor": {
+                  "version": "1.0.2",
+                  "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz",
+                  "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+                  "requires": {
+                    "is-accessor-descriptor": "^1.0.0",
+                    "is-data-descriptor": "^1.0.0",
+                    "kind-of": "^6.0.2"
+                  }
+                },
+                "is-extendable": {
+                  "version": "1.0.1",
+                  "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+                  "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+                  "requires": {
+                    "is-plain-object": "^2.0.4"
+                  }
+                },
+                "kind-of": {
+                  "version": "6.0.3",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+                  "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
+                }
+              }
             }
           }
         },
@@ -2594,6 +3328,124 @@
               "version": "5.1.0",
               "resolved": "http://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz",
               "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0="
+            },
+            "posix-character-classes": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npm.taobao.org/posix-character-classes/download/posix-character-classes-0.1.1.tgz",
+              "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
+            },
+            "regex-not": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npm.taobao.org/regex-not/download/regex-not-1.0.2.tgz",
+              "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=",
+              "requires": {
+                "extend-shallow": "^3.0.2",
+                "safe-regex": "^1.1.0"
+              },
+              "dependencies": {
+                "extend-shallow": {
+                  "version": "3.0.2",
+                  "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+                  "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+                  "requires": {
+                    "assign-symbols": "^1.0.0",
+                    "is-extendable": "^1.0.1"
+                  }
+                },
+                "is-extendable": {
+                  "version": "1.0.1",
+                  "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+                  "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+                  "requires": {
+                    "is-plain-object": "^2.0.4"
+                  }
+                }
+              }
+            },
+            "snapdragon": {
+              "version": "0.8.2",
+              "resolved": "https://registry.npm.taobao.org/snapdragon/download/snapdragon-0.8.2.tgz",
+              "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=",
+              "requires": {
+                "base": "^0.11.1",
+                "debug": "^2.2.0",
+                "define-property": "^0.2.5",
+                "extend-shallow": "^2.0.1",
+                "map-cache": "^0.2.2",
+                "source-map": "^0.5.6",
+                "source-map-resolve": "^0.5.0",
+                "use": "^3.1.0"
+              }
+            },
+            "to-regex": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npm.taobao.org/to-regex/download/to-regex-3.0.2.tgz",
+              "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=",
+              "requires": {
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "regex-not": "^1.0.2",
+                "safe-regex": "^1.1.0"
+              },
+              "dependencies": {
+                "define-property": {
+                  "version": "2.0.2",
+                  "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
+                  "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+                  "requires": {
+                    "is-descriptor": "^1.0.2",
+                    "isobject": "^3.0.1"
+                  }
+                },
+                "extend-shallow": {
+                  "version": "3.0.2",
+                  "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+                  "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+                  "requires": {
+                    "assign-symbols": "^1.0.0",
+                    "is-extendable": "^1.0.1"
+                  }
+                },
+                "is-accessor-descriptor": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz",
+                  "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+                  "requires": {
+                    "kind-of": "^6.0.0"
+                  }
+                },
+                "is-data-descriptor": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz",
+                  "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+                  "requires": {
+                    "kind-of": "^6.0.0"
+                  }
+                },
+                "is-descriptor": {
+                  "version": "1.0.2",
+                  "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz",
+                  "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+                  "requires": {
+                    "is-accessor-descriptor": "^1.0.0",
+                    "is-data-descriptor": "^1.0.0",
+                    "kind-of": "^6.0.2"
+                  }
+                },
+                "is-extendable": {
+                  "version": "1.0.1",
+                  "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+                  "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+                  "requires": {
+                    "is-plain-object": "^2.0.4"
+                  }
+                },
+                "kind-of": {
+                  "version": "6.0.3",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+                  "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
+                }
+              }
             }
           }
         },
@@ -2627,6 +3479,157 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "fragment-cache": {
+              "version": "0.2.1",
+              "resolved": "https://registry.npm.taobao.org/fragment-cache/download/fragment-cache-0.2.1.tgz",
+              "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+              "requires": {
+                "map-cache": "^0.2.2"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz",
+              "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0="
+            },
+            "regex-not": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npm.taobao.org/regex-not/download/regex-not-1.0.2.tgz",
+              "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=",
+              "requires": {
+                "extend-shallow": "^3.0.2",
+                "safe-regex": "^1.1.0"
+              },
+              "dependencies": {
+                "extend-shallow": {
+                  "version": "3.0.2",
+                  "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+                  "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+                  "requires": {
+                    "assign-symbols": "^1.0.0",
+                    "is-extendable": "^1.0.1"
+                  }
+                },
+                "is-extendable": {
+                  "version": "1.0.1",
+                  "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+                  "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+                  "requires": {
+                    "is-plain-object": "^2.0.4"
+                  }
+                }
+              }
+            },
+            "snapdragon": {
+              "version": "0.8.2",
+              "resolved": "https://registry.npm.taobao.org/snapdragon/download/snapdragon-0.8.2.tgz",
+              "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=",
+              "requires": {
+                "base": "^0.11.1",
+                "debug": "^2.2.0",
+                "define-property": "^0.2.5",
+                "extend-shallow": "^2.0.1",
+                "map-cache": "^0.2.2",
+                "source-map": "^0.5.6",
+                "source-map-resolve": "^0.5.0",
+                "use": "^3.1.0"
+              },
+              "dependencies": {
+                "define-property": {
+                  "version": "0.2.5",
+                  "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz",
+                  "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                  "requires": {
+                    "is-descriptor": "^0.1.0"
+                  }
+                },
+                "is-descriptor": {
+                  "version": "0.1.6",
+                  "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-0.1.6.tgz",
+                  "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
+                  "requires": {
+                    "is-accessor-descriptor": "^0.1.6",
+                    "is-data-descriptor": "^0.1.4",
+                    "kind-of": "^5.0.0"
+                  }
+                }
+              }
+            },
+            "to-regex": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npm.taobao.org/to-regex/download/to-regex-3.0.2.tgz",
+              "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=",
+              "requires": {
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "regex-not": "^1.0.2",
+                "safe-regex": "^1.1.0"
+              },
+              "dependencies": {
+                "define-property": {
+                  "version": "2.0.2",
+                  "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
+                  "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+                  "requires": {
+                    "is-descriptor": "^1.0.2",
+                    "isobject": "^3.0.1"
+                  }
+                },
+                "extend-shallow": {
+                  "version": "3.0.2",
+                  "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+                  "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+                  "requires": {
+                    "assign-symbols": "^1.0.0",
+                    "is-extendable": "^1.0.1"
+                  }
+                },
+                "is-extendable": {
+                  "version": "1.0.1",
+                  "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+                  "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+                  "requires": {
+                    "is-plain-object": "^2.0.4"
+                  }
+                }
+              }
             }
           }
         },
@@ -2648,6 +3651,15 @@
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "to-regex-range": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npm.taobao.org/to-regex-range/download/to-regex-range-2.1.1.tgz",
+              "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+              "requires": {
+                "is-number": "^3.0.0",
+                "repeat-string": "^1.6.1"
+              }
             }
           }
         },
@@ -2733,8 +3745,9 @@
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         },
         "kind-of": {
-          "version": "6.0.2",
-          "resolved": ""
+          "version": "6.0.3",
+          "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+          "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
         },
         "micromatch": {
           "version": "3.1.10",
@@ -2754,6 +3767,177 @@
             "regex-not": "^1.0.0",
             "snapdragon": "^0.8.1",
             "to-regex": "^3.0.2"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "2.0.2",
+              "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
+              "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+              "requires": {
+                "is-descriptor": "^1.0.2",
+                "isobject": "^3.0.1"
+              }
+            },
+            "extend-shallow": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+              "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+              "requires": {
+                "assign-symbols": "^1.0.0",
+                "is-extendable": "^1.0.1"
+              }
+            },
+            "fragment-cache": {
+              "version": "0.2.1",
+              "resolved": "https://registry.npm.taobao.org/fragment-cache/download/fragment-cache-0.2.1.tgz",
+              "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+              "requires": {
+                "map-cache": "^0.2.2"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+              "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            },
+            "nanomatch": {
+              "version": "1.2.13",
+              "resolved": "https://registry.npm.taobao.org/nanomatch/download/nanomatch-1.2.13.tgz",
+              "integrity": "sha1-uHqKpPwN6P5r6IiVs4mD/yZb0Rk=",
+              "requires": {
+                "arr-diff": "^4.0.0",
+                "array-unique": "^0.3.2",
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "fragment-cache": "^0.2.1",
+                "is-windows": "^1.0.2",
+                "kind-of": "^6.0.2",
+                "object.pick": "^1.3.0",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.1"
+              }
+            },
+            "object.pick": {
+              "version": "1.3.0",
+              "resolved": "https://registry.npm.taobao.org/object.pick/download/object.pick-1.3.0.tgz",
+              "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+              "requires": {
+                "isobject": "^3.0.1"
+              }
+            },
+            "regex-not": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npm.taobao.org/regex-not/download/regex-not-1.0.2.tgz",
+              "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=",
+              "requires": {
+                "extend-shallow": "^3.0.2",
+                "safe-regex": "^1.1.0"
+              }
+            },
+            "snapdragon": {
+              "version": "0.8.2",
+              "resolved": "https://registry.npm.taobao.org/snapdragon/download/snapdragon-0.8.2.tgz",
+              "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=",
+              "requires": {
+                "base": "^0.11.1",
+                "debug": "^2.2.0",
+                "define-property": "^0.2.5",
+                "extend-shallow": "^2.0.1",
+                "map-cache": "^0.2.2",
+                "source-map": "^0.5.6",
+                "source-map-resolve": "^0.5.0",
+                "use": "^3.1.0"
+              },
+              "dependencies": {
+                "define-property": {
+                  "version": "0.2.5",
+                  "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz",
+                  "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                  "requires": {
+                    "is-descriptor": "^0.1.0"
+                  }
+                },
+                "extend-shallow": {
+                  "version": "2.0.1",
+                  "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+                  "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                  "requires": {
+                    "is-extendable": "^0.1.0"
+                  }
+                },
+                "is-descriptor": {
+                  "version": "0.1.6",
+                  "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-0.1.6.tgz",
+                  "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
+                  "requires": {
+                    "is-accessor-descriptor": "^0.1.6",
+                    "is-data-descriptor": "^0.1.4",
+                    "kind-of": "^5.0.0"
+                  }
+                },
+                "is-extendable": {
+                  "version": "0.1.1",
+                  "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-0.1.1.tgz",
+                  "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
+                },
+                "kind-of": {
+                  "version": "5.1.0",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz",
+                  "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0="
+                }
+              }
+            },
+            "to-regex": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npm.taobao.org/to-regex/download/to-regex-3.0.2.tgz",
+              "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=",
+              "requires": {
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "regex-not": "^1.0.2",
+                "safe-regex": "^1.1.0"
+              }
+            }
           }
         },
         "ms": {
@@ -2765,14 +3949,27 @@
           "version": "3.0.0",
           "resolved": "http://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz",
           "integrity": "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU="
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
         }
       }
     },
     "chownr": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
+      "resolved": "https://registry.npm.taobao.org/chownr/download/chownr-1.1.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchownr%2Fdownload%2Fchownr-1.1.4.tgz",
+      "integrity": "sha1-b8nXtC0ypYNZYzdmbn0ICE2izGs="
+    },
+    "chrome-trace-event": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/chrome-trace-event/download/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha1-I0CQ7pfH1K0aLEvq4nUF3v/GCKQ=",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
     },
     "ci-info": {
       "version": "1.6.0",
@@ -2783,6 +3980,7 @@
       "version": "1.0.4",
       "resolved": "http://registry.npm.taobao.org/cipher-base/download/cipher-base-1.0.4.tgz",
       "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
+      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -2793,14 +3991,6 @@
       "resolved": "http://registry.npm.taobao.org/circular-json/download/circular-json-0.3.3.tgz",
       "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY="
     },
-    "clap": {
-      "version": "1.2.3",
-      "resolved": "http://registry.npm.taobao.org/clap/download/clap-1.2.3.tgz",
-      "integrity": "sha1-TzZ0WzIAhJJVf0ZBLWbVDLmbzlE=",
-      "requires": {
-        "chalk": "^1.1.3"
-      }
-    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "http://registry.npm.taobao.org/class-utils/download/class-utils-0.3.6.tgz",
@@ -2833,9 +4023,9 @@
       "integrity": "sha1-Q5Nb/90pHzJtrQogUwmzjQD2UM4="
     },
     "clean-css": {
-      "version": "4.2.1",
-      "resolved": "http://registry.npm.taobao.org/clean-css/download/clean-css-4.2.1.tgz",
-      "integrity": "sha1-LUEe92uFabbQyEBo2r6FsKpeXBc=",
+      "version": "4.2.3",
+      "resolved": "https://registry.npm.taobao.org/clean-css/download/clean-css-4.2.3.tgz",
+      "integrity": "sha1-UHtd59l7SO5T2ErbAWD/YhY4D3g=",
       "requires": {
         "source-map": "~0.6.0"
       }
@@ -2854,14 +4044,14 @@
       }
     },
     "cli-width": {
-      "version": "2.2.0",
-      "resolved": "http://registry.npm.taobao.org/cli-width/download/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+      "version": "2.2.1",
+      "resolved": "https://registry.npm.taobao.org/cli-width/download/cli-width-2.2.1.tgz",
+      "integrity": "sha1-sEM9C06chH7xiGik7xb9X8gnHEg="
     },
     "clipboard": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz",
-      "integrity": "sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npm.taobao.org/clipboard/download/clipboard-2.0.6.tgz",
+      "integrity": "sha1-UpISlu7A/fd+rRdJQhshyWhkc3Y=",
       "requires": {
         "good-listener": "^1.2.2",
         "select": "^1.1.2",
@@ -2898,15 +4088,10 @@
         }
       }
     },
-    "clone": {
-      "version": "1.0.4",
-      "resolved": "http://registry.npm.taobao.org/clone/download/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
-    },
     "clone-deep": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "resolved": "https://registry.npm.taobao.org/clone-deep/download/clone-deep-4.0.1.tgz",
+      "integrity": "sha1-wZ/Zvbv4WUK0/ZechNz31fB8I4c=",
       "requires": {
         "is-plain-object": "^2.0.4",
         "kind-of": "^6.0.2",
@@ -2915,38 +4100,30 @@
       "dependencies": {
         "kind-of": {
           "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+          "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+          "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
         }
       }
     },
     "clsx": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.0.tgz",
-      "integrity": "sha512-3avwM37fSK5oP6M5rQ9CNe99lwxhXDOeSWVPAOYF6OazUTgZCMb0yWlJpmdD74REy1gkEaFiub2ULv4fq9GUhA=="
+      "resolved": "https://registry.npm.taobao.org/clsx/download/clsx-1.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fclsx%2Fdownload%2Fclsx-1.1.0.tgz",
+      "integrity": "sha1-YpN8at/qdxJHw0tU0yD7mWJPVwI="
     },
     "co": {
       "version": "4.6.0",
       "resolved": "http://registry.npm.taobao.org/co/download/co-4.6.0.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
     },
-    "coa": {
-      "version": "1.0.4",
-      "resolved": "http://registry.npm.taobao.org/coa/download/coa-1.0.4.tgz",
-      "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
-      "requires": {
-        "q": "^1.1.2"
-      }
-    },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "http://registry.npm.taobao.org/code-point-at/download/code-point-at-1.1.0.tgz",
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
     "codemirror": {
-      "version": "5.51.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.51.0.tgz",
-      "integrity": "sha512-vyuYYRv3eXL0SCuZA4spRFlKNzQAewHcipRQCOKgRy7VNAvZxTKzbItdbCl4S5AgPZ5g3WkHp+ibWQwv9TLG7Q=="
+      "version": "5.53.0",
+      "resolved": "https://registry.npm.taobao.org/codemirror/download/codemirror-5.53.0.tgz",
+      "integrity": "sha1-fVw3M4jia7kCCC2nSaDoztv+K5U="
     },
     "collection-visit": {
       "version": "1.0.0",
@@ -2957,16 +4134,6 @@
         "object-visit": "^1.0.0"
       }
     },
-    "color": {
-      "version": "0.11.4",
-      "resolved": "http://registry.npm.taobao.org/color/download/color-0.11.4.tgz",
-      "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
-      "requires": {
-        "clone": "^1.0.2",
-        "color-convert": "^1.3.0",
-        "color-string": "^0.3.0"
-      }
-    },
     "color-convert": {
       "version": "1.9.3",
       "resolved": "http://registry.npm.taobao.org/color-convert/download/color-convert-1.9.3.tgz",
@@ -2980,29 +4147,6 @@
       "resolved": "http://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz",
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
-    "color-string": {
-      "version": "0.3.0",
-      "resolved": "http://registry.npm.taobao.org/color-string/download/color-string-0.3.0.tgz",
-      "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
-      "requires": {
-        "color-name": "^1.0.0"
-      }
-    },
-    "colormin": {
-      "version": "1.1.2",
-      "resolved": "http://registry.npm.taobao.org/colormin/download/colormin-1.1.2.tgz",
-      "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
-      "requires": {
-        "color": "^0.11.0",
-        "css-color-names": "0.0.4",
-        "has": "^1.0.1"
-      }
-    },
-    "colors": {
-      "version": "1.1.2",
-      "resolved": "http://registry.npm.taobao.org/colors/download/colors-1.1.2.tgz",
-      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM="
-    },
     "combined-stream": {
       "version": "1.0.7",
       "resolved": "http://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.7.tgz",
@@ -3030,9 +4174,9 @@
       }
     },
     "component-emitter": {
-      "version": "1.2.1",
-      "resolved": "http://registry.npm.taobao.org/component-emitter/download/component-emitter-1.2.1.tgz",
-      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+      "version": "1.3.0",
+      "resolved": "https://registry.npm.taobao.org/component-emitter/download/component-emitter-1.3.0.tgz",
+      "integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A="
     },
     "component-indexof": {
       "version": "0.0.3",
@@ -3040,11 +4184,18 @@
       "integrity": "sha1-EdCRMSI5648yyPJa6csAL/6NPCQ="
     },
     "compressible": {
-      "version": "2.0.16",
-      "resolved": "http://registry.npm.taobao.org/compressible/download/compressible-2.0.16.tgz",
-      "integrity": "sha1-pJv5hY84IbZM4b4Clq/HOARmp38=",
+      "version": "2.0.18",
+      "resolved": "https://registry.npm.taobao.org/compressible/download/compressible-2.0.18.tgz?cache=0&sync_timestamp=1578286264482&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcompressible%2Fdownload%2Fcompressible-2.0.18.tgz",
+      "integrity": "sha1-r1PMprBw1MPAdQ+9dyhqbXzEb7o=",
       "requires": {
-        "mime-db": ">= 1.38.0 < 2"
+        "mime-db": ">= 1.43.0 < 2"
+      },
+      "dependencies": {
+        "mime-db": {
+          "version": "1.43.0",
+          "resolved": "https://registry.npm.taobao.org/mime-db/download/mime-db-1.43.0.tgz",
+          "integrity": "sha1-ChLgUCZQ5HPXNVNQUOfI9OtPrlg="
+        }
       }
     },
     "compression": {
@@ -3078,8 +4229,8 @@
     },
     "compression-webpack-plugin": {
       "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-1.1.12.tgz",
-      "integrity": "sha512-UpBXSHbrCSdSZieAffqXlAQpLO2fikVVRYibrWlbHYzKpOw1Y4jwkVZ/+S91GzWuJvXSbc8SBy/e8fQJh8uEMQ==",
+      "resolved": "https://registry.npm.taobao.org/compression-webpack-plugin/download/compression-webpack-plugin-1.1.12.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcompression-webpack-plugin%2Fdownload%2Fcompression-webpack-plugin-1.1.12.tgz",
+      "integrity": "sha1-vs0q7GIKzpa7P+mkKlXPSKzItNQ=",
       "dev": true,
       "requires": {
         "cacache": "^10.0.1",
@@ -3138,26 +4289,31 @@
       "integrity": "sha1-NSrVNAyj0pbn66wUrc94nriiDgw=",
       "requires": {
         "immutable": "^3.8.1"
+      },
+      "dependencies": {
+        "immutable": {
+          "version": "3.8.2",
+          "resolved": "https://registry.npm.taobao.org/immutable/download/immutable-3.8.2.tgz",
+          "integrity": "sha1-wkOZUUVbs5kT2vKBN28VMOEErfM="
+        }
       }
     },
     "console-browserify": {
-      "version": "1.1.0",
-      "resolved": "http://registry.npm.taobao.org/console-browserify/download/console-browserify-1.1.0.tgz",
-      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-      "requires": {
-        "date-now": "^0.1.4"
-      }
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/console-browserify/download/console-browserify-1.2.0.tgz",
+      "integrity": "sha1-ZwY871fOts9Jk6KrOlWECujEkzY=",
+      "dev": true
     },
     "console-control-strings": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true
+      "resolved": "https://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "constants-browserify": {
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/constants-browserify/download/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
     },
     "contains-path": {
       "version": "0.1.0",
@@ -3165,9 +4321,13 @@
       "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo="
     },
     "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "http://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+      "version": "0.5.3",
+      "resolved": "https://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcontent-disposition%2Fdownload%2Fcontent-disposition-0.5.3.tgz",
+      "integrity": "sha1-4TDK9+cnkIfFYWwgB9BIVpiYT70=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
     },
     "content-type": {
       "version": "1.0.4",
@@ -3181,7 +4341,7 @@
     },
     "contour_plot": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/contour_plot/-/contour_plot-0.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/contour_plot/download/contour_plot-0.0.1.tgz",
       "integrity": "sha1-R1hw8DK44zhBKqX8UHiA8L9JXHc="
     },
     "convert-source-map": {
@@ -3204,8 +4364,8 @@
     },
     "copy-concurrently": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "resolved": "https://registry.npm.taobao.org/copy-concurrently/download/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha1-kilzmMrjSTf8r9bsgTnBgFHwteA=",
       "dev": true,
       "requires": {
         "aproba": "^1.1.1",
@@ -3222,9 +4382,9 @@
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
     },
     "copy-to-clipboard": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.2.1.tgz",
-      "integrity": "sha512-btru1Q6RD9wbonIvEU5EfnhIRGHLo//BGXQ1hNAD2avIs/nBZlpbOeKtv3mhoUByN4DB9Cb6/vXBymj1S43KmA==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npm.taobao.org/copy-to-clipboard/download/copy-to-clipboard-3.3.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcopy-to-clipboard%2Fdownload%2Fcopy-to-clipboard-3.3.1.tgz",
+      "integrity": "sha1-EVqhqZmP+rYZb5MHatbaO5E2Yq4=",
       "requires": {
         "toggle-selection": "^1.0.6"
       }
@@ -3254,9 +4414,9 @@
       },
       "dependencies": {
         "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+          "version": "1.2.0",
+          "resolved": "http://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         }
       }
     },
@@ -3264,6 +4424,7 @@
       "version": "4.0.3",
       "resolved": "http://registry.npm.taobao.org/create-ecdh/download/create-ecdh-4.0.3.tgz",
       "integrity": "sha1-yREbbzMEXEaX8UR4f5JUzcd8Rf8=",
+      "dev": true,
       "requires": {
         "bn.js": "^4.1.0",
         "elliptic": "^6.0.0"
@@ -3281,6 +4442,7 @@
       "version": "1.2.0",
       "resolved": "http://registry.npm.taobao.org/create-hash/download/create-hash-1.2.0.tgz",
       "integrity": "sha1-iJB4rxGmN1a8+1m9IhmWvjqe8ZY=",
+      "dev": true,
       "requires": {
         "cipher-base": "^1.0.1",
         "inherits": "^2.0.1",
@@ -3293,6 +4455,7 @@
       "version": "1.1.7",
       "resolved": "http://registry.npm.taobao.org/create-hmac/download/create-hmac-1.1.7.tgz",
       "integrity": "sha1-aRcMeLOrlXFHsriwRXLkfq0iQ/8=",
+      "dev": true,
       "requires": {
         "cipher-base": "^1.0.3",
         "create-hash": "^1.1.0",
@@ -3312,10 +4475,24 @@
         "object-assign": "^4.1.1"
       }
     },
-    "cropperjs": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npm.taobao.org/cropperjs/download/cropperjs-0.7.2.tgz",
-      "integrity": "sha512-4un9nk/TuWEIXPYYez2eU9f5yl5vnnOb3xgbCqnM0YbFW9DMuvBtyk5SRnpjn2DKHtCRMKJptWLYdIocjmeJhQ=="
+    "create-react-context": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npm.taobao.org/create-react-context/download/create-react-context-0.3.0.tgz",
+      "integrity": "sha1-VG3t6dxCLe8NP8L+A6/gvA9PfYw=",
+      "requires": {
+        "gud": "^1.0.0",
+        "warning": "^4.0.3"
+      },
+      "dependencies": {
+        "warning": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npm.taobao.org/warning/download/warning-4.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwarning%2Fdownload%2Fwarning-4.0.3.tgz",
+          "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=",
+          "requires": {
+            "loose-envify": "^1.0.0"
+          }
+        }
+      }
     },
     "cross-spawn": {
       "version": "5.1.0",
@@ -3329,13 +4506,14 @@
     },
     "crypt": {
       "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/crypt/download/crypt-0.0.2.tgz",
       "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
     },
     "crypto-browserify": {
       "version": "3.12.0",
       "resolved": "http://registry.npm.taobao.org/crypto-browserify/download/crypto-browserify-3.12.0.tgz",
       "integrity": "sha1-OWz58xN/A+S45TLFj2mCVOAPgOw=",
+      "dev": true,
       "requires": {
         "browserify-cipher": "^1.0.0",
         "browserify-sign": "^4.0.0",
@@ -3377,66 +4555,10 @@
       "resolved": "http://registry.npm.taobao.org/css-color-keywords/download/css-color-keywords-1.0.0.tgz",
       "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU="
     },
-    "css-color-names": {
-      "version": "0.0.4",
-      "resolved": "http://registry.npm.taobao.org/css-color-names/download/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA="
-    },
-    "css-loader": {
-      "version": "0.28.7",
-      "resolved": "http://registry.npm.taobao.org/css-loader/download/css-loader-0.28.7.tgz",
-      "integrity": "sha1-Xy7pid0y7dkHcX+VMxdlYWCZnBs=",
-      "requires": {
-        "babel-code-frame": "^6.11.0",
-        "css-selector-tokenizer": "^0.7.0",
-        "cssnano": ">=2.6.1 <4",
-        "icss-utils": "^2.1.0",
-        "loader-utils": "^1.0.2",
-        "lodash.camelcase": "^4.3.0",
-        "object-assign": "^4.0.1",
-        "postcss": "^5.0.6",
-        "postcss-modules-extract-imports": "^1.0.0",
-        "postcss-modules-local-by-default": "^1.0.1",
-        "postcss-modules-scope": "^1.0.0",
-        "postcss-modules-values": "^1.1.0",
-        "postcss-value-parser": "^3.3.0",
-        "source-list-map": "^2.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
+<<<<<<< HEAD
     "css-select": {
       "version": "1.2.0",
-      "resolved": "http://registry.npm.taobao.org/css-select/download/css-select-1.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/css-select/download/css-select-1.2.0.tgz",
       "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
       "requires": {
         "boolbase": "~1.0.0",
@@ -3445,28 +4567,6 @@
         "nth-check": "~1.0.1"
       }
     },
-    "css-selector-tokenizer": {
-      "version": "0.7.1",
-      "resolved": "http://registry.npm.taobao.org/css-selector-tokenizer/download/css-selector-tokenizer-0.7.1.tgz",
-      "integrity": "sha1-oXcnGovKUBkXL0+JH8bu2cv2jV0=",
-      "requires": {
-        "cssesc": "^0.1.0",
-        "fastparse": "^1.1.1",
-        "regexpu-core": "^1.0.0"
-      },
-      "dependencies": {
-        "regexpu-core": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/regexpu-core/download/regexpu-core-1.0.0.tgz",
-          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
-          "requires": {
-            "regenerate": "^1.2.1",
-            "regjsgen": "^0.2.0",
-            "regjsparser": "^0.1.4"
-          }
-        }
-      }
-    },
     "css-to-react-native": {
       "version": "2.3.0",
       "resolved": "http://registry.npm.taobao.org/css-to-react-native/download/css-to-react-native-2.3.0.tgz",
@@ -3487,121 +4587,14 @@
     },
     "css-what": {
       "version": "2.1.3",
-      "resolved": "http://registry.npm.taobao.org/css-what/download/css-what-2.1.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/css-what/download/css-what-2.1.3.tgz?cache=0&sync_timestamp=1573341698559&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-what%2Fdownload%2Fcss-what-2.1.3.tgz",
       "integrity": "sha1-ptdgRXM2X+dGhsPzEcVlE9iChfI="
     },
     "cssesc": {
-      "version": "0.1.0",
-      "resolved": "http://registry.npm.taobao.org/cssesc/download/cssesc-0.1.0.tgz",
-      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q="
-    },
-    "cssnano": {
-      "version": "3.10.0",
-      "resolved": "http://registry.npm.taobao.org/cssnano/download/cssnano-3.10.0.tgz",
-      "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
-      "requires": {
-        "autoprefixer": "^6.3.1",
-        "decamelize": "^1.1.2",
-        "defined": "^1.0.0",
-        "has": "^1.0.1",
-        "object-assign": "^4.0.1",
-        "postcss": "^5.0.14",
-        "postcss-calc": "^5.2.0",
-        "postcss-colormin": "^2.1.8",
-        "postcss-convert-values": "^2.3.4",
-        "postcss-discard-comments": "^2.0.4",
-        "postcss-discard-duplicates": "^2.0.1",
-        "postcss-discard-empty": "^2.0.1",
-        "postcss-discard-overridden": "^0.1.1",
-        "postcss-discard-unused": "^2.2.1",
-        "postcss-filter-plugins": "^2.0.0",
-        "postcss-merge-idents": "^2.1.5",
-        "postcss-merge-longhand": "^2.0.1",
-        "postcss-merge-rules": "^2.0.3",
-        "postcss-minify-font-values": "^1.0.2",
-        "postcss-minify-gradients": "^1.0.1",
-        "postcss-minify-params": "^1.0.4",
-        "postcss-minify-selectors": "^2.0.4",
-        "postcss-normalize-charset": "^1.1.0",
-        "postcss-normalize-url": "^3.0.7",
-        "postcss-ordered-values": "^2.1.0",
-        "postcss-reduce-idents": "^2.2.2",
-        "postcss-reduce-initial": "^1.0.0",
-        "postcss-reduce-transforms": "^1.0.3",
-        "postcss-svgo": "^2.1.1",
-        "postcss-unique-selectors": "^2.0.2",
-        "postcss-value-parser": "^3.2.3",
-        "postcss-zindex": "^2.0.1"
-      },
-      "dependencies": {
-        "autoprefixer": {
-          "version": "6.7.7",
-          "resolved": "http://registry.npm.taobao.org/autoprefixer/download/autoprefixer-6.7.7.tgz",
-          "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
-          "requires": {
-            "browserslist": "^1.7.6",
-            "caniuse-db": "^1.0.30000634",
-            "normalize-range": "^0.1.2",
-            "num2fraction": "^1.2.2",
-            "postcss": "^5.2.16",
-            "postcss-value-parser": "^3.2.3"
-          }
-        },
-        "browserslist": {
-          "version": "1.7.7",
-          "resolved": "http://registry.npm.taobao.org/browserslist/download/browserslist-1.7.7.tgz",
-          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-          "requires": {
-            "caniuse-db": "^1.0.30000639",
-            "electron-to-chromium": "^1.2.7"
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "csso": {
-      "version": "2.3.2",
-      "resolved": "http://registry.npm.taobao.org/csso/download/csso-2.3.2.tgz",
-      "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
-      "requires": {
-        "clap": "^1.0.9",
-        "source-map": "^0.5.3"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        }
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz",
+      "integrity": "sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4=",
+      "dev": true
     },
     "cssom": {
       "version": "0.3.6",
@@ -3631,55 +4624,47 @@
     },
     "cyclist": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/cyclist/download/cyclist-1.0.1.tgz",
       "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
       "dev": true
     },
-    "d": {
-      "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/d/download/d-1.0.0.tgz",
-      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-      "requires": {
-        "es5-ext": "^0.10.9"
-      }
-    },
     "d3-color": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.0.tgz",
-      "integrity": "sha512-TzNPeJy2+iEepfiL92LAAB7fvnp/dV2YwANPVHdDWmYMm23qIJBYww3qT8I8C1wXrmrg4UWs7BKc2tKIgyjzHg=="
+      "resolved": "https://registry.npm.taobao.org/d3-color/download/d3-color-1.4.0.tgz",
+      "integrity": "sha1-icRamV7Xc7EzFPBkYN8m1gug7K8="
     },
     "d3-dispatch": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
-      "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
+      "resolved": "https://registry.npm.taobao.org/d3-dispatch/download/d3-dispatch-1.0.6.tgz",
+      "integrity": "sha1-ANN7zuTdjNl3Kd2JOgrCnKq6XVg="
     },
     "d3-ease": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.6.tgz",
-      "integrity": "sha512-SZ/lVU7LRXafqp7XtIcBdxnWl8yyLpgOmzAk0mWBI9gXNzLDx5ybZgnRbH9dN/yY5tzVBqCQ9avltSnqVwessQ=="
+      "resolved": "https://registry.npm.taobao.org/d3-ease/download/d3-ease-1.0.6.tgz",
+      "integrity": "sha1-69ttoi36wKIiIvLU2gb2bEFqDsA="
     },
     "d3-interpolate": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.6.tgz",
-      "integrity": "sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==",
+      "resolved": "https://registry.npm.taobao.org/d3-interpolate/download/d3-interpolate-1.1.6.tgz",
+      "integrity": "sha1-LPOVriOBgE3wiqG/dmt/l7X2j7Y=",
       "requires": {
         "d3-color": "1"
       }
     },
     "d3-selection": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.1.tgz",
-      "integrity": "sha512-BTIbRjv/m5rcVTfBs4AMBLKs4x8XaaLkwm28KWu9S2vKNqXkXt2AH2Qf0sdPZHjFxcWg/YL53zcqAz+3g4/7PA=="
+      "resolved": "https://registry.npm.taobao.org/d3-selection/download/d3-selection-1.4.1.tgz",
+      "integrity": "sha1-mO7bvghfvaW6+i+ePzovTX1iKpg="
     },
     "d3-timer": {
       "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz",
-      "integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="
+      "resolved": "https://registry.npm.taobao.org/d3-timer/download/d3-timer-1.0.10.tgz",
+      "integrity": "sha1-3+dripF0iDGxO22ceT/71QjdneU="
     },
     "d3-transition": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz",
-      "integrity": "sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==",
+      "resolved": "https://registry.npm.taobao.org/d3-transition/download/d3-transition-1.3.2.tgz",
+      "integrity": "sha1-qY7yFRvo2GAFQ0NMHKgBQK4js5g=",
       "requires": {
         "d3-color": "1",
         "d3-dispatch": "1",
@@ -3702,15 +4687,467 @@
         "assert-plus": "^1.0.0"
       }
     },
-    "date-fns": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
-      "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="
+    "data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/data-urls/download/data-urls-2.0.0.tgz",
+      "integrity": "sha1-FWSFpyljqXD11YIar2Qr7yvy25s=",
+      "requires": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+=======
+    "css-loader": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npm.taobao.org/css-loader/download/css-loader-3.5.2.tgz",
+      "integrity": "sha1-ZIOuVvSKf5Afvgfd4vyWsB6vqzw=",
+<<<<<<< HEAD
+=======
+      "requires": {
+        "camelcase": "^5.3.1",
+        "cssesc": "^3.0.0",
+        "icss-utils": "^4.1.1",
+        "loader-utils": "^1.2.3",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.27",
+        "postcss-modules-extract-imports": "^2.0.0",
+        "postcss-modules-local-by-default": "^3.0.2",
+        "postcss-modules-scope": "^2.2.0",
+        "postcss-modules-values": "^3.0.0",
+        "postcss-value-parser": "^4.0.3",
+        "schema-utils": "^2.6.5",
+        "semver": "^6.3.0"
+>>>>>>> 22e9ed32d0b11c3a43e6a9929e1072e6c78f3fa4
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.2",
+          "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.2.tgz?cache=0&sync_timestamp=1587338610933&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.2.tgz",
+          "integrity": "sha1-xinF7O0XuvMUQ3kY0tqIyZ1ZWM0=",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.4.1.tgz",
+          "integrity": "sha1-75FuJxxkrBIXH9g4TqrmsjRYVNo="
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz",
+          "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1585815676992&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
+              "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "fast-deep-equal": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha1-VFFFB3xQFJHjOxXsQIwpQ3bpSuQ="
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA="
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz",
+          "integrity": "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU="
+        },
+        "postcss": {
+          "version": "7.0.27",
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.27.tgz?cache=0&sync_timestamp=1581994803116&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.27.tgz",
+          "integrity": "sha1-zGfNxrDao3UQW3xCSoVWc0X8VNk=",
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "postcss-value-parser": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-4.0.3.tgz?cache=0&sync_timestamp=1582038347323&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-value-parser%2Fdownload%2Fpostcss-value-parser-4.0.3.tgz",
+          "integrity": "sha1-ZR/0WTqp7ajV0NZlk6JBeurrMl0="
+        },
+        "schema-utils": {
+          "version": "2.6.6",
+          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.6.6.tgz?cache=0&sync_timestamp=1587138145115&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-2.6.6.tgz",
+          "integrity": "sha1-KZ/mvUozZdwj2Z/URsr/jx1sMww=",
+          "requires": {
+            "ajv": "^6.12.0",
+            "ajv-keywords": "^3.4.1"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz",
+          "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0="
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
     },
-    "date-now": {
-      "version": "0.1.4",
-      "resolved": "http://registry.npm.taobao.org/date-now/download/date-now-0.1.4.tgz",
-      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
+    "css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/css-select/download/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "requires": {
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
+      }
+    },
+    "css-to-react-native": {
+      "version": "2.3.0",
+      "resolved": "http://registry.npm.taobao.org/css-to-react-native/download/css-to-react-native-2.3.0.tgz",
+      "integrity": "sha1-v4DSTsSgjkMDBu9CnAWG5u1Uhfc=",
+      "requires": {
+        "camelize": "^1.0.0",
+        "css-color-keywords": "^1.0.0",
+        "postcss-value-parser": "^3.3.0"
+      }
+    },
+    "css-vendor": {
+      "version": "0.3.8",
+      "resolved": "http://registry.npm.taobao.org/css-vendor/download/css-vendor-0.3.8.tgz",
+      "integrity": "sha1-ZCHP0wNM5mT+dnOXL9ARn8KJQfo=",
+      "requires": {
+        "is-in-browser": "^1.0.2"
+      }
+    },
+    "css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npm.taobao.org/css-what/download/css-what-2.1.3.tgz?cache=0&sync_timestamp=1573341698559&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-what%2Fdownload%2Fcss-what-2.1.3.tgz",
+      "integrity": "sha1-ptdgRXM2X+dGhsPzEcVlE9iChfI="
+    },
+    "cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz",
+      "integrity": "sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4="
+    },
+    "cssom": {
+      "version": "0.3.6",
+      "resolved": "http://registry.npm.taobao.org/cssom/download/cssom-0.3.6.tgz",
+      "integrity": "sha1-+FIGzuBO+oQfPFmCp0uparINZa0="
+    },
+    "cssstyle": {
+      "version": "0.2.37",
+      "resolved": "http://registry.npm.taobao.org/cssstyle/download/cssstyle-0.2.37.tgz",
+      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
+>>>>>>> f191fbe55a03f133615d827fc04311e6de41b163
+      "requires": {
+        "camelcase": "^5.3.1",
+        "cssesc": "^3.0.0",
+        "icss-utils": "^4.1.1",
+        "loader-utils": "^1.2.3",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.27",
+        "postcss-modules-extract-imports": "^2.0.0",
+        "postcss-modules-local-by-default": "^3.0.2",
+        "postcss-modules-scope": "^2.2.0",
+        "postcss-modules-values": "^3.0.0",
+        "postcss-value-parser": "^4.0.3",
+        "schema-utils": "^2.6.5",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.2",
+          "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.2.tgz?cache=0&sync_timestamp=1587338610933&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.2.tgz",
+          "integrity": "sha1-xinF7O0XuvMUQ3kY0tqIyZ1ZWM0=",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.4.1.tgz",
+          "integrity": "sha1-75FuJxxkrBIXH9g4TqrmsjRYVNo="
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz",
+          "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
+              "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "fast-deep-equal": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha1-VFFFB3xQFJHjOxXsQIwpQ3bpSuQ="
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA="
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz",
+          "integrity": "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU="
+        },
+        "postcss": {
+          "version": "7.0.27",
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.27.tgz?cache=0&sync_timestamp=1581994803116&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.27.tgz",
+          "integrity": "sha1-zGfNxrDao3UQW3xCSoVWc0X8VNk=",
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "postcss-value-parser": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-4.0.3.tgz?cache=0&sync_timestamp=1582038347323&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-value-parser%2Fdownload%2Fpostcss-value-parser-4.0.3.tgz",
+          "integrity": "sha1-ZR/0WTqp7ajV0NZlk6JBeurrMl0="
+        },
+        "schema-utils": {
+          "version": "2.6.6",
+          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.6.6.tgz?cache=0&sync_timestamp=1587138145115&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-2.6.6.tgz",
+          "integrity": "sha1-KZ/mvUozZdwj2Z/URsr/jx1sMww=",
+          "requires": {
+            "ajv": "^6.12.0",
+            "ajv-keywords": "^3.4.1"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz",
+          "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0="
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "css-select": {
+      "version": "1.2.0",
+      "resolved": "http://registry.npm.taobao.org/css-select/download/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "requires": {
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
+      }
+    },
+    "css-to-react-native": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npm.taobao.org/css-to-react-native/download/css-to-react-native-2.3.2.tgz",
+      "integrity": "sha1-514vj3qjhbTDYRxSsHS3CgAvLn0=",
+      "requires": {
+        "camelize": "^1.0.0",
+        "css-color-keywords": "^1.0.0",
+        "postcss-value-parser": "^3.3.0"
+      }
+    },
+    "css-vendor": {
+      "version": "0.3.8",
+      "resolved": "http://registry.npm.taobao.org/css-vendor/download/css-vendor-0.3.8.tgz",
+      "integrity": "sha1-ZCHP0wNM5mT+dnOXL9ARn8KJQfo=",
+      "requires": {
+        "is-in-browser": "^1.0.2"
+      }
+    },
+    "css-what": {
+      "version": "2.1.3",
+      "resolved": "http://registry.npm.taobao.org/css-what/download/css-what-2.1.3.tgz",
+      "integrity": "sha1-ptdgRXM2X+dGhsPzEcVlE9iChfI="
+    },
+    "cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz",
+      "integrity": "sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4="
+    },
+    "cssom": {
+      "version": "0.3.6",
+      "resolved": "http://registry.npm.taobao.org/cssom/download/cssom-0.3.6.tgz",
+      "integrity": "sha1-+FIGzuBO+oQfPFmCp0uparINZa0="
+    },
+    "cssstyle": {
+      "version": "0.2.37",
+      "resolved": "http://registry.npm.taobao.org/cssstyle/download/cssstyle-0.2.37.tgz",
+      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
+      "requires": {
+        "cssom": "0.3.x"
+      }
+    },
+    "csstype": {
+      "version": "2.6.3",
+      "resolved": "http://registry.npm.taobao.org/csstype/download/csstype-2.6.3.tgz",
+      "integrity": "sha1-twHlloJFv5sI1UrIPQC2JOYiqfo="
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "http://registry.npm.taobao.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "requires": {
+        "array-find-index": "^1.0.1"
+      }
+    },
+    "cyclist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/cyclist/download/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
+      "dev": true
+    },
+    "d3-color": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npm.taobao.org/d3-color/download/d3-color-1.4.1.tgz",
+      "integrity": "sha1-xSACv4hGraRCTVXZeYL+8m6zvIo="
+    },
+    "d3-dispatch": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npm.taobao.org/d3-dispatch/download/d3-dispatch-1.0.6.tgz",
+      "integrity": "sha1-ANN7zuTdjNl3Kd2JOgrCnKq6XVg="
+    },
+    "d3-ease": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npm.taobao.org/d3-ease/download/d3-ease-1.0.6.tgz",
+      "integrity": "sha1-69ttoi36wKIiIvLU2gb2bEFqDsA="
+    },
+    "d3-interpolate": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npm.taobao.org/d3-interpolate/download/d3-interpolate-1.1.6.tgz",
+      "integrity": "sha1-LPOVriOBgE3wiqG/dmt/l7X2j7Y=",
+      "requires": {
+        "d3-color": "1"
+      }
+    },
+    "d3-selection": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npm.taobao.org/d3-selection/download/d3-selection-1.4.1.tgz",
+      "integrity": "sha1-mO7bvghfvaW6+i+ePzovTX1iKpg="
+    },
+    "d3-timer": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npm.taobao.org/d3-timer/download/d3-timer-1.0.10.tgz",
+      "integrity": "sha1-3+dripF0iDGxO22ceT/71QjdneU="
+    },
+    "d3-transition": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npm.taobao.org/d3-transition/download/d3-transition-1.3.2.tgz",
+      "integrity": "sha1-qY7yFRvo2GAFQ0NMHKgBQK4js5g=",
+      "requires": {
+        "d3-color": "1",
+        "d3-dispatch": "1",
+        "d3-ease": "1",
+        "d3-interpolate": "1",
+        "d3-selection": "^1.1.0",
+        "d3-timer": "1"
+      }
+    },
+    "damerau-levenshtein": {
+      "version": "1.0.4",
+      "resolved": "http://registry.npm.taobao.org/damerau-levenshtein/download/damerau-levenshtein-1.0.4.tgz",
+      "integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ="
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "http://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/data-urls/download/data-urls-2.0.0.tgz",
+      "integrity": "sha1-FWSFpyljqXD11YIar2Qr7yvy25s=",
+      "requires": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      },
+      "dependencies": {
+        "abab": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npm.taobao.org/abab/download/abab-2.0.3.tgz",
+          "integrity": "sha1-Yj4gdeAustPyR15J+ZyRhGRnkHo="
+        },
+        "tr46": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npm.taobao.org/tr46/download/tr46-2.0.2.tgz",
+          "integrity": "sha1-Ayc1ht7xWVrgj+2zjXczzukdJHk=",
+          "requires": {
+            "punycode": "^2.1.1"
+          }
+        },
+        "webidl-conversions": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npm.taobao.org/webidl-conversions/download/webidl-conversions-5.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebidl-conversions%2Fdownload%2Fwebidl-conversions-5.0.0.tgz",
+          "integrity": "sha1-rlnIoAsSFUOirMZcBDT1ew/BGv8="
+        },
+        "whatwg-url": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npm.taobao.org/whatwg-url/download/whatwg-url-8.0.0.tgz",
+          "integrity": "sha1-N/JWy3RjmOGbEHvW74ILSuLRWHE=",
+          "requires": {
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^2.0.0",
+            "webidl-conversions": "^5.0.0"
+          }
+        }
+      }
+    },
+    "date-fns": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npm.taobao.org/date-fns/download/date-fns-2.12.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdate-fns%2Fdownload%2Fdate-fns-2.12.0.tgz",
+      "integrity": "sha1-AXVMii8zaPwRGc9GJcPa2MGEXuY="
     },
     "debug": {
       "version": "3.2.6",
@@ -3725,6 +5162,11 @@
       "resolved": "http://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
+    "decimal.js": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npm.taobao.org/decimal.js/download/decimal.js-10.2.0.tgz",
+      "integrity": "sha1-OUZhE6ngNhEdAvgkibX9awte0jE="
+    },
     "decode-uri-component": {
       "version": "0.2.0",
       "resolved": "http://registry.npm.taobao.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz",
@@ -3750,6 +5192,60 @@
       "resolved": "http://registry.npm.taobao.org/deepmerge/download/deepmerge-2.2.1.tgz",
       "integrity": "sha1-XT/yKgHAD2RUBaL7wX0HeKGAEXA="
     },
+    "default-gateway": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npm.taobao.org/default-gateway/download/default-gateway-4.2.0.tgz",
+      "integrity": "sha1-FnEEx1AMIRX23WmwpTa7jtcgVSs=",
+      "requires": {
+        "execa": "^1.0.0",
+        "ip-regex": "^2.1.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz",
+          "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/execa/download/execa-1.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fexeca%2Fdownload%2Fexeca-1.0.0.tgz",
+          "integrity": "sha1-xiNqW7TfbW8V6I5/AXeYIWdJ3dg=",
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npm.taobao.org/get-stream/download/get-stream-4.1.0.tgz",
+          "integrity": "sha1-wbJVV189wh1Zv8ec09K0axw6VLU=",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz",
+          "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=",
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
     "default-require-extensions": {
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/default-require-extensions/download/default-require-extensions-1.0.0.tgz",
@@ -3767,12 +5263,11 @@
       }
     },
     "define-property": {
-      "version": "2.0.2",
-      "resolved": "http://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
-      "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
       "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
+        "is-descriptor": "^1.0.0"
       },
       "dependencies": {
         "is-accessor-descriptor": {
@@ -3801,15 +5296,10 @@
             "kind-of": "^6.0.2"
           }
         },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "http://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-        },
         "kind-of": {
           "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+          "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+          "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
         }
       }
     },
@@ -3830,6 +5320,21 @@
         "pify": "^2.0.0",
         "pinkie-promise": "^2.0.0",
         "rimraf": "^2.2.8"
+      },
+      "dependencies": {
+        "globby": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npm.taobao.org/globby/download/globby-5.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobby%2Fdownload%2Fglobby-5.0.0.tgz",
+          "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+          "requires": {
+            "array-union": "^1.0.1",
+            "arrify": "^1.0.0",
+            "glob": "^7.0.3",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        }
       }
     },
     "delayed-stream": {
@@ -3839,14 +5344,13 @@
     },
     "delegate": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
-      "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+      "resolved": "https://registry.npm.taobao.org/delegate/download/delegate-3.2.0.tgz",
+      "integrity": "sha1-tmtxwxWFIuirV0T3INjKDCr1kWY="
     },
     "delegates": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true
+      "resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdelegates%2Fdownload%2Fdelegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
     "depd": {
       "version": "1.1.2",
@@ -3854,9 +5358,10 @@
       "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
     },
     "des.js": {
-      "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/des.js/download/des.js-1.0.0.tgz",
-      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/des.js/download/des.js-1.0.1.tgz",
+      "integrity": "sha1-U4IULhvcU/hdhtU+X0qn3rkeCEM=",
+      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "minimalistic-assert": "^1.0.0"
@@ -3867,6 +5372,11 @@
       "resolved": "http://registry.npm.taobao.org/destroy/download/destroy-1.0.4.tgz",
       "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
     },
+    "detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/detect-file/download/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc="
+    },
     "detect-indent": {
       "version": "4.0.0",
       "resolved": "http://registry.npm.taobao.org/detect-indent/download/detect-indent-4.0.0.tgz",
@@ -3875,6 +5385,12 @@
         "repeating": "^2.0.0"
       }
     },
+    "detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npm.taobao.org/detect-libc/download/detect-libc-1.0.3.tgz",
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "optional": true
+    },
     "detect-node": {
       "version": "2.0.4",
       "resolved": "http://registry.npm.taobao.org/detect-node/download/detect-node-2.0.4.tgz",
@@ -3913,12 +5429,37 @@
       "version": "5.0.3",
       "resolved": "http://registry.npm.taobao.org/diffie-hellman/download/diffie-hellman-5.0.3.tgz",
       "integrity": "sha1-QOjumPVaIUlgcUaSHGPhrl89KHU=",
+      "dev": true,
       "requires": {
         "bn.js": "^4.1.0",
         "miller-rabin": "^4.0.0",
         "randombytes": "^2.0.0"
       }
     },
+    "dir-glob": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/dir-glob/download/dir-glob-2.0.0.tgz",
+      "integrity": "sha1-CyBdK2rvmCOMooZZioIE0p0KADQ=",
+      "requires": {
+        "arrify": "^1.0.1",
+        "path-type": "^3.0.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/path-type/download/path-type-3.0.0.tgz",
+          "integrity": "sha1-zvMdyOCho7sNEFwM2Xzzv0f0428=",
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/pify/download/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+        }
+      }
+    },
     "dns-equal": {
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/dns-equal/download/dns-equal-1.0.0.tgz",
@@ -3956,7 +5497,7 @@
     },
     "dom-closest": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz",
       "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
       "requires": {
         "dom-matches": ">=1.0.1"
@@ -3995,12 +5536,12 @@
     },
     "dom-lib": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/dom-lib/-/dom-lib-1.2.1.tgz",
-      "integrity": "sha512-sx7X6iK0jidoY0xR/a/a3zOW6aLRuikb8E+3H5l5j4cgYmxXRvH1VcLf7w+FK77F8EAOt7td6ILmh1pyE/xDJA=="
+      "resolved": "https://registry.npm.taobao.org/dom-lib/download/dom-lib-1.2.1.tgz",
+      "integrity": "sha1-PXjFR/m3SZzjTRZld4elTHTPTjA="
     },
     "dom-matches": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz",
       "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw="
     },
     "dom-scroll-into-view": {
@@ -4009,12 +5550,19 @@
       "integrity": "sha1-6PNnMt0ImwIBqI14Fdw/iObWbH4="
     },
     "dom-serializer": {
-      "version": "0.1.1",
-      "resolved": "http://registry.npm.taobao.org/dom-serializer/download/dom-serializer-0.1.1.tgz",
-      "integrity": "sha1-HsQFnihLq+027sKUHUqXChic58A=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npm.taobao.org/dom-serializer/download/dom-serializer-0.2.2.tgz",
+      "integrity": "sha1-GvuB9TNxcXXUeGVd68XjMtn5u1E=",
       "requires": {
-        "domelementtype": "^1.3.0",
-        "entities": "^1.1.1"
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npm.taobao.org/domelementtype/download/domelementtype-2.0.1.tgz",
+          "integrity": "sha1-H4vf6R9aeAYydOgDtL3O326U+U0="
+        }
       }
     },
     "dom-urls": {
@@ -4033,13 +5581,29 @@
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "http://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz",
-      "integrity": "sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto="
+      "integrity": "sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto=",
+      "dev": true
     },
     "domelementtype": {
       "version": "1.3.1",
       "resolved": "http://registry.npm.taobao.org/domelementtype/download/domelementtype-1.3.1.tgz",
       "integrity": "sha1-0EjESzew0Qp/Kj1f7j9DM9eQSB8="
     },
+    "domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npm.taobao.org/domexception/download/domexception-2.0.1.tgz?cache=0&sync_timestamp=1576355459111&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomexception%2Fdownload%2Fdomexception-2.0.1.tgz",
+      "integrity": "sha1-+0Su+6eT4VdLCvau0oAdBXUp8wQ=",
+      "requires": {
+        "webidl-conversions": "^5.0.0"
+      },
+      "dependencies": {
+        "webidl-conversions": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npm.taobao.org/webidl-conversions/download/webidl-conversions-5.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebidl-conversions%2Fdownload%2Fwebidl-conversions-5.0.0.tgz",
+          "integrity": "sha1-rlnIoAsSFUOirMZcBDT1ew/BGv8="
+        }
+      }
+    },
     "domhandler": {
       "version": "2.4.2",
       "resolved": "http://registry.npm.taobao.org/domhandler/download/domhandler-2.4.2.tgz",
@@ -4057,6 +5621,15 @@
         "domelementtype": "1"
       }
     },
+    "dot-case": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npm.taobao.org/dot-case/download/dot-case-3.0.3.tgz",
+      "integrity": "sha1-IdO1Lvqroupf2odbsaqBJFIc9Ko=",
+      "requires": {
+        "no-case": "^3.0.3",
+        "tslib": "^1.10.0"
+      }
+    },
     "dot-prop": {
       "version": "4.2.0",
       "resolved": "http://registry.npm.taobao.org/dot-prop/download/dot-prop-4.2.0.tgz",
@@ -4077,27 +5650,20 @@
     },
     "dotignore": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/dotignore/-/dotignore-0.1.2.tgz",
-      "integrity": "sha512-UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw==",
+      "resolved": "https://registry.npm.taobao.org/dotignore/download/dotignore-0.1.2.tgz",
+      "integrity": "sha1-+ULyIA0ow6dvvdbw7p8yV8ii6QU=",
       "requires": {
         "minimatch": "^3.0.4"
       }
     },
     "draft-js": {
       "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.10.5.tgz",
-      "integrity": "sha512-LE6jSCV9nkPhfVX2ggcRLA4FKs6zWq9ceuO/88BpXdNCS7mjRTgs0NsV6piUCJX9YxMsB9An33wnkMmU2sD2Zg==",
+      "resolved": "https://registry.npm.taobao.org/draft-js/download/draft-js-0.10.5.tgz",
+      "integrity": "sha1-v6m+sBj+BTPbsI1mdcNxprCPp0I=",
       "requires": {
         "fbjs": "^0.8.15",
         "immutable": "~3.7.4",
         "object-assign": "^4.1.0"
-      },
-      "dependencies": {
-        "immutable": {
-          "version": "3.7.6",
-          "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz",
-          "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks="
-        }
       }
     },
     "duplexer": {
@@ -4112,8 +5678,8 @@
     },
     "duplexify": {
       "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "resolved": "https://registry.npm.taobao.org/duplexify/download/duplexify-3.7.1.tgz",
+      "integrity": "sha1-Kk31MX9sz9kfhtb9JdjYoQO4gwk=",
       "dev": true,
       "requires": {
         "end-of-stream": "^1.0.0",
@@ -4132,16 +5698,16 @@
       }
     },
     "echarts": {
-      "version": "4.2.1",
-      "resolved": "http://registry.npm.taobao.org/echarts/download/echarts-4.2.1.tgz",
-      "integrity": "sha1-mo6jsDNU+G+CTZdiXDNM8Wll7wM=",
+      "version": "4.7.0",
+      "resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.7.0.tgz",
+      "integrity": "sha1-Wzh1pML5HjkpQl+rq56s5+QJiz8=",
       "requires": {
-        "zrender": "4.0.7"
+        "zrender": "4.3.0"
       }
     },
     "editor.md": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/editor.md/-/editor.md-1.5.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/editor.md/download/editor.md-1.5.0.tgz",
       "integrity": "sha1-b+Y2qIo5uFYT9T7ubst7c0irI78="
     },
     "ee-first": {
@@ -4150,9 +5716,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "ejs": {
-      "version": "2.6.1",
-      "resolved": "http://registry.npm.taobao.org/ejs/download/ejs-2.6.1.tgz",
-      "integrity": "sha1-SY7A1JVlWrxvI81hho2SZGQHGqA=",
+      "version": "2.7.4",
+      "resolved": "https://registry.npm.taobao.org/ejs/download/ejs-2.7.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fejs%2Fdownload%2Fejs-2.7.4.tgz",
+      "integrity": "sha1-SGYSh1c9zFPjZsehrlLDoSDuybo=",
       "dev": true
     },
     "electron-to-chromium": {
@@ -4162,13 +5728,14 @@
     },
     "element-resize-event": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/element-resize-event/-/element-resize-event-3.0.3.tgz",
-      "integrity": "sha512-vhGNxT87PdZA6Ak4E0QhArwGzNcSPUwSN7n9wCFLeBlY2NNuuiwguQuQIp7P5oB65PLJ892yKcHiqz1xLWeiug=="
+      "resolved": "https://registry.npm.taobao.org/element-resize-event/download/element-resize-event-3.0.3.tgz",
+      "integrity": "sha1-P1n6zva48j+9Z4pfNk7lcjr5iio="
     },
     "elliptic": {
-      "version": "6.4.1",
-      "resolved": "http://registry.npm.taobao.org/elliptic/download/elliptic-6.4.1.tgz",
-      "integrity": "sha1-wtC3d2kRuGcixjLDwGxg8vgZk5o=",
+      "version": "6.5.2",
+      "resolved": "https://registry.npm.taobao.org/elliptic/download/elliptic-6.5.2.tgz",
+      "integrity": "sha1-BcVnjXFzwEnYykM1UiJKSV0ON2I=",
+      "dev": true,
       "requires": {
         "bn.js": "^4.4.0",
         "brorand": "^1.0.1",
@@ -4204,22 +5771,33 @@
     },
     "end-of-stream": {
       "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
+      "resolved": "https://registry.npm.taobao.org/end-of-stream/download/end-of-stream-1.4.4.tgz",
+      "integrity": "sha1-WuZKX0UFe682JuwU2gyl5LJDHrA=",
       "requires": {
         "once": "^1.4.0"
       }
     },
     "enhanced-resolve": {
-      "version": "3.4.1",
-      "resolved": "http://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-3.4.1.tgz",
-      "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+      "version": "4.1.1",
+      "resolved": "https://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-4.1.1.tgz?cache=0&sync_timestamp=1572991764265&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-4.1.1.tgz",
+      "integrity": "sha1-KTfiuAZs0P584JkKmPDXGjUYn2Y=",
+      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
-        "object-assign": "^4.0.1",
-        "tapable": "^0.2.7"
+        "memory-fs": "^0.5.0",
+        "tapable": "^1.0.0"
+      },
+      "dependencies": {
+        "memory-fs": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npm.taobao.org/memory-fs/download/memory-fs-0.5.0.tgz?cache=0&sync_timestamp=1570537491040&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmemory-fs%2Fdownload%2Fmemory-fs-0.5.0.tgz",
+          "integrity": "sha1-MkwBKIuIZSlm0WHbd4OHIIRajjw=",
+          "dev": true,
+          "requires": {
+            "errno": "^0.1.3",
+            "readable-stream": "^2.0.1"
+          }
+        }
       }
     },
     "enquire.js": {
@@ -4228,9 +5806,9 @@
       "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ="
     },
     "entities": {
-      "version": "1.1.2",
-      "resolved": "http://registry.npm.taobao.org/entities/download/entities-1.1.2.tgz",
-      "integrity": "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY="
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/entities/download/entities-2.0.0.tgz",
+      "integrity": "sha1-aNYITKsbB5dnVA2A5Wo5tCPkq/Q="
     },
     "errno": {
       "version": "0.1.7",
@@ -4271,76 +5849,11 @@
         "is-symbol": "^1.0.2"
       }
     },
-    "es5-ext": {
-      "version": "0.10.49",
-      "resolved": "http://registry.npm.taobao.org/es5-ext/download/es5-ext-0.10.49.tgz",
-      "integrity": "sha1-BZojnehiyUSU/sKPgVDJdwKMbF4=",
-      "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.1",
-        "next-tick": "^1.0.0"
-      }
-    },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "http://registry.npm.taobao.org/es6-iterator/download/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "es6-map": {
-      "version": "0.1.5",
-      "resolved": "http://registry.npm.taobao.org/es6-map/download/es6-map-0.1.5.tgz",
-      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-set": "~0.1.5",
-        "es6-symbol": "~3.1.1",
-        "event-emitter": "~0.3.5"
-      }
-    },
     "es6-promise": {
       "version": "4.2.6",
       "resolved": "http://registry.npm.taobao.org/es6-promise/download/es6-promise-4.2.6.tgz",
       "integrity": "sha1-toXt2CWIhjZepitX0w3ij63Nl08="
     },
-    "es6-set": {
-      "version": "0.1.5",
-      "resolved": "http://registry.npm.taobao.org/es6-set/download/es6-set-0.1.5.tgz",
-      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "~0.3.5"
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.1",
-      "resolved": "http://registry.npm.taobao.org/es6-symbol/download/es6-symbol-3.1.1.tgz",
-      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
-    "es6-weak-map": {
-      "version": "2.0.2",
-      "resolved": "http://registry.npm.taobao.org/es6-weak-map/download/es6-weak-map-2.0.2.tgz",
-      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.14",
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
-      }
-    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "http://registry.npm.taobao.org/escape-html/download/escape-html-1.0.3.tgz",
@@ -4370,17 +5883,6 @@
         }
       }
     },
-    "escope": {
-      "version": "3.6.0",
-      "resolved": "http://registry.npm.taobao.org/escope/download/escope-3.6.0.tgz",
-      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
-      "requires": {
-        "es6-map": "^0.1.3",
-        "es6-weak-map": "^2.0.1",
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
     "eslint": {
       "version": "4.10.0",
       "resolved": "http://registry.npm.taobao.org/eslint/download/eslint-4.10.0.tgz",
@@ -4445,6 +5947,27 @@
           "resolved": "http://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz",
           "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE="
         },
+        "inquirer": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npm.taobao.org/inquirer/download/inquirer-3.3.0.tgz",
+          "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=",
+          "requires": {
+            "ansi-escapes": "^3.0.0",
+            "chalk": "^2.0.0",
+            "cli-cursor": "^2.1.0",
+            "cli-width": "^2.0.0",
+            "external-editor": "^2.0.4",
+            "figures": "^2.0.0",
+            "lodash": "^4.3.0",
+            "mute-stream": "0.0.7",
+            "run-async": "^2.2.0",
+            "rx-lite": "^4.0.8",
+            "rx-lite-aggregates": "^4.0.8",
+            "string-width": "^2.1.0",
+            "strip-ansi": "^4.0.0",
+            "through": "^2.3.6"
+          }
+        },
         "js-yaml": {
           "version": "3.13.1",
           "resolved": "http://registry.npm.taobao.org/js-yaml/download/js-yaml-3.13.1.tgz",
@@ -4494,15 +6017,149 @@
       }
     },
     "eslint-loader": {
-      "version": "1.9.0",
-      "resolved": "http://registry.npm.taobao.org/eslint-loader/download/eslint-loader-1.9.0.tgz",
-      "integrity": "sha1-fhvp/t3KMo09z67xrUnVvv/oOhM=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npm.taobao.org/eslint-loader/download/eslint-loader-4.0.0.tgz",
+      "integrity": "sha1-qwls6RaPoWfkFZr/9maSwXP8e3k=",
       "requires": {
-        "loader-fs-cache": "^1.0.0",
-        "loader-utils": "^1.0.2",
-        "object-assign": "^4.0.1",
-        "object-hash": "^1.1.4",
-        "rimraf": "^2.6.1"
+        "fs-extra": "^9.0.0",
+        "loader-fs-cache": "^1.0.3",
+        "loader-utils": "^2.0.0",
+        "object-hash": "^2.0.3",
+        "schema-utils": "^2.6.5"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.2",
+          "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.2.tgz?cache=0&sync_timestamp=1587338610933&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.2.tgz",
+          "integrity": "sha1-xinF7O0XuvMUQ3kY0tqIyZ1ZWM0=",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.4.1.tgz",
+          "integrity": "sha1-75FuJxxkrBIXH9g4TqrmsjRYVNo="
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz",
+          "integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang="
+        },
+        "fast-deep-equal": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha1-VFFFB3xQFJHjOxXsQIwpQ3bpSuQ="
+        },
+        "find-cache-dir": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-0.1.1.tgz?cache=0&sync_timestamp=1583734591888&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-0.1.1.tgz",
+          "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
+          "requires": {
+            "commondir": "^1.0.1",
+            "mkdirp": "^0.5.1",
+            "pkg-dir": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "fs-extra": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npm.taobao.org/fs-extra/download/fs-extra-9.0.0.tgz",
+          "integrity": "sha1-tq/DEDbiR7JGbcmcKa55fV1FgKM=",
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^1.0.0"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA="
+        },
+        "json5": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npm.taobao.org/json5/download/json5-2.1.3.tgz?cache=0&sync_timestamp=1586046271069&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson5%2Fdownload%2Fjson5-2.1.3.tgz",
+          "integrity": "sha1-ybD3+pIzv+WAf+ZvzzpWF+1ZfUM=",
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "jsonfile": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.0.1.tgz",
+          "integrity": "sha1-mJZsuiFDeMjIS4LghZB7QL9hQXk=",
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^1.0.0"
+          }
+        },
+        "loader-fs-cache": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npm.taobao.org/loader-fs-cache/download/loader-fs-cache-1.0.3.tgz",
+          "integrity": "sha1-8IZXZG1gcHi+LwoDL4vWndbyd9k=",
+          "requires": {
+            "find-cache-dir": "^0.1.1",
+            "mkdirp": "^0.5.1"
+          }
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
+          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1584051509720&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz",
+          "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI="
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npm.taobao.org/path-exists/download/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "pkg-dir": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-1.0.0.tgz",
+          "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
+          "requires": {
+            "find-up": "^1.0.0"
+          }
+        },
+        "schema-utils": {
+          "version": "2.6.6",
+          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.6.6.tgz?cache=0&sync_timestamp=1587138145115&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-2.6.6.tgz",
+          "integrity": "sha1-KZ/mvUozZdwj2Z/URsr/jx1sMww=",
+          "requires": {
+            "ajv": "^6.12.0",
+            "ajv-keywords": "^3.4.1"
+          }
+        },
+        "universalify": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-1.0.0.tgz?cache=0&sync_timestamp=1583531006552&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-1.0.0.tgz",
+          "integrity": "sha1-thodoXPoQ1sv48Z9Kbmt+FlL0W0="
+        }
       }
     },
     "eslint-module-utils": {
@@ -4710,42 +6367,35 @@
       "resolved": "http://registry.npm.taobao.org/etag/download/etag-1.8.1.tgz",
       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
     },
-    "event-emitter": {
-      "version": "0.3.5",
-      "resolved": "http://registry.npm.taobao.org/event-emitter/download/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
     "eventemitter3": {
-      "version": "3.1.0",
-      "resolved": "http://registry.npm.taobao.org/eventemitter3/download/eventemitter3-3.1.0.tgz",
-      "integrity": "sha1-CQtNbNvWRe0Qv3UNS1QHlC17oWM="
+      "version": "4.0.0",
+      "resolved": "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.0.tgz?cache=0&sync_timestamp=1560950873670&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feventemitter3%2Fdownload%2Feventemitter3-4.0.0.tgz",
+      "integrity": "sha1-1lF2FjiH7lnzhtZMgmELaWpKdOs="
     },
     "eventlistener": {
       "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/eventlistener/-/eventlistener-0.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/eventlistener/download/eventlistener-0.0.1.tgz",
       "integrity": "sha1-7Suqu4UiJ68rz4iRUscsY8pTLrg="
     },
     "events": {
-      "version": "3.0.0",
-      "resolved": "http://registry.npm.taobao.org/events/download/events-3.0.0.tgz",
-      "integrity": "sha1-mgoN+vYok9krh1uPJpjKQRSXPog="
+      "version": "3.1.0",
+      "resolved": "https://registry.npm.taobao.org/events/download/events-3.1.0.tgz?cache=0&sync_timestamp=1578498298945&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fevents%2Fdownload%2Fevents-3.1.0.tgz",
+      "integrity": "sha1-hCea8bNMt1qoi/X/KR9tC9mzGlk=",
+      "dev": true
     },
     "eventsource": {
-      "version": "0.1.6",
-      "resolved": "http://registry.npm.taobao.org/eventsource/download/eventsource-0.1.6.tgz",
-      "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
+      "version": "1.0.7",
+      "resolved": "https://registry.npm.taobao.org/eventsource/download/eventsource-1.0.7.tgz",
+      "integrity": "sha1-j7xyyT/NNAiAkLwKTmT0tc7m2NA=",
       "requires": {
-        "original": ">=0.0.5"
+        "original": "^1.0.0"
       }
     },
     "evp_bytestokey": {
       "version": "1.0.3",
       "resolved": "http://registry.npm.taobao.org/evp_bytestokey/download/evp_bytestokey-1.0.3.tgz",
       "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
+      "dev": true,
       "requires": {
         "md5.js": "^1.3.4",
         "safe-buffer": "^5.1.1"
@@ -4771,6 +6421,13 @@
         "p-finally": "^1.0.0",
         "signal-exit": "^3.0.0",
         "strip-eof": "^1.0.0"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/get-stream/download/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+        }
       }
     },
     "expand-brackets": {
@@ -4798,69 +6455,130 @@
       }
     },
     "express": {
-      "version": "4.16.4",
-      "resolved": "http://registry.npm.taobao.org/express/download/express-4.16.4.tgz",
-      "integrity": "sha1-/d72GSYQniTFFeqX/S8b2/Yt8S4=",
+      "version": "4.17.1",
+      "resolved": "https://registry.npm.taobao.org/express/download/express-4.17.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fexpress%2Fdownload%2Fexpress-4.17.1.tgz",
+      "integrity": "sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ=",
+      "dev": true,
       "requires": {
-        "accepts": "~1.3.5",
+        "accepts": "~1.3.7",
         "array-flatten": "1.1.1",
-        "body-parser": "1.18.3",
-        "content-disposition": "0.5.2",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
         "content-type": "~1.0.4",
-        "cookie": "0.3.1",
+        "cookie": "0.4.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "~1.1.2",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.1.1",
+        "finalhandler": "~1.1.2",
         "fresh": "0.5.2",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
         "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
+        "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.4",
-        "qs": "6.5.2",
-        "range-parser": "~1.2.0",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
         "safe-buffer": "5.1.2",
-        "send": "0.16.2",
-        "serve-static": "1.13.2",
-        "setprototypeof": "1.1.0",
-        "statuses": "~1.4.0",
-        "type-is": "~1.6.16",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
       },
       "dependencies": {
+        "accepts": {
+          "version": "1.3.7",
+          "resolved": "https://registry.npm.taobao.org/accepts/download/accepts-1.3.7.tgz",
+          "integrity": "sha1-UxvHJlF6OytB+FACHGzBXqq1B80=",
+          "dev": true,
+          "requires": {
+            "mime-types": "~2.1.24",
+            "negotiator": "0.6.2"
+          }
+        },
         "array-flatten": {
           "version": "1.1.1",
           "resolved": "http://registry.npm.taobao.org/array-flatten/download/array-flatten-1.1.1.tgz",
-          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+          "dev": true
+        },
+        "cookie": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npm.taobao.org/cookie/download/cookie-0.4.0.tgz",
+          "integrity": "sha1-vrQ35wIrO21JAZ0IhmUwPr6cFLo=",
+          "dev": true
         },
         "debug": {
           "version": "2.6.9",
           "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
           "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
         },
+        "mime-db": {
+          "version": "1.43.0",
+          "resolved": "https://registry.npm.taobao.org/mime-db/download/mime-db-1.43.0.tgz",
+          "integrity": "sha1-ChLgUCZQ5HPXNVNQUOfI9OtPrlg=",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.26",
+          "resolved": "https://registry.npm.taobao.org/mime-types/download/mime-types-2.1.26.tgz?cache=0&sync_timestamp=1578282585871&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime-types%2Fdownload%2Fmime-types-2.1.26.tgz",
+          "integrity": "sha1-nJIfwJt+FJpl39wNpNIJlyALCgY=",
+          "dev": true,
+          "requires": {
+            "mime-db": "1.43.0"
+          }
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "negotiator": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npm.taobao.org/negotiator/download/negotiator-0.6.2.tgz",
+          "integrity": "sha1-/qz3zPUlp3rpY0Q2pkiD/+yjRvs=",
+          "dev": true
+        },
+        "parseurl": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz",
+          "integrity": "sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ=",
+          "dev": true
         },
         "path-to-regexp": {
           "version": "0.1.7",
           "resolved": "http://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-0.1.7.tgz",
-          "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+          "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+          "dev": true
         },
         "qs": {
-          "version": "6.5.2",
-          "resolved": "http://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz",
-          "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY="
+          "version": "6.7.0",
+          "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz",
+          "integrity": "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw=",
+          "dev": true
+        },
+        "setprototypeof": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.1.tgz?cache=0&sync_timestamp=1563425414995&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsetprototypeof%2Fdownload%2Fsetprototypeof-1.1.1.tgz",
+          "integrity": "sha1-fpWsskqpL1iF4KvvW6ExMw1K5oM=",
+          "dev": true
+        },
+        "statuses": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz?cache=0&sync_timestamp=1587328859420&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstatuses%2Fdownload%2Fstatuses-1.5.0.tgz",
+          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+          "dev": true
         }
       }
     },
@@ -4870,22 +6588,11 @@
       "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo="
     },
     "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "http://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
-          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
+        "is-extendable": "^0.1.0"
       }
     },
     "external-editor": {
@@ -4906,17 +6613,6 @@
         "is-extglob": "^1.0.0"
       }
     },
-    "extract-text-webpack-plugin": {
-      "version": "3.0.2",
-      "resolved": "http://registry.npm.taobao.org/extract-text-webpack-plugin/download/extract-text-webpack-plugin-3.0.2.tgz",
-      "integrity": "sha1-XwQ+qgL5dQqSWLeMCm4NwUCPsvc=",
-      "requires": {
-        "async": "^2.4.1",
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^0.3.0",
-        "webpack-sources": "^1.0.1"
-      }
-    },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "http://registry.npm.taobao.org/extsprintf/download/extsprintf-1.3.0.tgz",
@@ -4929,8 +6625,325 @@
     },
     "fast-diff": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
-      "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
+      "resolved": "https://registry.npm.taobao.org/fast-diff/download/fast-diff-1.1.2.tgz",
+      "integrity": "sha1-S2LEK44D3j+EhGC2OQeZIGldAVQ="
+    },
+    "fast-glob": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npm.taobao.org/fast-glob/download/fast-glob-2.2.7.tgz?cache=0&sync_timestamp=1582318661510&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-glob%2Fdownload%2Ffast-glob-2.2.7.tgz",
+      "integrity": "sha1-aVOFfDr6R1//ku5gFdUtpwpM050=",
+      "requires": {
+        "@mrmlnc/readdir-enhanced": "^2.2.1",
+        "@nodelib/fs.stat": "^1.1.2",
+        "glob-parent": "^3.1.0",
+        "is-glob": "^4.0.0",
+        "merge2": "^1.2.3",
+        "micromatch": "^3.1.10"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/arr-diff/download/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npm.taobao.org/array-unique/download/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npm.taobao.org/braces/download/braces-2.3.2.tgz",
+          "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=",
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
+          "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+          "requires": {
+            "is-descriptor": "^1.0.2",
+            "isobject": "^3.0.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npm.taobao.org/expand-brackets/download/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-0.1.6.tgz",
+              "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
+              "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz",
+              "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0="
+            }
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+              "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npm.taobao.org/extglob/download/extglob-2.0.4.tgz",
+          "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=",
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+        },
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz",
+          "integrity": "sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw=",
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+          "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npm.taobao.org/micromatch/download/micromatch-3.1.10.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmicromatch%2Fdownload%2Fmicromatch-3.1.10.tgz",
+          "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=",
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
     },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
@@ -4942,15 +6955,10 @@
       "resolved": "http://registry.npm.taobao.org/fast-levenshtein/download/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
-    "fastparse": {
-      "version": "1.1.2",
-      "resolved": "http://registry.npm.taobao.org/fastparse/download/fastparse-1.1.2.tgz",
-      "integrity": "sha1-kXKMWllC7O2FMSg8eUQe5BIsNak="
-    },
     "faye-websocket": {
-      "version": "0.11.1",
-      "resolved": "http://registry.npm.taobao.org/faye-websocket/download/faye-websocket-0.11.1.tgz",
-      "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+      "version": "0.10.0",
+      "resolved": "https://registry.npm.taobao.org/faye-websocket/download/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
       "requires": {
         "websocket-driver": ">=0.5.1"
       }
@@ -4994,8 +7002,14 @@
     },
     "fecha": {
       "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
-      "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
+      "resolved": "https://registry.npm.taobao.org/fecha/download/fecha-2.3.3.tgz",
+      "integrity": "sha1-lI50FX3xoy/RsSw6PDzctuydls0="
+    },
+    "figgy-pudding": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npm.taobao.org/figgy-pudding/download/figgy-pudding-3.5.2.tgz",
+      "integrity": "sha1-tO7oFIq7Adzx0aw0Nn1Z4S+mHW4=",
+      "dev": true
     },
     "figures": {
       "version": "2.0.0",
@@ -5015,14 +7029,85 @@
       }
     },
     "file-loader": {
-      "version": "1.1.5",
-      "resolved": "http://registry.npm.taobao.org/file-loader/download/file-loader-1.1.5.tgz",
-      "integrity": "sha1-kcJba2++VtrpnxCkJf1kkztcnao=",
+      "version": "6.0.0",
+      "resolved": "https://registry.npm.taobao.org/file-loader/download/file-loader-6.0.0.tgz",
+      "integrity": "sha1-l7v6q3okYMB7y9ctOmkiQH9nZJ8=",
       "requires": {
-        "loader-utils": "^1.0.2",
-        "schema-utils": "^0.3.0"
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.6.5"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.2",
+          "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.2.tgz?cache=0&sync_timestamp=1587338610933&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.2.tgz",
+          "integrity": "sha1-xinF7O0XuvMUQ3kY0tqIyZ1ZWM0=",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.4.1.tgz",
+          "integrity": "sha1-75FuJxxkrBIXH9g4TqrmsjRYVNo="
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz",
+          "integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang="
+        },
+        "fast-deep-equal": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha1-VFFFB3xQFJHjOxXsQIwpQ3bpSuQ="
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA="
+        },
+        "json5": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npm.taobao.org/json5/download/json5-2.1.3.tgz?cache=0&sync_timestamp=1586046271069&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson5%2Fdownload%2Fjson5-2.1.3.tgz",
+          "integrity": "sha1-ybD3+pIzv+WAf+ZvzzpWF+1ZfUM=",
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
+          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1584051509720&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz",
+          "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI="
+        },
+        "schema-utils": {
+          "version": "2.6.6",
+          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.6.6.tgz?cache=0&sync_timestamp=1587138145115&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-2.6.6.tgz",
+          "integrity": "sha1-KZ/mvUozZdwj2Z/URsr/jx1sMww=",
+          "requires": {
+            "ajv": "^6.12.0",
+            "ajv-keywords": "^3.4.1"
+          }
+        }
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/file-uri-to-path/download/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha1-VTp7hEb/b2hDWcRF8eN6BdrMM90=",
+      "optional": true
+    },
     "filename-regex": {
       "version": "2.0.1",
       "resolved": "http://registry.npm.taobao.org/filename-regex/download/filename-regex-2.0.1.tgz",
@@ -5038,9 +7123,9 @@
       }
     },
     "filesize": {
-      "version": "3.5.11",
-      "resolved": "http://registry.npm.taobao.org/filesize/download/filesize-3.5.11.tgz",
-      "integrity": "sha1-GRkyZ0lDO7PPdzaL0VjKq8wZ6e4="
+      "version": "3.6.1",
+      "resolved": "https://registry.npm.taobao.org/filesize/download/filesize-3.6.1.tgz",
+      "integrity": "sha1-CQuz7gG2+AGoqL6Z0xcQs0Irsxc="
     },
     "fill-range": {
       "version": "2.2.4",
@@ -5055,16 +7140,17 @@
       }
     },
     "finalhandler": {
-      "version": "1.1.1",
-      "resolved": "http://registry.npm.taobao.org/finalhandler/download/finalhandler-1.1.1.tgz",
-      "integrity": "sha1-7r9O2EAHnIP0JJA4ydcDAIMBsQU=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npm.taobao.org/finalhandler/download/finalhandler-1.1.2.tgz",
+      "integrity": "sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0=",
+      "dev": true,
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
-        "statuses": "~1.4.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
         "unpipe": "~1.0.0"
       },
       "dependencies": {
@@ -5072,6 +7158,7 @@
           "version": "2.6.9",
           "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
           "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -5079,7 +7166,20 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "parseurl": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz",
+          "integrity": "sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ=",
+          "dev": true
+        },
+        "statuses": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz?cache=0&sync_timestamp=1587328859420&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstatuses%2Fdownload%2Fstatuses-1.5.0.tgz",
+          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+          "dev": true
         }
       }
     },
@@ -5101,6 +7201,321 @@
         "locate-path": "^2.0.0"
       }
     },
+    "findup-sync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npm.taobao.org/findup-sync/download/findup-sync-3.0.0.tgz",
+      "integrity": "sha1-F7EI+e5RLft6XH88iyfqnhqcCNE=",
+      "requires": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/arr-diff/download/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npm.taobao.org/array-unique/download/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npm.taobao.org/braces/download/braces-2.3.2.tgz",
+          "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=",
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
+          "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+          "requires": {
+            "is-descriptor": "^1.0.2",
+            "isobject": "^3.0.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npm.taobao.org/expand-brackets/download/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-0.1.6.tgz",
+              "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
+              "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz",
+              "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0="
+            }
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+              "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npm.taobao.org/extglob/download/extglob-2.0.4.tgz",
+          "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=",
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+        },
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz",
+          "integrity": "sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw=",
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+          "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npm.taobao.org/micromatch/download/micromatch-3.1.10.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmicromatch%2Fdownload%2Fmicromatch-3.1.10.tgz",
+          "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=",
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
     "flat-cache": {
       "version": "1.3.4",
       "resolved": "http://registry.npm.taobao.org/flat-cache/download/flat-cache-1.3.4.tgz",
@@ -5112,24 +7527,28 @@
         "write": "^0.2.1"
       }
     },
-    "flatten": {
-      "version": "1.0.2",
-      "resolved": "http://registry.npm.taobao.org/flatten/download/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I="
-    },
     "flush-write-stream": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "resolved": "https://registry.npm.taobao.org/flush-write-stream/download/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha1-jdfYc6G6vCB9lOrQwuDkQnbr8ug=",
       "dev": true,
       "requires": {
         "inherits": "^2.0.3",
         "readable-stream": "^2.3.6"
       }
     },
+    "flv.js": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npm.taobao.org/flv.js/download/flv.js-1.5.0.tgz",
+      "integrity": "sha1-+lm+1DkdcENc+odArEDsAHDvmK4=",
+      "requires": {
+        "es6-promise": "^4.2.5",
+        "webworkify": "^1.5.0"
+      }
+    },
     "fmin": {
       "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/fmin/-/fmin-0.0.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/fmin/download/fmin-0.0.2.tgz",
       "integrity": "sha1-Wbu0DUP/3ByUzQClaMQflfGXMBc=",
       "requires": {
         "contour_plot": "^0.0.1",
@@ -5141,12 +7560,12 @@
       "dependencies": {
         "camelcase": {
           "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-1.2.1.tgz",
           "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
         },
         "cliui": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-2.1.0.tgz?cache=0&sync_timestamp=1573942320052&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-2.1.0.tgz",
           "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
           "requires": {
             "center-align": "^0.1.1",
@@ -5156,12 +7575,12 @@
         },
         "source-map": {
           "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
         },
         "uglify-js": {
           "version": "2.8.29",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+          "resolved": "https://registry.npm.taobao.org/uglify-js/download/uglify-js-2.8.29.tgz?cache=0&sync_timestamp=1582036421880&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuglify-js%2Fdownload%2Fuglify-js-2.8.29.tgz",
           "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
           "requires": {
             "source-map": "~0.5.1",
@@ -5171,12 +7590,12 @@
         },
         "wordwrap": {
           "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "resolved": "https://registry.npm.taobao.org/wordwrap/download/wordwrap-0.0.2.tgz",
           "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
         },
         "yargs": {
           "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-3.10.0.tgz?cache=0&sync_timestamp=1583129910829&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-3.10.0.tgz",
           "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
           "requires": {
             "camelcase": "^1.0.2",
@@ -5197,8 +7616,8 @@
     },
     "for-each": {
       "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "resolved": "https://registry.npm.taobao.org/for-each/download/for-each-0.3.3.tgz",
+      "integrity": "sha1-abRH6IoKXTLD5whPPxcQA0shN24=",
       "requires": {
         "is-callable": "^1.1.3"
       }
@@ -5221,6 +7640,322 @@
       "resolved": "http://registry.npm.taobao.org/forever-agent/download/forever-agent-0.6.1.tgz",
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
+    "fork-ts-checker-webpack-plugin": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npm.taobao.org/fork-ts-checker-webpack-plugin/download/fork-ts-checker-webpack-plugin-3.1.0.tgz",
+      "integrity": "sha1-+0EaSyw2l+HNf4NDbU/urLzHDHs=",
+      "requires": {
+        "babel-code-frame": "^6.22.0",
+        "chalk": "^2.4.1",
+        "chokidar": "^2.0.4",
+        "micromatch": "^3.1.10",
+        "minimatch": "^3.0.4",
+        "semver": "^5.6.0",
+        "tapable": "^1.0.0",
+        "worker-rpc": "^0.1.0"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/arr-diff/download/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npm.taobao.org/array-unique/download/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npm.taobao.org/braces/download/braces-2.3.2.tgz",
+          "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=",
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
+          "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+          "requires": {
+            "is-descriptor": "^1.0.2",
+            "isobject": "^3.0.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npm.taobao.org/expand-brackets/download/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-0.1.6.tgz",
+              "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
+              "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz",
+              "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0="
+            }
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+              "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npm.taobao.org/extglob/download/extglob-2.0.4.tgz",
+          "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=",
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+          "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npm.taobao.org/micromatch/download/micromatch-3.1.10.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmicromatch%2Fdownload%2Fmicromatch-3.1.10.tgz",
+          "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=",
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
     "form-data": {
       "version": "2.3.3",
       "resolved": "http://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz",
@@ -5251,7 +7986,7 @@
     },
     "from2": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/from2/download/from2-2.3.0.tgz",
       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
       "dev": true,
       "requires": {
@@ -5269,9 +8004,18 @@
         "universalify": "^0.1.0"
       }
     },
+    "fs-minipass": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npm.taobao.org/fs-minipass/download/fs-minipass-1.2.7.tgz?cache=0&sync_timestamp=1579628584498&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-minipass%2Fdownload%2Ffs-minipass-1.2.7.tgz",
+      "integrity": "sha1-zP+FcIQef+QmVpPaiJNsVa7X98c=",
+      "optional": true,
+      "requires": {
+        "minipass": "^2.6.0"
+      }
+    },
     "fs-write-stream-atomic": {
       "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "resolved": "https://registry.npm.taobao.org/fs-write-stream-atomic/download/fs-write-stream-atomic-1.0.10.tgz",
       "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
       "dev": true,
       "requires": {
@@ -5287,34 +8031,31 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
-      "version": "1.2.7",
-      "resolved": "http://registry.npm.taobao.org/fsevents/download/fsevents-1.2.7.tgz",
-      "integrity": "sha1-SFG2ZKN4PlIAOzxm6w7uEHSTOqQ=",
+      "version": "1.2.12",
+      "resolved": "https://registry.npm.taobao.org/fsevents/download/fsevents-1.2.12.tgz",
+      "integrity": "sha1-234NjsOwtFck/U2D1DVUqPHw3lw=",
       "optional": true,
       "requires": {
-        "nan": "^2.9.2",
-        "node-pre-gyp": "^0.10.0"
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1",
+        "node-pre-gyp": "*"
       },
       "dependencies": {
         "abbrev": {
           "version": "1.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "aproba": {
           "version": "1.2.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "are-we-there-yet": {
           "version": "1.1.5",
           "bundled": true,
-          "optional": true,
           "requires": {
             "delegates": "^1.0.0",
             "readable-stream": "^2.0.6"
@@ -5322,455 +8063,85 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
           }
         },
         "chownr": {
-          "version": "1.1.1",
-          "bundled": true,
-          "optional": true
+          "version": "1.1.4",
+          "bundled": true
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "core-util-is": {
           "version": "1.0.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "debug": {
-          "version": "2.6.9",
+          "version": "3.2.6",
           "bundled": true,
-          "optional": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
         },
         "deep-extend": {
           "version": "0.6.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "delegates": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "detect-libc": {
           "version": "1.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "fs-minipass": {
-          "version": "1.2.5",
+          "version": "1.2.7",
           "bundled": true,
-          "optional": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "^2.6.0"
           }
         },
         "fs.realpath": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "gauge": {
           "version": "2.7.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "aproba": "^1.0.3",
             "console-control-strings": "^1.0.0",
             "has-unicode": "^2.0.0",
             "object-assign": "^4.1.0",
             "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
             "strip-ansi": "^3.0.1",
             "wide-align": "^1.1.0"
           }
-        },
-        "glob": {
-          "version": "7.1.3",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
-        "ignore-walk": {
-          "version": "3.0.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "minimatch": "^3.0.4"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "optional": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "optional": true
-        },
-        "minipass": {
-          "version": "2.3.5",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          }
-        },
-        "minizlib": {
-          "version": "1.2.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.2.1"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "needle": {
-          "version": "2.2.4",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "debug": "^2.1.2",
-            "iconv-lite": "^0.4.4",
-            "sax": "^1.2.4"
-          }
-        },
-        "node-pre-gyp": {
-          "version": "0.10.3",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "^1.0.2",
-            "mkdirp": "^0.5.1",
-            "needle": "^2.2.1",
-            "nopt": "^4.0.1",
-            "npm-packlist": "^1.1.6",
-            "npmlog": "^4.0.2",
-            "rc": "^1.2.7",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^4"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.0.5",
-          "bundled": true,
-          "optional": true
-        },
-        "npm-packlist": {
-          "version": "1.2.0",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.8",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.3",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": true,
-          "optional": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true,
-          "optional": true
-        },
-        "sax": {
-          "version": "1.2.4",
-          "bundled": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "5.6.0",
-          "bundled": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "4.4.8",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.4",
-            "minizlib": "^1.1.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "wide-align": {
-          "version": "1.1.3",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "string-width": "^1.0.2 || 2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "yallist": {
-          "version": "3.0.3",
-          "bundled": true,
-          "optional": true
         }
       }
     },
     "fstream": {
       "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "resolved": "https://registry.npm.taobao.org/fstream/download/fstream-1.0.12.tgz",
+      "integrity": "sha1-Touo7i1Ivk99DeUFRVVI6uWTIEU=",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -5791,9 +8162,8 @@
     },
     "gauge": {
       "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "resolved": "https://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz?cache=0&sync_timestamp=1580507640343&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgauge%2Fdownload%2Fgauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
       "requires": {
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
@@ -5807,18 +8177,16 @@
       "dependencies": {
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
         },
         "string-width": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz?cache=0&sync_timestamp=1573488535785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5829,17 +8197,17 @@
     },
     "gaze": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+      "resolved": "https://registry.npm.taobao.org/gaze/download/gaze-1.1.3.tgz",
+      "integrity": "sha1-xEFzPhO5J6yMD/C0w7Az8ogSkko=",
       "dev": true,
       "requires": {
         "globule": "^1.0.0"
       }
     },
     "get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "http://registry.npm.taobao.org/get-caller-file/download/get-caller-file-1.0.3.tgz",
-      "integrity": "sha1-+Xj6TJDR3+f/LWvtoqUV5xO9z0o="
+      "version": "2.0.5",
+      "resolved": "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-2.0.5.tgz",
+      "integrity": "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34="
     },
     "get-stdin": {
       "version": "4.0.1",
@@ -5847,9 +8215,23 @@
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
     },
     "get-stream": {
-      "version": "3.0.0",
-      "resolved": "http://registry.npm.taobao.org/get-stream/download/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+      "version": "4.1.0",
+      "resolved": "https://registry.npm.taobao.org/get-stream/download/get-stream-4.1.0.tgz",
+      "integrity": "sha1-wbJVV189wh1Zv8ec09K0axw6VLU=",
+      "requires": {
+        "pump": "^3.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz",
+          "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=",
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
     },
     "get-value": {
       "version": "2.0.6",
@@ -5865,9 +8247,9 @@
       }
     },
     "glob": {
-      "version": "7.1.3",
-      "resolved": "http://registry.npm.taobao.org/glob/download/glob-7.1.3.tgz",
-      "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=",
+      "version": "7.1.6",
+      "resolved": "https://registry.npm.taobao.org/glob/download/glob-7.1.6.tgz?cache=0&sync_timestamp=1573078079496&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglob%2Fdownload%2Fglob-7.1.6.tgz",
+      "integrity": "sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=",
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -5884,23 +8266,61 @@
       "requires": {
         "glob-parent": "^2.0.0",
         "is-glob": "^2.0.0"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/glob-parent/download/glob-parent-2.0.0.tgz",
+          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+          "requires": {
+            "is-glob": "^2.0.0"
+          }
+        }
       }
     },
     "glob-parent": {
-      "version": "2.0.0",
-      "resolved": "http://registry.npm.taobao.org/glob-parent/download/glob-parent-2.0.0.tgz",
-      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npm.taobao.org/glob-parent/download/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "requires": {
-        "is-glob": "^2.0.0"
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+        },
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
       }
     },
+    "glob-to-regexp": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npm.taobao.org/glob-to-regexp/download/glob-to-regexp-0.3.0.tgz",
+      "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs="
+    },
     "global": {
-      "version": "4.3.2",
-      "resolved": "http://registry.npm.taobao.org/global/download/global-4.3.2.tgz",
-      "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
+      "version": "4.4.0",
+      "resolved": "https://registry.npm.taobao.org/global/download/global-4.4.0.tgz",
+      "integrity": "sha1-PnsQUXkAajI+1xqvyj6cV6XMZAY=",
       "requires": {
         "min-document": "^2.19.0",
-        "process": "~0.5.1"
+        "process": "^0.11.10"
+      },
+      "dependencies": {
+        "process": {
+          "version": "0.11.10",
+          "resolved": "https://registry.npm.taobao.org/process/download/process-0.11.10.tgz",
+          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+        }
       }
     },
     "global-dirs": {
@@ -5912,25 +8332,28 @@
       }
     },
     "global-modules": {
-      "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/global-modules/download/global-modules-1.0.0.tgz",
-      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/global-modules/download/global-modules-2.0.0.tgz",
+      "integrity": "sha1-mXYFrSNF8n9RU5vqJldEISFcd4A=",
       "requires": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
+        "global-prefix": "^3.0.0"
       }
     },
     "global-prefix": {
-      "version": "1.0.2",
-      "resolved": "http://registry.npm.taobao.org/global-prefix/download/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npm.taobao.org/global-prefix/download/global-prefix-3.0.0.tgz",
+      "integrity": "sha1-/IX3MGTfafUEIfR/iD/luRO6m5c=",
       "requires": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
+        "ini": "^1.3.5",
+        "kind-of": "^6.0.2",
+        "which": "^1.3.1"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+          "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
+        }
       }
     },
     "globals": {
@@ -5939,22 +8362,30 @@
       "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo="
     },
     "globby": {
-      "version": "5.0.0",
-      "resolved": "http://registry.npm.taobao.org/globby/download/globby-5.0.0.tgz",
-      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "version": "8.0.2",
+      "resolved": "https://registry.npm.taobao.org/globby/download/globby-8.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobby%2Fdownload%2Fglobby-8.0.2.tgz",
+      "integrity": "sha1-VpdhnM2VxSdduy1vqkIIfBqUHY0=",
       "requires": {
         "array-union": "^1.0.1",
-        "arrify": "^1.0.0",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "dir-glob": "2.0.0",
+        "fast-glob": "^2.0.2",
+        "glob": "^7.1.2",
+        "ignore": "^3.3.5",
+        "pify": "^3.0.0",
+        "slash": "^1.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/pify/download/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+        }
       }
     },
     "globule": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz",
-      "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==",
+      "resolved": "https://registry.npm.taobao.org/globule/download/globule-1.3.1.tgz?cache=0&sync_timestamp=1581553302347&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobule%2Fdownload%2Fglobule-1.3.1.tgz",
+      "integrity": "sha1-kKJTOPIrf761J87mPGKa6nVNM7k=",
       "dev": true,
       "requires": {
         "glob": "~7.1.1",
@@ -5964,15 +8395,15 @@
       "dependencies": {
         "lodash": {
           "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz",
+          "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=",
           "dev": true
         }
       }
     },
     "good-listener": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/good-listener/download/good-listener-1.2.2.tgz",
       "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
       "requires": {
         "delegate": "^3.1.2"
@@ -5994,12 +8425,19 @@
         "timed-out": "^4.0.0",
         "unzip-response": "^2.0.1",
         "url-parse-lax": "^1.0.0"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/get-stream/download/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+        }
       }
     },
     "graceful-fs": {
-      "version": "4.1.15",
-      "resolved": "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.15.tgz",
-      "integrity": "sha1-/7cD4QZuig7qpMi4C6klPu77+wA="
+      "version": "4.2.3",
+      "resolved": "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.3.tgz",
+      "integrity": "sha1-ShL/G2A3bvCYYsIJPt2Qgyi+hCM="
     },
     "growly": {
       "version": "1.3.0",
@@ -6008,42 +8446,58 @@
     },
     "gud": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
-      "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
+      "resolved": "https://registry.npm.taobao.org/gud/download/gud-1.0.0.tgz",
+      "integrity": "sha1-pIlYGxfmpwvsqavjrlfeekmYUsA="
     },
     "gzip-size": {
-      "version": "3.0.0",
-      "resolved": "http://registry.npm.taobao.org/gzip-size/download/gzip-size-3.0.0.tgz",
-      "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=",
+      "version": "5.1.1",
+      "resolved": "https://registry.npm.taobao.org/gzip-size/download/gzip-size-5.1.1.tgz",
+      "integrity": "sha1-y5vuaS+HwGErIyhAqHOQTkwTUnQ=",
       "requires": {
-        "duplexer": "^0.1.1"
+        "duplexer": "^0.1.1",
+        "pify": "^4.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz",
+          "integrity": "sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE="
+        }
       }
     },
     "hammerjs": {
       "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
     },
     "handle-thing": {
-      "version": "1.2.5",
-      "resolved": "http://registry.npm.taobao.org/handle-thing/download/handle-thing-1.2.5.tgz",
-      "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ="
+      "version": "2.0.1",
+      "resolved": "https://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.1.tgz",
+      "integrity": "sha1-hX95zjWVgMNA1DCBzGSJcNC7I04="
     },
     "handlebars": {
-      "version": "4.7.3",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.3.tgz",
-      "integrity": "sha512-SRGwSYuNfx8DwHD/6InAPzD6RgeruWLT+B8e8a7gGs8FWgHzlExpTFMEq2IA6QpAfOClpKHy6+8IqTjeBCu6Kg==",
+      "version": "4.7.6",
+      "resolved": "https://registry.npm.taobao.org/handlebars/download/handlebars-4.7.6.tgz?cache=0&sync_timestamp=1585937700804&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhandlebars%2Fdownload%2Fhandlebars-4.7.6.tgz",
+      "integrity": "sha1-1MBcG6+Q6ZRfd6pop6IZqkp9904=",
       "requires": {
+        "minimist": "^1.2.5",
         "neo-async": "^2.6.0",
-        "optimist": "^0.6.1",
         "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4"
+        "uglify-js": "^3.1.4",
+        "wordwrap": "^1.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1584051509720&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz",
+          "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI="
+        }
       }
     },
     "happypack": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/happypack/-/happypack-5.0.1.tgz",
-      "integrity": "sha512-AzXVxLzX0mtv0T40Kic72rfcGK4Y2b/cDdtcyw+e+V/13ozl7x0+EZ4hvrL1rJ8MoefR9+FfUJQsK2irH0GWOw==",
+      "resolved": "https://registry.npm.taobao.org/happypack/download/happypack-5.0.1.tgz",
+      "integrity": "sha1-hQg5Qm1iBaUgv5E+liNJ++UjoHw=",
       "dev": true,
       "requires": {
         "async": "1.5.0",
@@ -6054,19 +8508,19 @@
       "dependencies": {
         "async": {
           "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/async/download/async-1.5.0.tgz",
           "integrity": "sha1-J5ZkJyNXOFlWVjP8YnRES+4vjOM=",
           "dev": true
         },
         "big.js": {
           "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+          "resolved": "https://registry.npm.taobao.org/big.js/download/big.js-3.2.0.tgz",
+          "integrity": "sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4=",
           "dev": true
         },
         "loader-utils": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.1.0.tgz",
           "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
           "dev": true,
           "requires": {
@@ -6092,20 +8546,20 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.10.0",
-          "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.10.0.tgz",
-          "integrity": "sha1-kNDVRDnaWHzX6EO/twRfUL0ivfE=",
+          "version": "6.12.2",
+          "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.2.tgz?cache=0&sync_timestamp=1587338610933&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.2.tgz",
+          "integrity": "sha1-xinF7O0XuvMUQ3kY0tqIyZ1ZWM0=",
           "requires": {
-            "fast-deep-equal": "^2.0.1",
+            "fast-deep-equal": "^3.1.1",
             "fast-json-stable-stringify": "^2.0.0",
             "json-schema-traverse": "^0.4.1",
             "uri-js": "^4.2.2"
           }
         },
         "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+          "version": "3.1.1",
+          "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha1-VFFFB3xQFJHjOxXsQIwpQ3bpSuQ="
         },
         "json-schema-traverse": {
           "version": "0.4.1",
@@ -6136,15 +8590,14 @@
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
     "has-symbols": {
-      "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.0.tgz",
-      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.1.tgz",
+      "integrity": "sha1-n1IUdYpEGWxAbZvXbOv4HsLdMeg="
     },
     "has-unicode": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true
+      "resolved": "https://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
     "has-value": {
       "version": "1.0.0",
@@ -6204,6 +8657,7 @@
       "version": "3.0.4",
       "resolved": "http://registry.npm.taobao.org/hash-base/download/hash-base-3.0.4.tgz",
       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -6213,6 +8667,7 @@
       "version": "1.1.7",
       "resolved": "http://registry.npm.taobao.org/hash.js/download/hash.js-1.1.7.tgz",
       "integrity": "sha1-C6vKU46NTuSg+JiNaIZlN6ADz0I=",
+      "dev": true,
       "requires": {
         "inherits": "^2.0.3",
         "minimalistic-assert": "^1.0.1"
@@ -6224,30 +8679,40 @@
       "integrity": "sha1-hK5l+n6vsWX922FWauFLrwVmTw8="
     },
     "history": {
-      "version": "4.9.0",
-      "resolved": "http://registry.npm.taobao.org/history/download/history-4.9.0.tgz",
-      "integrity": "sha1-hFh8IGgDnq2K92np1qaGChT6G8o=",
+      "version": "4.10.1",
+      "resolved": "https://registry.npm.taobao.org/history/download/history-4.10.1.tgz?cache=0&sync_timestamp=1587086191879&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhistory%2Fdownload%2Fhistory-4.10.1.tgz",
+      "integrity": "sha1-MzcaZeOoOyZ0NOKz87G0xYqtTPM=",
       "requires": {
         "@babel/runtime": "^7.1.2",
         "loose-envify": "^1.2.0",
-        "resolve-pathname": "^2.2.0",
+        "resolve-pathname": "^3.0.0",
         "tiny-invariant": "^1.0.2",
         "tiny-warning": "^1.0.0",
-        "value-equal": "^0.4.0"
+        "value-equal": "^1.0.1"
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.4.3",
-          "resolved": "http://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.4.3.tgz",
-          "integrity": "sha1-eYiORSA0IjrZYJGHoK0f4NKtS9w=",
+          "version": "7.9.2",
+          "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.9.2.tgz",
+          "integrity": "sha1-2Q3wWDo6JS8JqqYZZlNnuuUY2wY=",
           "requires": {
-            "regenerator-runtime": "^0.13.2"
+            "regenerator-runtime": "^0.13.4"
           }
         },
         "regenerator-runtime": {
-          "version": "0.13.2",
-          "resolved": "http://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.2.tgz",
-          "integrity": "sha1-MuWcmm+5saSv8JtJMMotRHc0NEc="
+          "version": "0.13.5",
+          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.5.tgz?cache=0&sync_timestamp=1584052597708&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.5.tgz",
+          "integrity": "sha1-2Hih0JS0MG0QuQlkhLM+vVXiZpc="
+        },
+        "resolve-pathname": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/resolve-pathname/download/resolve-pathname-3.0.0.tgz",
+          "integrity": "sha1-mdAiJNPPJjaJvsuzk7xWAxMCXc0="
+        },
+        "value-equal": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npm.taobao.org/value-equal/download/value-equal-1.0.1.tgz",
+          "integrity": "sha1-Hgt5THNMXAyt4XnEN9NW2TGjTWw="
         }
       }
     },
@@ -6255,6 +8720,7 @@
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/hmac-drbg/download/hmac-drbg-1.0.1.tgz",
       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
       "requires": {
         "hash.js": "^1.0.3",
         "minimalistic-assert": "^1.0.0",
@@ -6262,9 +8728,9 @@
       }
     },
     "hoist-non-react-statics": {
-      "version": "3.3.0",
-      "resolved": "http://registry.npm.taobao.org/hoist-non-react-statics/download/hoist-non-react-statics-3.3.0.tgz",
-      "integrity": "sha1-sJF48BIhhPuVrPUl2q7LTY9FlYs=",
+      "version": "3.3.2",
+      "resolved": "https://registry.npm.taobao.org/hoist-non-react-statics/download/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha1-7OCsr3HWLClpwuxZ/v9CpLGoW0U=",
       "requires": {
         "react-is": "^16.7.0"
       }
@@ -6293,9 +8759,9 @@
       "dev": true
     },
     "hosted-git-info": {
-      "version": "2.7.1",
-      "resolved": "http://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-2.7.1.tgz",
-      "integrity": "sha1-l/I2l3vW4SVAiTD/bePuxigewEc="
+      "version": "2.8.8",
+      "resolved": "https://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-2.8.8.tgz?cache=0&sync_timestamp=1583017392137&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhosted-git-info%2Fdownload%2Fhosted-git-info-2.8.8.tgz",
+      "integrity": "sha1-dTm9S8Hg4KiVgVouAmJCCxKFhIg="
     },
     "hpack.js": {
       "version": "2.1.6",
@@ -6308,73 +8774,60 @@
         "wbuf": "^1.1.0"
       }
     },
-    "html-comment-regex": {
-      "version": "1.1.2",
-      "resolved": "http://registry.npm.taobao.org/html-comment-regex/download/html-comment-regex-1.1.2.tgz",
-      "integrity": "sha1-l9RoiutcgYhqNk+qDK0d2hTUM6c="
-    },
     "html-encoding-sniffer": {
-      "version": "1.0.2",
-      "resolved": "http://registry.npm.taobao.org/html-encoding-sniffer/download/html-encoding-sniffer-1.0.2.tgz",
-      "integrity": "sha1-5w2EuU2lOqN14R/jo1G+ZkLKRvg=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npm.taobao.org/html-encoding-sniffer/download/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha1-QqbcT9M/ACgRduiyN1nKTk+hhfM=",
       "requires": {
-        "whatwg-encoding": "^1.0.1"
+        "whatwg-encoding": "^1.0.5"
       }
     },
     "html-entities": {
-      "version": "1.2.1",
-      "resolved": "http://registry.npm.taobao.org/html-entities/download/html-entities-1.2.1.tgz",
-      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8="
+      "version": "1.3.1",
+      "resolved": "https://registry.npm.taobao.org/html-entities/download/html-entities-1.3.1.tgz",
+      "integrity": "sha1-+5oaS1sUxdq6gtPjTGrk/nAaDkQ="
     },
-    "html-minifier": {
-      "version": "3.5.21",
-      "resolved": "http://registry.npm.taobao.org/html-minifier/download/html-minifier-3.5.21.tgz",
-      "integrity": "sha1-0AQOBUcw41TbAIRjWTGUAVIS0gw=",
+    "html-minifier-terser": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npm.taobao.org/html-minifier-terser/download/html-minifier-terser-5.0.5.tgz",
+      "integrity": "sha1-jxL2OXifBPqp9c8v+bn2VgfyH4s=",
       "requires": {
-        "camel-case": "3.0.x",
-        "clean-css": "4.2.x",
-        "commander": "2.17.x",
-        "he": "1.2.x",
-        "param-case": "2.1.x",
-        "relateurl": "0.2.x",
-        "uglify-js": "3.4.x"
+        "camel-case": "^4.1.1",
+        "clean-css": "^4.2.3",
+        "commander": "^4.1.1",
+        "he": "^1.2.0",
+        "param-case": "^3.0.3",
+        "relateurl": "^0.2.7",
+        "terser": "^4.6.3"
       },
       "dependencies": {
         "commander": {
-          "version": "2.17.1",
-          "resolved": "http://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz",
-          "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
+          "version": "4.1.1",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-4.1.1.tgz?cache=0&sync_timestamp=1584148318639&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-4.1.1.tgz",
+          "integrity": "sha1-n9YCvZNilOnp70aj9NaWQESxgGg="
         }
       }
     },
     "html-webpack-plugin": {
-      "version": "2.29.0",
-      "resolved": "http://registry.npm.taobao.org/html-webpack-plugin/download/html-webpack-plugin-2.29.0.tgz",
-      "integrity": "sha1-6Yf0IYU9O2k4yMTIFxhC5f0XryM=",
+      "version": "4.2.0",
+      "resolved": "https://registry.npm.taobao.org/html-webpack-plugin/download/html-webpack-plugin-4.2.0.tgz",
+      "integrity": "sha1-6kbxW2INTByMc+o5k5XIEgjp+CM=",
       "requires": {
-        "bluebird": "^3.4.7",
-        "html-minifier": "^3.2.3",
-        "loader-utils": "^0.2.16",
-        "lodash": "^4.17.3",
-        "pretty-error": "^2.0.2",
-        "toposort": "^1.0.0"
+        "@types/html-minifier-terser": "^5.0.0",
+        "@types/tapable": "^1.0.5",
+        "@types/webpack": "^4.41.8",
+        "html-minifier-terser": "^5.0.1",
+        "loader-utils": "^1.2.3",
+        "lodash": "^4.17.15",
+        "pretty-error": "^2.1.1",
+        "tapable": "^1.1.3",
+        "util.promisify": "1.0.0"
       },
       "dependencies": {
-        "big.js": {
-          "version": "3.2.0",
-          "resolved": "http://registry.npm.taobao.org/big.js/download/big.js-3.2.0.tgz",
-          "integrity": "sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4="
-        },
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "http://registry.npm.taobao.org/loader-utils/download/loader-utils-0.2.17.tgz",
-          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
-          "requires": {
-            "big.js": "^3.1.3",
-            "emojis-list": "^2.0.0",
-            "json5": "^0.5.0",
-            "object-assign": "^4.0.1"
-          }
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz",
+          "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg="
         }
       }
     },
@@ -6391,10 +8844,15 @@
         "readable-stream": "^3.1.1"
       },
       "dependencies": {
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npm.taobao.org/entities/download/entities-1.1.2.tgz",
+          "integrity": "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY="
+        },
         "readable-stream": {
-          "version": "3.3.0",
-          "resolved": "http://registry.npm.taobao.org/readable-stream/download/readable-stream-3.3.0.tgz",
-          "integrity": "sha1-y4ARqtAC63F78EApH+uoVpyYb7k=",
+          "version": "3.6.0",
+          "resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.6.0.tgz",
+          "integrity": "sha1-M3u9o63AcGvT4CRCaihtS0sskZg=",
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -6409,54 +8867,361 @@
       "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc="
     },
     "http-errors": {
-      "version": "1.6.3",
-      "resolved": "http://registry.npm.taobao.org/http-errors/download/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "version": "1.7.2",
+      "resolved": "https://registry.npm.taobao.org/http-errors/download/http-errors-1.7.2.tgz?cache=0&sync_timestamp=1561418493658&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.2.tgz",
+      "integrity": "sha1-T1ApzxMjnzEDblsuVSkrz7zIXI8=",
       "requires": {
         "depd": "~1.1.2",
         "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        },
+        "setprototypeof": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.1.tgz?cache=0&sync_timestamp=1563425414995&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsetprototypeof%2Fdownload%2Fsetprototypeof-1.1.1.tgz",
+          "integrity": "sha1-fpWsskqpL1iF4KvvW6ExMw1K5oM="
+        },
+        "statuses": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz?cache=0&sync_timestamp=1587328859420&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstatuses%2Fdownload%2Fstatuses-1.5.0.tgz",
+          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+        }
       }
     },
     "http-parser-js": {
-      "version": "0.5.0",
-      "resolved": "http://registry.npm.taobao.org/http-parser-js/download/http-parser-js-0.5.0.tgz",
-      "integrity": "sha1-1l7b7ehDSdDcMDIIFaFdOcw8u9g="
+      "version": "0.4.10",
+      "resolved": "https://registry.npm.taobao.org/http-parser-js/download/http-parser-js-0.4.10.tgz?cache=0&sync_timestamp=1572714627611&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-parser-js%2Fdownload%2Fhttp-parser-js-0.4.10.tgz",
+      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q="
     },
     "http-proxy": {
-      "version": "1.17.0",
-      "resolved": "http://registry.npm.taobao.org/http-proxy/download/http-proxy-1.17.0.tgz",
-      "integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=",
+      "version": "1.18.0",
+      "resolved": "https://registry.npm.taobao.org/http-proxy/download/http-proxy-1.18.0.tgz?cache=0&sync_timestamp=1568770896103&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-proxy%2Fdownload%2Fhttp-proxy-1.18.0.tgz",
+      "integrity": "sha1-2+VfY+daNH2389mZdPJpKjFKajo=",
       "requires": {
-        "eventemitter3": "^3.0.0",
+        "eventemitter3": "^4.0.0",
         "follow-redirects": "^1.0.0",
         "requires-port": "^1.0.0"
       }
     },
     "http-proxy-middleware": {
-      "version": "0.17.4",
-      "resolved": "http://registry.npm.taobao.org/http-proxy-middleware/download/http-proxy-middleware-0.17.4.tgz",
-      "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=",
+      "version": "0.19.1",
+      "resolved": "https://registry.npm.taobao.org/http-proxy-middleware/download/http-proxy-middleware-0.19.1.tgz",
+      "integrity": "sha1-GDx9xKoUeRUDBkmMIQza+WCApDo=",
       "requires": {
-        "http-proxy": "^1.16.2",
-        "is-glob": "^3.1.0",
-        "lodash": "^4.17.2",
-        "micromatch": "^2.3.11"
+        "http-proxy": "^1.17.0",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.11",
+        "micromatch": "^3.1.10"
       },
       "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/arr-diff/download/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npm.taobao.org/array-unique/download/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npm.taobao.org/braces/download/braces-2.3.2.tgz",
+          "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=",
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
+          "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+          "requires": {
+            "is-descriptor": "^1.0.2",
+            "isobject": "^3.0.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npm.taobao.org/expand-brackets/download/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-0.1.6.tgz",
+              "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
+              "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz",
+              "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0="
+            }
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+              "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npm.taobao.org/extglob/download/extglob-2.0.4.tgz",
+          "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=",
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
         "is-extglob": {
           "version": "2.1.1",
           "resolved": "http://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz",
           "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
         },
         "is-glob": {
-          "version": "3.1.0",
-          "resolved": "http://registry.npm.taobao.org/is-glob/download/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "version": "4.0.1",
+          "resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz",
+          "integrity": "sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw=",
           "requires": {
-            "is-extglob": "^2.1.0"
+            "is-extglob": "^2.1.1"
           }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+          "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npm.taobao.org/micromatch/download/micromatch-3.1.10.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmicromatch%2Fdownload%2Fmicromatch-3.1.10.tgz",
+          "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=",
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         }
       }
     },
@@ -6473,7 +9238,8 @@
     "https-browserify": {
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/https-browserify/download/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
     },
     "hyphenate-style-name": {
       "version": "1.0.3",
@@ -6488,27 +9254,67 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
-    "icss-replace-symbols": {
-      "version": "1.1.0",
-      "resolved": "http://registry.npm.taobao.org/icss-replace-symbols/download/icss-replace-symbols-1.1.0.tgz",
-      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0="
-    },
     "icss-utils": {
-      "version": "2.1.0",
-      "resolved": "http://registry.npm.taobao.org/icss-utils/download/icss-utils-2.1.0.tgz",
-      "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
+      "version": "4.1.1",
+      "resolved": "https://registry.npm.taobao.org/icss-utils/download/icss-utils-4.1.1.tgz",
+      "integrity": "sha1-IRcLU3ie4nRHwvR91oMIFAP5pGc=",
       "requires": {
-        "postcss": "^6.0.1"
+        "postcss": "^7.0.14"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+<<<<<<< HEAD
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz",
+=======
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1585815676992&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz",
+>>>>>>> f191fbe55a03f133615d827fc04311e6de41b163
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
+              "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "postcss": {
+          "version": "7.0.27",
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.27.tgz?cache=0&sync_timestamp=1581994803116&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.27.tgz",
+          "integrity": "sha1-zGfNxrDao3UQW3xCSoVWc0X8VNk=",
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "ieee754": {
       "version": "1.1.13",
       "resolved": "http://registry.npm.taobao.org/ieee754/download/ieee754-1.1.13.tgz",
-      "integrity": "sha1-7BaFWOlaoYH9h9N/VcMrvLZwi4Q="
+      "integrity": "sha1-7BaFWOlaoYH9h9N/VcMrvLZwi4Q=",
+      "dev": true
     },
     "iferr": {
       "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "resolved": "https://registry.npm.taobao.org/iferr/download/iferr-0.1.5.tgz",
       "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
       "dev": true
     },
@@ -6517,18 +9323,32 @@
       "resolved": "http://registry.npm.taobao.org/ignore/download/ignore-3.3.10.tgz",
       "integrity": "sha1-Cpf7h2mG6AgcYxFg+PnziRV/AEM="
     },
+    "ignore-walk": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npm.taobao.org/ignore-walk/download/ignore-walk-3.0.3.tgz",
+      "integrity": "sha1-AX4kRxhL/q3nwjjkrv3R6PlbHjc=",
+      "optional": true,
+      "requires": {
+        "minimatch": "^3.0.4"
+      }
+    },
+    "immer": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npm.taobao.org/immer/download/immer-1.10.0.tgz",
+      "integrity": "sha1-utZ2BbqcgQJ12R4cKkfUWC6YKG0="
+    },
     "immutability-helper": {
       "version": "2.9.1",
-      "resolved": "http://registry.npm.taobao.org/immutability-helper/download/immutability-helper-2.9.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/immutability-helper/download/immutability-helper-2.9.1.tgz",
       "integrity": "sha1-ccQjujh+Z7bGzroGUFcvKipnJ98=",
       "requires": {
         "invariant": "^2.2.0"
       }
     },
     "immutable": {
-      "version": "3.8.2",
-      "resolved": "http://registry.npm.taobao.org/immutable/download/immutable-3.8.2.tgz",
-      "integrity": "sha1-wkOZUUVbs5kT2vKBN28VMOEErfM="
+      "version": "3.7.6",
+      "resolved": "https://registry.npm.taobao.org/immutable/download/immutable-3.7.6.tgz",
+      "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks="
     },
     "import-lazy": {
       "version": "2.1.0",
@@ -6536,12 +9356,60 @@
       "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM="
     },
     "import-local": {
-      "version": "0.1.1",
-      "resolved": "http://registry.npm.taobao.org/import-local/download/import-local-0.1.1.tgz",
-      "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/import-local/download/import-local-2.0.0.tgz",
+      "integrity": "sha1-VQcL44pZk88Y72236WH1vuXFoJ0=",
       "requires": {
-        "pkg-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0",
         "resolve-cwd": "^2.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz",
+          "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=",
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz",
+          "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npm.taobao.org/p-limit/download/p-limit-2.3.0.tgz",
+          "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz",
+          "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=",
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npm.taobao.org/p-try/download/p-try-2.2.0.tgz",
+          "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY="
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz",
+          "integrity": "sha1-J0kCDyOe2ZCIGx9xIQ1R62UjvqM=",
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        }
       }
     },
     "imurmurhash": {
@@ -6550,9 +9418,9 @@
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
     },
     "in-publish": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
-      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npm.taobao.org/in-publish/download/in-publish-2.0.1.tgz",
+      "integrity": "sha1-lIsaU1yAMFYc6lIvc/ePS+NX4Aw=",
       "dev": true
     },
     "indefinite-observable": {
@@ -6573,13 +9441,24 @@
     },
     "indexes-of": {
       "version": "1.0.1",
+<<<<<<< HEAD
+      "resolved": "https://registry.npm.taobao.org/indexes-of/download/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+=======
+<<<<<<< HEAD
       "resolved": "http://registry.npm.taobao.org/indexes-of/download/indexes-of-1.0.1.tgz",
+=======
+      "resolved": "https://registry.npm.taobao.org/indexes-of/download/indexes-of-1.0.1.tgz",
+>>>>>>> f191fbe55a03f133615d827fc04311e6de41b163
       "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
+>>>>>>> 22e9ed32d0b11c3a43e6a9929e1072e6c78f3fa4
     },
-    "indexof": {
-      "version": "0.0.1",
-      "resolved": "http://registry.npm.taobao.org/indexof/download/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
+    "infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npm.taobao.org/infer-owner/download/infer-owner-1.0.4.tgz",
+      "integrity": "sha1-xM78qo5RBRwqQLos6KPScpWvlGc=",
+      "dev": true
     },
     "inflight": {
       "version": "1.0.6",
@@ -6591,9 +9470,9 @@
       }
     },
     "inherits": {
-      "version": "2.0.3",
-      "resolved": "http://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+      "version": "2.0.4",
+      "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz",
+      "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w="
     },
     "ini": {
       "version": "1.3.5",
@@ -6601,30 +9480,29 @@
       "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc="
     },
     "inquirer": {
-      "version": "3.3.0",
-      "resolved": "http://registry.npm.taobao.org/inquirer/download/inquirer-3.3.0.tgz",
-      "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=",
+      "version": "6.5.0",
+      "resolved": "https://registry.npm.taobao.org/inquirer/download/inquirer-6.5.0.tgz",
+      "integrity": "sha1-IwMxfvyaTqfsLi32+GVptzSsz0I=",
       "requires": {
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.0",
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
         "cli-cursor": "^2.1.0",
         "cli-width": "^2.0.0",
-        "external-editor": "^2.0.4",
+        "external-editor": "^3.0.3",
         "figures": "^2.0.0",
-        "lodash": "^4.3.0",
+        "lodash": "^4.17.12",
         "mute-stream": "0.0.7",
         "run-async": "^2.2.0",
-        "rx-lite": "^4.0.8",
-        "rx-lite-aggregates": "^4.0.8",
+        "rxjs": "^6.4.0",
         "string-width": "^2.1.0",
-        "strip-ansi": "^4.0.0",
+        "strip-ansi": "^5.1.0",
         "through": "^2.3.6"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+          "version": "4.1.0",
+          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-4.1.0.tgz",
+          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc="
         },
         "chalk": {
           "version": "2.4.2",
@@ -6636,28 +9514,40 @@
             "supports-color": "^5.3.0"
           }
         },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+        "chardet": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npm.taobao.org/chardet/download/chardet-0.7.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchardet%2Fdownload%2Fchardet-0.7.0.tgz",
+          "integrity": "sha1-kAlISfCTfy7twkJdDSip5fDLrZ4="
+        },
+        "external-editor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npm.taobao.org/external-editor/download/external-editor-3.1.0.tgz?cache=0&sync_timestamp=1562602052556&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fexternal-editor%2Fdownload%2Fexternal-editor-3.1.0.tgz",
+          "integrity": "sha1-ywP3QL764D6k0oPK7SdBqD8zVJU=",
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "chardet": "^0.7.0",
+            "iconv-lite": "^0.4.24",
+            "tmp": "^0.0.33"
+          }
+        },
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz",
+          "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg="
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz",
+          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
+          "requires": {
+            "ansi-regex": "^4.1.0"
           }
         }
       }
     },
     "install": {
       "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/install/-/install-0.12.2.tgz",
-      "integrity": "sha512-+7thTb4Rpvs9mnlhHKGZFJbGOO6kyMgy+gg0sgM5vFzIFK0wrCYXqdlaM71Bi289DTuPHf61puMFsaZBcwDIrg=="
-    },
-    "internal-ip": {
-      "version": "1.2.0",
-      "resolved": "http://registry.npm.taobao.org/internal-ip/download/internal-ip-1.2.0.tgz",
-      "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=",
-      "requires": {
-        "meow": "^3.3.0"
-      }
+      "resolved": "https://registry.npm.taobao.org/install/download/install-0.12.2.tgz",
+      "integrity": "sha1-6hDpssu1sEhPJQgLJLWzRCnZ9WQ="
     },
     "interpret": {
       "version": "1.2.0",
@@ -6682,15 +9572,16 @@
       "resolved": "http://registry.npm.taobao.org/ip/download/ip-1.1.5.tgz",
       "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
     },
-    "ipaddr.js": {
-      "version": "1.8.0",
-      "resolved": "http://registry.npm.taobao.org/ipaddr.js/download/ipaddr.js-1.8.0.tgz",
-      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
-    },
-    "is-absolute-url": {
+    "ip-regex": {
       "version": "2.1.0",
-      "resolved": "http://registry.npm.taobao.org/is-absolute-url/download/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY="
+      "resolved": "https://registry.npm.taobao.org/ip-regex/download/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
+    },
+    "ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npm.taobao.org/ipaddr.js/download/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha1-v/OFQ+64mEglB5/zoqjmy9RngbM=",
+      "dev": true
     },
     "is-accessor-descriptor": {
       "version": "0.1.6",
@@ -6702,8 +9593,8 @@
     },
     "is-arguments": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
+      "resolved": "https://registry.npm.taobao.org/is-arguments/download/is-arguments-1.0.4.tgz",
+      "integrity": "sha1-P6+WbHy6D/Q3+zH2JQCC/PBEjPM="
     },
     "is-arrayish": {
       "version": "0.2.1",
@@ -6779,6 +9670,11 @@
       "resolved": "http://registry.npm.taobao.org/is-directory/download/is-directory-0.3.1.tgz",
       "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE="
     },
+    "is-docker": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/is-docker/download/is-docker-2.0.0.tgz",
+      "integrity": "sha1-LLDfDnXi0GT+GGTDfN6st7Lc8ls="
+    },
     "is-dotfile": {
       "version": "1.0.3",
       "resolved": "http://registry.npm.taobao.org/is-dotfile/download/is-dotfile-1.0.3.tgz",
@@ -6843,9 +9739,9 @@
       }
     },
     "is-mobile": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-mobile/-/is-mobile-2.2.0.tgz",
-      "integrity": "sha512-K0DmUqaZqYl6M8ej536uJYAQaBkx+qWph7xl1KRBr31UiGUT0MoFWUoqnIxzXnIeolnK8bkxtKXkZNL6HfSHhQ=="
+      "version": "2.2.1",
+      "resolved": "https://registry.npm.taobao.org/is-mobile/download/is-mobile-2.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-mobile%2Fdownload%2Fis-mobile-2.2.1.tgz",
+      "integrity": "sha1-EPIyABLEEMwoX+7LE0Br1Ybxsvg="
     },
     "is-npm": {
       "version": "1.0.0",
@@ -6911,6 +9807,11 @@
       "resolved": "http://registry.npm.taobao.org/is-posix-bracket/download/is-posix-bracket-0.1.1.tgz",
       "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q="
     },
+    "is-potential-custom-element-name": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/is-potential-custom-element-name/download/is-potential-custom-element-name-1.0.0.tgz",
+      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c="
+    },
     "is-primitive": {
       "version": "2.0.0",
       "resolved": "http://registry.npm.taobao.org/is-primitive/download/is-primitive-2.0.0.tgz",
@@ -6944,24 +9845,11 @@
       "resolved": "http://registry.npm.taobao.org/is-retry-allowed/download/is-retry-allowed-1.1.0.tgz",
       "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ="
     },
-    "is-root": {
-      "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/is-root/download/is-root-1.0.0.tgz",
-      "integrity": "sha1-B7bCM7w5TNnQK6FclmvWZg1jQtU="
-    },
     "is-stream": {
       "version": "1.1.0",
       "resolved": "http://registry.npm.taobao.org/is-stream/download/is-stream-1.1.0.tgz",
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
     },
-    "is-svg": {
-      "version": "2.1.0",
-      "resolved": "http://registry.npm.taobao.org/is-svg/download/is-svg-2.1.0.tgz",
-      "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
-      "requires": {
-        "html-comment-regex": "^1.1.0"
-      }
-    },
     "is-symbol": {
       "version": "1.0.2",
       "resolved": "http://registry.npm.taobao.org/is-symbol/download/is-symbol-1.0.2.tgz",
@@ -6980,6 +9868,11 @@
       "resolved": "http://registry.npm.taobao.org/is-utf8/download/is-utf8-0.2.1.tgz",
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
     },
+    "is-what": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npm.taobao.org/is-what/download/is-what-3.8.0.tgz",
+      "integrity": "sha1-YQvEalJDVfJCTrhe7cbru/fh/4w="
+    },
     "is-windows": {
       "version": "1.0.2",
       "resolved": "http://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz",
@@ -7394,9 +10287,9 @@
       }
     },
     "js-base64": {
-      "version": "2.5.1",
-      "resolved": "http://registry.npm.taobao.org/js-base64/download/js-base64-2.5.1.tgz",
-      "integrity": "sha1-Hvo57yxfeYC7F4St5KivLeMpESE="
+      "version": "2.5.2",
+      "resolved": "https://registry.npm.taobao.org/js-base64/download/js-base64-2.5.2.tgz?cache=0&sync_timestamp=1581520619493&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-base64%2Fdownload%2Fjs-base64-2.5.2.tgz",
+      "integrity": "sha1-MTtidN2nGPcU0AszMLuubjjpAgk="
     },
     "js-tokens": {
       "version": "4.0.0",
@@ -7404,19 +10297,12 @@
       "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk="
     },
     "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "version": "3.7.0",
+      "resolved": "http://registry.npm.taobao.org/js-yaml/download/js-yaml-3.7.0.tgz",
+      "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
       "requires": {
         "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-        }
+        "esprima": "^2.6.0"
       }
     },
     "jsbn": {
@@ -7454,6 +10340,14 @@
           "version": "4.0.13",
           "resolved": "http://registry.npm.taobao.org/acorn/download/acorn-4.0.13.tgz",
           "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
+        },
+        "html-encoding-sniffer": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npm.taobao.org/html-encoding-sniffer/download/html-encoding-sniffer-1.0.2.tgz",
+          "integrity": "sha1-5w2EuU2lOqN14R/jo1G+ZkLKRvg=",
+          "requires": {
+            "whatwg-encoding": "^1.0.1"
+          }
         }
       }
     },
@@ -7462,10 +10356,11 @@
       "resolved": "http://registry.npm.taobao.org/jsesc/download/jsesc-1.3.0.tgz",
       "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s="
     },
-    "json-loader": {
-      "version": "0.5.7",
-      "resolved": "http://registry.npm.taobao.org/json-loader/download/json-loader-0.5.7.tgz",
-      "integrity": "sha1-3KFKcCNf+C8KyaOr62DTN6NlGF0="
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/json-parse-better-errors/download/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk=",
+      "dev": true
     },
     "json-schema": {
       "version": "0.2.3",
@@ -7492,7 +10387,7 @@
     },
     "json2module": {
       "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/json2module/-/json2module-0.0.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/json2module/download/json2module-0.0.3.tgz",
       "integrity": "sha1-APtfSpt638PwZHwpyxe80Zeb6bI=",
       "requires": {
         "rw": "^1.3.2"
@@ -7500,16 +10395,16 @@
     },
     "json2mq": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/json2mq/download/json2mq-0.2.0.tgz",
       "integrity": "sha1-tje9O6nqvhIsg+lyBIOusQ0skEo=",
       "requires": {
         "string-convert": "^0.2.0"
       }
     },
     "json3": {
-      "version": "3.3.2",
-      "resolved": "http://registry.npm.taobao.org/json3/download/json3-3.3.2.tgz",
-      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE="
+      "version": "3.3.3",
+      "resolved": "https://registry.npm.taobao.org/json3/download/json3-3.3.3.tgz",
+      "integrity": "sha1-f8EON1/FrkLEcFpcwKpvYr4wW4E="
     },
     "json5": {
       "version": "0.5.1",
@@ -7642,8 +10537,8 @@
     },
     "katex": {
       "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/katex/-/katex-0.11.1.tgz",
-      "integrity": "sha512-5oANDICCTX0NqYIyAiFCCwjQ7ERu3DQG2JFHLbYOf+fXaMoH8eg/zOq5WSYJsKMi/QebW+Eh3gSM+oss1H/bww==",
+      "resolved": "https://registry.npm.taobao.org/katex/download/katex-0.11.1.tgz",
+      "integrity": "sha1-3zDKQMVlyd8BpGagDVPgeehP+qI=",
       "requires": {
         "commander": "^2.19.0"
       }
@@ -7666,14 +10561,6 @@
         "is-buffer": "^1.1.5"
       }
     },
-    "klaw": {
-      "version": "1.3.1",
-      "resolved": "http://registry.npm.taobao.org/klaw/download/klaw-1.3.1.tgz",
-      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-      "requires": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
     "latest-version": {
       "version": "3.1.0",
       "resolved": "http://registry.npm.taobao.org/latest-version/download/latest-version-3.1.0.tgz",
@@ -7723,59 +10610,14 @@
     },
     "load-script": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/load-script/-/load-script-1.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/load-script/download/load-script-1.0.0.tgz",
       "integrity": "sha1-BJGTngvuVkPuSUp+PaPSuscMbKQ="
     },
-    "loader-fs-cache": {
-      "version": "1.0.2",
-      "resolved": "http://registry.npm.taobao.org/loader-fs-cache/download/loader-fs-cache-1.0.2.tgz",
-      "integrity": "sha1-VM7fa3J+F3n9jwEgXwX26IcG8IY=",
-      "requires": {
-        "find-cache-dir": "^0.1.1",
-        "mkdirp": "0.5.1"
-      },
-      "dependencies": {
-        "find-cache-dir": {
-          "version": "0.1.1",
-          "resolved": "http://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-0.1.1.tgz",
-          "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
-          "requires": {
-            "commondir": "^1.0.1",
-            "mkdirp": "^0.5.1",
-            "pkg-dir": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "http://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "http://registry.npm.taobao.org/path-exists/download/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "pkg-dir": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/pkg-dir/download/pkg-dir-1.0.0.tgz",
-          "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-          "requires": {
-            "find-up": "^1.0.0"
-          }
-        }
-      }
-    },
     "loader-runner": {
       "version": "2.4.0",
       "resolved": "http://registry.npm.taobao.org/loader-runner/download/loader-runner-2.4.0.tgz",
-      "integrity": "sha1-7UcGa/5TTX6ExMe5mYwqdWB9k1c="
+      "integrity": "sha1-7UcGa/5TTX6ExMe5mYwqdWB9k1c=",
+      "dev": true
     },
     "loader-utils": {
       "version": "1.2.3",
@@ -7796,9 +10638,9 @@
           }
         },
         "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+          "version": "1.2.0",
+          "resolved": "http://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         }
       }
     },
@@ -7813,8 +10655,8 @@
     },
     "lodash": {
       "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+      "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz",
+      "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg="
     },
     "lodash-es": {
       "version": "4.17.11",
@@ -7831,11 +10673,6 @@
       "resolved": "http://registry.npm.taobao.org/lodash._reinterpolate/download/lodash._reinterpolate-3.0.0.tgz",
       "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
     },
-    "lodash.camelcase": {
-      "version": "4.3.0",
-      "resolved": "http://registry.npm.taobao.org/lodash.camelcase/download/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
-    },
     "lodash.cond": {
       "version": "4.5.2",
       "resolved": "http://registry.npm.taobao.org/lodash.cond/download/lodash.cond-4.5.2.tgz",
@@ -7881,6 +10718,11 @@
       "resolved": "http://registry.npm.taobao.org/lodash.memoize/download/lodash.memoize-4.1.2.tgz",
       "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
     },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npm.taobao.org/lodash.sortby/download/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+    },
     "lodash.template": {
       "version": "4.4.0",
       "resolved": "http://registry.npm.taobao.org/lodash.template/download/lodash.template-4.4.0.tgz",
@@ -7900,18 +10742,13 @@
     },
     "lodash.throttle": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
     },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "http://registry.npm.taobao.org/lodash.uniq/download/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
-    },
     "loglevel": {
-      "version": "1.6.1",
-      "resolved": "http://registry.npm.taobao.org/loglevel/download/loglevel-1.6.1.tgz",
-      "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po="
+      "version": "1.6.8",
+      "resolved": "https://registry.npm.taobao.org/loglevel/download/loglevel-1.6.8.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floglevel%2Fdownload%2Floglevel-1.6.8.tgz",
+      "integrity": "sha1-iiX7ddCSIw7NRFcnDYC1TigBEXE="
     },
     "longest": {
       "version": "1.0.1",
@@ -7935,11 +10772,6 @@
         "signal-exit": "^3.0.0"
       }
     },
-    "lower-case": {
-      "version": "1.1.4",
-      "resolved": "http://registry.npm.taobao.org/lower-case/download/lower-case-1.1.4.tgz",
-      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw="
-    },
     "lowercase-keys": {
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/lowercase-keys/download/lowercase-keys-1.0.1.tgz",
@@ -7977,6 +10809,14 @@
         "tmpl": "1.0.x"
       }
     },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npm.taobao.org/map-age-cleaner/download/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha1-fVg6cwZDTAVf5HSw9FB45uG0uSo=",
+      "requires": {
+        "p-defer": "^1.0.0"
+      }
+    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "http://registry.npm.taobao.org/map-cache/download/map-cache-0.2.2.tgz",
@@ -7995,11 +10835,6 @@
         "object-visit": "^1.0.0"
       }
     },
-    "material-colors": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
-      "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg=="
-    },
     "material-ui": {
       "version": "1.0.0-beta.46",
       "resolved": "http://registry.npm.taobao.org/material-ui/download/material-ui-1.0.0-beta.46.tgz",
@@ -8053,11 +10888,6 @@
         }
       }
     },
-    "math-expression-evaluator": {
-      "version": "1.2.17",
-      "resolved": "http://registry.npm.taobao.org/math-expression-evaluator/download/math-expression-evaluator-1.2.17.tgz",
-      "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw="
-    },
     "math-random": {
       "version": "1.0.4",
       "resolved": "http://registry.npm.taobao.org/math-random/download/math-random-1.0.4.tgz",
@@ -8065,7 +10895,7 @@
     },
     "md5": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/md5/download/md5-2.2.1.tgz",
       "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
       "requires": {
         "charenc": "~0.0.1",
@@ -8077,6 +10907,7 @@
       "version": "1.3.5",
       "resolved": "http://registry.npm.taobao.org/md5.js/download/md5.js-1.3.5.tgz",
       "integrity": "sha1-tdB7jjIW4+J81yjXL3DR5qNCAF8=",
+      "dev": true,
       "requires": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1",
@@ -8089,11 +10920,20 @@
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
     "mem": {
-      "version": "1.1.0",
-      "resolved": "http://registry.npm.taobao.org/mem/download/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "version": "4.3.0",
+      "resolved": "https://registry.npm.taobao.org/mem/download/mem-4.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmem%2Fdownload%2Fmem-4.3.0.tgz",
+      "integrity": "sha1-Rhr0l7xK4JYIzbLmDu+2m/90QXg=",
       "requires": {
-        "mimic-fn": "^1.0.0"
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-2.1.0.tgz?cache=0&sync_timestamp=1560442058146&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmimic-fn%2Fdownload%2Fmimic-fn-2.1.0.tgz",
+          "integrity": "sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs="
+        }
       }
     },
     "memoize-one": {
@@ -8128,9 +10968,9 @@
       },
       "dependencies": {
         "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+          "version": "1.2.0",
+          "resolved": "http://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         }
       }
     },
@@ -8139,16 +10979,34 @@
       "resolved": "http://registry.npm.taobao.org/merge/download/merge-1.2.1.tgz",
       "integrity": "sha1-OL6/gMMiCopIe2/Ps5QbsRcgwUU="
     },
+    "merge-anything": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npm.taobao.org/merge-anything/download/merge-anything-2.4.4.tgz",
+      "integrity": "sha1-YiayrD09P8X7no0jqkAN8l+Y/fA=",
+      "requires": {
+        "is-what": "^3.3.1"
+      }
+    },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/merge-descriptors/download/merge-descriptors-1.0.1.tgz",
       "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
     },
+    "merge2": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npm.taobao.org/merge2/download/merge2-1.3.0.tgz",
+      "integrity": "sha1-WzZu6DsvFYLEj4fkfPGpNSEDyoE="
+    },
     "methods": {
       "version": "1.1.2",
       "resolved": "http://registry.npm.taobao.org/methods/download/methods-1.1.2.tgz",
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
+    "microevent.ts": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npm.taobao.org/microevent.ts/download/microevent.ts-0.1.1.tgz",
+      "integrity": "sha1-cLCbg/Q99RctAgWmMCW84Pc1f6A="
+    },
     "micromatch": {
       "version": "2.3.11",
       "resolved": "http://registry.npm.taobao.org/micromatch/download/micromatch-2.3.11.tgz",
@@ -8173,6 +11031,7 @@
       "version": "4.0.1",
       "resolved": "http://registry.npm.taobao.org/miller-rabin/download/miller-rabin-4.0.1.tgz",
       "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
+      "dev": true,
       "requires": {
         "bn.js": "^4.0.0",
         "brorand": "^1.0.1"
@@ -8209,6 +11068,50 @@
         "dom-walk": "^0.1.0"
       }
     },
+    "mini-css-extract-plugin": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.9.0.tgz?cache=0&sync_timestamp=1576856580721&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.9.0.tgz",
+      "integrity": "sha1-R/LPB6oWWrNXM7H8l9TEbAVkM54=",
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "normalize-url": "1.9.1",
+        "schema-utils": "^1.0.0",
+        "webpack-sources": "^1.1.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.2",
+          "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.2.tgz?cache=0&sync_timestamp=1587338610933&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.2.tgz",
+          "integrity": "sha1-xinF7O0XuvMUQ3kY0tqIyZ1ZWM0=",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha1-VFFFB3xQFJHjOxXsQIwpQ3bpSuQ="
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA="
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz?cache=0&sync_timestamp=1587138145115&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-1.0.0.tgz",
+          "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=",
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
     "mini-store": {
       "version": "2.0.0",
       "resolved": "http://registry.npm.taobao.org/mini-store/download/mini-store-2.0.0.tgz",
@@ -8235,7 +11138,8 @@
     "minimalistic-crypto-utils": {
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/minimalistic-crypto-utils/download/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
     },
     "minimatch": {
       "version": "3.0.4",
@@ -8250,10 +11154,35 @@
       "resolved": "http://registry.npm.taobao.org/minimist/download/minimist-0.0.8.tgz",
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
+    "minipass": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npm.taobao.org/minipass/download/minipass-2.9.0.tgz",
+      "integrity": "sha1-5xN2Ln0+Mv7YAxFc+T4EvKn8yaY=",
+      "requires": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-3.1.1.tgz",
+          "integrity": "sha1-27fa+b/YusmrRev2ArjLrQ1dCP0="
+        }
+      }
+    },
+    "minizlib": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npm.taobao.org/minizlib/download/minizlib-1.3.3.tgz",
+      "integrity": "sha1-IpDeloGKNMKVUcio0wEha9Zahh0=",
+      "optional": true,
+      "requires": {
+        "minipass": "^2.9.0"
+      }
+    },
     "mississippi": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
-      "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
+      "resolved": "https://registry.npm.taobao.org/mississippi/download/mississippi-2.0.0.tgz",
+      "integrity": "sha1-NEKlCPr8KFAEhv7qmUCWduTuWm8=",
       "dev": true,
       "requires": {
         "concat-stream": "^1.5.0",
@@ -8270,8 +11199,8 @@
     },
     "mixin-deep": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "resolved": "https://registry.npm.taobao.org/mixin-deep/download/mixin-deep-1.3.2.tgz?cache=0&sync_timestamp=1561436244196&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmixin-deep%2Fdownload%2Fmixin-deep-1.3.2.tgz",
+      "integrity": "sha1-ESC0PcNZp4Xc5ltVuC4lfM9HlWY=",
       "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
@@ -8279,8 +11208,8 @@
       "dependencies": {
         "is-extendable": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "resolved": "http://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
           "requires": {
             "is-plain-object": "^2.0.4"
           }
@@ -8297,8 +11226,8 @@
     },
     "mockjs": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mockjs/-/mockjs-1.1.0.tgz",
-      "integrity": "sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ==",
+      "resolved": "https://registry.npm.taobao.org/mockjs/download/mockjs-1.1.0.tgz",
+      "integrity": "sha1-5qDDeOkZBtuv8gkRzAJzs8fXWwY=",
       "dev": true,
       "requires": {
         "commander": "*"
@@ -8310,21 +11239,21 @@
       "integrity": "sha1-DQVdU/UFKqZTyfbraLtdEr9cK1s="
     },
     "monaco-editor": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.13.1.tgz",
-      "integrity": "sha512-0Kssg/O3cl1tXP0qAIxhrtMbRnzusFUEvFyt5/fpUbmuVeY3z+TnUx13+3kW16pgacFPXGUTEO/hOPlDeFU/dw=="
+      "version": "0.20.0",
+      "resolved": "https://registry.npm.taobao.org/monaco-editor/download/monaco-editor-0.20.0.tgz",
+      "integrity": "sha1-XVAJNDpVASRCbLTZZaTSejSLTeo="
     },
     "monaco-editor-webpack-plugin": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.8.2.tgz",
-      "integrity": "sha512-g9G7A/lxQtpPsYaZFBqm73dwVkOziGUXExIR6iW7ksZUaiMkpvdTiE9O8edgdJGo+XtCmjycmIKB1Lt8VKbSTQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npm.taobao.org/monaco-editor-webpack-plugin/download/monaco-editor-webpack-plugin-1.9.0.tgz",
+      "integrity": "sha1-W1Rygbn0BAV9xdjFciOQ35rJC+Y=",
       "requires": {
         "loader-utils": "^1.2.3"
       }
     },
     "move-concurrently": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz",
       "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
       "dev": true,
       "requires": {
@@ -8398,10 +11327,67 @@
           "resolved": "http://registry.npm.taobao.org/array-unique/download/array-unique-0.3.2.tgz",
           "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
         },
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
+          "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+          "requires": {
+            "is-descriptor": "^1.0.2",
+            "isobject": "^3.0.1"
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        },
         "kind-of": {
           "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+          "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+          "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
         }
       }
     },
@@ -8410,6 +11396,17 @@
       "resolved": "http://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
     },
+    "needle": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npm.taobao.org/needle/download/needle-2.4.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fneedle%2Fdownload%2Fneedle-2.4.1.tgz",
+      "integrity": "sha1-FK9IcyRj10dWlvk3YmsbmTJHpWo=",
+      "optional": true,
+      "requires": {
+        "debug": "^3.2.6",
+        "iconv-lite": "^0.4.4",
+        "sax": "^1.2.4"
+      }
+    },
     "negotiator": {
       "version": "0.6.1",
       "resolved": "http://registry.npm.taobao.org/negotiator/download/negotiator-0.6.1.tgz",
@@ -8420,17 +11417,28 @@
       "resolved": "http://registry.npm.taobao.org/neo-async/download/neo-async-2.6.0.tgz",
       "integrity": "sha1-udFeTXHGdikIZUtRg+04t1M0CDU="
     },
-    "next-tick": {
-      "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/next-tick/download/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npm.taobao.org/nice-try/download/nice-try-1.0.5.tgz",
+      "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y="
     },
     "no-case": {
-      "version": "2.3.2",
-      "resolved": "http://registry.npm.taobao.org/no-case/download/no-case-2.3.2.tgz",
-      "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=",
+      "version": "3.0.3",
+      "resolved": "https://registry.npm.taobao.org/no-case/download/no-case-3.0.3.tgz?cache=0&sync_timestamp=1576748705107&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fno-case%2Fdownload%2Fno-case-3.0.3.tgz",
+      "integrity": "sha1-whtDTB/+SLOQh+hs+00lgunfGPg=",
       "requires": {
-        "lower-case": "^1.1.1"
+        "lower-case": "^2.0.1",
+        "tslib": "^1.10.0"
+      },
+      "dependencies": {
+        "lower-case": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npm.taobao.org/lower-case/download/lower-case-2.0.1.tgz",
+          "integrity": "sha1-Oe6zbjlhFcwF4pQi6uqeaSyUCMc=",
+          "requires": {
+            "tslib": "^1.10.0"
+          }
+        }
       }
     },
     "node-fetch": {
@@ -8443,14 +11451,14 @@
       }
     },
     "node-forge": {
-      "version": "0.7.5",
-      "resolved": "http://registry.npm.taobao.org/node-forge/download/node-forge-0.7.5.tgz",
-      "integrity": "sha1-bBUsNFzhHFL0ZcKr2VfoY5zWdN8="
+      "version": "0.9.0",
+      "resolved": "https://registry.npm.taobao.org/node-forge/download/node-forge-0.9.0.tgz?cache=0&sync_timestamp=1569524669712&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.9.0.tgz",
+      "integrity": "sha1-1iQFDtu0SHStyhK7mlLsY8t4JXk="
     },
     "node-gyp": {
       "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
-      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+      "resolved": "https://registry.npm.taobao.org/node-gyp/download/node-gyp-3.8.0.tgz",
+      "integrity": "sha1-VAMEJhwzDoDQ1e3OJTpoyzlkIYw=",
       "dev": true,
       "requires": {
         "fstream": "^1.0.0",
@@ -8469,7 +11477,7 @@
       "dependencies": {
         "semver": {
           "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.3.0.tgz",
           "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
           "dev": true
         }
@@ -8481,9 +11489,10 @@
       "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
     },
     "node-libs-browser": {
-      "version": "2.2.0",
-      "resolved": "http://registry.npm.taobao.org/node-libs-browser/download/node-libs-browser-2.2.0.tgz",
-      "integrity": "sha1-xy9g2dRt4IqUDe27JfP/ovm7qnc=",
+      "version": "2.2.1",
+      "resolved": "https://registry.npm.taobao.org/node-libs-browser/download/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha1-tk9RPRgzhiX5A0bSew0jXmMfZCU=",
+      "dev": true,
       "requires": {
         "assert": "^1.1.1",
         "browserify-zlib": "^0.2.0",
@@ -8495,7 +11504,7 @@
         "events": "^3.0.0",
         "https-browserify": "^1.0.0",
         "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.0",
+        "path-browserify": "0.0.1",
         "process": "^0.11.10",
         "punycode": "^1.2.4",
         "querystring-es3": "^0.2.0",
@@ -8507,18 +11516,20 @@
         "tty-browserify": "0.0.0",
         "url": "^0.11.0",
         "util": "^0.11.0",
-        "vm-browserify": "0.0.4"
+        "vm-browserify": "^1.0.1"
       },
       "dependencies": {
         "process": {
           "version": "0.11.10",
           "resolved": "http://registry.npm.taobao.org/process/download/process-0.11.10.tgz",
-          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+          "dev": true
         },
         "punycode": {
           "version": "1.4.1",
           "resolved": "http://registry.npm.taobao.org/punycode/download/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
         }
       }
     },
@@ -8534,10 +11545,66 @@
         "which": "^1.3.0"
       }
     },
+    "node-pre-gyp": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npm.taobao.org/node-pre-gyp/download/node-pre-gyp-0.14.0.tgz",
+      "integrity": "sha1-mgWWUzuHcom8rU4UOYLKPZBN3IM=",
+      "optional": true,
+      "requires": {
+        "detect-libc": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "needle": "^2.2.1",
+        "nopt": "^4.0.1",
+        "npm-packlist": "^1.1.6",
+        "npmlog": "^4.0.2",
+        "rc": "^1.2.7",
+        "rimraf": "^2.6.1",
+        "semver": "^5.3.0",
+        "tar": "^4.4.2"
+      },
+      "dependencies": {
+        "nopt": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npm.taobao.org/nopt/download/nopt-4.0.3.tgz",
+          "integrity": "sha1-o3XK2dAv2SEnjZVMIlTVqlfhXkg=",
+          "optional": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "tar": {
+          "version": "4.4.13",
+          "resolved": "https://registry.npm.taobao.org/tar/download/tar-4.4.13.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftar%2Fdownload%2Ftar-4.4.13.tgz",
+          "integrity": "sha1-Q7NkvFKIjVVSmGN7ENYHkCVKtSU=",
+          "optional": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.8.6",
+            "minizlib": "^1.2.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.3"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-3.1.1.tgz",
+          "integrity": "sha1-27fa+b/YusmrRev2ArjLrQ1dCP0=",
+          "optional": true
+        }
+      }
+    },
+    "node-releases": {
+      "version": "1.1.53",
+      "resolved": "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.53.tgz",
+      "integrity": "sha1-LYIb+kme18Xf/F4vKMiOeKCO4/Q="
+    },
     "node-sass": {
       "version": "4.13.1",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.1.tgz",
-      "integrity": "sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==",
+      "resolved": "https://registry.npm.taobao.org/node-sass/download/node-sass-4.13.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-sass%2Fdownload%2Fnode-sass-4.13.1.tgz",
+      "integrity": "sha1-nbVolpa7LuwsMrmL/qTHoumS0KM=",
       "dev": true,
       "requires": {
         "async-foreach": "^0.1.3",
@@ -8561,7 +11628,7 @@
       "dependencies": {
         "cross-spawn": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-3.0.1.tgz",
           "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
           "dev": true,
           "requires": {
@@ -8571,15 +11638,15 @@
         },
         "lodash": {
           "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz",
+          "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=",
           "dev": true
         }
       }
     },
     "nopt": {
       "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz",
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
@@ -8626,3101 +11693,30 @@
         "sort-keys": "^1.0.0"
       }
     },
-    "npm": {
-      "version": "6.13.7",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-6.13.7.tgz",
-      "integrity": "sha512-X967EKTT407CvgrWFjXusnPh0VLERcmR9hZFSVgkEquOomZkvpwLJ5zrQ3qrG9SpPLKJE4bPLUu76exKQ4a3Cg==",
+    "npm-bundled": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npm.taobao.org/npm-bundled/download/npm-bundled-1.1.1.tgz",
+      "integrity": "sha1-Ht1XCGWpTNsbyCIHdeKUZsn7I0s=",
+      "optional": true,
       "requires": {
-        "JSONStream": "^1.3.5",
-        "abbrev": "~1.1.1",
-        "ansicolors": "~0.3.2",
-        "ansistyles": "~0.1.3",
-        "aproba": "^2.0.0",
-        "archy": "~1.0.0",
-        "bin-links": "^1.1.7",
-        "bluebird": "^3.5.5",
-        "byte-size": "^5.0.1",
-        "cacache": "^12.0.3",
-        "call-limit": "^1.1.1",
-        "chownr": "^1.1.3",
-        "ci-info": "^2.0.0",
-        "cli-columns": "^3.1.2",
-        "cli-table3": "^0.5.1",
-        "cmd-shim": "^3.0.3",
-        "columnify": "~1.5.4",
-        "config-chain": "^1.1.12",
-        "debuglog": "*",
-        "detect-indent": "~5.0.0",
-        "detect-newline": "^2.1.0",
-        "dezalgo": "~1.0.3",
-        "editor": "~1.0.0",
-        "figgy-pudding": "^3.5.1",
-        "find-npm-prefix": "^1.0.2",
-        "fs-vacuum": "~1.2.10",
-        "fs-write-stream-atomic": "~1.0.10",
-        "gentle-fs": "^2.3.0",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.3",
-        "has-unicode": "~2.0.1",
-        "hosted-git-info": "^2.8.5",
-        "iferr": "^1.0.2",
-        "imurmurhash": "*",
-        "infer-owner": "^1.0.4",
-        "inflight": "~1.0.6",
-        "inherits": "^2.0.4",
-        "ini": "^1.3.5",
-        "init-package-json": "^1.10.3",
-        "is-cidr": "^3.0.0",
-        "json-parse-better-errors": "^1.0.2",
-        "lazy-property": "~1.0.0",
-        "libcipm": "^4.0.7",
-        "libnpm": "^3.0.1",
-        "libnpmaccess": "^3.0.2",
-        "libnpmhook": "^5.0.3",
-        "libnpmorg": "^1.0.1",
-        "libnpmsearch": "^2.0.2",
-        "libnpmteam": "^1.0.2",
-        "libnpx": "^10.2.2",
-        "lock-verify": "^2.1.0",
-        "lockfile": "^1.0.4",
-        "lodash._baseindexof": "*",
-        "lodash._baseuniq": "~4.6.0",
-        "lodash._bindcallback": "*",
-        "lodash._cacheindexof": "*",
-        "lodash._createcache": "*",
-        "lodash._getnative": "*",
-        "lodash.clonedeep": "~4.5.0",
-        "lodash.restparam": "*",
-        "lodash.union": "~4.6.0",
-        "lodash.uniq": "~4.5.0",
-        "lodash.without": "~4.4.0",
-        "lru-cache": "^5.1.1",
-        "meant": "~1.0.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "~0.5.1",
-        "move-concurrently": "^1.0.1",
-        "node-gyp": "^5.0.7",
-        "nopt": "~4.0.1",
-        "normalize-package-data": "^2.5.0",
-        "npm-audit-report": "^1.3.2",
-        "npm-cache-filename": "~1.0.2",
-        "npm-install-checks": "^3.0.2",
-        "npm-lifecycle": "^3.1.4",
-        "npm-package-arg": "^6.1.1",
-        "npm-packlist": "^1.4.7",
-        "npm-pick-manifest": "^3.0.2",
-        "npm-profile": "^4.0.2",
-        "npm-registry-fetch": "^4.0.2",
-        "npm-user-validate": "~1.0.0",
-        "npmlog": "~4.1.2",
-        "once": "~1.4.0",
-        "opener": "^1.5.1",
-        "osenv": "^0.1.5",
-        "pacote": "^9.5.12",
-        "path-is-inside": "~1.0.2",
-        "promise-inflight": "~1.0.1",
-        "qrcode-terminal": "^0.12.0",
-        "query-string": "^6.8.2",
-        "qw": "~1.0.1",
-        "read": "~1.0.7",
-        "read-cmd-shim": "^1.0.5",
-        "read-installed": "~4.0.3",
-        "read-package-json": "^2.1.1",
-        "read-package-tree": "^5.3.1",
-        "readable-stream": "^3.4.0",
-        "readdir-scoped-modules": "^1.1.0",
-        "request": "^2.88.0",
-        "retry": "^0.12.0",
-        "rimraf": "^2.6.3",
-        "safe-buffer": "^5.1.2",
-        "semver": "^5.7.1",
-        "sha": "^3.0.0",
-        "slide": "~1.1.6",
-        "sorted-object": "~2.0.1",
-        "sorted-union-stream": "~2.1.3",
-        "ssri": "^6.0.1",
-        "stringify-package": "^1.0.1",
-        "tar": "^4.4.13",
-        "text-table": "~0.2.0",
-        "tiny-relative-date": "^1.3.0",
-        "uid-number": "0.0.6",
-        "umask": "~1.1.0",
-        "unique-filename": "^1.1.1",
-        "unpipe": "~1.0.0",
-        "update-notifier": "^2.5.0",
-        "uuid": "^3.3.3",
-        "validate-npm-package-license": "^3.0.4",
-        "validate-npm-package-name": "~3.0.0",
-        "which": "^1.3.1",
-        "worker-farm": "^1.7.0",
-        "write-file-atomic": "^2.4.3"
-      },
-      "dependencies": {
-        "JSONStream": {
-          "version": "1.3.5",
-          "bundled": true,
-          "requires": {
-            "jsonparse": "^1.2.0",
-            "through": ">=2.2.7 <3"
-          }
-        },
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true
-        },
-        "agent-base": {
-          "version": "4.3.0",
-          "bundled": true,
-          "requires": {
-            "es6-promisify": "^5.0.0"
-          }
-        },
-        "agentkeepalive": {
-          "version": "3.5.2",
-          "bundled": true,
-          "requires": {
-            "humanize-ms": "^1.2.1"
-          }
-        },
-        "ajv": {
-          "version": "5.5.2",
-          "bundled": true,
-          "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
-          }
-        },
-        "ansi-align": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "string-width": "^2.0.0"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "bundled": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "ansicolors": {
-          "version": "0.3.2",
-          "bundled": true
-        },
-        "ansistyles": {
-          "version": "0.1.3",
-          "bundled": true
-        },
-        "aproba": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "archy": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "bundled": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "asap": {
-          "version": "2.0.6",
-          "bundled": true
-        },
-        "asn1": {
-          "version": "0.2.4",
-          "bundled": true,
-          "requires": {
-            "safer-buffer": "~2.1.0"
-          }
-        },
-        "assert-plus": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "bundled": true
-        },
-        "aws-sign2": {
-          "version": "0.7.0",
-          "bundled": true
-        },
-        "aws4": {
-          "version": "1.8.0",
-          "bundled": true
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "bcrypt-pbkdf": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "tweetnacl": "^0.14.3"
-          }
-        },
-        "bin-links": {
-          "version": "1.1.7",
-          "bundled": true,
-          "requires": {
-            "bluebird": "^3.5.3",
-            "cmd-shim": "^3.0.0",
-            "gentle-fs": "^2.3.0",
-            "graceful-fs": "^4.1.15",
-            "npm-normalize-package-bin": "^1.0.0",
-            "write-file-atomic": "^2.3.0"
-          }
-        },
-        "bluebird": {
-          "version": "3.5.5",
-          "bundled": true
-        },
-        "boxen": {
-          "version": "1.3.0",
-          "bundled": true,
-          "requires": {
-            "ansi-align": "^2.0.0",
-            "camelcase": "^4.0.0",
-            "chalk": "^2.0.1",
-            "cli-boxes": "^1.0.0",
-            "string-width": "^2.0.0",
-            "term-size": "^1.2.0",
-            "widest-line": "^2.0.0"
-          }
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "buffer-from": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "builtins": {
-          "version": "1.0.3",
-          "bundled": true
-        },
-        "byline": {
-          "version": "5.0.0",
-          "bundled": true
-        },
-        "byte-size": {
-          "version": "5.0.1",
-          "bundled": true
-        },
-        "cacache": {
-          "version": "12.0.3",
-          "bundled": true,
-          "requires": {
-            "bluebird": "^3.5.5",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.4",
-            "graceful-fs": "^4.1.15",
-            "infer-owner": "^1.0.3",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.3",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
-          }
-        },
-        "call-limit": {
-          "version": "1.1.1",
-          "bundled": true
-        },
-        "camelcase": {
-          "version": "4.1.0",
-          "bundled": true
-        },
-        "capture-stack-trace": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "bundled": true
-        },
-        "chalk": {
-          "version": "2.4.1",
-          "bundled": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "chownr": {
-          "version": "1.1.3",
-          "bundled": true
-        },
-        "ci-info": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "cidr-regex": {
-          "version": "2.0.10",
-          "bundled": true,
-          "requires": {
-            "ip-regex": "^2.1.0"
-          }
-        },
-        "cli-boxes": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "cli-columns": {
-          "version": "3.1.2",
-          "bundled": true,
-          "requires": {
-            "string-width": "^2.0.0",
-            "strip-ansi": "^3.0.1"
-          }
-        },
-        "cli-table3": {
-          "version": "0.5.1",
-          "bundled": true,
-          "requires": {
-            "colors": "^1.1.2",
-            "object-assign": "^4.1.0",
-            "string-width": "^2.1.1"
-          }
-        },
-        "cliui": {
-          "version": "4.1.0",
-          "bundled": true,
-          "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "bundled": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "bundled": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
-        "clone": {
-          "version": "1.0.4",
-          "bundled": true
-        },
-        "cmd-shim": {
-          "version": "3.0.3",
-          "bundled": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "mkdirp": "~0.5.0"
-          }
-        },
-        "co": {
-          "version": "4.6.0",
-          "bundled": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "color-convert": {
-          "version": "1.9.1",
-          "bundled": true,
-          "requires": {
-            "color-name": "^1.1.1"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "bundled": true
-        },
-        "colors": {
-          "version": "1.3.3",
-          "bundled": true,
-          "optional": true
-        },
-        "columnify": {
-          "version": "1.5.4",
-          "bundled": true,
-          "requires": {
-            "strip-ansi": "^3.0.0",
-            "wcwidth": "^1.0.0"
-          }
-        },
-        "combined-stream": {
-          "version": "1.0.6",
-          "bundled": true,
-          "requires": {
-            "delayed-stream": "~1.0.0"
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true
-        },
-        "concat-stream": {
-          "version": "1.6.2",
-          "bundled": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "inherits": "^2.0.3",
-            "readable-stream": "^2.2.2",
-            "typedarray": "^0.0.6"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "config-chain": {
-          "version": "1.1.12",
-          "bundled": true,
-          "requires": {
-            "ini": "^1.3.4",
-            "proto-list": "~1.2.1"
-          }
-        },
-        "configstore": {
-          "version": "3.1.2",
-          "bundled": true,
-          "requires": {
-            "dot-prop": "^4.1.0",
-            "graceful-fs": "^4.1.2",
-            "make-dir": "^1.0.0",
-            "unique-string": "^1.0.0",
-            "write-file-atomic": "^2.0.0",
-            "xdg-basedir": "^3.0.0"
-          }
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "copy-concurrently": {
-          "version": "1.0.5",
-          "bundled": true,
-          "requires": {
-            "aproba": "^1.1.1",
-            "fs-write-stream-atomic": "^1.0.8",
-            "iferr": "^0.1.5",
-            "mkdirp": "^0.5.1",
-            "rimraf": "^2.5.4",
-            "run-queue": "^1.0.0"
-          },
-          "dependencies": {
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true
-            },
-            "iferr": {
-              "version": "0.1.5",
-              "bundled": true
-            }
-          }
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "create-error-class": {
-          "version": "3.0.2",
-          "bundled": true,
-          "requires": {
-            "capture-stack-trace": "^1.0.0"
-          }
-        },
-        "cross-spawn": {
-          "version": "5.1.0",
-          "bundled": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          },
-          "dependencies": {
-            "lru-cache": {
-              "version": "4.1.5",
-              "bundled": true,
-              "requires": {
-                "pseudomap": "^1.0.2",
-                "yallist": "^2.1.2"
-              }
-            },
-            "yallist": {
-              "version": "2.1.2",
-              "bundled": true
-            }
-          }
-        },
-        "crypto-random-string": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "cyclist": {
-          "version": "0.2.2",
-          "bundled": true
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "^1.0.0"
-          }
-        },
-        "debug": {
-          "version": "3.1.0",
-          "bundled": true,
-          "requires": {
-            "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "bundled": true
-            }
-          }
-        },
-        "debuglog": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "decamelize": {
-          "version": "1.2.0",
-          "bundled": true
-        },
-        "decode-uri-component": {
-          "version": "0.2.0",
-          "bundled": true
-        },
-        "deep-extend": {
-          "version": "0.5.1",
-          "bundled": true
-        },
-        "defaults": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "clone": "^1.0.2"
-          }
-        },
-        "define-properties": {
-          "version": "1.1.3",
-          "bundled": true,
-          "requires": {
-            "object-keys": "^1.0.12"
-          }
-        },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "detect-indent": {
-          "version": "5.0.0",
-          "bundled": true
-        },
-        "detect-newline": {
-          "version": "2.1.0",
-          "bundled": true
-        },
-        "dezalgo": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "asap": "^2.0.0",
-            "wrappy": "1"
-          }
-        },
-        "dot-prop": {
-          "version": "4.2.0",
-          "bundled": true,
-          "requires": {
-            "is-obj": "^1.0.0"
-          }
-        },
-        "dotenv": {
-          "version": "5.0.1",
-          "bundled": true
-        },
-        "duplexer3": {
-          "version": "0.1.4",
-          "bundled": true
-        },
-        "duplexify": {
-          "version": "3.6.0",
-          "bundled": true,
-          "requires": {
-            "end-of-stream": "^1.0.0",
-            "inherits": "^2.0.1",
-            "readable-stream": "^2.0.0",
-            "stream-shift": "^1.0.0"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "ecc-jsbn": {
-          "version": "0.1.2",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "~0.1.0",
-            "safer-buffer": "^2.1.0"
-          }
-        },
-        "editor": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "encoding": {
-          "version": "0.1.12",
-          "bundled": true,
-          "requires": {
-            "iconv-lite": "~0.4.13"
-          }
-        },
-        "end-of-stream": {
-          "version": "1.4.1",
-          "bundled": true,
-          "requires": {
-            "once": "^1.4.0"
-          }
-        },
-        "env-paths": {
-          "version": "2.2.0",
-          "bundled": true
-        },
-        "err-code": {
-          "version": "1.1.2",
-          "bundled": true
-        },
-        "errno": {
-          "version": "0.1.7",
-          "bundled": true,
-          "requires": {
-            "prr": "~1.0.1"
-          }
-        },
-        "es-abstract": {
-          "version": "1.12.0",
-          "bundled": true,
-          "requires": {
-            "es-to-primitive": "^1.1.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.1",
-            "is-callable": "^1.1.3",
-            "is-regex": "^1.0.4"
-          }
-        },
-        "es-to-primitive": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "is-callable": "^1.1.4",
-            "is-date-object": "^1.0.1",
-            "is-symbol": "^1.0.2"
-          }
-        },
-        "es6-promise": {
-          "version": "4.2.8",
-          "bundled": true
-        },
-        "es6-promisify": {
-          "version": "5.0.0",
-          "bundled": true,
-          "requires": {
-            "es6-promise": "^4.0.3"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "bundled": true
-        },
-        "execa": {
-          "version": "0.7.0",
-          "bundled": true,
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          },
-          "dependencies": {
-            "get-stream": {
-              "version": "3.0.0",
-              "bundled": true
-            }
-          }
-        },
-        "extend": {
-          "version": "3.0.2",
-          "bundled": true
-        },
-        "extsprintf": {
-          "version": "1.3.0",
-          "bundled": true
-        },
-        "fast-deep-equal": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "fast-json-stable-stringify": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "figgy-pudding": {
-          "version": "3.5.1",
-          "bundled": true
-        },
-        "find-npm-prefix": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "flush-write-stream": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "inherits": "^2.0.1",
-            "readable-stream": "^2.0.4"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "bundled": true
-        },
-        "form-data": {
-          "version": "2.3.2",
-          "bundled": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "1.0.6",
-            "mime-types": "^2.1.12"
-          }
-        },
-        "from2": {
-          "version": "2.3.0",
-          "bundled": true,
-          "requires": {
-            "inherits": "^2.0.1",
-            "readable-stream": "^2.0.0"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "fs-minipass": {
-          "version": "1.2.7",
-          "bundled": true,
-          "requires": {
-            "minipass": "^2.6.0"
-          },
-          "dependencies": {
-            "minipass": {
-              "version": "2.9.0",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.0"
-              }
-            }
-          }
-        },
-        "fs-vacuum": {
-          "version": "1.2.10",
-          "bundled": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "path-is-inside": "^1.0.1",
-            "rimraf": "^2.5.2"
-          }
-        },
-        "fs-write-stream-atomic": {
-          "version": "1.0.10",
-          "bundled": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "iferr": "^0.1.5",
-            "imurmurhash": "^0.1.4",
-            "readable-stream": "1 || 2"
-          },
-          "dependencies": {
-            "iferr": {
-              "version": "0.1.5",
-              "bundled": true
-            },
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "function-bind": {
-          "version": "1.1.1",
-          "bundled": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
-          },
-          "dependencies": {
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
-          }
-        },
-        "genfun": {
-          "version": "5.0.0",
-          "bundled": true
-        },
-        "gentle-fs": {
-          "version": "2.3.0",
-          "bundled": true,
-          "requires": {
-            "aproba": "^1.1.2",
-            "chownr": "^1.1.2",
-            "cmd-shim": "^3.0.3",
-            "fs-vacuum": "^1.2.10",
-            "graceful-fs": "^4.1.11",
-            "iferr": "^0.1.5",
-            "infer-owner": "^1.0.4",
-            "mkdirp": "^0.5.1",
-            "path-is-inside": "^1.0.2",
-            "read-cmd-shim": "^1.0.1",
-            "slide": "^1.1.6"
-          },
-          "dependencies": {
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true
-            },
-            "iferr": {
-              "version": "0.1.5",
-              "bundled": true
-            }
-          }
-        },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "bundled": true
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "bundled": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "getpass": {
-          "version": "0.1.7",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "^1.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.4",
-          "bundled": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "global-dirs": {
-          "version": "0.1.1",
-          "bundled": true,
-          "requires": {
-            "ini": "^1.3.4"
-          }
-        },
-        "got": {
-          "version": "6.7.1",
-          "bundled": true,
-          "requires": {
-            "create-error-class": "^3.0.0",
-            "duplexer3": "^0.1.4",
-            "get-stream": "^3.0.0",
-            "is-redirect": "^1.0.0",
-            "is-retry-allowed": "^1.0.0",
-            "is-stream": "^1.0.0",
-            "lowercase-keys": "^1.0.0",
-            "safe-buffer": "^5.0.1",
-            "timed-out": "^4.0.0",
-            "unzip-response": "^2.0.1",
-            "url-parse-lax": "^1.0.0"
-          },
-          "dependencies": {
-            "get-stream": {
-              "version": "3.0.0",
-              "bundled": true
-            }
-          }
-        },
-        "graceful-fs": {
-          "version": "4.2.3",
-          "bundled": true
-        },
-        "har-schema": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "har-validator": {
-          "version": "5.1.0",
-          "bundled": true,
-          "requires": {
-            "ajv": "^5.3.0",
-            "har-schema": "^2.0.0"
-          }
-        },
-        "has": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "function-bind": "^1.1.1"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "bundled": true
-        },
-        "has-symbols": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "hosted-git-info": {
-          "version": "2.8.5",
-          "bundled": true
-        },
-        "http-cache-semantics": {
-          "version": "3.8.1",
-          "bundled": true
-        },
-        "http-proxy-agent": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "agent-base": "4",
-            "debug": "3.1.0"
-          }
-        },
-        "http-signature": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "^1.0.0",
-            "jsprim": "^1.2.2",
-            "sshpk": "^1.7.0"
-          }
-        },
-        "https-proxy-agent": {
-          "version": "2.2.4",
-          "bundled": true,
-          "requires": {
-            "agent-base": "^4.3.0",
-            "debug": "^3.1.0"
-          }
-        },
-        "humanize-ms": {
-          "version": "1.2.1",
-          "bundled": true,
-          "requires": {
-            "ms": "^2.0.0"
-          }
-        },
-        "iconv-lite": {
-          "version": "0.4.23",
-          "bundled": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
-        "iferr": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "ignore-walk": {
-          "version": "3.0.3",
-          "bundled": true,
-          "requires": {
-            "minimatch": "^3.0.4"
-          }
-        },
-        "import-lazy": {
-          "version": "2.1.0",
-          "bundled": true
-        },
-        "imurmurhash": {
-          "version": "0.1.4",
-          "bundled": true
-        },
-        "infer-owner": {
-          "version": "1.0.4",
-          "bundled": true
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.4",
-          "bundled": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true
-        },
-        "init-package-json": {
-          "version": "1.10.3",
-          "bundled": true,
-          "requires": {
-            "glob": "^7.1.1",
-            "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
-            "promzard": "^0.3.0",
-            "read": "~1.0.1",
-            "read-package-json": "1 || 2",
-            "semver": "2.x || 3.x || 4 || 5",
-            "validate-npm-package-license": "^3.0.1",
-            "validate-npm-package-name": "^3.0.0"
-          }
-        },
-        "invert-kv": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "ip": {
-          "version": "1.1.5",
-          "bundled": true
-        },
-        "ip-regex": {
-          "version": "2.1.0",
-          "bundled": true
-        },
-        "is-callable": {
-          "version": "1.1.4",
-          "bundled": true
-        },
-        "is-ci": {
-          "version": "1.1.0",
-          "bundled": true,
-          "requires": {
-            "ci-info": "^1.0.0"
-          },
-          "dependencies": {
-            "ci-info": {
-              "version": "1.6.0",
-              "bundled": true
-            }
-          }
-        },
-        "is-cidr": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "cidr-regex": "^2.0.10"
-          }
-        },
-        "is-date-object": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "is-installed-globally": {
-          "version": "0.1.0",
-          "bundled": true,
-          "requires": {
-            "global-dirs": "^0.1.0",
-            "is-path-inside": "^1.0.0"
-          }
-        },
-        "is-npm": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "is-obj": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "is-path-inside": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "path-is-inside": "^1.0.1"
-          }
-        },
-        "is-redirect": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "is-regex": {
-          "version": "1.0.4",
-          "bundled": true,
-          "requires": {
-            "has": "^1.0.1"
-          }
-        },
-        "is-retry-allowed": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "is-stream": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "is-symbol": {
-          "version": "1.0.2",
-          "bundled": true,
-          "requires": {
-            "has-symbols": "^1.0.0"
-          }
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "isexe": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "bundled": true
-        },
-        "jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "optional": true
-        },
-        "json-parse-better-errors": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "json-schema": {
-          "version": "0.2.3",
-          "bundled": true
-        },
-        "json-schema-traverse": {
-          "version": "0.3.1",
-          "bundled": true
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "bundled": true
-        },
-        "jsonparse": {
-          "version": "1.3.1",
-          "bundled": true
-        },
-        "jsprim": {
-          "version": "1.4.1",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.3.0",
-            "json-schema": "0.2.3",
-            "verror": "1.10.0"
-          }
-        },
-        "latest-version": {
-          "version": "3.1.0",
-          "bundled": true,
-          "requires": {
-            "package-json": "^4.0.0"
-          }
-        },
-        "lazy-property": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "lcid": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "invert-kv": "^2.0.0"
-          }
-        },
-        "libcipm": {
-          "version": "4.0.7",
-          "bundled": true,
-          "requires": {
-            "bin-links": "^1.1.2",
-            "bluebird": "^3.5.1",
-            "figgy-pudding": "^3.5.1",
-            "find-npm-prefix": "^1.0.2",
-            "graceful-fs": "^4.1.11",
-            "ini": "^1.3.5",
-            "lock-verify": "^2.0.2",
-            "mkdirp": "^0.5.1",
-            "npm-lifecycle": "^3.0.0",
-            "npm-logical-tree": "^1.2.1",
-            "npm-package-arg": "^6.1.0",
-            "pacote": "^9.1.0",
-            "read-package-json": "^2.0.13",
-            "rimraf": "^2.6.2",
-            "worker-farm": "^1.6.0"
-          }
-        },
-        "libnpm": {
-          "version": "3.0.1",
-          "bundled": true,
-          "requires": {
-            "bin-links": "^1.1.2",
-            "bluebird": "^3.5.3",
-            "find-npm-prefix": "^1.0.2",
-            "libnpmaccess": "^3.0.2",
-            "libnpmconfig": "^1.2.1",
-            "libnpmhook": "^5.0.3",
-            "libnpmorg": "^1.0.1",
-            "libnpmpublish": "^1.1.2",
-            "libnpmsearch": "^2.0.2",
-            "libnpmteam": "^1.0.2",
-            "lock-verify": "^2.0.2",
-            "npm-lifecycle": "^3.0.0",
-            "npm-logical-tree": "^1.2.1",
-            "npm-package-arg": "^6.1.0",
-            "npm-profile": "^4.0.2",
-            "npm-registry-fetch": "^4.0.0",
-            "npmlog": "^4.1.2",
-            "pacote": "^9.5.3",
-            "read-package-json": "^2.0.13",
-            "stringify-package": "^1.0.0"
-          }
-        },
-        "libnpmaccess": {
-          "version": "3.0.2",
-          "bundled": true,
-          "requires": {
-            "aproba": "^2.0.0",
-            "get-stream": "^4.0.0",
-            "npm-package-arg": "^6.1.0",
-            "npm-registry-fetch": "^4.0.0"
-          }
-        },
-        "libnpmconfig": {
-          "version": "1.2.1",
-          "bundled": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1",
-            "find-up": "^3.0.0",
-            "ini": "^1.3.5"
-          },
-          "dependencies": {
-            "find-up": {
-              "version": "3.0.0",
-              "bundled": true,
-              "requires": {
-                "locate-path": "^3.0.0"
-              }
-            },
-            "locate-path": {
-              "version": "3.0.0",
-              "bundled": true,
-              "requires": {
-                "p-locate": "^3.0.0",
-                "path-exists": "^3.0.0"
-              }
-            },
-            "p-limit": {
-              "version": "2.2.0",
-              "bundled": true,
-              "requires": {
-                "p-try": "^2.0.0"
-              }
-            },
-            "p-locate": {
-              "version": "3.0.0",
-              "bundled": true,
-              "requires": {
-                "p-limit": "^2.0.0"
-              }
-            },
-            "p-try": {
-              "version": "2.2.0",
-              "bundled": true
-            }
-          }
-        },
-        "libnpmhook": {
-          "version": "5.0.3",
-          "bundled": true,
-          "requires": {
-            "aproba": "^2.0.0",
-            "figgy-pudding": "^3.4.1",
-            "get-stream": "^4.0.0",
-            "npm-registry-fetch": "^4.0.0"
-          }
-        },
-        "libnpmorg": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "aproba": "^2.0.0",
-            "figgy-pudding": "^3.4.1",
-            "get-stream": "^4.0.0",
-            "npm-registry-fetch": "^4.0.0"
-          }
-        },
-        "libnpmpublish": {
-          "version": "1.1.2",
-          "bundled": true,
-          "requires": {
-            "aproba": "^2.0.0",
-            "figgy-pudding": "^3.5.1",
-            "get-stream": "^4.0.0",
-            "lodash.clonedeep": "^4.5.0",
-            "normalize-package-data": "^2.4.0",
-            "npm-package-arg": "^6.1.0",
-            "npm-registry-fetch": "^4.0.0",
-            "semver": "^5.5.1",
-            "ssri": "^6.0.1"
-          }
-        },
-        "libnpmsearch": {
-          "version": "2.0.2",
-          "bundled": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1",
-            "get-stream": "^4.0.0",
-            "npm-registry-fetch": "^4.0.0"
-          }
-        },
-        "libnpmteam": {
-          "version": "1.0.2",
-          "bundled": true,
-          "requires": {
-            "aproba": "^2.0.0",
-            "figgy-pudding": "^3.4.1",
-            "get-stream": "^4.0.0",
-            "npm-registry-fetch": "^4.0.0"
-          }
-        },
-        "libnpx": {
-          "version": "10.2.2",
-          "bundled": true,
-          "requires": {
-            "dotenv": "^5.0.1",
-            "npm-package-arg": "^6.0.0",
-            "rimraf": "^2.6.2",
-            "safe-buffer": "^5.1.0",
-            "update-notifier": "^2.3.0",
-            "which": "^1.3.0",
-            "y18n": "^4.0.0",
-            "yargs": "^11.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "lock-verify": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "npm-package-arg": "^6.1.0",
-            "semver": "^5.4.1"
-          }
-        },
-        "lockfile": {
-          "version": "1.0.4",
-          "bundled": true,
-          "requires": {
-            "signal-exit": "^3.0.2"
-          }
-        },
-        "lodash._baseindexof": {
-          "version": "3.1.0",
-          "bundled": true
-        },
-        "lodash._baseuniq": {
-          "version": "4.6.0",
-          "bundled": true,
-          "requires": {
-            "lodash._createset": "~4.0.0",
-            "lodash._root": "~3.0.0"
-          }
-        },
-        "lodash._bindcallback": {
-          "version": "3.0.1",
-          "bundled": true
-        },
-        "lodash._cacheindexof": {
-          "version": "3.0.2",
-          "bundled": true
-        },
-        "lodash._createcache": {
-          "version": "3.1.2",
-          "bundled": true,
-          "requires": {
-            "lodash._getnative": "^3.0.0"
-          }
-        },
-        "lodash._createset": {
-          "version": "4.0.3",
-          "bundled": true
-        },
-        "lodash._getnative": {
-          "version": "3.9.1",
-          "bundled": true
-        },
-        "lodash._root": {
-          "version": "3.0.1",
-          "bundled": true
-        },
-        "lodash.clonedeep": {
-          "version": "4.5.0",
-          "bundled": true
-        },
-        "lodash.restparam": {
-          "version": "3.6.1",
-          "bundled": true
-        },
-        "lodash.union": {
-          "version": "4.6.0",
-          "bundled": true
-        },
-        "lodash.uniq": {
-          "version": "4.5.0",
-          "bundled": true
-        },
-        "lodash.without": {
-          "version": "4.4.0",
-          "bundled": true
-        },
-        "lowercase-keys": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "lru-cache": {
-          "version": "5.1.1",
-          "bundled": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "make-dir": {
-          "version": "1.3.0",
-          "bundled": true,
-          "requires": {
-            "pify": "^3.0.0"
-          }
-        },
-        "make-fetch-happen": {
-          "version": "5.0.2",
-          "bundled": true,
-          "requires": {
-            "agentkeepalive": "^3.4.1",
-            "cacache": "^12.0.0",
-            "http-cache-semantics": "^3.8.1",
-            "http-proxy-agent": "^2.1.0",
-            "https-proxy-agent": "^2.2.3",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "node-fetch-npm": "^2.0.2",
-            "promise-retry": "^1.1.1",
-            "socks-proxy-agent": "^4.0.0",
-            "ssri": "^6.0.0"
-          }
-        },
-        "map-age-cleaner": {
-          "version": "0.1.3",
-          "bundled": true,
-          "requires": {
-            "p-defer": "^1.0.0"
-          }
-        },
-        "meant": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "mem": {
-          "version": "4.3.0",
-          "bundled": true,
-          "requires": {
-            "map-age-cleaner": "^0.1.1",
-            "mimic-fn": "^2.0.0",
-            "p-is-promise": "^2.0.0"
-          },
-          "dependencies": {
-            "mimic-fn": {
-              "version": "2.1.0",
-              "bundled": true
-            }
-          }
-        },
-        "mime-db": {
-          "version": "1.35.0",
-          "bundled": true
-        },
-        "mime-types": {
-          "version": "2.1.19",
-          "bundled": true,
-          "requires": {
-            "mime-db": "~1.35.0"
-          }
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true
-        },
-        "minizlib": {
-          "version": "1.3.3",
-          "bundled": true,
-          "requires": {
-            "minipass": "^2.9.0"
-          },
-          "dependencies": {
-            "minipass": {
-              "version": "2.9.0",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.0"
-              }
-            }
-          }
-        },
-        "mississippi": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "concat-stream": "^1.5.0",
-            "duplexify": "^3.4.2",
-            "end-of-stream": "^1.1.0",
-            "flush-write-stream": "^1.0.0",
-            "from2": "^2.1.0",
-            "parallel-transform": "^1.1.0",
-            "pump": "^3.0.0",
-            "pumpify": "^1.3.3",
-            "stream-each": "^1.1.0",
-            "through2": "^2.0.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "move-concurrently": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "aproba": "^1.1.1",
-            "copy-concurrently": "^1.0.0",
-            "fs-write-stream-atomic": "^1.0.8",
-            "mkdirp": "^0.5.1",
-            "rimraf": "^2.5.4",
-            "run-queue": "^1.0.3"
-          },
-          "dependencies": {
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true
-            }
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "bundled": true
-        },
-        "mute-stream": {
-          "version": "0.0.7",
-          "bundled": true
-        },
-        "nice-try": {
-          "version": "1.0.5",
-          "bundled": true
-        },
-        "node-fetch-npm": {
-          "version": "2.0.2",
-          "bundled": true,
-          "requires": {
-            "encoding": "^0.1.11",
-            "json-parse-better-errors": "^1.0.0",
-            "safe-buffer": "^5.1.1"
-          }
-        },
-        "node-gyp": {
-          "version": "5.0.7",
-          "bundled": true,
-          "requires": {
-            "env-paths": "^2.2.0",
-            "glob": "^7.1.4",
-            "graceful-fs": "^4.2.2",
-            "mkdirp": "^0.5.1",
-            "nopt": "^4.0.1",
-            "npmlog": "^4.1.2",
-            "request": "^2.88.0",
-            "rimraf": "^2.6.3",
-            "semver": "^5.7.1",
-            "tar": "^4.4.12",
-            "which": "^1.3.1"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "normalize-package-data": {
-          "version": "2.5.0",
-          "bundled": true,
-          "requires": {
-            "hosted-git-info": "^2.1.4",
-            "resolve": "^1.10.0",
-            "semver": "2 || 3 || 4 || 5",
-            "validate-npm-package-license": "^3.0.1"
-          },
-          "dependencies": {
-            "resolve": {
-              "version": "1.10.0",
-              "bundled": true,
-              "requires": {
-                "path-parse": "^1.0.6"
-              }
-            }
-          }
-        },
-        "npm-audit-report": {
-          "version": "1.3.2",
-          "bundled": true,
-          "requires": {
-            "cli-table3": "^0.5.0",
-            "console-control-strings": "^1.1.0"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.1.1",
-          "bundled": true,
-          "requires": {
-            "npm-normalize-package-bin": "^1.0.1"
-          }
-        },
-        "npm-cache-filename": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "npm-install-checks": {
-          "version": "3.0.2",
-          "bundled": true,
-          "requires": {
-            "semver": "^2.3.0 || 3.x || 4 || 5"
-          }
-        },
-        "npm-lifecycle": {
-          "version": "3.1.4",
-          "bundled": true,
-          "requires": {
-            "byline": "^5.0.0",
-            "graceful-fs": "^4.1.15",
-            "node-gyp": "^5.0.2",
-            "resolve-from": "^4.0.0",
-            "slide": "^1.1.6",
-            "uid-number": "0.0.6",
-            "umask": "^1.1.0",
-            "which": "^1.3.1"
-          }
-        },
-        "npm-logical-tree": {
-          "version": "1.2.1",
-          "bundled": true
-        },
-        "npm-normalize-package-bin": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "npm-package-arg": {
-          "version": "6.1.1",
-          "bundled": true,
-          "requires": {
-            "hosted-git-info": "^2.7.1",
-            "osenv": "^0.1.5",
-            "semver": "^5.6.0",
-            "validate-npm-package-name": "^3.0.0"
-          }
-        },
-        "npm-packlist": {
-          "version": "1.4.7",
-          "bundled": true,
-          "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
-          }
-        },
-        "npm-pick-manifest": {
-          "version": "3.0.2",
-          "bundled": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1",
-            "npm-package-arg": "^6.0.0",
-            "semver": "^5.4.1"
-          }
-        },
-        "npm-profile": {
-          "version": "4.0.2",
-          "bundled": true,
-          "requires": {
-            "aproba": "^1.1.2 || 2",
-            "figgy-pudding": "^3.4.1",
-            "npm-registry-fetch": "^4.0.0"
-          }
-        },
-        "npm-registry-fetch": {
-          "version": "4.0.2",
-          "bundled": true,
-          "requires": {
-            "JSONStream": "^1.3.4",
-            "bluebird": "^3.5.1",
-            "figgy-pudding": "^3.4.1",
-            "lru-cache": "^5.1.1",
-            "make-fetch-happen": "^5.0.0",
-            "npm-package-arg": "^6.1.0",
-            "safe-buffer": "^5.2.0"
-          },
-          "dependencies": {
-            "safe-buffer": {
-              "version": "5.2.0",
-              "bundled": true
-            }
-          }
-        },
-        "npm-run-path": {
-          "version": "2.0.2",
-          "bundled": true,
-          "requires": {
-            "path-key": "^2.0.0"
-          }
-        },
-        "npm-user-validate": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "oauth-sign": {
-          "version": "0.9.0",
-          "bundled": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true
-        },
-        "object-keys": {
-          "version": "1.0.12",
-          "bundled": true
-        },
-        "object.getownpropertydescriptors": {
-          "version": "2.0.3",
-          "bundled": true,
-          "requires": {
-            "define-properties": "^1.1.2",
-            "es-abstract": "^1.5.1"
-          }
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "opener": {
-          "version": "1.5.1",
-          "bundled": true
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "os-locale": {
-          "version": "3.1.0",
-          "bundled": true,
-          "requires": {
-            "execa": "^1.0.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
-          },
-          "dependencies": {
-            "cross-spawn": {
-              "version": "6.0.5",
-              "bundled": true,
-              "requires": {
-                "nice-try": "^1.0.4",
-                "path-key": "^2.0.1",
-                "semver": "^5.5.0",
-                "shebang-command": "^1.2.0",
-                "which": "^1.2.9"
-              }
-            },
-            "execa": {
-              "version": "1.0.0",
-              "bundled": true,
-              "requires": {
-                "cross-spawn": "^6.0.0",
-                "get-stream": "^4.0.0",
-                "is-stream": "^1.1.0",
-                "npm-run-path": "^2.0.0",
-                "p-finally": "^1.0.0",
-                "signal-exit": "^3.0.0",
-                "strip-eof": "^1.0.0"
-              }
-            }
-          }
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          }
-        },
-        "p-defer": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "p-finally": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "p-is-promise": {
-          "version": "2.1.0",
-          "bundled": true
-        },
-        "p-limit": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "package-json": {
-          "version": "4.0.1",
-          "bundled": true,
-          "requires": {
-            "got": "^6.7.1",
-            "registry-auth-token": "^3.0.1",
-            "registry-url": "^3.0.3",
-            "semver": "^5.1.0"
-          }
-        },
-        "pacote": {
-          "version": "9.5.12",
-          "bundled": true,
-          "requires": {
-            "bluebird": "^3.5.3",
-            "cacache": "^12.0.2",
-            "chownr": "^1.1.2",
-            "figgy-pudding": "^3.5.1",
-            "get-stream": "^4.1.0",
-            "glob": "^7.1.3",
-            "infer-owner": "^1.0.4",
-            "lru-cache": "^5.1.1",
-            "make-fetch-happen": "^5.0.0",
-            "minimatch": "^3.0.4",
-            "minipass": "^2.3.5",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "normalize-package-data": "^2.4.0",
-            "npm-normalize-package-bin": "^1.0.0",
-            "npm-package-arg": "^6.1.0",
-            "npm-packlist": "^1.1.12",
-            "npm-pick-manifest": "^3.0.0",
-            "npm-registry-fetch": "^4.0.0",
-            "osenv": "^0.1.5",
-            "promise-inflight": "^1.0.1",
-            "promise-retry": "^1.1.1",
-            "protoduck": "^5.0.1",
-            "rimraf": "^2.6.2",
-            "safe-buffer": "^5.1.2",
-            "semver": "^5.6.0",
-            "ssri": "^6.0.1",
-            "tar": "^4.4.10",
-            "unique-filename": "^1.1.1",
-            "which": "^1.3.1"
-          },
-          "dependencies": {
-            "minipass": {
-              "version": "2.9.0",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.0"
-              }
-            }
-          }
-        },
-        "parallel-transform": {
-          "version": "1.1.0",
-          "bundled": true,
-          "requires": {
-            "cyclist": "~0.2.2",
-            "inherits": "^2.0.3",
-            "readable-stream": "^2.1.5"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "bundled": true
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "path-is-inside": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "path-key": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "path-parse": {
-          "version": "1.0.6",
-          "bundled": true
-        },
-        "performance-now": {
-          "version": "2.1.0",
-          "bundled": true
-        },
-        "pify": {
-          "version": "3.0.0",
-          "bundled": true
-        },
-        "prepend-http": {
-          "version": "1.0.4",
-          "bundled": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "promise-inflight": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "promise-retry": {
-          "version": "1.1.1",
-          "bundled": true,
-          "requires": {
-            "err-code": "^1.0.0",
-            "retry": "^0.10.0"
-          },
-          "dependencies": {
-            "retry": {
-              "version": "0.10.1",
-              "bundled": true
-            }
-          }
-        },
-        "promzard": {
-          "version": "0.3.0",
-          "bundled": true,
-          "requires": {
-            "read": "1"
-          }
-        },
-        "proto-list": {
-          "version": "1.2.4",
-          "bundled": true
-        },
-        "protoduck": {
-          "version": "5.0.1",
-          "bundled": true,
-          "requires": {
-            "genfun": "^5.0.0"
-          }
-        },
-        "prr": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "pseudomap": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "psl": {
-          "version": "1.1.29",
-          "bundled": true
-        },
-        "pump": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        },
-        "pumpify": {
-          "version": "1.5.1",
-          "bundled": true,
-          "requires": {
-            "duplexify": "^3.6.0",
-            "inherits": "^2.0.3",
-            "pump": "^2.0.0"
-          },
-          "dependencies": {
-            "pump": {
-              "version": "2.0.1",
-              "bundled": true,
-              "requires": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
-              }
-            }
-          }
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "bundled": true
-        },
-        "qrcode-terminal": {
-          "version": "0.12.0",
-          "bundled": true
-        },
-        "qs": {
-          "version": "6.5.2",
-          "bundled": true
-        },
-        "query-string": {
-          "version": "6.8.2",
-          "bundled": true,
-          "requires": {
-            "decode-uri-component": "^0.2.0",
-            "split-on-first": "^1.0.0",
-            "strict-uri-encode": "^2.0.0"
-          }
-        },
-        "qw": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "rc": {
-          "version": "1.2.7",
-          "bundled": true,
-          "requires": {
-            "deep-extend": "^0.5.1",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true
-            }
-          }
-        },
-        "read": {
-          "version": "1.0.7",
-          "bundled": true,
-          "requires": {
-            "mute-stream": "~0.0.4"
-          }
-        },
-        "read-cmd-shim": {
-          "version": "1.0.5",
-          "bundled": true,
-          "requires": {
-            "graceful-fs": "^4.1.2"
-          }
-        },
-        "read-installed": {
-          "version": "4.0.3",
-          "bundled": true,
-          "requires": {
-            "debuglog": "^1.0.1",
-            "graceful-fs": "^4.1.2",
-            "read-package-json": "^2.0.0",
-            "readdir-scoped-modules": "^1.0.0",
-            "semver": "2 || 3 || 4 || 5",
-            "slide": "~1.1.3",
-            "util-extend": "^1.0.1"
-          }
-        },
-        "read-package-json": {
-          "version": "2.1.1",
-          "bundled": true,
-          "requires": {
-            "glob": "^7.1.1",
-            "graceful-fs": "^4.1.2",
-            "json-parse-better-errors": "^1.0.1",
-            "normalize-package-data": "^2.0.0",
-            "npm-normalize-package-bin": "^1.0.0"
-          }
-        },
-        "read-package-tree": {
-          "version": "5.3.1",
-          "bundled": true,
-          "requires": {
-            "read-package-json": "^2.0.0",
-            "readdir-scoped-modules": "^1.0.0",
-            "util-promisify": "^2.1.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.4.0",
-          "bundled": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "readdir-scoped-modules": {
-          "version": "1.1.0",
-          "bundled": true,
-          "requires": {
-            "debuglog": "^1.0.1",
-            "dezalgo": "^1.0.0",
-            "graceful-fs": "^4.1.2",
-            "once": "^1.3.0"
-          }
-        },
-        "registry-auth-token": {
-          "version": "3.3.2",
-          "bundled": true,
-          "requires": {
-            "rc": "^1.1.6",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "registry-url": {
-          "version": "3.1.0",
-          "bundled": true,
-          "requires": {
-            "rc": "^1.0.1"
-          }
-        },
-        "request": {
-          "version": "2.88.0",
-          "bundled": true,
-          "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.8.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.6",
-            "extend": "~3.0.2",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.2",
-            "har-validator": "~5.1.0",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.19",
-            "oauth-sign": "~0.9.0",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.2",
-            "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.4.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.3.2"
-          }
-        },
-        "require-directory": {
-          "version": "2.1.1",
-          "bundled": true
-        },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "resolve-from": {
-          "version": "4.0.0",
-          "bundled": true
-        },
-        "retry": {
-          "version": "0.12.0",
-          "bundled": true
-        },
-        "rimraf": {
-          "version": "2.6.3",
-          "bundled": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "run-queue": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "aproba": "^1.1.1"
-          },
-          "dependencies": {
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true
-            }
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "bundled": true
-        },
-        "semver-diff": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "semver": "^5.0.3"
-          }
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "sha": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "graceful-fs": "^4.1.2"
-          }
-        },
-        "shebang-command": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "shebang-regex": "^1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true
-        },
-        "slide": {
-          "version": "1.1.6",
-          "bundled": true
-        },
-        "smart-buffer": {
-          "version": "4.1.0",
-          "bundled": true
-        },
-        "socks": {
-          "version": "2.3.3",
-          "bundled": true,
-          "requires": {
-            "ip": "1.1.5",
-            "smart-buffer": "^4.1.0"
-          }
-        },
-        "socks-proxy-agent": {
-          "version": "4.0.2",
-          "bundled": true,
-          "requires": {
-            "agent-base": "~4.2.1",
-            "socks": "~2.3.2"
-          },
-          "dependencies": {
-            "agent-base": {
-              "version": "4.2.1",
-              "bundled": true,
-              "requires": {
-                "es6-promisify": "^5.0.0"
-              }
-            }
-          }
-        },
-        "sorted-object": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "sorted-union-stream": {
-          "version": "2.1.3",
-          "bundled": true,
-          "requires": {
-            "from2": "^1.3.0",
-            "stream-iterate": "^1.1.0"
-          },
-          "dependencies": {
-            "from2": {
-              "version": "1.3.0",
-              "bundled": true,
-              "requires": {
-                "inherits": "~2.0.1",
-                "readable-stream": "~1.1.10"
-              }
-            },
-            "isarray": {
-              "version": "0.0.1",
-              "bundled": true
-            },
-            "readable-stream": {
-              "version": "1.1.14",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.1",
-                "isarray": "0.0.1",
-                "string_decoder": "~0.10.x"
-              }
-            },
-            "string_decoder": {
-              "version": "0.10.31",
-              "bundled": true
-            }
-          }
-        },
-        "spdx-correct": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "spdx-expression-parse": "^3.0.0",
-            "spdx-license-ids": "^3.0.0"
-          }
-        },
-        "spdx-exceptions": {
-          "version": "2.1.0",
-          "bundled": true
-        },
-        "spdx-expression-parse": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "spdx-exceptions": "^2.1.0",
-            "spdx-license-ids": "^3.0.0"
-          }
-        },
-        "spdx-license-ids": {
-          "version": "3.0.3",
-          "bundled": true
-        },
-        "split-on-first": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "sshpk": {
-          "version": "1.14.2",
-          "bundled": true,
-          "requires": {
-            "asn1": "~0.2.3",
-            "assert-plus": "^1.0.0",
-            "bcrypt-pbkdf": "^1.0.0",
-            "dashdash": "^1.12.0",
-            "ecc-jsbn": "~0.1.1",
-            "getpass": "^0.1.1",
-            "jsbn": "~0.1.0",
-            "safer-buffer": "^2.0.2",
-            "tweetnacl": "~0.14.0"
-          }
-        },
-        "ssri": {
-          "version": "6.0.1",
-          "bundled": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1"
-          }
-        },
-        "stream-each": {
-          "version": "1.2.2",
-          "bundled": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "stream-shift": "^1.0.0"
-          }
-        },
-        "stream-iterate": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "readable-stream": "^2.1.5",
-            "stream-shift": "^1.0.0"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "stream-shift": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "strict-uri-encode": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "bundled": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "bundled": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "2.0.0",
-              "bundled": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "bundled": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
-        "string_decoder": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "stringify-package": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-eof": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "supports-color": {
-          "version": "5.4.0",
-          "bundled": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
-        "tar": {
-          "version": "4.4.13",
-          "bundled": true,
-          "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.8.6",
-            "minizlib": "^1.2.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.3"
-          },
-          "dependencies": {
-            "minipass": {
-              "version": "2.9.0",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.0"
-              }
-            }
-          }
-        },
-        "term-size": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "execa": "^0.7.0"
-          }
-        },
-        "text-table": {
-          "version": "0.2.0",
-          "bundled": true
-        },
-        "through": {
-          "version": "2.3.8",
-          "bundled": true
-        },
-        "through2": {
-          "version": "2.0.3",
-          "bundled": true,
-          "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "timed-out": {
-          "version": "4.0.1",
-          "bundled": true
-        },
-        "tiny-relative-date": {
-          "version": "1.3.0",
-          "bundled": true
-        },
-        "tough-cookie": {
-          "version": "2.4.3",
-          "bundled": true,
-          "requires": {
-            "psl": "^1.1.24",
-            "punycode": "^1.4.1"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "bundled": true,
-          "requires": {
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "bundled": true,
-          "optional": true
-        },
-        "typedarray": {
-          "version": "0.0.6",
-          "bundled": true
-        },
-        "uid-number": {
-          "version": "0.0.6",
-          "bundled": true
-        },
-        "umask": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "unique-filename": {
-          "version": "1.1.1",
-          "bundled": true,
-          "requires": {
-            "unique-slug": "^2.0.0"
-          }
-        },
-        "unique-slug": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "imurmurhash": "^0.1.4"
-          }
-        },
-        "unique-string": {
-          "version": "1.0.0",
-          "bundled": true,
-          "requires": {
-            "crypto-random-string": "^1.0.0"
-          }
-        },
-        "unpipe": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "unzip-response": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "update-notifier": {
-          "version": "2.5.0",
-          "bundled": true,
-          "requires": {
-            "boxen": "^1.2.1",
-            "chalk": "^2.0.1",
-            "configstore": "^3.0.0",
-            "import-lazy": "^2.1.0",
-            "is-ci": "^1.0.10",
-            "is-installed-globally": "^0.1.0",
-            "is-npm": "^1.0.0",
-            "latest-version": "^3.0.0",
-            "semver-diff": "^2.0.0",
-            "xdg-basedir": "^3.0.0"
-          }
-        },
-        "url-parse-lax": {
-          "version": "1.0.0",
-          "bundled": true,
-          "requires": {
-            "prepend-http": "^1.0.1"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "util-extend": {
-          "version": "1.0.3",
-          "bundled": true
-        },
-        "util-promisify": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "object.getownpropertydescriptors": "^2.0.3"
-          }
-        },
-        "uuid": {
-          "version": "3.3.3",
-          "bundled": true
-        },
-        "validate-npm-package-license": {
-          "version": "3.0.4",
-          "bundled": true,
-          "requires": {
-            "spdx-correct": "^3.0.0",
-            "spdx-expression-parse": "^3.0.0"
-          }
-        },
-        "validate-npm-package-name": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "builtins": "^1.0.3"
-          }
-        },
-        "verror": {
-          "version": "1.10.0",
-          "bundled": true,
-          "requires": {
-            "assert-plus": "^1.0.0",
-            "core-util-is": "1.0.2",
-            "extsprintf": "^1.2.0"
-          }
-        },
-        "wcwidth": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "defaults": "^1.0.3"
-          }
-        },
-        "which": {
-          "version": "1.3.1",
-          "bundled": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
-        "which-module": {
-          "version": "2.0.0",
-          "bundled": true
-        },
-        "wide-align": {
-          "version": "1.1.2",
-          "bundled": true,
-          "requires": {
-            "string-width": "^1.0.2"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
-          }
-        },
-        "widest-line": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "string-width": "^2.1.1"
-          }
-        },
-        "worker-farm": {
-          "version": "1.7.0",
-          "bundled": true,
-          "requires": {
-            "errno": "~0.1.7"
-          }
-        },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "write-file-atomic": {
-          "version": "2.4.3",
-          "bundled": true,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "imurmurhash": "^0.1.4",
-            "signal-exit": "^3.0.2"
-          }
-        },
-        "xdg-basedir": {
-          "version": "3.0.0",
-          "bundled": true
-        },
-        "xtend": {
-          "version": "4.0.1",
-          "bundled": true
-        },
-        "y18n": {
-          "version": "4.0.0",
-          "bundled": true
-        },
-        "yallist": {
-          "version": "3.0.3",
-          "bundled": true
-        },
-        "yargs": {
-          "version": "11.1.1",
-          "bundled": true,
-          "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.1.1",
-            "find-up": "^2.1.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.1.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^9.0.2"
-          },
-          "dependencies": {
-            "y18n": {
-              "version": "3.2.1",
-              "bundled": true
-            }
-          }
-        },
-        "yargs-parser": {
-          "version": "9.0.2",
-          "bundled": true,
-          "requires": {
-            "camelcase": "^4.1.0"
-          }
-        }
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "npm-normalize-package-bin": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/npm-normalize-package-bin/download/npm-normalize-package-bin-1.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnpm-normalize-package-bin%2Fdownload%2Fnpm-normalize-package-bin-1.0.1.tgz",
+      "integrity": "sha1-bnmkHyP9I1wGIyGCKNp9nCO49uI=",
+      "optional": true
+    },
+    "npm-packlist": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npm.taobao.org/npm-packlist/download/npm-packlist-1.4.8.tgz",
+      "integrity": "sha1-Vu5swTW5+YrT1Rwcldoiu7my7z4=",
+      "optional": true,
+      "requires": {
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1",
+        "npm-normalize-package-bin": "^1.0.1"
       }
     },
     "npm-run-path": {
@@ -11733,9 +11729,8 @@
     },
     "npmlog": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "dev": true,
+      "resolved": "https://registry.npm.taobao.org/npmlog/download/npmlog-4.1.2.tgz",
+      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
       "requires": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -11763,7 +11758,7 @@
     },
     "numeral": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/numeral/download/numeral-2.0.6.tgz",
       "integrity": "sha1-StCAk21EPCVhrtnyGX7//iX05QY="
     },
     "nwmatcher": {
@@ -11771,6 +11766,11 @@
       "resolved": "http://registry.npm.taobao.org/nwmatcher/download/nwmatcher-1.4.4.tgz",
       "integrity": "sha1-IoVjHzSpXw0Dlc2QDJbtObWPNG4="
     },
+    "nwsapi": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npm.taobao.org/nwsapi/download/nwsapi-2.2.0.tgz",
+      "integrity": "sha1-IEh5qePQaP8qVROcLHcngGgaOLc="
+    },
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "http://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz",
@@ -11802,19 +11802,66 @@
       }
     },
     "object-hash": {
-      "version": "1.3.1",
-      "resolved": "http://registry.npm.taobao.org/object-hash/download/object-hash-1.3.1.tgz",
-      "integrity": "sha1-/eRSCYqVHLFF8Dm7fUVUSd3BJt8="
+      "version": "2.0.3",
+      "resolved": "https://registry.npm.taobao.org/object-hash/download/object-hash-2.0.3.tgz",
+      "integrity": "sha1-0S2wROA80so9d8BXDYciWwLh5uo="
     },
     "object-inspect": {
       "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
+      "resolved": "https://registry.npm.taobao.org/object-inspect/download/object-inspect-1.7.0.tgz",
+      "integrity": "sha1-9Pa9GBrXfwBrXs5gvQtvOY/3Smc="
     },
     "object-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz",
-      "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npm.taobao.org/object-is/download/object-is-1.1.2.tgz?cache=0&sync_timestamp=1586894009620&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject-is%2Fdownload%2Fobject-is-1.1.2.tgz",
+      "integrity": "sha1-xdLof/nhGfeLegiEQVGeLuwVc7Y=",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.5",
+          "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.5.tgz",
+          "integrity": "sha1-2MnR1myJgfuSAOIlHXme7pJ3Suk=",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.1.5",
+            "is-regex": "^1.0.5",
+            "object-inspect": "^1.7.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.0",
+            "string.prototype.trimleft": "^2.1.1",
+            "string.prototype.trimright": "^2.1.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.1.tgz",
+          "integrity": "sha1-5VzUyc3BiLzvsDs2bHNjI/xciYo=",
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "is-callable": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npm.taobao.org/is-callable/download/is-callable-1.1.5.tgz",
+          "integrity": "sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs="
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npm.taobao.org/is-regex/download/is-regex-1.0.5.tgz?cache=0&sync_timestamp=1576454688491&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regex%2Fdownload%2Fis-regex-1.0.5.tgz",
+          "integrity": "sha1-OdWJo1i/GJZ/cmlnEguPwa7XTq4=",
+          "requires": {
+            "has": "^1.0.3"
+          }
+        }
+      }
     },
     "object-keys": {
       "version": "1.1.1",
@@ -11838,8 +11885,8 @@
     },
     "object.assign": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "resolved": "https://registry.npm.taobao.org/object.assign/download/object.assign-4.1.0.tgz",
+      "integrity": "sha1-lovxEA15Vrs8oIbwBvhGs7xACNo=",
       "requires": {
         "define-properties": "^1.1.2",
         "function-bind": "^1.1.1",
@@ -11847,6 +11894,117 @@
         "object-keys": "^1.0.11"
       }
     },
+    "object.entries": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npm.taobao.org/object.entries/download/object.entries-1.1.1.tgz?cache=0&sync_timestamp=1576180159335&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject.entries%2Fdownload%2Fobject.entries-1.1.1.tgz",
+      "integrity": "sha1-7hzwQVPeArsJP+wzaDkA9XzlOZs=",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.5",
+          "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.5.tgz",
+          "integrity": "sha1-2MnR1myJgfuSAOIlHXme7pJ3Suk=",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.1.5",
+            "is-regex": "^1.0.5",
+            "object-inspect": "^1.7.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.0",
+            "string.prototype.trimleft": "^2.1.1",
+            "string.prototype.trimright": "^2.1.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.1.tgz",
+          "integrity": "sha1-5VzUyc3BiLzvsDs2bHNjI/xciYo=",
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "is-callable": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npm.taobao.org/is-callable/download/is-callable-1.1.5.tgz",
+          "integrity": "sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs="
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npm.taobao.org/is-regex/download/is-regex-1.0.5.tgz?cache=0&sync_timestamp=1576454688491&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regex%2Fdownload%2Fis-regex-1.0.5.tgz",
+          "integrity": "sha1-OdWJo1i/GJZ/cmlnEguPwa7XTq4=",
+          "requires": {
+            "has": "^1.0.3"
+          }
+        }
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npm.taobao.org/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.0.tgz",
+      "integrity": "sha1-Npvx+VktiridcS3O1cuBx8U1Jkk=",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.5",
+          "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.5.tgz",
+          "integrity": "sha1-2MnR1myJgfuSAOIlHXme7pJ3Suk=",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.1.5",
+            "is-regex": "^1.0.5",
+            "object-inspect": "^1.7.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.0",
+            "string.prototype.trimleft": "^2.1.1",
+            "string.prototype.trimright": "^2.1.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.1.tgz",
+          "integrity": "sha1-5VzUyc3BiLzvsDs2bHNjI/xciYo=",
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.1.tgz",
+          "integrity": "sha1-n1IUdYpEGWxAbZvXbOv4HsLdMeg="
+        },
+        "is-callable": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npm.taobao.org/is-callable/download/is-callable-1.1.5.tgz",
+          "integrity": "sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs="
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npm.taobao.org/is-regex/download/is-regex-1.0.5.tgz?cache=0&sync_timestamp=1576454688491&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regex%2Fdownload%2Fis-regex-1.0.5.tgz",
+          "integrity": "sha1-OdWJo1i/GJZ/cmlnEguPwa7XTq4=",
+          "requires": {
+            "has": "^1.0.3"
+          }
+        }
+      }
+    },
     "object.omit": {
       "version": "2.0.1",
       "resolved": "http://registry.npm.taobao.org/object.omit/download/object.omit-2.0.1.tgz",
@@ -11878,8 +12036,8 @@
     },
     "omit.js": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/omit.js/-/omit.js-1.0.2.tgz",
-      "integrity": "sha512-/QPc6G2NS+8d4L/cQhbk6Yit1WTB6Us2g84A7A/1+w9d/eRGHyEqC5kkQtHVoHZ5NFWGG7tUGgrhVZwgZanKrQ==",
+      "resolved": "https://registry.npm.taobao.org/omit.js/download/omit.js-1.0.2.tgz",
+      "integrity": "sha1-kaFPDrqEBm36AVvzDkdMR/MLyFg=",
       "requires": {
         "babel-runtime": "^6.23.0"
       }
@@ -11913,6 +12071,22 @@
         "mimic-fn": "^1.0.0"
       }
     },
+    "open": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npm.taobao.org/open/download/open-7.0.3.tgz?cache=0&sync_timestamp=1583734612347&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fopen%2Fdownload%2Fopen-7.0.3.tgz",
+      "integrity": "sha1-21UaGvnHq0x69mQTmTCCYThTHEg=",
+      "requires": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "dependencies": {
+        "is-wsl": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npm.taobao.org/is-wsl/download/is-wsl-2.1.1.tgz?cache=0&sync_timestamp=1569219566107&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-wsl%2Fdownload%2Fis-wsl-2.1.1.tgz",
+          "integrity": "sha1-ShwVLUKd89RBZpSY4khtNZbrrx0="
+        }
+      }
+    },
     "opener": {
       "version": "1.5.1",
       "resolved": "http://registry.npm.taobao.org/opener/download/opener-1.5.1.tgz",
@@ -11920,29 +12094,13 @@
       "dev": true
     },
     "opn": {
-      "version": "5.2.0",
-      "resolved": "http://registry.npm.taobao.org/opn/download/opn-5.2.0.tgz",
-      "integrity": "sha1-cf35NNaCfWds7L6hUx+V01RkEiU=",
+      "version": "5.5.0",
+      "resolved": "https://registry.npm.taobao.org/opn/download/opn-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fopn%2Fdownload%2Fopn-5.5.0.tgz",
+      "integrity": "sha1-/HFk+rVtI1kExRw7J9pnWMo7m/w=",
       "requires": {
         "is-wsl": "^1.1.0"
       }
     },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "http://registry.npm.taobao.org/optimist/download/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.3",
-          "resolved": "http://registry.npm.taobao.org/wordwrap/download/wordwrap-0.0.3.tgz",
-          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-        }
-      }
-    },
     "optionator": {
       "version": "0.8.2",
       "resolved": "http://registry.npm.taobao.org/optionator/download/optionator-0.8.2.tgz",
@@ -11967,7 +12125,8 @@
     "os-browserify": {
       "version": "0.3.0",
       "resolved": "http://registry.npm.taobao.org/os-browserify/download/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
     },
     "os-homedir": {
       "version": "1.0.2",
@@ -11989,19 +12148,28 @@
     },
     "osenv": {
       "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "dev": true,
+      "resolved": "https://registry.npm.taobao.org/osenv/download/osenv-0.1.5.tgz",
+      "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=",
       "requires": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.0"
       }
     },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/p-defer/download/p-defer-1.0.0.tgz?cache=0&sync_timestamp=1559922734651&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-defer%2Fdownload%2Fp-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
+    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/p-finally/download/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
     },
+    "p-is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npm.taobao.org/p-is-promise/download/p-is-promise-2.1.0.tgz",
+      "integrity": "sha1-kYzrrqJIpiz3/6uOO8qMX4gvxC4="
+    },
     "p-limit": {
       "version": "1.3.0",
       "resolved": "http://registry.npm.taobao.org/p-limit/download/p-limit-1.3.0.tgz",
@@ -12023,6 +12191,14 @@
       "resolved": "http://registry.npm.taobao.org/p-map/download/p-map-1.2.0.tgz",
       "integrity": "sha1-5OlPMR6rvIYzoeeZCBZfyiYkG2s="
     },
+    "p-retry": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npm.taobao.org/p-retry/download/p-retry-3.0.1.tgz",
+      "integrity": "sha1-MWtMiJPiyNwc+okfQGxLQivr8yg=",
+      "requires": {
+        "retry": "^0.12.0"
+      }
+    },
     "p-try": {
       "version": "1.0.0",
       "resolved": "http://registry.npm.taobao.org/p-try/download/p-try-1.0.0.tgz",
@@ -12040,14 +12216,15 @@
       }
     },
     "pako": {
-      "version": "1.0.10",
-      "resolved": "http://registry.npm.taobao.org/pako/download/pako-1.0.10.tgz",
-      "integrity": "sha1-Qyi621CGpCaqkPVBl31JVdpclzI="
+      "version": "1.0.11",
+      "resolved": "https://registry.npm.taobao.org/pako/download/pako-1.0.11.tgz",
+      "integrity": "sha1-bJWZ00DVTf05RjgCUqNXBaa5kr8=",
+      "dev": true
     },
     "parallel-transform": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "resolved": "https://registry.npm.taobao.org/parallel-transform/download/parallel-transform-1.2.0.tgz",
+      "integrity": "sha1-kEnKN9bLIYLDsdLHIL6U0UpYFPw=",
       "dev": true,
       "requires": {
         "cyclist": "^1.0.1",
@@ -12056,22 +12233,24 @@
       }
     },
     "param-case": {
-      "version": "2.1.1",
-      "resolved": "http://registry.npm.taobao.org/param-case/download/param-case-2.1.1.tgz",
-      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "version": "3.0.3",
+      "resolved": "https://registry.npm.taobao.org/param-case/download/param-case-3.0.3.tgz?cache=0&sync_timestamp=1576721509342&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparam-case%2Fdownload%2Fparam-case-3.0.3.tgz",
+      "integrity": "sha1-S+Qfg5nv9iHFbuu4KaXkUdmAEjg=",
       "requires": {
-        "no-case": "^2.2.0"
+        "dot-case": "^3.0.3",
+        "tslib": "^1.10.0"
       }
     },
     "parchment": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
-      "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
+      "resolved": "https://registry.npm.taobao.org/parchment/download/parchment-1.1.4.tgz",
+      "integrity": "sha1-rt7Xq5OP6SHUw0vDOc4RaLwv/eU="
     },
     "parse-asn1": {
-      "version": "5.1.4",
-      "resolved": "http://registry.npm.taobao.org/parse-asn1/download/parse-asn1-5.1.4.tgz",
-      "integrity": "sha1-N/Zij4I/vesic7TVQENKIvPvH8w=",
+      "version": "5.1.5",
+      "resolved": "https://registry.npm.taobao.org/parse-asn1/download/parse-asn1-5.1.5.tgz",
+      "integrity": "sha1-ADJxND2ljclMrOSU+u89IUfs6g4=",
+      "dev": true,
       "requires": {
         "asn1.js": "^4.0.0",
         "browserify-aes": "^1.0.0",
@@ -12115,15 +12294,25 @@
       "resolved": "http://registry.npm.taobao.org/parseurl/download/parseurl-1.3.2.tgz",
       "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
     },
+    "pascal-case": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npm.taobao.org/pascal-case/download/pascal-case-3.1.1.tgz?cache=0&sync_timestamp=1577925951636&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpascal-case%2Fdownload%2Fpascal-case-3.1.1.tgz",
+      "integrity": "sha1-WsGXUTPtYZKB6Ikglz0s0fJ53l8=",
+      "requires": {
+        "no-case": "^3.0.3",
+        "tslib": "^1.10.0"
+      }
+    },
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "http://registry.npm.taobao.org/pascalcase/download/pascalcase-0.1.1.tgz",
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
     },
     "path-browserify": {
-      "version": "0.0.0",
-      "resolved": "http://registry.npm.taobao.org/path-browserify/download/path-browserify-0.0.0.tgz",
-      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo="
+      "version": "0.0.1",
+      "resolved": "https://registry.npm.taobao.org/path-browserify/download/path-browserify-0.0.1.tgz",
+      "integrity": "sha1-5sTd1+06onxoogzE5Q4aTug7vEo=",
+      "dev": true
     },
     "path-dirname": {
       "version": "1.0.2",
@@ -12184,6 +12373,7 @@
       "version": "3.0.17",
       "resolved": "http://registry.npm.taobao.org/pbkdf2/download/pbkdf2-3.0.17.tgz",
       "integrity": "sha1-l2wgZTBhexTrsyEUI597CTNuk6Y=",
+      "dev": true,
       "requires": {
         "create-hash": "^1.1.2",
         "create-hmac": "^1.1.4",
@@ -12223,6 +12413,14 @@
         "find-up": "^2.1.0"
       }
     },
+    "pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/pkg-up/download/pkg-up-2.0.0.tgz",
+      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+      "requires": {
+        "find-up": "^2.1.0"
+      }
+    },
     "pluralize": {
       "version": "7.0.0",
       "resolved": "http://registry.npm.taobao.org/pluralize/download/pluralize-7.0.0.tgz",
@@ -12234,33 +12432,13 @@
       "integrity": "sha1-VWC5m7rXZH6fqkdca4BWYh9aT/I="
     },
     "portfinder": {
-      "version": "1.0.20",
-      "resolved": "http://registry.npm.taobao.org/portfinder/download/portfinder-1.0.20.tgz",
-      "integrity": "sha1-vqaGMuVLLhOrewxHdem0G/Jw5Eo=",
+      "version": "1.0.25",
+      "resolved": "https://registry.npm.taobao.org/portfinder/download/portfinder-1.0.25.tgz",
+      "integrity": "sha1-JU/TN/+6hp9LnTftwpgFnLTTXso=",
       "requires": {
-        "async": "^1.5.2",
-        "debug": "^2.2.0",
-        "mkdirp": "0.5.x"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "http://registry.npm.taobao.org/async/download/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
-          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
+        "async": "^2.6.2",
+        "debug": "^3.1.1",
+        "mkdirp": "^0.5.1"
       }
     },
     "posix-character-classes": {
@@ -12290,363 +12468,6 @@
         }
       }
     },
-    "postcss-calc": {
-      "version": "5.3.1",
-      "resolved": "http://registry.npm.taobao.org/postcss-calc/download/postcss-calc-5.3.1.tgz",
-      "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
-      "requires": {
-        "postcss": "^5.0.2",
-        "postcss-message-helpers": "^2.0.0",
-        "reduce-css-calc": "^1.2.6"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-colormin": {
-      "version": "2.2.2",
-      "resolved": "http://registry.npm.taobao.org/postcss-colormin/download/postcss-colormin-2.2.2.tgz",
-      "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
-      "requires": {
-        "colormin": "^1.0.5",
-        "postcss": "^5.0.13",
-        "postcss-value-parser": "^3.2.3"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-convert-values": {
-      "version": "2.6.1",
-      "resolved": "http://registry.npm.taobao.org/postcss-convert-values/download/postcss-convert-values-2.6.1.tgz",
-      "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
-      "requires": {
-        "postcss": "^5.0.11",
-        "postcss-value-parser": "^3.1.2"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-comments": {
-      "version": "2.0.4",
-      "resolved": "http://registry.npm.taobao.org/postcss-discard-comments/download/postcss-discard-comments-2.0.4.tgz",
-      "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
-      "requires": {
-        "postcss": "^5.0.14"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-duplicates": {
-      "version": "2.1.0",
-      "resolved": "http://registry.npm.taobao.org/postcss-discard-duplicates/download/postcss-discard-duplicates-2.1.0.tgz",
-      "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
-      "requires": {
-        "postcss": "^5.0.4"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-empty": {
-      "version": "2.1.0",
-      "resolved": "http://registry.npm.taobao.org/postcss-discard-empty/download/postcss-discard-empty-2.1.0.tgz",
-      "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
-      "requires": {
-        "postcss": "^5.0.14"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-overridden": {
-      "version": "0.1.1",
-      "resolved": "http://registry.npm.taobao.org/postcss-discard-overridden/download/postcss-discard-overridden-0.1.1.tgz",
-      "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
-      "requires": {
-        "postcss": "^5.0.16"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-unused": {
-      "version": "2.2.3",
-      "resolved": "http://registry.npm.taobao.org/postcss-discard-unused/download/postcss-discard-unused-2.2.3.tgz",
-      "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
-      "requires": {
-        "postcss": "^5.0.14",
-        "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-filter-plugins": {
-      "version": "2.0.3",
-      "resolved": "http://registry.npm.taobao.org/postcss-filter-plugins/download/postcss-filter-plugins-2.0.3.tgz",
-      "integrity": "sha1-giRf34IzcEFkXkdxFNjlk6oYuOw=",
-      "requires": {
-        "postcss": "^5.0.4"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
     "postcss-flexbugs-fixes": {
       "version": "3.2.0",
       "resolved": "http://registry.npm.taobao.org/postcss-flexbugs-fixes/download/postcss-flexbugs-fixes-3.2.0.tgz",
@@ -12695,723 +12516,446 @@
         "schema-utils": "^0.3.0"
       }
     },
-    "postcss-merge-idents": {
-      "version": "2.1.7",
-      "resolved": "http://registry.npm.taobao.org/postcss-merge-idents/download/postcss-merge-idents-2.1.7.tgz",
-      "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
-      "requires": {
-        "has": "^1.0.1",
-        "postcss": "^5.0.10",
-        "postcss-value-parser": "^3.1.1"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-merge-longhand": {
-      "version": "2.0.2",
-      "resolved": "http://registry.npm.taobao.org/postcss-merge-longhand/download/postcss-merge-longhand-2.0.2.tgz",
-      "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
-      "requires": {
-        "postcss": "^5.0.4"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-merge-rules": {
-      "version": "2.1.2",
-      "resolved": "http://registry.npm.taobao.org/postcss-merge-rules/download/postcss-merge-rules-2.1.2.tgz",
-      "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
-      "requires": {
-        "browserslist": "^1.5.2",
-        "caniuse-api": "^1.5.2",
-        "postcss": "^5.0.4",
-        "postcss-selector-parser": "^2.2.2",
-        "vendors": "^1.0.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "1.7.7",
-          "resolved": "http://registry.npm.taobao.org/browserslist/download/browserslist-1.7.7.tgz",
-          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-          "requires": {
-            "caniuse-db": "^1.0.30000639",
-            "electron-to-chromium": "^1.2.7"
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-message-helpers": {
-      "version": "2.0.0",
-      "resolved": "http://registry.npm.taobao.org/postcss-message-helpers/download/postcss-message-helpers-2.0.0.tgz",
-      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4="
-    },
-    "postcss-minify-font-values": {
-      "version": "1.0.5",
-      "resolved": "http://registry.npm.taobao.org/postcss-minify-font-values/download/postcss-minify-font-values-1.0.5.tgz",
-      "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
-      "requires": {
-        "object-assign": "^4.0.1",
-        "postcss": "^5.0.4",
-        "postcss-value-parser": "^3.0.2"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-minify-gradients": {
-      "version": "1.0.5",
-      "resolved": "http://registry.npm.taobao.org/postcss-minify-gradients/download/postcss-minify-gradients-1.0.5.tgz",
-      "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
-      "requires": {
-        "postcss": "^5.0.12",
-        "postcss-value-parser": "^3.3.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-minify-params": {
-      "version": "1.2.2",
-      "resolved": "http://registry.npm.taobao.org/postcss-minify-params/download/postcss-minify-params-1.2.2.tgz",
-      "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
-      "requires": {
-        "alphanum-sort": "^1.0.1",
-        "postcss": "^5.0.2",
-        "postcss-value-parser": "^3.0.2",
-        "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-minify-selectors": {
-      "version": "2.1.1",
-      "resolved": "http://registry.npm.taobao.org/postcss-minify-selectors/download/postcss-minify-selectors-2.1.1.tgz",
-      "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
-      "requires": {
-        "alphanum-sort": "^1.0.2",
-        "has": "^1.0.1",
-        "postcss": "^5.0.14",
-        "postcss-selector-parser": "^2.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
     "postcss-modules-extract-imports": {
-      "version": "1.2.1",
-      "resolved": "http://registry.npm.taobao.org/postcss-modules-extract-imports/download/postcss-modules-extract-imports-1.2.1.tgz",
-      "integrity": "sha1-3IfjQUjsfqtfeR981YSYMzdbdBo=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/postcss-modules-extract-imports/download/postcss-modules-extract-imports-2.0.0.tgz",
+      "integrity": "sha1-gYcZoa4doyX5gyRGsBE27rSTzX4=",
       "requires": {
-        "postcss": "^6.0.1"
+        "postcss": "^7.0.5"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
+              "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "postcss": {
+          "version": "7.0.27",
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.27.tgz?cache=0&sync_timestamp=1581994803116&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.27.tgz",
+          "integrity": "sha1-zGfNxrDao3UQW3xCSoVWc0X8VNk=",
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "postcss-modules-local-by-default": {
-      "version": "1.2.0",
-      "resolved": "http://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-1.2.0.tgz",
-      "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
+      "version": "3.0.2",
+      "resolved": "https://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-3.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-local-by-default%2Fdownload%2Fpostcss-modules-local-by-default-3.0.2.tgz",
+      "integrity": "sha1-6KZWG+kUqvPAUodjd1JMqQ27eRU=",
       "requires": {
-        "css-selector-tokenizer": "^0.7.0",
-        "postcss": "^6.0.1"
+        "icss-utils": "^4.1.1",
+        "postcss": "^7.0.16",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.0.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
+              "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "postcss": {
+          "version": "7.0.27",
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.27.tgz?cache=0&sync_timestamp=1581994803116&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.27.tgz",
+          "integrity": "sha1-zGfNxrDao3UQW3xCSoVWc0X8VNk=",
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "postcss-value-parser": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-4.0.3.tgz?cache=0&sync_timestamp=1582038347323&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-value-parser%2Fdownload%2Fpostcss-value-parser-4.0.3.tgz",
+          "integrity": "sha1-ZR/0WTqp7ajV0NZlk6JBeurrMl0="
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "postcss-modules-scope": {
-      "version": "1.1.0",
-      "resolved": "http://registry.npm.taobao.org/postcss-modules-scope/download/postcss-modules-scope-1.1.0.tgz",
-      "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npm.taobao.org/postcss-modules-scope/download/postcss-modules-scope-2.2.0.tgz",
+      "integrity": "sha1-OFyuATzHdD9afXYC0Qc6iequYu4=",
       "requires": {
-        "css-selector-tokenizer": "^0.7.0",
-        "postcss": "^6.0.1"
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
+              "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "postcss": {
+          "version": "7.0.27",
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.27.tgz?cache=0&sync_timestamp=1581994803116&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.27.tgz",
+          "integrity": "sha1-zGfNxrDao3UQW3xCSoVWc0X8VNk=",
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "postcss-modules-values": {
-      "version": "1.3.0",
-      "resolved": "http://registry.npm.taobao.org/postcss-modules-values/download/postcss-modules-values-1.3.0.tgz",
-      "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npm.taobao.org/postcss-modules-values/download/postcss-modules-values-3.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-values%2Fdownload%2Fpostcss-modules-values-3.0.0.tgz",
+      "integrity": "sha1-W1AA1uuuKbQlUwG0o6VFdEI+fxA=",
       "requires": {
-        "icss-replace-symbols": "^1.1.0",
-        "postcss": "^6.0.1"
-      }
-    },
-    "postcss-normalize-charset": {
-      "version": "1.1.1",
-      "resolved": "http://registry.npm.taobao.org/postcss-normalize-charset/download/postcss-normalize-charset-1.1.1.tgz",
-      "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
-      "requires": {
-        "postcss": "^5.0.5"
+        "icss-utils": "^4.0.0",
+        "postcss": "^7.0.6"
       },
       "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
+              "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
         },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
+          "version": "7.0.27",
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.27.tgz?cache=0&sync_timestamp=1581994803116&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.27.tgz",
+          "integrity": "sha1-zGfNxrDao3UQW3xCSoVWc0X8VNk=",
           "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
           }
         },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
         "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
           "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-normalize-url": {
-      "version": "3.0.8",
-      "resolved": "http://registry.npm.taobao.org/postcss-normalize-url/download/postcss-normalize-url-3.0.8.tgz",
-      "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
-      "requires": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^1.4.0",
-        "postcss": "^5.0.14",
-        "postcss-value-parser": "^3.2.3"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-ordered-values": {
-      "version": "2.2.3",
-      "resolved": "http://registry.npm.taobao.org/postcss-ordered-values/download/postcss-ordered-values-2.2.3.tgz",
-      "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
-      "requires": {
-        "postcss": "^5.0.4",
-        "postcss-value-parser": "^3.0.1"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-reduce-idents": {
-      "version": "2.4.0",
-      "resolved": "http://registry.npm.taobao.org/postcss-reduce-idents/download/postcss-reduce-idents-2.4.0.tgz",
-      "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
-      "requires": {
-        "postcss": "^5.0.4",
-        "postcss-value-parser": "^3.0.2"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-reduce-initial": {
-      "version": "1.0.1",
-      "resolved": "http://registry.npm.taobao.org/postcss-reduce-initial/download/postcss-reduce-initial-1.0.1.tgz",
-      "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
-      "requires": {
-        "postcss": "^5.0.4"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-reduce-transforms": {
-      "version": "1.0.4",
-      "resolved": "http://registry.npm.taobao.org/postcss-reduce-transforms/download/postcss-reduce-transforms-1.0.4.tgz",
-      "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
-      "requires": {
-        "has": "^1.0.1",
-        "postcss": "^5.0.8",
-        "postcss-value-parser": "^3.0.1"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
     },
     "postcss-selector-parser": {
-      "version": "2.2.3",
-      "resolved": "http://registry.npm.taobao.org/postcss-selector-parser/download/postcss-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+      "version": "6.0.2",
+      "resolved": "https://registry.npm.taobao.org/postcss-selector-parser/download/postcss-selector-parser-6.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-selector-parser%2Fdownload%2Fpostcss-selector-parser-6.0.2.tgz",
+      "integrity": "sha1-k0z3mdAWyDQRhZ4J3Oyt4BKG7Fw=",
       "requires": {
-        "flatten": "^1.0.2",
+        "cssesc": "^3.0.0",
         "indexes-of": "^1.0.1",
         "uniq": "^1.0.1"
       }
     },
-    "postcss-svgo": {
-      "version": "2.1.6",
-      "resolved": "http://registry.npm.taobao.org/postcss-svgo/download/postcss-svgo-2.1.6.tgz",
-      "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
+    "postcss-modules-extract-imports": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/postcss-modules-extract-imports/download/postcss-modules-extract-imports-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-extract-imports%2Fdownload%2Fpostcss-modules-extract-imports-2.0.0.tgz",
+      "integrity": "sha1-gYcZoa4doyX5gyRGsBE27rSTzX4=",
       "requires": {
-        "is-svg": "^2.0.0",
-        "postcss": "^5.0.14",
-        "postcss-value-parser": "^3.2.3",
-        "svgo": "^0.7.0"
+        "postcss": "^7.0.5"
       },
       "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1585815676992&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
           "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
+              "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
           }
         },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        "postcss": {
+          "version": "7.0.27",
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.27.tgz?cache=0&sync_timestamp=1581994803116&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.27.tgz",
+          "integrity": "sha1-zGfNxrDao3UQW3xCSoVWc0X8VNk=",
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
         },
         "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
     },
-    "postcss-unique-selectors": {
-      "version": "2.0.2",
-      "resolved": "http://registry.npm.taobao.org/postcss-unique-selectors/download/postcss-unique-selectors-2.0.2.tgz",
-      "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
+    "postcss-modules-local-by-default": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-3.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-local-by-default%2Fdownload%2Fpostcss-modules-local-by-default-3.0.2.tgz",
+      "integrity": "sha1-6KZWG+kUqvPAUodjd1JMqQ27eRU=",
       "requires": {
-        "alphanum-sort": "^1.0.1",
-        "postcss": "^5.0.4",
-        "uniqs": "^2.0.0"
+        "icss-utils": "^4.1.1",
+        "postcss": "^7.0.16",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.0.0"
       },
       "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1585815676992&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
+              "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
         },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
+          "version": "7.0.27",
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.27.tgz?cache=0&sync_timestamp=1581994803116&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.27.tgz",
+          "integrity": "sha1-zGfNxrDao3UQW3xCSoVWc0X8VNk=",
           "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
           }
         },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        "postcss-value-parser": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-4.0.3.tgz?cache=0&sync_timestamp=1582038347323&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-value-parser%2Fdownload%2Fpostcss-value-parser-4.0.3.tgz",
+          "integrity": "sha1-ZR/0WTqp7ajV0NZlk6JBeurrMl0="
         },
         "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
     },
+    "postcss-modules-scope": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npm.taobao.org/postcss-modules-scope/download/postcss-modules-scope-2.2.0.tgz",
+      "integrity": "sha1-OFyuATzHdD9afXYC0Qc6iequYu4=",
+      "requires": {
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1585815676992&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
+              "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "postcss": {
+          "version": "7.0.27",
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.27.tgz?cache=0&sync_timestamp=1581994803116&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.27.tgz",
+          "integrity": "sha1-zGfNxrDao3UQW3xCSoVWc0X8VNk=",
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "postcss-modules-values": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npm.taobao.org/postcss-modules-values/download/postcss-modules-values-3.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-values%2Fdownload%2Fpostcss-modules-values-3.0.0.tgz",
+      "integrity": "sha1-W1AA1uuuKbQlUwG0o6VFdEI+fxA=",
+      "requires": {
+        "icss-utils": "^4.0.0",
+        "postcss": "^7.0.6"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1585815676992&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
+              "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "postcss": {
+          "version": "7.0.27",
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.27.tgz?cache=0&sync_timestamp=1581994803116&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.27.tgz",
+          "integrity": "sha1-zGfNxrDao3UQW3xCSoVWc0X8VNk=",
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npm.taobao.org/postcss-selector-parser/download/postcss-selector-parser-6.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-selector-parser%2Fdownload%2Fpostcss-selector-parser-6.0.2.tgz",
+      "integrity": "sha1-k0z3mdAWyDQRhZ4J3Oyt4BKG7Fw=",
+      "requires": {
+        "cssesc": "^3.0.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npm.taobao.org/postcss-selector-parser/download/postcss-selector-parser-6.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-selector-parser%2Fdownload%2Fpostcss-selector-parser-6.0.2.tgz",
+      "integrity": "sha1-k0z3mdAWyDQRhZ4J3Oyt4BKG7Fw=",
+      "dev": true,
+      "requires": {
+        "cssesc": "^3.0.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
     "postcss-value-parser": {
       "version": "3.3.1",
       "resolved": "http://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-3.3.1.tgz",
       "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE="
     },
-    "postcss-zindex": {
-      "version": "2.2.0",
-      "resolved": "http://registry.npm.taobao.org/postcss-zindex/download/postcss-zindex-2.2.0.tgz",
-      "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
-      "requires": {
-        "has": "^1.0.1",
-        "postcss": "^5.0.4",
-        "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "js-base64": "^2.1.9",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "http://registry.npm.taobao.org/prelude-ls/download/prelude-ls-1.1.2.tgz",
@@ -13480,7 +13024,7 @@
     },
     "promise-inflight": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/promise-inflight/download/promise-inflight-1.0.1.tgz",
       "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
       "dev": true
     },
@@ -13495,12 +13039,13 @@
       }
     },
     "proxy-addr": {
-      "version": "2.0.4",
-      "resolved": "http://registry.npm.taobao.org/proxy-addr/download/proxy-addr-2.0.4.tgz",
-      "integrity": "sha1-7PxzO/Iv+Mb0B/onUye5q2fki5M=",
+      "version": "2.0.6",
+      "resolved": "https://registry.npm.taobao.org/proxy-addr/download/proxy-addr-2.0.6.tgz",
+      "integrity": "sha1-/cIzZQVEfT8vLGOO0nLK9hS7sr8=",
+      "dev": true,
       "requires": {
         "forwarded": "~0.1.2",
-        "ipaddr.js": "1.8.0"
+        "ipaddr.js": "1.9.1"
       }
     },
     "prr": {
@@ -13522,6 +13067,7 @@
       "version": "4.0.3",
       "resolved": "http://registry.npm.taobao.org/public-encrypt/download/public-encrypt-4.0.3.tgz",
       "integrity": "sha1-T8ydd6B+SLp1J+fL4N4z0HATMeA=",
+      "dev": true,
       "requires": {
         "bn.js": "^4.1.0",
         "browserify-rsa": "^4.0.0",
@@ -13533,8 +13079,8 @@
     },
     "pump": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "resolved": "https://registry.npm.taobao.org/pump/download/pump-2.0.1.tgz",
+      "integrity": "sha1-Ejma3W5M91Jtlzy8i1zi4pCLOQk=",
       "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
@@ -13543,8 +13089,8 @@
     },
     "pumpify": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "resolved": "https://registry.npm.taobao.org/pumpify/download/pumpify-1.5.1.tgz?cache=0&sync_timestamp=1569938200736&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpumpify%2Fdownload%2Fpumpify-1.5.1.tgz",
+      "integrity": "sha1-NlE74karJ1cLGjdKXOJ4v9dDcM4=",
       "dev": true,
       "requires": {
         "duplexify": "^3.6.0",
@@ -13557,15 +13103,87 @@
       "resolved": "http://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz",
       "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew="
     },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "http://registry.npm.taobao.org/q/download/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
+    "purgecss": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npm.taobao.org/purgecss/download/purgecss-2.1.2.tgz",
+      "integrity": "sha1-lvZm0ExWcFIIqqGlRLXyLhOCiVU=",
+      "dev": true,
+      "requires": {
+        "commander": "^5.0.0",
+        "glob": "^7.0.0",
+        "postcss": "7.0.27",
+        "postcss-selector-parser": "^6.0.2"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1585815676992&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
+              "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+              "dev": true,
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "commander": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-5.0.0.tgz?cache=0&sync_timestamp=1584148318639&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-5.0.0.tgz",
+          "integrity": "sha1-2/GQm0nlBE+P2vCtyAnwwHIr39A=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.27",
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.27.tgz?cache=0&sync_timestamp=1581994803116&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.27.tgz",
+          "integrity": "sha1-zGfNxrDao3UQW3xCSoVWc0X8VNk=",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "qr.js": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npm.taobao.org/qr.js/download/qr.js-0.0.0.tgz",
+      "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
+    },
+    "qrcode.react": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/qrcode.react/download/qrcode.react-1.0.0.tgz",
+      "integrity": "sha1-foiJ2zt2nlVejrRj1MbeIhw21d4=",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.0",
+        "qr.js": "0.0.0"
+      }
     },
     "qs": {
-      "version": "6.7.0",
-      "resolved": "http://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz",
-      "integrity": "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw="
+      "version": "6.9.3",
+      "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.9.3.tgz",
+      "integrity": "sha1-v63NKWwtVJ8d/6VgYZEyyXf1AI4="
     },
     "query-string": {
       "version": "4.3.4",
@@ -13584,7 +13202,8 @@
     "querystring-es3": {
       "version": "0.2.1",
       "resolved": "http://registry.npm.taobao.org/querystring-es3/download/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
     },
     "querystringify": {
       "version": "2.1.1",
@@ -13593,8 +13212,8 @@
     },
     "quill": {
       "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
-      "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+      "resolved": "https://registry.npm.taobao.org/quill/download/quill-1.3.7.tgz",
+      "integrity": "sha1-2lsvOixHDpMjQM2/NmjJ8h+Shug=",
       "requires": {
         "clone": "^2.1.1",
         "deep-equal": "^1.0.1",
@@ -13606,20 +13225,20 @@
       "dependencies": {
         "clone": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+          "resolved": "https://registry.npm.taobao.org/clone/download/clone-2.1.2.tgz",
           "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
         },
         "eventemitter3": {
           "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
+          "resolved": "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-2.0.3.tgz?cache=0&sync_timestamp=1560950873670&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feventemitter3%2Fdownload%2Feventemitter3-2.0.3.tgz",
           "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="
         }
       }
     },
     "quill-delta": {
       "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
-      "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
+      "resolved": "https://registry.npm.taobao.org/quill-delta/download/quill-delta-3.6.3.tgz",
+      "integrity": "sha1-sZ/SuJQSMBxg4f8hPY2GDqwPEDI=",
       "requires": {
         "deep-equal": "^1.0.1",
         "extend": "^3.0.2",
@@ -13628,8 +13247,8 @@
     },
     "quill-delta-to-html": {
       "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/quill-delta-to-html/-/quill-delta-to-html-0.11.0.tgz",
-      "integrity": "sha512-PsW/VIuVDxa0xN/e+jglsSZy2eSUl/db3Lbvv3uC/syFi2ZIBL8zSsQfR7qrURrt4Aih36JZnw37CFxelIaX2Q=="
+      "resolved": "https://registry.npm.taobao.org/quill-delta-to-html/download/quill-delta-to-html-0.11.0.tgz",
+      "integrity": "sha1-2YDCh3Uv1kEyK6jL6xHr2SnWLqc="
     },
     "raf": {
       "version": "3.4.0",
@@ -13650,6 +13269,17 @@
       "integrity": "sha1-/pMPdYIRAg1H44gV9Rlqi+QVB0A=",
       "requires": {
         "global": "~4.3.0"
+      },
+      "dependencies": {
+        "global": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npm.taobao.org/global/download/global-4.3.2.tgz",
+          "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
+          "requires": {
+            "min-document": "^2.19.0",
+            "process": "~0.5.1"
+          }
+        }
       }
     },
     "randomatic": {
@@ -13668,9 +13298,9 @@
           "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8="
         },
         "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+          "version": "6.0.2",
+          "resolved": "http://registry.npm.taobao.org/kind-of/download/kind-of-6.0.2.tgz",
+          "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE="
         }
       }
     },
@@ -13678,6 +13308,7 @@
       "version": "2.1.0",
       "resolved": "http://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz",
       "integrity": "sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo=",
+      "dev": true,
       "requires": {
         "safe-buffer": "^5.1.0"
       }
@@ -13686,34 +13317,35 @@
       "version": "1.0.4",
       "resolved": "http://registry.npm.taobao.org/randomfill/download/randomfill-1.0.4.tgz",
       "integrity": "sha1-ySGW/IarQr6YPxvzF3giSTHWFFg=",
+      "dev": true,
       "requires": {
         "randombytes": "^2.0.5",
         "safe-buffer": "^5.1.0"
       }
     },
     "range-parser": {
-      "version": "1.2.0",
-      "resolved": "http://registry.npm.taobao.org/range-parser/download/range-parser-1.2.0.tgz",
-      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
+      "version": "1.2.1",
+      "resolved": "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.1.tgz",
+      "integrity": "sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE=",
+      "dev": true
     },
     "raw-body": {
-      "version": "2.3.3",
-      "resolved": "http://registry.npm.taobao.org/raw-body/download/raw-body-2.3.3.tgz",
-      "integrity": "sha1-GzJOzmtXBuFThVvBFIxlu39uoMM=",
+      "version": "2.4.0",
+      "resolved": "https://registry.npm.taobao.org/raw-body/download/raw-body-2.4.0.tgz",
+      "integrity": "sha1-oc5vucm8NWylLoklarWQWeE9AzI=",
+      "dev": true,
       "requires": {
-        "bytes": "3.0.0",
-        "http-errors": "1.6.3",
-        "iconv-lite": "0.4.23",
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
       "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.23",
-          "resolved": "http://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.23.tgz",
-          "integrity": "sha1-KXhx9jvlB63Pv8pxXQzQ7thOmmM=",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npm.taobao.org/bytes/download/bytes-3.1.0.tgz",
+          "integrity": "sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY=",
+          "dev": true
         }
       }
     },
@@ -13729,9 +13361,9 @@
       },
       "dependencies": {
         "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+          "version": "1.2.0",
+          "resolved": "http://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         }
       }
     },
@@ -13760,9 +13392,9 @@
       }
     },
     "rc-calendar": {
-      "version": "9.15.9",
-      "resolved": "https://registry.npmjs.org/rc-calendar/-/rc-calendar-9.15.9.tgz",
-      "integrity": "sha512-XOPzJlXYmLFIcwalXmzxKZrrAMD6dEPLRVoHG3wbBpErqjE8ugnXVjm9yXgtQh3Ho3Imhmt+KO0WGLv5T4WuAA==",
+      "version": "9.15.10",
+      "resolved": "https://registry.npm.taobao.org/rc-calendar/download/rc-calendar-9.15.10.tgz",
+      "integrity": "sha1-Ic+HuqeJ5YWrF7Ys93GEZXp9A28=",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "2.x",
@@ -13775,8 +13407,8 @@
     },
     "rc-cascader": {
       "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-0.17.5.tgz",
-      "integrity": "sha512-WYMVcxU0+Lj+xLr4YYH0+yXODumvNXDcVEs5i7L1mtpWwYkubPV/zbQpn+jGKFCIW/hOhjkU4J1db8/P/UKE7A==",
+      "resolved": "https://registry.npm.taobao.org/rc-cascader/download/rc-cascader-0.17.5.tgz?cache=0&sync_timestamp=1582781950582&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-cascader%2Fdownload%2Frc-cascader-0.17.5.tgz",
+      "integrity": "sha1-T96R0jt2CMQgJjw47unAaH+A99w=",
       "requires": {
         "array-tree-filter": "^2.1.0",
         "prop-types": "^15.5.8",
@@ -13789,8 +13421,8 @@
       "dependencies": {
         "warning": {
           "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+          "resolved": "https://registry.npm.taobao.org/warning/download/warning-4.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwarning%2Fdownload%2Fwarning-4.0.3.tgz",
+          "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=",
           "requires": {
             "loose-envify": "^1.0.0"
           }
@@ -13799,8 +13431,8 @@
     },
     "rc-checkbox": {
       "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-2.1.8.tgz",
-      "integrity": "sha512-6qOgh0/by0nVNASx6LZnhRTy17Etcgav+IrI7kL9V9kcDZ/g7K14JFlqrtJ3NjDq/Kyn+BPI1st1XvbkhfaJeg==",
+      "resolved": "https://registry.npm.taobao.org/rc-checkbox/download/rc-checkbox-2.1.8.tgz",
+      "integrity": "sha1-7t2e+cLzr1s7jlzeUlSqia0aiAo=",
       "requires": {
         "babel-runtime": "^6.23.0",
         "classnames": "2.x",
@@ -13810,8 +13442,8 @@
     },
     "rc-collapse": {
       "version": "1.11.8",
-      "resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-1.11.8.tgz",
-      "integrity": "sha512-8EhfPyScTYljkbRuIoHniSwZagD5UPpZ3CToYgoNYWC85L2qCbPYF7+OaC713FOrIkp6NbfNqXsITNxmDAmxog==",
+      "resolved": "https://registry.npm.taobao.org/rc-collapse/download/rc-collapse-1.11.8.tgz?cache=0&sync_timestamp=1577417298933&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-collapse%2Fdownload%2Frc-collapse-1.11.8.tgz",
+      "integrity": "sha1-ZqQAidRpUZ6UJACasckn4hQEHYA=",
       "requires": {
         "classnames": "2.x",
         "css-animation": "1.x",
@@ -13823,9 +13455,9 @@
       }
     },
     "rc-dialog": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-7.6.0.tgz",
-      "integrity": "sha512-N48vBPW8I53WycFHI4KXhuTUkB4mx+hixq1a9tcFMLoE7EhkAjbHvs0vGg+Bh/uFg5V00jmZBgQOIEbhcNal/A==",
+      "version": "7.6.1",
+      "resolved": "https://registry.npm.taobao.org/rc-dialog/download/rc-dialog-7.6.1.tgz?cache=0&sync_timestamp=1584699356539&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-dialog%2Fdownload%2Frc-dialog-7.6.1.tgz",
+      "integrity": "sha1-EVRczAuUWTT6dgeXJuDYU+UtcF8=",
       "requires": {
         "babel-runtime": "6.x",
         "rc-animate": "2.x",
@@ -13833,23 +13465,28 @@
       },
       "dependencies": {
         "rc-util": {
-          "version": "4.19.0",
-          "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.19.0.tgz",
-          "integrity": "sha512-mptALlLwpeczS3nrv83DbwJNeupolbuvlIEjcvimSiWI8NUBjpF0HgG3kWp1RymiuiRCNm9yhaXqDz0a99dpgQ==",
+          "version": "4.20.3",
+          "resolved": "https://registry.npm.taobao.org/rc-util/download/rc-util-4.20.3.tgz",
+          "integrity": "sha1-xNTuYXHPaF3HVXJ1KnZDEDJYiNM=",
           "requires": {
             "add-dom-event-listener": "^1.1.0",
-            "babel-runtime": "6.x",
             "prop-types": "^15.5.10",
+            "react-is": "^16.12.0",
             "react-lifecycles-compat": "^3.0.4",
             "shallowequal": "^1.1.0"
           }
+        },
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npm.taobao.org/react-is/download/react-is-16.13.1.tgz?cache=0&sync_timestamp=1586484576689&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-is%2Fdownload%2Freact-is-16.13.1.tgz",
+          "integrity": "sha1-eJcppNw23imZ3BVt1sHZwYzqVqQ="
         }
       }
     },
     "rc-drawer": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-3.1.3.tgz",
-      "integrity": "sha512-2z+RdxmzXyZde/1OhVMfDR1e/GBswFeWSZ7FS3Fdd0qhgVdpV1wSzILzzxRaT481ItB5hOV+e8pZT07vdJE8kg==",
+      "resolved": "https://registry.npm.taobao.org/rc-drawer/download/rc-drawer-3.1.3.tgz",
+      "integrity": "sha1-y8sE1MB/C2by7OEdhH9KG9gOoLc=",
       "requires": {
         "classnames": "^2.2.6",
         "rc-util": "^4.16.1",
@@ -13857,23 +13494,28 @@
       },
       "dependencies": {
         "rc-util": {
-          "version": "4.19.0",
-          "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.19.0.tgz",
-          "integrity": "sha512-mptALlLwpeczS3nrv83DbwJNeupolbuvlIEjcvimSiWI8NUBjpF0HgG3kWp1RymiuiRCNm9yhaXqDz0a99dpgQ==",
+          "version": "4.20.3",
+          "resolved": "https://registry.npm.taobao.org/rc-util/download/rc-util-4.20.3.tgz",
+          "integrity": "sha1-xNTuYXHPaF3HVXJ1KnZDEDJYiNM=",
           "requires": {
             "add-dom-event-listener": "^1.1.0",
-            "babel-runtime": "6.x",
             "prop-types": "^15.5.10",
+            "react-is": "^16.12.0",
             "react-lifecycles-compat": "^3.0.4",
             "shallowequal": "^1.1.0"
           }
+        },
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npm.taobao.org/react-is/download/react-is-16.13.1.tgz?cache=0&sync_timestamp=1586484576689&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-is%2Fdownload%2Freact-is-16.13.1.tgz",
+          "integrity": "sha1-eJcppNw23imZ3BVt1sHZwYzqVqQ="
         }
       }
     },
     "rc-dropdown": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-2.4.1.tgz",
-      "integrity": "sha512-p0XYn0wrOpAZ2fUGE6YJ6U8JBNc5ASijznZ6dkojdaEfQJAeZtV9KMEewhxkVlxGSbbdXe10ptjBlTEW9vEwEg==",
+      "resolved": "https://registry.npm.taobao.org/rc-dropdown/download/rc-dropdown-2.4.1.tgz",
+      "integrity": "sha1-qu9us6UVLN2ZgolcKnjZtfBGzew=",
       "requires": {
         "babel-runtime": "^6.26.0",
         "classnames": "^2.2.6",
@@ -13884,8 +13526,8 @@
     },
     "rc-editor-core": {
       "version": "0.8.10",
-      "resolved": "https://registry.npmjs.org/rc-editor-core/-/rc-editor-core-0.8.10.tgz",
-      "integrity": "sha512-T3aHpeMCIYA1sdAI7ynHHjXy5fqp83uPlD68ovZ0oClTSc3tbHmyCxXlA+Ti4YgmcpCYv7avF6a+TIbAka53kw==",
+      "resolved": "https://registry.npm.taobao.org/rc-editor-core/download/rc-editor-core-0.8.10.tgz",
+      "integrity": "sha1-byFbxd+cM/+p9sWzDKc6favoq3w=",
       "requires": {
         "babel-runtime": "^6.26.0",
         "classnames": "^2.2.5",
@@ -13898,8 +13540,8 @@
     },
     "rc-editor-mention": {
       "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/rc-editor-mention/-/rc-editor-mention-1.1.13.tgz",
-      "integrity": "sha512-3AOmGir91Fi2ogfRRaXLtqlNuIwQpvla7oUnGHS1+3eo7b+fUp5IlKcagqtwUBB5oDNofoySXkLBxzWvSYNp/Q==",
+      "resolved": "https://registry.npm.taobao.org/rc-editor-mention/download/rc-editor-mention-1.1.13.tgz",
+      "integrity": "sha1-nxyrEGX4awFSOEAyF5DCqxKsXos=",
       "requires": {
         "babel-runtime": "^6.23.0",
         "classnames": "^2.2.5",
@@ -13909,37 +13551,45 @@
         "prop-types": "^15.5.8",
         "rc-animate": "^2.3.0",
         "rc-editor-core": "~0.8.3"
-      },
-      "dependencies": {
-        "immutable": {
-          "version": "3.7.6",
-          "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz",
-          "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks="
-        }
       }
     },
     "rc-form": {
-      "version": "2.4.4",
-      "resolved": "http://registry.npm.taobao.org/rc-form/download/rc-form-2.4.4.tgz",
-      "integrity": "sha1-rA88xkNySZHHQtWuZ0J3f7wLz7s=",
+      "version": "2.4.11",
+      "resolved": "https://registry.npm.taobao.org/rc-form/download/rc-form-2.4.11.tgz",
+      "integrity": "sha1-Ye465XklloSuMPLEj1Xw8jpdPQg=",
       "requires": {
-        "async-validator": "~1.8.5",
+        "async-validator": "~1.11.3",
         "babel-runtime": "6.x",
         "create-react-class": "^15.5.3",
         "dom-scroll-into-view": "1.x",
         "hoist-non-react-statics": "^3.3.0",
         "lodash": "^4.17.4",
+        "rc-util": "^4.15.3",
         "warning": "^4.0.3"
       },
       "dependencies": {
         "async-validator": {
-          "version": "1.8.5",
-          "resolved": "http://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz",
-          "integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
+          "version": "1.11.5",
+          "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.11.5.tgz",
+          "integrity": "sha1-nUPPSe9rt2vlRCOI0Z+5puR1l+o="
+        },
+        "rc-util": {
+          "version": "4.20.3",
+          "resolved": "https://registry.npm.taobao.org/rc-util/download/rc-util-4.20.3.tgz",
+          "integrity": "sha1-xNTuYXHPaF3HVXJ1KnZDEDJYiNM=",
           "requires": {
-            "babel-runtime": "6.x"
+            "add-dom-event-listener": "^1.1.0",
+            "prop-types": "^15.5.10",
+            "react-is": "^16.12.0",
+            "react-lifecycles-compat": "^3.0.4",
+            "shallowequal": "^1.1.0"
           }
         },
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npm.taobao.org/react-is/download/react-is-16.13.1.tgz?cache=0&sync_timestamp=1586484576689&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-is%2Fdownload%2Freact-is-16.13.1.tgz",
+          "integrity": "sha1-eJcppNw23imZ3BVt1sHZwYzqVqQ="
+        },
         "warning": {
           "version": "4.0.3",
           "resolved": "http://registry.npm.taobao.org/warning/download/warning-4.0.3.tgz",
@@ -13952,8 +13602,8 @@
     },
     "rc-hammerjs": {
       "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/rc-hammerjs/-/rc-hammerjs-0.6.9.tgz",
-      "integrity": "sha512-4llgWO3RgLyVbEqUdGsDfzUDqklRlQW5VEhE3x35IvhV+w//VPRG34SBavK3D2mD/UaLKaohgU41V4agiftC8g==",
+      "resolved": "https://registry.npm.taobao.org/rc-hammerjs/download/rc-hammerjs-0.6.9.tgz",
+      "integrity": "sha1-mk3b2hsuyPm5WWCRpqmJhCokOQc=",
       "requires": {
         "babel-runtime": "6.x",
         "hammerjs": "^2.0.8",
@@ -13961,9 +13611,9 @@
       }
     },
     "rc-input-number": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-4.5.4.tgz",
-      "integrity": "sha512-lHk4o+vXv9l7Ku4jz4iCuzwG7PsOimdlPpIdIEX9TqnBWVa4QMjwkqin7ILlS2Dy/DBYrLnymtPrIXEGOll7KA==",
+      "version": "4.5.6",
+      "resolved": "https://registry.npm.taobao.org/rc-input-number/download/rc-input-number-4.5.6.tgz?cache=0&sync_timestamp=1582780745318&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-input-number%2Fdownload%2Frc-input-number-4.5.6.tgz",
+      "integrity": "sha1-DVJ2KwrDlDIlbixsXINhAvl5fEY=",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "^2.2.0",
@@ -13974,8 +13624,8 @@
     },
     "rc-mentions": {
       "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/rc-mentions/-/rc-mentions-0.4.2.tgz",
-      "integrity": "sha512-DTZurQzacLXOfVuiHydGzqkq7cFMHXF18l2jZ9PhWUn2cqvOSY3W4osN0Pq29AOMOBpcxdZCzgc7Lb0r/bgkDw==",
+      "resolved": "https://registry.npm.taobao.org/rc-mentions/download/rc-mentions-0.4.2.tgz?cache=0&sync_timestamp=1582778385016&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-mentions%2Fdownload%2Frc-mentions-0.4.2.tgz",
+      "integrity": "sha1-wYq3Ae+55LdbOFGgwNLdaYZA4kY=",
       "requires": {
         "@ant-design/create-react-context": "^0.2.4",
         "classnames": "^2.2.6",
@@ -14005,8 +13655,8 @@
     },
     "rc-notification": {
       "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-3.3.1.tgz",
-      "integrity": "sha512-U5+f4BmBVfMSf3OHSLyRagsJ74yKwlrQAtbbL5ijoA0F2C60BufwnOcHG18tVprd7iaIjzZt1TKMmQSYSvgrig==",
+      "resolved": "https://registry.npm.taobao.org/rc-notification/download/rc-notification-3.3.1.tgz?cache=0&sync_timestamp=1582728076248&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-notification%2Fdownload%2Frc-notification-3.3.1.tgz",
+      "integrity": "sha1-C6o+cPjUCrAVzo+njCYMSQ/HvrQ=",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "2.x",
@@ -14016,39 +13666,57 @@
       }
     },
     "rc-pagination": {
-      "version": "1.17.14",
-      "resolved": "http://registry.npm.taobao.org/rc-pagination/download/rc-pagination-1.17.14.tgz",
-      "integrity": "sha1-/7KIL9idlbO2A5ONxdsvssMAJtM=",
+      "version": "1.21.0",
+      "resolved": "https://registry.npm.taobao.org/rc-pagination/download/rc-pagination-1.21.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-pagination%2Fdownload%2Frc-pagination-1.21.0.tgz",
+      "integrity": "sha1-1x+VSGEDLjYdrdf9cYzTQVHW7Sw=",
       "requires": {
         "babel-runtime": "6.x",
+        "classnames": "^2.2.6",
         "prop-types": "^15.5.7",
         "react-lifecycles-compat": "^3.0.4"
       }
     },
     "rc-progress": {
       "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-2.5.2.tgz",
-      "integrity": "sha512-ajI+MJkbBz9zYDuE9GQsY5gsyqPF7HFioZEDZ9Fmc+ebNZoiSeSJsTJImPFCg0dW/5WiRGUy2F69SX1aPtSJgA==",
+      "resolved": "https://registry.npm.taobao.org/rc-progress/download/rc-progress-2.5.2.tgz",
+      "integrity": "sha1-qwG6Tl0vo2/J9vBYsQtyDnMVVgw=",
       "requires": {
         "babel-runtime": "6.x",
         "prop-types": "^15.5.8"
       }
     },
     "rc-rate": {
-      "version": "2.5.0",
-      "resolved": "http://registry.npm.taobao.org/rc-rate/download/rc-rate-2.5.0.tgz",
-      "integrity": "sha1-ctSYSgPQp6Dmd5x6ee/OonYmq/Y=",
+      "version": "2.6.0",
+      "resolved": "https://registry.npm.taobao.org/rc-rate/download/rc-rate-2.6.0.tgz?cache=0&sync_timestamp=1587022209816&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-rate%2Fdownload%2Frc-rate-2.6.0.tgz",
+      "integrity": "sha1-OZDxsMfw2pFGXBKvNhLAPdg2cD0=",
       "requires": {
         "classnames": "^2.2.5",
-        "prop-types": "^15.5.8",
-        "rc-util": "^4.3.0",
-        "react-lifecycles-compat": "^3.0.4"
+        "rc-util": "^4.20.1"
+      },
+      "dependencies": {
+        "rc-util": {
+          "version": "4.20.3",
+          "resolved": "https://registry.npm.taobao.org/rc-util/download/rc-util-4.20.3.tgz",
+          "integrity": "sha1-xNTuYXHPaF3HVXJ1KnZDEDJYiNM=",
+          "requires": {
+            "add-dom-event-listener": "^1.1.0",
+            "prop-types": "^15.5.10",
+            "react-is": "^16.12.0",
+            "react-lifecycles-compat": "^3.0.4",
+            "shallowequal": "^1.1.0"
+          }
+        },
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npm.taobao.org/react-is/download/react-is-16.13.1.tgz?cache=0&sync_timestamp=1586484576689&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-is%2Fdownload%2Freact-is-16.13.1.tgz",
+          "integrity": "sha1-eJcppNw23imZ3BVt1sHZwYzqVqQ="
+        }
       }
     },
     "rc-resize-observer": {
       "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/rc-resize-observer/-/rc-resize-observer-0.1.3.tgz",
-      "integrity": "sha512-uzOQEwx83xdQSFOkOAM7x7GHIQKYnrDV4dWxtCxyG1BS1pkfJ4EvDeMfsvAJHSYkQXVBu+sgRHGbRtLG3qiuUg==",
+      "resolved": "https://registry.npm.taobao.org/rc-resize-observer/download/rc-resize-observer-0.1.3.tgz",
+      "integrity": "sha1-CXGR+cOrGG7ZB7VTum71Zd8Rwkk=",
       "requires": {
         "classnames": "^2.2.1",
         "rc-util": "^4.13.0",
@@ -14056,16 +13724,21 @@
       },
       "dependencies": {
         "rc-util": {
-          "version": "4.19.0",
-          "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.19.0.tgz",
-          "integrity": "sha512-mptALlLwpeczS3nrv83DbwJNeupolbuvlIEjcvimSiWI8NUBjpF0HgG3kWp1RymiuiRCNm9yhaXqDz0a99dpgQ==",
+          "version": "4.20.3",
+          "resolved": "https://registry.npm.taobao.org/rc-util/download/rc-util-4.20.3.tgz",
+          "integrity": "sha1-xNTuYXHPaF3HVXJ1KnZDEDJYiNM=",
           "requires": {
             "add-dom-event-listener": "^1.1.0",
-            "babel-runtime": "6.x",
             "prop-types": "^15.5.10",
+            "react-is": "^16.12.0",
             "react-lifecycles-compat": "^3.0.4",
             "shallowequal": "^1.1.0"
           }
+        },
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npm.taobao.org/react-is/download/react-is-16.13.1.tgz?cache=0&sync_timestamp=1586484576689&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-is%2Fdownload%2Freact-is-16.13.1.tgz",
+          "integrity": "sha1-eJcppNw23imZ3BVt1sHZwYzqVqQ="
         }
       }
     },
@@ -14100,8 +13773,8 @@
     },
     "rc-slider": {
       "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-8.7.1.tgz",
-      "integrity": "sha512-WMT5mRFUEcrLWwTxsyS8jYmlaMsTVCZIGENLikHsNv+tE8ThU2lCoPfi/xFNUfJFNFSBFP3MwPez9ZsJmNp13g==",
+      "resolved": "https://registry.npm.taobao.org/rc-slider/download/rc-slider-8.7.1.tgz?cache=0&sync_timestamp=1582781270275&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-slider%2Fdownload%2Frc-slider-8.7.1.tgz",
+      "integrity": "sha1-ntBzYtyTSJo45lSyG4EirXD9PEI=",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "^2.2.5",
@@ -14115,8 +13788,8 @@
       "dependencies": {
         "warning": {
           "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+          "resolved": "https://registry.npm.taobao.org/warning/download/warning-4.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwarning%2Fdownload%2Fwarning-4.0.3.tgz",
+          "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=",
           "requires": {
             "loose-envify": "^1.0.0"
           }
@@ -14125,8 +13798,8 @@
     },
     "rc-steps": {
       "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-3.5.0.tgz",
-      "integrity": "sha512-2Vkkrpa7PZbg7qPsqTNzVDov4u78cmxofjjnIHiGB9+9rqKS8oTLPzbW2uiWDr3Lk+yGwh8rbpGO1E6VAgBCOg==",
+      "resolved": "https://registry.npm.taobao.org/rc-steps/download/rc-steps-3.5.0.tgz",
+      "integrity": "sha1-NrKn8fSZB7DZA2OISxhiPK+ftgA=",
       "requires": {
         "babel-runtime": "^6.23.0",
         "classnames": "^2.2.3",
@@ -14136,8 +13809,8 @@
     },
     "rc-switch": {
       "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-1.9.0.tgz",
-      "integrity": "sha512-Isas+egaK6qSk64jaEw4GgPStY4umYDbT7ZY93bZF1Af+b/JEsKsJdNOU2qG3WI0Z6tXo2DDq0kJCv8Yhu0zww==",
+      "resolved": "https://registry.npm.taobao.org/rc-switch/download/rc-switch-1.9.0.tgz",
+      "integrity": "sha1-qyuHjycTxoE1ikUzkZdsm5WykPc=",
       "requires": {
         "classnames": "^2.2.1",
         "prop-types": "^15.5.6",
@@ -14145,9 +13818,9 @@
       }
     },
     "rc-table": {
-      "version": "6.10.11",
-      "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-6.10.11.tgz",
-      "integrity": "sha512-YcTlpO4RKlcM7Mio2FjcUOqRUyGU4edtOBG4x5kwZNHwZdfBm7m6VQuyQ/i6qec5S67EP86wiFbmKU54Z2HtFQ==",
+      "version": "6.10.14",
+      "resolved": "https://registry.npm.taobao.org/rc-table/download/rc-table-6.10.14.tgz",
+      "integrity": "sha1-Eunbbxk16BSRyryFb/aA3iHdRR8=",
       "requires": {
         "classnames": "^2.2.5",
         "component-classes": "^1.2.6",
@@ -14160,23 +13833,28 @@
       },
       "dependencies": {
         "rc-util": {
-          "version": "4.19.0",
-          "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.19.0.tgz",
-          "integrity": "sha512-mptALlLwpeczS3nrv83DbwJNeupolbuvlIEjcvimSiWI8NUBjpF0HgG3kWp1RymiuiRCNm9yhaXqDz0a99dpgQ==",
+          "version": "4.20.3",
+          "resolved": "https://registry.npm.taobao.org/rc-util/download/rc-util-4.20.3.tgz",
+          "integrity": "sha1-xNTuYXHPaF3HVXJ1KnZDEDJYiNM=",
           "requires": {
             "add-dom-event-listener": "^1.1.0",
-            "babel-runtime": "6.x",
             "prop-types": "^15.5.10",
+            "react-is": "^16.12.0",
             "react-lifecycles-compat": "^3.0.4",
             "shallowequal": "^1.1.0"
           }
+        },
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npm.taobao.org/react-is/download/react-is-16.13.1.tgz?cache=0&sync_timestamp=1586484576689&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-is%2Fdownload%2Freact-is-16.13.1.tgz",
+          "integrity": "sha1-eJcppNw23imZ3BVt1sHZwYzqVqQ="
         }
       }
     },
     "rc-tabs": {
       "version": "9.7.0",
-      "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-9.7.0.tgz",
-      "integrity": "sha512-kvmgp8/MfLzFZ06hWHignqomFQ5nF7BqKr5O1FfhE4VKsGrep52YSF/1MvS5oe0NPcI9XGNS2p751C5v6cYDpQ==",
+      "resolved": "https://registry.npm.taobao.org/rc-tabs/download/rc-tabs-9.7.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-tabs%2Fdownload%2Frc-tabs-9.7.0.tgz",
+      "integrity": "sha1-rglpW+9ZY9bmTnvBBSHHbf3YRIs=",
       "requires": {
         "@ant-design/create-react-context": "^0.2.4",
         "babel-runtime": "6.x",
@@ -14193,16 +13871,16 @@
       "dependencies": {
         "raf": {
           "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-          "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+          "resolved": "https://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fraf%2Fdownload%2Fraf-3.4.1.tgz",
+          "integrity": "sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=",
           "requires": {
             "performance-now": "^2.1.0"
           }
         },
         "warning": {
           "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+          "resolved": "https://registry.npm.taobao.org/warning/download/warning-4.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwarning%2Fdownload%2Fwarning-4.0.3.tgz",
+          "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=",
           "requires": {
             "loose-envify": "^1.0.0"
           }
@@ -14211,8 +13889,8 @@
     },
     "rc-time-picker": {
       "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/rc-time-picker/-/rc-time-picker-3.7.3.tgz",
-      "integrity": "sha512-Lv1Mvzp9fRXhXEnRLO4nW6GLNxUkfAZ3RsiIBsWjGjXXvMNjdr4BX/ayElHAFK0DoJqOhm7c5tjmIYpEOwcUXg==",
+      "resolved": "https://registry.npm.taobao.org/rc-time-picker/download/rc-time-picker-3.7.3.tgz?cache=0&sync_timestamp=1576572941972&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-time-picker%2Fdownload%2Frc-time-picker-3.7.3.tgz",
+      "integrity": "sha1-ZajekECTJQrpyCsCpJBeD5leI+I=",
       "requires": {
         "classnames": "2.x",
         "moment": "2.x",
@@ -14224,8 +13902,8 @@
       "dependencies": {
         "raf": {
           "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-          "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+          "resolved": "https://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fraf%2Fdownload%2Fraf-3.4.1.tgz",
+          "integrity": "sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=",
           "requires": {
             "performance-now": "^2.1.0"
           }
@@ -14234,8 +13912,8 @@
     },
     "rc-tooltip": {
       "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-3.7.3.tgz",
-      "integrity": "sha512-dE2ibukxxkrde7wH9W8ozHKUO4aQnPZ6qBHtrTH9LoO836PjDdiaWO73fgPB05VfJs9FbZdmGPVEbXCeOP99Ww==",
+      "resolved": "https://registry.npm.taobao.org/rc-tooltip/download/rc-tooltip-3.7.3.tgz?cache=0&sync_timestamp=1582782132860&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-tooltip%2Fdownload%2Frc-tooltip-3.7.3.tgz",
+      "integrity": "sha1-KArsavyqROjf8EgPuv+eh/wArsw=",
       "requires": {
         "babel-runtime": "6.x",
         "prop-types": "^15.5.8",
@@ -14243,9 +13921,9 @@
       }
     },
     "rc-tree": {
-      "version": "1.15.2",
-      "resolved": "http://registry.npm.taobao.org/rc-tree/download/rc-tree-1.15.2.tgz",
-      "integrity": "sha1-oNbyD6K9vlHYKdXO6nSkB7BL/qk=",
+      "version": "1.15.3",
+      "resolved": "https://registry.npm.taobao.org/rc-tree/download/rc-tree-1.15.3.tgz?cache=0&sync_timestamp=1586517308737&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-tree%2Fdownload%2Frc-tree-1.15.3.tgz",
+      "integrity": "sha1-SSSBTEaNyAlcrCEvo4uisctstck=",
       "requires": {
         "babel-runtime": "^6.23.0",
         "classnames": "2.x",
@@ -14275,8 +13953,8 @@
     },
     "rc-tree-select": {
       "version": "2.9.4",
-      "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-2.9.4.tgz",
-      "integrity": "sha512-0HQkXAN4XbfBW20CZYh3G+V+VMrjX42XRtDCpyv6PDUm5vikC0Ob682ZBCVS97Ww2a5Hf6Ajmu0ahWEdIEpwhg==",
+      "resolved": "https://registry.npm.taobao.org/rc-tree-select/download/rc-tree-select-2.9.4.tgz?cache=0&sync_timestamp=1582780708830&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-tree-select%2Fdownload%2Frc-tree-select-2.9.4.tgz",
+      "integrity": "sha1-aqeU4fDmXGbEBqoKKg50/QpVewk=",
       "requires": {
         "classnames": "^2.2.1",
         "dom-scroll-into-view": "^1.2.1",
@@ -14292,9 +13970,9 @@
       },
       "dependencies": {
         "rc-animate": {
-          "version": "2.10.2",
-          "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.10.2.tgz",
-          "integrity": "sha512-cE/A7piAzoWFSgUD69NmmMraqCeqVBa51UErod8NS3LUEqWfppSVagHfa0qHAlwPVPiIBg3emRONyny3eiH0Dg==",
+          "version": "2.10.3",
+          "resolved": "https://registry.npm.taobao.org/rc-animate/download/rc-animate-2.10.3.tgz",
+          "integrity": "sha1-Fj1eKSgaT/gtU+55GO7qyFa3Vvk=",
           "requires": {
             "babel-runtime": "6.x",
             "classnames": "^2.2.6",
@@ -14306,13 +13984,13 @@
           },
           "dependencies": {
             "rc-util": {
-              "version": "4.19.0",
-              "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.19.0.tgz",
-              "integrity": "sha512-mptALlLwpeczS3nrv83DbwJNeupolbuvlIEjcvimSiWI8NUBjpF0HgG3kWp1RymiuiRCNm9yhaXqDz0a99dpgQ==",
+              "version": "4.20.3",
+              "resolved": "https://registry.npm.taobao.org/rc-util/download/rc-util-4.20.3.tgz",
+              "integrity": "sha1-xNTuYXHPaF3HVXJ1KnZDEDJYiNM=",
               "requires": {
                 "add-dom-event-listener": "^1.1.0",
-                "babel-runtime": "6.x",
                 "prop-types": "^15.5.10",
+                "react-is": "^16.12.0",
                 "react-lifecycles-compat": "^3.0.4",
                 "shallowequal": "^1.1.0"
               }
@@ -14321,8 +13999,8 @@
         },
         "rc-tree": {
           "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-2.1.3.tgz",
-          "integrity": "sha512-COvV65spQ6omrHBUhHRKqKNL5+ddXjlS+qWZchaL9FFuQNvjM5pjp9RnmMWK4fJJ5kBhhpLneh6wh9Vh3kSMXQ==",
+          "resolved": "https://registry.npm.taobao.org/rc-tree/download/rc-tree-2.1.3.tgz",
+          "integrity": "sha1-UhSrGyGhhI65ot3LkZ47xG1tOQs=",
           "requires": {
             "@ant-design/create-react-context": "^0.2.4",
             "classnames": "2.x",
@@ -14335,8 +14013,8 @@
         },
         "rc-trigger": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-3.0.0.tgz",
-          "integrity": "sha512-hQxbbJpo23E2QnYczfq3Ec5J5tVl2mUDhkqxrEsQAqk16HfADQg+iKNWzEYXyERSncdxfnzYuaBgy764mNRzTA==",
+          "resolved": "https://registry.npm.taobao.org/rc-trigger/download/rc-trigger-3.0.0.tgz",
+          "integrity": "sha1-9tmx2oomsrLR2RKgaHbBpIb1mA8=",
           "requires": {
             "babel-runtime": "6.x",
             "classnames": "^2.2.6",
@@ -14349,8 +14027,8 @@
           "dependencies": {
             "rc-animate": {
               "version": "3.0.0-rc.6",
-              "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.0.0-rc.6.tgz",
-              "integrity": "sha512-oBLPpiT6Q4t6YvD/pkLcmofBP1p01TX0Otse8Q4+Mxt8J+VSDflLZGIgf62EwkvRwsQUkLPjZVFBsldnPKLzjg==",
+              "resolved": "https://registry.npm.taobao.org/rc-animate/download/rc-animate-3.0.0-rc.6.tgz",
+              "integrity": "sha1-BCiO76EY4MriFFNsipA/+qwbw/s=",
               "requires": {
                 "babel-runtime": "6.x",
                 "classnames": "^2.2.5",
@@ -14363,23 +14041,28 @@
               }
             },
             "rc-util": {
-              "version": "4.19.0",
-              "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.19.0.tgz",
-              "integrity": "sha512-mptALlLwpeczS3nrv83DbwJNeupolbuvlIEjcvimSiWI8NUBjpF0HgG3kWp1RymiuiRCNm9yhaXqDz0a99dpgQ==",
+              "version": "4.20.3",
+              "resolved": "https://registry.npm.taobao.org/rc-util/download/rc-util-4.20.3.tgz",
+              "integrity": "sha1-xNTuYXHPaF3HVXJ1KnZDEDJYiNM=",
               "requires": {
                 "add-dom-event-listener": "^1.1.0",
-                "babel-runtime": "6.x",
                 "prop-types": "^15.5.10",
+                "react-is": "^16.12.0",
                 "react-lifecycles-compat": "^3.0.4",
                 "shallowequal": "^1.1.0"
               }
             }
           }
         },
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npm.taobao.org/react-is/download/react-is-16.13.1.tgz?cache=0&sync_timestamp=1586484576689&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-is%2Fdownload%2Freact-is-16.13.1.tgz",
+          "integrity": "sha1-eJcppNw23imZ3BVt1sHZwYzqVqQ="
+        },
         "warning": {
           "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+          "resolved": "https://registry.npm.taobao.org/warning/download/warning-4.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwarning%2Fdownload%2Fwarning-4.0.3.tgz",
+          "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=",
           "requires": {
             "loose-envify": "^1.0.0"
           }
@@ -14400,9 +14083,9 @@
       }
     },
     "rc-upload": {
-      "version": "2.6.3",
-      "resolved": "http://registry.npm.taobao.org/rc-upload/download/rc-upload-2.6.3.tgz",
-      "integrity": "sha1-mfD0uUjoLHEoClBzme5L8vwWtEA=",
+      "version": "2.9.4",
+      "resolved": "https://registry.npm.taobao.org/rc-upload/download/rc-upload-2.9.4.tgz",
+      "integrity": "sha1-jjSnOkaNeQf+MZgsOBAORZOFfTI=",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "^2.2.5",
@@ -14442,9 +14125,9 @@
       }
     },
     "react": {
-      "version": "16.12.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.12.0.tgz",
-      "integrity": "sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==",
+      "version": "16.13.1",
+      "resolved": "https://registry.npm.taobao.org/react/download/react-16.13.1.tgz?cache=0&sync_timestamp=1586486111976&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact%2Fdownload%2Freact-16.13.1.tgz",
+      "integrity": "sha1-LoGIIvGpdDEiwGPWQQ2FweOv5I4=",
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -14480,22 +14163,9 @@
       }
     },
     "react-codemirror2": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/react-codemirror2/-/react-codemirror2-6.0.0.tgz",
-      "integrity": "sha512-D7y9qZ05FbUh9blqECaJMdDwKluQiO3A9xB+fssd5jKM7YAXucRuEOlX32mJQumUvHUkHRHqXIPBjm6g0FW0Ag=="
-    },
-    "react-color": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/react-color/-/react-color-2.18.0.tgz",
-      "integrity": "sha512-FyVeU1kQiSokWc8NPz22azl1ezLpJdUyTbWL0LPUpcuuYDrZ/Y1veOk9rRK5B3pMlyDGvTk4f4KJhlkIQNRjEA==",
-      "requires": {
-        "@icons/material": "^0.2.4",
-        "lodash": "^4.17.11",
-        "material-colors": "^1.2.1",
-        "prop-types": "^15.5.10",
-        "reactcss": "^1.2.0",
-        "tinycolor2": "^1.4.1"
-      }
+      "version": "6.0.1",
+      "resolved": "https://registry.npm.taobao.org/react-codemirror2/download/react-codemirror2-6.0.1.tgz",
+      "integrity": "sha1-faukB5XrKlJjeSa2/gtzpukJByM="
     },
     "react-content-loader": {
       "version": "3.4.2",
@@ -14504,53 +14174,221 @@
     },
     "react-cookies": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/react-cookies/-/react-cookies-0.1.1.tgz",
-      "integrity": "sha512-PP75kJ4vtoHuuTdq0TAD3RmlAv7vuDQh9fkC4oDlhntgs9vX1DmREomO0Y1mcQKR9nMZ6/zxoflaMJ3MAmF5KQ==",
+      "resolved": "https://registry.npm.taobao.org/react-cookies/download/react-cookies-0.1.1.tgz",
+      "integrity": "sha1-KjWAfgT1oT9YzNGp+2ZXRQaHPIg=",
       "requires": {
         "cookie": "^0.3.1",
         "object-assign": "^4.1.1"
       }
     },
-    "react-dev-utils": {
-      "version": "5.0.3",
-      "resolved": "http://registry.npm.taobao.org/react-dev-utils/download/react-dev-utils-5.0.3.tgz",
-      "integrity": "sha1-kvl2aPA96wnX+hHqKIgyqMdW414=",
+    "react-datepicker": {
+      "version": "2.14.1",
+      "resolved": "https://registry.npm.taobao.org/react-datepicker/download/react-datepicker-2.14.1.tgz",
+      "integrity": "sha1-g0Y764UjWldUdZVfVUKQqV+Jxls=",
       "requires": {
-        "address": "1.0.3",
-        "babel-code-frame": "6.26.0",
-        "chalk": "1.1.3",
-        "cross-spawn": "5.1.0",
+        "classnames": "^2.2.6",
+        "date-fns": "^2.0.1",
+        "prop-types": "^15.7.2",
+        "react-onclickoutside": "^6.9.0",
+        "react-popper": "^1.3.4"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.9.2",
+          "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.9.2.tgz",
+          "integrity": "sha1-2Q3wWDo6JS8JqqYZZlNnuuUY2wY=",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "deep-equal": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz",
+          "integrity": "sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o=",
+          "requires": {
+            "is-arguments": "^1.0.4",
+            "is-date-object": "^1.0.1",
+            "is-regex": "^1.0.4",
+            "object-is": "^1.0.1",
+            "object-keys": "^1.1.1",
+            "regexp.prototype.flags": "^1.2.0"
+          }
+        },
+        "react-popper": {
+          "version": "1.3.7",
+          "resolved": "https://registry.npm.taobao.org/react-popper/download/react-popper-1.3.7.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-popper%2Fdownload%2Freact-popper-1.3.7.tgz",
+          "integrity": "sha1-9qNHE2LvHw0QpJY2c3id4brKIyQ=",
+          "requires": {
+            "@babel/runtime": "^7.1.2",
+            "create-react-context": "^0.3.0",
+            "deep-equal": "^1.1.1",
+            "popper.js": "^1.14.4",
+            "prop-types": "^15.6.1",
+            "typed-styles": "^0.0.7",
+            "warning": "^4.0.2"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.5",
+          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.5.tgz?cache=0&sync_timestamp=1584052597708&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.5.tgz",
+          "integrity": "sha1-2Hih0JS0MG0QuQlkhLM+vVXiZpc="
+        },
+        "warning": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npm.taobao.org/warning/download/warning-4.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwarning%2Fdownload%2Fwarning-4.0.3.tgz",
+          "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=",
+          "requires": {
+            "loose-envify": "^1.0.0"
+          }
+        }
+      }
+    },
+    "react-dev-utils": {
+      "version": "9.2.0-next.80",
+      "resolved": "https://registry.npm.taobao.org/react-dev-utils/download/react-dev-utils-9.2.0-next.80.tgz?cache=0&sync_timestamp=1584750909878&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-dev-utils%2Fdownload%2Freact-dev-utils-9.2.0-next.80.tgz",
+      "integrity": "sha1-2trEs89f31pXVuthck5zcI35G3A=",
+      "requires": {
+        "@babel/code-frame": "7.5.5",
+        "address": "1.1.2",
+        "browserslist": "4.7.3",
+        "chalk": "2.4.2",
+        "cross-spawn": "6.0.5",
         "detect-port-alt": "1.1.6",
         "escape-string-regexp": "1.0.5",
-        "filesize": "3.5.11",
-        "global-modules": "1.0.0",
-        "gzip-size": "3.0.0",
-        "inquirer": "3.3.0",
-        "is-root": "1.0.0",
-        "opn": "5.2.0",
-        "react-error-overlay": "^4.0.1",
-        "recursive-readdir": "2.2.1",
-        "shell-quote": "1.6.1",
-        "sockjs-client": "1.1.5",
-        "strip-ansi": "3.0.1",
+        "filesize": "3.6.1",
+        "find-up": "3.0.0",
+        "fork-ts-checker-webpack-plugin": "3.1.0",
+        "global-modules": "2.0.0",
+        "globby": "8.0.2",
+        "gzip-size": "5.1.1",
+        "immer": "1.10.0",
+        "inquirer": "6.5.0",
+        "is-root": "2.1.0",
+        "loader-utils": "1.2.3",
+        "open": "^7.0.0",
+        "pkg-up": "2.0.0",
+        "react-error-overlay": "6.1.0-next.80+0b456009",
+        "recursive-readdir": "2.2.2",
+        "shell-quote": "1.7.2",
+        "strip-ansi": "5.2.0",
         "text-table": "0.2.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-4.1.0.tgz",
+          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc="
+        },
+        "browserslist": {
+          "version": "4.7.3",
+          "resolved": "https://registry.npm.taobao.org/browserslist/download/browserslist-4.7.3.tgz",
+          "integrity": "sha1-AjQfFitrzB4QKOMGJIFdSSRELcM=",
+          "requires": {
+            "caniuse-lite": "^1.0.30001010",
+            "electron-to-chromium": "^1.3.306",
+            "node-releases": "^1.1.40"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001045",
+          "resolved": "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30001045.tgz",
+          "integrity": "sha1-p3DfneNq1soMNPkOqnl6Lbuxthk="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz",
+          "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "electron-to-chromium": {
+          "version": "1.3.414",
+          "resolved": "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.414.tgz",
+          "integrity": "sha1-nQqS3v79p8wc+IlQWLiSeV3da0E="
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz",
+          "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=",
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "is-root": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npm.taobao.org/is-root/download/is-root-2.1.0.tgz",
+          "integrity": "sha1-gJ4YEpzxEpZEMCpPhUQDXVGYSpw="
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz",
+          "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npm.taobao.org/p-limit/download/p-limit-2.3.0.tgz",
+          "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz",
+          "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=",
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npm.taobao.org/p-try/download/p-try-2.2.0.tgz",
+          "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY="
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz",
+          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
     "react-dom": {
-      "version": "16.12.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.12.0.tgz",
-      "integrity": "sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==",
+      "version": "16.13.1",
+      "resolved": "https://registry.npm.taobao.org/react-dom/download/react-dom-16.13.1.tgz?cache=0&sync_timestamp=1586484258205&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-dom%2Fdownload%2Freact-dom-16.13.1.tgz",
+      "integrity": "sha1-wb03MxoEhsB47lTEdAcgmTsuDn8=",
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
         "prop-types": "^15.6.2",
-        "scheduler": "^0.18.0"
+        "scheduler": "^0.19.1"
       }
     },
     "react-error-overlay": {
-      "version": "4.0.1",
-      "resolved": "http://registry.npm.taobao.org/react-error-overlay/download/react-error-overlay-4.0.1.tgz",
-      "integrity": "sha1-QXrdsIFKkPOnCC6sunzuWI0A2ok="
+      "version": "6.1.0-next.80",
+      "resolved": "https://registry.npm.taobao.org/react-error-overlay/download/react-error-overlay-6.1.0-next.80.tgz",
+      "integrity": "sha1-jtzeqTg8oPNt7iOlrzQ+hZJ6uZ8="
     },
     "react-event-listener": {
       "version": "0.5.10",
@@ -14575,18 +14413,17 @@
       }
     },
     "react-hot-loader": {
-      "version": "4.8.3",
-      "resolved": "http://registry.npm.taobao.org/react-hot-loader/download/react-hot-loader-4.8.3.tgz",
-      "integrity": "sha1-FPAYd3pg6pz6YElsc0HC+WcxElM=",
+      "version": "4.12.20",
+      "resolved": "https://registry.npm.taobao.org/react-hot-loader/download/react-hot-loader-4.12.20.tgz",
+      "integrity": "sha1-wsQjYqdXjlwwNXpf96+mgKoL74o=",
       "requires": {
         "fast-levenshtein": "^2.0.6",
         "global": "^4.3.0",
         "hoist-non-react-statics": "^3.3.0",
         "loader-utils": "^1.1.0",
-        "lodash": "^4.17.11",
         "prop-types": "^15.6.1",
         "react-lifecycles-compat": "^3.0.4",
-        "shallowequal": "^1.0.2",
+        "shallowequal": "^1.1.0",
         "source-map": "^0.7.3"
       },
       "dependencies": {
@@ -14631,7 +14468,7 @@
     },
     "react-lazy-load": {
       "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/react-lazy-load/-/react-lazy-load-3.0.13.tgz",
+      "resolved": "https://registry.npm.taobao.org/react-lazy-load/download/react-lazy-load-3.0.13.tgz",
       "integrity": "sha1-OwqS0zbUPT8Nc8vm81sXBQsIuCQ=",
       "requires": {
         "eventlistener": "0.0.1",
@@ -14655,8 +14492,8 @@
     },
     "react-monaco-editor": {
       "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/react-monaco-editor/-/react-monaco-editor-0.25.1.tgz",
-      "integrity": "sha512-VLksQjt8fmeIZoET9fQgmR0sdCCBFaiss92MwW5JvgO3JfrnhHtrLBqrSQRjtbUmef1EmEKi4gZp5Mh0oidvVg==",
+      "resolved": "https://registry.npm.taobao.org/react-monaco-editor/download/react-monaco-editor-0.25.1.tgz",
+      "integrity": "sha1-KSFQYdoj0OSte/ko2UAyiNW+TpI=",
       "requires": {
         "@types/react": "*",
         "monaco-editor": "^0.16.0",
@@ -14665,15 +14502,20 @@
       "dependencies": {
         "monaco-editor": {
           "version": "0.16.2",
-          "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.16.2.tgz",
-          "integrity": "sha512-NtGrFzf54jADe7qsWh3lazhS7Kj0XHkJUGBq9fA/Jbwc+sgVcyfsYF6z2AQ7hPqDC+JmdOt/OwFjBnRwqXtx6w=="
+          "resolved": "https://registry.npm.taobao.org/monaco-editor/download/monaco-editor-0.16.2.tgz",
+          "integrity": "sha1-lQCE7YLurvHIydPBvKuEn+EbJBU="
         }
       }
     },
+    "react-onclickoutside": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npm.taobao.org/react-onclickoutside/download/react-onclickoutside-6.9.0.tgz",
+      "integrity": "sha1-pUvDF66M9hMaXXis6lWhEGfzeh8="
+    },
     "react-player": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/react-player/-/react-player-1.15.2.tgz",
-      "integrity": "sha512-8KWo2ZQU9OnTx5Yp7eKRh/jGadSc436MOqJ+7c7RryfOXeuY938yZ2Osvh6bZY+etMWXDBHqXm14Vv9SoGb68g==",
+      "version": "1.15.3",
+      "resolved": "https://registry.npm.taobao.org/react-player/download/react-player-1.15.3.tgz",
+      "integrity": "sha1-0AzxRfnIYYTLCgcaH7+Oy3tomH8=",
       "requires": {
         "deepmerge": "^4.0.0",
         "load-script": "^1.0.0",
@@ -14682,8 +14524,8 @@
       "dependencies": {
         "deepmerge": {
           "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-          "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
+          "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-4.2.2.tgz",
+          "integrity": "sha1-RNLqNnm49NT/ujPwPYZfwee/SVU="
         }
       }
     },
@@ -14781,8 +14623,8 @@
     },
     "react-slick": {
       "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/react-slick/-/react-slick-0.25.2.tgz",
-      "integrity": "sha512-8MNH/NFX/R7zF6W/w+FS5VXNyDusF+XDW1OU0SzODEU7wqYB+ZTGAiNJ++zVNAVqCAHdyCybScaUB+FCZOmBBw==",
+      "resolved": "https://registry.npm.taobao.org/react-slick/download/react-slick-0.25.2.tgz",
+      "integrity": "sha1-VjMbZ9R9i8/i3OtqyrHI/VvR9rw=",
       "requires": {
         "classnames": "^2.2.5",
         "enquire.js": "^2.1.6",
@@ -14792,39 +14634,27 @@
       }
     },
     "react-split-pane": {
-      "version": "0.1.89",
-      "resolved": "https://registry.npmjs.org/react-split-pane/-/react-split-pane-0.1.89.tgz",
-      "integrity": "sha512-bGEiOevi6nBE1evEJOsZjd5A7plLboFAU4+HGASWWVm94XUg7QdsuPInGOB+5Ym4RtY3TZCpmUvLe6qQmrZUOg==",
+      "version": "0.1.91",
+      "resolved": "https://registry.npm.taobao.org/react-split-pane/download/react-split-pane-0.1.91.tgz",
+      "integrity": "sha1-GLnvI7L/IlyVf3e2sJbkWNhTEq4=",
       "requires": {
-        "prop-types": "^15.5.10",
+        "prop-types": "^15.7.2",
         "react-lifecycles-compat": "^3.0.4",
-        "react-style-proptype": "^3.0.0"
+        "react-style-proptype": "^3.2.2"
       }
     },
     "react-style-proptype": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/react-style-proptype/-/react-style-proptype-3.2.2.tgz",
-      "integrity": "sha512-ywYLSjNkxKHiZOqNlso9PZByNEY+FTyh3C+7uuziK0xFXu9xzdyfHwg4S9iyiRRoPCR4k2LqaBBsWVmSBwCWYQ==",
+      "resolved": "https://registry.npm.taobao.org/react-style-proptype/download/react-style-proptype-3.2.2.tgz",
+      "integrity": "sha1-2OmY5iznnsNbCHJSuQ8Z8cM5aKA=",
       "requires": {
         "prop-types": "^15.5.4"
       }
     },
-    "react-transition-group": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npm.taobao.org/react-transition-group/download/react-transition-group-1.2.1.tgz",
-      "integrity": "sha1-4R9yslf5IbITIpp3TfRmEjRsfKY=",
-      "requires": {
-        "chain-function": "^1.0.0",
-        "dom-helpers": "^3.2.0",
-        "loose-envify": "^1.3.1",
-        "prop-types": "^15.5.6",
-        "warning": "^3.0.0"
-      }
-    },
     "react-url-query": {
-      "version": "1.4.0",
-      "resolved": "http://registry.npm.taobao.org/react-url-query/download/react-url-query-1.4.0.tgz",
-      "integrity": "sha1-4OY54l7GPijFSBQPSxL7pMEM/LI=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npm.taobao.org/react-url-query/download/react-url-query-1.5.0.tgz",
+      "integrity": "sha1-AmdcAhcxAC1kqWyFWIJ9K6ahcxU=",
       "requires": {
         "loose-envify": "^1.2.0",
         "prop-types": "^15.5.9",
@@ -14833,8 +14663,8 @@
     },
     "react-virtualized": {
       "version": "9.21.2",
-      "resolved": "https://registry.npmjs.org/react-virtualized/-/react-virtualized-9.21.2.tgz",
-      "integrity": "sha512-oX7I7KYiUM7lVXQzmhtF4Xg/4UA5duSA+/ZcAvdWlTLFCoFYq1SbauJT5gZK9cZS/wdYR6TPGpX/dqzvTqQeBA==",
+      "resolved": "https://registry.npm.taobao.org/react-virtualized/download/react-virtualized-9.21.2.tgz",
+      "integrity": "sha1-AubfZcHgIMjb9XTsTOlxZSr8qE4=",
       "requires": {
         "babel-runtime": "^6.26.0",
         "clsx": "^1.0.1",
@@ -14845,40 +14675,44 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.8.4",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz",
-          "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==",
+          "version": "7.9.2",
+          "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.9.2.tgz",
+          "integrity": "sha1-2Q3wWDo6JS8JqqYZZlNnuuUY2wY=",
           "requires": {
-            "regenerator-runtime": "^0.13.2"
+            "regenerator-runtime": "^0.13.4"
           }
         },
         "csstype": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.8.tgz",
-          "integrity": "sha512-msVS9qTuMT5zwAGCVm4mxfrZ18BNc6Csd0oJAtiFMZ1FAx1CCvy2+5MDmYoix63LM/6NDbNtodCiGYGmFgO0dA=="
+          "version": "2.6.10",
+          "resolved": "https://registry.npm.taobao.org/csstype/download/csstype-2.6.10.tgz?cache=0&sync_timestamp=1586935655811&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcsstype%2Fdownload%2Fcsstype-2.6.10.tgz",
+          "integrity": "sha1-5jr1DmbXwmbttrMpCc/Qqr4Dkos="
         },
         "dom-helpers": {
-          "version": "5.1.3",
-          "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.1.3.tgz",
-          "integrity": "sha512-nZD1OtwfWGRBWlpANxacBEZrEuLa16o1nh7YopFWeoF68Zt8GGEmzHu6Xv4F3XaFIC+YXtTLrzgqKxFgLEe4jw==",
+          "version": "5.1.4",
+          "resolved": "https://registry.npm.taobao.org/dom-helpers/download/dom-helpers-5.1.4.tgz",
+          "integrity": "sha1-RgloCrXHmkXyUxRB8ZSbedZYf0s=",
           "requires": {
-            "@babel/runtime": "^7.6.3",
+            "@babel/runtime": "^7.8.7",
             "csstype": "^2.6.7"
           }
         },
         "regenerator-runtime": {
-          "version": "0.13.3",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-          "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
+          "version": "0.13.5",
+          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.5.tgz?cache=0&sync_timestamp=1584052597708&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.5.tgz",
+          "integrity": "sha1-2Hih0JS0MG0QuQlkhLM+vVXiZpc="
         }
       }
     },
-    "reactcss": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz",
-      "integrity": "sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==",
+    "react-zmage": {
+      "version": "0.8.5-beta.31",
+      "resolved": "https://registry.npm.taobao.org/react-zmage/download/react-zmage-0.8.5-beta.31.tgz",
+      "integrity": "sha1-kc+7Hs+Y0fYFEdDFfZEt4K+53ZY=",
       "requires": {
-        "lodash": "^4.0.1"
+        "classnames": "^2.2.6",
+        "lodash.memoize": "^4.1.2",
+        "prop-types": "^15.6.2",
+        "react": "^16.6.3",
+        "react-dom": "^16.6.3"
       }
     },
     "read-pkg": {
@@ -14988,6 +14822,15 @@
             "ms": "2.0.0"
           }
         },
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
+          "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+          "requires": {
+            "is-descriptor": "^1.0.2",
+            "isobject": "^3.0.1"
+          }
+        },
         "expand-brackets": {
           "version": "2.1.4",
           "resolved": "http://registry.npm.taobao.org/expand-brackets/download/expand-brackets-2.1.4.tgz",
@@ -15071,6 +14914,25 @@
             }
           }
         },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+              "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            }
+          }
+        },
         "extglob": {
           "version": "2.0.4",
           "resolved": "http://registry.npm.taobao.org/extglob/download/extglob-2.0.4.tgz",
@@ -15176,8 +15038,8 @@
         },
         "kind-of": {
           "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+          "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+          "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
         },
         "micromatch": {
           "version": "3.1.10",
@@ -15227,21 +15089,11 @@
       }
     },
     "recursive-readdir": {
-      "version": "2.2.1",
-      "resolved": "http://registry.npm.taobao.org/recursive-readdir/download/recursive-readdir-2.2.1.tgz",
-      "integrity": "sha1-kO8jHQd4xc4JPJpI105cVCLROpk=",
+      "version": "2.2.2",
+      "resolved": "https://registry.npm.taobao.org/recursive-readdir/download/recursive-readdir-2.2.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frecursive-readdir%2Fdownload%2Frecursive-readdir-2.2.2.tgz",
+      "integrity": "sha1-mUb7MnThYo3m42svZxSVO0hFCU8=",
       "requires": {
-        "minimatch": "3.0.3"
-      },
-      "dependencies": {
-        "minimatch": {
-          "version": "3.0.3",
-          "resolved": "http://registry.npm.taobao.org/minimatch/download/minimatch-3.0.3.tgz",
-          "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=",
-          "requires": {
-            "brace-expansion": "^1.0.0"
-          }
-        }
+        "minimatch": "3.0.4"
       }
     },
     "redent": {
@@ -15253,42 +15105,10 @@
         "strip-indent": "^1.0.1"
       }
     },
-    "reduce-css-calc": {
-      "version": "1.3.0",
-      "resolved": "http://registry.npm.taobao.org/reduce-css-calc/download/reduce-css-calc-1.3.0.tgz",
-      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
-      "requires": {
-        "balanced-match": "^0.4.2",
-        "math-expression-evaluator": "^1.2.14",
-        "reduce-function-call": "^1.0.1"
-      },
-      "dependencies": {
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "http://registry.npm.taobao.org/balanced-match/download/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
-        }
-      }
-    },
-    "reduce-function-call": {
-      "version": "1.0.2",
-      "resolved": "http://registry.npm.taobao.org/reduce-function-call/download/reduce-function-call-1.0.2.tgz",
-      "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
-      "requires": {
-        "balanced-match": "^0.4.2"
-      },
-      "dependencies": {
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "http://registry.npm.taobao.org/balanced-match/download/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
-        }
-      }
-    },
     "redux": {
-      "version": "4.0.1",
-      "resolved": "http://registry.npm.taobao.org/redux/download/redux-4.0.1.tgz",
-      "integrity": "sha1-Q2yubMQPvkcnaJ18j65EgI8b/vU=",
+      "version": "4.0.5",
+      "resolved": "https://registry.npm.taobao.org/redux/download/redux-4.0.5.tgz?cache=0&sync_timestamp=1577154206919&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fredux%2Fdownload%2Fredux-4.0.5.tgz",
+      "integrity": "sha1-TbXeWBbheJHeioDEJCMtBvBR2T8=",
       "requires": {
         "loose-envify": "^1.4.0",
         "symbol-observable": "^1.2.0"
@@ -15334,21 +15154,40 @@
       "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
     "regexp.prototype.flags": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
-      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
+      "resolved": "https://registry.npm.taobao.org/regexp.prototype.flags/download/regexp.prototype.flags-1.3.0.tgz?cache=0&sync_timestamp=1576388141321&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregexp.prototype.flags%2Fdownload%2Fregexp.prototype.flags-1.3.0.tgz",
+      "integrity": "sha1-erqJs8E6ZFCdq888qNn7ub31y3U=",
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.17.0-next.1"
       },
       "dependencies": {
         "es-abstract": {
-          "version": "1.17.4",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-          "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+          "version": "1.17.5",
+          "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.5.tgz",
+          "integrity": "sha1-2MnR1myJgfuSAOIlHXme7pJ3Suk=",
           "requires": {
             "es-to-primitive": "^1.2.1",
             "function-bind": "^1.1.1",
@@ -15365,28 +15204,23 @@
         },
         "es-to-primitive": {
           "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+          "resolved": "https://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.1.tgz",
+          "integrity": "sha1-5VzUyc3BiLzvsDs2bHNjI/xciYo=",
           "requires": {
             "is-callable": "^1.1.4",
             "is-date-object": "^1.0.1",
             "is-symbol": "^1.0.2"
           }
         },
-        "has-symbols": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
-        },
         "is-callable": {
           "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
+          "resolved": "https://registry.npm.taobao.org/is-callable/download/is-callable-1.1.5.tgz",
+          "integrity": "sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs="
         },
         "is-regex": {
           "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "resolved": "https://registry.npm.taobao.org/is-regex/download/is-regex-1.0.5.tgz?cache=0&sync_timestamp=1576454688491&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regex%2Fdownload%2Fis-regex-1.0.5.tgz",
+          "integrity": "sha1-OdWJo1i/GJZ/cmlnEguPwa7XTq4=",
           "requires": {
             "has": "^1.0.3"
           }
@@ -15528,6 +15362,31 @@
         }
       }
     },
+    "request-promise-core": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npm.taobao.org/request-promise-core/download/request-promise-core-1.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frequest-promise-core%2Fdownload%2Frequest-promise-core-1.1.3.tgz",
+      "integrity": "sha1-6aPAgbUTgN/qZ3M2Bh/qh5qCnuk=",
+      "requires": {
+        "lodash": "^4.17.15"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz",
+          "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg="
+        }
+      }
+    },
+    "request-promise-native": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npm.taobao.org/request-promise-native/download/request-promise-native-1.0.8.tgz",
+      "integrity": "sha1-pFW5YLgm5E4r+Jma9k3/K/5YyzY=",
+      "requires": {
+        "request-promise-core": "1.1.3",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      }
+    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "http://registry.npm.taobao.org/require-directory/download/require-directory-2.1.1.tgz",
@@ -15598,6 +15457,30 @@
       "requires": {
         "expand-tilde": "^2.0.0",
         "global-modules": "^1.0.0"
+      },
+      "dependencies": {
+        "global-modules": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/global-modules/download/global-modules-1.0.0.tgz",
+          "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
+          "requires": {
+            "global-prefix": "^1.0.1",
+            "is-windows": "^1.0.1",
+            "resolve-dir": "^1.0.0"
+          }
+        },
+        "global-prefix": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npm.taobao.org/global-prefix/download/global-prefix-1.0.2.tgz",
+          "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+          "requires": {
+            "expand-tilde": "^2.0.2",
+            "homedir-polyfill": "^1.0.1",
+            "ini": "^1.3.4",
+            "is-windows": "^1.0.1",
+            "which": "^1.2.14"
+          }
+        }
       }
     },
     "resolve-from": {
@@ -15605,11 +15488,6 @@
       "resolved": "http://registry.npm.taobao.org/resolve-from/download/resolve-from-1.0.1.tgz",
       "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY="
     },
-    "resolve-pathname": {
-      "version": "2.2.0",
-      "resolved": "http://registry.npm.taobao.org/resolve-pathname/download/resolve-pathname-2.2.0.tgz",
-      "integrity": "sha1-fpriHtgV/WOrGJre7mTcgx7vqHk="
-    },
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "http://registry.npm.taobao.org/resolve-url/download/resolve-url-0.2.1.tgz",
@@ -15626,7 +15504,7 @@
     },
     "resumer": {
       "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/resumer/download/resumer-0.0.0.tgz",
       "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
       "requires": {
         "through": "~2.3.4"
@@ -15637,6 +15515,11 @@
       "resolved": "http://registry.npm.taobao.org/ret/download/ret-0.1.15.tgz",
       "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w="
     },
+    "retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npm.taobao.org/retry/download/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
+    },
     "right-align": {
       "version": "0.1.3",
       "resolved": "http://registry.npm.taobao.org/right-align/download/right-align-0.1.3.tgz",
@@ -15657,6 +15540,7 @@
       "version": "2.0.2",
       "resolved": "http://registry.npm.taobao.org/ripemd160/download/ripemd160-2.0.2.tgz",
       "integrity": "sha1-ocGm9iR1FXe6XQeRTLyShQWFiQw=",
+      "dev": true,
       "requires": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1"
@@ -15664,8 +15548,8 @@
     },
     "rmc-feedback": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/rmc-feedback/-/rmc-feedback-2.0.0.tgz",
-      "integrity": "sha512-5PWOGOW7VXks/l3JzlOU9NIxRpuaSS8d9zA3UULUCuTKnpwBHNvv1jSJzxgbbCQeYzROWUpgKI4za3X4C/mKmQ==",
+      "resolved": "https://registry.npm.taobao.org/rmc-feedback/download/rmc-feedback-2.0.0.tgz",
+      "integrity": "sha1-y8bLOuY8emNe7w4l5PuvWsNm7qo=",
       "requires": {
         "babel-runtime": "6.x",
         "classnames": "^2.2.5"
@@ -15673,7 +15557,7 @@
     },
     "rollup": {
       "version": "0.25.8",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.25.8.tgz",
+      "resolved": "https://registry.npm.taobao.org/rollup/download/rollup-0.25.8.tgz",
       "integrity": "sha1-v2zoO4dRDRY0Ru6qV37WpvxYNeA=",
       "requires": {
         "chalk": "^1.1.1",
@@ -15683,12 +15567,12 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+          "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1584051509720&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz",
+          "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI="
         },
         "source-map": {
           "version": "0.1.32",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.1.32.tgz",
           "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
           "requires": {
             "amdefine": ">=0.0.4"
@@ -15696,7 +15580,7 @@
         },
         "source-map-support": {
           "version": "0.3.3",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.3.tgz",
+          "resolved": "https://registry.npm.taobao.org/source-map-support/download/source-map-support-0.3.3.tgz",
           "integrity": "sha1-NJAJd9W6PwfHdX7nLnO7GptTdU8=",
           "requires": {
             "source-map": "0.1.32"
@@ -15705,11 +15589,11 @@
       }
     },
     "rsuite": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/rsuite/-/rsuite-4.2.1.tgz",
-      "integrity": "sha512-7Lfoq8jmHlbgrFyJRNbEhY4uWE3mSZU7OkwQBuCpQq89ohk2kI93+oTp/RllqSyspBKOLLn3744HyINYdOZWng==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npm.taobao.org/rsuite/download/rsuite-4.3.4.tgz",
+      "integrity": "sha1-TreHhnDWbcIhe67ZvM0GYUKDdN4=",
       "requires": {
-        "@babel/runtime": "^7.0.0",
+        "@babel/runtime": "^7.8.4",
         "classnames": ">=2.0.0",
         "date-fns": "^1.30.1",
         "dom-lib": "^1.2.1",
@@ -15718,59 +15602,81 @@
         "prop-types": "^15.7.2",
         "react-lifecycles-compat": "^3.0.4",
         "react-virtualized": "^9.21.0",
-        "recompose": "^0.26.0",
-        "rsuite-table": "^3.8.4",
+        "recompose": "^0.30.0",
+        "rsuite-table": "^3.9.5",
         "rsuite-utils": "^2.2.1",
         "schema-typed": "^1.4.0"
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.8.4",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz",
-          "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==",
+          "version": "7.9.2",
+          "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.9.2.tgz",
+          "integrity": "sha1-2Q3wWDo6JS8JqqYZZlNnuuUY2wY=",
           "requires": {
-            "regenerator-runtime": "^0.13.2"
+            "regenerator-runtime": "^0.13.4"
           }
         },
+        "date-fns": {
+          "version": "1.30.1",
+          "resolved": "https://registry.npm.taobao.org/date-fns/download/date-fns-1.30.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdate-fns%2Fdownload%2Fdate-fns-1.30.1.tgz",
+          "integrity": "sha1-LnG/CxGRU9u0zE6I2epaz7UNwFw="
+        },
         "hoist-non-react-statics": {
           "version": "2.5.5",
-          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
-          "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+          "resolved": "https://registry.npm.taobao.org/hoist-non-react-statics/download/hoist-non-react-statics-2.5.5.tgz",
+          "integrity": "sha1-xZA89AnA39kI84jmGdhrnBF0y0c="
         },
         "recompose": {
-          "version": "0.26.0",
-          "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.26.0.tgz",
-          "integrity": "sha512-KwOu6ztO0mN5vy3+zDcc45lgnaUoaQse/a5yLVqtzTK13czSWnFGmXbQVmnoMgDkI5POd1EwIKSbjU1V7xdZog==",
+          "version": "0.30.0",
+          "resolved": "https://registry.npm.taobao.org/recompose/download/recompose-0.30.0.tgz",
+          "integrity": "sha1-gnc2QbOSfox9JKDYfWWu66GKq9A=",
           "requires": {
+            "@babel/runtime": "^7.0.0",
             "change-emitter": "^0.1.2",
             "fbjs": "^0.8.1",
             "hoist-non-react-statics": "^2.3.1",
+            "react-lifecycles-compat": "^3.0.2",
             "symbol-observable": "^1.0.4"
           }
         },
         "regenerator-runtime": {
-          "version": "0.13.3",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-          "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
+          "version": "0.13.5",
+          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.5.tgz?cache=0&sync_timestamp=1584052597708&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.5.tgz",
+          "integrity": "sha1-2Hih0JS0MG0QuQlkhLM+vVXiZpc="
         }
       }
     },
     "rsuite-table": {
-      "version": "3.8.4",
-      "resolved": "https://registry.npmjs.org/rsuite-table/-/rsuite-table-3.8.4.tgz",
-      "integrity": "sha512-HT6nKVR4LuREwh/ZoQrQzEq2UhXUy1ArJg09e6H+pbky8zVpuXjhEFpLaHO6xMYdamtGoF2LvVD09EW/4lwEVg==",
+      "version": "3.11.1",
+      "resolved": "https://registry.npm.taobao.org/rsuite-table/download/rsuite-table-3.11.1.tgz",
+      "integrity": "sha1-h2fY6fQM4Iz9zq/0Eh6auvgcSss=",
       "requires": {
+        "@babel/runtime": "^7.8.4",
         "classnames": "^2.2.5",
         "dom-lib": "^1.2.1",
         "element-resize-event": "^3.0.2",
-        "lodash": "^4.17.5",
-        "react-lifecycles-compat": "^3.0.4"
+        "lodash": "^4.17.5"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.9.2",
+          "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.9.2.tgz",
+          "integrity": "sha1-2Q3wWDo6JS8JqqYZZlNnuuUY2wY=",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.5",
+          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.5.tgz?cache=0&sync_timestamp=1584052597708&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.5.tgz",
+          "integrity": "sha1-2Hih0JS0MG0QuQlkhLM+vVXiZpc="
+        }
       }
     },
     "rsuite-utils": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/rsuite-utils/-/rsuite-utils-2.2.1.tgz",
-      "integrity": "sha512-viDaUWDb6UtrV2YcncrJmJqinf4VmhMr73rU7xfympIBMZ3frfbnWbhxro8zrlLocMDKWbu0MgYF5SGBBIwsYA==",
+      "resolved": "https://registry.npm.taobao.org/rsuite-utils/download/rsuite-utils-2.2.1.tgz",
+      "integrity": "sha1-2+3Tbx5ASxpb7+zUHXqupbVckPU=",
       "requires": {
         "classnames": "^2.2.5",
         "lodash": "^4.17.5",
@@ -15778,16 +15684,16 @@
       }
     },
     "run-async": {
-      "version": "2.3.0",
-      "resolved": "http://registry.npm.taobao.org/run-async/download/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "version": "2.4.0",
+      "resolved": "https://registry.npm.taobao.org/run-async/download/run-async-2.4.0.tgz?cache=0&sync_timestamp=1582711719088&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frun-async%2Fdownload%2Frun-async-2.4.0.tgz",
+      "integrity": "sha1-5ZBUpbhods+uB/Qx0Yy63cWU8eg=",
       "requires": {
         "is-promise": "^2.1.0"
       }
     },
     "run-queue": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/run-queue/download/run-queue-1.0.3.tgz",
       "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
       "dev": true,
       "requires": {
@@ -15796,7 +15702,7 @@
     },
     "rw": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/rw/download/rw-1.3.3.tgz",
       "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
     },
     "rx-lite": {
@@ -15812,6 +15718,14 @@
         "rx-lite": "*"
       }
     },
+    "rxjs": {
+      "version": "6.5.5",
+      "resolved": "https://registry.npm.taobao.org/rxjs/download/rxjs-6.5.5.tgz",
+      "integrity": "sha1-xciE4wlMjP7jG/J+uH5UzPyH+ew=",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "http://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz",
@@ -15861,15 +15775,15 @@
           }
         },
         "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+          "version": "1.2.0",
+          "resolved": "http://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         }
       }
     },
     "sass-graph": {
       "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
+      "resolved": "https://registry.npm.taobao.org/sass-graph/download/sass-graph-2.2.4.tgz",
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "dev": true,
       "requires": {
@@ -15881,8 +15795,8 @@
     },
     "sass-loader": {
       "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz",
-      "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
+      "resolved": "https://registry.npm.taobao.org/sass-loader/download/sass-loader-7.3.1.tgz",
+      "integrity": "sha1-pb9ooEvOocE/+ELXRxUPerfQ0j8=",
       "requires": {
         "clone-deep": "^4.0.1",
         "loader-utils": "^1.0.1",
@@ -15893,13 +15807,13 @@
       "dependencies": {
         "pify": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+          "resolved": "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz",
+          "integrity": "sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE="
         },
         "semver": {
           "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+          "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz",
+          "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0="
         }
       }
     },
@@ -15908,10 +15822,18 @@
       "resolved": "http://registry.npm.taobao.org/sax/download/sax-1.2.4.tgz",
       "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk="
     },
+    "saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npm.taobao.org/saxes/download/saxes-5.0.1.tgz",
+      "integrity": "sha1-7rq5U/o7dgjb6U5drbFciI+maW0=",
+      "requires": {
+        "xmlchars": "^2.2.0"
+      }
+    },
     "scheduler": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.18.0.tgz",
-      "integrity": "sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==",
+      "version": "0.19.1",
+      "resolved": "https://registry.npm.taobao.org/scheduler/download/scheduler-0.19.1.tgz?cache=0&sync_timestamp=1586486116434&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fscheduler%2Fdownload%2Fscheduler-0.19.1.tgz",
+      "integrity": "sha1-Tz4u0sGn1laB9MhU+oxaHMtA8ZY=",
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1"
@@ -15919,8 +15841,8 @@
     },
     "schema-typed": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/schema-typed/-/schema-typed-1.5.0.tgz",
-      "integrity": "sha512-gKVmlCEUCN0QCL0Qx1VeipowuYDwEov4Trjz/Ibe/zSaq1D0XiqsvAyNowdOiko/YzLBmFfXPbxoS3LgVyJnoQ=="
+      "resolved": "https://registry.npm.taobao.org/schema-typed/download/schema-typed-1.5.0.tgz",
+      "integrity": "sha1-nVWqqa5oLQxhGS1ixJxHpg/Gixs="
     },
     "schema-utils": {
       "version": "0.3.0",
@@ -15939,13 +15861,13 @@
       }
     },
     "scroll-into-view": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/scroll-into-view/-/scroll-into-view-1.14.1.tgz",
-      "integrity": "sha512-50Ynbg3igEFY2bCa5Iv4H+t9dqCmG+Y10LnaaSIjPR13+KFtvFRr+Wmq0foGoyJmn8K+8My+ZFbEIZ2JUorxcA=="
+      "version": "1.14.2",
+      "resolved": "https://registry.npm.taobao.org/scroll-into-view/download/scroll-into-view-1.14.2.tgz",
+      "integrity": "sha1-IepbsvkhubsXOuc9eJRsOTpOFx0="
     },
     "scss-tokenizer": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz",
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
@@ -15955,7 +15877,7 @@
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz",
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
@@ -15966,7 +15888,7 @@
     },
     "select": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/select/download/select-1.1.2.tgz",
       "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
     },
     "select-hose": {
@@ -15975,11 +15897,11 @@
       "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo="
     },
     "selfsigned": {
-      "version": "1.10.4",
-      "resolved": "http://registry.npm.taobao.org/selfsigned/download/selfsigned-1.10.4.tgz",
-      "integrity": "sha1-zdfsz8pO12NdR6CL8tXTB0CS4s0=",
+      "version": "1.10.7",
+      "resolved": "https://registry.npm.taobao.org/selfsigned/download/selfsigned-1.10.7.tgz?cache=0&sync_timestamp=1569952074772&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fselfsigned%2Fdownload%2Fselfsigned-1.10.7.tgz",
+      "integrity": "sha1-2lgZ/QSdVXTyjoipvMbbxubzkGs=",
       "requires": {
-        "node-forge": "0.7.5"
+        "node-forge": "0.9.0"
       }
     },
     "semver": {
@@ -15996,9 +15918,10 @@
       }
     },
     "send": {
-      "version": "0.16.2",
-      "resolved": "http://registry.npm.taobao.org/send/download/send-0.16.2.tgz",
-      "integrity": "sha1-bsyh4PjBVtFBWXVZhI32RzCmu8E=",
+      "version": "0.17.1",
+      "resolved": "https://registry.npm.taobao.org/send/download/send-0.17.1.tgz",
+      "integrity": "sha1-wdiwWfeQD3Rm3Uk4vcROEd2zdsg=",
+      "dev": true,
       "requires": {
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -16007,44 +15930,49 @@
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
+        "http-errors": "~1.7.2",
+        "mime": "1.6.0",
+        "ms": "2.1.1",
         "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
       },
       "dependencies": {
         "debug": {
           "version": "2.6.9",
           "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
           "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "dev": true,
           "requires": {
             "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "dev": true
+            }
           }
         },
-        "mime": {
-          "version": "1.4.1",
-          "resolved": "http://registry.npm.taobao.org/mime/download/mime-1.4.1.tgz",
-          "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY="
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        "statuses": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz?cache=0&sync_timestamp=1587328859420&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstatuses%2Fdownload%2Fstatuses-1.5.0.tgz",
+          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+          "dev": true
         }
       }
     },
     "serialize-error": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/serialize-error/download/serialize-error-2.1.0.tgz",
       "integrity": "sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=",
       "dev": true
     },
     "serialize-javascript": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
-      "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
+      "resolved": "https://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-1.9.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-1.9.1.tgz",
+      "integrity": "sha1-z8IArvd7YAxH2pu4FJyUPnmML9s=",
       "dev": true
     },
     "serve-index": {
@@ -16069,6 +15997,22 @@
             "ms": "2.0.0"
           }
         },
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npm.taobao.org/http-errors/download/http-errors-1.6.3.tgz?cache=0&sync_timestamp=1561418493658&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.6.3.tgz",
+          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
@@ -16077,14 +16021,23 @@
       }
     },
     "serve-static": {
-      "version": "1.13.2",
-      "resolved": "http://registry.npm.taobao.org/serve-static/download/serve-static-1.13.2.tgz",
-      "integrity": "sha1-CV6Ecv1bRiN9tQzkhqQ/S4bGzsE=",
+      "version": "1.14.1",
+      "resolved": "https://registry.npm.taobao.org/serve-static/download/serve-static-1.14.1.tgz",
+      "integrity": "sha1-Zm5jbcTwEPfvKZcKiKZ0MgiYsvk=",
+      "dev": true,
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "parseurl": "~1.3.2",
-        "send": "0.16.2"
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
+      },
+      "dependencies": {
+        "parseurl": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz",
+          "integrity": "sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ=",
+          "dev": true
+        }
       }
     },
     "serviceworker-cache-polyfill": {
@@ -16099,23 +16052,13 @@
     },
     "set-value": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "resolved": "https://registry.npm.taobao.org/set-value/download/set-value-2.0.1.tgz?cache=0&sync_timestamp=1585775409029&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fset-value%2Fdownload%2Fset-value-2.0.1.tgz",
+      "integrity": "sha1-oY1AUw5vB95CKMfe/kInr4ytAFs=",
       "requires": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
         "is-plain-object": "^2.0.3",
         "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
       }
     },
     "setimmediate": {
@@ -16132,6 +16075,7 @@
       "version": "2.4.11",
       "resolved": "http://registry.npm.taobao.org/sha.js/download/sha.js-2.4.11.tgz",
       "integrity": "sha1-N6XPC4HsvGlD3hCbopYNGyZYSuc=",
+      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -16139,23 +16083,23 @@
     },
     "shallow-clone": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "resolved": "https://registry.npm.taobao.org/shallow-clone/download/shallow-clone-3.0.1.tgz",
+      "integrity": "sha1-jymBrZJTH1UDWwH7IwdppA4C76M=",
       "requires": {
         "kind-of": "^6.0.2"
       },
       "dependencies": {
         "kind-of": {
           "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+          "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+          "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
         }
       }
     },
     "shallow-equal": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz",
-      "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA=="
+      "resolved": "https://registry.npm.taobao.org/shallow-equal/download/shallow-equal-1.2.1.tgz",
+      "integrity": "sha1-TBar+lYEOqINBQMk76aJQLDaedo="
     },
     "shallowequal": {
       "version": "1.1.0",
@@ -16176,15 +16120,9 @@
       "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
     },
     "shell-quote": {
-      "version": "1.6.1",
-      "resolved": "http://registry.npm.taobao.org/shell-quote/download/shell-quote-1.6.1.tgz",
-      "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
-      "requires": {
-        "array-filter": "~0.0.0",
-        "array-map": "~0.0.0",
-        "array-reduce": "~0.0.0",
-        "jsonify": "~0.0.0"
-      }
+      "version": "1.7.2",
+      "resolved": "https://registry.npm.taobao.org/shell-quote/download/shell-quote-1.7.2.tgz",
+      "integrity": "sha1-Z6fQLHbJ2iT5nSCAj8re0ODgS+I="
     },
     "shellwords": {
       "version": "0.1.1",
@@ -16193,26 +16131,26 @@
     },
     "showdown": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/showdown/-/showdown-1.9.1.tgz",
-      "integrity": "sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA==",
+      "resolved": "https://registry.npm.taobao.org/showdown/download/showdown-1.9.1.tgz",
+      "integrity": "sha1-E04UjnXNRiPgnCGwURl315ta0O8=",
       "requires": {
         "yargs": "^14.2"
       },
       "dependencies": {
         "ansi-regex": {
           "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-4.1.0.tgz",
+          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc="
         },
         "camelcase": {
           "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz",
+          "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA="
         },
         "cliui": {
           "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-5.0.0.tgz?cache=0&sync_timestamp=1573942320052&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-5.0.0.tgz",
+          "integrity": "sha1-3u/P2y6AB4SqNPRvoI4GhRx7u8U=",
           "requires": {
             "string-width": "^3.1.0",
             "strip-ansi": "^5.2.0",
@@ -16221,26 +16159,26 @@
         },
         "emoji-regex": {
           "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+          "resolved": "https://registry.npm.taobao.org/emoji-regex/download/emoji-regex-7.0.3.tgz",
+          "integrity": "sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY="
         },
         "find-up": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz",
+          "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=",
           "requires": {
             "locate-path": "^3.0.0"
           }
         },
         "get-caller-file": {
           "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+          "resolved": "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-2.0.5.tgz",
+          "integrity": "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34="
         },
         "locate-path": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz",
+          "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=",
           "requires": {
             "p-locate": "^3.0.0",
             "path-exists": "^3.0.0"
@@ -16248,34 +16186,34 @@
         },
         "p-limit": {
           "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "resolved": "https://registry.npm.taobao.org/p-limit/download/p-limit-2.2.2.tgz?cache=0&sync_timestamp=1577904218145&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-limit%2Fdownload%2Fp-limit-2.2.2.tgz",
+          "integrity": "sha1-YSebZ3IfUoeqHBOpp/u8SMkpGx4=",
           "requires": {
             "p-try": "^2.0.0"
           }
         },
         "p-locate": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "resolved": "https://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz",
+          "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=",
           "requires": {
             "p-limit": "^2.0.0"
           }
         },
         "p-try": {
           "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+          "resolved": "https://registry.npm.taobao.org/p-try/download/p-try-2.2.0.tgz",
+          "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY="
         },
         "require-main-filename": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+          "resolved": "https://registry.npm.taobao.org/require-main-filename/download/require-main-filename-2.0.0.tgz",
+          "integrity": "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs="
         },
         "string-width": {
           "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-3.1.0.tgz?cache=0&sync_timestamp=1573488535785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-3.1.0.tgz",
+          "integrity": "sha1-InZ74htirxCBV0MG9prFG2IgOWE=",
           "requires": {
             "emoji-regex": "^7.0.1",
             "is-fullwidth-code-point": "^2.0.0",
@@ -16284,21 +16222,21 @@
         },
         "strip-ansi": {
           "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz",
+          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
           "requires": {
             "ansi-regex": "^4.1.0"
           }
         },
         "which-module": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/which-module/download/which-module-2.0.0.tgz",
           "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
         },
         "wrap-ansi": {
           "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha1-H9H2cjXVttD+54EFYAG/tpTAOwk=",
           "requires": {
             "ansi-styles": "^3.2.0",
             "string-width": "^3.0.0",
@@ -16307,13 +16245,13 @@
         },
         "y18n": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
+          "resolved": "https://registry.npm.taobao.org/y18n/download/y18n-4.0.0.tgz",
+          "integrity": "sha1-le+U+F7MgdAHwmThkKEg8KPIVms="
         },
         "yargs": {
-          "version": "14.2.3",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
-          "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
+          "version": "14.2.2",
+          "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-14.2.2.tgz?cache=0&sync_timestamp=1583129910829&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-14.2.2.tgz",
+          "integrity": "sha1-J2lWQ3kAn/hZfN04+6CdqbSTxLU=",
           "requires": {
             "cliui": "^5.0.0",
             "decamelize": "^1.2.0",
@@ -16325,13 +16263,13 @@
             "string-width": "^3.0.0",
             "which-module": "^2.0.0",
             "y18n": "^4.0.0",
-            "yargs-parser": "^15.0.1"
+            "yargs-parser": "^15.0.0"
           }
         },
         "yargs-parser": {
-          "version": "15.0.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz",
-          "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==",
+          "version": "15.0.0",
+          "resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-15.0.0.tgz?cache=0&sync_timestamp=1583128930944&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-15.0.0.tgz",
+          "integrity": "sha1-zdepdJDsg2GV9Z8/Tb5eqej3Xwg=",
           "requires": {
             "camelcase": "^5.0.0",
             "decamelize": "^1.2.0"
@@ -16340,20 +16278,210 @@
       }
     },
     "showdown-katex": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/showdown-katex/-/showdown-katex-0.6.0.tgz",
-      "integrity": "sha512-eEOipJjqMxRJ+e69WlA7XENhFZzKhNl12csey0iLd4QbLzGF61+FBxNPhEZFz9wICYTJNfyqNgLSqmm8Uj0fGA==",
+      "version": "0.8.0",
+      "resolved": "https://registry.npm.taobao.org/showdown-katex/download/showdown-katex-0.8.0.tgz",
+      "integrity": "sha1-k1BjclkichisNwsmOL4hdQA4YUE=",
       "requires": {
-        "katex": "^0.10.0"
+        "jsdom": "^16.2.1",
+        "katex": "^0.11.1"
       },
       "dependencies": {
-        "katex": {
-          "version": "0.10.2",
-          "resolved": "https://registry.npmjs.org/katex/-/katex-0.10.2.tgz",
-          "integrity": "sha512-cQOmyIRoMloCoSIOZ1+gEwsksdJZ1EW4SWm3QzxSza/QsnZr6D4U1V9S4q+B/OLm2OQ8TCBecQ8MaIfnScI7cw==",
+        "abab": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npm.taobao.org/abab/download/abab-2.0.3.tgz",
+          "integrity": "sha1-Yj4gdeAustPyR15J+ZyRhGRnkHo="
+        },
+        "acorn": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-7.1.1.tgz?cache=0&sync_timestamp=1583796606796&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-7.1.1.tgz",
+          "integrity": "sha1-41Zo3gtALzWd5RXFSCoaufiaab8="
+        },
+        "acorn-globals": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npm.taobao.org/acorn-globals/download/acorn-globals-6.0.0.tgz",
+          "integrity": "sha1-Rs3Tnw+P8IqHZhm1X1rIptx3C0U=",
           "requires": {
-            "commander": "^2.19.0"
+            "acorn": "^7.1.1",
+            "acorn-walk": "^7.1.1"
           }
+        },
+        "acorn-walk": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npm.taobao.org/acorn-walk/download/acorn-walk-7.1.1.tgz?cache=0&sync_timestamp=1581612804260&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn-walk%2Fdownload%2Facorn-walk-7.1.1.tgz",
+          "integrity": "sha1-NF8N/61cc15zc9L+yaECPmpEuD4="
+        },
+        "cssom": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npm.taobao.org/cssom/download/cssom-0.4.4.tgz?cache=0&sync_timestamp=1573719337707&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcssom%2Fdownload%2Fcssom-0.4.4.tgz",
+          "integrity": "sha1-WmbPk9LQtmHYC/akT7ZfXC5OChA="
+        },
+        "cssstyle": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npm.taobao.org/cssstyle/download/cssstyle-2.2.0.tgz",
+          "integrity": "sha1-5MRN68zWt5Ee1hekOV5XVLulmZI=",
+          "requires": {
+            "cssom": "~0.3.6"
+          },
+          "dependencies": {
+            "cssom": {
+              "version": "0.3.8",
+              "resolved": "https://registry.npm.taobao.org/cssom/download/cssom-0.3.8.tgz?cache=0&sync_timestamp=1573719337707&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcssom%2Fdownload%2Fcssom-0.3.8.tgz",
+              "integrity": "sha1-nxJ29bK0Y/IRTT8sdSUK+MGjb0o="
+            }
+          }
+        },
+        "escodegen": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npm.taobao.org/escodegen/download/escodegen-1.14.1.tgz?cache=0&sync_timestamp=1580954994482&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescodegen%2Fdownload%2Fescodegen-1.14.1.tgz",
+          "integrity": "sha1-ugHQyCeLXpWppFNQFCAmZZAnpFc=",
+          "requires": {
+            "esprima": "^4.0.1",
+            "estraverse": "^4.2.0",
+            "esutils": "^2.0.2",
+            "optionator": "^0.8.1",
+            "source-map": "~0.6.1"
+          }
+        },
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fesprima%2Fdownload%2Fesprima-4.0.1.tgz",
+          "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE="
+        },
+        "jsdom": {
+          "version": "16.2.2",
+          "resolved": "https://registry.npm.taobao.org/jsdom/download/jsdom-16.2.2.tgz",
+          "integrity": "sha1-dvL3VBZGvrRqk49dxHa4hwW+3ys=",
+          "requires": {
+            "abab": "^2.0.3",
+            "acorn": "^7.1.1",
+            "acorn-globals": "^6.0.0",
+            "cssom": "^0.4.4",
+            "cssstyle": "^2.2.0",
+            "data-urls": "^2.0.0",
+            "decimal.js": "^10.2.0",
+            "domexception": "^2.0.1",
+            "escodegen": "^1.14.1",
+            "html-encoding-sniffer": "^2.0.1",
+            "is-potential-custom-element-name": "^1.0.0",
+            "nwsapi": "^2.2.0",
+            "parse5": "5.1.1",
+            "request": "^2.88.2",
+            "request-promise-native": "^1.0.8",
+            "saxes": "^5.0.0",
+            "symbol-tree": "^3.2.4",
+            "tough-cookie": "^3.0.1",
+            "w3c-hr-time": "^1.0.2",
+            "w3c-xmlserializer": "^2.0.0",
+            "webidl-conversions": "^6.0.0",
+            "whatwg-encoding": "^1.0.5",
+            "whatwg-mimetype": "^2.3.0",
+            "whatwg-url": "^8.0.0",
+            "ws": "^7.2.3",
+            "xml-name-validator": "^3.0.0"
+          }
+        },
+        "parse5": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npm.taobao.org/parse5/download/parse5-5.1.1.tgz",
+          "integrity": "sha1-9o5OW6GFKsLK3AD0VV//bCq7YXg="
+        },
+        "qs": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz",
+          "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY="
+        },
+        "request": {
+          "version": "2.88.2",
+          "resolved": "https://registry.npm.taobao.org/request/download/request-2.88.2.tgz",
+          "integrity": "sha1-1zyRhzHLWofaBH4gcjQUb2ZNErM=",
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.3",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.5.0",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
+          },
+          "dependencies": {
+            "tough-cookie": {
+              "version": "2.5.0",
+              "resolved": "https://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftough-cookie%2Fdownload%2Ftough-cookie-2.5.0.tgz",
+              "integrity": "sha1-zZ+yoKodWhK0c72fuW+j3P9lreI=",
+              "requires": {
+                "psl": "^1.1.28",
+                "punycode": "^2.1.1"
+              }
+            }
+          }
+        },
+        "symbol-tree": {
+          "version": "3.2.4",
+          "resolved": "https://registry.npm.taobao.org/symbol-tree/download/symbol-tree-3.2.4.tgz",
+          "integrity": "sha1-QwY30ki6d+B4iDlR+5qg7tfGP6I="
+        },
+        "tough-cookie": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npm.taobao.org/tough-cookie/download/tough-cookie-3.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftough-cookie%2Fdownload%2Ftough-cookie-3.0.1.tgz",
+          "integrity": "sha1-nfT1fnOcJpMKAYGEiH9K233Kc7I=",
+          "requires": {
+            "ip-regex": "^2.1.0",
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        },
+        "tr46": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npm.taobao.org/tr46/download/tr46-2.0.2.tgz",
+          "integrity": "sha1-Ayc1ht7xWVrgj+2zjXczzukdJHk=",
+          "requires": {
+            "punycode": "^2.1.1"
+          }
+        },
+        "webidl-conversions": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/webidl-conversions/download/webidl-conversions-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebidl-conversions%2Fdownload%2Fwebidl-conversions-6.1.0.tgz",
+          "integrity": "sha1-kRG01+qArNQPUnDWZmIa+ni2lRQ="
+        },
+        "whatwg-url": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npm.taobao.org/whatwg-url/download/whatwg-url-8.0.0.tgz",
+          "integrity": "sha1-N/JWy3RjmOGbEHvW74ILSuLRWHE=",
+          "requires": {
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^2.0.0",
+            "webidl-conversions": "^5.0.0"
+          },
+          "dependencies": {
+            "webidl-conversions": {
+              "version": "5.0.0",
+              "resolved": "https://registry.npm.taobao.org/webidl-conversions/download/webidl-conversions-5.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebidl-conversions%2Fdownload%2Fwebidl-conversions-5.0.0.tgz",
+              "integrity": "sha1-rlnIoAsSFUOirMZcBDT1ew/BGv8="
+            }
+          }
+        },
+        "ws": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npm.taobao.org/ws/download/ws-7.2.3.tgz?cache=0&sync_timestamp=1583774972911&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fws%2Fdownload%2Fws-7.2.3.tgz",
+          "integrity": "sha1-pUEeH7BNXtDv7nbSbVxG2DDDm0Y="
+        },
+        "xml-name-validator": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/xml-name-validator/download/xml-name-validator-3.0.0.tgz",
+          "integrity": "sha1-auc+Bt5NjG5H+fsYH3jWSK1FfGo="
         }
       }
     },
@@ -16406,14 +16534,6 @@
             "is-descriptor": "^0.1.0"
           }
         },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
@@ -16436,48 +16556,10 @@
         "snapdragon-util": "^3.0.1"
       },
       "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/define-property/download/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "http://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz",
-          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
         "isobject": {
           "version": "3.0.1",
           "resolved": "http://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz",
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": ""
         }
       }
     },
@@ -16490,54 +16572,34 @@
       }
     },
     "sockjs": {
-      "version": "0.3.18",
-      "resolved": "http://registry.npm.taobao.org/sockjs/download/sockjs-0.3.18.tgz",
-      "integrity": "sha1-2bKJMWyn33dZXvKZ4HXw+TfrQgc=",
+      "version": "0.3.19",
+      "resolved": "https://registry.npm.taobao.org/sockjs/download/sockjs-0.3.19.tgz",
+      "integrity": "sha1-2Xa76ACve9IK4IWY1YI5NQiZPA0=",
       "requires": {
         "faye-websocket": "^0.10.0",
-        "uuid": "^2.0.2"
-      },
-      "dependencies": {
-        "faye-websocket": {
-          "version": "0.10.0",
-          "resolved": "http://registry.npm.taobao.org/faye-websocket/download/faye-websocket-0.10.0.tgz",
-          "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-          "requires": {
-            "websocket-driver": ">=0.5.1"
-          }
-        },
-        "uuid": {
-          "version": "2.0.3",
-          "resolved": "http://registry.npm.taobao.org/uuid/download/uuid-2.0.3.tgz",
-          "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho="
-        }
+        "uuid": "^3.0.1"
       }
     },
     "sockjs-client": {
-      "version": "1.1.5",
-      "resolved": "http://registry.npm.taobao.org/sockjs-client/download/sockjs-client-1.1.5.tgz",
-      "integrity": "sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npm.taobao.org/sockjs-client/download/sockjs-client-1.4.0.tgz",
+      "integrity": "sha1-yfJWjhnI/YFztJl+o0IOC7MGx9U=",
       "requires": {
-        "debug": "^2.6.6",
-        "eventsource": "0.1.6",
-        "faye-websocket": "~0.11.0",
-        "inherits": "^2.0.1",
+        "debug": "^3.2.5",
+        "eventsource": "^1.0.7",
+        "faye-websocket": "~0.11.1",
+        "inherits": "^2.0.3",
         "json3": "^3.3.2",
-        "url-parse": "^1.1.8"
+        "url-parse": "^1.4.3"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
-          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+        "faye-websocket": {
+          "version": "0.11.3",
+          "resolved": "https://registry.npm.taobao.org/faye-websocket/download/faye-websocket-0.11.3.tgz",
+          "integrity": "sha1-XA6aiWjokSwoZjn96XeosgnyUI4=",
           "requires": {
-            "ms": "2.0.0"
+            "websocket-driver": ">=0.5.1"
           }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         }
       }
     },
@@ -16560,11 +16622,11 @@
       "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
     },
     "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "http://registry.npm.taobao.org/source-map-resolve/download/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha1-cuLMNAlVQ+Q7LGKyxMENSpBU8lk=",
+      "version": "0.5.3",
+      "resolved": "https://registry.npm.taobao.org/source-map-resolve/download/source-map-resolve-0.5.3.tgz?cache=0&sync_timestamp=1584831908370&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map-resolve%2Fdownload%2Fsource-map-resolve-0.5.3.tgz",
+      "integrity": "sha1-GQhmvs51U+H48mei7oLGBrVQmho=",
       "requires": {
-        "atob": "^2.1.1",
+        "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
         "source-map-url": "^0.4.0",
@@ -16572,12 +16634,18 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.16",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-      "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
+      "version": "0.4.18",
+      "resolved": "http://registry.npm.taobao.org/source-map-support/download/source-map-support-0.4.18.tgz",
+      "integrity": "sha1-Aoam3ovkJkEzhZTpfM6nXwosWF8=",
       "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
+        "source-map": "^0.5.6"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
       }
     },
     "source-map-url": {
@@ -16614,59 +16682,57 @@
       "integrity": "sha1-dezRqI3owYTvAV6vtRtbSL/RG7E="
     },
     "spdy": {
-      "version": "3.4.7",
-      "resolved": "http://registry.npm.taobao.org/spdy/download/spdy-3.4.7.tgz",
-      "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=",
+      "version": "4.0.2",
+      "resolved": "https://registry.npm.taobao.org/spdy/download/spdy-4.0.2.tgz",
+      "integrity": "sha1-t09GYgOj7aRSwCSSuR+56EonZ3s=",
       "requires": {
-        "debug": "^2.6.8",
-        "handle-thing": "^1.2.5",
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
         "http-deceiver": "^1.2.7",
-        "safe-buffer": "^5.0.1",
         "select-hose": "^2.0.0",
-        "spdy-transport": "^2.0.18"
+        "spdy-transport": "^3.0.0"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
-          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "version": "4.1.1",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.1.1.tgz",
+          "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         }
       }
     },
     "spdy-transport": {
-      "version": "2.1.1",
-      "resolved": "http://registry.npm.taobao.org/spdy-transport/download/spdy-transport-2.1.1.tgz",
-      "integrity": "sha1-xUgV1zhYqt0GzmMAHn0l+mRBYjs=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npm.taobao.org/spdy-transport/download/spdy-transport-3.0.0.tgz",
+      "integrity": "sha1-ANSGOmQArXXfkzYaFghgXl3NzzE=",
       "requires": {
-        "debug": "^2.6.8",
-        "detect-node": "^2.0.3",
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
         "hpack.js": "^2.1.6",
-        "obuf": "^1.1.1",
-        "readable-stream": "^2.2.9",
-        "safe-buffer": "^5.0.1",
-        "wbuf": "^1.7.2"
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
-          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "version": "4.1.1",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.1.1.tgz",
+          "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.6.0.tgz",
+          "integrity": "sha1-M3u9o63AcGvT4CRCaihtS0sskZg=",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
         }
       }
     },
@@ -16676,6 +16742,25 @@
       "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
       "requires": {
         "extend-shallow": "^3.0.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
     "sprintf-js": {
@@ -16701,8 +16786,8 @@
     },
     "ssri": {
       "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
-      "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
+      "resolved": "https://registry.npm.taobao.org/ssri/download/ssri-5.3.0.tgz",
+      "integrity": "sha1-ujhyycbTOgcEp9cf8EXl7EiZnQY=",
       "dev": true,
       "requires": {
         "safe-buffer": "^5.1.1"
@@ -16734,13 +16819,18 @@
     },
     "stdout-stream": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
-      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
+      "resolved": "https://registry.npm.taobao.org/stdout-stream/download/stdout-stream-1.4.1.tgz",
+      "integrity": "sha1-WsF0zdXNcmEEqgwLK9g4FdjVNd4=",
       "dev": true,
       "requires": {
         "readable-stream": "^2.0.1"
       }
     },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npm.taobao.org/stealthy-require/download/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
+    },
     "stifle": {
       "version": "1.1.0",
       "resolved": "http://registry.npm.taobao.org/stifle/download/stifle-1.1.0.tgz",
@@ -16755,6 +16845,7 @@
       "version": "2.0.2",
       "resolved": "http://registry.npm.taobao.org/stream-browserify/download/stream-browserify-2.0.2.tgz",
       "integrity": "sha1-h1IdOKRKp+6RzhzSpH3wy0ndZgs=",
+      "dev": true,
       "requires": {
         "inherits": "~2.0.1",
         "readable-stream": "^2.0.2"
@@ -16762,8 +16853,8 @@
     },
     "stream-each": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "resolved": "https://registry.npm.taobao.org/stream-each/download/stream-each-1.2.3.tgz",
+      "integrity": "sha1-6+J6DDibBPvMIzZClS4Qcxr6m64=",
       "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
@@ -16774,6 +16865,7 @@
       "version": "2.8.3",
       "resolved": "http://registry.npm.taobao.org/stream-http/download/stream-http-2.8.3.tgz",
       "integrity": "sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw=",
+      "dev": true,
       "requires": {
         "builtin-status-codes": "^3.0.0",
         "inherits": "^2.0.1",
@@ -16784,8 +16876,8 @@
     },
     "stream-shift": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "resolved": "https://registry.npm.taobao.org/stream-shift/download/stream-shift-1.0.1.tgz?cache=0&sync_timestamp=1576147145118&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstream-shift%2Fdownload%2Fstream-shift-1.0.1.tgz",
+      "integrity": "sha1-1wiCgVWasneEJCebCHfaPDktWj0=",
       "dev": true
     },
     "strict-uri-encode": {
@@ -16795,7 +16887,7 @@
     },
     "string-convert": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/string-convert/download/string-convert-0.2.1.tgz",
       "integrity": "sha1-aYLMMEn7tM2F+LJFaLnZvznu/5c="
     },
     "string-length": {
@@ -16832,8 +16924,8 @@
     },
     "string.prototype.trim": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz",
-      "integrity": "sha512-MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw==",
+      "resolved": "https://registry.npm.taobao.org/string.prototype.trim/download/string.prototype.trim-1.2.1.tgz",
+      "integrity": "sha1-FBIz3/Msgr+tgGhNfl8Iae4Pt4I=",
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.17.0-next.1",
@@ -16841,9 +16933,9 @@
       },
       "dependencies": {
         "es-abstract": {
-          "version": "1.17.4",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-          "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+          "version": "1.17.5",
+          "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.5.tgz",
+          "integrity": "sha1-2MnR1myJgfuSAOIlHXme7pJ3Suk=",
           "requires": {
             "es-to-primitive": "^1.2.1",
             "function-bind": "^1.1.1",
@@ -16860,28 +16952,23 @@
         },
         "es-to-primitive": {
           "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+          "resolved": "https://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.1.tgz",
+          "integrity": "sha1-5VzUyc3BiLzvsDs2bHNjI/xciYo=",
           "requires": {
             "is-callable": "^1.1.4",
             "is-date-object": "^1.0.1",
             "is-symbol": "^1.0.2"
           }
         },
-        "has-symbols": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
-        },
         "is-callable": {
           "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
+          "resolved": "https://registry.npm.taobao.org/is-callable/download/is-callable-1.1.5.tgz",
+          "integrity": "sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs="
         },
         "is-regex": {
           "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "resolved": "https://registry.npm.taobao.org/is-regex/download/is-regex-1.0.5.tgz?cache=0&sync_timestamp=1576454688491&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regex%2Fdownload%2Fis-regex-1.0.5.tgz",
+          "integrity": "sha1-OdWJo1i/GJZ/cmlnEguPwa7XTq4=",
           "requires": {
             "has": "^1.0.3"
           }
@@ -16890,8 +16977,8 @@
     },
     "string.prototype.trimleft": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
-      "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
+      "resolved": "https://registry.npm.taobao.org/string.prototype.trimleft/download/string.prototype.trimleft-2.1.1.tgz",
+      "integrity": "sha1-m9uKxqvW1gKxek7TIYcNL43O/HQ=",
       "requires": {
         "define-properties": "^1.1.3",
         "function-bind": "^1.1.1"
@@ -16899,8 +16986,8 @@
     },
     "string.prototype.trimright": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
-      "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
+      "resolved": "https://registry.npm.taobao.org/string.prototype.trimright/download/string.prototype.trimright-2.1.1.tgz?cache=0&sync_timestamp=1576706898686&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimright%2Fdownload%2Fstring.prototype.trimright-2.1.1.tgz",
+      "integrity": "sha1-RAMUsVmWyGbOigNBiU1FGGIAxdk=",
       "requires": {
         "define-properties": "^1.1.3",
         "function-bind": "^1.1.1"
@@ -16958,16 +17045,18 @@
       }
     },
     "styled-components": {
-      "version": "4.2.0",
-      "resolved": "http://registry.npm.taobao.org/styled-components/download/styled-components-4.2.0.tgz",
-      "integrity": "sha1-gR+77E1kxxifbHSCuetv76f+/vc=",
+      "version": "4.4.1",
+      "resolved": "https://registry.npm.taobao.org/styled-components/download/styled-components-4.4.1.tgz?cache=0&sync_timestamp=1586236957838&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstyled-components%2Fdownload%2Fstyled-components-4.4.1.tgz",
+      "integrity": "sha1-4GMeiJ8B22ffTeV2/trKRj8FwvI=",
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
-        "@emotion/is-prop-valid": "^0.7.3",
+        "@babel/traverse": "^7.0.0",
+        "@emotion/is-prop-valid": "^0.8.1",
         "@emotion/unitless": "^0.7.0",
         "babel-plugin-styled-components": ">= 1",
         "css-to-react-native": "^2.2.2",
         "memoize-one": "^5.0.0",
+        "merge-anything": "^2.2.4",
         "prop-types": "^15.5.4",
         "react-is": "^16.6.0",
         "stylis": "^3.5.0",
@@ -16993,31 +17082,6 @@
         "has-flag": "^3.0.0"
       }
     },
-    "svgo": {
-      "version": "0.7.2",
-      "resolved": "http://registry.npm.taobao.org/svgo/download/svgo-0.7.2.tgz",
-      "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
-      "requires": {
-        "coa": "~1.0.1",
-        "colors": "~1.1.2",
-        "csso": "~2.3.1",
-        "js-yaml": "~3.7.0",
-        "mkdirp": "~0.5.1",
-        "sax": "~1.2.1",
-        "whet.extend": "~0.9.9"
-      },
-      "dependencies": {
-        "js-yaml": {
-          "version": "3.7.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
-          "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
-          "requires": {
-            "argparse": "^1.0.7",
-            "esprima": "^2.6.0"
-          }
-        }
-      }
-    },
     "sw-precache": {
       "version": "5.2.1",
       "resolved": "http://registry.npm.taobao.org/sw-precache/download/sw-precache-5.2.1.tgz",
@@ -17111,14 +17175,14 @@
       }
     },
     "tapable": {
-      "version": "0.2.9",
-      "resolved": "http://registry.npm.taobao.org/tapable/download/tapable-0.2.9.tgz",
-      "integrity": "sha1-ry2LvJsE907hevK02QSPgHrNGKg="
+      "version": "1.1.3",
+      "resolved": "https://registry.npm.taobao.org/tapable/download/tapable-1.1.3.tgz",
+      "integrity": "sha1-ofzMBrWNth/XpF2i2kT186Pme6I="
     },
     "tape": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/tape/-/tape-4.13.0.tgz",
-      "integrity": "sha512-J/hvA+GJnuWJ0Sj8Z0dmu3JgMNU+MmusvkCT7+SN4/2TklW18FNCp/UuHIEhPZwHfy4sXfKYgC7kypKg4umbOw==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npm.taobao.org/tape/download/tape-4.13.2.tgz?cache=0&sync_timestamp=1583221772526&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftape%2Fdownload%2Ftape-4.13.2.tgz",
+      "integrity": "sha1-60GbnZvABAJbGoGltjCT4H9CVik=",
       "requires": {
         "deep-equal": "~1.1.1",
         "defined": "~1.0.0",
@@ -17131,7 +17195,7 @@
         "is-regex": "~1.0.5",
         "minimist": "~1.2.0",
         "object-inspect": "~1.7.0",
-        "resolve": "~1.14.2",
+        "resolve": "~1.15.1",
         "resumer": "~0.0.0",
         "string.prototype.trim": "~1.2.1",
         "through": "~2.3.8"
@@ -17139,8 +17203,8 @@
       "dependencies": {
         "deep-equal": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-          "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+          "resolved": "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz",
+          "integrity": "sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o=",
           "requires": {
             "is-arguments": "^1.0.4",
             "is-date-object": "^1.0.1",
@@ -17150,41 +17214,23 @@
             "regexp.prototype.flags": "^1.2.0"
           }
         },
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-        },
         "is-regex": {
           "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "resolved": "https://registry.npm.taobao.org/is-regex/download/is-regex-1.0.5.tgz?cache=0&sync_timestamp=1576454688491&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regex%2Fdownload%2Fis-regex-1.0.5.tgz",
+          "integrity": "sha1-OdWJo1i/GJZ/cmlnEguPwa7XTq4=",
           "requires": {
             "has": "^1.0.3"
           }
         },
         "minimist": {
           "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+          "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1584051509720&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz",
+          "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI="
         },
         "resolve": {
-          "version": "1.14.2",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz",
-          "integrity": "sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==",
+          "version": "1.15.1",
+          "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.15.1.tgz",
+          "integrity": "sha1-J73N7/6vLWJEuVuw+fS0ZTRR8+g=",
           "requires": {
             "path-parse": "^1.0.6"
           }
@@ -17193,8 +17239,8 @@
     },
     "tar": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
+      "resolved": "https://registry.npm.taobao.org/tar/download/tar-2.2.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftar%2Fdownload%2Ftar-2.2.2.tgz",
+      "integrity": "sha1-DKiEhWLHKZuLRG/2pNYM27I+3EA=",
       "dev": true,
       "requires": {
         "block-stream": "*",
@@ -17210,6 +17256,286 @@
         "execa": "^0.7.0"
       }
     },
+    "terser": {
+      "version": "4.6.10",
+      "resolved": "https://registry.npm.taobao.org/terser/download/terser-4.6.10.tgz?cache=0&sync_timestamp=1585665783882&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser%2Fdownload%2Fterser-4.6.10.tgz",
+      "integrity": "sha1-kPW9Bp/0Vt28lQOxjlL5xJPTt8I=",
+      "requires": {
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "dependencies": {
+        "source-map-support": {
+          "version": "0.5.16",
+          "resolved": "https://registry.npm.taobao.org/source-map-support/download/source-map-support-0.5.16.tgz",
+          "integrity": "sha1-CuBp5/47p1OMZMmFFeNTOerFoEI=",
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-1.4.3.tgz?cache=0&sync_timestamp=1581696211948&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-1.4.3.tgz",
+      "integrity": "sha1-Xsry29xfuZdF/QZ5H0b8ndscmnw=",
+      "dev": true,
+      "requires": {
+        "cacache": "^12.0.2",
+        "find-cache-dir": "^2.1.0",
+        "is-wsl": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^2.1.2",
+        "source-map": "^0.6.1",
+        "terser": "^4.1.2",
+        "webpack-sources": "^1.4.0",
+        "worker-farm": "^1.7.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.0",
+          "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.0.tgz?cache=0&sync_timestamp=1582379612319&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.0.tgz",
+          "integrity": "sha1-BtYLlth7hFSlrauobnhU2mKdtLc=",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "bluebird": {
+          "version": "3.7.2",
+          "resolved": "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz",
+          "integrity": "sha1-nyKcFb4nJFT/qXOs4NvueaGww28=",
+          "dev": true
+        },
+        "cacache": {
+          "version": "12.0.4",
+          "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-12.0.4.tgz?cache=0&sync_timestamp=1585009516561&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-12.0.4.tgz",
+          "integrity": "sha1-ZovL0QWutfHZL+JVcOyVJcj6pAw=",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "infer-owner": "^1.0.3",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha1-VFFFB3xQFJHjOxXsQIwpQ3bpSuQ=",
+          "dev": true
+        },
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-2.1.0.tgz?cache=0&sync_timestamp=1583734591888&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-2.1.0.tgz",
+          "integrity": "sha1-jQ+UzRP+Q8bHwmGg2GEVypGMBfc=",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz",
+          "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npm.taobao.org/glob/download/glob-7.1.6.tgz?cache=0&sync_timestamp=1573078079496&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglob%2Fdownload%2Fglob-7.1.6.tgz",
+          "integrity": "sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz",
+          "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-5.1.1.tgz",
+          "integrity": "sha1-HaJ+ZxAnGUdpXa9oSOhH8B2EuSA=",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npm.taobao.org/make-dir/download/make-dir-2.1.0.tgz",
+          "integrity": "sha1-XwMQ4YuL6JjMBwCSlaMK5B6R5vU=",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "mississippi": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/mississippi/download/mississippi-3.0.0.tgz",
+          "integrity": "sha1-6goykfl+C16HdrNj1fChLZTGcCI=",
+          "dev": true,
+          "requires": {
+            "concat-stream": "^1.5.0",
+            "duplexify": "^3.4.2",
+            "end-of-stream": "^1.1.0",
+            "flush-write-stream": "^1.0.0",
+            "from2": "^2.1.0",
+            "parallel-transform": "^1.1.0",
+            "pump": "^3.0.0",
+            "pumpify": "^1.3.3",
+            "stream-each": "^1.1.0",
+            "through2": "^2.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npm.taobao.org/p-limit/download/p-limit-2.3.0.tgz",
+          "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz",
+          "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npm.taobao.org/p-try/download/p-try-2.2.0.tgz",
+          "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY=",
+          "dev": true
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz",
+          "integrity": "sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE=",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz",
+          "integrity": "sha1-J0kCDyOe2ZCIGx9xIQ1R62UjvqM=",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz",
+          "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz",
+          "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        },
+        "serialize-javascript": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-2.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-2.1.2.tgz",
+          "integrity": "sha1-7OxTsOAxe9yV73arcHS3OEeF+mE=",
+          "dev": true
+        },
+        "ssri": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npm.taobao.org/ssri/download/ssri-6.0.1.tgz",
+          "integrity": "sha1-KjxBso3UW2K2Nnbst0ABJlrp7dg=",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1"
+          }
+        },
+        "webpack-sources": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.4.3.tgz",
+          "integrity": "sha1-7t2OwLko+/HL/plOItLYkPMwqTM=",
+          "dev": true,
+          "requires": {
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
+          }
+        },
+        "worker-farm": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npm.taobao.org/worker-farm/download/worker-farm-1.7.0.tgz",
+          "integrity": "sha1-JqlMU5G7ypJhUgAvabhKS/dy5ag=",
+          "dev": true,
+          "requires": {
+            "errno": "~0.1.7"
+          }
+        },
+        "y18n": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/y18n/download/y18n-4.0.0.tgz",
+          "integrity": "sha1-le+U+F7MgdAHwmThkKEg8KPIVms=",
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-3.1.1.tgz",
+          "integrity": "sha1-27fa+b/YusmrRev2ArjLrQ1dCP0=",
+          "dev": true
+        }
+      }
+    },
     "test-exclude": {
       "version": "4.2.3",
       "resolved": "http://registry.npm.taobao.org/test-exclude/download/test-exclude-4.2.3.tgz",
@@ -17250,8 +17576,8 @@
     },
     "through2": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "resolved": "https://registry.npm.taobao.org/through2/download/through2-2.0.5.tgz",
+      "integrity": "sha1-AcHjnrMdB8t9A6lqcIIyYLIxMs0=",
       "dev": true,
       "requires": {
         "readable-stream": "~2.3.6",
@@ -17259,14 +17585,9 @@
       }
     },
     "thunky": {
-      "version": "1.0.3",
-      "resolved": "http://registry.npm.taobao.org/thunky/download/thunky-1.0.3.tgz",
-      "integrity": "sha1-9d9zJFNAewkZHa5z4qjMc/OBqCY="
-    },
-    "time-stamp": {
-      "version": "2.2.0",
-      "resolved": "http://registry.npm.taobao.org/time-stamp/download/time-stamp-2.2.0.tgz",
-      "integrity": "sha1-kX4KZpBWiHkOx7u94EBGJZr4P1c="
+      "version": "1.1.0",
+      "resolved": "https://registry.npm.taobao.org/thunky/download/thunky-1.1.0.tgz?cache=0&sync_timestamp=1571043401546&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthunky%2Fdownload%2Fthunky-1.1.0.tgz",
+      "integrity": "sha1-Wrr3FKlAXbBQRzK7zNLO3Z75U30="
     },
     "timed-out": {
       "version": "4.0.1",
@@ -17274,17 +17595,18 @@
       "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
     },
     "timers-browserify": {
-      "version": "2.0.10",
-      "resolved": "http://registry.npm.taobao.org/timers-browserify/download/timers-browserify-2.0.10.tgz",
-      "integrity": "sha1-HSjj0qrfHVpZlsTp+VYBzQU0gK4=",
+      "version": "2.0.11",
+      "resolved": "https://registry.npm.taobao.org/timers-browserify/download/timers-browserify-2.0.11.tgz",
+      "integrity": "sha1-gAsfPu4nLlvFPuRloE0OgEwxIR8=",
+      "dev": true,
       "requires": {
         "setimmediate": "^1.0.4"
       }
     },
     "tiny-emitter": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+      "resolved": "https://registry.npm.taobao.org/tiny-emitter/download/tiny-emitter-2.1.0.tgz",
+      "integrity": "sha1-HRpW7fxRxD6GPLtTgqcjMONVVCM="
     },
     "tiny-invariant": {
       "version": "1.0.4",
@@ -17298,7 +17620,7 @@
     },
     "tinycolor2": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.1.tgz",
       "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g="
     },
     "tmp": {
@@ -17317,7 +17639,8 @@
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "http://registry.npm.taobao.org/to-arraybuffer/download/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
     },
     "to-fast-properties": {
       "version": "1.0.3",
@@ -17341,6 +17664,70 @@
         "extend-shallow": "^3.0.2",
         "regex-not": "^1.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
+          "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+          "requires": {
+            "is-descriptor": "^1.0.2",
+            "isobject": "^3.0.1"
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+          "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
+        }
       }
     },
     "to-regex-range": {
@@ -17364,13 +17751,13 @@
     },
     "toggle-selection": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/toggle-selection/download/toggle-selection-1.0.6.tgz",
       "integrity": "sha1-bkWxJj8gF/oKzH2J14sVuL932jI="
     },
-    "toposort": {
-      "version": "1.0.7",
-      "resolved": "http://registry.npm.taobao.org/toposort/download/toposort-1.0.7.tgz",
-      "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk="
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/toidentifier/download/toidentifier-1.0.0.tgz",
+      "integrity": "sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM="
     },
     "tough-cookie": {
       "version": "2.5.0",
@@ -17398,8 +17785,8 @@
     },
     "true-case-path": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
+      "resolved": "https://registry.npm.taobao.org/true-case-path/download/true-case-path-1.0.3.tgz",
+      "integrity": "sha1-+BO1qMhrQNpZYGcisUTjIleZ9H0=",
       "dev": true,
       "requires": {
         "glob": "^7.1.2"
@@ -17411,10 +17798,16 @@
       "integrity": "sha1-8shUBoALmw90yfdGW4HqrSQSUvg=",
       "dev": true
     },
+    "tslib": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npm.taobao.org/tslib/download/tslib-1.11.1.tgz",
+      "integrity": "sha1-6xXRKIJ/vuKEFUnhcfRe0zisfjU="
+    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "http://registry.npm.taobao.org/tty-browserify/download/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
     },
     "tunnel-agent": {
       "version": "0.6.0",
@@ -17438,14 +17831,37 @@
       }
     },
     "type-is": {
-      "version": "1.6.16",
-      "resolved": "http://registry.npm.taobao.org/type-is/download/type-is-1.6.16.tgz",
-      "integrity": "sha1-+JzjQVQcZysl7nrjxz3uOyvlAZQ=",
+      "version": "1.6.18",
+      "resolved": "https://registry.npm.taobao.org/type-is/download/type-is-1.6.18.tgz",
+      "integrity": "sha1-TlUs0F3wlGfcvE73Od6J8s83wTE=",
+      "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "~2.1.18"
+        "mime-types": "~2.1.24"
+      },
+      "dependencies": {
+        "mime-db": {
+          "version": "1.43.0",
+          "resolved": "https://registry.npm.taobao.org/mime-db/download/mime-db-1.43.0.tgz",
+          "integrity": "sha1-ChLgUCZQ5HPXNVNQUOfI9OtPrlg=",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.26",
+          "resolved": "https://registry.npm.taobao.org/mime-types/download/mime-types-2.1.26.tgz?cache=0&sync_timestamp=1578282585871&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime-types%2Fdownload%2Fmime-types-2.1.26.tgz",
+          "integrity": "sha1-nJIfwJt+FJpl39wNpNIJlyALCgY=",
+          "dev": true,
+          "requires": {
+            "mime-db": "1.43.0"
+          }
+        }
       }
     },
+    "typed-styles": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npm.taobao.org/typed-styles/download/typed-styles-0.0.7.tgz",
+      "integrity": "sha1-kzkqAIeUxFlRGf9i3eaAnbxAo9k="
+    },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "http://registry.npm.taobao.org/typedarray/download/typedarray-0.0.6.tgz",
@@ -17456,22 +17872,6 @@
       "resolved": "http://registry.npm.taobao.org/ua-parser-js/download/ua-parser-js-0.7.19.tgz",
       "integrity": "sha1-lBUb5MCn+x0AGvcCL9rKRkJlnks="
     },
-    "uglify-es": {
-      "version": "3.3.9",
-      "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
-      "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
-      "requires": {
-        "commander": "~2.13.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.13.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
-          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA=="
-        }
-      }
-    },
     "uglify-js": {
       "version": "3.4.10",
       "resolved": "http://registry.npm.taobao.org/uglify-js/download/uglify-js-3.4.10.tgz",
@@ -17495,67 +17895,278 @@
       "optional": true
     },
     "uglifyjs-webpack-plugin": {
-      "version": "0.4.6",
-      "resolved": "http://registry.npm.taobao.org/uglifyjs-webpack-plugin/download/uglifyjs-webpack-plugin-0.4.6.tgz",
-      "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npm.taobao.org/uglifyjs-webpack-plugin/download/uglifyjs-webpack-plugin-2.2.0.tgz",
+      "integrity": "sha1-51vIDn8ZN/cllUybTFoeln6p0Nc=",
+      "dev": true,
       "requires": {
-        "source-map": "^0.5.6",
-        "uglify-js": "^2.8.29",
-        "webpack-sources": "^1.0.1"
+        "cacache": "^12.0.2",
+        "find-cache-dir": "^2.1.0",
+        "is-wsl": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.7.0",
+        "source-map": "^0.6.1",
+        "uglify-js": "^3.6.0",
+        "webpack-sources": "^1.4.0",
+        "worker-farm": "^1.7.0"
       },
       "dependencies": {
-        "camelcase": {
-          "version": "1.2.1",
-          "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
-        },
-        "cliui": {
-          "version": "2.1.0",
-          "resolved": "http://registry.npm.taobao.org/cliui/download/cliui-2.1.0.tgz",
-          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+        "ajv": {
+          "version": "6.12.0",
+          "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.0.tgz?cache=0&sync_timestamp=1582379612319&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.0.tgz",
+          "integrity": "sha1-BtYLlth7hFSlrauobnhU2mKdtLc=",
+          "dev": true,
           "requires": {
-            "center-align": "^0.1.1",
-            "right-align": "^0.1.1",
-            "wordwrap": "0.0.2"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        "bluebird": {
+          "version": "3.7.2",
+          "resolved": "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz",
+          "integrity": "sha1-nyKcFb4nJFT/qXOs4NvueaGww28=",
+          "dev": true
+        },
+        "cacache": {
+          "version": "12.0.4",
+          "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-12.0.4.tgz?cache=0&sync_timestamp=1585009516561&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-12.0.4.tgz",
+          "integrity": "sha1-ZovL0QWutfHZL+JVcOyVJcj6pAw=",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "infer-owner": "^1.0.3",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          }
+        },
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.20.3.tgz?cache=0&sync_timestamp=1584148318639&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.20.3.tgz",
+          "integrity": "sha1-/UhehMA+tIgcIHIrpIA16FMa6zM=",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha1-VFFFB3xQFJHjOxXsQIwpQ3bpSuQ=",
+          "dev": true
+        },
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-2.1.0.tgz?cache=0&sync_timestamp=1583734591888&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-2.1.0.tgz",
+          "integrity": "sha1-jQ+UzRP+Q8bHwmGg2GEVypGMBfc=",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz",
+          "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npm.taobao.org/glob/download/glob-7.1.6.tgz?cache=0&sync_timestamp=1573078079496&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglob%2Fdownload%2Fglob-7.1.6.tgz",
+          "integrity": "sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz",
+          "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-5.1.1.tgz",
+          "integrity": "sha1-HaJ+ZxAnGUdpXa9oSOhH8B2EuSA=",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npm.taobao.org/make-dir/download/make-dir-2.1.0.tgz",
+          "integrity": "sha1-XwMQ4YuL6JjMBwCSlaMK5B6R5vU=",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "mississippi": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/mississippi/download/mississippi-3.0.0.tgz",
+          "integrity": "sha1-6goykfl+C16HdrNj1fChLZTGcCI=",
+          "dev": true,
+          "requires": {
+            "concat-stream": "^1.5.0",
+            "duplexify": "^3.4.2",
+            "end-of-stream": "^1.1.0",
+            "flush-write-stream": "^1.0.0",
+            "from2": "^2.1.0",
+            "parallel-transform": "^1.1.0",
+            "pump": "^3.0.0",
+            "pumpify": "^1.3.3",
+            "stream-each": "^1.1.0",
+            "through2": "^2.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npm.taobao.org/p-limit/download/p-limit-2.3.0.tgz",
+          "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz",
+          "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npm.taobao.org/p-try/download/p-try-2.2.0.tgz",
+          "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY=",
+          "dev": true
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz",
+          "integrity": "sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE=",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz",
+          "integrity": "sha1-J0kCDyOe2ZCIGx9xIQ1R62UjvqM=",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz",
+          "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz",
+          "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        },
+        "ssri": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npm.taobao.org/ssri/download/ssri-6.0.1.tgz",
+          "integrity": "sha1-KjxBso3UW2K2Nnbst0ABJlrp7dg=",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1"
+          }
         },
         "uglify-js": {
-          "version": "2.8.29",
-          "resolved": "http://registry.npm.taobao.org/uglify-js/download/uglify-js-2.8.29.tgz",
-          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+          "version": "3.8.1",
+          "resolved": "https://registry.npm.taobao.org/uglify-js/download/uglify-js-3.8.1.tgz",
+          "integrity": "sha1-Q7sVzm9UXqoKZMSf0pN16gn6D5M=",
+          "dev": true,
           "requires": {
-            "source-map": "~0.5.1",
-            "uglify-to-browserify": "~1.0.0",
-            "yargs": "~3.10.0"
+            "commander": "~2.20.3",
+            "source-map": "~0.6.1"
           }
         },
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "http://registry.npm.taobao.org/wordwrap/download/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
-        },
-        "yargs": {
-          "version": "3.10.0",
-          "resolved": "http://registry.npm.taobao.org/yargs/download/yargs-3.10.0.tgz",
-          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+        "webpack-sources": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.4.3.tgz",
+          "integrity": "sha1-7t2OwLko+/HL/plOItLYkPMwqTM=",
+          "dev": true,
           "requires": {
-            "camelcase": "^1.0.2",
-            "cliui": "^2.1.0",
-            "decamelize": "^1.0.0",
-            "window-size": "0.1.0"
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
           }
+        },
+        "worker-farm": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npm.taobao.org/worker-farm/download/worker-farm-1.7.0.tgz",
+          "integrity": "sha1-JqlMU5G7ypJhUgAvabhKS/dy5ag=",
+          "dev": true,
+          "requires": {
+            "errno": "~0.1.7"
+          }
+        },
+        "y18n": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/y18n/download/y18n-4.0.0.tgz",
+          "integrity": "sha1-le+U+F7MgdAHwmThkKEg8KPIVms=",
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-3.1.1.tgz",
+          "integrity": "sha1-27fa+b/YusmrRev2ArjLrQ1dCP0=",
+          "dev": true
         }
       }
     },
     "union-value": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "resolved": "https://registry.npm.taobao.org/union-value/download/union-value-1.0.1.tgz",
+      "integrity": "sha1-C2/nuDWuzaYcbqTU8CwUIh4QmEc=",
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
@@ -17565,18 +18176,23 @@
     },
     "uniq": {
       "version": "1.0.1",
+<<<<<<< HEAD
+      "resolved": "https://registry.npm.taobao.org/uniq/download/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+=======
+<<<<<<< HEAD
       "resolved": "http://registry.npm.taobao.org/uniq/download/uniq-1.0.1.tgz",
+=======
+      "resolved": "https://registry.npm.taobao.org/uniq/download/uniq-1.0.1.tgz",
+>>>>>>> f191fbe55a03f133615d827fc04311e6de41b163
       "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
-    },
-    "uniqs": {
-      "version": "2.0.0",
-      "resolved": "http://registry.npm.taobao.org/uniqs/download/uniqs-2.0.0.tgz",
-      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI="
+>>>>>>> 22e9ed32d0b11c3a43e6a9929e1072e6c78f3fa4
     },
     "unique-filename": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "resolved": "https://registry.npm.taobao.org/unique-filename/download/unique-filename-1.1.1.tgz",
+      "integrity": "sha1-HWl2k2mtoFgxA6HmrodoG1ZXMjA=",
       "dev": true,
       "requires": {
         "unique-slug": "^2.0.0"
@@ -17584,8 +18200,8 @@
     },
     "unique-slug": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "resolved": "https://registry.npm.taobao.org/unique-slug/download/unique-slug-2.0.2.tgz",
+      "integrity": "sha1-uqvOkQg/xk6UWw861hPiZPfNTmw=",
       "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4"
@@ -17656,9 +18272,9 @@
       "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c="
     },
     "upath": {
-      "version": "1.1.2",
-      "resolved": "http://registry.npm.taobao.org/upath/download/upath-1.1.2.tgz",
-      "integrity": "sha1-PbZYYA7a7sy+bbXmhNZ+6MKs0Gg="
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/upath/download/upath-1.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fupath%2Fdownload%2Fupath-1.2.0.tgz",
+      "integrity": "sha1-j2bbzVWog6za5ECK+LA1pQRMGJQ="
     },
     "update-notifier": {
       "version": "2.5.0",
@@ -17689,11 +18305,6 @@
         }
       }
     },
-    "upper-case": {
-      "version": "1.1.3",
-      "resolved": "http://registry.npm.taobao.org/upper-case/download/upper-case-1.1.3.tgz",
-      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg="
-    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz",
@@ -17739,11 +18350,11 @@
       }
     },
     "url-parse": {
-      "version": "1.4.6",
-      "resolved": "http://registry.npm.taobao.org/url-parse/download/url-parse-1.4.6.tgz",
-      "integrity": "sha1-uvkdbmeDyKeV60dokv/vJzf8BFY=",
+      "version": "1.4.7",
+      "resolved": "https://registry.npm.taobao.org/url-parse/download/url-parse-1.4.7.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furl-parse%2Fdownload%2Furl-parse-1.4.7.tgz",
+      "integrity": "sha1-qKg1NejACjFuQDpdtKwbm4U64ng=",
       "requires": {
-        "querystringify": "^2.0.0",
+        "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
       }
     },
@@ -17764,8 +18375,17 @@
       "version": "0.11.1",
       "resolved": "http://registry.npm.taobao.org/util/download/util-0.11.1.tgz",
       "integrity": "sha1-MjZzNyDsZLsn9uJvQhqqLhtYjWE=",
+      "dev": true,
       "requires": {
         "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
       }
     },
     "util-deprecate": {
@@ -17773,6 +18393,15 @@
       "resolved": "http://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
+    "util.promisify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/util.promisify/download/util.promisify-1.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Futil.promisify%2Fdownload%2Futil.promisify-1.0.0.tgz",
+      "integrity": "sha1-RA9xZaRZyaFtwUXrjnLzVocJcDA=",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
     "utila": {
       "version": "0.4.0",
       "resolved": "http://registry.npm.taobao.org/utila/download/utila-0.4.0.tgz",
@@ -17788,6 +18417,11 @@
       "resolved": "http://registry.npm.taobao.org/uuid/download/uuid-3.3.2.tgz",
       "integrity": "sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE="
     },
+    "v8-compile-cache": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npm.taobao.org/v8-compile-cache/download/v8-compile-cache-2.0.3.tgz",
+      "integrity": "sha1-APdJTSritojP4omd9u0sVL75Hb4="
+    },
     "validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "http://registry.npm.taobao.org/validate-npm-package-license/download/validate-npm-package-license-3.0.4.tgz",
@@ -17797,25 +18431,15 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "value-equal": {
-      "version": "0.4.0",
-      "resolved": "http://registry.npm.taobao.org/value-equal/download/value-equal-0.4.0.tgz",
-      "integrity": "sha1-xb3S9U7gk8BIOdcc4uR1imiQq8c="
-    },
     "vary": {
       "version": "1.1.2",
       "resolved": "http://registry.npm.taobao.org/vary/download/vary-1.1.2.tgz",
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
     },
-    "vendors": {
-      "version": "1.0.2",
-      "resolved": "http://registry.npm.taobao.org/vendors/download/vendors-1.0.2.tgz",
-      "integrity": "sha1-f8te759WI7FWvOqJ7DfWNnbyGAE="
-    },
     "venn.js": {
       "version": "0.2.20",
-      "resolved": "https://registry.npmjs.org/venn.js/-/venn.js-0.2.20.tgz",
-      "integrity": "sha512-bb5SYq/wamY9fvcuErb9a0FJkgIFHJjkLZWonQ+DoKKuDX3WPH2B4ouI1ce4K2iejBklQy6r1ly8nOGIyOCO6w==",
+      "resolved": "https://registry.npm.taobao.org/venn.js/download/venn.js-0.2.20.tgz",
+      "integrity": "sha1-Pw5QzHXLofWGkqijL2e9eq8apvo=",
       "requires": {
         "d3-selection": "^1.0.2",
         "d3-transition": "^1.0.1",
@@ -17833,11 +18457,32 @@
       }
     },
     "vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "http://registry.npm.taobao.org/vm-browserify/download/vm-browserify-0.0.4.tgz",
-      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz",
+      "integrity": "sha1-eGQcSIuObKkadfUR56OzKobl3aA=",
+      "dev": true
+    },
+    "w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/w3c-hr-time/download/w3c-hr-time-1.0.2.tgz?cache=0&sync_timestamp=1583455604765&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fw3c-hr-time%2Fdownload%2Fw3c-hr-time-1.0.2.tgz",
+      "integrity": "sha1-ConN9cwVgi35w2BUNnaWPgzDCM0=",
       "requires": {
-        "indexof": "0.0.1"
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "w3c-xmlserializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/w3c-xmlserializer/download/w3c-xmlserializer-2.0.0.tgz",
+      "integrity": "sha1-PnEEoFt1FGzGD1ZDgLf2g6zxAgo=",
+      "requires": {
+        "xml-name-validator": "^3.0.0"
+      },
+      "dependencies": {
+        "xml-name-validator": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/xml-name-validator/download/xml-name-validator-3.0.0.tgz",
+          "integrity": "sha1-auc+Bt5NjG5H+fsYH3jWSK1FfGo="
+        }
       }
     },
     "walker": {
@@ -17862,11 +18507,12 @@
       "integrity": "sha1-d3mLLaD5kQ1ZXxrOWwwiWFIfIdw="
     },
     "watchpack": {
-      "version": "1.6.0",
-      "resolved": "http://registry.npm.taobao.org/watchpack/download/watchpack-1.6.0.tgz",
-      "integrity": "sha1-S8EsLr6KonenHx0/FNaFx7RGzQA=",
+      "version": "1.6.1",
+      "resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.6.1.tgz",
+      "integrity": "sha1-KA2gqHGFkhdAEMB4x1hadM2M0OI=",
+      "dev": true,
       "requires": {
-        "chokidar": "^2.0.2",
+        "chokidar": "^2.1.8",
         "graceful-fs": "^4.1.2",
         "neo-async": "^2.5.0"
       }
@@ -17885,158 +18531,454 @@
       "integrity": "sha1-qFWYCx8LazWbodXZ+zmulB+qY60="
     },
     "webpack": {
-      "version": "3.8.1",
-      "resolved": "http://registry.npm.taobao.org/webpack/download/webpack-3.8.1.tgz",
-      "integrity": "sha1-sWloqBEAq+YWCLAVPJFZ74uyvYM=",
+      "version": "4.42.1",
+      "resolved": "https://registry.npm.taobao.org/webpack/download/webpack-4.42.1.tgz",
+      "integrity": "sha1-rnB7rwkfXKPvnDi4hCh8/o8Zg+8=",
+      "dev": true,
       "requires": {
-        "acorn": "^5.0.0",
-        "acorn-dynamic-import": "^2.0.0",
-        "ajv": "^5.1.5",
-        "ajv-keywords": "^2.0.0",
-        "async": "^2.1.2",
-        "enhanced-resolve": "^3.4.0",
-        "escope": "^3.6.0",
-        "interpret": "^1.0.0",
-        "json-loader": "^0.5.4",
-        "json5": "^0.5.1",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "mkdirp": "~0.5.0",
-        "node-libs-browser": "^2.0.0",
-        "source-map": "^0.5.3",
-        "supports-color": "^4.2.1",
-        "tapable": "^0.2.7",
-        "uglifyjs-webpack-plugin": "^0.4.6",
-        "watchpack": "^1.4.0",
-        "webpack-sources": "^1.0.1",
-        "yargs": "^8.0.2"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/wasm-edit": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "acorn": "^6.2.1",
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.3",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.4.0",
+        "loader-utils": "^1.2.3",
+        "memory-fs": "^0.4.1",
+        "micromatch": "^3.1.10",
+        "mkdirp": "^0.5.3",
+        "neo-async": "^2.6.1",
+        "node-libs-browser": "^2.2.1",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.3",
+        "terser-webpack-plugin": "^1.4.3",
+        "watchpack": "^1.6.0",
+        "webpack-sources": "^1.4.1"
       },
       "dependencies": {
+        "acorn": {
+          "version": "6.4.1",
+          "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-6.4.1.tgz?cache=0&sync_timestamp=1583796606796&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-6.4.1.tgz",
+          "integrity": "sha1-Ux5Yuj9RudrLmmZGyk3r9bFMpHQ=",
+          "dev": true
+        },
+        "ajv": {
+          "version": "6.12.0",
+          "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.0.tgz?cache=0&sync_timestamp=1582379612319&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.0.tgz",
+          "integrity": "sha1-BtYLlth7hFSlrauobnhU2mKdtLc=",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
         "ajv-keywords": {
-          "version": "2.1.1",
-          "resolved": "http://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-2.1.1.tgz",
-          "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I="
+          "version": "3.4.1",
+          "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.4.1.tgz",
+          "integrity": "sha1-75FuJxxkrBIXH9g4TqrmsjRYVNo=",
+          "dev": true
         },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/arr-diff/download/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npm.taobao.org/array-unique/download/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
         },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "http://registry.npm.taobao.org/load-json-file/download/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npm.taobao.org/braces/download/braces-2.3.2.tgz",
+          "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=",
+          "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
-        "os-locale": {
-          "version": "2.1.0",
-          "resolved": "http://registry.npm.taobao.org/os-locale/download/os-locale-2.1.0.tgz",
-          "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=",
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+          "dev": true,
           "requires": {
-            "execa": "^0.7.0",
-            "lcid": "^1.0.0",
-            "mem": "^1.1.0"
+            "ms": "2.0.0"
           }
         },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "http://registry.npm.taobao.org/path-type/download/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
+          "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+          "dev": true,
           "requires": {
-            "pify": "^2.0.0"
+            "is-descriptor": "^1.0.2",
+            "isobject": "^3.0.1"
           }
         },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "http://registry.npm.taobao.org/read-pkg/download/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+        "eslint-scope": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npm.taobao.org/eslint-scope/download/eslint-scope-4.0.3.tgz",
+          "integrity": "sha1-ygODMxD2iJoyZHgaqC5j65z+eEg=",
+          "dev": true,
           "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
           }
         },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "http://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npm.taobao.org/expand-brackets/download/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
           "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "dev": true,
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "dev": true,
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "dev": true,
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "dev": true,
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-0.1.6.tgz",
+              "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz",
+              "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
+              "dev": true
+            }
           }
         },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz",
+              "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+              "dev": true,
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            }
+          }
         },
-        "strip-bom": {
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npm.taobao.org/extglob/download/extglob-2.0.4.tgz",
+          "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=",
+          "dev": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npm.taobao.org/define-property/download/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fast-deep-equal": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha1-VFFFB3xQFJHjOxXsQIwpQ3bpSuQ=",
+          "dev": true
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-number": {
           "version": "3.0.0",
-          "resolved": "http://registry.npm.taobao.org/strip-bom/download/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-        },
-        "supports-color": {
-          "version": "4.5.0",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
           "requires": {
-            "has-flag": "^2.0.0"
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
-        "which-module": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
+          "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npm.taobao.org/micromatch/download/micromatch-3.1.10.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmicromatch%2Fdownload%2Fmicromatch-3.1.10.tgz",
+          "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz",
+          "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npm.taobao.org/mkdirp/download/mkdirp-0.5.5.tgz",
+          "integrity": "sha1-2Rzv1i0UNsoPQWIOJRKI1CAJne8=",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "ms": {
           "version": "2.0.0",
-          "resolved": "http://registry.npm.taobao.org/which-module/download/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         },
-        "yargs": {
-          "version": "8.0.2",
-          "resolved": "http://registry.npm.taobao.org/yargs/download/yargs-8.0.2.tgz",
-          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+        "neo-async": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npm.taobao.org/neo-async/download/neo-async-2.6.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fneo-async%2Fdownload%2Fneo-async-2.6.1.tgz",
+          "integrity": "sha1-rCetpmFn+ohJpq3dg39rGJrSCBw=",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz",
+          "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=",
+          "dev": true,
           "requires": {
-            "camelcase": "^4.1.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
-            "read-pkg-up": "^2.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^7.0.0"
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
           }
         },
-        "yargs-parser": {
-          "version": "7.0.0",
-          "resolved": "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-7.0.0.tgz",
-          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+        "webpack-sources": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.4.3.tgz",
+          "integrity": "sha1-7t2OwLko+/HL/plOItLYkPMwqTM=",
+          "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
           }
         }
       }
     },
     "webpack-bundle-analyzer": {
-      "version": "3.3.2",
-      "resolved": "http://registry.npm.taobao.org/webpack-bundle-analyzer/download/webpack-bundle-analyzer-3.3.2.tgz",
-      "integrity": "sha1-PaczqQD1FZFOcp/OvNTEDd5x/G8=",
+      "version": "3.7.0",
+      "resolved": "https://registry.npm.taobao.org/webpack-bundle-analyzer/download/webpack-bundle-analyzer-3.7.0.tgz?cache=0&sync_timestamp=1586846559504&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-bundle-analyzer%2Fdownload%2Fwebpack-bundle-analyzer-3.7.0.tgz",
+      "integrity": "sha1-hNpDTolEKJm4hNmtOORm0NsCpW8=",
       "dev": true,
       "requires": {
-        "acorn": "^6.0.7",
-        "acorn-walk": "^6.1.1",
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1",
         "bfj": "^6.1.1",
         "chalk": "^2.4.1",
         "commander": "^2.18.0",
@@ -18044,16 +18986,16 @@
         "express": "^4.16.3",
         "filesize": "^3.6.1",
         "gzip-size": "^5.0.0",
-        "lodash": "^4.17.10",
+        "lodash": "^4.17.15",
         "mkdirp": "^0.5.1",
         "opener": "^1.5.1",
         "ws": "^6.0.0"
       },
       "dependencies": {
         "acorn": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
+          "version": "7.1.1",
+          "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-7.1.1.tgz?cache=0&sync_timestamp=1583796606796&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-7.1.1.tgz",
+          "integrity": "sha1-41Zo3gtALzWd5RXFSCoaufiaab8=",
           "dev": true
         },
         "chalk": {
@@ -18066,106 +19008,582 @@
             "escape-string-regexp": "^1.0.5",
             "supports-color": "^5.3.0"
           }
+        }
+      }
+    },
+    "webpack-cli": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npm.taobao.org/webpack-cli/download/webpack-cli-3.3.11.tgz",
+      "integrity": "sha1-O/IYib9Ze12Cw48hUTWkEe39xjE=",
+      "requires": {
+        "chalk": "2.4.2",
+        "cross-spawn": "6.0.5",
+        "enhanced-resolve": "4.1.0",
+        "findup-sync": "3.0.0",
+        "global-modules": "2.0.0",
+        "import-local": "2.0.0",
+        "interpret": "1.2.0",
+        "loader-utils": "1.2.3",
+        "supports-color": "6.1.0",
+        "v8-compile-cache": "2.0.3",
+        "yargs": "13.2.4"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-4.1.0.tgz",
+          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc="
         },
-        "filesize": {
-          "version": "3.6.1",
-          "resolved": "http://registry.npm.taobao.org/filesize/download/filesize-3.6.1.tgz",
-          "integrity": "sha1-CQuz7gG2+AGoqL6Z0xcQs0Irsxc=",
-          "dev": true
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz",
+          "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA="
         },
-        "gzip-size": {
-          "version": "5.0.0",
-          "resolved": "http://registry.npm.taobao.org/gzip-size/download/gzip-size-5.0.0.tgz",
-          "integrity": "sha1-pV7NmSIvTEj9jAHGJc47NJ0KDoA=",
-          "dev": true,
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
           "requires": {
-            "duplexer": "^0.1.1",
-            "pify": "^3.0.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
+              "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
           }
         },
-        "pify": {
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-5.0.0.tgz?cache=0&sync_timestamp=1573942320052&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-5.0.0.tgz",
+          "integrity": "sha1-3u/P2y6AB4SqNPRvoI4GhRx7u8U=",
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          }
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz",
+          "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npm.taobao.org/emoji-regex/download/emoji-regex-7.0.3.tgz",
+          "integrity": "sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY="
+        },
+        "enhanced-resolve": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-4.1.0.tgz?cache=0&sync_timestamp=1572991764265&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-4.1.0.tgz",
+          "integrity": "sha1-Qcfgv9/nSsH/4eV61qXGyfN0Kn8=",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "memory-fs": "^0.4.0",
+            "tapable": "^1.0.0"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/execa/download/execa-1.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fexeca%2Fdownload%2Fexeca-1.0.0.tgz",
+          "integrity": "sha1-xiNqW7TfbW8V6I5/AXeYIWdJ3dg=",
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "find-up": {
           "version": "3.0.0",
-          "resolved": "http://registry.npm.taobao.org/pify/download/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
+          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz",
+          "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=",
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "invert-kv": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/invert-kv/download/invert-kv-2.0.0.tgz",
+          "integrity": "sha1-c5P1r6Weyf9fZ6J2INEcIm4+7AI="
+        },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/lcid/download/lcid-2.0.0.tgz",
+          "integrity": "sha1-bvXS32DlL4LrIopMNz6NHzlyU88=",
+          "requires": {
+            "invert-kv": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz",
+          "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npm.taobao.org/os-locale/download/os-locale-3.1.0.tgz?cache=0&sync_timestamp=1584865484693&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fos-locale%2Fdownload%2Fos-locale-3.1.0.tgz",
+          "integrity": "sha1-qAKm7hfyTBBIOrmTVxnO9O0Wvxo=",
+          "requires": {
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npm.taobao.org/p-limit/download/p-limit-2.3.0.tgz",
+          "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz",
+          "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=",
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npm.taobao.org/p-try/download/p-try-2.2.0.tgz",
+          "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY="
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/require-main-filename/download/require-main-filename-2.0.0.tgz",
+          "integrity": "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs="
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-3.1.0.tgz",
+          "integrity": "sha1-InZ74htirxCBV0MG9prFG2IgOWE=",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz",
+          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/which-module/download/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+        },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha1-H9H2cjXVttD+54EFYAG/tpTAOwk=",
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          }
+        },
+        "y18n": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/y18n/download/y18n-4.0.0.tgz",
+          "integrity": "sha1-le+U+F7MgdAHwmThkKEg8KPIVms="
+        },
+        "yargs": {
+          "version": "13.2.4",
+          "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-13.2.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-13.2.4.tgz",
+          "integrity": "sha1-C1YreUAW65ZRuYvTes82SqXW3IM=",
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "os-locale": "^3.1.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "13.1.2",
+          "resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-13.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-13.1.2.tgz",
+          "integrity": "sha1-Ew8JcC667vJlDVTObj5XBvek+zg=",
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
         }
       }
     },
     "webpack-dev-middleware": {
-      "version": "1.12.2",
-      "resolved": "http://registry.npm.taobao.org/webpack-dev-middleware/download/webpack-dev-middleware-1.12.2.tgz",
-      "integrity": "sha1-+PwRIM47T8VoDO7LQ9d3lmshEF4=",
+      "version": "3.7.2",
+      "resolved": "https://registry.npm.taobao.org/webpack-dev-middleware/download/webpack-dev-middleware-3.7.2.tgz?cache=0&sync_timestamp=1582191620751&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-dev-middleware%2Fdownload%2Fwebpack-dev-middleware-3.7.2.tgz",
+      "integrity": "sha1-ABnD23FuP6XOy/ZPKriKdLqzMfM=",
       "requires": {
-        "memory-fs": "~0.4.1",
-        "mime": "^1.5.0",
-        "path-is-absolute": "^1.0.0",
-        "range-parser": "^1.0.3",
-        "time-stamp": "^2.0.0"
+        "memory-fs": "^0.4.1",
+        "mime": "^2.4.4",
+        "mkdirp": "^0.5.1",
+        "range-parser": "^1.2.1",
+        "webpack-log": "^2.0.0"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "2.4.4",
+          "resolved": "https://registry.npm.taobao.org/mime/download/mime-2.4.4.tgz",
+          "integrity": "sha1-vXuRE1/GsBzePpuuM9ZZtj2IV+U="
+        },
+        "range-parser": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.1.tgz",
+          "integrity": "sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE="
+        }
       }
     },
     "webpack-dev-server": {
-      "version": "2.9.4",
-      "resolved": "http://registry.npm.taobao.org/webpack-dev-server/download/webpack-dev-server-2.9.4.tgz",
-      "integrity": "sha1-eIPmF1nGpLM+mxnsQDe9SrYUKNE=",
+      "version": "3.10.3",
+      "resolved": "https://registry.npm.taobao.org/webpack-dev-server/download/webpack-dev-server-3.10.3.tgz",
+      "integrity": "sha1-81lFA2gT5X71gsJCDve0cOFNOvA=",
       "requires": {
         "ansi-html": "0.0.7",
-        "array-includes": "^3.0.3",
         "bonjour": "^3.5.0",
-        "chokidar": "^1.6.0",
-        "compression": "^1.5.2",
-        "connect-history-api-fallback": "^1.3.0",
-        "debug": "^3.1.0",
-        "del": "^3.0.0",
-        "express": "^4.13.3",
-        "html-entities": "^1.2.0",
-        "http-proxy-middleware": "~0.17.4",
-        "import-local": "^0.1.1",
-        "internal-ip": "1.2.0",
+        "chokidar": "^2.1.8",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^1.6.0",
+        "debug": "^4.1.1",
+        "del": "^4.1.1",
+        "express": "^4.17.1",
+        "html-entities": "^1.2.1",
+        "http-proxy-middleware": "0.19.1",
+        "import-local": "^2.0.0",
+        "internal-ip": "^4.3.0",
         "ip": "^1.1.5",
-        "killable": "^1.0.0",
-        "loglevel": "^1.4.1",
-        "opn": "^5.1.0",
-        "portfinder": "^1.0.9",
-        "selfsigned": "^1.9.1",
-        "serve-index": "^1.7.2",
-        "sockjs": "0.3.18",
-        "sockjs-client": "1.1.4",
-        "spdy": "^3.4.1",
+        "is-absolute-url": "^3.0.3",
+        "killable": "^1.0.1",
+        "loglevel": "^1.6.6",
+        "opn": "^5.5.0",
+        "p-retry": "^3.0.1",
+        "portfinder": "^1.0.25",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.10.7",
+        "semver": "^6.3.0",
+        "serve-index": "^1.9.1",
+        "sockjs": "0.3.19",
+        "sockjs-client": "1.4.0",
+        "spdy": "^4.0.1",
         "strip-ansi": "^3.0.1",
-        "supports-color": "^4.2.1",
-        "webpack-dev-middleware": "^1.11.0",
-        "yargs": "^6.6.0"
+        "supports-color": "^6.1.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "^3.7.2",
+        "webpack-log": "^2.0.0",
+        "ws": "^6.2.1",
+        "yargs": "12.0.5"
       },
       "dependencies": {
-        "chokidar": {
-          "version": "1.7.0",
-          "resolved": "http://registry.npm.taobao.org/chokidar/download/chokidar-1.7.0.tgz",
-          "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+        "accepts": {
+          "version": "1.3.7",
+          "resolved": "https://registry.npm.taobao.org/accepts/download/accepts-1.3.7.tgz",
+          "integrity": "sha1-UxvHJlF6OytB+FACHGzBXqq1B80=",
           "requires": {
-            "anymatch": "^1.3.0",
-            "async-each": "^1.0.0",
-            "fsevents": "^1.0.0",
-            "glob-parent": "^2.0.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^2.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0"
+            "mime-types": "~2.1.24",
+            "negotiator": "0.6.2"
+          }
+        },
+        "ajv": {
+          "version": "6.12.2",
+          "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.2.tgz?cache=0&sync_timestamp=1587338610933&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.2.tgz",
+          "integrity": "sha1-xinF7O0XuvMUQ3kY0tqIyZ1ZWM0=",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "array-flatten": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npm.taobao.org/array-flatten/download/array-flatten-1.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Farray-flatten%2Fdownload%2Farray-flatten-1.1.1.tgz",
+          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+        },
+        "body-parser": {
+          "version": "1.19.0",
+          "resolved": "https://registry.npm.taobao.org/body-parser/download/body-parser-1.19.0.tgz",
+          "integrity": "sha1-lrJwnlfJxOCab9Zqj9l5hE9p8Io=",
+          "requires": {
+            "bytes": "3.1.0",
+            "content-type": "~1.0.4",
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "http-errors": "1.7.2",
+            "iconv-lite": "0.4.24",
+            "on-finished": "~2.3.0",
+            "qs": "6.7.0",
+            "raw-body": "2.4.0",
+            "type-is": "~1.6.17"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz",
+              "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+            },
+            "qs": {
+              "version": "6.7.0",
+              "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz",
+              "integrity": "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw="
+            }
+          }
+        },
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npm.taobao.org/bytes/download/bytes-3.1.0.tgz",
+          "integrity": "sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY="
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz",
+          "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA="
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-4.1.0.tgz?cache=0&sync_timestamp=1573942320052&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-4.1.0.tgz",
+          "integrity": "sha1-NIQi2+gtgAswIu709qwQvy5NG0k=",
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "content-disposition": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcontent-disposition%2Fdownload%2Fcontent-disposition-0.5.3.tgz",
+          "integrity": "sha1-4TDK9+cnkIfFYWwgB9BIVpiYT70=",
+          "requires": {
+            "safe-buffer": "5.1.2"
+          }
+        },
+        "cookie": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npm.taobao.org/cookie/download/cookie-0.4.0.tgz",
+          "integrity": "sha1-vrQ35wIrO21JAZ0IhmUwPr6cFLo="
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz",
+          "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "5.7.1",
+              "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz",
+              "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc="
+            }
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.1.1.tgz",
+          "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=",
+          "requires": {
+            "ms": "^2.1.1"
           }
         },
         "del": {
-          "version": "3.0.0",
-          "resolved": "http://registry.npm.taobao.org/del/download/del-3.0.0.tgz",
-          "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+          "version": "4.1.1",
+          "resolved": "https://registry.npm.taobao.org/del/download/del-4.1.1.tgz",
+          "integrity": "sha1-no8RciLqRKMf86FWwEm5kFKp8LQ=",
           "requires": {
+            "@types/glob": "^7.1.1",
             "globby": "^6.1.0",
-            "is-path-cwd": "^1.0.0",
-            "is-path-in-cwd": "^1.0.0",
-            "p-map": "^1.1.1",
-            "pify": "^3.0.0",
-            "rimraf": "^2.2.8"
+            "is-path-cwd": "^2.0.0",
+            "is-path-in-cwd": "^2.0.0",
+            "p-map": "^2.0.0",
+            "pify": "^4.0.1",
+            "rimraf": "^2.6.3"
           }
         },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/execa/download/execa-1.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fexeca%2Fdownload%2Fexeca-1.0.0.tgz",
+          "integrity": "sha1-xiNqW7TfbW8V6I5/AXeYIWdJ3dg=",
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "express": {
+          "version": "4.17.1",
+          "resolved": "https://registry.npm.taobao.org/express/download/express-4.17.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fexpress%2Fdownload%2Fexpress-4.17.1.tgz",
+          "integrity": "sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ=",
+          "requires": {
+            "accepts": "~1.3.7",
+            "array-flatten": "1.1.1",
+            "body-parser": "1.19.0",
+            "content-disposition": "0.5.3",
+            "content-type": "~1.0.4",
+            "cookie": "0.4.0",
+            "cookie-signature": "1.0.6",
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "finalhandler": "~1.1.2",
+            "fresh": "0.5.2",
+            "merge-descriptors": "1.0.1",
+            "methods": "~1.1.2",
+            "on-finished": "~2.3.0",
+            "parseurl": "~1.3.3",
+            "path-to-regexp": "0.1.7",
+            "proxy-addr": "~2.0.5",
+            "qs": "6.7.0",
+            "range-parser": "~1.2.1",
+            "safe-buffer": "5.1.2",
+            "send": "0.17.1",
+            "serve-static": "1.14.1",
+            "setprototypeof": "1.1.1",
+            "statuses": "~1.5.0",
+            "type-is": "~1.6.18",
+            "utils-merge": "1.0.1",
+            "vary": "~1.1.2"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz",
+              "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+            },
+            "qs": {
+              "version": "6.7.0",
+              "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz",
+              "integrity": "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw="
+            }
+          }
+        },
+        "fast-deep-equal": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha1-VFFFB3xQFJHjOxXsQIwpQ3bpSuQ="
+        },
+        "finalhandler": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npm.taobao.org/finalhandler/download/finalhandler-1.1.2.tgz",
+          "integrity": "sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0=",
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "on-finished": "~2.3.0",
+            "parseurl": "~1.3.3",
+            "statuses": "~1.5.0",
+            "unpipe": "~1.0.0"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz",
+              "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+            }
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz",
+          "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=",
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "get-caller-file": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-1.0.3.tgz",
+          "integrity": "sha1-+Xj6TJDR3+f/LWvtoqUV5xO9z0o="
+        },
         "globby": {
           "version": "6.1.0",
           "resolved": "http://registry.npm.taobao.org/globby/download/globby-6.1.0.tgz",
@@ -18185,176 +19603,337 @@
             }
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "http://registry.npm.taobao.org/has-flag/download/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+        "internal-ip": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npm.taobao.org/internal-ip/download/internal-ip-4.3.0.tgz",
+          "integrity": "sha1-hFRSuq2dLKO2nGNaE3rLmg2tCQc=",
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "default-gateway": "^4.2.0",
+            "ipaddr.js": "^1.9.0"
           }
         },
-        "ms": {
+        "invert-kv": {
           "version": "2.0.0",
-          "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "resolved": "https://registry.npm.taobao.org/invert-kv/download/invert-kv-2.0.0.tgz",
+          "integrity": "sha1-c5P1r6Weyf9fZ6J2INEcIm4+7AI="
+        },
+        "ipaddr.js": {
+          "version": "1.9.1",
+          "resolved": "https://registry.npm.taobao.org/ipaddr.js/download/ipaddr.js-1.9.1.tgz",
+          "integrity": "sha1-v/OFQ+64mEglB5/zoqjmy9RngbM="
+        },
+        "is-absolute-url": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npm.taobao.org/is-absolute-url/download/is-absolute-url-3.0.3.tgz?cache=0&sync_timestamp=1569736493122&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-absolute-url%2Fdownload%2Fis-absolute-url-3.0.3.tgz",
+          "integrity": "sha1-lsaiK2ojkpsR6gr7GDbDatSl1pg="
+        },
+        "is-path-cwd": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npm.taobao.org/is-path-cwd/download/is-path-cwd-2.2.0.tgz?cache=0&sync_timestamp=1562347283002&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-path-cwd%2Fdownload%2Fis-path-cwd-2.2.0.tgz",
+          "integrity": "sha1-Z9Q7gmZKe1GR/ZEZEn6zAASKn9s="
+        },
+        "is-path-in-cwd": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npm.taobao.org/is-path-in-cwd/download/is-path-in-cwd-2.1.0.tgz",
+          "integrity": "sha1-v+Lcomxp85cmWkAJljYCk1oFOss=",
+          "requires": {
+            "is-path-inside": "^2.1.0"
+          }
+        },
+        "is-path-inside": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npm.taobao.org/is-path-inside/download/is-path-inside-2.1.0.tgz",
+          "integrity": "sha1-fJgQWH1lmkDSe8201WFuqwWUlLI=",
+          "requires": {
+            "path-is-inside": "^1.0.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA="
+        },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/lcid/download/lcid-2.0.0.tgz",
+          "integrity": "sha1-bvXS32DlL4LrIopMNz6NHzlyU88=",
+          "requires": {
+            "invert-kv": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz",
+          "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "loglevel": {
+          "version": "1.6.8",
+          "resolved": "https://registry.npm.taobao.org/loglevel/download/loglevel-1.6.8.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floglevel%2Fdownload%2Floglevel-1.6.8.tgz",
+          "integrity": "sha1-iiX7ddCSIw7NRFcnDYC1TigBEXE="
+        },
+        "mime-db": {
+          "version": "1.43.0",
+          "resolved": "https://registry.npm.taobao.org/mime-db/download/mime-db-1.43.0.tgz",
+          "integrity": "sha1-ChLgUCZQ5HPXNVNQUOfI9OtPrlg="
+        },
+        "mime-types": {
+          "version": "2.1.26",
+          "resolved": "https://registry.npm.taobao.org/mime-types/download/mime-types-2.1.26.tgz?cache=0&sync_timestamp=1578282585871&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime-types%2Fdownload%2Fmime-types-2.1.26.tgz",
+          "integrity": "sha1-nJIfwJt+FJpl39wNpNIJlyALCgY=",
+          "requires": {
+            "mime-db": "1.43.0"
+          }
+        },
+        "negotiator": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npm.taobao.org/negotiator/download/negotiator-0.6.2.tgz",
+          "integrity": "sha1-/qz3zPUlp3rpY0Q2pkiD/+yjRvs="
+        },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npm.taobao.org/os-locale/download/os-locale-3.1.0.tgz?cache=0&sync_timestamp=1584865484693&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fos-locale%2Fdownload%2Fos-locale-3.1.0.tgz",
+          "integrity": "sha1-qAKm7hfyTBBIOrmTVxnO9O0Wvxo=",
+          "requires": {
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npm.taobao.org/p-limit/download/p-limit-2.3.0.tgz",
+          "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz",
+          "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=",
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-map": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npm.taobao.org/p-map/download/p-map-2.1.0.tgz",
+          "integrity": "sha1-MQko/u+cnsxltosXaTAYpmXOoXU="
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npm.taobao.org/p-try/download/p-try-2.2.0.tgz",
+          "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY="
+        },
+        "parseurl": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz",
+          "integrity": "sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ="
+        },
+        "path-to-regexp": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-0.1.7.tgz",
+          "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
         },
         "pify": {
-          "version": "3.0.0",
-          "resolved": "http://registry.npm.taobao.org/pify/download/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+          "version": "4.0.1",
+          "resolved": "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz",
+          "integrity": "sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE="
         },
-        "sockjs-client": {
-          "version": "1.1.4",
-          "resolved": "http://registry.npm.taobao.org/sockjs-client/download/sockjs-client-1.1.4.tgz",
-          "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=",
+        "proxy-addr": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npm.taobao.org/proxy-addr/download/proxy-addr-2.0.6.tgz",
+          "integrity": "sha1-/cIzZQVEfT8vLGOO0nLK9hS7sr8=",
           "requires": {
-            "debug": "^2.6.6",
-            "eventsource": "0.1.6",
-            "faye-websocket": "~0.11.0",
-            "inherits": "^2.0.1",
-            "json3": "^3.3.2",
-            "url-parse": "^1.1.8"
+            "forwarded": "~0.1.2",
+            "ipaddr.js": "1.9.1"
+          }
+        },
+        "range-parser": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.1.tgz",
+          "integrity": "sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE="
+        },
+        "raw-body": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npm.taobao.org/raw-body/download/raw-body-2.4.0.tgz",
+          "integrity": "sha1-oc5vucm8NWylLoklarWQWeE9AzI=",
+          "requires": {
+            "bytes": "3.1.0",
+            "http-errors": "1.7.2",
+            "iconv-lite": "0.4.24",
+            "unpipe": "1.0.0"
+          }
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz?cache=0&sync_timestamp=1587138145115&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-1.0.0.tgz",
+          "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=",
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz",
+          "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0="
+        },
+        "send": {
+          "version": "0.17.1",
+          "resolved": "https://registry.npm.taobao.org/send/download/send-0.17.1.tgz",
+          "integrity": "sha1-wdiwWfeQD3Rm3Uk4vcROEd2zdsg=",
+          "requires": {
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "destroy": "~1.0.4",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "~1.7.2",
+            "mime": "1.6.0",
+            "ms": "2.1.1",
+            "on-finished": "~2.3.0",
+            "range-parser": "~1.2.1",
+            "statuses": "~1.5.0"
           },
           "dependencies": {
             "debug": {
               "version": "2.6.9",
-              "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
+              "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz",
               "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
               "requires": {
                 "ms": "2.0.0"
+              },
+              "dependencies": {
+                "ms": {
+                  "version": "2.0.0",
+                  "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
+                  "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+                }
               }
             }
           }
         },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "http://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+        "serve-static": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npm.taobao.org/serve-static/download/serve-static-1.14.1.tgz",
+          "integrity": "sha1-Zm5jbcTwEPfvKZcKiKZ0MgiYsvk=",
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "parseurl": "~1.3.3",
+            "send": "0.17.1"
           }
         },
+        "setprototypeof": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.1.tgz?cache=0&sync_timestamp=1563425414995&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsetprototypeof%2Fdownload%2Fsetprototypeof-1.1.1.tgz",
+          "integrity": "sha1-fpWsskqpL1iF4KvvW6ExMw1K5oM="
+        },
+        "statuses": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz?cache=0&sync_timestamp=1587328859420&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstatuses%2Fdownload%2Fstatuses-1.5.0.tgz",
+          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+        },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "6.1.0",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
           "requires": {
-            "has-flag": "^2.0.0"
+            "has-flag": "^3.0.0"
           }
         },
-        "yargs": {
-          "version": "6.6.0",
-          "resolved": "http://registry.npm.taobao.org/yargs/download/yargs-6.6.0.tgz",
-          "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
+        "type-is": {
+          "version": "1.6.18",
+          "resolved": "https://registry.npm.taobao.org/type-is/download/type-is-1.6.18.tgz",
+          "integrity": "sha1-TlUs0F3wlGfcvE73Od6J8s83wTE=",
           "requires": {
-            "camelcase": "^3.0.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
+            "media-typer": "0.3.0",
+            "mime-types": "~2.1.24"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/which-module/download/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+        },
+        "yargs": {
+          "version": "12.0.5",
+          "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-12.0.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-12.0.5.tgz",
+          "integrity": "sha1-BfWZe2CWR7ZPZrgeO0sQo2jnrRM=",
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
             "get-caller-file": "^1.0.1",
-            "os-locale": "^1.4.0",
-            "read-pkg-up": "^1.0.1",
+            "os-locale": "^3.0.0",
             "require-directory": "^2.1.1",
             "require-main-filename": "^1.0.1",
             "set-blocking": "^2.0.0",
-            "string-width": "^1.0.2",
-            "which-module": "^1.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^4.2.0"
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^11.1.1"
           }
         },
         "yargs-parser": {
-          "version": "4.2.1",
-          "resolved": "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-4.2.1.tgz",
-          "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
+          "version": "11.1.1",
+          "resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-11.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-11.1.1.tgz",
+          "integrity": "sha1-h5oIZZc7yp9rq1y987HGfsfTvPQ=",
           "requires": {
-            "camelcase": "^3.0.0"
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
     },
+    "webpack-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/webpack-log/download/webpack-log-2.0.0.tgz",
+      "integrity": "sha1-W3ko4GN1k/EZ0y9iJ8HgrDHhtH8=",
+      "requires": {
+        "ansi-colors": "^3.0.0",
+        "uuid": "^3.3.2"
+      }
+    },
     "webpack-manifest-plugin": {
-      "version": "1.3.2",
-      "resolved": "http://registry.npm.taobao.org/webpack-manifest-plugin/download/webpack-manifest-plugin-1.3.2.tgz",
-      "integrity": "sha1-XqjuV1Y1ndwdmIFDJP5DSWNJp9Q=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npm.taobao.org/webpack-manifest-plugin/download/webpack-manifest-plugin-2.2.0.tgz?cache=0&sync_timestamp=1571924873147&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-manifest-plugin%2Fdownload%2Fwebpack-manifest-plugin-2.2.0.tgz",
+      "integrity": "sha1-GcpptDWwuux+KfvpD7QBXeLeTxY=",
       "requires": {
-        "fs-extra": "^0.30.0",
-        "lodash": ">=3.5 <5"
+        "fs-extra": "^7.0.0",
+        "lodash": ">=3.5 <5",
+        "object.entries": "^1.1.0",
+        "tapable": "^1.0.0"
       },
       "dependencies": {
         "fs-extra": {
-          "version": "0.30.0",
-          "resolved": "http://registry.npm.taobao.org/fs-extra/download/fs-extra-0.30.0.tgz",
-          "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+          "version": "7.0.1",
+          "resolved": "https://registry.npm.taobao.org/fs-extra/download/fs-extra-7.0.1.tgz",
+          "integrity": "sha1-TxicRKoSO4lfcigE9V6iPq3DSOk=",
           "requires": {
             "graceful-fs": "^4.1.2",
-            "jsonfile": "^2.1.0",
-            "klaw": "^1.0.0",
-            "path-is-absolute": "^1.0.0",
-            "rimraf": "^2.2.8"
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
           }
         },
         "jsonfile": {
-          "version": "2.4.0",
-          "resolved": "http://registry.npm.taobao.org/jsonfile/download/jsonfile-2.4.0.tgz",
-          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
           "requires": {
             "graceful-fs": "^4.1.6"
           }
         }
       }
     },
-    "webpack-parallel-uglify-plugin": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/webpack-parallel-uglify-plugin/-/webpack-parallel-uglify-plugin-1.1.2.tgz",
-      "integrity": "sha512-S+siPmIYTtUk8uY8WYpeBEa/g6E1qlnpn/nsqIvGlYoQcJEhUDEMXADgAdpqGyExzt90Gle98D/1tgMVCzCJgg==",
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "glob": "^7.0.5",
-        "mkdirp": "^0.5.1",
-        "pify": "^3.0.0",
-        "tmp": "0.0.29",
-        "uglify-es": "^3.3.9",
-        "uglify-js": "^3.6.0",
-        "webpack-sources": "^1.0.0",
-        "worker-farm": "^1.3.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-        },
-        "tmp": {
-          "version": "0.0.29",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz",
-          "integrity": "sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=",
-          "requires": {
-            "os-tmpdir": "~1.0.1"
-          }
-        },
-        "uglify-js": {
-          "version": "3.7.7",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.7.tgz",
-          "integrity": "sha512-FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA==",
-          "requires": {
-            "commander": "~2.20.3",
-            "source-map": "~0.6.1"
-          }
-        }
-      }
-    },
     "webpack-sources": {
       "version": "1.3.0",
       "resolved": "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.3.0.tgz",
@@ -18365,11 +19944,12 @@
       }
     },
     "websocket-driver": {
-      "version": "0.7.0",
-      "resolved": "http://registry.npm.taobao.org/websocket-driver/download/websocket-driver-0.7.0.tgz",
-      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+      "version": "0.7.3",
+      "resolved": "https://registry.npm.taobao.org/websocket-driver/download/websocket-driver-0.7.3.tgz",
+      "integrity": "sha1-otTg1PTxFvHmKX66WLBdQwEA6fk=",
       "requires": {
-        "http-parser-js": ">=0.4.0",
+        "http-parser-js": ">=0.4.0 <0.4.11",
+        "safe-buffer": ">=5.1.0",
         "websocket-extensions": ">=0.1.1"
       }
     },
@@ -18378,6 +19958,11 @@
       "resolved": "http://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.3.tgz",
       "integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk="
     },
+    "webworkify": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npm.taobao.org/webworkify/download/webworkify-1.5.0.tgz",
+      "integrity": "sha1-c0rYendN5uvdVG4dPgJ9pbj0pCw="
+    },
     "whatwg-encoding": {
       "version": "1.0.5",
       "resolved": "http://registry.npm.taobao.org/whatwg-encoding/download/whatwg-encoding-1.0.5.tgz",
@@ -18391,6 +19976,11 @@
       "resolved": "http://registry.npm.taobao.org/whatwg-fetch/download/whatwg-fetch-2.0.3.tgz",
       "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
     },
+    "whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npm.taobao.org/whatwg-mimetype/download/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha1-PUseAxLSB5h5+Cav8Y2+7KWWD78="
+    },
     "whatwg-url": {
       "version": "4.8.0",
       "resolved": "http://registry.npm.taobao.org/whatwg-url/download/whatwg-url-4.8.0.tgz",
@@ -18407,11 +19997,6 @@
         }
       }
     },
-    "whet.extend": {
-      "version": "0.9.9",
-      "resolved": "http://registry.npm.taobao.org/whet.extend/download/whet.extend-0.9.9.tgz",
-      "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE="
-    },
     "which": {
       "version": "1.3.1",
       "resolved": "http://registry.npm.taobao.org/which/download/which-1.3.1.tgz",
@@ -18427,9 +20012,8 @@
     },
     "wide-align": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
+      "resolved": "https://registry.npm.taobao.org/wide-align/download/wide-align-1.1.3.tgz",
+      "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=",
       "requires": {
         "string-width": "^1.0.2 || 2"
       }
@@ -18449,7 +20033,7 @@
     },
     "wolfy87-eventemitter": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/wolfy87-eventemitter/download/wolfy87-eventemitter-5.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwolfy87-eventemitter%2Fdownload%2Fwolfy87-eventemitter-5.1.0.tgz",
       "integrity": "sha1-NcGsDdGsDBXjXZgVCPwiCEoToBE="
     },
     "wordwrap": {
@@ -18465,6 +20049,14 @@
         "errno": "~0.1.7"
       }
     },
+    "worker-rpc": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npm.taobao.org/worker-rpc/download/worker-rpc-0.1.1.tgz",
+      "integrity": "sha1-y1Zb1tcHGo8WZgaGBR6WmtMvVNU=",
+      "requires": {
+        "microevent.ts": "~0.1.1"
+      }
+    },
     "wrap-ansi": {
       "version": "2.1.0",
       "resolved": "http://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-2.1.0.tgz",
@@ -18529,7 +20121,6 @@
       "version": "6.2.1",
       "resolved": "http://registry.npm.taobao.org/ws/download/ws-6.2.1.tgz",
       "integrity": "sha1-RC/fCkftZPWbal2P8TD0dI7VJPs=",
-      "dev": true,
       "requires": {
         "async-limiter": "~1.0.0"
       }
@@ -18544,10 +20135,16 @@
       "resolved": "http://registry.npm.taobao.org/xml-name-validator/download/xml-name-validator-2.0.1.tgz",
       "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU="
     },
+    "xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npm.taobao.org/xmlchars/download/xmlchars-2.2.0.tgz",
+      "integrity": "sha1-Bg/hvLf5x2/ioX24apvDq4lCEMs="
+    },
     "xtend": {
       "version": "4.0.1",
       "resolved": "http://registry.npm.taobao.org/xtend/download/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
     },
     "y18n": {
       "version": "3.2.1",
@@ -18579,6 +20176,11 @@
         "yargs-parser": "^5.0.0"
       },
       "dependencies": {
+        "get-caller-file": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-1.0.3.tgz",
+          "integrity": "sha1-+Xj6TJDR3+f/LWvtoqUV5xO9z0o="
+        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
@@ -18608,9 +20210,9 @@
       }
     },
     "zrender": {
-      "version": "4.0.7",
-      "resolved": "http://registry.npm.taobao.org/zrender/download/zrender-4.0.7.tgz",
-      "integrity": "sha1-Fa6WCCL17+1BCZXTflEH/j3hDm0="
+      "version": "4.3.0",
+      "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.0.tgz",
+      "integrity": "sha1-nwVhIbILuuREFNKHv2oRn/cEJmE="
     }
   }
 }
diff --git a/package.json b/package.json
index 4097410a..7f942c78 100644
--- a/package.json
+++ b/package.json
@@ -3,10 +3,9 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@icedesign/base": "^0.2.5",
     "@monaco-editor/react": "^2.3.0",
     "@novnc/novnc": "^1.1.0",
-    "antd": "^3.23.2",
+    "antd": "^3.26.15",
     "array-flatten": "^2.1.2",
     "autoprefixer": "7.1.6",
     "axios": "^0.18.1",
@@ -17,102 +16,104 @@
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-preset-react-app": "^3.1.1",
     "babel-runtime": "6.26.0",
-    "bizcharts": "^3.5.5",
+    "bizcharts": "^3.5.8",
     "bundle-loader": "^0.5.6",
     "case-sensitive-paths-webpack-plugin": "2.1.1",
     "chalk": "1.1.3",
     "classnames": "^2.2.5",
-    "clipboard": "^2.0.4",
-    "codemirror": "^5.46.0",
+    "clipboard": "^2.0.6",
+    "codemirror": "^5.53.0",
     "connected-react-router": "4.4.1",
-    "css-loader": "0.28.7",
+    "css-loader": "^3.5.2",
     "dotenv": "4.0.0",
     "dotenv-expand": "4.2.0",
-    "echarts": "^4.2.0-rc.2",
+    "echarts": "^4.7.0",
     "editor.md": "^1.5.0",
     "eslint": "4.10.0",
     "eslint-config-react-app": "^2.1.0",
-    "eslint-loader": "1.9.0",
+    "eslint-loader": "^4.0.0",
     "eslint-plugin-flowtype": "2.39.1",
     "eslint-plugin-import": "2.8.0",
     "eslint-plugin-jsx-a11y": "5.1.1",
     "eslint-plugin-react": "7.4.0",
-    "extract-text-webpack-plugin": "3.0.2",
-    "file-loader": "1.1.5",
+    "file-loader": "^6.0.0",
+    "flv.js": "^1.5.0",
     "fs-extra": "3.0.1",
-    "html-webpack-plugin": "2.29.0",
+    "html-webpack-plugin": "^4.0.4",
     "immutability-helper": "^2.6.6",
     "install": "^0.12.2",
     "jest": "20.0.4",
-    "js-base64": "^2.5.1",
+    "js-base64": "^2.5.2",
     "katex": "^0.11.1",
     "lodash": "^4.17.15",
-    "loglevel": "^1.6.1",
+    "loglevel": "^1.6.8",
     "material-ui": "^1.0.0-beta.40",
     "md5": "^2.2.1",
+    "mini-css-extract-plugin": "^0.9.0",
     "moment": "^2.23.0",
-    "monaco-editor": "0.13",
-    "monaco-editor-webpack-plugin": "^1.8.1",
-    "npm": "^6.10.1",
+    "monaco-editor": "^0.20.0",
+    "monaco-editor-webpack-plugin": "^1.9.0",
     "numeral": "^2.0.6",
     "object-assign": "4.1.1",
     "postcss-flexbugs-fixes": "3.2.0",
     "postcss-loader": "2.0.8",
     "promise": "8.0.1",
     "prop-types": "^15.6.1",
-    "qs": "^6.6.0",
+    "qrcode.react": "^1.0.0",
+    "qs": "^6.9.3",
     "quill": "^1.3.7",
     "quill-delta-to-html": "^0.11.0",
     "raf": "3.4.0",
-    "rc-form": "^2.1.7",
-    "rc-pagination": "^1.16.2",
-    "rc-rate": "^2.4.0",
+    "rc-form": "^2.4.11",
+    "rc-pagination": "^1.21.0",
+    "rc-rate": "^2.6.0",
     "rc-select": "^8.0.12",
-    "rc-tree": "^1.7.11",
-    "rc-upload": "^2.5.1",
-    "react": "^16.9.0",
+    "rc-tree": "^1.15.3",
+    "rc-upload": "^2.9.4",
+    "react": "^16.13.1",
+    "react-color": "^2.18.0",
     "react-beautiful-dnd": "^10.0.4",
     "react-codemirror": "^1.0.0",
-    "react-codemirror2": "^6.0.0",
-    "react-color": "^2.18.0",
+    "react-codemirror2": "^6.0.1",
     "react-content-loader": "^3.1.1",
     "react-cookies": "^0.1.1",
-    "react-dev-utils": "^5.0.0",
-    "react-dom": "^16.9.0",
-    "react-hot-loader": "^4.0.0",
+    "react-datepicker": "^2.14.1",
+    "react-dev-utils": "^9.2.0-next.80",
+    "react-dom": "^16.13.1",
+    "react-hot-loader": "^4.12.20",
     "react-infinite-scroller": "^1.2.4",
     "react-loadable": "^5.3.1",
     "react-monaco-editor": "^0.25.1",
-    "react-player": "^1.11.1",
+    "react-player": "^1.15.3",
     "react-redux": "5.0.7",
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
-    "react-split-pane": "^0.1.89",
-    "react-url-query": "^1.4.0",
-    "redux": "^4.0.0",
+    "react-split-pane": "^0.1.91",
+    "react-url-query": "^1.5.0",
+    "react-zmage": "^0.8.5-beta.31",
+    "redux": "^4.0.5",
     "redux-thunk": "2.3.0",
-    "rsuite": "^4.0.1",
-    "sass-loader": "^7.3.1",
-    "scroll-into-view": "^1.12.3",
+    "rsuite": "^4.3.4",
+    "sass-loader": "7.3.1",
+    "scroll-into-view": "^1.14.2",
     "showdown": "^1.9.1",
-    "showdown-katex": "^0.6.0",
-    "source-map-support": "^0.5.16",
+    "showdown-katex": "^0.8.0",
     "store": "^2.0.12",
     "style-loader": "0.19.0",
-    "styled-components": "^4.1.3",
+    "styled-components": "^4.4.1",
     "sw-precache-webpack-plugin": "0.11.4",
     "url-loader": "0.6.2",
-    "webpack": "3.8.1",
-    "webpack-dev-server": "2.9.4",
-    "webpack-manifest-plugin": "1.3.2",
-    "webpack-parallel-uglify-plugin": "^1.1.0",
+    "webpack-cli": "^3.3.11",
+    "webpack-dev-server": "^3.10.3",
+    "webpack-manifest-plugin": "^2.2.0",
     "whatwg-fetch": "2.0.3",
     "wrap-md-editor": "^0.2.20"
   },
   "scripts": {
-    "start": "node --max_old_space_size=20000 scripts/start.js",
-    "build": "node --max_old_space_size=15360 scripts/build.js",
-    "concat": "node scripts/concat.js",
+    "start": "node --max_old_space_size=15360 scripts/start.js",
+    "build": "NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
+    "test-build": "NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
+    "pre-build": "NODE_ENV=preBuild node --max_old_space_size=15360 scripts/build.js",
     "gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json",
     "ana": "webpack-bundle-analyzer ./stats.json",
     "analyze": "npm run build -- --stats && webpack-bundle-analyzer build/bundle-stats.json",
@@ -177,14 +178,19 @@
   "port": "3007",
   "devDependencies": {
     "@babel/runtime": "7.0.0-beta.51",
-    "babel-plugin-import": "^1.11.0",
+    "babel-plugin-import": "^1.13.0",
     "compression-webpack-plugin": "^1.1.12",
     "concat": "^1.0.3",
     "happypack": "^5.0.1",
     "mockjs": "^1.1.0",
     "node-sass": "^4.12.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.3",
+    "purgecss": "^2.1.2",
     "reqwest": "^2.0.5",
-    "webpack-bundle-analyzer": "^3.0.3",
-    "webpack-parallel-uglify-plugin": "^1.1.0"
+    "resize-observer-polyfill": "^1.5.1",
+    "terser-webpack-plugin": "^2.3.5",
+    "uglifyjs-webpack-plugin": "^2.2.0",
+    "webpack": "^4.42.1",
+    "webpack-bundle-analyzer": "^3.7.0"
   }
-}
+}
\ No newline at end of file
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
new file mode 100644
index 00000000..1df0f835
--- /dev/null
+++ b/public/assets/kindeditor/kindeditor.js
@@ -0,0 +1,6272 @@
+//function dump_obj(myObject) {
+//    var s = "";
+//    for (var property in myObject) {
+//        s = s + "\n "+property +": " + myObject[property] ;
+//    }
+//    alert(s)
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2013 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @website http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+* @version 4.1.10 (2013-11-23)
+*******************************************************************************/
+(function (window, undefined) {
+	if (window.KindEditor) {
+		return;
+	}
+if (!window.console) {
+	window.console = {};
+}
+if (!console.log) {
+	console.log = function () {};
+}
+var _VERSION = '4.1.10 (2013-11-23)',
+	_ua = navigator.userAgent.toLowerCase(),
+	_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
+	_NEWIE = _ua.indexOf('msie') == -1 && _ua.indexOf('trident') > -1,
+	_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
+	_WEBKIT = _ua.indexOf('applewebkit') > -1,
+	_OPERA = _ua.indexOf('opera') > -1,
+	_MOBILE = _ua.indexOf('mobile') > -1,
+	_IOS = /ipad|iphone|ipod/.test(_ua),
+	_QUIRKS = document.compatMode != 'CSS1Compat',
+	_IERANGE = !window.getSelection,
+	_matches = /(?:msie|firefox|webkit|opera)[\/:\s](\d+)/.exec(_ua),
+	_V = _matches ? _matches[1] : '0',
+	_TIME = new Date().getTime();
+function _isArray(val) {
+	if (!val) {
+		return false;
+	}
+	return Object.prototype.toString.call(val) === '[object Array]';
+}
+function _isFunction(val) {
+	if (!val) {
+		return false;
+	}
+	return Object.prototype.toString.call(val) === '[object Function]';
+}
+function _inArray(val, arr) {
+	for (var i = 0, len = arr.length; i < len; i++) {
+		if (val === arr[i]) {
+			return i;
+		}
+	}
+	return -1;
+}
+function _each(obj, fn) {
+	if (_isArray(obj)) {
+		for (var i = 0, len = obj.length; i < len; i++) {
+			if (fn.call(obj[i], i, obj[i]) === false) {
+				break;
+			}
+		}
+	} else {
+		for (var key in obj) {
+			if (obj.hasOwnProperty(key)) {
+				if (fn.call(obj[key], key, obj[key]) === false) {
+					break;
+				}
+			}
+		}
+	}
+}
+function _trim(str) {
+	return str.replace(/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g, '');
+}
+function _inString(val, str, delimiter) {
+	delimiter = delimiter === undefined ? ',' : delimiter;
+	return (delimiter + str + delimiter).indexOf(delimiter + val + delimiter) >= 0;
+}
+function _addUnit(val, unit) {
+	unit = unit || 'px';
+	//return val && /^\d+$/.test(val) ? val + unit : val;
+	return val && /^-?\d+(?:\.\d+)?$/.test(val) ? val + unit : val;
+}
+function _removeUnit(val) {
+	var match;
+	return val && (match = /(\d+)/.exec(val)) ? parseInt(match[1], 10) : 0;
+}
+function _escape(val) {
+	return val.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+}
+function _unescape(val) {
+	return val.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&amp;/g, '&');
+}
+function _toCamel(str) {
+	var arr = str.split('-');
+	str = '';
+	_each(arr, function(key, val) {
+		str += (key > 0) ? val.charAt(0).toUpperCase() + val.substr(1) : val;
+	});
+	return str;
+}
+function _toHex(val) {
+	function hex(d) {
+		var s = parseInt(d, 10).toString(16).toUpperCase();
+		return s.length > 1 ? s : '0' + s;
+	}
+	return val.replace(/rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/ig,
+		function($0, $1, $2, $3) {
+			return '#' + hex($1) + hex($2) + hex($3);
+		}
+	);
+}
+function _toMap(val, delimiter) {
+	delimiter = delimiter === undefined ? ',' : delimiter;
+	var map = {}, arr = _isArray(val) ? val : val.split(delimiter), match;
+	_each(arr, function(key, val) {
+		if ((match = /^(\d+)\.\.(\d+)$/.exec(val))) {
+			for (var i = parseInt(match[1], 10); i <= parseInt(match[2], 10); i++) {
+				map[i.toString()] = true;
+			}
+		} else {
+			map[val] = true;
+		}
+	});
+	return map;
+}
+function _toArray(obj, offset) {
+	return Array.prototype.slice.call(obj, offset || 0);
+}
+function _undef(val, defaultVal) {
+	return val === undefined ? defaultVal : val;
+}
+function _invalidUrl(url) {
+	return !url || /[<>"]/.test(url);
+}
+function _addParam(url, param) {
+	return url.indexOf('?') >= 0 ? url + '&' + param : url + '?' + param;
+}
+function _extend(child, parent, proto) {
+	if (!proto) {
+		proto = parent;
+		parent = null;
+	}
+	var childProto;
+	if (parent) {
+		var fn = function () {};
+		fn.prototype = parent.prototype;
+		childProto = new fn();
+		_each(proto, function(key, val) {
+			childProto[key] = val;
+		});
+	} else {
+		childProto = proto;
+	}
+	childProto.constructor = child;
+	child.prototype = childProto;
+	child.parent = parent ? parent.prototype : null;
+}
+function _json(text) {
+	var match;
+	if ((match = /\{[\s\S]*\}|\[[\s\S]*\]/.exec(text))) {
+		text = match[0];
+	}
+	var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+	cx.lastIndex = 0;
+	if (cx.test(text)) {
+		text = text.replace(cx, function (a) {
+			return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+		});
+	}
+	if (/^[\],:{}\s]*$/.
+	test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+	replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+	replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+		return eval('(' + text + ')');
+	}
+	throw 'JSON parse error';
+}
+var _round = Math.round;
+var K = {
+	DEBUG : false,
+	VERSION : _VERSION,
+	IE : _IE,
+	GECKO : _GECKO,
+	WEBKIT : _WEBKIT,
+	OPERA : _OPERA,
+	V : _V,
+	TIME : _TIME,
+	each : _each,
+	isArray : _isArray,
+	isFunction : _isFunction,
+	inArray : _inArray,
+	inString : _inString,
+	trim : _trim,
+	addUnit : _addUnit,
+	removeUnit : _removeUnit,
+	escape : _escape,
+	unescape : _unescape,
+	toCamel : _toCamel,
+	toHex : _toHex,
+	toMap : _toMap,
+	toArray : _toArray,
+	undef : _undef,
+	invalidUrl : _invalidUrl,
+	addParam : _addParam,
+	extend : _extend,
+	json : _json
+};
+var _INLINE_TAG_MAP = _toMap('a,abbr,acronym,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,img,input,ins,kbd,label,map,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'),
+	_BLOCK_TAG_MAP = _toMap('address,applet,blockquote,body,center,dd,dir,div,dl,dt,fieldset,form,frameset,h1,h2,h3,h4,h5,h6,head,hr,html,iframe,ins,isindex,li,map,menu,meta,noframes,noscript,object,ol,p,pre,script,style,table,tbody,td,tfoot,th,thead,title,tr,ul'),
+	_SINGLE_TAG_MAP = _toMap('area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed'),
+	_STYLE_TAG_MAP = _toMap('b,basefont,big,del,em,font,i,s,small,span,strike,strong,sub,sup,u'),
+	_CONTROL_TAG_MAP = _toMap('img,table,input,textarea,button'),
+	_PRE_TAG_MAP = _toMap('pre,style,script'),
+	_NOSPLIT_TAG_MAP = _toMap('html,head,body,td,tr,table,ol,ul,li'),
+	_AUTOCLOSE_TAG_MAP = _toMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'),
+	_FILL_ATTR_MAP = _toMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'),
+	_VALUE_TAG_MAP = _toMap('input,button,textarea,select');
+// Begining of modification by Macrow
+function _getBasePath() {
+	var refPath = '/assets/kindeditor/';
+	var els = document.getElementsByTagName('script'), src;
+	for (var i = 0, len = els.length; i < len; i++) {
+		src = els[i].src || '';
+		if (/(kindeditor|application)[\w\-\.]*\.js/.test(src)) {
+			return src.substring(0, src.indexOf('assets')) + refPath;
+		}
+	}
+	return refPath;
+}
+// End of modification by Macrow
+K.basePath = _getBasePath();
+K.options = {
+    placeholder : '',
+    local_storage_mdu : '',
+    local_storage_id : '',
+	designMode : true,
+	fullscreenMode : false,
+	filterMode : true,
+	wellFormatMode : true,
+	shadowMode : true,
+	loadStyleMode : true,
+	basePath : K.basePath,
+    emotionsBasePath: '', //TODO  http://forge.trustie.net
+	themesPath : K.basePath + 'themes/',
+	langPath : K.basePath + 'lang/',
+	pluginsPath : K.basePath + 'plugins/',
+	themeType : 'default',
+	langType : 'zh_CN',
+	urlType : '',
+	newlineTag : 'p',
+	resizeType : 1,
+	syncType : 'form',
+	pasteType : 2,
+	dialogAlignType : 'page',
+	useContextmenu : true,
+	fullscreenShortcut : false,
+	bodyClass : 'ke-content',
+	indentChar : '\t',
+	cssPath : K.basePath +'plugins/code/previewcode.css',
+	cssData : 'font{color:black;}',
+	minWidth : 650,
+	minHeight : 100,
+	minChangeSize : 1,
+	zIndex : 811213,
+	items : ['code','emoticons','fontname',
+        'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
+		'formatblock', 'fontsize', '|','indent', 'outdent',
+		 '|','imagedirectupload','table',   'media', 'preview',"more"
+	],
+	noDisableItems : ['source', 'fullscreen'],
+	colorTable : [
+		['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
+		['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
+		['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
+		['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
+	],
+	fontSizeTable : ['选中的字体大小:','9px', '10px', '12px', '14px', '16px', '18px', '24px', '32px'],
+	htmlTags : {
+		font : ['id', 'class', 'color', 'size', 'face', '.background-color'],
+		span : [
+			'id', 'class', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.line-height', 'data-user-id'
+		],
+		div : [
+			'id', 'class', 'align', '.border', '.margin', '.padding', '.text-align', '.color',
+			'.background-color', '.font-size', '.font-family', '.font-weight', '.background',
+			'.font-style', '.text-decoration', '.vertical-align', '.margin-left'
+		],
+		table: [
+			'id', 'class', 'border', 'cellspacing', 'cellpadding', 'width', 'height', 'align', 'bordercolor',
+			'.padding', '.margin', '.border','.border-color', 'bgcolor', '.text-align', '.color', '.background-color',
+			'.font-size', '.font-family', '.font-weight', '.font-style', '.text-decoration', '.background',
+			'.width', '.height', '.border-collapse','.table-layout'
+		],
+		'td,th': [
+			'id', 'class', 'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor',
+			'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
+			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border','.border-color', '.text-overflow','.overflow','.white-space'
+		],
+        a : ['id', 'class', 'href', 'target', 'name','data-method','data-remote','rel'],
+        embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+		img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
+		'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
+			'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.text-indent', '.margin-left', '.margin', '.border', '.padding'
+		],
+		pre : ['id', 'class'],
+		hr : ['id', 'class', '.page-break-after'],
+		'br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del' : ['id', 'class'],
+		iframe : ['id', 'class', 'src', 'frameborder', 'width', 'height', '.width', '.height']
+	},
+	layout : '<div class="container"><div class="toolbar"></div><div class="edit"></div><div class="statusbar"></div></div>'
+};
+var _useCapture = false;
+var _INPUT_KEY_MAP = _toMap('8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222');
+var _CURSORMOVE_KEY_MAP = _toMap('33..40');
+var _CHANGE_KEY_MAP = {};
+_each(_INPUT_KEY_MAP, function(key, val) {
+	_CHANGE_KEY_MAP[key] = val;
+});
+_each(_CURSORMOVE_KEY_MAP, function(key, val) {
+	_CHANGE_KEY_MAP[key] = val;
+});
+function _bindEvent(el, type, fn) {
+	if (el.addEventListener){
+		el.addEventListener(type, fn, _useCapture);
+	} else if (el.attachEvent){
+		el.attachEvent('on' + type, fn);
+	}
+}
+function _unbindEvent(el, type, fn) {
+	if (el.removeEventListener){
+		el.removeEventListener(type, fn, _useCapture);
+	} else if (el.detachEvent){
+		el.detachEvent('on' + type, fn);
+	}
+}
+var _EVENT_PROPS = ('altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,' +
+	'data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,' +
+	'pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which').split(',');
+function KEvent(el, event) {
+	this.init(el, event);
+}
+_extend(KEvent, {
+	init : function(el, event) {
+		var self = this, doc = el.ownerDocument || el.document || el;
+		self.event = event;
+		_each(_EVENT_PROPS, function(key, val) {
+			self[val] = event[val];
+		});
+		if (!self.target) {
+			self.target = self.srcElement || doc;
+		}
+		if (self.target.nodeType === 3) {
+			self.target = self.target.parentNode;
+		}
+		if (!self.relatedTarget && self.fromElement) {
+			self.relatedTarget = self.fromElement === self.target ? self.toElement : self.fromElement;
+		}
+		if (self.pageX == null && self.clientX != null) {
+			var d = doc.documentElement, body = doc.body;
+			self.pageX = self.clientX + (d && d.scrollLeft || body && body.scrollLeft || 0) - (d && d.clientLeft || body && body.clientLeft || 0);
+			self.pageY = self.clientY + (d && d.scrollTop  || body && body.scrollTop  || 0) - (d && d.clientTop  || body && body.clientTop  || 0);
+		}
+		if (!self.which && ((self.charCode || self.charCode === 0) ? self.charCode : self.keyCode)) {
+			self.which = self.charCode || self.keyCode;
+		}
+		if (!self.metaKey && self.ctrlKey) {
+			self.metaKey = self.ctrlKey;
+		}
+		if (!self.which && self.button !== undefined) {
+			self.which = (self.button & 1 ? 1 : (self.button & 2 ? 3 : (self.button & 4 ? 2 : 0)));
+		}
+		switch (self.which) {
+		case 186 :
+			self.which = 59;
+			break;
+		case 187 :
+		case 107 :
+		case 43 :
+			self.which = 61;
+			break;
+		case 189 :
+		case 45 :
+			self.which = 109;
+			break;
+		case 42 :
+			self.which = 106;
+			break;
+		case 47 :
+			self.which = 111;
+			break;
+		case 78 :
+			self.which = 110;
+			break;
+		}
+		if (self.which >= 96 && self.which <= 105) {
+			self.which -= 48;
+		}
+	},
+	preventDefault : function() {
+		var ev = this.event;
+		if (ev.preventDefault) {
+			ev.preventDefault();
+		} else {
+			ev.returnValue = false;
+		}
+	},
+	stopPropagation : function() {
+		var ev = this.event;
+		if (ev.stopPropagation) {
+			ev.stopPropagation();
+		} else {
+			ev.cancelBubble = true;
+		}
+	},
+	stop : function() {
+		this.preventDefault();
+		this.stopPropagation();
+	}
+});
+var _eventExpendo = 'kindeditor_' + _TIME, _eventId = 0, _eventData = {};
+function _getId(el) {
+	return el[_eventExpendo] || null;
+}
+function _setId(el) {
+	el[_eventExpendo] = ++_eventId;
+	return _eventId;
+}
+function _removeId(el) {
+	try {
+		delete el[_eventExpendo];
+	} catch(e) {
+		if (el.removeAttribute) {
+			el.removeAttribute(_eventExpendo);
+		}
+	}
+}
+function _bind(el, type, fn) {
+	if (type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_bind(el, this, fn);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		id = _setId(el);
+	}
+	if (_eventData[id] === undefined) {
+		_eventData[id] = {};
+	}
+	var events = _eventData[id][type];
+	if (events && events.length > 0) {
+		_unbindEvent(el, type, events[0]);
+	} else {
+		_eventData[id][type] = [];
+		_eventData[id].el = el;
+	}
+	events = _eventData[id][type];
+	if (events.length === 0) {
+		events[0] = function(e) {
+			var kevent = e ? new KEvent(el, e) : undefined;
+			_each(events, function(i, event) {
+				if (i > 0 && event) {
+					event.call(el, kevent);
+				}
+			});
+		};
+	}
+	if (_inArray(fn, events) < 0) {
+		events.push(fn);
+	}
+	_bindEvent(el, type, events[0]);
+}
+function _unbind(el, type, fn) {
+	if (type && type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_unbind(el, this, fn);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		return;
+	}
+	if (type === undefined) {
+		if (id in _eventData) {
+			_each(_eventData[id], function(key, events) {
+				if (key != 'el' && events.length > 0) {
+					_unbindEvent(el, key, events[0]);
+				}
+			});
+			delete _eventData[id];
+			_removeId(el);
+		}
+		return;
+	}
+	if (!_eventData[id]) {
+		return;
+	}
+	var events = _eventData[id][type];
+	if (events && events.length > 0) {
+		if (fn === undefined) {
+			_unbindEvent(el, type, events[0]);
+			delete _eventData[id][type];
+		} else {
+			_each(events, function(i, event) {
+				if (i > 0 && event === fn) {
+					events.splice(i, 1);
+				}
+			});
+			if (events.length == 1) {
+				_unbindEvent(el, type, events[0]);
+				delete _eventData[id][type];
+			}
+		}
+		var count = 0;
+		_each(_eventData[id], function() {
+			count++;
+		});
+		if (count < 2) {
+			delete _eventData[id];
+			_removeId(el);
+		}
+	}
+}
+function _fire(el, type) {
+	if (type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_fire(el, this);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		return;
+	}
+	var events = _eventData[id][type];
+	if (_eventData[id] && events && events.length > 0) {
+		events[0]();
+	}
+}
+function _ctrl(el, key, fn) {
+	var self = this;
+	key = /^\d{2,}$/.test(key) ? key : key.toUpperCase().charCodeAt(0);
+	_bind(el, 'keydown', function(e) {
+		if (e.ctrlKey && e.which == key && !e.shiftKey && !e.altKey) {
+			fn.call(el);
+			e.stop();
+		}
+	});
+}
+var _readyFinished = false;
+function _ready(fn) {
+	if (_readyFinished) {
+		fn(KindEditor);
+		return;
+	}
+	var loaded = false;
+	function readyFunc() {
+		if (!loaded) {
+			loaded = true;
+			fn(KindEditor);
+			_readyFinished = true;
+		}
+	}
+	function ieReadyFunc() {
+		if (!loaded) {
+			try {
+				document.documentElement.doScroll('left');
+			} catch(e) {
+				setTimeout(ieReadyFunc, 100);
+				return;
+			}
+			readyFunc();
+		}
+	}
+	function ieReadyStateFunc() {
+		if (document.readyState === 'complete') {
+			readyFunc();
+		}
+	}
+	if (document.addEventListener) {
+		_bind(document, 'DOMContentLoaded', readyFunc);
+	} else if (document.attachEvent) {
+		_bind(document, 'readystatechange', ieReadyStateFunc);
+		var toplevel = false;
+		try {
+			toplevel = window.frameElement == null;
+		} catch(e) {}
+		if (document.documentElement.doScroll && toplevel) {
+			ieReadyFunc();
+		}
+	}
+	_bind(window, 'load', readyFunc);
+}
+if (window.attachEvent) {
+	window.attachEvent('onunload', function() {
+		_each(_eventData, function(key, events) {
+			if (events.el) {
+				_unbind(events.el);
+			}
+		});
+	});
+}
+K.ctrl = _ctrl;
+K.ready = _ready;
+function _getCssList(css) {
+	var list = {},
+		reg = /\s*([\w\-]+)\s*:([^;]*)(;|$)/g,
+		match;
+	while ((match = reg.exec(css))) {
+		var key = _trim(match[1].toLowerCase()),
+			val = _trim(_toHex(match[2]));
+		list[key] = val;
+	}
+	return list;
+}
+function _getAttrList(tag) {
+	var list = {},
+		reg = /\s+(?:([\w\-:]+)|(?:([\w\-:]+)=([^\s"'<>]+))|(?:([\w\-:"]+)="([^"]*)")|(?:([\w\-:"]+)='([^']*)'))(?=(?:\s|\/|>)+)/g,
+		match;
+	while ((match = reg.exec(tag))) {
+		var key = (match[1] || match[2] || match[4] || match[6]).toLowerCase(),
+			val = (match[2] ? match[3] : (match[4] ? match[5] : match[7])) || '';
+		list[key] = val;
+	}
+	return list;
+}
+function _addClassToTag(tag, className) {
+	if (/\s+class\s*=/.test(tag)) {
+		tag = tag.replace(/(\s+class=["']?)([^"']*)(["']?[\s>])/, function($0, $1, $2, $3) {
+			if ((' ' + $2 + ' ').indexOf(' ' + className + ' ') < 0) {
+				return $2 === '' ? $1 + className + $3 : $1 + $2 + ' ' + className + $3;
+			} else {
+				return $0;
+			}
+		});
+	} else {
+		tag = tag.substr(0, tag.length - 1) + ' class="' + className + '">';
+	}
+	return tag;
+}
+function _formatCss(css) {
+	var str = '';
+	_each(_getCssList(css), function(key, val) {
+		str += key + ':' + val + ';';
+	});
+	return str;
+}
+function _formatUrl(url, mode, host, pathname) {
+	mode = _undef(mode, '').toLowerCase();
+	if (url.substr(0, 5) != 'data:') {
+		url = url.replace(/([^:])\/\//g, '$1/');
+	}
+	if (_inArray(mode, ['absolute', 'relative', 'domain']) < 0) {
+		return url;
+	}
+	host = host || location.protocol + '//' + location.host;
+	if (pathname === undefined) {
+		var m = location.pathname.match(/^(\/.*)\//);
+		pathname = m ? m[1] : '';
+	}
+	var match;
+	if ((match = /^(\w+:\/\/[^\/]*)/.exec(url))) {
+		if (match[1] !== host) {
+			return url;
+		}
+	} else if (/^\w+:/.test(url)) {
+		return url;
+	}
+	function getRealPath(path) {
+		var parts = path.split('/'), paths = [];
+		for (var i = 0, len = parts.length; i < len; i++) {
+			var part = parts[i];
+			if (part == '..') {
+				if (paths.length > 0) {
+					paths.pop();
+				}
+			} else if (part !== '' && part != '.') {
+				paths.push(part);
+			}
+		}
+		return '/' + paths.join('/');
+	}
+	if (/^\//.test(url)) {
+		url = host + getRealPath(url.substr(1));
+	} else if (!/^\w+:\/\//.test(url)) {
+		url = host + getRealPath(pathname + '/' + url);
+	}
+	function getRelativePath(path, depth) {
+		if (url.substr(0, path.length) === path) {
+			var arr = [];
+			for (var i = 0; i < depth; i++) {
+				arr.push('..');
+			}
+			var prefix = '.';
+			if (arr.length > 0) {
+				prefix += '/' + arr.join('/');
+			}
+			if (pathname == '/') {
+				prefix += '/';
+			}
+			return prefix + url.substr(path.length);
+		} else {
+			if ((match = /^(.*)\//.exec(path))) {
+				return getRelativePath(match[1], ++depth);
+			}
+		}
+	}
+	if (mode === 'relative') {
+		url = getRelativePath(host + pathname, 0).substr(2);
+	} else if (mode === 'absolute') {
+		if (url.substr(0, host.length) === host) {
+			url = url.substr(host.length);
+		}
+	}
+	return url;
+}
+function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
+	if (html == null) {
+		html = '';
+	}
+	urlType = urlType || '';
+	wellFormatted = _undef(wellFormatted, false);
+	indentChar = _undef(indentChar, '\t');
+	var fontSizeList = 'xx-small,x-small,small,medium,large,x-large,xx-large'.split(',');
+	html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
+		return $1 + $2.replace(/<(?:br|br\s[^>]*)>/ig, '\n') + $3;
+	});
+	html = html.replace(/<(?:br|br\s[^>]*)\s*\/?>\s*<\/p>/ig, '</p>');
+	html = html.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/ig, '$1<br />$2');
+	html = html.replace(/\u200B/g, '');
+	html = html.replace(/\u00A9/g, '&copy;');
+	html = html.replace(/\u00AE/g, '&reg;');
+	html = html.replace(/\u2003/g, '&emsp;');
+	html = html.replace(/\u3000/g, '&emsp;');
+	html = html.replace(/<[^>]+/g, function($0) {
+		return $0.replace(/\s+/g, ' ');
+	});
+	var htmlTagMap = {};
+	if (htmlTags) {
+		_each(htmlTags, function(key, val) {
+			var arr = key.split(',');
+			for (var i = 0, len = arr.length; i < len; i++) {
+				htmlTagMap[arr[i]] = _toMap(val);
+			}
+		});
+		if (!htmlTagMap.script) {
+			html = html.replace(/(<(?:script|script\s[^>]*)>)([\s\S]*?)(<\/script>)/ig, '');
+		}
+		if (!htmlTagMap.style) {
+			html = html.replace(/(<(?:style|style\s[^>]*)>)([\s\S]*?)(<\/style>)/ig, '');
+		}
+	}
+	var re = /(\s*)<(\/)?([\w\-:]+)((?:\s+|(?:\s+[\w\-:]+)|(?:\s+[\w\-:]+=[^\s"'<>]+)|(?:\s+[\w\-:"]+="[^"]*")|(?:\s+[\w\-:"]+='[^']*'))*)(\/)?>(\s*)/g;
+	var tagStack = [];
+	html = html.replace(re, function($0, $1, $2, $3, $4, $5, $6) {
+		var full = $0,
+			startNewline = $1 || '',
+			startSlash = $2 || '',
+			tagName = $3.toLowerCase(),
+			attr = $4 || '',
+			endSlash = $5 ? ' ' + $5 : '',
+			endNewline = $6 || '';
+		if (htmlTags && !htmlTagMap[tagName]) {
+			return '';
+		}
+		if (endSlash === '' && _SINGLE_TAG_MAP[tagName]) {
+			endSlash = ' /';
+		}
+		if (_INLINE_TAG_MAP[tagName]) {
+			if (startNewline) {
+				startNewline = ' ';
+			}
+			if (endNewline) {
+				endNewline = ' ';
+			}
+		}
+		if (_PRE_TAG_MAP[tagName]) {
+			if (startSlash) {
+				endNewline = '\n';
+			} else {
+				startNewline = '\n';
+			}
+		}
+		if (wellFormatted && tagName == 'br') {
+			endNewline = '\n';
+		}
+		if (_BLOCK_TAG_MAP[tagName] && !_PRE_TAG_MAP[tagName]) {
+			if (wellFormatted) {
+				if (startSlash && tagStack.length > 0 && tagStack[tagStack.length - 1] === tagName) {
+					tagStack.pop();
+				} else {
+					tagStack.push(tagName);
+				}
+				startNewline = '\n';
+				endNewline = '\n';
+				for (var i = 0, len = startSlash ? tagStack.length : tagStack.length - 1; i < len; i++) {
+					startNewline += indentChar;
+					if (!startSlash) {
+						endNewline += indentChar;
+					}
+				}
+				if (endSlash) {
+					tagStack.pop();
+				} else if (!startSlash) {
+					endNewline += indentChar;
+				}
+			} else {
+				startNewline = endNewline = '';
+			}
+		}
+        //blockquote 单独加上style 之后再改成接口 给别的加上默认的
+		if (attr !== '' || (tagName === 'blockquote')) {
+			var attrMap = _getAttrList(full);
+			if (tagName === 'font') {
+				var fontStyleMap = {}, fontStyle = '';
+				_each(attrMap, function(key, val) {
+					if (key === 'color') {
+						fontStyleMap.color = val;
+						delete attrMap[key];
+					}
+					if (key === 'size') {
+						fontStyleMap['font-size'] = fontSizeList[parseInt(val, 10) - 1] || '';
+						delete attrMap[key];
+					}
+					if (key === 'face') {
+						fontStyleMap['font-family'] = val;
+						delete attrMap[key];
+					}
+					if (key === 'style') {
+						fontStyle = val;
+					}
+				});
+				if (fontStyle && !/;$/.test(fontStyle)) {
+					fontStyle += ';';
+				}
+				_each(fontStyleMap, function(key, val) {
+					if (val === '') {
+						return;
+					}
+					if (/\s/.test(val)) {
+						val = "'" + val + "'";
+					}
+					fontStyle += key + ':' + val + ';';
+				});
+				attrMap.style = fontStyle;
+			}
+			_each(attrMap, function(key, val) {
+				if (_FILL_ATTR_MAP[key]) {
+					attrMap[key] = key;
+				}
+				if (_inArray(key, ['src', 'href']) >= 0) {
+					attrMap[key] = _formatUrl(val, urlType);
+				}
+				if (htmlTags && key !== 'style' && !htmlTagMap[tagName]['*'] && !htmlTagMap[tagName][key] ||
+					tagName === 'body' && key === 'contenteditable' ||
+					/^kindeditor_\d+$/.test(key)) {
+					delete attrMap[key];
+				}
+				if (key === 'style' && val !== '') {
+					var styleMap = _getCssList(val);
+					_each(styleMap, function(k, v) {
+						if (htmlTags && !htmlTagMap[tagName].style && !htmlTagMap[tagName]['.' + k]) {
+							delete styleMap[k];
+						}
+					});
+					var style = '';
+					_each(styleMap, function(k, v) {
+						style += k + ':' + v + ';';
+					});
+					attrMap.style = style;
+				}
+			});
+			attr = '';
+            if (tagName === 'blockquote') {
+                attrMap['style'] = "margin: 0 0 0 40px; border: none; padding: 0px;background: none;background-color: ;";
+            }
+			_each(attrMap, function(key, val) {
+				if (key === 'style' && val === '') {
+					return;
+				}
+				val = val.replace(/"/g, '&quot;');
+				attr += ' ' + key + '="' + val + '"';
+			});
+		}
+		if (tagName === 'font') {
+			tagName = 'span';
+		}
+		return startNewline + '<' + startSlash + tagName + attr + endSlash + '>' + endNewline;
+	});
+	html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
+		return $1 + $2.replace(/\n/g, '<span id="__kindeditor_pre_newline__">\n') + $3;
+	});
+	html = html.replace(/\n\s*\n/g, '\n');
+	html = html.replace(/<span id="__kindeditor_pre_newline__">\n/g, '\n');
+	return _trim(html);
+}
+function _clearMsWord(html, htmlTags) {
+	html = html.replace(/<meta[\s\S]*?>/ig, '')
+		.replace(/<![\s\S]*?>/ig, '')
+		.replace(/<style[^>]*>[\s\S]*?<\/style>/ig, '')
+		.replace(/<script[^>]*>[\s\S]*?<\/script>/ig, '')
+		.replace(/<w:[^>]+>[\s\S]*?<\/w:[^>]+>/ig, '')
+		.replace(/<o:[^>]+>[\s\S]*?<\/o:[^>]+>/ig, '')
+		.replace(/<xml>[\s\S]*?<\/xml>/ig, '')
+		.replace(/<(?:table|td)[^>]*>/ig, function(full) {
+			return full.replace(/border-bottom:([#\w\s]+)/ig, 'border:$1');
+		});
+	return _formatHtml(html, htmlTags);
+}
+function _mediaType(src) {
+	if (/\.(rm|rmvb)(\?|$)/i.test(src)) {
+		return 'audio/x-pn-realaudio-plugin';
+	}
+	if (/\.(swf|flv)(\?|$)/i.test(src)) {
+		return 'application/x-shockwave-flash';
+	}
+	return 'video/x-ms-asf-plugin';
+}
+function _mediaClass(type) {
+	if (/realaudio/i.test(type)) {
+		return 'ke-rm';
+	}
+	if (/flash/i.test(type)) {
+		return 'ke-flash';
+	}
+	return 'ke-media';
+}
+function _mediaAttrs(srcTag) {
+	return _getAttrList(unescape(srcTag));
+}
+function _mediaEmbed(attrs,target) {
+    if(target && target === "media"){
+        var html = [[],"<img class=\"mediaIco\" src=\"../../images/video.png\" "],_ww = window.screen.width,_wh = window.screen.height;//_docHeight(window.document);
+        _each(attrs, function(key, val) {
+            if(key === "src"){
+                html[0].push("<a class=\"mediaIcobox\" href=\"javascript:window.open('"+ val+"','newwindow','");
+            }else{
+                if(key === "width"){
+                    html[0].push("width="+val,",left="+(_ww-val)/2 + ",");
+                }else if(key === "height"){
+                    html[0].push("height="+val,",top="+(_wh-val)/2);
+                }else{
+                    html.push(key, "=\"" , val , "\" ");
+                }
+            }
+        });
+        html[0].push("')\">");
+        html[0] = html[0].join("");
+        html.push("/></a>");
+        return html.join("");
+    }else{
+        var html = '<img ';
+        _each(attrs, function(key, val) {
+            html += key + '="' + val + '" ';
+        });
+        html += '/>';
+        return html;
+    }
+}
+function _mediaImg(blankPath, attrs) {
+	var width = attrs.width,
+		height = attrs.height,
+		type = attrs.type || _mediaType(attrs.src),
+		srcTag = _mediaEmbed(attrs),
+		style = '';
+	if (/\D/.test(width)) {
+		style += 'width:' + width + ';';
+	} else if (width > 0) {
+		style += 'width:' + width + 'px;';
+	}
+	if (/\D/.test(height)) {
+		style += 'height:' + height + ';';
+	} else if (height > 0) {
+		style += 'height:' + height + 'px;';
+	}
+	var html = '<img class="' + _mediaClass(type) + '" src="' + blankPath + '" ';
+	if (style !== '') {
+		html += 'style="' + style + '" ';
+	}
+	html += 'data-ke-tag="' + escape(srcTag) + '" alt="" />';
+	return html;
+}
+function _tmpl(str, data) {
+	var fn = new Function("obj",
+		"var p=[],print=function(){p.push.apply(p,arguments);};" +
+		"with(obj){p.push('" +
+		str.replace(/[\r\t\n]/g, " ")
+			.split("<%").join("\t")
+			.replace(/((^|%>)[^\t]*)'/g, "$1\r")
+			.replace(/\t=(.*?)%>/g, "',$1,'")
+			.split("\t").join("');")
+			.split("%>").join("p.push('")
+			.split("\r").join("\\'") + "');}return p.join('');");
+	return data ? fn(data) : fn;
+}
+K.formatUrl = _formatUrl;
+K.formatHtml = _formatHtml;
+K.getCssList = _getCssList;
+K.getAttrList = _getAttrList;
+K.mediaType = _mediaType;
+K.mediaAttrs = _mediaAttrs;
+K.mediaEmbed = _mediaEmbed;
+K.mediaImg = _mediaImg;
+K.clearMsWord = _clearMsWord;
+K.tmpl = _tmpl;
+function _contains(nodeA, nodeB) {
+	if (nodeA.nodeType == 9 && nodeB.nodeType != 9) {
+		return true;
+	}
+	while ((nodeB = nodeB.parentNode)) {
+		if (nodeB == nodeA) {
+			return true;
+		}
+	}
+	return false;
+}
+var _getSetAttrDiv = document.createElement('div');
+_getSetAttrDiv.setAttribute('className', 't');
+var _GET_SET_ATTRIBUTE = _getSetAttrDiv.className !== 't';
+function _getAttr(el, key) {
+	key = key.toLowerCase();
+	var val = null;
+	if (!_GET_SET_ATTRIBUTE && el.nodeName.toLowerCase() != 'script') {
+		var div = el.ownerDocument.createElement('div');
+		div.appendChild(el.cloneNode(false));
+		var list = _getAttrList(_unescape(div.innerHTML));
+		if (key in list) {
+			val = list[key];
+		}
+	} else {
+		try {
+			val = el.getAttribute(key, 2);
+		} catch(e) {
+			val = el.getAttribute(key, 1);
+		}
+	}
+	if (key === 'style' && val !== null) {
+		val = _formatCss(val);
+	}
+	return val;
+}
+function _queryAll(expr, root) {
+	var exprList = expr.split(',');
+	if (exprList.length > 1) {
+		var mergedResults = [];
+		_each(exprList, function() {
+			_each(_queryAll(this, root), function() {
+				if (_inArray(this, mergedResults) < 0) {
+					mergedResults.push(this);
+				}
+			});
+		});
+		return mergedResults;
+	}
+	root = root || document;
+	function escape(str) {
+		if (typeof str != 'string') {
+			return str;
+		}
+		return str.replace(/([^\w\-])/g, '\\$1');
+	}
+	function stripslashes(str) {
+		return str.replace(/\\/g, '');
+	}
+	function cmpTag(tagA, tagB) {
+		return tagA === '*' || tagA.toLowerCase() === escape(tagB.toLowerCase());
+	}
+	function byId(id, tag, root) {
+		var arr = [],
+			doc = root.ownerDocument || root,
+			el = doc.getElementById(stripslashes(id));
+		if (el) {
+			if (cmpTag(tag, el.nodeName) && _contains(root, el)) {
+				arr.push(el);
+			}
+		}
+		return arr;
+	}
+	function byClass(className, tag, root) {
+		var doc = root.ownerDocument || root, arr = [], els, i, len, el;
+		if (root.getElementsByClassName) {
+			els = root.getElementsByClassName(stripslashes(className));
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (cmpTag(tag, el.nodeName)) {
+					arr.push(el);
+				}
+			}
+		} else if (doc.querySelectorAll) {
+			els = doc.querySelectorAll((root.nodeName !== '#document' ? root.nodeName + ' ' : '') + tag + '.' + className);
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (_contains(root, el)) {
+					arr.push(el);
+				}
+			}
+		} else {
+			els = root.getElementsByTagName(tag);
+			className = ' ' + className + ' ';
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (el.nodeType == 1) {
+					var cls = el.className;
+					if (cls && (' ' + cls + ' ').indexOf(className) > -1) {
+						arr.push(el);
+					}
+				}
+			}
+		}
+		return arr;
+	}
+	function byName(name, tag, root) {
+		var arr = [], doc = root.ownerDocument || root,
+			els = doc.getElementsByName(stripslashes(name)), el;
+		for (var i = 0, len = els.length; i < len; i++) {
+			el = els[i];
+			if (cmpTag(tag, el.nodeName) && _contains(root, el)) {
+				if (el.getAttribute('name') !== null) {
+					arr.push(el);
+				}
+			}
+		}
+		return arr;
+	}
+	function byAttr(key, val, tag, root) {
+		var arr = [], els = root.getElementsByTagName(tag), el;
+		for (var i = 0, len = els.length; i < len; i++) {
+			el = els[i];
+			if (el.nodeType == 1) {
+				if (val === null) {
+					if (_getAttr(el, key) !== null) {
+						arr.push(el);
+					}
+				} else {
+					if (val === escape(_getAttr(el, key))) {
+						arr.push(el);
+					}
+				}
+			}
+		}
+		return arr;
+	}
+	function select(expr, root) {
+		var arr = [], matches;
+		matches = /^((?:\\.|[^.#\s\[<>])+)/.exec(expr);
+		var tag = matches ? matches[1] : '*';
+		if ((matches = /#((?:[\w\-]|\\.)+)$/.exec(expr))) {
+			arr = byId(matches[1], tag, root);
+		} else if ((matches = /\.((?:[\w\-]|\\.)+)$/.exec(expr))) {
+			arr = byClass(matches[1], tag, root);
+		} else if ((matches = /\[((?:[\w\-]|\\.)+)\]/.exec(expr))) {
+			arr = byAttr(matches[1].toLowerCase(), null, tag, root);
+		} else if ((matches = /\[((?:[\w\-]|\\.)+)\s*=\s*['"]?((?:\\.|[^'"]+)+)['"]?\]/.exec(expr))) {
+			var key = matches[1].toLowerCase(), val = matches[2];
+			if (key === 'id') {
+				arr = byId(val, tag, root);
+			} else if (key === 'class') {
+				arr = byClass(val, tag, root);
+			} else if (key === 'name') {
+				arr = byName(val, tag, root);
+			} else {
+				arr = byAttr(key, val, tag, root);
+			}
+		} else {
+			var els = root.getElementsByTagName(tag), el;
+			for (var i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (el.nodeType == 1) {
+					arr.push(el);
+				}
+			}
+		}
+		return arr;
+	}
+	var parts = [], arr, re = /((?:\\.|[^\s>])+|[\s>])/g;
+	while ((arr = re.exec(expr))) {
+		if (arr[1] !== ' ') {
+			parts.push(arr[1]);
+		}
+	}
+	var results = [];
+	if (parts.length == 1) {
+		return select(parts[0], root);
+	}
+	var isChild = false, part, els, subResults, val, v, i, j, k, length, len, l;
+	for (i = 0, lenth = parts.length; i < lenth; i++) {
+		part = parts[i];
+		if (part === '>') {
+			isChild = true;
+			continue;
+		}
+		if (i > 0) {
+			els = [];
+			for (j = 0, len = results.length; j < len; j++) {
+				val = results[j];
+				subResults = select(part, val);
+				for (k = 0, l = subResults.length; k < l; k++) {
+					v = subResults[k];
+					if (isChild) {
+						if (val === v.parentNode) {
+							els.push(v);
+						}
+					} else {
+						els.push(v);
+					}
+				}
+			}
+			results = els;
+		} else {
+			results = select(part, root);
+		}
+		if (results.length === 0) {
+			return [];
+		}
+	}
+	return results;
+}
+function _query(expr, root) {
+	var arr = _queryAll(expr, root);
+	return arr.length > 0 ? arr[0] : null;
+}
+K.query = _query;
+K.queryAll = _queryAll;
+function _get(val) {
+	return K(val)[0];
+}
+function _getDoc(node) {
+	if (!node) {
+		return document;
+	}
+	return node.ownerDocument || node.document || node;
+}
+function _getWin(node) {
+	if (!node) {
+		return window;
+	}
+	var doc = _getDoc(node);
+	return doc.parentWindow || doc.defaultView;
+}
+function _setHtml(el, html) {
+	if (el.nodeType != 1) {
+		return;
+	}
+	var doc = _getDoc(el);
+	try {
+		el.innerHTML = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + html;
+		var temp = doc.getElementById('__kindeditor_temp_tag__');
+		temp.parentNode.removeChild(temp);
+	} catch(e) {
+		K(el).empty();
+		K('@' + html, doc).each(function() {
+			el.appendChild(this);
+		});
+	}
+}
+function _hasClass(el, cls) {
+	return _inString(cls, el.className, ' ');
+}
+function _setAttr(el, key, val) {
+	if (_IE && _V < 8 && key.toLowerCase() == 'class') {
+		key = 'className';
+	}
+	el.setAttribute(key, '' + val);
+}
+function _removeAttr(el, key) {
+	if (_IE && _V < 8 && key.toLowerCase() == 'class') {
+		key = 'className';
+	}
+	_setAttr(el, key, '');
+	el.removeAttribute(key);
+}
+function _getNodeName(node) {
+	if (!node || !node.nodeName) {
+		return '';
+	}
+	return node.nodeName.toLowerCase();
+}
+function _computedCss(el, key) {
+	var self = this, win = _getWin(el), camelKey = _toCamel(key), val = '';
+	if (win.getComputedStyle) {
+		var style = win.getComputedStyle(el, null);
+		val = style[camelKey] || style.getPropertyValue(key) || el.style[camelKey];
+	} else if (el.currentStyle) {
+		val = el.currentStyle[camelKey] || el.style[camelKey];
+	}
+	return val;
+}
+function _hasVal(node) {
+	return !!_VALUE_TAG_MAP[_getNodeName(node)];
+}
+function _docElement(doc) {
+	doc = doc || document;
+	return _QUIRKS ? doc.body : doc.documentElement;
+}
+function _docHeight(doc) {
+	var el = _docElement(doc);
+	return Math.max(el.scrollHeight, el.clientHeight);
+}
+function _docWidth(doc) {
+	var el = _docElement(doc);
+	return Math.max(el.scrollWidth, el.clientWidth);
+}
+function _getScrollPos(doc) {
+	doc = doc || document;
+	var x, y;
+	if (_IE || _NEWIE || _OPERA) {
+		x = _docElement(doc).scrollLeft;
+		y = _docElement(doc).scrollTop;
+	} else {
+		x = _getWin(doc).scrollX;
+		y = _getWin(doc).scrollY;
+	}
+	return {x : x, y : y};
+}
+function KNode(node) {
+	this.init(node);
+}
+_extend(KNode, {
+	init : function(node) {
+		var self = this;
+		node = _isArray(node) ? node : [node];
+		var length = 0;
+		for (var i = 0, len = node.length; i < len; i++) {
+			if (node[i]) {
+				self[i] = node[i].constructor === KNode ? node[i][0] : node[i];
+				length++;
+			}
+		}
+		self.length = length;
+		self.doc = _getDoc(self[0]);
+		self.name = _getNodeName(self[0]);
+		self.type = self.length > 0 ? self[0].nodeType : null;
+		self.win = _getWin(self[0]);
+	},
+	each : function(fn) {
+		var self = this;
+		for (var i = 0; i < self.length; i++) {
+			if (fn.call(self[i], i, self[i]) === false) {
+				return self;
+			}
+		}
+		return self;
+	},
+	bind : function(type, fn) {
+		this.each(function() {
+			_bind(this, type, fn);
+		});
+		return this;
+	},
+	unbind : function(type, fn) {
+		this.each(function() {
+			_unbind(this, type, fn);
+		});
+		return this;
+	},
+	fire : function(type) {
+		if (this.length < 1) {
+			return this;
+		}
+		_fire(this[0], type);
+		return this;
+	},
+	hasAttr : function(key) {
+		if (this.length < 1) {
+			return false;
+		}
+		return !!_getAttr(this[0], key);
+	},
+	attr : function(key, val) {
+		var self = this;
+		if (key === undefined) {
+			return _getAttrList(self.outer());
+		}
+		if (typeof key === 'object') {
+			_each(key, function(k, v) {
+				self.attr(k, v);
+			});
+			return self;
+		}
+		if (val === undefined) {
+			val = self.length < 1 ? null : _getAttr(self[0], key);
+			return val === null ? '' : val;
+		}
+		self.each(function() {
+			_setAttr(this, key, val);
+		});
+		return self;
+	},
+	removeAttr : function(key) {
+		this.each(function() {
+			_removeAttr(this, key);
+		});
+		return this;
+	},
+	get : function(i) {
+		if (this.length < 1) {
+			return null;
+		}
+		return this[i || 0];
+	},
+	eq : function(i) {
+		if (this.length < 1) {
+			return null;
+		}
+		return this[i] ? new KNode(this[i]) : null;
+	},
+	hasClass : function(cls) {
+		if (this.length < 1) {
+			return false;
+		}
+		return _hasClass(this[0], cls);
+	},
+	addClass : function(cls) {
+		this.each(function() {
+			if (!_hasClass(this, cls)) {
+				this.className = _trim(this.className + ' ' + cls);
+			}
+		});
+		return this;
+	},
+	removeClass : function(cls) {
+		this.each(function() {
+			if (_hasClass(this, cls)) {
+				this.className = _trim(this.className.replace(new RegExp('(^|\\s)' + cls + '(\\s|$)'), ' '));
+			}
+		});
+		return this;
+	},
+	html : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1 || self.type != 1) {
+				return '';
+			}
+			return _formatHtml(self[0].innerHTML);
+		}
+		self.each(function() {
+			_setHtml(this, val);
+		});
+		return self;
+	},
+	text : function() {
+		var self = this;
+		if (self.length < 1) {
+			return '';
+		}
+		return _IE ? self[0].innerText : self[0].textContent;
+	},
+	hasVal : function() {
+		if (this.length < 1) {
+			return false;
+		}
+		return _hasVal(this[0]);
+	},
+	val : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return '';
+			}
+			return self.hasVal() ? self[0].value : self.attr('value');
+		} else {
+			self.each(function() {
+				if (_hasVal(this)) {
+					this.value = val;
+				} else {
+					_setAttr(this, 'value' , val);
+				}
+			});
+			return self;
+		}
+	},
+	css : function(key, val) {
+		var self = this;
+		if (key === undefined) {
+			return _getCssList(self.attr('style'));
+		}
+		if (typeof key === 'object') {
+			_each(key, function(k, v) {
+				self.css(k, v);
+			});
+			return self;
+		}
+		if (val === undefined) {
+			if (self.length < 1) {
+				return '';
+			}
+			return self[0].style[_toCamel(key)] || _computedCss(self[0], key) || '';
+		}
+		self.each(function() {
+			this.style[_toCamel(key)] = val;
+		});
+		return self;
+	},
+	width : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return 0;
+			}
+			return self[0].offsetWidth;
+		}
+		return self.css('width', _addUnit(val));
+	},
+	height : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return 0;
+			}
+			return self[0].offsetHeight;
+		}
+		return self.css('height', _addUnit(val));
+	},
+	opacity : function(val) {
+		this.each(function() {
+			if (this.style.opacity === undefined) {
+				this.style.filter = val == 1 ? '' : 'alpha(opacity=' + (val * 100) + ')';
+			} else {
+				this.style.opacity = val == 1 ? '' : val;
+			}
+		});
+		return this;
+	},
+	data : function(key, val) {
+		var self = this;
+		key = 'kindeditor_data_' + key;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return null;
+			}
+			return self[0][key];
+		}
+		this.each(function() {
+			this[key] = val;
+		});
+		return self;
+	},
+	pos : function() {
+		var self = this, node = self[0], x = 0, y = 0;
+		if (node) {
+			if (node.getBoundingClientRect) {
+				var box = node.getBoundingClientRect(),
+					pos = _getScrollPos(self.doc);
+				x = box.left + pos.x;
+				y = box.top + pos.y;
+			} else {
+				while (node) {
+					x += node.offsetLeft;
+					y += node.offsetTop;
+					node = node.offsetParent;
+				}
+			}
+		}
+		return {x : _round(x), y : _round(y)};
+	},
+	clone : function(bool) {
+		if (this.length < 1) {
+			return new KNode([]);
+		}
+		return new KNode(this[0].cloneNode(bool));
+	},
+	append : function(expr) {
+		this.each(function() {
+			if (this.appendChild) {
+				this.appendChild(_get(expr));
+			}
+		});
+		return this;
+	},
+	appendTo : function(expr) {
+		this.each(function() {
+			_get(expr).appendChild(this);
+		});
+		return this;
+	},
+	before : function(expr) {
+		this.each(function() {
+			this.parentNode.insertBefore(_get(expr), this);
+		});
+		return this;
+	},
+	after : function(expr) {
+		this.each(function() {
+			if (this.nextSibling) {
+				this.parentNode.insertBefore(_get(expr), this.nextSibling);
+			} else {
+				this.parentNode.appendChild(_get(expr));
+			}
+		});
+		return this;
+	},
+	replaceWith : function(expr) {
+		var nodes = [];
+		this.each(function(i, node) {
+			_unbind(node);
+			var newNode = _get(expr);
+			node.parentNode.replaceChild(newNode, node);
+			nodes.push(newNode);
+		});
+		return K(nodes);
+	},
+	empty : function() {
+		var self = this;
+		self.each(function(i, node) {
+			var child = node.firstChild;
+			while (child) {
+				if (!node.parentNode) {
+					return;
+				}
+				var next = child.nextSibling;
+				child.parentNode.removeChild(child);
+				child = next;
+			}
+		});
+		return self;
+	},
+	remove : function(keepChilds) {
+		var self = this;
+		self.each(function(i, node) {
+			if (!node.parentNode) {
+				return;
+			}
+			_unbind(node);
+			if (keepChilds) {
+				var child = node.firstChild;
+				while (child) {
+					var next = child.nextSibling;
+					node.parentNode.insertBefore(child, node);
+					child = next;
+				}
+			}
+			node.parentNode.removeChild(node);
+			delete self[i];
+		});
+		self.length = 0;
+		return self;
+	},
+	show : function(val) {
+		var self = this;
+		if (val === undefined) {
+			val = self._originDisplay || '';
+		}
+		if (self.css('display') != 'none') {
+			return self;
+		}
+		return self.css('display', val);
+	},
+	hide : function() {
+		var self = this;
+		if (self.length < 1) {
+			return self;
+		}
+		self._originDisplay = self[0].style.display;
+		return self.css('display', 'none');
+	},
+	outer : function() {
+		var self = this;
+		if (self.length < 1) {
+			return '';
+		}
+		var div = self.doc.createElement('div'), html;
+		div.appendChild(self[0].cloneNode(true));
+		html = _formatHtml(div.innerHTML);
+		div = null;
+		return html;
+	},
+	isSingle : function() {
+		return !!_SINGLE_TAG_MAP[this.name];
+	},
+	isInline : function() {
+		return !!_INLINE_TAG_MAP[this.name];
+	},
+	isBlock : function() {
+		return !!_BLOCK_TAG_MAP[this.name];
+	},
+	isStyle : function() {
+		return !!_STYLE_TAG_MAP[this.name];
+	},
+	isControl : function() {
+		return !!_CONTROL_TAG_MAP[this.name];
+	},
+	contains : function(otherNode) {
+		if (this.length < 1) {
+			return false;
+		}
+		return _contains(this[0], _get(otherNode));
+	},
+	parent : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].parentNode;
+		return node ? new KNode(node) : null;
+	},
+	children : function() {
+		if (this.length < 1) {
+			return new KNode([]);
+		}
+		var list = [], child = this[0].firstChild;
+		while (child) {
+			if (child.nodeType != 3 || _trim(child.nodeValue) !== '') {
+				list.push(child);
+			}
+			child = child.nextSibling;
+		}
+		return new KNode(list);
+	},
+	first : function() {
+		var list = this.children();
+		return list.length > 0 ? list.eq(0) : null;
+	},
+	last : function() {
+		var list = this.children();
+		return list.length > 0 ? list.eq(list.length - 1) : null;
+	},
+	index : function() {
+		if (this.length < 1) {
+			return -1;
+		}
+		var i = -1, sibling = this[0];
+		while (sibling) {
+			i++;
+			sibling = sibling.previousSibling;
+		}
+		return i;
+	},
+	prev : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].previousSibling;
+		return node ? new KNode(node) : null;
+	},
+	next : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].nextSibling;
+		return node ? new KNode(node) : null;
+	},
+	scan : function(fn, order) {
+		if (this.length < 1) {
+			return;
+		}
+		order = (order === undefined) ? true : order;
+		function walk(node) {
+			var n = order ? node.firstChild : node.lastChild;
+			while (n) {
+				var next = order ? n.nextSibling : n.previousSibling;
+				if (fn(n) === false) {
+					return false;
+				}
+				if (walk(n) === false) {
+					return false;
+				}
+				n = next;
+			}
+		}
+		walk(this[0]);
+		return this;
+	}
+});
+_each(('blur,focus,focusin,focusout,load,resize,scroll,unload,click,dblclick,' +
+	'mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,' +
+	'change,select,submit,keydown,keypress,keyup,error,contextmenu').split(','), function(i, type) {
+	KNode.prototype[type] = function(fn) {
+		return fn ? this.bind(type, fn) : this.fire(type);
+	};
+});
+var _K = K;
+K = function(expr, root) {
+	if (expr === undefined || expr === null) {
+		return;
+	}
+	function newNode(node) {
+		if (!node[0]) {
+			node = [];
+		}
+		return new KNode(node);
+	}
+	if (typeof expr === 'string') {
+		if (root) {
+			root = _get(root);
+		}
+		var length = expr.length;
+		if (expr.charAt(0) === '@') {
+			expr = expr.substr(1);
+		}
+		if (expr.length !== length || /<.+>/.test(expr)) {
+			var doc = root ? root.ownerDocument || root : document,
+				div = doc.createElement('div'), list = [];
+			div.innerHTML = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + expr;
+			for (var i = 0, len = div.childNodes.length; i < len; i++) {
+				var child = div.childNodes[i];
+				if (child.id == '__kindeditor_temp_tag__') {
+					continue;
+				}
+				list.push(child);
+			}
+			return newNode(list);
+		}
+		return newNode(_queryAll(expr, root));
+	}
+	if (expr && expr.constructor === KNode) {
+		return expr;
+	}
+	if (expr.toArray) {
+		expr = expr.toArray();
+	}
+	if (_isArray(expr)) {
+		return newNode(expr);
+	}
+	return newNode(_toArray(arguments));
+};
+_each(_K, function(key, val) {
+	K[key] = val;
+});
+K.NodeClass = KNode;
+window.KindEditor = K;
+var _START_TO_START = 0,
+	_START_TO_END = 1,
+	_END_TO_END = 2,
+	_END_TO_START = 3,
+	_BOOKMARK_ID = 0;
+function _updateCollapsed(range) {
+	range.collapsed = (range.startContainer === range.endContainer && range.startOffset === range.endOffset);
+	return range;
+}
+function _copyAndDelete(range, isCopy, isDelete) {
+	var doc = range.doc, nodeList = [];
+	function splitTextNode(node, startOffset, endOffset) {
+		var length = node.nodeValue.length, centerNode;
+		if (isCopy) {
+			var cloneNode = node.cloneNode(true);
+			if (startOffset > 0) {
+				centerNode = cloneNode.splitText(startOffset);
+			} else {
+				centerNode = cloneNode;
+			}
+			if (endOffset < length) {
+				centerNode.splitText(endOffset - startOffset);
+			}
+		}
+		if (isDelete) {
+			var center = node;
+			if (startOffset > 0) {
+				center = node.splitText(startOffset);
+				range.setStart(node, startOffset);
+			}
+			if (endOffset < length) {
+				var right = center.splitText(endOffset - startOffset);
+				range.setEnd(right, 0);
+			}
+			nodeList.push(center);
+		}
+		return centerNode;
+	}
+	function removeNodes() {
+		if (isDelete) {
+			range.up().collapse(true);
+		}
+		for (var i = 0, len = nodeList.length; i < len; i++) {
+			var node = nodeList[i];
+			if (node.parentNode) {
+				node.parentNode.removeChild(node);
+			}
+		}
+	}
+	var copyRange = range.cloneRange().down();
+	var start = -1, incStart = -1, incEnd = -1, end = -1,
+		ancestor = range.commonAncestor(), frag = doc.createDocumentFragment();
+	if (ancestor.nodeType == 3) {
+		var textNode = splitTextNode(ancestor, range.startOffset, range.endOffset);
+		if (isCopy) {
+			frag.appendChild(textNode);
+		}
+		removeNodes();
+		return isCopy ? frag : range;
+	}
+	function extractNodes(parent, frag) {
+		var node = parent.firstChild, nextNode;
+		while (node) {
+			var testRange = new KRange(doc).selectNode(node);
+			start = testRange.compareBoundaryPoints(_START_TO_END, range);
+			if (start >= 0 && incStart <= 0) {
+				incStart = testRange.compareBoundaryPoints(_START_TO_START, range);
+			}
+			if (incStart >= 0 && incEnd <= 0) {
+				incEnd = testRange.compareBoundaryPoints(_END_TO_END, range);
+			}
+			if (incEnd >= 0 && end <= 0) {
+				end = testRange.compareBoundaryPoints(_END_TO_START, range);
+			}
+			if (end >= 0) {
+				return false;
+			}
+			nextNode = node.nextSibling;
+			if (start > 0) {
+				if (node.nodeType == 1) {
+					if (incStart >= 0 && incEnd <= 0) {
+						if (isCopy) {
+							frag.appendChild(node.cloneNode(true));
+						}
+						if (isDelete) {
+							nodeList.push(node);
+						}
+					} else {
+						var childFlag;
+						if (isCopy) {
+							childFlag = node.cloneNode(false);
+							frag.appendChild(childFlag);
+						}
+						if (extractNodes(node, childFlag) === false) {
+							return false;
+						}
+					}
+				} else if (node.nodeType == 3) {
+					var textNode;
+					if (node == copyRange.startContainer) {
+						textNode = splitTextNode(node, copyRange.startOffset, node.nodeValue.length);
+					} else if (node == copyRange.endContainer) {
+						textNode = splitTextNode(node, 0, copyRange.endOffset);
+					} else {
+						textNode = splitTextNode(node, 0, node.nodeValue.length);
+					}
+					if (isCopy) {
+						try {
+							frag.appendChild(textNode);
+						} catch(e) {}
+					}
+				}
+			}
+			node = nextNode;
+		}
+	}
+	extractNodes(ancestor, frag);
+	if (isDelete) {
+		range.up().collapse(true);
+	}
+	for (var i = 0, len = nodeList.length; i < len; i++) {
+		var node = nodeList[i];
+		if (node.parentNode) {
+			node.parentNode.removeChild(node);
+		}
+	}
+	return isCopy ? frag : range;
+}
+function _moveToElementText(range, el) {
+	var node = el;
+	while (node) {
+		var knode = K(node);
+		if (knode.name == 'marquee' || knode.name == 'select') {
+			return;
+		}
+		node = node.parentNode;
+	}
+	try {
+		range.moveToElementText(el);
+	} catch(e) {}
+}
+function _getStartEnd(rng, isStart) {
+	var doc = rng.parentElement().ownerDocument,
+		pointRange = rng.duplicate();
+	pointRange.collapse(isStart);
+	var parent = pointRange.parentElement(),
+		nodes = parent.childNodes;
+	if (nodes.length === 0) {
+		return {node: parent.parentNode, offset: K(parent).index()};
+	}
+	var startNode = doc, startPos = 0, cmp = -1;
+	var testRange = rng.duplicate();
+	_moveToElementText(testRange, parent);
+	for (var i = 0, len = nodes.length; i < len; i++) {
+		var node = nodes[i];
+		cmp = testRange.compareEndPoints('StartToStart', pointRange);
+		if (cmp === 0) {
+			return {node: node.parentNode, offset: i};
+		}
+		if (node.nodeType == 1) {
+			var nodeRange = rng.duplicate(), dummy, knode = K(node), newNode = node;
+			if (knode.isControl()) {
+				dummy = doc.createElement('span');
+				knode.after(dummy);
+				newNode = dummy;
+				startPos += knode.text().replace(/\r\n|\n|\r/g, '').length;
+			}
+			_moveToElementText(nodeRange, newNode);
+			testRange.setEndPoint('StartToEnd', nodeRange);
+			if (cmp > 0) {
+				startPos += nodeRange.text.replace(/\r\n|\n|\r/g, '').length;
+			} else {
+				startPos = 0;
+			}
+			if (dummy) {
+				K(dummy).remove();
+			}
+		} else if (node.nodeType == 3) {
+			testRange.moveStart('character', node.nodeValue.length);
+			startPos += node.nodeValue.length;
+		}
+		if (cmp < 0) {
+			startNode = node;
+		}
+	}
+	if (cmp < 0 && startNode.nodeType == 1) {
+		return {node: parent, offset: K(parent.lastChild).index() + 1};
+	}
+	if (cmp > 0) {
+		while (startNode.nextSibling && startNode.nodeType == 1) {
+			startNode = startNode.nextSibling;
+		}
+	}
+	testRange = rng.duplicate();
+	_moveToElementText(testRange, parent);
+	testRange.setEndPoint('StartToEnd', pointRange);
+	startPos -= testRange.text.replace(/\r\n|\n|\r/g, '').length;
+	if (cmp > 0 && startNode.nodeType == 3) {
+		var prevNode = startNode.previousSibling;
+		while (prevNode && prevNode.nodeType == 3) {
+			startPos -= prevNode.nodeValue.length;
+			prevNode = prevNode.previousSibling;
+		}
+	}
+	return {node: startNode, offset: startPos};
+}
+function _getEndRange(node, offset) {
+	var doc = node.ownerDocument || node,
+		range = doc.body.createTextRange();
+	if (doc == node) {
+		range.collapse(true);
+		return range;
+	}
+	if (node.nodeType == 1 && node.childNodes.length > 0) {
+		var children = node.childNodes, isStart, child;
+		if (offset === 0) {
+			child = children[0];
+			isStart = true;
+		} else {
+			child = children[offset - 1];
+			isStart = false;
+		}
+		if (!child) {
+			return range;
+		}
+		if (K(child).name === 'head') {
+			if (offset === 1) {
+				isStart = true;
+			}
+			if (offset === 2) {
+				isStart = false;
+			}
+			range.collapse(isStart);
+			return range;
+		}
+		if (child.nodeType == 1) {
+			var kchild = K(child), span;
+			if (kchild.isControl()) {
+				span = doc.createElement('span');
+				if (isStart) {
+					kchild.before(span);
+				} else {
+					kchild.after(span);
+				}
+				child = span;
+			}
+			_moveToElementText(range, child);
+			range.collapse(isStart);
+			if (span) {
+				K(span).remove();
+			}
+			return range;
+		}
+		node = child;
+		offset = isStart ? 0 : child.nodeValue.length;
+	}
+	var dummy = doc.createElement('span');
+	K(node).before(dummy);
+	_moveToElementText(range, dummy);
+	range.moveStart('character', offset);
+	K(dummy).remove();
+	return range;
+}
+function _toRange(rng) {
+	var doc, range;
+	function tr2td(start) {
+		if (K(start.node).name == 'tr') {
+			start.node = start.node.cells[start.offset];
+			start.offset = 0;
+		}
+	}
+	if (_IERANGE) {
+		if (rng.item) {
+			doc = _getDoc(rng.item(0));
+			range = new KRange(doc);
+			range.selectNode(rng.item(0));
+			return range;
+		}
+		doc = rng.parentElement().ownerDocument;
+		var start = _getStartEnd(rng, true),
+			end = _getStartEnd(rng, false);
+		tr2td(start);
+		tr2td(end);
+		range = new KRange(doc);
+		range.setStart(start.node, start.offset);
+		range.setEnd(end.node, end.offset);
+		return range;
+	}
+	var startContainer = rng.startContainer;
+	doc = startContainer.ownerDocument || startContainer;
+	range = new KRange(doc);
+	range.setStart(startContainer, rng.startOffset);
+	range.setEnd(rng.endContainer, rng.endOffset);
+	return range;
+}
+function KRange(doc) {
+	this.init(doc);
+}
+_extend(KRange, {
+	init : function(doc) {
+		var self = this;
+		self.startContainer = doc;
+		self.startOffset = 0;
+		self.endContainer = doc;
+		self.endOffset = 0;
+		self.collapsed = true;
+		self.doc = doc;
+	},
+	commonAncestor : function() {
+		function getParents(node) {
+			var parents = [];
+			while (node) {
+				parents.push(node);
+				node = node.parentNode;
+			}
+			return parents;
+		}
+		var parentsA = getParents(this.startContainer),
+			parentsB = getParents(this.endContainer),
+			i = 0, lenA = parentsA.length, lenB = parentsB.length, parentA, parentB;
+		while (++i) {
+			parentA = parentsA[lenA - i];
+			parentB = parentsB[lenB - i];
+			if (!parentA || !parentB || parentA !== parentB) {
+				break;
+			}
+		}
+		return parentsA[lenA - i + 1];
+	},
+	setStart : function(node, offset) {
+		var self = this, doc = self.doc;
+		self.startContainer = node;
+		self.startOffset = offset;
+		if (self.endContainer === doc) {
+			self.endContainer = node;
+			self.endOffset = offset;
+		}
+		return _updateCollapsed(this);
+	},
+	setEnd : function(node, offset) {
+		var self = this, doc = self.doc;
+		self.endContainer = node;
+		self.endOffset = offset;
+		if (self.startContainer === doc) {
+			self.startContainer = node;
+			self.startOffset = offset;
+		}
+		return _updateCollapsed(this);
+	},
+	setStartBefore : function(node) {
+		return this.setStart(node.parentNode || this.doc, K(node).index());
+	},
+	setStartAfter : function(node) {
+		return this.setStart(node.parentNode || this.doc, K(node).index() + 1);
+	},
+	setEndBefore : function(node) {
+		return this.setEnd(node.parentNode || this.doc, K(node).index());
+	},
+	setEndAfter : function(node) {
+		return this.setEnd(node.parentNode || this.doc, K(node).index() + 1);
+	},
+	selectNode : function(node) {
+		return this.setStartBefore(node).setEndAfter(node);
+	},
+	selectNodeContents : function(node) {
+		var knode = K(node);
+		if (knode.type == 3 || knode.isSingle()) {
+			return this.selectNode(node);
+		}
+		var children = knode.children();
+		if (children.length > 0) {
+			return this.setStartBefore(children[0]).setEndAfter(children[children.length - 1]);
+		}
+		return this.setStart(node, 0).setEnd(node, 0);
+	},
+	collapse : function(toStart) {
+		if (toStart) {
+			return this.setEnd(this.startContainer, this.startOffset);
+		}
+		return this.setStart(this.endContainer, this.endOffset);
+	},
+	compareBoundaryPoints : function(how, range) {
+		var rangeA = this.get(), rangeB = range.get();
+		if (_IERANGE) {
+			var arr = {};
+			arr[_START_TO_START] = 'StartToStart';
+			arr[_START_TO_END] = 'EndToStart';
+			arr[_END_TO_END] = 'EndToEnd';
+			arr[_END_TO_START] = 'StartToEnd';
+			var cmp = rangeA.compareEndPoints(arr[how], rangeB);
+			if (cmp !== 0) {
+				return cmp;
+			}
+			var nodeA, nodeB, nodeC, posA, posB;
+			if (how === _START_TO_START || how === _END_TO_START) {
+				nodeA = this.startContainer;
+				posA = this.startOffset;
+			}
+			if (how === _START_TO_END || how === _END_TO_END) {
+				nodeA = this.endContainer;
+				posA = this.endOffset;
+			}
+			if (how === _START_TO_START || how === _START_TO_END) {
+				nodeB = range.startContainer;
+				posB = range.startOffset;
+			}
+			if (how === _END_TO_END || how === _END_TO_START) {
+				nodeB = range.endContainer;
+				posB = range.endOffset;
+			}
+			if (nodeA === nodeB) {
+				var diff = posA - posB;
+				return diff > 0 ? 1 : (diff < 0 ? -1 : 0);
+			}
+			nodeC = nodeB;
+			while (nodeC && nodeC.parentNode !== nodeA) {
+				nodeC = nodeC.parentNode;
+			}
+			if (nodeC) {
+				return K(nodeC).index() >= posA ? -1 : 1;
+			}
+			nodeC = nodeA;
+			while (nodeC && nodeC.parentNode !== nodeB) {
+				nodeC = nodeC.parentNode;
+			}
+			if (nodeC) {
+				return K(nodeC).index() >= posB ? 1 : -1;
+			}
+			nodeC = K(nodeB).next();
+			if (nodeC && nodeC.contains(nodeA)) {
+				return 1;
+			}
+			nodeC = K(nodeA).next();
+			if (nodeC && nodeC.contains(nodeB)) {
+				return -1;
+			}
+		} else {
+			return rangeA.compareBoundaryPoints(how, rangeB);
+		}
+	},
+	cloneRange : function() {
+		return new KRange(this.doc).setStart(this.startContainer, this.startOffset).setEnd(this.endContainer, this.endOffset);
+	},
+	toString : function() {
+		var rng = this.get(), str = _IERANGE ? rng.text : rng.toString();
+		return str.replace(/\r\n|\n|\r/g, '');
+	},
+	cloneContents : function() {
+		return _copyAndDelete(this, true, false);
+	},
+	deleteContents : function() {
+		return _copyAndDelete(this, false, true);
+	},
+	extractContents : function() {
+		return _copyAndDelete(this, true, true);
+	},
+	insertNode : function(node) {
+		var self = this,
+			sc = self.startContainer, so = self.startOffset,
+			ec = self.endContainer, eo = self.endOffset,
+			firstChild, lastChild, c, nodeCount = 1;
+		if (node.nodeName.toLowerCase() === '#document-fragment') {
+			firstChild = node.firstChild;
+			lastChild = node.lastChild;
+			nodeCount = node.childNodes.length;
+		}
+		if (sc.nodeType == 1) {
+			c = sc.childNodes[so];
+			if (c) {
+				sc.insertBefore(node, c);
+				if (sc === ec) {
+					eo += nodeCount;
+				}
+			} else {
+				sc.appendChild(node);
+			}
+		} else if (sc.nodeType == 3) {
+			if (so === 0) {
+				sc.parentNode.insertBefore(node, sc);
+				if (sc.parentNode === ec) {
+					eo += nodeCount;
+				}
+			} else if (so >= sc.nodeValue.length) {
+				if (sc.nextSibling) {
+					sc.parentNode.insertBefore(node, sc.nextSibling);
+				} else {
+					sc.parentNode.appendChild(node);
+				}
+			} else {
+				if (so > 0) {
+					c = sc.splitText(so);
+				} else {
+					c = sc;
+				}
+				sc.parentNode.insertBefore(node, c);
+				if (sc === ec) {
+					ec = c;
+					eo -= so;
+				}
+			}
+		}
+		if (firstChild) {
+			self.setStartBefore(firstChild).setEndAfter(lastChild);
+		} else {
+			self.selectNode(node);
+		}
+		if (self.compareBoundaryPoints(_END_TO_END, self.cloneRange().setEnd(ec, eo)) >= 1) {
+			return self;
+		}
+		return self.setEnd(ec, eo);
+	},
+	surroundContents : function(node) {
+		node.appendChild(this.extractContents());
+		return this.insertNode(node).selectNode(node);
+	},
+	isControl : function() {
+		var self = this,
+			sc = self.startContainer, so = self.startOffset,
+			ec = self.endContainer, eo = self.endOffset, rng;
+		return sc.nodeType == 1 && sc === ec && so + 1 === eo && K(sc.childNodes[so]).isControl();
+	},
+	get : function(hasControlRange) {
+		var self = this, doc = self.doc, node, rng;
+		if (!_IERANGE) {
+			rng = doc.createRange();
+			try {
+				rng.setStart(self.startContainer, self.startOffset);
+				rng.setEnd(self.endContainer, self.endOffset);
+			} catch (e) {}
+			return rng;
+		}
+		if (hasControlRange && self.isControl()) {
+			rng = doc.body.createControlRange();
+			rng.addElement(self.startContainer.childNodes[self.startOffset]);
+			return rng;
+		}
+		var range = self.cloneRange().down();
+		rng = doc.body.createTextRange();
+		rng.setEndPoint('StartToStart', _getEndRange(range.startContainer, range.startOffset));
+		rng.setEndPoint('EndToStart', _getEndRange(range.endContainer, range.endOffset));
+		return rng;
+	},
+	html : function() {
+		return K(this.cloneContents()).outer();
+	},
+	down : function() {
+		var self = this;
+		function downPos(node, pos, isStart) {
+			if (node.nodeType != 1) {
+				return;
+			}
+			var children = K(node).children();
+			if (children.length === 0) {
+				return;
+			}
+			var left, right, child, offset;
+			if (pos > 0) {
+				left = children.eq(pos - 1);
+			}
+			if (pos < children.length) {
+				right = children.eq(pos);
+			}
+			if (left && left.type == 3) {
+				child = left[0];
+				offset = child.nodeValue.length;
+			}
+			if (right && right.type == 3) {
+				child = right[0];
+				offset = 0;
+			}
+			if (!child) {
+				return;
+			}
+			if (isStart) {
+				self.setStart(child, offset);
+			} else {
+				self.setEnd(child, offset);
+			}
+		}
+		downPos(self.startContainer, self.startOffset, true);
+		downPos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	up : function() {
+		var self = this;
+		function upPos(node, pos, isStart) {
+			if (node.nodeType != 3) {
+				return;
+			}
+			if (pos === 0) {
+				if (isStart) {
+					self.setStartBefore(node);
+				} else {
+					self.setEndBefore(node);
+				}
+			} else if (pos == node.nodeValue.length) {
+				if (isStart) {
+					self.setStartAfter(node);
+				} else {
+					self.setEndAfter(node);
+				}
+			}
+		}
+		upPos(self.startContainer, self.startOffset, true);
+		upPos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	enlarge : function(toBlock) {
+		var self = this;
+		self.up();
+		function enlargePos(node, pos, isStart) {
+			var knode = K(node), parent;
+			if (knode.type == 3 || _NOSPLIT_TAG_MAP[knode.name] || !toBlock && knode.isBlock()) {
+				return;
+			}
+			if (pos === 0) {
+				while (!knode.prev()) {
+					parent = knode.parent();
+					if (!parent || _NOSPLIT_TAG_MAP[parent.name] || !toBlock && parent.isBlock()) {
+						break;
+					}
+					knode = parent;
+				}
+				if (isStart) {
+					self.setStartBefore(knode[0]);
+				} else {
+					self.setEndBefore(knode[0]);
+				}
+			} else if (pos == knode.children().length) {
+				while (!knode.next()) {
+					parent = knode.parent();
+					if (!parent || _NOSPLIT_TAG_MAP[parent.name] || !toBlock && parent.isBlock()) {
+						break;
+					}
+					knode = parent;
+				}
+				if (isStart) {
+					self.setStartAfter(knode[0]);
+				} else {
+					self.setEndAfter(knode[0]);
+				}
+			}
+		}
+		enlargePos(self.startContainer, self.startOffset, true);
+		enlargePos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	shrink : function() {
+		var self = this, child, collapsed = self.collapsed;
+		while (self.startContainer.nodeType == 1 && (child = self.startContainer.childNodes[self.startOffset]) && child.nodeType == 1 && !K(child).isSingle()) {
+			self.setStart(child, 0);
+		}
+		if (collapsed) {
+			return self.collapse(collapsed);
+		}
+		while (self.endContainer.nodeType == 1 && self.endOffset > 0 && (child = self.endContainer.childNodes[self.endOffset - 1]) && child.nodeType == 1 && !K(child).isSingle()) {
+			self.setEnd(child, child.childNodes.length);
+		}
+		return self;
+	},
+	createBookmark : function(serialize) {
+		var self = this, doc = self.doc, endNode,
+			startNode = K('<span style="display:none;"></span>', doc)[0];
+		startNode.id = '__kindeditor_bookmark_start_' + (_BOOKMARK_ID++) + '__';
+		if (!self.collapsed) {
+			endNode = startNode.cloneNode(true);
+			endNode.id = '__kindeditor_bookmark_end_' + (_BOOKMARK_ID++) + '__';
+		}
+		if (endNode) {
+			self.cloneRange().collapse(false).insertNode(endNode).setEndBefore(endNode);
+		}
+		self.insertNode(startNode).setStartAfter(startNode);
+		return {
+			start : serialize ? '#' + startNode.id : startNode,
+			end : endNode ? (serialize ? '#' + endNode.id : endNode) : null
+		};
+	},
+	moveToBookmark : function(bookmark) {
+		var self = this, doc = self.doc,
+			start = K(bookmark.start, doc), end = bookmark.end ? K(bookmark.end, doc) : null;
+		if (!start || start.length < 1) {
+			return self;
+		}
+		self.setStartBefore(start[0]);
+		start.remove();
+		if (end && end.length > 0) {
+			self.setEndBefore(end[0]);
+			end.remove();
+		} else {
+			self.collapse(true);
+		}
+		return self;
+	},
+	dump : function() {
+		console.log('--------------------');
+		console.log(this.startContainer.nodeType == 3 ? this.startContainer.nodeValue : this.startContainer, this.startOffset);
+		console.log(this.endContainer.nodeType == 3 ? this.endContainer.nodeValue : this.endContainer, this.endOffset);
+	}
+});
+function _range(mixed) {
+	if (!mixed.nodeName) {
+		return mixed.constructor === KRange ? mixed : _toRange(mixed);
+	}
+	return new KRange(mixed);
+}
+K.RangeClass = KRange;
+K.range = _range;
+K.START_TO_START = _START_TO_START;
+K.START_TO_END = _START_TO_END;
+K.END_TO_END = _END_TO_END;
+K.END_TO_START = _END_TO_START;
+
+function _nativeCommand(doc, key, val) {
+	try {
+		doc.execCommand(key, false, val);
+	} catch(e) {}
+}
+function _nativeCommandValue(doc, key) {
+	var val = '';
+	try {
+//		val = doc.query_nativeCommand(self.doc, name, val);Value(key);
+        val = doc.queryCommandValue(key);
+	} catch (e) {}
+	if (typeof val !== 'string') {
+		val = '';
+	}
+	return val;
+}
+function _getSel(doc) {
+	var win = _getWin(doc);
+	return _IERANGE ? doc.selection : win.getSelection();
+}
+function _getRng(doc) {
+	var sel = _getSel(doc), rng;
+	try {
+		if (sel.rangeCount > 0) {
+			rng = sel.getRangeAt(0);
+		} else {
+			rng = sel.createRange();
+		}
+	} catch(e) {}
+	if (_IERANGE && (!rng || (!rng.item && rng.parentElement().ownerDocument !== doc))) {
+		return null;
+	}
+	return rng;
+}
+function _singleKeyMap(map) {
+	var newMap = {}, arr, v;
+	_each(map, function(key, val) {
+		arr = key.split(',');
+		for (var i = 0, len = arr.length; i < len; i++) {
+			v = arr[i];
+			newMap[v] = val;
+		}
+	});
+	return newMap;
+}
+function _hasAttrOrCss(knode, map) {
+	return _hasAttrOrCssByKey(knode, map, '*') || _hasAttrOrCssByKey(knode, map);
+}
+function _hasAttrOrCssByKey(knode, map, mapKey) {
+	mapKey = mapKey || knode.name;
+	if (knode.type !== 1) {
+		return false;
+	}
+	var newMap = _singleKeyMap(map);
+	if (!newMap[mapKey]) {
+		return false;
+	}
+	var arr = newMap[mapKey].split(',');
+	for (var i = 0, len = arr.length; i < len; i++) {
+		var key = arr[i];
+		if (key === '*') {
+			return true;
+		}
+		var match = /^(\.?)([^=]+)(?:=([^=]*))?$/.exec(key);
+		var method = match[1] ? 'css' : 'attr';
+		key = match[2];
+		var val = match[3] || '';
+		if (val === '' && knode[method](key) !== '') {
+			return true;
+		}
+		if (val !== '' && knode[method](key) === val) {
+			return true;
+		}
+	}
+	return false;
+}
+function _removeAttrOrCss(knode, map) {
+	if (knode.type != 1) {
+		return;
+	}
+	_removeAttrOrCssByKey(knode, map, '*');
+	_removeAttrOrCssByKey(knode, map);
+}
+function _removeAttrOrCssByKey(knode, map, mapKey) {
+	mapKey = mapKey || knode.name;
+	if (knode.type !== 1) {
+		return;
+	}
+	var newMap = _singleKeyMap(map);
+	if (!newMap[mapKey]) {
+		return;
+	}
+	var arr = newMap[mapKey].split(','), allFlag = false;
+	for (var i = 0, len = arr.length; i < len; i++) {
+		var key = arr[i];
+		if (key === '*') {
+			allFlag = true;
+			break;
+		}
+		var match = /^(\.?)([^=]+)(?:=([^=]*))?$/.exec(key);
+		key = match[2];
+		if (match[1]) {
+			key = _toCamel(key);
+			if (knode[0].style[key]) {
+				knode[0].style[key] = '';
+			}
+		} else {
+			knode.removeAttr(key);
+		}
+	}
+	if (allFlag) {
+		knode.remove(true);
+	}
+}
+function _getInnerNode(knode) {
+	var inner = knode;
+	while (inner.first()) {
+		inner = inner.first();
+	}
+	return inner;
+}
+function _isEmptyNode(knode) {
+	if (knode.type != 1 || knode.isSingle()) {
+		return false;
+	}
+	return knode.html().replace(/<[^>]+>/g, '') === '';
+}
+function _mergeWrapper(a, b) {
+	a = a.clone(true);
+	var lastA = _getInnerNode(a), childA = a, merged = false;
+	while (b) {
+		while (childA) {
+			if (childA.name === b.name) {
+				_mergeAttrs(childA, b.attr(), b.css());
+				merged = true;
+			}
+			childA = childA.first();
+		}
+		if (!merged) {
+			lastA.append(b.clone(false));
+		}
+		merged = false;
+		b = b.first();
+	}
+	return a;
+}
+function _wrapNode(knode, wrapper) {
+	wrapper = wrapper.clone(true);
+	if (knode.type == 3) {
+		_getInnerNode(wrapper).append(knode.clone(false));
+		knode.replaceWith(wrapper);
+		return wrapper;
+	}
+	var nodeWrapper = knode, child;
+	while ((child = knode.first()) && child.children().length == 1) {
+		knode = child;
+	}
+	child = knode.first();
+	var frag = knode.doc.createDocumentFragment();
+	while (child) {
+		frag.appendChild(child[0]);
+		child = child.next();
+	}
+	wrapper = _mergeWrapper(nodeWrapper, wrapper);
+	if (frag.firstChild) {
+		_getInnerNode(wrapper).append(frag);
+	}
+	nodeWrapper.replaceWith(wrapper);
+	return wrapper;
+}
+function _mergeAttrs(knode, attrs, styles) {
+	_each(attrs, function(key, val) {
+		if (key !== 'style') {
+			knode.attr(key, val);
+		}
+	});
+	_each(styles, function(key, val) {
+		knode.css(key, val);
+	});
+}
+function _inPreElement(knode) {
+	while (knode && knode.name != 'body') {
+		if (_PRE_TAG_MAP[knode.name] || knode.name == 'div' && knode.hasClass('ke-script')) {
+			return true;
+		}
+		knode = knode.parent();
+	}
+	return false;
+}
+function KCmd(range) {
+	this.init(range);
+}
+_extend(KCmd, {
+	init : function(range) {
+		var self = this, doc = range.doc;
+		self.doc = doc;
+		self.win = _getWin(doc);
+		self.sel = _getSel(doc);
+		self.range = range;
+	},
+	selection : function(forceReset) {
+		var self = this, doc = self.doc, rng = _getRng(doc);
+		self.sel = _getSel(doc);
+		if (rng) {
+			self.range = _range(rng);
+			if (K(self.range.startContainer).name == 'html') {
+				self.range.selectNodeContents(doc.body).collapse(false);
+			}
+			return self;
+		}
+		if (forceReset) {
+			self.range.selectNodeContents(doc.body).collapse(false);
+		}
+		return self;
+	},
+	select : function(hasDummy) {
+		hasDummy = _undef(hasDummy, true);
+		var self = this, sel = self.sel, range = self.range.cloneRange().shrink(),
+			sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset,
+			doc = _getDoc(sc), win = self.win, rng, hasU200b = false;
+		if (hasDummy && sc.nodeType == 1 && range.collapsed) {
+			if (_IERANGE) {
+				var dummy = K('<span>&nbsp;</span>', doc);
+				range.insertNode(dummy[0]);
+				rng = doc.body.createTextRange();
+				try {
+					rng.moveToElementText(dummy[0]);
+				} catch(ex) {}
+				rng.collapse(false);
+				rng.select();
+				dummy.remove();
+				win.focus();
+				return self;
+			}
+			if (_WEBKIT) {
+				var children = sc.childNodes;
+				if (K(sc).isInline() || so > 0 && K(children[so - 1]).isInline() || children[so] && K(children[so]).isInline()) {
+					range.insertNode(doc.createTextNode('\u200B'));
+					hasU200b = true;
+				}
+			}
+		}
+		if (_IERANGE) {
+			try {
+				rng = range.get(true);
+				rng.select();
+			} catch(e) {}
+		} else {
+			if (hasU200b) {
+				range.collapse(false);
+			}
+			rng = range.get(true);
+			sel.removeAllRanges();
+			sel.addRange(rng);
+			if (doc !== document) {
+				var pos = K(rng.endContainer).pos();
+				//win.scrollTo(pos.x, pos.y);
+			}
+		}
+		win.focus();
+		return self;
+	},
+	wrap : function(val) {
+		var self = this, doc = self.doc, range = self.range, wrapper;
+		wrapper = K(val, doc);
+		if (range.collapsed) {
+			range.shrink();
+			range.insertNode(wrapper[0]).selectNodeContents(wrapper[0]);
+			return self;
+		}
+		if (wrapper.isBlock()) {
+			var copyWrapper = wrapper.clone(true), child = copyWrapper;
+			while (child.first()) {
+				child = child.first();
+			}
+			child.append(range.extractContents());
+			range.insertNode(copyWrapper[0]).selectNode(copyWrapper[0]);
+			return self;
+		}
+		range.enlarge();
+		var bookmark = range.createBookmark(), ancestor = range.commonAncestor(), isStart = false;
+		K(ancestor).scan(function(node) {
+			if (!isStart && node == bookmark.start) {
+				isStart = true;
+				return;
+			}
+			if (isStart) {
+				if (node == bookmark.end) {
+					return false;
+				}
+				var knode = K(node);
+				if (_inPreElement(knode)) {
+					return;
+				}
+				if (knode.type == 3 && _trim(node.nodeValue).length > 0) {
+					var parent;
+					while ((parent = knode.parent()) && parent.isStyle() && parent.children().length == 1) {
+						knode = parent;
+					}
+					_wrapNode(knode, wrapper);
+				}
+			}
+		});
+		range.moveToBookmark(bookmark);
+		return self;
+	},
+	split : function(isStart, map) {
+		var range = this.range, doc = range.doc;
+		var tempRange = range.cloneRange().collapse(isStart);
+		var node = tempRange.startContainer, pos = tempRange.startOffset,
+			parent = node.nodeType == 3 ? node.parentNode : node,
+			needSplit = false, knode;
+		while (parent && parent.parentNode) {
+			knode = K(parent);
+			if (map) {
+				if (!knode.isStyle()) {
+					break;
+				}
+				if (!_hasAttrOrCss(knode, map)) {
+					break;
+				}
+			} else {
+				if (_NOSPLIT_TAG_MAP[knode.name]) {
+					break;
+				}
+			}
+			needSplit = true;
+			parent = parent.parentNode;
+		}
+		if (needSplit) {
+			var dummy = doc.createElement('span');
+			range.cloneRange().collapse(!isStart).insertNode(dummy);
+			if (isStart) {
+				tempRange.setStartBefore(parent.firstChild).setEnd(node, pos);
+			} else {
+				tempRange.setStart(node, pos).setEndAfter(parent.lastChild);
+			}
+			var frag = tempRange.extractContents(),
+				first = frag.firstChild, last = frag.lastChild;
+			if (isStart) {
+				tempRange.insertNode(frag);
+				range.setStartAfter(last).setEndBefore(dummy);
+			} else {
+				parent.appendChild(frag);
+				range.setStartBefore(dummy).setEndBefore(first);
+			}
+			var dummyParent = dummy.parentNode;
+			if (dummyParent == range.endContainer) {
+				var prev = K(dummy).prev(), next = K(dummy).next();
+				if (prev && next && prev.type == 3 && next.type == 3) {
+					range.setEnd(prev[0], prev[0].nodeValue.length);
+				} else if (!isStart) {
+					range.setEnd(range.endContainer, range.endOffset - 1);
+				}
+			}
+			dummyParent.removeChild(dummy);
+		}
+		return this;
+	},
+	remove : function(map) {
+		var self = this, doc = self.doc, range = self.range;
+		range.enlarge();
+		if (range.startOffset === 0) {
+			var ksc = K(range.startContainer), parent;
+			while ((parent = ksc.parent()) && parent.isStyle() && parent.children().length == 1) {
+				ksc = parent;
+			}
+			range.setStart(ksc[0], 0);
+			ksc = K(range.startContainer);
+			if (ksc.isBlock()) {
+				_removeAttrOrCss(ksc, map);
+			}
+			var kscp = ksc.parent();
+			if (kscp && kscp.isBlock()) {
+				_removeAttrOrCss(kscp, map);
+			}
+		}
+		var sc, so;
+		if (range.collapsed) {
+			self.split(true, map);
+			sc = range.startContainer;
+			so = range.startOffset;
+			if (so > 0) {
+				var sb = K(sc.childNodes[so - 1]);
+				if (sb && _isEmptyNode(sb)) {
+					sb.remove();
+					range.setStart(sc, so - 1);
+				}
+			}
+			var sa = K(sc.childNodes[so]);
+			if (sa && _isEmptyNode(sa)) {
+				sa.remove();
+			}
+			if (_isEmptyNode(sc)) {
+				range.startBefore(sc);
+				sc.remove();
+			}
+			range.collapse(true);
+			return self;
+		}
+		self.split(true, map);
+		self.split(false, map);
+		var startDummy = doc.createElement('span'), endDummy = doc.createElement('span');
+		range.cloneRange().collapse(false).insertNode(endDummy);
+		range.cloneRange().collapse(true).insertNode(startDummy);
+		var nodeList = [], cmpStart = false;
+		K(range.commonAncestor()).scan(function(node) {
+			if (!cmpStart && node == startDummy) {
+				cmpStart = true;
+				return;
+			}
+			if (node == endDummy) {
+				return false;
+			}
+			if (cmpStart) {
+				nodeList.push(node);
+			}
+		});
+		K(startDummy).remove();
+		K(endDummy).remove();
+		sc = range.startContainer;
+		so = range.startOffset;
+		var ec = range.endContainer, eo = range.endOffset;
+		if (so > 0) {
+			var startBefore = K(sc.childNodes[so - 1]);
+			if (startBefore && _isEmptyNode(startBefore)) {
+				startBefore.remove();
+				range.setStart(sc, so - 1);
+				if (sc == ec) {
+					range.setEnd(ec, eo - 1);
+				}
+			}
+			var startAfter = K(sc.childNodes[so]);
+			if (startAfter && _isEmptyNode(startAfter)) {
+				startAfter.remove();
+				if (sc == ec) {
+					range.setEnd(ec, eo - 1);
+				}
+			}
+		}
+		var endAfter = K(ec.childNodes[range.endOffset]);
+		if (endAfter && _isEmptyNode(endAfter)) {
+			endAfter.remove();
+		}
+		var bookmark = range.createBookmark(true);
+		_each(nodeList, function(i, node) {
+			_removeAttrOrCss(K(node), map);
+		});
+		range.moveToBookmark(bookmark);
+		return self;
+	},
+	commonNode : function(map) {
+		var range = this.range;
+		var ec = range.endContainer, eo = range.endOffset,
+			node = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
+		function find(node) {
+			var child = node, parent = node;
+			while (parent) {
+				if (_hasAttrOrCss(K(parent), map)) {
+					return K(parent);
+				}
+				parent = parent.parentNode;
+			}
+			while (child && (child = child.lastChild)) {
+				if (_hasAttrOrCss(K(child), map)) {
+					return K(child);
+				}
+			}
+			return null;
+		}
+		var cNode = find(node);
+		if (cNode) {
+			return cNode;
+		}
+		if (node.nodeType == 1 || (ec.nodeType == 3 && eo === 0)) {
+			var prev = K(node).prev();
+			if (prev) {
+				return find(prev);
+			}
+		}
+		return null;
+	},
+	commonAncestor : function(tagName) {
+		var range = this.range,
+			sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset,
+			startNode = (sc.nodeType == 3 || so === 0) ? sc : sc.childNodes[so - 1],
+			endNode = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
+		function find(node) {
+			while (node) {
+				if (node.nodeType == 1) {
+					if (node.tagName.toLowerCase() === tagName) {
+						return node;
+					}
+				}
+				node = node.parentNode;
+			}
+			return null;
+		}
+		var start = find(startNode), end = find(endNode);
+		if (start && end && start === end) {
+			return K(start);
+		}
+		return null;
+	},
+	state : function(key) {
+		var self = this, doc = self.doc, bool = false;
+		try {
+			bool = doc.queryCommandState(key);
+		} catch (e) {}
+		return bool;
+	},
+	val : function(key) {
+		var self = this, doc = self.doc, range = self.range;
+		function lc(val) {
+			return val.toLowerCase();
+		}
+		key = lc(key);
+		var val = '', knode;
+		if (key === 'fontfamily' || key === 'fontname') {
+			val = _nativeCommandValue(doc, 'fontname');
+			val = val.replace(/['"]/g, '');
+			return lc(val);
+		}
+		if (key === 'formatblock') {
+			val = _nativeCommandValue(doc, key);
+			if (val === '') {
+				knode = self.commonNode({'h1,h2,h3,h4,h5,h6,p,div,pre,address' : '*'});
+				if (knode) {
+					val = knode.name;
+				}
+			}
+			if (val === 'Normal') {
+				val = 'p';
+			}
+			return lc(val);
+		}
+		if (key === 'fontsize') {
+			knode = self.commonNode({'*' : '.font-size'});
+			if (knode) {
+				val = knode.css('font-size');
+			}
+			return lc(val);
+		}
+		if (key === 'forecolor') {
+			knode = self.commonNode({'*' : '.color'});
+			if (knode) {
+				val = knode.css('color');
+			}
+			val = _toHex(val);
+			if (val === '') {
+				val = 'default';
+			}
+			return lc(val);
+		}
+		if (key === 'hilitecolor') {
+			knode = self.commonNode({'*' : '.background-color'});
+			if (knode) {
+				val = knode.css('background-color');
+			}
+			val = _toHex(val);
+			if (val === '') {
+				val = 'default';
+			}
+			return lc(val);
+		}
+		return val;
+	},
+	toggle : function(wrapper, map) {
+		var self = this;
+		if (self.commonNode(map)) {
+			self.remove(map);
+		} else {
+			self.wrap(wrapper);
+		}
+		return self.select();
+	},
+	bold : function() {
+		return this.toggle('<strong></strong>', {
+			span : '.font-weight=bold',
+			strong : '*',
+			b : '*'
+		});
+	},
+	italic : function() {
+		return this.toggle('<em></em>', {
+			span : '.font-style=italic',
+			em : '*',
+			i : '*'
+		});
+	},
+	underline : function() {
+		return this.toggle('<u></u>', {
+			span : '.text-decoration=underline',
+			u : '*'
+		});
+	},
+	strikethrough : function() {
+		return this.toggle('<s></s>', {
+			span : '.text-decoration=line-through',
+			s : '*'
+		});
+	},
+	forecolor : function(val) {
+		return this.wrap('<span style="color:' + val + ';"></span>').select();
+	},
+	hilitecolor : function(val) {
+		return this.wrap('<span style="background-color:' + val + ';"></span>').select();
+	},
+	fontsize : function(val) {
+		return this.wrap('<span style="font-size:' + val + ';"></span>').select();
+	},
+	fontname : function(val) {
+		return this.fontfamily(val);
+	},
+	fontfamily : function(val) {
+		return this.wrap('<span style="font-family:' + val + ';"></span>').select();
+	},
+	removeformat : function() {
+		var map = {
+			'*' : '.font-weight,.font-style,.text-decoration,.color,.background-color,.font-size,.font-family,.text-indent'
+		},
+		tags = _STYLE_TAG_MAP;
+		_each(tags, function(key, val) {
+			map[key] = '*';
+		});
+		this.remove(map);
+		return this.select();
+	},
+	inserthtml : function(val, quickMode) {
+		var self = this, range = self.range;
+		if (val === '') {
+			return self;
+		}
+		function pasteHtml(range, val) {
+			val = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + val;
+			var rng = range.get();
+			if (rng.item) {
+				rng.item(0).outerHTML = val;
+			} else {
+				rng.pasteHTML(val);
+			}
+			var temp = range.doc.getElementById('__kindeditor_temp_tag__');
+			temp.parentNode.removeChild(temp);
+			var newRange = _toRange(rng);
+			range.setEnd(newRange.endContainer, newRange.endOffset);
+			range.collapse(false);
+			self.select(false);
+		}
+		function insertHtml(range, val) {
+			var doc = range.doc,
+				frag = doc.createDocumentFragment();
+			K('@' + val, doc).each(function() {
+				frag.appendChild(this);
+			});
+			range.deleteContents();
+			range.insertNode(frag);
+			range.collapse(false);
+			self.select(false);
+		}
+		if (_IERANGE && quickMode) {
+			try {
+				pasteHtml(range, val);
+			} catch(e) {
+				insertHtml(range, val);
+			}
+			return self;
+		}
+		insertHtml(range, val);
+		return self;
+	},
+	hr : function() {
+		return this.inserthtml('<hr />');
+	},
+	print : function() {
+		this.win.print();
+		return this;
+	},
+	insertimage : function(url, title, width, height, border, align) {
+		title = _undef(title, '');
+		border = _undef(border, 0);
+		var html = '<img src="' + _escape(url) + '" data-ke-src="' + _escape(url) + '" ';
+		if (width) {
+			html += 'width="' + _escape(width) + '" ';
+		}
+		if (height) {
+			html += 'height="' + _escape(height) + '" ';
+		}
+		if (title) {
+			html += 'title="' + _escape(title) + '" ';
+		}
+		if (align) {
+			html += 'align="' + _escape(align) + '" ';
+		}
+		html += 'alt="' + _escape(title) + '" ';
+		html += '/>';
+		return this.inserthtml(html);
+	},
+	createlink : function(url, type) {
+		var self = this, doc = self.doc, range = self.range;
+		self.select();
+		var a = self.commonNode({ a : '*' });
+		if (a && !range.isControl()) {
+			range.selectNode(a.get());
+			self.select();
+		}
+		var html = '<a href="' + _escape(url) + '" data-ke-src="' + _escape(url) + '" ';
+		if (type) {
+			html += ' target="' + _escape(type) + '"';
+		}
+		if (range.collapsed) {
+			html += '>' + _escape(url) + '</a>';
+			return self.inserthtml(html);
+		}
+		if (range.isControl()) {
+			var node = K(range.startContainer.childNodes[range.startOffset]);
+			html += '></a>';
+			node.after(K(html, doc));
+			node.next().append(node);
+			range.selectNode(node[0]);
+			return self.select();
+		}
+		function setAttr(node, url, type) {
+			K(node).attr('href', url).attr('data-ke-src', url);
+			if (type) {
+				K(node).attr('target', type);
+			} else {
+				K(node).removeAttr('target');
+			}
+		}
+		var sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset;
+		if (sc.nodeType == 1 && sc === ec && so + 1 === eo) {
+			var child = sc.childNodes[so];
+			if (child.nodeName.toLowerCase() == 'a') {
+				setAttr(child, url, type);
+				return self;
+			}
+		}
+		_nativeCommand(doc, 'createlink', '__kindeditor_temp_url__');
+		K('a[href="__kindeditor_temp_url__"]', doc).each(function() {
+			setAttr(this, url, type);
+		});
+		return self;
+	},
+	unlink : function() {
+		var self = this, doc = self.doc, range = self.range;
+		self.select();
+		if (range.collapsed) {
+			var a = self.commonNode({ a : '*' });
+			if (a) {
+				range.selectNode(a.get());
+				self.select();
+			}
+			_nativeCommand(doc, 'unlink', null);
+			if (_WEBKIT && K(range.startContainer).name === 'img') {
+				var parent = K(range.startContainer).parent();
+				if (parent.name === 'a') {
+					parent.remove(true);
+				}
+			}
+		} else {
+			_nativeCommand(doc, 'unlink', null);
+		}
+		return self;
+	}
+});
+_each(('formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,' +
+	'insertunorderedlist,indent,outdent,subscript,superscript').split(','), function(i, name) {
+	KCmd.prototype[name] = function(val) {
+		var self = this;
+		self.select();
+		_nativeCommand(self.doc, name, val);
+		if (_IERANGE && _inArray(name, 'justifyleft,justifycenter,justifyright,justifyfull'.split(',')) >= 0) {
+			self.selection();
+		}
+		if (!_IERANGE || _inArray(name, 'formatblock,selectall,insertorderedlist,insertunorderedlist'.split(',')) >= 0) {
+			self.selection();
+		}
+
+		return self;
+	};
+});
+_each('cut,copy,paste'.split(','), function(i, name) {
+	KCmd.prototype[name] = function() {
+		var self = this;
+		if (!self.doc.queryCommandSupported(name)) {
+			throw 'not supported';
+		}
+		self.select();
+		_nativeCommand(self.doc, name, null);
+		return self;
+	};
+});
+function _cmd(mixed) {
+	if (mixed.nodeName) {
+		var doc = _getDoc(mixed);
+		mixed = _range(doc).selectNodeContents(doc.body).collapse(false);
+	}
+	return new KCmd(mixed);
+}
+K.CmdClass = KCmd;
+K.cmd = _cmd;
+function _drag(options) {
+	var moveEl = options.moveEl,
+		moveFn = options.moveFn,
+		clickEl = options.clickEl || moveEl,
+		beforeDrag = options.beforeDrag,
+		iframeFix = options.iframeFix === undefined ? true : options.iframeFix;
+	var docs = [document];
+	if (iframeFix) {
+		K('iframe').each(function() {
+			var src = _formatUrl(this.src || '', 'absolute');
+			if (/^https?:\/\//.test(src)) {
+				return;
+			}
+			var doc;
+			try {
+				doc = _iframeDoc(this);
+			} catch(e) {}
+			if (doc) {
+				var pos = K(this).pos();
+				K(doc).data('pos-x', pos.x);
+				K(doc).data('pos-y', pos.y);
+				docs.push(doc);
+			}
+		});
+	}
+	clickEl.mousedown(function(e) {
+		//新加的
+		if(e.button !== 0 && e.button !== 1) {
+			return;
+		}
+		e.stopPropagation();
+		var self = clickEl.get(),
+			x = _removeUnit(moveEl.css('left')),
+			y = _removeUnit(moveEl.css('top')),
+			width = moveEl.width(),
+			height = moveEl.height(),
+			pageX = e.pageX,
+			pageY = e.pageY;
+		if (beforeDrag) {
+			beforeDrag();
+		}
+		function moveListener(e) {
+			e.preventDefault();
+			var kdoc = K(_getDoc(e.target));
+			var diffX = _round((kdoc.data('pos-x') || 0) + e.pageX - pageX);
+			var diffY = _round((kdoc.data('pos-y') || 0) + e.pageY - pageY);
+			moveFn.call(clickEl, x, y, width, height, diffX, diffY);
+		}
+		function selectListener(e) {
+			e.preventDefault();
+		}
+		function upListener(e) {
+			e.preventDefault();
+			K(docs).unbind('mousemove', moveListener)
+				.unbind('mouseup', upListener)
+				.unbind('selectstart', selectListener);
+			if (self.releaseCapture) {
+				self.releaseCapture();
+			}
+		}
+		K(docs).mousemove(moveListener)
+			.mouseup(upListener)
+			.bind('selectstart', selectListener);
+		if (self.setCapture) {
+			self.setCapture();
+		}
+	});
+}
+function KWidget(options) {
+	this.init(options);
+}
+_extend(KWidget, {
+	init : function(options) {
+		var self = this;
+		self.name = options.name || '';
+		self.doc = options.doc || document;
+		self.win = _getWin(self.doc);
+		self.x = _addUnit(options.x);
+		self.y = _addUnit(options.y);
+		self.z = options.z;
+		self.width = _addUnit(options.width);
+		self.height = _addUnit(options.height);
+		self.div = K('<div style="display:block;"></div>');
+		self.options = options;
+		self._alignEl = options.alignEl;
+		if (self.width) {
+			self.div.css('width', self.width);
+		}
+		if (self.height) {
+			self.div.css('height', self.height);
+		}
+		if (self.z) {
+			self.div.css({
+				position : 'absolute',
+				left : self.x,
+				top : self.y,
+				'z-index' : self.z
+			});
+		}
+		if (self.z && (self.x === undefined || self.y === undefined)) {
+			self.autoPos(self.width, self.height);
+		}
+		if (options.cls) {
+			self.div.addClass(options.cls);
+		}
+		if (options.shadowMode) {
+			self.div.addClass('ke-shadow');
+		}
+		if (options.css) {
+			self.div.css(options.css);
+		}
+		if (options.src) {
+			K(options.src).replaceWith(self.div);
+		} else {
+			K(self.doc.body).append(self.div);
+		}
+		if (options.html) {
+			self.div.html(options.html);
+		}
+		if (options.autoScroll) {
+			if (_IE && _V < 7 || _QUIRKS) {
+				var scrollPos = _getScrollPos();
+				K(self.win).bind('scroll', function(e) {
+					var pos = _getScrollPos(),
+						diffX = pos.x - scrollPos.x,
+						diffY = pos.y - scrollPos.y;
+					self.pos(_removeUnit(self.x) + diffX, _removeUnit(self.y) + diffY, false);
+				});
+			} else {
+				self.div.css('position', 'fixed');
+			}
+		}
+	},
+	pos : function(x, y, updateProp) {
+		var self = this;
+		updateProp = _undef(updateProp, true);
+		if (x !== null) {
+			x = x < 0 ? 0 : _addUnit(x);
+			self.div.css('left', x);
+			if (updateProp) {
+				self.x = x;
+			}
+		}
+		if (y !== null) {
+			y = y < 0 ? 0 : _addUnit(y);
+			self.div.css('top', y);
+			if (updateProp) {
+				self.y = y;
+			}
+		}
+		return self;
+	},
+	autoPos : function(width, height) {
+		var self = this,
+			w = _removeUnit(width) || 0,
+			h = _removeUnit(height) || 0,
+			scrollPos = _getScrollPos();
+		if (self._alignEl) {
+			var knode = K(self._alignEl),
+				pos = knode.pos(),
+				diffX = _round(knode[0].clientWidth / 2 - w / 2),
+				diffY = _round(knode[0].clientHeight / 2 - h / 2);
+			x = diffX < 0 ? pos.x : pos.x + diffX;
+			y = diffY < 0 ? pos.y : pos.y + diffY;
+		} else {
+			var docEl = _docElement(self.doc);
+			x = _round(scrollPos.x + (docEl.clientWidth - w) / 2);
+			y = _round(scrollPos.y + (docEl.clientHeight - h) / 2);
+		}
+		if (!(_IE && _V < 7 || _QUIRKS)) {
+			x -= scrollPos.x;
+			y -= scrollPos.y;
+		}
+		return self.pos(x, y);
+	},
+	remove : function() {
+		var self = this;
+		if (_IE && _V < 7 || _QUIRKS) {
+			K(self.win).unbind('scroll');
+		}
+		self.div.remove();
+		_each(self, function(i) {
+			self[i] = null;
+		});
+		return this;
+	},
+	show : function() {
+		this.div.show();
+		return this;
+	},
+	hide : function() {
+		this.div.hide();
+		return this;
+	},
+	draggable : function(options) {
+		var self = this;
+		options = options || {};
+		options.moveEl = self.div;
+		options.moveFn = function(x, y, width, height, diffX, diffY) {
+			if ((x = x + diffX) < 0) {
+				x = 0;
+			}
+			if ((y = y + diffY) < 0) {
+				y = 0;
+			}
+			self.pos(x, y);
+		};
+		_drag(options);
+		return self;
+	}
+});
+function _widget(options) {
+	return new KWidget(options);
+}
+K.WidgetClass = KWidget;
+K.widget = _widget;
+function _iframeDoc(iframe) {
+	iframe = _get(iframe);
+	return iframe.contentDocument || iframe.contentWindow.document;
+}
+var html, _direction = '';
+if ((html = document.getElementsByTagName('html'))) {
+	_direction = html[0].dir;
+}
+
+function _getInitHtml(themesPath, bodyClass, cssPath, cssData) {
+	var arr = [
+		(_direction === '' ? '<html>' : '<html dir="' + _direction + '">'),
+		'<head><meta charset="utf-8" /><title></title>',
+		'<style>',
+		'html {margin:3px 5px;padding:0px;}',
+		'body {margin:0px;padding:0px;}',
+		'body, td {font:14px/1.5 "sans serif",tahoma,verdana,helvetica;}',
+		'body, p, div {word-wrap: break-word;}',
+		'p {margin:0 0;}',
+		'table {border-collapse:collapse;}',
+		'img {border:0;width:80px}',
+        '::-webkit-scrollbar  {width:7px;height:10px;background-color: #F5F5F5;  }',
+        '::-webkit-scrollbar-track  {-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);background-color: #F5F5F5;}',
+        '::-webkit-scrollbar-thumb  {-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);background-color: #dadada;}',
+		'noscript {display:none;}',
+		'table.ke-zeroborder td {border:1px dotted #AAA;}',
+		'img.ke-flash {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/flash.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-rm {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/rm.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-media {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/media.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-anchor {',
+		'	border:1px dashed #666;',
+		'	width:16px;',
+		'	height:16px;',
+		'}',
+		'.ke-script, .ke-noscript, .ke-display-none {',
+		'	display:none;',
+		'	font-size:0;',
+		'	width:0;',
+		'	height:0;',
+		'}',
+		'.ke-pagebreak {',
+		'	border:1px dotted #AAA;',
+		'	font-size:0;',
+		'	height:2px;',
+		'}',
+		'</style>'
+	];
+	if (!_isArray(cssPath)) {
+		cssPath = [cssPath];
+	}
+	_each(cssPath, function(i, path) {
+		if (path) {
+			arr.push('<link href="' + path + '" rel="stylesheet" />');
+		}
+	});
+	if (cssData) {
+		arr.push('<style>' + cssData + '</style>');
+	}
+	arr.push('</head><body ' + (bodyClass ? 'class="' + bodyClass + '"' : '') + '></body></html>');
+	return arr.join('\n');
+}
+function _elementVal(knode, val) {
+	if (knode.hasVal()) {
+		if (val === undefined) {
+			var html = knode.val();
+			html = html.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig, '');
+			return html;
+		}
+        if(self.placeholder != ""){
+            if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*[\，]*[\（]*[\u4e00-\u9fa5]*[\：]*[\u4e00-\u9fa5]*[\。]*[\）]*<\/\w*\>\s*$/.test(val)){
+                return knode.val("");
+            }
+        }
+		return knode.val(val);
+	}
+    if(self.placeholder != ""){
+        if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*[\，]*[\（]*[\u4e00-\u9fa5]*[\：]*[\u4e00-\u9fa5]*[\。]*[\）]*<\/\w*\>\s*$/.test(val)){
+            return knode.html("");
+        }
+    } else{
+        return knode.html(val);
+    }
+}
+function KEdit(options) {
+	this.init(options);
+}
+_extend(KEdit, KWidget, {
+	init : function(options) {
+		var self = this;
+		KEdit.parent.init.call(self, options);
+		self.srcElement = K(options.srcElement);
+		self.div.addClass('ke-edit');
+		self.designMode = _undef(options.designMode, true);
+		self.beforeGetHtml = options.beforeGetHtml;
+		self.beforeSetHtml = options.beforeSetHtml;
+		self.afterSetHtml = options.afterSetHtml;
+		var themesPath = _undef(options.themesPath, ''),
+			bodyClass = options.bodyClass,
+			cssPath = options.cssPath,
+			cssData = options.cssData,
+			isDocumentDomain = location.protocol != 'res:' && location.host.replace(/:\d+/, '') !== document.domain,
+			srcScript = ('document.open();' +
+				(isDocumentDomain ? 'document.domain="' + document.domain + '";' : '') +
+				'document.close();'),
+			iframeSrc = _IE ? ' src="javascript:void(function(){' + encodeURIComponent(srcScript) + '}())"' : '';
+		self.iframe = K('<iframe class="ke-edit-iframe" hidefocus="true" frameborder="0"' + iframeSrc + '></iframe>').css('width', '100%');
+		self.textarea = K('<textarea class="ke-edit-textarea" hidefocus="true"></textarea>').css('width', '100%');
+		self.tabIndex = isNaN(parseInt(options.tabIndex, 10)) ? self.srcElement.attr('tabindex') : parseInt(options.tabIndex, 10);
+		self.iframe.attr('tabindex', self.tabIndex);
+		self.textarea.attr('tabindex', self.tabIndex);
+		if (self.width) {
+			self.setWidth(self.width);
+		}
+		if (self.height) {
+			self.setHeight(self.height);
+		}
+		if (self.designMode) {
+			self.textarea.hide();
+		} else {
+			self.iframe.hide();
+		}
+		function ready() {
+			var doc = _iframeDoc(self.iframe);
+			doc.open();
+			if (isDocumentDomain) {
+				doc.domain = document.domain;
+			}
+
+			doc.write(_getInitHtml(themesPath, bodyClass, cssPath, cssData));
+			doc.close();
+			self.win = self.iframe[0].contentWindow;
+			self.doc = doc;
+			var cmd = _cmd(doc);
+			self.afterChange(function(e) {
+//                if (e.which == 8) {
+//                    var range = cmd.range
+//                    var bookmark = range.createBookmark();
+//                    cmd.doc.body.innerHTML = cmd.doc.body.innerHTML.replace(/<p>\s*<\/p>/g,"");
+//                    range.moveToBookmark(bookmark);
+//                }
+                cmd.selection();
+			});
+			if (_WEBKIT) {
+				K(doc).click(function(e) {
+					if (K(e.target).name === 'img') {
+						cmd.selection(true);
+						cmd.range.selectNode(e.target);
+						cmd.select();
+					}
+				});
+			}
+			if (_IE) {
+				self._mousedownHandler = function() {
+					var newRange = cmd.range.cloneRange();
+					newRange.shrink();
+					if (newRange.isControl()) {
+						self.blur();
+					}
+				};
+				K(document).mousedown(self._mousedownHandler);
+				K(doc).keydown(function(e) {
+					if (e.which == 8) {
+						cmd.selection();
+						var rng = cmd.range;
+						if (rng.isControl()) {
+							rng.collapse(true);
+							K(rng.startContainer.childNodes[rng.startOffset]).remove();
+							e.preventDefault();
+						}
+					}
+				});
+			}
+			self.cmd = cmd;
+			self.html(_elementVal(self.srcElement));
+			if (_IE) {
+				doc.body.disabled = true;
+				doc.body.contentEditable = true;
+				doc.body.removeAttribute('disabled');
+			} else {
+				doc.designMode = 'on';
+			}
+			if (options.afterCreate) {
+				options.afterCreate.call(self);
+			}
+		}
+		if (isDocumentDomain) {
+			self.iframe.bind('load', function(e) {
+				self.iframe.unbind('load');
+				if (_IE) {
+					ready();
+				} else {
+					setTimeout(ready, 0);
+				}
+			});
+		}
+		self.div.append(self.iframe);
+		self.div.append(self.textarea);
+		self.srcElement.hide();
+		!isDocumentDomain && ready();
+	},
+	setWidth : function(val) {
+		var self = this;
+		val = _addUnit(val);
+		self.width = val;
+		self.div.css('width', val);
+		return self;
+	},
+	setHeight : function(val) {
+		var self = this;
+		val = _addUnit(val);
+		self.height = val;
+		self.div.css('height', val);
+		self.iframe.css('height', val);
+		if ((_IE && _V < 8) || _QUIRKS) {
+			val = _addUnit(_removeUnit(val) - 2);
+		}
+		self.textarea.css('height', val);
+		return self;
+	},
+	remove : function() {
+		var self = this, doc = self.doc;
+		K(doc.body).unbind();
+		K(doc).unbind();
+		K(self.win).unbind();
+		if (self._mousedownHandler) {
+			K(document).unbind('mousedown', self._mousedownHandler);
+		}
+		_elementVal(self.srcElement, self.html());
+		self.srcElement.show();
+		doc.write('');
+		self.iframe.unbind();
+		self.textarea.unbind();
+		KEdit.parent.remove.call(self);
+	},
+	html : function(val, isFull) {
+		var self = this, doc = self.doc;
+		if (self.designMode) {
+			var body = doc.body;
+			if (val === undefined) {
+				if (isFull) {
+					val = '<!doctype html><html>' + body.parentNode.innerHTML + '</html>';
+				} else {
+					val = body.innerHTML;
+				}
+                //yk
+				if (self.beforeGetHtml) {
+					val = self.beforeGetHtml(val);
+				}
+				if (_GECKO && val == '<br />') {
+					val = '';
+				}
+				return val;
+			}
+			if (self.beforeSetHtml) {
+				val = self.beforeSetHtml(val);
+			}
+			if (_IE && _V >= 9) {
+				val = val.replace(/(<.*?checked=")checked(".*>)/ig, '$1$2');
+			}
+			K(body).html(val);
+			if (self.afterSetHtml) {
+				self.afterSetHtml();
+			}
+			return self;
+		}
+		if (val === undefined) {
+			return self.textarea.val();
+		}
+		self.textarea.val(val);
+		return self;
+	},
+	design : function(bool) {
+		var self = this, val;
+		if (bool === undefined ? !self.designMode : bool) {
+			if (!self.designMode) {
+				val = self.html();
+				self.designMode = true;
+				
+				//self.html(val);
+				//self.textarea.hide();
+				//self.iframe.show();
+				//新加
+				self.textarea.hide();
+				self.html(val);
+				var iframe = self.iframe;
+				var height = _removeUnit(self.height);
+				iframe.height(height - 2);
+				iframe.show();
+				setTimeout(function() {
+					iframe.height(height);
+				}, 0);
+			}
+		} else {
+			if (self.designMode) {
+				val = self.html();
+				self.designMode = false;
+				self.html(val);
+				self.iframe.hide();
+				self.textarea.show();
+			}
+		}
+		return self.focus();
+	},
+	focus : function() {
+		var self = this;
+		self.designMode ? self.win.focus() : self.textarea[0].focus();
+		return self;
+	},
+	blur : function() {
+		var self = this;
+		if (_IE) {
+			var input = K('<input type="text" style="float:left;width:0;height:0;padding:0;margin:0;border:0;" value="" />', self.div);
+			self.div.append(input);
+			input[0].focus();
+			input.remove();
+		} else {
+			self.designMode ? self.win.blur() : self.textarea[0].blur();
+		}
+		return self;
+	},
+	afterChange : function(fn) {
+		var self = this, doc = self.doc, body = doc.body;
+		K(doc).keyup(function(e) {
+			if (!e.ctrlKey && !e.altKey && _CHANGE_KEY_MAP[e.which]) {
+				fn(e);
+			}
+		});
+		K(doc).mouseup(fn).contextmenu(fn);
+		K(self.win).blur(fn);
+		function timeoutHandler(e) {
+			setTimeout(function() {
+				fn(e);
+			}, 1);
+		}
+		K(body).bind('paste', timeoutHandler);
+		K(body).bind('cut', timeoutHandler);
+		return self;
+	}
+});
+function _edit(options) {
+	return new KEdit(options);
+}
+K.EditClass = KEdit;
+K.edit = _edit;
+K.iframeDoc = _iframeDoc;
+function _selectToolbar(name, fn) {
+	var self = this,
+		knode = self.get(name);
+	if (knode) {
+		if (knode.hasClass('ke-disabled')) {
+			return;
+		}
+		fn(knode);
+	}
+}
+function KToolbar(options) {
+	this.init(options);
+}
+_extend(KToolbar, KWidget, {
+	init : function(options) {
+		var self = this;
+		KToolbar.parent.init.call(self, options);
+		self.disableMode = _undef(options.disableMode, false);
+		self.noDisableItemMap = _toMap(_undef(options.noDisableItems, []));
+		self._itemMap = {};
+		self.div.addClass('ke-toolbar').bind('contextmenu,mousedown,mousemove', function(e) {
+			e.preventDefault();
+		}).attr('unselectable', 'on');
+		function find(target) {
+			var knode = K(target);
+			if (knode.hasClass('ke-outline')) {
+				return knode;
+			}
+			if (knode.hasClass('ke-toolbar-icon')) {
+				return knode.parent();
+			}
+		}
+		function hover(e, method) {
+			var knode = find(e.target);
+			if (knode) {
+				if (knode.hasClass('ke-disabled')) {
+					return;
+				}
+				if (knode.hasClass('ke-selected')) {
+					return;
+				}
+				knode[method]('ke-on');
+			}
+		}
+		self.div.mouseover(function(e) {
+			hover(e, 'addClass');
+		})
+		.mouseout(function(e) {
+			hover(e, 'removeClass');
+		})
+		.click(function(e) {
+			var knode = find(e.target);
+			if (knode) {
+				if (knode.hasClass('ke-disabled')) {
+					return;
+				}
+				self.options.click.call(this, e, knode.attr('data-name'));
+			}
+		});
+	},
+	get : function(name) {
+		//if(this._itemMap[name])return this._itemMap[name];
+		//return this._itemMap[name]=K("span.ke-icon-"+name,this.div).parent()
+//		if (this._itemMap[name]) {
+//			return this._itemMap[name];
+//		}
+//        if($("#define").css('display') == 'block'){
+//            pdiv = $("#define")
+//        }else if($("#full").css('display') == 'block'){
+//            pdiv = $("#full")
+//        }
+		var container = this.div;
+		if(!$("#define",container).is(':hidden')){
+			pdiv = $("#define",container);
+		}else if(!$("#full",container).is(':hidden')){
+			pdiv = $("#full",container);
+		}
+		return (this._itemMap[name] = K('span.ke-icon-' + name, this.div).parent());
+	},
+	select : function(name) {
+		_selectToolbar.call(this, name, function(knode) {
+			knode.addClass('ke-selected');
+		});
+		return self;
+	},
+	unselect : function(name) {
+		_selectToolbar.call(this, name, function(knode) {
+			knode.removeClass('ke-selected').removeClass('ke-on');
+		});
+		return self;
+	},
+	enable : function(name) {
+		var self = this,
+			knode = name.get ? name : self.get(name);
+		if (knode) {
+			knode.removeClass('ke-disabled');
+			knode.opacity(1);
+		}
+		return self;
+	},
+	disable : function(name) {
+		var self = this,
+			knode = name.get ? name : self.get(name);
+		if (knode) {
+			knode.removeClass('ke-selected').addClass('ke-disabled');
+			knode.opacity(0.5);
+		}
+		return self;
+	},
+	disableAll : function(bool, noDisableItems) {
+		var self = this, map = self.noDisableItemMap, item;
+		if (noDisableItems) {
+			map = _toMap(noDisableItems);
+		}
+		if (bool === undefined ? !self.disableMode : bool) {
+			K('span.ke-outline', self.div).each(function() {
+				var knode = K(this),
+					name = knode[0].getAttribute('data-name', 2);
+				if (!map[name]) {
+					self.disable(knode);
+				}
+			});
+			self.disableMode = true;
+		} else {
+			K('span.ke-outline', self.div).each(function() {
+				var knode = K(this),
+					name = knode[0].getAttribute('data-name', 2);
+				if (!map[name]) {
+					self.enable(knode);
+				}
+			});
+			self.disableMode = false;
+		}
+		return self;
+	}
+});
+function _toolbar(options) {
+	return new KToolbar(options);
+}
+K.ToolbarClass = KToolbar;
+K.toolbar = _toolbar;
+function KMenu(options) {
+	this.init(options);
+}
+_extend(KMenu, KWidget, {
+	init : function(options) {
+		var self = this;
+		options.z = options.z || 811213;
+		KMenu.parent.init.call(self, options);
+		self.centerLineMode = _undef(options.centerLineMode, true);
+		self.div.addClass('ke-menu').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		}).attr('unselectable', 'on');
+	},
+	addItem : function(item) {
+		var self = this;
+		if (item.title === '-') {
+			self.div.append(K('<div class="ke-menu-separator"></div>'));
+			return;
+		}
+		var itemDiv = K('<div class="ke-menu-item" unselectable="on"></div>'),
+			leftDiv = K('<div class="ke-inline-block ke-menu-item-left"></div>'),
+			rightDiv = K('<div class="ke-inline-block ke-menu-item-right"></div>'),
+			height = _addUnit(item.height),
+			iconClass = _undef(item.iconClass, '');
+		self.div.append(itemDiv);
+		if (height) {
+			itemDiv.css('height', height);
+			rightDiv.css('line-height', height);
+		}
+		var centerDiv;
+		if (self.centerLineMode) {
+			centerDiv = K('<div class="ke-inline-block ke-menu-item-center"></div>');
+			if (height) {
+				centerDiv.css('height', height);
+			}
+		}
+		itemDiv.mouseover(function(e) {
+			K(this).addClass('ke-menu-item-on');
+			if (centerDiv) {
+				centerDiv.addClass('ke-menu-item-center-on');
+			}
+		})
+		.mouseout(function(e) {
+			K(this).removeClass('ke-menu-item-on');
+			if (centerDiv) {
+				centerDiv.removeClass('ke-menu-item-center-on');
+			}
+		})
+		.click(function(e) {
+			item.click.call(K(this));
+			e.stopPropagation();
+		})
+		.append(leftDiv);
+		if (centerDiv) {
+			itemDiv.append(centerDiv);
+		}
+		itemDiv.append(rightDiv);
+		if (item.checked) {
+			iconClass = 'ke-icon-checked';
+		}
+		if (iconClass !== '') {
+			leftDiv.html('<span class="ke-inline-block ke-toolbar-icon ke-toolbar-icon-url ' + iconClass + '"></span>');
+		}
+		rightDiv.html(item.title);
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (self.options.beforeRemove) {
+			self.options.beforeRemove.call(self);
+		}
+		K('.ke-menu-item', self.div[0]).unbind();
+		KMenu.parent.remove.call(self);
+		return self;
+	}
+});
+function _menu(options) {
+	return new KMenu(options);
+}
+K.MenuClass = KMenu;
+K.menu = _menu;
+function KColorPicker(options) {
+	this.init(options);
+}
+_extend(KColorPicker, KWidget, {
+	init : function(options) {
+		var self = this;
+		options.z = options.z || 811213;
+		KColorPicker.parent.init.call(self, options);
+		var colors = options.colors || [
+			['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
+			['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
+			['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
+			['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
+		];
+		self.selectedColor = (options.selectedColor || '').toLowerCase();
+		self._cells = [];
+		self.div.addClass('ke-colorpicker').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		}).attr('unselectable', 'on');
+		var table = self.doc.createElement('table');
+		self.div.append(table);
+		table.className = 'ke-colorpicker-table';
+		table.cellPadding = 0;
+		table.cellSpacing = 0;
+		table.border = 0;
+		var row = table.insertRow(0), cell = row.insertCell(0);
+		cell.colSpan = colors[0].length;
+		self._addAttr(cell, '', 'ke-colorpicker-cell-top');
+		for (var i = 0; i < colors.length; i++) {
+			row = table.insertRow(i + 1);
+			for (var j = 0; j < colors[i].length; j++) {
+				cell = row.insertCell(j);
+				self._addAttr(cell, colors[i][j], 'ke-colorpicker-cell');
+			}
+		}
+	},
+	_addAttr : function(cell, color, cls) {
+		var self = this;
+		cell = K(cell).addClass(cls);
+		if (self.selectedColor === color.toLowerCase()) {
+			cell.addClass('ke-colorpicker-cell-selected');
+		}
+		cell.attr('title', color || self.options.noColor);
+		cell.mouseover(function(e) {
+			K(this).addClass('ke-colorpicker-cell-on');
+		});
+		cell.mouseout(function(e) {
+			K(this).removeClass('ke-colorpicker-cell-on');
+		});
+		cell.click(function(e) {
+			e.stop();
+			self.options.click.call(K(this), color);
+		});
+		if (color) {
+			cell.append(K('<div class="ke-colorpicker-cell-color" unselectable="on"></div>').css('background-color', color));
+		} else {
+			cell.html(self.options.noColor);
+		}
+		K(cell).attr('unselectable', 'on');
+		self._cells.push(cell);
+	},
+	remove : function() {
+		var self = this;
+		_each(self._cells, function() {
+			this.unbind();
+		});
+		KColorPicker.parent.remove.call(self);
+		return self;
+	}
+});
+function _colorpicker(options) {
+	return new KColorPicker(options);
+}
+K.ColorPickerClass = KColorPicker;
+K.colorpicker = _colorpicker;
+function KUploadButton(options) {
+	this.init(options);
+}
+_extend(KUploadButton, {
+	init : function(options) {
+		//dump_obj(options);
+		var self = this,
+			button = K(options.button),
+			fieldName = options.fieldName || 'file',
+			url = options.url || '',
+			title = button.val(),
+			extraParams = options.extraParams || {},
+			cls = button[0].className || '',
+			target = options.target || 'kindeditor_upload_iframe_' + new Date().getTime();
+		options.afterError = options.afterError || function(str) {
+			alert(str);
+		};
+		var hiddenElements = [];
+		for(var k in extraParams){
+			hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
+		}
+		var html = [
+			'<div class="ke-inline-block ' + cls + '">',
+			(options.target ? '' : '<iframe name="' + target + '" style="display:none;"></iframe>'),
+			(options.form ? '<div class="ke-upload-area">' : '<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + url + '">'),
+			'<span class="ke-button-common">',
+			hiddenElements.join(''),
+			'<input type="button" class="ke-button-common ke-button" value="' + title + '" />',
+			'</span>',
+			'<input type="file" class="ke-upload-file" name="' + fieldName + '" tabindex="-1" />',
+			(options.form ? '</div>' : '</form>'),
+			'</div>'].join('');
+		var div = K(html, button.doc);
+		$(div).hide()// 如果 以后要用根据 http://kindeditor.net/docs/uploadbutton.html#k-uploadbutton-options来使用uploadButton,那么这里的button会 是隐藏的
+		button.hide();
+		button.before(div);
+		self.div = div;
+		if(options.ops!=undefined)options.ops.up_file_div = div;//options.ops是KindEditor.create()的options参数
+		self.button = button;
+		self.iframe = options.target ? K('iframe[name="' + target + '"]') : K('iframe', div);
+		self.form = options.form ? K(options.form) : K('form', div);
+		self.fileBox = K('.ke-upload-file', div);
+		var width = options.width || K('.ke-button-common', div).width();
+		K('.ke-upload-area', div).width(width);
+		self.options = options;
+	},
+	submit : function() {
+		var self = this,
+			iframe = self.iframe;
+		iframe.bind('load', function() {
+			iframe.unbind();
+			var tempForm = document.createElement('form');
+			self.fileBox.before(tempForm);
+			K(tempForm).append(self.fileBox);
+			tempForm.reset();
+			K(tempForm).remove(true);
+			var doc = K.iframeDoc(iframe),
+				pre = doc.getElementsByTagName('pre')[0],
+				str = '', data;
+			if (pre) {
+				str = pre.innerHTML;
+			} else {
+				str = doc.body.innerHTML;
+			}
+			str = _unescape(str);
+			iframe[0].src = 'javascript:false';
+			try {
+				data = K.json(str);
+			} catch (e) {
+				self.options.afterError.call(self, '<!doctype html><html>' + doc.body.parentNode.innerHTML + '</html>');
+			}
+			if (data) {
+				self.options.afterUpload.call(self, data);
+			}
+		});
+		self.form[0].submit();
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (self.fileBox) {
+			self.fileBox.unbind();
+		}
+		self.iframe.remove();
+		self.div.remove();
+		self.button.show();
+		return self;
+	}
+});
+function _uploadbutton(options) {
+	return new KUploadButton(options);
+}
+K.UploadButtonClass = KUploadButton;
+K.uploadbutton = _uploadbutton;
+function _createButton(arg) {
+	arg = arg || {};
+	var name = arg.name || '',
+		span = K('<span class="ke-button-common ke-button-outer" title="' + name + '"></span>'),
+		btn = K('<input class="ke-button-common ke-button" type="button" value="' + name + '" />');
+	if (arg.click) {
+		btn.click(arg.click);
+	}
+	span.append(btn);
+	return span;
+}
+function KDialog(options) {
+	this.init(options);
+}
+_extend(KDialog, KWidget, {
+	init : function(options) {
+		var self = this;
+		var shadowMode = _undef(options.shadowMode, true);
+		options.z = options.z || 811213;
+		options.shadowMode = false;
+		options.autoScroll = _undef(options.autoScroll, true);
+		KDialog.parent.init.call(self, options);
+		var title = options.title,
+			body = K(options.body, self.doc),
+			previewBtn = options.previewBtn,
+			yesBtn = options.yesBtn,
+			noBtn = options.noBtn,
+			closeBtn = options.closeBtn,
+			showMask = _undef(options.showMask, true);
+		self.div.addClass('ke-dialog').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		var contentDiv = K('<div class="ke-dialog-content"></div>').appendTo(self.div);
+		if (_IE && _V < 7) {
+			self.iframeMask = K('<iframe src="about:blank" class="ke-dialog-shadow"></iframe>').appendTo(self.div);
+		} else if (shadowMode) {
+			K('<div class="ke-dialog-shadow"></div>').appendTo(self.div);
+		}
+		var headerDiv = K('<div class="ke-dialog-header"></div>');
+		contentDiv.append(headerDiv);
+		headerDiv.html(title);
+		self.closeIcon = K('<span class="ke-dialog-icon-close" title="' + closeBtn.name + '"></span>').click(closeBtn.click);
+		headerDiv.append(self.closeIcon);
+		self.draggable({
+			clickEl : headerDiv,
+			beforeDrag : options.beforeDrag
+		});
+		var bodyDiv = K('<div class="ke-dialog-body"></div>');
+		contentDiv.append(bodyDiv);
+		bodyDiv.append(body);
+		var footerDiv = K('<div class="ke-dialog-footer"></div>');
+		if (previewBtn || yesBtn || noBtn) {
+			contentDiv.append(footerDiv);
+		}
+		_each([
+			{ btn : previewBtn, name : 'preview' },
+			{ btn : yesBtn, name : 'yes' },
+			{ btn : noBtn, name : 'no' }
+		], function() {
+			if (this.btn) {
+				var button = _createButton(this.btn);
+				button.addClass('ke-dialog-' + this.name);
+				footerDiv.append(button);
+			}
+		});
+		if (self.height) {
+			bodyDiv.height(_removeUnit(self.height) - headerDiv.height() - footerDiv.height());
+		}
+		self.div.width(self.div.width());
+		self.div.height(self.div.height());
+		self.mask = null;
+		if (showMask) {
+			var docEl = _docElement(self.doc),
+				docWidth = Math.max(docEl.scrollWidth, docEl.clientWidth),
+				docHeight = Math.max(docEl.scrollHeight, docEl.clientHeight);
+			self.mask = _widget({
+				x : 0,
+				y : 0,
+				z : self.z - 1,
+				cls : 'ke-dialog-mask',
+				width : docWidth,
+				height : docHeight
+			});
+		}
+		self.autoPos(self.div.width(), self.div.height());
+		self.footerDiv = footerDiv;
+		self.bodyDiv = bodyDiv;
+		self.headerDiv = headerDiv;
+		self.isLoading = false;
+	},
+	setMaskIndex : function(z) {
+		var self = this;
+		self.mask.div.css('z-index', z);
+	},
+	showLoading : function(msg) {
+		msg = _undef(msg, '');
+		var self = this, body = self.bodyDiv;
+		self.loading = K('<div class="ke-dialog-loading"><div class="ke-inline-block ke-dialog-loading-content" style="margin-top:' + Math.round(body.height() / 3) + 'px;">' + msg + '</div></div>')
+			.width(body.width()).height(body.height())
+			.css('top', self.headerDiv.height() + 'px');
+		body.css('visibility', 'hidden').after(self.loading);
+		self.isLoading = true;
+		return self;
+	},
+	hideLoading : function() {
+		this.loading && this.loading.remove();
+		this.bodyDiv.css('visibility', 'visible');
+		this.isLoading = false;
+		return this;
+	},
+	remove : function() {
+		var self = this;
+		if (self.options.beforeRemove) {
+			self.options.beforeRemove.call(self);
+		}
+		self.mask && self.mask.remove();
+		self.iframeMask && self.iframeMask.remove();
+		self.closeIcon.unbind();
+		K('input', self.div).unbind();
+		K('button', self.div).unbind();
+		self.footerDiv.unbind();
+		self.bodyDiv.unbind();
+		self.headerDiv.unbind();
+		K('iframe', self.div).each(function() {
+			K(this).remove();
+		});
+		KDialog.parent.remove.call(self);
+		return self;
+	}
+});
+function _dialog(options) {
+	return new KDialog(options);
+}
+K.DialogClass = KDialog;
+K.dialog = _dialog;
+function _tabs(options) {
+	var self = _widget(options),
+		remove = self.remove,
+		afterSelect = options.afterSelect,
+		div = self.div,
+		liList = [];
+	div.addClass('ke-tabs')
+		.bind('contextmenu,mousedown,mousemove', function(e) {
+			e.preventDefault();
+		});
+	var ul = K('<ul class="ke-tabs-ul ke-clearfix"></ul>');
+	div.append(ul);
+	self.add = function(tab) {
+		var li = K('<li class="ke-tabs-li">' + tab.title + '</li>');
+		li.data('tab', tab);
+		liList.push(li);
+		ul.append(li);
+	};
+	self.selectedIndex = 0;
+	self.select = function(index) {
+		self.selectedIndex = index;
+		_each(liList, function(i, li) {
+			li.unbind();
+			if (i === index) {
+				li.addClass('ke-tabs-li-selected');
+				K(li.data('tab').panel).show('');
+			} else {
+				li.removeClass('ke-tabs-li-selected').removeClass('ke-tabs-li-on')
+				.mouseover(function() {
+					K(this).addClass('ke-tabs-li-on');
+				})
+				.mouseout(function() {
+					K(this).removeClass('ke-tabs-li-on');
+				})
+				.click(function() {
+					self.select(i);
+				});
+				K(li.data('tab').panel).hide();
+			}
+		});
+		if (afterSelect) {
+			afterSelect.call(self, index);
+		}
+	};
+	self.remove = function() {
+		_each(liList, function() {
+			this.remove();
+		});
+		ul.remove();
+		remove.call(self);
+	};
+	return self;
+}
+K.tabs = _tabs;
+function _loadScript(url, fn) {
+	var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
+		script = document.createElement('script');
+	head.appendChild(script);
+	script.src = url;
+	script.charset = 'utf-8';
+	script.onload = script.onreadystatechange = function() {
+		if (!this.readyState || this.readyState === 'loaded') {
+			if (fn) {
+				fn();
+			}
+			script.onload = script.onreadystatechange = null;
+			head.removeChild(script);
+		}
+	};
+}
+function _chopQuery(url) {
+	var index = url.indexOf('?');
+	return index > 0 ? url.substr(0, index) : url;
+}
+function _loadStyle(url) {
+	var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
+		link = document.createElement('link'),
+		absoluteUrl = _chopQuery(_formatUrl(url, 'absolute'));
+	var links = K('link[rel="stylesheet"]', head);
+	for (var i = 0, len = links.length; i < len; i++) {
+		if (_chopQuery(_formatUrl(links[i].href, 'absolute')) === absoluteUrl) {
+			return;
+		}
+	}
+	head.appendChild(link);
+	link.href = url;
+	link.rel = 'stylesheet';
+}
+function _ajax(url, fn, method, param, dataType) {
+	method = method || 'GET';
+	dataType = dataType || 'json';
+	var xhr = window.XMLHttpRequest ? new window.XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
+	xhr.open(method, url, true);
+	xhr.onreadystatechange = function () {
+		if (xhr.readyState == 4 && xhr.status == 200) {
+			if (fn) {
+				var data = _trim(xhr.responseText);
+				if (dataType == 'json') {
+					data = _json(data);
+				}
+				fn(data);
+			}
+		}
+	};
+	if (method == 'POST') {
+		var params = [];
+		_each(param, function(key, val) {
+			params.push(encodeURIComponent(key) + '=' + encodeURIComponent(val));
+		});
+		try {
+			xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+		} catch (e) {}
+		xhr.send(params.join('&'));
+	} else {
+		xhr.send(null);
+	}
+}
+K.loadScript = _loadScript;
+K.loadStyle = _loadStyle;
+K.ajax = _ajax;
+var _plugins = {};
+function _plugin(name, fn) {
+	if (name === undefined) {
+		return _plugins;
+	}
+	if (!fn) {
+		return _plugins[name];
+	}
+	_plugins[name] = fn;
+}
+var _language = {};
+function _parseLangKey(key) {
+	var match, ns = 'core';
+	if ((match = /^(\w+)\.(\w+)$/.exec(key))) {
+		ns = match[1];
+		key = match[2];
+	}
+	return { ns : ns, key : key };
+}
+function _lang(mixed, langType) {
+	langType = langType === undefined ? K.options.langType : langType;
+	if (typeof mixed === 'string') {
+		if (!_language[langType]) {
+			return 'no language';
+		}
+		var pos = mixed.length - 1;
+		if (mixed.substr(pos) === '.') {
+			return _language[langType][mixed.substr(0, pos)];
+		}
+		var obj = _parseLangKey(mixed);
+		return _language[langType][obj.ns][obj.key];
+	}
+	_each(mixed, function(key, val) {
+		var obj = _parseLangKey(key);
+		if (!_language[langType]) {
+			_language[langType] = {};
+		}
+		if (!_language[langType][obj.ns]) {
+			_language[langType][obj.ns] = {};
+		}
+		_language[langType][obj.ns][obj.key] = val;
+	});
+}
+function _getImageFromRange(range, fn) {
+	if (range.collapsed) {
+		return;
+	}
+	range = range.cloneRange().up();
+	var sc = range.startContainer, so = range.startOffset;
+	if (!_WEBKIT && !range.isControl()) {
+		return;
+	}
+	var img = K(sc.childNodes[so]);
+	if (!img || img.name != 'img') {
+		return;
+	}
+	if (fn(img)) {
+		return img;
+	}
+}
+function _bindContextmenuEvent() {
+	var self = this, doc = self.edit.doc;
+	K(doc).contextmenu(function(e) {
+		if (self.menu) {
+			self.hideMenu();
+		}
+		if (!self.useContextmenu) {
+			e.preventDefault();
+			return;
+		}
+		if (self._contextmenus.length === 0) {
+			return;
+		}
+		var maxWidth = 0, items = [];
+		_each(self._contextmenus, function() {
+			if (this.title == '-') {
+				items.push(this);
+				return;
+			}
+			if (this.cond && this.cond()) {
+				items.push(this);
+				if (this.width && this.width > maxWidth) {
+					maxWidth = this.width;
+				}
+			}
+		});
+		while (items.length > 0 && items[0].title == '-') {
+			items.shift();
+		}
+		while (items.length > 0 && items[items.length - 1].title == '-') {
+			items.pop();
+		}
+		var prevItem = null;
+		_each(items, function(i) {
+			if (this.title == '-' && prevItem.title == '-') {
+				delete items[i];
+			}
+			prevItem = this;
+		});
+		if (items.length > 0) {
+			e.preventDefault();
+			var pos = K(self.edit.iframe).pos(),
+				menu = _menu({
+					x : pos.x + e.clientX,
+					y : pos.y + e.clientY,
+					width : maxWidth,
+					css : { visibility: 'hidden' },
+					shadowMode : self.shadowMode
+				});
+			_each(items, function() {
+				if (this.title) {
+					menu.addItem(this);
+				}
+			});
+			var docEl = _docElement(menu.doc),
+				menuHeight = menu.div.height();
+			if (e.clientY + menuHeight >= docEl.clientHeight - 100) {
+				menu.pos(menu.x, _removeUnit(menu.y) - menuHeight);
+			}
+			menu.div.css('visibility', 'visible');
+			self.menu = menu;
+		}
+	});
+}
+function _bindNewlineEvent() {
+	var self = this, doc = self.edit.doc, newlineTag = self.newlineTag;
+	if (_IE && newlineTag !== 'br') {
+		return;
+	}
+	if (_GECKO && _V < 3 && newlineTag !== 'p') {
+		return;
+	}
+	if (_OPERA && _V < 9) {
+		return;
+	}
+	var brSkipTagMap = _toMap('h1,h2,h3,h4,h5,h6,pre,li'),
+		pSkipTagMap = _toMap('p,h1,h2,h3,h4,h5,h6,pre,li,blockquote');
+	function getAncestorTagName(range) {
+		var ancestor = K(range.commonAncestor());
+		while (ancestor) {
+			if (ancestor.type == 1 && !ancestor.isStyle()) {
+				break;
+			}
+			ancestor = ancestor.parent();
+		}
+		return ancestor.name;
+	}
+	K(doc).keydown(function(e) {
+		if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
+			return;
+		}
+		self.cmd.selection();
+		var tagName = getAncestorTagName(self.cmd.range);
+		if (tagName == 'marquee' || tagName == 'select') {
+			return;
+		}
+		if (newlineTag === 'br' && !brSkipTagMap[tagName]) {
+			e.preventDefault();
+			self.insertHtml('<br />' + (_IE && _V < 9 ? '' : '\u200B'));
+			return;
+		}
+		if (!pSkipTagMap[tagName]) {
+			_nativeCommand(doc, 'formatblock', '<p>');
+		}
+	});
+	K(doc).keyup(function(e) {
+		if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
+			return;
+		}
+		if (newlineTag == 'br') {
+			return;
+		}
+		if (_GECKO) {
+			var root = self.cmd.commonAncestor('p');
+			var a = self.cmd.commonAncestor('a');
+			if (a && a.text() == '') {
+				a.remove(true);
+				self.cmd.range.selectNodeContents(root[0]).collapse(true);
+				self.cmd.select();
+			}
+			return;
+		}
+		self.cmd.selection();
+		var tagName = getAncestorTagName(self.cmd.range);
+		if (tagName == 'marquee' || tagName == 'select') {
+			return;
+		}
+		if (!pSkipTagMap[tagName]) {
+			_nativeCommand(doc, 'formatblock', '<p>');
+		}
+		var div = self.cmd.commonAncestor('div');
+		if (div) {
+			var p = K('<p></p>'),
+				child = div[0].firstChild;
+			while (child) {
+				var next = child.nextSibling;
+				p.append(child);
+				child = next;
+			}
+			div.before(p);
+			div.remove();
+			self.cmd.range.selectNodeContents(p[0]);
+			self.cmd.select();
+		}
+	});
+}
+function _bindTabEvent() {
+	var self = this, doc = self.edit.doc;
+	K(doc).keydown(function(e) {
+		if (e.which == 9) {
+			e.preventDefault();
+			if (self.afterTab) {
+				self.afterTab.call(self, e);
+				return;
+			}
+			var cmd = self.cmd, range = cmd.range;
+			range.shrink();
+			if (range.collapsed && range.startContainer.nodeType == 1) {
+				range.insertNode(K('@&nbsp;', doc)[0]);
+				cmd.select();
+			}
+			self.insertHtml('&nbsp;&nbsp;&nbsp;&nbsp;');
+		}
+	});
+}
+function _bindFocusEvent() {
+	var self = this;
+	K(self.edit.textarea[0], self.edit.win).focus(function(e) {
+        if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*[\，]*[\u4e00-\u9fa5]*[\。]*<\/\w*\>\s*$/.test(self.edit.html())){
+            self.edit.html('');
+        }
+		if(typeof self.options.enable_at === 'function'){
+			self.options.enable_at();
+		}
+		if (self.afterFocus) {
+			self.afterFocus.call(self, e);
+		}
+	}).blur(function(e) {
+        if(self.isEmpty()) {
+            if (self.placeholder != "") {
+                self.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>" + self.placeholder + "</span>");
+            }
+           // self.edit.html(self.placeholder);
+           // self.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>" + self.placeholder + "</span>");
+        }
+		if (self.afterBlur) {
+			self.afterBlur.call(self, e);
+		}
+	});
+}
+function _removeBookmarkTag(html) {
+	return _trim(html.replace(/<span [^>]*id="?__kindeditor_bookmark_\w+_\d+__"?[^>]*><\/span>/ig, ''));
+}
+function _removeTempTag(html) {
+	return html.replace(/<div[^>]+class="?__kindeditor_paste__"?[^>]*>[\s\S]*?<\/div>/ig, '');
+}
+function _addBookmarkToStack(stack, bookmark) {
+	if (stack.length === 0) {
+		stack.push(bookmark);
+		return;
+	}
+	var prev = stack[stack.length - 1];
+	if (_removeBookmarkTag(bookmark.html) !== _removeBookmarkTag(prev.html)) {
+		stack.push(bookmark);
+	}
+}
+function _undoToRedo(fromStack, toStack) {
+	var self = this, edit = self.edit,
+		body = edit.doc.body,
+		range, bookmark;
+	if (fromStack.length === 0) {
+		return self;
+	}
+	if (edit.designMode) {
+		range = self.cmd.range;
+		bookmark = range.createBookmark(true);
+		bookmark.html = body.innerHTML;
+	} else {
+		bookmark = {
+			html : body.innerHTML
+		};
+	}
+	_addBookmarkToStack(toStack, bookmark);
+	var prev = fromStack.pop();
+	if (_removeBookmarkTag(bookmark.html) === _removeBookmarkTag(prev.html) && fromStack.length > 0) {
+		prev = fromStack.pop();
+	}
+	if (edit.designMode) {
+		edit.html(prev.html);
+		if (prev.start) {
+			range.moveToBookmark(prev);
+			self.select();
+		}
+	} else {
+		K(body).html(_removeBookmarkTag(prev.html));
+	}
+	return self;
+}
+function KEditor(options) {
+	var self = this;
+	self.options = {};
+	function setOption(key, val) {
+		if (KEditor.prototype[key] === undefined) {
+			self[key] = val;
+		}
+		self.options[key] = val;
+	}
+	_each(options, function(key, val) {
+		setOption(key, options[key]);
+	});
+	_each(K.options, function(key, val) {
+		if (self[key] === undefined) {
+			setOption(key, val);
+		}
+	});
+	var se = K(self.srcElement || '<textarea/>');
+	if (!self.width) {
+		self.width = se[0].style.width || se.width();
+	}
+	if (!self.height) {
+		self.height = se[0].style.height || se.height();
+	}
+	setOption('width', _undef(self.width, self.minWidth));
+	setOption('height', _undef(self.height, self.minHeight));
+	setOption('width', _addUnit(self.width));
+	setOption('height', _addUnit(self.height));
+	if (_MOBILE && (!_IOS || _V < 534)) {
+		self.designMode = false;
+	}
+	self.srcElement = se;
+	self.initContent = '';
+	self.plugin = {};
+	self.isCreated = false;
+	self._handlers = {};
+	self._contextmenus = [];
+	self._undoStack = [];
+	self._redoStack = [];
+	self._firstAddBookmark = true;
+	self.menu = self.contextmenu = null;
+	self.dialogs = [];
+}
+KEditor.prototype = {
+	lang : function(mixed) {
+		return _lang(mixed, this.langType);
+	},
+	loadPlugin : function(name, fn) {
+		var self = this;
+		//新加
+		var _pluginStatus = this._pluginStatus;
+		if (!_pluginStatus) {
+			_pluginStatus = this._pluginStatus = {};
+		}
+		if (_plugins[name]) {
+			if (!_isFunction(_plugins[name])) {
+				setTimeout(function() {
+					self.loadPlugin(name, fn);
+				}, 100);
+				return self;
+			}
+			//_plugins[name].call(self, KindEditor);
+			//新加
+			if(!_pluginStatus[name]) {
+				_plugins[name].call(self, KindEditor);
+				_pluginStatus[name] = 'inited';
+			}
+			if (fn) {
+				fn.call(self);
+			}
+			return self;
+		}
+		_plugins[name] = 'loading';
+		_loadScript(self.pluginsPath + name + '/' + name + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
+			setTimeout(function() {
+				if (_plugins[name]) {
+					self.loadPlugin(name, fn);
+				}
+			}, 0);
+		});
+		return self;
+	},
+	handler : function(key, fn) {
+		var self = this;
+		if (!self._handlers[key]) {
+			self._handlers[key] = [];
+		}
+		if (_isFunction(fn)) {
+			self._handlers[key].push(fn);
+			return self;
+		}
+		_each(self._handlers[key], function() {
+			fn = this.call(self, fn);
+		});
+		return fn;
+	},
+	clickToolbar : function(name, fn) {
+		var self = this, key = 'clickToolbar' + name;
+		if (fn === undefined) {
+			if (self._handlers[key]) {
+				return self.handler(key);
+			}
+			self.loadPlugin(name, function() {
+				self.handler(key);
+			});
+			return self;
+		}
+		//if(name=='more')alert(fn);
+		return self.handler(key, fn);
+	},
+	updateState : function() {
+		var self = this;
+		_each(('justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,' +
+			'subscript,superscript,bold,italic,underline,strikethrough').split(','), function(i, name) {
+			self.cmd.state(name) ? self.toolbar.select(name) : self.toolbar.unselect(name);
+		});
+		return self;
+	},
+	addContextmenu : function(item) {
+		this._contextmenus.push(item);
+		return this;
+	},
+	afterCreate : function(fn) {
+		return this.handler('afterCreate', fn);
+	},
+	beforeRemove : function(fn) {
+		return this.handler('beforeRemove', fn);
+	},
+	beforeGetHtml : function(fn) {
+		return this.handler('beforeGetHtml', fn);
+	},
+	beforeSetHtml : function(fn) {
+		return this.handler('beforeSetHtml', fn);
+	},
+	afterSetHtml : function(fn) {
+		return this.handler('afterSetHtml', fn);
+	},
+	create : function() {K
+		var self = this, fullscreenMode = self.fullscreenMode;
+		if (self.isCreated) {
+			return self;
+		}
+		if (self.srcElement.data('kindeditor')) {
+			return self;
+		}
+		self.srcElement.data('kindeditor', 'true');
+		if (fullscreenMode) {
+			_docElement().style.overflow = 'hidden';
+		} else {
+			_docElement().style.overflow = '';
+		}
+		var width = fullscreenMode ? _docElement().clientWidth + 'px' : self.width,
+			height = fullscreenMode ? _docElement().clientHeight + 'px' : self.height;
+		if ((_IE && _V < 8) || _QUIRKS) {
+			height = _addUnit(_removeUnit(height) + 2);
+		}
+		var container = self.container = K(self.layout);
+		if (fullscreenMode) {
+			K(document.body).append(container);
+		} else {
+			self.srcElement.before(container);
+		}
+		var toolbarDiv = K('.toolbar', container),
+            toolBarDivFull = K('.toolbar', container),
+			editDiv = K('.edit', container),
+			statusbar = self.statusbar = K('.statusbar', container);
+		container.removeClass('container')
+			.addClass('ke-container  ke-container-' + self.themeType).css('width', width);
+		if (fullscreenMode) {
+			container.css({
+				position : 'absolute',
+				left : 0,
+				top : 0,
+				'z-index' : 811211
+			});
+			if (!_GECKO) {
+				self._scrollPos = _getScrollPos();
+			}
+			window.scrollTo(0, 0);
+			K(document.body).css({
+				'height' : '1px',
+				'overflow' : 'hidden'
+			});
+			K(document.body.parentNode).css('overflow', 'hidden');
+			self._fullscreenExecuted = true;
+		} else {
+			if (self._fullscreenExecuted) {
+				K(document.body).css({
+					'height' : '',
+					'overflow' : ''
+				});
+				K(document.body.parentNode).css('overflow', '');
+			}
+			if (self._scrollPos) {
+				window.scrollTo(self._scrollPos.x, self._scrollPos.y);
+			}
+		}
+		var htmlList = [];
+		K.each(self.items, function(i, name) {
+			if (name == '|') {
+				htmlList.push('<span class="ke-inline-block ke-separator"></span>');
+			} else if (name == '/') {
+				htmlList.push('<div class="ke-hr"></div>');
+			} else {
+				htmlList.push('<span class="ke-outline" data-name="' + name + '" title="' + self.lang(name) + '" unselectable="on">');
+				htmlList.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-' + name + '" unselectable="on"></span></span>');
+			}
+		});
+        htmlList.unshift('<div style="display:block" id="define"/>')
+        htmlList.push('</div>')
+        var htmlListFull = [];
+        var fullItems =  ['code','emoticons','fontname',
+            'forecolor', 'hilitecolor', 'bold','|', 'justifyleft', 'justifycenter',  'insertorderedlist', 'insertunorderedlist', '|',
+            'formatblock', 'fontsize', '|', 'indent', 'outdent',
+              '|','imagedirectupload','table',   'media', 'preview', "less",
+                '/',
+            'italic', 'underline',  'undo', 'redo', '|',  'removeformat',
+            'justifyright','justifyfull', 'source','plainpaste', 'wordpaste',  'subscript',
+            'superscript', 'clearhtml', 'quickformat', /* 'selectall',*/
+            'strikethrough', 'lineheight', 'hr', 'pagebreak',
+            'link','unlink', 'print'
+        ]
+        K.each(fullItems, function(i, name) {
+            if (name == '|') {
+//                htmlListFull.push('<span class="ke-inline-block ke-separator"></span>');
+            } else if (name == '/') {
+//                htmlListFull.push('<div class="ke-hr"></div>');
+            } else {
+                htmlListFull.push('<span class="ke-outline" data-name="' + name + '" title="' + self.lang(name) + '" unselectable="on">');
+                htmlListFull.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-' + name + '" unselectable="on"></span></span>');
+            }
+        });
+        htmlListFull.unshift('<div style="display:none" id="full"/>')
+        htmlListFull.push('</div>')
+		var toolbar = self.toolbar = _toolbar({
+			src : toolbarDiv,
+			html : htmlList.join('')+htmlListFull.join(''),
+			noDisableItems : self.noDisableItems,
+			click : function(e, name) {
+				e.stop();
+				if (self.menu) {
+					var menuName = self.menu.name;
+					self.hideMenu();
+					if (menuName === name) {
+						return;
+					}
+				}
+				self.clickToolbar(name);
+			}
+		});
+
+		var editHeight = _removeUnit(height) - toolbar.div.height();
+		var edit = self.edit = _edit({
+			height : editHeight > 0 && _removeUnit(height) > self.minHeight ? editHeight : self.minHeight,
+			src : editDiv,
+			srcElement : self.srcElement,
+			designMode : true,
+			themesPath : self.themesPath,
+			bodyClass : self.bodyClass,
+			cssPath : self.cssPath,
+			cssData : self.cssData,
+			beforeGetHtml : function(html) {
+				html = self.beforeGetHtml(html);
+				html = _removeBookmarkTag(_removeTempTag(html));
+				return _formatHtml(html, self.filterMode ? self.htmlTags : null, self.urlType, self.wellFormatMode, self.indentChar);
+			},
+			beforeSetHtml : function(html) {
+				html = _formatHtml(html, self.filterMode ? self.htmlTags : null, '', false);
+				return self.beforeSetHtml(html);
+			},
+			afterSetHtml : function() {
+				self.edit = edit = this;
+				self.afterSetHtml();
+			},
+			afterCreate : function() {
+                self.loadPlugin('autoheight');
+                self.edit = edit = this;
+				self.cmd = edit.cmd;
+                //edit.iframe[0].scroll = 'no';
+                //edit.doc.body.style.overflowY = 'hidden';
+				self._docMousedownFn = function(e) {
+					if (self.menu) {
+						self.hideMenu();
+					}
+				};
+				K(edit.doc, document).mousedown(self._docMousedownFn);
+				_bindContextmenuEvent.call(self);
+				_bindNewlineEvent.call(self);
+				_bindTabEvent.call(self);
+				_bindFocusEvent.call(self);
+				edit.afterChange(function(e) {
+//					if (!edit.designMode) {
+//						return;
+//					}
+					self.updateState();
+					self.addBookmark();
+                    //prettyPrint("",self.edit.doc.body);
+					if (self.options.afterChange) {
+						self.options.afterChange.call(self);
+					}
+				});
+				edit.textarea.keyup(function(e) {
+					if (!e.ctrlKey && !e.altKey && _INPUT_KEY_MAP[e.which]) {
+						if (self.options.afterChange) {
+							self.options.afterChange.call(self);
+						}
+					}
+				});
+				if (self.readonlyMode) {
+					self.readonly();
+				}
+				self.isCreated = true;
+				if (self.initContent === '') {
+					self.initContent = self.html();
+				}
+				if (self._undoStack.length > 0) {
+					var prev = self._undoStack.pop();
+					if (prev.start) {
+						self.html(prev.html);
+						edit.cmd.range.moveToBookmark(prev);
+						self.select();
+					}
+				}
+				self.afterCreate();
+				if (self.options.afterCreate) {
+                    if (typeof self.options.afterCreate == 'string'){
+                        self.options.afterCreate = eval(self.options.afterCreate);
+                    }
+					self.options.afterCreate.call(self);
+				}
+                if (self.placeholder != "" && self.edit.html() == "") {
+                    self.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>" + self.placeholder + "</span>");
+                }
+                elocalStorage(self, self.local_storage_mdu, self.local_storage_id);
+            }
+		});
+		//statusbar.removeClass('statusbar').addClass('ke-statusbar')
+		//	.append('<span class="ke-inline-block ke-statusbar-center-icon"></span>');
+		if (self._fullscreenResizeHandler) {
+			K(window).unbind('resize', self._fullscreenResizeHandler);
+			self._fullscreenResizeHandler = null;
+		}
+		function initResize() {
+			if (statusbar.height() === 0) {
+				setTimeout(initResize, 100);
+				return;
+			}
+			self.resize(width, height, false);
+		}
+		initResize();
+		if (fullscreenMode) {
+			self._fullscreenResizeHandler = function(e) {
+				if (self.isCreated) {
+					self.resize(_docElement().clientWidth, _docElement().clientHeight, false);
+				}
+			};
+			K(window).bind('resize', self._fullscreenResizeHandler);
+			toolbar.select('fullscreen');
+			if(statusbar.first() ){
+                statusbar.first() .css('visibility', 'hidden');
+                statusbar.last().css('visibility', 'hidden');
+            }
+		} else {
+			if (_GECKO) {
+				K(window).bind('scroll', function(e) {
+					self._scrollPos = _getScrollPos();
+				});
+			}
+			if (self.resizeType > 0) {
+				_drag({
+					moveEl : container,
+					clickEl : statusbar,
+					moveFn : function(x, y, width, height, diffX, diffY) {
+						height += diffY;
+						self.resize(null, height);
+					}
+				});
+			} else {
+                if(statusbar.first() ){
+				    statusbar.first().css('visibility', 'hidden');
+                }
+			}
+			if (self.resizeType === 2) {
+				_drag({
+					moveEl : container,
+					clickEl : statusbar.last(),
+					moveFn : function(x, y, width, height, diffX, diffY) {
+						width += diffX;
+						height += diffY;
+						self.resize(width, height);
+					}
+				});
+			} else {
+				if(statusbar.last()) {statusbar.last().css('visibility', 'hidden');}
+			}
+		}
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (!self.isCreated) {
+			return self;
+		}
+		self.beforeRemove();
+		self.srcElement.data('kindeditor', '');
+		if (self.menu) {
+			self.hideMenu();
+		}
+		_each(self.dialogs, function() {
+			self.hideDialog();
+		});
+		K(document).unbind('mousedown', self._docMousedownFn);
+		self.toolbar.remove();
+		self.edit.remove();
+		self.statusbar.last().unbind();
+		self.statusbar.unbind();
+		self.container.remove();
+		self.container = self.toolbar = self.edit = self.menu = null;
+		self.dialogs = [];
+		self.isCreated = false;
+		return self;
+	},
+	resize : function(width, height, updateProp) {
+		var self = this;
+		updateProp = _undef(updateProp, true);
+		if (width) {
+			if (!/%/.test(width)) {
+				width = _removeUnit(width);
+				width = width < self.minWidth ? self.minWidth : width;
+			}
+			self.container.css('width', _addUnit(width));
+			if (updateProp) {
+				self.width = _addUnit(width);
+			}
+		}
+		if (height) {
+			height = _removeUnit(height);
+			editHeight = _removeUnit(height) - self.toolbar.div.height() - self.statusbar.height();
+			editHeight = editHeight < self.minHeight ? self.minHeight : editHeight;
+			self.edit.setHeight(editHeight);
+			if (updateProp) {
+				self.height = _addUnit(height);
+			}
+		}
+		return self;
+	},
+	select : function() {
+		this.isCreated && this.cmd.select();
+		return this;
+	},
+	html : function(val) {
+		var self = this;
+		if (val === undefined) {
+			return self.isCreated ? self.edit.html() : _elementVal(self.srcElement);
+		}
+		self.isCreated ? self.edit.html(val) : _elementVal(self.srcElement, val);
+		if (self.isCreated) {
+			self.cmd.selection();
+		}
+		return self;
+	},
+	fullHtml : function() {
+		return this.isCreated ? this.edit.html(undefined, true) : '';
+	},
+	text : function(val) {
+		var self = this;
+		if (val === undefined) {
+			return _trim(self.html().replace(/<(?!img|embed).*?>/ig, '').replace(/&nbsp;/ig, ' '));
+		} else {
+			return self.html(_escape(val));
+		}
+	},
+	isEmpty : function() {
+        var self = this;
+        if(self.placeholder == ""){
+            return _trim(this.text().replace(/\r\n|\n|\r/, '')) === '';
+        } else{
+            return (_trim(this.text().replace(/\r\n|\n|\r/, '')) === '' || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*[\，]*[\（]*[\u4e00-\u9fa5]*[\：]*[\u4e00-\u9fa5]*[\。]*[\）]*<\/\w*\>\s*$/.test(self.edit.html()));
+        }
+	},
+	isDirty : function() {
+		return _trim(this.initContent.replace(/\r\n|\n|\r|t/g, '')) !== _trim(this.html().replace(/\r\n|\n|\r|t/g, ''));
+	},
+	selectedHtml : function() {
+		var val = this.isCreated ? this.cmd.range.html() : '';
+		val = _removeBookmarkTag(_removeTempTag(val));
+		return val;
+	},
+	count : function(mode) {
+		var self = this;
+		mode = (mode || 'html').toLowerCase();
+		if (mode === 'html') {
+			return self.html().length;
+		}
+		if (mode === 'text') {
+			return self.text().replace(/<(?:img|embed).*?>/ig, 'K').replace(/\r\n|\n|\r/g, '').length;
+		}
+		return 0;
+	},
+	exec : function(key) {
+		key = key.toLowerCase();
+		var self = this, cmd = self.cmd,
+			changeFlag = _inArray(key, 'selectall,copy,paste,print'.split(',')) < 0;
+		if (changeFlag) {
+			self.addBookmark(false);
+		}
+		cmd[key].apply(cmd, _toArray(arguments, 1));
+		if (changeFlag) {
+			self.updateState();
+			self.addBookmark(false);
+			if (self.options.afterChange) {
+				self.options.afterChange.call(self);
+			}
+		}
+		return self;
+	},
+	insertHtml : function(val, quickMode) {
+		if (!this.isCreated) {
+			return this;
+		}
+		val = this.beforeSetHtml(val);
+		this.exec('inserthtml', val, quickMode);
+		return this;
+	},
+	appendHtml : function(val) {
+        if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*[\，]*[\（]*[\u4e00-\u9fa5]*[\：]*[\u4e00-\u9fa5]*[\。]*[\）]*<\/\w*\>\s*$/.test(this.html())){
+            this.html(val);
+        } else{
+            this.html(this.html() + val);
+        }
+		if (this.isCreated) {
+			var cmd = this.cmd;
+			cmd.range.selectNodeContents(cmd.doc.body).collapse(false);
+			cmd.select();
+		}
+		return this;
+	},
+	sync : function() {
+		_elementVal(this.srcElement, this.html());
+		return this;
+	},
+	focus : function() {
+		this.isCreated ? this.edit.focus() : this.srcElement[0].focus();
+		return this;
+	},
+	blur : function() {
+		this.isCreated ? this.edit.blur() : this.srcElement[0].blur();
+		return this;
+	},
+	addBookmark : function(checkSize) {
+		checkSize = _undef(checkSize, true);
+		var self = this, edit = self.edit,
+			body = edit.doc.body,
+			html = _removeTempTag(body.innerHTML), bookmark;
+		if (checkSize && self._undoStack.length > 0) {
+			var prev = self._undoStack[self._undoStack.length - 1];
+			if (Math.abs(html.length - _removeBookmarkTag(prev.html).length) < self.minChangeSize) {
+				return self;
+			}
+		}
+		if (edit.designMode && !self._firstAddBookmark) {
+			var range = self.cmd.range;
+			bookmark = range.createBookmark(true);
+			bookmark.html = _removeTempTag(body.innerHTML);
+			range.moveToBookmark(bookmark);
+		} else {
+			bookmark = {
+				html : html
+			};
+		}
+		self._firstAddBookmark = false;
+		_addBookmarkToStack(self._undoStack, bookmark);
+		return self;
+	},
+	undo : function() {
+		return _undoToRedo.call(this, this._undoStack, this._redoStack);
+	},
+	redo : function() {
+		return _undoToRedo.call(this, this._redoStack, this._undoStack);
+	},
+	fullscreen : function(bool) {
+		this.fullscreenMode = (bool === undefined ? !this.fullscreenMode : bool);
+		this.addBookmark(false);
+		return this.remove().create();
+	},
+	readonly : function(isReadonly) {
+		isReadonly = _undef(isReadonly, true);
+		var self = this, edit = self.edit, doc = edit.doc;
+		if (self.designMode) {
+			self.toolbar.disableAll(isReadonly, []);
+		} else {
+			_each(self.noDisableItems, function() {
+				self.toolbar[isReadonly ? 'disable' : 'enable'](this);
+			});
+		}
+		if (_IE) {
+			doc.body.contentEditable = !isReadonly;
+		} else {
+			doc.designMode = isReadonly ? 'off' : 'on';
+		}
+		edit.textarea[0].disabled = isReadonly;
+	},
+	createMenu : function(options) {
+		var self = this,
+			name = options.name,
+            knode = self.toolbar.get(name),
+			pos = knode.pos();
+
+		options.x = pos.x;
+		options.y = pos.y + knode.height();
+		options.z = self.options.zIndex;
+		options.shadowMode = _undef(options.shadowMode, self.shadowMode);
+		if (options.selectedColor !== undefined) {
+			options.cls = 'ke-colorpicker-' + self.themeType;
+			options.noColor = self.lang('noColor');
+			self.menu = _colorpicker(options);
+		} else {
+			options.cls = 'ke-menu-' + self.themeType;
+			options.centerLineMode = false;
+			self.menu = _menu(options);
+		}
+		return self.menu;
+	},
+	hideMenu : function() {
+		this.menu.remove();
+		this.menu = null;
+		return this;
+	},
+	hideContextmenu : function() {
+		this.contextmenu.remove();
+		this.contextmenu = null;
+		return this;
+	},
+	createDialog : function(options) {
+		var self = this, name = options.name;
+		options.z = self.options.zIndex;
+		options.shadowMode = _undef(options.shadowMode, self.shadowMode);
+		options.closeBtn = _undef(options.closeBtn, {
+			name : self.lang('close'),
+			click : function(e) {
+				self.hideDialog();
+				if (_IE && self.cmd) {
+					self.cmd.select();
+				}
+			}
+		});
+		options.noBtn = _undef(options.noBtn, {
+			name : self.lang(options.yesBtn ? 'no' : 'close'),
+			click : function(e) {
+				self.hideDialog();
+				if (_IE && self.cmd) {
+					self.cmd.select();
+				}
+			}
+		});
+		if (self.dialogAlignType != 'page') {
+			options.alignEl = self.container;
+		}
+		options.cls = 'ke-dialog-' + self.themeType;
+		if (self.dialogs.length > 0) {
+			var firstDialog = self.dialogs[0],
+				parentDialog = self.dialogs[self.dialogs.length - 1];
+			firstDialog.setMaskIndex(parentDialog.z + 2);
+			options.z = parentDialog.z + 3;
+			options.showMask = false;
+		}
+		var dialog = _dialog(options);
+		self.dialogs.push(dialog);
+		return dialog;
+	},
+	hideDialog : function() {
+		var self = this;
+		if (self.dialogs.length > 0) {
+			self.dialogs.pop().remove();
+		}
+		if (self.dialogs.length > 0) {
+			var firstDialog = self.dialogs[0],
+				parentDialog = self.dialogs[self.dialogs.length - 1];
+			firstDialog.setMaskIndex(parentDialog.z - 1);
+		}
+		return self;
+	},
+	errorDialog : function(html) {
+		var self = this;
+		var dialog = self.createDialog({
+			width : 750,
+			title : self.lang('uploadError'),
+			body : '<div style="padding:10px 20px;"><iframe frameborder="0" style="width:708px;height:400px;"></iframe></div>'
+		});
+		var iframe = K('iframe', dialog.div), doc = K.iframeDoc(iframe);
+		doc.open();
+		doc.write(html);
+		doc.close();
+		K(doc.body).css('background-color', '#FFF');
+		iframe[0].contentWindow.focus();
+		return self;
+	}
+};
+function _editor(options) {
+	return new KEditor(options);
+}
+_instances = [];
+function _create(expr, options) {
+	options = options || {};
+//    options.emotionsBasePath = _undef(options.emotionsBasePath,'http://forge.trustie.net') // TODO
+    options.emotionsBasePath = _undef(options.emotionsBasePath,'') // 使用本地的emotion图片
+	options.basePath = _undef(options.basePath, K.basePath);
+	options.themesPath = _undef(options.themesPath, options.basePath + 'themes/');
+	options.langPath = _undef(options.langPath, options.basePath + 'lang/');
+	options.pluginsPath = _undef(options.pluginsPath, options.basePath + 'plugins/');
+	if (_undef(options.loadStyleMode, K.options.loadStyleMode)) {
+		var themeType = _undef(options.themeType, K.options.themeType);
+		_loadStyle(options.themesPath + 'default/default.css');
+		_loadStyle(options.themesPath + themeType + '/' + themeType + '.css');
+	}
+	function create(editor) {
+		_each(_plugins, function(name, fn) {
+			if (_isFunction(fn)) {
+				fn.call(editor, KindEditor);
+				//新加
+				if (!editor._pluginStatus) {
+					editor._pluginStatus = {};
+				}
+				editor._pluginStatus[name] = 'inited';
+			}
+		});
+		return editor.create();
+	}
+	var knode = K(expr);
+	if (!knode || knode.length === 0) {
+		return;
+	}
+	if (knode.length > 1) {
+		knode.each(function() {
+			_create(this, options);
+		});
+		return _instances[0];
+	}
+	options.srcElement = knode[0];
+	var editor = new KEditor(options);
+	_instances.push(editor);
+	if (_language[editor.langType]) {
+		return create(editor);
+	}
+	_loadScript(editor.langPath + editor.langType + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
+		create(editor);
+	});
+	return editor;
+}
+function _eachEditor(expr, fn) {
+	K(expr).each(function(i, el) {
+		K.each(_instances, function(j, editor) {
+			if (editor && editor.srcElement[0] == el) {
+				fn.call(editor, j);
+				return false;
+			}
+		});
+	});
+}
+K.remove = function(expr) {
+	_eachEditor(expr, function(i) {
+		this.remove();
+		_instances.splice(i, 1);
+	});
+};
+K.sync = function(expr) {
+	_eachEditor(expr, function() {
+		this.sync();
+	});
+};
+K.html = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.html(val);
+	});
+};
+K.insertHtml = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.insertHtml(val);
+	});
+};
+K.appendHtml = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.appendHtml(val);
+	});
+};
+if (_IE && _V < 7) {
+	_nativeCommand(document, 'BackgroundImageCache', true);
+}
+K.EditorClass = KEditor;
+K.editor = _editor;
+K.create = _create;
+K.instances = _instances;
+K.plugin = _plugin;
+K.lang = _lang;
+_plugin('core', function(K) {
+	var self = this,
+		shortcutKeys = {
+			undo : 'Z', redo : 'Y', bold : 'B', italic : 'I', underline : 'U', print : 'P', selectall : 'A'
+		};
+	self.afterSetHtml(function() {
+		if (self.options.afterChange) {
+			self.options.afterChange.call(self);
+
+		}
+	});
+	self.afterCreate(function() {
+		if (self.syncType != 'form') {
+			return;
+		}
+		var el = K(self.srcElement), hasForm = false;
+		while ((el = el.parent())) {
+			if (el.name == 'form') {
+				hasForm = true;
+				break;
+			}
+		}
+		if (hasForm) {
+			el.bind('submit', function(e) {
+				self.sync();
+				K(window).bind('unload', function() {
+					self.edit.textarea.remove();
+				});
+			});
+			var resetBtn = K('[type="reset"]', el);
+			resetBtn.click(function() {
+				self.html(self.initContent);
+				self.cmd.selection();
+			});
+			self.beforeRemove(function() {
+				el.unbind();
+				resetBtn.unbind();
+			});
+		}
+	});
+	self.clickToolbar('source', function() {
+		if (self.edit.designMode) {
+			self.toolbar.disableAll(true);
+			self.edit.design(false);
+			self.toolbar.select('source');
+		} else {
+			self.toolbar.disableAll(false);
+			self.edit.design(true);
+			self.toolbar.unselect('source');
+			if (_GECKO) {
+				setTimeout(function() {
+					self.cmd.selection();
+				}, 0);
+			} else {
+				self.cmd.selection();
+			}
+		}
+		self.designMode = self.edit.designMode;
+	});
+	self.afterCreate(function() {
+		if (!self.designMode) {
+			self.toolbar.disableAll(true).select('source');
+		}
+	});
+	self.clickToolbar('fullscreen', function() {
+		self.fullscreen();
+	});
+    inputObj = document.createElement("input");
+    inputObj.setAttribute('id', 'jUploadFile_ef');
+    inputObj.setAttribute('type', 'button');
+    inputObj.setAttribute('style', 'visibility:hidden');
+    document.body.appendChild(inputObj);
+
+    //window.uploadButton = K.uploadbutton({
+	self.uploadButton = K.uploadbutton({
+		ops:self, //self 是KindEditor.create()的options参数
+		button: inputObj,
+        fieldName:'imgFile',
+        fieldName:'file',
+        // url:K.addParam('/kindeditor/upload', 'dir=image'),
+        url:K.addParam('/api/attachments.json'),
+        // url:K.addParam( 'http://testbdweb.educoder.net' + '/kindeditor/upload', 'dir=image'),
+		
+        afterUpload : function(data) {
+            if (data.id || data.error === 0) {
+				data.url =  '/api/attachments/' + data.id
+				data.asset_id = data.id
+               var url = data.url//K.formatUrl(data.url, 'absolute');
+               // console.log(url)
+                self.exec('insertimage', url, 'image','','','1','');
+				//self.exec('insertimage', url, 'image','','','1','left');
+                //self.insertHtml('<img src="'+url+'"/>');
+                var asset_id  = data.asset_id;
+                if ( asset_id != "" && parent.document.getElementById('asset_id') != null ) {
+                    parent.document.getElementById('asset_id').value += asset_id.toString();
+                    parent.document.getElementById('asset_id').value += ",";
+                }else{
+                    //TODO 暂时什么也不做
+                }
+                var _bod = $(self.cmd.doc.body);
+                var body = self.cmd.doc.body;
+                var _bw = _bod.width(),_bh = Math.max((K.IE ? body.scrollHeight : (K.GECKO ? body.offsetHeight+26:body.offsetHeight)));
+                var _bsh = 0;
+                _bod.children().each(function(){
+                    _bsh += $(this).height();
+                });
+                var _imgbase = _bod.find("img");
+                _imgbase[0].onload = function(){
+                    var _iw=_imgbase.width(),_ih = _imgbase.height();
+                    var _alh = _bsh + _ih;
+                    var _rhig = _alh > _bh ? _alh : _bh;
+                    switch(self.resizeType){
+                        case 1:
+                            var _defh = self.toolbar.div.height() + self.statusbar.height();
+                            _defh = _defh > 0 ? _defh + 6 : _defh;
+                            self.resize(null,_rhig + _defh);
+                            break;
+                    }
+                }
+            } else {
+                //alert(data.message);
+//                alert("仅支持如下图片格式:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF");
+                long_notice_box("仅支持如下图片格式:bmp,jpeg,jpg,png,gif!");
+                console.log(data.error + "-------" + data.message);
+            }
+        },
+        afterError : function(str) {
+            alert('error: ' + str);
+        }
+    });
+	self.uploadButton.fileBox.change(function(e) {
+		// 检查如果不是图片格式
+		var filePath = e.event.currentTarget.value;
+		var dotIndex = filePath.lastIndexOf('.')
+		var fileType = filePath.substring(dotIndex + 1)
+		if (['bmp', 'jpeg', 'jpg', 'png', 'gif'].indexOf(fileType.toLowerCase()) == -1) {
+			long_notice_box("仅支持如下图片格式:bmp,jpeg,jpg,png,gif!");
+			return;
+		}
+		self.uploadButton.submit();
+    });
+
+    if (self.fullscreenShortcut) {
+		var loaded = false;
+		self.afterCreate(function() {
+			K(self.edit.doc, self.edit.textarea).keyup(function(e) {
+				if (e.which == 27) {
+					setTimeout(function() {
+						self.fullscreen();
+					}, 0);
+				}
+			});
+			if (loaded) {
+				if (_IE && !self.designMode) {
+					return;
+				}
+				self.focus();
+			}
+			if (!loaded) {
+				loaded = true;
+			}
+		});
+	}
+	_each('undo,redo'.split(','), function(i, name) {
+		if (shortcutKeys[name]) {
+			self.afterCreate(function() {
+				_ctrl(this.edit.doc, shortcutKeys[name], function() {
+					self.clickToolbar(name);
+				});
+			});
+		}
+		self.clickToolbar(name, function() {
+			self[name]();
+		});
+	});
+    self.clickToolbar('imagedirectupload', function() {
+		$('.ke-upload-file',this.up_file_div).trigger('click');
+
+    });
+	self.clickToolbar('formatblock', function() {
+		var blocks = self.lang('formatblock.formatBlock'),
+			heights = {
+				h1 : 28,
+				h2 : 24,
+				h3 : 18,
+				H4 : 14,
+                p : 12
+			},
+			curVal = self.cmd.val('formatblock'),
+			menu = self.createMenu({
+				name : 'formatblock',
+				width : self.langType == 'en' ? 200 : 150
+			});
+		_each(blocks, function(key, val) {
+			var style = 'font-size:' + heights[key] + 'px;';
+			if (key.charAt(0) === 'h') {
+				style += 'font-weight:bold;';
+			}
+			menu.addItem({
+				title : '<span style="' + style + '" unselectable="on">' + val + '</span>',
+				height : heights[key] + 12,
+				checked : (curVal === key || curVal === val),
+				click : function() {
+					self.select().exec('formatblock', '<' + key + '>').hideMenu();
+                    //by yk利用html的特性使h1 h2 h3 h4标签之间不能相互包含 并将空的标签去掉
+//                    if (key != "p"){
+                        var val = self.select().html();
+                        self.select().html(val);
+                        self.cmd.doc.body.innerHTML = self.cmd.doc.body.innerHTML.replace(/<p>\s*<\/p>/g,"");
+                        val = self.select().html().replace(/(<h1>\s*<\/h1>)|(<h2>\s*<\/h2>)|(<h3>\s*<\/h3>)|(<h4>\s*<\/h4>)/g,"");
+                        self.select().html(val);
+                        self.select();
+//                    }
+				}
+			});
+		});
+	});
+	self.clickToolbar('fontname', function() {
+		var curVal = self.cmd.val('fontname'),
+			menu = self.createMenu({
+				name : 'fontname',
+				width : 150
+			});
+		_each(self.lang('fontname.fontName'), function(key, val) {
+			menu.addItem({
+				title : '<span style="font-family: ' + key + ';" unselectable="on">' + val + '</span>',
+				checked : (curVal === key.toLowerCase() || curVal === val.toLowerCase()),
+				click : function() {
+					self.exec('fontname', key).hideMenu();
+				}
+			});
+		});
+	});
+	self.clickToolbar('fontsize', function() {
+       // knode = self.getSelectedAnchor();
+
+        //console.log(self.cmd.range.startContainer.parentElement.style.fontSize)
+		var curVal = self.cmd.val('fontsize'),
+			menu = self.createMenu({
+				name : 'fontsize',
+				width : 150
+			});
+		_each(self.fontSizeTable, function(i, val) {
+            if (i==0){
+                fontsize = "14px"
+                if(self.cmd.range.startContainer.parentElement.style.fontSize) {
+                    fontsize = self.cmd.range.startContainer.parentElement.style.fontSize
+                    menu.addItem({
+                        title: '<span style="font-size:14px ;" unselectable="on">首个选中字体:' + fontsize + '</span>',
+                        height: 14,
+                        click: function () {
+                        }
+                    });
+                }else {
+                    menu.addItem({
+                        title: '<span style="font-size:14px ;" unselectable="on">当前为默认字体:' + fontsize + '</span>',
+                        height: 14,
+                        click: function () {
+                        }
+                    });
+                }
+            }else {
+                menu.addItem({
+                    title: '<span style="font-size:' + val + ';" unselectable="on">' + val + '</span>',
+                    height: _removeUnit(val) + 12,
+                    checked: curVal === val,
+                    click: function () {
+                        self.exec('fontsize', val).hideMenu();
+
+                    }
+                });
+            }
+
+		});
+	});
+	_each('forecolor,hilitecolor'.split(','), function(i, name) {
+		self.clickToolbar(name, function() {
+			self.createMenu({
+				name : name,
+				selectedColor : self.cmd.val(name) || 'default',
+				colors : self.colorTable,
+				click : function(color) {
+					self.exec(name, color).hideMenu();
+				}
+			});
+		});
+	});
+	_each(('cut,copy,paste').split(','), function(i, name) {
+		self.clickToolbar(name, function() {
+			self.focus();
+			try {
+				self.exec(name, null);
+			} catch(e) {
+				alert(self.lang(name + 'Error'));
+			}
+		});
+	});
+	self.clickToolbar('about', function() {
+		var html = '<div style="margin:20px;">' +
+			'<div>KindEditor ' + _VERSION + '</div>' +
+			'<div>Copyright &copy; <a href="http://www.kindsoft.net/" target="_blank">kindsoft.net</a> All rights reserved.</div>' +
+			'</div>';
+		self.createDialog({
+			name : 'about',
+			width : 350,
+			title : self.lang('about'),
+			body : html
+		});
+	});
+	self.plugin.getSelectedLink = function() {
+		return self.cmd.commonAncestor('a');
+	};
+	self.plugin.getSelectedImage = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return !/^ke-\w+$/i.test(img[0].className);
+		});
+	};
+	self.plugin.getSelectedFlash = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-flash';
+		});
+	};
+	self.plugin.getSelectedMedia = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-media' || img[0].className == 'ke-rm';
+		});
+	};
+	self.plugin.getSelectedAnchor = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-anchor';
+		});
+	};
+	_each('link,image,flash,media,anchor'.split(','), function(i, name) {
+		var uName = name.charAt(0).toUpperCase() + name.substr(1);
+		_each('edit,delete'.split(','), function(j, val) {
+			self.addContextmenu({
+				title : self.lang(val + uName),
+				click : function() {
+					self.loadPlugin(name, function() {
+						self.plugin[name][val]();
+						self.hideMenu();
+					});
+				},
+				cond : self.plugin['getSelected' + uName],
+				width : 150,
+				iconClass : val == 'edit' ? 'ke-icon-' + name : undefined
+			});
+		});
+		self.addContextmenu({ title : '-' });
+	});
+	self.plugin.getSelectedTable = function() {
+		return self.cmd.commonAncestor('table');
+	};
+	self.plugin.getSelectedRow = function() {
+		return self.cmd.commonAncestor('tr');
+	};
+	self.plugin.getSelectedCell = function() {
+		return self.cmd.commonAncestor('td');
+	};
+	_each(('prop,cellprop,colinsertleft,colinsertright,rowinsertabove,rowinsertbelow,rowmerge,colmerge,' +
+	'rowsplit,colsplit,coldelete,rowdelete,insert,delete').split(','), function(i, val) {
+		var cond = _inArray(val, ['prop', 'delete']) < 0 ? self.plugin.getSelectedCell : self.plugin.getSelectedTable;
+		self.addContextmenu({
+			title : self.lang('table' + val),
+			click : function() {
+				self.loadPlugin('table', function() {
+					self.plugin.table[val]();
+					self.hideMenu();
+				});
+			},
+			cond : cond,
+			width : 170,
+			iconClass : 'ke-icon-table' + val
+		});
+	});
+	self.addContextmenu({ title : '-' });
+	_each(('selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,' +
+		'insertunorderedlist,indent,outdent,subscript,superscript,hr,print,' +
+		'bold,italic,underline,strikethrough,removeformat,unlink').split(','), function(i, name) {
+		if (shortcutKeys[name]) {
+			self.afterCreate(function() {
+				_ctrl(this.edit.doc, shortcutKeys[name], function() {
+					self.cmd.selection();
+					self.clickToolbar(name);
+				});
+			});
+		}
+		self.clickToolbar(name, function() {
+			self.focus().exec(name, null);
+		});
+	});
+	self.afterCreate(function() {
+		var doc = self.edit.doc, cmd, bookmark, div,
+			cls = '__kindeditor_paste__', pasting = false;
+		function movePastedData() {
+			cmd.range.moveToBookmark(bookmark);
+			cmd.select();
+			if (_WEBKIT) {
+				K('div.' + cls, div).each(function() {
+					K(this).after('<br />').remove(true);
+				});
+				K('span.Apple-style-span', div).remove(true);
+				K('span.Apple-tab-span', div).remove(true);
+				K('span[style]', div).each(function() {
+					if (K(this).css('white-space') == 'nowrap') {
+						K(this).remove(true);
+					}
+				});
+				K('meta', div).remove();
+			}
+			var html = div[0].innerHTML;
+			div.remove();
+			if (html === '') {
+				return;
+			}
+			if (_WEBKIT) {
+				html = html.replace(/(<br>)\1/ig, '$1');
+			}
+			if (self.pasteType === 2) {
+				html = html.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig, '');
+				if (/schemas-microsoft-com|worddocument|mso-\w+/i.test(html)) {
+					html = _clearMsWord(html, self.filterMode ? self.htmlTags : K.options.htmlTags);
+				} else {
+					html = _formatHtml(html, self.filterMode ? self.htmlTags : null);
+					html = self.beforeSetHtml(html);
+				}
+			}
+			if (self.pasteType === 1) {
+				html = html.replace(/&nbsp;/ig, ' ');
+				html = html.replace(/\n\s*\n/g, '\n');
+				html = html.replace(/<br[^>]*>/ig, '\n');
+				html = html.replace(/<\/p><p[^>]*>/ig, '\n');
+				html = html.replace(/<[^>]+>/g, '');
+				html = html.replace(/ {2}/g, ' &nbsp;');
+				if (self.newlineTag == 'p') {
+					if (/\n/.test(html)) {
+						html = html.replace(/^/, '<p>').replace(/$/, '<br /></p>').replace(/\n/g, '<br /></p><p>');
+					}
+				} else {
+					html = html.replace(/\n/g, '<br />$&');
+				}
+			}
+
+//            var kePasteContainer = document.getElementById("ke_paste");
+//            if (kePasteContainer == null) {
+//                kePasteContainer = document.createElement("div");
+//                kePasteContainer.id = "ke_paste";
+//                var last=document.body.lastChild;//得到页面的最后个元素
+//                document.body.insertBefore(kePasteContainer,last);//在得到的最后元素之前插入
+//            }
+//            kePasteContainer.innerHTML = html;
+//            $("#ke_paste").hide();
+//
+//            var imglist = $("#ke_paste").find("img");
+//
+//            if (imglist.length > 0){
+//                df(self);
+//            }
+            self.insertHtml(html, true);
+            df(self);
+		}
+		K(doc.body).bind('paste', function(e){
+			if (self.pasteType === 0) {
+				e.stop();
+				return;
+			}
+			if (pasting) {
+				return;
+			}
+			pasting = true;
+			K('div.' + cls, doc).remove();
+			cmd = self.cmd.selection();
+			bookmark = cmd.range.createBookmark();
+			div = K('<div class="' + cls + '"></div>', doc).css({
+				position : 'absolute',
+				width : '1px',
+				height : '1px',
+				overflow : 'hidden',
+				left : '-1981px',
+				top : K(bookmark.start).pos().y + 'px',
+				'white-space' : 'nowrap'
+			});
+			K(doc.body).append(div);
+
+			if (_IE) {
+				var rng = cmd.range.get(true);
+				rng.moveToElementText(div[0]);
+				rng.select();
+				rng.execCommand('paste');
+				e.preventDefault();
+			} else {
+				cmd.range.selectNodeContents(div[0]);
+				cmd.select();
+				//新加
+				div[0].tabIndex = -1;
+				div[0].focus();
+			}
+			setTimeout(function() {
+				movePastedData();
+				pasting = false;
+			}, 0);
+		});
+	});
+	self.beforeGetHtml(function(html) {
+		if (_IE && _V <= 8) {
+			html = html.replace(/<div\s+[^>]*data-ke-input-tag="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, tag) {
+				return unescape(tag);
+			});
+			html = html.replace(/(<input)((?:\s+[^>]*)?>)/ig, function($0, $1, $2) {
+				if (!/\s+type="[^"]+"/i.test($0)) {
+					return $1 + ' type="text"' + $2;
+				}
+				return $0;
+			});
+		}
+		return html.replace(/(<(?:noscript|noscript\s[^>]*)>)([\s\S]*?)(<\/noscript>)/ig, function($0, $1, $2, $3) {
+			return $1 + _unescape($2).replace(/\s+/g, ' ') + $3;
+		})
+		.replace(/<img[^>]*class="?ke-(flash|rm|media)"?[^>]*>/ig, function(full) {
+			var imgAttrs = _getAttrList(full);
+			var styles = _getCssList(imgAttrs.style || '');
+			var attrs = _mediaAttrs(imgAttrs['data-ke-tag']);
+			var width = _undef(styles.width, '');
+			var height = _undef(styles.height, '');
+			if (/px/i.test(width)) {
+				width = _removeUnit(width);
+			}
+			if (/px/i.test(height)) {
+				height = _removeUnit(height);
+			}
+			attrs.width = _undef(imgAttrs.width, width);
+			attrs.height = _undef(imgAttrs.height, height);
+			return _mediaEmbed(attrs,"media");
+		})
+		.replace(/<img[^>]*class="?ke-anchor"?[^>]*>/ig, function(full) {
+			var imgAttrs = _getAttrList(full);
+			return '<a name="' + unescape(imgAttrs['data-ke-name']) + '"></a>';
+		})
+		.replace(/<div\s+[^>]*data-ke-script-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, attr, code) {
+			return '<script' + unescape(attr) + '>' + unescape(code) + '</script>';
+		})
+		.replace(/<div\s+[^>]*data-ke-noscript-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, attr, code) {
+			return '<noscript' + unescape(attr) + '>' + unescape(code) + '</noscript>';
+		})
+		.replace(/(<[^>]*)data-ke-src="([^"]*)"([^>]*>)/ig, function(full, start, src, end) {
+			full = full.replace(/(\s+(?:href|src)=")[^"]*(")/i, function($0, $1, $2) {
+				return $1 + _unescape(src) + $2;
+			});
+			full = full.replace(/\s+data-ke-src="[^"]*"/i, '');
+			return full;
+		})
+		.replace(/(<[^>]+\s)data-ke-(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {
+			return start + end;
+		});
+	});
+	self.beforeSetHtml(function(html) {
+		if (_IE && _V <= 8) {
+			html = html.replace(/<input[^>]*>|<(select|button)[^>]*>[\s\S]*?<\/\1>/ig, function(full) {
+				var attrs = _getAttrList(full);
+				var styles = _getCssList(attrs.style || '');
+				if (styles.display == 'none') {
+					return '<div class="ke-display-none" data-ke-input-tag="' + escape(full) + '"></div>';
+				}
+				return full;
+			});
+		}
+		return html.replace(/<embed[^>]*type="([^"]+)"[^>]*>(?:<\/embed>)?/ig, function(full) {
+			var attrs = _getAttrList(full);
+			attrs.src = _undef(attrs.src, '');
+			attrs.width = _undef(attrs.width, 0);
+			attrs.height = _undef(attrs.height, 0);
+			return _mediaImg(self.themesPath + 'common/blank.gif', attrs);
+		})
+		.replace(/<a[^>]*name="([^"]+)"[^>]*>(?:<\/a>)?/ig, function(full) {
+			var attrs = _getAttrList(full);
+			if (attrs.href !== undefined) {
+				return full;
+			}
+			return '<img class="ke-anchor" src="' + self.themesPath + 'common/anchor.gif" data-ke-name="' + escape(attrs.name) + '" />';
+		})
+		.replace(/<script([^>]*)>([\s\S]*?)<\/script>/ig, function(full, attr, code) {
+			return '<div class="ke-script" data-ke-script-attr="' + escape(attr) + '">' + escape(code) + '</div>';
+		})
+		.replace(/<noscript([^>]*)>([\s\S]*?)<\/noscript>/ig, function(full, attr, code) {
+			return '<div class="ke-noscript" data-ke-noscript-attr="' + escape(attr) + '">' + escape(code) + '</div>';
+		})
+		.replace(/(<[^>]*)(href|src)="([^"]*)"([^>]*>)/ig, function(full, start, key, src, end) {
+			if (full.match(/\sdata-ke-src="[^"]*"/i)) {
+				return full;
+			}
+			full = start + key + '="' + src + '"' + ' data-ke-src="' + _escape(src) + '"' + end;
+			return full;
+		})
+		.replace(/(<[^>]+\s)(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {
+			return start + 'data-ke-' + end;
+		})
+		.replace(/<table[^>]*\s+border="0"[^>]*>/ig, function(full) {
+			if (full.indexOf('ke-zeroborder') >= 0) {
+				return full;
+			}
+			return _addClassToTag(full, 'ke-zeroborder');
+		});
+	});
+});
+
+})(window);
diff --git a/public/assets/kindeditor/lang/zh_CN.js b/public/assets/kindeditor/lang/zh_CN.js
new file mode 100644
index 00000000..b262e981
--- /dev/null
+++ b/public/assets/kindeditor/lang/zh_CN.js
@@ -0,0 +1,239 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+    imagedirectupload:'本地图片',
+    more: '切换到更多功能',
+    less: '切换到简单功能',
+	source : 'HTML代码',
+	preview : '预览',
+	undo : '后退(Ctrl+Z)',
+	redo : '前进(Ctrl+Y)',
+	cut : '剪切(Ctrl+X)',
+	copy : '复制(Ctrl+C)',
+	paste : '粘贴(Ctrl+V)',
+	plainpaste : '粘贴为无格式文本',
+	wordpaste : '从Word粘贴',
+	selectall : '全选(Ctrl+A)',
+	justifyleft : '左对齐',
+	justifycenter : '居中',
+	justifyright : '右对齐',
+	justifyfull : '两端对齐',
+	insertorderedlist : '编号',
+	insertunorderedlist : '项目符号',
+	indent : '增加缩进',
+	outdent : '减少缩进',
+	subscript : '下标',
+	superscript : '上标',
+	formatblock : '段落',
+	fontname : '字体',
+	fontsize : '文字大小',
+	forecolor : '文字颜色',
+	hilitecolor : '文字背景',
+	bold : '粗体(Ctrl+B)',
+	italic : '斜体(Ctrl+I)',
+	underline : '下划线(Ctrl+U)',
+	strikethrough : '删除线',
+	removeformat : '删除格式',
+	image : '图片',
+	multiimage : '批量图片上传',
+	flash : 'Flash',
+	media : '视音频',
+	table : '表格',
+	tablecell : '单元格',
+	hr : '插入横线',
+	emoticons : '插入表情',
+	link : '超级链接',
+	unlink : '取消超级链接',
+	fullscreen : '全屏显示',
+	about : '关于',
+	print : '打印(Ctrl+P)',
+	filemanager : '文件空间',
+	code : '插入程序代码',
+	map : 'Google地图',
+	baidumap : '百度地图',
+	lineheight : '行距',
+	clearhtml : '清理HTML代码',
+	pagebreak : '插入分页符',
+	quickformat : '一键排版',
+	insertfile : '插入文件',
+	template : '插入模板',
+	anchor : '锚点',
+	yes : '确定',
+	no : '取消',
+	close : '关闭',
+	editImage : '图片属性',
+	deleteImage : '删除图片',
+	editFlash : 'Flash属性',
+	deleteFlash : '删除Flash',
+	editMedia : '视音频属性',
+	deleteMedia : '删除视音频',
+	editLink : '超级链接属性',
+	deleteLink : '取消超级链接',
+	editAnchor : '锚点属性',
+	deleteAnchor : '删除锚点',
+	tableprop : '表格属性',
+	tablecellprop : '单元格属性',
+	tableinsert : '插入表格',
+	tabledelete : '删除表格',
+	tablecolinsertleft : '左侧插入列',
+	tablecolinsertright : '右侧插入列',
+	tablerowinsertabove : '上方插入行',
+	tablerowinsertbelow : '下方插入行',
+	tablerowmerge : '向下合并单元格',
+	tablecolmerge : '向右合并单元格',
+	tablerowsplit : '拆分行',
+	tablecolsplit : '拆分列',
+	tablecoldelete : '删除列',
+	tablerowdelete : '删除行',
+	noColor : '无颜色',
+	pleaseSelectFile : '请选择文件。',
+	invalidImg : "请输入有效的URL地址。\n只允许jpg,gif,bmp,png格式。",
+	invalidMedia : "请输入有效的URL地址。\n只允许swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb格式。",
+	invalidWidth : "宽度必须为数字。",
+	invalidHeight : "高度必须为数字。",
+	invalidBorder : "边框必须为数字。",
+	invalidUrl : "请输入有效的URL地址。",
+	invalidRows : '行数为必选项，只允许输入大于0的数字。',
+	invalidCols : '列数为必选项，只允许输入大于0的数字。',
+	invalidPadding : '边距必须为数字。',
+	invalidSpacing : '间距必须为数字。',
+	invalidJson : '服务器发生故障。',
+	uploadSuccess : '上传成功。',
+	cutError : '您的浏览器安全设置不允许使用剪切操作，请使用快捷键(Ctrl+X)来完成。',
+	copyError : '您的浏览器安全设置不允许使用复制操作，请使用快捷键(Ctrl+C)来完成。',
+	pasteError : '您的浏览器安全设置不允许使用粘贴操作，请使用快捷键(Ctrl+V)来完成。',
+	ajaxLoading : '加载中，请稍候 ...',
+	uploadLoading : '上传中，请稍候 ...',
+	uploadError : '上传错误',
+	'plainpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'wordpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'code.pleaseInput' : '请输入程序代码。',
+	'link.url' : 'URL',
+	'link.linkType' : '打开类型',
+	'link.newWindow' : '新窗口',
+	'link.selfWindow' : '当前窗口',
+	'flash.url' : 'URL',
+	'flash.width' : '宽度',
+	'flash.height' : '高度',
+	'flash.upload' : '上传',
+	'flash.viewServer' : '文件空间',
+	'media.url' : 'URL',
+	'media.width' : '宽度',
+	'media.height' : '高度',
+	'media.autostart' : '自动播放',
+	'media.upload' : '上传',
+	'media.viewServer' : '文件空间',
+	'image.remoteImage' : '网络图片',
+	'image.localImage' : '本地上传',
+	'image.remoteUrl' : '图片地址',
+	'image.localUrl' : '上传文件',
+	'image.size' : '图片大小',
+	'image.width' : '宽',
+	'image.height' : '高',
+	'image.resetSize' : '重置大小',
+	'image.align' : '对齐方式',
+	'image.defaultAlign' : '默认方式',
+	'image.leftAlign' : '左对齐',
+	'image.rightAlign' : '右对齐',
+	'image.imgTitle' : '图片说明',
+	'image.upload' : '浏览...',
+	'image.viewServer' : '图片空间',
+	'multiimage.uploadDesc' : '允许用户同时上传<%=uploadLimit%>张图片，单张图片容量不超过<%=sizeLimit%>',
+	'multiimage.startUpload' : '开始上传',
+	'multiimage.clearAll' : '全部清空',
+	'multiimage.insertAll' : '全部插入',
+	'multiimage.queueLimitExceeded' : '文件数量超过限制。',
+	'multiimage.fileExceedsSizeLimit' : '文件大小超过限制。',
+	'multiimage.zeroByteFile' : '无法上传空文件。',
+	'multiimage.invalidFiletype' : '文件类型不正确。',
+	'multiimage.unknownError' : '发生异常，无法上传。',
+	'multiimage.pending' : '等待上传',
+	'multiimage.uploadError' : '上传失败',
+	'filemanager.emptyFolder' : '空文件夹',
+	'filemanager.moveup' : '移到上一级文件夹',
+	'filemanager.viewType' : '显示方式：',
+	'filemanager.viewImage' : '缩略图',
+	'filemanager.listImage' : '详细信息',
+	'filemanager.orderType' : '排序方式：',
+	'filemanager.fileName' : '名称',
+	'filemanager.fileSize' : '大小',
+	'filemanager.fileType' : '类型',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : '文件说明',
+	'insertfile.upload' : '上传',
+	'insertfile.viewServer' : '文件空间',
+	'table.cells' : '单元格数',
+	'table.rows' : '行数',
+	'table.cols' : '列数',
+	'table.size' : '大小',
+	'table.width' : '宽度',
+	'table.height' : '高度',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '边距间距',
+	'table.padding' : '边距',
+	'table.spacing' : '间距',
+	'table.align' : '对齐方式',
+	'table.textAlign' : '水平对齐',
+	'table.verticalAlign' : '垂直对齐',
+	'table.alignDefault' : '默认',
+	'table.alignLeft' : '左对齐',
+	'table.alignCenter' : '居中',
+	'table.alignRight' : '右对齐',
+	'table.alignTop' : '顶部',
+	'table.alignMiddle' : '中部',
+	'table.alignBottom' : '底部',
+	'table.alignBaseline' : '基线',
+	'table.border' : '边框',
+	'table.borderWidth' : '边框',
+	'table.borderColor' : '颜色',
+	'table.backgroundColor' : '背景颜色',
+	'map.address' : '地址: ',
+	'map.search' : '搜索',
+	'baidumap.address' : '地址: ',
+	'baidumap.search' : '搜索',
+	'baidumap.insertDynamicMap' : '插入动态地图',
+	'anchor.name' : '锚点名称',
+	'formatblock.formatBlock' : {
+		h1 : '标题 1',
+		h2 : '标题 2',
+		h3 : '标题 3',
+		h4 : '标题 4',
+		p : '正 文'
+	},
+	'fontname.fontName' : {
+		'SimSun' : '宋体',
+		'NSimSun' : '新宋体',
+		'FangSong_GB2312' : '仿宋_GB2312',
+		'KaiTi_GB2312' : '楷体_GB2312',
+		'SimHei' : '黑体',
+		'Microsoft YaHei' : '微软雅黑',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Times New Roman' : 'Times New Roman',
+		'Courier New' : 'Courier New',
+		'Tahoma' : 'Tahoma',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '单倍行距'},
+		{'1.5' : '1.5倍行距'},
+		{'2' : '2倍行距'},
+		{'2.5' : '2.5倍行距'},
+		{'3' : '3倍行距'}
+	],
+	'template.selectTemplate' : '可选模板',
+	'template.replaceContent' : '替换当前内容',
+	'template.fileList' : {
+		'1.html' : '图片和文字',
+		'2.html' : '表格',
+		'3.html' : '项目编号'
+	}
+}, 'zh_CN');
diff --git a/public/assets/kindeditor/plugins/autoheight/autoheight.js b/public/assets/kindeditor/plugins/autoheight/autoheight.js
new file mode 100644
index 00000000..e8294c4b
--- /dev/null
+++ b/public/assets/kindeditor/plugins/autoheight/autoheight.js
@@ -0,0 +1,71 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('autoheight', function(K) {
+	var self = this;
+    //self.autoHeightMode = true;
+	if (!self.autoHeightMode) {
+		return;
+	}
+
+	var minHeight;
+
+	function hideScroll() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe[0].scroll = 'no';
+		body.style.overflowY = 'hidden';
+	}
+
+	function resetHeight() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe.height(minHeight);
+
+        //最高418 超过用滚动条
+		self.resize(null, Math.max(
+            (K.IE ? body.scrollHeight : body.offsetHeight) > 385 ? 385+33 : (K.IE ? body.scrollHeight : body.offsetHeight)
+                + 33, minHeight));
+
+        if( self.height == "418px" ){
+            edit.iframe[0].scroll = 'yes';
+            body.style.overflowY = 'auto';
+        }
+        else{
+            hideScroll();
+        }
+	}
+
+	function init() {
+		minHeight = K.removeUnit(self.height);
+
+		self.edit.afterChange(resetHeight);
+		hideScroll();
+        var edit = self.edit;
+        var body = edit.doc.body;
+        edit.iframe.height(minHeight);
+        self.resize(null, Math.max(
+                ((K.IE ? body.scrollHeight : body.offsetHeight) > 250 ? 250 : (K.IE ? body.scrollHeight : body.offsetHeight)) //限制初始化太高的情况
+                + 33, minHeight));
+	}
+
+	if (self.isCreated) {
+		init();
+	} else {
+		self.afterCreate(init);
+	}
+});
+
+/*
+* 如何实现真正的自动高度？
+* 修改编辑器高度之后，再次获取body内容高度时，最小值只会是当前iframe的设置高度，这样就导致高度只增不减。
+* 所以每次获取body内容高度之前，先将iframe的高度重置为最小高度，这样就能获取body的实际高度。
+* 由此就实现了真正的自动高度
+* 测试：chrome、firefox、IE9、IE8
+* */
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
new file mode 100644
index 00000000..9e3fddab
--- /dev/null
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -0,0 +1,56 @@
+.ke-content {
+    font-family: "微软雅黑","宋体";
+}
+.ke-content pre {
+    font-size:9pt;
+    font-family:Courier New,Arial;
+    border:1px solid #ddd;
+    border-left:5px solid #6CE26C;
+    background:#f6f6f6;
+    padding:5px;
+}
+
+.ke-content code {
+    margin: 0 2px;
+    padding: 0 5px;
+    white-space: nowrap;
+    border: 1px solid #DDD;
+    background-color: #F6F6F6;
+    border-radius: 3px;
+}
+
+.ke-content pre>code {
+    margin: 0;
+    padding: 0;
+    white-space: pre;
+    border: none;
+    background: transparent;
+}
+
+.ke-content pre code {
+    background-color: transparent;
+    border: none;
+}
+
+.ke-content p {
+    /*margin: 0 0 15px 0;*/
+    /*margin-bottom:15pt;*/
+    line-height:1.5;
+    /*letter-spacing: 1px;*/
+}
+
+.ke-content div.ref {border:1px solid #ddd;margin:0 0 10px 0;padding:2px;font-size:9pt;background:#ffe;}
+.ke-content div.ref h4 {margin:0;padding:1px 3px;background:#CC9966;color:#fff;font-size:9pt;font-weight:normal;}
+.ke-content div.ref .ref_body {margin:0;padding:2px;line-height:20px;color:#666;font-size:9pt;}
+
+
+.ke-content blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
+span.at {color:#269ac9;}
+span.at a{color:#269ac9;text-decoration: none;}
+
+/*yk*/
+.ke-content ol li{list-style-type: decimal;}
+.ke-content ul li{list-style-type: disc;}
+.ke-content ol,.ke-content ul,.ke-content h1,.ke-content h2,.ke-content h3,.ke-content h4{margin-top:0;margin-bottom: 0;}
+.ke-content a{color: #136ec2;}
+.ke-content a:link,.ke-content a:visited{text-decoration:none;}
diff --git a/public/assets/kindeditor/plugins/paste/paste.js b/public/assets/kindeditor/plugins/paste/paste.js
new file mode 100644
index 00000000..aee6bb85
--- /dev/null
+++ b/public/assets/kindeditor/plugins/paste/paste.js
@@ -0,0 +1,361 @@
+// Generated by CoffeeScript 1.9.0
+
+/* 
+paste.js is an interface to read data ( text / image ) from clipboard in different browsers. It also contains several hacks.
+https://github.com/layerssss/paste.js
+ */
+
+(function() {
+    var $, Paste, createHiddenEditable, dataURLtoBlob;
+
+    $ = window.jQuery;
+
+    $.paste = function(pasteContainer) {
+        var pm;
+        if (typeof console !== "undefined" && console !== null) {
+            console.log("DEPRECATED: This method is deprecated. Please use $.fn.pastableNonInputable() instead.");
+        }
+        pm = Paste.mountNonInputable(pasteContainer);
+        return pm._container;
+    };
+
+    $.fn.pastableNonInputable = function() {
+        var el, _i, _len;
+        for (_i = 0, _len = this.length; _i < _len; _i++) {
+            el = this[_i];
+            Paste.mountNonInputable(el);
+        }
+        return this;
+    };
+
+    $.fn.pastableTextarea = function() {
+        var el, _i, _len;
+        for (_i = 0, _len = this.length; _i < _len; _i++) {
+            el = this[_i];
+            Paste.mountTextarea(el);
+        }
+        return this;
+    };
+
+    $.fn.pastableContenteditable = function() {
+        var el, _i, _len;
+        for (_i = 0, _len = this.length; _i < _len; _i++) {
+            el = this[_i];
+            Paste.mountContenteditable(el);
+        }
+        return this;
+    };
+
+    dataURLtoBlob = function(dataURL, sliceSize) {
+        var b64Data, byteArray, byteArrays, byteCharacters, byteNumbers, contentType, i, m, offset, slice, _ref;
+        if (sliceSize == null) {
+            sliceSize = 512;
+        }
+        if (!(m = dataURL.match(/^data\:([^\;]+)\;base64\,(.+)$/))) {
+            return null;
+        }
+        _ref = m, m = _ref[0], contentType = _ref[1], b64Data = _ref[2];
+        byteCharacters = atob(b64Data);
+        byteArrays = [];
+        offset = 0;
+        while (offset < byteCharacters.length) {
+            slice = byteCharacters.slice(offset, offset + sliceSize);
+            byteNumbers = new Array(slice.length);
+            i = 0;
+            while (i < slice.length) {
+                byteNumbers[i] = slice.charCodeAt(i);
+                i++;
+            }
+            byteArray = new Uint8Array(byteNumbers);
+            byteArrays.push(byteArray);
+            offset += sliceSize;
+        }
+        return new Blob(byteArrays, {
+            type: contentType
+        });
+    };
+
+    createHiddenEditable = function() {
+        return $(document.createElement('div')).attr('contenteditable', true).css({
+            width: 1,
+            height: 1,
+            position: 'fixed',
+            left: -100,
+            overflow: 'hidden'
+        });
+    };
+
+    Paste = (function() {
+        Paste.prototype._target = null;
+
+        Paste.prototype._container = null;
+
+        Paste.mountNonInputable = function(nonInputable) {
+            var paste;
+            paste = new Paste(createHiddenEditable().appendTo(nonInputable), nonInputable);
+            $(nonInputable).on('click', (function(_this) {
+                return function() {
+                    return paste._container.focus();
+                };
+            })(this));
+            paste._container.on('focus', (function(_this) {
+                return function() {
+                    return $(nonInputable).addClass('pastable-focus');
+                };
+            })(this));
+            return paste._container.on('blur', (function(_this) {
+                return function() {
+                    return $(nonInputable).removeClass('pastable-focus');
+                };
+            })(this));
+        };
+
+        Paste.mountTextarea = function(textarea) {
+            var ctlDown, paste;
+            if (-1 !== navigator.userAgent.toLowerCase().indexOf('chrome')) {
+                return this.mountContenteditable(textarea);
+            }
+            paste = new Paste(createHiddenEditable().insertBefore(textarea), textarea);
+            ctlDown = false;
+            $(textarea).on('keyup', function(ev) {
+                var _ref;
+                if ((_ref = ev.keyCode) === 17 || _ref === 224) {
+                    return ctlDown = false;
+                }
+            });
+            $(textarea).on('keydown', function(ev) {
+                var _ref;
+                if ((_ref = ev.keyCode) === 17 || _ref === 224) {
+                    ctlDown = true;
+                }
+                if (ctlDown && ev.keyCode === 86) {
+                    return paste._container.focus();
+                }
+            });
+            $(paste._target).on('pasteImage', (function(_this) {
+                return function() {
+                    return $(textarea).focus();
+                };
+            })(this));
+            $(paste._target).on('pasteText', (function(_this) {
+                return function() {
+                    return $(textarea).focus();
+                };
+            })(this));
+            $(textarea).on('focus', (function(_this) {
+                return function() {
+                    return $(textarea).addClass('pastable-focus');
+                };
+            })(this));
+            return $(textarea).on('blur', (function(_this) {
+                return function() {
+                    return $(textarea).removeClass('pastable-focus');
+                };
+            })(this));
+        };
+
+        Paste.mountContenteditable = function(contenteditable) {
+            var paste;
+            paste = new Paste(contenteditable, contenteditable);
+            $(contenteditable).on('focus', (function(_this) {
+                return function() {
+                    return $(contenteditable).addClass('pastable-focus');
+                };
+            })(this));
+            return $(contenteditable).on('blur', (function(_this) {
+                return function() {
+                    return $(contenteditable).removeClass('pastable-focus');
+                };
+            })(this));
+        };
+
+        function Paste(_at__container, _at__target) {
+            this._container = _at__container;
+            this._target = _at__target;
+            this._container = $(this._container);
+            this._target = $(this._target).addClass('pastable');
+            this._container.on('paste', (function(_this) {
+                return function(ev) {
+                    var clipboardData, file, item, reader, text, _i, _j, _len, _len1, _ref, _ref1, _ref2, _ref3, _results;
+                    if (((_ref = ev.originalEvent) != null ? _ref.clipboardData : void 0) != null) {
+                        clipboardData = ev.originalEvent.clipboardData;
+                        if (clipboardData.items) {
+                            _ref1 = clipboardData.items;
+                            for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+                                item = _ref1[_i];
+                                if (item.type.match(/^image\//)) {
+                                    reader = new FileReader();
+                                    reader.onload = function(event) {
+                                        return _this._handleImage(event.target.result);
+                                    };
+                                    reader.readAsDataURL(item.getAsFile());
+                                }
+                                if (item.type === 'text/plain') {
+                                    item.getAsString(function(string) {
+                                        return _this._target.trigger('pasteText', {
+                                            text: string
+                                        });
+                                    });
+                                }
+                            }
+                        } else {
+                            if (-1 !== Array.prototype.indexOf.call(clipboardData.types, 'text/plain')) {
+                                text = clipboardData.getData('Text');
+                                _this._target.trigger('pasteText', {
+                                    text: text
+                                });
+                            }
+                            _this._checkImagesInContainer(function(src) {
+                                return _this._handleImage(src);
+                            });
+                        }
+                    }
+                    if (clipboardData = window.clipboardData) {
+                        if ((_ref2 = (text = clipboardData.getData('Text'))) != null ? _ref2.length : void 0) {
+                            return _this._target.trigger('pasteText', {
+                                text: text
+                            });
+                        } else {
+                            _ref3 = clipboardData.files;
+                            _results = [];
+                            for (_j = 0, _len1 = _ref3.length; _j < _len1; _j++) {
+                                file = _ref3[_j];
+                                _this._handleImage(URL.createObjectURL(file));
+                                _results.push(_this._checkImagesInContainer(function() {}));
+                            }
+                            return _results;
+                        }
+                    }
+                };
+            })(this));
+        }
+
+        Paste.prototype._handleImage = function(src) {
+            var loader;
+            loader = new Image();
+            loader.onload = (function(_this) {
+                return function() {
+                    var blob, canvas, ctx, dataURL;
+                    canvas = document.createElement('canvas');
+                    canvas.width = loader.width;
+                    canvas.height = loader.height;
+                    ctx = canvas.getContext('2d');
+                    ctx.drawImage(loader, 0, 0, canvas.width, canvas.height);
+                    dataURL = null;
+                    try {
+                        dataURL = canvas.toDataURL('image/png');
+                        blob = dataURLtoBlob(dataURL);
+                    } catch (_error) {}
+                    if (dataURL) {
+                        return _this._target.trigger('pasteImage', {
+                            blob: blob,
+                            dataURL: dataURL,
+                            width: loader.width,
+                            height: loader.height
+                        });
+                    }
+                };
+            })(this);
+            return loader.src = src;
+        };
+
+        Paste.prototype._checkImagesInContainer = function(cb) {
+            var img, timespan, _i, _len, _ref;
+            timespan = Math.floor(1000 * Math.random());
+            _ref = this._container.find('img');
+            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+                img = _ref[_i];
+                img["_paste_marked_" + timespan] = true;
+            }
+            return setTimeout((function(_this) {
+                return function() {
+                    var _j, _len1, _ref1, _results;
+                    _ref1 = _this._container.find('img');
+                    _results = [];
+                    for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+                        img = _ref1[_j];
+                        if (!img["_paste_marked_" + timespan]) {
+                            cb(img.src);
+                        }
+                        //firefox问题处理，因为采用了 pastableContenteditable 模式，故只需要删除默认的粘贴
+                        if ($(img).attr('src').startsWith('data:image/')) {
+                           _results.push($(img).remove()); 
+                        };
+                    }
+                    return _results;
+                };
+            })(this), 1);
+        };
+
+        return Paste;
+
+    })();
+
+}).call(this);
+
+KindEditor.plugin('paste', function(K) {
+    var editor = this,
+        name = 'paste';
+    if(editor.edit == undefined || editor.edit.iframe == undefined){
+        return;
+    }
+    var contentWindow = editor.edit.iframe[0].contentWindow;
+    //var contentWindow = editor.iframeDoc;
+    //var contentWindow = document.getElementsByTagName('iframe')[0].contentWindow;
+    var nodeBody = contentWindow.document.getElementsByTagName('body')[0];
+    console.log(nodeBody);
+    $(nodeBody).pastableContenteditable();
+    
+    dataURItoBlob = function(dataURI) {
+      // convert base64/URLEncoded data component to raw binary data held in a string
+      var byteString;
+      if (dataURI.split(',')[0].indexOf('base64') >= 0)
+        byteString = atob(dataURI.split(',')[1]);
+      else
+        byteString = unescape(dataURI.split(',')[1]);
+
+      // separate out the mime component
+      var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0];
+
+      // write the bytes of the string to a typed array
+      var ia = new Uint8Array(byteString.length);
+      for (var i = 0; i < byteString.length; i++) {
+        ia[i] = byteString.charCodeAt(i);
+      }
+
+      return new Blob([ia], {type:mimeString});
+    };
+
+    $(nodeBody).on('pasteImage', function(ev, data) {
+        console.log('pasteImage');
+        console.log("dataURL: " + data.dataURL);
+        console.log("width: " + data.width);
+        console.log("height: " + data.height);
+        var blob = dataURItoBlob(data.dataURL);
+        if (data.blob !== null) {
+            var data = new FormData();
+            // data.append("imgFile",blob, "imageFilename.png");
+            data.append("file",blob, "imageFilename.png");
+            console.log(data);
+            $.ajax({
+              url: '/kindeditor/upload?dir=image',
+              url: '/api/attachments.json',
+              contentType: false,
+              type: 'POST',
+              data: data,
+              processData: false,
+              success: function(data) {
+                console.log(data);
+                // editor.exec('insertimage', JSON.parse(data).url);
+
+                // /api/attachments/227362
+                editor.exec('insertimage', '/api/attachments/' + data.id);
+              }
+            });
+        }
+
+    });
+    return;
+    
+});
+
diff --git a/public/assets/kindeditor/themes/default/default.css b/public/assets/kindeditor/themes/default/default.css
new file mode 100644
index 00000000..49a9c0a4
--- /dev/null
+++ b/public/assets/kindeditor/themes/default/default.css
@@ -0,0 +1,1168 @@
+/* common */
+.ke-inline-block {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-clearfix {
+	zoom: 1;
+}
+.ke-clearfix:after {
+	content: ".";
+	display: block;
+	clear: both;
+	font-size: 0;
+	height: 0;
+	line-height: 0;
+	visibility: hidden;
+}
+.ke-shadow {
+	box-shadow: 1px 1px 3px #A0A0A0;
+	-moz-box-shadow: 1px 1px 3px #A0A0A0;
+	-webkit-box-shadow: 1px 1px 3px #A0A0A0;
+	filter: progid:DXImageTransform.Microsoft.Shadow(color='#A0A0A0', Direction=135, Strength=3);
+	background-color: #F0F0EE;
+}
+.ke-menu a,
+.ke-menu a:hover,
+.ke-dialog a,
+.ke-dialog a:hover {
+	color: #337FE5;
+	text-decoration: none;
+}
+/* icons */
+.ke-icon-source {
+	background-position: 0px 0px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-preview {
+	background-position: 0px -16px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-print {
+	background-position: 0px -32px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-undo {
+	background-position: 0px -48px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-redo {
+	background-position: 0px -64px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-cut {
+	background-position: 0px -80px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-copy {
+	background-position: 0px -96px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-paste {
+	background-position: 0px -112px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-selectall {
+	background-position: 0px -128px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyleft {
+	background-position: 0px -144px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifycenter {
+	background-position: 0px -160px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyright {
+	background-position: 0px -176px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyfull {
+	background-position: 0px -192px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertorderedlist {
+	background-position: 0px -208px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertunorderedlist {
+	background-position: 0px -224px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-indent {
+	background-position: 0px -240px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-outdent {
+	background-position: 0px -256px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-subscript {
+	background-position: 0px -272px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-superscript {
+	background-position: 0px -288px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-date {
+	background-position: 0px -304px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-time {
+	background-position: 0px -320px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-formatblock {
+	background-position: 0px -336px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-fontname {
+	background-position: 0px -352px;
+	width: 21px;
+	height: 16px;
+}
+.ke-icon-fontsize {
+	background-position: 0px -368px;
+	width: 23px;
+	height: 16px;
+}
+.ke-icon-forecolor {
+	background-position: 0px -384px;
+	width: 20px;
+	height: 16px;
+}
+.ke-icon-hilitecolor {
+	background-position: 0px -400px;
+	width: 23px;
+	height: 16px;
+}
+.ke-icon-bold {
+	background-position: 0px -416px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-italic {
+	background-position: 0px -432px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-underline {
+	background-position: 0px -448px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-strikethrough {
+	background-position: 0px -464px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-removeformat {
+	background-position: 0px -480px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-image {
+	background-position: 0px -496px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-flash {
+	background-position: 0px -512px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-media {
+	background-position: 0px -528px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-div {
+	background-position: 0px -544px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-formula {
+	background-position: 0px -576px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-hr {
+	background-position: 0px -592px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-emoticons {
+	background-position: 0px -608px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-link {
+	background-position: 0px -624px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-unlink {
+	background-position: 0px -640px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-fullscreen {
+	background-position: 0px -656px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-about {
+	background-position: 0px -672px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-more {
+    background-position: 0px -672px;
+    width: 16px;
+    height: 16px;
+}
+.ke-icon-plainpaste {
+	background-position: 0px -704px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-wordpaste {
+	background-position: 0px -720px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-table {
+	background-position: 0px -784px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablemenu {
+	background-position: 0px -768px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tableinsert {
+	background-position: 0px -784px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tabledelete {
+	background-position: 0px -800px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolinsertleft {
+	background-position: 0px -816px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolinsertright {
+	background-position: 0px -832px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowinsertabove {
+	background-position: 0px -848px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowinsertbelow {
+	background-position: 0px -864px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecoldelete {
+	background-position: 0px -880px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowdelete {
+	background-position: 0px -896px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecellprop {
+	background-position: 0px -912px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tableprop {
+	background-position: 0px -928px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-checked {
+	background-position: 0px -944px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-code {
+	background-position: 0px -960px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-map {
+	background-position: 0px -976px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-less {
+    background-position: 0px -976px;
+    width: 16px;
+    height: 16px;
+}
+.ke-icon-baidumap {
+	background-position: 0px -976px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-lineheight {
+	background-position: 0px -992px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-clearhtml {
+	background-position: 0px -1008px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-pagebreak {
+	background-position: 0px -1024px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertfile {
+	background-position: 0px -1040px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-quickformat {
+	background-position: 0px -1056px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-template {
+	background-position: 0px -1072px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecellsplit {
+	background-position: 0px -1088px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowmerge {
+	background-position: 0px -1104px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowsplit {
+	background-position: 0px -1120px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolmerge {
+	background-position: 0px -1136px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolsplit {
+	background-position: 0px -1152px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-anchor {
+	background-position: 0px -1168px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-search {
+	background-position: 0px -1184px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-new {
+	background-position: 0px -1200px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-specialchar {
+	background-position: 0px -1216px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-multiimage {
+	background-position: 0px -1232px;
+	width: 16px;
+	height: 16px;
+}
+
+.ke-icon-imagedirectupload
+{
+    background-position: 0px -496px;
+    width: 16px;
+    height: 16px;
+}
+/* container */
+.ke-container {
+    max-width: 100%;
+	display: block;
+	border: 1px solid #CCCCCC;
+	background-color: #FFF;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+    border-radius: 3px;
+    -moz-box-sizing: border-box;  /*Firefox3.5+*/-webkit-box-sizing: border-box; /*Safari3.2+*/-o-box-sizing: border-box; /*Opera9.6*/-ms-box-sizing: border-box; /*IE8*/box-sizing: border-box;
+}
+/* toolbar */
+.ke-toolbar {
+	border-bottom: 1px solid #CCC;
+	background-color: #F0F0EE;
+	padding: 2px 5px;
+	text-align: left;
+	overflow: hidden;
+	zoom: 1;
+}
+.ke-toolbar-icon {
+	background-repeat: no-repeat;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	display: block;
+}
+.ke-toolbar-icon-url {
+	background-image: url(default.png);
+}
+.ke-toolbar .ke-outline {
+	border: 1px solid #F0F0EE;
+	margin: 1px;
+	padding: 1px 2px;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	cursor: pointer;
+	display: block;
+	float: left;
+}
+.ke-toolbar .ke-on {
+	border: 1px solid #5690D2;
+}
+.ke-toolbar .ke-selected {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-toolbar .ke-disabled {
+	cursor: default;
+}
+.ke-toolbar .ke-separator {
+	height: 16px;
+	margin: 2px 3px;
+	border-left: 1px solid #A0A0A0;
+	border-right: 1px solid #FFFFFF;
+	border-top:0;
+	border-bottom:0;
+	width: 0;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	display: block;
+	float: left;
+}
+.ke-toolbar .ke-hr {
+	overflow: hidden;
+	height: 1px;
+	clear: both;
+}
+/* edit */
+.ke-edit {
+	padding: 0;
+}
+.ke-edit-iframe,
+.ke-edit-textarea {
+	border: 0;
+	margin: 0;
+	padding: 0;
+	overflow: auto;
+}
+.ke-edit-textarea {
+	font: 12px/1.5 "Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
+	color: #000;
+	overflow: auto;
+	resize: none;
+}
+.ke-edit-textarea:focus {
+	outline: none;
+}
+/* statusbar */
+.ke-statusbar {
+	position: relative;
+
+	font-size: 0;
+	line-height: 0;
+	*height: 12px;
+	overflow: hidden;
+	text-align: center;
+	cursor: s-resize;
+}
+.ke-statusbar-center-icon {
+	background-position: -0px -754px;
+	width: 15px;
+	height: 11px;
+	background-image: url(default.png);
+}
+.ke-statusbar-right-icon {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	cursor: se-resize;
+	background-position: -5px -741px;
+	width: 11px;
+	height: 11px;
+	background-image: url(default.png);
+}
+/* menu */
+.ke-menu {
+	border: 1px solid #A0A0A0;
+	background-color: #F1F1F1;
+	color: #222222;
+	padding: 2px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-item {
+	border: 1px solid #F1F1F1;
+	background-color: #F1F1F1;
+	color: #222222;
+	height: 24px;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-menu-item-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-menu-item-left {
+	width: 27px;
+	text-align: center;
+	overflow: hidden;
+}
+.ke-menu-item-center {
+	width: 0;
+	height: 24px;
+	border-left: 1px solid #E3E3E3;
+	border-right: 1px solid #FFFFFF;
+	border-top: 0;
+	border-bottom: 0;
+}
+.ke-menu-item-center-on {
+	border-left: 1px solid #E9EFF6;
+	border-right: 1px solid #E9EFF6;
+}
+.ke-menu-item-right {
+	border: 0;
+	padding: 0 0 0 5px;
+	line-height: 24px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-separator {
+	margin: 2px 0;
+	height: 0;
+	overflow: hidden;
+	border-top: 1px solid #CCCCCC;
+	border-bottom: 1px solid #FFFFFF;
+	border-left: 0;
+	border-right: 0;
+}
+/* colorpicker */
+.ke-colorpicker {
+	border: 1px solid #A0A0A0;
+	background-color: #F1F1F1;
+	color: #222222;
+	padding: 2px;
+}
+.ke-colorpicker-table {
+	border:0;
+	margin:0;
+	padding:0;
+	border-collapse: separate;
+}
+.ke-colorpicker-cell {
+	font-size: 0;
+	line-height: 0;
+	border: 1px solid #F0F0EE;
+	cursor: pointer;
+	margin:3px;
+	padding:0;
+}
+.ke-colorpicker-cell-top {
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 24px;
+	border: 1px solid #F0F0EE;
+	cursor: pointer;
+	margin:0;
+	padding:0;
+	text-align: center;
+}
+.ke-colorpicker-cell-on {
+	border: 1px solid #5690D2;
+}
+.ke-colorpicker-cell-selected {
+	border: 1px solid #2446AB;
+}
+.ke-colorpicker-cell-color {
+	width: 14px;
+	height: 14px;
+	margin: 3px;
+	padding: 0;
+	border: 0;
+}
+/* dialog */
+.ke-dialog {
+	position: absolute;
+	margin: 0;
+	padding: 0;
+}
+.ke-dialog .ke-header {
+	width: 100%;
+	margin-bottom: 10px;
+}
+.ke-dialog .ke-header .ke-left {
+	float: left;
+}
+.ke-dialog .ke-header .ke-right {
+	float: right;
+}
+.ke-dialog .ke-header label {
+	margin-right: 0;
+	cursor: pointer;
+	font-weight: normal;
+	display: inline;
+	vertical-align: top;
+}
+.ke-dialog-content {
+	background-color: #FFF;
+	width: 100%;
+	height: 100%;
+	color: #333;
+	border: 1px solid #A0A0A0;
+}
+.ke-dialog-shadow {
+	position: absolute;
+	z-index: -1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	box-shadow: 3px 3px 7px #999;
+	-moz-box-shadow: 3px 3px 7px #999;
+	-webkit-box-shadow: 3px 3px 7px #999;
+	filter: progid:DXImageTransform.Microsoft.Blur(PixelRadius='3', MakeShadow='true', ShadowOpacity='0.4');
+	background-color: #F0F0EE;
+}
+.ke-dialog-header {
+	border:0;
+	margin:0;
+	padding: 0 10px;
+	background: url(background.png) repeat scroll 0 0 #F0F0EE;
+	border-bottom: 1px solid #CFCFCF;
+	height: 24px;
+	font: 12px/24px "sans serif",tahoma,verdana,helvetica;
+	text-align: left;
+	color: #222;
+	cursor: move;
+}
+.ke-dialog-icon-close {
+	display: block;
+	background: url(default.png) no-repeat scroll 0px -688px;
+	width: 16px;
+	height: 16px;
+	position: absolute;
+	right: 6px;
+	top: 6px;
+	cursor: pointer;
+}
+.ke-dialog-body {
+	font: 12px/1.5 "sans serif",tahoma,verdana,helvetica;
+	text-align: left;
+	overflow: hidden;
+	width: 100%;
+}
+.ke-dialog-body textarea {
+	display: block;
+	overflow: auto;
+	padding: 0;
+	resize: none;
+}
+.ke-dialog-body textarea:focus,
+.ke-dialog-body input:focus,
+.ke-dialog-body select:focus {
+	outline: none;
+}
+.ke-dialog-body label {
+	margin-right: 10px;
+	cursor: pointer;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-dialog-body img {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-dialog-body select {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+	width: auto;
+}
+.ke-dialog-body .ke-textarea {
+	display: block;
+	width: 408px;
+	height: 260px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+}
+.ke-dialog-body .ke-form {
+	margin: 0;
+	padding: 0;
+}
+.ke-dialog-loading {
+	position: absolute;
+	top: 0;
+	left: 1px;
+	z-index: 1;
+	text-align: center;
+}
+.ke-dialog-loading-content {
+	background: url("../common/loading.gif") no-repeat;
+    color: #666;
+    font-size: 14px;
+    font-weight: bold;
+    height: 31px;
+    line-height: 31px;
+    padding-left: 36px;
+}
+.ke-dialog-row {
+	margin-bottom: 10px;
+}
+.ke-dialog-footer {
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	text-align: right;
+	padding:0 0 5px 0;
+	background-color: #FFF;
+	width: 100%;
+}
+.ke-dialog-preview,
+.ke-dialog-yes {
+	margin: 5px;
+}
+.ke-dialog-no {
+	margin: 5px 10px 5px 5px;
+}
+.ke-dialog-mask {
+	background-color:#FFF;
+	filter:alpha(opacity=50);
+	opacity:0.5;
+}
+.ke-button-common {
+	background: url(background.png) no-repeat scroll 0 -25px transparent;
+	cursor: pointer;
+	height: 23px;
+	line-height: 23px;
+	overflow: visible;
+	display: inline-block;
+	vertical-align: top;
+	cursor: pointer;
+}
+.ke-button-outer {
+	background-position: 0 -25px;
+	padding: 0;
+	position: relative;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-button {
+	background-position: right -25px;
+	padding: 0 12px;
+	margin: 0;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	border: 0 none;
+	color: #333;
+	font-size: 12px;
+	left: 2px;
+	text-decoration: none;
+}
+/* inputbox */
+.ke-input-text {
+	background-color:#FFFFFF;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 17px;
+	height: 17px;
+	padding: 2px 4px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-input-number {
+	width: 50px;
+}
+.ke-input-color {
+	border: 1px solid #A0A0A0;
+	background-color: #FFFFFF;
+	font-size: 12px;
+	width: 60px;
+	height: 20px;
+	line-height: 20px;
+	padding-left: 5px;
+	overflow: hidden;
+	cursor: pointer;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-upload-button {
+	position: relative;
+}
+.ke-upload-area {
+	position: relative;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+	*height: 25px;
+}
+.ke-upload-area .ke-upload-file {
+	position: absolute;
+	font-size: 60px;
+	top: 0;
+	right: 0;
+	padding: 0;
+	margin: 0;
+	z-index: 811212;
+	border: 0 none;
+	opacity: 0;
+	filter: alpha(opacity=0);
+}
+/* tabs */
+.ke-tabs {
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	border-bottom:1px solid #A0A0A0;
+	padding-left:5px;
+	margin-bottom:20px;
+}
+.ke-tabs-ul  {
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	margin:0;
+	padding:0;
+}
+.ke-tabs-li {
+	position: relative;
+	border: 1px solid #A0A0A0;
+	background-color: #F0F0EE;
+	margin: 0 2px -1px 0;
+	padding: 0 20px;
+	float: left;
+	line-height: 25px;
+	text-align: center;
+	color: #555555;
+	cursor: pointer;
+}
+.ke-tabs-li-selected {
+	background-color: #FFF;
+	border-bottom: 1px solid #FFF;
+	color: #000;
+	cursor: default;
+}
+.ke-tabs-li-on {
+	background-color: #FFF;
+	color: #000;
+}
+/* progressbar */
+.ke-progressbar {
+	position: relative;
+	margin: 0;
+	padding: 0;
+}
+.ke-progressbar-bar {
+	border: 1px solid #6FA5DB;
+	width: 80px;
+	height: 5px;
+	margin: 10px 10px 0 10px;
+	padding: 0;
+}
+.ke-progressbar-bar-inner {
+	width: 0;
+	height: 5px;
+	background-color: #6FA5DB;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+}
+.ke-progressbar-percent {
+	position: absolute;
+	top: 0;
+	left: 40%;
+	display: none;
+}
+/* swfupload */
+.ke-swfupload-top {
+	position: relative;
+	margin-bottom: 10px;
+	_width: 608px;
+}
+.ke-swfupload-button {
+	height: 23px;
+	line-height: 23px;
+}
+.ke-swfupload-desc {
+	padding: 0 10px;
+	height: 23px;
+	line-height: 23px;
+}
+.ke-swfupload-startupload {
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.ke-swfupload-body {
+	overflow: scroll;
+	background-color:#FFFFFF;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	width: auto;
+	height: 370px;
+	padding: 5px;
+}
+.ke-swfupload-body .ke-item {
+	width: 100px;
+	margin: 5px;
+}
+.ke-swfupload-body .ke-photo {
+	position: relative;
+	border: 1px solid #DDDDDD;
+	background-color:#FFFFFF;
+	padding: 10px;
+}
+.ke-swfupload-body .ke-delete {
+	display: block;
+	background: url(default.png) no-repeat scroll 0px -688px;
+	width: 16px;
+	height: 16px;
+	position: absolute;
+	right: 0;
+	top: 0;
+	cursor: pointer;
+}
+.ke-swfupload-body .ke-status  {
+	position: absolute;
+	left: 0;
+	bottom: 5px;
+	width: 100px;
+	height: 17px;
+}
+.ke-swfupload-body .ke-message  {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:17px;
+}
+.ke-swfupload-body .ke-error  {
+	color: red;
+}
+.ke-swfupload-body .ke-name {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:16px;
+}
+.ke-swfupload-body .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+
+/* emoticons */
+.ke-plugin-emoticons {
+	position: relative;
+}
+.ke-plugin-emoticons .ke-preview {
+	position: absolute;
+	text-align: center;
+	margin: 2px;
+	padding: 10px;
+	top: 0;
+	border: 1px solid #A0A0A0;
+	background-color: #FFFFFF;
+	display: none;
+}
+.ke-plugin-emoticons .ke-preview-img {
+	border:0;
+	margin:0;
+	padding:0;
+}
+.ke-plugin-emoticons .ke-table {
+	border:0;
+	margin:0;
+	padding:0;
+	border-collapse:separate;
+}
+.ke-plugin-emoticons .ke-cell {
+	margin:0;
+	padding:1px;
+	border:1px solid #F0F0EE;
+	cursor:pointer;
+}
+.ke-plugin-emoticons .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-plugin-emoticons .ke-img {
+	display:block;
+	background-repeat:no-repeat;
+	overflow:hidden;
+	margin:2px;
+	width:24px;
+	height:24px;
+	margin: 0;
+	padding: 0;
+	border: 0;
+}
+.ke-plugin-emoticons .ke-page {
+	text-align: right;
+	margin: 5px;
+	padding: 0;
+	border: 0;
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	color: #333;
+	text-decoration: none;
+}
+.ke-plugin-plainpaste-textarea,
+.ke-plugin-wordpaste-iframe {
+	display: block;
+	width: 408px;
+	height: 260px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+}
+/* filemanager */
+.ke-plugin-filemanager-header {
+	width: 100%;
+	margin-bottom: 10px;
+}
+.ke-plugin-filemanager-header .ke-left {
+	float: left;
+}
+.ke-plugin-filemanager-header .ke-right {
+	float: right;
+}
+.ke-plugin-filemanager-body {
+	overflow: scroll;
+	background-color:#FFFFFF;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	width: auto;
+	height: 370px;
+	padding: 5px;
+}
+.ke-plugin-filemanager-body .ke-item {
+	width: 100px;
+	margin: 5px;
+}
+.ke-plugin-filemanager-body .ke-photo {
+	border: 1px solid #DDDDDD;
+	background-color:#FFFFFF;
+	padding: 10px;
+}
+.ke-plugin-filemanager-body .ke-name {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:16px;
+}
+.ke-plugin-filemanager-body .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-plugin-filemanager-body .ke-table {
+	width: 95%;
+	border: 0;
+	margin: 0;
+	padding: 0;
+	border-collapse: separate;
+}
+.ke-plugin-filemanager-body .ke-table .ke-cell {
+	margin: 0;
+	padding: 0;
+	border: 0;
+}
+.ke-plugin-filemanager-body .ke-table .ke-name {
+	width: 55%;
+	text-align: left;
+}
+.ke-plugin-filemanager-body .ke-table .ke-size {
+	width: 15%;
+	text-align: left;
+}
+.ke-plugin-filemanager-body .ke-table .ke-datetime {
+	width: 30%;
+	text-align: center;
+}
+
diff --git a/public/css/css_min_all.css b/public/css/css_min_all.css
deleted file mode 100644
index bc447467..00000000
--- a/public/css/css_min_all.css
+++ /dev/null
@@ -1,1907 +0,0 @@
-@charset "utf-8";
-body{font-size:14px; line-height:2.0;background:#ffffff!important;font-family: "微软雅黑","宋体"; color:#333;height: 100%}
-html{height:100%;}
-.newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
-.newMain{ margin: 0 auto; padding-bottom: 155px; min-width:1200px }
-.newFooter{
-    max-height: 110px;
-}
-.newFooter{ position: absolute; bottom: 0; width: 100%;background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;}
-.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:99998}
-/* 重置样式 */
-body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;}
-table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5; color:#333;}
-div,img,tr,td,table{ border:0;}
-table,tr,td{border:0;}
-a:link,a:visited{text-decoration:none;color:#898989; }
-a:hover {color:#4CACFF;}
-a:hover.fa{color:#4CACFF;}
-
-input,textarea,select{ background: #fff; border:1px solid #eee;}
-textarea{resize: none;}
-/*侧滚动条*/
-::-webkit-scrollbar  {   width:10px;    height:10px;   background-color: #F5F5F5;  }
-::-webkit-scrollbar-track  {   -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);     background-color: #F5F5F5;  }
-::-webkit-scrollbar-thumb  {   -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);  background-color: #ccc;  }
-/*万能清除浮动*/
-.clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden;}
-.clearfix{clear:both;zoom:1}
-.cl{ clear: both; overflow: hidden;}
-/*通用浮动*/
-.fl{ float: left;}
-.fr{ float: right;}
-/*pre标签换行*/
-.break-word{word-break: break-all;word-wrap: break-word;}
-.break-word-firefox{white-space: pre-wrap !important;word-break: break-all;}
-/*超过隐藏*/
-.task-hide{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.task-hide2{overflow:-moz-hidden-unscrollable; white-space: nowrap; text-overflow:ellipsis;}
-.hide{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.hide-text {overflow:hidden; white-space:nowrap;}
-/*隐藏*/
-.none{display: none}
-.block{ display:block;}
-/*通用文字功能样式*/
-.font-bd{ font-weight: bold;}
-.color-red-light{color: #F00!important;}
-.color-red{ color:#d2322d!important;}
-.u-color-light-red{color: #FF6666}
-.color-black{color:#333!important;}
-.color-green{color:#51a74f!important;}
-.color-light-green{color:#29bd8b!important;}
-.color-blue{color:#3498db!important;}
-.color-orange{color:#ee4a1f!important;}
-.color-orange02{color:#f79f88!important;}
-.color-orange03{color:#ff7500!important;}
-.color-orange04{color: #ee4a20!important;}/*温馨提示公用颜色*/
-.color-orange05{color: #FF9e6a!important;}
-.color-orange06{color: #ff6530!important;}
-a.color-orange05:hover,i.color-orange05:hover{color:#ff7500!important;}
-.color-orange06{color:#FF6610!important;}
-.color-yellow{color:#f0ad4e!important;}
-.color-yellow2{color:#ff9933!important;}
-.color-yellow3{color:#FFC828;}/*新版学员统计---通关排行榜   2018/01/22*/
-
-.color-light-grey{color:#afafaf!important;}
-.color-grey-7f{color: #7f7f7f!important;}
-.color-grey-no-a{color:#888!important;}
-.color-grey{color:#888!important;}
-.color-grey9{color:#999!important;}
-a.color-grey:hover{color: #4CACFF!important;}/*a标签，移入变蓝色*/
-.color-dark-grey{color:#666!important;}
-.color-grey3{color:#333!important;}
-a.color-grey3:hover{color: #ff7500!important;}
-.u-color-light-grey{color: #CCCCCC}
-.color-light-grey-C{color: #CCCCCC!important;}
-.color-light-grey-E{color: #EEEEEE}
-.color-grey-bf{color:#bfbfbf!important;}
-.color-grey-b{color:#bbbbbb!important;}
-
-.-text-danger{ color:#FF6545 }
-.color_white{ color:#fff!important;}
-.color_Purple_grey{color: #8291a3!important;}/*TPI评论里右侧点赞的icon颜色*/
-.color-grey-c{color: #cccccc!important;}
-a.link-color-grey{color:#888!important;}
-a:hover.link-color-grey{color:#29bd8b!important;}
-a.link-color-green{color:#29bd8b!important;}
-a.link-color-blue{color:#6a8abe!important;}
-a.link-color-grey02{color:#888!important;}
-a:hover.link-color-grey02{ color:red!important;}
-a.link-color-grey03{color:#888!important;}
-a:hover.link-color-grey03{color:#3498db!important;}
-.edu-color-grey{ color:#666;}
-.edu-color-grey:hover{color:#ff7500;}
-/*通用背景颜色*/
-.back-color-orange{background-color: #FF7500}
-
-
-/*通用文字大小样式*/
-.font-12{ font-size: 12px!important;}
-.font-13{ font-size: 13px!important;}
-.font-14{ font-size: 14px!important;}
-.font-15{ font-size: 15px!important;}
-.font-16{ font-size: 16px!important;}
-.font-17{ font-size: 17px!important;}
-.font-18{ font-size: 18px!important;}
-.font-20{ font-size: 20px!important;}
-.font-22{ font-size: 22px!important;}
-.font-25{ font-size: 25px!important;}
-.font-24{ font-size: 24px!important;}
-.font-28{ font-size: 28px!important;}
-.font-30{ font-size: 30px!important;}
-.font-50{ font-size: 50px!important;}
-.font-60{ font-size: 60px!important;}
-.font-70{ font-size: 70px!important;}
-/*通用内外边距*/
-.mt-10{ margin-top:-10px;}.mt1{ margin-top:1px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px;}.mt4{ margin-top:4px;}.mt5{ margin-top:5px!important;}.mt6{ margin-top:6px;}.mt7{ margin-top:7px!important;}.mt8{ margin-top:8px;}.mt10{ margin-top:10px;}.mt12{ margin-top:12px;}.mt13{ margin-top:13px;}.mt15{ margin-top:15px;}.mt17{ margin-top:17px;}.mt20{ margin-top:20px!important;}.mt25{ margin-top:25px;}.mt30{ margin-top:30px!important;}.mt36{ margin-top:36px!important;}.mt40{ margin-top:40px;}.mt50{ margin-top:50px;}.mt70{ margin-top:70px;}.mt95{ margin-top:95px;}.mt100{ margin-top:100px;}
-.mb5{ margin-bottom: 5px;}.mb7{ margin-bottom: 7px;}.mb10{ margin-bottom: 10px;}.mb11{ margin-bottom: 11px;}.mb15{ margin-bottom: 15px;}.mb20{ margin-bottom: 20px;}.mb25{ margin-bottom: 25px;}.mb30{ margin-bottom: 30px!important;}.mb40{ margin-bottom: 40px!important;}.mb50{ margin-bottom: 50px!important;}.mb60{ margin-bottom: 60px!important;}.mb70{ margin-bottom: 70px!important;}.mb80{ margin-bottom: 80px!important;}.mb90{ margin-bottom: 90px!important;}.mb100{ margin-bottom: 100px!important;}.mb110{ margin-bottom: 110px;}
-.ml-3{ margin-left: -3px;}.ml1{margin-left: 1px;}.ml2{margin-left: 2px;}.ml3{margin-left: 3px;}.ml4{margin-left: 4px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml12{ margin-left:12px!important;}.ml15{ margin-left: 15px;}.ml18{ margin-left: 18px;}.ml20{ margin-left: 20px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml33{ margin-left: 33px;}.ml35{ margin-left:35px;}.ml40{margin-left:40px;}.ml42{margin-left:42px;}.ml45{ margin-left: 45px;}.ml50{ margin-left: 50px;}.ml55{ margin-left: 55px;}.ml60{ margin-left: 60px;}.ml75{ margin-left: 75px;}.ml80{ margin-left: 80px;}.ml85{margin-left:85px;}.ml95{ margin-left: 95px;}.ml115{margin-left: 115px}.ml123{ margin-left: 123px;}.ml150{ margin-left: 150px;}.ml180{ margin-left: 180px;}.ml230{ margin-left: 230px;}.ml240{margin-left: 240px;}.ml250{ margin-left: 250px;}.ml290{ margin-left: 290px;}
-.mr3{margin-right: 3px}.mr4{margin-right: 4px}.mr5{ margin-right: 5px;}.mr8{ margin-right: 8px;}.mr10{ margin-right: 10px;}.mr12{ margin-right:12px!important;}.mr15{ margin-right: 15px;}.mr18{ margin-right: 18px;}.mr20{ margin-right: 20px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr35{margin-right:35px;}.mr40{margin-right:40px;}.mr45{margin-right:45px;}.mr50{ margin-right: 50px;}.mr60{ margin-right:60px;}.mr350{ margin-right:350px;}.pt5{ padding-top:5px;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt20{ padding-top:20px;}.pt30{ padding-top:30px;}.pt40{ padding-top:40px;}.pt47{ padding-top:47px;}.pt100{padding-top:100px;}.pt130{padding-top:130px;}
-
-.pt1{ padding-top:1px;}.pt5{ padding-top:5px;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt20{ padding-top:20px;}.pt30{ padding-top:30px;}.pt40{ padding-top:40px;}
-.pb5{ padding-bottom:5px;}.pb10{ padding-bottom:10px;}.pb15{ padding-bottom:15px;}.pb20{ padding-bottom:20px;}.pb28{ padding-bottom:28px;}.pb30{ padding-bottom:30px;}.pb40{ padding-bottom:40px;}.pb47{ padding-bottom:47px;}.pb50{ padding-bottom:50px;}.pb155{ padding-bottom:155px;}
-.pl2{ padding-left:2px;}.pl5{ padding-left:5px;}.pl8{ padding-left:8px;}.pl10{ padding-left:10px;}.pl15{ padding-left:15px;}.pl20{ padding-left:20px;}.pl28{ padding-left:28px;}.pl30{ padding-left:30px;}.pl33{padding-left: 33px}.pl40{ padding-left:40px;}.pl42{ padding-left:42px;}.pl45{ padding-left:45px;}.pl50{ padding-left:50px;}.pl100{ padding-left:100px;}.pl35{ padding-left:35px;}.pl50{padding-left:50px;}.pl70{padding-left:70px;}.pl80{padding-left:80px;}.pl92{padding-left:92px;}
-.pr2{ paddding-right:2px;}.pr5{ padding-right:5px;}.pr10{ padding-right:10px;}.pr15{ padding-right:15px;}.pr20{ padding-right:20px!important;}.pr30{ padding-right:30px!important;}.pr42{ padding-right:42px;}.pr45{ padding-right:45px;}
-
-.pl2{ padding-left:2px;}.pl5{ padding-left:5px;}.pl8{ padding-left:8px;}.pl10{ padding-left:10px;}.pl15{ padding-left:15px;}.pl20{ padding-left:20px;}.pl28{ padding-left:28px;}.pl30{ padding-left:30px;}.pl33{padding-left: 33px}.pl40{ padding-left:40px;}.pl42{ padding-left:42px;}.pl45{ padding-left:45px;}.pl50{ padding-left:50px;}.pl100{ padding-left:100px;}.pl35{ padding-left:35px;}.pl50{padding-left:50px;}.pl70{padding-left:70px;}.pl80{padding-left:80px;}.pl92{padding-left:92px;}
-.pr2{ paddding-right:2px;}.pr5{ padding-right:5px;}.pr10{ padding-right:10px;}.pr15{ padding-right:15px;}.pr20{ padding-right:20px!important;}.pr30{ padding-right:30px!important;}.pr42{ padding-right:42px;}.pr45{ padding-right:45px;}
-
-
-.padding15{ padding:15px;}
-.padding10{ padding:10px;}
-.padding10-15{ padding:10px 15px;}
-.padding15-10{ padding:15px 10px;}
-.ptl5-10{ padding:5px 10px;}
-.ptl3-10{ padding:3px 10px;}
-.ptl8-10{ padding:8px 10px;}
-
-
-
-.wb11{width:11%!important;}.wb89{width:89%!important;}
-
-.h3{ height:3px;}
-.h24{ height: 24px;}
-.h32{ height: 32px;}
-.h40{ height: 40px;}
-.h50{ height: 50px;}
-.h60{ height: 60px;}
-.h80{ height: 80px;}
-.h100{ height:100px;}
-.h140{ height:140px;}
-.h200{ height:200px;}
-/*块*/
-.col-width{ background: #fff; border:1px solid #e8e8e8;}
-.col-width-10{ max-width: 100%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-9{ max-width: 90%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-8{ max-width: 80%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-7{ max-width: 70%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-6{ max-width: 60%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-5{ max-width: 50%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-4{ max-width: 40%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-3{ width: 500px; background: #fff; border:1px solid #e8e8e8;
-    position:absolute;left:-510px;top:0;}
-.col-width-2{ max-width: 20%; background: #fff; border:1px solid #e8e8e8;}
-.col-width-1{ max-width: 10%; background: #fff; border:1px solid #e8e8e8;}
-/*按钮*/
-a.task-btn{cursor: pointer;display: inline-block;font-weight: bold;border: none;padding: 0 12px;color: #666;background: #e1e1e1;letter-spacing: 1px;text-align: center;font-size: 14px;height: 30px;line-height: 30px;border-radius: 3px; }
-a.task-btn-green{background: #29bd8b; color: #fff!important;}
-a:hover.task-btn-green{background: #19b17e;}
-a.task-btn-orange{background: #FF7500; color:#fff!important;}
-a:hover.task-btn-orange{ background:#ff7500;}
-a.task-newbtn-grey{background-color: #e1e1e1;color: #666666;}
-a:hover.task-newbtn-grey{color: #333}
-a.task-btn-blue{background: #4CACFF; color:#fff!important;}
-a:hover.task-btn-blue{background: #4CACFF;color:#fff;}
-a.task-btn-grey{background-color: #d4d6d8; color: #4d555d!important;}
-a:hover.task-btn-grey{background-color: #d4d6d8; color: #4d555d;}
-a.task-btn-grey-white{background-color: #c2c4c6; color: #fff;}
-a:hover.task-btn-grey-white{background-color: #a9abad;}
-a.new-btn{display: inline-block;border:none; padding:0 10px;color: #666;background: #e1e1e1; text-align:center;font-size: 12px;  height: 30px;border-radius: 3px; line-height: 30px;}
-a.new-btn:hover{background: #c3c3c3; color: #333;}
-a.new-btn-green{background: #29bd8b; color: #fff;}
-a.new-btn-green:hover{background:#19b17e; }
-a.new-btn-blue{background: #6a8abe; color: #fff!important;}
-a.new-btn-blue:hover{background:#5f7cab; }
-a.new-bigbtn{display: inline-block;border:none; padding:2px 30px;color: #666;background: #e1e1e1; text-align:center;font-size: 14px;  height: 30px;line-height: 30px; border-radius: 3px;}
-a:hover.new-bigbtn{background: #c3c3c3; color: #333;}
-a.new-bigbtn-green{background: #3b94d6; color: #fff;}
-a.new-bigbtn-green:hover{background: #2384cd; color: #fff;}
-a.task-btn-ver{ height:45px; line-height: 45px; background: #FF7500; color: #fff !important; border-radius:5px; font-size:12px; padding:0 10px;}
-a.rest-btn-ver{ cursor: not-allowed; background: #ccc;}
-a.task-btn-ver-line{height:43px; line-height: 43px;  border-radius:5px; font-size:12px; padding:0 10px; border:1px solid #ccc;}
-a:hover.task-btn-ver-line{ border:1px solid #29bd8b;}
-a:hover.rest-btn-ver{ cursor: not-allowed; background: #ccc;}
-.new_login_submit_disable{ width:265px; height:40px; line-height: 40px; background:#ccc;  color:#fff; font-size:14px; border-radius:5px; border:none;  text-align:center;  cursor:pointer; vertical-align: middle;}
-.new_login_submit,a.new_login_submit{ display: block; text-decoration: none !important; width:100%; height:45px; line-height: 45px; background:#29bd8b; color:#fff !important; font-size:14px; border-radius:5px; border:none; text-align:center; cursor:pointer; vertical-align: middle;}
-.new_login_submit a{ color:#fff !important; text-decoration: none;}
-.new_login_submit:hover{background: #19b17e;}
-a.task-btn-email{display: inline-block;font-weight: bold;border: none; width:185px;color: #666;background: #e1e1e1;letter-spacing: 1px;text-align: center;font-size: 14px;height: 40px;line-height: 40px;border-radius: 3px;}
-a:hover.task-btn-email {background: #c3c3c3; color: #666;}
-.white-btn{text-align:center;cursor: pointer;display: inline-block;padding: 0px 8px;border: 1px solid #ccc;color: #666;letter-spacing: 1px;font-size: 14px;height: 26px;line-height: 26px;border-radius: 3px;}
-.white-btn-h40{text-align:center;cursor: pointer;display: inline-block;padding: 5px 10px;border: 1px solid #ccc;color: #666;letter-spacing: 1px;font-size: 14px;height: 26px;line-height: 26px;border-radius: 3px;}
-a.white-btn.green-btn{color:#29bd8b;border:1px solid #29bd8b; }
-a.white-btn.gery-btn{color: #aaa;border: 1px solid #aaa}
-a.white-btn.gery-btn:hover{color: #FFFFFF;border: 1px solid #aaa;background: #aaa}
-a.white-btn.orange-btn,a.white-btn-h40.orange-btn{color: #FF7500;border: 1px solid #FF7500}
-a.white-btn.orange-btn:hover,a.white-btn-h40.orange-btn:hover{color: #FFFFFF;border: 1px solid #FF7500;background: #ff7500}
-a.white-btn.orange-bg-btn,a.white-btn-h40.orange-bg-btn{color: #FFFFFF;border: 1px solid #FF7500;background: #ff7500}
-a.grey-btn{padding: 0px 8px;height: 30px;line-height: 30px;background-color: #eaeaea;color: #7f7f7f;font-size: 14px;border-radius: 3px;}
-
-.invite-btn{display: block;padding: 1px 10px;background: #fff;color: #333;border-radius: 4px;}
-a.decoration{text-decoration: underline!important;}
-/*07-11  新添加的公用样式   cs*/
-a.course-btn{cursor: pointer;font-weight: bold;border-radius: 4px;display: inline-block;width: auto;padding: 0px 12px;background-color: #FFFFFF;color: #44bfa3;letter-spacing: 1px;height: 30px;line-height: 30px;}
-.bc-grey{background-color: #CCCCCC!important;}
-.bc-white{background-color: #ffffff!important;}
-a.course-bth-blue{cursor: pointer;background-color:#199ed8 ;color: #ffffff !important;display: inline-block;font-weight: bold;border: none;padding: 0 12px;letter-spacing: 1px;text-align: center;font-size: 14px;height: 30px;line-height: 30px;border-radius: 3px;}
-a.course-bth-orange{cursor: pointer;background-color:#ff6530 ;color: #ffffff !important;display: inline-block;font-weight: bold;border: none;padding: 0 12px;letter-spacing: 1px;text-align: center;font-size: 14px;height: 30px;line-height: 30px;border-radius: 3px;}
-.topic-hover a:hover{background:#ff7500;color:#fff;}
-/*.topic-hover li a:hover{color:#fff;}*/
-/*提示条*/
-.alert{  padding:10px;border: 1px solid transparent; text-align: center;}
-.alert-blue{ background-color: #d9edf7;border-color: #bce8f1; color: #3a87ad;}
-.alert-orange{ background-color: #fff9e9;border-color: #f6d0b1; color:#ee4a20;}
-.alert-green{ background-color: #dff0d8;border-color: #d6e9c6; color:#3c763d;}
-.task-close{padding: 0;cursor: pointer; background: transparent; border: 0; -webkit-appearance: none;  font-size: 21px; font-weight: bold;line-height: 1; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.3;}
-.taskclose:hover{opacity: 0.5;}
-.alert-red{background-color: #f2dede;border-color: #eed3d7; color: #d14f4d; text-align: left!important;}
-/*tag*/
-.task-tag{  padding:0 10px; text-align: center; display:inline-block; height:30px; line-height: 30px;}
-.tag-blue{ background-color: #d9edf7; color: #3a87ad;}
-.tag-grey{ background-color: #f3f5f7; color: #4d555d;}
-.tag-border-grey{ background-color: #fff;border-color: #e2e2e2; color: #888;}
-.cir-orange{background: #ff6530;color: #fff; border-radius: 15px; padding: 0 5px; display: inline-block; font-size: 12px;  height: 16px;line-height: 16px; }
-.cir-red{background: red;color: #fff; border-radius: 15px; padding: 0 5px; display: inline-block; font-size: 12px;  height: 16px;line-height: 16px; }
-.red-cir-btn{ background:#e74c3c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-/****************************/
-/* 页面结构*/
-.task-pm-content{ width: 1000px; margin: 0 auto; }
-.task-pm-box{ width: 100%; background: #fff; border: 1px solid #e8e8e8;}
-.task-paner-con{ padding:15px; color:#666; line-height:2.0;}
-.task-text-center{ text-align: center;}
-.flow_hidden{ width:300px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-/*pre标签换行*/
-.break_word{word-break: break-all;word-wrap: break-word;}
-.break_word_firefox{white-space: pre-wrap !important;word-break: break-all;}
-.pre_word{white-space: pre-wrap;word-wrap: break-word;word-break: normal;}
-.pr {position:relative;}
-.df {display:flex;display: -webkit-flex;display: -ms-flex;}
-.df-js-ac{ justify-content:space-around;-webkit-justify-content: space-around;-webkit-align-items:center;-ms-flex-align:center; align-items: center;}
-
-.w28 {width: 28px;}
-.w40{ width: 40px;}
-.w50{width: 50px;}.edu-txt-w50{ width:50px;}
-.w60{width: 60px;}
-.w70{width: 70px;}
-.w80 {width: 80px;}
-.w100{width: 100px;}
-.w120{width: 120px;}
-.w150{width: 150px;}
-.w200{width: 200px;}
-.w300{width: 300px;}
-.w320{width: 320px;}
-.edu-w245{ width: 245px; }.w266{width: 266px;}
-.w780{width: 780px;}
-.w850{width: 850px;}
-.w900{width: 900px;}
-
-
-
-.with10{ width: 10%;}.with15{ width: 15%;}
-.with20{ width: 20%;}.with25{ width: 25%;}
-.with30{ width: 30%;}.with33{ width: 33%;}.with35{ width: 35%;}
-.with40{ width: 40%;}.with45{ width: 45%;}.with49{ width: 49%;}
-.with50{ width: 50%;}.with55{ width: 55%;}
-.with52{ width: 52%;}.with48{ width: 48%;}
-.with60{ width: 60%;}.with65{ width: 65%;}
-.with70{ width: 70%;}.with73{ width: 73%;}.with75{ width: 75%;}
-.with70{ width: 70%;}.with73{ width: 73%;}.with75{ width: 75%;}
-.with80{ width: 80%;}.with85{ width: 85%;}
-.with87{ width: 87%;}.with90{ width: 90%;}.with95{ width: 95%;}
-.with100{ width: 100%;}
-.edu-bg{ background:#fff!important;}
-.disabled-bg{ background:#eee !important;}
-.disabled-grey-bg{ background: #a4a4a4 !important;}
-/* 课程共用 后期再添加至公共样式 bylinda*/
-a.link-name-dark{ color:#666; max-width:140px; display: block; }
-a:hover.link-name-dark{ color:#ff7500;}
-/* 超过宽度省略 */
-.edu-name-dark{  max-width:100px; display: block; }
-.edu-info-dark{  max-width:345px; display: block; }
-.edu-max-h200{ height:200px; overflow: auto;}
-.edu-h260{ height:260px;}
-.edu-position{ position: relative;}
-.edu-h200-auto{ max-height:200px; overflow:auto;}
-.edu-h300-auto{ max-height:300px; overflow:auto;}
-.edu-h350-auto{ max-height:350px; overflow:auto;}
-.edu-txt-w240{ width:240px; display: block;}
-.edu-txt-w280{ width:280px; display: block;}
-.edu-txt-w320{ width:320px; display: block;}
-.edu-txt-w200{ width:200px; display: block;}
-a.edu-txt-w280,.edu-txt-w280{ width:280px; display: inline-block;text-align: center}
-a.edu-txt-w190,.edu-txt-w190{ width:190px; display: inline-block;text-align: center}
-a.edu-txt-w160,.edu-txt-w160{ width:160px; display: inline-block;text-align: center}
-a.edu-txt-w140,.edu-txt-w140{ width:141px; display: inline-block;text-align: center}
-a.edu-txt-w130,.edu-txt-w130{ width:130px; display: inline-block;text-align: center}
-a.edu-txt-w120,.edu-txt-w120{ width:120px; display: inline-block;text-align: center}
-a.edu-txt-w100,.edu-txt-w100{ width:100px; display: inline-block;text-align: center}
-a.edu-txt-w90,.edu-txt-w90{ width:90px; display: inline-block;text-align: center}
-a.edu-txt-w80,.edu-txt-w80{ width:80px; display: inline-block;text-align: center}
-.overellipsis{overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
-/* 筛选按钮 */
-.edu-btn-search{ position: absolute; top:0; right:15px;}
-.edu-bg-light-blue{ background:#f7f9fd; padding:5px;}
-.edu-con-top{ padding:10px 0; background:#fff; border-bottom:1px solid #eee;font-size:16px; }
-.edu-con-top h2{ font-size:16px;}
-.edu-form-label{display: inline-block; width:60px;text-align: right; line-height: 40px; font-weight: normal;}
-.edu-form-border{ border:1px solid #ddd;}
-.edu-form-notice-border{ border:1px solid #f27d61 !important;}
-.edu-form-noborder,input.edu-form-noborder{ border:none; outline:none;}
-a.edu-btn{display: inline-block;border:none; padding:0 12px;color: #666!important;border:1px solid #ccc; text-align:center;font-size: 14px;  height: 29px;line-height: 29px; border-radius:3px; font-weight: bold;letter-spacing:1px;}
-a:hover.edu-btn{ border:1px  solid #5faee3; color: #5faee3!important;}
-.edu-cir-grey{ display: inline-block; padding:0px 5px; color:#666; background:#f3f3f3; text-align: center; border-radius:15px; font-size:12px; line-height:20px!important;}
-.edu-cir-grey1{ display: inline-block; padding:0px 5px; margin-left: 5px; color:#666; background:#ccc; text-align: center; border-radius:15px; font-size:12px; line-height:20px!important;}
-.edu-cir-grey-q{ display: inline-block; padding:0px 7px; color:#666; background:#f3f3f3; text-align: center; border-radius:15px; font-size:12px; line-height:20px!important;}
-.edu-cir-orange{ display: inline-block; padding:0px 7px; color:#fff; background:#FF7500; text-align: center; border-radius:15px; font-size:12px; line-height:20px!important;}
-
-/*a.edu-filter-cir-grey{display: inline-block; padding:0px 15px; color:#666; border:1px solid #ddd; text-align: center; border-radius:3px; font-size:12px; height:25px; line-height:25px;}
-a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498db;  color:#3498db; }*/
-
-.edu-filter-btn{display: inline-block; padding:0px 3px; color:#666; background:#fff; text-align: center; border-radius:3px; font-size:12px; height:20px; line-height:20px;}
-.edu-filter-btn-blue{border:1px solid #3498db; color:#3498db;}
-.edu-filter-btn-orange{border:1px solid #ff5055; color:#ff5055;}
-.edu-filter-btn-red{border:1px solid #d72e36; color:#d72e36;}
-.edu-filter-btn-green{border:1px solid #6fbb9d; color:#6fbb9d;}
-.edu-filter-btn-yellow{border:1px solid #ef9324; color:#ef9324;}
-.edu-filter-btn-danger{background:#d72e36; color:#fff;}
-.edu-filter-btn-late{border:1px solid #3fbcff; color: #3fbcff;}
-.edu-filter-btn-no-late{border:1px solid #8c8c8c;color: #8c8c8c;}
-.edu-filter-btn-end{border: 1px solid #b6b6b6;color: #b6b6b6;}
-.eud-pointer{ cursor:pointer;}
-.edu-bg-grey{ background:#f6f6f6; width:90%; min-width:700px;   color:#666;}
-/* table-1底部边框 */
-.edu-pop-table{ width: 100%; border:1px solid #eee; border-bottom:none; background:#fff; color:#888;cursor: default}
-.edu-pop-table tr{ height:40px;  }
-.edu-pop-table tr.edu-bg-grey{ background:#f5f5f5;}
-.edu-txt-center{ text-align: center;}.edu-txt-left{ text-align: left;}.edu-txt-right{ text-align: right;}
-.edu-pop-table tr th{ color:#333;border-bottom:1px solid #eee; }
-.edu-pop-table tr td{border-bottom:1px solid #eee;}
-.edu-pop-table.table-line tr td,.edu-pop-table.table-line tr th{ border-right:1px solid #eee;}
-.edu-pop-table.table-line tr td:last-child,.edu-pop-table.table-line tr th:last-child{border-right:none;}
-.edu-pop-table tr td .alink-name{color: #333!important;}
-.edu-pop-table tr td .alink-name:hover{color: #FF7500!important;}
-.edu-pop-table tr td .alink-operate{color: #cccccc!important;}
-.edu-pop-table tr td .alink-operate:hover{color: #FF7500!important;}
-/*th行有背景颜色且table无边框*/
-.edu-pop-table.head-color thead tr{background: #fafbfb}
-.edu-pop-table.head-color{border: none}
-.edu-pop-table.head-color tr:last-child td {border: none}
-/*--表格行间隔背景颜色-*/
-.edu-pop-table.interval-td thead tr{background: #fafbfb}
-.edu-pop-table.interval-td tbody tr:nth-child(even){background: #fafbfb}
-.edu-pop-table.interval-td tbody tr td{border: none}
-/*--表格行间隔背景颜色(th也没有边框)-*/
-.edu-pop-table.interval-all{border:none}
-.edu-pop-table.interval-all thead th{border: none}
-.edu-pop-table.interval-all thead tr{background: #fafbfb}
-.edu-pop-table.interval-all tbody tr:nth-child(even){background: #fafbfb}
-.edu-pop-table.interval-all tbody tr td{border: none;padding:5px 0px}
-/*--表格行移入背景颜色-*/
-.edu-pop-table.hover-td tbody tr:hover{background: #EFF9FD}/*悬浮颜色为天蓝色*/
-.edu-pop-table.hover-td_1 tbody tr:hover{background:#FCF2EC}/*悬浮颜色为浅橙色*/
-/* table-2全边框 */
-.edu-pop-table-all{ width: 100%; border:1px solid #eee; background:#fff; color:#888;border-collapse: collapse}
-.edu-pop-table-all tr{ height:30px;  }
-.edu-pop-table-all tr.edu-bg-grey{ background:#f5f5f5;}
-.edu-pop-table-all tr th{ color:#333;border:1px solid #eee; }
-.edu-pop-table-all tr td{border:1px solid #eee;padding: 5px}
-
-
-
-.edu-line{ border-bottom:1px solid #eee;}
-table.table-th-grey th{ background:#f5f5f5;}
-table.table-pa5 th,table.table-pa5 td{ padding:0 5px;}
-.panel-comment_item .orig_cont-red{ border:solid 2px #cc0000; border-radius:10px;  padding:4px;color:#999;margin-top:-1px; }
-/***** loading ******/
-/***** Ajax indicator ******/
-#ajax-indicator {
-    position: absolute; /* fixed not supported by IE*/
-    background-color:#eee;
-    border: 1px solid #bbb;
-    top:35%;
-    left:40%;
-    width:20%;
-    /*height:5%;*/
-    font-weight:bold;
-    text-align:center;
-    padding:0.6em;
-    z-index:100000;
-    opacity: 0.5;
-}
-
-html>body #ajax-indicator { position: fixed; }
-
-#ajax-indicator span{
-    color:#fff;
-    color: #333333;
-    background-position: 0% 40%;
-    background-repeat: no-repeat;
-    /*background-image: url(/images/loading.gif);  图片没在react images目录中*/
-    padding-left: 26px;
-    vertical-align: bottom;
-    z-index:100000;
-}
-
-
-/*----------------------列表结构*/
-.forum_table_item{padding: 20px 15px;display: flex;border-bottom: 1px solid #ebebeb}
-.forum_table_line:last-child .forum_table_item{border-bottom:none;}
-.forum_table_item .item_name:hover{color: #4cacff}
-
-
-.edu-bg{ background:#fff;}
-/*---------tab切换-----*/
-.task-tab{width:10%;height:42px;line-height:42px;text-align:center;color:#666;
-    position:relative;cursor:pointer;}
-.task-tab.sheet{border-bottom:3px solid #5faee3;color:#5faee3;}
-.task-tab.bold{border-bottom:3px solid #5faee3;font-weight:bold;}
-.task-tab i{position:absolute;bottom:-9px;left:45%;color:#5faee3 !important;}
-
-.undis {display: none}
-.edu-change .panel-form-label{ line-height:1.9;}
-
-.title_type { line-height: 40px;height: 40px;border-bottom: 1px solid #eee;color: #666;padding-left: 15px; }
-.teacher_banner {border-bottom: 1px solid #eee}
-.zbg { background: url("/images/edu_user/richEditer.png") -195px -2px no-repeat; height: 18px; cursor: pointer}
-.zbg_latex { background: url("/images/edu_user/richEditer.png") -315px -3px no-repeat;height: 18px;cursor: pointer;}
-.latex{position:relative;top: 4px;}
-
-.white_bg {background: #fff}
-.user_tab_type {background: #FF6610}
-
-/*首页----------筛选切换（有数字）*/
-.user_course_filtrate{width: auto;text-align: center;line-height: 26px;}
-.user_filtrate_span1_bg{color: #FF7500}
-.user_filtrate_span2{width: auto;padding: 0px 6px;border-radius: 8px;background: #ccc;font-size: 12px;display: block;line-height: 15px;float: right;color: #FFFFFF; margin-top: 6px;}
-.user_filtrate_span2_bg{background: #FF7500!important;}
-.user_course_filtrate:hover .user_filtrate_span1{color: #FF7500!important;}
-.user_course_filtrate:hover .user_filtrate_span2{background: #FF7500!important;}
-/*课堂----------筛选切换（没有数字，默认白色背景）*/
-.course_filtrate{width: auto;padding:0px 10px;text-align: center;background: #eeeeee;border-radius: 10px;margin-right: 20px;line-height: 26px;}
-.course_filtrate:hover{background: #FF7500; color: #ffffff; }
-.course_filtrate_bg{background: #FF7500; color: #ffffff!important; }
-/*我的课堂----------筛选切换（没有数字，默认灰色背景）*/
-.edu-filter-cir-grey{color: #666!important;width: auto;padding:0px 15px;text-align: center;background: #f3f3f3;border-radius: 10px;display: block; height:25px; line-height:25px;}
-.edu-filter-cir-grey:hover{background: #FF7500; color: #ffffff!important;}
-.edu-filter-cir-grey.active{background: #FF7500; color: #ffffff!important;}
-
-.edu-find .edu-find-input{border-bottom: 1px solid #EEEEEE;}
-.edu-find .edu-find-input input{border: none;outline: none}
-.edu-find .edu-close{position: absolute;top: -1px;right: 7px;font-size: 18px;cursor: pointer;}
-.edu-find .edu-open{position: absolute;top: 1px;right: -18px}
-
-
-/*最新和最热导航条的公用样式*/
-.nav_check_item{margin-bottom:13px;border-bottom: 2px solid #FC7033;}
-.nav_check_item li{width:auto;width: 80px;text-align: center;cursor: pointer;height: 38px;line-height: 38px;border-top-right-radius:5px;border-top-left-radius:5px;}
-.nav_check_item li a{display: block;width: 100%;}
-
-.check_nav{background: #FC7033;color: #ffffff;}
-.check_nav a{color: #ffffff !important;}
-.check_on{background:#FF7500;color: #ffffff!important;border-radius: 4px;}
-
-/*实训列表块里面的遮罩效果*/
-.black-half{position: absolute;left: 0;top:0px;width: 100%;height: 100%;background: rgba(0,0,0,0.4);z-index: 3;display: none;}
-.black-half-lock{width: 65px;height: 65px;border-radius: 50%;background:#8291a3;vertical-align: middle;text-align: center;margin:25% auto 0px;}
-.black-half-lock i{margin-top: 7px;}
-.black-half-info{width: 100%;text-align: center;color: #FFFFFF;margin-top:10px}
-.show-black{display: block;animation: black-down 1s linear 1;}
-@-webkit-keyframes black-down {
-    25% {-webkit-transform: translateY(0);}
-    50%, 100% {-webkit-transform: translateY(0);}
-}
-
-@keyframes black-down {
-    25% {transform: translateY(0);}
-    50%, 100% {transform: translateY(0);}
-}
-
-/*去掉IE input框输入时自带的清除按钮*/
-input::-ms-clear{display:none;}
-
-
-/*最小高度*/
-.mh750{min-height: 750px}
-.mh650{min-height: 650px}
-.mh580{min-height: 580px}
-.mh550{min-height: 550px}
-.mh510{min-height: 510px}
-.mh440{min-height: 440px}
-.mh400{min-height: 400px}
-.mh390{min-height: 390px}
-.mh360{min-height: 360px}
-.mh350{min-height: 350px}
-.mh320{min-height: 320px}
-.mh240{min-height: 240px}
-.mh200{min-height: 200px}
-
-/*---------------操作部分虚线边框-----------------*/
-.border-dash-orange{border: 1px dashed #ffbfaa}
-/*错误、危险、失败提示边框*/
-.border-error-result{border:1px dashed #ff5252}
-
-.border-dash-ccc{border-top:1px dashed #ccc;border-bottom:1px dashed #ccc;}
-
-.login-error{border:1px solid #ff5252!important;}/*登录时，输入的手机号码或者密码错误，边框变红*/
-.error-red{border: 1px solid #DB6666;background: #FFE6E5;border-radius: 3px;padding: 2px 10px;}
-.error-red i{color: #FF6666}
-
-
-/*---------------tab公用背景颜色-----------------*/
-.background-blue{background:#5ECFBA!important;}
-.background-orange{background: #FC7033!important;}
-.back-orange-main{background: #FC7500!important;color:#FFFFff!important;}/*主流橙色*/
-.back-orange-01{background: #FF9e6a!important;}/*带背景标题、带色彩分割线和操作入口*/
-.back-f6-grey{background: #F6F6F6;}
-.background-blue a{color:#ffffff!important;}
-.background-orange a{color: #ffffff!important;}
-/*---------------tab公用边框-----------------*/
-.border-bottom-orange{border-bottom: 2px solid #FC7033!important;}
-.bor-bottom-orange{border-bottom: 1px solid #FF9e6a!important;}
-.bor-bottom-greyE{border-bottom: 1px solid #EEEEEE!important;}
-.bor-top-greyE{border-top: 1px solid #EEEEEE!important;}
-/*---------------边框-----------------*/
-.bor-gray-c{border:1px solid #ccc;}
-.bor-grey-e{border:1px solid #eee;}
-.bor-grey-d{border:1px solid #ddd;}
-.bor-grey01{border:1px solid #E6EAEB;}
-.bor-blue{border:1px solid #5faee3;}
-.bor-red{border:1px solid #db0505 !important;}
-.bor-none{border:none;}
-.bor-outnone{outline:none; border:0px;}
-/*延时*/
-.delay{border:1px solid #db0505;padding: 0px 10px;height: 23px;line-height: 23px;border-radius: 12px;display: block;float: left;color:#db0505 }
-/*
-    tip公共样式的设置：
-
-*/
-.-task-title{opacity:0;position:absolute;left:0;top:0;display:none;z-index:100000;}       /*1*/
-.data-tip-down,.data-tip-left,.data-tip-right,.data-tip-top{  position:relative;  box-shadow:0px 0px 8px #000;  background:#000;  color:#fff;  max-width:300px;/*2*/
-    word-wrap: break-word;  text-align:center;  border-radius:4px;  padding:0 10px;  border:1px solid #000; display:none; }/*3*/
-.data-tip-down:after,.data-tip-down:before,.data-tip-left:before,.data-tip-right:before,.data-tip-left:after,.data-tip-right:after,.data-tip-top:after,.data-tip-top:before{/*4*/
-    position: absolute;content:''; width:0; height:0;}/*5*/
-.data-tip-down:after,.data-tip-down:before{left: 45%;top:-10px;/*6*/
-    border-left: 5px solid transparent;  border-right: 5px solid transparent;  border-bottom: 10px solid #000;  }/*7*/
-.data-tip-down:before{top:-11px;border-bottom:10px solid #000;}/*8*/
-.data-tip-left:after,.data-tip-left:before{left: -10px;top:50%; margin-top:-5px;/*9*/
-    border-top: 5px solid transparent;  border-bottom: 5px solid transparent;  border-right: 10px solid #000;  }/*10*/
-.data-tip-left:before{ left: -12px;border-right: 10px solid #000;  }/*11*/
-.data-tip-right:after,.data-tip-right:before{right: -10px;  top:50%; margin-top:-5px;/*12*/
-    border-top: 5px solid transparent;border-bottom: 5px solid transparent;  border-left: 10px solid #000;  }/*13*/
-.data-tip-right:before{ right: -10px;border-left: 10px solid #000;  }/*14*/
-.data-tip-top:after,.data-tip-top:before{left: 45%;bottom:-10px;border-left: 5px solid transparent;
-    border-right: 5px solid transparent;border-top: 10px solid #000;}
-.data-tip-top:before{bottom:-11px;}
-
-/*-------------------------圆角-------------------------*/
-.bor-radius-upper{border-radius: 4px 4px 0px 0px;}
-.bor-radius4{border-radius: 4px;}
-.bor-radius20{border-radius: 20px;}
-.bor-radius-all{border-radius: 50%;}
-
-/*-------------------------旋转-------------------------*/
-.transform90{transform: rotate(90deg);}
-/*---------------------编辑器边框------------------------*/
-.kindeditor{background: #F0F0EE;height:22px;border:1px solid #CCCCCC;border-bottom: none}
-
-/*文本框只有下边框*/
-.other_input{border: none;border-bottom: 1px solid #aaa;outline: none}
-/*两端对齐*/
-.justify{text-align: justify!important;}
-
-/**/
-#edu-tab-nav .edu-position-hidebox li a{font-size: 12px}
-/*在线课堂*/
-.courseRefer{float:left; max-height:120px;margin-bottom:10px;overflow:auto; overflow-x:hidden;}
-.logo {width: 295px;height: 30px;border-style:none;position: absolute;top:50%;left:39%;}
-/**/
-.task-header-info .fork{font-weight:bold;font-size:14px;color:#666;}
-
-
-.memos_con a{color: #3b94d6!important;}
-.memos_con ul li{ list-style-type: disc!important; }
-.memos_con ol li{ list-style-type: decimal!important; }
-.memos_con li{ margin-bottom: 0!important; }
-.memos_con pre {overflow-x: auto;}
-
-/*详情a标签默认显示样式*/
-.a_default_show a{color: #136ec2!important}
-
-/*消息机制右侧小三角*/
-.tiding{width: 100%;height: 50px ;position: relative}
-.triangle {position: absolute;right: -1px;top:0px;width: 0;height: 0;border-top: 35px solid #29bd8b;border-left: 60px solid transparent;z-index: 1}
-.triangle-new{position: absolute;right: 1px;top: 0px;z-index: 2;font-size: 14px;color: white;transform: rotate(30deg);}
-.news_list_item{padding: 10px 0px;}
-.news_list_item:nth-child(odd){background-color:#FAFBFB }
-.listItem_right{line-height: 45px;float: right;max-width: 100px;margin-right: 15px;color: #888888}
-.listItem_middle{max-width: 980px;}
-.news_fa{font-size: 30px;color: #888;margin: 7px 16px;}
-.tiding_logo{text-align:center;background: #f3f3f3;width: 200px;height: 100px}
-
-.tr-position{position: absolute;left:54%;width: 20px;text-align: center;border: none!important;}
-
-.two_lines_show{ overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;height: 60px; word-wrap: break-word;}
-.two_lines_show_my{ overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;height: 40px; word-wrap: break-word;}
-.three_lines_show{ overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 3;-webkit-box-orient: vertical;height: 66px;line-height: 22px; word-wrap: break-word;}
-
-/*新版讨论区*/
-.discuss-tab a:hover{border-bottom: 2px solid #FC7033!important; color:#000;}
-.discuss-lh40{ line-height:40px;}.discuss-lh16{ line-height:16px}.discuss-lh20{ line-height:20px;}.discuss-lh20{ line-height:20px;}.discuss-lh30{ line-height:30px;}.discuss-lh50{ line-height:50px;}.discuss-lh60{line-height:60px}.discuss-lh80{line-height:80px;}.discuss-lh100{line-height:100px;}
-.discuss-bor-l{ border-left:4px solid #ff7500;}
-.page-turn:hover{background:#fff; color:#FF7500;}
-
-/*实训路径/镜像类别图片*/
-.hor-ver-center{width:80px; height:80px; position:absolute; left:50%; top:50%; margin-left:-40px; margin-top:-40px;}
-.hor-ver-center100{width:100px; height:100px; position:absolute; left:50%;top:25%; margin-left:-50px; margin-top:-25px;}
-.mirror-shade{ background: rgba(0,0,0,0.4); z-index: 3; display:none;}
-
-.position20{position:absolute; top:-60px; left:7%;}
-
-/*--------TA的主页、关注*/
-.user_watch{width: 78px;padding: 2px 0px!important;}
-
-
-/*-------------主页块的背景颜色----------------*/
-.edu-index-bg-green{ background:#5bcab1;}
-.edu-index-bg-blue{ background:#75b9de;}
-.edu-index-bg-purple{ background:#8f97df;}
-.edu-index-bg-yellow{ background:#f7bb74;}
-.edu-index-bg-orange{ background:#e48a81;}
-
-
-
-/* 头部 */
-.header{ width:100%; height:51px;min-width:1200px;background:rgb(23, 22, 22);  }
-.header_con{ width:1200px; min-width:1200px; height:50px; margin:0 auto;}
-.new-logo img{ width:36px; height:36px;margin-top:7px; border-radius:3px; }
-.new-logo p{ font-size: 18px; color:#fff; line-height: 50px; }
-a.new-nav-a{ display: block; font-size: 14px; line-height: 50px; color:#fff;}
-a:hover.new-nav-a{ color:#ff7500; text-decoration: none;}
-.header-search{border-radius:3px; background:#fff;}
-.header-search a{text-decoration: none; color:#666!important;}
-.header-search a:hover{color:#ff7500!important;}
-input.header-search-input{ width:150px; height:30px; padding:0 5px; border-style: none; border: none;outline:none;}
-.innner-nav{ margin-left:40px;}
-.innner-nav li{float:left; margin-right:40px;}
-.innner-nav li a{ display: block; color:#fff; padding:0 10px; }
-.inner-btnbox02{ width:270px; margin: 30px auto 0;}
-.new-container-inner02{width:1200px; margin:0px auto; padding:50px 0;}
-.inner-nav-mes{ font-size:16px; color:#fff; margin-right:35px; margin-top:18px; }
-.inner-nav-cir{ background:#ff6530; color:#fff; border-radius:15px;padding:0 5px; display: inline-block; font-size:10px; height:17px; line-height:17px;}
-.inner-nav-user{ width: 75px; height: 45px; margin-top:5px; position: relative; padding-left: 0px;}
-.inner-nav-user-img{ width: 40px; height: 40px; border-radius:50px;}
-select.header-search-select{ border:none; font-size:14px; padding:5px; background: none;}
-.edu-unlogin-nav a{ color:#fff!important; font-size:14px; line-height:50px;}
-.edu-unlogin-nav a:hover{ color:#3b94d6;}
-.edu-unlogin-nav{ font-size:12px; color:#fff; line-height:50px;}
-
-.task-user-dropdown{font-size:12px; line-height: 1.9; width:120px; background-color:#fff; border-radius:3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:relative; top:5px; right:44px; display: none; z-index:999;}
-.task-user-dropdown font{ border: 1px solid #dddddd;   display: block; border-width: 8px; position: absolute; top: -13px;left:100px; border-style:solid; border-color: transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
-.task-user-dropdown-nav { padding-top:5px; }
-.task-user-dropdown-nav li { display: inline-block; text-align: center;  width:100%; height: 30px; line-height: 30px;}
-.task-user-dropdown-nav li:hover{ background:#eee;}
-.task-user-dropdown-nav li:hover a{color: #FF7500!important;}
-.task-line{ display: block; height: 1px!important; line-height: 1px!important; border-bottom:1px solid #eee; margin:0;}
-.inner-nav-user:hover .task-user-dropdown{ display:block;}
-dropdown { display: inline-block; height:30px; line-height:1.9; font-size:12px; }
-dropdown label, dropdown ul li{ display: block; width:42px; padding:4px 10px; text-align: center;border-radius:3px; color:#666;}
-dropdown ul li:hover{background: #eee; color:#666;cursor: pointer;}
-dropdown label{color: #666;border-radius: 3px 0 0 3px;  position: relative; z-index: 2; width:50px; text-align: center; height:22px;}
-dropdown input{display: none;}
-dropdown input:checked + label{ background: #fff;color:#666;}
-dropdown ul{ position: absolute; visibility: visible; opacity: 1; top: 38px; background: #fff; z-index: 99; border-radius:3px;}
-$colors: #fff, #0072B5, #2C3E50;
-@for $i from 1 through length($colors) {
-    dropdown ul li:nth-child(#{$i}) {
-        border-left: 4px solid nth($colors, $i);
-    .fa{
-        color: nth($colors, $i);
-    }
-&:hover {
-     background: nth($colors, $i);
-     color: white;
-    .fa{
-        color: white;
-    }
-}
-}
-}
-
-.edu-dropdown{ position: relative; padding:0 15px; }
-.edu-dropdown-menu{ background-color:#fff; text-align: center;  border-radius:3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:absolute; top:25px; left:0px; z-index: 999;   display:none;}
-.edu-dropdown-menu li{ height:30px; line-height:30px; display: block; padding:0 15px; text-align: left;}
-.edu-dropdown-menu li label{ cursor: pointer;}
-.edu-dropdown-menu li:hover{ color: #FF7500!important;}
-/*.edu-dropdown:hover .edu-dropdown-menu{ display: block;}*/
-.animate{ -webkit-transition: all .3s; -moz-transition: all .3s; -ms-transition: all .3s; -ms-transition: all .3s;
-    transition: all .3s;   backface-visibility:hidden; -webkit-backface-visibility:hidden; /* Chrome and Safari */ -moz-backface-visibility:hidden; /* Firefox */ -ms-backface-visibility:hidden; /* Internet Explorer */}
-/* 底部 */
-.footer{width:100%; height:100px; background-color:#fff; }
-.footer_con{ width:1200px; height:100px; margin:0 auto; text-align: center;  padding:20px 0; }
-.footer_con-inner{ width: 300px; margin:0px auto;}
-.footer_con-inner li a{ font-size: 16px; color: #888;display: block;padding:0 15px; border-right: solid 1px #888;}
-.footer_con-inner li a:hover{text-decoration: underline;}
-.footer_con-p{ color: #888; margin-top:10px;}
-.inner-footer{ width: 100%; min-width:1200px; background:#323232; padding-bottom:30px;}
-.inner-footer_con{ width: 1200px; margin: 0 auto;}
-.inner-footer-nav{ height: 50px; border-bottom:1px solid #47494d;}
-.inner-footer-nav li a{ float: left; margin-right:15px; font-size: 14px; color: #888; line-height: 50px;}
-.saoma-box{ position: relative;}
-.saoma-img-box{  position: absolute; top:-300px; left: -86px; border-radius:3px; background:#fff; padding:15px;box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); display: none;}
-.saoma-box  li:hover ul{display:block; }
-.img-show{ width:50px; height:50px; border-radius:50px; }
-.saoma-img-box font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top:289px;left: 103px; border-style:solid; border-color:#fff transparent transparent  transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
-.inner-footer-p-big{ display: block; height: 50px; line-height: 50px; color:#888; font-size: 16px; border-left:2px solid #888; padding-left:15px;}
-.inner-btnbox02{ width:270px; margin: 30px auto 0;}
-.new-container-inner02{width:1200px; margin:0px auto; padding:50px 0;}
-img.edu-footer-logo{  height: 50px;}
-/************布局 byLB****************/
-.panel-content{ width: 1200px; margin:20px auto; background:#eaebec;}
-.panel-contentss{ width: 1200px; margin:10px auto; margin-bottom:20px; background:#fff;}
-/************讨论区20170321 byLB****************/
-.panel-inner-fourm{ padding:20px; border-bottom:1px solid #eee;}
-.panel-inner-fourm:hover{ background:#EFF9FD;}
-.nobg:hover{ background:#fff;}
-a.panel-list-title,.panel-list-title { display:inline-block; font-size: 16px; color: #333; font-weight:normal; max-width:82%;}
-a:hover.panel-list-title{color:#FF7500;}
-.panel-list-img{ width: 60px; height: 60px; border-radius:100px;}
-a.panel-name-small{ display: inline-block; max-width:100px; color:#29bd8b; font-size:12px; }
-.panel-list-infobox{ width: 92%; margin-left:8%; margin-top:-70px;}
-.panel-lightgrey,.panel-lightgrey span{  font-size:12px; color:#888;}
-.panel-inner-info{ width: 93%; margin-left:7%;}
-.panel-bg-grey{ padding:5px 0;background:#f6f6f6; width: 100%; color:#666;}
-.panel-list-nodata{ width: 420px; margin:100px auto; text-align: center;}
-
-/*班级讨论区panel 2017/07/20   cs*/
-.panel-content-box{background: #FFFFFF;}
-.panel-content-line{width: 90%;margin: 30px 5%;}
-.panel-content-line .panel-line-left{width: 8%;text-align: right;}
-.panel-content-line .panel-content-label{height: 40px;line-height: 40px}
-.panel-content-line .panel-content-input{width: 90%;height: 28px;padding: 5px;}
-.panel-content-line .panel-content-ta{width: 90%;min-height: 148px;padding: 5px;}
-/* 回复评论 */
-.panel-comment_item{ width: 100%; }
-.panel-comment_item .t_area{ color:#888;}
-.comment_item_cont{ padding:15px; border-bottom:1px solid #e3e3e3;}
-.comment_item_cont .J_Comment_Face{height: 50px}
-.comment_item_cont .J_Comment_Face img{ width:50px; height:50px; border-radius:100px; }
-.panel-comment_item .t_content{ width:93%; margin-left:15px;}
-.panel-comment_item a.content-username {font-size:14px; margin-right:15px; display:inline-block; max-width:100px;color: #888888}
-.J_Comment_Info{height: 20px;line-height: 22px;}
-/*.panel-comment_item a:hover.content-username{color:#FF7500;}*/
-.panel-comment_item .orig_user img{width:40px; height:40px;border-radius:100px; }
-.panel-comment_item .reply-right{ float:right; position:relative;}
-.panel-comment_item .reply_iconup02{ position:absolute; top:22px; left:14px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
-.panel-comment_item .comment_orig_content{margin:10px 0; color:#999;}
-.panel-comment_item .comment_orig_content .comment_orig_content{margin-top:0; color:#666;}
-.panel-comment_item .orig_cont{ border:solid 1px #F3DDB3; background:#FFFEF4; padding:4px;color:#999;margin-top:-1px; }
-.panel-comment_item .orig_cont_sub{ border-top:0}
-.panel-comment_item .comment_orig_content .orig_index{ float:right; color:#666; font-family:Arial; padding-right:5px;line-height:30px;}
-.panel-comment_item .comment_orig_content .orig_user{ margin:10px 15px 10px 5px;}
-.panel-comment_item .comment_orig_content .orig_user span{ color:#999; padding-right:5px;}
-.panel-comment_item .comment_orig_content .orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; }
-.panel-comment_item .orig_right{ width:80%; margin-top:5px;}
-.panel-comment_item .orig_right img{max-width:100%;}
-.panel-comment_item a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; }
-.panel-comment_item a:hover.comment_ding_link{ color:#269ac9;}
-.panel-comment_item .comment_ding_link span{display: inline-block;padding: 0 0px 0 8px;}
-.panel-comment_item .comment_ding_link em{font-style: normal;font-family:arial;}
-.panel-comment_item .comment_reply_link{  display:inline-block; width:50px; height:24px;line-height: 24px; vertical-align:middle;text-align: center;}
-.panel-comment_item .comment_reply_link:link,.comment_reply_link:visited{color:#333;text-decoration: none;}
-.panel-comment_item .comment_content{ color:#666;}
-.comment_content img,.orig_content img{max-width: 100%}
-.panel-comment_item .t_txt{ margin-top:10px;}
-.panel-comment_item .orig_reply_box{border-top:1px solid #e3e3e3; width:100%;padding: 15px 0px 0px 0;margin-top: 5px;}
-.panel-comment_item .orig_textarea{width:90%;  margin-bottom:10px;}
-.panel-comment_item .orig_textarea02{ border:1px solid #ccc; background-color:#fff; width:92%;  margin-bottom:10px;}
-.panel-comment_item .orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
-.panel-comment_item .orig_sub:hover{ background:#297fb8;}
-.panel-comment_item .orig_cont_hide{ text-align:center; width:100%; display:block; font-size:14px; color:#666; border-bottom:1px solid #F3DDB3; padding:8px 0;}
-.panel-comment_item .orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;}
-.orig_reply{ font-size: 12px; }
-.panel-mes-head{ padding:10px; border-bottom:1px solid #eee;}
-.homepagePostReplyPortrait a img{border-radius: 100px;}
-/* 表格 */
-.panel-new-table { width:100%; text-align: center; }
-.panel-new-table tr th{ color:#333; height: 50px;line-height:50px; }
-.panel-new-table tr th,.panel-new-table tr td{ border-bottom:1px solid #eee; }
-.panel-new-table tr td{color:#666; height: 40px; line-height:40px;}
-.panel-table-pd15 tr td{ padding:15px 0;}
-.panel-new-table tbody tr:hover{ background:#f9f9f9;}
-a.panel-table-name{display:block; max-width:100px;text-align:center;}
-a.panel-table-title{display:block; max-width:240px;text-align:center;}
-.table-num{ width:5%; text-align: center;}
-/* 滑动条 */
-.panel-slider-bg{ width:240px; height: 15px; border-radius:15px; background:#f1f2f7; }
-.panel-slider-inner00{ display:block;  width:0%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner01{ display:block;  width:10%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner02{ display:block;  width:20%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner03{ display:block;  width:30%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner04{ display:block;  width:40%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner05{ display:block;  width:50%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner06{ display:block;  width:60%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner07{ display:block;  width:70%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner08{ display:block;  width:80%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner09{ display:block;  width:90%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner10{ display:block;  width:100%; height: 15px; border-radius:15px; background:#29bd8b;}
-/* 翻页 */
-.panel-pages a{ display: inline-block;  border:1px solid #d1d1d1; color:#888; float:left;text-align:center; padding:0 10px; margin-right:5px; height: 30px; line-height: 30px; }
-.panel-pages a:hover,.panel-pages .active{  background-color:#29bd8b; border:1px solid #29bd8b;color:#fff; }
-.panel-pages{ width: 350px; margin:20px auto;}
-/* 翻页*/
-.pages_right_min a{ display: inline-block;border:1px solid #d1d1d1; color:#888!important; float:left;text-align:center; padding:3px 10px; line-height:1.9; margin: 0 5px;}
-.pages_right_min a.pages-border-right{border-right:1px solid #d1d1d1; }
-.pages_right_min a:hover,.pages_right_min a.active{  background-color:#FC7033; color:#fff!important;border:1px solid #FC7033}
-.pages_right_min li{float: left;}
-/* 个人主页翻页 */
-.pages_user_show a:hover,.pages_user_show a.active{  background-color:#FC7033;; color:#fff;border: 1px solid #FC7033;}
-.pages_user_show a{ display: inline-block;border:1px solid #d1d1d1; color:#888; float:left;text-align:center; padding:3px 10px; line-height:1.9; margin: 0 5px;}
-.pages_user_show li{float: left; list-style-type: none;}
-.pages_user_show ul li{list-style-type: none !important;}
-.pages_user_show ul li a{color:#888}
-/* 小翻页 */
-.pages_little_show a:hover,.pages_little_show a.active{  background-color:#FC7033;; color:#fff!important;border:1px solid #FC7033}
-.pages_little_show a{ display: inline-block;border:1px solid #d1d1d1; color:#888!important; float:left;text-align:center; padding:3px 3px; line-height:1.9; margin: 0 2px; font-size: 12px;}
-.pages_little_show li{float: left;}
-/* 搜索*/
-.panel-search{ position: relative;}
-input.panel-search-input{ height: 30px; width:300px; color: #666;}
-.panel-search-btn{ position: absolute; top:2px; right:10px;}
-/* 表单*/
-.label-w20{ width:20%!important;}
-.panel-form-label{ display:inline-block; width:10%; min-width:90px; text-align:right; line-height:40px; font-weight: normal; }
-.panel-form input,.panel-form textarea,.panel-form select{ border:1px solid #e2e2e2;color:#666;line-height: 1.9; background:#fff;}
-.panel-box-sizing{-moz-box-sizing: border-box;  /*Firefox3.5+*/-webkit-box-sizing: border-box; /*Safari3.2+*/-o-box-sizing: border-box; /*Opera9.6*/-ms-box-sizing: border-box; /*IE8*/box-sizing: border-box; border-radius:3px;}
-input.panel-form-width-690{ padding:5px;width:90%; height:40px; }
-input.panel-form-width-100{ padding:5px;width:100%; height:40px;}
-input.panel-form-width-45{ padding:5px;width:44.5%; height:40px; }
-input.panel-form-width-50{ padding:5px;width:44.5%; height:25px; }
-input.panel-form-width-60{ padding:5px;width:60%; height:40px; }
-textarea.panel-form-width-100{ padding:5px;width:100%; height:150px; }
-textarea.panel-form-width-690{ padding:5px;width:90%; height:150px; }
-.panel-form-width-670{ width: 670px; padding:5px;}
-.panel-form-height-150{ height: 150px;}
-.panel-form-height-30{height: 30px;}
-.task-bg-grey{ background:#f3f3f3; width:90%; min-width:700px; padding:10px; border:1px solid #f3f3f3; color:#888;}
-.task-bg-grey02{ background:#f3f3f3; width:80%; min-width:700px; padding:7px 10px; border:1px solid #f3f3f3; color:#888;}
-
-input.task-form-10,textarea.task-form-10,select.task-form-10,.task-form-10{padding:5px;width:10%;box-sizing: border-box}
-input.task-form-15,textarea.task-form-15,select.task-form-15,.task-form-15{padding:5px;width:15%;box-sizing: border-box}
-input.task-form-20,textarea.task-form-20,select.task-form-20,.task-form-20{padding:5px;width:20%;box-sizing: border-box}
-input.task-form-30,textarea.task-form-30,select.task-form-30,.task-form-30{padding:5px;width:30%;box-sizing: border-box}
-input.task-form-35,textarea.task-form-35,select.task-form-35,.task-form-35{padding:5px;width:35%;box-sizing: border-box}
-input.task-form-40,textarea.task-form-40,select.task-form-40,.task-form-40{padding:5px;width:40%;box-sizing: border-box}
-input.task-form-45,textarea.task-form-45,select.task-form-45,.task-form-45{padding:5px;width:45%;box-sizing: border-box}
-input.task-form-50,textarea.task-form-50,select.task-form-50,.task-form-50{padding:5px;width:50%;box-sizing: border-box}
-input.task-form-60,textarea.task-form-60,select.task-form-60,.task-form-60{padding:5px;width:60%;box-sizing: border-box}
-input.task-form-70,textarea.task-form-70,select.task-form-70,.task-form-70{padding:5px;width:70%;box-sizing: border-box}
-input.task-form-80,textarea.task-form-80,select.task-form-80,.task-form-80{padding:5px;width:80%;box-sizing: border-box}
-input.task-form-90,textarea.task-form-90,select.task-form-90,.task-form-90{padding:5px;width:90%;box-sizing: border-box}
-input.task-form-100,textarea.task-form-100,select.task-form-100,.task-form-100{padding:5px;width:100%;}
-input.task-height-40,textarea.task-height-40,.task-height-40,select.task-height-40{height:40px;}
-input.task-height-30,textarea.task-height-30,.task-height-30,select.task-height-30{height:32px;}
-input.task-height-220,textarea.task-height-220,.task-height-220{height:220px;}
-input.task-height-150,textarea.task-height-150,.task-height-150{height:150px;}
-input.task-height-100,textarea.task-height-100,.task-height-100{height:100px;}
-input.task-height-80,textarea.task-height-80,.task-height-80{height:80px;}
-
-/*头像下拉弹框*/
-.my_account_info{ width:160px; background-color:#fff; border-radius: 3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:absolute; font-size: 14px; top:46px; left:-97px;display: none; z-index:999;}
-.my_account_info li a{ color: #888;}
-.my_account_info font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color:  transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
-.my_account_info li{ padding-left: 5px; line-height: 1.5;}
-.li_bottom_border{ border-bottom:1px solid #eee;}
-a.task-index-name{ display: inline-block; max-width:80px;}
-.task-index-name{ display: inline-block; max-width:80px;}
-
-/*滑块验证*/
-.drag_slider{ position: relative; background-color: #e8e8e8; width:100%; height: 45px; line-height: 45px; text-align: center;border-radius: 4px;}
-.drag_slider .handler{ border-radius: 4px 0px 0px 4px;position: absolute; top: 0px; left: 0px; width: 50px; height: 43px; border: 1px solid #eee; cursor: move;}
-.handler_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;}
-.handler_ok_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;}
-.drag_slider .drag_bg{ background-color: #29bd8b; height: 45px; width: 0px;}
-.drag_slider .drag_text{border-radius: 4px 0px 0px 4px;position: absolute; top: 0px; width: 100%; -moz-user-select: none; -webkit-user-select: none; user-select: none; -o-user-select:none; -ms-user-select:none;}
-
-
-/*新建新增*/
-/*.edu-con-top{ padding:10px 0; background:#fff; border-bottom:1px solid #eee;font-size:16px; }*/
-/*.edu-con-top h2{ font-size:16px;}*/
-/*.edu-con-bg01{ width: 100%; background:#fff;}*/
-/*.edu-con-top .color-grey{ color:#666!important;}*/
-
-/*附件上传的样式*/
-.atta_input{ width: 980px; white-space: nowrap; text-overflow:ellipsis;}
-
-/*作业描述、帖子内容*/
-.upload_img img{max-width: 100%;}
-.table_maxWidth table {max-width: 642px;}
-.list_style ol li{list-style-type: decimal;margin-left: 40px;}
-.list_style ul li{list-style-type: disc;margin-left: 40px;}
-
-/*数据为空公共页面*/
-img.edu-nodata-img{ width:200px; margin:50px auto 20px; display: block;}
-.edu-nodata-p{ font-size: 16px; text-align: center; color:#888;border-bottom:none!important;}
-
-/* new tab */
-.edu-tab{ width: 100%; background:#fff;}
-#edu-tab-nav{height:47px;background: #fff;}
-#edu-tab-nav li.new-tab-nav {float:left; width: 150px; text-align:center;height:48px;line-height:48px;border-top-right-radius:5px;border-top-left-radius:5px; }
-#edu-tab-nav li a{font-size:14px; }
-#edu-user-tab-nav{height:40px;background: #fff; border-bottom:2px solid #FC7033;}
-#edu-user-tab-nav li.new-tab-nav {float:left; width: 120px; text-align:center;height:42px;line-height:42px;border-top-left-radius: 5px;border-top-right-radius:5px}
-#edu-user-tab-nav li a{font-size:14px; }
-.edu-new-tab-hover { background:#5faee3; }
-.edu-user-tab-hover{background:#FC7033;}
-.edu-user-tab-hover a{color:#fff!important;}
-.edu-new-tab-hover a{color:#fff!important;}
-.edu-class-con-list:hover{ background:#EFF9FD;}
-.edu-bg-shadow{box-shadow: 0px 0px 5px rgba(146, 153, 169, 0.2);}
-a.task-btn-line{display: inline-block;font-weight: bold;padding: 0 12px;color: #666;background: #fff;letter-spacing: 1px;text-align: center;font-size: 14px;height: 30px;line-height: 30px;border-radius: 3px;  border:1px solid #ccc;}
-a:hover.task-btn-line{ border:1px solid #3498db;background:#3498db;color: #fff;}
-
-/*阴影*/
-.user_bg_shadow{-webkit-box-shadow: 0 0 8px 0 rgba(142,142,142,.1);-moz-box-shadow: 0 0 8px 0 rgba(142,142,142,.1);box-shadow: 0 0 8px 0 rgba(142,142,142,.1);}/*四边阴影*/
-.user_bg_shadow_notop{-webkit-box-shadow: 0 3px 8px 0 rgba(142,142,142,.1);-moz-box-shadow: 0 3px 8px 0 rgba(142,142,142,.1);box-shadow: 0 3px 8px 0 rgba(142,142,142,.1);}/*没有上边阴影*/
-/*阴影+边框*/
-.shadow_border{border:1px solid #eee;-webkit-box-shadow: 0 0 8px 0 rgba(142,142,142,.1);-moz-box-shadow: 0 0 8px 0 rgba(142,142,142,.1);box-shadow: 0 0 8px 0 rgba(142,142,142,.1);}
-.shadow_border_notop{border:1px solid #eee;-webkit-box-shadow: 0 3px 8px 0 rgba(142,142,142,.1);-moz-box-shadow: 0 3px 8px 0 rgba(142,142,142,.1);box-shadow: 0 3px 8px 0 rgba(142,142,142,.1);}
-.user_bg_shadow01{-webkit-box-shadow: 0 1px 2px 2px rgba(123, 123, 123, 0.15);-moz-box-shadow: 0 1px 2px 2px rgba(123, 123, 123, 0.15);box-shadow: 0 1px 2px 2px rgba(123, 123, 123, 0.15);}
-.user_bg_shadow02{-webkit-box-shadow: 0 2px 8px 0 rgba(123, 123, 123, 0.15);-moz-box-shadow: 0 2px 8px 0 rgba(123, 123, 123, 0.15);box-shadow: 0 2px 8px 0 rgba(123, 123, 123, 0.15);}
-.box_bg_shandow {box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);}
-
-/*新增的公用样式*/
-.box-boxshadow{box-shadow: 3px 3px 10px rgba(146, 153, 169, 0.2);}
-.prop-notice-info{padding: 10px;border:1px solid #F3DDB3;background-color: #FFFEF4;}
-.prop-notice-info ol{list-style-type: disc;list-style-position:inside}
-.prop-notice-info ol li{list-style-type: disc;color: #ff6532;margin-bottom:0!important;}
-
-/*input框移出后没有内容将边框阴影变为红色*/
-.notinput_bg_shadow{border: none;box-shadow: 0px 0px 4px rgba(227,53,37,1);}
-/*设置input框的placehoder的字体颜色*/
-input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color: #cccccc}
-input::-moz-placeholder,textarea::-moz-placeholder { color:#cccccc;}
-input::-moz-placeholder,textarea::-moz-placeholder { color:#cccccc;}
-input::-ms-input-placeholder,textarea::-ms-input-placeholder {color:#cccccc;}
-/*班级讨论区置顶的样式*/
-.btn-cir {display: inline-block;padding: 0px 5px;border-radius: 25px;line-height: 20px;font-size: 12px;}
-.btn-cir:hover{background:#fff;color:#333333}.all_work_border{border: 1px solid #4c515d;}/*TPI全部任务的数量需要加一个边框*/
-.btn-cir-grey{background: #e1e1e1;color: #8c8c8c;font-weight: normal;border: 1px solid #e1e1e1}
-.btn-cir-red{background:red;color: #fff; font-weight: normal;}
-.btn-cir-red:hover{background:red;}
-.btn-cir-orange {background: #ff7500; color: #fff; font-weight: normal;border: 1px solid #ff7500}
-.btn-top{display: inline-block;padding: 0px 5px;line-height: 20px;font-size: 12px;border-radius: 3px;}
-.btn-cir-big{ background: #999;color: #fff;display: inline-block; padding:0px 10px; border-radius:25px;  line-height:25px; height: 25px; font-size:12px;}
-/*圆形绿色背景---------22*/
-.panel-inner-icon{width: 22px;height: 22px;line-height: 22px;border-radius: 50%;background: #29bd8b;display: block;text-align: center}
-.panel-inner-icon{width: 22px;height: 22px;line-height: 22px;border-radius: 50%;background: #29bd8b;display: block;text-align: center}
-/*圆形绿色背景------------------18*/
-.panel-inner-icon18{width: 18px;height: 18px;line-height: 18px;border-radius: 50%;background: #29bd8b;display: block;text-align: center}
-
-/*---------------块右上角的三角形，颜色为浅橙色*/
-.triangle-topright {position: absolute;right: -1px;top:0px;width: 0;height: 0;border-top: 35px solid #FF9E6A;border-left: 60px solid transparent;z-index: 1}
-.triangle-font{position: absolute;right: 1px;top: 2px;z-index: 2;font-size: 12px;color: white;transform: rotate(31deg);}
-.triangle-font2{position: absolute;right: 1px;top: -5px;z-index: 2;font-size: 12px;color: white;transform: rotate(31deg);}
-
-/* colorbox
-*******************************************************************************/
-/*
-    Colorbox Core Style:
-    The following CSS is consistent between example themes and should not be altered.
-*/
-#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:99999; overflow:hidden;}
-#cboxWrapper {max-width:none;}
-#cboxOverlay{position:fixed; width:100%; height:100%;}
-#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
-#cboxContent{position:relative;}
-#cboxLoadedContent{overflow:auto; -webkit-overflow-scrolling: touch;}
-#cboxTitle{margin:0;}
-#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
-#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
-.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;}
-.cboxIframe{width:100%; height:100%; display:block; border:0; padding:0; margin:0;}
-#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
-
-/*
-    User Style:
-    Change the following styles to modify the appearance of Colorbox.  They are
-    ordered & tabbed in a way that represents the nesting of the generated HTML.
-*/
-#cboxOverlay{background:#fff;}
-#colorbox{outline:0;}
-#cboxTopLeft{width:25px; height:25px; background:url(/images/colorbox/border1.png) no-repeat 0 0;}
-#cboxTopCenter{height:25px; background:url(/images/colorbox/border1.png) repeat-x 0 -50px;}
-#cboxTopRight{width:25px; height:25px; background:url(/images/colorbox/border1.png) no-repeat -25px 0;}
-#cboxBottomLeft{width:25px; height:25px; background:url(/images/colorbox/border1.png) no-repeat 0 -25px;}
-#cboxBottomCenter{height:25px; background:url(/images/colorbox/border1.png) repeat-x 0 -75px;}
-#cboxBottomRight{width:25px; height:25px; background:url(/images/colorbox/border1.png) no-repeat -25px -25px;}
-#cboxMiddleLeft{width:25px; background:url(/images/colorbox/border2.png) repeat-y 0 0;}
-#cboxMiddleRight{width:25px; background:url(/images/colorbox/border2.png) repeat-y -25px 0;}
-#cboxContent{background:#fff; overflow:hidden;}
-.cboxIframe{background:#fff;}
-#cboxError{padding:50px; border:1px solid #ccc;}
-#cboxLoadedContent{margin-bottom:20px;}
-#cboxTitle{position:absolute; bottom:0px; left:0; text-align:center; width:100%; color:#999;}
-#cboxCurrent{position:absolute; bottom:0px; left:100px; color:#999;}
-#cboxLoadingOverlay{background:#fff url(/images/colorbox/loading.gif) no-repeat 5px 5px;}
-/* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
-#cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; width:auto; background:none; }
-/* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
-#cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;}
-#cboxSlideshow{position:absolute; bottom:0px; right:42px; color:#444;}
-#cboxPrevious{position:absolute; bottom:0px; left:0; color:#444;}
-#cboxNext{position:absolute; bottom:0px; left:63px; color:#444;}
-#cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;}
-
-/*-----下拉框--------*/
-.down-select{display:none;position: absolute;z-index: 10;left: 0px;width: 100%;overflow-y: auto;background: #fff;max-height: 200px;}
-.down-select p{height: 35px;line-height: 35px;padding-left: 5px;}
-.down-select p:hover{background: #f3f4f6}
-
-/*课程、实训的条状样式*/
-.homepage-list-show p{height:70px;line-height:70px;}
-.homepage-list-show p:nth-child(odd){background:#fafbfb;}
-.homepage-list-show p .first{width:58%;display:inline-block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.homepage-list-show p .hasmargin{width:23%;display:inline-block;text-align: center;color:#888;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.homepage-list-show p .haspadding{width:16.7%;display:inline-block;margin-right:12%;color:#888;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.homepage-list-show p .last{width:8.33%;display:inline-block;color:#888;cursor: pointer; display: none;}
-.homepage-list-show p .last:hover{color:#5faee3;}
-.homepage-list-show p .last:hover .blue{color:#5faee3;}
-
-/*-----课程名称下拉框--------*/
-.course_list_ul,.down-list{ overflow-y: scroll;display: none;position: absolute;top:40px;left: -1px;width: 100% !important;border:1px solid #eeeeee;background: #FFFFFF;max-height: 150px;z-index: 10}
-.course_list_ul li{height:20px;padding:5px 10px;clear:both;line-height:28px;margin-bottom: 0 !important;cursor: pointer;}
-.down-list li{text-align: left;outline: none;padding: 5px 10px;clear: both;line-height: 22px!important;margin-bottom: 0 !important;cursor: pointer;width: 100%;box-sizing: border-box;height: 30px;border: none!important;}
-.down-list li:hover{background: #eee}
-.down-list{top:32px}
-.unit-part{border:1px solid #ccc;padding: 0px 8px;border-radius: 5px;margin-right: 10px}
-.unit-part input{border: none!important;text-align: left;width:auto;outline: none}
-/*-----试卷提交状态--------*/
-.post_status_btn{display: block;float: left;padding: 0px 5px;font-size: 12px;color: #FFFFFF;border-radius: 4px;height: 20px;line-height: 20px;;}
-.post_btn_green{background: #29bd8b;border: 1px solid #29bd8b!important;color: #fff;}
-.post_btn_green_q{background: #5ECFBA;border: 1px solid #5ECFBA!important;color: #fff;}
-.post_btn_orange{background: #FF7500;border: 1px solid #FF7500!important;color: #fff;}
-.post_btn_red{background: #ee4a1f;border: 1px solid #ee4a1f!important;color: #fff;}
-.post_btn_grey{background: #e4e4e3;border: 1px solid #e4e4e3!important;}
-.post_btn_white{background: #ffffff;}
-/*评阅状态*/
-.checkstatus_box_small{width: 10px;height: 10px;display: block;float: left;margin-right: 3px;}
-.checkstatus_box_big{cursor: default;width: 30px;height: 30px;line-height: 30px;text-align: center;margin-right: 10px;border:1px solid #CCCCCC;display: block;float: left;margin-bottom: 10px}
-.checkstatus_box_big i{position: absolute;top:18px;left: 10px;}
-
-/*个人主页头部认证圆形背景*/
-.user-info-span{border-radius: 50%;float:left;background: #F3F5F7;text-align: center;width: 23px;height: 23px;line-height: 23px;margin-top: 3px;margin-right: 5px}
-
-/*试卷答题倒计时*/
-.time_panel span.factorial{float: left;display: block;line-height: 35px;padding: 0px 3px;}
-.time_panel span.time{float: left;display: block;color: #ffffff;background-color: #333333;font-size: 16px;border-radius: 5px;letter-spacing: 1px;width: 33px;text-align: center;line-height: 35px;height: 35px;}
-
-.hidemsg{overflow: hidden;cursor: pointer}
-.hidemsg div{
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    margin: auto;
-    opacity:0.4;
-    background-color: #ffffff;
-    -webkit-border-radius: 100%;
-    -moz-border-radius: 100%;
-    -o-border-radius: 100%;
-    -ms-border-radius: 100%;
-    -webkit-animation-fill-mode: both;
-    -moz-animation-fill-mode: both;
-    -ms-animation-fill-mode: both;
-    -o-animation-fill-mode: both;
-    width: 80px;
-    height: 80px;
-    -webkit-animation: ball-scale 1s 0s ease-in-out infinite;
-    -moz-animation: ball-scale 1s 0s ease-in-out infinite;
-    -ms-animation: ball-scale 1s 0s ease-in-out infinite;
-    -o-animation: ball-scale 1s 0s ease-in-out infinite;
-    animation: ball-scale 1s 0s ease-in-out infinite;
-}
-@keyframes ball-scale{
-    0%{width: 0px;height: 0px}
-    100%{width: 80px;height: 80px}
-}
-
-/*-------------------个人主页关注和粉丝列表改版         以及TPM合作者部分改版 2018/01/15-------------------------*/
-.-task-con-int .favour .fens-table-list{display: flex;width:21.29%;margin:0px 1.5% 1.5% 0px;min-height: 125px;border: 1px solid #EEEEEE;padding: 10px;background: #f9fbfd}
-.-task-con-int .favour .fens-table-list:nth-child(4n+1){margin:0px 1.5% 1.5% 1.5%;}
-.-task-con-int .favour .fens-table-list .touxiang{border-radius: 50%;overflow: hidden;}
-.white-icon-ring{width: 25px;height: 25px;background: #ffffff;border-radius: 50%;text-align: center;line-height: 25px;}
-a.btn-focus{display: block;width:80px;height: 35px;line-height: 35px;border-radius: 4px;border:1px solid #EEEEEE;text-align: center;cursor: pointer;background: #ffffff}
-a.btn-focus:hover{color: #FFFFFF!important;background:#FC7033;border: 1px solid #FC7033 }
-.fans-name{max-width: 100px;word-break: break-all;overflow: hidden;height: 26px;text-overflow: ellipsis;white-space: nowrap;}
-.school-name{max-width: 196px;word-break: break-all;overflow: hidden;height: 26px;text-overflow: ellipsis;white-space: nowrap;}
-
-.fans_del{position: absolute;right: 12px;top: 12px;cursor: pointer;
-    text-align: center;}
-.fans_del i{color: #b5b5b5}
-.fans_del:hover i{color: #ff7500!important;}
-
-.-task-con-int .favour .p2{line-height:90px;text-align:center;}
-.-task-con-int .favour .p2:hover .changecolor{color:#5faee3;}
-.-task-con-int .favour .fens{position:relative;}
-.-task-con-int .favour .fens .many{position:absolute;right:22px;top:-35px;}
-.-task-con-int .favour .fens .list{width:100px;text-align:center;padding-top:5px;}
-.-task-con-int .favour .fens .list dt{margin:20px;margin-bottom:5px;}
-.-task-con-int .favour .fens .touxiang{border-radius:28px;overflow:hidden;}
-
-/*选择实训的弹框*/
-.shixun_work_div{overflow-y: auto;max-height: 90px;}
-
-/************新版公共****************/
-/************新版公共****************/
-html{height:100%;}
-/*.newContainer{ min-height:100%; height: auto !important; height: 100%;  position: relative;}
-.newMain{ margin: 0 auto; padding-bottom: 155px; }
-.newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px}
-.newHeader{background: #46484c;width:100%; height: 50px; min-width: 1200px}*/
-.w20_center{ width: 20px;text-align: center; }
-.task-container{ min-width:1300px; margin:0 auto; background: #f5f9fc; position: relative;}
-/*左侧导航*/
-.leftbar{  height: 100%; background: #1f212d; width:80px;}
-.user-info{ width:80px; height:100px;  padding-top:15px;}
-a.user-info-img{ display: block; width: 50px; height: 50px; margin:0 auto;  }
-a.user-info-img img{border-radius:100px;border:2px solid #666;}
-a.user-info-img img:hover{border:2px solid #888;}
-a.user-info-name{ display: block; font-size: 16px; color: #fff; max-width:100px; margin: 10px auto; text-align: center;    overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
-.leftnav-box{ width: 80px; height: 60px; background:#292b3a; padding:10px 0; margin-bottom:2px;}
-a.leftnav-box-inner{ display: block; width:77px;  border-left:3px solid #292b3a; background:#292b3a;  text-align: center; padding:10px 0; color:#575f6c;}
-a:hover.leftnav-box-inner,a.leftnav-active{border-left:3px solid #3498db;color: #fff!important;}
-a:hover.leftnav-box-inner .btn-cir{background:#fff;color:#333333}
-a.leftnav-box-reset-inner{ display: block; width:77px;  border-left:3px solid #292b3a; background:#292b3a;  text-align: center; color:#575f6c;}
-a:hover.leftnav-box-reset-inner{border-left:3px solid #3498db;color: #fff!important;}
-
-
-
-/*右侧头部*/
-.rightbar-header{width: 100%; background:#282c37; height:60px; min-width:1000px;}
-.rightbar-score{ margin-top: 17px; font-size: 14px; margin-right:20px;}
-.rightbar-score li{ float: left; color:#fff; margin-right: 20px;}
-.rightbar-score li a{ color:#fff;}
-a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:15px; margin-top: 12px;}
-.rightbar-h2{ color:#fff; margin:12px 0 0 20px;  font-weight: normal;}
-.rightbar{background:#f5f9fc; color:#333; position: relative;}
-/*右侧内容*/
-.content{ min-width:1000px;  }
-.content-row{ padding:15px; }
-.content-info{ width:49.5%; min-width:250px;}
-.content-editor{  width:49.3%; min-width:250px; margin-left:15px; }
-.panel-header{  border-bottom:1px solid #eee; padding:10px 15px; color:#898989;}
-.panel-header-border{  border:1px solid #eee; padding:10px 15px; border-bottom:none; }
-/* tab */
-.tab_content{ width: 100%;  margin: 0 auto;  background:#fff;  }
-#tab_nav {height:42px;background: #fff; border-bottom: 1px solid #EEEEEE}
-#tab_nav li {float:left; padding:0 30px;text-align:center;height: 40px;line-height: 40px;  }
-
-.tab_hover {border-bottom:2px solid #3498db; background: #fff;color: #3498db}
-/*.tab_hover_setting{background:#FC7033;}*/
-.tab_hover a{ color:#3498db!important;display:block;width:100%;height: 100%;font-size:16px;}
-/*.tab_hover_setting a{color:#fff;}*/
-.undis {display:none;}
-.dis {display:block;}
-.tab-info{ }
-.content-editor-inner{ overflow:auto;}
-.tab-info-inner{ overflow:auto; height:600px;  margin:0 0 0px 15px;padding-top: 15px}
-.content-history-inner{height:120px; overflow:auto; padding:15px;}
-.content-history{width:48.7%; min-width:500px; }
-.history-success{ width: 100%; height:40px; line-height: 40px;  background:#eef1f2; color:#666; }
-.history-fail{ width: 100%; height:40px; line-height: 40px;  background:#fdebeb; color:#e53238; }
-.icon-fail{ display:inline-block; padding:0 8px; background:#e53238; color:#fff;}
-.icon-success{ display:inline-block; padding:0 8px; background:#252e38; color:#fff;}
-.info-partly{display: block;box-flex:1;flex:1;-webkit-flex:1;position: relative;}
-.content-output{width:37.5%; min-width:200px;  }
-.content-submit{width:10%; min-width:135px; }
-.content-submitbox{ width:120px; margin: 15px auto; height:135px;}
-.panel-inner{ background:#EFF2F7; margin:15px; padding:15px;}
-.panel-inner-title{ font-size: 14px; color: #666; max-width:85%; line-height:30px;word-wrap: break-word; margin-bottom: 10px}
-.panel-footer{ min-width:1000px; height: 210px!important;}
-/* 弹框 */
-.task-popup-text-center{ text-align: center; color: #333;}
-.task-popup-title{ border-bottom: 1px solid #eee; padding:10px 15px; }
-.task-popup-submit{ margin: 0 auto 15px; width: 120px;}
-/* TPM */
-.task-header{ width: 100%;min-width:1200px; background:url("/images/task/task-bg-header.png");height: 180px;background-size: cover;display: flex;align-items: center;}
-.task-header-info{ width: 1200px; margin: 0 auto; color:#fff}
-.task-header-info h2 a,.task-header-info h2{ font-weight: normal;color:#fff;}
-a.task-header-name{ max-width:200px;}
-.task-header-title{ display: block; max-width:750px;word-wrap: break-word;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.task-header-nav{ width: 100%;min-width:1200px; height:50px;}
-.task-header-navs{ width: 1200px; margin: 0 auto;}
-
-.task-header-navs li{ float: left;}
-.task-header-navs li{ display: block; height: 50px; padding:0 50px; color:#666; text-align: center; font-size: 16px; line-height: 50px;}
-.task-header-navs li:hover,.task-header-navs li:hover a{ color:#FC7033!important;}
-.task-header-navs li.active{border-bottom: 2px solid #FC7033;color:#FC7033;}
-.task-header-navs li.active a{color:#FC7033!important;}
-.task-header-navs li.active .edu-cir-grey,.task-header-navs li:hover .edu-cir-grey,.edu-cir-grey.active{background: #FF7500;color: #FFFFff}
-
-.task-pm-content{ width: 1200px; margin: 0 auto; min-height:566px}
-.task-pm-box{ width: 100%; background: #fff; border: 1px solid #e8e8e8;}
-.task-paner-con{ padding:15px; color:#666; line-height:2.0;}
-.task-paner-con img{ max-width: 100%}
-.panel-form{margin:0 30px 0px 20px; padding:30px 0;  }.panel-form li{ margin-bottom:20px; font-size: 14px; color:#666;}
-
-
-.panel-form-label{ display:inline-block; width:10%; min-width:90px; text-align:right; line-height:40px; color: #666;}
-.panel-form-label1{ display:inline-block; width:20%; min-width:90px; text-align:right; line-height:40px; }
-.panel-form input,.panel-form textarea{ border:1px solid #e2e2e2;color:#666;line-height: 1.9;}
-.panel-box-sizing{-moz-box-sizing: border-box;  /*Firefox3.5+*/-webkit-box-sizing: border-box; /*Safari3.2+*/-o-box-sizing: border-box; /*Opera9.6*/-ms-box-sizing: border-box; /*IE8*/box-sizing: border-box; }
-input.panel-form-width-690{ padding:5px;width:90%; height:40px; min-width:700px;}
-input.panel-form-width-200{ padding:5px; height:40px; width:200px;}
-input.panel-form-width-100{ padding:5px;width:100%; height:40px; min-width:700px;}
-textarea.panel-form-width-100{ padding:5px;width:100%; height:150px; min-width:700px;}
-textarea.panel-form-width-40{ padding:5px;width:100%; height: 40px; min-width:700px;}
-textarea.panel-form-width-690{ padding:5px;width:90%; height:150px; min-width:700px;}
-textarea.panel-form-width2-100{ padding:5px;width:100%; height:40px; min-width:700px;}
-textarea.panel-form-width2-690{ padding:5px;width:90%; height:40px; min-width:700px;}
-textarea.panel-form-width2-695{ padding:5px;width:95%; height:40px; min-width:700px;}
-.panel-form-width-670{ width: 670px; padding:5px;}
-.panel-form-height-150{ height: 150px;}
-.panel-form-height-30{height: 30px;}
-.task-bg-grey{ background:#f3f3f3!important; width:90%; min-width:700px; padding:10px; border:1px solid #f3f3f3;}
-.task-bg-grey-ligh{line-height: 1.9;padding:5px 10px;}
-.task-bg-grey li{ margin-bottom: 0}
-.task-bd-grey{width:680px; padding:10 0px;}
-.panel-form-width-690{ padding:5px;width:90%; min-height:40px; min-width:700px;}
-input.task-tag-input{ border:none; background: none; height:30px; padding:0 5px; color:#888; line-height: 30px;}
-textarea.task-textarea-pd{ padding-bottom: 0; padding-top:0;}
-.task-setting-tab{ min-height:600px;}
-.task-pd15-box{ padding:15px;}
-.mb20{margin-bottom: 20px;}
-input.knowledge_frame{height:28px;line-height:28px;border:none;background:#f3f5f7;}
-/* TPi全屏展示css */
-.content-all-fix{  position: absolute; top:75px; left:15px; right:15px; z-index:99; height: 91%; width: 98.5%;}
-.content-all-fix .big-tab-info-inner{ display: block; height:50%; overflow:auto; margin:15px 0 0px 15px; }
-.content-half-fix{ min-width:450px; margin:0; position: absolute; top:75px; left:15px; z-index:99;}
-.content-half-fix .content-history-inner{height:100%; overflow:auto; }
-.content-half-fix02{margin:0; position: absolute; top:65px; z-index:99; right:45px;}
-.content-history-extend{ height: 98%;overflow:auto;}
-.task-bg-grey .prettyprint{font-size: 9pt;font-family: Courier New,Arial;border: 1px solid #ddd;border-left: 5px solid #6CE26C;background: #f6f6f6;padding: 5px;}
-/* 左右版TPI 20170410byLB */
-#game_task_pass img{cursor: pointer}
-.-fit { position: absolute; top: 0;  right: 0;  bottom: 0;  left: 0;}
-.-layout-v { display: flex; flex-direction: column;box-flex-direction: column;-webkit-flex-direction: column;}
-.page--header { position: fixed;top: 0; left:80px; right: 0; z-index: 7000;background:#33485F; height:44px; padding:10px 0; color:#fff;}
-.page--leftnav{position: fixed;top:0; left:0; right: 0; z-index: 9001;width:80px; height:100%;background:#282c37;}
-.page--body { position: relative;}
-.-margin-t-64 { margin-top: 64px;}
-.-flex { box-flex:1;flex:1;-webkit-flex:1;}
-/*.-flex-auto{flex-basis:100%;}*/
-.split-panel.-fit {position: absolute;}
-.split-panel { position: relative;  overflow: hidden;  min-height: 200px; height: 100%;}
-.-stretch { align-items: stretch;}
-.-layout { display: flex;}
-.split-panel--first { overflow: hidden;}
-.-relative { position: relative;}
-.-bg-white { background-color: #eee;}
-.split-panel.-handle .split-panel--second { padding-left: 2px;}
-/* .split-panel--second { overflow: hidden;} */
-.task-answer-view { position: absolute; top: 0; right: 0; bottom: 0;left: 0; display: flex;
-    flex-direction: column; border-top: 1px solid #515151;}
-.-vertical { flex-direction: column;box-flex-direction: column;-webkit-flex-direction: column;}
-.-layout-h { display: flex;flex-direction: row;box-flex-direction: row;-webkit-flex-direction: row;}
-.-horizontal {flex-direction: row-reverse;box-flex-direction: row-reverse;-webkit-flex-direction: row-reverse;}
-.-scroll{ overflow:auto;}
-.-flex-basic0{flex-basis: 0%!important;box-flex-basis: 0%!important;-webkit-flex-basis: 0%!important; display: none}
-/*王昌------------拖拽增加样式---------------修改*/
-.-flex-basic40{width:40%;box-flex:auto;flex:auto;-webkit-flex:auto;}
-.-flex-basic50{width:60%;box-flex:auto;flex:auto;-webkit-flex:auto;}
-.b-label{width:4px;cursor:ew-resize;background:#2b2b2b;}
-.h-center{height:4px;cursor:ns-resize;background:#333;}
-.-changebg{height:3px;}
-.-brother{width:100%;height:100%;position:absolute;left:0;top:0;z-index:999;}
-.-bg-weightblack{background:#000;}
-.-flex-basic70{box-flex:4 9 auto;flex:4 9 auto;-webkit-flex:4 9 auto;height:70%;}
-/*---------------------------------------------*/
-.-flex-basic60{box-flex:2 1 auto;flex:2 1 auto;-webkit-flex:2 1 auto;height:30%;}
-.-flex-basic100{flex-basis: 100%!important;box-flex-basis: 100%!important;-webkit-flex-basis: 100%!important;}
-.-header-title{ max-width:500px; font-weight: normal;}
-.-header-right{ background:#333;border-radius:25px; padding:5px 15px; height: 30px; position: absolute; right:10px;line-height: 30px;}
-.-header-right-info{ padding:10px; background:#fff; border-radius:3px; top:50px; right:10px;   position: relative;display:none;color:#666;}
-.-header-right-info font { border: 1px solid #dddddd; display: block;border-width: 8px;  position: absolute;  top: -15px;right:20px;border-style: solid; border-color: transparent transparent #fff transparent;  font-size: 0; line-height: 0;}
-.-header-right-box:hover .-header-right-info{ display: block;}
-.-task-bar-bg{ width: 160px; height:15px; border-radius:15px; background:#ff9932; color:#fff; font-size: 12px; line-height: 15px; text-align: right; position: relative; padding-right:10px;}
-.-task-bar-inner{background:#ffc100; display: block; height: 15px;border-radius:15px; position: absolute; top:0; left:0;}
-.-task-widht-10{ width: 10%;}
-.-task-widht-20{ width: 20%;}
-.-task-widht-30{ width: 30%;}
-.-task-widht-40{ width: 40%;}
-.-task-widht-50{ width: 50%;}
-.-task-widht-60{ width: 60%;}
-.-task-widht-70{ width: 70%;}
-.-task-widht-80{ width: 80%;}
-.-task-widht-90{ width: 90%;}
-.-task-widht-100{ width: 100%;}
-.-footer-left{min-height:48px;background:#f5f5f5;}
-.-footer-left ul {width: 100%}
-.-footer-left ul li{ cursor: pointer; color:#666;}
-.-footer-left ul li:hover{ color:#888;}
-.-bg-black{ background:#2b2b2b; color:#f4f1ed;}
-.-bg-darkblack{background:#1D1D1D; color: #fff;}
-.task-answer-view{ border-top:1px solid #515151; background:#333;}
-#blacktab_nav {height:40px;background:#292929; }
-#blacktab_nav li {float:left; padding:0px 25px;text-align:center;height: 40px;line-height: 40px;  }
-#blacktab_nav .add-webssh{position:relative;}
-#blacktab_nav .add-webssh span{position:absolute;top:0;right:5px;color:#fff;cursor:pointer;}
-#blacktab_nav li a{font-size:14px;display:block;width:100%;height: 100%;}
-#blacktab_nav li.code-file-tab{padding: 0px;box-sizing: border-box;padding: 0px 25px;}
-.code-flie-list{display:none;position: absolute;z-index: 5;top:40px;background: #515151;width: 300px;left: 0px;color: #fff;}
-.blue-line{border-left: 3px solid #199ED8!important;padding-left: 5px;}
-.codefile-all{max-height: 122px;overflow-y: auto;overflow-x: hidden;}
-.codefile-all p{text-align: left;cursor: pointer;height: 22px;line-height: 22px;margin-bottom: 3px;padding-left: 5px;border-left: 3px solid #515151;width: 273px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
-.codefile-all p:hover{background: #CCCCCC;color: #333;}
-
-.-task-ces-top{ padding:5px 15px; background:#515151; color:#bfbfbf;}
-.-task-ces-info-left{ display: inline-block; width:100px; text-align: right; }
-.-position-a-r15{ position: absolute; top:5px; right:15px;}
-.-task-ml80{ margin-left: 80px;}
-.page--over { position: fixed;top: 0; left:80px; right: 0; z-index:8000; height:100%; color:#fff;}
-.-task-list-header{  border-bottom:1px solid #eee; padding:5px 15px; color:#898989; font-size: 14px; font-weight: normal;}
-.-task-list-header h3{ font-weight: normal; font-size:16px; color:#333;}
-.-task-list-inner{ background:#EFF2F7; margin:10px; padding:5px;}
-.-task-list-title{ font-size: 14px; color: #666;word-wrap: break-word; font-weight: normal; max-width: 80%;}
-.greytab-inner{ background:#fff; }
-.blacktab-inner{ background:#333;}
-.task-padding16{ padding:16px;}
-.task-padding10{ padding:10px;}
-.task-padding-new{ padding-top: 16px}
-/* TPM统计 20170321byLB */
-.panel-warp-3{ width: 30%; background:#23b181; color:#fff; margin:2.5%; margin-right:0; position: relative; }
-.panel-warp-3-over{ background:#fff;opacity:0.8; color:#29bd8b; width: 100%; height:135px; position: absolute; top:0; left:0;  text-align: center; padding-top:130px;}
-.panel-warp-3-over a{color:#29bd8b; font-size: 18px; text-align:center; font-weight: bold;}
-.panel-warp-img{width: 30px; height: 30px; border-radius:100px;}
-.panel-warp-name{ display:block; max-width:100px;}
-.panel-warp-inner{ padding:15px;}
-.panel-warp-dbg{ background:#29bd8b; padding:15px; height:120px;}
-.panel-warp-dbg li{ margin-bottom:15px; }
-.panel-warp-dbg li:last-child{ margin-bottom:0;}
-.fa-icons-trophy{ position:relative; padding-top:10px;}
-.fa-icons-trophy span{ position:absolute; top:12px; right:10px; color:#f04b27; font-size:14px; font-weight: bold;}
-.fa-icons-flower{ display: inline-block; width: 14px; height: 14px; background:url("../images/task/icons-flower.png") 0 0 no-repeat;}
-.fa-icons-flower:hover{display:inline-block; width: 14px; height: 14px;background:url("../images/task/icons-flower.png") -18px 0 no-repeat;}
-/* 实训首页 20170330byLB */
-.task-index{ width: 1200px; margin:0 auto;}
-.task-index-head{     box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); }
-/*.task-index-head-top{background-image: linear-gradient(to right, rgb(106, 177, 216) 0%, rgb(1, 74, 78) 100%);background-color: rgb(1, 70, 74); padding:30px;}*/
-
-/*background: linear-gradient(to right, rgb(104, 177, 215) 0%, rgb(1,75,79) 100%);*/
-/*background: linear-gradient(to right,#5DDAE4,#23ADC9);*/
-.task-index-head-top{ padding:30px;background:#FCA24B;background: linear-gradient(to right, rgb(104, 177, 215) 0%, rgb(1,75,79) 100%);}
-
-/*.task-index-head-top{ padding:30px;background:#FFA65E;}*/
-.top-xz{position: absolute;border:14px solid #FFFFFF;border-radius: 50%;box-shadow: 0px 2px 10px rgba(142,142,142,0.6);
-    opacity: 0.4;}
-
-.task-index-head-top-course{padding:30px;background:linear-gradient(to right, rgb(69, 191, 165) 0%, rgb(164, 175, 247) 100%);}
-/*linear-gradient(to right, rgb(69, 191, 165) 0%, rgb(164, 175, 247) 100%);*/
-.task-inde-head-title{ color:#fff; }
-.task-index-head-info{ background:#fff; padding:10px 30px;}
-.task-index-head-info li{ width:100px; float: left; text-align: center;  color:#666;}
-
-.task-index-list{ width: 1200px;}
-
-
-.task-index-list-box{box-sizing:border-box; width:23.87%;margin: 0 1.5% 30px 0px; border-radius:2px;border:1px solid #eee; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); color:#666; position:relative; }
-.task-index-list-box:hover{-webkit-animation: bounce-down 1s linear 1;animation: bounce-down 1s linear 1; }
-.task-index-list-box:hover .black-half{display: block;}
-.task-index-list-box:nth-child(4n+0) {margin: 0 0 30px 0;}
-.task-mg8{ margin:0 15px 15px 0px; border-radius:2px; border:1px solid #eee;    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); color:#666; position:relative; }
-.task-index-list-box-top{padding:16px; padding-top:30px; background:#fff; text-align: center; position:relative; height: 160px;}
-.task-index-list-title{ max-width:80%; display: block; margin:10px auto 0px; font-size:14px; font-weight: bold;}
-.task-index-list-user{padding:5px 10px; border-radius:25px;background: #F5F6F7; margin:0px auto 20px; display: inline-block;}
-.task-index-list-box-bottom{ background: #F5F6F7; color:#666; padding:10px 10%; text-align: center;}
-.task-index-list-box-bottom li{ display: inline; margin: 0 5px;}
-.task-index-list-box-bottom2{ background: #fff; color:#666; padding:10px 10%; text-align: center;}
-.task-index-list-box-bottom2 li{ display: inline; margin: 0 5px;}
-.task-vip{ position: absolute; right:15px; top:15px;}
-@-webkit-keyframes bounce-down {
-    25% {-webkit-transform: translateY(-10px);}
-    50%, 100% {-webkit-transform: translateY(0);}
-}
-
-@keyframes bounce-down {
-    25% {transform: translateY(-10px);}
-    50%, 100% {transform: translateY(0);}
-}
-.task-index-list-hover{ position:absolute; top:0; left:0; color:#fff;  width: 100%; height: 100%; border-radius:2px 2px 0 0; }
-.task-index-list-hover p{ margin:15px;overflow:hidden; text-align: left; height: 85%;}
-.task-index-list-hover{ display: none; }
-.task-mg8:hover .task-index-list-hover{display: block;}
-.task-mg8:hover{ box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.15);cursor: pointer;}
-.task-dropdown{}
-.task-dropdown-menu{ min-width: 100px; border: 1px solid rgba(0,0,0,.05);box-shadow: 0 6px 12px rgba(0,0,0,.15);}
-.task-dropdown-menu li a{ color:#666; }
-/* 伸展型搜索 20170330byLB */
-.search-wrapper {position: absolute; font-size:14px; }
-.search-wrapper .input-holder { overflow: hidden; height: 30px;  position: relative; width:32px;background: none;}
-.search-wrapper.active .input-holder { width:320px; border:none; border-bottom:2px solid #ccc;  }
-.search-wrapper .input-holder .search-input { width:100%; height: 30px; font-size:14px;   position: absolute; top:0px; left:0; border:none;   opacity: 0; }
-.search-wrapper.active .input-holder .search-input {  opacity: 1; outline:none; background: none;}
-.search-wrapper .search-icon { width:20px;  height:20px;  border:none;  padding:0px;  outline:none;  position: relative;  z-index: 2;  float:right;  cursor: pointer; background: none; color: #666; top:2px;}
-.search-wrapper .close { position: absolute; z-index: 1;  top:2px; right:20px; width:25px; height:25px; cursor: pointer; opacity: 0;color: #666;}
-.search-wrapper.active .close {right:-35px; opacity: 1;}
-a.sortArrowActiveD {background:url(../images/post_image_list.png) -0px -20px no-repeat; width:7px; height:9px; float:left; margin-top: 10px;margin-left: 5px;}
-a.sortArrowActiveU {background:url(../images/post_image_list.png) -17px -20px no-repeat; width:7px; height:9px; float:left; margin-left:5px; margin-top:10px;}
-.postSort {width:75px; float:right}
-.shixunPostSort {width:60px; float:right}
-.remove_li li{ list-style-type: none!important;}
-
-a.shixun-task-btn { display: inline-block;font-weight: bold;border: none;padding: 0 12px;color: #666;letter-spacing: 1px;text-align: center;font-size: 14px;height: 30px;line-height: 30px;border-radius: 3px; }
-a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weight: bold;border: none;padding: 0 12px;color: #666;letter-spacing: 1px;text-align: center;font-size: 14px;height: 30px;line-height: 30px;border-radius: 3px;  cursor: default;}
-.shixun-panel-list > div:nth-child(odd){ background:#f9f9f9; }
-.shixun-panel-list > div:nth-child(even){ background:#fff; }
-.shixun-panel-list {background: #fff; margin: 0 1px;}
-.shixun-panel-inner { background: #EFF2F7; padding: 15px; height: 70px;}
-.challange_operate{display: none}
-.shixun-panel-inner:hover .challange_operate{display: block}
-.shixun_title {color: #333;font-size: 16px;}
-.g_frame{border: 1px solid #29bd8b;color: #29bd8b;padding:0 5px;border-radius: 3px;text-align:center;}
-.loading-center{text-align: center; align-items: center;justify-content: center;}
-.center{vertical-align: middle;text-align: center; }
-.itoblock_w150{ display: block; float:left; width:150px }
-.itoblock_w75{ display: block; float:left; width:75px }
-
-/*实训--技能勋章*/
-.modal-list li{float: left;padding: 0px 15px;background:#ff7500;color: #ffffff;border-radius: 4px;margin-right: 10px}
-.modal-list li:before{content: '●';color: #FFFFFF;margin-right: 5px;font-size: 14px}
-.modal-list span{width: 8px;height: 8px;border-radius: 50%;background: #ffffff;display: block;float: left;margin-right: 5px;margin-top:10px;}
-
-/* 合作者 20170516byLB */
-.task-partner-list{ padding:15px; border-bottom:1px solid #eee;}
-.task-width33{ width:33.3%;}
-
-.read_only{ -moz-user-select: none; -webkit-user-select: none; }
-
-.task-form-28{width: 28%;padding:0px 10px}
-.lesson{line-height:40px;}
-.lesson_img{position: absolute;right: 10px;top:10px;}
-.lesson_checkbox{display: none;position: absolute;top:40px;left: -1px;width: 100%;border:1px solid #eeeeee;background: #FFFFFF;padding-bottom: 5px;height: 150px;z-index: 10}
-.lesson_checkbox li{height:20px;padding:5px 10px;clear:both;line-height:28px;margin-bottom: 0;}
-.lesson_checkbox li input{float: left;margin: 3px 5px 0px 0px;}
-.lesson_content{width:95%;padding:5px; border: none!important;}
-
-/* 实训首页的搜索 */
-.xy_box{padding:16px;height:180px}
-.task_yx_bo{margin: 0px auto 13px;}
-.course-nav-box{padding:0px 10px;margin:30px 0px}
-.xy_level{width: 80%;margin: 0px auto;border-top: 1px solid #eee;margin-top: 5px;line-height: 35px;}
-.course-nav-row{padding:7px 0px}
-.course-nav-row_item li{width:auto;height: 30px;line-height: 30px;margin: 5px;padding:0px 15px;}
-.course-nav-row_item label{cursor: pointer;}
-.check_item{height:40px;line-height: 40px;padding: 0px 15px;}
-.more_check{position: absolute;bottom: 5px;right: 10px;cursor: pointer;}
-
-
-.bottomdashed1{border-bottom: 1px dashed #eeeeee;}
-
-/*更多和收起*/
-.two_line_lesson{height: 80px;overflow: hidden;}
-.more_line_lesson{max-height: 200px;display: block;}
-.scroll_lesson{overflow-x: hidden;overflow-y: scroll;}
-
-.searchFor{width:auto;}
-.searchFor .searchCon{width:250px;border-bottom:1px solid #cccccc;float: left;height: 30px;}
-.searchFor .searchCon input{border: none;outline: none;height: 29px;width:91%;}
-.searchFor .searchImg{margin:5px 10px 0px 0px;cursor: pointer;}
-.searchFor .search_close{font-size: 18px;float: right;color: #666;height: 29px;line-height: 29px;cursor: pointer;}
-
-.tab_color{color: #bfbfbf!important;}
-
-/*_game_show.html.erb页面新增的一个tab*/
-.comments_item_content img{border-radius: 50%;margin-right: 5px}
-.comment_item_one{flex: 1;}
-.comment_item_bottom{border-bottom: 1px solid #efefef;display: flex}
-.comment_item_top{border-top: 1px solid #efefef}
-.comment_item_left_green{border-left: 3px solid #29bd8b}
-.return_item{height: 20px;line-height: 20px;margin-top: 5px;}
-.comment-input{width: 100%;margin: 10px;margin-right: 17px;}
-.comment_position{ position: absolute;bottom: 8px;right: 20px}
-
-/*-------新建阶段添加选项部分----------*/
-.option-item{border:1px solid #e2e2e2;}
-.option-item,.add-option-item{display: block;width: 38px;height: 38px;text-align: center;line-height: 38px;border-radius: 4px}
-.check-option-bg{background: #FF7500;color: #ffffff!important;border: 1px solid #FF7500}
-.add-option-input{padding: 5px;width: 90%;height: 40px;min-width: 700px;}
-.add-option-input a{display: block;width: 100%;height: 100%;cursor: pointer}
-.position-delete{position: absolute;right: -22px;top: 12px;cursor: pointer}
-
-/*--------TPI的答案选项卡------*/
-.quiz-task-options:not(.-compact) {padding:10px;}
-.card {position: relative;border-radius: 2px;overflow: hidden;}
-/*.card:hover{background: #3f3f3f;}*/
-.card-check{background: #3498db!important;}
-.-justify {justify-content: space-between;}
-.-center { align-items: center;min-height: 66px;}
-.markdown {letter-spacing: 0;line-height: 1.6;word-wrap: break-word;word-break: break-word;}
-.markdown code {padding:0;line-height: 23px;margin: 0;font-family: "微软雅黑","宋体";}
-
-
-/*模拟实战---加载等待*/
-.loading_all{background:#ffffff;z-index: 100000;width: 100%;height: 100%;position: fixed;left: 0px;top:0px;text-align: center;}
-.loading_main img{border-radius: 4px;}
-.loading_main span{font-size: 44px;font-weight: bold;color: #ff7500;letter-spacing: 5px;margin-left: 5px;}
-.load{width: auto;top:50%;margin-top:-100px;position: relative;}
-.loading_seconde{color: #ff7500;letter-spacing: 3px;font-size: 16px;}
-#ajax-indicator-base {
-    position: absolute; /* fixed not supported by IE*//*
-
-    top: 50%;
-    left: 50%;
-    margin-left: -20px;
-    margin-top: -40px;
-    width: 20%;
-    height: 5%; */
-    width: 100%;
-    height: 100%;
-    font-weight:bold;
-    text-align:center;
-    /*padding:0.6em;*/
-    z-index:9999;
-    background: rgba(225,225,225,0);
-}
-html>body #ajax-indicator-base { position: fixed; }
-
-#ajax-indicator-base embed{
-    position: relative;
-    top: 40%;
-    width: 40px;
-    height: 40px;
-    margin-left: -40px;
-    left: 50%;
-}
-/*#ajax-indicator-base span{
-    color:#fff;
-    background-position: 0% 40%;
-    background-repeat: no-repeat;
-    *//*background-image: url(/images/loading.gif);*//*
-    padding-left: 26px;
-    vertical-align: bottom;
-    z-index:999;
-}*/
-
-.save-tip{display:none;position: fixed;top:0px;left: 0px;width: 100%;height: 100%;}
-.save-tip-content{position: absolute;top:50%;left: 50%;margin-left: -36px;margin-top:-19px;background: rgba(0,0,0,0.7);color:#fff;padding:5px 15px;border-radius: 4px}
-.empty{background: #494A4C;display: inline; margin: 0 2px; padding: 0 3px;}
-.tab-key{background: #494A4C;display: inline; margin: 0 2px; padding: 0 6px;}
-
-/*二次回复的提示语的样式*/
-.points-data-tip-top{position:absolute;left:100px;top:-30px;opacity:.7;width:150px;height:30px;z-index:9999;display:none;}
-.data-tip-top1{position:relative;box-shadow:0px 0px 8px #000;background:#000;color:#fff;word-wrap: break-word;
-    text-align:center;border-radius:4px;padding:0 10px;border:1px solid #000;}
-.data-tip-top1:after,.data-tip-top1:before{position: absolute;content:'';width:0;height:0;left: 45%;bottom:-10px;border-left: 5px solid transparent;
-    border-right: 5px solid transparent;border-top: 10px solid #000;}
-.data-tip-top1:before{bottom:-11px;}
-/*选择题tab切换*/
-.nav_option li{overflow: hidden;width: 110px; text-align: center;cursor: pointer;height: 38px;line-height: 38px;border-top-right-radius: 5px;border-top-left-radius: 5px;border:1px solid #e2e2e2;border-bottom: 0px;color: #FF7500;border-right: none;}
-.nav_option li:last-child{border-right: 1px solid #e2e2e2;}
-.nav_option li a{width: 100%;height: 100%;display: block;}
-
-/*---------------------试卷----------------------*/
-.question_item_con{font-weight: normal!important;border:1px solid #EEEEEE!important;color: #333!important;background: #FFFFff!important;position: relative}
-.exam_operator{cursor: pointer;position: absolute;right: 15px;top: 11px;}
-.question_item_con .write_answer{border-top:1px solid #EEEEEE;background:#EFF9FD;padding: 10px 15px;text-align:justify;}
-.add_item_part{width: auto;padding: 2px 20px;border: 1px solid #ff7500;border-radius: 3px;margin-left: 15px;cursor: pointer;color: #ff7500!important;}
-.add_item_part:hover{color:#fff!important;background-color: #ff7500}
-
-/*作业问答*/
-.work_search_ul{border: 1px solid #EEEEEE;border-radius: 4px;}
-.work_search_ul li span{display:block;float: left;height: 38px;line-height: 38px}
-.work_search_ul li{border-bottom: 1px dashed #EEEEEE;}
-.work_search_ul li:last-child{border-bottom: none}
-.work_search_ul .magic-radio + label,.work_search_ul .magic-checkbox + label{top:5px}
-
-/*更新提示*/
-.update_back_main{display: none;position: fixed;left: 0px;top:0px;background: rgba(0,0,0,0.3);width: 100%;z-index: 7001;height: 100%;}
-.tip-panel-animate-left{position: absolute;z-index: 9000;left: 80px;top:290px;background: #FFFFff;width: 430px;height: 140px;border-radius: 3px;}
-.tip-panel-animate{position: absolute;z-index: 10001;right: 4px;top:40px;background: #FFFFff;width: 430px;height: 140px;border-radius: 3px;display: none}
-.tip-panel-animate .tip-img,.tip-panel-animate-left .tip-img{width: 130px;text-align: center;background-color: #E8E9ED;height: 100%;}
-.tip-panel-animate .tip-img img,.tip-panel-animate-left .tip-img img{width: 70px;height: 70px;margin: 35px 30px;}
-.tip-right-con{width: 69.7%;height: 100%;}
-.tip-operator-btn{width:100%;border-top: 1px solid #eee;height: 40px;position: absolute;right: 0px;bottom: 0px;text-align: center;}
-.tip-operator-btn a,.tip-operator-btn span{height: 100%;text-align: center;line-height: 40px;width: 50%}
-.tip-operator-btn a:hover,.tip-operator-btn span:hover{background-color:#f9f9f9}
-.tip-operator-btn a:first-child,.tip-operator-btn span:first-child{border-right: 1px solid #eee;width: 49.5%}
-.animate-tip{animation:rightToleft 1s;}
-.animate-tip-hide{animation:leftToright 1s;}
-@keyframes rightToleft
-{
-    from {right: -400px;}
-    to {right: 4px;}
-}
-@keyframes leftToright
-{
-    from {right: 4px;}
-    to {right: -420px;}
-}
-.animate-tip-l{animation:rightToleft-l 1s;}
-.animate-tip-hide-l{animation:leftToright-l 1s;}
-@keyframes rightToleft-l
-{
-    from {left: -400px;}
-    to {left: 80px;}
-}
-@keyframes leftToright-l
-{
-    from {left: 80px;}
-    to {left: -420px;}
-}
-
-
-/*----------实训TPI图片查看效果--------------*/
-.photo_display{box-sizing: border-box;width: 100%;position: fixed;top: 0px;left: 0px;padding-top: 64px;padding-left: 80px;background: rgba(0,0,0,0);height: 100%;z-index: 100}
-.photo_display .task-popup{width: 100%!important;height: 100%!important;}
-#picture-content img{max-width: 100%;height: 400px;display: block; margin:0px auto;margin-bottom: 20px;}
-#box-img{width:100%;height:100%;display:table;text-align:center;background:#fff;}
-#box-img span{display:table-cell;vertical-align:middle;}
-
-/*-------------学员统计  通关排行榜------------*/
-.rankings_num{position: absolute;width: 100%;top: 3px;height: 15px;line-height: 15px;left: 0px;font-size: 12px;color: #F24B27;text-align: center}
-
-.census_main{width: 1086px;overflow: hidden;position: relative;min-height: 350px;margin:0px 45px;}
-.census_main ul{position: absolute;min-width: 1086px;}
-.census_main ul>li{float:left;width: 260px;margin:6px 6px;min-height: 335px}
-.census_main ul>li:nth-child(4n){margin-right: 0px;}
-.part_main{border-radius: 5px;background: #FFFFff;border:1px solid #EEEEEE}
-.part_main .part_top{background: #FF9E6A;color: #FFFFff;padding: 10px 15px;border-radius: 5px 5px 0px 0px;}
-.wipe{display: none;cursor: pointer;line-height: 332px;color:#FFFFff!important;font-size:16px ;width: 100%;position: absolute;left: 0px;top:0px;background:rgba(0,0,0,0.3);height: 100%;z-index: 3;text-align: center;border-radius: 5px; }
-.part_main:hover .wipe{display: block;}
-
-
-#census_left,#census_right{display: none;position: absolute;cursor: pointer;background: #FCF2EC;padding: 10px 5px;width: 35px;box-sizing: border-box;top:122.5px;text-align: center}
-#census_left i,#census_right i{color:#FBBD81;}
-
-
-/*-----------实训配置、评测脚本-------------*/
-.edit_script_text .test_script_text{word-break: break-all;background-color: #f7f7f7;}
-.edit_script_text .CodeMirror-lines{padding: 0px!important;padding-bottom: 4px}
-
-
-/* FONT PATH
- * -------------------------- */
-/*!
- * Font Awesome Free 5.0.13 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- */
-.fa,.fab,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{animation:a 2s infinite linear}.fa-pulse{animation:a 1s infinite steps(8)}@keyframes a{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";transform:scaleX(-1)}.fa-flip-vertical{transform:scaleY(-1)}.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-horizontal.fa-flip-vertical{transform:scale(-1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-accessible-icon:before{content:"\f368"}.fa-accusoft:before{content:"\f369"}.fa-address-book:before{content:"\f2b9"}.fa-address-card:before{content:"\f2bb"}.fa-adjust:before{content:"\f042"}.fa-adn:before{content:"\f170"}.fa-adversal:before{content:"\f36a"}.fa-affiliatetheme:before{content:"\f36b"}.fa-algolia:before{content:"\f36c"}.fa-align-center:before{content:"\f037"}.fa-align-justify:before{content:"\f039"}.fa-align-left:before{content:"\f036"}.fa-align-right:before{content:"\f038"}.fa-allergies:before{content:"\f461"}.fa-amazon:before{content:"\f270"}.fa-amazon-pay:before{content:"\f42c"}.fa-ambulance:before{content:"\f0f9"}.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-amilia:before{content:"\f36d"}.fa-anchor:before{content:"\f13d"}.fa-android:before{content:"\f17b"}.fa-angellist:before{content:"\f209"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-down:before{content:"\f107"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angrycreative:before{content:"\f36e"}.fa-angular:before{content:"\f420"}.fa-app-store:before{content:"\f36f"}.fa-app-store-ios:before{content:"\f370"}.fa-apper:before{content:"\f371"}.fa-apple:before{content:"\f179"}.fa-apple-pay:before{content:"\f415"}.fa-archive:before{content:"\f187"}.fa-arrow-alt-circle-down:before{content:"\f358"}.fa-arrow-alt-circle-left:before{content:"\f359"}.fa-arrow-alt-circle-right:before{content:"\f35a"}.fa-arrow-alt-circle-up:before{content:"\f35b"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-down:before{content:"\f063"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrows-alt:before{content:"\f0b2"}.fa-arrows-alt-h:before{content:"\f337"}.fa-arrows-alt-v:before{content:"\f338"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asterisk:before{content:"\f069"}.fa-asymmetrik:before{content:"\f372"}.fa-at:before{content:"\f1fa"}.fa-audible:before{content:"\f373"}.fa-audio-description:before{content:"\f29e"}.fa-autoprefixer:before{content:"\f41c"}.fa-avianex:before{content:"\f374"}.fa-aviato:before{content:"\f421"}.fa-aws:before{content:"\f375"}.fa-backward:before{content:"\f04a"}.fa-balance-scale:before{content:"\f24e"}.fa-ban:before{content:"\f05e"}.fa-band-aid:before{content:"\f462"}.fa-bandcamp:before{content:"\f2d5"}.fa-barcode:before{content:"\f02a"}.fa-bars:before{content:"\f0c9"}.fa-baseball-ball:before{content:"\f433"}.fa-basketball-ball:before{content:"\f434"}.fa-bath:before{content:"\f2cd"}.fa-battery-empty:before{content:"\f244"}.fa-battery-full:before{content:"\f240"}.fa-battery-half:before{content:"\f242"}.fa-battery-quarter:before{content:"\f243"}.fa-battery-three-quarters:before{content:"\f241"}.fa-bed:before{content:"\f236"}.fa-beer:before{content:"\f0fc"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-bell:before{content:"\f0f3"}.fa-bell-slash:before{content:"\f1f6"}.fa-bicycle:before{content:"\f206"}.fa-bimobject:before{content:"\f378"}.fa-binoculars:before{content:"\f1e5"}.fa-birthday-cake:before{content:"\f1fd"}.fa-bitbucket:before{content:"\f171"}.fa-bitcoin:before{content:"\f379"}.fa-bity:before{content:"\f37a"}.fa-black-tie:before{content:"\f27e"}.fa-blackberry:before{content:"\f37b"}.fa-blender:before{content:"\f517"}.fa-blind:before{content:"\f29d"}.fa-blogger:before{content:"\f37c"}.fa-blogger-b:before{content:"\f37d"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-bold:before{content:"\f032"}.fa-bolt:before{content:"\f0e7"}.fa-bomb:before{content:"\f1e2"}.fa-book:before{content:"\f02d"}.fa-book-open:before{content:"\f518"}.fa-bookmark:before{content:"\f02e"}.fa-bowling-ball:before{content:"\f436"}.fa-box:before{content:"\f466"}.fa-box-open:before{content:"\f49e"}.fa-boxes:before{content:"\f468"}.fa-braille:before{content:"\f2a1"}.fa-briefcase:before{content:"\f0b1"}.fa-briefcase-medical:before{content:"\f469"}.fa-broadcast-tower:before{content:"\f519"}.fa-broom:before{content:"\f51a"}.fa-btc:before{content:"\f15a"}.fa-bug:before{content:"\f188"}.fa-building:before{content:"\f1ad"}.fa-bullhorn:before{content:"\f0a1"}.fa-bullseye:before{content:"\f140"}.fa-burn:before{content:"\f46a"}.fa-buromobelexperte:before{content:"\f37f"}.fa-bus:before{content:"\f207"}.fa-buysellads:before{content:"\f20d"}.fa-calculator:before{content:"\f1ec"}.fa-calendar:before{content:"\f133"}.fa-calendar-alt:before{content:"\f073"}.fa-calendar-check:before{content:"\f274"}.fa-calendar-minus:before{content:"\f272"}.fa-calendar-plus:before{content:"\f271"}.fa-calendar-times:before{content:"\f273"}.fa-camera:before{content:"\f030"}.fa-camera-retro:before{content:"\f083"}.fa-capsules:before{content:"\f46b"}.fa-car:before{content:"\f1b9"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-caret-square-down:before{content:"\f150"}.fa-caret-square-left:before{content:"\f191"}.fa-caret-square-right:before{content:"\f152"}.fa-caret-square-up:before{content:"\f151"}.fa-caret-up:before{content:"\f0d8"}.fa-cart-arrow-down:before{content:"\f218"}.fa-cart-plus:before{content:"\f217"}.fa-cc-amazon-pay:before{content:"\f42d"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-apple-pay:before{content:"\f416"}.fa-cc-diners-club:before{content:"\f24c"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-cc-visa:before{content:"\f1f0"}.fa-centercode:before{content:"\f380"}.fa-certificate:before{content:"\f0a3"}.fa-chalkboard:before{content:"\f51b"}.fa-chalkboard-teacher:before{content:"\f51c"}.fa-chart-area:before{content:"\f1fe"}.fa-chart-bar:before{content:"\f080"}.fa-chart-line:before{content:"\f201"}.fa-chart-pie:before{content:"\f200"}.fa-check:before{content:"\f00c"}.fa-check-circle:before{content:"\f058"}.fa-check-square:before{content:"\f14a"}.fa-chess:before{content:"\f439"}.fa-chess-bishop:before{content:"\f43a"}.fa-chess-board:before{content:"\f43c"}.fa-chess-king:before{content:"\f43f"}.fa-chess-knight:before{content:"\f441"}.fa-chess-pawn:before{content:"\f443"}.fa-chess-queen:before{content:"\f445"}.fa-chess-rook:before{content:"\f447"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-down:before{content:"\f078"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-chevron-up:before{content:"\f077"}.fa-child:before{content:"\f1ae"}.fa-chrome:before{content:"\f268"}.fa-church:before{content:"\f51d"}.fa-circle:before{content:"\f111"}.fa-circle-notch:before{content:"\f1ce"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clipboard-list:before{content:"\f46d"}.fa-clock:before{content:"\f017"}.fa-clone:before{content:"\f24d"}.fa-closed-captioning:before{content:"\f20a"}.fa-cloud:before{content:"\f0c2"}.fa-cloud-download-alt:before{content:"\f381"}.fa-cloud-upload-alt:before{content:"\f382"}.fa-cloudscale:before{content:"\f383"}.fa-cloudsmith:before{content:"\f384"}.fa-cloudversify:before{content:"\f385"}.fa-code:before{content:"\f121"}.fa-code-branch:before{content:"\f126"}.fa-codepen:before{content:"\f1cb"}.fa-codiepie:before{content:"\f284"}.fa-coffee:before{content:"\f0f4"}.fa-cog:before{content:"\f013"}.fa-cogs:before{content:"\f085"}.fa-coins:before{content:"\f51e"}.fa-columns:before{content:"\f0db"}.fa-comment:before{content:"\f075"}.fa-comment-alt:before{content:"\f27a"}.fa-comment-dots:before{content:"\f4ad"}.fa-comment-slash:before{content:"\f4b3"}.fa-comments:before{content:"\f086"}.fa-compact-disc:before{content:"\f51f"}.fa-compass:before{content:"\f14e"}.fa-compress:before{content:"\f066"}.fa-connectdevelop:before{content:"\f20e"}.fa-contao:before{content:"\f26d"}.fa-copy:before{content:"\f0c5"}.fa-copyright:before{content:"\f1f9"}.fa-couch:before{content:"\f4b8"}.fa-cpanel:before{content:"\f388"}.fa-creative-commons:before{content:"\f25e"}.fa-creative-commons-by:before{content:"\f4e7"}.fa-creative-commons-nc:before{content:"\f4e8"}.fa-creative-commons-nc-eu:before{content:"\f4e9"}.fa-creative-commons-nc-jp:before{content:"\f4ea"}.fa-creative-commons-nd:before{content:"\f4eb"}.fa-creative-commons-pd:before{content:"\f4ec"}.fa-creative-commons-pd-alt:before{content:"\f4ed"}.fa-creative-commons-remix:before{content:"\f4ee"}.fa-creative-commons-sa:before{content:"\f4ef"}.fa-creative-commons-sampling:before{content:"\f4f0"}.fa-creative-commons-sampling-plus:before{content:"\f4f1"}.fa-creative-commons-share:before{content:"\f4f2"}.fa-credit-card:before{content:"\f09d"}.fa-crop:before{content:"\f125"}.fa-crosshairs:before{content:"\f05b"}.fa-crow:before{content:"\f520"}.fa-crown:before{content:"\f521"}.fa-css3:before{content:"\f13c"}.fa-css3-alt:before{content:"\f38b"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-cut:before{content:"\f0c4"}.fa-cuttlefish:before{content:"\f38c"}.fa-d-and-d:before{content:"\f38d"}.fa-dashcube:before{content:"\f210"}.fa-database:before{content:"\f1c0"}.fa-deaf:before{content:"\f2a4"}.fa-delicious:before{content:"\f1a5"}.fa-deploydog:before{content:"\f38e"}.fa-deskpro:before{content:"\f38f"}.fa-desktop:before{content:"\f108"}.fa-deviantart:before{content:"\f1bd"}.fa-diagnoses:before{content:"\f470"}.fa-dice:before{content:"\f522"}.fa-dice-five:before{content:"\f523"}.fa-dice-four:before{content:"\f524"}.fa-dice-one:before{content:"\f525"}.fa-dice-six:before{content:"\f526"}.fa-dice-three:before{content:"\f527"}.fa-dice-two:before{content:"\f528"}.fa-digg:before{content:"\f1a6"}.fa-digital-ocean:before{content:"\f391"}.fa-discord:before{content:"\f392"}.fa-discourse:before{content:"\f393"}.fa-divide:before{content:"\f529"}.fa-dna:before{content:"\f471"}.fa-dochub:before{content:"\f394"}.fa-docker:before{content:"\f395"}.fa-dollar-sign:before{content:"\f155"}.fa-dolly:before{content:"\f472"}.fa-dolly-flatbed:before{content:"\f474"}.fa-donate:before{content:"\f4b9"}.fa-door-closed:before{content:"\f52a"}.fa-door-open:before{content:"\f52b"}.fa-dot-circle:before{content:"\f192"}.fa-dove:before{content:"\f4ba"}.fa-download:before{content:"\f019"}.fa-draft2digital:before{content:"\f396"}.fa-dribbble:before{content:"\f17d"}.fa-dribbble-square:before{content:"\f397"}.fa-dropbox:before{content:"\f16b"}.fa-drupal:before{content:"\f1a9"}.fa-dumbbell:before{content:"\f44b"}.fa-dyalog:before{content:"\f399"}.fa-earlybirds:before{content:"\f39a"}.fa-ebay:before{content:"\f4f4"}.fa-edge:before{content:"\f282"}.fa-edit:before{content:"\f044"}.fa-eject:before{content:"\f052"}.fa-elementor:before{content:"\f430"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-ember:before{content:"\f423"}.fa-empire:before{content:"\f1d1"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-square:before{content:"\f199"}.fa-envira:before{content:"\f299"}.fa-equals:before{content:"\f52c"}.fa-eraser:before{content:"\f12d"}.fa-erlang:before{content:"\f39d"}.fa-ethereum:before{content:"\f42e"}.fa-etsy:before{content:"\f2d7"}.fa-euro-sign:before{content:"\f153"}.fa-exchange-alt:before{content:"\f362"}.fa-exclamation:before{content:"\f12a"}.fa-exclamation-circle:before{content:"\f06a"}.fa-exclamation-triangle:before{content:"\f071"}.fa-expand:before{content:"\f065"}.fa-expand-arrows-alt:before{content:"\f31e"}.fa-expeditedssl:before{content:"\f23e"}.fa-external-link-alt:before{content:"\f35d"}.fa-external-link-square-alt:before{content:"\f360"}.fa-eye:before{content:"\f06e"}.fa-eye-dropper:before{content:"\f1fb"}.fa-eye-slash:before{content:"\f070"}.fa-facebook:before{content:"\f09a"}.fa-facebook-f:before{content:"\f39e"}.fa-facebook-messenger:before{content:"\f39f"}.fa-facebook-square:before{content:"\f082"}.fa-fast-backward:before{content:"\f049"}.fa-fast-forward:before{content:"\f050"}.fa-fax:before{content:"\f1ac"}.fa-feather:before{content:"\f52d"}.fa-female:before{content:"\f182"}.fa-fighter-jet:before{content:"\f0fb"}.fa-file:before{content:"\f15b"}.fa-file-alt:before{content:"\f15c"}.fa-file-archive:before{content:"\f1c6"}.fa-file-audio:before{content:"\f1c7"}.fa-file-code:before{content:"\f1c9"}.fa-file-excel:before{content:"\f1c3"}.fa-file-image:before{content:"\f1c5"}.fa-file-medical:before{content:"\f477"}.fa-file-medical-alt:before{content:"\f478"}.fa-file-pdf:before{content:"\f1c1"}.fa-file-powerpoint:before{content:"\f1c4"}.fa-file-video:before{content:"\f1c8"}.fa-file-word:before{content:"\f1c2"}.fa-film:before{content:"\f008"}.fa-filter:before{content:"\f0b0"}.fa-fire:before{content:"\f06d"}.fa-fire-extinguisher:before{content:"\f134"}.fa-firefox:before{content:"\f269"}.fa-first-aid:before{content:"\f479"}.fa-first-order:before{content:"\f2b0"}.fa-first-order-alt:before{content:"\f50a"}.fa-firstdraft:before{content:"\f3a1"}.fa-flag:before{content:"\f024"}.fa-flag-checkered:before{content:"\f11e"}.fa-flask:before{content:"\f0c3"}.fa-flickr:before{content:"\f16e"}.fa-flipboard:before{content:"\f44d"}.fa-fly:before{content:"\f417"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-font:before{content:"\f031"}.fa-font-awesome:before{content:"\f2b4"}.fa-font-awesome-alt:before{content:"\f35c"}.fa-font-awesome-flag:before{content:"\f425"}.fa-font-awesome-logo-full:before{content:"\f4e6"}.fa-fonticons:before{content:"\f280"}.fa-fonticons-fi:before{content:"\f3a2"}.fa-football-ball:before{content:"\f44e"}.fa-fort-awesome:before{content:"\f286"}.fa-fort-awesome-alt:before{content:"\f3a3"}.fa-forumbee:before{content:"\f211"}.fa-forward:before{content:"\f04e"}.fa-foursquare:before{content:"\f180"}.fa-free-code-camp:before{content:"\f2c5"}.fa-freebsd:before{content:"\f3a4"}.fa-frog:before{content:"\f52e"}.fa-frown:before{content:"\f119"}.fa-fulcrum:before{content:"\f50b"}.fa-futbol:before{content:"\f1e3"}.fa-galactic-republic:before{content:"\f50c"}.fa-galactic-senate:before{content:"\f50d"}.fa-gamepad:before{content:"\f11b"}.fa-gas-pump:before{content:"\f52f"}.fa-gavel:before{content:"\f0e3"}.fa-gem:before{content:"\f3a5"}.fa-genderless:before{content:"\f22d"}.fa-get-pocket:before{content:"\f265"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-gift:before{content:"\f06b"}.fa-git:before{content:"\f1d3"}.fa-git-square:before{content:"\f1d2"}.fa-github:before{content:"\f09b"}.fa-github-alt:before{content:"\f113"}.fa-github-square:before{content:"\f092"}.fa-gitkraken:before{content:"\f3a6"}.fa-gitlab:before{content:"\f296"}.fa-gitter:before{content:"\f426"}.fa-glass-martini:before{content:"\f000"}.fa-glasses:before{content:"\f530"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-globe:before{content:"\f0ac"}.fa-gofore:before{content:"\f3a7"}.fa-golf-ball:before{content:"\f450"}.fa-goodreads:before{content:"\f3a8"}.fa-goodreads-g:before{content:"\f3a9"}.fa-google:before{content:"\f1a0"}.fa-google-drive:before{content:"\f3aa"}.fa-google-play:before{content:"\f3ab"}.fa-google-plus:before{content:"\f2b3"}.fa-google-plus-g:before{content:"\f0d5"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-wallet:before{content:"\f1ee"}.fa-graduation-cap:before{content:"\f19d"}.fa-gratipay:before{content:"\f184"}.fa-grav:before{content:"\f2d6"}.fa-greater-than:before{content:"\f531"}.fa-greater-than-equal:before{content:"\f532"}.fa-gripfire:before{content:"\f3ac"}.fa-grunt:before{content:"\f3ad"}.fa-gulp:before{content:"\f3ae"}.fa-h-square:before{content:"\f0fd"}.fa-hacker-news:before{content:"\f1d4"}.fa-hacker-news-square:before{content:"\f3af"}.fa-hand-holding:before{content:"\f4bd"}.fa-hand-holding-heart:before{content:"\f4be"}.fa-hand-holding-usd:before{content:"\f4c0"}.fa-hand-lizard:before{content:"\f258"}.fa-hand-paper:before{content:"\f256"}.fa-hand-peace:before{content:"\f25b"}.fa-hand-point-down:before{content:"\f0a7"}.fa-hand-point-left:before{content:"\f0a5"}.fa-hand-point-right:before{content:"\f0a4"}.fa-hand-point-up:before{content:"\f0a6"}.fa-hand-pointer:before{content:"\f25a"}.fa-hand-rock:before{content:"\f255"}.fa-hand-scissors:before{content:"\f257"}.fa-hand-spock:before{content:"\f259"}.fa-hands:before{content:"\f4c2"}.fa-hands-helping:before{content:"\f4c4"}.fa-handshake:before{content:"\f2b5"}.fa-hashtag:before{content:"\f292"}.fa-hdd:before{content:"\f0a0"}.fa-heading:before{content:"\f1dc"}.fa-headphones:before{content:"\f025"}.fa-heart:before{content:"\f004"}.fa-heartbeat:before{content:"\f21e"}.fa-helicopter:before{content:"\f533"}.fa-hips:before{content:"\f452"}.fa-hire-a-helper:before{content:"\f3b0"}.fa-history:before{content:"\f1da"}.fa-hockey-puck:before{content:"\f453"}.fa-home:before{content:"\f015"}.fa-hooli:before{content:"\f427"}.fa-hospital:before{content:"\f0f8"}.fa-hospital-alt:before{content:"\f47d"}.fa-hospital-symbol:before{content:"\f47e"}.fa-hotjar:before{content:"\f3b1"}.fa-hourglass:before{content:"\f254"}.fa-hourglass-end:before{content:"\f253"}.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-start:before{content:"\f251"}.fa-houzz:before{content:"\f27c"}.fa-html5:before{content:"\f13b"}.fa-hubspot:before{content:"\f3b2"}.fa-i-cursor:before{content:"\f246"}.fa-id-badge:before{content:"\f2c1"}.fa-id-card:before{content:"\f2c2"}.fa-id-card-alt:before{content:"\f47f"}.fa-image:before{content:"\f03e"}.fa-images:before{content:"\f302"}.fa-imdb:before{content:"\f2d8"}.fa-inbox:before{content:"\f01c"}.fa-indent:before{content:"\f03c"}.fa-industry:before{content:"\f275"}.fa-infinity:before{content:"\f534"}.fa-info:before{content:"\f129"}.fa-info-circle:before{content:"\f05a"}.fa-instagram:before{content:"\f16d"}.fa-internet-explorer:before{content:"\f26b"}.fa-ioxhost:before{content:"\f208"}.fa-italic:before{content:"\f033"}.fa-itunes:before{content:"\f3b4"}.fa-itunes-note:before{content:"\f3b5"}.fa-java:before{content:"\f4e4"}.fa-jedi-order:before{content:"\f50e"}.fa-jenkins:before{content:"\f3b6"}.fa-joget:before{content:"\f3b7"}.fa-joomla:before{content:"\f1aa"}.fa-js:before{content:"\f3b8"}.fa-js-square:before{content:"\f3b9"}.fa-jsfiddle:before{content:"\f1cc"}.fa-key:before{content:"\f084"}.fa-keybase:before{content:"\f4f5"}.fa-keyboard:before{content:"\f11c"}.fa-keycdn:before{content:"\f3ba"}.fa-kickstarter:before{content:"\f3bb"}.fa-kickstarter-k:before{content:"\f3bc"}.fa-kiwi-bird:before{content:"\f535"}.fa-korvue:before{content:"\f42f"}.fa-language:before{content:"\f1ab"}.fa-laptop:before{content:"\f109"}.fa-laravel:before{content:"\f3bd"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-leaf:before{content:"\f06c"}.fa-leanpub:before{content:"\f212"}.fa-lemon:before{content:"\f094"}.fa-less:before{content:"\f41d"}.fa-less-than:before{content:"\f536"}.fa-less-than-equal:before{content:"\f537"}.fa-level-down-alt:before{content:"\f3be"}.fa-level-up-alt:before{content:"\f3bf"}.fa-life-ring:before{content:"\f1cd"}.fa-lightbulb:before{content:"\f0eb"}.fa-line:before{content:"\f3c0"}.fa-link:before{content:"\f0c1"}.fa-linkedin:before{content:"\f08c"}.fa-linkedin-in:before{content:"\f0e1"}.fa-linode:before{content:"\f2b8"}.fa-linux:before{content:"\f17c"}.fa-lira-sign:before{content:"\f195"}.fa-list:before{content:"\f03a"}.fa-list-alt:before{content:"\f022"}.fa-list-ol:before{content:"\f0cb"}.fa-list-ul:before{content:"\f0ca"}.fa-location-arrow:before{content:"\f124"}.fa-lock:before{content:"\f023"}.fa-lock-open:before{content:"\f3c1"}.fa-long-arrow-alt-down:before{content:"\f309"}.fa-long-arrow-alt-left:before{content:"\f30a"}.fa-long-arrow-alt-right:before{content:"\f30b"}.fa-long-arrow-alt-up:before{content:"\f30c"}.fa-low-vision:before{content:"\f2a8"}.fa-lyft:before{content:"\f3c3"}.fa-magento:before{content:"\f3c4"}.fa-magic:before{content:"\f0d0"}.fa-magnet:before{content:"\f076"}.fa-male:before{content:"\f183"}.fa-mandalorian:before{content:"\f50f"}.fa-map:before{content:"\f279"}.fa-map-marker:before{content:"\f041"}.fa-map-marker-alt:before{content:"\f3c5"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-mars:before{content:"\f222"}.fa-mars-double:before{content:"\f227"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mastodon:before{content:"\f4f6"}.fa-maxcdn:before{content:"\f136"}.fa-medapps:before{content:"\f3c6"}.fa-medium:before{content:"\f23a"}.fa-medium-m:before{content:"\f3c7"}.fa-medkit:before{content:"\f0fa"}.fa-medrt:before{content:"\f3c8"}.fa-meetup:before{content:"\f2e0"}.fa-meh:before{content:"\f11a"}.fa-memory:before{content:"\f538"}.fa-mercury:before{content:"\f223"}.fa-microchip:before{content:"\f2db"}.fa-microphone:before{content:"\f130"}.fa-microphone-alt:before{content:"\f3c9"}.fa-microphone-alt-slash:before{content:"\f539"}.fa-microphone-slash:before{content:"\f131"}.fa-microsoft:before{content:"\f3ca"}.fa-minus:before{content:"\f068"}.fa-minus-circle:before{content:"\f056"}.fa-minus-square:before{content:"\f146"}.fa-mix:before{content:"\f3cb"}.fa-mixcloud:before{content:"\f289"}.fa-mizuni:before{content:"\f3cc"}.fa-mobile:before{content:"\f10b"}.fa-mobile-alt:before{content:"\f3cd"}.fa-modx:before{content:"\f285"}.fa-monero:before{content:"\f3d0"}.fa-money-bill:before{content:"\f0d6"}.fa-money-bill-alt:before{content:"\f3d1"}.fa-money-bill-wave:before{content:"\f53a"}.fa-money-bill-wave-alt:before{content:"\f53b"}.fa-money-check:before{content:"\f53c"}.fa-money-check-alt:before{content:"\f53d"}.fa-moon:before{content:"\f186"}.fa-motorcycle:before{content:"\f21c"}.fa-mouse-pointer:before{content:"\f245"}.fa-music:before{content:"\f001"}.fa-napster:before{content:"\f3d2"}.fa-neuter:before{content:"\f22c"}.fa-newspaper:before{content:"\f1ea"}.fa-nintendo-switch:before{content:"\f418"}.fa-node:before{content:"\f419"}.fa-node-js:before{content:"\f3d3"}.fa-not-equal:before{content:"\f53e"}.fa-notes-medical:before{content:"\f481"}.fa-npm:before{content:"\f3d4"}.fa-ns8:before{content:"\f3d5"}.fa-nutritionix:before{content:"\f3d6"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-old-republic:before{content:"\f510"}.fa-opencart:before{content:"\f23d"}.fa-openid:before{content:"\f19b"}.fa-opera:before{content:"\f26a"}.fa-optin-monster:before{content:"\f23c"}.fa-osi:before{content:"\f41a"}.fa-outdent:before{content:"\f03b"}.fa-page4:before{content:"\f3d7"}.fa-pagelines:before{content:"\f18c"}.fa-paint-brush:before{content:"\f1fc"}.fa-palette:before{content:"\f53f"}.fa-palfed:before{content:"\f3d8"}.fa-pallet:before{content:"\f482"}.fa-paper-plane:before{content:"\f1d8"}.fa-paperclip:before{content:"\f0c6"}.fa-parachute-box:before{content:"\f4cd"}.fa-paragraph:before{content:"\f1dd"}.fa-parking:before{content:"\f540"}.fa-paste:before{content:"\f0ea"}.fa-patreon:before{content:"\f3d9"}.fa-pause:before{content:"\f04c"}.fa-pause-circle:before{content:"\f28b"}.fa-paw:before{content:"\f1b0"}.fa-paypal:before{content:"\f1ed"}.fa-pen-square:before{content:"\f14b"}.fa-pencil-alt:before{content:"\f303"}.fa-people-carry:before{content:"\f4ce"}.fa-percent:before{content:"\f295"}.fa-percentage:before{content:"\f541"}.fa-periscope:before{content:"\f3da"}.fa-phabricator:before{content:"\f3db"}.fa-phoenix-framework:before{content:"\f3dc"}.fa-phoenix-squadron:before{content:"\f511"}.fa-phone:before{content:"\f095"}.fa-phone-slash:before{content:"\f3dd"}.fa-phone-square:before{content:"\f098"}.fa-phone-volume:before{content:"\f2a0"}.fa-php:before{content:"\f457"}.fa-pied-piper:before{content:"\f2ae"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-pied-piper-hat:before{content:"\f4e5"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-piggy-bank:before{content:"\f4d3"}.fa-pills:before{content:"\f484"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-p:before{content:"\f231"}.fa-pinterest-square:before{content:"\f0d3"}.fa-plane:before{content:"\f072"}.fa-play:before{content:"\f04b"}.fa-play-circle:before{content:"\f144"}.fa-playstation:before{content:"\f3df"}.fa-plug:before{content:"\f1e6"}.fa-plus:before{content:"\f067"}.fa-plus-circle:before{content:"\f055"}.fa-plus-square:before{content:"\f0fe"}.fa-podcast:before{content:"\f2ce"}.fa-poo:before{content:"\f2fe"}.fa-portrait:before{content:"\f3e0"}.fa-pound-sign:before{content:"\f154"}.fa-power-off:before{content:"\f011"}.fa-prescription-bottle:before{content:"\f485"}.fa-prescription-bottle-alt:before{content:"\f486"}.fa-print:before{content:"\f02f"}.fa-procedures:before{content:"\f487"}.fa-product-hunt:before{content:"\f288"}.fa-project-diagram:before{content:"\f542"}.fa-pushed:before{content:"\f3e1"}.fa-puzzle-piece:before{content:"\f12e"}.fa-python:before{content:"\f3e2"}.fa-qq:before{content:"\f1d6"}.fa-qrcode:before{content:"\f029"}.fa-question:before{content:"\f128"}.fa-question-circle:before{content:"\f059"}.fa-quidditch:before{content:"\f458"}.fa-quinscape:before{content:"\f459"}.fa-quora:before{content:"\f2c4"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-r-project:before{content:"\f4f7"}.fa-random:before{content:"\f074"}.fa-ravelry:before{content:"\f2d9"}.fa-react:before{content:"\f41b"}.fa-readme:before{content:"\f4d5"}.fa-rebel:before{content:"\f1d0"}.fa-receipt:before{content:"\f543"}.fa-recycle:before{content:"\f1b8"}.fa-red-river:before{content:"\f3e3"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-alien:before{content:"\f281"}.fa-reddit-square:before{content:"\f1a2"}.fa-redo:before{content:"\f01e"}.fa-redo-alt:before{content:"\f2f9"}.fa-registered:before{content:"\f25d"}.fa-rendact:before{content:"\f3e4"}.fa-renren:before{content:"\f18b"}.fa-reply:before{content:"\f3e5"}.fa-reply-all:before{content:"\f122"}.fa-replyd:before{content:"\f3e6"}.fa-researchgate:before{content:"\f4f8"}.fa-resolving:before{content:"\f3e7"}.fa-retweet:before{content:"\f079"}.fa-ribbon:before{content:"\f4d6"}.fa-road:before{content:"\f018"}.fa-robot:before{content:"\f544"}.fa-rocket:before{content:"\f135"}.fa-rocketchat:before{content:"\f3e8"}.fa-rockrms:before{content:"\f3e9"}.fa-rss:before{content:"\f09e"}.fa-rss-square:before{content:"\f143"}.fa-ruble-sign:before{content:"\f158"}.fa-ruler:before{content:"\f545"}.fa-ruler-combined:before{content:"\f546"}.fa-ruler-horizontal:before{content:"\f547"}.fa-ruler-vertical:before{content:"\f548"}.fa-rupee-sign:before{content:"\f156"}.fa-safari:before{content:"\f267"}.fa-sass:before{content:"\f41e"}.fa-save:before{content:"\f0c7"}.fa-schlix:before{content:"\f3ea"}.fa-school:before{content:"\f549"}.fa-screwdriver:before{content:"\f54a"}.fa-scribd:before{content:"\f28a"}.fa-search:before{content:"\f002"}.fa-search-minus:before{content:"\f010"}.fa-search-plus:before{content:"\f00e"}.fa-searchengin:before{content:"\f3eb"}.fa-seedling:before{content:"\f4d8"}.fa-sellcast:before{content:"\f2da"}.fa-sellsy:before{content:"\f213"}.fa-server:before{content:"\f233"}.fa-servicestack:before{content:"\f3ec"}.fa-share:before{content:"\f064"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-share-square:before{content:"\f14d"}.fa-shekel-sign:before{content:"\f20b"}.fa-shield-alt:before{content:"\f3ed"}.fa-ship:before{content:"\f21a"}.fa-shipping-fast:before{content:"\f48b"}.fa-shirtsinbulk:before{content:"\f214"}.fa-shoe-prints:before{content:"\f54b"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-shopping-cart:before{content:"\f07a"}.fa-shower:before{content:"\f2cc"}.fa-sign:before{content:"\f4d9"}.fa-sign-in-alt:before{content:"\f2f6"}.fa-sign-language:before{content:"\f2a7"}.fa-sign-out-alt:before{content:"\f2f5"}.fa-signal:before{content:"\f012"}.fa-simplybuilt:before{content:"\f215"}.fa-sistrix:before{content:"\f3ee"}.fa-sitemap:before{content:"\f0e8"}.fa-sith:before{content:"\f512"}.fa-skull:before{content:"\f54c"}.fa-skyatlas:before{content:"\f216"}.fa-skype:before{content:"\f17e"}.fa-slack:before{content:"\f198"}.fa-slack-hash:before{content:"\f3ef"}.fa-sliders-h:before{content:"\f1de"}.fa-slideshare:before{content:"\f1e7"}.fa-smile:before{content:"\f118"}.fa-smoking:before{content:"\f48d"}.fa-smoking-ban:before{content:"\f54d"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-snowflake:before{content:"\f2dc"}.fa-sort:before{content:"\f0dc"}.fa-sort-alpha-down:before{content:"\f15d"}.fa-sort-alpha-up:before{content:"\f15e"}.fa-sort-amount-down:before{content:"\f160"}.fa-sort-amount-up:before{content:"\f161"}.fa-sort-down:before{content:"\f0dd"}.fa-sort-numeric-down:before{content:"\f162"}.fa-sort-numeric-up:before{content:"\f163"}.fa-sort-up:before{content:"\f0de"}.fa-soundcloud:before{content:"\f1be"}.fa-space-shuttle:before{content:"\f197"}.fa-speakap:before{content:"\f3f3"}.fa-spinner:before{content:"\f110"}.fa-spotify:before{content:"\f1bc"}.fa-square:before{content:"\f0c8"}.fa-square-full:before{content:"\f45c"}.fa-stack-exchange:before{content:"\f18d"}.fa-stack-overflow:before{content:"\f16c"}.fa-star:before{content:"\f005"}.fa-star-half:before{content:"\f089"}.fa-staylinked:before{content:"\f3f5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-steam-symbol:before{content:"\f3f6"}.fa-step-backward:before{content:"\f048"}.fa-step-forward:before{content:"\f051"}.fa-stethoscope:before{content:"\f0f1"}.fa-sticker-mule:before{content:"\f3f7"}.fa-sticky-note:before{content:"\f249"}.fa-stop:before{content:"\f04d"}.fa-stop-circle:before{content:"\f28d"}.fa-stopwatch:before{content:"\f2f2"}.fa-store:before{content:"\f54e"}.fa-store-alt:before{content:"\f54f"}.fa-strava:before{content:"\f428"}.fa-stream:before{content:"\f550"}.fa-street-view:before{content:"\f21d"}.fa-strikethrough:before{content:"\f0cc"}.fa-stripe:before{content:"\f429"}.fa-stripe-s:before{content:"\f42a"}.fa-stroopwafel:before{content:"\f551"}.fa-studiovinari:before{content:"\f3f8"}.fa-stumbleupon:before{content:"\f1a4"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-subscript:before{content:"\f12c"}.fa-subway:before{content:"\f239"}.fa-suitcase:before{content:"\f0f2"}.fa-sun:before{content:"\f185"}.fa-superpowers:before{content:"\f2dd"}.fa-superscript:before{content:"\f12b"}.fa-supple:before{content:"\f3f9"}.fa-sync:before{content:"\f021"}.fa-sync-alt:before{content:"\f2f1"}.fa-syringe:before{content:"\f48e"}.fa-table:before{content:"\f0ce"}.fa-table-tennis:before{content:"\f45d"}.fa-tablet:before{content:"\f10a"}.fa-tablet-alt:before{content:"\f3fa"}.fa-tablets:before{content:"\f490"}.fa-tachometer-alt:before{content:"\f3fd"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-tape:before{content:"\f4db"}.fa-tasks:before{content:"\f0ae"}.fa-taxi:before{content:"\f1ba"}.fa-teamspeak:before{content:"\f4f9"}.fa-telegram:before{content:"\f2c6"}.fa-telegram-plane:before{content:"\f3fe"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-terminal:before{content:"\f120"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-th:before{content:"\f00a"}.fa-th-large:before{content:"\f009"}.fa-th-list:before{content:"\f00b"}.fa-themeisle:before{content:"\f2b2"}.fa-thermometer:before{content:"\f491"}.fa-thermometer-empty:before{content:"\f2cb"}.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thumbs-down:before{content:"\f165"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbtack:before{content:"\f08d"}.fa-ticket-alt:before{content:"\f3ff"}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-tint:before{content:"\f043"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-toolbox:before{content:"\f552"}.fa-trade-federation:before{content:"\f513"}.fa-trademark:before{content:"\f25c"}.fa-train:before{content:"\f238"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-trash:before{content:"\f1f8"}.fa-trash-alt:before{content:"\f2ed"}.fa-tree:before{content:"\f1bb"}.fa-trello:before{content:"\f181"}.fa-tripadvisor:before{content:"\f262"}.fa-trophy:before{content:"\f091"}.fa-truck:before{content:"\f0d1"}.fa-truck-loading:before{content:"\f4de"}.fa-truck-moving:before{content:"\f4df"}.fa-tshirt:before{content:"\f553"}.fa-tty:before{content:"\f1e4"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-tv:before{content:"\f26c"}.fa-twitch:before{content:"\f1e8"}.fa-twitter:before{content:"\f099"}.fa-twitter-square:before{content:"\f081"}.fa-typo3:before{content:"\f42b"}.fa-uber:before{content:"\f402"}.fa-uikit:before{content:"\f403"}.fa-umbrella:before{content:"\f0e9"}.fa-underline:before{content:"\f0cd"}.fa-undo:before{content:"\f0e2"}.fa-undo-alt:before{content:"\f2ea"}.fa-uniregistry:before{content:"\f404"}.fa-universal-access:before{content:"\f29a"}.fa-university:before{content:"\f19c"}.fa-unlink:before{content:"\f127"}.fa-unlock:before{content:"\f09c"}.fa-unlock-alt:before{content:"\f13e"}.fa-untappd:before{content:"\f405"}.fa-upload:before{content:"\f093"}.fa-usb:before{content:"\f287"}.fa-user:before{content:"\f007"}.fa-user-alt:before{content:"\f406"}.fa-user-alt-slash:before{content:"\f4fa"}.fa-user-astronaut:before{content:"\f4fb"}.fa-user-check:before{content:"\f4fc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-clock:before{content:"\f4fd"}.fa-user-cog:before{content:"\f4fe"}.fa-user-edit:before{content:"\f4ff"}.fa-user-friends:before{content:"\f500"}.fa-user-graduate:before{content:"\f501"}.fa-user-lock:before{content:"\f502"}.fa-user-md:before{content:"\f0f0"}.fa-user-minus:before{content:"\f503"}.fa-user-ninja:before{content:"\f504"}.fa-user-plus:before{content:"\f234"}.fa-user-secret:before{content:"\f21b"}.fa-user-shield:before{content:"\f505"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-tie:before{content:"\f508"}.fa-user-times:before{content:"\f235"}.fa-users:before{content:"\f0c0"}.fa-users-cog:before{content:"\f509"}.fa-ussunnah:before{content:"\f407"}.fa-utensil-spoon:before{content:"\f2e5"}.fa-utensils:before{content:"\f2e7"}.fa-vaadin:before{content:"\f408"}.fa-venus:before{content:"\f221"}.fa-venus-double:before{content:"\f226"}.fa-venus-mars:before{content:"\f228"}.fa-viacoin:before{content:"\f237"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-vial:before{content:"\f492"}.fa-vials:before{content:"\f493"}.fa-viber:before{content:"\f409"}.fa-video:before{content:"\f03d"}.fa-video-slash:before{content:"\f4e2"}.fa-vimeo:before{content:"\f40a"}.fa-vimeo-square:before{content:"\f194"}.fa-vimeo-v:before{content:"\f27d"}.fa-vine:before{content:"\f1ca"}.fa-vk:before{content:"\f189"}.fa-vnv:before{content:"\f40b"}.fa-volleyball-ball:before{content:"\f45f"}.fa-volume-down:before{content:"\f027"}.fa-volume-off:before{content:"\f026"}.fa-volume-up:before{content:"\f028"}.fa-vuejs:before{content:"\f41f"}.fa-walking:before{content:"\f554"}.fa-wallet:before{content:"\f555"}.fa-warehouse:before{content:"\f494"}.fa-weibo:before{content:"\f18a"}.fa-weight:before{content:"\f496"}.fa-weixin:before{content:"\f1d7"}.fa-whatsapp:before{content:"\f232"}.fa-whatsapp-square:before{content:"\f40c"}.fa-wheelchair:before{content:"\f193"}.fa-whmcs:before{content:"\f40d"}.fa-wifi:before{content:"\f1eb"}.fa-wikipedia-w:before{content:"\f266"}.fa-window-close:before{content:"\f410"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-windows:before{content:"\f17a"}.fa-wine-glass:before{content:"\f4e3"}.fa-wolf-pack-battalion:before{content:"\f514"}.fa-won-sign:before{content:"\f159"}.fa-wordpress:before{content:"\f19a"}.fa-wordpress-simple:before{content:"\f411"}.fa-wpbeginner:before{content:"\f297"}.fa-wpexplorer:before{content:"\f2de"}.fa-wpforms:before{content:"\f298"}.fa-wrench:before{content:"\f0ad"}.fa-x-ray:before{content:"\f497"}.fa-xbox:before{content:"\f412"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-y-combinator:before{content:"\f23b"}.fa-yahoo:before{content:"\f19e"}.fa-yandex:before{content:"\f413"}.fa-yandex-international:before{content:"\f414"}.fa-yelp:before{content:"\f1e9"}.fa-yen-sign:before{content:"\f157"}.fa-yoast:before{content:"\f2b1"}.fa-youtube:before{content:"\f167"}.fa-youtube-square:before{content:"\f431"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:Font Awesome\ 5 Brands;font-style:normal;font-weight:400;src:url(../webfonts/fa-brands-400.eot);src:url(../webfonts/fa-brands-400.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.woff) format("woff"),url(../webfonts/fa-brands-400.ttf) format("truetype"),url(../webfonts/fa-brands-400.svg#fontawesome) format("svg")}.fab{font-family:Font Awesome\ 5 Brands}@font-face{font-family:Font Awesome\ 5 Free;font-style:normal;font-weight:400;src:url(../webfonts/fa-regular-400.eot);src:url(../webfonts/fa-regular-400.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.woff) format("woff"),url(../webfonts/fa-regular-400.ttf) format("truetype"),url(../webfonts/fa-regular-400.svg#fontawesome) format("svg")}.far{font-weight:400}@font-face{font-family:Font Awesome\ 5 Free;font-style:normal;font-weight:900;src:url(../webfonts/fa-solid-900.eot);src:url(../webfonts/fa-solid-900.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.woff) format("woff"),url(../webfonts/fa-solid-900.ttf) format("truetype"),url(../webfonts/fa-solid-900.svg#fontawesome) format("svg")}.fa,.far,.fas{font-family:Font Awesome\ 5 Free}.fa,.fas{font-weight:900}
-
-/*! Editor.md v1.5.0 | editormd.min.css | Open source online markdown editor. | MIT License | By: Pandao | https://github.com/pandao/editor.md | 2015-06-09 */
-@charset "UTF-8";/*! prefixes.scss v0.1.0 | Author: Pandao | https://github.com/pandao/prefixes.scss | MIT license | Copyright (c) 2015 */.fa-ul,.markdown-body .task-list-item,li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}.editormd-form br,.markdown-body hr:after{clear:both}.editormd{width:90%;height:640px;margin:0 auto 15px;text-align:left;overflow:hidden;position:relative;border:1px solid #ddd;font-family:"微软雅黑", "Meiryo UI","Microsoft YaHei","Malgun Gothic","Segoe UI","Trebuchet MS",Helvetica,Monaco,monospace,Tahoma,STXihei,"华文细黑",STHeiti,"Helvetica Neue","Droid Sans","wenquanyi micro hei",FreeSans,Arimo,Arial,SimSun,"宋体",Heiti,"黑体",sans-serif}.editormd *,.editormd :after,.editormd :before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.editormd a{text-decoration:none}.editormd img{border:none;vertical-align:middle}.editormd .editormd-html-textarea,.editormd .editormd-markdown-textarea,.editormd>textarea{width:0;height:0;outline:0;resize:none}.editormd .editormd-html-textarea,.editormd .editormd-markdown-textarea{display:none}.editormd button,.editormd input[type=text],.editormd input[type=button],.editormd input[type=submit],.editormd select,.editormd textarea{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;appearance:none}.editormd ::-webkit-scrollbar{height:10px;width:7px;background:rgba(0,0,0,.1)}.editormd ::-webkit-scrollbar:hover{background:rgba(0,0,0,.2)}.editormd ::-webkit-scrollbar-thumb{background:rgba(0,0,0,.3);-webkit-border-radius:6px;-moz-border-radius:6px;-ms-border-radius:6px;-o-border-radius:6px;border-radius:6px}.editormd ::-webkit-scrollbar-thumb:hover{-webkit-box-shadow:inset 1px 1px 1px rgba(0,0,0,.25);-moz-box-shadow:inset 1px 1px 1px rgba(0,0,0,.25);-ms-box-shadow:inset 1px 1px 1px rgba(0,0,0,.25);-o-box-shadow:inset 1px 1px 1px rgba(0,0,0,.25);box-shadow:inset 1px 1px 1px rgba(0,0,0,.25);background-color:rgba(0,0,0,.4)}.editormd-user-unselect{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.editormd-toolbar{width:100%;min-height:37px;background:#fff;display:none;position:absolute;top:0;left:0;z-index:10;border-bottom:1px solid #ddd}.editormd-toolbar-container{padding:0 8px;min-height:35px;-o-user-select:none;user-select:none}.editormd-toolbar-container,.markdown-body .octicon{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.editormd-menu,.markdown-body ol,.markdown-body td,.markdown-body th,.markdown-body ul{padding:0}.editormd-menu{margin:0;list-style:none}.editormd-menu>li{margin:0;padding:5px 1px;display:inline-block;position:relative}.editormd-menu>li.divider{display:inline-block;text-indent:-9999px;margin:0 5px;height:65%;border-right:1px solid #ddd}.editormd-menu>li>a{outline:0;color:#666;display:inline-block;min-width:24px;font-size:16px;text-decoration:none;text-align:center;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;-o-border-radius:2px;border-radius:2px;border:1px solid #fff;transition:all 300ms ease-out}.editormd-dropdown-menu>li>a:hover,.editormd-menu>li>a{-webkit-transition:all 300ms ease-out;-moz-transition:all 300ms ease-out}.editormd-menu>li>a.active,.editormd-menu>li>a:hover{border:1px solid #ddd;background:#eee}.editormd-menu>li>a>.fa{text-align:center;display:block;padding:5px}.editormd-menu>li>a>.editormd-bold{padding:5px 2px;display:inline-block;font-weight:700}.editormd-menu>li:hover .editormd-dropdown-menu{display:block}.editormd-menu>li+li>a{margin-left:3px}.editormd-dropdown-menu{display:none;background:#fff;border:1px solid #ddd;width:148px;list-style:none;position:absolute;top:33px;left:0;z-index:100;-webkit-box-shadow:1px 2px 6px rgba(0,0,0,.15);-moz-box-shadow:1px 2px 6px rgba(0,0,0,.15);-ms-box-shadow:1px 2px 6px rgba(0,0,0,.15);-o-box-shadow:1px 2px 6px rgba(0,0,0,.15);box-shadow:1px 2px 6px rgba(0,0,0,.15)}.editormd-dropdown-menu:after,.editormd-dropdown-menu:before{width:0;height:0;display:block;content:"";position:absolute;top:-11px;left:8px;border:5px solid transparent}.editormd-dropdown-menu:before{border-bottom-color:#ccc}.editormd-dropdown-menu:after{border-bottom-color:#fff;top:-10px}.editormd-dropdown-menu>li>a{color:#666;display:block;text-decoration:none;padding:8px 10px}.editormd-dropdown-menu>li>a:hover{background:#f6f6f6;transition:all 300ms ease-out}.editormd-dropdown-menu>li+li{border-top:1px solid #ddd}.editormd-container{margin:0;width:100%;height:100%;overflow:hidden;padding:35px 0 0;position:relative;background:#fff;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.editormd-dialog{color:#666;position:fixed;z-index:99999;display:none;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 0 10px rgba(0,0,0,.3);-moz-box-shadow:0 0 10px rgba(0,0,0,.3);-ms-box-shadow:0 0 10px rgba(0,0,0,.3);-o-box-shadow:0 0 10px rgba(0,0,0,.3);box-shadow:0 0 10px rgba(0,0,0,.3);background:#fff;font-size:14px}.editormd-dialog-container{position:relative;padding:20px;line-height:1.4}.editormd-dialog-container h1{font-size:24px;margin-bottom:10px}.editormd-dialog-container h1 .fa{color:#2C7EEA;padding-right:5px}.editormd-dialog-container h1 small{padding-left:5px;font-weight:400;font-size:12px;color:#999}.editormd-dialog-container select{color:#999;padding:3px 8px;border:1px solid #ddd}.editormd-dialog-close{position:absolute;top:12px;right:15px;font-size:18px;color:#ccc;-webkit-transition:color 300ms ease-out;-moz-transition:color 300ms ease-out;transition:color 300ms ease-out}.editormd-dialog-close:hover{color:#999}.editormd-dialog-header{padding:11px 20px;border-bottom:1px solid #eee;-webkit-transition:background 300ms ease-out;-moz-transition:background 300ms ease-out;transition:background 300ms ease-out}.editormd-dialog-header:hover{background:#f6f6f6}.editormd-dialog-title{font-size:14px}.editormd-dialog-footer{padding:10px 0 0;text-align:right}.editormd-dialog-info{width:420px}.editormd-dialog-info h1{font-weight:400}.editormd-dialog-info .editormd-dialog-container{padding:20px 25px 25px}.editormd-dialog-info .editormd-dialog-close{top:10px;right:10px}.editormd-dialog-info .hover-link:hover,.editormd-dialog-info p>a{color:#2196F3}.editormd-dialog-info .hover-link{color:#666}.editormd-dialog-info a .fa-external-link{display:none}.editormd-dialog-info a:hover{color:#2196F3}.editormd-dialog-info a:hover .fa-external-link{display:inline-block}.editormd-container-mask,.editormd-dialog-mask,.editormd-mask{display:none;width:100%;height:100%;position:absolute;top:0;left:0}.editormd-dialog-mask-bg,.editormd-mask{background:#fff;opacity:.5;filter:alpha(opacity=50)}.editormd-mask{position:fixed;background:#000;opacity:.2;filter:alpha(opacity=20);z-index:99998}.editormd-container-mask,.editormd-dialog-mask-con{background:url(../images/loading.gif)center center no-repeat;-webkit-background-size:32px 32px;-moz-background-size:32px 32px;-o-background-size:32px 32px;background-size:32px 32px}.editormd-container-mask{z-index:20;display:block;background-color:#fff}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-device-pixel-ratio:2){.editormd-container-mask,.editormd-dialog-mask-con{background-image:url(../images/loading@2x.gif)}}@media only screen and (-webkit-min-device-pixel-ratio:3),only screen and (min-device-pixel-ratio:3){.editormd-container-mask,.editormd-dialog-mask-con{background-image:url(../images/loading@3x.gif)}}.editormd-code-block-dialog textarea,.editormd-preformatted-text-dialog textarea{width:100%;height:400px;margin-bottom:6px;overflow:auto;border:1px solid #eee;background:#fff;padding:15px;resize:none}.editormd-code-toolbar{color:#999;font-size:14px;margin:-5px 0 10px}.editormd-grid-table{width:99%;display:table;border:1px solid #ddd;border-collapse:collapse}.editormd-grid-table-row{width:100%;display:table-row}.editormd-grid-table-row a{font-size:1.4em;width:5%;height:36px;color:#999;text-align:center;display:table-cell;vertical-align:middle;border:1px solid #ddd;text-decoration:none;-webkit-transition:background-color 300ms ease-out,color 100ms ease-in;-moz-transition:background-color 300ms ease-out,color 100ms ease-in;transition:background-color 300ms ease-out,color 100ms ease-in}.editormd-grid-table-row a.selected{color:#666;background-color:#eee}.editormd-grid-table-row a:hover{color:#777;background-color:#f6f6f6}.editormd-tab-head{list-style:none;border-bottom:1px solid #ddd}.editormd-tab-head li{display:inline-block}.editormd-tab-head li a{color:#999;display:block;padding:6px 12px 5px;text-align:center;text-decoration:none;margin-bottom:-1px;border:1px solid #ddd;-webkit-border-top-left-radius:3px;-moz-border-top-left-radius:3px;-ms-border-top-left-radius:3px;-o-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-top-right-radius:3px;-moz-border-top-right-radius:3px;-ms-border-top-right-radius:3px;-o-border-top-right-radius:3px;border-top-right-radius:3px;background:#f6f6f6;-webkit-transition:all 300ms ease-out;-moz-transition:all 300ms ease-out;transition:all 300ms ease-out}.editormd-tab-head li a:hover{color:#666;background:#eee}.editormd-tab-head li.active a{color:#666;background:#fff;border-bottom-color:#fff}.editormd-tab-head li+li{margin-left:3px}.editormd-tab-box{padding:20px 0}.editormd-form{color:#666}.editormd-form label{float:left;display:block;width:75px;text-align:left;padding:7px 0 15px 5px;margin:0 0 2px;font-weight:400}.editormd-form iframe{display:none}.editormd-form input:focus{outline:0}.editormd-form input[type=text],.editormd-form input[type=number]{color:#999;padding:4px;border:1px solid #ddd}.editormd-form input[type=number]{width:40px;display:inline-block;padding:6px 8px}.editormd-form input[type=text]{display:inline-block;width:264px}.editormd-form .fa-btns{display:inline-block}.editormd-form .fa-btns a{color:#999;padding:7px 10px 0 0;display:inline-block;text-decoration:none;text-align:center}.editormd-form .fa-btns .fa{font-size:1.3em}.editormd-form .fa-btns label{float:none;display:inline-block;width:auto;text-align:left;padding:0 0 0 5px;cursor:pointer}.fa-fw,.fa-li{text-align:center}.editormd-dialog-container .editormd-btn,.editormd-dialog-container button,.editormd-dialog-container input[type=submit],.editormd-dialog-footer .editormd-btn,.editormd-dialog-footer button,.editormd-dialog-footer input[type=submit],.editormd-form .editormd-btn,.editormd-form button,.editormd-form input[type=submit]{color:#666;min-width:75px;cursor:pointer;background:#fff;padding:3px 10px;border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px;-webkit-transition:background 300ms ease-out;-moz-transition:background 300ms ease-out;transition:background 300ms ease-out}.editormd-dialog-container .editormd-btn:hover,.editormd-dialog-container button:hover,.editormd-dialog-container input[type=submit]:hover,.editormd-dialog-footer .editormd-btn:hover,.editormd-dialog-footer button:hover,.editormd-dialog-footer input[type=submit]:hover,.editormd-form .editormd-btn:hover,.editormd-form button:hover,.editormd-form input[type=submit]:hover{background:#eee}.editormd-dialog-container .editormd-btn+.editormd-btn,.editormd-dialog-footer .editormd-btn+.editormd-btn,.editormd-form .editormd-btn+.editormd-btn{margin-left:8px}.editormd-file-input{width:75px;height:32px;margin-left:8px;position:relative;display:inline-block}.editormd-file-input input[type=file]{width:75px;height:32px;opacity:0;cursor:pointer;background:#000;display:inline-block;position:absolute;top:0;right:0}.editormd-file-input input[type=file]::-webkit-file-upload-button{visibility:hidden}.editormd-file-input:hover input[type=submit]{background:#eee}.editormd .CodeMirror,.editormd-preview{display:inline-block;width:50%;height:100%;vertical-align:top;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0}.editormd-preview{position:absolute;top:35px;right:0;overflow:auto;line-height:1.6;display:none;background:#fff}.fa,.fa-stack{display:inline-block}.editormd .CodeMirror{z-index:10;float:left;border-right:1px solid #ddd;font-size:14px;font-family:"YaHei Consolas Hybrid",Consolas,"微软雅黑","Meiryo UI","Malgun Gothic","Segoe UI","Trebuchet MS",Helvetica,Monaco,courier,monospace;line-height:1.6;margin-top:35px}.editormd .CodeMirror pre{font-size:14px!important;padding:0 12px}.editormd .CodeMirror-linenumbers{padding:0 5px}.editormd .CodeMirror-focused .CodeMirror-selected,.editormd .CodeMirror-selected{background:#70B7FF}.editormd .CodeMirror,.editormd .CodeMirror-scroll,.editormd .editormd-preview{-webkit-overflow-scrolling:touch}.editormd .styled-background{background-color:#ff7}.editormd .CodeMirror-focused .cm-matchhighlight{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);background-position:bottom;background-repeat:repeat-x}.editormd .CodeMirror-empty.CodeMirror-focused{outline:0}.editormd .CodeMirror pre.CodeMirror-placeholder{color:#999}.editormd .cm-trailingspace{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QUXCToH00Y1UgAAACFJREFUCNdjPMDBUc/AwNDAAAFMTAwMDA0OP34wQgX/AQBYgwYEx4f9lQAAAABJRU5ErkJggg==);background-position:bottom left;background-repeat:repeat-x}.editormd .cm-tab{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=)right no-repeat}/*! prefixes.scss v0.1.0 | Author: Pandao | https://github.com/pandao/prefixes.scss | MIT license | Copyright (c) 2015 */
-
-/* 重置掉些样式 */
-.tpi_content p, .tpi_content dl, .tpi_content ol, .tpi_content ul,
-.tpi_content h1, .tpi_content h2, .tpi_content h3, .tpi_content h4, .tpi_content h5 {
-    margin-bottom: 0px;
-}
-
-/*  Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */
-/*  这里包括了 markdown里的样式 如h4等等*/
-@font-face{font-family:FontAwesome;src:url(../fonts/fontawesome-webfont.eot?v=4.3.0);src:url(../fonts/fontawesome-webfont.eot?#iefix&v=4.3.0)format("embedded-opentype"),url(../fonts/fontawesome-webfont.woff2?v=4.3.0)format("woff2"),url(../fonts/fontawesome-webfont.woff?v=4.3.0)format("woff"),url(../fonts/fontawesome-webfont.ttf?v=4.3.0)format("truetype"),url(../fonts/fontawesome-webfont.svg?v=4.3.0#fontawesomeregular)format("svg");font-weight:400;font-style:normal}.fa{font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;transform:translate(0,0)}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em}.fa-ul{padding-left:0;margin-left:2.14285714em}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:.08em solid #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1,1);-ms-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1,-1);-ms-transform:scale(1,-1);transform:scale(1,-1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-rotate-90{filter:none}.fa-stack{position:relative;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-close:before,.fa-remove:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-cog:before,.fa-gear:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-repeat:before,.fa-rotate-right:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-image:before,.fa-photo:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-exclamation-triangle:before,.fa-warning:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-cogs:before,.fa-gears:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-floppy-o:before,.fa-save:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-bars:before,.fa-navicon:before,.fa-reorder:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-sort:before,.fa-unsorted:before{content:"\f0dc"}.fa-sort-desc:before,.fa-sort-down:before{content:"\f0dd"}.fa-sort-asc:before,.fa-sort-up:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-gavel:before,.fa-legal:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-bolt:before,.fa-flash:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-clipboard:before,.fa-paste:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-chain-broken:before,.fa-unlink:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-caret-square-o-down:before,.fa-toggle-down:before{content:"\f150"}.fa-caret-square-o-up:before,.fa-toggle-up:before{content:"\f151"}.fa-caret-square-o-right:before,.fa-toggle-right:before{content:"\f152"}.fa-eur:before,.fa-euro:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-inr:before,.fa-rupee:before{content:"\f156"}.fa-cny:before,.fa-jpy:before,.fa-rmb:before,.fa-yen:before{content:"\f157"}.fa-rouble:before,.fa-rub:before,.fa-ruble:before{content:"\f158"}.fa-krw:before,.fa-won:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-caret-square-o-left:before,.fa-toggle-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-try:before,.fa-turkish-lira:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-bank:before,.fa-institution:before,.fa-university:before{content:"\f19c"}.fa-graduation-cap:before,.fa-mortar-board:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-image-o:before,.fa-file-photo-o:before,.fa-file-picture-o:before{content:"\f1c5"}.fa-file-archive-o:before,.fa-file-zip-o:before{content:"\f1c6"}.fa-file-audio-o:before,.fa-file-sound-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-ring:before,.fa-life-saver:before,.fa-support:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-empire:before,.fa-ge:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-paper-plane:before,.fa-send:before{content:"\f1d8"}.fa-paper-plane-o:before,.fa-send-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before,.fa-genderless:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-futbol-o:before,.fa-soccer-ball-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-ils:before,.fa-shekel:before,.fa-sheqel:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-bed:before,.fa-hotel:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}/*! prefixes.scss v0.1.0 | Author: Pandao | https://github.com/pandao/prefixes.scss | MIT license | Copyright (c) 2015 */@font-face{font-family:editormd-logo;src:url(../fonts/editormd-logo.eot?-5y8q6h);src:url(.../fonts/editormd-logo.eot?#iefix-5y8q6h)format("embedded-opentype"),url(../fonts/editormd-logo.woff?-5y8q6h)format("woff"),url(../fonts/editormd-logo.ttf?-5y8q6h)format("truetype"),url(../fonts/editormd-logo.svg?-5y8q6h#icomoon)format("svg");font-weight:400;font-style:normal}.editormd-logo,.editormd-logo-1x,.editormd-logo-2x,.editormd-logo-3x,.editormd-logo-4x,.editormd-logo-5x,.editormd-logo-6x,.editormd-logo-7x,.editormd-logo-8x{font-family:editormd-logo;speak:none;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;font-size:inherit;line-height:1;display:inline-block;text-rendering:auto;vertical-align:inherit;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.markdown-body hr:after,.markdown-body hr:before{content:"";display:table}.editormd-logo-1x:before,.editormd-logo-2x:before,.editormd-logo-3x:before,.editormd-logo-4x:before,.editormd-logo-5x:before,.editormd-logo-6x:before,.editormd-logo-7x:before,.editormd-logo-8x:before,.editormd-logo:before{content:"\e1987"}.editormd-logo-1x{font-size:1em}.editormd-logo-lg{font-size:1.2em}.editormd-logo-2x{font-size:2em}.editormd-logo-3x{font-size:3em}.editormd-logo-4x{font-size:4em}.editormd-logo-5x{font-size:5em}.editormd-logo-6x{font-size:6em}.editormd-logo-7x{font-size:7em}.editormd-logo-8x{font-size:8em}.editormd-logo-color{color:#2196F3}/*! github-markdown-css | The MIT License (MIT) | Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com) | https://github.com/sindresorhus/github-markdown-css */@font-face{font-family:octicons-anchor;src:url(data:font/woff;charset=utf-8;base64,d09GRgABAAAAAAYcAA0AAAAACjQAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABMAAAABwAAAAca8vGTk9TLzIAAAFMAAAARAAAAFZG1VHVY21hcAAAAZAAAAA+AAABQgAP9AdjdnQgAAAB0AAAAAQAAAAEACICiGdhc3AAAAHUAAAACAAAAAj//wADZ2x5ZgAAAdwAAADRAAABEKyikaNoZWFkAAACsAAAAC0AAAA2AtXoA2hoZWEAAALgAAAAHAAAACQHngNFaG10eAAAAvwAAAAQAAAAEAwAACJsb2NhAAADDAAAAAoAAAAKALIAVG1heHAAAAMYAAAAHwAAACABEAB2bmFtZQAAAzgAAALBAAAFu3I9x/Nwb3N0AAAF/AAAAB0AAAAvaoFvbwAAAAEAAAAAzBdyYwAAAADP2IQvAAAAAM/bz7t4nGNgZGFgnMDAysDB1Ml0hoGBoR9CM75mMGLkYGBgYmBlZsAKAtJcUxgcPsR8iGF2+O/AEMPsznAYKMwIkgMA5REMOXicY2BgYGaAYBkGRgYQsAHyGMF8FgYFIM0ChED+h5j//yEk/3KoSgZGNgYYk4GRCUgwMaACRoZhDwCs7QgGAAAAIgKIAAAAAf//AAJ4nHWMMQrCQBBF/0zWrCCIKUQsTDCL2EXMohYGSSmorScInsRGL2DOYJe0Ntp7BK+gJ1BxF1stZvjz/v8DRghQzEc4kIgKwiAppcA9LtzKLSkdNhKFY3HF4lK69ExKslx7Xa+vPRVS43G98vG1DnkDMIBUgFN0MDXflU8tbaZOUkXUH0+U27RoRpOIyCKjbMCVejwypzJJG4jIwb43rfl6wbwanocrJm9XFYfskuVC5K/TPyczNU7b84CXcbxks1Un6H6tLH9vf2LRnn8Ax7A5WQAAAHicY2BkYGAA4teL1+yI57f5ysDNwgAC529f0kOmWRiYVgEpDgYmEA8AUzEKsQAAAHicY2BkYGB2+O/AEMPCAAJAkpEBFbAAADgKAe0EAAAiAAAAAAQAAAAEAAAAAAAAKgAqACoAiAAAeJxjYGRgYGBhsGFgYgABEMkFhAwM/xn0QAIAD6YBhwB4nI1Ty07cMBS9QwKlQapQW3VXySvEqDCZGbGaHULiIQ1FKgjWMxknMfLEke2A+IJu+wntrt/QbVf9gG75jK577Lg8K1qQPCfnnnt8fX1NRC/pmjrk/zprC+8D7tBy9DHgBXoWfQ44Av8t4Bj4Z8CLtBL9CniJluPXASf0Lm4CXqFX8Q84dOLnMB17N4c7tBo1AS/Qi+hTwBH4rwHHwN8DXqQ30XXAS7QaLwSc0Gn8NuAVWou/gFmnjLrEaEh9GmDdDGgL3B4JsrRPDU2hTOiMSuJUIdKQQayiAth69r6akSSFqIJuA19TrzCIaY8sIoxyrNIrL//pw7A2iMygkX5vDj+G+kuoLdX4GlGK/8Lnlz6/h9MpmoO9rafrz7ILXEHHaAx95s9lsI7AHNMBWEZHULnfAXwG9/ZqdzLI08iuwRloXE8kfhXYAvE23+23DU3t626rbs8/8adv+9DWknsHp3E17oCf+Z48rvEQNZ78paYM38qfk3v/u3l3u3GXN2Dmvmvpf1Srwk3pB/VSsp512bA/GG5i2WJ7wu430yQ5K3nFGiOqgtmSB5pJVSizwaacmUZzZhXLlZTq8qGGFY2YcSkqbth6aW1tRmlaCFs2016m5qn36SbJrqosG4uMV4aP2PHBmB3tjtmgN2izkGQyLWprekbIntJFing32a5rKWCN/SdSoga45EJykyQ7asZvHQ8PTm6cslIpwyeyjbVltNikc2HTR7YKh9LBl9DADC0U/jLcBZDKrMhUBfQBvXRzLtFtjU9eNHKin0x5InTqb8lNpfKv1s1xHzTXRqgKzek/mb7nB8RZTCDhGEX3kK/8Q75AmUM/eLkfA+0Hi908Kx4eNsMgudg5GLdRD7a84npi+YxNr5i5KIbW5izXas7cHXIMAau1OueZhfj+cOcP3P8MNIWLyYOBuxL6DRylJ4cAAAB4nGNgYoAALjDJyIAOWMCiTIxMLDmZedkABtIBygAAAA==)format("woff")}.markdown-body{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;color:#333;overflow:hidden;font-family:"微软雅黑","Microsoft YaHei",Helvetica,"Meiryo UI","Malgun Gothic","Segoe UI","Trebuchet MS",Monaco,monospace,Tahoma,STXihei,"华文细黑",STHeiti,"Helvetica Neue","Droid Sans","wenquanyi micro hei",FreeSans,Arimo,Arial,SimSun,"宋体",Heiti,"黑体",sans-serif;font-size:16px;line-height:1.6;word-wrap:break-word}.markdown-body strong{font-weight:700}.markdown-body h1{margin:.67em 0}.markdown-body img{border:0}.markdown-body hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}.markdown-body input{color:inherit;margin:0;line-height:normal;font:13px/1.4 Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.markdown-body html input[disabled]{cursor:default}.markdown-body input[type=checkbox]{-moz-box-sizing:border-box;box-sizing:border-box;padding:0}.markdown-body *{-moz-box-sizing:border-box;box-sizing:border-box}.markdown-body a{background:0 0;color:#4183c4!important;text-decoration:none}.markdown-body a:active,.markdown-body a:hover{outline:0;text-decoration:underline}.markdown-body hr{margin:15px 0;overflow:hidden;background:0 0;border:0;border-bottom:1px solid #ddd}.markdown-body h1,.markdown-body h2{padding-bottom:.3em;border-bottom:1px solid #eee}.markdown-body blockquote{margin:0}.markdown-body ol ol,.markdown-body ul ol{list-style-type:lower-roman}.markdown-body ol ol ol,.markdown-body ol ul ol,.markdown-body ul ol ol,.markdown-body ul ul ol{list-style-type:lower-alpha}.markdown-body dd{margin-left:0}.markdown-body code{font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace}.markdown-body pre{font:12px Consolas,"Liberation Mono",Menlo,Courier,monospace;word-wrap:normal}.markdown-body .octicon{font:normal normal 16px octicons-anchor;line-height:1;display:inline-block;text-decoration:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;user-select:none}.markdown-body .octicon-link:before{content:'\f05c'}.markdown-body>:first-child{margin-top:0!important}.markdown-body>:last-child{margin-bottom:0!important}.markdown-body .anchor{position:absolute;top:0;left:0;display:block;padding-right:6px;padding-left:30px;margin-left:-30px}.markdown-body .anchor:focus{outline:0}.markdown-body h1,.markdown-body h2,.markdown-body h3,.markdown-body h4,.markdown-body h5,.markdown-body h6{position:relative;margin-top:1em;margin-bottom:16px;font-weight:700;line-height:1.4}.markdown-body h1 .octicon-link,.markdown-body h2 .octicon-link,.markdown-body h3 .octicon-link,.markdown-body h4 .octicon-link,.markdown-body h5 .octicon-link,.markdown-body h6 .octicon-link{display:none;color:#000;vertical-align:middle}.markdown-body h1:hover .anchor,.markdown-body h2:hover .anchor,.markdown-body h3:hover .anchor,.markdown-body h4:hover .anchor,.markdown-body h5:hover .anchor,.markdown-body h6:hover .anchor{padding-left:8px;margin-left:-30px;text-decoration:none}.markdown-body h1:hover .anchor .octicon-link,.markdown-body h2:hover .anchor .octicon-link,.markdown-body h3:hover .anchor .octicon-link,.markdown-body h4:hover .anchor .octicon-link,.markdown-body h5:hover .anchor .octicon-link,.markdown-body h6:hover .anchor .octicon-link{display:inline-block}.markdown-body h1{font-size:2.25em;line-height:1.2}.markdown-body h1 .anchor{line-height:1}.markdown-body h2{font-size:1.75em;line-height:1.225}.markdown-body h2 .anchor{line-height:1}.markdown-body h3{font-size:1.5em;line-height:1.43}.markdown-body h3 .anchor,.markdown-body h4 .anchor{line-height:1.2}.markdown-body h4{font-size:1.25em}.markdown-body h5 .anchor,.markdown-body h6 .anchor{line-height:1.1}.markdown-body h5{font-size:1em}.markdown-body h6{font-size:1em;color:#777}.markdown-body blockquote,.markdown-body dl,.markdown-body ol,.markdown-body p,.markdown-body pre,.markdown-body table,.markdown-body ul{margin-top:0;margin-bottom:16px}.markdown-body ol,.markdown-body ul{padding-left:2em}.markdown-body ol ol,.markdown-body ol ul,.markdown-body ul ol,.markdown-body ul ul{margin-top:0;margin-bottom:0}.markdown-body li>p{margin-top:16px}.markdown-body dl{padding:0}.markdown-body dl dt{padding:0;margin-top:16px;font-size:1em;font-style:italic;font-weight:700}.markdown-body dl dd{padding:0 16px;margin-bottom:16px}.markdown-body blockquote{padding:0 15px;color:#777;border-left:4px solid #ddd}.markdown-body blockquote>:first-child{margin-top:0}.markdown-body blockquote>:last-child{margin-bottom:0}.markdown-body table{border-collapse:collapse;border-spacing:0;display:block;width:100%;overflow:auto;word-break:normal;word-break:keep-all}.markdown-body table th{font-weight:700}.markdown-body table td,.markdown-body table th{padding:6px 13px;border:1px solid #ddd}.markdown-body table tr{background-color:#fff;border-top:1px solid #ccc}.markdown-body table tr:nth-child(2n){background-color:#f8f8f8}.markdown-body img{max-width:100%;-moz-box-sizing:border-box;box-sizing:border-box}.markdown-body code{padding:.2em 0;margin:0;font-size:85%;background-color:rgba(0,0,0,.04);border-radius:3px}.markdown-body code:after,.markdown-body code:before{letter-spacing:-.2em;content:"\00a0"}.markdown-body pre>code{padding:0;margin:0;font-size:100%;word-break:normal;white-space:pre;background:0 0;border:0}.markdown-body .highlight{margin-bottom:16px}.markdown-body .highlight pre,.markdown-body pre{padding:16px;overflow:auto;font-size:85%;background-color:#f7f7f7;border-radius:3px}.markdown-body .highlight pre{margin-bottom:0;word-break:normal}.markdown-body pre code{display:inline;max-width:initial;padding:0;margin:0;overflow:initial;line-height:inherit;word-wrap:normal;background-color:transparent;border:0}.markdown-body pre code:after,.markdown-body pre code:before{content:normal}.markdown-body .pl-c{color:#969896}.markdown-body .pl-c1,.markdown-body .pl-mdh,.markdown-body .pl-mm,.markdown-body .pl-mp,.markdown-body .pl-mr,.markdown-body .pl-s1 .pl-v,.markdown-body .pl-s3,.markdown-body .pl-sc,.markdown-body .pl-sv{color:#0086b3}.markdown-body .pl-e,.markdown-body .pl-en{color:#795da3}.markdown-body .pl-s1 .pl-s2,.markdown-body .pl-smi,.markdown-body .pl-smp,.markdown-body .pl-stj,.markdown-body .pl-vo,.markdown-body .pl-vpf{color:#333}.markdown-body .pl-ent{color:#63a35c}.markdown-body .pl-k,.markdown-body .pl-s,.markdown-body .pl-st{color:#a71d5d}.markdown-body .pl-pds,.markdown-body .pl-s1,.markdown-body .pl-s1 .pl-pse .pl-s2,.markdown-body .pl-sr,.markdown-body .pl-sr .pl-cce,.markdown-body .pl-sr .pl-sra,.markdown-body .pl-sr .pl-sre,.markdown-body .pl-src{color:#df5000}.markdown-body .pl-mo,.markdown-body .pl-v{color:#1d3e81}.markdown-body .pl-id{color:#b52a1d}.markdown-body .pl-ii{background-color:#b52a1d;color:#f8f8f8}.markdown-body .pl-sr .pl-cce{color:#63a35c;font-weight:700}.markdown-body .pl-ml{color:#693a17}.markdown-body .pl-mh,.markdown-body .pl-mh .pl-en,.markdown-body .pl-ms{color:#1d3e81;font-weight:700}.markdown-body .pl-mq{color:teal}.markdown-body .pl-mi{color:#333;font-style:italic}.markdown-body .pl-mb{color:#333;font-weight:700}.markdown-body .pl-md,.markdown-body .pl-mdhf{background-color:#ffecec;color:#bd2c00}.markdown-body .pl-mdht,.markdown-body .pl-mi1{background-color:#eaffea;color:#55a532}.markdown-body .pl-mdr{color:#795da3;font-weight:700}.markdown-body kbd{display:inline-block;padding:3px 5px;font:11px Consolas,"Liberation Mono",Menlo,Courier,monospace;line-height:10px;color:#555;vertical-align:middle;background-color:#fcfcfc;border:1px solid #ccc;border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.markdown-body .task-list-item+.task-list-item{margin-top:3px}.markdown-body .task-list-item input{float:left;margin:.3em 0 .25em -1.6em;vertical-align:middle}.markdown-body :checked+.radio-label{z-index:1;position:relative;border-color:#4183c4}.editormd-html-preview,.editormd-preview-container{text-align:left;font-size:16px;line-height:1.6;overflow:auto;width:100%;background-color:#fff}.editormd-html-preview blockquote,.editormd-preview-container blockquote{color:#666;border-left:4px solid #ddd;padding-left:20px;margin-left:0;font-size:14px;font-style:italic}.editormd-html-preview p code,.editormd-preview-container p code{margin-left:5px;margin-right:4px}.editormd-html-preview abbr,.editormd-preview-container abbr{background:#ffd}.editormd-html-preview hr,.editormd-preview-container hr{height:1px;border:none;border-top:1px solid #ddd;background:0 0}.editormd-html-preview code,.editormd-preview-container code{border:0px solid #ddd;background:#f6f6f6;padding:3px;border-radius:3px;font-size:14px}.editormd-html-preview pre,.editormd-preview-container pre{border:1px solid #ddd;background:#f6f6f6;padding:10px;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px}.editormd-html-preview pre code,.editormd-preview-container pre code{padding:0}.editormd-html-preview code,.editormd-html-preview kbd,.editormd-html-preview pre,.editormd-preview-container code,.editormd-preview-container kbd,.editormd-preview-container pre{font-family:"YaHei Consolas Hybrid",Consolas,"Meiryo UI","Malgun Gothic","Segoe UI","Trebuchet MS",Helvetica,monospace,monospace}.editormd-html-preview table thead tr,.editormd-preview-container table thead tr{background-color:#F8F8F8}.editormd-html-preview p.editormd-tex,.editormd-preview-container p.editormd-tex{text-align:center}.editormd-html-preview span.editormd-tex,.editormd-preview-container span.editormd-tex{margin:0 5px}.editormd-html-preview .emoji,.editormd-preview-container .emoji{width:24px;height:24px}.editormd-html-preview .katex,.editormd-preview-container .katex{font-size:1.4em}.editormd-html-preview .flowchart,.editormd-html-preview .sequence-diagram,.editormd-preview-container .flowchart,.editormd-preview-container .sequence-diagram{margin:0 auto;text-align:center}.editormd-html-preview .flowchart svg,.editormd-html-preview .sequence-diagram svg,.editormd-preview-container .flowchart svg,.editormd-preview-container .sequence-diagram svg{margin:0 auto}.editormd-html-preview .flowchart text,.editormd-html-preview .sequence-diagram text,.editormd-preview-container .flowchart text,.editormd-preview-container .sequence-diagram text{font-size:15px!important;font-family:"YaHei Consolas Hybrid",Consolas,"Microsoft YaHei","Malgun Gothic","Segoe UI",Helvetica,Arial!important}/*! Pretty printing styles. Used with prettify.js. */.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.clo,.opn,.pun{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.kwd,.tag,.typ{font-weight:700}.str{color:#060}.kwd{color:#006}.com{color:#600;font-style:italic}.typ{color:#404}.lit{color:#044}.clo,.opn,.pun{color:#440}.tag{color:#006}.atn{color:#404}.atv{color:#060}}
-pre.prettyprint{padding:5px;border:1px solid #ccc;white-space: pre-wrap !important;word-break: break-all;border-radius: 3px}
-ol.linenums{margin-top:0;margin-bottom:0}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}.editormd-html-preview pre.prettyprint,.editormd-preview-container pre.prettyprint{padding:10px;border:0px solid #ddd;white-space:pre-wrap;word-wrap:break-word}.editormd-html-preview ol.linenums,.editormd-preview-container ol.linenums{color:#999;padding-left:2.5em}.editormd-html-preview ol.linenums li,.editormd-preview-container ol.linenums li{list-style-type:decimal}.editormd-html-preview ol.linenums li code,.editormd-preview-container ol.linenums li code{border:none;background:0 0;padding:0}.editormd-html-preview .editormd-toc-menu,.editormd-preview-container .editormd-toc-menu{margin:8px 0 12px;display:inline-block}.editormd-html-preview .editormd-toc-menu>.markdown-toc,.editormd-preview-container .editormd-toc-menu>.markdown-toc{position:relative;-webkit-border-radius:4px;-moz-border-radius:4px;-ms-border-radius:4px;-o-border-radius:4px;border-radius:4px;border:1px solid #ddd;display:inline-block;font-size:1em}.editormd-html-preview .editormd-toc-menu>.markdown-toc>ul,.editormd-preview-container .editormd-toc-menu>.markdown-toc>ul{width:160%;min-width:180px;position:absolute;left:-1px;top:-2px;z-index:100;padding:0 10px 10px;display:none;background:#fff;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;-ms-border-radius:4px;-o-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 3px 5px rgba(0,0,0,.2);-moz-box-shadow:0 3px 5px rgba(0,0,0,.2);-ms-box-shadow:0 3px 5px rgba(0,0,0,.2);-o-box-shadow:0 3px 5px rgba(0,0,0,.2);box-shadow:0 3px 5px rgba(0,0,0,.2)}.editormd-html-preview .editormd-toc-menu>.markdown-toc>ul>li ul,.editormd-preview-container .editormd-toc-menu>.markdown-toc>ul>li ul{width:100%;min-width:180px;border:1px solid #ddd;display:none;background:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;-ms-border-radius:4px;-o-border-radius:4px;border-radius:4px}.editormd-html-preview .editormd-toc-menu .toc-menu-btn:hover,.editormd-html-preview .editormd-toc-menu>.markdown-toc>ul>li a:hover,.editormd-preview-container .editormd-toc-menu .toc-menu-btn:hover,.editormd-preview-container .editormd-toc-menu>.markdown-toc>ul>li a:hover{background-color:#f6f6f6}.editormd-html-preview .editormd-toc-menu>.markdown-toc>ul>li a,.editormd-preview-container .editormd-toc-menu>.markdown-toc>ul>li a{color:#666;padding:6px 10px;display:block;-webkit-transition:background-color 500ms ease-out;-moz-transition:background-color 500ms ease-out;transition:background-color 500ms ease-out}.editormd-html-preview .editormd-toc-menu>.markdown-toc li,.editormd-preview-container .editormd-toc-menu>.markdown-toc li{position:relative}.editormd-html-preview .editormd-toc-menu>.markdown-toc li>ul,.editormd-preview-container .editormd-toc-menu>.markdown-toc li>ul{position:absolute;top:32px;left:10%;display:none;-webkit-box-shadow:0 3px 5px rgba(0,0,0,.2);-moz-box-shadow:0 3px 5px rgba(0,0,0,.2);-ms-box-shadow:0 3px 5px rgba(0,0,0,.2);-o-box-shadow:0 3px 5px rgba(0,0,0,.2);box-shadow:0 3px 5px rgba(0,0,0,.2)}.editormd-html-preview .editormd-toc-menu>.markdown-toc li>ul:after,.editormd-html-preview .editormd-toc-menu>.markdown-toc li>ul:before,.editormd-preview-container .editormd-toc-menu>.markdown-toc li>ul:after,.editormd-preview-container .editormd-toc-menu>.markdown-toc li>ul:before{pointer-events:pointer-events;position:absolute;left:15px;top:-6px;display:block;content:"";width:0;height:0;border:6px solid transparent;border-width:0 6px 6px;z-index:10}.editormd-html-preview .editormd-toc-menu>.markdown-toc li>ul:before,.editormd-preview-container .editormd-toc-menu>.markdown-toc li>ul:before{border-bottom-color:#ccc}.editormd-html-preview .editormd-toc-menu>.markdown-toc li>ul:after,.editormd-preview-container .editormd-toc-menu>.markdown-toc li>ul:after{border-bottom-color:#fff;top:-5px}.editormd-html-preview .editormd-toc-menu ul,.editormd-preview-container .editormd-toc-menu ul{list-style:none}.editormd-html-preview .editormd-toc-menu a,.editormd-preview-container .editormd-toc-menu a{text-decoration:none}.editormd-html-preview .editormd-toc-menu h1,.editormd-preview-container .editormd-toc-menu h1{font-size:16px;padding:5px 0 10px 10px;line-height:1;border-bottom:1px solid #eee}.editormd-html-preview .editormd-toc-menu h1 .fa,.editormd-preview-container .editormd-toc-menu h1 .fa{padding-left:10px}.editormd-html-preview .editormd-toc-menu .toc-menu-btn,.editormd-preview-container .editormd-toc-menu .toc-menu-btn{color:#666;min-width:180px;padding:5px 10px;border-radius:4px;display:inline-block;-webkit-transition:background-color 500ms ease-out;-moz-transition:background-color 500ms ease-out;transition:background-color 500ms ease-out}.editormd-html-preview textarea,.editormd-onlyread .editormd-toolbar{display:none}.editormd-html-preview .editormd-toc-menu .toc-menu-btn .fa,.editormd-preview-container .editormd-toc-menu .toc-menu-btn .fa{float:right;padding:3px 0 0 10px;font-size:1.3em}.markdown-body .editormd-toc-menu ul{padding-left:0}.markdown-body .highlight pre,.markdown-body pre{line-height:1.6}hr.editormd-page-break{border:1px dotted #ccc;font-size:0;height:2px}@media only print{hr.editormd-page-break{background:0 0;border:none;height:0}}.editormd-html-preview hr.editormd-page-break{background:0 0;border:none;height:0}.editormd-preview-close-btn{color:#fff;padding:4px 6px;font-size:18px;-webkit-border-radius:500px;-moz-border-radius:500px;-ms-border-radius:500px;-o-border-radius:500px;border-radius:500px;display:none;background-color:#ccc;position:absolute;top:25px;right:35px;z-index:19;-webkit-transition:background-color 300ms ease-out;-moz-transition:background-color 300ms ease-out;transition:background-color 300ms ease-out}.editormd-preview-close-btn:hover{background-color:#999}.editormd-preview-active{width:100%;padding:40px}.editormd-preview-theme-dark{color:#777;background:#2C2827}.editormd-preview-theme-dark .editormd-preview-container{color:#888;background-color:#2C2827}.editormd-preview-theme-dark .editormd-preview-container pre.prettyprint{border:none}.editormd-preview-theme-dark .editormd-preview-container blockquote{color:#555;padding:.5em;background:#222;border-color:#333}.editormd-preview-theme-dark .editormd-preview-container abbr{color:#fff;padding:1px 3px;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px;background:#f90}.editormd-preview-theme-dark .editormd-preview-container code{color:#fff;border:none;padding:1px 3px;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;-o-border-radius:3px;border-radius:3px;background:#5A9600}.editormd-preview-theme-dark .editormd-preview-container table{border:none}.editormd-preview-theme-dark .editormd-preview-container .fa-emoji{color:#B4BF42}.editormd-preview-theme-dark .editormd-preview-container .katex{color:#FEC93F}.editormd-preview-theme-dark .editormd-toc-menu>.markdown-toc{background:#fff;border:none}.editormd-preview-theme-dark .editormd-toc-menu>.markdown-toc h1{border-color:#ddd}.editormd-preview-theme-dark .markdown-body h1,.editormd-preview-theme-dark .markdown-body h2,.editormd-preview-theme-dark .markdown-body hr{border-color:#222}.editormd-preview-theme-dark pre{color:#999;background-color:#111;background-color:rgba(0,0,0,.4)}.editormd-preview-theme-dark pre .pln{color:#999}.editormd-preview-theme-dark li.L1,.editormd-preview-theme-dark li.L3,.editormd-preview-theme-dark li.L5,.editormd-preview-theme-dark li.L7,.editormd-preview-theme-dark li.L9{background:0 0}.editormd-preview-theme-dark [class*=editormd-logo]{color:#2196F3}.editormd-preview-theme-dark .sequence-diagram text{fill:#fff}.editormd-preview-theme-dark .sequence-diagram path,.editormd-preview-theme-dark .sequence-diagram rect{color:#fff;fill:#64D1CB;stroke:#64D1CB}.editormd-preview-theme-dark .flowchart path,.editormd-preview-theme-dark .flowchart rect{stroke:#A6C6FF}.editormd-preview-theme-dark .flowchart rect{fill:#A6C6FF}.editormd-preview-theme-dark .flowchart text{fill:#5879B4}@media screen{.editormd-preview-theme-dark .str{color:#080}.editormd-preview-theme-dark .kwd{color:#f90}.editormd-preview-theme-dark .com{color:#444}.editormd-preview-theme-dark .typ{color:#606}.editormd-preview-theme-dark .lit{color:#066}.editormd-preview-theme-dark .clo,.editormd-preview-theme-dark .opn,.editormd-preview-theme-dark .pun{color:#660}.editormd-preview-theme-dark .tag{color:#f90}.editormd-preview-theme-dark .atn{color:#6C95F5}.editormd-preview-theme-dark .atv{color:#080}.editormd-preview-theme-dark .dec,.editormd-preview-theme-dark .var{color:#008BA7}.editormd-preview-theme-dark .fun{color:red}}.editormd-onlyread .CodeMirror{margin-top:0}.editormd-onlyread .editormd-preview{top:0}.editormd-fullscreen{position:fixed;top:0;left:0;border:none;margin:0 auto}.editormd-theme-dark{border-color:#1a1a17}.editormd-theme-dark .editormd-toolbar{background:#1A1A17;border-color:#1a1a17}.editormd-theme-dark .editormd-menu>li>a{color:#777;border-color:#1a1a17}.editormd-theme-dark .editormd-menu>li>a.active,.editormd-theme-dark .editormd-menu>li>a:hover{border-color:#333;background:#333}.editormd-theme-dark .editormd-menu>li.divider{border-right:1px solid #111}.editormd-theme-dark .CodeMirror{border-right:1px solid rgba(0,0,0,.1)}
-
-
-.CodeMirror-merge {
-    position: relative;
-    white-space: pre;
-}
-
-.CodeMirror-merge, .CodeMirror-merge .CodeMirror {
-    min-height:50px;
-}
-
-.CodeMirror-merge-2pane .CodeMirror-merge-pane { width: 48%; }
-.CodeMirror-merge-2pane .CodeMirror-merge-gap { width: 4%; }
-.CodeMirror-merge-3pane .CodeMirror-merge-pane { width: 31%; }
-.CodeMirror-merge-3pane .CodeMirror-merge-gap { width: 3.5%; }
-
-.CodeMirror-merge-pane {
-    display: inline-block;
-    white-space: normal;
-    vertical-align: top;
-}
-.CodeMirror-merge-pane-rightmost {
-    position: absolute;
-    right: 0px;
-    z-index: 1;
-}
-
-.CodeMirror-merge-gap {
-    z-index: 2;
-    display: inline-block;
-    height: 100%;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-    position: relative;
-    background: #515151;
-}
-
-.CodeMirror-merge-scrolllock-wrap {
-    position: absolute;
-    bottom: 0; left: 50%;
-}
-.CodeMirror-merge-scrolllock {
-    position: relative;
-    left: -50%;
-    cursor: pointer;
-    color: #d8d8d8;
-    line-height: 1;
-}
-
-.CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
-    position: absolute;
-    left: 0; top: 0;
-    right: 0; bottom: 0;
-    line-height: 1;
-}
-
-.CodeMirror-merge-copy {
-    position: absolute;
-    cursor: pointer;
-    color: #ce374b;
-    z-index: 3;
-}
-
-.CodeMirror-merge-copy-reverse {
-    position: absolute;
-    cursor: pointer;
-    color: #44c;
-}
-
-.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
-.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
-
-.CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted {
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
-    background-position: bottom left;
-    background-repeat: repeat-x;
-}
-
-.CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted {
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
-    background-position: bottom left;
-    background-repeat: repeat-x;
-}
-
-.CodeMirror-merge-r-chunk { background: #9a6868; }
-.CodeMirror-merge-r-chunk-start { /*border-top: 1px solid #ee8; */}
-.CodeMirror-merge-r-chunk-end {/* border-bottom: 1px solid #ee8; */}
-.CodeMirror-merge-r-connect { fill:#9a6868;}
-
-.CodeMirror-merge-l-chunk { background: #eef; }
-.CodeMirror-merge-l-chunk-start { border-top: 1px solid #88e; }
-.CodeMirror-merge-l-chunk-end { border-bottom: 1px solid #88e; }
-.CodeMirror-merge-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
-
-.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
-.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
-.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }
-
-.CodeMirror-merge-collapsed-widget:before {
-    content: "(...)";
-}
-.CodeMirror-merge-collapsed-widget {
-    cursor: pointer;
-    color: #88b;
-    background: #eef;
-    border: 1px solid #ddf;
-    font-size: 90%;
-    padding: 0 3px;
-    border-radius: 4px;
-}
-.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt { display: none; }
-
-/* ！！覆盖之前的样式*/
-.-header-right {
-    background: #1F2F3B;
-}
-
-.page--header {
-    background: #05101A;
-    left: 0px;
-    padding: 5px 0;
-}
-.page--body {
-    margin-top: 54px;
-}
-#myshixun_top {
-    display: flex;
-    height: 54px;
-}
-
-.yslflexhome {
-    display: flex;
-    flex-direction: row;
-}
-.yslflexhomes {
-    display: flex;
-    flex-direction: row;
-
-}
-
-.yslflexhomesysl1 {
-    display: flex;
-    flex-direction: column;
-}
-
-#games_repository_contents,
-.cm-s-railscasts .CodeMirror-gutters,
-.split-panel--second {
-    background: #111C24;
-}
-
-.-task-ml80 {
-    margin-left: 0px;
-}
-
-
-
-
-/*edu-popup.css*/
-/* 修改密码成功弹框 */
-.task-popup{ width: 30%;background: #fff; border:1px solid #e8e8e8; border-radius:3px; -webkit-box-shadow:0 0 10px #ccc;  -moz-box-shadow:0 0 10px #ccc;  box-shadow:0 0 10px #ccc;}
-.task-popup-text-center{ text-align: center; color: #333;}
-.task-popup-title{ border-bottom: 1px solid #eee; padding:10px 15px; }
-.task-popup-content{ padding:15px;}
-.task-popup-submit{ margin:0px auto 15px; width: 120px;}
-.task-popup-sure{margin:0px auto 15px;width: 54px;}
-.task-popup-right-sure{margin:0px auto 15px;text-align: center}
-.task-popup-OK{ margin:15px auto; text-align: center}
-.task-popup-bggrey{ background:#fff; color:#333;}
-
-/************实训弹窗****************/
-.task-popup-warp{ width: 100%; height:100%; background:black; position:fixed;}
-.task-popup-box{  position: relative; margin:150px auto 0px; }
-.task-box1{ width:428px; height:420px;background:url(/images/task/task-success.png) 0px 0px no-repeat;}
-.task-box2{ width:496px; height:373px;background:url(/images/task/task-success02.png) 0px 50px no-repeat;}
-a.task-popup-close{ display: block; background:url(/images/task/task-close.png) 0px 0px no-repeat; width: 31px; height: 31px; position:absolute; right:5px; top:100px;}
-a:hover.task-popup-close{background:url(/images/task/task-close.png) -40px 0px no-repeat; }
-.task-su-con{  text-align: center; padding-top:285px;}
-.task-su-p{ font-size: 20px; color:#ee4a1f; font-weight: bold;}
-a.task-su-btn{display: block;background:url(/images/task/task-su-btn.png) 0px -64px no-repeat; width: 138px; height: 57px;color:#ee4a1f; line-height: 50px; text-align: center; font-size: 16px; margin:20px auto;}
-a:hover.task-su-btn{background:url(/images/task/task-su-btn.png) 0px 0px no-repeat; }
-a.task-su-btn-white{ display: inline-block; padding:8px 25px; border:1px solid #fff; color:#fff; text-align: center; border-radius:5px; font-size:14px;}
-a:hover.task-su-btn-white{ color: #ee4a1f;  border:1px solid #ee4a1f; }
-
-/*  模板弹框 20170407byLB */
-#task_popup_box{ background:#fff;padding-bottom:15px;-webkit-border-radius:5px;-moz-border-radius:5px;-o-border-radius:5px;border-radius:5px;box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);}
-.task_popup_top{background:#ccc;height:40px;-webkit-border-radius: 5px 5px 0px 0px;-moz-border-radius: 5px 5px 0px 0px;-o-border-radius: 5px 5px 0px 0px;border-radius: 5px 5px 0px 0px;}
-.task_popup_top h3{ font-size:14px; color:#333; line-height:40px; padding-left:10px; }
-a.task_icons_close{width:20px; height:20px;display:block;background: url(../images/popup/sy_icons_close.png) 0 0px no-repeat; margin:8px 10px 0 0;}
-a:hover.task_icons_close{background: url(../images/popup/sy_icons_close.png) -40px 0px no-repeat;}
-.task_popup_con{ padding:20px;}
-
-/*智能课堂弹框 20170421byLB*/
-.upload_select_box{ width: 410px; height:240px; overflow-y:auto; padding: 10px; background:#f7f9fd; color: #333; }
-.upload_select_box li{ height: 30px; line-height:28px;}
-.upload_select_box li div.mt5{ margin-top:0px;}
-.upload_select_box li:hover{ background:#e4eaf6;}
-.task-popup-submit02{ margin:15px auto; width:120px;}
-.task-popup-submit03{ margin:15px auto; width:70px;}
-.task-popup-submit04{ margin:15px auto; width:85px;}
-/*智能课堂弹框tab 20170428byLB*/
-.newupload_conbox{ background: #fff; padding-bottom: 0;}
-.newupload_navbox{border-bottom:1px solid #dbdbdb;}
-.newupload_nav { height: 38px; line-height: 38px; background: #e7e7e7;  }
-.newupload_nav li {float:left; padding:0 15px;   display: block;  text-align:center; }
-.newupload_nav li:last-child{ border-right: none;}
-.newupload_nav li a{font-size:12px; color:#444;}
-.newupload_nav_hover{ background: #3498db; }
-.newupload_nav_hover a{color: #fff !important; }
-.markdown-body { text-align: justify;word-break: break-all;}
-.bor-reds{
-    border:1px solid #FF0000!important;
-    border-radius: 4px;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
-}
-
-@charset "UTF-8";
-
-/*!
- * animate.css -http://daneden.me/animate
- * Version - 3.6.0
- * Licensed under the MIT license - http://opensource.org/licenses/MIT
- *
- * Copyright (c) 2018 Daniel Eden
- */
-
-.animated{-webkit-animation-duration:1s;animation-duration:1s;-webkit-animation-fill-mode:both;animation-fill-mode:both}.animated.infinite{-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite}@-webkit-keyframes bounce{0%,20%,53%,80%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1);-webkit-transform:translateZ(0);transform:translateZ(0)}40%,43%{-webkit-animation-timing-function:cubic-bezier(.755,.05,.855,.06);animation-timing-function:cubic-bezier(.755,.05,.855,.06);-webkit-transform:translate3d(0,-30px,0);transform:translate3d(0,-30px,0)}70%{-webkit-animation-timing-function:cubic-bezier(.755,.05,.855,.06);animation-timing-function:cubic-bezier(.755,.05,.855,.06);-webkit-transform:translate3d(0,-15px,0);transform:translate3d(0,-15px,0)}90%{-webkit-transform:translate3d(0,-4px,0);transform:translate3d(0,-4px,0)}}@keyframes bounce{0%,20%,53%,80%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1);-webkit-transform:translateZ(0);transform:translateZ(0)}40%,43%{-webkit-animation-timing-function:cubic-bezier(.755,.05,.855,.06);animation-timing-function:cubic-bezier(.755,.05,.855,.06);-webkit-transform:translate3d(0,-30px,0);transform:translate3d(0,-30px,0)}70%{-webkit-animation-timing-function:cubic-bezier(.755,.05,.855,.06);animation-timing-function:cubic-bezier(.755,.05,.855,.06);-webkit-transform:translate3d(0,-15px,0);transform:translate3d(0,-15px,0)}90%{-webkit-transform:translate3d(0,-4px,0);transform:translate3d(0,-4px,0)}}.bounce{-webkit-animation-name:bounce;animation-name:bounce;-webkit-transform-origin:center bottom;transform-origin:center bottom}@-webkit-keyframes flash{0%,50%,to{opacity:1}25%,75%{opacity:0}}@keyframes flash{0%,50%,to{opacity:1}25%,75%{opacity:0}}.flash{-webkit-animation-name:flash;animation-name:flash}@-webkit-keyframes pulse{0%{-webkit-transform:scaleX(1);transform:scaleX(1)}50%{-webkit-transform:scale3d(1.05,1.05,1.05);transform:scale3d(1.05,1.05,1.05)}to{-webkit-transform:scaleX(1);transform:scaleX(1)}}@keyframes pulse{0%{-webkit-transform:scaleX(1);transform:scaleX(1)}50%{-webkit-transform:scale3d(1.05,1.05,1.05);transform:scale3d(1.05,1.05,1.05)}to{-webkit-transform:scaleX(1);transform:scaleX(1)}}.pulse{-webkit-animation-name:pulse;animation-name:pulse}@-webkit-keyframes rubberBand{0%{-webkit-transform:scaleX(1);transform:scaleX(1)}30%{-webkit-transform:scale3d(1.25,.75,1);transform:scale3d(1.25,.75,1)}40%{-webkit-transform:scale3d(.75,1.25,1);transform:scale3d(.75,1.25,1)}50%{-webkit-transform:scale3d(1.15,.85,1);transform:scale3d(1.15,.85,1)}65%{-webkit-transform:scale3d(.95,1.05,1);transform:scale3d(.95,1.05,1)}75%{-webkit-transform:scale3d(1.05,.95,1);transform:scale3d(1.05,.95,1)}to{-webkit-transform:scaleX(1);transform:scaleX(1)}}@keyframes rubberBand{0%{-webkit-transform:scaleX(1);transform:scaleX(1)}30%{-webkit-transform:scale3d(1.25,.75,1);transform:scale3d(1.25,.75,1)}40%{-webkit-transform:scale3d(.75,1.25,1);transform:scale3d(.75,1.25,1)}50%{-webkit-transform:scale3d(1.15,.85,1);transform:scale3d(1.15,.85,1)}65%{-webkit-transform:scale3d(.95,1.05,1);transform:scale3d(.95,1.05,1)}75%{-webkit-transform:scale3d(1.05,.95,1);transform:scale3d(1.05,.95,1)}to{-webkit-transform:scaleX(1);transform:scaleX(1)}}.rubberBand{-webkit-animation-name:rubberBand;animation-name:rubberBand}@-webkit-keyframes shake{0%,to{-webkit-transform:translateZ(0);transform:translateZ(0)}10%,30%,50%,70%,90%{-webkit-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}20%,40%,60%,80%{-webkit-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}}@keyframes shake{0%,to{-webkit-transform:translateZ(0);transform:translateZ(0)}10%,30%,50%,70%,90%{-webkit-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}20%,40%,60%,80%{-webkit-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}}.shake{-webkit-animation-name:shake;animation-name:shake}@-webkit-keyframes headShake{0%{-webkit-transform:translateX(0);transform:translateX(0)}6.5%{-webkit-transform:translateX(-6px) rotateY(-9deg);transform:translateX(-6px) rotateY(-9deg)}18.5%{-webkit-transform:translateX(5px) rotateY(7deg);transform:translateX(5px) rotateY(7deg)}31.5%{-webkit-transform:translateX(-3px) rotateY(-5deg);transform:translateX(-3px) rotateY(-5deg)}43.5%{-webkit-transform:translateX(2px) rotateY(3deg);transform:translateX(2px) rotateY(3deg)}50%{-webkit-transform:translateX(0);transform:translateX(0)}}@keyframes headShake{0%{-webkit-transform:translateX(0);transform:translateX(0)}6.5%{-webkit-transform:translateX(-6px) rotateY(-9deg);transform:translateX(-6px) rotateY(-9deg)}18.5%{-webkit-transform:translateX(5px) rotateY(7deg);transform:translateX(5px) rotateY(7deg)}31.5%{-webkit-transform:translateX(-3px) rotateY(-5deg);transform:translateX(-3px) rotateY(-5deg)}43.5%{-webkit-transform:translateX(2px) rotateY(3deg);transform:translateX(2px) rotateY(3deg)}50%{-webkit-transform:translateX(0);transform:translateX(0)}}.headShake{-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out;-webkit-animation-name:headShake;animation-name:headShake}@-webkit-keyframes swing{20%{-webkit-transform:rotate(15deg);transform:rotate(15deg)}40%{-webkit-transform:rotate(-10deg);transform:rotate(-10deg)}60%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}80%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(0deg);transform:rotate(0deg)}}@keyframes swing{20%{-webkit-transform:rotate(15deg);transform:rotate(15deg)}40%{-webkit-transform:rotate(-10deg);transform:rotate(-10deg)}60%{-webkit-transform:rotate(5deg);transform:rotate(5deg)}80%{-webkit-transform:rotate(-5deg);transform:rotate(-5deg)}to{-webkit-transform:rotate(0deg);transform:rotate(0deg)}}.swing{-webkit-transform-origin:top center;transform-origin:top center;-webkit-animation-name:swing;animation-name:swing}@-webkit-keyframes tada{0%{-webkit-transform:scaleX(1);transform:scaleX(1)}10%,20%{-webkit-transform:scale3d(.9,.9,.9) rotate(-3deg);transform:scale3d(.9,.9,.9) rotate(-3deg)}30%,50%,70%,90%{-webkit-transform:scale3d(1.1,1.1,1.1) rotate(3deg);transform:scale3d(1.1,1.1,1.1) rotate(3deg)}40%,60%,80%{-webkit-transform:scale3d(1.1,1.1,1.1) rotate(-3deg);transform:scale3d(1.1,1.1,1.1) rotate(-3deg)}to{-webkit-transform:scaleX(1);transform:scaleX(1)}}@keyframes tada{0%{-webkit-transform:scaleX(1);transform:scaleX(1)}10%,20%{-webkit-transform:scale3d(.9,.9,.9) rotate(-3deg);transform:scale3d(.9,.9,.9) rotate(-3deg)}30%,50%,70%,90%{-webkit-transform:scale3d(1.1,1.1,1.1) rotate(3deg);transform:scale3d(1.1,1.1,1.1) rotate(3deg)}40%,60%,80%{-webkit-transform:scale3d(1.1,1.1,1.1) rotate(-3deg);transform:scale3d(1.1,1.1,1.1) rotate(-3deg)}to{-webkit-transform:scaleX(1);transform:scaleX(1)}}.tada{-webkit-animation-name:tada;animation-name:tada}@-webkit-keyframes wobble{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}15%{-webkit-transform:translate3d(-25%,0,0) rotate(-5deg);transform:translate3d(-25%,0,0) rotate(-5deg)}30%{-webkit-transform:translate3d(20%,0,0) rotate(3deg);transform:translate3d(20%,0,0) rotate(3deg)}45%{-webkit-transform:translate3d(-15%,0,0) rotate(-3deg);transform:translate3d(-15%,0,0) rotate(-3deg)}60%{-webkit-transform:translate3d(10%,0,0) rotate(2deg);transform:translate3d(10%,0,0) rotate(2deg)}75%{-webkit-transform:translate3d(-5%,0,0) rotate(-1deg);transform:translate3d(-5%,0,0) rotate(-1deg)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes wobble{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}15%{-webkit-transform:translate3d(-25%,0,0) rotate(-5deg);transform:translate3d(-25%,0,0) rotate(-5deg)}30%{-webkit-transform:translate3d(20%,0,0) rotate(3deg);transform:translate3d(20%,0,0) rotate(3deg)}45%{-webkit-transform:translate3d(-15%,0,0) rotate(-3deg);transform:translate3d(-15%,0,0) rotate(-3deg)}60%{-webkit-transform:translate3d(10%,0,0) rotate(2deg);transform:translate3d(10%,0,0) rotate(2deg)}75%{-webkit-transform:translate3d(-5%,0,0) rotate(-1deg);transform:translate3d(-5%,0,0) rotate(-1deg)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.wobble{-webkit-animation-name:wobble;animation-name:wobble}@-webkit-keyframes jello{0%,11.1%,to{-webkit-transform:translateZ(0);transform:translateZ(0)}22.2%{-webkit-transform:skewX(-12.5deg) skewY(-12.5deg);transform:skewX(-12.5deg) skewY(-12.5deg)}33.3%{-webkit-transform:skewX(6.25deg) skewY(6.25deg);transform:skewX(6.25deg) skewY(6.25deg)}44.4%{-webkit-transform:skewX(-3.125deg) skewY(-3.125deg);transform:skewX(-3.125deg) skewY(-3.125deg)}55.5%{-webkit-transform:skewX(1.5625deg) skewY(1.5625deg);transform:skewX(1.5625deg) skewY(1.5625deg)}66.6%{-webkit-transform:skewX(-.78125deg) skewY(-.78125deg);transform:skewX(-.78125deg) skewY(-.78125deg)}77.7%{-webkit-transform:skewX(.390625deg) skewY(.390625deg);transform:skewX(.390625deg) skewY(.390625deg)}88.8%{-webkit-transform:skewX(-.1953125deg) skewY(-.1953125deg);transform:skewX(-.1953125deg) skewY(-.1953125deg)}}@keyframes jello{0%,11.1%,to{-webkit-transform:translateZ(0);transform:translateZ(0)}22.2%{-webkit-transform:skewX(-12.5deg) skewY(-12.5deg);transform:skewX(-12.5deg) skewY(-12.5deg)}33.3%{-webkit-transform:skewX(6.25deg) skewY(6.25deg);transform:skewX(6.25deg) skewY(6.25deg)}44.4%{-webkit-transform:skewX(-3.125deg) skewY(-3.125deg);transform:skewX(-3.125deg) skewY(-3.125deg)}55.5%{-webkit-transform:skewX(1.5625deg) skewY(1.5625deg);transform:skewX(1.5625deg) skewY(1.5625deg)}66.6%{-webkit-transform:skewX(-.78125deg) skewY(-.78125deg);transform:skewX(-.78125deg) skewY(-.78125deg)}77.7%{-webkit-transform:skewX(.390625deg) skewY(.390625deg);transform:skewX(.390625deg) skewY(.390625deg)}88.8%{-webkit-transform:skewX(-.1953125deg) skewY(-.1953125deg);transform:skewX(-.1953125deg) skewY(-.1953125deg)}}.jello{-webkit-animation-name:jello;animation-name:jello;-webkit-transform-origin:center;transform-origin:center}@-webkit-keyframes bounceIn{0%,20%,40%,60%,80%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}20%{-webkit-transform:scale3d(1.1,1.1,1.1);transform:scale3d(1.1,1.1,1.1)}40%{-webkit-transform:scale3d(.9,.9,.9);transform:scale3d(.9,.9,.9)}60%{opacity:1;-webkit-transform:scale3d(1.03,1.03,1.03);transform:scale3d(1.03,1.03,1.03)}80%{-webkit-transform:scale3d(.97,.97,.97);transform:scale3d(.97,.97,.97)}to{opacity:1;-webkit-transform:scaleX(1);transform:scaleX(1)}}@keyframes bounceIn{0%,20%,40%,60%,80%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}20%{-webkit-transform:scale3d(1.1,1.1,1.1);transform:scale3d(1.1,1.1,1.1)}40%{-webkit-transform:scale3d(.9,.9,.9);transform:scale3d(.9,.9,.9)}60%{opacity:1;-webkit-transform:scale3d(1.03,1.03,1.03);transform:scale3d(1.03,1.03,1.03)}80%{-webkit-transform:scale3d(.97,.97,.97);transform:scale3d(.97,.97,.97)}to{opacity:1;-webkit-transform:scaleX(1);transform:scaleX(1)}}.bounceIn{-webkit-animation-duration:.75s;animation-duration:.75s;-webkit-animation-name:bounceIn;animation-name:bounceIn}@-webkit-keyframes bounceInDown{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(0,-3000px,0);transform:translate3d(0,-3000px,0)}60%{opacity:1;-webkit-transform:translate3d(0,25px,0);transform:translate3d(0,25px,0)}75%{-webkit-transform:translate3d(0,-10px,0);transform:translate3d(0,-10px,0)}90%{-webkit-transform:translate3d(0,5px,0);transform:translate3d(0,5px,0)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes bounceInDown{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(0,-3000px,0);transform:translate3d(0,-3000px,0)}60%{opacity:1;-webkit-transform:translate3d(0,25px,0);transform:translate3d(0,25px,0)}75%{-webkit-transform:translate3d(0,-10px,0);transform:translate3d(0,-10px,0)}90%{-webkit-transform:translate3d(0,5px,0);transform:translate3d(0,5px,0)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.bounceInDown{-webkit-animation-name:bounceInDown;animation-name:bounceInDown}@-webkit-keyframes bounceInLeft{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(-3000px,0,0);transform:translate3d(-3000px,0,0)}60%{opacity:1;-webkit-transform:translate3d(25px,0,0);transform:translate3d(25px,0,0)}75%{-webkit-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}90%{-webkit-transform:translate3d(5px,0,0);transform:translate3d(5px,0,0)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes bounceInLeft{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(-3000px,0,0);transform:translate3d(-3000px,0,0)}60%{opacity:1;-webkit-transform:translate3d(25px,0,0);transform:translate3d(25px,0,0)}75%{-webkit-transform:translate3d(-10px,0,0);transform:translate3d(-10px,0,0)}90%{-webkit-transform:translate3d(5px,0,0);transform:translate3d(5px,0,0)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.bounceInLeft{-webkit-animation-name:bounceInLeft;animation-name:bounceInLeft}@-webkit-keyframes bounceInRight{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(3000px,0,0);transform:translate3d(3000px,0,0)}60%{opacity:1;-webkit-transform:translate3d(-25px,0,0);transform:translate3d(-25px,0,0)}75%{-webkit-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}90%{-webkit-transform:translate3d(-5px,0,0);transform:translate3d(-5px,0,0)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes bounceInRight{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(3000px,0,0);transform:translate3d(3000px,0,0)}60%{opacity:1;-webkit-transform:translate3d(-25px,0,0);transform:translate3d(-25px,0,0)}75%{-webkit-transform:translate3d(10px,0,0);transform:translate3d(10px,0,0)}90%{-webkit-transform:translate3d(-5px,0,0);transform:translate3d(-5px,0,0)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.bounceInRight{-webkit-animation-name:bounceInRight;animation-name:bounceInRight}@-webkit-keyframes bounceInUp{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(0,3000px,0);transform:translate3d(0,3000px,0)}60%{opacity:1;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}75%{-webkit-transform:translate3d(0,10px,0);transform:translate3d(0,10px,0)}90%{-webkit-transform:translate3d(0,-5px,0);transform:translate3d(0,-5px,0)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes bounceInUp{0%,60%,75%,90%,to{-webkit-animation-timing-function:cubic-bezier(.215,.61,.355,1);animation-timing-function:cubic-bezier(.215,.61,.355,1)}0%{opacity:0;-webkit-transform:translate3d(0,3000px,0);transform:translate3d(0,3000px,0)}60%{opacity:1;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}75%{-webkit-transform:translate3d(0,10px,0);transform:translate3d(0,10px,0)}90%{-webkit-transform:translate3d(0,-5px,0);transform:translate3d(0,-5px,0)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.bounceInUp{-webkit-animation-name:bounceInUp;animation-name:bounceInUp}@-webkit-keyframes bounceOut{20%{-webkit-transform:scale3d(.9,.9,.9);transform:scale3d(.9,.9,.9)}50%,55%{opacity:1;-webkit-transform:scale3d(1.1,1.1,1.1);transform:scale3d(1.1,1.1,1.1)}to{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}}@keyframes bounceOut{20%{-webkit-transform:scale3d(.9,.9,.9);transform:scale3d(.9,.9,.9)}50%,55%{opacity:1;-webkit-transform:scale3d(1.1,1.1,1.1);transform:scale3d(1.1,1.1,1.1)}to{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}}.bounceOut{-webkit-animation-duration:.75s;animation-duration:.75s;-webkit-animation-name:bounceOut;animation-name:bounceOut}@-webkit-keyframes bounceOutDown{20%{-webkit-transform:translate3d(0,10px,0);transform:translate3d(0,10px,0)}40%,45%{opacity:1;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}to{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}}@keyframes bounceOutDown{20%{-webkit-transform:translate3d(0,10px,0);transform:translate3d(0,10px,0)}40%,45%{opacity:1;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}to{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}}.bounceOutDown{-webkit-animation-name:bounceOutDown;animation-name:bounceOutDown}@-webkit-keyframes bounceOutLeft{20%{opacity:1;-webkit-transform:translate3d(20px,0,0);transform:translate3d(20px,0,0)}to{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}}@keyframes bounceOutLeft{20%{opacity:1;-webkit-transform:translate3d(20px,0,0);transform:translate3d(20px,0,0)}to{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}}.bounceOutLeft{-webkit-animation-name:bounceOutLeft;animation-name:bounceOutLeft}@-webkit-keyframes bounceOutRight{20%{opacity:1;-webkit-transform:translate3d(-20px,0,0);transform:translate3d(-20px,0,0)}to{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}}@keyframes bounceOutRight{20%{opacity:1;-webkit-transform:translate3d(-20px,0,0);transform:translate3d(-20px,0,0)}to{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}}.bounceOutRight{-webkit-animation-name:bounceOutRight;animation-name:bounceOutRight}@-webkit-keyframes bounceOutUp{20%{-webkit-transform:translate3d(0,-10px,0);transform:translate3d(0,-10px,0)}40%,45%{opacity:1;-webkit-transform:translate3d(0,20px,0);transform:translate3d(0,20px,0)}to{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}}@keyframes bounceOutUp{20%{-webkit-transform:translate3d(0,-10px,0);transform:translate3d(0,-10px,0)}40%,45%{opacity:1;-webkit-transform:translate3d(0,20px,0);transform:translate3d(0,20px,0)}to{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}}.bounceOutUp{-webkit-animation-name:bounceOutUp;animation-name:bounceOutUp}@-webkit-keyframes fadeIn{0%{opacity:0}to{opacity:1}}@keyframes fadeIn{0%{opacity:0}to{opacity:1}}.fadeIn{-webkit-animation-name:fadeIn;animation-name:fadeIn}@-webkit-keyframes fadeInDown{0%{opacity:0;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes fadeInDown{0%{opacity:0;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}.fadeInDown{-webkit-animation-name:fadeInDown;animation-name:fadeInDown}@-webkit-keyframes fadeInDownBig{0%{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes fadeInDownBig{0%{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}.fadeInDownBig{-webkit-animation-name:fadeInDownBig;animation-name:fadeInDownBig}@-webkit-keyframes fadeInLeft{0%{opacity:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes fadeInLeft{0%{opacity:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}.fadeInLeft{-webkit-animation-name:fadeInLeft;animation-name:fadeInLeft}@-webkit-keyframes fadeInLeftBig{0%{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes fadeInLeftBig{0%{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}.fadeInLeftBig{-webkit-animation-name:fadeInLeftBig;animation-name:fadeInLeftBig}@-webkit-keyframes fadeInRight{0%{opacity:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes fadeInRight{0%{opacity:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}.fadeInRight{-webkit-animation-name:fadeInRight;animation-name:fadeInRight}@-webkit-keyframes fadeInRightBig{0%{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes fadeInRightBig{0%{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}.fadeInRightBig{-webkit-animation-name:fadeInRightBig;animation-name:fadeInRightBig}@-webkit-keyframes fadeInUp{0%{opacity:0;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes fadeInUp{0%{opacity:0;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}.fadeInUp{-webkit-animation-name:fadeInUp;animation-name:fadeInUp}@-webkit-keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}.fadeInUpBig{-webkit-animation-name:fadeInUpBig;animation-name:fadeInUpBig}@-webkit-keyframes fadeOut{0%{opacity:1}to{opacity:0}}@keyframes fadeOut{0%{opacity:1}to{opacity:0}}.fadeOut{-webkit-animation-name:fadeOut;animation-name:fadeOut}@-webkit-keyframes fadeOutDown{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}}@keyframes fadeOutDown{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}}.fadeOutDown{-webkit-animation-name:fadeOutDown;animation-name:fadeOutDown}@-webkit-keyframes fadeOutDownBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}}@keyframes fadeOutDownBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,2000px,0);transform:translate3d(0,2000px,0)}}.fadeOutDownBig{-webkit-animation-name:fadeOutDownBig;animation-name:fadeOutDownBig}@-webkit-keyframes fadeOutLeft{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}@keyframes fadeOutLeft{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}.fadeOutLeft{-webkit-animation-name:fadeOutLeft;animation-name:fadeOutLeft}@-webkit-keyframes fadeOutLeftBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}}@keyframes fadeOutLeftBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(-2000px,0,0);transform:translate3d(-2000px,0,0)}}.fadeOutLeftBig{-webkit-animation-name:fadeOutLeftBig;animation-name:fadeOutLeftBig}@-webkit-keyframes fadeOutRight{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}@keyframes fadeOutRight{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}.fadeOutRight{-webkit-animation-name:fadeOutRight;animation-name:fadeOutRight}@-webkit-keyframes fadeOutRightBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}}@keyframes fadeOutRightBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(2000px,0,0);transform:translate3d(2000px,0,0)}}.fadeOutRightBig{-webkit-animation-name:fadeOutRightBig;animation-name:fadeOutRightBig}@-webkit-keyframes fadeOutUp{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}}@keyframes fadeOutUp{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}}.fadeOutUp{-webkit-animation-name:fadeOutUp;animation-name:fadeOutUp}@-webkit-keyframes fadeOutUpBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}}@keyframes fadeOutUpBig{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(0,-2000px,0);transform:translate3d(0,-2000px,0)}}.fadeOutUpBig{-webkit-animation-name:fadeOutUpBig;animation-name:fadeOutUpBig}@-webkit-keyframes flip{0%{-webkit-transform:perspective(400px) rotateY(-1turn);transform:perspective(400px) rotateY(-1turn);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}40%{-webkit-transform:perspective(400px) translateZ(150px) rotateY(-190deg);transform:perspective(400px) translateZ(150px) rotateY(-190deg);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}50%{-webkit-transform:perspective(400px) translateZ(150px) rotateY(-170deg);transform:perspective(400px) translateZ(150px) rotateY(-170deg);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}80%{-webkit-transform:perspective(400px) scale3d(.95,.95,.95);transform:perspective(400px) scale3d(.95,.95,.95);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}to{-webkit-transform:perspective(400px);transform:perspective(400px);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}}@keyframes flip{0%{-webkit-transform:perspective(400px) rotateY(-1turn);transform:perspective(400px) rotateY(-1turn);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}40%{-webkit-transform:perspective(400px) translateZ(150px) rotateY(-190deg);transform:perspective(400px) translateZ(150px) rotateY(-190deg);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}50%{-webkit-transform:perspective(400px) translateZ(150px) rotateY(-170deg);transform:perspective(400px) translateZ(150px) rotateY(-170deg);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}80%{-webkit-transform:perspective(400px) scale3d(.95,.95,.95);transform:perspective(400px) scale3d(.95,.95,.95);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}to{-webkit-transform:perspective(400px);transform:perspective(400px);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}}.animated.flip{-webkit-backface-visibility:visible;backface-visibility:visible;-webkit-animation-name:flip;animation-name:flip}@-webkit-keyframes flipInX{0%{-webkit-transform:perspective(400px) rotateX(90deg);transform:perspective(400px) rotateX(90deg);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in;opacity:0}40%{-webkit-transform:perspective(400px) rotateX(-20deg);transform:perspective(400px) rotateX(-20deg);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}60%{-webkit-transform:perspective(400px) rotateX(10deg);transform:perspective(400px) rotateX(10deg);opacity:1}80%{-webkit-transform:perspective(400px) rotateX(-5deg);transform:perspective(400px) rotateX(-5deg)}to{-webkit-transform:perspective(400px);transform:perspective(400px)}}@keyframes flipInX{0%{-webkit-transform:perspective(400px) rotateX(90deg);transform:perspective(400px) rotateX(90deg);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in;opacity:0}40%{-webkit-transform:perspective(400px) rotateX(-20deg);transform:perspective(400px) rotateX(-20deg);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}60%{-webkit-transform:perspective(400px) rotateX(10deg);transform:perspective(400px) rotateX(10deg);opacity:1}80%{-webkit-transform:perspective(400px) rotateX(-5deg);transform:perspective(400px) rotateX(-5deg)}to{-webkit-transform:perspective(400px);transform:perspective(400px)}}.flipInX{-webkit-backface-visibility:visible!important;backface-visibility:visible!important;-webkit-animation-name:flipInX;animation-name:flipInX}@-webkit-keyframes flipInY{0%{-webkit-transform:perspective(400px) rotateY(90deg);transform:perspective(400px) rotateY(90deg);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in;opacity:0}40%{-webkit-transform:perspective(400px) rotateY(-20deg);transform:perspective(400px) rotateY(-20deg);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}60%{-webkit-transform:perspective(400px) rotateY(10deg);transform:perspective(400px) rotateY(10deg);opacity:1}80%{-webkit-transform:perspective(400px) rotateY(-5deg);transform:perspective(400px) rotateY(-5deg)}to{-webkit-transform:perspective(400px);transform:perspective(400px)}}@keyframes flipInY{0%{-webkit-transform:perspective(400px) rotateY(90deg);transform:perspective(400px) rotateY(90deg);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in;opacity:0}40%{-webkit-transform:perspective(400px) rotateY(-20deg);transform:perspective(400px) rotateY(-20deg);-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}60%{-webkit-transform:perspective(400px) rotateY(10deg);transform:perspective(400px) rotateY(10deg);opacity:1}80%{-webkit-transform:perspective(400px) rotateY(-5deg);transform:perspective(400px) rotateY(-5deg)}to{-webkit-transform:perspective(400px);transform:perspective(400px)}}.flipInY{-webkit-backface-visibility:visible!important;backface-visibility:visible!important;-webkit-animation-name:flipInY;animation-name:flipInY}@-webkit-keyframes flipOutX{0%{-webkit-transform:perspective(400px);transform:perspective(400px)}30%{-webkit-transform:perspective(400px) rotateX(-20deg);transform:perspective(400px) rotateX(-20deg);opacity:1}to{-webkit-transform:perspective(400px) rotateX(90deg);transform:perspective(400px) rotateX(90deg);opacity:0}}@keyframes flipOutX{0%{-webkit-transform:perspective(400px);transform:perspective(400px)}30%{-webkit-transform:perspective(400px) rotateX(-20deg);transform:perspective(400px) rotateX(-20deg);opacity:1}to{-webkit-transform:perspective(400px) rotateX(90deg);transform:perspective(400px) rotateX(90deg);opacity:0}}.flipOutX{-webkit-animation-duration:.75s;animation-duration:.75s;-webkit-animation-name:flipOutX;animation-name:flipOutX;-webkit-backface-visibility:visible!important;backface-visibility:visible!important}@-webkit-keyframes flipOutY{0%{-webkit-transform:perspective(400px);transform:perspective(400px)}30%{-webkit-transform:perspective(400px) rotateY(-15deg);transform:perspective(400px) rotateY(-15deg);opacity:1}to{-webkit-transform:perspective(400px) rotateY(90deg);transform:perspective(400px) rotateY(90deg);opacity:0}}@keyframes flipOutY{0%{-webkit-transform:perspective(400px);transform:perspective(400px)}30%{-webkit-transform:perspective(400px) rotateY(-15deg);transform:perspective(400px) rotateY(-15deg);opacity:1}to{-webkit-transform:perspective(400px) rotateY(90deg);transform:perspective(400px) rotateY(90deg);opacity:0}}.flipOutY{-webkit-animation-duration:.75s;animation-duration:.75s;-webkit-backface-visibility:visible!important;backface-visibility:visible!important;-webkit-animation-name:flipOutY;animation-name:flipOutY}@-webkit-keyframes lightSpeedIn{0%{-webkit-transform:translate3d(100%,0,0) skewX(-30deg);transform:translate3d(100%,0,0) skewX(-30deg);opacity:0}60%{-webkit-transform:skewX(20deg);transform:skewX(20deg);opacity:1}80%{-webkit-transform:skewX(-5deg);transform:skewX(-5deg);opacity:1}to{-webkit-transform:translateZ(0);transform:translateZ(0);opacity:1}}@keyframes lightSpeedIn{0%{-webkit-transform:translate3d(100%,0,0) skewX(-30deg);transform:translate3d(100%,0,0) skewX(-30deg);opacity:0}60%{-webkit-transform:skewX(20deg);transform:skewX(20deg);opacity:1}80%{-webkit-transform:skewX(-5deg);transform:skewX(-5deg);opacity:1}to{-webkit-transform:translateZ(0);transform:translateZ(0);opacity:1}}.lightSpeedIn{-webkit-animation-name:lightSpeedIn;animation-name:lightSpeedIn;-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}@-webkit-keyframes lightSpeedOut{0%{opacity:1}to{-webkit-transform:translate3d(100%,0,0) skewX(30deg);transform:translate3d(100%,0,0) skewX(30deg);opacity:0}}@keyframes lightSpeedOut{0%{opacity:1}to{-webkit-transform:translate3d(100%,0,0) skewX(30deg);transform:translate3d(100%,0,0) skewX(30deg);opacity:0}}.lightSpeedOut{-webkit-animation-name:lightSpeedOut;animation-name:lightSpeedOut;-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in}@-webkit-keyframes rotateIn{0%{-webkit-transform-origin:center;transform-origin:center;-webkit-transform:rotate(-200deg);transform:rotate(-200deg);opacity:0}to{-webkit-transform-origin:center;transform-origin:center;-webkit-transform:translateZ(0);transform:translateZ(0);opacity:1}}@keyframes rotateIn{0%{-webkit-transform-origin:center;transform-origin:center;-webkit-transform:rotate(-200deg);transform:rotate(-200deg);opacity:0}to{-webkit-transform-origin:center;transform-origin:center;-webkit-transform:translateZ(0);transform:translateZ(0);opacity:1}}.rotateIn{-webkit-animation-name:rotateIn;animation-name:rotateIn}@-webkit-keyframes rotateInDownLeft{0%{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate(-45deg);transform:rotate(-45deg);opacity:0}to{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:translateZ(0);transform:translateZ(0);opacity:1}}@keyframes rotateInDownLeft{0%{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate(-45deg);transform:rotate(-45deg);opacity:0}to{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:translateZ(0);transform:translateZ(0);opacity:1}}.rotateInDownLeft{-webkit-animation-name:rotateInDownLeft;animation-name:rotateInDownLeft}@-webkit-keyframes rotateInDownRight{0%{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate(45deg);transform:rotate(45deg);opacity:0}to{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:translateZ(0);transform:translateZ(0);opacity:1}}@keyframes rotateInDownRight{0%{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate(45deg);transform:rotate(45deg);opacity:0}to{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:translateZ(0);transform:translateZ(0);opacity:1}}.rotateInDownRight{-webkit-animation-name:rotateInDownRight;animation-name:rotateInDownRight}@-webkit-keyframes rotateInUpLeft{0%{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate(45deg);transform:rotate(45deg);opacity:0}to{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:translateZ(0);transform:translateZ(0);opacity:1}}@keyframes rotateInUpLeft{0%{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate(45deg);transform:rotate(45deg);opacity:0}to{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:translateZ(0);transform:translateZ(0);opacity:1}}.rotateInUpLeft{-webkit-animation-name:rotateInUpLeft;animation-name:rotateInUpLeft}@-webkit-keyframes rotateInUpRight{0%{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate(-90deg);transform:rotate(-90deg);opacity:0}to{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:translateZ(0);transform:translateZ(0);opacity:1}}@keyframes rotateInUpRight{0%{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate(-90deg);transform:rotate(-90deg);opacity:0}to{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:translateZ(0);transform:translateZ(0);opacity:1}}.rotateInUpRight{-webkit-animation-name:rotateInUpRight;animation-name:rotateInUpRight}@-webkit-keyframes rotateOut{0%{-webkit-transform-origin:center;transform-origin:center;opacity:1}to{-webkit-transform-origin:center;transform-origin:center;-webkit-transform:rotate(200deg);transform:rotate(200deg);opacity:0}}@keyframes rotateOut{0%{-webkit-transform-origin:center;transform-origin:center;opacity:1}to{-webkit-transform-origin:center;transform-origin:center;-webkit-transform:rotate(200deg);transform:rotate(200deg);opacity:0}}.rotateOut{-webkit-animation-name:rotateOut;animation-name:rotateOut}@-webkit-keyframes rotateOutDownLeft{0%{-webkit-transform-origin:left bottom;transform-origin:left bottom;opacity:1}to{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate(45deg);transform:rotate(45deg);opacity:0}}@keyframes rotateOutDownLeft{0%{-webkit-transform-origin:left bottom;transform-origin:left bottom;opacity:1}to{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate(45deg);transform:rotate(45deg);opacity:0}}.rotateOutDownLeft{-webkit-animation-name:rotateOutDownLeft;animation-name:rotateOutDownLeft}@-webkit-keyframes rotateOutDownRight{0%{-webkit-transform-origin:right bottom;transform-origin:right bottom;opacity:1}to{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate(-45deg);transform:rotate(-45deg);opacity:0}}@keyframes rotateOutDownRight{0%{-webkit-transform-origin:right bottom;transform-origin:right bottom;opacity:1}to{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate(-45deg);transform:rotate(-45deg);opacity:0}}.rotateOutDownRight{-webkit-animation-name:rotateOutDownRight;animation-name:rotateOutDownRight}@-webkit-keyframes rotateOutUpLeft{0%{-webkit-transform-origin:left bottom;transform-origin:left bottom;opacity:1}to{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate(-45deg);transform:rotate(-45deg);opacity:0}}@keyframes rotateOutUpLeft{0%{-webkit-transform-origin:left bottom;transform-origin:left bottom;opacity:1}to{-webkit-transform-origin:left bottom;transform-origin:left bottom;-webkit-transform:rotate(-45deg);transform:rotate(-45deg);opacity:0}}.rotateOutUpLeft{-webkit-animation-name:rotateOutUpLeft;animation-name:rotateOutUpLeft}@-webkit-keyframes rotateOutUpRight{0%{-webkit-transform-origin:right bottom;transform-origin:right bottom;opacity:1}to{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate(90deg);transform:rotate(90deg);opacity:0}}@keyframes rotateOutUpRight{0%{-webkit-transform-origin:right bottom;transform-origin:right bottom;opacity:1}to{-webkit-transform-origin:right bottom;transform-origin:right bottom;-webkit-transform:rotate(90deg);transform:rotate(90deg);opacity:0}}.rotateOutUpRight{-webkit-animation-name:rotateOutUpRight;animation-name:rotateOutUpRight}@-webkit-keyframes hinge{0%{-webkit-transform-origin:top left;transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}20%,60%{-webkit-transform:rotate(80deg);transform:rotate(80deg);-webkit-transform-origin:top left;transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}40%,80%{-webkit-transform:rotate(60deg);transform:rotate(60deg);-webkit-transform-origin:top left;transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out;opacity:1}to{-webkit-transform:translate3d(0,700px,0);transform:translate3d(0,700px,0);opacity:0}}@keyframes hinge{0%{-webkit-transform-origin:top left;transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}20%,60%{-webkit-transform:rotate(80deg);transform:rotate(80deg);-webkit-transform-origin:top left;transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}40%,80%{-webkit-transform:rotate(60deg);transform:rotate(60deg);-webkit-transform-origin:top left;transform-origin:top left;-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out;opacity:1}to{-webkit-transform:translate3d(0,700px,0);transform:translate3d(0,700px,0);opacity:0}}.hinge{-webkit-animation-duration:2s;animation-duration:2s;-webkit-animation-name:hinge;animation-name:hinge}@-webkit-keyframes jackInTheBox{0%{opacity:0;-webkit-transform:scale(.1) rotate(30deg);transform:scale(.1) rotate(30deg);-webkit-transform-origin:center bottom;transform-origin:center bottom}50%{-webkit-transform:rotate(-10deg);transform:rotate(-10deg)}70%{-webkit-transform:rotate(3deg);transform:rotate(3deg)}to{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes jackInTheBox{0%{opacity:0;-webkit-transform:scale(.1) rotate(30deg);transform:scale(.1) rotate(30deg);-webkit-transform-origin:center bottom;transform-origin:center bottom}50%{-webkit-transform:rotate(-10deg);transform:rotate(-10deg)}70%{-webkit-transform:rotate(3deg);transform:rotate(3deg)}to{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}.jackInTheBox{-webkit-animation-name:jackInTheBox;animation-name:jackInTheBox}@-webkit-keyframes rollIn{0%{opacity:0;-webkit-transform:translate3d(-100%,0,0) rotate(-120deg);transform:translate3d(-100%,0,0) rotate(-120deg)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes rollIn{0%{opacity:0;-webkit-transform:translate3d(-100%,0,0) rotate(-120deg);transform:translate3d(-100%,0,0) rotate(-120deg)}to{opacity:1;-webkit-transform:translateZ(0);transform:translateZ(0)}}.rollIn{-webkit-animation-name:rollIn;animation-name:rollIn}@-webkit-keyframes rollOut{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(100%,0,0) rotate(120deg);transform:translate3d(100%,0,0) rotate(120deg)}}@keyframes rollOut{0%{opacity:1}to{opacity:0;-webkit-transform:translate3d(100%,0,0) rotate(120deg);transform:translate3d(100%,0,0) rotate(120deg)}}.rollOut{-webkit-animation-name:rollOut;animation-name:rollOut}@-webkit-keyframes zoomIn{0%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}50%{opacity:1}}@keyframes zoomIn{0%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}50%{opacity:1}}.zoomIn{-webkit-animation-name:zoomIn;animation-name:zoomIn}@-webkit-keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,-1000px,0);transform:scale3d(.1,.1,.1) translate3d(0,-1000px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,60px,0);transform:scale3d(.475,.475,.475) translate3d(0,60px,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}@keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,-1000px,0);transform:scale3d(.1,.1,.1) translate3d(0,-1000px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,60px,0);transform:scale3d(.475,.475,.475) translate3d(0,60px,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomInDown{-webkit-animation-name:zoomInDown;animation-name:zoomInDown}@-webkit-keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(-1000px,0,0);transform:scale3d(.1,.1,.1) translate3d(-1000px,0,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(10px,0,0);transform:scale3d(.475,.475,.475) translate3d(10px,0,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}@keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(-1000px,0,0);transform:scale3d(.1,.1,.1) translate3d(-1000px,0,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(10px,0,0);transform:scale3d(.475,.475,.475) translate3d(10px,0,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomInLeft{-webkit-animation-name:zoomInLeft;animation-name:zoomInLeft}@-webkit-keyframes zoomInRight{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(1000px,0,0);transform:scale3d(.1,.1,.1) translate3d(1000px,0,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(-10px,0,0);transform:scale3d(.475,.475,.475) translate3d(-10px,0,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}@keyframes zoomInRight{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(1000px,0,0);transform:scale3d(.1,.1,.1) translate3d(1000px,0,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(-10px,0,0);transform:scale3d(.475,.475,.475) translate3d(-10px,0,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomInRight{-webkit-animation-name:zoomInRight;animation-name:zoomInRight}@-webkit-keyframes zoomInUp{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,1000px,0);transform:scale3d(.1,.1,.1) translate3d(0,1000px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}@keyframes zoomInUp{0%{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,1000px,0);transform:scale3d(.1,.1,.1) translate3d(0,1000px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}60%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomInUp{-webkit-animation-name:zoomInUp;animation-name:zoomInUp}@-webkit-keyframes zoomOut{0%{opacity:1}50%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}to{opacity:0}}@keyframes zoomOut{0%{opacity:1}50%{opacity:0;-webkit-transform:scale3d(.3,.3,.3);transform:scale3d(.3,.3,.3)}to{opacity:0}}.zoomOut{-webkit-animation-name:zoomOut;animation-name:zoomOut}@-webkit-keyframes zoomOutDown{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}to{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,2000px,0);transform:scale3d(.1,.1,.1) translate3d(0,2000px,0);-webkit-transform-origin:center bottom;transform-origin:center bottom;-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}@keyframes zoomOutDown{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);transform:scale3d(.475,.475,.475) translate3d(0,-60px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}to{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,2000px,0);transform:scale3d(.1,.1,.1) translate3d(0,2000px,0);-webkit-transform-origin:center bottom;transform-origin:center bottom;-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomOutDown{-webkit-animation-name:zoomOutDown;animation-name:zoomOutDown}@-webkit-keyframes zoomOutLeft{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(42px,0,0);transform:scale3d(.475,.475,.475) translate3d(42px,0,0)}to{opacity:0;-webkit-transform:scale(.1) translate3d(-2000px,0,0);transform:scale(.1) translate3d(-2000px,0,0);-webkit-transform-origin:left center;transform-origin:left center}}@keyframes zoomOutLeft{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(42px,0,0);transform:scale3d(.475,.475,.475) translate3d(42px,0,0)}to{opacity:0;-webkit-transform:scale(.1) translate3d(-2000px,0,0);transform:scale(.1) translate3d(-2000px,0,0);-webkit-transform-origin:left center;transform-origin:left center}}.zoomOutLeft{-webkit-animation-name:zoomOutLeft;animation-name:zoomOutLeft}@-webkit-keyframes zoomOutRight{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(-42px,0,0);transform:scale3d(.475,.475,.475) translate3d(-42px,0,0)}to{opacity:0;-webkit-transform:scale(.1) translate3d(2000px,0,0);transform:scale(.1) translate3d(2000px,0,0);-webkit-transform-origin:right center;transform-origin:right center}}@keyframes zoomOutRight{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(-42px,0,0);transform:scale3d(.475,.475,.475) translate3d(-42px,0,0)}to{opacity:0;-webkit-transform:scale(.1) translate3d(2000px,0,0);transform:scale(.1) translate3d(2000px,0,0);-webkit-transform-origin:right center;transform-origin:right center}}.zoomOutRight{-webkit-animation-name:zoomOutRight;animation-name:zoomOutRight}@-webkit-keyframes zoomOutUp{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,60px,0);transform:scale3d(.475,.475,.475) translate3d(0,60px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}to{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,-2000px,0);transform:scale3d(.1,.1,.1) translate3d(0,-2000px,0);-webkit-transform-origin:center bottom;transform-origin:center bottom;-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}@keyframes zoomOutUp{40%{opacity:1;-webkit-transform:scale3d(.475,.475,.475) translate3d(0,60px,0);transform:scale3d(.475,.475,.475) translate3d(0,60px,0);-webkit-animation-timing-function:cubic-bezier(.55,.055,.675,.19);animation-timing-function:cubic-bezier(.55,.055,.675,.19)}to{opacity:0;-webkit-transform:scale3d(.1,.1,.1) translate3d(0,-2000px,0);transform:scale3d(.1,.1,.1) translate3d(0,-2000px,0);-webkit-transform-origin:center bottom;transform-origin:center bottom;-webkit-animation-timing-function:cubic-bezier(.175,.885,.32,1);animation-timing-function:cubic-bezier(.175,.885,.32,1)}}.zoomOutUp{-webkit-animation-name:zoomOutUp;animation-name:zoomOutUp}@-webkit-keyframes slideInDown{0%{-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes slideInDown{0%{-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.slideInDown{-webkit-animation-name:slideInDown;animation-name:slideInDown}@-webkit-keyframes slideInLeft{0%{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes slideInLeft{0%{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.slideInLeft{-webkit-animation-name:slideInLeft;animation-name:slideInLeft}@-webkit-keyframes slideInRight{0%{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes slideInRight{0%{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.slideInRight{-webkit-animation-name:slideInRight;animation-name:slideInRight}@-webkit-keyframes slideInUp{0%{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes slideInUp{0%{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0);visibility:visible}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.slideInUp{-webkit-animation-name:slideInUp;animation-name:slideInUp}@-webkit-keyframes slideOutDown{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}}@keyframes slideOutDown{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}}.slideOutDown{-webkit-animation-name:slideOutDown;animation-name:slideOutDown}@-webkit-keyframes slideOutLeft{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}@keyframes slideOutLeft{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}.slideOutLeft{-webkit-animation-name:slideOutLeft;animation-name:slideOutLeft}@-webkit-keyframes slideOutRight{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}@keyframes slideOutRight{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}.slideOutRight{-webkit-animation-name:slideOutRight;animation-name:slideOutRight}@-webkit-keyframes slideOutUp{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}}@keyframes slideOutUp{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{visibility:hidden;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}}.slideOutUp{-webkit-animation-name:slideOutUp;animation-name:slideOutUp}
diff --git a/public/css/demo_index.html b/public/css/demo_index.html
index 281ac40d..38893ea4 100644
--- a/public/css/demo_index.html
+++ b/public/css/demo_index.html
@@ -30,6 +30,174 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe748;</span>
+                <div class="name">多行公式</div>
+                <div class="code-name">&amp;#xe748;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe747;</span>
+                <div class="name">行内公式</div>
+                <div class="code-name">&amp;#xe747;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe746;</span>
+                <div class="name">取消置顶</div>
+                <div class="code-name">&amp;#xe746;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe745;</span>
+                <div class="name">置顶</div>
+                <div class="code-name">&amp;#xe745;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe744;</span>
+                <div class="name">新建简历、我的简历</div>
+                <div class="code-name">&amp;#xe744;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe743;</span>
+                <div class="name">回复</div>
+                <div class="code-name">&amp;#xe743;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe742;</span>
+                <div class="name">图片</div>
+                <div class="code-name">&amp;#xe742;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe741;</span>
+                <div class="name">问题列表</div>
+                <div class="code-name">&amp;#xe741;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe73f;</span>
+                <div class="name">职称</div>
+                <div class="code-name">&amp;#xe73f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe76b;</span>
+                <div class="name">upload</div>
+                <div class="code-name">&amp;#xe76b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe73e;</span>
+                <div class="name">发布职位</div>
+                <div class="code-name">&amp;#xe73e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe73d;</span>
+                <div class="name">职位要求</div>
+                <div class="code-name">&amp;#xe73d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe73c;</span>
+                <div class="name">公司介绍</div>
+                <div class="code-name">&amp;#xe73c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe73b;</span>
+                <div class="name">公司地址</div>
+                <div class="code-name">&amp;#xe73b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe73a;</span>
+                <div class="name">局部刷新键头</div>
+                <div class="code-name">&amp;#xe73a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe739;</span>
+                <div class="name">返回</div>
+                <div class="code-name">&amp;#xe739;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe738;</span>
+                <div class="name">统计</div>
+                <div class="code-name">&amp;#xe738;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe736;</span>
+                <div class="name">签到-02</div>
+                <div class="code-name">&amp;#xe736;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe737;</span>
+                <div class="name">下箭头</div>
+                <div class="code-name">&amp;#xe737;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe735;</span>
+                <div class="name">签到-01</div>
+                <div class="code-name">&amp;#xe735;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe734;</span>
+                <div class="name">移动</div>
+                <div class="code-name">&amp;#xe734;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe732;</span>
+                <div class="name">下移2</div>
+                <div class="code-name">&amp;#xe732;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe731;</span>
+                <div class="name">上移2</div>
+                <div class="code-name">&amp;#xe731;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe730;</span>
+                <div class="name">下移</div>
+                <div class="code-name">&amp;#xe730;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe72f;</span>
+                <div class="name">上移</div>
+                <div class="code-name">&amp;#xe72f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe72e;</span>
+                <div class="name">编辑</div>
+                <div class="code-name">&amp;#xe72e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe72d;</span>
+                <div class="name">删除</div>
+                <div class="code-name">&amp;#xe72d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe72c;</span>
+                <div class="name">选择</div>
+                <div class="code-name">&amp;#xe72c;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe72a;</span>
                 <div class="name">编辑</div>
@@ -2012,6 +2180,258 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-duohanggongshi"></span>
+            <div class="name">
+              多行公式
+            </div>
+            <div class="code-name">.icon-duohanggongshi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-hangneigongshi"></span>
+            <div class="name">
+              行内公式
+            </div>
+            <div class="code-name">.icon-hangneigongshi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-quxiaozhiding"></span>
+            <div class="name">
+              取消置顶
+            </div>
+            <div class="code-name">.icon-quxiaozhiding
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-zhiding1"></span>
+            <div class="name">
+              置顶
+            </div>
+            <div class="code-name">.icon-zhiding1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xinjianjianliwodejianli"></span>
+            <div class="name">
+              新建简历、我的简历
+            </div>
+            <div class="code-name">.icon-xinjianjianliwodejianli
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-huifu"></span>
+            <div class="name">
+              回复
+            </div>
+            <div class="code-name">.icon-huifu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-tupian"></span>
+            <div class="name">
+              图片
+            </div>
+            <div class="code-name">.icon-tupian
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-wentiliebiao"></span>
+            <div class="name">
+              问题列表
+            </div>
+            <div class="code-name">.icon-wentiliebiao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-zhicheng"></span>
+            <div class="name">
+              职称
+            </div>
+            <div class="code-name">.icon-zhicheng
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-upload"></span>
+            <div class="name">
+              upload
+            </div>
+            <div class="code-name">.icon-upload
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fabuzhiwei"></span>
+            <div class="name">
+              发布职位
+            </div>
+            <div class="code-name">.icon-fabuzhiwei
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-zhiweiyaoqiu"></span>
+            <div class="name">
+              职位要求
+            </div>
+            <div class="code-name">.icon-zhiweiyaoqiu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-gongsijieshao"></span>
+            <div class="name">
+              公司介绍
+            </div>
+            <div class="code-name">.icon-gongsijieshao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-gongsidizhi"></span>
+            <div class="name">
+              公司地址
+            </div>
+            <div class="code-name">.icon-gongsidizhi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jubushuaxinjiantou"></span>
+            <div class="name">
+              局部刷新键头
+            </div>
+            <div class="code-name">.icon-jubushuaxinjiantou
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fanhui"></span>
+            <div class="name">
+              返回
+            </div>
+            <div class="code-name">.icon-fanhui
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-tongji1"></span>
+            <div class="name">
+              统计
+            </div>
+            <div class="code-name">.icon-tongji1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-qiandao-1"></span>
+            <div class="name">
+              签到-02
+            </div>
+            <div class="code-name">.icon-qiandao-1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xiajiantou2"></span>
+            <div class="name">
+              下箭头
+            </div>
+            <div class="code-name">.icon-xiajiantou2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-qiandao-"></span>
+            <div class="name">
+              签到-01
+            </div>
+            <div class="code-name">.icon-qiandao-
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yidong"></span>
+            <div class="name">
+              移动
+            </div>
+            <div class="code-name">.icon-yidong
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xiayi1"></span>
+            <div class="name">
+              下移2
+            </div>
+            <div class="code-name">.icon-xiayi1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shangyi1"></span>
+            <div class="name">
+              上移2
+            </div>
+            <div class="code-name">.icon-shangyi1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xiayi"></span>
+            <div class="name">
+              下移
+            </div>
+            <div class="code-name">.icon-xiayi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shangyi"></span>
+            <div class="name">
+              上移
+            </div>
+            <div class="code-name">.icon-shangyi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-bianji5"></span>
+            <div class="name">
+              编辑
+            </div>
+            <div class="code-name">.icon-bianji5
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shanchu3"></span>
+            <div class="name">
+              删除
+            </div>
+            <div class="code-name">.icon-shanchu3
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xuanze"></span>
+            <div class="name">
+              选择
+            </div>
+            <div class="code-name">.icon-xuanze
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-bianji4"></span>
             <div class="name">
@@ -4939,6 +5359,230 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-duohanggongshi"></use>
+                </svg>
+                <div class="name">多行公式</div>
+                <div class="code-name">#icon-duohanggongshi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-hangneigongshi"></use>
+                </svg>
+                <div class="name">行内公式</div>
+                <div class="code-name">#icon-hangneigongshi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-quxiaozhiding"></use>
+                </svg>
+                <div class="name">取消置顶</div>
+                <div class="code-name">#icon-quxiaozhiding</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zhiding1"></use>
+                </svg>
+                <div class="name">置顶</div>
+                <div class="code-name">#icon-zhiding1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xinjianjianliwodejianli"></use>
+                </svg>
+                <div class="name">新建简历、我的简历</div>
+                <div class="code-name">#icon-xinjianjianliwodejianli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-huifu"></use>
+                </svg>
+                <div class="name">回复</div>
+                <div class="code-name">#icon-huifu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tupian"></use>
+                </svg>
+                <div class="name">图片</div>
+                <div class="code-name">#icon-tupian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-wentiliebiao"></use>
+                </svg>
+                <div class="name">问题列表</div>
+                <div class="code-name">#icon-wentiliebiao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zhicheng"></use>
+                </svg>
+                <div class="name">职称</div>
+                <div class="code-name">#icon-zhicheng</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-upload"></use>
+                </svg>
+                <div class="name">upload</div>
+                <div class="code-name">#icon-upload</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fabuzhiwei"></use>
+                </svg>
+                <div class="name">发布职位</div>
+                <div class="code-name">#icon-fabuzhiwei</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zhiweiyaoqiu"></use>
+                </svg>
+                <div class="name">职位要求</div>
+                <div class="code-name">#icon-zhiweiyaoqiu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-gongsijieshao"></use>
+                </svg>
+                <div class="name">公司介绍</div>
+                <div class="code-name">#icon-gongsijieshao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-gongsidizhi"></use>
+                </svg>
+                <div class="name">公司地址</div>
+                <div class="code-name">#icon-gongsidizhi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jubushuaxinjiantou"></use>
+                </svg>
+                <div class="name">局部刷新键头</div>
+                <div class="code-name">#icon-jubushuaxinjiantou</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fanhui"></use>
+                </svg>
+                <div class="name">返回</div>
+                <div class="code-name">#icon-fanhui</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tongji1"></use>
+                </svg>
+                <div class="name">统计</div>
+                <div class="code-name">#icon-tongji1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-qiandao-1"></use>
+                </svg>
+                <div class="name">签到-02</div>
+                <div class="code-name">#icon-qiandao-1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xiajiantou2"></use>
+                </svg>
+                <div class="name">下箭头</div>
+                <div class="code-name">#icon-xiajiantou2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-qiandao-"></use>
+                </svg>
+                <div class="name">签到-01</div>
+                <div class="code-name">#icon-qiandao-</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yidong"></use>
+                </svg>
+                <div class="name">移动</div>
+                <div class="code-name">#icon-yidong</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xiayi1"></use>
+                </svg>
+                <div class="name">下移2</div>
+                <div class="code-name">#icon-xiayi1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shangyi1"></use>
+                </svg>
+                <div class="name">上移2</div>
+                <div class="code-name">#icon-shangyi1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xiayi"></use>
+                </svg>
+                <div class="name">下移</div>
+                <div class="code-name">#icon-xiayi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shangyi"></use>
+                </svg>
+                <div class="name">上移</div>
+                <div class="code-name">#icon-shangyi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-bianji5"></use>
+                </svg>
+                <div class="name">编辑</div>
+                <div class="code-name">#icon-bianji5</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shanchu3"></use>
+                </svg>
+                <div class="name">删除</div>
+                <div class="code-name">#icon-shanchu3</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xuanze"></use>
+                </svg>
+                <div class="name">选择</div>
+                <div class="code-name">#icon-xuanze</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-bianji4"></use>
diff --git a/public/css/edu-all.css b/public/css/edu-all.css
index 5700120c..b8a55807 100644
--- a/public/css/edu-all.css
+++ b/public/css/edu-all.css
@@ -1,198 +1,840 @@
-/*--------------------------首页*/
 /*头部导航条样式---2018-03-19--by-cs*/
-.newHeader{
-    /*overflow:hidden;*/
-    /*text-overflow:ellipsis;*/
-    /*white-space:nowrap;*/
-    background: #24292D !important; width:100%; height: 60px !important; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);
+.newHeader {
+  background: #24292D !important;
+  width: 100%;
+  height: 60px !important;
+  min-width: 1200px;
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  z-index: 1000;
+  -moz-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.1);
+  /* 老的 Firefox */
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.1);
+}
+
+.newHeader .logoimg {
+  margin-top: 16px;
+  float: left;
+  width: 97px;
+}
+
+.head-nav {
+  float: left;
+  text-align: center;
+  height: 60px;
+  box-sizing: border-box;
+  min-width: 780px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.head-nav ul#header-nav {
+  position: absolute;
+  top: 0px;
+  z-index: 3;
+  height: 60px;
+  box-sizing: border-box;
+}
+
+.head-nav ul#header-nav li {
+  float: left;
+  height: 60px;
+  line-height: 60px;
+  margin-right: 30px;
+  cursor: pointer;
+  position: relative;
+  font-size: 16px
+}
+
+.head-nav ul#header-nav li a {
+  display: block;
+  height: 100%;
+  width: 100%;
+  color: #fff
+}
+
+.head-nav ul#header-nav li a:hover {
+  color: #cccccc;
+}
+
+.head-nav ul#header-nav li:last-child {
+  margin-right: 0px
+}
+
+.head-nav ul#header-nav li.active a {
+  color: #459be5 !important;
+}
+
+.head-nav ul#header-nav li.active p {
+  color: #459be5 !important;
+}
+
+.head-nav ul#header-nav li p:hover {
+  color: #cccccc;
+}
+
+.head-nav ul#header-nav li p {
+  display: block;
+  height: 100%;
+  width: 100%;
+  color: #fff
+}
+
+.head-nav ul#header-nav li.active div ul li a {
+  color: #000 !important;
+}
+
+.head-nav ul#header-nav li.active div ul li a:hover {
+  color: #FFF !important;
+}
+
+.head-nav ul#header-nav li.active ul li a {
+  color: #000 !important;
+}
+
+.head-nav ul#header-nav li.active ul li a:hover {
+  color: #FFF !important;
+}
+
+.head-nav ul#header-nav li.active:after {
+  content: '';
+  position: absolute;
+  left: 0px;
+  top: auto;
+  bottom: 10px;
+  right: auto;
+  height: 2px;
+  width: 14px;
+  background-color: #459be5;
+}
+
+.nav-img {
+  position: absolute;
+  top: 2px;
+  right: -8px;
+  display: none
+}
+
+.head-right {
+  box-sizing: border-box;
+  height: 60px;
+  background: #24292D;
+}
+
+.head-right i {
+  margin-top: 12px;
+  float: right;
+  margin-right: 15px;
+  margin-left: 15px;
 }
-.newHeader .logoimg{
-    margin-top: 16px;
-    float: left;
-    width: 97px;}
-.head-nav{
-    float: left;
-    text-align: center;
-    height: 60px;
-    box-sizing: border-box;
-    min-width: 780px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;}
-.head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}
-.head-nav ul#header-nav li a{display: block;height: 100%;width: 100%;color: #fff}
-.head-nav ul#header-nav li a:hover{color: #cccccc;}
-.head-nav ul#header-nav li:last-child{margin-right: 0px}
-.head-nav ul#header-nav li.active a{color:#459be5 !important;}
-.head-nav ul#header-nav li.active p{color:#459be5 !important;}
-.head-nav ul#header-nav li p:hover {color: #cccccc;}
-.head-nav ul#header-nav li p{display: block;height: 100%;width: 100%;color: #fff}
-.head-nav ul#header-nav li.active div ul li a {color: #000 !important;}
-.head-nav ul#header-nav li.active div ul li a:hover {color: #FFF!important;}
-.head-nav ul#header-nav li.active ul li a {color: #000!important;}
-.head-nav ul#header-nav li.active ul li a:hover{color:#FFF !important;}
-.head-nav ul#header-nav li.active:after {content: '';position: absolute;left: 0px;top: auto;bottom: 10px;right: auto;height: 2px;width: 14px;background-color: #459be5;}
-.nav-img{position: absolute;top:2px;right: -8px;display: none}
 
-.head-right{box-sizing: border-box;height: 60px; background: #24292D; }
-.head-right i{margin-top:12px;float: right;margin-right: 15px;margin-left: 15px;}
 /* tpm*/
-.educontent .icon { padding-left: 0px !important;    padding-top: 0px !important;   padding-bottom: 0px !important;}
-em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
+.educontent .icon {
+  padding-left: 0px !important;
+  padding-top: 0px !important;
+  padding-bottom: 0px !important;
+}
+
+em.vertical-line {
+  display: inline-block;
+  width: 2px;
+  background: #999;
+  height: 10px
+}
+
 /*.newslight{position: absolute;display: block;background: #FF6800;border-radius:30px;left: 25px;top: 13px;padding:0px 2px;color: #fff;font-size: 11px;*/
-    /*height: 16px;line-height: 15px;min-width: 12px;text-align: center;}*/
+/*height: 16px;line-height: 15px;min-width: 12px;text-align: center;}*/
 
-.newslight{ display: block; width: 5px; height: 5px; border-radius: 50%; left: 25px; top: 3px;  position: absolute; background: #FF6800;}
+.newslight {
+  display: block;
+  width: 5px;
+  height: 5px;
+  border-radius: 50%;
+  left: 25px;
+  top: 3px;
+  position: absolute;
+  background: #FF6800;
+}
 
 
-#ratePanel{position: relative;width: 512px;height: 170px;left: -30px;top: -2px;display: none}
-.showratePanel{ position: absolute;width: 512px;height: 224px;left: -31px;top: 30px;}
-.rateTrangle{display: block;border-width: 8px;position: absolute;top: -8px;left: 35px;border-style: dashed solid dashed dashed;border-color: transparent transparent #fff transparent;font-size: 0;line-height: 0;z-index: 2}
-.ratePanelContent{width: 100%;padding: 20px;box-sizing: border-box;height: 180px;background-color: #fff;box-shadow: 0px 0px 5px rgb(202, 193, 153);position: absolute;top: 8px;z-index: 1}
-#commentsStar{height: 30px;padding-top: 7px;box-sizing: border-box;}
-.ratePanelContent-left{justify-content: center;align-items: center;display: -webkit-flex;height: 100%;}
-.greybar{width: 210px;position: relative;height: 8px;background-color: #CDCDCD;border-radius: 4px;margin-left: 10px;float: left;margin-top:8px;}
-.yellowBar{position: absolute;top: 0px;height: 8px;border-radius: 4px;left: 0px;background-color: #FFA800;display: block}
-.ratePanelContent-left span{display: block;text-align: center}
+#ratePanel {
+  position: relative;
+  width: 512px;
+  height: 170px;
+  left: -30px;
+  top: -2px;
+  display: none
+}
+
+.showratePanel {
+  position: absolute;
+  width: 512px;
+  height: 224px;
+  left: -31px;
+  top: 30px;
+}
+
+.rateTrangle {
+  display: block;
+  border-width: 8px;
+  position: absolute;
+  top: -8px;
+  left: 35px;
+  border-style: dashed solid dashed dashed;
+  border-color: transparent transparent #fff transparent;
+  font-size: 0;
+  line-height: 0;
+  z-index: 2
+}
+
+.ratePanelContent {
+  width: 100%;
+  padding: 20px;
+  box-sizing: border-box;
+  height: 180px;
+  background-color: #fff;
+  box-shadow: 0px 0px 5px rgb(202, 193, 153);
+  position: absolute;
+  top: 8px;
+  z-index: 1
+}
+
+#commentsStar {
+  height: 30px;
+  padding-top: 7px;
+  box-sizing: border-box;
+}
+
+.ratePanelContent-left {
+  justify-content: center;
+  align-items: center;
+  display: -webkit-flex;
+  height: 100%;
+}
+
+.greybar {
+  width: 210px;
+  position: relative;
+  height: 8px;
+  background-color: #CDCDCD;
+  border-radius: 4px;
+  margin-left: 10px;
+  float: left;
+  margin-top: 8px;
+}
+
+.yellowBar {
+  position: absolute;
+  top: 0px;
+  height: 8px;
+  border-radius: 4px;
+  left: 0px;
+  background-color: #FFA800;
+  display: block
+}
+
+.ratePanelContent-left span {
+  display: block;
+  text-align: center
+}
+
 /*----------------------------------首页查询输入框*/
-.search-all{width: 216px;margin: 0px auto;position: relative;background-color: #24292D;}
-.seperateLine { border-left: 1px solid #EAEAEA;float: left;height: 16px;margin-top: 22px;   visibility: hidden;}
-.search-all .search-input{  width: 181px; outline: none;border: none;height: 30px;margin-top: 15px;border-bottom: 1px solid #eee;background: none;padding-left: 10px;box-sizing: border-box;color: #fff}
-.search-all .search-clear{font-size: 14px;display: inline-block;width: 50px;text-align: center;color: #656565;line-height: 60px;cursor: pointer}
-.search-icon{color: #656565;display: block;display: inline-block;height: 60px;width: 30px;cursor: pointer;}
-.search-icon path{ fill: #4CACFF;}
+.search-all {
+  width: 216px;
+  margin: 0px auto;
+  position: relative;
+  background-color: #24292D;
+}
+
+.seperateLine {
+  border-left: 1px solid #EAEAEA;
+  float: left;
+  height: 16px;
+  margin-top: 22px;
+  visibility: hidden;
+}
+
+.search-all .search-input {
+  width: 181px;
+  outline: none;
+  border: none;
+  height: 30px;
+  margin-top: 15px;
+  border-bottom: 1px solid #eee;
+  background: none;
+  padding-left: 10px;
+  box-sizing: border-box;
+  color: #fff
+}
+
+.search-all .search-clear {
+  font-size: 14px;
+  display: inline-block;
+  width: 50px;
+  text-align: center;
+  color: #656565;
+  line-height: 60px;
+  cursor: pointer
+}
+
+.search-icon {
+  color: #656565;
+  display: block;
+  display: inline-block;
+  height: 60px;
+  width: 30px;
+  cursor: pointer;
+}
+
+.search-icon path {
+  fill: #4CACFF;
+}
 
 /* 右侧内容宽度变化的话，需要调整posi-search right的值*/
-.posi-search{opacity: 1;position: absolute;top: -2px;background: #fff;z-index: 2; right: -241px;}
-.posi-search.unlogin{right: -191px;}
-.search-content{box-sizing: border-box;position: absolute;height: 300px;background: #fff;border-radius: 0px 0px 5px 5px;width: 100%;left: 0px;top:58px;box-shadow: 0 4px 8px 0 rgba(0,0,0,.2);overflow-y: auto}
-.search-title{height: 40px;line-height: 40px;padding-left: 20px;font-size: 12px;color: #bbb;text-align: left}
-.search-content a{display: inline-block;width:100%;height: 30px;line-height: 30px;padding:0px 20px;box-sizing: border-box;text-align: left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
-/*底部*/
-.newFooter{
-    max-height: 110px;
+.posi-search {
+  opacity: 1;
+  position: absolute;
+  top: -2px;
+  background: #fff;
+  z-index: 2;
+  right: -241px;
 }
-.newFooter{ position: absolute; bottom: 0; width: 100%;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;}
-.footercon{border-bottom:1px solid #47494d;}
-.inner-footernav{width: 560px;margin: 0px auto}
-.inner-footernav li{float: left;height: 50px;width: 80px;text-align: center}
-.inner-footernav li a{width: 100%;text-align: center;line-height: 50px;color: #888}
-.inner-footer_con{ width: 1200px; margin: 0 auto;}
-.inner-footernavysl{  display: flex;flex-direction:initial;}
+
+.posi-search.unlogin {
+  right: -191px;
+}
+
+.search-content {
+  box-sizing: border-box;
+  position: absolute;
+  height: 300px;
+  background: #fff;
+  border-radius: 0px 0px 5px 5px;
+  width: 100%;
+  left: 0px;
+  top: 58px;
+  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, .2);
+  overflow-y: auto
+}
+
+.search-title {
+  height: 40px;
+  line-height: 40px;
+  padding-left: 20px;
+  font-size: 12px;
+  color: #bbb;
+  text-align: left
+}
+
+.search-content a {
+  display: inline-block;
+  width: 100%;
+  height: 30px;
+  line-height: 30px;
+  padding: 0px 20px;
+  box-sizing: border-box;
+  text-align: left;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+/*底部*/
+.newFooter {
+  max-height: 110px;
+}
+
+.newFooter {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background: #323232;
+  clear: both;
+  min-width: 1200px;
+  z-index: 8;
+  left: 0px;
+}
+
+.footercon {
+  border-bottom: 1px solid #47494d;
+}
+
+.inner-footernav {
+  width: 560px;
+  margin: 0px auto
+}
+
+.inner-footernav li {
+  float: left;
+  height: 50px;
+  width: 80px;
+  text-align: center
+}
+
+.inner-footernav li a {
+  width: 100%;
+  text-align: center;
+  line-height: 50px;
+  color: #888
+}
+
+.inner-footer_con {
+  width: 1200px;
+  margin: 0 auto;
+}
+
+.inner-footernavysl {
+  display: flex;
+  flex-direction: initial;
+}
+
 .inner-footernavysl li a {
-    height: 40px;
-    line-height: 40px;
-    color:#878786;
-    font-size: 19px;
+  height: 40px;
+  line-height: 40px;
+  color: #878786;
+  font-size: 19px;
 }
 
 .inner-footernavysl li Link {
-    height: 40px;
-    line-height: 40px;
-    color:#878786;
+  height: 40px;
+  line-height: 40px;
+  color: #878786;
 }
 
-.intermediatecenter{
-    width:100%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
+.intermediatecenter {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
 }
-.footer_con-p{ color: #888; margin-top:10px;}
+
+.footer_con-p {
+  color: #888;
+  margin-top: 10px;
+}
+
 /*banner图*/
-.banner{width:100%;height:345px;position: relative;overflow: hidden;border-radius: 10px;}
-.banner .img{position: absolute;left:0px;top:0px;}
-.banner .img li{float:left;width:1200px;height: 345px;}
-.banner .img li a{display: block;width: 100%;height: 100%}
-.banner .img li img{width: 100%;height: 345px;}
-.banner .num{position:absolute;width:100%;bottom:30px;left:0px;text-align: center;font-size: 0px;}
-.banner .num li{width: 7px;height: 7px;background:rgba(225,225,225,0.3);border-radius: 50%;display: inline-block;margin:0 5px;cursor: pointer;}
-.banner .num li.on{width: 12px;border-radius: 8px;}
-.banner-l{position: absolute;left: -76px;top:0px;width: 76px;text-align: left;height: 100%;width: 76px;display: none;cursor: pointer}
-.banner-r{position: absolute;right: -76px;top:0px;width: 76px;text-align: right;height: 100%;width: 76px;display: none;cursor: pointer}
-.banner-r img,.banner-l img{padding-top: 148px;}
+.banner {
+  width: 100%;
+  height: 345px;
+  position: relative;
+  overflow: hidden;
+  border-radius: 10px;
+}
+
+.banner .img {
+  position: absolute;
+  left: 0px;
+  top: 0px;
+}
+
+.banner .img li {
+  float: left;
+  width: 1200px;
+  height: 345px;
+}
+
+.banner .img li a {
+  display: block;
+  width: 100%;
+  height: 100%
+}
+
+.banner .img li img {
+  width: 100%;
+  height: 345px;
+}
+
+.banner .num {
+  position: absolute;
+  width: 100%;
+  bottom: 30px;
+  left: 0px;
+  text-align: center;
+  font-size: 0px;
+}
+
+.banner .num li {
+  width: 7px;
+  height: 7px;
+  background: rgba(225, 225, 225, 0.3);
+  border-radius: 50%;
+  display: inline-block;
+  margin: 0 5px;
+  cursor: pointer;
+}
+
+.banner .num li.on {
+  width: 12px;
+  border-radius: 8px;
+}
+
+.banner-l {
+  position: absolute;
+  left: -76px;
+  top: 0px;
+  width: 76px;
+  text-align: left;
+  height: 100%;
+  width: 76px;
+  display: none;
+  cursor: pointer
+}
+
+.banner-r {
+  position: absolute;
+  right: -76px;
+  top: 0px;
+  width: 76px;
+  text-align: right;
+  height: 100%;
+  width: 76px;
+  display: none;
+  cursor: pointer
+}
+
+.banner-r img,
+.banner-l img {
+  padding-top: 148px;
+}
 
 /*更多*/
-.moreitem{position: absolute;right: 5px;top:35px;height: 15px;color:#656565}
-/*块状列表*/
-.square-list{width: 100%;box-sizing: border-box;margin-top:20px;flex-wrap:wrap;display:flex;}
-.square-Item{position: relative;width:280px;margin-right: 26px;margin-bottom: 26px;float: left;border-radius: 6px;background-color:#fff;box-shadow: 0px 0px 12px rgba(0,0,0,0.1); }
-.square-Item:hover{
-    /*bottom: 3px;*/
-    box-shadow: 0px 0px 12px rgba(0,0,0,0.3);}
-.square-Item:hover .closeSquare{display: block}
-.square-Item:nth-child(4n+0){margin-right: 0px;}
-.square-Item .square-img{display: block;width: 100%}
-.square-Item .square-img img{width: 100%;border-radius: 6px 6px 0px 0px;vertical-align: bottom;height: 210px;}
-.square-main{padding:15px 20px;box-sizing: border-box;}
-.course-bottom{height: 48px;padding: 10px 0px;box-sizing: border-box}
-.squareIconSpan{line-height: 25px}
-/*块状列表（小）---列如实训路径详情选择实训*/
-.square-Item.smallSquare{width: 32%;margin-right: 1.33%;margin-bottom: 10px;min-height: 210px; border: none;}
-.square-Item.smallSquare:hover{bottom: 0px; box-shadow: 0px 0px 12px rgba(0,0,0,0.1); }
-.smallSquare:nth-child(3n+0){margin-right: 0px;}
-.partimg{height: 180px;width: 100%;border-radius: 6px 6px 0px 0px;}
-/*块状列表上面的绿色标签*/
-.tag-green{
-    position: absolute;
-    left: 10px;
-    bottom: 90px;}
-.tag-green .tag-name{display: block;width: auto;
-    /*background-image: url("/images/educoder/tag1.png");*/
-    background: rgba(000,000,000,0.56);
-    border: 1px solid rgba(255,255,255,0.56);
-    border-radius: 3px;
-    font-size: 12px;
-    /*opacity: 0.56;*/
-    background-size: 100% 100%;
-    padding: 0px 8px;color: #fff;float: left;}
-.tag-orange{position: absolute;right: 0px;top:12px;}
-.tag-orange .tag-name{display: block;width: auto;background-color:#FF6800;
-    background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;
-    height: 28px;
-    line-height: 28px;
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
+.moreitem {
+  position: absolute;
+  right: 5px;
+  top: 35px;
+  height: 15px;
+  color: #656565
 }
-/*发送至弹框里的下拉框*/
-.downSelectOption{position: relative;height: 35px;}
-.downSelectOption .showOption{background-color: #F4F4F4;border: 1px solid #EAEAEA;width: 100%;padding: 5px 40px 5px 5px;outline: none;height: 100%;box-sizing: border-box;}
 
-.iconPosition{position: absolute;right: 10px;top:5px;}
-.downOptions{display: none;cursor: pointer;position: absolute;left: 0px;width: 100%;top: 35px;padding: 5px 0px;height: 200px;overflow-y: auto;background-color: #fff;box-shadow:0px 1px 4px 1px rgba(76,76,76,0.2);z-index: 2 }
-.downOptions p{height: 28px;line-height: 28px;padding-left:20px;box-sizing: border-box;cursor: pointer}
-.downOptions p:hover{background-color: #F6F6F6;}
+/*块状列表*/
+.square-list {
+  width: 100%;
+  box-sizing: border-box;
+  margin-top: 20px;
+  flex-wrap: wrap;
+  display: flex;
+}
+
+.square-Item {
+  position: relative;
+  width: 280px;
+  margin-right: 26px;
+  margin-bottom: 26px;
+  float: left;
+  border-radius: 6px;
+  background-color: #fff;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.1);
+}
+
+.square-Item:hover {
+  /*bottom: 3px;*/
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.3);
+}
+
+.square-Item:hover .closeSquare {
+  display: block
+}
+
+.square-Item:nth-child(4n+0) {
+  margin-right: 0px;
+}
+
+.square-Item .square-img {
+  display: block;
+  width: 100%
+}
+
+.square-Item .square-img img {
+  width: 100%;
+  border-radius: 6px 6px 0px 0px;
+  vertical-align: bottom;
+  height: 210px;
+}
+
+.square-main {
+  padding: 15px 20px;
+  box-sizing: border-box;
+}
+
+.course-bottom {
+  height: 48px;
+  padding: 10px 0px;
+  box-sizing: border-box
+}
+
+.squareIconSpan {
+  line-height: 25px
+}
+
+/*块状列表（小）---列如实训路径详情选择实训*/
+.square-Item.smallSquare {
+  width: 32%;
+  margin-right: 1.33%;
+  margin-bottom: 10px;
+  min-height: 210px;
+  border: none;
+}
+
+.square-Item.smallSquare:hover {
+  bottom: 0px;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.1);
+}
+
+.smallSquare:nth-child(3n+0) {
+  margin-right: 0px;
+}
+
+.partimg {
+  height: 180px;
+  width: 100%;
+  border-radius: 6px 6px 0px 0px;
+}
+
+/*块状列表上面的绿色标签*/
+.tag-green {
+  position: absolute;
+  left: 10px;
+  bottom: 90px;
+}
+
+.tag-green .tag-name {
+  display: block;
+  width: auto;
+  /*background-image: url("/images/educoder/tag1.png");*/
+  background: rgba(000, 000, 000, 0.56);
+  border: 1px solid rgba(255, 255, 255, 0.56);
+  border-radius: 3px;
+  font-size: 12px;
+  /*opacity: 0.56;*/
+  background-size: 100% 100%;
+  padding: 0px 8px;
+  color: #fff;
+  float: left;
+}
+
+.tag-orange {
+  position: absolute;
+  right: 0px;
+  top: 12px;
+}
+
+.tag-orange .tag-name {
+  display: block;
+  width: auto;
+  background-color: #FF6800;
+  background-size: 100% 100%;
+  padding: 0px 8px;
+  color: #fff;
+  float: left;
+  height: 28px;
+  line-height: 28px;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+
+/*发送至弹框里的下拉框*/
+.downSelectOption {
+  position: relative;
+  height: 35px;
+}
+
+.downSelectOption .showOption {
+  background-color: #F4F4F4;
+  border: 1px solid #EAEAEA;
+  width: 100%;
+  padding: 5px 40px 5px 5px;
+  outline: none;
+  height: 100%;
+  box-sizing: border-box;
+}
+
+.iconPosition {
+  position: absolute;
+  right: 10px;
+  top: 5px;
+}
+
+.downOptions {
+  display: none;
+  cursor: pointer;
+  position: absolute;
+  left: 0px;
+  width: 100%;
+  top: 35px;
+  padding: 5px 0px;
+  height: 200px;
+  overflow-y: auto;
+  background-color: #fff;
+  box-shadow: 0px 1px 4px 1px rgba(76, 76, 76, 0.2);
+  z-index: 2
+}
+
+.downOptions p {
+  height: 28px;
+  line-height: 28px;
+  padding-left: 20px;
+  box-sizing: border-box;
+  cursor: pointer
+}
+
+.downOptions p:hover {
+  background-color: #F6F6F6;
+}
 
 /*门户左侧导航栏*/
-.user_navlist{position: absolute;left: 0px;width: 160px;top:0px;height: 100%;}
-.user_navlist_black{position: relative;width: 100%;height: 100%;border-radius: 8px 0px 0px 8px;background: rgba(0,0,0,0.8);}
-.user_navlist_white{position: absolute;left: 160px;background: #FFFFff;width: 622px;min-height: 345px;top: 0px;z-index: 1;display: none;padding:0px 30px;box-sizing: border-box;box-shadow: 0px 0px 10px rgba(76,76,76,0.2);z-index: 99}
-.user_navlist_white a{color: #989898;margin-right: 15px;font-size: 14px;display: block;float: left;height: 30px;line-height: 30px;}
-.user_navlist_white a:hover{color: #4cacff}
-.headIcon{height: 100%;box-sizing: border-box;    margin: 0px!important;}
-.black_nav_list{padding: 4px 0px;box-sizing: border-box;height: 100%;}
-.black_nav_list li{line-height: 40px;height: 40px;color: #fff;cursor: pointer;}
-.black_nav_span{display: block;margin:0px 20px;border-bottom: 1px solid #4B4B4B;padding-left: 8px;color: #FAFAFA}
-.welcome_shixun_index:last-child .black_nav_span{border-bottom: none}
-.black_nav_list li:hover{background: #fff;}
-.black_nav_list li:hover .black_nav_span{color: #05101A!important;}
-.black_nav_list li:hover > a{color:#4cacff!important;}
-.black_nav_list li:hover .user_navlist_white{display: block}
-.navlistpanel-line{border-bottom: 1px solid #EBEBEB;}
-.navlistpanel-line:last-child{border-bottom: none;}
-.little-title{width: 100%;height: 20px;line-height: 20px;color: #05101a;font-size:15px;margin-bottom: 8px; }
+.user_navlist {
+  position: absolute;
+  left: 0px;
+  width: 160px;
+  top: 0px;
+  height: 100%;
+}
+
+.user_navlist_black {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  border-radius: 8px 0px 0px 8px;
+  background: rgba(0, 0, 0, 0.8);
+}
+
+.user_navlist_white {
+  position: absolute;
+  left: 160px;
+  background: #FFFFff;
+  width: 622px;
+  min-height: 345px;
+  top: 0px;
+  z-index: 1;
+  display: none;
+  padding: 0px 30px;
+  box-sizing: border-box;
+  box-shadow: 0px 0px 10px rgba(76, 76, 76, 0.2);
+  z-index: 99
+}
+
+.user_navlist_white a {
+  color: #989898;
+  margin-right: 15px;
+  font-size: 14px;
+  display: block;
+  float: left;
+  height: 30px;
+  line-height: 30px;
+}
+
+.user_navlist_white a:hover {
+  color: #4cacff
+}
+
+.headIcon {
+  height: 100%;
+  box-sizing: border-box;
+  margin: 0px !important;
+}
+
+.black_nav_list {
+  padding: 4px 0px;
+  box-sizing: border-box;
+  height: 100%;
+}
+
+.black_nav_list li {
+  line-height: 40px;
+  height: 40px;
+  color: #fff;
+  cursor: pointer;
+}
+
+.black_nav_span {
+  display: block;
+  margin: 0px 20px;
+  border-bottom: 1px solid #4B4B4B;
+  padding-left: 8px;
+  color: #FAFAFA
+}
+
+.welcome_shixun_index:last-child .black_nav_span {
+  border-bottom: none
+}
+
+.black_nav_list li:hover {
+  background: #fff;
+}
+
+.black_nav_list li:hover .black_nav_span {
+  color: #05101A !important;
+}
+
+.black_nav_list li:hover>a {
+  color: #4cacff !important;
+}
+
+.black_nav_list li:hover .user_navlist_white {
+  display: block
+}
+
+.navlistpanel-line {
+  border-bottom: 1px solid #EBEBEB;
+}
+
+.navlistpanel-line:last-child {
+  border-bottom: none;
+}
+
+.little-title {
+  width: 100%;
+  height: 20px;
+  line-height: 20px;
+  color: #05101a;
+  font-size: 15px;
+  margin-bottom: 8px;
+}
+
 /*排行榜*/
-.ranking{text-align: center;margin-top:40px}
-.grade{width: auto;display: inline-block;}
-.grade li{float: left;margin:0px 10px;width: 60px;}
-.ranking a img{width: 60px;height: 60px;border-radius: 50%;box-shadow: 0px 0px 12px rgba(0,0,0,0.2);}
-.mentor-ranking{background-color: #EFEFEF;background-size:100% 100%;}
-.huangguan{position: absolute;top: -30px;left: 13px;}
+.ranking {
+  text-align: center;
+  margin-top: 40px
+}
+
+.grade {
+  width: auto;
+  display: inline-block;
+}
+
+.grade li {
+  float: left;
+  margin: 0px 10px;
+  width: 60px;
+}
+
+.ranking a img {
+  width: 60px;
+  height: 60px;
+  border-radius: 50%;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.2);
+}
+
+.mentor-ranking {
+  background-color: #EFEFEF;
+  background-size: 100% 100%;
+}
+
+.huangguan {
+  position: absolute;
+  top: -30px;
+  left: 13px;
+}
+
 /*消息盒子*/
-.news-list{max-height: 150px;overflow-y: auto}
+.news-list {
+  max-height: 150px;
+  overflow-y: auto
+}
 
 /*
     colorbox
@@ -200,931 +842,3586 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
     Change the following styles to modify the appearance of Colorbox.  They are
     ordered & tabbed in a way that represents the nesting of the generated HTML.
 */
-#cboxOverlay{background:#fff;}
-#colorbox{outline:0;}
-#cboxTopLeft{width:25px; height:25px; background:url(/images/colorbox/border1.png) no-repeat 0 0;}
-#cboxTopCenter{height:25px; background:url(/images/colorbox/border1.png) repeat-x 0 -50px;}
-#cboxTopRight{width:25px; height:25px; background:url(/images/colorbox/border1.png) no-repeat -25px 0;}
-#cboxBottomLeft{width:25px; height:25px; background:url(/images/colorbox/border1.png) no-repeat 0 -25px;}
-#cboxBottomCenter{height:25px; background:url(/images/colorbox/border1.png) repeat-x 0 -75px;}
-#cboxBottomRight{width:25px; height:25px; background:url(/images/colorbox/border1.png) no-repeat -25px -25px;}
-#cboxMiddleLeft{width:25px; background:url(/images/colorbox/border2.png) repeat-y 0 0;}
-#cboxMiddleRight{width:25px; background:url(/images/colorbox/border2.png) repeat-y -25px 0;}
-#cboxContent{background:#fff; overflow:hidden;}
-.cboxIframe{background:#fff;}
-#cboxError{padding:50px; border:1px solid #ccc;}
-#cboxLoadedContent{margin-bottom:20px;}
-#cboxTitle{position:absolute; bottom:0px; left:0; text-align:center; width:100%; color:#999;}
-#cboxCurrent{position:absolute; bottom:0px; left:100px; color:#999;}
-#cboxLoadingOverlay{background:#fff url(/images/colorbox/loading.gif) no-repeat 5px 5px;}
+#cboxOverlay {
+  background: #fff;
+}
+
+#colorbox {
+  outline: 0;
+}
+
+#cboxTopLeft {
+  width: 25px;
+  height: 25px;
+  background: url(/images/colorbox/border1.png) no-repeat 0 0;
+}
+
+#cboxTopCenter {
+  height: 25px;
+  background: url(/images/colorbox/border1.png) repeat-x 0 -50px;
+}
+
+#cboxTopRight {
+  width: 25px;
+  height: 25px;
+  background: url(/images/colorbox/border1.png) no-repeat -25px 0;
+}
+
+#cboxBottomLeft {
+  width: 25px;
+  height: 25px;
+  background: url(/images/colorbox/border1.png) no-repeat 0 -25px;
+}
+
+#cboxBottomCenter {
+  height: 25px;
+  background: url(/images/colorbox/border1.png) repeat-x 0 -75px;
+}
+
+#cboxBottomRight {
+  width: 25px;
+  height: 25px;
+  background: url(/images/colorbox/border1.png) no-repeat -25px -25px;
+}
+
+#cboxMiddleLeft {
+  width: 25px;
+  background: url(/images/colorbox/border2.png) repeat-y 0 0;
+}
+
+#cboxMiddleRight {
+  width: 25px;
+  background: url(/images/colorbox/border2.png) repeat-y -25px 0;
+}
+
+#cboxContent {
+  background: #fff;
+  overflow: hidden;
+}
+
+.cboxIframe {
+  background: #fff;
+}
+
+#cboxError {
+  padding: 50px;
+  border: 1px solid #ccc;
+}
+
+#cboxLoadedContent {
+  margin-bottom: 20px;
+}
+
+#cboxTitle {
+  position: absolute;
+  bottom: 0px;
+  left: 0;
+  text-align: center;
+  width: 100%;
+  color: #999;
+}
+
+#cboxCurrent {
+  position: absolute;
+  bottom: 0px;
+  left: 100px;
+  color: #999;
+}
+
+#cboxLoadingOverlay {
+  background: #fff url(/images/colorbox/loading.gif) no-repeat 5px 5px;
+}
+
 /* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
-#cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; width:auto; background:none; }
+#cboxPrevious,
+#cboxNext,
+#cboxSlideshow,
+#cboxClose {
+  border: 0;
+  padding: 0;
+  margin: 0;
+  overflow: visible;
+  width: auto;
+  background: none;
+}
+
 /* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
-#cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;}
-#cboxSlideshow{position:absolute; bottom:0px; right:42px; color:#444;}
-#cboxPrevious{position:absolute; bottom:0px; left:0; color:#444;}
-#cboxNext{position:absolute; bottom:0px; left:63px; color:#444;}
-#cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;}
+#cboxPrevious:active,
+#cboxNext:active,
+#cboxSlideshow:active,
+#cboxClose:active {
+  outline: 0;
+}
+
+#cboxSlideshow {
+  position: absolute;
+  bottom: 0px;
+  right: 42px;
+  color: #444;
+}
+
+#cboxPrevious {
+  position: absolute;
+  bottom: 0px;
+  left: 0;
+  color: #444;
+}
+
+#cboxNext {
+  position: absolute;
+  bottom: 0px;
+  left: 63px;
+  color: #444;
+}
+
+#cboxClose {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  display: block;
+  color: #444;
+}
 
 /*-----------------------------登录-------------------------------*/
-.login_register{height: 100%; width: 100%;background-size: 100% 100%;background-image:url("/images/educoder/logo-bg.jpg");position: fixed;bottom: 0px;right: 0px;min-height: 700px;}
-.login_reg{width: 414px;margin:0px auto;background-size: 100% 100%;}
-#register_content{border-radius: 5px;background: #FFFFff;width: 100%;text-align: center;margin-top: 75px;padding: 40px 30px;box-sizing: border-box}
-#log_reg_content{border-radius: 5px;background: #FFFFff;width: 100%;text-align: center;position: absolute;top: 165px;
-    left: 0px;padding: 40px 30px;box-sizing: border-box}
-.log_nav{border-bottom:1px solid #eaeaea;}
-.log_nav li{float: left;text-align: center;font-size: 16px;padding-bottom:15px;
-    /*margin: 0px 20px;*/
-    cursor: pointer;}
-.log_nav li.active{border-bottom: 2px solid #459be5;}
-.log-botton{width: 100%;text-align: center;color: #FFFFff!important;display: block;background: #cbcbcb;height: 45px;line-height: 45px;border-radius: 4px;letter-spacing: 2px;cursor: pointer}
-.log-botton:hover{color: #FFFFff!important;}
-.log-botton.active{background: #4cacff;}
-.gain-code{width: 48%;display: block;float: right;height: 45px;line-height: 45px;text-align: center;background: #CBCBCB;color: #FFFFff!important;border-radius: 4px;cursor: pointer}
-.gain-code:hover{color: #FFFFff!important;}
-.logo-redirect{display: block}
-.logo-redirect img{width: 105px;}
+.login_register {
+  height: 100%;
+  width: 100%;
+  background-size: 100% 100%;
+  background-image: url("/images/educoder/logo-bg.jpg");
+  position: fixed;
+  bottom: 0px;
+  right: 0px;
+  min-height: 700px;
+}
+
+.login_reg {
+  width: 414px;
+  margin: 0px auto;
+  background-size: 100% 100%;
+}
+
+#register_content {
+  border-radius: 5px;
+  background: #FFFFff;
+  width: 100%;
+  text-align: center;
+  margin-top: 75px;
+  padding: 40px 30px;
+  box-sizing: border-box
+}
+
+#log_reg_content {
+  border-radius: 5px;
+  background: #FFFFff;
+  width: 100%;
+  text-align: center;
+  position: absolute;
+  top: 165px;
+  left: 0px;
+  padding: 40px 30px;
+  box-sizing: border-box
+}
+
+.log_nav {
+  border-bottom: 1px solid #eaeaea;
+}
+
+.log_nav li {
+  float: left;
+  text-align: center;
+  font-size: 16px;
+  padding-bottom: 15px;
+  /*margin: 0px 20px;*/
+  cursor: pointer;
+}
+
+.log_nav li.active {
+  border-bottom: 2px solid #459be5;
+}
+
+.log-botton {
+  width: 100%;
+  text-align: center;
+  color: #FFFFff !important;
+  display: block;
+  background: #cbcbcb;
+  height: 45px;
+  line-height: 45px;
+  border-radius: 4px;
+  letter-spacing: 2px;
+  cursor: pointer
+}
+
+.log-botton:hover {
+  color: #FFFFff !important;
+}
+
+.log-botton.active {
+  background: #4cacff;
+}
+
+.gain-code {
+  width: 48%;
+  display: block;
+  float: right;
+  height: 45px;
+  line-height: 45px;
+  text-align: center;
+  background: #CBCBCB;
+  color: #FFFFff !important;
+  border-radius: 4px;
+  cursor: pointer
+}
+
+.gain-code:hover {
+  color: #FFFFff !important;
+}
+
+.logo-redirect {
+  display: block
+}
+
+.logo-redirect img {
+  width: 105px;
+}
 
 /*-----------------------------注册、找回密码、绑定邮箱----------------------------*/
-div.title_detail{width: 660px;margin:0px auto;}
-div.title_detail img{width:180px}
-p.copyright_info{text-align: center; margin-top: 60px;}
-.reg_pass{min-height: 100%;width: 100%;background-image: url('/images/educoder/account_bg.png');background-size: 100% 100%;min-height: 100%;height: 100%;position: relative;}
-.account_main{width: 660px;margin:0px auto;background-color:#FFFFff;box-shadow: 0 1px 12px 0 rgba(0,0,0,.2);border-radius: 8px;}
-.account_title{height: 85px;line-height: 85px;text-align: center;background-color: #459be5;color: #FFFFff;border-radius: 8px 8px 0px 0px;font-size: 20px}
-.account_safe{background: #fff;color:#05101a;border-bottom: 1px solid #eaeaea}
-#account_input,#bind_email{width: 400px;margin: 0px auto;padding: 40px 0px;box-sizing: border-box}
-.realheight{padding-top:140px;}
-@media screen and (max-height: 1000px) {
-    .realheight{padding-top:50px;}
+div.title_detail {
+  width: 660px;
+  margin: 0px auto;
 }
+
+div.title_detail img {
+  width: 180px
+}
+
+p.copyright_info {
+  text-align: center;
+  margin-top: 60px;
+}
+
+.reg_pass {
+  min-height: 100%;
+  width: 100%;
+  background-image: url('/images/educoder/account_bg.png');
+  background-size: 100% 100%;
+  min-height: 100%;
+  height: 100%;
+  position: relative;
+}
+
+.account_main {
+  width: 660px;
+  margin: 0px auto;
+  background-color: #FFFFff;
+  box-shadow: 0 1px 12px 0 rgba(0, 0, 0, .2);
+  border-radius: 8px;
+}
+
+.account_title {
+  height: 85px;
+  line-height: 85px;
+  text-align: center;
+  background-color: #459be5;
+  color: #FFFFff;
+  border-radius: 8px 8px 0px 0px;
+  font-size: 20px
+}
+
+.account_safe {
+  background: #fff;
+  color: #05101a;
+  border-bottom: 1px solid #eaeaea
+}
+
+#account_input,
+#bind_email {
+  width: 400px;
+  margin: 0px auto;
+  padding: 40px 0px;
+  box-sizing: border-box
+}
+
+.realheight {
+  padding-top: 140px;
+}
+
+@media screen and (max-height: 1000px) {
+  .realheight {
+    padding-top: 50px;
+  }
+}
+
 @media screen and (max-height: 800px) {
-    .realheight{padding-top:10px;}
+  .realheight {
+    padding-top: 10px;
+  }
 }
 
 /*----------------------------用户资料完善、认证等页面-----------------*/
-.all_submit_btn{width: 340px;height: 48px;line-height: 48px;text-align: center;color: #FFFFff!important;background: #4cacff;border-radius: 4px;display: block;margin: 20px auto 40px;}/*提交、保存*/
-.choosefile{width: 120px;height: 70px;border-radius: 4px;text-align: center;line-height: 70px;display: block;color: #FFFFff!important;background: #cccccc}/*选择文件*/
-#upload_img_file{width: 120px;height: 70px;border-radius: 4px;}/*更换照片*/
-.changephotos{display: block;position:absolute;width: 100%;height: 100%;left: 0px;top: 0px;background-color:rgba(0,0,0,0.2);color: #FFFFff!important;line-height: 70px;text-align: center;display: none }
-#upload_img_file:hover .changephotos{ display: block}
-.apply_link{position: absolute;right: -95px;top: 9px;}
+.all_submit_btn {
+  width: 340px;
+  height: 48px;
+  line-height: 48px;
+  text-align: center;
+  color: #FFFFff !important;
+  background: #4cacff;
+  border-radius: 4px;
+  display: block;
+  margin: 20px auto 40px;
+}
+
+/*提交、保存*/
+.choosefile {
+  width: 120px;
+  height: 70px;
+  border-radius: 4px;
+  text-align: center;
+  line-height: 70px;
+  display: block;
+  color: #FFFFff !important;
+  background: #cccccc
+}
+
+/*选择文件*/
+#upload_img_file {
+  width: 120px;
+  height: 70px;
+  border-radius: 4px;
+}
+
+/*更换照片*/
+.changephotos {
+  display: block;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0px;
+  top: 0px;
+  background-color: rgba(0, 0, 0, 0.2);
+  color: #FFFFff !important;
+  line-height: 70px;
+  text-align: center;
+  display: none
+}
+
+#upload_img_file:hover .changephotos {
+  display: block
+}
+
+.apply_link {
+  position: absolute;
+  right: -95px;
+  top: 9px;
+}
+
 /*账号安全*/
-.account_left{float: left;width: 15%;text-align: center;}
-.account_middle{float: left;width: 65%;}
-.account_right{float: right}
+.account_left {
+  float: left;
+  width: 15%;
+  text-align: center;
+}
+
+.account_middle {
+  float: left;
+  width: 65%;
+}
+
+.account_right {
+  float: right
+}
 
 /*----------------------------试用申请弹框--------------------------*/
-.reUploadDetail{border:1px solid #dddddd; padding: 0 5px; float:left; resize:none; width:418px; height:80px; overflow-y:auto;outline: none;}
+.reUploadDetail {
+  border: 1px solid #dddddd;
+  padding: 0 5px;
+  float: left;
+  resize: none;
+  width: 418px;
+  height: 80px;
+  overflow-y: auto;
+  outline: none;
+}
 
 /*-----------------------------个人主页页面-begin-------------------------*/
-.user-main-half{width: 100%;height: 465px;background: #fff;margin-bottom: 20px;position: relative}
-.user-headImg{width: 100%;height: 160px;background-image: url("/images/educoder/userhead.jpg");position: absolute;width: 100%;left: 0px;top:0px}
-.user-headCon{position: absolute;width: 100%;left: 0px;top:0px;min-height: 465px;}
-.inline{width: auto;display: inline-block;}
-.headtab{width: 188px;height: 60px;text-align: center}
-.headtab span,.headtab a{display: block;width: 100%;text-align: center;}
-.headtab span{color: #989898;font-size: 14px;}
-.headtab a{color: #fff;font-size: 24px;}
-.headphoto{text-align: center;background: #FFFFff;width: 115px;height: 115px;padding: 3px;border-radius: 50%;position: relative;float: left;margin-top: 19px;box-sizing: border-box}
-.headphoto img{width: 109px;border-radius: 50%;height: 109px;}
-.headphoto-black{display: none;cursor: pointer;position: absolute;top: 3px;left: 3px;width: 109px;height: 109px;text-align: center;line-height: 112px;border-radius: 50%;background-color: rgba(0,0,0,0.3);color: #fff;}
-.myName{display: block;width: auto;color: #05101A;font-size: 24px;height: 28px;line-height: 28px;margin-top: 5px}
-.mypost{color: #686868;font-size: 14px;display: block;width: auto;height: 20px;line-height: 20px;}
-.mysign-span{margin: 0 auto;color: #05101A;font-size: 14px;display: block;width: 280px;cursor: pointer;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;}
-.mysign-input{margin: 0 auto;color: #05101A;font-size: 14px;width: 280px;height: 28px;border: none;outline: none;text-align: center}
-.v-h-line{display: block;width: 1px;height: 40px;background-color: #999;margin-top: 12px;}
-.navPositon{position: absolute;bottom: 0px;width: 100%;}
-.user-nav-item li{float:left;margin:0px 40px;padding-bottom: 7px}
-.user-nav-item li a{color: #666;font-size: 16px;}
-.user-nav-item li.active{color: #05101A;border-bottom: 2px solid #05101A;padding-bottom: 5px}
-.user-nav-item li.active a{color: #05101A;}
+.user-main-half {
+  width: 100%;
+  height: 465px;
+  background: #fff;
+  margin-bottom: 20px;
+  position: relative
+}
+
+.user-headImg {
+  width: 100%;
+  height: 160px;
+  background-image: url("/images/educoder/userhead.jpg");
+  position: absolute;
+  width: 100%;
+  left: 0px;
+  top: 0px
+}
+
+.user-headCon {
+  position: absolute;
+  width: 100%;
+  left: 0px;
+  top: 0px;
+  min-height: 465px;
+}
+
+.inline {
+  width: auto;
+  display: inline-block;
+}
+
+.headtab {
+  width: 188px;
+  height: 60px;
+  text-align: center
+}
+
+.headtab span,
+.headtab a {
+  display: block;
+  width: 100%;
+  text-align: center;
+}
+
+.headtab span {
+  color: #989898;
+  font-size: 14px;
+}
+
+.headtab a {
+  color: #fff;
+  font-size: 24px;
+}
+
+.headphoto {
+  text-align: center;
+  background: #FFFFff;
+  width: 115px;
+  height: 115px;
+  padding: 3px;
+  border-radius: 50%;
+  position: relative;
+  float: left;
+  margin-top: 19px;
+  box-sizing: border-box
+}
+
+.headphoto img {
+  width: 109px;
+  border-radius: 50%;
+  height: 109px;
+}
+
+.headphoto-black {
+  display: none;
+  cursor: pointer;
+  position: absolute;
+  top: 3px;
+  left: 3px;
+  width: 109px;
+  height: 109px;
+  text-align: center;
+  line-height: 112px;
+  border-radius: 50%;
+  background-color: rgba(0, 0, 0, 0.3);
+  color: #fff;
+}
+
+.myName {
+  display: block;
+  width: auto;
+  color: #05101A;
+  font-size: 24px;
+  height: 28px;
+  line-height: 28px;
+  margin-top: 5px
+}
+
+.mypost {
+  color: #686868;
+  font-size: 14px;
+  display: block;
+  width: auto;
+  height: 20px;
+  line-height: 20px;
+}
+
+.mysign-span {
+  margin: 0 auto;
+  color: #05101A;
+  font-size: 14px;
+  display: block;
+  width: 280px;
+  cursor: pointer;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.mysign-input {
+  margin: 0 auto;
+  color: #05101A;
+  font-size: 14px;
+  width: 280px;
+  height: 28px;
+  border: none;
+  outline: none;
+  text-align: center
+}
+
+.v-h-line {
+  display: block;
+  width: 1px;
+  height: 40px;
+  background-color: #999;
+  margin-top: 12px;
+}
+
+.navPositon {
+  position: absolute;
+  bottom: 0px;
+  width: 100%;
+}
+
+.user-nav-item li {
+  float: left;
+  margin: 0px 40px;
+  padding-bottom: 7px
+}
+
+.user-nav-item li a {
+  color: #666;
+  font-size: 16px;
+}
+
+.user-nav-item li.active {
+  color: #05101A;
+  border-bottom: 2px solid #05101A;
+  padding-bottom: 5px
+}
+
+.user-nav-item li.active a {
+  color: #05101A;
+}
 
 
 /*我的实训、进度条*/
-.user-bar{position: relative;width: 100%;height:8px;background-color: #CDCDCD;border-radius: 4px;}
-.user-bar p{position: absolute;left: 0px;top: 0px;height: 100%;background-color: #4CACFF;border-radius: 4px;}
-/*我的课堂和我的项目，公开梯形*/
-.publicpart{position: absolute;left: 1px;top:1px;width: 0;height: 0;border-left: 80px solid #4cacff;border-bottom: 80px solid transparent;z-index: 1;}
-.publicpart.orangeBlack{border-left: 80px solid #FF6800;}
-.smalltrangle{display: block;position: absolute;left: 1px;top:1px;border-left: 25px solid #fff;border-bottom: 25px solid transparent;z-index: 2;}
-.publicword{transform:rotate(-45deg);text-align: center;color:#FFF;font-size: 14px;display: block;position: absolute;width: 50px;left: 0px;z-index: 3;top: 15px;}
+.user-bar {
+  position: relative;
+  width: 100%;
+  height: 8px;
+  background-color: #CDCDCD;
+  border-radius: 4px;
+}
+
+.user-bar p {
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  height: 100%;
+  background-color: #4CACFF;
+  border-radius: 4px;
+}
+
+/*我的课堂和我的项目，公开梯形*/
+.publicpart {
+  position: absolute;
+  left: 1px;
+  top: 1px;
+  width: 0;
+  height: 0;
+  border-left: 80px solid #4cacff;
+  border-bottom: 80px solid transparent;
+  z-index: 1;
+}
+
+.publicpart.orangeBlack {
+  border-left: 80px solid #FF6800;
+}
+
+.smalltrangle {
+  display: block;
+  position: absolute;
+  left: 1px;
+  top: 1px;
+  border-left: 25px solid #fff;
+  border-bottom: 25px solid transparent;
+  z-index: 2;
+}
+
+.publicword {
+  transform: rotate(-45deg);
+  text-align: center;
+  color: #FFF;
+  font-size: 14px;
+  display: block;
+  position: absolute;
+  width: 50px;
+  left: 0px;
+  z-index: 3;
+  top: 15px;
+}
+
+.closeSquare {
+  position: absolute;
+  width: 100%;
+  left: 0px;
+  top: 0px;
+  text-align: center;
+  background-color: rgba(0, 0, 0, .5);
+  height: 100%;
+  z-index: 5;
+  display: none;
+  cursor: default
+}
+
+.substance {
+  padding: 40px 40px 0px 40px;
+  box-sizing: border-box;
+  text-align: center;
+  border-bottom: 1px solid #EAEAEA;
+  min-height: 241px;
+}
+
+.subName {
+  line-height: 20px;
+  height: 40px;
+  text-align: center;
+  color: #1A0B00;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+}
 
-.closeSquare{position: absolute;width: 100%;left: 0px;top: 0px;text-align: center;background-color: rgba(0,0,0,.5);height: 100%;z-index: 5;display: none;cursor: default}
-.substance{padding: 40px 40px 0px 40px;box-sizing: border-box;text-align: center;border-bottom: 1px solid #EAEAEA;min-height: 241px;}
-.subName{line-height: 20px;height: 40px;text-align: center;color: #1A0B00;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
 /*题库以及资料*/
-.secondNav li{color: #676767;margin: 0px 20px;float: left}
-.secondNav li a:hover{color: #4CACFF}
-.secondNav li.active a{color: #4CACFF}
+.secondNav li {
+  color: #676767;
+  margin: 0px 20px;
+  float: left
+}
+
+.secondNav li a:hover {
+  color: #4CACFF
+}
+
+.secondNav li.active a {
+  color: #4CACFF
+}
+
 /*题库*/
-.dataBank_Item{margin-bottom: 3px;width: 100%;border-bottom: 1px solid #EEEEEE;padding: 17px 37px 17px 20px;box-sizing: border-box;background: #fff;display: flex;cursor: pointer}
-.dataBank_Item:hover{box-shadow:0px 0px 15px rgba(76,76,76,0.2)}
-.dataBank_Item:last-child{border:none; }
-.dataItemLeft{margin-right: 20px;width: 20px;}
-.dataItemRight{flex: 1;}
-.edit-del-data{width: 325px;}
-.dataTitle{color: #05101A;display: block;float: left;max-width: 400px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
-.itembottom span.bottomspan{display: block;width: 200px;text-align: left}
-.authForBank{min-height: 400px;padding-top: 154px;box-sizing: border-box}
-.search_course_list{height: 150px;overflow-y: auto}
-.search_course_list li{height: 30px;}
+.dataBank_Item {
+  margin-bottom: 3px;
+  width: 100%;
+  border-bottom: 1px solid #EEEEEE;
+  padding: 17px 37px 17px 20px;
+  box-sizing: border-box;
+  background: #fff;
+  display: flex;
+  cursor: pointer
+}
+
+.dataBank_Item:hover {
+  box-shadow: 0px 0px 15px rgba(76, 76, 76, 0.2)
+}
+
+.dataBank_Item:last-child {
+  border: none;
+}
+
+.dataItemLeft {
+  margin-right: 20px;
+  width: 20px;
+}
+
+.dataItemRight {
+  flex: 1;
+}
+
+.edit-del-data {
+  width: 325px;
+}
+
+.dataTitle {
+  color: #05101A;
+  display: block;
+  float: left;
+  max-width: 400px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.itembottom span.bottomspan {
+  display: block;
+  width: 200px;
+  text-align: left
+}
+
+.authForBank {
+  min-height: 400px;
+  padding-top: 154px;
+  box-sizing: border-box
+}
+
+.search_course_list {
+  height: 150px;
+  overflow-y: auto
+}
+
+.search_course_list li {
+  height: 30px;
+}
+
 /*资料*/
-.userdata{width: 622px;margin: 0px auto;background: #fff;margin-bottom: 80px;padding: 40px;box-sizing: border-box;border-radius: 4px}
-label.infolabel{display: block;float: left;width: 56px;text-align: right;margin-right: 30px;color: #989898;}
-.infosign{display: block;flex: 1;float: left;word-wrap: break-word;word-break: break-all;}
-.empiric-value{padding:10px 40px;box-sizing: border-box;background-color: #fff;}
-.empiric{border-bottom: 1px solid #EBEBEB;}
-.empiric li{float: left;padding: 10px 0px;}
-.empiric:last-child{border-bottom: none;}
-.em-name{width: 13%;text-align: left;}
-.em-val{width: 10%;text-align: center;}
-.em-time{width: 25%;text-align: center;color: #9A9A9A}
-.em-con{width: 52%;text-align: left;color: #666;}
+.userdata {
+  width: 622px;
+  margin: 0px auto;
+  background: #fff;
+  margin-bottom: 80px;
+  padding: 40px;
+  box-sizing: border-box;
+  border-radius: 4px
+}
+
+label.infolabel {
+  display: block;
+  float: left;
+  width: 56px;
+  text-align: right;
+  margin-right: 30px;
+  color: #989898;
+}
+
+.infosign {
+  display: block;
+  flex: 1;
+  float: left;
+  word-wrap: break-word;
+  word-break: break-all;
+}
+
+.empiric-value {
+  padding: 10px 40px;
+  box-sizing: border-box;
+  background-color: #fff;
+}
+
+.empiric {
+  border-bottom: 1px solid #EBEBEB;
+}
+
+.empiric li {
+  float: left;
+  padding: 10px 0px;
+}
+
+.empiric:last-child {
+  border-bottom: none;
+}
+
+.em-name {
+  width: 13%;
+  text-align: left;
+}
+
+.em-val {
+  width: 10%;
+  text-align: center;
+}
+
+.em-time {
+  width: 25%;
+  text-align: center;
+  color: #9A9A9A
+}
+
+.em-con {
+  width: 52%;
+  text-align: left;
+  color: #666;
+}
 
 /*发送题库的筛选*/
-.edu-btn-search{ position: absolute; top:0px; right:15px;}
+.edu-btn-search {
+  position: absolute;
+  top: 0px;
+  right: 15px;
+}
 
 
 
 /*-------------------------------精选实训-------------------------------*/
-.shaiTitle{display: block;padding-right: 20px;}
-.shaiContent li.shaiItem.active{background-color: #4CACFF!important;color:#fff!important;}
-.shaiContent li.shaiItem{padding:3px 15px;float: left;border-radius: 4px;color: #4C4C4C;cursor: pointer;margin-right: 15px;display: block}
-.shaiContent li.shaiItem:hover{background-color: #4CACFF!important;color:#fff!important;}
-.shaiAllItem{max-width: 1138px;}
-.subshaicontent{display: none;box-sizing: border-box;position: absolute;width: 100%;top: 33px;left: 0px;background-color: #fff;box-shadow:0px 1px 4px rgba(76,76,76,0.2);padding:0px 20px;z-index: 99999;border-radius: 4px;max-height: 800px;overflow-y: auto}
-.subshaicontent-part{border-bottom: 1px solid #eee;}
-.subshaicontent-part:last-child{border-bottom: none;}
-.subshaicontent a:hover,.subshaicontent a.active{color: #4CACFF}
-.subshaicontent a{float: left;margin-right: 20px;color: #999;cursor: pointer}
+.shaiTitle {
+  display: block;
+  padding-right: 20px;
+}
+
+.shaiContent li.shaiItem.active {
+  background-color: #4CACFF !important;
+  color: #fff !important;
+}
+
+.shaiContent li.shaiItem {
+  padding: 3px 15px;
+  float: left;
+  border-radius: 4px;
+  color: #4C4C4C;
+  cursor: pointer;
+  margin-right: 15px;
+  display: block
+}
+
+.shaiContent li.shaiItem:hover {
+  background-color: #4CACFF !important;
+  color: #fff !important;
+}
+
+.shaiAllItem {
+  max-width: 1138px;
+}
+
+.subshaicontent {
+  display: none;
+  box-sizing: border-box;
+  position: absolute;
+  width: 100%;
+  top: 33px;
+  left: 0px;
+  background-color: #fff;
+  box-shadow: 0px 1px 4px rgba(76, 76, 76, 0.2);
+  padding: 0px 20px;
+  z-index: 99999;
+  border-radius: 4px;
+  max-height: 800px;
+  overflow-y: auto
+}
+
+.subshaicontent-part {
+  border-bottom: 1px solid #eee;
+}
+
+.subshaicontent-part:last-child {
+  border-bottom: none;
+}
+
+.subshaicontent a:hover,
+.subshaicontent a.active {
+  color: #4CACFF
+}
+
+.subshaicontent a {
+  float: left;
+  margin-right: 20px;
+  color: #999;
+  cursor: pointer
+}
 
 
-.search-new{width: 248px;height:32px;position: relative;}
-.search-span{display: block;position: absolute;width: 100%;height: 100%;left:0px;top:0px;background-color: #F4F4F4;border: 1px solid #EAEAEA; border-radius: 4px;z-index: 1}
-.search-new-input{height: 32px;padding-left: 5px;width: 225px;border: none;box-sizing: border-box;background: none;outline: none;position: absolute;left:0px;top:1px;z-index: 2}
-.search-new img,.search-new a,.search-new .searchicon{cursor: pointer;position: absolute;right:2px;top:2px;z-index: 2}
-.search-new a{top: 0px}
-.search-new-input:focus + .search-span{background-color: #fff;}
+.search-new {
+  width: 248px;
+  height: 32px;
+  position: relative;
+}
+
+.search-span {
+  display: block;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0px;
+  top: 0px;
+  background-color: #F4F4F4;
+  border: 1px solid #EAEAEA;
+  border-radius: 4px;
+  z-index: 1
+}
+
+.search-new-input {
+  height: 32px;
+  padding-left: 5px;
+  width: 225px;
+  border: none;
+  box-sizing: border-box;
+  background: none;
+  outline: none;
+  position: absolute;
+  left: 0px;
+  top: 1px;
+  z-index: 2
+}
+
+.search-new img,
+.search-new a,
+.search-new .searchicon {
+  cursor: pointer;
+  position: absolute;
+  right: 2px;
+  top: 2px;
+  z-index: 2
+}
+
+.search-new a {
+  top: 0px
+}
+
+.search-new-input:focus+.search-span {
+  background-color: #fff;
+}
+
+.controlbtn {
+  width: 36px;
+  height: 15px;
+  background-color: #CCCCCC;
+  border-radius: 7px;
+  cursor: pointer
+}
+
+.controlblue {
+  width: 0px;
+  height: 15px;
+  background-color: #4CACFF;
+  border-radius: 7px;
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  z-index: 1
+}
+
+.controlring {
+  width: 13px;
+  height: 13px;
+  border-radius: 50%;
+  background-color: #fff;
+  position: absolute;
+  left: 1px;
+  top: 1px;
+  z-index: 2
+}
 
-.controlbtn{width: 36px;height: 15px;background-color: #CCCCCC;border-radius: 7px;cursor: pointer}
-.controlblue{width: 0px;height: 15px;background-color: #4CACFF;border-radius: 7px;position: absolute;left: 0px;top:0px;z-index: 1}
-.controlring{width: 13px;height: 13px;border-radius: 50%;background-color: #fff;position: absolute;left: 1px;top:1px;z-index: 2}
 /*庞门用于实训，站酷黑用于路径*/
-@font-face{
-    font-family: 'panmen-webfont';
-    src : url('../fonts/panmen-webfont.ttf');
+@font-face {
+  font-family: 'panmen-webfont';
+  src: url('../fonts/panmen-webfont.ttf');
 }
-.shixunDes{font-family: 'panmen-webfont';display: block;position: absolute;height: 100%;width: 100%;text-align: center;line-height: 220px;color: #fff;top: 0px;font-size: 24px;background-color: rgba(5,16,26,0.4);border-radius: 6px 6px 0px 0px;}
+
+.shixunDes {
+  font-family: 'panmen-webfont';
+  display: block;
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  text-align: center;
+  line-height: 220px;
+  color: #fff;
+  top: 0px;
+  font-size: 24px;
+  background-color: rgba(5, 16, 26, 0.4);
+  border-radius: 6px 6px 0px 0px;
+}
+
 /*TPM*/
-.shixunDetail_top{width: 100%;background-image: url("/images/educoder/shixun-detail.jpg"); height: 240px;
-    justify-content: center;align-items: center;display: -webkit-flex;
-    background-size: cover;
-    background-position: center;
-    background-repeat: no-repeat;
+.shixunDetail_top {
+  width: 100%;
+  background-image: url("/images/educoder/shixun-detail.jpg");
+  height: 240px;
+  justify-content: center;
+  align-items: center;
+  display: -webkit-flex;
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
 }
-.task-item{margin-top: 30px;padding-bottom: 30px;border-bottom: 1px solid #eee}
-.task-item:last-child{border-bottom: none;}
-.challengeNav a.active{color: #4CACFF;}
-.recomments{  margin-bottom: 20px;}
-.recomments:first-child{margin-top: 0px;}
-.recomments:last-child{margin-bottom: 0px;border:none;padding-bottom: 0px;}
-.url-input{border: none;padding: 0px;font-size: 12px;color:#999;outline: none}
-.forkNum{display: block;float: left;width: 36px;text-align: center;border-left: 1px solid #4CACFF;background-color:rgba(76,172,255,0.2);color: #4CACFF!important; }
-.TPMtaskName{max-width: 500px}
+
+.task-item {
+  margin-top: 30px;
+  padding-bottom: 30px;
+  border-bottom: 1px solid #eee
+}
+
+.task-item:last-child {
+  border-bottom: none;
+}
+
+.challengeNav a.active {
+  color: #4CACFF;
+}
+
+.recomments {
+  margin-bottom: 20px;
+}
+
+.recomments:first-child {
+  margin-top: 0px;
+}
+
+.recomments:last-child {
+  margin-bottom: 0px;
+  border: none;
+  padding-bottom: 0px;
+}
+
+.url-input {
+  border: none;
+  padding: 0px;
+  font-size: 12px;
+  color: #999;
+  outline: none
+}
+
+.forkNum {
+  display: block;
+  float: left;
+  width: 36px;
+  text-align: center;
+  border-left: 1px solid #4CACFF;
+  background-color: rgba(76, 172, 255, 0.2);
+  color: #4CACFF !important;
+}
+
+.TPMtaskName {
+  max-width: 500px
+}
+
 /*任务*/
-.recomment-name{max-width: 222px;display: block}
-.task-colspan{min-width:25%;text-align: left;display: block;float: left;color: #999; }
-.colspan-grey{border-radius: 12px;background-color: #E6E6E6;padding: 3px 10px;color: #747A7F}
+.recomment-name {
+  max-width: 222px;
+  display: block
+}
+
+.task-colspan {
+  min-width: 25%;
+  text-align: left;
+  display: block;
+  float: left;
+  color: #999;
+}
+
+.colspan-grey {
+  border-radius: 12px;
+  background-color: #E6E6E6;
+  padding: 3px 10px;
+  color: #747A7F
+}
+
 /*新建任务*/
-.challenge_nav{padding: 20px 20px 0px 20px;border-bottom: 1px solid #eee;}
-.challenge_nav li{width: auto;float: left;margin-right: 20px;position: relative}
-.challenge_nav li.active:after{position: absolute;content: '';width: 76%;background-color: #4CACFF;height: 3px;border-radius: 2px;left: 25%;bottom: 0px;}
-.challenge_nav li a{display: block;width: 100%;padding-bottom: 20px;}
-.add_choose_type{width: 60px;height: 20px;line-height: 19px;border-radius: 2px;background-color: #eaeaea;color: #999!important;display: block;float: left;text-align: center;margin-top: 4px;}
+.challenge_nav {
+  padding: 20px 20px 0px 20px;
+  border-bottom: 1px solid #eee;
+}
+
+.challenge_nav li {
+  width: auto;
+  float: left;
+  margin-right: 20px;
+  position: relative
+}
+
+.challenge_nav li.active:after {
+  position: absolute;
+  content: '';
+  width: 76%;
+  background-color: #4CACFF;
+  height: 3px;
+  border-radius: 2px;
+  left: 25%;
+  bottom: 0px;
+}
+
+.challenge_nav li a {
+  display: block;
+  width: 100%;
+  padding-bottom: 20px;
+}
+
+.add_choose_type {
+  width: 60px;
+  height: 20px;
+  line-height: 19px;
+  border-radius: 2px;
+  background-color: #eaeaea;
+  color: #999 !important;
+  display: block;
+  float: left;
+  text-align: center;
+  margin-top: 4px;
+}
 
 
 
-.task_tag_span{float: left;padding:0px 10px;background-color: #eee;color: #999;border-radius: 2px;margin-right: 10px;margin-bottom: 8px;}
-.task_tag_span span{float: left;}
-.task_tag_span a{font-size: 18px;margin-left: 5px;float: left;line-height: 28px;height: 28px;cursor: pointer}
-.task_tag_span a:hover{color: #666!important;}
+.task_tag_span {
+  float: left;
+  padding: 0px 10px;
+  background-color: #eee;
+  color: #999;
+  border-radius: 2px;
+  margin-right: 10px;
+  margin-bottom: 8px;
+}
+
+.task_tag_span span {
+  float: left;
+}
+
+.task_tag_span a {
+  font-size: 18px;
+  margin-left: 5px;
+  float: left;
+  line-height: 28px;
+  height: 28px;
+  cursor: pointer
+}
+
+.task_tag_span a:hover {
+  color: #666 !important;
+}
+
+.show_content_label {
+  line-height: 48px
+}
+
+.show_content_grey {
+  padding: 10px 15px;
+  background-color: #F4F4F4;
+  color: #05101A;
+  text-align: justify;
+  word-break: break-all;
+  border-radius: 4px;
+  width: 100%;
+  box-sizing: border-box
+}
+
+.del_array {
+  position: absolute;
+  right: -35px;
+}
+
+.del_array i {
+  margin-left: 4.5px;
+}
+
+.del_array:hover i {
+  color: #4cacff !important;
+}
+
+.empty {
+  background: #494A4C;
+  display: inline;
+  margin: 0 2px;
+  padding: 0 3px;
+}
+
+.tab-key {
+  background: #494A4C;
+  display: inline;
+  margin: 0 2px;
+  padding: 0 6px;
+}
+
+.show-span {
+  display: block;
+  text-align: right;
+  min-width: 75px;
+}
 
-.show_content_label{line-height: 48px}
-.show_content_grey{padding: 10px 15px;background-color: #F4F4F4;color: #05101A;text-align: justify;word-break: break-all;border-radius: 4px;width: 100%;box-sizing: border-box}
-.del_array{position: absolute;right: -35px;}
-.del_array i{margin-left: 4.5px;}
-.del_array:hover i{color: #4cacff!important;}
-.empty{background: #494A4C;display: inline; margin: 0 2px; padding: 0 3px;}
-.tab-key{background: #494A4C;display: inline; margin: 0 2px; padding: 0 6px;}
-.show-span{display: block;text-align: right;min-width: 75px;}
 /*选择题*/
-.option-item{border:1px solid #e2e2e2;}
-.option-item,.add-option-item{display: block;width: 38px;height: 38px;text-align: center;line-height: 38px;border-radius: 4px;cursor: pointer}
-.check-option-bg{background: #FF7500;color: #ffffff!important;border: 1px solid #FF7500}
-.add-option-input{padding: 5px;width: 90%;height: 40px;min-width: 700px;}
-.add-option-input a{display: block;width: 100%;height: 100%;cursor: pointer}
-.position-delete{position: absolute;right: -22px;top: 12px;cursor: pointer}
-.position-delete:hover i{color: #4cacff!important;}
+.option-item {
+  border: 1px solid #e2e2e2;
+}
+
+.option-item,
+.add-option-item {
+  display: block;
+  width: 38px;
+  height: 38px;
+  text-align: center;
+  line-height: 38px;
+  border-radius: 4px;
+  cursor: pointer
+}
+
+.check-option-bg {
+  background: #FF7500;
+  color: #ffffff !important;
+  border: 1px solid #FF7500
+}
+
+.add-option-input {
+  padding: 5px;
+  width: 90%;
+  height: 40px;
+  min-width: 700px;
+}
+
+.add-option-input a {
+  display: block;
+  width: 100%;
+  height: 100%;
+  cursor: pointer
+}
+
+.position-delete {
+  position: absolute;
+  right: -22px;
+  top: 12px;
+  cursor: pointer
+}
+
+.position-delete:hover i {
+  color: #4cacff !important;
+}
+
 /*排行榜*/
-.rankings li{line-height: 40px;height: 40px;}
-.rankingindex{width: 24px;text-align: center;}
+.rankings li {
+  line-height: 40px;
+  height: 40px;
+}
+
+.rankingindex {
+  width: 24px;
+  text-align: center;
+}
+
 /*合作者*/
-.collaborators-item{border-bottom: 1px solid #eee;cursor: default;padding-top: 30px;padding-left: 20px}
-.collaborators-item:last-child{border-bottom: none;}
-.collaborators-item-middle{max-width: 300px;padding:0px 0px 20px 20px;}
-.upload_select_box{ width: 100%;box-sizing: border-box; height:240px; overflow-y:auto; padding: 10px; background:#F4FAFF; color: #333; }
+.collaborators-item {
+  border-bottom: 1px solid #eee;
+  cursor: default;
+  padding-top: 30px;
+  padding-left: 20px
+}
+
+.collaborators-item:last-child {
+  border-bottom: none;
+}
+
+.collaborators-item-middle {
+  max-width: 300px;
+  padding: 0px 0px 20px 20px;
+}
+
+.upload_select_box {
+  width: 100%;
+  box-sizing: border-box;
+  height: 240px;
+  overflow-y: auto;
+  padding: 10px;
+  background: #F4FAFF;
+  color: #333;
+}
+
 /*配置*/
-#evaluate_script_show + .CodeMirror{height: 300px;}
-.lesson{line-height:40px;}
-.lesson_img{position: absolute;right: 10px;top:10px;}
-.lesson_checkbox{display: none;position: absolute;top:40px;left: -1px;width: 100%;border:1px solid #eeeeee;background: #FFFFFF;padding-bottom: 5px;height: 150px;z-index: 10}
-.lesson_checkbox li{height:20px;padding:5px 10px;clear:both;line-height:28px;margin-bottom: 0;}
-.lesson_checkbox li input{float: left;margin: 3px 5px 0px 0px;}
-.lesson_content{width:95%;padding:5px; border: none!important;}
+#evaluate_script_show+.CodeMirror {
+  height: 300px;
+}
+
+.lesson {
+  line-height: 40px;
+}
+
+.lesson_img {
+  position: absolute;
+  right: 10px;
+  top: 10px;
+}
+
+.lesson_checkbox {
+  display: none;
+  position: absolute;
+  top: 40px;
+  left: -1px;
+  width: 100%;
+  border: 1px solid #eeeeee;
+  background: #FFFFFF;
+  padding-bottom: 5px;
+  height: 150px;
+  z-index: 10
+}
+
+.lesson_checkbox li {
+  height: 20px;
+  padding: 5px 10px;
+  clear: both;
+  line-height: 28px;
+  margin-bottom: 0;
+}
+
+.lesson_checkbox li input {
+  float: left;
+  margin: 3px 5px 0px 0px;
+}
+
+.lesson_content {
+  width: 95%;
+  padding: 5px;
+  border: none !important;
+}
+
 /*版本库*/
-.recordnav{background-color:#F0F8FF;  vertical-align:middle;}
-.pullreques_pullbox{border-bottom: 1px solid #eee;padding: 40px 20px;box-sizing: border-box}
-.pullreques_pullbox:last-child{border-bottom: none;}
-.pullreques_name{width: 120px;text-align: left;margin-right: 10px}
-.pullreques_pull_txt{display: block; margin-left: 10px;max-width:640px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
-.versionFileList li{border-bottom: 1px solid #eee;}
-.versionFileList li:last-child{border-bottom: none;}
+.recordnav {
+  background-color: #F0F8FF;
+  vertical-align: middle;
+}
+
+.pullreques_pullbox {
+  border-bottom: 1px solid #eee;
+  padding: 40px 20px;
+  box-sizing: border-box
+}
+
+.pullreques_pullbox:last-child {
+  border-bottom: none;
+}
+
+.pullreques_name {
+  width: 120px;
+  text-align: left;
+  margin-right: 10px
+}
+
+.pullreques_pull_txt {
+  display: block;
+  margin-left: 10px;
+  max-width: 640px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.versionFileList li {
+  border-bottom: 1px solid #eee;
+}
+
+.versionFileList li:last-child {
+  border-bottom: none;
+}
 
 /*项目版本库--旧版*/
-.new_roadmap_conbox .pullreques_pullbox{padding:0px!important;}
+.new_roadmap_conbox .pullreques_pullbox {
+  padding: 0px !important;
+}
 
 /* 提交记录详情------文本变更样式 */
-.autoscroll {overflow-x: auto; margin-bottom: 0.2em;}
-table.filecontent { border: 1px solid #e2e2e2; border-collapse: collapse; width: 100%;background-color: #fafafa;}
-table.text-file{}
-.old_line,.new_line,.diff_line {margin: 0px; padding: 0px;border: none; background: #f7f8fa;color: rgba(0,0,0,0.3); padding: 0px 5px; border-right: 1px solid #dce0e6;text-align: right; min-width: 35px; max-width: 50px; width: 35px; -webkit-user-select: none;}
-.old_line a,.new_line a,.diff_line a { float: left;width: 35px; font-weight: normal; color: rgba(0,0,0,0.3);}
-.line_content{padding: 0px 5px;}
-.old{ background:#ffecec; }
-.old:hover{ background:#fffaf1; }
-.new{ background: #eaffea;}
-.new:hover{ background:#fffaf1; }
-.commit_id_value{color: white !important;}
+.autoscroll {
+  overflow-x: auto;
+  margin-bottom: 0.2em;
+}
+
+table.filecontent {
+  border: 1px solid #e2e2e2;
+  border-collapse: collapse;
+  width: 100%;
+  background-color: #fafafa;
+}
+
+table.text-file {}
+
+.old_line,
+.new_line,
+.diff_line {
+  margin: 0px;
+  padding: 0px;
+  border: none;
+  background: #f7f8fa;
+  color: rgba(0, 0, 0, 0.3);
+  padding: 0px 5px;
+  border-right: 1px solid #dce0e6;
+  text-align: right;
+  min-width: 35px;
+  max-width: 50px;
+  width: 35px;
+  -webkit-user-select: none;
+}
+
+.old_line a,
+.new_line a,
+.diff_line a {
+  float: left;
+  width: 35px;
+  font-weight: normal;
+  color: rgba(0, 0, 0, 0.3);
+}
+
+.line_content {
+  padding: 0px 5px;
+}
+
+.old {
+  background: #ffecec;
+}
+
+.old:hover {
+  background: #fffaf1;
+}
+
+.new {
+  background: #eaffea;
+}
+
+.new:hover {
+  background: #fffaf1;
+}
+
+.commit_id_value {
+  color: white !important;
+}
 
 
 /*-------------------------------实训路径-------------------------------*/
-.path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png");
-    background-color: #000a4f;
-    /*background-size: cover;*/
-    background-position: center;
-    background-repeat: no-repeat;
+.path-head {
+  width: 100%;
+  height: 300px;
+  background-image: url("/images/educoder/path.png");
+  background-color: #000a4f;
+  /*background-size: cover;*/
+  background-position: center;
+  background-repeat: no-repeat;
 }
-.pathNavLine{position: absolute;bottom: -8px;width: 100%;}
-.path-nav li{float: left;padding: 0px 30px;height: 42px;}
-.path-nav li a{color:#fff;font-size: 16px;display: block;    height: 40px;}
-.path-nav li.active a{border-bottom: 3px solid #4CACFF;color:#4CACFF;}
+
+.pathNavLine {
+  position: absolute;
+  bottom: -8px;
+  width: 100%;
+}
+
+.path-nav li {
+  float: left;
+  padding: 0px 30px;
+  height: 42px;
+}
+
+.path-nav li a {
+  color: #fff;
+  font-size: 16px;
+  display: block;
+  height: 40px;
+}
+
+.path-nav li.active a {
+  border-bottom: 3px solid #4CACFF;
+  color: #4CACFF;
+}
+
 /*---实训路径详情----*/
-.subhead{width: 100%;margin-bottom:40px;background-size: 100% 100%;background-image: url("/images/educoder/path-detail.jpg");height: 240px;
-    justify-content: center;align-items: center;display: -webkit-flex;
-    background-size: cover;
-    background-position: center;
-    background-repeat: no-repeat;
+.subhead {
+  width: 100%;
+  margin-bottom: 40px;
+  background-size: 100% 100%;
+  background-image: url("/images/educoder/path-detail.jpg");
+  height: 240px;
+  justify-content: center;
+  align-items: center;
+  display: -webkit-flex;
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
 }
-.subhead_content{width: 1200px;margin: 0px auto;}
-.pathInfo li{text-align: center;float: left;margin-right: 30px;}
-.pathInfo li span{display: block;}
-.produce-content{padding: 40px 20px;background-color: #fff;box-sizing: border-box}
 
-.subject-produce{outline: none;line-height: 1.5;width: 100%;border: none;background: none;height: 30px;}
-.stage-info-line:hover{background-color:rgba(142,212,254,0.3)}
-.lesson-saved-list-item{border-bottom: 1px solid #EBEBEB;padding: 37px 0px}
-.title-line{padding: 0px 20px;}
-.paragraph{height: 50px;padding: 10px 20px 10px 47px;box-sizing: border-box}
-.paragraph:hover{background-color:#F0F8FF;}
-.lesson-saved-list-item:last-child{border:none;}
-.click_add{text-align: center;height: 90px;line-height: 90px;background-color: #fff;border-top: 1px solid #EBEBEB;cursor: pointer}
-.mustlearn{padding: 40px 25px;}
-.teacherTeam{padding: 40px 25px 0px 25px;}
-.teacherTeamItem{border-bottom: 1px solid #EAEAEA;padding: 40px 0px;}
-.teacherTeamItem:first-child{padding-top: 0px!important;}
-.teacherTeamItem:last-child{border: none;}
-.addTeamMember{height: 70px;text-align: center;line-height: 70px;}
-.adding-stage-item{padding: 0px 20px 20px 50px;position: relative}
-.colseThispart{position: absolute;right: -6px;top:-6px;z-index: 2;line-height: 15px;}
-.progressRing{display: block;width: 16px;height: 16px;float: left;position: relative;z-index: 1; }
-.progressRing-over{color:#459BE6;position: absolute;top: -10px;}
-.progressRing-part{color: #B3DCFF;position: absolute;top: -10px;}
+.subhead_content {
+  width: 1200px;
+  margin: 0px auto;
+}
 
-.upline{content: '';position: absolute;left: 7px;bottom: 15px;right: auto;height: 18px;width: 1px;}
-.downline{content: '';position: absolute;left: 7px;top: 15px;right: auto;height: 18px;width: 1px;}
+.pathInfo li {
+  text-align: center;
+  float: left;
+  margin-right: 30px;
+}
 
-.myProgressNav{width: 100%;position: relative;height: 10px;border-radius: 5px;background-color: #EAEAEA;}
-.myProgressGreen{position: absolute;top: 0px;left: 0px;border-radius: 5px;height: 100%;background-color: #29BD8B}
+.pathInfo li span {
+  display: block;
+}
 
-.lesson-saved-list-item .title-line .edit:hover,.lesson-saved-list-item .title-line .delete:hover{color:#ff7500!important;}
-li.li-width63{width: 63%;text-align: left}
-li.li-width20{width: 20%;text-align: left}
-li.li-width15{width: 15%;text-align: left}
-li.li-width7{width: 7%;text-align: left}
+.produce-content {
+  padding: 40px 20px;
+  background-color: #fff;
+  box-sizing: border-box
+}
+
+.subject-produce {
+  outline: none;
+  line-height: 1.5;
+  width: 100%;
+  border: none;
+  background: none;
+  height: 30px;
+}
+
+.stage-info-line:hover {
+  background-color: rgba(142, 212, 254, 0.3)
+}
+
+.lesson-saved-list-item {
+  border-bottom: 1px solid #EBEBEB;
+  padding: 37px 0px
+}
+
+.title-line {
+  padding: 0px 20px;
+}
+
+.paragraph {
+  height: 50px;
+  padding: 10px 20px 10px 47px;
+  box-sizing: border-box
+}
+
+.paragraph:hover {
+  background-color: #F0F8FF;
+}
+
+.lesson-saved-list-item:last-child {
+  border: none;
+}
+
+.click_add {
+  text-align: center;
+  height: 90px;
+  line-height: 90px;
+  background-color: #fff;
+  border-top: 1px solid #EBEBEB;
+  cursor: pointer
+}
+
+.mustlearn {
+  padding: 40px 25px;
+}
+
+.teacherTeam {
+  padding: 40px 25px 0px 25px;
+}
+
+.teacherTeamItem {
+  border-bottom: 1px solid #EAEAEA;
+  padding: 40px 0px;
+}
+
+.teacherTeamItem:first-child {
+  padding-top: 0px !important;
+}
+
+.teacherTeamItem:last-child {
+  border: none;
+}
+
+.addTeamMember {
+  height: 70px;
+  text-align: center;
+  line-height: 70px;
+}
+
+.adding-stage-item {
+  padding: 0px 20px 20px 50px;
+  position: relative
+}
+
+.colseThispart {
+  position: absolute;
+  right: -6px;
+  top: -6px;
+  z-index: 2;
+  line-height: 15px;
+}
+
+.progressRing {
+  display: block;
+  width: 16px;
+  height: 16px;
+  float: left;
+  position: relative;
+  z-index: 1;
+}
+
+.progressRing-over {
+  color: #459BE6;
+  position: absolute;
+  top: -10px;
+}
+
+.progressRing-part {
+  color: #B3DCFF;
+  position: absolute;
+  top: -10px;
+}
+
+.upline {
+  content: '';
+  position: absolute;
+  left: 7px;
+  bottom: 15px;
+  right: auto;
+  height: 18px;
+  width: 1px;
+}
+
+.downline {
+  content: '';
+  position: absolute;
+  left: 7px;
+  top: 15px;
+  right: auto;
+  height: 18px;
+  width: 1px;
+}
+
+.myProgressNav {
+  width: 100%;
+  position: relative;
+  height: 10px;
+  border-radius: 5px;
+  background-color: #EAEAEA;
+}
+
+.myProgressGreen {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  border-radius: 5px;
+  height: 100%;
+  background-color: #29BD8B
+}
+
+.lesson-saved-list-item .title-line .edit:hover,
+.lesson-saved-list-item .title-line .delete:hover {
+  color: #ff7500 !important;
+}
+
+li.li-width63 {
+  width: 63%;
+  text-align: left
+}
+
+li.li-width20 {
+  width: 20%;
+  text-align: left
+}
+
+li.li-width15 {
+  width: 15%;
+  text-align: left
+}
+
+li.li-width7 {
+  width: 7%;
+  text-align: left
+}
 
 /*-----------------------------在线课堂动态----------------------------------*/
-.courseHead{width: 100%;margin-bottom:40px;background-size: 100% 100%;background-image: url("/images/educoder/courtailsbdpicture.jpg");height: 240px;
-    justify-content: center;align-items: center;display: -webkit-flex;
-    background-size: cover;
-    background-position: center;
-    background-repeat: no-repeat;
+.courseHead {
+  width: 100%;
+  margin-bottom: 40px;
+  background-size: 100% 100%;
+  background-image: url("/images/educoder/courtailsbdpicture.jpg");
+  height: 240px;
+  justify-content: center;
+  align-items: center;
+  display: -webkit-flex;
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
 }
-.invite-tip{position: absolute;top: -5px;right: 140px;color: #fff; box-sizing: border-box;width: 170px;text-align: center;border-radius: 2px;background-color: rgba(5,16,26,0.6);z-index: 5000;}
-.inviteTipbtn a{font-size:14px;width: 100%;height: 30px;line-height: 30px;display: block;color: #747A7F;background-color: rgba(5,16,26,0.4)}
-.inviteTipbtn a:hover{color: #4cacff!important;}
-.top-black-trangle{display: block;border-width: 8px;position: absolute;top: -16px;right: 4px;border-style: dashed solid dashed dashed;border-color: transparent transparent rgba(5,16,26,0.6) transparent;font-size: 0;line-height: 0;}
-.right-black-trangle{display: block;border-width: 8px;position: absolute;top: 10px;right: -16px;border-style: dashed solid dashed dashed;border-color: transparent transparent transparent rgba(5,16,26,0.6);font-size: 0;line-height: 0;}
-.activity-nav.active{color: #4CACFF!important;}
-.yslinvitetip{right: 140px;color: #fff; box-sizing: border-box;width: 170px;text-align: center;border-radius: 2px;background-color: rgba(5,16,26,0.6)}
 
-.courseNewNum{display: block;background: #FF6800;border-radius:30px;padding:0px 2px;color: #fff!important;font-size: 11px;
-    height: 16px;line-height: 15px;min-width: 12px;text-align: center;margin-top: 17px;}
-.devide_class{max-width: 112px;}
-.edu-class-leftnav{ background:#fff;}
-.edu-class-leftnav li{ height: 50px;line-height: 50px;font-size:16px;cursor: pointer;position: relative;}
-.edu-class-leftnav li a{padding-left: 42px;width: 100%;box-sizing: border-box;}
-.edu-class-leftnav li:hover{background-color: #4CACFF}
-.edu-class-leftnav li:hover a{color: #FFF!important;}
-.edu-class-leftnav li:hover a,.edu-class-leftnav li:hover i{color: #fff!important;}
-.edu-class-leftnav li:hover span{color: #FFF;}
-.edu-class-leftnav li.active:before{content: '';position: absolute;left: 0px;top: 14px;bottom: 0;right: auto;height: 24px;width: 2px;background-color: #459be5;}
-.edu-class-leftnav li.active:hover{color: #fff; }
-.edu-class-leftnav li.active:hover .activity-left-name,.edu-class-leftnav li.active:hover i,.edu-class-leftnav li:hover .groupNum{color: #fff!important;}
-.edu-class-leftnav li.active:hover .courseNewNum{color:#fff!important;}
+.invite-tip {
+  position: absolute;
+  top: -5px;
+  right: 140px;
+  color: #fff;
+  box-sizing: border-box;
+  width: 170px;
+  text-align: center;
+  border-radius: 2px;
+  background-color: rgba(5, 16, 26, 0.6);
+  z-index: 5000;
+}
+
+.inviteTipbtn a {
+  font-size: 14px;
+  width: 100%;
+  height: 30px;
+  line-height: 30px;
+  display: block;
+  color: #747A7F;
+  background-color: rgba(5, 16, 26, 0.4)
+}
+
+.inviteTipbtn a:hover {
+  color: #4cacff !important;
+}
+
+.top-black-trangle {
+  display: block;
+  border-width: 8px;
+  position: absolute;
+  top: -16px;
+  right: 4px;
+  border-style: dashed solid dashed dashed;
+  border-color: transparent transparent rgba(5, 16, 26, 0.6) transparent;
+  font-size: 0;
+  line-height: 0;
+}
+
+.right-black-trangle {
+  display: block;
+  border-width: 8px;
+  position: absolute;
+  top: 10px;
+  right: -16px;
+  border-style: dashed solid dashed dashed;
+  border-color: transparent transparent transparent rgba(5, 16, 26, 0.6);
+  font-size: 0;
+  line-height: 0;
+}
+
+.activity-nav.active {
+  color: #4CACFF !important;
+}
+
+.yslinvitetip {
+  right: 140px;
+  color: #fff;
+  box-sizing: border-box;
+  width: 170px;
+  text-align: center;
+  border-radius: 2px;
+  background-color: rgba(5, 16, 26, 0.6)
+}
+
+.courseNewNum {
+  display: block;
+  background: #FF6800;
+  border-radius: 30px;
+  padding: 0px 2px;
+  color: #fff !important;
+  font-size: 11px;
+  height: 16px;
+  line-height: 15px;
+  min-width: 12px;
+  text-align: center;
+  margin-top: 17px;
+}
+
+.devide_class {
+  max-width: 112px;
+}
+
+.edu-class-leftnav {
+  background: #fff;
+}
+
+.edu-class-leftnav li {
+  height: 50px;
+  line-height: 50px;
+  font-size: 16px;
+  cursor: pointer;
+  position: relative;
+}
+
+.edu-class-leftnav li a {
+  padding-left: 42px;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.edu-class-leftnav li:hover {
+  background-color: #4CACFF
+}
+
+.edu-class-leftnav li:hover a {
+  color: #FFF !important;
+}
+
+.edu-class-leftnav li:hover a,
+.edu-class-leftnav li:hover i {
+  color: #fff !important;
+}
+
+.edu-class-leftnav li:hover span {
+  color: #FFF;
+}
+
+.edu-class-leftnav li.active:before {
+  content: '';
+  position: absolute;
+  left: 0px;
+  top: 14px;
+  bottom: 0;
+  right: auto;
+  height: 24px;
+  width: 2px;
+  background-color: #459be5;
+}
+
+.edu-class-leftnav li.active:hover {
+  color: #fff;
+}
+
+.edu-class-leftnav li.active:hover .activity-left-name,
+.edu-class-leftnav li.active:hover i,
+.edu-class-leftnav li:hover .groupNum {
+  color: #fff !important;
+}
+
+.edu-class-leftnav li.active:hover .courseNewNum {
+  color: #fff !important;
+}
 
 /*动态*/
-.activity-i{height: 32px;line-height: 32px;}
-.activity-list{padding-left: 20px;}
-.activity-item{padding: 30px 0px;display: flex;border-top: 1px solid #eee;}
-.activity-item:first-child{border-top: none;}
-p .activity-item:first-child{border-top: 1px solid #eee;}
-.activity-title{max-width: 530px;}
-.activity-tag{display: block;float: left;line-height: 48px;color: #999;font-size: 16px;width: 32px}
-.loadMore{width:100%;background-color: #fff;color:#4cacff!important; text-align:center; display:block;letter-spacing: 1px;box-sizing: border-box;height: 110px;line-height: 110px;}
+.activity-i {
+  height: 32px;
+  line-height: 32px;
+}
+
+.activity-list {
+  padding-left: 20px;
+}
+
+.activity-item {
+  padding: 30px 0px;
+  display: flex;
+  border-top: 1px solid #eee;
+}
+
+.activity-item:first-child {
+  border-top: none;
+}
+
+p .activity-item:first-child {
+  border-top: 1px solid #eee;
+}
+
+.activity-title {
+  max-width: 530px;
+}
+
+.activity-tag {
+  display: block;
+  float: left;
+  line-height: 48px;
+  color: #999;
+  font-size: 16px;
+  width: 32px
+}
+
+.loadMore {
+  width: 100%;
+  background-color: #fff;
+  color: #4cacff !important;
+  text-align: center;
+  display: block;
+  letter-spacing: 1px;
+  box-sizing: border-box;
+  height: 110px;
+  line-height: 110px;
+}
+
 /*课堂设置*/
-.upperLeft{min-width:400px;}
-.upperLeft-s{padding-left: 75px;}
-.del-childName{position: absolute;right: -37px;top: 7px}
-.addChildName{position: absolute;right: -178px;top: 10px;}
-.activity-left-name{display: block;max-width: 126px;float: left; }
+.upperLeft {
+  min-width: 400px;
+}
+
+.upperLeft-s {
+  padding-left: 75px;
+}
+
+.del-childName {
+  position: absolute;
+  right: -37px;
+  top: 7px
+}
+
+.addChildName {
+  position: absolute;
+  right: -178px;
+  top: 10px;
+}
+
+.activity-left-name {
+  display: block;
+  max-width: 126px;
+  float: left;
+}
 
 /*帖子列表*/
-.panel-inner-fourm{ padding:15px 20px; border-bottom:1px solid #eee;}
-.panel-inner-fourm:hover{ background:#EFF9FD;}
+.panel-inner-fourm {
+  padding: 15px 20px;
+  border-bottom: 1px solid #eee;
+}
+
+.panel-inner-fourm:hover {
+  background: #EFF9FD;
+}
+
 /*---------------------------------我的粉丝和我的关注-------------------*/
-.focus_fan_list{border-bottom: 1px solid #EBEBEB;padding: 20px 0px;display: flex}
-.focus_fan_list:last-child{border-bottom: none;}
-.double_f_middle{width: 56%;}
+.focus_fan_list {
+  border-bottom: 1px solid #EBEBEB;
+  padding: 20px 0px;
+  display: flex
+}
+
+.focus_fan_list:last-child {
+  border-bottom: none;
+}
+
+.double_f_middle {
+  width: 56%;
+}
 
 /*如何获得金币弹框*/
-.knowThis{width: 100%;height: 45px;line-height: 45px;text-align: center;border-top: 1px solid #eee}
+.knowThis {
+  width: 100%;
+  height: 45px;
+  line-height: 45px;
+  text-align: center;
+  border-top: 1px solid #eee
+}
 
 /*课堂资源列表*/
-#resource_list .homepageRight{width:100%!important;box-sizing: border-box;}
-.homepageRightBanner {width:100%!important; margin:0px auto; float:right; background-color: #ffffff; padding:25px 15px;border-bottom:1px solid #eee;box-sizing: border-box; }
-.resources {width:100%!important;padding: 15px;float: left;box-sizing: border-box;border-top: 1px solid #EEEEEE}
-.sources-bg:hover{background: #EFF9FD}
-.resources:last-child{border-bottom: none;}
-.homepagePostBrief{display: flex}
-.homepagePostDes{flex: 1;position: relative;}
-.homepagePostBrief {width:100%!important; margin:0px auto; position:relative;}
+#resource_list .homepageRight {
+  width: 100% !important;
+  box-sizing: border-box;
+}
+
+.homepageRightBanner {
+  width: 100% !important;
+  margin: 0px auto;
+  float: right;
+  background-color: #ffffff;
+  padding: 25px 15px;
+  border-bottom: 1px solid #eee;
+  box-sizing: border-box;
+}
+
+.resources {
+  width: 100% !important;
+  padding: 15px;
+  float: left;
+  box-sizing: border-box;
+  border-top: 1px solid #EEEEEE
+}
+
+.sources-bg:hover {
+  background: #EFF9FD
+}
+
+.resources:last-child {
+  border-bottom: none;
+}
+
+.homepagePostBrief {
+  display: flex
+}
+
+.homepagePostDes {
+  flex: 1;
+  position: relative;
+}
+
+.homepagePostBrief {
+  width: 100% !important;
+  margin: 0px auto;
+  position: relative;
+}
+
 /*资源标签*/
-#sourceTag li{font-size: 12px;color: #4E7A9B;background-color: #E5F3FF;padding: 0px 4px;height: 20px;line-height: 20px; margin-left: 5px;display: inline-block;cursor: pointer}
-#sourceTag li a{color: #4e7a9b!important;}
-#sourceTag li.active{background-color: #4CACFF;color: #fff;}
-#sourceTag li.active a{background-color: #4CACFF;color: #fff!important;}
-.sourseLineTag li{display: inline-block;margin-right: 5px;}
-.sourseLineTag li span{display: inline-block;font-size: 12px;cursor: default;color: #4E7A9B;background-color: #E5F3FF;padding: 0px 4px;height: 20px;line-height: 20px;}
-.sourseLineTag li a{display: inline-block;margin-left: 3px;color: #cccccc;}
-.sourseLineTag .addTagBtn{font-size: 12px;border:1px solid #4CACFF;color: #4CACFF;height: 20px;line-height: 20px;padding: 0px 5px;border-radius: 4px;}
+#sourceTag li {
+  font-size: 12px;
+  color: #4E7A9B;
+  background-color: #E5F3FF;
+  padding: 0px 4px;
+  height: 20px;
+  line-height: 20px;
+  margin-left: 5px;
+  display: inline-block;
+  cursor: pointer
+}
+
+#sourceTag li a {
+  color: #4e7a9b !important;
+}
+
+#sourceTag li.active {
+  background-color: #4CACFF;
+  color: #fff;
+}
+
+#sourceTag li.active a {
+  background-color: #4CACFF;
+  color: #fff !important;
+}
+
+.sourseLineTag li {
+  display: inline-block;
+  margin-right: 5px;
+}
+
+.sourseLineTag li span {
+  display: inline-block;
+  font-size: 12px;
+  cursor: default;
+  color: #4E7A9B;
+  background-color: #E5F3FF;
+  padding: 0px 4px;
+  height: 20px;
+  line-height: 20px;
+}
+
+.sourseLineTag li a {
+  display: inline-block;
+  margin-left: 3px;
+  color: #cccccc;
+}
+
+.sourseLineTag .addTagBtn {
+  font-size: 12px;
+  border: 1px solid #4CACFF;
+  color: #4CACFF;
+  height: 20px;
+  line-height: 20px;
+  padding: 0px 5px;
+  border-radius: 4px;
+}
+
 /*---------------------------------消息页----------------------------------*/
-.new-info{height: 18px;min-width: 18px;line-height:18px;padding:0px 2px;box-sizing: border-box;text-align: center;background-color: #ff6800;color: #fff;border-radius: 30px;display: block;position: absolute;right: 40px;top:13px;font-size: 12px; }
-.ridingNav li{float: left;margin:0px 20px;color:#999;font-size: 16px;height: 60px;line-height: 60px;position: relative;}
-.ridingNav li a{display: block;width: 100%;height: 100%;color: #999999;}
-.ridingNav li.active a{color: #05101A;}
-.ridingNav li.active:after{content: '';position: absolute;bottom: 0px;width: 100%;height: 2px;border-radius: 1px;background-color: #05101A;}
+.new-info {
+  height: 18px;
+  min-width: 18px;
+  line-height: 18px;
+  padding: 0px 2px;
+  box-sizing: border-box;
+  text-align: center;
+  background-color: #ff6800;
+  color: #fff;
+  border-radius: 30px;
+  display: block;
+  position: absolute;
+  right: 40px;
+  top: 13px;
+  font-size: 12px;
+}
+
+.ridingNav li {
+  float: left;
+  margin: 0px 20px;
+  color: #999;
+  font-size: 16px;
+  height: 60px;
+  line-height: 60px;
+  position: relative;
+}
+
+.ridingNav li a {
+  display: block;
+  width: 100%;
+  height: 100%;
+  color: #999999;
+}
+
+.ridingNav li.active a {
+  color: #05101A;
+}
+
+.ridingNav li.active:after {
+  content: '';
+  position: absolute;
+  bottom: 0px;
+  width: 100%;
+  height: 2px;
+  border-radius: 1px;
+  background-color: #05101A;
+}
+
+.new-point {
+  display: block;
+  width: 4px;
+  height: 4px;
+  border-radius: 50%;
+  background-color: #ff6800;
+}
+
+.ridinglist:hover {
+  background-color: #F5F5F5;
+}
+
+.ridinglist .ridinglist-sub {
+  border-bottom: 1px solid #F5F5F5;
+  padding: 25px 0px;
+  cursor: pointer;
+}
+
+.ridinglist:last-child .ridinglist-sub {
+  border-bottom: none;
+}
 
-.new-point{display: block;width:4px;height: 4px;border-radius: 50%;background-color: #ff6800;}
-.ridinglist:hover{background-color: #F5F5F5;}
-.ridinglist .ridinglist-sub{border-bottom: 1px solid #F5F5F5;padding: 25px 0px;cursor: pointer;}
-.ridinglist:last-child .ridinglist-sub{border-bottom: none;}
 /*私信*/
-.private-item{padding: 30px 30px 30px 25px;border-bottom: 1px solid #F5F5F5;cursor: pointer}
-.private-item:hover{background-color: #f5f5f5;}
-.private-item:last-child{border-bottom: none;}
-.writeLetter_Info{position: relative;width: 100%;height: 260px;background-color: #F6F6F6;cursor: default;border-radius: 3px;}
-.writeLetter_text{width: 100%;border:none;background-color:#F6F6F6;outline: none;height: 100%;padding: 5px 5px 30px 5px;border: 1px solid #EAEAEA; box-sizing: border-box; resize: none;}
-.longchar{position: absolute;background-color:#F6F6F6;bottom: 1px;color: #999999;right: 10px;}
-.writeLetter_text:focus + .longchar{background-color: #fff;}
-.recently_person{position: absolute;width: 100%;top: 35px;max-height: 300px;overflow-y: auto;border-radius: 4px;box-shadow: 0px 1px 6px rgba(76,76,76,0.2);left: 0px;z-index: 1;background-color: #fff;cursor: pointer;display: none}
-.recently_item{padding: 10px 20px;}
-.recently_name{float: left;line-height: 48px;display: block}
-.recently_item:hover{background-color: #F9F9F9;}
-/*私信对话框*/
-.private-list{min-height: 660px;max-height: 831px;overflow-y: auto;overflow-x: hidden;}
-.private-list .private-part{padding-left:20px;cursor: pointer}
-.private-part:hover{background-color: #F5F5F5;}
-.private-part.active{background-color: #F5F5F5;}
-.privatePartName{max-width: 70px;float: left}
-.newLetter{display: block;width: 4px;height: 4px;background-color: #FF6800;border-radius: 50%;float: right}
-.part-line{padding: 30px 20px 30px 0px;border-bottom: 1px solid #f5f5f5;}
-.private-part:last-child .part-line{border: none;}
+.private-item {
+  padding: 30px 30px 30px 25px;
+  border-bottom: 1px solid #F5F5F5;
+  cursor: pointer
+}
 
-.dialogPanel{padding: 0px 20px;height: 545px;overflow-y: auto}
-.letter-time{width: auto;padding: 0px 10px;background-color: #999;color: #fff;border-radius: 10px;height: 20px;line-height: 20px;}
-.OtherSide,.ThisSide{margin-top: 30px;}
-.OtherSide-info .trangle{position: absolute;left: -5px;top: 10px;width: 0;height: 0px;border-top: 6px solid transparent;border-right: 5px solid #f5f5f5;border-bottom: 6px solid transparent}
-.OtherSide-info .sms{max-width: 300px;padding:10px 15px;box-sizing: border-box;background-color: #F5F5F5;color: #666;border-radius: 6px;text-align: justify}
-.OtherSide-info .sms img{max-width: 80px;cursor: pointer}
-.ThisSide-info .sms p{line-height: 20px;}
-.sms{min-height: 48px;}
-.ThisSide .trangle{position: absolute;right: -5px;top: 10px;width: 0;height: 0px;border-top: 6px solid transparent;border-left: 5px solid #4CACFF;border-bottom: 6px solid transparent}
-.ThisSide-info .sms{max-width: 300px;padding:10px 15px;box-sizing: border-box;background-color: #4CACFF;color: #fff;border-radius: 6px;text-align: justify}
-.ThisSide-info .sms p{line-height: 20px;}
-.ThisSide-info .sms img{max-width: 80px;cursor: pointer}
+.private-item:hover {
+  background-color: #f5f5f5;
+}
+
+.private-item:last-child {
+  border-bottom: none;
+}
+
+.writeLetter_Info {
+  position: relative;
+  width: 100%;
+  height: 260px;
+  background-color: #F6F6F6;
+  cursor: default;
+  border-radius: 3px;
+}
+
+.writeLetter_text {
+  width: 100%;
+  border: none;
+  background-color: #F6F6F6;
+  outline: none;
+  height: 100%;
+  padding: 5px 5px 30px 5px;
+  border: 1px solid #EAEAEA;
+  box-sizing: border-box;
+  resize: none;
+}
+
+.longchar {
+  position: absolute;
+  background-color: #F6F6F6;
+  bottom: 1px;
+  color: #999999;
+  right: 10px;
+}
+
+.writeLetter_text:focus+.longchar {
+  background-color: #fff;
+}
+
+.recently_person {
+  position: absolute;
+  width: 100%;
+  top: 35px;
+  max-height: 300px;
+  overflow-y: auto;
+  border-radius: 4px;
+  box-shadow: 0px 1px 6px rgba(76, 76, 76, 0.2);
+  left: 0px;
+  z-index: 1;
+  background-color: #fff;
+  cursor: pointer;
+  display: none
+}
+
+.recently_item {
+  padding: 10px 20px;
+}
+
+.recently_name {
+  float: left;
+  line-height: 48px;
+  display: block
+}
+
+.recently_item:hover {
+  background-color: #F9F9F9;
+}
+
+/*私信对话框*/
+.private-list {
+  min-height: 660px;
+  max-height: 831px;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+.private-list .private-part {
+  padding-left: 20px;
+  cursor: pointer
+}
+
+.private-part:hover {
+  background-color: #F5F5F5;
+}
+
+.private-part.active {
+  background-color: #F5F5F5;
+}
+
+.privatePartName {
+  max-width: 70px;
+  float: left
+}
+
+.newLetter {
+  display: block;
+  width: 4px;
+  height: 4px;
+  background-color: #FF6800;
+  border-radius: 50%;
+  float: right
+}
+
+.part-line {
+  padding: 30px 20px 30px 0px;
+  border-bottom: 1px solid #f5f5f5;
+}
+
+.private-part:last-child .part-line {
+  border: none;
+}
+
+.dialogPanel {
+  padding: 0px 20px;
+  height: 545px;
+  overflow-y: auto
+}
+
+.letter-time {
+  width: auto;
+  padding: 0px 10px;
+  background-color: #999;
+  color: #fff;
+  border-radius: 10px;
+  height: 20px;
+  line-height: 20px;
+}
+
+.OtherSide,
+.ThisSide {
+  margin-top: 30px;
+}
+
+.OtherSide-info .trangle {
+  position: absolute;
+  left: -5px;
+  top: 10px;
+  width: 0;
+  height: 0px;
+  border-top: 6px solid transparent;
+  border-right: 5px solid #f5f5f5;
+  border-bottom: 6px solid transparent
+}
+
+.OtherSide-info .sms {
+  max-width: 300px;
+  padding: 10px 15px;
+  box-sizing: border-box;
+  background-color: #F5F5F5;
+  color: #666;
+  border-radius: 6px;
+  text-align: justify
+}
+
+.OtherSide-info .sms img {
+  max-width: 80px;
+  cursor: pointer
+}
+
+.ThisSide-info .sms p {
+  line-height: 20px;
+}
+
+.sms {
+  min-height: 48px;
+}
+
+.ThisSide .trangle {
+  position: absolute;
+  right: -5px;
+  top: 10px;
+  width: 0;
+  height: 0px;
+  border-top: 6px solid transparent;
+  border-left: 5px solid #4CACFF;
+  border-bottom: 6px solid transparent
+}
+
+.ThisSide-info .sms {
+  max-width: 300px;
+  padding: 10px 15px;
+  box-sizing: border-box;
+  background-color: #4CACFF;
+  color: #fff;
+  border-radius: 6px;
+  text-align: justify
+}
+
+.ThisSide-info .sms p {
+  line-height: 20px;
+}
+
+.ThisSide-info .sms img {
+  max-width: 80px;
+  cursor: pointer
+}
 
 
 /*-------------------竞赛----------------------*/
-#contenter{min-width: 1200px;}
-#competition-content,#competition-db-content{background-color: #EFEFEF}
-#competition-content img,#competition-db-content img,#ccfPage img{vertical-align: bottom;}
-#hnpage1{background: url('/images/educoder/competition/logo_1.jpg') no-repeat top center;min-height: 820px;}
+#contenter {
+  min-width: 1200px;
+}
 
-#competition-header{background: linear-gradient(to right, #29bd8b , #13dc98);height: 60px;width: 100%;padding-right: 40px;box-sizing: border-box;position: fixed;top: 0px;left: 0px;width: 100%;z-index: 1000;}
-.nav-game{position: relative;}
-.nav-game li{position: relative;float: left;width: 110px;height: 60px;line-height: 60px;text-align: center;box-sizing: border-box}
-.nav-game li a{color:#fff;font-size: 16px;}
-.nav-border{position: absolute;bottom: 0px;width: 100%;height: 3px;}
-#nav-white{height: 3px;background-color: #fff;position: relative;width: 42px;left: 34px;}
+#competition-content,
+#competition-db-content {
+  background-color: #EFEFEF
+}
+
+#competition-content img,
+#competition-db-content img,
+#ccfPage img {
+  vertical-align: bottom;
+}
+
+#hnpage1 {
+  background: url('/images/educoder/competition/logo_1.jpg') no-repeat top center;
+  min-height: 820px;
+}
+
+#competition-header {
+  background: linear-gradient(to right, #29bd8b, #13dc98);
+  height: 60px;
+  width: 100%;
+  padding-right: 40px;
+  box-sizing: border-box;
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  z-index: 1000;
+}
+
+.nav-game {
+  position: relative;
+}
+
+.nav-game li {
+  position: relative;
+  float: left;
+  width: 110px;
+  height: 60px;
+  line-height: 60px;
+  text-align: center;
+  box-sizing: border-box
+}
+
+.nav-game li a {
+  color: #fff;
+  font-size: 16px;
+}
+
+.nav-border {
+  position: absolute;
+  bottom: 0px;
+  width: 100%;
+  height: 3px;
+}
+
+#nav-white {
+  height: 3px;
+  background-color: #fff;
+  position: relative;
+  width: 42px;
+  left: 34px;
+}
+
+.intoGame {
+  background-color: #efefef;
+  width: 100%;
+  position: relative;
+  min-height: 2200px;
+}
+
+.top-com {
+  position: relative;
+  width: 100%;
+  top: 285px;
+  margin: 0px auto;
+}
+
+.partGame {
+  width: 900px;
+  margin: 60px auto;
+  background-color: #fff;
+  padding: 70px;
+  box-sizing: border-box
+}
+
+.partGame:first-child {
+  margin-top: 0px;
+}
+
+.partborder {
+  position: relative;
+  width: 100%;
+  border: 1px solid #eee;
+  border-radius: 3px;
+  padding: 60px;
+  box-sizing: border-box;
+  text-align: center
+}
+
+.gemeName {
+  position: absolute;
+  font-weight: bold;
+  font-size: 24px;
+  top: -24px;
+  background-color: #fff;
+  display: block;
+  left: 50%;
+  margin-left: -45px;
+  text-align: center;
+  padding: 0px 5px;
+}
+
+.enterTo a {
+  float: left;
+  width: 180px;
+  color: #fff !important;
+  background-color: #cdcdcd;
+  font-weight: bold;
+  font-size: 22px;
+  text-align: center;
+  margin-right: 25px;
+  cursor: default;
+  height: 60px;
+  line-height: 60px;
+  border-radius: 35px;
+}
+
+.enterTo a:last-child {
+  margin-right: 0px;
+}
+
+.partTime .pro,
+.partTime .time {
+  color: #666;
+  font-size: 17px;
+}
+
+.action {
+  color: rgb(5, 16, 26);
+}
+
+.partTime.active .pro,
+.partTime.active .time {
+  color: #666;
+}
 
-.intoGame{background-color: #efefef;width:100%;position: relative;min-height: 2200px;}
-.top-com{position: relative;width: 100%;top: 285px;margin: 0px auto;}
-.partGame{width:900px;margin:60px auto;background-color: #fff;padding:70px;box-sizing: border-box }
-.partGame:first-child{margin-top:0px;}
-.partborder{position: relative;width: 100%;border:1px solid #eee;border-radius: 3px;padding: 60px;box-sizing: border-box;text-align: center}
-.gemeName{position: absolute;font-weight: bold;font-size: 24px;top: -24px;background-color: #fff;display: block;left: 50%;margin-left: -45px;text-align: center;padding: 0px 5px;}
-.enterTo a{float: left;width: 180px;color: #fff!important;background-color:#cdcdcd;font-weight: bold;font-size: 22px;text-align: center;margin-right:25px;cursor: default;height: 60px;line-height: 60px;border-radius: 35px;}
-.enterTo a:last-child{margin-right: 0px;}
-.partTime .pro,.partTime .time{color: #666;font-size: 17px;}
-.action{color: rgb(5, 16, 26);}
-.partTime.active .pro,.partTime.active .time{color: #666;}
 /*开源标注组*/
-.partGame.largepart{width: 1010px;}
-.partGame.largepart .partborder{padding: 56px 40px 40px 40px;}
-.partGame.largepart .partborder .enterTo a{width: 249px;margin-right: 20px;font-size: 20px;font-weight: normal}
-.enterTo span.f-cart{width: 246px;text-align: center;color: #29BD8B;font-size: 20px;line-height: 20px;float: left;display: block;font-weight: bold;margin-right: 20px;}
-.enterTo span.d-cart{box-sizing:border-box;width: 246px;text-align: center;color: #989898;font-size: 16px;line-height: 22px;float: left;display: block;margin-right: 20px;}
-.partGame.largepart .partborder .enterTo a:last-child,.enterTo span.f-cart:last-child,.enterTo span.d-cart:last-child{margin-right:0px;}
+.partGame.largepart {
+  width: 1010px;
+}
+
+.partGame.largepart .partborder {
+  padding: 56px 40px 40px 40px;
+}
+
+.partGame.largepart .partborder .enterTo a {
+  width: 249px;
+  margin-right: 20px;
+  font-size: 20px;
+  font-weight: normal
+}
+
+.enterTo span.f-cart {
+  width: 246px;
+  text-align: center;
+  color: #29BD8B;
+  font-size: 20px;
+  line-height: 20px;
+  float: left;
+  display: block;
+  font-weight: bold;
+  margin-right: 20px;
+}
+
+.enterTo span.d-cart {
+  box-sizing: border-box;
+  width: 246px;
+  text-align: center;
+  color: #989898;
+  font-size: 16px;
+  line-height: 22px;
+  float: left;
+  display: block;
+  margin-right: 20px;
+}
+
+.partGame.largepart .partborder .enterTo a:last-child,
+.enterTo span.f-cart:last-child,
+.enterTo span.d-cart:last-child {
+  margin-right: 0px;
+}
+
 /*.partTime.active .time{color:#ff3232; }*/
-.partTime.active .enterTo a{cursor: pointer;background-color: #29bd8b;box-shadow: 0px 10px 10px rgba(41,189,139,0.2)}
-a.enterLink{cursor: pointer;color: #418CCD!important;background: none!important;box-shadow: none!important;font-size: 14px!important;text-align: left;line-height: 20px;height: 20px;padding-bottom: 1px;border-bottom: 1px solid #418ccd;width: auto!important;border-radius: 0px;}
-.codeRemark{display: block;height: 30px;border-radius: 14px;width: 100%;background-color: #cdcdcd;color: #fff!important;text-align: center;line-height: 30px;}
-.timered{color:#ff3232!important; }
-.wordblack{color:rgb(5, 16, 26)!important;}
+.partTime.active .enterTo a {
+  cursor: pointer;
+  background-color: #29bd8b;
+  box-shadow: 0px 10px 10px rgba(41, 189, 139, 0.2)
+}
 
-.Enroll-competition1,.Enroll-competition2,.Enroll-competition3{width: 140px;color: #cdcdcd!important;font-weight: bold;font-size: 18px;text-align: center;margin:0px 20px;cursor: default}
-.Enroll-competition1.active,.Enroll-competition2.active,.Enroll-competition3.active{color: #13dc98!important;cursor: pointer}
+a.enterLink {
+  cursor: pointer;
+  color: #418CCD !important;
+  background: none !important;
+  box-shadow: none !important;
+  font-size: 14px !important;
+  text-align: left;
+  line-height: 20px;
+  height: 20px;
+  padding-bottom: 1px;
+  border-bottom: 1px solid #418ccd;
+  width: auto !important;
+  border-radius: 0px;
+}
 
-.position-shixun{position: absolute;z-index: 2;bottom: 40px;text-align: center;width: 100%}
-.ccf-position-shixun .shixun-btn,.position-shixun .shixun-btn,.ccf-position-shixun-2 .shixun-btn{display: block;float: left;width: 160px;text-align:center;letter-spacing: 1px;height: 40px;line-height: 40px;color:#fff!important;margin:0px 20px;background: linear-gradient(to right, #ff8634 , #ff9d5b);box-shadow: 6px 4px 11px #f7ece4;}
+.codeRemark {
+  display: block;
+  height: 30px;
+  border-radius: 14px;
+  width: 100%;
+  background-color: #cdcdcd;
+  color: #fff !important;
+  text-align: center;
+  line-height: 30px;
+}
+
+.timered {
+  color: #ff3232 !important;
+}
+
+.wordblack {
+  color: rgb(5, 16, 26) !important;
+}
+
+.Enroll-competition1,
+.Enroll-competition2,
+.Enroll-competition3 {
+  width: 140px;
+  color: #cdcdcd !important;
+  font-weight: bold;
+  font-size: 18px;
+  text-align: center;
+  margin: 0px 20px;
+  cursor: default
+}
+
+.Enroll-competition1.active,
+.Enroll-competition2.active,
+.Enroll-competition3.active {
+  color: #13dc98 !important;
+  cursor: pointer
+}
+
+.position-shixun {
+  position: absolute;
+  z-index: 2;
+  bottom: 40px;
+  text-align: center;
+  width: 100%
+}
+
+.ccf-position-shixun .shixun-btn,
+.position-shixun .shixun-btn,
+.ccf-position-shixun-2 .shixun-btn {
+  display: block;
+  float: left;
+  width: 160px;
+  text-align: center;
+  letter-spacing: 1px;
+  height: 40px;
+  line-height: 40px;
+  color: #fff !important;
+  margin: 0px 20px;
+  background: linear-gradient(to right, #ff8634, #ff9d5b);
+  box-shadow: 6px 4px 11px #f7ece4;
+}
 
 @media screen and (max-width: 1600px) {
 
-    .position-shixun{bottom: 30px;}
-    .ccf-position-shixun .shixun-btn,.position-shixun .shixun-btn,.ccf-position-shixun-2 .shixun-btn{width: 150px;letter-spacing: 0px;height:40px;line-height: 40px;}
-    .ccf-position-shixun{top:242px!important;}
-    .ccf-position-shixun-2{bottom: 240px!important;}
+  .position-shixun {
+    bottom: 30px;
+  }
+
+  .ccf-position-shixun .shixun-btn,
+  .position-shixun .shixun-btn,
+  .ccf-position-shixun-2 .shixun-btn {
+    width: 150px;
+    letter-spacing: 0px;
+    height: 40px;
+    line-height: 40px;
+  }
+
+  .ccf-position-shixun {
+    top: 242px !important;
+  }
+
+  .ccf-position-shixun-2 {
+    bottom: 240px !important;
+  }
 }
+
 @media screen and (max-width: 1400px) {
 
-    .position-shixun{bottom: 25px;}
-    .ccf-position-shixun .shixun-btn,.position-shixun .shixun-btn,.ccf-position-shixun-2 .shixun-btn{width: 130px;letter-spacing: 0px;height:30px;line-height: 30px;}
-    .ccf-position-shixun{top:200px!important;}
-    .ccf-position-shixun-2{bottom: 200px!important;}
-}
-.announcement-list{padding: 10px 80px 40px;}
-.announcement{padding:20px 0px;border-bottom: 1px solid #eee;}
-.announcement:last-child{border-bottom: none;}
+  .position-shixun {
+    bottom: 25px;
+  }
 
-.competition-part{position: absolute;width: 100%;top:550px;z-index:9;height: 0px;}
-.img-game{position: absolute;right: -140px;z-index: 11;}
-.close-game{position: absolute;right:10px; z-index: 12;top: 0px;}
-.part{width: 540px;margin:0px auto 10px;background-color: rgba(25,27,32,.6)}
+  .ccf-position-shixun .shixun-btn,
+  .position-shixun .shixun-btn,
+  .ccf-position-shixun-2 .shixun-btn {
+    width: 130px;
+    letter-spacing: 0px;
+    height: 30px;
+    line-height: 30px;
+  }
+
+  .ccf-position-shixun {
+    top: 200px !important;
+  }
+
+  .ccf-position-shixun-2 {
+    bottom: 200px !important;
+  }
+}
+
+.announcement-list {
+  padding: 10px 80px 40px;
+}
+
+.announcement {
+  padding: 20px 0px;
+  border-bottom: 1px solid #eee;
+}
+
+.announcement:last-child {
+  border-bottom: none;
+}
+
+.competition-part {
+  position: absolute;
+  width: 100%;
+  top: 550px;
+  z-index: 9;
+  height: 0px;
+}
+
+.img-game {
+  position: absolute;
+  right: -140px;
+  z-index: 11;
+}
+
+.close-game {
+  position: absolute;
+  right: 10px;
+  z-index: 12;
+  top: 0px;
+}
+
+.part {
+  width: 540px;
+  margin: 0px auto 10px;
+  background-color: rgba(25, 27, 32, .6)
+}
 
 /*报名入口页*/
-.enroll-t{min-height: 350px;position: relative;justify-content: center;align-items: center;display: -webkit-flex;}
-.enroll-b{background:url('/images/educoder/competition/enroll-2.png') no-repeat top center; min-height: 1100px}
-.enroll-info{margin: 0px auto;min-width: 520px;max-width: 580px;height: 40px;line-height: 40px;background-color:#f6f6f6;border-radius: 20px;padding: 0px 60px;box-sizing: border-box }
+.enroll-t {
+  min-height: 350px;
+  position: relative;
+  justify-content: center;
+  align-items: center;
+  display: -webkit-flex;
+}
 
-.immediatelyEnroll{display: block;width: 130px;text-align:center;letter-spacing: 1px;height: 34px;line-height: 34px;color:#fff!important;background: linear-gradient(to right, #ff8634 , #ff9d5b);box-shadow: 6px 4px 11px #f7ece4;}
-.enrollShowPanel{width: 915px;min-height: 300px;box-shadow: -8px 9px 12px 1px rgba(116,122,127,0.2);margin: 0px auto;margin-left: 18px;}
-.enrollShowTitle{position: absolute;top: -39px;width: 100%;left: 0px;text-align: center}
-.enrollShowNum{font-size: 18px;height: 40px;line-height: 40px;box-shadow: 0px -3px 4px rgba(109,109,109,0.15);background: #fff;width: 150px;text-align: center;color: #21B351;display: block}
-.enrollList{height: 670px;box-shadow:0px 0px 4px rgba(0,0,0,0.1);width: 100%;margin-top: 40px;}
-.enrollItemContent{padding: 0px 10px;width: 100%;box-sizing: border-box;height: 100%;overflow: hidden;}
-.enrollItemContent li{border-bottom: 1px solid #EAEAEA;padding: 20px;line-height: 20px}
-.team-p-s{width: 20px;height: 20px;line-height: 12px;text-align: center;border-radius: 50%;background: #BCBCBC;color: #fff;float: left}
-.enroll-in-b{display: block;border:4px solid #fff;width: 216px;height: 62px;text-align: center;line-height: 62px;margin-right: 220px;font-size: 32px;color: #fff!important;background: #006542}
-.enroll-in-b-green{background: #29BD8B}
+.enroll-b {
+  background: url('/images/educoder/competition/enroll-2.png') no-repeat top center;
+  min-height: 1100px
+}
+
+.enroll-info {
+  margin: 0px auto;
+  min-width: 520px;
+  max-width: 580px;
+  height: 40px;
+  line-height: 40px;
+  background-color: #f6f6f6;
+  border-radius: 20px;
+  padding: 0px 60px;
+  box-sizing: border-box
+}
+
+.immediatelyEnroll {
+  display: block;
+  width: 130px;
+  text-align: center;
+  letter-spacing: 1px;
+  height: 34px;
+  line-height: 34px;
+  color: #fff !important;
+  background: linear-gradient(to right, #ff8634, #ff9d5b);
+  box-shadow: 6px 4px 11px #f7ece4;
+}
+
+.enrollShowPanel {
+  width: 915px;
+  min-height: 300px;
+  box-shadow: -8px 9px 12px 1px rgba(116, 122, 127, 0.2);
+  margin: 0px auto;
+  margin-left: 18px;
+}
+
+.enrollShowTitle {
+  position: absolute;
+  top: -39px;
+  width: 100%;
+  left: 0px;
+  text-align: center
+}
+
+.enrollShowNum {
+  font-size: 18px;
+  height: 40px;
+  line-height: 40px;
+  box-shadow: 0px -3px 4px rgba(109, 109, 109, 0.15);
+  background: #fff;
+  width: 150px;
+  text-align: center;
+  color: #21B351;
+  display: block
+}
+
+.enrollList {
+  height: 670px;
+  box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
+  width: 100%;
+  margin-top: 40px;
+}
+
+.enrollItemContent {
+  padding: 0px 10px;
+  width: 100%;
+  box-sizing: border-box;
+  height: 100%;
+  overflow: hidden;
+}
+
+.enrollItemContent li {
+  border-bottom: 1px solid #EAEAEA;
+  padding: 20px;
+  line-height: 20px
+}
+
+.team-p-s {
+  width: 20px;
+  height: 20px;
+  line-height: 12px;
+  text-align: center;
+  border-radius: 50%;
+  background: #BCBCBC;
+  color: #fff;
+  float: left
+}
+
+.enroll-in-b {
+  display: block;
+  border: 4px solid #fff;
+  width: 216px;
+  height: 62px;
+  text-align: center;
+  line-height: 62px;
+  margin-right: 220px;
+  font-size: 32px;
+  color: #fff !important;
+  background: #006542
+}
+
+.enroll-in-b-green {
+  background: #29BD8B
+}
+
+.joinTeamInfo {
+  background-image: url('/images/educoder/competition/enroll-item.png');
+  height: 202px;
+  width: 934px;
+  padding: 10px 35px;
+  box-sizing: border-box;
+  margin: 0px auto;
+  padding-top: 60px;
+}
+
+.joinTeamInfo span,
+.joinTeamInfo a {
+  line-height: 30px;
+}
 
-.joinTeamInfo{background-image:url('/images/educoder/competition/enroll-item.png');height:202px;width: 934px;padding: 10px 35px;box-sizing: border-box;margin: 0px auto;padding-top: 60px;}
-.joinTeamInfo span,.joinTeamInfo a{line-height: 30px;}
 /*弹框*/
-.c-l-box{background: rgba(139,163,183,0.08);height: 226px;overflow-y: auto;width: 100%;padding: 20px 20px 0px 20px;box-sizing: border-box;}
-.c-l-box li,.c-r-box li{margin-bottom: 15px;line-height: 25px;}
-.l-column-1,.l-column-2,.l-column-3{text-align: left;float: left;width: 100px;}
-.l-column-1{width: 80px}
-.select-arrow i{color: #B2DAFB!important;}
-.select-arrow i:hover{color: #4CACFF!important;}
-.c-r-box{height: 226px;padding: 20px 20px 0px 20px;overflow-y: scroll;}
+.c-l-box {
+  background: rgba(139, 163, 183, 0.08);
+  height: 226px;
+  overflow-y: auto;
+  width: 100%;
+  padding: 20px 20px 0px 20px;
+  box-sizing: border-box;
+}
 
-.pointerTeacher{position: absolute;width: 100%;background:#fff;border-radius:2px;box-shadow:0px 2px 10px 0px rgba(76,76,76,0.2);height: 184px;z-index: 3;top: 35px;overflow-y: auto}
-.pointerTeacher li .pt-s{width: 100px;text-align: center;float: left;margin-right: 10px;line-height: 34px}
-.pointerTeacher li .pt-s-n{width: 120px;text-align: center;float: left;margin-right: 10px;line-height: 34px}
-.pointerTeacher li .pt-m{width: 260px;text-align: center;float: left;line-height: 34px}
-.pointerTeacher li .pt-l{width: 369px;text-align: center;float: left;line-height: 34px}
-.pointerTeacher li{cursor: pointer}
-.pointerTeacher li:hover{background-color: #F6F6F6;}
-.pointerTeacher .added{background-color: #FFF0E5!important;}
+.c-l-box li,
+.c-r-box li {
+  margin-bottom: 15px;
+  line-height: 25px;
+}
+
+.l-column-1,
+.l-column-2,
+.l-column-3 {
+  text-align: left;
+  float: left;
+  width: 100px;
+}
+
+.l-column-1 {
+  width: 80px
+}
+
+.select-arrow i {
+  color: #B2DAFB !important;
+}
+
+.select-arrow i:hover {
+  color: #4CACFF !important;
+}
+
+.c-r-box {
+  height: 226px;
+  padding: 20px 20px 0px 20px;
+  overflow-y: scroll;
+}
+
+.pointerTeacher {
+  position: absolute;
+  width: 100%;
+  background: #fff;
+  border-radius: 2px;
+  box-shadow: 0px 2px 10px 0px rgba(76, 76, 76, 0.2);
+  height: 184px;
+  z-index: 3;
+  top: 35px;
+  overflow-y: auto
+}
+
+.pointerTeacher li .pt-s {
+  width: 100px;
+  text-align: center;
+  float: left;
+  margin-right: 10px;
+  line-height: 34px
+}
+
+.pointerTeacher li .pt-s-n {
+  width: 120px;
+  text-align: center;
+  float: left;
+  margin-right: 10px;
+  line-height: 34px
+}
+
+.pointerTeacher li .pt-m {
+  width: 260px;
+  text-align: center;
+  float: left;
+  line-height: 34px
+}
+
+.pointerTeacher li .pt-l {
+  width: 369px;
+  text-align: center;
+  float: left;
+  line-height: 34px
+}
+
+.pointerTeacher li {
+  cursor: pointer
+}
+
+.pointerTeacher li:hover {
+  background-color: #F6F6F6;
+}
+
+.pointerTeacher .added {
+  background-color: #FFF0E5 !important;
+}
+
+.personListLine {
+  cursor: default
+}
+
+.personListLine>span {
+  float: left;
+  text-align: center;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.t-c-1 {
+  width: 120px;
+}
+
+.t-c-2 {
+  width: 150px;
+  text-align: left !important;
+}
+
+.t-c-3 {
+  width: 210px;
+}
+
+.t-c-4 {
+  width: 200px;
+}
+
+.t-c-5 {
+  width: 80px;
+}
 
-.personListLine{cursor: default}
-.personListLine > span{float: left;text-align: center;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.t-c-1{width: 120px;}
-.t-c-2{width: 150px;text-align: left!important;}
-.t-c-3{width: 210px;}
-.t-c-4{width: 200px;}
-.t-c-5{width: 80px;}
 /*东北赛区*/
-#dbpage1{background: url('/images/educoder/competition/db/db1.jpg') no-repeat top center;min-height: 820px;}
-/*主页、列表页*/
-.competitionHome{background: url('/images/educoder/competition/home/homepage.jpg') no-repeat top center;min-width: 1200px;}
-.homePageBtn{position: absolute;width: 100%;top: 510px;}
-.homeBtn{display: block;float: left;border-radius: 30px;width: 168px;height: 60px;line-height: 60px;background-color: #21B351;font-size: 30px;color: #fff!important;text-align: center}
+#dbpage1 {
+  background: url('/images/educoder/competition/db/db1.jpg') no-repeat top center;
+  min-height: 820px;
+}
 
-.competitionsList-item{width: 50%;float: left;box-sizing: border-box;}
-.competitionsList-item:nth-of-type(odd){padding-right: 10px;}
-.competitionsList-item:nth-of-type(even){padding-left: 10px;}
-.competition-Img{width: 100%;height: 340px;}
-.status-tag {display: block;height: 30px;line-height: 30px;color: #fff;padding: 0px 20px;}
-.status-blue .status-tag{background-color: #4CACFF;}
-.status-orange .status-tag{background-color: #ff6800;}
-.status-grey .status-tag{background-color: #B3B3B3;}
+/*主页、列表页*/
+.competitionHome {
+  background: url('/images/educoder/competition/home/homepage.jpg') no-repeat top center;
+  min-width: 1200px;
+}
+
+.homePageBtn {
+  position: absolute;
+  width: 100%;
+  top: 510px;
+}
+
+.homeBtn {
+  display: block;
+  float: left;
+  border-radius: 30px;
+  width: 168px;
+  height: 60px;
+  line-height: 60px;
+  background-color: #21B351;
+  font-size: 30px;
+  color: #fff !important;
+  text-align: center
+}
+
+.competitionsList-item {
+  width: 50%;
+  float: left;
+  box-sizing: border-box;
+}
+
+.competitionsList-item:nth-of-type(odd) {
+  padding-right: 10px;
+}
+
+.competitionsList-item:nth-of-type(even) {
+  padding-left: 10px;
+}
+
+.competition-Img {
+  width: 100%;
+  height: 340px;
+}
+
+.status-tag {
+  display: block;
+  height: 30px;
+  line-height: 30px;
+  color: #fff;
+  padding: 0px 20px;
+}
+
+.status-blue .status-tag {
+  background-color: #4CACFF;
+}
+
+.status-orange .status-tag {
+  background-color: #ff6800;
+}
+
+.status-grey .status-tag {
+  background-color: #B3B3B3;
+}
 
 /*竞赛报名弹框*/
-.CompetitionEnrollBox{position: fixed;z-index:99998;width: 100%;height: 100%;background-color: rgba(5,26,26,0.4);left: 0px;top:0px;    text-align: center;justify-content: center;align-items: center;display: -webkit-flex;min-width: 1200px}
-.CompetitionEnrollBox .CloseBox{position: absolute;right: 6%;top:24%;}
-.CompetitionEnrollBox .ImmediatelyEnroll{position: absolute;bottom: 4%;border-radius: 33px;background:rgba(255,198,2,1);box-shadow:-1px 2px 64px 1px rgba(121,94,0,0.2);width: 22%;left: 50%;margin-left: -11%;height: 8%;color: #fefefe;
-    font-size: 28px;font-weight: bold;justify-content: center;align-items: center;display: -webkit-flex;}
+.CompetitionEnrollBox {
+  position: fixed;
+  z-index: 99998;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(5, 26, 26, 0.4);
+  left: 0px;
+  top: 0px;
+  text-align: center;
+  justify-content: center;
+  align-items: center;
+  display: -webkit-flex;
+  min-width: 1200px
+}
+
+.CompetitionEnrollBox .CloseBox {
+  position: absolute;
+  right: 6%;
+  top: 24%;
+}
+
+.CompetitionEnrollBox .ImmediatelyEnroll {
+  position: absolute;
+  bottom: 4%;
+  border-radius: 33px;
+  background: rgba(255, 198, 2, 1);
+  box-shadow: -1px 2px 64px 1px rgba(121, 94, 0, 0.2);
+  width: 22%;
+  left: 50%;
+  margin-left: -11%;
+  height: 8%;
+  color: #fefefe;
+  font-size: 28px;
+  font-weight: bold;
+  justify-content: center;
+  align-items: center;
+  display: -webkit-flex;
+}
+
 @media screen and (max-width: 1600px) {
-    .CompetitionEnrollBox .ImmediatelyEnroll{font-size: 24px;}
+  .CompetitionEnrollBox .ImmediatelyEnroll {
+    font-size: 24px;
+  }
 }
+
 @media screen and (max-width: 1500px) {
-    .CompetitionEnrollBox .ImmediatelyEnroll{font-size: 24px;}
+  .CompetitionEnrollBox .ImmediatelyEnroll {
+    font-size: 24px;
+  }
 }
+
 @media screen and (max-width: 1300px) {
-    .CompetitionEnrollBox .ImmediatelyEnroll{font-size: 20px;}
+  .CompetitionEnrollBox .ImmediatelyEnroll {
+    font-size: 20px;
+  }
 }
+
 @media screen and (max-width: 1200px) {
-    .CompetitionEnrollBox .ImmediatelyEnroll{font-size: 18px;}
+  .CompetitionEnrollBox .ImmediatelyEnroll {
+    font-size: 18px;
+  }
 }
 
 /*ccf*/
-.ccf-position-shixun{position: absolute;z-index: 2;top:300px;text-align: center;width: 100%}
-.ccf-position-shixun .shixun-btn{margin: 0px 38px;}
-.ccf-position-shixun-2{position: absolute;z-index: 2;bottom:300px;text-align: center;width: 100%}
-.headerImg{min-height: 820px;}
+.ccf-position-shixun {
+  position: absolute;
+  z-index: 2;
+  top: 300px;
+  text-align: center;
+  width: 100%
+}
+
+.ccf-position-shixun .shixun-btn {
+  margin: 0px 38px;
+}
+
+.ccf-position-shixun-2 {
+  position: absolute;
+  z-index: 2;
+  bottom: 300px;
+  text-align: center;
+  width: 100%
+}
+
+.headerImg {
+  min-height: 820px;
+}
 
 
 /*全国赛*/
-.qg-1{min-height: 822px;}
-.qg-2{min-height: 2758px;}
-.qg-3{min-height: 1755px;}
-.qg-4{min-height: 1531px;}
-.qg-5{min-height: 661px;}
+.qg-1 {
+  min-height: 822px;
+}
+
+.qg-2 {
+  min-height: 2758px;
+}
+
+.qg-3 {
+  min-height: 1755px;
+}
+
+.qg-4 {
+  min-height: 1531px;
+}
+
+.qg-5 {
+  min-height: 661px;
+}
 
 
 /*排行榜*/
-.competion-ranking{background-color: #fff;box-shadow:0px 4px 15px rgba(0,0,0,0.1);position: relative;width: 860px;margin:70px auto 80px;padding: 50px;}
-.ranking-nav{height: 48px;width: 480px;margin:0px auto;background-color: #fff;text-align: center;position: absolute;top:-48px;left: 50%;margin-left: -240px;}
-.ranking-nav li{cursor: pointer;float:left;font-size: 18px;margin:0px 15px;line-height: 48px;height: 48px;position: relative}
-.ranking-nav li.active{color: #29BD8B!important;}
-.ranking-nav li.active:after{content: '';position: absolute;height: 2px;width: 60px;left: 50%;margin-left: -30px;bottom: 0px;background-color: #29BD8B;}
-.person-ranking{background-color:#f6f6f6;border-radius: 20px;margin:0px auto; }
-.person-ranking li{cursor: default;float: left;margin:0px 25px;height: 40px;line-height: 40px;}
-.ranking-img{width: 25px;height: 30px;margin-top: 12px}
-.ranking-number{width: 25px;text-align: center;font-size: 16px;}
+.competion-ranking {
+  background-color: #fff;
+  box-shadow: 0px 4px 15px rgba(0, 0, 0, 0.1);
+  position: relative;
+  width: 860px;
+  margin: 70px auto 80px;
+  padding: 50px;
+}
 
-.team-ranking{background-color: #f6f6f6;border-radius: 20px;margin: 0px auto;padding: 0px 20px;height: 40px;line-height: 40px;}
-.team-ranking li{float: left;text-align: center;box-sizing: border-box;margin:0px 10px;cursor: default}
-.team-ranking li:nth-child(1){width: 100px;}
-.team-ranking li:nth-child(2){width: 120px;}
-.team-ranking li:nth-child(3){width: 90px;}
-.team-ranking li:nth-child(4){width: 100px;}
+.ranking-nav {
+  height: 48px;
+  width: 480px;
+  margin: 0px auto;
+  background-color: #fff;
+  text-align: center;
+  position: absolute;
+  top: -48px;
+  left: 50%;
+  margin-left: -240px;
+}
 
-.rankingList-line{padding: 15px 0px;border-top: 1px solid #eee;box-sizing: border-box;}
-.rankingList-line li{float: left;height: 50px;line-height: 50px;}
-.ranking-name{display: block;max-width: 80px;}
+.ranking-nav li {
+  cursor: pointer;
+  float: left;
+  font-size: 18px;
+  margin: 0px 15px;
+  line-height: 48px;
+  height: 48px;
+  position: relative
+}
 
-.no-com{padding: 70px 0px;}
+.ranking-nav li.active {
+  color: #29BD8B !important;
+}
+
+.ranking-nav li.active:after {
+  content: '';
+  position: absolute;
+  height: 2px;
+  width: 60px;
+  left: 50%;
+  margin-left: -30px;
+  bottom: 0px;
+  background-color: #29BD8B;
+}
+
+.person-ranking {
+  background-color: #f6f6f6;
+  border-radius: 20px;
+  margin: 0px auto;
+}
+
+.person-ranking li {
+  cursor: default;
+  float: left;
+  margin: 0px 25px;
+  height: 40px;
+  line-height: 40px;
+}
+
+.ranking-img {
+  width: 25px;
+  height: 30px;
+  margin-top: 12px
+}
+
+.ranking-number {
+  width: 25px;
+  text-align: center;
+  font-size: 16px;
+}
+
+.team-ranking {
+  background-color: #f6f6f6;
+  border-radius: 20px;
+  margin: 0px auto;
+  padding: 0px 20px;
+  height: 40px;
+  line-height: 40px;
+}
+
+.team-ranking li {
+  float: left;
+  text-align: center;
+  box-sizing: border-box;
+  margin: 0px 10px;
+  cursor: default
+}
+
+.team-ranking li:nth-child(1) {
+  width: 100px;
+}
+
+.team-ranking li:nth-child(2) {
+  width: 120px;
+}
+
+.team-ranking li:nth-child(3) {
+  width: 90px;
+}
+
+.team-ranking li:nth-child(4) {
+  width: 100px;
+}
+
+.rankingList-line {
+  padding: 15px 0px;
+  border-top: 1px solid #eee;
+  box-sizing: border-box;
+}
+
+.rankingList-line li {
+  float: left;
+  height: 50px;
+  line-height: 50px;
+}
+
+.ranking-name {
+  display: block;
+  max-width: 80px;
+}
+
+.no-com {
+  padding: 70px 0px;
+}
 
 #new_private_message_form .ke-toolbar-icon-url {
-    background-image: url('/images/educoder/upload-image.png');
-    background-position: 0px 0px;
-    background-size: 20px 20px;
-    width: 20px;
-    height: 20px;
+  background-image: url('/images/educoder/upload-image.png');
+  background-position: 0px 0px;
+  background-size: 20px 20px;
+  width: 20px;
+  height: 20px;
 }
 
 /*竞赛列表页*/
-.competition_list_pagebox{
-    width: 100%;
-    min-height: 1200px;
-    margin: 25px 0px 50px 0px;
+.competition_list_pagebox {
+  width: 100%;
+  min-height: 1200px;
+  margin: 25px 0px 50px 0px;
 }
 
 
 /*顶部按钮*/
-.both{
-    clear:both;
-}
-.left{
-    float:left;
+.both {
+  clear: both;
 }
 
-.right{
-    float:right;
-}
-.competition_list_pageboxchildtopbotton{
-    width:100%;
-    height:60px;
+.left {
+  float: left;
 }
 
-.com_list_pagespan{
-    display: inline-block;
-    margin: 15px 10px 0px 0px;
-    float: right;
+.right {
+  float: right;
 }
 
-.com_list_pagespan a{
-    border-radius: 8px;
+.competition_list_pageboxchildtopbotton {
+  width: 100%;
+  height: 60px;
 }
 
-.competition_Content_checkbox{
-    width: 65px;
+.com_list_pagespan {
+  display: inline-block;
+  margin: 15px 10px 0px 0px;
+  float: right;
 }
+
+.com_list_pagespan a {
+  border-radius: 8px;
+}
+
+.competition_Content_checkbox {
+  width: 65px;
+}
+
 /*顶部top容器*/
-.competition_list_pageboxchildtop{
-    min-height: 400px;
-    width: 95%;
-    padding: 29px;
-    border: 1px solid #e7e7e7;
-    margin-bottom: 20px;;
+.competition_list_pageboxchildtop {
+  min-height: 400px;
+  width: 95%;
+  padding: 29px;
+  border: 1px solid #e7e7e7;
+  margin-bottom: 20px;
+  ;
 }
 
-.competition_list_images{
-    min-height: 200px;
-    width: 95%;
-    padding: 29px;
-    border: 1px solid #e7e7e7;
-    margin-bottom: 20px;;
+.competition_list_images {
+  min-height: 200px;
+  width: 95%;
+  padding: 29px;
+  border: 1px solid #e7e7e7;
+  margin-bottom: 20px;
+  ;
 }
 
-.competition_list_title{
-    height:50px;
+.competition_list_title {
+  height: 50px;
 }
 
-.competition_list_center{
+.competition_list_center {}
 
+.competitionUpload {
+  margin-left: 1%;
+  width: 93%;
+  max-height: 225px;
+  overflow-y: auto;
 }
 
-.competitionUpload{
-    margin-left:1%;
-    width: 93%;
-    max-height: 225px;
-    overflow-y: auto;
+.Upload-picture-prompt {
+  width: 28% !important;
+  line-height: 90px;
+  color: #3BA0FE;
 }
 
-.Upload-picture-prompt{
-    width: 28% !important;
-    line-height: 90px;
-    color: #3BA0FE;
+.competition_list_bottom {
+  margin-top: 70px;
+  max-height: 150px;
 }
 
-.competition_list_bottom{
-    margin-top:70px;
-    max-height: 150px;
+.Other_boxinput {
+  height: 30px;
+  padding-left: 5px;
+  width: 80px;
 }
 
-.Other_boxinput{
-    height: 30px;
-    padding-left: 5px;
-    width: 80px;
-}
-.Other_boxdiv{
-    width:87px;
-    margin-right: 10px;
-    overflow:hidden;
-    text-overflow:ellipsis;
-    white-space:nowrap;
-}
-.marbot{
-    margin-bottom: 15px;
-}
-.competition_Nav{
-    width: 45px;
-    padding-left: 3px;
+.Other_boxdiv {
+  width: 87px;
+  margin-right: 10px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
-.competition_Content li{
-    margin-bottom: 20px;
+.marbot {
+  margin-bottom: 15px;
 }
 
-.ompetitionCheckbox{
-    height: 30px;
-    padding-left: 5px;
-    width: 400px;
+.competition_Nav {
+  width: 45px;
+  padding-left: 3px;
 }
 
-.addContentFillinthebox{
-    font-size: 18px !important;
-    color: #4CACFF!important;
-    margin-left: 8px;
-    line-height: 31px;
-}
-.newaddFillintheboxinput{
-    height: 30px;
-    margin-right: 10px;
-    padding-left: 5px;
-    width: 80px;
-}
-.competition_Content_notice{
-    width: 100px;
+.competition_Content li {
+  margin-bottom: 20px;
 }
 
-.competition_Content_ranking{
-    width: 100px;
+.ompetitionCheckbox {
+  height: 30px;
+  padding-left: 5px;
+  width: 400px;
 }
 
-.competition_Content_data_download{
-    width: 100px;
-}
-.ContentFillintheboxdata_download{
-    margin-left: -3px;
-    width: 50%;
-    height: 50px;
+.addContentFillinthebox {
+  font-size: 18px !important;
+  color: #4CACFF !important;
+  margin-left: 8px;
+  line-height: 31px;
 }
 
-#competition_homepage_input{
-    color: #B4B4B4;
-}
-#competition_homepage_input::-webkit-input-placeholder{
-    color: #B4B4B4;
-    padding-left: 20px;
-}
-#competition_homepage_input:-moz-placeholder{
-    color: #B4B4B4;
-    padding-left: 20px;
-}
-#competition_homepage_input:-ms-input-placeholder{
-    color: #B4B4B4;
-    padding-left: 20px;
+.newaddFillintheboxinput {
+  height: 30px;
+  margin-right: 10px;
+  padding-left: 5px;
+  width: 80px;
 }
 
-#competition_data_download{
-    color: #3BA0FE;
-    padding-left: 20px;
+.competition_Content_notice {
+  width: 100px;
+}
+
+.competition_Content_ranking {
+  width: 100px;
+}
+
+.competition_Content_data_download {
+  width: 100px;
+}
+
+.ContentFillintheboxdata_download {
+  margin-left: -3px;
+  width: 50%;
+  height: 50px;
+}
+
+#competition_homepage_input {
+  color: #B4B4B4;
+}
+
+#competition_homepage_input::-webkit-input-placeholder {
+  color: #B4B4B4;
+  padding-left: 20px;
+}
+
+#competition_homepage_input:-moz-placeholder {
+  color: #B4B4B4;
+  padding-left: 20px;
+}
+
+#competition_homepage_input:-ms-input-placeholder {
+  color: #B4B4B4;
+  padding-left: 20px;
+}
+
+#competition_data_download {
+  color: #3BA0FE;
+  padding-left: 20px;
 }
 
 
-.competition_input_style{
-    color: #3BA0FE;
-    padding-left: 20px;
-    width: 79%;
+.competition_input_style {
+  color: #3BA0FE;
+  padding-left: 20px;
+  width: 79%;
 }
 
 
 
-#competition_data_download::-webkit-input-placeholder{
-    color: #3BA0FE;
-    padding-left: 20px;
+#competition_data_download::-webkit-input-placeholder {
+  color: #3BA0FE;
+  padding-left: 20px;
 }
-#competition_data_download:-moz-placeholder{
-    color: #3BA0FE;
-    padding-left: 20px;
+
+#competition_data_download:-moz-placeholder {
+  color: #3BA0FE;
+  padding-left: 20px;
 }
-#competition_data_download:-ms-input-placeholder{
-    color: #3BA0FE;
-    padding-left: 20px;
+
+#competition_data_download:-ms-input-placeholder {
+  color: #3BA0FE;
+  padding-left: 20px;
 }
 
 /*顶部center容器*/
-.competition_list_pageboxchildcenter{
-    flex:1;
-    min-height: 150px;
-    border: 1px solid #e7e7e7;
-    width: 99.9%;
-    margin-bottom: 20px;
-}
-.childcenter_title{
-    width:99%;
-    border-bottom: 1px solid #e7e7e7;
-    padding: 6px;
+.competition_list_pageboxchildcenter {
+  flex: 1;
+  min-height: 150px;
+  border: 1px solid #e7e7e7;
+  width: 99.9%;
+  margin-bottom: 20px;
 }
 
-.childcenter_content{
-    width: 26%;
-    float: right;
-    margin-right: 10px;
+.childcenter_title {
+  width: 99%;
+  border-bottom: 1px solid #e7e7e7;
+  padding: 6px;
 }
 
-.childcenter_title_input{
-    padding-left: 20px;
-    font-weight: bold;
-    width:50%;
-    float:left;
-    border:1px solid transparent;
-    background: #fafafa;
+.childcenter_content {
+  width: 26%;
+  float: right;
+  margin-right: 10px;
+}
+
+.childcenter_title_input {
+  padding-left: 20px;
+  font-weight: bold;
+  width: 50%;
+  float: left;
+  border: 1px solid transparent;
+  background: #fafafa;
 }
 
 
-.childcenter_title_botton{
-    display: inline-block;
-    float: right;
-}
-.childcenter_title_botton a{
-    border-radius: 8px;
-}
-.childcenter_but{
-    background: #fafafa ;
-    float: right;
-    margin-right: 10px;
+.childcenter_title_botton {
+  display: inline-block;
+  float: right;
 }
 
-.childcenter_center_content{
-    padding: 10px;
-    height: 50px;
-    margin-left: 25px;
-    border-bottom: 1px solid #e7e7e7;
-}
-.childcenter_center_contentlast{
-    padding: 10px;
-    height: 50px;
-    margin-left: 25px;
-    border-bottom: 1px solid transparent;
-}
-.childcenter_center_content_two{
-    padding: 10px;
-    height: 50px;
-    margin-left: 25px;
+.childcenter_title_botton a {
+  border-radius: 8px;
 }
 
-.editTitlevalue{
-    width: 70%;
-    margin-left: 10px;
-}
-.child_center_overtime{
-    margin-left:20px;
-}
-.child_center_entry_button{
-    margin-left:20px;
+.childcenter_but {
+  background: #fafafa;
+  float: right;
+  margin-right: 10px;
 }
 
-.child_nth_child1span{
-    margin-top: 10px;
-    margin-right: 10px;
-    display: inline-block;
-}
-.childcenterWinput{
-    width: 150px;
-    height: 35px;
-    padding: 5px;
-    box-sizing: border-box;
+.childcenter_center_content {
+  padding: 10px;
+  height: 50px;
+  margin-left: 25px;
+  border-bottom: 1px solid #e7e7e7;
 }
 
-.child_entry_button_input{
-    width:1.5rem;
-}
-.child_nth_child1spinner span{
-    margin-bottom: 7px;
+.childcenter_center_contentlast {
+  padding: 10px;
+  height: 50px;
+  margin-left: 25px;
+  border-bottom: 1px solid transparent;
 }
 
-.child_center_entry_buttondel{
-    margin-top: 10px;
+.childcenter_center_content_two {
+  padding: 10px;
+  height: 50px;
+  margin-left: 25px;
 }
 
-#goodsUpload{
-    position: relative;
+.editTitlevalue {
+  width: 70%;
+  margin-left: 10px;
 }
-#uploadImg{
-    position: absolute;
-    bottom: 0px;
-    left: 30px;
+
+.child_center_overtime {
+  margin-left: 20px;
 }
-.Event_prompts{
-    color:red;
-    margin-right:10px;
-    display:none;
+
+.child_center_entry_button {
+  margin-left: 20px;
+}
+
+.child_nth_child1span {
+  margin-top: 10px;
+  margin-right: 10px;
+  display: inline-block;
+}
+
+.childcenterWinput {
+  width: 150px;
+  height: 35px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.child_entry_button_input {
+  width: 1.5rem;
+}
+
+.child_nth_child1spinner span {
+  margin-bottom: 7px;
+}
+
+.child_center_entry_buttondel {
+  margin-top: 10px;
+}
+
+#goodsUpload {
+  position: relative;
+}
+
+#uploadImg {
+  position: absolute;
+  bottom: 0px;
+  left: 30px;
+}
+
+.Event_prompts {
+  color: red;
+  margin-right: 10px;
+  display: none;
 }
 
 
@@ -1134,103 +4431,579 @@ a.enterLink{cursor: pointer;color: #418CCD!important;background: none!important;
 
 
 /*面向学院管理员的综合统计页面*/
-.statistics_top{height: 240px;width: 100%;position: relative;background-image: url('/images/educoder/statistics.jpg');background-size: 100% 100%;}
-.statistics_position{position: absolute;bottom: 22px;left: 0px;width: 100%;left: 0px;}
-ul.count_ul li{width: 300px;position: relative;float: left}
-ul.count_ul li span:first-child{display: block;width: 100%;color: #989898;margin-bottom: 20px;}
-ul.count_ul li span:last-child{display: block;width: 100%;color: #fff;font-size: 24px;line-height: 20px;}
-ul.count_ul li:not(:last-child):after{position: absolute;content: '';width: 1px;height: 36px;background-color: #999999;right: 0px;top: 16px;}
-.static_shadow{box-shadow: 0px 0px 9px rgba(174, 175, 177, 0.2);}
-.base_status_name{display: flex;height: 48px;line-height: 48px;font-size:16px;background-color: #F5F5F5;border-top:1px solid #EBEBEB;border-bottom:1px solid #EBEBEB; }
-.base_status_name li,.base_status_value li{float: left;flex: 1;text-align: center;color: #686868;}
-.base_status_value{display: flex;height: 100px;line-height: 100px;text-align: center;}
-.base_status_value li{color:#05101A;cursor: default}
-.base_status_value li span{font-size: 24px;margin-right: 5px;}
-.count_student_test a{cursor: pointer;display: inline-block;width: 60px;height: 30px;line-height: 30px;text-align: center;border-radius:4px;color: #666 }
-.count_student_test a.active{background:#4CACFF;color: #fff; }
+.statistics_top {
+  height: 240px;
+  width: 100%;
+  position: relative;
+  background-image: url('/images/educoder/statistics.jpg');
+  background-size: 100% 100%;
+}
+
+.statistics_position {
+  position: absolute;
+  bottom: 22px;
+  left: 0px;
+  width: 100%;
+  left: 0px;
+}
+
+ul.count_ul li {
+  width: 300px;
+  position: relative;
+  float: left
+}
+
+ul.count_ul li span:first-child {
+  display: block;
+  width: 100%;
+  color: #989898;
+  margin-bottom: 20px;
+}
+
+ul.count_ul li span:last-child {
+  display: block;
+  width: 100%;
+  color: #fff;
+  font-size: 24px;
+  line-height: 20px;
+}
+
+ul.count_ul li:not(:last-child):after {
+  position: absolute;
+  content: '';
+  width: 1px;
+  height: 36px;
+  background-color: #999999;
+  right: 0px;
+  top: 16px;
+}
+
+.static_shadow {
+  box-shadow: 0px 0px 9px rgba(174, 175, 177, 0.2);
+}
+
+.base_status_name {
+  display: flex;
+  height: 48px;
+  line-height: 48px;
+  font-size: 16px;
+  background-color: #F5F5F5;
+  border-top: 1px solid #EBEBEB;
+  border-bottom: 1px solid #EBEBEB;
+}
+
+.base_status_name li,
+.base_status_value li {
+  float: left;
+  flex: 1;
+  text-align: center;
+  color: #686868;
+}
+
+.base_status_value {
+  display: flex;
+  height: 100px;
+  line-height: 100px;
+  text-align: center;
+}
+
+.base_status_value li {
+  color: #05101A;
+  cursor: default
+}
+
+.base_status_value li span {
+  font-size: 24px;
+  margin-right: 5px;
+}
+
+.count_student_test a {
+  cursor: pointer;
+  display: inline-block;
+  width: 60px;
+  height: 30px;
+  line-height: 30px;
+  text-align: center;
+  border-radius: 4px;
+  color: #666
+}
+
+.count_student_test a.active {
+  background: #4CACFF;
+  color: #fff;
+}
+
 /*路径的合作团队增加使用情况统计页面*/
-.subject_statistics_top{height: 240px;width: 100%;position: relative;background-image: url('/images/educoder/subject_statistics.jpg');background-size: 100% 100%;}
+.subject_statistics_top {
+  height: 240px;
+  width: 100%;
+  position: relative;
+  background-image: url('/images/educoder/subject_statistics.jpg');
+  background-size: 100% 100%;
+}
 
 
 /*------------------------------职业路径begin-----------------------------*/
 /*新建页*/
-.subjectPathArray{width: 100%;background-color: #FAFAFA;padding: 20px;box-sizing: border-box;box-shadow: 0px 0px 6px rgba(154,154,154,0.3);font-size: 16px;margin-bottom: 22px;cursor: move;}
-.subjectPathArray p{cursor: default;}
+.subjectPathArray {
+  width: 100%;
+  background-color: #FAFAFA;
+  padding: 20px;
+  box-sizing: border-box;
+  box-shadow: 0px 0px 6px rgba(154, 154, 154, 0.3);
+  font-size: 16px;
+  margin-bottom: 22px;
+  cursor: move;
+}
+
+.subjectPathArray p {
+  cursor: default;
+}
+
 /*详情页*/
-.busy_detail_top{width: 100%;height: 230px;background: url('/images/educoder/business/detailTop.jpg') no-repeat top center;position: relative }
-.busy_detail_nav{position: absolute;bottom: 0px;text-align: center;width: 100%}
-.busy_detail_nav ul{vertical-align: bottom}
-.busy_detail_nav ul li{padding:0px 49px 34px 49px;float: left;position: relative}
-.busy_detail_nav ul li a{display: block;width: 100%;height: 100%;font-size: 24px;color: #fff;line-height: 28px;font-weight: bold}
-.busy_detail_nav ul li.active a{background: linear-gradient(to bottom right, #fcd16a, #f9b76a);-webkit-background-clip: text;color: transparent;}
-.busy_detail_nav ul li.active:after{content: '';width: 64px;position: absolute;left: 50%;margin-left: -32px;bottom: 0px;height: 4px;background: #f9b76a}
+.busy_detail_top {
+  width: 100%;
+  height: 230px;
+  background: url('/images/educoder/business/detailTop.jpg') no-repeat top center;
+  position: relative
+}
+
+.busy_detail_nav {
+  position: absolute;
+  bottom: 0px;
+  text-align: center;
+  width: 100%
+}
+
+.busy_detail_nav ul {
+  vertical-align: bottom
+}
+
+.busy_detail_nav ul li {
+  padding: 0px 49px 34px 49px;
+  float: left;
+  position: relative
+}
+
+.busy_detail_nav ul li a {
+  display: block;
+  width: 100%;
+  height: 100%;
+  font-size: 24px;
+  color: #fff;
+  line-height: 28px;
+  font-weight: bold
+}
+
+.busy_detail_nav ul li.active a {
+  background: linear-gradient(to bottom right, #fcd16a, #f9b76a);
+  -webkit-background-clip: text;
+  color: transparent;
+}
+
+.busy_detail_nav ul li.active:after {
+  content: '';
+  width: 64px;
+  position: absolute;
+  left: 50%;
+  margin-left: -32px;
+  bottom: 0px;
+  height: 4px;
+  background: #f9b76a
+}
+
 /*--课程介绍--*/
-.busy_detail_vedio{width: 1238px;margin: 78px auto;position: relative;border-radius: 10px;height: 480px;}
-.vedioInfo{position: absolute;z-index: 2;width: 100%;height: 100%;background-color:rgba(5,16,26,0.8);color: #fff;border-radius: 10px;top: 0px;left: 0px;justify-content: center;align-items: center;display: -webkit-flex;}
-.playVedio{font-size: 86px!important;line-height: 86px;}
-.vedioInfoWords{width: 630px;text-align: left}
-.vedioTitle{background: linear-gradient(to right, #f5f5f5, #c9c9c9);-webkit-background-clip: text;color: transparent;}
+.busy_detail_vedio {
+  width: 1238px;
+  margin: 78px auto;
+  position: relative;
+  border-radius: 10px;
+  height: 480px;
+}
 
-.busy_detail_introduce{width: 100%;background: url('/images/educoder/business/introduceback.jpg') no-repeat top center;cursor: default;min-height: 800px;padding-top: 92px;box-sizing: border-box;position: relative; }
-.introduce_content{position: absolute;bottom: 0px;width: 100%;text-align: center;}
-.introduce_content img{vertical-align: bottom;}
-.introduce_content_font{padding-left: 116px;padding-top:66px;text-align: left;color: #fff;max-width: 521px;}
+.vedioInfo {
+  position: absolute;
+  z-index: 2;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(5, 16, 26, 0.8);
+  color: #fff;
+  border-radius: 10px;
+  top: 0px;
+  left: 0px;
+  justify-content: center;
+  align-items: center;
+  display: -webkit-flex;
+}
 
-.busy_detail_lessons{background: #f9f9f9;padding-top: 84px;text-align: center;position: relative;padding-bottom: 106px;}
-.busyLessons{width: 1152px;margin: 0px auto;}
-.l-course-cart{width: 288px;float: left;margin-bottom: 48px;padding: 0px 24px;position: relative;box-sizing: border-box;}
-.l-course-cart-axis{position: absolute;width: 288px;height: 16px;top: 25px;left: 0;z-index: 0;}
-.l-course-cart-axis .axisx{position: absolute;width: 100%;height: 4px;top: 6px;left: 0;right: 0;background-color: #C6CCD2;z-index: 0;}
-.l-course-cart-axis .axisy{position: absolute;left: 8px;top: 0;border-radius: 50%;width: 16px;height: 16px;box-sizing: border-box;border: 4px solid #C6CCD2;background-color: #fff;z-index: 1;}
-.l-course-cart:nth-child(4n+0) .axisx{border-radius: 0px 3px 3px 0px;}
-.l-course-cart:nth-child(4n+1) .axisx{border-radius: 3px 0px 0px 3px;}
-.l-course-cart-wrap{position: relative;width: 100%;height: 250px;background-color: #fff;border-radius: 12px;box-shadow: 0 4px 8px rgba(7,17,27,.1);z-index: 1;overflow: hidden}
-.l-course-cart-t{height: 58px;line-height: 60px;border-radius: 12px 12px 0px 0px;background: #788795;padding: 0px 20px;box-sizing: border-box;font-size: 18px;color: #fff;text-align: left}
-.l-course-more{position: absolute;bottom: 0px;height: 244px;width: 100%;z-index: 1;text-align: center;padding-top: 90px;box-sizing: border-box;
-    background-image: linear-gradient(to bottom,rgba(243,243,243,0) 0%,rgba(243,243,243,0.3) 5%,rgba(243,243,243, 0.4) 10%,rgba(243,243,243,0.6) 20%,rgba(243,243,243,0.9) 30%,rgb(243, 243, 243) 100%);}
-.l-course-more-btn{display: block;width: 207px;height: 64px;line-height: 64px;border-radius: 32px;font-size: 18px;text-align: center;color: #fff!important;background: #4CACFF;margin: 0px auto;}
+.playVedio {
+  font-size: 86px !important;
+  line-height: 86px;
+}
 
-.busy_detail_question{padding: 100px 0px;width: 1165px;margin: 0px auto}
-.q-course-cart{width: 540px;margin-bottom: 40px;display: inline-grid;}
-.q-course-cart:nth-child(odd){margin-right: 40px;}
-.q-course-cart:nth-child(even){margin-left: 40px;}
-.q-course-cart-right{max-width: 503px;text-align: justify;line-height: 22px;}
+.vedioInfoWords {
+  width: 630px;
+  text-align: left
+}
+
+.vedioTitle {
+  background: linear-gradient(to right, #f5f5f5, #c9c9c9);
+  -webkit-background-clip: text;
+  color: transparent;
+}
+
+.busy_detail_introduce {
+  width: 100%;
+  background: url('/images/educoder/business/introduceback.jpg') no-repeat top center;
+  cursor: default;
+  min-height: 800px;
+  padding-top: 92px;
+  box-sizing: border-box;
+  position: relative;
+}
+
+.introduce_content {
+  position: absolute;
+  bottom: 0px;
+  width: 100%;
+  text-align: center;
+}
+
+.introduce_content img {
+  vertical-align: bottom;
+}
+
+.introduce_content_font {
+  padding-left: 116px;
+  padding-top: 66px;
+  text-align: left;
+  color: #fff;
+  max-width: 521px;
+}
+
+.busy_detail_lessons {
+  background: #f9f9f9;
+  padding-top: 84px;
+  text-align: center;
+  position: relative;
+  padding-bottom: 106px;
+}
+
+.busyLessons {
+  width: 1152px;
+  margin: 0px auto;
+}
+
+.l-course-cart {
+  width: 288px;
+  float: left;
+  margin-bottom: 48px;
+  padding: 0px 24px;
+  position: relative;
+  box-sizing: border-box;
+}
+
+.l-course-cart-axis {
+  position: absolute;
+  width: 288px;
+  height: 16px;
+  top: 25px;
+  left: 0;
+  z-index: 0;
+}
+
+.l-course-cart-axis .axisx {
+  position: absolute;
+  width: 100%;
+  height: 4px;
+  top: 6px;
+  left: 0;
+  right: 0;
+  background-color: #C6CCD2;
+  z-index: 0;
+}
+
+.l-course-cart-axis .axisy {
+  position: absolute;
+  left: 8px;
+  top: 0;
+  border-radius: 50%;
+  width: 16px;
+  height: 16px;
+  box-sizing: border-box;
+  border: 4px solid #C6CCD2;
+  background-color: #fff;
+  z-index: 1;
+}
+
+.l-course-cart:nth-child(4n+0) .axisx {
+  border-radius: 0px 3px 3px 0px;
+}
+
+.l-course-cart:nth-child(4n+1) .axisx {
+  border-radius: 3px 0px 0px 3px;
+}
+
+.l-course-cart-wrap {
+  position: relative;
+  width: 100%;
+  height: 250px;
+  background-color: #fff;
+  border-radius: 12px;
+  box-shadow: 0 4px 8px rgba(7, 17, 27, .1);
+  z-index: 1;
+  overflow: hidden
+}
+
+.l-course-cart-t {
+  height: 58px;
+  line-height: 60px;
+  border-radius: 12px 12px 0px 0px;
+  background: #788795;
+  padding: 0px 20px;
+  box-sizing: border-box;
+  font-size: 18px;
+  color: #fff;
+  text-align: left
+}
+
+.l-course-more {
+  position: absolute;
+  bottom: 0px;
+  height: 244px;
+  width: 100%;
+  z-index: 1;
+  text-align: center;
+  padding-top: 90px;
+  box-sizing: border-box;
+  background-image: linear-gradient(to bottom, rgba(243, 243, 243, 0) 0%, rgba(243, 243, 243, 0.3) 5%, rgba(243, 243, 243, 0.4) 10%, rgba(243, 243, 243, 0.6) 20%, rgba(243, 243, 243, 0.9) 30%, rgb(243, 243, 243) 100%);
+}
+
+.l-course-more-btn {
+  display: block;
+  width: 207px;
+  height: 64px;
+  line-height: 64px;
+  border-radius: 32px;
+  font-size: 18px;
+  text-align: center;
+  color: #fff !important;
+  background: #4CACFF;
+  margin: 0px auto;
+}
+
+.busy_detail_question {
+  padding: 100px 0px;
+  width: 1165px;
+  margin: 0px auto
+}
+
+.q-course-cart {
+  width: 540px;
+  margin-bottom: 40px;
+  display: inline-grid;
+}
+
+.q-course-cart:nth-child(odd) {
+  margin-right: 40px;
+}
+
+.q-course-cart:nth-child(even) {
+  margin-left: 40px;
+}
+
+.q-course-cart-right {
+  max-width: 503px;
+  text-align: justify;
+  line-height: 22px;
+}
+
+.grey-to-white {
+  background: linear-gradient(to bottom, #f5f5f5, #C9C9C9);
+  -webkit-background-clip: text;
+  color: transparent;
+}
+
+.yellow-to-orange {
+  background: linear-gradient(to bottom, #FCD16A, #F9B76A);
+  -webkit-background-clip: text;
+  color: transparent;
+}
+
+.mainfont {
+  color: #C59F59;
+}
+
+.yellowfont {
+  color: #C18C14
+}
 
-.grey-to-white{background: linear-gradient(to bottom, #f5f5f5, #C9C9C9);-webkit-background-clip: text;color: transparent;}
-.yellow-to-orange{background: linear-gradient(to bottom, #FCD16A, #F9B76A);-webkit-background-clip: text;color: transparent;}
-.mainfont{color: #C59F59;}
-.yellowfont{color: #C18C14}
 /*--内容安排--*/
-.busy_detail_content{background: #101019;padding: 60px 0px 30px 0px;}
-.lesson-all-link{height: 384px;background:linear-gradient(-41deg,rgba(103,51,79,0.96),rgba(88,89,144,0.96),rgba(49,65,127,0.96));padding: 4px;box-sizing: border-box}
-.lesson-all-link > div{background: #202031;width: 100%;height: 100%;box-sizing: border-box;padding: 20px 15px;}
-.lesson-all-link > div li{float: left;min-height: 60px;min-width: 144px;padding: 4px;box-sizing: border-box;margin: 0px 5px 9px 5px;}
-.lesson-all-link > div li a{display: block;width: 100%;color: #fff!important;font-size: 20px;text-align: center;height: 54px;line-height: 54px;cursor: pointer;}
-.lesson-all-link > div li.link-on{background:linear-gradient(-41deg,rgba(124,97,66,0.96),rgba(188,151,102,0.96),rgba(124,97,66,0.96));}
-.lesson-all-link > div li.link-on a{background:linear-gradient(to right,#181b33,#281725);}
+.busy_detail_content {
+  background: #101019;
+  padding: 60px 0px 30px 0px;
+}
 
-.lesson-all-link > div li.link-off{background:linear-gradient(-41deg,rgba(73,68,69,0.96),rgba(146,145,148,0.96),rgba(89,87,91,0.96));}
-.lesson-all-link > div li.link-off a{background:#202031;}
+.lesson-all-link {
+  height: 384px;
+  background: linear-gradient(-41deg, rgba(103, 51, 79, 0.96), rgba(88, 89, 144, 0.96), rgba(49, 65, 127, 0.96));
+  padding: 4px;
+  box-sizing: border-box
+}
 
-.mer-width{width: 182px;}
-.m-width{width: 186px;}
-.u-width{width: 286px;}
-.l-width{width: 464px;}
-.l-height{height: 204px;}
-li.l-height a{height: 196px!important;line-height: 196px!important;}
-.m-height{height: 98px;}
-li.m-height a{height: 90px!important;line-height: 90px!important;}
+.lesson-all-link>div {
+  background: #202031;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  padding: 20px 15px;
+}
 
-.lesson-l-cart{border:1px solid #6C5539;padding: 44px 32px 20px 32px;box-sizing: border-box;background: #010101;border-radius: 2px;}
-.l-cart-number{display: block;height: 62px;line-height: 62px;border-radius: 0px 10px 0px 10px;background:linear-gradient(0deg,rgba(30,29,58,1),rgba(46,26,40,1));font-size: 36px;color: #fff;width: 74px;text-align: center;border: 1px solid #3a3a3a;}
-.l-cart-name{display: block;max-width: 700px}
+.lesson-all-link>div li {
+  float: left;
+  min-height: 60px;
+  min-width: 144px;
+  padding: 4px;
+  box-sizing: border-box;
+  margin: 0px 5px 9px 5px;
+}
 
-.l-cart-h-title{width: 100%;height: 78px;background-color: #1F1F30;color: #A6A6A6;line-height: 78px;}
-.c-number{display: block;float: left;background-image: url("/images/educoder/c-number.png");background-size:100% 100%;width: 95px;height: 78px;line-height: 78px;text-align: center;padding-right: 17px;}
-.c-number > span{font-size: 40px;background: linear-gradient(to bottom, #FCD16A, #F9B76A);-webkit-background-clip: text;color: transparent;}
-.l-cart-h-content{background-color: #1B1B2A;}
-.spinner {font-size: 20px;width: 1em;height: 1em;border-radius: 50%;box-shadow: inset 0 0 0 .1em rgba(58, 168, 237, .2);}
-.spinner span {position: absolute;clip: rect(0, 1em, 1em, .5em);width: 1em;height: 1em;content: '';animation: spinner-circle 1s ease-in-out infinite;border-radius: 50%;box-shadow: inset 0 0 0 .1em #3aa8ed;}
+.lesson-all-link>div li a {
+  display: block;
+  width: 100%;
+  color: #fff !important;
+  font-size: 20px;
+  text-align: center;
+  height: 54px;
+  line-height: 54px;
+  cursor: pointer;
+}
+
+.lesson-all-link>div li.link-on {
+  background: linear-gradient(-41deg, rgba(124, 97, 66, 0.96), rgba(188, 151, 102, 0.96), rgba(124, 97, 66, 0.96));
+}
+
+.lesson-all-link>div li.link-on a {
+  background: linear-gradient(to right, #181b33, #281725);
+}
+
+.lesson-all-link>div li.link-off {
+  background: linear-gradient(-41deg, rgba(73, 68, 69, 0.96), rgba(146, 145, 148, 0.96), rgba(89, 87, 91, 0.96));
+}
+
+.lesson-all-link>div li.link-off a {
+  background: #202031;
+}
+
+.mer-width {
+  width: 182px;
+}
+
+.m-width {
+  width: 186px;
+}
+
+.u-width {
+  width: 286px;
+}
+
+.l-width {
+  width: 464px;
+}
+
+.l-height {
+  height: 204px;
+}
+
+li.l-height a {
+  height: 196px !important;
+  line-height: 196px !important;
+}
+
+.m-height {
+  height: 98px;
+}
+
+li.m-height a {
+  height: 90px !important;
+  line-height: 90px !important;
+}
+
+.lesson-l-cart {
+  border: 1px solid #6C5539;
+  padding: 44px 32px 20px 32px;
+  box-sizing: border-box;
+  background: #010101;
+  border-radius: 2px;
+}
+
+.l-cart-number {
+  display: block;
+  height: 62px;
+  line-height: 62px;
+  border-radius: 0px 10px 0px 10px;
+  background: linear-gradient(0deg, rgba(30, 29, 58, 1), rgba(46, 26, 40, 1));
+  font-size: 36px;
+  color: #fff;
+  width: 74px;
+  text-align: center;
+  border: 1px solid #3a3a3a;
+}
+
+.l-cart-name {
+  display: block;
+  max-width: 700px
+}
+
+.l-cart-h-title {
+  width: 100%;
+  height: 78px;
+  background-color: #1F1F30;
+  color: #A6A6A6;
+  line-height: 78px;
+}
+
+.c-number {
+  display: block;
+  float: left;
+  background-image: url("/images/educoder/c-number.png");
+  background-size: 100% 100%;
+  width: 95px;
+  height: 78px;
+  line-height: 78px;
+  text-align: center;
+  padding-right: 17px;
+}
+
+.c-number>span {
+  font-size: 40px;
+  background: linear-gradient(to bottom, #FCD16A, #F9B76A);
+  -webkit-background-clip: text;
+  color: transparent;
+}
+
+.l-cart-h-content {
+  background-color: #1B1B2A;
+}
+
+.spinner {
+  font-size: 20px;
+  width: 1em;
+  height: 1em;
+  border-radius: 50%;
+  box-shadow: inset 0 0 0 .1em rgba(58, 168, 237, .2);
+}
+
+.spinner span {
+  position: absolute;
+  clip: rect(0, 1em, 1em, .5em);
+  width: 1em;
+  height: 1em;
+  content: '';
+  animation: spinner-circle 1s ease-in-out infinite;
+  border-radius: 50%;
+  box-shadow: inset 0 0 0 .1em #3aa8ed;
+}
 
 
 
@@ -1238,2268 +5011,2945 @@ li.m-height a{height: 90px!important;line-height: 90px!important;}
 
 
 /*智慧课堂-------------------------------资源详情列表页面改版*/
-.du-back-white-right{
-    width: 100%;
-    height: 35px;
-    margin-bottom: 8px;
-    text-align: right;
-    border: 1px solid transparent;
-    position: relative;
-}
-.du-back-Iconfont{
-    position: absolute;
-    top: 1px;
-    right: -16px;
-    font-size: 12px !important;
-    color: #989898;
-}
-.du-back-whiteP{
-    position: absolute;
-    top: 37px;
-    right: 24px;
-    font-size: 12px;
-    color: rgba(152,152,152,1);
-    line-height: 0px;
-    width: 100px;
-    height: 50px;
-
-}
-.du-back-whitePP{
-    position: absolute;
-    top: 14px;
-    right: 0px;
-    font-size:12px;
-    color:rgba(152,152,152,1);
-    line-height:0px;
-    width:100px;
-    height:50px;
-}
-.du-back-whiteTime{
-    position: absolute;
-    top: 8px;
-    right: 20px;
-}
-@font-face {
-    font-family: 'iconfont';
-    src: url('./iconfont/iconfont.eot');
-    src: url('./iconfont/iconfont.eot?#iefix') format('embedded-opentype'),
-    url('./iconfont/iconfont.woff') format('woff'),
-    url('./iconfont/font_148784_v4ggb6wrjmkotj4i.woff') format('woff'),
-    url('./iconfont/roboto-regular.woff2') format('woff2'),
-    url('./iconfont/iconfont.ttf') format('truetype'),
-    url('./iconfont/iconfont.svg#iconfont') format('svg');
-}
-.iconfont{
-    vertical-align:middle;
-    font-family:"iconfont" !important;
-    font-size:16px;font-style:normal;
-    -webkit-font-smoothing: antialiased;
-    -webkit-text-stroke-width: 0.2px;
-    -moz-osx-font-smoothing: grayscale;
-}
-._resource_detailwidth{
-    max-width:516px;
-    height:17px;
-    font-size:16px;
-    color: #05101A;
-    font-weight: bold;
-    line-height:17px;
-    overflow:hidden;
-    text-overflow:ellipsis;
-    white-space:nowrap
-}
-.newImport_resource_info_list{
-    width: 610px;
-    background: rgba(247,251,255,1);
-    overflow-y: hidden;
-    overflow-x: hidden;
-    padding-left: 10px;
+.du-back-white-right {
+  width: 100%;
+  height: 35px;
+  margin-bottom: 8px;
+  text-align: right;
+  border: 1px solid transparent;
+  position: relative;
 }
 
-.newhomework_info_list{
-    width: 529px !important;
-    background: rgba(247,251,255,1);
-    overflow-y: hidden;
-    overflow-x: hidden;
-    padding-left: 10px;
+.du-back-Iconfont {
+  position: absolute;
+  top: 1px;
+  right: -16px;
+  font-size: 12px !important;
+  color: #989898;
 }
 
-.newBorder_info_list{
-    display: inline-block;
-}
-.descriptionboxlist{
-    cursor: default;
-    width: 711px;
-}
-.deletPosition{
-    position: relative;
-}
-.deletVersions{
-    position: absolute;
-    top: 12px;
-    right: -85px;
-}
-.deletVersionsFont{
-    margin-left: 62px;
-    max-width: 229px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-.deletPositionLabel{
-    position: absolute;
-    top: 1px;
-    left: 33px;
-}
-.newedu-find-input{
-    border: 1px solid #EAEAEA;
-    width: 100%;
-}
-.newpanelstylel{
-    width:248px;
-    height: 30px;
-}
-.newedu-open{
-    top:-1px;right: -21px;
-}
-.NewsOrange-btn{
-    height:15px;
-    font-size:16px;
-    color:rgba(5,16,26,1);
-    line-height:0px;
-    margin-top: 13px;
-}
-.NEWorange-btn{
-    border: 1px solid transparent !important;
-    color: #4CACFF !important;
-}
-.newedu-back-white{
-    height: 50px;
-    margin-bottom: 40px;
-    border: 1px solid transparent !important;
-}
-#course_list{
-    overflow-y: auto;
-    background: #FFF;
-}
-.file_fontGrey{
-    margin-top: -1px !important;
-}
-a.newcolor-grey3:hover{
-    color:  #459be5 !important;
-}
-.edu-menu-listlia{
-    color: #05101a !important;
-}
-.syllabusbox_tishi p{
-    text-align: center;
-}
-#tip_attachment_count{
-    color:#4CACFF;
-    margin-top:4px !important;
-}
-.newsedu-open{
-    top: -1px !important;
-    right: 7px !important;
-}
-#course_filter_order{
-    top: 24px;
-    width: 110px;
-    text-align: left;
-    right: -28px !important;
-}
-.du-back-white-right :hover .du-back-whiteTime{
-    color:#459be5 !important;
+.du-back-whiteP {
+  position: absolute;
+  top: 37px;
+  right: 24px;
+  font-size: 12px;
+  color: rgba(152, 152, 152, 1);
+  line-height: 0px;
+  width: 100px;
+  height: 50px;
+
 }
 
-.du-back-white-right :hover .du-back-Iconfont{
-    color:#459be5 !important;
+.du-back-whitePP {
+  position: absolute;
+  top: 14px;
+  right: 0px;
+  font-size: 12px;
+  color: rgba(152, 152, 152, 1);
+  line-height: 0px;
+  width: 100px;
+  height: 50px;
 }
-.popup_tip_box{
-    right:-160px;
-    top:55px;
+
+.du-back-whiteTime {
+  position: absolute;
+  top: 8px;
+  right: 20px;
 }
-.privately-owned{
-    position: absolute;
-    top: 15px;
-    color:#747A7F !important;
+
+._resource_detailwidth {
+  max-width: 516px;
+  height: 17px;
+  font-size: 16px;
+  color: #05101A;
+  font-weight: bold;
+  line-height: 17px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap
 }
-.homepagePostSetting{
-    display:none;
+
+.newImport_resource_info_list {
+  width: 610px;
+  background: rgba(247, 251, 255, 1);
+  overflow-y: hidden;
+  overflow-x: hidden;
+  padding-left: 10px;
 }
-#describe{
-    width: 100%;
-    line-height: 25px;
+
+.newhomework_info_list {
+  width: 529px !important;
+  background: rgba(247, 251, 255, 1);
+  overflow-y: hidden;
+  overflow-x: hidden;
+  padding-left: 10px;
 }
+
+.newBorder_info_list {
+  display: inline-block;
+}
+
+.descriptionboxlist {
+  cursor: default;
+  width: 711px;
+}
+
+.deletPosition {
+  position: relative;
+}
+
+.deletVersions {
+  position: absolute;
+  top: 12px;
+  right: -85px;
+}
+
+.deletVersionsFont {
+  margin-left: 62px;
+  max-width: 229px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.deletPositionLabel {
+  position: absolute;
+  top: 1px;
+  left: 33px;
+}
+
+.newedu-find-input {
+  border: 1px solid #EAEAEA;
+  width: 100%;
+}
+
+.newpanelstylel {
+  width: 248px;
+  height: 30px;
+}
+
+.newedu-open {
+  top: -1px;
+  right: -21px;
+}
+
+.NewsOrange-btn {
+  height: 15px;
+  font-size: 16px;
+  color: rgba(5, 16, 26, 1);
+  line-height: 0px;
+  margin-top: 13px;
+}
+
+.NEWorange-btn {
+  border: 1px solid transparent !important;
+  color: #4CACFF !important;
+}
+
+.newedu-back-white {
+  height: 50px;
+  margin-bottom: 40px;
+  border: 1px solid transparent !important;
+}
+
+#course_list {
+  overflow-y: auto;
+  background: #FFF;
+}
+
+.file_fontGrey {
+  margin-top: -1px !important;
+}
+
+a.newcolor-grey3:hover {
+  color: #459be5 !important;
+}
+
+.edu-menu-listlia {
+  color: #05101a !important;
+}
+
+.syllabusbox_tishi p {
+  text-align: center;
+}
+
+#tip_attachment_count {
+  color: #4CACFF;
+  margin-top: 4px !important;
+}
+
+.newsedu-open {
+  top: -1px !important;
+  right: 7px !important;
+}
+
+#course_filter_order {
+  top: 24px;
+  width: 110px;
+  text-align: left;
+  right: -28px !important;
+}
+
+.du-back-white-right :hover .du-back-whiteTime {
+  color: #459be5 !important;
+}
+
+.du-back-white-right :hover .du-back-Iconfont {
+  color: #459be5 !important;
+}
+
+.popup_tip_box {
+  right: -160px;
+  top: 55px;
+}
+
+.privately-owned {
+  position: absolute;
+  top: 15px;
+  color: #747A7F !important;
+}
+
+.homepagePostSetting {
+  display: none;
+}
+
+#describe {
+  width: 100%;
+  line-height: 25px;
+}
+
 #describe a {
-    display:none;
-    line-height: 25px;
+  display: none;
+  line-height: 25px;
 
 }
-#resources-Sourcesbg:hover .homepagePostSetting{
-    display:block;
-}
-#resources-Sourcesbg:hover #describe a{
-    display:inline-block;
-}
-#describe a i.iconfont:hover{
-    color:#fff !important;
-}
-.newBorder_info_listone{
-    width: 15px;
-    height: 15px;
-    border: 1px solid #29BD8B;
-    background: #29BD8B;
-    border-radius: 50%;
-    position: relative;
-    display: block;
-    top: 3px;
-    margin: 1px 0px 0px 10px;
-}
-.newBorder_info_listtwo{
-    display: block;
-    color: #fff;
-    font-size: 13px !important;
-    position: absolute;
-    top: -4px;
-    left: 1px;
-}
-.newcolor-grey3{
-    max-width:516px;
-    float:left;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-}
-.homepageSignatureTextarea{
-    resize: none;
-    max-width: none;
-    margin-left: 0
-}
-.neworange-btn{
-    border: 1px solid transparent !important;
-    color: #FFF !important;
-    background: #FF6800 !important;
-    border: 1px solid #FF6800 !important;
+
+#resources-Sourcesbg:hover .homepagePostSetting {
+  display: block;
 }
 
-#course_file_form{
-    height:260px;
-}
-#course_file_form form{
-    min-height:260px;
-}
-.NEWtitlefl{
-    margin: 0px 0px 0px 43%;
-}
-.font12mb15{
-    font-size:16px !important;
-}
-.newfont12mb{
-    color:#FF6800;
-}
-.newtask-btn-orange{
-    margin-right: 180px;
-}
-.newtask-btn{
-    margin-right: 80px  !important;
-    color:#FFFFFF  !important;
-}
-a.task-btn-9A9A9A{
-    background: #9A9A9A!important;
-    color: #fff!important;
-}
-.margin20{
-    margin: 20px;
-}
-.edumaxblueh{
-    height:320px;
-}
-.edutaskhide{
-    font-size:14px;
-    color:rgba(76,76,76,1);
-}
-.newtask-popup{
-    width:600px;
-    max-height:700px;
-    overflow-x: auto;
-}
-.newcolor-grey{
-    margin: 0px 0px 0px 43%;
-    color:#05101A !important;
-}
-.newrealname{
-    width:90%;
-    margin-left:10px;
-}
-.newhide_realname{
-    top: -15px !important;
-    left: 46px !important;
-}
-.search_undis{
-    margin-top: 8px;
-    margin-bottom: 37px;
-}
-.nestask-orange{
-    margin-right: 210px;
-}
-.nestask-btn{
-    margin-right: 80px;
-    color:#FFFFFF;
-}
-.newImport_resource_info_list{
-    width: 600px !important;
-}
-.nodata{
-    text-align: center;
-    background-color: transparent;
-    border-color: transparent;
-    color: #000;
-}
-.import_color-grey{
-    margin: 0px 0px 0px 150px;
-    color:#000 !important;
-    width: 300px;
-}
-.newtask-popup-content{
-    max-height: 459px;
-    min-height: 459px;
-}
-.userImport_resource{
-    margin-bottom: 32px;
-}
-.subjectBannernews{
-    height:350px;
-    min-height:350px;
-    max-height:350px;
-    margin-bottom: 15px;
-}
-.subjectBannerone{
-    width: 91.3% !important;
-    padding: 0px 0px 0px 64px;
-    color: #676767;
-    font-size: 14px;
-    height: 40px !important;
-    line-height: 40px;
-}
-.subjectNamenew{
-    padding-left:15px;
-}
-.import_resource_infobtn-orange{
-    margin-right: 198px;
-}
-.import_resource_infobtn-btn{
-    margin-right: 68px;
-    color: #FFFFFF;
-}
-.subjectSearChfrp{
-    background:rgba(244,244,244,1);
-    right: -24px;
-    top: -37px;
-    position: absolute;
-}
-.du-back-Iconfontbox{
-    position:absolute;
-    top:-37px;
-    right:-11px;
-    cursor: pointer;
-    font-size: 18px !important;
-}
-.newtaskTitle{
-    margin: 0px 0px 0px 130px;
-    color:#000 !important;
-    width: 300px;
-}
-.task-popupList{
-    width:598px;
-    max-height: 574px;
-}
-.newnetwork_issu{
-    color: red;
-    display: none;
-}
-.newregex_publish_time{
-    margin-right: 190px;
-}
-.newregtask-btn_time{
-    margin-right: 80px;
-    color:#FFFFFF;
-}
-.newregexInputBox{
-    width: 530px !important;
-    height: 200px !important;
-    font-size: 12px !important;
-}
-.newregexInputBox::-webkit-input-placeholder { /* WebKit browsers */
-    color: #999;
-    font-size: 14px;
-}
-.newregexInputBox:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
-    color: #999;
-    font-size: 14px;
-}
-.newregexInputBox::-moz-placeholder { /* Mozilla Firefox 19+ */
-    color: #999;
-    font-size: 14px;
-}
-.newregexInputBox:-ms-input-placeholder { /* Internet Explorer 10+ */
-    color: #999;
-    font-size: 14px;
+#resources-Sourcesbg:hover #describe a {
+  display: inline-block;
 }
 
-#datetimepicker_mask::-webkit-input-placeholder { /* WebKit browsers */
-    color: #999;
-    font-size: 14px;
+#describe a i.iconfont:hover {
+  color: #fff !important;
 }
-#datetimepicker_mask:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
-    color: #999;
-    font-size: 14px;
+
+.newBorder_info_listone {
+  width: 15px;
+  height: 15px;
+  border: 1px solid #29BD8B;
+  background: #29BD8B;
+  border-radius: 50%;
+  position: relative;
+  display: block;
+  top: 3px;
+  margin: 1px 0px 0px 10px;
 }
-#datetimepicker_mask::-moz-placeholder { /* Mozilla Firefox 19+ */
-    color: #999;
-    font-size: 14px;
+
+.newBorder_info_listtwo {
+  display: block;
+  color: #fff;
+  font-size: 13px !important;
+  position: absolute;
+  top: -4px;
+  left: 1px;
 }
-#datetimepicker_mask:-ms-input-placeholder { /* Internet Explorer 10+ */
-    color: #999;
-    font-size: 14px;
+
+.newcolor-grey3 {
+  max-width: 516px;
+  float: left;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.homepageSignatureTextarea {
+  resize: none;
+  max-width: none;
+  margin-left: 0
+}
+
+.neworange-btn {
+  border: 1px solid transparent !important;
+  color: #FFF !important;
+  background: #FF6800 !important;
+  border: 1px solid #FF6800 !important;
+}
+
+#course_file_form {
+  height: 260px;
+}
+
+#course_file_form form {
+  min-height: 260px;
+}
+
+.NEWtitlefl {
+  margin: 0px 0px 0px 43%;
+}
+
+.font12mb15 {
+  font-size: 16px !important;
+}
+
+.newfont12mb {
+  color: #FF6800;
+}
+
+.newtask-btn-orange {
+  margin-right: 180px;
+}
+
+.newtask-btn {
+  margin-right: 80px !important;
+  color: #FFFFFF !important;
+}
+
+a.task-btn-9A9A9A {
+  background: #9A9A9A !important;
+  color: #fff !important;
+}
+
+.margin20 {
+  margin: 20px;
+}
+
+.edumaxblueh {
+  height: 320px;
+}
+
+.edutaskhide {
+  font-size: 14px;
+  color: rgba(76, 76, 76, 1);
+}
+
+.newtask-popup {
+  width: 600px;
+  max-height: 700px;
+  overflow-x: auto;
+}
+
+.newcolor-grey {
+  margin: 0px 0px 0px 43%;
+  color: #05101A !important;
+}
+
+.newrealname {
+  width: 90%;
+  margin-left: 10px;
+}
+
+.newhide_realname {
+  top: -15px !important;
+  left: 46px !important;
+}
+
+.search_undis {
+  margin-top: 8px;
+  margin-bottom: 37px;
+}
+
+.nestask-orange {
+  margin-right: 210px;
+}
+
+.nestask-btn {
+  margin-right: 80px;
+  color: #FFFFFF;
+}
+
+.newImport_resource_info_list {
+  width: 600px !important;
+}
+
+.nodata {
+  text-align: center;
+  background-color: transparent;
+  border-color: transparent;
+  color: #000;
+}
+
+.import_color-grey {
+  margin: 0px 0px 0px 150px;
+  color: #000 !important;
+  width: 300px;
+}
+
+.newtask-popup-content {
+  max-height: 459px;
+  min-height: 459px;
+}
+
+.userImport_resource {
+  margin-bottom: 32px;
+}
+
+.subjectBannernews {
+  height: 350px;
+  min-height: 350px;
+  max-height: 350px;
+  margin-bottom: 15px;
+}
+
+.subjectBannerone {
+  width: 91.3% !important;
+  padding: 0px 0px 0px 64px;
+  color: #676767;
+  font-size: 14px;
+  height: 40px !important;
+  line-height: 40px;
+}
+
+.subjectNamenew {
+  padding-left: 15px;
+}
+
+.import_resource_infobtn-orange {
+  margin-right: 198px;
+}
+
+.import_resource_infobtn-btn {
+  margin-right: 68px;
+  color: #FFFFFF;
+}
+
+.subjectSearChfrp {
+  background: rgba(244, 244, 244, 1);
+  right: -24px;
+  top: -37px;
+  position: absolute;
+}
+
+.du-back-Iconfontbox {
+  position: absolute;
+  top: -37px;
+  right: -11px;
+  cursor: pointer;
+  font-size: 18px !important;
+}
+
+.newtaskTitle {
+  margin: 0px 0px 0px 130px;
+  color: #000 !important;
+  width: 300px;
+}
+
+.task-popupList {
+  width: 598px;
+  max-height: 574px;
+}
+
+.newnetwork_issu {
+  color: red;
+  display: none;
+}
+
+.newregex_publish_time {
+  margin-right: 190px;
+}
+
+.newregtask-btn_time {
+  margin-right: 80px;
+  color: #FFFFFF;
+}
+
+.newregexInputBox {
+  width: 530px !important;
+  height: 200px !important;
+  font-size: 12px !important;
+}
+
+.newregexInputBox::-webkit-input-placeholder {
+  /* WebKit browsers */
+  color: #999;
+  font-size: 14px;
+}
+
+.newregexInputBox:-moz-placeholder {
+  /* Mozilla Firefox 4 to 18 */
+  color: #999;
+  font-size: 14px;
+}
+
+.newregexInputBox::-moz-placeholder {
+  /* Mozilla Firefox 19+ */
+  color: #999;
+  font-size: 14px;
+}
+
+.newregexInputBox:-ms-input-placeholder {
+  /* Internet Explorer 10+ */
+  color: #999;
+  font-size: 14px;
+}
+
+#datetimepicker_mask::-webkit-input-placeholder {
+  /* WebKit browsers */
+  color: #999;
+  font-size: 14px;
+}
+
+#datetimepicker_mask:-moz-placeholder {
+  /* Mozilla Firefox 4 to 18 */
+  color: #999;
+  font-size: 14px;
+}
+
+#datetimepicker_mask::-moz-placeholder {
+  /* Mozilla Firefox 19+ */
+  color: #999;
+  font-size: 14px;
+}
+
+#datetimepicker_mask:-ms-input-placeholder {
+  /* Internet Explorer 10+ */
+  color: #999;
+  font-size: 14px;
 }
 
 
-.datetimepicker_mask::-webkit-input-placeholder { /* WebKit browsers */
-    color: #999;
-    font-size: 14px;
+.datetimepicker_mask::-webkit-input-placeholder {
+  /* WebKit browsers */
+  color: #999;
+  font-size: 14px;
 }
-.datetimepicker_mask:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
-    color: #999;
-    font-size: 14px;
+
+.datetimepicker_mask:-moz-placeholder {
+  /* Mozilla Firefox 4 to 18 */
+  color: #999;
+  font-size: 14px;
 }
-.datetimepicker_mask::-moz-placeholder { /* Mozilla Firefox 19+ */
-    color: #999;
-    font-size: 14px;
+
+.datetimepicker_mask::-moz-placeholder {
+  /* Mozilla Firefox 19+ */
+  color: #999;
+  font-size: 14px;
 }
-.datetimepicker_mask:-ms-input-placeholder { /* Internet Explorer 10+ */
-    color: #999;
-    font-size: 14px;
+
+.datetimepicker_mask:-ms-input-placeholder {
+  /* Internet Explorer 10+ */
+  color: #999;
+  font-size: 14px;
 }
 
 
-.attachmentinput::-webkit-input-placeholder { /* WebKit browsers */
-    color: #999;
-    font-size: 14px;
+.attachmentinput::-webkit-input-placeholder {
+  /* WebKit browsers */
+  color: #999;
+  font-size: 14px;
 }
-.attachmentinput:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
-    color: #999;
-    font-size: 14px;
+
+.attachmentinput:-moz-placeholder {
+  /* Mozilla Firefox 4 to 18 */
+  color: #999;
+  font-size: 14px;
 }
-.attachmentinput::-moz-placeholder { /* Mozilla Firefox 19+ */
-    color: #999;
-    font-size: 14px;
+
+.attachmentinput::-moz-placeholder {
+  /* Mozilla Firefox 19+ */
+  color: #999;
+  font-size: 14px;
 }
-.attachmentinput:-ms-input-placeholder { /* Internet Explorer 10+ */
-    color: #999;
-    font-size: 14px;
+
+.attachmentinput:-ms-input-placeholder {
+  /* Internet Explorer 10+ */
+  color: #999;
+  font-size: 14px;
 }
-.newtaskpopupWrap{
-    width:598px !important;
-    min-height: 300px !important;
+
+.newtaskpopupWrap {
+  width: 598px !important;
+  min-height: 300px !important;
 }
-.newclearfix{
-    margin:-3px 0px 10px 0px;
+
+.newclearfix {
+  margin: -3px 0px 10px 0px;
 }
-.newcourseFileform{
-    min-height:250px;
+
+.newcourseFileform {
+  min-height: 250px;
 }
-.newcourseFileform ul{
-    overflow-y: auto;
-    height: 269px !important;
+
+.newcourseFileform ul {
+  overflow-y: auto;
+  height: 269px !important;
 }
-.course_file_form_form form{
-    min-height:320px !important;
+
+.course_file_form_form form {
+  min-height: 320px !important;
 }
-.muban_table{
-    border:1px solid transparent;
+
+.muban_table {
+  border: 1px solid transparent;
 }
-.muban_table thead tr th{
-    border:1px solid transparent;
+
+.muban_table thead tr th {
+  border: 1px solid transparent;
 }
-#attachment_history_popub{
-    margin-left: 3px;
+
+#attachment_history_popub {
+  margin-left: 3px;
 }
-.muban_tableone{
-    width: 565px !important;
+
+.muban_tableone {
+  width: 565px !important;
 }
-#attachments_fields span{
-    font-size: 12px;
-    color: #CCC;
+
+#attachments_fields span {
+  font-size: 12px;
+  color: #CCC;
 }
-.nestask-popuphidden{
-    width: 598px;
-    max-height: 708px;
-    overflow-y: auto;
-    overflow-x:hidden;
+
+.nestask-popuphidden {
+  width: 598px;
+  max-height: 708px;
+  overflow-y: auto;
+  overflow-x: hidden;
 }
-.nestask-popuphiddencolor-grey{
-    margin: 0px 0px 0px 43%;
-    color: #000 !important;
+
+.nestask-popuphiddencolor-grey {
+  margin: 0px 0px 0px 43%;
+  color: #000 !important;
 }
-.popup_ziyuan_title_fl{
-    max-width: 140px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+
+.popup_ziyuan_title_fl {
+  max-width: 140px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
-.ml20mr20Color{
-    color: #676767;
+
+.ml20mr20Color {
+  color: #676767;
 }
-.popup_ziyuan_title a{
-    width: 268px;
-    display: inline-block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+
+.popup_ziyuan_title a {
+  width: 268px;
+  display: inline-block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
-.muban_icons_bluemt5ml5fl{
-    /*position: absolute;*/
-    /*top: 6px;*/
-    /*left: 146px;*/
+
+.muban_icons_bluemt5ml5fl {
+  /*position: absolute;*/
+  /*top: 6px;*/
+  /*left: 146px;*/
 }
-.clearcoursecoursenew{
-    width: 87%;
-    margin-left: 2%;
+
+.clearcoursecoursenew {
+  width: 87%;
+  margin-left: 2%;
 }
-.publicmb10{
-    width: 87%;
-    margin-left: 0.5%;
+
+.publicmb10 {
+  width: 87%;
+  margin-left: 0.5%;
 }
-.clearfixnewmb10{
-    width: 87%;
-    margin-left: 0.5%;
+
+.clearfixnewmb10 {
+  width: 87%;
+  margin-left: 0.5%;
 }
-.mb10newclearfix{
-    width: 95%;
-    margin-left: 0.5%;
+
+.mb10newclearfix {
+  width: 95%;
+  margin-left: 0.5%;
 }
-.settingfllme{
-    width: 50%;
-    height: 40px;
+
+.settingfllme {
+  width: 50%;
+  height: 40px;
 }
-.tasksettingfllme{
-    margin-top: 4px;
-    width: 55px;
-    overflow:hidden;
-    text-overflow:ellipsis;
-    white-space:nowrap
+
+.tasksettingfllme {
+  margin-top: 4px;
+  width: 55px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap
 }
-.attachmentTake{
-    margin-right: 53px !important;
-    color:#FFFFFF !important;
+
+.attachmentTake {
+  margin-right: 53px !important;
+  color: #FFFFFF !important;
 }
-.attachmentTakebut{
-    margin-right: 198px;
+
+.attachmentTakebut {
+  margin-right: 198px;
 }
-.newmuban_textarea{
-    resize:none;
-    width: 98% !important;
-    min-height: 100px;
+
+.newmuban_textarea {
+  resize: none;
+  width: 98% !important;
+  min-height: 100px;
 }
-.newun_unified_setting_group{
-    width:100%;
+
+.newun_unified_setting_group {
+  width: 100%;
 }
-.newfontdeletitle{
-    position: relative;
-    top: -53px;
-    left: 126px;
-    width: 700px;
-    height: 0px;
-    padding: 10px;
+
+.newfontdeletitle {
+  position: relative;
+  top: -53px;
+  left: 126px;
+  width: 700px;
+  height: 0px;
+  padding: 10px;
 }
-.colorGreylistbox{
-    margin-left:20px;
+
+.colorGreylistbox {
+  margin-left: 20px;
 }
+
 .new_ypopupWrap {
-    /*top: 230px !important;*/
-    /*left: 650px !important;*/
-    width:600px !important;
-    /*height:530px !important;*/
-    /*min-height:530px !important;*/
-    /*max-height:600px !important;*/
+  /*top: 230px !important;*/
+  /*left: 650px !important;*/
+  width: 600px !important;
+  /*height:530px !important;*/
+  /*min-height:530px !important;*/
+  /*max-height:600px !important;*/
 }
+
 .newchoose_group_allow {
-    margin-left: 17px;
-    font-size: 13px;
+  margin-left: 17px;
+  font-size: 13px;
 }
-.no_span2_font a{
-    margin-right: 10px;
+
+.no_span2_font a {
+  margin-right: 10px;
 }
-.nesbor-bottom-greyE{
-    line-height: 14px;
-    position: relative;
+
+.nesbor-bottom-greyE {
+  line-height: 14px;
+  position: relative;
 }
-.nesbor-bottom{
-    display: inline-block;
-    height: 50px;
+
+.nesbor-bottom {
+  display: inline-block;
+  height: 50px;
 }
-.newConstration{
-    position: absolute;
-    top: 28px !important;
+
+.newConstration {
+  position: absolute;
+  top: 28px !important;
 }
-.nesbor-bottom label{
-    top: -1px !important;
-    left: 114px;
+
+.nesbor-bottom label {
+  top: -1px !important;
+  left: 114px;
 }
-.nesbor-bottom label span{
-    position: absolute;
-    top: 6px !important;
-    width: 562px;
+
+.nesbor-bottom label span {
+  position: absolute;
+  top: 6px !important;
+  width: 562px;
 }
-.newteacher_banner{
-    height: 75px !important;
-    line-height: 75px !important;
+
+.newteacher_banner {
+  height: 75px !important;
+  line-height: 75px !important;
 }
-.newpanel-box-sizing{
-    position: absolute;
-    bottom: 25px;
-    right: 10px;
+
+.newpanel-box-sizing {
+  position: absolute;
+  bottom: 25px;
+  right: 10px;
 }
-.HowManyStu{
-    position: absolute;
-    top: 85px;
-    left: 20px;
+
+.HowManyStu {
+  position: absolute;
+  top: 85px;
+  left: 20px;
 }
-.HowManyStuValue{
-    color: #FF6800;
+
+.HowManyStuValue {
+  color: #FF6800;
 }
-.newsedu-opennew{
-    top: 7px !important;
-    right: 10px !important;
-    position: absolute;
+
+.newsedu-opennew {
+  top: 7px !important;
+  right: 10px !important;
+  position: absolute;
 }
-.newsedu-opennewP{
-    top: -1px !important;
-    right: 10px !important;
-    position: absolute;
+
+.newsedu-opennewP {
+  top: -1px !important;
+  right: 10px !important;
+  position: absolute;
 }
-.newedu-findnew-input{
-    position: absolute;
-    right: 20px;
-    z-index:1;
+
+.newedu-findnew-input {
+  position: absolute;
+  right: 20px;
+  z-index: 1;
 }
-.du-backnew-Iconfont{
-    position: absolute;
-    top: 45px;
-    right: 4px;
-    font-size: 12px !important;
+
+.du-backnew-Iconfont {
+  position: absolute;
+  top: 45px;
+  right: 4px;
+  font-size: 12px !important;
 }
-.du-backnew-IconfontP{
-    position: absolute;
-    top: 1px;
-    right: -17px;
-    font-size: 12px !important;
+
+.du-backnew-IconfontP {
+  position: absolute;
+  top: 1px;
+  right: -17px;
+  font-size: 12px !important;
 }
-.du-back-white-rightnews{
-    width: 100%;
-    height: 35px;
-    text-align: left;
-    border: 1px solid transparent;
-    position: relative;
+
+.du-back-white-rightnews {
+  width: 100%;
+  height: 35px;
+  text-align: left;
+  border: 1px solid transparent;
+  position: relative;
 }
-.eduCenternew{
-    height:56px !important;
+
+.eduCenternew {
+  height: 56px !important;
 }
-.mh550cClearfix{
-    background: #FAFAFA !important;
+
+.mh550cClearfix {
+  background: #FAFAFA !important;
 }
-.setting_member_cClearfix{
-    height: 56px !important;
-    background: #FFF !important;
+
+.setting_member_cClearfix {
+  height: 56px !important;
+  background: #FFF !important;
 }
+
 .setting_member_cClearfix:hover {
-    background: #EFF9FD;
+  background: #EFF9FD;
 }
-.newedua-pop-table tr th{
-    border:1px solid transparent;
+
+.newedua-pop-table tr th {
+  border: 1px solid transparent;
 }
-.newedua-pop-table{
-    margin-bottom: 50px;
+
+.newedua-pop-table {
+  margin-bottom: 50px;
 }
-.newSelectclass{
-    width:600px;
-    height: 237px;
+
+.newSelectclass {
+  width: 600px;
+  height: 237px;
 }
-#newteacher_assign #teacher_assign_group_form{
-    padding-left: 30px;
+
+#newteacher_assign #teacher_assign_group_form {
+  padding-left: 30px;
 }
-.newteacher_clearfix{
-    color:#05101A;
-    font-weight: Bold;
-    font-size:16px;
-    padding-left: 2%;
+
+.newteacher_clearfix {
+  color: #05101A;
+  font-weight: Bold;
+  font-size: 16px;
+  padding-left: 2%;
 }
-.newclassHtmlvalue{
-    width:600px;
-    height: 237px;
+
+.newclassHtmlvalue {
+  width: 600px;
+  height: 237px;
 }
-.NewClasses{
-    margin-left: 44%;
+
+.NewClasses {
+  margin-left: 44%;
 }
-.newpanel-form-label{
-    width: 1% !important;
-    margin-left: -30px;
+
+.newpanel-form-label {
+  width: 1% !important;
+  margin-left: -30px;
 }
-.new_neygroup_name{
-    width: 86% !important;
-    height: 30px !important;
-    margin-top: 5px !important;
+
+.new_neygroup_name {
+  width: 86% !important;
+  height: 30px !important;
+  margin-top: 5px !important;
 }
-.newtaskBtn{
-    margin-right: 35%;
-    margin-top: 19px;
+
+.newtaskBtn {
+  margin-right: 35%;
+  margin-top: 19px;
 }
-.newtask-mr10btn{
-    margin-right: 7%;
-    margin-top: 19px;
-    color: #fff !important;
+
+.newtask-mr10btn {
+  margin-right: 7%;
+  margin-top: 19px;
+  color: #fff !important;
 }
-.task-popup-submit02{
-    width:100%;
+
+.task-popup-submit02 {
+  width: 100%;
 }
-.linclorregrey{
-    width:463px;
-    border:1px solid #ddd;
-    background:#fff;
+
+.linclorregrey {
+  width: 463px;
+  border: 1px solid #ddd;
+  background: #fff;
 }
-.Suggest_delete{
-    margin-left:46%;
-    color: #05101A !important
+
+.Suggest_delete {
+  margin-left: 46%;
+  color: #05101A !important
 }
-.newflBtn{
-    margin-bottom: 20px;
-    margin-left: 30px;
+
+.newflBtn {
+  margin-bottom: 20px;
+  margin-left: 30px;
 }
-.nesntoclasses{
-    margin-left: 30px;
-    margin-right: 10px;
-    color: #4CACFF !important;
-    border:1px solid #4CACFF !important;
+
+.nesntoclasses {
+  margin-left: 30px;
+  margin-right: 10px;
+  color: #4CACFF !important;
+  border: 1px solid #4CACFF !important;
 }
-.deletebtnOrange{
-    color:#DEDEDE !important;
-    border:1px solid #DEDEDE !important;
+
+.deletebtnOrange {
+  color: #DEDEDE !important;
+  border: 1px solid #DEDEDE !important;
 }
-.nesteacher{
-    width:650px;
+
+.nesteacher {
+  width: 650px;
 }
-.nesteacherFont{
-    margin-left: 40%;
+
+.nesteacherFont {
+  margin-left: 40%;
 }
+
 /* .width100{
     width: 92%;
     padding: 0px 0px 0px 25px;
 } */
-.unitsGrey{
-    float: left;
-    height: 40px;
-    line-height: 40px;
-    margin-right: 15px;
+.unitsGrey {
+  float: left;
+  height: 40px;
+  line-height: 40px;
+  margin-right: 15px;
 }
-.unitsPosition{
-    float: left;
-    width: 465px;
-    margin-top: 4px;
+
+.unitsPosition {
+  float: left;
+  width: 465px;
+  margin-top: 4px;
 }
-.unitsPositionboxsizing{
-    height:30px !important;
-    margin-top: 2px;
+
+.unitsPositionboxsizing {
+  height: 30px !important;
+  margin-top: 2px;
 }
-.unitsPositionboxsizinga{
-    width:465px !important;
-    height:30px !important;
-    margin-top: 6px;
+
+.unitsPositionboxsizinga {
+  width: 465px !important;
+  height: 30px !important;
+  margin-top: 6px;
 }
-.unitsPositionboxsizingc{
-    width:465px !important;
-    height:30px !important;
-    margin-top: 6px;
+
+.unitsPositionboxsizingc {
+  width: 465px !important;
+  height: 30px !important;
+  margin-top: 6px;
 }
-.edu-btn-searcha{
-    position: absolute;
-    top: -5px;
-    right: 15px;
+
+.edu-btn-searcha {
+  position: absolute;
+  top: -5px;
+  right: 15px;
 }
-.edu-btn-searchtwo{
-    position: absolute;
-    top: 0px;
-    right: 15px;
+
+.edu-btn-searchtwo {
+  position: absolute;
+  top: 0px;
+  right: 15px;
 }
-.search_Stubd_list{
-    overflow-y: auto;
-    width: 100%;
-    height: 280px;
+
+.search_Stubd_list {
+  overflow-y: auto;
+  width: 100%;
+  height: 280px;
 }
-.choose_student_idslist{
-    width:100%;
-    background:#fff;
-    height:25px;
+
+.choose_student_idslist {
+  width: 100%;
+  background: #fff;
+  height: 25px;
 }
-.attachmentTakebuta{
-    margin-right: 170px;
+
+.attachmentTakebuta {
+  margin-right: 170px;
 }
-.teacher_bannerBar{
-    height: 80px !important;
-    line-height: 80px !important;
+
+.teacher_bannerBar {
+  height: 80px !important;
+  line-height: 80px !important;
 }
-.color-dark-greyfont{
-    color: #666 !important;
-    font-size:14px;
+
+.color-dark-greyfont {
+  color: #666 !important;
+  font-size: 14px;
 }
-.color-dark-grey{
-    color: #999 !important;
+
+.color-dark-grey {
+  color: #999 !important;
 }
-.educontopnewclearfix{
-    height: 125px;
+
+.educontopnewclearfix {
+  height: 125px;
 }
-.nesbor-bottom-greyE{
-    top:0px;
+
+.nesbor-bottom-greyE {
+  top: 0px;
 }
-.colorFFF{
-    color:#FFF !important;
+
+.colorFFF {
+  color: #FFF !important;
 }
-.marginrename{
-    margin-left:44%;
-    color: #05101A !important
+
+.marginrename {
+  margin-left: 44%;
+  color: #05101A !important
 }
-.attachmentTakebuttwo{
-    margin-right: 143px;
+
+.attachmentTakebuttwo {
+  margin-right: 143px;
 }
-.new_neygroupaname{
-    width: 81% !important;
-    height: 30px !important;
-    margin-top: 3px;
+
+.new_neygroupaname {
+  width: 81% !important;
+  height: 30px !important;
+  margin-top: 3px;
 }
-.unitsGreynew{
-    float: left;
-    height: 40px;
-    line-height: 40px;
-    text-align: left;
-    width: 56px;
-    margin-left: 11px
+
+.unitsGreynew {
+  float: left;
+  height: 40px;
+  line-height: 40px;
+  text-align: left;
+  width: 56px;
+  margin-left: 11px
 }
-.btn_student{
-    color: #FF7500;
-    border: 1px solid #FF7500;
+
+.btn_student {
+  color: #FF7500;
+  border: 1px solid #FF7500;
 }
-.btn_studenta{
-    color: #FFF !important;
-    border: 1px solid #FF7500;
-    background: #FF7500;
+
+.btn_studenta {
+  color: #FFF !important;
+  border: 1px solid #FF7500;
+  background: #FF7500;
 }
-.edu-pop-table tr td .ChangeAdministrator{
-    color:#4CACFF !important;
+
+.edu-pop-table tr td .ChangeAdministrator {
+  color: #4CACFF !important;
 }
-.mutual{
-    margin-left:2px;
+
+.mutual {
+  margin-left: 2px;
 }
-#student_table_div table tbody tr:nth-child(1) td{
-    border-top:1px solid transparent !important;
+
+#student_table_div table tbody tr:nth-child(1) td {
+  border-top: 1px solid transparent !important;
 }
-.orangeback{
-    width: 68px;
-    height: 24px;
-    line-height: 24px;
-    background: #FF7500 !important;
-    color: #FFF !important;
-    font-size: 14px !important;
+
+.orangeback {
+  width: 68px;
+  height: 24px;
+  line-height: 24px;
+  background: #FF7500 !important;
+  color: #FFF !important;
+  font-size: 14px !important;
 }
-.colorBule{
-    color:#4CACFF !important;
+
+.colorBule {
+  color: #4CACFF !important;
 }
-.educontoptwpConnot{
-    height: 50px !important;
-    position:relative;
-    border-bottom: none!important;
+
+.educontoptwpConnot {
+  height: 50px !important;
+  position: relative;
+  border-bottom: none !important;
 }
-.HowManyStufont14{
-    position: absolute;
-    top: 21px;
-    left: 20px;
-    font-size: 14px;
+
+.HowManyStufont14 {
+  position: absolute;
+  top: 21px;
+  left: 20px;
+  font-size: 14px;
 }
-.edu-cold-input{
-    position: absolute;
-    top: 17px;
-    right: 18px;
+
+.edu-cold-input {
+  position: absolute;
+  top: 17px;
+  right: 18px;
 }
-.newseduiconfont{
-    top: -1px !important;
+
+.newseduiconfont {
+  top: -1px !important;
 }
-#edu-bgtablethead table thead tr th{
-    width: 132px !important;
-    display: inline-block;
-    float: left;
-    height: 56px !important;
-    line-height: 56px !important;
+
+#edu-bgtablethead table thead tr th {
+  width: 132px !important;
+  display: inline-block;
+  float: left;
+  height: 56px !important;
+  line-height: 56px !important;
 }
-#edu-bgtablethead table thead tr th:nth-child(1){
-    margin-left: 24px;
+
+#edu-bgtablethead table thead tr th:nth-child(1) {
+  margin-left: 24px;
 }
-#edu-bgtablethead table tbody tr td{
-    width: 134px !important;
-    display: inline-block;
-    float: left;
-    height: 56px !important;
-    line-height: 56px !important;
+
+#edu-bgtablethead table tbody tr td {
+  width: 134px !important;
+  display: inline-block;
+  float: left;
+  height: 56px !important;
+  line-height: 56px !important;
 }
-#edu-bgtablethead table tbody tr td:nth-child(1){
-    margin-left: 24px;
+
+#edu-bgtablethead table tbody tr td:nth-child(1) {
+  margin-left: 24px;
 }
-#edu-bgtablethead table tbody tr:nth-child(1) td{
-    border-top:1px solid transparent !important;
+
+#edu-bgtablethead table tbody tr:nth-child(1) td {
+  border-top: 1px solid transparent !important;
 }
-#edu-bgtablethead table tr th{
-    border: 1px solid transparent;
+
+#edu-bgtablethead table tr th {
+  border: 1px solid transparent;
 }
 
 
 
-#edu-bgtabletheadtech table thead tr th{
-    width: 160px !important;
-    display: inline-block;
-    float: left;
-    height: 56px !important;
-    line-height: 56px !important;
-    font-weight: 500;
-    color: #666666 !important;
+#edu-bgtabletheadtech table thead tr th {
+  width: 160px !important;
+  display: inline-block;
+  float: left;
+  height: 56px !important;
+  line-height: 56px !important;
+  font-weight: 500;
+  color: #666666 !important;
 }
-#edu-bgtabletheadtech table thead tr th:nth-child(1){
-    margin-left: 24px;
+
+#edu-bgtabletheadtech table thead tr th:nth-child(1) {
+  margin-left: 24px;
 }
-#edu-bgtabletheadtech table tbody tr td{
-    width: 163px !important;
-    display: inline-block;
-    float: left;
-    height: 56px !important;
-    line-height: 56px !important;
+
+#edu-bgtabletheadtech table tbody tr td {
+  width: 163px !important;
+  display: inline-block;
+  float: left;
+  height: 56px !important;
+  line-height: 56px !important;
 }
-#edu-bgtabletheadtech table tbody tr td:nth-child(1){
-    margin-left: 24px;
+
+#edu-bgtabletheadtech table tbody tr td:nth-child(1) {
+  margin-left: 24px;
 }
-#edu-bgtabletheadtech table tbody tr:nth-child(1) td{
-    border-top:1px solid transparent !important;
+
+#edu-bgtabletheadtech table tbody tr:nth-child(1) td {
+  border-top: 1px solid transparent !important;
 }
-#edu-bgtabletheadtech table tr th{
-    border: 1px solid transparent;
+
+#edu-bgtabletheadtech table tr th {
+  border: 1px solid transparent;
 }
 
 
-.newpopupteacher{
-    width:600px;
-    margin-left: 38%;
-    position: absolute;
-    top: -100px;
-    left:100px;
+.newpopupteacher {
+  width: 600px;
+  margin-left: 38%;
+  position: absolute;
+  top: -100px;
+  left: 100px;
 }
-.newupload_Teacher{
-    height: 520px;
+
+.newupload_Teacher {
+  height: 520px;
 }
-.taskform80{
-    padding: 5px;
-    width: 83%;
-    height: 30px !important;
-    background: rgba(255,255,255,1);
-    border-radius: 4px;
+
+.taskform80 {
+  padding: 5px;
+  width: 83%;
+  height: 30px !important;
+  background: rgba(255, 255, 255, 1);
+  border-radius: 4px;
 }
-.unitsGrey80{
-    float: left;
-    height: 29px;
-    line-height: 29px;
-    margin-right: 15px;
+
+.unitsGrey80 {
+  float: left;
+  height: 29px;
+  line-height: 29px;
+  margin-right: 15px;
 }
-.edu-btn-searcha80{
-    position: absolute;
-    top: -7px;
-    right: 64px;
+
+.edu-btn-searcha80 {
+  position: absolute;
+  top: -7px;
+  right: 64px;
 }
-.left_80_path{
-    width: 568px;
+
+.left_80_path {
+  width: 568px;
 }
-.all_ther_selectstyle{
-    width:550px;
-    background: #f7f9fd;
-    height: 25px;
-    display: none;
+
+.all_ther_selectstyle {
+  width: 550px;
+  background: #f7f9fd;
+  height: 25px;
+  display: none;
 }
-.all_settings_selectstyle ul{
-    width:519px !important;
-    height: 280px;
+
+.all_settings_selectstyle ul {
+  width: 519px !important;
+  height: 280px;
 }
-.task_popup_conList{
-    padding: 30px 40px 0px 40px;
+
+.task_popup_conList {
+  padding: 30px 40px 0px 40px;
 }
-.mb10important{
-    margin-bottom: 20px !important;
-    position: relative;
+
+.mb10important {
+  margin-bottom: 20px !important;
+  position: relative;
 }
-.unitsGrey101{
-    width:100%;
-    height: 100px;
-    position:relative;
+
+.unitsGrey101 {
+  width: 100%;
+  height: 100px;
+  position: relative;
 }
-.unitsGrey101 h4{
-    width: 52px;
-    float: left;
+
+.unitsGrey101 h4 {
+  width: 52px;
+  float: left;
 }
-.unitsGrey101 ul{
-    width: 280px;
-    float: left;
+
+.unitsGrey101 ul {
+  width: 280px;
+  float: left;
 }
-.left{
-    float:left;
+
+.left {
+  float: left;
 }
-.assistants{
-    margin-left:30px;
+
+.assistants {
+  margin-left: 30px;
 }
-.cancellation{
-    position: absolute;
-    top: 62px;
-    left: 177px;
-    color: #FFF !important;
+
+.cancellation {
+  position: absolute;
+  top: 62px;
+  left: 177px;
+  color: #FFF !important;
 }
-.determine{
-    position: absolute;
-    top: 62px;
-    left: 287px;
+
+.determine {
+  position: absolute;
+  top: 62px;
+  left: 287px;
 }
-.nesborBox{
-    height:105px;
+
+.nesborBox {
+  height: 105px;
 }
-.CCC_btn{
-    border:1px solid #B3B3B3 !important;
-    color: #B3B3B3 !important;
+
+.CCC_btn {
+  border: 1px solid #B3B3B3 !important;
+  color: #B3B3B3 !important;
 }
-.backOrange{
-    background: #FF6800 !important;
-    color: #FFF !important;
-    border:1px solid #FF6800  !important;
+
+.backOrange {
+  background: #FF6800 !important;
+  color: #FFF !important;
+  border: 1px solid #FF6800 !important;
 }
-.bulewhitebtn{
-    border:1px solid #4CACFF !important;
-    color: #4CACFF !important;
+
+.bulewhitebtn {
+  border: 1px solid #4CACFF !important;
+  color: #4CACFF !important;
 }
-.tabeltext-alignleft{
-    text-align: center;
+
+.tabeltext-alignleft {
+  text-align: center;
 }
-.tehchpositiong{
-    top: 18px !important;
+
+.tehchpositiong {
+  top: 18px !important;
 }
-.newpanelstylelposition{
-    position: absolute;
-    top: -1px;
+
+.newpanelstylelposition {
+  position: absolute;
+  top: -1px;
 }
-.newsedu-opennewposition{
-    top: -3px !important;
-    right: 10px !important;
-    position: absolute;
+
+.newsedu-opennewposition {
+  top: -3px !important;
+  right: 10px !important;
+  position: absolute;
 }
-.sy_cgreyblue{
-    color: #4CACFF !important;
-    border: 1px solid #4CACFF !important;
+
+.sy_cgreyblue {
+  color: #4CACFF !important;
+  border: 1px solid #4CACFF !important;
 }
-.attachment_history_tr th{
-    color: #888 !important;
+
+.attachment_history_tr th {
+  color: #888 !important;
 }
+
 .attachment_th th {
-    color: #888 !important;
-    margin-right: 22px;
-    width: 500px;
+  color: #888 !important;
+  margin-right: 22px;
+  width: 500px;
 }
-.deletehist{
-    position: absolute;
-    bottom: 91px;
-    right: 27px;
+
+.deletehist {
+  position: absolute;
+  bottom: 91px;
+  right: 27px;
 }
-.orangebtuB3{
-    color:#B3B3B3 !important;
-    border:1px solid #B3B3B3 !important;
+
+.orangebtuB3 {
+  color: #B3B3B3 !important;
+  border: 1px solid #B3B3B3 !important;
 }
-#homepagePostPorimg img{
-    float: left;
-    margin-top: 17px !important;
+
+#homepagePostPorimg img {
+  float: left;
+  margin-top: 17px !important;
 }
-#tip_attachment_count span{
-    margin-right:24px;
+
+#tip_attachment_count span {
+  margin-right: 24px;
 }
-.homepagePostSettingundis{
-    left: -66px !important;
+
+.homepagePostSettingundis {
+  left: -66px !important;
 }
-.muban_table thead tr th{
-    font-weight: 500 !important;
+
+.muban_table thead tr th {
+  font-weight: 500 !important;
 }
-.greymaxfont{
-    color: #989898 !important;
-    font-size: 12px;
-    margin-top: 2px;
+
+.greymaxfont {
+  color: #989898 !important;
+  font-size: 12px;
+  margin-top: 2px;
 }
-#edu-bgtabletheadtech table tbody tr td span{
-    color: #343434 !important;
+
+#edu-bgtabletheadtech table tbody tr td span {
+  color: #343434 !important;
 }
-#edu-bgtabletheadtech table tbody tr td:nth-child(1) span{
-    color: #656565 !important;
+
+#edu-bgtabletheadtech table tbody tr td:nth-child(1) span {
+  color: #656565 !important;
 }
-#edu-bgtabletheadtech table tbody tr td:nth-child(3) span{
-    color: #9A9A9A !important;
+
+#edu-bgtabletheadtech table tbody tr td:nth-child(3) span {
+  color: #9A9A9A !important;
 }
-#edu-bgtablethead table  thead tr th{
-    font-weight: 400;
-    color: #666 !important;
+
+#edu-bgtablethead table thead tr th {
+  font-weight: 400;
+  color: #666 !important;
 }
 
 
-#edu-bgtabletheadtech table  tbody tr td{
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+#edu-bgtabletheadtech table tbody tr td {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
-#search_not_teachers_ul li label a{
-    color:#4C4C4C;
-}
-#search_not_students_ul li label a{
-    color:#4C4C4C;
+#search_not_teachers_ul li label a {
+  color: #4C4C4C;
 }
 
-#search_not_students_ul li label span:nth-child(2){
-    color:#9A9A9A;
+#search_not_students_ul li label a {
+  color: #4C4C4C;
 }
 
-#search_not_students_ul li label span:nth-child(3){
-    color: #CBCBCB;
+#search_not_students_ul li label span:nth-child(2) {
+  color: #9A9A9A;
+}
+
+#search_not_students_ul li label span:nth-child(3) {
+  color: #CBCBCB;
 }
 
 
-.loginX{
-    position: absolute;
-    right: 6px;
-    top: 0px;
+.loginX {
+  position: absolute;
+  right: 6px;
+  top: 0px;
 }
 
-#newtrainingtask-popup{
-    width:840px;
-    height:615px;
+#newtrainingtask-popup {
+  width: 840px;
+  height: 615px;
 }
 
-.TrainingList{
-    margin-left: 32px;
-    color:#9A9A9A;
-    font-size:14px;
-    line-height: 32px;
-}
-.TrainingListchild{
-    color:#FF6800;
-}
-.newshixun_tab_div{
-    padding: 0px 22px 0px -5px;
-    max-height: 90px;
-    overflow-y: auto;
+.TrainingList {
+  margin-left: 32px;
+  color: #9A9A9A;
+  font-size: 14px;
+  line-height: 32px;
 }
 
-.newtask_popup_con{
-    padding:20px 0px 20px 0px;
+.TrainingListchild {
+  color: #FF6800;
 }
 
-#new_shixun_homework_list{
-    padding: 0px 3px 10px 20px;
+.newshixun_tab_div {
+  padding: 0px 22px 0px -5px;
+  max-height: 90px;
+  overflow-y: auto;
 }
 
-.choose_idsbox{
-    width:100%;
-    height: 30px;
-    background:#EAEAEA;
-}
-.task-hidechoose_idsbox{
-    width: 100px;
-    color:#343434;
-}
-.task-hidechild{
-    display: inline-block;
-    margin-left:10px;
-}
-.search-spannew{
-    margin-right: 32px;
-}
-.newdetails{
-    color: #4CACFF;
-    width: 80px;
-}
-.widthnew90{
-    width: 90px;
-}
-.widthnew250{
-    width: 250px;
-}
-.widthnew180{
-    width: 180px;
-}
-.clearfixnewclass{
-    height: 38px;
-    border-bottom: 1px solid #EBEBEB;
-    padding-top: 10px;
-}
-.over490{
-    max-height: 420px;
-}
-.widthnew280{
-    width:280px;
-}
-.widthnew100{
-    width: 134px;
-    text-align: center;
-    color:#676767;
-}
-.widthnew210{
-    width: 229px;
-    text-align: right;
-    color: #676767;
-}
-.widthnew142{
-    width: 147px;
-    text-align: right;
-    color: #676767;
-}
-.widthnew132{
-    width: 81px;
-    text-align: right;
-    color: #676767;
-}
-.FFFFF{
-    color:#FFFFFF !important;
-    margin-right: 61px;
+.newtask_popup_con {
+  padding: 20px 0px 20px 0px;
 }
 
-.search-spannewshixun_name_search::-webkit-input-placeholder{
-    color: #9A9A9A;
+#new_shixun_homework_list {
+  padding: 0px 3px 10px 20px;
 }
-.search-spannewshixun_name_search:-moz-placeholder{
-    color: #9A9A9A;
+
+.choose_idsbox {
+  width: 100%;
+  height: 30px;
+  background: #EAEAEA;
 }
-.search-spannewshixun_name_search:-ms-input-placeholder{
-    color: #9A9A9A;;
+
+.task-hidechoose_idsbox {
+  width: 100px;
+  color: #343434;
+}
+
+.task-hidechild {
+  display: inline-block;
+  margin-left: 10px;
+}
+
+.search-spannew {
+  margin-right: 32px;
+}
+
+.newdetails {
+  color: #4CACFF;
+  width: 80px;
+}
+
+.widthnew90 {
+  width: 90px;
+}
+
+.widthnew250 {
+  width: 250px;
+}
+
+.widthnew180 {
+  width: 180px;
+}
+
+.clearfixnewclass {
+  height: 38px;
+  border-bottom: 1px solid #EBEBEB;
+  padding-top: 10px;
+}
+
+.over490 {
+  max-height: 420px;
+}
+
+.widthnew280 {
+  width: 280px;
+}
+
+.widthnew100 {
+  width: 134px;
+  text-align: center;
+  color: #676767;
+}
+
+.widthnew210 {
+  width: 229px;
+  text-align: right;
+  color: #676767;
+}
+
+.widthnew142 {
+  width: 147px;
+  text-align: right;
+  color: #676767;
+}
+
+.widthnew132 {
+  width: 81px;
+  text-align: right;
+  color: #676767;
+}
+
+.FFFFF {
+  color: #FFFFFF !important;
+  margin-right: 61px;
+}
+
+.search-spannewshixun_name_search::-webkit-input-placeholder {
+  color: #9A9A9A;
+}
+
+.search-spannewshixun_name_search:-moz-placeholder {
+  color: #9A9A9A;
+}
+
+.search-spannewshixun_name_search:-ms-input-placeholder {
+  color: #9A9A9A;
+  ;
 }
 
 
 /*在线课堂作业*/
-.classaInputOverflow{
-    display: block;
-    color: #333;
-    font-size: 16px;
-    max-width: 516px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    font-size: 16px;
-    font-family: MicrosoftYaHei-Bold;
-    color: #05101A !important;
-    font-weight: Bold;
-    margin-top: 3px;
+.classaInputOverflow {
+  display: block;
+  color: #333;
+  font-size: 16px;
+  max-width: 516px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  font-size: 16px;
+  font-family: MicrosoftYaHei-Bold;
+  color: #05101A !important;
+  font-weight: Bold;
+  margin-top: 3px;
 }
 
-.marginxe61f{
-    margin-top: 5px;
-    margin-left: 6px;
-    color: #747A7F !important;
-}
-.classaInputleft{
-    font-size: 16px;
-    font-family: MicrosoftYaHei-Bold;
-    color: #05101A !important;
-    font-weight: Bold;
+.marginxe61f {
+  margin-top: 5px;
+  margin-left: 6px;
+  color: #747A7F !important;
 }
 
-.Training_details{
-    background: rgba(76,172,255,1);
-    border-radius: 12px;
-    color: #FFF !important;
-    width: 76px !important;
-    height: 22px !important;
-    line-height: 21px !important;
-    padding: 0px !important;
-    border: 1px solid rgba(76,172,255,1);
-    margin-top: 7px;
+.classaInputleft {
+  font-size: 16px;
+  font-family: MicrosoftYaHei-Bold;
+  color: #05101A !important;
+  font-weight: Bold;
 }
-.Training_FCFCFC{
-    background:#B2B2B2;
-    border-radius: 12px;
-    color: #FFF !important;
-    width: 76px !important;
-    height: 22px !important;
-    line-height: 21px !important;
-    padding: 0px !important;
-    border: 1px solid #B2B2B2;
-    margin-top: 7px;
+
+.Training_details {
+  background: rgba(76, 172, 255, 1);
+  border-radius: 12px;
+  color: #FFF !important;
+  width: 76px !important;
+  height: 22px !important;
+  line-height: 21px !important;
+  padding: 0px !important;
+  border: 1px solid rgba(76, 172, 255, 1);
+  margin-top: 7px;
 }
-.Training_FCFCFC a{
-    color: #FFF;
-    font-size: 14px;
+
+.Training_FCFCFC {
+  background: #B2B2B2;
+  border-radius: 12px;
+  color: #FFF !important;
+  width: 76px !important;
+  height: 22px !important;
+  line-height: 21px !important;
+  padding: 0px !important;
+  border: 1px solid #B2B2B2;
+  margin-top: 7px;
 }
-.Training_details a{
-    color: #FFF;
-    font-size: 14px;
+
+.Training_FCFCFC a {
+  color: #FFF;
+  font-size: 14px;
 }
-.Foundedin{
-    color: #CCCCCC;
-    font-size: 14px;
+
+.Training_details a {
+  color: #FFF;
+  font-size: 14px;
 }
-.color343434{
-    color:#343434;
-    font-size:14px;
+
+.Foundedin {
+  color: #CCCCCC;
+  font-size: 14px;
 }
-.colortFF6800{
-    color: #FF6800;
-    font-size:14px;
+
+.color343434 {
+  color: #343434;
+  font-size: 14px;
 }
-.colort21B351{
-    color: #21B351;
-    font-size:14px;
+
+.colortFF6800 {
+  color: #FF6800;
+  font-size: 14px;
 }
-.edu-filter-btn-redgreenBtn{
-    width:94px;
-    height:22px;
-    background: #FFF;
-    border-radius: 12px !important;
-    line-height: 22px !important;
-    padding: 0px !important;
-    color: #DD1717 !important;
-    margin-top: 7px;
-    border: 1px solid #DD1717;
-    font-size: 14px;
+
+.colort21B351 {
+  color: #21B351;
+  font-size: 14px;
 }
-.edu-filter-btn-no-latehomeStatusBtn{
-    width: 66px;
-    height: 22px;
-    background: #FFF;
-    border-radius: 12px !important;
-    line-height: 22px !important;
-    padding: 0px !important;
-    color: #747A7F !important;
-    margin-top: 7px;
-    border: 1px solid #747A7F;
-    font-size: 14px;
+
+.edu-filter-btn-redgreenBtn {
+  width: 94px;
+  height: 22px;
+  background: #FFF;
+  border-radius: 12px !important;
+  line-height: 22px !important;
+  padding: 0px !important;
+  color: #DD1717 !important;
+  margin-top: 7px;
+  border: 1px solid #DD1717;
+  font-size: 14px;
 }
-.edu-filter-btn-endhomeStatusBtn{
-    width: 66px;
-    height: 22px;
-    background:#FFF;
-    border-radius: 12px !important;
-    line-height: 22px !important;
-    padding: 0px !important;
-    color: #747A7F !important;
-    margin-top: 7px;
-    border: 1px solid #747A7F;
-    font-size: 14px;
+
+.edu-filter-btn-no-latehomeStatusBtn {
+  width: 66px;
+  height: 22px;
+  background: #FFF;
+  border-radius: 12px !important;
+  line-height: 22px !important;
+  padding: 0px !important;
+  color: #747A7F !important;
+  margin-top: 7px;
+  border: 1px solid #747A7F;
+  font-size: 14px;
 }
-.edu-filter-btn-endgreenhomeStatusBtn{
-    width: 100px;
-    height: 22px;
-    background:#FFF;
-    border-radius: 12px !important;
-    line-height: 22px !important;
-    padding: 0px !important;
-    color: #29BD8B !important;
-    margin-top: 7px;
-    border: 1px solid #29BD8B;
-    font-size: 14px;
+
+.edu-filter-btn-endhomeStatusBtn {
+  width: 66px;
+  height: 22px;
+  background: #FFF;
+  border-radius: 12px !important;
+  line-height: 22px !important;
+  padding: 0px !important;
+  color: #747A7F !important;
+  margin-top: 7px;
+  border: 1px solid #747A7F;
+  font-size: 14px;
 }
-.edu-filter-btn-orangehomeStatusBtn{
-    width: 66px;
-    height: 22px;
-    background: #FFF;
-    border-radius: 12px !important;
-    line-height: 22px !important;
-    padding: 0px !important;
-    color: #ff6800 !important;
-    margin-top: 7px;
-    border: 1px solid #ff6800;
-    font-size: 14px;
+
+.edu-filter-btn-endgreenhomeStatusBtn {
+  width: 100px;
+  height: 22px;
+  background: #FFF;
+  border-radius: 12px !important;
+  line-height: 22px !important;
+  padding: 0px !important;
+  color: #29BD8B !important;
+  margin-top: 7px;
+  border: 1px solid #29BD8B;
+  font-size: 14px;
 }
-.newcolor-red{
-    color: #DD1717;
+
+.edu-filter-btn-orangehomeStatusBtn {
+  width: 66px;
+  height: 22px;
+  background: #FFF;
+  border-radius: 12px !important;
+  line-height: 22px !important;
+  padding: 0px !important;
+  color: #ff6800 !important;
+  margin-top: 7px;
+  border: 1px solid #ff6800;
+  font-size: 14px;
 }
-.newcolor-orange{
-    color: #FF6800;
+
+.newcolor-red {
+  color: #DD1717;
 }
-.color4CACFF{
-    color:#4CACFF !important;
-    font-size:16px;
+
+.newcolor-orange {
+  color: #FF6800;
 }
-.paddingLeft30{
-    padding-left:30%;
+
+.color4CACFF {
+  color: #4CACFF !important;
+  font-size: 16px;
 }
-.paddingLeft35{
-    padding-left:35%;
+
+.paddingLeft30 {
+  padding-left: 30%;
 }
-.paddingLeft20{
-    padding-left:20%;
+
+.paddingLeft35 {
+  padding-left: 35%;
 }
-.color979797{
-    font-size: 14px;
-    color: #979797 !important;
-    padding-left: 2%;
+
+.paddingLeft20 {
+  padding-left: 20%;
 }
-.marginRight55{
-    margin-right: 55px;
+
+.color979797 {
+  font-size: 14px;
+  color: #979797 !important;
+  padding-left: 2%;
 }
-.marginTop{
-    margin-right: 33%;
-    margin-top: 20px;
+
+.marginRight55 {
+  margin-right: 55px;
 }
-.marginTop30{
-    margin:30px 30% 20px 0px;
+
+.marginTop {
+  margin-right: 33%;
+  margin-top: 20px;
 }
+
+.marginTop30 {
+  margin: 30px 30% 20px 0px;
+}
+
 /*选择实训弹框*/
-.Select_trainingFont{
-    font-weight: Bold;
-    font-size:16px;
-    font-family:MicrosoftYaHei-Bold;
-    color:#05101A !important;
+.Select_trainingFont {
+  font-weight: Bold;
+  font-size: 16px;
+  font-family: MicrosoftYaHei-Bold;
+  color: #05101A !important;
 }
-.TrainingHead{
-    padding: 0px !important;
-    height: 151px !important;
-    margin-bottom: 10px;
-    border: 1px solid transparent;
+
+.TrainingHead {
+  padding: 0px !important;
+  height: 151px !important;
+  margin-bottom: 10px;
+  border: 1px solid transparent;
 }
-#resources-Sourcesbg{
-    border-top: 1px solid #eee;
-    border-bottom: 1px solid transparent;
+
+#resources-Sourcesbg {
+  border-top: 1px solid #eee;
+  border-bottom: 1px solid transparent;
 }
+
 .homework_index_list .mh550 #resources-Sourcesbg:nth-child(1) {
-    border-top:1px solid transparent;
+  border-top: 1px solid transparent;
 }
 
-.height55{
-    height: 55px;
-    border-bottom: 1px solid #eee;
-}
-.TrainingHead div:nth-child(2){
-    border-bottom:1px solid transparent;
+.height55 {
+  height: 55px;
+  border-bottom: 1px solid #eee;
 }
 
-.mt12ml25{
-    margin-top: 12px;
-    margin-left: 25px;
+.TrainingHead div:nth-child(2) {
+  border-bottom: 1px solid transparent;
 }
-.mat13{
-    margin-top: 13px;
-}
-#homework_index_tab a{
-    font-size: 14px !important;
-    display: inline-block;
-    margin-right: 45px;
-}
-.homework_index_taba{color: #459be5 !important;}
-.relativemrt{
-    position: relative;
-    margin-top: 10px;
-    margin-right: -14px;
-}
-.borderEAEAEA{
-    border:1px solid #EAEAEA;
-}
-.borderEAEAEA::-webkit-input-placeholder{color: #9A9A9A; font-size:14px; }
 
-.borderEAEAEA:-moz-placeholder{color: #9A9A9A; font-size:14px;}
+.mt12ml25 {
+  margin-top: 12px;
+  margin-left: 25px;
+}
 
-.borderEAEAEA::-moz-placeholder{color: #9A9A9A; font-size:14px;}
+.mat13 {
+  margin-top: 13px;
+}
 
-.borderEAEAEA:-ms-input-placeholder{color: #9A9A9A; font-size:14px;}
+#homework_index_tab a {
+  font-size: 14px !important;
+  display: inline-block;
+  margin-right: 45px;
+}
+
+.homework_index_taba {
+  color: #459be5 !important;
+}
+
+.relativemrt {
+  position: relative;
+  margin-top: 10px;
+  margin-right: -14px;
+}
+
+.borderEAEAEA {
+  border: 1px solid #EAEAEA;
+}
+
+.borderEAEAEA::-webkit-input-placeholder {
+  color: #9A9A9A;
+  font-size: 14px;
+}
+
+.borderEAEAEA:-moz-placeholder {
+  color: #9A9A9A;
+  font-size: 14px;
+}
+
+.borderEAEAEA::-moz-placeholder {
+  color: #9A9A9A;
+  font-size: 14px;
+}
+
+.borderEAEAEA:-ms-input-placeholder {
+  color: #9A9A9A;
+  font-size: 14px;
+}
 
 /*选择实训弹窗*/
-.shixuns_countfont{
-    color: #9A9A9A;
-    font-size:14px;
-    margin-left: 10px;
-}
-.shixuns_count{
-    color: #05101A;
-    font-size:14px;
-}
-#shixun_search_form_div{
-    margin-top: 20px;
-    margin-bottom: 20px !important;
-}
-.relativemrtnew{
-    margin-top: -3px;
+.shixuns_countfont {
+  color: #9A9A9A;
+  font-size: 14px;
+  margin-left: 10px;
 }
 
-#import_resource_div_list{
-    padding: 20px !important;
-    height: 260px !important;
-    max-height: 260px !important;
-    overflow-y:auto;
-}
-.newtask_popup_con{
-    padding: 15px 36px 36px 36px;
-}
-.zuoyebtn{
-    margin-right: 50px;
-    margin-left: 185px;
-    color: #FFF !important;
-}
-.newsedu-shuxunsearch{
-    top: -6px !important;
-    right: 10px !important;
-    position: absolute;
-}
-.shixuntaskname{
-    width:85px;
-    text-align: left !important;
-}
-.shixunstaskum{
-    width: 15px;
-    text-align: left !important;
-}
-.shixunstasktype{
-    text-align:left !important;
-}
-.shixuntasktitle{
-    text-align:left;
-    width: 280px;
-    color: #4C4C4C !important;
-    padding: 0px 0px 0px 5px;
-}
-.singlebtn{
-    margin-top: 25px;
-    margin-left: 196px;
-}
-.singlefrbtn{
-    margin-right: 40px;
-    color: #FFF !important;
-}
-.student_workcontent{
-    padding: 10px 30px 30px 30px;
+.shixuns_count {
+  color: #05101A;
+  font-size: 14px;
 }
 
-.newsinglebtn{
-    margin-top: 25px;
-    margin-right: 150px;
+#shixun_search_form_div {
+  margin-top: 20px;
+  margin-bottom: 20px !important;
 }
-.newsinglebtna{
-    margin-top: 25px;
-    margin-right: 130px;
+
+.relativemrtnew {
+  margin-top: -3px;
 }
-.newsinglebtnaTwo{
-    margin-top: 32px;
-    margin-right: 138px;
+
+#import_resource_div_list {
+  padding: 20px !important;
+  height: 260px !important;
+  max-height: 260px !important;
+  overflow-y: auto;
 }
-.singlepublishbtn{
-    padding-left: 17px;
-    padding-right: 15px;
+
+.newtask_popup_con {
+  padding: 15px 36px 36px 36px;
 }
-.singlepublishbtn{
-    padding-left: 17px;
-    padding-right: 15px;
+
+.zuoyebtn {
+  margin-right: 50px;
+  margin-left: 185px;
+  color: #FFF !important;
 }
-.tasklepublishbtn{
-    padding-left: 16px;
-    padding-right: 16px;
+
+.newsedu-shuxunsearch {
+  top: -6px !important;
+  right: 10px !important;
+  position: absolute;
 }
+
+.shixuntaskname {
+  width: 85px;
+  text-align: left !important;
+}
+
+.shixunstaskum {
+  width: 15px;
+  text-align: left !important;
+}
+
+.shixunstasktype {
+  text-align: left !important;
+}
+
+.shixuntasktitle {
+  text-align: left;
+  width: 280px;
+  color: #4C4C4C !important;
+  padding: 0px 0px 0px 5px;
+}
+
+.singlebtn {
+  margin-top: 25px;
+  margin-left: 196px;
+}
+
+.singlefrbtn {
+  margin-right: 40px;
+  color: #FFF !important;
+}
+
+.student_workcontent {
+  padding: 10px 30px 30px 30px;
+}
+
+.newsinglebtn {
+  margin-top: 25px;
+  margin-right: 150px;
+}
+
+.newsinglebtna {
+  margin-top: 25px;
+  margin-right: 130px;
+}
+
+.newsinglebtnaTwo {
+  margin-top: 32px;
+  margin-right: 138px;
+}
+
+.singlepublishbtn {
+  padding-left: 17px;
+  padding-right: 15px;
+}
+
+.singlepublishbtn {
+  padding-left: 17px;
+  padding-right: 15px;
+}
+
+.tasklepublishbtn {
+  padding-left: 16px;
+  padding-right: 16px;
+}
+
 .newsinglebtntwo {
-    margin-top: 25px;
-    margin-right: 75px;
-}
-.singlefrbtntwo{
-    margin-right: 40px;
-}
-.edu-pop-table-grey{
-    border: 1px solid transparent;
-    background: #F7FBFF;
-    max-height: 198px;
-    overflow-y: auto;
-    display: block;
-}
-.edu-pop-table-grey tr td{
-    border: 1px solid transparent;
-}
-.publish-btn{
-    background: #4CACFF !important;
-    width: 86px !important;
-    height: 28px !important;
-    line-height: 28px !important;
-    color: #FFF !important;
-    border:1px solid #4CACFF !important;
-    border-radius: 2px !important;
-    font-size:14px;
-    font-weight: 500 !important;
-}
-a.singlepublish{
-    background: #9A9A9A !important;
-    width: 86px !important;
-    height: 28px !important;
-    line-height: 28px !important;
-    border: 1px solid #9A9A9A !important;
-    color: #FFF !important;
-    border-radius: 2px !important;
-    font-size: 14px;
-    font-weight: 500;
-    text-align: center;
-}
-a.singlepublishtwo{
-    margin-right: 50px;
-    padding-right: 15px;
-    padding-left: 17px;
-}
-.publish-btntwo{
-    margin-right: 50px;
-    padding-right: 12px !important;
-    padding-left: 20px !important;
-}
-.studentcontent{
-    color: #05101A !important;
-    font-size: 16px;
-}
-.class-containersdu{
-    color: #989898 !important;
-}
-.class-containersdu a{
-    color: #989898 !important;
-}
-.user_bg_shadowfont{
-    color: #333333 !important;
-    max-width: 300px;
-    height: 26px;
-    line-height: 26px !important;
-    font-size: 18px;
-    font-family: MicrosoftYaHei;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-.homework_top_conton{
-    height: 40px !important;
-    padding-top: 26px;
-}
-.newgreengreenBtn{
-    margin-top: 2px;
-}
-.newgreendetails{
-    margin-top: 2px;
-}
-.goTraining_deta{
-    margin-top: -2px;
-    color:#999999;
+  margin-top: 25px;
+  margin-right: 75px;
 }
 
-.background-newBlue{
-    width:118px !important;
-    height:48px !important;
-    border:1px solid #4CACFF !important;
-    border-radius: 24px !important;
-}
-.background-newBlue a{
-    color: #4CACFF !important;
+.singlefrbtntwo {
+  margin-right: 40px;
 }
 
-.edu-tab-navhomework{
-    height: 80px !important;
-    padding-top: 38px;
+.edu-pop-table-grey {
+  border: 1px solid transparent;
+  background: #F7FBFF;
+  max-height: 198px;
+  overflow-y: auto;
+  display: block;
 }
-.newhomework_info_list tr td{
-    border:1px solid transparent;
+
+.edu-pop-table-grey tr td {
+  border: 1px solid transparent;
 }
-.newhomework_info_list.hover-td_1 tbody tr:hover{
-    background: transparent;
+
+.publish-btn {
+  background: #4CACFF !important;
+  width: 86px !important;
+  height: 28px !important;
+  line-height: 28px !important;
+  color: #FFF !important;
+  border: 1px solid #4CACFF !important;
+  border-radius: 2px !important;
+  font-size: 14px;
+  font-weight: 500 !important;
 }
-.short_note_but{
-    width: 80px;
-    height: 27px;
-    border: 1px solid #CCC;
-    text-align: center;
-    line-height: 27px;
-    cursor:pointer;
+
+a.singlepublish {
+  background: #9A9A9A !important;
+  width: 86px !important;
+  height: 28px !important;
+  line-height: 28px !important;
+  border: 1px solid #9A9A9A !important;
+  color: #FFF !important;
+  border-radius: 2px !important;
+  font-size: 14px;
+  font-weight: 500;
+  text-align: center;
 }
-.short_note_but:hover{
-    background: #F3F3F3;
+
+a.singlepublishtwo {
+  margin-right: 50px;
+  padding-right: 15px;
+  padding-left: 17px;
 }
-#newhomework_list{
-    width: 100%;
-    height: 30px;
-    margin-top: 10px;
+
+.publish-btntwo {
+  margin-right: 50px;
+  padding-right: 12px !important;
+  padding-left: 20px !important;
 }
-.navdefaultsetting{
-    width: 118px !important;
-    height: 48px !important;
-    border: 1px solid transparent;
-    border-radius: 24px !important;
+
+.studentcontent {
+  color: #05101A !important;
+  font-size: 16px;
 }
-.newpadding40{
-    padding: 40px !important;
+
+.class-containersdu {
+  color: #989898 !important;
 }
-.editormd-html-preview{
-    width: 100% !important;
-    color: #323232 !important;
+
+.class-containersdu a {
+  color: #989898 !important;
 }
-#homework_editorMd_description hr{
-    border: 1px solid transparent;
+
+.user_bg_shadowfont {
+  color: #333333 !important;
+  max-width: 300px;
+  height: 26px;
+  line-height: 26px !important;
+  font-size: 18px;
+  font-family: MicrosoftYaHei;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
-#homework_explanation_div{
-    padding: 5px 60px !important;
+
+.homework_top_conton {
+  height: 40px !important;
+  padding-top: 26px;
 }
-.jobDescription{
-    color: #29BD8B;
-    font-size: 16px !important;
-    font-weight: 500;
+
+.newgreengreenBtn {
+  margin-top: 2px;
 }
-.newBorder_info_listtwo:hover{
-    color:#FFF !important;
+
+.newgreendetails {
+  margin-top: 2px;
 }
-.newnoteDetailPoint{
-    width: 100px;
-    height: 70px;
-    background-color: #4cacff;
-    border-radius: 35px;
-    color: #fff;
-    text-align: center;
-    margin: 0 auto;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    padding: 2px 0;
-    cursor: pointer;
-    line-height: 22px;
-    padding-top: 12px;
+
+.goTraining_deta {
+  margin-top: -2px;
+  color: #999999;
 }
-.newCommentItem{
-    height: 112px;
-    border-bottom: 1px solid transparent;
+
+.background-newBlue {
+  width: 118px !important;
+  height: 48px !important;
+  border: 1px solid #4CACFF !important;
+  border-radius: 24px !important;
 }
-.comment_reply_box{
-    margin-top: 20px;
+
+.background-newBlue a {
+  color: #4CACFF !important;
 }
-.panel-mes-headbox{
-    padding: 10px;
+
+.edu-tab-navhomework {
+  height: 80px !important;
+  padding-top: 38px;
 }
-.colorCCC{
-    color: #CCCCCC !important;
+
+.newhomework_info_list tr td {
+  border: 1px solid transparent;
 }
-.panelHeaddiv{
-    padding-left: 30px;
+
+.newhomework_info_list.hover-td_1 tbody tr:hover {
+  background: transparent;
 }
-.newpanel-comment_item{
-    width: 94%;
-    padding: 0px 0px 0px 30px;
-    margin-bottom: 20px;
+
+.short_note_but {
+  width: 80px;
+  height: 27px;
+  border: 1px solid #CCC;
+  text-align: center;
+  line-height: 27px;
+  cursor: pointer;
 }
-.mt4{
-    margin-top:4px;
+
+.short_note_but:hover {
+  background: #F3F3F3;
 }
-.panel-comment_itemorig_cont{
-    border: solid 1px transparent !important;
-    background: #EBEBEB !important;
-    padding: 0px !important;
-    color: #999 !important;
+
+#newhomework_list {
+  width: 100%;
+  height: 30px;
+  margin-top: 10px;
 }
-.orig_ClearfixBox{
-    padding: 0px !important;
+
+.navdefaultsetting {
+  width: 118px !important;
+  height: 48px !important;
+  border: 1px solid transparent;
+  border-radius: 24px !important;
 }
-.ptl8{
-    padding-left: 8px;
+
+.newpadding40 {
+  padding: 40px !important;
+}
+
+.editormd-html-preview {
+  width: 100% !important;
+  color: #323232 !important;
+}
+
+#homework_editorMd_description hr {
+  border: 1px solid transparent;
+}
+
+#homework_explanation_div {
+  padding: 5px 60px !important;
+}
+
+.jobDescription {
+  color: #29BD8B;
+  font-size: 16px !important;
+  font-weight: 500;
+}
+
+.newBorder_info_listtwo:hover {
+  color: #FFF !important;
+}
+
+.newnoteDetailPoint {
+  width: 100px;
+  height: 70px;
+  background-color: #4cacff;
+  border-radius: 35px;
+  color: #fff;
+  text-align: center;
+  margin: 0 auto;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 2px 0;
+  cursor: pointer;
+  line-height: 22px;
+  padding-top: 12px;
+}
+
+.newCommentItem {
+  height: 112px;
+  border-bottom: 1px solid transparent;
+}
+
+.comment_reply_box {
+  margin-top: 20px;
+}
+
+.panel-mes-headbox {
+  padding: 10px;
+}
+
+.colorCCC {
+  color: #CCCCCC !important;
+}
+
+.panelHeaddiv {
+  padding-left: 30px;
+}
+
+.newpanel-comment_item {
+  width: 94%;
+  padding: 0px 0px 0px 30px;
+  margin-bottom: 20px;
+}
+
+.mt4 {
+  margin-top: 4px;
+}
+
+.panel-comment_itemorig_cont {
+  border: solid 1px transparent !important;
+  background: #EBEBEB !important;
+  padding: 0px !important;
+  color: #999 !important;
+}
+
+.orig_ClearfixBox {
+  padding: 0px !important;
+}
+
+.ptl8 {
+  padding-left: 8px;
 }
 
 
 /*毕业设计*/
-#selectionSubject p{margin: 0px 30px;height: 56px;line-height: 56px;border-bottom:1px solid #ebebeb;display: flex;}
-#selectionSubject p:first-child{background-color: #F5F5F5;text-align: center;border-bottom: none;color: #666666;padding: 0px 30px;margin: 0px!important;}
-#selectionSubject p span{min-width: 80px;float: left;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;padding: 0px 5px;box-sizing: border-box;text-align: center;color: #989898}
-#selectionSubject p span.s-w{width:130px;}
-#selectionSubject p span.m-w{width:170px;}
-#selectionSubject p span.l-w{width:240px;}
+#selectionSubject p {
+  margin: 0px 30px;
+  height: 56px;
+  line-height: 56px;
+  border-bottom: 1px solid #ebebeb;
+  display: flex;
+}
+
+#selectionSubject p:first-child {
+  background-color: #F5F5F5;
+  text-align: center;
+  border-bottom: none;
+  color: #666666;
+  padding: 0px 30px;
+  margin: 0px !important;
+}
+
+#selectionSubject p span {
+  min-width: 80px;
+  float: left;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  padding: 0px 5px;
+  box-sizing: border-box;
+  text-align: center;
+  color: #989898
+}
+
+#selectionSubject p span.s-w {
+  width: 130px;
+}
+
+#selectionSubject p span.m-w {
+  width: 170px;
+}
+
+#selectionSubject p span.l-w {
+  width: 240px;
+}
 
 
 /*----------------------------超级管理员------------------------------------*/
-.NotCountUrl{display: inline-block;height: 22px;text-align: center;width: 22px;line-height: 22px;color: #fff;background-color: #666;border-radius: 4px;}
-.havaCountUrl{background-color: #91D5FF;display: inline-block;height: 22px;text-align: center;width: 22px;line-height: 22px;border-radius: 4px;color: #2B9AFD!important;}
-.manageName{display: inline-block;height: 22px;line-height: 22px;padding: 0px 5px;border:1px solid #91D5FF;background-color: #E6F7FF;color: #91D5FF;border-radius: 4px;margin-top: 5px;}
-/*工程认证*/
-.ManagerFindPanel{width: 260px;height: 34px;}
-.ManagerFindPanel > input{width: 100%;border:1px solid #eee;padding: 0px 25px 0px 5px;outline: none;box-sizing: border-box;height: 34px;line-height: 34px;}
-.ManagerFindPanel > i{position: absolute;right: 5px;top:0px;color: #eee;}
+.NotCountUrl {
+  display: inline-block;
+  height: 22px;
+  text-align: center;
+  width: 22px;
+  line-height: 22px;
+  color: #fff;
+  background-color: #666;
+  border-radius: 4px;
+}
+
+.havaCountUrl {
+  background-color: #91D5FF;
+  display: inline-block;
+  height: 22px;
+  text-align: center;
+  width: 22px;
+  line-height: 22px;
+  border-radius: 4px;
+  color: #2B9AFD !important;
+}
+
+.manageName {
+  display: inline-block;
+  height: 22px;
+  line-height: 22px;
+  padding: 0px 5px;
+  border: 1px solid #91D5FF;
+  background-color: #E6F7FF;
+  color: #91D5FF;
+  border-radius: 4px;
+  margin-top: 5px;
+}
+
+/*工程认证*/
+.ManagerFindPanel {
+  width: 260px;
+  height: 34px;
+}
+
+.ManagerFindPanel>input {
+  width: 100%;
+  border: 1px solid #eee;
+  padding: 0px 25px 0px 5px;
+  outline: none;
+  box-sizing: border-box;
+  height: 34px;
+  line-height: 34px;
+}
+
+.ManagerFindPanel>i {
+  position: absolute;
+  right: 5px;
+  top: 0px;
+  color: #eee;
+}
+
+.majorItem {
+  margin-bottom: 10px;
+}
+
+.majorItem-line {
+  height: 40px;
+  line-height: 40px;
+  background-color: #f5f5f5;
+  font-size: 14px;
+  padding: 0px 10px;
+  cursor: pointer;
+  color: #666;
+}
+
+.collegeManage {
+  float: left;
+  padding: 0px 8px;
+  border-radius: 6px;
+  background-color: #f5f5f5;
+  margin: 3px 0px 3px 10px;
+  height: 34px;
+  line-height: 34px;
+}
 
-.majorItem{margin-bottom: 10px;}
-.majorItem-line{height: 40px;line-height: 40px;background-color: #f5f5f5;font-size: 14px;padding: 0px 10px;cursor: pointer;color: #666;}
-.collegeManage{float: left;padding: 0px 8px;border-radius: 6px;background-color: #f5f5f5;margin: 3px 0px 3px 10px;height: 34px;line-height: 34px;}
 /*合作伙伴*/
-.edu-cooperation li{height: 60px;width: 210px;padding: 10px 0px;margin-left: 20px;float: left;margin-bottom: 20px;text-align: center;line-height: 40px;box-sizing: border-box}
-.edu-cooperation li img{height: 40px;width: 210px;}
+.edu-cooperation li {
+  height: 60px;
+  width: 210px;
+  padding: 10px 0px;
+  margin-left: 20px;
+  float: left;
+  margin-bottom: 20px;
+  text-align: center;
+  line-height: 40px;
+  box-sizing: border-box
+}
+
+.edu-cooperation li img {
+  height: 40px;
+  width: 210px;
+}
 
 
 /* 兼容（小屏幕）手机浏览器 */
-.newHeader , .newMain , .newFooter  {
-    max-width: unset;
+.newHeader,
+.newMain,
+.newFooter {
+  max-width: unset;
 }
-.educontentTop{
-    width: 1178px !important;
+
+.educontentTop {
+  width: 1178px !important;
 }
+
 .inner-footer_con {
-    width: auto;
+  width: auto;
 }
 
-.competition_img{width: 120px; height: 90px;}
+.competition_img {
+  width: 120px;
+  height: 90px;
+}
 
-.careershover{
-    margin-right:30px !important;
+.careershover {
+  margin-right: 30px !important;
 }
-.careershover ul li a{
-    color:#000 !important;
+
+.careershover ul li a {
+  color: #000 !important;
 }
-.careershover ul li{
-    height: 35px !important;
-    line-height: 35px !important;
+
+.careershover ul li {
+  height: 35px !important;
+  line-height: 35px !important;
 }
-.edu-menu-listnew{
-    width: 165px !important;
-    top: 60px;
-    left: -42px;
+
+.edu-menu-listnew {
+  width: 165px !important;
+  top: 60px;
+  left: -42px;
 }
-.edu-menu-listnew li a{
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    color:#000 !important;
+
+.edu-menu-listnew li a {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: #000 !important;
 }
-.edu-menu-listnew li a:hover{
-    color:#fff !important;
+
+.edu-menu-listnew li a:hover {
+  color: #fff !important;
 }
 
 
 /*工程认证*/
 /*首页*/
-.authMainImg{width: 100%;height: 240px;background:url("/images/educoder/auth/banner1.jpg") no-repeat top center;background-size: 100% 100%;justify-content: center;align-items: center;display: -webkit-flex;}
-.ListTableLine>p,.ListTableLine>.ListTableTitle{margin-bottom: 0px;padding: 0px 30px;background-color: #F5F5F5;line-height: 40px;height: 56px;padding-top: 8px;box-sizing: border-box;}
-.ListTableLine>p span,.ListTableTitle span{float: left;color: #666;box-sizing: border-box}
-.ListTableLine li{min-height: 48px;padding: 10px 0px;box-sizing: border-box;margin:0px 30px;border-bottom: 1px solid #eaeaea;}
-.ListTableLine li>span{float: left;box-sizing: border-box;}
+.authMainImg {
+  width: 100%;
+  height: 240px;
+  background: url("/images/educoder/auth/banner1.jpg") no-repeat top center;
+  background-size: 100% 100%;
+  justify-content: center;
+  align-items: center;
+  display: -webkit-flex;
+}
 
-.ListTableLine.disInline > .ListTableTitle,.ListTableLine.disInline li{line-height: 20px;min-height: 56px;}
-.ListTableLine .column-1{width: 100px;text-align: left;padding-left: 5px;box-sizing: border-box}
-.ListTableLine .column-1{width: 100px;text-align: left;padding-left: 5px;box-sizing: border-box}
+.ListTableLine>p,
+.ListTableLine>.ListTableTitle {
+  margin-bottom: 0px;
+  padding: 0px 30px;
+  background-color: #F5F5F5;
+  line-height: 40px;
+  height: 56px;
+  padding-top: 8px;
+  box-sizing: border-box;
+}
 
-.ListTableLine .column-2{width: 180px;text-align: center;padding-left: 5px;box-sizing: border-box}
-.ListTableLine .column-3{width: 330px;text-align: left;padding-left: 5px;box-sizing: border-box}
-.ListTableLine .column-4{width: 400px;text-align: left;padding-left: 5px;box-sizing: border-box}
-.ListTableLine .column-5{width: 120px;text-align: center;padding-left: 5px;float: right;box-sizing: border-box}
-.ListTableLine .column-6{width: 130px;padding-left: 5px;box-sizing: border-box;text-align: center;}
-.ListTableLine .column-7{width: 200px;text-align: center;padding-left: 5px;box-sizing: border-box}
+.ListTableLine>p span,
+.ListTableTitle span {
+  float: left;
+  color: #666;
+  box-sizing: border-box
+}
+
+.ListTableLine li {
+  min-height: 48px;
+  padding: 10px 0px;
+  box-sizing: border-box;
+  margin: 0px 30px;
+  border-bottom: 1px solid #eaeaea;
+}
+
+.ListTableLine li>span {
+  float: left;
+  box-sizing: border-box;
+}
+
+.ListTableLine.disInline>.ListTableTitle,
+.ListTableLine.disInline li {
+  line-height: 20px;
+  min-height: 56px;
+}
+
+.ListTableLine .column-1 {
+  width: 100px;
+  text-align: left;
+  padding-left: 5px;
+  box-sizing: border-box
+}
+
+.ListTableLine .column-1 {
+  width: 100px;
+  text-align: left;
+  padding-left: 5px;
+  box-sizing: border-box
+}
+
+.ListTableLine .column-2 {
+  width: 180px;
+  text-align: center;
+  padding-left: 5px;
+  box-sizing: border-box
+}
+
+.ListTableLine .column-3 {
+  width: 330px;
+  text-align: left;
+  padding-left: 5px;
+  box-sizing: border-box
+}
+
+.ListTableLine .column-4 {
+  width: 400px;
+  text-align: left;
+  padding-left: 5px;
+  box-sizing: border-box
+}
+
+.ListTableLine .column-5 {
+  width: 120px;
+  text-align: center;
+  padding-left: 5px;
+  float: right;
+  box-sizing: border-box
+}
+
+.ListTableLine .column-6 {
+  width: 130px;
+  padding-left: 5px;
+  box-sizing: border-box;
+  text-align: center;
+}
+
+.ListTableLine .column-7 {
+  width: 200px;
+  text-align: center;
+  padding-left: 5px;
+  box-sizing: border-box
+}
 
 /*具体学年*/
-.MajorName{display: inline-block;position: relative;padding: 0px 5px;height: 28px;line-height: 28px;background-color: #ebebeb;border-radius: 14px;color:#323232;margin:0px 3px 5px 3px;}
-.MajorColumn{max-width: 362px;}
-.MajorName > i{position: absolute;top:-11px;right:-5px;color: #CBCBCB;cursor: pointer;}
-.MajorName > i:hover{color: #4CACFF}
+.MajorName {
+  display: inline-block;
+  position: relative;
+  padding: 0px 5px;
+  height: 28px;
+  line-height: 28px;
+  background-color: #ebebeb;
+  border-radius: 14px;
+  color: #323232;
+  margin: 0px 3px 5px 3px;
+}
+
+.MajorColumn {
+  max-width: 362px;
+}
+
+.MajorName>i {
+  position: absolute;
+  top: -11px;
+  right: -5px;
+  color: #CBCBCB;
+  cursor: pointer;
+}
+
+.MajorName>i:hover {
+  color: #4CACFF
+}
+
 /*培养目标*/
-#traningNav{padding:30px 30px 0px 0px;}
-#traningNav>li{float: left;padding:0px 30px 30px 30px;font-size: 16px;}
-#traningNav>li>a,#traningNav li>i{color: #666!important;position: relative}
-#traningNav>li.active > a,#traningNav li.active > i{color: #05101A!important;}
-#traningNav>li.active > a:after{content: '';position: absolute;width: 64px;left: 50%;margin-left: -32px;height: 2px;background-color: #05101A;bottom: -35px;}
+#traningNav {
+  padding: 30px 30px 0px 0px;
+}
+
+#traningNav>li {
+  float: left;
+  padding: 0px 30px 30px 30px;
+  font-size: 16px;
+}
+
+#traningNav>li>a,
+#traningNav li>i {
+  color: #666 !important;
+  position: relative
+}
+
+#traningNav>li.active>a,
+#traningNav li.active>i {
+  color: #05101A !important;
+}
+
+#traningNav>li.active>a:after {
+  content: '';
+  position: absolute;
+  width: 64px;
+  left: 50%;
+  margin-left: -32px;
+  height: 2px;
+  background-color: #05101A;
+  bottom: -35px;
+}
+
 /*毕业要求VS培养目标*/
-.sustain{display: inline-block;width: 14px;height: 14px;background-color: #29BD8B;border-radius: 50%;}
-.gaugeOutfit{position: relative;height: 70px;width: 120px;background:linear-gradient(30deg,transparent 49.5%,#eee 50%,#eee 50%,transparent 50.5%);}
-.gaugeOutfit span:first-child{position: absolute;left: 8px;top: 46px;}
-.gaugeOutfit span:last-child{position: absolute;right: 8px;top: 14px;}
-.sustainLine td:not(:first-child):hover{background-color:rgba(41,189,139,0.1);cursor: pointer}
+.sustain {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  background-color: #29BD8B;
+  border-radius: 50%;
+}
+
+.gaugeOutfit {
+  position: relative;
+  height: 70px;
+  width: 120px;
+  background: linear-gradient(30deg, transparent 49.5%, #eee 50%, #eee 50%, transparent 50.5%);
+}
+
+.gaugeOutfit span:first-child {
+  position: absolute;
+  left: 8px;
+  top: 46px;
+}
+
+.gaugeOutfit span:last-child {
+  position: absolute;
+  right: 8px;
+  top: 14px;
+}
+
+.sustainLine td:not(:first-child):hover {
+  background-color: rgba(41, 189, 139, 0.1);
+  cursor: pointer
+}
+
 /*毕业要求VS课程体系*/
-.tableScroll{width: auto;white-space:nowrap;min-width: 100%;}
+.tableScroll {
+  width: auto;
+  white-space: nowrap;
+  min-width: 100%;
+}
+
 /*课程目标VS毕业要求指标点*/
-.CourseTargetPoint thead th{vertical-align: baseline;}
-.CourseTargetPoint tbody tr td{vertical-align: top;}
+.CourseTargetPoint thead th {
+  vertical-align: baseline;
+}
+
+.CourseTargetPoint tbody tr td {
+  vertical-align: top;
+}
 
 
 /*众包*/
 
-.packinput .ant-input{
-    height: 50px;
-    width:749px;
-    border-color: #E1EDF8 !important;
+.packinput .ant-input {
+  height: 50px;
+  width: 749px;
+  border-color: #E1EDF8 !important;
 }
 
-.packinput{
-    width:749px;
+.packinput {
+  width: 749px;
 }
 
 
-.packinput .ant-input-group-addon .ant-btn{
-    width:140px !important;
-    font-size: 18px;
-    height: 50px;
-    background:rgba(76,172,255,1);
+.packinput .ant-input-group-addon .ant-btn {
+  width: 140px !important;
+  font-size: 18px;
+  height: 50px;
+  background: rgba(76, 172, 255, 1);
 }
 
-.setissues{
-    width:280px;
-    height:50px;
-    background:rgba(76,172,255,1);
-    border-radius:4px;
-    margin-left: 15px;
+.setissues {
+  width: 280px;
+  height: 50px;
+  background: rgba(76, 172, 255, 1);
+  border-radius: 4px;
+  margin-left: 15px;
 }
 
-.pagetype li{
-    color:#8F8F8F !important;
+.pagetype li {
+  color: #8F8F8F !important;
 }
 
-.maxwidth700{
-    max-width: 700px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+.maxwidth700 {
+  max-width: 700px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
-.mbf10{
-    margin-bottom:-10px;
+.mbf10 {
+  margin-bottom: -10px;
 }
 
-.PackageIndexNEIBanner{
-    width:1200px;
-    height:110px;
-    background:rgba(255,255,255,1);
-    box-shadow:0px 2px 6px 0px rgba(125,125,125,0.26);
-    border-radius:8px;
+.PackageIndexNEIBanner {
+  width: 1200px;
+  height: 110px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 2px 6px 0px rgba(125, 125, 125, 0.26);
+  border-radius: 8px;
 }
 
-.padding110{
-    padding: 39px 110px 0px;
-    box-sizing: border-box;
+.padding110 {
+  padding: 39px 110px 0px;
+  box-sizing: border-box;
 }
 
-.borderccc{
-    border: 1px solid #ccc;
+.borderccc {
+  border: 1px solid #ccc;
 }
 
-.input-100-40s{
-    width: 100%;
-    padding: 5px;
-    box-sizing: border-box;
+.input-100-40s {
+  width: 100%;
+  padding: 5px;
+  box-sizing: border-box;
 }
 
-.fafafas{
-    background-color: #fafafa!important;
-    height: 40px;
+.fafafas {
+  background-color: #fafafa !important;
+  height: 40px;
 }
 
-.fafafas:focus{
-    background-color: #fff!important;
+.fafafas:focus {
+  background-color: #fff !important;
 }
 
-.fafas .ant-input{
-    background-color: #fafafa!important;
-    height: 40px;
+.fafas .ant-input {
+  background-color: #fafafa !important;
+  height: 40px;
 }
 
-.fafas .ant-input:focus{
-    background-color: #fff!important;
-}
-.fafas .ant-input-group-addon .ant-btn{
-    width:140px !important;
-    font-size: 14px;
-    height: 40px;
-    background:rgba(76,172,255,1);
+.fafas .ant-input:focus {
+  background-color: #fff !important;
 }
 
-.newFormbox .upload_filename{
-    line-height: 32px;
+.fafas .ant-input-group-addon .ant-btn {
+  width: 140px !important;
+  font-size: 14px;
+  height: 40px;
+  background: rgba(76, 172, 255, 1);
 }
 
-.newFormbox .attachment span{
-    line-height: 23px;
+.newFormbox .upload_filename {
+  line-height: 32px;
 }
 
-.newFormbox .attachment .remove-upload{
-    line-height: 28px;
+.newFormbox .attachment span {
+  line-height: 23px;
 }
 
-.pd26a0{
-    padding: 26px 26px 16px 26px;
+.newFormbox .attachment .remove-upload {
+  line-height: 28px;
 }
 
-.newFormbox .attachment .icon-fujian{
-    font-size: 14px !important;
-    line-height: 14px;
-    margin-top: 9px;
+.pd26a0 {
+  padding: 26px 26px 16px 26px;
 }
 
-.newFormbox{
-    height:20px
+.newFormbox .attachment .icon-fujian {
+  font-size: 14px !important;
+  line-height: 14px;
+  margin-top: 9px;
 }
 
-.ml24{
-    margin-left:24px;
+.newFormbox {
+  height: 20px
 }
 
-.defalutCancelbtns{
-    display: block;
-    border: 1px solid #4CACFF !important;
-    background-color: #fff;
-    color: #4CACFF !important;
-    width:130px;
-    height:40px;
-    text-align: center;
-    line-height: 40px;
-    border-radius: 4px;
+.ml24 {
+  margin-left: 24px;
 }
 
-.defalutSubmitbtns{
-    background-color: #4CACFF;
-    height:40px;
+.defalutCancelbtns {
+  display: block;
+  border: 1px solid #4CACFF !important;
+  background-color: #fff;
+  color: #4CACFF !important;
+  width: 130px;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  border-radius: 4px;
 }
 
-.defalutSubmitbtnmodels{
-    width:127px;
-    height:30px;
-    background-color: #4CACFF;
+.defalutSubmitbtns {
+  background-color: #4CACFF;
+  height: 40px;
 }
 
-.ant-steps-item-process .ant-steps-item-icon{
-    background-color: #4CACFF !important;
+.defalutSubmitbtnmodels {
+  width: 127px;
+  height: 30px;
+  background-color: #4CACFF;
 }
 
-.ant-steps-item-process .ant-steps-item-icon{
-    background-color: #4CACFF !important;
+.ant-steps-item-process .ant-steps-item-icon {
+  background-color: #4CACFF !important;
 }
 
-.padding200{
-    padding: 115px 200px 215px 200px;
+.ant-steps-item-process .ant-steps-item-icon {
+  background-color: #4CACFF !important;
 }
 
-.fontcircle{
-    font-size: 80px;
-    display: inherit;
+.padding200 {
+  padding: 115px 200px 215px 200px;
 }
 
-.sumbtongs{
-    font-size: 24px;
-    display: inherit;
-    text-align: center;
+.fontcircle {
+  font-size: 80px;
+  display: inherit;
 }
 
-.terraces{
-    font-size: 16px;
-    display: inherit;
-    text-align: center;
-    color:#999;
-}
-.padding251{
-    padding: 0px 245px;
+.sumbtongs {
+  font-size: 24px;
+  display: inherit;
+  text-align: center;
 }
 
-.ant-modal-title{
-    text-align: center;
-}
-.ml17{
-    margin-left: 17px;
+.terraces {
+  font-size: 16px;
+  display: inherit;
+  text-align: center;
+  color: #999;
 }
 
-.project-package-items{
-    display: -webkit-flex;
-    display: flex;
-    flex-direction: row;
-    margin:0px !important;
-    padding: 20px;
-    background: white;
-    margin-bottom:0px !important;
-    box-shadow: none  !important;
+.padding251 {
+  padding: 0px 245px;
 }
 
-.mtf7{
-    margin-top:-7px;
+.ant-modal-title {
+  text-align: center;
+}
+
+.ml17 {
+  margin-left: 17px;
+}
+
+.project-package-items {
+  display: -webkit-flex;
+  display: flex;
+  flex-direction: row;
+  margin: 0px !important;
+  padding: 20px;
+  background: white;
+  margin-bottom: 0px !important;
+  box-shadow: none !important;
+}
+
+.mtf7 {
+  margin-top: -7px;
 }
 
 .publicpart.orangeGreen {
-    border-left: 80px solid #29BD8B;
+  border-left: 80px solid #29BD8B;
 }
 
-.publicwords{
-    left: 3px;
-    top: 18px;
+.publicwords {
+  left: 3px;
+  top: 18px;
 }
 
-.project-packages-list .project-package-items .item-image{
-    width:100px !important;
+.project-packages-list .project-package-items .item-image {
+  width: 100px !important;
 }
 
-.height185{
-    height: 185px;
+.height185 {
+  height: 185px;
 }
 
-.ContacttheTA{
-    width: 80px;
-    height: 26px;
-    font-size: 14px;
-    line-height: 26px;
-    display: block;
-    border: 1px solid #4CACFF !important;
-    background-color: #fff;
-    color: #4CACFF !important;
-    text-align: center;
-    border-radius: 4px;
-}
-.ContacttheTAs{
-    width: 80px;
-    height: 26px;
-    font-size: 14px;
-    line-height: 24px;
-    /*display: block;*/
-    border: 1px solid #fff !important;
-    background-color: #4CACFF;
-    color: #fff !important;
-    text-align: center;
-    border-radius: 4px;
-}
-.ml28{
-    margin-left: 28px;
+.ContacttheTA {
+  width: 80px;
+  height: 26px;
+  font-size: 14px;
+  line-height: 26px;
+  display: block;
+  border: 1px solid #4CACFF !important;
+  background-color: #fff;
+  color: #4CACFF !important;
+  text-align: center;
+  border-radius: 4px;
 }
 
-.longboxs{
-    font-size: 16px;
-    font-family: MicrosoftYaHei-Bold;
-    font-weight: bold;
-    color: rgba(5,16,26,1);
-    border-left: 4px solid rgba(76,172,255,1);
-    padding-left: 10px;
-    margin-bottom: 20px;
+.ContacttheTAs {
+  width: 80px;
+  height: 26px;
+  font-size: 14px;
+  line-height: 24px;
+  /*display: block;*/
+  border: 1px solid #fff !important;
+  background-color: #4CACFF;
+  color: #fff !important;
+  text-align: center;
+  border-radius: 4px;
 }
 
-.padding020{
-    padding: 0px 20px 20px;
+.ml28 {
+  margin-left: 28px;
 }
 
-.mtf3{
-    margin-top:-3px;
+.longboxs {
+  font-size: 16px;
+  font-family: MicrosoftYaHei-Bold;
+  font-weight: bold;
+  color: rgba(5, 16, 26, 1);
+  border-left: 4px solid rgba(76, 172, 255, 1);
+  padding-left: 10px;
+  margin-bottom: 20px;
 }
 
-.task-btn-nebules{
-    background: #fff!important;
-    color: #4CACFF!important;
-    border: 1px solid #4CACFF!important;
-    margin-left: 20px;
-    cursor: pointer;
-    display: inline-block;
-    padding: 0 12px;
-    letter-spacing: 1px;
-    text-align: center;
-    font-size: 14px;
-    height: 30px;
-    line-height: 30px;
-    border-radius: 2px;
+.padding020 {
+  padding: 0px 20px 20px;
 }
 
-.packageabsolute{
-    position: absolute;
-    right: -16px;
-    top: -7px;
-}
-.relativef{
-    position: relative;
+.mtf3 {
+  margin-top: -3px;
 }
 
-.homehove:hover .ptext{
-    color: #4CACFF!important;
+.task-btn-nebules {
+  background: #fff !important;
+  color: #4CACFF !important;
+  border: 1px solid #4CACFF !important;
+  margin-left: 20px;
+  cursor: pointer;
+  display: inline-block;
+  padding: 0 12px;
+  letter-spacing: 1px;
+  text-align: center;
+  font-size: 14px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 2px;
 }
 
-.homehove:hover .ContacttheTAs{
-    display: block;
+.packageabsolute {
+  position: absolute;
+  right: -16px;
+  top: -7px;
 }
 
-.topsj{
-    position: absolute;
-    top: -6px;
-}
-.bottomsj{
-    position: absolute;
-    bottom: -6px;
-}
-.touchSelect .ant-spin-dot-spin{
-    margin-top: 30% !important;
+.relativef {
+  position: relative;
 }
 
-.pagenoedits{
-    margin-left: 20px;
-    color: #ccc;
+.homehove:hover .ptext {
+  color: #4CACFF !important;
 }
 
-.pagemancenter{
-    text-align: center;
+.homehove:hover .ContacttheTAs {
+  display: block;
 }
 
-.ml0{
-    margin-left: 0px;
-}
-.tabelcli{
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    max-width: 850px;
-    display: table-cell;
+.topsj {
+  position: absolute;
+  top: -6px;
 }
 
-.mtf10{
-    margin-top:-10px;
+.bottomsj {
+  position: absolute;
+  bottom: -6px;
 }
 
-.padding26{
-    padding: 26px;
-    box-sizing: border-box;
+.touchSelect .ant-spin-dot-spin {
+  margin-top: 30% !important;
 }
 
-.pd26{
-    padding: 26px;
-}
-.pd30a0{
-    padding: 30px 30px 16px 30px;
+.pagenoedits {
+  margin-left: 20px;
+  color: #ccc;
 }
 
-.shaiContent li.shaiItem:hover span{
-    color: #fff !important;
+.pagemancenter {
+  text-align: center;
 }
 
-.shaiContent li.shaiItem:hover i.iconfont{
-    color: #4CACFF!important
+.ml0 {
+  margin-left: 0px;
 }
 
-.detail_for_paragraph p{
-    white-space: pre-wrap;
+.tabelcli {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 850px;
+  display: table-cell;
 }
 
-.ant-tooltip{
-    max-width: 100% !important;
+.mtf10 {
+  margin-top: -10px;
 }
 
-.square-main p{
-    margin-bottom: 0 !important;
+.padding26 {
+  padding: 26px;
+  box-sizing: border-box;
+}
+
+.pd26 {
+  padding: 26px;
+}
+
+.pd30a0 {
+  padding: 30px 30px 16px 30px;
+}
+
+.shaiContent li.shaiItem:hover span {
+  color: #fff !important;
+}
+
+.shaiContent li.shaiItem:hover i.iconfont {
+  color: #4CACFF !important
+}
+
+.detail_for_paragraph p {
+  white-space: pre-wrap;
+}
+
+.ant-tooltip {
+  max-width: 100% !important;
+}
+
+.square-main p {
+  margin-bottom: 0 !important;
 }
 
 
 
 
 .markdown-body {
-    text-align: justify;
-    word-break: break-all;
+  text-align: justify;
+  word-break: break-all;
 }
 
-.RightPaneDrawer .ant-drawer-content{
-    background: #070f1a;
-    overflow: hidden !important;
+.RightPaneDrawer .ant-drawer-content {
+  background: #070f1a;
+  overflow: hidden !important;
 }
 
-.deletebuttom{
-    border: transparent;
+.deletebuttom {
+  border: transparent;
 }
 
-.RightPaneDrawer .jupyter_data_list{
-    max-height: 340px;
+.RightPaneDrawer .jupyter_data_list {
+  max-height: 340px;
 }
 
-.ant-btn-primary{
-    text-shadow: none !important;
-    box-shadow: none !important;
+.ant-btn-primary {
+  text-shadow: none !important;
+  box-shadow: none !important;
 }
 
-.ant-notification{
-    z-index: 10001 !important;
+.ant-notification {
+  z-index: 10001 !important;
 }
\ No newline at end of file
diff --git a/public/css/edu-common.css b/public/css/edu-common.css
new file mode 100755
index 00000000..96a8277d
--- /dev/null
+++ b/public/css/edu-common.css
@@ -0,0 +1,3519 @@
+body {
+  font-size: 14px;
+  line-height: 2.0;
+  background: #ffffff !important;
+  font-family: "微软雅黑", "宋体";
+  color: #333;
+  height: 100%
+}
+
+html {
+  height: 100%;
+}
+
+.newContainer {
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
+  /*IE6不识别min-height*/
+  position: relative;
+}
+
+.newMain {
+  margin: 0 auto;
+  padding-bottom: 155px;
+  min-width: 1200px
+}
+
+.newFooter {
+  max-height: 110px;
+}
+
+.newFooter {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background: #323232;
+  clear: both;
+  min-width: 1200px;
+  z-index: 99999;
+  left: 0px;
+}
+
+.newHeader {
+  background: #171616;
+  width: 100%;
+  height: 50px;
+  min-width: 1200px;
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  z-index: 99998
+}
+
+/* 重置样式 */
+body,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+hr,
+p,
+blockquote,
+dl,
+dt,
+dd,
+ul,
+ol,
+li,
+pre,
+form,
+fieldset,
+legend,
+button,
+input,
+textarea,
+th,
+td,
+span {
+  margin: 0;
+  padding: 0;
+}
+
+table,
+input,
+textarea,
+select,
+button {
+  font-family: "微软雅黑", "宋体";
+  font-size: 14px;
+  line-height: 1.9;
+  background: #f5f5f5;
+  color: #333;
+}
+
+div,
+img,
+tr,
+td,
+table {
+  border: 0;
+}
+
+table,
+tr,
+td {
+  border: 0;
+}
+
+a:link,
+a:visited {
+  text-decoration: none;
+  color: #898989;
+}
+
+a:hover {
+  color: #FF7500;
+}
+
+a:hover.fa {
+  color: #FF7500;
+}
+
+input,
+textarea,
+select {
+  background: #fff;
+  border: 1px solid #eee;
+}
+
+textarea {
+  resize: none;
+}
+
+/*侧滚动条*/
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+  background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar-thumb {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+  background-color: #ccc;
+}
+
+/*万能清除浮动*/
+.clearfix:after {
+  clear: both;
+  content: ".";
+  display: block;
+  font-size: 0;
+  height: 0;
+  line-height: 0;
+  visibility: hidden;
+}
+
+.clearfix {
+  clear: both;
+  zoom: 1
+}
+
+.cl {
+  clear: both;
+  overflow: hidden;
+}
+
+/*通用浮动*/
+.fl {
+  float: left;
+}
+
+.fr {
+  float: right;
+}
+
+/*pre标签换行*/
+.break-word {
+  word-break: break-all;
+  word-wrap: break-word;
+}
+
+.break-word-firefox {
+  white-space: pre-wrap !important;
+  word-break: break-all;
+}
+
+/*超过隐藏*/
+.task-hide {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.task-hide2 {
+  overflow: -moz-hidden-unscrollable;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.hide {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.hide-text {
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+/*隐藏*/
+.none {
+  display: none
+}
+
+.block {
+  display: block;
+}
+
+/*通用文字功能样式*/
+.font-bd {
+  font-weight: bold;
+}
+
+.color-red-light {
+  color: #F00 !important;
+}
+
+.color-red {
+  color: #d2322d !important;
+}
+
+.u-color-light-red {
+  color: #FF6666
+}
+
+.color-black {
+  color: #333 !important;
+}
+
+.color-green {
+  color: #51a74f !important;
+}
+
+.color-light-green {
+  color: #29bd8b !important;
+}
+
+.color-blue {
+  color: #3498db !important;
+}
+
+.color-orange {
+  color: #ee4a1f !important;
+}
+
+.color-orange02 {
+  color: #f79f88 !important;
+}
+
+.color-orange03 {
+  color: #ff7500 !important;
+}
+
+.color-orange04 {
+  color: #ee4a20 !important;
+}
+
+/*温馨提示公用颜色*/
+.color-orange05 {
+  color: #FF9e6a !important;
+}
+
+.color-orange06 {
+  color: #ff6530 !important;
+}
+
+a.color-orange05:hover,
+i.color-orange05:hover {
+  color: #ff7500 !important;
+}
+
+.color-orange06 {
+  color: #FF6610 !important;
+}
+
+.color-yellow {
+  color: #f0ad4e !important;
+}
+
+.color-yellow2 {
+  color: #ff9933 !important;
+}
+
+.color-yellow3 {
+  color: #FFC828;
+}
+
+/*新版学员统计---通关排行榜   2018/01/22*/
+
+.color-light-grey {
+  color: #afafaf !important;
+}
+
+.color-grey-7f {
+  color: #7f7f7f !important;
+}
+
+.color-grey-no-a {
+  color: #888 !important;
+}
+
+.color-grey {
+  color: #888 !important;
+}
+
+.color-grey9 {
+  color: #999 !important;
+}
+
+a.color-grey:hover {
+  color: #FF7500 !important;
+}
+
+/*a标签，移入变橙色*/
+.color-dark-grey {
+  color: #666 !important;
+}
+
+.color-grey3 {
+  color: #333 !important;
+}
+
+a.color-grey3:hover {
+  color: #ff7500 !important;
+}
+
+.u-color-light-grey {
+  color: #CCCCCC
+}
+
+.color-light-grey-C {
+  color: #CCCCCC !important;
+}
+
+.color-light-grey-E {
+  color: #EEEEEE
+}
+
+.color-grey-bf {
+  color: #bfbfbf !important;
+}
+
+.color-grey-b {
+  color: #bbbbbb !important;
+}
+
+.-text-danger {
+  color: #FF6545
+}
+
+.color_white {
+  color: #fff !important;
+}
+
+.color_Purple_grey {
+  color: #8291a3 !important;
+}
+
+/*TPI评论里右侧点赞的icon颜色*/
+.color-grey-c {
+  color: #cccccc !important;
+}
+
+a.link-color-grey {
+  color: #888 !important;
+}
+
+a:hover.link-color-grey {
+  color: #29bd8b !important;
+}
+
+a.link-color-green {
+  color: #29bd8b !important;
+}
+
+a.link-color-blue {
+  color: #6a8abe !important;
+}
+
+a.link-color-grey02 {
+  color: #888 !important;
+}
+
+a:hover.link-color-grey02 {
+  color: red !important;
+}
+
+a.link-color-grey03 {
+  color: #888 !important;
+}
+
+a:hover.link-color-grey03 {
+  color: #3498db !important;
+}
+
+.edu-color-grey {
+  color: #666;
+}
+
+.edu-color-grey:hover {
+  color: #ff7500;
+}
+
+/*通用背景颜色*/
+.back-color-orange {
+  background-color: #FF7500
+}
+
+
+/*通用文字大小样式*/
+.font-12 {
+  font-size: 12px !important;
+}
+
+.font-13 {
+  font-size: 13px !important;
+}
+
+.font-14 {
+  font-size: 14px !important;
+}
+
+.font-15 {
+  font-size: 15px !important;
+}
+
+.font-16 {
+  font-size: 16px !important;
+}
+
+.font-17 {
+  font-size: 17px !important;
+}
+
+.font-18 {
+  font-size: 18px !important;
+}
+
+.font-20 {
+  font-size: 20px !important;
+}
+
+.font-22 {
+  font-size: 22px !important;
+}
+
+.font-25 {
+  font-size: 25px !important;
+}
+
+.font-24 {
+  font-size: 24px !important;
+}
+
+.font-28 {
+  font-size: 28px !important;
+}
+
+.font-30 {
+  font-size: 30px !important;
+}
+
+.font-50 {
+  font-size: 50px !important;
+}
+
+.font-60 {
+  font-size: 60px !important;
+}
+
+.font-70 {
+  font-size: 70px !important;
+}
+
+/*通用内外边距*/
+.mt-10 {
+  margin-top: -10px;
+}
+
+.mt1 {
+  margin-top: 1px;
+}
+
+.mt2 {
+  margin-top: 2px;
+}
+
+.mt3 {
+  margin-top: 3px;
+}
+
+.mt4 {
+  margin-top: 4px;
+}
+
+.mt5 {
+  margin-top: 5px !important;
+}
+
+.mt6 {
+  margin-top: 6px;
+}
+
+.mt7 {
+  margin-top: 7px !important;
+}
+
+.mt8 {
+  margin-top: 8px;
+}
+
+.mt10 {
+  margin-top: 10px;
+}
+
+.mt12 {
+  margin-top: 12px;
+}
+
+.mt13 {
+  margin-top: 13px;
+}
+
+.mt15 {
+  margin-top: 15px;
+}
+
+.mt17 {
+  margin-top: 17px;
+}
+
+.mt20 {
+  margin-top: 20px !important;
+}
+
+.mt25 {
+  margin-top: 25px;
+}
+
+.mt30 {
+  margin-top: 30px !important;
+}
+
+.mt36 {
+  margin-top: 36px !important;
+}
+
+.mt40 {
+  margin-top: 40px;
+}
+
+.mt50 {
+  margin-top: 50px;
+}
+
+.mt70 {
+  margin-top: 70px;
+}
+
+.mt95 {
+  margin-top: 95px;
+}
+
+.mt100 {
+  margin-top: 100px;
+}
+
+.mb5 {
+  margin-bottom: 5px;
+}
+
+.mb7 {
+  margin-bottom: 7px;
+}
+
+.mb10 {
+  margin-bottom: 10px;
+}
+
+.mb11 {
+  margin-bottom: 11px;
+}
+
+.mb15 {
+  margin-bottom: 15px;
+}
+
+.mb20 {
+  margin-bottom: 20px;
+}
+
+.mb25 {
+  margin-bottom: 25px;
+}
+
+.mb30 {
+  margin-bottom: 30px !important;
+}
+
+.mb40 {
+  margin-bottom: 40px !important;
+}
+
+.mb50 {
+  margin-bottom: 50px !important;
+}
+
+.mb60 {
+  margin-bottom: 60px !important;
+}
+
+.mb70 {
+  margin-bottom: 70px !important;
+}
+
+.mb80 {
+  margin-bottom: 80px !important;
+}
+
+.mb90 {
+  margin-bottom: 90px !important;
+}
+
+.mb100 {
+  margin-bottom: 100px !important;
+}
+
+.mb110 {
+  margin-bottom: 110px;
+}
+
+.ml-3 {
+  margin-left: -3px;
+}
+
+.ml1 {
+  margin-left: 1px;
+}
+
+.ml2 {
+  margin-left: 2px;
+}
+
+.ml3 {
+  margin-left: 3px;
+}
+
+.ml4 {
+  margin-left: 4px;
+}
+
+.ml5 {
+  margin-left: 5px;
+}
+
+.ml6 {
+  margin-left: 6px;
+}
+
+.ml10 {
+  margin-left: 10px;
+}
+
+.ml12 {
+  margin-left: 12px !important;
+}
+
+.ml15 {
+  margin-left: 15px;
+}
+
+.ml18 {
+  margin-left: 18px;
+}
+
+.ml20 {
+  margin-left: 20px;
+}
+
+.ml25 {
+  margin-left: 25px;
+}
+
+.ml30 {
+  margin-left: 30px;
+}
+
+.ml33 {
+  margin-left: 33px;
+}
+
+.ml35 {
+  margin-left: 35px;
+}
+
+.ml40 {
+  margin-left: 40px;
+}
+
+.ml42 {
+  margin-left: 42px;
+}
+
+.ml45 {
+  margin-left: 45px;
+}
+
+.ml50 {
+  margin-left: 50px;
+}
+
+.ml55 {
+  margin-left: 55px;
+}
+
+.ml60 {
+  margin-left: 60px;
+}
+
+.ml75 {
+  margin-left: 75px;
+}
+
+.ml80 {
+  margin-left: 80px;
+}
+
+.ml85 {
+  margin-left: 85px;
+}
+
+.ml95 {
+  margin-left: 95px;
+}
+
+.ml115 {
+  margin-left: 115px
+}
+
+.ml123 {
+  margin-left: 123px;
+}
+
+.ml150 {
+  margin-left: 150px;
+}
+
+.ml180 {
+  margin-left: 180px;
+}
+
+.ml230 {
+  margin-left: 230px;
+}
+
+.ml240 {
+  margin-left: 240px;
+}
+
+.ml250 {
+  margin-left: 250px;
+}
+
+.ml290 {
+  margin-left: 290px;
+}
+
+.mr3 {
+  margin-right: 3px
+}
+
+.mr4 {
+  margin-right: 4px
+}
+
+.mr5 {
+  margin-right: 5px;
+}
+
+.mr8 {
+  margin-right: 8px;
+}
+
+.mr10 {
+  margin-right: 10px;
+}
+
+.mr12 {
+  margin-right: 12px !important;
+}
+
+.mr15 {
+  margin-right: 15px;
+}
+
+.mr18 {
+  margin-right: 18px;
+}
+
+.mr20 {
+  margin-right: 20px;
+}
+
+.mr25 {
+  margin-right: 25px;
+}
+
+.mr30 {
+  margin-right: 30px;
+}
+
+.mr35 {
+  margin-right: 35px;
+}
+
+.mr40 {
+  margin-right: 40px;
+}
+
+.mr45 {
+  margin-right: 45px;
+}
+
+.mr50 {
+  margin-right: 50px;
+}
+
+.mr60 {
+  margin-right: 60px;
+}
+
+.mr350 {
+  margin-right: 350px;
+}
+
+.pt5 {
+  padding-top: 5px;
+}
+
+.pt10 {
+  padding-top: 10px;
+}
+
+.pt15 {
+  padding-top: 15px;
+}
+
+.pt20 {
+  padding-top: 20px;
+}
+
+.pt30 {
+  padding-top: 30px;
+}
+
+.pt40 {
+  padding-top: 40px;
+}
+
+.pt47 {
+  padding-top: 47px;
+}
+
+.pt100 {
+  padding-top: 100px;
+}
+
+.pt130 {
+  padding-top: 130px;
+}
+
+.pt1 {
+  padding-top: 1px;
+}
+
+.pt5 {
+  padding-top: 5px;
+}
+
+.pt10 {
+  padding-top: 10px;
+}
+
+.pt15 {
+  padding-top: 15px;
+}
+
+.pt20 {
+  padding-top: 20px;
+}
+
+.pt30 {
+  padding-top: 30px;
+}
+
+.pt40 {
+  padding-top: 40px;
+}
+
+.pb5 {
+  padding-bottom: 5px;
+}
+
+.pb10 {
+  padding-bottom: 10px;
+}
+
+.pb15 {
+  padding-bottom: 15px;
+}
+
+.pb20 {
+  padding-bottom: 20px;
+}
+
+.pb28 {
+  padding-bottom: 28px;
+}
+
+.pb30 {
+  padding-bottom: 30px;
+}
+
+.pb40 {
+  padding-bottom: 40px;
+}
+
+.pb47 {
+  padding-bottom: 47px;
+}
+
+.pb50 {
+  padding-bottom: 50px;
+}
+
+.pb155 {
+  padding-bottom: 155px;
+}
+
+.pl2 {
+  padding-left: 2px;
+}
+
+.pl5 {
+  padding-left: 5px;
+}
+
+.pl8 {
+  padding-left: 8px;
+}
+
+.pl10 {
+  padding-left: 10px;
+}
+
+.pl15 {
+  padding-left: 15px;
+}
+
+.pl20 {
+  padding-left: 20px;
+}
+
+.pl28 {
+  padding-left: 28px;
+}
+
+.pl30 {
+  padding-left: 30px;
+}
+
+.pl33 {
+  padding-left: 33px
+}
+
+.pl40 {
+  padding-left: 40px;
+}
+
+.pl42 {
+  padding-left: 42px;
+}
+
+.pl45 {
+  padding-left: 45px;
+}
+
+.pl50 {
+  padding-left: 50px;
+}
+
+.pl100 {
+  padding-left: 100px;
+}
+
+.pl35 {
+  padding-left: 35px;
+}
+
+.pl50 {
+  padding-left: 50px;
+}
+
+.pl70 {
+  padding-left: 70px;
+}
+
+.pl80 {
+  padding-left: 80px;
+}
+
+.pl92 {
+  padding-left: 92px;
+}
+
+.pr2 {
+  paddding-right: 2px;
+}
+
+.pr5 {
+  padding-right: 5px;
+}
+
+.pr10 {
+  padding-right: 10px;
+}
+
+.pr15 {
+  padding-right: 15px;
+}
+
+.pr20 {
+  padding-right: 20px !important;
+}
+
+.pr30 {
+  padding-right: 30px !important;
+}
+
+.pr42 {
+  padding-right: 42px;
+}
+
+.pr45 {
+  padding-right: 45px;
+}
+
+.pl2 {
+  padding-left: 2px;
+}
+
+.pl5 {
+  padding-left: 5px;
+}
+
+.pl8 {
+  padding-left: 8px;
+}
+
+.pl10 {
+  padding-left: 10px;
+}
+
+.pl15 {
+  padding-left: 15px;
+}
+
+.pl20 {
+  padding-left: 20px;
+}
+
+.pl28 {
+  padding-left: 28px;
+}
+
+.pl30 {
+  padding-left: 30px;
+}
+
+.pl33 {
+  padding-left: 33px
+}
+
+.pl40 {
+  padding-left: 40px;
+}
+
+.pl42 {
+  padding-left: 42px;
+}
+
+.pl45 {
+  padding-left: 45px;
+}
+
+.pl50 {
+  padding-left: 50px;
+}
+
+.pl100 {
+  padding-left: 100px;
+}
+
+.pl35 {
+  padding-left: 35px;
+}
+
+.pl50 {
+  padding-left: 50px;
+}
+
+.pl70 {
+  padding-left: 70px;
+}
+
+.pl80 {
+  padding-left: 80px;
+}
+
+.pl92 {
+  padding-left: 92px;
+}
+
+.pr2 {
+  paddding-right: 2px;
+}
+
+.pr5 {
+  padding-right: 5px;
+}
+
+.pr10 {
+  padding-right: 10px;
+}
+
+.pr15 {
+  padding-right: 15px;
+}
+
+.pr20 {
+  padding-right: 20px !important;
+}
+
+.pr30 {
+  padding-right: 30px !important;
+}
+
+.pr42 {
+  padding-right: 42px;
+}
+
+.pr45 {
+  padding-right: 45px;
+}
+
+
+.padding15 {
+  padding: 15px;
+}
+
+.padding10 {
+  padding: 10px;
+}
+
+.padding10-15 {
+  padding: 10px 15px;
+}
+
+.padding15-10 {
+  padding: 15px 10px;
+}
+
+.ptl5-10 {
+  padding: 5px 10px;
+}
+
+.ptl3-10 {
+  padding: 3px 10px;
+}
+
+.ptl8-10 {
+  padding: 8px 10px;
+}
+
+
+
+.wb11 {
+  width: 11% !important;
+}
+
+.wb89 {
+  width: 89% !important;
+}
+
+.h3 {
+  height: 3px;
+}
+
+.h24 {
+  height: 24px;
+}
+
+.h32 {
+  height: 32px;
+}
+
+.h40 {
+  height: 40px;
+}
+
+.h50 {
+  height: 50px;
+}
+
+.h60 {
+  height: 60px;
+}
+
+.h80 {
+  height: 80px;
+}
+
+.h80 {
+  height: 80px;
+}
+
+.h85 {
+  height: 85px;
+}
+
+.h100 {
+  height: 100px;
+}
+
+.h140 {
+  height: 140px;
+}
+
+.h200 {
+  height: 200px;
+}
+
+/*块*/
+.col-width {
+  background: #fff;
+  border: 1px solid #e8e8e8;
+}
+
+.col-width-10 {
+  max-width: 100%;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+}
+
+.col-width-9 {
+  max-width: 90%;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+}
+
+.col-width-8 {
+  max-width: 80%;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+}
+
+.col-width-7 {
+  max-width: 70%;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+}
+
+.col-width-6 {
+  max-width: 60%;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+}
+
+.col-width-5 {
+  max-width: 50%;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+}
+
+.col-width-4 {
+  max-width: 40%;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+}
+
+.col-width-3 {
+  width: 500px;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+  position: absolute;
+  left: -510px;
+  top: 0;
+}
+
+.col-width-2 {
+  max-width: 20%;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+}
+
+.col-width-1 {
+  max-width: 10%;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+}
+
+/*按钮*/
+a.task-btn {
+  cursor: pointer;
+  display: inline-block;
+  font-weight: bold;
+  border: none;
+  padding: 0 12px;
+  color: #666;
+  background: #e1e1e1;
+  letter-spacing: 1px;
+  text-align: center;
+  font-size: 14px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 3px;
+}
+
+a.task-btn-green {
+  background: #29bd8b;
+  color: #fff !important;
+}
+
+a:hover.task-btn-green {
+  background: #19b17e;
+}
+
+a.task-btn-orange {
+  background: #FF7500;
+  color: #fff !important;
+}
+
+a:hover.task-btn-orange {
+  background: #ff7500;
+}
+
+a.task-newbtn-grey {
+  background-color: #e1e1e1;
+  color: #666666;
+}
+
+a:hover.task-newbtn-grey {
+  color: #333
+}
+
+a.task-btn-blue {
+  background: #199ed8;
+  color: #fff !important;
+}
+
+a:hover.task-btn-blue {
+  background: #199ed8;
+  color: #fff;
+}
+
+a.task-btn-grey {
+  background-color: #d4d6d8;
+  color: #4d555d !important;
+}
+
+a:hover.task-btn-grey {
+  background-color: #d4d6d8;
+  color: #4d555d;
+}
+
+a.task-btn-grey-white {
+  background-color: #c2c4c6;
+  color: #fff;
+}
+
+a:hover.task-btn-grey-white {
+  background-color: #a9abad;
+}
+
+a.new-btn {
+  display: inline-block;
+  border: none;
+  padding: 0 10px;
+  color: #666;
+  background: #e1e1e1;
+  text-align: center;
+  font-size: 12px;
+  height: 30px;
+  border-radius: 3px;
+  line-height: 30px;
+}
+
+a.new-btn:hover {
+  background: #c3c3c3;
+  color: #333;
+}
+
+a.new-btn-green {
+  background: #29bd8b;
+  color: #fff;
+}
+
+a.new-btn-green:hover {
+  background: #19b17e;
+}
+
+a.new-btn-blue {
+  background: #6a8abe;
+  color: #fff !important;
+}
+
+a.new-btn-blue:hover {
+  background: #5f7cab;
+}
+
+a.new-bigbtn {
+  display: inline-block;
+  border: none;
+  padding: 2px 30px;
+  color: #666;
+  background: #e1e1e1;
+  text-align: center;
+  font-size: 14px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 3px;
+}
+
+a:hover.new-bigbtn {
+  background: #c3c3c3;
+  color: #333;
+}
+
+a.new-bigbtn-green {
+  background: #3b94d6;
+  color: #fff;
+}
+
+a.new-bigbtn-green:hover {
+  background: #2384cd;
+  color: #fff;
+}
+
+a.task-btn-ver {
+  height: 45px;
+  line-height: 45px;
+  background: #FF7500;
+  color: #fff !important;
+  border-radius: 5px;
+  font-size: 12px;
+  padding: 0 10px;
+}
+
+a.rest-btn-ver {
+  cursor: not-allowed;
+  background: #ccc;
+}
+
+a.task-btn-ver-line {
+  height: 43px;
+  line-height: 43px;
+  border-radius: 5px;
+  font-size: 12px;
+  padding: 0 10px;
+  border: 1px solid #ccc;
+}
+
+a:hover.task-btn-ver-line {
+  border: 1px solid #29bd8b;
+}
+
+a:hover.rest-btn-ver {
+  cursor: not-allowed;
+  background: #ccc;
+}
+
+.new_login_submit_disable {
+  width: 265px;
+  height: 40px;
+  line-height: 40px;
+  background: #ccc;
+  color: #fff;
+  font-size: 14px;
+  border-radius: 5px;
+  border: none;
+  text-align: center;
+  cursor: pointer;
+  vertical-align: middle;
+}
+
+.new_login_submit,
+a.new_login_submit {
+  display: block;
+  text-decoration: none !important;
+  width: 100%;
+  height: 45px;
+  line-height: 45px;
+  background: #29bd8b;
+  color: #fff !important;
+  font-size: 14px;
+  border-radius: 5px;
+  border: none;
+  text-align: center;
+  cursor: pointer;
+  vertical-align: middle;
+}
+
+.new_login_submit a {
+  color: #fff !important;
+  text-decoration: none;
+}
+
+.new_login_submit:hover {
+  background: #19b17e;
+}
+
+a.task-btn-email {
+  display: inline-block;
+  font-weight: bold;
+  border: none;
+  width: 185px;
+  color: #666;
+  background: #e1e1e1;
+  letter-spacing: 1px;
+  text-align: center;
+  font-size: 14px;
+  height: 40px;
+  line-height: 40px;
+  border-radius: 3px;
+}
+
+a:hover.task-btn-email {
+  background: #c3c3c3;
+  color: #666;
+}
+
+.white-btn {
+  text-align: center;
+  cursor: pointer;
+  display: inline-block;
+  padding: 0px 8px;
+  border: 1px solid #ccc;
+  color: #666;
+  letter-spacing: 1px;
+  font-size: 14px;
+  height: 26px;
+  line-height: 26px;
+  border-radius: 3px;
+}
+
+.white-btn-h40 {
+  text-align: center;
+  cursor: pointer;
+  display: inline-block;
+  padding: 5px 10px;
+  border: 1px solid #ccc;
+  color: #666;
+  letter-spacing: 1px;
+  font-size: 14px;
+  height: 26px;
+  line-height: 26px;
+  border-radius: 3px;
+}
+
+a.white-btn.green-btn {
+  color: #29bd8b;
+  border: 1px solid #29bd8b;
+}
+
+a.white-btn.gery-btn {
+  color: #aaa;
+  border: 1px solid #aaa
+}
+
+a.white-btn.gery-btn:hover {
+  color: #FFFFFF;
+  border: 1px solid #aaa;
+  background: #aaa
+}
+
+a.white-btn.orange-btn,
+a.white-btn-h40.orange-btn {
+  color: #FF7500;
+  border: 1px solid #FF7500
+}
+
+a.white-btn.orange-btn:hover,
+a.white-btn-h40.orange-btn:hover {
+  color: #FFFFFF;
+  border: 1px solid #FF7500;
+  background: #ff7500
+}
+
+a.white-btn.orange-bg-btn,
+a.white-btn-h40.orange-bg-btn {
+  color: #FFFFFF;
+  border: 1px solid #FF7500;
+  background: #ff7500
+}
+
+a.grey-btn {
+  padding: 0px 8px;
+  height: 30px;
+  line-height: 30px;
+  background-color: #eaeaea;
+  color: #7f7f7f;
+  font-size: 14px;
+  border-radius: 3px;
+}
+
+.invite-btn {
+  display: block;
+  padding: 1px 10px;
+  background: #fff;
+  color: #333;
+  border-radius: 4px;
+}
+
+a.decoration {
+  text-decoration: underline !important;
+}
+
+/*07-11  新添加的公用样式   cs*/
+a.course-btn {
+  cursor: pointer;
+  font-weight: bold;
+  border-radius: 4px;
+  display: inline-block;
+  width: auto;
+  padding: 0px 12px;
+  background-color: #FFFFFF;
+  color: #44bfa3;
+  letter-spacing: 1px;
+  height: 30px;
+  line-height: 30px;
+}
+
+.bc-grey {
+  background-color: #CCCCCC !important;
+}
+
+.bc-white {
+  background-color: #ffffff !important;
+}
+
+a.course-bth-blue {
+  cursor: pointer;
+  background-color: #199ed8;
+  color: #ffffff !important;
+  display: inline-block;
+  font-weight: bold;
+  border: none;
+  padding: 0 12px;
+  letter-spacing: 1px;
+  text-align: center;
+  font-size: 14px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 3px;
+}
+
+a.course-bth-orange {
+  cursor: pointer;
+  background-color: #ff6530;
+  color: #ffffff !important;
+  display: inline-block;
+  font-weight: bold;
+  border: none;
+  padding: 0 12px;
+  letter-spacing: 1px;
+  text-align: center;
+  font-size: 14px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 3px;
+}
+
+.topic-hover a:hover {
+  background: #ff7500;
+  color: #fff;
+}
+
+/*.topic-hover li a:hover{color:#fff;}*/
+/*提示条*/
+.alert {
+  padding: 10px;
+  border: 1px solid transparent;
+  text-align: center;
+}
+
+.alert-blue {
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+  color: #3a87ad;
+}
+
+.alert-orange {
+  background-color: #fff9e9;
+  border-color: #f6d0b1;
+  color: #ee4a20;
+}
+
+.alert-green {
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+  color: #3c763d;
+}
+
+.task-close {
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+  font-size: 21px;
+  font-weight: bold;
+  line-height: 1;
+  color: #000000;
+  text-shadow: 0 1px 0 #ffffff;
+  opacity: 0.3;
+}
+
+.taskclose:hover {
+  opacity: 0.5;
+}
+
+.alert-red {
+  background-color: #f2dede;
+  border-color: #eed3d7;
+  color: #d14f4d;
+  text-align: left !important;
+}
+
+/*tag*/
+.task-tag {
+  padding: 0 10px;
+  text-align: center;
+  display: inline-block;
+  height: 30px;
+  line-height: 30px;
+}
+
+.tag-blue {
+  background-color: #d9edf7;
+  color: #3a87ad;
+}
+
+.tag-grey {
+  background-color: #f3f5f7;
+  color: #4d555d;
+}
+
+.tag-border-grey {
+  background-color: #fff;
+  border-color: #e2e2e2;
+  color: #888;
+}
+
+.cir-orange {
+  background: #ff6530;
+  color: #fff;
+  border-radius: 15px;
+  padding: 0 5px;
+  display: inline-block;
+  font-size: 12px;
+  height: 16px;
+  line-height: 16px;
+}
+
+.cir-red {
+  background: red;
+  color: #fff;
+  border-radius: 15px;
+  padding: 0 5px;
+  display: inline-block;
+  font-size: 12px;
+  height: 16px;
+  line-height: 16px;
+}
+
+.red-cir-btn {
+  background: #e74c3c;
+  padding: 1px 5px;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  border-radius: 2px;
+  color: #fff;
+  font-weight: normal;
+  font-size: 12px;
+}
+
+/****************************/
+/* 页面结构*/
+.task-pm-content {
+  width: 1000px;
+  margin: 0 auto;
+}
+
+.task-pm-box {
+  width: 100%;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+}
+
+.task-paner-con {
+  padding: 15px;
+  color: #666;
+  line-height: 2.0;
+}
+
+.task-text-center {
+  text-align: center;
+}
+
+.flow_hidden {
+  width: 300px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+/*pre标签换行*/
+.break_word {
+  word-break: break-all;
+  word-wrap: break-word;
+}
+
+.break_word_firefox {
+  white-space: pre-wrap !important;
+  word-break: break-all;
+}
+
+.pre_word {
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  word-break: normal;
+}
+
+.pr {
+  position: relative;
+}
+
+.df {
+  display: flex;
+  display: -webkit-flex;
+  display: -ms-flex;
+}
+
+.df-js-ac {
+  justify-content: space-around;
+  -webkit-justify-content: space-around;
+  -webkit-align-items: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
+.w28 {
+  width: 28px;
+}
+
+.w40 {
+  width: 40px;
+}
+
+.w50 {
+  width: 50px;
+}
+
+.edu-txt-w50 {
+  width: 50px;
+}
+
+.w60 {
+  width: 60px;
+}
+
+.w70 {
+  width: 70px;
+}
+
+.w80 {
+  width: 80px;
+}
+
+.w100 {
+  width: 100px;
+}
+
+.w120 {
+  width: 120px;
+}
+
+.w150 {
+  width: 150px;
+}
+
+.w200 {
+  width: 200px;
+}
+
+.w300 {
+  width: 300px;
+}
+
+.w320 {
+  width: 320px;
+}
+
+.edu-w245 {
+  width: 245px;
+}
+
+.w266 {
+  width: 266px;
+}
+
+.w780 {
+  width: 780px;
+}
+
+.w850 {
+  width: 850px;
+}
+
+.w900 {
+  width: 900px;
+}
+
+
+
+.with10 {
+  width: 10%;
+}
+
+.with15 {
+  width: 15%;
+}
+
+.with20 {
+  width: 20%;
+}
+
+.with25 {
+  width: 25%;
+}
+
+.with30 {
+  width: 30%;
+}
+
+.with35 {
+  width: 35%;
+}
+
+.with40 {
+  width: 40%;
+}
+
+.with45 {
+  width: 45%;
+}
+
+.with49 {
+  width: 49%;
+}
+
+.with50 {
+  width: 50%;
+}
+
+.with55 {
+  width: 55%;
+}
+
+.with52 {
+  width: 52%;
+}
+
+.with48 {
+  width: 48%;
+}
+
+.with60 {
+  width: 60%;
+}
+
+.with65 {
+  width: 65%;
+}
+
+.with70 {
+  width: 70%;
+}
+
+.with73 {
+  width: 73%;
+}
+
+.with75 {
+  width: 75%;
+}
+
+.with70 {
+  width: 70%;
+}
+
+.with73 {
+  width: 73%;
+}
+
+.with75 {
+  width: 75%;
+}
+
+.with80 {
+  width: 80%;
+}
+
+.with85 {
+  width: 85%;
+}
+
+.with87 {
+  width: 87%;
+}
+
+.with90 {
+  width: 90%;
+}
+
+.with95 {
+  width: 95%;
+}
+
+.with100 {
+  width: 100%;
+}
+
+.edu-bg {
+  background: #fff !important;
+}
+
+.disabled-bg {
+  background: #eee !important;
+}
+
+.disabled-grey-bg {
+  background: #a4a4a4 !important;
+}
+
+/* 课程共用 后期再添加至公共样式 bylinda*/
+a.link-name-dark {
+  color: #666;
+  max-width: 140px;
+  display: block;
+}
+
+a:hover.link-name-dark {
+  color: #ff7500;
+}
+
+/* 超过宽度省略 */
+.edu-name-dark {
+  max-width: 100px;
+  display: block;
+}
+
+.edu-info-dark {
+  max-width: 345px;
+  display: block;
+}
+
+.edu-max-h200 {
+  height: 200px;
+  overflow: auto;
+}
+
+.edu-h260 {
+  height: 260px;
+}
+
+.edu-position {
+  position: relative;
+}
+
+.edu-h200-auto {
+  max-height: 200px;
+  overflow: auto;
+}
+
+.edu-h300-auto {
+  max-height: 300px;
+  overflow: auto;
+}
+
+.edu-h350-auto {
+  max-height: 350px;
+  overflow: auto;
+}
+
+.edu-txt-w240 {
+  width: 240px;
+  display: block;
+}
+
+.edu-txt-w280 {
+  width: 280px;
+  display: block;
+}
+
+.edu-txt-w320 {
+  width: 320px;
+  display: block;
+}
+
+.edu-txt-w200 {
+  width: 200px;
+  display: block;
+}
+
+a.edu-txt-w280,
+.edu-txt-w280 {
+  width: 280px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w190,
+.edu-txt-w190 {
+  width: 190px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w160,
+.edu-txt-w160 {
+  width: 160px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w140,
+.edu-txt-w140 {
+  width: 141px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w130,
+.edu-txt-w130 {
+  width: 130px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w120,
+.edu-txt-w120 {
+  width: 120px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w100,
+.edu-txt-w100 {
+  width: 100px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w90,
+.edu-txt-w90 {
+  width: 90px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w80,
+.edu-txt-w80 {
+  width: 80px;
+  display: inline-block;
+  text-align: center
+}
+
+.overellipsis {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+/* 筛选按钮 */
+.edu-btn-search {
+  position: absolute;
+  top: 0;
+  right: 15px;
+}
+
+.edu-bg-light-blue {
+  background: #f7f9fd;
+  padding: 5px;
+}
+
+.edu-con-top {
+  padding: 10px 0;
+  background: #fff;
+  border-bottom: 1px solid #eee;
+  font-size: 16px;
+}
+
+.edu-con-top h2 {
+  font-size: 16px;
+}
+
+.edu-form-label {
+  display: inline-block;
+  width: 60px;
+  text-align: right;
+  line-height: 40px;
+  font-weight: normal;
+}
+
+.edu-form-border {
+  border: 1px solid #ddd;
+}
+
+.edu-form-notice-border {
+  border: 1px solid #f27d61 !important;
+}
+
+.edu-form-noborder,
+input.edu-form-noborder {
+  border: none;
+  outline: none;
+}
+
+a.edu-btn {
+  display: inline-block;
+  border: none;
+  padding: 0 12px;
+  color: #666 !important;
+  border: 1px solid #ccc;
+  text-align: center;
+  font-size: 14px;
+  height: 29px;
+  line-height: 29px;
+  border-radius: 3px;
+  font-weight: bold;
+  letter-spacing: 1px;
+}
+
+a:hover.edu-btn {
+  border: 1px solid #5faee3;
+  color: #5faee3 !important;
+}
+
+.edu-cir-grey {
+  display: inline-block;
+  padding: 0px 5px;
+  color: #666;
+  background: #f3f3f3;
+  text-align: center;
+  border-radius: 15px;
+  font-size: 12px;
+  line-height: 20px !important;
+}
+
+.edu-cir-grey1 {
+  display: inline-block;
+  padding: 0px 5px;
+  margin-left: 5px;
+  color: #666;
+  background: #ccc;
+  text-align: center;
+  border-radius: 15px;
+  font-size: 12px;
+  line-height: 20px !important;
+}
+
+.edu-cir-grey-q {
+  display: inline-block;
+  padding: 0px 7px;
+  color: #666;
+  background: #f3f3f3;
+  text-align: center;
+  border-radius: 15px;
+  font-size: 12px;
+  line-height: 20px !important;
+}
+
+.edu-cir-orange {
+  display: inline-block;
+  padding: 0px 7px;
+  color: #fff;
+  background: #FF7500;
+  text-align: center;
+  border-radius: 15px;
+  font-size: 12px;
+  line-height: 20px !important;
+}
+
+/*a.edu-filter-cir-grey{display: inline-block; padding:0px 15px; color:#666; border:1px solid #ddd; text-align: center; border-radius:3px; font-size:12px; height:25px; line-height:25px;}
+a:hover.edu-filter-cir-grey,a.edu-filter-cir-grey.active{ border:1px solid #3498db;  color:#3498db; }*/
+
+.edu-filter-btn {
+  display: inline-block;
+  padding: 0px 3px;
+  color: #666;
+  background: #fff;
+  text-align: center;
+  border-radius: 3px;
+  font-size: 12px;
+  height: 20px;
+  line-height: 20px;
+}
+
+.edu-filter-btn-blue {
+  border: 1px solid #3498db;
+  color: #3498db;
+}
+
+.edu-filter-btn-orange {
+  border: 1px solid #ff5055;
+  color: #ff5055;
+}
+
+.edu-filter-btn-red {
+  border: 1px solid #d72e36;
+  color: #d72e36;
+}
+
+.edu-filter-btn-green {
+  border: 1px solid #6fbb9d;
+  color: #6fbb9d;
+}
+
+.edu-filter-btn-yellow {
+  border: 1px solid #ef9324;
+  color: #ef9324;
+}
+
+.edu-filter-btn-danger {
+  background: #d72e36;
+  color: #fff;
+}
+
+.edu-filter-btn-late {
+  border: 1px solid #3fbcff;
+  color: #3fbcff;
+}
+
+.edu-filter-btn-no-late {
+  border: 1px solid #8c8c8c;
+  color: #8c8c8c;
+}
+
+.edu-filter-btn-end {
+  border: 1px solid #b6b6b6;
+  color: #b6b6b6;
+}
+
+.eud-pointer {
+  cursor: pointer;
+}
+
+.edu-bg-grey {
+  background: #f6f6f6;
+  width: 90%;
+  min-width: 700px;
+  color: #666;
+}
+
+/* table-1底部边框 */
+.edu-pop-table {
+  width: 100%;
+  border: 1px solid #eee;
+  border-bottom: none;
+  background: #fff;
+  color: #888;
+  cursor: default
+}
+
+.edu-pop-table tr {
+  height: 40px;
+}
+
+.edu-pop-table tr.edu-bg-grey {
+  background: #f5f5f5;
+}
+
+.edu-txt-center {
+  text-align: center;
+}
+
+.edu-txt-left {
+  text-align: left;
+}
+
+.edu-txt-right {
+  text-align: right;
+}
+
+.edu-pop-table tr th {
+  color: #333;
+  border-bottom: 1px solid #eee;
+}
+
+.edu-pop-table tr td {
+  border-bottom: 1px solid #eee;
+}
+
+.edu-pop-table.table-line tr td,
+.edu-pop-table.table-line tr th {
+  border-right: 1px solid #eee;
+}
+
+.edu-pop-table.table-line tr td:last-child,
+.edu-pop-table.table-line tr th:last-child {
+  border-right: none;
+}
+
+.edu-pop-table tr td .alink-name {
+  color: #333 !important;
+}
+
+.edu-pop-table tr td .alink-name:hover {
+  color: #FF7500 !important;
+}
+
+.edu-pop-table tr td .alink-operate {
+  color: #cccccc !important;
+}
+
+.edu-pop-table tr td .alink-operate:hover {
+  color: #FF7500 !important;
+}
+
+/*th行有背景颜色且table无边框*/
+.edu-pop-table.head-color thead tr {
+  background: #fafbfb
+}
+
+.edu-pop-table.head-color {
+  border: none
+}
+
+.edu-pop-table.head-color tr:last-child td {
+  border: none
+}
+
+/*--表格行间隔背景颜色-*/
+.edu-pop-table.interval-td thead tr {
+  background: #fafbfb
+}
+
+.edu-pop-table.interval-td tbody tr:nth-child(even) {
+  background: #fafbfb
+}
+
+.edu-pop-table.interval-td tbody tr td {
+  border: none
+}
+
+/*--表格行间隔背景颜色(th也没有边框)-*/
+.edu-pop-table.interval-all {
+  border: none
+}
+
+.edu-pop-table.interval-all thead th {
+  border: none
+}
+
+.edu-pop-table.interval-all thead tr {
+  background: #fafbfb
+}
+
+.edu-pop-table.interval-all tbody tr:nth-child(even) {
+  background: #fafbfb
+}
+
+.edu-pop-table.interval-all tbody tr td {
+  border: none;
+  padding: 5px 0px
+}
+
+/*--表格行移入背景颜色-*/
+.edu-pop-table.hover-td tbody tr:hover {
+  background: #EFF9FD
+}
+
+/*悬浮颜色为天蓝色*/
+.edu-pop-table.hover-td_1 tbody tr:hover {
+  background: #FCF2EC
+}
+
+/*悬浮颜色为浅橙色*/
+/* table-2全边框 */
+.edu-pop-table-all {
+  width: 100%;
+  border: 1px solid #eee;
+  background: #fff;
+  color: #888;
+  border-collapse: collapse
+}
+
+.edu-pop-table-all tr {
+  height: 30px;
+}
+
+.edu-pop-table-all tr.edu-bg-grey {
+  background: #f5f5f5;
+}
+
+.edu-pop-table-all tr th {
+  color: #333;
+  border: 1px solid #eee;
+}
+
+.edu-pop-table-all tr td {
+  border: 1px solid #eee;
+  padding: 5px
+}
+
+
+
+.edu-line {
+  border-bottom: 1px solid #eee;
+}
+
+table.table-th-grey th {
+  background: #f5f5f5;
+}
+
+table.table-pa5 th,
+table.table-pa5 td {
+  padding: 0 5px;
+}
+
+.panel-comment_item .orig_cont-red {
+  border: solid 2px #cc0000;
+  border-radius: 10px;
+  padding: 4px;
+  color: #999;
+  margin-top: -1px;
+}
+
+/***** loading ******/
+/***** Ajax indicator ******/
+#ajax-indicator {
+  position: absolute;
+  /* fixed not supported by IE*/
+  background-color: #eee;
+  border: 1px solid #bbb;
+  top: 35%;
+  left: 40%;
+  width: 20%;
+  /*height:5%;*/
+  font-weight: bold;
+  text-align: center;
+  padding: 0.6em;
+  z-index: 100000;
+  opacity: 0.5;
+}
+
+html>body #ajax-indicator {
+  position: fixed;
+}
+
+#ajax-indicator span {
+  color: #fff;
+  color: #333333;
+  background-position: 0% 40%;
+  background-repeat: no-repeat;
+  background-image: url(/images/loading.gif);
+  padding-left: 26px;
+  vertical-align: bottom;
+  z-index: 100000;
+}
+
+
+/*----------------------列表结构*/
+.forum_table .forum_table_item:nth-child(odd) {
+  background: #fafbfb
+}
+
+.forum_table_item {
+  padding: 20px 15px;
+  display: flex;
+}
+
+.forum_table_item .item_name {
+  color: #333
+}
+
+.forum_table_item .item_name:hover {
+  color: #FF7500
+}
+
+
+.edu-bg {
+  background: #fff;
+}
+
+/*---------tab切换-----*/
+.task-tab {
+  width: 10%;
+  height: 42px;
+  line-height: 42px;
+  text-align: center;
+  color: #666;
+  position: relative;
+  cursor: pointer;
+}
+
+.task-tab.sheet {
+  border-bottom: 3px solid #5faee3;
+  color: #5faee3;
+}
+
+.task-tab.bold {
+  border-bottom: 3px solid #5faee3;
+  font-weight: bold;
+}
+
+.task-tab i {
+  position: absolute;
+  bottom: -9px;
+  left: 45%;
+  color: #5faee3 !important;
+}
+
+.undis {
+  display: none
+}
+
+.edu-change .panel-form-label {
+  line-height: 1.9;
+}
+
+.title_type {
+  line-height: 40px;
+  height: 40px;
+  border-bottom: 1px solid #eee;
+  color: #666;
+  padding-left: 15px;
+}
+
+.teacher_banner {
+  border-bottom: 1px solid #eee
+}
+
+.zbg {
+  background: url("/images/edu_user/richEditer.png") -195px -2px no-repeat;
+  height: 18px;
+  cursor: pointer
+}
+
+.zbg_latex {
+  background: url("/images/edu_user/richEditer.png") -315px -3px no-repeat;
+  height: 18px;
+  cursor: pointer;
+}
+
+.latex {
+  position: relative;
+  top: 4px;
+}
+
+.white_bg {
+  background: #fff
+}
+
+.user_tab_type {
+  background: #FF6610
+}
+
+/*首页----------筛选切换（有数字）*/
+.user_course_filtrate {
+  width: auto;
+  text-align: center;
+  line-height: 26px;
+}
+
+.user_filtrate_span1_bg {
+  color: #FF7500
+}
+
+.user_filtrate_span2 {
+  width: auto;
+  padding: 0px 6px;
+  border-radius: 8px;
+  background: #ccc;
+  font-size: 12px;
+  display: block;
+  line-height: 15px;
+  float: right;
+  color: #FFFFFF;
+  margin-top: 6px;
+}
+
+.user_filtrate_span2_bg {
+  background: #FF7500 !important;
+}
+
+.user_course_filtrate:hover .user_filtrate_span1 {
+  color: #FF7500 !important;
+}
+
+.user_course_filtrate:hover .user_filtrate_span2 {
+  background: #FF7500 !important;
+}
+
+/*课堂----------筛选切换（没有数字，默认白色背景）*/
+.course_filtrate {
+  width: auto;
+  padding: 0px 10px;
+  text-align: center;
+  background: #eeeeee;
+  border-radius: 10px;
+  margin-right: 20px;
+  line-height: 26px;
+}
+
+.course_filtrate:hover {
+  background: #FF7500;
+  color: #ffffff;
+}
+
+.course_filtrate_bg {
+  background: #FF7500;
+  color: #ffffff !important;
+}
+
+/*我的课堂----------筛选切换（没有数字，默认灰色背景）*/
+.edu-filter-cir-grey {
+  color: #666 !important;
+  width: auto;
+  padding: 0px 15px;
+  text-align: center;
+  background: #f3f3f3;
+  border-radius: 10px;
+  display: block;
+  height: 25px;
+  line-height: 25px;
+}
+
+.edu-filter-cir-grey:hover {
+  background: #FF7500;
+  color: #ffffff !important;
+}
+
+.edu-filter-cir-grey.active {
+  background: #FF7500;
+  color: #ffffff !important;
+}
+
+.edu-find .edu-find-input {
+  border-bottom: 1px solid #EEEEEE;
+}
+
+.edu-find .edu-find-input input {
+  border: none;
+  outline: none
+}
+
+.edu-find .edu-close {
+  position: absolute;
+  top: -1px;
+  right: 7px;
+  font-size: 18px;
+  cursor: pointer;
+}
+
+.edu-find .edu-open {
+  position: absolute;
+  top: 1px;
+  right: -18px
+}
+
+
+/*最新和最热导航条的公用样式*/
+.nav_check_item {
+  margin-bottom: 13px;
+  border-bottom: 2px solid #FC7033;
+}
+
+.nav_check_item li {
+  width: auto;
+  width: 80px;
+  text-align: center;
+  cursor: pointer;
+  height: 38px;
+  line-height: 38px;
+  border-top-right-radius: 5px;
+  border-top-left-radius: 5px;
+}
+
+.nav_check_item li a {
+  display: block;
+  width: 100%;
+}
+
+.check_nav {
+  background: #FC7033;
+  color: #ffffff;
+}
+
+.check_nav a {
+  color: #ffffff !important;
+}
+
+.check_on {
+  background: #FF7500;
+  color: #ffffff !important;
+  border-radius: 4px;
+}
+
+/*实训列表块里面的遮罩效果*/
+.black-half {
+  position: absolute;
+  left: 0;
+  top: 0px;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 3;
+  display: none;
+}
+
+.black-half-lock {
+  width: 65px;
+  height: 65px;
+  border-radius: 50%;
+  background: #8291a3;
+  vertical-align: middle;
+  text-align: center;
+  margin: 25% auto 0px;
+}
+
+.black-half-lock i {
+  margin-top: 7px;
+}
+
+.black-half-info {
+  width: 100%;
+  text-align: center;
+  color: #FFFFFF;
+  margin-top: 10px
+}
+
+.show-black {
+  display: block;
+  animation: black-down 1s linear 1;
+}
+
+@-webkit-keyframes black-down {
+  25% {
+    -webkit-transform: translateY(0);
+  }
+
+  50%,
+  100% {
+    -webkit-transform: translateY(0);
+  }
+}
+
+@keyframes black-down {
+  25% {
+    transform: translateY(0);
+  }
+
+  50%,
+  100% {
+    transform: translateY(0);
+  }
+}
+
+/*去掉IE input框输入时自带的清除按钮*/
+input::-ms-clear {
+  display: none;
+}
+
+
+/*最小高度*/
+.mh750 {
+  min-height: 750px
+}
+
+.mh650 {
+  min-height: 650px
+}
+
+.mh580 {
+  min-height: 580px
+}
+
+.mh550 {
+  min-height: 550px
+}
+
+.mh510 {
+  min-height: 510px
+}
+
+.mh440 {
+  min-height: 440px
+}
+
+.mh400 {
+  min-height: 400px
+}
+
+.mh390 {
+  min-height: 390px
+}
+
+.mh360 {
+  min-height: 360px
+}
+
+.mh350 {
+  min-height: 350px
+}
+
+.mh320 {
+  min-height: 320px
+}
+
+.mh240 {
+  min-height: 240px
+}
+
+.mh200 {
+  min-height: 200px
+}
+
+/*---------------操作部分虚线边框-----------------*/
+.border-dash-orange {
+  border: 1px dashed #ffbfaa
+}
+
+/*错误、危险、失败提示边框*/
+.border-error-result {
+  border: 1px dashed #ff5252
+}
+
+.border-dash-ccc {
+  border-top: 1px dashed #ccc;
+  border-bottom: 1px dashed #ccc;
+}
+
+.login-error {
+  border: 1px solid #ff5252 !important;
+}
+
+/*登录时，输入的手机号码或者密码错误，边框变红*/
+.error-red {
+  border: 1px solid #DB6666;
+  background: #FFE6E5;
+  border-radius: 3px;
+  padding: 2px 10px;
+}
+
+.error-red i {
+  color: #FF6666
+}
+
+
+/*---------------tab公用背景颜色-----------------*/
+.background-blue {
+  background: #5ECFBA !important;
+}
+
+.background-orange {
+  background: #FC7033 !important;
+}
+
+.back-orange-main {
+  background: #FC7500 !important;
+  color: #FFFFff !important;
+}
+
+/*主流橙色*/
+.back-orange-01 {
+  background: #FF9e6a !important;
+}
+
+/*带背景标题、带色彩分割线和操作入口*/
+.back-f6-grey {
+  background: #F6F6F6;
+}
+
+.background-blue a {
+  color: #ffffff !important;
+}
+
+.background-orange a {
+  color: #ffffff !important;
+}
+
+/*---------------tab公用边框-----------------*/
+.border-bottom-orange {
+  border-bottom: 2px solid #FC7033 !important;
+}
+
+.bor-bottom-orange {
+  border-bottom: 1px solid #FF9e6a !important;
+}
+
+.bor-bottom-greyE {
+  border-bottom: 1px solid #EEEEEE !important;
+}
+
+.bor-top-greyE {
+  border-top: 1px solid #EEEEEE !important;
+}
+
+/*---------------边框-----------------*/
+.bor-gray-c {
+  border: 1px solid #ccc;
+}
+
+.bor-grey-e {
+  border: 1px solid #eee;
+}
+
+.bor-grey-d {
+  border: 1px solid #ddd;
+}
+
+.bor-grey01 {
+  border: 1px solid #E6EAEB;
+}
+
+.bor-blue {
+  border: 1px solid #5faee3;
+}
+
+.bor-red {
+  border: 1px solid #db0505 !important;
+}
+
+.bor-none {
+  border: none;
+}
+
+.bor-outnone {
+  outline: none;
+  border: 0px;
+}
+
+/*延时*/
+.delay {
+  border: 1px solid #db0505;
+  padding: 0px 10px;
+  height: 23px;
+  line-height: 23px;
+  border-radius: 12px;
+  display: block;
+  float: left;
+  color: #db0505
+}
+
+/*
+    tip公共样式的设置：
+
+*/
+.-task-title {
+  opacity: 0;
+  position: absolute;
+  left: 0;
+  top: 0;
+  display: none;
+  z-index: 100000;
+}
+
+/*1*/
+.data-tip-down,
+.data-tip-left,
+.data-tip-right,
+.data-tip-top {
+  position: relative;
+  box-shadow: 0px 0px 8px #000;
+  background: #000;
+  color: #fff;
+  max-width: 300px;
+  /*2*/
+  word-wrap: break-word;
+  text-align: center;
+  border-radius: 4px;
+  padding: 0 10px;
+  border: 1px solid #000;
+  display: none;
+}
+
+/*3*/
+.data-tip-down:after,
+.data-tip-down:before,
+.data-tip-left:before,
+.data-tip-right:before,
+.data-tip-left:after,
+.data-tip-right:after,
+.data-tip-top:after,
+.data-tip-top:before {
+  /*4*/
+  position: absolute;
+  content: '';
+  width: 0;
+  height: 0;
+}
+
+/*5*/
+.data-tip-down:after,
+.data-tip-down:before {
+  left: 45%;
+  top: -10px;
+  /*6*/
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 10px solid #000;
+}
+
+/*7*/
+.data-tip-down:before {
+  top: -11px;
+  border-bottom: 10px solid #000;
+}
+
+/*8*/
+.data-tip-left:after,
+.data-tip-left:before {
+  left: -10px;
+  top: 50%;
+  margin-top: -5px;
+  /*9*/
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-right: 10px solid #000;
+}
+
+/*10*/
+.data-tip-left:before {
+  left: -12px;
+  border-right: 10px solid #000;
+}
+
+/*11*/
+.data-tip-right:after,
+.data-tip-right:before {
+  right: -10px;
+  top: 50%;
+  margin-top: -5px;
+  /*12*/
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 10px solid #000;
+}
+
+/*13*/
+.data-tip-right:before {
+  right: -10px;
+  border-left: 10px solid #000;
+}
+
+/*14*/
+.data-tip-top:after,
+.data-tip-top:before {
+  left: 45%;
+  bottom: -10px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top: 10px solid #000;
+}
+
+.data-tip-top:before {
+  bottom: -11px;
+}
+
+/*-------------------------圆角-------------------------*/
+.bor-radius-upper {
+  border-radius: 4px 4px 0px 0px;
+}
+
+.bor-radius4 {
+  border-radius: 4px;
+}
+
+.bor-radius20 {
+  border-radius: 20px;
+}
+
+.bor-radius-all {
+  border-radius: 50%;
+}
+
+/*-------------------------旋转-------------------------*/
+.transform90 {
+  transform: rotate(90deg);
+}
+
+/*---------------------编辑器边框------------------------*/
+.kindeditor {
+  background: #F0F0EE;
+  height: 22px;
+  border: 1px solid #CCCCCC;
+  border-bottom: none
+}
+
+/*文本框只有下边框*/
+.other_input {
+  border: none;
+  border-bottom: 1px solid #aaa;
+  outline: none
+}
+
+/*两端对齐*/
+.justify {
+  text-align: justify !important;
+}
+
+/**/
+#edu-tab-nav .edu-position-hidebox li a {
+  font-size: 12px
+}
+
+/*在线课堂*/
+.courseRefer {
+  float: left;
+  max-height: 120px;
+  margin-bottom: 10px;
+  overflow: auto;
+  overflow-x: hidden;
+}
+
+.logo {
+  width: 295px;
+  height: 30px;
+  border-style: none;
+  position: absolute;
+  top: 50%;
+  left: 39%;
+}
+
+/**/
+.task-header-info .fork {
+  font-weight: bold;
+  font-size: 14px;
+  color: #666;
+}
+
+
+.memos_con a {
+  color: #3b94d6 !important;
+}
+
+.memos_con ul li {
+  list-style-type: disc !important;
+}
+
+.memos_con ol li {
+  list-style-type: decimal !important;
+}
+
+.memos_con li {
+  margin-bottom: 0 !important;
+}
+
+.memos_con pre {
+  overflow-x: auto;
+}
+
+/*详情a标签默认显示样式*/
+.a_default_show a {
+  color: #136ec2 !important
+}
+
+/*消息机制右侧小三角*/
+.tiding {
+  width: 100%;
+  height: 50px;
+  position: relative
+}
+
+.triangle {
+  position: absolute;
+  right: -1px;
+  top: 0px;
+  width: 0;
+  height: 0;
+  border-top: 35px solid #29bd8b;
+  border-left: 60px solid transparent;
+  z-index: 1
+}
+
+.triangle-new {
+  position: absolute;
+  right: 1px;
+  top: 0px;
+  z-index: 2;
+  font-size: 14px;
+  color: white;
+  transform: rotate(30deg);
+}
+
+.news_list_item {
+  padding: 10px 0px;
+}
+
+.news_list_item:nth-child(odd) {
+  background-color: #FAFBFB
+}
+
+.listItem_right {
+  line-height: 45px;
+  float: right;
+  max-width: 100px;
+  margin-right: 15px;
+  color: #888888
+}
+
+.listItem_middle {
+  max-width: 980px;
+}
+
+.news_fa {
+  font-size: 30px;
+  color: #888;
+  margin: 7px 16px;
+}
+
+.tiding_logo {
+  text-align: center;
+  background: #f3f3f3;
+  width: 200px;
+  height: 100px
+}
+
+.tr-position {
+  position: absolute;
+  left: 54%;
+  width: 20px;
+  text-align: center;
+  border: none !important;
+}
+
+.two_lines_show {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  height: 60px;
+  word-wrap: break-word;
+}
+
+.two_lines_show_my {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  height: 40px;
+  word-wrap: break-word;
+}
+
+.three_lines_show {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
+  height: 66px;
+  line-height: 22px;
+  word-wrap: break-word;
+}
+
+/*新版讨论区*/
+.discuss-tab a:hover {
+  border-bottom: 2px solid #FC7033 !important;
+  color: #000;
+}
+
+.discuss-lh40 {
+  line-height: 40px;
+}
+
+.discuss-lh16 {
+  line-height: 16px
+}
+
+.discuss-lh20 {
+  line-height: 20px;
+}
+
+.discuss-lh20 {
+  line-height: 20px;
+}
+
+.discuss-lh30 {
+  line-height: 30px;
+}
+
+.discuss-lh50 {
+  line-height: 50px;
+}
+
+.discuss-lh60 {
+  line-height: 60px
+}
+
+.discuss-lh80 {
+  line-height: 80px;
+}
+
+.discuss-lh100 {
+  line-height: 100px;
+}
+
+.discuss-bor-l {
+  border-left: 4px solid #ff7500;
+}
+
+.page-turn:hover {
+  background: #fff;
+  color: #FF7500;
+}
+
+/*实训路径/镜像类别图片*/
+.hor-ver-center {
+  width: 80px;
+  height: 80px;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  margin-left: -40px;
+  margin-top: -40px;
+}
+
+.hor-ver-center100 {
+  width: 100px;
+  height: 100px;
+  position: absolute;
+  left: 50%;
+  top: 25%;
+  margin-left: -50px;
+  margin-top: -25px;
+}
+
+.mirror-shade {
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 3;
+  display: none;
+}
+
+.position20 {
+  position: absolute;
+  top: -60px;
+  left: 7%;
+}
+
+/*--------TA的主页、关注*/
+.user_watch {
+  width: 78px;
+  padding: 2px 0px !important;
+}
+
+
+/*-------------主页块的背景颜色----------------*/
+.edu-index-bg-green {
+  background: #5bcab1;
+}
+
+.edu-index-bg-blue {
+  background: #75b9de;
+}
+
+.edu-index-bg-purple {
+  background: #8f97df;
+}
+
+.edu-index-bg-yellow {
+  background: #f7bb74;
+}
+
+.edu-index-bg-orange {
+  background: #e48a81;
+}
+
+
+/*-------------提示框颜色----------------*/
+.bor-reds {
+  border: 1px solid #FF0000 !important;
+  border-radius: 4px;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
\ No newline at end of file
diff --git a/public/css/edu-main.css b/public/css/edu-main.css
new file mode 100644
index 00000000..5dc75270
--- /dev/null
+++ b/public/css/edu-main.css
@@ -0,0 +1,4255 @@
+body {
+  font-size: 14px;
+  line-height: 2.0;
+  background: #fafafa !important;
+  font-family: "微软雅黑", "宋体";
+  color: #05101a;
+  height: 100%;
+  position: relative;
+}
+
+html,
+body {
+  height: 100%;
+}
+
+body,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+hr,
+p,
+blockquote,
+dl,
+dt,
+dd,
+ul,
+ol,
+li,
+pre,
+form,
+fieldset,
+legend,
+button,
+input,
+textarea,
+th,
+td,
+span {
+  margin: 0;
+  padding: 0;
+}
+
+table,
+input,
+textarea,
+select,
+button {
+  outline: none;
+  border-radius: 3px;
+  font-family: "微软雅黑", "宋体";
+  font-size: 14px;
+  line-height: 1.9;
+  border: 1px solid #eaeaea;
+  background: #FFFFff;
+  color: #05101A;
+}
+
+textarea {
+  resize: none;
+}
+
+/*设置input框的placehoder的字体颜色*/
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+  color: #cccccc
+}
+
+input::-moz-placeholder,
+textarea::-moz-placeholder {
+  color: #cccccc;
+}
+
+input::-moz-placeholder,
+textarea::-moz-placeholder {
+  color: #cccccc;
+}
+
+input::-ms-input-placeholder,
+textarea::-ms-input-placeholder {
+  color: #cccccc;
+}
+
+div,
+img,
+tr,
+td,
+table {
+  border: 0;
+}
+
+a:link,
+a:visited {
+  text-decoration: none;
+  color: #05101a;
+}
+
+a:hover {
+  color: #459be5;
+}
+
+ol,
+ul,
+li {
+  list-style-type: none;
+}
+
+select:disabled,
+input:disabled {
+  background-color: #EEEEEE;
+}
+
+/*万能清除浮动*/
+.clearfix:after {
+  clear: both;
+  content: ".";
+  display: block;
+  font-size: 0;
+  height: 0;
+  line-height: 0;
+  visibility: hidden;
+}
+
+.clearfix {
+  clear: both;
+  zoom: 1
+}
+
+.cl {
+  clear: both;
+  overflow: hidden;
+}
+
+/*通用浮动*/
+.fl {
+  float: left !important;
+}
+
+.fr {
+  float: right !important;
+}
+
+/*pre标签换行*/
+.break-word {
+  word-break: break-all;
+  word-wrap: break-word;
+}
+
+.break-word-firefox {
+  white-space: pre-wrap !important;
+  word-break: break-all;
+}
+
+/*文字左右两端对齐*/
+.justify {
+  text-align: justify
+}
+
+.indent {
+  text-indent: 2em;
+}
+
+.edu-name-dark {
+  max-width: 100px;
+  display: block;
+}
+
+.edu-info-dark {
+  max-width: 345px;
+  display: block;
+}
+
+.edu-max-h200 {
+  height: 200px;
+  overflow: auto;
+}
+
+.edu-h260 {
+  height: 260px;
+}
+
+.edu-h270 {
+  height: 270px;
+}
+
+.edu-h310 {
+  height: 310px;
+}
+
+.edu-position {
+  position: relative;
+}
+
+.edu-h200-auto {
+  max-height: 200px;
+  overflow: auto;
+}
+
+.edu-h300-auto {
+  max-height: 300px;
+  overflow: auto;
+}
+
+.edu-h350-auto {
+  max-height: 350px;
+  overflow: auto;
+}
+
+.edu-h280-auto {
+  height: 280px;
+  overflow: auto;
+}
+
+.edu-txt-w240 {
+  width: 240px;
+  display: block;
+}
+
+.edu-txt-w280 {
+  width: 280px;
+  display: block;
+}
+
+.edu-txt-w320 {
+  width: 320px;
+  display: block;
+}
+
+.edu-txt-w200 {
+  width: 200px;
+  display: block;
+}
+
+a.edu-txt-w280,
+.edu-txt-w280 {
+  width: 280px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w190,
+.edu-txt-w190 {
+  width: 190px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w160,
+.edu-txt-w160 {
+  width: 160px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w140,
+.edu-txt-w140 {
+  width: 141px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w130,
+.edu-txt-w130 {
+  width: 130px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w120,
+.edu-txt-w120 {
+  width: 120px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w100,
+.edu-txt-w100 {
+  width: 100px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w90,
+.edu-txt-w90 {
+  width: 90px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w80,
+.edu-txt-w80 {
+  width: 80px;
+  display: inline-block;
+  text-align: center
+}
+
+/*超过隐藏*/
+.overellipsis {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.task-hide {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.task-hide-2 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+}
+
+/*隐藏*/
+.none {
+  display: none
+}
+
+.block {
+  display: block;
+}
+
+.boxsizing {
+  box-sizing: border-box
+}
+
+
+/*字体icon均为18px*/
+.iconfont {
+  font-size: 18px !important;
+}
+
+/*通用文字大小样式*/
+.font-n {
+  font-weight: normal !important;
+}
+
+.font-bd {
+  font-weight: bold;
+}
+
+.font-n {
+  font-weight: normal;
+}
+
+.font-12 {
+  font-size: 12px !important;
+}
+
+.font-13 {
+  font-size: 13px !important;
+}
+
+.font-14 {
+  font-size: 14px !important;
+}
+
+.font-15 {
+  font-size: 15px !important;
+}
+
+.font-16 {
+  font-size: 16px !important;
+}
+
+.font-17 {
+  font-size: 17px !important;
+}
+
+.font-18 {
+  font-size: 18px !important;
+}
+
+.font-20 {
+  font-size: 20px !important;
+}
+
+.font-22 {
+  font-size: 22px !important;
+}
+
+.font-25 {
+  font-size: 25px !important;
+}
+
+.font-24 {
+  font-size: 24px !important;
+}
+
+.font-26 {
+  font-size: 26px !important;
+}
+
+.font-28 {
+  font-size: 28px !important;
+}
+
+.font-30 {
+  font-size: 30px !important;
+}
+
+.font-32 {
+  font-size: 32px !important;
+}
+
+.font-36 {
+  font-size: 36px !important;
+}
+
+.font-50 {
+  font-size: 50px !important;
+}
+
+.font-60 {
+  font-size: 60px !important;
+}
+
+.font-70 {
+  font-size: 70px !important;
+}
+
+/*a标签的下划线*/
+a.decoration {
+  text-decoration: underline
+}
+
+/*表单*/
+.panel-form-label {
+  display: inline-block;
+  width: 10%;
+  min-width: 90px;
+  text-align: right;
+  line-height: 40px;
+  font-weight: normal;
+}
+
+/*通用内外边距*/
+.mt-10 {
+  margin-top: -10px;
+}
+
+.mt-3 {
+  margin-top: -3px;
+}
+
+.mt0 {
+  margin-top: 0px !important;
+}
+
+.mt1 {
+  margin-top: 1px;
+}
+
+.mt2 {
+  margin-top: 2px;
+}
+
+.mt3 {
+  margin-top: 3px;
+}
+
+.mt4 {
+  margin-top: 4px;
+}
+
+.mt5 {
+  margin-top: 5px !important;
+}
+
+.mt6 {
+  margin-top: 6px;
+}
+
+.mt7 {
+  margin-top: 7px !important;
+}
+
+.mt8 {
+  margin-top: 8px;
+}
+
+.mt9 {
+  margin-top: 9px;
+}
+
+.mt10 {
+  margin-top: 10px !important;
+}
+
+.mt12 {
+  margin-top: 12px;
+}
+
+.mt13 {
+  margin-top: 13px;
+}
+
+.mt14 {
+  margin-top: 14px;
+}
+
+.mt15 {
+  margin-top: 15px !important;
+}
+
+.mt16 {
+  margin-top: 16px;
+}
+
+.mt17 {
+  margin-top: 17px;
+}
+
+.mt18 {
+  margin-top: 18px;
+}
+
+.mt20 {
+  margin-top: 20px !important;
+}
+
+.mt22 {
+  margin-top: 22px !important;
+}
+
+.mt23 {
+  margin-top: 23px !important;
+}
+
+.mt24 {
+  margin-top: 24px !important;
+}
+
+.mt25 {
+  margin-top: 25px;
+}
+
+.mt28 {
+  margin-top: 28px;
+}
+
+.mt30 {
+  margin-top: 30px !important;
+}
+
+.mt34 {
+  margin-top: 34px !important;
+}
+
+.mt35 {
+  margin-top: 35px !important;
+}
+
+.mt36 {
+  margin-top: 36px !important;
+}
+
+.mt40 {
+  margin-top: 40px;
+}
+
+.mt45 {
+  margin-top: 45px;
+}
+
+.mt46 {
+  margin-top: 46px;
+}
+
+.mt50 {
+  margin-top: 50px;
+}
+
+.mt56 {
+  margin-top: 56px;
+}
+
+.mt60 {
+  margin-top: 60px;
+}
+
+.mt70 {
+  margin-top: 70px;
+}
+
+.mt80 {
+  margin-top: 80px;
+}
+
+.mt95 {
+  margin-top: 95px;
+}
+
+.mt100 {
+  margin-top: 100px;
+}
+
+.mt110 {
+  margin-top: 110px;
+}
+
+.mt120 {
+  margin-top: 120px;
+}
+
+.mt130 {
+  margin-top: 130px;
+}
+
+.mt140 {
+  margin-top: 140px;
+}
+
+.mt150 {
+  margin-top: 150px;
+}
+
+.mt160 {
+  margin-top: 160px;
+}
+
+.mb0 {
+  margin-bottom: 0px !important;
+}
+
+.mb3 {
+  margin-bottom: 3px;
+}
+
+.mb5 {
+  margin-bottom: 5px;
+}
+
+.mb7 {
+  margin-bottom: 7px;
+}
+
+.mb10 {
+  margin-bottom: 10px;
+}
+
+.mb11 {
+  margin-bottom: 11px;
+}
+
+.mb14 {
+  margin-bottom: 14px;
+}
+
+.mb15 {
+  margin-bottom: 15px;
+}
+
+.mb16 {
+  margin-bottom: 16px;
+}
+
+.mb20 {
+  margin-bottom: 20px !important;
+}
+
+.mb25 {
+  margin-bottom: 25px;
+}
+
+.mb26 {
+  margin-bottom: 26px;
+}
+
+.mb28 {
+  margin-bottom: 28px;
+}
+
+.mb30 {
+  margin-bottom: 30px !important;
+}
+
+.mb40 {
+  margin-bottom: 40px !important;
+}
+
+.mb50 {
+  margin-bottom: 50px !important;
+}
+
+.mb60 {
+  margin-bottom: 60px !important;
+}
+
+.mb70 {
+  margin-bottom: 70px !important;
+}
+
+.mb80 {
+  margin-bottom: 80px !important;
+}
+
+.mb90 {
+  margin-bottom: 90px !important;
+}
+
+.mb100 {
+  margin-bottom: 100px !important;
+}
+
+.mb110 {
+  margin-bottom: 110px;
+}
+
+.ml-3 {
+  margin-left: -3px;
+}
+
+.ml1 {
+  margin-left: 1px;
+}
+
+.ml2 {
+  margin-left: 2px;
+}
+
+.ml3 {
+  margin-left: 3px;
+}
+
+.ml4 {
+  margin-left: 4px;
+}
+
+.ml5 {
+  margin-left: 5px;
+}
+
+.ml6 {
+  margin-left: 6px;
+}
+
+.ml10 {
+  margin-left: 10px;
+}
+
+.ml12 {
+  margin-left: 12px !important;
+}
+
+.ml13 {
+  margin-left: 13px !important;
+}
+
+.ml15 {
+  margin-left: 15px;
+}
+
+.ml18 {
+  margin-left: 18px;
+}
+
+.ml20 {
+  margin-left: 20px;
+}
+
+.ml22 {
+  margin-left: 22px;
+}
+
+.ml25 {
+  margin-left: 25px;
+}
+
+.ml29 {
+  margin-left: 29px;
+}
+
+.ml30 {
+  margin-left: 30px;
+}
+
+.ml33 {
+  margin-left: 33px;
+}
+
+.ml35 {
+  margin-left: 35px;
+}
+
+.ml40 {
+  margin-left: 40px;
+}
+
+.ml42 {
+  margin-left: 42px;
+}
+
+.ml45 {
+  margin-left: 45px;
+}
+
+.ml50 {
+  margin-left: 50px;
+}
+
+.ml55 {
+  margin-left: 55px;
+}
+
+.ml60 {
+  margin-left: 60px;
+}
+
+.ml72 {
+  margin-left: 72px;
+}
+
+.ml73 {
+  margin-left: 73px;
+}
+
+.ml75 {
+  margin-left: 75px;
+}
+
+.ml80 {
+  margin-left: 80px;
+}
+
+.ml85 {
+  margin-left: 85px;
+}
+
+.ml95 {
+  margin-left: 95px;
+}
+
+.ml115 {
+  margin-left: 115px
+}
+
+.ml123 {
+  margin-left: 123px;
+}
+
+.ml150 {
+  margin-left: 150px;
+}
+
+.ml180 {
+  margin-left: 180px;
+}
+
+.ml230 {
+  margin-left: 230px;
+}
+
+.ml240 {
+  margin-left: 240px;
+}
+
+.ml250 {
+  margin-left: 250px;
+}
+
+.ml290 {
+  margin-left: 290px;
+}
+
+.mr3 {
+  margin-right: 3px
+}
+
+.mr4 {
+  margin-right: 4px
+}
+
+.mr5 {
+  margin-right: 5px;
+}
+
+.mr8 {
+  margin-right: 8px;
+}
+
+.mr10 {
+  margin-right: 10px;
+}
+
+.mr12 {
+  margin-right: 12px !important;
+}
+
+.mr15 {
+  margin-right: 15px;
+}
+
+.mr18 {
+  margin-right: 18px;
+}
+
+.mr20 {
+  margin-right: 20px;
+}
+
+.mr24 {
+  margin-right: 24px;
+}
+
+.mr25 {
+  margin-right: 25px;
+}
+
+.mr30 {
+  margin-right: 30px;
+}
+
+.mr35 {
+  margin-right: 35px;
+}
+
+.mr40 {
+  margin-right: 40px;
+}
+
+.mr45 {
+  margin-right: 45px;
+}
+
+.mr50 {
+  margin-right: 50px;
+}
+
+.mr60 {
+  margin-right: 60px;
+}
+
+.mr70 {
+  margin-right: 70px;
+}
+
+.mr75 {
+  margin-right: 75px;
+}
+
+.mr80 {
+  margin-right: 80px;
+}
+
+.mr90 {
+  margin-right: 90px;
+}
+
+.mr100 {
+  margin-right: 100px;
+}
+
+.mr110 {
+  margin-right: 110px;
+}
+
+.mr350 {
+  margin-right: 350px;
+}
+
+.ml61 {
+  margin-left: 61px;
+}
+
+.pt1 {
+  padding-top: 1px;
+}
+
+.pt3 {
+  padding-top: 3px !important;
+}
+
+.pt5 {
+  padding-top: 5px !important;
+}
+
+.pt10 {
+  padding-top: 10px;
+}
+
+.pt15 {
+  padding-top: 15px;
+}
+
+.pt17 {
+  padding-top: 17px;
+}
+
+.pt20 {
+  padding-top: 20px !important;
+}
+
+.pt25 {
+  padding-top: 25px;
+}
+
+.pt30 {
+  padding-top: 30px;
+}
+
+.pt35 {
+  padding-top: 35px;
+}
+
+.pt37 {
+  padding-top: 37px;
+}
+
+.pt40 {
+  padding-top: 40px;
+}
+
+.pt47 {
+  padding-top: 47px;
+}
+
+.pt49 {
+  padding-top: 49px;
+}
+
+.pt50 {
+  padding-top: 50px;
+}
+
+.pt60 {
+  padding-top: 60px;
+}
+
+.pt70 {
+  padding-top: 70px;
+}
+
+.pt80 {
+  padding-top: 80px;
+}
+
+.pt90 {
+  padding-top: 90px;
+}
+
+.pt100 {
+  padding-top: 100px;
+}
+
+.pt110 {
+  padding-top: 110px;
+}
+
+.pt120 {
+  padding-top: 120px;
+}
+
+.pt130 {
+  padding-top: 130px;
+}
+
+.pb3 {
+  padding-bottom: 3px !important;
+}
+
+.pb5 {
+  padding-bottom: 5px !important;
+}
+
+.pb10 {
+  padding-bottom: 10px;
+}
+
+.pb15 {
+  padding-bottom: 15px;
+}
+
+.pb20 {
+  padding-bottom: 20px;
+}
+
+.pb25 {
+  padding-bottom: 20px;
+}
+
+.pb25 {
+  padding-bottom: 20px;
+}
+
+.pb28 {
+  padding-bottom: 28px;
+}
+
+.pb30 {
+  padding-bottom: 30px;
+}
+
+.pb35 {
+  padding-bottom: 35px;
+}
+
+.pb40 {
+  padding-bottom: 40px;
+}
+
+.pb47 {
+  padding-bottom: 47px;
+}
+
+.pb50 {
+  padding-bottom: 50px;
+}
+
+.pb60 {
+  padding-bottom: 60px;
+}
+
+.pb70 {
+  padding-bottom: 70px;
+}
+
+.pb80 {
+  padding-bottom: 80px;
+}
+
+.pb90 {
+  padding-bottom: 90px;
+}
+
+.pb100 {
+  padding-bottom: 100px;
+}
+
+.pb110 {
+  padding-bottom: 110px;
+}
+
+.pb155 {
+  padding-bottom: 155px;
+}
+
+.pr2 {
+  paddding-right: 2px;
+}
+
+.pr5 {
+  padding-right: 5px;
+}
+
+.pr10 {
+  padding-right: 10px;
+}
+
+.pr15 {
+  padding-right: 15px;
+}
+
+.pr20 {
+  padding-right: 20px !important;
+}
+
+.pr30 {
+  padding-right: 30px !important;
+}
+
+.pr35 {
+  padding-right: 35px !important;
+}
+
+.pr42 {
+  padding-right: 42px;
+}
+
+.pr45 {
+  padding-right: 45px;
+}
+
+.pr48 {
+  padding-right: 48px;
+}
+
+.pr57 {
+  padding-right: 57px;
+}
+
+.pr60 {
+  padding-right: 60px;
+}
+
+.pr70 {
+  padding-right: 70px;
+}
+
+.pr72 {
+  padding-right: 72px;
+}
+
+.pr75 {
+  padding-right: 75px;
+}
+
+.pr88 {
+  padding-right: 88px;
+}
+
+.pl0 {
+  padding-left: 0px !important;
+}
+
+.pl2 {
+  padding-left: 2px;
+}
+
+.pl5 {
+  padding-left: 5px;
+}
+
+.pl7 {
+  padding-left: 7px;
+}
+
+.pl8 {
+  padding-left: 8px;
+}
+
+.pl10 {
+  padding-left: 10px;
+}
+
+.pl15 {
+  padding-left: 15px;
+}
+
+.pl20 {
+  padding-left: 20px;
+}
+
+.pl22 {
+  padding-left: 22px;
+}
+
+.pl25 {
+  padding-left: 25px;
+}
+
+.pl28 {
+  padding-left: 28px;
+}
+
+.pl30 {
+  padding-left: 30px !important;
+}
+
+.pl33 {
+  padding-left: 33px
+}
+
+.pl35 {
+  padding-left: 35px;
+}
+
+.pl40 {
+  padding-left: 40px;
+}
+
+.pl42 {
+  padding-left: 42px;
+}
+
+.pl45 {
+  padding-left: 45px;
+}
+
+.pl50 {
+  padding-left: 50px;
+}
+
+.pl60 {
+  padding-left: 60px;
+}
+
+.pl70 {
+  padding-left: 70px;
+}
+
+.pl75 {
+  padding-left: 75px;
+}
+
+.pl80 {
+  padding-left: 80px;
+}
+
+.pl88 {
+  padding-left: 88px;
+}
+
+.pl92 {
+  padding-left: 92px;
+}
+
+.pl100 {
+  padding-left: 100px;
+}
+
+.pr2 {
+  paddding-right: 2px;
+}
+
+.pr5 {
+  padding-right: 5px;
+}
+
+.pr7 {
+  padding-right: 7px;
+}
+
+.pr10 {
+  padding-right: 10px;
+}
+
+.pr15 {
+  padding-right: 15px;
+}
+
+.pr20 {
+  padding-right: 20px !important;
+}
+
+.pr25 {
+  padding-right: 25px !important;
+}
+
+.pr30 {
+  padding-right: 30px !important;
+}
+
+.pr40 {
+  padding-right: 40px;
+}
+
+.pr42 {
+  padding-right: 42px;
+}
+
+.pr45 {
+  padding-right: 45px;
+}
+
+.pr60 {
+  padding-right: 60px;
+}
+
+.pr75 {
+  padding-right: 75px;
+}
+
+.padding5-10 {
+  padding: 5px 10px;
+  box-sizing: border-box
+}
+
+.padding5-20 {
+  padding: 5px 20px;
+  box-sizing: border-box
+}
+
+.padding10 {
+  padding: 10px;
+  box-sizing: border-box
+}
+
+.padding15 {
+  padding: 15px;
+  box-sizing: border-box
+}
+
+.padding20 {
+  padding: 20px;
+  box-sizing: border-box
+}
+
+.padding10-20 {
+  padding: 10px 20px;
+  box-sizing: border-box
+}
+
+.padding10-15 {
+  padding: 10px 15px;
+  box-sizing: border-box
+}
+
+.padding10-25 {
+  padding: 10px 25px;
+  box-sizing: border-box
+}
+
+.padding10-30 {
+  padding: 10px 30px;
+  box-sizing: border-box
+}
+
+.padding15-20 {
+  padding: 15px 20px;
+  box-sizing: border-box
+}
+
+.padding15-25 {
+  padding: 15px 25px;
+  box-sizing: border-box
+}
+
+.padding20-40 {
+  padding: 20px 40px;
+  box-sizing: border-box
+}
+
+.padding20-30 {
+  padding: 20px 30px;
+  box-sizing: border-box
+}
+
+.padding20-15 {
+  padding: 20px 15px;
+  box-sizing: border-box
+}
+
+.padding20-10 {
+  padding: 20px 10px;
+  box-sizing: border-box
+}
+
+.padding30 {
+  padding: 30px;
+  box-sizing: border-box
+}
+
+.padding30-20 {
+  padding: 30px 20px;
+  box-sizing: border-box
+}
+
+.padding30-40 {
+  padding: 30px 40px;
+  box-sizing: border-box
+}
+
+.padding40 {
+  padding: 40px;
+  box-sizing: border-box
+}
+
+.padding40-30 {
+  padding: 40px 30px;
+  box-sizing: border-box
+}
+
+.padding40-20 {
+  padding: 40px 20px;
+  box-sizing: border-box
+}
+
+.margin10 {
+  margin: 10px;
+}
+
+.margin15 {
+  margin: 15px;
+}
+
+.margin20 {
+  margin: 20px;
+}
+
+/*行高*/
+.lineh-12 {
+  line-height: 12px !important;
+}
+
+.lineh-15 {
+  line-height: 15px !important;
+}
+
+.lineh-17 {
+  line-height: 17px !important;
+}
+
+.lineh-20 {
+  line-height: 20px !important;
+}
+
+.lineh-24 {
+  line-height: 24px !important;
+}
+
+.lineh-25 {
+  line-height: 25px !important;
+}
+
+.lineh-30 {
+  line-height: 30px !important;
+}
+
+.lineh-35 {
+  line-height: 35px !important;
+}
+
+.lineh-40 {
+  line-height: 40px !important;
+}
+
+/*pre标签换行*/
+.break_word {
+  word-break: break-all;
+  word-wrap: break-word;
+}
+
+.break_word_firefox {
+  white-space: pre-wrap !important;
+  word-break: break-all;
+}
+
+/*定位*/
+.pr {
+  position: relative
+}
+
+.df {
+  display: flex;
+  display: -webkit-flex;
+  display: -ms-flex;
+}
+
+.flex1 {
+  flex: 1;
+}
+
+/*去掉IE input框输入时自带的清除按钮*/
+input::-ms-clear {
+  display: none;
+}
+
+/*自定义滚动条宽度*/
+::-webkit-scrollbar {
+  width: 7px;
+  height: 10px;
+  background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar-thumb {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+  background-color: #dadada;
+}
+
+
+.newContainer {
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
+  /*IE6不识别min-height*/
+  position: relative;
+}
+
+.educontent {
+  width: 1200px;
+  margin: 0px auto;
+  box-sizing: border-box
+}
+
+/*中间部分宽度固定为1200*/
+.newMain {
+  margin: 0 auto;
+  padding-bottom: 235px;
+  min-width: 1200px;
+}
+
+/*padding-bottom根据底部的高度而定*/
+.newMain {
+  padding-bottom: 124px !important;
+}
+
+/*高度*/
+.height-100 {
+  height: 100%;
+}
+
+/*文本位置*/
+.edu-txt-center {
+  text-align: center !important;
+}
+
+.edu-txt-left {
+  text-align: left !important;
+}
+
+.edu-txt-right {
+  text-align: right !important;
+}
+
+/*背景颜色*/
+.edu-back-white {
+  background-color: #FFFFff;
+}
+
+.edu-back-greyf5 {
+  background-color: #f5f5f5 !important;
+}
+
+.edu-back-skyblue {
+  background: #F4FAFF;
+}
+
+.edu-back-blue {
+  background-color: #459be6 !important;
+}
+
+.edu-back-blue-txt {
+  background-color: #F7FBFF !important;
+}
+
+.edu-bg-light-blue {
+  background: #f7f9fd;
+  padding: 5px;
+}
+
+/*发送实训弹框*/
+/*常用字体*/
+/*红色*/
+.color-red {
+  color: #FF0000 !important;
+}
+
+/*白色*/
+.color-white {
+  color: #ffffff !important;
+}
+
+/*黑色*/
+.color-dark {
+  color: #05101a !important;
+}
+
+.color-ooo {
+  color: #000 !important;
+}
+
+/*灰色*/
+.color-grey-name {
+  color: #1A0B00 !important;
+}
+
+.color-grey-fa {
+  color: #FAFAFA !important;
+}
+
+.color-grey-3 {
+  color: #333 !important;
+}
+
+.color-grey-eb {
+  color: #EBEBEB !important;
+}
+
+.color-grey-c {
+  color: #ccc !important;
+}
+
+.color-grey-cd {
+  color: #cdcdcd !important;
+}
+
+.color-grey-9 {
+  color: #999999 !important;
+}
+
+.color-grey-98 {
+  color: #989898 !important;
+}
+
+.color-grey-8 {
+  color: #888 !important;
+}
+
+.color-grey-6 {
+  color: #666 !important;
+}
+
+.color-grey-4d {
+  color: #4d4d4d !important;
+}
+
+.color-grey-B2 {
+  color: #B2B2B2 !important;
+}
+
+.color-grey-B3 {
+  color: #B3B3B3 !important;
+}
+
+.color-grey-B4 {
+  color: #B4B4B4 !important;
+}
+
+.color-grey-74 {
+  color: #747A7F !important;
+}
+
+
+a.color-grey-name:hover,
+a.color-dark:hover,
+a.color-grey-6:hover,
+a.color-grey-3:hover {
+  color: #4cacff !important;
+}
+
+a.color-grey-9:hover,
+a.color-grey-8:hover,
+a.color-grey-c:hover {
+  color: #111C24 !important;
+}
+
+/*蓝色*/
+.color-blue {
+  color: #4CACFF !important;
+}
+
+/*主*/
+.color-blue_4C {
+  color: #4CACFF !important;
+}
+
+a.color-blue:hover,
+a.color-blue_4C:hover {
+  color: #459BE6 !important;
+}
+
+/*橙色*/
+.color-orange {
+  color: #ff6800 !important;
+}
+
+/*辅助文字*/
+.color-orange-tip {
+  color: #FF954C !important;
+}
+
+/*提示文字*/
+.color-orange-tips {
+  color: #FF8204 !important;
+}
+
+/*提示文字*/
+a.color-orange:hover,
+a.color-orange-tip:hover {
+  color: #F06200 !important;
+}
+
+/*黄色*/
+.color-yellow {
+  color: #EFC003 !important;
+}
+
+.color-yellow-ff {
+  color: #FFA800 !important
+}
+
+/*绿色*/
+.color-green {
+  color: #29BD8B !important;
+}
+
+a.color-green:hover {
+  color: #28AC7F !important;
+}
+
+/*红色*/
+.color-red-dd {
+  color: #DD1717 !important;
+}
+
+a.color-red-dd:hover {
+  color: #C61616 !important;
+}
+
+/*圆角*/
+.radius {
+  border-radius: 50%;
+}
+
+.radius4 {
+  border-radius: 4px;
+}
+
+.radius2 {
+  border-radius: 2px;
+}
+
+
+/*绿色圆形--例如：实训路径详情的编辑icon的背景*/
+.ring-green {
+  width: 18px;
+  height: 18px;
+  display: block;
+  border-radius: 50%;
+  background-color: #29BD8B;
+  text-align: center;
+}
+
+.ring-op-green {
+  width: 18px;
+  height: 18px;
+  display: block;
+  border-radius: 50%;
+  background-color: rgba(41, 189, 139, 0.6);
+  text-align: center;
+}
+
+.ring-grey {
+  width: 18px;
+  height: 18px;
+  line-height: 18px;
+  display: block;
+  border-radius: 50%;
+  background-color: rgba(204, 204, 204, 0.5);
+  text-align: center;
+}
+
+.ring-blue {
+  width: 18px;
+  height: 18px;
+  display: block;
+  border-radius: 50%;
+  background-color: #4CACFF;
+  text-align: center;
+}
+
+.ring-orange {
+  background-color: #FF6800;
+  display: block;
+  padding: 0px 3px;
+  height: 18px;
+  box-sizing: border-box;
+  min-width: 18px;
+  text-align: center;
+  line-height: 18px;
+  border-radius: 50%;
+  color: #fff;
+  font-size: 12px;
+}
+
+/*左侧label内容右对齐*/
+.label-right {
+  min-width: 75px;
+  text-align: right;
+  height: 35px;
+  line-height: 35px;
+  float: left;
+}
+
+
+/*输入框样式---------宽度为百分比*/
+.input-flex-30 {
+  flex: 1;
+  height: 30px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-flex-35 {
+  flex: 1;
+  height: 35px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-flex-40 {
+  flex: 1;
+  height: 40px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-100-35 {
+  width: 100%;
+  height: 35px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-100-40 {
+  width: 100%;
+  height: 40px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-100-45 {
+  width: 100%;
+  height: 45px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-90-35 {
+  width: 90%;
+  height: 35px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-60-40 {
+  width: 60%;
+  height: 40px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-60-35 {
+  width: 60%;
+  height: 35px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-50-35 {
+  width: 50%;
+  height: 35px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-50-40 {
+  width: 50%;
+  height: 40px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-50-45 {
+  width: 50%;
+  height: 45px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-48-45 {
+  width: 48%;
+  height: 45px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+/*输入框为灰色背景，获取焦点时背景变白色*/
+.greyInput {
+  background-color: #F5F5F5;
+  outline: none
+}
+
+.greyInput:focus {
+  background-color: #fff;
+  border: 1px solid #ddd;
+}
+
+/*输入框样式---------宽度为固定长度*/
+.winput-240-45 {
+  width: 240px;
+  height: 45px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-240-40 {
+  width: 240px;
+  height: 40px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-240-35 {
+  width: 240px;
+  height: 35px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-240-30 {
+  width: 240px;
+  height: 30px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-190-45 {
+  width: 190px;
+  height: 45px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-200-35 {
+  width: 200px;
+  height: 35px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-120-40 {
+  width: 120px;
+  height: 40px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-120-35 {
+  width: 120px;
+  height: 35px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-120-30 {
+  width: 120px;
+  height: 30px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-115-40 {
+  width: 115px;
+  height: 40px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-90-40 {
+  width: 90px;
+  height: 40px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-90-35 {
+  width: 90px;
+  height: 35px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-240-100 {
+  width: 240px;
+  height: 100px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+/*输入框样式---------高度固定*/
+.winput-90-100 {
+  width: 90%;
+  height: 100px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-100-130 {
+  width: 100%;
+  height: 130px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-100-150 {
+  width: 100%;
+  height: 150px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-100-200 {
+  width: 100%;
+  height: 200px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-90-100 {
+  width: 90%;
+  height: 100px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+/*百分比宽度*/
+.width100 {
+  width: 100%;
+}
+
+.width90 {
+  width: 90%;
+}
+
+.width89 {
+  width: 89%;
+}
+
+.width80 {
+  width: 80%;
+}
+
+.width70 {
+  width: 70%;
+}
+
+.width60 {
+  width: 60%;
+}
+
+.width50 {
+  width: 50%;
+}
+
+.width40 {
+  width: 40%;
+}
+
+.width30 {
+  width: 30%;
+}
+
+.width20 {
+  width: 20%;
+}
+
+.width15 {
+  width: 15%;
+}
+
+.width10 {
+  width: 10%;
+}
+
+/*固定大小的宽度*/
+.wid100 {
+  width: 100px;
+  display: block
+}
+
+.wid120 {
+  width: 120px;
+  display: block
+}
+
+.wid90 {
+  min-width: 90px !important;
+  display: block
+}
+
+a.edu-txt-w280,
+.edu-txt-w280 {
+  width: 280px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w200,
+.edu-txt-w200 {
+  width: 200px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w190,
+.edu-txt-w190 {
+  width: 190px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w160,
+.edu-txt-w160 {
+  width: 160px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w140,
+.edu-txt-w140 {
+  width: 141px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w130,
+.edu-txt-w130 {
+  width: 130px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w120,
+.edu-txt-w120 {
+  width: 120px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w100,
+.edu-txt-w100 {
+  width: 100px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w90,
+.edu-txt-w90 {
+  width: 90px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w80,
+.edu-txt-w80 {
+  width: 80px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w40,
+.edu-txt-w40 {
+  width: 40px;
+  display: inline-block;
+  text-align: center
+}
+
+/*最小高度*/
+.minH-40 {
+  min-height: 490px;
+}
+
+.minH-280 {
+  min-height: 280px;
+}
+
+.minH-400 {
+  min-height: 400px;
+}
+
+.minH-440 {
+  min-height: 440px;
+}
+
+.minH-500 {
+  min-height: 500px;
+}
+
+.minH-560 {
+  min-height: 560px;
+}
+
+/*超出高度出现滚动条--纵向*/
+.over260 {
+  max-height: 260px;
+  overflow-y: auto
+}
+
+.over210 {
+  height: 210px;
+  overflow-y: auto
+}
+
+.over280 {
+  height: 280px;
+  overflow-y: auto
+}
+
+.over170 {
+  min-height: 170px;
+  max-height: 170px;
+  overflow-y: auto
+}
+
+/*---------------tab公用边框-----------------*/
+.border-bottom-orange {
+  border-bottom: 2px solid #FC7033 !important;
+}
+
+.bor-bottom-orange {
+  border-bottom: 1px solid #FF9e6a !important;
+}
+
+.bor-bottom-greyE {
+  border-bottom: 1px solid #EEEEEE !important;
+}
+
+.bor-left-greyE {
+  border-left: 1px solid #EEEEEE !important;
+}
+
+.bor-top-greyE {
+  border-top: 1px solid #EEEEEE !important;
+}
+
+.bor-right-greyE {
+  border-right: 1px solid #EEEEEE !important;
+}
+
+.bor-left-greyC {
+  border-left: 1px solid #CCC !important;
+}
+
+.bor-top-greyC {
+  border-top: 1px solid #CCC !important;
+}
+
+/*---------------边框-----------------*/
+.bor-gray-c {
+  border: 1px solid #ccc;
+}
+
+.bor-grey-e {
+  border: 1px solid #eee;
+}
+
+.bor-grey-d {
+  border: 1px solid #ddd;
+}
+
+.bor-grey01 {
+  border: 1px solid #E6EAEB;
+}
+
+.bor-orange {
+  border: 1px solid #FF7500;
+}
+
+.bor-blue {
+  border: 1px solid #5faee3;
+}
+
+.bor-red {
+  border: 1px solid #db0505 !important;
+}
+
+.bor-none {
+  border: none;
+}
+
+.bor-outnone {
+  outline: none;
+  border: 0px;
+}
+
+a.decoration {
+  text-decoration: underline !important;
+}
+
+/*下拉菜单*/
+.edu-menu-panel {
+  position: relative;
+  cursor: pointer
+}
+
+.edu-menu-list {
+  position: absolute;
+  padding: 5px 0px;
+  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, .2);
+  display: none;
+  width: 120px;
+  background: #FFFFff;
+  right: -5px;
+  border-radius: 0px 0px 4px 4px;
+  color: #05101a;
+  font-size: 14px;
+  z-index: 9
+}
+
+.edu-menu-list li {
+  width: 100%;
+  padding: 0px 15px;
+  box-sizing: border-box;
+  height: 35px;
+  line-height: 35px;
+  cursor: pointer;
+}
+
+.edu-menuSmall-list {
+  position: absolute;
+  padding: 5px 0px;
+  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, .2);
+  display: none;
+  width: 100px;
+  background: #FFFFff;
+  right: -5px;
+  border-radius: 0px 0px 4px 4px;
+  color: #05101a;
+  font-size: 14px;
+  z-index: 9
+}
+
+.edu-menuSmall-list li {
+  width: 100%;
+  padding: 0px 10px;
+  box-sizing: border-box;
+  height: 30px;
+  line-height: 30px;
+  cursor: pointer;
+  font-size: 12px;
+}
+
+.edu-menu-list li a,
+.edu-menuSmall-list li a {
+  width: 100%;
+  height: 100%;
+  display: block;
+  color: #323232;
+}
+
+.edu-menu-panel:hover i,
+.edu-menu-panel:hover {
+  color: #4cacff;
+}
+
+.edu-menu-panel:hover .edu-menu-list,
+.edu-menu-panel:hover .edu-menuSmall-list {
+  display: block
+}
+
+.edu-menu-list li:hover,
+.edu-menuSmall-list li:hover {
+  background: #4CACFF;
+}
+
+.edu-menu-list li:hover a,
+.edu-menuSmall-list li:hover a {
+  color: #fff !important;
+}
+
+.currentName {
+  display: block;
+  width: 100%;
+  padding: 0px 15px;
+  height: 40px;
+  line-height: 40px;
+  font-size: 16px;
+  box-sizing: border-box;
+  cursor: default
+}
+
+.ul-leftline:after {
+  position: absolute;
+  top: 0px;
+  content: "";
+  width: 1px;
+  background-color: #eee;
+  height: 100%;
+  right: 0px;
+}
+
+.overPart {
+  width: 240px;
+  height: 30px;
+  position: absolute;
+  right: 0;
+  top: -27px;
+  background: transparent;
+}
+
+/*滑块验证*/
+.drag_slider {
+  position: relative;
+  background-color: #e8e8e8;
+  width: 100%;
+  height: 45px;
+  color: #999999;
+  line-height: 45px;
+  text-align: center;
+  border-radius: 4px;
+}
+
+.drag_slider .handler {
+  border-radius: 4px 0px 0px 4px;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  width: 50px;
+  height: 43px;
+  border: 1px solid #eee;
+  cursor: move;
+}
+
+.handler_bg {
+  background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;
+}
+
+.handler_ok_bg {
+  background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;
+}
+
+.drag_slider .drag_bg {
+  background-color: #29bd8b;
+  height: 45px;
+  width: 0px;
+}
+
+.drag_slider .drag_text {
+  border-radius: 4px 0px 0px 4px;
+  position: absolute;
+  top: 0px;
+  width: 100%;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  user-select: none;
+  -o-user-select: none;
+  -ms-user-select: none;
+}
+
+/*tip公共样式的设置：*/
+.-task-title {
+  opacity: 0;
+  position: absolute;
+  left: 0;
+  top: 0;
+  display: none;
+  z-index: 100000;
+}
+
+/*1*/
+.data-tip-down,
+.data-tip-left,
+.data-tip-right,
+.data-tip-top {
+  position: relative;
+  box-shadow: 0px 0px 8px #000;
+  background: #000;
+  color: #fff;
+  max-width: 300px;
+  /*2*/
+  word-wrap: break-word;
+  text-align: center;
+  border-radius: 4px;
+  padding: 0 10px;
+  border: 1px solid #000;
+  display: none;
+}
+
+/*3*/
+.data-tip-down:after,
+.data-tip-down:before,
+.data-tip-left:before,
+.data-tip-right:before,
+.data-tip-left:after,
+.data-tip-right:after,
+.data-tip-top:after,
+.data-tip-top:before {
+  /*4*/
+  position: absolute;
+  content: '';
+  width: 0;
+  height: 0;
+}
+
+/*5*/
+.data-tip-down:after,
+.data-tip-down:before {
+  left: 45%;
+  top: -10px;
+  /*6*/
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 10px solid #000;
+}
+
+/*7*/
+.data-tip-down:before {
+  top: -11px;
+  border-bottom: 10px solid #000;
+}
+
+/*8*/
+.data-tip-left:after,
+.data-tip-left:before {
+  left: -10px;
+  top: 50%;
+  margin-top: -5px;
+  /*9*/
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-right: 10px solid #000;
+}
+
+/*10*/
+.data-tip-left:before {
+  left: -12px;
+  border-right: 10px solid #000;
+}
+
+/*11*/
+.data-tip-right:after,
+.data-tip-right:before {
+  right: -10px;
+  top: 50%;
+  margin-top: -5px;
+  /*12*/
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 10px solid #000;
+}
+
+/*13*/
+.data-tip-right:before {
+  right: -10px;
+  border-left: 10px solid #000;
+}
+
+/*14*/
+.data-tip-top:after,
+.data-tip-top:before {
+  left: 45%;
+  bottom: -10px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top: 10px solid #000;
+}
+
+.data-tip-top:before {
+  bottom: -11px;
+}
+
+
+/*左右两栏排列、固定左右宽度----------ul*/
+ul.abouttable {
+  margin: 0px auto;
+  width: 440px;
+}
+
+ul.abouttable li {
+  width: 100%;
+}
+
+ul.abouttable li .rz-label {
+  min-width: 150px;
+  height: 45px;
+  line-height: 45px;
+  text-align: right;
+  color: #adadad;
+}
+
+ul.abouttable li .second-label {
+  min-width: 150px;
+  height: 40px;
+  line-height: 40px;
+  text-align: right;
+  color: #adadad;
+}
+
+ul.abouttable li .minh-label {
+  min-width: 150px;
+  height: 28px;
+  line-height: 28px;
+  text-align: right;
+  color: #adadad;
+}
+
+
+
+/* table--------------------------------*/
+
+/* table-1底部边框 */
+.edu-pop-table {
+  width: 100%;
+  border: 1px solid #eee;
+  border-bottom: none;
+  background: #fff;
+  color: #888;
+  cursor: default
+}
+
+.edu-pop-table tr {
+  height: 40px;
+}
+
+.edu-pop-table tr.edu-bg-grey {
+  background: #f5f5f5;
+}
+
+.edu-txt-center {
+  text-align: center;
+}
+
+.edu-txt-left {
+  text-align: left;
+}
+
+.edu-txt-right {
+  text-align: right;
+}
+
+.edu-pop-table tr th {
+  color: #333;
+  border-bottom: 1px solid #eee;
+}
+
+.edu-pop-table tr td {
+  border-bottom: 1px solid #eee;
+}
+
+.edu-pop-table.table-line tr td,
+.edu-pop-table.table-line tr th {
+  border-right: 1px solid #eee;
+}
+
+.edu-pop-table.table-line tr td:last-child,
+.edu-pop-table.table-line tr th:last-child {
+  border-right: none;
+}
+
+/*th行有背景颜色且table无边框*/
+.edu-pop-table.head-color thead tr {
+  background: #fafbfb
+}
+
+.edu-pop-table.head-color {
+  border: none
+}
+
+.edu-pop-table.head-color tr:last-child td {
+  border: none
+}
+
+/*--表格行间隔背景颜色-*/
+.edu-pop-table.interval-td {
+  border-bottom: 1px solid #eee;
+}
+
+.edu-pop-table.interval-td thead tr {
+  background: #fafbfb
+}
+
+.edu-pop-table.interval-td tbody tr:nth-child(even) {
+  background: #fafbfb
+}
+
+.edu-pop-table.interval-td tbody tr td {
+  border: none
+}
+
+/*--表格行间隔背景颜色(th也没有边框)-*/
+.edu-pop-table.interval-all {
+  border: none;
+  border-bottom: 1px solid #eee;
+}
+
+.edu-pop-table.interval-all thead th {
+  border: none
+}
+
+.edu-pop-table.interval-all thead tr {
+  background: #fafbfb
+}
+
+.edu-pop-table.interval-all tbody tr:nth-child(even) {
+  background: #fafbfb
+}
+
+.edu-pop-table.interval-all tbody tr td {
+  border: none;
+  padding: 5px 0px
+}
+
+/*--表格行移入背景颜色-*/
+.edu-pop-table.hover-td tbody tr:hover {
+  background: #EFF9FD
+}
+
+/*悬浮颜色为天蓝色*/
+.edu-pop-table.hover-td_1 tbody tr:hover {
+  background: #FCF2EC
+}
+
+/*悬浮颜色为浅橙色*/
+/* table-2全边框 */
+.edu-pop-table-all {
+  width: 100%;
+  border: 1px solid #eee;
+  background: #fff;
+  color: #888;
+  border-collapse: collapse
+}
+
+.edu-pop-table-all tr {
+  height: 30px;
+}
+
+.edu-pop-table-all tr.edu-bg-grey {
+  background: #f5f5f5;
+}
+
+.edu-pop-table-all tr th {
+  color: #333;
+  border: 1px solid #eee;
+}
+
+.edu-pop-table-all tr td {
+  border: 1px solid #eee;
+  padding: 5px
+}
+
+/*table无边框、无背景颜色*/
+.allNone {
+  background: none !important;
+  cursor: default;
+  border-bottom: none !important;
+}
+
+.allNone tr {
+  height: 30px !important;
+}
+
+/*数据为空公共页面*/
+img.edu-nodata-img {
+  width: 300px;
+  margin: 50px auto 20px;
+  display: block;
+  width: 128px;
+}
+
+/* 不能加 padding-left: 18px; 会影响其他地方的居中 */
+.edu-nodata-p {
+  font-size: 20px;
+  text-align: center;
+  color: #999;
+  border-bottom: none !important;
+  box-sizing: border-box;
+}
+
+/*输入为空或者错误的提示*/
+.input-none {
+  box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.1);
+}
+
+.notice {
+  height: 25px;
+  margin-left: 150px;
+}
+
+.input-none+.notice span {
+  display: block
+}
+
+/*列表里菜单icon移入*/
+.edu-position-hide {
+  position: absolute;
+  top: 15px;
+  left: -20px;
+  box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
+  background: #fff;
+  z-index: 1001;
+  padding: 5px 0;
+  z-index: 999999;
+}
+
+.edu-position-hide li a {
+  display: inline-block;
+  height: 30px;
+  width: 100px;
+  line-height: 30px;
+  text-align: center;
+  font-size: 12px !important;
+}
+
+.edu-position-hide li a:hover {
+  background: #F1F1F1;
+  color: #05101A;
+}
+
+.edu-position-hidebox i {
+  color: #bcbcbc;
+}
+
+.edu-position-hidebox i:hover {
+  color: #4CACFF;
+}
+
+.edu-position-hidebox a {
+  color: #05101A;
+}
+
+.edu-position-hidebox:hover .edu-position-hide {
+  display: block;
+}
+
+/*搜索（灰色背景、点击变白色）*/
+.seekPanel>input {
+  width: 100%;
+  height: 30px;
+  line-height: 30px;
+  background-color: #f4f4f4;
+  border: 1px solid #eaeaea;
+  padding: 0px 30px 0px 5px;
+  box-sizing: border-box;
+  outline: none;
+}
+
+.seekPanel>input:focus {
+  background-color: #fff;
+}
+
+.seekPanel>i {
+  position: absolute;
+  right: 7px;
+  top: -1px;
+}
+
+/*-------------------------------------------公用按钮：以white-btn(或者edu-default-btn无padding)为基础，宽度和高度可以用padding填充，颜色用edu-color-btn，begin-----------------------------------------*/
+/*按钮*/
+/*默认按钮*/
+/*长条形按钮*/
+.default_btn {
+  display: block;
+  border-radius: 5px;
+  background: #f4f4f4;
+  color: #cfcfcf !important;
+  text-align: center;
+  width: 102px;
+  box-sizing: border-box
+}
+
+/*正常按钮*/
+.white-btn {
+  text-align: center;
+  cursor: pointer;
+  display: inline-block;
+  padding: 0px 8px;
+  border: 1px solid #ccc;
+  color: #666;
+  letter-spacing: 1px;
+  font-size: 14px;
+  height: 26px;
+  line-height: 26px;
+  border-radius: 3px;
+}
+
+a.white-btn.orange-btn {
+  border: 1px solid #FF7500;
+  color: #FF7500 !important;
+}
+
+a.white-btn.orange-btn:hover {
+  border: 1px solid #F06200;
+  color: #F06200 !important;
+}
+
+.defalutGreyBorder {
+  display: block;
+  padding: 0px 10px;
+  border: 1px solid #ccc;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 4px;
+}
+
+a.task-btn {
+  cursor: pointer;
+  display: inline-block;
+  border: none;
+  padding: 0 12px;
+  color: #fff;
+  background: #CDCDCD !important;
+  letter-spacing: 1px;
+  text-align: center;
+  font-size: 14px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 2px;
+  font-weight: 400;
+}
+
+/*最新按钮：以个人主页为例-------------因高度和宽度都已经固定，后续不再支持使用，*/
+.user_default_btn {
+  cursor: pointer;
+  font-size: 14px;
+  display: block;
+  width: 120px;
+  text-align: center;
+  height: 40px;
+  line-height: 40px !important;
+  border-radius: 4px;
+  box-sizing: border-box
+}
+
+.user_orange_btn {
+  color: #fff !important;
+  background-color: #FF6800;
+}
+
+/*橙色签到按钮*/
+.user_orange_btn:hover {
+  background-color: #F06200;
+}
+
+.user_grey_btn {
+  color: #fff !important;
+  background-color: #CCCCCC;
+  cursor: default
+}
+
+/*灰色已经签到按钮*/
+.user_private_btn {
+  color: #646464 !important;
+  background-color: #fff;
+  border: 1px solid #989898
+}
+
+/*灰色私信、互相关注按钮*/
+.user_private_btn:hover {
+  color: #B2B2B2 !important;
+  border: 1px solid #B2B2B2;
+}
+
+.btn_auto {
+  border-radius: 5px;
+  background: #fff;
+  padding: 0px 18px;
+}
+
+/*可共用按钮，需添加padding或者边框*/
+.edu-default-btn {
+  display: block;
+  border-radius: 4px;
+}
+
+a.edu-focus-btn {
+  padding: 0px 10px;
+  height: 30px;
+  line-height: 30px;
+  border: 1px solid #b2b2b2;
+  color: #b2b2b2 !important;
+}
+
+a.edu-focus-btn:hover {
+  border: 1px solid #666;
+  color: #666 !important;
+}
+
+a.edu-greenback-btn {
+  padding: 0px 10px;
+  background: #29BD8B;
+  color: #fff !important;
+  border: 1px solid #29BD8B;
+}
+
+a.edu-greenline-btn {
+  padding: 0px 10px;
+  color: #29BD8B !important;
+  border: 1px solid #29BD8B;
+}
+
+a.edu-greenback-btn:hover {
+  background-color: #28AC7F;
+}
+
+a.edu-greenline-btn:hover {
+  border: 1px solid #28AC7F;
+  color: #28AC7F !important;
+}
+
+a.edu-blueback-btn {
+  padding: 0px 10px;
+  background: #4CACFF;
+  color: #fff !important;
+  border: 1px solid #4CACFF;
+}
+
+a.edu-blueline-btn {
+  padding: 0px 10px;
+  color: #4CACFF !important;
+  border: 1px solid #4CACFF;
+}
+
+a.edu-blueback-btn:hover {
+  background-color: #459BE6;
+}
+
+a.edu-blueline-btn:hover {
+  border: 1px solid #459BE6;
+  color: #459BE6 !important;
+}
+
+a.edu-orangeback-btn {
+  background-color: #ff7500;
+  color: #fff !important;
+  border: 1px solid #FF7500
+}
+
+a.edu-orangeback-btn:hover {
+  background-color: #F06200;
+}
+
+a.edu-orangeline-btn {
+  color: #FF7500 !important;
+  border: 1px solid #FF7500
+}
+
+a.edu-orangeline-btn:hover {
+  color: #F06200 !important;
+  border: 1px solid #F06200
+}
+
+a.edu-greyback-btn {
+  padding: 0px 10px;
+  background: #CCCCCC;
+  color: #fff !important;
+  border: 1px solid #CCCCCC;
+}
+
+a.edu-greyback-btn:hover {
+  background-color: #B2B2B2;
+}
+
+a.edu-greyshallowline-btn {
+  padding: 0px 10px;
+  color: #999 !important;
+  border: 1px solid #CFCFCF
+}
+
+a.edu-greyline-btn {
+  padding: 0px 10px;
+  background: #fff;
+  color: #666 !important;
+  border: 1px solid #eaeaea;
+  line-height: 33px;
+  height: 33px;
+}
+
+a.edu-greyline-btn:hover,
+a.edu-greyshallowline-btn:hover {
+  border: 1px solid #B2B2B2;
+  color: #B2B2B2 !important;
+}
+
+/*新建页面的提交和取消按钮*/
+.defalutCancelbtn {
+  display: block;
+  border: 1px solid #CDCDCD;
+  background-color: #fafafa;
+  color: #999 !important;
+  width: 120px;
+  text-align: center;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 2px;
+  width: 130px;
+  height: 40px;
+  background: rgba(77, 124, 254, 0);
+  border: 1px solid rgba(76, 172, 255, 1);
+  border-radius: 4px;
+  line-height: 40px;
+  font-size: 16px;
+  font-family: MicrosoftYaHei;
+  font-weight: 400;
+  color: rgba(76, 172, 255, 1) !important;
+}
+
+.defalutCancelbtn:hover {
+  border: 1px solid #B2B2B2;
+  color: #B2B2B2 !important;
+}
+
+.defalutSubmitbtn {
+  display: block;
+  border: 1px solid #4CACFF;
+  background-color: #4CACFF;
+  color: #fff !important;
+  width: 120px;
+  text-align: center;
+  line-height: 40px;
+  border-radius: 2px;
+  width: 130px;
+  height: 40px;
+  background: rgba(76, 172, 255, 1);
+  border-radius: 4px;
+  font-size: 16px;
+  font-family: MicrosoftYaHei;
+  font-weight: 400;
+  color: rgba(255, 255, 255, 1);
+}
+
+/*删除按钮*/
+.delectshixuncdbtn {
+  display: block;
+  border: 1px solid #CDCDCD;
+  background-color: #fafafa;
+  color: #999 !important;
+  width: 120px;
+  text-align: center;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 2px;
+  width: 130px;
+  height: 40px;
+  background: rgba(77, 124, 254, 0);
+  border-radius: 4px;
+  line-height: 40px;
+  font-size: 16px;
+  font-family: MicrosoftYaHei;
+  font-weight: 400;
+}
+
+.defalutSubmitbtn:hover {
+  background-color: #459BE6;
+  border: 1px solid #459BE6;
+}
+
+/*-------------------------------------------公用按钮：以white-btn(或者edu-default-btn无padding)为基础，宽度和高度可以用padding填充，颜色用edu-color-btn，end-----------------------------------------*/
+
+/*可点击按钮---蓝色*/
+.use_btn {
+  background: #4cacff;
+  color: #fff !important;
+}
+
+a.task-btn-orange {
+  background: #4CACFF !important;
+  color: #fff !important;
+}
+
+a:hover.task-btn-orange {
+  background: #459BE6;
+}
+
+/*可点击按钮---蓝色---蓝色边框*/
+.user_blue_btn {
+  border: 1px solid #4CACFF;
+  color: #4CACFF !important;
+}
+
+/*可点击按钮---蓝色---蓝色背景*/
+a.user_bluebg_btn {
+  background-color: #4CACFF;
+  color: #fff;
+}
+
+a.user_orangebg_btn {
+  background-color: #FF6800;
+  color: #fff;
+}
+
+a.user_greybg_btn {
+  background-color: #747A7F;
+  color: #fff;
+}
+
+/*.user_white_btn{border: 1px solid #ffffff;color: #ffffff!important;}*/
+
+.pointer {
+  cursor: pointer
+}
+
+.cdefault {
+  cursor: default
+}
+
+
+/*md编辑器恢复被覆盖样式*/
+.new_li .markdown-body ul>li,
+.markdown-body ul>li {
+  list-style-type: disc !important;
+  margin-bottom: 0 !important;
+}
+
+.new_li .markdown-body ol>li,
+.markdown-body ol>li {
+  list-style-type: decimal !important;
+}
+
+.new_li li {
+  margin-bottom: 0 !important;
+}
+
+.markdown-body p {
+  font-size: 16px !important;
+}
+
+/*搜索框*/
+#pollingPanel {
+  position: relative;
+  width: 248px;
+  height: 32px;
+}
+
+#pollingPanel>input {
+  width: 100%;
+  height: 100%;
+  border: 1px solid #eaeaea;
+  border-radius: 4px;
+  padding: 0px 30px 0px 5px;
+  box-sizing: border-box;
+  background-color: #F4F4F4;
+}
+
+#pollingPanel>input:focus {
+  background-color: #fff;
+  outline: none;
+}
+
+#pollingPanel>a {
+  position: absolute;
+  right: 10px;
+  top: 0px;
+}
+
+/* 弹框 */
+.popupAll {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  z-index: 99998;
+  background-color: rgba(5, 16, 26, 0.6);
+  left: 0;
+  top: 0;
+}
+
+.task-popup {
+  width: 30%;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+  border-radius: 10px;
+}
+
+.task-popup-text-center {
+  text-align: center;
+  color: #333;
+}
+
+.task-popup-title {
+  border-bottom: 1px solid #eee;
+  padding: 0px 15px;
+  text-align: center;
+  box-sizing: border-box;
+  line-height: 70px;
+  height: 70px;
+  border-radius: 10px 10px 0px 0px;
+  font-size: 16px;
+  font-weight: bold;
+}
+
+.task-popup-content {
+  padding: 15px;
+}
+
+.task-popup-submit {
+  margin: 0px auto 15px;
+  width: 160px;
+}
+
+.task-popup-sure {
+  margin: 0px auto 15px;
+  width: 54px;
+}
+
+.task-popup-right-sure {
+  margin: 0px auto 15px;
+  text-align: center
+}
+
+.task-popup-OK {
+  margin: 15px auto;
+  text-align: center
+}
+
+.task-popup-bggrey {
+  background: #fff;
+  color: #333;
+}
+
+#closeIcon {
+  position: absolute;
+  color: #fefefe
+}
+
+/*  模板弹框 20170407byLB */
+#task_popup_box {
+  background: #fff;
+  padding-bottom: 15px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  -o-border-radius: 5px;
+  border-radius: 5px;
+  box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
+}
+
+.task_popup_top {
+  background: #ccc;
+  height: 40px;
+  -webkit-border-radius: 5px 5px 0px 0px;
+  -moz-border-radius: 5px 5px 0px 0px;
+  -o-border-radius: 5px 5px 0px 0px;
+  border-radius: 5px 5px 0px 0px;
+}
+
+.task_popup_top h3 {
+  font-size: 14px;
+  color: #333;
+  line-height: 40px;
+  padding-left: 10px;
+}
+
+a.task_icons_close {
+  width: 20px;
+  height: 20px;
+  display: block;
+  background: url(../images/popup/sy_icons_close.png) 0 0px no-repeat;
+  margin: 8px 10px 0 0;
+}
+
+a:hover.task_icons_close {
+  background: url(../images/popup/sy_icons_close.png) -40px 0px no-repeat;
+}
+
+.task_popup_con {
+  padding: 20px;
+}
+
+/*  模板弹框 20161013byLB */
+#muban_popup_box {
+  background: #fff;
+  padding-bottom: 15px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  -o-border-radius: 5px;
+  border-radius: 5px;
+  box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
+}
+
+.muban_popup_top {
+  background: #3b94d6;
+  height: 40px;
+  -webkit-border-radius: 5px 5px 0px 0px;
+  -moz-border-radius: 5px 5px 0px 0px;
+  -o-border-radius: 5px 5px 0px 0px;
+  border-radius: 5px 5px 0px 0px;
+}
+
+.muban_popup_top h3 {
+  font-size: 16px;
+  color: #fff;
+  font-weight: normal;
+  line-height: 40px;
+  padding-left: 10px;
+}
+
+a.muban_icons_close {
+  width: 20px;
+  height: 20px;
+  display: block;
+  background: url(/images/sy/sy_icons_close.png) 0 0px no-repeat;
+  margin: 8px 10px 0 0;
+}
+
+a:hover.muban_icons_close {
+  background: url(/images/sy/sy_icons_close.png) -40px 0px no-repeat;
+}
+
+#muban_popup_box input,
+#muban_pwopup_box select {
+  border: 1px solid #c8c8c8;
+  height: 28px;
+  color: #888;
+}
+
+#muban_popup_box label.pop_box_label {
+  width: 100px;
+  text-align: right;
+  display: inline-block;
+}
+
+input.radio-width90 {
+  width: 90px;
+}
+
+#muban_popup_box label.pop_box_label_l {
+  width: 100px;
+  text-align: left;
+  display: inline-block;
+}
+
+
+/*提示条*/
+.alert {
+  padding: 10px;
+  border: 1px solid transparent;
+  text-align: center;
+}
+
+.alert-blue {
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+  color: #3a87ad;
+}
+
+.alert-orange {
+  background-color: #fff9e9;
+  border-color: #f6d0b1;
+  color: #ee4a20;
+}
+
+.task-close {
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+  font-size: 21px;
+  font-weight: bold;
+  line-height: 1;
+  color: #000000;
+  text-shadow: 0 1px 0 #ffffff;
+  opacity: 0.3;
+}
+
+.taskclose:hover {
+  opacity: 0.5;
+}
+
+.alert-red {
+  background-color: #f2dede;
+  border-color: #eed3d7;
+  color: #d14f4d;
+  text-align: left !important;
+}
+
+/*搜索的下拉列表*/
+.search_down_list a {
+  display: block;
+  height: 28px;
+  line-height: 28px;
+  padding: 0px 5px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.search_down_list a:hover {
+  background: #fafafa;
+}
+
+/*白色色块--类似个人主页-学习-里面的tab*/
+.white-panel {
+  border-radius: 2px;
+  width: 100%;
+  margin: 0px auto;
+  box-sizing: border-box;
+  padding-left: 25px;
+}
+
+.white-panel li {
+  width: 118px;
+  height: 48px;
+  line-height: 48px;
+  text-align: center;
+  color: #05101A;
+  float: left;
+  cursor: pointer;
+  border: 1px solid #fff;
+}
+
+.white-panel li a {
+  display: block;
+  width: 100%;
+}
+
+.white-panel li.active {
+  border-radius: 24px;
+  border: 1px solid #4CACFF;
+  color: #4CACFF;
+}
+
+.white-panel li.active a {
+  color: #4CACFF;
+}
+
+
+/* 个人主页翻页 */
+.pages_user_show a:hover,
+.pages_user_show li.active a {
+  background-color: #4CACFF;
+  color: #fff;
+  border: 1px solid #4CACFF;
+}
+
+.pages_user_show a {
+  border-radius: 2px;
+  display: inline-block;
+  border: 1px solid #d1d1d1;
+  background-color: #fff;
+  color: #888;
+  float: left;
+  text-align: center;
+  padding: 2px 10px;
+  line-height: 1.9;
+  margin: 0 5px;
+}
+
+.pages_user_show li {
+  float: left;
+  list-style-type: none;
+}
+
+.pages_user_show ul li {
+  list-style-type: none !important;
+}
+
+.pages_user_show ul li a {
+  color: #888
+}
+
+.page_GO {
+  text-align: center;
+  width: 80px;
+  border-radius: 2px;
+  margin-left: 5px;
+  height: 33px;
+  padding: 0px 5px;
+  box-sizing: border-box;
+  float: left;
+  border: 1px solid #d1d1d1;
+}
+
+/* 小翻页 */
+.pages_little_show a:hover,
+.pages_little_show li.active a {
+  background-color: #4CACFF;
+  ;
+  color: #fff !important;
+  border: 1px solid #4CACFF
+}
+
+.pages_little_show a {
+  display: inline-block;
+  border: 1px solid #d1d1d1;
+  color: #888 !important;
+  float: left;
+  text-align: center;
+  padding: 3px 3px;
+  line-height: 1.9;
+  margin: 0 2px;
+  font-size: 12px;
+}
+
+.pages_little_show li {
+  float: left;
+}
+
+/*左右排版结构：参考个人主页的经验值和金币等页面*/
+.leftPanel {
+  width: 22%;
+  float: left;
+}
+
+.leftPanel li.nav {
+  padding: 10px 0px;
+  box-sizing: border-box;
+}
+
+.leftPanel li.nav a {
+  padding-left: 40px;
+  display: block;
+  width: 100%;
+  box-sizing: border-box;
+  border-left: 2px solid #fff;
+  height: 24px;
+  line-height: 24px;
+}
+
+.leftPanel li.nav.active a {
+  border-left: 2px solid #4CACFF;
+}
+
+.rightPanel {
+  width: 78%;
+  float: right;
+}
+
+/*个人主页，认证的圆圈*/
+.ringauto {
+  width: 20px;
+  height: 20px;
+  line-height: 20px;
+  text-align: center;
+  border-radius: 50%;
+  background-color: #F4FAFF;
+  margin-right: 5px;
+}
+
+/*-------------------个人主页：右侧提示区域--------------------------*/
+.-task-sidebar {
+  position: fixed;
+  width: 40px;
+  height: 180px;
+  right: 0;
+  bottom: 80px;
+  z-index: 10;
+}
+
+.-task-sidebar div {
+  height: 40px;
+  line-height: 40px;
+  box-sizing: border-box;
+  width: 40px;
+  background: #4CACFF;
+  color: #fff;
+  font-size: 20px;
+  text-align: center;
+  margin-bottom: 5px;
+  border-radius: 4px;
+}
+
+.-task-sidebar div i {
+  color: #fff;
+}
+
+.-task-sidebar div i:hover {
+  color: #fff !important;
+}
+
+.gotop {
+  background-color: rgba(208, 207, 207, 0.5) !important;
+  padding: 0px !important;
+}
+
+.-task-desc {
+  background: #494949;
+  width: 90px;
+  line-height: 36px;
+  text-align: center;
+  position: absolute;
+  color: #fff;
+  font-size: 13px;
+  z-index: 999999;
+  opacity: 0;
+}
+
+.-task-desc div {
+  position: absolute;
+  top: 10px;
+  right: -7px;
+  height: 13px;
+}
+
+.-task-desc div img {
+  float: left
+}
+
+
+/***** loading ******/
+/*****载入中******/
+#ajax-indicator {
+  position: absolute;
+  /* fixed not supported by IE*/
+  background-color: #eee;
+  border: 1px solid #bbb;
+  top: 35%;
+  left: 40%;
+  width: 20%;
+  /*height:5%;*/
+  font-weight: bold;
+  text-align: center;
+  padding: 0.6em;
+  z-index: 100000;
+  opacity: 0.5;
+}
+
+html>body #ajax-indicator {
+  position: fixed;
+}
+
+#ajax-indicator span {
+  color: #fff;
+  color: #333333;
+  background-position: 0% 40%;
+  background-repeat: no-repeat;
+  background-image: url(/images/loading.gif);
+  padding-left: 26px;
+  vertical-align: bottom;
+  z-index: 100000;
+}
+
+/*最新、最热*/
+.bestChoose.active {
+  color: #4CACFF;
+}
+
+
+/*实训路径选择实训*/
+.edu-filter-cir-grey {
+  color: #666 !important;
+  width: auto;
+  padding: 0px 15px;
+  font-size: 14px !important;
+  text-align: center;
+  background: #f3f3f3;
+  border-radius: 10px;
+  display: block;
+  height: 25px;
+  line-height: 25px;
+}
+
+.edu-filter-cir-grey:hover {
+  background: #4cacff;
+  color: #ffffff !important;
+}
+
+.edu-filter-cir-grey.active {
+  background: #4cacff;
+  color: #ffffff !important;
+  font-size: 14px !important;
+}
+
+
+.with10 {
+  width: 10%;
+  box-sizing: border-box
+}
+
+.with12 {
+  width: 12%;
+  box-sizing: border-box
+}
+
+.with13 {
+  width: 13%;
+  box-sizing: border-box
+}
+
+.with14 {
+  width: 14%;
+  box-sizing: border-box
+}
+
+.with15 {
+  width: 15%;
+  box-sizing: border-box
+}
+
+.with20 {
+  width: 20%;
+  box-sizing: border-box
+}
+
+.with22 {
+  width: 22%;
+  box-sizing: border-box
+}
+
+.with23 {
+  width: 23%;
+  box-sizing: border-box
+}
+
+.with25 {
+  width: 25%;
+  box-sizing: border-box
+}
+
+.with30 {
+  width: 30%;
+  box-sizing: border-box
+}
+
+.with35 {
+  width: 35%;
+  box-sizing: border-box
+}
+
+.with40 {
+  width: 40%;
+  box-sizing: border-box
+}
+
+.with45 {
+  width: 45%;
+  box-sizing: border-box
+}
+
+.with49 {
+  width: 49%;
+  box-sizing: border-box
+}
+
+.with50 {
+  width: 50%;
+  box-sizing: border-box
+}
+
+.with55 {
+  width: 55%;
+  box-sizing: border-box
+}
+
+.with52 {
+  width: 52%;
+  box-sizing: border-box
+}
+
+.with48 {
+  width: 48%;
+  box-sizing: border-box
+}
+
+.with60 {
+  width: 60%;
+  box-sizing: border-box
+}
+
+.with65 {
+  width: 65%;
+  box-sizing: border-box
+}
+
+.with70 {
+  width: 70%;
+  box-sizing: border-box
+}
+
+.with73 {
+  width: 73%;
+  box-sizing: border-box
+}
+
+.with75 {
+  width: 75%;
+  box-sizing: border-box
+}
+
+.with77 {
+  width: 77%;
+  box-sizing: border-box
+}
+
+.with78 {
+  width: 78%;
+  box-sizing: border-box
+}
+
+.with80 {
+  width: 80%;
+  box-sizing: border-box
+}
+
+.with85 {
+  width: 85%;
+  box-sizing: border-box
+}
+
+.with87 {
+  width: 87%;
+  box-sizing: border-box
+}
+
+.with90 {
+  width: 90%;
+  box-sizing: border-box
+}
+
+.with95 {
+  width: 95%;
+  box-sizing: border-box
+}
+
+.with100 {
+  width: 100%;
+}
+
+.transform-90 {
+  transform: rotate(-90deg);
+  -ms-transform: rotate(-90deg);
+  /* IE 9 */
+  -moz-transform: rotate(-90deg);
+  /* Firefox */
+  -webkit-transform: rotate(-90deg);
+  /* Safari 和 Chrome */
+  -o-transform: rotate(-90deg);
+}
+
+.newplayVedio {
+  font-size: 86px !important;
+}
+
+.icon-qizhi {
+  font-size: 30px !important;
+}
+
+.icon-31 {
+  font-size: 68px !important;
+}
+
+/*置顶*/
+.btn-cir {
+  display: inline-block;
+  padding: 0px 5px;
+  border-radius: 25px;
+  line-height: 20px;
+  font-size: 12px;
+}
+
+.btn-cir-red {
+  background: red;
+  color: #fff;
+  font-weight: normal;
+  cursor: default
+}
+
+.btn-cir-red:hover {
+  background: red;
+  color: #fff !important;
+}
+
+.btn-cir-grey {
+  background: #e1e1e1;
+  color: #8c8c8c;
+  font-weight: normal;
+  border: 1px solid #e1e1e1
+}
+
+/*动态标签*/
+.edu-filter-btn {
+  cursor: default;
+  display: inline-block;
+  padding: 0px 9px;
+  color: #666;
+  background: #fff;
+  text-align: center;
+  border-radius: 10px;
+  font-size: 12px;
+  height: 18px;
+  line-height: 18px;
+}
+
+.edu-filter-btn-blue {
+  border: 1px solid #3498db;
+  color: #3498db;
+}
+
+.edu-filter-btn-orange {
+  border: 1px solid #ff6800;
+  color: #ff6800 !important;
+}
+
+/*提交中、评阅中*/
+.edu-filter-btn-red {
+  border: 1px solid #DD1717;
+  color: #DD1717;
+}
+
+/*已截止、未开启补交*/
+.edu-filter-btn-green {
+  border: 1px solid #29BD8B;
+  color: #29BD8B !important;
+}
+
+/*申诉中、已开启补交*/
+.edu-filter-btn-appeal {
+  border: 1px solid #FF4343;
+  color: #FF4343 !important;
+}
+
+/*申诉中*/
+.edu-filter-btn-yellow {
+  border: 1px solid #ef9324;
+  color: #ef9324;
+}
+
+.edu-filter-btn-danger {
+  background: #d72e36;
+  color: #fff;
+}
+
+.edu-filter-btn-late {
+  border: 1px solid #3fbcff;
+  color: #3fbcff;
+}
+
+.edu-filter-btn-no-late {
+  border: 1px solid #747A7F;
+  color: #747A7F;
+}
+
+/*未发布*/
+.edu-filter-btn-end {
+  border: 1px solid #999999;
+  color: #999999;
+}
+
+/*已结束*/
+/*动态按钮*/
+.edu-activity-orange {
+  background-color: #FF6800;
+  color: #fff !important;
+  cursor: pointer;
+  border: 1px solid #ff6800;
+}
+
+/*修改作品、补交作品、立即补交、补交附件*/
+.edu-activity-blue {
+  background-color: #4CACFF;
+  color: #fff !important;
+  cursor: pointer;
+  border: 1px solid #4CACFF;
+}
+
+/*开始实战、开始答题、继续答题、继续实战、提交作品*/
+.edu-activity-grey {
+  background-color: #747A7F;
+  color: #fff !important;
+  cursor: pointer;
+  border: 1px solid #747A7F;
+}
+
+/*匿评作品*/
+.edu-activity-green {
+  background-color: #29BD8B;
+  color: #fff !important;
+  cursor: pointer;
+  border: 1px solid #29BD8B;
+}
+
+/*查看作品、查看实战、查看答题*/
+.edu-activity-light-grey {
+  background-color: #cbcbcb;
+  color: #fff !important;
+  cursor: pointer;
+  border: 1px solid #cbcbcb;
+}
+
+/*取消关联*/
+/*课堂设置页面*/
+.course-ul-nav {
+  width: 100%;
+  border-bottom: 1px solid #EBEBEB;
+}
+
+.course-ul-nav a {
+  display: inline-block;
+  padding: 20px;
+  font-size: 18px;
+  text-align: center;
+  width: 94px;
+  position: relative
+}
+
+.course-ul-nav a.active,
+.course-ul-nav a:hover {
+  color: #4CACFF;
+}
+
+.course-ul-nav a.active:after {
+  content: '';
+  width: 94px;
+  left: 20px;
+  bottom: 0px;
+  height: 2px;
+  background-color: #4CACFF;
+  position: absolute
+}
+
+/*-----下拉框--------*/
+.down-select {
+  display: none;
+  position: absolute;
+  z-index: 10;
+  left: 0px;
+  width: 100%;
+  overflow-y: auto;
+  background: #fff;
+  max-height: 200px;
+  border: 1px solid #eee;
+}
+
+.down-select p {
+  height: 35px;
+  line-height: 35px;
+  padding-left: 5px;
+  cursor: pointer
+}
+
+.down-select p:hover {
+  background: #f3f4f6
+}
+
+
+
+.paddingLeft28 {
+  padding-left: 28px;
+}
+
+/*.ant-modal-header{*/
+/*border-radius: 10px;*/
+/*}*/
+
+.color656565 {
+  color: #656565;
+}
+
+.colorC8161D {
+  color: #C8161D;
+}
+
+.bor-reds {
+  border: 1px solid #FF0000 !important;
+  border-radius: 4px;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+
+.editormd-dialog-footer {
+  padding: 0px;
+}
+
+.educontentysl {
+  width: 1250px;
+  margin: 0px auto;
+  box-sizing: border-box
+}
+
+/*中间部分宽度固定为1200*/
+
+.footer_con-p {
+  color: #898989 !important;
+}
+
+.markdown-body {
+  text-align: justify;
+  word-break: break-all;
+}
+
+.RightPaneDrawer .ant-drawer-content {
+  background: #070f1a;
+  overflow: hidden !important;
+}
+
+.deletebuttom {
+  border: transparent;
+}
+
+.RightPaneDrawer .jupyter_data_list {
+  max-height: 340px;
+}
\ No newline at end of file
diff --git a/public/css/edu-public.css b/public/css/edu-public.css
new file mode 100755
index 00000000..863a739e
--- /dev/null
+++ b/public/css/edu-public.css
@@ -0,0 +1,2411 @@
+/* 头部 */
+.header {
+  width: 100%;
+  height: 51px;
+  min-width: 1200px;
+  background: rgb(23, 22, 22);
+}
+
+.header_con {
+  width: 1200px;
+  min-width: 1200px;
+  height: 50px;
+  margin: 0 auto;
+}
+
+.new-logo img {
+  width: 36px;
+  height: 36px;
+  margin-top: 7px;
+  border-radius: 3px;
+}
+
+.new-logo p {
+  font-size: 18px;
+  color: #fff;
+  line-height: 50px;
+}
+
+a.new-nav-a {
+  display: block;
+  font-size: 14px;
+  line-height: 50px;
+  color: #fff;
+}
+
+a:hover.new-nav-a {
+  color: #ff7500;
+  text-decoration: none;
+}
+
+.header-search {
+  border-radius: 3px;
+  background: #fff;
+}
+
+.header-search a {
+  text-decoration: none;
+  color: #666 !important;
+}
+
+.header-search a:hover {
+  color: #ff7500 !important;
+}
+
+input.header-search-input {
+  width: 150px;
+  height: 30px;
+  padding: 0 5px;
+  border-style: none;
+  border: none;
+  outline: none;
+}
+
+.innner-nav {
+  margin-left: 40px;
+}
+
+.innner-nav li {
+  float: left;
+  margin-right: 40px;
+}
+
+.innner-nav li a {
+  display: block;
+  color: #fff;
+  padding: 0 10px;
+}
+
+.inner-btnbox02 {
+  width: 270px;
+  margin: 30px auto 0;
+}
+
+.new-container-inner02 {
+  width: 1200px;
+  margin: 0px auto;
+  padding: 50px 0;
+}
+
+.inner-nav-mes {
+  font-size: 16px;
+  color: #fff;
+  margin-right: 35px;
+  margin-top: 18px;
+}
+
+.inner-nav-cir {
+  background: #ff6530;
+  color: #fff;
+  border-radius: 15px;
+  padding: 0 5px;
+  display: inline-block;
+  font-size: 10px;
+  height: 17px;
+  line-height: 17px;
+}
+
+.inner-nav-user {
+  width: 75px;
+  height: 45px;
+  margin-top: 5px;
+  position: relative;
+  padding-left: 0px;
+}
+
+.inner-nav-user-img {
+  width: 40px;
+  height: 40px;
+  border-radius: 50px;
+}
+
+select.header-search-select {
+  border: none;
+  font-size: 14px;
+  padding: 5px;
+  background: none;
+}
+
+.edu-unlogin-nav a {
+  color: #fff !important;
+  font-size: 14px;
+  line-height: 50px;
+}
+
+.edu-unlogin-nav a:hover {
+  color: #3b94d6;
+}
+
+.edu-unlogin-nav {
+  font-size: 12px;
+  color: #fff;
+  line-height: 50px;
+}
+
+.task-user-dropdown {
+  font-size: 12px;
+  line-height: 1.9;
+  width: 120px;
+  background-color: #fff;
+  border-radius: 3px;
+  box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
+  position: relative;
+  top: 5px;
+  right: 44px;
+  display: none;
+  z-index: 999;
+}
+
+.task-user-dropdown font {
+  border: 1px solid #dddddd;
+  display: block;
+  border-width: 8px;
+  position: absolute;
+  top: -13px;
+  left: 100px;
+  border-style: solid;
+  border-color: transparent transparent #fff transparent;
+  font-size: 0;
+  line-height: 0;
+  box-shadow: 2px rgba(146, 153, 169, 0.5);
+}
+
+.task-user-dropdown-nav {
+  padding-top: 5px;
+}
+
+.task-user-dropdown-nav li {
+  display: inline-block;
+  text-align: center;
+  width: 100%;
+  height: 30px;
+  line-height: 30px;
+}
+
+.task-user-dropdown-nav li:hover {
+  background: #eee;
+}
+
+.task-user-dropdown-nav li:hover a {
+  color: #FF7500 !important;
+}
+
+.task-line {
+  display: block;
+  height: 1px !important;
+  line-height: 1px !important;
+  border-bottom: 1px solid #eee;
+  margin: 0;
+}
+
+.inner-nav-user:hover .task-user-dropdown {
+  display: block;
+}
+
+dropdown {
+  display: inline-block;
+  height: 30px;
+  line-height: 1.9;
+  font-size: 12px;
+}
+
+dropdown label,
+dropdown ul li {
+  display: block;
+  width: 42px;
+  padding: 4px 10px;
+  text-align: center;
+  border-radius: 3px;
+  color: #666;
+}
+
+dropdown ul li:hover {
+  background: #eee;
+  color: #666;
+  cursor: pointer;
+}
+
+dropdown label {
+  color: #666;
+  border-radius: 3px 0 0 3px;
+  position: relative;
+  z-index: 2;
+  width: 50px;
+  text-align: center;
+  height: 22px;
+}
+
+dropdown input {
+  display: none;
+}
+
+dropdown input:checked+label {
+  background: #fff;
+  color: #666;
+}
+
+dropdown ul {
+  position: absolute;
+  visibility: visible;
+  opacity: 1;
+  top: 38px;
+  background: #fff;
+  z-index: 99;
+  border-radius: 3px;
+}
+
+.edu-dropdown {
+  position: relative;
+  padding: 0 15px;
+}
+
+.edu-dropdown-menu {
+  background-color: #fff;
+  text-align: center;
+  border-radius: 3px;
+  box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
+  position: absolute;
+  top: 25px;
+  left: 0px;
+  z-index: 999;
+  display: none;
+}
+
+.edu-dropdown-menu li {
+  height: 30px;
+  line-height: 30px;
+  display: block;
+  padding: 0 15px;
+  text-align: left;
+}
+
+.edu-dropdown-menu li label {
+  cursor: pointer;
+}
+
+.edu-dropdown-menu li:hover {
+  color: #FF7500 !important;
+}
+
+/*.edu-dropdown:hover .edu-dropdown-menu{ display: block;}*/
+.animate {
+  -webkit-transition: all .3s;
+  -moz-transition: all .3s;
+  -ms-transition: all .3s;
+  -ms-transition: all .3s;
+  transition: all .3s;
+  backface-visibility: hidden;
+  -webkit-backface-visibility: hidden;
+  /* Chrome and Safari */
+  -moz-backface-visibility: hidden;
+  /* Firefox */
+  -ms-backface-visibility: hidden;
+  /* Internet Explorer */
+}
+
+/* 底部 */
+.footer {
+  width: 100%;
+  height: 100px;
+  background-color: #fff;
+}
+
+.footer_con {
+  width: 1200px;
+  height: 100px;
+  margin: 0 auto;
+  text-align: center;
+  padding: 20px 0;
+}
+
+.footer_con-inner {
+  width: 300px;
+  margin: 0px auto;
+}
+
+.footer_con-inner li a {
+  font-size: 16px;
+  color: #888;
+  display: block;
+  padding: 0 15px;
+  border-right: solid 1px #888;
+}
+
+.footer_con-inner li a:hover {
+  text-decoration: underline;
+}
+
+.footer_con-p {
+  color: #888;
+  margin-top: 10px;
+}
+
+.inner-footer {
+  width: 100%;
+  min-width: 1200px;
+  background: #323232;
+  padding-bottom: 30px;
+}
+
+.inner-footer_con {
+  width: 1200px;
+  margin: 0 auto;
+}
+
+.inner-footer-nav {
+  height: 50px;
+  border-bottom: 1px solid #47494d;
+}
+
+.inner-footer-nav li a {
+  float: left;
+  margin-right: 15px;
+  font-size: 14px;
+  color: #888;
+  line-height: 50px;
+}
+
+.saoma-box {
+  position: relative;
+}
+
+.saoma-img-box {
+  position: absolute;
+  top: -300px;
+  left: -86px;
+  border-radius: 3px;
+  background: #fff;
+  padding: 15px;
+  box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
+  display: none;
+}
+
+.saoma-box li:hover ul {
+  display: block;
+}
+
+.img-show {
+  width: 50px;
+  height: 50px;
+  border-radius: 50px;
+}
+
+.saoma-img-box font {
+  border: 1px solid #dddddd;
+  display: block;
+  border-width: 8px;
+  position: absolute;
+  top: 289px;
+  left: 103px;
+  border-style: solid;
+  border-color: #fff transparent transparent transparent;
+  font-size: 0;
+  line-height: 0;
+  box-shadow: 2px rgba(146, 153, 169, 0.5);
+}
+
+.inner-footer-p-big {
+  display: block;
+  height: 50px;
+  line-height: 50px;
+  color: #888;
+  font-size: 16px;
+  border-left: 2px solid #888;
+  padding-left: 15px;
+}
+
+.inner-btnbox02 {
+  width: 270px;
+  margin: 30px auto 0;
+}
+
+.new-container-inner02 {
+  width: 1200px;
+  margin: 0px auto;
+  padding: 50px 0;
+}
+
+img.edu-footer-logo {
+  height: 50px;
+}
+
+/************布局 byLB****************/
+.panel-content {
+  width: 1200px;
+  margin: 20px auto;
+  background: #eaebec;
+}
+
+.panel-contentss {
+  width: 1200px;
+  margin: 10px auto;
+  margin-bottom: 20px;
+  background: #fff;
+}
+
+/************讨论区20170321 byLB****************/
+.panel-inner-fourm {
+  padding: 20px;
+  border-bottom: 1px solid #eee;
+}
+
+.panel-inner-fourm:hover {
+  background: #EFF9FD;
+}
+
+.nobg:hover {
+  background: #fff;
+}
+
+a.panel-list-title,
+.panel-list-title {
+  display: inline-block;
+  font-size: 16px;
+  color: #333;
+  font-weight: normal;
+  max-width: 82%;
+}
+
+a:hover.panel-list-title {
+  color: #FF7500;
+}
+
+.panel-list-img {
+  width: 60px;
+  height: 60px;
+  border-radius: 100px;
+}
+
+a.panel-name-small {
+  display: inline-block;
+  max-width: 100px;
+  color: #29bd8b;
+  font-size: 12px;
+}
+
+.panel-list-infobox {
+  width: 92%;
+  margin-left: 8%;
+  margin-top: -70px;
+}
+
+.panel-lightgrey,
+.panel-lightgrey span {
+  font-size: 12px;
+  color: #888;
+}
+
+.panel-inner-info {
+  width: 93%;
+  margin-left: 7%;
+}
+
+.panel-bg-grey {
+  padding: 5px 0;
+  background: #f6f6f6;
+  width: 100%;
+  color: #666;
+}
+
+.panel-list-nodata {
+  width: 420px;
+  margin: 100px auto;
+  text-align: center;
+}
+
+/*班级讨论区panel 2017/07/20   cs*/
+.panel-content-box {
+  background: #FFFFFF;
+}
+
+.panel-content-line {
+  width: 90%;
+  margin: 30px 5%;
+}
+
+.panel-content-line .panel-line-left {
+  width: 8%;
+  text-align: right;
+}
+
+.panel-content-line .panel-content-label {
+  height: 40px;
+  line-height: 40px
+}
+
+.panel-content-line .panel-content-input {
+  width: 90%;
+  height: 28px;
+  padding: 5px;
+}
+
+.panel-content-line .panel-content-ta {
+  width: 90%;
+  min-height: 148px;
+  padding: 5px;
+}
+
+/* 回复评论 */
+.panel-comment_item {
+  width: 100%;
+}
+
+.panel-comment_item .t_area {
+  color: #888;
+}
+
+.comment_item_cont {
+  padding: 15px;
+  border-bottom: 1px solid #e3e3e3;
+}
+
+.comment_item_cont .J_Comment_Face {
+  height: 50px
+}
+
+.comment_item_cont .J_Comment_Face img {
+  width: 50px;
+  height: 50px;
+  border-radius: 100px;
+}
+
+.panel-comment_item .t_content {
+  width: 93%;
+  margin-left: 15px;
+}
+
+.panel-comment_item a.content-username {
+  font-size: 14px;
+  margin-right: 15px;
+  display: inline-block;
+  max-width: 100px;
+  color: #888888
+}
+
+.J_Comment_Info {
+  height: 20px;
+  line-height: 22px;
+}
+
+/*.panel-comment_item a:hover.content-username{color:#FF7500;}*/
+.panel-comment_item .orig_user img {
+  width: 40px;
+  height: 40px;
+  border-radius: 100px;
+}
+
+.panel-comment_item .reply-right {
+  float: right;
+  position: relative;
+}
+
+.panel-comment_item .reply_iconup02 {
+  position: absolute;
+  top: 22px;
+  left: 14px;
+  color: #d4d4d4;
+  font-size: 16px;
+  background: #f1f1f1;
+  line-height: 13px;
+}
+
+.panel-comment_item .comment_orig_content {
+  margin: 10px 0;
+  color: #999;
+}
+
+.panel-comment_item .comment_orig_content .comment_orig_content {
+  margin-top: 0;
+  color: #666;
+}
+
+.panel-comment_item .orig_cont {
+  border: solid 1px #F3DDB3;
+  background: #FFFEF4;
+  padding: 4px;
+  color: #999;
+  margin-top: -1px;
+}
+
+.panel-comment_item .orig_cont_sub {
+  border-top: 0
+}
+
+.panel-comment_item .comment_orig_content .orig_index {
+  float: right;
+  color: #666;
+  font-family: Arial;
+  padding-right: 5px;
+  line-height: 30px;
+}
+
+.panel-comment_item .comment_orig_content .orig_user {
+  margin: 10px 15px 10px 5px;
+}
+
+.panel-comment_item .comment_orig_content .orig_user span {
+  color: #999;
+  padding-right: 5px;
+}
+
+.panel-comment_item .comment_orig_content .orig_content {
+  padding: 5px 0px 5px 0px;
+  line-height: 24px;
+  color: #333;
+}
+
+.panel-comment_item .orig_right {
+  width: 80%;
+  margin-top: 5px;
+}
+
+.panel-comment_item .orig_right img {
+  max-width: 100%;
+}
+
+.panel-comment_item a.comment_ding_link {
+  height: 24px;
+  line-height: 24px;
+  display: inline-block;
+  padding-left: 2px;
+  vertical-align: middle;
+  color: #333;
+}
+
+.panel-comment_item a:hover.comment_ding_link {
+  color: #269ac9;
+}
+
+.panel-comment_item .comment_ding_link span {
+  display: inline-block;
+  padding: 0 0px 0 8px;
+}
+
+.panel-comment_item .comment_ding_link em {
+  font-style: normal;
+  font-family: arial;
+}
+
+.panel-comment_item .comment_reply_link {
+  display: inline-block;
+  width: 50px;
+  height: 24px;
+  line-height: 24px;
+  vertical-align: middle;
+  text-align: center;
+}
+
+.panel-comment_item .comment_reply_link:link,
+.comment_reply_link:visited {
+  color: #333;
+  text-decoration: none;
+}
+
+.panel-comment_item .comment_content {
+  color: #666;
+}
+
+.comment_content img,
+.orig_content img {
+  max-width: 100%
+}
+
+.panel-comment_item .t_txt {
+  margin-top: 10px;
+}
+
+.panel-comment_item .orig_reply_box {
+  border-top: 1px solid #e3e3e3;
+  width: 100%;
+  padding: 15px 0px 0px 0;
+  margin-top: 5px;
+}
+
+.panel-comment_item .orig_textarea {
+  width: 90%;
+  margin-bottom: 10px;
+}
+
+.panel-comment_item .orig_textarea02 {
+  border: 1px solid #ccc;
+  background-color: #fff;
+  width: 92%;
+  margin-bottom: 10px;
+}
+
+.panel-comment_item .orig_sub {
+  float: right;
+  background-color: #269ac9;
+  color: #fff;
+  height: 25px;
+  line-height: 25px;
+  text-align: center;
+  width: 80px;
+  border: none;
+}
+
+.panel-comment_item .orig_sub:hover {
+  background: #297fb8;
+}
+
+.panel-comment_item .orig_cont_hide {
+  text-align: center;
+  width: 100%;
+  display: block;
+  font-size: 14px;
+  color: #666;
+  border-bottom: 1px solid #F3DDB3;
+  padding: 8px 0;
+}
+
+.panel-comment_item .orig_icon {
+  color: #888;
+  margin-right: 10px;
+  font-size: 14px;
+  font-weight: bold;
+}
+
+.orig_reply {
+  font-size: 12px;
+}
+
+.panel-mes-head {
+  padding: 10px;
+  border-bottom: 1px solid #eee;
+}
+
+.homepagePostReplyPortrait a img {
+  border-radius: 100px;
+}
+
+/* 表格 */
+.panel-new-table {
+  width: 100%;
+  text-align: center;
+}
+
+.panel-new-table tr th {
+  color: #333;
+  height: 50px;
+  line-height: 50px;
+}
+
+.panel-new-table tr th,
+.panel-new-table tr td {
+  border-bottom: 1px solid #eee;
+}
+
+.panel-new-table tr td {
+  color: #666;
+  height: 40px;
+  line-height: 40px;
+}
+
+.panel-table-pd15 tr td {
+  padding: 15px 0;
+}
+
+.panel-new-table tbody tr:hover {
+  background: #f9f9f9;
+}
+
+a.panel-table-name {
+  display: block;
+  max-width: 100px;
+  text-align: center;
+}
+
+a.panel-table-title {
+  display: block;
+  max-width: 240px;
+  text-align: center;
+}
+
+.table-num {
+  width: 5%;
+  text-align: center;
+}
+
+/* 滑动条 */
+.panel-slider-bg {
+  width: 240px;
+  height: 15px;
+  border-radius: 15px;
+  background: #f1f2f7;
+}
+
+.panel-slider-inner00 {
+  display: block;
+  width: 0%;
+  height: 15px;
+  border-radius: 15px;
+  background: #29bd8b;
+}
+
+.panel-slider-inner01 {
+  display: block;
+  width: 10%;
+  height: 15px;
+  border-radius: 15px;
+  background: #29bd8b;
+}
+
+.panel-slider-inner02 {
+  display: block;
+  width: 20%;
+  height: 15px;
+  border-radius: 15px;
+  background: #29bd8b;
+}
+
+.panel-slider-inner03 {
+  display: block;
+  width: 30%;
+  height: 15px;
+  border-radius: 15px;
+  background: #29bd8b;
+}
+
+.panel-slider-inner04 {
+  display: block;
+  width: 40%;
+  height: 15px;
+  border-radius: 15px;
+  background: #29bd8b;
+}
+
+.panel-slider-inner05 {
+  display: block;
+  width: 50%;
+  height: 15px;
+  border-radius: 15px;
+  background: #29bd8b;
+}
+
+.panel-slider-inner06 {
+  display: block;
+  width: 60%;
+  height: 15px;
+  border-radius: 15px;
+  background: #29bd8b;
+}
+
+.panel-slider-inner07 {
+  display: block;
+  width: 70%;
+  height: 15px;
+  border-radius: 15px;
+  background: #29bd8b;
+}
+
+.panel-slider-inner08 {
+  display: block;
+  width: 80%;
+  height: 15px;
+  border-radius: 15px;
+  background: #29bd8b;
+}
+
+.panel-slider-inner09 {
+  display: block;
+  width: 90%;
+  height: 15px;
+  border-radius: 15px;
+  background: #29bd8b;
+}
+
+.panel-slider-inner10 {
+  display: block;
+  width: 100%;
+  height: 15px;
+  border-radius: 15px;
+  background: #29bd8b;
+}
+
+/* 翻页 */
+.panel-pages a {
+  display: inline-block;
+  border: 1px solid #d1d1d1;
+  color: #888;
+  float: left;
+  text-align: center;
+  padding: 0 10px;
+  margin-right: 5px;
+  height: 30px;
+  line-height: 30px;
+}
+
+.panel-pages a:hover,
+.panel-pages .active {
+  background-color: #29bd8b;
+  border: 1px solid #29bd8b;
+  color: #fff;
+}
+
+.panel-pages {
+  width: 350px;
+  margin: 20px auto;
+}
+
+/* 翻页*/
+.pages_right_min a {
+  display: inline-block;
+  border: 1px solid #d1d1d1;
+  color: #888 !important;
+  float: left;
+  text-align: center;
+  padding: 3px 10px;
+  line-height: 1.9;
+  margin: 0 5px;
+}
+
+.pages_right_min a.pages-border-right {
+  border-right: 1px solid #d1d1d1;
+}
+
+.pages_right_min a:hover,
+.pages_right_min a.active {
+  background-color: #FC7033;
+  color: #fff !important;
+  border: 1px solid #FC7033
+}
+
+.pages_right_min li {
+  float: left;
+}
+
+/* 个人主页翻页 */
+.pages_user_show a:hover,
+.pages_user_show a.active {
+  background-color: #FC7033;
+  ;
+  color: #fff;
+  border: 1px solid #FC7033;
+}
+
+.pages_user_show a {
+  display: inline-block;
+  border: 1px solid #d1d1d1;
+  color: #888;
+  float: left;
+  text-align: center;
+  padding: 3px 10px;
+  line-height: 1.9;
+  margin: 0 5px;
+}
+
+.pages_user_show li {
+  float: left;
+  list-style-type: none;
+}
+
+.pages_user_show ul li {
+  list-style-type: none !important;
+}
+
+.pages_user_show ul li a {
+  color: #888
+}
+
+/* 小翻页 */
+.pages_little_show a:hover,
+.pages_little_show a.active {
+  background-color: #FC7033;
+  ;
+  color: #fff !important;
+  border: 1px solid #FC7033
+}
+
+.pages_little_show a {
+  display: inline-block;
+  border: 1px solid #d1d1d1;
+  color: #888 !important;
+  float: left;
+  text-align: center;
+  padding: 3px 3px;
+  line-height: 1.9;
+  margin: 0 2px;
+  font-size: 12px;
+}
+
+.pages_little_show li {
+  float: left;
+}
+
+/* 搜索*/
+.panel-search {
+  position: relative;
+}
+
+input.panel-search-input {
+  height: 30px;
+  width: 300px;
+  color: #666;
+}
+
+.panel-search-btn {
+  position: absolute;
+  top: 2px;
+  right: 10px;
+}
+
+/* 表单*/
+.label-w20 {
+  width: 20% !important;
+}
+
+.panel-form-label {
+  display: inline-block;
+  width: 10%;
+  min-width: 90px;
+  text-align: right;
+  line-height: 40px;
+  font-weight: normal;
+}
+
+.panel-form input,
+.panel-form textarea,
+.panel-form select {
+  border: 1px solid #e2e2e2;
+  color: #666;
+  line-height: 1.9;
+  background: #fff;
+}
+
+.panel-box-sizing {
+  -moz-box-sizing: border-box;
+  /*Firefox3.5+*/
+  -webkit-box-sizing: border-box;
+  /*Safari3.2+*/
+  -o-box-sizing: border-box;
+  /*Opera9.6*/
+  -ms-box-sizing: border-box;
+  /*IE8*/
+  box-sizing: border-box;
+  border-radius: 3px;
+}
+
+input.panel-form-width-690 {
+  padding: 5px;
+  width: 90%;
+  height: 40px;
+}
+
+input.panel-form-width-100 {
+  padding: 5px;
+  width: 100%;
+  height: 40px;
+}
+
+input.panel-form-width-45 {
+  padding: 5px;
+  width: 44.5%;
+  height: 40px;
+}
+
+input.panel-form-width-50 {
+  padding: 5px;
+  width: 44.5%;
+  height: 25px;
+}
+
+input.panel-form-width-60 {
+  padding: 5px;
+  width: 60%;
+  height: 40px;
+}
+
+textarea.panel-form-width-100 {
+  padding: 5px;
+  width: 100%;
+  height: 150px;
+}
+
+textarea.panel-form-width-690 {
+  padding: 5px;
+  width: 90%;
+  height: 150px;
+}
+
+.panel-form-width-670 {
+  width: 670px;
+  padding: 5px;
+}
+
+.panel-form-height-150 {
+  height: 150px;
+}
+
+.panel-form-height-30 {
+  height: 30px;
+}
+
+.task-bg-grey {
+  background: #f3f3f3;
+  width: 90%;
+  min-width: 700px;
+  padding: 10px;
+  border: 1px solid #f3f3f3;
+  color: #888;
+}
+
+.task-bg-grey02 {
+  background: #f3f3f3;
+  width: 80%;
+  min-width: 700px;
+  padding: 7px 10px;
+  border: 1px solid #f3f3f3;
+  color: #888;
+}
+
+input.task-form-10,
+textarea.task-form-10,
+select.task-form-10,
+.task-form-10 {
+  padding: 5px;
+  width: 10%;
+  box-sizing: border-box
+}
+
+input.task-form-15,
+textarea.task-form-15,
+select.task-form-15,
+.task-form-15 {
+  padding: 5px;
+  width: 15%;
+  box-sizing: border-box
+}
+
+input.task-form-20,
+textarea.task-form-20,
+select.task-form-20,
+.task-form-20 {
+  padding: 5px;
+  width: 20%;
+  box-sizing: border-box
+}
+
+input.task-form-30,
+textarea.task-form-30,
+select.task-form-30,
+.task-form-30 {
+  padding: 5px;
+  width: 30%;
+  box-sizing: border-box
+}
+
+input.task-form-35,
+textarea.task-form-35,
+select.task-form-35,
+.task-form-35 {
+  padding: 5px;
+  width: 35%;
+  box-sizing: border-box
+}
+
+input.task-form-40,
+textarea.task-form-40,
+select.task-form-40,
+.task-form-40 {
+  padding: 5px;
+  width: 40%;
+  box-sizing: border-box
+}
+
+input.task-form-45,
+textarea.task-form-45,
+select.task-form-45,
+.task-form-45 {
+  padding: 5px;
+  width: 45%;
+  box-sizing: border-box
+}
+
+input.task-form-50,
+textarea.task-form-50,
+select.task-form-50,
+.task-form-50 {
+  padding: 5px;
+  width: 50%;
+  box-sizing: border-box
+}
+
+input.task-form-60,
+textarea.task-form-60,
+select.task-form-60,
+.task-form-60 {
+  padding: 5px;
+  width: 60%;
+  box-sizing: border-box
+}
+
+input.task-form-70,
+textarea.task-form-70,
+select.task-form-70,
+.task-form-70 {
+  padding: 5px;
+  width: 70%;
+  box-sizing: border-box
+}
+
+input.task-form-80,
+textarea.task-form-80,
+select.task-form-80,
+.task-form-80 {
+  padding: 5px;
+  width: 80%;
+  box-sizing: border-box
+}
+
+input.task-form-90,
+textarea.task-form-90,
+select.task-form-90,
+.task-form-90 {
+  padding: 5px;
+  width: 90%;
+  box-sizing: border-box
+}
+
+input.task-form-100,
+textarea.task-form-100,
+select.task-form-100,
+.task-form-100 {
+  padding: 5px;
+  width: 100%;
+}
+
+input.task-height-40,
+textarea.task-height-40,
+.task-height-40,
+select.task-height-40 {
+  height: 40px;
+}
+
+input.task-height-30,
+textarea.task-height-30,
+.task-height-30,
+select.task-height-30 {
+  height: 32px;
+}
+
+input.task-height-220,
+textarea.task-height-220,
+.task-height-220 {
+  height: 220px;
+}
+
+input.task-height-150,
+textarea.task-height-150,
+.task-height-150 {
+  height: 150px;
+}
+
+input.task-height-100,
+textarea.task-height-100,
+.task-height-100 {
+  height: 100px;
+}
+
+input.task-height-80,
+textarea.task-height-80,
+.task-height-80 {
+  height: 80px;
+}
+
+/*头像下拉弹框*/
+.my_account_info {
+  width: 160px;
+  background-color: #fff;
+  border-radius: 3px;
+  box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
+  position: absolute;
+  font-size: 14px;
+  top: 46px;
+  left: -97px;
+  display: none;
+  z-index: 999;
+}
+
+.my_account_info li a {
+  color: #888;
+}
+
+.my_account_info font {
+  border: 1px solid #dddddd;
+  display: block;
+  border-width: 8px;
+  position: absolute;
+  top: -15px;
+  left: 140px;
+  border-style: solid;
+  border-color: transparent transparent #fff transparent;
+  font-size: 0;
+  line-height: 0;
+  box-shadow: 2px rgba(146, 153, 169, 0.5);
+}
+
+.my_account_info li {
+  padding-left: 5px;
+  line-height: 1.5;
+}
+
+.li_bottom_border {
+  border-bottom: 1px solid #eee;
+}
+
+a.task-index-name {
+  display: inline-block;
+  max-width: 80px;
+}
+
+.task-index-name {
+  display: inline-block;
+  max-width: 80px;
+}
+
+/*滑块验证*/
+.drag_slider {
+  position: relative;
+  background-color: #e8e8e8;
+  width: 100%;
+  height: 45px;
+  line-height: 45px;
+  text-align: center;
+  border-radius: 4px;
+}
+
+.drag_slider .handler {
+  border-radius: 4px 0px 0px 4px;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  width: 50px;
+  height: 43px;
+  border: 1px solid #eee;
+  cursor: move;
+}
+
+.handler_bg {
+  background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;
+}
+
+.handler_ok_bg {
+  background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;
+}
+
+.drag_slider .drag_bg {
+  background-color: #29bd8b;
+  height: 45px;
+  width: 0px;
+}
+
+.drag_slider .drag_text {
+  border-radius: 4px 0px 0px 4px;
+  position: absolute;
+  top: 0px;
+  width: 100%;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  user-select: none;
+  -o-user-select: none;
+  -ms-user-select: none;
+}
+
+
+/*新建新增*/
+/*.edu-con-top{ padding:10px 0; background:#fff; border-bottom:1px solid #eee;font-size:16px; }*/
+/*.edu-con-top h2{ font-size:16px;}*/
+/*.edu-con-bg01{ width: 100%; background:#fff;}*/
+/*.edu-con-top .color-grey{ color:#666!important;}*/
+
+/*附件上传的样式*/
+.atta_input {
+  width: 980px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+/*作业描述、帖子内容*/
+.upload_img img {
+  max-width: 100%;
+}
+
+.table_maxWidth table {
+  max-width: 642px;
+}
+
+.list_style ol li {
+  list-style-type: decimal;
+  margin-left: 40px;
+}
+
+.list_style ul li {
+  list-style-type: disc;
+  margin-left: 40px;
+}
+
+/*数据为空公共页面*/
+img.edu-nodata-img {
+  width: 200px;
+  margin: 50px auto 20px;
+  display: block;
+}
+
+.edu-nodata-p {
+  font-size: 16px;
+  text-align: center;
+  color: #888;
+  border-bottom: none !important;
+}
+
+/* new tab */
+.edu-tab {
+  width: 100%;
+  background: #fff;
+}
+
+#edu-tab-nav {
+  height: 47px;
+  background: #fff;
+}
+
+#edu-tab-nav li.new-tab-nav {
+  float: left;
+  width: 150px;
+  text-align: center;
+  height: 48px;
+  line-height: 48px;
+  border-top-right-radius: 5px;
+  border-top-left-radius: 5px;
+}
+
+#edu-tab-nav li a {
+  font-size: 14px;
+}
+
+#edu-user-tab-nav {
+  height: 40px;
+  background: #fff;
+  border-bottom: 2px solid #FC7033;
+}
+
+#edu-user-tab-nav li.new-tab-nav {
+  float: left;
+  width: 120px;
+  text-align: center;
+  height: 42px;
+  line-height: 42px;
+  border-top-left-radius: 5px;
+  border-top-right-radius: 5px
+}
+
+#edu-user-tab-nav li a {
+  font-size: 14px;
+}
+
+.edu-new-tab-hover {
+  background: #5faee3;
+}
+
+.edu-user-tab-hover {
+  background: #FC7033;
+}
+
+.edu-user-tab-hover a {
+  color: #fff !important;
+}
+
+.edu-new-tab-hover a {
+  color: #fff !important;
+}
+
+.edu-class-con-list:hover {
+  background: #EFF9FD;
+}
+
+.edu-bg-shadow {
+  box-shadow: 0px 0px 5px rgba(146, 153, 169, 0.2);
+}
+
+a.task-btn-line {
+  display: inline-block;
+  font-weight: bold;
+  padding: 0 12px;
+  color: #666;
+  background: #fff;
+  letter-spacing: 1px;
+  text-align: center;
+  font-size: 14px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 3px;
+  border: 1px solid #ccc;
+}
+
+a:hover.task-btn-line {
+  border: 1px solid #3498db;
+  background: #3498db;
+  color: #fff;
+}
+
+/*阴影*/
+.user_bg_shadow {
+  -webkit-box-shadow: 0 0 8px 0 rgba(142, 142, 142, .1);
+  -moz-box-shadow: 0 0 8px 0 rgba(142, 142, 142, .1);
+  box-shadow: 0 0 8px 0 rgba(142, 142, 142, .1);
+}
+
+/*四边阴影*/
+.user_bg_shadow_notop {
+  -webkit-box-shadow: 0 3px 8px 0 rgba(142, 142, 142, .1);
+  -moz-box-shadow: 0 3px 8px 0 rgba(142, 142, 142, .1);
+  box-shadow: 0 3px 8px 0 rgba(142, 142, 142, .1);
+}
+
+/*没有上边阴影*/
+/*阴影+边框*/
+.shadow_border {
+  border: 1px solid #eee;
+  -webkit-box-shadow: 0 0 8px 0 rgba(142, 142, 142, .1);
+  -moz-box-shadow: 0 0 8px 0 rgba(142, 142, 142, .1);
+  box-shadow: 0 0 8px 0 rgba(142, 142, 142, .1);
+}
+
+.shadow_border_notop {
+  border: 1px solid #eee;
+  -webkit-box-shadow: 0 3px 8px 0 rgba(142, 142, 142, .1);
+  -moz-box-shadow: 0 3px 8px 0 rgba(142, 142, 142, .1);
+  box-shadow: 0 3px 8px 0 rgba(142, 142, 142, .1);
+}
+
+.user_bg_shadow01 {
+  -webkit-box-shadow: 0 1px 2px 2px rgba(123, 123, 123, 0.15);
+  -moz-box-shadow: 0 1px 2px 2px rgba(123, 123, 123, 0.15);
+  box-shadow: 0 1px 2px 2px rgba(123, 123, 123, 0.15);
+}
+
+.user_bg_shadow02 {
+  -webkit-box-shadow: 0 2px 8px 0 rgba(123, 123, 123, 0.15);
+  -moz-box-shadow: 0 2px 8px 0 rgba(123, 123, 123, 0.15);
+  box-shadow: 0 2px 8px 0 rgba(123, 123, 123, 0.15);
+}
+
+.box_bg_shandow {
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);
+}
+
+/*新增的公用样式*/
+.box-boxshadow {
+  box-shadow: 3px 3px 10px rgba(146, 153, 169, 0.2);
+}
+
+.prop-notice-info {
+  padding: 10px;
+  border: 1px solid #F3DDB3;
+  background-color: #FFFEF4;
+}
+
+.prop-notice-info ol {
+  list-style-type: disc;
+  list-style-position: inside
+}
+
+.prop-notice-info ol li {
+  list-style-type: disc;
+  color: #ff6532;
+  margin-bottom: 0 !important;
+}
+
+/*input框移出后没有内容将边框阴影变为红色*/
+.notinput_bg_shadow {
+  border: none;
+  box-shadow: 0px 0px 4px rgba(227, 53, 37, 1);
+}
+
+/*设置input框的placehoder的字体颜色*/
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+  color: #cccccc
+}
+
+input::-moz-placeholder,
+textarea::-moz-placeholder {
+  color: #cccccc;
+}
+
+input::-moz-placeholder,
+textarea::-moz-placeholder {
+  color: #cccccc;
+}
+
+input::-ms-input-placeholder,
+textarea::-ms-input-placeholder {
+  color: #cccccc;
+}
+
+/*班级讨论区置顶的样式*/
+.btn-cir {
+  display: inline-block;
+  padding: 0px 5px;
+  border-radius: 25px;
+  line-height: 20px;
+  font-size: 12px;
+}
+
+.btn-cir:hover {
+  background: #fff;
+  color: #333333
+}
+
+.all_work_border {
+  border: 1px solid #4c515d;
+}
+
+/*TPI全部任务的数量需要加一个边框*/
+.btn-cir-grey {
+  background: #e1e1e1;
+  color: #8c8c8c;
+  font-weight: normal;
+  border: 1px solid #e1e1e1
+}
+
+.btn-cir-red {
+  background: red;
+  color: #fff;
+  font-weight: normal;
+}
+
+.btn-cir-red:hover {
+  background: red;
+}
+
+.btn-cir-orange {
+  background: #ff7500;
+  color: #fff;
+  font-weight: normal;
+  border: 1px solid #ff7500
+}
+
+.btn-top {
+  display: inline-block;
+  padding: 0px 5px;
+  line-height: 20px;
+  font-size: 12px;
+  border-radius: 3px;
+}
+
+.btn-cir-big {
+  background: #999;
+  color: #fff;
+  display: inline-block;
+  padding: 0px 10px;
+  border-radius: 25px;
+  line-height: 25px;
+  height: 25px;
+  font-size: 12px;
+}
+
+/*圆形绿色背景---------22*/
+.panel-inner-icon {
+  width: 22px;
+  height: 22px;
+  line-height: 22px;
+  border-radius: 50%;
+  background: #29bd8b;
+  display: block;
+  text-align: center
+}
+
+.panel-inner-icon {
+  width: 22px;
+  height: 22px;
+  line-height: 22px;
+  border-radius: 50%;
+  background: #29bd8b;
+  display: block;
+  text-align: center
+}
+
+/*圆形绿色背景------------------18*/
+.panel-inner-icon18 {
+  width: 18px;
+  height: 18px;
+  line-height: 18px;
+  border-radius: 50%;
+  background: #29bd8b;
+  display: block;
+  text-align: center
+}
+
+/*---------------块右上角的三角形，颜色为浅橙色*/
+.triangle-topright {
+  position: absolute;
+  right: -1px;
+  top: 0px;
+  width: 0;
+  height: 0;
+  border-top: 35px solid #FF9E6A;
+  border-left: 60px solid transparent;
+  z-index: 1
+}
+
+.triangle-font {
+  position: absolute;
+  right: 1px;
+  top: 2px;
+  z-index: 2;
+  font-size: 12px;
+  color: white;
+  transform: rotate(31deg);
+}
+
+.triangle-font2 {
+  position: absolute;
+  right: 1px;
+  top: -5px;
+  z-index: 2;
+  font-size: 12px;
+  color: white;
+  transform: rotate(31deg);
+}
+
+/* colorbox
+*******************************************************************************/
+/*
+    Colorbox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox,
+#cboxOverlay,
+#cboxWrapper {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 99999;
+  overflow: hidden;
+}
+
+#cboxWrapper {
+  max-width: none;
+}
+
+#cboxOverlay {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+}
+
+#cboxMiddleLeft,
+#cboxBottomLeft {
+  clear: left;
+}
+
+#cboxContent {
+  position: relative;
+}
+
+#cboxLoadedContent {
+  overflow: auto;
+  -webkit-overflow-scrolling: touch;
+}
+
+#cboxTitle {
+  margin: 0;
+}
+
+#cboxLoadingOverlay,
+#cboxLoadingGraphic {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
+#cboxPrevious,
+#cboxNext,
+#cboxClose,
+#cboxSlideshow {
+  cursor: pointer;
+}
+
+.cboxPhoto {
+  float: left;
+  margin: auto;
+  border: 0;
+  display: block;
+  max-width: none;
+  -ms-interpolation-mode: bicubic;
+}
+
+.cboxIframe {
+  width: 100%;
+  height: 100%;
+  display: block;
+  border: 0;
+  padding: 0;
+  margin: 0;
+}
+
+#colorbox,
+#cboxContent,
+#cboxLoadedContent {
+  box-sizing: content-box;
+  -moz-box-sizing: content-box;
+  -webkit-box-sizing: content-box;
+}
+
+/*
+    User Style:
+    Change the following styles to modify the appearance of Colorbox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay {
+  background: #fff;
+}
+
+#colorbox {
+  outline: 0;
+}
+
+#cboxTopLeft {
+  width: 25px;
+  height: 25px;
+  background: url(/images/colorbox/border1.png) no-repeat 0 0;
+}
+
+#cboxTopCenter {
+  height: 25px;
+  background: url(/images/colorbox/border1.png) repeat-x 0 -50px;
+}
+
+#cboxTopRight {
+  width: 25px;
+  height: 25px;
+  background: url(/images/colorbox/border1.png) no-repeat -25px 0;
+}
+
+#cboxBottomLeft {
+  width: 25px;
+  height: 25px;
+  background: url(/images/colorbox/border1.png) no-repeat 0 -25px;
+}
+
+#cboxBottomCenter {
+  height: 25px;
+  background: url(/images/colorbox/border1.png) repeat-x 0 -75px;
+}
+
+#cboxBottomRight {
+  width: 25px;
+  height: 25px;
+  background: url(/images/colorbox/border1.png) no-repeat -25px -25px;
+}
+
+#cboxMiddleLeft {
+  width: 25px;
+  background: url(/images/colorbox/border2.png) repeat-y 0 0;
+}
+
+#cboxMiddleRight {
+  width: 25px;
+  background: url(/images/colorbox/border2.png) repeat-y -25px 0;
+}
+
+#cboxContent {
+  background: #fff;
+  overflow: hidden;
+}
+
+.cboxIframe {
+  background: #fff;
+}
+
+#cboxError {
+  padding: 50px;
+  border: 1px solid #ccc;
+}
+
+#cboxLoadedContent {
+  margin-bottom: 20px;
+}
+
+#cboxTitle {
+  position: absolute;
+  bottom: 0px;
+  left: 0;
+  text-align: center;
+  width: 100%;
+  color: #999;
+}
+
+#cboxCurrent {
+  position: absolute;
+  bottom: 0px;
+  left: 100px;
+  color: #999;
+}
+
+#cboxLoadingOverlay {
+  background: #fff url(/images/colorbox/loading.gif) no-repeat 5px 5px;
+}
+
+/* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
+#cboxPrevious,
+#cboxNext,
+#cboxSlideshow,
+#cboxClose {
+  border: 0;
+  padding: 0;
+  margin: 0;
+  overflow: visible;
+  width: auto;
+  background: none;
+}
+
+/* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
+#cboxPrevious:active,
+#cboxNext:active,
+#cboxSlideshow:active,
+#cboxClose:active {
+  outline: 0;
+}
+
+#cboxSlideshow {
+  position: absolute;
+  bottom: 0px;
+  right: 42px;
+  color: #444;
+}
+
+#cboxPrevious {
+  position: absolute;
+  bottom: 0px;
+  left: 0;
+  color: #444;
+}
+
+#cboxNext {
+  position: absolute;
+  bottom: 0px;
+  left: 63px;
+  color: #444;
+}
+
+#cboxClose {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  display: block;
+  color: #444;
+}
+
+/*-----下拉框--------*/
+.down-select {
+  display: none;
+  position: absolute;
+  z-index: 10;
+  left: 0px;
+  width: 100%;
+  overflow-y: auto;
+  background: #fff;
+  max-height: 200px;
+}
+
+.down-select p {
+  height: 35px;
+  line-height: 35px;
+  padding-left: 5px;
+}
+
+.down-select p:hover {
+  background: #f3f4f6
+}
+
+/*课程、实训的条状样式*/
+.homepage-list-show p {
+  height: 70px;
+  line-height: 70px;
+}
+
+.homepage-list-show p:nth-child(odd) {
+  background: #fafbfb;
+}
+
+.homepage-list-show p .first {
+  width: 58%;
+  display: inline-block;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.homepage-list-show p .hasmargin {
+  width: 23%;
+  display: inline-block;
+  text-align: center;
+  color: #888;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.homepage-list-show p .haspadding {
+  width: 16.7%;
+  display: inline-block;
+  margin-right: 12%;
+  color: #888;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.homepage-list-show p .last {
+  width: 8.33%;
+  display: inline-block;
+  color: #888;
+  cursor: pointer;
+  display: none;
+}
+
+.homepage-list-show p .last:hover {
+  color: #5faee3;
+}
+
+.homepage-list-show p .last:hover .blue {
+  color: #5faee3;
+}
+
+/*-----课程名称下拉框--------*/
+.course_list_ul,
+.down-list {
+  overflow-y: scroll;
+  display: none;
+  position: absolute;
+  top: 40px;
+  left: -1px;
+  width: 100% !important;
+  border: 1px solid #eeeeee;
+  background: #FFFFFF;
+  max-height: 150px;
+  z-index: 10
+}
+
+.course_list_ul li {
+  height: 20px;
+  padding: 5px 10px;
+  clear: both;
+  line-height: 28px;
+  margin-bottom: 0 !important;
+  cursor: pointer;
+}
+
+.down-list li {
+  text-align: left;
+  outline: none;
+  padding: 5px 10px;
+  clear: both;
+  line-height: 22px !important;
+  margin-bottom: 0 !important;
+  cursor: pointer;
+  width: 100%;
+  box-sizing: border-box;
+  height: 30px;
+  border: none !important;
+}
+
+.down-list li:hover {
+  background: #eee
+}
+
+.down-list {
+  top: 32px
+}
+
+.unit-part {
+  border: 1px solid #ccc;
+  padding: 0px 8px;
+  border-radius: 5px;
+  margin-right: 10px
+}
+
+.unit-part input {
+  border: none !important;
+  text-align: left;
+  width: auto;
+  outline: none
+}
+
+/*-----试卷提交状态--------*/
+.post_status_btn {
+  display: block;
+  float: left;
+  padding: 0px 5px;
+  font-size: 12px;
+  color: #FFFFFF;
+  border-radius: 4px;
+  height: 20px;
+  line-height: 20px;
+  ;
+}
+
+.post_btn_green {
+  background: #29bd8b;
+  border: 1px solid #29bd8b !important;
+  color: #fff;
+}
+
+.post_btn_green_q {
+  background: #5ECFBA;
+  border: 1px solid #5ECFBA !important;
+  color: #fff;
+}
+
+.post_btn_orange {
+  background: #FF7500;
+  border: 1px solid #FF7500 !important;
+  color: #fff;
+}
+
+.post_btn_red {
+  background: #ee4a1f;
+  border: 1px solid #ee4a1f !important;
+  color: #fff;
+}
+
+.post_btn_grey {
+  background: #e4e4e3;
+  border: 1px solid #e4e4e3 !important;
+}
+
+.post_btn_white {
+  background: #ffffff;
+}
+
+/*评阅状态*/
+.checkstatus_box_small {
+  width: 10px;
+  height: 10px;
+  display: block;
+  float: left;
+  margin-right: 3px;
+}
+
+.checkstatus_box_big {
+  cursor: default;
+  width: 30px;
+  height: 30px;
+  line-height: 30px;
+  text-align: center;
+  margin-right: 10px;
+  border: 1px solid #CCCCCC;
+  display: block;
+  float: left;
+  margin-bottom: 10px
+}
+
+.checkstatus_box_big i {
+  position: absolute;
+  top: 18px;
+  left: 10px;
+}
+
+/*个人主页头部认证圆形背景*/
+.user-info-span {
+  border-radius: 50%;
+  float: left;
+  background: #F3F5F7;
+  text-align: center;
+  width: 23px;
+  height: 23px;
+  line-height: 23px;
+  margin-top: 3px;
+  margin-right: 5px
+}
+
+/*试卷答题倒计时*/
+.time_panel span.factorial {
+  float: left;
+  display: block;
+  line-height: 35px;
+  padding: 0px 3px;
+}
+
+.time_panel span.time {
+  float: left;
+  display: block;
+  color: #ffffff;
+  background-color: #333333;
+  font-size: 16px;
+  border-radius: 5px;
+  letter-spacing: 1px;
+  width: 33px;
+  text-align: center;
+  line-height: 35px;
+  height: 35px;
+}
+
+.hidemsg {
+  overflow: hidden;
+  cursor: pointer
+}
+
+.hidemsg div {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+  opacity: 0.4;
+  background-color: #ffffff;
+  -webkit-border-radius: 100%;
+  -moz-border-radius: 100%;
+  -o-border-radius: 100%;
+  -ms-border-radius: 100%;
+  -webkit-animation-fill-mode: both;
+  -moz-animation-fill-mode: both;
+  -ms-animation-fill-mode: both;
+  -o-animation-fill-mode: both;
+  width: 80px;
+  height: 80px;
+  -webkit-animation: ball-scale 1s 0s ease-in-out infinite;
+  -moz-animation: ball-scale 1s 0s ease-in-out infinite;
+  -ms-animation: ball-scale 1s 0s ease-in-out infinite;
+  -o-animation: ball-scale 1s 0s ease-in-out infinite;
+  animation: ball-scale 1s 0s ease-in-out infinite;
+}
+
+@keyframes ball-scale {
+  0% {
+    width: 0px;
+    height: 0px
+  }
+
+  100% {
+    width: 80px;
+    height: 80px
+  }
+}
+
+/*-------------------个人主页关注和粉丝列表改版         以及TPM合作者部分改版 2018/01/15-------------------------*/
+.-task-con-int .favour .fens-table-list {
+  display: flex;
+  width: 21.29%;
+  margin: 0px 1.5% 1.5% 0px;
+  min-height: 125px;
+  border: 1px solid #EEEEEE;
+  padding: 10px;
+  background: #f9fbfd
+}
+
+.-task-con-int .favour .fens-table-list:nth-child(4n+1) {
+  margin: 0px 1.5% 1.5% 1.5%;
+}
+
+.-task-con-int .favour .fens-table-list .touxiang {
+  border-radius: 50%;
+  overflow: hidden;
+}
+
+.white-icon-ring {
+  width: 25px;
+  height: 25px;
+  background: #ffffff;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 25px;
+}
+
+a.btn-focus {
+  display: block;
+  width: 80px;
+  height: 35px;
+  line-height: 35px;
+  border-radius: 4px;
+  border: 1px solid #EEEEEE;
+  text-align: center;
+  cursor: pointer;
+  background: #ffffff
+}
+
+a.btn-focus:hover {
+  color: #FFFFFF !important;
+  background: #FC7033;
+  border: 1px solid #FC7033
+}
+
+.fans-name {
+  max-width: 100px;
+  word-break: break-all;
+  overflow: hidden;
+  height: 26px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.school-name {
+  max-width: 196px;
+  word-break: break-all;
+  overflow: hidden;
+  height: 26px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.fans_del {
+  position: absolute;
+  right: 12px;
+  top: 12px;
+  cursor: pointer;
+  text-align: center;
+}
+
+.fans_del i {
+  color: #b5b5b5
+}
+
+.fans_del:hover i {
+  color: #ff7500 !important;
+}
+
+.-task-con-int .favour .p2 {
+  line-height: 90px;
+  text-align: center;
+}
+
+.-task-con-int .favour .p2:hover .changecolor {
+  color: #5faee3;
+}
+
+.-task-con-int .favour .fens {
+  position: relative;
+}
+
+.-task-con-int .favour .fens .many {
+  position: absolute;
+  right: 22px;
+  top: -35px;
+}
+
+.-task-con-int .favour .fens .list {
+  width: 100px;
+  text-align: center;
+  padding-top: 5px;
+}
+
+.-task-con-int .favour .fens .list dt {
+  margin: 20px;
+  margin-bottom: 5px;
+}
+
+.-task-con-int .favour .fens .touxiang {
+  border-radius: 28px;
+  overflow: hidden;
+}
+
+/*选择实训的弹框*/
+.shixun_work_div {
+  overflow-y: auto;
+  max-height: 90px;
+}
\ No newline at end of file
diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css
new file mode 100644
index 00000000..f86bd149
--- /dev/null
+++ b/public/css/edu-purge.css
@@ -0,0 +1,6742 @@
+/* 头部 */
+.header {
+  width: 100%;
+  height: 51px;
+  min-width: 1200px;
+  background: rgb(23, 22, 22);
+}
+
+/*.edu-dropdown:hover .edu-dropdown-menu{ display: block;}*/
+.animate {
+  -webkit-transition: all .3s;
+  -moz-transition: all .3s;
+  -ms-transition: all .3s;
+  -ms-transition: all .3s;
+  transition: all .3s;
+  backface-visibility: hidden;
+  -webkit-backface-visibility: hidden;
+  /* Chrome and Safari */
+  -moz-backface-visibility: hidden;
+  /* Firefox */
+  -ms-backface-visibility: hidden;
+  /* Internet Explorer */
+}
+
+/* 底部 */
+.footer {
+  width: 100%;
+  height: 100px;
+  background-color: #fff;
+}
+
+.footer_con-p {
+  color: #888;
+  margin-top: 10px;
+}
+
+.inner-footer_con {
+  width: 1200px;
+  margin: 0 auto;
+}
+
+/************布局 byLB****************/
+
+/************讨论区20170321 byLB****************/
+.panel-inner-fourm {
+  padding: 20px;
+  border-bottom: 1px solid #eee;
+}
+
+.panel-inner-fourm:hover {
+  background: #EFF9FD;
+}
+
+a.panel-list-title,
+.panel-list-title {
+  display: inline-block;
+  font-size: 16px;
+  color: #333;
+  font-weight: normal;
+  max-width: 82%;
+}
+
+a:hover.panel-list-title {
+  color: #FF7500;
+}
+
+.panel-list-img {
+  width: 60px;
+  height: 60px;
+  border-radius: 100px;
+}
+
+a.panel-name-small {
+  display: inline-block;
+  max-width: 100px;
+  color: #29bd8b;
+  font-size: 12px;
+}
+
+.panel-lightgrey,
+.panel-lightgrey span {
+  font-size: 12px;
+  color: #888;
+}
+
+/*班级讨论区panel 2017/07/20   cs*/
+
+/* 回复评论 */
+.panel-comment_item {
+  width: 100%;
+}
+
+.panel-comment_item .t_area {
+  color: #888;
+}
+
+.comment_item_cont {
+  padding: 15px;
+  border-bottom: 1px solid #e3e3e3;
+}
+
+.comment_item_cont .J_Comment_Face {
+  height: 50px
+}
+
+.comment_item_cont .J_Comment_Face img {
+  width: 50px;
+  height: 50px;
+  border-radius: 100px;
+}
+
+.panel-comment_item .t_content {
+  width: 93%;
+  margin-left: 15px;
+}
+
+.panel-comment_item a.content-username {
+  font-size: 14px;
+  margin-right: 15px;
+  display: inline-block;
+  max-width: 100px;
+  color: #888888
+}
+
+.J_Comment_Info {
+  height: 20px;
+  line-height: 22px;
+}
+
+/*.panel-comment_item a:hover.content-username{color:#FF7500;}*/
+
+.panel-comment_item .comment_orig_content {
+  margin: 10px 0;
+  color: #999;
+}
+
+.panel-comment_item .comment_orig_content .comment_orig_content {
+  margin-top: 0;
+  color: #666;
+}
+
+.panel-comment_item .comment_content {
+  color: #666;
+}
+
+.comment_content img {
+  max-width: 100%
+}
+
+.orig_reply {
+  font-size: 12px;
+}
+
+.homepagePostReplyPortrait a img {
+  border-radius: 100px;
+}
+
+/* 表格 */
+
+/* 滑动条 */
+
+/* 翻页 */
+
+/* 翻页*/
+
+/* 个人主页翻页 */
+.pages_user_show a:hover,
+.pages_user_show a.active {
+  background-color: #FC7033;
+  ;
+  color: #fff;
+  border: 1px solid #FC7033;
+}
+
+.pages_user_show a {
+  display: inline-block;
+  border: 1px solid #d1d1d1;
+  color: #888;
+  float: left;
+  text-align: center;
+  padding: 3px 10px;
+  line-height: 1.9;
+  margin: 0 5px;
+}
+
+.pages_user_show li {
+  float: left;
+  list-style-type: none;
+}
+
+.pages_user_show ul li {
+  list-style-type: none !important;
+}
+
+.pages_user_show ul li a {
+  color: #888
+}
+
+/* 小翻页 */
+
+/* 搜索*/
+
+/* 表单*/
+
+.panel-form-label {
+  display: inline-block;
+  width: 10%;
+  min-width: 90px;
+  text-align: right;
+  line-height: 40px;
+  font-weight: normal;
+}
+
+.panel-box-sizing {
+  -moz-box-sizing: border-box;
+  /*Firefox3.5+*/
+  -webkit-box-sizing: border-box;
+  /*Safari3.2+*/
+  -o-box-sizing: border-box;
+  /*Opera9.6*/
+  -ms-box-sizing: border-box;
+  /*IE8*/
+  box-sizing: border-box;
+  border-radius: 3px;
+}
+
+input.task-form-80,
+textarea.task-form-80,
+select.task-form-80,
+.task-form-80 {
+  padding: 5px;
+  width: 80%;
+  box-sizing: border-box
+}
+
+input.task-form-100,
+textarea.task-form-100,
+select.task-form-100,
+.task-form-100 {
+  padding: 5px;
+  width: 100%;
+}
+
+input.task-height-40,
+textarea.task-height-40,
+.task-height-40,
+select.task-height-40 {
+  height: 40px;
+}
+
+input.task-height-150,
+textarea.task-height-150,
+.task-height-150 {
+  height: 150px;
+}
+
+/*头像下拉弹框*/
+
+/*滑块验证*/
+
+.handler_bg {
+  background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;
+}
+
+.handler_ok_bg {
+  background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;
+}
+
+
+/*新建新增*/
+/*.edu-con-top{ padding:10px 0; background:#fff; border-bottom:1px solid #eee;font-size:16px; }*/
+/*.edu-con-top h2{ font-size:16px;}*/
+/*.edu-con-bg01{ width: 100%; background:#fff;}*/
+/*.edu-con-top .color-grey{ color:#666!important;}*/
+
+/*附件上传的样式*/
+
+/*作业描述、帖子内容*/
+
+/*数据为空公共页面*/
+img.edu-nodata-img {
+  width: 200px;
+  margin: 50px auto 20px;
+  display: block;
+}
+
+.edu-nodata-p {
+  font-size: 16px;
+  text-align: center;
+  color: #888;
+  border-bottom: none !important;
+}
+
+/* new tab */
+
+/*阴影*/
+.user_bg_shadow {
+  -webkit-box-shadow: 0 0 8px 0 rgba(142, 142, 142, .1);
+  -moz-box-shadow: 0 0 8px 0 rgba(142, 142, 142, .1);
+  box-shadow: 0 0 8px 0 rgba(142, 142, 142, .1);
+}
+
+/*四边阴影*/
+
+/*没有上边阴影*/
+/*阴影+边框*/
+
+/*新增的公用样式*/
+
+/*input框移出后没有内容将边框阴影变为红色*/
+
+/*设置input框的placehoder的字体颜色*/
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+  color: #cccccc
+}
+
+input::-moz-placeholder,
+textarea::-moz-placeholder {
+  color: #cccccc;
+}
+
+input::-moz-placeholder,
+textarea::-moz-placeholder {
+  color: #cccccc;
+}
+
+input::-ms-input-placeholder,
+textarea::-ms-input-placeholder {
+  color: #cccccc;
+}
+
+/*班级讨论区置顶的样式*/
+.btn-cir {
+  display: inline-block;
+  padding: 0px 5px;
+  border-radius: 25px;
+  line-height: 20px;
+  font-size: 12px;
+}
+
+.btn-cir:hover {
+  background: #fff;
+  color: #333333
+}
+
+.all_work_border {
+  border: 1px solid #4c515d;
+}
+
+/*TPI全部任务的数量需要加一个边框*/
+
+.btn-cir-red {
+  background: red;
+  color: #fff;
+  font-weight: normal;
+}
+
+.btn-cir-red:hover {
+  background: red;
+}
+
+.btn-cir-orange {
+  background: #ff7500;
+  color: #fff;
+  font-weight: normal;
+  border: 1px solid #ff7500
+}
+
+.btn-top {
+  display: inline-block;
+  padding: 0px 5px;
+  line-height: 20px;
+  font-size: 12px;
+  border-radius: 3px;
+}
+
+.btn-cir-big {
+  background: #999;
+  color: #fff;
+  display: inline-block;
+  padding: 0px 10px;
+  border-radius: 25px;
+  line-height: 25px;
+  height: 25px;
+  font-size: 12px;
+}
+
+/*圆形绿色背景---------22*/
+.panel-inner-icon {
+  width: 22px;
+  height: 22px;
+  line-height: 22px;
+  border-radius: 50%;
+  background: #29bd8b;
+  display: block;
+  text-align: center
+}
+
+.panel-inner-icon {
+  width: 22px;
+  height: 22px;
+  line-height: 22px;
+  border-radius: 50%;
+  background: #29bd8b;
+  display: block;
+  text-align: center
+}
+
+/*圆形绿色背景------------------18*/
+
+/*---------------块右上角的三角形，颜色为浅橙色*/
+
+/* colorbox
+*******************************************************************************/
+/*
+    Colorbox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+
+/*
+    User Style:
+    Change the following styles to modify the appearance of Colorbox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+
+/* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
+
+/* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
+
+/*-----下拉框--------*/
+
+/*课程、实训的条状样式*/
+
+/*-----课程名称下拉框--------*/
+
+/*-----试卷提交状态--------*/
+
+/*评阅状态*/
+
+/*个人主页头部认证圆形背景*/
+
+/*试卷答题倒计时*/
+
+@keyframes ball-scale {
+  0% {
+    width: 0px;
+    height: 0px
+  }
+
+  100% {
+    width: 80px;
+    height: 80px
+  }
+}
+
+/*-------------------个人主页关注和粉丝列表改版         以及TPM合作者部分改版 2018/01/15-------------------------*/
+
+/*选择实训的弹框*/
+.shixun_work_div {
+  overflow-y: auto;
+  max-height: 90px;
+}html {
+  height: 100%;
+}
+
+.w20_center {
+  width: 20px;
+  text-align: center;
+}
+
+/*左侧导航*/
+
+.user-info {
+  width: 80px;
+  height: 100px;
+  padding-top: 15px;
+}
+
+a.user-info-img {
+  display: block;
+  width: 50px;
+  height: 50px;
+  margin: 0 auto;
+}
+
+a.user-info-img img {
+  border-radius: 100px;
+  border: 2px solid #666;
+}
+
+a.user-info-img img:hover {
+  border: 2px solid #888;
+}
+
+a.user-info-name {
+  display: block;
+  font-size: 16px;
+  color: #fff;
+  max-width: 100px;
+  margin: 10px auto;
+  text-align: center;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.leftnav-box {
+  width: 80px;
+  height: 60px;
+  background: #292b3a;
+  padding: 10px 0;
+  margin-bottom: 2px;
+}
+
+a.leftnav-box-inner {
+  display: block;
+  width: 77px;
+  border-left: 3px solid #292b3a;
+  background: #292b3a;
+  text-align: center;
+  padding: 10px 0;
+  color: #575f6c;
+}
+
+a:hover.leftnav-box-inner,
+a.leftnav-active {
+  border-left: 3px solid #3498db;
+  color: #fff !important;
+}
+
+a:hover.leftnav-box-inner .btn-cir {
+  background: #fff;
+  color: #333333
+}
+
+
+
+/*右侧头部*/
+
+/*右侧内容*/
+.content {
+  min-width: 1000px;
+}
+
+/* tab */
+
+#tab_nav {
+  height: 42px;
+  background: #fff;
+  border-bottom: 1px solid #EEEEEE
+}
+
+#tab_nav li {
+  float: left;
+  padding: 0 30px;
+  text-align: center;
+  height: 40px;
+  line-height: 40px;
+}
+
+#tab_nav li a {
+  font-size: 14px;
+}
+
+.tab_hover {
+  border-bottom: 2px solid #3498db;
+  background: #fff;
+  color: #3498db
+}
+
+/*.tab_hover_setting{background:#FC7033;}*/
+.tab_hover a {
+  color: #3498db !important;
+}
+
+/*.tab_hover_setting a{color:#fff;}*/
+.undis {
+  display: none;
+}
+
+.dis {
+  display: block;
+}
+
+.tab-info {}
+
+.info-partly {
+  display: block;
+  box-flex: 1;
+  flex: 1;
+  -webkit-flex: 1;
+  position: relative;
+}
+
+/* 弹框 */
+.task-popup-text-center {
+  text-align: center;
+  color: #333;
+}
+
+.task-popup-title {
+  border-bottom: 1px solid #eee;
+  padding: 10px 15px;
+}
+
+.task-popup-submit {
+  margin: 0 auto 15px;
+  width: 120px;
+}
+
+/* TPM */
+
+
+.panel-form-label {
+  display: inline-block;
+  width: 10%;
+  min-width: 90px;
+  text-align: right;
+  line-height: 40px;
+  color: #666;
+}
+
+.panel-box-sizing {
+  -moz-box-sizing: border-box;
+  /*Firefox3.5+*/
+  -webkit-box-sizing: border-box;
+  /*Safari3.2+*/
+  -o-box-sizing: border-box;
+  /*Opera9.6*/
+  -ms-box-sizing: border-box;
+  /*IE8*/
+  box-sizing: border-box;
+}
+
+.mb20 {
+  margin-bottom: 20px;
+}
+
+/* TPi全屏展示css */
+
+/* 左右版TPI 20170410byLB */
+#game_task_pass img {
+  cursor: pointer
+}
+
+.-fit {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
+
+.-layout-v {
+  display: flex;
+  flex-direction: column;
+  -webkit-flex-direction: column;
+}
+
+.page--leftnav {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 9001;
+  width: 80px;
+  height: 100%;
+  background: #282c37;
+}
+
+.page--body {
+  position: relative;
+  margin-top: 54px;
+}
+
+.-flex {
+  box-flex: 1;
+  flex: 1;
+  -webkit-flex: 1;
+}
+
+/*.-flex-auto{flex-basis:100%;}*/
+.split-panel.-fit {
+  position: absolute;
+}
+
+.split-panel {
+  position: relative;
+  overflow: hidden;
+  min-height: 200px;
+  height: 100%;
+}
+
+.-stretch {
+  align-items: stretch;
+}
+
+.-layout {
+  display: flex;
+}
+
+.split-panel--first {
+  overflow: hidden;
+}
+
+.-relative {
+  position: relative;
+}
+
+.-bg-white {
+  background-color: #eee;
+}
+
+.-vertical {
+  flex-direction: column;
+  box-flex-direction: column;
+  -webkit-flex-direction: column;
+}
+
+.-layout-h {
+  display: flex;
+  flex-direction: row;
+  box-flex-direction: row;
+  -webkit-flex-direction: row;
+}
+
+.-horizontal {
+  flex-direction: row-reverse;
+  box-flex-direction: row-reverse;
+  -webkit-flex-direction: row-reverse;
+}
+
+.-scroll {
+  overflow: auto;
+}
+
+/*王昌------------拖拽增加样式---------------修改*/
+.-flex-basic40 {
+  width: 40%;
+  box-flex: auto;
+  flex: auto;
+  -webkit-flex: auto;
+}
+
+.-flex-basic50 {
+  width: 60%;
+  box-flex: auto;
+  flex: auto;
+  -webkit-flex: auto;
+}
+
+.b-label {
+  width: 4px;
+  cursor: ew-resize;
+  background: #2b2b2b;
+}
+
+.h-center {
+  height: 4px;
+  cursor: ns-resize;
+  background: #333;
+}
+
+.-changebg {
+  height: 3px;
+}
+
+.-bg-weightblack {
+  background: #000;
+}
+
+.-flex-basic70 {
+  box-flex: 4 9 auto;
+  flex: 4 9 auto;
+  -webkit-flex: 4 9 auto;
+  height: 70%;
+}
+
+/*---------------------------------------------*/
+.-flex-basic60 {
+  box-flex: 2 1 auto;
+  flex: 2 1 auto;
+  -webkit-flex: 2 1 auto;
+  height: 30%;
+}
+
+.-header-title {
+  max-width: 500px;
+  font-weight: normal;
+}
+
+.-header-right {
+  background: #333;
+  border-radius: 25px;
+  padding: 5px 15px;
+  height: 30px;
+  position: absolute;
+  right: 10px;
+  line-height: 30px;
+}
+
+.-bg-black {
+  background: #2b2b2b;
+  color: #f4f1ed;
+}
+
+.-bg-darkblack {
+  background: #1D1D1D;
+  color: #fff;
+}
+
+#blacktab_nav {
+  height: 40px;
+  background: #292929;
+}
+
+#blacktab_nav li {
+  float: left;
+  padding: 0px 50px;
+  text-align: center;
+  height: 40px;
+  line-height: 40px;
+}
+
+#blacktab_nav .add-webssh {
+  position: relative;
+}
+
+#blacktab_nav .add-webssh span {
+  position: absolute;
+  top: 0;
+  right: 5px;
+  color: #fff;
+  cursor: pointer;
+}
+
+#blacktab_nav li a {
+  font-size: 14px;
+}
+
+#blacktab_nav li.code-file-tab {
+  padding: 0px;
+  width: 120px;
+  box-sizing: border-box;
+  padding: 0px 15px;
+}
+
+.code-flie-list {
+  display: none;
+  position: absolute;
+  z-index: 5;
+  top: 40px;
+  background: #515151;
+  width: 300px;
+  left: 0px;
+  color: #fff;
+}
+
+.blue-line {
+  border-left: 3px solid #199ED8 !important;
+  padding-left: 5px;
+}
+
+.codefile-all {
+  max-height: 122px;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+.codefile-all p {
+  text-align: left;
+  cursor: pointer;
+  height: 22px;
+  line-height: 22px;
+  margin-bottom: 3px;
+  padding-left: 5px;
+  border-left: 3px solid #515151;
+  width: 273px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.codefile-all p:hover {
+  background: #CCCCCC;
+  color: #333;
+}
+
+.blacktab_hover a {
+  color: #fff;
+}
+
+.-task-ces-top {
+  padding: 5px 15px;
+  background: #515151;
+  color: #bfbfbf;
+}
+
+.-task-ces-info-left {
+  display: inline-block;
+  width: 100px;
+  text-align: right;
+}
+
+.page--over {
+  position: fixed;
+  top: 0;
+  left: 80px;
+  right: 0;
+  z-index: 8000;
+  height: 100%;
+  color: #fff;
+}
+
+.-task-list-inner {
+  background: #EFF2F7;
+  margin: 10px;
+  padding: 5px;
+}
+
+.-task-list-title {
+  font-size: 14px;
+  color: #666;
+  word-wrap: break-word;
+  font-weight: normal;
+  max-width: 80%;
+}
+
+.greytab-inner {
+  background: #fff;
+}
+
+.blacktab-inner {
+  background: #333;
+}
+
+.task-padding16 {
+  padding: 16px;
+}
+
+/* TPM统计 20170321byLB */
+
+/* 实训首页 20170330byLB */
+
+/*.task-index-head-top{ padding:30px;background:#FFA65E;}*/
+
+@keyframes bounce-down {
+  25% {
+    transform: translateY(-10px);
+  }
+
+  50%,
+  100% {
+    transform: translateY(0);
+  }
+}
+
+/* 伸展型搜索 20170330byLB */
+
+a.shixun-task-btn {
+  display: inline-block;
+  font-weight: bold;
+  border: none;
+  padding: 0 12px;
+  color: #666;
+  letter-spacing: 1px;
+  text-align: center;
+  font-size: 14px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 3px;
+}
+
+.loading-center {
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+}
+
+.center {
+  vertical-align: middle;
+  text-align: center;
+}
+
+/*实训--技能勋章*/
+
+/* 合作者 20170516byLB */
+
+
+/* 实训首页的搜索 */
+
+/*更多和收起*/
+
+.searchFor {
+  width: auto;
+}
+
+.searchFor .searchCon {
+  width: 250px;
+  border-bottom: 1px solid #cccccc;
+  float: left;
+  height: 30px;
+}
+
+.searchFor .searchCon input {
+  border: none;
+  outline: none;
+  height: 29px;
+  width: 91%;
+}
+
+.searchFor .search_close {
+  font-size: 18px;
+  float: right;
+  color: #666;
+  height: 29px;
+  line-height: 29px;
+  cursor: pointer;
+}
+
+.tab_color {
+  color: #bfbfbf !important;
+}
+
+/*_game_show.html.erb页面新增的一个tab*/
+
+.comment-input {
+  width: 100%;
+  margin: 10px;
+  margin-right: 17px;
+}
+
+.comment-input textarea {
+  border: none !important;
+  width: 100%;
+  outline: none;
+  height: 30px;
+  border-radius: 4px;
+  padding-left: 5px;
+  float: left
+}
+
+/*-------新建阶段添加选项部分----------*/
+.option-item {
+  border: 1px solid #e2e2e2;
+}
+
+.option-item {
+  display: block;
+  width: 38px;
+  height: 38px;
+  text-align: center;
+  line-height: 38px;
+  border-radius: 4px
+}
+
+.check-option-bg {
+  background: #FF7500;
+  color: #ffffff !important;
+  border: 1px solid #FF7500
+}
+
+.position-delete {
+  position: absolute;
+  right: -22px;
+  top: 12px;
+  cursor: pointer
+}
+
+/*--------TPI的答案选项卡------*/
+
+/*.card:hover{background: #3f3f3f;}*/
+
+.-center {
+  align-items: center;
+  min-height: 66px;
+}
+
+.markdown {
+  letter-spacing: 0;
+  line-height: 1.6;
+  word-wrap: break-word;
+  word-break: break-word;
+}
+
+.markdown code {
+  padding: 0;
+  line-height: 23px;
+  margin: 0;
+  font-family: "微软雅黑", "宋体";
+}
+
+
+/*模拟实战---加载等待*/
+
+.load {
+  width: auto;
+  top: 50%;
+  margin-top: -100px;
+  position: relative;
+}
+
+/*#ajax-indicator-base span{
+    color:#fff;
+    background-position: 0% 40%;
+    background-repeat: no-repeat;
+    */
+/*background-image: url(/images/loading.gif);*/
+/*
+    padding-left: 26px;
+    vertical-align: bottom;
+    z-index:999;
+}*/
+
+.empty {
+  background: #494A4C;
+  display: inline;
+  margin: 0 2px;
+  padding: 0 3px;
+}
+
+/*二次回复的提示语的样式*/
+
+/*选择题tab切换*/
+
+/*---------------------试卷----------------------*/
+
+/*作业问答*/
+
+/*更新提示*/
+.update_back_main {
+  display: none;
+  position: fixed;
+  left: 0px;
+  top: 0px;
+  background: rgba(0, 0, 0, 0.3);
+  width: 100%;
+  z-index: 7001;
+  height: 100%;
+}
+
+.tip-panel-animate-left {
+  position: absolute;
+  z-index: 9000;
+  left: 80px;
+  top: 290px;
+  background: #FFFFff;
+  width: 430px;
+  height: 140px;
+  border-radius: 3px;
+}
+
+.tip-panel-animate {
+  position: absolute;
+  z-index: 10001;
+  right: 4px;
+  top: 40px;
+  background: #FFFFff;
+  width: 430px;
+  height: 140px;
+  border-radius: 3px;
+  display: none
+}
+
+.tip-operator-btn {
+  width: 100%;
+  border-top: 1px solid #eee;
+  height: 40px;
+  position: absolute;
+  right: 0px;
+  bottom: 0px;
+  text-align: center;
+}
+
+.tip-operator-btn a,
+.tip-operator-btn span {
+  height: 100%;
+  text-align: center;
+  line-height: 40px;
+  width: 50%
+}
+
+.tip-operator-btn a:hover,
+.tip-operator-btn span:hover {
+  background-color: #f9f9f9
+}
+
+.tip-operator-btn a:first-child,
+.tip-operator-btn span:first-child {
+  border-right: 1px solid #eee;
+  width: 49.5%
+}
+
+.animate-tip {
+  animation: rightToleft 1s;
+}
+
+.animate-tip-hide {
+  animation: leftToright 1s;
+}
+
+@keyframes rightToleft {
+  from {
+    right: -400px;
+  }
+
+  to {
+    right: 4px;
+  }
+}
+
+@keyframes leftToright {
+  from {
+    right: 4px;
+  }
+
+  to {
+    right: -420px;
+  }
+}
+
+@keyframes rightToleft-l {
+  from {
+    left: -400px;
+  }
+
+  to {
+    left: 80px;
+  }
+}
+
+@keyframes leftToright-l {
+  from {
+    left: 80px;
+  }
+
+  to {
+    left: -420px;
+  }
+}
+
+/*----------实训TPI图片查看效果--------------*/
+.photo_display {
+  box-sizing: border-box;
+  width: 100%;
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  padding-top: 64px;
+  padding-left: 80px;
+  background: rgba(0, 0, 0, 0);
+  height: 100%;
+  z-index: 100
+}
+
+.photo_display .task-popup {
+  width: 100% !important;
+  height: 100% !important;
+}
+
+#picture-content img {
+  max-width: 100%;
+  height: 400px;
+  display: block;
+  margin: 0px auto;
+  margin-bottom: 20px;
+}
+
+/*-------------学员统计  通关排行榜------------*/
+
+
+/*-----------实训配置、评测脚本-------------*/body {
+  font-size: 14px;
+  line-height: 2.0;
+  background: #fafafa !important;
+  font-family: "微软雅黑", "宋体";
+  color: #05101a;
+  height: 100%;
+  position: relative;
+}
+
+html,
+body {
+  height: 100%;
+}
+
+body,
+h2,
+h3,
+h4,
+h6,
+hr,
+p,
+blockquote,
+dd,
+ul,
+ol,
+li,
+pre,
+form,
+fieldset,
+legend,
+button,
+input,
+textarea,
+th,
+td,
+span {
+  margin: 0;
+  padding: 0;
+}
+
+table,
+input,
+textarea,
+select,
+button {
+  outline: none;
+  border-radius: 3px;
+  font-family: "微软雅黑", "宋体";
+  font-size: 14px;
+  line-height: 1.9;
+  border: 1px solid #eaeaea;
+  background: #FFFFff;
+  color: #05101A;
+}
+
+textarea {
+  resize: none;
+}
+
+/*设置input框的placehoder的字体颜色*/
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+  color: #cccccc
+}
+
+input::-moz-placeholder,
+textarea::-moz-placeholder {
+  color: #cccccc;
+}
+
+input::-moz-placeholder,
+textarea::-moz-placeholder {
+  color: #cccccc;
+}
+
+input::-ms-input-placeholder,
+textarea::-ms-input-placeholder {
+  color: #cccccc;
+}
+
+div,
+img,
+tr,
+td,
+table {
+  border: 0;
+}
+
+a:link,
+a:visited {
+  text-decoration: none;
+  color: #05101a;
+}
+
+a:hover {
+  color: #459be5;
+}
+
+ol,
+ul,
+li {
+  list-style-type: none;
+}
+
+select:disabled,
+input:disabled {
+  background-color: #EEEEEE;
+}
+
+/*万能清除浮动*/
+.clearfix:after {
+  clear: both;
+  content: ".";
+  display: block;
+  font-size: 0;
+  height: 0;
+  line-height: 0;
+  visibility: hidden;
+}
+
+.clearfix {
+  clear: both;
+  zoom: 1
+}
+
+.cl {
+  clear: both;
+  overflow: hidden;
+}
+
+/*通用浮动*/
+.fl {
+  float: left !important;
+}
+
+.fr {
+  float: right !important;
+}
+
+/*pre标签换行*/
+.break-word {
+  word-break: break-all;
+  word-wrap: break-word;
+}
+
+.break-word-firefox {
+  white-space: pre-wrap !important;
+  word-break: break-all;
+}
+
+/*文字左右两端对齐*/
+.justify {
+  text-align: justify
+}
+
+.indent {
+  text-indent: 2em;
+}
+
+.edu-max-h200 {
+  height: 200px;
+  overflow: auto;
+}
+
+.edu-h270 {
+  height: 270px;
+}
+
+.edu-position {
+  position: relative;
+}
+
+a.edu-txt-w100,
+.edu-txt-w100 {
+  width: 100px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w80,
+.edu-txt-w80 {
+  width: 80px;
+  display: inline-block;
+  text-align: center
+}
+
+/*超过隐藏*/
+
+.task-hide {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.task-hide-2 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+}
+
+/*隐藏*/
+.none {
+  display: none
+}
+
+.block {
+  display: block;
+}
+
+.boxsizing {
+  box-sizing: border-box
+}
+
+
+/*字体icon均为18px*/
+.iconfont {
+  font-size: 18px !important;
+}
+
+/*通用文字大小样式*/
+.font-n {
+  font-weight: normal !important;
+}
+
+.font-bd {
+  font-weight: bold;
+}
+
+.font-n {
+  font-weight: normal;
+}
+
+.font-12 {
+  font-size: 12px !important;
+}
+
+.font-13 {
+  font-size: 13px !important;
+}
+
+.font-14 {
+  font-size: 14px !important;
+}
+
+.font-15 {
+  font-size: 15px !important;
+}
+
+.font-16 {
+  font-size: 16px !important;
+}
+
+.font-17 {
+  font-size: 17px !important;
+}
+
+.font-18 {
+  font-size: 18px !important;
+}
+
+.font-20 {
+  font-size: 20px !important;
+}
+
+.font-22 {
+  font-size: 22px !important;
+}
+
+.font-25 {
+  font-size: 25px !important;
+}
+
+.font-24 {
+  font-size: 24px !important;
+}
+
+.font-28 {
+  font-size: 28px !important;
+}
+
+.font-30 {
+  font-size: 30px !important;
+}
+
+.font-32 {
+  font-size: 32px !important;
+}
+
+.font-36 {
+  font-size: 36px !important;
+}
+
+.font-50 {
+  font-size: 50px !important;
+}
+
+/*a标签的下划线*/
+a.decoration {
+  text-decoration: underline
+}
+
+/*表单*/
+.panel-form-label {
+  display: inline-block;
+  width: 10%;
+  min-width: 90px;
+  text-align: right;
+  line-height: 40px;
+  font-weight: normal;
+}
+
+/*通用内外边距*/
+
+.mt1 {
+  margin-top: 1px;
+}
+
+.mt2 {
+  margin-top: 2px;
+}
+
+.mt3 {
+  margin-top: 3px;
+}
+
+.mt4 {
+  margin-top: 4px;
+}
+
+.mt5 {
+  margin-top: 5px !important;
+}
+
+.mt6 {
+  margin-top: 6px;
+}
+
+.mt7 {
+  margin-top: 7px !important;
+}
+
+.mt8 {
+  margin-top: 8px;
+}
+
+.mt9 {
+  margin-top: 9px;
+}
+
+.mt10 {
+  margin-top: 10px !important;
+}
+
+.mt12 {
+  margin-top: 12px;
+}
+
+.mt13 {
+  margin-top: 13px;
+}
+
+.mt14 {
+  margin-top: 14px;
+}
+
+.mt15 {
+  margin-top: 15px !important;
+}
+
+.mt16 {
+  margin-top: 16px;
+}
+
+.mt17 {
+  margin-top: 17px;
+}
+
+.mt18 {
+  margin-top: 18px;
+}
+
+.mt20 {
+  margin-top: 20px !important;
+}
+
+.mt22 {
+  margin-top: 22px !important;
+}
+
+.mt23 {
+  margin-top: 23px !important;
+}
+
+.mt24 {
+  margin-top: 24px !important;
+}
+
+.mt25 {
+  margin-top: 25px;
+}
+
+.mt28 {
+  margin-top: 28px;
+}
+
+.mt30 {
+  margin-top: 30px !important;
+}
+
+.mt34 {
+  margin-top: 34px !important;
+}
+
+.mt35 {
+  margin-top: 35px !important;
+}
+
+.mt36 {
+  margin-top: 36px !important;
+}
+
+.mt40 {
+  margin-top: 40px;
+}
+
+.mt45 {
+  margin-top: 45px;
+}
+
+.mt50 {
+  margin-top: 50px;
+}
+
+.mt56 {
+  margin-top: 56px;
+}
+
+.mt60 {
+  margin-top: 60px;
+}
+
+.mt70 {
+  margin-top: 70px;
+}
+
+.mt80 {
+  margin-top: 80px;
+}
+
+.mt100 {
+  margin-top: 100px;
+}
+
+.mb0 {
+  margin-bottom: 0px !important;
+}
+
+.mb3 {
+  margin-bottom: 3px;
+}
+
+.mb5 {
+  margin-bottom: 5px;
+}
+
+.mb7 {
+  margin-bottom: 7px;
+}
+
+.mb10 {
+  margin-bottom: 10px;
+}
+
+.mb14 {
+  margin-bottom: 14px;
+}
+
+.mb15 {
+  margin-bottom: 15px;
+}
+
+.mb16 {
+  margin-bottom: 16px;
+}
+
+.mb20 {
+  margin-bottom: 20px !important;
+}
+
+.mb25 {
+  margin-bottom: 25px;
+}
+
+.mb26 {
+  margin-bottom: 26px;
+}
+
+.mb30 {
+  margin-bottom: 30px !important;
+}
+
+.mb40 {
+  margin-bottom: 40px !important;
+}
+
+.mb50 {
+  margin-bottom: 50px !important;
+}
+
+.mb60 {
+  margin-bottom: 60px !important;
+}
+
+.mb70 {
+  margin-bottom: 70px !important;
+}
+
+.mb80 {
+  margin-bottom: 80px !important;
+}
+
+.mb100 {
+  margin-bottom: 100px !important;
+}
+
+.ml-3 {
+  margin-left: -3px;
+}
+
+.ml1 {
+  margin-left: 1px;
+}
+
+.ml2 {
+  margin-left: 2px;
+}
+
+.ml3 {
+  margin-left: 3px;
+}
+
+.ml4 {
+  margin-left: 4px;
+}
+
+.ml5 {
+  margin-left: 5px;
+}
+
+.ml6 {
+  margin-left: 6px;
+}
+
+.ml10 {
+  margin-left: 10px;
+}
+
+.ml12 {
+  margin-left: 12px !important;
+}
+
+.ml13 {
+  margin-left: 13px !important;
+}
+
+.ml15 {
+  margin-left: 15px;
+}
+
+.ml18 {
+  margin-left: 18px;
+}
+
+.ml20 {
+  margin-left: 20px;
+}
+
+.ml22 {
+  margin-left: 22px;
+}
+
+.ml25 {
+  margin-left: 25px;
+}
+
+.ml30 {
+  margin-left: 30px;
+}
+
+.ml33 {
+  margin-left: 33px;
+}
+
+.ml35 {
+  margin-left: 35px;
+}
+
+.ml40 {
+  margin-left: 40px;
+}
+
+.ml50 {
+  margin-left: 50px;
+}
+
+.ml60 {
+  margin-left: 60px;
+}
+
+.ml80 {
+  margin-left: 80px;
+}
+
+.ml85 {
+  margin-left: 85px;
+}
+
+.ml180 {
+  margin-left: 180px;
+}
+
+.mr3 {
+  margin-right: 3px
+}
+
+.mr4 {
+  margin-right: 4px
+}
+
+.mr5 {
+  margin-right: 5px;
+}
+
+.mr8 {
+  margin-right: 8px;
+}
+
+.mr10 {
+  margin-right: 10px;
+}
+
+.mr12 {
+  margin-right: 12px !important;
+}
+
+.mr15 {
+  margin-right: 15px;
+}
+
+.mr18 {
+  margin-right: 18px;
+}
+
+.mr20 {
+  margin-right: 20px;
+}
+
+.mr25 {
+  margin-right: 25px;
+}
+
+.mr30 {
+  margin-right: 30px;
+}
+
+.mr35 {
+  margin-right: 35px;
+}
+
+.mr40 {
+  margin-right: 40px;
+}
+
+.mr50 {
+  margin-right: 50px;
+}
+
+.mr60 {
+  margin-right: 60px;
+}
+
+.mr70 {
+  margin-right: 70px;
+}
+
+.mr80 {
+  margin-right: 80px;
+}
+
+.mr90 {
+  margin-right: 90px;
+}
+
+.ml61 {
+  margin-left: 61px;
+}
+
+.pt5 {
+  padding-top: 5px !important;
+}
+
+.pt10 {
+  padding-top: 10px;
+}
+
+.pt15 {
+  padding-top: 15px;
+}
+
+.pt20 {
+  padding-top: 20px !important;
+}
+
+.pt25 {
+  padding-top: 25px;
+}
+
+.pt30 {
+  padding-top: 30px;
+}
+
+.pt35 {
+  padding-top: 35px;
+}
+
+.pt37 {
+  padding-top: 37px;
+}
+
+.pt40 {
+  padding-top: 40px;
+}
+
+.pt50 {
+  padding-top: 50px;
+}
+
+.pt60 {
+  padding-top: 60px;
+}
+
+.pt80 {
+  padding-top: 80px;
+}
+
+.pb5 {
+  padding-bottom: 5px !important;
+}
+
+.pb10 {
+  padding-bottom: 10px;
+}
+
+.pb15 {
+  padding-bottom: 15px;
+}
+
+.pb20 {
+  padding-bottom: 20px;
+}
+
+.pb25 {
+  padding-bottom: 20px;
+}
+
+.pb25 {
+  padding-bottom: 20px;
+}
+
+.pb28 {
+  padding-bottom: 28px;
+}
+
+.pb30 {
+  padding-bottom: 30px;
+}
+
+.pb40 {
+  padding-bottom: 40px;
+}
+
+.pb47 {
+  padding-bottom: 47px;
+}
+
+.pb50 {
+  padding-bottom: 50px;
+}
+
+.pb60 {
+  padding-bottom: 60px;
+}
+
+.pb100 {
+  padding-bottom: 100px;
+}
+
+.pr5 {
+  padding-right: 5px;
+}
+
+.pr10 {
+  padding-right: 10px;
+}
+
+.pr15 {
+  padding-right: 15px;
+}
+
+.pr20 {
+  padding-right: 20px !important;
+}
+
+.pr30 {
+  padding-right: 30px !important;
+}
+
+.pr35 {
+  padding-right: 35px !important;
+}
+
+.pl0 {
+  padding-left: 0px !important;
+}
+
+.pl5 {
+  padding-left: 5px;
+}
+
+.pl8 {
+  padding-left: 8px;
+}
+
+.pl10 {
+  padding-left: 10px;
+}
+
+.pl15 {
+  padding-left: 15px;
+}
+
+.pl20 {
+  padding-left: 20px;
+}
+
+.pl25 {
+  padding-left: 25px;
+}
+
+.pl28 {
+  padding-left: 28px;
+}
+
+.pl30 {
+  padding-left: 30px !important;
+}
+
+.pl33 {
+  padding-left: 33px
+}
+
+.pl35 {
+  padding-left: 35px;
+}
+
+.pl40 {
+  padding-left: 40px;
+}
+
+.pl50 {
+  padding-left: 50px;
+}
+
+.pl60 {
+  padding-left: 60px;
+}
+
+.pr5 {
+  padding-right: 5px;
+}
+
+.pr10 {
+  padding-right: 10px;
+}
+
+.pr15 {
+  padding-right: 15px;
+}
+
+.pr20 {
+  padding-right: 20px !important;
+}
+
+.pr25 {
+  padding-right: 25px !important;
+}
+
+.pr30 {
+  padding-right: 30px !important;
+}
+
+.pr40 {
+  padding-right: 40px;
+}
+
+.padding5-10 {
+  padding: 5px 10px;
+  box-sizing: border-box
+}
+
+.padding5-20 {
+  padding: 5px 20px;
+  box-sizing: border-box
+}
+
+.padding10 {
+  padding: 10px;
+  box-sizing: border-box
+}
+
+.padding15 {
+  padding: 15px;
+  box-sizing: border-box
+}
+
+.padding20 {
+  padding: 20px;
+  box-sizing: border-box
+}
+
+.padding10-20 {
+  padding: 10px 20px;
+  box-sizing: border-box
+}
+
+.padding10-15 {
+  padding: 10px 15px;
+  box-sizing: border-box
+}
+
+.padding10-30 {
+  padding: 10px 30px;
+  box-sizing: border-box
+}
+
+.padding20-30 {
+  padding: 20px 30px;
+  box-sizing: border-box
+}
+
+.padding30 {
+  padding: 30px;
+  box-sizing: border-box
+}
+
+.padding30-20 {
+  padding: 30px 20px;
+  box-sizing: border-box
+}
+
+.padding40 {
+  padding: 40px;
+  box-sizing: border-box
+}
+
+.padding40-30 {
+  padding: 40px 30px;
+  box-sizing: border-box
+}
+
+.padding40-20 {
+  padding: 40px 20px;
+  box-sizing: border-box
+}
+
+/*行高*/
+.lineh-12 {
+  line-height: 12px !important;
+}
+
+.lineh-15 {
+  line-height: 15px !important;
+}
+
+.lineh-17 {
+  line-height: 17px !important;
+}
+
+.lineh-20 {
+  line-height: 20px !important;
+}
+
+.lineh-24 {
+  line-height: 24px !important;
+}
+
+.lineh-25 {
+  line-height: 25px !important;
+}
+
+.lineh-30 {
+  line-height: 30px !important;
+}
+
+.lineh-35 {
+  line-height: 35px !important;
+}
+
+.lineh-40 {
+  line-height: 40px !important;
+}
+
+/*pre标签换行*/
+.break_word {
+  word-break: break-all;
+  word-wrap: break-word;
+}
+
+.break_word_firefox {
+  white-space: pre-wrap !important;
+  word-break: break-all;
+}
+
+/*定位*/
+.pr {
+  position: relative
+}
+
+.df {
+  display: flex;
+  display: -webkit-flex;
+  display: -ms-flex;
+}
+
+.flex1 {
+  flex: 1;
+}
+
+/*去掉IE input框输入时自带的清除按钮*/
+input::-ms-clear {
+  display: none;
+}
+
+/*自定义滚动条宽度*/
+::-webkit-scrollbar {
+  width: 7px;
+  height: 10px;
+  background-color: #F5F5F5;
+}
+
+
+.newContainer {
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
+  /*IE6不识别min-height*/
+  position: relative;
+}
+
+.educontent {
+  width: 1200px;
+  margin: 0px auto;
+  box-sizing: border-box
+}
+
+/*中间部分宽度固定为1200*/
+.newMain {
+  margin: 0 auto;
+  padding-bottom: 235px;
+  min-width: 1200px;
+}
+
+/*padding-bottom根据底部的高度而定*/
+.newMain {
+  padding-bottom: 124px !important;
+}
+
+/*高度*/
+
+/*文本位置*/
+.edu-txt-center {
+  text-align: center !important;
+}
+
+.edu-txt-left {
+  text-align: left !important;
+}
+
+.edu-txt-right {
+  text-align: right !important;
+}
+
+/*背景颜色*/
+.edu-back-white {
+  background-color: #FFFFff;
+}
+
+.edu-back-greyf5 {
+  background-color: #f5f5f5 !important;
+}
+
+.edu-back-skyblue {
+  background: #F4FAFF;
+}
+
+.edu-back-blue {
+  background-color: #459be6 !important;
+}
+
+.edu-bg-light-blue {
+  background: #f7f9fd;
+  padding: 5px;
+}
+
+/*发送实训弹框*/
+/*常用字体*/
+/*红色*/
+.color-red {
+  color: #FF0000 !important;
+}
+
+/*白色*/
+.color-white {
+  color: #ffffff !important;
+}
+
+/*黑色*/
+.color-dark {
+  color: #05101a !important;
+}
+
+.color-ooo {
+  color: #000 !important;
+}
+
+/*灰色*/
+.color-grey-name {
+  color: #1A0B00 !important;
+}
+
+.color-grey-3 {
+  color: #333 !important;
+}
+
+.color-grey-eb {
+  color: #EBEBEB !important;
+}
+
+.color-grey-c {
+  color: #ccc !important;
+}
+
+.color-grey-cd {
+  color: #cdcdcd !important;
+}
+
+.color-grey-9 {
+  color: #999999 !important;
+}
+
+.color-grey-98 {
+  color: #989898 !important;
+}
+
+.color-grey-8 {
+  color: #888 !important;
+}
+
+.color-grey-6 {
+  color: #666 !important;
+}
+
+.color-grey-B2 {
+  color: #B2B2B2 !important;
+}
+
+.color-grey-B3 {
+  color: #B3B3B3 !important;
+}
+
+.color-grey-B4 {
+  color: #B4B4B4 !important;
+}
+
+.color-grey-74 {
+  color: #747A7F !important;
+}
+
+
+a.color-grey-name:hover,
+a.color-dark:hover,
+a.color-grey-6:hover,
+a.color-grey-3:hover {
+  color: #4cacff !important;
+}
+
+a.color-grey-9:hover,
+a.color-grey-8:hover,
+a.color-grey-c:hover {
+  color: #111C24 !important;
+}
+
+/*蓝色*/
+.color-blue {
+  color: #4CACFF !important;
+}
+
+/*主*/
+.color-blue_4C {
+  color: #4CACFF !important;
+}
+
+a.color-blue:hover,
+a.color-blue_4C:hover {
+  color: #459BE6 !important;
+}
+
+/*橙色*/
+.color-orange {
+  color: #ff6800 !important;
+}
+
+/*辅助文字*/
+.color-orange-tip {
+  color: #FF954C !important;
+}
+
+/*提示文字*/
+.color-orange-tips {
+  color: #FF8204 !important;
+}
+
+/*提示文字*/
+a.color-orange:hover,
+a.color-orange-tip:hover {
+  color: #F06200 !important;
+}
+
+/*黄色*/
+.color-yellow {
+  color: #EFC003 !important;
+}
+
+.color-yellow-ff {
+  color: #FFA800 !important
+}
+
+/*绿色*/
+.color-green {
+  color: #29BD8B !important;
+}
+
+a.color-green:hover {
+  color: #28AC7F !important;
+}
+
+/*红色*/
+
+/*圆角*/
+.radius {
+  border-radius: 50%;
+}
+
+.radius4 {
+  border-radius: 4px;
+}
+
+
+/*绿色圆形--例如：实训路径详情的编辑icon的背景*/
+.ring-green {
+  width: 18px;
+  height: 18px;
+  display: block;
+  border-radius: 50%;
+  background-color: #29BD8B;
+  text-align: center;
+}
+
+.ring-op-green {
+  width: 18px;
+  height: 18px;
+  display: block;
+  border-radius: 50%;
+  background-color: rgba(41, 189, 139, 0.6);
+  text-align: center;
+}
+
+.ring-grey {
+  width: 18px;
+  height: 18px;
+  line-height: 18px;
+  display: block;
+  border-radius: 50%;
+  background-color: rgba(204, 204, 204, 0.5);
+  text-align: center;
+}
+
+.ring-blue {
+  width: 18px;
+  height: 18px;
+  display: block;
+  border-radius: 50%;
+  background-color: #4CACFF;
+  text-align: center;
+}
+
+/*左侧label内容右对齐*/
+
+
+/*输入框样式---------宽度为百分比*/
+
+.input-flex-35 {
+  flex: 1;
+  height: 35px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-flex-40 {
+  flex: 1;
+  height: 40px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-100-45 {
+  width: 100%;
+  height: 45px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.input-60-40 {
+  width: 60%;
+  height: 40px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+/*输入框为灰色背景，获取焦点时背景变白色*/
+.greyInput {
+  background-color: #F5F5F5;
+  outline: none
+}
+
+.greyInput:focus {
+  background-color: #fff;
+  border: 1px solid #ddd;
+}
+
+/*输入框样式---------宽度为固定长度*/
+
+.winput-240-40 {
+  width: 240px;
+  height: 40px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-120-35 {
+  width: 120px;
+  height: 35px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+/*输入框样式---------高度固定*/
+
+.winput-100-130 {
+  width: 100%;
+  height: 130px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.winput-100-150 {
+  width: 100%;
+  height: 150px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+/*百分比宽度*/
+.width100 {
+  width: 100%;
+}
+
+.width89 {
+  width: 89%;
+}
+
+.width20 {
+  width: 20%;
+}
+
+.width15 {
+  width: 15%;
+}
+
+/*固定大小的宽度*/
+
+a.edu-txt-w100,
+.edu-txt-w100 {
+  width: 100px;
+  display: inline-block;
+  text-align: center
+}
+
+a.edu-txt-w80,
+.edu-txt-w80 {
+  width: 80px;
+  display: inline-block;
+  text-align: center
+}
+
+/*最小高度*/
+
+.minH-440 {
+  min-height: 440px;
+}
+
+.minH-500 {
+  min-height: 500px;
+}
+
+.minH-560 {
+  min-height: 560px;
+}
+
+/*超出高度出现滚动条--纵向*/
+
+.over210 {
+  height: 210px;
+  overflow-y: auto
+}
+
+.over280 {
+  height: 280px;
+  overflow-y: auto
+}
+
+/*---------------tab公用边框-----------------*/
+
+.bor-bottom-greyE {
+  border-bottom: 1px solid #EEEEEE !important;
+}
+
+.bor-left-greyE {
+  border-left: 1px solid #EEEEEE !important;
+}
+
+.bor-top-greyE {
+  border-top: 1px solid #EEEEEE !important;
+}
+
+/*---------------边框-----------------*/
+
+.bor-grey-e {
+  border: 1px solid #eee;
+}
+
+.bor-red {
+  border: 1px solid #db0505 !important;
+}
+
+a.decoration {
+  text-decoration: underline !important;
+}
+
+/*下拉菜单*/
+.edu-menu-panel {
+  position: relative;
+  cursor: pointer
+}
+
+.edu-menu-list {
+  position: absolute;
+  padding: 5px 0px;
+  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, .2);
+  display: none;
+  width: 120px;
+  background: #FFFFff;
+  right: -5px;
+  border-radius: 0px 0px 4px 4px;
+  color: #05101a;
+  font-size: 14px;
+  z-index: 9
+}
+
+.edu-menu-list li {
+  width: 100%;
+  padding: 0px 15px;
+  box-sizing: border-box;
+  height: 35px;
+  line-height: 35px;
+  cursor: pointer;
+}
+
+.edu-menu-list li a {
+  width: 100%;
+  height: 100%;
+  display: block;
+  color: #323232;
+}
+
+.edu-menu-panel:hover i,
+.edu-menu-panel:hover {
+  color: #4cacff;
+}
+
+.edu-menu-panel:hover .edu-menu-list {
+  display: block
+}
+
+.edu-menu-list li:hover {
+  background: #4CACFF;
+}
+
+.edu-menu-list li:hover a {
+  color: #fff !important;
+}
+
+.ul-leftline:after {
+  position: absolute;
+  top: 0px;
+  content: "";
+  width: 1px;
+  background-color: #eee;
+  height: 100%;
+  right: 0px;
+}
+
+.overPart {
+  width: 240px;
+  height: 30px;
+  position: absolute;
+  right: 0;
+  top: -27px;
+  background: transparent;
+}
+
+/*滑块验证*/
+
+.handler_bg {
+  background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;
+}
+
+.handler_ok_bg {
+  background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;
+}
+
+/*tip公共样式的设置：*/
+.-task-title {
+  opacity: 0;
+  position: absolute;
+  left: 0;
+  top: 0;
+  display: none;
+  z-index: 100000;
+}
+
+/*1*/
+.data-tip-down,
+.data-tip-left,
+.data-tip-right,
+.data-tip-top {
+  position: relative;
+  box-shadow: 0px 0px 8px #000;
+  background: #000;
+  color: #fff;
+  max-width: 300px;
+  /*2*/
+  word-wrap: break-word;
+  text-align: center;
+  border-radius: 4px;
+  padding: 0 10px;
+  border: 1px solid #000;
+  display: none;
+}
+
+/*3*/
+.data-tip-down:after,
+.data-tip-down:before,
+.data-tip-left:before,
+.data-tip-right:before,
+.data-tip-left:after,
+.data-tip-right:after,
+.data-tip-top:after,
+.data-tip-top:before {
+  /*4*/
+  position: absolute;
+  content: '';
+  width: 0;
+  height: 0;
+}
+
+/*5*/
+.data-tip-down:after,
+.data-tip-down:before {
+  left: 45%;
+  top: -10px;
+  /*6*/
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 10px solid #000;
+}
+
+/*7*/
+.data-tip-down:before {
+  top: -11px;
+  border-bottom: 10px solid #000;
+}
+
+/*8*/
+.data-tip-left:after,
+.data-tip-left:before {
+  left: -10px;
+  top: 50%;
+  margin-top: -5px;
+  /*9*/
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-right: 10px solid #000;
+}
+
+/*10*/
+.data-tip-left:before {
+  left: -12px;
+  border-right: 10px solid #000;
+}
+
+/*11*/
+.data-tip-right:after,
+.data-tip-right:before {
+  right: -10px;
+  top: 50%;
+  margin-top: -5px;
+  /*12*/
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 10px solid #000;
+}
+
+/*13*/
+.data-tip-right:before {
+  right: -10px;
+  border-left: 10px solid #000;
+}
+
+/*14*/
+.data-tip-top:after,
+.data-tip-top:before {
+  left: 45%;
+  bottom: -10px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top: 10px solid #000;
+}
+
+.data-tip-top:before {
+  bottom: -11px;
+}
+
+
+/*左右两栏排列、固定左右宽度----------ul*/
+
+
+
+/* table--------------------------------*/
+
+/* table-1底部边框 */
+.edu-pop-table {
+  width: 100%;
+  border: 1px solid #eee;
+  border-bottom: none;
+  background: #fff;
+  color: #888;
+  cursor: default
+}
+
+.edu-pop-table tr {
+  height: 40px;
+}
+
+.edu-txt-center {
+  text-align: center;
+}
+
+.edu-txt-left {
+  text-align: left;
+}
+
+.edu-txt-right {
+  text-align: right;
+}
+
+.edu-pop-table tr th {
+  color: #333;
+  border-bottom: 1px solid #eee;
+}
+
+.edu-pop-table tr td {
+  border-bottom: 1px solid #eee;
+}
+
+/*th行有背景颜色且table无边框*/
+.edu-pop-table.head-color thead tr {
+  background: #fafbfb
+}
+
+.edu-pop-table.head-color {
+  border: none
+}
+
+.edu-pop-table.head-color tr:last-child td {
+  border: none
+}
+
+/*--表格行间隔背景颜色-*/
+.edu-pop-table.interval-td {
+  border-bottom: 1px solid #eee;
+}
+
+.edu-pop-table.interval-td thead tr {
+  background: #fafbfb
+}
+
+.edu-pop-table.interval-td tbody tr:nth-child(even) {
+  background: #fafbfb
+}
+
+.edu-pop-table.interval-td tbody tr td {
+  border: none
+}
+
+/*--表格行间隔背景颜色(th也没有边框)-*/
+
+/*--表格行移入背景颜色-*/
+
+/*悬浮颜色为天蓝色*/
+
+/*悬浮颜色为浅橙色*/
+/* table-2全边框 */
+.edu-pop-table-all {
+  width: 100%;
+  border: 1px solid #eee;
+  background: #fff;
+  color: #888;
+  border-collapse: collapse
+}
+
+.edu-pop-table-all tr {
+  height: 30px;
+}
+
+.edu-pop-table-all tr th {
+  color: #333;
+  border: 1px solid #eee;
+}
+
+.edu-pop-table-all tr td {
+  border: 1px solid #eee;
+  padding: 5px
+}
+
+/*table无边框、无背景颜色*/
+
+/*数据为空公共页面*/
+img.edu-nodata-img {
+  width: 300px;
+  margin: 50px auto 20px;
+  display: block;
+  width: 128px;
+}
+
+/* 不能加 padding-left: 18px; 会影响其他地方的居中 */
+.edu-nodata-p {
+  font-size: 20px;
+  text-align: center;
+  color: #999;
+  border-bottom: none !important;
+  box-sizing: border-box;
+}
+
+/*输入为空或者错误的提示*/
+
+.notice {
+  height: 25px;
+  margin-left: 150px;
+}
+
+/*列表里菜单icon移入*/
+.edu-position-hide {
+  position: absolute;
+  top: 15px;
+  left: -20px;
+  box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
+  background: #fff;
+  z-index: 1001;
+  padding: 5px 0;
+  z-index: 999999;
+}
+
+.edu-position-hide li a {
+  display: inline-block;
+  height: 30px;
+  width: 100px;
+  line-height: 30px;
+  text-align: center;
+  font-size: 12px !important;
+}
+
+.edu-position-hide li a:hover {
+  background: #F1F1F1;
+  color: #05101A;
+}
+
+.edu-position-hidebox i {
+  color: #bcbcbc;
+}
+
+.edu-position-hidebox i:hover {
+  color: #4CACFF;
+}
+
+.edu-position-hidebox a {
+  color: #05101A;
+}
+
+.edu-position-hidebox:hover .edu-position-hide {
+  display: block;
+}
+
+/*搜索（灰色背景、点击变白色）*/
+
+/*-------------------------------------------公用按钮：以white-btn(或者edu-default-btn无padding)为基础，宽度和高度可以用padding填充，颜色用edu-color-btn，begin-----------------------------------------*/
+/*按钮*/
+/*默认按钮*/
+/*长条形按钮*/
+
+/*正常按钮*/
+.white-btn {
+  text-align: center;
+  cursor: pointer;
+  display: inline-block;
+  padding: 0px 8px;
+  border: 1px solid #ccc;
+  color: #666;
+  letter-spacing: 1px;
+  font-size: 14px;
+  height: 26px;
+  line-height: 26px;
+  border-radius: 3px;
+}
+
+a.white-btn.orange-btn {
+  border: 1px solid #FF7500;
+  color: #FF7500 !important;
+}
+
+a.white-btn.orange-btn:hover {
+  border: 1px solid #F06200;
+  color: #F06200 !important;
+}
+
+.defalutGreyBorder {
+  display: block;
+  padding: 0px 10px;
+  border: 1px solid #ccc;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 4px;
+}
+
+a.task-btn {
+  cursor: pointer;
+  display: inline-block;
+  border: none;
+  padding: 0 12px;
+  color: #fff;
+  background: #CDCDCD !important;
+  letter-spacing: 1px;
+  text-align: center;
+  font-size: 14px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 2px;
+  font-weight: 400;
+}
+
+/*最新按钮：以个人主页为例-------------因高度和宽度都已经固定，后续不再支持使用，*/
+.user_default_btn {
+  cursor: pointer;
+  font-size: 14px;
+  display: block;
+  width: 120px;
+  text-align: center;
+  height: 40px;
+  line-height: 40px !important;
+  border-radius: 4px;
+  box-sizing: border-box
+}
+
+.user_orange_btn {
+  color: #fff !important;
+  background-color: #FF6800;
+}
+
+/*橙色签到按钮*/
+.user_orange_btn:hover {
+  background-color: #F06200;
+}
+
+.user_grey_btn {
+  color: #fff !important;
+  background-color: #CCCCCC;
+  cursor: default
+}
+
+/*灰色已经签到按钮*/
+.user_private_btn {
+  color: #646464 !important;
+  background-color: #fff;
+  border: 1px solid #989898
+}
+
+/*灰色私信、互相关注按钮*/
+.user_private_btn:hover {
+  color: #B2B2B2 !important;
+  border: 1px solid #B2B2B2;
+}
+
+.btn_auto {
+  border-radius: 5px;
+  background: #fff;
+  padding: 0px 18px;
+}
+
+/*可共用按钮，需添加padding或者边框*/
+.edu-default-btn {
+  display: block;
+  border-radius: 4px;
+}
+
+a.edu-greenback-btn {
+  padding: 0px 10px;
+  background: #29BD8B;
+  color: #fff !important;
+  border: 1px solid #29BD8B;
+}
+
+a.edu-greenback-btn:hover {
+  background-color: #28AC7F;
+}
+
+a.edu-blueback-btn {
+  padding: 0px 10px;
+  background: #4CACFF;
+  color: #fff !important;
+  border: 1px solid #4CACFF;
+}
+
+a.edu-blueline-btn {
+  padding: 0px 10px;
+  color: #4CACFF !important;
+  border: 1px solid #4CACFF;
+}
+
+a.edu-blueback-btn:hover {
+  background-color: #459BE6;
+}
+
+a.edu-blueline-btn:hover {
+  border: 1px solid #459BE6;
+  color: #459BE6 !important;
+}
+
+a.edu-orangeback-btn {
+  background-color: #ff7500;
+  color: #fff !important;
+  border: 1px solid #FF7500
+}
+
+a.edu-orangeback-btn:hover {
+  background-color: #F06200;
+}
+
+a.edu-orangeline-btn {
+  color: #FF7500 !important;
+  border: 1px solid #FF7500
+}
+
+a.edu-orangeline-btn:hover {
+  color: #F06200 !important;
+  border: 1px solid #F06200
+}
+
+a.edu-greyline-btn {
+  padding: 0px 10px;
+  background: #fff;
+  color: #666 !important;
+  border: 1px solid #eaeaea;
+  line-height: 33px;
+  height: 33px;
+}
+
+a.edu-greyline-btn:hover {
+  border: 1px solid #B2B2B2;
+  color: #B2B2B2 !important;
+}
+
+/*新建页面的提交和取消按钮*/
+.defalutCancelbtn {
+  display: block;
+  border: 1px solid #CDCDCD;
+  background-color: #fafafa;
+  color: #999 !important;
+  width: 120px;
+  text-align: center;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 2px;
+  width: 130px;
+  height: 40px;
+  background: rgba(77, 124, 254, 0);
+  border: 1px solid rgba(76, 172, 255, 1);
+  border-radius: 4px;
+  line-height: 40px;
+  font-size: 16px;
+  font-family: MicrosoftYaHei;
+  font-weight: 400;
+  color: rgba(76, 172, 255, 1) !important;
+}
+
+.defalutCancelbtn:hover {
+  border: 1px solid #B2B2B2;
+  color: #B2B2B2 !important;
+}
+
+.defalutSubmitbtn {
+  display: block;
+  border: 1px solid #4CACFF;
+  background-color: #4CACFF;
+  color: #fff !important;
+  width: 120px;
+  text-align: center;
+  line-height: 40px;
+  border-radius: 2px;
+  width: 130px;
+  height: 40px;
+  background: rgba(76, 172, 255, 1);
+  border-radius: 4px;
+  font-size: 16px;
+  font-family: MicrosoftYaHei;
+  font-weight: 400;
+  color: rgba(255, 255, 255, 1);
+}
+
+/*删除按钮*/
+.delectshixuncdbtn {
+  display: block;
+  border: 1px solid #CDCDCD;
+  background-color: #fafafa;
+  color: #999 !important;
+  width: 120px;
+  text-align: center;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 2px;
+  width: 130px;
+  height: 40px;
+  background: rgba(77, 124, 254, 0);
+  border-radius: 4px;
+  line-height: 40px;
+  font-size: 16px;
+  font-family: MicrosoftYaHei;
+  font-weight: 400;
+}
+
+.defalutSubmitbtn:hover {
+  background-color: #459BE6;
+  border: 1px solid #459BE6;
+}
+
+/*-------------------------------------------公用按钮：以white-btn(或者edu-default-btn无padding)为基础，宽度和高度可以用padding填充，颜色用edu-color-btn，end-----------------------------------------*/
+
+/*可点击按钮---蓝色*/
+
+a.task-btn-orange {
+  background: #4CACFF !important;
+  color: #fff !important;
+}
+
+a:hover.task-btn-orange {
+  background: #459BE6;
+}
+
+/*可点击按钮---蓝色---蓝色边框*/
+.user_blue_btn {
+  border: 1px solid #4CACFF;
+  color: #4CACFF !important;
+}
+
+/*可点击按钮---蓝色---蓝色背景*/
+a.user_bluebg_btn {
+  background-color: #4CACFF;
+  color: #fff;
+}
+
+/*.user_white_btn{border: 1px solid #ffffff;color: #ffffff!important;}*/
+
+.pointer {
+  cursor: pointer
+}
+
+.cdefault {
+  cursor: default
+}
+
+
+/*md编辑器恢复被覆盖样式*/
+.new_li .markdown-body ul>li,
+.markdown-body ul>li {
+  list-style-type: disc !important;
+  margin-bottom: 0 !important;
+}
+
+.new_li .markdown-body ol>li,
+.markdown-body ol>li {
+  list-style-type: decimal !important;
+}
+
+.new_li li {
+  margin-bottom: 0 !important;
+}
+
+.markdown-body p {
+  font-size: 16px !important;
+}
+
+/*搜索框*/
+
+/* 弹框 */
+
+.task-popup {
+  width: 30%;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+  border-radius: 10px;
+}
+
+.task-popup-text-center {
+  text-align: center;
+  color: #333;
+}
+
+.task-popup-title {
+  border-bottom: 1px solid #eee;
+  padding: 0px 15px;
+  text-align: center;
+  box-sizing: border-box;
+  line-height: 70px;
+  height: 70px;
+  border-radius: 10px 10px 0px 0px;
+  font-size: 16px;
+  font-weight: bold;
+}
+
+.task-popup-content {
+  padding: 15px;
+}
+
+.task-popup-submit {
+  margin: 0px auto 15px;
+  width: 160px;
+}
+
+.task-popup-sure {
+  margin: 0px auto 15px;
+  width: 54px;
+}
+
+.task-popup-OK {
+  margin: 15px auto;
+  text-align: center
+}
+
+#closeIcon {
+  position: absolute;
+  color: #fefefe
+}
+
+/*  模板弹框 20170407byLB */
+
+.task_popup_con {
+  padding: 20px;
+}
+
+/*  模板弹框 20161013byLB */
+
+
+/*提示条*/
+.alert {
+  padding: 10px;
+  border: 1px solid transparent;
+  text-align: center;
+}
+
+.alert-orange {
+  background-color: #fff9e9;
+  border-color: #f6d0b1;
+  color: #ee4a20;
+}
+
+/*搜索的下拉列表*/
+
+/*白色色块--类似个人主页-学习-里面的tab*/
+.white-panel {
+  border-radius: 2px;
+  width: 100%;
+  margin: 0px auto;
+  box-sizing: border-box;
+  padding-left: 25px;
+}
+
+.white-panel li {
+  width: 118px;
+  height: 48px;
+  line-height: 48px;
+  text-align: center;
+  color: #05101A;
+  float: left;
+  cursor: pointer;
+  border: 1px solid #fff;
+}
+
+.white-panel li a {
+  display: block;
+  width: 100%;
+}
+
+.white-panel li.active {
+  border-radius: 24px;
+  border: 1px solid #4CACFF;
+  color: #4CACFF;
+}
+
+.white-panel li.active a {
+  color: #4CACFF;
+}
+
+
+/* 个人主页翻页 */
+.pages_user_show a:hover,
+.pages_user_show li.active a {
+  background-color: #4CACFF;
+  color: #fff;
+  border: 1px solid #4CACFF;
+}
+
+.pages_user_show a {
+  border-radius: 2px;
+  display: inline-block;
+  border: 1px solid #d1d1d1;
+  background-color: #fff;
+  color: #888;
+  float: left;
+  text-align: center;
+  padding: 2px 10px;
+  line-height: 1.9;
+  margin: 0 5px;
+}
+
+.pages_user_show li {
+  float: left;
+  list-style-type: none;
+}
+
+.pages_user_show ul li {
+  list-style-type: none !important;
+}
+
+.pages_user_show ul li a {
+  color: #888
+}
+
+/* 小翻页 */
+
+/*左右排版结构：参考个人主页的经验值和金币等页面*/
+.leftPanel {
+  width: 22%;
+  float: left;
+}
+
+.leftPanel li.nav {
+  padding: 10px 0px;
+  box-sizing: border-box;
+}
+
+.leftPanel li.nav a {
+  padding-left: 40px;
+  display: block;
+  width: 100%;
+  box-sizing: border-box;
+  border-left: 2px solid #fff;
+  height: 24px;
+  line-height: 24px;
+}
+
+.leftPanel li.nav.active a {
+  border-left: 2px solid #4CACFF;
+}
+
+.rightPanel {
+  width: 78%;
+  float: right;
+}
+
+/*个人主页，认证的圆圈*/
+.ringauto {
+  width: 20px;
+  height: 20px;
+  line-height: 20px;
+  text-align: center;
+  border-radius: 50%;
+  background-color: #F4FAFF;
+  margin-right: 5px;
+}
+
+/*-------------------个人主页：右侧提示区域--------------------------*/
+.-task-sidebar {
+  position: fixed;
+  width: 40px;
+  height: 180px;
+  right: 0;
+  bottom: 80px;
+  z-index: 10;
+}
+
+.-task-sidebar div {
+  height: 40px;
+  line-height: 40px;
+  box-sizing: border-box;
+  width: 40px;
+  background: #4CACFF;
+  color: #fff;
+  font-size: 20px;
+  text-align: center;
+  margin-bottom: 5px;
+  border-radius: 4px;
+}
+
+.-task-sidebar div i {
+  color: #fff;
+}
+
+.-task-sidebar div i:hover {
+  color: #fff !important;
+}
+
+.gotop {
+  background-color: rgba(208, 207, 207, 0.5) !important;
+  padding: 0px !important;
+}
+
+
+/***** loading ******/
+/*****载入中******/
+#ajax-indicator {
+  position: absolute;
+  /* fixed not supported by IE*/
+  background-color: #eee;
+  border: 1px solid #bbb;
+  top: 35%;
+  left: 40%;
+  width: 20%;
+  /*height:5%;*/
+  font-weight: bold;
+  text-align: center;
+  padding: 0.6em;
+  z-index: 100000;
+  opacity: 0.5;
+}
+
+html>body #ajax-indicator {
+  position: fixed;
+}
+
+#ajax-indicator span {
+  color: #fff;
+  color: #333333;
+  background-position: 0% 40%;
+  background-repeat: no-repeat;
+  background-image: url(/images/loading.gif);
+  padding-left: 26px;
+  vertical-align: bottom;
+  z-index: 100000;
+}
+
+/*最新、最热*/
+.bestChoose.active {
+  color: #4CACFF;
+}
+
+
+/*实训路径选择实训*/
+.edu-filter-cir-grey {
+  color: #666 !important;
+  width: auto;
+  padding: 0px 15px;
+  font-size: 14px !important;
+  text-align: center;
+  background: #f3f3f3;
+  border-radius: 10px;
+  display: block;
+  height: 25px;
+  line-height: 25px;
+}
+
+.edu-filter-cir-grey:hover {
+  background: #4cacff;
+  color: #ffffff !important;
+}
+
+.edu-filter-cir-grey.active {
+  background: #4cacff;
+  color: #ffffff !important;
+  font-size: 14px !important;
+}
+
+
+.with10 {
+  width: 10%;
+  box-sizing: border-box
+}
+
+.with13 {
+  width: 13%;
+  box-sizing: border-box
+}
+
+.with14 {
+  width: 14%;
+  box-sizing: border-box
+}
+
+.with15 {
+  width: 15%;
+  box-sizing: border-box
+}
+
+.with20 {
+  width: 20%;
+  box-sizing: border-box
+}
+
+.with22 {
+  width: 22%;
+  box-sizing: border-box
+}
+
+.with23 {
+  width: 23%;
+  box-sizing: border-box
+}
+
+.with25 {
+  width: 25%;
+  box-sizing: border-box
+}
+
+.with30 {
+  width: 30%;
+  box-sizing: border-box
+}
+
+.with35 {
+  width: 35%;
+  box-sizing: border-box
+}
+
+.with40 {
+  width: 40%;
+  box-sizing: border-box
+}
+
+.with45 {
+  width: 45%;
+  box-sizing: border-box
+}
+
+.with49 {
+  width: 49%;
+  box-sizing: border-box
+}
+
+.with50 {
+  width: 50%;
+  box-sizing: border-box
+}
+
+.with52 {
+  width: 52%;
+  box-sizing: border-box
+}
+
+.with48 {
+  width: 48%;
+  box-sizing: border-box
+}
+
+.with60 {
+  width: 60%;
+  box-sizing: border-box
+}
+
+.with65 {
+  width: 65%;
+  box-sizing: border-box
+}
+
+.with70 {
+  width: 70%;
+  box-sizing: border-box
+}
+
+.with75 {
+  width: 75%;
+  box-sizing: border-box
+}
+
+.with78 {
+  width: 78%;
+  box-sizing: border-box
+}
+
+.with80 {
+  width: 80%;
+  box-sizing: border-box
+}
+
+.with100 {
+  width: 100%;
+}
+
+.transform-90 {
+  transform: rotate(-90deg);
+  -ms-transform: rotate(-90deg);
+  /* IE 9 */
+  -moz-transform: rotate(-90deg);
+  /* Firefox */
+  -webkit-transform: rotate(-90deg);
+  /* Safari 和 Chrome */
+  -o-transform: rotate(-90deg);
+}
+
+/*置顶*/
+.btn-cir {
+  display: inline-block;
+  padding: 0px 5px;
+  border-radius: 25px;
+  line-height: 20px;
+  font-size: 12px;
+}
+
+.btn-cir-red {
+  background: red;
+  color: #fff;
+  font-weight: normal;
+  cursor: default
+}
+
+.btn-cir-red:hover {
+  background: red;
+  color: #fff !important;
+}
+
+/*动态标签*/
+.edu-filter-btn {
+  cursor: default;
+  display: inline-block;
+  padding: 0px 9px;
+  color: #666;
+  background: #fff;
+  text-align: center;
+  border-radius: 10px;
+  font-size: 12px;
+  height: 18px;
+  line-height: 18px;
+}
+
+/*提交中、评阅中*/
+.edu-filter-btn-red {
+  border: 1px solid #DD1717;
+  color: #DD1717;
+}
+
+/*已截止、未开启补交*/
+.edu-filter-btn-green {
+  border: 1px solid #29BD8B;
+  color: #29BD8B !important;
+}
+
+/*申诉中、已开启补交*/
+
+/*申诉中*/
+
+/*未发布*/
+
+/*已结束*/
+/*动态按钮*/
+.edu-activity-orange {
+  background-color: #FF6800;
+  color: #fff !important;
+  cursor: pointer;
+  border: 1px solid #ff6800;
+}
+
+/*修改作品、补交作品、立即补交、补交附件*/
+.edu-activity-blue {
+  background-color: #4CACFF;
+  color: #fff !important;
+  cursor: pointer;
+  border: 1px solid #4CACFF;
+}
+
+/*开始实战、开始答题、继续答题、继续实战、提交作品*/
+
+/*匿评作品*/
+.edu-activity-green {
+  background-color: #29BD8B;
+  color: #fff !important;
+  cursor: pointer;
+  border: 1px solid #29BD8B;
+}
+
+/*查看作品、查看实战、查看答题*/
+
+/*取消关联*/
+/*课堂设置页面*/
+
+/*-----下拉框--------*/
+
+/*.ant-modal-header{*/
+/*border-radius: 10px;*/
+/*}*/
+
+.color656565 {
+  color: #656565;
+}
+
+.colorC8161D {
+  color: #C8161D;
+}
+
+.bor-reds {
+  border: 1px solid #FF0000 !important;
+  border-radius: 4px;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+
+/*中间部分宽度固定为1200*/
+
+.footer_con-p {
+  color: #898989 !important;
+}
+
+.markdown-body {
+  text-align: justify;
+  word-break: break-all;
+}
+
+.RightPaneDrawer .ant-drawer-content {
+  background: #070f1a;
+  overflow: hidden !important;
+}
+
+.deletebuttom {
+  border: transparent;
+}
+
+.RightPaneDrawer .jupyter_data_list {
+  max-height: 340px;
+}/*头部导航条样式---2018-03-19--by-cs*/
+
+.head-nav {
+  float: left;
+  text-align: center;
+  height: 60px;
+  box-sizing: border-box;
+  min-width: 780px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.head-nav ul#header-nav {
+  position: absolute;
+  top: 0px;
+  z-index: 3;
+  height: 60px;
+  box-sizing: border-box;
+}
+
+.head-nav ul#header-nav li {
+  float: left;
+  height: 60px;
+  line-height: 60px;
+  margin-right: 30px;
+  cursor: pointer;
+  position: relative;
+  font-size: 16px
+}
+
+.head-nav ul#header-nav li a {
+  display: block;
+  height: 100%;
+  width: 100%;
+  color: #fff
+}
+
+.head-nav ul#header-nav li a:hover {
+  color: #cccccc;
+}
+
+.head-nav ul#header-nav li:last-child {
+  margin-right: 0px
+}
+
+.head-nav ul#header-nav li.active a {
+  color: #459be5 !important;
+}
+
+.head-nav ul#header-nav li.active p {
+  color: #459be5 !important;
+}
+
+.head-nav ul#header-nav li p:hover {
+  color: #cccccc;
+}
+
+.head-nav ul#header-nav li p {
+  display: block;
+  height: 100%;
+  width: 100%;
+  color: #fff
+}
+
+.head-nav ul#header-nav li.active div ul li a {
+  color: #000 !important;
+}
+
+.head-nav ul#header-nav li.active div ul li a:hover {
+  color: #FFF !important;
+}
+
+.head-nav ul#header-nav li.active ul li a {
+  color: #000 !important;
+}
+
+.head-nav ul#header-nav li.active ul li a:hover {
+  color: #FFF !important;
+}
+
+.head-nav ul#header-nav li.active:after {
+  content: '';
+  position: absolute;
+  left: 0px;
+  top: auto;
+  bottom: 10px;
+  right: auto;
+  height: 2px;
+  width: 14px;
+  background-color: #459be5;
+}
+
+.head-right {
+  box-sizing: border-box;
+  height: 60px;
+  background: #24292D;
+}
+
+.head-right i {
+  margin-top: 12px;
+  float: right;
+  margin-right: 15px;
+  margin-left: 15px;
+}
+
+/* tpm*/
+.educontent .icon {
+  padding-left: 0px !important;
+  padding-top: 0px !important;
+  padding-bottom: 0px !important;
+}
+
+em.vertical-line {
+  display: inline-block;
+  width: 2px;
+  background: #999;
+  height: 10px
+}
+
+/*.newslight{position: absolute;display: block;background: #FF6800;border-radius:30px;left: 25px;top: 13px;padding:0px 2px;color: #fff;font-size: 11px;*/
+/*height: 16px;line-height: 15px;min-width: 12px;text-align: center;}*/
+
+.newslight {
+  display: block;
+  width: 5px;
+  height: 5px;
+  border-radius: 50%;
+  left: 25px;
+  top: 3px;
+  position: absolute;
+  background: #FF6800;
+}
+
+.rateTrangle {
+  display: block;
+  border-width: 8px;
+  position: absolute;
+  top: -8px;
+  left: 35px;
+  border-style: dashed solid dashed dashed;
+  border-color: transparent transparent #fff transparent;
+  font-size: 0;
+  line-height: 0;
+  z-index: 2
+}
+
+#commentsStar {
+  height: 30px;
+  padding-top: 7px;
+  box-sizing: border-box;
+}
+
+/*----------------------------------首页查询输入框*/
+.search-all {
+  width: 216px;
+  margin: 0px auto;
+  position: relative;
+  background-color: #24292D;
+}
+
+.search-all .search-clear {
+  font-size: 14px;
+  display: inline-block;
+  width: 50px;
+  text-align: center;
+  color: #656565;
+  line-height: 60px;
+  cursor: pointer
+}
+
+/* 右侧内容宽度变化的话，需要调整posi-search right的值*/
+
+/*底部*/
+.newFooter {
+  max-height: 110px;
+}
+
+.newFooter {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background: #323232;
+  clear: both;
+  min-width: 1200px;
+  z-index: 8;
+  left: 0px;
+}
+
+.footercon {
+  border-bottom: 1px solid #47494d;
+}
+
+.inner-footernav {
+  width: 560px;
+  margin: 0px auto
+}
+
+.inner-footernav li {
+  float: left;
+  height: 50px;
+  width: 80px;
+  text-align: center
+}
+
+.inner-footernav li a {
+  width: 100%;
+  text-align: center;
+  line-height: 50px;
+  color: #888
+}
+
+.inner-footer_con {
+  width: 1200px;
+  margin: 0 auto;
+}
+
+.intermediatecenter {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.footer_con-p {
+  color: #888;
+  margin-top: 10px;
+}
+
+/*banner图*/
+.banner {
+  width: 100%;
+  height: 345px;
+  position: relative;
+  overflow: hidden;
+  border-radius: 10px;
+}
+
+.banner .img {
+  position: absolute;
+  left: 0px;
+  top: 0px;
+}
+
+.banner .img li {
+  float: left;
+  width: 1200px;
+  height: 345px;
+}
+
+.banner .img li a {
+  display: block;
+  width: 100%;
+  height: 100%
+}
+
+.banner .img li img {
+  width: 100%;
+  height: 345px;
+}
+
+.banner .num {
+  position: absolute;
+  width: 100%;
+  bottom: 30px;
+  left: 0px;
+  text-align: center;
+  font-size: 0px;
+}
+
+.banner .num li {
+  width: 7px;
+  height: 7px;
+  background: rgba(225, 225, 225, 0.3);
+  border-radius: 50%;
+  display: inline-block;
+  margin: 0 5px;
+  cursor: pointer;
+}
+
+.banner .num li.on {
+  width: 12px;
+  border-radius: 8px;
+}
+
+/*更多*/
+.moreitem {
+  position: absolute;
+  right: 5px;
+  top: 35px;
+  height: 15px;
+  color: #656565
+}
+
+/*块状列表*/
+.square-list {
+  width: 100%;
+  box-sizing: border-box;
+  margin-top: 20px;
+  flex-wrap: wrap;
+  display: flex;
+}
+
+.square-Item {
+  position: relative;
+  width: 280px;
+  margin-right: 26px;
+  margin-bottom: 26px;
+  float: left;
+  border-radius: 6px;
+  background-color: #fff;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.1);
+}
+
+.square-Item:hover {
+  /*bottom: 3px;*/
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.3);
+}
+
+.square-Item:hover .closeSquare {
+  display: block
+}
+
+.square-Item:nth-child(4n+0) {
+  margin-right: 0px;
+}
+
+.square-Item .square-img {
+  display: block;
+  width: 100%
+}
+
+.square-Item .square-img img {
+  width: 100%;
+  border-radius: 6px 6px 0px 0px;
+  vertical-align: bottom;
+  height: 210px;
+}
+
+.square-main {
+  padding: 15px 20px;
+  box-sizing: border-box;
+}
+
+.course-bottom {
+  height: 48px;
+  padding: 10px 0px;
+  box-sizing: border-box
+}
+
+.squareIconSpan {
+  line-height: 25px
+}
+
+/*块状列表（小）---列如实训路径详情选择实训*/
+.square-Item.smallSquare {
+  width: 32%;
+  margin-right: 1.33%;
+  margin-bottom: 10px;
+  min-height: 210px;
+  border: none;
+}
+
+.square-Item.smallSquare:hover {
+  bottom: 0px;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.1);
+}
+
+.smallSquare:nth-child(3n+0) {
+  margin-right: 0px;
+}
+
+.partimg {
+  height: 180px;
+  width: 100%;
+  border-radius: 6px 6px 0px 0px;
+}
+
+/*块状列表上面的绿色标签*/
+.tag-green {
+  position: absolute;
+  left: 10px;
+  bottom: 90px;
+}
+
+.tag-green .tag-name {
+  display: block;
+  width: auto;
+  /*background-image: url("/images/educoder/tag1.png");*/
+  background: rgba(000, 000, 000, 0.56);
+  border: 1px solid rgba(255, 255, 255, 0.56);
+  border-radius: 3px;
+  font-size: 12px;
+  /*opacity: 0.56;*/
+  background-size: 100% 100%;
+  padding: 0px 8px;
+  color: #fff;
+  float: left;
+}
+
+.tag-orange {
+  position: absolute;
+  right: 0px;
+  top: 12px;
+}
+
+.tag-orange .tag-name {
+  display: block;
+  width: auto;
+  background-color: #FF6800;
+  background-size: 100% 100%;
+  padding: 0px 8px;
+  color: #fff;
+  float: left;
+  height: 28px;
+  line-height: 28px;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+
+/*发送至弹框里的下拉框*/
+
+/*门户左侧导航栏*/
+.user_navlist {
+  position: absolute;
+  left: 0px;
+  width: 160px;
+  top: 0px;
+  height: 100%;
+}
+
+.user_navlist_black {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  border-radius: 8px 0px 0px 8px;
+  background: rgba(0, 0, 0, 0.8);
+}
+
+.user_navlist_white {
+  position: absolute;
+  left: 160px;
+  background: #FFFFff;
+  width: 622px;
+  min-height: 345px;
+  top: 0px;
+  z-index: 1;
+  display: none;
+  padding: 0px 30px;
+  box-sizing: border-box;
+  box-shadow: 0px 0px 10px rgba(76, 76, 76, 0.2);
+  z-index: 99
+}
+
+.user_navlist_white a {
+  color: #989898;
+  margin-right: 15px;
+  font-size: 14px;
+  display: block;
+  float: left;
+  height: 30px;
+  line-height: 30px;
+}
+
+.user_navlist_white a:hover {
+  color: #4cacff
+}
+
+.headIcon {
+  height: 100%;
+  box-sizing: border-box;
+  margin: 0px !important;
+}
+
+.black_nav_list {
+  padding: 4px 0px;
+  box-sizing: border-box;
+  height: 100%;
+}
+
+.black_nav_list li {
+  line-height: 40px;
+  height: 40px;
+  color: #fff;
+  cursor: pointer;
+}
+
+.black_nav_span {
+  display: block;
+  margin: 0px 20px;
+  border-bottom: 1px solid #4B4B4B;
+  padding-left: 8px;
+  color: #FAFAFA
+}
+
+.welcome_shixun_index:last-child .black_nav_span {
+  border-bottom: none
+}
+
+.black_nav_list li:hover {
+  background: #fff;
+}
+
+.black_nav_list li:hover .black_nav_span {
+  color: #05101A !important;
+}
+
+.black_nav_list li:hover>a {
+  color: #4cacff !important;
+}
+
+.black_nav_list li:hover .user_navlist_white {
+  display: block
+}
+
+.navlistpanel-line {
+  border-bottom: 1px solid #EBEBEB;
+}
+
+.navlistpanel-line:last-child {
+  border-bottom: none;
+}
+
+.little-title {
+  width: 100%;
+  height: 20px;
+  line-height: 20px;
+  color: #05101a;
+  font-size: 15px;
+  margin-bottom: 8px;
+}
+
+/*排行榜*/
+.ranking {
+  text-align: center;
+  margin-top: 40px
+}
+
+.grade {
+  width: auto;
+  display: inline-block;
+}
+
+.grade li {
+  float: left;
+  margin: 0px 10px;
+  width: 60px;
+}
+
+.ranking a img {
+  width: 60px;
+  height: 60px;
+  border-radius: 50%;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.2);
+}
+
+.mentor-ranking {
+  background-color: #EFEFEF;
+  background-size: 100% 100%;
+}
+
+.huangguan {
+  position: absolute;
+  top: -30px;
+  left: 13px;
+}
+
+/*消息盒子*/
+
+/*
+    colorbox
+    User Style:
+    Change the following styles to modify the appearance of Colorbox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+
+/* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
+
+/* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
+
+/*-----------------------------登录-------------------------------*/
+
+#log_reg_content {
+  border-radius: 5px;
+  background: #FFFFff;
+  width: 100%;
+  text-align: center;
+  position: absolute;
+  top: 165px;
+  left: 0px;
+  padding: 40px 30px;
+  box-sizing: border-box
+}
+
+.log_nav {
+  border-bottom: 1px solid #eaeaea;
+}
+
+.log_nav li {
+  float: left;
+  text-align: center;
+  font-size: 16px;
+  padding-bottom: 15px;
+  /*margin: 0px 20px;*/
+  cursor: pointer;
+}
+
+.log_nav li.active {
+  border-bottom: 2px solid #459be5;
+}
+
+.log-botton {
+  width: 100%;
+  text-align: center;
+  color: #FFFFff !important;
+  display: block;
+  background: #cbcbcb;
+  height: 45px;
+  line-height: 45px;
+  border-radius: 4px;
+  letter-spacing: 2px;
+  cursor: pointer
+}
+
+.log-botton:hover {
+  color: #FFFFff !important;
+}
+
+.log-botton.active {
+  background: #4cacff;
+}
+
+.gain-code {
+  width: 48%;
+  display: block;
+  float: right;
+  height: 45px;
+  line-height: 45px;
+  text-align: center;
+  background: #CBCBCB;
+  color: #FFFFff !important;
+  border-radius: 4px;
+  cursor: pointer
+}
+
+.gain-code:hover {
+  color: #FFFFff !important;
+}
+
+/*-----------------------------注册、找回密码、绑定邮箱----------------------------*/
+
+/*----------------------------用户资料完善、认证等页面-----------------*/
+
+/*提交、保存*/
+
+/*选择文件*/
+
+/*更换照片*/
+
+/*账号安全*/
+
+/*----------------------------试用申请弹框--------------------------*/
+
+/*-----------------------------个人主页页面-begin-------------------------*/
+.user-main-half {
+  width: 100%;
+  height: 465px;
+  background: #fff;
+  margin-bottom: 20px;
+  position: relative
+}
+
+.user-headImg {
+  width: 100%;
+  height: 160px;
+  background-image: url("/images/educoder/userhead.jpg");
+  position: absolute;
+  width: 100%;
+  left: 0px;
+  top: 0px
+}
+
+.user-headCon {
+  position: absolute;
+  width: 100%;
+  left: 0px;
+  top: 0px;
+  min-height: 465px;
+}
+
+.inline {
+  width: auto;
+  display: inline-block;
+}
+
+.headtab {
+  width: 188px;
+  height: 60px;
+  text-align: center
+}
+
+.headtab span,
+.headtab a {
+  display: block;
+  width: 100%;
+  text-align: center;
+}
+
+.headtab span {
+  color: #989898;
+  font-size: 14px;
+}
+
+.headtab a {
+  color: #fff;
+  font-size: 24px;
+}
+
+.headphoto {
+  text-align: center;
+  background: #FFFFff;
+  width: 115px;
+  height: 115px;
+  padding: 3px;
+  border-radius: 50%;
+  position: relative;
+  float: left;
+  margin-top: 19px;
+  box-sizing: border-box
+}
+
+.headphoto img {
+  width: 109px;
+  border-radius: 50%;
+  height: 109px;
+}
+
+.headphoto-black {
+  display: none;
+  cursor: pointer;
+  position: absolute;
+  top: 3px;
+  left: 3px;
+  width: 109px;
+  height: 109px;
+  text-align: center;
+  line-height: 112px;
+  border-radius: 50%;
+  background-color: rgba(0, 0, 0, 0.3);
+  color: #fff;
+}
+
+.myName {
+  display: block;
+  width: auto;
+  color: #05101A;
+  font-size: 24px;
+  height: 28px;
+  line-height: 28px;
+  margin-top: 5px
+}
+
+.mypost {
+  color: #686868;
+  font-size: 14px;
+  display: block;
+  width: auto;
+  height: 20px;
+  line-height: 20px;
+}
+
+.mysign-span {
+  margin: 0 auto;
+  color: #05101A;
+  font-size: 14px;
+  display: block;
+  width: 280px;
+  cursor: pointer;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.mysign-input {
+  margin: 0 auto;
+  color: #05101A;
+  font-size: 14px;
+  width: 280px;
+  height: 28px;
+  border: none;
+  outline: none;
+  text-align: center
+}
+
+.v-h-line {
+  display: block;
+  width: 1px;
+  height: 40px;
+  background-color: #999;
+  margin-top: 12px;
+}
+
+
+/*我的实训、进度条*/
+.user-bar {
+  position: relative;
+  width: 100%;
+  height: 8px;
+  background-color: #CDCDCD;
+  border-radius: 4px;
+}
+
+.user-bar p {
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  height: 100%;
+  background-color: #4CACFF;
+  border-radius: 4px;
+}
+
+/*我的课堂和我的项目，公开梯形*/
+.publicpart {
+  position: absolute;
+  left: 1px;
+  top: 1px;
+  width: 0;
+  height: 0;
+  border-left: 80px solid #4cacff;
+  border-bottom: 80px solid transparent;
+  z-index: 1;
+}
+
+.publicpart.orangeBlack {
+  border-left: 80px solid #FF6800;
+}
+
+.smalltrangle {
+  display: block;
+  position: absolute;
+  left: 1px;
+  top: 1px;
+  border-left: 25px solid #fff;
+  border-bottom: 25px solid transparent;
+  z-index: 2;
+}
+
+.publicword {
+  transform: rotate(-45deg);
+  text-align: center;
+  color: #FFF;
+  font-size: 14px;
+  display: block;
+  position: absolute;
+  width: 50px;
+  left: 0px;
+  z-index: 3;
+  top: 15px;
+}
+
+.closeSquare {
+  position: absolute;
+  width: 100%;
+  left: 0px;
+  top: 0px;
+  text-align: center;
+  background-color: rgba(0, 0, 0, .5);
+  height: 100%;
+  z-index: 5;
+  display: none;
+  cursor: default
+}
+
+.substance {
+  padding: 40px 40px 0px 40px;
+  box-sizing: border-box;
+  text-align: center;
+  border-bottom: 1px solid #EAEAEA;
+  min-height: 241px;
+}
+
+.subName {
+  line-height: 20px;
+  height: 40px;
+  text-align: center;
+  color: #1A0B00;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+}
+
+/*题库以及资料*/
+.secondNav li {
+  color: #676767;
+  margin: 0px 20px;
+  float: left
+}
+
+.secondNav li a:hover {
+  color: #4CACFF
+}
+
+.secondNav li.active a {
+  color: #4CACFF
+}
+
+/*题库*/
+.dataBank_Item {
+  margin-bottom: 3px;
+  width: 100%;
+  border-bottom: 1px solid #EEEEEE;
+  padding: 17px 37px 17px 20px;
+  box-sizing: border-box;
+  background: #fff;
+  display: flex;
+  cursor: pointer
+}
+
+.dataBank_Item:hover {
+  box-shadow: 0px 0px 15px rgba(76, 76, 76, 0.2)
+}
+
+.dataBank_Item:last-child {
+  border: none;
+}
+
+.dataItemLeft {
+  margin-right: 20px;
+  width: 20px;
+}
+
+.dataItemRight {
+  flex: 1;
+}
+
+.dataTitle {
+  color: #05101A;
+  display: block;
+  float: left;
+  max-width: 400px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.itembottom span.bottomspan {
+  display: block;
+  width: 200px;
+  text-align: left
+}
+
+.search_course_list {
+  height: 150px;
+  overflow-y: auto
+}
+
+.search_course_list li {
+  height: 30px;
+}
+
+/*资料*/
+.userdata {
+  width: 622px;
+  margin: 0px auto;
+  background: #fff;
+  margin-bottom: 80px;
+  padding: 40px;
+  box-sizing: border-box;
+  border-radius: 4px
+}
+
+/*发送题库的筛选*/
+
+
+
+/*-------------------------------精选实训-------------------------------*/
+.shaiTitle {
+  display: block;
+  padding-right: 20px;
+}
+
+.shaiContent li.shaiItem.active {
+  background-color: #4CACFF !important;
+  color: #fff !important;
+}
+
+.shaiContent li.shaiItem {
+  padding: 3px 15px;
+  float: left;
+  border-radius: 4px;
+  color: #4C4C4C;
+  cursor: pointer;
+  margin-right: 15px;
+  display: block
+}
+
+.shaiContent li.shaiItem:hover {
+  background-color: #4CACFF !important;
+  color: #fff !important;
+}
+
+.shaiAllItem {
+  max-width: 1138px;
+}
+
+.subshaicontent {
+  display: none;
+  box-sizing: border-box;
+  position: absolute;
+  width: 100%;
+  top: 33px;
+  left: 0px;
+  background-color: #fff;
+  box-shadow: 0px 1px 4px rgba(76, 76, 76, 0.2);
+  padding: 0px 20px;
+  z-index: 99999;
+  border-radius: 4px;
+  max-height: 800px;
+  overflow-y: auto
+}
+
+.subshaicontent-part {
+  border-bottom: 1px solid #eee;
+}
+
+.subshaicontent-part:last-child {
+  border-bottom: none;
+}
+
+.subshaicontent a:hover,
+.subshaicontent a.active {
+  color: #4CACFF
+}
+
+.subshaicontent a {
+  float: left;
+  margin-right: 20px;
+  color: #999;
+  cursor: pointer
+}
+
+
+.search-new {
+  width: 248px;
+  height: 32px;
+  position: relative;
+}
+
+.search-span {
+  display: block;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0px;
+  top: 0px;
+  background-color: #F4F4F4;
+  border: 1px solid #EAEAEA;
+  border-radius: 4px;
+  z-index: 1
+}
+
+.search-new-input {
+  height: 32px;
+  padding-left: 5px;
+  width: 225px;
+  border: none;
+  box-sizing: border-box;
+  background: none;
+  outline: none;
+  position: absolute;
+  left: 0px;
+  top: 1px;
+  z-index: 2
+}
+
+.search-new img,
+.search-new a {
+  cursor: pointer;
+  position: absolute;
+  right: 2px;
+  top: 2px;
+  z-index: 2
+}
+
+.search-new a {
+  top: 0px
+}
+
+.search-new-input:focus+.search-span {
+  background-color: #fff;
+}
+
+.controlblue {
+  width: 0px;
+  height: 15px;
+  background-color: #4CACFF;
+  border-radius: 7px;
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  z-index: 1
+}
+
+.controlring {
+  width: 13px;
+  height: 13px;
+  border-radius: 50%;
+  background-color: #fff;
+  position: absolute;
+  left: 1px;
+  top: 1px;
+  z-index: 2
+}
+
+/*庞门用于实训，站酷黑用于路径*/
+@font-face {
+  font-family: 'panmen-webfont';
+  src: url('../fonts/panmen-webfont.ttf');
+}
+
+/*TPM*/
+.shixunDetail_top {
+  width: 100%;
+  background-image: url("/images/educoder/shixun-detail.jpg");
+  height: 240px;
+  justify-content: center;
+  align-items: center;
+  display: -webkit-flex;
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+}
+
+.task-item {
+  margin-top: 30px;
+  padding-bottom: 30px;
+  border-bottom: 1px solid #eee
+}
+
+.task-item:last-child {
+  border-bottom: none;
+}
+
+.recomments {
+  margin-bottom: 20px;
+}
+
+.recomments:first-child {
+  margin-top: 0px;
+}
+
+.recomments:last-child {
+  margin-bottom: 0px;
+  border: none;
+  padding-bottom: 0px;
+}
+
+.url-input {
+  border: none;
+  padding: 0px;
+  font-size: 12px;
+  color: #999;
+  outline: none
+}
+
+.TPMtaskName {
+  max-width: 500px
+}
+
+/*任务*/
+.recomment-name {
+  max-width: 222px;
+  display: block
+}
+
+.task-colspan {
+  min-width: 25%;
+  text-align: left;
+  display: block;
+  float: left;
+  color: #999;
+}
+
+/*新建任务*/
+.challenge_nav {
+  padding: 20px 20px 0px 20px;
+  border-bottom: 1px solid #eee;
+}
+
+.challenge_nav li {
+  width: auto;
+  float: left;
+  margin-right: 20px;
+  position: relative
+}
+
+.challenge_nav li.active:after {
+  position: absolute;
+  content: '';
+  width: 76%;
+  background-color: #4CACFF;
+  height: 3px;
+  border-radius: 2px;
+  left: 25%;
+  bottom: 0px;
+}
+
+.challenge_nav li a {
+  display: block;
+  width: 100%;
+  padding-bottom: 20px;
+}
+
+.add_choose_type {
+  width: 60px;
+  height: 20px;
+  line-height: 19px;
+  border-radius: 2px;
+  background-color: #eaeaea;
+  color: #999 !important;
+  display: block;
+  float: left;
+  text-align: center;
+  margin-top: 4px;
+}
+
+
+
+.task_tag_span {
+  float: left;
+  padding: 0px 10px;
+  background-color: #eee;
+  color: #999;
+  border-radius: 2px;
+  margin-right: 10px;
+  margin-bottom: 8px;
+}
+
+.task_tag_span span {
+  float: left;
+}
+
+.task_tag_span a {
+  font-size: 18px;
+  margin-left: 5px;
+  float: left;
+  line-height: 28px;
+  height: 28px;
+  cursor: pointer
+}
+
+.task_tag_span a:hover {
+  color: #666 !important;
+}
+
+.show_content_grey {
+  padding: 10px 15px;
+  background-color: #F4F4F4;
+  color: #05101A;
+  text-align: justify;
+  word-break: break-all;
+  border-radius: 4px;
+  width: 100%;
+  box-sizing: border-box
+}
+
+.empty {
+  background: #494A4C;
+  display: inline;
+  margin: 0 2px;
+  padding: 0 3px;
+}
+
+/*选择题*/
+.option-item {
+  border: 1px solid #e2e2e2;
+}
+
+.option-item {
+  display: block;
+  width: 38px;
+  height: 38px;
+  text-align: center;
+  line-height: 38px;
+  border-radius: 4px;
+  cursor: pointer
+}
+
+.check-option-bg {
+  background: #FF7500;
+  color: #ffffff !important;
+  border: 1px solid #FF7500
+}
+
+.position-delete {
+  position: absolute;
+  right: -22px;
+  top: 12px;
+  cursor: pointer
+}
+
+.position-delete:hover i {
+  color: #4cacff !important;
+}
+
+/*排行榜*/
+.rankings li {
+  line-height: 40px;
+  height: 40px;
+}
+
+.rankingindex {
+  width: 24px;
+  text-align: center;
+}
+
+/*合作者*/
+.collaborators-item {
+  border-bottom: 1px solid #eee;
+  cursor: default;
+  padding-top: 30px;
+  padding-left: 20px
+}
+
+.collaborators-item:last-child {
+  border-bottom: none;
+}
+
+.upload_select_box {
+  width: 100%;
+  box-sizing: border-box;
+  height: 240px;
+  overflow-y: auto;
+  padding: 10px;
+  background: #F4FAFF;
+  color: #333;
+}
+
+/*配置*/
+
+/*版本库*/
+
+.pullreques_name {
+  width: 120px;
+  text-align: left;
+  margin-right: 10px
+}
+
+.pullreques_pull_txt {
+  display: block;
+  margin-left: 10px;
+  max-width: 640px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.versionFileList li {
+  border-bottom: 1px solid #eee;
+}
+
+.versionFileList li:last-child {
+  border-bottom: none;
+}
+
+/*项目版本库--旧版*/
+
+/* 提交记录详情------文本变更样式 */
+
+.old {
+  background: #ffecec;
+}
+
+.old:hover {
+  background: #fffaf1;
+}
+
+.new {
+  background: #eaffea;
+}
+
+.new:hover {
+  background: #fffaf1;
+}
+
+
+/*-------------------------------实训路径-------------------------------*/
+
+.pathNavLine {
+  position: absolute;
+  bottom: -8px;
+  width: 100%;
+}
+
+.path-nav li {
+  float: left;
+  padding: 0px 30px;
+  height: 42px;
+}
+
+.path-nav li a {
+  color: #fff;
+  font-size: 16px;
+  display: block;
+  height: 40px;
+}
+
+.path-nav li.active a {
+  border-bottom: 3px solid #4CACFF;
+  color: #4CACFF;
+}
+
+/*---实训路径详情----*/
+.subhead {
+  width: 100%;
+  margin-bottom: 40px;
+  background-size: 100% 100%;
+  background-image: url("/images/educoder/path-detail.jpg");
+  height: 240px;
+  justify-content: center;
+  align-items: center;
+  display: -webkit-flex;
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+}
+
+.subhead_content {
+  width: 1200px;
+  margin: 0px auto;
+}
+
+.pathInfo li {
+  text-align: center;
+  float: left;
+  margin-right: 30px;
+}
+
+.pathInfo li span {
+  display: block;
+}
+
+.produce-content {
+  padding: 40px 20px;
+  background-color: #fff;
+  box-sizing: border-box
+}
+
+.lesson-saved-list-item {
+  border-bottom: 1px solid #EBEBEB;
+  padding: 37px 0px
+}
+
+.title-line {
+  padding: 0px 20px;
+}
+
+.paragraph {
+  height: 50px;
+  padding: 10px 20px 10px 47px;
+  box-sizing: border-box
+}
+
+.paragraph:hover {
+  background-color: #F0F8FF;
+}
+
+.lesson-saved-list-item:last-child {
+  border: none;
+}
+
+.click_add {
+  text-align: center;
+  height: 90px;
+  line-height: 90px;
+  background-color: #fff;
+  border-top: 1px solid #EBEBEB;
+  cursor: pointer
+}
+
+.mustlearn {
+  padding: 40px 25px;
+}
+
+.teacherTeam {
+  padding: 40px 25px 0px 25px;
+}
+
+.teacherTeamItem {
+  border-bottom: 1px solid #EAEAEA;
+  padding: 40px 0px;
+}
+
+.teacherTeamItem:first-child {
+  padding-top: 0px !important;
+}
+
+.teacherTeamItem:last-child {
+  border: none;
+}
+
+.addTeamMember {
+  height: 70px;
+  text-align: center;
+  line-height: 70px;
+}
+
+.adding-stage-item {
+  padding: 0px 20px 20px 50px;
+  position: relative
+}
+
+.colseThispart {
+  position: absolute;
+  right: -6px;
+  top: -6px;
+  z-index: 2;
+  line-height: 15px;
+}
+
+.progressRing {
+  display: block;
+  width: 16px;
+  height: 16px;
+  float: left;
+  position: relative;
+  z-index: 1;
+}
+
+.progressRing-over {
+  color: #459BE6;
+  position: absolute;
+  top: -10px;
+}
+
+.progressRing-part {
+  color: #B3DCFF;
+  position: absolute;
+  top: -10px;
+}
+
+.myProgressNav {
+  width: 100%;
+  position: relative;
+  height: 10px;
+  border-radius: 5px;
+  background-color: #EAEAEA;
+}
+
+.myProgressGreen {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  border-radius: 5px;
+  height: 100%;
+  background-color: #29BD8B
+}
+
+.lesson-saved-list-item .title-line .edit:hover,
+.lesson-saved-list-item .title-line .delete:hover {
+  color: #ff7500 !important;
+}
+
+li.li-width63 {
+  width: 63%;
+  text-align: left
+}
+
+/*-----------------------------在线课堂动态----------------------------------*/
+.courseHead {
+  width: 100%;
+  margin-bottom: 40px;
+  background-size: 100% 100%;
+  background-image: url("/images/educoder/courtailsbdpicture.jpg");
+  height: 240px;
+  justify-content: center;
+  align-items: center;
+  display: -webkit-flex;
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+}
+
+.invite-tip {
+  position: absolute;
+  top: -5px;
+  right: 140px;
+  color: #fff;
+  box-sizing: border-box;
+  width: 170px;
+  text-align: center;
+  border-radius: 2px;
+  background-color: rgba(5, 16, 26, 0.6);
+  z-index: 5000;
+}
+
+.inviteTipbtn a {
+  font-size: 14px;
+  width: 100%;
+  height: 30px;
+  line-height: 30px;
+  display: block;
+  color: #747A7F;
+  background-color: rgba(5, 16, 26, 0.4)
+}
+
+.inviteTipbtn a:hover {
+  color: #4cacff !important;
+}
+
+.top-black-trangle {
+  display: block;
+  border-width: 8px;
+  position: absolute;
+  top: -16px;
+  right: 4px;
+  border-style: dashed solid dashed dashed;
+  border-color: transparent transparent rgba(5, 16, 26, 0.6) transparent;
+  font-size: 0;
+  line-height: 0;
+}
+
+/*动态*/
+
+.loadMore {
+  width: 100%;
+  background-color: #fff;
+  color: #4cacff !important;
+  text-align: center;
+  display: block;
+  letter-spacing: 1px;
+  box-sizing: border-box;
+  height: 110px;
+  line-height: 110px;
+}
+
+/*课堂设置*/
+
+.activity-left-name {
+  display: block;
+  max-width: 126px;
+  float: left;
+}
+
+/*帖子列表*/
+.panel-inner-fourm {
+  padding: 15px 20px;
+  border-bottom: 1px solid #eee;
+}
+
+.panel-inner-fourm:hover {
+  background: #EFF9FD;
+}
+
+/*---------------------------------我的粉丝和我的关注-------------------*/
+
+/*如何获得金币弹框*/
+
+/*课堂资源列表*/
+
+.resources {
+  width: 100% !important;
+  padding: 15px;
+  float: left;
+  box-sizing: border-box;
+  border-top: 1px solid #EEEEEE
+}
+
+.resources:last-child {
+  border-bottom: none;
+}
+
+/*资源标签*/
+#sourceTag li {
+  font-size: 12px;
+  color: #4E7A9B;
+  background-color: #E5F3FF;
+  padding: 0px 4px;
+  height: 20px;
+  line-height: 20px;
+  margin-left: 5px;
+  display: inline-block;
+  cursor: pointer
+}
+
+#sourceTag li a {
+  color: #4e7a9b !important;
+}
+
+#sourceTag li.active {
+  background-color: #4CACFF;
+  color: #fff;
+}
+
+#sourceTag li.active a {
+  background-color: #4CACFF;
+  color: #fff !important;
+}
+
+/*---------------------------------消息页----------------------------------*/
+.new-info {
+  height: 18px;
+  min-width: 18px;
+  line-height: 18px;
+  padding: 0px 2px;
+  box-sizing: border-box;
+  text-align: center;
+  background-color: #ff6800;
+  color: #fff;
+  border-radius: 30px;
+  display: block;
+  position: absolute;
+  right: 40px;
+  top: 13px;
+  font-size: 12px;
+}
+
+.ridingNav li {
+  float: left;
+  margin: 0px 20px;
+  color: #999;
+  font-size: 16px;
+  height: 60px;
+  line-height: 60px;
+  position: relative;
+}
+
+.ridingNav li a {
+  display: block;
+  width: 100%;
+  height: 100%;
+  color: #999999;
+}
+
+.ridingNav li.active a {
+  color: #05101A;
+}
+
+.ridingNav li.active:after {
+  content: '';
+  position: absolute;
+  bottom: 0px;
+  width: 100%;
+  height: 2px;
+  border-radius: 1px;
+  background-color: #05101A;
+}
+
+.new-point {
+  display: block;
+  width: 4px;
+  height: 4px;
+  border-radius: 50%;
+  background-color: #ff6800;
+}
+
+.ridinglist:hover {
+  background-color: #F5F5F5;
+}
+
+.ridinglist .ridinglist-sub {
+  border-bottom: 1px solid #F5F5F5;
+  padding: 25px 0px;
+  cursor: pointer;
+}
+
+.ridinglist:last-child .ridinglist-sub {
+  border-bottom: none;
+}
+
+/*私信*/
+.private-item {
+  padding: 30px 30px 30px 25px;
+  border-bottom: 1px solid #F5F5F5;
+  cursor: pointer
+}
+
+.private-item:hover {
+  background-color: #f5f5f5;
+}
+
+.private-item:last-child {
+  border-bottom: none;
+}
+
+.writeLetter_Info {
+  position: relative;
+  width: 100%;
+  height: 260px;
+  background-color: #F6F6F6;
+  cursor: default;
+  border-radius: 3px;
+}
+
+.writeLetter_text {
+  width: 100%;
+  border: none;
+  background-color: #F6F6F6;
+  outline: none;
+  height: 100%;
+  padding: 5px 5px 30px 5px;
+  border: 1px solid #EAEAEA;
+  box-sizing: border-box;
+  resize: none;
+}
+
+.longchar {
+  position: absolute;
+  background-color: #F6F6F6;
+  bottom: 1px;
+  color: #999999;
+  right: 10px;
+}
+
+.writeLetter_text:focus+.longchar {
+  background-color: #fff;
+}
+
+.recently_person {
+  position: absolute;
+  width: 100%;
+  top: 35px;
+  max-height: 300px;
+  overflow-y: auto;
+  border-radius: 4px;
+  box-shadow: 0px 1px 6px rgba(76, 76, 76, 0.2);
+  left: 0px;
+  z-index: 1;
+  background-color: #fff;
+  cursor: pointer;
+  display: none
+}
+
+.recently_item {
+  padding: 10px 20px;
+}
+
+.recently_name {
+  float: left;
+  line-height: 48px;
+  display: block
+}
+
+.recently_item:hover {
+  background-color: #F9F9F9;
+}
+
+/*私信对话框*/
+.private-list {
+  min-height: 660px;
+  max-height: 831px;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+.private-list .private-part {
+  padding-left: 20px;
+  cursor: pointer
+}
+
+.private-part:hover {
+  background-color: #F5F5F5;
+}
+
+.private-part.active {
+  background-color: #F5F5F5;
+}
+
+.privatePartName {
+  max-width: 70px;
+  float: left
+}
+
+.newLetter {
+  display: block;
+  width: 4px;
+  height: 4px;
+  background-color: #FF6800;
+  border-radius: 50%;
+  float: right
+}
+
+.part-line {
+  padding: 30px 20px 30px 0px;
+  border-bottom: 1px solid #f5f5f5;
+}
+
+.private-part:last-child .part-line {
+  border: none;
+}
+
+.dialogPanel {
+  padding: 0px 20px;
+  height: 545px;
+  overflow-y: auto
+}
+
+.letter-time {
+  width: auto;
+  padding: 0px 10px;
+  background-color: #999;
+  color: #fff;
+  border-radius: 10px;
+  height: 20px;
+  line-height: 20px;
+}
+
+.OtherSide,
+.ThisSide {
+  margin-top: 30px;
+}
+
+.OtherSide-info .trangle {
+  position: absolute;
+  left: -5px;
+  top: 10px;
+  width: 0;
+  height: 0px;
+  border-top: 6px solid transparent;
+  border-right: 5px solid #f5f5f5;
+  border-bottom: 6px solid transparent
+}
+
+.OtherSide-info .sms {
+  max-width: 300px;
+  padding: 10px 15px;
+  box-sizing: border-box;
+  background-color: #F5F5F5;
+  color: #666;
+  border-radius: 6px;
+  text-align: justify
+}
+
+.OtherSide-info .sms img {
+  max-width: 80px;
+  cursor: pointer
+}
+
+.ThisSide-info .sms p {
+  line-height: 20px;
+}
+
+.sms {
+  min-height: 48px;
+}
+
+.ThisSide .trangle {
+  position: absolute;
+  right: -5px;
+  top: 10px;
+  width: 0;
+  height: 0px;
+  border-top: 6px solid transparent;
+  border-left: 5px solid #4CACFF;
+  border-bottom: 6px solid transparent
+}
+
+.ThisSide-info .sms {
+  max-width: 300px;
+  padding: 10px 15px;
+  box-sizing: border-box;
+  background-color: #4CACFF;
+  color: #fff;
+  border-radius: 6px;
+  text-align: justify
+}
+
+.ThisSide-info .sms p {
+  line-height: 20px;
+}
+
+.ThisSide-info .sms img {
+  max-width: 80px;
+  cursor: pointer
+}
+
+
+/*-------------------竞赛----------------------*/
+
+.action {
+  color: rgb(5, 16, 26);
+}
+
+/*开源标注组*/
+
+/*.partTime.active .time{color:#ff3232; }*/
+
+.announcement {
+  padding: 20px 0px;
+  border-bottom: 1px solid #eee;
+}
+
+.announcement:last-child {
+  border-bottom: none;
+}
+
+.part {
+  width: 540px;
+  margin: 0px auto 10px;
+  background-color: rgba(25, 27, 32, .6)
+}
+
+/*报名入口页*/
+
+/*弹框*/
+
+/*东北赛区*/
+
+/*主页、列表页*/
+
+/*竞赛报名弹框*/
+
+/*ccf*/
+
+
+/*全国赛*/
+
+
+/*排行榜*/
+
+/*竞赛列表页*/
+
+
+/*顶部按钮*/
+.both {
+  clear: both;
+}
+
+.left {
+  float: left;
+}
+
+.right {
+  float: right;
+}
+
+/*顶部top容器*/
+
+/*顶部center容器*/
+
+
+
+
+
+
+
+/*面向学院管理员的综合统计页面*/
+
+.statistics_position {
+  position: absolute;
+  bottom: 22px;
+  left: 0px;
+  width: 100%;
+  left: 0px;
+}
+
+ul.count_ul li {
+  width: 300px;
+  position: relative;
+  float: left
+}
+
+ul.count_ul li span:first-child {
+  display: block;
+  width: 100%;
+  color: #989898;
+  margin-bottom: 20px;
+}
+
+ul.count_ul li span:last-child {
+  display: block;
+  width: 100%;
+  color: #fff;
+  font-size: 24px;
+  line-height: 20px;
+}
+
+ul.count_ul li:not(:last-child):after {
+  position: absolute;
+  content: '';
+  width: 1px;
+  height: 36px;
+  background-color: #999999;
+  right: 0px;
+  top: 16px;
+}
+
+.static_shadow {
+  box-shadow: 0px 0px 9px rgba(174, 175, 177, 0.2);
+}
+
+/*路径的合作团队增加使用情况统计页面*/
+.subject_statistics_top {
+  height: 240px;
+  width: 100%;
+  position: relative;
+  background-image: url('/images/educoder/subject_statistics.jpg');
+  background-size: 100% 100%;
+}
+
+
+/*------------------------------职业路径begin-----------------------------*/
+/*新建页*/
+
+/*详情页*/
+
+/*--课程介绍--*/
+
+/*--内容安排--*/
+
+
+
+/*------------------------------职业路径end-----------------------------*/
+
+
+/*智慧课堂-------------------------------资源详情列表页面改版*/
+
+#course_list {
+  overflow-y: auto;
+  background: #FFF;
+}
+
+.popup_tip_box {
+  right: -160px;
+  top: 55px;
+}
+
+.homepagePostSetting {
+  display: none;
+}
+
+.nodata {
+  text-align: center;
+  background-color: transparent;
+  border-color: transparent;
+  color: #000;
+}
+
+#attachments_fields span {
+  font-size: 12px;
+  color: #CCC;
+}
+
+.ml20mr20Color {
+  color: #676767;
+}
+
+/* .width100{
+    width: 92%;
+    padding: 0px 0px 0px 25px;
+} */
+
+.color-dark-grey {
+  color: #999 !important;
+}
+
+.colorFFF {
+  color: #FFF !important;
+}
+
+.left {
+  float: left;
+}
+
+.cancellation {
+  position: absolute;
+  top: 62px;
+  left: 177px;
+  color: #FFF !important;
+}
+
+.tabeltext-alignleft {
+  text-align: center;
+}
+
+.newshixun_tab_div {
+  padding: 0px 22px 0px -5px;
+  max-height: 90px;
+  overflow-y: auto;
+}
+
+
+/*在线课堂作业*/
+
+.newcolor-orange {
+  color: #FF6800;
+}
+
+.color4CACFF {
+  color: #4CACFF !important;
+  font-size: 16px;
+}
+
+.color979797 {
+  font-size: 14px;
+  color: #979797 !important;
+  padding-left: 2%;
+}
+
+.marginTop {
+  margin-right: 33%;
+  margin-top: 20px;
+}
+
+/*选择实训弹框*/
+
+/*选择实训弹窗*/
+
+.shixuns_count {
+  color: #05101A;
+  font-size: 14px;
+}
+
+#shixun_search_form_div {
+  margin-top: 20px;
+  margin-bottom: 20px !important;
+}
+
+.editormd-html-preview {
+  width: 100% !important;
+  color: #323232 !important;
+}
+
+.mt4 {
+  margin-top: 4px;
+}
+
+
+/*毕业设计*/
+
+
+/*----------------------------超级管理员------------------------------------*/
+
+/*工程认证*/
+
+/*合作伙伴*/
+
+
+/* 兼容（小屏幕）手机浏览器 */
+
+.newMain,
+.newFooter {
+  max-width: unset;
+}
+
+.educontentTop {
+  width: 1178px !important;
+}
+
+.inner-footer_con {
+  width: auto;
+}
+
+.careershover {
+  margin-right: 30px !important;
+}
+
+.careershover ul li a {
+  color: #000 !important;
+}
+
+.careershover ul li {
+  height: 35px !important;
+  line-height: 35px !important;
+}
+
+.edu-menu-listnew {
+  width: 165px !important;
+  top: 60px;
+  left: -42px;
+}
+
+.edu-menu-listnew li a {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: #000 !important;
+}
+
+.edu-menu-listnew li a:hover {
+  color: #fff !important;
+}
+
+
+/*工程认证*/
+/*首页*/
+
+.ListTableLine>p {
+  margin-bottom: 0px;
+  padding: 0px 30px;
+  background-color: #F5F5F5;
+  line-height: 40px;
+  height: 56px;
+  padding-top: 8px;
+  box-sizing: border-box;
+}
+
+.ListTableLine>p span {
+  float: left;
+  color: #666;
+  box-sizing: border-box
+}
+
+.ListTableLine li {
+  min-height: 48px;
+  padding: 10px 0px;
+  box-sizing: border-box;
+  margin: 0px 30px;
+  border-bottom: 1px solid #eaeaea;
+}
+
+.ListTableLine li>span {
+  float: left;
+  box-sizing: border-box;
+}
+
+.ListTableLine .column-1 {
+  width: 100px;
+  text-align: left;
+  padding-left: 5px;
+  box-sizing: border-box
+}
+
+.ListTableLine .column-1 {
+  width: 100px;
+  text-align: left;
+  padding-left: 5px;
+  box-sizing: border-box
+}
+
+.ListTableLine .column-2 {
+  width: 180px;
+  text-align: center;
+  padding-left: 5px;
+  box-sizing: border-box
+}
+
+.ListTableLine .column-3 {
+  width: 330px;
+  text-align: left;
+  padding-left: 5px;
+  box-sizing: border-box
+}
+
+.ListTableLine .column-4 {
+  width: 400px;
+  text-align: left;
+  padding-left: 5px;
+  box-sizing: border-box
+}
+
+/*具体学年*/
+
+/*培养目标*/
+#traningNav {
+  padding: 30px 30px 0px 0px;
+}
+
+#traningNav>li {
+  float: left;
+  padding: 0px 30px 30px 30px;
+  font-size: 16px;
+}
+
+#traningNav>li>a,
+#traningNav li>i {
+  color: #666 !important;
+  position: relative
+}
+
+#traningNav>li.active>a,
+#traningNav li.active>i {
+  color: #05101A !important;
+}
+
+#traningNav>li.active>a:after {
+  content: '';
+  position: absolute;
+  width: 64px;
+  left: 50%;
+  margin-left: -32px;
+  height: 2px;
+  background-color: #05101A;
+  bottom: -35px;
+}
+
+/*毕业要求VS培养目标*/
+
+.gaugeOutfit {
+  position: relative;
+  height: 70px;
+  width: 120px;
+  background: linear-gradient(30deg, transparent 49.5%, #eee 50%, #eee 50%, transparent 50.5%);
+}
+
+.gaugeOutfit span:first-child {
+  position: absolute;
+  left: 8px;
+  top: 46px;
+}
+
+.gaugeOutfit span:last-child {
+  position: absolute;
+  right: 8px;
+  top: 14px;
+}
+
+.sustainLine td:not(:first-child):hover {
+  background-color: rgba(41, 189, 139, 0.1);
+  cursor: pointer
+}
+
+/*毕业要求VS课程体系*/
+
+/*课程目标VS毕业要求指标点*/
+
+
+/*众包*/
+
+.packinput .ant-input {
+  height: 50px;
+  width: 749px;
+  border-color: #E1EDF8 !important;
+}
+
+.packinput {
+  width: 749px;
+}
+
+
+.packinput .ant-input-group-addon .ant-btn {
+  width: 140px !important;
+  font-size: 18px;
+  height: 50px;
+  background: rgba(76, 172, 255, 1);
+}
+
+.setissues {
+  width: 280px;
+  height: 50px;
+  background: rgba(76, 172, 255, 1);
+  border-radius: 4px;
+  margin-left: 15px;
+}
+
+.pagetype li {
+  color: #8F8F8F !important;
+}
+
+.mbf10 {
+  margin-bottom: -10px;
+}
+
+.PackageIndexNEIBanner {
+  width: 1200px;
+  height: 110px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 2px 6px 0px rgba(125, 125, 125, 0.26);
+  border-radius: 8px;
+}
+
+.padding110 {
+  padding: 39px 110px 0px;
+  box-sizing: border-box;
+}
+
+.borderccc {
+  border: 1px solid #ccc;
+}
+
+.input-100-40s {
+  width: 100%;
+  padding: 5px;
+  box-sizing: border-box;
+}
+
+.fafafas {
+  background-color: #fafafa !important;
+  height: 40px;
+}
+
+.fafafas:focus {
+  background-color: #fff !important;
+}
+
+.fafas .ant-input {
+  background-color: #fafafa !important;
+  height: 40px;
+}
+
+.fafas .ant-input:focus {
+  background-color: #fff !important;
+}
+
+.fafas .ant-input-group-addon .ant-btn {
+  width: 140px !important;
+  font-size: 14px;
+  height: 40px;
+  background: rgba(76, 172, 255, 1);
+}
+
+.newFormbox .upload_filename {
+  line-height: 32px;
+}
+
+.newFormbox .attachment span {
+  line-height: 23px;
+}
+
+.newFormbox .attachment .remove-upload {
+  line-height: 28px;
+}
+
+.newFormbox .attachment .icon-fujian {
+  font-size: 14px !important;
+  line-height: 14px;
+  margin-top: 9px;
+}
+
+.newFormbox {
+  height: 20px
+}
+
+.defalutCancelbtns {
+  display: block;
+  border: 1px solid #4CACFF !important;
+  background-color: #fff;
+  color: #4CACFF !important;
+  width: 130px;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  border-radius: 4px;
+}
+
+.defalutSubmitbtns {
+  background-color: #4CACFF;
+  height: 40px;
+}
+
+.defalutSubmitbtnmodels {
+  width: 127px;
+  height: 30px;
+  background-color: #4CACFF;
+}
+
+.padding200 {
+  padding: 115px 200px 215px 200px;
+}
+
+.fontcircle {
+  font-size: 80px;
+  display: inherit;
+}
+
+.sumbtongs {
+  font-size: 24px;
+  display: inherit;
+  text-align: center;
+}
+
+.terraces {
+  font-size: 16px;
+  display: inherit;
+  text-align: center;
+  color: #999;
+}
+
+.padding251 {
+  padding: 0px 245px;
+}
+
+.ml17 {
+  margin-left: 17px;
+}
+
+.project-package-items {
+  display: -webkit-flex;
+  display: flex;
+  flex-direction: row;
+  margin: 0px !important;
+  padding: 20px;
+  background: white;
+  margin-bottom: 0px !important;
+  box-shadow: none !important;
+}
+
+.publicpart.orangeGreen {
+  border-left: 80px solid #29BD8B;
+}
+
+.publicwords {
+  left: 3px;
+  top: 18px;
+}
+
+.project-packages-list .project-package-items .item-image {
+  width: 100px !important;
+}
+
+.height185 {
+  height: 185px;
+}
+
+.ContacttheTA {
+  width: 80px;
+  height: 26px;
+  font-size: 14px;
+  line-height: 26px;
+  display: block;
+  border: 1px solid #4CACFF !important;
+  background-color: #fff;
+  color: #4CACFF !important;
+  text-align: center;
+  border-radius: 4px;
+}
+
+.ContacttheTAs {
+  width: 80px;
+  height: 26px;
+  font-size: 14px;
+  line-height: 24px;
+  /*display: block;*/
+  border: 1px solid #fff !important;
+  background-color: #4CACFF;
+  color: #fff !important;
+  text-align: center;
+  border-radius: 4px;
+}
+
+.ml28 {
+  margin-left: 28px;
+}
+
+.longboxs {
+  font-size: 16px;
+  font-family: MicrosoftYaHei-Bold;
+  font-weight: bold;
+  color: rgba(5, 16, 26, 1);
+  border-left: 4px solid rgba(76, 172, 255, 1);
+  padding-left: 10px;
+  margin-bottom: 20px;
+}
+
+.padding020 {
+  padding: 0px 20px 20px;
+}
+
+.mtf3 {
+  margin-top: -3px;
+}
+
+.task-btn-nebules {
+  background: #fff !important;
+  color: #4CACFF !important;
+  border: 1px solid #4CACFF !important;
+  margin-left: 20px;
+  cursor: pointer;
+  display: inline-block;
+  padding: 0 12px;
+  letter-spacing: 1px;
+  text-align: center;
+  font-size: 14px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 2px;
+}
+
+.packageabsolute {
+  position: absolute;
+  right: -16px;
+  top: -7px;
+}
+
+.relativef {
+  position: relative;
+}
+
+.homehove:hover .ptext {
+  color: #4CACFF !important;
+}
+
+.homehove:hover .ContacttheTAs {
+  display: block;
+}
+
+.topsj {
+  position: absolute;
+  top: -6px;
+}
+
+.bottomsj {
+  position: absolute;
+  bottom: -6px;
+}
+
+.pagenoedits {
+  margin-left: 20px;
+  color: #ccc;
+}
+
+.pagemancenter {
+  text-align: center;
+}
+
+.ml0 {
+  margin-left: 0px;
+}
+
+.tabelcli {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 850px;
+  display: table-cell;
+}
+
+.mtf10 {
+  margin-top: -10px;
+}
+
+.padding26 {
+  padding: 26px;
+  box-sizing: border-box;
+}
+
+.pd26 {
+  padding: 26px;
+}
+
+.pd30a0 {
+  padding: 30px 30px 16px 30px;
+}
+
+.shaiContent li.shaiItem:hover span {
+  color: #fff !important;
+}
+
+.shaiContent li.shaiItem:hover i.iconfont {
+  color: #4CACFF !important
+}
+
+.detail_for_paragraph p {
+  white-space: pre-wrap;
+}
+
+.square-main p {
+  margin-bottom: 0 !important;
+}
+
+
+
+
+.markdown-body {
+  text-align: justify;
+  word-break: break-all;
+}
+
+.RightPaneDrawer .ant-drawer-content {
+  background: #070f1a;
+  overflow: hidden !important;
+}
+
+.deletebuttom {
+  border: transparent;
+}
+
+.RightPaneDrawer .jupyter_data_list {
+  max-height: 340px;
+}
+
+.ant-btn-primary {
+  text-shadow: none !important;
+  box-shadow: none !important;
+}
+
+.ant-notification {
+  z-index: 10001 !important;
+}
\ No newline at end of file
diff --git a/public/css/edu_public.css b/public/css/edu_public.css
deleted file mode 100644
index a1af7744..00000000
--- a/public/css/edu_public.css
+++ /dev/null
@@ -1,481 +0,0 @@
-/* 头部 */
-.header{ width:100%; height:51px;min-width:1200px;background:rgb(23, 22, 22);  }
-.header_con{ width:1200px; min-width:1200px; height:50px; margin:0 auto;}
-.new-logo img{ width:36px; height:36px;margin-top:7px; border-radius:3px; }
-.new-logo p{ font-size: 18px; color:#fff; line-height: 50px; }
-a.new-nav-a{ display: block; font-size: 14px; line-height: 50px; color:#fff;}
-a:hover.new-nav-a{ color:#ff7500; text-decoration: none;}
-.header-search{border-radius:3px; background:#fff;}
-.header-search a{text-decoration: none; color:#666!important;}
-.header-search a:hover{color:#ff7500!important;}
-input.header-search-input{ width:150px; height:30px; padding:0 5px; border-style: none; border: none;outline:none;}
-.innner-nav{ margin-left:40px;}
-.innner-nav li{float:left; margin-right:40px;}
-.innner-nav li a{ display: block; color:#fff; padding:0 10px; }
-.inner-btnbox02{ width:270px; margin: 30px auto 0;}
-.new-container-inner02{width:1200px; margin:0px auto; padding:50px 0;}
-.inner-nav-mes{ font-size:16px; color:#fff; margin-right:35px; margin-top:18px; }
-.inner-nav-cir{ background:#ff6530; color:#fff; border-radius:15px;padding:0 5px; display: inline-block; font-size:10px; height:17px; line-height:17px;}
-.inner-nav-user{ width: 75px; height: 45px; margin-top:5px; position: relative; padding-left: 0px;}
-.inner-nav-user-img{ width: 40px; height: 40px; border-radius:50px;}
-select.header-search-select{ border:none; font-size:14px; padding:5px; background: none;}
-.edu-unlogin-nav a{ color:#fff!important; font-size:14px; line-height:50px;}
-.edu-unlogin-nav a:hover{ color:#3b94d6;}
-.edu-unlogin-nav{ font-size:12px; color:#fff; line-height:50px;}
-
-.task-user-dropdown{font-size:12px; line-height: 1.9; width:120px; background-color:#fff; border-radius:3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:relative; top:5px; right:44px; display: none; z-index:999;}
-.task-user-dropdown font{ border: 1px solid #dddddd;   display: block; border-width: 8px; position: absolute; top: -13px;left:100px; border-style:solid; border-color: transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
-.task-user-dropdown-nav { padding-top:5px; }
-.task-user-dropdown-nav li { display: inline-block; text-align: center;  width:100%; height: 30px; line-height: 30px;}
-.task-user-dropdown-nav li:hover{ background:#eee;}
-.task-user-dropdown-nav li:hover a{color: #FF7500!important;}
-.task-line{ display: block; height: 1px!important; line-height: 1px!important; border-bottom:1px solid #eee; margin:0;}
-.inner-nav-user:hover .task-user-dropdown{ display:block;}
-dropdown { display: inline-block; height:30px; line-height:1.9; font-size:12px; }
-dropdown label, dropdown ul li{ display: block; width:42px; padding:4px 10px; text-align: center;border-radius:3px; color:#666;}
-dropdown ul li:hover{background: #eee; color:#666;cursor: pointer;}
-dropdown label{color: #666;border-radius: 3px 0 0 3px;  position: relative; z-index: 2; width:50px; text-align: center; height:22px;}
-dropdown input{display: none;}
-dropdown input:checked + label{ background: #fff;color:#666;}
-dropdown ul{ position: absolute; visibility: visible; opacity: 1; top: 38px; background: #fff; z-index: 99; border-radius:3px;}
-$colors: #fff, #0072B5, #2C3E50;
-@for $i from 1 through length($colors) {
-    dropdown ul li:nth-child(#{$i}) {
-        border-left: 4px solid nth($colors, $i);
-    .fa{
-        color: nth($colors, $i);
-    }
-&:hover {
-     background: nth($colors, $i);
-     color: white;
-    .fa{
-        color: white;
-    }
-}
-}
-}
-
-.edu-dropdown{ position: relative; padding:0 15px; }
-.edu-dropdown-menu{ background-color:#fff; text-align: center;  border-radius:3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:absolute; top:25px; left:0px; z-index: 999;   display:none;}
-.edu-dropdown-menu li{ height:30px; line-height:30px; display: block; padding:0 15px; text-align: left;}
-.edu-dropdown-menu li label{ cursor: pointer;}
-.edu-dropdown-menu li:hover{ color: #FF7500!important;}
-/*.edu-dropdown:hover .edu-dropdown-menu{ display: block;}*/
-.animate{ -webkit-transition: all .3s; -moz-transition: all .3s; -ms-transition: all .3s; -ms-transition: all .3s;
-    transition: all .3s;   backface-visibility:hidden; -webkit-backface-visibility:hidden; /* Chrome and Safari */ -moz-backface-visibility:hidden; /* Firefox */ -ms-backface-visibility:hidden; /* Internet Explorer */}
-/* 底部 */
-.footer{width:100%; height:100px; background-color:#fff; }
-.footer_con{ width:1200px; height:100px; margin:0 auto; text-align: center;  padding:20px 0; }
-.footer_con-inner{ width: 300px; margin:0px auto;}
-.footer_con-inner li a{ font-size: 16px; color: #888;display: block;padding:0 15px; border-right: solid 1px #888;}
-.footer_con-inner li a:hover{text-decoration: underline;}
-.footer_con-p{ color: #888; margin-top:10px;}
-.inner-footer{ width: 100%; min-width:1200px; background:#323232; padding-bottom:30px;}
-.inner-footer_con{ width: 1200px; margin: 0 auto;}
-.inner-footer-nav{ height: 50px; border-bottom:1px solid #47494d;}
-.inner-footer-nav li a{ float: left; margin-right:15px; font-size: 14px; color: #888; line-height: 50px;}
-.saoma-box{ position: relative;}
-.saoma-img-box{  position: absolute; top:-300px; left: -86px; border-radius:3px; background:#fff; padding:15px;box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); display: none;}
-.saoma-box  li:hover ul{display:block; }
-.img-show{ width:50px; height:50px; border-radius:50px; }
-.saoma-img-box font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top:289px;left: 103px; border-style:solid; border-color:#fff transparent transparent  transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
-.inner-footer-p-big{ display: block; height: 50px; line-height: 50px; color:#888; font-size: 16px; border-left:2px solid #888; padding-left:15px;}
-.inner-btnbox02{ width:270px; margin: 30px auto 0;}
-.new-container-inner02{width:1200px; margin:0px auto; padding:50px 0;}
-img.edu-footer-logo{  height: 50px;}
-/************布局 byLB****************/
-.panel-content{ width: 1200px; margin:20px auto; background:#eaebec;}
-.panel-contentss{ width: 1200px; margin:10px auto; margin-bottom:20px; background:#fff;}
-/************讨论区20170321 byLB****************/
-.panel-inner-fourm{ padding:20px; border-bottom:1px solid #eee;}
-.panel-inner-fourm:hover{ background:#EFF9FD;}
-.nobg:hover{ background:#fff;}
-a.panel-list-title,.panel-list-title { display:inline-block; font-size: 16px; color: #333; font-weight:normal; max-width:82%;}
-a:hover.panel-list-title{color:#FF7500;}
-.panel-list-img{ width: 60px; height: 60px; border-radius:100px;}
-a.panel-name-small{ display: inline-block; max-width:100px; color:#29bd8b; font-size:12px; }
-.panel-list-infobox{ width: 92%; margin-left:8%; margin-top:-70px;}
-.panel-lightgrey,.panel-lightgrey span{  font-size:12px; color:#888;}
-.panel-inner-info{ width: 93%; margin-left:7%;}
-.panel-bg-grey{ padding:5px 0;background:#f6f6f6; width: 100%; color:#666;}
-.panel-list-nodata{ width: 420px; margin:100px auto; text-align: center;}
-
-/*班级讨论区panel 2017/07/20   cs*/
-.panel-content-box{background: #FFFFFF;}
-.panel-content-line{width: 90%;margin: 30px 5%;}
-.panel-content-line .panel-line-left{width: 8%;text-align: right;}
-.panel-content-line .panel-content-label{height: 40px;line-height: 40px}
-.panel-content-line .panel-content-input{width: 90%;height: 28px;padding: 5px;}
-.panel-content-line .panel-content-ta{width: 90%;min-height: 148px;padding: 5px;}
-/* 回复评论 */
-.panel-comment_item{ width: 100%; }
-.panel-comment_item .t_area{ color:#888;}
-.comment_item_cont{ padding:15px; border-bottom:1px solid #e3e3e3;}
-.comment_item_cont .J_Comment_Face{height: 50px}
-.comment_item_cont .J_Comment_Face img{ width:50px; height:50px; border-radius:100px; }
-.panel-comment_item .t_content{ width:93%; margin-left:15px;}
-.panel-comment_item a.content-username {font-size:14px; margin-right:15px; display:inline-block; max-width:100px;color: #888888}
-.J_Comment_Info{height: 20px;line-height: 22px;}
-/*.panel-comment_item a:hover.content-username{color:#FF7500;}*/
-.panel-comment_item .orig_user img{width:40px; height:40px;border-radius:100px; }
-.panel-comment_item .reply-right{ float:right; position:relative;}
-.panel-comment_item .reply_iconup02{ position:absolute; top:22px; left:14px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
-.panel-comment_item .comment_orig_content{margin:10px 0; color:#999;}
-.panel-comment_item .comment_orig_content .comment_orig_content{margin-top:0; color:#666;}
-.panel-comment_item .orig_cont{ border:solid 1px #F3DDB3; background:#FFFEF4; padding:4px;color:#999;margin-top:-1px; }
-.panel-comment_item .orig_cont_sub{ border-top:0}
-.panel-comment_item .comment_orig_content .orig_index{ float:right; color:#666; font-family:Arial; padding-right:5px;line-height:30px;}
-.panel-comment_item .comment_orig_content .orig_user{ margin:10px 15px 10px 5px;}
-.panel-comment_item .comment_orig_content .orig_user span{ color:#999; padding-right:5px;}
-.panel-comment_item .comment_orig_content .orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; }
-.panel-comment_item .orig_right{ width:80%; margin-top:5px;}
-.panel-comment_item .orig_right img{max-width:100%;}
-.panel-comment_item a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; }
-.panel-comment_item a:hover.comment_ding_link{ color:#269ac9;}
-.panel-comment_item .comment_ding_link span{display: inline-block;padding: 0 0px 0 8px;}
-.panel-comment_item .comment_ding_link em{font-style: normal;font-family:arial;}
-.panel-comment_item .comment_reply_link{  display:inline-block; width:50px; height:24px;line-height: 24px; vertical-align:middle;text-align: center;}
-.panel-comment_item .comment_reply_link:link,.comment_reply_link:visited{color:#333;text-decoration: none;}
-.panel-comment_item .comment_content{ color:#666;}
-.comment_content img,.orig_content img{max-width: 100%}
-.panel-comment_item .t_txt{ margin-top:10px;}
-.panel-comment_item .orig_reply_box{border-top:1px solid #e3e3e3; width:100%;padding: 15px 0px 0px 0;margin-top: 5px;}
-.panel-comment_item .orig_textarea{width:90%;  margin-bottom:10px;}
-.panel-comment_item .orig_textarea02{ border:1px solid #ccc; background-color:#fff; width:92%;  margin-bottom:10px;}
-.panel-comment_item .orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
-.panel-comment_item .orig_sub:hover{ background:#297fb8;}
-.panel-comment_item .orig_cont_hide{ text-align:center; width:100%; display:block; font-size:14px; color:#666; border-bottom:1px solid #F3DDB3; padding:8px 0;}
-.panel-comment_item .orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;}
-.orig_reply{ font-size: 12px; }
-.panel-mes-head{ padding:10px; border-bottom:1px solid #eee;}
-.homepagePostReplyPortrait a img{border-radius: 100px;}
-/* 表格 */
-.panel-new-table { width:100%; text-align: center; }
-.panel-new-table tr th{ color:#333; height: 50px;line-height:50px; }
-.panel-new-table tr th,.panel-new-table tr td{ border-bottom:1px solid #eee; }
-.panel-new-table tr td{color:#666; height: 40px; line-height:40px;}
-.panel-table-pd15 tr td{ padding:15px 0;}
-.panel-new-table tbody tr:hover{ background:#f9f9f9;}
-a.panel-table-name{display:block; max-width:100px;text-align:center;}
-a.panel-table-title{display:block; max-width:240px;text-align:center;}
-.table-num{ width:5%; text-align: center;}
-/* 滑动条 */
-.panel-slider-bg{ width:240px; height: 15px; border-radius:15px; background:#f1f2f7; }
-.panel-slider-inner00{ display:block;  width:0%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner01{ display:block;  width:10%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner02{ display:block;  width:20%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner03{ display:block;  width:30%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner04{ display:block;  width:40%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner05{ display:block;  width:50%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner06{ display:block;  width:60%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner07{ display:block;  width:70%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner08{ display:block;  width:80%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner09{ display:block;  width:90%; height: 15px; border-radius:15px; background:#29bd8b;}
-.panel-slider-inner10{ display:block;  width:100%; height: 15px; border-radius:15px; background:#29bd8b;}
-/* 翻页 */
-.panel-pages a{ display: inline-block;  border:1px solid #d1d1d1; color:#888; float:left;text-align:center; padding:0 10px; margin-right:5px; height: 30px; line-height: 30px; }
-.panel-pages a:hover,.panel-pages .active{  background-color:#29bd8b; border:1px solid #29bd8b;color:#fff; }
-.panel-pages{ width: 350px; margin:20px auto;}
-/* 翻页*/
-.pages_right_min a{ display: inline-block;border:1px solid #d1d1d1; color:#888!important; float:left;text-align:center; padding:3px 10px; line-height:1.9; margin: 0 5px;}
-.pages_right_min a.pages-border-right{border-right:1px solid #d1d1d1; }
-.pages_right_min a:hover,.pages_right_min a.active{  background-color:#FC7033; color:#fff!important;border:1px solid #FC7033}
-.pages_right_min li{float: left;}
-/* 个人主页翻页 */
-.pages_user_show a:hover,.pages_user_show a.active{  background-color:#FC7033;; color:#fff;border: 1px solid #FC7033;}
-.pages_user_show a{ display: inline-block;border:1px solid #d1d1d1; color:#888; float:left;text-align:center; padding:3px 10px; line-height:1.9; margin: 0 5px;}
-.pages_user_show li{float: left; list-style-type: none;}
-.pages_user_show ul li{list-style-type: none !important;}
-.pages_user_show ul li a{color:#888}
-/* 小翻页 */
-.pages_little_show a:hover,.pages_little_show a.active{  background-color:#FC7033;; color:#fff!important;border:1px solid #FC7033}
-.pages_little_show a{ display: inline-block;border:1px solid #d1d1d1; color:#888!important; float:left;text-align:center; padding:3px 3px; line-height:1.9; margin: 0 2px; font-size: 12px;}
-.pages_little_show li{float: left;}
-/* 搜索*/
-.panel-search{ position: relative;}
-input.panel-search-input{ height: 30px; width:300px; color: #666;}
-.panel-search-btn{ position: absolute; top:2px; right:10px;}
-/* 表单*/
-.label-w20{ width:20%!important;}
-.panel-form-label{ display:inline-block; width:10%; min-width:90px; text-align:right; line-height:40px; font-weight: normal; }
-.panel-form input,.panel-form textarea,.panel-form select{ border:1px solid #e2e2e2;color:#666;line-height: 1.9; background:#fff;}
-.panel-box-sizing{-moz-box-sizing: border-box;  /*Firefox3.5+*/-webkit-box-sizing: border-box; /*Safari3.2+*/-o-box-sizing: border-box; /*Opera9.6*/-ms-box-sizing: border-box; /*IE8*/box-sizing: border-box; border-radius:3px;}
-input.panel-form-width-690{ padding:5px;width:90%; height:40px; }
-input.panel-form-width-100{ padding:5px;width:100%; height:40px;}
-input.panel-form-width-45{ padding:5px;width:44.5%; height:40px; }
-input.panel-form-width-50{ padding:5px;width:44.5%; height:25px; }
-input.panel-form-width-60{ padding:5px;width:60%; height:40px; }
-textarea.panel-form-width-100{ padding:5px;width:100%; height:150px; }
-textarea.panel-form-width-690{ padding:5px;width:90%; height:150px; }
-.panel-form-width-670{ width: 670px; padding:5px;}
-.panel-form-height-150{ height: 150px;}
-.panel-form-height-30{height: 30px;}
-.task-bg-grey{ background:#f3f3f3; width:90%; min-width:700px; padding:10px; border:1px solid #f3f3f3; color:#888;}
-.task-bg-grey02{ background:#f3f3f3; width:80%; min-width:700px; padding:7px 10px; border:1px solid #f3f3f3; color:#888;}
-
-input.task-form-10,textarea.task-form-10,select.task-form-10,.task-form-10{padding:5px;width:10%;box-sizing: border-box}
-input.task-form-15,textarea.task-form-15,select.task-form-15,.task-form-15{padding:5px;width:15%;box-sizing: border-box}
-input.task-form-20,textarea.task-form-20,select.task-form-20,.task-form-20{padding:5px;width:20%;box-sizing: border-box}
-input.task-form-30,textarea.task-form-30,select.task-form-30,.task-form-30{padding:5px;width:30%;box-sizing: border-box}
-input.task-form-35,textarea.task-form-35,select.task-form-35,.task-form-35{padding:5px;width:35%;box-sizing: border-box}
-input.task-form-40,textarea.task-form-40,select.task-form-40,.task-form-40{padding:5px;width:40%;box-sizing: border-box}
-input.task-form-45,textarea.task-form-45,select.task-form-45,.task-form-45{padding:5px;width:45%;box-sizing: border-box}
-input.task-form-50,textarea.task-form-50,select.task-form-50,.task-form-50{padding:5px;width:50%;box-sizing: border-box}
-input.task-form-60,textarea.task-form-60,select.task-form-60,.task-form-60{padding:5px;width:60%;box-sizing: border-box}
-input.task-form-70,textarea.task-form-70,select.task-form-70,.task-form-70{padding:5px;width:70%;box-sizing: border-box}
-input.task-form-80,textarea.task-form-80,select.task-form-80,.task-form-80{padding:5px;width:80%;box-sizing: border-box}
-input.task-form-90,textarea.task-form-90,select.task-form-90,.task-form-90{padding:5px;width:90%;box-sizing: border-box}
-input.task-form-100,textarea.task-form-100,select.task-form-100,.task-form-100{padding:5px;width:100%;}
-input.task-height-40,textarea.task-height-40,.task-height-40,select.task-height-40{height:40px;}
-input.task-height-30,textarea.task-height-30,.task-height-30,select.task-height-30{height:32px;}
-input.task-height-220,textarea.task-height-220,.task-height-220{height:220px;}
-input.task-height-150,textarea.task-height-150,.task-height-150{height:150px;}
-input.task-height-100,textarea.task-height-100,.task-height-100{height:100px;}
-input.task-height-80,textarea.task-height-80,.task-height-80{height:80px;}
-
-/*头像下拉弹框*/
-.my_account_info{ width:160px; background-color:#fff; border-radius: 3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:absolute; font-size: 14px; top:46px; left:-97px;display: none; z-index:999;}
-.my_account_info li a{ color: #888;}
-.my_account_info font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color:  transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
-.my_account_info li{ padding-left: 5px; line-height: 1.5;}
-.li_bottom_border{ border-bottom:1px solid #eee;}
-a.task-index-name{ display: inline-block; max-width:80px;}
-.task-index-name{ display: inline-block; max-width:80px;}
-
-/*滑块验证*/
-.drag_slider{ position: relative; background-color: #e8e8e8; width:100%; height: 45px; line-height: 45px; text-align: center;border-radius: 4px;}
-.drag_slider .handler{ border-radius: 4px 0px 0px 4px;position: absolute; top: 0px; left: 0px; width: 50px; height: 43px; border: 1px solid #eee; cursor: move;}
-.handler_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;}
-.handler_ok_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;}
-.drag_slider .drag_bg{ background-color: #29bd8b; height: 45px; width: 0px;}
-.drag_slider .drag_text{border-radius: 4px 0px 0px 4px;position: absolute; top: 0px; width: 100%; -moz-user-select: none; -webkit-user-select: none; user-select: none; -o-user-select:none; -ms-user-select:none;}
-
-
-/*新建新增*/
-/*.edu-con-top{ padding:10px 0; background:#fff; border-bottom:1px solid #eee;font-size:16px; }*/
-/*.edu-con-top h2{ font-size:16px;}*/
-/*.edu-con-bg01{ width: 100%; background:#fff;}*/
-/*.edu-con-top .color-grey{ color:#666!important;}*/
-
-/*附件上传的样式*/
-.atta_input{ width: 980px; white-space: nowrap; text-overflow:ellipsis;}
-
-/*作业描述、帖子内容*/
-.upload_img img{max-width: 100%;}
-.table_maxWidth table {max-width: 642px;}
-.list_style ol li{list-style-type: decimal;margin-left: 40px;}
-.list_style ul li{list-style-type: disc;margin-left: 40px;}
-
-/*数据为空公共页面*/
-img.edu-nodata-img{ width:200px; margin:50px auto 20px; display: block;}
-.edu-nodata-p{ font-size: 16px; text-align: center; color:#888;border-bottom:none!important;}
-
-/* new tab */
-.edu-tab{ width: 100%; background:#fff;}
-#edu-tab-nav{height:47px;background: #fff;}
-#edu-tab-nav li.new-tab-nav {float:left; width: 150px; text-align:center;height:48px;line-height:48px;border-top-right-radius:5px;border-top-left-radius:5px; }
-#edu-tab-nav li a{font-size:14px; }
-#edu-user-tab-nav{height:40px;background: #fff; border-bottom:2px solid #FC7033;}
-#edu-user-tab-nav li.new-tab-nav {float:left; width: 120px; text-align:center;height:42px;line-height:42px;border-top-left-radius: 5px;border-top-right-radius:5px}
-#edu-user-tab-nav li a{font-size:14px; }
-.edu-new-tab-hover { background:#5faee3; }
-.edu-user-tab-hover{background:#FC7033;}
-.edu-user-tab-hover a{color:#fff!important;}
-.edu-new-tab-hover a{color:#fff!important;}
-.edu-class-con-list:hover{ background:#EFF9FD;}
-.edu-bg-shadow{box-shadow: 0px 0px 5px rgba(146, 153, 169, 0.2);}
-a.task-btn-line{display: inline-block;font-weight: bold;padding: 0 12px;color: #666;background: #fff;letter-spacing: 1px;text-align: center;font-size: 14px;height: 30px;line-height: 30px;border-radius: 3px;  border:1px solid #ccc;}
-a:hover.task-btn-line{ border:1px solid #3498db;background:#3498db;color: #fff;}
-
-/*阴影*/
-.user_bg_shadow{-webkit-box-shadow: 0 0 8px 0 rgba(142,142,142,.1);-moz-box-shadow: 0 0 8px 0 rgba(142,142,142,.1);box-shadow: 0 0 8px 0 rgba(142,142,142,.1);}/*四边阴影*/
-.user_bg_shadow_notop{-webkit-box-shadow: 0 3px 8px 0 rgba(142,142,142,.1);-moz-box-shadow: 0 3px 8px 0 rgba(142,142,142,.1);box-shadow: 0 3px 8px 0 rgba(142,142,142,.1);}/*没有上边阴影*/
-/*阴影+边框*/
-.shadow_border{border:1px solid #eee;-webkit-box-shadow: 0 0 8px 0 rgba(142,142,142,.1);-moz-box-shadow: 0 0 8px 0 rgba(142,142,142,.1);box-shadow: 0 0 8px 0 rgba(142,142,142,.1);}
-.shadow_border_notop{border:1px solid #eee;-webkit-box-shadow: 0 3px 8px 0 rgba(142,142,142,.1);-moz-box-shadow: 0 3px 8px 0 rgba(142,142,142,.1);box-shadow: 0 3px 8px 0 rgba(142,142,142,.1);}
-.user_bg_shadow01{-webkit-box-shadow: 0 1px 2px 2px rgba(123, 123, 123, 0.15);-moz-box-shadow: 0 1px 2px 2px rgba(123, 123, 123, 0.15);box-shadow: 0 1px 2px 2px rgba(123, 123, 123, 0.15);}
-.user_bg_shadow02{-webkit-box-shadow: 0 2px 8px 0 rgba(123, 123, 123, 0.15);-moz-box-shadow: 0 2px 8px 0 rgba(123, 123, 123, 0.15);box-shadow: 0 2px 8px 0 rgba(123, 123, 123, 0.15);}
-.box_bg_shandow {box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);}
-
-/*新增的公用样式*/
-.box-boxshadow{box-shadow: 3px 3px 10px rgba(146, 153, 169, 0.2);}
-.prop-notice-info{padding: 10px;border:1px solid #F3DDB3;background-color: #FFFEF4;}
-.prop-notice-info ol{list-style-type: disc;list-style-position:inside}
-.prop-notice-info ol li{list-style-type: disc;color: #ff6532;margin-bottom:0!important;}
-
-/*input框移出后没有内容将边框阴影变为红色*/
-.notinput_bg_shadow{border: none;box-shadow: 0px 0px 4px rgba(227,53,37,1);}
-/*设置input框的placehoder的字体颜色*/
-input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color: #cccccc}
-input::-moz-placeholder,textarea::-moz-placeholder { color:#cccccc;}
-input::-moz-placeholder,textarea::-moz-placeholder { color:#cccccc;}
-input::-ms-input-placeholder,textarea::-ms-input-placeholder {color:#cccccc;}
-/*班级讨论区置顶的样式*/
-.btn-cir {display: inline-block;padding: 0px 5px;border-radius: 25px;line-height: 20px;font-size: 12px;}
-.btn-cir:hover{background:#fff;color:#333333}.all_work_border{border: 1px solid #4c515d;}/*TPI全部任务的数量需要加一个边框*/
-.btn-cir-grey{background: #e1e1e1;color: #8c8c8c;font-weight: normal;border: 1px solid #e1e1e1}
-.btn-cir-red{background:red;color: #fff; font-weight: normal;}
-.btn-cir-red:hover{background:red;}
-.btn-cir-orange {background: #ff7500; color: #fff; font-weight: normal;border: 1px solid #ff7500}
-.btn-top{display: inline-block;padding: 0px 5px;line-height: 20px;font-size: 12px;border-radius: 3px;}
-.btn-cir-big{ background: #999;color: #fff;display: inline-block; padding:0px 10px; border-radius:25px;  line-height:25px; height: 25px; font-size:12px;}
-/*圆形绿色背景---------22*/
-.panel-inner-icon{width: 22px;height: 22px;line-height: 22px;border-radius: 50%;background: #29bd8b;display: block;text-align: center}
-.panel-inner-icon{width: 22px;height: 22px;line-height: 22px;border-radius: 50%;background: #29bd8b;display: block;text-align: center}
-/*圆形绿色背景------------------18*/
-.panel-inner-icon18{width: 18px;height: 18px;line-height: 18px;border-radius: 50%;background: #29bd8b;display: block;text-align: center}
-
-/*---------------块右上角的三角形，颜色为浅橙色*/
-.triangle-topright {position: absolute;right: -1px;top:0px;width: 0;height: 0;border-top: 35px solid #FF9E6A;border-left: 60px solid transparent;z-index: 1}
-.triangle-font{position: absolute;right: 1px;top: 2px;z-index: 2;font-size: 12px;color: white;transform: rotate(31deg);}
-.triangle-font2{position: absolute;right: 1px;top: -5px;z-index: 2;font-size: 12px;color: white;transform: rotate(31deg);}
-
-/* colorbox
-*******************************************************************************/
-/*
-    Colorbox Core Style:
-    The following CSS is consistent between example themes and should not be altered.
-*/
-#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:99999; overflow:hidden;}
-#cboxWrapper {max-width:none;}
-#cboxOverlay{position:fixed; width:100%; height:100%;}
-#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
-#cboxContent{position:relative;}
-#cboxLoadedContent{overflow:auto; -webkit-overflow-scrolling: touch;}
-#cboxTitle{margin:0;}
-#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
-#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
-.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;}
-.cboxIframe{width:100%; height:100%; display:block; border:0; padding:0; margin:0;}
-#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
-
-/*
-    User Style:
-    Change the following styles to modify the appearance of Colorbox.  They are
-    ordered & tabbed in a way that represents the nesting of the generated HTML.
-*/
-#cboxOverlay{background:#fff;}
-#colorbox{outline:0;}
-#cboxTopLeft{width:25px; height:25px; background:url(/images/colorbox/border1.png) no-repeat 0 0;}
-#cboxTopCenter{height:25px; background:url(/images/colorbox/border1.png) repeat-x 0 -50px;}
-#cboxTopRight{width:25px; height:25px; background:url(/images/colorbox/border1.png) no-repeat -25px 0;}
-#cboxBottomLeft{width:25px; height:25px; background:url(/images/colorbox/border1.png) no-repeat 0 -25px;}
-#cboxBottomCenter{height:25px; background:url(/images/colorbox/border1.png) repeat-x 0 -75px;}
-#cboxBottomRight{width:25px; height:25px; background:url(/images/colorbox/border1.png) no-repeat -25px -25px;}
-#cboxMiddleLeft{width:25px; background:url(/images/colorbox/border2.png) repeat-y 0 0;}
-#cboxMiddleRight{width:25px; background:url(/images/colorbox/border2.png) repeat-y -25px 0;}
-#cboxContent{background:#fff; overflow:hidden;}
-.cboxIframe{background:#fff;}
-#cboxError{padding:50px; border:1px solid #ccc;}
-#cboxLoadedContent{margin-bottom:20px;}
-#cboxTitle{position:absolute; bottom:0px; left:0; text-align:center; width:100%; color:#999;}
-#cboxCurrent{position:absolute; bottom:0px; left:100px; color:#999;}
-#cboxLoadingOverlay{background:#fff url(/images/colorbox/loading.gif) no-repeat 5px 5px;}
-/* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
-#cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; width:auto; background:none; }
-/* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
-#cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;}
-#cboxSlideshow{position:absolute; bottom:0px; right:42px; color:#444;}
-#cboxPrevious{position:absolute; bottom:0px; left:0; color:#444;}
-#cboxNext{position:absolute; bottom:0px; left:63px; color:#444;}
-#cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;}
-
-/*-----下拉框--------*/
-.down-select{display:none;position: absolute;z-index: 10;left: 0px;width: 100%;overflow-y: auto;background: #fff;max-height: 200px;}
-.down-select p{height: 35px;line-height: 35px;padding-left: 5px;}
-.down-select p:hover{background: #f3f4f6}
-
-/*课程、实训的条状样式*/
-.homepage-list-show p{height:70px;line-height:70px;}
-.homepage-list-show p:nth-child(odd){background:#fafbfb;}
-.homepage-list-show p .first{width:58%;display:inline-block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.homepage-list-show p .hasmargin{width:23%;display:inline-block;text-align: center;color:#888;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.homepage-list-show p .haspadding{width:16.7%;display:inline-block;margin-right:12%;color:#888;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.homepage-list-show p .last{width:8.33%;display:inline-block;color:#888;cursor: pointer; display: none;}
-.homepage-list-show p .last:hover{color:#5faee3;}
-.homepage-list-show p .last:hover .blue{color:#5faee3;}
-
-/*-----课程名称下拉框--------*/
-.course_list_ul,.down-list{ overflow-y: scroll;display: none;position: absolute;top:40px;left: -1px;width: 100% !important;border:1px solid #eeeeee;background: #FFFFFF;max-height: 150px;z-index: 10}
-.course_list_ul li{height:20px;padding:5px 10px;clear:both;line-height:28px;margin-bottom: 0 !important;cursor: pointer;}
-.down-list li{text-align: left;outline: none;padding: 5px 10px;clear: both;line-height: 22px!important;margin-bottom: 0 !important;cursor: pointer;width: 100%;box-sizing: border-box;height: 30px;border: none!important;}
-.down-list li:hover{background: #eee}
-.down-list{top:32px}
-.unit-part{border:1px solid #ccc;padding: 0px 8px;border-radius: 5px;margin-right: 10px}
-.unit-part input{border: none!important;text-align: left;width:auto;outline: none}
-/*-----试卷提交状态--------*/
-.post_status_btn{display: block;float: left;padding: 0px 5px;font-size: 12px;color: #FFFFFF;border-radius: 4px;height: 20px;line-height: 20px;;}
-.post_btn_green{background: #29bd8b;border: 1px solid #29bd8b!important;color: #fff;}
-.post_btn_green_q{background: #5ECFBA;border: 1px solid #5ECFBA!important;color: #fff;}
-.post_btn_orange{background: #FF7500;border: 1px solid #FF7500!important;color: #fff;}
-.post_btn_red{background: #ee4a1f;border: 1px solid #ee4a1f!important;color: #fff;}
-.post_btn_grey{background: #e4e4e3;border: 1px solid #e4e4e3!important;}
-.post_btn_white{background: #ffffff;}
-/*评阅状态*/
-.checkstatus_box_small{width: 10px;height: 10px;display: block;float: left;margin-right: 3px;}
-.checkstatus_box_big{cursor: default;width: 30px;height: 30px;line-height: 30px;text-align: center;margin-right: 10px;border:1px solid #CCCCCC;display: block;float: left;margin-bottom: 10px}
-.checkstatus_box_big i{position: absolute;top:18px;left: 10px;}
-
-/*个人主页头部认证圆形背景*/
-.user-info-span{border-radius: 50%;float:left;background: #F3F5F7;text-align: center;width: 23px;height: 23px;line-height: 23px;margin-top: 3px;margin-right: 5px}
-
-/*试卷答题倒计时*/
-.time_panel span.factorial{float: left;display: block;line-height: 35px;padding: 0px 3px;}
-.time_panel span.time{float: left;display: block;color: #ffffff;background-color: #333333;font-size: 16px;border-radius: 5px;letter-spacing: 1px;width: 33px;text-align: center;line-height: 35px;height: 35px;}
-
-.hidemsg{overflow: hidden;cursor: pointer}
-.hidemsg div{
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    margin: auto;
-    opacity:0.4;
-    background-color: #ffffff;
-    -webkit-border-radius: 100%;
-    -moz-border-radius: 100%;
-    -o-border-radius: 100%;
-    -ms-border-radius: 100%;
-    -webkit-animation-fill-mode: both;
-    -moz-animation-fill-mode: both;
-    -ms-animation-fill-mode: both;
-    -o-animation-fill-mode: both;
-    width: 80px;
-    height: 80px;
-    -webkit-animation: ball-scale 1s 0s ease-in-out infinite;
-    -moz-animation: ball-scale 1s 0s ease-in-out infinite;
-    -ms-animation: ball-scale 1s 0s ease-in-out infinite;
-    -o-animation: ball-scale 1s 0s ease-in-out infinite;
-    animation: ball-scale 1s 0s ease-in-out infinite;
-}
-@keyframes ball-scale{
-    0%{width: 0px;height: 0px}
-    100%{width: 80px;height: 80px}
-}
-
-/*-------------------个人主页关注和粉丝列表改版         以及TPM合作者部分改版 2018/01/15-------------------------*/
-.-task-con-int .favour .fens-table-list{display: flex;width:21.29%;margin:0px 1.5% 1.5% 0px;min-height: 125px;border: 1px solid #EEEEEE;padding: 10px;background: #f9fbfd}
-.-task-con-int .favour .fens-table-list:nth-child(4n+1){margin:0px 1.5% 1.5% 1.5%;}
-.-task-con-int .favour .fens-table-list .touxiang{border-radius: 50%;overflow: hidden;}
-.white-icon-ring{width: 25px;height: 25px;background: #ffffff;border-radius: 50%;text-align: center;line-height: 25px;}
-a.btn-focus{display: block;width:80px;height: 35px;line-height: 35px;border-radius: 4px;border:1px solid #EEEEEE;text-align: center;cursor: pointer;background: #ffffff}
-a.btn-focus:hover{color: #FFFFFF!important;background:#FC7033;border: 1px solid #FC7033 }
-.fans-name{max-width: 100px;word-break: break-all;overflow: hidden;height: 26px;text-overflow: ellipsis;white-space: nowrap;}
-.school-name{max-width: 196px;word-break: break-all;overflow: hidden;height: 26px;text-overflow: ellipsis;white-space: nowrap;}
-
-.fans_del{position: absolute;right: 12px;top: 12px;cursor: pointer;
-    text-align: center;}
-.fans_del i{color: #b5b5b5}
-.fans_del:hover i{color: #ff7500!important;}
-
-.-task-con-int .favour .p2{line-height:90px;text-align:center;}
-.-task-con-int .favour .p2:hover .changecolor{color:#5faee3;}
-.-task-con-int .favour .fens{position:relative;}
-.-task-con-int .favour .fens .many{position:absolute;right:22px;top:-35px;}
-.-task-con-int .favour .fens .list{width:100px;text-align:center;padding-top:5px;}
-.-task-con-int .favour .fens .list dt{margin:20px;margin-bottom:5px;}
-.-task-con-int .favour .fens .touxiang{border-radius:28px;overflow:hidden;}
-
-/*选择实训的弹框*/
-.shixun_work_div{overflow-y: auto;max-height: 90px;}
diff --git a/public/css/iconfont.css b/public/css/iconfont.css
index bb457c2c..7aa1e0b0 100644
--- a/public/css/iconfont.css
+++ b/public/css/iconfont.css
@@ -1,10 +1,10 @@
 @font-face {font-family: "iconfont";
-  src: url('iconfont.eot?t=1582267811228'); /* IE9 */
-  src: url('iconfont.eot?t=1582267811228#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAALTgAAsAAAABVJgAALSPAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCnFgqEzQyDyGkBNgIkA4loC4R2AAQgBYRtB51PWzQPcUTcfUUhcjsAum/7X3h2BPY4kIMxWMCOPeJxoBC7fvb//39isjGGwakHQpat2q/1QzR3MXaJnmBRMYRiqq/axSjbNL2oXUy99DxkyHmg6/2nzEOi2qjAAr9Ww4fOaq+aJmsHH9SjuQ9hsPqFWWG/0WXQ2dxXPyx8WEid9xDqA5yhvOhsNgnmtt/frg6VTrDPdEDC/1+OLmdIxsxcrc/uZkmybyGupt3IhAZMDJHNPHhISAJvmr861sBcwFLwONEpbGSFcQsvtZIjT0aCj/3edy88CBGoIoGOKqMtKwBUfzo+pJpTQJnkA/Q8cqD3pz0QN1gq9KBrWqfi8Pzcev8vGxi5IEoYjIqNjegRI3LUCBWHRKkMUEJFh0WoCJhggWKCOowC7lDvjFM4rEKsJAAG5jnksloAXMScf7e4oXfqa20sbXwQaDl26BFA4AHSlh9pY+v3QBAoGASGQtCx5QKlgAdDaIAAgeujes99z0qIYsbmUoOfIAOUyXI8oenkHvKU335LP7twUTEvz39/xO7c8xMukp0SDCTdaOV2kcSaxJqE2vVdr7NXrjIjJ2xZBhn5yHgAtLtPPiD2qZFa6//u95kUHXcAJFkzcQAc2kTyFOz5MbW6A0XsiOj9/wcs7KbGSV1Q2IEfC4V89y7htiG7CID452S33d/eJjKCyBJLejFGnkgUBdcCAQDZfV9d0dNGsS3n25EhmXg2s5kFPiBqATuCkrrrumuLgwGbCr5b0soG2dnFPCRoX3X//wqxnZAAv7Rh+tMrzv112EobxnsUIhyBIwG2wMlPOe2duc60Pc17TxAoSHKg5UCBQLIDS46zgPm7WdZFalm+CgyBBZsDpQAXCOerqX1Vaiv5r6pbsjOyNEThIYDqLkNAZCvJEDgZXbp2ufr/W4HAEFC3LDkwYEh4IDAEDW/39OFwWtBizjSX0maRpCXWaIHeiBGqYWhbst6eYBUYg/XA+7ahEJYJ2Ywm/5mV42gy/n+dfrXSR3vQHkLPzPoc/yVsiZt+i/I+KfBkxful+IPlfIicATkekOwBKR4iLme3pCc72S8lC0/xwFMyhZy/4CwmC0AVVrsVUbdF0eTPApVcFCVgVSxVdSK9NYCtXY0EnOP37m2vIdBVWKFyUAjhlmS2vL07tHZPqGoZepMgHM62qlA494X8f6+q1YK0vdZm+WLoUiiqTd1dLqorc8/3P0DpfQQaH6QsANRaIKVdg5R2BYCyBVL2WrL2hvImemO46O10KQug7DMp755I2XsnX9T6YiianKrcX9PH8pqivAgcw2kcRDYPTyijECEJkeqk/apuffHdHq1P4b46trekiAQJIYQgaW/Mj5+qyNb/0rIvuqSCHDy7xlajV/3fRoIBBkvL4SFz9ljt/LHsAgsUcGIFWQnJZUy4dxJU6jUtOeZ2yjnKcttXlyC5JVx/pXKVl3eOnihLFBuvMR9Jk4Jy+lAf8ET59Cd/KheWVCGzvU9nXHfsNY7YwutnwgiXZM/kAT4NnhsZppH/6rutqWQ3iE/StJArWz/O8+wQTOqXq4wp0AkGgDWwA64gCISAung61mI79v/m1a1o5Y9H/qxvzycdaAst+VSsPoN9p8f27hOTU++SUpWn0ToV9rj8ymsv/GTxW/e/c7dP3ljVwzV2utKuX11rnz/m2XXRH4K+3Lz8gs5EEpm/OzXc0RlMFpvD5UXHxBYVx5WUVsXvq0sgGKrPDGclZCcmJZelpKalU/zum8+++OCjT96Zq/LeK6+98NZsHW+89NwzTzz12CMPzfjff+66U/G2f/1j0rjrrrnqoiFn5/mBUce3X13zxXI16w1GnWajXirmMik7YSmi9NcqdwX255cacM19qen744+Z5oX/XXIMbdH5YDVINHW2ubG+JhPgnzELM7NxCTFJSyuLk9NTvwVF87FOK0kpaRlZOXkFbdoP7755HTq9Xyn6y0VZRVVNt1eTXn36DQwW61EG9DvaMY718XH6nKbX8Xp069KpQ7s2LVo1a9KoYTG9B+rVerlOtRoFRWUVKlV5P78p/gm81OleGvRMyZufr/vAh7oZ8rN1b1/swfs+/ex7N5AU5SNXQ93MOF4+Ug6RVYTHkAAuSwg7JYLdEsNaSeAOJIXFksF+yWGOFHBMShgpFZyTGvZKA+9DWughHfSSHv6SgZQywt8ywT8yk1YW+FdW+E82+F92QiAHMeQkJ7mIIzdx5SGevMSXjwTyk7MC5KIguSpEbgqTUBFyV5Q8FIN3oTh5KkFeSpK3UuSjNPkqQ37Kkr9yhFSeUCoQWkXCqERYlUmkColVJZxqJFGdpGqQSk3CqwW/q00adQhQl0D1CFKf9BoQU0OCNSKWxkTQhNiaElEzImlOZC1IpiVRtCKq1kTThujawp/awR/aw686wG86wk86wc86wy+6wA/QFX7UjXS6w2s94GvoCd9AL3gFveE76APfQ19S6AffQn/4CgbAlzAQhEHwOQyGL2AIfAZD4VMYBp/AcPgYRsBHMBLeg1HwDoyGt2EMqY2Ft2AcvAnj4Q2YAM9gIjyCSfAAJsN9mAL3YCrcgmlwynS4ZAacMBOumAVXzYZrMAeuw1w4Yx4cNx+ewwLYYiEctAgOWQyHLYEjlsIBy2CH5bDLCthjJWyzCjZbDZusgY3WwhrrYLX1sMKG47JGHCM1ARbaDItsgQW2wizbYLrtMMMOeAk7YbldMNNu2G4PTLMXJtsHU+2H+Q7ABAdhuEMwyGEY7wgMdhSGOAZDHYdhTsBAJ2GKUzDRaVjqDExyFsY4B2Odh3EuwCgX4QVcgttw+XFaGO0qjHANBrgOfd2Afm5Cf7egj9vQ0x3o7S50dw/auw9tPYCuHkIXj0Bnj0Inj0E7j0MbT0ArT0JrT8ETeBpaegaaeRYaeQ4aex4KeQEKexEKegmKeBlaeAU6eBWaew3qex0aegMaeBMewltQz9tQwDsk9+60dA/T230MPcA09hBQ1EdQzMdQ3CdQwqdQ0mdQyudQ2hdQxpdQ1ldr9RpDbzCO3gLK+Q7K+x62+gEq+BEq+gmews9QyS9Q2a9QxW9Q1e9QzR9Q3Z+wyl9Qw99Q0z9Qy79Q239Qx/9Q1xT5AI4iYIBI0E+kOJrIcAyR41iigI9FEccRJfQRZZxGVKCXqMTxRBV6iGp0EzXoImrRSdShg6hHO9GANqIRLUQTWonmU2rB6dWKM1IbDlftWKsODHUCD4gu1BPdqCV68LLoRR3Rh2qiHzXEAArEIIrEEMrEMCqIEVQSo6gixvC+GEdOTCAjJpEQU0iJJZxOHIGXxCkYJE7HM+I8lIir8aa4Fp+LJ7COeApriKexgVjFFcTasdw28DNiH14U+/G233wuFt0KPOj3D3GfPx7Bp/6sx2f+uhXf4///8R1IDoL0np1iL5fWcO8WtqxT5W/SlzKZXCqVq5YtclH+5BKfqfaJQitRUiRxFQdKiURqZAllyJD8w6EpP9IH1sh7WriUEWTjyEe1yCLUWCFXEpfx0FZxuaxWps28TDyhpPynah06zWpUZ1jZDAo71OjwBdswC/JFHJACtiIyav4zjZUUGEOweuJpdLJakA/LQJIoZEMS/cYKdHECiB50fRinlAXQi+gJRbxQ54/IimNKjsaT2h4wI5jJiKmqsrhT5lJnEp1QdSrinKzU9CDM6tujPHslp6tTrU7OLMOTbjvT8TRqZvO/yEl1X/OOUwdogagmvYDqgfchqu8ZlwQCSkSpKSF9TJVzngCDO0w46IojIQFSGZ65s33uO9UJMZruhA9jSgHrNu10DJC96pViOzvbyliWXVTUVkuSs5uH8wNE18u51AV+IQEBVhg8YSNcEE6P+/1FUCCeruvj+04VwS4xcpQBeZzTVJOnEHOOx9ihOncFi03zYcZcioam6NMRsQU/DCtBISpKEKsMDDOZMHgdB8HzIqNCJKpHJMRYDN4nA1BadUiD0W/sNQNYze2DE9r7rKB49/pOAt/sp4ks6Gx6uXINWWcEcx4QIjgfBhk8Ogusxw1SG+UNYCHg2nmWQGBzDrXjcQDuFronVUCo5rhebCHI8bqsz0j9UQNwBNgYdph01GEW65u9yAvJHrTOynSQAWfiAL77Ul/rA9W1FOsyQyxrLAGu9wrndAuIHK9EBm/rMqI/CCx0CgOqR0qjTLFiEKGuhz4E4KfJdoTItUc1qCVHGyZfhEETR4ruSBY2hcew+/yU+b15nReEdxbhtmhylTV4/37PgXjAFi1suY/SB1ZeeINPAO99ErEXQBUlC8m5SWZ/+eLJyWdsPrd8+BBoxdDdMHZ7vv2CHJsAXSODnWfEvAEsi0pPoPL1x08/mdWsyxjaa847eP8dzthRIF7My+RfdKmflMXxFbsv7XyFlGeFcGit4HqPKaVPzOs9dgmMa4Upnw785tThOscFbu1ds4vytmm60AxJbOsb6tYOYbReGRLymLru7VUAcN93zB2eia16L58t8FN3qyM4R/JPrYNcZzVPB387a+6tDf8jYvrvJTAzcjd/p4Cfv9/JRc/c462fKls5RI0OQM4B+I1sqeNzBgi698yeaqUQCFjTGk67vd8tjV/HW+OtC6ZO4V3CH+NIpgGe9OoK0Sn5LMaumwmfi8t2P+P1p0WoFixoAOmP3XdsTPAAriD0C0u42DTN842MHR3F8ew9uwKFtcY9cHn5LAEmAIKSc1mo0dL0oEq/6OTrldaekeSjnV9R26ZpHOO/BQAdKwFRZgojd+xMaXo6pYOQiqlI7xAHJrjnBboibU63Q94xMvVMNdOlEAC/zrnLBBoCtWXbzlED6S3l+ZHHAKa3RSxLHdXW0o7rvtYQrsJmNyCswMsY2Fo+PJcrzzTux0qxyclO0URoqpPNt7D151fXYaYX3wIgbVnan9Z62NQu+cofrD3HoJeqy+h906oTh+pBj4It7fuE1uxxp9+K9kc+FGCkEdsVjafOOEsP0T8yZ37PnSJHx0k+RA/tXa764kyiD5JfH57uSV0Z/7N1UqzUHqx+kC8r0OlJNfMSV7DG6iVoj4WAiJiIxf4kJAz68YZ4lJyoZugoooigsEVzGnf5iEi2xR+wJOowunG5zwmPxBrD3qMBlwjEGU8zLrFHi44yTQ6AhJZXG3ceD4vPsrQBmckm4lUuPiW88GSQ8fSGrNdp9Ii0nHFj9nwpIwjTzLkifDxMxcfSXxgyFsWqpOSqHmsKiJOgmzmE/w3F+rWMAzzlQPtDBEcuAms+aCxHh4bRXi0f6O+Cd3B3YXPFYurTUjBrtpfsT7QLcV95Ff526sNfz8Dfz079MfkV+Ovpj347C/848/Hvd7o/7RNR2APeSc+pzLT5zY3/hto5043G3rezR90WrME4YUkZMJzNRortTXjP3/uUDHb/1qP9vT//tQtRb/sfAxb3j7jdZuUsgvvk6AVF9qvtGPd0FiXD0zBpu5dy/WabaNdxHFVpVHAuZd3yiT7JTrno6cwfrpm0ne7tdFe1i/UYRlXo2oeCzIBtxBMF2O8Ex8sclYNGuJ2rdPMlvx5sWEXxRqlSHigb3vOD38ZeTnftoxfX/Y/lzKnmwDB+lQaEyZGjDGMyaMpsd8CdrZk8CfvS8uKg4/KEGywtdyXrKkfIA1czJQ6F3WtSOhEVDlFH9eCATTVCS0VsaXd8KyIOhACTBaPpRI1flZXh8wkHIrSymA7tKmpqy/ao4/3XLVF1Kq6pblvIkh3OnN4wOwlZIjI8YpiRxbcy5z0M5Dcvl/U7ugR7e5s3fwJmOpPZVl9r5/Bb7yuHPtDVZhWAG8usl3Kow3YT3pO2eleUWjXsqAvhNVpLI6KIYyok7HEy1FtXgaZXuzAqPYU4McJdJJb+VSTiu4dgZkKvO9RKVFMGLGqMjC9ZjiKCxdRgoJyT2wzZZAgp92HxrJTS6oK1ciGg5e4ET3j6V85AwLKguW60nAluMM0UeOfJpKPSB/R41h7YK54zsn2ccjt2ttvlaRsFiUFtgImpKmyrb7CwseNyVb9tdsK3MUDUrcTN7bo6QV1t6XMxOHu++VtCidg5rA/YoSo4xkLyyjDqepZnYl6UQcDHdRWkz1qi5KoxU5WCsRo3B0kkh8win4ARcMxjsthTW6aGVNhvwlfkwu6OQKaXHEyTdifC3523GEtLWwlSWj7vh8dVWDv9e0UFuGe7DHS1rqxuzDVjG3dTE24+oW37FeMMwaeyOImTV3Em5BP6sdxJJQCLl5M9liYNzOs9x1AMLZ5V/+j/tL87tSKVABAkSjlPEVD162akQn4lAFBHYCXQ2gFVeYyJRBhRlqRBLMzFtjaghP0WokzIwnKVcZ84WBg/aUhrZ9y/q9uqRJACoTUdhjXsF0c+4Fk4XkOBUIYpyFiM6qYn6hmw2tBEmFZ/4grT2hgd1Bbck2CkimVhf37NZkYYrzzu9vx4guMUpz3VnCjhpDjW1oaJmi77k6qoqmJmh2oTcmndL0KByioQ++4VDUvSDypuFrky9ntwKtqCJIfMe5xI+gOqWD/taiIGW5nDVQbK7Adu2xqsZKz+OV7D2Mt5rom4sZp9P/Hlf5l2V/Q9zZpFOi3jk1bz0cQhkcyNHVXp/CUMF56lunrNXzrqm9sTpxiwZVoW31g+YP1lfmP8zlJuLHvelKcZazXmUllCR5UU+Y0u8BGnv+OnP6VsuqC/QqizuLW2fZSj1sHmiladP5R2iFi+zQsO6Sza8dCBrTSOana9tjU9sgr+xbbtr+jNaRWa/R3ZmRImeURU8LbFa8Rw8vHLDuNSwxef17GaXveoBOIrhTZdwxht3sA4rB3lNGG5jZSoO3oI4FO2VwY7rK0rYmgTddr6aHNFvsur5ng7s3VoqNcwviDWLU0zRGxv7ZsPZox8Kh467dXMye3IrHcmMN6e7R1ajkpovJWJYFkLASlklEze6q2ZX2w5fElcZ0nnbcRGrXGTkCglCB9Kixg8fsCd8ll4Gh0Xkftf778frDqZZ+FDnLPyLdyTYA71iIQgrzzVkORfhNFOZ5HrN8vtOm8lkVvh58SfqmYIqcaUast5T6Jecerd/SDhBgdTXajViUodYLzffqXTaKGTclMSWt+tVG12q5UDtJilW4S4gCHsSa7RonrBjrjCHK/ptzhj1sa0vPo8WteE2Yk04EY/3MXJvuN7WoG2sk+ocJiPsXohloOQcZGbZeUYjVtmGI4KdBZVhQi4pBg7CcHpuier/FHQiQhJuT93tjfqK8jPa7/ednTaFev6fqyvakRWhmfG6naa24lWmlzig1nKdGKw/hC4+QwvVcAlbztf2FtGHIFFvRMZcMgYIX7HsYjdPFlbJ4qCLDyTlgf9mNDBBiTzn5ZvyMF8pcD4jPcHfJSChx/+4jG36kJDBiCcTEz1NwAnJlNCfhdD+MtDWwYpoXsXQ/iDFmKYEnp3MRS7gWDwpWW1niKQCJdktBRC+cvrPXtkw38m/pkDdx/f/P/ra03cLY3YPV88fTFeX3CLrg22OBmW5i7of3xvXbIwKsLB3m+FK4IYNCV6g9eUJuJUwj/oWQxQse5p773mbLrtRL++a6FoSiKdGIKErqpAIm9LNTBdcWo0SukKDELsgHId/ojkxOXxsHvmr7508tx+f/CQRkfY14T4yPI4LxQg1bb2vidJ3aP2iMhCwaHo2UNHe9oRYvq/aO5u0nk5hjMGnV7PaOxlh8XjL0a3kStNXZbmrSYM5YTM2YdE5ajKO4f1VnfhYFNfuhbb2LfOetjZr3f8N+FVjewVY0Fry3tteUDvHJNZclDUjqsCPaKJpFaHdFr3n3HfFxGjckrEFk6YX/BDiik8YAUZLBEmnLtQzi6d8w1MnyWsU0q7m1QWWgn6lgw5r0tn4kMiEziTcmE9qWr4G4hHWi73Q89/e+Up/IxAx4z/IgCQMQx/30vNAgqSwrIHwvPJk36DLq/oRGIwIL8ngeFxncpxL2/7eescfWDwLNpGWkZ6To/XI6LbU8ljwBEY5Avgoexdn2iNBSz6gD2ugvB1t9AhIjxruyoeJ+dqLqWaHgAh5vHW91+O19qn9Vd9cWu9sDr/w4+bNU4BWOhhtHfDsPLJUqfNgHJ35pBlCzyjSygySD/m2763A4yk+wiYN1ilfKTv9gGbnNvGPIQEyKT79+o1mQZCd+XMyv6TwWHw1ZRDTH3DMgeyBls9eFB8TH1efGy3yRvbtOVg3gyuDbnczWqdGZT8Y46MmutgUhUXcNbLOa6Z4QZkU9bAbJGaPsub/LzfmLuwTRdKAZUjkZnMYtZpy1n9W0VjbAa7oPwJcZXGBJW1BW0fWWyPWgcUmgNAcxmOSLfcDluNh5bfYUJdaFagkA56FjBtywNxI5zVs3CLMpU5T/CfCvocRbROQ1vMswCYJdZw6rwGV1AnWunaOHl+PkzyUbvb3FomMC9iWtmD0u30keQyFMCAQOtMiWJD2eTs4FfuqZEIdFy+nKFyaL7ZX2cQ5oZ1waWhvp8vx+aha8TxsP6IOCrjbXXGjoR716PAFz92P45vXA4AZ5+bAfCntQE/lBsDugesJK/cYqoEDZ2V5JOJSklK+fUUSM3RFqN2BCg/482wwjX+iEldqxFMMegegMaikJi/6RcUmFVjsD4IfAq2ZVOwPW60sleCA+3fe5V9BgzbHQ1Pk9DGM3YBC1DxmKHqE6uSWVuxeRAMGVA1N3MWTOlHvRt6/DhnGzb9jwofho0Ttc1JJtbZf/k0ExPnysUJWS63qfbHsBpfr06eVgNQXLuu2Fw6V01DZ7sQTkzUsqumNwneM3YudW6yIEHb8ttIEJX7hkth2PI4IczKq4iXFFj1Ua/SUDWS6wU2f034et7niK6PX+ytU+2E+64JOdOZOUYBKoZFVXBMkcOg3C7sRlB5AmeB3JSAUX76rIK9eRfaRTXLznBevtvC5IIKmTxSAzL2w140BQe4eAl76RXZY5JmI5UWG+wNCOvPOofbFxgQBCg4MUCrJzIw6zX5NoelL37IRmG7WOu8jhlcClhzDlkKP5FzBYBe7itGznvn2N/Ou2BrzyL8Qa1WTbG4A8QBpBBlLG2oozIfPwIxPY9l0oAz21X0q9YHwSy5lkfj13SmxyfHpGHQIkFn/ipeIL2IY1lVOk72H2kgmR67fcLuwU3TsswM5Qo8xwQnV73V7XDrUIS54krCGfNdgq2yi5Bp8SeO+XXsH69ApiEIAsPCa+5ot+V19AGE3+Sd5orExOVE5QajrQNx2E2OwySCpZyi5dN+RESFKJI3bBwy4W0rgkYCDgaYCuAQDTTDK8a7u9jxjgbdYszw14zeMFZj1lmf1J2+yO24CEKWYMRyxLCHHzurQ1qO++yXealnrfKQBdSg6TH8+n4/Qe7KUXi476HmywnMYILGiJ1z6FsYejm6JuSGwT7lFVgvSX5HxeIaPQwR8dqdKAkAEXDot/xZqhdW1UpZ3YZudC5eljSO8fsTcY3psgqr+NMVUUxDGhdpakQ8eq44aRhVdjInBIt4flB/Ur9KJ1j5eHgSKFs5WRmiIO04wrJXJbnR4CcRyGItdlZTP+8l5d6JQo5iWVakOkIIawr6u/1PMMqh5z3ZoBtthdvebjulURwkevdkS/8ximjecc/U+ft2TTkSe7bCLxV1xklCEYfnas2TRIWlNB3Q8A3Rsi+Ob6wSLsGFykMJKgtJ+YZV7sggXAfb5DgIII2hctdNvJ/jowY9QVQFVAwz+dQXFlCJ9DUSvA2E7/5oZ9m7jwl3DIdoZzEe4MiTkyJDq23JmxdnkGZweT4bQlhTuNYmUeDRvJyw6o2eUmCB3Lh/hK/apXE1eefMypJHW0OBYe2GyL73e3gsTeL3JOQZIBlOqpt+5Orp+oAFwic2UVoGEi8VJK5ic2//3nmia7D3ThkY33jH6HitqidXxzZvHPlwqQP0Ne6Zo8vXeslP7utOmbngdF3d3LzWGZ3TuGq5pNB/ygckwvIB438huw7cwF6Y5x5jxmCBQLWJ8ZLv5iq6udZzykHRKoKcwmahoplgYSbYKTpl5dwV/7CSWGF36VJFh2kr/3FTIvAZ4meNBKkcIi6oL3xQFVWxcm1BsYX2LV5NER7slOU+jhW+0Hju6A87z+jOuX49606LZIGO59vamD5RTkLE8srqeKNnJHYeASwxWYUrJuC34GMPMz0NNYYh3l8ioj3psP2K9shY2l4Yz577E0rtFTe8zeiucNYuN1hDPJgszG5HaBDnOzDD4elLZtI659w5XX0eYce0ANKgsAs7B2IxjTFTIGxDQdPtp7oOxYVFo2lnN8pS8ZARf9INX5EjJ2hALqu/Z/PI/d3S/XpWMer80EGp1s8FKarCT7jkh+MKPWIn0/iZUlA1KycwIEhJMUwPizdGLllWiYQaZnDc099hpiNeeZrbRhrHDprHbczoslxet0rtOWM3xdm1Eku/0kC0QnkjzLjL51tWZkEvhWznTG+e2I8DDb9aRTjIzHN0K2gKUvkOiVLO3ISnLX/NbVtLnTHObV9ZPq9x8rXqbxKlSrXbFChlZhJEVdytrfXyP+vDbLUTxNoqIKrdqiJikt4m8vCiLb1CEigQ4GnsQ89WGfkVkcGXGEURy6hkFAMGlHRWIlUol6TtEgu0egzQWP7h7ujwIL75ZnDLeJ4OjyiHsETF+36RS/Usj1VZ/WQj7J/IyiHy0AIOTqH3NUHYo6SdSLn0EjWtlV4Vd7c9Kt28dqKKl6TlF3wJwHduYPbMGgcm3aVjEFpFiJnoFF6/27Yqp96/G2tyQ7sARFHTZSIS06OpyhFmaR/3725J6AKkAgfTb3A4Qz8CfbKEzHylKLrEuNT9ywQvJYkpKvg3BRJwct+2DXIse+2DPvlLj41XcjH5a/qI33TQftMpyxuVvZKSRq2+QtN58+n7vHPqItAfUQR6w/MmV9rSI5PLKq3AvOhavOsJTmAUe40Vxq8fceXcf++iMYbpirWivRr2zhWX7n6yoHkqnjq/mtvlUPyP/KSs1iJ2sjzO1QuNZKvh4jxeuyJ2cokxwS+XvKUEfZcMW5XxEJ7Gs7yZrfgTGxNB3qiDuGoPYY2E/DBYHBgg02NAXqmKAWg+/HxBvQP11kf2+vOWfQgu9owE2FuDZiMM6KARzXhZD8WMEOSG4KEy6+1+jzvS8myBXxJvqnhzzsGVqd2YReaeYqjIwSJHu5C7j4R+4ssioO7RH76Y+ZmY6Bz68ctZqgrNlZ293Amdb7Wc8zc6afOgcFwFvtCjfmfzuTZOywcy3pEITsuqnOxkV3L25wVcKBSUQ8wHLws68yNRRRWHUVnCMja2mQvsDVFl2dL2JUKUKfVwGDuc49gKgig0fA6au1A3uXbLcslcTjLGIP7O6yhd1IdBAE8ZSYfpmz2/lfUoAuYic1fL+N2MYmjoMZCkqffwn5pl5ceKyK0fsDgXR/sbHqqFA65q5pz+LzB7XpZSl6hUE6tBH/HZozEA3CJOIslM7m2qApZ6vSBBUs7C9C56KUXxKGfFR4N4iKcnCrAciPXlKUbm8Q6z3nSSpcvcaN2gOBxbL8k0R3EM46IggRrHni1QJ/neIeKOxJC5bIllfANd0apIeGPy5ZF+S5hXiDBFQKgsGKZ/uYd/M07mo1Oe3q/uzHT7TMLyWblAcOTSXLyOv7u732FTyX69GxLJ0j7TTp8dTA59NF9dsywgkaB5LRXq/WNRwT8gHo8qUklAS4zdwb/xrkV6Stg6VUYUpOVhzT+pZrpK23WAu7932oYvEHeGmEgnGsVblCa4XXQ5qgOBuAe2nEQO3iKuN8aUvjurRoT69yDOOIZ5eNL2KPtHyVwPhWF3/zZxNti0LEaAJfCxIF9Y+iJv7YuXTO6u41/xa1SsngbtHk4140T18v8Vjgq40f459vL+KfdMznaNzB8rIYDGsb9EC/3tPoWCAVSCFKeQcaAO8NLowo5Thw/M96B28+xIdvdZFWiNoV5vc/thj8RbY/09Bm52cn6VFpzb/4KJTuudoBpro30wzod+PGbv2W9jruZeRDDdHueKnge7WvO+BzqSJXPhwT8ik5ce+I3yBolbMt7b5rnNBczvlXQrYtFkSmz/69zrmulWdg0ZeAI5BsV1BDJpDFFHxS03jQ5CZvmh2ot78rGYLraQFMMwCCvwCYhEd5xBgetF6yjIaCpiQEXoqe5H5pcvzaqSc/yGu1jDWBempnZIV+t1+nFqnqGWFllgaALeNXIaFXSITU81ZUqWyZZl/Xqvpu5Yvo7IAbt3BWfR255/9hbbmlMKgnjhRGzpegyoCYW75tBv3yrZz+jQxOEXWJt1f1Npr+7+85Np1xZP+4MA1Q6SHJlT/0Gu62aZfNqvg+S2v736XAlK/vrzVLKmTzqAqHvRD6EpuboqBANFRy3ur+i2zPtY41p3rkifiyy1ChkDCvUNmBQZ2UCAVKZQR0FXoU4eHQEAerBOEI/h1RBrB3drTnTzJIE4YxfugqDwvghJ1a7QW6XZIOnn0GRxrpv2UAJ/Eowfcl8llxvzErRrdJ42Jj7AOUzvykPNjyLS5xuRYmOPjaM8RAfdNCbyWwbbYUHW1dUgR3GPTSDg9hxfWBOsZxK3pjBfZCVORiFakfXO+Qa/Zm+TNQ21T+MTVuYH0Z+QJBaZmnYf1zKcxDAhXR85eWU6J7pZigq47Xc63CQI6ZcBP4L4C9ugWPEDF5akhfnGr4wBn9RhDZ+Cz2PNwzRfhCs3EmgffQScNU4BXjgIcuV1hJYIkJxoqgzfKhpYqP1lwiROxa5yE3FUns/9BLFTI2ykKN4s2pX6RJGTqsDyyo0OqDhH7yMFeNagYpm8cBQWRw1ibtU1oLRM7PFEomZKCBC2tFdnVxV7Aq4WkWOmZwirXB9mwY5/40WIQf0SfB5lGIRMDikzikKi7Y7Yxz7KOZeojGLcGEq9bWl2YnsRa6u77ZcsL60r/4V9m170ZzTSmHdeOnkfaEQWorPafb/jhc6i4bTmci/v3/pSYIlWWrJfPPMg/DoVe6Xvtr/cXdD8XfbLN6mKIn1Vsk+yFkXSTuJjuoH4YE/bg0R4cCMtE+3JIhxY+4rO2LJKN/MAnTlniOpwkZ9uWf9Z5jc+t3a8nyf5S66e7Bxtc5ZdXWhyTmbYrY9+WwqmMRBj/HTnZcUvtVtVYi8MW/kmD2oetgqDizXz1JNDS12eZhipG6iaoTc3VK5r7WKmTwY1anZovmF+qO9souJ2y093NOxu1x6qpv0Qd1kbsPOQJcaFlBhDbtzn2G6Cz3IQgF+5k6Lyo4Xx/JECPXZ3IsYQlfCn7RIWOaKN9tV3kTA5Q40/0JakIF7yIGl3C8fvkfGvsJco9POO/qjGZ/T0LykJ5w7XFQIDAu+SjCX4CpnnAN9g64sspzkhDoqItwdSzc4kET8C4sVkGEAw25zGGpNXBq4DFZ/EW1infHsruY8MXNdSJFIOBtR6uNjYr67qcfbXCl+YCFJ+MguRQCUnIUd+MQYI6TiNiMrAHC70RXon6gkBEUU9NPRIph8eW1Z7SpgBcn60995ckVUvmvweIojIM8s8PhHIfHVCP+9RIWlLwoi6mMYelP7NcBSiMUzU0yU5dv+BU97Cd1DY4BKQYBlYlqggbh6md9NEPBp2YVfq80EjUKs33hFx0QnndZu+Wq37nFBMyienS2e0ztPcJ3vXvkZcrhvxCYKzkkI59ovsEELIzVhaXhq2hMlLRTOIgib0emOqYW9J9OEZ26JQHFfR7dmtQ2c5M1qzJtsI2EB0j+s2h5HjSequpZor0ls1CVAHUeht1xozmwf2UkdvzujT60T2bmd5Y0UXmsTNi67O8XSrJfhyO52KFk8mhQ2HxIrt4kRd7vXMrJdUmjmsNCtgb60oOR3ROnOSUnJSo8MasWWP01WhwTYoJuwieEFf+J+3IuqgMFp5hbZnX4GvZl4HCGYBwdAEuLT+1Mr4FeNV9HoKGThVr05ahpWasqsOgfaU87DmNbx7CAw6GKD6vxZvmRypfshwkjSMvoXlgr25ivuLGGubOAWFvNkZCC3kooSvHzEHJPzsbgmjCXSXAs8T+z7EYF+RAEEE67FTnLM0Hj5sfTzKt0QjycR4LmbImUDOB00f3mhEyC2sKsbYQNdGZDiVfnrNKCkhUw8g/Ldv8exqpHApItY3DVMZw3KJdRmNDjLFHIcsuWj2MuleWdNSxRqGTsnyYzbJ6gGrZ8TR5dtrGWI4Q/DSYeapzGn2V9fHf0K7LKexjuN6B1bNTMvCDE8wrVEbF8Z3TOlpoWgUPZyT8U7fhA/K3Tz4/pxK9+n2pvukfeeK3hliWHN7v2NTQTIjXaK2pOQP1rTTi1TV8q2Z7yvknB5RSDE0fwi8aWBzJsj46g1khmo+S6vRRugO3moOJezdbEuXBVgFSl1kDEJkA2Rg75z6nX8JW5kC2ZvRp77hgLvvd94B2DtYaYUDfAnl8gAEcL2VA+C8V+NCOIvOSZ0h0baoQbmvgdan9RMQFWKIR5rYFuiX9EiiIlyV64nGDAyPD0u3Tbqb808JPTaDAEOqkHyPXmpeFu54ccmScyfFhAiYmufdAbmVYvt2B+qgPecGjSHyaMsOPEbtmhkZBIgCZnlbwiiZjyuuxEKUTzQWeOoBnoik89ySoNKc83pV8S4avDK7EVroMkjvon/Y21YjnX19OppLCbJstjWp5mwTfhYUYelrzKtaRquiSRlsrpEgQ8q4DjftQitR6LI24xKBhA+yLEWNDlomJ+FqlGlBR+TVgJX0K7OCIwq9FE+rjkavKkC/7HYHwSK40pl0axrSTVOXZ+YMmQedUgF2sdurnsUwoocjp5p4uu0fshNBBGezSnMOmtCbR3vwPMtCgeoreF8CzW68LhCOTkwrvgbGaua+BquJxHtF8pxORNwnBd/BvsLONGA2W8iEcB1U3jktshYymFVSvRcFt+4BWpkIknA9LycVz+0c2YahpxmHS5uZ5e6E+kHlbKVgFCL/cQeLONvMdWOQtupUkHtw7nGC3jKgPRUvlca0myQBRMFIGqmtrE0s7xlu7Z0+R4ULyZRYZMtW64gw9yvDUGlaEfslUNQr5jh1OGufHL+g8H4FXIWSQeNE/FlcGiR2CCsYjWEuisngHu7fEJGUcBrNvKLbSJDmO9x5NMYShCJibaZf87UjDiY6OM1aY4AQwRktCtkrjgm+FrEnE92Wc0Y7pQzI7lsvCvj7OEs6u54cJcuKjx8XpN3T5bf48uJGh5mJOkYnXs4domIeUSg51wpEvRck5xKRu92EFcPRGJlSWx2FHt5/YYcP7RM0q4y/TdP6j+pYc4U58k05tdsImgXxH8sR5gUU1mbE27w7ZqGUvtpVmMGiQ6gt+GHU+LSo3DrRmReEekYP7BDsBxxi3+KQ0tVlYgGzZEIMrH/OmPOwLbwYJUZF/VJkXLAQDYAgazjsSxeiFyDKNmCQw7B9pnyBO1JCbkM9/fg5bKC6dfpJDxGG7mm16MR473BibjR2xu6c1eKKFC7k92tdlFL6bSgC9OoMksKRllW4WMjnzkLl4jD+jfaEzuQkRQFBuCTbwwji+IVGgJZeQwd0f+/qY60lLA6dVmGMQWhxAMuqIwkwCp8Kgvg7ph5n9vSv2c+3SVwZPSVDTmfg81u+u3HysqDwx6Xu4Gc3f3/9zJV+/sublXJxwjvhpUUQBT4B6OIHMn9Kop+H5dHvvWaX4PKrl59ad8gmsUfaevz+GFIHaNbZVpuj43gEje2xrpMtew8Z/mDmY7W1vSQ5VbTjXFVbFDZUSsXyHotYuWj/6lAN10Y9178scWXdSlh/JT5JUu0dcvVBHK4MYW5jBlINeVK46U357OBInRwg6D491qIoE4zcS6TZbG/3vBupQacE4ojgZ6PjqolKXabw1nR1Jyk2N4CqTvv5Sfns5elwMgS8+90zqFHs9aOi6bU4JumE1lmNQhgBYQaobBdBE2LhJkJwgWbJBNBjx1mAQhFQQDqhxmaLK2duCTaaAjvlZY2/KFZao9iZTuJ1XS+UiyCxIU2l7eqMoFwz+kKW9vSQi6FNIMSmNj6w0QjrdLdSp2+yHPqLzGPpWRndQzXKgBkz9i8fETxyPbPlxLw6Oz/CBBBzNkgoe0QUU0NsOSCKOzwfq690XD9TCKFOAcG5WQd1pnXABUWGtw0CtIYFEJF1Aa7IXT4MaWwPU4tmn8QaO354W4krCk9ljmD2KSOKYVIr68ks7kIJgRh3c8+rmEWf8Q4QAFVc0cLeuNnPjHALgtrzAUQoC4+sZ3lZPgEM0W4E5Q8zNGtD9ImbqyNIweXwXnCK7KfImUR0MnNcMss30D2eCSjfF7rxAXDXW+4LtczdrQrIV8VgkXlfi5eGr/ufuZHds4OTQNHSBIZodJOQ4KlBZuwvKKQqqsILOtDeO75gGN2i2qsnrB7NkdNvfAS4hVfG8BEtthWpxlhflc4jOb9Lmy6/oEkT/HEfGriaVlMY/ENUeP/WuUsXVklTJcOmVum2JHlpty1t10druqmCVtSolJAlie0i9cm3780SuhzLqqlY3pEzrFywdKw15hFdjFwgo4+efzbdYTxLWF3EkyspagPqPR9nTBAlICdyLelZomI4OnBUSbPF7nctnRB1aspcy7Aw5/sKuH6OyirVeXceTTCfE75te1UytDrLKcKoIougPMPpKYO0i+z1qA6iqxHFF2Nd1hrg4snyID0z5lYgOV/fkjB53z08W1WXswDVSB82lLzezUnFdXBNFr/Lp0HhtMmPfThk0u4NbrQeO2KwsU3o0Z2sQt9orObMJhHAEE16eh5Y/O02HpdsYJ9EKvk9x26DxyRKa7PwE3cbQzbOA7+jrulyRPUxXtPj10seYn2XTp/s+XLodZA7NPwghL50rN06hzXezJsmZiWW+N7pPu3rPzKqsez/rR3Sc1TmD20plikmdoV23VSs2xQ1Ry1CHAfZNoZ03HQmh3YXy29wEnOGn+RMaSjHFPndm2TkQc7LrFB464AbeYauDA7E5cWRNQY6QcjuTqylmJ9t1AzXGymqldbq1J1RgtJt560gTfFscA1ViXGu0drQXL+aZYIXiAHPr7AjUTkCH1IrAP7g3byqzo2IlRi4vlRyFH14Cq/apvWc9KSUf1ZIu9F6cwuInNU6KyCEJLYrgfobFNYgV7tcwmEqFfI7lqxX2Z/hXc884xn0JpOVbaqJdYKC1l694yVpq726c0WzlJ0sDwjLG1eLVph3gIhB8jxjqRAHKkEXU7YPi8RJSRehVOCYudl16UIcVtdfVTrpEIfiW25tCXZA+HynsfuP0lOqkqLaSzqoizb6qNgN+cxQpxAA0Xt+U6hya1VbSn0F1z6b3k3razWMl5weEkhhFvbpqjDcpmT2/on9urtrdddiPSntHY9OH5Kh5nQlVheTyOElSgED9LiCmbHp+i8zJ1anu2mttbu1Ts3VQZJA3eg2zdlsipdUuZU5/CQWzw+enWbHTkkjgbl0vCqVFiCi7KQiy3KlO8wargOpzKdEae7N1SmVqh8cG4yBW39FxpdsQCRmOh5NKIlIlUsZxyBgsT/FjyVhbr6HkIvxwXXkAcYe4xGstmFdKpylRiGlyXQK26u5hHF+2kMO0TyhLftxp4Xypn2jSF5ufkGg94k4hMTZHhKHb6y9yEuGKRwehvn89dfnSwbPS+Hf6p4QtI7dwAYRGlFEn3JGQ2BzuHiK8JhcC0XPjqSPjKwdreRz3UkPitxncnJtJO9JQQq5GYz8XjV94PXBWG4dSOeBt02fGb5j3szkwnAJiMiiDlvShQKqqGh5UmcwBMZswUycwVKcGhDQ63f2AsLgUb05cPFGsGXAvF5UxZ4cyoPQt8iGDVu2btzY3z86OJpgbGELIpgvoORgxLXX3k1yF/dCmM+q6e9DqDDw/nDDKZu+fv3mTevW9fQMNToJfQ9gMNwpgp/iKvOpu+4q0M4MGvAySLVybPmi9vr6Dbyj9vf8JiLYW33ZK2y7O4a9zrxABI1jb7/UqHm0zXSwWqgzQCqNmspUqWqrkvAmz2l8WOZDZyJSvcyNvxzju4f2ObQe+lqMi2PpT4SjFJxIdDFeFvi3zoEQuKTZhY13AwLC8flE28ma9GfLKmicEPQLUkLIwdiHEz1FnU55EsJC5GuKyj7/c4zJrU97BSURnZ55iTMz7DlesLveXpm6zeEbJWOyWq+hyvLxCn/ufzgVwtFXEarR4QbNTSj09Vunvyb0huVgEqIgYXR8LeI1+Oq0XFrH/gjupg8PQelDgc8ZavERXVi7fFr7pf9Qv6+YOd23zEVVAes/syPaFvsTN0ykKHBjimp82v4YGBmD3YPyKdj0FIELR4GERxJbFQ6U4DifTzKNs3YrHYt61xuRYidz0cjdMQ2UUnWB+Gi+JfKa14jM23JlZopUHXQOXjd6iiGqbKm+TzMbGASHpisHvRHL5SOz9o1w1dpZFSx7Zsye/V6u6Fn3hsN/fQpY33wEliSqM9xNDJnKpwRSW+wEYBPhdUVXRMJVrv/uTfDdg6auNaa5jIDnqujQOh8DUU88CmE2DE4zqVOu8xJ9y8JEtY7OnlwRE6CO8F2eUWKC9/Wy2Z0DuoyXZAiYNb7olJ2uV11Z0cWSH7PbVcXO/ByfV0VBWFxCC0irazAXv2UXz3HV11c2iEF0+pRkim0dg4O3rOEUusaLoSGigfLotJKJVx0b0szVz4Xy47VsxeYoGrggYQeXAIbjCwZTPBdgH9A6x8sH82+O+Z5GDnhurv+eX5ZOEcdGo2PYIRRtHUMQOxbBZKRWP6fuAfYmtZ7DMCrpE9oylSevH+LeArXlCFANjxByVvslf7y3W5Hhr86rf1uZGh/fTlUFOCl7T8n+2oLW3BNiejUknpK6+j+9OYRvXO2uV7wyyFOx7hlRV6VHAdvYn9GExwoRzVSV3B48Y9dIsEctXR+a0xYiSJRaqE7HR96nnB/gDJFTmjV1SKxUJE8MtSN8Se1U4m9HUYFozeUwxfrDRCQfkUNmPxfCKhGTaD5rYwbghGcJzO2BTbd3PlG2mn3nAYEr6ZbbbyFhaKEthUJoXAHTfrwVyCpRx+vMe3fy8qVDXqPqCYvY42IGOSt1iBy5My2yn4qe0OZHChqtPs146DM5eOpmSWlLu73XPG8h5tO5oa3yMnd26y/fV8hpNXcgCs1IFGMLGmbRS/O+r9UsgZY+R+LtZye//Cpz6mc8qbL2rKdUcCXDI5WS6tkmZKhkcaFz/KfkMD5injkZVfrt0d65lKTlbH33hCkG56mz6DgKMQy15UG7pzNUYwllzgDpHGvk/17zQmqTiLPUfn/6j9vUIflAUZ4627PVeqY21T8miWQFCDJ2Zi1TaTtGub6wZ8pfMAqRiBjR4q7R0d7kH6/bEtr+VUH45agVq91JTA9QfS531CraXrhpy9jGEiHddlRREYq7KxzaTWncxzTb8fxJRWkxuk95y0v9qFhwESkNvPm9DMkOAYg5WzQUYGl5Wofnw48IGx7NTQ/lJhRRt4BDB/K3sZIQw4R16MvfqR18rDA3WrhbcrodL909fCulRIdlr4R3MXSHx3rbKysDl3vLzl0EXHyxb2s3wBG826P9/q9YuPaqcNW+M+y/KZilm9mYql17vz/FH4n9Du9Tc1Qpq9n+Hkz4tlUVZjleP9WaCkZyOeabfFU01o9OIEXnB9my0OZRU1oICKeuFwpPB9hXtV0z0DeORKi0G3502e1nrHilYriOIKiMy3SA96Eihdx1EfPM5OAe4sElNBcT5vWCqMuJD6VNCS5+Xe5Ganl4PbewpCwty25EKZYus9ZKa/GUN/MQL2VIWD/lEjOc9R7Wqxov5fh+S+bi3TBMBcfC9w732Psj9Jz3CjAACEmO5gM32CZapySF43CA9sIVKIEHKeMmWHjinNHNEwoIOPgq9QpAHX2Zhz/nF2/6wMYhsnNS/VEEw87cGG9di/gDvdH2BxULMznkmS1f9yAPVU+2lMialOXLUAzlP1XpX9bysA7EdlM4i2m3bNEa2cyFbK+U7XUsvSMyblAa25RVWYg8cUt6hVty+GAKC8nP0fFckaxqUbls9imzMTw9ucV05kqFOTgpVPZKWNFWXx2ml7+iigHPTAt/o3k58LOF+7VrGi7qQA6+XDUdlNbUqZxdJB6ar/lhtelvTxYWDJYJPtToEcqmJuaBW89Y3lPS3ocg0z2Ogj5HpbIPHzxhU+fNKjL1cHrL9KwlYvXU1VwyZ30Vu+K2RQgx4NfQ8jXPcBCtjmCAAA0K919Xzj8fTETKMv8G4tPsYO7e0kFDjGJroIm834U5ZIlTyqJoCwIibso5707jM8ddX7c3l+PQ5+Y3sigFM4K8qGcMt1RpcRJyAXSBQ9SWZYzlz4SVJ/EE+EWQBVxIbW1ALCkMeDUklEzznYxdhYxhR6Q6xAXPAmZkFWs4Hi/CnKJWhA4nfo6ie0IxSvOsLMWZp7J3B4UTOoJ957s7N5UYe2uxYx04JLk4dOxtjkNZHnDeZZSLHnGLnrq59qsRh+Id4sKr0r5NeX4f9bICKYkreiqhUBQmIhBklprObKrL3co8G611D3/xaKQ60dt+/DMH461TLFcYHPr88ehEdX7byc8ztYV3O0PVxvaTX147JnqHv3r61Z6qsizsbpsoRDASYYZ1N8D43euB9RQ/1UGvoUimXdfOe4NKngh51EZ2FqFHhhw066NcNmCdOe3KUTGTE6WJJKBkT24Zhk+xKo9G0vsPoSwT1SHmWUUR4cGoKqkc8cGWVSrwAB2Re5auUV/YYNlTq5saTouxTd4uS6bmmae5L1IvDSxypJDjPip590ueiPLP90dkjIxWJVqLHtPIO5kpLgQshY7vmU6O38PF3wYXEb0b7cb2zQOZcbghZ0HbmErT3qSfm7PY3xPaPaK+JNaUevMrbW4HHQuo5+rmyTdafJOVPB9pKVMPzt8uBzm+5Icjua4mDRHvQl+sWZixE9OZjmvlvxF/5vuOXIibmX/GJZjfxaaxcpmqKZTzsmfRI1DwNEezDOHraxZAEXFeEdIKpdStAhArCQrNLNvSjl9NiCXSbRPxkvHMott1tZmoLeJVlJfqV9xKcZkMqv+c4ioBg9LIpwuMyOoQBKp+L2gsrKXgGlbW/PjeSEIFg6JkLK7NFig8cvgaVRFmMGBQGRhw66PHrtb1LlEiBDuqEgfQbYpOGl0hVzIStHrPFK3eM1HLwCxX6hUOpmmHU+UqD1R7Y0SMY0a93fKoRWiOHJ0rUbHKO3OaJC3mKBnIra6d+2Mr3k9SFELjRn0sKFoj87sncaqX+LmBV/aOVepRrtUrVu8NNHkvTzgf+dVSPJKSIu1v/opnVVwaFt2e+Lvvy5xaGu7xwO2oxXkFBm/lyw/3pP2+iR4rfPTx2hnn/ZP9lkcUCpY1kXtp2ajbw4aE/qqpESUi+tD/85fTDpB2Ovg4+BZXq0dTj05LhXEeM5jclMlrZtjHfumwGOYJZ/20bTAmcoVJTBo5e1Zw+9e+qhA5qTds1mC7uskb5nh7adTuLYw/vmDqd2BNoDgfERVusLrv1lbjwteEyE7LlK8FCWdulssjjVwRNixdkpIlrxWdOl+wIFhaJvTO139+wHkAtSqIqFsKom3HEG2xDPNVDNDr4SJvpCxjBEGcQsNNYYhBXH07ywPfQgBv/YnkXx7UU/OwiNMHiAo8Sa3Hsm7NdIZFdaRteajEXs4zNwUrAECQm1UASptch+E7vZ6RepJJuDBL0TVLz2YflLA6qfFHDgyBiVrKJWLOgk2rBU/L+0Qe70VzwEpPoRGbjiHHIhVu8vPh/77oE1jzX+f2nh3ZFZtfIHaQHHYRR3+G9RrtDZ/aLEkj5ftv+BmQc0mrRgdu1YP9PebcjSdk6pjoY9kvWDJopIa3sRds/Wy4qZBQzfzREhktF8edyp6pHGoYjTsqpAo7E1GSviKjEohXIr4xhWlZZceBoi3BCNVTjqKvoFMk6kKzxK5CcM8XN9KMpDtU4oGjyNsG7elg1QN6dJbIjC7D1zO2DnDJ8IOLmm4XUZ8gql/i/OnAnj1yBqZ4hv8fA8IGuXAL2kF1y57LveAsaZ4kTqAQHQE5reY5nMNnG5oGM+6ulLnrjFJqazYZ9vwInNloZAwyQ7ZsuQADlo2CojJqLJhebKQF1PnacuEHhnDeJEUz3Sr4MnbsnHCKHlmQYh9yHPu2oqJKStogsNr5X4QvCC+B+T/hkTjFTnkxxsyvMMx1NPQtTzMd3OSeGpC+8z9zWWLulhGzqYJSRPZoCGG14qnFxTybvES7MVmmz67MDNzxK8G8Vp1sma6vbqLnjtfasyVuBiOTrZ1nP0+N1hZonFt0zKlanAtvOF82vCLjYtntlXCniLDVGxq3++F+hS7IEbCDuS7uUgj6IdFx2SKKCPx6WRzbEsKZVunu6oCxnZDGhrl5n3ss+HzWEy5qxhQcqmtZTTqwaBFjDASSvYF5QaLt/Uom56W94xrlm3s4L/GZhgxXwmMylLN2jBn5vJnLjU34ob5u/4WvrmtCrKuiImkspEhIWTsxvBbjN7VTNEYmkhtlwlpWHqBCDJ5+gkwgacjizNuQp2YjCHwofsjRx/OR5T6SszDSyQM3eqfvk4ZWzgSYeNwbZFntMLuoqphqGxMAZXsXbXgDM1JXAINr3OvkBdxoFwDNQnMHy5pjy+nL0yMoLO3XrdTvXs9zbtQ1vF/LdmMZQd5TRd1K9UHreE6T5vYoqJOFnd8f61+1KJJHL8qhxg19VVrWOI88H5VwDsxRKnFqvMoa2HwuOn9hrvRUR0RRoq0vinN7slCgDHeqRg0rhThbwolew3rdhFb9AFAjbKTWxBlf+8AFMNJ99nlDUVwANqjCc3rKgul9JXIUMjug7bgFfKv5wS29cNFamdQ1fMUsJLbMkiPwQSVh8YqP8C1V7oPPXp6ItzhzhTkOK73AKS0LaTdEvLLyRUMUccnkkme40nqXB/rMNIoyh+AcxrpwcApdYaK/gxy2tDzxdGYRpWnIXw/tox+AKXdc5BPkDQ5qcq8EhGrIKmf2gHq996Y34+VQ5yqaR+dE8JSqCNTu/2LjgUv6x6P8tsYu7VPBIzxgTUVY1gHuycy+5OlO467uFFOa3yRPP320TdOXCYC9le6qNtJoP4TbzPYCscbbjbFNpsM9fqR1nB/o2uJ/voPJJb66xvafAMjau8sq+0BFLw3aK/+U60zlgS5XcZ0yc12B7elQokdMd3fohLZL5zqyWHptNzwkOWTT4lHBFxS3sNDxkddDNJQNOwS7Mve4rXP9lj9Sa/PlvKf79Vxvt4TrkjGkQXAIOvtd/aH/0n4eTn5LbWY0Y0pcuO7GmylkoBGrGPhPYcbc0ua0FzYl4XaPGGzPH2rNfOzkZTSq9fktv5vvhwQFPy85Mfqtl2ROACByBrmaiodDRI40A9LqYr067Y1HEyQeeQxM0wkfJ4WCVi2mHT21FNSCTyxOUhNe6UYl7zKWpAvC5KZC2vImjR+rkHbwiJZT8MtrvAF1WU91cR0Ja+z1UWEuC/XCoBYgRNTkxz2G1kzPTWsJjozhMyFd7J0IPVqTgakp/dPzUyhocC7h0ypA/RpOoXqrJdDcxmTN1zFof3egsU1rHBuxypZmuHRfMViVilk8WZ7XbRHTSPYe0YG5fr08sHTxIZGF3kfCXt1zKVmGOWFJztusoJVsS42EkzM5U+fBHYpyyLJlGOhhyR0VklQ2dEzmzvobRy7AtUuy8yK6yF2nhSu+ez8CoLBJogx2L/dZR4vBoywacdbXbHWMh01zhWl9q7M605vB2Z6tsxY7gTZb4V3lEHsSG9COa4rdGPlPmyQD7lt65vve31mtLM5zkyKaEz9K/7+evvvkln//7S/fW3Os9v+nb/7n2r176O9r/r7wX3/Te80lOLXn6mL9n6TkGx+fBL///64XZsRTinyzXP7/i/xnnvn22DPPvPCtaszOFWNrb2urf3YLkK+Jt1rSkBiE+hn0r1kzYSjDcDPx8hqHCzi6XghtjJUJYKrIYi9vZDaeiKyZnSxr2H4Y+eIF8jCgUNirbAQEvRtx6xYCuNsR9JIPNNBVJ67jW8czLR1Vrg4bmDbxDCvxYjy/mn+9nWnpt8TFr455fQvTC8l5iCsDjh91z9md0wV6p+1O6zlm6J62H7Ybtj8NfG6dRzeh4zAV6POYckwcunH7XLCYCwsw6HK0QgDTgoVcrKdsAYJ76DRYoMgPhBEgqMF+3Nq3AgQtWMxDc4OdqLbIGBUYJGvlRpnKL0Zxhr9x44xx3G/K7Psv6jF8JuXdXCt+hDGCJ4Ti2mcc34cfYwzjqrbjhhljWs04YwQX7llcruYytKqgXAWLE7tMlzmhocCz2jhN8E1WVSEQ5xWLn/5qJ3seI2VwKnBPxKY7pmPf4PeSxLGk8eL/myTev37+RTfCObMPXIvo/bg7avS4/07WmxuVB+KdVqy525v4lPg2bUJrNv7ZMr7b312cPAM0AM47ZeNgYvz48XH3OCfGwdSDY8cf6C0Dr5uHCbM6swSPSbj7re4sASehGuxB30qOc6pzKbrvEvGtzlvCfSHey9431eA9/sNP62rH0J3Gb/+P8MxMKPhDfNs90f2W6OrsCo1zJ7jjPIETcFCpw+haFbaaUHCCyaPP4HbmLY0tbZUPOsoAcEoL/CQqCmVbUJkJ19VBmQ6uZMKQ6ski2FTUExGBx0dGz2B4hL6+DczX3ENyOMhM3uNwRBxD3bWRNt64gsThkMBXJoJeQl4QBYi9HooGbQ3BlgC9QeHRWwPdZRQag7xkFOsuJSLWjgy3wGsRwyPYDW4ZGe68pNLhHeVS+Xel53VxuwW7uU62fpWA6Jmdk5HrQHaud69/0ubs1NCtxP9PkLv7E7ZJBmLd5UA3nPL0r7/dsmwz3fux79//+2+rTNssS8u/NnoGNYZ00mrqs7/+O2TWFjN8ePzw7TOZJ8wP/vXsK+1ZWuP1yJXCvsNjh++MZB63QN/MwO3m9waKru5uvYSlaGqHprWfzNTVpdjq3VYNv6BspJ33riHJZGTiaxNBL6kjESooXA6XgvXrw1S6zNM5cEbWhMqeLajUpUyb9uj8X1rC+LyFVCJF5+QS5P+BDiJjKA4qLobiLAWtx0FD8ggHg5GLijkX/h/KhFethLIsR2rlyix4CAzDxsMEbr02GMrIgEIsDexGwdBQCK4LgR6QrYCSTw+y+GYFteesx4ViEsSGSMVEGvs96XmxFugDbfEAVX/OdGtNbjbZD02iEQeJNFIsRSSae2j8aDQqyjAWT9MMamh4lNk571BvweRQLGJWkPvTgudeBuxC8Qfvm95Plwa/4B78NFVOvcteyilCT7BfgzE+jbeBp1tuI+PocfaF5m8aKMR1YhZhT2MLBzblG1CiGwhgPuM9rGxsyIEJpcDKmW9sVITGtxH5cMfYWAfCwQ+GO+B2/I3yDVWdw8XxqrMdN6GckLGIA4hYpBNqk2NVtiPOoSrHQAZNNdPBUFoaFDwNBXUpGJoOinBBXPBkzN90d7Kn9Tt6plv78NO4fo3j/M2dRmH3t/KoNBM6lVdJ5VHHgtpYwFGaKzmcBIRAXSELCER+RaZJ5n5m5CRzjwT7+CjHiGb01ZCmrdDSDLtCUWcE5TD6jFsbg16/PW6SYgQmrQyMKKTfrmyoNTEEpF9xZGAEyHiegh3pHpqY0MOLiOTeq3YROYS9HKoHVdCWQ4iwpvxzhJRDfCcPxRw1QWMUMiVGBEkTEqTQXGIMSoo26dCQg9PnyR83UtJw6fOUyxwk/AdCIE3PUwyptCcbP5LdgsnNYAaQAQUYswoZTCZo2yL5QAHfs1S5wvrNy9wT7+xW6MycQH6cRR4X8UujK/xBbNNCy1XB0ASd8rO8tizMP+okyEVexZGvoRJBr0jk2ahL1Wk6vtY9/DDi1RvkUZAatFPqWaFTEbjRGjXQTOB9d05GQDHFqjiYgAIUg3i26TvP0rIUP3ojJsLI3ELEGpBCBTI0SIKkAzQLiQU7JlpJR2kl1XW5vFynYSNWjlwZIQsyKalJh6bj2KZuwm/00s6SMojv9N8Rc3FvwLy1NjKSSIycVlS8HnJAAFV5V6wi3U1KWrskG1oIr61Cp6OJs/qzJFRwYVoUFAEtluPFO0izt+VXoyFVERz9RCmVKhq+Ct0V8SjSdxmNiDB8YhgRqb2qTUF2MmIUaDN+DIaF6FboykKKfCfnu36QfcF1QgW4DD69v0b8TZoznCMhLCJCzgGGu78xf8WZMzGpwcGpzvtPrhVGwlrjQ/ylFUYDg031BvVNNHsuSOrRg20hAv645q3TrL4PalSi4mGcDFE++rNO07jjeMLcT65hI9WWV+FQ4N7T63v/2IgQrK/+W6e3+jI+m8NX6087Tbse4XWiO3JO+padnwOecNpBYmO39N7IpcamjCav/MtNOeI277aTwE1zv7Skid1UUjJSqzecnp6WPqZXC3x6sY1d4Onnhq6jF9jnh5rl89PGrl032bfwAw3bwZdnjdt33SLScgAus7ydm1qKBTQljXjBcSA7Fgc5xaGG7XZBhi4QqeVgPmEp3NEJl/xNjNOOt7mt4FQdndu8OXJ4aTEUv9pIqbXT5hquBtwdoMa72tsn0ZvXeCf6OPpUPcWrfMjpnFKTVSfjSY+9EyobPbG5PW+eeeV1grml4CKPEnR71fwWXiClMGirCwZZflV41JJW/9ksh7FCsrtMNzfjYLZRjl5/lqFyT1m7hX+1WG1tSPO/6M+wpQXcAhFj9kRALGf/R6ALf4jFjDdvzi9u27O8rTi/Zqiybos679X8kzYGstalKxfX39kQJao/7iHG7tpYuukQQrKkJxGjF/2Xft2m6sgPYaviL21cV1Q3dJgK7pXpWP6l+Cu9clD3qU5uNSFRnhCdNJH9r3v9ffPya1tHb584XHr1nnmxVXFU9kRUcmyC/oTOsx/e1FucaLQY4bKmblGVte1OG6N9OCiAWoUqujs0dFFAyMqKXhvCcp3x49D1IUWos2U2qi3z3sMYhRMWLom1iTIcN5chAAehnmNW7v2nlkdTL5KoUJtoa1/jaqcmq+1cj4XKNhG8r6ngSP3opQyJRLD0Uv5xneKb0R75eGmwKffxPwj+mVVnu5R5qDjRgKWGiytlU/UrTCt6c3PFmYUOgq/ISaShGbDbYzJwuICetfiO3OSD11swX5PKFHRt5hPT9i7w3RHpW7+koSCIqkltyVjiYr9buBN7AX9rdAW4ucKr0F1F+CTN3woFkmSGtwYzwDnknz/Ic4CqGTjrhaMJwWKj56VPcyIQsm07AQmhUzmwX2fpZ+bndSduTQ1DKHd0iI6+edPBUS58d8xCLRIApJYqAOGJVN1uvXmMEWZewN10590pLw8ZH3pJwSZO5eqF58ZbMzNOig5jVRsGadyBljw+M9PT5Q+l1dVSY3n/hg2lKH/ck43pGIvFHXv28AoK2js6ZlmANdu4/fby5u3Z0yEWG7OmlmtU1h+nr7Si1PF8j0r+t5qy+p281ftTRzSdF7tWnraaUv/xBnTGbPum8kc9ZTXtRWy57+DBMTTJhr4DO6+S681h3DBzenLVPHYH3YaEHjt4ELIDfOEiTAz1XINOQ0a0ZyHRpzeUtsloeVLwSnS4Ua7FxKp9Z2MXosJxw6jHLxXRVO0q3VVj/Z6FJBs+eccwIyUn58JQr7Jtgt7ucG9yXe2ql1tgb88nvw+PtLppqbRRDpYtAYSCEx5hrG6GR0IUxxlOboGLnstq96a3O3Axf9g8dgF7rEFkIh5w5atV85h1mHnVE10g6uT9T/TmHeb1QEc8BqqvVVZBI93HgNL13fhHFwWYg4DEDpi4UTeN4Wng5OqE3/HtG3fMwox+HTu6Ja4SA2dHfeaTJ9lT0bPxtJN4ZYeZnx6XTuTtJnQRdlt26UQgPPGqqxmdDUGE+HawV50DVQ4xvn/rLvqzAfCgwZFWu4lwNnFPmF2MuVGEjo6+3LZJGtR0JJ6ZkRnKzXK2ikzSZsOkggVhzpmRRhkZcv0j7UHSJhtmvI45L9Q8K6LqzhX+wdvyMpPEAjsugi/aqS3I/yvBDXP5N2E4wHlBBD5hv0HKtqRUnQgdWHDUNbVglbOLc3za4piUhavMXMxyT3PU/RSouhpKnDIBK1NVw+Kv/h4BwguesR77sYJB7gE2Mkjjk5PjpEPzILd4Z4ZpyPG44x6Zpj/fhCA3XXd6wbRug+7sglldEOK04nIYKuiY1zGj9e7LIOPB0Buco8vB5VBUcLLR5JHQm29DvX29yfF2ewQPeQ1NDLsl7j91xeWWEjnkPYQ4b59di4IKLvXXFQsFFQTb8rll0HoPI8PQlkHLZYxIKpEvnF+R5xzyJiHtY3TjwX3J3chrqJS29n3yQ3459NI4eabJOABWgBT2gRdmLYuUGeiLOfb4ME7NxiOTOxxDBZ0lpRm/lHDzPiM5ToS4uf+FGfemECuNgji/T8wNxl/cxR001LFPInT5u8nYTV/XKpE1ogEjAmeZ+nnv0xOPLT0sE44z/31PdK0Dm/cH9OX6923ZTyicay7f9/fb2YZH2iXJWjhFADUpUnqB8qV6d9PY+6v/bWGnDb8Y1Aeq/mnRSzu2sfj7svZAqw9Bh04217tGuvVOZ7Gr7C9c/eoTh9OYeiPdXOubTx4Ksv6wQeZ2eO+YXlpL1T8H0tgvhtmWqP53P5ODQ/IOJy9+BfrwkiVmQOEsyYxOS53aVOX4U6kr6PZPb0pNrZgRU99SxcblS5agD/MrnLyAh6Lo1kUijXjxFoonS5bxUMko3ohH2wAgJBsEprY1werEIXNP/mr1jddccrFxgQtfrSgKIHReZ+xxwE3YqqBOGEys1rFeuWXDxp/tAsZeBxzOXv5BLU/AxWJ5x0/M/0h2wTU57qHDHARhGVvVv9E4y72HFOfp1SoSGsK57jm85Dwj54lh9fGYqgFfIPIi9biq4t04PV0ZjA8ksRcAnh/V3Yh/biK2c1Jz9Gq2QwXwiv59NTD1PbyjwOCBfG7vd4WQvHhpHCS8Y7l4pJHnHDvpf/pmXn13ELYDc/H8RUwHNqi7Pm+R5ul51d2aq8NpE4hRjnPIbEcLREdxW93FSOtnyGIQW6O/VdBKXxwQqiQ8yd6+/mZpcxbbhQZpicLFhVXAjy5t63fB/JqAS2uXhobdg6VpbrJ5wuCx8zarka1YLJv0K9g8XFKY2cfgmr6+GsPwBIhGAwrLyQkDhhygHWPzVnDdnhnFEaeJcq2TVi6axRl19GmVRk1GSg+ifuRkSROb3GiogVCQ2gQxLt08AWu05zQIBw8MayaMlOCesBV6udW9wbnBhZmTm5vDdGl7u299CbUirxIIxI2W6xFnzyISrzcEvYrI4pcaCtetM3Upd/Fr99nyzzrAiaP+QpVT/ZitWsdfKpN/6d/nXFycTg9Vjrhg+/ekRNZiqNiLQRq2oJwm/w7xl2pjFi12IkqldXW4YswyljyWtYwq5UopI8tEsbGiZVR/jhS86yq8nr9ZO4rbjyVg9uPwI4EhYAdHtZvzPxwlnpl8V6gUCoGQ+wFUjBzwaTCAaXzAh7ANOt158GCDpCyT5dLymKTxkFypOswiKZhHnIlfQWRewPGoGiSbS0zWBq9x83JzvPaqMY/sF8wHUTtgJlAKnM9xbgt6pViyObxHUz4KHhs/Fnxcs484vF9v//DfRqWTZcb2xmWT++SVJHuS0lC+/NBydmkgcV5vnhhImMe8wxe9pv4MBHb/CVHzhnsw0rbXx35ry61P1hqp6VKAORpPK6edZ1Nb1QmUvFwaoJXzykC0anwC5NDioEmakq+kTsA28WCH8QnaI/0NFLl5Ogo0uem5aNmuOtSTXzZdPcDRBI1VzBGk6QBwJjunYoq8ebE12dy1qdnsBU2WuLM4y1atSp5b28pKvZkqpMIwXh/+jKSDB/bUcSm9JABkiYNQjG1NgsRjQNCrLJLwDnbHowC6Wsju+P6tQ4+cS/Zv3dcPor4KQfvxg+dwPk7Mu8Pkf6HSZbSl73guxWcEdc+Es/YH8uSnTyeRGSDGvOt7sseis4PeEcBfr/NjpGfyUVCQc3quU7ndgQ9RG+kD9Cb6IeY/QG8894cqpQ5QpHOH5qSUARXKVKmcpJFek+hkJZlHfk3mFpsRZgmv8bPdygHhJM4Sj/Qyh61O04xhZhK13JRrJII/Rx/TnxGYvEnCL1DQH+EtHhOeMsCHGCivAIqCoosQA8VCuQVQNBQ17LEQcJwTiSnkyJgDvmJjEwyWhxusBd1CvBYv7AY1vuzWKgURgn5LuIRhICMGznOX8eP4YWMXXjXXhaRPcuJW81yMAwhjrDFCAOQjElVzIrx5+qaR3tRq0Z0EDePG1yOU9LI751OabpEu+DMaWkrxY6xx/DY8zrqPfQ5dmu0B8Kh7J0+YUf7MGWyLSv0QlXJ2zSLiszv8JKSCBVnpvovstm+P+eW7HN53DG4McFkhyFjSud9wf6eyAHKrA/7oxv5jdJBTkFOotE13g3LVjQooGBTGGvqx/Ypig4ECUjdCuW62WeBmtEhibmwmEVUursYxRvNkD20VPFQYUiKqIE4UT/HQSCRE2i3QypUiiZmd1YNOHKrs/qWPMib83yOqJPzWRxqTqCkLKggkfVQY4e8emSwRoRSjp+2Rdgx2RCrwziimXN9Z0K7XtKtgjFdAu9+dZ59kny73acue3w5/OEuu+sKd4d2z+Cry7MOYqLWZ1sSvAM3jghpDMFgpszPhM7MUC5UQTsScrwytmTwLXLKiJodJCcSRyc040vDk+ItORaSOj2axBEp+nCo0AaeDZ+cMX3bch8kRIm4zVbqiZdLRWEjWIwuNHSd1e7UlpxcPL3zAZ0PaY0Y/Y6qDPc/u1+3nznIHqNTl3LeAp8tjz+lR6168uEIWktcuNU87HWAcVQ3CgL+k+Pzzh/Q8VJlomUyJyqM//HpEWhwQHl0dYHw6zRz2k3CoEokMnVtkttmGMFN5+UNKDbLJa3G538XNJHQxVjWowEBL0aTdbL8ql4VEXGRdIOOvyhuIDce7Wd3HNazsF5x2iw6LZosmmzS775KG+UK3FmCSkhQLulmxbXMapga1FwiiYkMrYw0i+LIwk2hj09BrtXk/NbruqqN/kNFukmhcgBM5ShAso2cXDngd0xrN0VhyogclprQq+xvekHwkfJk1VbYgVMYMt2JHmEaGGY/282cDyU2PxOXoyuNs4+S6saL8P0Eawi7XfGRypa1SriPItz3S6rewpljFYRcNhotS0Dijx5eObGF3TnauPw3ZX32T04YMnPAteifBwgVX7hvZ4yPRu6/mB/C6y7BICuc6b5Unzow8fsNhTbLfkQQUNtxcVt0b+ar9cpcxqVYUBimVUNgzQV81DPKLaCSjn1vCB9OhwEsOftVgyJDQRdGaMZyNpWa3qQ/8p/wn/MetFG/tyE3ppgac8dcVpvwfsBVTKO3i+QYWYUAwT1zO1J3SjTOIo45DCGicSuJOA10Dv3+fqEk6szr/etPvI+Aw7PE6TAuCeOPIrCAjKmbpyEMSAtNyrC4c6wHD/pidZejaWYK297atTHbHdsMkYRZdu6vMH+NUH2OpW6ZcoCw7xbJEK9+2U540wLiBxSkVdFY2MDHeupFxN5sMSOQSEgmQSSVkcBNPINQLyzs7TdeaRa+J3gen8rdMVSEk4IIbgSEXAkNfto4zCQ4JpryA72D+zav7DKWGnaubzdaYRa/1W7266HjTzc28BNP4JAK+2Em5a1fiA3vnzj7gYefn4bEzaiSpVe2Wm9ZbVZicsNU1pqEMHfhBQqwgCtetLCF2VksITd0STUkKQXrZWV94qSK9hRC+ZPWSzKDyqJ0e1tH+ydLk3BqSxwWScMCxuWByVtjdRjQNgaXEJqJwUemiEiGxgiSE3jEazZssKszLveeafMm1f3X44Ejz7Dk2YFPOqIED5Ag5ADPDx1qaA9XZevJA14VWs4ruBadvnpAM5BP9UMXw3UyFDzng2wu9OYcDWFHEed099ytm7dfbLdKTFXo8CbBh/xE25EBzabSfNCRDZMNJT8HDSz0IwO19NbpRNkmCi5FYgQ5AbempQMHMxsG8Q8kDxwhw8uCjT6Y7j3qw4BHggueaquWLANWpJ7rjnGSwieCk5seApPmVZKCCIAWwRMtfax49aLZwLwRF9zgnK6J2hnhEw+KjHh7vZJutk2SQbJd+IlbWaFORAcnaDCoVSzEVpEY0jIa5icqOyjPYIoMyKlC2C4dIyZPQxUWyaI+QnVFQlIfX0X0nFjn1xgBo7yLngSVSIr99DwRVFrQdlho0avkQ1YnQOHrVzGZ3rxACztaSZ0yWx86jTHhMW3xxLyqpZzcTRiVGHQ1E5Y026MDER7JGlDmmkViOhoaYiyOfz0dBrC2ym8dDHw0tGMFvXjI16x2yMYWZR3d7NJsNnMA7Q7DZYGzjaaXoy54qRBUSJc0v/QbyCRIISAYKCGv8jiz0kAAoutfZWzXMfOaMeCb+ku02CI6CZZttEqOqZA06pEfQpB2qSfYVRib17ELRRAErNBv/Q95duYHX+LVgoZufR8ERvxCVged1NJW6PAWljCMpkCDiE5380QYD07/1VDei/37DzhIO+uEEK56ho1Uq3AVwWnLar1/Sz6lidli1W7ZbdfgAV/JLqyT/UAMhXc+OJ44dqyc0ceu7LDVVSHVkZXbCAEU/vaJP+UsD+QdBP3UHbBn/UtOENEdICAHVuK3QNtTW0TbE1sm2ljBzoYyhTMLw+FzvfcIUIREf5PtbqGeuMQmT+P8s/8NXYVlPE6lAywPXI+dEh92OfOPo2WM9t611W+smrC+GZh62F76afsVjHYePux3BWeNsJ7gzAtVNP78wihHrRVk9eNnw8pLXEaL1CMxK09aR2QAlOxKnbh+o+Z7HGeSvX8jEZyaCEylTVSM8NAQDNzqCXvLRCDyF1cJWcmNKpcF2pwSjBEQgLNHdLLKS0kui3aL/LLqll7ot0zSuMHoL/mIBehvSJZVxx9tYFFD8zCpwTXhiCmY7Kda1x/1Ya8g+r8XN9uvsYwyr6HtRrzkJjcQvUsOT3EJdse41+GOGjZHI/TjY02uY6XMeLT99IlUalymIIDIm0FhqdIqz+H/IYBky06cBwhlxKfAVAQ8wD5VC81QP6o8wu5/oAT0PNkVVqp5ne+jNsQ1OeJHm2fMkLyIvnjjw1JWJMARma9lrIyJchLBYe+rjtdvwiwXv4JYYWPHPwGLZPknDD8E8/ADxR9BCat51MR4fCb/jPg4lzhMfEOYHfgzME/w3H2FfCOuz4IWyqiwiKlGYN/0+4ju9d6DEh3LpdXrQSt0yBuWJo861qOjoz9mnT79WBNXHMyToa9FRUaP/S9npoHD0R5cRNr5Ozy9dixYXPcRwK4UHAUZwyEIb7Xz1xUGF0gnz5KI+yF4cSomE3UFqnwxaWADJoMiFC0MMAQFBtrAgUtoTFsbWj1hPa0yfTUM4yn09ueAH0eS3Q9JuZSbwyQDN5Jj01oT4Y4GDOAa0xFuHq5GadedmXs8dXqdBqu/ElvhocLM7BMrMhELomZkVAnA9WjNiNyTy90cgfHMLBmZ1Zj8/xmTaOOpLUVITl7QTBYsAYVZ3lpAGulLso4Z8jHjlhGkdMnBV8OxTEVcJ+7CP2Uy1c3LBuzmf7ufos0QjJtrmPEb1mVz8bEGEDhiD9oFxvqGmIrY8tjG2yap1srA/RHhs6xcyoqNlkaZcTse21jD6LPss+jAd/yK6k4aVhtlpgeF+i77dK8tq8vJYm8UciMhwMy8XBZYtM361LKCs+o47ocIvqBxJEeVKgg5My2zm3mzzjip3MOTntU8lUL3AMdQsWi7YBZSQUUZjYRlYbT9u16Y7YBb71b+70E3EJrQ3poJYgfFies9IjKUUb4rUWHJ2H7OCeYE3ncObnzKf3rDz/131VlPp6bNfkBqGBkLnxkqY3U6oQ0IwGOTUYF4lguLkQEQomwgSQ3I5JAKgKM7QXQZimVownT3T7tvh2+zTfNKXacls62VaMFPYmnGmcQ9msv9At64uHqXsPM9oMm80LzevaDlIoRvSjGiG9B2VZL4hz4BH4C+r0+gyb2qVna7PaTfdU0eGjCADi8DgczQLUJW0CeYEZj9uHscEdCVdxVS9A1bcStZJmhLSbAZczbpAnXFbciNusZONPo3e5T7lxp/jO47ZDqe8m7wrvDvTgmPgID260lVHDwqs3XQzZzwAKB+E1imKobolxRoMrhZSc7PrcK5qaCl/AQ8ToHIAoBn48luuuEAIcivZGIcIwGYhIGQAcqkLIrtoFCBEyTbl04G4IAACVzpiout3lEJQcZxlA7IY6yKARNmYwC+yngAOjbNkpL+YTjcAF2U62GE2406Bsj7UWDJyKsrSoIsyXXjqGEDSPcw/l3/W9bB5em6Qr3L0Nz+vFX6q+MTebJ+e1wW5y5UPlM4htaYCZ1HOjptHd3Elfmdycs6UF3eu9QMyDkH4y4036kdwTMmtHSF+GMmlHt+8GXekBIc/iFVJ4Btmm0IljyV+a95cmBT3bqxD+6Metdrimev8FWJXPpsK04VsHFKOZAtRK1IZDPx86LAu1KNjiwQn+NXvwAUwMAkl3Tj11uId33esWbnjh2ZNveS32rq3Fh/G7RDn3Bu6lXVma75rOkt34A4TJSh3lg5/7+pLH5dXG5Sj+eGai8AyGBqBnNjaFhm3FQH33HLiRdW0ZAu1eCaDCZzqmKrTuGrcaawGK3TVeoZmouOrJQ07rBrkUk8Ycxqr1euZkKPB0NkAPJPmdgl13bwjQW/nxQpfmrDPqXEbFe+d00AFF6DhOdE9N3GmAsKBfbx6dcm6stTzLy4ZLvbdrkwd/e6Kiz+26Nez0NM7ujf3xdRSPHGzwEU3W6DE5/Fiz+Gy3LZfOXKufCGiuMgFMVB9KaXUNlZwc69hoM53h11j5YYR2+FxURhRkS6Muxf70hILGSIcbDv2MKdI1ygukNw/NVnHllhoGBoma7XJKP57UO/nuO+u+kq37/GHEUG4wBqSYFruIXVwkEoZeAbOQCYbHEXMwDDAqJoBTPjocCgvD4p4jCpHJaLCYyji3mpEAHhnUoYb1hzTjOHLKPMPshMx/ZjH850+aH7k+xjTf7QvFFLmQGGPMapEVY5XmDKHJDlGnCWWQWIxjRs+UBlxVvn7xjipDNuBPYYsZaQH9odQ9ZTbsX0YVCxgO6aTqEVphnHtuGE8CjeGb8ePkU73grMdXSZCicrQ7aoJfDnLYPsr51fbXbg1s6a7Ka4pnlHaXFIrcThlTC4Wm/tvr14OsVNJ1GMPZ2cOsdsdBRP/zI+awix7HA0rCuaQaAZ0z/dzQhN1dmCupOj+wUTryujYDkofpZ/SaYQfZ6A969HlBD/ebxL28m3q7cuX0e3kdhJboQAZh43D6U5zdeS5u1pGLDL0D6aJTPIFqJyZwcS1BSEQD1odXAXn5+CYKwi6kciP4eDCCWCa+MM82t4aMhK3sxGFwyQUDkWSTidFJ12ARdIZvpVBR2IFdDrobt2d9Nw+eohiIrgDT2GVm8EnKvexgWvtvCRwPU1Jq6rbi3DiOUKbB1BR9RKJE3JvXfXUXaqfzxAkv0uadLbWumW8rlYx+WKw6CHYisbLQhV43cXL79OiDKJo6MLUr5rLzJ/7IMMgg/YfDQ6h/L5Pg1LV1QegyKIH0QGf6FnuZPd6Zjonx7nLMEq9HzqN6zltWixJDB30VBVtc7iqFqHz4tdybqNzRbXXBNtV6gHPxLCl0mF+D+402K+O6jLMcU43Wc/snuQMPiI4HiBQiOdId3ItVuExmQ68+VvpQ4QBCsFxP/HhIEeia3haVI+3KyJETVq1SA6h6nGnRUZLWqSPWxlFsFt6oPuntzHTSmqhvcrrEfEe6XGofdHicrsEQ0lrYJ2mbGVTs02sje5JbAb2qm6stU3zyuZcdf6e/EX5haEEz6XyybJMs0yqtoN8a7ho65YSGDyOiSZR4mLm5FAdoJialAZd1mamP1Ave/LAIG3uLZH0dm7mLYn4FmCz1CQDhFxg8MlAIEcYkNShodhP2PxfaNG1+HOadF3EKGsX3Y7i+OrsuqvXKQ1GvsD0pNHQN8vx9+ZGErO8e9TSy+Fh5KVUoxFXCnpTzbd1k0uU7uFBwqCfIYea/Ru17hY2tMqf0DGpaydKDjVYkvPRQJvVF+vV+Wf0/J9xk/yxBhP9GY5ft01QY0Y3dL+/3L8ym2PSE23wKLz0ZVuaPpFg5m9iGB1nHETMqTAbmMzuiCU6PusdPx/M/5zsQvNU4fi4oEQtaKSRahzD3dfEjb+T9A5Z4d14HIpH9XK26zdxZPPYleFxTfo8qrv/UbYnjyNk89mVSnmz7/o0j6FPHRnYRaaRRQzvuqio+gwDIWElQehBU1AVJqOM8XNIBWIAN8hU9ESt/iP60y3Eq/HCbrXo0IMj3/bNYUGMKvrpSOx/odD42fsnN144tXHsLDR+L3QkVucCbis0eJLXE9YddooHDW4NdR/0PocF6osz9JBnsa5tccuZq8s1HXTnp6GLT40dSHse4Rtrqrrlbxgu49Wqhv8rVFxgOSp8zZYkWGhz2Tz9pcvN9CG0lKhvmQDPnkT5PS5liX0dljAXcv/FYXFhAg4TYOJSTBylihX/DStaI3nh/oaPDSGF6SXO8+E/qVNOzwYQsAL4CLxX1B4sab15iSR2bVnGNDgtuqmyJqwmr2amJMGTKwcP1NIP1jvzOTL21tnvnQYrIT4i81FzEZFB/giGDHR9TOqu7EJ8KKOxuXUbVZ94J8oo5gsM6oETiWFr6/nIi2NvukRMiCA2n32MiUUJJ/f97VdkgnlZUPJulIJ/uK5zggvdzpTaEck24LKDCaaCVIEx4aCaSE1ojgmmhSIOTCO5HL2hlTXfM7NYWDUyB2mamqFWFg4uExpnxRxqLIuFikNiMwdwDJw3DWmPFNuvHhk4OkQcwY6VYvfjfuKG6afVP1Wano/bT+fe2LFMdTfPme/Cd+Yt6KWSSZosZADizlGNjekkmgE16b0A/E3iErU0i/whelqtPk3EpJfzqYRsYsb66afpw9+2HwhMJKS5vIuLIAYnrKUiqTHYGPn1ZqUES41B4jh/Av/svg1cO3IcMStgsfjznCtUwDsBv+OwmHo9xf31hhrGAewYtB/n3OsyI2eBMvoJWjm4QlVCrCYegKXH6Y20y/RcSDjLfY5gcMO4WGwVSmwsbhhwd1ZGaAKM92Gu5h2OY4CP39t6FdtP8o/QRNrjKa6wC6mCAHRVNLafjgAOPHj8TTYHAc8EqjQjjBENITwIv6kxZY2tHazLCbUoRzuY7mShkQgQsdsP5eug/feyVsTe52U3N3eVsfPVf44nG3pGsrP6vNIDkEiMADz+u/YJKPkSuC16DaEqqJfpkEn3XWfH2pqXVyDqEifUSqMepMgBNJOa3iyuiKzryIYhGM3i9uSwzUYDNYBQHx5merGhu6iBz8UV6c0ONQ4bM5wSasWiriqbx2uzItkX2flnPLNFnDVPatP8kUCA4kIftV6UuB+37XzXmaJh6tW8vKv0oF5CVfSaIDNjzFXq+CocXc7DXa27RBVgkWDeVw3U8/ujhAm2Wzigo74iIJovD31900VqEXBd+pBCGGYOd1OWURwFOgW4EbxcE31j4uO7s41cDPy1bwxjiS7EWFQJbkTzRvUfYZvOtsHvrprTrGG8K36Ydb0T3HGE4dMN5Rx8SYF/zzQGXIruH9m794j+nl7HhNbV7CO7HG2R4yIlawJp67jrCHt1q2NC7x79bJ8NW8q2Bjlv8rc8G2BZ4bYOLjkyw60pwPKQiCudg7YG+20OsLwTfSe1zX7BVi/syoAMf8sr0Vf82ybxZ1i+NA4ih+SGkIOMujD6C4S32ON6CQbLaFd7NuuZjIMDRYIVhmBlj4PcgeEKQY44nezBDg1r3S3hyvYg+6WvcFEBR+DA8AVSEefZc8QLpDk2hdB0YWCePT9wQVtjUUJfOoJhbiF3GIgxSHupcoAHcmoQGjjZXlqNL6WbB+7qYIHhvVGX222XXrx0vfei7cLdF8W9VyaIiPYLalPjhxxHzkN70/UfuannzN87oucoNAqHMVKKOPQPH+hkmiENuL+vARCMK/9rWpkg+f5QSgpl+ylnUkCuZCHHD8TFQ2K6b3Pites6NUp2VxgmI9EzqdaN3nMSckRj+zH4kt6TQrTqrS2py4gbMsXeu5fZrVCIofh4IGZKWlJPnkKtR6P+fpsbL8FN+jc7vRDKWivgfCSkojjvKH5OTkFQ4qiMpRJesi6VGhd5VyNErpTm2Ckr7XIeP8US2kI2t/P3Qz4mp4EFVclxusGbm9/gfqxhtypFVSyScuqi/pTf++dAS/hp5w1XSIg5JRU+C8nxFigvFnD56Dp9zoD7KcOoaC208dOGF5NR0eAbHfX30Ey7T4dPs08TEsw0CSTXoEDyfgEHESMTs1yqArtDZQb6oVG7YOlxGdVLl8JxBLzeFxq9XkhYa6o0F45CFxRB0SA0cVEghZq1oTYPUkDrVLqJSXBFJZQERWUWUw41N/cZ9KV/p4HEoCMyEkniGfFIyIjIvujcAu4bjCxE5yBHtXXxRjEKLLErLxbR9arZR1pluPtsvYq79kIcs1LvAU7UM8hmLpew2szyLa7ikKKN9e7WFV7uCf6rYrCT1e5J53KfCXrWqyexMav8wfyGViSvH5+HD+UdacW0Ynmn8X7YQL3L2++vxT7f2l0zu6EJvQb3eNePjtcbKwukUFoCJAXS5LQglExLhpjSEsDTmgq0LkzY2W3FWUwKNggylguh2iJarPCER1SLSQJLsIO4UxcuRwf/lhFqXt6KQUejX93C18gepTDyrMOtUlMjrPYPomTGB+Gbw5vTVOn/fH6KdwJCGkowARNurqQdO0o4Ksj0gBdubl0KFUGt6+HFOIfMjc2O/U+hTQgLq0YE6Lr+/C4kgZqs0X1DIvYGJZxTCNYUlCkQixHp5SAQkhQtAWS4l4Vg9Zof5qbDjv0IUfeFRSAdNu8G4Hw0VFgIJY4GwBQDLS6EowlmjXEFEj8IYrvT/PxobxGqJm7uaaix2CH7+kgxXuLiB++NyC5AWsWnXX2UoSux2vTX/U1ih1DjaxuCRqOZupmjehuuFY3nXIsJAzLa0pieCGzq5KNMc+Fjj4xlvgyySL/a867gx9KNHt2dA20sQZBHj9EJdB1EpKXUz2YlOhvpQAWIaGQJapWftWUgIpyVtPn4OWLUKroqwCw6gKfgrRL7sRf44+6T/n7WKZSASjPdtRS1csc9WoJmGgVctlUicIDxBHyCnkCfHD49+UTL03MccdRbU6DnMOLQT7OQxt/sK7WB+hU0ODR8bQBuEL9GwTi4bxr4a/v2c+eiIPirKxUOB0FnuQ7cgAC6A93xkQaIgO85kVYknNPyuQtMLPYSdt0BaSiGTHvdQ5GRYpLMkYke66/urWGKQjllUcH4QnTWoi6FYXax2NIvdpet6S5KsHmNf1OjhWWf3H/AvAqtgyoA1GqoZgSwRqHEsopEOBEaCpzEUlllAqRIt3IueF+47HP5kvclIwP33gWcyOrqSE4U77ig4TI4kbyo43aKBlLyO0Npfr7UMMBoG6DhMgylRgHb7BQNrSbgTKWTOCRKa+Kkg0GG2Rgh3SNFw9bUACJQqmNerNJ58IdWSJ6amZkik6dLml4/0slTDx9GhOTAouRCvwt7guvFc7E0YxJ95tYkj3yLHFYDEMuVA4Oi0i2bgLdmZsnGtNjF41eBWAyuQmIRdJUmCtmASIz3oMlpV6lycJUin7sK5FQQ6Zc242HpNjPLbpYei+a1uKmXi5epB1maRnHn+yIXX767s2Mvs9+yj27sZ6TIZf46MESo5/bcOaIaAN8L6kNgBOhCQdwqK6YHkq9SAqjp1DH/4Ahr7nhJ/n7u/sWL95uUGw/3fyIHcKTQp9lh43KT4aKOSZK0qj+ISKCEI6jzc9a/K0Nppyyf4SjFJq6PqfV1N4ZNhnftam7mcqnLalbVD5uU+KVfkNuiOdlz+uKFNWTgtmGifThQfGLPr1Wxm7CEacKzZ+3z7Z1zp7nKjonuKZ0pwvMancBA2ZDweccEYYqA5kLc7Ndb9uSkNjDfIZWOo3TlUXBUCZzyvy9y5C9xqIutEZ70NjgpGNb3ufmdH2cxSLGkWJFHLTnfb3ItW8lU+1rL1BWl1UL+KauGuFLgAd0SxlGQA/0Ekpdn0aYfCz03ktjU1XNFte87IH3CzkKvH5uKPL1IhP4BJCVOCGe5uXsV3o1cAWVMDeS4Uzfq5VWcmcuoZWyF9IkbC71ebcwI86QQ+gb9cTzdcFk9T9/HxBqbxMY8FNg4qIEH/FLtJ/JTk+kkApk2qRa2J31fL2eojd87koTqSRqZQKIvwIFrIF/U7cXcuaY0u6dnVe8aML9iB1AtGrmgun+h5QAqxMCrVwOIc5joXpkhFe2YaGw7uR0bjWmv9sZ0YK66Sm7mbs2P1JgmzDCmmdyB1rcXiq34pu2bFt9K9FV085Fdv2Hod2MwfQYd69c3WRZsfdSvSO8w6Lt7t+/htgJLMHf9w+14pIx03X/medAQ4FP+o23TbVKwsPOkYsPgdHoROJYf/QqtJ2RgAEZQvQWNajNiHUaHGLwT4HRhFtb+2Xoyc8CwK0PRuYi+cGrnSg6HaJS0BaHnGIEcMmwcPN2/MpG+2Ggv9QSoZFZBx6At6CR2YiUrYhmC+PoyhbD3vDvIKkeY17oj23DUuOVU7x7TqkLdSY4cDxsde2gDxYfgbAeP8Y2azsEroD7d08C2ANdRp8dc9W1aT7Xa6GNyGPFUoyuLji03xnZpdmq6sMYrhhZdMaIy4+O2W9HNoJPMq5A5mY04EwCLI8zVfSF82E2xnbhd4c7S9wJX4VOQp4NrutuzlysvW2ejPiwILHvNj280jbZ46DgA+yC6HYJPIhWUpccaCdL4XfRGjCUREKfYIESaJ+2VueSINWkXQktrdzNOOBdBKGEccqhP0jPXar/hlWdKVysxNdTtqIXb5Lzw1evOS4j/H3O58PwAaY52Ba9ZfnQ8ftfjMDNWNsroPEnno29LWBwmFzuCd89F4MbyCErddRQMbpwxFliQLufEy5n4KdYDOrNTff5pJg7la/YkLlyp6v4LRbx+E01OB06Tz+ylrtvzuzviO7qdRCAuDoiA+BCNPb87zC0b5xuQI2i4XtKdLezH4cURxIlA/pEIV2cL7xC+MEAsvM7dL+4XnxYPgz9qNSooMCoqYih0TCbz9A0E2VmSqPPxRegztFdETHboDPHVGcwByuMnlL0iBGXt+bMaYi/62TVyD7r36rNeciaqL9w9aNFi8CMqI940ll9Xx5ebxms1yI+tq78PxJuOGnA9TgreaERZbJhJsElRkXEwJ3QfJ6wfu6go2DiMsy+UA0Dpw2H7TEJNgGgSZtLQNgH0SFQtYIEEXPXFkN6QgD4EvCA18szPX2cPPn+gIc8if/7CAETTogIxLIKXFMBNLi7r3dwFfq50StBm0aKx9kakCo9diRzSSy1tpAZCFgKJu5uzBrh1C8I2kxcCF4Tnd9pFk6edn3VB7hrKcr2JtW2MsF7oWSl9I3HV0bohvy2UcYBNmUSyWMjEkxNBr3qf/Xth1yE6PvtltqhFPyaoLphz1P1Fva6MmSNnrKKqNxh6BqlSiyqxqcy8BPghCVWGrA8i+2EocU+LvPD2CrO11oRSb/t/biK9XutOqCE5vlq8PVWZJSfJgKAzW2qeQF9ACpWYJdKMg6noNfQ1ROYptp0RG4lNHIwcgAijne8iF6kd9ZzkkmFkk6NT5N+MP2TcNGOqSprJfORlDOZyJpEYzMBlDPa5/Vj/8DhIVQDJDHK7CTJlTLSVbtBfDlEAjm9YmgUlgvpUWnD3+GnsggAPgojPNKdbTpwBhUDBqsw4EA2KMwGHUXMEBn/XMLmLuocqEvIe8i6H8/LH7SPWStkF/y4tSumF0tz3TBIZqOum27Dk24zb3qa9rjPUoj3/j+6Z2WVqB6sbXpb7V0jJgIbr4sDq2KwIqUO3qi6ZPZjTvJKFQhPVoL+NVO0EQfBO87nJ8KhP3zkSV78ZABxdhamcalU14CCcRo759xN5Btq06+FK+48ibEQG2iGC87m08rKTLPmCf317HiNtKQgP/TZB8nPRBln6G9UYtUv5GheSaAIbCsLTl+YxaN4GRWh3TaP9nofQZuTZnz+b9LZL6w46B7ZhXdb1uq7HrobO3c1pxxEfPiCOE4q6i5gAh+voBCLizh8/+CI04qA/o6bvkAyeTAfDIu3+WXUeIWcFhuu0NSy1MlcSPtjqRcAtcCpC2L7Hmyutes+vTITDWayAM2mHXoRFHvKnq/tLHiBldIVFLI7zaFxqbZFrcGOBXiS8Dk4fC4ThIwOLXOtFn5Z3rHZ/s8LQY2vfciDwX9uxJuR3jZH76o5lc8Cyhn/Z5rBN7388+0E1/V/jC7xYWnh4aDz1+Y+pXJMfE0S1ykXCaFhlILz5xvqhyuE3psh47p1Fwpg7eXPwHfRm6022exvfVIv5ZlcSkeWm98iSy117HPfaf6IsWc6RgO5li5sYbc26n2dafnpqLSk6I8hGvyF8hybFisIaR27x24Nv70kGeq7/PYvWZvz3/Bn/60m6ePHe8+e8F8+n1p2H3/rzbtzlxwyPvZh1wItfvAVTtMXGerfj+5cmcfU5cVSTNumS4SXL4o3ugnJzPEqM4mXL+o3RFjj7srQfcL8Au1KkFDeKZMZ1RgJEqTQIOOWdqSgCS0HBWZWS4pR/pnztR4wEsq921ZTp+eiVaZaJAIlrQJv01ZIvgAxEy7orcG7MxyMRlK01ZSk1m8htlYnsVBnNoQLrCK4KE+hcpZdNhE3kz1sZgYEoVGCQQhZIBAl0PjMgRDk6O6KE+seWQmfKnfK7j/pmx6WgqA/oq70L65DDGtw5VNB8LHubSJuIn9cVDa3KiGpYcz47cMmW5MqCAKkDVLgvPT7bnIf6C8WVGSu4wsqzyIvP2qdUNX+juApjGRxFtjhtRVoOoCSB9TeL+y4I3YT+OwZkJjKioTM2hNJfOGeM1XJVzlIoYyEFTbSmD7HubbQ2sYlAVIW4vhpmygvg1ke4ABwRRMzLCtCBgQpF5NCCAPrh5XcLJhfqDrOb395xYkUCN9bA514RGuvL0MAhg6VuDymAW27hfLgAQmPKutusojeNNiWICzVUGNRldnlnn74gT3G3388nghIV6QtnJHeNFB5ZReZRuFGYVE0CFTsXolOaqo1/nCPxSPM7aIrk/3e0/ACHv/wOytgIeRt5x9j4DoJNQsKHhrGR3VolQ76xsYzVuEFdSp2g59QW1ZYroXUJPm3Y6ziIqunCebexX/EOPXq1oTGHPg0pa8vURUroDLV0g7oRAVyL3uh2O4gg4zlHKkKkMGDPaZFa6pJ63MpC4/O5fwMloOuziN2koJ71YxqrM4ZgTz08XAQRsL5NNPUAUQrlPsTP9CLcBJMOukZvL0+KD5GyGqlEKskO6B0ajTrswSqc3JtjvMbEeiESWVZhFVOl53NXBHOiBQgREhmNWGarEQJtCVLhwIURqNUsA37MUNAHvt4k4py2CCAFNKEeNPD1dSdbCoIAXjj5DYbBGYgINhRBRxoa0FhgKCJB84CwkfBAI0IYGGGx3hgK2getEAEMxhtNwfhgVBwMhiuruFjbKAU6qXtjNKpQomgWjQLNxZDzKn7r1cCBarpZ1K3a9aa5/FxquFbpCZpRpeIUlaZ20wumGr0bFOiHaAV3W0kuu1Fm+e2uAh1ygHdLaabhsq1DL216Gsb2/NvSOi3P4t3I6kQbCRAHce3ahxgwVAmUHGju1xYV5g756kKYrnGL9DUDuyCxWbckR2q2YS7GMm//NdZC24yQfMtvCZenYSliH8eMwqNMewLoS6y12H9B4qaeuctHW9ZTsxZJ4CXLPEOpMay8FXUpZIVR8I/9GIpiv4JyAuGKnrWbRZPvdhmte3EoU6igYIQYCmvaVEVWsS06WCy94cFqYVKDzAi3dDNu20LrDEj6jjPOcZ1BVNZCJB3G1EQr2s1AEHCbcYdAIGQhE8FISlwGIzId+sgohLLybBmZxkQKcAJLkbSyGBALjRdTTyeARDiuZMdQXMzZcEDQc4Hv+EXdha7Bl+irCVQ2uQUUqGuh+iV0ZAPYKVrHgIJMNM4WCiJ5a8NjaIsJ6BVxuQvqwJ9JaAOurBJKNmIRVXoTuqyFuils6m7Y1Nchj9d3PjrJuswChznnW3jiLUhnED4wEoARoZTA/GV60lzXRGJA3jMiLd68hrAPS/vyCvE/VZ+jS430sj9E+a6B7E3S/uHYi6SOxsutHKO0tg4uyW6OGZco+pGbTbmd3ltN9Bausn6Qa+l9zjrtEE8dR6SwKUSwRNC2Ww/WynNnaCkBTQT6EAkqJJY4M1PLi43FaA4SIkL6IBmKlaI+yNu1m7RHvB3aBu3xxaWsP8gbOcRbH3Bmu75QOO3x2Q5vg/f6OO31BQ1b0dMHzu05JfA6fEk0BDIhhcvKH0UNuxsTjsHhyD4de5+E6yubbvUMWdahAhFBjluJfxEdqkA8lO7VVzMZc30/kngfbAVtxAMAjo/4JQG4W64pbd+vt61rsxjrp8TMJTOTzbVHOH1HWYuOgg/WuKwf+oI0Yt0SI/61BiYym7j9L3cYGnczdFZhcxEEU+RGl+DkwGRwYRM6RIRE9+TCjVG3A+Gxz1SmlWmVqJ1lhQDQs3H8W18dDAGBwyP0KpO6PP7jC1Lo4jgZrSkgMa6nJ99RWOwzecFtV0xMLVVlOz4p/pya1H60iMHibLl/sfYiLhALpEU3GcB5BkDYoNoNSWjkDkz3JH4vAnFl3fE95XZRJeNBnwe6v+MyLZnx0VxUQMbOwK3Nlx5HIZveqHBxbqtwxUNFSASglXz9Ojq7dukoEkKSEQTljvO26SIcXug9TONTfPU5dGmH2anrI+lh0ia2DhSkqjbYHmfKj6Pxd8duk2JDMc0Xr+BIx8PsB/SJYpiwBjq7momMupT0l15aLQqG0Xr6aPhdIVOizqJ3AmpFTassSVmDTsyCVI7Upcawn0kDxHP0a9KY6zL5ppCUFusohvBFkh97/iJ6Pri2i01JSpxv35i06f8wd5raQQyz1zv8BVJ5Lp2tDVfNUzhobFIsUlpGW4W7xTh1w+AmN7B8L8I8mG6IwplznHYGk5xu1gZq6yuMNh1LlC48mL8h1pBNoHXoe7zY9ldcv0/U8iWQCjb0v5tsNjMQ8dUiydyMIWGIqt87lqlC3bYMVj6umuHgP0krGK4hF+N3rDuBD4z9yssw4Hfd2xWVFmqNKYOWqae3ZAFv8NIu6QQOOSuint5n2rHwwiR4LmJvOfCGLppFkr2O8457kZGzIvqbA+wtgjucyQsLeR3t1ymiWaT+3lJ4lejqKtG8hNejzy1dLTmYmf0laxG+JfRYf/r5/vS+9PN/DefvVWgCmCTNIpn01MbgU/6h13THLkNiWqIJ3qvIvxW1kNSiKsweyFwtIWLc8C1pwMHvrNmrcgA5nQot3PP0FuREgIIU6cFQEJSRDoJIwYkHD6MGOvQN2gcG9hEgS8ghUJzkHlkVVQEe1qsHOgj4jgG+8yFrkSrQfEEQUCigwKoBrv3rEtBRsqF1lgblXOUHQYr02tBKgTkIaBOlbRASeELHbzF9BHyfnAbyNyzeAEQrxZnwc6f8YIfuxLwbXZXtHZzfRMPVkoKE+PYNrX78r/T46Nw/Ps0mTuWueZZZKwwIXn/e0v7/+2ZYnukf99IbDPsg0GcedhL9dE1jbjm3oTG9+86seVN961fdgzejnMNPexcamJoHBq+9IfscmKVvi6/5ehx1HZ3pGyUL4ZU10QsKlSYL2VJq784Ll1eL5pzazULARJfi14Iph7cLfm00juTvvHbgwyU9Jy97a9ODJphwk6BWhCCiKyQVDAH6joDdD6OMk5Zd2SFC3omzzg3Kdbl5uW9E/4quSFYdxmuVi2A8f5XycvPq4YMSmAsr4l+tXfD2UGoYHf1EP67+8Ph/z5/eOuL358aqIIMHh9an+Szg16erj/zz/NW7R3fPrkph8FN2TXyFjfRRT27Q4BT+9zKycdjC/mtfLeSlR29AgqjpxO1cTtddBONuF4e7/S4DYTI4+M/z139u3T27MoXBXFjxKRFGOPTHGxpFWvyb+dFuQqZRl3J75bFRTwzi6g5P3HuxS/GN746IBYz6RGTG9nrN9+jwve0Ogp0OwQDW45YslSnf6kz8Ee09mNOGLCLUhe7Bqq3ZHpQzXEdSoKeQVCR8sl5I3WajU+Y0rWNv1OkhJHmQAp0cokp1l2MVQupbK0642GNNOb7R3+xBZa7o8qU9CfCvb9+ad7m9Eke0iUmXn1XDcVRIYXHBHnISv3m9WFybHGX0iarYkWLwp2khVZDYpdSvRyebLMqXwGr8/I6gNB1vm5URc4qHy2yCSSWroCDU0O2vX5796OEnMLdIjZOwEcMN4aaFpTmQ0Glpjo7ltuOe1KL3NwzWr6tekh64anmIOLwE5Rs0WEe6sHIzTmhB4WRnMytYIIGE2Al8upXBueCaiLOguvb8msljPKG4Pl6fd/4GzTg2MP1uF4HoKDZZRA9z7MwW3FiKaqxeoCdyChkeym8rO5YRYSBdULowwVIyiYf98JLQRLOlV02X+W57ikERDGVIYVawp0jxalXFOGOTReWJ+ouW5aHH/Dj/eWcxkWe/scZdN450VhdSjQexnO0LPy+knVz86cBGgKiWBQSgUBGTidDapyPA6aaIEkIJhnXmDdDJ/R0nU0JcPfLv6IxDB27puOe7UkJMEI1DQ1ihMQSKN+2cRhaAsp07ymGoFO7cAZchMrseA3uE4dwsBZH7y+AKoNXgVy6CMjuXGBV90ppPWfOIxzNoRCEiqtGA94i3hsK3Poke630LEWdiromQyLVaxtmZZBF0/Ol1l+tPXZ4CFxD1ueV5hP6BgX4Cv4q7yla3C/jdkCQxUQIRDIW9akaAu6zAg9pA89b4UksdOVH7rfbvjzlgdQDS0BrpHvRG2nLN8m2z9H2IR48R+8XmFVlzCaOZtpmjID7WokKM2P8RbR/CIIO6OKAX0yudX2LEL/BAbLlydTOCUF6ILR78AiMMvi4SzsuHIgFA4UpIkeDw0UiZoWFklFYbSLwMZKNGYN53k8RGeOzZi7h7F5G4dyLoVW6ly5obO/R5+u3NTYGhz2M3N3ZmYzNWyO5oVte0p9ubgfDm8Hyv35BSK1ZIeobAThIZ2mqg1a7tnCImA8dHJxpqksGqmppVqWJqLArD11RV1uDCixrio4dHiJABjTRymgzpQ2Svoj98SB8ZPhGlDJh8890BGQhvPPcZhZIXV0ZD5f4aCiuh5FGfuXOIM4hzc1WCAR6FvMTacq2nGBoNA08/6BxDp1SuwVIwzRsTIQUOTVmWkEMmHEiuZJ4g++mUPEupPLIZkvgNofA6+nUaFkio7B8LeZER0istsW57x4mwmeHMgHCpdIm5GIorhzaooJQEFZy3e2U9tGgPR8H5xewhwfpBQmHUwaQe4AWJ1Nc9EfmF9cu0K7sfKXK9wBff5BheJLe6mivjRR8XNDrgFePGXE00T2agknGjeaijmbEg3CTEZGmxSTAnvN/B4YI7mNofZtipuNgYIBVD9GEmLUtCk0JbIFu+d2FsWuLCCFxIJGavn1AZ6G7Oqpd5zks3jVkwwtC9VcnN3uDfreWR1izrG8+pT+s8m7a6pPbhOXzaKXf1/7q3kpvHkppvTutsTIGrgb0EPZdCz0XlJRstD6SFCFLpNVCBWYVuZSo1AH4h9v66ZpIKEo20iUTVp/LO04Bb0SoqraQ0yG8YBEqlgWBYErSvz77BPneNZG15f/8JfyAH/mvKypWsWWZ5ZSWNboDMy21fDB3bf2CWE54gtlmx7yE/3319UfHgSXRcR55VYY7FlqqqMub/zDKwbL94EigpGZISXPgt7FFvkYs4YlPuflN1La8/v4mI6Y6GC31gYlsGaKaSJ2aQlAR/utK3EXLOoyBnJsjUZpCxmZjdsK67qnK/c6sKOYEYqLD1Iq9tKikuUkaZVxnTrIICo90plVAm3VIRvAH8aAgNtxi3yLbOOli8ECwCxWKVZZltOR4avlDJ3uKVlDBnX2pX4tA0BlaAmgEnPMxz9kkJ5SuCFbbswNn4kjdvXncYdjSsel0af1ZV/OAeeJLYpEvTrexoI4GbcFYdFbqQXmNHsy5Nr+GDpxawAcmThNZ8ARo3l78qTyLgKGbDrSp4yxY4cdFEgNRuUBGkci96lgovXwalQanLl6e2yMuWw6lw2rJlQPXv0uKlxBUXXpoIskppZNeWFjoqUVjq2AMLAHBu/YNmBUL1ohRPSVR4UMe+QN/lGofoHyOpTduaF/0fteRxQDZPwBOLStbZRt3meeCiLQJNpUtDI+BkqCXHMO7VAsAwNqVCVa3HywwzWKcCPWN8kyYaVixDC7MO9maI10tKJWV1drqXwV/gb6ASHRerfJd+K0WOqLdms0NDW2ujzNYLDdOI+7gSZyTHKTUBbnHAsbsg1gJCV6EhCzSG+bdYShy5ihxHQQ8J91E8eflxqXQLbouUz8ezhZeVvBx+/RYnSS2+tp2NY0sjT1/hqu8v2Fe9j4QPAFVkXPbhZXV+0O0NZbGagQp/PKFs47IVVCCQof45sP2/Cy8Mt5bsuCFL0g/a3lC7KORs33/vjk1sbNoQHV9TlCs9HjS1j7/EIDBicQs456v2rQFOQOtQr+3tXGPRepjCJ6+j8CiHWy3XdCK+PbJ/lAzAUfCx7+TS1gGy4+S6GR55oLXuZN83hJ293QgKuDv1l75Y/H7+it8zcWqo3856nncR8/Ra85E+qdAdotvMG/efHJro4c+bPlpW9ELDAfPPc8aXHIUecXbuGNvBMXt4reAZ/xngKHB2jL2N4BEH2lmTDVN3FD5c9Ogrn79j4sihfmPrL8Z0EiZzqiSaEm3lTAwJJgND/5HD4zv4X/mPFhU+3AGSapN8syhwYnlFIkS1ogIzJCwtS0BCjfDRIUQD4AKoau3xCUEIlJ0FDRwyEeShLAX2gSkoc9sZQPfvcbu8XSnGqV5YLFFb63dHWHxT+eGVUzW9crfBOJp8g9uVQ8ofqm+Bheof1poUix+1YoxyosjFrTa48t8ol+K7nz79yJJHH69I2n1La629FbowpOxLlHP2PRTqZ5bc7/iNxsFJ/N+3ggd3Usf8x6Sh3Yc45wUj6t3IAa7+rJlDwteWLy1fvBauOAw5kWhLyhtfo1wGqbsUCn+agfDImaa6HCXqmrN7JO3PmYGBmA+7jhzJZc4yy1auSie8ZU3h0zepLHpqilt3lzPLV65M32tXeEtId8py5jumcnCwZCDjxFAuE3ySZsH19XDirIngRMp8IAYuXAzFUC0sxMLJMAKZ5cUxsE5zI/b0CLEFu5W2D0uo2bWvAkOFcH1rT5+zfNvK5XBhBpJOaC0euoG6KJngoXhTFRSc41B2D44JB7/nYLitb9wPWxWXfucwEIyBBFbcnWEKOsqMCyOpdFhmpY8T4O4iYUYsDhWF1rb7MZ67Ul0HGAhHyCCnxD8KguDVNNwJcbA3io7gDsEcaEp4mfLUaQpGQkdYTISvawWfS6UfZhKa4ozsnQZ53GcwAkYtBcLjkTIeR8CNsru9UqGW4ZiQADzDLAxgeKIRkJ5/G4EOYHAOFcWBHWO5dPo2lAOE5ioHz8F06j+Y/b/oAkoIRSCYZ8JxyWyKI+RAscRSgduGdqpmjDmOp+LHmWM4B+reVpFfGGenuYErhnOxtFdUObWAhbpODGxyQl8nd8wUzHSYvOK0zyRi5Hn1hNv9azWHVd3wawkTzAcEHeKs3kUWYHUEaPta/BRzyqRPEXQJZ1MKMEQs3X/I9sUcIoyzxguicWiJF90fhjBbHAzyn36Dk/9kVoGoNseHewHAUkViGlUshqBwUGkisYMW7N/DStEv3n8w1M408ldHw0NFTLRNWqHMUbGYmYbOnx+o2xcYH/FnZ8MkNjYqMzpGdaOh41e4H36QdlNVj131Wrtl3VWbtBBW+dSpeZtT07O4dCu0c7fdsgyAi/vi1DRvmz8H4MGy/Mv+LhfXpImSDYlRRNvXUwE+EyGGFiPWwvQbHgtEM5xknga8iw1acPm3Pdnuj/0bh6lHKIGzkFVrF0itQ4o//72oup/dTs2WK/LIrGNzcurLD1TKZytuNi806TDJl17C/anD+ucVEwF9vc6YzbDtsM3YOZZcfoqhJeMQ4uUYogPIApvfu/znsNgH0Xjj2Ha4Cy4ABaLpxlAXQttmIGIGHUa8GEN2EGx2dt4Mxr/uWC3zt7h2zcLfIHuViDjr8hoPkLbJxuXkZFL5ZPJkOSmZXF5xDchBMiSnJdOU7DblALNruc/IWs+hJdNBp8WBZMu8bM7YQzhS9mr1i4C4LpwW/Iysczk53fjpPxeNPfCClLSTyz0l6CZdwBZHA8LHoiqtkviZpDSqMlKSPhOVShsNQIrCBWSRQBqEeFsMOotCmCdWEecJXwjzA6VaSJ4hGp4ytNZ5YJ7weU3SNux+Wj+2zP20/ZgT21Qz368CIvBXAWy7Coj9kchwAFUHpQP7Xr751IhoEcAKYifWglhscgwopaQ6DsJ2lIKiLzKT6c0JpX8XjOc8d43DwOG5eREQoZpC4S5O8ispRsVtIMeyFbhw48bFMIeKY52v5DbSH3PjBaYAbuY5CcdShrcax8S+fx8bS6bECngRAYdhfBj56iXiMGKgpMMuwngAgJA5SRBkvZTrhIZj/PxKlgYEFBdXlEkIEp6QCICJjfSqIALhRwDEqoXDr16hkX4v4s5dRA+i986dtS4oBLjn3ahW5V4XxcjVSLHXBWHn+l++KC6/BPll2Z8SXr5wDqB/aSchbnSu3rvGJqOns3jt1+l9A2YEMK42KX6+It1MP1q8J3RPmChG30z2fEUxEEbVprrNH5txXfHsc3SPGdOb2T1I5+4Y1Ipnaw4A7zf9BjHdfS9f7qDSTISUObKU/J7KNXGc6YJ2ayk8yntKrAmdJKF0vXrVj5cWI1B4VODu97jTIPYP90Ij040rqRRhQcw99ZmuP08ys3Ol1DmaEQE6gjbgQMfLF11UHnB939dN5pEJZO5k9yRXvEl5tQYrasP28aVhnDS6mPHIQpHGCZfwm+pkLfepXC8uddW+AmlbfWGje3KQa7cObZMWBCW7Nz56oSFwg6nGJB7pnIGk+yIWvGMnCzXirRyCwmWx+gbD4k42UJDoZOA6Zo50ktoo8zXLjCWV2uA3xwBVyqFUJb8RnAtepqszVFLsU4y/alolx+xkuWrrps1l+Cwqs5/5NN6mgmLsSQvjkpoVStxuQR/yKaJfMA0e52n7DQ37tQYvJpz29bVfE1n4G+UYBphDUYsWRUHuY4VZ+0ynXhgUaIm/ITe1Sk9saq7vV9nd2svtZI1bE7eTf/hiV3Euw42RS5iUTDdmXYtgv9UBgWib1VYREKoHdwx0EHYQOgcG3+/eh0HqTOns0JlA7UCNI/2Bzr9/803KdsjGUfqEtzpTBH273foH9LubTBP0ZQ90wM/or8sTU4q2MPTfj4FCs7NDIcN9S1Uu4nyovYGcG+yV5nHqbVP+/4OySCIBK2/Yxt3u8RYBX/1AUiKQOLpE3tyIx6etrEyDB3Kc7Fdf6DypQAh2EUexHdQ+7GZ+LPk0JTY6WqqCMK0aSj9FKtxsDjRK2MURAJdtuLL/Z/7/v4wxxVCeDUbkMqYa8VOMXJVVpsz2zP8zM8oFoUhBvdryiIs71ryGfdQlHfzPfDYggznqpZwo6m4/njA2jgc50QJcYcBEWOqhEKgIHAINYy2j72oM8wCaEySVOtIcGzaKIW5REQeWyTAktSJDzBFvbHAEVLkcAvw8dybM1EHDaAQmhzDFmsJncYnZ6y4OkmdVJVUCETbAwJdLHHydHrBgRJGTlGoaJC4VzDJzg0VKQfnwBeWSX3FeHpBX7A7oLi1d0NAHD5Wdxv31mqRcn6eBEZ/VZ4ay5VBaFZS0uFqO0ZGiEpVQSBUUrsgNgioEzQ6FV0EhiUopyjwWs7gaSqqC0sqWCyjzjhVRjX2tjcyHoyX14oaovPuYiihj1tbSvUBEC6GJHHrTRsFp69MCIOq37hcB+2LOwjwKUZGxfn2EpRAK8pt0m3KUjbqFX62X2iwN8A8IVNkutYUg4OhH2NxwCoy/I/pO1W4Y+L2nXEd2pAy0Fp3qA9WPcBO0ODxeTh+ndwWnhLFKTaHlwDuONtECy9q8xitWhFbUrKgIEwBOjxXjbV4oBC2owTlnYZGlJYoWWopAzGlwBo6Z+B9IY4FxCh3ij/Drk0daa+3gIyjj8fIoFegvk5C4KG9QT2+A1gWnTCfTaQP2WpU0zTT11m5uElkX1+3sTNLDLQkqbt11MDoh2QAU127an6iHzRTZ3vlY4RDSF9Kf6Hjuuv0z5O8OsLEiKwCbx7b5lJX5tPX5bCkrb/Pu2+JdXu69pc+7rbxsiw8qRi+0wbWgwLWhzbWxIP+b1HaP8wFINBQURCfz4SPR8l/Rl11SvXRPMUmxDn15ROwDgtanks4K/u2PQabmv7OdtpkOK/4PcD5qPLRw5Yf4IW6ocm+/AATTr595j84b7a6OZ64209Fc1JnTucqS9wmbV680WgTNZWjgddPuRSQaadGe143H2cfBndvmriS2ox/7JQiKzuMHOrLdcLy4Y5hifwrEIbAC9rNAMB8IVUysrR9cQMq/+8m/Q9u28yUWwYlb/rzr0gr3lsmCoYtte0sRoNr2Aq/APDoCm5d6Rb1iZEXNivn9Q/pqBR+vFSvh6z2P/8A4V+M7j0j335+LQZr1jKqfGjUsXiK1aEXNJq9FbSE6fO9DyZvxFX4nP4VG2Q3xyEPdTfgyfFO3vQjylUwzoJHiUq53vyUQCbOE6/hZdNDUoLYx5tdImMYT8VN4vERaziqv2IBq1c+/jFXWlMvKBS4fbv5PnYKR8BT1fw42zGVRVVSGEyumXP7HvyXMNBk0GswQpgjgrmhA0MHgMzuYA8zJZ3S8ttVS9WmQoj75ONDkCRLdL5etuHf/7bXmwSvp5xvFCH4jd+1y+Y0CaIBB/ZJtkP1CAQxAo37LAi7vAJgnVnFWn63i1dWaXNx7Qq7W7WlylKMrC7+k9iDBcUlu0QKiH46wvVVFiHh5nyAU2abYYqPhNyZQ7E5DaVGsbpxbLAFedA23quSCu4Ydpp1Gu45hkYodi/v0YzonsJ3UTuyEqo/aPwqQTBqotjb3bgltSS0OBSc8WIBAxkFyfq38VV/8EifQG78cJ1brWy6fD6QHJhxMtaK4scv2erhsR+weJPdFpS2Mlg+fQJgWuRS/4qBLEcLUB2MxtvCnbeUC1+iS7hE5Fq0Lof9g5vTUenOYfHTQpgNYhFUNfhz/BzeumdJiOzD7JDBRHu0cpoPSrjinaKd0YE44GFM9sI7cgYFDgclH0ciOZ/PIr98jiDMI9CNHdkJbFyHlvHJp+UYCwoF54Jcb81XJ9WghJADS6GXnXpm9LBnMlEa8hX7L7/7EP8Hn1IxSqRW65SBt4zmMUvV9bvkvjsYd+dbMYPwouf5tQ41z7zGbJA9x+XgOs6zmP7F1ks2xXqf1G78tu/uTsSw/4Vc+xpUu8dtR3fr90wEA41Xp9W+tKqed/tbO6x2Ag/A5g/z1czB6d6uL6i3wc+SDAceR4yxwFMifOTABW+DMwQqYAIUmvnr/8JUhGgmBskKAG8YNRsZQKJGxg2dFjq8Oh3MXQVFI+7iOeM6irZAyhQ0LqdZuyodxw2+UvJ277E6skeQDPzht+fI0OB2uzQSnAZFvbsoS/poTUDVumDGMgxuOHFkJI5Dd6mDW+EoOPdki37OWYwOJXfWN+4WPhr/bTg690h1y1JzQFmzRARdReTY1wCNoj38Kto1+fBrfgQ70W7bOstxKBA7lUM9qsLELY8uYZRltKXSImnMwEDTYtTwOWUPpXdCWu3xNiAzjwErZGeERFEcFCw6T5ggpxDl9QAIJTBVqAVFJoujPjzrC3KbnA4Cos2uyXocILpaRADElwqd0W8XZlAoA13M61q9Fbru97wzi92/kWQKkM26P8iF8jOxDPnqI6Ef0PXrUB+ASAmgfPQRuGzb4fPro3OTU9PHTivSPWZfM3M2yrY8jQX0SAu5hApfPjq2mjH8R1zsdeIE8x59XTNgAHDsD/zqErEfW/Tp8Blb48Al/Cb8OnfE/DL3YiiwhlHIYRq/K7xdfWAemxsWFGJqissWLaRyJhE6PVVyuiBLY3xL9VAWHYhTMaKMCG3qvs61zry09aYEfQqEbHGr2mOINYVxs6BcFQxm9iy4cTlFgAlQ/FQGYC5uzHjtXXVl+JeDm3QUuLTPxGqCJXz3j4gPsj4o+cCV+cCs81nM/0OTkoFsYaBx8oI5DrdA49QMYh1aXVa939WOrpybF+BGbloa1wTnFmpEhrV81lOcPnG5cpOS1rcqHRUDlUtRmtMvuWNlQKHq/ob/FOVd9X5YNZxDnlbbK9asEJCYCCXdrWQ6WYBAp0xp2XlhtonTqToNWVuFT8ZtuOkcC5wH5QbNeAPiJUSJJdHQspZ8Sy9+8LEjTT5EC59GCB6YP3s2WMdrN2xllBzxC9ZtO+Pjc4fW88PWZMAV/TDjtzMfkp52b2728JjKsD969K2O2cwy47BQt4bNQ7Zs7n5KfMNrBRn3GiNn0vXtT5sPmU/f+m7pCf8tFLcC9abMR8N3koyY8HGeLCw9rzVgOCzaLzxDNIWyR86KPAgpyO36WNY3bfi0qsm097i0jN3RVrgMJGd8eFcDhYRCfOYio7OmphAlFgagcZPInXIMBMSpKq1of6J2twnqV9sZOBK7BwWEmT5YdWPbk1uJn3eV41Gd57SF2MPsIpGxuUsIOTgkpBw2C2Idq5Z9R+HLwd/Jm+PIVxGaoly+HGGGiqr6yuWkFYt/e62mr+/YRA967D7GCHnv30rMQhKZLN8tRFFl51+XqUMBY+9GjE4oI8Qca7gGKYA30qX/2jEylxOku94sbWfyL8JNwK3gf8uEMYh/Vhw9DjJiimrEZ4OqYGbm7NOP1Yu37C49l7H/cYuj0GLcnkeyPFx5qF7/OKN0dR3xHuDpKdKYRRBcDnoELMYJPnCUcw7/bXi+cjCwoC480PlHFCqlw0YatWpg2mos6Q+qElHyLNkpNlDRIPGsiMJlfMVW+WNxq9LcMzHlpw1ig+i2Zv5sf6AYHFzUVZV73we3QbA+g8NzccKhJ0CoUnhzw7ghIFfnABZ3VP6GWXf1zavk+26SGD8BD6c/Ji92urdM2c/EcBixuqdOK5e0P1dMDhgB4rAYvqgIWJQWmlhR4p08s/PzXQky6oCQ1sMB/0cuqZgja3gJzRm8Z6jYaem9E4xiQCG4Ekr5Bo+GFlWG26MPivAyTjRIP7Q4VNIUmNm32dGiy/IG/o4N/6e7c6NnQlBDq3BS6+VgUChiegAfDQ4Cn/+cLUru7ngtIEDVEvCA71A9EQ4XFUHSwhT10mzcCGqBh6m0wxmsAI2doYFgyDGDnLuANziJyd69LpAV1GFoNRnh3K3CraUgK7rhkzG9MMp6Q8SkSIZUKBKEjIkHuCjlFnrVDt7dprhtyx+9/ziDOIn79cwKVX/9iepkJvNsOrfcOIJ6eQa4T8tOtEqysm0/byKJiuGkHU8CgiomxnH22AlbGSBc6eRnw0GTAHSdx4fcPzR59ANhfNZO5xA3E3Mma3YitZ6hzxw8KgyvlvpcGPAqe5mxNsQnkwpDxPXV4fFyrXeFW4NBt3sCZhRvhWc6wykzk3Jnz7LAIGPvpxuQtDxGmLbnBBMvrHWNXLTq6k6Q7gWpEjysa6Mf8YhuCvrBfYltcTzVx/LPsf4j1BPSL0R1LBCEyKkXRiKGir6LwQUPBNAK3SQO4cy37osl/1ipUcifniwzfy//G6NwAKtKGz9k3AVdukScn/y1cVUlz9Y/kOVy8WNd7xPT8DQraNZ87+To6gvXdXca2GRhQqVtra+uiejdR/9sE/uUkCYNLjhQf4YwFR+W02K1W1+7O2lDnsGszxB8BjfnCIZNEx9xIgz05BW/oCXn+W/fTnK5xLl/K3HX06IZep51Ujms+b/JVTAQLzGdq4e9diCrq33doYbV4h1+Xdv41aKoWkYFQTNXthlCQOoQCkTFVuzsuCKSJqLQ03yAgC7406t8QQQcFtxb8k/fPglvgmylWfmYkKrrP2J8CKHL2pYo17oyOGjkjp8hFIvmZp69noViOAPNJgCw36vcTsZTYoj/FP2v3fiM5+SqHVBj97Ch2H1Qg4IMOoV9r3O7AW0u5ypMEuUy0ubdNuARJuhOk33Sri/gBGXd0Vnya2+AZjQvCQxCSGMLwZ4TluScFwsH2LtBWzrV9JM4ZuH3UP0FQ4B6maXVEOzSvX0J4263BdKAJm1aX5nOQbto+4v6jb1X7og5ZTmj7CUWCM9609dSiIu1yWrNuZMn65jLN242l51lYLN1RTWLd3aLghXEVZUkGi3Ce0a//XeO0+TAfigCbAqj7dM8CxVwhqIDZw1CZ4BDgvjHn6h1wvYg0lmZ7MivtTmoaa3BLMM11p1LjHO56/tkJucmoxf/LRX3MSaoa6X17/gcxr40u3hlJ/TAg0q2R8OUtcLAJkrPOLH9nFHAdvPlxiH3mjTcqsJsQhP90nuRs9/fdWgonRERDRSJpIl2zQ/VBHvGHZ5ZHkigDPqt9iOBARLC7YBOta10IKZxDCXYUBHgG+6mOc1nYHI+VqxS39S4CuTN9Yi7z35p/iyK6uQn68Zqa+dtNIscM96DIehE+I5FilBQ7cy04xoZ7vv02U87q7/837t98I7Lk58P3L152OeZ+q0hU21iD0W2d3TTpHsBhhBMmR0Fy69AUo4NJZnYwRGT0tQVHF8rcAGCAnPNzdeyr+t5I57q580qIAUHhbkNFTfZSgPA3EbsUOvl63eX/hjqvS2sWrr99/VjncIz6XcFQ53+X1y1Uxwwf+7Ddt9cvrJECGhHdbBE0FEna47UnDD+0nKcRFu5McUw6/J6E7n+sCzxvTLoT+wfi7b9W/oV2w99BxvYNBHDQM1kpbpxf+X1zdswfXtzca83T+L/b11edNAihTTXhXEV37WOJHuliDHqitXWajRhwWm3XnOmTvOWzLLKH1QHqaJd/yXBY6bnkVo0n6jvYqsnVRhLmbEMNfddr8bZ6ZpU1hYKqVmNaWtTbLPupNmJq7QhQQLEtD9kY+8XuLgfI5g80TchVFZ5pFR7Y3MS1QfbfFg/Ie7tzc9VsVxXa4+wfH4RwM/tqiuBkPpqY17cJwpaAAqs3bHHVxmdIcSBZqG2T1ZuWrWNPyAWqaqu6bVxFxVXKfM1C0LZ3uGpKbs+c2vTk/K0Bz7Xel0BjL/e7TYFN4iPfvWNN0VhoppOHgMXQJLvNeFS1ar9FWj1e71Cmtlq4+eeO+4kImj8w3x1qpJHGofvbFuxw/ZCboiVSa2GnagvjMSxNMvr7tfuIv0TP/w/4M+MyvFpPt5iXBvTDTsiFx7gO5wyShjOO8eOoC7X95SrzxEt9W0oTHXuqGgFCn/WRjFIRPOHVfRgemxVldblZpQlAYuO3WgjKI8gz8wfPjObe9NnusVtSfP5o8AQq8rJxmnMNXClpP3wO7RXnWcJ3tzL89Aj85pirbWlpgMdu0/16aR4+vccPxEIAbO8dy17d+b9paYmA2jyhAjrvLB/AgK5FVE9hotY5iu1wsz1woVQHrIR3+tHCv7Rs7H/dTLzx2xmHh/7uKztFK0AT/5XJ6UbDTl8QywaPuSRd4RkLd3EdX3ZCNxxmbwFfy2+mWwM0HJAAdH5BDlqI0/Dv9eblAI07ytXqwip/0jh0qwl5PdkbBTsj+tRNo+xQ9zyIJnf5McpdNmauMKRp/bOj1f5Z9mQox/PbDOh77U30LJ8Y0HVRpRYr7PTR+suTxAgBekKBMKSAkxZGez1N2+C5aC3O4/0+6L4uafuvL5nfyro6Mk+NSgS6ugC3iD91ghgAs+DttwJOel20mfbnA90x4s3mLV3s3rvcYyyPxGaPZ7I9QVvUXmpETEAxLC4qitz5c9EMXw1mg/OcfOzYzO2pnXSwMtKRkEqEqmXhqbKRxIHLmpvLozccxSbKRyv5om9uh016IaDjSXt9irpeitpt41zGDvAs91u73OviPvBCj2tNny3VlKRw+zPCjXLaRM+uikB4cc10mw1GMk/19HsiaiOetVq1UMOqpSLuqibnF2+Fw0bonj35bo9mTlnFpQ9vmeIcUT9J3KyB9SJP95lmjvY3lcdxRnEi5cuqoi4ec9QpCzxHO1r/mt47TmstRoiBbps2LNFI1NItoL3c53cHeL4nNEJNzecUU/Scl535yNegT73N/6v3BqtG+FBrS89Hmk+s9yJrLeHi+cZ5BG2U+Ig3Bn87CuIoi+8I+SKryLr3ebjPo7C/K7rmhHWbNEDwWauqz2jUadh8YQvDz7jLqUC79rnECFy+k957Fv5ew1EfWK796U8vp3j9yoSVAJ9nV09x5mMqF7fTNwYHKAhZvI9wHWedIzzrW0nbJovHgDDYpMztMDDzL427Xes2HYqpN+gAXPvgpFD7IUe03/P3AfNnguf3Ua+G56kQBoyI3A3b8fwK9v44rSdtYObRnHiJ/tn7/Oft1RIlLSUNaQ+GYy+5XX9spGR+ybys9+N5daIl9uNeN+xbD32X+GE4MRRfnd28+8TV4U+52kLSaTP3WvFFBromtms+BSazeEvP90H58E+hQ13R7bXAlD1K56eOJCQHjW4epKikDdzH/PZGG++NSguZCnEsR5J3eelUSU86UzbM50un0wVVltNFZYenK005/rVXaXKXTJJXYNJ9KJ2o93Y6VevrdKbeHj5fup4uaPV3uqg+RLrSeUkTZZXRLmLojm4gGYxQqwi69FZruHs7+jO4EWXTe0TqHRqFg8Vpf4wffoceWhM+NLkzsxW2lSxu6L4BYhG1lQia9565Xg8Hawqx1yXvuqMbSAYj1MqfMOjS26vnLvGpfwY3omw5J/v0hO/QKNxzcdofLfi73FudbL84aXJnxpoV7LitZHHDGiCtFFHNzSJo3vsK5Xo94LOztvL+YPdzed4sj3ynFKwlOfwf+8g7dd56Juu/1l/P1v9v9bs9C49vSk70n/HLNv/zvuANCxwcf0DaxdnF1c29aw08vbx9fL+reaSfROofcE7kcHDIHr5ieMTNNoSfuMs6VfK4+CuylZKSb2/7Fk1LV2RkZmXnKHPz8gsWLlpcuERVtLS4pLSsvKKyqvqGs74ratSiJCvqBV5bNsO07EQylc5kc/lCsVSuVGv1RrPV7nR7/cFwNJ5MZ/PFcrXecLTd7Q/H0/lyvd0d1/MDgqRohuV4QZRkRdV0w7Rs58+CmZuu5wdhFCdplhdlVQOIcNN2/TBO87Ju+3Fe9/N+f5PMQ642RJPZYrXZHU6X2+P1oTFYt0P6IABACCYQSWQKlUZnMFlsDpfHFwhFYolUJlcoVWqNVqc3GPfTiVUAn+knp8RhJA5W5bQkUblvZlN5pmTyLoIDSv0em30tiQJfJeWXTSNS63U63ItbCQo8UP3X1DvUmbJw2Jp6jN/pzlv4Wo+miSYFq71peybrKvFxozoCadqg/S/xTb1LAi72f6ujswL7bqssolllFA7781AhSNPxNFm1N7brRC9dbJlAdqJMEbgvj68iWIheEg4XmAY0IYyYCI4qhcB719aTRX//8cdLICzCIYOAH6osLoSI0lXhwzo61tCHajZn2h0s4NDQs07oN0SM1U3wtsWeLMZZWVyq7GOw5Z3BhfCYXYVDVPbGlIKoYdJEfTvA4Osf8sB7N+l5SwoIHuZ1ljvydgFKKw5T6aRgR41AMzSb6Ehf5bvaJG5dssmNOt84X6XKCJYGwSu5FT7KBHMVo4W8Zy/zFHZwmmhmDrYYJBbZzvs9MOoKwevDCb9JBwekE3IzBcqqHseCeIDNGs2gQXGSyuYz5x09y7OSFXsbUlYLTT1qe7ZKgsLu3m4FShMNQL4dWLDPw4QJpHO+I6fCWxrkEB+4l78dhdQaP9yq+DgJh3r+E9DxJtLoQOrEqn1hOPedJtEzTSAG0Qhsxfc9OJULLgrc6lTp84vWtWlBDacbrKLsgkzLefdGXUOpfVImDqVvdOZZmfJSGuNcESDhYnG6Rex6z+QETsiFSuMNMU+zjFjR4E1rF3CnI4cvRnHRT7ZOLO+t15mpbTbr60MUNt63iSA+kHNy2/wM14Knv6JcI9ZNRsi4W8tPVOHSRTjsyJQXiqS08vttjJ6UQ2y0xPNgUOBIe9j5TKUh0Rs1c2/bJoWAu6VYaHSBQmyTe3LM6nmrGDmoNA8F/OB/Tnth1SqnpMmGPwhZwLRQ2Q/k1FNBzQQyQ1BKmF8vuUfpmUASvj41navVVFFRvxm5YkRLVJx0JNxUbxy8d+MfvxKw1eK0vqzMb1ADNMmTRtIF+Ltjh1HXy7uzKI8/qkVWrTFp3aCbFeJCTWRAjqxW/uARifqqnAEYf6kVyG/gpHzIGkCh0hc90kWD6g7Vjh5L5ZGAKznL1htThtDvGlkjSLbui+HxrNMa9+/reZrsgO94SqVtFYc0VJRHoAHpTBxqyi2CcLB8a8qEO51gCQCqqkBSVAXse6NqU/1uWBu9R67MQxf7/dksxH338sDx8v8D76coT4fwBUdi48iTDu97Z5N3Rtz/u2lvlBIeRnOI+udVFXf6ip40f9iKKrdL1Zww01+Nt8Yn0JgdM+OJYmxtpHlFqgndK+wi+lWUZdR40mdHmQq5OtcL0Anql88/Ce9DDLscDjIOfiLLp5fKP3P8uUJYS2ckT2s+Kh8nff9+/GfiUrwvxuR4wbupb56E3/fXfBP1gCq/6RbNPICojc398j4Czm0PGlV8I4OrsltlIJCmRXk8RknYRhaM40xUK9RHO76pJuJ7qnTKHloK/Fm3XZSwJ1fNE8i7i+8HuqaxPWbZ8F3bW8LIIFoUuF3gNUkVDNu5HgLiz/QV9r87mVzgN86i6E/YHw5/DeX7kUIcPox58i5T1sutocZCa/pXsDRUwRzoJLS/KF1MRVGSf9UyJd8srATshdpIcpCZvTaI+CWjReNdXE/EWhMOGcjO5vRaDEuisrHmAXhbm4XDqrJgczJWjZTDArOXyivGt9EcPKPNVnElajMhiOa1Lka32+0pLkCWxk4qvogdQAaRIOq4mQ8C60TdLHmtvGAUDgZcpXLoJnO+ls8U1S3sI5jJDK6uYYK6XSGMjATiNdHll9q4X6hT4gH5olXYSfFg/I7Rvl5WvxvWClQIeKWibOF+Is3Qribc5AR8UTosUYJpG6bsLGc6uVO3DS24VfcWOX2jThMCtf2lqyylAp6qWP8RxaeajetylcvUvFVqtwZfirFJql3RqI0iEYZLkqvUTlpdrDb8Kh3+k4IC3xbYWA26U6Z7jcLhoFAkoxhv17YL3CKoRSkUvUKokYmnamd+omdJ16M8RI5TQajtwt870FI0SSQFZoF/R/Z8UXeYgyEO1j9U24AyxvPlSTxpOAIcjh6e5mwb/Mk4rwdm4H8FHp3OfL1jShvkqavNAV+HlZ4dp2zoFawe/FcbWYRP/gY=') format('woff2'),
-  url('iconfont.woff?t=1582267811228') format('woff'),
-  url('iconfont.ttf?t=1582267811228') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-  url('iconfont.svg?t=1582267811228#iconfont') format('svg'); /* iOS 4.1- */
+  src: url('iconfont.eot?t=1587980376124'); /* IE9 */
+  src: url('iconfont.eot?t=1587980376124#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAMBsAAsAAAABbawAAMAbAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCqFgqE+EiD6hQBNgIkA4pMC4UoAAQgBYRtB6ASWwYjcaXw9rdRId0JVKolfd1foGK6uQPlbqqXVDGQk23DHpwHCij5PC77////5KQyhrYB0hZQUN0+5/7/imbi4kHkVuniQjaLbou0tVpIhI9QFtO22OfowaG6yxGyb3JKuDr0A/szmfhMb9415Tg4FdVXNmKmn5vHi+OUWlHHq0OmGzb8GhReJjX/ipm+NQOs2PK9MbEnXNDKZ84Bma3quJXhD8nES5vDT55Z7EJE6W84hBWcYshZzDf+2Zf1unQrr0L+tqbuXf5wzd9TbjAT/vEuLGSBbcNeNDp6Qn0/hu6DDyF0AOSStg4AhKlSkVW+wpCRGd/GFl3nhufn1vt/2cDIbUQKg1GxsRE9BiNjpDhEWmWAwjCHRViACXoKignqEBs4Uc86hcMqxDpteJ44ZK85h/i2As2s87GA8jHPsw9UwfMwr7c/qG4nxipnVuiXcGI6noc/+nW7p5UwkKidPkZQutFKYTvuZlEi8TpD8+dtO4J5AhHUAENpi6G7DKMgrH1DObWsr3THA4Fdjh1aAggsIOcjfa2vRmhoWksWGBJ2bFlus+01KScZOOA+/49PjxFOVprrGFIjwEiHRD4FIQe5XxeQO0EhMLAuYgFdr7NXqjIjJWydDLJlhLv75gOg3X3yIX1CW4006fzyu1TpaHruAEi2p8/EvKaSi3nmY7KVzqgaGCFGtMRIAhZ2WePOWPupsZkzocs+yz4NfgRPs8OVMICXeXg4lu8y2E+j+Ox4IJuOqrhtTRtm2F80yOgfd/+BcgtMb96ycKrFJkioMAuGdtFu/rFP1mW9Iv1lBEABBAycE4CGM66uZ5r989XUviq1lfxX1S3ZiSwNElR32VZAaA2xk+jStXur3n8rENhxQN0CBwYMCQ8EhqBh/54+nNaIcbUh5SM44AOg/TeWng6plMgR0d/dIjzfKj4o311iI0uahUOemZ/wUZP/q6VZlXBVwvXrN9jcMJISFhhCdOLpHoFpNHqSvbIsr7XGvnTf8noSbhgQGIZFSwKyFgAOl0AEPByzhqdy7zAVmDKAg5HbENjX5dccYBsCSWbuLaqt5jB/z6I7rqL8T8SKUWKkJKDE8P+r+roCkgvpSrpVptNpdW192eow3gfwi++Roj9ASgpA/SJQLiDpApAugJjaywP5FQP8Lg+kCyj9nAPqu1CpkrvstD61srW2ZVmyjt9OaVO2rGOWMdnasiZoiBaoigv5PaKxBrC1q5FUBVxS8cO9Ko2rrqUGILUoADD7dB7K+5e1ntWJvtWxNkCDwagTZzDcv1fVakGFtTfLF7MuxaJx6ra77oruipLvf4DU/whcBMoCQK4EUrIXoGQbACULJB0oyzeQVuejNoTQ6VI2SNlrStauKdkbUrqiyamL/TX9TX9le1dU1ekIVxHovCjBKtue+bbP9B5kNqXtVdzwDYMVTsayoiG4la+Utv4Zmz0P5nnX+hE5BihMsRZXi3SRv5ax9V++TCsvUWEwYCD8GGJu/w/Txnzj97PAAAEZYoIM77i14NRhAAbBPHZAkpvhsaAcJBjfmwGw4g95maA8KoDMHNdABwZq4kSRyzOaFNDhi44HPobPvL3JsWGDg4LIeJoeKwJywP5z8NOiGmO9R2zMBZ8KDE4QAHYB5GJ0R1KKdoj7ZDdkB1O/uBKxCzbhgAT9xUS4KHGy5Sqy/sWGFw9ffP/x/ypXq3fs9eo31Le3f3cMwHekeOuLB7dg+qCPL8/App+cx0+XKL2Z7G94hLc8+PCtH7v6MZc868RXPep34IC5O+MmM/FQJ5XObGf3D4r6FzfIF4onTcp+rVRr9Uaz1e50e/3TgRecDx7RPnzfYTx56j3dne3NF8vLbuvNrWgkaGM2ZMM2Yt0G7Em8haWZVWt2L8rc9A8x9bpdTofdZNDf8X723atnTx4/mpq4PXb33v1/r197feJ78dLl0aHb47Tfbaexa6q8yALX+/f5Z8e0U40lVJKiGdzSa0OSFeE3/fc6DoMRFFq6vGaxsqqyorx00cKSF8UFuQo/A1/DorLCrJzsp5k+V17IdCPyF0sCAoOCQ0KX592gsPCTQOTLKGm0LCb2LzAuPiExCeTB5sbh0fE72Lp+1n66trqyvLS4MDc/OzM9Ndu8l9vjj1ujY339g0PDI8/gop6u7s6O9rbW2f8w77ylubGpob5udGR4aOBTb7VkuJ1dLT2BEKB/v/8X2z/gi41+xia/i1/zug+8TyLLeMyyRf3ujpFoE1wgQSS4IpLsiBR7Is2ayPBMZFkVOY6IPHOiwAlRZEKUOCXKHOAAAOwD2gFkF7AwINoAFQ5MBHAdQGRHIgrRiEFyqQ326YWjPngaQKAhRBpBojFk4qAQD5UEaCRCpwkMkmCSDIs9bFLgkAqXNHikwycDAZkIyUJENmJykJCLlDxk5COnKQqaoaQAFc1R0wJN2qJFIdoEo0N7dClCj2L0KcGAThhSByNKMaYuJpRhSj3MKMecCiyoxPLpZUUV1lRjQ01sqYUdodgTggOBOBKEE93jkR7wRACe6QYvdItXOuKN7vBO5/igC3xSA190hW+6xg+t8UuX+KMz/NPlJYAI+B8i4t9I+C8y/omCv6Pir2j4Mzr+iIHfYuKXWPg5NgNeioOfEBc/Ih5+QHx8gwT4EgnxORLhMyTGp0iCD5EULyIZ3kRyPI8UeBsp8Q5S4V2kxntIg5eRFs8hHb5FetyTAU8gI55EJjyFzHgaWfA4suKBbHgoOx7Jgfty4u5cuCs37syDW/Li5ny4IT+uK4BrCuLKQriqMK4ogouK4vxiuKA4vkcJXF/y7cJwf6lTUho4uwzOLYvLy+GM8ji+Ag5XxOmVcKQyHK0cx6rAcVXiUFU4p2qcWc1BtcBZ1eGU6nFqDTitRpxUE75DzfgIteAl1IqTa8MJteNgHdhXJ/bXhQN1Y2892FUv9tSHHfVjQwNY1yC2NYStDWNLI9jcKNY3hrWNY3UTWNMkvkJTWNU0ljeDxc1iSXMY3DyGtIBBLWJoS1jZMja2ghWtYkFrWNQ6FraBL9Am5reFgW0z4Ll2JqVdTG57GNrHJHYADOsQwzvCiI4xshOM6hSjO8OYzjG2C4zrcqmuMHSNcXQDjO8WE7rDvd1jYg+Y1CO+Rk+Y3DOm9IKpvWJab5jeO2b0gZv6xMy+MKtvzO4Hc/rF3P4wr3+cER8IwKZA2BAYh4LAkSBxLCi8AxA0TgSDdcHiTHBoFzxOhYA1IWJVSFgRMpaFgiWhYlFoWBA65oSBeWFiVliYER1Miy6mRG8+Nob0gUtigEkxxLgY4ZEYY0JMMCocjAn35OLhIFOc7cxwkDkOssBBlsAzALFCr1ijR2zQJbboFjt0ygJ0iP3algPQJny0iuNSOWFIAJyLM1rEBc3iikZxQ5O4o0E8UC+eqCNeqCXeqCE+qCa+qCJ+qCBCPBARyok/yogYpUSCEhKAYhKIIhKEQhKMAhJ+pBYFXJE4DEg2ngBILr4BSBEqyXr8SSt+ZQP+5QEu5CG25Tt+AMhv3JP1/Mcxrz5GoSGw4G0bs97HccZHHed8DvHAn/WPe0g0ILkqO2mwZ2xq/Baa7mdpD3C5JbftZTW2MVTsl7ppyUsW1RoFNXBREGWw6rkhMu37Ep7Ms2Qra+iSEMCsXakVtQTlRyvYUQz0nDOzrSUoy8GlVrEoVSKwDPkgS4i6B0O5uFVH1rCy65iWN1J7MgFVJZnDy/AmI21JgQawFq1j1bPcEs2TTTRWjqzne62JXsMykCKF3DiVXzj3WRSAyEGZR2WUcQWYKlZQ1Aqr7dG6apiRodpOzQENQtUWVTUQJnNjLqtVoqw0aMp8+WwgvE1yCGE2l57nxhsZPWjqoHG3bOU67vOy4ZO6umqNBxWYdBECxv0Wmz1qEijQhoEQ+hLV7AlTq7qAABjlxI7jVb0HlhxrM2y6CMlTHzxKRNXCj6eB3/MJTB7wPflOnRSzxuihCaZLC44loBmiGvUAUjGGcRyKYyAD6Awz9GrsOKX+ET1NEdbqzUhIgJibW5dctUuq/WjIVQn5ddtMp/O2X2jrIUvV7WazzW0eF0Ff22qOsrlwZb+G6Hwccj3IL0XAA6N3hC3hQFjtlsuDVyCsZg/2nSq8HUPgIA1SO8S+i458SCnsUlcdygxaP6wHDDmrn8J51SJM3jXNTFBwCuLFKgPNQAyN07YRXD8SOogENYn4ELLFfN0Deeo6Qo3Oz5aaAMzVxSu1hLHbgulLTxcS1Ayu78mCzNUgH3P2SQd4+xpACFfXoJHGoVlEI3WzqkvkHcFrA861Ywk4VgffNd4MwKWRLpMqwNalMB+23osju3G+JdU7NcAO4KriGguNasxi/UOMCIZhb1tbG5FmTJoSzz12T0yQq+NR62WqX0VbWYKYbBRuun4tIruTyOhJYwvsAzmYyUvjAplEOmq5At957sqETD5NtyME7gy6Cl1OwUZD99GopcaKzkhGrjK3fvH5ivnNMA8j/CdL4HlMckrqnXtr2BOPGDWzZRPEeFZ2cgHPAW8+CVgKoIqchGRfxWp5vF8U37F6Z3z/WDflii4147bp2y+o5iogdS1K6RgNz4BxVDHTZwHnr1/8ZrqZx9ZPT2pXw7nvsOGaPDFjGHt3vzZuksXukV3maT9D8m0hrKcp47xEH+M3ZnYOiwjGjcKUVg0/7xt+qJpx7O3qyY7K263GgyZIpNIzteICfrxmQ0RqY1m+nAUAG1Myl7gWtuqchAW+cWmuCXVN8k/XNXJOWt307uKgyVjr/0dA/1+JTDV2t36VwXcvL+RgmA2WPlV61QgaagApeeA3Eu/aOwUQdO6YHXUdeU/AHGe/KpduMU78duQ08bYMrL1/TfijbUkPBiQezxC1pE0IZTkQzozjdHnA05si1GWMmADSH8vvuKq8A3CC0C+SI1rfD8MFaUvaiZHNZ/YIFDoKS+B4vE1A5QFBTikfWjSPk65V6Zc4+5plmm5JdPqCnWja9n3bhn8zANp1BAQZyPu2HSj2N2NcC6nYpukVcaCCDSvRibS+TbENqTAZpi7RUQiAm4dUJkJoA03jdrtHBcJgjd4dewrAonYa49iNa71Mu3nZdd6f/NZuAT8DD9Gwtbx+qXY8UHvMEmgoFopJUOi72WYFWrc/nf1A918AkGkcpz+tdbBxOvLJra3do9Gj6ti6vxqCt8psYlHkglxkCEQd7PvQfj2zysPpvWLOssfmL7R6KbHcPs96A5p2bLS6H4AYuARwExvjb9YmikV7uqHUMTKNWWtlNzVcLvCuBWc7rfnVnR0bw0oq+DRDIJqX21Bqg844N4RQoS4J9yxsaIt2YoZQv3mogE/HeRws8gkvmm1NoTMSIeIb3Ud4obHUK26Z9WFZ2UWnEXDpPqg1YQwIemmCQTvi2Et0SF6XcumsMgswljkzSiQ7ENrYDh6CS2RmaZrFbBuCbDAgBFVmKiEezy/WUo7mWgWzrNrklty+5g5DP/Lm6rae5No7Le0AF5MRFv3HsNEKAS7z31iGksEAfU1YibNYp8htbhV3VunOLNzNP5UX+sX9QJhuj8eidN5+TETEsRCt5Qva2MJeaWLjQE/v3C9voz/5QrlxUpTsVANkw6PXVnf5Vf7tk9yTr7U/f3gp0zgahFg8TGfhWbxxxEUmMktCjg4MmcD919jIuUO8wnc+f0mUcRfZPZ3u7Q0N3pyN22xUVUwzhRHSwrBDc6GO6obj6ZRsHWJ7+YL1h/+z/z42P2XOehq/5cIwGsJnw03s99VUKzUyQaYZ3YGNAUplDTRjP+CkkEEe2v7jiMUmDPPppPoJNbpJsU1kFyVTVZyba0S1LSm3H0UCyDXnMY5V/byiJH7+zsd3Ub/Cs15C/ZpSEFPIar5X3DAfxBrsKiTbTHa+akGKY4Q4UPeDy5MoyIKGcWH3+/6uyw0/XuerbAUJS/VtK06DrGfWLx5UrJU9/zZrvbndNGq1Ncsw39wQrDezEcENt8dXz4mw2EVqZWpiBkGBNp+WpVZLCGP0plh5NKbkpNDsPmS2qG6v5Sc+RLOvu0pjGVCgBCUIyMnl1Mdf422OPlISwx8D5uODD6XTmjJ5dn/ftiJ/U1C+r8EOt5Jq438rT8rDkxntUYNl/aImSoNDXS6ZBjiVcPslZawd3aqd+FL3VpAD3Hac4N4ZuqHiqxEKa25v4DFNS2VMTa07l8HqNtnhNJ5dG8hZ/39JH5rL8eFMVMtjPeSo21qwq9pvl1Dxjy3e1XYcEGNHWe7TuYOidphltw06DO7nVHaAYCezMr1UMKSv040DHWIQYSeDpqGsMUcMu2FGTvjuoimTq5/7ci4TDbDyk93lJjWYVYyJuMYRbjLl6JsbSFsQYZxiF69YHhrJE2E8AHQkRToCE1OmTZol8SNmLi99n4V+n5XaS91Nz4G0Q9o4qX9ora6xbZojtKG9oCJHxcyhPmhLZ7w/vHnhWMzq/6pvZXU4LtkELYFOBpHOGEo04FRv4gHdoj3UPum7tuHJmBd54NKdG2GTW2PcpGmeOWvG5Dh3gypOzMrBy4SAsYiYXS9Jo7xY68mA+Kgsbph2Q+vtOY84VI97hCdZfWx2Qe2iM+qGm5lPBJhqRWZV47mT2vRD9K/cwT8f7ieHj6QYoqx9wPlonEv0QfJ71pWq3DNFL8foduPB2sf5igK9oVQ7L3EVa6zegvbMHFAiEv9DPyNK9am0BCoshhiKOTaBTdrCYj0/Jdom/DGLw5YKBP0vEh6matC5yWOOcezJsUfyjpJNDoCElne0vHaLlxrF0hJkfZNEvPuTeuY9+3yQ0fQ1Wa9/0jIpptQQ93RGGESnRUrKfyb7XjtkZhiJcpmtjWQReT0y1tVvQmncuwjwnAPtTxCc2gg2zLQ62iQb3c3+k1Q/SJz115dnDaFePQUVvbtpzrcB8bD5Kvxj/ye/H4R/Hpr7q+0V+PuBT/84BP86+Nmf146/3Q5R2g7eT/NUJdb171ybF8SbnG5l3PfLztOuB2kwC7EkBAx3Zgsl6XV++78tafuTfw39c7uj//yMp1xujD81pxDczWbOemQPP7K8BU9TrlNvIu1rlqOCWmmXbWxQ3FNXGc3pcG9te16n3WRjLe5xn/NxFaMeODZBW6gCuxN54E2WP8NRJWgFq3a1ny/7TX/JKIkPytXKWN/AylOvx15Wf/ejl8/Tz7T0hfbYPH6bxoTMkaMkYzZo82x/xuHdzb2Q5TE1XB8j+zy5Ok7ZdJ9TTZK60OZTTGyptjzL/Wpguk+xmYqsT2zZeoeVpxpqG0t/2HLy0DRTtZSNGyh683qlwROX7JyHLGYZj2MusFJoCEDKdtabBiTYNdy+ewdwcKXZzkjnyOF3P1KecaReLwMIHAJQe806fCh95TZRa1TkkeoLu9aYnhJFOaM8jG6pod+ycg29VIdpaQvEDSvcgWPpTCAVXz0EMytyw2E2TDUhBAg5CpnlsixBhFlii4F+IGaYKhoCYVLkCZGSlFETK4JDRk7rPhRSPgMB3tBsN5zJBC+wzjhCreCI2rdqhsf6aGOKQ7ZRMGRRG2CxdQbhmghxHNQZYB+hbGGAiJvPntuq69zFt+/i2wnDPg7BGyqQM+wzPB+mTyrqUaQlalnl++FyUzgZw4N+yXwORthFP8xKJ1qQ8UnlLdbhGwpoHAtke20jFVJthfJPSYThkaoQRuEPl8wRHjZO7y5aBe6FooWu1GW1a0k7MnE/0eH1R4W4hzNuSvAxFkdx4wvcZPiE0xjuvFIA2oDgeWohnOLCYXo8yjIZAcIIkzgaptJL8uqEMQDMCSAJYt0A08rZj3kW9DRQAOoAARkF2uDdYdjRYK1lSDCvntgE0+jqqKCxpO/5mRqW5XTeyCqCBCfcOu6GeIySBUm5ajlRk7Nw3qMm1Bva92ZVUdREeQ0bdbm54JWgQBXlcXeualiWjl/KNgnVph4PVlUr8JxZtW9V2vxeURrPTSTOQiBWKjzERB43NcYbmah+hRcw9nKOKyMurWe/rUS9Tftb6vZ2wyC9oO3p6LRv1vfTZC57iKfz30pwYYTq+kV/c2dR35qIYsCmeVZ6e3W791fnG+d3lnIj7KBwXzcbNV5QkJapCZJG5/iUMzr8/E8pmy6JbwP1Nv5yJTYzeXn2r9Xo42mHiM4ULzikt0HDgb1X0jiqysJoc3qwB/7Vtu1vqe2SCM3+iewtCJk8IgJ52/otanj08csOs7iGLz6vIzF/0aMSiJ8Uuq4/MfH6Q4kFV/akJCa5rtgQdygR4AvUyQONSnuaFDhAvVSdbm/hs9DTi92MqqgRQmx131ln09NBFLG93W/eHTv1OX2CXTKpR5VnvfN6sVvpbBuOirHYyVjQUUJAChllk3c78/pXVxy4Ju5jSR2Z0AowPUhIlAyEA2XGVWyzp/A68WfYg+9Ggwya8FXafvES+p5/DmFMRQGfp62e/OswuskQcp16sVmlnTicFpTbBB8qNSWkGlOqAd81DfGKk2yfBTE1LmB8cpUq0l4HGb5tp9SqNaSTmma4dMkXp15vl0t3kGOCYlXIiWlmg5vaDKrXwYAt5GJDI2FKgIVuec3zaN5gZi9UgBs+vS5nR5rnjQrEdm4XUJiP4V0Qu4WQWV2uVBRbavuEyQ8jZBbtCxBwjXws6gSrr+/NXR4BJwEmKYyq+xtdUz3fIt260vDhstjA8yN1XSs0MjzT1ncT+01EKCoc3w0WMr2QZnYHHTfDa6XWRcjKE3RmEEethbELHlwgNUPwhjK2jcfzC0hp0yJuedCPKrq5Bsng2/h2G9HwrKd+x8tDrDzrvfbEF48Vo9lphLUgPOiY6ndoOTYYD8Jf2RVsM9CWXjyI+8quYAs52FU8iPfKrthiwOt7a5X7++mJ4wqL1kKYf39/qGau+U/L/1yAq/dc//8zpCI5iZW3DZhZu6e5pOenJliT2Rtn8YD/8SNNBBkFNkHeZpVzghi0GXrjl9bm4p2Yf7NXMUClpA9+9NJT6bajo/LSaNS4xDkxBAVx7/Ml7uvwZkZbnJ2J0m4RBiGOQbwMf05lxdXZsHga2L9t4fQWf/wukZ7AsraLd67O8kJDqvLO6ukk9U/KUSVzBcejp7YfGsqHKpP/T+duJ/XnVTxjGNMNo+rzOotrb1WOkMsMum1123BMurepvZ9WD/G8c0Ac9te3llXYdaClTeOUws4ecey/Cc4pZBedDbor2Ke+VxxTyBbZR+ucOJ0eFJXEvUU6IcZO6j+MiFFnSpwtne58wQ+PGEfARAaLmQnFGLEscBLHENYJprEkxN2QN2XQcSidKD3hzXCpSDNKmfyUSFDJkXRy/rMbV+E2gY4Z/nUAICOY/KKX6AVZiXPr1RBuwEXjhrisnhWy8YBdfRQYLuqEF7287eet0/SD8RfQP9WR0otirhkR3aFGHgaOwDhZDw8F7/bEd2m4vAPYYwoQW3YJ7UmAZxzVxOPoXM0l2NBXQMB0ePfJBz2N/mm8z2f01rNqg99/XyWkBTFZO/fwci8lgNyxFLJslGd4BQYGicdM6nk5zmi8QZ2rlUuHxm6SMEm7KeRBKEAkFzMxalJNgK7L8ixvJM9juh5zkJtLEkcna7De1pvgQer10a3bTN5a5Qn2BFe7nZ6stZkqkv1Lo9FyLcyq4ijOejnDlTNcgmzBujIDqfkLksn3A+Iw/Ygu1QIah0MzqbGkk1az8CtZ64gGOzD/hjhPQ4KtjSUhTwm6ZuXaV4DkUgyRrt8MGrUblt8nFugiZgMyab9jAdO2PKHHIDerqb9GmEofIfhPEX2OItrEgQ3iWASYxjbwIv1V1Atn2yZMnur6bXzI7rdX1jGs5DGu60LpbnJTMgkCoCCgd8YDQ0NeZszgLf3SVAAGrrKagXLovom3VYj5UvZEkatT/ZS9jzgclh8RlVKrr1blRMy3HAW29s1ncXx7Hwg487YZEO64NeBFeOSKzoClOa7Fm0wVS0Mntck7DZGSBLPbcaCWwz1G7HFAfsnJsFvo+hsmfXYvwRSF7QJoLFONeqs86/pOPgub44RPzrRsKpwaMTrZ1aCk6Z0t71FQJB1o5BwKrT0vc0gACycZrDy2ri1rKnOECIYEaJqLaaOm8CKc9V1e/NCuue6/qDAbrq03rk9ysUm/8yeokHou26hLv9jExl/X1ea92uwJQW1CXKsfrOw1U/ZCEcHEWEPk2Lr5XQHuFd5cGdzCSvDaVt5DwhC5T7kEJrlnIcA85gTiNQHWfZfreK0W4ksZtv0E98k1Hkd4ffONzgI2juon67LcGqyiBJUps+ZAlSkGQ2RWUT4BlPN4DMjdVYTRmvkLJvTOF1GenFn3DE6b32ZBck7ZTB6KMRl5fkyaIg9w9gr2knE5YobMx8byatgeRqT5v0zh4XmCrEblVv0KndmbgVmvTbc4NPn0J2wa9ovpNR0R9ZSntihkCfxCIUsBDHNSI/WMbkz97bwDsVuR8CfvduvKjAZAM4AUosxMauKQyKYWgSiNYBk1oQ0NFXnC+saZlazlkWg7kmjyyGHmOLhIvTO4iRfIMKD1ejU6TaY4yya7e1r24K5icZBOgnCPeNb9vQlZUC5Y2WZ+Or8WccpIH0ErbQxSLd7YMr+No1MNSBUAgciw4K4n2mB5fXUM4Dd4v73FMXEtpGz/UGc7DofJcZhEmAmlaPVcABERIEXigo4JHd6zAsSIIOMeSXlQRg1J4Yp6qg8dr6jfzodUb8PkDVM1yQbrOwYDG4t9G0HIYohYCAnbedWa9nA5xSFv+nmesslA5mKDuk14+1F3IHdrJ9jedFD74x4MYoJmiJ1z6LsYejlxZcglg33LA7KeE9wOiY15fMgS8d4dy8gDDzfwR/EQ1etzYiPsHIJ3WhdvSxJF8se9cS/Tvgh78JeTopgEOC3i2Ii4cltZqGHUnUufF2bA9ZOPJX334hFUPh4r9oWttLQIUZBqFMqK1yTpruAVcVRJJXRaXV3/tHDtSAFHmWmapzqAEGsc8il/DwlTyK4n2rPDlWDVyTcmCSM/Vocnnf6PhAHJqfZUlX9rF5XGsacK/FHUZBZKyKNwXaKtOBa+kyQHNPwkaJ0Mk280iSLBmfITESLzUf0GVO5ogrkNDklz4EEcRfUO9X6t9QsVn0CqDMoHKX/qBzPIQX2LBJ+93qnvZpqeqhLuKPaJmkS5R6aerEQytNkUf2t1CmoK1xu4JIA1gct8I/Rc2irGpHojJ+gZIC8tnsCtdG1YjL8UpiTx070hx7DWfWI+93h4M4mj0zF5CkiKo0IDj4p4uj1gReATrdeWgsBKBIEp2939P0pCuir77Ji+4rV39DiNph5dm7n+2u7plQGQ7NxTu1bP9YIfnRxOqWHvZF1fVT/XQZ2STljOcv+Ej1GE4QCG/0z2YaAG9jyX20QyBnMZatSLZV+3q7o937EqQdEoETm55VxVU8FM2d8rWhWlPcr/oTW+ws5Sx6r2kob7vTNmrCr+sUScUAUiJijpP6KmCozcLqXYQvseb7cLG96U/qKcKXwl8PSun9adFDcWR3UlO0+TGVoepMqMPl1JQsTKWq+nNTQVS0IAC0xW4NJ5+D2kWGEmlqDGMIT780SUkzrbw2m7iIUcyI67/oRSxQ94SsTdkkgXWIs5mUFblPWIH7kDmGL/5GmzzVp7eO2sPIKgY4KDqBLIQ88QsSQNMeNAdEPOmk/vqCoElywaSjvbUJKIrxn2Fe948hw5QYvkQsquAYlpv2W/mZQPW09bINX4RRhZRbhHkVZ5ikKPpJeY/lnJ1Q4CY8IoKFOmtYptJjMyjUDTDE55R4f1eII3rvahTGvnvHvsVlmVfn3tOnarWj7ByVuMpVOqSbQh8oYZtFf3u73MCp8LOswqLe+Zj701r1lZcpCap2gH0hRG41NDYkm6LeT2dz22tdKf4ux0fHXfZuSPedb6TaJWKrfrHKX5wQiVpf1ovuO+fh4kW8/b1lQuUq2XBRHz+LaIs6/Z0s5F9SQAvafrX3qqyIivRIQ+ISKKso5NhrO/DGWVk2KF82WNhSl/5xigmfzD+9OTNv7wh+JHTp5OTikNsQTF7/5AuZ0x22SfL3TC1wmt/MKFFnBwCn2kEUKLuUtBa6FwyQVsWipshWy+XUptV2thyYmS3JUyDch3xcD0mVEEJt4lY+BrJWhegwj96avHnj4bavCI1gGIoqJ9JFJnSBORi0xDO7B/Z0NCFyDlWpC+3VIYevGNyJpk8haDaIdZXI+uY9SJY10E8DcO5Cnofm4a51D23A/66C8xNc5wLPo5vcnv2qd+87jiTcthSVCjzkhhVfvWice8PWs6GE0pA4aTA5lze9bB+VWeVmBAi8sPPcENmIZew4XiFVOumPufXTTDMF1T1oRPw+FeaeXhJwvaSthTZxZwtRiwU6LI38h6JSQnxbOo4ljR6gFez5GjIicdmcn49dJqCEFOSq9RkldZSTSB0BvRr7XtQd6p3aisrzJrMXpRzQhUkPY6IG9URR+0dTjeWG+2vvKRHhtu3tsEZ6eMGPTdmaYD+lTQCge9rFfLjGB4e4DOh0Cw8zWucctTGeaxd0SsTxpm0iB6ien9yBYpwGnahx7JnUSh935GuNg/+cMX476g873jP345XtWhvbW2YR8V+U7XOnN2kDYOCke4/pWY8fvL95Rpmt+b8JVEcJ7V5Pwgm+HQ60aO5nJKQ+pDqQg889aIoMqCaVmTFWhsMh3oGySLMqXqCYQwVeqiMBacZthywhDo+rnZ4kHD5MopwzWGU6IphuBnpYHiOaOcOIgrUUyqIOPQDrMGJz0M2PzE/2hGmdLQUyCKE6/BPzFLy4slgzdgZraEm0sOqIUSV7Swx//pO/cNybirirexE4wgn11aY8AtylkkmEl/VzXAfMeE4cfFNEgeRR9OGHVxM/uQHx3i8bEcrHsjdX2ClrqVY8KbVtJkhkudO5QFhy+WxgBHcfTrRUECNYs9laFB8sNDxDWOIdPJEstwO57TKktwY/JOZtRl5gVCVBEgKgMm47+Kh3/TFM1HJzS9hz8y093zCcun5XzBX+6ay7exd1f3+2Qq2A9nfSRY2mvcyUPjbRO356lbVikkrmirkjD1dWdE8F+Ia1FllGLQDGO5+C+luIxPMZvH84iKVDysGSWYruNW7cptP2ry/Ir4LPHNEPPpxGfwJqkJOcq6GNUuQ9wGW84jB2/i16szSl2tiSmu/jWIU8RkHrnue5j+w2huNYVB99gRca6xaYWPAGtgY0G8MP9Gb/eLV8Ryl3ZfkTZIrV1N2j+RaoeR7OX/KxzlUqP7C/by/lnPQk6XMoOdMgKoiP1NXBrtjigUjKEypDiFjJJawCvTS4cfWnxsMIS67f0d3i+yxFdaE8Ph9mK5h+Pd7tGKhtt926/jknb7T5DRcd11qrGWuqUpfOLlTav7r8dsxb2KYLy9nkuHH9wXtkYf2BMs6esP/hUYvfnAHzSukbAl5XyuGl6VI26haFghgySdY/vfH90b6OlOdhEZuI4cg+ImApk0hkinzV15qPHi9nzMp6tbSMphEoTdsANEvDuFQY7r5j0UZDgV0oBC+NTypwadCzt52Tlyx11JS7uqmuhaQ12vVvHH8fkEdYTKXC22k3d1v4UqWsS2LdosJX20pa9eUWqIOzZvI2LA5btUaKW3Pf/sLba1yE0E8dLp2MrtGFAdCGfDC7/964xqs+6BN2ibh/0dJXx68PEnoy8LzwUCV6rDKC3JtOpTdl9PU/603wRpmf5i+Z4QBP33x6lmzJ9xAdF0oh9KmwnXVCEYKzlqY3NWtWXexxo3+tU8fs7S1CKkDDCpr8Isz8gEAsRSBTpyug5N9GgJANCDcYJ4Ci+FWGtym7YQbx7FEDfJhblAIDwZQLHSOL7lDAXxog0m88P9pAMSlNvB9MEvyuTS3V6EdBHPk7r5B2QY0tvyePujCvSVa5FkY5dre1JPOuimKVG5bNAdSFMaVDVEwLiHexFwh6pnNvirKcedBcwWkVjLsTJUQNbb849/wlxG0w25T+1tVudH0atLI2KZhtZvNTLciKAudQ85eSU7RwdpIhVw0xMOlwky8s7jRxD/oNdIVrzAhWWpYLbxmZHgk9qryKfg81hbQeKW4NqdBNqHngGnjBOAZ7eB3OhVhJYJkBbSVAW+WzKg0MLnC5k4VbvGZcRRZZD7cWLHR9hUSXxYsqt9b5GTqsLK2p0OqDqHHiMFeMqgMlN+dhcsTRtEX2rZgNIKsYuJq9oUgoJQub0+u640EsT15p7MOtuDWfDGv5ESxKB5Dh6PEMYplYPqnGWZnukNO8Zu54xriIwyqTGRes/S9ER/Hmujuf4Llhe3LO+F3Ze96JcV0lqzXjr2GGiFBsKzFvpx7Qu9Dc3pVO2X91z5UmBI5myaL558kvw6EXvOD2te7q8r/nb/400qEGTEy+ZFxjJNmkncqRsiB+x59SARNtwY+0iHrEQO3P01kbFlHW9OXeksaoeo9sb4uW7vv17nG7/b2N10Ub4+t7em9V7EsomlNmVkBtxm1/ctYByDYIifGLw0/6N2KnPseUHD7XK/toJGbny5ZUAr3hrQNPNIKG/AcoYue6IeauXRk9vjCjUz0N/WH5TfbIPihTp33mip7bY50UwWA/mWsQE9S7LU0SElZpAbLVJot53HcgjAZ+4Yrf5sYTyzs0APP5w4Y4hK+MsaCUsc0VY68QESMjelxh9rRRIQb3mQdAe5I4+I+I9ymCj069rRtMYnxdJvKQmndzQVAgUcb0dGHHwDzNOA79Crszi2CHHbA196INXu9yHxw0i8HB8GEOxsD2CNqVTHLgPmn9RXsE7o1k78GDJwU0kRS1kYUOthi7GH32vHibdFnpARpOykBhFHJS0hQ74FA4RUnGpEaWAad9RFciscCT4Rhh1pqJF0L9y9LrWFkAPk/GxfXbnQLF2W+SNEGCxPLSvxXo/nm3v060bloVYkjMidaexB6UyGFYiqmMinHSNWYO8xL+HfR01oEZFgGFjWKKde3xXfVah4OmzAW6n9fUbAvSveo/Wided1m75aa/oWohiV75wrnxQqT303G3n3tKJiVYuP4F+RBCqxzrJFCGG0I255SdBgJq/lzSD066TX9akHnWneh2t2k0Jx3ER3Kyvb1mqmdSo6u5RgA949WTAZjOxJUn831d7iXk9HQC1EYbiotMrLW+ZKX22X1fmLePZ2r7M0q3JN6g1osXcq3eky3umn49HymaRQYT/1ukVuiAtKQwsXS8L1HI42K+BwtyQtPCg4c5Jgsk+jAwJ1K56FF1cldokymVmEUtBn/tetDLGPOt28Qluzr8BXM68DBLOAYGgCXH6/fxX8ivEqej2FDJxq1mYtw0rN2TWHQHvOeVjxGtw2AcZdDFDzX5N3TY7UKGQ4SRpGv4Jy3by+iUcbMrRgIgoKedYbCy3khoTbW80BCb94WMKomb4lwXPFOoMYFBUJEESwGYvihxanhNnep0TFnqgmuZDyMCbwOY8veg2zZ1uh5ApWgTZzpUtTIpxiL71hmpSRrgfWMp/ZTiB3V4RkbKqm0mZVOFZl1FpIl3IEsvi8Ocq4e2FXSVVXM3SClh+RSVZfsXJGVM5PvfMQIoMIL+Gn7oicJt7aHv4besvwmXgwruvAuoWKLMzwWKY1aFMsDO+oUtNC1ih8mMhobVGHD8p8LvnRIk+P8PaGR7XdeyXvPDGsLXO/YxNBPCh1pLYk6I83tNYJRc3wrZHjKeScmFJImWD+IPi6seszQUbXX4NmsOLTWY+uhe7VW8qhhMO7banTACtAqY3GOEQ2QAb29qzv0kvQSmfI3o0++42QcY/+LjkAe782Wm5bKqNUDkAAN628gJx3a1yoVqRzVGtCpAY2yI8U0HJJPQKSIZbwUBGHfPVcmy7A/Ffk2qxVhklnUupN1APbP6sM6QxEGGKJ5Df0Ev386uH7Fwwxx5gmRMBUPO8MyK0U27c7UAXtOjNuTJBHe3btY9TiAkEJ/kjAyOl/C1mBBSueqM3x2FmOCCTSXBKhUpwrjZrkndVYpXYnYOeM4Hn/hK/Lp3tHx3Q0lQykr3cFqfZQFz4EyiDpo+zijtQJFMmC7V0SxiElXY7baq4TC3R+l/VihoQD0ueigQctkvsQ7paPSyIibwasps/KGo6oDBN5gg+2hlUB+n62Pw6WwUXBvNtQkG7r2h9clGQe9Go52MfusHrVFilAETfKsaP7/kF7IUToa9dxUZM68PpRPXiaBcFBjWRciqGdl15eoa5ehGuOAqZq6m795ZjjXTR5SvdJ3c0UX5Mjjr0SYFbJZUK493HfolCR1Y/KJ5p3s3v5HqCUiUAJr079uOS4g0NraWqaEVxSTw1vt6vv432dBJSQyH/ZwYbc2bb7EUhV9ALJbTj9OJHePMA9BScWh6SbBAFIwog6aUHZ6F1dOdxZHThNk1PNFFhoFat3RJh7uONY7PQi5ksgqRfMaepQ1m42d9bDezhwGUoKTRP1T+GuQWJB2I1RFXJhSAb3cH9dRFKGaTjxnK4CQZzuUEfQDIslFCFpU/2SpxyxMPHz49zdGCBocEGogo2IHcUXKvZYot+1Too+yXTRffNlCv+usaR+4rEZssql+HFOyp6ovMuW5/d7ph4pY3TkxeQSgX6Qo7So5iDaPceErMFzN+uwpjlaRybY5ZehwnvO7NCh3ZR2cufvTqf3H7WxlOXm8JNiarvm13PiP1IMUMfDZG2KfU65oheK8asdhRxsWISach9Czc7T6q1ub40h6qoR2CLYDzjEvsUh5UsqxAJm2YQYWP+sGedhm3sxRIzK6qXIuGQhmgBB1rLol2WIYYAouwSDHIfd85WzPBYSKiZU04+cwQZqGpc/6p6EobydLh6dHZ5ILE7HYuzBnUJdY8rZ4hYtSpJpf2QIGDYJkkBFi5qcrudz78DixiT+g3JEa0aSooAgXGEDYQRx/EogQGu3ob1ibHhzVXcnLE+c4GGMQWhxAKt8MAkwCp9TgviZpBGnD49uKeZlEtemj7OQ0xv78p4fzh67Lij8dbw//sXdP545eaOf//pytVKqe6d9tASiwOcAXf5C5o8z9POwMv2j6nYZrr57wfGLymwQK9IVc/fH0AZAoxtdfjBdxFNoZrtxHW+Ze/DwhZqPpdbWsrSwqjXrqPKSUKFaLlW2G8TyRfNXi2p4ZdB1RV7i6lUb5uoZ7IgS7Rzp5jgMFyYgtzoIsYYMKdz1WfnquPMqXNo9plrC6oScWStZpbN+1g3FuFUBsiTwktER3ka1LeP4YtyHkhSbHn9JL723V9x/8PB6UgW8++MzqFGsxiHaVj2OSToqOGtRCCNBmAIs20bQhJi7iSzciLmpBAt7MgYmQD5LUEA8wsYmCgu37ApMaQrolOEN/iFYcbXszXgUDnWdSDZDYkOcSjpRGUG9qsaCRttHyBZoE0hiYxMf2KmFTbxbaOA3GoXuHlNIfI2BHB8xmVFVPH+J8NDl1PxYv1obmaICkD4bRBQcIoqJJjbvIsWzbQ+rn+K4flYIoV4BwcWKhXolFXBKgYFDBwHyAQFEqMsAF5ILAOLInIwVmn0Sa2y54e7EWVF4KlOBPqKkIPGimilPZnEfSgjErJt73kQterT3gQCo4fIK9mb1fqr8NQhq1xcQoSysWM7yuigYOoivSP4+Q7M2RDvcXB1BCi6g94JjaN8iaxDWSsxyjSG+Q/TqdEB5UUQP94K7PtM/qHX6YZWBvykEq9TnSrwE+Tr94A2fPTk4CmR15jBE07sIBY8PMm1PQSEVRAleEnp3tWdJM7pJbdiMST2aKEvfeAS4mY+O4YNC7XJSre4RL59BcrCkzLdXkLgO/qwLDFxMoykk9iEqvOfKxWuXeqiJEGFjo3RTGq6w25Rq1sWqUlduI6yVCsiQxMwiteflO1lGF2BZ15XpOrJMysh1pLTWJDoHuUCGvzjzfIzDrDQmdRH1rSVSS1Cv/IqZjCgKOZFrSdsQgeZo11I1xRbLJ1dOqzrRZapFmGf7jgCuY1NZxzZfnkdimSfCMW2vjobmt3LKIFiREaE8xenyQap5tj2iJtEliOJzsPaVFjgnVx9CT4xmGxCdrmdayHzkHpatZECZK9XUiGxwvOHrO4HtX1Cjkz7xcydku/umGWWyN34tf+ygxGauQ4/mMgojqbMaE51HAEM064k1YPC3UzHusLHdDLHkbxxLhIcZSmU39wtPWtdsPS/8gdyXKhGtx/q2P/125kPJyHmzZ4a/vvbm9pHbP/kgQJm5rjy+gDW+Pm3rmFVYotMTY7pm7OC0xnL8e7ukbanMm9hUqlBM7CodupB9m6PmtEWI4yDbxpAWTWd2Ylup8jY3Isrwk9wUGsoZZfyOxSmaZPA2KxQ+faRSnqGLKttxeXVkrbGeG9C7xkoi8/OtipKFTnLqJpUq9stCELz133GTRJ4KrqSCSC62GkuK65TTlPEMTcBzSuRoiFxEPoDXgT9+d1qX5zpEQoxdUatZijwkefUmXp0KIwkslCitNb7VASKnjdYsCKqJRSHQ6BKFNcgtXS/hZMzC5rQM2SyTP8Xbz3xipTCcT+Z1iSIuEgS08OnDD1Ar3d7auDYTclI8IBRvVq28ZD4AIgJpucxMmCipAl1MWRFFI4prSiFYSDHT00vSuMguruitnXGJ4/EDpQajD8LXWrX1j8pPqSCRahW12xZt9Em179GFiV4hAGL49CxEuI2yKVm8H3c/G9NPqvMVGc88MSGQwsxbxIur3iomE/bM7RFDfaW/GxsybddsdGA/C7VLpUicE4UWrxGAVMAjw8LMfPPlzNHeQD+pNNZXFrDttjiGptFv6xbrZl4TlU5msZOuCCmdHvxvtftmShgJ1KXl1bG8Ah6lVZU+t3CPZK2sA6nMp0Rt+NPWCZZr3ywbzIBbb1VGF2xABGYyno5wRCgq5YRjELA0WuA7SZgbDBFyDt53EXqAqUd9BMttaFGGM980pDQZQ2G3Z0eM8HNesh/nCRzajzsdlGfmjSx6ufhZB7VPxAUkztaQOHlj60We2xXDyS4wzZMnTVbwyTH8V583BF1FT9E+KbsjQvtIjIbA9mT+OOGp7UrIe3rkcnd36+hovhQ36D6a+4ItXBm57xglhUwPpv4smzjy+kjMdLbTeVE6pC5M3vG0nMmF4VwQkUV1tiIKBdng0cqsTmEElNqcmjiFBTs3QCA37xwEAsEbVALO6RBrDHYFK/MKQXlgtAMcOnTs+OHDut5jSwNEji2IYL6A2uyIgYFfktw5KoDZq0zXpLSMqcma41p58ODRIwcOKEqm1lHyCwCDyaYQfr9e9tRdd1m4mT4KzwdXqYLcZ6EcuDad4jcK/8YTiGCv96CT490dw2lvjSGCitg7prUaDu2aQcg0V/8AqbYaYq9IeZsVhN132ucmZT4UE6Hfxdzo6aid7D/q0mLyW2ecXkmnN6xQcDrRx3iV4r/q54LiimBnl90tIhDW1hI/Sijph0opaJwQ9BuSQciJWFOJP4vqN+QZCEuR75oq++2vMaZiI05JRG9owHChTJ6zGZc3MvSx3z5844eMyXq1IlXmxnPdsf/lRAjXiEeoRgdauDin0Ldv+/xdZTgpx5MQBQmjPVci3oBvDsjNBTmawv3kxn4oHSikVU1t3MQLy1fP2b/4D+v7tp7T0iwX9ShY/4MdFGKsZ1zSkcKEGzVl465jMTA1A+dLYOdIiD9dJeDCaSDg4fhWue0yLLL5KFG91e2lw2HnUiuU7KTOa7lbpoFSsi7gH021eF5TmoEph7bI1BSqg8rB7YZ3METVA8WPcGaVceJQd9mEM2KhuKM3vuOuGm/WBM2emjFnv4VLh68at9gPpwjri0/DskC1yt5ENah4iiHlxZYPNhF2m3eFBFyF5p9qg+3u63D3YVsGAo6r3CIz1YSoK65AmA9Xp570Uar1ieQ6V6810cmjC6ID1OO+8wtSTHCeXjS7sldU8AoLAbPBN6yK1fSKq2uiVPYjcrup1Fsb5muiJAwSx9AA0uhLzMZv0Y0znI+OuAgxiA4cZ0yyLWNQetMGTqFLvQhaNBpwr04aGTnV0QnFXHjY52+980ZokryBjQlbOA4wLC5JjEucgr1XcE6Xj+QHrsFQKwderC6e/m3WHHFsND2DHULR5hkEsWMRTKYazdM+NEbfxP3jHKeaPip6HeGZ0w+yb4HWsgSohRUExBq/FfcMlyUZ3tqA/9vNNNj4hURNgGNs5DgbaywJW44QlbWQeJxxH9t7cQjfvtjL3vZ8kGdj/fOqrnOPALaxX1aETQshxVSJXPTvkmvI6KOmrgPtkoEIErWGVOfiE+/7D8a4KZHjVHTtIS0VyWNNHQ4eYDfh+NcRlMs6VRtTrL9MnMQjfEjtp0MYJZIkmMnbjAY4Yll81Q2w6dbBx4pWtfcf4LiiYdl/GQlNC2naZzxxfO6aW7AgbDmDec9BXrjrkNeofMIgdpHPwOeFDpGFa/M0+zkdDm0wlVHtjCjGA1+wieN3S4IHmt1V/bSZODufuy7GhOrc2pW//1Yhp9Negyi0Q1aKLWjpWbflfUdpGALNf5rE07t7L3+Ve+hlHKk0Oeso5d/O8FCkpHy2ARoqHlvq776TvI4Pm0+0FKujtGu4l5KkmPoPTpDIYJ96G5ajEMNQKx60hyJDNZZQ5hSQ3k4z/+9eH6Q2ibhC7Y/m/3ZEHZIPOOWpszVba2Yac6MdjSfLwPC6C7uZalfTKs2llX53wSiJREgELS91TY8mb7FpS2j7F4XAH4eNWM1erDuAylW70hLaXZ+0ZWRCiYBqO6ooCIXdRQ7tJ1h0MdV6tjspKywm+lNG8RI3KuqeRTx6P/xRhGSGAMCsFTUJWEKc1uLtyUeECo/m5idyrjLELeKFrfnbkpogzYSHYST/c63JxwqL04VfSgtvx42HJ2+NCdJJOSzhXQm6w2F9wYsaYxeUOtZdETjnm2VVuYEcIXc7tN/2hWu3XlztmXdWR2+qVPDmZEbWLv3InaLUfJ+PqCpWKwvZfDtQ91WjJuRKOLzQm3JGcjnqG/1UPEuQDin6PtVP5oUyD+vSgocYdblQeJqlTii7qsA3mQpgYTe8LLM/ysz8RcqUV0UIKul87cr7ZIghL7so84nMwT2RDefGuSiSrxCGuCBySGldgnO2i90YKx6+OlWwJCQd+3ZEcTrn8yulsnr/m1NPnpcg5upxF5jkXO1h7aXyvBTfz2UuHoZBLAQKvndS8YtD+Jz7QmGIyIgr84AbfBldJSWFahSAClEUqIELKekmWHhSKMObt7OkCPDF0SUAtfR1Ht6vnHPkG50lka0z1o8SMWwtzvDupai/pbZSb1yZQconPL3l8x7nvuiIlmJZXaR/HoIh/ccy/d0tD2uXbTWFtZh02RStlsxsyPaI6a9j6RyRynrO2KasTkNkiFtTK1ymBR8v6mU5Lk02NStd1keV3BmuITtkInOhghwcoxZHJGxoY8Qv4gvf0MK4Y6aBv/NlNch3K/tb2T6V1YIcfL1pOCGVueM5vUo8NWi4YS0w2p0vLEksY3yiNSSkTQ30vfeeVLyXpLpJglQ6HAUjjkr4GL75nE2dd5pItx5OH5hYdIRtnlDDJnPCLTsUN21AEgPesqu3PMNANLuEAQI0KNx/op5/PpgLFGT+bcTnySH2vaGCFh9FVOYK/BqmkMVWOQmDLfAQvyltfTAPzyTzfm5v9qHsdfmFzMpelZdmzeXIRG5wEsgC6AKHqAMLGMufhZEncgT4daAFXEhtLUEsCYw5NcQUj8uDDU9AZsqBiFWIc54CLLAa1LA8Kw9TskoRfD0pp8m7Rxgjt0zKwbjpqOxUUDgqIgsQVuduKDH2dmOH+7CfCWEY2JscB7OcdUYiygNecoUev7vxuxGH4iuiw6tSncI8f4RGRYGUxFW9EGGWhLyMGFpkRrHpsm7NRth0o3/ii0eZWn24uPuChfGZC6yOMjj++eOuem1waO/FTGPp095ErbW49/J1dn144qunX+2qghmhtptISQQ83+Ucfhsw/uBykGqMl2q3UxMk0Wxq7atGxU8IPUpTuVnSI0VK1TyUygSsEyvGD9HlnKj1RgEm++j6MPkma/JkJL3nOEofqfZkPgkEETZMq5rIRQ7Yso6F1JUOz10TV6svaLDsjtVPNKfHmCZP65JqOOZJ7gc3Sn1jHCnk2I9yzv2cIyL/S3FIxEhJUxJltVo3MlZmjgkBQ6Hju6uSI49w+rcjkOjdabcWl7d4wqEmnCUhMp6mw3k3N2tstBKYPRK+RsaUcvsrbm76LYNQTzfNo3dYygGreSZUUroeCn2vHqh6zg2Hs11tM1i4C2OxbGHGIiYyA9fIf+fsmecHCsCDhXtGJBgskXmobMbrCqXc/RSGBQpe5miRIPL6O/VJEXZZEdQLudgzBSCpRgg0sWBLNfoiIuZQt0nEW9ozB9yq6/VYbBLvoryMHsUziXQ9geo/hchNDPqllE8XmCGqI8AT9VdOY6GsmaKqZPWPb4kkVNDLS5PEymwGg1MHblEBM4MxjUrfmNvsOnyzqneeAiHYUUHkw7DJa0k4jq54idDCji5a2NFRS8EiVeKFFqYJi1PhYgdUc39KTGNqtdnzsEFoGh2VK5Kx8sdLmrRZ1JIyoFtZa/fHVnwsSVEIjUvNmaBoTA2W+3BqlHipgddWu6vtyDfaldTuVTR7z9etj7x8My6kpIz767+jJYtLkEWXJ/6povS5lckRD8yOWFxWoO9e3nnYx9Qf1oe08JF7Gie1H82Oug5RKOgoIvfRtNU0J6mEfk/XiBIRfut58WV1XUkHHXzve5dzX237ak7DgnMaVVRuXPldPexjv3bygyYeUzZKuxIzWa6Qw6SV01cFs3/ucwKQo3Yj7RZcqGHyll7sbnbZw/Wex5d0/WY3GIjzEBFQg7X9clVRFI4iaHaepXyhSLhwt+xkWqkiRCx1lIwlbySdMl0yIJifJfSRY19u9+1FnUAC6qbCULZiiDZZhvkqBuh1/wBvpyxjCkGcQmKnMMQgLL6X5ILvIoA3vxLyLwOaqWVY2PkDWAkeJ9ejWbtmvECiOFK2vJpjL+2Yu4zlAyCMyRoBirtchsk7tZlZxvOEftlPJKzNavypBYOv3ki5BluyoHM940iuS+TxnjfHrPQcmrLpDHIsUuUy3w//3zGXwLJ/HN51Yfqt2NwCSR/IkQHg6MnwcE0PJ49fLo1aQvfc8Ssg5xqNCu69V4+PVvTFO4+y1GE6yrKXaDLopJr3sBNseMjvzMVUI2+6TKYrpaJT3T6XQ5mJRUd5WKVnIsrSEWRaAvFOwDOjMK2o5HqgZEswRfWCo/ArGBSxJtN22E0Ibv/hapqhdItwPFYJv+WqPRmsMMBHJwhUDRllL2PqAOcMLwprqHYJGhNI9ousPy04VDMnoItX+H/DQKggV3ZBa1Ld0tdSz1lBbcWxFSgEB0GWxDKFk9jX3laZdDcjPW9VLaVdkwxzZAoubDQ4A5kkWjZcgAmWDoZBGdYWTKw6cA61X18t/EQRTlnAaCqVgs9ih/eU4/jInBhr0nHM2/KmqglhA8PK135zfEHYMSzfCY/IKnbcizGWf4fT8SOhr3iCaXeS22JMOtb/NEsTK64PmHXlFgK8g0Mw6wVHLs6m6XRizdp4Bj+bySC54zWDNaU229FdX1l9qPc0upUCl4Op2c6R/RdT040lHOcSPXmuFSfDGk41NK/QtFhwhyV8k0fY7G2Nu6NwD0cX5CLwBnWdf0sh6IaEp2WDKIPj12VGkSkhXCgV5xfHtO2YNGnqmyftY8HlM0yYqKo5OMSsYTUawKxBjDoeCPZ6BxRFm3u4gc6d1R6N8t09kJf45ECCLeFhFkpZPsOkfJ7lctkZP8TXzb/Iq+9lgWyqoiBpKCRYXMry+uSViBNay2sjI8GNUDeW5cewEJWmnyARUBohYers8HOLEfg+Eb/n6LPlyNKfykUU2Vmw2dl2Tz6qZdfO61Q82eVpZqUcmM76F7rSDEDa8LIJr2+BcdcxcU1OB3kOt9IcQTPX4q8VbcmO1ZdrSBBYOaZaCZ9czrX3Q03n14Jam0GQ9RRpW649cBtPatbb1SZqZenIk92jm5Zp8tBVOblyx4iXVxXOg/e6JFzCcohwnJquNAPrz0W7ZydJW/RoFCV++EPJYkEGCrjmTsm0YaUQN6dhotuwXjeh1SwBWoROtxq7YGuSuABKOpRayFXMETZE+Ws7wqjufTFyFDJ7oO/YOXyr+fEtPnPWWBm1NfxEDRJTZs4S+GY1ZvHARfiSIndlH0wqtdz0bCEXYXUUWOVVquUjiFUWvuqIPC6bXPAMF1oeUE8enAdR+iG4CLHOOjiHLjBS30EKk1sefzo1BtIk5K5H7MpnYcoc5/kceZuBGj0iAaEa0sqpU0I97HzK7WidbU2gZXTuCZ5TAUPd0a8u3XvN6FSU39daUj6nEsJj1lyEBe3K7ZnFl1yDAdwXN/iU+nfJU08f6bL56wTA3lZ7TplqpTfIbWo6gRjFbmtq47G8t051TkkXL25Sczv3eLFs2f07ANk4VVHZj6t686C99j+jyXie0FU+iu9xVa6yyMuD0WFRaq/hUSFL6zq0mv/VDXA/E5psWjpEpYzsAQY6MrU9yAoXsUOwy3KPm/ZuP/Cn6kqznvfEmK521guwri2GOPBkOiUsGuG/7J8Xs9dikxnJmNO2ALb8MAUMJGIUA/9hMmNycZMqhC4IuO2DElt5q9XIc1pdpGjcRf/U3w8IAn5eWkjpN19hOQGAyCnkfDFuChE4XBmk0se6N+DNRs0SSwYDU3fCY6FCQbcVE5aeUorUgj1BSlKuIUyjmtZtSTIqZN6Sea1489qPJUhr8qAwUuSX23gbal9NDXEZCWPsh0d5dhbq9YOagqBRk5/yGlowXR3QDBwZwRdUO6d0JOLhmhTMTemdX+tHQYsyCQ+oAPV7OIWanS5Di5cmC7+NQfr4gdYhpbUzbZTNLXBpXzVYHbMZPJ5Z1u0AppFsOij0xVHtLli5ej/Nkt6Hw17TcQlahlm3pEVHr6K1ZINPh7MzWYtnIJSFGWTe0gx0sfiK8lAoGzjMcqf00sEDcm1rdkCjy8x1grviufYzAAqTJExhd8lu5UgReISEEVd8wdbHeOis5krqZmdzaqlMKiNbZl16gqh0hbtHIfYYdqAZ95pmY8gXFuGfJAXuvTyDai9+9aP/Pvp/r/fOtP/Cf7vz3Wf+v1D/4Nmf5//29X/c7/q7D7MAwPebC/BHvAIiiePw51fLTOYtPu3QCPTf6yfvt2Ty7l76fG+AC+CdHjtJf/oHgPv5ZTxE5WnShw+Hop3cKHVmG9EryMsqAyuC/vnl3J4K/jPSPW+AdZKNGFCSLGUZeSuBWAw9hawIVkZ5vevaDchktPOhX9Dd8iGTISdZ0iCKeDNWJgtYQIAC6Nv/AeeH9ADoH8uFdnSJmYQOc0WsAAsTHkb7iR1XLtJNhfyg9H+cZLQLDucNZDLoLbr2zqJWOvqJR1+jjsQ6Jck7STulSbvRx+oZekq2k7eFykLLZPI7e6qqdDmVbz8SEU68QYyI0F7pxyIRY1ycGnTUOjdYainu7W0bHTULE+MQcNzsD6czcAcyADYgHSTLYAHtICUGdkKdv0COMU0je1OwL3V0aTLT9Elgh/3AfHoSS8eJFOgMNjS3WdCT+cirVOpVw0jkkVflqSfuqu1HvH6N6LelRj4zb117EATQYlBLhTEWINiXTbM1guXvbOXszwJ9/n22HE2IBUIFoRzVtWSouhpKlgbocyVD15K0lv4xGybHSVLS+OQ1LR+cNpSX+bWVsAjC0jUwDch0xr6GtYDAxIQAyDUQSkiAAm+YGGkXuC/Qeo7YuduNgPk6gLzP4dwvjFwI0pLxR58MPKvRD7Rz0AvZ1ik2sAsHAZ3Mn4wgzbWiJDIm0JX5kagwtrBKNAsOiFGFe3CE+43PIIavUodAaWlQSJ/APE4IpDlHmJ7u7tDv0+/oVrf2cpfeVjMxco5GgXOam7MhQsOpUrgmCb3x4IEGhIGBeVFoHCcJSEmFxJAkJUUSx1NTICk1FWWNJEYSSxuec+RUGodGZUrMLM0kE7rWU3gm3LZxtQJ2UnQTGjhnI+wS4Ivwgi7AsdA7LAJFwlO6mzdPhITwhQ7BwRPARVh5ZayJPiCY77DUNmrhncmEPHg2XRGqWT9RqTY6P3ERUWcfjc7ITE3po5OKTHsRq6Y8atIJFlj9e5ASbWROPYhc7Ec5jINmU6T5KbMxs2l4TQCBSqXUhITiFuFCQjRiKMQaarOLw6xkLmJlWcmsZC166XbeWFjBamNWWlcyNzJr9wN+BbINUWnlW9229UyKIC7Y0TQeRJruIfsDHm2HVLlwwnj8o0s8ScaVgRfuodpEb7kWreTeiYpkzBBlCBOKiH8y62UEfTyKOMjFOnOxO2acdj+dIWRVL8QpVCdUChy3kXiC4XrELLz+E6tQETUK7MIOYifxHmNC2mHXqXNFp49QDfyUqg4+xYzmKSi+DeSueAk6rqQkedLc7WJ2h2hP7aesjOvjNxYtXrNrXMWKsEQ0XOnvgJV2uR/RYKMrzbq6uufzEIzOlcPtdVCaEXNyUf2SmrKa4mV3vzENUVkdquq1GYGBujoZySxtRGNCAp1v8edDcHiAP6ciNfOmqkmUPu7DTkNnww7cKFLboW8FIguZbCEeTDJH0CdlGQGD9KBeIWzmIIFfjqPgyPxF/9QgLsxc0S1qIq4y6+V3VR3b3O+tqUS3gDOCgagogiMhKnLg8Blp4JoQGeH+glEFucKVFs0MV0d12queisFvg0IwFUX4TYAPr8MMNf0Po9miEoYpFR8HBsJsBYNIHMTgd1h0lOdhqoL6m6E2VzN++23xcpLN6PTqsFO360C9PDw+iVeBG0d12x+Kj4f8UyBRfII/dFs0JfcHiFKAf0K8Y1kY/w8iBQac25x5RAriDyd53UczqjPlI8XZRMKejuQWS/8XCs5hcODQYK9xrFFv+w721MnzVt6nnOaagKNWxb7w0eao4W10Ij8iCf0pZij2xKdEdJofOumpzS4jcH4oTtpFWbNfAsUlAuEhSJIYJwTPs0UmRRLk/fv75YT9HKUc4YDEJP1dvYyTJLUuM9qfVDp0HyoMRzBf9xg0LH/wuOHP49gCGpDjFMo4ks+XQnk4vqhLSQtp17kzSACQFT8DQBoMlw6T58ldmTVk//i5jaoXaBpbdHm66uXFK4rVmdsC3C9uaeRvam7o1hVIc4ZzpCZqKape3Lh4ebH6YbNqlqv11FuWV+l4iPcBbeaPgfBQ3SpdaWip3+S8wQ+yH7hGqAKXwOcPV4m/SzMhLCNDzwGGR4Cx6fIzZ2JSQ0JSXfZQlxsJ6o0PmS6uMuofUDcaNKppDlywNluXHxKOE2ZQsVWayiSdppuTujPnt6z3J8nnlnbUO4lKFIaHo29ZojFoLgdH8ACiqOSR+qjYcPT8btwCnBxJGlXd9CbJUaSjAAk/hhBIRL/m4n1TNUqSI3ELakmzJHRm9ZnD9ow40mP6Y22cNkEFrtmqcX8glwP/8YB5HH+gBS1SSxVkvbmXX86/Kazbg5/cJQj6YznvBTwXF+RkDw5mOENU1OfmqqphXnPzZQb9yr//Dg4+1Kuqoj12esxd2dRHZhPgak4H/dC3cmWgAtycG1+9JmFTwpZNTatXT61ZHRZ8JTw4OPxK1BF3OyWZO3XlNatzqPmb8ld+xjB/g77VqycM9dDdTby9x+EAjq4XQBtjpXw4ZJPGQhuROXgism52sqJp+2Hky5fIwwKNorS0EBD0LsStWwjgLkOQJisT7GgQNZjaxDOtnJRujhuYtvEMa9FCvGmt6bV2ppX/Ilf/Bua1LUxvJOcRrgI4fdI9Z39OF+idtj+t55Spe9phyH7I4TTwvXUerUbHYarQ5zGVmDh08/a5EBEX5mPQlegMPkwLEXCxXtIFCG6IgAbzM7J9YfgIaog/t/4dH0ELEfHQ3BBnqiuyhgUGyFq5UZbif6M4w9+4ccY47jdl9sP/qjF8FuX9XCt+mDGMJ4ThxmMc34sfYwzharbjhhhjSt04YxgX4ZU/W8uyypzZGhhOTNme5ISmHLdq8zzBR0pNDQJRXbXw2bMo6YsXe7JABACJidh0p3TsW3wBSRyDmuv+KxT7/Lp83TfSJasX5CJ6/r23F9GNeHAP0wMKFAfjnZevvtdz13eJn/o/aDXqH47xPdQ9JMcAuOySjoOJ8ePHx717OTEOph4eO/5Q7Rp43zxMmNWZJXhOwl3vdGcJODHVYC/6VrrNqc7F6N6LxHc67wgPBPi7zANbHd7zX/y0rnI83Wn89n8JL4EJhX+I77omut4R3VzcoHHuBHecx3cGjkpVOF2rxNYSGk7Q7MgLmJV5S2NHW+mLjlYAnGSBH0dFoywLqrPghgYoy8CkLBikkQzBhtLuyEg8PpO6ByIi9fWfAZivWzBFUfeMG29cRuJwyIpfxuHShL4gGhB7PDOatHUEOwK0pgzPngrYLqHQGORFo1gPCRGxZnhoLbwGMTQMCV5rgMGLqx3fUy5Wfld4XRO1W7JbGqTrV/KJXjm5mXmOZJdGj8anbS7OTV0K/H8EuUcAYZu4P9ZDDnQjKM/+vu6ebZflMdf94MH169ZZdtlWptu2egZ1hmHHKurzv/89ZN4WM3R4/PCdM1knLP76+/lX2nNT8/XIFYLew2OH7w5nHbdETMD95vcmiq7uHr2ExWhqh6a1j8x8vGKKnd4d5cdPLZwr968iyeT1emgUpWUDiVBF4XK4FKxdG6LSRYHOgYdkRQ/kJjn6YxLKf+VLGJ23RDxb7t2/FP0/oIPIHIyDysqgOKuA0eKgQbnGwaD00jLO6H+DWfDKFVC2lSRWrMiGB0ExrDxM4TZqQ6DMTCjUSkGfKwQaDMUNodBDsjVQmIaHWn6zhrpL1nO0jASxIVIZkcb+QHpRpgX6QFvWT9WfM9tal5dD9keTaMQBIo0USxEK5x4ZPx6JjjaMxdM0AxoaHmV+zifMhz85GIuY5ef9tOR5VAD7MPxfD8welEOTf0g3fpoqp96jb+AUoTvEv8kancZbwLMtd5Bx9Dj9Ygs29ZfgOjHF2NPYkv5NBRaUWgUUMJ/5AVY0N+XChJZgxSo0N0tK87vIArhjbKwDYWCHwR1wO/5e+YaqzeXieLU5TptQzshYxEFELNIZtcmpJscJ51iTazkEqOumWz6xaSi4FAJNB2v54Ol2kMnibVcne7rDTdfip3F9Gqf5v8c8ze5r5W2rjPJKteRRuWA+FnAUFgoOowEBUFVJA4OQX5FlkHqcGT7J3EPBPjnKMaIZfTWkaau0NMMdYagz/EoYfca9jUFv3B43STECk1oGRhTSby9rqLQwBKRfcWRgBMh4mYKd6Z6amLDDxURyzxX7yFzCPg7Vk8pvyyVE2lD+OULKJb6Xh2GOmqAxGVIFRghJEhIk0FxiDEqCNunQkEPS58mfNlLScOnzlEscJPwHQiDNzlMsibSnGz+RnULILWAGkAEFGNMqGUwmaLsiubiA79nKPEHj5qUeiXf3ZOjMnEB+mkUeF5qWy6oCQKy6yGplCDRBp/ysrK8ID4g+CfKQV3Dkq6hE0CMUejXrUnXUx9d4RBxGvH6LPApSg3dJvKp0qoI22qD6Wwi87y7JCCimTBkHE6BAMYhnn77zrKzK8SM3YiKNLCyFrH4JVChFgyRI0k+zFFuyY2QKOkorLq/J5ZU6NeuxcuSKyDAhk5LUOjQVxw6zGr/RWztLyiS+139PzMO9BfM22qgoIjFzWl71fsQBgaHMu+zUbg8pac2iHKgIXlODTkcT13zYUSEladFQJLRQjhftJM3ekV+RQcpSWPY0EkqlDL4Ck9JcSvVdRyIjDZ8aRkZpr2hLED+sIkdAUrcebAcR8Mc175xn9X1RI2IlD+NsiPLVn3Wexh3HE+Z+ci3rqXa8EkcAj+4ev4frRoRi/fTfOb/Tz+J7c/ha/WnnabcjvCZWaY9I33Hwc8ALTvuL2NwluT98sVmdqfYuuKTOFbX5tJ0E7poH5UvUbPWSJcP1ekPp6WnpY3r1wLcH27wDPPvStOPoKPv84AT58qx5x+6b7Fv4/qbt4P/nzdt33yLScgEuq7KdJ7QYC2gKGnHUqT8nEQW5xcGm7W5+BkeJ1Eown7AY7uiEl1wnxmnHu9xWMKaOzm0+HDm8uAyKX2Wk0Npr8wxXAe42UOdT6+Ob6MPqfBJ9nXxrnqM1vvR0TrnJypPxpCc+CdXNFtvcnr/MvPM7wdxicIFHCb6zcn4LL4hSErzVFYOsvCI4akVr/GKey1gu3lOhm5f5V45Rrl5ftqFib0W7ZUCtSGVjSAu4EMCwowXeApFjDkRArKT/R2AH/hCLGW/RUlDWtndZW1lB3WB1wxZV/ut5ja2BtHXxioWNdzdECxuPe4qwuzeWbzqEEC/qTsToyf7Wb9hUG/UxfGX8xY3rShsGD1PB/Qodq78z/k6vHtB9ppNXS0iUJ8iSJnJuezQ+sKi8unXkzonD5VfuW5RZl0XnTEQnxyboT+g8/+FDvcWRoUUI19UNxTU2drtsjfbjoEBqDar03uDgBT4hO1u2JpTlNuPPoetDGWEuVjmotqz7j2IynLHwkljbaMNxCykCcBCqFVz1/r8quSx0IwlLtIl2DnVu9iqyyt7t2FLZJYIPdVUciT+9nCEW8xdfLDiuU3ZT5lmAl4SYcZ/8gzA9s/LsDkU+Kk7Yb6Xh4srZVP0qs6qevDxRVokj/ytyEmloDuz3mvQfLqRnL7wrN/no/Q7M16Uy+Ts2mxLT9i3w2xnl17ioqTCYqkldm7nI1WGPYBd2FH9rZDm4udy7xENJ+Cwp2AoFkaSGtwYywTnknz/Ic4Cu6z/rjaMJwGSr561PcyaQWbtuDBJAD+TIfoOln5mfV5y5dXUMgdzJUSa7edPRSS74dIwCLRIApJYyANF9yYY9evMYI8w8nznpzntQXh0yPvSKgk09kGsErhtvzcw4Z3QYK9swSOMOtPjx2ZmeLn8kqa2VGMv7NmwoxPjjvnRMx1gk6ti7l1dY2N7RMcsCrNnB7bd3Nm/v3g6RyJg1tRkis/50RstLko6X12vJf9ZT1r/TL/SB1GFN82LfytPWU6o/d5M6Y3ZDU/2jmrKevgvZav9ff42hSbb0ndh5pVxvDuOOmdOTK+exO+m2JPTYX39B9sBUUIyJoZ5r0mmqkPYWEX17wmibjJYlhaxARxjlWU6s3H82tggVgRtCPXmVIaNqV+qulLV7i0gufPKu4UYKTs6Fo0ENtgl6t9ND7bbKTS+v0MHBlPwhIsr6ppXCVjFQsQgQGs7erBTWNyOiIIrTDCev0FXPdZWH+t1OXMwfNo9dyJ5oEN4YD7iZqpTzmHWYeeVTXcAb5H1P9eYd5/VAQzwByp81q4Rmuk8AZcd34x87KMDuByR2wMSNumkMLwNnN2f8zm/fuBMWZszJ7OwSu4kNXJz0mU+f5kzpD8fLjfCKVpifn5RPZO0lcBV0mXbrRCK88DJVj8aGIEJyJ9i7wZEqhxjfv3Xl/fUAeNLgKOs9RDiHuDfcPsbCKFJHR19up5YEq4/EMzOzwrjZLtZRSdocmFS4INwlK8ooM1Ouf6Q9WKK2ZcbrWPDCLLIjy+5eFRCyIy8rTiy05yL50t3aggO+Gtxw19sJQ4EuCyLxCQcMUrYlpepobGDBUbfUwpUuri7xaQtjUopWmrua553G6AcpUG0tVDhlAVanyqZlXwM8AwWjXrGeB7C8LPcEGxk7zdG+c7dD8yCvbFemWejxuOOeWWbX2Qjy0nWnF0zrNunOLpjVBaHOyy+Fo4KPeR8zWu+xFDIeCLvBOboMXApDhaSbTR4Ju/kuzMfPhxzvtk/IoPfgxmH3xAOnLrveUiAHfQYR5x1yKpFQIS3/uuwgoYJhWTa3FFrvaWSY6lJomYgQSSXy6PnlWfZBHxLSIUY3HjyUPIy8Bwupaz4kPxaWQa/Nk2fUxoFwBkhhH3xpHpskzCA/zLGnK3PqNh6Z3OUYKvhhUurxSomw6DWS44SImwdemnNvcrHUBhDn94u4IfgLu7mjhhr7FMKWvZ+M3fR1jQJZIRoxKnCRql70PDvxxMrTquB46OsPVLcGsPlAYG9eQO+WA4TGeerw/UCfvV1ElH2SNMYpAZCTooQbqFysdy+NfaD29lp22tBLYT5Y889avbRjG8u+L20Psv4YfOhkS6NblHvPspe5Sf/GNa46cdgUqCfK3a2x5eShYJuPG6Tuh/eN6aWtrfnnYBr75RBbY7W3DwRydEze6extWoU+vGiROchwEWfJ0lKnNtU4/VToBkz/pzelplbNiKjvqCLjykWL0IdNq5y9gWdG6a0LRBrxwi0UT5os5aGSUbxhz7Z+QEi2CFRuU8N44qB9JHtcdeMtl5yvLXA1VWWUBhI6rzH2OuIm7KRfZwwmVuvUqNiyYePPdj5jnyMO5yD/qBL3wcViecdPzP9Ip+AZOe2lwxIE4ZlbVb/ROKt9hzLO02uVJDSEc9t7eNF5Ru5Tw9rjMTX9fkDoTep2U8a7c7p3ZDI+kkTeAHh9UnUh/rmJ2M5JzdWr2w4Vwsv79tfB1A/wzgaFB/K5fT8SQvKyxXGQ4K7VwuFmnkvsZMDpm/mNXcHYDsyF8xcwHdjgrsb8VZqr1xUPG64Op40vQjnNIXOc1BcdxW31ECFtniPLQGyd/lZ+K31hQKkR88T7evtaJC1VbBcYmGIlC0tqgD9d0tbngXqpgWvrDg0NuxdL09xk87jOY+dvViFTtVo26FexebikNLKPwXW9vXWK4QUQrToUnpsbDgwZQD3G5m3gOj03iiNOE+VaZ62ct4oz6ujVKozURgpPIn/i9CITrWT0oYHQUOoEMc5snIA12nMahIH5hjUTRgpwX9AKvdrq0eTS5MrMzcvLZbp23T22voJakVcIBOJGq/WIs2cRhdcrgrSkskzLDQXr1pm5Vrr6j/Ns5Rcd4MxR/U+VU/2ppVYnQCKV/9+3L7m4OJ1uqhwxand9Uixda5ixD4M0XItynrweGiDRxhQvdCZKJA0NuDLMUpY8lrWUKuFKKMNLhbGxwqXUAI4EvN9Rcq1gs3YEdwBLwBzA4SWGIWCnRrSbCz7cQDwz+Z5AIRAAAfMCqBg5MKXBAKaZAlMIW6DTnX/91SSuqHilpDIibj48T6IKd4jz5xEPZVpCpG7A6agKJFuITdaErHb3dje85qqziOrjzweHVsBMoBS6nOPcCZjVIhHM8QOa8on/xPgJ/9Pq/cShA3oHhq4blU9WGDsYV0zunStIDiSFoXzZoWXs8iDivN48MYgwj3mPL31L/OkP6vrTQ91b7l9Rdj2+DlvX3vpso5GYLQaYo/G0Stp5OreVnUDBy6MBWiWvAsiU4xMglxYHTdIUpgrqBOwQD3YZn6Bd03WQkZevI0GTm5aHlu6uQj75f2vTBRxN0FjHHEGa9QMXsktJZsibG1uTw12TmsNeoLbCncVZjWy95KW7razUm6kCKgzj9eEvSDp46EAdl4RPCABR4iAyxvb+QOExIEhLkziig93xOICpFbA7vn/r0COPJHuq+8ZB1FciaD9+8BzPx4l4d5mm/1PpUtri9zzX/AuCum/CWfMDefLz55PITBBjseN7smfx2QGfSBCg1/kpyiv5KCjMeHC2qZzuwoeozfR+upp+iHr305vP/aFKqP0UydyhOQmlX/ZkplBM0khvSHSygswjvyFzy8wJs4Q3+NkuRT+3E2eJR3qYQ9anw6QhZhK10oxrpoI/R5/QnxOYvEnCLzDQH+MtnxCeMcDHGCi/EIqGZE2JgWKhvEJIBkWLNRYCTnNCEYWcSXPAT2RsgoEX3WHtIV9eq4A6P65SqoWR/D4reAJDQIQMXOYu4cfxQ8auvFquK0mf5Myt5bkaBxLGWGOEQMhXKKzlRPrw9M2ifKi1wjsNGsKNr0co6BV3zxeZjmmjAYymteX4MdY4fquMsx5gX0BKsTwEng3v5QkzUThzBluiUz9Gp5xdXUx8doeflFSwIDvdr9h++/ZcXn7L4P3H4OZA1+X8zEWdBwwPdCoKIfcGEIBu7jtGB7mFuSUKu3R3KE/VnAGFgJJYQ3+2f2lsCMiAVM1QnrtdNrgpE4otjM3FwurVVRtjNE/6yC6DhwpHioVVxI7iZTwyEgqQ9iu0crVQbG7vtMmJg9Vdv/RRxoT/uoXVhN/6SGMSNWVBFYGkjwonXO+WihIRSjF63hlpH8CeSAU+mWWUa7sK2/XUuwvHeIW0B135DkkO5fCAtvTFnYhHs+SaH9we0TWLryHPPorRzS00tWkVaJkU5BiCxUyZnYmYmaU4yIQIImYUaS3kI0RfQvTkECmBODy5GUcamhxXNCoidXw8iyRQCuNUrvI5HSwzZ/mK4z5ODhNxm6mS5WsnnYwFZD2ywNhpUrdH2er08NCWD/huSHvC6GNMdbDn2X26fdxZbj+Vuoz7DvB0eew5PWrDy5eXyQLymsUWaacDjaNrQTgIEJedf/GIno+qEC6VKlD59Edfj0jKAiNktYHGp9MsYH8xhyoWS9F5peabbQkz1Zc+ptQh1d4LK/0vbCahy7DKgQwMtBhN2sP2r3EtIuKiGoIYf1ffQGw43sXqOq5h5bzktFt2WLZYqm3T7L8TDfWEbi3AJCVlLOhixbbNaZga1F/Aj44Nq441iDSVhpvIjM3Crtbn/9ToeiiP/kHK3MUyXKAzOZofIqXnlPR7X4cTztFYcqInJaa8Jucb3pB8JGKpDVW6IEzKjLBmR5pFhRuP9JnOBpGbnonL1ZXH2cXJdRNF+b98E8IOV32lcoWdQq7Dz7Y81uqvZU2xytIqHIgQpqBxRk8uDbmW3TnbOf40ZH/1S04bNHDGr1UHCYoWXH5g5ICPQu+5UhDI66rAIimca7yVXjhz8vgNx9XJ/kcSUNgIC2ltT9Tr9ks7jEn1wnBIoYDCnwfM04ZD/ppKMvq553oqHQq6aGBPGwIZErZoWguGs7Hc/A71YcBUwETAuHXGO3tyU5qZAWf87SBTAQ/ZGVPI9PhNDRx6ASE8USVTd0o3ziCOOg4hoHEqiTsNdA38bz8zk3RmdW770B8g4HDs8QbMWgTxxpFZfmZ0LtKRRyQEZu2xhgisJwwHYHZVoOtnCdqeO3ZS6V27DZOEWXT97ooAjHNjjJVuhWKBouIUywqteN9JcVIH4waWp0LRWdHE2HjrxoB72GRAIi8hkQCZtIQMbuIJhEZBZWen2Rpz2WrZPjVVsGWqldDAUdODQkeDwl6WjjMJjglmvMDvoN4tq3oNJYadq1rMV5vL1vivWpW33XRLCy/BLD6JgC9zVuzenbp479rVCzzt/T09d0UPJ7Wq3PPSempKkhO2usU0VaCDPoqJVUTBuhVLiJ21YoK6S6xZkkKQXHLRF1ysSl9LiFi0alFWcGX0Lk8bWUCyJDmvjuQ5ShL0O7UUTs4KutqIZqGwhKgmCorLi5cIiFUkAfSe0WyhtqyyqPSZU/uRa//a8MWR5tlzbMCmnFEBR8gJcgTmhk/1NEeqi83kwb4LcauqrgWnb54Q9xcQ/VHV8P1MlS+50reXenOOV2JFE+d19z2QMeuw1r5YT1Tp8STAhisOsyFHmkOzw6QhGSIbTnpxHt7akwLcP9Sim6WTJLgDEqvQgagt3VUomNk8kH8ouf8YAU4eePzZbNdRTxYsPka9VtcsKwZU525ZxznxgJrgLJdHv7jltbi/iiABsFhrusZCNmBetA+CZN0uyRnRu0I9ZbDoqKfne+lmmyQpJN2tn4iVNttWZULSNoPqjMWYKlIzGkbD0kTlROcbbJFCmVUou6JBUvIkdKFYKvMM3RUNRXt6H91/oti5JwZA+4pd+hdJiKbteyGourDtsMSgWWsKUZ0JzSNXzG339Agg4GIjfs5kee46yoRl3qIL+1BJ3XuYMCox+mgQKn+kSQcmPpY2oywwzcRKNPSBuTj6+QIUxNoivXk87PHgAvF/86KZec+grRnMPLrHs8W8/wTeBYLNB2KbL4ZBP/ZcIaqAKG555d9fQBBDQNxfSFjtf6TIUwwgWY+Lj/Ij81kL4pX4S7rHICQalm62TYyukTbpkB5Dk/YotfQrjEzq3o2iCQM3aNb/i7y3cQOv9vWgyN3fs/CIf6jSwOsamkpdn4IWTsEQiB/RiU7TkSYDs+t6yhuy62/Z2YIBvzf+8udomVKJGwWnxaf9+8R9nBpmh3W7Vbt1hy/wiL+pmvxDBQThWnY8ceIYn9Akze+zVVQB1YmW2Qn9FH1zVZ/ytwbyD4V+6va7BvxbRRPQnCABBJTjdgK7MDsnu1A7Z7t6wsxoBUNRlKHxuZ4HhClCIj7pD7ZQz1xlEibx/1r9i29labeaTGDtQ7cj54SH3Y984+g5YL22rXFfYwasH4ZmEb4rX82+4rqOw8fdj+BscJYT3Bm+8qa/f+pliPXC7Jm6ZHhp0eto4XoEZoVt+6gcgJQThQfumGXNfc8zyF+/zkqBRtF9SUNNMzw4CAM3G4I0+VgEXoJaQSu5OaXaYLtzglECIggW624WWkvoS2Tusj/Ft/RSt2WZxZXItuAvFKK3IV1TGXd9jIWBZc+tg1ZHJKZgtpNi3bo9jrWG7vde2OKwziHGsIa+D/WGk9BM/F9ieJJboivSvQp/yrQ1EnocB3t7DLN8zrPrZ08lCuOKDCKIigkylhid4iz8DzJYiszyWYBgRlQO/ITAE8xD5dA81ZP6o5c9T/WAnieboixXzbM99ebYBie8SfPseZI3kRVPHHzmZYkwDWbr2a0RER6HsFC56eP12/AL+e/htQnQ4p/+haJ/4qYf/Hn4IeIPfy2pZfeFeHwU/J77JIw4T3xImO//0T9PCNh8hD0a3uvAC7LKoojIREHW/HuJ7/XegyW+lItv0oNX6FYwKE+ddK5Gy2Rfck6ffpMR3JhMEqOvyqKjN3ybsssxwykAXUHY+CY9u3RVJip9jOBWCI8CzOCQBbbaeeKFUYXWCPPk0iHIXPiQhISdQWqvFCoqhKRQVFFRhCEgoEiLCqMk3eHhbP2MdLdG9NkshKPcN5MLfhBNfjsm7VFkAd9MMIGckt6ZEH8scBTFgLXxNhEqpGbduZk3c4fXaZCqO3VtvAzc7AqFsrKgULpmZYcCXLfWnNgFCQMCEAjb3Pz+WZ3ZL08wWbZO+hKUxMQ17URhMSDM6s4S0sCOFIfoQV8jXiVhWocM3DJ4DkbEZMJ+7GE+U+uSXPh+zrfrBfos0YqJujmPUX0nFz5fEKkDxqD9YNzUUFMVWxnbHKu2bp0s6QsVHNv6PxnRsbZYUykPZ7fRMHqtei17MR23EV1p3VrD7LREpc+yd8+Koqq8MtZlmAMZGm7mVXFQxVLj10sDK2rvehCq/IMrkRRhnjj44LTUdu7tNp/oSkdD0/zxqAbKlziGikXLA7uBApIqaCwsA6sewO3edgcsYp/q9w60mqhG+2CqiFUYb6bPjNhYQvGhSIzFZ/czq5ijvOlc3vyUxfSGXf/tbrSeSk+f/R+pYWgg9MhYc6P7CVVoKAaDnAqMK4VQnBwICW0RQiJILoeEABRFmbrrQEGmFkznzLT7dfi1+Lac9GNaMdt6mJbMFLZmnKncw4XsO9ilq4tHKTrPM9QWzRaVFlVr/6LQDWlGNEP6zmqyqSHPgEcwXdqg0WX+Kc7MdHV2++nuBjJkBBk4+AZfZCxAVdAmmBOYA7h5HBPQFXQlU/kJmHErWCdpCkixGHA164J0xu3IDTvFTjb7NvtU+lYaf0nuOmY3lPBR+1T5DGYtjoGD9OgKNx09KKh+083c8UCgeBjWkFEGNSwq02Bw9ZCKm9OAc1NBi00X8DCBSkcAJoCp/JYbLgiC3JdsjEMEYrMREDIQudgVkVMqCoRYss35dBAuGICgFU4YWePOcggqi7NqQpZhXfmQMAcT9L90IIC2cZaUBAyAPpUvSFXQI23HnYOkQ6iypGQj6qVCF6Sq8DwwgKR7Wnyp/KLrafvs3ICp0inA4rxW8LnqM3uzQ3r+DshDrniocAmtN+O7CHN33jy6myv2P5Obe6bduHOtH5FxCMLf7rwRf4JTEfduiPghJJd6fPNm3JElOPxfWKUYvmG+KUz8ROy/+u3opKhnYwM6APW41Q7P9EevADuasqkwXcDGIeVINheVIpXBwLeHDmsCPTo2j3+Cf+NOXCADk7CkC6faWrbz+87VK3b+0KxuFPxWS9fWssO4naLce1P3is4czXdNZ/lO3GEiBeet0uHvO3rNbXn1wbmaH255CCyDoeHLifGOyLjtCLjblhMfV0VLd1GPZzKYwLmBqTyNq8WdxmqwXFOuZ2hmOr6WaOiRtSCPesKa0ziNr2dCjgbTZwPxzDC3m8vr5jsEen9UrPETE/7FGLVV8j45DVRxgRqec7jvJs5UYG9gP69RtWRdRer5lxcNF/ptV6SOfHfDxR8r/vU87PSe7s19IbUcT9zMd9XN4Svw+bzYc7hs9+2Xj5yrLEKUlboi+msvppTbxfJv7jMM0vnuuHuiXDdsNzQpCmMqUoVJ9/G+ssJCDxEOsxt7lJsnNY4LJPdPReaxRZYahoZJu1UbxX8P7vkS991NX+H+Pf4wIhgXVEfiz8tdJI6OEgkDz8AZSKUDI4gYGPoYUTGAiSk6AsrPhyKfoCpRiUh5AkXeu40MBO9NKnBDmmOaMXwFZf5hTiKmD/NkuTMKLY88n2D6jvaGQYpcKPwJRpmozHALV+SSxMeIs8QKSCSicdMDqiDOKn7fGCdVYDuwx5CpgvTQ4RCqmnI7theDSvhsx3QStSjNEK4dN4RH4cbw7fgx0ulBsLejK4QoYQW6XbaAL2UbbH/t8nq7KzNn1XWp49TxlNH2okqBwyli8rDYvNs9ernETgVRjy32zlxilwcKJv5ZHrWEWQ44GlYYwiHRDMJ9P8wJTOTZ/qWSpPsHG1tXQcd2UHopfZROI/w4A+3biK4kePF+k7CX7lDvXLqEbie3k+hBCpFx2Dic5jzXQF66yxXEPNP/YNRkUihEZSwMJq4tGIF42Oroxj8/B8dcRtCNhP4MR1dOINMkAObR9tWRkbi9jSiqkFA4FEnYnTM66Xwsks7wzQw6Esun00Fz7+qkZ47SI5QQwRl4CWrcDT5TuU8M3OqXJb4baQpaTcM+hDPPCdrcj4puFIudkfsaaufupHE5QxH/XqLW2Vrvnvmmu8UUiEDxI7AVjZeGZeB1Fy57QIs2iKahx6Z+VRxm/jwAmQaZtH9pcDjl9wMalGquPAR5hh6GB3xls9zJrvXMdE6uyw7DaNUB6DSu+7RZmTgxbMBLWbrN8YpKiM6PX8Oljc4T1l/lb1eq+r0SwxdLhky7cafBAVX0DsNcl3ST9cyuSc7AY4LTQQKFeI50N89yJR6T5cibv5U+SOinEJwOEB8NcMS6hqeFjXj7UkL0pPVa8SFUI+600GjRWsnjhYwm2C8+0v2r25hZNbXEQen9mHif9CTMoXRhpX2Cobg1qEFTsULdYhtrq3sSm4m9ohtrY9uyoiVPVbC3oLigJIzgtVbeKcss26RmOyiwgUu3blkCgycxMhIlLmZJDj0AiplJefAlbVb6Q9XSpw8N0ubeEUnv5mbekYjvADZbRTJAyPkGnw34coQBSRUWhv2MrX+HJqvHn9Ok6yJGWLvp9hSn12fXXblGaTLyA2YnjQa/WY1/sDASm+ffp5ZfiggnL6YaDbtR0Jvqvq2bXKTwiAgWBP8MPVTvP6l1rWVDKwMIHZO69sLkMINFuZ8MtNm9sd6df0bO/xk3KRhrMtGf4fh32QY3Z3ZBD/oqA6pzOCYD0QfPkov/b0vTJxLMA0wMZXHGwcTcKvP+yZyOWKLT857x8yGm35NVYJEqGB/nL1EFDFJodU4RHqvjxt+LewZVeT8eh+JRvdzd+i2c2Dx2dUScWp8Xah5/FO3pexGwTdnVCnmL7/gsn6FPHe7fTaaRhRTvvpio+gwDAWEFQeBJy6BmmIwwxs8hwxcDuENmwqcq1R/hny4BXoUXdKn4gB4e+bZ/DgtilLJnw7H/hkHjZx+c3Dh6auPYWWj8fthwrM4obis0cJLXHd4VfooHDWwN8xjwOYct1P8u0COe5bq2hWvPXFmm6aC7PAtbeGrsYNqLSL9YM+WtAMMIKa9eOfRvScYoyynDz3xRgqU2j83TX7zMXB9CS4j6Vgnw7EmU/5NylsjPcRGziHsbh8WF8zlMgIlLMXGSZCz/dyijNYoXEWD4xBDKMLvIeTH0J3XK+Xk/As4Avnyf5fV/LWm9eZEkclu7lGlwWnhTaUPwFq9npsQhkysGDtaHK/XuPBIZe+vs906DFZApIutxSymRQf4EBg10fU0aLu9GfKygsbkNG5WfeScqKBYLDBqBM4lhZ+f12JvjYLZIRIgktpx9golFCSb3X/cvNcG8KlzyfoSCf7Suc4IL3cmS2BPJtuCSowmmilSFMeGg1CQ1mmOCiZFmwzSTK9EbWlnLPSOLhVUhc5GqqhgqaeLgsqBxVsKmwrJYqDgktuckjoG7m4ekW4LtUw33Hx0kDmPHyrEHcD9xQ/TTqp9KRSvAHaAzd+xYlqqL52LqaurCW9BDJZOiU8gAxJ2jGhvTSTQDatIHPrhO4hK1NIfCIbqpXp8mZNIrTUOCrGPB+uin6UPfth8MSiSkub6PiySGJKyhIqkx2Bj5tRaFGEuNQeI4f4L+7L/1XT98HDHLZ7FM5zmXqYB3An7PYTH1usuG68wawgHsGHQA59LjOiNngQr6CVoluExVQCw1D8CS4/Rm2iV6HsTtlb5HMLghXCy2DCM2FjcEuLuqIzWBxvsxV/IPxzHAp+9jvoLtIwVEarT+eImq7ENrIABdEY4doCOAIw8ef5vDQcAzQUrNMGNYQ4gIxm9rzFljZw/rcsIsK9GOZrtYaCQCRO7xR/k5am9f0grZ+73dlubuCnaB6s/xZEOvKHZ2r3d6IBKJ4YMn1+ufgiX/B22TrSbUBPcwHbPofuvsWVvz8wuFO0QJ9ZLohylyAM2kpreIqqIaOnJgCEazuN25bPORIA0g9KXDXC82bDc16IWoKr3Fsc5xY6ZzQr1IuKPG9sma7Cj2BXbBGa8cIWf10/q0ACTgo7jQJ603Je7HHXu/dWZomHolP/8KPbiHUCNbHWxujLlCHV+Jo8t5uCsNF6l8LBLM+6mAav5wVE51aSLiNuionxAI5ysjT790oUoI3BY/ohCGmENdlHUUW6FOIW4YL9foZyU+vivHyNUgQPvWMJboSoxFLcENa94q/yVs09k28N1Nc5o1hHfDD7GudYJ7jlA53VTJwRcU2I9NY8C19MGRffuO6O/tcUpoXcU+stvJDjkuVLAmkHZOu4+wV7U6JfTs1e/tsWFLxdZgl00BVmcDrarc2+DEieru6kCrQ0Fd4RK8NcR/c6DVXdndUjf7hzjdsSsCkwKsLssuB/RNHMCwemUcTA7NCyUHG+3A6C8Q3GKP6yUYLKVd6d6sZzIODpbylxuCjT0OcgaGy/m5onSyJzssvHW/RAPbk+yfvtxV+d/FK05glEzEefYccZQ0x6YQ1KP98+z5/lFtz0YJe+UEhrgl3CHAZyHto8oBHsipwWjyZHt5Ob6cbR54qEL4hvdHXO+0XXz5yu3+y7bRey+G+69NEJHtoyoz40ccJ84jB7P1Hzmp5iw+OKHnKDQKhwaklHLoHz/SyTRDGvD4UAcgGFf597QiQfz9kYQUxv5TzqSAPHERxx/ExUMiul9L4tVrOnUK9o5wTGaiV1K9O737JOSExvZh8Et6TgrQynfn1KXEDVkinz1L7ZdniC7N8wVETPHa1JOnUOvRqOvv8uLFuMmAeucXSlljDVyOhFaV5R/Fz8kpCEoclbFYzEvWpVLjtHMbIWqFJNdeUW2f++QZltAWurnd9ADka3IaWFIVHOcbvLl5Ce7DGnYpU5RlQgmnIfpP5f1/Dq6NOO2y4TIJMaegwmchOd4S5c0Crp/cps/xdz5lGC3TQhs/b3g5GS0DT1n09cGZdt8O3xZfNRLMqDkSEyiQPl3AUcjIwiyTKMGeMKmBflj0blhyWkbt4sVwHAGv94OGrxca3poqyYOj0YWlkAyEJRYHUajZG+rzoQxonVI3MQmuqoaSoOisMsqhlpZeg97y7jQQG3RERSFJPCMeCRkZ1asvLeCxwchSeA5yUtmUbRShwCL7yjIhXa+WfaRVinvA1qu65yDAMav1HuKE3QNs5jIxq828wPIKDinc2OhhU+XtkRCwMgY7WeuRdC7vecAseu0kNmZlAJjf0Irk9eHz8WG8I62YVizvNN4fG6R3afuDNdgXW7vqZjeo0atxT3b/6HizsbpQAqUlQBIgSU4LRvG0ZChQWgJ4VleF1oUJu7qsOQtJIQbBxnIBVF9KixWc8AhrIYlvBXYSd+nCleiQ31JC3atbMWgZ+vUtfJ30cQoj3ybCOjU10npfQcmMj4K3hzenKdP/+fIM7wwENBR/AibcXEE7dpRwlJ/lCRdtbl0MlUKt6+GFOMesjS1Ofc+gTQhL62YE2HHtxT1IDKlt0L2DQvYGBZxbAlYXVmQgFiLSK0EQJC5dBMhwDwvB6rE4zAyHnfoQwq4LC0E7bNEFwHkZVFICFZYBYIiBFpbAMoKaY9yA2B+C6N40f3/a+4WqiZt7FmYscsy5NlyGF7v6w/sicwqR1vFpVx5n6oqtN/39YJPIMcz46obgERlTN2tEb8PVvNHcqxFBYFJbGtMLgU2cfJxlIbju4bGsV8GW6Ve6zw3+LF3ZyJ5caOMSBHnkGJ1A10FEWUn8bVegc5COVICQIZegVvrbWAUhIlhJm4+fI0avpCsDzWWBvAzeSpE/e0EA7iEe4G+TQPGpNLM9y1Erdt2rJahm0cALtlIIDjKegs/QU+iz4+enn2n5ek7DTnqrC/Uchx3nZopYAsy/UpuoX0GTY9PXJuAOmdZlMAoeGPr/3r793LlU+H/vKInDgd9ZriM3MJDuSHd6rAFC4HdOqBUK5rRs6QITy32E3XdBGooh1V7zzMhMMUnmSIVP9Ff11DGFYZyK6BB8CTq7eEeGYU6ZyMo/dred2W5KiEVdgLrZ0qpXHtBvUYPWQRUCai1UNwxYI1BiRVUinAiJBCexVFGdAEnardxRn9FLvpcu+lxUOvDoWcCJqq2N4kTzjgcMXDonihd9XB+ghZb83lBSUCAxDDTaBhi4dEOJUeA2fYCWbhNwZpJJHBKlNXHWwSDDbY2QHlHCIZtQB0JQrqNurPJ58IdWQp6amZkik6ebTLePNPLUo0eakJ4sTi7xU9gVXCubi6UZk+gztyZ55FvkNBuAWK4cGOQlt1x83pqZJRvTYheOXwEiEbgCiYTQFZowCgaEIrwnTU67QpWDKxT53BUgp4Io/7QZTyv3mVV2t/IsnleiZt4O3maeZEkaxcPUDzn4mXq4OPUw+6x6w/V9jBSxTYAGDBGqpT13jqoCwG9UdQgMA10oqVulZfQg8hVKIDWdKssPjrThji8pOMA9sHDhAZNK46G+z+RAjgT6PDtkXGkyVNoxSZLU9AUTCZQIBHV+Tr+9Iox2yuo5jlJm4vaE2thwY8hkaPfulhYul7q0bmXjkEmB3/uFeWs1J7tPXxhdTQbuGybah4JEJ/b+Whm7CUuYJjx/3j7f3jl3mqvomOia0pkivKjTCQqSDgpedEwQpghoLsTNebNlb25qE/M9UuE0QlccBUcVwLnge7GT6SLHhtg6wUkfg5P8IX3fm99N4ywHKFYUa/KIFef7Ta5VK5nqUG+Vury8VmB6yroprhx4QrcEcRRkfx+B5O1VuulHkddGEpu6aq60/kMHpE/YVeL9Y1OplzeJ0NePpMQJ4Gx3D+/ce5GroMy5gVwP6ka9/Kozc5n1jK2QPnFjiffrjZnhXhRC74Dfxssdl9397ENMrLFJbMwjjo2TGXjCr1T+Qn8VmU4ikGmTKkF70vf1ckb08XtHkkA1SSMTSPQFOHAVFAi7vJm7VpfndHev7FkN5pfvBMri4VHlg9E4D5S38JD7Edccsb02R2a0Y2TYdnI7VoZpr/XBdGCupExuYU4tj1UYNWYI00LuQGvbS0ROvHpn9cIXEn0F3XJi158Y+l0YTK9Bx/r1aqvCrY/7MtI7DHrv3et9tK3QCsxd+3gnHiklXQuYeRE8CEwp/9K26aozWNh5UplhSDq9FBwrkL1G6wkYGIDh125Bo9qMWIfRoQbv+ThdmIV1eL6ezOw33JGZ0VlML5ratYLDIRolbUHoOUUiBw2bB073rUikLzTaRz0Bqpk10DFoCzqJnVjNilyKIL65RCHsO+8BsisRFvUeyDYcNW4Z1afbrKZEd5Ijx8NGxx7ZQvGhOLuBY6ZG6nPwcqhX9zTQy4BrqNNjbvq2radabfUxuYx4qtHl4mPLjLE7NLs0O7DGyweLLxtRmfFx263p5tBJ5hXIgsxGnAmERZEWqt5QU9g9Yztxe4YHS98bXIFPQV6Obunuz1+tuGSTg/q4IKjijWl8s5nM8pFTP+yL6HIMOYnMoCw+1kyQxO+mN2OsiIA4Racg0jxpr84lR65Ou3SZrNnPuNG5SMISxiHHxiQ9C632G15xZXOtAlNH3Y4q2iXnhq9dd15M/O+Y6+iLg6Q52uW/btnR8fjdT8LNWTkoo/MknU9+a8PjMHnYYbx3HgI3VkBQqm6gYHDjjLGgQnM2N1nOwk+xHoYLO9UbkGbiWLl6b2LRCmXX3yjitZtocjpwnnzuIHHbXtDVEd/R5SwEcXFACETHaKwFXeHuOTi/wNyAgevgrt7CYRxeFEKcEBQciXRzsfQJNRUEigTXuAdEfaLToiHwR6VCBQdFR2cEhY5Ipa5+QSAnWxx9Pr4UfYb2moipAZ0hvj6DOUh58pSyT4igrDl/VkPsQT+/Su5G91x53kPOQvVGeAQXLwQ/ojPjzWJNGxpM5Wbx2pgyjW1ovE/Gm41YcCPuF9zRiIrYcJMQk9JS4xBO2H5O+Fx3aWmIcThnfxgHgMyV8P0mYSZANQk3aWqbAHokqhZQIQG3+FJIb0lAHwLekAp55uevs0efL27Is8ifvzAAoS4uFMFCeFEhrHZ1Xe/uwfd3o1OCNwuLx9qbkUo8dgVyUC+1vJkaBFnyxR7uLhrg3sUP30wuAq4Ir++0CybPOr/ogrzVlGV6E2vaGOE90PNy+kbiyqMNg/5bKOMAmzKJZLGQhScXgrS80F4v2nGIjs95lSNcqx8T3BDCOerxslFXysyVM1ZSVRsMvYKVqaXV2FRmfgL8iISqQDYGk/0xlLhnpd54hwzzNTaEch+Hf24ivd/oTqggOb5WtD1VkS0nCZ+gM0dikUBfQAoTmyfSjEOo6NX01UTqKrKbERmJTByNHIEQo503IBelHvWaZMRQO8GRKfJvxh8ybpoxVSOMZFPkJQzmUsWRGMzkJQz2pf/YgIg4SFkISQ3yughSRYzMWjf4b8doAMc3Lc6GEkFjKi2ka/w0dkGgJ0FoyrSgO248EwqFQpRZcUAGyrIAh1F3AgZ/Tze5h7qPahryPvIeh/Pqx50jNpGwD/ldXprQC6N57O0QGaTrrtu06NuM+z71PrcZaune/0b2zuwztYJVTa8qA6okZMDA9fjAqsSiCKiDt2oumj+c07yWhkETtaCvjVTrDEHwLou5yYjoz985Yjf/GQCc3ASpnFplLeAgnMeO5fcTeQbatPvRCodPQmxkJtoxkvOlvPqSszR5NKCxPZ+RthhEhH2bIPm7aoOtAozqjNolphpXknACGwYi0hfnM2g+BqVoD02zw95H0Gbk2Z8/63S3T+sKPge2YV3X9bitx66Czt2NaccRHz8ijhOaeQcxAY7Q0QlCxJ0//tfLsMi/Ahh1vYek8Ar0V3iU/T8rzyPkrKAInbamxdYWCsJHO71IeC2cih7sPuAtFNY951ckwhEsVuCZtEMvw6MOBdBVfQWvJGHsCI8cjnNpXmxjmWdwY4FeFLwOTpcthOFjA8s8m+LPyzpWebxdbui5tXcZ4Aes6Vgd+rvOyGNVx9I5YFVnesn2sG3PvzyHARX9tvEoL5YWEREWT33xYyrP5McEUaV0FTOaVhoIbr61eaR0/I0pNZ57b5kw5kHeHHIXvdlmk92+5re1IlPzy4nISrP7ZPGlHXud9jl8pixaxhGDrqUL1Qy3bt3PM2t/emmtKDrDyGb/QXyHJsWawhpHbvHfi2/vTgZ6bv8+l2kz/33x3PTrSbtw4f6LF7yXL6bWnYfX+vPu3GXHDI+9nHXEi16+A4PMcmOj+/H9y5O46pwoWq1Numh40apsowe/0h6NFqFk2apxo8wSZ14V9gIeo7AbRUJxp4hn3GbEQJVIgoFz/pmqUrAYNJw1KSnOBWcqWz+i5suh1k1ToeerV6FZKgQkrgFt0k9LvggyEC7tqsK5M58MR1K2VpShVGwgt1UnslNDbwnj20RyLJyvctVutpG2UT9vZQYFoVBBwRnSRNxPkMuZfgHKycUJJdA/thg6U+lc0H80NLsuBqWjQB33KakiG17j7mH8lntysI2yjfx5LaOmsczomlWXs/3XbBE36gdIHKGS/enxORY81N8ortQ4g8vNPMv8+Oz9Cll3HcXNMJbCsaQL05an5QJKU1jXWdz3wWg1+npOSk2kREVnbojI3zhnjOVKZcbWxoIBzbQGOWLdyMi6woiFQJRKXG8dk+WFcGsrXAiGCCLGpYXooKCMjMyhOQVwEMvuoUyMUXeZMbndxn1LGmjM1cDnziE0iPWta+DQgXKzhhbCa9fCBXAhhNqkdWurhq62UEOIKzVkGFRldD2B+Pw/8hT3+vzlBBJalLT/OcMUHllJ5lG4qUwqJ4HyPRLCc5pqjX+cI/FI83toiuT/dsZegGO67C7K2Ah5B3nX2Pgugo0g4ZJhbGS/RsGQb2yuYDVvUJVTJ+i59aX1lQpoXYJvG/YaDqJqduB82tiveYcev97QnEufhhT1FapSBXSGWr5B1YwAbqVvdbschZDxnBMVIcwwYM9pkVrqokbcihLj83nXgQLQ1UXEbsqgnvVnGqsyB2EvPTxcChGwfmqaqp8ogfIe4Wd6EO78SUddo3eXJkWHSNnNVCKVZA/0Do1EH/cIKpjcl2u82sSmCImsqLKOqdHzvSeEOTI+QohEyhBLdRzBV7ZCShy4MQL1mqXAnxkGhsDTh0Sc05YCJJ8m0IP6v75psqtgCOAFk99gGJyBiGBDKXSkqQnNBgYjEzQPCRsJDzW8BwMjLNYHQ0H7ojOEAIPxQVMwvhglB4Phihou1i46A53WfDAaZUQoikmTgeZiyFlV//Uq4BiqutnUndqNZnmmedQIrcILVKPqjHNUWtpPL5hq9mnKQD9CZzCnFeSKGxVW3+5loEOP8F5Wmmu4bJuwi5uehbO9rlvZpOVbvh9elWgrBqJgrn37IAOGqoGCA8392qLE3CVfKYLpGvcoP3OwGxKZd4lzJeYb5mKs8g9cZRXZZYYWWH1LuDQNSxD7OeYUHmXaC0D/x9qIAhYkbuqeu3R07XpqdrEYXrTUK4waw8pf3pBCzjAK+XEAQ8k4kEE5gXBDz9rPosn3dhite3koS5BBwQgwFNa0mZKspJfpYKHkhidrLZMabE64pZt5xw5aZ0DSd5pxiesMprKKkHQYUyfLaDcHwcB9xgMCQZClVAgjKXGZjKh06BOjBMrOt2NkGRMpwBksRtIqYkAsNF5GPZ0AEuG4JTsH42LORgCCnit81z/6HnQVvkhfRaCyyWtBoaoealxERzaBXcJ1DCjYRONimUEkb216Am0xAT1CLndBA/gzCW3AVVRDyUYsolJvQpdVpJvCpu6Bzfwc83lD56GTrMssdJxzuYUn3oJ0RuHikQCMCOUE5i+zkxa6JmID8t5hSdnm1YT9WNr/rxH/UfU5utQob4dDlO8ayMEk7R+Og1DiZLzM2ilaa+fomuzulHmRoh+12Yzb6bPVRK9opc3DPCufczZph3iqOCKFTSGCRfy2PbGp1l67wsoJaCLQh0hQCXGJCzO1ssxYhOYgISKkD9I9sVJUf/F27yHtFW2HtkF7/XAp6//iDR/irQ88s13dUjjv9d0Ob4P3+Trv8wNNW9HTB8/tPcX3PnxROAiyoAzXFT9Km/Y0JxyDI5C9Og6+CddWqG91D1o1oIIQwU5biX8THWtAPJTu3Vs3GXPtAJL4AGwFbcSDAI6P/CUGuFtuKW3fr7Wta7Mc66PEzCUzky20Rzi9R1nFR8FHG1z2D31+GrFhkRH/XgMTlUPc/rcHDI27G7oosXkIghlyo2tIclAyGN2EDhUi0d15cHP0nSB47AuVaW1WI2xnWSMA9Hwc/85PB0NA4PAIveqkHZ7/mvJT6KI4KU0dmBjX3V3gJCjznRx13x0TU09V2o1Pir6kJrUfLWWwOFseXKi/gAvCAknpTQZwmQEQNrh+QxIauRPTNYnfh0BcXnd8b6V99JLx4C/9Xd9xWVbMeBkXFZi5K2hry8Un0Uj1WyUuzn0lrmywFIkAtCVfv47Mrlk8goSQZARBsfO8XboQhxf4DNFMKX76HLqkw/zUteH0cImarQMFK2sNtseZmcbRTPfEbpNgwzAtFy7jSMfDHfr1iSKYsBo6u4qJjL6Y9LdeWj0KhtF6+mj4fQlTrMqmdwJqVV2rNElRh07MhpRO1MXGsL9JE8Rz8ldrLHSZpmaQhBbrJILwpeIfe/8mej28uptNSUqcb9+YtOm/cA+aylEEs9c7/g1Sea6drU1XLFI4aGxSLFJSQVuJu8U4dcPgJjeoch/CIoRuiMJZcJx3hZCcb9YHaRurjDYdS5QU/VWwIdaQTaB16Hu+3PZ3XJ9v9LJFkBI2DLiXbD7TH/nVMsnCnCFmCGs/OFUow9y3DFQ/qZnh4D9LqhhuoRfid647gQ+K/crLNDDdcX93dFqYDaYCWqqa3pINfMAr+6QTOOSskHp6v1lH0egkeCFkbzn4li6cRZK9j/OOe5ORs0L624PsLfy7nMnRIl5H+zWKcBapv68cXim8slI4L+Z163PLV4n/ysr5P7sYvzbsWF/6+b703vTzfw8V7MvQBDJJmmKp5NTGkFN2yVPftc8Umy3RhOzLKLgVXURaqyzJ6c9aJSZi3PFr04Cj/1nz15UAcj4VVrL32S3ImQAFZ6SHQMFQZjoIJoUk/nUY1d+hb9De37+fAFlBjkGiJI+omugq8KhR1d9BwHf0m7ocshEqgywWBIOMDCiorI+rt10DO5ZsaJ2lQblXTIOhjPTK0EaBMRhoEyVtEGJ4QsefMb0EfK+cBgo2LNwAhCtEWfAL54IQx67E/Bs7qts7OL+JhqvEhQnx7Rta/U2/0uNleX98W0ycK93yrbKXGxC8/7yj/Xf9Zni+2R+P8hsMh2DQaxF+Ev1sdXNeJbepOb3r7qyFurH1q+5fN6NdIk77lBiYWQSFrLkh/RKUrW+Hr/t6HHUNneUXLQ3lVajphSUKkyK2hNqza/TSKuGcc7t5KJjYkfFrwZTjuwW/NhpHme66evDjRT1nbwcbs79MMBEmwa0IfuSO0FQwCOg7A/c8ijZOWnp5pxB5N84mLyg35OXnveX55Tu0jCqK1iuGYDx/lfLz8hthRQILQVX86zUL3h1KDaejn+rHNR4e//fFs1tH/P/cWBls8PDQ+jTfBaaN6aoj/7x4/f7xvbMrUximKbsnvsJG+qinN2hwiun3CrJxeFHf1a+W8vKjNyB+9HTidi5nxz0E494ODnf7PQbCZGDgnxdv/ty6d3ZFCoNZVPImEUY49Kcbmoy06DeL49yEzKIv5g3KdaOeGsQ1HJ64/3KPshvfbZELGI2JyMzt1Rrv0+H72x35OxuCAWzGrVhKM1PrM/FHtPdhThuylNCPdR+Wfc3xpJzhOpGCvASkUsHT9QLqNludCudpHQejTk8ByZMU5OwYXa67DJshoL5z4gTDnhOV+Fr/tAfVecJLF/cmwL++fWvZ7f5aFNkmIl16XgvHUaEMy1EHyFn09s1CUX1ytNFnasbOFIM/6iIqP3GHQr8RnWxSXCCGVfj5ncFpOj62KyLnMh4ttQ0hLVkJBaMG73z9//mPbtME5haJcRI2cqgpwqykPBcSOC/O1bHadtyLWvrhhsH6dbWL0oNWLgsVRSxB+QUPNJBGV2zGCSwpnJwcZhULJJAQu4BvlyIkD1wVchbU1p9fPXmMJxA1xuvzzt+gGccGpd/bQSA6iUyK6eFOnTn8G4tRzbUL9ITOoUODBW0VxzIjDSQLyosSrMSTeNgfLw5LNF98xWyp37ZnGBTBUIoUZId4CTNer6waZ2yyrD7ReMGqMuyYP+dfn2wm8uw31rjbxuHO2hKq8QCWs73oSxHt5MLPBzcCRK00MBCFyohUiFqftkDnm0JKKCUE1lg0QWf3D5xMCXXzLLirMw4dvKXjUeBGCTVBNA8OYgXGECjbtGsaWQgqdu2shKFyuHMnXIHI2vEEOCAM52YpiLxfBpcBzQa/8hCU2bnUBtEnbUwpqx/zeAbNKERFNRvwHvNWU0xtTqJlrV8J4kLMiUixuIeWcXEmXQgdf3bN9doz12fAFWRjXmU+oa+/v4/AnsZDaada+aZdkDgxUQwRFEVpuSDAQ1roSW2i+Wj8qOVOnOgD1gcOxBy0PghpaM10T3ozbZlm2a5Z9l7E4yeIAyKLquy5hJEsu6wREB9rWSVCHPiItRdhkEldGNiD6ZHMLzIyLfREbLl8ZTOC0G6ILZ6mhUYYfEMUnF8ARQGAotWQpMERI1FSQ8OoaK02EX8jSEeMwLzfNomF8MSrB3HvHqJwz0KQlk7lS1uaO/R5+u0t6kDX57Fbmie5uQUrYHe0yKvbzdYWILg5NN/jPxiJ5cvF3YOg96NNbzXQals7DxDTgdPjE011yWBlXd3K1AjUXBqOr6uprsNFlDbFy4aGiZABjTR8mgzpQ2SroT96RB8eOhOlDJimFnsCOhDceOE7AiUvrJZBlXYiJdVQ8ojv3DnEGcS5uRoeAB6BvEXaSq2XCBoJB88+6hxDp1SvxlIwLVsgQgoclrI0IZdMOJhczTxB9tdZ8jyl+shmSOw/COWN7E3plkio4h/t8QIjtEeyxKbtPSfSdoYzAyIkkkUWIiiuEtqghFJSTHD+nhWNUPFeTgbnF7ObBOsHCwTZAJO6gTckVN32RGSPrV+hPLXHkVLPDfzvlxzDi+LW1nKlPNnxgEFHvCLcmKcj40ktTFKujIc6mhULIkxCTRaXmYRwIvoMDC64g8p94ZbdysqMAaQMwg83WbsoLClsLWRn6lMSm5ZYFIkLjcLs8xcogjwsWI1Sr3nJpjFLRji6pya5xQfc3touaS3S3vHcxrTOs2mrltQ/XIdOO+et+k/3VnLLWFLLzWmdLVDQKuAgRs+l0PNQ+clGy4JoofxUeh1UaF6lW11SHYBXqEOArrm4ikQjbSJR9als8DTgXrqSSltSHuw/BIIkkiAwJA7e3+vQ5JC3Wrymsq/vRACQg4DVFZUK1iyzsrqaRjdA5ue1L4SOHTg4y4lIiGCzIr9D/n77e6PjwVNZXEe+dUmu5Zaamgrmf8wK4JZfPDGUlAxJCCZMhSPy/XIBR1TnHTBT1fP6CtRETJcMLvGFiW2ZoIVKnphBUhIC6Aq/Zsgln4KcmSBTW0DmZmLvpg1dNdUHXFqVyAlEf4nti713qKY4SBgV3hVM8yoKjPamVENZbIuF8AbwoykswnLcMscm+6+yIlAMOoh1tlWO1XhYRJGCvcU7KWHOodx+iaN6DCwHdQInPIxzDkkJlctDoteKg2fjl7x9+6bDsKNp5Zvy+LPKsof3wdNEtS5Nt7qjjfhW46w7qnQhveaOFl2aXtNHLy1gA5IXCU38DxRurnBFnkbAUYyGW5Xwli1w4dKFAMm9oFJI6Vz6PBVethRKg1KXLUuN6UuXwalw2tKlQHl7cZlLcWWNFxeCjELoOfXlJU4RKyl3GoEtAHBp/YNmBUGNwhQvcXREcMf+IL9lGkfZj+FU9baW4v+iFz0JzOHxeSLhknV20Xd4njiZZZCZZHFYJJwMrc01jHu9ADCMzahQTevxCsNM1qkgrxi/pImm5UvRguy/ejJF68Xl4ooGe91L4G9wHSiFx0VKv8XfypHDqq057LCw1voss/XCwjX8NK7AGclxCk2gexxw6iqMtYTQNWjIEs1i8S2WEkeuIcdR0OXCAxRPXnlcItmC2yIxNcWzBZcUvFzTxi3O4np8fTsbx5ZEnb7MVT1YsL92PwkfCGrIuJzDSxv8oTsbKmI1/VUBeELFxqXLqYAvRf1zcPu/oy8Nty7ZeUOapB+8vam+OPRs77/vj01sVG+QxdeV5kmOB0/tN11kEBS5cC0456fyqwPOQNthXtPTudqy9TDFlLyOwqMcbrVa3Yn49tjhcQUATvxPvScXt/aTnSbXzfDI/a0NJ3u/Iewd7MUv4O7SX/xy4Yd53bR74tRgn73NPO8C5tnfxwn1aZXuIN123rjv5OBEt+m82eOlpS81HDD/Ind80VHoMWfXzrGdHPNHVwufmz4HHApn59jbEB5zoF11OTB1Z8mj4sdfTU13Thw51Gds878xnYTJmloio8i0nIUhwWQI0Hfk8PhO06+mj4tLHu0ESfVJftkUOLGyKhGiXFWFAyQsrkhAQs3w0UFEE+ACqGbN8Ql+KJSTDQkOXQgKULYEvXjyK9x3BdIDut0vbVeIcMqXlotUNvpdkZbflP54xVRdj9x9II4m3+B++ZDih/JbUInqh40mxfJHvQijmCh1da8Pqb4d7Vp27/PnH9ly2fGqpD23tDbaW2FFoRX/R7vk3EehfmbL/Y/faB6YxF+/FTKwizoWMCZJ9QHEuSwYhe7NHOAWwJo5JHhj9crq5RvB8kOXE4l2pHruq5RLwLhHieCnEQiOnFE35EasoSVnRLD+nOnvj/m4+8iRPOYss2LFynTCO9YUPn0jFfoDk9+8p5JZuWJF+kE75R0h3Rgrme+ZioGBJf2ZJwbzmOCzJBtubIQLZy8E9yWNB2PgkoVQDOWSEiycDSOQRV4YA+u0NGNPDxPXYrfS9mMJdbv3V2GoEK53zelzVu9auRwuzEDSCa1lgzdQF8QTPBRvqoqCcxrM6cYx4eCvHAy39a3HYeuy8u8cBoLRn8CKuztEQUebc2EklQ5LrfVxfNw9JMyIxaGi0dp2f8YLN6pbPwPhBBnkLgmIhiB4FQ13QhTig6IjuIMwB5oSXKI8c56CkdARFhPh51ZlyqXSDzMJ6jgjB+cBHvc5jIBRi4HgeJSUx+Fzo+3vrMhQSXFMiA+eY4oCGV5oBKQX0EagAxicQ0VzYKdYLp2+DeUIobmKgXMwnfoP5sAvOp8SSuHz55lwXDKb4gQ5UqywVOC+oZ2qGWOO46n4ceYYzpF6sFVkj42zV5zAZcO5WNprqpxaSHu6RgxSO6OvkTtmCmc6TF5z2mcSMfL8RsKdvjWa46pO+DWECeZDgg5xVu8qC9AGArR9DX6KOWXTpgi6hIspBZgmlh845Hp3DhHGWeOF4TiujRc+GIIwWxwNCp59g5P/ZNWA6DanR/sAwFKFIhpVJIKgtFFpQpGjFhw4wMrQJzrwV5i9WdSvjqZHGTEy27SSMEbHYmaaOn9+IG9fYL3Gn51Nk9jY6GRZjPJGU8ev3n74Q9pNNd32tWvsl3bVbNJCWMUz55ZtzurncenWaPcu+6VJABf3v7N62bZ8CcSDpQWXAlwvrE4TJhsSo4l2b6YCfSdCDS2HbQTpNzwXCGc4yTwNeB8bvODSbwey/R+Ht45Tj1F8FwGr3j6I2oAUfbleXNvHbqfmyDPyyaxjc3Lqqy+UFNCDbrYoMekwKSCv4PQ0YAPyy4iAvl5nzHbIbsh27BxLbHsqwNrMQ6ODV2+IjjwOarnl5cDCezS/H9veHW0AA/X74A7aewMhmLTh5Ruyg6CLs+tmSMsX/k3HKmmA5dWrlgEGOSuFxFnXN3iAtEs2riQnkyonkycrScnkyqqrQA6SITktmaagwBuUC8yvZm7IxsqlJdPBosWBZEdVOmdNEIZEr5SfBeL6sC94QzZibgaH1/8CWxNwRgraRJl7A46wQHywOBoQPBHWaBXELySFUY2RgvSFqFDYagBSGMFnEDGkQYi2xaCzKYR5Yg1xnvA/Yb6/XAvJM4XiKkVrXfrnCV9WJ23DHqD1YdvYRzuAObFNuQp9SqCCACXAtiuBKACJTBtQdlA6sB/k20/NiJaBrGB2Yj2IxaZngVKW1MZB2I5ykPdOZjLdOWH07/zx3BducRg4Ii8/EiJ0SyjC1Vl+OcWorA3kOnYDl2zcuBDmUHGs89XcZvoTbjzf5sPdIjfhWMrQVuOY2A8fYmPJlFgOLyrgMIwPI1+/QhxG9Dc57CGM+wHoMTcJgmwWc53RcIy//5LFgYFlZVUVYoKYJyACYOJCXudEIPzWfrGscvj1azTT70HcvYfoRvTcvdvqgkaAu99t0LrS+4IIuQop8h4VNJd/9TJ/9hVkXxX9FeHVS5dA+v/tJMSNzlX7VttmdneWrfk6vb/fnADGVSZlL5anm+vLRHvD9oYLY/TNpS+WlwFBdL3Raf7YjNvy519k3ebMu4Xdi3TpikEtf776IPB522cQ09X76tVOKs1EQJkjS8gfqFwTp5kd0B4thUf5QEm0oJPElB2vX/fhJfkoFB4VePg/6TSI/cO9VMl041IyRZATc09tZsefpz0zc4XkOZoVATqB1md/x6uXO6g84Paht4vMIxPI3MmuSS4/W3n1Bsvrw/ebSsI5aXQR47FlRhonQmyqbpCufUDlenOpK/cXStoaS5o9koM9q01Ym6QwONmj+ZGGpsAdphqTeKRzBuKuq1jwzp0u0Ii2cggZrgtVNxiWd7pBBolOBm5jFkhniW0kv2GZsyQSW/z2mKRKOCHTkt8Izqi32apMpQT7DBOgnFbKMTtdrty6aXMFPpvK7GM+yw8qvwx70tJ4Sd1yBW4Pvxf5DNHHnwZP8rV9hoZ9WoOXE877e9uvCi0DjHINAy2g6OLiaMhjrCR7v9nUS4McXZluyEut0ROZWej7V3e19nA7WeM2xOnkH1ORmyiP4c7II4EUTHdmw1r+AeuDfOE2661CIFAN7OzvIOwkdPYL3+fci0HqTOns1JlA7USNI+2hzu3r7ASlO6XjKH3CO50pgr7bXn39+l0tpgn60oc64Kfs6/rEnGSWhgEHMFBYTk4YZLh/sdJVVAC1N5HzQrzTPM+9bWn634A0ikjAypu2cXd7vF/AV3+QlAjETq5RNzfi8WkrqtPg/lxnh1WjnSczEPzdxBFsB7UXu9k0lnyaEiuTSZQQJq6j9FEkgs12XyOE3Rw+cN2Gq/hv5r//KhhTDMXZYEYeY6oZP8XIkxmFYbFn/puZUSwIQ/IbVVZHXD2wFnXso67p4D/m834pzFEt5kRT9/jzBLFxPMiZFugGAybCSg+FQEXiEGgYa6Wf2xgWgTRnSCJxojk1bRRB3NJSDiyVYkiqjEwRR7SxyQlQ5XIImOZ7MGGmDhpGIzC5hCnWFD6bS8xZd2GAPKtcUsMXYgMN/LjEgTdmn4XDGblJqWbBonL+LDMvRKjgVw6NKtb8ivPywKxiV2BXYTKqoC8eOjON842adLYxSwXDvpvPASqWQWk1UNLCWjlGR4JKVEChNVBERl4wVBUwwaGIGig0USFBWcRiFtZCSTVQWsUyPmXeqSq6ube1mflIulItbIrOf4CpijZmbS3fB4S0UJqww27WzD9tc5oPhH02fULgUMYpyqcQMzLXr89eKYTCArWuOlfRrFvy1Wax7eLAgMAgpd1iOwgCTv6E7Q073/g7ovdU/Yb+6Z5xHdmJ0t9aeqoX1D7GTdDi8Hg5fZw+VZwCxioUiZYL9zjaxFpY2uY9XrU8rKpueVV4AOB0WT7e5o1C0IKbXHKLSq00VlpkJQI1t8kFOGXhfyCN+cYlNMQf4dfHj7TWW8EnUMHj5VOqkK8Qk6gwf0pPr582inOWs2q0fgetjJtlmblrN6uFNmUNuzqT9HCLgstadx8BnZFsAMrqNx1I1MNmCe3ufqpyDO0N7Ut0OnfN4Tny9wDYWKE1gC1i23wrKnzben23VFS2+fRu8ams9NnS69NWWbHFFxWjF9bkVljo1tTm1lxY8I20PeACAGJNhYXhSX1NkWj5L9kl11Rv3VNMUqxjbz4R+5Cg9a2ms0J+B2CQqQXv7aZtp9OM/wNcjhoPrlz5QX6QG6zeP8AHIeE3zvzH54321MYzV5nraC7ozOlcYcl7BS2rVhitgpYy1P9GvaeYRCMV733TfJx9HNy9Y+FGYjv5s1+BYFm+aZAT2/2lFcMM+5MvCoUzYH9LBFOJUMbE2vnDhaSCeyeboW0+BWLLkMQtf94baHFczywWDNVt21eOANO2/fByzOMM8J9xVqq9gybx8nkX8lOU4k0e81sL/Af6Oq4DQ1tf8bWQ2Tt9aj/HKkyrqCLVbfOaVI6++b8PIfGhfJXXyc9sLqfBknap8RV4dZcD9/OVTDOgkeJSrnW9IxAJs4Rr+Fl06NSAtjnh1UyYxhPxU3i8WFLJqqzagurWP6CCVaHOY+UB1483/6NOwUh4ivofB+sW0ugaKnsTZUy5/od/R5hRGzQbzBCmCOCesJ/fwTBldjD7qd2U0fHGTkvVp0GC+vRTv9oVJHpcqlh+/8G7qy0Dl9PPN0fAZOA/svt15bcBFTTUv50NTVGggYqa7gRe2gmwTLZeTv65/KorGFWtJg/3gZCndX+WHO3kxsIvqv+L4LQor3QB0R9H2N6qJES+ekAQCO1S7LAy+K0JFLvLUFIaqxvnHkuAi6/iNpUccFexQ7TTaLcxLJKxY0mPPkznBLaT2omdUPZS+8YBmkkT1c72/i2BHWmtQcMJjyCAL+UgOb9W/Gose4Xj641fihOp9K2WzQfRgwqOQPXCuLFLDnq4HCfsXiT3ZbUdjJYPnUCYlbqWveaUaynCzKZiMXbwp33lAjfZkq5hORatC6H/YOb0VHpzmAJ08KaDWIR1HX4c/wc3rpnSYjsw+8WwsXzaOUwHpT3jXEY7pQNzooMxPQJryB0YOAKYfBIO73k2Dv/6PYw4g0AeObwX2lyMlPMqJZVbCQj75oFf7szXS67JBBAfSGRLz702f7VkIEuiuQv8l937iX+Kz60boVKrdCtBWcZzGeWqB9zKXxyNO/L9mcn4seTatw11Lj3HbJM8RZXjucyKun9FNkm2x3qc12/8tvTeT8bS7Jh/5RhXvpX/rqrW758JABivy699a1U67/K3d1lvAxyE7xnkr5+jkd6vLsr3w8/hjwYcJ44L34kvf+7IBGy+CwfLZwIUmvj6w6PXhmgkBCpKAG4INxAVQ6FExQ5cFNleFQHnFUPRSIe4jnhO8VZIYQiGhZRrNhXAuKG3Ct6u3fYnVosLgD+ctmxZGpwO92aC04DQLy9lkenqE1AtbogxhIObjhxZASOQXaoQ1vgKDj3ZssCrknsGYvvaGw9KHg/9brts2I3uUEfODYthCw+4CitzqIGewXsDUrBt9OPT+A50kP/SdVaV1kJwKJd6VoONLYqtYFZUuOXQIWruX0GgyX7tk9DVlJ4FbXnLVodKMY6slF2RnsFxVLDgMGmOkEKc0wck0MBUiRYQFSSK/rw0EOY2vegHRJ19k406RHChggSIKRqfssopyqZUAbiW29G+Fpnlzv4ziN+/kWcJIGe8EelB+BTVi3z8CNGH6H38uBfACAJYHz8C7hs2+H7+5KJ2Vn/6vDz9U/ZFcw/z6uuTKNCYhIC7mcD1i1OrGeM24lqnIy+I5/TzsgkbgGNn4F+HkI3Ihl+Hz8ASHz7hL+XXoTMBh6GXW5FLCC0dhpGWhQOiK+tA5bi4CENLlJZ4EY0jFtPpOcbl8jCBwy3hT2VIGCaDKTMqtKX3uNi59NjRkxb4IzJ0Q8LMn1B8IIyrLf0Cf7DCd9WFIygZmEDlz4xAzOjm7CcuNZeXXQ68eW+B69qZeA3QxK+acfUFDkeFH7lif7gVlrXcjzTRGXQLA42Dj9RxqBUap34E49Cqitp2Vx5bOzcpxg/bxirWFtcp1g0PKnnlYJY3cL5xgZLftrIAFgKla2mb0T67e8qBwtAHDAMsL7ka/X/dcAFx3mkr3b6KQWIiEHO3VuRiCQZRUq1h5+gqE4VzVxq0ogafit900yUKdM6QPzTrDYC/CCUUy2SxlD5KrOnmdUGWPooEuIwUPjR7+H62gtFu0c6oOODRU5/ZhK/vXV73Sz/fCTPwx4TTznxCfta5ud3be6KH+eH79xXMdo4FV5yiI3zWU/vmzmfkp4x2sFGfMWw+ff/+lMWQxdT9f6cu098xUfFxf9p8GHw3+aSJiMDZ4SLCWzPXw/zN4jOFcwg75LzwE5+C3I6fZU3jtt+Kim7XiHvHyAtbmedIQsaPSxVwfBRsyhxAVHd3V8OEZkBUDzBNJ9xCADE6WqtcH+STE8p6pfYWnAjcQkLCTZ4uPbj06a2Fz7sq8agv8vpD7BD2EUjRolbABsYIKQYMgtmH6uVfUPhKcD15M3zpMmIz5EuXIoxQUdZe3qxejti/73ba8v79RIf37Ucsp8u+ffRsBEF98WYliiKtnIY8HQoYaz96dEYRIfpQwz1EGtZAm/pn7/BcSpzvcr+44eFflJ+EWyH7kY9mEPspP3oUYcQS5YLNADenrKg95ZlvFmo/jD6Rsv9xj6HTY9yfRrE/jT7SLnyTWb4njviecHOU8Mwiia4GPANXYqQpcZZwDP9+e6NgMqqwIiLK+EQNK7TKVRu+sihtJA919qgTuuSbzCg1Udwk9qqLxGR9xdT4YXGr0N8yMeclTROB7L9o+W58qBsSUqourYLuwz9gZnkIReTlRUDqgJGhiPSkT0egUWSTozqr/uZZZtXfPyv02qVVfCAeSn9OXujyLJ12WQvnMGDhkE6nIO9+KJ8dNATAcxV4WRNYnBSUuqTQJ32i6MvfRei4cElqUGFA8auaFgjavhbmjNwy1G029NmI2hiQCO4Ekr5Bs+HoinA7dKk4L8XkoESDe8L46rBE9WYvR7XVD/xdHfwrD5dmryZ1QpiLOmzzsWgUMDwBD0SEAq+AL6MS+3teC0gQNVS0ICfMH8igkjJIFmLpAN3hDYMmaIh6B4zxmsDwGRoYEg8BuPMy4C3OMmp/r0OUJXUIWgWGefdKcKtYSBnccfGY/5h4PCHzcxRCIuHzU0NEgbwNcqZ8G8cuH7M8d+TO3/+cQZxF/PoHuZPz/3X7LCIrgXfHsfX+QcSzM8h1AtN06wRrm5bTttLoGG7aXwYAdDExlnPIVsDSGOlCZy8DLp8MuOMkLvzhkfnjjwD7q24yj7iBmDdZtwex9Qx17vhfgpBqud/Ffs/CZ7lbU2yDuDBkfF8VER/Xal+yFTh2WTRxZuFmeJYzpDQXunTmPj8sBMb+ujH5y0IFaYtuMMGyRqfYlcVHd5F0J1DN6PGMJvox/9im4P/Zr7Br3U6pOQHZDj9Eenz6BVnHIn6olErJaMZQ0TdRWDEUTDNwnzSAO9ewL5j8a6NEJXdy/pfie0y/MTo3gKq0oXMOauDGLfXiFLyDa6ppbgFRPMcLFxp6jpidv0FBuxVwJ9/IIlnfPaRs2/5+paq1vr4humcT9d9N4DYnSRCy5EjZEc5YSHRGl10qVf2e7A0Njrs3Q6bDoLlAMGiS6JQZaogXp/AtPSE/YOsBmvNVzqWLWbuPHt3Q47yLynEr4E2+jolkgfksLfx9B6KG2vedWlgO7/TaoZ3fA03VIzIRGVMNeyDkpwGRgcicqt8TFwzShFRaml8wEIofjfq3h+C/+LcW/JP/z4Jb4JsZVn5mOFrWaxxAARQ5/XLFGnfKoofPyClyoVB+5tnbw1AcZ4D5JECWG/X5sVhKbDGAEtBr7z4jOflpDikx6sOjuK0oEPhRh9CnNW535K2hXOGJg10n2jzaJlyDxV0Jkm+6taWmgZl3dZZ/ntvgJcMF4yEISQxlBDDC8z2SguAQB1doK+fqfhLnDNw+EpDAL/QI17Q6oR1b1i8ivOvSYDrQhE2rygs4SHdtL/HAybeyQ2lDphPaPkIp/4I3dT21NE+/nFevG160vqVC825j+XkWFkt3UpFY97Zk8MK5GRVJBsU4L9mb26udtx+WQylgUwB1v+5ZkDFXAqpg9hBUwT8EuG8tuHoH3S4gjSU5Xsxq+5Oa5jrcIkxLw6nUOMd7Xn92Qe5Satl/cmEvczKUjfR2rp+ev4J5bXTRrijqx36hbp3YVL4WDjFBctaZF+yKBm4DNz8Nss+89UEFdRGC8Z/Pk1zsr9+rp3BChTRUFJIm1DU/1BjsGX94ZlkUidLvu8qXCA5GhnjwN9F2rAslRXAoIU78QK8Qf+VxLgub67liZcYdvQtA7kKfmMu6Xfe/3IQ3N0E/Xlc3f0ctdMr0CI5qFOIzEylGSbEzV0NibLnn2+8w5ay+vttxt+ssZMnPRxxYuPRSzINWobC+uQ6j2zq7adIjkMOIIEyOgOTWwSlGB5PM7GCE0OhrCo8WSd0BYIDc83MN7Cv6PkiXhrnzCogBQRHug6VqBwlABJjEMpRAJ9+su/TvYOc1SV3R+jvXjnUOxajeFw52/ntpXZEqZuhY57U764vqJIBGRLdYBg9GkfZ67w3HDy7jaQQlu1Kckg5/IKH7nugCrxuTHsS+/niHtvIv1RsBjvuR/f3BHEG636//Hj6aP3fF5Mj1mH7+YWy+vcXT/3/6qfc7+pxZoNU65UA7nZYI7Qt85nUb2sxQdbo6GVuqUxPPgBAGMrWkOkvbOmeVge3Hh8q6okNQcVW3oA6duPHG45/6bRQnQ6fu8rYi7qFtykcJwg4HSbnNFUmhLpzTcM9+VvXHdjAOAJ9mG+hcO3CmT3PtWZYjOB3gbre5zq/wQvIdnmocAu+mOcxpQ633Pt+Ih1btWRVoCrVcMy0tpu3MAU0YTnFnwJK0LYcc1x6Qo+Ak5JTKM60J5zY38Voi+5eCh/5ve3K3crypCe1yuNwRwvkwq1qCfW2OnehTB20JRCHUaMjCUnyxQmolFTVqfF1r6Tgn5CG26h7VvGytpOIKhXUHsn6s6oA/ZW+ZphpHAq5je1ADzbnc5w4Fto6PfbeMdcmQW+j0xndlNtkzfa1bvyFxD8S1DgZqq825+Z8d91OwYr4rVMlsEmf6bAs2mRxyk6xGTG39qdWwGLQ0ZJzo151H/E2mC/xpbRfwTtXXmlcJ/dAJOfMYZ+GcAZJwxjH+HDEal79dYeF4se/C9ETHarUBQF/4ImO61Ce8qo/CE7OiS0PuaiQB1Lj+mxaCsg3ymPm/rhktudVru8VuUfpiDZ7ChFbOnua8BrGiZvnhBbRVnBcK39Xq8NMR+BtjrnRtygItdpu+bZRmYX2vH4oA0d67mr2q80VLS3jZ908pd3LeWb4BkMDXBKl2iafWOUrZ6Wa7YWGXbQAtO3uvDy1At2nZBug/XUys2cl2xgF65HpfB52iFSiJt2VxuhHu8v91SznmonQYDOVO19yLzgG64TAHDfgadjLdOmgoEAnQ+SDbKcRJ+P9G85ZB445y07q10h+3CLUayOrl3gjY1aO1m0bYB6hrP+xN7vajlLtt9FxuUNLki5Fqn8irhrKnt0jgH6Q36FZWEvi6oGprtbDTJ+2/niQKfoCeyghDCjjuykivxa3aYLlKTefdvb4BemBH7fLvfsXismyregYj1+XlSiDce7x2gggQ2b79soCTVqe21L0F0F3D1ty4ZQf76y735FfLfH6hbs/lWIK2XmMzos8iFwUT9tyz54Jm+DFoDc5z8oljLS/P7KKDK8Mdju/30CBsPVNREjlwSXKzrPd6MTZR/rWCX4C+2Q4b9DJAx5IDjbHX7WKvfW7su8BO8CyPy3YXx1zdAzHa41LjbcrAxVq4c9vgRjhtIleuiAxvrrUurcGw56mevk5EfY9nrVYp1LBOmZB7IMn5y2XhQaMA3bfXf9ktmVNWctmjy0w6582/Jm7GwFqRp/dzyRzpbyqP45TihMuX1PS6WswRpzTwHG3p6CvidceTWgtDBN1JXbcK0HCvxcuA9XA/uydAnO8JiVBR8zllFDtn5aECFEiwZ9bm/zRag5UlfKQ1Zed7mk+ttyJrLeLi+cZZBG0v8TEfXPhtBMQRlvcN8gXWPes+5KG+6IV7dwRddUJ7mdSPf1tryttoNEi48dIWhrdxL6ZCu88LiT3w4t2gD87CvygV++PoYvtPp3j/qQmzAbh84ao8XGnP0e3t8xsDHTiArC84xSLOJjP1MfzYH8cWk+/fvVwt1eFrU6mrcqS7ASAj47vJoboP9U37/KQ33wyxdVjXq/nD2mqfukzHIdQL1AHXBHwYoT7JP3QCfQ/oTyEy6uf5widpUMJy15Tj7rPUvjBgM6oAzaP1Qfrs2aP0nN+5/RJdm/MSUh/o2KPejj8OKeSvOp/uQ177E11jGo+4pm5dJrfJR51E4fbnNt69Yn8EUPZbqPuZ0VwA4mVIaPaF2C75BBi14qbW91A2/FtoGSq9fM2RAFq8awkDWIzTwwcADmBwXgMvrEf/JNPXv8IMGa9Jj9ih20EDc90BOliNZedudwFD4LS7gg5udA+CHYKWHgJTLAZFwJBLgW1WzroNjHO428Eo+NwdYJyJWHZOdRcwy7vuCsYN0T0IXkKMoxz6RZ9zmGqwwJR2j8TRzzl6Y9gb+41ZR2tHE+Ed/2idm9N6sTq+9QNnNI4m/TpvInLKzU/pfXZ8OB491eZ7jLEoEXW7XObU3ViMfnoaXhosMCW7x/pTOfo5X3oMWz/+b8w6WstM+OFT/9E6v/RkbWFFiH3wZ9KEUoL9Om+E03Na7tz8lLw7Hcd5wZOabrTHGAulwK5bSzddpvKL+uLp5p/nm29vYwMT+MBUEpOZ7pCRmoTcZIg0CtSSIig2PSOJIcVOyAgMkxuyQTj9IjT9Bdp42kUSw9ztTrc3xSO8ZPJG0KCHhHonPCLyt42gX/FHX3nkcfE/kC6XlPz7fZ/RtPSMzKzsnFxFXn5BYVHxwpJFytLFZUvKKyqrqmtqf+Nu0+V1KgTFcOI73P670QzL8YIoyYqq6YZp2Y7r+UEYxUma5UVZ1U3b9cM4zcu62e72h+PpfLne7o8niuEESdEMy/GCKMmKqumG+bdcvTRtx/X8IIziJM3yoqzqpu0+39+/H8ZpXtZtP87rfl6wFRT8YUiyomq6YVq243o+gmK/D+p/DUnRDMvxgijJiqrphmnZjuv5QRjFSZrlRVnVzVa70+31B0T8iUkECBQkWIhQYcJFiBRFKppMjNhgHRqVkgE4RuE4DbQ9zDLS26Xapkwg60CBOLpQ5j9l8olgWZToIQH3I0orOqphXXz9ZoFnSoQ9gXxZ88OAHM2oSSDU2nrdHnwgNRv/AnIlbU+1kk6E0wCyieRA2PntSb1Og8LbyFnUaONByTJh6RP5qhE4gHzxm00YejuXCJjDIBxN2lnIO1IJe6rFc8H/fOz9D4M+ma30iinPTw6No2LLoh8P5K4+o+j8kHkHxKe8EaTbRR1fYqLIF5nmp6IzUfGhntxhVOCeqj2Pd9FOdJbVjcyT9Dmx8ya+EkWngQYFK7C3yImskaT7lSpPkCx7u7+Zr+o/kM7LdPpcz7dXsojOKkr53UmzmSDGzlm1M9p4/mkXawaQMTRTAuZy+dIT86l6nOMZyORgDOBIkkmr6Iw1f//x8DXMC8dZPfniDM50QiK7yH1Zi0pUv5Q/FAlk+0JBTQHgdUBf0FlotQ9SD+nORxI3BosGk4I1vJO7wtUxu0qOSdkbKYqihjkN1DUQj37+Q+54a1W6Zw1e/c+j3JA3cmd7+T1OWZCjAtAI9TU60HfhpjaYlLYWSUn5refLIAlgqSBojjvkAxaoGxjK5L1YMfLO5mmgkWnY7IBKVtxKtwNGXCG4NhzwQ93fIx2R6zVgUamOrc8FbI5rgxrD0FWKr7R37AxfIEY427RsBN31xp1YOUWR9nWhFWgaqAfyTeOCpzxEHEBagxtyLbihghzTHW/5j4vgDiZfXkr4MAjHamUMfnNvPHkdqFWr9MZilp4G0RMNICZSE7BVn9+hn3FRikiYkvP9Z2u0r6bGnElZaAsKLe1dUHI3cmV9molj7mrh46hM85JriXnAR8LZxvXmsc3g5B4ckTPl2gLSPIwSsKSCV62Mg1uJHN8E46xfdF1ZxltrKuObBNbnuyhMvG0qfrwjz5NLMiNcOj70gnJJWDUIMOP2iB+ow85ZOG7PU1gokbLK7G6xdtQPpdqQzP1RgRPtYFdG6g2IXqleuiYNMgG3W5hpcUWZ2AY40+KDkYANDorN0yJ+8b8nPRWi1U7OFal+r2QGE0qlP5xPPHaUDSAjRKWK/n7x1yg9EciEzw+dHkvVVKOsvli4YFSLdBwdibmK3jqUzi1/5ELA1ogT5nJ0vojWQx0waCJdgD8d1Euow7u1KIdf0U4WrTVJ7awbZeJMtWePXBgNnOFhz+opk/fAu8+3AvlCTTTvZwPAUMmL3mOngU0HG8dqS4VAwCXOtOoKJYt+u5cRQJqhN/Njt7cR/7pOx9X2+lamGG0r2E+FsnIA6pFOxLFivEgUjpabTjPhVmywouoqnJPVBdKdDOtN6at2KUQPXNqHLPbnoczEXfsJOJz/v+PtmOThIvmMgdgYzoP2rzNmk/qMuO1XsxdoE+4DOCb986KLY95RTOOXhNW5HcqOCWf2K/FW4giaZscc8UgpNRSpX5BGArcyahF9V2iMBo9O2dJMmVwtlzPQEarP1z8T3uYYdMk5Suj9ShafnkobY/q5jGTNrTQ83e2D8mHQ1//P/4y/KN4WI/1wxpupj3kQfn26xoW3O5TpMV2TWTOIKrTfzq89wZnkZkHF1xhckb2SnkDq7srhkGTCpjAgBE5Eq9Q3Om5UlvA1SVqkQ0OBv0Ibp0S685XyAPLq4cvGVjda9xobuUs7IoyMolmBm01eq1jDlmhsjJB+plHY/+4wOcdvRTJKYYT5ZT/N5UeRTBy/BH/wtlHQ6o4zS0cX1zjRUqEB6kBHmfkmy5myqkS5aIWSqTcjAHOhpuA8ZGpnDOzujhFG4ZWNI+pa6RxnILvA9btj2CQpGw3ugTdVs3BcVRasH9RVC2HvYPbQecGENJKDZ6i+El8i1iuCYkrjY2R7X97vDGSpmJNKCGJGkFnECHtu6i9960DtMrxmz5hiu8EVqPTo8zFPBHKipC6ky8xk7kK1EMRNhDAYCCRYwu4XU9yv1aFxj3zW0vVJcW/9lhG4PK182y4rUCbglbKyVe2BNEJzbLjBEfistF9cz5igMGFLnInqmPYWWjARd4SceMFeEy7FJsVRllACj3Ws54D8Q82VOl+2UpVshcqvwbdgKEm0EU2ojpJFi1yh8tLiQtqQCu3u74gKfJ2j0NbrVptuEYTjXqNQQzBBrmgDdTQ1L5lSUAgjPMlUbO2PDSxxHKrEJHGsCLFx/F09LXkTjFCgCzgd3HGl45H5MsvRhodic4kFI7z904BVFhvgSY7aIOORrztm1P0CHJzw8XLDaSoiHxpt9vrqqtgXhsfZsMtZUTAXayzCl/IC') format('woff2'),
+  url('iconfont.woff?t=1587980376124') format('woff'),
+  url('iconfont.ttf?t=1587980376124') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('iconfont.svg?t=1587980376124#iconfont') format('svg'); /* iOS 4.1- */
 }
 
 .iconfont {
@@ -15,6 +15,118 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-duohanggongshi:before {
+  content: "\e748";
+}
+
+.icon-hangneigongshi:before {
+  content: "\e747";
+}
+
+.icon-quxiaozhiding:before {
+  content: "\e746";
+}
+
+.icon-zhiding1:before {
+  content: "\e745";
+}
+
+.icon-xinjianjianliwodejianli:before {
+  content: "\e744";
+}
+
+.icon-huifu:before {
+  content: "\e743";
+}
+
+.icon-tupian:before {
+  content: "\e742";
+}
+
+.icon-wentiliebiao:before {
+  content: "\e741";
+}
+
+.icon-zhicheng:before {
+  content: "\e73f";
+}
+
+.icon-upload:before {
+  content: "\e76b";
+}
+
+.icon-fabuzhiwei:before {
+  content: "\e73e";
+}
+
+.icon-zhiweiyaoqiu:before {
+  content: "\e73d";
+}
+
+.icon-gongsijieshao:before {
+  content: "\e73c";
+}
+
+.icon-gongsidizhi:before {
+  content: "\e73b";
+}
+
+.icon-jubushuaxinjiantou:before {
+  content: "\e73a";
+}
+
+.icon-fanhui:before {
+  content: "\e739";
+}
+
+.icon-tongji1:before {
+  content: "\e738";
+}
+
+.icon-qiandao-1:before {
+  content: "\e736";
+}
+
+.icon-xiajiantou2:before {
+  content: "\e737";
+}
+
+.icon-qiandao-:before {
+  content: "\e735";
+}
+
+.icon-yidong:before {
+  content: "\e734";
+}
+
+.icon-xiayi1:before {
+  content: "\e732";
+}
+
+.icon-shangyi1:before {
+  content: "\e731";
+}
+
+.icon-xiayi:before {
+  content: "\e730";
+}
+
+.icon-shangyi:before {
+  content: "\e72f";
+}
+
+.icon-bianji5:before {
+  content: "\e72e";
+}
+
+.icon-shanchu3:before {
+  content: "\e72d";
+}
+
+.icon-xuanze:before {
+  content: "\e72c";
+}
+
 .icon-bianji4:before {
   content: "\e72a";
 }
@@ -1302,3 +1414,4 @@
 .icon-wenjianjia:before {
   content: "\e640";
 }
+
diff --git a/public/css/iconfont.eot b/public/css/iconfont.eot
index 53997f02..e30f1eb8 100644
Binary files a/public/css/iconfont.eot and b/public/css/iconfont.eot differ
diff --git a/public/css/iconfont.js b/public/css/iconfont.js
index d64d6f6e..719da595 100644
--- a/public/css/iconfont.js
+++ b/public/css/iconfont.js
@@ -1 +1 @@
-!function(z){var c,o='<svg><symbol id="icon-bianji4" viewBox="0 0 1032 1024"><path d="M934.724189 278.826729L834.414864 379.136054 653.380212 198.101402l100.394659-100.351991A42.257063 42.257063 0 0 1 783.769535 85.333412c6.527999 0 19.157332 1.621333 29.951997 12.415999l121.002657 121.002656a42.538663 42.538663 0 0 1 0 60.074662zM299.374908 914.176009l-200.661316 19.626665 19.669331-200.661316L593.049551 258.47473 774.084202 439.466715l-474.709294 474.709294z m695.679942-755.79727L874.09486 37.418749A127.317323 127.317323 0 0 0 783.769535 0.000085c-32.725331 0-65.407995 12.458666-90.367993 37.418664l-646.229279 646.229279c-7.082666 7.082666-11.434666 16.469332-12.287999 26.495998l-26.197331 267.818645c-2.133333 25.002665 17.706665 46.037329 42.239996 46.037329 1.194667 0 2.432-0.042667 3.626666-0.128l267.818645-26.239998a42.12053 42.12053 0 0 0 26.495998-12.287999l646.186612-646.186613c49.919996-49.919996 49.919996-130.858656 0-180.778651z"  ></path></symbol><symbol id="icon-bangding" viewBox="0 0 1024 1024"><path d="M722.7 654.8l-45.2-45.2 140.1-140.1C890 397 890 279 817.6 206.6c-72.5-72.5-190.4-72.5-262.9 0l-140.1 140-45.2-45.2 140.1-140.1c97.4-97.5 256-97.4 353.4 0 97.4 97.4 97.4 256 0 353.4L722.7 654.8zM338.1 935.9c-66.8 0-129.5-26-176.7-73.2-97.4-97.4-97.4-256 0-353.4l140.1-140.1 45.2 45.2-140.1 140.2c-72.5 72.5-72.5 190.4 0 262.9 35.1 35.1 81.8 54.5 131.5 54.5s96.3-19.3 131.4-54.5l140.1-140.1 45.2 45.2-140 140.1c-47.2 47.2-110 73.2-176.7 73.2z"  ></path><path d="M330.99 647.879l316.78-316.781 45.255 45.254-316.781 316.78z"  ></path></symbol><symbol id="icon-bofang2" viewBox="0 0 1024 1024"><path d="M692.224 495.616l-4.096-4.096L430.08 344.064c-4.096-4.096-8.192-4.096-12.288-4.096-12.288 0-20.48 8.192-20.48 20.48v303.104c0 12.288 8.192 20.48 20.48 20.48 4.096 0 8.192 0 12.288-4.096L688.128 532.48h4.096c4.096-4.096 8.192-8.192 8.192-16.384s-4.096-16.384-8.192-20.48zM438.272 630.784V393.216L647.168 512 438.272 630.784z" fill="#06101A" ></path><path d="M512 98.304C282.624 98.304 98.304 282.624 98.304 512S282.624 925.696 512 925.696c229.376 0 413.696-184.32 413.696-413.696S741.376 98.304 512 98.304z m0 790.528c-208.896 0-376.832-167.936-376.832-376.832S303.104 135.168 512 135.168 888.832 303.104 888.832 512 720.896 888.832 512 888.832z" fill="#06101A" ></path></symbol><symbol id="icon-weibiaoti1" viewBox="0 0 1024 1024"><path d="M671.053824 253.083648c6.05184 3.01056 13.463552 0.52224 16.47616-5.5296l43.646976-87.740416c3.012608-6.05184 0.524288-13.4656-5.527552-16.474112l-112.308224-55.86944c-6.05184-3.01056-13.4656-0.52224-16.47616 5.5296l-43.649024 87.740416c-3.01056 6.05184-0.52224 13.4656 5.527552 16.474112L671.053824 253.083648z"  ></path><path d="M448.755712 719.599616c4.622336-4.931584 10.866688-13.91616 13.877248-19.968l203.35616-408.778752c3.012608-6.05184 0.524288-13.4656-5.527552-16.474112l-112.310272-55.873536c-6.05184-3.01056-13.463552-0.52224-16.47616 5.5296L329.13408 631.177216c-3.01056 6.05184-6.268928 16.474112-7.241728 23.16288l-32.774144 225.294336c-0.9728 6.688768 2.013184 8.126464 6.63552 3.19488L448.755712 719.599616z"  ></path></symbol><symbol id="icon-jinggao2" viewBox="0 0 1024 1024"><path d="M563.2 312.32C563.2 281.6 542.72 256 512 256S460.8 281.6 460.8 312.32l0 256c0 30.72 20.48 51.2 51.2 51.2s51.2-20.48 51.2-51.2L563.2 312.32zM512 665.6c-30.72 0-51.2 20.48-51.2 51.2 0 30.72 20.48 51.2 51.2 51.2s51.2-20.48 51.2-51.2C563.2 686.08 542.72 665.6 512 665.6z"  ></path></symbol><symbol id="icon-lubiaosignpost3" viewBox="0 0 1024 1024"><path d="M575.0272 171.89888l0 705.792c0 8.38656-6.79936 15.17568-15.18592 15.17568l-86.016 0c-8.38656 0-15.18592-6.78912-15.18592-15.17568L458.63936 171.89888c0-8.37632 6.79936-15.16544 15.18592-15.16544l86.016 0C568.22784 156.73344 575.0272 163.52256 575.0272 171.89888zM988.68224 405.97504l-74.00448-66.41664c-1.40288-1.23904-3.20512-1.93536-5.07904-1.93536L606.01344 337.62304c-4.18816 0-7.59808 3.38944-7.59808 7.59808l0 118.90688c0 4.18816 3.40992 7.58784 7.59808 7.58784l303.58528 0c1.57696 0 3.11296-0.49152 4.39296-1.39264l74.00448-52.50048c1.88416-1.34144 3.05152-3.46112 3.19488-5.75488C991.31392 409.76384 990.39232 407.53152 988.68224 405.97504zM42.47552 452.9664c0.13312 2.304 1.31072 4.41344 3.19488 5.75488l74.00448 52.50048c1.28 0.90112 2.816 1.40288 4.39296 1.40288l303.59552 0c4.18816 0 7.58784-3.39968 7.58784-7.58784L435.2512 386.10944c0-4.1984-3.39968-7.59808-7.58784-7.59808L124.0576 378.51136c-1.87392 0-3.67616 0.69632-5.0688 1.9456l-74.00448 66.42688C43.27424 448.43008 42.35264 450.6624 42.47552 452.9664zM427.65312 211.10784 124.0576 211.10784c-1.87392 0-3.67616 0.67584-5.0688 1.93536l-74.00448 66.42688c-1.72032 1.52576-2.64192 3.76832-2.5088 6.07232 0.13312 2.31424 1.31072 4.43392 3.19488 5.76512l74.00448 52.49024c1.28 0.91136 2.816 1.41312 4.39296 1.41312l303.59552 0c4.18816 0 7.58784-3.40992 7.58784-7.59808L435.2512 218.69568C435.24096 214.48704 431.84128 211.10784 427.65312 211.10784z"  ></path></symbol><symbol id="icon-rili" viewBox="0 0 1024 1024"><path d="M177.81122 880.700293c-36.96489 0-67.041906-30.502711-67.041906-67.889203V202.947202L88.478635 225.539756h757.993601c36.769438 0 66.756403 30.462802 66.756403 67.684542V801.630447c0 12.477172 9.980305 22.591531 22.290679 22.59153 12.310374 0 22.290679-10.115382 22.290679-22.59153V293.224298c0-62.152549-49.925063-112.868627-111.337761-112.868627H88.478635c-12.310374 0-22.290679 10.115382-22.290678 22.591531v609.862865c0 62.333674 50.030463 113.073288 111.62224 113.073288h657.400554c12.310374 0 22.290679-10.114358 22.290679-22.591531s-9.980305-22.591531-22.290679-22.591531H177.81122z m133.573181-587.385944c0 12.477172 9.980305 22.591531 22.290679 22.591531 12.310374 0 22.290679-10.115382 22.290679-22.591531v-169.43904c0-12.477172-9.980305-22.591531-22.290679-22.591531-12.310374 0-22.290679 10.115382-22.290679 22.591531v169.43904z m378.939495-11.295254c0 12.477172 9.980305 22.591531 22.290679 22.591531s22.290679-10.115382 22.290679-22.591531V112.580055c0-12.477172-9.980305-22.591531-22.290679-22.591531s-22.290679 10.115382-22.290679 22.591531v169.43904zM355.965759 428.865581c12.310374 0 22.290679-10.115382 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H233.367537c-12.310374 0-22.290679 10.114358-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.598222z m245.195422 0c12.310374 0 22.290679-10.115382 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H478.563982c-12.310374 0-22.290679 10.114358-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.597199z m222.905766 0c12.310374 0 22.290679-10.115382 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H701.468724c-12.310374 0-22.290679 10.114358-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.598223z m-468.101188 135.550209c12.310374 0 22.290679-10.114358 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H233.367537c-12.310374 0-22.290679 10.115382-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.598222z m245.195422 0c12.310374 0 22.290679-10.114358 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H478.563982c-12.310374 0-22.290679 10.115382-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.597199z m222.905766 0c12.310374 0 22.290679-10.114358 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H701.468724c-12.310374 0-22.290679 10.115382-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.598223z m-468.101188 135.550209c12.310374 0 22.290679-10.115382 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H233.367537c-12.310374 0-22.290679 10.114358-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.598222z m245.195422 0c12.310374 0 22.290679-10.115382 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H478.563982c-12.310374 0-22.290679 10.114358-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.597199z m222.905766 0c12.310374 0 22.290679-10.115382 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H701.468724c-12.310374 0-22.290679 10.114358-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.598223z" fill="#070001" ></path></symbol><symbol id="icon-bianji3" viewBox="0 0 1024 1024"><path d="M243.2 624.2304v121.7792h121.7792L880.5888 230.4l-121.7792-121.7792L243.2 624.2304zM758.784 0l230.4 230.4L396.7744 822.784h-230.4v-230.4L758.8352 0z" fill="#979797" ></path><path d="M0 947.2h1024v76.8H0z" fill="#979797" ></path></symbol><symbol id="icon-yiguanbi" viewBox="0 0 1024 1024"><path d="M601.6 550.4c0 32-32 57.6-64 57.6s-64-25.6-64-57.6V57.6c0-32 32-57.6 64-57.6s64 25.6 64 57.6v492.8zM0 518.4c0-179.2 96-339.2 236.8-428.8 25.6-19.2 64-6.4 83.2 19.2 19.2 25.6 6.4 64-19.2 83.2-102.4 70.4-179.2 192-179.2 326.4 0 211.2 172.8 384 390.4 384 211.2 0 384-172.8 390.4-384 0-140.8-76.8-262.4-192-332.8-32-19.2-38.4-51.2-19.2-83.2 12.8-25.6 51.2-32 76.8-12.8 153.6 83.2 256 243.2 256 428.8 0 275.2-230.4 505.6-512 505.6s-512-224-512-505.6"  ></path></symbol><symbol id="icon-yiguanbi1" viewBox="0 0 1024 1024"><path d="M857.83376895 48.11021519m61.2817864 61.28178636l0.03871533 0.03871538q61.28179003 61.28179003 0 122.56357633l-694.69469443 694.69469086q-61.28179003 61.28179003-122.56357641 0l-0.03871167-0.03871172q-61.28179003-61.28179003 0-122.56357636l694.69469085-694.69469449q61.28179003-61.28179003 122.56357633 0Z"  ></path><path d="M163.08781638 48.11541046m-61.28178632 61.28178996l-0.03871539 0.03871173q-61.28179003 61.28179003 0 122.5635764l694.69469448 694.69469443q61.28179003 61.28179003 122.56357639 0l0.03871171-0.03871538q61.28179003-61.28179003 0-122.56357635l-694.69469081-694.69469083q-61.28179003-61.28179003-122.56357638 0Z"  ></path></symbol><symbol id="icon-lajitong" viewBox="0 0 1024 1024"><path d="M972.658 209.348c14.5 0.02 26.272-11.777 26.292-26.35 0.02-14.572-11.72-26.401-26.22-26.421L32.458 155.28c-14.501-0.02-26.273 11.777-26.292 26.35-0.02 14.572 11.719 26.402 26.22 26.422l940.272 1.295zM180.467 992.356v26.659l26.526-0.274 626.369-6.473 25.986-0.269V289.397c0-14.572-11.755-26.386-26.256-26.386s-26.257 11.814-26.257 26.386v696.486l25.987-26.384-626.369 6.473 26.527 26.384V282.67c0-14.573-11.756-26.386-26.257-26.386-14.5 0-26.256 11.813-26.256 26.386v709.686z"  ></path><path d="M656.41 847.079c0 14.573 11.756 26.386 26.257 26.386 14.5 0 26.256-11.813 26.256-26.386V372.132c0-14.573-11.755-26.386-26.256-26.386s-26.257 11.813-26.257 26.386v474.947zM341.333 847.079c0 14.573 11.756 26.386 26.257 26.386 14.5 0 26.256-11.813 26.256-26.386V372.132c0-14.573-11.755-26.386-26.256-26.386s-26.257 11.813-26.257 26.386v474.947zM498.872 847.079c0 14.573 11.755 26.386 26.256 26.386s26.257-11.813 26.257-26.386V372.132c0-14.573-11.756-26.386-26.257-26.386-14.5 0-26.256 11.813-26.256 26.386v474.947zM392.148 116.722c0-14.658 11.61-26.358 26.253-26.358h204.525c14.483 0 26.253 11.798 26.253 26.186v55.095h52.513V116.55c0-43.563-35.311-78.958-78.766-78.958H418.4c-43.677 0-78.766 35.359-78.766 79.13v48.589h52.513v-48.59z"  ></path></symbol><symbol id="icon-dianjiliang" viewBox="0 0 1582 1024"><path d="M791.272727 1024C359.330909 1024 0 652.288 0 512S359.330909 0 791.272727 0C1223.214545 0 1582.545455 371.712 1582.545455 512S1223.214545 1024 791.272727 1024z m0-930.909091C398.429091 93.090909 93.090909 427.287273 93.090909 512S398.429091 930.909091 791.272727 930.909091 1489.454545 596.712727 1489.454545 512 1184.116364 93.090909 791.272727 93.090909z" fill="#606266" ></path><path d="M791.272727 744.727273A232.727273 232.727273 0 1 1 1024 512 233.006545 233.006545 0 0 1 791.272727 744.727273z m0-372.363637A139.636364 139.636364 0 1 0 930.909091 512 139.822545 139.822545 0 0 0 791.272727 372.363636z" fill="#606266" ></path></symbol><symbol id="icon-bofang1" viewBox="0 0 1024 1024"><path d="M512 1024a512 512 0 1 1 512-512 512.57344 512.57344 0 0 1-512 512z m0-983.04a471.04 471.04 0 1 0 471.04 471.04A471.57248 471.57248 0 0 0 512 40.96z" fill="#FFFFFF" ></path><path d="M409.6 383.73376v256.53248a40.96 40.96 0 0 0 63.6928 34.07872l192.38912-128.26624a40.96 40.96 0 0 0 0-68.15744l-192.4096-128.26624A40.96 40.96 0 0 0 409.6 383.73376z" fill="#FFFFFF" ></path></symbol><symbol id="icon-chushihua" viewBox="0 0 1024 1024"><path d="M511.682434 1024A468.457376 468.457376 0 0 1 44.559694 555.542624a66.73182 66.73182 0 0 1 133.46364 0A333.6591 333.6591 0 1 0 511.682434 220.548887a330.989827 330.989827 0 0 0-235.785764 98.095776 66.73182 66.73182 0 0 1-111.2197-66.73182l60.503517-203.309612a66.798552 66.798552 0 1 1 128.125094 37.814698l-9.564894 31.808835A468.234937 468.234937 0 1 1 511.682434 1024z" fill="#2EA4FF" ></path><path d="M600.658194 712.58484h-133.46364a66.73182 66.73182 0 0 1-66.73182-66.73182V423.41362a66.73182 66.73182 0 0 1 133.46364 0v155.70758h66.73182a66.73182 66.73182 0 0 1 0 133.46364z" fill="#2EA4FF" ></path></symbol><symbol id="icon-ceshiji" viewBox="0 0 1073 1024"><path d="M536.332172 562.02102a75.330291 75.330291 0 0 1-29.985844-6.338471l-463.195967-207.95061a73.136205 73.136205 0 0 1 0-133.351681l463.195967-207.95061a73.136205 73.136205 0 0 1 59.971688 0l463.195966 207.95061a73.136205 73.136205 0 0 1 0 133.351681l-463.195966 207.95061a75.330291 75.330291 0 0 1-29.985844 6.338471zM251.832333 281.177992L536.332172 408.678776l284.499838-127.500784L536.332172 153.43342z" fill="#2EA4FF" ></path><path d="M536.332172 793.131429a73.136205 73.136205 0 0 1-31.204781-7.069834l-463.195967-219.408615a73.184963 73.184963 0 0 1 62.409562-132.376532L536.332172 638.570248l431.259823-215.020443a73.136205 73.136205 0 0 1 65.33501 130.913807l-463.195966 230.866621a73.136205 73.136205 0 0 1-33.398867 7.801196z" fill="#2EA4FF" ></path><path d="M536.332172 1023.99805a73.136205 73.136205 0 0 1-31.204781-7.069833l-463.195967-219.408616a73.136205 73.136205 0 0 1 62.409562-131.888957L536.332172 869.680657l431.259823-215.264231a73.136205 73.136205 0 0 1 65.33501 130.913807l-463.195966 230.866621A73.136205 73.136205 0 0 1 536.332172 1023.99805z" fill="#2EA4FF" ></path></symbol><symbol id="icon-guolvqi" viewBox="0 0 1024 1024"><path d="M908.6 134.7c6.5 15.5 3.8 28.8-8 39.7L620.9 454.1V875c0 15.8-7.4 27.1-22.1 33.5-4.9 2-9.7 2.9-14.2 2.9-10.3 0-18.7-3.6-25.5-10.7L413.8 755.2c-7.2-7.2-10.7-15.7-10.7-25.5V454.1L123.4 174.4c-11.7-11-14.3-24.2-8-39.7 6.5-14.8 17.5-22.1 33.5-22.1H875c16-0.1 27.2 7.3 33.6 22.1z"  ></path></symbol><symbol id="icon-jiashang1" viewBox="0 0 1024 1024"><path d="M512 1024C228.693333 1024 0 795.306667 0 512S228.693333 0 512 0s512 228.693333 512 512-228.693333 512-512 512z m0-989.866667C249.173333 34.133333 34.133333 249.173333 34.133333 512s215.04 477.866667 477.866667 477.866667 477.866667-215.04 477.866667-477.866667S774.826667 34.133333 512 34.133333z" fill="#4CACFF" ></path><path d="M699.733333 563.2h-375.466666c-20.48 0-34.133333-13.653333-34.133334-34.133333s13.653333-34.133333 34.133334-34.133334h375.466666c20.48 0 34.133333 13.653333 34.133334 34.133334s-13.653333 34.133333-34.133334 34.133333z" fill="#4CACFF" ></path><path d="M512 750.933333c-20.48 0-34.133333-13.653333-34.133333-34.133333V341.333333c0-20.48 13.653333-34.133333 34.133333-34.133333s34.133333 13.653333 34.133333 34.133333v375.466667c0 20.48-13.653333 34.133333-34.133333 34.133333z" fill="#4CACFF" ></path></symbol><symbol id="icon-jianqu1" viewBox="0 0 1024 1024"><path d="M512 1024C228.693333 1024 0 795.306667 0 512S228.693333 0 512 0s512 228.693333 512 512-228.693333 512-512 512z m0-989.866667C249.173333 34.133333 34.133333 249.173333 34.133333 512s215.04 477.866667 477.866667 477.866667 477.866667-215.04 477.866667-477.866667S774.826667 34.133333 512 34.133333z" fill="#DDDDDD" ></path><path d="M699.733333 563.2h-375.466666c-20.48 0-34.133333-13.653333-34.133334-34.133333s13.653333-34.133333 34.133334-34.133334h375.466666c20.48 0 34.133333 13.653333 34.133334 34.133334s-13.653333 34.133333-34.133334 34.133333z" fill="#888888" ></path></symbol><symbol id="icon-jiashang" viewBox="0 0 1024 1024"><path d="M512 1024C228.693333 1024 0 795.306667 0 512S228.693333 0 512 0s512 228.693333 512 512-228.693333 512-512 512z m0-989.866667C249.173333 34.133333 34.133333 249.173333 34.133333 512s215.04 477.866667 477.866667 477.866667 477.866667-215.04 477.866667-477.866667S774.826667 34.133333 512 34.133333z" fill="#DDDDDD" ></path><path d="M699.733333 563.2h-375.466666c-20.48 0-34.133333-13.653333-34.133334-34.133333s13.653333-34.133333 34.133334-34.133334h375.466666c20.48 0 34.133333 13.653333 34.133334 34.133334s-13.653333 34.133333-34.133334 34.133333z" fill="#888888" ></path><path d="M512 750.933333c-20.48 0-34.133333-13.653333-34.133333-34.133333V341.333333c0-20.48 13.653333-34.133333 34.133333-34.133333s34.133333 13.653333 34.133333 34.133333v375.466667c0 20.48-13.653333 34.133333-34.133333 34.133333z" fill="#888888" ></path></symbol><symbol id="icon-jianqu" viewBox="0 0 1024 1024"><path d="M512 1024C228.693333 1024 0 795.306667 0 512S228.693333 0 512 0s512 228.693333 512 512-228.693333 512-512 512z m0-989.866667C249.173333 34.133333 34.133333 249.173333 34.133333 512s215.04 477.866667 477.866667 477.866667 477.866667-215.04 477.866667-477.866667S774.826667 34.133333 512 34.133333z" fill="#4CACFF" ></path><path d="M699.733333 563.2h-375.466666c-20.48 0-34.133333-13.653333-34.133334-34.133333s13.653333-34.133333 34.133334-34.133334h375.466666c20.48 0 34.133333 13.653333 34.133334 34.133334s-13.653333 34.133333-34.133334 34.133333z" fill="#4CACFF" ></path></symbol><symbol id="icon-shanchu2" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#EEEEEE" ></path><path d="M665.6 716.8c-15.36 0-25.6-5.12-35.84-15.36L512 583.68l-117.76 117.76c-20.48 20.48-51.2 20.48-71.68 0s-20.48-51.2 0-71.68L440.32 512 322.56 394.24c-20.48-20.48-20.48-51.2 0-71.68s51.2-20.48 71.68 0L512 440.32l117.76-117.76c20.48-20.48 51.2-20.48 71.68 0s20.48 51.2 0 71.68L583.68 512l117.76 117.76c20.48 20.48 20.48 51.2 0 71.68-10.24 10.24-20.48 15.36-35.84 15.36z" fill="#BBBBBB" ></path></symbol><symbol id="icon-shijuan1" viewBox="0 0 1024 1024"><path d="M352.256 30.72h436.224c112.64 0 204.8 92.16 204.8 204.8v552.96c0 112.64-92.16 204.8-204.8 204.8H352.256c-112.64 0-204.8-92.16-204.8-204.8v-552.96c0-112.64 90.112-204.8 204.8-204.8z" fill="#FFFFFF" ></path><path d="M788.48 1024H352.256c-129.024 0-235.52-106.496-235.52-235.52v-552.96C116.736 106.496 221.184 0 352.256 0h436.224C917.504 0 1024 106.496 1024 235.52v552.96C1024 917.504 917.504 1024 788.48 1024zM352.256 61.44c-96.256 0-174.08 77.824-174.08 174.08v552.96c0 96.256 77.824 174.08 174.08 174.08h436.224c96.256 0 174.08-77.824 174.08-174.08v-552.96C962.56 139.264 884.736 61.44 788.48 61.44H352.256z" fill="#3B77E3" ></path><path d="M311.296 331.776m-40.96 0a40.96 40.96 0 1 0 81.92 0 40.96 40.96 0 1 0-81.92 0Z" fill="#3B77E3" ></path><path d="M311.296 563.2m-40.96 0a40.96 40.96 0 1 0 81.92 0 40.96 40.96 0 1 0-81.92 0Z" fill="#3B77E3" ></path><path d="M841.728 350.208H471.04c-16.384 0-30.72-14.336-30.72-30.72s14.336-30.72 30.72-30.72h370.688c16.384 0 30.72 14.336 30.72 30.72s-12.288 30.72-30.72 30.72zM841.728 581.632H471.04c-16.384 0-30.72-14.336-30.72-30.72s14.336-30.72 30.72-30.72h370.688c16.384 0 30.72 14.336 30.72 30.72s-12.288 30.72-30.72 30.72z" fill="#3B77E3" ></path><path d="M819.2 993.28c-26.624-32.768-43.008-61.44-47.104-88.064-4.096-24.576-2.048-59.392 8.192-104.448v-6.144c0-16.384-14.336-30.72-30.72-30.72H61.44c-16.384 0-30.72 14.336-30.72 30.72v83.968c0 63.488 51.2 114.688 114.688 114.688H819.2z" fill="#FFFFFF" ></path><path d="M882.688 1024h-737.28C65.536 1024 0 958.464 0 878.592v-83.968c0-34.816 26.624-61.44 61.44-61.44h688.128c34.816 0 61.44 26.624 61.44 61.44 0 4.096 0 8.192-2.048 12.288-8.192 43.008-10.24 73.728-8.192 94.208 4.096 18.432 16.384 43.008 40.96 73.728l40.96 49.152zM61.44 794.624v83.968C61.44 925.696 98.304 962.56 145.408 962.56h614.4c-10.24-18.432-16.384-34.816-18.432-51.2-4.096-26.624-2.048-63.488 8.192-116.736H61.44z" fill="#3B77E3" ></path></symbol><symbol id="icon-zuoyoutuodong" viewBox="0 0 2048 1024"><path d="M558.848 972.288L35.84 541.696a38.4 38.4 0 0 1 0-59.392L558.848 51.712a38.4 38.4 0 0 1 62.72 29.696v221.44a38.4 38.4 0 0 0 38.4 38.4h728.064a38.4 38.4 0 0 0 38.4-38.4V81.536a38.4 38.4 0 0 1 62.72-29.696l522.88 430.592a38.4 38.4 0 0 1 0 59.392l-522.88 430.592a38.4 38.4 0 0 1-62.72-29.696v-221.44a38.4 38.4 0 0 0-38.4-38.4H659.968a38.4 38.4 0 0 0-38.4 38.4v221.44a38.4 38.4 0 0 1-62.72 29.696z" fill="#666666" ></path></symbol><symbol id="icon-shangxiatuodong" viewBox="0 0 1024 1024"><path d="M742.144 744.576L526.848 1006.08a19.2 19.2 0 0 1-29.696 0L281.856 744.576a19.2 19.2 0 0 1 14.848-31.36h110.72a19.2 19.2 0 0 0 19.2-19.2V329.984a19.2 19.2 0 0 0-19.2-19.2H296.768a19.2 19.2 0 0 1-14.848-31.36L497.152 17.92a19.2 19.2 0 0 1 29.696 0l215.296 261.44a19.2 19.2 0 0 1-14.848 31.36h-110.72a19.2 19.2 0 0 0-19.2 19.2v364.032a19.2 19.2 0 0 0 19.2 19.2h110.72a19.2 19.2 0 0 1 14.848 31.36z" fill="#666666" ></path></symbol><symbol id="icon-bianzu2" viewBox="0 0 1024 1024"><path d="M512 542.117647m-240.941176 0a240.941176 240.941176 0 1 0 481.882352 0 240.941176 240.941176 0 1 0-481.882352 0Z" fill="#050F37" fill-opacity=".303" ></path><path d="M512 361.411765m-361.411765 0a361.411765 361.411765 0 1 0 722.82353 0 361.411765 361.411765 0 1 0-722.82353 0Z" fill="#EEEEEE" ></path><path d="M402.552471 469.714824L279.491765 368.399059a9.035294 9.035294 0 0 1 0-13.974588l123.030588-101.315765a9.035294 9.035294 0 0 1 14.757647 6.987294v52.103529a9.035294 9.035294 0 0 0 9.035294 9.035295h171.309177a9.035294 9.035294 0 0 0 9.035294-9.035295v-52.103529a9.035294 9.035294 0 0 1 14.757647-6.987294l123.030588 101.315765a9.035294 9.035294 0 0 1 0 13.974588l-123.030588 101.315765a9.035294 9.035294 0 0 1-14.757647-6.987295v-52.103529a9.035294 9.035294 0 0 0-9.035294-9.035294H426.345412a9.035294 9.035294 0 0 0-9.035294 9.035294v52.103529a9.035294 9.035294 0 0 1-14.757647 6.987295z" fill="#666666" ></path></symbol><symbol id="icon-fuzhi3" viewBox="0 0 1024 1024"><path d="M648.533333 1024h-477.866666C75.093333 1024 0 948.906667 0 853.333333v-477.866666C0 279.893333 75.093333 204.8 170.666667 204.8h477.866666C744.106667 204.8 819.2 279.893333 819.2 375.466667v477.866666c0 95.573333-75.093333 170.666667-170.666667 170.666667z m-477.866666-750.933333C116.053333 273.066667 68.266667 320.853333 68.266667 375.466667v477.866666c0 54.613333 47.786667 102.4 102.4 102.4h477.866666c54.613333 0 102.4-47.786667 102.4-102.4v-477.866666c0-54.613333-47.786667-102.4-102.4-102.4h-477.866666z" fill="#A0A7B4" ></path><path d="M955.733333 785.066667c-20.48 0-34.133333-13.653333-34.133333-34.133334V204.8c0-54.613333-47.786667-102.4-102.4-102.4H273.066667c-20.48 0-34.133333-13.653333-34.133334-34.133333s13.653333-34.133333 34.133334-34.133334h546.133333c95.573333 0 170.666667 75.093333 170.666667 170.666667v546.133333c0 20.48-13.653333 34.133333-34.133334 34.133334z" fill="#A0A7B4" ></path></symbol><symbol id="icon-jianhao" viewBox="0 0 1024 1024"><path d="M768 554.666667H256c-25.6 0-42.666667-17.066667-42.666667-42.666667s17.066667-42.666667 42.666667-42.666667h512c25.6 0 42.666667 17.066667 42.666667 42.666667s-17.066667 42.666667-42.666667 42.666667z"  ></path></symbol><symbol id="icon-shitilan" viewBox="0 0 1024 1024"><path d="M816.118519 1024H184.019753c-69.530864 0-126.419753-56.888889-126.419753-126.419753V139.061728C57.6 69.530864 114.488889 12.641975 184.019753 12.641975h568.888889l189.62963 189.62963v695.308642c0 69.530864-56.888889 126.419753-126.419753 126.419753zM727.624691 75.851852H184.019753c-37.925926 0-63.209877 25.283951-63.209876 63.209876v758.518519c0 37.925926 25.283951 63.209877 63.209876 63.209876h632.098766c37.925926 0 63.209877-25.283951 63.209876-63.209876V227.555556L727.624691 75.851852z" fill="#FFFFFF" ></path><path d="M955.180247 233.876543h-189.62963c-25.283951 0-44.246914-18.962963-44.246913-44.246913l6.320987-189.62963 227.555556 233.876543z m-170.666667-82.172839v18.962963h18.962963l-18.962963-18.962963zM670.735802 328.691358H329.402469c-18.962963 0-31.604938-12.641975-31.604938-31.604938S310.439506 265.481481 329.402469 265.481481h341.333333c18.962963 0 31.604938 12.641975 31.604939 31.604939s-12.641975 31.604938-31.604939 31.604938zM670.735802 581.530864H329.402469c-18.962963 0-31.604938-12.641975-31.604938-31.604938S310.439506 518.320988 329.402469 518.320988h341.333333c18.962963 0 31.604938 12.641975 31.604939 31.604938s-12.641975 31.604938-31.604939 31.604938zM670.735802 834.37037H329.402469c-18.962963 0-31.604938-12.641975-31.604938-31.604938s12.641975-31.604938 31.604938-31.604938h341.333333c18.962963 0 31.604938 12.641975 31.604939 31.604938s-12.641975 31.604938-31.604939 31.604938z" fill="#FFFFFF" ></path></symbol><symbol id="icon-shanchu1" viewBox="0 0 1024 1024"><path d="M672 992H358.4c-76.8 0-140.8-57.6-153.6-140.8L96 326.4c0-19.2 6.4-32 25.6-38.4 19.2-6.4 32 6.4 38.4 25.6l102.4 524.8c12.8 51.2 51.2 89.6 96 89.6h313.6c44.8 0 83.2-38.4 96-89.6l102.4-524.8c6.4-19.2 19.2-25.6 38.4-25.6 19.2 6.4 25.6 19.2 25.6 38.4L832 851.2c-19.2 83.2-83.2 140.8-160 140.8zM608 192v-6.4c0-51.2-44.8-89.6-96-89.6S416 140.8 416 192h-64C352 102.4 422.4 32 512 32c83.2 0 153.6 64 160 153.6V192h-64z" fill="#4CACFF" ></path><path d="M384 857.6c-12.8 0-25.6-12.8-32-25.6L256 320c0-19.2 12.8-32 25.6-38.4 19.2 0 38.4 12.8 38.4 25.6l96 512c0 19.2-6.4 38.4-32 38.4 6.4 0 0 0 0 0zM640 857.6s-6.4 0 0 0c-25.6-6.4-32-19.2-32-38.4l96-512c0-19.2 19.2-32 38.4-25.6 12.8 6.4 25.6 19.2 25.6 38.4l-96 512c-6.4 12.8-19.2 25.6-32 25.6zM512 857.6c-19.2 0-32-12.8-32-32v-512c0-19.2 12.8-32 32-32s32 12.8 32 32v512c0 19.2-12.8 32-32 32zM992 256H32C12.8 256 0 243.2 0 224S12.8 192 32 192h960c19.2 0 32 12.8 32 32s-12.8 32-32 32z" fill="#4CACFF" ></path></symbol><symbol id="icon-jiexi" viewBox="0 0 1024 1024"><path d="M506.311111 995.555556c-73.955556 0-147.911111-17.066667-216.177778-51.2-11.377778-5.688889-22.755556-22.755556-11.377777-39.822223 5.688889-11.377778 22.755556-22.755556 39.822222-11.377777 56.888889 28.444444 125.155556 45.511111 187.733333 45.511111 238.933333 0 432.355556-187.733333 432.355556-426.666667 0-85.333333-22.755556-164.977778-73.955556-233.244444-11.377778-11.377778-5.688889-28.444444 5.688889-39.822223 11.377778-11.377778 28.444444-5.688889 39.822222 5.688889 51.2 79.644444 79.644444 170.666667 79.644445 267.377778 5.688889 267.377778-216.177778 483.555556-483.555556 483.555556z m-301.511111-125.155556c-5.688889 0-11.377778 0-17.066667-5.688889C85.333333 773.688889 28.444444 642.844444 28.444444 506.311111 28.444444 244.622222 238.933333 28.444444 500.622222 28.444444c119.466667 0 233.244444 45.511111 318.577778 125.155556 11.377778 11.377778 11.377778 28.444444 0 39.822222-11.377778 11.377778-28.444444 11.377778-39.822222 0-79.644444-73.955556-176.355556-113.777778-278.755556-113.777778-227.555556 0-415.288889 187.733333-415.288889 420.977778 0 125.155556 51.2 238.933333 142.222223 318.577778 11.377778 11.377778 11.377778 28.444444 0 39.822222-5.688889 11.377778-11.377778 11.377778-22.755556 11.377778z" fill="#4CACFF" ></path><path d="M512 864.711111c-56.888889 0-102.4-45.511111-102.4-102.4v-34.133333c-62.577778-34.133333-102.4-102.4-102.4-170.666667C307.2 449.422222 398.222222 358.4 512 358.4s204.8 91.022222 204.8 199.111111c0 68.266667-39.822222 136.533333-102.4 170.666667v34.133333c0 51.2-39.822222 96.711111-91.022222 102.4H512z m0-449.422222c-79.644444 0-147.911111 62.577778-147.911111 142.222222 0 51.2 28.444444 96.711111 73.955555 125.155556l28.444445 17.066666v68.266667c0 22.755556 17.066667 45.511111 45.511111 45.511111h5.688889c22.755556 0 39.822222-22.755556 39.822222-45.511111v-68.266667l28.444445-17.066666c45.511111-22.755556 73.955556-73.955556 73.955555-125.155556 0-73.955556-68.266667-142.222222-147.911111-142.222222zM676.977778 398.222222c-5.688889 0-17.066667 0-22.755556-5.688889-11.377778-11.377778-11.377778-28.444444 0-39.822222L739.555556 267.377778c11.377778-11.377778 28.444444-11.377778 39.822222 0s11.377778 28.444444 0 39.822222l-85.333334 85.333333c-5.688889 0-11.377778 5.688889-17.066666 5.688889zM347.022222 398.222222c-5.688889 0-11.377778-5.688889-17.066666-5.688889L238.933333 301.511111c-11.377778-11.377778-11.377778-28.444444 0-39.822222s28.444444-11.377778 39.822223 0l85.333333 85.333333c11.377778 11.377778 11.377778 28.444444 0 39.822222 0 5.688889-5.688889 11.377778-17.066667 11.377778zM512 335.644444c-17.066667 0-28.444444-11.377778-28.444444-28.444444V210.488889c0-17.066667 11.377778-28.444444 28.444444-28.444445s28.444444 11.377778 28.444444 28.444445v102.4c0 11.377778-11.377778 22.755556-28.444444 22.755555z" fill="#4CACFF" ></path></symbol><symbol id="icon-gongkai" viewBox="0 0 1024 1024"><path d="M512 853.333333C432.355556 853.333333 369.777778 790.755556 369.777778 711.111111S432.355556 568.888889 512 568.888889s142.222222 62.577778 142.222222 142.222222S591.644444 853.333333 512 853.333333z m0-227.555555c-45.511111 0-85.333333 39.822222-85.333333 85.333333S466.488889 796.444444 512 796.444444 597.333333 756.622222 597.333333 711.111111 557.511111 625.777778 512 625.777778zM256 426.666667c-17.066667 0-28.444444-11.377778-28.444444-28.444445V233.244444C244.622222 113.777778 352.711111 28.444444 483.555556 28.444444c142.222222 0 250.311111 96.711111 256 221.866667v5.688889c0 17.066667-11.377778 28.444444-28.444445 28.444444s-28.444444-11.377778-28.444444-28.444444c-5.688889-96.711111-91.022222-170.666667-199.111111-170.666667-102.4 0-187.733333 68.266667-199.111112 153.6V398.222222c0 17.066667-11.377778 28.444444-28.444444 28.444445z" fill="#4CACFF" ></path><path d="M739.555556 1024h-455.111112C176.355556 1024 85.333333 932.977778 85.333333 824.888889v-227.555556C85.333333 489.244444 176.355556 398.222222 284.444444 398.222222h455.111112c108.088889 0 199.111111 91.022222 199.111111 199.111111v227.555556c0 108.088889-91.022222 199.111111-199.111111 199.111111z m-455.111112-568.888889C204.8 455.111111 142.222222 517.688889 142.222222 597.333333v227.555556C142.222222 904.533333 204.8 967.111111 284.444444 967.111111h455.111112c79.644444 0 142.222222-62.577778 142.222222-142.222222v-227.555556C881.777778 517.688889 819.2 455.111111 739.555556 455.111111h-455.111112z" fill="#4CACFF" ></path></symbol><symbol id="icon-bianji2" viewBox="0 0 1024 1024"><path d="M704.752941 993.882353H198.776471c-78.305882 0-138.541176-60.235294-138.541177-132.517647V228.894118c0-72.282353 66.258824-132.517647 138.541177-132.517647h319.247058c18.070588 0 30.117647 12.047059 30.117647 30.117647s-12.047059 24.094118-30.117647 24.094117H198.776471c-42.164706 0-78.305882 36.141176-78.305883 72.282353v632.470588c0 42.164706 36.141176 72.282353 78.305883 72.282353h499.952941c42.164706 0 78.305882-36.141176 78.305882-72.282353V602.352941c0-18.070588 12.047059-30.117647 30.117647-30.117647s30.117647 12.047059 30.117647 30.117647v259.011765c6.023529 72.282353-60.235294 132.517647-132.517647 132.517647z" fill="#4CACFF" ></path><path d="M313.223529 734.870588c-24.094118 0-54.211765-18.070588-60.235294-48.188235v-30.117647l36.141177-126.494118 445.741176-445.741176c48.188235-48.188235 120.470588-48.188235 168.658824 0 48.188235 48.188235 48.188235 120.470588 0 168.658823l-445.741177 445.741177-126.494117 30.117647c-6.023529 6.023529-12.047059 6.023529-18.070589 6.023529z m36.141177-174.682353l-36.141177 114.447059 120.470589-30.117647 433.694117-433.694118c12.047059-12.047059 18.070588-24.094118 18.070589-42.164705 0-18.070588-6.023529-30.117647-18.070589-42.164706-24.094118-24.094118-60.235294-24.094118-84.329411 0L349.364706 560.188235z" fill="#4CACFF" ></path></symbol><symbol id="icon-fangda" viewBox="0 0 1024 1024"><path d="M603.022222 477.866667c-17.066667 0-28.444444-5.688889-39.822222-17.066667-22.755556-22.755556-22.755556-56.888889 0-79.644444L830.577778 113.777778h-182.044445c-34.133333 0-56.888889-22.755556-56.888889-56.888889s22.755556-56.888889 56.888889-56.888889H967.111111c5.688889 0 17.066667 0 22.755556 5.688889 5.688889 0 11.377778 5.688889 17.066666 11.377778 5.688889 5.688889 11.377778 11.377778 11.377778 17.066666 5.688889 5.688889 5.688889 17.066667 5.688889 22.755556v318.577778c0 34.133333-22.755556 56.888889-56.888889 56.888889s-56.888889-22.755556-56.888889-56.888889V193.422222l-267.377778 267.377778c-11.377778 11.377778-22.755556 17.066667-39.822222 17.066667zM375.466667 1024H56.888889c-5.688889 0-17.066667 0-22.755556-5.688889-5.688889 0-11.377778-5.688889-17.066666-11.377778-5.688889-5.688889-11.377778-11.377778-11.377778-17.066666-5.688889-5.688889-5.688889-17.066667-5.688889-22.755556v-318.577778c0-34.133333 22.755556-56.888889 56.888889-56.888889s56.888889 22.755556 56.888889 56.888889v182.044445l267.377778-267.377778c22.755556-22.755556 56.888889-22.755556 79.644444 0s22.755556 56.888889 0 79.644444L193.422222 910.222222h182.044445c34.133333 0 56.888889 22.755556 56.888889 56.888889s-22.755556 56.888889-56.888889 56.888889z" fill="#888888" ></path></symbol><symbol id="icon-suoxiao2" viewBox="0 0 1024 1024"><path d="M921.6 477.866667h-318.577778c-5.688889 0-17.066667 0-22.755555-5.688889-5.688889 0-11.377778-5.688889-17.066667-11.377778-5.688889-5.688889-11.377778-11.377778-11.377778-17.066667 0-5.688889-5.688889-11.377778-5.688889-22.755555V102.4c0-34.133333 22.755556-56.888889 56.888889-56.888889s56.888889 22.755556 56.888889 56.888889V284.444444L927.288889 17.066667c22.755556-22.755556 56.888889-22.755556 79.644444 0s22.755556 56.888889 0 79.644444L739.555556 364.088889h182.044444c34.133333 0 56.888889 22.755556 56.888889 56.888889s-22.755556 56.888889-56.888889 56.888889zM56.888889 1024c-17.066667 0-28.444444-5.688889-39.822222-17.066667-22.755556-22.755556-22.755556-56.888889 0-79.644444L284.444444 659.911111H102.4c-34.133333 0-56.888889-22.755556-56.888889-56.888889s22.755556-56.888889 56.888889-56.888889h318.577778c5.688889 0 17.066667 0 22.755555 5.688889 5.688889 0 11.377778 5.688889 17.066667 11.377778 5.688889 5.688889 11.377778 11.377778 11.377778 17.066667 0 5.688889 5.688889 11.377778 5.688889 22.755555v318.577778c0 34.133333-22.755556 56.888889-56.888889 56.888889s-56.888889-22.755556-56.888889-56.888889V739.555556l-267.377778 267.377777c-11.377778 11.377778-22.755556 17.066667-39.822222 17.066667z" fill="#888888" ></path></symbol><symbol id="icon-jiantou9" viewBox="0 0 1024 1024"><path d="M944.083879 289.536302c14.264888 18.286482 15.462157 41.208541 2.670829 51.196009l-417.191704 325.421604c-2.885723 2.261507-12.156878 7.828292-13.732769 9.578146-15.544021 17.181311-37.893029 22.338774-49.947576 11.461029l-392.908648-354.309538c-12.054547-10.887978-9.271154-33.666774 6.272867-50.889017 15.544021-17.21201 37.893029-22.349007 49.988508-11.471262l357.584118 322.443783 408.258241-318.463122C907.910005 264.516466 929.84969 271.260054 944.083879 289.536302z"  ></path></symbol><symbol id="icon-changyongtubiao-xianxingdaochu-zhuanqu-" viewBox="0 0 1024 1024"><path d="M904.5504 677.2736L531.456 304.1792a30.72 30.72 0 0 0-43.4688 0l-373.0944 373.0944a30.72 30.72 0 1 0 43.4176 43.4688l351.4368-351.3856 351.3856 351.3856a30.72 30.72 0 1 0 43.4176-43.4688z" fill="#666666" ></path></symbol><symbol id="icon-wenti" viewBox="0 0 1194 1024"><path d="M1001.92929543 376.49706231l-391.49453142 158.74738807h-0.18530883a40.15011728 40.15011728 0 0 1-30.94647499 0h-0.24707773L187.56137103 376.49706231A39.65596257 39.65596257 0 0 1 162.54475911 339.80603164c0-16.49243317 10.31549167-30.69939728 25.01661192-36.62926107L579.05590247 144.42938248l0.24707772-0.06176959a41.20019777 41.20019777 0 0 1 30.94647498 0l0.18530884 0.0617696 391.49453143 158.74738808a39.53242335 39.53242335 0 0 1 25.01661192 36.62926107 39.77950107 39.77950107 0 0 1-25.01661193 36.69103068z m0.37061623 172.08958125l-391.43276182 158.74738807h-0.24707772a40.02657879 40.02657879 0 0 1-30.94647572 0H579.48828828L187.99375685 548.58664356A39.53242335 39.53242335 0 0 1 162.91537532 511.95738249c0-21.98991041 18.09843798-39.71773147 40.52073423-39.71773219 5.49747796 0 10.68610789 1.11184938 15.44235341 3.02670151v0.06176888h0.247077l375.99040985 152.38513918 375.99040914-152.44690806a41.07665855 41.07665855 0 0 1 15.50412229-3.08847113h0.18530812a40.15011728 40.15011728 0 0 1 40.52073423 39.71773219 39.90304029 39.90304029 0 0 1-25.01661193 36.69103068zM203.43610956 644.39100116c5.49747796 0 10.68610789 1.11184938 15.4423534 3.08847039h0.247077l375.99040985 152.38513845 375.99040914-152.44690807a41.07665855 41.07665855 0 0 1 15.50412229-3.08847039l0.1235385 0.06176962c22.42229624 0 40.52073423 17.72782104 40.52073424 39.71773145a39.71773147 39.71773147 0 0 1-25.07838082 36.62926107l-391.43276254 158.74738808h-0.18530811a40.58250384 40.58250384 0 0 1-30.946475 0h-0.24707771L187.87021764 720.73799368a39.53242335 39.53242335 0 0 1-25.0166112-36.62926107 40.15011728 40.15011728 0 0 1 40.58250311-39.71773145z"  ></path></symbol><symbol id="icon-chuangjianzhe1" viewBox="0 0 1024 1024"><path d="M512.000731 551.350857c150.016 0 271.652571-123.392 271.652572-275.675428V68.900571A68.461714 68.461714 0 0 0 715.776731 0H512.000731C361.984731 0 240.34816 123.465143 240.34816 275.748571c0 152.137143 121.636571 275.602286 271.652571 275.602286z" fill="#85aef5" ></path><path d="M240.34816 610.450286h543.305143c112.566857 0 203.776 92.598857 203.776 206.774857v137.874286c0 38.034286-30.427429 68.900571-67.949714 68.900571H104.595017A68.461714 68.461714 0 0 1 36.57216 955.099429v-137.874286c0-114.176 91.209143-206.774857 203.776-206.774857z" fill="#4385f7" ></path></symbol><symbol id="icon-shu1" viewBox="0 0 1102 1024"><path d="M0 1.304362m61.279822 0l122.480878 0q61.279822 0 61.279821 61.279822l0 857.602442q0 61.279822-61.279821 61.279822l-122.480878 0q-61.279822 0-61.279822-61.279822l0-857.602442q0-61.279822 61.279822-61.279822Z" fill="#5091FF" ></path><path d="M306.320343 1.304362m61.279822 0l122.480878 0q61.279822 0 61.279821 61.279822l0 857.602442q0 61.279822-61.279821 61.279822l-122.480878 0q-61.279822 0-61.279822-61.279822l0-857.602442q0-61.279822 61.279822-61.279822Z" fill="#5091FF" ></path><path d="M658.009809 33.913419L776.394863 2.092021a61.279822 61.279822 0 0 1 75.063843 43.32121l221.962131 828.459082a61.279822 61.279822 0 0 1-43.321211 74.985078l-118.385054 31.742632a61.279822 61.279822 0 0 1-74.985077-43.32121L614.688598 108.898497a61.279822 61.279822 0 0 1 43.321211-75.063844z" fill="#B6D0FC" ></path></symbol><symbol id="icon-biaoqian2" viewBox="0 0 1024 1024"><path d="M753.37797 268.521842l256.957652 453.093464c25.58611 45.104657 12.939262 102.052029-27.706103 131.878123l-8.479968 5.555841-256.592135 150.884949c-44.373626 26.097833-100.151346 13.158571-129.538822-28.144722l-5.482738-8.626174-25.293698-44.592935a25.58611 25.58611 0 0 1-3.289643-14.328222l0.804135-4.897913 120.474029-457.772066 51.39153-179.833805a14.620635 14.620635 0 0 1 26.755761-3.21654z" fill="#B6D0FC" ></path><path d="M359.644283 1019.437631a98.61618 98.61618 0 0 0 120.98575-71.129387l166.163511-631.611411C682.17548 182.479408 603.955085 44.606825 472.150065 8.640064 340.418148-27.326697 205.031073 52.282658 169.72224 186.500083L3.485626 818.038391a100.809275 100.809275 0 0 0 69.886633 123.251949l286.272024 78.074188z m35.820554-719.262115a88.235529 88.235529 0 0 1-61.114252-107.827179A86.261744 86.261744 0 0 1 440.203979 130.137537c46.054999 12.573746 73.468688 60.82184 61.114252 107.754076a86.261744 86.261744 0 0 1-105.853394 62.283903z" fill="#5091FF" ></path></symbol><symbol id="icon-jilu1" viewBox="0 0 1024 1024"><path d="M78.769231 691.751385v302.867692c0 16.226462 13.154462 29.380923 29.380923 29.380923h886.468923a29.380923 29.380923 0 0 0 29.380923-29.380923V324.765538a29.380923 29.380923 0 0 0-52.932923-17.644307L676.233846 701.44a29.380923 29.380923 0 0 1-41.353846 5.828923L468.440615 580.686769a29.380923 29.380923 0 0 0-41.747692 6.301539L298.535385 767.684923a29.380923 29.380923 0 0 1-42.535385 5.828923L126.739692 668.829538a29.380923 29.380923 0 0 0-47.891692 22.843077z" fill="#5091FF" ></path><path d="M225.043692 630.153846a78.690462 78.690462 0 0 1-48.679384-16.856615L30.089846 498.294154a78.769231 78.769231 0 0 1 97.358769-123.825231l81.762462 64.196923 131.544615-182.272a78.769231 78.769231 0 0 1 113.112616-15.36L601.560615 359.187692 751.458462 184.083692l-3.072 0.393846A78.769231 78.769231 0 1 1 727.591385 28.356923l207.241846-27.648a78.769231 78.769231 0 0 1 70.262154 129.260308L671.665231 519.640615a78.690462 78.690462 0 0 1-109.016616 10.24l-142.572307-114.136615-131.15077 181.720615a78.769231 78.769231 0 0 1-63.803076 32.689231z" fill="#B6D0FC" ></path></symbol><symbol id="icon-tuijian1" viewBox="0 0 1097 1024"><path d="M729.526857 1015.442286a99.474286 99.474286 0 0 1-40.96-9.216c-66.706286-30.72-165.595429-77.385143-206.262857-96.768-69.046857 31.670857-138.093714 63.488-207.140571 95.378285-31.744 13.750857-62.683429 11.922286-85.577143-4.388571-21.577143-15.36-32.256-41.837714-29.403429-72.411429 8.192-71.533714 21.942857-169.398857 27.062857-205.750857-57.197714-59.172571-113.590857-119.222857-169.033143-179.931428a67.437714 67.437714 0 0 1-14.116571-69.266286c10.020571-26.331429 35.84-45.056 69.339429-49.810286l219.355428-39.131428C313.051429 349.622857 373.028571 248.246857 413.037714 182.052571c33.792-61.659429 67.218286-61.659429 84.845715-55.442285 19.163429 6.144 37.302857 24.356571 55.442285 56.100571 39.058286 65.755429 98.011429 167.058286 117.979429 201.435429l217.234286 39.350857c31.963429 4.608 57.417143 23.259429 67.291428 49.737143a67.730286 67.730286 0 0 1-13.458286 68.973714c-55.076571 61.220571-110.957714 121.417143-167.570285 180.955429 4.900571 36.132571 18.285714 134.290286 26.989714 205.458285 3.364571 31.451429-7.168 58.221714-29.037714 73.801143-12.653714 8.704-27.794286 13.238857-43.154286 13.019429z" fill="#5091FF" ></path><path d="M1021.805714 215.698286a26.770286 26.770286 0 0 1-11.629714 3.364571c-21.211429 1.389714-52.882286 3.072-65.828571 3.657143l-36.644572 55.076571c-5.778286 8.192-13.677714 12.141714-21.869714 10.971429-7.68-0.950857-14.409143-6.436571-18.432-15.067429-8.923429-20.187429-20.626286-48.274286-24.868572-58.660571a2543.689143 2543.689143 0 0 1-69.558857-23.771429 21.942857 21.942857 0 0 1-14.189714-16.457142 24.137143 24.137143 0 0 1 9.508571-23.186286l48.274286-41.764572a7717.302857 7717.302857 0 0 1-1.316571-71.021714c-1.170286-21.211429 7.094857-26.038857 12.434285-26.843428 5.705143-1.170286 12.946286 1.097143 22.308572 6.948571 19.748571 11.995429 49.956571 30.573714 60.196571 36.864l59.830857-20.553143a23.625143 23.625143 0 0 1 24.283429 3.657143c5.851429 5.046857 8.630857 12.873143 7.314286 20.260571-4.242286 24.137143-8.777143 48.274286-13.677715 72.192 6.802286 8.923429 25.234286 33.133714 38.326858 50.907429 5.705143 7.899429 7.168 16.530286 4.169142 23.771429a20.114286 20.114286 0 0 1-8.704 9.654857zM133.705143 278.381714a13.385143 13.385143 0 0 1-4.388572-4.169143c-5.851429-8.850286-14.482286-22.162286-17.993142-27.648-10.971429-0.731429-21.942857-1.462857-32.987429-2.048-4.973714-0.438857-8.704-2.925714-10.24-6.729142-1.462857-3.657143-0.731429-7.899429 1.901714-11.702858 6.582857-8.996571 15.725714-21.065143 19.163429-25.526857a1271.881143 1271.881143 0 0 1-7.021714-36.059428 10.971429 10.971429 0 0 1 3.584-10.24 12.068571 12.068571 0 0 1 12.434285-1.682286l30.134857 10.459429c5.12-3.145143 20.333714-12.361143 30.354286-18.285715 8.923429-5.851429 13.092571-3.437714 14.774857-1.389714 1.901714 2.194286 2.779429 5.924571 2.56 11.483429l-0.877714 35.254857 23.844571 20.772571c3.584 2.925714 5.339429 7.168 4.461715 11.410286a10.971429 10.971429 0 0 1-6.948572 8.192 1293.165714 1293.165714 0 0 1-34.669714 12.141714c-2.194286 5.193143-8.045714 19.236571-12.434286 29.330286-2.048 4.388571-5.412571 7.314286-9.289143 7.753143a10.020571 10.020571 0 0 1-6.363428-1.316572z" fill="#B6D0FC" ></path></symbol><symbol id="icon-jinggao1" viewBox="0 0 1024 1024"><path d="M512 0a512 512 0 1 1 0 1024A512 512 0 0 1 512 0z m0 736a96 96 0 1 0 0 192 96 96 0 0 0 0-192z m55.488-576H456.512a64 64 0 0 0-63.488 71.936l48 384a64 64 0 0 0 63.488 56.064h14.976a64 64 0 0 0 63.488-56.064l48-384A64 64 0 0 0 567.488 160z" fill="#FF5555" ></path></symbol><symbol id="icon-dianzan2" viewBox="0 0 1024 1024"><path d="M753.709604 1023.987953H121.672932A120.408016 120.408016 0 0 1 0 905.326727V531.513748a122.877615 122.877615 0 0 1 121.672932-120.829654h114.505072c79.027172 0 162.150264-157.331534 190.219366-304.302799a139.502233 139.502233 0 0 1 274.96878 27.707697l-34.092515 228.046397 212.867398 4.276623a144.140261 144.140261 0 0 1 116.312095 57.523589 135.767717 135.767717 0 0 1 21.985455 120.408016l-103.000353 360.441003A166.667824 166.667824 0 0 1 753.64937 1023.987953zM121.672932 470.918219A61.860446 61.860446 0 0 0 60.234125 531.513748v373.812979a60.113657 60.113657 0 0 0 61.499041 58.427101h631.976438a106.373465 106.373465 0 0 0 103.723163-75.292656l103.120822-360.802408a76.0757 76.0757 0 0 0-12.287761-67.582688 84.68918 84.68918 0 0 0-68.666903-33.429939L631.85597 421.646705a30.117062 30.117062 0 0 1-29.153317-34.574388l38.730543-257.44065A75.894997 75.894997 0 0 0 563.550472 60.241955a76.256402 76.256402 0 0 0-78.003191 57.342887C461.815035 241.908076 384.594887 432.428613 271.053562 465.798318V963.753828h-60.234125V470.918219z" fill="#333333" ></path></symbol><symbol id="icon-pinglun1" viewBox="0 0 1024 1024"><path d="M512.035266 1024H163.29535a90.331527 90.331527 0 0 1-89.006665-105.86855 344.163119 344.163119 0 0 0 11.020446-123.63375 492.848813 492.848813 0 0 1-46.309963-86.35694A511.999097 511.999097 0 1 1 512.035266 1024z m0-963.536291a451.356531 451.356531 0 0 0-375.59849 702.538398c12.40553 18.608295 16.681222 53.83759-2.770167 165.487358a30.110509 30.110509 0 0 0 24.509955 34.928191L512.035266 963.778982a451.657636 451.657636 0 0 0 0-903.315273z" fill="#333333" ></path><path d="M271.151194 512.121345m-60.221019 0a60.221018 60.221018 0 1 0 120.442037 0 60.221018 60.221018 0 1 0-120.442037 0Z" fill="#333333" ></path><path d="M512.035266 512.121345m-60.221018 0a60.221018 60.221018 0 1 0 120.442037 0 60.221018 60.221018 0 1 0-120.442037 0Z" fill="#333333" ></path><path d="M752.919339 512.121345m-60.221018 0a60.221018 60.221018 0 1 0 120.442036 0 60.221018 60.221018 0 1 0-120.442036 0Z" fill="#333333" ></path></symbol><symbol id="icon-duigou" viewBox="0 0 1024 1024"><path d="M512 0a512 512 0 1 0 512 512 512 512 0 0 0-512-512z m237.248 450.56l-256 256a64 64 0 0 1-90.496 0l-128-128a64 64 0 0 1 90.496-90.496L448 570.88l210.752-210.752a64 64 0 0 1 90.496 90.496z" fill="#33BD8C" ></path></symbol><symbol id="icon-tishi2" viewBox="0 0 1024 1024"><path d="M512 0a512 512 0 1 1 0 1024A512 512 0 0 1 512 0z m0 56.888889a455.111111 455.111111 0 1 0 0 910.222222A455.111111 455.111111 0 0 0 512 56.888889z" fill="#888888" ></path><path d="M512 227.555556a56.888889 56.888889 0 0 1 56.888889 56.888888v284.444445a56.888889 56.888889 0 0 1-113.777778 0V284.444444a56.888889 56.888889 0 0 1 56.888889-56.888888z" fill="#888888" ></path><path d="M512 739.555556m-56.888889 0a56.888889 56.888889 0 1 0 113.777778 0 56.888889 56.888889 0 1 0-113.777778 0Z" fill="#888888" ></path></symbol><symbol id="icon-bianji_Hover" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#5091FF" ></path><path d="M665.2416 505.9584l-224.8192 224.8704a22.3232 22.3232 0 0 1-11.264 6.144l-153.9072 30.6688c-10.24 2.048-18.8416-4.4544-19.2512-14.4896a18.7904 18.7904 0 0 1 0.3584-4.4032l30.72-153.856a22.3232 22.3232 0 0 1 6.144-11.264l224.768-224.8704 147.2512 147.2z m-51.2-243.2c7.936-7.9872 19.7632-9.0624 26.4192-2.4064l123.1872 123.1872c6.656 6.656 5.5808 18.432-2.4064 26.4192l-59.1872 59.1872-147.2-147.2 59.1872-59.1872z" fill="#FFFFFF" ></path></symbol><symbol id="icon-shangyi_Hover" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#33BD8C" ></path><path d="M512 768a51.2 51.2 0 0 1-51.2-51.2V430.7968L394.5984 496.9984a51.2 51.2 0 1 1-72.3968-72.3968l153.6-153.6A51.0464 51.0464 0 0 1 511.8464 256h0.3072a51.0464 51.0464 0 0 1 36.0448 15.0016l153.6 153.6a51.2 51.2 0 1 1-72.3968 72.3968L563.2 430.7968V716.8a51.2 51.2 0 0 1-51.2 51.2z" fill="#FFFFFF" ></path></symbol><symbol id="icon-shanchu_moren" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#EEEEEE" ></path><path d="M665.6 716.8a51.0464 51.0464 0 0 1-36.1984-15.0016L512 584.3968l-117.4016 117.4016a51.2 51.2 0 1 1-72.3968-72.3968L439.6032 512 322.2016 394.5984a51.2 51.2 0 0 1 72.3968-72.3968L512 439.6032l117.4016-117.4016a51.2 51.2 0 1 1 72.3968 72.3968L584.3968 512l117.4016 117.4016A51.2 51.2 0 0 1 665.6 716.8z" fill="#999999" ></path></symbol><symbol id="icon-xiayi_Hover" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#33BD8C" ></path><path d="M512 768h-0.1536a51.0464 51.0464 0 0 1-36.0448-15.0016l-153.6-153.6a51.2 51.2 0 0 1 72.3968-72.3968L460.8 593.2032V307.2a51.2 51.2 0 1 1 102.4 0v286.0032l66.2016-66.2016a51.2 51.2 0 0 1 72.3968 72.3968l-153.6 153.6a51.0464 51.0464 0 0 1-36.0448 15.0016H512z" fill="#FFFFFF" ></path></symbol><symbol id="icon-shanchu_Hover" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#FF5555" ></path><path d="M665.6 716.8a51.0464 51.0464 0 0 1-36.1984-15.0016L512 584.3968l-117.4016 117.4016a51.2 51.2 0 1 1-72.3968-72.3968L439.6032 512 322.2016 394.5984a51.2 51.2 0 0 1 72.3968-72.3968L512 439.6032l117.4016-117.4016a51.2 51.2 0 1 1 72.3968 72.3968L584.3968 512l117.4016 117.4016A51.2 51.2 0 0 1 665.6 716.8z" fill="#FFFFFF" ></path></symbol><symbol id="icon-xiayi_moren" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#EEEEEE" ></path><path d="M512 768h-0.1536a51.0464 51.0464 0 0 1-36.0448-15.0016l-153.6-153.6a51.2 51.2 0 0 1 72.3968-72.3968L460.8 593.2032V307.2a51.2 51.2 0 1 1 102.4 0v286.0032l66.2016-66.2016a51.2 51.2 0 0 1 72.3968 72.3968l-153.6 153.6a51.0464 51.0464 0 0 1-36.0448 15.0016H512z" fill="#999999" ></path></symbol><symbol id="icon-bianji_moren" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#EEEEEE" ></path><path d="M665.2416 505.9584l-224.8192 224.8704a22.3232 22.3232 0 0 1-11.264 6.144l-153.9072 30.6688c-10.24 2.048-18.8416-4.4544-19.2512-14.4896a18.7904 18.7904 0 0 1 0.3584-4.4032l30.72-153.856a22.3232 22.3232 0 0 1 6.144-11.264l224.768-224.8704 147.2512 147.2z m-51.2-243.2c7.936-7.9872 19.7632-9.0624 26.4192-2.4064l123.1872 123.1872c6.656 6.656 5.5808 18.432-2.4064 26.4192l-59.1872 59.1872-147.2-147.2 59.1872-59.1872z" fill="#999999" ></path></symbol><symbol id="icon-huifuchushidaima" viewBox="0 0 1024 1024"><path d="M40.618667 471.381333L470.812444 41.187556A57.457778 57.457778 0 0 1 568.888889 81.92v159.288889c0 31.800889 25.713778 57.514667 57.457778 57.514667h340.195555c31.744 0 57.457778 25.713778 57.457778 57.457777v311.751111a57.457778 57.457778 0 0 1-57.457778 57.457778h-340.195555A57.457778 57.457778 0 0 0 568.888889 782.791111v159.345778a57.457778 57.457778 0 0 1-98.076445 40.675555L40.618667 552.618667a57.457778 57.457778 0 0 1 0-81.237334z" fill="#999999" ></path></symbol><symbol id="icon-zaicizairu" viewBox="0 0 1024 1024"><path d="M563.307789 19.941053a21.557895 21.557895 0 0 1 12.39579 3.934315l273.623579 192.565895a21.557895 21.557895 0 0 1 0 35.247158L575.703579 444.200421a21.557895 21.557895 0 0 1-33.953684-17.623579V364.544l-10.778948-2.856421a351.070316 351.070316 0 0 0-431.858526 313.936842 434.283789 434.283789 0 0 1 442.691368-557.810526V41.498947c0-11.910737 9.593263-21.557895 21.557895-21.557894zM459.668211 1020.550737a21.557895 21.557895 0 0 1-12.39579-3.934316l-273.623579-192.512a21.557895 21.557895 0 0 1 0-35.247158l273.569684-192.512a21.557895 21.557895 0 0 1 33.953685 17.623579v62.032842l10.886736 2.856421a351.070316 351.070316 0 0 0 431.858527-313.936842 434.283789 434.283789 0 0 1-442.745263 557.810526v76.261053a21.557895 21.557895 0 0 1-21.557895 21.557895z" fill="#999999" ></path></symbol><symbol id="icon-kaiguan" viewBox="0 0 1024 1024"><path d="M512.003915 1023.992772A483.987172 483.987172 0 0 1 171.195027 198.473893a60.234869 60.234869 0 0 1 85.352809 84.931165 361.409214 361.409214 0 1 0 510.912158 0 60.234869 60.234869 0 0 1 85.413045-84.931165A484.047407 484.047407 0 0 1 512.003915 1023.992772z" fill="#999999" ></path><path d="M512.003915 0a60.234869 60.234869 0 0 1 60.234869 60.234869v361.409214a60.234869 60.234869 0 0 1-60.234869 60.234868 60.234869 60.234869 0 0 1-60.234869-60.234868V60.234869a60.234869 60.234869 0 0 1 60.234869-60.234869z" fill="#999999" ></path></symbol><symbol id="icon-mulu" viewBox="0 0 1024 1024"><path d="M881.777778 0a56.888889 56.888889 0 0 1 56.888889 56.888889v910.222222a56.888889 56.888889 0 0 1-56.888889 56.888889H142.222222a56.888889 56.888889 0 0 1-56.888889-56.888889V56.888889a56.888889 56.888889 0 0 1 56.888889-56.888889h739.555556zM483.555556 682.666667H256a56.888889 56.888889 0 0 0 0 113.777777h227.555556a56.888889 56.888889 0 0 0 0-113.777777z m284.444444-227.555556H256a56.888889 56.888889 0 1 0 0 113.777778h512a56.888889 56.888889 0 0 0 0-113.777778z m0-227.555555H256a56.888889 56.888889 0 1 0 0 113.777777h512a56.888889 56.888889 0 0 0 0-113.777777z" fill="#999999" ></path></symbol><symbol id="icon-suoxiao1" viewBox="0 0 1024 1024"><path d="M601.6 486.4h-1.536a63.168 63.168 0 0 1-22.336-4.608 63.936 63.936 0 0 1-40.064-57.856V108.8a64 64 0 0 1 128 0v159.104L914.688 18.752a64 64 0 0 1 90.496 90.496L756.096 358.4H915.2a64 64 0 0 1 0 128H601.6zM64 1024a64 64 0 0 1-45.248-109.248l249.152-249.216H108.8a64 64 0 0 1 0-128H423.936a63.36 63.36 0 0 1 22.4 4.672 64 64 0 0 1 40.064 57.792V915.2a64 64 0 0 1-128 0v-159.168l-249.152 249.216A63.808 63.808 0 0 1 64 1024z" fill="#999999" ></path></symbol><symbol id="icon-kuoda" viewBox="0 0 1024 1024"><path d="M601.570673 486.398688a63.99688 63.99688 0 0 1-45.245794-109.178677L805.464734 128.016159H646.36849a63.99688 63.99688 0 0 1 0-127.99376h313.392722a12.991367 12.991367 0 0 1 1.535925 0h0.19199a63.164921 63.164921 0 0 1 22.398908 4.671772A64.060877 64.060877 0 0 1 1023.950082 62.547351V377.603992a63.99688 63.99688 0 0 1-127.99376 0V218.571745l-249.139854 249.139854A63.80489 63.80489 0 0 1 601.570673 486.398688zM63.99688 1023.972481a11.647432 11.647432 0 0 0-1.535925 0 63.356911 63.356911 0 0 1-22.398908-4.607775 63.868886 63.868886 0 0 1-40.062047-57.789183V646.390888a63.99688 63.99688 0 0 1 127.99376 0v159.096245l249.139855-249.139855a63.99688 63.99688 0 0 1 90.491588 90.491589L218.485349 895.978721H377.581593a63.99688 63.99688 0 1 1 0 127.99376H63.99688z" fill="#999999" ></path></symbol><symbol id="icon-shezhi3" viewBox="0 0 1024 1024"><path d="M929.382997 638.12007l79.699872-41.98323a22.129372 22.129372 0 0 0 11.775784-18.886765L1023.987485 476.444812a22.129372 22.129372 0 0 0-10.694915-19.626307l-77.083032-46.648034a22.129372 22.129372 0 0 1-9.272718-11.150017l-29.638568-79.074106a22.129372 22.129372 0 0 1-0.398215-14.221962l26.623512-86.071311a22.129372 22.129372 0 0 0-5.119906-21.788045l-69.175621-72.930218a22.18626 22.18626 0 0 0-21.446718-6.257663l-87.493507 21.731157a22.18626 22.18626 0 0 1-14.506401-1.308421l-76.05905-34.58781a22.18626 22.18626 0 0 1-10.353588-9.727822L596.873537 14.799942a22.18626 22.18626 0 0 0-18.886764-11.718896L477.010846 0.009102a22.18626 22.18626 0 0 0-19.626307 10.694915l-46.648033 77.026144a22.18626 22.18626 0 0 1-11.206906 9.272718l-79.187882 29.58168a22.18626 22.18626 0 0 1-14.278849 0.455103l-86.128199-26.566624a22.18626 22.18626 0 0 0-21.788045 5.063018L125.159519 174.768565a22.129372 22.129372 0 0 0-6.257663 21.276054l21.332942 87.94861a22.129372 22.129372 0 0 1-1.365308 14.392625L104.224792 374.331128a22.129372 22.129372 0 0 1-9.78471 10.410476l-79.586096 42.097006a22.129372 22.129372 0 0 0-11.718897 18.886765L0.006258 546.644414a22.129372 22.129372 0 0 0 10.694915 19.569419l77.083031 46.648033a22.129372 22.129372 0 0 1 9.272719 11.150018l29.58168 79.074106c1.763523 4.551028 1.934187 9.614046 0.455103 14.278849l-26.623512 86.128199a22.129372 22.129372 0 0 0 5.00613 21.674269l69.175621 73.555985a22.18626 22.18626 0 0 0 21.38983 6.314551l87.94861-21.38983a22.18626 22.18626 0 0 1 14.392625 1.365308l76.05905 34.587811a22.18626 22.18626 0 0 1 10.410476 9.784709l42.097006 79.75676a22.18626 22.18626 0 0 0 18.886764 11.775784L546.698457 1023.990329a22.18626 22.18626 0 0 0 19.626307-10.694915l46.648034-77.026143a22.18626 22.18626 0 0 1 11.206905-9.272719l79.130994-29.58168a22.18626 22.18626 0 0 1 14.335737-0.455103l86.185087 26.623512a22.18626 22.18626 0 0 0 21.674269-5.063018l73.612873-69.118733a22.129372 22.129372 0 0 0 6.371439-21.38983l-21.38983-87.94861a22.129372 22.129372 0 0 1 1.251532-14.221962l34.07582-77.083031a22.129372 22.129372 0 0 1 9.898485-10.638027z m-476.321934 93.011628A227.153169 227.153169 0 0 1 292.409786 452.836356a227.551384 227.551384 0 0 1 278.522894-160.878829 227.153169 227.153169 0 0 1 160.651277 278.409119 227.551384 227.551384 0 0 1-278.522894 160.82194z" fill="#999999" ></path></symbol><symbol id="icon-yincang2" viewBox="0 0 1462 1024"><path d="M731.450514 73.142857c232.594286 0 469.942857 129.974857 711.972572 389.851429a71.387429 71.387429 0 0 1 0 98.011428l-22.674286 23.917715C1186.618514 828.854857 956.803657 950.857143 731.450514 950.857143 498.856229 950.857143 261.507657 820.882286 19.477943 561.005714a71.387429 71.387429 0 0 1 0-98.011428l22.674286-23.917715C276.282514 195.145143 506.097371 73.142857 731.450514 73.142857z m0 219.428572a219.428571 219.428571 0 1 0 0 438.857142 219.428571 219.428571 0 0 0 0-438.857142z" fill="#999999" ></path><path d="M1196.931657 46.518857a73.142857 73.142857 0 0 1 0 103.424L369.393371 977.481143a73.142857 73.142857 0 0 1-103.424-103.424L1093.507657 46.518857a73.142857 73.142857 0 0 1 103.424 0z" fill="#FF5555" ></path></symbol><symbol id="icon-xiaoxi11" viewBox="0 0 1024 1024"><path d="M404.136796 916.240019a107.759981 107.759981 0 1 0 215.519963 0M188.616833 404.380106a323.441584 323.441584 0 0 1 215.843243-304.960747 107.759981 107.759981 0 0 1 214.873403 0A323.387704 323.387704 0 0 1 835.176722 404.380106V754.600046a53.879991 53.879991 0 0 1 0 107.759982H188.616833a53.879991 53.879991 0 0 1 0-107.759982V404.380106z" fill="#999999" ></path></symbol><symbol id="icon-bianzu1" viewBox="0 0 1024 1024"><path d="M331.294118 843.294118C170.646588 843.294118 0 790.528 0 692.705882v-180.705882h60.235294v180.705882c0 36.803765 105.592471 90.352941 271.058824 90.352942 19.516235 0 39.032471-0.542118 57.404235-2.288942l5.662118 59.994353c-20.178824 1.867294-41.622588 2.529882-63.066353 2.529883z" fill="#FFD500" ></path><path d="M331.294118 662.588235C170.646588 662.588235 0 609.822118 0 512v-180.705882h60.235294v180.705882C60.235294 548.864 165.827765 602.352941 331.294118 602.352941c19.516235 0 39.032471-0.542118 57.404235-2.288941l5.662118 59.994353c-20.178824 1.867294-41.622588 2.529882-63.066353 2.529882zM602.352941 331.294118h60.235294v62.644706h-60.235294z" fill="#FFD500" ></path><path d="M331.294118 481.882353C170.646588 481.882353 0 429.116235 0 331.294118v-180.705883h60.235294v180.705883C60.235294 368.158118 165.827765 421.647059 331.294118 421.647059a602.352941 602.352941 0 0 0 110.110117-9.155765l11.083294 59.27153A665.118118 665.118118 0 0 1 331.294118 481.882353zM591.932235 427.369412l-29.756235-52.404706c25.539765-14.456471 40.176941-30.418824 40.176941-43.670588v-180.705883h60.235294v180.705883c0 25.479529-12.227765 62.825412-70.656 96.075294z" fill="#FFD500" ></path><path d="M331.294118 301.176471C170.646588 301.176471 0 248.410353 0 150.588235S170.646588 0 331.294118 0 662.588235 52.766118 662.588235 150.588235 491.881412 301.176471 331.294118 301.176471z m0-240.941177C165.827765 60.235294 60.235294 113.724235 60.235294 150.588235S165.827765 240.941176 331.294118 240.941176 602.352941 187.452235 602.352941 150.588235 496.760471 60.235294 331.294118 60.235294z" fill="#FFD500" ></path><path d="M692.705882 1024C532.058353 1024 361.411765 971.233882 361.411765 873.411765v-180.705883h60.235294c0 17.950118 31.021176 46.742588 99.147294 67.523765A606.268235 606.268235 0 0 0 692.705882 783.058824c165.466353 0 271.058824-53.549176 271.058824-90.352942h60.235294v180.705883c0 97.822118-170.706824 150.588235-331.294118 150.588235zM421.647059 782.155294V873.411765c0 36.803765 105.592471 90.352941 271.058823 90.352941s271.058824-53.549176 271.058824-90.352941v-91.497412A547.538824 547.538824 0 0 1 692.705882 843.294118a667.105882 667.105882 0 0 1-189.379764-25.419294A337.136941 337.136941 0 0 1 421.647059 782.155294z" fill="#FFD500" ></path><path d="M692.705882 843.294118a667.105882 667.105882 0 0 1-189.379764-25.419294C411.768471 789.925647 361.411765 745.532235 361.411765 692.705882v-180.705882h60.235294c0 17.950118 31.021176 46.742588 99.147294 67.523765a527.179294 527.179294 0 0 0 114.085647 20.48c18.853647 1.807059 38.309647 2.349176 57.825882 2.349176 165.466353 0 271.058824-53.488941 271.058824-90.352941h60.235294v180.705882c0 97.822118-170.706824 150.588235-331.294118 150.588236zM421.647059 601.449412V692.705882c0 17.950118 31.021176 46.742588 99.147294 67.523765A606.268235 606.268235 0 0 0 692.705882 783.058824c165.466353 0 271.058824-53.549176 271.058824-90.352942V601.208471a598.377412 598.377412 0 0 1-334.125177 58.849882 589.583059 589.583059 0 0 1-126.554353-22.889412A333.703529 333.703529 0 0 1 421.647059 601.389176z" fill="#FFD500" ></path><path d="M692.705882 662.588235c-21.383529 0-42.887529-0.602353-63.066353-2.529882a589.583059 589.583059 0 0 1-126.554353-22.889412C411.768471 609.159529 361.411765 564.766118 361.411765 512c0-25.479529 12.288-62.825412 70.656-96.075294A436.705882 436.705882 0 0 1 572.235294 371.410824a428.272941 428.272941 0 0 1 58.307765-7.529412c19.275294-1.807059 40.719059-2.469647 62.102588-2.469647 160.587294 0 331.294118 52.766118 331.294118 150.588235S853.293176 662.588235 692.705882 662.588235z m0-240.941176c-19.516235 0-38.972235 0.542118-57.404235 2.288941a386.108235 386.108235 0 0 0-52.284235 6.746353 386.048 386.048 0 0 0-121.434353 37.767529C436.284235 482.846118 421.647059 498.748235 421.647059 512c0 17.950118 31.021176 46.742588 99.147294 67.523765a527.179294 527.179294 0 0 0 114.085647 20.48c18.853647 1.807059 38.309647 2.349176 57.825882 2.349176 165.466353 0 271.058824-53.488941 271.058824-90.352941S858.172235 421.647059 692.705882 421.647059z" fill="#FFD500" ></path></symbol><symbol id="icon-xianshimima" viewBox="0 0 1706 1024"><path d="M853.333333 1024C544.853333 1024 264.106667 869.717333 18.858667 565.504a85.333333 85.333333 0 0 1 0-107.008C264.021333 154.282667 544.768 0 853.333333 0c308.48 0 589.226667 154.282667 834.389334 458.496a85.162667 85.162667 0 0 1 0 107.008C1442.56 869.717333 1161.813333 1024 853.333333 1024zM196.778667 512C398.08 741.546667 613.376 853.333333 853.333333 853.333333c239.957333 0 455.253333-111.786667 656.554667-341.333333C1308.672 282.453333 1093.376 170.666667 853.333333 170.666667 613.376 170.666667 398.08 282.453333 196.778667 512z" fill="#CCCCCC" ></path><path d="M853.333333 512m-170.666666 0a170.666667 170.666667 0 1 0 341.333333 0 170.666667 170.666667 0 1 0-341.333333 0Z" fill="#CCCCCC" ></path></symbol><symbol id="icon-yincangmima" viewBox="0 0 2346 1024"><path d="M1910.802982 360.181531a123.378994 123.378994 0 0 1 168.535706 45.156712l123.378994 213.692417a123.378994 123.378994 0 0 1-45.156712 168.535706 123.378994 123.378994 0 0 1-168.535706-45.156712l-123.378994-213.692417a123.378994 123.378994 0 0 1 45.156712-168.535706zM1427.650842 535.996597a123.378994 123.378994 0 0 1 142.872875 100.183744l42.93589 243.056618a123.378994 123.378994 0 0 1-100.183743 142.872875 123.378994 123.378994 0 0 1-142.872875-100.060364l-42.812511-243.056619a123.378994 123.378994 0 0 1 99.936985-142.996254zM913.407195 535.996597a123.378994 123.378994 0 0 1 100.060364 142.996254l-42.812511 243.056619a123.378994 123.378994 0 0 1-142.872875 99.936985 123.378994 123.378994 0 0 1-100.183743-142.872875l42.93589-243.056618a123.378994 123.378994 0 0 1 142.872875-99.936986zM430.255054 360.181531a123.378994 123.378994 0 0 1 45.156712 168.535706l-123.378994 213.692417a123.378994 123.378994 0 0 1-168.535706 45.156712 123.378994 123.378994 0 0 1-45.156712-168.535706l123.378994-213.692417a123.378994 123.378994 0 0 1 168.535706-45.156712z" fill="#CCCCCC" ></path><path d="M1170.529018 681.953947a1594.303361 1594.303361 0 0 1-613.933874-121.775067 1607.504913 1607.504913 0 0 1-277.232599-148.42493A1613.427105 1613.427105 0 0 1 36.429305 212.126738 123.378994 123.378994 0 0 1 210.887203 37.668841a1367.039254 1367.039254 0 0 0 205.796162 169.029221 1356.058523 1356.058523 0 0 0 234.420089 125.476437 1366.669117 1366.669117 0 0 0 1038.851129 0 1351.863637 1351.863637 0 0 0 234.666847-125.476437 1371.357518 1371.357518 0 0 0 205.672783-169.029221 123.378994 123.378994 0 1 1 174.457897 174.457897 1616.634958 1616.634958 0 0 1-242.933239 199.627212 1602.569753 1602.569753 0 0 1-277.355979 148.42493 1593.069571 1593.069571 0 0 1-613.933874 121.775067z" fill="#CCCCCC" ></path></symbol><symbol id="icon-fuzhi2" viewBox="0 0 1024 1024"><path d="M933.647059 783.058824H722.823529V331.294118a30.117647 30.117647 0 0 0-30.117647-30.117647H240.941176V90.352941A90.473412 90.473412 0 0 1 331.294118 0h602.352941A90.473412 90.473412 0 0 1 1024 90.352941v602.352941a90.473412 90.473412 0 0 1-90.352941 90.352942zM783.058824 722.823529h150.588235a30.177882 30.177882 0 0 0 30.117647-30.117647v-602.352941a30.117647 30.117647 0 0 0-30.117647-30.117647h-602.352941a30.117647 30.117647 0 0 0-30.117647 30.117647V240.941176h391.529411A90.473412 90.473412 0 0 1 783.058824 331.294118z" fill="#888888" ></path><path d="M692.705882 1024h-602.352941A90.473412 90.473412 0 0 1 0 933.647059v-602.352941A90.473412 90.473412 0 0 1 90.352941 240.941176h602.352941A90.473412 90.473412 0 0 1 783.058824 331.294118v602.352941a90.473412 90.473412 0 0 1-90.352942 90.352941zM90.352941 301.176471a30.117647 30.117647 0 0 0-30.117647 30.117647v602.352941a30.117647 30.117647 0 0 0 30.117647 30.117647h602.352941a30.177882 30.177882 0 0 0 30.117647-30.117647v-602.352941a30.117647 30.117647 0 0 0-30.117647-30.117647z" fill="#888888" ></path></symbol><symbol id="icon-xingzhuangjiehe" viewBox="0 0 1024 1024"><path d="M865.962667 0c51.541333 0 94.094222 39.025778 100.352 89.543111L967.111111 102.4v665.6H764.814222a50.176 50.176 0 0 0-49.607111 41.187556l-0.910222 10.012444V1024H157.923556a101.603556 101.603556 0 0 1-100.238223-89.543111L56.888889 921.6V102.4C56.888889 50.176 95.573333 7.168 145.294222 0.796444L158.151111 0H865.848889z m99.896889 870.4L815.445333 1016.604444V870.4h150.414223zM562.517333 716.8H259.185778c-24.803556 0-45.511111 18.204444-49.834667 42.097778l-0.796444 9.102222 0.796444 9.102222a50.972444 50.972444 0 0 0 40.732445 41.301334l9.102222 0.796444h303.331555c24.917333 0 45.511111-18.204444 49.834667-42.097778l0.796444-9.102222-0.796444-9.102222a50.744889 50.744889 0 0 0-49.834667-42.097778z m202.296889-256H259.185778c-24.803556 0-45.511111 18.204444-49.834667 42.097778l-0.796444 9.102222 0.796444 9.102222a50.972444 50.972444 0 0 0 40.732445 41.301334l9.102222 0.796444h505.628444c24.803556 0 45.511111-18.204444 49.834667-42.097778l0.796444-9.102222-0.796444-9.102222a50.744889 50.744889 0 0 0-49.834667-42.097778z m0-256H259.185778c-24.803556 0-45.511111 18.204444-49.834667 42.097778l-0.796444 9.102222 0.796444 9.102222a50.972444 50.972444 0 0 0 40.732445 41.301334l9.102222 0.796444h505.628444c24.803556 0 45.511111-18.204444 49.834667-42.097778l0.796444-9.102222-0.796444-9.102222a50.744889 50.744889 0 0 0-49.834667-42.097778z" fill="#5091FF" ></path></symbol><symbol id="icon-xingzhuangjiehebeifen" viewBox="0 0 1280 1024"><path d="M1222.258786 485.112723c31.871522 0 57.599136 24.063639 57.727134 53.759194a47.35929 47.35929 0 0 1-3.455948 18.431723l-122.494162 314.747279-20.735689 52.735209-24.319636 63.615046A57.215142 57.215142 0 0 1 1054.709299 1023.98464H164.098659c-31.99952 0-57.599136-24.191637-57.855133-53.887191V968.945466a42.239366 42.239366 0 0 1 3.455949-17.279741l167.677484-431.225532a57.215142 57.215142 0 0 1 54.143188-35.583466H1222.386784zM434.302606 0c18.175727 0 35.839462 4.095939 52.095218 11.903821l182.525262 83.966741c15.99976 7.679885 33.791493 11.775823 51.967221 11.903821h318.715219c63.871042 0.127998 115.454268 48.383274 115.582266 107.774384v161.661575H331.520147c-72.958906 0.127998-137.98193 42.751359-162.813558 106.750399L6.917016 898.930516A98.814518 98.814518 0 0 1 0.00512 862.323065V107.774383C0.133118 48.383274 51.844342 0.255996 115.587386 0h318.71522z" fill="#5091FF" ></path></symbol><symbol id="icon-shangchuan" viewBox="0 0 1562 1024"><path d="M959.326316 0c208.357053 0 377.263158 167.154526 377.263158 373.328842 0 20.965053-1.751579 41.498947-5.12 61.520842 132.742737 31.312842 231.477895 149.504 231.477894 290.492632C1562.947368 890.260211 1427.833263 1024 1261.136842 1024c-10.913684 0-21.719579-0.565895-32.336842-1.697684V1024H301.810526C135.114105 1024 0 890.287158 0 725.342316s135.114105-298.684632 301.810526-298.684632c0-111.912421 91.701895-202.644211 204.8-202.64421a205.608421 205.608421 0 0 1 97.172211 24.198737C655.737263 103.585684 795.297684 0 959.326316 0z m-160.687158 568.185263a17.785263 17.785263 0 0 0-25.061053 1.536l-186.960842 211.429053a17.785263 17.785263 0 0 0 13.312 29.507368h72.165053a17.785263 17.785263 0 0 1 17.758316 17.785263V1024h194.021052v-195.584a17.785263 17.785263 0 0 1 17.785263-17.758316h72.138106a17.785263 17.785263 0 0 0 13.312-29.507368l-186.933895-211.429053a17.758316 17.758316 0 0 0-1.536-1.536z" fill="#5091FF" ></path></symbol><symbol id="icon-tiaozhan" viewBox="0 0 1024 1024"><path d="M512 0a512 512 0 0 1 512 512 512 512 0 0 1-512 512 512 512 0 0 1-512-512 512 512 0 0 1 512-512z m97.664 205.696l-313.856 298.88a6.4 6.4 0 0 0 2.56 10.688l152.128 48.32a6.4 6.4 0 0 1 4.288 7.424l-50.56 240.832a6.4 6.4 0 0 0 10.688 5.952l313.856-298.88a6.4 6.4 0 0 0-2.048-10.624l-145.856-58.304a6.4 6.4 0 0 1-3.84-7.168l43.328-231.296a6.4 6.4 0 0 0-10.688-5.824z" fill="#33BD8C" ></path></symbol><symbol id="icon-youhua" viewBox="0 0 1194 1024"><path d="M85.333333 1024a85.333333 85.333333 0 0 1-60.330666-145.664L391.338667 512 25.002667 145.664A85.333333 85.333333 0 0 1 145.664 25.002667l426.666667 426.666666a85.333333 85.333333 0 0 1 0 120.661334l-426.666667 426.666666A85.077333 85.077333 0 0 1 85.333333 1024z" fill="#888888" ></path><path d="M682.666667 1024a85.333333 85.333333 0 0 1-60.330667-145.664L988.672 512 622.336 145.664A85.333333 85.333333 0 0 1 742.997333 25.002667l426.666667 426.666666a85.333333 85.333333 0 0 1 0 120.661334l-426.666667 426.666666A85.077333 85.077333 0 0 1 682.666667 1024z" fill="#888888" ></path></symbol><symbol id="icon-jiesuo" viewBox="0 0 1024 1024"><path d="M873.411765 481.882353a60.235294 60.235294 0 0 1 60.235294 60.235294v421.647059a60.235294 60.235294 0 0 1-60.235294 60.235294H150.588235a60.235294 60.235294 0 0 1-60.235294-60.235294V542.117647a60.235294 60.235294 0 0 1 60.235294-60.235294z m-361.411765 150.588235a60.235294 60.235294 0 0 0-60.235294 60.235294v120.470589a60.235294 60.235294 0 0 0 120.470588 0v-120.470589a60.235294 60.235294 0 0 0-60.235294-60.235294z" fill="#888888" ></path><path d="M271.058824 542.117647a60.235294 60.235294 0 0 1-60.235295-60.235294V301.176471a301.176471 301.176471 0 0 1 602.352942 0 60.235294 60.235294 0 0 1-120.470589 0 180.705882 180.705882 0 0 0-361.411764 0v180.705882a60.235294 60.235294 0 0 1-60.235294 60.235294z" fill="#888888" ></path></symbol><symbol id="icon-suo1" viewBox="0 0 1024 1024"><path d="M921.6 409.6a68.266667 68.266667 0 0 1 68.266667 68.266667v477.866666a68.266667 68.266667 0 0 1-68.266667 68.266667H102.4a68.266667 68.266667 0 0 1-68.266667-68.266667V477.866667a68.266667 68.266667 0 0 1 68.266667-68.266667zM512 580.266667a68.266667 68.266667 0 0 0-68.266667 68.266666v136.533334a68.266667 68.266667 0 0 0 136.533334 0v-136.533334a68.266667 68.266667 0 0 0-68.266667-68.266666z" fill="#888888" ></path><path d="M785.066667 614.4a68.266667 68.266667 0 0 1-68.266667-68.266667V341.333333a204.8 204.8 0 0 0-409.6 0v204.8a68.266667 68.266667 0 0 1-136.533333 0V341.333333a341.333333 341.333333 0 0 1 682.666666 0v204.8a68.266667 68.266667 0 0 1-68.266666 68.266667z" fill="#888888" ></path></symbol><symbol id="icon-bianzu11" viewBox="0 0 1024 1024"><path d="M474.039901 948.079801a474.039901 474.039901 0 1 1 474.0399-474.0399 474.58166 474.58166 0 0 1-474.0399 474.0399zM474.039901 135.439972a338.599929 338.599929 0 1 0 338.599929 338.599929 339.006249 339.006249 0 0 0-338.599929-338.599929z" fill="#BBBBBB" ></path><path d="M956.273919 1023.993905a67.516826 67.516826 0 0 1-47.87803-19.841956l-143.634089-143.63409a67.719986 67.719986 0 0 1 95.756059-95.756059l143.63409 143.634089a67.719986 67.719986 0 0 1-47.87803 115.598016z" fill="#BBBBBB" ></path></symbol><symbol id="icon-biji" viewBox="0 0 1024 1024"><path d="M834.340512 1023.992248H75.842091A37.92769 37.92769 0 0 1 37.914401 986.119928V151.710758a37.92769 37.92769 0 0 1 37.92769-37.927689h379.276895a37.92769 37.92769 0 1 1 0 75.855379H113.76978v758.55379H796.468192v-379.276895a37.92769 37.92769 0 1 1 75.80001 0v417.204585a37.92769 37.92769 0 0 1-37.92769 37.87232z"  ></path><path d="M910.25126 212.284324L701.78739 420.637456a20.707965 20.707965 0 0 1-10.46472 5.702996l-142.574892 28.459609a14.229805 14.229805 0 0 1-17.828782-13.45464 17.4412 17.4412 0 0 1 0.332213-4.041929l28.404241-142.63026a20.707965 20.707965 0 0 1 5.702995-10.464721l208.408502-208.353132zM849.068637 5.97984a16.832143 16.832143 0 0 1 23.476409-2.104018l109.630402 109.630402a16.832143 16.832143 0 0 1-2.159387 23.476409l-52.655814 52.600446L796.468192 58.691023z"  ></path><path d="M644.757433 834.40917H265.480538a37.92769 37.92769 0 1 1 0-75.855379h379.276895a37.92769 37.92769 0 0 1 0 75.855379zM644.757433 644.770722H265.480538a37.92769 37.92769 0 1 1 0-75.855379h379.276895a37.92769 37.92769 0 0 1 0 75.855379z"  ></path></symbol><symbol id="icon-zhiding" viewBox="0 0 1024 1024"><path d="M496.0256 224.768L129.024 683.52A20.48 20.48 0 0 0 144.9984 716.8H337.92c11.264 0 20.48 9.216 20.48 20.48v266.24c0 11.264 9.216 20.48 20.48 20.48h266.24a20.48 20.48 0 0 0 20.48-20.48V737.28c0-11.264 9.216-20.48 20.48-20.48h192.9216a20.48 20.48 0 0 0 15.9744-33.28l-367.0016-458.752a20.48 20.48 0 0 0-31.9488 0z" fill="#4099E8" ></path><path d="M153.6 0m51.2 0l614.4 0q51.2 0 51.2 51.2l0 0q0 51.2-51.2 51.2l-614.4 0q-51.2 0-51.2-51.2l0 0q0-51.2 51.2-51.2Z" fill="#4099E8" ></path></symbol><symbol id="icon-leixing" viewBox="0 0 1024 1024"><path d="M85.346133 42.696106h255.99232a85.330773 85.330773 0 0 1 85.330774 85.330773v255.99232a85.330773 85.330773 0 0 1-85.330774 85.330774H85.346133a85.330773 85.330773 0 0 1-85.330773-85.330774v-255.99232a85.330773 85.330773 0 0 1 85.330773-85.330773z" fill="#459BE5" ></path><path d="M493.397891 197.998113L667.302008 24.093997a82.002873 82.002873 0 0 1 116.049851 0l173.904117 173.904116a82.002873 82.002873 0 0 1 0 116.049852L783.351859 487.952081a82.002873 82.002873 0 0 1-116.049851 0L493.397891 314.047965a82.002873 82.002873 0 0 1 0-116.049852z" fill="#B5D7F5" ></path><path d="M85.346133 554.680746h255.99232a85.330773 85.330773 0 0 1 85.330774 85.330774v255.99232a85.330773 85.330773 0 0 1-85.330774 85.330773H85.346133a85.330773 85.330773 0 0 1-85.330773-85.330773v-255.99232a85.330773 85.330773 0 0 1 85.330773-85.330774zM597.330773 554.680746h255.992321a85.330773 85.330773 0 0 1 85.330773 85.330774v255.99232a85.330773 85.330773 0 0 1-85.330773 85.330773H597.330773a85.330773 85.330773 0 0 1-85.330773-85.330773v-255.99232a85.330773 85.330773 0 0 1 85.330773-85.330774z" fill="#459BE5" ></path></symbol><symbol id="icon-biaoqianjiantou" viewBox="0 0 1024 1024"><path d="M810.666667 0v1024h-90.752a170.666667 170.666667 0 0 1-131.072-61.44l-329.984-395.946667a85.333333 85.333333 0 0 1 0-109.226666l329.984-395.946667A170.666667 170.666667 0 0 1 719.914667 0H810.666667z m-170.666667 426.666667a85.333333 85.333333 0 1 0 0 170.666666 85.333333 85.333333 0 0 0 0-170.666666z" fill="#ECF5FD" ></path></symbol><symbol id="icon-jiazaishibai1" viewBox="0 0 1024 1024"><path d="M21.041096 806.575342a406.794521 119.232877 0 1 0 813.589041 0 406.794521 119.232877 0 1 0-813.589041 0Z" fill="#DCE0E6" ></path><path d="M820.60274 512a56.109589 35.068493 0 1 0 112.219178 0 56.109589 35.068493 0 1 0-112.219178 0Z" fill="#DCE0E6" ></path><path d="M960.876712 666.30137a28.054795 21.041096 0 1 0 56.109589 0 28.054795 21.041096 0 1 0-56.109589 0Z" fill="#DCE0E6" ></path><path d="M241.173041 112.219178h373.128767c39.276712 0 70.136986 30.860274 70.136987 70.136986v558.290411c0 39.276712-30.860274 70.136986-70.136987 70.136987H241.173041c-39.276712 0-70.136986-30.860274-70.136986-70.136987V182.356164c0-39.276712 30.860274-70.136986 70.136986-70.136986z" fill="#F5F5F5" ></path><path d="M239.770301 199.189041h381.545206v173.939726H239.770301zM266.422356 490.958904h326.838356c15.430137 0 28.054795 12.624658 28.054795 28.054795s-12.624658 28.054795-28.054795 28.054794H266.422356c-15.430137 0-28.054795-12.624658-28.054794-28.054794 1.40274-15.430137 12.624658-28.054795 28.054794-28.054795zM266.422356 604.580822h326.838356c15.430137 0 28.054795 12.624658 28.054795 28.054794s-12.624658 28.054795-28.054795 28.054795H266.422356c-15.430137 0-28.054795-12.624658-28.054794-28.054795 1.40274-15.430137 12.624658-28.054795 28.054794-28.054794z" fill="#DCE0E6" ></path><path d="M382.849753 112.219178l-33.665753 173.939726h78.553425L382.849753 448.876712h61.720548l-47.69315 155.70411L538.553863 392.767123l-63.123288-21.041096 42.082192-144.482191h-67.331507L486.652493 112.219178z" fill="#FFFFFF" ></path></symbol><symbol id="icon-qiyezhanghao" viewBox="0 0 1105 1024"><path d="M122.88 40.96a40.96 40.96 0 0 1 40.96-40.96h450.56a40.96 40.96 0 0 1 40.96 40.96v901.12h409.6a40.96 40.96 0 1 1 0 81.92H40.96a40.96 40.96 0 1 1 0-81.92h81.92V40.96z m368.64 696.32H286.72a40.96 40.96 0 0 0-3.072 81.8176L286.72 819.2h204.8a40.96 40.96 0 1 0 0-81.92z m0-204.8H286.72a40.96 40.96 0 0 0-3.072 81.8176L286.72 614.4h204.8a40.96 40.96 0 1 0 0-81.92z m0-204.8H286.72a40.96 40.96 0 0 0-3.072 81.8176L286.72 409.6h204.8a40.96 40.96 0 1 0 0-81.92z m0-204.8H286.72a40.96 40.96 0 0 0-3.072 81.8176L286.72 204.8h204.8a40.96 40.96 0 1 0 0-81.92z" fill="#999999" ></path><path d="M778.24 204.8h163.84a40.96 40.96 0 0 1 40.96 40.96v696.32H737.28V245.76a40.96 40.96 0 0 1 40.96-40.96z" fill="#BBBBBB" ></path></symbol><symbol id="icon-gerenzhanghao" viewBox="0 0 1024 1024"><path d="M692.154923 295.050847a13.016949 13.016949 0 0 1 12.791322 10.552407l83.725017 435.356204a13.016949 13.016949 0 0 1-2.065356 9.823457L609.505974 1008.397017a13.016949 13.016949 0 0 1-21.451932 0L410.95411 750.782915a13.016949 13.016949 0 0 1-2.065356-9.823457l83.725017-435.356204A13.016949 13.016949 0 0 1 505.405093 295.050847zM606.000076 4.807593l140.704542 93.808814a13.016949 13.016949 0 0 1 5.137356 14.943457l-45.958508 137.875526a13.016949 13.016949 0 0 1-12.357424 8.903593H504.033974a13.016949 13.016949 0 0 1-12.357423-8.903593l-45.958509-137.875526a13.016949 13.016949 0 0 1 5.137356-14.926101L591.55994 4.790237a13.016949 13.016949 0 0 1 14.440136 0z" fill="#999999" ></path><path d="M442.576618 277.694915L348.594245 745.454644l-94.03444 51.442983a11.975593 11.975593 0 0 1-3.679458 1.301695L248.953839 798.372881c-6.317559 0.052068-11.576407-4.859661-12.444204-11.298712l-0.138847-1.787661L234.305432 541.157966a13.797966 13.797966 0 0 1 1.909152-7.150644l1.076068-1.544678L442.576618 277.694915z" fill="#BBBBBB" ></path></symbol><symbol id="icon-shenglvehao" viewBox="0 0 1024 1024"><path d="M221 592c-44.183 0-80-35.817-80-80s35.817-80 80-80 80 35.817 80 80-35.817 80-80 80z m291 0c-44.183 0-80-35.817-80-80s35.817-80 80-80 80 35.817 80 80-35.817 80-80 80z m291 0c-44.183 0-80-35.817-80-80s35.817-80 80-80 80 35.817 80 80-35.817 80-80 80z"  ></path></symbol><symbol id="icon-shangjiantou-tianchong" viewBox="0 0 1024 1024"><path d="M512 32C246.4 32 32 246.4 32 512s214.4 480 480 480 480-214.4 480-480S777.6 32 512 32z m272 595.2c-12.8 12.8-32 12.8-44.8 0L512 400l-227.2 227.2c-12.8 12.8-32 12.8-44.8 0-12.8-12.8-12.8-32 0-44.8l249.6-249.6c12.8-12.8 32-12.8 44.8 0l249.6 249.6c12.8 12.8 12.8 32 0 44.8z"  ></path></symbol><symbol id="icon-wancheng1" viewBox="0 0 1024 1024"><path d="M512 0a512 512 0 1 1 0 1024A512 512 0 0 1 512 0z m307.2 288h-112.576a6.4 6.4 0 0 0-4.48 1.92L451.136 540.8a6.4 6.4 0 0 1-7.168 1.28L248.832 454.656a6.4 6.4 0 0 0-7.552 1.792l-45.824 55.936a6.4 6.4 0 0 0 0.256 8.32l247.04 273.6a6.4 6.4 0 0 0 9.92-0.448L824.32 298.24a6.4 6.4 0 0 0-5.12-10.24z" fill="#33BD8C" ></path></symbol><symbol id="icon-jinzhi" viewBox="0 0 1024 1024"><path d="M512 0C229.222291 0 0 229.222291 0 512c0 282.777709 229.222291 512 512 512 282.777709 0 512-229.201014 512-512C1023.978723 229.222291 794.777709 0 512 0zM77.194697 512c0-240.116361 194.667664-434.784025 434.784025-434.784025 64.811204 0 126.324398 14.213357 181.582014 39.639945L279.330757 879.313136C157.857624 802.224826 77.194697 666.538337 77.194697 512zM512 946.762748c-52.257491 0-102.344679-9.234426-148.729585-26.107468L773.819391 164.90047c105.068196 79.343723 172.943357 205.285127 172.943357 347.09953C946.762748 752.116361 752.116361 946.762748 512 946.762748z"  ></path></symbol><symbol id="icon-biaoqian1" viewBox="0 0 1024 1024"><path d="M753.37797 268.521842l256.957652 453.093464c25.58611 45.104657 12.939262 102.052029-27.706103 131.878123l-8.479968 5.555841-256.592135 150.884949c-44.373626 26.097833-100.151346 13.158571-129.538822-28.144722l-5.482738-8.626174-25.293698-44.592935a25.58611 25.58611 0 0 1-3.289643-14.328222l0.804135-4.897913 120.474029-457.772066 51.39153-179.833805a14.620635 14.620635 0 0 1 26.755761-3.21654z" fill="#B6D0FC" ></path><path d="M359.644283 1019.437631a98.61618 98.61618 0 0 0 120.98575-71.129387l166.163511-631.611411C682.17548 182.479408 603.955085 44.606825 472.150065 8.640064 340.418148-27.326697 205.031073 52.282658 169.72224 186.500083L3.485626 818.038391a100.809275 100.809275 0 0 0 69.886633 123.251949l286.272024 78.074188z m35.820554-719.262115a88.235529 88.235529 0 0 1-61.114252-107.827179A86.261744 86.261744 0 0 1 440.203979 130.137537c46.054999 12.573746 73.468688 60.82184 61.114252 107.754076a86.261744 86.261744 0 0 1-105.853394 62.283903z" fill="#5091FF" ></path></symbol><symbol id="icon-jilu" viewBox="0 0 1024 1024"><path d="M78.769231 691.751385v302.867692c0 16.226462 13.154462 29.380923 29.380923 29.380923h886.468923a29.380923 29.380923 0 0 0 29.380923-29.380923V324.765538a29.380923 29.380923 0 0 0-52.932923-17.644307L676.233846 701.44a29.380923 29.380923 0 0 1-41.353846 5.828923L468.440615 580.686769a29.380923 29.380923 0 0 0-41.747692 6.301539L298.535385 767.684923a29.380923 29.380923 0 0 1-42.535385 5.828923L126.739692 668.829538a29.380923 29.380923 0 0 0-47.891692 22.843077z" fill="#5091FF" ></path><path d="M225.043692 630.153846a78.690462 78.690462 0 0 1-48.679384-16.856615L30.089846 498.294154a78.769231 78.769231 0 0 1 97.358769-123.825231l81.762462 64.196923 131.544615-182.272a78.769231 78.769231 0 0 1 113.112616-15.36L601.560615 359.187692 751.458462 184.083692l-3.072 0.393846A78.769231 78.769231 0 1 1 727.591385 28.356923l207.241846-27.648a78.769231 78.769231 0 0 1 70.262154 129.260308L671.665231 519.640615a78.690462 78.690462 0 0 1-109.016616 10.24l-142.572307-114.136615-131.15077 181.720615a78.769231 78.769231 0 0 1-63.803076 32.689231z" fill="#B6D0FC" ></path></symbol><symbol id="icon-shu" viewBox="0 0 1102 1024"><path d="M0 1.304362m61.279822 0l122.480878 0q61.279822 0 61.279821 61.279822l0 857.602442q0 61.279822-61.279821 61.279822l-122.480878 0q-61.279822 0-61.279822-61.279822l0-857.602442q0-61.279822 61.279822-61.279822Z" fill="#5091FF" ></path><path d="M306.320343 1.304362m61.279822 0l122.480878 0q61.279822 0 61.279821 61.279822l0 857.602442q0 61.279822-61.279821 61.279822l-122.480878 0q-61.279822 0-61.279822-61.279822l0-857.602442q0-61.279822 61.279822-61.279822Z" fill="#5091FF" ></path><path d="M658.009809 33.913419L776.394863 2.092021a61.279822 61.279822 0 0 1 75.063843 43.32121l221.962131 828.459082a61.279822 61.279822 0 0 1-43.321211 74.985078l-118.385054 31.742632a61.279822 61.279822 0 0 1-74.985077-43.32121L614.688598 108.898497a61.279822 61.279822 0 0 1 43.321211-75.063844z" fill="#B6D0FC" ></path></symbol><symbol id="icon-tuijian" viewBox="0 0 1097 1024"><path d="M729.526857 1015.442286a99.474286 99.474286 0 0 1-40.96-9.216c-66.706286-30.72-165.595429-77.385143-206.262857-96.768-69.046857 31.670857-138.093714 63.488-207.140571 95.378285-31.744 13.750857-62.683429 11.922286-85.577143-4.388571-21.577143-15.36-32.256-41.837714-29.403429-72.411429 8.192-71.533714 21.942857-169.398857 27.062857-205.750857-57.197714-59.172571-113.590857-119.222857-169.033143-179.931428a67.437714 67.437714 0 0 1-14.116571-69.266286c10.020571-26.331429 35.84-45.056 69.339429-49.810286l219.355428-39.131428C313.051429 349.622857 373.028571 248.246857 413.037714 182.052571c33.792-61.659429 67.218286-61.659429 84.845715-55.442285 19.163429 6.144 37.302857 24.356571 55.442285 56.100571 39.058286 65.755429 98.011429 167.058286 117.979429 201.435429l217.234286 39.350857c31.963429 4.608 57.417143 23.259429 67.291428 49.737143a67.730286 67.730286 0 0 1-13.458286 68.973714c-55.076571 61.220571-110.957714 121.417143-167.570285 180.955429 4.900571 36.132571 18.285714 134.290286 26.989714 205.458285 3.364571 31.451429-7.168 58.221714-29.037714 73.801143-12.653714 8.704-27.794286 13.238857-43.154286 13.019429z" fill="#5091FF" ></path><path d="M1021.805714 215.698286a26.770286 26.770286 0 0 1-11.629714 3.364571c-21.211429 1.389714-52.882286 3.072-65.828571 3.657143l-36.644572 55.076571c-5.778286 8.192-13.677714 12.141714-21.869714 10.971429-7.68-0.950857-14.409143-6.436571-18.432-15.067429-8.923429-20.187429-20.626286-48.274286-24.868572-58.660571a2543.689143 2543.689143 0 0 1-69.558857-23.771429 21.942857 21.942857 0 0 1-14.189714-16.457142 24.137143 24.137143 0 0 1 9.508571-23.186286l48.274286-41.764572a7717.302857 7717.302857 0 0 1-1.316571-71.021714c-1.170286-21.211429 7.094857-26.038857 12.434285-26.843428 5.705143-1.170286 12.946286 1.097143 22.308572 6.948571 19.748571 11.995429 49.956571 30.573714 60.196571 36.864l59.830857-20.553143a23.625143 23.625143 0 0 1 24.283429 3.657143c5.851429 5.046857 8.630857 12.873143 7.314286 20.260571-4.242286 24.137143-8.777143 48.274286-13.677715 72.192 6.802286 8.923429 25.234286 33.133714 38.326858 50.907429 5.705143 7.899429 7.168 16.530286 4.169142 23.771429a20.114286 20.114286 0 0 1-8.704 9.654857zM133.705143 278.381714a13.385143 13.385143 0 0 1-4.388572-4.169143c-5.851429-8.850286-14.482286-22.162286-17.993142-27.648-10.971429-0.731429-21.942857-1.462857-32.987429-2.048-4.973714-0.438857-8.704-2.925714-10.24-6.729142-1.462857-3.657143-0.731429-7.899429 1.901714-11.702858 6.582857-8.996571 15.725714-21.065143 19.163429-25.526857a1271.881143 1271.881143 0 0 1-7.021714-36.059428 10.971429 10.971429 0 0 1 3.584-10.24 12.068571 12.068571 0 0 1 12.434285-1.682286l30.134857 10.459429c5.12-3.145143 20.333714-12.361143 30.354286-18.285715 8.923429-5.851429 13.092571-3.437714 14.774857-1.389714 1.901714 2.194286 2.779429 5.924571 2.56 11.483429l-0.877714 35.254857 23.844571 20.772571c3.584 2.925714 5.339429 7.168 4.461715 11.410286a10.971429 10.971429 0 0 1-6.948572 8.192 1293.165714 1293.165714 0 0 1-34.669714 12.141714c-2.194286 5.193143-8.045714 19.236571-12.434286 29.330286-2.048 4.388571-5.412571 7.314286-9.289143 7.753143a10.020571 10.020571 0 0 1-6.363428-1.316572z" fill="#B6D0FC" ></path></symbol><symbol id="icon-chuangjianzhe" viewBox="0 0 1024 1024"><path d="M512.000731 551.350857c150.016 0 271.652571-123.392 271.652572-275.675428V68.900571A68.461714 68.461714 0 0 0 715.776731 0H512.000731C361.984731 0 240.34816 123.465143 240.34816 275.748571c0 152.137143 121.636571 275.602286 271.652571 275.602286z" fill="#B6D0FC" ></path><path d="M240.34816 610.450286h543.305143c112.566857 0 203.776 92.598857 203.776 206.774857v137.874286c0 38.034286-30.427429 68.900571-67.949714 68.900571H104.595017A68.461714 68.461714 0 0 1 36.57216 955.099429v-137.874286c0-114.176 91.209143-206.774857 203.776-206.774857z" fill="#5091FF" ></path></symbol><symbol id="icon-bangdingshoujihao" viewBox="0 0 1024 1024"><path d="M728.15 898.72H297.89c-23.71 0-43-19.29-43-43V167.99c0-23.71 19.29-43 43-43h430.26c23.71 0 43 19.29 43 43v687.73c0 23.71-19.29 43-43 43zM297.89 130.99c-20.4 0-37 16.6-37 37v687.73c0 20.4 16.6 37 37 37h430.26c20.4 0 37-16.6 37-37V167.99c0-20.4-16.6-37-37-37H297.89z" fill="#161616" ></path><path d="M691.33 745.76h-358c-18.2 0-33-14.8-33-33V221.78c0-18.2 14.8-33 33-33h358c18.2 0 33 14.8 33 33v490.98c0 18.2-14.8 33-33 33z m-358-550.98c-14.89 0-27 12.11-27 27v490.98c0 14.89 12.11 27 27 27h358c14.89 0 27-12.11 27-27V221.78c0-14.89-12.11-27-27-27h-358z" fill="#161616" ></path><path d="M512.38 870.46c-26.84 0-48.67-21.83-48.67-48.67 0-26.84 21.84-48.67 48.67-48.67 26.84 0 48.67 21.83 48.67 48.67 0 26.84-21.83 48.67-48.67 48.67z m0-91.35c-23.53 0-42.67 19.14-42.67 42.67s19.14 42.67 42.67 42.67 42.67-19.14 42.67-42.67c0-23.52-19.14-42.67-42.67-42.67z" fill="#0E89F3" ></path></symbol><symbol id="icon-liulan" viewBox="0 0 1024 1024"><path d="M510.557138 204.354248c-302.839283 0-458.323497 306.150702-458.323497 306.150702s117.330242 306.189587 458.323497 306.189587c308.802088 0 458.300984-304.995389 458.300984-304.995389S818.167075 204.354248 510.557138 204.354248L510.557138 204.354248 510.557138 204.354248zM511.245823 701.866279c-110.729917 0-190.772928-83.72589-190.772928-191.364399 0-107.647719 80.049151-191.352119 190.772928-191.352119 110.723777 0 190.763718 83.697237 190.763718 191.352119C702.010565 618.140389 621.970624 701.866279 511.245823 701.866279L511.245823 701.866279 511.245823 701.866279zM511.245823 395.675668c-63.286372 0.145309-114.460892 53.321416-114.460892 114.827235 0 61.473073 51.175543 114.821095 114.460892 114.821095 63.282279 0 114.453728-53.352115 114.453728-114.821095C625.703645 448.975595 574.529125 395.556964 511.245823 395.675668L511.245823 395.675668 511.245823 395.675668z"  ></path></symbol><symbol id="icon-pinglun" viewBox="0 0 1024 1024"><path d="M896 192H128c-35.2 0-64 28.8-64 64v448c0 35.2 28.8 64 64 64h256l128 64 128-64h256c35.2 0 64-28.8 64-64V256c0-35.2-28.8-64-64-64zM304 528c-26.5 0-48-21.5-48-48s21.5-48 48-48 48 21.5 48 48-21.5 48-48 48z m208 0c-26.5 0-48-21.5-48-48s21.5-48 48-48 48 21.5 48 48-21.5 48-48 48z m208 0c-26.5 0-48-21.5-48-48s21.5-48 48-48 48 21.5 48 48-21.5 48-48 48z"  ></path></symbol><symbol id="icon-bokeyuan" viewBox="0 0 1024 1024"><path d="M863.418182 698.181818c-13.963636 0-23.272727 9.309091-23.272727 23.272727v186.181819c0 39.563636-25.6 69.818182-69.818182 69.818181H134.981818c-41.890909 0-86.109091-30.254545-86.109091-69.818181V114.036364C48.872727 74.472727 93.090909 46.545455 134.981818 46.545455h635.345455c44.218182 0 69.818182 30.254545 69.818182 69.818181v325.818182c0 13.963636 9.309091 23.272727 23.272727 23.272727s23.272727-9.309091 23.272727-23.272727V116.363636c0-65.163636-46.545455-116.363636-116.363636-116.363636H134.981818C69.818182 0 2.327273 46.545455 2.327273 114.036364V907.636364c0 69.818182 69.818182 116.363636 132.654545 116.363636h635.345455c69.818182 0 116.363636-51.2 116.363636-116.363636v-186.181819c0-13.963636-11.636364-23.272727-23.272727-23.272727z m153.6-260.654545c-9.309091-9.309091-23.272727-9.309091-32.581818 0L512 889.018182c-9.309091 9.309091-9.309091 23.272727 0 32.581818 9.309091 9.309091 23.272727 9.309091 32.581818 0l472.436364-451.490909c6.981818-6.981818 6.981818-23.272727 0-32.581818zM630.690909 302.545455h-372.363636c-13.963636 0-23.272727 9.309091-23.272728 23.272727s9.309091 23.272727 23.272728 23.272727h372.363636c13.963636 0 23.272727-9.309091 23.272727-23.272727s-11.636364-23.272727-23.272727-23.272727z m0 232.727272h-372.363636c-13.963636 0-23.272727 9.309091-23.272728 23.272728s9.309091 23.272727 23.272728 23.272727h372.363636c13.963636 0 23.272727-9.309091 23.272727-23.272727s-11.636364-23.272727-23.272727-23.272728z" fill="#666666" ></path></symbol><symbol id="icon-weibiaoti105" viewBox="0 0 1024 1024"><path d="M 936.038 145.126 c -109.38 -118.519 -286.737 -118.519 -396.083 0 l -27.9296 30.2763 l -27.9467 -30.2763 c -109.363 -118.519 -286.703 -118.519 -396.066 0 c -109.38 118.511 -109.38 310.647 0 429.158 l 27.9296 30.2507 l 396.083 365.414 l 396.066 -365.414 l 27.9467 -30.2507 C 1045.4 455.774 1045.4 263.637 936.038 145.126 L 936.038 145.126 Z" fill="#8a8a8a" ></path></symbol><symbol id="icon-guanzhu" viewBox="0 0 1028 1024"><path d="M726.109091 32.581818c-83.781818 0-158.254545 32.581818-214.109091 93.090909-55.854545-60.509091-130.327273-93.090909-214.109091-93.090909C134.981818 32.581818 0 176.872727 0 353.745455c0 93.090909 37.236364 181.527273 107.054545 246.690909l353.745455 367.709091c13.963636 13.963636 32.581818 23.272727 51.2 23.272727 18.618182 0 37.236364-9.309091 51.2-23.272727l358.4-363.054546c65.163636-65.163636 107.054545-158.254545 107.054545-251.345454-4.654545-176.872727-139.636364-321.163636-302.545454-321.163637z m144.290909 516.654546L512 912.290909l-358.4-367.709091c-51.2-51.2-83.781818-116.363636-83.781818-190.836363 0-134.981818 102.4-242.036364 228.072727-242.036364 97.745455 0 176.872727 65.163636 214.109091 153.6 32.581818-88.436364 116.363636-153.6 214.109091-153.6 125.672727 0 228.072727 107.054545 228.072727 242.036364 0 74.472727-32.581818 144.290909-83.781818 195.490909z" fill="#707070" ></path></symbol><symbol id="icon-tongji" viewBox="0 0 1024 1024"><path d="M210.823529 301.176471A90.352941 90.352941 0 0 1 301.176471 391.529412v542.117647A90.352941 90.352941 0 0 1 210.823529 1024h-120.470588A90.352941 90.352941 0 0 1 0 933.647059v-542.117647A90.352941 90.352941 0 0 1 90.352941 301.176471h120.470588z m361.411765-301.176471A90.352941 90.352941 0 0 1 662.588235 90.352941v843.294118A90.352941 90.352941 0 0 1 572.235294 1024h-120.470588A90.352941 90.352941 0 0 1 361.411765 933.647059v-843.294118A90.352941 90.352941 0 0 1 451.764706 0h120.470588z m361.411765 542.117647a90.352941 90.352941 0 0 1 90.352941 90.352941v301.176471a90.352941 90.352941 0 0 1-90.352941 90.352941h-120.470588a90.352941 90.352941 0 0 1-90.352942-90.352941v-301.176471A90.352941 90.352941 0 0 1 813.176471 542.117647h120.470588z m-722.82353-180.705882h-120.470588a30.117647 30.117647 0 0 0-29.635765 24.69647L60.235294 391.529412v542.117647a30.117647 30.117647 0 0 0 24.696471 29.635765L90.352941 963.764706h120.470588a30.117647 30.117647 0 0 0 29.635765-24.696471L240.941176 933.647059v-542.117647a30.117647 30.117647 0 0 0-30.117647-30.117647z m361.411765-301.176471h-120.470588a30.117647 30.117647 0 0 0-29.635765 24.696471L421.647059 90.352941v843.294118a30.117647 30.117647 0 0 0 24.69647 29.635765L451.764706 963.764706h120.470588a30.117647 30.117647 0 0 0 29.635765-24.696471L602.352941 933.647059v-843.294118a30.117647 30.117647 0 0 0-30.117647-30.117647z m361.411765 542.117647h-120.470588a30.117647 30.117647 0 0 0-29.635765 24.696471L783.058824 632.470588v301.176471a30.117647 30.117647 0 0 0 24.69647 29.635765l5.421177 0.481882h120.470588a30.117647 30.117647 0 0 0 29.635765-24.696471L963.764706 933.647059v-301.176471a30.117647 30.117647 0 0 0-30.117647-30.117647z" fill="#666666" ></path></symbol><symbol id="icon-zhuye" viewBox="0 0 1024 1024"><path d="M981.929813 524.629333c-9.756444 0-19.626667-3.413333-27.534222-10.211555L538.395591 154.965333l-4.494222-4.124444a31.488 31.488 0 0 0-43.320889 0c-1.251556 1.28-2.816 2.702222-4.494222 4.124444L69.944036 514.417778a42.097778 42.097778 0 0 1-59.676445-4.551111 42.723556 42.723556 0 0 1 4.522667-60.017778L430.761813 90.339556c0.284444-0.284444 1.137778-0.995556 1.422223-1.422223a115.484444 115.484444 0 0 1 159.687111 0l1.422222 1.422223L1009.23648 449.820444c17.777778 15.36 19.768889 42.183111 4.522667 60.046223-8.192 9.671111-20.024889 14.791111-31.857778 14.791111zM769.023147 995.555556h-77.027556c-61.354667 0-111.303111-50.261333-111.303111-112.014223V762.026667a27.192889 27.192889 0 0 0-26.652444-26.851556H477.040924a26.823111 26.823111 0 0 0-26.652444 26.851556v121.514666c0 61.752889-49.948444 112.014222-111.303111 112.014223H256.283591c-61.354667 0-111.303111-50.261333-111.303111-112.014223v-392.248889a42.382222 42.382222 0 0 1 42.325333-42.609777 42.382222 42.382222 0 0 1 42.325334 42.609777v392.248889c0 14.791111 11.975111 26.823111 26.652444 26.823111h82.801778a26.823111 26.823111 0 0 0 26.652444-26.823111V762.026667c0-61.781333 49.948444-112.014222 111.303111-112.014223h77.027556c61.354667 0 111.303111 50.232889 111.303111 112.014223v121.514666c0 14.791111 11.975111 26.823111 26.652445 26.823111h77.027555a26.823111 26.823111 0 0 0 26.652445-26.823111v-392.248889a42.382222 42.382222 0 0 1 42.325333-42.609777 42.382222 42.382222 0 0 1 42.325333 42.609777v392.248889c0 61.752889-49.948444 112.014222-111.303111 112.014223z"  ></path></symbol><symbol id="icon-fuzhi1" viewBox="0 0 1024 1024"><path d="M869.864727 46.545455A107.706182 107.706182 0 0 1 977.454545 154.112v599.412364A107.706182 107.706182 0 0 1 869.864727 861.090909H721.454545v8.797091A107.682909 107.682909 0 0 1 613.888 977.454545H154.112A107.682909 107.682909 0 0 1 46.545455 869.888V270.475636A107.682909 107.682909 0 0 1 154.112 162.909091H302.545455v-8.797091A107.706182 107.706182 0 0 1 410.135273 46.545455h459.729454zM154.135273 907.636364h459.729454A37.841455 37.841455 0 0 0 651.636364 869.888V270.475636c0-20.805818-16.942545-37.748364-37.748364-37.748363H154.135273C133.329455 232.727273 116.363636 249.669818 116.363636 270.475636v599.412364C116.363636 890.717091 133.329455 907.636364 154.135273 907.636364zM907.636364 753.524364V154.112C907.636364 133.306182 890.670545 116.363636 869.864727 116.363636H410.135273C389.329455 116.363636 372.363636 133.306182 372.363636 154.112V162.909091h241.524364A107.682909 107.682909 0 0 1 721.454545 270.475636V791.272727h148.410182c20.805818 0 37.771636-16.919273 37.771637-37.748363zM523.636364 372.363636a34.909091 34.909091 0 0 1 0 69.818182h-279.272728a34.909091 34.909091 0 0 1 0-69.818182h279.272728z m0 162.909091a34.909091 34.909091 0 0 1 0 69.818182h-279.272728a34.909091 34.909091 0 0 1 0-69.818182h279.272728z m-93.090909 162.909091a34.909091 34.909091 0 0 1 0 69.818182h-186.181819a34.909091 34.909091 0 0 1 0-69.818182h186.181819z" fill="#797979" ></path></symbol><symbol id="icon-projectx" viewBox="0 0 1024 1024"><path d="M1001.245241 289.985422H773.689685a45.511111 45.511111 0 0 1-45.511111-45.511111V22.755556H318.578574a56.888889 56.888889 0 0 0-56.888889 56.888888v170.666667h-22.755555V79.644444a79.644444 79.644444 0 0 1 79.644444-79.644444h432.355556l273.066666 273.066667v637.155555a79.644444 79.644444 0 0 1-79.644444 79.644445H398.223019v-22.755556h546.133333a56.888889 56.888889 0 0 0 56.888889-56.888889V289.985422z m-17.214578-22.755555L750.93413 34.133333v198.9632a34.133333 34.133333 0 0 0 34.133333 34.133334h198.9632z m-852.184178 626.688c0-24.735289 7.736889-48.776533 21.959111-69.0176V638.850844A251.448889 251.448889 0 0 1 0.000796 406.528c0-91.113244 49.664-175.604622 129.6384-220.478578a31.061333 31.061333 0 0 1 31.175112 0.364089c9.602844 5.688889 15.485156 16.0768 15.485155 27.295289v104.174933c0 6.8608 5.768533 12.674844 12.572445 12.674845h124.5184c6.803911 0 12.538311-5.802667 12.538311-12.674845v-104.174933c0-11.218489 5.893689-21.6064 15.473777-27.295289a31.288889 31.288889 0 0 1 31.175112-0.364089c79.985778 44.896711 129.683911 129.365333 129.683911 220.478578a251.448889 251.448889 0 0 1-153.827556 232.311467v185.981155a120.0128 120.0128 0 0 1 21.981867 69.074489c0 66.332444-53.498311 120.263111-119.284622 120.263111s-119.284622-53.930667-119.284623-120.263111z m23.415467 2.025244c-0.113778 50.972444 43.190044 96.119467 95.891911 96.745245 47.183644 1.046756 96.6656-40.391111 95.311645-96.745245 1.046756-37.364622-12.686222-56.866133-22.414223-71.042844V627.143111C406.369508 605.377422 484.887552 498.346667 477.867463 410.350933c-0.227556-88.211911-51.780267-170.609778-102.741333-201.636977-6.644622-3.811556-17.1008-9.227378-23.643022-5.279289-6.5536 3.982222-5.006222 15.7696-5.006223 23.620266v115.325156c0 4.801422-3.925333 8.863289-8.567466 8.863289h-176.583111c-4.642133 0-8.578844-4.061867-8.578845-8.863289l2.503111-115.325156c0-7.850667 0.159289-19.638044-6.382933-23.620266-6.5536-3.982222-22.710044 6.826667-29.343289 10.660977-51.245511 34.4064-95.459556 116.155733-95.516444 196.266667 0 71.600356 58.015289 187.665067 153.349688 208.930133v205.596445c-9.716622 14.153956-23.426844 34.633956-22.095644 71.042844zM159.289685 466.488889h182.044445a11.377778 11.377778 0 0 1 0 22.755555H159.289685a11.377778 11.377778 0 0 1 0-22.755555z m91.022223 489.244444a45.511111 45.511111 0 1 1 0-91.022222 45.511111 45.511111 0 0 1 0 91.022222z m319.670044-351.687111h301.579378a11.377778 11.377778 0 1 1 0 22.755556H569.981952a11.377778 11.377778 0 0 1 0-22.755556zM557.511908 816.810667h301.579377a11.377778 11.377778 0 1 1 0 22.755555H557.511908a11.377778 11.377778 0 0 1 0-22.755555zM632.35493 409.6h239.2064a11.377778 11.377778 0 1 1 0 22.755556H632.35493a11.377778 11.377778 0 1 1 0-22.755556z" fill="#D8D8D8" ></path></symbol><symbol id="icon-hostingx2" viewBox="0 0 1280 1024"><path d="M773.033088 555.6864l-76.352 122.176a108.8 108.8 0 1 1-154.112 64.064l-129.7024-105.024A108.416 108.416 0 0 1 339.241088 665.6a108.4288 108.4288 0 0 1-43.6352-9.1008l-112.1664 179.5072a108.8 108.8 0 1 1-20.6336-15.296l110.72-177.1904a108.8 108.8 0 1 1 156.032-26.0352l123.9296 100.352A108.736 108.736 0 0 1 646.441088 665.6c8.8832 0 17.5232 1.0624 25.792 3.072l78.208-125.1456a108.8 108.8 0 1 1 22.592 12.16zM108.841088 998.4a83.2 83.2 0 1 0 0-166.4 83.2 83.2 0 0 0 0 166.4z m230.4-358.4a83.2 83.2 0 1 0 0-166.4 83.2 83.2 0 0 0 0 166.4z m307.2 217.6a83.2 83.2 0 1 0 0-166.4 83.2 83.2 0 0 0 0 166.4z m166.4-320a83.2 83.2 0 1 0 0-166.4 83.2 83.2 0 0 0 0 166.4zM294.441088 985.6v-25.6h908.8a51.2 51.2 0 0 0 51.2-51.2V281.6a51.2 51.2 0 0 0-51.2-51.2H769.615488c-24.5248-41.4592-58.5472-93.312-102.0672-155.584A115.2 115.2 0 0 0 573.122688 25.6H89.641088a51.2 51.2 0 0 0-51.2 51.2v652.8H12.841088V64a64 64 0 0 1 64-64h506.9056a115.2 115.2 0 0 1 94.6688 49.536c42.5216 61.312 76.3904 113.0752 101.6192 155.264H1216.041088a64 64 0 0 1 64 64v652.8a64 64 0 0 1-64 64H294.441088z" fill="#D8D8D8" ></path></symbol><symbol id="icon-communityx" viewBox="0 0 1293 1024"><path d="M620.078831 849.814501c16.571363 31.1353 49.862287 52.395146 88.218928 52.395146h46.601905l-10.468251 79.380868c0 4.971409 0.431125 4.971409 4.675011 3.327745 3.489417-1.347265 10.400888-6.830635 18.942549-12.044551l106.029775-70.664062h290.322189c54.914532 0 99.428175-43.584031 99.428175-97.353387V544.69934c0-41.819113-26.945305-77.494697-64.76304-91.263748v-34.867224c53.216977 6.992307 94.308567 52.960997 94.308567 108.629997v292.760738c0 60.519155-48.541967 109.55961-108.414435 109.55961H879.642954l-140.048223 92.045162a14.361848 14.361848 0 0 1-20.006889-4.284304 14.725609 14.725609 0 0 1-2.23646-9.606001l8.730279-78.141384h-38.343169c-49.633252 0-91.47931-33.722049-104.345694-79.717685h-79.54254l-234.96306 152.806825a24.250774 24.250774 0 0 1-37.319247-23.051709l14.644773-129.755116H181.880809c-100.452097 0-181.880809-81.428712-181.880809-181.880809V181.880809C0 81.428712 81.428712 0 181.880809 0h834.186224c100.452097 0 181.880809 81.428712 181.880808 181.880809v486.052883c0 100.452097-81.428712 181.880809-181.880808 181.880809H620.078831z m-129.889843-29.936234h507.11064c95.925286 0 173.702909-75.98576 173.702908-169.701531V196.660308C1171.002536 102.931065 1093.224914 26.945305 997.299628 26.945305H200.648214C104.722928 26.945305 26.945305 102.931065 26.945305 196.660308v453.516428c0 93.729243 77.76415 169.701531 173.702909 169.701531h81.374821l-18.28239 138.391087c0 8.662916 0.754469 8.662916 8.164428 5.79324 6.103112-2.344242 18.174608-11.896352 33.102307-20.97692l185.181608-123.207407zM323.34366 485.01549a80.835915 80.835915 0 1 1 0-161.67183 80.835915 80.835915 0 0 1 0 161.67183z m0-26.945305a53.89061 53.89061 0 1 0 0-107.78122 53.89061 53.89061 0 0 0 0 107.78122z m269.45305 26.945305a80.835915 80.835915 0 1 1 0-161.67183 80.835915 80.835915 0 0 1 0 161.67183z m0-26.945305a53.89061 53.89061 0 1 0 0-107.78122 53.89061 53.89061 0 0 0 0 107.78122z m269.453049 26.945305a80.835915 80.835915 0 1 1 0-161.67183 80.835915 80.835915 0 0 1 0 161.67183z m0-26.945305a53.89061 53.89061 0 1 0 0-107.78122 53.89061 53.89061 0 0 0 0 107.78122z" fill="#D8D8D8" ></path></symbol><symbol id="icon-detectionx" viewBox="0 0 1276 1024"><path d="M1170.28541 319.168748H26.597396v531.947914a53.194791 53.194791 0 0 0 53.194791 53.194791h598.441403v26.597396H79.792187a79.792187 79.792187 0 0 1-79.792187-79.792187V79.792187a79.792187 79.792187 0 0 1 79.792187-79.792187h1037.298432a79.792187 79.792187 0 0 1 79.792187 79.792187v279.272655h-26.597396v-39.896094z m0-26.597395V79.792187a53.194791 53.194791 0 0 0-53.194791-53.194791H79.792187a53.194791 53.194791 0 0 0-53.194791 53.194791v212.779166h1143.688014z" fill="#D8D8D8" ></path><path d="M1003.692622 1023.999734c-1.569246 0-3.138493-0.10639-4.654544-0.345766C906.479141 1010.195686 731.428381 934.060641 731.428381 742.333314V482.875719c0-16.54358 11.277296-30.826382 27.009656-34.044667l238.711626-49.205182c4.322077-0.891013 8.777141-0.891013 13.099217 0l238.711627 49.205182c15.73236 3.218285 27.009655 17.501086 27.009655 34.044667v259.457595c0 191.727327-175.05076 267.862372-267.609697 281.320654a30.015161 30.015161 0 0 1-4.654544 0.345766z m0-26.597396c1.409662 0 2.819324-0.093091 4.202389-0.30587 83.529121-12.327893 241.477755-81.973174 241.477755-257.396296v-237.381757c0-15.133918-10.173504-28.193239-24.376513-31.132252l-215.38571-45.016092a29.20394 29.20394 0 0 0-11.835841 0L782.415589 471.172865C768.199281 474.125176 758.025777 487.184497 758.025777 502.331714v237.381756c0 175.409825 157.948634 245.068404 241.477756 257.382998 1.356467 0.212779 2.779428 0.30587 4.189089 0.30587z" fill="#D8D8D8" ></path><path d="M159.584374 146.285676m-39.896093 0a39.896094 39.896094 0 1 0 79.792187 0 39.896094 39.896094 0 1 0-79.792187 0Z" fill="#D8D8D8" ></path><path d="M305.87005 146.285676m-39.896093 0a39.896094 39.896094 0 1 0 79.792187 0 39.896094 39.896094 0 1 0-79.792187 0Z" fill="#D8D8D8" ></path><path d="M452.155727 146.285676m-39.896094 0a39.896094 39.896094 0 1 0 79.792187 0 39.896094 39.896094 0 1 0-79.792187 0Z" fill="#D8D8D8" ></path><path d="M412.259633 585.142705h26.597396l-39.896094 186.18177h-26.597395zM332.387654 492.238002L199.480468 627.033603l132.907186 134.782303-13.298698 13.48488L172.883072 627.033603 319.088956 478.753122l13.298698 13.48488z" fill="#D8D8D8" ></path><path d="M997.402338 505.350518m13.298698 0l0 0q13.298698 0 13.298698 13.298698l0 372.36354q0 13.298698-13.298698 13.298697l0 0q-13.298698 0-13.298698-13.298697l0-372.36354q0-13.298698 13.298698-13.298698Z" fill="#D8D8D8" ></path></symbol><symbol id="icon-lianjie" viewBox="0 0 1024 1024"><path d="M722.664727 628.736a34.955636 34.955636 0 0 1-24.692363-59.601455l154.949818-154.926545c68.049455-68.049455 68.049455-178.781091 0-246.853818-68.072727-68.049455-178.850909-68.049455-246.877091 0l-154.926546 154.926545a34.909091 34.909091 0 1 1-49.338181-49.361454L556.683636 117.992727c95.278545-95.232 250.321455-95.278545 345.6 0 95.278545 95.278545 95.278545 250.321455 0 345.576728l-154.926545 154.949818a34.792727 34.792727 0 0 1-24.669091 10.216727zM290.816 973.707636a243.665455 243.665455 0 0 1-172.823273-71.447272c-95.278545-95.301818-95.278545-250.321455 0-345.6l138.472728-138.449455a34.909091 34.909091 0 1 1 49.384727 49.361455l-138.472727 138.449454c-68.072727 68.049455-68.072727 178.804364 0 246.877091 68.072727 68.049455 178.827636 68.002909 246.853818 0l138.472727-138.496a34.909091 34.909091 0 1 1 49.338182 49.361455l-138.426182 138.472727a243.595636 243.595636 0 0 1-172.8 71.447273z m137.076364-346.414545a34.955636 34.955636 0 0 1-24.692364-59.601455l164.538182-164.538181a34.909091 34.909091 0 1 1 49.361454 49.361454l-164.538181 164.561455a34.792727 34.792727 0 0 1-24.669091 10.24z" fill="#797979" ></path></symbol><symbol id="icon-nenghaofenxix" viewBox="0 0 1024 1024"><path d="M314.757461 943.248803c7.309511 2.945859 10.239617 11.767683 7.309512 19.124455-2.914353 7.356771-11.688917 10.30263-18.998429 7.356771-39.477663-19.124454-78.955325-42.675574-114.053582-72.086905C-5.443245 734.329106-46.385961 456.25261 80.821591 245.867859c4.395159-7.356771 13.15397-8.821824 20.479235-4.410912 7.309511 4.410912 8.758811 13.232736 4.379405 20.589508-119.882287 200.097873-76.025219 463.460828 102.348913 614.991408 32.168151 25.016172 68.715708 48.551539 106.728317 66.21094m-130.121904-782.716338a14.067659 14.067659 0 0 1-20.479235 0 14.288204 14.288204 0 0 1 0-20.589507C346.925613-36.619549 636.438974-48.387232 835.276586 117.872644c5.844458 5.875965 7.309511 14.713542 1.465053 20.589508-5.860212 5.891718-14.634776 7.356771-20.479234 1.480806-185.683643-155.957247-456.182823-147.135422-631.626848 20.589507m717.891685 73.567711c-4.379406-7.356771-2.914353-16.178595 2.930105-20.60526 7.309511-4.410912 16.068322-2.930106 20.479235 2.945859 127.191799 182.438472 121.34734 435.498796-27.788746 614.991409a514.454121 514.454121 0 0 1-194.458207 144.17381c-7.309511 2.945859-16.084076 0-19.014182-7.356771-2.930106-7.356771 0-16.178595 7.309512-19.124455 70.180761-29.427084 133.052011-76.497817 182.76929-135.351986 138.896469-164.779071 149.136086-403.125852 27.772993-579.672606"  ></path><path d="M285.078325 641.180096a15.438192 15.438192 0 0 1-20.573754 1.512313 16.509414 16.509414 0 0 1-1.465053-21.156625s132.264348-151.073737 208.699152-238.6776a15.438192 15.438192 0 0 1 20.573753-1.512312c5.875965 6.049251 5.875965 15.107374 1.465053 21.156624L285.094078 641.180096m283.668903-235.668728a14.886828 14.886828 0 0 1 0-21.140871 13.941633 13.941633 0 0 1 20.573754 0A76567.320452 76567.320452 0 0 0 806.841957 618.511159a14.886828 14.886828 0 0 1 0 21.140871 13.941633 13.941633 0 0 1-20.573754 0L568.747228 405.527121"  ></path><path d="M527.694239 400.438819c25.063432 0 44.2509-18.982675 44.2509-43.809808S552.741918 312.803449 527.694239 312.803449c-25.063432 0-44.2509 18.998428-44.250899 43.825562S502.64656 400.438819 527.694239 400.438819z m0 29.222292c-41.289287 0-73.725244-32.136645-73.725244-73.0321S486.389199 283.59691 527.694239 283.59691c41.289287 0 73.725244 32.136645 73.725244 73.032101s-32.435957 73.0321-73.725244 73.0321zM240.118529 695.481574c16.225855 0 29.490098-13.15397 29.490097-29.222292s-13.279996-29.206539-29.490097-29.206539c-16.225855 0-29.505851 13.15397-29.505851 29.206539 0 16.068322 13.279996 29.222292 29.505851 29.222292z m0 29.206539C207.666819 724.688113 181.12258 698.395926 181.12258 666.259282s26.544238-58.413078 58.995949-58.413078 58.980195 26.292186 58.980195 58.413078c0 32.136645-26.544238 58.428831-58.980195 58.428831z m575.151421-29.206539c16.225855 0 29.505851-13.15397 29.505851-29.222292s-13.279996-29.206539-29.505851-29.206539-29.490098 13.15397-29.490098 29.206539c0 16.068322 13.279996 29.222292 29.490098 29.222292z m0 29.206539c-32.45171 0-58.980195-26.292186-58.980195-58.428831s26.544238-58.413078 58.980195-58.413078c32.45171 0 58.995948 26.292186 58.995948 58.413078C874.265898 698.395926 847.72166 724.688113 815.26995 724.688113zM274.035291 425.265953l209.408049 172.340634c5.907471 5.860212 7.388278 14.619023 1.480806 20.463481-5.891718 5.828705-14.745049 7.293758-20.636767 1.465053L254.847824 447.194487c-5.907471-5.860212-7.372524-14.619023-1.480806-20.463481 4.426665-5.828705 13.279996-7.293758 20.636767-1.465053z m296.429042 182.580251L781.353187 423.8009c5.907471-4.379406 16.225855-4.379406 20.636767 2.914352 4.442419 5.844458 4.442419 16.068322-2.930106 20.447728L588.15524 631.208284c-5.891718 4.379406-16.225855 4.379406-20.636767-2.914352-4.426665-5.844458-2.961612-16.068322 2.94586-20.447728z"  ></path><path d="M518.856662 579.285549c40.233819 0 71.850606 31.979112 71.850606 72.701282C590.707268 692.693247 559.090481 724.688113 518.856662 724.688113c-40.249572 0-71.866359-31.979112-71.86636-72.701282 0-40.72217 31.616787-72.717035 71.86636-72.717036zM238.606216 346.609939c31.616787 0 57.499389 26.181914 57.499389 58.161026 0 31.994865-25.882602 58.176779-57.499389 58.176779-31.616787 0-57.483636-26.181914-57.483636-58.176779C181.12258 372.791853 206.989429 346.609939 238.621969 346.609939z"  ></path><path d="M236.258981 429.31454c15.170387 0 27.5682-12.413567 27.5682-27.5682s-12.397813-27.5682-27.5682-27.568201-27.5682 12.413567-27.568201 27.568201 12.397813 27.5682 27.568201 27.5682z m0 27.5682a55.293933 55.293933 0 0 1-55.136401-55.1364 55.293933 55.293933 0 0 1 55.136401-55.136401 55.293933 55.293933 0 0 1 55.1364 55.136401 55.293933 55.293933 0 0 1-55.1364 55.1364zM819.129498 346.609939a55.293933 55.293933 0 0 1 55.1364 55.136401 55.293933 55.293933 0 0 1-55.1364 55.1364 55.293933 55.293933 0 0 1-55.1364-55.1364 55.293933 55.293933 0 0 1 55.1364-55.136401z"  ></path><path d="M815.458989 434.969959a29.521604 29.521604 0 0 0 29.395578-29.458591c0-16.194348-13.232736-29.458591-29.395578-29.458591a29.521604 29.521604 0 0 0-29.411331 29.458591c0 16.194348 13.232736 29.458591 29.411331 29.458591z m0 29.458591a59.027455 59.027455 0 0 1-58.822663-58.917182c0-32.388697 26.465472-58.901429 58.822663-58.901429A59.027455 59.027455 0 0 1 874.265898 405.527121c0 32.388697-26.465472 58.885676-58.806909 58.885676zM447.872485 1024c-8.821824 0-14.697789-5.891718-14.697789-14.729296 0-8.821824 5.875965-14.729296 14.697789-14.729295h1.480806c8.821824 0 14.697789 5.891718 14.697789 14.729295s-5.875965 14.729296-14.697789 14.729296h-1.480806z m60.287715 0c-8.821824 0-14.697789-5.891718-14.697789-14.729296 0-8.821824 5.875965-14.729296 14.697789-14.729295h1.465053c8.821824 0 14.713542 5.891718 14.713542 14.729295s-5.891718 14.729296-14.713542 14.729296h-1.465053z m60.287716 0c-8.821824 0-14.713542-5.891718-14.713543-14.729296 0-8.821824 5.891718-14.729296 14.713543-14.729295h1.465053c8.821824 0 14.697789 5.891718 14.697789 14.729295S578.734793 1024 569.912969 1024h-1.465053z"  ></path></symbol><symbol id="icon-healthmode" viewBox="0 0 1083 1024"><path d="M910.57414 517.322419c0-8.906419 7.513302-14.848 15.038511-14.848 9.025488 0 15.038512 5.941581 15.038512 14.848v1.488372c0 8.906419-7.525209 14.848-15.038512 14.848a14.978977 14.978977 0 0 1-15.038511-14.848v-1.488372m-4.524652 56.439069c1.512186-7.418047 9.037395-13.359628 16.550698-11.871255 7.525209 1.476465 13.538233 8.906419 12.026047 16.336372v1.488372c-1.500279 7.418047-9.013581 13.359628-16.538791 11.883163-7.513302 0-13.538233-7.429953-12.026047-17.824745m-12.026046 54.950698c3.000558-7.429953 10.51386-11.883163 18.03907-10.394791 7.525209 2.976744 12.026047 10.394791 10.525767 17.824745v1.488372c-3.000558 7.418047-10.525767 11.883163-18.050977 10.39479-9.013581-1.488372-13.526326-8.918326-10.525767-19.313116m-19.551256 53.474233c3.012465-7.429953 12.026047-10.394791 19.551256-7.429954 7.525209 2.976744 10.525767 11.883163 7.525209 19.313116v1.488372c-3.012465 7.429953-12.026047 10.394791-19.551256 7.429954-9.025488-2.976744-12.026047-11.883163-7.525209-20.801488m-28.576744 50.497488c4.524651-7.418047 13.538233-8.906419 21.063442-4.453209 7.513302 4.453209 9.013581 13.371535 4.500837 20.801488 0 0 0 1.476465-1.500279 1.476465-4.512744 7.429953-13.538233 8.918326-21.051535 4.465116-6.02493-5.953488-7.525209-14.859907-3.012465-22.28986m-34.589768 44.567814c6.013023-5.953488 15.038512-7.429953 21.051535-1.488372 6.02493 5.953488 7.525209 14.859907 1.512186 20.801488 0 0 0 1.476465-1.512186 1.476465-6.013023 5.953488-15.038512 7.429953-21.051535 1.488372-6.013023-5.941581-6.013023-14.848 0-22.277953m-40.60279 40.102698c6.013023-5.941581 16.538791-4.453209 21.051535 1.488372 6.013023 5.941581 4.512744 14.848-1.512186 20.789581 0 0-1.500279 0-1.50028 1.488372-6.013023 5.941581-16.550698 4.453209-21.051534-1.488372-6.02493-7.429953-4.524651-16.336372 3.000558-22.277953m-46.615814 32.672744c7.513302-4.453209 16.538791-2.964837 21.051535 4.465116 4.512744 7.418047 3.012465 16.336372-4.512745 20.789581 0 0-1.500279 0-1.500279 1.488373-7.525209 4.453209-16.550698 2.976744-21.063441-4.45321s-1.500279-16.348279 6.02493-22.28986m-51.140465 26.74307c7.513302-2.976744 16.550698 0 19.551255 7.429953 3.012465 7.418047 0 16.336372-7.525209 19.301209H683.460465c-7.525209 2.976744-16.550698 0-19.551256-7.418046-3.012465-5.953488 0-14.859907 9.025489-19.313116m-54.152931 19.313116c7.525209-1.488372 16.550698 2.976744 18.050977 10.394791 1.512186 7.429953-3.000558 16.336372-10.525767 17.824744h-1.500279c-7.525209 1.488372-16.550698-2.976744-18.050977-10.394791-1.500279-5.953488 3.012465-14.859907 12.026046-17.824744m-55.641302 11.883163c7.513302-1.488372 15.038512 4.453209 16.550698 13.359628 1.500279 7.429953-4.524651 14.859907-13.55014 16.348279h-1.500279c-7.525209 1.476465-15.038512-4.465116-16.550697-13.371535-1.500279-7.429953 4.524651-14.859907 13.538232-16.336372h1.512186m-57.153488 2.976744c9.025488 0 15.038512 7.418047 15.038511 14.848 0 8.906419-7.525209 14.848-15.038511 14.848h-1.512186a14.978977 14.978977 0 0 1-15.038512-14.848c0-8.918326 7.525209-14.859907 15.038512-14.859907h1.512186m-57.153489-4.453209c7.513302 1.488372 13.538233 8.906419 12.026047 16.336372-1.500279 7.429953-9.025488 13.371535-16.550698 11.883162h-1.500279c-9.013581-1.488372-15.038512-8.906419-13.526325-16.336372 1.500279-8.918326 9.025488-13.371535 19.551255-11.883162m-55.653209-13.371535c7.525209 2.976744 12.026047 10.394791 10.525768 19.313116-3.000558 7.429953-10.525767 11.883163-19.551256 10.394791h-1.500279c-7.525209-2.976744-12.026047-10.394791-9.025489-19.313117 1.500279-8.906419 9.025488-13.359628 19.551256-10.39479m-54.141023-20.789582c7.513302 2.976744 10.525767 11.883163 7.513302 19.30121-3.000558 7.429953-12.026047 10.406698-19.551256 7.429953h-1.500279c-7.525209-2.976744-10.525767-11.883163-7.525209-19.313116 3.012465-8.906419 12.026047-11.883163 21.063442-7.418047m-49.640186-28.219535c7.525209 4.453209 9.025488 13.359628 4.524651 20.789582-4.524651 7.429953-13.55014 8.906419-21.075349 4.453209 0 0-1.500279 0-1.500279-1.488372-7.513302-4.453209-9.013581-13.359628-4.500837-20.789581 4.500837-7.429953 15.038512-8.918326 22.551814-2.976745m-45.127442-35.637581c6.02493 5.941581 6.02493 14.848 1.512186 20.789581a16.253023 16.253023 0 0 1-21.051535 1.488372s-1.512186 0-1.512186-1.488372a15.764837 15.764837 0 0 1-1.500279-20.789581c6.013023-5.953488 15.038512-5.953488 22.563721 0m-39.102512-40.114605c6.013023 5.953488 4.512744 16.348279-1.512186 20.801489-6.013023 4.453209-16.550698 4.453209-21.051535-1.488372 0 0 0-1.488372-1.500279-1.488372-6.02493-5.941581-4.524651-16.336372 1.500279-20.789582 6.013023-5.953488 16.550698-4.453209 22.563721 2.976744m-34.601674-46.056186c4.524651 7.429953 1.512186 16.336372-4.512744 20.801489-7.513302 4.453209-16.550698 1.476465-21.051535-4.465117 0 0 0-1.476465-1.500279-1.476465-4.524651-7.429953-1.512186-16.348279 4.512744-20.801488 9.013581-4.453209 18.03907-2.976744 22.551814 5.953488M145.026977 671.791628c3.012465 7.429953 0 16.336372-7.52521 19.313116-7.513302 2.964837-16.550698 0-19.551255-7.429953v-1.488372c-3.000558-7.429953 0-16.336372 7.525209-19.313117 7.513302-2.976744 15.038512 0 19.551256 8.918326m-18.050977-53.474233c1.500279 7.429953-3.000558 16.336372-10.525767 17.824745s-16.550698-2.976744-18.050977-10.394791v-1.488372c-1.500279-7.429953 3.012465-16.336372 10.525767-17.824744 7.525209-2.976744 15.050419 1.488372 18.050977 11.883162m-10.525767-56.439069c1.500279 7.418047-4.512744 14.848-13.538233 16.336372-7.513302 1.488372-15.038512-4.453209-16.550698-13.371535v-1.488372c-1.500279-8.906419 4.524651-14.848 13.538233-16.336372 7.525209-1.488372 15.050419 4.453209 16.550698 13.371534v1.488373m-3.012466-56.43907c0 8.906419-7.513302 14.848-15.038511 14.848A14.978977 14.978977 0 0 1 83.348837 505.439256v-1.488372c0-8.906419 7.525209-14.848 15.038512-14.848 9.025488 0 15.038512 7.429953 15.038511 14.848v1.488372m6.024931-56.43907c-1.512186 7.429953-9.025488 13.371535-18.050977 11.883163a15.419535 15.419535 0 0 1-12.026047-17.824744v-1.488372c1.500279-7.429953 9.013581-13.371535 18.03907-11.883163 9.025488 1.488372 13.538233 8.918326 12.026047 19.313116m13.538232-54.962605c-3.000558 7.429953-10.525767 11.883163-19.551256 8.918326-7.513302-2.976744-12.026047-10.406698-9.025488-19.313116v-1.488372c3.012465-7.429953 10.537674-11.883163 19.563163-8.906419 9.013581 2.976744 12.026047 11.883163 9.013581 20.789581m22.563721-51.98586c-3.000558 7.429953-12.026047 10.394791-19.551256 5.953488-7.525209-2.976744-10.525767-11.89507-6.013023-19.325023v-1.476465c3.000558-7.429953 12.026047-10.406698 19.551256-5.953488 7.513302 2.976744 10.525767 11.89507 6.013023 20.801488m28.576744-49.021023c-4.512744 7.429953-13.538233 8.918326-21.051534 2.976744-7.525209-4.453209-9.025488-13.371535-3.012466-20.801489 0 0 0-1.476465 1.500279-1.476465 4.524651-7.429953 13.538233-8.918326 21.063442-2.976744 6.013023 4.453209 7.513302 13.371535 1.500279 22.277954m36.101954-44.555907a14.669395 14.669395 0 0 1-21.063442 0 14.240744 14.240744 0 0 1 0-20.789582s0-1.488372 1.512186-1.488372a14.669395 14.669395 0 0 1 21.051535 0c6.013023 5.941581 6.013023 14.848-1.500279 22.277954m42.114977-38.614326c-6.02493 4.453209-16.550698 4.453209-21.063442-2.976744-4.512744-5.941581-4.512744-16.336372 3.012465-20.789581 0 0 1.500279 0 1.500279-1.488373 6.013023-4.453209 16.550698-4.453209 21.063442 2.976745 4.500837 7.418047 4.500837 16.336372-4.524651 22.266046m48.139907-32.672744c-7.525209 4.453209-16.550698 1.488372-21.063442-5.941581s-1.500279-16.336372 6.02493-20.789582c0 0 1.500279 0 1.500279-1.488372 7.513302-4.453209 16.550698-1.488372 21.051535 5.941581 3.012465 8.906419 0 17.824744-7.513302 22.277954m51.128558-25.242791c-7.513302 2.964837-16.550698 0-19.551256-7.429953s0-16.336372 9.025488-19.313117h1.512186c7.513302-2.976744 16.538791 0 19.551256 8.918326 3.000558 5.941581-1.512186 14.848-10.537674 17.812837m54.15293-16.336372c-7.525209 1.488372-16.550698-2.976744-18.050977-10.394791-1.500279-7.429953 3.012465-16.336372 10.525768-17.824744h1.512186c7.513302-1.488372 16.538791 2.976744 18.03907 10.394791 1.512186 7.429953-3.000558 16.348279-10.525768 17.824744h-1.500279m57.153488-10.394791c-7.525209 1.488372-15.038512-4.453209-16.550697-13.371534-1.500279-8.906419 4.524651-14.848 13.538232-16.336372h1.500279c9.025488-1.488372 15.050419 4.453209 16.550698 13.371534 1.500279 7.429953-6.013023 14.848-13.538233 16.336372h-1.500279"  ></path><path d="M977.92 384.369116c-1.476465-7.418047 2.976744-16.312558 10.406698-17.80093s16.348279 2.964837 17.836651 10.382884C1018.058419 419.982884 1024 465.991442 1024 512c0 283.457488-228.875907 512-512.738233 512C228.875907 1024 0 795.457488 0 512S228.875907 0 512.738233 0c86.206512 0 166.459535 20.777674 237.794232 57.867907 7.429953 4.465116 10.406698 13.371535 5.953488 19.301209-4.465116 7.418047-13.383442 10.394791-20.813395 5.941582a486.923907 486.923907 0 0 0-224.410791-54.914977C246.712558 29.684093 29.719814 246.355349 29.719814 512S246.712558 994.315907 512.738233 994.315907c266.037581 0 483.018419-216.671256 483.018418-482.315907 0-43.031814-5.941581-86.075535-17.824744-127.630884"  ></path><path d="M300.186791 601.707163c-4.453209 5.929674-14.836093 7.40614-20.765768 2.976744-5.941581-4.453209-7.418047-14.812279-2.976744-20.741954l207.741023-281.338046 23.742512 17.765209-207.741023 281.338047z m161.744372-279.849675l22.266046-19.253581L691.914419 539.517023l281.933395-355.363721c4.453209-5.929674 14.836093-7.40614 20.765767-2.976744 5.941581 4.453209 7.418047 14.812279 2.976745 20.741954L715.668837 557.29414l-22.266046 28.124279-23.730605-26.647814-207.741023-236.913117z m0 0l22.266046-19.253581 23.730605 17.765209-23.742512-17.765209-22.266046 19.253581z"  ></path><path d="M1006.139535 107.162791c43.341395 0 77.395349 34.053953 77.395349 77.395349S1049.48093 261.953488 1006.139535 261.953488 928.744186 227.899535 928.744186 184.55814 962.79814 107.162791 1006.139535 107.162791z"  ></path><path d="M1006.139535 230.995349c26.314419 0 46.437209-20.122791 46.437209-46.437209s-20.122791-46.437209-46.437209-46.43721-46.437209 20.122791-46.437209 46.43721 20.122791 46.437209 46.437209 46.437209z m0 30.958139c-43.341395 0-77.395349-34.053953-77.395349-77.395348S962.79814 107.162791 1006.139535 107.162791s77.395349 34.053953 77.395349 77.395349-34.053953 77.395349-77.395349 77.395348zM690.604651 512c32.744186 0 59.534884 26.790698 59.534884 59.534884s-26.790698 59.534884-59.534884 59.534883-59.534884-26.790698-59.534884-59.534883 26.790698-59.534884 59.534884-59.534884z"  ></path><path d="M690.604651 601.302326c16.372093 0 29.767442-13.395349 29.767442-29.767442s-13.395349-29.767442-29.767442-29.767442a29.850791 29.850791 0 0 0-29.767442 29.767442c0 16.372093 13.395349 29.767442 29.767442 29.767442z m0 29.767441c-32.744186 0-59.534884-26.790698-59.534884-59.534883s26.790698-59.534884 59.534884-59.534884 59.534884 26.790698 59.534884 59.534884-26.790698 59.534884-59.534884 59.534883zM476.27907 273.860465c32.744186 0 59.534884 26.790698 59.534883 59.534884s-26.790698 59.534884-59.534883 59.534884-59.534884-26.790698-59.534884-59.534884 26.790698-59.534884 59.534884-59.534884z"  ></path><path d="M476.529116 363.781953c16.312558 0 29.648372-13.478698 29.648372-29.96986s-13.335814-29.981767-29.648372-29.981767c-16.300651 0-29.636465 13.490605-29.636465 29.981767 0 16.491163 13.335814 29.96986 29.648372 29.96986z m0 29.981768c-32.601302 0-59.27293-26.981209-59.27293-59.951628 0-32.982326 26.671628-59.951628 59.27293-59.951628C509.142326 273.860465 535.813953 300.841674 535.813953 333.812093c0 32.982326-26.671628 59.951628-59.284837 59.951628zM249.808372 672.541767c16.300651 0 29.636465-13.490605 29.636465-29.981767 0-16.491163-13.335814-29.96986-29.648372-29.96986-16.300651 0-29.636465 13.478698-29.636465 29.96986s13.335814 29.981767 29.648372 29.981767z m0 29.969861C217.183256 702.511628 190.511628 675.530419 190.511628 642.56c0-32.982326 26.671628-59.951628 59.284837-59.951628 32.601302 0 59.27293 26.981209 59.27293 59.951628 0 32.982326-26.671628 59.951628-59.27293 59.951628z"  ></path></symbol><symbol id="icon-shequ" viewBox="0 0 1024 1024"><path d="M369 435l300 0 0 51-300 0 0-51Z"  ></path><path d="M369 561l300 0 0 50-300 0 0-50Z"  ></path><path d="M369 685l300 0 0 52-300 0 0-52Z"  ></path><path d="M1010.8 469.1 530.1 16.7c-9.7-9.1-24.7-9.1-34.4 0L15 469.1c-7.5 7-9.9 17.2-6.1 26.7 3.8 9.5 13 15.1 23.3 15.1L194 510.9l0 475.5c0 13.8 10.9 24.5 24.7 24.5l601 0c13.8 0 24.3-10.7 24.3-24.5L844 511l149.7 0c10.2 0 19.5-5.6 23.3-15.1C1020.7 486.4 1018.3 476.2 1010.8 469.1zM819.7 460c-13.8 0-24.7 13.5-24.7 27.3L795 961 243 961 243 487.3c0-13.8-10.5-27.3-24.3-27.3L95.2 460 512.9 66.8 930.6 460 819.7 460z"  ></path></symbol><symbol id="icon-gongcheng" viewBox="0 0 1024 1024"><path d="M141.9 419.2L454.1 598c18.2 10.6 38.9 16.3 59.9 16.3 21.2 0 41.7-5.6 59.4-16.3l312.4-178.6c21.7-11.8 35.2-36.5 34.5-63.1-0.8-26.2-15.4-50.2-37.4-61.2L567.3 137.6c-33.9-16.9-72.8-16.9-106.6 0L144.9 295.2c-22.5 11.6-36.4 34.5-37.2 61.1-0.8 26.3 12.3 50.4 34.2 62.9z m22.3-85.9l315.6-157.5c10.9-5.4 22.5-8.2 34.2-8.2 11.7 0 23.4 2.7 34.2 8.2l315.5 157.5c8.1 4 13.5 13.6 13.8 24.2 0.3 10.6-4.5 20.2-12.2 24.3L552 561l-0.5 0.3c-11 6.7-24 10.2-37.5 10.2s-26.7-3.6-38.5-10.5L163.1 382.2c-8-4.6-13-14.3-12.7-24.6 0.3-10.9 5.6-20 13.8-24.3zM888.4 646.3l-369 211c-3.5 2-7.1 2-10.7-0.1L139.6 646.3c-10.3-5.9-23.3-2.3-29.1 7.9-5.9 10.2-2.3 23.3 7.9 29.1l368.8 210.8c8.4 4.9 17.6 7.3 26.7 7.3 9.2 0 18.3-2.4 26.6-7.2l368.9-210.9c10.2-5.9 13.8-18.9 7.9-29.1-5.6-10.2-18.7-13.8-28.9-7.9z"  ></path><path d="M888.4 508.9l-369 211c-3.5 2-7.1 2-10.7-0.1L139.6 508.9c-10.3-5.9-23.3-2.3-29.1 7.9-5.9 10.2-2.3 23.3 7.9 29.1l368.8 210.8c8.4 4.9 17.6 7.3 26.7 7.3 9.2 0 18.3-2.4 26.6-7.2L909.6 546c10.2-5.9 13.8-18.9 7.9-29.1-5.8-10.3-18.9-13.8-29.1-8z"  ></path></symbol><symbol id="icon-danxuanxuanzhong1" viewBox="0 0 1024 1024"><path d="M512 1024C229.230208 1024 0 794.769792 0 512 0 229.230208 229.230208 0 512 0 794.769792 0 1024 229.230208 1024 512 1024 794.769792 794.769792 1024 512 1024ZM512 960C759.423565 960 960 759.423565 960 512 960 264.576432 759.423565 64 512 64 264.576432 64 64 264.576432 64 512 64 759.423565 264.576432 960 512 960ZM512 832C688.731117 832 832 688.731117 832 512 832 335.26888 688.731117 192 512 192 335.26888 192 192 335.26888 192 512 192 688.731117 335.26888 832 512 832Z"  ></path></symbol><symbol id="icon-huodong" viewBox="0 0 1030 1024"><path d="M947.228444 5.233778c-5.347556-3.441778-24.632889-13.056-47.559111 8.476444l-8.504889 8.049778c-59.704889 56.746667-99.128889 94.236444-318.208 20.508444C513.991111 22.442667 454.058667 13.596444 394.837333 15.957333a477.411556 477.411556 0 0 0-139.776 26.993778c-77.425778 27.306667-123.249778 65.450667-125.155555 67.072a26.737778 26.737778 0 0 0-4.408889 4.721778 26.936889 26.936889 0 0 0-10.382222 33.735111L454.257778 914.716444a26.908444 26.908444 0 1 0 49.208889-21.816888l-157.184-355.100445 2.645333-5.063111c35.640889-68.124444 76.060444-145.294222 283.733333-126.862222a220.899556 220.899556 0 0 0 116.679111-21.475556c32.028444-15.331556 62.520889-38.513778 90.652445-68.807111 44.003556-47.502222 82.801778-114.176 106.410667-182.926222 8.988444-26.168889 14.904889-50.432 17.237333-70.144 2.190222-18.631111 2.872889-44.828444-16.412445-57.287111z m-57.372444 125.496889c-20.110222 52.508444-49.152 102.058667-81.635556 139.605333-51.797333 59.818667-109.255111 87.352889-170.808888 81.891556-106.268444-9.443556-185.770667 4.124444-243.057778 41.472-36.408889 23.694222-58.823111 53.617778-75.548445 81.976888L172.515556 145.152c15.132444-10.894222 51.143111-34.360889 102.513777-52.167111 91.363556-31.715556 185.856-31.601778 280.775111 0.341333 112.384 37.774222 191.943111 50.375111 250.481778 39.651556 43.719111-8.021333 73.272889-28.302222 99.072-51.000889a407.324444 407.324444 0 0 1-15.502222 48.753778z m0 0" fill="" ></path><path d="M876.913778 634.424889c-91.562667-39.537778-218.680889-63.288889-363.434667-63.288889-7.936 0-15.843556 0.085333-23.694222 0.256v64.682667c7.822222-0.170667 15.729778-0.256 23.694222-0.256 264.533333 0 448.796444 84.935111 448.796445 161.052444 0 38.741333-45.539556 79.843556-125.098667 110.449778v0.113778c-78.990222 30.122667-189.980444 51.768889-320.483556 51.768889-264.533333 0-448.796444-84.906667-448.796444-161.052445 0-38.741333 45.511111-80.810667 125.127111-111.445333v-0.056889c9.984-3.84 20.110222-7.338667 30.264889-10.581333v-67.669334C86.613333 648.049778 0 716.288 0 796.842667c0 65.820444 57.685333 123.335111 153.201778 163.868444 91.562667 39.509333 218.680889 63.232 363.434666 63.232 292.721778 0 513.479111-96.995556 513.479112-225.706667 0-65.792-57.685333-123.306667-153.201778-163.811555z m0 0" fill="" ></path></symbol><symbol id="icon-menu_voucher" viewBox="0 0 1024 1024"><path d="M830.236 960.886H200.924c-63.104 0-114.421-51.316-114.421-114.421V531.809c0-63.104 51.316-114.421 114.421-114.421h629.313c63.104 0 114.421 51.316 114.421 114.421v314.656c-0.001 63.105-51.317 114.421-114.422 114.421zM200.924 474.599c-31.538 0-57.21 25.672-57.21 57.21v314.656c0 31.538 25.672 57.21 57.21 57.21h629.313c31.538 0 57.21-25.672 57.21-57.21V531.809c0-31.538-25.672-57.21-57.21-57.21H200.924zM801.631 291.152H229.529c-15.811 0-28.605-12.794-28.605-28.605s12.794-28.605 28.605-28.605h572.103c15.811 0 28.605 12.794 28.605 28.605s-12.795 28.605-28.606 28.605zM630 118.096H401.159c-15.811 0-28.605-12.794-28.605-28.605s12.794-28.605 28.605-28.605H630c15.811 0 28.605 12.794 28.605 28.605S645.812 118.096 630 118.096z" fill="#333333" ></path></symbol><symbol id="icon-menu_events" viewBox="0 0 1024 1024"><path d="M751.493 766.011h-281.25c-15.546 0-28.125-12.579-28.125-28.125s12.579-28.125 28.125-28.125h281.25c15.546 0 28.125 12.579 28.125 28.125s-12.579 28.125-28.125 28.125zM751.493 400.386h-281.25c-15.546 0-28.125-12.579-28.125-28.125s12.579-28.125 28.125-28.125h281.25c15.546 0 28.125 12.579 28.125 28.125s-12.579 28.125-28.125 28.125zM751.493 583.198h-281.25c-15.546 0-28.125-12.579-28.125-28.125s12.579-28.125 28.125-28.125h281.25c15.546 0 28.125 12.579 28.125 28.125s-12.579 28.125-28.125 28.125zM920.243 316.011H811.259c-46.527 0-84.375-37.848-84.375-84.375V91.011c0-15.546 12.579-28.125 28.125-28.125s28.125 12.579 28.125 28.125v140.625c0 15.518 12.607 28.125 28.125 28.125h108.984c15.546 0 28.125 12.579 28.125 28.125s-12.579 28.125-28.125 28.125z" fill="#333333" ></path><path d="M863.993 962.886h-506.25c-46.527 0-84.375-37.848-84.375-84.375v-731.25c0-46.527 37.848-84.375 84.375-84.375h397.266c8.322 0 16.205 3.68 21.533 10.052l165.234 196.875a28.048 28.048 0 0 1 6.592 18.073v590.625c0 46.527-37.848 84.375-84.375 84.375z m-506.25-843.75c-15.518 0-28.125 12.607-28.125 28.125v731.25c0 15.518 12.607 28.125 28.125 28.125h506.25c15.518 0 28.125-12.607 28.125-28.125v-580.38l-150.21-178.995H357.743z" fill="#333333" ></path><path d="M329.618 962.886h-168.75c-46.527 0-84.375-37.848-84.375-84.375v-562.5c0-46.527 37.848-84.375 84.375-84.375h112.5c15.546 0 28.125 12.579 28.125 28.125s-12.579 28.125-28.125 28.125h-112.5c-15.518 0-28.125 12.607-28.125 28.125v562.5c0 15.518 12.607 28.125 28.125 28.125h168.75c15.546 0 28.125 12.579 28.125 28.125s-12.579 28.125-28.125 28.125z" fill="#333333" ></path></symbol><symbol id="icon-menu_map" viewBox="0 0 1024 1024"><path d="M372.589 958.578c-9.47 0-18.939-1.843-27.983-5.529l-235.717-96.453c-27.927-11.397-45.958-38.275-45.958-68.441v-630.09c0-24.666 12.22-47.631 32.718-61.382 20.498-13.694 46.327-16.387 69.235-7.06l201.723 82.532c3.856 1.616 8.25 1.588 11.993 0L625.261 71.252c18.06-7.371 37.878-7.371 55.995 0l235.745 96.453c27.898 11.397 45.93 38.275 45.93 68.441v630.091c0 24.694-12.22 47.631-32.718 61.382-20.442 13.751-46.299 16.416-69.207 7.06l-201.751-82.532c-3.799-1.588-8.194-1.559-11.993 0L400.601 953.05c-9.044 3.686-18.514 5.528-28.012 5.528zM136.872 142.16c-4.196 0-7.371 1.758-8.846 2.722-2.126 1.418-7.031 5.557-7.031 13.184v630.091c0 6.493 3.856 12.248 9.838 14.686h0.028l235.745 96.453c3.856 1.616 8.25 1.616 11.993 0L625.26 798.392c18.06-7.371 37.878-7.371 55.995 0l201.752 82.532c7.031 2.864 12.758-0.057 14.828-1.503 2.126-1.418 7.031-5.529 7.031-13.184V236.146c0-6.493-3.856-12.248-9.838-14.686l-235.774-96.453c-3.799-1.588-8.194-1.559-11.993 0l-246.66 100.904c-18.06 7.343-37.878 7.4-55.995 0l-201.723-82.532c-2.155-0.879-4.168-1.219-6.011-1.219z" fill="#333333" ></path><path d="M366.692 952.596c-16.047 0-29.032-12.985-29.032-29.032V215.562c0-16.047 12.985-29.032 29.032-29.032s29.032 12.985 29.032 29.032v708.002c0.001 16.047-12.985 29.032-29.032 29.032zM650.295 837.771c-16.047 0-29.032-12.985-29.032-29.032V100.738c0-16.047 12.985-29.032 29.032-29.032s29.032 12.985 29.032 29.032v708.001c0.001 16.047-12.984 29.032-29.032 29.032z" fill="#333333" ></path></symbol><symbol id="icon-menu_people" viewBox="0 0 1024 1024"><path d="M605.55 470.45c-104.84 0-190.14-85.3-190.14-190.14s85.3-190.14 190.14-190.14 190.19 85.3 190.19 190.14-85.3 190.14-190.19 190.14z m0-327.34c-75.63 0-137.2 61.54-137.2 137.2s61.57 137.2 137.2 137.2S742.8 356 742.8 280.31s-61.57-137.2-137.25-137.2zM850.8 945.53H360.36c-39.65 0-76.1-21.38-97.5-57.17-23-38.41-24.14-84.53-3.21-123.35 64.78-120.22 185.44-194.89 314.93-194.89h62C766 570.12 886.67 644.79 951.5 765c20.88 38.85 19.69 85-3.21 123.32-21.4 35.83-57.84 57.21-97.49 57.21zM574.58 623.05c-110 0-212.83 64-268.3 167.08-12 22.26-11.27 48.83 2 71.06 11.73 19.67 31.22 31.4 52.06 31.4H850.8c20.83 0 40.27-11.73 52-31.4 13.29-22.23 14.06-48.8 2.07-71.08-55.52-103-158.35-167.06-268.3-167.06z" fill="#007AFF" ></path><path d="M426.37 462.38c-97.29 0-176.44-79.12-176.44-176.38s79.15-176.44 176.44-176.44c1.29 0 7.39 0.57 8.69 0.75 14.42 2.09 24.81 15.56 22.69 30a26.29 26.29 0 0 1-29.57 22.48c-0.1 0-1-0.13-1.14-0.13-69 0-124.17 55.34-124.17 123.33s55.42 123.44 123.5 123.44a26.47 26.47 0 0 1 0 52.94zM192 945.53a45 45 0 0 1-13.9-2.22A166.53 166.53 0 0 1 77 845.47c-17.16-45.23-13.39-93.31 10.6-135.36 71.49-125.18 204.92-203 348.17-203a26.47 26.47 0 0 1 0 52.94c-124.28 0-240.08 67.54-302.16 176.28a104.44 104.44 0 0 0-7.09 90.36 112.88 112.88 0 0 0 68.29 66.36c14.63 0 25.08 11.6 25.08 26.21s-13.28 26.27-27.89 26.27z" fill="#007AFF" ></path></symbol><symbol id="icon-menu_date" viewBox="0 0 1024 1024"><path d="M885.52 862.13H327.44a26.47 26.47 0 0 1 0-52.94h558.08A26.5 26.5 0 0 0 912 782.71V359.19a26.5 26.5 0 0 0-26.47-26.48h-292.3a26.4 26.4 0 0 1-22.77-13l-54.13-91.51c-8.64-14.55-34.54-27.84-54.34-27.84H144.34c-14.91 0-26.47 7.73-26.47 14.37V661.4a26.47 26.47 0 1 1-52.94 0V214.73c0-37.74 34.87-67.31 79.41-67.31H462c38.78 0 81.71 23.14 99.88 53.82l46.46 78.53h277.18a79.5 79.5 0 0 1 79.41 79.42v423.52a79.5 79.5 0 0 1-79.41 79.42z" fill="#007AFF" ></path><path d="M627.17 575.63a99.54 99.54 0 1 1 99.53-99.55 99.65 99.65 0 0 1-99.53 99.55z m0-146.13a46.6 46.6 0 1 0 46.58 46.58 46.62 46.62 0 0 0-46.58-46.58zM505.39 794.79a99.53 99.53 0 1 1 99.55-99.53 99.64 99.64 0 0 1-99.55 99.53z m0-146.11A46.59 46.59 0 1 0 552 695.26a46.63 46.63 0 0 0-46.61-46.58zM310.59 645.06a99.52 99.52 0 1 1 99.52-99.52 99.64 99.64 0 0 1-99.52 99.52z m0-146.1a46.58 46.58 0 1 0 46.58 46.58A46.62 46.62 0 0 0 310.59 499zM164.45 888.6A99.53 99.53 0 1 1 264 789.07a99.64 99.64 0 0 1-99.55 99.53z m0-146.11a46.59 46.59 0 1 0 46.61 46.58 46.63 46.63 0 0 0-46.61-46.58z" fill="#007AFF" ></path><path d="M201 752.63a26.47 26.47 0 0 1-22.67-40.12l71.32-118.6A26.48 26.48 0 1 1 295 621.2l-71.3 118.6a26.5 26.5 0 0 1-22.7 12.83zM432.34 693.76a26.42 26.42 0 0 1-19.47-8.53l-67.31-73.05a26.47 26.47 0 0 1 38.93-35.88l67.31 73.05a26.46 26.46 0 0 1-19.46 44.41zM529.74 648.68a26.46 26.46 0 0 1-21-42.57l62.72-81.85a26.48 26.48 0 0 1 42 32.21l-62.71 81.85a26.5 26.5 0 0 1-21.01 10.36z" fill="#007AFF" ></path></symbol><symbol id="icon-yunweijiankong" viewBox="0 0 1024 1024"><path d="M624.64 662.528c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24H92.16c-22.528 0-40.96-18.432-40.96-40.96v-419.84c0-22.528 18.432-40.96 40.96-40.96h675.84c22.528 0 40.96 18.432 40.96 40.96v276.48c0 6.144-4.096 10.24-10.24 10.24s-10.24-4.096-10.24-10.24v-276.48c0-11.264-9.216-20.48-20.48-20.48H92.16c-11.264 0-20.48 9.216-20.48 20.48v419.84c0 11.264 9.216 20.48 20.48 20.48h532.48M602.112 822.272c8.192 0 15.36-7.168 15.36-15.36s-7.168-15.36-15.36-15.36h-317.44c-8.192 0-15.36 7.168-15.36 15.36s7.168 15.36 15.36 15.36h317.44m0 20.48h-317.44c-19.456 0-35.84-16.384-35.84-35.84s16.384-35.84 35.84-35.84h317.44c19.456 0 35.84 16.384 35.84 35.84s-16.384 35.84-35.84 35.84z" fill="#666666" ></path><path d="M425.984 672.768h20.48v119.808h-20.48V672.768M230.4 501.76l-14.336-14.336s67.584-66.56 105.472-105.472l14.336 14.336L230.4 501.76m124.928-112.64l13.312-15.36c11.264 9.216 26.624 22.528 41.984 34.816 14.336 12.288 29.696 25.6 43.008 36.864L440.32 460.8l-43.008-36.864-41.984-34.816m174.08 76.8l-14.336-14.336c34.816-34.816 96.256-95.232 96.256-95.232l14.336 14.336-96.256 95.232M378.88 631.808c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24H378.88m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024M819.2 816.128c73.728 0 133.12-59.392 133.12-132.096s-59.392-132.096-133.12-132.096-133.12 59.392-133.12 132.096 59.392 132.096 133.12 132.096m0 20.48c-84.992 0-153.6-68.608-153.6-152.576s68.608-152.576 153.6-152.576 153.6 68.608 153.6 152.576-68.608 152.576-153.6 152.576z" fill="#666666" ></path><path d="M819.2 737.28c29.696 0 53.248-23.552 53.248-53.248 0-29.696-23.552-53.248-53.248-53.248-29.696 0-53.248 23.552-53.248 53.248 0 28.672 23.552 53.248 53.248 53.248m0 20.48c-40.96 0-73.728-32.768-73.728-73.728s32.768-73.728 73.728-73.728 73.728 32.768 73.728 73.728c0 39.936-32.768 73.728-73.728 73.728z" fill="#666666" ></path><path d="M665.6 693.248v-20.48h295.936v20.48H665.6" fill="#666666" ></path><path d="M809.984 530.432h20.48v294.912h-20.48V530.432M204.8 542.72c13.312 0 23.552-10.24 23.552-23.552 0-13.312-10.24-23.552-23.552-23.552s-23.552 10.24-23.552 23.552c0 13.312 10.24 23.552 23.552 23.552m416.768-174.08c7.168 0 12.288-5.12 12.288-12.288s-5.12-12.288-12.288-12.288-12.288 5.12-12.288 12.288c0 6.144 5.12 12.288 12.288 12.288M204.8 563.2c-24.576 0-44.032-19.456-44.032-44.032s19.456-44.032 44.032-44.032 44.032 19.456 44.032 44.032S229.376 563.2 204.8 563.2z m416.768-174.08c-18.432 0-32.768-14.336-32.768-32.768 0-18.432 14.336-32.768 32.768-32.768 18.432 0 32.768 14.336 32.768 32.768 0 17.408-14.336 32.768-32.768 32.768zM476.16 510.976c18.432 0 32.768-15.36 32.768-33.792 0-18.432-15.36-33.792-32.768-33.792s-32.768 15.36-32.768 33.792c-1.024 18.432 14.336 33.792 32.768 33.792M336.896 379.904c6.144 0 11.264-5.12 11.264-12.288s-5.12-12.288-11.264-12.288c-6.144 0-11.264 5.12-11.264 12.288-1.024 7.168 4.096 12.288 11.264 12.288m139.264 151.552c-29.696 0-53.248-24.576-53.248-54.272s23.552-54.272 53.248-54.272 53.248 24.576 53.248 54.272-23.552 54.272-53.248 54.272zM336.896 400.384c-17.408 0-31.744-14.336-31.744-32.768s14.336-32.768 31.744-32.768c17.408 0 31.744 14.336 31.744 32.768s-14.336 32.768-31.744 32.768z" fill="#666666" ></path></symbol><symbol id="icon-gongyiliucheng" viewBox="0 0 1024 1024"><path d="M757.76 813.056v20.48H501.76c-22.528 0-40.96-18.432-40.96-40.96v-460.8h20.48v460.8c0 11.264 9.216 20.48 20.48 20.48h256"  ></path><path d="M757.76 546.816v20.48H501.76c-22.528 0-40.96-18.432-40.96-40.96v-112.64h20.48v112.64c0 11.264 9.216 20.48 20.48 20.48h256"  ></path><path d="M235.52 679.936v-20.48h184.32c22.528 0 40.96-18.432 40.96-40.96v-112.64h20.48v112.64c0 33.792-27.648 61.44-61.44 61.44H235.52M819.2 608.256c28.672 0 51.2-22.528 51.2-51.2s-22.528-51.2-51.2-51.2-51.2 22.528-51.2 51.2 22.528 51.2 51.2 51.2m0 20.48c-39.936 0-71.68-31.744-71.68-71.68s31.744-71.68 71.68-71.68 71.68 31.744 71.68 71.68-31.744 71.68-71.68 71.68zM819.2 874.496c28.672 0 51.2-22.528 51.2-51.2s-22.528-51.2-51.2-51.2-51.2 22.528-51.2 51.2c0 27.648 22.528 51.2 51.2 51.2m0 20.48c-39.936 0-71.68-31.744-71.68-71.68s31.744-71.68 71.68-71.68 71.68 31.744 71.68 71.68-31.744 71.68-71.68 71.68zM563.2 239.616c0-6.144 5.12-10.24 10.24-10.24 6.144 0 10.24 4.096 10.24 10.24v1.024c0 6.144-5.12 10.24-10.24 10.24-6.144 0-10.24-5.12-10.24-11.264m-6.144 33.792c2.048-5.12 8.192-8.192 13.312-6.144 5.12 2.048 8.192 8.192 6.144 13.312v1.024c-2.048 5.12-8.192 8.192-13.312 6.144-6.144-3.072-9.216-8.192-6.144-14.336m-18.432 28.672c4.096-4.096 10.24-4.096 14.336 0 4.096 4.096 4.096 10.24 1.024 14.336l-1.024 1.024c-4.096 4.096-10.24 4.096-14.336 0-4.096-4.096-4.096-10.24 0-15.36m-27.648 20.48c5.12-2.048 11.264 0 13.312 5.12 2.048 5.12 0 11.264-5.12 13.312h-1.024c-5.12 2.048-11.264 0-13.312-5.12-2.048-4.096 0-10.24 6.144-13.312m-32.768 9.216c6.144 0 10.24 4.096 11.264 9.216 0 6.144-4.096 10.24-9.216 11.264h-1.024c-6.144 0-10.24-4.096-11.264-9.216-1.024-6.144 3.072-11.264 10.24-11.264m-33.792-4.096c5.12 2.048 8.192 7.168 7.168 13.312-2.048 5.12-7.168 8.192-12.288 7.168h-1.024c-5.12-2.048-8.192-7.168-7.168-13.312 1.024-6.144 6.144-9.216 13.312-7.168m-30.72-16.384c4.096 3.072 5.12 10.24 2.048 14.336-3.072 4.096-10.24 5.12-14.336 2.048 0 0-1.024 0-1.024-1.024-4.096-3.072-5.12-10.24-1.024-14.336 3.072-4.096 9.216-5.12 14.336-1.024m-22.528-25.6c3.072 5.12 1.024 11.264-4.096 14.336-5.12 3.072-11.264 1.024-14.336-4.096 0 0 0-1.024-1.024-1.024-3.072-5.12-1.024-11.264 4.096-14.336 6.144-2.048 12.288-1.024 15.36 5.12m-11.264-31.744c1.024 5.12-3.072 11.264-8.192 11.264s-11.264-3.072-11.264-8.192V256c-1.024-5.12 3.072-11.264 8.192-11.264 5.12-2.048 10.24 2.048 11.264 9.216m1.024-34.816c-1.024 5.12-7.168 9.216-12.288 8.192-5.12-1.024-9.216-7.168-8.192-12.288v-1.024c1.024-5.12 7.168-9.216 12.288-7.168 6.144 0 10.24 6.144 8.192 12.288m13.312-31.744c-3.072 5.12-9.216 6.144-14.336 3.072-5.12-3.072-6.144-9.216-3.072-14.336 0 0 0-1.024 1.024-1.024 3.072-5.12 9.216-6.144 14.336-3.072s6.144 10.24 2.048 15.36m24.576-23.552c-5.12 3.072-11.264 2.048-14.336-3.072-3.072-5.12-2.048-11.264 3.072-14.336 0 0 1.024 0 1.024-1.024 5.12-3.072 11.264-2.048 14.336 3.072 2.048 5.12 1.024 11.264-4.096 15.36m31.744-14.336c-5.12 1.024-11.264-2.048-12.288-8.192-1.024-5.12 2.048-11.264 8.192-12.288h1.024c5.12-1.024 11.264 2.048 12.288 8.192 0 5.12-3.072 11.264-9.216 12.288"  ></path><path d="M471.04 188.416c28.672 0 51.2 22.528 51.2 51.2s-22.528 51.2-51.2 51.2-51.2-22.528-51.2-51.2 22.528-51.2 51.2-51.2z"  ></path><path d="M471.04 270.336c17.408 0 30.72-13.312 30.72-30.72s-13.312-30.72-30.72-30.72-30.72 13.312-30.72 30.72 13.312 30.72 30.72 30.72m0 20.48c-28.672 0-51.2-22.528-51.2-51.2s22.528-51.2 51.2-51.2 51.2 22.528 51.2 51.2c0 27.648-22.528 51.2-51.2 51.2z"  ></path><path d="M184.32 618.496c28.672 0 51.2 22.528 51.2 51.2s-22.528 51.2-51.2 51.2-51.2-22.528-51.2-51.2 22.528-51.2 51.2-51.2z"  ></path><path d="M184.32 700.416c17.408 0 30.72-13.312 30.72-30.72s-13.312-30.72-30.72-30.72-30.72 13.312-30.72 30.72c0 16.384 13.312 30.72 30.72 30.72m0 20.48c-28.672 0-51.2-22.528-51.2-51.2s22.528-51.2 51.2-51.2 51.2 22.528 51.2 51.2c0 27.648-22.528 51.2-51.2 51.2z"  ></path></symbol><symbol id="icon-zhiliangkongzhi" viewBox="0 0 1024 1024"><path d="M517.12 364.544c-38.912 0-69.632 13.312-93.184 39.936-21.504 24.576-31.744 57.344-31.744 97.28s10.24 71.68 31.744 97.28c22.528 26.624 53.248 39.936 92.16 39.936 28.672 0 53.248-7.168 73.728-21.504 8.192 10.24 16.384 21.504 24.576 33.792 3.072 5.12 10.24 6.144 14.336 2.048 4.096-3.072 4.096-9.216 2.048-13.312-8.192-12.288-17.408-24.576-25.6-35.84l4.096-4.096c21.504-24.576 31.744-57.344 31.744-97.28 0-39.936-10.24-71.68-31.744-97.28-22.528-27.648-53.248-40.96-92.16-40.96z m0 21.504c31.744 0 56.32 10.24 74.752 32.768 17.408 20.48 26.624 49.152 26.624 82.944 0 34.816-9.216 62.464-26.624 82.944v1.024c-13.312-17.408-27.648-32.768-41.984-48.128-4.096-4.096-10.24-4.096-14.336 0-4.096 4.096-4.096 9.216 0 13.312 13.312 15.36 27.648 30.72 40.96 49.152-16.384 12.288-36.864 18.432-60.416 18.432-31.744 0-57.344-11.264-75.776-32.768-17.408-21.504-26.624-49.152-26.624-82.944s9.216-61.44 26.624-82.944c19.456-23.552 45.056-33.792 76.8-33.792z"  ></path><path d="M650.24 220.16c-47.104 1.024-94.208-62.464-131.072-99.328-4.096-4.096-10.24-4.096-14.336 0-36.864 36.864-83.968 100.352-131.072 99.328-56.32 0-169.984 6.144-169.984 6.144-5.12 0-10.24 5.12-9.216 10.24l12.288 463.872 4.096 8.192 290.816 194.56c3.072 2.048 7.168 3.072 10.24 3.072 4.096 0 7.168-1.024 10.24-3.072l290.816-194.56 2.048-4.096 2.048-4.096L829.44 236.544l-20.48 9.216-11.264 444.416c0 2.048-1.024 5.12-3.072 6.144L522.24 878.592c-6.144 4.096-14.336 4.096-20.48 0L235.52 700.416c-5.12-3.072-8.192-9.216-8.192-15.36l-11.264-430.08c0-5.12 3.072-9.216 8.192-9.216 25.6-1.024 104.448-5.12 150.528-5.12 54.272-1.024 115.712-70.656 133.12-92.16 3.072-3.072 7.168-3.072 10.24-1.024 33.792 33.792 71.68 91.136 133.12 92.16 54.272 1.024 157.696 6.144 157.696 6.144s20.48-6.144 20.48-9.216c0-3.072-1.024-5.12-3.072-7.168-2.048-2.048-4.096-3.072-7.168-3.072 1.024 0-112.64-6.144-168.96-6.144z"  ></path><path d="M716.8 281.6c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 20.48c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24 0-6.144-5.12-10.24-10.24-10.24-6.144 0-10.24 4.096-10.24 10.24z m1.024 40.96c0 6.144 5.12 10.24 10.24 10.24s10.24-5.12 10.24-10.24c0-6.144-5.12-10.24-10.24-10.24-6.144 0-10.24 4.096-10.24 10.24z m1.024 40.96c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24 0-6.144-5.12-10.24-10.24-10.24-6.144 0-10.24 4.096-10.24 10.24z m1.024 40.96c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24 0-6.144-5.12-10.24-10.24-10.24-6.144 0-10.24 4.096-10.24 10.24z m1.024 40.96c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24 0-6.144-5.12-10.24-10.24-10.24s-10.24 4.096-10.24 10.24z m1.024 40.96c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24 0-6.144-5.12-10.24-10.24-10.24s-10.24 4.096-10.24 10.24z m1.024 40.96c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24 0-6.144-5.12-10.24-10.24-10.24s-10.24 4.096-10.24 10.24z m1.024 40.96c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24 0-6.144-5.12-10.24-10.24-10.24s-10.24 4.096-10.24 10.24z m2.048 40.96c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24s-5.12-10.24-10.24-10.24c-6.144 0-11.264 4.096-10.24 10.24z m20.48 40.96c5.12 3.072 11.264 2.048 14.336-3.072 3.072-5.12 2.048-11.264-3.072-14.336-5.12-3.072-11.264-2.048-14.336 3.072-3.072 4.096-2.048 11.264 3.072 14.336z m33.792 22.528c5.12 3.072 11.264 2.048 14.336-3.072 3.072-5.12 2.048-11.264-3.072-14.336-5.12-3.072-11.264-2.048-14.336 3.072-3.072 5.12-1.024 11.264 3.072 14.336z m34.816 22.528c5.12 3.072 11.264 2.048 14.336-3.072 3.072-5.12 2.048-11.264-3.072-14.336-5.12-3.072-11.264-2.048-14.336 3.072-3.072 5.12-2.048 11.264 3.072 14.336z m33.792 22.528c5.12 3.072 11.264 2.048 14.336-3.072 3.072-5.12 2.048-11.264-3.072-14.336-5.12-3.072-11.264-2.048-14.336 3.072-3.072 5.12-2.048 11.264 3.072 14.336z m33.792 22.528c5.12 3.072 11.264 2.048 14.336-3.072 3.072-5.12 2.048-11.264-3.072-14.336-5.12-3.072-11.264-2.048-14.336 3.072-3.072 5.12-1.024 11.264 3.072 14.336z m34.816 22.528c5.12 3.072 11.264 2.048 14.336-3.072 3.072-5.12 2.048-11.264-3.072-14.336-5.12-3.072-11.264-2.048-14.336 3.072-3.072 5.12-2.048 11.264 3.072 14.336z m33.792 22.528c5.12 3.072 11.264 2.048 14.336-3.072 3.072-5.12 2.048-11.264-3.072-14.336-5.12-3.072-11.264-2.048-14.336 3.072-3.072 5.12-2.048 11.264 3.072 14.336z m45.056-8.192c5.12-3.072 6.144-9.216 3.072-14.336-3.072-5.12-9.216-6.144-14.336-3.072-5.12 3.072-6.144 9.216-3.072 14.336 4.096 5.12 10.24 6.144 14.336 3.072z m34.816-22.528c5.12-3.072 6.144-9.216 3.072-14.336-3.072-5.12-9.216-6.144-14.336-3.072-5.12 3.072-6.144 9.216-3.072 14.336 3.072 5.12 9.216 6.144 14.336 3.072z m33.792-22.528c5.12-3.072 6.144-9.216 3.072-14.336-3.072-5.12-9.216-6.144-14.336-3.072-5.12 3.072-6.144 9.216-3.072 14.336 3.072 5.12 9.216 6.144 14.336 3.072z m33.792-22.528c5.12-3.072 6.144-9.216 3.072-14.336-3.072-5.12-9.216-6.144-14.336-3.072-5.12 3.072-6.144 9.216-3.072 14.336 4.096 5.12 10.24 6.144 14.336 3.072z m34.816-22.528c5.12-3.072 6.144-9.216 3.072-14.336-3.072-5.12-9.216-6.144-14.336-3.072-5.12 3.072-6.144 9.216-3.072 14.336 3.072 4.096 9.216 6.144 14.336 3.072z m33.792-22.528c5.12-3.072 6.144-9.216 3.072-14.336-3.072-5.12-9.216-6.144-14.336-3.072-5.12 3.072-6.144 9.216-3.072 14.336 3.072 4.096 10.24 6.144 14.336 3.072z m33.792-23.552c5.12-3.072 6.144-9.216 3.072-14.336-3.072-5.12-9.216-6.144-14.336-3.072-5.12 3.072-6.144 9.216-3.072 14.336 4.096 5.12 10.24 6.144 14.336 3.072z m9.216-47.104c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24 4.096 10.24 10.24 10.24c5.12 0 10.24-5.12 10.24-10.24z m1.024-40.96c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24 4.096 10.24 10.24 10.24c5.12 0 10.24-5.12 10.24-10.24z m1.024-40.96c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24 4.096 10.24 10.24 10.24c5.12 0 10.24-5.12 10.24-10.24z m1.024-40.96c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24 4.096 10.24 10.24 10.24c5.12 0 10.24-5.12 10.24-10.24z m1.024-40.96c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24 4.096 10.24 10.24 10.24c5.12 0 10.24-5.12 10.24-10.24z m1.024-40.96c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24c0 5.12 4.096 10.24 10.24 10.24s10.24-5.12 10.24-10.24z m1.024-40.96c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24 4.096 10.24 10.24 10.24c5.12 0 10.24-5.12 10.24-10.24z m1.024-40.96c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24 4.096 10.24 10.24 10.24c5.12 0 10.24-5.12 10.24-10.24z m-9.216-46.08c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z"  ></path></symbol><symbol id="icon-shebeiguanli" viewBox="0 0 1024 1024"><path d="M839.68 363.52c11.264 0 20.48-9.216 20.48-20.48v-122.88c0-11.264-9.216-20.48-20.48-20.48H184.32c-11.264 0-20.48 9.216-20.48 20.48v122.88c0 11.264 9.216 20.48 20.48 20.48h655.36m0 20.48H184.32c-22.528 0-40.96-18.432-40.96-40.96v-122.88c0-22.528 18.432-40.96 40.96-40.96h655.36c22.528 0 40.96 18.432 40.96 40.96v122.88c0 22.528-18.432 40.96-40.96 40.96zM839.68 824.32c11.264 0 20.48-9.216 20.48-20.48v-122.88c0-11.264-9.216-20.48-20.48-20.48H184.32c-11.264 0-20.48 9.216-20.48 20.48v122.88c0 11.264 9.216 20.48 20.48 20.48h655.36m0 20.48H184.32c-22.528 0-40.96-18.432-40.96-40.96v-122.88c0-22.528 18.432-40.96 40.96-40.96h655.36c22.528 0 40.96 18.432 40.96 40.96v122.88c0 22.528-18.432 40.96-40.96 40.96zM153.6 517.12c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h276.48c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24H153.6M593.92 517.12c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h276.48c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24H593.92"  ></path><path d="M215.04 773.12c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24H215.04m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024M716.8 271.36c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24H716.8m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024M501.76 384c0-6.144 4.096-10.24 10.24-10.24s10.24 4.096 10.24 10.24v61.44c0 6.144-4.096 10.24-10.24 10.24s-10.24-4.096-10.24-10.24v-61.44M501.76 588.8c0-6.144 4.096-10.24 10.24-10.24s10.24 4.096 10.24 10.24v61.44c0 6.144-4.096 10.24-10.24 10.24s-10.24-4.096-10.24-10.24v-61.44"  ></path><path d="M512 578.56c33.792 0 61.44-27.648 61.44-61.44s-27.648-61.44-61.44-61.44-61.44 27.648-61.44 61.44 27.648 61.44 61.44 61.44m0 20.48c-45.056 0-81.92-36.864-81.92-81.92s36.864-81.92 81.92-81.92 81.92 36.864 81.92 81.92-36.864 81.92-81.92 81.92z"  ></path></symbol><symbol id="icon-shengmingzhouqi" viewBox="0 0 1024 1024"><path d="M680.96 605.184c-5.12 3.072-11.264 1.024-14.336-4.096-3.072-5.12-1.024-11.264 4.096-14.336 33.792-19.456 72.704-23.552 108.544-14.336 34.816 9.216 66.56 32.768 87.04 66.56 38.912 68.608 16.384 156.672-52.224 195.584-33.792 19.456-72.704 23.552-108.544 14.336-34.816-9.216-66.56-32.768-87.04-66.56-3.072-5.12-1.024-11.264 4.096-14.336 5.12-3.072 11.264-1.024 14.336 4.096 16.384 28.672 43.008 49.152 74.752 57.344 31.744 8.192 64.512 4.096 92.16-12.288 58.368-33.792 78.848-109.568 45.056-167.936-16.384-28.672-43.008-49.152-74.752-57.344-31.744-7.168-64.512-3.072-93.184 13.312M455.68 431.104c5.12 1.024 9.216 7.168 7.168 12.288-1.024 5.12-7.168 9.216-12.288 7.168-14.336-4.096-28.672-10.24-39.936-17.408-51.2-32.768-77.824-96.256-61.44-157.696 20.48-76.8 99.328-121.856 175.104-101.376 37.888 10.24 68.608 34.816 87.04 66.56 18.432 31.744 24.576 70.656 14.336 108.544-1.024 5.12-7.168 8.192-12.288 7.168-5.12-1.024-9.216-7.168-7.168-12.288 8.192-31.744 4.096-64.512-12.288-93.184s-43.008-49.152-74.752-57.344c-65.536-17.408-133.12 21.504-150.528 87.04-14.336 52.224 7.168 106.496 52.224 135.168 10.24 7.168 22.528 12.288 34.816 15.36"  ></path><path d="M487.424 261.12c28.672 0 51.2 22.528 51.2 51.2s-22.528 51.2-51.2 51.2-51.2-22.528-51.2-51.2 22.528-51.2 51.2-51.2z"  ></path><path d="M487.424 343.04c17.408 0 30.72-13.312 30.72-30.72s-13.312-30.72-30.72-30.72-30.72 13.312-30.72 30.72 13.312 30.72 30.72 30.72m0 20.48c-28.672 0-51.2-22.528-51.2-51.2s22.528-51.2 51.2-51.2 51.2 22.528 51.2 51.2-23.552 51.2-51.2 51.2z"  ></path><path d="M743.424 660.48c28.672 0 51.2 22.528 51.2 51.2s-22.528 51.2-51.2 51.2-51.2-22.528-51.2-51.2 22.528-51.2 51.2-51.2z"  ></path><path d="M743.424 742.4c17.408 0 30.72-13.312 30.72-30.72s-13.312-30.72-30.72-30.72-30.72 13.312-30.72 30.72 13.312 30.72 30.72 30.72m0 20.48c-28.672 0-51.2-22.528-51.2-51.2s22.528-51.2 51.2-51.2 51.2 22.528 51.2 51.2-23.552 51.2-51.2 51.2z"  ></path><path d="M282.624 660.48c28.672 0 51.2 22.528 51.2 51.2s-22.528 51.2-51.2 51.2-51.2-22.528-51.2-51.2 22.528-51.2 51.2-51.2z"  ></path><path d="M282.624 742.4c17.408 0 30.72-13.312 30.72-30.72s-13.312-30.72-30.72-30.72-30.72 13.312-30.72 30.72 13.312 30.72 30.72 30.72m0 20.48c-28.672 0-51.2-22.528-51.2-51.2s22.528-51.2 51.2-51.2 51.2 22.528 51.2 51.2-23.552 51.2-51.2 51.2zM415.744 721.92c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h276.48c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-276.48"  ></path><path d="M299.008 692.224c-3.072 5.12-9.216 6.144-14.336 3.072-5.12-3.072-6.144-9.216-3.072-14.336l163.84-245.76c3.072-5.12 9.216-6.144 14.336-3.072 5.12 3.072 6.144 9.216 3.072 14.336l-163.84 245.76M490.496 343.04c-3.072-5.12-2.048-11.264 3.072-14.336 5.12-3.072 11.264-2.048 14.336 3.072l176.128 260.096c3.072 5.12 2.048 11.264-3.072 14.336-5.12 3.072-11.264 2.048-14.336-3.072L490.496 343.04"  ></path><path d="M282.624 588.8c-67.584 0-122.88 55.296-122.88 122.88s55.296 122.88 122.88 122.88 122.88-55.296 122.88-122.88c0-6.144 4.096-10.24 10.24-10.24s10.24 4.096 10.24 10.24c0 78.848-64.512 143.36-143.36 143.36s-143.36-64.512-143.36-143.36 64.512-143.36 143.36-143.36c6.144 0 10.24 4.096 10.24 10.24s-5.12 10.24-10.24 10.24z"  ></path></symbol><symbol id="icon-wuquanxian" viewBox="0 0 1024 1024"><path d="M498.40708 122.336283c-102.4 0-185.769912 83.369912-185.769912 185.769912v226.548672c0 7.249558 6.343363 13.59292 13.59292 13.592921h344.353983c7.249558 0 13.59292-6.343363 13.59292-13.592921V308.106195c0-102.4-83.369912-185.769912-185.769911-185.769912z m0 72.495575c62.527434 0 113.274336 50.746903 113.274336 113.274337v117.805309c0 12.686726-9.968142 22.654867-22.654867 22.654868H407.787611c-12.686726 0-22.654867-9.968142-22.654868-22.654868V308.106195c0-62.527434 50.746903-113.274336 113.274337-113.274337z" fill="#FFFFFF" ></path><path d="M670.584071 552.778761H326.230088c-9.968142 0-18.123894-8.155752-18.123893-18.123894V308.106195c0-105.118584 85.182301-190.300885 190.300885-190.300885s190.300885 85.182301 190.300885 190.300885v226.548672c0 9.968142-8.155752 18.123894-18.123894 18.123894zM498.40708 126.867257c-99.681416 0-181.238938 81.557522-181.238938 181.238938v226.548672c0 5.437168 3.624779 9.061947 9.061946 9.061947h344.353983c5.437168 0 9.061947-3.624779 9.061947-9.061947V308.106195c0-99.681416-81.557522-181.238938-181.238938-181.238938z m90.619469 326.230088H407.787611c-15.40531 0-27.185841-11.780531-27.185841-27.185841V308.106195c0-65.246018 52.559292-117.80531 117.80531-117.80531s117.80531 52.559292 117.805309 117.80531v117.805309c0 15.40531-11.780531 27.185841-27.18584 27.185841zM498.40708 199.362832c-59.80885 0-108.743363 48.934513-108.743363 108.743363v117.805309c0 9.968142 8.155752 18.123894 18.123894 18.123894h181.238938c9.968142 0 18.123894-8.155752 18.123893-18.123894V308.106195c0-59.80885-48.934513-108.743363-108.743362-108.743363z" fill="#9BBBCC" ></path><path d="M240.141593 376.070796h516.530973c9.968142 0 18.123894 8.155752 18.123894 18.123894v407.787611c0 9.968142-8.155752 18.123894-18.123894 18.123894h-516.530973c-9.968142 0-18.123894-8.155752-18.123894-18.123894v-407.787611c0-9.968142 8.155752-18.123894 18.123894-18.123894z" fill="#E3F2FA" ></path><path d="M756.672566 824.637168h-516.530973c-12.686726 0-22.654867-9.968142-22.654867-22.654867v-407.787611c0-12.686726 9.968142-22.654867 22.654867-22.654867h516.530973c12.686726 0 22.654867 9.968142 22.654868 22.654867v407.787611c0 12.686726-9.968142 22.654867-22.654868 22.654867z m-516.530973-444.035398c-7.249558 0-13.59292 6.343363-13.59292 13.59292v407.787611c0 7.249558 6.343363 13.59292 13.59292 13.59292h516.530973c7.249558 0 13.59292-6.343363 13.592921-13.59292v-407.787611c0-7.249558-6.343363-13.59292-13.592921-13.59292h-516.530973z" fill="#9BBBCC" ></path><path d="M498.40708 579.964602m-99.681416 0a99.681416 99.681416 0 1 0 199.362832 0 99.681416 99.681416 0 1 0-199.362832 0Z" fill="#FFFFFF" ></path><path d="M498.40708 681.458407c-56.184071 0-101.493805-45.309735-101.493806-101.493805s45.309735-101.493805 101.493806-101.493806 101.493805 45.309735 101.493805 101.493806-45.309735 101.493805-101.493805 101.493805z m0-199.362832c-53.465487 0-97.869027 43.497345-97.869027 97.869027S444.941593 677.833628 498.40708 677.833628 596.276106 633.430088 596.276106 579.964602 551.872566 482.095575 498.40708 482.095575z" fill="#C6D9E3" ></path><path d="M326.230088 901.663717a181.238938 22.654867 0 1 0 362.477877 0 181.238938 22.654867 0 1 0-362.477877 0Z" fill="#D0E0EA" ></path><path d="M489.345133 578.152212c-10.874336-3.624779-18.123894-13.59292-18.123894-25.373451 0-15.40531 11.780531-27.185841 27.185841-27.185841s27.185841 11.780531 27.18584 27.185841c0 11.780531-7.249558 21.748673-18.123893 25.373451V625.274336c0 5.437168-3.624779 9.061947-9.061947 9.061947s-9.061947-3.624779-9.061947-9.061947v-47.122124z" fill="#CDE4F0" ></path><path d="M167.646018 294.513274m-31.716814 0a31.716814 31.716814 0 1 0 63.433628 0 31.716814 31.716814 0 1 0-63.433628 0Z" fill="#E0EEF6" ></path><path d="M167.646018 330.761062c-19.936283 0-36.247788-16.311504-36.247788-36.247788s16.311504-36.247788 36.247788-36.247787 36.247788 16.311504 36.247787 36.247787-16.311504 36.247788-36.247787 36.247788z m0-63.433628c-15.40531 0-27.185841 11.780531-27.185841 27.18584s11.780531 27.185841 27.185841 27.185841 27.185841-11.780531 27.18584-27.185841-11.780531-27.185841-27.18584-27.18584z" fill="#C2D5E0" ></path><path d="M833.699115 643.39823m-18.123894 0a18.123894 18.123894 0 1 0 36.247788 0 18.123894 18.123894 0 1 0-36.247788 0Z" fill="#E0EEF6" ></path><path d="M833.699115 666.053097c-12.686726 0-22.654867-9.968142-22.654867-22.654867s9.968142-22.654867 22.654867-22.654867 22.654867 9.968142 22.654867 22.654867-9.968142 22.654867-22.654867 22.654867z m0-36.247787c-7.249558 0-13.59292 6.343363-13.59292 13.59292s6.343363 13.59292 13.59292 13.59292 13.59292-6.343363 13.59292-13.59292-6.343363-13.59292-13.59292-13.59292z" fill="#C2D5E0" ></path><path d="M874.477876 376.070796m-13.59292 0a13.59292 13.59292 0 1 0 27.18584 0 13.59292 13.59292 0 1 0-27.18584 0Z" fill="#E0EEF6" ></path><path d="M874.477876 391.476106c-9.061947 0-16.311504-7.249558-16.311504-16.311504s7.249558-16.311504 16.311504-16.311505 16.311504 7.249558 16.311505 16.311505-7.249558 16.311504-16.311505 16.311504z m0-27.185841c-6.343363 0-10.874336 5.437168-10.874336 10.874337s5.437168 10.874336 10.874336 10.874336 10.874336-5.437168 10.874336-10.874336-4.530973-10.874336-10.874336-10.874337z" fill="#C2D5E0" ></path><path d="M31.716814 493.876106m-13.59292 0a13.59292 13.59292 0 1 0 27.185841 0 13.59292 13.59292 0 1 0-27.185841 0Z" fill="#E0EEF6" ></path><path d="M31.716814 509.281416c-9.061947 0-16.311504-7.249558-16.311504-16.311504s7.249558-16.311504 16.311504-16.311505 16.311504 7.249558 16.311505 16.311505-7.249558 16.311504-16.311505 16.311504z m0-27.185841c-6.343363 0-10.874336 5.437168-10.874336 10.874337s5.437168 10.874336 10.874336 10.874336 10.874336-5.437168 10.874336-10.874336-4.530973-10.874336-10.874336-10.874337z" fill="#C2D5E0" ></path><path d="M701.39469 153.146903c-1.812389 0-3.624779-0.906195-3.624778-2.718584-9.061947-19.030088-28.092035-35.341593-55.277877-47.122124-2.718584-0.906195-3.624779-3.624779-2.718584-6.343363 0.906195-2.718584 3.624779-3.624779 6.343363-2.718584 29.904425 12.686726 49.840708 29.904425 60.715044 51.653097 0.906195 1.812389 0 4.530973-1.812389 6.343363-2.718584 0.906195-2.718584 0.906195-3.624779 0.906195zM746.704425 144.99115c-1.812389 0-3.624779-0.906195-4.530974-2.718584-19.936283-43.497345-52.559292-71.589381-96.962832-85.182301-2.718584-0.906195-3.624779-3.624779-2.718584-5.437168 0.906195-2.718584 3.624779-3.624779 5.437169-2.718584 47.122124 14.499115 81.557522 44.40354 103.306194 90.619469 0.906195 2.718584 0 4.530973-1.812389 6.343363-1.812389-1.812389-2.718584-0.906195-2.718584-0.906195z" fill="#9BBBCC" ></path><path d="M915.256637 271.858407h13.592921c2.718584 0 4.530973 1.812389 4.530973 4.530974s-1.812389 4.530973-4.530973 4.530973H915.256637v13.59292c0 2.718584-1.812389 4.530973-4.530973 4.530974s-4.530973-1.812389-4.530974-4.530974V280.920354h-13.59292c-2.718584 0-4.530973-1.812389-4.530974-4.530973s1.812389-4.530973 4.530974-4.530974h13.59292v-13.59292c0-2.718584 1.812389-4.530973 4.530974-4.530974s4.530973 1.812389 4.530973 4.530974V271.858407z" fill="#C2D5E0" ></path><path d="M77.026549 412.318584h18.123893c2.718584 0 4.530973 1.812389 4.530974 4.530974s-1.812389 4.530973-4.530974 4.530973h-18.123893v18.123894c0 2.718584-1.812389 4.530973-4.530974 4.530973s-4.530973-1.812389-4.530973-4.530973v-18.123894h-18.123894c-2.718584 0-4.530973-1.812389-4.530973-4.530973s1.812389-4.530973 4.530973-4.530974h18.123894v-18.123894c0-2.718584 1.812389-4.530973 4.530973-4.530973s4.530973 1.812389 4.530974 4.530973v18.123894zM983.221239 548.247788h18.123894c2.718584 0 4.530973 1.812389 4.530973 4.530973s-1.812389 4.530973-4.530973 4.530974h-18.123894v18.123893c0 2.718584-1.812389 4.530973-4.530974 4.530974s-4.530973-1.812389-4.530973-4.530974v-18.123893h-18.123894c-2.718584 0-4.530973-1.812389-4.530973-4.530974s1.812389-4.530973 4.530973-4.530973h18.123894v-18.123894c0-2.718584 1.812389-4.530973 4.530973-4.530974s4.530973 1.812389 4.530974 4.530974v18.123894z" fill="#9BBBCC" ></path></symbol><symbol id="icon-xuexizhongxin" viewBox="0 0 1081 1024"><path d="M946.907429 6.309366H635.102609c-36.145292 0-68.945093 14.533168-92.91687 38.13605A131.510857 131.510857 0 0 0 449.389714 6.309366H137.591255C64.422957 6.309366 4.916472 65.815851 4.916472 138.984149v643.472696a39.707031 39.707031 0 0 0 39.751553 39.751553h378.142211c55.149714 0 84.22241 45.348571 85.214609 46.957714 0.496099 0.871354 1.240248 1.367453 1.736348 2.238807 0.623304 0.871354 1.246609 1.615503 1.863552 2.353292 2.111602 2.493217 4.477615 4.725665 6.958112 6.716423l1.494659 1.113043c6.455652 4.35041 14.037068 6.958112 21.987378 6.958112 3.472696 0 7.078957-0.496099 10.558013-1.488298 1.488298-0.375255 2.734907-1.367453 4.096-1.863553 1.990758-0.744149 3.854311-1.615503 5.717863-2.607702 1.615503-0.998559 2.976596-2.111602 4.471255-3.231006a40.19677 40.19677 0 0 0 4.719304-4.471255c0.992199-1.119404 2.111602-2.359652 2.982957-3.606261 0.368894-0.616944 0.992199-1.113043 1.367453-1.736348 1.240248-1.990758 30.306584-47.332969 85.462659-47.332968h378.13585a39.707031 39.707031 0 0 0 39.751553-39.751553V138.984149c0.25441-73.168298-59.252075-132.674783-132.420372-132.674783zM422.931081 774.385689H50.576696V126.263652c0-29.320745 56.154634-69.275826 85.348174-69.275826h311.798459c29.320745 0 72.475031 40.082286 72.475031 69.275826v667.12646c-21.739329-11.054112-65.841292-19.004422-97.267279-19.004423z m602.582658 0h-363.825292c-31.425988 0-57.884621 7.950311-79.63031 19.004423V126.263652c0-29.320745 27.120099-67.584 56.313639-67.584h330.879205c29.320745 0 56.141913 38.39046 56.141913 67.584v648.122037h0.127205z"  ></path><path d="M403.055304 251.802236H184.173714c-21.987379 0-39.751553 14.208795-39.751553 31.801242 0 17.586087 17.764174 31.801242 39.751553 31.801242h218.88159c21.987379 0 39.751553-14.215155 39.751553-31.801242 0-17.490683-17.764174-31.801242-39.751553-31.801242z m0 248.049689H184.173714c-21.987379 0-39.751553 14.208795-39.751553 31.801243 0 17.586087 17.764174 31.801242 39.751553 31.801242h218.88159c21.987379 0 39.751553-14.215155 39.751553-31.801242 0-17.490683-17.764174-31.801242-39.751553-31.801243z m497.517715-254.409937H681.564224c-21.987379 0-39.751553 14.208795-39.751553 31.801242 0 17.586087 17.764174 31.801242 39.751553 31.801242h218.88159c21.987379 0 39.751553-14.215155 39.751552-31.801242 0.127205-17.490683-17.636969-31.801242-39.624347-31.801242z m0 254.409937H681.564224c-21.987379 0-39.751553 14.208795-39.751553 31.801243 0 17.586087 17.764174 31.801242 39.751553 31.801242h218.88159c21.987379 0 39.751553-14.215155 39.751552-31.801242 0.127205-17.490683-17.636969-31.801242-39.624347-31.801243z m139.251279 457.638957H52.249441c-21.987379 0-39.751553 14.208795-39.751553 31.801242s17.764174 31.801242 39.751553 31.801242h987.574857c21.987379 0 39.751553-14.208795 39.751553-31.801242 0-17.490683-17.764174-31.801242-39.751553-31.801242z"  ></path></symbol><symbol id="icon-kecheng" viewBox="0 0 1024 1024"><path d="M996.787309 145.845804c-1.815034-0.26092-18.690715-2.600646-48.777789-2.600646-56.224704 0-155.561098 8.41075-283.086836 52.292368 130.994692-74.191116 265.118999-80.908025 266.951142-80.986443 11.373547-0.461957 20.206332-10.063244 19.760059-21.419682-0.479066-11.390657-10.141663-20.34606-21.415404-19.761485-8.52624 0.345042-167.074373 7.98729-313.77417 102.846695 110.928087-103.553888 273.184707-134.927028 275.317693-135.333379 11.172511-2.07738 18.552413-12.82643 16.513529-23.99894-2.054567-11.172511-12.79934-18.613722-23.97185-16.536342-11.818395 2.184314-271.914326 52.253872-372.444108 244.189789-100.746503-191.496774-360.296355-241.520706-372.11475-243.70502-11.134014-2.031754-21.900174 5.363832-23.977554 16.536342-2.07738 11.211007 5.341019 21.944373 16.536342 23.99894 2.155798 0.400648 164.673338 31.662575 275.622812 135.572912-146.805306-95.060442-305.608656-102.741186-314.142024-103.063416-11.272316-0.685806-20.952022 8.387938-21.413979 19.760059-0.446273 11.373547 8.387938 20.974834 19.760059 21.415404 1.854956 0.082696 136.11899 6.594291 267.336106 81.107636-127.70824-44.004236-227.162975-52.43067-283.448988-52.43067-30.085649 0-46.984142 2.361112-48.799176 2.623458-16.051573 2.3383-27.563422 16.735953-26.355776 32.910144l51.318552 684.664164c1.191963 15.689421 13.99558 28.009695 29.723498 28.570031 254.270143 9.119369 409.809854 124.099559 411.341155 125.230213 5.48645 4.15476 12.057928 6.272061 18.652218 6.272061 4.679451 0 9.380289-1.069344 13.73466-3.225143 2.723264-1.333116 5.139982-3.085415 7.278671-5.064415 19.219684-13.673351 169.697831-115.144156 409.202466-123.698911 15.727918-0.561762 28.532961-12.882036 29.724923-28.571457l51.300016-684.686977C1024.335047 162.566074 1012.838882 148.208343 996.787309 145.845804L996.787309 145.845804zM480.968352 937.089388c-65.413937-36.664256-193.022372-93.59045-369.169063-104.985384l-46.967033-626.407706c3.447566-0.078419 7.156053-0.139728 11.188194-0.139728 71.18412 0 216.865901 14.420466 404.947901 108.934829L480.968352 937.089388 480.968352 937.089388zM912.232107 831.602125c-176.146691 11.374973-303.755125 68.321128-369.191875 105.003919l0-622.615097c188.082-94.520067 333.780891-108.894907 404.963585-108.894907 3.993645 0 7.724944 0.038496 11.172511 0.122618L912.232107 831.602125 912.232107 831.602125zM912.232107 831.602125" fill="#8a8a8a" ></path></symbol><symbol id="icon-yemian" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z"  ></path><path d="M464.782222 331.377778h120.888889a24.746667 24.746667 0 0 0 23.04-15.075556l48.071111-113.777778a23.324444 23.324444 0 0 0-2.56-22.755555 26.737778 26.737778 0 0 0-20.195555-9.102222h-217.315556a24.462222 24.462222 0 0 0-20.764444 10.24 22.755556 22.755556 0 0 0-2.275556 21.902222l48.355556 113.777778a25.031111 25.031111 0 0 0 22.755555 14.791111zM568.888889 284.444444h-88.177778l-28.444444-68.835555H597.333333z m-43.52 574.577778a25.031111 25.031111 0 0 0 17.92-5.688889l132.835555-137.671111a23.893333 23.893333 0 0 0 6.257778-21.902222L597.333333 394.24a22.755556 22.755556 0 0 0-22.755555-17.066667h-96.711111a23.324444 23.324444 0 0 0-23.04 17.066667L369.777778 692.622222a21.617778 21.617778 0 0 0 5.973333 21.902222l133.688889 138.808889a17.351111 17.351111 0 0 0 15.928889 6.826667z m106.097778-166.4l-106.097778 108.942222-106.382222-110.08 76.231111-268.515555h59.164444z" fill="#FFFFFF" ></path></symbol><symbol id="icon-bianzu" viewBox="0 0 1024 1024"><path d="M512 1024C229.233778 1024 0 794.766222 0 512S229.233778 0 512 0s512 229.233778 512 512-229.233778 512-512 512z m-60.359111-553.528889C321.848889 509.468444 227.555556 626.972444 227.555556 765.838222h42.439111c0-147.968 123.477333-267.889778 275.825777-267.889778v-0.085333c82.488889-2.730667 148.536889-68.551111 148.536889-149.333333C694.328889 266.012444 625.493333 199.111111 540.529778 199.111111c-84.963556 0-153.827556 66.901333-153.827556 149.418667-0.056889 48.469333 24.177778 93.952 64.938667 121.941333z m343.239111 51.882667l-198.542222 192.853333-98.986667-96.170667-30.008889 29.127112 129.024 125.297777L824.888889 551.537778l-30.008889-29.155556z m-254.350222-65.649778c-61.525333 0-111.388444-48.440889-111.388445-108.174222 0-59.761778 49.863111-108.202667 111.388445-108.202667 61.525333 0 111.388444 48.440889 111.388444 108.202667 0 59.733333-49.863111 108.174222-111.388444 108.174222z"  ></path></symbol><symbol id="icon-Page-1" viewBox="0 0 1691 1024"><path d="M133.565217 0h1037.80174a133.565217 133.565217 0 0 1 133.565217 133.565217v756.869566a133.565217 133.565217 0 0 1-133.565217 133.565217H133.565217a133.565217 133.565217 0 0 1-133.565217-133.565217V133.565217a133.565217 133.565217 0 0 1 133.565217-133.565217z m1263.08174 267.130435l192.333913-145.14087a64.111304 64.111304 0 0 1 89.043478 12.466087 63.22087 63.22087 0 0 1 12.911304 38.733913v675.394783a64.111304 64.111304 0 0 1-102.845217 51.2L1396.646957 756.869565a64.556522 64.556522 0 0 1-25.822609-51.2V316.104348a64.556522 64.556522 0 0 1 25.822609-48.973913z" fill="#4CACFF" ></path><path d="M365.078261 249.766957h183.874782a299.631304 299.631304 0 0 1 57.433044 5.342608 156.716522 156.716522 0 0 1 56.542609 30.274783 123.325217 123.325217 0 0 1 39.17913 48.528695 159.387826 159.387826 0 0 1 15.582609 72.125218 154.490435 154.490435 0 0 1-39.624348 102.845217 150.038261 150.038261 0 0 1-119.318261 49.864348H442.10087V756.869565H365.078261z m77.022609 236.410434h113.530434a81.92 81.92 0 0 0 64.556522-26.267826 85.481739 85.481739 0 0 0 20.48-55.652174 94.831304 94.831304 0 0 0-8.45913-44.521739 64.556522 64.556522 0 0 0-24.041739-24.932174 99.283478 99.283478 0 0 0-55.206957-14.246956H442.10087zM801.391304 379.325217V302.302609l72.125218-52.535652h72.570435V756.869565h-73.906087V326.789565z" fill="#FFFFFF" ></path></symbol><symbol id="icon-Page-3" viewBox="0 0 1691 1024"><path d="M133.565217 0h1037.80174a133.565217 133.565217 0 0 1 133.565217 133.565217v756.869566a133.565217 133.565217 0 0 1-133.565217 133.565217H133.565217a133.565217 133.565217 0 0 1-133.565217-133.565217V133.565217a133.565217 133.565217 0 0 1 133.565217-133.565217z m1263.08174 267.130435l192.333913-145.14087a64.111304 64.111304 0 0 1 89.043478 12.466087 63.22087 63.22087 0 0 1 12.911304 38.733913v675.394783a64.111304 64.111304 0 0 1-102.845217 51.2L1396.646957 756.869565a64.556522 64.556522 0 0 1-25.822609-51.2V316.104348a64.556522 64.556522 0 0 1 25.822609-48.973913z" fill="#4CACFF" ></path><path d="M365.078261 249.766957h183.874782a299.631304 299.631304 0 0 1 57.433044 5.342608 156.716522 156.716522 0 0 1 56.542609 30.274783 123.325217 123.325217 0 0 1 39.17913 48.528695 159.387826 159.387826 0 0 1 15.582609 72.125218 154.490435 154.490435 0 0 1-39.624348 102.845217 150.038261 150.038261 0 0 1-119.318261 49.864348H442.10087V756.869565H365.078261z m77.022609 236.410434h113.530434a81.92 81.92 0 0 0 64.556522-26.267826 85.481739 85.481739 0 0 0 20.48-55.652174 94.831304 94.831304 0 0 0-8.45913-44.521739 64.556522 64.556522 0 0 0-24.041739-24.932174 99.283478 99.283478 0 0 0-55.206957-14.246956H442.10087zM859.269565 463.471304h24.932174a79.693913 79.693913 0 0 0 57.878261-20.48 70.344348 70.344348 0 0 0 20.48-51.645217 73.46087 73.46087 0 0 0-21.370435-52.535652A74.796522 74.796522 0 0 0 890.434783 318.330435a67.673043 67.673043 0 0 0-42.295653 14.692174 75.686957 75.686957 0 0 0-27.15826 44.521739h-74.796522a147.366957 147.366957 0 0 1 44.521739-94.831305 133.565217 133.565217 0 0 1 93.94087-38.733913 142.914783 142.914783 0 0 1 149.593043 144.250435A158.497391 158.497391 0 0 1 1024 445.217391a120.653913 120.653913 0 0 1-44.521739 48.528696 129.558261 129.558261 0 0 1 44.521739 49.864348 146.921739 146.921739 0 0 1 13.356522 61.44 148.257391 148.257391 0 0 1-44.521739 112.194782 152.264348 152.264348 0 0 1-109.968696 44.52174 139.353043 139.353043 0 0 1-91.714783-33.391305 156.271304 156.271304 0 0 1-51.645217-96.612174h72.570435a96.612174 96.612174 0 0 0 27.603478 40.96 67.673043 67.673043 0 0 0 47.638261 16.473044 72.125217 72.125217 0 0 0 57.878261-21.370435 77.022609 77.022609 0 0 0 23.151304-58.323478 80.584348 80.584348 0 0 0-23.151304-60.104348 76.577391 76.577391 0 0 0-54.761739-21.815652h-31.165218z" fill="#FFFFFF" ></path></symbol><symbol id="icon-Page" viewBox="0 0 1691 1024"><path d="M133.565217 0h1037.80174a133.565217 133.565217 0 0 1 133.565217 133.565217v756.869566a133.565217 133.565217 0 0 1-133.565217 133.565217H133.565217a133.565217 133.565217 0 0 1-133.565217-133.565217V133.565217a133.565217 133.565217 0 0 1 133.565217-133.565217z m1263.08174 267.130435l192.333913-145.14087a64.111304 64.111304 0 0 1 89.043478 12.466087 63.22087 63.22087 0 0 1 12.911304 38.733913v675.394783a64.111304 64.111304 0 0 1-102.845217 51.2L1396.646957 756.869565a64.556522 64.556522 0 0 1-25.822609-51.2V316.104348a64.556522 64.556522 0 0 1 25.822609-48.973913z" fill="#4CACFF" ></path><path d="M365.078261 249.766957h183.874782a299.631304 299.631304 0 0 1 57.433044 5.342608 156.716522 156.716522 0 0 1 56.542609 30.274783 123.325217 123.325217 0 0 1 39.17913 48.528695 159.387826 159.387826 0 0 1 15.582609 72.125218 154.490435 154.490435 0 0 1-39.624348 102.845217 150.038261 150.038261 0 0 1-119.318261 49.864348H442.10087V756.869565H365.078261z m77.022609 236.410434h113.530434a81.92 81.92 0 0 0 64.556522-26.267826 85.481739 85.481739 0 0 0 20.48-55.652174 94.831304 94.831304 0 0 0-8.45913-44.521739 64.556522 64.556522 0 0 0-24.041739-24.932174 99.283478 99.283478 0 0 0-55.206957-14.246956H442.10087zM756.869565 688.306087l198.121739-247.54087a105.961739 105.961739 0 0 0 15.582609-28.048695 104.626087 104.626087 0 0 0 2.671304-22.706087 74.351304 74.351304 0 0 0-17.808695-49.864348 67.227826 67.227826 0 0 0-52.090435-21.815652 68.563478 68.563478 0 0 0-49.864348 19.144348 82.810435 82.810435 0 0 0-24.486956 53.871304H756.869565a155.826087 155.826087 0 0 1 44.521739-104.626087 133.565217 133.565217 0 0 1 98.393044-40.96 146.476522 146.476522 0 0 1 106.406956 41.405217 141.133913 141.133913 0 0 1 41.850435 103.290435 139.798261 139.798261 0 0 1-30.72 89.043478l-162.949565 204.8h193.669565V756.869565H756.869565z" fill="#FFFFFF" ></path></symbol><symbol id="icon-xiaoxi1" viewBox="0 0 1024 1024"><path d="M768 512a255.2 255.2 0 0 1-75 181l45.25 45.25a320 320 0 0 0 0-452.55L693 331a255.2 255.2 0 0 1 75 181z"  ></path><path d="M896 512a382.8 382.8 0 0 1-112.47 271.53l45.25 45.25a448 448 0 0 0 0-633.57l-45.25 45.25A382.8 382.8 0 0 1 896 512z"  ></path><path d="M715.651707 715.650121m-22.627417 22.627417a32 32 0 1 0 45.254834-45.254834 32 32 0 1 0-45.254834 45.254834Z"  ></path><path d="M806.162728 806.150586m-22.627417 22.627417a32 32 0 1 0 45.254834-45.254834 32 32 0 1 0-45.254834 45.254834Z"  ></path><path d="M715.64795 308.34505m-22.627417 22.627417a32 32 0 1 0 45.254834-45.254834 32 32 0 1 0-45.254834 45.254834Z"  ></path><path d="M806.15795 217.83505m-22.627417 22.627417a32 32 0 1 0 45.254834-45.254834 32 32 0 1 0-45.254834 45.254834Z"  ></path><path d="M544 125.54h-19.33a63.77 63.77 0 0 0-43.82 17.36L292.35 320H128a32 32 0 0 0-32 32v320a32 32 0 0 0 32 32h164.35l188.5 177.1a63.77 63.77 0 0 0 43.82 17.36H544a64.07 64.07 0 0 0 64-64V189.54a64.07 64.07 0 0 0-64-64zM256 656h-96V384h96z m288 178.46h-19.33L320 642.16V381.84l204.67-192.3H544v644.92z"  ></path></symbol><symbol id="icon-bianji1" viewBox="0 0 1024 1024"><path d="M896 604.16h-64V832H192V192h254.4V128H192a64 64 0 0 0-64 64v640a64 64 0 0 0 64 64h640a64 64 0 0 0 64-64V604.16z" fill="#2C3E77" ></path><path d="M419.456 653.12l-48.576-41.6 425.6-496.64 48.64 41.6z" fill="#2C3E77" ></path></symbol><symbol id="icon-renzhengshangjia" viewBox="0 0 1778 1024"><path d="M1334.595368 978.081684l-14.982736-6.521263c-248.724211-107.897263-409.546105-352.202105-409.546106-622.053053V159.582316l13.689263-11.264a643.880421 643.880421 0 0 1 822.056422 0l13.635368 11.264v189.925052c0 269.850947-160.606316 514.155789-409.330526 622.053053l-15.521685 6.521263zM985.734737 194.991158v154.51621c0 234.442105 136.353684 447.056842 348.914526 546.384843a603.513263 603.513263 0 0 0 348.968421-546.384843V194.991158a568.427789 568.427789 0 0 0-348.968421-119.808c-126.544842 0-249.694316 42.469053-348.914526 119.808z m321.913263 508.227368h-0.646737c-41.013895-0.323368-64.835368-37.888-68.985263-45.433263l-142.982737-152.037052a37.241263 37.241263 0 0 1 16.060632-50.661053 38.049684 38.049684 0 0 1 50.930526 15.898947l142.120421 150.905263c0.485053 0.646737 1.509053 1.994105 2.694737 3.17979 1.616842-1.886316 3.664842-4.742737 6.03621-8.623158l229.807158-331.991579a38.211368 38.211368 0 0 1 50.122106-18.647579 37.618526 37.618526 0 0 1 18.755368 49.798737l-231.693474 335.602526c-25.653895 43.493053-53.140211 52.008421-72.218947 52.008421z"  ></path><path d="M1028.958316 816.936421c-17.138526-50.822737-73.781895-58.098526-121.101474-78.524632-52.008421-22.474105-109.621895-48.505263-161.522526-70.278736l-44.409263-12.39579c-17.677474-12.395789-34.977684-53.786947-44.409264-74.374737l-28.240842-4.096c1.455158-31.797895 20.695579-33.522526 28.240842-57.882947 6.682947-21.396211 0.700632-49.259789 11.264-69.146947 7.329684-13.797053 23.929263-13.850947 32.175158-25.70779 7.545263-10.725053 12.449684-29.372632 14.767158-42.522947 4.311579-24.037053 8.030316-56.858947-3.125894-80.680421-6.413474-13.689263-10.401684-14.982737-12.234106-31.582316-2.155789-20.156632 5.820632-85.800421 6.144-99.974737 0.808421-36.810105-0.053895-39.828211-8.730947-75.66821 0 0-10.617263-32.444632-27.162947-42.253474L637.574737 45.972211 617.094737 26.624C534.905263-25.168842 446.679579 11.156211 399.467789 30.773895 331.452632 53.355789 288.390737 121.586526 318.410105 267.317895c5.12 24.791579-13.312 35.947789-12.126316 49.583158 2.694737 29.696 3.233684 101.106526 30.612211 118.67621 2.533053 1.616842 22.042947 6.629053 21.881263 5.281684l8.084211 86.770527c6.844632 19.240421 23.228632 21.288421 28.025263 48.505263l-21.018948 5.173895c-9.431579 20.641684-26.731789 61.978947-44.409263 74.374736l-44.409263 12.39579c-51.846737 21.827368-109.514105 47.804632-161.468631 70.278737-47.319579 20.48-104.016842 27.701895-121.101474 78.524631 0 34.492632-3.233684 115.927579-2.317474 161.145263H452.715789l33.253053-232.286315-27.648-59.661474 63.757474-31.312842 53.733052 30.666105-29.58821 61.44 52.277895 231.208421h432.774736c0.862316-45.271579-2.317474-126.706526-2.317473-161.199158z"  ></path></symbol><symbol id="icon-shenfenzhenghaomaguizheng" viewBox="0 0 1638 1024"><path d="M995.185376 834.694718h-125.843918v-128.965708h172.977814a142.527578 142.527578 0 0 1 112.077341-35.6191 143.090523 143.090523 0 0 1 77.788839 35.6191h65.301684v55.424549l141.094625-125.280973V104.24728C1438.581761 46.622127 1386.995478 0 1340.015113 0H106.396709C30.040822 0 0 46.622127 0 104.24728v778.29781c0 57.625153 49.590385 104.24728 110.695566 104.24728h989.248859l-67.860527-73.489983a145.086421 145.086421 0 0 1-36.898522-78.607669zM869.341458 189.86618h428.094501v128.965708h-428.094501v-128.965708z m0 257.931415h428.094501v128.965708h-428.094501V447.797595z m-728.758601 385.464171s-1.535306-90.941295 18.884264-110.234974c20.470747-19.242502 28.812577-53.991596 137.409891-69.805248 108.546137-15.813652 97.236049-72.159384 100.716076-70.368194-0.665299-21.340754-2.814728-51.381576-2.814728-51.381575s-56.499262-23.643713-73.182921-70.368194c-35.004978-13.868931-30.347883-22.722529-33.776733-40.68561 0 0-10.542435-72.517622 13.050101-71.033493 0 0 15.35306 0 11.617149-16.683659-1.228245-27.737862-1.228245-81.575928 0.614123-99.9996 1.893544-18.526026 15.813652-68.577003 55.21984-75.895295 39.406188-7.420646 23.541359-3.633558 36.744992-5.629456 13.152455-1.79119 9.416544-9.211836 33.776733-9.211836l50.613922-10.235374c24.360189 0 39.969134 39.252658 53.121589 41.197379 13.152455 1.842367 16.274244-5.629455 43.193277-0.716476 39.406188 7.420646 33.930264 60.235174 35.823807 78.812377 1.842367 18.423673 5.322394 68.730534 1.586483 85.363016-3.735911 16.683659 7.932415 14.841292 7.932415 14.841291 28.147277 0 19.344856 71.033493 19.344856 71.033493-4.298857 18.781911-16.120713 21.08487-42.272093 37.359114-16.683659 46.826834-69.856425 81.21769-69.856425 81.21769s-0.255884 38.740889-0.460592 47.236249c0.767653 3.27532-6.03887 51.535106 86.540084 65.148153 108.597314 15.813652 127.328048 50.562746 147.798795 69.805248 20.470747 19.293679 22.671353 110.234974 22.671353 110.234974H140.582857z m1483.719758-168.730134a54.196303 54.196303 0 0 0-34.186148-18.116612 53.940419 53.940419 0 0 0-42.118562 13.203632l-263.663224 234.031818-107.420246-116.376198a53.684535 53.684535 0 0 0-76.304711-2.763551 54.963956 54.963956 0 0 0-2.712374 77.021187l143.192877 155.21944c8.444183 9.211836 19.958979 14.994822 32.241427 16.427775a55.782786 55.782786 0 0 0 31.013182-5.424748 44.523875 44.523875 0 0 0 11.92421-7.318292l303.12059-268.985619a54.963956 54.963956 0 0 0 4.912979-76.918832z"  ></path></symbol><symbol id="icon-yonghujiaose_wushuju" viewBox="0 0 1692 1024"><path d="M454.529406 945.631607h31.639427A15.673428 15.673428 0 0 1 501.54969 961.305035c0 8.651732-6.750023 15.673428-15.380857 15.673428H454.529406v31.639426A15.673428 15.673428 0 0 1 438.855979 1023.998746a15.443551 15.443551 0 0 1-15.673428-15.380857V976.978463h-31.639427A15.673428 15.673428 0 0 1 376.162267 961.305035c0-8.651732 6.750023-15.673428 15.380857-15.673428h31.639427v-31.639426A15.673428 15.673428 0 0 1 438.855979 898.611324c8.651732 0 15.673428 6.750023 15.673427 15.380857v31.639426zM52.244759 512.000104h21.106883A10.448952 10.448952 0 0 1 83.591615 522.449056c0 5.767821-4.493049 10.448952-10.239973 10.448952H52.244759v21.106883A10.448952 10.448952 0 0 1 41.795807 564.244864a10.281769 10.281769 0 0 1-10.448951-10.239973V532.898008H10.239973A10.448952 10.448952 0 0 1 0 522.449056c0-5.767821 4.493049-10.448952 10.239973-10.448952H31.346856v-21.106882A10.448952 10.448952 0 0 1 41.795807 480.653249c5.767821 0 10.448952 4.493049 10.448952 10.239973v21.106882z m1567.342781-480.651786V10.241436A10.281769 10.281769 0 0 0 1609.138588 0.001463a10.448952 10.448952 0 0 0-10.448952 10.239973V31.348318h-21.106883A10.281769 10.281769 0 0 0 1567.342781 41.79727c0 5.600638 4.597539 10.448952 10.239972 10.448952h21.106883v21.106883c0 5.746924 4.68113 10.239973 10.448952 10.239973a10.448952 10.448952 0 0 0 10.448952-10.239973V52.246222h21.106883c5.746924 0 10.239973-4.68113 10.239972-10.448952a10.448952 10.448952 0 0 0-10.239972-10.448952H1619.58754zM543.345497 355.265826a20.897904 20.897904 0 0 1 20.877006-20.897903H752.324535a20.897904 20.897904 0 1 1 0 41.795807H564.243401A20.83521 20.83521 0 0 1 543.345497 355.265826z m0 125.387423c0-11.535643 9.299567-20.897904 20.751619-20.897904h251.067415c11.452051 0 20.751618 9.278669 20.751619 20.897904 0 11.535643-9.299567 20.897904-20.751619 20.897904H564.097116A20.772516 20.772516 0 0 1 543.345497 480.653249z m0 125.387422c0-11.535643 9.320465-20.897904 20.856108-20.897903h104.57311c11.514745 0 20.856108 9.278669 20.856108 20.897903 0 11.535643-9.320465 20.897904-20.856108 20.897904h-104.57311A20.814312 20.814312 0 0 1 543.345497 606.040671zM188.081134 229.878404a62.693711 62.693711 0 1 1 0-125.387422 62.693711 62.693711 0 0 1 0 125.387422z m73.142663 417.958075a31.346856 31.346856 0 1 1 0-62.693711 31.346856 31.346856 0 0 1 0 62.693711zM188.081134 198.531548a31.346856 31.346856 0 1 0 0-62.693711 31.346856 31.346856 0 0 0 0 62.693711zM1630.036492 501.551153a62.693711 62.693711 0 1 1 0-125.387423 62.693711 62.693711 0 0 1 0 125.387423z m0-31.346856a31.346856 31.346856 0 1 0 0-62.693711 31.346856 31.346856 0 0 0 0 62.693711zM1295.670032 1003.100842a41.795807 41.795807 0 1 1 0-83.591615 41.795807 41.795807 0 0 1 0 83.591615z m0-20.897903a20.897904 20.897904 0 1 0 0-41.795808 20.897904 20.897904 0 0 0 0 41.795808zM1037.727206 567.839303A167.245924 167.245924 0 0 1 1170.282609 731.428094c0 20.856108 0.543345 20.856108-165.594989 20.856108S835.91615 752.284202 835.91615 731.428094c0-80.456929 56.842298-147.64369 132.555403-163.588791l17.324362 17.303465H982.201476l-16.760119 83.842389c-2.298769 11.36846 2.654034 27.188173 11.034093 35.254764L1004.68762 731.428094l25.704422-26.707521c8.045693-8.359161 12.66413-24.32516 10.36536-35.735416L1023.997283 585.142768h-3.594439l17.324362-17.303465zM1003.09938 543.34696a83.591615 83.591615 0 1 1 0-167.18323 83.591615 83.591615 0 0 1 0 167.18323z m-606.039209 188.081134V292.572115c0-46.184367 37.428146-83.591615 83.758798-83.591615H501.54969V188.082597c0-46.184367 37.428146-83.591615 83.758798-83.591615h710.194361A83.612513 83.612513 0 0 1 1379.261647 188.082597v438.855978c0 46.184367-37.428146 83.591615-83.758798 83.591615H1274.772128v20.897904c0 15.234572-4.075091 29.50784-11.180378 41.795807h115.732591c11.493847 0 20.83521 9.278669 20.83521 20.897904 0 11.535643-9.46675 20.897904-20.83521 20.897904H355.20167A20.814312 20.814312 0 0 1 334.36646 794.121805c0-11.535643 9.46675-20.897904 20.83521-20.897904h53.03888A83.110963 83.110963 0 0 1 397.060171 731.428094z m877.711957-62.693711h20.83521A41.858501 41.858501 0 0 0 1337.465839 627.001269V188.019903A41.795807 41.795807 0 0 0 1295.607338 146.286789H585.203998A41.858501 41.858501 0 0 0 543.345497 188.019903V208.9805h647.667833A83.612513 83.612513 0 0 1 1274.772128 292.572115v376.162268zM438.855979 292.509422v438.981365A41.795807 41.795807 0 0 0 480.71448 773.223901h710.403339A41.858501 41.858501 0 0 0 1232.976321 731.490787V292.509422A41.795807 41.795807 0 0 0 1191.117819 250.776308H480.71448A41.858501 41.858501 0 0 0 438.855979 292.509422zM1441.955358 794.121805c0-11.535643 9.46675-20.897904 20.83521-20.897904h83.717002c11.493847 0 20.83521 9.278669 20.835211 20.897904 0 11.535643-9.46675 20.897904-20.835211 20.897904h-83.717002A20.814312 20.814312 0 0 1 1441.955358 794.121805z" fill="#8A96A3" ></path></symbol><symbol id="icon-paixu1" viewBox="0 0 1024 1024"><path d="M538.0745 7.143179l335.327905 401.296447a18.137693 18.137693 0 0 1-3.291114 26.328909A20.47804 20.47804 0 0 1 857.897603 438.864143H146.285714L506.991761 7.143179a20.551176 20.551176 0 0 1 31.082739 0zM516.938238 1016.856821L877.644284 585.135857H166.032396C155.208289 585.135857 146.285714 593.546481 146.285714 603.931772c0 4.168744 1.462717 8.264352 4.24188 11.628602l335.327904 401.296447a20.551176 20.551176 0 0 0 31.08274 0z" fill="#999999" ></path></symbol><symbol id="icon-kong" viewBox="0 0 1024 1024"><path d="M948.378 520.448h-46.08l-74.343-123.34c-0.102-0.206-0.102-0.36-0.46-0.564 0-0.154 0-0.358-0.205-0.358a6.349 6.349 0 0 0-1.434-1.434 4.096 4.096 0 0 0-1.946-1.075c-0.204-0.359-0.563-0.359-0.972-0.512h-0.359L623.36 329.37c59.494-36.864 87.603-73.216 88.166-73.933a4.506 4.506 0 0 0-0.972-6.298 4.506 4.506 0 0 0-6.298 0.922c-0.563 0.717-29.9 38.502-92.211 75.673l-101.12-32.41a9.574 9.574 0 0 0-5.376 0l-7.936 2.51-216.474 69.324H168.55a23.296 23.296 0 0 0 0 46.49h11.418l-37.171 62.362h-71.68a23.245 23.245 0 1 0 0 46.49h44.032l-18.74 31.436a9.523 9.523 0 0 0-1.075 7.014 9.728 9.728 0 0 0 4.455 5.53l75.878 39.731v119.245c0 3.226 1.792 6.298 4.66 7.885l2.969 1.638 289.28 162.407a8.858 8.858 0 0 0 8.448 5.734c0.717 0 1.229 0 1.997-0.205h0.102c0.768 0 1.434 0.205 2.355 0.205a11.264 11.264 0 0 0 3.943-0.922l332.851-165.324 1.843-0.922a8.704 8.704 0 0 0 5.018-7.936V663.45l51.61 1.075a23.194 23.194 0 1 0 0.972-46.439l-52.531-1.075v-25.446l59.238-24.679h59.904a23.296 23.296 0 0 0 0.052-46.438zM792.883 402.483L511.078 508.058v-127.95a499.61 499.61 0 0 0 91.444-38.604l190.361 60.98zM511.078 370.74v-58.521l79.565 25.497a490.342 490.342 0 0 1-79.565 33.024z m-17.97-54.579v60.006c-36.506 10.24-77.825 17.818-124.724 20.43a4.557 4.557 0 0 0-4.3 4.71 4.557 4.557 0 0 0 4.505 4.25h0.256a591.718 591.718 0 0 0 124.262-20.02v129.382l-15.053 5.53L221.184 403.2l271.923-87.04z m-303.924 80.026zM116.736 553.01l83.098-139.571L468.48 535.91l-73.523 162.97-205.21-107.622-73.011-38.247z m278.426 166.195a8.192 8.192 0 0 0 7.014 0.512 9.626 9.626 0 0 0 5.376-4.864l64.563-142.796V874.24L193.69 718.285V613.632l201.472 105.574z m416.102 1.383l-321.126 159.18V559.259l89.036 129.28c2.51 3.584 6.964 4.864 10.957 3.225l221.133-92.62v121.446z m5.58-143.155c-0.511 0.204-1.074 0.358-1.586 0.768L589.926 672.46l-95.692-138.855 322.201-120.678 79.36 131.482-78.95 33.024z" fill="#9C9C9C" ></path><path d="M485.58 901.222c-0.92 0-1.638-0.204-2.354-0.204h-0.103c-0.768 0.204-1.28 0.204-1.997 0.204a8.858 8.858 0 0 1-8.448-5.734l-289.28-162.406c-15.206 14.387-23.808 30.054-23.808 46.438 0 70.349 153.344 127.386 342.426 127.386 189.03 0 342.374-57.037 342.374-127.386 0-15.667-7.987-30.618-21.913-44.493L489.626 900.352a13.056 13.056 0 0 1-4.045 0.87z" fill="#E5E5E4" ></path><path d="M816.435 412.877L494.234 533.555l95.692 138.855 225.332-94.26c0.563-0.41 1.075-0.563 1.587-0.768l78.95-33.075-79.36-131.43z" fill="#FFFFFF" ></path><path d="M590.08 691.866a9.114 9.114 0 0 1-10.957-3.226l-89.037-129.28v320.512l321.127-159.18V599.346L590.08 691.866z" fill="#E5E5E4" ></path><path d="M511.078 370.74a487.629 487.629 0 0 0 79.565-33.076l-79.565-25.446v58.521z m0 137.318l281.805-105.575-190.31-60.979c-25.6 14.08-56.115 27.546-91.443 38.605v127.949z m-33.075 12.39l15.053-5.53V385.536c-36.454 10.035-77.67 17.408-124.16 20.02h-0.256a4.557 4.557 0 0 1-4.506-4.25 4.454 4.454 0 0 1 4.25-4.71 584.704 584.704 0 0 0 124.723-20.43V316.16L221.184 403.2l256.82 117.248z" fill="#FFFFFF" ></path><path d="M472.115 874.24V572.058l-64.563 142.796a9.626 9.626 0 0 1-8.243 5.428 8.5 8.5 0 0 1-4.147-1.076L193.69 613.632v104.653L472.115 874.24z" fill="#E5E5E4" ></path><path d="M394.957 698.88l73.523-162.97-268.646-122.47-83.098 139.571 73.011 38.298z" fill="#FFFFFF" ></path><path d="M221.389 326.912c267.417-11.213 405.35-159.59 406.63-161.075 1.639-1.843 1.536-4.66-0.307-6.349s-4.66-1.587-6.298 0.307c-1.382 1.434-136.704 147.098-400.435 158.106a4.608 4.608 0 0 0-4.3 4.71 4.608 4.608 0 0 0 4.505 4.301h0.205z" fill="#9C9C9C" ></path></symbol><symbol id="icon-shouji" viewBox="0 0 1024 1024"><path d="M256 960V64h512v896H256z m0 64h512a64 64 0 0 0 64-64V64a64 64 0 0 0-64-64H256a64 64 0 0 0-64 64v896a64 64 0 0 0 64 64zM256 192V128h512v64H256z m0 632.32v-64h512v64H256z m192 96v-64h128v64H448z"  ></path></symbol><symbol id="icon-yinhangqia1" viewBox="0 0 1024 1024"><path d="M887.0462301677038 159.14585414162968h-15.53445925925926c-13.315251313777777 0-22.19208430933333 8.876834209185184-22.19208430933333 22.19208430933333s8.876834209185184 22.19208430933333 22.19208430933333 22.19208430933333h15.53445925925926c11.096042154666666 0 22.19208430933333 8.876834209185184 22.19208552296296 22.19208552296296v106.5220056557037H119.20010141392589v-106.5220056557037c0-11.096042154666666 8.876834209185184-22.19208430933333 22.19208430933333-22.19208552296296h596.9670781155555c13.315251313777777 0 22.19208430933333-8.876834209185184 22.19208430933333-22.19208430933333s-8.876834209185184-22.19208430933333-22.19208430933333-22.19208430933333h-599.1862860610371c-35.50733562311111 0-66.57625414162963 28.849710573037036-66.57625414162963 66.57625414162963v565.8981583834073c0 35.50733562311111 28.849710573037036 66.57625414162963 66.57625414162963 66.57625414162963h747.8732523899258c35.50733562311111 0 66.57625414162963-28.849710573037036 66.57625414162963-66.57625414162963V225.72210828325927c0-37.72654356859259-31.06891851851852-66.57625414162963-66.57625414162963-66.57625414162963z m22.19208552296296 630.2552045795555c0 11.096042154666666-8.876834209185184 22.19208430933333-22.19208552296296 22.19208430933333H139.17297777777782c-11.096042154666666 0-22.19208430933333-8.876834209185184-22.19208430933333-22.19208430933333V376.62828377125925h790.038213063111v412.77277494992586z" fill="" ></path><path d="M216.8452740740741 538.6305014139259h310.6891851851852c13.315251313777777 0 22.19208430933333-8.876834209185184 22.19208430933333-22.19208430933333s-8.876834209185184-22.19208430933333-22.19208430933333-22.19208430933333h-310.6891851851852c-13.315251313777777 0-22.19208430933333 8.876834209185184-22.19208430933333 22.19208430933333s11.096042154666666 22.19208430933333 22.19208430933333 22.19208430933333zM618.5220068693334 538.6305014139259h55.480210773333326c13.315251313777777 0 22.19208430933333-8.876834209185184 22.19208552296296-22.19208430933333s-8.876834209185184-22.19208430933333-22.19208552296296-22.19208430933333h-55.480210773333326c-13.315251313777777 0-22.19208430933333 8.876834209185184-22.19208552296296 22.19208430933333s8.876834209185184 22.19208430933333 22.19208552296296 22.19208430933333zM216.8452740740741 658.4677583834074h288.49710087585186c13.315251313777777 0 22.19208430933333-8.876834209185184 22.19208430933333-22.19208430933333s-8.876834209185184-22.19208430933333-22.19208430933333-22.19208430933333h-288.49710087585186c-13.315251313777777 0-22.19208430933333 8.876834209185184-22.19208430933333 22.19208430933333s11.096042154666666 22.19208430933333 22.19208430933333 22.19208430933333z" fill="" ></path></symbol><symbol id="icon-shezhi2" viewBox="0 0 1024 1024"><path d="M870.592 421.488L811.2 456.096a285.824 285.824 0 0 1 0 111.808l59.456 34.608a51.424 51.424 0 0 1 18.592 69.936L838.4 761.152a50.56 50.56 0 0 1-69.36 18.736l-60.064-34.976a303.728 303.728 0 0 1-95.424 56.432V844.8a50.992 50.992 0 0 1-50.768 51.2h-101.568a50.992 50.992 0 0 1-50.784-51.2v-43.456a303.696 303.696 0 0 1-95.424-56.432l-60.064 34.976a50.544 50.544 0 0 1-69.344-18.736l-50.784-88.688a51.424 51.424 0 0 1 18.592-69.936l59.392-34.624a285.872 285.872 0 0 1 0-111.808l-59.392-34.608a51.424 51.424 0 0 1-18.592-69.936l50.784-88.688a50.544 50.544 0 0 1 69.36-18.736l60.064 34.96a303.696 303.696 0 0 1 95.424-56.432V179.2A50.992 50.992 0 0 1 461.216 128h101.552a50.992 50.992 0 0 1 50.784 51.2v43.456a303.696 303.696 0 0 1 95.424 56.432l60.064-34.96a50.544 50.544 0 0 1 69.36 18.736l50.768 88.688a51.424 51.424 0 0 1-18.576 69.936z m-38.08-66.512l-25.392-44.336a25.28 25.28 0 0 0-34.688-9.376L701.904 342.4a252.976 252.976 0 0 0-139.2-81.184V204.8a25.488 25.488 0 0 0-25.392-25.6h-50.704a25.488 25.488 0 0 0-25.392 25.6v56.336a252.96 252.96 0 0 0-139.2 81.184l-70.544-41.072a25.28 25.28 0 0 0-34.688 9.376l-25.392 44.336a25.712 25.712 0 0 0 9.296 34.976l70.832 41.232a248.928 248.928 0 0 0 0 161.6l-70.816 41.232a25.712 25.712 0 0 0-9.296 34.976l25.392 44.336a25.264 25.264 0 0 0 34.688 9.376l70.608-41.088a252.976 252.976 0 0 0 139.2 81.184V819.2a25.488 25.488 0 0 0 25.392 25.6h50.784a25.488 25.488 0 0 0 25.392-25.6v-56.336a252.976 252.976 0 0 0 139.2-81.184l70.544 41.072a25.264 25.264 0 0 0 34.688-9.376l25.392-44.336a25.712 25.712 0 0 0-9.296-34.976l-70.832-41.232a248.928 248.928 0 0 0 0-161.6l70.832-41.232a25.712 25.712 0 0 0 9.12-35.024zM512 640a128 128 0 1 1 126.944-128A127.472 127.472 0 0 1 512 640z m0-204.8a76.8 76.8 0 1 0 76.16 76.8A76.48 76.48 0 0 0 512 435.2z"  ></path></symbol><symbol id="icon-mingpian" viewBox="0 0 1024 1024"><path d="M428.544 525.824c27.136-21.504 44.544-54.272 44.544-91.648C473.088 369.664 420.864 317.44 356.352 317.44S239.616 369.664 239.616 434.176c0 37.376 17.408 70.144 44.544 91.648-71.68 28.672-122.368 98.816-122.368 180.736H220.16c0-75.264 60.928-136.192 136.192-136.192s136.192 60.928 136.192 136.192h58.368c0-81.92-50.688-152.064-122.368-180.736z m-72.192-33.28c-32.256 0-58.368-26.112-58.368-58.368 0-32.256 26.112-58.368 58.368-58.368S414.72 401.92 414.72 434.176c0 32.256-26.112 58.368-58.368 58.368z m476.672 0h-194.56c-16.384 0-29.184 12.8-29.184 29.184s12.8 29.184 29.184 29.184h194.56c16.384 0 29.184-12.8 29.184-29.184s-13.312-29.184-29.184-29.184z m0-136.192h-194.56c-16.384 0-29.184 12.8-29.184 29.184s12.8 29.184 29.184 29.184h194.56c16.384 0 29.184-12.8 29.184-29.184s-13.312-29.184-29.184-29.184zM920.576 122.88H103.424C60.416 122.88 25.6 157.696 25.6 200.704v622.592c0 43.008 34.816 77.824 77.824 77.824h817.152c43.008 0 77.824-34.816 77.824-77.824V200.704c0-43.008-34.816-77.824-77.824-77.824z m19.456 680.96c0 21.504-17.408 38.912-38.912 38.912H122.88c-21.504 0-38.912-17.408-38.912-38.912V220.16c0-21.504 17.408-38.912 38.912-38.912h778.24c21.504 0 38.912 17.408 38.912 38.912v583.68z m-184.832-175.104h-116.736c-16.384 0-29.184 12.8-29.184 29.184s12.8 29.184 29.184 29.184h116.736c16.384 0 29.184-12.8 29.184-29.184s-12.8-29.184-29.184-29.184z" fill="#333333" ></path></symbol><symbol id="icon-jinggao" viewBox="0 0 1024 1024"><path d="M919.893333 969.386667H104.106667c-37.546667 0-69.973333-18.773333-88.746667-51.2-18.773333-32.426667-18.773333-71.68 0-102.4L423.253333 105.813333c18.773333-32.426667 52.906667-51.2 88.746667-51.2 37.546667 0 69.973333 18.773333 88.746667 51.2l407.893333 708.266667c18.773333 32.426667 18.773333 71.68 0 102.4-17.066667 34.133333-51.2 52.906667-88.746667 52.906667zM452.266667 122.88l-409.6 708.266667c-11.946667 22.186667-11.946667 47.786667 0 68.266666s34.133333 34.133333 59.733333 34.133334h817.493333c25.6 0 47.786667-13.653333 59.733334-34.133334 11.946667-22.186667 11.946667-47.786667 0-68.266666L571.733333 122.88c-11.946667-22.186667-34.133333-34.133333-59.733333-34.133333s-47.786667 13.653333-59.733333 34.133333z" fill="#333333" ></path><path d="M512 626.346667c-10.24 0-17.066667-6.826667-17.066667-17.066667v-273.066667c0-10.24 6.826667-17.066667 17.066667-17.066666s17.066667 6.826667 17.066667 17.066666v273.066667c0 10.24-6.826667 17.066667-17.066667 17.066667z" fill="#333333" ></path><path d="M512 738.986667m-32.426667 0a32.426667 32.426667 0 1 0 64.853334 0 32.426667 32.426667 0 1 0-64.853334 0Z" fill="#333333" ></path></symbol><symbol id="icon-yincang1" viewBox="0 0 1024 1024"><path d="M927.4 512.9c0 0.4 0 0.7-0.1 1v0.5c0 0.3-0.1 0.5-0.1 0.8 0 0.3-0.1 0.6-0.1 0.9v0.1c-1 6.6-4 12.7-8.7 17.5-8.7 10.6-18.2 20.5-27.8 30.2-51.7 52.5-111.1 99.3-176 133.3-41.5 21.7-85.9 39.2-131.9 47.6-50.6 9.3-101.3 8.8-151.6-2.2-39.9-8.7-78-23.5-114.4-42.2l1.2-1.2 103.8-68.3c25.6 18.4 56.8 29.4 90.8 29.4 86 0 155.6-69.7 155.6-155.6 0-11.5-1.3-22.6-3.7-33.4l137.2-90.2c9.1 6.8 18.1 13.8 26.8 21 32 26.1 63.5 54.7 90 86.8 4.6 4.7 7.7 10.9 8.7 17.5v0.1c0 0.3 0.1 0.6 0.1 0.9 0 0.2 0.1 0.5 0.1 0.8v0.5c0 0.3 0.1 0.7 0.1 1 0 0.5 0.1 1 0.1 1.6 0 0.6 0 1.1-0.1 1.6z m-415 69.8c-5.1 0-10.1-0.5-14.9-1.5l90.9-59.8c-7.5 35-38.7 61.3-76 61.3z m341.4-275.5L179.6 748l-0.2 0.2c-3.1 2-6.7 3.2-10.6 3.2-10.7 0-19.5-8.7-19.5-19.5 0-6.8 3.5-12.8 8.8-16.3l674.2-440.8 0.2-0.2c3.1-2 6.7-3.2 10.6-3.2 10.7 0 19.5 8.7 19.5 19.5 0 6.8-3.5 12.8-8.8 16.3zM512.4 427c7.4 0 14.6 1.1 21.4 3l-98.6 65.8c4.4-38.7 37.3-68.8 77.2-68.8z m94.5-45.6c-26.2-20.1-58.9-32.1-94.5-32.1-86 0-155.6 69.7-155.6 155.6 0 13.7 2 27 5.3 39.7l-135 90-7.1 4.7c-8.1-6.1-16.1-12.4-23.9-18.8-32-26.1-63.5-54.7-90-86.8-11.6-14.1-11.6-30.7 0-44.7 8.7-10.6 18.2-20.5 27.8-30.2 51.7-52.5 111.1-99.4 176-133.3 41.5-21.7 85.9-39.2 131.9-47.6 50.6-9.3 101.2-8.8 151.6 2.1 37.5 8.2 73.4 21.8 107.8 38.9l-7.2 4.5-87.1 58z"  ></path></symbol><symbol id="icon-laba" viewBox="0 0 1024 1024"><path d="M858.584615 309.825641c-5.251282-5.251282-10.502564-10.502564-15.753846-13.128205-5.251282-5.251282-10.502564-10.502564-18.379487-13.128205v10.502564c-21.005128 0-39.384615 18.379487-39.384615 39.384615v2.625641c0 21.005128 18.379487 39.384615 39.384615 39.384616v18.379487c26.25641 34.133333 39.384615 73.517949 39.384615 118.153846s-15.753846 86.646154-39.384615 118.153846v15.753846c-21.005128 0-39.384615 18.379487-39.384615 39.384616v2.625641c0 21.005128 18.379487 39.384615 39.384615 39.384615v10.502564c7.876923-5.251282 13.128205-10.502564 21.005128-15.753846 5.251282-2.625641 10.502564-7.876923 13.128205-10.502564 52.512821-49.887179 86.646154-120.779487 86.646154-202.174359 0-78.769231-34.133333-149.661538-86.646154-199.548718z m-189.046153-191.671795h-7.876924c-7.876923 0-13.128205 2.625641-21.005128 7.876923l-330.830769 149.661539H157.538462c-44.635897 0-78.769231 34.133333-78.769231 78.76923v317.702565c2.625641 42.010256 36.758974 76.14359 78.769231 76.143589h39.384615c21.005128 0 39.384615-18.379487 39.384615-39.384615s-15.753846-36.758974-34.133333-39.384615H236.307692c-65.641026 0-78.769231-13.128205-78.76923-78.769231v2.625641-170.666667 7.876923c0-60.389744 10.502564-76.14359 65.641025-78.769231H315.076923c5.251282 0 10.502564-2.625641 15.753846-5.251282 2.625641 0 7.876923-2.625641 10.502564-5.251282l288.820513-131.282051v593.394872L375.466667 682.666667c-18.379487-13.128205-42.010256-7.876923-55.138462 7.876923-13.128205 18.379487-7.876923 42.010256 7.876923 55.138461L638.030769 892.717949c7.876923 5.251282 18.379487 7.876923 26.25641 7.876923h2.625642c21.005128 0 39.384615-18.379487 39.384615-39.384616L708.923077 157.538462c0-23.630769-18.379487-39.384615-39.384615-39.384616z m-506.748718 551.384616H157.538462h5.251282z m-5.251282-315.076924h21.005128H157.538462z"  ></path></symbol><symbol id="icon-kehuliuyan" viewBox="0 0 1024 1024"><path d="M878.592 73.216H145.408C65.536 73.216 0 138.24 0 218.112v440.832c0 79.872 65.536 145.408 145.408 145.408h1.024v146.432l244.224-146.432h488.448c79.872 0 145.408-65.536 145.408-145.408V218.112c-0.512-79.872-66.048-144.896-145.92-144.896zM219.648 512c-40.448 0-73.216-32.768-73.216-73.216S179.2 365.568 219.648 365.568s73.216 32.768 73.216 73.216S260.096 512 219.648 512z m292.352 0c-40.448 0-73.216-32.768-73.216-73.216s32.768-73.216 73.216-73.216 73.216 32.768 73.216 73.216S552.448 512 512 512z m292.864 0c-40.448 0-73.216-32.768-73.216-73.216s32.768-73.216 73.216-73.216 73.216 32.768 73.216 73.216-32.768 73.216-73.216 73.216z"  ></path></symbol><symbol id="icon-cuban2shangchuanyunduan" viewBox="0 0 1024 1024"><path d="M787.842844 793.053867c-4.3008 1.956978-8.988444 3.185778-14.017422 3.185778l-18.978133 0c-1.319822 0.022756-2.594133 0.2048-3.913956 0.2048-1.251556 0-2.4576-0.182044-3.731911-0.2048L648.533333 796.239644l0-68.266667 113.777778-0.955733 0 0c76.276622-5.893689 136.533333-68.949333 136.533333-146.750578 0-77.778489-60.256711-140.834133-136.533333-146.750578l0-1.160533-68.266667 0c0-113.117867-91.682133-204.8-204.8-204.8s-204.8 91.682133-204.8 204.8c0 7.736889 0.682667 15.268978 1.547378 22.755556L261.688889 455.111111l0 0 0 0c-75.389156 0-136.533333 61.144178-136.533333 136.533333 0 74.752 60.120178 135.281778 134.621867 136.328533L352.711111 727.972978l0 68.266667-87.404089 0c-1.206044 0.022756-2.389333 0.2048-3.618133 0.2048-1.319822 0-2.594133-0.182044-3.913956-0.2048l-7.350044 0c-0.864711 0-1.592889-0.432356-2.434844-0.477867C141.289244 788.662044 56.888889 700.120178 56.888889 591.621689c0-98.668089 69.791289-181.020444 162.724978-200.430933C239.479467 259.959467 352.4608 159.266133 489.244444 159.266133c127.226311 0 233.836089 87.153778 264.146489 204.936533 118.237867 1.342578 213.720178 97.4848 213.720178 216.041244C967.111111 687.012978 889.605689 775.509333 787.842844 793.053867zM338.3296 602.999467l138.148978-138.126222c13.334756-13.334756 34.929778-13.357511 48.264533 0l138.148978 138.126222c13.334756 13.334756 13.334756 34.952533 0 48.287289-13.334756 13.312-34.952533 13.312-48.264533-0.022756L534.755556 571.392 534.755556 830.577778c0 18.864356-15.268978 34.156089-34.133333 34.156089-18.8416 0-34.133333-15.291733-34.133333-34.156089L466.488889 571.392l-79.872 79.894756c-13.312 13.334756-34.952533 13.312-48.287289-0.022756S325.0176 616.334222 338.3296 602.999467z"  ></path></symbol><symbol id="icon-yincang" viewBox="0 0 1024 1024"><path d="M921.336 355.126c-26.714 43.135-61.03 80.714-100.382 112.396 0.44 0.86 1.053 1.58 1.405 2.493l50.305 129.37c5.282 13.628-1.282 29.136-14.657 34.56a25.276 25.276 0 0 1-9.6 1.868c-10.76 0-20.274-6.6-24.24-16.815l-46.69-120.084c-37.474 23.722-78.353 42.59-121.603 55.579l24.942 123.252c1.404 6.95 0.07 14.05-3.756 19.983-3.826 5.941-9.689 9.997-16.534 11.445a25.227 25.227 0 0 1-5.3 0.552c-12.287 0-23.012-8.933-25.504-21.248l-24.556-121.425a501.976 501.976 0 0 1-93.15 8.722c-33.946 0-67.365-3.598-99.873-10.207l-20.886 122.111c-2.23 12.77-13.025 22.046-25.68 22.046-1.44 0-2.931-0.123-4.563-0.386-6.829-1.22-12.813-5.099-16.815-10.917-4.02-5.82-5.565-12.885-4.37-19.888l21.553-125.98c-45.39-14.333-87.955-35.333-126.675-61.512L196.883 596.74c-3.721 10.479-13.551 17.509-24.486 17.509-3.072 0-6.073-0.545-8.917-1.624-6.565-2.44-11.795-7.328-14.727-13.779-2.949-6.442-3.23-13.656-0.842-20.334l43.213-120.751c-34.35-29.619-64.469-63.89-88.463-102.637-3.74-6.003-4.95-13.129-3.406-20.071 1.527-6.933 5.617-12.849 11.514-16.63 4.178-2.72 8.987-4.152 13.902-4.152 9.021 0 17.271 4.652 22.063 12.428 74.826 120.794 214.787 195.83 365.28 195.83 150.476 0 290.42-75.036 365.245-195.821 4.793-7.784 13.042-12.436 22.047-12.436a25.4 25.4 0 0 1 13.901 4.143c5.915 3.79 10.004 9.698 11.532 16.639 1.546 6.934 0.335 14.07-3.403 20.072z" fill="" ></path></symbol><symbol id="icon-xianshi" viewBox="0 0 1024 1024"><path d="M512 236.8C332.8 236.8 64 384 64 518.4c0 89.6 268.8 262.4 448 262.4s448-185.6 448-262.4c0-83.2-249.6-281.6-448-281.6z m0 486.4c-179.2 0-377.6-166.4-384-198.4 0-76.8 211.2-217.6 384-217.6 179.2 0 371.2 172.8 384 217.6-25.6 44.8-230.4 198.4-384 198.4z m0-371.2c-89.6 0-166.4 70.4-166.4 160S416 678.4 512 678.4c89.6 0 166.4-70.4 166.4-166.4 0-89.6-76.8-160-166.4-160z"  ></path></symbol><symbol id="icon-renzhengxinxi" viewBox="0 0 1024 1024"><path d="M485.648423 1024c-144.376948 0-412.841368-220.864564-412.841368-429.728646L72.807056 178.182433l41.04289-0.68044c0.866014 0 92.50888-1.948532 187.059079-40.331521 96.962668-39.403649 159.532198-84.652894 160.11985-85.054972l24.495832-17.846079 24.712335 17.846079c0.587653 0.433007 63.126253 45.651323 160.11985 85.054972 94.550199 38.382989 186.193065 40.331521 187.151867 40.331521l40.857315 0.68044 0.185574 416.057992C898.582578 803.104506 630.118159 1024 485.648423 1024L485.648423 1024M156.160928 257.948532l0 336.291893c0 161.511659 233.854778 346.374773 329.487495 346.374773 95.632717 0 329.487495-184.863115 329.487495-346.374773L815.135919 257.948532c-40.857315-4.422859-107.200193-15.588257-176.079256-43.548145-70.611091-28.702187-124.242117-59.909629-153.40824-78.498007-29.104265 18.588377-82.76622 49.79582-153.315452 78.498007C263.361121 242.391205 197.018243 253.525674 156.160928 257.948532L156.160928 257.948532M463.56506 750.586928 288.28996 601.261327l53.909387-63.404615 112.458137 95.725504 213.441585-245.886191 63.033466 54.682614L463.56506 750.586928 463.56506 750.586928M463.56506 750.586928 463.56506 750.586928z"  ></path></symbol><symbol id="icon-jibenxinxi" viewBox="0 0 1024 1024"><path d="M816.872727 635.345455c27.927273 0 32.581818-6.981818 32.581818-32.581819 0-13.963636-11.636364-27.927273-23.272727-34.909091l-2.327273-2.327272c-37.236364-27.927273-76.8-53.527273-121.018181-69.818182 58.181818-46.545455 93.090909-116.363636 93.090909-193.163636 0-139.636364-118.690909-256-267.636364-256S265.309091 160.581818 265.309091 302.545455c0 76.8 37.236364 146.618182 93.090909 193.163636C176.872727 560.872727 46.545455 730.763636 46.545455 926.254545c0 25.6 11.636364 44.218182 39.563636 44.218182s27.927273-18.618182 27.927273-44.218182c0-204.8 128-397.963636 418.909091-393.30909 88.436364 2.327273 190.836364 32.581818 253.672727 83.781818 16.290909 13.963636 20.945455 13.963636 27.927273 16.290909l2.327272 2.327273m-283.927272-148.945455c-137.309091 0-204.8-95.418182-204.8-183.854545 0-88.436364 76.8-193.163636 204.8-193.163637 148.945455 0 204.8 104.727273 204.8 195.490909 0 86.109091-88.436364 183.854545-204.8 181.527273m88.436363 269.963636c0 25.6 20.945455 37.236364 48.872727 37.236364h258.327273c27.927273 0 48.872727-11.636364 48.872727-37.236364s-20.945455-34.909091-48.872727-34.909091H670.254545c-27.927273 0-48.872727 9.309091-48.872727 34.909091M928.581818 907.636364H670.254545c-27.927273 0-48.872727 9.309091-48.872727 34.909091s20.945455 34.909091 48.872727 34.90909h258.327273c27.927273 0 48.872727-9.309091 48.872727-34.90909s-20.945455-34.909091-48.872727-34.909091"  ></path></symbol><symbol id="icon-anquanshezhi" viewBox="0 0 1024 1024"><path d="M513.3 701.4c-108.3 0-196.3-88-196.3-196.3 0-108.3 88-196.3 196.3-196.3s196.3 88 196.3 196.3c0 108.3-88 196.3-196.3 196.3z m0-314.8c-64.3 0-118.5 54.2-118.5 118.5S449 623.6 513.3 623.6s118.5-54.2 118.5-118.5c-0.1-64.3-54.2-118.5-118.5-118.5z m0 0"  ></path><path d="M367.7 985.7c-10.2 0-20.3-3.4-30.5-6.8-50.8-20.3-98.1-47.4-142.1-81.2-30.5-27.1-40.6-71.1-23.7-108.3 10.2-27.1 10.2-57.5-3.4-81.2-13.5-23.7-40.6-40.6-67.7-44-44-3.4-74.5-33.8-81.2-74.5C9 562.6 5.6 532.2 5.6 505.1c0-27.1 3.4-54.2 6.8-81.2 6.8-40.6 40.6-71.1 81.2-74.5 30.5-3.4 54.2-20.3 67.7-44s16.9-54.2 3.4-81.2c-16.9-40.6-6.8-84.6 27.1-111.7 44-33.8 91.4-60.9 142.1-81.2 37.2-13.5 81.2 0 108.3 33.8 16.9 23.7 44 37.2 71.1 37.2 30.5 0 57.5-13.5 74.5-37.2 23.7-33.8 67.7-47.4 104.9-33.8 50.8 20.3 98.1 47.4 142.1 81.2 30.5 27.1 40.6 71.1 23.7 108.3-10.2 27.1-10.2 57.5 3.4 81.2 13.5 23.7 40.6 40.6 67.7 44 44 3.4 74.5 33.8 81.2 74.5 3.4 27.1 6.8 57.5 6.8 84.6 0 27.1-3.4 54.2-6.8 81.2-6.8 40.6-40.6 71.1-81.2 74.5-30.5 3.4-54.1 20.3-67.7 44-13.5 23.7-16.9 54.2-3.4 81.2 16.9 37.2 6.8 84.6-23.7 108.3-40.6 33.8-91.4 60.9-142.1 81.2-37.2 13.5-81.2 0-108.3-33.8-16.9-23.7-44-37.2-71.1-37.2-30.5 0-57.5 13.5-74.5 37.2-13.5 30.4-44 44-71.1 44z m-3.3-883.4H361c-44 20.3-84.6 40.6-121.8 71.1-3.4 3.4-3.4 13.5 0 16.9 23.7 50.8 20.3 108.3-6.8 152.3-27.1 47.4-74.5 77.8-128.6 84.6-6.8 0-13.5 3.4-13.5 10.2-3.4 23.7-6.8 44-6.8 67.7 0 23.7 3.4 47.4 6.8 71.1 0 6.8 6.8 10.2 13.5 10.2 54.2 6.8 101.5 37.2 128.6 84.6 27.1 47.4 30.5 101.5 6.8 152.3-3.4 6.8-3.4 13.5 3.4 16.9 37.2 30.5 77.8 50.8 121.8 67.7 6.8 3.4 13.5-3.4 16.9-6.8 30.5-44 81.2-71.1 135.4-71.1s104.9 23.7 135.4 67.7c3.4 3.4 10.2 10.2 16.9 6.8 44-16.9 84.6-40.6 118.4-71.1 3.4-3.4 3.4-10.2 3.4-16.9-23.7-50.8-20.3-108.3 6.8-152.3 27.1-47.4 74.5-77.8 128.6-84.6 6.8 0 13.5-3.4 13.5-10.2 3.4-23.7 6.8-44 6.8-67.7 0-23.7-3.4-47.4-6.8-71.1 0-6.8-6.8-10.2-13.5-10.2-54.2-6.8-101.5-37.2-128.6-84.6-27.1-47.4-30.5-101.5-6.8-152.3 3.4-6.8 3.4-13.5-3.4-16.9-37.2-30.5-77.8-50.8-121.8-67.7-6.8-3.4-13.5 3.4-16.9 6.8-30.5 44-81.2 71.1-135.4 71.1s-104.9-23.7-135.4-67.7c-6.8-3.4-10.2-6.8-13.5-6.8z m0 0"  ></path></symbol><symbol id="icon-moban" viewBox="0 0 1093 1024"><path d="M172.872 363.733h740.079l-49.439 49.438V169.19l49.439 49.439H172.872l49.439-49.439v243.982l-49.439-49.438z m0 49.438V169.19h740.079v243.982H172.872zM894.774 517.507h24.72v-49.439H474.547v49.439h24.72zM894.774 625.371h24.72v-49.438H474.547v49.438h24.72zM894.774 733.236h24.72v-49.439H474.547v49.439h24.72zM894.774 841.1h24.72v-49.438H474.547v49.439h24.72zM172.872 802.9h246.693l-49.438 49.44V461.967l49.438 49.438H172.872l49.439-49.438v390.371l-49.439-49.438z m0 49.439V461.967h246.693v390.372H172.872z"  ></path></symbol><symbol id="icon-xiazai1" viewBox="0 0 1024 1024"><path d="M896 604.8l-384 353.28-384-353.28h256V129.92h256v474.88z"  ></path></symbol><symbol id="icon-edit" viewBox="0 0 1024 1024"><path d="M688.814 176.789l158.39 158.39-448.018 448.019-158.39-158.39zM192 832V673.6L350.4 832zM895.2 287.2L736.8 128.8 783.6 82c24-24 63.3-24 87.4 0l71 71c24 24 24 63.3 0 87.4l-46.8 46.8zM128 896h768v64H128zM64 768h64v192H64z" fill="" ></path><path d="M895.3 768h64v192h-64z" fill="" ></path></symbol><symbol id="icon-tianjiachengyuan" viewBox="0 0 1024 1024"><path d="M543.744 935.936h-422.4c-7.68 0-15.36-1.536-22.016-5.12-9.728-4.608-13.824-14.336-13.824-25.088v-93.696c0-3.072 1.024-6.144 2.048-8.704 54.784-128.512 148.992-213.504 284.16-251.904 4.608-1.024 9.728-1.024 14.336 0.512 61.952 21.504 123.392 21.504 184.832-0.512 3.584-1.024 8.192-1.536 11.264-0.512 19.968 5.632 39.424 11.264 73.728 25.6 0 0 55.808-36.352 52.736-39.424-25.6-24.064-58.368-28.672-60.416-29.696 3.072-2.56 5.12-4.608 7.68-7.168 54.784-49.664 86.016-111.104 92.672-184.832 11.776-131.072-71.68-252.928-198.656-288.768-15.36-4.096-30.72-5.632-46.592-8.704-2.048-0.512-4.096-1.024-5.632-1.536h-39.424c-14.336 2.56-28.672 3.584-43.008 7.68-109.056 29.696-178.176 100.352-202.24 210.432-21.504 97.792 6.144 183.296 75.776 255.488 5.632 6.144 12.288 11.264 18.432 16.896-12.8 5.632-25.6 10.752-37.888 16.896-114.176 56.832-193.536 145.408-240.64 263.68-1.024 2.048-2.048 4.608-3.072 6.656v122.368c1.024 4.608 2.048 9.216 3.584 13.824 11.264 35.328 34.816 57.344 71.68 65.024 1.024 0 2.048 1.024 3.072 1.536 158.72 3.072 363.52 1.536 440.32 1.536l-0.512-62.464zM266.24 292.352c-0.512-117.248 94.208-213.504 210.944-214.016 116.736-0.512 211.456 95.744 211.456 214.016 0 118.272-94.72 214.528-210.944 215.04-116.736 0-210.944-96.256-211.456-215.04z" fill="" ></path><path d="M736.768 742.4v-195.584h60.928v195.584h198.144v61.952h-198.144v196.608h-60.928v-196.608h-198.144v-61.952h198.144z" fill="" ></path></symbol><symbol id="icon-tishi1" viewBox="0 0 1024 1024"><path d="M922.42944 338.61632c-22.44096-53.0432-54.54848-100.67456-95.4624-141.58336-40.89856-40.89856-88.54016-73.02656-141.57824-95.4624C630.47168 78.34112 572.12928 66.56 512 66.56c-60.11904 0-118.4512 11.78112-173.37856 35.01056-53.03296 22.43584-100.67968 54.55872-141.58336 95.45728-40.9088 40.9088-73.02656 88.54528-95.4624 141.58336C78.35136 393.53344 66.56 451.87584 66.56 512s11.79136 118.46144 35.01568 173.37856c22.43584 53.0432 54.5536 100.67968 95.46752 141.58336 40.89856 40.90368 88.53504 73.02656 141.57824 95.4624C393.53856 945.65376 451.87584 957.44 512 957.44c60.1344 0 118.46144-11.78624 173.39392-35.01568 53.03808-22.43584 100.67968-54.5536 141.57824-95.4624 40.9088-40.90368 73.02144-88.54016 95.4624-141.58336C945.65888 630.46144 957.44 572.12416 957.44 512s-11.78112-118.46656-35.01056-173.38368z m-57.10848 322.63168c-19.30752 45.65504-46.97088 86.66624-82.18112 121.88672a382.43328 382.43328 0 0 1-121.8816 82.18112c-47.26784 19.98848-97.48992 30.12608-149.26336 30.12608-51.76832 0-101.98016-10.13248-149.248-30.12608-45.66016-19.31264-86.66112-46.96064-121.87648-82.18112a382.3104 382.3104 0 0 1-82.18112-121.88672c-19.9936-47.26784-30.1312-97.47968-30.1312-149.248s10.13248-101.98528 30.1312-149.248a382.17216 382.17216 0 0 1 82.18112-121.88672 382.26944 382.26944 0 0 1 121.87648-82.18112c47.26784-19.98848 97.47968-30.1312 149.248-30.1312 51.77344 0 101.98016 10.1376 149.25312 30.1312 45.66016 19.31264 86.66112 46.96064 121.8816 82.18112a382.17216 382.17216 0 0 1 82.18112 121.88672c19.99872 47.26272 30.1312 97.47968 30.1312 149.248s-10.13248 101.98016-30.12096 149.248z" fill="#333333" ></path><path d="M549.77024 580.46976c-2.56 27.95008-20.33152 41.0112-37.87264 41.0112-13.0304 0 0 0 0 0-16.66048-3.13856-29.59872-10.24512-35.28192-38.51264l-22.92224-264.25856c0-26.56256 32.29184-50.06848 59.68896-50.06848 27.40224 0 56.91392 24.58112 56.91392 51.0976l-20.52608 260.73088zM512 656.0512c-27.40224 0-49.6384 22.21056-49.6384 49.6384 0 27.43296 22.21056 49.67424 49.6384 49.67424 27.42272 0 49.64352-22.24128 49.64352-49.67424-0.00512-27.392-22.22592-49.6384-49.64352-49.6384z" fill="#333333" ></path></symbol><symbol id="icon-biaoqian" viewBox="0 0 1024 1024"><path d="M1024 778.752l0-534.2208-1024 0 117.76 278.528-117.76 255.6928z"  ></path></symbol><symbol id="icon-sandian" viewBox="0 0 1024 1024"><path d="M510.9248 913.6128m-110.3872 0a110.3872 110.3872 0 1 0 220.7744 0 110.3872 110.3872 0 1 0-220.7744 0Z"  ></path><path d="M510.9248 505.1392m-110.3872 0a110.3872 110.3872 0 1 0 220.7744 0 110.3872 110.3872 0 1 0-220.7744 0Z"  ></path><path d="M510.9248 110.3872m-110.3872 0a110.3872 110.3872 0 1 0 220.7744 0 110.3872 110.3872 0 1 0-220.7744 0Z"  ></path></symbol><symbol id="icon-fuzhi" viewBox="0 0 1024 1024"><path d="M715.436342 780.14204c-21.404496 0-38.724976 17.3389-38.724976 38.724976l0 30.31033c0 18.379603-14.938224 33.335223-33.316803 33.335223L176.316681 882.512568c-18.379603 0-33.354666-14.956643-33.354666-33.335223L142.962016 382.098441c0-18.379603 14.976086-33.316803 33.354666-33.316803l26.888394 0c21.404496 0 38.724976-17.3389 38.724976-38.724976s-17.320481-38.724976-38.724976-38.724976l-26.888394 0c-61.112869 0-110.803595 49.691749-110.803595 110.765733l0 467.078905c0 61.093427 49.691749 110.785176 110.803595 110.785176l467.078905 0c61.075007 0 110.765733-49.691749 110.765733-110.785176l0-30.31033C754.161319 797.48094 736.840838 780.14204 715.436342 780.14204z"  ></path><path d="M842.313008 64.037479 386.012587 64.037479c-64.062038 0-116.173906 52.111868-116.173906 116.173906l0 456.282001c0 64.062038 52.111868 116.173906 116.173906 116.173906l456.30042 0c64.062038 0 116.173906-52.111868 116.173906-116.173906l0-456.282001C958.486914 116.149347 906.375046 64.037479 842.313008 64.037479zM881.037984 636.493385c0 21.348214-17.358343 38.724976-38.724976 38.724976L386.012587 675.218362c-21.366633 0-38.724976-17.376763-38.724976-38.724976l0-456.282001c0-21.348214 17.358343-38.724976 38.724976-38.724976l456.30042 0c21.366633 0 38.724976 17.376763 38.724976 38.724976L881.037984 636.493385z"  ></path></symbol><symbol id="icon-zhangjie1" viewBox="0 0 1024 1024"><path d="M336.034909 233.029818l606.021818 0c19.572364 0 35.397818-22.202182 35.397818-47.918545s-15.848727-45.730909-35.397818-45.730909l-606.021818 0c-19.572364 0-35.397818 20.014545-35.397818 45.730909S316.462545 233.029818 336.034909 233.029818zM942.056727 488.029091l-606.021818 0c-19.572364 0-35.397818 23.226182-35.397818 45.963636 0 22.760727 15.825455 47.778909 35.397818 47.778909l606.021818 0c19.572364 0 35.397818-25.018182 35.397818-47.778909C977.454545 511.255273 961.605818 488.029091 942.056727 488.029091zM942.056727 813.870545l-606.021818 0c-19.572364 0-35.397818 20.852364-35.397818 43.566545s15.825455 50.385455 35.397818 50.385455l606.021818 0c19.572364 0 35.397818-27.671273 35.397818-50.385455S961.605818 813.870545 942.056727 813.870545zM105.984 139.776c-25.995636 0-47.057455 21.085091-47.057455 47.057455 0 25.995636 21.085091 47.057455 47.057455 47.057455 25.995636 0 47.057455-21.061818 47.057455-47.057455C153.064727 160.861091 131.979636 139.776 105.984 139.776zM105.984 488.866909c-25.995636 0-47.057455 21.085091-47.057455 47.057455 0 25.995636 21.085091 47.057455 47.057455 47.057455 25.995636 0 47.057455-21.061818 47.057455-47.057455C153.064727 509.952 131.979636 488.866909 105.984 488.866909zM105.984 814.685091c-25.995636 0-47.057455 21.085091-47.057455 47.057455 0 25.995636 21.085091 47.057455 47.057455 47.057455 25.995636 0 47.057455-21.061818 47.057455-47.057455C153.064727 835.770182 131.979636 814.685091 105.984 814.685091z"  ></path></symbol><symbol id="icon-tianjiadaohang" viewBox="0 0 1024 1024"><path d="M448 0h128v1024H448V0zM0 448h1024v128H0V448z" fill="#666666" ></path></symbol><symbol id="icon-shangchuantupian1" viewBox="0 0 1098 1024"><path d="M1020.0064 0H78.475636C35.309382 0 0 35.607273 0 79.127273v791.272727c0 43.52 35.309382 79.127273 78.466327 79.127273H745.378909v-79.127273H117.694836c-23.542691 0-39.228509-19.781818-39.228509-39.563636v-712.145455c0-19.781818 15.685818-39.563636 39.228509-39.563636h863.083055c23.542691 0 39.228509 19.781818 39.228509 39.563636V633.018182H1098.472727V79.127273c0-43.52-35.309382-79.127273-78.466327-79.127273z m-84.126255 618.607709c-7.838255-7.875491-15.6672-11.803927-27.424581-11.803927-11.748073 0-19.586327 3.928436-27.415273 11.803927L771.351273 728.808727c-15.676509 15.750982-15.676509 39.358836 0 55.109818 15.6672 15.732364 39.172655 15.732364 54.839854 0l43.101091-43.296581v244.0192c0 19.679418 15.657891 39.358836 39.163346 39.358836s39.172655-15.741673 39.172654-39.358836V740.621964l47.010909 47.225018c15.6672 15.741673 39.172655 15.741673 54.849164 0 15.6672-15.732364 15.6672-39.358836 0-55.100509l-113.608146-114.138764z m-513.182254-295.191273c19.586327-43.287273 7.838255-94.459345-23.505455-129.880436-35.253527-35.421091-90.093382-43.287273-133.185163-27.554909C222.906182 185.679127 195.490909 232.904145 195.490909 280.138473c0 62.966691 50.920727 114.129455 113.608146 114.129454 47.010909 0 94.021818-27.5456 113.598836-70.842182z m-148.852364-43.287272c0-11.813236 3.909818-19.679418 11.748073-27.554909 3.909818-11.803927 15.6672-15.741673 27.415273-15.741673 19.595636 0 39.181964 15.741673 39.181963 35.421091s-15.676509 39.358836-35.262836 43.287272c-23.505455 0-43.091782-15.732364-43.091782-35.411781zM142.689745 760.906473c15.7696 15.6672 39.433309 15.6672 55.20291 0l165.590109-164.463709L501.480727 733.500509c3.947055 3.909818 3.947055 3.909818 7.894109 3.909818 15.7696 7.838255 31.5392 7.838255 47.3088-3.909818l390.330182-387.658473c15.7696-15.6672 15.7696-39.163345 0-54.830545-15.778909-15.657891-39.433309-15.657891-55.202909 0l-362.728727 360.261818-137.988655-140.976873-3.947054-3.909818c-15.7696-11.748073-35.486255-11.748073-51.255855 3.909818L138.761309 706.094545c-11.822545 15.6672-11.822545 39.163345 3.937746 54.830546z"  ></path></symbol><symbol id="icon-pdf" viewBox="0 0 1024 1024"><path d="M905.185809 178.844158C898.576738 172.685485 891.19337 165.824412 883.21687 158.436127 860.422682 137.322863 837.434925 116.207791 815.697647 96.487895 813.243072 94.261877 813.243072 94.261877 810.786411 92.037081 781.783552 65.781062 757.590948 44.376502 739.713617 29.293612 729.254178 20.469111 721.020606 13.860686 714.970549 9.501727 710.955023 6.608611 707.690543 4.524745 704.47155 2.998714 700.417679 1.07689 696.638044-0.094029 691.307277 0.005928 677.045677 0.273349 665.6 11.769337 665.6 26.182727L665.6 77.352844 665.6 128.522961 665.6 230.863194 665.6 256.448252 691.2 256.448252 896 256.448252 870.4 230.863194 870.4 998.414942 896 972.829884 230.381436 972.829884C187.90385 972.829884 153.6 938.623723 153.6 896.20663L153.6 26.182727 128 51.767786 588.8 51.767786C602.93849 51.767786 614.4 40.312965 614.4 26.182727 614.4 12.05249 602.93849 0.597669 588.8 0.597669L128 0.597669 102.4 0.597669 102.4 26.182727 102.4 896.20663C102.4 966.91021 159.652833 1024 230.381436 1024L896 1024 921.6 1024 921.6 998.414942 921.6 230.863194 921.6 205.278135 896 205.278135 691.2 205.278135 716.8 230.863194 716.8 128.522961 716.8 77.352844 716.8 26.182727C716.8 39.813762 705.748075 50.91427 692.267725 51.167041 687.705707 51.252584 685.069822 50.435995 682.52845 49.231204 682.259458 49.103682 683.344977 49.796618 685.029451 51.010252 689.779394 54.432502 697.145822 60.34494 706.686383 68.394196 724.009052 83.009121 747.816448 104.072869 776.413589 129.961594 778.850014 132.168064 778.850014 132.168064 781.285216 134.376514 802.876774 153.964212 825.739479 174.96442 848.413564 195.966437 856.350957 203.3185 863.697005 210.144893 870.269888 216.269843 874.209847 219.941299 877.019309 222.565641 878.499674 223.951409 888.81866 233.610931 905.019017 233.081212 914.684179 222.768247 924.349344 212.455283 923.819315 196.264383 913.500326 186.604861 911.981323 185.182945 909.155025 182.542876 905.185809 178.844158ZM102.4 461.128719 0 461.128719 0 896.074709 512 896.074709 1024 896.074709 1024 461.128719 153.6 461.128719 153.6 460.531049 102.4 460.531049 102.4 461.128719ZM208.2 711 208.2 819.2 157.6 819.2 157.6 528 269 528C301.533495 528 327.366571 536.466581 346.5 553.4 365.633429 570.333419 375.2 592.733195 375.2 620.6 375.2 649.133476 365.833427 671.333254 347.1 687.2 328.366573 703.066746 302.133502 711 268.4 711L208.2 711ZM208.2 670.4 269 670.4C287.00009 670.4 300.733286 666.166709 310.2 657.7 319.666714 649.233291 324.4 637.000079 324.4 621 324.4 605.266588 319.600047 592.700047 310 583.3 300.399951 573.899953 287.200083 569.066669 270.4 568.8L208.2 568.8 208.2 670.4ZM419.4 819.2 419.4 528 505.4 528C531.133461 528 553.966566 533.733276 573.9 545.2 593.833434 556.666724 609.266611 572.933229 620.2 594 631.133389 615.066771 636.6 639.199863 636.6 666.4L636.6 681C636.6 708.600139 631.100055 732.866562 620.1 753.8 609.099945 774.733438 593.433436 790.866609 573.1 802.2 552.766564 813.533391 529.466799 819.2 503.2 819.2L419.4 819.2ZM470 568.8 470 778.8 503 778.8C529.533466 778.8 549.89993 770.500083 564.1 753.9 578.30007 737.299917 585.533331 713.466822 585.8 682.4L585.8 666.2C585.8 634.599842 578.933402 610.46675 565.2 593.8 551.466598 577.13325 531.533463 568.8 505.4 568.8L470 568.8ZM854.8 695.8 737.6 695.8 737.6 819.2 687 819.2 687 528 872 528 872 568.8 737.6 568.8 737.6 655.4 854.8 655.4 854.8 695.8Z"  ></path></symbol><symbol id="icon-shezhi1" viewBox="0 0 1024 1024"><path d="M927.744 429.056c-5.12-26.112-20.992-43.008-40.448-43.008h-4.096c-57.344 0-103.936-46.592-103.936-103.936 0-18.432 9.216-39.424 9.216-39.424 10.24-23.04 2.56-51.2-18.432-66.048l-1.536-1.024L663.552 117.76l-1.536-0.512c-6.656-3.072-14.336-4.608-22.528-4.608-16.384 0-32.256 6.656-43.008 17.408-11.264 11.776-51.2 46.08-81.92 46.08s-70.656-34.816-82.432-46.592c-10.752-11.264-26.624-17.92-43.008-17.92-7.68 0-14.848 1.536-22.016 4.096l-1.536 0.512-108.032 59.904-1.536 1.024c-20.48 14.336-28.672 42.496-18.432 65.536 0 0 9.216 20.992 9.216 39.424 0 57.344-46.592 103.936-103.936 103.936h-4.096c-19.968 0-35.84 16.896-40.448 43.008-0.512 2.048-8.704 47.616-8.704 82.944s8.704 80.896 8.704 82.944c5.12 26.112 20.992 43.008 40.448 43.008h4.608c57.344 0 103.936 46.592 103.936 103.936 0 18.432-8.704 39.424-9.216 39.424-10.24 23.04-2.56 51.2 18.432 66.048l1.024 1.024L360.448 906.24l1.536 0.512c6.656 3.072 14.336 4.608 22.016 4.608 16.384 0 32.768-6.656 43.008-18.432 14.848-15.872 54.272-48.64 83.456-48.64 31.744 0 72.704 36.864 84.48 49.664 10.752 11.776 26.624 18.432 43.52 18.432 7.68 0 14.848-1.536 22.016-4.608l1.536-0.512 107.008-58.88 1.536-1.024c20.48-14.336 28.672-42.496 18.432-65.536 0 0-9.216-20.992-9.216-39.424 0-57.344 46.592-103.936 103.936-103.936h4.096c19.968 0 35.84-16.896 40.96-43.008 0-0.512 8.704-46.592 8.704-82.944-1.024-35.84-9.216-81.408-9.728-83.456z m-416.768 232.96c-82.944 0-150.016-67.584-150.016-150.016 0-82.944 67.584-150.016 150.016-150.016 82.944 0 150.016 67.584 150.016 150.016s-67.072 150.016-150.016 150.016z"  ></path></symbol><symbol id="icon-zhiliangfenxi" viewBox="0 0 1024 1024"><path d="M928 150.613333h-384V85.333333h-64v65.28h-384a32.853333 32.853333 0 0 0-32 32.853334v522.666666a32.426667 32.426667 0 0 0 32 32.426667h384v51.626667l-152.746667 91.306666 32 57.173334 143.786667-85.333334h19.2l144.213333 85.333334 32-57.173334-154.453333-91.306666v-51.626667h384a32.426667 32.426667 0 0 0 32-32.426667V183.466667a32.853333 32.853333 0 0 0-32-32.853334zM896 673.28H128V215.893333h768z m-105.813333-392.106667l42.666666 49.066667-316.586666 276.906667-164.266667-140.373334-118.186667 101.12-42.666666-49.92L352.853333 384l162.986667 140.373333z"  ></path></symbol><symbol id="icon-shixundaibeijing" viewBox="0 0 1024 1024"><path d="M512.3 512.7m-415.7 0a415.7 415.7 0 1 0 831.4 0 415.7 415.7 0 1 0-831.4 0Z"  ></path><path d="M395 341.4c-9.2 0-16.7 7.5-16.7 16.7v338.4c0 9.2 7.5 16.7 16.7 16.7s16.7-7.5 16.7-16.7V358.1c0.1-9.2-7.4-16.7-16.7-16.7zM277.7 404.1c-9.2 0-16.7 7.5-16.7 16.7v200.5c0 9.2 7.5 16.7 16.7 16.7s16.7-7.5 16.7-16.7V420.8c0-9.3-7.4-16.7-16.7-16.7zM512.3 274.6c-9.2 0-16.7 7.5-16.7 16.7v442.8c0 9.2 7.5 16.7 16.7 16.7s16.7-7.5 16.7-16.7V291.3c0-9.2-7.5-16.7-16.7-16.7zM629.6 341.4c-9.2 0-16.7 7.5-16.7 16.7v338.4c0 9.2 7.5 16.7 16.7 16.7s16.7-7.5 16.7-16.7V358.1c0-9.2-7.5-16.7-16.7-16.7zM746.8 404.1c-9.2 0-16.7 7.5-16.7 16.7v200.5c0 9.2 7.5 16.7 16.7 16.7s16.7-7.5 16.7-16.7V420.8c0-9.3-7.4-16.7-16.7-16.7z" fill="#FFFFFF" ></path></symbol><symbol id="icon-chenggong" viewBox="0 0 1024 1024"><path d="M512 0C229.2224 0 0 229.2224 0 512s229.2224 512 512 512 512-229.2224 512-512S794.7776 0 512 0z m244.667733 422.0416l-263.68 263.662933c-6.656 6.673067-15.394133 10.001067-24.132266 10.001067s-17.4592-3.328-24.132267-10.001067l-143.240533-143.240533c-12.032-12.032-14.984533-31.402667-5.0688-45.2096a34.133333 34.133333 0 0 1 51.985066-4.386133l96.3072 96.3072a34.133333 34.133333 0 0 0 48.264534 0l216.746666-216.7296a34.133333 34.133333 0 0 1 51.985067 4.386133c9.949867 13.806933 6.980267 33.1776-5.034667 45.2096z" fill="#040000" ></path></symbol><symbol id="icon-trustie" viewBox="0 0 1024 1024"><path d="M240.8 181.3c40.2 0.6 95.6 20.3 99.9-13.9 3.4-27.6-62-39.5-141.1-24.6-23.5 8.5-77 42.8-52.4 95.1 5.3 11.8 17.1 13.9 17.1 13.9s27.8 176.3 1.1 380.5c1.1 8.6 25.7 23.5 33.1 0 1.1-17.1 18.2-253.3-2.1-394.4-3.2-13.8 10.4-57.1 44.4-56.6z"  ></path><path d="M310.8 458.1c9.1-31.6 16.7-221.1-15.4-242.5-7.5-4.3-22 7.4-21 14.9 0.5 3.6 3.1 36.7 5.2 77h-18.3c0.4-30.2 0.4-55.9-0.8-64.1-3.2-21.4-25.7-39.5-37.4-6.4 0 0 8.6 147.5 5.3 221.2-2.1 21.3 56.7 79 82.4-0.1z m-28.9-21.3c-1.1 11.8-17.1 43.8-21.4-4.3-1-12.5-0.4-47.6 0.2-84.4h20.8c1.3 33 1.8 66.1 0.4 88.7z"  ></path><path d="M513.7 276.4c-0.1-42.8-14.8-51.3-30.3-51.3h-28.7c5.7-17.6 14.8-44.3 23.8-66.3 15-36.3-7.5-55.6-31-55.6H340.8c-20.2 18.2-4.4 32.1 6.3 38.5 3.8 2.3 17.8 2.5 34.3 2.2-3.9 18.3-15.7 49.6-50.3 80.1-1 4.9-0.4 12.2 5 15.9-2.3 5.6-3.7 11.5-5 15.1 9.6 248-22.5 304.6-36.4 334.5-18.2 37.4 15 39.5 24.6 33.1 28.9-32.1 39.3-117.9 42.8-197.2 7.6 5.2 22.4 8.1 45.2 9v182.3s3.9 11 17.6 11c13.6 0 17.7-12.6 17.7-12.6V434.3c22.2-1.4 36.2-5.5 43.3-9.5 8.5 123.6 31.4 176.5 40.9 191.5 22.4 33.1 43.3-9.1 31-22.4-46.1-30-44-274.7-44.1-317.5z m-30.3-9.6c-0.6 21.3-0.9 41.4-0.8 60.3-7.3-4.7-19.8-9.3-40.1-11v-57c22.9 1.2 40.6 4.7 40.9 7.7z m-120.3 1.1c12.1-4.9 27.9-7.5 44.1-8.6v56.9c-22.5 2.1-36.2 7.9-43.7 12.5-0.1-33.9-0.9-57.6-0.4-60.8zM449.7 145c2.1 19.3-17.6 57.1-31 80.2h-36.2c9.8-13.7 32-50.8 33.9-82.2 18.2-0.6 32.9-0.6 33.3 2z m-87 265.3c0.8-23 1-45 1-64.7 8 4.6 22.3 7.2 43.6 8v43.6c-23.5 2.2-37.4 8.4-44.6 13.1z m79.8-13.2v-43.8c19.3-1.3 32.4-4.5 40.2-8 0.3 23.2 1 44.6 2.1 64.3-6.8-5.1-19.7-10.6-42.3-12.5zM667.7 142.3h126.6s12.8-6.8 12.8-22-13.6-22-13.6-22H667.7s-14.5 7.6-13.7 22c0.9 14.4 13.7 22 13.7 22zM870.5 198.4c2.4-12.8-7.2-40.9-42.5-40.9h-97.4-87.7c-35.3 0-44.9 28.1-42.5 40.9C614 334.7 586 386.8 586 386.8c0 43.3 31.3 24 37.7 9.6 17.6-42.5 11.2-166.7 10.4-177.9-0.8-11.2 6.4-24 20-24h162.8c13.6 0 20.8 12.8 20 24s-7.2 135.5 10.4 177.9c6.4 14.4 37.7 33.7 37.7-9.6-0.1 0-28.2-52.1-14.5-188.4z"  ></path><path d="M775.2 458.1c-2.2-6.7-3.8-16.7-4.9-28.9h36.9s13.4-6 13.4-19.3-14.2-19.3-14.2-19.3h-38.1c-1.5-58.4 2.1-130.5 2.1-140.1-11.2-44.1-88.2-25.4-88.2-25.4-31.3 18.7-1.6 39 7.2 36.6 60.1-15.2 44.9 12.8 44.9 36.9v2.4h-56.1c-9.9 0-17.4 13.4-17.4 20.8 0 7.5 7.7 20.8 17.4 20.8h56.6c0.2 14.3 0.3 30.6 0.1 47.9h-59.8s-15.1 6.7-14.2 19.3c0.8 12.6 14.2 19.3 14.2 19.3h59.1c-2 64-57.1 139.8-80.1 170.7-24.1 32.1 16.9 33.7 24.9 27.8 36.9-22.7 72.9-129.3 72.9-129.3 18.4 65.2 61.7 122.3 70.5 129.3 44.1 20.6 29.7-24.6 24.8-31-33.6-28.7-59.2-99.2-72-138.5z"  ></path><path d="M824.9 716.5c-27.3 0-31 38.2-31 38.2h62c-0.1 0-3.8-38.2-31-38.2z"  ></path><path d="M895.3 645H198.6c-6 130.1-16 203.3-32.6 234.3-34.7 62-37.9-31-31.5-53.4C148.3 787.3 166 645 166 645h-40c-15.9 0-29 13-29 29v221.2c0 15.9 13 29 29 29h769.3c15.9 0 29-13 29-29V673.9c-0.1-15.9-13.1-28.9-29-28.9z m-590.9 79.4l-41.1 27.8v93.9c0 12.4-10 22.4-22.4 22.4-12.4 0-22.4-10-22.4-22.4V740.4v-34.6c0-12.4 10-22.4 22.4-22.4 9.9 0 18.3 6.5 21.3 15.4l17-11.5c10.3-6.9 24.2-4.3 31.2 6 6.9 10.2 4.3 24.2-6 31.1zM444.1 810c0 30.3-26.3 64.1-64.1 64.1-38.6 0-61.6-35-61.6-68.9V702.6c0-12.4 10-22.4 22.4-22.4 12.4 0 22.4 10 22.4 22.4v102.6c0 8.4 4.9 24 16.7 24 11.8 0 19.2-13.5 19.2-19.2V702.6c0-12.4 10-22.4 22.4-22.4s22.4 10 22.4 22.4V810z m123.7 36.1c-35.3 49.2-94.6 24.6-110.8 5.6-18.4-27.5 5.5-47.3 21-40.3 21.4 9.6 20.4 20.8 38.5 20.8 24 0 16.6-18.4 11.8-22.4-21.2-17.6-56.1-23.5-65.7-43-18.2-47.3 11.8-78.8 39.5-88.4 36.3-9.1 56.2 11.7 63.1 27.5 3.2 7.4 4.8 25.9-3.8 31.8-24.1 10.7-29.8-8-48.8-11.2-16.8-1.6-21.1 24.3 1.2 27.8 73.8 17 60.3 76.8 54 91.8z m84.1-100.6h-7.4v102.2c0 12.4-10 22.4-22.4 22.4-12.4 0-22.4-10-22.4-22.4V745.5h-2.4c-12.4 0-22.4-10-22.4-22.4 0-12.4 10-22.4 22.4-22.4h2.4v-14.8c0-12.4 10-22.4 22.4-22.4 12.4 0 22.4 10 22.4 22.4v14.8h7.4c12.4 0 22.4 10 22.4 22.4 0 12.3-10 22.4-22.4 22.4z m80.8 106.2c0 12.4-10 22.4-22.4 22.4s-22.4-10-22.4-22.4v-101c0-12.4 10-22.4 22.4-22.4s22.4 10 22.4 22.4v101z m-22.5-135.2c-13.6 0-24.6-11-24.6-24.6 0-13.6 11-24.6 24.6-24.6 13.6 0 24.6 11 24.6 24.6 0 13.6-11 24.6-24.6 24.6z m181.1 69.7h-94.5c0 42.7 37.7 51.9 46.5 41.5 10.1-14.8 34.5-22.4 41.9-8.8 7.4 13.6-3.8 50.5-57.9 50.5-58.5 0-71.3-53.7-71.3-102.6 0-34.5 11.2-90.7 73.7-90.7 68.9 0 61.6 110.1 61.6 110.1z"  ></path></symbol><symbol id="icon-congshulianjie" viewBox="0 0 1024 1024"><path d="M844.8 665.6a128 128 0 0 0-125.44 102.4H358.4a102.4 102.4 0 0 1 0-204.8h307.2a153.6 153.6 0 0 0 0-307.2H304.64a128 128 0 1 0 0 51.2H665.6a102.4 102.4 0 0 1 0 204.8H358.4a153.6 153.6 0 0 0 0 307.2h360.96a128 128 0 1 0 125.44-153.6z m0 204.8a76.8 76.8 0 1 1 76.8-76.8 76.8 76.8 0 0 1-76.8 76.8z"  ></path></symbol><symbol id="icon-zhongzhi2" viewBox="0 0 1024 1024"><path d="M510.9 510.7m-128 0a128 128 0 1 0 256 0 128 128 0 1 0-256 0Z" fill="" ></path><path d="M959.6 383.6v-256L858.9 228.3C770.2 119.9 632.1 54.6 481.7 64.8 234.8 81.6 48.3 295.2 65 542.1 81.8 789 295.5 975.5 542.3 958.8c225.2-15.3 400.2-194.4 416.4-413.1l-64.6 4.4C876.1 733.3 727.8 882 538 894.9c-211.6 14.4-394.8-145.5-409.1-357.1S274.4 143 486 128.7c131.2-8.9 251.5 49.2 327.4 145.1L703.6 383.6h256z" fill="" ></path></symbol><symbol id="icon-shijian" viewBox="0 0 1024 1024"><path d="M506.678925 977.849905c-63.955231 0-125.966224-12.484061-184.395723-37.247527-56.382932-23.84251-107.035475-58.020186-150.627361-101.509743-43.489557-43.489557-77.667233-94.142101-101.509743-150.627361-24.763466-58.429499-37.247527-120.440492-37.247527-184.395723S45.382632 378.000999 70.043769 319.5715c23.84251-56.382932 58.020186-107.035475 101.509743-150.627361 43.489557-43.489557 94.142101-77.667233 150.627361-101.509743 58.429499-24.763466 120.440492-37.247527 184.395723-37.247527s125.966224 12.484061 184.395723 37.247527c56.382932 23.84251 107.035475 58.020186 150.627361 101.509743 43.489557 43.489557 77.667233 94.142101 101.509743 150.627361 24.763466 58.429499 37.247527 120.440492 37.247527 184.395723S967.872889 630.035775 943.211752 688.465274c-23.84251 56.382932-58.020186 107.035475-101.509743 150.627361-43.489557 43.489557-94.142101 77.667233-150.627361 101.509743C632.645148 965.263516 570.531828 977.849905 506.678925 977.849905zM506.678925 91.68622c-55.666633 0-109.696013 10.949136-160.553213 32.438093-49.117618 20.772659-93.221145 50.550215-131.082642 88.411712s-67.639053 81.965024-88.411712 131.082642c-21.488958 50.8572-32.438093 104.784251-32.438093 160.553213s10.949136 109.696013 32.438093 160.553213c20.772659 49.117618 50.550215 93.221145 88.411712 131.082642s81.965024 67.639053 131.082642 88.411712c50.8572 21.488958 104.784251 32.438093 160.553213 32.438093s109.696013-10.949136 160.553213-32.438093c49.117618-20.772659 93.221145-50.550215 131.082642-88.411712s67.639053-81.965024 88.411712-131.082642c21.488958-50.8572 32.438093-104.784251 32.438093-160.553213s-10.949136-109.696013-32.438093-160.553213c-20.772659-49.117618-50.550215-93.221145-88.411712-131.082642s-81.965024-67.639053-131.082642-88.411712C616.272609 102.533027 562.345558 91.68622 506.678925 91.68622z"  ></path><path d="M724.536025 499.874088l-204.65674 0-0.920955-280.993704c-0.102328-16.884181-13.81433-30.596183-30.698511-30.596183 0 0-0.102328 0-0.102328 0-16.986509 0.102328-30.698511 13.81433-30.596183 30.800839l1.023284 310.873588c0 0.204657 0 0.409313 0 0.61397 0 16.884181 13.712002 30.698511 30.698511 30.698511l235.355251 0c16.884181 0 30.698511-13.712002 30.698511-30.698511S741.522534 499.874088 724.536025 499.874088z"  ></path></symbol><symbol id="icon-qq" viewBox="0 0 1024 1024"><path d="M960.1 512c0-247.4-200.5-447.9-447.9-447.9S64.3 264.6 64.3 512s200.5 447.9 447.9 447.9S960.1 759.3 960.1 512z" fill="#04ACEE" ></path><path d="M690.8 445.2c0-185.5-96.1-241.6-178.6-241.6s-180.5 55.3-180.5 241.6c0 0-62.6 140.2-62.6 207.5s56.5-32.7 56.5-32.7-1.8 67.2 56.5 113.8c0 0-70.8 28.4-47.3 42.3 23.5 13.9 170.6 2.4 170.6 2.4h10s142.1 9.1 169.1 0-16.4-38.7-44.4-44.7c56.6-50.4 56.6-113.8 56.6-113.8s55.9 101.8 55.9 34.4-61.8-209.2-61.8-209.2z" fill="#FFFFFF" ></path></symbol><symbol id="icon-csdn" viewBox="0 0 1024 1024"><path d="M906.475693 943.728792c-49.491181 17.325597-152.164608 28.913517-295.537993 28.913517-412.545894 0-635.223462-193.912431-608.80579-450.249611C33.545364 216.96445 363.386627 45.025473 724.595296 45.025473c139.829675 0 222.1301 11.388375 299.383578 30.263258l-24.720008 205.822692c-51.434439-17.35118-171.688267-33.208333-269.12032-33.208333-212.388225 0-392.96493 63.425541-413.440264 263.878946-18.429745 179.328271 108.114346 265.024026 347.120812 265.024026 83.251076 0 205.89944-11.884678 262.580371-29.214369L906.475693 943.728792z" fill="#d81e06" ></path></symbol><symbol id="icon-weibo" viewBox="0 0 1024 1024"><path d="M521.1990464028488 988.8678975894004C249.27637860777747 988.8678975894004 28.94831437026488 768.5398317807978 28.94831437026488 496.8082556628046S249.27637860777747 4.748613736208938 521.0079562968607 4.748613736208938 1013.0675966523665 225.07667954481133 1013.0675966523665 496.8082556628046c0.191091677078182 271.7315761179932-220.13697413152437 492.0596419265958-491.86855024951745 492.0596419265958z m0.9554568143009067-624.6768809018033c-36.11622170474618 20.637841423023534-36.11622170474618 5.923824707433607-34.9696763555471-19.682386179812628 3.2485490837890745-140.45197574015296-240.77481555454784-40.320227602836155-309.75870988025116 142.17179612058655-38.98258900546889 110.8328506318949 23.504208723746245 206.5695043362235 120.0052244231176 248.41845907132517 235.61535441324702 89.81282742580501 407.21518239392327-58.66497518528153 436.45212571911514-154.7838091015865 38.98258900546889-144.27379828408652-73.57008200685962-116.5655852333403-73.57008200685962-116.5655852333403s-33.44094608110166 7.834736764945416-17.58038401631264-18.918021042589903c25.03293742710169-51.97678534062519-15.478380281722648-137.39451676235205-120.57849788326214-80.64045363458233zM713.627807483627 421.3272615984331c11.083285848734494 3.057457406710893 15.669471958800827-6.879279950644512 16.816018879089917-15.860562064789006 1.1465469202890857-8.981282114144499 20.637841423023534-130.51523681170752-103.95357068125038-116.5655852333403-9.363465468300863 1.1465469202890857-15.669471958800827 7.070371627722693-14.71401671558993 15.860563635879014 1.1465469202890857 8.79019200815632 8.025826870933594 13.758561472379021 13.376378118222659 13.18528644114448 5.350551247289063-0.7643651372227249 88.47519039952775-16.242745418945372 81.59591044888322 77.20081444480508 1.3376385973672678 8.59910033107814-4.39509600407816 23.12202536958988 6.879279950644512 26.179482776300777z m-94.7811968900277-232.9400787896025c-8.981282114144499 1.7198203804336283-29.236941754101668 10.127829034433585-29.42803343117986 27.899304727824408-0.191091677078182 17.962565799379 17.771474122300823 29.61912353716804 26.75275780753532 30.383488674390765 33.44094608110166 0 193.19312464691086-9.17237379122268 163.9561828928092 155.35708256173103-4.012914221011799 17.962565799379-7.070371627722693 45.67077885012523 12.994196335156298 51.40351188048065 18.34474758244536 4.968369464222703 29.42803343117986-15.28729017573447 34.587494572480736-30.956762134535296 2.2930938405781713-17.962565799379 76.24535763050417-253.76901188970422-208.8625981768016-234.08662570989156z m-184.40293263875455 513.461848486842c-111.59721576911762 16.433837096023556-210.39132688015715-35.925131598758-220.90133926874708-116.75667691041852-10.318920711511767-80.8315453116605 71.65917152043784-159.75217856580917 183.06529561247726-175.9949239847546 111.59721576911762-16.433837096023556 210.39132688015715 35.925131598758 220.71024759166895 116.7566753393285 10.701102494578127 80.8315453116605-71.27698816628147 159.56108688873104-182.8742039353991 175.99492555584456z m85.03554963866048-168.54237057396554c-8.79019200815632-49.30150971698068-63.25116129534787-79.49390671429325-121.34286302048483-67.64625729942603-58.09170172513699 11.847649414867213-98.22083765089495 61.531340914914246-89.23955553675046 110.8328506318949 8.79019200815632 49.30150971698068 63.25116129534787 79.49390671429325 121.34286302048483 67.64625729942603 58.09170172513699-12.038741091945395 98.02974597381682-61.531340914914246 89.23955553675046-110.8328506318949z m-68.79280421971512 20.828931529011715c-7.452553410789053 0-15.096198498656289-9.554555574289044-15.09620006974629-21.402204989156253 0-11.847649414867213 7.643645087867235-21.402204989156253 15.09620006974629-21.40220656024626 7.452553410789053 0 15.096198498656289 9.554555574289044 15.096198498656289 21.40220656024626 0 11.65655773778903-7.452553410789053 21.402204989156253-15.096198498656289 21.402204989156253z m-59.42934032250426 44.52423192983614c-20.064567962878993 0-36.49840505890254-14.71401671558993-36.498403487812546-33.058764298035285 0-18.34474758244536 16.242745418945372-33.058764298035285 36.498403487812546-33.058764298035285 20.064567962878993 0 36.307313381824365 14.71401671558993 36.307313381824365 33.058764298035285 0 18.153655905367184-16.242745418945372 33.058764298035285-36.307313381824365 33.058764298035285z" fill="" ></path></symbol><symbol id="icon-weixin2" viewBox="0 0 1000 1000"><path d="M320.85344 375.57045333c17.79989333 0 29.74528-12.10165333 29.74528-30.12885334 0-18.11146667-11.94549333-30.05216-29.74528-30.05215999-17.79242667 0-35.75210667 11.94069333-35.75210666 30.05215999C285.10122667 363.4688 303.06101334 375.57045333 320.85344 375.57045333zM487.12832 315.38826667c-17.79989333 0-35.67648 11.94069333-35.67648 30.05216 0 18.02826667 17.87658667 30.12885333 35.67648 30.12885332 17.94485333 0 29.81461333-12.10165333 29.81461333-30.12885332C516.94293333 327.33013332 505.07306667 315.38826667 487.12832 315.38826667zM695.07904001 538.16416c17.87658667 0 29.81354667-11.94602667 29.81354666-24.04341333 0-12.02069333-11.93696-24.12234667-29.81354666-24.12234668-11.7088 0-23.50293333 12.10165333-23.50293334 24.12234668C671.57717334 526.21813333 683.37024 538.16416 695.07904001 538.16416zM564.40490667 538.16416c18.02794667 0 29.73674667-11.94602667 29.73674667-24.04341333 0-12.02069333-11.7088-24.12234667-29.73674667-24.12234668-11.78666667 0-23.73098667 12.10165333-23.73098667 24.12234668C540.67392 526.21813333 552.61834667 538.16416 564.40490667 538.16416zM27.73770667 501.78784c0 258.68224 209.67338667 468.34592 468.36298667 468.34591999 258.6896 0 468.36298667-209.66368 468.36298667-468.34591999S754.79029333 33.44512 496.10069334 33.44512C237.41109333 33.44512 27.73770667 243.10559999 27.73770667 501.78784zM614.9072 380.64330667c-112.87530667 0-202.01962667 85.39381333-202.01962667 190.53855999 0 17.56352 2.73642667 34.42464 7.34144001 50.50122667-7.34144 0.62464-14.68181333 0.93696-22.16832 0.93696-29.66965333 0-53.552-6.08650667-83.21418667-12.09738667l-83.06176 42.22954667 23.73098666-72.4384c-59.4832-42.14954667-95.07434667-96.40181333-95.07434666-162.51701334 0-114.58581333 107.02090667-204.81898667 237.61930667-204.81898666 116.85461333 0 219.19477333 72.12288 239.71605334 169.07253333C630.29045334 381.19221333 622.63658668 380.64330667 614.9072 380.64330667zM831.76106667 568.36874667c0 54.2512-35.51552 102.336-83.21418667 138.55029332l17.87658667 60.26208-65.17770667-36.13973332c-23.81525333 6.01088-47.61450667 12.02069333-71.27616 12.02069332-113.02666667 0-202.17205333-78.29248-202.17205333-174.69439999 0-96.32085333 89.14538667-174.76682667 202.17205333-174.76682668C736.67808 393.60191999 831.76106667 472.048 831.76106667 568.36874667z" fill="#62b900" ></path></symbol><symbol id="icon-StackOverflow" viewBox="0 0 1025 1024"><path d="M513.27936 0.511744C230.796602 0.511744 1.535232 229.773113 1.535232 512.255872s229.261369 511.744128 511.744128 511.744128 511.744128-229.261369 511.744128-511.744128S796.273863 0.511744 513.27936 0.511744z m-15.864068 256.383808l214.932534 179.110445-35.822089 42.986507-214.932534-179.110445 35.822089-42.986507zM415.024488 373.573213l253.825087 118.212894-24.051974 50.662669-253.313343-118.212894 23.54023-50.662669z m-48.615692 126.912544l273.783108 57.315342-11.258371 54.756622-273.783108-57.315342 11.258371-54.756622z m-16.887557 126.4008H629.445277v55.78011H349.521239v-55.78011z m391.484258 167.852074H237.449275v-224.143928h55.78011v167.852074h391.484258v-167.852074h55.78011v224.143928z m-18.422788-369.479261l-166.828586-224.655672 45.033483-33.263368L767.616192 391.996002l-45.033483 33.263368z" fill="" ></path></symbol><symbol id="icon-linkedin" viewBox="0 0 1024 1024"><path d="M511.995437 511.995437m-511.995437 0a511.995437 511.995437 0 1 0 1023.990873 0 511.995437 511.995437 0 1 0-1023.990873 0Z" fill="#007AB9" ></path><path d="M817.907645 553.193829v211.084717H695.526333V567.340375c0-49.449023-17.669492-83.218197-61.980124-83.218197-33.814808 0-53.902903 22.734868-62.774156 44.748719-3.221762 7.867305-4.052301 18.792089-4.052301 29.826394v205.572128h-122.390438s1.642825-333.54817 0-368.074868h122.399565v52.159683c-0.246424 0.410706-0.593242 0.812286-0.812286 1.204738h0.812286v-1.204738c16.263964-25.025696 45.268947-60.802767 110.297423-60.802766 80.516663 0 140.881343 52.606897 140.881343 165.642361z m-501.609134-334.424343c-41.864649 0-69.254187 27.480806-69.254187 63.586442 0 35.338984 26.595506 63.613822 67.647869 63.613822h0.794032c42.686061 0 69.226806-28.274838 69.226807-63.613822-0.812286-36.105636-26.540745-63.586442-68.414521-63.586442z m-61.980125 545.50906H376.663191v-368.083995H254.318386v368.083995z" fill="#F1F2F2" ></path></symbol><symbol id="icon-github" viewBox="0 0 1024 1024"><path d="M511.6 76.3C264.3 76.2 64 276.4 64 523.5 64 718.9 189.3 885 363.8 946c23.5 5.9 19.9-10.8 19.9-22.2v-77.5c-135.7 15.9-141.2-73.9-150.3-88.9C215 726 171.5 718 184.5 703c30.9-15.9 62.4 4 98.9 57.9 26.4 39.1 77.9 32.5 104 26 5.7-23.5 17.9-44.5 34.7-60.8-140.6-25.2-199.2-111-199.2-213 0-49.5 16.3-95 48.3-131.7-20.4-60.5 1.9-112.3 4.9-120 58.1-5.2 118.5 41.6 123.2 45.3 33-8.9 70.7-13.6 112.9-13.6 42.4 0 80.2 4.9 113.5 13.9 11.3-8.6 67.3-48.8 121.3-43.9 2.9 7.7 24.7 58.3 5.5 118 32.4 36.8 48.9 82.7 48.9 132.3 0 102.2-59 188.1-200 212.9 23.5 23.2 38.1 55.4 38.1 91v112.5c0.8 9 0 17.9 15 17.9 177.1-59.7 304.6-227 304.6-424.1 0-247.2-200.4-447.3-447.5-447.3z" fill="#333333" ></path></symbol><symbol id="icon-net" viewBox="0 0 1024 1024"><path d="M512 81.53088c-124.22144 0-235.9808 53.1968-314.63424 137.6256-0.36864-0.28672-0.82944-0.53248-1.21856-0.8192L186.368 231.2704C121.22112 306.7392 81.53088 404.72576 81.53088 512c0 107.80672 40.13056 206.2336 105.86112 281.86624l8.7552 11.55584c0.33792-0.26624 0.75264-0.4864 1.09568-0.73216 78.65344 84.5312 190.464 137.7792 314.75712 137.7792 237.3632 0 430.46912-193.12128 430.46912-430.46912 0-237.37344-193.12128-430.46912-430.46912-430.46912z m24.38144 273.69984c58.95168-2.1504 115.44064-11.3664 166.98368-26.52672 14.99136 47.68768 24.1152 101.64224 26.18368 158.93504h-193.16736V355.23072z m0-48.7424V132.83328c61.14816 11.94496 114.5856 68.38784 149.81632 150.15936-46.1312 13.2608-96.768 21.43232-149.81632 23.5008z m-48.76288-173.66016v173.83424c-53.17632-1.63328-103.9616-9.43616-150.40512-22.28224 35.2256-82.55488 88.91392-139.53536 150.40512-151.552z m0 222.5664v132.224H294.4512c2.06848-56.68864 10.96704-110.17728 25.69728-157.50144 51.80416 14.72512 108.4416 23.5776 167.4752 25.28256zM245.7088 487.62368h-114.176c4.85376-76.3904 32.15872-146.55488 75.53536-204.2624a470.9632 470.9632 0 0 0 66.80064 31.59552c-16.26112 52.00384-26.0864 110.34624-28.16 172.66688z m0 48.76288c2.0736 62.14656 11.84768 120.34048 28.04224 172.24704a471.36768 471.36768 0 0 0-66.85184 31.7696c-43.27936-57.63584-70.51264-127.75424-75.3664-204.01664h114.176z m48.7424 0h193.16736v131.97312c-59.00288 1.70496-115.88096 10.01984-167.66976 24.84224-14.60224-47.1808-23.4496-100.4032-25.4976-156.81536z m193.16736 180.736v174.04928c-61.63456-12.03712-115.42016-69.28896-150.67648-152.13568 46.42304-12.94336 97.50016-20.28544 150.6816-21.9136z m48.76288 174.04928v-173.8752c53.07904 2.04288 103.936 9.79456 150.0672 23.15776-35.23584 82.08896-88.77568 138.752-150.0672 150.71744z m0-222.6432v-132.1472h193.16736c-2.06848 57.05216-11.12064 110.84288-26.0096 158.40768-51.52256-15.26784-108.1856-24.0896-167.15776-26.2656z m241.90464-132.1472h114.2016c-4.92544 77.24032-32.768 148.14208-76.99456 206.19264-20.28544-11.97056-42.42432-22.528-65.87392-31.8208 16.57344-52.41344 26.5728-111.39072 28.672-174.36672z m0-48.75776c-2.0992-63.0272-12.09344-122.02496-28.6976-174.49472a462.39232 462.39232 0 0 0 65.71008-31.93856c44.31872 58.09664 72.26368 129.09568 77.16352 206.43328h-114.176z m4.608-244.1728c-15.67744 8.75008-32.2048 16.8704-49.95584 23.9104-16.50688-39.15264-37.10976-73.1648-60.66176-101.2992 41.34912 19.23584 78.8736 45.37344 110.62272 77.3888zM351.744 166.03136c-23.94112 28.60032-44.86144 63.22176-61.5168 103.18336-18.11456-6.94784-34.95936-15.04256-50.95424-23.74656C271.4112 212.57728 309.53984 185.66144 351.744 166.03648z m-112.64 612.3264a423.6544 423.6544 0 0 1 51.02592-23.74656c16.67584 40.0384 37.64736 74.70592 61.61408 103.3728-42.27584-19.69664-80.4352-46.63808-112.64-79.62624z m433.17248 79.60576c23.552-28.16 44.15488-62.19776 60.68736-101.3504a421.9392 421.9392 0 0 1 50.10432 23.79264c-31.7952 32.08704-69.37088 58.27072-110.79168 77.55776z" fill="#272636" ></path></symbol><symbol id="icon-mstest" viewBox="0 0 1024 1024"><path d="M552.8 512l291.8-198.8-299.4-175.8-300.2 163z m167.2 78.8c61.6 0 104-12.8 116-34.4l1-11.6 1.4-14.4 12.4-137.4 4.6-50.6-287.6 196v34c56.2 11.8 108.6 18.4 152.2 18.4z m11 77.4c-49.8 0-105-6-163.2-17.6v231.2l251.4-221.6c-25.8 5.2-55.2 8-88.2 8zM236 416.6c8.4 9.2 18.4 18.6 30 27.8 53.4 43.2 132.4 81.2 222.4 107.6 16.6 4.8 33 9.2 49.4 13.2V538l-308-211.4 6.2 90z m230.8 209.2c-83.2-24.2-160.2-58.4-223.4-98.2l7.8 114.2 286.4 241.2V644.2c-23.2-5.2-46.8-11.4-70.8-18.4z" fill="#008CDB" ></path><path d="M848.4 431.6l-4.2 42.2c21.6 30.8 30.4 60.4 23 85.4-22.6 77.6-192 78.8-387.4 21.8-195-57-324.8-164-302.2-241.6 11.2-38.4 57.6-62.4 125.2-70l45.6-24.8c-119-6.4-207.6 18.2-224 74-25.2 86.6 133.4 214.8 350.8 278.4 217.6 63.4 410.8 54 436-32.4 11.4-38.8-13-86.4-62.8-133z" fill="#008CDB" ></path></symbol><symbol id="icon-vs" viewBox="0 0 1024 1024"><path d="M161.109333 259.163022l109.715911 392.612978 110.262044-392.612978 126.987378 0L365.499733 766.509511 176.150756 766.509511 34.133333 259.163022 161.109333 259.163022z"  ></path><path d="M989.866667 298.7008 718.654578 298.7008c-27.841422 0-50.699378 22.823822-50.699378 50.676622l0 134.200889L989.866667 483.578311l0 180.462933c0 55.694222-45.6704 101.910756-101.364622 101.910756L540.990578 765.952l0-40.664178 270.665956 0c27.841422 0 51.234133-22.823822 51.234133-50.665244L862.890667 524.8 540.990578 524.8 540.990578 359.401244c0-55.694222 45.6704-101.922133 101.922133-101.922133L989.866667 257.479111 989.866667 298.7008z"  ></path></symbol><symbol id="icon-base" viewBox="0 0 1024 1024"><path d="M25.28 328.49066666l474.88 230.592a25.6 25.6 0 0 0 12.352 2.56 41.472 41.472 0 0 0 13.44-2.56L1000.768 327.46666666a27.52 27.52 0 0 0 16-24.96 26.624 26.624 0 0 0-17.024-25.024L524.8 45.86666666a32.256 32.256 0 0 0-25.728 0L25.28 277.54666666a28.416 28.416 0 0 0-15.424 25.472 27.52 27.52 0 0 0 15.424 25.536z m487.232-221.44l399.168 194.88-399.168 194.88-399.104-194.88L512.512 107.11466666z m498.56 576c7.68 3.52 12.8 10.688 12.8 19.84 0 9.216-5.12 16.832-12.8 20.48l-488.768 238.72a22.528 22.528 0 0 1-9.792 1.984c-3.072 0-6.208-1.024-9.28-2.048L13.952 724.33066666a21.44 21.44 0 0 1-12.8-19.84c0-9.216 5.12-16.896 12.8-20.48l82.944-40.32c6.72-2.56 13.44-2.56 19.584 0l19.584 9.216c7.68 4.096 12.8 11.776 12.8 20.416 0 9.152-5.12 16.832-12.8 20.416l-21.632 10.24 394.496 191.744a13.312 13.312 0 0 0 10.816 0l392.96-192.832-22.144-10.688a21.44 21.44 0 0 1-12.928-19.84c0-9.216 5.12-16.896 12.928-20.48l19.008-9.152c5.12-2.56 12.928-2.56 18.56 0l82.944 40.32zM12.928 524.26666666a22.848 22.848 0 0 1-12.8-19.84c0-9.216 5.12-16.832 12.8-20.48l82.944-40.256c6.72-2.56 13.44-2.56 19.584 0l19.52 9.216c7.744 4.032 12.928 11.712 12.928 20.416 0 9.152-5.12 16.832-12.928 20.352l-21.568 10.24 395.008 191.808a13.312 13.312 0 0 0 10.816 0l392.96-192.832-22.144-10.752a22.144 22.144 0 0 1 0-40.32L909.056 442.66666666c5.12-2.56 12.928-2.56 18.56 0l82.944 40.32c7.68 3.584 12.8 10.688 12.8 19.84 0 9.216-5.12 16.896-12.8 20.48L521.28 762.02666666a22.528 22.528 0 0 1-9.792 2.048 30.336 30.336 0 0 1-9.28-2.048L12.928 524.39466666z"  ></path></symbol><symbol id="icon-dengluIpjiankong" viewBox="0 0 1024 1024"><path d="M924.208 126.176H100.832a35.936 35.936 0 0 0-35.968 35.968v567.568a36 36 0 0 0 35.968 36h823.376a36 36 0 0 0 35.952-36V162.144a35.952 35.952 0 0 0-35.952-35.968z m-54.08 328.64v0.368C801.264 593.84 662.272 682.4 512.512 682.4c-149.856 0-289.152-88.688-357.616-227.696-4.336-8.16-3.952-18.048 0-26.016C223.36 290.032 362.672 201.44 512.512 201.44c149.744 0 288.752 88.592 357.616 227.344a28.736 28.736 0 0 1 0 26.032z" fill="#FFFFFF" ></path><path d="M924.208 62.224H100.832C46.672 62.224 2.64 105.44 1.072 159.216v573.44c1.568 53.744 45.616 96.992 99.76 96.992h379.712v63.936H224.72a31.936 31.936 0 0 0-31.968 32c0 17.664 14.288 31.936 31.968 31.936h575.568a31.936 31.936 0 0 0 31.968-31.936c0-17.728-14.304-32-31.968-32H544.496v-63.936h379.696c55.152 0 99.92-44.8 99.92-99.92V162.144a99.872 99.872 0 0 0-99.904-99.92z m35.952 667.488a36 36 0 0 1-35.952 36H100.832a36 36 0 0 1-35.968-36V162.144a35.936 35.936 0 0 1 35.968-35.968h823.376a35.952 35.952 0 0 1 35.952 35.968v567.568z" fill="#23B294" ></path><path d="M689.392 313.808c-53.728-34.224-114.864-52.24-176.88-52.24-62 0-123.248 18.016-177.088 52.24a349.728 349.728 0 0 0-119.472 127.936 351.12 351.12 0 0 0 119.568 128.24c53.728 34.272 114.88 52.336 176.992 52.336 62.016 0 123.136-18.064 176.88-52.272a354.56 354.56 0 0 0 119.872-128.112c-28.848-52.32-70-96.496-119.872-128.128zM512.512 573.84c-70.56 0-127.904-57.376-127.904-127.808 0-70.56 57.344-128 127.904-128 70.544 0 127.904 57.344 127.904 128 0 70.432-57.36 127.808-127.904 127.808z" fill="#B8DFD7" ></path><path d="M512.512 381.984a64.032 64.032 0 0 0-63.952 64.048 63.968 63.968 0 0 0 127.904 0 64.096 64.096 0 0 0-63.952-64.048z" fill="#B8DFD7" ></path><path d="M512.512 201.44c-149.856 0-289.152 88.592-357.616 227.248-3.952 7.968-4.336 17.856 0 26.016C223.36 593.712 362.672 682.4 512.512 682.4c149.744 0 288.752-88.56 357.616-227.232v-0.368a28.704 28.704 0 0 0 0-26.016C801.264 290.032 662.272 201.44 512.512 201.44z m176.88 368.608c-53.728 34.208-114.864 52.272-176.88 52.272-62.096 0-123.248-18.064-176.992-52.336a350.992 350.992 0 0 1-119.568-128.24 349.728 349.728 0 0 1 119.472-127.936c53.84-34.224 115.088-52.24 177.088-52.24 62.016 0 123.136 18.016 176.88 52.24 49.872 31.632 91.024 75.792 119.872 128.112a354.48 354.48 0 0 1-119.872 128.128z" fill="#23B294" ></path><path d="M512.512 318.032c-70.56 0-127.904 57.44-127.904 128 0 70.432 57.344 127.808 127.904 127.808 70.544 0 127.904-57.376 127.904-127.808 0-70.656-57.36-128-127.904-128z m0 191.824a63.968 63.968 0 0 1-63.952-63.824 64.032 64.032 0 0 1 63.952-64.048 64.096 64.096 0 0 1 63.952 64.048 63.968 63.968 0 0 1-63.952 63.824z" fill="#23B294" ></path></symbol><symbol id="icon-itsm-liuchengguanli" viewBox="0 0 1181 1024"><path d="M1091.162219 638.818266h-110.040446v-168.30333H630.152877v-86.120894h99.564154a90.059349 90.059349 0 0 0 90.400682-89.271657V89.272445A90.059349 90.059349 0 0 0 729.717031 0.000788h-286.194431a90.033092 90.033092 0 0 0-90.374425 89.271657v205.84994a90.033092 90.033092 0 0 0 90.374425 89.271657h104.132763v86.120894H192.669242v168.30333H90.505707a90.059349 90.059349 0 0 0-90.400682 89.271658v206.637631A90.059349 90.059349 0 0 0 90.505707 1023.999212h286.194431a90.059349 90.059349 0 0 0 90.374425-89.271657v-206.637631a90.059349 90.059349 0 0 0-90.374425-89.271658H267.814973v-93.73524h638.029787v93.73524h-100.850716a90.059349 90.059349 0 0 0-90.400682 89.271658v206.637631a90.059349 90.059349 0 0 0 90.400682 89.271657h286.194431a90.033092 90.033092 0 0 0 90.374425-89.271657v-206.637631a90.033092 90.033092 0 0 0-90.374425-89.271658z m-714.567106 74.568091a14.572285 14.572285 0 0 1 15.0449 14.703567v206.637631a14.572285 14.572285 0 0 1-15.0449 14.703567h-286.194432a14.598542 14.598542 0 0 1-15.071156-14.703567v-206.637631a14.598542 14.598542 0 0 1 15.071156-14.703567h286.194432z m67.452614-403.297841a14.808593 14.808593 0 0 1-15.071156-14.966131V89.272445a14.808593 14.808593 0 0 1 15.071156-14.966131h286.194432a14.808593 14.808593 0 0 1 15.071156 14.966131v205.84994a14.808593 14.808593 0 0 1-15.071156 14.966131h-286.194432z m662.185648 624.639039a14.598542 14.598542 0 0 1-15.071156 14.703567h-286.194432a14.598542 14.598542 0 0 1-15.071156-14.703567v-206.637631a14.598542 14.598542 0 0 1 15.071156-14.703567h286.194432a14.598542 14.598542 0 0 1 15.071156 14.703567v206.637631z"  ></path></symbol><symbol id="icon-reset" viewBox="0 0 1024 1024"><path d="M256 512H170.666667c0 185.002667 156.288 341.333333 341.333333 341.333333s341.333333-156.330667 341.333333-341.333333-156.288-341.333333-341.333333-341.333333V85.333333L342.4 213.333333 512 341.333333V256c138.752 0 256 117.248 256 256s-117.248 256-256 256-256-117.248-256-256z" fill="" ></path><path d="M640 512c0-71.210667-56.704-128-128-128s-128 56.789333-128 128 56.704 128 128 128 128-56.789333 128-128z" fill="" ></path></symbol><symbol id="icon-zhongzhi1" viewBox="0 0 1024 1024"><path d="M511.99872 3.456C229.93792 3.456 1.28 231.13984 1.28 511.99744 1.28 792.86016 229.93792 1020.544 511.99872 1020.544 794.06592 1020.544 1022.72 792.86016 1022.72 511.99744 1022.72 231.13984 794.06592 3.456 511.99872 3.456L511.99872 3.456zM520.3072 872.28032c-188.20096 0-341.3312-152.47616-341.3312-339.87584 0-187.3984 153.13024-339.87456 341.3312-339.87456l0.02816 0L520.33536 118.64448l178.08384 118.21696-178.08384 118.21952L520.33536 281.1904l-0.02816 0c-139.10784 0-252.28544 112.69376-252.28544 251.21536 0 138.5152 113.1776 251.21152 252.28544 251.21152s252.28672-112.69632 252.28672-251.21152c0-24.50432 19.91168-44.33152 44.52224-44.33152 24.60928 0 44.52224 19.8272 44.52224 44.33152C861.63712 719.80416 708.50304 872.28032 520.3072 872.28032L520.3072 872.28032zM520.3072 872.28032"  ></path></symbol><symbol id="icon-default" viewBox="0 0 1024 1024"><path d="M512.020 73.677c-239.75 0-434.093 195.721-434.093 437.159s194.342 437.159 434.093 437.159 434.112-195.721 434.112-437.159-194.362-437.159-434.112-437.159zM729.087 523.45c0 18.589-14.961 33.649-33.397 33.649h-367.321c-18.434 0-33.377-15.058-33.377-33.649v-33.61c0-18.59 14.941-33.649 33.377-33.649h367.321c18.435 0 33.397 15.058 33.397 33.649v33.61z" fill="#555555" ></path></symbol><symbol id="icon-timefill" viewBox="0 0 1024 1024"><path d="M512 64C264.96 64 64 264.96 64 512s200.96 448 448 448 448-200.96 448-448S759.04 64 512 64zM671.264 576l-191.104 0C462.496 576 448 561.536 448 543.84L448 289.088c0-17.664 14.336-32 32-32s32 14.336 32 32L512 512l159.264 0c17.696 0 32 14.336 32 32C703.264 561.696 688.928 576 671.264 576z"  ></path></symbol><symbol id="icon-daimapeizhir" viewBox="0 0 1024 1024"><path d="M513.536 3.072C233.472 3.072 5.632 230.912 5.632 510.464c0 280.064 227.84 507.904 507.904 507.904 280.064 0 507.904-227.84 507.904-507.904C1020.928 230.912 793.6 3.072 513.536 3.072zM425.984 662.016c-4.608 5.12-10.752 7.168-16.896 7.168-5.632 0-11.264-2.048-15.36-6.144L246.272 527.36c-5.12-4.608-7.68-11.264-7.168-17.92-0.512-6.656 2.048-13.312 7.68-18.432L394.24 361.984c9.216-8.192 24.064-7.168 32.256 2.048 8.192 9.216 7.168 24.064-2.048 32.256L294.4 509.952 424.448 629.76C433.664 638.464 434.176 652.8 425.984 662.016zM574.976 309.76 512 718.336c-1.536 11.264-11.264 19.456-22.528 19.456-1.024 0-2.56 0-3.584-0.512-12.288-2.048-20.992-13.312-18.944-26.112l62.464-408.576c2.048-12.288 13.312-20.992 26.112-18.944C568.32 285.696 576.512 297.472 574.976 309.76zM803.328 534.528l-147.456 136.192c-4.608 4.096-9.728 6.144-15.36 6.144-6.144 0-12.288-2.56-16.896-7.168-8.704-9.216-8.192-23.552 1.536-32.256l130.048-119.808-129.536-113.664c-9.216-8.192-10.24-22.528-2.048-32.256 8.192-9.216 22.528-10.24 32.256-2.048l147.456 129.536c5.632 4.608 8.192 11.776 7.68 18.432C810.496 523.264 808.448 529.92 803.328 534.528z"  ></path></symbol><symbol id="icon-luyou" viewBox="0 0 1024 1024"><path d="M886.833275 403.841671l23.553517 0C903.017286 403.33592 894.997531 403.552671 886.833275 403.841671zM110.723206 403.841671l30.056022 0C130.519721 403.40817 119.898963 402.97467 110.723206 403.841671z"  ></path><path d="M926.281803 406.370423c-3.757003-1.083751-7.947506-1.806251-12.354759-2.239752-1.156001-0.07225-2.312002-0.21675-3.540253-0.289l-23.553517 0c-8.164256 0.21675-16.545262 0.65025-24.557793 0.65025-21.530516 0-42.627531 0.722501-61.629295-0.65025-1.156001-0.07225-2.246977-0.1445-3.323502-0.21675l0-192.040641c0-42.266281 5.129754-79.980809-30.207747-84.171312l-9.175757 0c-34.896776 4.768503-30.128272 42.049531-30.128272 82.29281l0 194.786143c-137.491851-0.578-277.295703 1.083751-413.703803-0.65025-5.996754-0.07225-11.993509-0.1445-17.990263-0.21675l0-192.040641c0-42.194031 5.491004-80.269809-30.128272-84.171312l-8.236506 0c-36.269527 4.624003-31.139773 43.566782-31.139773 86.844564l0 190.234389-65.819798 0c-6.141254 0-13.00501-0.36125-20.013265-0.65025l-30.056022 0c-5.996754 0.50575-11.415508 1.517251-15.750512 3.395752-15.606011 6.719255-28.394271 19.724264-32.946024 35.691526-1.734001 6.141254-2.456502 13.00501-2.601002 20.085515-0.07225 1.300501-0.07225 2.601002-0.07225 3.901503 0 10.476258 0.867001 21.169266 0.867001 30.850773l0 113.439808c0 11.119283-0.867001 22.823792-0.867001 33.87805 0 4.053228 0.07225 8.019756 0.4335 11.849009 0.289 3.179002 0.65025 6.285755 1.300501 9.182982 4.335003 20.808015 22.831017 40.31553 46.673534 42.988781 2.890002 0.36125 5.852254 0.578 8.742256 0.787526 8.092006 0.578 16.328512 0.794751 24.637268 0.794751 22.758767 0 46.167784-1.589501 68.998801-1.589501l614.6312 0c20.519015 0 42.844281 1.589501 62.785296 1.589501 3.460778 0 6.85653-0.07225 10.107782-0.1445 10.042757-0.368475 19.146264-1.307726 26.73252-3.330727 21.602766-5.700529 35.684301-23.763042 40.243279-46.594059l0-207.646652C958.794327 429.85169 948.67932 412.872927 926.281803 406.370423zM913.421294 648.6971c-15.172511 10.042757-67.8428 4.551753-96.880096 4.551753l-657.547732 0c-19.146264 0-39.665279 1.878501-48.479786-4.551753-6.141254-4.479503-9.175757-13.51076-10.548508-24.709518-2.167502-17.340013-0.4335-39.809779-0.4335-58.522543l0-46.601284c0-11.054258-0.289-20.880265 0.4335-29.189021 1.445001-16.184012 6.647005-26.73252 25.143018-29.405772 28.105271-3.973753 68.1318-0.867001 100.644324-0.867001l597.146687 0c25.721019 0 79.908559-4.190503 92.407818 6.430255 4.768503 4.046003 7.369505 11.776759 8.742256 21.602766l0 138.142101C922.452551 636.270091 919.273548 644.795597 913.421294 648.6971z"  ></path><path d="M964.668257 750.208424c0 2.442052 0 4.884104 0 7.326155-5.541579 26.479644-21.053665 42.959881-47.554985 48.472561-269.781698 0-539.58507 0-809.359543 0-28.285896-6.170155-45.864334-23.033317-47.56221-55.798716C361.698215 750.208424 663.168786 750.208424 964.668257 750.208424z"  ></path><path d="M634.82509 532.808015l0 63.724547c0 2.239752-1.806251 4.046003-4.046003 4.046003l-82.07606 0c-2.246977 0-4.118253-1.806251-4.118253-4.046003l0-63.724547c0-2.239752 1.878501-4.046003 4.118253-4.046003l82.07606 0C633.018839 528.762012 634.82509 530.568264 634.82509 532.808015z"  ></path><path d="M759.167431 532.808015l0 63.724547c0 2.239752-1.806251 4.046003-4.046003 4.046003l-82.07606 0c-2.239752 0-4.046003-1.806251-4.046003-4.046003l0-63.724547c0-2.239752 1.806251-4.046003 4.046003-4.046003l82.07606 0C757.36118 528.762012 759.167431 530.568264 759.167431 532.808015z"  ></path><path d="M884.449023 532.808015l0 63.724547c0 2.239752-1.806251 4.046003-4.046003 4.046003l-82.07606 0c-2.239752 0-4.046003-1.806251-4.046003-4.046003l0-63.724547c0-2.239752 1.806251-4.046003 4.046003-4.046003l82.07606 0C882.642771 528.762012 884.449023 530.568264 884.449023 532.808015z"  ></path><path d="M226.612291 403.841671l0 0.65025-65.819798 0c-6.141254 0-13.00501-0.36125-20.013265-0.65025L226.612291 403.841671z"  ></path><path d="M727.810908 403.841671l0 0.65025c-137.491851-0.578-277.295703 1.083751-413.703803-0.65025L727.810908 403.841671z"  ></path><path d="M886.833275 403.841671c-8.164256 0.21675-16.545262 0.65025-24.557793 0.65025-21.530516 0-42.627531 0.722501-61.629295-0.65025L886.833275 403.841671z"  ></path><path d="M913.927044 403.841671l0 0.289c-1.156001-0.07225-2.312002-0.21675-3.540253-0.289L913.927044 403.841671z"  ></path><path d="M141.140478 710.687646l-24.637268 0 0-0.794751C124.595216 710.470895 132.831722 710.687646 141.140478 710.687646z"  ></path><path d="M887.555775 710.687646 141.140478 710.687646c22.758767 0 46.167784-1.589501 68.998801-1.589501l614.6312 0C845.289494 709.098144 867.61476 710.687646 887.555775 710.687646z"  ></path><path d="M897.670782 710.543145l0 0.1445-10.107782 0C891.023778 710.687646 894.41953 710.615395 897.670782 710.543145z"  ></path><path d="M59.425669 463.014464c-0.07225 1.300501-0.07225 2.601002-0.07225 3.901503l0-3.901503L59.425669 463.014464z"  ></path><path d="M59.786919 656.933606l-0.4335 0 0-11.849009C59.353418 649.1306 59.425669 653.104353 59.786919 656.933606z"  ></path><path d="M60.220419 497.76674l0 113.439808c0 11.119283-0.867001 22.823792-0.867001 33.87805l0-178.16863C59.353418 477.392225 60.220419 488.085232 60.220419 497.76674z"  ></path><path d="M99.957948 489.674734l0 134.312848c-2.167502-17.340013-0.4335-39.809779-0.4335-58.522543l0-46.601284C99.524448 507.809497 99.235448 497.98349 99.957948 489.674734z"  ></path></symbol><symbol id="icon-zhinengjiankongtixi" viewBox="0 0 1024 1024"><path d="M692.6 560.7H605c-13.4 0-24.2-10.8-24.2-24.2V388.6c0-13.4 10.8-24.2 24.2-24.2h87.6c13.4 0 24.2 10.8 24.2 24.2v147.9c0 13.4-10.9 24.2-24.2 24.2z" fill="#80BAFF" ></path><path d="M730.7 846.5c-4.4 0-8-3.6-8-8v-61.1c0-4.4 3.6-8 8-8s8 3.6 8 8v61.1c0 4.4-3.6 8-8 8zM796.2 846.5c-4.4 0-8-3.6-8-8v-61.1c0-4.4 3.6-8 8-8s8 3.6 8 8v61.1c0 4.4-3.6 8-8 8zM761.3 846.5c-4.4 0-8-3.6-8-8v-33.4c0-4.4 3.6-8 8-8s8 3.6 8 8v33.4c0 4.4-3.6 8-8 8zM212.3 252.1c-4.4 0-8-3.6-8-8V183c0-4.4 3.6-8 8-8s8 3.6 8 8v61.1c0 4.4-3.6 8-8 8zM277.7 252.1c-4.4 0-8-3.6-8-8V183c0-4.4 3.6-8 8-8s8 3.6 8 8v61.1c0 4.4-3.6 8-8 8zM242.9 252.1c-4.4 0-8-3.6-8-8v-33.4c0-4.4 3.6-8 8-8s8 3.6 8 8v33.4c0 4.4-3.6 8-8 8zM828.8 394.7c-32 0-58.1-26.1-58.1-58.1s26.1-58.1 58.1-58.1 58.1 26.1 58.1 58.1-26.1 58.1-58.1 58.1z m0-100.2c-23.2 0-42.1 18.9-42.1 42.1s18.9 42.1 42.1 42.1 42.1-18.9 42.1-42.1-18.9-42.1-42.1-42.1zM830.1 629.1c-38.2 0-69.3-31.1-69.3-69.3s31.1-69.3 69.3-69.3c38.2 0 69.3 31.1 69.3 69.3s-31.1 69.3-69.3 69.3z m0-122.6c-29.4 0-53.3 23.9-53.3 53.3s23.9 53.3 53.3 53.3 53.3-23.9 53.3-53.3-23.9-53.3-53.3-53.3zM716.8 568.7h-134c-4.4 0-8-3.6-8-8V336.3c0-4.4 3.6-8 8-8h134c4.4 0 8 3.6 8 8v224.4c0 4.4-3.6 8-8 8z m-126-16h118V344.3h-118v208.4z" fill="#0084FF" ></path><path d="M632.3 849h-216c-4.4 0-8-3.6-8-8v-74.2c0-10-8.1-18.1-18.1-18.1h-36.8c-34.2 0-62.1-26.8-63.5-61.1-1.5-38.2-10.1-63.3-24.2-70.6-8-4.2-16-7.7-23-10.8-19.4-8.7-34.7-15.5-38.1-29-2.1-8.4 0.8-17.3 9.1-28.2 23.7-30.9 62.4-109 69.1-161.1 3.9-30.5 24.7-78.7 62.5-117.3 33-33.8 91.6-73.2 183.1-69.5 48.2 2 98.1 25.3 144.2 67.4 34.5 31.5 54.6 62 55.5 63.3 0.8 1.3 1.3 2.7 1.3 4.2 0.2 9.4 4 231.2-0.1 258.2-0.7 4.6-2.8 18.6-47.5 80.1-18.1 24.9-36 47.7-41.5 54.8V841c0 4.4-3.6 8-8 8z m-208-16h200V726.5c0-1.8 0.6-3.6 1.7-5 32.4-40.6 84.8-111.7 87.4-129.5 3.1-20.4 1.3-173.1 0-253.2-4.9-7-23.5-32.8-51.9-58.7-30.1-27.4-77.8-60.6-133.8-63-85.6-3.5-140.2 33.2-171 64.7-35.2 36-54.5 80.2-58 108.2-7.2 55.5-46.9 135.7-72.3 168.8-4.9 6.4-7.1 11.4-6.3 14.5 1.5 6 14.9 11.9 29.1 18.3 7.2 3.2 15.4 6.9 23.8 11.2 20 10.3 31.1 38.7 32.8 84.2 1 25.6 21.9 45.7 47.5 45.7h36.8c18.8 0 34.1 15.3 34.1 34.1V833z" fill="#0084FF" ></path><path d="M646.7 707.5c-0.4 0-0.8 0-1.1-0.1-63.8-9.1-121.2-38.6-165.9-85.4-43.9-45.9-74.8-107.5-89.2-178.1-6.8-33.3-5-66.5 5.5-98.8 8.3-25.7 22-50.8 40.8-74.6 31.8-40.3 66.7-62.8 68.2-63.8 3.7-2.4 8.7-1.3 11 2.4 2.4 3.7 1.3 8.7-2.4 11-0.3 0.2-34.4 22.2-64.5 60.6-39.8 50.7-54.3 104.5-42.9 159.9C434.7 580.3 525 674 647.8 691.6c4.4 0.6 7.4 4.7 6.8 9.1-0.6 3.9-4 6.8-7.9 6.8z" fill="#0084FF" ></path><path d="M578.8 456.5H408.4c-4.4 0-8-3.6-8-8s3.6-8 8-8h170.4c4.4 0 8 3.6 8 8s-3.6 8-8 8z" fill="#0084FF" ></path><path d="M401.9 459.8m-54.7 0a54.7 54.7 0 1 0 109.4 0 54.7 54.7 0 1 0-109.4 0Z" fill="#0084FF" ></path><path d="M777.7 345.6h-50.9c-4.4 0-8-3.6-8-8s3.6-8 8-8h50.9c4.4 0 8 3.6 8 8s-3.6 8-8 8zM763.4 567.8h-36.6c-4.4 0-8-3.6-8-8s3.6-8 8-8h36.6c4.4 0 8 3.6 8 8s-3.6 8-8 8z" fill="#0084FF" ></path></symbol><symbol id="icon-phpkaifa" viewBox="0 0 1024 1024"><path d="M365.789184 315.230208" fill="#333303" ></path><path d="M832.292864 374.351872l-21.512192 0-8.835072 45.45536 20.103168 0c0 0 24.457216 0.641024 25.61024-29.45024C848.809984 373.071872 832.292864 374.351872 832.292864 374.351872z" fill="#333303" ></path><path d="M808.7552 275.965952 594.432 231.424c0 0 9.703424 41.621504 9.740288 75.913216 0 0 0.393216 28.051456 0.720896 61.935616l2.28352-11.696128c0 0 29.835264 0.385024 49.42848 0 19.591168-0.385024 38.856704 13.459456 29.835264 44.816384-10.756096 37.390336-49.043456 34.318336-49.043456 34.318336l-21.768192-0.172032-6.148096 28.60032-4.255744 0c-0.12288 11.476992-0.364544 19.245056-0.77824 20.781056-2.121728 7.862272-2.648064 41.40032-77.84448 43.102208s-78.102528-43.37664-77.828096-48.277504l-0.280576-72.38656c0 0 1.009664-10.113024 11.362304-10.776576 10.348544-0.669696 11.360256 11.341824 11.360256 11.341824l0.657408 71.909376c0 0 4.411392 27.500544 55.832576 27.357184 51.423232-0.139264 51.843072-19.95776 53.481472-25.483264s0.561152-199.13728 0.561152-199.13728 2.883584-66.224128-72.577024-83.982336c0 0-9.037824-4.958208-35.616768-4.947968l-110.592 1.964032c0 0-114.581504 3.446784-132.212736 140.498944 0 0-3.166208 24.829952-3.201024 42.51648-0.034816 17.682432-0.256 309.11488-0.256 309.11488s-1.23904 20.412416-24.567808 25.667584c0 0-25.874432 3.432448-32.067584-25.790464l-0.571392-84.527104c0 0-2.56-32.014336-35.885056-34.803712 0 0-30.887936-0.018432-36.255744 34.813952l1.148928 90.066944c0 0 6.176768 54.76352 60.65152 79.110144 54.478848 24.346624 101.081088-6.545408 107.866112-12.109824 6.77888-5.564416 34.033664-25.554944 39.809024-64.768 0 0 1.511424-2.174976 1.511424-35.34848l0.415744-54.075392c0 0 5.410816-27.564032 35.043328-28.489728 29.630464-0.925696 35.043328 28.506112 35.043328 28.506112l0 201.140224c0 0 6.350848 26.646528 30.599168 21.338112l139.425792-12.1344c0 0 20.39808-4.298752 20.39808-24.168448l0-140.679168c0 0 4.110336-12.68736 16.379904-12.68736 12.26752 0 128.86016 0.17408 128.86016 0.17408s9.652224 1.181696 13.983744 12.51328c4.333568 11.329536-0.446464 0-0.446464 0l0.628736 133.349376c0 0 1.875968 23.334912 31.213568 22.534144l115.982336 15.910912 26.257408 3.602432c0 0 24.092672-2.768896 24.567808-24.530944L927.285248 402.868224C927.289344 402.868224 922.79808 300.591104 808.7552 275.965952zM365.789184 315.230208l-9.818112 11.270144c-11.4176-9.981952-24.342528-1.927168-24.342528-1.927168-13.641728 8.548352-6.572032 24.03328-6.572032 24.03328l-11.266048 3.545088c-6.324224 1.601536-10.907648-2.738176-10.907648-2.738176-4.796416-18.034688 7.24992-34.185216 7.24992-34.185216 19.597312-21.254144 46.995456-12.652544 46.995456-12.652544C370.640896 306.82112 365.789184 315.230208 365.789184 315.230208zM742.144 436.711424c0 0 5.593088-24.999936 8.044544-42.35264 1.005568-7.143424 5.402624-19.24096-6.244352-19.267584-9.752576-0.026624-24.338432-0.100352-24.338432-0.100352l-12.294144 61.720576-23.048192 0 21.512192-108.075008 23.6032 0-5.931008 28.932096 24.332288 0c0 0 32.268288-2.551808 28.42624 24.082432-3.842048 26.63424-11.014144 55.062528-11.014144 55.062528L742.144 436.713472zM870.068224 402.393088c-10.756096 37.390336-49.043456 34.318336-49.043456 34.318336l-21.768192-0.172032-6.146048 28.60032L769.80224 465.139712l21.00224-107.563008c0 0 29.835264 0.385024 49.42848 0C859.824128 357.19168 879.089664 371.03616 870.068224 402.393088z" fill="#333303" ></path><path d="M664.031232 390.356992c1.153024-17.28512-15.366144-16.00512-15.366144-16.00512l-21.51424 0-8.835072 45.45536 20.103168 0C638.420992 419.807232 662.880256 420.448256 664.031232 390.356992z" fill="#333303" ></path></symbol><symbol id="icon-SQLserver" viewBox="0 0 1024 1024"><path d="M541.6 883.6c-4.9 4.2-11 6.3-18.2 6.3-13.8 0-26-9.7-36.6-29.2l-35.2 21.2v0.2c8.3 16.4 18.2 28.4 29.8 36.1 11.7 7.7 25.3 11.5 41 11.5 20.1 0 36.4-5.9 48.9-17.7 12.5-11.8 18.7-26.7 18.7-44.8 0-9.3-1.8-17.8-5.3-25.7-3.5-7.8-9.6-16-18.1-24.6-3.4-3.5-13.1-12-29.1-25.3-17.1-14.4-27.4-23.9-30.7-28.3-2.5-3.3-3.8-6.8-3.8-10.5s1.8-7.1 5.3-10c3.5-2.9 8-4.4 13.5-4.4 11.3 0 22.4 7.6 33.3 22.7l31-27.4C574.7 720.3 563.9 711 554 706c-10-5.1-20.5-7.6-31.4-7.6-17.1 0-31.5 5.5-43.1 16.4-11.7 10.9-17.5 24-17.5 39.3 0 10.6 3.5 21.2 10.5 31.8 7 10.6 22.5 25.7 46.5 45.3 12.6 10.3 20.7 17.9 24.4 22.9 3.7 5 5.6 10 5.6 15 0 5.5-2.5 10.3-7.4 14.5zM799.2 732.1c-22.4-22.6-49.3-33.9-80.5-33.9-20.5 0-39.6 5.2-57.5 15.6-17.9 10.4-31.9 24.4-42.1 42-10.2 17.6-15.3 37-15.3 58.1 0 31.5 10.9 58.7 32.8 81.5 21.9 22.8 49.4 34.2 82.5 34.2 19.8 0 37.7-4.4 53.8-13.2l19.5 25.1h49.7L803.8 892c19.4-21.7 29.1-47.4 29.1-77.3 0-32.5-11.2-60.1-33.7-82.6z m-21.6 126l-19.9-25.6h-50l39.4 50.8c-8.8 3.9-18.2 5.9-28.2 5.9-17.4 0-33-5.6-46.7-16.6-17.4-14.3-26.2-33.6-26.2-58 0-21.9 7-39.9 20.9-54.1 13.9-14.2 31.1-21.3 51.7-21.3 20 0 37 7.3 51.1 21.8 14.1 14.6 21.2 32.3 21.2 53.2 0 16.1-4.4 30.7-13.3 43.9zM899 703.8h-41.9v220.3h103v-40H899z" fill="#333303" ></path><path d="M451.3 585c122.9 0 251.9-24.6 325.6-67.6v85.8h0.1c0.9 16.1 14.3 28.9 30.7 28.9s29.7-12.8 30.7-28.9h0.1V234.8c0-202.7-774.1-202.7-774.1 0v552.9c0 80.7 132.6 132.4 285.4 148.3 1.3 0.2 2.7 0.4 4.1 0.4 0.6 0.1 1.1 0.1 1.7 0.2v-0.2c16.7-0.3 30.1-13.9 30.1-30.7 0-17-13.8-30.7-30.7-30.7h-0.8c-147.5-15-228.3-61.8-228.3-87.4v-92.2c53 30.9 134.7 52.3 222.1 61.9 2.3 0.5 4.6 0.8 7 0.8h0.6c16.7-0.3 30.1-13.9 30.1-30.7 0-17-13.8-30.7-30.7-30.7h-1.3c-147.2-15.1-227.9-61.8-227.9-87.3v-92.2c73.6 43.2 202.6 67.8 325.5 67.8zM778 419.1c0 36.9-116.7 98.3-325.6 98.3-208.9 0-325.6-61.4-325.6-92.2V333c73.7 43 202.7 67.6 325.6 67.6 122.9 0 251.9-24.6 325.6-67.6v86.1zM451.3 142.6c208.9 0 325.6 61.4 325.6 92.1 0 30.7-116.7 92.2-325.6 92.2-208.9 0-325.6-61.4-325.6-92.2-0.1-30.6 116.7-92.1 325.6-92.1z" fill="#333303" ></path></symbol><symbol id="icon-mongodb1" viewBox="0 0 1024 1024"><path d="M646.625 227.507c-42.414-73.446-90-111.728-105.528-130.35C525.594 78.541 505.923 32 505.923 32c-4.122 48.394-41.365 57.917-99.303 126.208-57.928 68.27-110.694 204.826-110.694 334.126 0 129.316 48.62 214.144 88.97 273.111 31.068 45.394 68.792 72.975 91.628 94.142 1.602 1.469 3.174 2.97 4.725 4.5 0.246 0.225 0.466 0.466 0.697 0.712a111.427 111.427 0 0 1 3.604 3.691c0.563 0.6 1.034 1.198 1.572 1.797 0.747 0.845 1.52 1.71 2.196 2.55a53.29 53.29 0 0 1 3.17 4.311c15.524 23.793 13.445 104.494 13.445 104.494l26.905 10.353s3.113-106.558 9.319-117.94c6.205-11.381 29.977-28.968 43.443-41.38 13.445-12.41 29.998-32.06 66.207-78.617 36.203-46.556 68.27-146.908 75.504-240.302 7.255-93.384-38.272-212.808-80.686-286.249zM410.506 747.914c-41.303-60.375-83.533-137.963-83.533-255.58 0-126.244 51.979-253.542 103.312-314.06 19.743-23.271 36.674-39.056 51.604-52.967 8.55-7.967 16.722-15.6 24.039-23.624 0 0 15.524 180.654 15.524 381.358 0 200.684-15.524 326.252-15.524 326.252s2.852 36.075-25.672 12.15c-21.504-18.048-47.662-41.242-69.75-73.529z" fill="#333303" ></path></symbol><symbol id="icon-css3" viewBox="0 0 1024 1024"><path d="M157.110857 73.142857l860.013714 0-151.990857 761.709714-459.410286 152.576-398.848-152.576 40.594286-203.410286 169.691429 0-16.603429 83.968 241.152 92.013714 277.723429-92.013714 38.838857-193.682286-690.322286 0 33.133714-169.691429 690.834286 0 21.723429-109.129143-690.322286 0z" fill="#333303" ></path></symbol><symbol id="icon-html5" viewBox="0 0 1024 1024"><path d="M755.419429 341.138286l9.142857-99.986286-505.124571 0 26.843429 305.152 349.696 0-12.580571 130.267429-112.566857 30.281143-111.981714-30.281143-7.460571-80.018286-99.986286 0 12.580571 158.866286 206.848 57.124571 2.267429 0 0-0.585143 205.165714-56.539429 28.598857-310.857143-367.981714 0-8.557714-103.424 385.170286 0zM109.714286 73.142857l804.571429 0-73.142857 821.686857-330.313143 92.598857-327.972571-92.598857z" fill="#333303" ></path></symbol><symbol id="icon-linux" viewBox="0 0 1024 1024"><path d="M452.32912 234.848q-6.272 0.576-8.864 6.016t-4.864 5.44q-2.848 0.576-2.848-2.848 0-6.848 10.848-8.576l5.728 0zM502.05712 242.848q-2.272 0.576-6.56-3.712t-10.016-2.56q13.728-6.272 18.272 1.152 1.728 3.424-1.728 5.152zM301.48112 486.848q-2.272-0.576-3.424 1.728t-2.56 7.136-3.136 7.712-5.728 7.424q-4 5.728-0.576 6.848 2.272 0.576 7.136-4t7.136-10.272q0.576-1.728 1.152-4t1.152-3.424 0.864-2.56 0.288-2.272l0-1.728t-0.576-1.44-1.728-1.152zM790.05712 692q0-10.272-31.424-24 2.272-8.576 4.288-15.712t2.848-14.848 1.728-12.288 0.288-12.864-0.576-11.136-2.016-12.576-2.272-11.712-2.848-14.272-3.136-15.136q-5.728-27.424-26.848-58.848t-41.152-42.848q13.728 11.424 32.576 47.424 49.728 92.576 30.848 158.848-6.272 22.848-28.576 24-17.728 2.272-22.016-10.56t-4.576-47.712-6.56-61.152q-5.152-22.272-11.136-39.424t-11.136-26.016-8.864-14.016-7.424-8.576-4.288-4q-8-35.424-17.728-58.848t-16.864-32-13.44-18.848-8.576-22.848q-2.272-12 3.424-30.56t2.56-28.288-25.44-14.272q-8.576-1.728-25.44-10.272t-20.288-9.152q-4.576-0.576-6.272-14.848t4.576-29.152 20.576-15.424q21.152-1.728 29.152 17.152t2.272 33.152q-6.272 10.848-1.152 15.136t17.152 0.288q7.424-2.272 7.424-20.576l0-21.152q-2.848-17.152-7.712-28.576t-12-17.44-13.44-8.576-15.424-4.288q-61.152 4.576-50.848 76.576 0 8.576-0.576 8.576-5.152-5.152-16.864-6.016t-18.848 0.288-8.864-2.848q0.576-32.576-9.152-51.424t-25.728-19.424q-15.424-0.576-23.712 15.712t-9.44 34.016q-0.576 8.576 2.016 21.152t7.424 21.44 8.864 7.712q5.728-1.728 9.152-8 2.272-5.152-4-4.576-4 0-8.864-8.288t-5.44-19.136q-0.576-12.576 5.152-21.152t19.424-8q9.728 0 15.424 12t5.44 22.272-0.864 12.576q-12.576 8.576-17.728 16.576-4.576 6.848-15.712 13.44t-11.712 7.136q-7.424 8-8.864 15.424t4.288 10.272q8 4.576 14.272 11.136t9.152 10.848 10.56 7.424 20.288 3.712q26.848 1.152 58.272-8.576 1.152-0.576 13.152-4t19.712-6.016 16.864-7.424 12-10.016q5.152-8 11.424-4.576 2.848 1.728 3.712 4.864t-1.728 6.848-9.44 5.44q-11.424 3.424-32.288 12.288t-26.016 11.136q-25.152 10.848-40 13.152-14.272 2.848-45.152-1.152-5.728-1.152-5.152 1.152t9.728 10.848q14.272 13.152 38.272 12.576 9.728-0.576 20.576-4t20.576-8 19.136-10.016 17.152-9.728 14.016-6.848 10.016-1.44 4.864 6.272q0 1.152-0.576 2.56t-2.272 2.848-3.424 2.56-4.864 2.848-5.152 2.56-5.728 2.848-5.44 2.56q-16 8-38.56 25.152t-38.016 24.576-28 0.576q-12-6.272-36-41.728-12.576-17.728-14.272-12.576-0.576 1.728-0.576 5.728 0 14.272-8.576 32.288t-16.864 31.712-12 33.152 6.56 36q-13.152 3.424-35.712 51.424t-27.136 80.576q-1.152 10.272-0.864 39.424t-3.136 33.728q-4.576 13.728-16.576 1.728-18.272-17.728-20.576-53.728-1.152-16 2.272-32 2.272-10.848-0.576-10.272l-2.272 2.848q-20.576 37.152 5.728 94.848 2.848 6.848 14.272 16t13.728 11.424q11.424 13.152 59.424 51.712t53.152 43.712q9.152 8.576 10.016 21.728t-8 24.576-26.016 13.152q4.576 8.576 16.576 25.44t16 30.848 4 40.288q26.272-13.728 4-52.576-2.272-4.576-6.016-9.152t-5.44-6.848-1.152-3.424q1.728-2.848 7.424-5.44t11.424 1.44q26.272 29.728 94.848 20.576 76-8.576 101.152-49.728 13.152-21.728 19.424-17.152 6.848 3.424 5.728 29.728-0.576 14.272-13.152 52.576-5.152 13.152-3.424 21.44t13.728 8.864q1.728-10.848 8.288-44t7.712-51.424q1.152-12-3.712-42.016t-4.288-55.424 13.152-40.288q8.576-10.272 29.152-10.272 0.576-21.152 19.712-30.272t41.44-6.016 34.272 12.864zM431.20912 219.424q1.728-9.728-1.44-17.152t-6.56-8.576q-5.152-1.152-5.152 4 1.152 2.848 2.848 3.424 5.728 0 4 8.576-1.728 11.424 4.576 11.424 1.728 0 1.728-1.728zM670.63312 332q-1.152-4.576-3.712-6.56t-7.424-2.848-8.288-3.136q-2.848-1.728-5.44-4.576t-4-4.576-3.136-3.712-2.272-2.272-2.272 0.864q-8 9.152 4 24.864t22.272 18.016q5.152 0.576 8.288-4.576t2.016-11.424zM568.90512 210.272q0-6.272-2.848-11.136t-6.272-7.136-5.152-1.728q-8 0.576-4 4l2.272 1.152q8 2.272 10.272 17.728 0 1.728 4.576-1.152zM599.75312 77.152q0-1.152-1.44-2.848t-5.152-4-5.44-3.424q-8.576-8.576-13.728-8.576-5.152 0.576-6.56 4.288t-0.576 7.424-0.288 7.136q-0.576 2.272-3.424 6.016t-3.424 5.152 1.728 4.864q2.272 1.728 4.576 0t6.272-5.152 8.576-5.152q0.576-0.576 5.152-0.576t8.576-1.152 5.152-4zM922.63312 843.424q11.424 6.848 17.728 14.016t6.848 13.728-1.44 12.864-8.864 12.576-13.44 11.136-17.152 10.56-18.016 9.44-18.272 8.864-15.424 7.424q-21.728 10.848-48.864 32t-43.136 36.576q-9.728 9.152-38.848 11.136t-50.848-8.288q-10.272-5.152-16.864-13.44t-9.44-14.56-12.576-11.136-26.848-5.44q-25.152-0.576-74.272-0.576-10.848 0-32.576 0.864t-33.152 1.44q-25.152 0.576-45.44 8.576t-30.56 17.152-24.864 16.288-30.56 6.56q-16.576-0.576-63.424-17.728t-83.424-24.576q-10.848-2.272-29.152-5.44t-28.576-5.152-22.56-5.44-19.136-8.288-9.728-11.136q-5.728-13.152 4-38.016t10.272-31.136q0.576-9.152-2.272-22.848t-5.728-24.288-2.56-20.864 6.016-15.424q8-6.848 32.576-8t34.272-6.848q17.152-10.272 24-20t6.848-29.152q12 41.728-18.272 60.576-18.272 11.424-47.424 8.576-19.424-1.728-24.576 5.728-7.424 8.576 2.848 32.576 1.152 3.424 4.576 10.272t4.864 10.272 2.56 9.728 0.576 12.576q0 8.576-9.728 28t-8 27.424q1.728 9.728 21.152 14.848 11.424 3.424 48.288 10.56t56.864 11.712q13.728 3.424 42.272 12.576t47.136 13.152 31.712 2.272q24.576-3.424 36.864-16t13.152-27.424-4.288-33.44-10.848-29.728-11.424-20.864q-69.152-108.576-96.576-138.272-38.848-42.272-64.576-22.848-6.272 5.152-8.576-8.576-1.728-9.152-1.152-21.728 0.576-16.576 5.728-29.728t13.728-26.848 12.576-24q4.576-12 15.136-41.152t16.864-44.576 17.152-34.848 22.272-30.848q62.848-81.728 70.848-111.424-6.848-64-9.152-177.152-1.152-51.424 13.728-86.56t60.576-59.712q22.272-12 59.424-12 30.272-0.576 60.576 7.712t50.848 23.712q32.576 24 52.288 69.44t16.864 84.288q-2.848 54.272 17.152 122.272 19.424 64.576 76 124.576 31.424 33.728 56.864 93.152t34.016 109.152q4.576 28 2.848 48.288t-6.848 31.712-11.424 12.576q-5.728 1.152-13.44 10.848t-15.424 20.288-23.136 19.136-34.848 8q-10.272-0.576-18.016-2.848t-12.864-7.712-7.712-8.864-6.56-11.712-5.152-11.136q-12.576-21.152-23.424-17.152t-16 28 4 55.424q11.424 40 0.576 111.424-5.728 37.152 10.272 57.44t41.728 18.848 48.576-20.288q33.728-28 51.136-38.016t59.136-24.288q30.272-10.272 44-20.864t10.56-19.712-14.272-16.288-29.44-13.44q-18.848-6.272-28.288-27.424t-8.576-41.44 8.864-27.136q0.576 17.728 4.576 32.288t8.288 23.136 11.712 16.288 12 10.848 12.288 7.424 9.44 5.44z" fill="#333303" ></path></symbol><symbol id="icon-dashujucunchu" viewBox="0 0 1026 1024"><path d="M975.644444 662.755556V361.244444c28.444444-14.222222 51.2-42.666667 51.2-76.8 0-48.355556-36.977778-85.333333-85.333333-85.333333-19.911111 0-39.822222 8.533333-54.044444 19.911111L594.488889 65.422222C585.955556 28.444444 551.822222 0 512 0c-42.666667 0-79.644444 31.288889-85.333333 73.955556L145.066667 224.711111C130.844444 207.644444 108.088889 199.111111 85.333333 199.111111c-48.355556 0-85.333333 36.977778-85.333333 85.333333 0 39.822222 28.444444 73.955556 65.422222 82.488889v290.133334C28.444444 665.6 0 699.733333 0 739.555556c0 48.355556 36.977778 85.333333 85.333333 85.333333 22.755556 0 45.511111-8.533333 59.733334-25.6l281.6 150.755555c5.688889 42.666667 39.822222 73.955556 85.333333 73.955556 39.822222 0 73.955556-28.444444 82.488889-65.422222l290.133333-153.6c14.222222 11.377778 34.133333 19.911111 54.044445 19.911111 48.355556 0 85.333333-36.977778 85.333333-85.333333 0-34.133333-19.911111-62.577778-48.355556-76.8z m-96.711111 14.222222l-133.688889-65.422222v-199.111112l133.688889-65.422222c11.377778 11.377778 22.755556 17.066667 36.977778 19.911111v290.133334c-14.222222 2.844444-25.6 11.377778-36.977778 19.911111zM853.333333 295.822222l-139.377777 68.266667L540.444444 264.533333V164.977778c19.911111-8.533333 36.977778-22.755556 45.511112-39.822222l267.377777 142.222222v28.444444zM520.533333 705.422222l-170.666666-96.711111v-193.422222l170.666666-96.711111 170.666667 96.711111v193.422222l-170.666667 96.711111zM483.555556 164.977778v105.244444l-167.822223 96.711111L170.666667 295.822222V284.444444v-8.533333l270.222222-145.066667c8.533333 17.066667 25.6 28.444444 42.666667 34.133334zM145.066667 347.022222l147.911111 73.955556v184.888889l-147.911111 73.955555c-5.688889-5.688889-14.222222-11.377778-22.755556-17.066666V361.244444c8.533333-2.844444 14.222222-8.533333 22.755556-14.222222zM170.666667 728.177778l145.066666-73.955556 167.822223 96.711111v105.244445c-17.066667 5.688889-34.133333 17.066667-42.666667 34.133333l-270.222222-142.222222V739.555556v-11.377778z m369.777777 130.844444v-99.555555l176.355556-99.555556 139.377778 68.266667v11.377778c0 5.688889 0 11.377778 2.844444 17.066666l-267.377778 142.222222c-14.222222-19.911111-31.288889-34.133333-51.2-39.822222z" fill="#333303" ></path></symbol><symbol id="icon-VPN" viewBox="0 0 1024 1024"><path d="M787.8 193.9c-49 0-92.1 19.8-123.5 51.6l-0.3-0.3-1.5 2.3c-13.1 13.7-23.9 29.5-31.8 46.8L555.4 405l-70.7 96.8-96.6 133c-3.1 4.1-5.9 8.3-8.6 12.5l-5.2 7.7 0.5 0.2c-13.2 24.1-20.7 51.7-20.7 81 0 94.3 77.3 170.7 172.7 170.7 95.3 0 172.6-76.4 172.6-170.7 0-81.4-57.6-149.4-134.7-166.5L521.6 634c1.8-0.1 3.5-0.3 5.3-0.3 57.2 0 103.6 45.9 103.6 102.4-0.3 56.4-46.7 102.4-103.9 102.4S423 792.7 423 736.2c0-22.4 7.4-42.7 19.7-59.7h0.1l-0.1-0.6v-0.1s50.6-71.6 50.4-71.6c0 0 131.8-183.1 132.1-182.5l74.1-109.9c1.7-2.7 3.5-5.4 5.4-7.9l2.2-3.3 0.3 0.3c19-23.4 47.7-38.6 80.4-38.6 57.2 0 103.6 45.9 103.6 102.5s-46.4 102.4-103.6 102.4c-45.3 0-83.4-29-97.4-69.1l-43.4 64.6c31.2 43.9 82.5 72.7 140.8 72.7 95.4 0 172.7-76.4 172.7-170.7 0.1-94.3-77.5-170.8-172.5-170.8zM402.7 409.7l55.4 71 42.2-57.9-116.8-147c-7.2-11.8-15.8-22.8-25.8-32.4l-1.9-2.5-0.4 0.3c-31-29.3-72.8-47.3-119-47.3-95.3 0-172.6 76.5-172.6 170.8s77.3 170.7 172.6 170.7c79.5-0.1 146.3-53.3 166.3-125.7z m-167.4 57.4c-57.2 0-103.6-45.9-103.6-102.4 0-56.6 46.4-102.5 103.6-102.5s103.6 45.9 103.6 102.5c0 56.5-46.4 102.4-103.6 102.4z" fill="#333303" ></path><path d="M620.8 192l0.1 0.2-105.6 146.9-110.2-146.9z" fill="#333303" ></path></symbol><symbol id="icon-jquery" viewBox="0 0 1024 1024"><path d="M65.450667 250.624c-90.581333 130.133333-79.36 299.392-10.112 437.589333 1.578667 3.370667 3.328 6.570667 5.034666 9.770667 0.981333 2.218667 2.090667 4.266667 3.285334 6.357333 0.554667 1.194667 1.322667 2.432 2.005333 3.541334 1.109333 2.218667 2.304 4.352 3.456 6.485333l6.698667 11.306667c1.237333 2.090667 2.432 4.138667 3.84 6.229333 2.346667 4.010667 5.12 7.978667 7.552 11.989333 1.109333 1.664 2.133333 3.328 3.370666 4.992a271.36 271.36 0 0 0 13.226667 18.944c3.328 4.565333 6.656 9.002667 10.24 13.44 1.152 1.621333 2.432 3.242667 3.626667 4.864l9.429333 11.477334c1.152 1.322667 2.304 2.858667 3.541333 4.224 4.181333 5.034667 8.618667 9.941333 13.056 14.890666 0 0.085333 0.128 0.170667 0.213334 0.298667a133.546667 133.546667 0 0 0 18.090666 18.773333c3.413333 3.498667 6.826667 6.997333 10.453334 10.410667l4.309333 4.138667c4.736 4.437333 9.472 8.874667 14.464 13.141333 0.085333 0 0.128 0.085333 0.213333 0.128l2.432 2.133333c4.352 3.797333 8.746667 7.594667 13.226667 11.093334l5.333333 4.48c3.626667 2.901333 7.381333 5.674667 11.093334 8.533333l5.802666 4.437333c3.968 2.986667 8.192 5.930667 12.245334 8.832 1.493333 1.066667 2.986667 2.133333 4.522666 3.114667l1.237334 0.981333 11.989333 7.893334 5.12 3.413333c6.272 4.010667 12.501333 7.808 18.688 11.562667 1.792 0.896 3.584 1.877333 5.248 2.901333 4.608 2.645333 9.386667 5.333333 14.037333 7.808 2.56 1.450667 5.205333 2.688 7.850667 4.010667 3.2 1.792 6.528 3.541333 9.941333 5.333333a13.824 13.824 0 0 1 2.389334 0.981333c1.408 0.64 2.730667 1.322667 4.096 2.005334 5.12 2.56 10.453333 4.992 16 7.424 1.024 0.426667 2.133333 0.853333 3.242666 1.450666 6.144 2.688 12.288 5.248 18.645334 7.765334 1.450667 0.426667 2.986667 1.152 4.48 1.706666 5.76 2.176 11.690667 4.394667 17.536 6.485334l2.133333 0.768c6.528 2.218667 12.970667 4.352 19.584 6.4 1.536 0.426667 3.114667 0.981333 4.736 1.408 6.784 2.048 13.354667 4.48 20.181333 5.802666 437.76 79.786667 564.992-263.210667 564.992-263.210666-106.88 139.178667-296.533333 175.872-476.16 135.04-6.656-1.536-13.312-3.669333-20.010666-5.632a576.938667 576.938667 0 0 1-24.192-7.722667l-2.645334-1.024c-5.802667-1.962667-11.392-4.138667-17.066666-6.314667a68.821333 68.821333 0 0 0-4.693334-1.749333c-6.272-2.517333-12.373333-5.12-18.432-7.808-1.322667-0.426667-2.432-1.024-3.754666-1.536a998.826667 998.826667 0 0 1-15.402667-7.253333 63.274667 63.274667 0 0 1-4.522667-2.218667c-4.010667-1.877333-8.021333-4.010667-11.946666-6.058667a168.192 168.192 0 0 1-7.978667-4.096c-4.821333-2.56-9.642667-5.333333-14.464-7.978666-1.450667-1.024-3.114667-1.877333-4.778667-2.816a678.485333 678.485333 0 0 1-18.688-11.477334 89.770667 89.770667 0 0 1-5.034666-3.370666 256.085333 256.085333 0 0 1-13.312-8.789334c-1.493333-0.981333-2.858667-2.048-4.394667-3.114666a407.082667 407.082667 0 0 1-12.544-9.045334c-1.792-1.450667-3.712-2.816-5.632-4.266666-3.754667-2.944-7.552-5.76-11.306667-8.874667l-5.034666-4.010667a451.413333 451.413333 0 0 1-14.250667-11.989333 11.008 11.008 0 0 0-1.578667-1.28l-14.805333-13.482667-4.266667-4.010666c-3.498667-3.541333-7.082667-6.954667-10.666666-10.453334l-4.138667-4.266666a386.986667 386.986667 0 0 1-13.184-13.781334l-0.64-0.682666a765.610667 765.610667 0 0 1-13.354667-15.104c-1.152-1.322667-2.218667-2.730667-3.413333-4.138667l-9.642667-11.818667a906.581333 906.581333 0 0 1-14.506666-19.114666C92.16 502.869333 56.106667 315.136 135.850667 161.152" fill="#333303" ></path><path d="M346.496 141.013333c-65.664 94.250667-61.952 220.288-10.837333 319.957334a388.266667 388.266667 0 0 0 28.885333 48.298666c9.813333 14.08 20.650667 30.72 33.792 42.069334 4.565333 5.205333 9.514667 10.24 14.677333 15.317333l3.84 3.84c4.864 4.693333 9.856 9.301333 14.933334 13.866667l0.64 0.554666a420.48 420.48 0 0 0 17.664 14.592c1.450667 0.981333 2.688 2.133333 4.096 3.114667 5.973333 4.608 11.989333 9.045333 18.218666 13.44l0.64 0.384c2.645333 1.92 5.461333 3.669333 8.448 5.546667 1.194667 0.768 2.56 1.792 3.84 2.56 4.522667 2.901333 8.96 5.632 13.525334 8.405333 0.725333 0.298667 1.365333 0.682667 2.048 0.981333 3.84 2.346667 8.021333 4.608 12.032 6.698667 1.408 0.853333 2.773333 1.493333 4.224 2.304 2.858667 1.408 5.674667 2.901333 8.405333 4.352l1.365333 0.597333c5.76 2.816 11.648 5.461333 17.408 8.106667 1.450667 0.554667 2.688 1.024 3.925334 1.621333 4.736 2.048 9.557333 4.010667 14.293333 5.845334 2.133333 0.725333 4.138667 1.578667 6.144 2.218666 4.352 1.621333 8.917333 3.114667 13.226667 4.608l5.973333 1.92c6.229333 1.92 12.544 4.437333 19.114667 5.504 337.92 56.021333 416.170667-204.245333 416.170666-204.245333-70.442667 101.376-206.762667 149.674667-352.042666 111.957333a342.613333 342.613333 0 0 1-19.114667-5.546666c-2.048-0.554667-3.84-1.194667-5.802667-1.792-4.437333-1.536-9.002667-3.029333-13.312-4.650667l-6.144-2.304c-4.778667-1.92-9.642667-3.712-14.293333-5.76-1.450667-0.64-2.773333-1.066667-3.882667-1.706667-5.973333-2.688-11.989333-5.333333-17.792-8.192l-8.789333-4.565333-5.077333-2.56a241.92 241.92 0 0 1-11.306667-6.4 26.453333 26.453333 0 0 1-2.645333-1.450667c-4.522667-2.816-9.216-5.546667-13.525334-8.448-1.450667-0.810667-2.773333-1.792-4.138666-2.645333l-8.874667-5.802667c-6.144-4.266667-12.16-8.874667-18.218667-13.312-1.365333-1.237333-2.688-2.261333-4.010666-3.370666-63.872-50.218667-114.261333-118.869333-138.154667-196.608-25.173333-80.810667-19.626667-171.434667 23.850667-244.992" fill="#333303" ></path><path d="M582.826667 59.050667c-38.741333 56.832-42.453333 127.402667-15.786667 190.08 28.330667 66.56 86.272 118.826667 153.770667 143.573333 2.773333 1.066667 5.461333 1.962667 8.32 2.986667l3.754666 1.152c3.925333 1.237333 7.893333 2.688 11.946667 3.584 186.709333 36.010667 237.226667-95.872 250.837333-115.242667-44.458667 63.829333-118.997333 79.146667-210.432 56.917333a206.677333 206.677333 0 0 1-22.016-6.826666 270.677333 270.677333 0 0 1-26.325333-10.837334 278.229333 278.229333 0 0 1-46.08-28.16c-81.92-62.037333-132.650667-180.48-79.232-276.949333" fill="#333303" ></path></symbol><symbol id="icon-docker" viewBox="0 0 1024 1024"><path d="M205.653333 737.066667c-29.184 0-55.637333-23.893333-55.637333-52.906667s23.893333-53.034667 55.68-53.034667c31.914667 0 55.893333 23.893333 55.893333 52.992s-26.538667 52.906667-55.68 52.906667z m683.178667-288.554667c-5.76-42.325333-32-76.8-66.56-103.253333l-13.44-10.666667-10.837333 13.226667c-21.077333 23.893333-29.44 66.261333-26.88 97.92 2.56 23.978667 10.24 47.786667 23.637333 66.304-10.837333 5.546667-24.234667 10.666667-34.56 16.085333a225.706667 225.706667 0 0 1-71.68 10.666667H4.138667l-2.56 15.786666a297.813333 297.813333 0 0 0 23.978666 151.04l10.410667 18.56v2.56c64 105.941333 177.92 153.6 301.994667 153.6 238.677333 0 434.432-103.253333 527.232-325.674666 60.8 2.645333 122.197333-13.226667 151.04-71.509334l7.68-13.226666-12.8-7.978667c-34.56-21.077333-81.92-23.893333-121.6-13.226667l-0.768 0.085334z m-341.674667-42.325333h-103.594666v103.253333h103.68V406.101333l-0.085334 0.128z m0-129.834667h-103.594666v103.253333h103.68V276.48l-0.085334-0.128z m0-132.437333h-103.594666v103.253333h103.68v-103.253333h-0.085334z m126.72 262.272H570.88v103.253333h103.253333V406.101333l-0.298666 0.128z m-383.914666 0H187.008v103.253333h103.338667V406.101333l-0.426667 0.128z m129.28 0h-102.4v103.253333H419.84V406.101333l-0.64 0.128z m-257.28 0H59.733333v103.253333h103.594667V406.101333l-1.28 0.128z m257.28-129.834667h-102.4v103.253333H419.84V276.48l-0.64-0.128z m-129.92 0H187.178667v103.253333H290.133333V276.48l-0.682666-0.128z" fill="#333303" ></path></symbol><symbol id="icon-python" viewBox="0 0 1029 1024"><path d="M610.56 7.68l38.4 8.533333 31.146667 11.093334 25.173333 12.8 19.2 13.653333 14.506667 14.506667 10.666666 14.506666 6.826667 14.08 4.266667 12.8 1.706666 11.093334 0.853334 8.533333-0.426667 5.546667V362.666667l-2.133333 26.88-5.546667 23.466666-8.96 19.626667-11.093333 16.213333-12.8 13.226667-14.08 10.666667-14.933334 8.106666-14.933333 5.973334-14.08 4.266666-12.8 2.986667-11.093333 1.706667-8.96 0.853333H376.746667l-29.44 2.133333-25.173334 5.973334-21.333333 9.386666-17.493333 11.52-14.08 13.653334-11.52 14.933333-8.533334 15.36-6.4 15.786667-4.266666 14.933333-2.986667 13.653333-1.706667 11.52-0.853333 8.96v130.56H137.813333l-8.96-1.28-11.946666-2.986666-13.653334-5.12-14.933333-7.68-15.36-11.093334-15.36-15.36-14.933333-19.626666-13.653334-25.173334-11.946666-31.146666-8.96-37.546667-5.973334-44.8L0 510.72l2.56-52.053333 6.826667-44.373334 10.24-37.12 13.653333-30.293333 15.36-24.32 17.066667-18.773333 17.92-14.08 17.92-10.24 17.066666-6.826667 15.36-4.266667 13.653334-2.133333 10.24-0.426667h6.826666l2.56 0.426667h348.16v-35.413333H266.24l-0.426667-117.333334-0.853333-15.786666 2.133333-14.506667 4.693334-13.226667 7.253333-11.946666 10.666667-11.093334 13.226666-9.813333 16.213334-8.533333 18.773333-7.68 21.76-6.4 24.746667-5.12 27.306666-4.266667 30.293334-2.56 32.853333-1.706667 35.84-0.853333 54.186667 2.133333 45.653333 5.546667z m-268.8 84.48l-9.813333 14.08-3.413334 17.493333 3.413334 17.493334 9.813333 14.506666 14.08 9.386667 17.493333 3.84 17.493334-3.84 14.08-9.386667 9.813333-14.506666 3.413333-17.493334-3.413333-17.493333-9.813333-14.08-14.08-9.386667-17.493334-3.84-17.493333 3.84-14.08 9.386667z" fill="#333303" ></path><path d="M900.266667 260.693333l11.946666 2.56 13.653334 5.12 14.933333 7.68 15.36 11.52 15.36 14.933334 14.933333 20.053333 13.653334 25.173333 11.946666 31.146667 8.96 37.546667 5.973334 44.373333 2.133333 52.48-2.56 52.48-6.826667 44.373333-10.24 36.693334-13.653333 30.293333-15.36 24.32-17.066667 19.2-17.92 14.08-17.92 10.24-17.066666 6.826667-15.36 3.84-13.653334 2.133333-10.24 0.853333-6.826666-0.426666h-350.72v34.986666h249.173333l0.426667 117.76 0.853333 15.36-2.133333 14.506667-4.693334 13.226667-7.253333 12.373333-10.666667 10.666667-13.226666 10.24-16.213334 8.533333-18.773333 7.253333-21.76 6.4-24.746667 5.546667-27.306666 3.84-30.293334 2.986667-32.853333 1.706666-35.84 0.426667-54.186667-1.706667-45.653333-5.973333-38.4-8.533333-31.146667-10.666667-25.173333-12.8-19.2-14.08-14.506667-14.506667-10.666666-14.506666-6.826667-14.08-4.266667-12.8-1.706666-10.666667-0.853334-8.533333 0.426667-5.546667v-227.84l2.133333-27.306667 5.546667-23.04 8.96-19.626666 11.093333-16.213334 12.8-13.653333 14.08-10.24 14.933334-8.533333 14.933333-5.973334 14.08-4.266666 12.8-2.56 11.093333-1.706667 8.96-0.853333 5.546667-0.426667h249.173333l29.44-2.133333 25.173334-5.973334 21.333333-8.96 17.493333-11.946666 14.08-13.653334 11.52-14.933333 8.533334-15.36 6.4-15.36 4.266666-14.933333 2.986667-13.653334 1.706667-11.946666 0.853333-8.96V258.986667h89.173333l5.973334 0.426666 8.96 1.28z m-276.053334 608l-9.813333 14.08-3.413333 17.493334 3.413333 17.493333 9.813333 14.08 14.08 9.813333 17.493334 3.413334 17.493333-3.413334 14.08-9.813333 9.813333-14.08 3.413334-17.493333-3.413334-17.493334-9.813333-14.08-14.08-9.813333-17.493333-3.413333-17.493334 3.413333-14.08 9.813333z" fill="#333303" ></path></symbol><symbol id="icon-php" viewBox="0 0 1024 1024"><path d="M299.093333 435.498667h-40.277333l-21.973333 112.981333h35.754666c23.722667 0 41.386667-4.48 52.992-13.397333 11.605333-8.96 19.413333-23.850667 23.466667-44.757334 3.925333-20.053333 2.133333-34.218667-5.290667-42.453333-7.466667-8.234667-22.314667-12.373333-44.672-12.373333z" fill="#333303" ></path><path d="M512 242.688C229.248 242.688 0 363.264 0 512s229.248 269.354667 512 269.354667S1024 660.736 1024 512c0-148.736-229.248-269.312-512-269.312z m-139.093333 317.909333c-11.136 10.666667-24.533333 18.688-39.125334 23.509334-14.336 4.608-32.64 6.997333-54.826666 6.997333H228.565333l-13.952 71.722667H155.818667l52.48-269.909334h113.066666c34.005333 0 58.794667 8.917333 74.410667 26.794667 15.616 17.834667 20.309333 42.752 14.08 74.752a121.002667 121.002667 0 0 1-13.013333 36.138667c-6.101333 10.88-14.08 20.906667-23.936 29.994666z m171.690666 30.506667l23.168-119.424c2.688-13.568 1.664-22.869333-2.901333-27.776-4.565333-4.949333-14.336-7.424-29.312-7.424H488.96l-30.037333 154.666667H400.554667l52.48-269.952h58.325333l-13.952 71.765333h51.968c32.725333 0 55.253333 5.717333 67.669333 17.109333s16.128 29.866667 11.221334 55.424l-24.405334 125.610667h-59.264z m324.138667-96.64a118.698667 118.698667 0 0 1-13.013333 36.138667c-6.101333 10.88-14.08 20.906667-23.936 29.994666a104.106667 104.106667 0 0 1-39.125334 23.509334c-14.336 4.608-32.64 6.997333-54.869333 6.997333h-50.346667l-13.952 71.765333h-58.794666l52.48-269.909333h113.024c34.005333 0 58.794667 8.917333 74.410666 26.794667 15.616 17.792 20.352 42.709333 14.122667 74.709333z" fill="#333303" ></path><path d="M758.016 435.498667h-40.234667l-22.016 112.981333h35.754667c23.765333 0 41.429333-4.48 52.992-13.397333 11.605333-8.96 19.413333-23.850667 23.509333-44.757334 3.925333-20.053333 2.090667-34.218667-5.333333-42.453333s-22.357333-12.373333-44.672-12.373333z" fill="#333303" ></path></symbol><symbol id="icon-java" viewBox="0 0 1024 1024"><path d="M377.596784 791.989528s-39.199482 22.799699 27.799633 30.399598c81.198926 9.199878 122.598379 7.999894 211.997197-8.999881 0 0 23.599688 14.799804 56.399254 27.599635C473.395518 926.787745 220.198866 835.988946 377.596784 791.989528m-24.399677-112.198517s-43.799421 32.399572 23.199693 39.399479c86.598855 8.999881 155.197948 9.599873 273.596382-13.199825 0 0 16.399783 16.599781 42.199442 25.599661-242.596792 70.999061-512.593222 5.799923-338.995517-51.799315m206.397271-190.197485c49.399347 56.799249-12.999828 107.998572-12.999828 107.998572s125.398342-64.799143 67.799103-145.798072c-53.799289-75.599-94.998744-113.198503 128.198305-242.596792 0.199997 0-350.395367 87.598842-182.99758 280.396292m265.196493 385.194907s28.999617 23.799685-31.799579 42.399439c-115.798469 34.999537-481.593632 45.599397-583.192289 1.399982-36.599516-15.799791 31.999577-37.999498 53.599291-42.599437 22.399704-4.799937 35.399532-3.999947 35.399532-3.999947-40.599463-28.599622-262.596528 56.199257-112.798508 80.398937 408.3946 66.399122 744.790152-29.799606 638.791553-77.598974M396.396536 563.592548s-186.197538 44.199416-65.999128 60.199204c50.799328 6.79991 151.99799 5.199931 246.196745-2.599966 76.998982-6.399915 154.397958-20.39973 154.397958-20.39973s-27.19964 11.599847-46.799381 24.999669c-188.997501 49.799342-553.992675 26.599648-448.994063-24.19968 88.998823-42.799434 161.197869-37.999498 161.197869-37.999497m333.995583 186.597532c192.197459-99.79868 103.198635-195.797411 41.199456-182.797582-15.199799 3.199958-21.999709 5.999921-21.999709 5.99992s5.599926-8.799884 16.399783-12.599833c122.598379-43.199429 216.997131 127.198318-39.599477 194.597427 0-0.199997 2.99996-2.799963 3.999947-5.199932M614.393653 0s106.398593 106.398593-100.998664 269.99643c-166.197802 131.198265-37.999498 206.197274 0 291.596144-96.998717-87.598842-168.197776-164.597824-120.398408-236.396874C463.195652 220.197088 657.393085 168.997765 614.393653 0m-198.997369 1020.786502c184.397562 11.799844 467.593817-6.599913 474.19373-93.798759 0 0-12.799831 32.999564-152.397985 59.399214-157.397919 29.599609-351.595351 26.199654-466.59383 7.199905 0-0.199997 23.599688 19.399743 144.798085 27.19964" fill="#333303" ></path></symbol><symbol id="icon-mysql" viewBox="0 0 1024 1024"><path d="M1001.632 793.792c-7.84-13.856-26.016-37.536-93.12-83.2a1096.224 1096.224 0 0 0-125.152-74.144c-30.592-82.784-89.824-190.112-176.256-319.36-93.056-139.168-201.12-197.792-321.888-174.56a756.608 756.608 0 0 0-40.928-37.696C213.824 78.688 139.2 56.48 96.32 60.736c-19.424 1.952-34.016 9.056-43.36 21.088-21.664 27.904-14.432 68.064 85.504 198.912 19.008 55.616 23.072 84.672 23.072 99.296 0 30.912 15.968 66.368 49.984 110.752l-32 109.504c-28.544 97.792 23.328 224.288 71.616 268.384 25.76 23.552 47.456 20.032 58.176 15.84 21.504-8.448 38.848-29.472 50.048-89.504 5.728 14.112 11.808 29.312 18.208 45.6 34.56 87.744 68.352 136.288 106.336 152.736a32.032 32.032 0 0 0 25.44-58.688c-9.408-4.096-35.328-23.712-72.288-117.504-31.168-79.136-53.856-132.064-69.376-161.856a32.224 32.224 0 0 0-35.328-16.48 32.032 32.032 0 0 0-25.024 29.92c-3.872 91.04-13.056 130.4-19.2 147.008-26.496-30.464-68.128-125.984-47.232-197.536 20.768-71.232 32.992-112.928 36.64-125.248a31.936 31.936 0 0 0-5.888-29.28c-41.664-51.168-46.176-75.584-46.176-83.712 0-29.472-9.248-70.4-28.288-125.152a31.104 31.104 0 0 0-4.768-8.896c-53.824-70.112-73.6-105.216-80.832-121.888 25.632 1.216 74.336 15.04 91.008 29.376a660.8 660.8 0 0 1 49.024 46.304c8 8.448 19.968 11.872 31.232 8.928 100.192-25.92 188.928 21.152 271.072 144 87.808 131.328 146.144 238.048 173.408 317.216a32 32 0 0 0 16.384 18.432 1004.544 1004.544 0 0 1 128.8 75.264c7.392 5.024 14.048 9.696 20.064 14.016h-98.848a32.032 32.032 0 0 0-24.352 52.736 3098.752 3098.752 0 0 0 97.856 110.464 32 32 0 1 0 46.56-43.872 2237.6 2237.6 0 0 1-50.08-55.328h110.08a32.032 32.032 0 0 0 27.84-47.776z" fill="#333303" ></path><path d="M320 289.472c12.672 21.76 22.464 37.344 29.344 46.784 8.288 16.256 21.184 29.248 29.44 45.536l2.016-1.984c14.528-9.952 25.92-49.504 2.752-75.488-12.032-18.176-51.04-17.664-63.552-14.848z" fill="#333303" ></path></symbol><symbol id="icon-weizhi" viewBox="0 0 1024 1024"><path d="M515.5 260c-69.6 0-126 56.4-126 126s56.4 126 126 126 126-56.4 126-126-56.4-126-126-126z m0 212c-47.5 0-86-38.5-86-86s38.5-86 86-86 86 38.5 86 86-38.5 86-86 86z m-3-392h-1c-176.7 0-320 143.3-320 320 0 40.8 9.2 93.6 35.3 145.8C288.9 669.6 514.5 944 514.5 944h1s219.6-274.4 281.7-398.2c26.1-52.2 35.3-105.1 35.3-145.8 0-176.7-143.3-320-320-320z m4 801c-0.1 0.1-1-0.1-1 0-149-203-283-332.5-285-479-2.1-154.6 130.4-282 285-282h1c154.6 0 276 127.4 276 282 0 135-130 274-276 479z" fill="#333333" ></path></symbol><symbol id="icon-fork" viewBox="0 0 1024 1024"><path d="M752 100c-61.8 0-112 50.2-112 112 0 47.7 29.9 88.5 72 104.6v27.6L512 601.4 312 344.2v-27.6c42.1-16.1 72-56.9 72-104.6 0-61.8-50.2-112-112-112s-112 50.2-112 112c0 50.6 33.8 93.5 80 107.3v34.4c0 9.7 3.3 19.3 9.3 27L476 672.3v33.6c-44.2 15-76 56.9-76 106.1 0 61.8 50.2 112 112 112s112-50.2 112-112c0-49.2-31.8-91-76-106.1v-33.6l226.7-291.6c6-7.7 9.3-17.3 9.3-27v-34.4c46.2-13.8 80-56.7 80-107.3 0-61.8-50.2-112-112-112zM224 212c0-26.5 21.5-48 48-48s48 21.5 48 48-21.5 48-48 48-48-21.5-48-48z m336 600c0 26.5-21.5 48-48 48s-48-21.5-48-48 21.5-48 48-48 48 21.5 48 48z m192-552c-26.5 0-48-21.5-48-48s21.5-48 48-48 48 21.5 48 48-21.5 48-48 48z"  ></path></symbol><symbol id="icon-jia" viewBox="0 0 1024 1024"><path d="M1024 458.24H539.136V0h-54.272v458.24H0V512h484.864v512h54.272V512H1024z" fill="" ></path></symbol><symbol id="icon-gengduo1" viewBox="0 0 1024 1024"><path d="M104 520m-104 0a104 104 0 1 0 208 0 104 104 0 1 0-208 0Z" fill="" ></path><path d="M920 520m-104 0a104 104 0 1 0 208 0 104 104 0 1 0-208 0Z" fill="" ></path><path d="M512 512m-160 0a160 160 0 1 0 320 0 160 160 0 1 0-320 0Z" fill="" ></path></symbol><symbol id="icon-yinhangqia" viewBox="0 0 1024 1024"><path d="M917.048889 789.617778H91.022222c-22.755556 0-43.235556-18.204444-43.235555-40.96V432.355556h912.497777v318.577777c0 20.48-18.204444 38.684444-43.235555 38.684445zM134.257778 707.697778h170.666666v-40.96H134.257778v40.96z m427.804444-125.155556H134.257778v40.96h427.804444v-40.96zM47.786667 223.004444C47.786667 200.248889 68.266667 182.044444 91.022222 182.044444h826.026667c22.755556 0 43.235556 18.204444 43.235555 40.96v125.155556H47.786667V223.004444z m0 0" fill="" ></path></symbol><symbol id="icon-zuobiao" viewBox="0 0 1024 1024"><path d="M512 0C290.6752 0 110.5984 181.1392 110.5984 403.7696c0 86.5408 27.2 169.3184 78.1568 238.7264l240.9472 344.5632c17.7344 23.456 44.7488 36.9344 74.0864 36.9344 29.4976 0 56.576-13.568 74.3168-37.2736l256.6592-343.5648c51.4368-70.0736 78.6368-152.8448 78.6368-239.3856C913.4016 181.1392 733.3248 0 512 0L512 0zM796.4608 610.1184l-273.6384 366.2848c-6.432 8.5824-15.0208 9.8688-19.584 9.8688-4.5376 0-13.1008-1.2864-18.752-8.7104L227.712 610.3616c-45.4144-61.856-69.4336-134.9376-69.4336-211.3152C158.2784 202.592 316.9664 42.752 512 42.752c195.0272 0 353.7216 159.8464 353.7216 356.2944C865.7216 475.424 841.7088 548.5056 796.4608 610.1184L796.4608 610.1184zM778.624 601.6128"  ></path><path d="M512 215.4752c-103.3152 0-187.3536 84.4672-187.3536 188.2944 0 103.8528 84.0448 188.32 187.3536 188.32 103.3088 0 187.3536-84.4672 187.3536-188.32C699.3536 299.9488 615.3152 215.4752 512 215.4752L512 215.4752zM512 547.7376c-78.7072 0-142.7264-64.5696-142.7264-143.968 0-79.3664 64.0192-143.936 142.7264-143.936 78.7008 0 142.72 64.576 142.72 143.936C654.72 483.168 590.7008 547.7376 512 547.7376L512 547.7376zM512 519.3984"  ></path></symbol><symbol id="icon-roundclose" viewBox="0 0 1024 1024"><path d="M512 960C264.96 960 64 759.04 64 512S264.96 64 512 64s448 200.96 448 448S759.04 960 512 960zM512 128.288C300.416 128.288 128.288 300.416 128.288 512c0 211.552 172.128 383.712 383.712 383.712 211.552 0 383.712-172.16 383.712-383.712C895.712 300.416 723.552 128.288 512 128.288z"  ></path><path d="M557.056 513.376l138.368-136.864c12.576-12.416 12.672-32.672 0.256-45.248-12.416-12.576-32.704-12.672-45.248-0.256l-138.56 137.024-136.448-136.864c-12.512-12.512-32.736-12.576-45.248-0.064-12.512 12.48-12.544 32.736-0.064 45.248l136.256 136.672-137.376 135.904c-12.576 12.448-12.672 32.672-0.256 45.248 6.272 6.336 14.496 9.504 22.752 9.504 8.128 0 16.256-3.104 22.496-9.248l137.568-136.064 138.688 139.136c6.24 6.272 14.432 9.408 22.656 9.408 8.192 0 16.352-3.136 22.592-9.344 12.512-12.48 12.544-32.704 0.064-45.248L557.056 513.376z"  ></path></symbol><symbol id="icon-roundaddfill" viewBox="0 0 1024 1024"><path d="M828.704 196.576c-84.608-84.192-197.056-130.56-316.704-130.56s-232.128 46.368-316.736 130.56C110.624 280.8 64 392.832 64 512c0 119.2 46.624 231.2 131.232 315.424 84.608 84.192 197.088 130.56 316.736 130.56s232.128-46.368 316.704-130.56c84.672-84.256 131.296-196.288 131.264-315.456C959.968 392.8 913.376 280.8 828.704 196.576zM736 544l-192 0 0 192c0 17.696-14.336 32-32 32s-32-14.304-32-32l0-192L288 544c-17.664 0-32-14.336-32-32s14.336-32 32-32l192 0L480 288c0-17.664 14.336-32 32-32s32 14.336 32 32l0 192 192 0c17.696 0 32 14.336 32 32S753.696 544 736 544z"  ></path></symbol><symbol id="icon-tianjia" viewBox="0 0 1024 1024"><path d="M814.08 201.216A436.224 436.224 0 0 0 197.12 819.2a436.224 436.224 0 0 0 614.4-616.96z m-90.112 339.968h-187.392v187.904a31.232 31.232 0 1 1-62.464 0v-187.904H287.744a31.232 31.232 0 0 1 0-62.464h186.88V290.816a31.232 31.232 0 1 1 62.464 0v187.904h186.88a31.232 31.232 0 0 1 0 62.464z" fill="#666666" ></path></symbol><symbol id="icon-triangle" viewBox="0 0 1024 1024"><path d="M322.392 90.125l421.803 421.898-421.803 421.852v-843.75z" fill="#666666" ></path></symbol><symbol id="icon-suo" viewBox="0 0 1024 1024"><path d="M828.691531 408.944706h-61.229077V216.144786C767.564844 96.963104 679.919208 0 572.205179 0H452.613939c-107.714029 0-195.359664 96.963104-195.359664 216.144786v192.79992h-61.945806c-42.491751 0-77.09949 38.293771-77.09949 85.29067v444.473953c0 46.9969 34.607739 85.290671 77.09949 85.290671H828.691531c42.491751 0 77.09949-38.293771 77.09949-85.290671V494.235376c0-47.09929-34.607739-85.290671-77.09949-85.29067z m-482.358164-192.79992c0-64.812719 47.713629-117.543446 106.280572-117.543446h119.59124c58.566943 0 106.280572 52.730727 106.280572 117.543446v192.79992h-332.152384V216.144786z"  ></path></symbol><symbol id="icon-biyezhuanhuan" viewBox="0 0 1024 1024"><path d="M486.4 396.8c-28.8 0-60.8-3.2-83.2-12.8L54.4 262.4C19.2 246.4 12.8 227.2 12.8 217.6c0-9.6 6.4-28.8 41.6-41.6l348.8-121.6c41.6-16 115.2-19.2 163.2-3.2l348.8 124.8c28.8 12.8 44.8 25.6 44.8 44.8s-12.8 32-41.6 41.6L569.6 384c-22.4 6.4-54.4 12.8-83.2 12.8z m6.4-323.2c-28.8 0-57.6 3.2-76.8 12.8L67.2 208c-16 3.2-22.4 9.6-22.4 9.6s6.4 6.4 22.4 12.8L416 352c38.4 16 105.6 16 144 0l348.8-121.6c12.8-6.4 19.2-9.6 19.2-12.8 0 0-3.2-6.4-22.4-12.8L556.8 83.2c-16-6.4-41.6-9.6-64-9.6z" fill="#333303" ></path><path d="M435.2 748.8c-89.6 0-172.8-28.8-227.2-83.2-41.6-41.6-64-96-64-153.6V288h32v224c0 51.2 19.2 96 54.4 131.2 48 48 128 76.8 214.4 73.6h86.4c156.8 0 268.8-86.4 268.8-208v-224h32v224c0 137.6-128 240-300.8 240h-96zM896 326.4h32v352h-32v-352zM912 739.2c25.6 0 48 12.8 48 32s-22.4 96-48 96-48-76.8-48-96 22.4-32 48-32z" fill="#333303" ></path></symbol><symbol id="icon-weibiaoti12" viewBox="0 0 1024 1024"><path d="M960 576 64 576c-35.2 0-64-28.8-64-64 0-35.2 28.8-64 64-64l896 0c35.2 0 64 28.8 64 64C1024 547.2 995.2 576 960 576zM960 200 64 200c-35.2 0-64-28.8-64-64 0-35.2 28.8-64 64-64l896 0c35.2 0 64 28.8 64 64C1024 171.2 995.2 200 960 200zM64 824l896 0c35.2 0 64 28.8 64 64 0 35.2-28.8 64-64 64L64 952c-35.2 0-64-28.8-64-64C0 852.8 28.8 824 64 824z"  ></path></symbol><symbol id="icon-wenhao" viewBox="0 0 1024 1024"><path d="M502.757 960.219c-60.5 0-119.201-11.854-174.474-35.231-53.377-22.576-101.31-54.894-142.466-96.05-41.156-41.153-73.472-89.088-96.049-142.465C66.39 631.201 54.537 572.5 54.537 512S66.39 392.799 89.768 337.526c22.576-53.376 54.893-101.309 96.049-142.465 41.156-41.157 89.089-73.473 142.466-96.049 55.271-23.378 113.973-35.231 174.474-35.231 60.499 0 119.2 11.853 174.474 35.231 53.377 22.577 101.31 54.893 142.466 96.05 41.157 41.155 73.472 89.088 96.048 142.465 23.379 55.27 35.231 113.972 35.231 174.474s-11.854 119.204-35.232 174.473c-22.577 53.38-54.892 101.312-96.047 142.466-41.156 41.155-89.09 73.473-142.465 96.049C621.956 948.365 563.256 960.219 502.757 960.219zM502.757 94.48c-56.369 0-111.047 11.038-162.515 32.806-49.717 21.029-94.369 51.136-132.716 89.482-38.348 38.348-68.453 83-89.482 132.717C96.275 400.952 85.237 455.63 85.237 512c0 56.368 11.038 111.047 32.807 162.512 21.03 49.722 51.135 94.373 89.482 132.717 38.347 38.351 82.999 68.455 132.716 89.482 51.469 21.77 106.146 32.809 162.515 32.809s111.046-11.036 162.516-32.809c49.717-21.029 94.368-51.135 132.715-89.482 38.348-38.344 68.453-82.996 89.48-132.715 21.771-51.465 32.809-106.145 32.809-162.514 0-56.371-11.037-111.049-32.809-162.515-21.028-49.718-51.135-94.371-89.48-132.718-38.348-38.347-82.999-68.453-132.717-89.482C613.804 105.518 559.125 94.48 502.757 94.48zM446.479 719.294l0 74.638 89.476 0 0-74.638L446.479 719.294zM677.814 461.148c13.094-19.66 19.645-41.14 19.645-64.442 0-40.29-18.628-74.642-55.87-103.039-37.253-28.397-87.159-42.599-149.72-42.599-59.074 0-106.578 13.231-142.51 39.685-35.942 26.461-57.545 64.57-64.816 114.325l80.75 8.01c6.979-37.134 21.674-64.443 44.081-81.917 22.407-17.479 50.34-26.216 83.806-26.216 34.628 0 63.873 9.647 87.736 28.943 23.858 19.299 35.795 41.69 35.795 67.178 0 14.08-4.082 27.068-12.226 38.956-8.149 11.897-25.823 27.854-53.032 47.879-27.21 20.024-46.045 35.258-56.526 45.695-14.259 14.323-24.589 28.523-30.986 42.596-8.733 18.695-13.093 40.905-13.093 66.63 0 4.371 0.14 10.923 0.436 19.663l75.509 0c0.578-26.216 2.761-45.153 6.55-56.798 3.775-11.651 9.602-21.969 17.456-30.951 7.859-8.975 24.59-22.938 50.198-41.868C639.109 504.722 664.72 480.814 677.814 461.148L677.814 461.148z"  ></path></symbol><symbol id="icon-31" viewBox="0 0 1024 1024"><path d="M726.277689 227.555556l-91.886933 138.899911L539.420444 227.555556 726.277689 227.555556zM619.793067 398.222222 415.9488 398.222222l101.910756 387.629511L619.793067 398.222222zM422.752711 375.466667l190.225067 0-95.118222-139.127467L422.752711 375.466667zM401.351111 366.455467 496.310044 227.555556 309.464178 227.555556 401.351111 366.455467zM496.264533 793.156267 392.430933 398.222222 168.721067 398.222222 496.264533 793.156267zM169.039644 375.466667l210.989511 0-91.909689-138.934044L169.039644 375.466667zM747.463111 236.782933 655.712711 375.466667l210.625422 0L747.463111 236.782933zM643.310933 398.222222l-103.844978 394.899911L866.656711 398.222222 643.310933 398.222222z"  ></path></symbol><symbol id="icon-qizhi" viewBox="0 0 1024 1024"><path d="M756.022303 122.197333c86.04703 0 142.801455-9.122909 195.584-41.766788v516.406303c-52.782545 32.581818-107.799273 55.202909-193.846303 55.20291-85.98497 0-117.884121-9.836606-170.511515-42.635637-52.565333-32.519758-109.568-42.635636-195.52194-42.635636-85.922909 0-158.844121 31.930182-211.533575 64.57406V95.852606c52.689455-32.79903 125.641697-64.729212 211.533575-64.729212 85.953939 0 142.987636 10.20897 195.52194 42.635636 52.689455 32.519758 82.881939 48.438303 168.773818 48.438303z" fill="#666666" ></path><path d="M98.148848 1010.160485a31.030303 31.030303 0 0 1-31.030303-31.030303V63.425939a31.030303 31.030303 0 1 1 62.060607 0v915.704243a31.030303 31.030303 0 0 1-31.030304 31.030303z" fill="#666666" ></path></symbol><symbol id="icon-fujian" viewBox="0 0 1024 1024"><path d="M902.656 506.92096c-1.04448 1.00352-2.12992 2.06848-3.25632 3.25632L528.26112 881.37728l-0.1024 0.14336c-0.94208 0.65536-1.80224 1.47456-2.64192 2.31424-92.5696 89.68192-241.68448 88.61696-332.8-2.51904C101.43744 790.07744 100.53632 640.69632 190.6688 548.20864 197.0176 541.77792 612.02432 126.44352 616.18176 122.28608c65.00352-64.9216 170.7008-64.9216 235.64288 0 31.29344 31.35488 48.61952 73.05216 48.61952 117.4528-0.08192 44.56448-17.48992 86.44608-49.07008 117.92384L424.1408 784.81408c-36.06528 32.74752-91.15648 31.35488-125.7472-3.21536-34.59072-34.52928-35.71712-89.82528-2.68288-125.89056 0.63488-0.59392 1.18784-1.31072 1.67936-2.06848l0.14336-0.06144c0.16384-0.16384 0.3072-0.3072 0.43008-0.45056l1.08544-1.10592c0.08192-0.06144 0.2048-0.1024 0.3072-0.26624l371.42528-371.44576c9.80992-9.8304 9.80992-25.74336 0-35.59424-9.80992-9.8304-25.78432-9.8304-35.61472 0L263.92576 615.97696l-1.6384 1.57696c-0.28672 0.3072-0.63488 0.63488-0.96256 0.98304l-4.17792 4.11648 0 0c-1.65888 1.6384-3.01056 3.52256-4.11648 5.48864-45.64992 55.97184-42.00448 137.5232 9.64608 189.15328 53.92384 53.82144 139.89888 55.72608 195.95264 4.28032 0.22528-0.22528 0.49152-0.45056 0.75776-0.69632l427.54048-427.54048c41.12384-40.98048 63.77472-95.5392 63.77472-153.57952 0.04096-57.856-22.38464-112.2304-63.30368-153.06752-84.56192-84.54144-222.28992-84.54144-306.91328 0l-212.82816 212.992-146.3296 146.5344-66.19136 66.19136c-0.16384 0.22528-0.34816 0.38912-0.49152 0.55296l0 0c-109.40416 112.06656-108.31872 293.31456 2.39616 403.94752 55.808 55.82848 129.51552 83.7632 203.264 83.7632 71.35232 0 142.848-26.17344 198.12352-78.6432 0.43008-0.3072 0.8192-0.69632 1.20832-1.00352 0.43008-0.36864 0.7168-0.69632 1.14688-1.06496l2.68288-2.58048c0.1024-0.16384 0.18432-0.16384 0.3072-0.32768l371.4048-371.44576c0.04096-0.06144 0.18432-0.26624 0.22528-0.32768 0.63488-0.512 1.18784-1.20832 1.92512-1.8432 10.01472-9.54368 10.48576-25.41568 1.00352-35.5328C928.68608 497.84832 912.75264 497.37728 902.656 506.92096L902.656 506.92096 902.656 506.92096zM902.656 506.92096"  ></path></symbol><symbol id="icon-shezhi" viewBox="0 0 1024 1024"><path d="M509 349.5c-88.6 0-161.1 73.1-161.1 162.6 0 89.4 72.5 162.6 161.1 162.6s161.1-73.1 161.1-162.6S597.6 349.5 509 349.5zM380.1 85.3c16.1 0 34.2 6.1 44.3 16.3 12.1 14.2 54.4 50.8 86.6 50.8 32.2 0 74.5-36.6 86.6-48.8 10.1-12.2 28.2-18.3 44.3-18.3 10.1 0 16.1 0 24.2 4.1h2l110.7 63h2c22.1 16.3 30.2 46.7 20.1 71.1 0 0-10.1 22.4-10.1 42.7 0 61 48.3 109.7 108.7 109.7h4c20.1 0 36.2 18.3 42.3 46.7 2 2 10.1 50.8 10.1 89.4 0 40.6-10.1 89.4-10.1 89.4-4 28.4-22.1 46.7-42.3 46.7h-4c-60.4 0-108.7 48.8-108.7 109.7 0 20.3 10.1 42.7 10.1 42.7 10.1 24.4 2 52.8-20.1 69.1h-2l-110.7 63h-2c-6 2-14.1 4.1-22.1 4.1-18.1 0-36.2-8.1-46.3-20.3-12.1-14.2-56.4-52.8-88.6-52.8-30.2 0-70.5 36.6-86.6 52.8-10.1 12.2-26.2 20.3-44.3 20.3-10.1 0-16.1 0-24.2-4.1h-2l-108.7-61h-2c-22.3-16.2-30.3-46.7-20.3-71 0 0 10.1-22.4 10.1-42.7 0-61-48.3-109.7-108.7-109.7h-4c-20.1 0-36.2-18.3-42.3-46.7-2-2-10.1-50.8-10.1-89.4 0-36.6 8.1-85.3 10.1-89.4 4-28.4 22.1-46.7 42.3-46.7h2c60.4 0 108.7-48.8 108.7-109.7 0-20.3-10.1-42.7-10.1-42.7-10.1-24.4-2-52.8 20.1-69.1h2l114.8-65h2c6.1-2.2 14.2-4.2 22.2-4.2z" fill="#333333" ></path></symbol><symbol id="icon-wanchenggouxuan" viewBox="0 0 1024 1024"><path d="M762.7 760.6C863.4 660 893.5 508.6 839 377.1c-54.5-131.5-182.8-217.3-325.2-217.3-142.4 0-270.7 85.8-325.2 217.3S164.4 660 265.1 760.6c137.4 137.4 360.1 137.4 497.6 0z m42.2 42.3C687 921.2 509.4 956.7 355 892.9c-154.4-63.8-255-214.3-255-381.3S200.7 194 355 130.3c154.4-63.8 332-28.3 449.9 90 160.5 161.1 160.5 421.5 0 582.6z m0 0"  ></path><path d="M686.4 373.7c7.1-9.8 19.3-14.4 31.1-11.9s21 11.7 23.6 23.6c2.5 11.8-2.2 24-11.9 31.1L492.3 653.3c-13.6 12.8-34.9 12.8-48.5 0l-135-134c-9.8-7.1-14.4-19.3-11.9-31.1s11.7-21 23.6-23.6c11.8-2.5 24 2.2 31.1 11.9l113.6 116 221.2-218.8z m0 0"  ></path></symbol><symbol id="icon-xinzengtishi" viewBox="0 0 1024 1024"><path d="M229.4 293.6c-11.6-11.6-30.4-11.6-42 0-11.6 11.6-11.6 30.4 0 42l42 42c11.6 11.6 30.4 11.6 42 0 11.6-11.6 11.6-30.3 0-42l-42-42zM793.3 293.6l-42 42c-11.6 11.6-11.6 30.4 0 42 11.6 11.6 30.4 11.6 42 0l42-42c11.6-11.6 11.6-30.4 0-42-11.6-11.6-30.4-11.6-42 0M155.2 528.5H95.8c-16.4 0-29.7 13.3-29.7 29.7s13.3 29.7 29.7 29.7h59.4c16.4 0 29.7-13.3 29.7-29.7-0.1-16.4-13.4-29.7-29.7-29.7M926.9 528.5h-59.4c-16.4 0-29.7 13.3-29.7 29.7s13.3 29.7 29.7 29.7h59.4c16.4 0 29.7-13.3 29.7-29.7-0.1-16.4-13.4-29.7-29.7-29.7M481.7 187.1v59.4c0 16.4 13.3 29.7 29.7 29.7s29.7-13.3 29.7-29.7v-59.4c0-16.4-13.3-29.7-29.7-29.7-16.4 0.1-29.7 13.4-29.7 29.7M511.3 331.2c-147.5 0-267.1 119.6-267.1 267.1 0 147.6 119.6 267.2 267.1 267.2 147.5 0 267.1-119.6 267.1-267.2 0.1-147.5-119.5-267.1-267.1-267.1z m0 489.4c-122.8 0-222.3-99.5-222.3-222.3 0-122.7 99.5-222.2 222.3-222.2 122.8 0 222.3 99.5 222.3 222.2 0 122.8-99.5 222.3-222.3 222.3z"  ></path></symbol><symbol id="icon-htmal5icon19" viewBox="0 0 1024 1024"><path d="M625.425306 681.589466l-115.472941-115.472941-115.471918 115.472941-54.117548-54.118572 115.471918-115.471918-115.471918-115.472941 54.117548-54.117548 115.471918 115.471918 115.472941-115.471918 54.117548 54.117548-115.472941 115.472941 115.472941 115.471918L625.425306 681.589466zM780.543176 241.409189c-148.824537-148.824537-392.356063-148.824537-541.1806 0s-148.824537 392.355039 0 541.179576 392.356063 148.824537 541.1806 0C929.367713 633.765251 929.367713 390.233726 780.543176 241.409189z"  ></path></symbol><symbol id="icon-xiazai18" viewBox="0 0 1024 1024"><path d="M856.954985 385.981888c-0.576121 51.994188-17.180288 99.533924-39.609113 145.413857-33.606399 68.75185-78.228689 130.188084-126.728286 188.95349-45.148269 54.706973-93.597725 106.356306-145.30948 154.923442-18.070564 16.966417-34.56012 17.48728-53.085032 0.859577-95.919607-86.087681-182.122921-180.470281-247.924579-292.121174-10.708899-18.169825-20.417005-36.901445-28.77844-56.283888-7.924483-18.371416-1.090844-37.588083 16.018835-45.521776 17.158798-7.957229 36.875862-0.977257 45.222971 17.178241 39.327704 85.524862 96.852862 158.196998 159.714562 227.119741 24.238031 26.575262 49.630351 52.033074 75.916017 76.598562 3.251044 3.035126 5.296633 5.501294 9.914814 0.850367 87.10894-87.772043 168.662351-179.933045 228.0356-289.487184 17.307178-31.93534 31.737842-65.306378 36.57194-101.670587 7.284917-54.81749-3.724835-106.969267-29.730115-155.072845-49.526997-91.616604-126.402875-143.862525-231.327576-147.546428-119.527281-4.194532-225.729068 72.993454-263.348873 186.984648-9.450233 28.636201-14.455223 57.984622-14.845103 88.142479-0.278339 21.561062-14.415314 36.784788-33.901111 36.734646-19.547195-0.047072-33.82027-15.626909-33.762965-36.842093 0.442068-160.357198 110.895693-299.273061 266.558985-335.243297C575.346235 20.187785 713.3094 73.709769 791.261797 183.556573 834.320475 244.230444 855.712691 311.864844 856.954985 385.981888zM136.976186 921.538397c254.766404 0 508.070504 0 761.591545 0-0.037862-4.378727-2.922563-7.237845-4.750187-10.443863-33.05279-58.048067-66.178235-116.059296-99.363032-174.032662-7.121188-12.438287-7.562233-24.825408 0.360204-36.855396 7.136537-10.840906 17.59882-16.087397 30.610158-15.196097 11.692297 0.806365 20.893866 6.54916 26.681686 16.642029 45.293579 79.001285 90.644463 157.970848 135.468344 237.237169 13.837146 24.473391-3.272533 50.588165-32.371268 50.595328-151.58644 0.050142-303.172881 0.023536-454.755228 0.023536-138.542356 0-277.091876-0.693802-415.621952 0.533143-31.091112 0.277316-50.15326-28.113291-33.062-56.870242 44.724621-75.246775 87.2389-151.807475 130.681318-227.818659 9.356089-16.367783 23.981181-23.556509 39.297005-19.578917 22.651906 5.892197 32.509415 29.940916 20.503986 51.17452-23.185049 41.015136-46.706765 81.84096-70.065775 122.756835C160.695401 879.824343 149.256884 899.965056 136.976186 921.538397zM653.782655 380.311749c0.008186 74.774007-61.005422 135.555325-135.90632 135.38648-74.259284-0.165776-134.827755-60.983933-134.825708-135.37727 0.004093-74.859965 60.867276-135.492904 135.870504-135.352711C593.176322 245.105371 653.776516 305.924551 653.782655 380.311749zM518.829034 312.651766c-37.586037 0.010233-68.025303 30.203906-68.087725 67.536162-0.062422 37.753859 30.839379 68.179822 68.88488 67.822688 36.531008-0.342808 66.62849-31.17707 66.470901-68.095911C585.939501 343.05624 555.526841 312.64358 518.829034 312.651766z"  ></path></symbol><symbol id="icon-mail" viewBox="0 0 1024 1024"><path d="M809.6 790.4h-595.2c-51.2 0-89.6-38.4-89.6-89.6v-377.6c0-51.2 38.4-89.6 89.6-89.6h595.2c51.2 0 89.6 38.4 89.6 89.6v377.6c0 51.2-38.4 89.6-89.6 89.6z m0-505.6h-595.2c-19.2 0-38.4 19.2-38.4 38.4v377.6c0 19.2 19.2 38.4 38.4 38.4h595.2c19.2 0 38.4-19.2 38.4-38.4v-377.6c0-19.2-19.2-38.4-38.4-38.4z m-460.8 262.4c12.8-12.8 25.6-12.8 38.4 0 12.8 12.8 12.8 25.6 0 38.4-25.6 25.6-76.8 70.4-102.4 96-6.4 6.4-12.8 12.8-19.2 12.8-6.4 0-12.8-6.4-19.2-12.8 0 0-6.4-6.4-6.4-12.8s0-12.8 6.4-19.2l102.4-102.4z m352 0c-12.8-12.8-25.6-12.8-38.4 0-12.8 12.8-12.8 25.6 0 38.4 32 25.6 76.8 70.4 102.4 96 6.4 6.4 12.8 6.4 19.2 6.4 6.4 0 12.8 0 19.2-6.4 6.4-6.4 6.4-12.8 6.4-19.2 0-6.4 0-12.8-6.4-19.2-25.6-19.2-76.8-70.4-102.4-96z m-179.2-12.8c-32 0-64-6.4-89.6-25.6L262.656 384.576a28.416 28.416 0 0 1-6.336-39.424v-0.064a27.072 27.072 0 0 1 37.632-6.336L470.4 464c32 25.6 83.2 25.6 121.6-6.4l146.624-118.4a25.792 25.792 0 0 1 36.096 3.584 24.64 24.64 0 0 1-3.008 34.624L624 502.4c-32 19.2-64 32-102.4 32z" fill="#515151" ></path></symbol><symbol id="icon-weibiaoti-" viewBox="0 0 1024 1024"><path d="M772.654545 900.654545l-13.963636-4.654545C165.236364 714.472727 128 265.309091 125.672727 260.654545V232.727273l155.927273-116.363637 160.581818 209.454546-81.454545 90.763636c27.927273 95.418182 174.545455 200.145455 242.036363 242.036364l109.381819-74.472727 190.836363 169.890909-130.327273 146.618181zM172.218182 258.327273c2.327273 25.6 44.218182 416.581818 586.472727 588.8l83.781818-88.436364-128-114.036364-104.727272 69.818182-11.636364-6.981818c-9.309091-6.981818-249.018182-146.618182-279.272727-290.909091l-2.327273-11.636363 72.145454-79.127273L279.272727 183.854545l-107.054545 74.472728z"  ></path></symbol><symbol id="icon-sanjiaoxing-down" viewBox="0 0 1024 1024"><path d="M191.815 319.981h640.37l-320.184 384.016z"  ></path></symbol><symbol id="icon-sanjiaoxing-up" viewBox="0 0 1024 1024"><path d="M832.185 704.019h-640.37l320.184-384.016z"  ></path></symbol><symbol id="icon-youjiang" viewBox="0 0 1024 1024"><path d="M653.4 220.6c-31.8-37.2-86-10.9-86 41.9L567.4 406.9 135.5 406.9c-18.7 0-34 15.3-34 34L101.5 583.2c0 18.7 15.3 34 34 34l431.8 0L567.3 762.5c0 52.7 54.3 79.1 86 41.9l259.9-249.6c19.4-23.3 19.4-61.19999999 0-84.5l-259.8-249.7z m0 0"  ></path></symbol><symbol id="icon-xiajiang" viewBox="0 0 1024 1024"><path d="M803.4 653.4c37.2-31.8 10.9-86-41.9-86H617.1V135.5c0-18.7-15.3-34-34-34H440.8c-18.7 0-34 15.3-34 34v431.8H261.5c-52.7 0-79.1 54.3-41.9 86l249.6 259.9c23.3 19.4 61.2 19.4 84.5 0l249.7-259.8z m0 0"  ></path></symbol><symbol id="icon-shixing" viewBox="0 0 1024 1024"><path d="M538.4 102.3l114.7 232.4c4.4 8.9 12.9 15.1 22.7 16.5l256.4 37.3c24.7 3.6 34.6 34 16.7 51.4L763.3 620.7c-7.1 6.9-10.3 16.9-8.7 26.7l43.8 255.4c4.2 24.6-21.6 43.4-43.8 31.8L525.4 814c-8.8-4.6-19.3-4.6-28.1 0L267.9 934.6c-22.1 11.6-48-7.2-43.8-31.8L268 647.4c1.7-9.8-1.6-19.8-8.7-26.7L73.8 439.8c-17.9-17.4-8-47.8 16.7-51.4l256.4-37.3c9.8-1.4 18.3-7.6 22.7-16.5l114.7-232.4c11.1-22.3 43-22.3 54.1 0.1z"  ></path></symbol><symbol id="icon-kongxing" viewBox="0 0 1024 1024"><path d="M512.4 152l101.3 205.3c10.1 20.5 29.6 34.6 52.2 37.9l226.6 32.9L728.6 588c-16.3 15.9-23.8 38.9-19.9 61.3L747.3 875 544.7 768.5c-9.9-5.2-21.1-8-32.2-8-11.2 0-22.3 2.8-32.2 8L277.5 875l38.7-225.7c3.9-22.5-3.6-45.4-19.9-61.3l-164-159.8 226.6-32.9c22.6-3.3 42.1-17.5 52.2-37.9L512.4 152m0-53.8c-10.4 0-20.8 5.4-26.2 16.3L375.1 339.6c-4.3 8.6-12.5 14.6-22 16l-248.4 36.1c-24 3.5-33.5 32.9-16.2 49.8l179.8 175.2c6.9 6.7 10 16.4 8.4 25.9L234.3 890c-3.2 18.9 11.8 34.2 28.8 34.2 4.5 0 9.1-1.1 13.6-3.4L498.8 804c4.3-2.2 8.9-3.4 13.6-3.4 4.7 0 9.3 1.1 13.6 3.4l222.2 116.8c4.5 2.4 9.1 3.4 13.6 3.4 17 0 32-15.3 28.8-34.2l-42.4-247.4c-1.6-9.5 1.5-19.1 8.4-25.9l179.8-175.2c17.3-16.9 7.8-46.3-16.2-49.8l-248.4-36.1c-9.5-1.4-17.7-7.4-22-16L538.6 114.5c-5.3-10.8-15.8-16.3-26.2-16.3z"  ></path></symbol><symbol id="icon-xueyuanguanliyuan" viewBox="0 0 1024 1024"><path d="M347.2 510.4C276.3 475 228.4 404 228.4 318.9c0-117 95.8-212.8 212.8-212.8 117 0 212.8 95.8 212.8 212.8 0 115.3-90.4 209.3-205.7 212.8h-1.8c-175.6 0-319.2 143.6-319.2 319.2 0 10.6-7.1 17.7-17.7 17.7s-17.7-7.1-17.7-17.7C91.8 689.5 200 553 347.2 510.4z m94-14.2c97.5 0 177.3-79.8 177.3-177.3 0-97.5-79.8-177.3-177.3-177.3-97.5 0-177.3 79.8-177.3 177.3 0 97.5 79.8 177.3 177.3 177.3z m485.9 117.1l3.5 8.9-42.6 51.4c-7.1 8.9-7.1 23.1 0 31.9l42.6 49.7-3.5 8.9c-8.9 24.8-21.3 49.7-39 69.2l-7.1 7.1-65.6-10.6c-10.6-1.8-23.1 5.3-26.6 16l-23.1 63.8-8.9 1.8c-33.7 7.1-67.4 7.1-101.1 0l-10.6-1.8-21.3-62.1c-3.5-10.6-16-17.7-26.6-16l-67.4 10.6-7.1-7.1c-8.9-8.9-16-19.5-21.3-30.1-7.1-12.4-14.2-26.6-17.7-40.8l-3.5-8.9 44.3-49.7c7.1-8.9 7.1-23.1 0-30.1L482 623.9l3.5-8.9c8.9-26.6 23.1-49.7 40.8-70.9l7.1-7.1 63.8 10.6c10.6 1.8 23.1-5.3 28.4-16l23.1-62.1 8.9-1.8c31.9-7.1 65.6-7.1 99.3 0l10.6 1.8 21.3 60.3c3.5 10.6 16 19.5 28.4 17.7l65.6-8.9 7.1 7.1c8.9 10.6 16 19.5 21.3 31.9 5.3 9.1 10.6 23.3 15.9 35.7zM877.5 592c-3.5-7.1-7.1-12.4-12.4-19.5l-46.1 5.3c-28.4 3.5-56.7-14.2-65.6-40.8l-14.2-40.8c-21.3-3.5-42.6-3.5-63.8 0l-16 42.6c-8.9 26.6-39 44.3-67.4 39l-44.3-7.1c-10.6 12.4-17.7 28.4-24.8 42.6l30.1 35.5c17.7 21.3 17.7 55 0 76.3l-30.1 35.5c3.5 8.9 7.1 16 12.4 24.8 3.5 7.1 7.1 12.4 12.4 17.7l47.9-7.1c28.4-3.5 56.7 14.2 65.6 40.8l14.2 42.6c21.3 3.5 44.3 3.5 65.6 0l16-44.3c8.9-26.6 39-44.3 65.6-39l44.3 7.1c8.9-12.4 17.7-26.6 23.1-42.6l-28.4-33.7c-17.7-21.3-19.5-55-1.8-76.3l30.2-35.5c-3.7-7.1-7.2-14.2-12.5-23.1zM707.2 769.3c-44.3 0-79.8-35.5-79.8-79.8s35.5-79.8 79.8-79.8 79.8 35.5 79.8 79.8c0 44.4-37.2 79.8-79.8 79.8z m0-35.4c24.8 0 44.3-19.5 44.3-44.3 0-24.8-19.5-44.3-44.3-44.3-24.8 0-44.3 19.5-44.3 44.3 0 24.8 19.5 44.3 44.3 44.3z m0 0"  ></path></symbol><symbol id="icon-gengduo" viewBox="0 0 1024 1024"><path d="M568 826.5c-13.4 0-26.7-5.9-35.6-17.3-15.5-19.7-12.1-48.1 7.6-63.6l296.8-233.3-296.9-233.4c-19.7-15.5-23.1-43.9-7.6-63.6 15.5-19.7 44-23.1 63.6-7.6L938 476.6c10.9 8.6 17.3 21.7 17.3 35.6 0 13.9-6.4 27-17.3 35.6l-342.1 269c-8.3 6.5-18.1 9.7-27.9 9.7zM112.7 826.5c-13.4 0-26.7-5.9-35.6-17.3-15.5-19.7-12.1-48.2 7.6-63.6l296.8-233.3L84.7 278.9C65 263.4 61.6 235 77.1 215.3c15.5-19.7 44-23.1 63.6-7.6l342 268.9c10.9 8.6 17.3 21.7 17.3 35.6 0 13.9-6.4 27-17.3 35.6l-342 268.9c-8.3 6.6-18.2 9.8-28 9.8z"  ></path></symbol><symbol id="icon-xiangxiayi" viewBox="0 0 1024 1024"><path d="M827.2 195C652.7 20.6 369.9 20.6 195.5 195s-174.4 457.2 0 631.7 457.2 174.4 631.7 0 174.4-457.2 0-631.7zM705.7 558.1L529.1 734.8l-0.2 0.2c-0.3 0.2-0.5 0.5-0.8 0.7l-0.6 0.6c-0.3 0.2-0.5 0.4-0.8 0.6-0.2 0.2-0.5 0.4-0.7 0.5-0.2 0.2-0.5 0.3-0.8 0.5-0.3 0.2-0.5 0.4-0.8 0.5-0.2 0.1-0.5 0.3-0.7 0.4-0.3 0.2-0.6 0.3-0.9 0.5-0.2 0.1-0.5 0.2-0.7 0.4-0.3 0.1-0.6 0.3-0.9 0.4-0.1 0-0.2 0.1-0.2 0.1-0.2 0.1-0.4 0.1-0.6 0.2-0.3 0.1-0.6 0.2-0.8 0.3-0.4 0.1-0.7 0.2-1.1 0.3-0.2 0.1-0.4 0.1-0.6 0.2-0.4 0.1-0.9 0.2-1.3 0.3-0.2 0-0.3 0.1-0.5 0.1-0.5 0.1-0.9 0.2-1.4 0.2-0.1 0-0.3 0-0.4 0.1-0.5 0.1-1 0.1-1.5 0.1h-2.3c-0.5 0-1 0-1.4-0.1h-0.4c-0.5 0-0.9-0.1-1.4-0.2-0.2 0-0.3 0-0.5-0.1-0.4-0.1-0.9-0.2-1.3-0.3-0.2 0-0.3-0.1-0.5-0.1-0.4-0.1-0.9-0.2-1.3-0.4-0.2-0.1-0.3-0.1-0.5-0.2-0.4-0.1-0.8-0.3-1.3-0.5-0.1 0-0.2-0.1-0.3-0.1-0.1 0-0.1 0-0.2-0.1-0.4-0.2-0.8-0.4-1.2-0.5-0.2-0.1-0.3-0.2-0.5-0.3-0.4-0.2-0.7-0.4-1.1-0.6l-0.6-0.3-0.9-0.6c-0.2-0.1-0.4-0.3-0.7-0.4-0.3-0.2-0.5-0.4-0.8-0.6-0.2-0.2-0.5-0.4-0.7-0.6-0.2-0.2-0.4-0.4-0.6-0.5-0.3-0.2-0.5-0.5-0.8-0.7l-0.2-0.2-176.4-176.5c-9.8-9.8-9.8-25.8 0-35.6s25.8-9.8 35.6 0l133.7 133.7V304.8c0-13.9 11.3-25.2 25.2-25.2s25.2 11.3 25.2 25.2v351.4l133.7-133.7c9.8-9.8 25.8-9.8 35.6 0 9.7 9.9 9.7 25.8-0.2 35.6z"  ></path></symbol><symbol id="icon-xiangshangyi" viewBox="0 0 1024 1024"><path d="M827.2 195C652.7 20.6 369.9 20.6 195.5 195s-174.4 457.2 0 631.7 457.2 174.4 631.7 0 174.4-457.2 0-631.7zM705.7 499.2c-9.8 9.8-25.8 9.8-35.6 0L536.5 365.6V717c0 13.9-11.3 25.2-25.2 25.2s-25.2-11.3-25.2-25.2V365.6L352.5 499.2c-9.8 9.8-25.8 9.8-35.6 0s-9.8-25.8 0-35.6L493.5 287l0.2-0.2c0.3-0.3 0.5-0.5 0.8-0.7 0.2-0.2 0.4-0.4 0.6-0.5 0.2-0.2 0.5-0.4 0.7-0.6 0.3-0.2 0.5-0.4 0.8-0.6 0.2-0.2 0.4-0.3 0.7-0.4l0.9-0.6 0.6-0.3c0.4-0.2 0.7-0.4 1.1-0.6 0.2-0.1 0.3-0.2 0.5-0.3 0.4-0.2 0.8-0.4 1.2-0.5 0.1 0 0.1 0 0.2-0.1 0.1 0 0.2-0.1 0.3-0.1 0.4-0.2 0.8-0.3 1.3-0.5 0.2-0.1 0.3-0.1 0.5-0.2 0.4-0.1 0.9-0.3 1.3-0.4 0.2 0 0.3-0.1 0.5-0.1 0.4-0.1 0.9-0.2 1.3-0.3 0.2 0 0.3-0.1 0.5-0.1 0.5-0.1 0.9-0.1 1.4-0.2h0.4c0.5 0 0.9-0.1 1.4-0.1h2.3c0.5 0 1 0.1 1.5 0.1 0.1 0 0.3 0 0.4 0.1 0.5 0.1 0.9 0.1 1.4 0.2 0.2 0 0.3 0.1 0.5 0.1 0.4 0.1 0.9 0.2 1.3 0.3 0.2 0.1 0.4 0.1 0.6 0.2 0.4 0.1 0.7 0.2 1.1 0.3 0.3 0.1 0.6 0.2 0.8 0.3 0.2 0.1 0.4 0.1 0.6 0.2 0.1 0 0.2 0.1 0.2 0.1 0.3 0.1 0.6 0.3 0.9 0.4 0.2 0.1 0.5 0.2 0.7 0.4 0.3 0.2 0.6 0.3 0.9 0.5 0.2 0.1 0.5 0.3 0.7 0.4 0.3 0.2 0.5 0.3 0.8 0.5 0.3 0.2 0.5 0.3 0.8 0.5 0.2 0.2 0.5 0.4 0.7 0.5 0.3 0.2 0.5 0.4 0.8 0.6l0.6 0.6c0.3 0.2 0.5 0.5 0.8 0.7l0.2 0.2 176.6 176.6c9.7 10.1 9.7 26-0.2 35.8z"  ></path></symbol><symbol id="icon-chengyuanguanli" viewBox="0 0 1024 1024"><path d="M501 571c-129.8 0-234.8-105-234.8-234.8s105-234.8 234.8-234.8 234.8 105 234.8 234.8S630.9 571 501 571z m0-431.5c-108.8 0-196.6 87.8-196.6 196.6S392.2 532.7 501 532.7s196.6-87.8 196.6-196.6c0.1-108.7-87.7-196.6-196.6-196.6z m0 0"  ></path><path d="M478.1 532.8c-177.5 7.6-322.6 154.6-336 339.8 0 11.5 7.6 21 19.1 21 9.5 0 19.1-7.6 19.1-17.2 11.5-168 139.4-297.8 297.8-305.4 11.5 0 19.1-7.6 19.1-19.1 0-11.5-9.5-19.1-19.1-19.1zM882.8 719.9l-11.5-47.7c-3.8-11.5-15.3-22.9-28.6-24.8l-19.1-1.9c-1.9 0-3.8 0-5.7-1.9v-1.9c-1.9-1.9-1.9-5.7-1.9-7.6l1.9-19.1c1.9-15.3-5.7-28.6-17.2-34.4l-43.9-21h-1.9c-3.8 0-7.6-1.9-11.5-1.9-7.6 0-17.2 3.8-22.9 9.5l-13.4 13.4c-1.9 1.9-3.8 3.8-5.7 3.8-1.9 0-3.8-1.9-5.7-3.8l-13.4-13.4c-5.7-5.7-13.4-9.5-22.9-9.5-5.7 0-11.5 1.9-13.4 3.8l-43.9 21c-9.5 5.7-19.1 19.1-17.2 32.5l1.9 21c1.9 3.8 0 7.6 0 7.6 0 1.9-3.8 3.8-7.6 3.8l-19.1 1.9c-13.4 1.9-24.8 11.5-28.6 24.8L520 721.8c-3.8 13.4 1.9 28.6 13.4 36.3l15.3 9.5c1.9 0 3.8 3.8 5.7 5.7 0 1.9 0 5.7-1.9 7.6L541 798.1c-7.6 11.5-5.7 28.6 1.9 38.2l30.5 40.1c7.6 7.6 17.2 11.5 26.7 11.5 3.8 0 7.6 0 11.5-1.9l19.1-5.7c1.9-1.9 3.8-1.9 5.7-1.9h3.8c1.9 0 3.8 3.8 3.8 5.7l5.7 17.2c3.8 13.4 19.1 21 30.5 21h47.7c11.7 0 23.4-7.3 23.6-14.3 1.3-2 2.4-4.3 3.2-6.7l5.7-19.1c0.3-0.6 0.6-1.2 0.9-1.9h8.7l17.2 5.7c3.8 1.9 7.6 1.9 11.5 1.9 8 0 17.3-4 23.5-9.8 3-1.8 5.5-4.3 7-7.4l30.5-40.1c5.7-9.5 7.6-22.9 1.9-32.5L850.4 781c-1.2-2.5-2.5-5.7-3.2-8.2 2-1.7 5.1-3.4 5.1-5.1l17.2-11.5c9.5-7.7 17.2-24.9 13.3-36.3z m-324 91.3c0-0.9 0-1.7 0.2-2.4-0.1 0.7-0.2 1.6-0.2 2.4z m-2.4-141l17.2-1.9c5.6 0 14.4-3.1 20.9-7.8 3.3-1.8 6.2-4.3 7.8-7.5 3.8-5.7 7.6-17.2 5.7-24.8l-1.9-19.1v-0.4c0.2-2 2-5.3 3.8-5.3l43.9-21h1.9c1.9 0 3.8 1.9 3.8 1.9l13.4 13.4c5.7 5.7 15.3 11.5 24.8 11.5s21-3.8 26.7-11.5l13.4-13.4c0-1.9 1.9-1.9 3.8-1.9h1.9l43.9 19.1s1.9 3.8 1.9 5.7l-1.9 21c0 3.8 1.9 17.2 7.6 26.7 5.7 5.7 13.4 11.5 26.7 13.4l19.1 1.9c1.9 0 1.9 1.9 3.8 3.8l11.5 47.7c0 1.9-1.9 5.7-1.9 5.7L837 739c-3.8 3.8-15.3 13.4-17.2 22.9 0 9.5 1.9 21 7.6 28.6l11.5 17.2c1.9 1.9 1.9 3.8 0 5.7l-30.5 38.2c0 1.9-1.9 1.9-3.8 1.9h-1.9l-17.2-5.7c-5.7-1.9-9.5-1.9-15.3-1.9-5.7 0-11.5 1.9-13.4 3.8-7.6 3.8-13.4 13.4-17.2 22.9l-5.7 17.2c-1.9 1.9-3.8 3.8-5.7 3.8h-47.7l-3.8-1.9-5.7-17.2c-1.9-9.5-7.6-19.1-17.2-22.9-5.7-3.8-11.5-3.8-15.3-3.8-5.7 0-11.5 1.9-24.8 1.9l-17.2 5.7h-1.9c-1.9 0-3.8-1.9-3.8-1.9l-30.5-38.2v-7.6l6.3-11.4 5.1-7.7c3.3-4.9 6.5-14 6.2-21.4 0.1-2-0.1-3.8-0.5-5.4-1.9-11.5-13.4-19.1-17.2-22.9L543 727.5l-1.9-3.8c-0.4 0.4-0.6 0.9-0.7 1.4 0-1.2 0.2-2.3 0.7-3.3l11.5-47.7c0-3.2 2.7-6.5 5.9-7.4-1.5 1.1-2.8 2.6-3.9 4.1 0.6-0.3 1.2-0.6 1.8-0.6z m49.6-84c-2 1.2-3.8 2.7-5.5 4.4 1.7-1.8 3.5-3.4 5.5-4.4z m-28.6 63c3.2 0 6.5-1.2 9-2.6-1.3 1.4-3 2.6-7.1 2.6l-19.1 1.9 17.2-1.9z"  ></path><path d="M552.6 674.1l-11.5 49.6 11.5-47.7c0-1.4 0.8-3.3 2-5.2-1.1 0.7-2 2-2 3.3zM766.4 679.8c-15.3-15.3-38.2-24.8-61.1-24.8-47.7 0-85.9 38.2-85.9 85.9s38.2 85.9 85.9 85.9c45.8 0 84-38.2 85.9-85.9 0-22.9-7.6-43.9-24.8-61.1z m-61.1 118.3c-32.5 0-59.2-24.8-59.2-57.3s26.7-59.2 59.2-59.2c30.5 0 57.3 24.8 59.2 57.3 0 32.5-26.7 59.2-59.2 59.2z"  ></path></symbol><symbol id="icon-caidan" viewBox="0 0 1024 1024"><path d="M905.2 231.7H120.8c-12.6 0-22.8-10.2-22.8-22.8 0-12.6 10.2-22.8 22.8-22.8h784.4c12.6 0 22.8 10.2 22.8 22.8 0 12.6-10.2 22.8-22.8 22.8zM905.2 537.4H120.8c-12.6 0-22.8-10.2-22.8-22.8 0-12.6 10.2-22.8 22.8-22.8h784.4c12.6 0 22.8 10.2 22.8 22.8 0 12.6-10.2 22.8-22.8 22.8zM905.2 840.3H120.8c-12.6 0-22.8-10.2-22.8-22.8s10.2-22.8 22.8-22.8h784.4c12.6 0 22.8 10.2 22.8 22.8s-10.2 22.8-22.8 22.8z"  ></path></symbol><symbol id="icon-shijuan" viewBox="0 0 1024 1024"><path d="M200.4 924.8c-21.3 0-38.6-17.3-38.6-38.6v-746c0-21.3 17.3-38.6 38.6-38.6h617.4c21.3 0 38.6 17.3 38.6 38.6v457.9c0 16.2 20 23.8 30.7 11.7 2.9-3.2 4.4-7.4 4.4-11.7V140.2c0-40.8-33-73.8-73.8-73.8H200.4c-40.8 0-73.8 33-73.8 73.8v746c0 40.8 33 73.8 73.8 73.8h344.1c5 0 9.8-2.2 13.2-5.9 10.1-11.4 2-29.4-13.2-29.4H200.4z"  ></path><path d="M760.3 242.3H363.8c-13.3 0-24 10.8-24 24 0 13.3 10.8 24 24 24h396.5c13.3 0 24-10.8 24-24.1-0.1-13.2-10.8-23.9-24-23.9zM245.6 266.3c0 14.9 12.3 27 27.5 27s27.5-12.1 27.5-27-12.3-27-27.5-27-27.5 12.1-27.5 27z m0 0M760.3 423.8H363.8c-13.3 0-24 10.8-24 24 0 13.3 10.8 24 24 24h396.5c13.3 0 24-10.8 24-24.1-0.1-13.1-10.8-23.9-24-23.9zM245.6 447.8c0 14.9 12.3 27 27.5 27s27.5-12.1 27.5-27-12.3-27-27.5-27c-15.2 0.1-27.5 12.1-27.5 27z m0 0"  ></path><path d="M363.6 620.5H538c13.3 0 24 10.8 24 24 0 13.3-10.8 24-24 24H363.6c-13.3 0-24-10.7-24-24 0-13.2 10.8-24 24-24zM245.6 644.5c0 14.9 12.3 27 27.5 27s27.5-12.1 27.5-27-12.3-27-27.5-27c-15.2 0.1-27.5 12.1-27.5 27z m0 0"  ></path><path d="M552 785.7l88.1 65.2 219.5-187.6s14.7-12.5 27.6-2.7c3.8 2.8 8.3 11.2-1.7 24.2L656.3 933.7s-17.5 22.3-38.4-0.3l-99-123.8s-11.7-16.8 2.9-26.8c5.1-3.3 16.3-8.6 30.2 2.9z m0 0"  ></path></symbol><symbol id="icon-dongtai" viewBox="0 0 1024 1024"><path d="M513 630.8c-64.4 0-116.7-52.4-116.7-116.7 0-64.4 52.4-116.7 116.7-116.7s116.7 52.4 116.7 116.7c0 64.4-52.3 116.7-116.7 116.7z m0-193.3c-42.3 0-76.6 34.4-76.6 76.6 0 42.3 34.4 76.6 76.6 76.6 42.3 0 76.6-34.4 76.6-76.6 0-42.3-34.3-76.6-76.6-76.6zM720.4 514.1c0 61.3-26.8 116.5-69.3 154.4-13.7 12.3-5.1 35 13.4 35 4.9 0 9.7-1.7 13.3-5 50.7-45.4 82.7-111.2 82.7-184.4s-32-139.1-82.7-184.4c-3.6-3.3-8.4-5-13.3-5-18.4 0-27.1 22.7-13.4 35 42.5 37.9 69.3 93.1 69.3 154.4zM305.6 514.1c0-61.3 26.8-116.5 69.3-154.4 13.7-12.3 5.1-35-13.4-35-4.9 0-9.7 1.7-13.3 5-50.7 45.4-82.7 111.2-82.7 184.4s32 139.1 82.7 184.4c3.6 3.3 8.4 5 13.3 5 18.4 0 27.1-22.7 13.4-35-42.5-37.9-69.3-93.1-69.3-154.4z"  ></path><path d="M812.5 237h-0.7c-17 0-25.8 19.9-14.7 32.9 56.5 65.7 90.7 151 90.7 244.3 0 93.2-34.2 178.6-90.7 244.3-11.1 12.9-2.4 32.8 14.7 32.8h0.7c5.7 0 11.2-2.4 15-6.8C890.1 711.8 928 617.3 928 514.1c0-103.2-37.9-197.7-100.5-270.4-3.7-4.3-9.3-6.7-15-6.7zM214.2 791.2c17 0 25.8-19.9 14.7-32.8-56.5-65.7-90.7-151-90.7-244.3 0-93.2 34.2-178.6 90.8-244.3 11.1-12.9 2.4-32.9-14.7-32.9h-0.7c-5.7 0-11.2 2.4-15 6.8C135.9 316.4 98 410.9 98 514.1c0 103.2 37.9 197.7 100.5 270.4 3.7 4.3 9.2 6.8 15 6.8h0.7z"  ></path></symbol><symbol id="icon-wenjuan" viewBox="0 0 1024 1024"><path d="M636.8 278.1c30.1 26.1 45.1 61.9 45.1 107.5 0 36.6-9.5 67.1-28.6 91.7-6.5 8-27.6 27.6-63.1 58.6-14 11.5-24.6 24.5-31.6 39.1-8 14.5-12 31.1-12 49.6v12.8h-80.4v-12.8c0-29 5-52.9 15-71.4 9.5-20 37.8-51.1 84.9-93.2l12.8-14.3c14-18 21-36.3 21-54.9 0-25.5-7.3-46.1-21.8-61.6-15-15-36.3-22.5-63.9-22.5-34.1 0-58.6 10.8-73.6 32.3-8.8 11.8-14.8 26.7-17.8 44.9-3.1 18.5-19.7 31.8-38.4 31.8-25 0-43.4-23-38.4-47.5 6.8-32.8 21-60 42.8-81.8 31.6-32.1 75.1-48.1 130.8-48.1 48.6 0 87.6 13.2 117.2 39.8z m-90.9 414.8c10.5 9.5 15.8 22.3 15.8 38.3 0 15-5.5 28.1-16.5 39.1-11 10-24 15-39.1 15-15.5 0-28.6-5.3-39.1-15.8s-15.8-23.3-15.8-38.3c0-16 5.3-28.8 15.8-38.3 10-10 23-15 39.1-15 16.5 0 29.7 5 39.8 15zM752.7 905.4c-3.1 0-6.2-0.4-9.2-1.3-12.5-3.5-21.6-13.7-23.8-26.5l-21.9-129.5c-1.7-9.9 1.2-20 7.8-27.6 6.7-7.6 16.3-11.8 26.4-11.3l131.2 5.2c13 0.5 24.2 8.2 29.3 20.2 5.1 11.9 3 25.4-5.6 35.2L777.6 894c-6.4 7.4-15.5 11.4-24.9 11.4zM741 751.6l17.1 101.1 85.4-97.1-102.5-4z m-1.8-10.5z"  ></path><path d="M205.3 922.7c-21.3 0-38.6-17.3-38.6-38.6V139.3c0-21.3 17.3-38.6 38.6-38.6h616.4c21.3 0 38.6 17.3 38.6 38.6v660.9l35.1-39.5V139.3c0-40.7-33-73.7-73.7-73.7H205.3c-40.7 0-73.7 33-73.7 73.7v744.9c0 40.7 33 73.7 73.7 73.7h385.6c5 0 9.8-2.2 13.2-5.9 10.1-11.4 2-29.3-13.2-29.3H205.3z"  ></path></symbol><symbol id="icon-taolun" viewBox="0 0 1024 1024"><path d="M274.7 496c0 28 22.6 50.6 50.6 50.6s50.6-22.6 50.6-50.6-22.6-50.6-50.6-50.6c-28.1 0-50.6 22.6-50.6 50.6zM466.6 496c0 28 22.6 50.6 50.6 50.6s50.6-22.6 50.6-50.6-22.6-50.6-50.6-50.6-50.6 22.6-50.6 50.6zM652.7 496c0 28 22.6 50.6 50.6 50.6s50.6-22.6 50.6-50.6-22.6-50.6-50.6-50.6-50.6 22.6-50.6 50.6z"  ></path><path d="M511.3 120c-228 0-413.4 162.4-413.4 362.1 0 106.6 52.9 202.5 136.8 268.8v-53.5c-59.8-57-96.2-132.6-96.2-215.3 0-177.3 167.2-321.5 372.8-321.5s372.8 144.2 372.8 321.5-167.2 321.5-372.8 321.5c-30.2 0-59.5-3.2-87.6-9.1l-50.1 28.9c43.1 13.4 89.4 20.7 137.7 20.7 228 0 413.4-162.4 413.4-362.1 0-199.6-185.4-362-413.4-362zM267.2 847.4v-73.3c-11.3-7.2-22.1-14.9-32.5-23.1v152.7l138.9-80.2c-13.6-4.2-27-9-39.9-14.5l-66.5 38.4z"  ></path><path d="M379.3 782.7L333.7 809c12.9 5.4 26.3 10.2 39.9 14.5l50.1-28.9c-15.2-3.3-30-7.2-44.4-11.9zM267.2 724.8c-11.4-8.6-22.3-17.7-32.5-27.4v53.5c10.4 8.2 21.2 15.9 32.5 23.1v-49.2z"  ></path></symbol><symbol id="icon-fenban" viewBox="0 0 1024 1024"><path d="M261.2 339.5h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71v91.1c0 39.2-31.8 71-71 71z m-91.1-202.1c-22.1 0-40 17.9-40 40v91.1c0 22.1 18 40 40 40h91.1c22.1 0 40-18 40-40v-91.1c0-22.1-17.9-40-40-40h-91.1zM555.2 339.5h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71v91.1c0 39.2-31.9 71-71 71z m-91.1-202.1c-22.1 0-40 17.9-40 40v91.1c0 22.1 18 40 40 40h91.1c22.1 0 40-18 40-40v-91.1c0-22.1-17.9-40-40-40h-91.1zM853.9 339.5h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71v91.1c-0.1 39.2-31.9 71-71 71z m-91.1-202.1c-22.1 0-40 17.9-40 40v91.1c0 22.1 17.9 40 40 40h91.1c22.1 0 40-18 40-40v-91.1c0-22.1-18-40-40-40h-91.1zM261.2 634.2h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71v91.1c0 39.1-31.8 71-71 71z m-91.1-202.1c-22.1 0-40 18-40 40v91.1c0 22.1 18 40 40 40h91.1c22.1 0 40-18 40-40v-91.1c0-22.1-17.9-40-40-40h-91.1zM555.2 634.2h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71v91.1c0 39.1-31.9 71-71 71z m-91.1-202.1c-22.1 0-40 18-40 40v91.1c0 22.1 18 40 40 40h91.1c22.1 0 40-18 40-40v-91.1c0-22.1-17.9-40-40-40h-91.1zM853.9 634.2h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71v91.1c-0.1 39.1-31.9 71-71 71z m-91.1-202.1c-22.1 0-40 18-40 40v91.1c0 22.1 17.9 40 40 40h91.1c22.1 0 40-18 40-40v-91.1c0-22.1-18-40-40-40h-91.1zM261.2 920h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71V849c0 39.1-31.8 71-71 71z m-91.1-202.1c-22.1 0-40 18-40 40V849c0 22.1 18 40 40 40h91.1c22.1 0 40-17.9 40-40v-91.1c0-22.1-17.9-40-40-40h-91.1zM555.2 920h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71V849c0 39.1-31.9 71-71 71z m-91.1-202.1c-22.1 0-40 18-40 40V849c0 22.1 18 40 40 40h91.1c22.1 0 40-17.9 40-40v-91.1c0-22.1-17.9-40-40-40h-91.1zM853.9 920h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71V849c-0.1 39.1-31.9 71-71 71z m-91.1-202.1c-22.1 0-40 18-40 40V849c0 22.1 17.9 40 40 40h91.1c22.1 0 40-17.9 40-40v-91.1c0-22.1-18-40-40-40h-91.1z"  ></path></symbol><symbol id="icon-putongzuoye" viewBox="0 0 1024 1024"><path d="M830.1 64.2H195.9c-38 0-68.9 30.9-68.9 68.9v757.4c0 38 30.9 68.9 68.9 68.9h634.2c38 0 68.9-30.9 68.9-68.9V133.1c0-38-30.9-68.9-68.9-68.9z m-74 44.7v144.2h0.1c0 2.4-1.7 4.9-5.2 4.9l-77.9-48.9-77.9 48.9c-3.5-2.4-5.2-4.9-5.2-4.9V108.9c0-1.8 1.9-3.6 4.9-4.4H751c4 1.2 5.1 4.4 5.1 4.4z m102.6 781.6c0 15.8-12.8 28.6-28.6 28.6H195.9c-15.8 0-28.6-12.8-28.6-28.6V133.1c0-15.8 12.8-28.6 28.6-28.6h373v191.2s2.2 3.8 6.5 7.6l97.7-65.8 97.7 65.8c4.3 0 6.5-3.8 6.5-7.6V104.5h52.8c15.8 0 28.6 12.8 28.6 28.6v757.4z"  ></path><path d="M718.6 542.9H307.4c-11.1 0-20.1-9-20.1-20.1s9-20.1 20.1-20.1h411.2c11.1 0 20.1 9 20.1 20.1 0 11.1-9 20.1-20.1 20.1zM718.6 726.7H307.4c-11.1 0-20.1-9-20.1-20.1s9-20.1 20.1-20.1h411.2c11.1 0 20.1 9 20.1 20.1s-9 20.1-20.1 20.1z"  ></path></symbol><symbol id="icon-fenzuzuoye" viewBox="0 0 1024 1024"><path d="M325.8 527.1v-0.1c0-9.8-7.9-17.6-17.8-17.6-64.3 0-116.5-55.9-116.5-124.4 0-68.6 52.2-124.4 116.5-124.4 9.8 0 17.8-7.9 17.8-17.6 0-9.8-7.9-17.8-17.8-17.8-83.8 0-151.9 71.8-151.9 159.8 0 58.7 30.2 110 75.1 137.8C135.6 556.5 66.7 651.9 66.7 764c0 9.8 7.9 17.7 17.7 17.7 9.8 0 17.7-7.9 17.7-17.7 0-120.9 92.4-219.2 205.9-219.2 9.8 0 17.8-7.9 17.8-17.7zM700.2 536.1v-0.1c0-9.8 7.9-17.6 17.8-17.6 64.3 0 116.5-55.9 116.5-124.4 0-68.6-52.2-124.4-116.5-124.4-9.8 0-17.8-7.9-17.8-17.6 0-9.8 7.9-17.8 17.8-17.8 83.8 0 151.9 71.8 151.9 159.8 0 58.7-30.2 110-75.1 137.8C890.4 565.5 959.3 661 959.3 773c0 9.8-7.9 17.7-17.7 17.7-9.8 0-17.7-7.9-17.7-17.7 0-120.9-92.4-219.2-205.9-219.2-9.8 0-17.8-7.9-17.8-17.7z"  ></path><path d="M733.1 620.5c-1.5-1.7-39.9-42.1-86.1-62.8-19.3-8.7-37.2-14.7-52.2-19 61.3-30.3 103.7-93.3 103.7-166.2 0-102.2-83.2-185.4-185.5-185.4s-185.5 83.2-185.5 185.4c0 70.6 39.8 132.2 98 163.5-121.4 37.4-209.8 150.6-209.8 284.1 0 9.8 7.9 17.7 17.8 17.7 9.8 0 17.6-7.9 17.6-17.7 0-144.3 117.5-261.8 260.6-261.9 1.9 0.2 3.7 0.1 5.5-0.3 2.3-0.1 4.6-0.4 6.9-0.5 0.8 0 1.5 0.1 2.3 0.1 26.2 0.6 75.8 16.2 105.6 29.8 45.6 20.8 76.3 58.7 78 60.5 41.8 47.8 64.7 108.3 64.7 172.3 0 9.8 7.9 17.7 17.7 17.7s17.6-7.9 17.6-17.7c0.2-74.5-27-144.9-76.9-199.6z m-182.2-92.4zM363 372.5c0-82.8 67.3-150.1 150.1-150.1s150.1 67.3 150.1 150.1-67.3 150.1-150.1 150.1c-82.7-0.1-150.1-67.4-150.1-150.1z"  ></path></symbol><symbol id="icon-bianjidaibeijing" viewBox="0 0 1024 1024"><path d="M513 98.2c-229.2 0-415 185.8-415 415s185.8 415 415 415 415-185.8 415-415-185.8-415-415-415z m-181.7 608c-0.7 0-0.7 0-0.7-0.7 14.6-38 28.5-76.8 43.2-114.9 23.4 23.4 47.6 46.8 71 71-37.4 14.6-75.5 30-113.5 44.6z m376.3-303.5C640 469 531.5 576.3 470.4 637.3l-71.7-71.7c61.1-61.1 169.9-168.6 237.5-234.9 5.7-5.6 14.9-5.5 20.5 0.1l51.1 51.1c5.7 5.8 5.6 15.1-0.2 20.8z"  ></path></symbol><symbol id="icon-bofang" viewBox="0 0 1024 1024"><path d="M513 928.2c-228.8 0-415-186.2-415-415s186.2-415 415-415 415 186.2 415 415-186.2 415-415 415z m0-798.1c-211.2 0-383.1 171.9-383.1 383.1S301.8 896.3 513 896.3s383.1-171.9 383.1-383.1S724.2 130.1 513 130.1z"  ></path><path d="M718.4 509.8L401 313.1c-2.7-1.7-6.2 0.3-6.2 3.4v393.3c0 3.2 3.5 5.1 6.2 3.4l317.4-196.6c2.5-1.5 2.5-5.2 0-6.8z"  ></path></symbol><symbol id="icon-wancheng" viewBox="0 0 1024 1024"><path d="M513 98.2c-228.6 0-414 185.4-414 414s185.4 414 414 414 414-185.4 414-414-185.4-414-414-414zM743.1 430L468.2 676.8c-6.4 5.7-14.6 8.9-23.1 8.9-0.9 0-1.7 0-2.6-0.1-9.4-0.7-18.1-5.2-24.1-12.5L279.3 504.6c-12.2-14.7-10.1-36.6 4.7-48.8 14.8-12.2 36.6-10.1 48.8 4.7l116.1 140.6L697 378.4c14.2-12.8 36.1-11.6 48.9 2.6 12.6 14.3 11.5 36.2-2.8 49z"  ></path></symbol><symbol id="icon-zuojiantou" viewBox="0 0 1024 1024"><path d="M204.7 511.2c0-19.8 9.1-38.5 24.7-50.8L716.9 77.1c28-22 68.6-17.2 90.7 10.8 22 28 17.2 68.6-10.8 90.7l-423 332.6 423 332.6c28.1 22 32.9 62.7 10.8 90.7-22 28-62.6 32.9-90.7 10.8L229.3 562c-15.6-12.3-24.6-31-24.6-50.8z"  ></path></symbol><symbol id="icon-youjiantou" viewBox="0 0 1024 1024"><path d="M821.3 511.2c0-19.8-9.1-38.5-24.7-50.8L309.1 77.1c-28-22-68.6-17.2-90.7 10.8-22 28-17.2 68.6 10.8 90.7l423 332.6-423 332.6c-28.1 22-32.9 62.7-10.8 90.7 22 28 62.6 32.9 90.7 10.8L796.7 562c15.6-12.3 24.6-31 24.6-50.8z"  ></path></symbol><symbol id="icon-shangjiantou" viewBox="0 0 1024 1024"><path d="M512.3 202.1c-19.8 0-38.5 9.1-50.8 24.7L78.1 714.3c-22 28-17.2 68.6 10.8 90.7 28 22 68.6 17.2 90.7-10.8l332.6-423 332.6 423c22 28.1 62.7 32.9 90.7 10.8 28-22 32.9-62.6 10.8-90.7L563 226.8c-12.2-15.6-31-24.7-50.7-24.7z"  ></path></symbol><symbol id="icon-zhankai" viewBox="0 0 1024 1024"><path d="M573.6 402.8c-14 14-13.8 35.1 0.6 48.9 13.5 13 35.4 11.9 48.6-1.4l234.1-234.1v158.9c0 20.5 13.6 34.3 33.9 34.5 19.4 0.2 35.1-16 35.1-35.4V134.1c0-9.4-3.7-18.4-10.4-25-6.6-6.6-15.6-10.4-25-10.4h-241c-20.5 0-34.3 13.5-34.5 33.9-0.3 19.4 16 35.1 35.4 35.1h158L573.6 402.8z m234.9-234.9"  ></path><path d="M131.4 617c-20.7 0-34.5 13.8-34.5 34.5v241c0 9.4 3.7 18.4 10.4 25 6.6 6.6 15.6 10.4 25 10.4h241c20.5 0 34.3-13.6 34.5-33.9 0.2-19.4-16-35.1-35.4-35.1h-158L449.3 624c14-14 13.8-35.1-0.6-48.9-13.5-13-35.4-11.9-48.7 1.4L165.9 810.4V651.5c0-20.7-13.8-34.5-34.5-34.5z m0 0"  ></path></symbol><symbol id="icon-shousuo" viewBox="0 0 1024 1024"><path d="M915.5 156.8c13.9-13.9 13.8-35-0.6-48.8-13.5-13-35.3-11.9-48.6 1.4L632.5 343.2V184.5c0-20.5-13.5-34.2-33.9-34.5-19.4-0.2-35.1 16-35.1 35.4v239.8c0 9.4 3.7 18.4 10.3 25 6.6 6.6 15.6 10.3 25 10.3h240.7c20.5 0 34.2-13.5 34.5-33.9 0.2-19.4-16-35.1-35.4-35.1H680.8l234.7-234.7z"  ></path><path d="M425.5 875.8c20.7 0 34.5-13.8 34.5-34.5V600.6c0-9.4-3.7-18.4-10.3-25-6.6-6.6-15.6-10.3-25-10.3H184c-20.5 0-34.2 13.5-34.5 33.9-0.2 19.4 16 35.1 35.4 35.1h157.8L108 869c-13.9 13.9-13.8 35 0.6 48.8 13.5 13 35.3 11.9 48.6-1.4L391 682.6v158.7c0 20.7 13.8 34.5 34.5 34.5z"  ></path></symbol><symbol id="icon-gonggao" viewBox="0 0 1024 1024"><path d="M895.1 471.1H734.7c-18.2 0-32.9 14.8-32.9 33.1v10.3c0 18.3 14.7 33.1 32.9 33.1H895c18.2 0 32.9-14.8 32.9-33.1v-10.3c0.1-18.3-14.6-33.1-32.8-33.1zM523 187.4c-49.9 39.7-154.2 95.2-229.3 148.7l-0.1 0.1c-0.9 0.5-1.7 3.5-2.6 4-8.9 5-12.9 18.8-61.1 18.8h-94.1c-24.1 0-39.1 11.3-39.1 36.8v226.6c0 25.5 13.7 38.1 39.1 38.1h94.5c48 0.1 51.9 13.8 60.7 18.8 0.9 0.5 1.7 3.5 2.6 4l0.1 0.1c72.7 53.4 177.8 113.4 229.3 151.4 15.5 11.5 67.1 31.6 67.1-39.2v-572c0.1-70.9-51.9-48.2-67.1-36.2z m148.1 156.2c8.5 15 25.4 18.8 37.7 8.4l131.8-111.1c12.3-10.4 15.4-30.9 6.9-46l-4.8-8.5c-8.5-15-25.4-18.8-37.7-8.4L673.2 289.1c-12.3 10.4-15.4 31-6.9 46l4.8 8.5z m37.7 323.5c-12.3-10.4-29.2-6.6-37.7 8.4l-4.8 8.5c-8.5 15-5.4 35.6 6.9 46L805 841.1c12.3 10.4 29.2 6.6 37.7-8.4l4.8-8.5c8.5-15 5.4-35.6-6.9-46L708.8 667.1z m0 0" fill="" ></path></symbol><symbol id="icon-wenjian" viewBox="0 0 1024 1024"><path d="M896.3 368H97.7c-8.5 0-16.6 3.4-22.6 9.4s-9.4 14.1-9.4 22.6v447.2c0 35.1 28.7 63.9 63.9 63.9h766.7c35.1 0 63.9-28.8 63.9-63.9V431.9c0-35.1-28.7-63.9-63.9-63.9zM97.7 304.2h411.5c23.8 0 39.2-25 28.6-46.2l-55.1-110.1c-10.8-21.7-32.9-35.3-57.2-35.3H129.7c-35.3 0-63.9 28.6-63.9 63.9v95.8c0 8.5 3.4 16.6 9.4 22.6 5.9 5.9 14 9.3 22.5 9.3z m0 0"  ></path></symbol><symbol id="icon-huifu1" viewBox="0 0 1024 1024"><path d="M311.5 435.7m-37.6 0a37.6 37.6 0 1 0 75.2 0 37.6 37.6 0 1 0-75.2 0Z" fill="" ></path><path d="M511.3 435.7m-37.6 0a37.6 37.6 0 1 0 75.2 0 37.6 37.6 0 1 0-75.2 0Z" fill="" ></path><path d="M711.2 435.7m-37.6 0a37.6 37.6 0 1 0 75.2 0 37.6 37.6 0 1 0-75.2 0Z" fill="" ></path><path d="M300.8 929.8c-2 0-4.1-0.3-6.1-0.8-8.2-2.2-14.6-8.6-16.7-16.7l-37.3-139.1h-96.4c-52.2 0-94.7-42.5-94.7-94.7V192.9c0-52.2 42.5-94.7 94.7-94.7h734c52.2 0 94.7 42.5 94.7 94.7v485.4c0 52.2-42.5 94.7-94.7 94.7h-411L317.6 922.8c-4.5 4.5-10.6 7-16.8 7zM144.3 145.6c-26.1 0-47.4 21.2-47.4 47.4v485.4c0 26.1 21.2 47.4 47.4 47.4h114.5c10.7 0 20.1 7.2 22.9 17.6l31.4 117.1 127.7-127.7c4.4-4.4 10.5-6.9 16.7-6.9h420.8c26.1 0 47.4-21.2 47.4-47.4V192.9c0-26.1-21.2-47.4-47.4-47.4h-734z" fill="" ></path></symbol><symbol id="icon-fenzhi" viewBox="0 0 1024 1024"><path d="M739.9 279.2c58.3 0 105.6-47.2 105.6-105.3 0-58.2-47.3-105.3-105.7-105.3-35.8 0-69.1 18.2-88.5 48.3-19.4 30.1-22.1 68-7.3 100.6L474.4 371.2c-29.8-17.6-63.8-26.9-98.4-26.8-51.2-0.1-100.4 20.2-136.7 56.4-36.3 36.2-56.7 85.3-56.8 136.6 0.2 106.7 86.7 193.1 193.4 193 37.3 0 72.3-10.6 101.8-28.9l111.1 100.7c-15 32.6-12.3 70.6 7.2 100.8 19.4 30.2 53 48.4 88.9 48.2 58.3 0 105.6-47.2 105.6-105.3 0-58.2-47.3-105.3-105.6-105.3-22.6 0-43.5 7-60.7 19.1l-103.7-94.1c31.6-35.3 49-81 49-128.3 0-50.6-19.5-96.7-51.4-131.1L679.4 260c17 12.1 38.1 19.1 60.5 19.2z m0-155.4c27.7 0 50.3 22.5 50.3 50.2 0 27.8-22.5 50.3-50.3 50.3-27.8 0-50.3-22.5-50.3-50.3 0.1-27.8 22.7-50.2 50.3-50.2zM278.3 634.9c-26-25.8-40.5-60.9-40.4-97.5 0-36.8 14.3-71.4 40.4-97.5 25.9-25.9 61.1-40.5 97.7-40.3 36.7-0.1 71.8 14.4 97.7 40.3 26.1 26 40.4 60.6 40.4 97.5 0.1 36.6-14.5 71.7-40.4 97.5-25.9 25.9-61.1 40.5-97.7 40.3-36.7 0.2-71.9-14.4-97.7-40.3z m406.6 160.9c26.7 1.3 47.7 23.4 47.7 50.1 0 26.7-21 48.8-47.7 50.1-26.7-1.3-47.7-23.4-47.7-50.1 0-26.7 21-48.7 47.7-50.1z m0 0" fill="" ></path></symbol><symbol id="icon-wangzhikelong" viewBox="0 0 1024 1024"><path d="M824.2 719.3h-415c-57.3 0-103.7-46.5-103.7-103.7v-415c0-57.3 46.5-103.7 103.7-103.7h415c57.3 0 103.7 46.5 103.7 103.7v415c0.1 57.2-46.4 103.7-103.7 103.7z m51.9-518.7c0-28.6-23.2-51.9-51.9-51.9h-415c-28.6 0-51.9 23.2-51.9 51.9v415c0 28.6 23.2 51.9 51.9 51.9h415c28.6 0 51.9-23.2 51.9-51.9v-415zM149.9 408.1v415c0 28.6 23.2 51.9 51.9 51.9h415c28.7 0 51.9-23.2 51.9-51.9v-25.9c0-14.3 11.6-25.9 25.9-25.9 14.3 0 25.9 11.6 25.9 25.9V823c0 57.3-46.4 103.7-103.7 103.7h-415C144.5 926.8 98 880.3 98 823V408c0-57.3 46.4-103.7 103.7-103.7h25.9c14.3 0 25.9 11.6 25.9 25.9 0 14.3-11.6 25.9-25.9 25.9h-25.9c-28.6 0.1-51.8 23.3-51.8 52z m0 0" fill="" ></path></symbol><symbol id="icon-xiazai" viewBox="0 0 1024 1024"><path d="M763.8 813.3h-503c-108.4 0-196.6-88.2-196.6-196.6 0-50.9 20.3-100.4 56-137-0.1-2.1-0.1-4.2-0.1-6.2 0-98.8 80.3-179.1 179.1-179.1 18.6 0 36.9 2.8 54.5 8.5 52.3-66.8 132.8-106.3 218-106.3 138.8 0 257.3 105.4 274.6 241.9 68.7 32.1 114.1 102.3 114.1 178.2 0 108.5-88.2 196.6-196.6 196.6z m-464.6-482c-78.5 0-142.3 63.8-142.3 142.3 0 4 0.2 8 0.5 11.9 0.5 5.6-1.7 11.1-5.8 15C119.5 530.6 101 573 101 616.8c0 88.1 71.7 159.7 159.7 159.7h503c88.1 0 159.7-71.7 159.7-159.7 0-64.8-40.7-124.4-101.2-148.5-6.5-2.6-10.9-8.6-11.5-15.5-10.6-123-115.6-219.3-239.1-219.3-78 0-151.4 38.1-196.4 102-4.9 7-14.1 9.7-22 6.4-17.1-7-35.3-10.6-54-10.6z" fill="" ></path><path d="M512.3 684.5c-2.4 0-4.8-0.5-7-1.4-6.9-2.8-11.4-9.6-11.4-17V472.8c0-10.2 8.2-18.4 18.4-18.4s18.4 8.2 18.4 18.4v148.9l51.4-51.4c7.2-7.2 18.8-7.2 26 0s7.2 18.8 0 26l-82.8 82.8c-3.5 3.5-8.2 5.4-13 5.4z" fill="" ></path><path d="M512.3 684.5c-4.8 0-9.5-1.9-13-5.4l-82.8-82.8c-7.2-7.2-7.2-18.8 0-26s18.8-7.2 26 0l51.4 51.4V472.8c0-10.2 8.2-18.4 18.4-18.4s18.4 8.2 18.4 18.4v193.3c0 7.4-4.5 14.2-11.4 17-2.3 0.9-4.6 1.4-7 1.4z" fill="" ></path></symbol><symbol id="icon-daima" viewBox="0 0 1024 1024"><path d="M311.1 739c-6.1 0-12.2-2.3-16.8-7L69.7 507.4l224.6-224.6c9.3-9.3 24.3-9.3 33.6 0s9.3 24.3 0 33.6l-191 191 191 191c9.3 9.3 9.3 24.3 0 33.6-4.6 4.7-10.7 7-16.8 7zM711.5 739c-6.1 0-12.2-2.3-16.8-7-9.3-9.3-9.3-24.3 0-33.6l191-191-191-191c-9.3-9.3-9.3-24.3 0-33.6s24.3-9.3 33.6 0L953 507.4 728.3 732c-4.6 4.7-10.7 7-16.8 7zM418.5 814.7c-2.4 0-4.8-0.4-7.2-1.1-12.5-4-19.4-17.3-15.5-29.8l179.6-567.1c4-12.5 17.3-19.4 29.8-15.5 12.5 4 19.4 17.3 15.5 29.8L441.1 798.1a23.73 23.73 0 0 1-22.6 16.6z" fill="" ></path></symbol><symbol id="icon-tijiaojilu" viewBox="0 0 1024 1024"><path d="M480.4 875.2H250.1c-2.5 0-5.1-0.1-7.6-0.3-1.5-0.1-2.9-0.2-4.3-0.4 7.9 0.9 2.8 0.4 1 0-6-1.1-11.8-2.7-17.5-4.9-4.8-1.8 5.6 2.5 0.9 0.4l-3.7-1.8c-2.5-1.3-4.9-2.7-7.2-4.1-1.8-1.1-10.6-7.6-3.8-2.4-4.2-3.4-8.2-7.1-11.8-11.2l-2.7-3.1c-3.2-4 3.6 4.8 0.6 0.7-3.5-4.8-6.5-9.9-9.1-15.2-0.8-1.5-2.7-6.3 0.3 0.9-0.6-1.3-1-2.6-1.5-3.9-2-5.7-3.5-11.6-4.4-17.7 1.4 8.7 0-1.2-0.1-3.4-0.1-1.5-0.1-2.9-0.1-4.4V219c0-3.4 0.2-6.8 0.5-10.2 0.5-5.3-1 6.3-0.1 1 0.9-6 2.6-11.8 4.7-17.5 0.6-1.6 2.7-6.3-0.5 0.8l1.8-3.7c2.4-4.9 5.3-9.6 8.5-14.1 3-4.1-3.8 4.7-0.6 0.8 2.9-3.5 6-6.8 9.3-9.9 1.5-1.4 9-7.3 2.2-2.2 5.9-4.4 12.2-8.1 18.9-11-7.1 3.1-2.5 1-0.9 0.4 5.3-1.9 10.7-3.4 16.2-4.4 1.8-0.4 7-1-1 0 4.2-0.5 8.5-0.7 12.8-0.6h524.9c3.2 0 6.3 0.1 9.5 0.4 4.6 0.8 9.1 1.9 13.6 3.3 2.1 0.6 11 4.3 3.1 0.9 6.7 2.9 13 6.6 18.9 11-6.1-4.5-2.1-1.6-0.8-0.5 4.2 3.5 8 7.4 11.5 11.6 1.1 1.2 4.1 5.3-0.5-0.8 4.4 5.9 8.1 12.2 11 18.9-3.5-7.9 0.3 1.1 0.9 3 1.4 4.5 2.5 9 3.3 13.6 0.9 5.3-0.7-6.3-0.1-1 0.4 2.9 0.5 5.8 0.5 8.7v356.8c0 13.6 11.4 25 25 25 13.8-0.1 24.9-11.2 25-25V219.4c0-21.9-5.9-43.7-17.1-62.6-14.7-23.9-37.1-42.2-63.6-51.7-17.5-6.7-36-6.9-54.5-6.9H267c-16.2 0-31.9 0-48 4-52.3 13.2-90 63.2-90 116.8v582c0 35.1 13 68.9 39.3 92.7 21.3 19.1 48.5 30.2 77 31.5 5.7 0.3 11.3 0.1 17 0.1h218c13.8-0.1 24.9-11.2 25-25 0-13.8-11.1-24.9-24.9-25.1zM854.2 687l-97.5 101.6-90.3 94h35.4l-73.2-65.2c-10.2-9-25.4-10-35.4 0-9.2 9.3-10.2 26.3 0 35.4l73.3 65.2c10 9 25.5 10.3 35.4 0l97.5-101.6 90.3-94c9.7-9.8 9.7-25.6 0-35.4-9.9-9.7-25.7-9.7-35.5 0zM349.9 338.5h326.3c13.8-0.1 24.9-11.3 25-25-0.1-13.8-11.3-24.9-25-25H349.9c-13.8 0.1-24.9 11.3-25 25-0.1 13.6 11.3 25 25 25z m0 195.6h326.3c13.8-0.1 24.9-11.2 25-25-0.1-13.8-11.3-24.9-25-25H349.9c-13.8 0.1-24.9 11.3-25 25-0.1 13.6 11.3 25 25 25z m0 195.6h130.6c13.8-0.2 24.9-11.3 25-25-0.1-13.8-11.3-24.9-25-25H349.8c-13.8 0.2-24.9 11.3-25 25 0 13.6 11.4 25 25.1 25z m0 0" fill="#2A2A2A" ></path></symbol><symbol id="icon-xuanzeti" viewBox="0 0 1024 1024"><path d="M701 959.4H325c-116.4 0-211.1-100.4-211.1-223.8V357.9c0-117.6 86.8-215.6 197.6-223.1l2.7 39.1c-90.3 6.1-161.1 87-161.1 184v377.7c0 101.8 77.2 184.6 172 184.6H701c94.8 0 172-82.8 172-184.6V357.9c0-97.1-70.7-177.9-161.1-184l2.7-39.1c110.8 7.5 197.6 105.5 197.6 223.1v377.7C912.1 859 817.4 959.4 701 959.4z" fill="" ></path><path d="M741.5 429.3L485.8 736.1c-9.8 11.7-27.2 13.2-38.7 3.3L276.5 593.2c-11.5-9.8-12.8-27.1-3-38.5 9.8-11.4 27.1-12.8 38.5-3l128.5 110.1c11.6 9.9 29 8.4 38.7-3.3l220.2-264.3c9.7-11.6 26.9-13.2 38.5-3.5 11.7 9.7 13.3 27 3.6 38.6z m17.5-21M640.8 239.8H385.2c-48.4 0-87.8-39.4-87.8-87.8s39.4-87.8 87.8-87.8h255.7c48.4 0 87.8 39.4 87.8 87.8s-39.5 87.8-87.9 87.8zM385.2 103.4c-26.8 0-48.6 21.8-48.6 48.6s21.8 48.6 48.6 48.6h255.7c26.8 0 48.6-21.8 48.6-48.6s-21.8-48.6-48.6-48.6H385.2z" fill="" ></path></symbol><symbol id="icon-bianji" viewBox="0 0 1024 1024"><path d="M758.6 96C622.9 229 404.5 444.9 281.8 567.7l144 144C548.4 589 766.4 373.5 902.2 240.4c11.6-11.4 11.7-30.1 0.2-41.6L799.8 96.3c-11.3-11.4-29.7-11.5-41.2-0.3zM145 848.5c29.4-76.4 57.3-154.3 86.7-230.7 47 47 95.5 94 142.5 142.5-74.9 29.4-151.3 60.2-227.8 89.6-1.4 0.1-1.4 0.1-1.4-1.4z" fill="" ></path></symbol><symbol id="icon-xiangshang" viewBox="0 0 1024 1024"><path d="M804.4 373L554.6 112.8c-23.3-19.4-61.3-19.4-84.6 0L220.2 373c-37.2 31.8-10.9 86.1 41.9 86.1h145.4v432.2c0 18.7 15.3 34 34 34h142.4c18.7 0 34-15.3 34-34V459.1h144.6c52.8 0 79.1-54.3 41.9-86.1z m0 0" fill="" ></path></symbol><symbol id="icon-shanchudiao" viewBox="0 0 1024 1024"><path d="M379.6 668.7c-5.7 0-11.3-2.2-15.6-6.5-8.6-8.6-8.6-22.6 0-31.3l266.7-266.7c8.6-8.6 22.6-8.6 31.3 0 8.6 8.6 8.6 22.6 0 31.3L395.3 662.2c-4.4 4.3-10 6.5-15.7 6.5z" fill="" ></path><path d="M646.4 668.7c-5.7 0-11.3-2.2-15.6-6.5L364 395.5c-8.6-8.6-8.6-22.6 0-31.3 8.6-8.6 22.6-8.6 31.3 0L662 630.9c8.6 8.6 8.6 22.6 0 31.3-4.3 4.3-10 6.5-15.6 6.5z" fill="" ></path><path d="M513 927.7c-106.2 0-212.4-40.4-293.2-121.3-161.7-161.6-161.7-424.7 0-586.4s424.7-161.7 586.4 0 161.7 424.8 0 586.4c-80.8 80.9-187 121.3-293.2 121.3z m0-784.7c-94.9 0-189.7 36.1-261.9 108.3-144.4 144.4-144.4 379.4 0 523.9 144.5 144.4 379.5 144.4 523.9 0 144.4-144.4 144.4-379.4 0-523.9C702.7 179.1 607.9 143 513 143z" fill="" ></path></symbol><symbol id="icon-shangshengpaixu" viewBox="0 0 1024 1024"><path d="M806.2 373.9L555.4 112.8c-23.4-19.5-61.5-19.5-84.9 0L219.8 373.9c-37.4 31.9-10.9 86.4 42 86.4h145.9v433.8c0 18.8 15.4 34.2 34.2 34.2h142.9c18.8 0 34.2-15.4 34.2-34.2V460.3h145.1c53 0 79.5-54.5 42.1-86.4z m0 0" fill="" ></path></symbol><symbol id="icon-banbenku" viewBox="0 0 1024 1024"><path d="M512.6 140.2c21.8 0 42.1 8.4 57.3 23.6l290.9 290.9c31.6 31.6 31.6 83.1 0 114.7L570 860.2c-15.2 15.2-35.6 23.6-57.3 23.6-21.8 0-42.1-8.4-57.3-23.6l-291-290.9c-31.6-31.6-31.6-83.1 0-114.7l290.9-290.9c15.2-15.1 35.6-23.5 57.3-23.5m0-40.6c-31.2 0-62.4 11.8-86 35.5L135.7 426c-47.3 47.3-47.3 124.7 0 172l290.9 290.9c23.7 23.7 54.8 35.5 86 35.5 31.2 0 62.4-11.8 86-35.5L889.5 598c47.3-47.3 47.3-124.7 0-172L598.6 135.1c-23.6-23.6-54.8-35.5-86-35.5z" fill="" ></path><path d="M686.4 237.5L621.2 280c-5.4-2.9-11.2-5.1-17.5-6.5-34.4-7.2-68 14.7-75.2 49.1-1.3 6.3-1.7 12.5-1.2 18.6l-112 73.2c-5.5-3.2-11.6-5.5-18.2-6.9-34.4-7.2-68 14.7-75.2 49.1-5.9 28 7.6 55.5 31.4 68.6l0.4 0.7 0.3-0.2c5.2 2.7 10.8 4.8 16.8 6.1 34.4 7.2 68-14.7 75.2-49.1 1.3-6 1.7-12.1 1.2-17.9l99.2-64.7-45.3 215.4c-21.7 6.3-39.4 24.1-44.4 47.9-7.2 34.4 14.7 68 49.1 75.2 34.4 7.2 68-14.7 75.2-49.1 5-23.8-4-47.2-21.4-61.7l48.6-231.2c21.7-6.3 39.4-24.1 44.4-47.9 1.3-6.3 1.7-12.5 1.2-18.6l65.1-42.5" fill="" ></path></symbol><symbol id="icon-issue" viewBox="0 0 1024 1024"><path d="M515.4 935c-111.7 0-216.8-43.5-295.8-122.5C140.5 733.4 97 628.4 97 516.6s43.5-216.8 122.5-295.8S403.6 98.3 515.3 98.3c111.8 0 216.8 43.5 295.8 122.5s122.5 184.1 122.5 295.8-43.5 216.8-122.5 295.8C732.2 891.5 627.1 935 515.4 935z m0-792.1c-99.8 0-193.7 38.9-264.3 109.5-70.6 70.6-109.5 164.5-109.5 264.3S180.5 710.4 251.1 781c70.6 70.6 164.5 109.5 264.3 109.5 99.8 0 193.7-38.9 264.3-109.5 70.6-70.6 109.5-164.5 109.5-264.3S850.3 323 779.7 252.4c-70.6-70.7-164.5-109.5-264.3-109.5z" fill="" ></path><path d="M510 718c2 2.4 4.4 3.6 6.7 3.6 4.2 0 8.1-1.8 11.9-5.4 10.9-8.9 23.8-24.8 38.6-48l12.5 7.1c-36.1 62.6-74.5 94.1-114.9 94.1-15.5 0-27.7-4.4-36.9-13.1-9.1-8.7-13.7-19.8-13.7-33.1 0-8.9 2-20 6.1-33.7L470 518.7c4.8-16.2 7.1-28.5 7.1-36.9 0-5.4-2.4-10.1-6.9-14.3-4.6-4.2-10.7-6.1-18.4-6.1-3.8 0-8.1 0.2-12.9 0.4l4.4-14.3L564.5 428h21.2l-73.3 253.9c-3.8 14.5-5.7 24.2-5.7 28.9 0.1 2.6 1.3 4.8 3.3 7.2z m91-364.5c-10.3 10.1-22.8 15.3-37.3 15.3-14.3 0-26.4-5.2-36.7-15.3-10.1-10.3-15.3-22.6-15.3-37.1s5-26.9 15.1-37.3c10.1-10.3 22.4-15.5 36.9-15.5 14.9 0 27.4 5.2 37.5 15.5 10.1 10.3 15.3 22.8 15.3 37.3 0.1 14.5-5.2 26.8-15.5 37.1z m0 0" fill="" ></path></symbol><symbol id="icon-shangchuantupian" viewBox="0 0 1024 1024"><path d="M858.9 98.2H167.1c-38 0-69.2 31.1-69.2 69.2v691.8c0 38.1 31.1 69.2 69.2 69.2h691.8c38 0 69.2-31.1 69.2-69.2V167.3c0-38-31.2-69.1-69.2-69.1zM669.5 270.8c47.8 0 86.4 38.7 86.4 86.5s-38.6 86.5-86.4 86.5c-47.8 0-86.5-38.7-86.5-86.5 0.1-47.8 38.7-86.5 86.5-86.5z m68.3 484.6H288.2c-38 0-59.8-29.7-48.2-65.9l87.9-277.3c11.5-36.3 39.4-40.9 62-10.3L535.3 599c22.6 30.6 60.3 31.1 83.7 1.1l44.5-56.8c23.4-30 53.6-25.4 67.1 10.1l51.9 137.2c13.5 35.7-6.6 64.8-44.7 64.8z m0 0" fill="" ></path></symbol><symbol id="icon-ceping" viewBox="0 0 1024 1024"><path d="M513 98.2c-229.2 0-415 185.8-415 415s185.8 415 415 415 415-185.8 415-415-185.8-415-415-415z m178.3 438.1l-236 136.2c-7.1 4.1-15.7 4.1-22.8 0-7.1-4.1-11.4-11.6-11.4-19.7V380.3c0-8.1 4.3-15.7 11.4-19.7 7.1-4.1 15.7-4.1 22.8 0l236 136.2c15.2 8.8 15.2 30.7 0 39.5z m0 0" fill="#040000" ></path></symbol><symbol id="icon-qqzaixianzixun" viewBox="0 0 1024 1024"><path d="M216 425.1c-4.7 11 1.6 18.8 0 61.2 0 11-50.2 64.3-70.6 119.2-20.4 53.3-22 109.8 7.8 133.3 29.8 21.9 58-73.7 62.7-59.6 1.6 6.3 3.1 12.5 6.3 18.8 9.4 26.7 26.7 54.9 50.2 81.5 4.7 6.3-29.8 15.7-50.2 50.2-20.4 34.5 6.3 97.2 108.2 97.2 131.7 0 159.9-45.5 163.1-45.5h20.4c12.5 0 7.8 1.6 18.8 0 6.3 0 70.6 54.9 158.4 45.5 150.5-15.7 127-65.9 116-97.2-12.5-32.9-56.4-48.6-53.3-50.2 36.1-39.2 42.3-64.3 53.3-100.3 4.7-15.7 39.2 83.1 67.4 59.6 11-9.4 32.9-48.6 11-133.3-21.9-83.1-65.9-103.5-64.3-119.2 1.6-32.9 1.6-54.9-1.6-61.1-7.8-28.2-25.1-22-25.1-28.2 0-166.2-123.9-299.5-277.5-299.5-153.7 0-277.5 134.8-277.5 299.5-1.6 12.5-14.1 3.1-23.5 28.1z m0 0" fill="" ></path></symbol><symbol id="icon-erweima" viewBox="0 0 1024 1024"><path d="M224.2 353.4h127.4V226.1H224.2v127.3zM96.9 926.6H479V544.5H96.9v382.1z m63.6-318.4h254.7v254.7H160.5V608.2z m63.7 191h127.4V671.8H224.2v127.4zM542.6 98.7v382.1h382.1V98.7H542.6zM861 417.1H606.3V162.4H861v254.7z m0 254.7H733.7V544.5h-191v382.1h63.7V671.8H670v63.7h254.7v-191H861v127.3z m-764.1-191H479V98.7H96.9v382.1z m63.6-318.4h254.7v254.7H160.5V162.4z m636.8 63.7H670v127.4h127.4V226.1zM861 926.6h63.7V799.2H861v127.4z m-127.3 0h63.7V799.2h-63.7v127.4z m0 0" fill="" ></path></symbol><symbol id="icon-yijianfankui" viewBox="0 0 1024 1024"><path d="M795.9 355.3v505c0 17-13.9 31-31 31h-573c-17 0-31-13.9-31-31V227.6c0-17 13.9-31 31-31h440.4c19.9 0 35.9-16.1 35.9-35.9 0-18.3-14.7-33-33-33H199.1c-55.7 0-101.2 45.5-101.2 101.2v630c0 55.7 45.5 101.2 101.2 101.2h558.8c55.7 0 101.2-45.5 101.2-101.2v-503c0-17.5-14.3-31.9-31.9-31.9-17.2 0-31.3 14-31.3 31.3z m0 0" fill="#212121" ></path><path d="M452.5 447.6H250.6c-14.2 0-25.8-11.7-25.8-25.8v-12.2c0-14.2 11.7-25.8 25.8-25.8h201.9c14.2 0 25.8 11.7 25.8 25.8v12.2c0.2 14.2-11.5 25.8-25.8 25.8z m189.4 192.1H250.6c-14.2 0-25.8-11.7-25.8-25.8v-12.2c0-14.2 11.7-25.8 25.8-25.8h391.3c14.2 0 25.8 11.7 25.8 25.8v12.2c0 14.2-11.6 25.8-25.8 25.8z m277.7-524.1L596 441c-10.1 10.1-26.5 10.1-36.6 0.1l-8.7-8.7c-10.1-10.1-10.1-26.5-0.1-36.6L874.3 70.4c10.1-10.1 26.5-10.1 36.6-0.1l8.7 8.7c10.1 10.1 10.1 26.5 0 36.6z m0 0" fill="#212121" ></path></symbol><symbol id="icon-youxiangrenzheng" viewBox="0 0 1024 1024"><path d="M879.1 174.4H144.4c-45 0-81.5 36.6-81.5 81.5v516.2c0 45 36.6 81.5 81.5 81.5H879c45 0 81.5-36.6 81.5-81.5V255.9c0.1-44.9-36.5-81.5-81.4-81.5z m0 56.1c4.1 0 8 1 11.5 2.8L511.8 506.4 133 233.3c3.6-1.8 7.5-2.8 11.5-2.8h734.6z m0 567H144.4c-14 0-25.4-11.4-25.4-25.4V292.4l392.7 283.2 392.7-283.2v479.8c0.1 13.9-11.3 25.3-25.3 25.3z m0 0" fill="#3E3A39" ></path></symbol><symbol id="icon-shoujirenzheng" viewBox="0 0 1024 1024"><path d="M729.1 960.9H296.9c-25.6 0-46.3-20.7-46.3-46.3V111.9c0-25.6 20.8-46.3 46.3-46.3h432.2c25.6 0 46.3 20.7 46.3 46.3v802.7c0 25.6-20.7 46.3-46.3 46.3zM513 914.6c17.1 0 30.9-13.8 30.9-30.9 0-17.1-13.8-30.9-30.9-30.9-17.1 0-30.9 13.8-30.9 30.9 0 17.1 13.8 30.9 30.9 30.9z m216.1-756.4H296.9v648.3h432.2V158.2z m0 0" fill="" ></path></symbol><symbol id="icon-zhiyerenzheng" viewBox="0 0 1024 1024"><path d="M602 326H403.7L284.5 708.8l218.6 220.3 238.2-201.8L602 326z m0.6-33H403.7L308.3 98.2h390.9L602.6 293z m0 0" fill="" ></path></symbol><symbol id="icon-shenfenrenzheng" viewBox="0 0 1024 1024"><path d="M509.7 891.3c-109.2 0-218.5 0.1-327.8 0-71-0.1-118.4-45-118.8-116.1-0.9-175.8-0.9-351.5 0-527.3 0.5-71 47.9-115.9 118.9-116 219.4 0 438.6 0 657.9 0.1 71.1 0 118.5 45 118.8 116.1 0.9 175.8 0.9 351.5 0 527.3-0.4 71.4-47.6 115.9-118.8 116.1-110-0.1-220.2-0.2-330.2-0.2z m3-710.7c-106.5 0-213.1-0.2-319.6 0.1-54.8 0.1-79.3 25.4-79.3 80.3v501.2c0 54.9 24.6 80.2 79.4 80.3 211.4 0.2 422.9 0.1 634.5 0 56.3 0 80.7-25 80.7-81.7V264.5c0-60-23.5-83.9-83.1-83.9-104.4-0.1-208.4 0-312.6 0z m0 0" fill="" ></path><path d="M742.7 529.1c14 12.4 29.1 23.9 41.8 37.4 24.5 26.1 37 57.7 38.5 93.5 0.5 13.9-0.6 27.5-18.7 28.8-17.2 1.2-22.5-9.9-23.8-24.9-2.7-33.4-15.5-62.1-42.1-83.1-69-54.9-169.6-14.6-182.5 72.9-0.5 3.2-0.6 6.6-0.7 9.8-0.7 14.7-5.7 26.6-23 25.2-18.7-1.4-21.4-14.8-20-30.3 3.6-41.8 20.3-77.3 51.7-105.4 9.2-8.2 19.4-15 30.8-23.6-26.1-27.7-42.6-59.4-37.4-98.7 4-29.7 17.8-54.2 41.1-73.4 41.7-34.4 106.7-31.5 146.5 6.4 45 43.1 44.1 101.5-2.2 165.4z m-8.5-84c0.6-35.9-28.8-66.1-65.2-66.8-36.5-0.7-66.9 28-67.9 64.1-1 36.9 29.4 68.2 66.4 68.3 36.2 0.3 66.1-29.2 66.7-65.6z m0 0M219.1 335.6h201.1c11.1 0 20.2 9 20.2 20.2 0 11.1-9 20.2-20.2 20.2H219.1c-11.1 0-20.2-9-20.2-20.2 0-11.1 9.1-20.2 20.2-20.2zM217.8 648.2h202.7c10.8 0 19.6 8.8 19.6 19.6s-8.8 19.6-19.6 19.6H217.8c-10.8 0-19.6-8.8-19.6-19.6 0-10.9 8.8-19.6 19.6-19.6zM217.1 492.9h204.5c10.5 0 18.9 8.5 18.9 18.9 0 10.5-8.5 18.9-18.9 18.9H217.1c-10.5 0-18.9-8.5-18.9-18.9 0-10.4 8.5-18.9 18.9-18.9z" fill="" ></path></symbol><symbol id="icon-pingfen" viewBox="0 0 1024 1024"><path d="M513 96.7L647.9 370l301.5 43.8-218.2 212.7 51.5 300.4L513 785.1 243.3 926.9l51.5-300.4L76.6 413.8 378.1 370z" fill="" ></path></symbol><symbol id="icon-pingfen-xian" viewBox="0 0 1024 1024"><path d="M772.8 928.2c-2.4 0-4.8-0.6-7.1-1.7L513 793.6 260.2 926.5c-5.1 2.7-11.3 2.2-16-1.2-4.7-3.4-7-9.1-6-14.8L286.5 629 82 429.7c-4.1-4-5.6-10.1-3.8-15.6 1.8-5.5 6.5-9.5 12.2-10.3l282.6-41 126.4-256.1c2.6-5.2 7.8-8.5 13.6-8.5s11.1 3.3 13.6 8.5L653 362.8l282.6 41.1c5.7 0.8 10.5 4.8 12.2 10.3 1.8 5.5 0.3 11.5-3.8 15.6L739.5 629l48.3 281.5c1 5.7-1.4 11.4-6 14.8-2.7 1.9-5.8 2.9-9 2.9zM513 761.3c2.4 0 4.9 0.6 7.1 1.7l232.6 122.3-44.4-259c-0.8-4.9 0.8-9.9 4.4-13.4l188.2-183.4-260.1-37.8c-4.9-0.7-9.2-3.8-11.4-8.3L513 147.7 396.7 383.3c-2.2 4.5-6.5 7.6-11.4 8.3l-260.1 37.8 188.2 183.4c3.6 3.5 5.2 8.5 4.4 13.4l-44.4 259L505.9 763c2.2-1.1 4.7-1.7 7.1-1.7z" fill="" ></path></symbol><symbol id="icon-zuoye" viewBox="0 0 1024 1024"><path d="M885.1 268.1l-161.6-189c-3.3-3.8-8-6-13.1-6h-518c-15.2 0-29.6 5.9-40.4 16.7-10.8 10.8-16.7 25.1-16.7 40.4v765.9c0 31.5 25.6 57.1 57.1 57.1H832c31.5 0 57.1-25.6 57.1-57.1V279.3c0.1-4.1-1.4-8-4-11.2zM852 282.3H704.4V109.7L852 282.3z m-19.9 636.6H192.5c-12.5 0-22.7-10.2-22.7-22.7V130.3c0-6.1 2.4-11.8 6.7-16.1 4.3-4.3 10-6.7 16.1-6.7H670v192c0 9.5 7.7 17.2 17.2 17.2h167.6v579.5c0 12.5-10.2 22.7-22.7 22.7z m0 0" fill="" ></path><path d="M726.5 389.2H279.9c-9.5 0-17.2 7.7-17.2 17.2s7.7 17.2 17.2 17.2h446.6c9.5 0 17.2-7.7 17.2-17.2s-7.7-17.2-17.2-17.2z m0 0M726.5 572.1H279.9c-9.5 0-17.2 7.7-17.2 17.2s7.7 17.2 17.2 17.2h446.6c9.5 0 17.2-7.7 17.2-17.2s-7.7-17.2-17.2-17.2z m0 0M726.5 754.9H279.9c-9.5 0-17.2 7.7-17.2 17.2s7.7 17.2 17.2 17.2h446.6c9.5 0 17.2-7.7 17.2-17.2s-7.7-17.2-17.2-17.2z m0 0" fill="" ></path></symbol><symbol id="icon-tishicuowu" viewBox="0 0 1024 1024"><path d="M511.3 64.2c-246.2 0-447.6 201.4-447.6 447.6s201.4 447.6 447.6 447.6S958.9 758 958.9 511.8 757.5 64.2 511.3 64.2z m298.4 522.2H212.9c-44.8 0-74.6-29.8-74.6-74.6s29.8-74.6 74.6-74.6h596.8c44.8 0 74.6 29.8 74.6 74.6s-29.8 74.6-74.6 74.6z m0 0" fill="" ></path></symbol><symbol id="icon-ziyuan" viewBox="0 0 1024 1024"><path d="M508.5 583.3c-12.6 0-24.5-3.9-34.5-11.3L100.7 369.2c-3.8-2-7.2-4.6-10.2-7.6-11-11-17-25.7-16.9-41.3 0.1-15.6 6.2-30.3 17.3-41.3 3.3-3.3 7.2-6.1 11.4-8.3L482.5 79.2c10.1-7.3 22-11.2 34.5-11.2 12 0 23.4 3.6 33.2 10.4l372.9 177.2c4.6 2.2 8.7 5.1 12.3 8.7 11.1 11 17.2 26.4 16.9 42.1-0.3 15.3-6.4 29.7-17.3 40.6-2.8 2.8-6 5.2-9.4 7.2l-381.4 217c-10.3 8-22.7 12.1-35.7 12.1zM517 98.4c-6.3 0-12.2 2-17.2 5.8-0.8 0.6-1.6 1.1-2.4 1.5L116 297.9c-1.3 0.7-2.5 1.5-3.6 2.6-5.3 5.3-8.3 12.4-8.4 19.9 0 7.4 2.8 14.4 8 19.6 0.9 0.9 2 1.8 3.2 2.4l374.3 203.3c0.7 0.4 1.4 0.9 2.1 1.4 4.8 3.7 10.6 5.7 16.8 5.7 6.5 0 12.6-2.1 17.7-6.2 0.6-0.5 1.3-1 2-1.4l382.5-217.7c1.1-0.6 2.1-1.4 3-2.3 5.3-5.3 8.2-12.2 8.4-19.6 0.1-7.5-2.8-14.7-8-20-1.1-1.1-2.4-2-3.9-2.7L535.9 105.3c-0.9-0.4-1.7-0.9-2.5-1.5-4.7-3.5-10.4-5.4-16.4-5.4z" fill="" ></path><path d="M505.9 708.2c-12.4 0-24.6-4-34.5-11.3L98.2 494.1c-10.4-5.7-18-15-21.4-26.4-3.4-11.4-2.1-23.4 3.6-33.8 4-7.4 13.3-10.1 20.7-6.1 7.4 4 10.1 13.3 6.1 20.7-1.8 3.3-2.2 7-1.1 10.6 1.1 3.6 3.4 6.5 6.7 8.3L487 670.7c0.7 0.4 1.4 0.8 2.1 1.3 4.8 3.7 10.6 5.7 16.8 5.7 6.4 0 12.7-2.2 17.7-6.2 0.6-0.5 1.3-0.9 2-1.3l382.5-217.7c3.2-1.8 5.5-4.8 6.5-8.4 1-3.6 0.5-7.3-1.3-10.6-4.2-7.3-1.6-16.6 5.7-20.8 7.3-4.2 16.6-1.6 20.8 5.7 5.9 10.3 7.4 22.3 4.2 33.7-3.1 11.4-10.5 21-20.8 26.8L541.6 696.1c-10.2 7.8-22.8 12.1-35.7 12.1z" fill="" ></path><path d="M505.9 833.4c-12.4 0-24.6-4-34.5-11.3L98.2 619.3c-10.4-5.7-18-15-21.4-26.4-3.4-11.4-2.1-23.4 3.6-33.8 4-7.4 13.3-10.1 20.7-6.1 7.4 4 10.1 13.3 6.1 20.7-1.8 3.3-2.2 7-1.1 10.6 1.1 3.6 3.4 6.5 6.7 8.3L487 795.8c0.7 0.4 1.4 0.8 2.1 1.3 4.8 3.7 10.6 5.7 16.8 5.7 6.4 0 12.7-2.2 17.7-6.2 0.6-0.5 1.3-0.9 2-1.3l382.5-217.7c6.7-3.8 9-12.3 5.2-19-4.2-7.3-1.6-16.6 5.7-20.8 7.3-4.2 16.6-1.6 20.8 5.7 12.1 21.3 4.7 48.4-16.6 60.5L541.6 821.3c-10.2 7.8-22.8 12.1-35.7 12.1z" fill="" ></path><path d="M506 958.5c-0.1 0-0.1 0 0 0-12.4 0-24.6-4-34.5-11.3L98.2 744.4c-21.5-11.7-29.5-38.7-17.8-60.2 4-7.4 13.3-10.1 20.7-6.1 7.4 4 10.1 13.3 6.1 20.7-3.7 6.7-1.2 15.2 5.6 18.9L487 921c0.7 0.4 1.4 0.8 2.1 1.3 4.8 3.7 10.6 5.7 16.8 5.7 6.4 0 12.7-2.2 17.7-6.2 0.6-0.5 1.3-0.9 2-1.3l382.5-217.7c6.7-3.8 9-12.3 5.2-19-4.2-7.3-1.6-16.6 5.7-20.8 7.3-4.2 16.6-1.6 20.8 5.7 12.1 21.3 4.7 48.4-16.6 60.5L541.6 946.4c-10.2 7.8-22.8 12.1-35.6 12.1z" fill="" ></path></symbol><symbol id="icon-tishi" viewBox="0 0 1024 1024"><path d="M512 65.9c-247.1 0-447.3 200.3-447.3 447.3S264.9 960.6 512 960.6s447.3-200.3 447.3-447.3S759.1 65.9 512 65.9z m0.7 760.5c-34.5 0-62.5-26.2-62.5-58.5s28-58.4 62.5-58.4 62.5 26.2 62.5 58.4c0 32.3-28 58.5-62.5 58.5z m112-487.2l-49.6 276.4c0 0.3 0.1 0.6 0.1 0.9 0 32.3-28 58.5-62.5 58.5s-62.5-26.2-62.5-58.5c0-0.3 0.1-0.6 0.1-0.9l-49.7-276.4h0.7c-0.4-3.8-0.7-7.6-0.7-11.5 0-58.1 50.2-105.2 112-105.2 61.9 0 112 47.1 112 105.2 0 3.9-0.3 7.7-0.7 11.5h0.8z m0 0" fill="" ></path></symbol><symbol id="icon-chengyuan" viewBox="0 0 1024 1024"><path d="M375.2 529.5v-0.1c0-11.8-9.5-21.3-21.5-21.3-77.7 0-140.9-67.5-140.9-150.4 0-83 63.1-150.4 140.9-150.4 11.8 0 21.5-9.5 21.5-21.3s-9.5-21.5-21.5-21.5c-101.3 0-183.7 86.7-183.7 193.2 0 70.9 36.5 132.9 90.8 166.6C145.3 565 62 680.4 62 815.8c0 11.8 9.5 21.3 21.3 21.3s21.3-9.5 21.3-21.3c0-146.1 111.7-265 248.9-265 12 0 21.7-9.5 21.7-21.3z" fill="" ></path><path d="M867.5 642.3c-1.8-2-48.2-50.9-104.1-76-23.4-10.5-44.9-17.8-63.1-22.9 74.1-36.6 125.4-112.8 125.4-200.9 0-123.5-100.6-224.1-224.2-224.1-123.7 0-224.2 100.6-224.2 224.1 0 85.4 48.1 159.8 118.5 197.6-146.7 45.2-253.6 182-253.6 343.5 0 11.8 9.5 21.3 21.5 21.3 11.8 0 21.3-9.5 21.3-21.3 0-174.5 142-316.5 315-316.6 2.3 0.3 4.5 0.1 6.7-0.4 2.8-0.1 5.5-0.4 8.3-0.6 1 0 1.8 0.1 2.8 0.1 31.6 0.8 91.6 19.6 127.7 36 55.1 25.1 92.3 70.9 94.3 73.2 50.6 57.8 78.2 130.9 78.2 208.3 0 11.8 9.5 21.3 21.3 21.3s21.3-9.5 21.3-21.3c0.1-90-32.8-175.1-93.1-241.3zM647.3 530.7zM420.1 342.6c0-100.1 81.4-181.4 181.4-181.4s181.4 81.3 181.4 181.4c0 100.1-81.4 181.4-181.4 181.4-99.9 0-181.4-81.4-181.4-181.4z" fill="" ></path></symbol><symbol id="icon-xuanzhuan" viewBox="0 0 1024 1024"><path d="M867.9 777.2c-9.3-7.5-22.9-6-30.4 3.3-77 95.9-196 146-318.1 133.9C320.9 894.7 175.3 717.1 195 518.5c9.5-96.2 56-182.9 130.7-244.2 67.3-55.2 150.4-83.7 236.4-81.9L503 239c-9.4 7.4-11 21-3.6 30.3 4.3 5.4 10.6 8.3 17 8.3 4.7 0 9.4-1.5 13.3-4.6L638 187.9c5.2-4.1 8.3-10.4 8.3-17s-3-12.9-8.3-17L529.8 68.8c-9.4-7.4-23-5.7-30.3 3.6-7.4 9.4-5.8 23 3.6 30.3l59.1 46.5c-96.1-1.8-188.7 30.1-263.8 91.7-83.7 68.6-135.7 165.7-146.4 273.4C141.3 622 173.2 727.4 241.8 811c68.6 83.7 165.7 135.7 273.4 146.3 13.5 1.3 26.9 2 40.3 2 122.2 0 238-55.1 315.7-151.8 7.5-9.3 6-22.9-3.3-30.3z" fill="" ></path></symbol><symbol id="icon-shixun" viewBox="0 0 1024 1024"><path d="M302.1 207.7c-16.5 0-29.8 13.3-29.8 29.8v603.6c0 16.5 13.3 29.8 29.8 29.8s29.8-13.3 29.8-29.8V237.5c0.1-16.5-13.3-29.8-29.8-29.8zM92.9 319.5c-16.5 0-29.8 13.3-29.8 29.8V707c0 16.5 13.3 29.8 29.8 29.8s29.8-13.3 29.8-29.8V349.3c0-16.5-13.3-29.8-29.8-29.8zM511.3 88.5c-16.5 0-29.8 13.3-29.8 29.8v789.9c0 16.5 13.3 29.8 29.8 29.8s29.8-13.3 29.8-29.8V118.3c0-16.5-13.3-29.8-29.8-29.8zM720.5 207.7c-16.5 0-29.8 13.3-29.8 29.8v603.6c0 16.5 13.3 29.8 29.8 29.8s29.8-13.3 29.8-29.8V237.5c0-16.5-13.3-29.8-29.8-29.8zM929.7 319.5c-16.5 0-29.8 13.3-29.8 29.8V707c0 16.5 13.3 29.8 29.8 29.8s29.8-13.3 29.8-29.8V349.3c0-16.5-13.3-29.8-29.8-29.8z" fill="" ></path></symbol><symbol id="icon-suoxiao" viewBox="0 0 1024 1024"><path d="M714.9 537.8h-409c-13.2 0-24-10.7-24-24 0-13.2 10.7-24 24-24h409c13.2 0 24 10.7 24 24 0 13.2-10.8 24-24 24z" fill="" ></path><path d="M510.4 963.4c-247.9 0-449.6-201.7-449.6-449.6S262.5 64.2 510.4 64.2C758.3 64.2 960 265.9 960 513.8S758.3 963.4 510.4 963.4z m0-851.2c-221.5 0-401.6 180.2-401.6 401.6S289 915.4 510.4 915.4 912 735.2 912 513.8 731.9 112.2 510.4 112.2z" fill="" ></path></symbol><symbol id="icon-xiajiantou" viewBox="0 0 1024 1024"><path d="M905.1 237.9c-26-20.5-63.8-16-84.3 10.1L511.4 641.4 202.1 247.9c-20.5-26.1-58.3-30.6-84.3-10.1-26.1 20.5-30.6 58.3-10.1 84.3l356.6 453.5c11.4 14.5 28.8 22.9 47.2 22.9s35.8-8.4 47.2-22.9l356.6-453.5c20.4-26 15.9-63.7-10.2-84.2z" fill="" ></path></symbol><symbol id="icon-gouxuan" viewBox="0 0 1024 1024"><path d="M387.5 805.2c-1.6 0-3.2-0.1-4.8-0.2-17.4-1.3-33.5-9.6-44.5-23.1L81.3 470.7c-22.5-27.2-18.7-67.6 8.6-90.1 27.3-22.5 67.6-18.7 90.1 8.6L394.4 649l458.2-411.4c26.3-23.6 66.7-21.4 90.3 4.9 23.6 26.3 21.4 66.7-4.9 90.3l-507.8 456c-11.7 10.6-27 16.4-42.7 16.4z" fill="" ></path></symbol><symbol id="icon-liulanyan" viewBox="0 0 1024 1024"><path d="M513 201.6c-247.1 0-448.1 139.2-448.1 310.2S265.9 822 513 822s448.1-139.2 448.1-310.2-201-310.2-448.1-310.2z m0 585.9c-228.1 0-413.6-123.7-413.6-275.7S284.9 236.1 513 236.1s413.6 123.7 413.6 275.7S741.1 787.5 513 787.5z" fill="" ></path><path d="M513 356.7c-85.5 0-155.1 69.6-155.1 155.1S427.5 666.9 513 666.9s155.1-69.6 155.1-155.1S598.5 356.7 513 356.7z m0 275.7c-66.5 0-120.6-54.1-120.6-120.6S446.5 391.2 513 391.2s120.6 54.1 120.6 120.6S579.5 632.4 513 632.4z" fill="" ></path></symbol><symbol id="icon-jingyan" viewBox="0 0 1024 1024"><path d="M764.5 63.9H258.2c-72.4 0-131.3 59.9-131.3 133.5v95.7c0 13.2 1.9 26.3 5.7 38.9 1.7 9.1 4.8 17.6 9.2 25.4l300.3 530.7c14.4 25.4 40.2 40.6 69.1 40.6 28.9 0 54.7-15.2 69.1-40.6l300.3-530.7c4.4-7.8 7.5-16.3 9.2-25.4 3.8-12.6 5.7-25.7 5.7-38.9v-95.7c0.2-73.6-58.7-133.5-131-133.5z m93.7 229.2c0 9.8-1.5 19.5-4.4 28.9l-0.6 2.4c-0.9 5.3-2.6 10.1-5.1 14.5L547.8 869.6c-7.7 13.5-21.3 21.6-36.5 21.6s-28.8-8.1-36.5-21.6L174.5 338.9c-2.5-4.4-4.2-9.2-5.1-14.5-0.1-0.8-0.3-1.6-0.6-2.4-2.9-9.4-4.4-19.1-4.4-28.9v-95.7c0-53 42.1-96 93.8-96h506.3c51.7 0 93.8 43.1 93.8 96v95.7z" fill="" ></path><path d="M661.8 347.1c-8.8-5.4-20.4-2.7-25.8 6.1L512.7 552.7 386.6 353c-5.5-8.8-17.1-11.4-25.9-5.8-8.8 5.5-11.4 17.1-5.8 25.9l142.2 225c3.4 5.4 9.4 8.7 15.8 8.7h0.1c6.5 0 12.5-3.4 15.9-8.9l139.1-225c5.4-8.8 2.6-20.4-6.2-25.8z" fill="" ></path></symbol><symbol id="icon-shixunguanqia" viewBox="0 0 1024 1024"><path d="M762.5 64.2h-498C198.8 64.2 145 118 145 183.7v657.5c0 65.7 53.8 119.5 119.5 119.5h498.1c65.7 0 119.5-53.8 119.5-119.5V183.8c0-65.8-53.8-119.6-119.6-119.6z m79.7 777c0 43.9-35.8 79.7-79.7 79.7h-498c-43.9 0-79.7-35.8-79.7-79.7V183.8c0-43.9 35.8-79.7 79.7-79.7h498.1c43.9 0 79.7 35.8 79.7 79.7v657.4z" fill="" ></path><path d="M702.8 303.3H324.2c-11 0-19.9 8.9-19.9 19.9 0 11 8.9 19.9 19.9 19.9h378.5c11 0 19.9-8.9 19.9-19.9 0.1-11-8.8-19.9-19.8-19.9zM623.1 492.6H324.2c-11 0-19.9 8.9-19.9 19.9 0 11 8.9 19.9 19.9 19.9h298.9c11 0 19.9-8.9 19.9-19.9 0-11-8.9-19.9-19.9-19.9zM503.5 681.9H324.2c-11 0-19.9 8.9-19.9 19.9s8.9 19.9 19.9 19.9h179.3c11 0 19.9-8.9 19.9-19.9s-8.9-19.9-19.9-19.9z" fill="" ></path></symbol><symbol id="icon-fabu" viewBox="0 0 1024 1024"><path d="M844.9 443.9c-17.3-136.3-135.7-241.6-274.3-241.6-85.1 0-165.4 39.4-217.7 106.1-17.5-5.6-35.8-8.5-54.4-8.5-98.6 0-178.9 80.2-178.9 178.9 0 2 0 4.1 0.1 6.2-35.7 36.6-55.9 86-55.9 136.9 0 108.2 88.1 196.3 196.3 196.3h502.3c108.2 0 196.3-88.1 196.3-196.3 0.1-75.8-45.2-146-113.8-178z m-82.4 337.6H260.2c-88 0-159.5-71.6-159.5-159.5 0-43.7 18.4-86 50.6-116.2 4.1-3.8 6.2-9.3 5.7-14.9-0.3-3.9-0.5-7.9-0.5-11.9 0-78.3 63.7-142.1 142.1-142.1 18.6 0 36.8 3.6 54 10.6 7.9 3.3 17.1 0.6 22-6.4 45-63.8 118.3-101.9 196.1-101.9 123.4 0 228.3 96.2 238.8 219 0.6 6.9 5.1 12.9 11.5 15.5 60.4 24 101.1 83.6 101.1 148.3-0.1 87.9-71.6 159.5-159.6 159.5z" fill="" ></path><path d="M524.3 465.1c-0.2-0.2-0.5-0.3-0.7-0.5-0.7-0.6-1.4-1.1-2.2-1.6-0.8-0.5-1.5-1-2.3-1.4-0.3-0.1-0.5-0.3-0.7-0.4-0.5-0.2-1.1-0.2-1.7-0.4-0.9-0.3-1.8-0.5-2.7-0.7-0.9-0.1-1.7-0.1-2.6-0.1-0.9 0-1.7 0-2.6 0.1-0.9 0.1-1.8 0.4-2.8 0.7-0.5 0.2-1.1 0.2-1.7 0.4-0.3 0.1-0.5 0.3-0.7 0.4-0.8 0.4-1.6 0.9-2.4 1.4-0.8 0.5-1.5 1-2.2 1.6-0.2 0.2-0.5 0.3-0.7 0.5l-82.7 82.7c-7.2 7.2-7.2 18.8 0 26 7.2 7.2 18.8 7.2 26 0l51.3-51.3v148.6c0 10.2 8.2 18.4 18.4 18.4s18.4-8.2 18.4-18.4V522.5l51.3 51.3c7.2 7.2 18.8 7.2 26 0 7.2-7.2 7.2-18.8 0-26l-82.7-82.7z" fill="" ></path></symbol><symbol id="icon-xiangxiayidong" viewBox="0 0 1024 1024"><path d="M859.7 533.8c-17.6-17.6-46.2-17.6-63.8 0L556.1 773.5V143.3c0-24.9-20.2-45.1-45.1-45.1s-45.1 20.2-45.1 45.1v630.2L226.1 533.8c-17.6-17.6-46.2-17.6-63.8 0-17.6 17.6-17.6 46.2 0 63.8l316.8 316.8 0.1 0.1c0.3 0.3 0.7 0.6 1 1l0.3 0.3c0.3 0.3 0.6 0.5 0.9 0.8 0.1 0.1 0.3 0.2 0.4 0.4 0.3 0.2 0.5 0.4 0.8 0.7 0.2 0.1 0.4 0.3 0.6 0.4 0.2 0.2 0.5 0.4 0.7 0.5 0.2 0.2 0.5 0.3 0.7 0.5 0.2 0.1 0.4 0.3 0.6 0.4 0.3 0.2 0.6 0.4 0.8 0.6 0.2 0.1 0.3 0.2 0.5 0.3 0.3 0.2 0.6 0.4 1 0.6 0.1 0.1 0.3 0.2 0.4 0.2 0.4 0.2 0.7 0.4 1.1 0.6 0.1 0.1 0.2 0.1 0.3 0.2l1.2 0.6c0.1 0 0.2 0.1 0.3 0.1 0.4 0.2 0.9 0.4 1.3 0.6 0.1 0 0.1 0.1 0.2 0.1 0.4 0.2 0.9 0.4 1.4 0.6 0 0 0.1 0 0.1 0.1h0.1c0.5 0.2 0.9 0.4 1.4 0.6 0.1 0 0.1 0 0.2 0.1 0.5 0.2 0.9 0.3 1.4 0.5 0.1 0 0.1 0 0.2 0.1 0.5 0.1 0.9 0.3 1.4 0.4 0.1 0 0.2 0.1 0.3 0.1 0.4 0.1 0.9 0.2 1.3 0.3 0.1 0 0.2 0.1 0.3 0.1l1.2 0.3c0.1 0 0.3 0.1 0.4 0.1 0.4 0.1 0.7 0.1 1.1 0.2 0.2 0 0.4 0.1 0.5 0.1 0.3 0.1 0.7 0.1 1 0.2 0.2 0 0.4 0.1 0.6 0.1 0.3 0 0.6 0.1 0.9 0.1 0.2 0 0.5 0.1 0.7 0.1 0.3 0 0.6 0 0.9 0.1 0.3 0 0.5 0 0.8 0.1h4.8c0.3 0 0.6 0 0.8-0.1 0.3 0 0.5 0 0.8-0.1 0.3 0 0.6-0.1 0.9-0.1 0.3 0 0.5-0.1 0.8-0.1 0.3 0 0.6-0.1 0.9-0.1 0.3 0 0.5-0.1 0.8-0.1 0.3 0 0.6-0.1 0.9-0.2 0.2 0 0.5-0.1 0.7-0.1 0.3-0.1 0.6-0.1 0.9-0.2 0.2-0.1 0.5-0.1 0.7-0.2 0.3-0.1 0.6-0.2 0.9-0.2 0.2-0.1 0.5-0.1 0.7-0.2l0.9-0.3c0.2-0.1 0.4-0.1 0.7-0.2 0.3-0.1 0.6-0.2 1-0.3 0.2-0.1 0.4-0.1 0.6-0.2 0.4-0.1 0.7-0.3 1-0.4 0.2-0.1 0.3-0.1 0.5-0.2s0.3-0.1 0.5-0.2 0.5-0.2 0.7-0.3c0.1-0.1 0.2-0.1 0.4-0.2 0.4-0.2 0.8-0.4 1.2-0.5 0.1 0 0.2-0.1 0.3-0.1l1.2-0.6c0.1 0 0.1-0.1 0.2-0.1 0.4-0.2 0.9-0.5 1.3-0.7l0.1-0.1c0.4-0.3 0.9-0.5 1.3-0.8h0.1c0.5-0.3 0.9-0.6 1.3-0.9 1.4-0.9 2.7-2 4-3 0.4-0.4 0.8-0.7 1.2-1.1l0.1-0.1c0.4-0.3 0.7-0.7 1.1-1l0.1-0.1 316.8-316.8c17.6-17.8 17.6-46.4 0-64z" fill="" ></path></symbol><symbol id="icon-xiangshangyidong" viewBox="0 0 1024 1024"><path d="M511 927.6c-24.9 0-45.1-20.2-45.1-45.1V143.3c0-18.2 11-34.7 27.9-41.7s36.3-3.1 49.2 9.8l316.8 316.8c17.6 17.6 17.6 46.2 0 63.8-17.6 17.6-46.2 17.6-63.8 0L556.1 252.3v630.2c0 24.9-20.2 45.1-45.1 45.1z" fill="" ></path><path d="M511 927.6c-24.9 0-45.1-20.2-45.1-45.1V252.3L226.1 492c-17.6 17.6-46.2 17.6-63.8 0-17.6-17.6-17.6-46.2 0-63.8l316.8-316.8c12.9-12.9 32.3-16.8 49.2-9.8 16.9 7 27.9 23.4 27.9 41.7v739.2c-0.1 24.9-20.3 45.1-45.2 45.1z" fill="" ></path></symbol><symbol id="icon-guanbi" viewBox="0 0 1024 1024"><path d="M147.8 922.6c-12 0-24-4.6-33.2-13.8-18.3-18.3-18.3-48.1 0-66.4L845 112c18.3-18.3 48.1-18.3 66.4 0s18.3 48.1 0 66.4L181 908.8c-9.2 9.2-21.2 13.8-33.2 13.8z" fill="" ></path><path d="M878.2 922.6c-12 0-24-4.6-33.2-13.8L114.6 178.4c-18.3-18.3-18.3-48.1 0-66.4s48.1-18.3 66.4 0l730.4 730.4c18.3 18.3 18.3 48.1 0 66.4-9.2 9.2-21.2 13.8-33.2 13.8z" fill="" ></path></symbol><symbol id="icon-xinjian" viewBox="0 0 1024 1024"><path d="M761.8 928.3h-499c-75.5 0-137-61.4-137-137V235.1c0-75.5 61.4-137 137-137h352.9c14.1 0 25.4 11.4 25.4 25.4S629.7 149 615.7 149H262.8c-47.5 0-86.1 38.6-86.1 86.1v556.2c0 47.5 38.6 86.1 86.1 86.1h499c47.5 0 86.1-38.6 86.1-86.1V378.5c0-14.1 11.4-25.4 25.4-25.4 14.1 0 25.4 11.4 25.4 25.4v412.9c0 75.5-61.4 136.9-136.9 136.9z" fill="" ></path><path d="M519.3 538.7c-5.8 0-11.7-2-16.5-6.1-10.7-9.1-12-25.2-2.9-35.9l331.8-389.6c9.1-10.7 25.2-12 35.9-2.9s12 25.2 2.9 35.9L538.6 529.7c-5 5.9-12.1 9-19.3 9z" fill="" ></path></symbol><symbol id="icon-xiaoxilingdang" viewBox="0 0 1024 1024"><path d="M797.8 567.8c1.8-13.1 2.8-26.3 2.8-39.4v-177c0-158.6-129-287.6-287.6-287.6s-287.6 129-287.6 287.6v177c0 13.1 0.9 26.3 2.8 39.4-59.7 18-102.3 73.6-102.3 137.5 0 79.3 64.5 143.8 143.8 143.8h112.6c10.6 62.7 65.1 110.6 130.7 110.6s120.1-47.9 130.7-110.6h112.6c79.3 0 143.8-64.5 143.8-143.8 0-63.9-42.6-119.4-102.3-137.5zM513 915.5c-41.2 0-75.8-28.2-85.7-66.4h171.4c-9.9 38.1-44.5 66.4-85.7 66.4z m243.3-110.6H269.7c-54.9 0-99.5-44.7-99.5-99.5 0-49.6 37.2-92 86.5-98.6 6.1-0.8 11.6-4.2 15.2-9.2 3.6-5.1 4.8-11.4 3.5-17.4-3.7-17.1-5.6-34.5-5.6-51.7v-177c0-134.2 109.2-243.3 243.3-243.3s243.3 109.2 243.3 243.3v177c0 17.3-1.9 34.7-5.6 51.7-1.3 6-0.1 12.4 3.5 17.4 3.6 5.1 9.1 8.4 15.2 9.2 49.3 6.6 86.5 48.9 86.5 98.6-0.1 54.8-44.8 99.5-99.7 99.5z" fill="" ></path></symbol><symbol id="icon-sousuo" viewBox="0 0 1024 1024"><path d="M463.9 804.4c-194.7 0-353.1-158.4-353.1-353.1S269.2 98.2 463.9 98.2 817 256.6 817 451.3 658.6 804.4 463.9 804.4z m0-651.9c-164.8 0-298.8 134-298.8 298.8s134 298.8 298.8 298.8 298.8-134 298.8-298.8-134-298.8-298.8-298.8z" fill="" ></path><path d="M884.9 926.6c-7.2 0-14.4-2.9-19.8-8.6l-198-210.6c-10.3-10.9-9.7-28.1 1.2-38.4 10.9-10.3 28.1-9.8 38.4 1.2l198 210.6c10.3 10.9 9.7 28.1-1.2 38.4-5.2 5-11.9 7.4-18.6 7.4z" fill="" ></path></symbol><symbol id="icon-tianjiafangda" viewBox="0 0 1024 1024"><path d="M716.1 487H536.8V307.7c0-13.2-10.7-23.8-23.8-23.8s-23.8 10.7-23.8 23.8V487H309.9c-13.2 0-23.8 10.7-23.8 23.8 0 13.2 10.7 23.8 23.8 23.8h179.3v179.3c0 13.2 10.7 23.8 23.8 23.8s23.8-10.7 23.8-23.8V534.6h179.3c13.2 0 23.8-10.7 23.8-23.8 0-13.2-10.6-23.8-23.8-23.8z" fill="" ></path><path d="M513 64.2c-246.2 0-446.6 200.3-446.6 446.6C66.4 757 266.8 957.4 513 957.4c246.2 0 446.6-200.3 446.6-446.6 0-246.2-200.4-446.6-446.6-446.6z m0 845.5c-220 0-398.9-179-398.9-398.9S293 111.9 513 111.9s398.9 179 398.9 398.9S733 909.7 513 909.7z" fill="" ></path></symbol><symbol id="icon-jiangli" viewBox="0 0 1024 1024"><path d="M883.3 285.9h-79.5c7.4-4.1 14.1-8.1 19.4-12.2 30.1-22.7 41.7-69.3 26.9-108.2-7.8-20.5-22-37.2-41.3-48.2-20.9-11.9-46.6-16.8-76.4-14.4-63 5-117.9 22.7-158.8 51.3-23.9 16.7-43.3 37.3-57.7 61-0.7 1.1-1.3 2.2-2 3.3-0.6-1.1-1.3-2.2-2-3.3-14.4-23.8-33.8-44.3-57.7-61-40.8-28.6-95.7-46.4-158.8-51.3-29.9-2.4-55.6 2.5-76.4 14.4-19.2 11-33.5 27.6-41.3 48.2-14.8 39-3.2 85.5 26.9 108.2 5.4 4.1 12.1 8.2 19.6 12.2H138c-15.2 0-27.5 12.3-27.5 27.5V494c0 15.2 12.3 27.5 27.5 27.5h36v334c0 37.4 28.6 67.8 63.6 67.8h546.3c35.1 0 63.6-30.4 63.6-67.8v-334h35.7c15.2 0 27.5-12.3 27.5-27.5V313.5c0.1-15.2-12.2-27.6-27.4-27.6zM736.5 153.7c34.3-2.7 57.7 7.9 66 29.8 7.4 19.5 0.8 41.4-10 49.5-24.5 18.5-95 42.6-128.4 52.9H541.6c25.3-103 131.2-127.2 194.9-132.2z m-501 79.4c-10.8-8.1-17.4-30-9.9-49.5 8.3-21.9 31.8-32.5 66-29.8 63.7 5 169.6 29.2 194.9 132.2H371v-0.1c-39.9-11.1-112.1-35.2-135.5-52.8z m-73.8 103.8H485v133.7H161.7V336.9z m60.7 518.6v-334H485v353.2H237.6c-8.2 0.1-15.2-8.7-15.2-19.2z m576.7 0c0 10.5-6.9 19.3-15.2 19.3H536V521.6h263.1v333.9z m60.8-384.9H536V336.9h135.2v0.2l0.5-0.2h188.1l0.1 133.7z" fill="" ></path></symbol><symbol id="icon-shanchu" viewBox="0 0 1024 1024"><path d="M852.1 272.8c-14.5 0-26.3 11.8-26.3 26.3v476.3c0 72.4-58.9 131.4-131.4 131.4H301.9c-72.4 0-131.4-58.9-131.4-131.4V299.1c0-14.5-11.8-26.3-26.3-26.3s-26.3 11.8-26.3 26.3v476.3c0 101.4 82.5 183.9 183.9 183.9h392.5c101.4 0 183.9-82.5 183.9-183.9V299.1c0.2-14.5-11.6-26.3-26.1-26.3z" fill="" ></path><path d="M288.8 426.9v325.7c0 14.5 11.8 26.3 26.3 26.3s26.3-11.8 26.3-26.3V426.9c0-14.5-11.8-26.3-26.3-26.3s-26.3 11.8-26.3 26.3zM485.1 392.7v394.2c0 14.5 11.8 26.3 26.3 26.3s26.3-11.8 26.3-26.3V392.7c0-14.5-11.8-26.3-26.3-26.3s-26.3 11.8-26.3 26.3zM655 426.9v325.7c0 14.5 11.8 26.3 26.3 26.3s26.3-11.8 26.3-26.3V426.9c0-14.5-11.8-26.3-26.3-26.3S655 412.4 655 426.9zM144.3 230.6h707.9c14.5 0 26.3-11.8 26.3-26.3S866.7 178 852.2 178h-154l-44.8-98.5c-4.3-9.4-13.6-15.4-23.9-15.4H366.9c-10.3 0-19.6 6-23.9 15.4L298.1 178H144.3c-14.5 0-26.3 11.8-26.3 26.3 0 14.6 11.7 26.3 26.3 26.3z m239.5-113.8h228.7l27.9 61.3H355.9l27.9-61.3z" fill="" ></path></symbol><symbol id="icon-yincangbiyan" viewBox="0 0 1024 1024"><path d="M512.8 581.5C331 581.5 161.4 492 70.3 347.7c-9.1-14.3-4.8-33.2 9.5-42.2 14.3-9.1 33.2-4.8 42.2 9.5 80 126.6 229.8 205.2 390.8 205.2S823.5 441.6 903.5 315c9-14.3 27.9-18.6 42.2-9.5 14.3 9 18.6 27.9 9.5 42.2-91.1 144.2-260.6 233.8-442.4 233.8z m0 0" fill="#231815" ></path><path d="M355.2 722.7c-1.8 0-3.5-0.2-5.3-0.4-16.7-2.9-27.8-18.8-24.9-35.4l23.8-136.3c3-16.7 18.7-27.5 35.4-24.9 16.7 2.9 27.8 18.8 24.9 35.4l-23.8 136.3c-2.5 14.8-15.5 25.3-30.1 25.3z m0 0M666.8 722.7c-14.2 0-27-10-29.9-24.4L608.8 562c-3.4-16.5 7.2-32.7 23.8-36.2 16.3-3.3 32.7 7.2 36.2 23.8l28.1 136.3c3.4 16.5-7.2 32.7-23.8 36.2-2.1 0.4-4.2 0.6-6.3 0.6z m0 0M147.4 622c-3.5 0-7.1-0.6-10.5-1.9-15.9-5.8-24.1-23.4-18.3-39.2l49.8-136.4c5.8-15.9 23.4-24.1 39.2-18.3 15.9 5.8 24.1 23.4 18.3 39.2l-49.8 136.4c-4.4 12.5-16.2 20.2-28.7 20.2z m0 0M874.7 644.8c-12.2 0-23.7-7.3-28.5-19.3L792.1 489c-6.2-15.7 1.5-33.5 17.2-39.8 15.7-6.3 33.5 1.4 39.8 17.2l54.1 136.4c6.2 15.7-1.4 33.5-17.2 39.8-3.8 1.5-7.6 2.2-11.3 2.2z m0 0" fill="#231815" ></path></symbol><symbol id="icon-kaisuo" viewBox="0 0 1024 1024"><path d="M28.5 456v-1.5M463.4 376.1v-74.5c0-63.2-46.7-118.8-109.7-124.8-59.1-5.6-110.5 31.3-127.3 83.7-5.1 15.8-19.2 27-35.9 26.8h-1c-24.1-0.4-41.8-23.6-34.8-46.6 24.4-80.5 99.2-139.1 187.6-138.9 107.7 0.2 195.6 93.3 195.6 200.8v73.5h39.2M881 377.6H410.8c-43.3 0-78.4 35.1-78.4 78.4v390.3c0 43.3 35.1 78.4 78.4 78.4H881c43.3 0 78.4-35.1 78.4-78.4V456c-0.1-43.3-35.2-78.4-78.4-78.4zM724.2 651.9c0 43.3-35.1 78.4-78.4 78.4-43.3 0-78.4-35.1-78.4-78.4v-0.8-0.8c0-43.3 35.1-78.4 78.4-78.4 43.3 0 78.4 35.1 78.4 78.4v1.6z" fill="" ></path></symbol><symbol id="icon-guansuo" viewBox="0 0 1024 1024"><path d="M749.4 373.9H710v-78.8c0-108.7-88.2-197-197-197-108.7 0-197 88.2-197 197v78.8h-39.4c-43.5 0-78.8 35.3-78.8 78.8v393.9c0 43.5 35.3 78.8 78.8 78.8h472.7c43.5 0 78.8-35.3 78.8-78.8V452.7c0.1-43.5-35.2-78.8-78.7-78.8zM513 728.5c-43.5 0-78.8-35.3-78.8-78.8s35.3-78.8 78.8-78.8 78.8 35.3 78.8 78.8-35.3 78.8-78.8 78.8z m122.1-354.6H390.9v-78.8c0-67.4 54.8-122.1 122.1-122.1 67.4 0 122.1 54.8 122.1 122.1v78.8z m0 0" fill="" ></path></symbol><symbol id="icon-tpixiaoxitixing" viewBox="0 0 1024 1024"><path d="M104.3 898.8c-5.6 0-11.1-2.3-15-6.5-5-5.4-6.7-13-4.5-20l50.3-160.8C87.4 650.1 62.3 579 62.3 505.2c0-208.2 201.4-377.6 449-377.6s449 169.4 449 377.6-201.4 377.6-449 377.6c-65.5 0-128.6-11.6-187.6-34.4l-214.8 49.9c-1.5 0.3-3 0.5-4.6 0.5z m407-730.3c-225.1 0-408.2 151.1-408.2 336.8 0 67.7 24.4 133.1 70.5 189 4.4 5.3 5.8 12.5 3.7 19.1l-42.9 137.2 186.3-43.3c4.1-0.9 8.3-0.6 12.2 0.9 55.8 22.5 115.9 33.8 178.4 33.8 225.1 0 408.2-151.1 408.2-336.8S736.4 168.5 511.3 168.5z" fill="" ></path><path d="M339.1 513.2m-32.4 0a32.4 32.4 0 1 0 64.8 0 32.4 32.4 0 1 0-64.8 0Z" fill="" ></path><path d="M511.3 513.2m-32.4 0a32.4 32.4 0 1 0 64.8 0 32.4 32.4 0 1 0-64.8 0Z" fill="" ></path><path d="M683.6 513.2m-32.4 0a32.4 32.4 0 1 0 64.8 0 32.4 32.4 0 1 0-64.8 0Z" fill="" ></path></symbol><symbol id="icon-dianzan" viewBox="0 0 1024 1024"><path d="M265.1 387.4H137.7c-38.5 0-69.8 31.3-69.8 69.8v401.6c0 38.6 31.3 69.8 69.8 69.8h127.4V387.4zM943 413.5c-13.3-16.5-33.3-26.1-54.4-26.1H649.2c7.4-15.6 15.5-33.8 22.8-53.3 13.2-34.7 21.7-66.2 25.2-93.8 5-38.8 0.4-71.1-13.8-95.9C658 99.9 610 90.6 574.2 90.6c-38.6 0-71.4 20-97.4 59.3-19.5 29.5-34 67.5-48 104.2-30.7 80.6-54.2 133.4-99 133.4h-1.9 0.7v541.2h472.9c32.7 0 61.1-22.7 68.2-54.7v-0.2l87-401.5c4.6-20.7-0.5-42.3-13.7-58.8z" fill="" ></path></symbol><symbol id="icon-dianzan-xian" viewBox="0 0 1024 1024"><path d="M793.6 934.3H147.8c-45.8-0.1-83.2-37.4-83.2-83.2V460.5c0-45.8 37.4-83.2 83.2-83.2h186.9c33.7 0 55.3-49.7 82-119.9C430.6 220.9 445 183.2 465 153c28.4-42.8 64.5-64.5 107.5-64.5 38.9 0 91.2 10.4 119.5 60 15.5 27.1 20.6 61.7 15.3 102.9-3.6 28-12.2 59.9-25.4 94.8-3.8 10.1-8.1 20.5-12.7 31.2h209.2c25.3 0 49 11.3 64.9 31.1 15.9 19.8 21.8 45.3 16.4 70.1L875 868.1c-0.1 0.4-0.1 0.7-0.2 1-8.5 38.4-41.9 65.2-81.2 65.2zM147.8 407.8c-29 0-52.6 23.7-52.7 52.7v390.7c0 29 23.7 52.6 52.7 52.7h645.8c24.6 0 45.6-16.6 51.2-40.5 0-0.3 0.1-0.6 0.1-0.8L929.5 472c3.5-15.7-0.3-31.9-10.4-44.4s-25-19.7-41.1-19.7H645.3c-5.2 0-10.1-2.7-12.9-7.1-2.8-4.4-3.1-10-0.9-14.7 8.3-17.4 15.6-34.5 21.7-50.7 12.4-32.6 20.4-62.2 23.7-87.8 4.5-34.4 0.6-62.6-11.5-83.8-21.1-36.9-62.2-44.6-93-44.6-32.1 0-59.7 17.1-82.1 50.8-18.1 27.3-31.9 63.4-45.2 98.4C413 352.7 387.9 408 334.6 408H147.8z" fill="" ></path><path d="M317.6 935.6c-8.4 0-15.3-6.8-15.3-15.3V392.5c0-8.4 6.8-15.3 15.3-15.3 8.4 0 15.3 6.8 15.3 15.3v527.8c0 8.5-6.9 15.3-15.3 15.3z" fill="" ></path></symbol><symbol id="icon-fanhuishangcidaima" viewBox="0 0 1024 1024"><path d="M909.3 868.7s-8.1 20.8-18.9 0c0 0-120.6-361.5-414.6-270.5v112.2s-4.7 65.9-62.7 23L124 485.6s-61.3-33.2 3.7-78.4l292.2-249.3s44-31.1 54.5 19.9l0.4 121.1s548 26.1 434.5 569.8z m0 0" fill="" ></path></symbol><symbol id="icon-zhongzhi" viewBox="0 0 1024 1024"><path d="M882.2 527.3c0-78.3-23.6-151-63.9-210.9-0.6-1-1-2.1-1.5-3-5.2-7.4-10.6-14.2-16-21.2-0.6-0.8-1.3-1.7-1.8-2.6-37-45.8-83.4-81.4-135.7-104.7-1.6-0.6-2.9-1.4-4.4-2-8.4-3.6-17-6.6-25.7-9.7-3-1-6.1-2.2-9.2-3.2-7.6-2.4-15.1-4.2-22.8-6.1-4.2-1-8.6-2.1-12.8-3-2.1-0.4-4.1-1-6.2-1.5-5.7-1-11.4-1.5-17.2-2.3-4.1-0.5-7.9-1.1-11.9-1.5-9.7-1-19.3-1.4-28.8-1.5-1.8 0-3.5-0.3-5.2-0.3-0.3 0-0.6 0.1-0.9 0.1-73.7 0.1-145.7 22.9-207.4 67.5-19.6 14.1-24.5 42.1-10.7 62.4 13.7 20.1 41 25.2 60.7 10.9 47.6-34.3 103.3-51.6 160.3-51.2 8.2 0.1 16.4 0.5 24.3 1.3 2.5 0.2 4.8 0.6 7.3 1 6.5 0.8 13 1.7 19.6 3.2 2.8 0.5 5.6 1.3 8.3 1.9 6.4 1.5 12.5 3 18.7 4.9 2.1 0.6 3.9 1.3 5.7 2.1 7.1 2.4 14 4.8 20.7 7.8 0.8 0.2 1.4 0.8 2.1 1 40.7 18 76.3 45.5 104.2 80.2 0.1 0.1 0.2 0.4 0.4 0.6 39.1 49 62.7 111.6 62.7 179.7h-72.8l116.4 179.2 116.1-179.2h-72.6zM665.5 731.4c-48 34.6-104.3 51.8-161.8 51.2-7.6-0.1-15.1-0.7-22.6-1.3-3.1-0.3-6-0.8-9.1-1.3-5.9-0.8-11.8-1.5-17.5-2.8-3.6-0.6-7.1-1.7-10.5-2.5-5.6-1.3-11.3-2.6-16.7-4.2-2.6-1-5-1.9-7.7-3-6.4-2.1-12.7-4.3-18.8-6.9-1.4-0.6-2.8-1.2-4-1.7-7.1-3.4-14.2-6.8-21-10.5-0.3-0.2-0.6-0.3-0.9-0.5-23.2-13.1-44.3-29.2-62.9-48.4-0.3-0.3-0.6-0.7-0.9-1-5.7-5.9-11.3-12.1-16.5-18.7-1.1-1.4-2.1-2.7-3.3-4.2-37.6-48.4-60.3-109.8-60.3-176.5h72.7L187.4 319.9 71.1 499h72.6c0 78.4 23.9 151.2 64.4 211.5 0.5 0.9 0.8 1.9 1.4 2.6 4.2 6.2 8.9 11.9 13.3 17.6 1.8 2.1 3.3 4.2 5 6.6 6.5 8.1 13.7 15.9 20.8 23.5 0.8 0.8 1.4 1.4 2 2.1 24.4 25.1 51.7 46 81.7 63 0.8 0.5 1.5 0.8 2.4 1.4 8.6 4.7 17.5 9.2 26.4 13.1 2.3 1 4.4 2.1 6.6 3 7.7 3.4 15.6 6.1 23.5 9 3.8 1.4 7.4 2.6 11.3 3.9 6.9 2.1 14 3.9 21.2 5.5 4.7 1.2 9.4 2.4 14.2 3.4 2 0.5 3.8 1.2 5.8 1.4 6.8 1.3 13.5 1.9 20.2 2.8 2.5 0.5 4.9 0.9 7.3 1.2 12.1 1.2 24.2 2 36.3 2 73.8 0 145.9-23.2 207.7-67.6 19.7-14.2 24.5-42.2 10.8-62.3-13.7-20.8-40.8-25.6-60.5-11.3z" fill="" ></path></symbol><symbol id="icon-zhengyan" viewBox="0 0 1024 1024"><path d="M512 797.1c-250.9 0-447.4-125.3-447.4-285.3S261.1 226.5 512 226.5s447.4 125.3 447.4 285.3S762.9 797.1 512 797.1z m0-515.5c-216.3 0-392.3 103.3-392.3 230.2 0 126.9 176 230.2 392.3 230.2s392.3-103.3 392.3-230.2c0-126.9-176-230.2-392.3-230.2z" fill="" ></path><path d="M512 626.9c-95.4 0-170.1-50.6-170.1-115.1S416.6 396.7 512 396.7s170.1 50.5 170.1 115.1S607.4 626.9 512 626.9z m0-175.1c-67.8 0-115 31.6-115 59.9 0 28.4 47.2 60 115 60s115-31.6 115-60c0-28.3-47.2-59.9-115-59.9z" fill="" ></path></symbol><symbol id="icon-expand" viewBox="0 0 1024 1024"><path d="M504.571429 603.428571q0 7.428571-5.714286 13.142857l-189.714286 189.714286 82.285714 82.285714q10.857143 10.857143 10.857143 25.714286t-10.857143 25.714286-25.714286 10.857143l-256 0q-14.857143 0-25.714286-10.857143t-10.857143-25.714286l0-256q0-14.857143 10.857143-25.714286t25.714286-10.857143 25.714286 10.857143l82.285714 82.285714 189.714286-189.714286q5.714286-5.714286 13.142857-5.714286t13.142857 5.714286l65.142857 65.142857q5.714286 5.714286 5.714286 13.142857zm446.285714-493.714286l0 256q0 14.857143-10.857143 25.714286t-25.714286 10.857143-25.714286-10.857143l-82.285714-82.285714-189.714286 189.714286q-5.714286 5.714286-13.142857 5.714286t-13.142857-5.714286l-65.142857-65.142857q-5.714286-5.714286-5.714286-13.142857t5.714286-13.142857l189.714286-189.714286-82.285714-82.285714q-10.857143-10.857143-10.857143-25.714286t10.857143-25.714286 25.714286-10.857143l256 0q14.857143 0 25.714286 10.857143t10.857143 25.714286z"  ></path></symbol><symbol id="icon-compress" viewBox="0 0 1024 1024"><path d="M512 548.571429v256q0 14.857143-10.857143 25.714285t-25.714286 10.857143-25.714285-10.857143l-82.285715-82.285714-189.714285 189.714286q-5.714286 5.714286-13.142857 5.714285t-13.142858-5.714285L86.285714 872.571429q-5.714286-5.714286-5.714285-13.142858t5.714285-13.142857l189.714286-189.714285-82.285714-82.285715q-10.857143-10.857143-10.857143-25.714285t10.857143-25.714286 25.714285-10.857143h256q14.857143 0 25.714286 10.857143t10.857143 25.714286z m431.428571-384q0 7.428571-5.714285 13.142857l-189.714286 189.714285 82.285714 82.285715q10.857143 10.857143 10.857143 25.714285t-10.857143 25.714286-25.714285 10.857143H548.571429q-14.857143 0-25.714286-10.857143t-10.857143-25.714286V219.428571q0-14.857143 10.857143-25.714285t25.714286-10.857143 25.714285 10.857143l82.285715 82.285714 189.714285-189.714286q5.714286-5.714286 13.142857-5.714285t13.142858 5.714285l65.142857 65.142857q5.714286 5.714286 5.714285 13.142858z"  ></path></symbol><symbol id="icon-liwu" viewBox="0 0 1137 1024"><path d="M1135.142452 361.58628c0-57.196057-46.96342-103.728338-104.689952-103.728338l-30.177676 0c17.059174-26.554471 26.182729-57.38756 26.182729-89.711715 0.003072-44.940856-17.691033-87.18735-49.821636-118.9585-32.078374-31.719945-74.707875-49.187728-120.035835-49.187728-43.922918 0-84.252328 19.345951-119.868909 57.499185-23.783302 25.479184-45.446753 59.392715-64.514154 100.969459-17.11345-5.294509-35.72411-8.054412-54.706511-8.054412-19.031558 0-37.644265 2.754783-54.716752 8.042123-19.069449-41.573671-40.729827-75.481058-64.511081-100.95717-35.615557-38.153234-75.943943-57.499185-119.864813-57.499185-77.72892 0-145.290745 52.34088-164.2967 127.28327-1.192033 4.699517-0.407585 9.682704 2.171056 13.788253 2.578641 4.105549 6.726177 6.977077 11.476898 7.944836 12.89218 2.625749 26.425436 6.186485 40.225978 10.582873 4.684155 1.493113 9.778968 0.972879 14.065779-1.435764 4.286811-2.408643 7.38159-6.48859 8.543924-11.265937 9.871136-40.558805 46.122648-68.885964 88.156133-68.885964 55.479694 0 97.333964 76.670018 119.09163 127.878262-3.066104 6.287869-5.029271 13.069347-5.858779 20.262505-0.098312 0.412705-0.183311 0.830531-0.252948 1.251429-0.247828 1.030227-0.650293 2.929901-0.650293 5.285292 0 8.050316 1.776784 15.914249 5.246377 23.433066-25.727012-0.641076-70.702687-10.009387-142.334217-49.166222C284.052714 168.690016 218.537007 149.286716 159.276399 149.286716c-96.788128 0-144.740812 51.962993-150.014839 58.040925-0.124938 0.142348-0.247828 0.287767-0.36867 0.434211-6.680093 8.138387-9.757462 18.377169-8.66579 28.832031 1.093721 10.46408 6.2254 19.853896 14.460051 26.446942 6.997559 5.595589 15.792383 8.677055 24.765398 8.677055 11.874242 0 23.001927-5.234088 30.541226-14.360715 1.476728-1.69793 27.368617-30.395806 87.911377-30.395806 45.805182 0 98.956111 16.367918 157.964795 48.641892 71.328402 39.079005 133.05705 58.892962 183.469581 58.892962 6.2254 0 12.604413-0.403489 19.568177-1.251429 2.877673 1.943709 6.318592 3.038454 9.925412 3.038454l49.222547 0 0 136.466222L178.781083 472.749461l0-111.231794c0-13.914215 11.567017-25.234428 25.785385-25.234428l144.292264 0c0.00512 0 0.011265-0.001024 0.017409 0 9.792281 0 17.730972-7.938691 17.730972-17.730972 0-7.363156-4.487531-13.677652-10.876785-16.357677-16.577855-7.68267-30.463396-14.64029-43.685331-21.891821-14.312583-7.804536-28.696852-14.717096-43.974122-21.130928-2.173104-0.912458-4.505965-1.382512-6.863404-1.382512L204.566468 257.789329c-57.72858 0-104.694048 46.532281-104.694048 103.728338l0 171.927142c0 9.792281 7.938691 17.730972 17.730972 17.730972l47.506184 0 0 369.091784c0 57.198105 46.966492 103.732434 104.695072 103.732434l695.545875 0c57.729604 0 104.695072-46.533305 104.695072-103.732434L1070.045595 551.387766l47.714073 0c4.708733 0 9.223915-1.873048 12.550137-5.205414 3.326221-3.332366 5.190052-7.852668 5.180836-12.561401L1135.142452 361.58628zM991.000729 551.241323l0 369.094857c0 13.915239-11.53527 25.234428-25.715747 25.234428L656.963304 945.570607 656.963304 551.241323 991.000729 551.241323zM1056.309571 361.58628l0 111.231794L657.03499 472.818074l0-136.465198 373.488173 0C1044.74153 336.352877 1056.309571 347.67309 1056.309571 361.58628zM652.285293 232.670622c-8.512177 2.07172-20.320878 3.739951-34.773761 3.739951-5.044633 0-10.108723-0.226322-15.126729-0.674871-1.922204-2.101418-4.027718-3.939647-6.311423-5.506494 6.261243-0.809026 13.444161-1.321067 21.438152-1.321067C631.962367 228.909166 643.773115 230.586614 652.285293 232.670622zM856.257015 78.012591c50.15139 0 90.953927 40.247484 90.953927 89.717859 0 49.468327-40.802537 89.713763-90.953927 89.713763L738.192539 257.444213c3.771698-7.893631 5.729744-16.221474 5.729744-24.753109 0-9.199337-2.292922-18.360783-6.695454-26.944647C759.002929 154.539238 800.831597 78.012591 856.257015 78.012591zM578.125302 551.241323l0 394.330309L269.804648 945.571631c-14.179453 0-25.715747-11.320213-25.715747-25.234428L244.088901 551.241323 578.125302 551.241323z"  ></path></symbol><symbol id="icon-dianzan1" viewBox="0 0 1024 1024"><path d="M281.504 367.754v0c0 0 31.971-1.032 31.971 31.971v446.554c0 0 0 18.563-22.688 18.563h-109.317c0 0-26.814 0-26.814-26.814l-25.782-444.491c0 0 0-25.782 26.813-25.782h125.818zM841.501 367.754v0c0 0 53.628-5.156 53.628 50.533 0 0 0 102.099-78.379 368.174 0 0-24.751 78.379-54.659 78.379h-315.578c-22.688 0-78.379-15.47-78.379-56.722v-440.365c0 0 155.726-92.817 155.726-240.293 5.156-7.219-7.219-53.627 51.565-53.627 0 0 137.163-8.249 55.69 293.921h210.385zM571.3 113.024c14.438 4.125 26.814 19.596 31.971 30.939 30.939 62.909 7.219 150.571-9.282 213.479l-6.188 21.657c-6.187 23.72 0 26.814 25.782 26.814h208.323c26.814 0 34.033 9.282 31.971 38.159-2.063 18.563-5.156 28.878-8.249 44.347-16.501 88.692-41.252 201.104-67.034 286.702-15.47 49.503-36.096 50.534-81.472 50.534h-242.356c-38.159 0-48.471-26.813-48.471-56.722v-382.612c88.692-44.347 154.695-157.789 156.758-252.669 1.032-5.156 1.032-9.282 2.063-15.47 0-1.032 0-3.094 0-4.125 2.063-1.032 4.125-1.032 6.188-1.032zM169.093 406.944h105.193v418.708h-81.472l-23.72-418.708z"  ></path></symbol><symbol id="icon-dianzan11" viewBox="0 0 1024 1024"><path d="M890.908 429.534c-20.66-26.05-51.585-40.99-84.84-40.99l-189.34 0c10.34-28.83 17.18-60.165 19.615-90.48 3.785-47.147-3.465-89.02-20.955-121.095-21.53-39.46-58.18-64.072-105.997-71.177-21.662-3.22-40.292 0.945-55.377 12.372-30.495 23.102-36.092 67.065-42.575 117.97-5.182 40.692-11.055 86.817-30.79 119.877-13.172 22.065-38.807 51.397-109.092 51.397l-73.345 0c-48.842 0-88.58 39.722-88.58 88.545l0 334.754c0 48.82 39.737 88.545 88.58 88.545l534.336 0c24.33 0 48.22-8.325 67.275-23.43 19.06-15.11 32.605-36.475 38.145-60.155l73.52-314.264C919.058 489.054 911.553 455.569 890.908 429.534zM168.672 830.708 168.672 495.956c0-16.27 13.252-29.505 29.537-29.505l62.232 0 0 393.762-62.232 0C181.925 860.213 168.672 846.978 168.672 830.708zM853.998 507.956l-73.52 314.272c-5.23 22.36-24.94 37.985-47.93 37.985L319.484 860.213 319.484 462.169c49.877-9.52 87.4-34.92 111.86-75.895 26.05-43.64 32.75-96.257 38.662-142.68 2.67-20.977 5.193-40.79 9.2-55.99 4.297-16.302 8.745-21.08 10.457-22.377 1.96-1.485 5.677-1.835 11.05-1.035 29.615 4.4 50.175 17.83 62.84 41.052 25.99 47.642 14.505 128.052-10.265 182.86-5.93 13.127-4.83 28.167 2.96 40.232 7.78 12.052 21.01 19.247 35.395 19.247l214.424 0c15.125 0 29.185 6.792 38.58 18.637C854.028 478.049 857.438 493.261 853.998 507.956z"  ></path></symbol><symbol id="icon-gift" viewBox="0 0 1024 1024"><path d="M85.930667 950.016c0 24.576 7.125333 31.317333 29.44 31.317333l353.365333 0L468.736 511.744 85.930667 511.744 85.930667 950.016zM555.264 981.333333l353.365333 0c22.357333 0 29.44-6.698667 29.44-31.317333L938.069333 511.744l-382.848 0L555.221333 981.333333zM938.666667 256l-213.333333 0c51.498667-11.733333 105.898667-49.706667 112.597333-94.293333 7.850667-50.858667-52.565333-127.957333-125.653333-118.186667-87.424 12.117333-151.509333 89.258667-196.736 149.077333C470.656 133.930667 412.16 65.408 328.362667 45.482667c-81.152-19.2-136.746667 64.938667-135.253333 116.992C194.56 206.72 245.717333 244.309333 298.666667 256L85.333333 256C58.965333 256 42.666667 270.848 42.666667 298.666667l0 170.581333L469.333333 469.333333 469.333333 256l85.333333 0 0 213.333333 426.666667-0.085333L981.333333 298.666667C981.333333 270.848 964.992 256 938.666667 256zM251.648 178.176C236.885333 161.749333 246.869333 139.434667 256.128 122.581333c17.024-29.696 40.746667-47.744 81.152-30.933333 56.32 23.509333 97.792 73.216 131.584 117.802667C397.312 217.344 290.56 220.416 251.648 178.176zM562.944 208.682667c34.816-44.629333 75.221333-89.941333 131.157333-117.802667 58.581333-28.970667 113.024 49.322667 85.205333 86.912-21.418667 28.544-89.258667 31.232-125.909333 32.853333C623.317333 212.181333 592.896 211.456 562.944 208.682667z"  ></path></symbol><symbol id="icon-xiaoxi" viewBox="0 0 1879 1024"><path d="M1465.119075 459.616185H1244.189595c-25.008092 0-45.428902 20.716763-45.428901 46.168786v14.353757c0 25.452023 20.272832 46.168786 45.428901 46.168786H1464.971098c25.156069 0 45.428902-20.716763 45.428902-46.168786v-14.353757c0-25.452023-20.124855-46.168786-45.280925-46.168786zM952.675145 63.334104c-68.661272 55.343353-212.494798 133.031214-315.930636 207.759538h-0.147977c-1.183815 0.739884-2.36763 4.883237-3.551445 5.623121-12.282081 6.954913-17.757225 26.191908-84.198844 26.191908h-129.627746c-33.294798 0-54.011561 15.833526-54.011561 51.495953v316.670521c0 35.662428 18.94104 53.271676 54.011561 53.271676h130.071676c66.145665 0 71.472832 19.236994 83.606937 26.191907 1.183815 0.591908 2.36763 4.883237 3.551445 5.475145l0.147977 0.147977c100.180347 74.580347 244.901734 158.33526 315.930636 211.606936 21.308671 15.981503 92.485549 44.09711 92.485549-54.899422v-799.075144c0.147977-98.996532-71.620809-67.32948-92.337572-50.460116z m203.912138 218.265896c11.83815 21.012717 34.922543 26.339884 51.939885 11.83815l181.56763-155.375722c17.017341-14.501734 21.160694-43.209249 9.47052-64.221966l-6.510983-11.83815c-11.690173-21.012717-35.07052-26.339884-51.939884-11.83815L1159.398844 205.391908c-17.017341 14.501734-21.160694 43.209249-9.47052 64.369942l6.658959 11.83815z m233.507515 607.29711L1208.527168 733.669364c-17.017341-14.501734-40.249711-9.174566-51.939885 11.690174l-6.658959 11.83815c-11.83815 21.012717-7.546821 49.720231 9.47052 64.369942l181.56763 155.227746c17.017341 14.501734 40.249711 9.322543 51.939884-11.690174l6.65896-11.83815c11.690173-21.012717 7.398844-49.868208-9.47052-64.369942z" fill="#212121" ></path></symbol><symbol id="icon-chexiao" viewBox="0 0 1024 1024"><path d="M530.496 371.072h-6.144V234.368c0-51.136-29.312-72.448-65.472-43.328L122.816 461.376c-36.096 28.992-36.096 76.48 0.128 105.472l333.504 267.648c36.16 28.992 67.968-0.448 67.968-43.584v-144.256h50.496c145.856 0 257.152 62.976 325.248 184.576 13.376 22.08 27.456 17.28 27.456 0-2.944-216.576-186.368-460.16-397.12-460.16z"  ></path></symbol><symbol id="icon-wenjianjia" viewBox="0 0 1024 1024"><path d="M957.3 431.6v-56.7c0-57.8-47-104.8-104.8-104.8H510.1v-46.8c0-57.8-47-104.8-104.8-104.8H172.6c-57.8 0-104.8 47-104.8 104.8v208.3h889.5zM67.8 501.2v304.5c0 57.8 47 104.8 104.8 104.8h680c57.8 0 104.8-47 104.8-104.8V501.2H67.8z"  ></path></symbol></svg>',l=(c=document.getElementsByTagName("script"))[c.length-1].getAttribute("data-injectcss");if(l&&!z.__iconfont__svg__cssinject__){z.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(c){console&&console.log(c)}}!function(c){if(document.addEventListener)if(~["complete","loaded","interactive"].indexOf(document.readyState))setTimeout(c,0);else{var l=function(){document.removeEventListener("DOMContentLoaded",l,!1),c()};document.addEventListener("DOMContentLoaded",l,!1)}else document.attachEvent&&(h=c,i=z.document,t=!1,(o=function(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(o,50)}a()})(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,a())});function a(){t||(t=!0,h())}var h,i,t,o}(function(){var c,l,a,h,i,t;(c=document.createElement("div")).innerHTML=o,o=null,(l=c.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",a=l,(h=document.body).firstChild?(i=a,(t=h.firstChild).parentNode.insertBefore(i,t)):h.appendChild(a))})}(window);
\ No newline at end of file
+!function(z){var c,o='<svg><symbol id="icon-duohanggongshi" viewBox="0 0 1024 1024"><path d="M665.6 477.866667h17.066667v-113.777778H295.822222l193.422222 227.555555-216.177777 216.177778h409.6l34.133333-130.844444h-22.755556c0 11.377778-5.688889 17.066667-11.377777 28.444444s-17.066667 17.066667-28.444445 22.755556H426.666667l164.977777-164.977778-136.533333-159.288889H597.333333c22.755556 5.688889 45.511111 11.377778 56.888889 22.755556 5.688889 17.066667 11.377778 34.133333 11.377778 51.2z" fill="#666666" ></path><path d="M807.822222 1012.622222H233.244444c-62.577778 0-119.466667-51.2-119.466666-119.466666V147.911111C113.777778 85.333333 164.977778 28.444444 233.244444 28.444444h443.733334l244.622222 233.244445v637.155555c0 62.577778-51.2 113.777778-113.777778 113.777778zM233.244444 85.333333c-34.133333 0-62.577778 28.444444-62.577777 62.577778v750.933333c0 34.133333 28.444444 62.577778 62.577777 62.577778h574.577778c34.133333 0 62.577778-28.444444 62.577778-62.577778V284.444444L654.222222 85.333333H233.244444z" fill="#666666" ></path><path d="M898.844444 301.511111h-176.355555c-45.511111 0-85.333333-39.822222-85.333333-85.333333V56.888889h56.888888v159.288889c0 17.066667 11.377778 28.444444 28.444445 28.444444h176.355555v56.888889z" fill="#666666" ></path></symbol><symbol id="icon-hangneigongshi" viewBox="0 0 1024 1024"><path d="M907.946667 259.413333h34.133333V0H54.613333l443.733334 525.653333L0 1024h942.08l81.92-307.2h-54.613333c0 20.48-13.653333 40.96-27.306667 68.266667s-34.133333 40.96-68.266667 47.786666H348.16l382.293333-375.466666-327.68-375.466667h327.68c61.44 6.826667 102.4 27.306667 129.706667 54.613333 34.133333 34.133333 47.786667 75.093333 47.786667 122.88z" fill="#666666" ></path></symbol><symbol id="icon-quxiaozhiding" viewBox="0 0 1024 1024"><path d="M480.492308 866.461538c-31.507692 0-63.015385-15.753846-86.646154-31.507692v-7.876923L86.646154 488.369231C70.892308 464.738462 55.138462 433.230769 55.138462 401.723077c0-31.507692 15.753846-63.015385 39.384615-78.769231 23.630769-15.753846 47.261538-31.507692 78.769231-31.507692h102.4V157.538462c0-63.015385 55.138462-118.153846 118.153846-118.153847h228.430769c63.015385 0 118.153846 55.138462 118.153846 118.153847v133.907692h78.769231c63.015385 0 118.153846 55.138462 118.153846 118.153846 0 31.507692-15.753846 63.015385-31.507692 86.646154l-338.707692 338.707692c-23.630769 23.630769-55.138462 39.384615-86.646154 31.507692zM173.292308 370.215385c-7.876923 0-15.753846 0-23.63077 7.876923-15.753846 15.753846-15.753846 39.384615 0 55.138461l307.2 338.707693c7.876923 15.753846 15.753846 15.753846 23.63077 15.753846 15.753846 0 23.630769 0 31.507692-7.876923l338.707692-338.707693c7.876923-7.876923 7.876923-15.753846 7.876923-31.507692 0-23.630769-15.753846-39.384615-39.384615-39.384615h-157.538462V157.538462c0-23.630769-15.753846-39.384615-39.384615-39.384616H401.723077c-23.630769 0-39.384615 15.753846-39.384615 39.384616v212.676923H173.292308zM913.723077 992.492308H102.4c-23.630769 0-39.384615-15.753846-39.384615-39.384616s15.753846-39.384615 39.384615-39.384615h811.323077c23.630769 0 39.384615 15.753846 39.384615 39.384615s-23.630769 39.384615-39.384615 39.384616z" fill="#979797" ></path></symbol><symbol id="icon-zhiding1" viewBox="0 0 1024 1024"><path d="M622.276923 984.615385H401.723077c-70.892308 0-118.153846-55.138462-118.153846-118.153847V732.553846H173.292308c-31.507692 0-55.138462-7.876923-78.769231-31.507692-47.261538-39.384615-47.261538-118.153846-7.876923-165.415385L393.846154 196.923077c23.630769-23.630769 55.138462-39.384615 86.646154-39.384615 31.507692 0 63.015385 15.753846 86.646154 31.507692l338.707692 338.707692c23.630769 23.630769 31.507692 55.138462 31.507692 86.646154 0 63.015385-55.138462 118.153846-118.153846 118.153846h-78.769231V866.461538c0 63.015385-47.261538 118.153846-118.153846 118.153847zM480.492308 236.307692c-7.876923 0-15.753846 0-23.63077 7.876923L149.661538 590.769231c-7.876923 7.876923-15.753846 15.753846-15.753846 23.630769 0 7.876923 7.876923 23.630769 15.753846 23.630769 7.876923 15.753846 15.753846 15.753846 23.63077 15.753846h181.16923V866.461538c0 23.630769 15.753846 39.384615 39.384616 39.384616h228.430769c23.630769 0 39.384615-15.753846 39.384615-39.384616V653.784615h157.538462c23.630769 0 39.384615-15.753846 39.384615-39.384615 0-7.876923-7.876923-23.630769-7.876923-31.507692L512 244.184615c-7.876923-7.876923-15.753846-15.753846-31.507692-7.876923zM913.723077 110.276923H102.4C78.769231 110.276923 63.015385 94.523077 63.015385 70.892308s15.753846-39.384615 39.384615-39.384616h811.323077c23.630769 0 39.384615 15.753846 39.384615 39.384616s-23.630769 39.384615-39.384615 39.384615z" fill="#979797" ></path></symbol><symbol id="icon-xinjianjianliwodejianli" viewBox="0 0 1024 1024"><path d="M698.181818 1000.727273H139.636364c-79.127273 0-139.636364-60.509091-139.636364-139.636364V139.636364c0-79.127273 60.509091-139.636364 139.636364-139.636364h712.145454c79.127273 0 139.636364 60.509091 139.636364 139.636364v595.781818L698.181818 1000.727273zM139.636364 93.090909c-27.927273 0-46.545455 18.618182-46.545455 46.545455v721.454545c0 27.927273 18.618182 46.545455 46.545455 46.545455h521.309091l237.381818-214.109091V139.636364c0-27.927273-18.618182-46.545455-46.545455-46.545455H139.636364z" fill="#4CADFF" ></path><path d="M735.418182 907.636364h-69.818182v-181.527273c0-46.545455 37.236364-83.781818 83.781818-83.781818h153.6v69.818182H744.727273c-4.654545 0-9.309091 4.654545-9.309091 9.30909v186.181819zM451.490909 735.418182H279.272727c-18.618182 0-37.236364-13.963636-37.236363-37.236364s13.963636-37.236364 37.236363-37.236363h172.218182c18.618182 0 37.236364 13.963636 37.236364 37.236363s-13.963636 37.236364-37.236364 37.236364zM730.763636 539.927273H279.272727c-18.618182 0-37.236364-13.963636-37.236363-37.236364s18.618182-32.581818 37.236363-32.581818h451.490909c18.618182 0 37.236364 13.963636 37.236364 37.236364s-13.963636 32.581818-37.236364 32.581818zM730.763636 344.436364H279.272727c-18.618182 0-37.236364-13.963636-37.236363-37.236364s18.618182-32.581818 37.236363-32.581818h451.490909c18.618182 0 37.236364 13.963636 37.236364 37.236363s-13.963636 32.581818-37.236364 32.581819z" fill="#4CADFF" ></path></symbol><symbol id="icon-huifu" viewBox="0 0 1024 1024"><path d="M512 992H166.4c-44.8-6.4-70.4-51.2-64-96 19.2-96 12.8-121.6 12.8-121.6-12.8-25.6-32-51.2-44.8-83.2C44.8 640 32 576 32 512 32 249.6 249.6 32 512 32s480 217.6 480 480-217.6 480-480 480z m0-896C281.6 96 96 281.6 96 512c0 57.6 12.8 108.8 32 160 12.8 25.6 25.6 51.2 38.4 70.4 12.8 19.2 19.2 51.2-6.4 166.4 0 6.4 6.4 19.2 12.8 19.2H512c230.4 0 416-185.6 416-416S742.4 96 512 96z" fill="#4AACFF" ></path><path d="M288 512m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#48ACFF" ></path><path d="M512 512m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#48ACFF" ></path><path d="M736 512m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#48ACFF" ></path></symbol><symbol id="icon-tupian" viewBox="0 0 1401 1024"><path d="M1185.684211 1024H215.578947c-118.568421 0-215.578947-97.010526-215.578947-215.578947V215.578947c0-118.568421 97.010526-215.578947 215.578947-215.578947h970.105264c118.568421 0 215.578947 97.010526 215.578947 215.578947v592.842106c0 118.568421-97.010526 215.578947-215.578947 215.578947zM215.578947 107.789474c-59.284211 0-107.789474 48.505263-107.789473 107.789473v592.842106c0 59.284211 48.505263 107.789474 107.789473 107.789473h970.105264c59.284211 0 107.789474-48.505263 107.789473-107.789473V215.578947c0-59.284211-48.505263-107.789474-107.789473-107.789473H215.578947z" fill="#48ACFF" ></path><path d="M0 716.8l247.915789-145.515789c64.673684-37.726316 145.515789-37.726316 210.189474-5.389474l274.863158 145.515789 258.694737-274.863158c43.115789-43.115789 102.4-59.284211 161.68421-43.115789L1401.263158 468.884211V862.315789c0 91.621053-70.063158 161.684211-161.684211 161.684211H161.684211c-91.621053 0-161.684211-70.063158-161.684211-161.684211" fill="#48ACFF" ></path><path d="M210.189474 317.978947a107.789474 107.789474 0 1 0 215.578947 0 107.789474 107.789474 0 1 0-215.578947 0Z" fill="#48ACFF" ></path></symbol><symbol id="icon-wentiliebiao" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#E8F5FF" ></path><path d="M512 720.738462c-55.138462 0-98.461538-19.692308-129.969231-55.138462-31.507692-35.446154-51.2-82.707692-51.2-141.784615 0-63.015385 15.753846-110.276923 51.2-149.661539 35.446154-35.446154 78.769231-55.138462 137.846154-55.138461 51.2 0 94.523077 19.692308 129.969231 55.138461s47.261538 82.707692 47.261538 141.784616c0 63.015385-15.753846 114.215385-51.2 149.661538l-23.630769 23.630769 110.276923 78.769231h-82.707692l-70.892308-55.138462c-23.630769 3.938462-43.323077 7.876923-66.953846 7.876924z m3.938462-358.4c-39.384615 0-74.830769 15.753846-98.461539 43.323076s-39.384615 66.953846-39.384615 114.215385 11.815385 86.646154 35.446154 114.215385c23.630769 27.569231 55.138462 43.323077 98.461538 43.323077s74.830769-15.753846 98.461538-43.323077c23.630769-27.569231 35.446154-66.953846 35.446154-114.215385 0-51.2-11.815385-90.584615-35.446154-118.153846-19.692308-23.630769-51.2-39.384615-94.523076-39.384615z" fill="#1A90FF" ></path></symbol><symbol id="icon-zhicheng" viewBox="0 0 1501 1024"><path d="M1331.2 1024h-1160.533333C75.093333 1024 0 948.906667 0 853.333333v-682.666666C0 75.093333 75.093333 0 170.666667 0h1160.533333C1426.773333 0 1501.866667 75.093333 1501.866667 170.666667v682.666666c0 95.573333-75.093333 170.666667-170.666667 170.666667zM170.666667 68.266667C116.053333 68.266667 68.266667 116.053333 68.266667 170.666667v682.666666c0 54.613333 47.786667 102.4 102.4 102.4h1160.533333c54.613333 0 102.4-47.786667 102.4-102.4v-682.666666c0-54.613333-47.786667-102.4-102.4-102.4h-1160.533333z" fill="#2495F7" ></path><path d="M750.933333 839.68c-20.48 0-34.133333-13.653333-34.133333-34.133333 0-129.706667-109.226667-238.933333-238.933333-238.933334s-238.933333 109.226667-238.933334 238.933334c0 20.48-13.653333 34.133333-34.133333 34.133333s-34.133333-13.653333-34.133333-34.133333c0-170.666667 136.533333-307.2 307.2-307.2s307.2 136.533333 307.2 307.2c0 20.48-13.653333 34.133333-34.133334 34.133333z" fill="#2495F7" ></path><path d="M477.866667 532.48c-88.746667 0-163.84-75.093333-163.84-163.84S389.12 204.8 477.866667 204.8s163.84 75.093333 163.84 163.84S566.613333 532.48 477.866667 532.48zM477.866667 273.066667c-54.613333 0-95.573333 40.96-95.573334 95.573333S423.253333 464.213333 477.866667 464.213333s95.573333-40.96 95.573333-95.573333S532.48 273.066667 477.866667 273.066667z" fill="#2495F7" ></path><path d="M1262.933333 819.2h-341.333333c-20.48 0-34.133333-13.653333-34.133333-34.133333s13.653333-34.133333 34.133333-34.133334h341.333333c20.48 0 34.133333 13.653333 34.133334 34.133334s-13.653333 34.133333-34.133334 34.133333zM1194.666667 580.266667h-273.066667c-20.48 0-34.133333-13.653333-34.133333-34.133334s13.653333-34.133333 34.133333-34.133333h273.066667c20.48 0 34.133333 13.653333 34.133333 34.133333s-13.653333 34.133333-34.133333 34.133334zM1058.133333 375.466667h-136.533333c-20.48 0-34.133333-13.653333-34.133333-34.133334s13.653333-34.133333 34.133333-34.133333h136.533333c20.48 0 34.133333 13.653333 34.133334 34.133333s-13.653333 34.133333-34.133334 34.133334z" fill="#2495F7" ></path></symbol><symbol id="icon-upload" viewBox="0 0 1024 1024"><path d="M704 341.333333h64a64 64 0 0 1 64 64v362.666667a64 64 0 0 1-64 64H256a64 64 0 0 1-64-64V405.333333a64 64 0 0 1 64-64h64v64h-64v362.666667h512V405.333333h-64v-64zM517.653333 124.629333l150.826667 150.826667-45.226667 45.269333-74.026666-74.005333v304.768h-64V247.616l-73.173334 73.130667-45.248-45.248 150.826667-150.848z"  ></path></symbol><symbol id="icon-fabuzhiwei" viewBox="0 0 1024 1024"><path d="M851.781818 1014.690909H139.636364c-79.127273 0-139.636364-60.509091-139.636364-139.636364V144.290909c0-79.127273 60.509091-139.636364 139.636364-139.636364h470.109091c27.927273 0 46.545455 18.618182 46.545454 46.545455s-18.618182 46.545455-46.545454 46.545455H139.636364c-27.927273 0-46.545455 18.618182-46.545455 46.545454v730.763636c0 27.927273 18.618182 46.545455 46.545455 46.545455h712.145454c27.927273 0 46.545455-18.618182 46.545455-46.545455V367.709091c0-27.927273 18.618182-46.545455 46.545454-46.545455s46.545455 18.618182 46.545455 46.545455v507.345454c0 74.472727-60.509091 139.636364-139.636364 139.636364z" fill="#4CADFF" ></path><path d="M721.454545 786.618182H269.963636c-18.618182 0-37.236364-13.963636-37.236363-37.236364s13.963636-37.236364 37.236363-37.236363h451.490909c18.618182 0 37.236364 13.963636 37.236364 37.236363s-13.963636 37.236364-37.236364 37.236364zM721.454545 553.890909H269.963636c-18.618182 0-37.236364-13.963636-37.236363-37.236364s13.963636-37.236364 37.236363-37.236363h451.490909c18.618182 0 37.236364 13.963636 37.236364 37.236363s-13.963636 37.236364-37.236364 37.236364zM442.181818 335.127273H269.963636c-18.618182 0-37.236364-13.963636-37.236363-32.581818s13.963636-37.236364 37.236363-37.236364h172.218182c18.618182 0 37.236364 13.963636 37.236364 37.236364s-13.963636 32.581818-37.236364 32.581818zM656.290909 367.709091c-13.963636 0-23.272727-4.654545-32.581818-13.963636-18.618182-18.618182-18.618182-46.545455 0-65.163637L893.672727 32.581818c18.618182-18.618182 46.545455-18.618182 65.163637 0 18.618182 18.618182 18.618182 46.545455 0 65.163637l-269.963637 256c-9.309091 9.309091-18.618182 13.963636-32.581818 13.963636z" fill="#4CADFF" ></path></symbol><symbol id="icon-zhiweiyaoqiu" viewBox="0 0 1024 1024"><path d="M823.652174 1024H200.347826c-75.686957 0-133.565217-57.878261-133.565217-133.565217V267.130435c0-75.686957 57.878261-133.565217 133.565217-133.565218h623.304348c75.686957 0 133.565217 57.878261 133.565217 133.565218v623.304348c0 75.686957-57.878261 133.565217-133.565217 133.565217zM200.347826 222.608696c-26.713043 0-44.521739 17.808696-44.521739 44.521739v623.304348c0 26.713043 17.808696 44.521739 44.521739 44.521739h623.304348c26.713043 0 44.521739-17.808696 44.521739-44.521739V267.130435c0-26.713043-17.808696-44.521739-44.521739-44.521739H200.347826z" fill="#4096F6" ></path><path d="M311.652174 253.773913c-26.713043 0-44.521739-17.808696-44.521739-44.521739V57.878261c0-26.713043 17.808696-44.521739 44.521739-44.521739s44.521739 17.808696 44.521739 44.521739v146.921739c0 26.713043-17.808696 48.973913-44.521739 48.973913zM756.869565 253.773913c-26.713043 0-44.521739-17.808696-44.521739-44.521739V57.878261c0-26.713043 17.808696-44.521739 44.521739-44.521739s44.521739 17.808696 44.521739 44.521739v146.921739c0 26.713043-17.808696 48.973913-44.521739 48.973913zM721.252174 409.6H302.747826c-17.808696 0-35.617391-13.356522-35.617391-35.617391s13.356522-35.617391 35.617391-35.617392h414.052174c17.808696 0 35.617391 13.356522 35.617391 35.617392s-13.356522 35.617391-31.165217 35.617391zM721.252174 632.208696H302.747826c-17.808696 0-35.617391-13.356522-35.617391-35.617392s13.356522-35.617391 35.617391-35.617391h414.052174c17.808696 0 35.617391 13.356522 35.617391 35.617391s-13.356522 35.617391-31.165217 35.617392zM645.565217 837.008696H302.747826c-17.808696 0-35.617391-13.356522-35.617391-35.617392s13.356522-35.617391 35.617391-35.617391H645.565217c17.808696 0 35.617391 13.356522 35.617392 35.617391s-17.808696 35.617391-35.617392 35.617392z" fill="#4096F6" ></path></symbol><symbol id="icon-gongsijieshao" viewBox="0 0 1365 1024"><path d="M487.619048 326.704762H414.47619c-39.009524 0-68.266667-34.133333-68.266666-73.142857s29.257143-68.266667 68.266666-68.266667H487.619048c39.009524 0 68.266667 29.257143 68.266666 68.266667s-29.257143 73.142857-68.266666 73.142857zM414.47619 234.057143c-9.752381 0-19.504762 9.752381-19.504761 19.504762s9.752381 19.504762 19.504761 19.504762H487.619048c9.752381 0 19.504762-9.752381 19.504762-19.504762s-9.752381-19.504762-19.504762-19.504762H414.47619zM487.619048 555.885714H414.47619c-39.009524 0-68.266667-29.257143-68.266666-68.266666s29.257143-68.266667 68.266666-68.266667H487.619048c39.009524 0 68.266667 29.257143 68.266666 68.266667s-29.257143 68.266667-68.266666 68.266666zM414.47619 468.114286c-9.752381 0-19.504762 9.752381-19.504761 19.504762s9.752381 19.504762 19.504761 19.504762H487.619048c9.752381 0 19.504762-9.752381 19.504762-19.504762s-9.752381-19.504762-19.504762-19.504762H414.47619zM487.619048 789.942857H414.47619c-39.009524 0-68.266667-29.257143-68.266666-68.266667s29.257143-68.266667 68.266666-68.266666H487.619048c39.009524 0 68.266667 29.257143 68.266666 68.266666s-29.257143 68.266667-68.266666 68.266667z m-73.142858-92.647619c-9.752381 0-19.504762 9.752381-19.504761 19.504762s9.752381 19.504762 19.504761 19.504762H487.619048c9.752381 0 19.504762-9.752381 19.504762-19.504762s-9.752381-19.504762-19.504762-19.504762H414.47619z" fill="#4096F6" ></path><path d="M809.447619 975.238095h-633.904762V97.52381c0-53.638095 43.885714-97.52381 97.52381-97.52381h438.857143c53.638095 0 97.52381 43.885714 97.523809 97.52381v877.714285z m-536.380952-97.523809h438.857143V97.52381h-438.857143v780.190476z" fill="#4096F6" ></path><path d="M1189.790476 975.238095h-463.238095V468.114286c0-53.638095 43.885714-97.52381 97.523809-97.52381h268.190477c53.638095 0 97.52381 43.885714 97.523809 97.52381V975.238095z m-365.714286-97.523809h268.190477V468.114286h-268.190477V877.714286z" fill="#4096F6" ></path><path d="M1297.066667 999.619048H68.266667c-29.257143 0-48.761905-19.504762-48.761905-48.761905s19.504762-48.761905 48.761905-48.761905h1223.923809c29.257143 0 48.761905 19.504762 48.761905 48.761905s-19.504762 48.761905-43.885714 48.761905z" fill="#4096F6" ></path></symbol><symbol id="icon-gongsidizhi" viewBox="0 0 1109 1024"><path d="M1015.466667 1024H93.866667c-46.933333 0-85.333333-38.4-85.333334-85.333333v-17.066667l59.733334-307.2c8.533333-38.4 42.666667-68.266667 85.333333-68.266667h85.333333v85.333334h-85.333333L93.866667 938.666667h921.6l-59.733334-307.2h-89.6v-85.333334h89.6c42.666667 0 76.8 29.866667 85.333334 68.266667l59.733333 307.2c4.266667 21.333333 0 46.933333-12.8 64-12.8 17.066667-34.133333 29.866667-55.466667 34.133333-8.533333 4.266667-12.8 4.266667-17.066666 4.266667z" fill="#4096F6" ></path><path d="M554.666667 819.2l-29.866667-34.133333c-149.333333-153.6-243.2-264.533333-281.6-324.266667-34.133333-42.666667-46.933333-98.133333-46.933333-149.333333C196.266667 140.8 354.133333 0 554.666667 0s358.4 140.8 358.4 311.466667c0 55.466667-17.066667 110.933333-46.933334 157.866666-38.4 55.466667-132.266667 166.4-281.6 320l-29.866666 29.866667zM554.666667 85.333333C401.066667 85.333333 281.6 187.733333 281.6 311.466667c0 38.4 12.8 72.533333 34.133333 106.666666s85.333333 110.933333 243.2 277.333334c157.866667-166.4 217.6-238.933333 238.933334-273.066667 21.333333-34.133333 34.133333-68.266667 34.133333-106.666667-4.266667-128-123.733333-230.4-277.333333-230.4z" fill="#4096F6" ></path><path d="M550.4 486.4c-72.533333 0-128-55.466667-128-128s55.466667-128 128-128 128 55.466667 128 128-59.733333 128-128 128z m0-213.333333c-46.933333 0-85.333333 38.4-85.333333 85.333333s38.4 85.333333 85.333333 85.333333 85.333333-38.4 85.333333-85.333333-38.4-85.333333-85.333333-85.333333z" fill="#4096F6" ></path></symbol><symbol id="icon-jubushuaxinjiantou" viewBox="0 0 1024 1024"><path d="M783.090347 1024a35.498667 35.498667 0 0 1-22.528-8.192l-546.133334-477.866667a32.768 32.768 0 0 1-8.874666-22.528 34.133333 34.133333 0 0 1 11.605333-25.941333l546.133333-477.866667a32.768 32.768 0 0 1 47.786667 0 34.133333 34.133333 0 0 1 0 48.469334L288.83968 512l516.778667 449.194667a34.816 34.816 0 0 1 3.413333 48.469333 35.498667 35.498667 0 0 1-25.941333 14.336z" fill="#BBBBBB" ></path></symbol><symbol id="icon-fanhui" viewBox="0 0 1102 1024"><path d="M590.769231 1003.362462H315.076923c-31.507692 0-63.015385-23.630769-63.015385-63.015385s23.630769-63.015385 63.015385-63.015385h275.692308c259.938462 0 378.092308-7.876923 378.092307-252.061538s-118.153846-252.061538-378.092307-252.061539H315.076923c-31.507692 0-63.015385-23.630769-63.015385-63.015384s31.507692-55.138462 63.015385-55.138462h275.692308c228.430769 0 496.246154 0 496.246154 378.092308s-267.815385 370.215385-496.246154 370.215385z" fill="#5091FF" ></path><path d="M47.261538 381.085538l259.938462 196.923077c39.384615 23.630769 86.646154 15.753846 110.276923-15.753846 7.876923-15.753846 15.753846-31.507692 15.753846-47.261538v-393.846154c0-47.261538-31.507692-78.769231-78.769231-78.769231-15.753846 0-31.507692 7.876923-47.261538 15.753846l-259.938462 196.923077c-39.384615 31.507692-47.261538 78.769231-15.753846 110.276923 0 7.876923 7.876923 15.753846 15.753846 15.753846z" fill="#5091FF" ></path></symbol><symbol id="icon-tongji1" viewBox="0 0 1365 1024"><path d="M702.171429 843.580952c-78.019048 0-141.409524-63.390476-141.409524-141.409523V141.409524c0-78.019048 63.390476-141.409524 141.409524-141.409524 78.019048 0 141.409524 63.390476 141.409523 141.409524v565.638095c-4.87619 73.142857-68.266667 136.533333-141.409523 136.533333z m0-746.057142c-24.380952 0-43.885714 19.504762-43.885715 43.885714v565.638095c0 24.380952 19.504762 43.885714 43.885715 43.885714s43.885714-19.504762 43.885714-43.885714V141.409524c-4.87619-24.380952-24.380952-43.885714-43.885714-43.885714zM1067.885714 843.580952c-78.019048 0-141.409524-63.390476-141.409524-141.409523V448.609524c0-78.019048 63.390476-141.409524 141.409524-141.409524s141.409524 63.390476 141.409524 141.409524v253.561905c0 78.019048-63.390476 141.409524-141.409524 141.409523z m0-433.980952c-24.380952 0-43.885714 19.504762-43.885714 43.885714v253.561905c0 24.380952 19.504762 43.885714 43.885714 43.885714s43.885714-19.504762 43.885715-43.885714V448.609524c0-19.504762-19.504762-39.009524-43.885715-39.009524zM331.580952 843.580952C253.561905 843.580952 195.047619 780.190476 195.047619 702.171429V448.609524c0-78.019048 63.390476-141.409524 141.409524-141.409524 78.019048 0 141.409524 63.390476 141.409524 141.409524v253.561905c-4.87619 78.019048-68.266667 141.409524-146.285715 141.409523z m0-433.980952c-19.504762 0-39.009524 19.504762-39.009523 39.009524v253.561905c0 24.380952 19.504762 43.885714 43.885714 43.885714s43.885714-19.504762 43.885714-43.885714V448.609524c-4.87619-19.504762-24.380952-39.009524-48.761905-39.009524z" fill="#5494FF" ></path><path d="M1297.066667 1004.495238H48.761905c-29.257143 0-48.761905-19.504762-48.761905-48.761905v-536.380952c0-29.257143 19.504762-48.761905 48.761905-48.761905s48.761905 19.504762 48.761905 48.761905v487.619048h1199.542857c29.257143 0 48.761905 19.504762 48.761904 48.761904s-24.380952 48.761905-48.761904 48.761905z" fill="#5091FF" ></path></symbol><symbol id="icon-qiandao-1" viewBox="0 0 1038 1024"><path d="M881.509434 1024h-724.528302a157.584906 157.584906 0 0 1-156.981132-156.981132v-603.773585a157.584906 157.584906 0 0 1 156.981132-156.981132h724.528302a157.584906 157.584906 0 0 1 156.981132 156.981132v603.773585a157.584906 157.584906 0 0 1-156.981132 156.981132z m-724.528302-845.283019a84.528302 84.528302 0 0 0-84.528302 84.528302v603.773585a84.528302 84.528302 0 0 0 84.528302 84.528302h724.528302a84.528302 84.528302 0 0 0 84.528302-84.528302v-603.773585a84.528302 84.528302 0 0 0-84.528302-84.528302zM277.735849 36.226415v241.509434" fill="#545454" ></path><path d="M277.735849 313.962264a36.226415 36.226415 0 0 1-36.226415-36.226415v-241.509434a36.226415 36.226415 0 1 1 72.45283 0v241.509434a36.226415 36.226415 0 0 1-36.226415 36.226415zM760.754717 36.226415v241.509434M760.754717 313.962264a36.226415 36.226415 0 0 1-36.226415-36.226415v-241.509434a36.226415 36.226415 0 0 1 72.45283 0v241.509434a36.226415 36.226415 0 0 1-36.226415 36.226415zM486.641509 746.264151a37.433962 37.433962 0 0 1-27.773584-10.867925l-175.09434-181.132075a36.226415 36.226415 0 0 1 0-51.320755 36.830189 36.830189 0 0 1 51.320755 0l152.754717 158.792453 281.962264-221.584906a36.226415 36.226415 0 0 1 50.716981 6.037736 36.830189 36.830189 0 0 1-6.037736 51.320755l-307.320755 241.509434a38.037736 38.037736 0 0 1-20.528302 7.245283z" fill="#545454" ></path></symbol><symbol id="icon-xiajiantou2" viewBox="0 0 1592 1024"><path d="M796.390468 1023.928326a113.768929 113.768929 0 0 1-86.464386-39.819126l-682.613575-796.382503A113.768929 113.768929 0 1 1 200.24128 39.827089L796.390468 739.506003 1392.539656 44.377846a113.768929 113.768929 0 0 1 172.928773 147.899608l-682.613575 796.382504A113.768929 113.768929 0 0 1 796.390468 1023.928326z" fill="#9F9F9F" ></path></symbol><symbol id="icon-qiandao-" viewBox="0 0 1038 1024"><path d="M881.509434 1024h-724.528302a157.584906 157.584906 0 0 1-156.981132-156.981132v-603.773585a157.584906 157.584906 0 0 1 156.981132-156.981132h724.528302a157.584906 157.584906 0 0 1 156.981132 156.981132v603.773585a157.584906 157.584906 0 0 1-156.981132 156.981132z m-724.528302-845.283019a84.528302 84.528302 0 0 0-84.528302 84.528302v603.773585a84.528302 84.528302 0 0 0 84.528302 84.528302h724.528302a84.528302 84.528302 0 0 0 84.528302-84.528302v-603.773585a84.528302 84.528302 0 0 0-84.528302-84.528302z" fill="#409EFF" ></path><path d="M277.735849 36.226415v241.509434" fill="#FFFFFF" ></path><path d="M277.735849 313.962264a36.226415 36.226415 0 0 1-36.226415-36.226415v-241.509434a36.226415 36.226415 0 1 1 72.45283 0v241.509434a36.226415 36.226415 0 0 1-36.226415 36.226415z" fill="#409EFF" ></path><path d="M760.754717 36.226415v241.509434" fill="#FFFFFF" ></path><path d="M760.754717 313.962264a36.226415 36.226415 0 0 1-36.226415-36.226415v-241.509434a36.226415 36.226415 0 0 1 72.45283 0v241.509434a36.226415 36.226415 0 0 1-36.226415 36.226415zM486.641509 746.264151a37.433962 37.433962 0 0 1-27.773584-10.867925l-175.09434-181.132075a36.226415 36.226415 0 0 1 0-51.320755 36.830189 36.830189 0 0 1 51.320755 0l152.754717 158.792453 281.962264-221.584906a36.226415 36.226415 0 0 1 50.716981 6.037736 36.830189 36.830189 0 0 1-6.037736 51.320755l-307.320755 241.509434a38.037736 38.037736 0 0 1-20.528302 7.245283z" fill="#409EFF" ></path></symbol><symbol id="icon-yidong" viewBox="0 0 1084 1024"><path d="M855.341176 1017.976471H174.682353c-90.352941 0-156.611765-72.282353-156.611765-156.611765V174.682353C18.070588 84.329412 90.352941 18.070588 174.682353 18.070588h680.658823c90.352941 0 156.611765 72.282353 156.611765 156.611765v78.305882h-90.352941V174.682353c0-36.141176-30.117647-66.258824-66.258824-66.258824H174.682353c-36.141176 0-66.258824 30.117647-66.258824 66.258824v680.658823c0 36.141176 30.117647 66.258824 66.258824 66.258824h680.658823c36.141176 0 66.258824-30.117647 66.258824-66.258824v-78.305882h90.352941v78.305882c6.023529 90.352941-66.258824 162.635294-156.611765 162.635295z" fill="#4CADFF" ></path><path d="M951.717647 596.329412H271.058824c-24.094118 0-48.188235-18.070588-48.188236-48.188236s18.070588-48.188235 48.188236-48.188235h680.658823c24.094118 0 48.188235 18.070588 48.188235 48.188235s-24.094118 48.188235-48.188235 48.188236z" fill="#4CADFF" ></path><path d="M1084.235294 548.141176L921.6 722.823529V361.411765L1084.235294 536.094118v12.047058z" fill="#4CADFF" ></path></symbol><symbol id="icon-xiayi1" viewBox="0 0 1024 1024"><path d="M512 512m-481.882353 0a481.882353 481.882353 0 1 0 963.764706 0 481.882353 481.882353 0 1 0-963.764706 0Z" fill="#4CACFF" ></path><path d="M512 1024C228.894118 1024 0 795.105882 0 512S228.894118 0 512 0 1024 228.894118 1024 512 795.105882 1024 512 1024z m0-963.764706C265.035294 60.235294 60.235294 265.035294 60.235294 512S265.035294 963.764706 512 963.764706 963.764706 758.964706 963.764706 512 758.964706 60.235294 512 60.235294z" fill="#4CACFF" ></path><path d="M502.964706 752.941176c-18.070588 0-30.117647-12.047059-30.117647-30.117647V307.2c0-18.070588 12.047059-30.117647 30.117647-30.117647s30.117647 12.047059 30.117647 30.117647V722.823529c0 18.070588-12.047059 30.117647-30.117647 30.117647z" fill="#FFFFFF" ></path><path d="M502.964706 807.152941c-6.023529 0-12.047059 0-18.070588-6.023529l-144.564706-132.517647c-12.047059-12.047059-12.047059-30.117647 0-42.164706 12.047059-12.047059 30.117647-12.047059 42.164706 0l126.494117 108.423529 132.517647-108.423529c12.047059-12.047059 30.117647-12.047059 42.164706 6.023529 6.023529 6.023529 6.023529 30.117647-12.047059 36.141177l-150.588235 132.517647c-6.023529 0-12.047059 6.023529-18.070588 6.023529z" fill="#FFFFFF" ></path></symbol><symbol id="icon-shangyi1" viewBox="0 0 1024 1024"><path d="M512 512m-481.882353 0a481.882353 481.882353 0 1 0 963.764706 0 481.882353 481.882353 0 1 0-963.764706 0Z" fill="#4CACFF" ></path><path d="M512 1024C228.894118 1024 0 795.105882 0 512S228.894118 0 512 0 1024 228.894118 1024 512 795.105882 1024 512 1024z m0-963.764706C265.035294 60.235294 60.235294 265.035294 60.235294 512S265.035294 963.764706 512 963.764706 963.764706 758.964706 963.764706 512 758.964706 60.235294 512 60.235294z" fill="#4CACFF" ></path><path d="M502.964706 789.082353c-18.070588 0-30.117647-12.047059-30.117647-30.117647V343.341176c0-18.070588 12.047059-30.117647 30.117647-30.117647s30.117647 12.047059 30.117647 30.117647v415.62353c0 18.070588-12.047059 30.117647-30.117647 30.117647z" fill="#FFFFFF" ></path><path d="M653.552941 451.764706c-6.023529 0-12.047059 0-18.070588-6.02353l-132.517647-114.447058-126.494118 108.423529c-12.047059 12.047059-30.117647 12.047059-42.164706 0-12.047059-12.047059-12.047059-30.117647 0-42.164706l144.564706-126.494117c12.047059-12.047059 30.117647-12.047059 42.164706 0l150.588235 126.494117c12.047059 12.047059 12.047059 30.117647 6.02353 42.164706-6.023529 6.023529-12.047059 12.047059-24.094118 12.047059z" fill="#FFFFFF" ></path></symbol><symbol id="icon-xiayi" viewBox="0 0 1024 1024"><path d="M512 512m-481.882353 0a481.882353 481.882353 0 1 0 963.764706 0 481.882353 481.882353 0 1 0-963.764706 0Z" fill="#FFFFFF" ></path><path d="M512 1024C228.894118 1024 0 795.105882 0 512S228.894118 0 512 0 1024 228.894118 1024 512 795.105882 1024 512 1024z m0-963.764706C265.035294 60.235294 60.235294 265.035294 60.235294 512S265.035294 963.764706 512 963.764706 963.764706 758.964706 963.764706 512 758.964706 60.235294 512 60.235294z" fill="#4CACFF" ></path><path d="M502.964706 752.941176c-18.070588 0-30.117647-12.047059-30.117647-30.117647V307.2c0-18.070588 12.047059-30.117647 30.117647-30.117647s30.117647 12.047059 30.117647 30.117647V722.823529c0 18.070588-12.047059 30.117647-30.117647 30.117647z" fill="#4CACFF" ></path><path d="M502.964706 807.152941c-6.023529 0-12.047059 0-18.070588-6.023529l-144.564706-132.517647c-12.047059-12.047059-12.047059-30.117647 0-42.164706 12.047059-12.047059 30.117647-12.047059 42.164706 0l126.494117 108.423529 132.517647-108.423529c12.047059-12.047059 30.117647-12.047059 42.164706 6.023529 6.023529 6.023529 6.023529 30.117647-12.047059 36.141177l-150.588235 132.517647c-6.023529 0-12.047059 6.023529-18.070588 6.023529z" fill="#4CACFF" ></path></symbol><symbol id="icon-shangyi" viewBox="0 0 1024 1024"><path d="M512 512m-481.882353 0a481.882353 481.882353 0 1 0 963.764706 0 481.882353 481.882353 0 1 0-963.764706 0Z" fill="#FFFFFF" ></path><path d="M512 1024C228.894118 1024 0 795.105882 0 512S228.894118 0 512 0 1024 228.894118 1024 512 795.105882 1024 512 1024z m0-963.764706C265.035294 60.235294 60.235294 265.035294 60.235294 512S265.035294 963.764706 512 963.764706 963.764706 758.964706 963.764706 512 758.964706 60.235294 512 60.235294z" fill="#4CACFF" ></path><path d="M502.964706 789.082353c-18.070588 0-30.117647-12.047059-30.117647-30.117647V343.341176c0-18.070588 12.047059-30.117647 30.117647-30.117647s30.117647 12.047059 30.117647 30.117647v415.62353c0 18.070588-12.047059 30.117647-30.117647 30.117647z" fill="#4CACFF" ></path><path d="M653.552941 451.764706c-6.023529 0-12.047059 0-18.070588-6.02353l-132.517647-114.447058-126.494118 108.423529c-12.047059 12.047059-30.117647 12.047059-42.164706 0-12.047059-12.047059-12.047059-30.117647 0-42.164706l144.564706-126.494117c12.047059-12.047059 30.117647-12.047059 42.164706 0l150.588235 126.494117c12.047059 12.047059 12.047059 30.117647 6.02353 42.164706-6.023529 6.023529-12.047059 12.047059-24.094118 12.047059z" fill="#4CACFF" ></path></symbol><symbol id="icon-bianji5" viewBox="0 0 1024 1024"><path d="M704.752941 993.882353H198.776471c-78.305882 0-138.541176-60.235294-138.541177-132.517647V228.894118c0-72.282353 66.258824-132.517647 138.541177-132.517647h319.247058c18.070588 0 30.117647 12.047059 30.117647 30.117647s-12.047059 24.094118-30.117647 24.094117H198.776471c-42.164706 0-78.305882 36.141176-78.305883 72.282353v632.470588c0 42.164706 36.141176 72.282353 78.305883 72.282353h499.952941c42.164706 0 78.305882-36.141176 78.305882-72.282353V602.352941c0-18.070588 12.047059-30.117647 30.117647-30.117647s30.117647 12.047059 30.117647 30.117647v259.011765c6.023529 72.282353-60.235294 132.517647-132.517647 132.517647z" fill="#4CACFF" ></path><path d="M313.223529 734.870588c-24.094118 0-54.211765-18.070588-60.235294-48.188235v-30.117647l36.141177-126.494118 445.741176-445.741176c48.188235-48.188235 120.470588-48.188235 168.658824 0 48.188235 48.188235 48.188235 120.470588 0 168.658823l-445.741177 445.741177-126.494117 30.117647c-6.023529 6.023529-12.047059 6.023529-18.070589 6.023529z m36.141177-174.682353l-36.141177 114.447059 120.470589-30.117647 433.694117-433.694118c12.047059-12.047059 18.070588-24.094118 18.070589-42.164705 0-18.070588-6.023529-30.117647-18.070589-42.164706-24.094118-24.094118-60.235294-24.094118-84.329411 0L349.364706 560.188235z" fill="#4CACFF" ></path></symbol><symbol id="icon-shanchu3" viewBox="0 0 1024 1024"><path d="M654.222222 995.555556H375.466667c-68.266667 0-125.155556-56.888889-136.533334-142.222223L142.222222 324.266667c0-17.066667 5.688889-28.444444 22.755556-34.133334 17.066667 0 28.444444 5.688889 34.133333 22.755556l91.022222 534.755555c11.377778 51.2 45.511111 91.022222 85.333334 91.022223h278.755555c39.822222 0 73.955556-39.822222 85.333334-91.022223l91.022222-534.755555c0-17.066667 17.066667-28.444444 34.133333-22.755556 17.066667 0 28.444444 17.066667 22.755556 34.133334L796.444444 853.333333c-17.066667 85.333333-73.955556 142.222222-142.222222 142.222223zM597.333333 187.733333v-5.688889c0-51.2-39.822222-96.711111-85.333333-96.711111s-85.333333 45.511111-85.333333 102.4h-56.888889C369.777778 102.4 432.355556 28.444444 512 28.444444c73.955556 0 136.533333 68.266667 142.222222 147.911112v5.688888l-56.888889 5.688889z" fill="#4CACFF" ></path><path d="M398.222222 859.022222c-11.377778 0-28.444444-11.377778-28.444444-22.755555L284.444444 318.577778c0-17.066667 11.377778-34.133333 22.755556-34.133334 17.066667-5.688889 34.133333 5.688889 34.133333 22.755556l85.333334 517.688889c0 17.066667-5.688889 34.133333-28.444445 34.133333 5.688889 0 0 0 0 0zM625.777778 859.022222s-5.688889 0 0 0c-22.755556-5.688889-28.444444-17.066667-28.444445-34.133333L682.666667 307.2c0-17.066667 17.066667-28.444444 34.133333-22.755556 11.377778 0 22.755556 17.066667 22.755556 34.133334l-85.333334 517.688889c0 11.377778-17.066667 22.755556-28.444444 22.755555zM512 859.022222c-17.066667 0-28.444444-11.377778-28.444444-28.444444V312.888889c0-17.066667 11.377778-28.444444 28.444444-28.444445s28.444444 11.377778 28.444444 28.444445v517.688889c0 17.066667-11.377778 28.444444-28.444444 28.444444zM938.666667 250.311111H85.333333c-17.066667 0-28.444444-17.066667-28.444444-28.444444s11.377778-28.444444 28.444444-28.444445h853.333334c17.066667 0 28.444444 11.377778 28.444444 28.444445s-11.377778 28.444444-28.444444 28.444444z" fill="#4CACFF" ></path></symbol><symbol id="icon-xuanze" viewBox="0 0 1024 1024"><path d="M870.4 0H153.6C66.56 0 0 66.56 0 153.6v716.8c0 87.04 66.56 153.6 153.6 153.6h716.8c87.04 0 153.6-66.56 153.6-153.6V153.6c0-87.04-66.56-153.6-153.6-153.6z m-40.96 394.24l-337.92 358.4c-10.24 10.24-25.6 15.36-40.96 15.36-10.24 0-20.48-5.12-30.72-10.24L174.08 563.2c-20.48-15.36-25.6-51.2-10.24-71.68 15.36-20.48 51.2-25.6 71.68-10.24l209.92 163.84 307.2-327.68c20.48-20.48 51.2-20.48 71.68 0 20.48 20.48 25.6 56.32 5.12 76.8z" fill="#37B46A" ></path></symbol><symbol id="icon-bianji4" viewBox="0 0 1032 1024"><path d="M934.724189 278.826729L834.414864 379.136054 653.380212 198.101402l100.394659-100.351991A42.257063 42.257063 0 0 1 783.769535 85.333412c6.527999 0 19.157332 1.621333 29.951997 12.415999l121.002657 121.002656a42.538663 42.538663 0 0 1 0 60.074662zM299.374908 914.176009l-200.661316 19.626665 19.669331-200.661316L593.049551 258.47473 774.084202 439.466715l-474.709294 474.709294z m695.679942-755.79727L874.09486 37.418749A127.317323 127.317323 0 0 0 783.769535 0.000085c-32.725331 0-65.407995 12.458666-90.367993 37.418664l-646.229279 646.229279c-7.082666 7.082666-11.434666 16.469332-12.287999 26.495998l-26.197331 267.818645c-2.133333 25.002665 17.706665 46.037329 42.239996 46.037329 1.194667 0 2.432-0.042667 3.626666-0.128l267.818645-26.239998a42.12053 42.12053 0 0 0 26.495998-12.287999l646.186612-646.186613c49.919996-49.919996 49.919996-130.858656 0-180.778651z"  ></path></symbol><symbol id="icon-bangding" viewBox="0 0 1024 1024"><path d="M722.7 654.8l-45.2-45.2 140.1-140.1C890 397 890 279 817.6 206.6c-72.5-72.5-190.4-72.5-262.9 0l-140.1 140-45.2-45.2 140.1-140.1c97.4-97.5 256-97.4 353.4 0 97.4 97.4 97.4 256 0 353.4L722.7 654.8zM338.1 935.9c-66.8 0-129.5-26-176.7-73.2-97.4-97.4-97.4-256 0-353.4l140.1-140.1 45.2 45.2-140.1 140.2c-72.5 72.5-72.5 190.4 0 262.9 35.1 35.1 81.8 54.5 131.5 54.5s96.3-19.3 131.4-54.5l140.1-140.1 45.2 45.2-140 140.1c-47.2 47.2-110 73.2-176.7 73.2z"  ></path><path d="M330.99 647.879l316.78-316.781 45.255 45.254-316.781 316.78z"  ></path></symbol><symbol id="icon-bofang2" viewBox="0 0 1024 1024"><path d="M692.224 495.616l-4.096-4.096L430.08 344.064c-4.096-4.096-8.192-4.096-12.288-4.096-12.288 0-20.48 8.192-20.48 20.48v303.104c0 12.288 8.192 20.48 20.48 20.48 4.096 0 8.192 0 12.288-4.096L688.128 532.48h4.096c4.096-4.096 8.192-8.192 8.192-16.384s-4.096-16.384-8.192-20.48zM438.272 630.784V393.216L647.168 512 438.272 630.784z" fill="#06101A" ></path><path d="M512 98.304C282.624 98.304 98.304 282.624 98.304 512S282.624 925.696 512 925.696c229.376 0 413.696-184.32 413.696-413.696S741.376 98.304 512 98.304z m0 790.528c-208.896 0-376.832-167.936-376.832-376.832S303.104 135.168 512 135.168 888.832 303.104 888.832 512 720.896 888.832 512 888.832z" fill="#06101A" ></path></symbol><symbol id="icon-weibiaoti1" viewBox="0 0 1024 1024"><path d="M671.053824 253.083648c6.05184 3.01056 13.463552 0.52224 16.47616-5.5296l43.646976-87.740416c3.012608-6.05184 0.524288-13.4656-5.527552-16.474112l-112.308224-55.86944c-6.05184-3.01056-13.4656-0.52224-16.47616 5.5296l-43.649024 87.740416c-3.01056 6.05184-0.52224 13.4656 5.527552 16.474112L671.053824 253.083648z"  ></path><path d="M448.755712 719.599616c4.622336-4.931584 10.866688-13.91616 13.877248-19.968l203.35616-408.778752c3.012608-6.05184 0.524288-13.4656-5.527552-16.474112l-112.310272-55.873536c-6.05184-3.01056-13.463552-0.52224-16.47616 5.5296L329.13408 631.177216c-3.01056 6.05184-6.268928 16.474112-7.241728 23.16288l-32.774144 225.294336c-0.9728 6.688768 2.013184 8.126464 6.63552 3.19488L448.755712 719.599616z"  ></path></symbol><symbol id="icon-jinggao2" viewBox="0 0 1024 1024"><path d="M563.2 312.32C563.2 281.6 542.72 256 512 256S460.8 281.6 460.8 312.32l0 256c0 30.72 20.48 51.2 51.2 51.2s51.2-20.48 51.2-51.2L563.2 312.32zM512 665.6c-30.72 0-51.2 20.48-51.2 51.2 0 30.72 20.48 51.2 51.2 51.2s51.2-20.48 51.2-51.2C563.2 686.08 542.72 665.6 512 665.6z"  ></path></symbol><symbol id="icon-lubiaosignpost3" viewBox="0 0 1024 1024"><path d="M575.0272 171.89888l0 705.792c0 8.38656-6.79936 15.17568-15.18592 15.17568l-86.016 0c-8.38656 0-15.18592-6.78912-15.18592-15.17568L458.63936 171.89888c0-8.37632 6.79936-15.16544 15.18592-15.16544l86.016 0C568.22784 156.73344 575.0272 163.52256 575.0272 171.89888zM988.68224 405.97504l-74.00448-66.41664c-1.40288-1.23904-3.20512-1.93536-5.07904-1.93536L606.01344 337.62304c-4.18816 0-7.59808 3.38944-7.59808 7.59808l0 118.90688c0 4.18816 3.40992 7.58784 7.59808 7.58784l303.58528 0c1.57696 0 3.11296-0.49152 4.39296-1.39264l74.00448-52.50048c1.88416-1.34144 3.05152-3.46112 3.19488-5.75488C991.31392 409.76384 990.39232 407.53152 988.68224 405.97504zM42.47552 452.9664c0.13312 2.304 1.31072 4.41344 3.19488 5.75488l74.00448 52.50048c1.28 0.90112 2.816 1.40288 4.39296 1.40288l303.59552 0c4.18816 0 7.58784-3.39968 7.58784-7.58784L435.2512 386.10944c0-4.1984-3.39968-7.59808-7.58784-7.59808L124.0576 378.51136c-1.87392 0-3.67616 0.69632-5.0688 1.9456l-74.00448 66.42688C43.27424 448.43008 42.35264 450.6624 42.47552 452.9664zM427.65312 211.10784 124.0576 211.10784c-1.87392 0-3.67616 0.67584-5.0688 1.93536l-74.00448 66.42688c-1.72032 1.52576-2.64192 3.76832-2.5088 6.07232 0.13312 2.31424 1.31072 4.43392 3.19488 5.76512l74.00448 52.49024c1.28 0.91136 2.816 1.41312 4.39296 1.41312l303.59552 0c4.18816 0 7.58784-3.40992 7.58784-7.59808L435.2512 218.69568C435.24096 214.48704 431.84128 211.10784 427.65312 211.10784z"  ></path></symbol><symbol id="icon-rili" viewBox="0 0 1024 1024"><path d="M177.81122 880.700293c-36.96489 0-67.041906-30.502711-67.041906-67.889203V202.947202L88.478635 225.539756h757.993601c36.769438 0 66.756403 30.462802 66.756403 67.684542V801.630447c0 12.477172 9.980305 22.591531 22.290679 22.59153 12.310374 0 22.290679-10.115382 22.290679-22.59153V293.224298c0-62.152549-49.925063-112.868627-111.337761-112.868627H88.478635c-12.310374 0-22.290679 10.115382-22.290678 22.591531v609.862865c0 62.333674 50.030463 113.073288 111.62224 113.073288h657.400554c12.310374 0 22.290679-10.114358 22.290679-22.591531s-9.980305-22.591531-22.290679-22.591531H177.81122z m133.573181-587.385944c0 12.477172 9.980305 22.591531 22.290679 22.591531 12.310374 0 22.290679-10.115382 22.290679-22.591531v-169.43904c0-12.477172-9.980305-22.591531-22.290679-22.591531-12.310374 0-22.290679 10.115382-22.290679 22.591531v169.43904z m378.939495-11.295254c0 12.477172 9.980305 22.591531 22.290679 22.591531s22.290679-10.115382 22.290679-22.591531V112.580055c0-12.477172-9.980305-22.591531-22.290679-22.591531s-22.290679 10.115382-22.290679 22.591531v169.43904zM355.965759 428.865581c12.310374 0 22.290679-10.115382 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H233.367537c-12.310374 0-22.290679 10.114358-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.598222z m245.195422 0c12.310374 0 22.290679-10.115382 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H478.563982c-12.310374 0-22.290679 10.114358-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.597199z m222.905766 0c12.310374 0 22.290679-10.115382 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H701.468724c-12.310374 0-22.290679 10.114358-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.598223z m-468.101188 135.550209c12.310374 0 22.290679-10.114358 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H233.367537c-12.310374 0-22.290679 10.115382-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.598222z m245.195422 0c12.310374 0 22.290679-10.114358 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H478.563982c-12.310374 0-22.290679 10.115382-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.597199z m222.905766 0c12.310374 0 22.290679-10.114358 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H701.468724c-12.310374 0-22.290679 10.115382-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.598223z m-468.101188 135.550209c12.310374 0 22.290679-10.115382 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H233.367537c-12.310374 0-22.290679 10.114358-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.598222z m245.195422 0c12.310374 0 22.290679-10.115382 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H478.563982c-12.310374 0-22.290679 10.114358-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.597199z m222.905766 0c12.310374 0 22.290679-10.115382 22.290679-22.591531 0-12.477172-9.980305-22.591531-22.290679-22.591531H701.468724c-12.310374 0-22.290679 10.114358-22.290679 22.591531 0 12.477172 9.980305 22.591531 22.290679 22.591531h122.598223z" fill="#070001" ></path></symbol><symbol id="icon-bianji3" viewBox="0 0 1024 1024"><path d="M243.2 624.2304v121.7792h121.7792L880.5888 230.4l-121.7792-121.7792L243.2 624.2304zM758.784 0l230.4 230.4L396.7744 822.784h-230.4v-230.4L758.8352 0z" fill="#979797" ></path><path d="M0 947.2h1024v76.8H0z" fill="#979797" ></path></symbol><symbol id="icon-yiguanbi" viewBox="0 0 1024 1024"><path d="M601.6 550.4c0 32-32 57.6-64 57.6s-64-25.6-64-57.6V57.6c0-32 32-57.6 64-57.6s64 25.6 64 57.6v492.8zM0 518.4c0-179.2 96-339.2 236.8-428.8 25.6-19.2 64-6.4 83.2 19.2 19.2 25.6 6.4 64-19.2 83.2-102.4 70.4-179.2 192-179.2 326.4 0 211.2 172.8 384 390.4 384 211.2 0 384-172.8 390.4-384 0-140.8-76.8-262.4-192-332.8-32-19.2-38.4-51.2-19.2-83.2 12.8-25.6 51.2-32 76.8-12.8 153.6 83.2 256 243.2 256 428.8 0 275.2-230.4 505.6-512 505.6s-512-224-512-505.6"  ></path></symbol><symbol id="icon-yiguanbi1" viewBox="0 0 1024 1024"><path d="M857.83376895 48.11021519m61.2817864 61.28178636l0.03871533 0.03871538q61.28179003 61.28179003 0 122.56357633l-694.69469443 694.69469086q-61.28179003 61.28179003-122.56357641 0l-0.03871167-0.03871172q-61.28179003-61.28179003 0-122.56357636l694.69469085-694.69469449q61.28179003-61.28179003 122.56357633 0Z"  ></path><path d="M163.08781638 48.11541046m-61.28178632 61.28178996l-0.03871539 0.03871173q-61.28179003 61.28179003 0 122.5635764l694.69469448 694.69469443q61.28179003 61.28179003 122.56357639 0l0.03871171-0.03871538q61.28179003-61.28179003 0-122.56357635l-694.69469081-694.69469083q-61.28179003-61.28179003-122.56357638 0Z"  ></path></symbol><symbol id="icon-lajitong" viewBox="0 0 1024 1024"><path d="M972.658 209.348c14.5 0.02 26.272-11.777 26.292-26.35 0.02-14.572-11.72-26.401-26.22-26.421L32.458 155.28c-14.501-0.02-26.273 11.777-26.292 26.35-0.02 14.572 11.719 26.402 26.22 26.422l940.272 1.295zM180.467 992.356v26.659l26.526-0.274 626.369-6.473 25.986-0.269V289.397c0-14.572-11.755-26.386-26.256-26.386s-26.257 11.814-26.257 26.386v696.486l25.987-26.384-626.369 6.473 26.527 26.384V282.67c0-14.573-11.756-26.386-26.257-26.386-14.5 0-26.256 11.813-26.256 26.386v709.686z"  ></path><path d="M656.41 847.079c0 14.573 11.756 26.386 26.257 26.386 14.5 0 26.256-11.813 26.256-26.386V372.132c0-14.573-11.755-26.386-26.256-26.386s-26.257 11.813-26.257 26.386v474.947zM341.333 847.079c0 14.573 11.756 26.386 26.257 26.386 14.5 0 26.256-11.813 26.256-26.386V372.132c0-14.573-11.755-26.386-26.256-26.386s-26.257 11.813-26.257 26.386v474.947zM498.872 847.079c0 14.573 11.755 26.386 26.256 26.386s26.257-11.813 26.257-26.386V372.132c0-14.573-11.756-26.386-26.257-26.386-14.5 0-26.256 11.813-26.256 26.386v474.947zM392.148 116.722c0-14.658 11.61-26.358 26.253-26.358h204.525c14.483 0 26.253 11.798 26.253 26.186v55.095h52.513V116.55c0-43.563-35.311-78.958-78.766-78.958H418.4c-43.677 0-78.766 35.359-78.766 79.13v48.589h52.513v-48.59z"  ></path></symbol><symbol id="icon-dianjiliang" viewBox="0 0 1582 1024"><path d="M791.272727 1024C359.330909 1024 0 652.288 0 512S359.330909 0 791.272727 0C1223.214545 0 1582.545455 371.712 1582.545455 512S1223.214545 1024 791.272727 1024z m0-930.909091C398.429091 93.090909 93.090909 427.287273 93.090909 512S398.429091 930.909091 791.272727 930.909091 1489.454545 596.712727 1489.454545 512 1184.116364 93.090909 791.272727 93.090909z" fill="#606266" ></path><path d="M791.272727 744.727273A232.727273 232.727273 0 1 1 1024 512 233.006545 233.006545 0 0 1 791.272727 744.727273z m0-372.363637A139.636364 139.636364 0 1 0 930.909091 512 139.822545 139.822545 0 0 0 791.272727 372.363636z" fill="#606266" ></path></symbol><symbol id="icon-bofang1" viewBox="0 0 1024 1024"><path d="M512 1024a512 512 0 1 1 512-512 512.57344 512.57344 0 0 1-512 512z m0-983.04a471.04 471.04 0 1 0 471.04 471.04A471.57248 471.57248 0 0 0 512 40.96z" fill="#FFFFFF" ></path><path d="M409.6 383.73376v256.53248a40.96 40.96 0 0 0 63.6928 34.07872l192.38912-128.26624a40.96 40.96 0 0 0 0-68.15744l-192.4096-128.26624A40.96 40.96 0 0 0 409.6 383.73376z" fill="#FFFFFF" ></path></symbol><symbol id="icon-chushihua" viewBox="0 0 1024 1024"><path d="M511.682434 1024A468.457376 468.457376 0 0 1 44.559694 555.542624a66.73182 66.73182 0 0 1 133.46364 0A333.6591 333.6591 0 1 0 511.682434 220.548887a330.989827 330.989827 0 0 0-235.785764 98.095776 66.73182 66.73182 0 0 1-111.2197-66.73182l60.503517-203.309612a66.798552 66.798552 0 1 1 128.125094 37.814698l-9.564894 31.808835A468.234937 468.234937 0 1 1 511.682434 1024z" fill="#2EA4FF" ></path><path d="M600.658194 712.58484h-133.46364a66.73182 66.73182 0 0 1-66.73182-66.73182V423.41362a66.73182 66.73182 0 0 1 133.46364 0v155.70758h66.73182a66.73182 66.73182 0 0 1 0 133.46364z" fill="#2EA4FF" ></path></symbol><symbol id="icon-ceshiji" viewBox="0 0 1073 1024"><path d="M536.332172 562.02102a75.330291 75.330291 0 0 1-29.985844-6.338471l-463.195967-207.95061a73.136205 73.136205 0 0 1 0-133.351681l463.195967-207.95061a73.136205 73.136205 0 0 1 59.971688 0l463.195966 207.95061a73.136205 73.136205 0 0 1 0 133.351681l-463.195966 207.95061a75.330291 75.330291 0 0 1-29.985844 6.338471zM251.832333 281.177992L536.332172 408.678776l284.499838-127.500784L536.332172 153.43342z" fill="#2EA4FF" ></path><path d="M536.332172 793.131429a73.136205 73.136205 0 0 1-31.204781-7.069834l-463.195967-219.408615a73.184963 73.184963 0 0 1 62.409562-132.376532L536.332172 638.570248l431.259823-215.020443a73.136205 73.136205 0 0 1 65.33501 130.913807l-463.195966 230.866621a73.136205 73.136205 0 0 1-33.398867 7.801196z" fill="#2EA4FF" ></path><path d="M536.332172 1023.99805a73.136205 73.136205 0 0 1-31.204781-7.069833l-463.195967-219.408616a73.136205 73.136205 0 0 1 62.409562-131.888957L536.332172 869.680657l431.259823-215.264231a73.136205 73.136205 0 0 1 65.33501 130.913807l-463.195966 230.866621A73.136205 73.136205 0 0 1 536.332172 1023.99805z" fill="#2EA4FF" ></path></symbol><symbol id="icon-guolvqi" viewBox="0 0 1024 1024"><path d="M908.6 134.7c6.5 15.5 3.8 28.8-8 39.7L620.9 454.1V875c0 15.8-7.4 27.1-22.1 33.5-4.9 2-9.7 2.9-14.2 2.9-10.3 0-18.7-3.6-25.5-10.7L413.8 755.2c-7.2-7.2-10.7-15.7-10.7-25.5V454.1L123.4 174.4c-11.7-11-14.3-24.2-8-39.7 6.5-14.8 17.5-22.1 33.5-22.1H875c16-0.1 27.2 7.3 33.6 22.1z"  ></path></symbol><symbol id="icon-jiashang1" viewBox="0 0 1024 1024"><path d="M512 1024C228.693333 1024 0 795.306667 0 512S228.693333 0 512 0s512 228.693333 512 512-228.693333 512-512 512z m0-989.866667C249.173333 34.133333 34.133333 249.173333 34.133333 512s215.04 477.866667 477.866667 477.866667 477.866667-215.04 477.866667-477.866667S774.826667 34.133333 512 34.133333z" fill="#4CACFF" ></path><path d="M699.733333 563.2h-375.466666c-20.48 0-34.133333-13.653333-34.133334-34.133333s13.653333-34.133333 34.133334-34.133334h375.466666c20.48 0 34.133333 13.653333 34.133334 34.133334s-13.653333 34.133333-34.133334 34.133333z" fill="#4CACFF" ></path><path d="M512 750.933333c-20.48 0-34.133333-13.653333-34.133333-34.133333V341.333333c0-20.48 13.653333-34.133333 34.133333-34.133333s34.133333 13.653333 34.133333 34.133333v375.466667c0 20.48-13.653333 34.133333-34.133333 34.133333z" fill="#4CACFF" ></path></symbol><symbol id="icon-jianqu1" viewBox="0 0 1024 1024"><path d="M512 1024C228.693333 1024 0 795.306667 0 512S228.693333 0 512 0s512 228.693333 512 512-228.693333 512-512 512z m0-989.866667C249.173333 34.133333 34.133333 249.173333 34.133333 512s215.04 477.866667 477.866667 477.866667 477.866667-215.04 477.866667-477.866667S774.826667 34.133333 512 34.133333z" fill="#DDDDDD" ></path><path d="M699.733333 563.2h-375.466666c-20.48 0-34.133333-13.653333-34.133334-34.133333s13.653333-34.133333 34.133334-34.133334h375.466666c20.48 0 34.133333 13.653333 34.133334 34.133334s-13.653333 34.133333-34.133334 34.133333z" fill="#888888" ></path></symbol><symbol id="icon-jiashang" viewBox="0 0 1024 1024"><path d="M512 1024C228.693333 1024 0 795.306667 0 512S228.693333 0 512 0s512 228.693333 512 512-228.693333 512-512 512z m0-989.866667C249.173333 34.133333 34.133333 249.173333 34.133333 512s215.04 477.866667 477.866667 477.866667 477.866667-215.04 477.866667-477.866667S774.826667 34.133333 512 34.133333z" fill="#DDDDDD" ></path><path d="M699.733333 563.2h-375.466666c-20.48 0-34.133333-13.653333-34.133334-34.133333s13.653333-34.133333 34.133334-34.133334h375.466666c20.48 0 34.133333 13.653333 34.133334 34.133334s-13.653333 34.133333-34.133334 34.133333z" fill="#888888" ></path><path d="M512 750.933333c-20.48 0-34.133333-13.653333-34.133333-34.133333V341.333333c0-20.48 13.653333-34.133333 34.133333-34.133333s34.133333 13.653333 34.133333 34.133333v375.466667c0 20.48-13.653333 34.133333-34.133333 34.133333z" fill="#888888" ></path></symbol><symbol id="icon-jianqu" viewBox="0 0 1024 1024"><path d="M512 1024C228.693333 1024 0 795.306667 0 512S228.693333 0 512 0s512 228.693333 512 512-228.693333 512-512 512z m0-989.866667C249.173333 34.133333 34.133333 249.173333 34.133333 512s215.04 477.866667 477.866667 477.866667 477.866667-215.04 477.866667-477.866667S774.826667 34.133333 512 34.133333z" fill="#4CACFF" ></path><path d="M699.733333 563.2h-375.466666c-20.48 0-34.133333-13.653333-34.133334-34.133333s13.653333-34.133333 34.133334-34.133334h375.466666c20.48 0 34.133333 13.653333 34.133334 34.133334s-13.653333 34.133333-34.133334 34.133333z" fill="#4CACFF" ></path></symbol><symbol id="icon-shanchu2" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#EEEEEE" ></path><path d="M665.6 716.8c-15.36 0-25.6-5.12-35.84-15.36L512 583.68l-117.76 117.76c-20.48 20.48-51.2 20.48-71.68 0s-20.48-51.2 0-71.68L440.32 512 322.56 394.24c-20.48-20.48-20.48-51.2 0-71.68s51.2-20.48 71.68 0L512 440.32l117.76-117.76c20.48-20.48 51.2-20.48 71.68 0s20.48 51.2 0 71.68L583.68 512l117.76 117.76c20.48 20.48 20.48 51.2 0 71.68-10.24 10.24-20.48 15.36-35.84 15.36z" fill="#BBBBBB" ></path></symbol><symbol id="icon-shijuan1" viewBox="0 0 1024 1024"><path d="M352.256 30.72h436.224c112.64 0 204.8 92.16 204.8 204.8v552.96c0 112.64-92.16 204.8-204.8 204.8H352.256c-112.64 0-204.8-92.16-204.8-204.8v-552.96c0-112.64 90.112-204.8 204.8-204.8z" fill="#FFFFFF" ></path><path d="M788.48 1024H352.256c-129.024 0-235.52-106.496-235.52-235.52v-552.96C116.736 106.496 221.184 0 352.256 0h436.224C917.504 0 1024 106.496 1024 235.52v552.96C1024 917.504 917.504 1024 788.48 1024zM352.256 61.44c-96.256 0-174.08 77.824-174.08 174.08v552.96c0 96.256 77.824 174.08 174.08 174.08h436.224c96.256 0 174.08-77.824 174.08-174.08v-552.96C962.56 139.264 884.736 61.44 788.48 61.44H352.256z" fill="#3B77E3" ></path><path d="M311.296 331.776m-40.96 0a40.96 40.96 0 1 0 81.92 0 40.96 40.96 0 1 0-81.92 0Z" fill="#3B77E3" ></path><path d="M311.296 563.2m-40.96 0a40.96 40.96 0 1 0 81.92 0 40.96 40.96 0 1 0-81.92 0Z" fill="#3B77E3" ></path><path d="M841.728 350.208H471.04c-16.384 0-30.72-14.336-30.72-30.72s14.336-30.72 30.72-30.72h370.688c16.384 0 30.72 14.336 30.72 30.72s-12.288 30.72-30.72 30.72zM841.728 581.632H471.04c-16.384 0-30.72-14.336-30.72-30.72s14.336-30.72 30.72-30.72h370.688c16.384 0 30.72 14.336 30.72 30.72s-12.288 30.72-30.72 30.72z" fill="#3B77E3" ></path><path d="M819.2 993.28c-26.624-32.768-43.008-61.44-47.104-88.064-4.096-24.576-2.048-59.392 8.192-104.448v-6.144c0-16.384-14.336-30.72-30.72-30.72H61.44c-16.384 0-30.72 14.336-30.72 30.72v83.968c0 63.488 51.2 114.688 114.688 114.688H819.2z" fill="#FFFFFF" ></path><path d="M882.688 1024h-737.28C65.536 1024 0 958.464 0 878.592v-83.968c0-34.816 26.624-61.44 61.44-61.44h688.128c34.816 0 61.44 26.624 61.44 61.44 0 4.096 0 8.192-2.048 12.288-8.192 43.008-10.24 73.728-8.192 94.208 4.096 18.432 16.384 43.008 40.96 73.728l40.96 49.152zM61.44 794.624v83.968C61.44 925.696 98.304 962.56 145.408 962.56h614.4c-10.24-18.432-16.384-34.816-18.432-51.2-4.096-26.624-2.048-63.488 8.192-116.736H61.44z" fill="#3B77E3" ></path></symbol><symbol id="icon-zuoyoutuodong" viewBox="0 0 2048 1024"><path d="M558.848 972.288L35.84 541.696a38.4 38.4 0 0 1 0-59.392L558.848 51.712a38.4 38.4 0 0 1 62.72 29.696v221.44a38.4 38.4 0 0 0 38.4 38.4h728.064a38.4 38.4 0 0 0 38.4-38.4V81.536a38.4 38.4 0 0 1 62.72-29.696l522.88 430.592a38.4 38.4 0 0 1 0 59.392l-522.88 430.592a38.4 38.4 0 0 1-62.72-29.696v-221.44a38.4 38.4 0 0 0-38.4-38.4H659.968a38.4 38.4 0 0 0-38.4 38.4v221.44a38.4 38.4 0 0 1-62.72 29.696z" fill="#666666" ></path></symbol><symbol id="icon-shangxiatuodong" viewBox="0 0 1024 1024"><path d="M742.144 744.576L526.848 1006.08a19.2 19.2 0 0 1-29.696 0L281.856 744.576a19.2 19.2 0 0 1 14.848-31.36h110.72a19.2 19.2 0 0 0 19.2-19.2V329.984a19.2 19.2 0 0 0-19.2-19.2H296.768a19.2 19.2 0 0 1-14.848-31.36L497.152 17.92a19.2 19.2 0 0 1 29.696 0l215.296 261.44a19.2 19.2 0 0 1-14.848 31.36h-110.72a19.2 19.2 0 0 0-19.2 19.2v364.032a19.2 19.2 0 0 0 19.2 19.2h110.72a19.2 19.2 0 0 1 14.848 31.36z" fill="#666666" ></path></symbol><symbol id="icon-bianzu2" viewBox="0 0 1024 1024"><path d="M512 542.117647m-240.941176 0a240.941176 240.941176 0 1 0 481.882352 0 240.941176 240.941176 0 1 0-481.882352 0Z" fill="#050F37" fill-opacity=".303" ></path><path d="M512 361.411765m-361.411765 0a361.411765 361.411765 0 1 0 722.82353 0 361.411765 361.411765 0 1 0-722.82353 0Z" fill="#EEEEEE" ></path><path d="M402.552471 469.714824L279.491765 368.399059a9.035294 9.035294 0 0 1 0-13.974588l123.030588-101.315765a9.035294 9.035294 0 0 1 14.757647 6.987294v52.103529a9.035294 9.035294 0 0 0 9.035294 9.035295h171.309177a9.035294 9.035294 0 0 0 9.035294-9.035295v-52.103529a9.035294 9.035294 0 0 1 14.757647-6.987294l123.030588 101.315765a9.035294 9.035294 0 0 1 0 13.974588l-123.030588 101.315765a9.035294 9.035294 0 0 1-14.757647-6.987295v-52.103529a9.035294 9.035294 0 0 0-9.035294-9.035294H426.345412a9.035294 9.035294 0 0 0-9.035294 9.035294v52.103529a9.035294 9.035294 0 0 1-14.757647 6.987295z" fill="#666666" ></path></symbol><symbol id="icon-fuzhi3" viewBox="0 0 1024 1024"><path d="M648.533333 1024h-477.866666C75.093333 1024 0 948.906667 0 853.333333v-477.866666C0 279.893333 75.093333 204.8 170.666667 204.8h477.866666C744.106667 204.8 819.2 279.893333 819.2 375.466667v477.866666c0 95.573333-75.093333 170.666667-170.666667 170.666667z m-477.866666-750.933333C116.053333 273.066667 68.266667 320.853333 68.266667 375.466667v477.866666c0 54.613333 47.786667 102.4 102.4 102.4h477.866666c54.613333 0 102.4-47.786667 102.4-102.4v-477.866666c0-54.613333-47.786667-102.4-102.4-102.4h-477.866666z" fill="#A0A7B4" ></path><path d="M955.733333 785.066667c-20.48 0-34.133333-13.653333-34.133333-34.133334V204.8c0-54.613333-47.786667-102.4-102.4-102.4H273.066667c-20.48 0-34.133333-13.653333-34.133334-34.133333s13.653333-34.133333 34.133334-34.133334h546.133333c95.573333 0 170.666667 75.093333 170.666667 170.666667v546.133333c0 20.48-13.653333 34.133333-34.133334 34.133334z" fill="#A0A7B4" ></path></symbol><symbol id="icon-jianhao" viewBox="0 0 1024 1024"><path d="M768 554.666667H256c-25.6 0-42.666667-17.066667-42.666667-42.666667s17.066667-42.666667 42.666667-42.666667h512c25.6 0 42.666667 17.066667 42.666667 42.666667s-17.066667 42.666667-42.666667 42.666667z"  ></path></symbol><symbol id="icon-shitilan" viewBox="0 0 1024 1024"><path d="M816.118519 1024H184.019753c-69.530864 0-126.419753-56.888889-126.419753-126.419753V139.061728C57.6 69.530864 114.488889 12.641975 184.019753 12.641975h568.888889l189.62963 189.62963v695.308642c0 69.530864-56.888889 126.419753-126.419753 126.419753zM727.624691 75.851852H184.019753c-37.925926 0-63.209877 25.283951-63.209876 63.209876v758.518519c0 37.925926 25.283951 63.209877 63.209876 63.209876h632.098766c37.925926 0 63.209877-25.283951 63.209876-63.209876V227.555556L727.624691 75.851852z" fill="#FFFFFF" ></path><path d="M955.180247 233.876543h-189.62963c-25.283951 0-44.246914-18.962963-44.246913-44.246913l6.320987-189.62963 227.555556 233.876543z m-170.666667-82.172839v18.962963h18.962963l-18.962963-18.962963zM670.735802 328.691358H329.402469c-18.962963 0-31.604938-12.641975-31.604938-31.604938S310.439506 265.481481 329.402469 265.481481h341.333333c18.962963 0 31.604938 12.641975 31.604939 31.604939s-12.641975 31.604938-31.604939 31.604938zM670.735802 581.530864H329.402469c-18.962963 0-31.604938-12.641975-31.604938-31.604938S310.439506 518.320988 329.402469 518.320988h341.333333c18.962963 0 31.604938 12.641975 31.604939 31.604938s-12.641975 31.604938-31.604939 31.604938zM670.735802 834.37037H329.402469c-18.962963 0-31.604938-12.641975-31.604938-31.604938s12.641975-31.604938 31.604938-31.604938h341.333333c18.962963 0 31.604938 12.641975 31.604939 31.604938s-12.641975 31.604938-31.604939 31.604938z" fill="#FFFFFF" ></path></symbol><symbol id="icon-shanchu1" viewBox="0 0 1024 1024"><path d="M672 992H358.4c-76.8 0-140.8-57.6-153.6-140.8L96 326.4c0-19.2 6.4-32 25.6-38.4 19.2-6.4 32 6.4 38.4 25.6l102.4 524.8c12.8 51.2 51.2 89.6 96 89.6h313.6c44.8 0 83.2-38.4 96-89.6l102.4-524.8c6.4-19.2 19.2-25.6 38.4-25.6 19.2 6.4 25.6 19.2 25.6 38.4L832 851.2c-19.2 83.2-83.2 140.8-160 140.8zM608 192v-6.4c0-51.2-44.8-89.6-96-89.6S416 140.8 416 192h-64C352 102.4 422.4 32 512 32c83.2 0 153.6 64 160 153.6V192h-64z" fill="#4CACFF" ></path><path d="M384 857.6c-12.8 0-25.6-12.8-32-25.6L256 320c0-19.2 12.8-32 25.6-38.4 19.2 0 38.4 12.8 38.4 25.6l96 512c0 19.2-6.4 38.4-32 38.4 6.4 0 0 0 0 0zM640 857.6s-6.4 0 0 0c-25.6-6.4-32-19.2-32-38.4l96-512c0-19.2 19.2-32 38.4-25.6 12.8 6.4 25.6 19.2 25.6 38.4l-96 512c-6.4 12.8-19.2 25.6-32 25.6zM512 857.6c-19.2 0-32-12.8-32-32v-512c0-19.2 12.8-32 32-32s32 12.8 32 32v512c0 19.2-12.8 32-32 32zM992 256H32C12.8 256 0 243.2 0 224S12.8 192 32 192h960c19.2 0 32 12.8 32 32s-12.8 32-32 32z" fill="#4CACFF" ></path></symbol><symbol id="icon-jiexi" viewBox="0 0 1024 1024"><path d="M506.311111 995.555556c-73.955556 0-147.911111-17.066667-216.177778-51.2-11.377778-5.688889-22.755556-22.755556-11.377777-39.822223 5.688889-11.377778 22.755556-22.755556 39.822222-11.377777 56.888889 28.444444 125.155556 45.511111 187.733333 45.511111 238.933333 0 432.355556-187.733333 432.355556-426.666667 0-85.333333-22.755556-164.977778-73.955556-233.244444-11.377778-11.377778-5.688889-28.444444 5.688889-39.822223 11.377778-11.377778 28.444444-5.688889 39.822222 5.688889 51.2 79.644444 79.644444 170.666667 79.644445 267.377778 5.688889 267.377778-216.177778 483.555556-483.555556 483.555556z m-301.511111-125.155556c-5.688889 0-11.377778 0-17.066667-5.688889C85.333333 773.688889 28.444444 642.844444 28.444444 506.311111 28.444444 244.622222 238.933333 28.444444 500.622222 28.444444c119.466667 0 233.244444 45.511111 318.577778 125.155556 11.377778 11.377778 11.377778 28.444444 0 39.822222-11.377778 11.377778-28.444444 11.377778-39.822222 0-79.644444-73.955556-176.355556-113.777778-278.755556-113.777778-227.555556 0-415.288889 187.733333-415.288889 420.977778 0 125.155556 51.2 238.933333 142.222223 318.577778 11.377778 11.377778 11.377778 28.444444 0 39.822222-5.688889 11.377778-11.377778 11.377778-22.755556 11.377778z" fill="#4CACFF" ></path><path d="M512 864.711111c-56.888889 0-102.4-45.511111-102.4-102.4v-34.133333c-62.577778-34.133333-102.4-102.4-102.4-170.666667C307.2 449.422222 398.222222 358.4 512 358.4s204.8 91.022222 204.8 199.111111c0 68.266667-39.822222 136.533333-102.4 170.666667v34.133333c0 51.2-39.822222 96.711111-91.022222 102.4H512z m0-449.422222c-79.644444 0-147.911111 62.577778-147.911111 142.222222 0 51.2 28.444444 96.711111 73.955555 125.155556l28.444445 17.066666v68.266667c0 22.755556 17.066667 45.511111 45.511111 45.511111h5.688889c22.755556 0 39.822222-22.755556 39.822222-45.511111v-68.266667l28.444445-17.066666c45.511111-22.755556 73.955556-73.955556 73.955555-125.155556 0-73.955556-68.266667-142.222222-147.911111-142.222222zM676.977778 398.222222c-5.688889 0-17.066667 0-22.755556-5.688889-11.377778-11.377778-11.377778-28.444444 0-39.822222L739.555556 267.377778c11.377778-11.377778 28.444444-11.377778 39.822222 0s11.377778 28.444444 0 39.822222l-85.333334 85.333333c-5.688889 0-11.377778 5.688889-17.066666 5.688889zM347.022222 398.222222c-5.688889 0-11.377778-5.688889-17.066666-5.688889L238.933333 301.511111c-11.377778-11.377778-11.377778-28.444444 0-39.822222s28.444444-11.377778 39.822223 0l85.333333 85.333333c11.377778 11.377778 11.377778 28.444444 0 39.822222 0 5.688889-5.688889 11.377778-17.066667 11.377778zM512 335.644444c-17.066667 0-28.444444-11.377778-28.444444-28.444444V210.488889c0-17.066667 11.377778-28.444444 28.444444-28.444445s28.444444 11.377778 28.444444 28.444445v102.4c0 11.377778-11.377778 22.755556-28.444444 22.755555z" fill="#4CACFF" ></path></symbol><symbol id="icon-gongkai" viewBox="0 0 1024 1024"><path d="M512 853.333333C432.355556 853.333333 369.777778 790.755556 369.777778 711.111111S432.355556 568.888889 512 568.888889s142.222222 62.577778 142.222222 142.222222S591.644444 853.333333 512 853.333333z m0-227.555555c-45.511111 0-85.333333 39.822222-85.333333 85.333333S466.488889 796.444444 512 796.444444 597.333333 756.622222 597.333333 711.111111 557.511111 625.777778 512 625.777778zM256 426.666667c-17.066667 0-28.444444-11.377778-28.444444-28.444445V233.244444C244.622222 113.777778 352.711111 28.444444 483.555556 28.444444c142.222222 0 250.311111 96.711111 256 221.866667v5.688889c0 17.066667-11.377778 28.444444-28.444445 28.444444s-28.444444-11.377778-28.444444-28.444444c-5.688889-96.711111-91.022222-170.666667-199.111111-170.666667-102.4 0-187.733333 68.266667-199.111112 153.6V398.222222c0 17.066667-11.377778 28.444444-28.444444 28.444445z" fill="#4CACFF" ></path><path d="M739.555556 1024h-455.111112C176.355556 1024 85.333333 932.977778 85.333333 824.888889v-227.555556C85.333333 489.244444 176.355556 398.222222 284.444444 398.222222h455.111112c108.088889 0 199.111111 91.022222 199.111111 199.111111v227.555556c0 108.088889-91.022222 199.111111-199.111111 199.111111z m-455.111112-568.888889C204.8 455.111111 142.222222 517.688889 142.222222 597.333333v227.555556C142.222222 904.533333 204.8 967.111111 284.444444 967.111111h455.111112c79.644444 0 142.222222-62.577778 142.222222-142.222222v-227.555556C881.777778 517.688889 819.2 455.111111 739.555556 455.111111h-455.111112z" fill="#4CACFF" ></path></symbol><symbol id="icon-bianji2" viewBox="0 0 1024 1024"><path d="M704.752941 993.882353H198.776471c-78.305882 0-138.541176-60.235294-138.541177-132.517647V228.894118c0-72.282353 66.258824-132.517647 138.541177-132.517647h319.247058c18.070588 0 30.117647 12.047059 30.117647 30.117647s-12.047059 24.094118-30.117647 24.094117H198.776471c-42.164706 0-78.305882 36.141176-78.305883 72.282353v632.470588c0 42.164706 36.141176 72.282353 78.305883 72.282353h499.952941c42.164706 0 78.305882-36.141176 78.305882-72.282353V602.352941c0-18.070588 12.047059-30.117647 30.117647-30.117647s30.117647 12.047059 30.117647 30.117647v259.011765c6.023529 72.282353-60.235294 132.517647-132.517647 132.517647z" fill="#4CACFF" ></path><path d="M313.223529 734.870588c-24.094118 0-54.211765-18.070588-60.235294-48.188235v-30.117647l36.141177-126.494118 445.741176-445.741176c48.188235-48.188235 120.470588-48.188235 168.658824 0 48.188235 48.188235 48.188235 120.470588 0 168.658823l-445.741177 445.741177-126.494117 30.117647c-6.023529 6.023529-12.047059 6.023529-18.070589 6.023529z m36.141177-174.682353l-36.141177 114.447059 120.470589-30.117647 433.694117-433.694118c12.047059-12.047059 18.070588-24.094118 18.070589-42.164705 0-18.070588-6.023529-30.117647-18.070589-42.164706-24.094118-24.094118-60.235294-24.094118-84.329411 0L349.364706 560.188235z" fill="#4CACFF" ></path></symbol><symbol id="icon-fangda" viewBox="0 0 1024 1024"><path d="M603.022222 477.866667c-17.066667 0-28.444444-5.688889-39.822222-17.066667-22.755556-22.755556-22.755556-56.888889 0-79.644444L830.577778 113.777778h-182.044445c-34.133333 0-56.888889-22.755556-56.888889-56.888889s22.755556-56.888889 56.888889-56.888889H967.111111c5.688889 0 17.066667 0 22.755556 5.688889 5.688889 0 11.377778 5.688889 17.066666 11.377778 5.688889 5.688889 11.377778 11.377778 11.377778 17.066666 5.688889 5.688889 5.688889 17.066667 5.688889 22.755556v318.577778c0 34.133333-22.755556 56.888889-56.888889 56.888889s-56.888889-22.755556-56.888889-56.888889V193.422222l-267.377778 267.377778c-11.377778 11.377778-22.755556 17.066667-39.822222 17.066667zM375.466667 1024H56.888889c-5.688889 0-17.066667 0-22.755556-5.688889-5.688889 0-11.377778-5.688889-17.066666-11.377778-5.688889-5.688889-11.377778-11.377778-11.377778-17.066666-5.688889-5.688889-5.688889-17.066667-5.688889-22.755556v-318.577778c0-34.133333 22.755556-56.888889 56.888889-56.888889s56.888889 22.755556 56.888889 56.888889v182.044445l267.377778-267.377778c22.755556-22.755556 56.888889-22.755556 79.644444 0s22.755556 56.888889 0 79.644444L193.422222 910.222222h182.044445c34.133333 0 56.888889 22.755556 56.888889 56.888889s-22.755556 56.888889-56.888889 56.888889z" fill="#888888" ></path></symbol><symbol id="icon-suoxiao2" viewBox="0 0 1024 1024"><path d="M921.6 477.866667h-318.577778c-5.688889 0-17.066667 0-22.755555-5.688889-5.688889 0-11.377778-5.688889-17.066667-11.377778-5.688889-5.688889-11.377778-11.377778-11.377778-17.066667 0-5.688889-5.688889-11.377778-5.688889-22.755555V102.4c0-34.133333 22.755556-56.888889 56.888889-56.888889s56.888889 22.755556 56.888889 56.888889V284.444444L927.288889 17.066667c22.755556-22.755556 56.888889-22.755556 79.644444 0s22.755556 56.888889 0 79.644444L739.555556 364.088889h182.044444c34.133333 0 56.888889 22.755556 56.888889 56.888889s-22.755556 56.888889-56.888889 56.888889zM56.888889 1024c-17.066667 0-28.444444-5.688889-39.822222-17.066667-22.755556-22.755556-22.755556-56.888889 0-79.644444L284.444444 659.911111H102.4c-34.133333 0-56.888889-22.755556-56.888889-56.888889s22.755556-56.888889 56.888889-56.888889h318.577778c5.688889 0 17.066667 0 22.755555 5.688889 5.688889 0 11.377778 5.688889 17.066667 11.377778 5.688889 5.688889 11.377778 11.377778 11.377778 17.066667 0 5.688889 5.688889 11.377778 5.688889 22.755555v318.577778c0 34.133333-22.755556 56.888889-56.888889 56.888889s-56.888889-22.755556-56.888889-56.888889V739.555556l-267.377778 267.377777c-11.377778 11.377778-22.755556 17.066667-39.822222 17.066667z" fill="#888888" ></path></symbol><symbol id="icon-jiantou9" viewBox="0 0 1024 1024"><path d="M944.083879 289.536302c14.264888 18.286482 15.462157 41.208541 2.670829 51.196009l-417.191704 325.421604c-2.885723 2.261507-12.156878 7.828292-13.732769 9.578146-15.544021 17.181311-37.893029 22.338774-49.947576 11.461029l-392.908648-354.309538c-12.054547-10.887978-9.271154-33.666774 6.272867-50.889017 15.544021-17.21201 37.893029-22.349007 49.988508-11.471262l357.584118 322.443783 408.258241-318.463122C907.910005 264.516466 929.84969 271.260054 944.083879 289.536302z"  ></path></symbol><symbol id="icon-changyongtubiao-xianxingdaochu-zhuanqu-" viewBox="0 0 1024 1024"><path d="M904.5504 677.2736L531.456 304.1792a30.72 30.72 0 0 0-43.4688 0l-373.0944 373.0944a30.72 30.72 0 1 0 43.4176 43.4688l351.4368-351.3856 351.3856 351.3856a30.72 30.72 0 1 0 43.4176-43.4688z" fill="#666666" ></path></symbol><symbol id="icon-wenti" viewBox="0 0 1194 1024"><path d="M1001.92929543 376.49706231l-391.49453142 158.74738807h-0.18530883a40.15011728 40.15011728 0 0 1-30.94647499 0h-0.24707773L187.56137103 376.49706231A39.65596257 39.65596257 0 0 1 162.54475911 339.80603164c0-16.49243317 10.31549167-30.69939728 25.01661192-36.62926107L579.05590247 144.42938248l0.24707772-0.06176959a41.20019777 41.20019777 0 0 1 30.94647498 0l0.18530884 0.0617696 391.49453143 158.74738808a39.53242335 39.53242335 0 0 1 25.01661192 36.62926107 39.77950107 39.77950107 0 0 1-25.01661193 36.69103068z m0.37061623 172.08958125l-391.43276182 158.74738807h-0.24707772a40.02657879 40.02657879 0 0 1-30.94647572 0H579.48828828L187.99375685 548.58664356A39.53242335 39.53242335 0 0 1 162.91537532 511.95738249c0-21.98991041 18.09843798-39.71773147 40.52073423-39.71773219 5.49747796 0 10.68610789 1.11184938 15.44235341 3.02670151v0.06176888h0.247077l375.99040985 152.38513918 375.99040914-152.44690806a41.07665855 41.07665855 0 0 1 15.50412229-3.08847113h0.18530812a40.15011728 40.15011728 0 0 1 40.52073423 39.71773219 39.90304029 39.90304029 0 0 1-25.01661193 36.69103068zM203.43610956 644.39100116c5.49747796 0 10.68610789 1.11184938 15.4423534 3.08847039h0.247077l375.99040985 152.38513845 375.99040914-152.44690807a41.07665855 41.07665855 0 0 1 15.50412229-3.08847039l0.1235385 0.06176962c22.42229624 0 40.52073423 17.72782104 40.52073424 39.71773145a39.71773147 39.71773147 0 0 1-25.07838082 36.62926107l-391.43276254 158.74738808h-0.18530811a40.58250384 40.58250384 0 0 1-30.946475 0h-0.24707771L187.87021764 720.73799368a39.53242335 39.53242335 0 0 1-25.0166112-36.62926107 40.15011728 40.15011728 0 0 1 40.58250311-39.71773145z"  ></path></symbol><symbol id="icon-chuangjianzhe1" viewBox="0 0 1024 1024"><path d="M512.000731 551.350857c150.016 0 271.652571-123.392 271.652572-275.675428V68.900571A68.461714 68.461714 0 0 0 715.776731 0H512.000731C361.984731 0 240.34816 123.465143 240.34816 275.748571c0 152.137143 121.636571 275.602286 271.652571 275.602286z" fill="#85aef5" ></path><path d="M240.34816 610.450286h543.305143c112.566857 0 203.776 92.598857 203.776 206.774857v137.874286c0 38.034286-30.427429 68.900571-67.949714 68.900571H104.595017A68.461714 68.461714 0 0 1 36.57216 955.099429v-137.874286c0-114.176 91.209143-206.774857 203.776-206.774857z" fill="#4385f7" ></path></symbol><symbol id="icon-shu1" viewBox="0 0 1102 1024"><path d="M0 1.304362m61.279822 0l122.480878 0q61.279822 0 61.279821 61.279822l0 857.602442q0 61.279822-61.279821 61.279822l-122.480878 0q-61.279822 0-61.279822-61.279822l0-857.602442q0-61.279822 61.279822-61.279822Z" fill="#5091FF" ></path><path d="M306.320343 1.304362m61.279822 0l122.480878 0q61.279822 0 61.279821 61.279822l0 857.602442q0 61.279822-61.279821 61.279822l-122.480878 0q-61.279822 0-61.279822-61.279822l0-857.602442q0-61.279822 61.279822-61.279822Z" fill="#5091FF" ></path><path d="M658.009809 33.913419L776.394863 2.092021a61.279822 61.279822 0 0 1 75.063843 43.32121l221.962131 828.459082a61.279822 61.279822 0 0 1-43.321211 74.985078l-118.385054 31.742632a61.279822 61.279822 0 0 1-74.985077-43.32121L614.688598 108.898497a61.279822 61.279822 0 0 1 43.321211-75.063844z" fill="#B6D0FC" ></path></symbol><symbol id="icon-biaoqian2" viewBox="0 0 1024 1024"><path d="M753.37797 268.521842l256.957652 453.093464c25.58611 45.104657 12.939262 102.052029-27.706103 131.878123l-8.479968 5.555841-256.592135 150.884949c-44.373626 26.097833-100.151346 13.158571-129.538822-28.144722l-5.482738-8.626174-25.293698-44.592935a25.58611 25.58611 0 0 1-3.289643-14.328222l0.804135-4.897913 120.474029-457.772066 51.39153-179.833805a14.620635 14.620635 0 0 1 26.755761-3.21654z" fill="#B6D0FC" ></path><path d="M359.644283 1019.437631a98.61618 98.61618 0 0 0 120.98575-71.129387l166.163511-631.611411C682.17548 182.479408 603.955085 44.606825 472.150065 8.640064 340.418148-27.326697 205.031073 52.282658 169.72224 186.500083L3.485626 818.038391a100.809275 100.809275 0 0 0 69.886633 123.251949l286.272024 78.074188z m35.820554-719.262115a88.235529 88.235529 0 0 1-61.114252-107.827179A86.261744 86.261744 0 0 1 440.203979 130.137537c46.054999 12.573746 73.468688 60.82184 61.114252 107.754076a86.261744 86.261744 0 0 1-105.853394 62.283903z" fill="#5091FF" ></path></symbol><symbol id="icon-jilu1" viewBox="0 0 1024 1024"><path d="M78.769231 691.751385v302.867692c0 16.226462 13.154462 29.380923 29.380923 29.380923h886.468923a29.380923 29.380923 0 0 0 29.380923-29.380923V324.765538a29.380923 29.380923 0 0 0-52.932923-17.644307L676.233846 701.44a29.380923 29.380923 0 0 1-41.353846 5.828923L468.440615 580.686769a29.380923 29.380923 0 0 0-41.747692 6.301539L298.535385 767.684923a29.380923 29.380923 0 0 1-42.535385 5.828923L126.739692 668.829538a29.380923 29.380923 0 0 0-47.891692 22.843077z" fill="#5091FF" ></path><path d="M225.043692 630.153846a78.690462 78.690462 0 0 1-48.679384-16.856615L30.089846 498.294154a78.769231 78.769231 0 0 1 97.358769-123.825231l81.762462 64.196923 131.544615-182.272a78.769231 78.769231 0 0 1 113.112616-15.36L601.560615 359.187692 751.458462 184.083692l-3.072 0.393846A78.769231 78.769231 0 1 1 727.591385 28.356923l207.241846-27.648a78.769231 78.769231 0 0 1 70.262154 129.260308L671.665231 519.640615a78.690462 78.690462 0 0 1-109.016616 10.24l-142.572307-114.136615-131.15077 181.720615a78.769231 78.769231 0 0 1-63.803076 32.689231z" fill="#B6D0FC" ></path></symbol><symbol id="icon-tuijian1" viewBox="0 0 1097 1024"><path d="M729.526857 1015.442286a99.474286 99.474286 0 0 1-40.96-9.216c-66.706286-30.72-165.595429-77.385143-206.262857-96.768-69.046857 31.670857-138.093714 63.488-207.140571 95.378285-31.744 13.750857-62.683429 11.922286-85.577143-4.388571-21.577143-15.36-32.256-41.837714-29.403429-72.411429 8.192-71.533714 21.942857-169.398857 27.062857-205.750857-57.197714-59.172571-113.590857-119.222857-169.033143-179.931428a67.437714 67.437714 0 0 1-14.116571-69.266286c10.020571-26.331429 35.84-45.056 69.339429-49.810286l219.355428-39.131428C313.051429 349.622857 373.028571 248.246857 413.037714 182.052571c33.792-61.659429 67.218286-61.659429 84.845715-55.442285 19.163429 6.144 37.302857 24.356571 55.442285 56.100571 39.058286 65.755429 98.011429 167.058286 117.979429 201.435429l217.234286 39.350857c31.963429 4.608 57.417143 23.259429 67.291428 49.737143a67.730286 67.730286 0 0 1-13.458286 68.973714c-55.076571 61.220571-110.957714 121.417143-167.570285 180.955429 4.900571 36.132571 18.285714 134.290286 26.989714 205.458285 3.364571 31.451429-7.168 58.221714-29.037714 73.801143-12.653714 8.704-27.794286 13.238857-43.154286 13.019429z" fill="#5091FF" ></path><path d="M1021.805714 215.698286a26.770286 26.770286 0 0 1-11.629714 3.364571c-21.211429 1.389714-52.882286 3.072-65.828571 3.657143l-36.644572 55.076571c-5.778286 8.192-13.677714 12.141714-21.869714 10.971429-7.68-0.950857-14.409143-6.436571-18.432-15.067429-8.923429-20.187429-20.626286-48.274286-24.868572-58.660571a2543.689143 2543.689143 0 0 1-69.558857-23.771429 21.942857 21.942857 0 0 1-14.189714-16.457142 24.137143 24.137143 0 0 1 9.508571-23.186286l48.274286-41.764572a7717.302857 7717.302857 0 0 1-1.316571-71.021714c-1.170286-21.211429 7.094857-26.038857 12.434285-26.843428 5.705143-1.170286 12.946286 1.097143 22.308572 6.948571 19.748571 11.995429 49.956571 30.573714 60.196571 36.864l59.830857-20.553143a23.625143 23.625143 0 0 1 24.283429 3.657143c5.851429 5.046857 8.630857 12.873143 7.314286 20.260571-4.242286 24.137143-8.777143 48.274286-13.677715 72.192 6.802286 8.923429 25.234286 33.133714 38.326858 50.907429 5.705143 7.899429 7.168 16.530286 4.169142 23.771429a20.114286 20.114286 0 0 1-8.704 9.654857zM133.705143 278.381714a13.385143 13.385143 0 0 1-4.388572-4.169143c-5.851429-8.850286-14.482286-22.162286-17.993142-27.648-10.971429-0.731429-21.942857-1.462857-32.987429-2.048-4.973714-0.438857-8.704-2.925714-10.24-6.729142-1.462857-3.657143-0.731429-7.899429 1.901714-11.702858 6.582857-8.996571 15.725714-21.065143 19.163429-25.526857a1271.881143 1271.881143 0 0 1-7.021714-36.059428 10.971429 10.971429 0 0 1 3.584-10.24 12.068571 12.068571 0 0 1 12.434285-1.682286l30.134857 10.459429c5.12-3.145143 20.333714-12.361143 30.354286-18.285715 8.923429-5.851429 13.092571-3.437714 14.774857-1.389714 1.901714 2.194286 2.779429 5.924571 2.56 11.483429l-0.877714 35.254857 23.844571 20.772571c3.584 2.925714 5.339429 7.168 4.461715 11.410286a10.971429 10.971429 0 0 1-6.948572 8.192 1293.165714 1293.165714 0 0 1-34.669714 12.141714c-2.194286 5.193143-8.045714 19.236571-12.434286 29.330286-2.048 4.388571-5.412571 7.314286-9.289143 7.753143a10.020571 10.020571 0 0 1-6.363428-1.316572z" fill="#B6D0FC" ></path></symbol><symbol id="icon-jinggao1" viewBox="0 0 1024 1024"><path d="M512 0a512 512 0 1 1 0 1024A512 512 0 0 1 512 0z m0 736a96 96 0 1 0 0 192 96 96 0 0 0 0-192z m55.488-576H456.512a64 64 0 0 0-63.488 71.936l48 384a64 64 0 0 0 63.488 56.064h14.976a64 64 0 0 0 63.488-56.064l48-384A64 64 0 0 0 567.488 160z" fill="#FF5555" ></path></symbol><symbol id="icon-dianzan2" viewBox="0 0 1024 1024"><path d="M753.709604 1023.987953H121.672932A120.408016 120.408016 0 0 1 0 905.326727V531.513748a122.877615 122.877615 0 0 1 121.672932-120.829654h114.505072c79.027172 0 162.150264-157.331534 190.219366-304.302799a139.502233 139.502233 0 0 1 274.96878 27.707697l-34.092515 228.046397 212.867398 4.276623a144.140261 144.140261 0 0 1 116.312095 57.523589 135.767717 135.767717 0 0 1 21.985455 120.408016l-103.000353 360.441003A166.667824 166.667824 0 0 1 753.64937 1023.987953zM121.672932 470.918219A61.860446 61.860446 0 0 0 60.234125 531.513748v373.812979a60.113657 60.113657 0 0 0 61.499041 58.427101h631.976438a106.373465 106.373465 0 0 0 103.723163-75.292656l103.120822-360.802408a76.0757 76.0757 0 0 0-12.287761-67.582688 84.68918 84.68918 0 0 0-68.666903-33.429939L631.85597 421.646705a30.117062 30.117062 0 0 1-29.153317-34.574388l38.730543-257.44065A75.894997 75.894997 0 0 0 563.550472 60.241955a76.256402 76.256402 0 0 0-78.003191 57.342887C461.815035 241.908076 384.594887 432.428613 271.053562 465.798318V963.753828h-60.234125V470.918219z" fill="#333333" ></path></symbol><symbol id="icon-pinglun1" viewBox="0 0 1024 1024"><path d="M512.035266 1024H163.29535a90.331527 90.331527 0 0 1-89.006665-105.86855 344.163119 344.163119 0 0 0 11.020446-123.63375 492.848813 492.848813 0 0 1-46.309963-86.35694A511.999097 511.999097 0 1 1 512.035266 1024z m0-963.536291a451.356531 451.356531 0 0 0-375.59849 702.538398c12.40553 18.608295 16.681222 53.83759-2.770167 165.487358a30.110509 30.110509 0 0 0 24.509955 34.928191L512.035266 963.778982a451.657636 451.657636 0 0 0 0-903.315273z" fill="#333333" ></path><path d="M271.151194 512.121345m-60.221019 0a60.221018 60.221018 0 1 0 120.442037 0 60.221018 60.221018 0 1 0-120.442037 0Z" fill="#333333" ></path><path d="M512.035266 512.121345m-60.221018 0a60.221018 60.221018 0 1 0 120.442037 0 60.221018 60.221018 0 1 0-120.442037 0Z" fill="#333333" ></path><path d="M752.919339 512.121345m-60.221018 0a60.221018 60.221018 0 1 0 120.442036 0 60.221018 60.221018 0 1 0-120.442036 0Z" fill="#333333" ></path></symbol><symbol id="icon-duigou" viewBox="0 0 1024 1024"><path d="M512 0a512 512 0 1 0 512 512 512 512 0 0 0-512-512z m237.248 450.56l-256 256a64 64 0 0 1-90.496 0l-128-128a64 64 0 0 1 90.496-90.496L448 570.88l210.752-210.752a64 64 0 0 1 90.496 90.496z" fill="#33BD8C" ></path></symbol><symbol id="icon-tishi2" viewBox="0 0 1024 1024"><path d="M512 0a512 512 0 1 1 0 1024A512 512 0 0 1 512 0z m0 56.888889a455.111111 455.111111 0 1 0 0 910.222222A455.111111 455.111111 0 0 0 512 56.888889z" fill="#888888" ></path><path d="M512 227.555556a56.888889 56.888889 0 0 1 56.888889 56.888888v284.444445a56.888889 56.888889 0 0 1-113.777778 0V284.444444a56.888889 56.888889 0 0 1 56.888889-56.888888z" fill="#888888" ></path><path d="M512 739.555556m-56.888889 0a56.888889 56.888889 0 1 0 113.777778 0 56.888889 56.888889 0 1 0-113.777778 0Z" fill="#888888" ></path></symbol><symbol id="icon-bianji_Hover" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#5091FF" ></path><path d="M665.2416 505.9584l-224.8192 224.8704a22.3232 22.3232 0 0 1-11.264 6.144l-153.9072 30.6688c-10.24 2.048-18.8416-4.4544-19.2512-14.4896a18.7904 18.7904 0 0 1 0.3584-4.4032l30.72-153.856a22.3232 22.3232 0 0 1 6.144-11.264l224.768-224.8704 147.2512 147.2z m-51.2-243.2c7.936-7.9872 19.7632-9.0624 26.4192-2.4064l123.1872 123.1872c6.656 6.656 5.5808 18.432-2.4064 26.4192l-59.1872 59.1872-147.2-147.2 59.1872-59.1872z" fill="#FFFFFF" ></path></symbol><symbol id="icon-shangyi_Hover" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#33BD8C" ></path><path d="M512 768a51.2 51.2 0 0 1-51.2-51.2V430.7968L394.5984 496.9984a51.2 51.2 0 1 1-72.3968-72.3968l153.6-153.6A51.0464 51.0464 0 0 1 511.8464 256h0.3072a51.0464 51.0464 0 0 1 36.0448 15.0016l153.6 153.6a51.2 51.2 0 1 1-72.3968 72.3968L563.2 430.7968V716.8a51.2 51.2 0 0 1-51.2 51.2z" fill="#FFFFFF" ></path></symbol><symbol id="icon-shanchu_moren" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#EEEEEE" ></path><path d="M665.6 716.8a51.0464 51.0464 0 0 1-36.1984-15.0016L512 584.3968l-117.4016 117.4016a51.2 51.2 0 1 1-72.3968-72.3968L439.6032 512 322.2016 394.5984a51.2 51.2 0 0 1 72.3968-72.3968L512 439.6032l117.4016-117.4016a51.2 51.2 0 1 1 72.3968 72.3968L584.3968 512l117.4016 117.4016A51.2 51.2 0 0 1 665.6 716.8z" fill="#999999" ></path></symbol><symbol id="icon-xiayi_Hover" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#33BD8C" ></path><path d="M512 768h-0.1536a51.0464 51.0464 0 0 1-36.0448-15.0016l-153.6-153.6a51.2 51.2 0 0 1 72.3968-72.3968L460.8 593.2032V307.2a51.2 51.2 0 1 1 102.4 0v286.0032l66.2016-66.2016a51.2 51.2 0 0 1 72.3968 72.3968l-153.6 153.6a51.0464 51.0464 0 0 1-36.0448 15.0016H512z" fill="#FFFFFF" ></path></symbol><symbol id="icon-shanchu_Hover" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#FF5555" ></path><path d="M665.6 716.8a51.0464 51.0464 0 0 1-36.1984-15.0016L512 584.3968l-117.4016 117.4016a51.2 51.2 0 1 1-72.3968-72.3968L439.6032 512 322.2016 394.5984a51.2 51.2 0 0 1 72.3968-72.3968L512 439.6032l117.4016-117.4016a51.2 51.2 0 1 1 72.3968 72.3968L584.3968 512l117.4016 117.4016A51.2 51.2 0 0 1 665.6 716.8z" fill="#FFFFFF" ></path></symbol><symbol id="icon-xiayi_moren" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#EEEEEE" ></path><path d="M512 768h-0.1536a51.0464 51.0464 0 0 1-36.0448-15.0016l-153.6-153.6a51.2 51.2 0 0 1 72.3968-72.3968L460.8 593.2032V307.2a51.2 51.2 0 1 1 102.4 0v286.0032l66.2016-66.2016a51.2 51.2 0 0 1 72.3968 72.3968l-153.6 153.6a51.0464 51.0464 0 0 1-36.0448 15.0016H512z" fill="#999999" ></path></symbol><symbol id="icon-bianji_moren" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#EEEEEE" ></path><path d="M665.2416 505.9584l-224.8192 224.8704a22.3232 22.3232 0 0 1-11.264 6.144l-153.9072 30.6688c-10.24 2.048-18.8416-4.4544-19.2512-14.4896a18.7904 18.7904 0 0 1 0.3584-4.4032l30.72-153.856a22.3232 22.3232 0 0 1 6.144-11.264l224.768-224.8704 147.2512 147.2z m-51.2-243.2c7.936-7.9872 19.7632-9.0624 26.4192-2.4064l123.1872 123.1872c6.656 6.656 5.5808 18.432-2.4064 26.4192l-59.1872 59.1872-147.2-147.2 59.1872-59.1872z" fill="#999999" ></path></symbol><symbol id="icon-huifuchushidaima" viewBox="0 0 1024 1024"><path d="M40.618667 471.381333L470.812444 41.187556A57.457778 57.457778 0 0 1 568.888889 81.92v159.288889c0 31.800889 25.713778 57.514667 57.457778 57.514667h340.195555c31.744 0 57.457778 25.713778 57.457778 57.457777v311.751111a57.457778 57.457778 0 0 1-57.457778 57.457778h-340.195555A57.457778 57.457778 0 0 0 568.888889 782.791111v159.345778a57.457778 57.457778 0 0 1-98.076445 40.675555L40.618667 552.618667a57.457778 57.457778 0 0 1 0-81.237334z" fill="#999999" ></path></symbol><symbol id="icon-zaicizairu" viewBox="0 0 1024 1024"><path d="M563.307789 19.941053a21.557895 21.557895 0 0 1 12.39579 3.934315l273.623579 192.565895a21.557895 21.557895 0 0 1 0 35.247158L575.703579 444.200421a21.557895 21.557895 0 0 1-33.953684-17.623579V364.544l-10.778948-2.856421a351.070316 351.070316 0 0 0-431.858526 313.936842 434.283789 434.283789 0 0 1 442.691368-557.810526V41.498947c0-11.910737 9.593263-21.557895 21.557895-21.557894zM459.668211 1020.550737a21.557895 21.557895 0 0 1-12.39579-3.934316l-273.623579-192.512a21.557895 21.557895 0 0 1 0-35.247158l273.569684-192.512a21.557895 21.557895 0 0 1 33.953685 17.623579v62.032842l10.886736 2.856421a351.070316 351.070316 0 0 0 431.858527-313.936842 434.283789 434.283789 0 0 1-442.745263 557.810526v76.261053a21.557895 21.557895 0 0 1-21.557895 21.557895z" fill="#999999" ></path></symbol><symbol id="icon-kaiguan" viewBox="0 0 1024 1024"><path d="M512.003915 1023.992772A483.987172 483.987172 0 0 1 171.195027 198.473893a60.234869 60.234869 0 0 1 85.352809 84.931165 361.409214 361.409214 0 1 0 510.912158 0 60.234869 60.234869 0 0 1 85.413045-84.931165A484.047407 484.047407 0 0 1 512.003915 1023.992772z" fill="#999999" ></path><path d="M512.003915 0a60.234869 60.234869 0 0 1 60.234869 60.234869v361.409214a60.234869 60.234869 0 0 1-60.234869 60.234868 60.234869 60.234869 0 0 1-60.234869-60.234868V60.234869a60.234869 60.234869 0 0 1 60.234869-60.234869z" fill="#999999" ></path></symbol><symbol id="icon-mulu" viewBox="0 0 1024 1024"><path d="M881.777778 0a56.888889 56.888889 0 0 1 56.888889 56.888889v910.222222a56.888889 56.888889 0 0 1-56.888889 56.888889H142.222222a56.888889 56.888889 0 0 1-56.888889-56.888889V56.888889a56.888889 56.888889 0 0 1 56.888889-56.888889h739.555556zM483.555556 682.666667H256a56.888889 56.888889 0 0 0 0 113.777777h227.555556a56.888889 56.888889 0 0 0 0-113.777777z m284.444444-227.555556H256a56.888889 56.888889 0 1 0 0 113.777778h512a56.888889 56.888889 0 0 0 0-113.777778z m0-227.555555H256a56.888889 56.888889 0 1 0 0 113.777777h512a56.888889 56.888889 0 0 0 0-113.777777z" fill="#999999" ></path></symbol><symbol id="icon-suoxiao1" viewBox="0 0 1024 1024"><path d="M601.6 486.4h-1.536a63.168 63.168 0 0 1-22.336-4.608 63.936 63.936 0 0 1-40.064-57.856V108.8a64 64 0 0 1 128 0v159.104L914.688 18.752a64 64 0 0 1 90.496 90.496L756.096 358.4H915.2a64 64 0 0 1 0 128H601.6zM64 1024a64 64 0 0 1-45.248-109.248l249.152-249.216H108.8a64 64 0 0 1 0-128H423.936a63.36 63.36 0 0 1 22.4 4.672 64 64 0 0 1 40.064 57.792V915.2a64 64 0 0 1-128 0v-159.168l-249.152 249.216A63.808 63.808 0 0 1 64 1024z" fill="#999999" ></path></symbol><symbol id="icon-kuoda" viewBox="0 0 1024 1024"><path d="M601.570673 486.398688a63.99688 63.99688 0 0 1-45.245794-109.178677L805.464734 128.016159H646.36849a63.99688 63.99688 0 0 1 0-127.99376h313.392722a12.991367 12.991367 0 0 1 1.535925 0h0.19199a63.164921 63.164921 0 0 1 22.398908 4.671772A64.060877 64.060877 0 0 1 1023.950082 62.547351V377.603992a63.99688 63.99688 0 0 1-127.99376 0V218.571745l-249.139854 249.139854A63.80489 63.80489 0 0 1 601.570673 486.398688zM63.99688 1023.972481a11.647432 11.647432 0 0 0-1.535925 0 63.356911 63.356911 0 0 1-22.398908-4.607775 63.868886 63.868886 0 0 1-40.062047-57.789183V646.390888a63.99688 63.99688 0 0 1 127.99376 0v159.096245l249.139855-249.139855a63.99688 63.99688 0 0 1 90.491588 90.491589L218.485349 895.978721H377.581593a63.99688 63.99688 0 1 1 0 127.99376H63.99688z" fill="#999999" ></path></symbol><symbol id="icon-shezhi3" viewBox="0 0 1024 1024"><path d="M929.382997 638.12007l79.699872-41.98323a22.129372 22.129372 0 0 0 11.775784-18.886765L1023.987485 476.444812a22.129372 22.129372 0 0 0-10.694915-19.626307l-77.083032-46.648034a22.129372 22.129372 0 0 1-9.272718-11.150017l-29.638568-79.074106a22.129372 22.129372 0 0 1-0.398215-14.221962l26.623512-86.071311a22.129372 22.129372 0 0 0-5.119906-21.788045l-69.175621-72.930218a22.18626 22.18626 0 0 0-21.446718-6.257663l-87.493507 21.731157a22.18626 22.18626 0 0 1-14.506401-1.308421l-76.05905-34.58781a22.18626 22.18626 0 0 1-10.353588-9.727822L596.873537 14.799942a22.18626 22.18626 0 0 0-18.886764-11.718896L477.010846 0.009102a22.18626 22.18626 0 0 0-19.626307 10.694915l-46.648033 77.026144a22.18626 22.18626 0 0 1-11.206906 9.272718l-79.187882 29.58168a22.18626 22.18626 0 0 1-14.278849 0.455103l-86.128199-26.566624a22.18626 22.18626 0 0 0-21.788045 5.063018L125.159519 174.768565a22.129372 22.129372 0 0 0-6.257663 21.276054l21.332942 87.94861a22.129372 22.129372 0 0 1-1.365308 14.392625L104.224792 374.331128a22.129372 22.129372 0 0 1-9.78471 10.410476l-79.586096 42.097006a22.129372 22.129372 0 0 0-11.718897 18.886765L0.006258 546.644414a22.129372 22.129372 0 0 0 10.694915 19.569419l77.083031 46.648033a22.129372 22.129372 0 0 1 9.272719 11.150018l29.58168 79.074106c1.763523 4.551028 1.934187 9.614046 0.455103 14.278849l-26.623512 86.128199a22.129372 22.129372 0 0 0 5.00613 21.674269l69.175621 73.555985a22.18626 22.18626 0 0 0 21.38983 6.314551l87.94861-21.38983a22.18626 22.18626 0 0 1 14.392625 1.365308l76.05905 34.587811a22.18626 22.18626 0 0 1 10.410476 9.784709l42.097006 79.75676a22.18626 22.18626 0 0 0 18.886764 11.775784L546.698457 1023.990329a22.18626 22.18626 0 0 0 19.626307-10.694915l46.648034-77.026143a22.18626 22.18626 0 0 1 11.206905-9.272719l79.130994-29.58168a22.18626 22.18626 0 0 1 14.335737-0.455103l86.185087 26.623512a22.18626 22.18626 0 0 0 21.674269-5.063018l73.612873-69.118733a22.129372 22.129372 0 0 0 6.371439-21.38983l-21.38983-87.94861a22.129372 22.129372 0 0 1 1.251532-14.221962l34.07582-77.083031a22.129372 22.129372 0 0 1 9.898485-10.638027z m-476.321934 93.011628A227.153169 227.153169 0 0 1 292.409786 452.836356a227.551384 227.551384 0 0 1 278.522894-160.878829 227.153169 227.153169 0 0 1 160.651277 278.409119 227.551384 227.551384 0 0 1-278.522894 160.82194z" fill="#999999" ></path></symbol><symbol id="icon-yincang2" viewBox="0 0 1462 1024"><path d="M731.450514 73.142857c232.594286 0 469.942857 129.974857 711.972572 389.851429a71.387429 71.387429 0 0 1 0 98.011428l-22.674286 23.917715C1186.618514 828.854857 956.803657 950.857143 731.450514 950.857143 498.856229 950.857143 261.507657 820.882286 19.477943 561.005714a71.387429 71.387429 0 0 1 0-98.011428l22.674286-23.917715C276.282514 195.145143 506.097371 73.142857 731.450514 73.142857z m0 219.428572a219.428571 219.428571 0 1 0 0 438.857142 219.428571 219.428571 0 0 0 0-438.857142z" fill="#999999" ></path><path d="M1196.931657 46.518857a73.142857 73.142857 0 0 1 0 103.424L369.393371 977.481143a73.142857 73.142857 0 0 1-103.424-103.424L1093.507657 46.518857a73.142857 73.142857 0 0 1 103.424 0z" fill="#FF5555" ></path></symbol><symbol id="icon-xiaoxi11" viewBox="0 0 1024 1024"><path d="M404.136796 916.240019a107.759981 107.759981 0 1 0 215.519963 0M188.616833 404.380106a323.441584 323.441584 0 0 1 215.843243-304.960747 107.759981 107.759981 0 0 1 214.873403 0A323.387704 323.387704 0 0 1 835.176722 404.380106V754.600046a53.879991 53.879991 0 0 1 0 107.759982H188.616833a53.879991 53.879991 0 0 1 0-107.759982V404.380106z" fill="#999999" ></path></symbol><symbol id="icon-bianzu1" viewBox="0 0 1024 1024"><path d="M331.294118 843.294118C170.646588 843.294118 0 790.528 0 692.705882v-180.705882h60.235294v180.705882c0 36.803765 105.592471 90.352941 271.058824 90.352942 19.516235 0 39.032471-0.542118 57.404235-2.288942l5.662118 59.994353c-20.178824 1.867294-41.622588 2.529882-63.066353 2.529883z" fill="#FFD500" ></path><path d="M331.294118 662.588235C170.646588 662.588235 0 609.822118 0 512v-180.705882h60.235294v180.705882C60.235294 548.864 165.827765 602.352941 331.294118 602.352941c19.516235 0 39.032471-0.542118 57.404235-2.288941l5.662118 59.994353c-20.178824 1.867294-41.622588 2.529882-63.066353 2.529882zM602.352941 331.294118h60.235294v62.644706h-60.235294z" fill="#FFD500" ></path><path d="M331.294118 481.882353C170.646588 481.882353 0 429.116235 0 331.294118v-180.705883h60.235294v180.705883C60.235294 368.158118 165.827765 421.647059 331.294118 421.647059a602.352941 602.352941 0 0 0 110.110117-9.155765l11.083294 59.27153A665.118118 665.118118 0 0 1 331.294118 481.882353zM591.932235 427.369412l-29.756235-52.404706c25.539765-14.456471 40.176941-30.418824 40.176941-43.670588v-180.705883h60.235294v180.705883c0 25.479529-12.227765 62.825412-70.656 96.075294z" fill="#FFD500" ></path><path d="M331.294118 301.176471C170.646588 301.176471 0 248.410353 0 150.588235S170.646588 0 331.294118 0 662.588235 52.766118 662.588235 150.588235 491.881412 301.176471 331.294118 301.176471z m0-240.941177C165.827765 60.235294 60.235294 113.724235 60.235294 150.588235S165.827765 240.941176 331.294118 240.941176 602.352941 187.452235 602.352941 150.588235 496.760471 60.235294 331.294118 60.235294z" fill="#FFD500" ></path><path d="M692.705882 1024C532.058353 1024 361.411765 971.233882 361.411765 873.411765v-180.705883h60.235294c0 17.950118 31.021176 46.742588 99.147294 67.523765A606.268235 606.268235 0 0 0 692.705882 783.058824c165.466353 0 271.058824-53.549176 271.058824-90.352942h60.235294v180.705883c0 97.822118-170.706824 150.588235-331.294118 150.588235zM421.647059 782.155294V873.411765c0 36.803765 105.592471 90.352941 271.058823 90.352941s271.058824-53.549176 271.058824-90.352941v-91.497412A547.538824 547.538824 0 0 1 692.705882 843.294118a667.105882 667.105882 0 0 1-189.379764-25.419294A337.136941 337.136941 0 0 1 421.647059 782.155294z" fill="#FFD500" ></path><path d="M692.705882 843.294118a667.105882 667.105882 0 0 1-189.379764-25.419294C411.768471 789.925647 361.411765 745.532235 361.411765 692.705882v-180.705882h60.235294c0 17.950118 31.021176 46.742588 99.147294 67.523765a527.179294 527.179294 0 0 0 114.085647 20.48c18.853647 1.807059 38.309647 2.349176 57.825882 2.349176 165.466353 0 271.058824-53.488941 271.058824-90.352941h60.235294v180.705882c0 97.822118-170.706824 150.588235-331.294118 150.588236zM421.647059 601.449412V692.705882c0 17.950118 31.021176 46.742588 99.147294 67.523765A606.268235 606.268235 0 0 0 692.705882 783.058824c165.466353 0 271.058824-53.549176 271.058824-90.352942V601.208471a598.377412 598.377412 0 0 1-334.125177 58.849882 589.583059 589.583059 0 0 1-126.554353-22.889412A333.703529 333.703529 0 0 1 421.647059 601.389176z" fill="#FFD500" ></path><path d="M692.705882 662.588235c-21.383529 0-42.887529-0.602353-63.066353-2.529882a589.583059 589.583059 0 0 1-126.554353-22.889412C411.768471 609.159529 361.411765 564.766118 361.411765 512c0-25.479529 12.288-62.825412 70.656-96.075294A436.705882 436.705882 0 0 1 572.235294 371.410824a428.272941 428.272941 0 0 1 58.307765-7.529412c19.275294-1.807059 40.719059-2.469647 62.102588-2.469647 160.587294 0 331.294118 52.766118 331.294118 150.588235S853.293176 662.588235 692.705882 662.588235z m0-240.941176c-19.516235 0-38.972235 0.542118-57.404235 2.288941a386.108235 386.108235 0 0 0-52.284235 6.746353 386.048 386.048 0 0 0-121.434353 37.767529C436.284235 482.846118 421.647059 498.748235 421.647059 512c0 17.950118 31.021176 46.742588 99.147294 67.523765a527.179294 527.179294 0 0 0 114.085647 20.48c18.853647 1.807059 38.309647 2.349176 57.825882 2.349176 165.466353 0 271.058824-53.488941 271.058824-90.352941S858.172235 421.647059 692.705882 421.647059z" fill="#FFD500" ></path></symbol><symbol id="icon-xianshimima" viewBox="0 0 1706 1024"><path d="M853.333333 1024C544.853333 1024 264.106667 869.717333 18.858667 565.504a85.333333 85.333333 0 0 1 0-107.008C264.021333 154.282667 544.768 0 853.333333 0c308.48 0 589.226667 154.282667 834.389334 458.496a85.162667 85.162667 0 0 1 0 107.008C1442.56 869.717333 1161.813333 1024 853.333333 1024zM196.778667 512C398.08 741.546667 613.376 853.333333 853.333333 853.333333c239.957333 0 455.253333-111.786667 656.554667-341.333333C1308.672 282.453333 1093.376 170.666667 853.333333 170.666667 613.376 170.666667 398.08 282.453333 196.778667 512z" fill="#CCCCCC" ></path><path d="M853.333333 512m-170.666666 0a170.666667 170.666667 0 1 0 341.333333 0 170.666667 170.666667 0 1 0-341.333333 0Z" fill="#CCCCCC" ></path></symbol><symbol id="icon-yincangmima" viewBox="0 0 2346 1024"><path d="M1910.802982 360.181531a123.378994 123.378994 0 0 1 168.535706 45.156712l123.378994 213.692417a123.378994 123.378994 0 0 1-45.156712 168.535706 123.378994 123.378994 0 0 1-168.535706-45.156712l-123.378994-213.692417a123.378994 123.378994 0 0 1 45.156712-168.535706zM1427.650842 535.996597a123.378994 123.378994 0 0 1 142.872875 100.183744l42.93589 243.056618a123.378994 123.378994 0 0 1-100.183743 142.872875 123.378994 123.378994 0 0 1-142.872875-100.060364l-42.812511-243.056619a123.378994 123.378994 0 0 1 99.936985-142.996254zM913.407195 535.996597a123.378994 123.378994 0 0 1 100.060364 142.996254l-42.812511 243.056619a123.378994 123.378994 0 0 1-142.872875 99.936985 123.378994 123.378994 0 0 1-100.183743-142.872875l42.93589-243.056618a123.378994 123.378994 0 0 1 142.872875-99.936986zM430.255054 360.181531a123.378994 123.378994 0 0 1 45.156712 168.535706l-123.378994 213.692417a123.378994 123.378994 0 0 1-168.535706 45.156712 123.378994 123.378994 0 0 1-45.156712-168.535706l123.378994-213.692417a123.378994 123.378994 0 0 1 168.535706-45.156712z" fill="#CCCCCC" ></path><path d="M1170.529018 681.953947a1594.303361 1594.303361 0 0 1-613.933874-121.775067 1607.504913 1607.504913 0 0 1-277.232599-148.42493A1613.427105 1613.427105 0 0 1 36.429305 212.126738 123.378994 123.378994 0 0 1 210.887203 37.668841a1367.039254 1367.039254 0 0 0 205.796162 169.029221 1356.058523 1356.058523 0 0 0 234.420089 125.476437 1366.669117 1366.669117 0 0 0 1038.851129 0 1351.863637 1351.863637 0 0 0 234.666847-125.476437 1371.357518 1371.357518 0 0 0 205.672783-169.029221 123.378994 123.378994 0 1 1 174.457897 174.457897 1616.634958 1616.634958 0 0 1-242.933239 199.627212 1602.569753 1602.569753 0 0 1-277.355979 148.42493 1593.069571 1593.069571 0 0 1-613.933874 121.775067z" fill="#CCCCCC" ></path></symbol><symbol id="icon-fuzhi2" viewBox="0 0 1024 1024"><path d="M933.647059 783.058824H722.823529V331.294118a30.117647 30.117647 0 0 0-30.117647-30.117647H240.941176V90.352941A90.473412 90.473412 0 0 1 331.294118 0h602.352941A90.473412 90.473412 0 0 1 1024 90.352941v602.352941a90.473412 90.473412 0 0 1-90.352941 90.352942zM783.058824 722.823529h150.588235a30.177882 30.177882 0 0 0 30.117647-30.117647v-602.352941a30.117647 30.117647 0 0 0-30.117647-30.117647h-602.352941a30.117647 30.117647 0 0 0-30.117647 30.117647V240.941176h391.529411A90.473412 90.473412 0 0 1 783.058824 331.294118z" fill="#888888" ></path><path d="M692.705882 1024h-602.352941A90.473412 90.473412 0 0 1 0 933.647059v-602.352941A90.473412 90.473412 0 0 1 90.352941 240.941176h602.352941A90.473412 90.473412 0 0 1 783.058824 331.294118v602.352941a90.473412 90.473412 0 0 1-90.352942 90.352941zM90.352941 301.176471a30.117647 30.117647 0 0 0-30.117647 30.117647v602.352941a30.117647 30.117647 0 0 0 30.117647 30.117647h602.352941a30.177882 30.177882 0 0 0 30.117647-30.117647v-602.352941a30.117647 30.117647 0 0 0-30.117647-30.117647z" fill="#888888" ></path></symbol><symbol id="icon-xingzhuangjiehe" viewBox="0 0 1024 1024"><path d="M865.962667 0c51.541333 0 94.094222 39.025778 100.352 89.543111L967.111111 102.4v665.6H764.814222a50.176 50.176 0 0 0-49.607111 41.187556l-0.910222 10.012444V1024H157.923556a101.603556 101.603556 0 0 1-100.238223-89.543111L56.888889 921.6V102.4C56.888889 50.176 95.573333 7.168 145.294222 0.796444L158.151111 0H865.848889z m99.896889 870.4L815.445333 1016.604444V870.4h150.414223zM562.517333 716.8H259.185778c-24.803556 0-45.511111 18.204444-49.834667 42.097778l-0.796444 9.102222 0.796444 9.102222a50.972444 50.972444 0 0 0 40.732445 41.301334l9.102222 0.796444h303.331555c24.917333 0 45.511111-18.204444 49.834667-42.097778l0.796444-9.102222-0.796444-9.102222a50.744889 50.744889 0 0 0-49.834667-42.097778z m202.296889-256H259.185778c-24.803556 0-45.511111 18.204444-49.834667 42.097778l-0.796444 9.102222 0.796444 9.102222a50.972444 50.972444 0 0 0 40.732445 41.301334l9.102222 0.796444h505.628444c24.803556 0 45.511111-18.204444 49.834667-42.097778l0.796444-9.102222-0.796444-9.102222a50.744889 50.744889 0 0 0-49.834667-42.097778z m0-256H259.185778c-24.803556 0-45.511111 18.204444-49.834667 42.097778l-0.796444 9.102222 0.796444 9.102222a50.972444 50.972444 0 0 0 40.732445 41.301334l9.102222 0.796444h505.628444c24.803556 0 45.511111-18.204444 49.834667-42.097778l0.796444-9.102222-0.796444-9.102222a50.744889 50.744889 0 0 0-49.834667-42.097778z" fill="#5091FF" ></path></symbol><symbol id="icon-xingzhuangjiehebeifen" viewBox="0 0 1280 1024"><path d="M1222.258786 485.112723c31.871522 0 57.599136 24.063639 57.727134 53.759194a47.35929 47.35929 0 0 1-3.455948 18.431723l-122.494162 314.747279-20.735689 52.735209-24.319636 63.615046A57.215142 57.215142 0 0 1 1054.709299 1023.98464H164.098659c-31.99952 0-57.599136-24.191637-57.855133-53.887191V968.945466a42.239366 42.239366 0 0 1 3.455949-17.279741l167.677484-431.225532a57.215142 57.215142 0 0 1 54.143188-35.583466H1222.386784zM434.302606 0c18.175727 0 35.839462 4.095939 52.095218 11.903821l182.525262 83.966741c15.99976 7.679885 33.791493 11.775823 51.967221 11.903821h318.715219c63.871042 0.127998 115.454268 48.383274 115.582266 107.774384v161.661575H331.520147c-72.958906 0.127998-137.98193 42.751359-162.813558 106.750399L6.917016 898.930516A98.814518 98.814518 0 0 1 0.00512 862.323065V107.774383C0.133118 48.383274 51.844342 0.255996 115.587386 0h318.71522z" fill="#5091FF" ></path></symbol><symbol id="icon-shangchuan" viewBox="0 0 1562 1024"><path d="M959.326316 0c208.357053 0 377.263158 167.154526 377.263158 373.328842 0 20.965053-1.751579 41.498947-5.12 61.520842 132.742737 31.312842 231.477895 149.504 231.477894 290.492632C1562.947368 890.260211 1427.833263 1024 1261.136842 1024c-10.913684 0-21.719579-0.565895-32.336842-1.697684V1024H301.810526C135.114105 1024 0 890.287158 0 725.342316s135.114105-298.684632 301.810526-298.684632c0-111.912421 91.701895-202.644211 204.8-202.64421a205.608421 205.608421 0 0 1 97.172211 24.198737C655.737263 103.585684 795.297684 0 959.326316 0z m-160.687158 568.185263a17.785263 17.785263 0 0 0-25.061053 1.536l-186.960842 211.429053a17.785263 17.785263 0 0 0 13.312 29.507368h72.165053a17.785263 17.785263 0 0 1 17.758316 17.785263V1024h194.021052v-195.584a17.785263 17.785263 0 0 1 17.785263-17.758316h72.138106a17.785263 17.785263 0 0 0 13.312-29.507368l-186.933895-211.429053a17.758316 17.758316 0 0 0-1.536-1.536z" fill="#5091FF" ></path></symbol><symbol id="icon-tiaozhan" viewBox="0 0 1024 1024"><path d="M512 0a512 512 0 0 1 512 512 512 512 0 0 1-512 512 512 512 0 0 1-512-512 512 512 0 0 1 512-512z m97.664 205.696l-313.856 298.88a6.4 6.4 0 0 0 2.56 10.688l152.128 48.32a6.4 6.4 0 0 1 4.288 7.424l-50.56 240.832a6.4 6.4 0 0 0 10.688 5.952l313.856-298.88a6.4 6.4 0 0 0-2.048-10.624l-145.856-58.304a6.4 6.4 0 0 1-3.84-7.168l43.328-231.296a6.4 6.4 0 0 0-10.688-5.824z" fill="#33BD8C" ></path></symbol><symbol id="icon-youhua" viewBox="0 0 1194 1024"><path d="M85.333333 1024a85.333333 85.333333 0 0 1-60.330666-145.664L391.338667 512 25.002667 145.664A85.333333 85.333333 0 0 1 145.664 25.002667l426.666667 426.666666a85.333333 85.333333 0 0 1 0 120.661334l-426.666667 426.666666A85.077333 85.077333 0 0 1 85.333333 1024z" fill="#888888" ></path><path d="M682.666667 1024a85.333333 85.333333 0 0 1-60.330667-145.664L988.672 512 622.336 145.664A85.333333 85.333333 0 0 1 742.997333 25.002667l426.666667 426.666666a85.333333 85.333333 0 0 1 0 120.661334l-426.666667 426.666666A85.077333 85.077333 0 0 1 682.666667 1024z" fill="#888888" ></path></symbol><symbol id="icon-jiesuo" viewBox="0 0 1024 1024"><path d="M873.411765 481.882353a60.235294 60.235294 0 0 1 60.235294 60.235294v421.647059a60.235294 60.235294 0 0 1-60.235294 60.235294H150.588235a60.235294 60.235294 0 0 1-60.235294-60.235294V542.117647a60.235294 60.235294 0 0 1 60.235294-60.235294z m-361.411765 150.588235a60.235294 60.235294 0 0 0-60.235294 60.235294v120.470589a60.235294 60.235294 0 0 0 120.470588 0v-120.470589a60.235294 60.235294 0 0 0-60.235294-60.235294z" fill="#888888" ></path><path d="M271.058824 542.117647a60.235294 60.235294 0 0 1-60.235295-60.235294V301.176471a301.176471 301.176471 0 0 1 602.352942 0 60.235294 60.235294 0 0 1-120.470589 0 180.705882 180.705882 0 0 0-361.411764 0v180.705882a60.235294 60.235294 0 0 1-60.235294 60.235294z" fill="#888888" ></path></symbol><symbol id="icon-suo1" viewBox="0 0 1024 1024"><path d="M921.6 409.6a68.266667 68.266667 0 0 1 68.266667 68.266667v477.866666a68.266667 68.266667 0 0 1-68.266667 68.266667H102.4a68.266667 68.266667 0 0 1-68.266667-68.266667V477.866667a68.266667 68.266667 0 0 1 68.266667-68.266667zM512 580.266667a68.266667 68.266667 0 0 0-68.266667 68.266666v136.533334a68.266667 68.266667 0 0 0 136.533334 0v-136.533334a68.266667 68.266667 0 0 0-68.266667-68.266666z" fill="#888888" ></path><path d="M785.066667 614.4a68.266667 68.266667 0 0 1-68.266667-68.266667V341.333333a204.8 204.8 0 0 0-409.6 0v204.8a68.266667 68.266667 0 0 1-136.533333 0V341.333333a341.333333 341.333333 0 0 1 682.666666 0v204.8a68.266667 68.266667 0 0 1-68.266666 68.266667z" fill="#888888" ></path></symbol><symbol id="icon-bianzu11" viewBox="0 0 1024 1024"><path d="M474.039901 948.079801a474.039901 474.039901 0 1 1 474.0399-474.0399 474.58166 474.58166 0 0 1-474.0399 474.0399zM474.039901 135.439972a338.599929 338.599929 0 1 0 338.599929 338.599929 339.006249 339.006249 0 0 0-338.599929-338.599929z" fill="#BBBBBB" ></path><path d="M956.273919 1023.993905a67.516826 67.516826 0 0 1-47.87803-19.841956l-143.634089-143.63409a67.719986 67.719986 0 0 1 95.756059-95.756059l143.63409 143.634089a67.719986 67.719986 0 0 1-47.87803 115.598016z" fill="#BBBBBB" ></path></symbol><symbol id="icon-biji" viewBox="0 0 1024 1024"><path d="M834.340512 1023.992248H75.842091A37.92769 37.92769 0 0 1 37.914401 986.119928V151.710758a37.92769 37.92769 0 0 1 37.92769-37.927689h379.276895a37.92769 37.92769 0 1 1 0 75.855379H113.76978v758.55379H796.468192v-379.276895a37.92769 37.92769 0 1 1 75.80001 0v417.204585a37.92769 37.92769 0 0 1-37.92769 37.87232z"  ></path><path d="M910.25126 212.284324L701.78739 420.637456a20.707965 20.707965 0 0 1-10.46472 5.702996l-142.574892 28.459609a14.229805 14.229805 0 0 1-17.828782-13.45464 17.4412 17.4412 0 0 1 0.332213-4.041929l28.404241-142.63026a20.707965 20.707965 0 0 1 5.702995-10.464721l208.408502-208.353132zM849.068637 5.97984a16.832143 16.832143 0 0 1 23.476409-2.104018l109.630402 109.630402a16.832143 16.832143 0 0 1-2.159387 23.476409l-52.655814 52.600446L796.468192 58.691023z"  ></path><path d="M644.757433 834.40917H265.480538a37.92769 37.92769 0 1 1 0-75.855379h379.276895a37.92769 37.92769 0 0 1 0 75.855379zM644.757433 644.770722H265.480538a37.92769 37.92769 0 1 1 0-75.855379h379.276895a37.92769 37.92769 0 0 1 0 75.855379z"  ></path></symbol><symbol id="icon-zhiding" viewBox="0 0 1024 1024"><path d="M496.0256 224.768L129.024 683.52A20.48 20.48 0 0 0 144.9984 716.8H337.92c11.264 0 20.48 9.216 20.48 20.48v266.24c0 11.264 9.216 20.48 20.48 20.48h266.24a20.48 20.48 0 0 0 20.48-20.48V737.28c0-11.264 9.216-20.48 20.48-20.48h192.9216a20.48 20.48 0 0 0 15.9744-33.28l-367.0016-458.752a20.48 20.48 0 0 0-31.9488 0z" fill="#4099E8" ></path><path d="M153.6 0m51.2 0l614.4 0q51.2 0 51.2 51.2l0 0q0 51.2-51.2 51.2l-614.4 0q-51.2 0-51.2-51.2l0 0q0-51.2 51.2-51.2Z" fill="#4099E8" ></path></symbol><symbol id="icon-leixing" viewBox="0 0 1024 1024"><path d="M85.346133 42.696106h255.99232a85.330773 85.330773 0 0 1 85.330774 85.330773v255.99232a85.330773 85.330773 0 0 1-85.330774 85.330774H85.346133a85.330773 85.330773 0 0 1-85.330773-85.330774v-255.99232a85.330773 85.330773 0 0 1 85.330773-85.330773z" fill="#459BE5" ></path><path d="M493.397891 197.998113L667.302008 24.093997a82.002873 82.002873 0 0 1 116.049851 0l173.904117 173.904116a82.002873 82.002873 0 0 1 0 116.049852L783.351859 487.952081a82.002873 82.002873 0 0 1-116.049851 0L493.397891 314.047965a82.002873 82.002873 0 0 1 0-116.049852z" fill="#B5D7F5" ></path><path d="M85.346133 554.680746h255.99232a85.330773 85.330773 0 0 1 85.330774 85.330774v255.99232a85.330773 85.330773 0 0 1-85.330774 85.330773H85.346133a85.330773 85.330773 0 0 1-85.330773-85.330773v-255.99232a85.330773 85.330773 0 0 1 85.330773-85.330774zM597.330773 554.680746h255.992321a85.330773 85.330773 0 0 1 85.330773 85.330774v255.99232a85.330773 85.330773 0 0 1-85.330773 85.330773H597.330773a85.330773 85.330773 0 0 1-85.330773-85.330773v-255.99232a85.330773 85.330773 0 0 1 85.330773-85.330774z" fill="#459BE5" ></path></symbol><symbol id="icon-biaoqianjiantou" viewBox="0 0 1024 1024"><path d="M810.666667 0v1024h-90.752a170.666667 170.666667 0 0 1-131.072-61.44l-329.984-395.946667a85.333333 85.333333 0 0 1 0-109.226666l329.984-395.946667A170.666667 170.666667 0 0 1 719.914667 0H810.666667z m-170.666667 426.666667a85.333333 85.333333 0 1 0 0 170.666666 85.333333 85.333333 0 0 0 0-170.666666z" fill="#ECF5FD" ></path></symbol><symbol id="icon-jiazaishibai1" viewBox="0 0 1024 1024"><path d="M21.041096 806.575342a406.794521 119.232877 0 1 0 813.589041 0 406.794521 119.232877 0 1 0-813.589041 0Z" fill="#DCE0E6" ></path><path d="M820.60274 512a56.109589 35.068493 0 1 0 112.219178 0 56.109589 35.068493 0 1 0-112.219178 0Z" fill="#DCE0E6" ></path><path d="M960.876712 666.30137a28.054795 21.041096 0 1 0 56.109589 0 28.054795 21.041096 0 1 0-56.109589 0Z" fill="#DCE0E6" ></path><path d="M241.173041 112.219178h373.128767c39.276712 0 70.136986 30.860274 70.136987 70.136986v558.290411c0 39.276712-30.860274 70.136986-70.136987 70.136987H241.173041c-39.276712 0-70.136986-30.860274-70.136986-70.136987V182.356164c0-39.276712 30.860274-70.136986 70.136986-70.136986z" fill="#F5F5F5" ></path><path d="M239.770301 199.189041h381.545206v173.939726H239.770301zM266.422356 490.958904h326.838356c15.430137 0 28.054795 12.624658 28.054795 28.054795s-12.624658 28.054795-28.054795 28.054794H266.422356c-15.430137 0-28.054795-12.624658-28.054794-28.054794 1.40274-15.430137 12.624658-28.054795 28.054794-28.054795zM266.422356 604.580822h326.838356c15.430137 0 28.054795 12.624658 28.054795 28.054794s-12.624658 28.054795-28.054795 28.054795H266.422356c-15.430137 0-28.054795-12.624658-28.054794-28.054795 1.40274-15.430137 12.624658-28.054795 28.054794-28.054794z" fill="#DCE0E6" ></path><path d="M382.849753 112.219178l-33.665753 173.939726h78.553425L382.849753 448.876712h61.720548l-47.69315 155.70411L538.553863 392.767123l-63.123288-21.041096 42.082192-144.482191h-67.331507L486.652493 112.219178z" fill="#FFFFFF" ></path></symbol><symbol id="icon-qiyezhanghao" viewBox="0 0 1105 1024"><path d="M122.88 40.96a40.96 40.96 0 0 1 40.96-40.96h450.56a40.96 40.96 0 0 1 40.96 40.96v901.12h409.6a40.96 40.96 0 1 1 0 81.92H40.96a40.96 40.96 0 1 1 0-81.92h81.92V40.96z m368.64 696.32H286.72a40.96 40.96 0 0 0-3.072 81.8176L286.72 819.2h204.8a40.96 40.96 0 1 0 0-81.92z m0-204.8H286.72a40.96 40.96 0 0 0-3.072 81.8176L286.72 614.4h204.8a40.96 40.96 0 1 0 0-81.92z m0-204.8H286.72a40.96 40.96 0 0 0-3.072 81.8176L286.72 409.6h204.8a40.96 40.96 0 1 0 0-81.92z m0-204.8H286.72a40.96 40.96 0 0 0-3.072 81.8176L286.72 204.8h204.8a40.96 40.96 0 1 0 0-81.92z" fill="#999999" ></path><path d="M778.24 204.8h163.84a40.96 40.96 0 0 1 40.96 40.96v696.32H737.28V245.76a40.96 40.96 0 0 1 40.96-40.96z" fill="#BBBBBB" ></path></symbol><symbol id="icon-gerenzhanghao" viewBox="0 0 1024 1024"><path d="M692.154923 295.050847a13.016949 13.016949 0 0 1 12.791322 10.552407l83.725017 435.356204a13.016949 13.016949 0 0 1-2.065356 9.823457L609.505974 1008.397017a13.016949 13.016949 0 0 1-21.451932 0L410.95411 750.782915a13.016949 13.016949 0 0 1-2.065356-9.823457l83.725017-435.356204A13.016949 13.016949 0 0 1 505.405093 295.050847zM606.000076 4.807593l140.704542 93.808814a13.016949 13.016949 0 0 1 5.137356 14.943457l-45.958508 137.875526a13.016949 13.016949 0 0 1-12.357424 8.903593H504.033974a13.016949 13.016949 0 0 1-12.357423-8.903593l-45.958509-137.875526a13.016949 13.016949 0 0 1 5.137356-14.926101L591.55994 4.790237a13.016949 13.016949 0 0 1 14.440136 0z" fill="#999999" ></path><path d="M442.576618 277.694915L348.594245 745.454644l-94.03444 51.442983a11.975593 11.975593 0 0 1-3.679458 1.301695L248.953839 798.372881c-6.317559 0.052068-11.576407-4.859661-12.444204-11.298712l-0.138847-1.787661L234.305432 541.157966a13.797966 13.797966 0 0 1 1.909152-7.150644l1.076068-1.544678L442.576618 277.694915z" fill="#BBBBBB" ></path></symbol><symbol id="icon-shenglvehao" viewBox="0 0 1024 1024"><path d="M221 592c-44.183 0-80-35.817-80-80s35.817-80 80-80 80 35.817 80 80-35.817 80-80 80z m291 0c-44.183 0-80-35.817-80-80s35.817-80 80-80 80 35.817 80 80-35.817 80-80 80z m291 0c-44.183 0-80-35.817-80-80s35.817-80 80-80 80 35.817 80 80-35.817 80-80 80z"  ></path></symbol><symbol id="icon-shangjiantou-tianchong" viewBox="0 0 1024 1024"><path d="M512 32C246.4 32 32 246.4 32 512s214.4 480 480 480 480-214.4 480-480S777.6 32 512 32z m272 595.2c-12.8 12.8-32 12.8-44.8 0L512 400l-227.2 227.2c-12.8 12.8-32 12.8-44.8 0-12.8-12.8-12.8-32 0-44.8l249.6-249.6c12.8-12.8 32-12.8 44.8 0l249.6 249.6c12.8 12.8 12.8 32 0 44.8z"  ></path></symbol><symbol id="icon-wancheng1" viewBox="0 0 1024 1024"><path d="M512 0a512 512 0 1 1 0 1024A512 512 0 0 1 512 0z m307.2 288h-112.576a6.4 6.4 0 0 0-4.48 1.92L451.136 540.8a6.4 6.4 0 0 1-7.168 1.28L248.832 454.656a6.4 6.4 0 0 0-7.552 1.792l-45.824 55.936a6.4 6.4 0 0 0 0.256 8.32l247.04 273.6a6.4 6.4 0 0 0 9.92-0.448L824.32 298.24a6.4 6.4 0 0 0-5.12-10.24z" fill="#33BD8C" ></path></symbol><symbol id="icon-jinzhi" viewBox="0 0 1024 1024"><path d="M512 0C229.222291 0 0 229.222291 0 512c0 282.777709 229.222291 512 512 512 282.777709 0 512-229.201014 512-512C1023.978723 229.222291 794.777709 0 512 0zM77.194697 512c0-240.116361 194.667664-434.784025 434.784025-434.784025 64.811204 0 126.324398 14.213357 181.582014 39.639945L279.330757 879.313136C157.857624 802.224826 77.194697 666.538337 77.194697 512zM512 946.762748c-52.257491 0-102.344679-9.234426-148.729585-26.107468L773.819391 164.90047c105.068196 79.343723 172.943357 205.285127 172.943357 347.09953C946.762748 752.116361 752.116361 946.762748 512 946.762748z"  ></path></symbol><symbol id="icon-biaoqian1" viewBox="0 0 1024 1024"><path d="M753.37797 268.521842l256.957652 453.093464c25.58611 45.104657 12.939262 102.052029-27.706103 131.878123l-8.479968 5.555841-256.592135 150.884949c-44.373626 26.097833-100.151346 13.158571-129.538822-28.144722l-5.482738-8.626174-25.293698-44.592935a25.58611 25.58611 0 0 1-3.289643-14.328222l0.804135-4.897913 120.474029-457.772066 51.39153-179.833805a14.620635 14.620635 0 0 1 26.755761-3.21654z" fill="#B6D0FC" ></path><path d="M359.644283 1019.437631a98.61618 98.61618 0 0 0 120.98575-71.129387l166.163511-631.611411C682.17548 182.479408 603.955085 44.606825 472.150065 8.640064 340.418148-27.326697 205.031073 52.282658 169.72224 186.500083L3.485626 818.038391a100.809275 100.809275 0 0 0 69.886633 123.251949l286.272024 78.074188z m35.820554-719.262115a88.235529 88.235529 0 0 1-61.114252-107.827179A86.261744 86.261744 0 0 1 440.203979 130.137537c46.054999 12.573746 73.468688 60.82184 61.114252 107.754076a86.261744 86.261744 0 0 1-105.853394 62.283903z" fill="#5091FF" ></path></symbol><symbol id="icon-jilu" viewBox="0 0 1024 1024"><path d="M78.769231 691.751385v302.867692c0 16.226462 13.154462 29.380923 29.380923 29.380923h886.468923a29.380923 29.380923 0 0 0 29.380923-29.380923V324.765538a29.380923 29.380923 0 0 0-52.932923-17.644307L676.233846 701.44a29.380923 29.380923 0 0 1-41.353846 5.828923L468.440615 580.686769a29.380923 29.380923 0 0 0-41.747692 6.301539L298.535385 767.684923a29.380923 29.380923 0 0 1-42.535385 5.828923L126.739692 668.829538a29.380923 29.380923 0 0 0-47.891692 22.843077z" fill="#5091FF" ></path><path d="M225.043692 630.153846a78.690462 78.690462 0 0 1-48.679384-16.856615L30.089846 498.294154a78.769231 78.769231 0 0 1 97.358769-123.825231l81.762462 64.196923 131.544615-182.272a78.769231 78.769231 0 0 1 113.112616-15.36L601.560615 359.187692 751.458462 184.083692l-3.072 0.393846A78.769231 78.769231 0 1 1 727.591385 28.356923l207.241846-27.648a78.769231 78.769231 0 0 1 70.262154 129.260308L671.665231 519.640615a78.690462 78.690462 0 0 1-109.016616 10.24l-142.572307-114.136615-131.15077 181.720615a78.769231 78.769231 0 0 1-63.803076 32.689231z" fill="#B6D0FC" ></path></symbol><symbol id="icon-shu" viewBox="0 0 1102 1024"><path d="M0 1.304362m61.279822 0l122.480878 0q61.279822 0 61.279821 61.279822l0 857.602442q0 61.279822-61.279821 61.279822l-122.480878 0q-61.279822 0-61.279822-61.279822l0-857.602442q0-61.279822 61.279822-61.279822Z" fill="#5091FF" ></path><path d="M306.320343 1.304362m61.279822 0l122.480878 0q61.279822 0 61.279821 61.279822l0 857.602442q0 61.279822-61.279821 61.279822l-122.480878 0q-61.279822 0-61.279822-61.279822l0-857.602442q0-61.279822 61.279822-61.279822Z" fill="#5091FF" ></path><path d="M658.009809 33.913419L776.394863 2.092021a61.279822 61.279822 0 0 1 75.063843 43.32121l221.962131 828.459082a61.279822 61.279822 0 0 1-43.321211 74.985078l-118.385054 31.742632a61.279822 61.279822 0 0 1-74.985077-43.32121L614.688598 108.898497a61.279822 61.279822 0 0 1 43.321211-75.063844z" fill="#B6D0FC" ></path></symbol><symbol id="icon-tuijian" viewBox="0 0 1097 1024"><path d="M729.526857 1015.442286a99.474286 99.474286 0 0 1-40.96-9.216c-66.706286-30.72-165.595429-77.385143-206.262857-96.768-69.046857 31.670857-138.093714 63.488-207.140571 95.378285-31.744 13.750857-62.683429 11.922286-85.577143-4.388571-21.577143-15.36-32.256-41.837714-29.403429-72.411429 8.192-71.533714 21.942857-169.398857 27.062857-205.750857-57.197714-59.172571-113.590857-119.222857-169.033143-179.931428a67.437714 67.437714 0 0 1-14.116571-69.266286c10.020571-26.331429 35.84-45.056 69.339429-49.810286l219.355428-39.131428C313.051429 349.622857 373.028571 248.246857 413.037714 182.052571c33.792-61.659429 67.218286-61.659429 84.845715-55.442285 19.163429 6.144 37.302857 24.356571 55.442285 56.100571 39.058286 65.755429 98.011429 167.058286 117.979429 201.435429l217.234286 39.350857c31.963429 4.608 57.417143 23.259429 67.291428 49.737143a67.730286 67.730286 0 0 1-13.458286 68.973714c-55.076571 61.220571-110.957714 121.417143-167.570285 180.955429 4.900571 36.132571 18.285714 134.290286 26.989714 205.458285 3.364571 31.451429-7.168 58.221714-29.037714 73.801143-12.653714 8.704-27.794286 13.238857-43.154286 13.019429z" fill="#5091FF" ></path><path d="M1021.805714 215.698286a26.770286 26.770286 0 0 1-11.629714 3.364571c-21.211429 1.389714-52.882286 3.072-65.828571 3.657143l-36.644572 55.076571c-5.778286 8.192-13.677714 12.141714-21.869714 10.971429-7.68-0.950857-14.409143-6.436571-18.432-15.067429-8.923429-20.187429-20.626286-48.274286-24.868572-58.660571a2543.689143 2543.689143 0 0 1-69.558857-23.771429 21.942857 21.942857 0 0 1-14.189714-16.457142 24.137143 24.137143 0 0 1 9.508571-23.186286l48.274286-41.764572a7717.302857 7717.302857 0 0 1-1.316571-71.021714c-1.170286-21.211429 7.094857-26.038857 12.434285-26.843428 5.705143-1.170286 12.946286 1.097143 22.308572 6.948571 19.748571 11.995429 49.956571 30.573714 60.196571 36.864l59.830857-20.553143a23.625143 23.625143 0 0 1 24.283429 3.657143c5.851429 5.046857 8.630857 12.873143 7.314286 20.260571-4.242286 24.137143-8.777143 48.274286-13.677715 72.192 6.802286 8.923429 25.234286 33.133714 38.326858 50.907429 5.705143 7.899429 7.168 16.530286 4.169142 23.771429a20.114286 20.114286 0 0 1-8.704 9.654857zM133.705143 278.381714a13.385143 13.385143 0 0 1-4.388572-4.169143c-5.851429-8.850286-14.482286-22.162286-17.993142-27.648-10.971429-0.731429-21.942857-1.462857-32.987429-2.048-4.973714-0.438857-8.704-2.925714-10.24-6.729142-1.462857-3.657143-0.731429-7.899429 1.901714-11.702858 6.582857-8.996571 15.725714-21.065143 19.163429-25.526857a1271.881143 1271.881143 0 0 1-7.021714-36.059428 10.971429 10.971429 0 0 1 3.584-10.24 12.068571 12.068571 0 0 1 12.434285-1.682286l30.134857 10.459429c5.12-3.145143 20.333714-12.361143 30.354286-18.285715 8.923429-5.851429 13.092571-3.437714 14.774857-1.389714 1.901714 2.194286 2.779429 5.924571 2.56 11.483429l-0.877714 35.254857 23.844571 20.772571c3.584 2.925714 5.339429 7.168 4.461715 11.410286a10.971429 10.971429 0 0 1-6.948572 8.192 1293.165714 1293.165714 0 0 1-34.669714 12.141714c-2.194286 5.193143-8.045714 19.236571-12.434286 29.330286-2.048 4.388571-5.412571 7.314286-9.289143 7.753143a10.020571 10.020571 0 0 1-6.363428-1.316572z" fill="#B6D0FC" ></path></symbol><symbol id="icon-chuangjianzhe" viewBox="0 0 1024 1024"><path d="M512.000731 551.350857c150.016 0 271.652571-123.392 271.652572-275.675428V68.900571A68.461714 68.461714 0 0 0 715.776731 0H512.000731C361.984731 0 240.34816 123.465143 240.34816 275.748571c0 152.137143 121.636571 275.602286 271.652571 275.602286z" fill="#B6D0FC" ></path><path d="M240.34816 610.450286h543.305143c112.566857 0 203.776 92.598857 203.776 206.774857v137.874286c0 38.034286-30.427429 68.900571-67.949714 68.900571H104.595017A68.461714 68.461714 0 0 1 36.57216 955.099429v-137.874286c0-114.176 91.209143-206.774857 203.776-206.774857z" fill="#5091FF" ></path></symbol><symbol id="icon-bangdingshoujihao" viewBox="0 0 1024 1024"><path d="M728.15 898.72H297.89c-23.71 0-43-19.29-43-43V167.99c0-23.71 19.29-43 43-43h430.26c23.71 0 43 19.29 43 43v687.73c0 23.71-19.29 43-43 43zM297.89 130.99c-20.4 0-37 16.6-37 37v687.73c0 20.4 16.6 37 37 37h430.26c20.4 0 37-16.6 37-37V167.99c0-20.4-16.6-37-37-37H297.89z" fill="#161616" ></path><path d="M691.33 745.76h-358c-18.2 0-33-14.8-33-33V221.78c0-18.2 14.8-33 33-33h358c18.2 0 33 14.8 33 33v490.98c0 18.2-14.8 33-33 33z m-358-550.98c-14.89 0-27 12.11-27 27v490.98c0 14.89 12.11 27 27 27h358c14.89 0 27-12.11 27-27V221.78c0-14.89-12.11-27-27-27h-358z" fill="#161616" ></path><path d="M512.38 870.46c-26.84 0-48.67-21.83-48.67-48.67 0-26.84 21.84-48.67 48.67-48.67 26.84 0 48.67 21.83 48.67 48.67 0 26.84-21.83 48.67-48.67 48.67z m0-91.35c-23.53 0-42.67 19.14-42.67 42.67s19.14 42.67 42.67 42.67 42.67-19.14 42.67-42.67c0-23.52-19.14-42.67-42.67-42.67z" fill="#0E89F3" ></path></symbol><symbol id="icon-liulan" viewBox="0 0 1024 1024"><path d="M510.557138 204.354248c-302.839283 0-458.323497 306.150702-458.323497 306.150702s117.330242 306.189587 458.323497 306.189587c308.802088 0 458.300984-304.995389 458.300984-304.995389S818.167075 204.354248 510.557138 204.354248L510.557138 204.354248 510.557138 204.354248zM511.245823 701.866279c-110.729917 0-190.772928-83.72589-190.772928-191.364399 0-107.647719 80.049151-191.352119 190.772928-191.352119 110.723777 0 190.763718 83.697237 190.763718 191.352119C702.010565 618.140389 621.970624 701.866279 511.245823 701.866279L511.245823 701.866279 511.245823 701.866279zM511.245823 395.675668c-63.286372 0.145309-114.460892 53.321416-114.460892 114.827235 0 61.473073 51.175543 114.821095 114.460892 114.821095 63.282279 0 114.453728-53.352115 114.453728-114.821095C625.703645 448.975595 574.529125 395.556964 511.245823 395.675668L511.245823 395.675668 511.245823 395.675668z"  ></path></symbol><symbol id="icon-pinglun" viewBox="0 0 1024 1024"><path d="M896 192H128c-35.2 0-64 28.8-64 64v448c0 35.2 28.8 64 64 64h256l128 64 128-64h256c35.2 0 64-28.8 64-64V256c0-35.2-28.8-64-64-64zM304 528c-26.5 0-48-21.5-48-48s21.5-48 48-48 48 21.5 48 48-21.5 48-48 48z m208 0c-26.5 0-48-21.5-48-48s21.5-48 48-48 48 21.5 48 48-21.5 48-48 48z m208 0c-26.5 0-48-21.5-48-48s21.5-48 48-48 48 21.5 48 48-21.5 48-48 48z"  ></path></symbol><symbol id="icon-bokeyuan" viewBox="0 0 1024 1024"><path d="M863.418182 698.181818c-13.963636 0-23.272727 9.309091-23.272727 23.272727v186.181819c0 39.563636-25.6 69.818182-69.818182 69.818181H134.981818c-41.890909 0-86.109091-30.254545-86.109091-69.818181V114.036364C48.872727 74.472727 93.090909 46.545455 134.981818 46.545455h635.345455c44.218182 0 69.818182 30.254545 69.818182 69.818181v325.818182c0 13.963636 9.309091 23.272727 23.272727 23.272727s23.272727-9.309091 23.272727-23.272727V116.363636c0-65.163636-46.545455-116.363636-116.363636-116.363636H134.981818C69.818182 0 2.327273 46.545455 2.327273 114.036364V907.636364c0 69.818182 69.818182 116.363636 132.654545 116.363636h635.345455c69.818182 0 116.363636-51.2 116.363636-116.363636v-186.181819c0-13.963636-11.636364-23.272727-23.272727-23.272727z m153.6-260.654545c-9.309091-9.309091-23.272727-9.309091-32.581818 0L512 889.018182c-9.309091 9.309091-9.309091 23.272727 0 32.581818 9.309091 9.309091 23.272727 9.309091 32.581818 0l472.436364-451.490909c6.981818-6.981818 6.981818-23.272727 0-32.581818zM630.690909 302.545455h-372.363636c-13.963636 0-23.272727 9.309091-23.272728 23.272727s9.309091 23.272727 23.272728 23.272727h372.363636c13.963636 0 23.272727-9.309091 23.272727-23.272727s-11.636364-23.272727-23.272727-23.272727z m0 232.727272h-372.363636c-13.963636 0-23.272727 9.309091-23.272728 23.272728s9.309091 23.272727 23.272728 23.272727h372.363636c13.963636 0 23.272727-9.309091 23.272727-23.272727s-11.636364-23.272727-23.272727-23.272728z" fill="#666666" ></path></symbol><symbol id="icon-weibiaoti105" viewBox="0 0 1024 1024"><path d="M 936.038 145.126 c -109.38 -118.519 -286.737 -118.519 -396.083 0 l -27.9296 30.2763 l -27.9467 -30.2763 c -109.363 -118.519 -286.703 -118.519 -396.066 0 c -109.38 118.511 -109.38 310.647 0 429.158 l 27.9296 30.2507 l 396.083 365.414 l 396.066 -365.414 l 27.9467 -30.2507 C 1045.4 455.774 1045.4 263.637 936.038 145.126 L 936.038 145.126 Z" fill="#8a8a8a" ></path></symbol><symbol id="icon-guanzhu" viewBox="0 0 1028 1024"><path d="M726.109091 32.581818c-83.781818 0-158.254545 32.581818-214.109091 93.090909-55.854545-60.509091-130.327273-93.090909-214.109091-93.090909C134.981818 32.581818 0 176.872727 0 353.745455c0 93.090909 37.236364 181.527273 107.054545 246.690909l353.745455 367.709091c13.963636 13.963636 32.581818 23.272727 51.2 23.272727 18.618182 0 37.236364-9.309091 51.2-23.272727l358.4-363.054546c65.163636-65.163636 107.054545-158.254545 107.054545-251.345454-4.654545-176.872727-139.636364-321.163636-302.545454-321.163637z m144.290909 516.654546L512 912.290909l-358.4-367.709091c-51.2-51.2-83.781818-116.363636-83.781818-190.836363 0-134.981818 102.4-242.036364 228.072727-242.036364 97.745455 0 176.872727 65.163636 214.109091 153.6 32.581818-88.436364 116.363636-153.6 214.109091-153.6 125.672727 0 228.072727 107.054545 228.072727 242.036364 0 74.472727-32.581818 144.290909-83.781818 195.490909z" fill="#707070" ></path></symbol><symbol id="icon-tongji" viewBox="0 0 1024 1024"><path d="M210.823529 301.176471A90.352941 90.352941 0 0 1 301.176471 391.529412v542.117647A90.352941 90.352941 0 0 1 210.823529 1024h-120.470588A90.352941 90.352941 0 0 1 0 933.647059v-542.117647A90.352941 90.352941 0 0 1 90.352941 301.176471h120.470588z m361.411765-301.176471A90.352941 90.352941 0 0 1 662.588235 90.352941v843.294118A90.352941 90.352941 0 0 1 572.235294 1024h-120.470588A90.352941 90.352941 0 0 1 361.411765 933.647059v-843.294118A90.352941 90.352941 0 0 1 451.764706 0h120.470588z m361.411765 542.117647a90.352941 90.352941 0 0 1 90.352941 90.352941v301.176471a90.352941 90.352941 0 0 1-90.352941 90.352941h-120.470588a90.352941 90.352941 0 0 1-90.352942-90.352941v-301.176471A90.352941 90.352941 0 0 1 813.176471 542.117647h120.470588z m-722.82353-180.705882h-120.470588a30.117647 30.117647 0 0 0-29.635765 24.69647L60.235294 391.529412v542.117647a30.117647 30.117647 0 0 0 24.696471 29.635765L90.352941 963.764706h120.470588a30.117647 30.117647 0 0 0 29.635765-24.696471L240.941176 933.647059v-542.117647a30.117647 30.117647 0 0 0-30.117647-30.117647z m361.411765-301.176471h-120.470588a30.117647 30.117647 0 0 0-29.635765 24.696471L421.647059 90.352941v843.294118a30.117647 30.117647 0 0 0 24.69647 29.635765L451.764706 963.764706h120.470588a30.117647 30.117647 0 0 0 29.635765-24.696471L602.352941 933.647059v-843.294118a30.117647 30.117647 0 0 0-30.117647-30.117647z m361.411765 542.117647h-120.470588a30.117647 30.117647 0 0 0-29.635765 24.696471L783.058824 632.470588v301.176471a30.117647 30.117647 0 0 0 24.69647 29.635765l5.421177 0.481882h120.470588a30.117647 30.117647 0 0 0 29.635765-24.696471L963.764706 933.647059v-301.176471a30.117647 30.117647 0 0 0-30.117647-30.117647z" fill="#666666" ></path></symbol><symbol id="icon-zhuye" viewBox="0 0 1024 1024"><path d="M981.929813 524.629333c-9.756444 0-19.626667-3.413333-27.534222-10.211555L538.395591 154.965333l-4.494222-4.124444a31.488 31.488 0 0 0-43.320889 0c-1.251556 1.28-2.816 2.702222-4.494222 4.124444L69.944036 514.417778a42.097778 42.097778 0 0 1-59.676445-4.551111 42.723556 42.723556 0 0 1 4.522667-60.017778L430.761813 90.339556c0.284444-0.284444 1.137778-0.995556 1.422223-1.422223a115.484444 115.484444 0 0 1 159.687111 0l1.422222 1.422223L1009.23648 449.820444c17.777778 15.36 19.768889 42.183111 4.522667 60.046223-8.192 9.671111-20.024889 14.791111-31.857778 14.791111zM769.023147 995.555556h-77.027556c-61.354667 0-111.303111-50.261333-111.303111-112.014223V762.026667a27.192889 27.192889 0 0 0-26.652444-26.851556H477.040924a26.823111 26.823111 0 0 0-26.652444 26.851556v121.514666c0 61.752889-49.948444 112.014222-111.303111 112.014223H256.283591c-61.354667 0-111.303111-50.261333-111.303111-112.014223v-392.248889a42.382222 42.382222 0 0 1 42.325333-42.609777 42.382222 42.382222 0 0 1 42.325334 42.609777v392.248889c0 14.791111 11.975111 26.823111 26.652444 26.823111h82.801778a26.823111 26.823111 0 0 0 26.652444-26.823111V762.026667c0-61.781333 49.948444-112.014222 111.303111-112.014223h77.027556c61.354667 0 111.303111 50.232889 111.303111 112.014223v121.514666c0 14.791111 11.975111 26.823111 26.652445 26.823111h77.027555a26.823111 26.823111 0 0 0 26.652445-26.823111v-392.248889a42.382222 42.382222 0 0 1 42.325333-42.609777 42.382222 42.382222 0 0 1 42.325333 42.609777v392.248889c0 61.752889-49.948444 112.014222-111.303111 112.014223z"  ></path></symbol><symbol id="icon-fuzhi1" viewBox="0 0 1024 1024"><path d="M869.864727 46.545455A107.706182 107.706182 0 0 1 977.454545 154.112v599.412364A107.706182 107.706182 0 0 1 869.864727 861.090909H721.454545v8.797091A107.682909 107.682909 0 0 1 613.888 977.454545H154.112A107.682909 107.682909 0 0 1 46.545455 869.888V270.475636A107.682909 107.682909 0 0 1 154.112 162.909091H302.545455v-8.797091A107.706182 107.706182 0 0 1 410.135273 46.545455h459.729454zM154.135273 907.636364h459.729454A37.841455 37.841455 0 0 0 651.636364 869.888V270.475636c0-20.805818-16.942545-37.748364-37.748364-37.748363H154.135273C133.329455 232.727273 116.363636 249.669818 116.363636 270.475636v599.412364C116.363636 890.717091 133.329455 907.636364 154.135273 907.636364zM907.636364 753.524364V154.112C907.636364 133.306182 890.670545 116.363636 869.864727 116.363636H410.135273C389.329455 116.363636 372.363636 133.306182 372.363636 154.112V162.909091h241.524364A107.682909 107.682909 0 0 1 721.454545 270.475636V791.272727h148.410182c20.805818 0 37.771636-16.919273 37.771637-37.748363zM523.636364 372.363636a34.909091 34.909091 0 0 1 0 69.818182h-279.272728a34.909091 34.909091 0 0 1 0-69.818182h279.272728z m0 162.909091a34.909091 34.909091 0 0 1 0 69.818182h-279.272728a34.909091 34.909091 0 0 1 0-69.818182h279.272728z m-93.090909 162.909091a34.909091 34.909091 0 0 1 0 69.818182h-186.181819a34.909091 34.909091 0 0 1 0-69.818182h186.181819z" fill="#797979" ></path></symbol><symbol id="icon-projectx" viewBox="0 0 1024 1024"><path d="M1001.245241 289.985422H773.689685a45.511111 45.511111 0 0 1-45.511111-45.511111V22.755556H318.578574a56.888889 56.888889 0 0 0-56.888889 56.888888v170.666667h-22.755555V79.644444a79.644444 79.644444 0 0 1 79.644444-79.644444h432.355556l273.066666 273.066667v637.155555a79.644444 79.644444 0 0 1-79.644444 79.644445H398.223019v-22.755556h546.133333a56.888889 56.888889 0 0 0 56.888889-56.888889V289.985422z m-17.214578-22.755555L750.93413 34.133333v198.9632a34.133333 34.133333 0 0 0 34.133333 34.133334h198.9632z m-852.184178 626.688c0-24.735289 7.736889-48.776533 21.959111-69.0176V638.850844A251.448889 251.448889 0 0 1 0.000796 406.528c0-91.113244 49.664-175.604622 129.6384-220.478578a31.061333 31.061333 0 0 1 31.175112 0.364089c9.602844 5.688889 15.485156 16.0768 15.485155 27.295289v104.174933c0 6.8608 5.768533 12.674844 12.572445 12.674845h124.5184c6.803911 0 12.538311-5.802667 12.538311-12.674845v-104.174933c0-11.218489 5.893689-21.6064 15.473777-27.295289a31.288889 31.288889 0 0 1 31.175112-0.364089c79.985778 44.896711 129.683911 129.365333 129.683911 220.478578a251.448889 251.448889 0 0 1-153.827556 232.311467v185.981155a120.0128 120.0128 0 0 1 21.981867 69.074489c0 66.332444-53.498311 120.263111-119.284622 120.263111s-119.284622-53.930667-119.284623-120.263111z m23.415467 2.025244c-0.113778 50.972444 43.190044 96.119467 95.891911 96.745245 47.183644 1.046756 96.6656-40.391111 95.311645-96.745245 1.046756-37.364622-12.686222-56.866133-22.414223-71.042844V627.143111C406.369508 605.377422 484.887552 498.346667 477.867463 410.350933c-0.227556-88.211911-51.780267-170.609778-102.741333-201.636977-6.644622-3.811556-17.1008-9.227378-23.643022-5.279289-6.5536 3.982222-5.006222 15.7696-5.006223 23.620266v115.325156c0 4.801422-3.925333 8.863289-8.567466 8.863289h-176.583111c-4.642133 0-8.578844-4.061867-8.578845-8.863289l2.503111-115.325156c0-7.850667 0.159289-19.638044-6.382933-23.620266-6.5536-3.982222-22.710044 6.826667-29.343289 10.660977-51.245511 34.4064-95.459556 116.155733-95.516444 196.266667 0 71.600356 58.015289 187.665067 153.349688 208.930133v205.596445c-9.716622 14.153956-23.426844 34.633956-22.095644 71.042844zM159.289685 466.488889h182.044445a11.377778 11.377778 0 0 1 0 22.755555H159.289685a11.377778 11.377778 0 0 1 0-22.755555z m91.022223 489.244444a45.511111 45.511111 0 1 1 0-91.022222 45.511111 45.511111 0 0 1 0 91.022222z m319.670044-351.687111h301.579378a11.377778 11.377778 0 1 1 0 22.755556H569.981952a11.377778 11.377778 0 0 1 0-22.755556zM557.511908 816.810667h301.579377a11.377778 11.377778 0 1 1 0 22.755555H557.511908a11.377778 11.377778 0 0 1 0-22.755555zM632.35493 409.6h239.2064a11.377778 11.377778 0 1 1 0 22.755556H632.35493a11.377778 11.377778 0 1 1 0-22.755556z" fill="#D8D8D8" ></path></symbol><symbol id="icon-hostingx2" viewBox="0 0 1280 1024"><path d="M773.033088 555.6864l-76.352 122.176a108.8 108.8 0 1 1-154.112 64.064l-129.7024-105.024A108.416 108.416 0 0 1 339.241088 665.6a108.4288 108.4288 0 0 1-43.6352-9.1008l-112.1664 179.5072a108.8 108.8 0 1 1-20.6336-15.296l110.72-177.1904a108.8 108.8 0 1 1 156.032-26.0352l123.9296 100.352A108.736 108.736 0 0 1 646.441088 665.6c8.8832 0 17.5232 1.0624 25.792 3.072l78.208-125.1456a108.8 108.8 0 1 1 22.592 12.16zM108.841088 998.4a83.2 83.2 0 1 0 0-166.4 83.2 83.2 0 0 0 0 166.4z m230.4-358.4a83.2 83.2 0 1 0 0-166.4 83.2 83.2 0 0 0 0 166.4z m307.2 217.6a83.2 83.2 0 1 0 0-166.4 83.2 83.2 0 0 0 0 166.4z m166.4-320a83.2 83.2 0 1 0 0-166.4 83.2 83.2 0 0 0 0 166.4zM294.441088 985.6v-25.6h908.8a51.2 51.2 0 0 0 51.2-51.2V281.6a51.2 51.2 0 0 0-51.2-51.2H769.615488c-24.5248-41.4592-58.5472-93.312-102.0672-155.584A115.2 115.2 0 0 0 573.122688 25.6H89.641088a51.2 51.2 0 0 0-51.2 51.2v652.8H12.841088V64a64 64 0 0 1 64-64h506.9056a115.2 115.2 0 0 1 94.6688 49.536c42.5216 61.312 76.3904 113.0752 101.6192 155.264H1216.041088a64 64 0 0 1 64 64v652.8a64 64 0 0 1-64 64H294.441088z" fill="#D8D8D8" ></path></symbol><symbol id="icon-communityx" viewBox="0 0 1293 1024"><path d="M620.078831 849.814501c16.571363 31.1353 49.862287 52.395146 88.218928 52.395146h46.601905l-10.468251 79.380868c0 4.971409 0.431125 4.971409 4.675011 3.327745 3.489417-1.347265 10.400888-6.830635 18.942549-12.044551l106.029775-70.664062h290.322189c54.914532 0 99.428175-43.584031 99.428175-97.353387V544.69934c0-41.819113-26.945305-77.494697-64.76304-91.263748v-34.867224c53.216977 6.992307 94.308567 52.960997 94.308567 108.629997v292.760738c0 60.519155-48.541967 109.55961-108.414435 109.55961H879.642954l-140.048223 92.045162a14.361848 14.361848 0 0 1-20.006889-4.284304 14.725609 14.725609 0 0 1-2.23646-9.606001l8.730279-78.141384h-38.343169c-49.633252 0-91.47931-33.722049-104.345694-79.717685h-79.54254l-234.96306 152.806825a24.250774 24.250774 0 0 1-37.319247-23.051709l14.644773-129.755116H181.880809c-100.452097 0-181.880809-81.428712-181.880809-181.880809V181.880809C0 81.428712 81.428712 0 181.880809 0h834.186224c100.452097 0 181.880809 81.428712 181.880808 181.880809v486.052883c0 100.452097-81.428712 181.880809-181.880808 181.880809H620.078831z m-129.889843-29.936234h507.11064c95.925286 0 173.702909-75.98576 173.702908-169.701531V196.660308C1171.002536 102.931065 1093.224914 26.945305 997.299628 26.945305H200.648214C104.722928 26.945305 26.945305 102.931065 26.945305 196.660308v453.516428c0 93.729243 77.76415 169.701531 173.702909 169.701531h81.374821l-18.28239 138.391087c0 8.662916 0.754469 8.662916 8.164428 5.79324 6.103112-2.344242 18.174608-11.896352 33.102307-20.97692l185.181608-123.207407zM323.34366 485.01549a80.835915 80.835915 0 1 1 0-161.67183 80.835915 80.835915 0 0 1 0 161.67183z m0-26.945305a53.89061 53.89061 0 1 0 0-107.78122 53.89061 53.89061 0 0 0 0 107.78122z m269.45305 26.945305a80.835915 80.835915 0 1 1 0-161.67183 80.835915 80.835915 0 0 1 0 161.67183z m0-26.945305a53.89061 53.89061 0 1 0 0-107.78122 53.89061 53.89061 0 0 0 0 107.78122z m269.453049 26.945305a80.835915 80.835915 0 1 1 0-161.67183 80.835915 80.835915 0 0 1 0 161.67183z m0-26.945305a53.89061 53.89061 0 1 0 0-107.78122 53.89061 53.89061 0 0 0 0 107.78122z" fill="#D8D8D8" ></path></symbol><symbol id="icon-detectionx" viewBox="0 0 1276 1024"><path d="M1170.28541 319.168748H26.597396v531.947914a53.194791 53.194791 0 0 0 53.194791 53.194791h598.441403v26.597396H79.792187a79.792187 79.792187 0 0 1-79.792187-79.792187V79.792187a79.792187 79.792187 0 0 1 79.792187-79.792187h1037.298432a79.792187 79.792187 0 0 1 79.792187 79.792187v279.272655h-26.597396v-39.896094z m0-26.597395V79.792187a53.194791 53.194791 0 0 0-53.194791-53.194791H79.792187a53.194791 53.194791 0 0 0-53.194791 53.194791v212.779166h1143.688014z" fill="#D8D8D8" ></path><path d="M1003.692622 1023.999734c-1.569246 0-3.138493-0.10639-4.654544-0.345766C906.479141 1010.195686 731.428381 934.060641 731.428381 742.333314V482.875719c0-16.54358 11.277296-30.826382 27.009656-34.044667l238.711626-49.205182c4.322077-0.891013 8.777141-0.891013 13.099217 0l238.711627 49.205182c15.73236 3.218285 27.009655 17.501086 27.009655 34.044667v259.457595c0 191.727327-175.05076 267.862372-267.609697 281.320654a30.015161 30.015161 0 0 1-4.654544 0.345766z m0-26.597396c1.409662 0 2.819324-0.093091 4.202389-0.30587 83.529121-12.327893 241.477755-81.973174 241.477755-257.396296v-237.381757c0-15.133918-10.173504-28.193239-24.376513-31.132252l-215.38571-45.016092a29.20394 29.20394 0 0 0-11.835841 0L782.415589 471.172865C768.199281 474.125176 758.025777 487.184497 758.025777 502.331714v237.381756c0 175.409825 157.948634 245.068404 241.477756 257.382998 1.356467 0.212779 2.779428 0.30587 4.189089 0.30587z" fill="#D8D8D8" ></path><path d="M159.584374 146.285676m-39.896093 0a39.896094 39.896094 0 1 0 79.792187 0 39.896094 39.896094 0 1 0-79.792187 0Z" fill="#D8D8D8" ></path><path d="M305.87005 146.285676m-39.896093 0a39.896094 39.896094 0 1 0 79.792187 0 39.896094 39.896094 0 1 0-79.792187 0Z" fill="#D8D8D8" ></path><path d="M452.155727 146.285676m-39.896094 0a39.896094 39.896094 0 1 0 79.792187 0 39.896094 39.896094 0 1 0-79.792187 0Z" fill="#D8D8D8" ></path><path d="M412.259633 585.142705h26.597396l-39.896094 186.18177h-26.597395zM332.387654 492.238002L199.480468 627.033603l132.907186 134.782303-13.298698 13.48488L172.883072 627.033603 319.088956 478.753122l13.298698 13.48488z" fill="#D8D8D8" ></path><path d="M997.402338 505.350518m13.298698 0l0 0q13.298698 0 13.298698 13.298698l0 372.36354q0 13.298698-13.298698 13.298697l0 0q-13.298698 0-13.298698-13.298697l0-372.36354q0-13.298698 13.298698-13.298698Z" fill="#D8D8D8" ></path></symbol><symbol id="icon-lianjie" viewBox="0 0 1024 1024"><path d="M722.664727 628.736a34.955636 34.955636 0 0 1-24.692363-59.601455l154.949818-154.926545c68.049455-68.049455 68.049455-178.781091 0-246.853818-68.072727-68.049455-178.850909-68.049455-246.877091 0l-154.926546 154.926545a34.909091 34.909091 0 1 1-49.338181-49.361454L556.683636 117.992727c95.278545-95.232 250.321455-95.278545 345.6 0 95.278545 95.278545 95.278545 250.321455 0 345.576728l-154.926545 154.949818a34.792727 34.792727 0 0 1-24.669091 10.216727zM290.816 973.707636a243.665455 243.665455 0 0 1-172.823273-71.447272c-95.278545-95.301818-95.278545-250.321455 0-345.6l138.472728-138.449455a34.909091 34.909091 0 1 1 49.384727 49.361455l-138.472727 138.449454c-68.072727 68.049455-68.072727 178.804364 0 246.877091 68.072727 68.049455 178.827636 68.002909 246.853818 0l138.472727-138.496a34.909091 34.909091 0 1 1 49.338182 49.361455l-138.426182 138.472727a243.595636 243.595636 0 0 1-172.8 71.447273z m137.076364-346.414545a34.955636 34.955636 0 0 1-24.692364-59.601455l164.538182-164.538181a34.909091 34.909091 0 1 1 49.361454 49.361454l-164.538181 164.561455a34.792727 34.792727 0 0 1-24.669091 10.24z" fill="#797979" ></path></symbol><symbol id="icon-nenghaofenxix" viewBox="0 0 1024 1024"><path d="M314.757461 943.248803c7.309511 2.945859 10.239617 11.767683 7.309512 19.124455-2.914353 7.356771-11.688917 10.30263-18.998429 7.356771-39.477663-19.124454-78.955325-42.675574-114.053582-72.086905C-5.443245 734.329106-46.385961 456.25261 80.821591 245.867859c4.395159-7.356771 13.15397-8.821824 20.479235-4.410912 7.309511 4.410912 8.758811 13.232736 4.379405 20.589508-119.882287 200.097873-76.025219 463.460828 102.348913 614.991408 32.168151 25.016172 68.715708 48.551539 106.728317 66.21094m-130.121904-782.716338a14.067659 14.067659 0 0 1-20.479235 0 14.288204 14.288204 0 0 1 0-20.589507C346.925613-36.619549 636.438974-48.387232 835.276586 117.872644c5.844458 5.875965 7.309511 14.713542 1.465053 20.589508-5.860212 5.891718-14.634776 7.356771-20.479234 1.480806-185.683643-155.957247-456.182823-147.135422-631.626848 20.589507m717.891685 73.567711c-4.379406-7.356771-2.914353-16.178595 2.930105-20.60526 7.309511-4.410912 16.068322-2.930106 20.479235 2.945859 127.191799 182.438472 121.34734 435.498796-27.788746 614.991409a514.454121 514.454121 0 0 1-194.458207 144.17381c-7.309511 2.945859-16.084076 0-19.014182-7.356771-2.930106-7.356771 0-16.178595 7.309512-19.124455 70.180761-29.427084 133.052011-76.497817 182.76929-135.351986 138.896469-164.779071 149.136086-403.125852 27.772993-579.672606"  ></path><path d="M285.078325 641.180096a15.438192 15.438192 0 0 1-20.573754 1.512313 16.509414 16.509414 0 0 1-1.465053-21.156625s132.264348-151.073737 208.699152-238.6776a15.438192 15.438192 0 0 1 20.573753-1.512312c5.875965 6.049251 5.875965 15.107374 1.465053 21.156624L285.094078 641.180096m283.668903-235.668728a14.886828 14.886828 0 0 1 0-21.140871 13.941633 13.941633 0 0 1 20.573754 0A76567.320452 76567.320452 0 0 0 806.841957 618.511159a14.886828 14.886828 0 0 1 0 21.140871 13.941633 13.941633 0 0 1-20.573754 0L568.747228 405.527121"  ></path><path d="M527.694239 400.438819c25.063432 0 44.2509-18.982675 44.2509-43.809808S552.741918 312.803449 527.694239 312.803449c-25.063432 0-44.2509 18.998428-44.250899 43.825562S502.64656 400.438819 527.694239 400.438819z m0 29.222292c-41.289287 0-73.725244-32.136645-73.725244-73.0321S486.389199 283.59691 527.694239 283.59691c41.289287 0 73.725244 32.136645 73.725244 73.032101s-32.435957 73.0321-73.725244 73.0321zM240.118529 695.481574c16.225855 0 29.490098-13.15397 29.490097-29.222292s-13.279996-29.206539-29.490097-29.206539c-16.225855 0-29.505851 13.15397-29.505851 29.206539 0 16.068322 13.279996 29.222292 29.505851 29.222292z m0 29.206539C207.666819 724.688113 181.12258 698.395926 181.12258 666.259282s26.544238-58.413078 58.995949-58.413078 58.980195 26.292186 58.980195 58.413078c0 32.136645-26.544238 58.428831-58.980195 58.428831z m575.151421-29.206539c16.225855 0 29.505851-13.15397 29.505851-29.222292s-13.279996-29.206539-29.505851-29.206539-29.490098 13.15397-29.490098 29.206539c0 16.068322 13.279996 29.222292 29.490098 29.222292z m0 29.206539c-32.45171 0-58.980195-26.292186-58.980195-58.428831s26.544238-58.413078 58.980195-58.413078c32.45171 0 58.995948 26.292186 58.995948 58.413078C874.265898 698.395926 847.72166 724.688113 815.26995 724.688113zM274.035291 425.265953l209.408049 172.340634c5.907471 5.860212 7.388278 14.619023 1.480806 20.463481-5.891718 5.828705-14.745049 7.293758-20.636767 1.465053L254.847824 447.194487c-5.907471-5.860212-7.372524-14.619023-1.480806-20.463481 4.426665-5.828705 13.279996-7.293758 20.636767-1.465053z m296.429042 182.580251L781.353187 423.8009c5.907471-4.379406 16.225855-4.379406 20.636767 2.914352 4.442419 5.844458 4.442419 16.068322-2.930106 20.447728L588.15524 631.208284c-5.891718 4.379406-16.225855 4.379406-20.636767-2.914352-4.426665-5.844458-2.961612-16.068322 2.94586-20.447728z"  ></path><path d="M518.856662 579.285549c40.233819 0 71.850606 31.979112 71.850606 72.701282C590.707268 692.693247 559.090481 724.688113 518.856662 724.688113c-40.249572 0-71.866359-31.979112-71.86636-72.701282 0-40.72217 31.616787-72.717035 71.86636-72.717036zM238.606216 346.609939c31.616787 0 57.499389 26.181914 57.499389 58.161026 0 31.994865-25.882602 58.176779-57.499389 58.176779-31.616787 0-57.483636-26.181914-57.483636-58.176779C181.12258 372.791853 206.989429 346.609939 238.621969 346.609939z"  ></path><path d="M236.258981 429.31454c15.170387 0 27.5682-12.413567 27.5682-27.5682s-12.397813-27.5682-27.5682-27.568201-27.5682 12.413567-27.568201 27.568201 12.397813 27.5682 27.568201 27.5682z m0 27.5682a55.293933 55.293933 0 0 1-55.136401-55.1364 55.293933 55.293933 0 0 1 55.136401-55.136401 55.293933 55.293933 0 0 1 55.1364 55.136401 55.293933 55.293933 0 0 1-55.1364 55.1364zM819.129498 346.609939a55.293933 55.293933 0 0 1 55.1364 55.136401 55.293933 55.293933 0 0 1-55.1364 55.1364 55.293933 55.293933 0 0 1-55.1364-55.1364 55.293933 55.293933 0 0 1 55.1364-55.136401z"  ></path><path d="M815.458989 434.969959a29.521604 29.521604 0 0 0 29.395578-29.458591c0-16.194348-13.232736-29.458591-29.395578-29.458591a29.521604 29.521604 0 0 0-29.411331 29.458591c0 16.194348 13.232736 29.458591 29.411331 29.458591z m0 29.458591a59.027455 59.027455 0 0 1-58.822663-58.917182c0-32.388697 26.465472-58.901429 58.822663-58.901429A59.027455 59.027455 0 0 1 874.265898 405.527121c0 32.388697-26.465472 58.885676-58.806909 58.885676zM447.872485 1024c-8.821824 0-14.697789-5.891718-14.697789-14.729296 0-8.821824 5.875965-14.729296 14.697789-14.729295h1.480806c8.821824 0 14.697789 5.891718 14.697789 14.729295s-5.875965 14.729296-14.697789 14.729296h-1.480806z m60.287715 0c-8.821824 0-14.697789-5.891718-14.697789-14.729296 0-8.821824 5.875965-14.729296 14.697789-14.729295h1.465053c8.821824 0 14.713542 5.891718 14.713542 14.729295s-5.891718 14.729296-14.713542 14.729296h-1.465053z m60.287716 0c-8.821824 0-14.713542-5.891718-14.713543-14.729296 0-8.821824 5.891718-14.729296 14.713543-14.729295h1.465053c8.821824 0 14.697789 5.891718 14.697789 14.729295S578.734793 1024 569.912969 1024h-1.465053z"  ></path></symbol><symbol id="icon-healthmode" viewBox="0 0 1083 1024"><path d="M910.57414 517.322419c0-8.906419 7.513302-14.848 15.038511-14.848 9.025488 0 15.038512 5.941581 15.038512 14.848v1.488372c0 8.906419-7.525209 14.848-15.038512 14.848a14.978977 14.978977 0 0 1-15.038511-14.848v-1.488372m-4.524652 56.439069c1.512186-7.418047 9.037395-13.359628 16.550698-11.871255 7.525209 1.476465 13.538233 8.906419 12.026047 16.336372v1.488372c-1.500279 7.418047-9.013581 13.359628-16.538791 11.883163-7.513302 0-13.538233-7.429953-12.026047-17.824745m-12.026046 54.950698c3.000558-7.429953 10.51386-11.883163 18.03907-10.394791 7.525209 2.976744 12.026047 10.394791 10.525767 17.824745v1.488372c-3.000558 7.418047-10.525767 11.883163-18.050977 10.39479-9.013581-1.488372-13.526326-8.918326-10.525767-19.313116m-19.551256 53.474233c3.012465-7.429953 12.026047-10.394791 19.551256-7.429954 7.525209 2.976744 10.525767 11.883163 7.525209 19.313116v1.488372c-3.012465 7.429953-12.026047 10.394791-19.551256 7.429954-9.025488-2.976744-12.026047-11.883163-7.525209-20.801488m-28.576744 50.497488c4.524651-7.418047 13.538233-8.906419 21.063442-4.453209 7.513302 4.453209 9.013581 13.371535 4.500837 20.801488 0 0 0 1.476465-1.500279 1.476465-4.512744 7.429953-13.538233 8.918326-21.051535 4.465116-6.02493-5.953488-7.525209-14.859907-3.012465-22.28986m-34.589768 44.567814c6.013023-5.953488 15.038512-7.429953 21.051535-1.488372 6.02493 5.953488 7.525209 14.859907 1.512186 20.801488 0 0 0 1.476465-1.512186 1.476465-6.013023 5.953488-15.038512 7.429953-21.051535 1.488372-6.013023-5.941581-6.013023-14.848 0-22.277953m-40.60279 40.102698c6.013023-5.941581 16.538791-4.453209 21.051535 1.488372 6.013023 5.941581 4.512744 14.848-1.512186 20.789581 0 0-1.500279 0-1.50028 1.488372-6.013023 5.941581-16.550698 4.453209-21.051534-1.488372-6.02493-7.429953-4.524651-16.336372 3.000558-22.277953m-46.615814 32.672744c7.513302-4.453209 16.538791-2.964837 21.051535 4.465116 4.512744 7.418047 3.012465 16.336372-4.512745 20.789581 0 0-1.500279 0-1.500279 1.488373-7.525209 4.453209-16.550698 2.976744-21.063441-4.45321s-1.500279-16.348279 6.02493-22.28986m-51.140465 26.74307c7.513302-2.976744 16.550698 0 19.551255 7.429953 3.012465 7.418047 0 16.336372-7.525209 19.301209H683.460465c-7.525209 2.976744-16.550698 0-19.551256-7.418046-3.012465-5.953488 0-14.859907 9.025489-19.313116m-54.152931 19.313116c7.525209-1.488372 16.550698 2.976744 18.050977 10.394791 1.512186 7.429953-3.000558 16.336372-10.525767 17.824744h-1.500279c-7.525209 1.488372-16.550698-2.976744-18.050977-10.394791-1.500279-5.953488 3.012465-14.859907 12.026046-17.824744m-55.641302 11.883163c7.513302-1.488372 15.038512 4.453209 16.550698 13.359628 1.500279 7.429953-4.524651 14.859907-13.55014 16.348279h-1.500279c-7.525209 1.476465-15.038512-4.465116-16.550697-13.371535-1.500279-7.429953 4.524651-14.859907 13.538232-16.336372h1.512186m-57.153488 2.976744c9.025488 0 15.038512 7.418047 15.038511 14.848 0 8.906419-7.525209 14.848-15.038511 14.848h-1.512186a14.978977 14.978977 0 0 1-15.038512-14.848c0-8.918326 7.525209-14.859907 15.038512-14.859907h1.512186m-57.153489-4.453209c7.513302 1.488372 13.538233 8.906419 12.026047 16.336372-1.500279 7.429953-9.025488 13.371535-16.550698 11.883162h-1.500279c-9.013581-1.488372-15.038512-8.906419-13.526325-16.336372 1.500279-8.918326 9.025488-13.371535 19.551255-11.883162m-55.653209-13.371535c7.525209 2.976744 12.026047 10.394791 10.525768 19.313116-3.000558 7.429953-10.525767 11.883163-19.551256 10.394791h-1.500279c-7.525209-2.976744-12.026047-10.394791-9.025489-19.313117 1.500279-8.906419 9.025488-13.359628 19.551256-10.39479m-54.141023-20.789582c7.513302 2.976744 10.525767 11.883163 7.513302 19.30121-3.000558 7.429953-12.026047 10.406698-19.551256 7.429953h-1.500279c-7.525209-2.976744-10.525767-11.883163-7.525209-19.313116 3.012465-8.906419 12.026047-11.883163 21.063442-7.418047m-49.640186-28.219535c7.525209 4.453209 9.025488 13.359628 4.524651 20.789582-4.524651 7.429953-13.55014 8.906419-21.075349 4.453209 0 0-1.500279 0-1.500279-1.488372-7.513302-4.453209-9.013581-13.359628-4.500837-20.789581 4.500837-7.429953 15.038512-8.918326 22.551814-2.976745m-45.127442-35.637581c6.02493 5.941581 6.02493 14.848 1.512186 20.789581a16.253023 16.253023 0 0 1-21.051535 1.488372s-1.512186 0-1.512186-1.488372a15.764837 15.764837 0 0 1-1.500279-20.789581c6.013023-5.953488 15.038512-5.953488 22.563721 0m-39.102512-40.114605c6.013023 5.953488 4.512744 16.348279-1.512186 20.801489-6.013023 4.453209-16.550698 4.453209-21.051535-1.488372 0 0 0-1.488372-1.500279-1.488372-6.02493-5.941581-4.524651-16.336372 1.500279-20.789582 6.013023-5.953488 16.550698-4.453209 22.563721 2.976744m-34.601674-46.056186c4.524651 7.429953 1.512186 16.336372-4.512744 20.801489-7.513302 4.453209-16.550698 1.476465-21.051535-4.465117 0 0 0-1.476465-1.500279-1.476465-4.524651-7.429953-1.512186-16.348279 4.512744-20.801488 9.013581-4.453209 18.03907-2.976744 22.551814 5.953488M145.026977 671.791628c3.012465 7.429953 0 16.336372-7.52521 19.313116-7.513302 2.964837-16.550698 0-19.551255-7.429953v-1.488372c-3.000558-7.429953 0-16.336372 7.525209-19.313117 7.513302-2.976744 15.038512 0 19.551256 8.918326m-18.050977-53.474233c1.500279 7.429953-3.000558 16.336372-10.525767 17.824745s-16.550698-2.976744-18.050977-10.394791v-1.488372c-1.500279-7.429953 3.012465-16.336372 10.525767-17.824744 7.525209-2.976744 15.050419 1.488372 18.050977 11.883162m-10.525767-56.439069c1.500279 7.418047-4.512744 14.848-13.538233 16.336372-7.513302 1.488372-15.038512-4.453209-16.550698-13.371535v-1.488372c-1.500279-8.906419 4.524651-14.848 13.538233-16.336372 7.525209-1.488372 15.050419 4.453209 16.550698 13.371534v1.488373m-3.012466-56.43907c0 8.906419-7.513302 14.848-15.038511 14.848A14.978977 14.978977 0 0 1 83.348837 505.439256v-1.488372c0-8.906419 7.525209-14.848 15.038512-14.848 9.025488 0 15.038512 7.429953 15.038511 14.848v1.488372m6.024931-56.43907c-1.512186 7.429953-9.025488 13.371535-18.050977 11.883163a15.419535 15.419535 0 0 1-12.026047-17.824744v-1.488372c1.500279-7.429953 9.013581-13.371535 18.03907-11.883163 9.025488 1.488372 13.538233 8.918326 12.026047 19.313116m13.538232-54.962605c-3.000558 7.429953-10.525767 11.883163-19.551256 8.918326-7.513302-2.976744-12.026047-10.406698-9.025488-19.313116v-1.488372c3.012465-7.429953 10.537674-11.883163 19.563163-8.906419 9.013581 2.976744 12.026047 11.883163 9.013581 20.789581m22.563721-51.98586c-3.000558 7.429953-12.026047 10.394791-19.551256 5.953488-7.525209-2.976744-10.525767-11.89507-6.013023-19.325023v-1.476465c3.000558-7.429953 12.026047-10.406698 19.551256-5.953488 7.513302 2.976744 10.525767 11.89507 6.013023 20.801488m28.576744-49.021023c-4.512744 7.429953-13.538233 8.918326-21.051534 2.976744-7.525209-4.453209-9.025488-13.371535-3.012466-20.801489 0 0 0-1.476465 1.500279-1.476465 4.524651-7.429953 13.538233-8.918326 21.063442-2.976744 6.013023 4.453209 7.513302 13.371535 1.500279 22.277954m36.101954-44.555907a14.669395 14.669395 0 0 1-21.063442 0 14.240744 14.240744 0 0 1 0-20.789582s0-1.488372 1.512186-1.488372a14.669395 14.669395 0 0 1 21.051535 0c6.013023 5.941581 6.013023 14.848-1.500279 22.277954m42.114977-38.614326c-6.02493 4.453209-16.550698 4.453209-21.063442-2.976744-4.512744-5.941581-4.512744-16.336372 3.012465-20.789581 0 0 1.500279 0 1.500279-1.488373 6.013023-4.453209 16.550698-4.453209 21.063442 2.976745 4.500837 7.418047 4.500837 16.336372-4.524651 22.266046m48.139907-32.672744c-7.525209 4.453209-16.550698 1.488372-21.063442-5.941581s-1.500279-16.336372 6.02493-20.789582c0 0 1.500279 0 1.500279-1.488372 7.513302-4.453209 16.550698-1.488372 21.051535 5.941581 3.012465 8.906419 0 17.824744-7.513302 22.277954m51.128558-25.242791c-7.513302 2.964837-16.550698 0-19.551256-7.429953s0-16.336372 9.025488-19.313117h1.512186c7.513302-2.976744 16.538791 0 19.551256 8.918326 3.000558 5.941581-1.512186 14.848-10.537674 17.812837m54.15293-16.336372c-7.525209 1.488372-16.550698-2.976744-18.050977-10.394791-1.500279-7.429953 3.012465-16.336372 10.525768-17.824744h1.512186c7.513302-1.488372 16.538791 2.976744 18.03907 10.394791 1.512186 7.429953-3.000558 16.348279-10.525768 17.824744h-1.500279m57.153488-10.394791c-7.525209 1.488372-15.038512-4.453209-16.550697-13.371534-1.500279-8.906419 4.524651-14.848 13.538232-16.336372h1.500279c9.025488-1.488372 15.050419 4.453209 16.550698 13.371534 1.500279 7.429953-6.013023 14.848-13.538233 16.336372h-1.500279"  ></path><path d="M977.92 384.369116c-1.476465-7.418047 2.976744-16.312558 10.406698-17.80093s16.348279 2.964837 17.836651 10.382884C1018.058419 419.982884 1024 465.991442 1024 512c0 283.457488-228.875907 512-512.738233 512C228.875907 1024 0 795.457488 0 512S228.875907 0 512.738233 0c86.206512 0 166.459535 20.777674 237.794232 57.867907 7.429953 4.465116 10.406698 13.371535 5.953488 19.301209-4.465116 7.418047-13.383442 10.394791-20.813395 5.941582a486.923907 486.923907 0 0 0-224.410791-54.914977C246.712558 29.684093 29.719814 246.355349 29.719814 512S246.712558 994.315907 512.738233 994.315907c266.037581 0 483.018419-216.671256 483.018418-482.315907 0-43.031814-5.941581-86.075535-17.824744-127.630884"  ></path><path d="M300.186791 601.707163c-4.453209 5.929674-14.836093 7.40614-20.765768 2.976744-5.941581-4.453209-7.418047-14.812279-2.976744-20.741954l207.741023-281.338046 23.742512 17.765209-207.741023 281.338047z m161.744372-279.849675l22.266046-19.253581L691.914419 539.517023l281.933395-355.363721c4.453209-5.929674 14.836093-7.40614 20.765767-2.976744 5.941581 4.453209 7.418047 14.812279 2.976745 20.741954L715.668837 557.29414l-22.266046 28.124279-23.730605-26.647814-207.741023-236.913117z m0 0l22.266046-19.253581 23.730605 17.765209-23.742512-17.765209-22.266046 19.253581z"  ></path><path d="M1006.139535 107.162791c43.341395 0 77.395349 34.053953 77.395349 77.395349S1049.48093 261.953488 1006.139535 261.953488 928.744186 227.899535 928.744186 184.55814 962.79814 107.162791 1006.139535 107.162791z"  ></path><path d="M1006.139535 230.995349c26.314419 0 46.437209-20.122791 46.437209-46.437209s-20.122791-46.437209-46.437209-46.43721-46.437209 20.122791-46.437209 46.43721 20.122791 46.437209 46.437209 46.437209z m0 30.958139c-43.341395 0-77.395349-34.053953-77.395349-77.395348S962.79814 107.162791 1006.139535 107.162791s77.395349 34.053953 77.395349 77.395349-34.053953 77.395349-77.395349 77.395348zM690.604651 512c32.744186 0 59.534884 26.790698 59.534884 59.534884s-26.790698 59.534884-59.534884 59.534883-59.534884-26.790698-59.534884-59.534883 26.790698-59.534884 59.534884-59.534884z"  ></path><path d="M690.604651 601.302326c16.372093 0 29.767442-13.395349 29.767442-29.767442s-13.395349-29.767442-29.767442-29.767442a29.850791 29.850791 0 0 0-29.767442 29.767442c0 16.372093 13.395349 29.767442 29.767442 29.767442z m0 29.767441c-32.744186 0-59.534884-26.790698-59.534884-59.534883s26.790698-59.534884 59.534884-59.534884 59.534884 26.790698 59.534884 59.534884-26.790698 59.534884-59.534884 59.534883zM476.27907 273.860465c32.744186 0 59.534884 26.790698 59.534883 59.534884s-26.790698 59.534884-59.534883 59.534884-59.534884-26.790698-59.534884-59.534884 26.790698-59.534884 59.534884-59.534884z"  ></path><path d="M476.529116 363.781953c16.312558 0 29.648372-13.478698 29.648372-29.96986s-13.335814-29.981767-29.648372-29.981767c-16.300651 0-29.636465 13.490605-29.636465 29.981767 0 16.491163 13.335814 29.96986 29.648372 29.96986z m0 29.981768c-32.601302 0-59.27293-26.981209-59.27293-59.951628 0-32.982326 26.671628-59.951628 59.27293-59.951628C509.142326 273.860465 535.813953 300.841674 535.813953 333.812093c0 32.982326-26.671628 59.951628-59.284837 59.951628zM249.808372 672.541767c16.300651 0 29.636465-13.490605 29.636465-29.981767 0-16.491163-13.335814-29.96986-29.648372-29.96986-16.300651 0-29.636465 13.478698-29.636465 29.96986s13.335814 29.981767 29.648372 29.981767z m0 29.969861C217.183256 702.511628 190.511628 675.530419 190.511628 642.56c0-32.982326 26.671628-59.951628 59.284837-59.951628 32.601302 0 59.27293 26.981209 59.27293 59.951628 0 32.982326-26.671628 59.951628-59.27293 59.951628z"  ></path></symbol><symbol id="icon-shequ" viewBox="0 0 1024 1024"><path d="M369 435l300 0 0 51-300 0 0-51Z"  ></path><path d="M369 561l300 0 0 50-300 0 0-50Z"  ></path><path d="M369 685l300 0 0 52-300 0 0-52Z"  ></path><path d="M1010.8 469.1 530.1 16.7c-9.7-9.1-24.7-9.1-34.4 0L15 469.1c-7.5 7-9.9 17.2-6.1 26.7 3.8 9.5 13 15.1 23.3 15.1L194 510.9l0 475.5c0 13.8 10.9 24.5 24.7 24.5l601 0c13.8 0 24.3-10.7 24.3-24.5L844 511l149.7 0c10.2 0 19.5-5.6 23.3-15.1C1020.7 486.4 1018.3 476.2 1010.8 469.1zM819.7 460c-13.8 0-24.7 13.5-24.7 27.3L795 961 243 961 243 487.3c0-13.8-10.5-27.3-24.3-27.3L95.2 460 512.9 66.8 930.6 460 819.7 460z"  ></path></symbol><symbol id="icon-gongcheng" viewBox="0 0 1024 1024"><path d="M141.9 419.2L454.1 598c18.2 10.6 38.9 16.3 59.9 16.3 21.2 0 41.7-5.6 59.4-16.3l312.4-178.6c21.7-11.8 35.2-36.5 34.5-63.1-0.8-26.2-15.4-50.2-37.4-61.2L567.3 137.6c-33.9-16.9-72.8-16.9-106.6 0L144.9 295.2c-22.5 11.6-36.4 34.5-37.2 61.1-0.8 26.3 12.3 50.4 34.2 62.9z m22.3-85.9l315.6-157.5c10.9-5.4 22.5-8.2 34.2-8.2 11.7 0 23.4 2.7 34.2 8.2l315.5 157.5c8.1 4 13.5 13.6 13.8 24.2 0.3 10.6-4.5 20.2-12.2 24.3L552 561l-0.5 0.3c-11 6.7-24 10.2-37.5 10.2s-26.7-3.6-38.5-10.5L163.1 382.2c-8-4.6-13-14.3-12.7-24.6 0.3-10.9 5.6-20 13.8-24.3zM888.4 646.3l-369 211c-3.5 2-7.1 2-10.7-0.1L139.6 646.3c-10.3-5.9-23.3-2.3-29.1 7.9-5.9 10.2-2.3 23.3 7.9 29.1l368.8 210.8c8.4 4.9 17.6 7.3 26.7 7.3 9.2 0 18.3-2.4 26.6-7.2l368.9-210.9c10.2-5.9 13.8-18.9 7.9-29.1-5.6-10.2-18.7-13.8-28.9-7.9z"  ></path><path d="M888.4 508.9l-369 211c-3.5 2-7.1 2-10.7-0.1L139.6 508.9c-10.3-5.9-23.3-2.3-29.1 7.9-5.9 10.2-2.3 23.3 7.9 29.1l368.8 210.8c8.4 4.9 17.6 7.3 26.7 7.3 9.2 0 18.3-2.4 26.6-7.2L909.6 546c10.2-5.9 13.8-18.9 7.9-29.1-5.8-10.3-18.9-13.8-29.1-8z"  ></path></symbol><symbol id="icon-danxuanxuanzhong1" viewBox="0 0 1024 1024"><path d="M512 1024C229.230208 1024 0 794.769792 0 512 0 229.230208 229.230208 0 512 0 794.769792 0 1024 229.230208 1024 512 1024 794.769792 794.769792 1024 512 1024ZM512 960C759.423565 960 960 759.423565 960 512 960 264.576432 759.423565 64 512 64 264.576432 64 64 264.576432 64 512 64 759.423565 264.576432 960 512 960ZM512 832C688.731117 832 832 688.731117 832 512 832 335.26888 688.731117 192 512 192 335.26888 192 192 335.26888 192 512 192 688.731117 335.26888 832 512 832Z"  ></path></symbol><symbol id="icon-huodong" viewBox="0 0 1030 1024"><path d="M947.228444 5.233778c-5.347556-3.441778-24.632889-13.056-47.559111 8.476444l-8.504889 8.049778c-59.704889 56.746667-99.128889 94.236444-318.208 20.508444C513.991111 22.442667 454.058667 13.596444 394.837333 15.957333a477.411556 477.411556 0 0 0-139.776 26.993778c-77.425778 27.306667-123.249778 65.450667-125.155555 67.072a26.737778 26.737778 0 0 0-4.408889 4.721778 26.936889 26.936889 0 0 0-10.382222 33.735111L454.257778 914.716444a26.908444 26.908444 0 1 0 49.208889-21.816888l-157.184-355.100445 2.645333-5.063111c35.640889-68.124444 76.060444-145.294222 283.733333-126.862222a220.899556 220.899556 0 0 0 116.679111-21.475556c32.028444-15.331556 62.520889-38.513778 90.652445-68.807111 44.003556-47.502222 82.801778-114.176 106.410667-182.926222 8.988444-26.168889 14.904889-50.432 17.237333-70.144 2.190222-18.631111 2.872889-44.828444-16.412445-57.287111z m-57.372444 125.496889c-20.110222 52.508444-49.152 102.058667-81.635556 139.605333-51.797333 59.818667-109.255111 87.352889-170.808888 81.891556-106.268444-9.443556-185.770667 4.124444-243.057778 41.472-36.408889 23.694222-58.823111 53.617778-75.548445 81.976888L172.515556 145.152c15.132444-10.894222 51.143111-34.360889 102.513777-52.167111 91.363556-31.715556 185.856-31.601778 280.775111 0.341333 112.384 37.774222 191.943111 50.375111 250.481778 39.651556 43.719111-8.021333 73.272889-28.302222 99.072-51.000889a407.324444 407.324444 0 0 1-15.502222 48.753778z m0 0" fill="" ></path><path d="M876.913778 634.424889c-91.562667-39.537778-218.680889-63.288889-363.434667-63.288889-7.936 0-15.843556 0.085333-23.694222 0.256v64.682667c7.822222-0.170667 15.729778-0.256 23.694222-0.256 264.533333 0 448.796444 84.935111 448.796445 161.052444 0 38.741333-45.539556 79.843556-125.098667 110.449778v0.113778c-78.990222 30.122667-189.980444 51.768889-320.483556 51.768889-264.533333 0-448.796444-84.906667-448.796444-161.052445 0-38.741333 45.511111-80.810667 125.127111-111.445333v-0.056889c9.984-3.84 20.110222-7.338667 30.264889-10.581333v-67.669334C86.613333 648.049778 0 716.288 0 796.842667c0 65.820444 57.685333 123.335111 153.201778 163.868444 91.562667 39.509333 218.680889 63.232 363.434666 63.232 292.721778 0 513.479111-96.995556 513.479112-225.706667 0-65.792-57.685333-123.306667-153.201778-163.811555z m0 0" fill="" ></path></symbol><symbol id="icon-menu_voucher" viewBox="0 0 1024 1024"><path d="M830.236 960.886H200.924c-63.104 0-114.421-51.316-114.421-114.421V531.809c0-63.104 51.316-114.421 114.421-114.421h629.313c63.104 0 114.421 51.316 114.421 114.421v314.656c-0.001 63.105-51.317 114.421-114.422 114.421zM200.924 474.599c-31.538 0-57.21 25.672-57.21 57.21v314.656c0 31.538 25.672 57.21 57.21 57.21h629.313c31.538 0 57.21-25.672 57.21-57.21V531.809c0-31.538-25.672-57.21-57.21-57.21H200.924zM801.631 291.152H229.529c-15.811 0-28.605-12.794-28.605-28.605s12.794-28.605 28.605-28.605h572.103c15.811 0 28.605 12.794 28.605 28.605s-12.795 28.605-28.606 28.605zM630 118.096H401.159c-15.811 0-28.605-12.794-28.605-28.605s12.794-28.605 28.605-28.605H630c15.811 0 28.605 12.794 28.605 28.605S645.812 118.096 630 118.096z" fill="#333333" ></path></symbol><symbol id="icon-menu_events" viewBox="0 0 1024 1024"><path d="M751.493 766.011h-281.25c-15.546 0-28.125-12.579-28.125-28.125s12.579-28.125 28.125-28.125h281.25c15.546 0 28.125 12.579 28.125 28.125s-12.579 28.125-28.125 28.125zM751.493 400.386h-281.25c-15.546 0-28.125-12.579-28.125-28.125s12.579-28.125 28.125-28.125h281.25c15.546 0 28.125 12.579 28.125 28.125s-12.579 28.125-28.125 28.125zM751.493 583.198h-281.25c-15.546 0-28.125-12.579-28.125-28.125s12.579-28.125 28.125-28.125h281.25c15.546 0 28.125 12.579 28.125 28.125s-12.579 28.125-28.125 28.125zM920.243 316.011H811.259c-46.527 0-84.375-37.848-84.375-84.375V91.011c0-15.546 12.579-28.125 28.125-28.125s28.125 12.579 28.125 28.125v140.625c0 15.518 12.607 28.125 28.125 28.125h108.984c15.546 0 28.125 12.579 28.125 28.125s-12.579 28.125-28.125 28.125z" fill="#333333" ></path><path d="M863.993 962.886h-506.25c-46.527 0-84.375-37.848-84.375-84.375v-731.25c0-46.527 37.848-84.375 84.375-84.375h397.266c8.322 0 16.205 3.68 21.533 10.052l165.234 196.875a28.048 28.048 0 0 1 6.592 18.073v590.625c0 46.527-37.848 84.375-84.375 84.375z m-506.25-843.75c-15.518 0-28.125 12.607-28.125 28.125v731.25c0 15.518 12.607 28.125 28.125 28.125h506.25c15.518 0 28.125-12.607 28.125-28.125v-580.38l-150.21-178.995H357.743z" fill="#333333" ></path><path d="M329.618 962.886h-168.75c-46.527 0-84.375-37.848-84.375-84.375v-562.5c0-46.527 37.848-84.375 84.375-84.375h112.5c15.546 0 28.125 12.579 28.125 28.125s-12.579 28.125-28.125 28.125h-112.5c-15.518 0-28.125 12.607-28.125 28.125v562.5c0 15.518 12.607 28.125 28.125 28.125h168.75c15.546 0 28.125 12.579 28.125 28.125s-12.579 28.125-28.125 28.125z" fill="#333333" ></path></symbol><symbol id="icon-menu_map" viewBox="0 0 1024 1024"><path d="M372.589 958.578c-9.47 0-18.939-1.843-27.983-5.529l-235.717-96.453c-27.927-11.397-45.958-38.275-45.958-68.441v-630.09c0-24.666 12.22-47.631 32.718-61.382 20.498-13.694 46.327-16.387 69.235-7.06l201.723 82.532c3.856 1.616 8.25 1.588 11.993 0L625.261 71.252c18.06-7.371 37.878-7.371 55.995 0l235.745 96.453c27.898 11.397 45.93 38.275 45.93 68.441v630.091c0 24.694-12.22 47.631-32.718 61.382-20.442 13.751-46.299 16.416-69.207 7.06l-201.751-82.532c-3.799-1.588-8.194-1.559-11.993 0L400.601 953.05c-9.044 3.686-18.514 5.528-28.012 5.528zM136.872 142.16c-4.196 0-7.371 1.758-8.846 2.722-2.126 1.418-7.031 5.557-7.031 13.184v630.091c0 6.493 3.856 12.248 9.838 14.686h0.028l235.745 96.453c3.856 1.616 8.25 1.616 11.993 0L625.26 798.392c18.06-7.371 37.878-7.371 55.995 0l201.752 82.532c7.031 2.864 12.758-0.057 14.828-1.503 2.126-1.418 7.031-5.529 7.031-13.184V236.146c0-6.493-3.856-12.248-9.838-14.686l-235.774-96.453c-3.799-1.588-8.194-1.559-11.993 0l-246.66 100.904c-18.06 7.343-37.878 7.4-55.995 0l-201.723-82.532c-2.155-0.879-4.168-1.219-6.011-1.219z" fill="#333333" ></path><path d="M366.692 952.596c-16.047 0-29.032-12.985-29.032-29.032V215.562c0-16.047 12.985-29.032 29.032-29.032s29.032 12.985 29.032 29.032v708.002c0.001 16.047-12.985 29.032-29.032 29.032zM650.295 837.771c-16.047 0-29.032-12.985-29.032-29.032V100.738c0-16.047 12.985-29.032 29.032-29.032s29.032 12.985 29.032 29.032v708.001c0.001 16.047-12.984 29.032-29.032 29.032z" fill="#333333" ></path></symbol><symbol id="icon-menu_people" viewBox="0 0 1024 1024"><path d="M605.55 470.45c-104.84 0-190.14-85.3-190.14-190.14s85.3-190.14 190.14-190.14 190.19 85.3 190.19 190.14-85.3 190.14-190.19 190.14z m0-327.34c-75.63 0-137.2 61.54-137.2 137.2s61.57 137.2 137.2 137.2S742.8 356 742.8 280.31s-61.57-137.2-137.25-137.2zM850.8 945.53H360.36c-39.65 0-76.1-21.38-97.5-57.17-23-38.41-24.14-84.53-3.21-123.35 64.78-120.22 185.44-194.89 314.93-194.89h62C766 570.12 886.67 644.79 951.5 765c20.88 38.85 19.69 85-3.21 123.32-21.4 35.83-57.84 57.21-97.49 57.21zM574.58 623.05c-110 0-212.83 64-268.3 167.08-12 22.26-11.27 48.83 2 71.06 11.73 19.67 31.22 31.4 52.06 31.4H850.8c20.83 0 40.27-11.73 52-31.4 13.29-22.23 14.06-48.8 2.07-71.08-55.52-103-158.35-167.06-268.3-167.06z" fill="#007AFF" ></path><path d="M426.37 462.38c-97.29 0-176.44-79.12-176.44-176.38s79.15-176.44 176.44-176.44c1.29 0 7.39 0.57 8.69 0.75 14.42 2.09 24.81 15.56 22.69 30a26.29 26.29 0 0 1-29.57 22.48c-0.1 0-1-0.13-1.14-0.13-69 0-124.17 55.34-124.17 123.33s55.42 123.44 123.5 123.44a26.47 26.47 0 0 1 0 52.94zM192 945.53a45 45 0 0 1-13.9-2.22A166.53 166.53 0 0 1 77 845.47c-17.16-45.23-13.39-93.31 10.6-135.36 71.49-125.18 204.92-203 348.17-203a26.47 26.47 0 0 1 0 52.94c-124.28 0-240.08 67.54-302.16 176.28a104.44 104.44 0 0 0-7.09 90.36 112.88 112.88 0 0 0 68.29 66.36c14.63 0 25.08 11.6 25.08 26.21s-13.28 26.27-27.89 26.27z" fill="#007AFF" ></path></symbol><symbol id="icon-menu_date" viewBox="0 0 1024 1024"><path d="M885.52 862.13H327.44a26.47 26.47 0 0 1 0-52.94h558.08A26.5 26.5 0 0 0 912 782.71V359.19a26.5 26.5 0 0 0-26.47-26.48h-292.3a26.4 26.4 0 0 1-22.77-13l-54.13-91.51c-8.64-14.55-34.54-27.84-54.34-27.84H144.34c-14.91 0-26.47 7.73-26.47 14.37V661.4a26.47 26.47 0 1 1-52.94 0V214.73c0-37.74 34.87-67.31 79.41-67.31H462c38.78 0 81.71 23.14 99.88 53.82l46.46 78.53h277.18a79.5 79.5 0 0 1 79.41 79.42v423.52a79.5 79.5 0 0 1-79.41 79.42z" fill="#007AFF" ></path><path d="M627.17 575.63a99.54 99.54 0 1 1 99.53-99.55 99.65 99.65 0 0 1-99.53 99.55z m0-146.13a46.6 46.6 0 1 0 46.58 46.58 46.62 46.62 0 0 0-46.58-46.58zM505.39 794.79a99.53 99.53 0 1 1 99.55-99.53 99.64 99.64 0 0 1-99.55 99.53z m0-146.11A46.59 46.59 0 1 0 552 695.26a46.63 46.63 0 0 0-46.61-46.58zM310.59 645.06a99.52 99.52 0 1 1 99.52-99.52 99.64 99.64 0 0 1-99.52 99.52z m0-146.1a46.58 46.58 0 1 0 46.58 46.58A46.62 46.62 0 0 0 310.59 499zM164.45 888.6A99.53 99.53 0 1 1 264 789.07a99.64 99.64 0 0 1-99.55 99.53z m0-146.11a46.59 46.59 0 1 0 46.61 46.58 46.63 46.63 0 0 0-46.61-46.58z" fill="#007AFF" ></path><path d="M201 752.63a26.47 26.47 0 0 1-22.67-40.12l71.32-118.6A26.48 26.48 0 1 1 295 621.2l-71.3 118.6a26.5 26.5 0 0 1-22.7 12.83zM432.34 693.76a26.42 26.42 0 0 1-19.47-8.53l-67.31-73.05a26.47 26.47 0 0 1 38.93-35.88l67.31 73.05a26.46 26.46 0 0 1-19.46 44.41zM529.74 648.68a26.46 26.46 0 0 1-21-42.57l62.72-81.85a26.48 26.48 0 0 1 42 32.21l-62.71 81.85a26.5 26.5 0 0 1-21.01 10.36z" fill="#007AFF" ></path></symbol><symbol id="icon-yunweijiankong" viewBox="0 0 1024 1024"><path d="M624.64 662.528c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24H92.16c-22.528 0-40.96-18.432-40.96-40.96v-419.84c0-22.528 18.432-40.96 40.96-40.96h675.84c22.528 0 40.96 18.432 40.96 40.96v276.48c0 6.144-4.096 10.24-10.24 10.24s-10.24-4.096-10.24-10.24v-276.48c0-11.264-9.216-20.48-20.48-20.48H92.16c-11.264 0-20.48 9.216-20.48 20.48v419.84c0 11.264 9.216 20.48 20.48 20.48h532.48M602.112 822.272c8.192 0 15.36-7.168 15.36-15.36s-7.168-15.36-15.36-15.36h-317.44c-8.192 0-15.36 7.168-15.36 15.36s7.168 15.36 15.36 15.36h317.44m0 20.48h-317.44c-19.456 0-35.84-16.384-35.84-35.84s16.384-35.84 35.84-35.84h317.44c19.456 0 35.84 16.384 35.84 35.84s-16.384 35.84-35.84 35.84z" fill="#666666" ></path><path d="M425.984 672.768h20.48v119.808h-20.48V672.768M230.4 501.76l-14.336-14.336s67.584-66.56 105.472-105.472l14.336 14.336L230.4 501.76m124.928-112.64l13.312-15.36c11.264 9.216 26.624 22.528 41.984 34.816 14.336 12.288 29.696 25.6 43.008 36.864L440.32 460.8l-43.008-36.864-41.984-34.816m174.08 76.8l-14.336-14.336c34.816-34.816 96.256-95.232 96.256-95.232l14.336 14.336-96.256 95.232M378.88 631.808c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24H378.88m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024M819.2 816.128c73.728 0 133.12-59.392 133.12-132.096s-59.392-132.096-133.12-132.096-133.12 59.392-133.12 132.096 59.392 132.096 133.12 132.096m0 20.48c-84.992 0-153.6-68.608-153.6-152.576s68.608-152.576 153.6-152.576 153.6 68.608 153.6 152.576-68.608 152.576-153.6 152.576z" fill="#666666" ></path><path d="M819.2 737.28c29.696 0 53.248-23.552 53.248-53.248 0-29.696-23.552-53.248-53.248-53.248-29.696 0-53.248 23.552-53.248 53.248 0 28.672 23.552 53.248 53.248 53.248m0 20.48c-40.96 0-73.728-32.768-73.728-73.728s32.768-73.728 73.728-73.728 73.728 32.768 73.728 73.728c0 39.936-32.768 73.728-73.728 73.728z" fill="#666666" ></path><path d="M665.6 693.248v-20.48h295.936v20.48H665.6" fill="#666666" ></path><path d="M809.984 530.432h20.48v294.912h-20.48V530.432M204.8 542.72c13.312 0 23.552-10.24 23.552-23.552 0-13.312-10.24-23.552-23.552-23.552s-23.552 10.24-23.552 23.552c0 13.312 10.24 23.552 23.552 23.552m416.768-174.08c7.168 0 12.288-5.12 12.288-12.288s-5.12-12.288-12.288-12.288-12.288 5.12-12.288 12.288c0 6.144 5.12 12.288 12.288 12.288M204.8 563.2c-24.576 0-44.032-19.456-44.032-44.032s19.456-44.032 44.032-44.032 44.032 19.456 44.032 44.032S229.376 563.2 204.8 563.2z m416.768-174.08c-18.432 0-32.768-14.336-32.768-32.768 0-18.432 14.336-32.768 32.768-32.768 18.432 0 32.768 14.336 32.768 32.768 0 17.408-14.336 32.768-32.768 32.768zM476.16 510.976c18.432 0 32.768-15.36 32.768-33.792 0-18.432-15.36-33.792-32.768-33.792s-32.768 15.36-32.768 33.792c-1.024 18.432 14.336 33.792 32.768 33.792M336.896 379.904c6.144 0 11.264-5.12 11.264-12.288s-5.12-12.288-11.264-12.288c-6.144 0-11.264 5.12-11.264 12.288-1.024 7.168 4.096 12.288 11.264 12.288m139.264 151.552c-29.696 0-53.248-24.576-53.248-54.272s23.552-54.272 53.248-54.272 53.248 24.576 53.248 54.272-23.552 54.272-53.248 54.272zM336.896 400.384c-17.408 0-31.744-14.336-31.744-32.768s14.336-32.768 31.744-32.768c17.408 0 31.744 14.336 31.744 32.768s-14.336 32.768-31.744 32.768z" fill="#666666" ></path></symbol><symbol id="icon-gongyiliucheng" viewBox="0 0 1024 1024"><path d="M757.76 813.056v20.48H501.76c-22.528 0-40.96-18.432-40.96-40.96v-460.8h20.48v460.8c0 11.264 9.216 20.48 20.48 20.48h256"  ></path><path d="M757.76 546.816v20.48H501.76c-22.528 0-40.96-18.432-40.96-40.96v-112.64h20.48v112.64c0 11.264 9.216 20.48 20.48 20.48h256"  ></path><path d="M235.52 679.936v-20.48h184.32c22.528 0 40.96-18.432 40.96-40.96v-112.64h20.48v112.64c0 33.792-27.648 61.44-61.44 61.44H235.52M819.2 608.256c28.672 0 51.2-22.528 51.2-51.2s-22.528-51.2-51.2-51.2-51.2 22.528-51.2 51.2 22.528 51.2 51.2 51.2m0 20.48c-39.936 0-71.68-31.744-71.68-71.68s31.744-71.68 71.68-71.68 71.68 31.744 71.68 71.68-31.744 71.68-71.68 71.68zM819.2 874.496c28.672 0 51.2-22.528 51.2-51.2s-22.528-51.2-51.2-51.2-51.2 22.528-51.2 51.2c0 27.648 22.528 51.2 51.2 51.2m0 20.48c-39.936 0-71.68-31.744-71.68-71.68s31.744-71.68 71.68-71.68 71.68 31.744 71.68 71.68-31.744 71.68-71.68 71.68zM563.2 239.616c0-6.144 5.12-10.24 10.24-10.24 6.144 0 10.24 4.096 10.24 10.24v1.024c0 6.144-5.12 10.24-10.24 10.24-6.144 0-10.24-5.12-10.24-11.264m-6.144 33.792c2.048-5.12 8.192-8.192 13.312-6.144 5.12 2.048 8.192 8.192 6.144 13.312v1.024c-2.048 5.12-8.192 8.192-13.312 6.144-6.144-3.072-9.216-8.192-6.144-14.336m-18.432 28.672c4.096-4.096 10.24-4.096 14.336 0 4.096 4.096 4.096 10.24 1.024 14.336l-1.024 1.024c-4.096 4.096-10.24 4.096-14.336 0-4.096-4.096-4.096-10.24 0-15.36m-27.648 20.48c5.12-2.048 11.264 0 13.312 5.12 2.048 5.12 0 11.264-5.12 13.312h-1.024c-5.12 2.048-11.264 0-13.312-5.12-2.048-4.096 0-10.24 6.144-13.312m-32.768 9.216c6.144 0 10.24 4.096 11.264 9.216 0 6.144-4.096 10.24-9.216 11.264h-1.024c-6.144 0-10.24-4.096-11.264-9.216-1.024-6.144 3.072-11.264 10.24-11.264m-33.792-4.096c5.12 2.048 8.192 7.168 7.168 13.312-2.048 5.12-7.168 8.192-12.288 7.168h-1.024c-5.12-2.048-8.192-7.168-7.168-13.312 1.024-6.144 6.144-9.216 13.312-7.168m-30.72-16.384c4.096 3.072 5.12 10.24 2.048 14.336-3.072 4.096-10.24 5.12-14.336 2.048 0 0-1.024 0-1.024-1.024-4.096-3.072-5.12-10.24-1.024-14.336 3.072-4.096 9.216-5.12 14.336-1.024m-22.528-25.6c3.072 5.12 1.024 11.264-4.096 14.336-5.12 3.072-11.264 1.024-14.336-4.096 0 0 0-1.024-1.024-1.024-3.072-5.12-1.024-11.264 4.096-14.336 6.144-2.048 12.288-1.024 15.36 5.12m-11.264-31.744c1.024 5.12-3.072 11.264-8.192 11.264s-11.264-3.072-11.264-8.192V256c-1.024-5.12 3.072-11.264 8.192-11.264 5.12-2.048 10.24 2.048 11.264 9.216m1.024-34.816c-1.024 5.12-7.168 9.216-12.288 8.192-5.12-1.024-9.216-7.168-8.192-12.288v-1.024c1.024-5.12 7.168-9.216 12.288-7.168 6.144 0 10.24 6.144 8.192 12.288m13.312-31.744c-3.072 5.12-9.216 6.144-14.336 3.072-5.12-3.072-6.144-9.216-3.072-14.336 0 0 0-1.024 1.024-1.024 3.072-5.12 9.216-6.144 14.336-3.072s6.144 10.24 2.048 15.36m24.576-23.552c-5.12 3.072-11.264 2.048-14.336-3.072-3.072-5.12-2.048-11.264 3.072-14.336 0 0 1.024 0 1.024-1.024 5.12-3.072 11.264-2.048 14.336 3.072 2.048 5.12 1.024 11.264-4.096 15.36m31.744-14.336c-5.12 1.024-11.264-2.048-12.288-8.192-1.024-5.12 2.048-11.264 8.192-12.288h1.024c5.12-1.024 11.264 2.048 12.288 8.192 0 5.12-3.072 11.264-9.216 12.288"  ></path><path d="M471.04 188.416c28.672 0 51.2 22.528 51.2 51.2s-22.528 51.2-51.2 51.2-51.2-22.528-51.2-51.2 22.528-51.2 51.2-51.2z"  ></path><path d="M471.04 270.336c17.408 0 30.72-13.312 30.72-30.72s-13.312-30.72-30.72-30.72-30.72 13.312-30.72 30.72 13.312 30.72 30.72 30.72m0 20.48c-28.672 0-51.2-22.528-51.2-51.2s22.528-51.2 51.2-51.2 51.2 22.528 51.2 51.2c0 27.648-22.528 51.2-51.2 51.2z"  ></path><path d="M184.32 618.496c28.672 0 51.2 22.528 51.2 51.2s-22.528 51.2-51.2 51.2-51.2-22.528-51.2-51.2 22.528-51.2 51.2-51.2z"  ></path><path d="M184.32 700.416c17.408 0 30.72-13.312 30.72-30.72s-13.312-30.72-30.72-30.72-30.72 13.312-30.72 30.72c0 16.384 13.312 30.72 30.72 30.72m0 20.48c-28.672 0-51.2-22.528-51.2-51.2s22.528-51.2 51.2-51.2 51.2 22.528 51.2 51.2c0 27.648-22.528 51.2-51.2 51.2z"  ></path></symbol><symbol id="icon-zhiliangkongzhi" viewBox="0 0 1024 1024"><path d="M517.12 364.544c-38.912 0-69.632 13.312-93.184 39.936-21.504 24.576-31.744 57.344-31.744 97.28s10.24 71.68 31.744 97.28c22.528 26.624 53.248 39.936 92.16 39.936 28.672 0 53.248-7.168 73.728-21.504 8.192 10.24 16.384 21.504 24.576 33.792 3.072 5.12 10.24 6.144 14.336 2.048 4.096-3.072 4.096-9.216 2.048-13.312-8.192-12.288-17.408-24.576-25.6-35.84l4.096-4.096c21.504-24.576 31.744-57.344 31.744-97.28 0-39.936-10.24-71.68-31.744-97.28-22.528-27.648-53.248-40.96-92.16-40.96z m0 21.504c31.744 0 56.32 10.24 74.752 32.768 17.408 20.48 26.624 49.152 26.624 82.944 0 34.816-9.216 62.464-26.624 82.944v1.024c-13.312-17.408-27.648-32.768-41.984-48.128-4.096-4.096-10.24-4.096-14.336 0-4.096 4.096-4.096 9.216 0 13.312 13.312 15.36 27.648 30.72 40.96 49.152-16.384 12.288-36.864 18.432-60.416 18.432-31.744 0-57.344-11.264-75.776-32.768-17.408-21.504-26.624-49.152-26.624-82.944s9.216-61.44 26.624-82.944c19.456-23.552 45.056-33.792 76.8-33.792z"  ></path><path d="M650.24 220.16c-47.104 1.024-94.208-62.464-131.072-99.328-4.096-4.096-10.24-4.096-14.336 0-36.864 36.864-83.968 100.352-131.072 99.328-56.32 0-169.984 6.144-169.984 6.144-5.12 0-10.24 5.12-9.216 10.24l12.288 463.872 4.096 8.192 290.816 194.56c3.072 2.048 7.168 3.072 10.24 3.072 4.096 0 7.168-1.024 10.24-3.072l290.816-194.56 2.048-4.096 2.048-4.096L829.44 236.544l-20.48 9.216-11.264 444.416c0 2.048-1.024 5.12-3.072 6.144L522.24 878.592c-6.144 4.096-14.336 4.096-20.48 0L235.52 700.416c-5.12-3.072-8.192-9.216-8.192-15.36l-11.264-430.08c0-5.12 3.072-9.216 8.192-9.216 25.6-1.024 104.448-5.12 150.528-5.12 54.272-1.024 115.712-70.656 133.12-92.16 3.072-3.072 7.168-3.072 10.24-1.024 33.792 33.792 71.68 91.136 133.12 92.16 54.272 1.024 157.696 6.144 157.696 6.144s20.48-6.144 20.48-9.216c0-3.072-1.024-5.12-3.072-7.168-2.048-2.048-4.096-3.072-7.168-3.072 1.024 0-112.64-6.144-168.96-6.144z"  ></path><path d="M716.8 281.6c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 0c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z m-40.96 20.48c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24 0-6.144-5.12-10.24-10.24-10.24-6.144 0-10.24 4.096-10.24 10.24z m1.024 40.96c0 6.144 5.12 10.24 10.24 10.24s10.24-5.12 10.24-10.24c0-6.144-5.12-10.24-10.24-10.24-6.144 0-10.24 4.096-10.24 10.24z m1.024 40.96c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24 0-6.144-5.12-10.24-10.24-10.24-6.144 0-10.24 4.096-10.24 10.24z m1.024 40.96c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24 0-6.144-5.12-10.24-10.24-10.24-6.144 0-10.24 4.096-10.24 10.24z m1.024 40.96c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24 0-6.144-5.12-10.24-10.24-10.24s-10.24 4.096-10.24 10.24z m1.024 40.96c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24 0-6.144-5.12-10.24-10.24-10.24s-10.24 4.096-10.24 10.24z m1.024 40.96c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24 0-6.144-5.12-10.24-10.24-10.24s-10.24 4.096-10.24 10.24z m1.024 40.96c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24 0-6.144-5.12-10.24-10.24-10.24s-10.24 4.096-10.24 10.24z m2.048 40.96c0 6.144 5.12 10.24 10.24 10.24 6.144 0 10.24-5.12 10.24-10.24s-5.12-10.24-10.24-10.24c-6.144 0-11.264 4.096-10.24 10.24z m20.48 40.96c5.12 3.072 11.264 2.048 14.336-3.072 3.072-5.12 2.048-11.264-3.072-14.336-5.12-3.072-11.264-2.048-14.336 3.072-3.072 4.096-2.048 11.264 3.072 14.336z m33.792 22.528c5.12 3.072 11.264 2.048 14.336-3.072 3.072-5.12 2.048-11.264-3.072-14.336-5.12-3.072-11.264-2.048-14.336 3.072-3.072 5.12-1.024 11.264 3.072 14.336z m34.816 22.528c5.12 3.072 11.264 2.048 14.336-3.072 3.072-5.12 2.048-11.264-3.072-14.336-5.12-3.072-11.264-2.048-14.336 3.072-3.072 5.12-2.048 11.264 3.072 14.336z m33.792 22.528c5.12 3.072 11.264 2.048 14.336-3.072 3.072-5.12 2.048-11.264-3.072-14.336-5.12-3.072-11.264-2.048-14.336 3.072-3.072 5.12-2.048 11.264 3.072 14.336z m33.792 22.528c5.12 3.072 11.264 2.048 14.336-3.072 3.072-5.12 2.048-11.264-3.072-14.336-5.12-3.072-11.264-2.048-14.336 3.072-3.072 5.12-1.024 11.264 3.072 14.336z m34.816 22.528c5.12 3.072 11.264 2.048 14.336-3.072 3.072-5.12 2.048-11.264-3.072-14.336-5.12-3.072-11.264-2.048-14.336 3.072-3.072 5.12-2.048 11.264 3.072 14.336z m33.792 22.528c5.12 3.072 11.264 2.048 14.336-3.072 3.072-5.12 2.048-11.264-3.072-14.336-5.12-3.072-11.264-2.048-14.336 3.072-3.072 5.12-2.048 11.264 3.072 14.336z m45.056-8.192c5.12-3.072 6.144-9.216 3.072-14.336-3.072-5.12-9.216-6.144-14.336-3.072-5.12 3.072-6.144 9.216-3.072 14.336 4.096 5.12 10.24 6.144 14.336 3.072z m34.816-22.528c5.12-3.072 6.144-9.216 3.072-14.336-3.072-5.12-9.216-6.144-14.336-3.072-5.12 3.072-6.144 9.216-3.072 14.336 3.072 5.12 9.216 6.144 14.336 3.072z m33.792-22.528c5.12-3.072 6.144-9.216 3.072-14.336-3.072-5.12-9.216-6.144-14.336-3.072-5.12 3.072-6.144 9.216-3.072 14.336 3.072 5.12 9.216 6.144 14.336 3.072z m33.792-22.528c5.12-3.072 6.144-9.216 3.072-14.336-3.072-5.12-9.216-6.144-14.336-3.072-5.12 3.072-6.144 9.216-3.072 14.336 4.096 5.12 10.24 6.144 14.336 3.072z m34.816-22.528c5.12-3.072 6.144-9.216 3.072-14.336-3.072-5.12-9.216-6.144-14.336-3.072-5.12 3.072-6.144 9.216-3.072 14.336 3.072 4.096 9.216 6.144 14.336 3.072z m33.792-22.528c5.12-3.072 6.144-9.216 3.072-14.336-3.072-5.12-9.216-6.144-14.336-3.072-5.12 3.072-6.144 9.216-3.072 14.336 3.072 4.096 10.24 6.144 14.336 3.072z m33.792-23.552c5.12-3.072 6.144-9.216 3.072-14.336-3.072-5.12-9.216-6.144-14.336-3.072-5.12 3.072-6.144 9.216-3.072 14.336 4.096 5.12 10.24 6.144 14.336 3.072z m9.216-47.104c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24 4.096 10.24 10.24 10.24c5.12 0 10.24-5.12 10.24-10.24z m1.024-40.96c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24 4.096 10.24 10.24 10.24c5.12 0 10.24-5.12 10.24-10.24z m1.024-40.96c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24 4.096 10.24 10.24 10.24c5.12 0 10.24-5.12 10.24-10.24z m1.024-40.96c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24 4.096 10.24 10.24 10.24c5.12 0 10.24-5.12 10.24-10.24z m1.024-40.96c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24 4.096 10.24 10.24 10.24c5.12 0 10.24-5.12 10.24-10.24z m1.024-40.96c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24c0 5.12 4.096 10.24 10.24 10.24s10.24-5.12 10.24-10.24z m1.024-40.96c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24 4.096 10.24 10.24 10.24c5.12 0 10.24-5.12 10.24-10.24z m1.024-40.96c0-6.144-4.096-10.24-10.24-10.24s-10.24 4.096-10.24 10.24 4.096 10.24 10.24 10.24c5.12 0 10.24-5.12 10.24-10.24z m-9.216-46.08c-6.144 0-10.24 4.096-10.24 10.24s4.096 10.24 10.24 10.24 10.24-4.096 10.24-10.24-4.096-10.24-10.24-10.24z"  ></path></symbol><symbol id="icon-shebeiguanli" viewBox="0 0 1024 1024"><path d="M839.68 363.52c11.264 0 20.48-9.216 20.48-20.48v-122.88c0-11.264-9.216-20.48-20.48-20.48H184.32c-11.264 0-20.48 9.216-20.48 20.48v122.88c0 11.264 9.216 20.48 20.48 20.48h655.36m0 20.48H184.32c-22.528 0-40.96-18.432-40.96-40.96v-122.88c0-22.528 18.432-40.96 40.96-40.96h655.36c22.528 0 40.96 18.432 40.96 40.96v122.88c0 22.528-18.432 40.96-40.96 40.96zM839.68 824.32c11.264 0 20.48-9.216 20.48-20.48v-122.88c0-11.264-9.216-20.48-20.48-20.48H184.32c-11.264 0-20.48 9.216-20.48 20.48v122.88c0 11.264 9.216 20.48 20.48 20.48h655.36m0 20.48H184.32c-22.528 0-40.96-18.432-40.96-40.96v-122.88c0-22.528 18.432-40.96 40.96-40.96h655.36c22.528 0 40.96 18.432 40.96 40.96v122.88c0 22.528-18.432 40.96-40.96 40.96zM153.6 517.12c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h276.48c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24H153.6M593.92 517.12c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h276.48c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24H593.92"  ></path><path d="M215.04 773.12c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24H215.04m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024M716.8 271.36c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24H716.8m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024m41.984 0c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h1.024c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-1.024M501.76 384c0-6.144 4.096-10.24 10.24-10.24s10.24 4.096 10.24 10.24v61.44c0 6.144-4.096 10.24-10.24 10.24s-10.24-4.096-10.24-10.24v-61.44M501.76 588.8c0-6.144 4.096-10.24 10.24-10.24s10.24 4.096 10.24 10.24v61.44c0 6.144-4.096 10.24-10.24 10.24s-10.24-4.096-10.24-10.24v-61.44"  ></path><path d="M512 578.56c33.792 0 61.44-27.648 61.44-61.44s-27.648-61.44-61.44-61.44-61.44 27.648-61.44 61.44 27.648 61.44 61.44 61.44m0 20.48c-45.056 0-81.92-36.864-81.92-81.92s36.864-81.92 81.92-81.92 81.92 36.864 81.92 81.92-36.864 81.92-81.92 81.92z"  ></path></symbol><symbol id="icon-shengmingzhouqi" viewBox="0 0 1024 1024"><path d="M680.96 605.184c-5.12 3.072-11.264 1.024-14.336-4.096-3.072-5.12-1.024-11.264 4.096-14.336 33.792-19.456 72.704-23.552 108.544-14.336 34.816 9.216 66.56 32.768 87.04 66.56 38.912 68.608 16.384 156.672-52.224 195.584-33.792 19.456-72.704 23.552-108.544 14.336-34.816-9.216-66.56-32.768-87.04-66.56-3.072-5.12-1.024-11.264 4.096-14.336 5.12-3.072 11.264-1.024 14.336 4.096 16.384 28.672 43.008 49.152 74.752 57.344 31.744 8.192 64.512 4.096 92.16-12.288 58.368-33.792 78.848-109.568 45.056-167.936-16.384-28.672-43.008-49.152-74.752-57.344-31.744-7.168-64.512-3.072-93.184 13.312M455.68 431.104c5.12 1.024 9.216 7.168 7.168 12.288-1.024 5.12-7.168 9.216-12.288 7.168-14.336-4.096-28.672-10.24-39.936-17.408-51.2-32.768-77.824-96.256-61.44-157.696 20.48-76.8 99.328-121.856 175.104-101.376 37.888 10.24 68.608 34.816 87.04 66.56 18.432 31.744 24.576 70.656 14.336 108.544-1.024 5.12-7.168 8.192-12.288 7.168-5.12-1.024-9.216-7.168-7.168-12.288 8.192-31.744 4.096-64.512-12.288-93.184s-43.008-49.152-74.752-57.344c-65.536-17.408-133.12 21.504-150.528 87.04-14.336 52.224 7.168 106.496 52.224 135.168 10.24 7.168 22.528 12.288 34.816 15.36"  ></path><path d="M487.424 261.12c28.672 0 51.2 22.528 51.2 51.2s-22.528 51.2-51.2 51.2-51.2-22.528-51.2-51.2 22.528-51.2 51.2-51.2z"  ></path><path d="M487.424 343.04c17.408 0 30.72-13.312 30.72-30.72s-13.312-30.72-30.72-30.72-30.72 13.312-30.72 30.72 13.312 30.72 30.72 30.72m0 20.48c-28.672 0-51.2-22.528-51.2-51.2s22.528-51.2 51.2-51.2 51.2 22.528 51.2 51.2-23.552 51.2-51.2 51.2z"  ></path><path d="M743.424 660.48c28.672 0 51.2 22.528 51.2 51.2s-22.528 51.2-51.2 51.2-51.2-22.528-51.2-51.2 22.528-51.2 51.2-51.2z"  ></path><path d="M743.424 742.4c17.408 0 30.72-13.312 30.72-30.72s-13.312-30.72-30.72-30.72-30.72 13.312-30.72 30.72 13.312 30.72 30.72 30.72m0 20.48c-28.672 0-51.2-22.528-51.2-51.2s22.528-51.2 51.2-51.2 51.2 22.528 51.2 51.2-23.552 51.2-51.2 51.2z"  ></path><path d="M282.624 660.48c28.672 0 51.2 22.528 51.2 51.2s-22.528 51.2-51.2 51.2-51.2-22.528-51.2-51.2 22.528-51.2 51.2-51.2z"  ></path><path d="M282.624 742.4c17.408 0 30.72-13.312 30.72-30.72s-13.312-30.72-30.72-30.72-30.72 13.312-30.72 30.72 13.312 30.72 30.72 30.72m0 20.48c-28.672 0-51.2-22.528-51.2-51.2s22.528-51.2 51.2-51.2 51.2 22.528 51.2 51.2-23.552 51.2-51.2 51.2zM415.744 721.92c-6.144 0-10.24-4.096-10.24-10.24s4.096-10.24 10.24-10.24h276.48c6.144 0 10.24 4.096 10.24 10.24s-4.096 10.24-10.24 10.24h-276.48"  ></path><path d="M299.008 692.224c-3.072 5.12-9.216 6.144-14.336 3.072-5.12-3.072-6.144-9.216-3.072-14.336l163.84-245.76c3.072-5.12 9.216-6.144 14.336-3.072 5.12 3.072 6.144 9.216 3.072 14.336l-163.84 245.76M490.496 343.04c-3.072-5.12-2.048-11.264 3.072-14.336 5.12-3.072 11.264-2.048 14.336 3.072l176.128 260.096c3.072 5.12 2.048 11.264-3.072 14.336-5.12 3.072-11.264 2.048-14.336-3.072L490.496 343.04"  ></path><path d="M282.624 588.8c-67.584 0-122.88 55.296-122.88 122.88s55.296 122.88 122.88 122.88 122.88-55.296 122.88-122.88c0-6.144 4.096-10.24 10.24-10.24s10.24 4.096 10.24 10.24c0 78.848-64.512 143.36-143.36 143.36s-143.36-64.512-143.36-143.36 64.512-143.36 143.36-143.36c6.144 0 10.24 4.096 10.24 10.24s-5.12 10.24-10.24 10.24z"  ></path></symbol><symbol id="icon-wuquanxian" viewBox="0 0 1024 1024"><path d="M498.40708 122.336283c-102.4 0-185.769912 83.369912-185.769912 185.769912v226.548672c0 7.249558 6.343363 13.59292 13.59292 13.592921h344.353983c7.249558 0 13.59292-6.343363 13.59292-13.592921V308.106195c0-102.4-83.369912-185.769912-185.769911-185.769912z m0 72.495575c62.527434 0 113.274336 50.746903 113.274336 113.274337v117.805309c0 12.686726-9.968142 22.654867-22.654867 22.654868H407.787611c-12.686726 0-22.654867-9.968142-22.654868-22.654868V308.106195c0-62.527434 50.746903-113.274336 113.274337-113.274337z" fill="#FFFFFF" ></path><path d="M670.584071 552.778761H326.230088c-9.968142 0-18.123894-8.155752-18.123893-18.123894V308.106195c0-105.118584 85.182301-190.300885 190.300885-190.300885s190.300885 85.182301 190.300885 190.300885v226.548672c0 9.968142-8.155752 18.123894-18.123894 18.123894zM498.40708 126.867257c-99.681416 0-181.238938 81.557522-181.238938 181.238938v226.548672c0 5.437168 3.624779 9.061947 9.061946 9.061947h344.353983c5.437168 0 9.061947-3.624779 9.061947-9.061947V308.106195c0-99.681416-81.557522-181.238938-181.238938-181.238938z m90.619469 326.230088H407.787611c-15.40531 0-27.185841-11.780531-27.185841-27.185841V308.106195c0-65.246018 52.559292-117.80531 117.80531-117.80531s117.80531 52.559292 117.805309 117.80531v117.805309c0 15.40531-11.780531 27.185841-27.18584 27.185841zM498.40708 199.362832c-59.80885 0-108.743363 48.934513-108.743363 108.743363v117.805309c0 9.968142 8.155752 18.123894 18.123894 18.123894h181.238938c9.968142 0 18.123894-8.155752 18.123893-18.123894V308.106195c0-59.80885-48.934513-108.743363-108.743362-108.743363z" fill="#9BBBCC" ></path><path d="M240.141593 376.070796h516.530973c9.968142 0 18.123894 8.155752 18.123894 18.123894v407.787611c0 9.968142-8.155752 18.123894-18.123894 18.123894h-516.530973c-9.968142 0-18.123894-8.155752-18.123894-18.123894v-407.787611c0-9.968142 8.155752-18.123894 18.123894-18.123894z" fill="#E3F2FA" ></path><path d="M756.672566 824.637168h-516.530973c-12.686726 0-22.654867-9.968142-22.654867-22.654867v-407.787611c0-12.686726 9.968142-22.654867 22.654867-22.654867h516.530973c12.686726 0 22.654867 9.968142 22.654868 22.654867v407.787611c0 12.686726-9.968142 22.654867-22.654868 22.654867z m-516.530973-444.035398c-7.249558 0-13.59292 6.343363-13.59292 13.59292v407.787611c0 7.249558 6.343363 13.59292 13.59292 13.59292h516.530973c7.249558 0 13.59292-6.343363 13.592921-13.59292v-407.787611c0-7.249558-6.343363-13.59292-13.592921-13.59292h-516.530973z" fill="#9BBBCC" ></path><path d="M498.40708 579.964602m-99.681416 0a99.681416 99.681416 0 1 0 199.362832 0 99.681416 99.681416 0 1 0-199.362832 0Z" fill="#FFFFFF" ></path><path d="M498.40708 681.458407c-56.184071 0-101.493805-45.309735-101.493806-101.493805s45.309735-101.493805 101.493806-101.493806 101.493805 45.309735 101.493805 101.493806-45.309735 101.493805-101.493805 101.493805z m0-199.362832c-53.465487 0-97.869027 43.497345-97.869027 97.869027S444.941593 677.833628 498.40708 677.833628 596.276106 633.430088 596.276106 579.964602 551.872566 482.095575 498.40708 482.095575z" fill="#C6D9E3" ></path><path d="M326.230088 901.663717a181.238938 22.654867 0 1 0 362.477877 0 181.238938 22.654867 0 1 0-362.477877 0Z" fill="#D0E0EA" ></path><path d="M489.345133 578.152212c-10.874336-3.624779-18.123894-13.59292-18.123894-25.373451 0-15.40531 11.780531-27.185841 27.185841-27.185841s27.185841 11.780531 27.18584 27.185841c0 11.780531-7.249558 21.748673-18.123893 25.373451V625.274336c0 5.437168-3.624779 9.061947-9.061947 9.061947s-9.061947-3.624779-9.061947-9.061947v-47.122124z" fill="#CDE4F0" ></path><path d="M167.646018 294.513274m-31.716814 0a31.716814 31.716814 0 1 0 63.433628 0 31.716814 31.716814 0 1 0-63.433628 0Z" fill="#E0EEF6" ></path><path d="M167.646018 330.761062c-19.936283 0-36.247788-16.311504-36.247788-36.247788s16.311504-36.247788 36.247788-36.247787 36.247788 16.311504 36.247787 36.247787-16.311504 36.247788-36.247787 36.247788z m0-63.433628c-15.40531 0-27.185841 11.780531-27.185841 27.18584s11.780531 27.185841 27.185841 27.185841 27.185841-11.780531 27.18584-27.185841-11.780531-27.185841-27.18584-27.18584z" fill="#C2D5E0" ></path><path d="M833.699115 643.39823m-18.123894 0a18.123894 18.123894 0 1 0 36.247788 0 18.123894 18.123894 0 1 0-36.247788 0Z" fill="#E0EEF6" ></path><path d="M833.699115 666.053097c-12.686726 0-22.654867-9.968142-22.654867-22.654867s9.968142-22.654867 22.654867-22.654867 22.654867 9.968142 22.654867 22.654867-9.968142 22.654867-22.654867 22.654867z m0-36.247787c-7.249558 0-13.59292 6.343363-13.59292 13.59292s6.343363 13.59292 13.59292 13.59292 13.59292-6.343363 13.59292-13.59292-6.343363-13.59292-13.59292-13.59292z" fill="#C2D5E0" ></path><path d="M874.477876 376.070796m-13.59292 0a13.59292 13.59292 0 1 0 27.18584 0 13.59292 13.59292 0 1 0-27.18584 0Z" fill="#E0EEF6" ></path><path d="M874.477876 391.476106c-9.061947 0-16.311504-7.249558-16.311504-16.311504s7.249558-16.311504 16.311504-16.311505 16.311504 7.249558 16.311505 16.311505-7.249558 16.311504-16.311505 16.311504z m0-27.185841c-6.343363 0-10.874336 5.437168-10.874336 10.874337s5.437168 10.874336 10.874336 10.874336 10.874336-5.437168 10.874336-10.874336-4.530973-10.874336-10.874336-10.874337z" fill="#C2D5E0" ></path><path d="M31.716814 493.876106m-13.59292 0a13.59292 13.59292 0 1 0 27.185841 0 13.59292 13.59292 0 1 0-27.185841 0Z" fill="#E0EEF6" ></path><path d="M31.716814 509.281416c-9.061947 0-16.311504-7.249558-16.311504-16.311504s7.249558-16.311504 16.311504-16.311505 16.311504 7.249558 16.311505 16.311505-7.249558 16.311504-16.311505 16.311504z m0-27.185841c-6.343363 0-10.874336 5.437168-10.874336 10.874337s5.437168 10.874336 10.874336 10.874336 10.874336-5.437168 10.874336-10.874336-4.530973-10.874336-10.874336-10.874337z" fill="#C2D5E0" ></path><path d="M701.39469 153.146903c-1.812389 0-3.624779-0.906195-3.624778-2.718584-9.061947-19.030088-28.092035-35.341593-55.277877-47.122124-2.718584-0.906195-3.624779-3.624779-2.718584-6.343363 0.906195-2.718584 3.624779-3.624779 6.343363-2.718584 29.904425 12.686726 49.840708 29.904425 60.715044 51.653097 0.906195 1.812389 0 4.530973-1.812389 6.343363-2.718584 0.906195-2.718584 0.906195-3.624779 0.906195zM746.704425 144.99115c-1.812389 0-3.624779-0.906195-4.530974-2.718584-19.936283-43.497345-52.559292-71.589381-96.962832-85.182301-2.718584-0.906195-3.624779-3.624779-2.718584-5.437168 0.906195-2.718584 3.624779-3.624779 5.437169-2.718584 47.122124 14.499115 81.557522 44.40354 103.306194 90.619469 0.906195 2.718584 0 4.530973-1.812389 6.343363-1.812389-1.812389-2.718584-0.906195-2.718584-0.906195z" fill="#9BBBCC" ></path><path d="M915.256637 271.858407h13.592921c2.718584 0 4.530973 1.812389 4.530973 4.530974s-1.812389 4.530973-4.530973 4.530973H915.256637v13.59292c0 2.718584-1.812389 4.530973-4.530973 4.530974s-4.530973-1.812389-4.530974-4.530974V280.920354h-13.59292c-2.718584 0-4.530973-1.812389-4.530974-4.530973s1.812389-4.530973 4.530974-4.530974h13.59292v-13.59292c0-2.718584 1.812389-4.530973 4.530974-4.530974s4.530973 1.812389 4.530973 4.530974V271.858407z" fill="#C2D5E0" ></path><path d="M77.026549 412.318584h18.123893c2.718584 0 4.530973 1.812389 4.530974 4.530974s-1.812389 4.530973-4.530974 4.530973h-18.123893v18.123894c0 2.718584-1.812389 4.530973-4.530974 4.530973s-4.530973-1.812389-4.530973-4.530973v-18.123894h-18.123894c-2.718584 0-4.530973-1.812389-4.530973-4.530973s1.812389-4.530973 4.530973-4.530974h18.123894v-18.123894c0-2.718584 1.812389-4.530973 4.530973-4.530973s4.530973 1.812389 4.530974 4.530973v18.123894zM983.221239 548.247788h18.123894c2.718584 0 4.530973 1.812389 4.530973 4.530973s-1.812389 4.530973-4.530973 4.530974h-18.123894v18.123893c0 2.718584-1.812389 4.530973-4.530974 4.530974s-4.530973-1.812389-4.530973-4.530974v-18.123893h-18.123894c-2.718584 0-4.530973-1.812389-4.530973-4.530974s1.812389-4.530973 4.530973-4.530973h18.123894v-18.123894c0-2.718584 1.812389-4.530973 4.530973-4.530974s4.530973 1.812389 4.530974 4.530974v18.123894z" fill="#9BBBCC" ></path></symbol><symbol id="icon-xuexizhongxin" viewBox="0 0 1081 1024"><path d="M946.907429 6.309366H635.102609c-36.145292 0-68.945093 14.533168-92.91687 38.13605A131.510857 131.510857 0 0 0 449.389714 6.309366H137.591255C64.422957 6.309366 4.916472 65.815851 4.916472 138.984149v643.472696a39.707031 39.707031 0 0 0 39.751553 39.751553h378.142211c55.149714 0 84.22241 45.348571 85.214609 46.957714 0.496099 0.871354 1.240248 1.367453 1.736348 2.238807 0.623304 0.871354 1.246609 1.615503 1.863552 2.353292 2.111602 2.493217 4.477615 4.725665 6.958112 6.716423l1.494659 1.113043c6.455652 4.35041 14.037068 6.958112 21.987378 6.958112 3.472696 0 7.078957-0.496099 10.558013-1.488298 1.488298-0.375255 2.734907-1.367453 4.096-1.863553 1.990758-0.744149 3.854311-1.615503 5.717863-2.607702 1.615503-0.998559 2.976596-2.111602 4.471255-3.231006a40.19677 40.19677 0 0 0 4.719304-4.471255c0.992199-1.119404 2.111602-2.359652 2.982957-3.606261 0.368894-0.616944 0.992199-1.113043 1.367453-1.736348 1.240248-1.990758 30.306584-47.332969 85.462659-47.332968h378.13585a39.707031 39.707031 0 0 0 39.751553-39.751553V138.984149c0.25441-73.168298-59.252075-132.674783-132.420372-132.674783zM422.931081 774.385689H50.576696V126.263652c0-29.320745 56.154634-69.275826 85.348174-69.275826h311.798459c29.320745 0 72.475031 40.082286 72.475031 69.275826v667.12646c-21.739329-11.054112-65.841292-19.004422-97.267279-19.004423z m602.582658 0h-363.825292c-31.425988 0-57.884621 7.950311-79.63031 19.004423V126.263652c0-29.320745 27.120099-67.584 56.313639-67.584h330.879205c29.320745 0 56.141913 38.39046 56.141913 67.584v648.122037h0.127205z"  ></path><path d="M403.055304 251.802236H184.173714c-21.987379 0-39.751553 14.208795-39.751553 31.801242 0 17.586087 17.764174 31.801242 39.751553 31.801242h218.88159c21.987379 0 39.751553-14.215155 39.751553-31.801242 0-17.490683-17.764174-31.801242-39.751553-31.801242z m0 248.049689H184.173714c-21.987379 0-39.751553 14.208795-39.751553 31.801243 0 17.586087 17.764174 31.801242 39.751553 31.801242h218.88159c21.987379 0 39.751553-14.215155 39.751553-31.801242 0-17.490683-17.764174-31.801242-39.751553-31.801243z m497.517715-254.409937H681.564224c-21.987379 0-39.751553 14.208795-39.751553 31.801242 0 17.586087 17.764174 31.801242 39.751553 31.801242h218.88159c21.987379 0 39.751553-14.215155 39.751552-31.801242 0.127205-17.490683-17.636969-31.801242-39.624347-31.801242z m0 254.409937H681.564224c-21.987379 0-39.751553 14.208795-39.751553 31.801243 0 17.586087 17.764174 31.801242 39.751553 31.801242h218.88159c21.987379 0 39.751553-14.215155 39.751552-31.801242 0.127205-17.490683-17.636969-31.801242-39.624347-31.801243z m139.251279 457.638957H52.249441c-21.987379 0-39.751553 14.208795-39.751553 31.801242s17.764174 31.801242 39.751553 31.801242h987.574857c21.987379 0 39.751553-14.208795 39.751553-31.801242 0-17.490683-17.764174-31.801242-39.751553-31.801242z"  ></path></symbol><symbol id="icon-kecheng" viewBox="0 0 1024 1024"><path d="M996.787309 145.845804c-1.815034-0.26092-18.690715-2.600646-48.777789-2.600646-56.224704 0-155.561098 8.41075-283.086836 52.292368 130.994692-74.191116 265.118999-80.908025 266.951142-80.986443 11.373547-0.461957 20.206332-10.063244 19.760059-21.419682-0.479066-11.390657-10.141663-20.34606-21.415404-19.761485-8.52624 0.345042-167.074373 7.98729-313.77417 102.846695 110.928087-103.553888 273.184707-134.927028 275.317693-135.333379 11.172511-2.07738 18.552413-12.82643 16.513529-23.99894-2.054567-11.172511-12.79934-18.613722-23.97185-16.536342-11.818395 2.184314-271.914326 52.253872-372.444108 244.189789-100.746503-191.496774-360.296355-241.520706-372.11475-243.70502-11.134014-2.031754-21.900174 5.363832-23.977554 16.536342-2.07738 11.211007 5.341019 21.944373 16.536342 23.99894 2.155798 0.400648 164.673338 31.662575 275.622812 135.572912-146.805306-95.060442-305.608656-102.741186-314.142024-103.063416-11.272316-0.685806-20.952022 8.387938-21.413979 19.760059-0.446273 11.373547 8.387938 20.974834 19.760059 21.415404 1.854956 0.082696 136.11899 6.594291 267.336106 81.107636-127.70824-44.004236-227.162975-52.43067-283.448988-52.43067-30.085649 0-46.984142 2.361112-48.799176 2.623458-16.051573 2.3383-27.563422 16.735953-26.355776 32.910144l51.318552 684.664164c1.191963 15.689421 13.99558 28.009695 29.723498 28.570031 254.270143 9.119369 409.809854 124.099559 411.341155 125.230213 5.48645 4.15476 12.057928 6.272061 18.652218 6.272061 4.679451 0 9.380289-1.069344 13.73466-3.225143 2.723264-1.333116 5.139982-3.085415 7.278671-5.064415 19.219684-13.673351 169.697831-115.144156 409.202466-123.698911 15.727918-0.561762 28.532961-12.882036 29.724923-28.571457l51.300016-684.686977C1024.335047 162.566074 1012.838882 148.208343 996.787309 145.845804L996.787309 145.845804zM480.968352 937.089388c-65.413937-36.664256-193.022372-93.59045-369.169063-104.985384l-46.967033-626.407706c3.447566-0.078419 7.156053-0.139728 11.188194-0.139728 71.18412 0 216.865901 14.420466 404.947901 108.934829L480.968352 937.089388 480.968352 937.089388zM912.232107 831.602125c-176.146691 11.374973-303.755125 68.321128-369.191875 105.003919l0-622.615097c188.082-94.520067 333.780891-108.894907 404.963585-108.894907 3.993645 0 7.724944 0.038496 11.172511 0.122618L912.232107 831.602125 912.232107 831.602125zM912.232107 831.602125" fill="#8a8a8a" ></path></symbol><symbol id="icon-yemian" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z"  ></path><path d="M464.782222 331.377778h120.888889a24.746667 24.746667 0 0 0 23.04-15.075556l48.071111-113.777778a23.324444 23.324444 0 0 0-2.56-22.755555 26.737778 26.737778 0 0 0-20.195555-9.102222h-217.315556a24.462222 24.462222 0 0 0-20.764444 10.24 22.755556 22.755556 0 0 0-2.275556 21.902222l48.355556 113.777778a25.031111 25.031111 0 0 0 22.755555 14.791111zM568.888889 284.444444h-88.177778l-28.444444-68.835555H597.333333z m-43.52 574.577778a25.031111 25.031111 0 0 0 17.92-5.688889l132.835555-137.671111a23.893333 23.893333 0 0 0 6.257778-21.902222L597.333333 394.24a22.755556 22.755556 0 0 0-22.755555-17.066667h-96.711111a23.324444 23.324444 0 0 0-23.04 17.066667L369.777778 692.622222a21.617778 21.617778 0 0 0 5.973333 21.902222l133.688889 138.808889a17.351111 17.351111 0 0 0 15.928889 6.826667z m106.097778-166.4l-106.097778 108.942222-106.382222-110.08 76.231111-268.515555h59.164444z" fill="#FFFFFF" ></path></symbol><symbol id="icon-bianzu" viewBox="0 0 1024 1024"><path d="M512 1024C229.233778 1024 0 794.766222 0 512S229.233778 0 512 0s512 229.233778 512 512-229.233778 512-512 512z m-60.359111-553.528889C321.848889 509.468444 227.555556 626.972444 227.555556 765.838222h42.439111c0-147.968 123.477333-267.889778 275.825777-267.889778v-0.085333c82.488889-2.730667 148.536889-68.551111 148.536889-149.333333C694.328889 266.012444 625.493333 199.111111 540.529778 199.111111c-84.963556 0-153.827556 66.901333-153.827556 149.418667-0.056889 48.469333 24.177778 93.952 64.938667 121.941333z m343.239111 51.882667l-198.542222 192.853333-98.986667-96.170667-30.008889 29.127112 129.024 125.297777L824.888889 551.537778l-30.008889-29.155556z m-254.350222-65.649778c-61.525333 0-111.388444-48.440889-111.388445-108.174222 0-59.761778 49.863111-108.202667 111.388445-108.202667 61.525333 0 111.388444 48.440889 111.388444 108.202667 0 59.733333-49.863111 108.174222-111.388444 108.174222z"  ></path></symbol><symbol id="icon-Page-1" viewBox="0 0 1691 1024"><path d="M133.565217 0h1037.80174a133.565217 133.565217 0 0 1 133.565217 133.565217v756.869566a133.565217 133.565217 0 0 1-133.565217 133.565217H133.565217a133.565217 133.565217 0 0 1-133.565217-133.565217V133.565217a133.565217 133.565217 0 0 1 133.565217-133.565217z m1263.08174 267.130435l192.333913-145.14087a64.111304 64.111304 0 0 1 89.043478 12.466087 63.22087 63.22087 0 0 1 12.911304 38.733913v675.394783a64.111304 64.111304 0 0 1-102.845217 51.2L1396.646957 756.869565a64.556522 64.556522 0 0 1-25.822609-51.2V316.104348a64.556522 64.556522 0 0 1 25.822609-48.973913z" fill="#4CACFF" ></path><path d="M365.078261 249.766957h183.874782a299.631304 299.631304 0 0 1 57.433044 5.342608 156.716522 156.716522 0 0 1 56.542609 30.274783 123.325217 123.325217 0 0 1 39.17913 48.528695 159.387826 159.387826 0 0 1 15.582609 72.125218 154.490435 154.490435 0 0 1-39.624348 102.845217 150.038261 150.038261 0 0 1-119.318261 49.864348H442.10087V756.869565H365.078261z m77.022609 236.410434h113.530434a81.92 81.92 0 0 0 64.556522-26.267826 85.481739 85.481739 0 0 0 20.48-55.652174 94.831304 94.831304 0 0 0-8.45913-44.521739 64.556522 64.556522 0 0 0-24.041739-24.932174 99.283478 99.283478 0 0 0-55.206957-14.246956H442.10087zM801.391304 379.325217V302.302609l72.125218-52.535652h72.570435V756.869565h-73.906087V326.789565z" fill="#FFFFFF" ></path></symbol><symbol id="icon-Page-3" viewBox="0 0 1691 1024"><path d="M133.565217 0h1037.80174a133.565217 133.565217 0 0 1 133.565217 133.565217v756.869566a133.565217 133.565217 0 0 1-133.565217 133.565217H133.565217a133.565217 133.565217 0 0 1-133.565217-133.565217V133.565217a133.565217 133.565217 0 0 1 133.565217-133.565217z m1263.08174 267.130435l192.333913-145.14087a64.111304 64.111304 0 0 1 89.043478 12.466087 63.22087 63.22087 0 0 1 12.911304 38.733913v675.394783a64.111304 64.111304 0 0 1-102.845217 51.2L1396.646957 756.869565a64.556522 64.556522 0 0 1-25.822609-51.2V316.104348a64.556522 64.556522 0 0 1 25.822609-48.973913z" fill="#4CACFF" ></path><path d="M365.078261 249.766957h183.874782a299.631304 299.631304 0 0 1 57.433044 5.342608 156.716522 156.716522 0 0 1 56.542609 30.274783 123.325217 123.325217 0 0 1 39.17913 48.528695 159.387826 159.387826 0 0 1 15.582609 72.125218 154.490435 154.490435 0 0 1-39.624348 102.845217 150.038261 150.038261 0 0 1-119.318261 49.864348H442.10087V756.869565H365.078261z m77.022609 236.410434h113.530434a81.92 81.92 0 0 0 64.556522-26.267826 85.481739 85.481739 0 0 0 20.48-55.652174 94.831304 94.831304 0 0 0-8.45913-44.521739 64.556522 64.556522 0 0 0-24.041739-24.932174 99.283478 99.283478 0 0 0-55.206957-14.246956H442.10087zM859.269565 463.471304h24.932174a79.693913 79.693913 0 0 0 57.878261-20.48 70.344348 70.344348 0 0 0 20.48-51.645217 73.46087 73.46087 0 0 0-21.370435-52.535652A74.796522 74.796522 0 0 0 890.434783 318.330435a67.673043 67.673043 0 0 0-42.295653 14.692174 75.686957 75.686957 0 0 0-27.15826 44.521739h-74.796522a147.366957 147.366957 0 0 1 44.521739-94.831305 133.565217 133.565217 0 0 1 93.94087-38.733913 142.914783 142.914783 0 0 1 149.593043 144.250435A158.497391 158.497391 0 0 1 1024 445.217391a120.653913 120.653913 0 0 1-44.521739 48.528696 129.558261 129.558261 0 0 1 44.521739 49.864348 146.921739 146.921739 0 0 1 13.356522 61.44 148.257391 148.257391 0 0 1-44.521739 112.194782 152.264348 152.264348 0 0 1-109.968696 44.52174 139.353043 139.353043 0 0 1-91.714783-33.391305 156.271304 156.271304 0 0 1-51.645217-96.612174h72.570435a96.612174 96.612174 0 0 0 27.603478 40.96 67.673043 67.673043 0 0 0 47.638261 16.473044 72.125217 72.125217 0 0 0 57.878261-21.370435 77.022609 77.022609 0 0 0 23.151304-58.323478 80.584348 80.584348 0 0 0-23.151304-60.104348 76.577391 76.577391 0 0 0-54.761739-21.815652h-31.165218z" fill="#FFFFFF" ></path></symbol><symbol id="icon-Page" viewBox="0 0 1691 1024"><path d="M133.565217 0h1037.80174a133.565217 133.565217 0 0 1 133.565217 133.565217v756.869566a133.565217 133.565217 0 0 1-133.565217 133.565217H133.565217a133.565217 133.565217 0 0 1-133.565217-133.565217V133.565217a133.565217 133.565217 0 0 1 133.565217-133.565217z m1263.08174 267.130435l192.333913-145.14087a64.111304 64.111304 0 0 1 89.043478 12.466087 63.22087 63.22087 0 0 1 12.911304 38.733913v675.394783a64.111304 64.111304 0 0 1-102.845217 51.2L1396.646957 756.869565a64.556522 64.556522 0 0 1-25.822609-51.2V316.104348a64.556522 64.556522 0 0 1 25.822609-48.973913z" fill="#4CACFF" ></path><path d="M365.078261 249.766957h183.874782a299.631304 299.631304 0 0 1 57.433044 5.342608 156.716522 156.716522 0 0 1 56.542609 30.274783 123.325217 123.325217 0 0 1 39.17913 48.528695 159.387826 159.387826 0 0 1 15.582609 72.125218 154.490435 154.490435 0 0 1-39.624348 102.845217 150.038261 150.038261 0 0 1-119.318261 49.864348H442.10087V756.869565H365.078261z m77.022609 236.410434h113.530434a81.92 81.92 0 0 0 64.556522-26.267826 85.481739 85.481739 0 0 0 20.48-55.652174 94.831304 94.831304 0 0 0-8.45913-44.521739 64.556522 64.556522 0 0 0-24.041739-24.932174 99.283478 99.283478 0 0 0-55.206957-14.246956H442.10087zM756.869565 688.306087l198.121739-247.54087a105.961739 105.961739 0 0 0 15.582609-28.048695 104.626087 104.626087 0 0 0 2.671304-22.706087 74.351304 74.351304 0 0 0-17.808695-49.864348 67.227826 67.227826 0 0 0-52.090435-21.815652 68.563478 68.563478 0 0 0-49.864348 19.144348 82.810435 82.810435 0 0 0-24.486956 53.871304H756.869565a155.826087 155.826087 0 0 1 44.521739-104.626087 133.565217 133.565217 0 0 1 98.393044-40.96 146.476522 146.476522 0 0 1 106.406956 41.405217 141.133913 141.133913 0 0 1 41.850435 103.290435 139.798261 139.798261 0 0 1-30.72 89.043478l-162.949565 204.8h193.669565V756.869565H756.869565z" fill="#FFFFFF" ></path></symbol><symbol id="icon-xiaoxi1" viewBox="0 0 1024 1024"><path d="M768 512a255.2 255.2 0 0 1-75 181l45.25 45.25a320 320 0 0 0 0-452.55L693 331a255.2 255.2 0 0 1 75 181z"  ></path><path d="M896 512a382.8 382.8 0 0 1-112.47 271.53l45.25 45.25a448 448 0 0 0 0-633.57l-45.25 45.25A382.8 382.8 0 0 1 896 512z"  ></path><path d="M715.651707 715.650121m-22.627417 22.627417a32 32 0 1 0 45.254834-45.254834 32 32 0 1 0-45.254834 45.254834Z"  ></path><path d="M806.162728 806.150586m-22.627417 22.627417a32 32 0 1 0 45.254834-45.254834 32 32 0 1 0-45.254834 45.254834Z"  ></path><path d="M715.64795 308.34505m-22.627417 22.627417a32 32 0 1 0 45.254834-45.254834 32 32 0 1 0-45.254834 45.254834Z"  ></path><path d="M806.15795 217.83505m-22.627417 22.627417a32 32 0 1 0 45.254834-45.254834 32 32 0 1 0-45.254834 45.254834Z"  ></path><path d="M544 125.54h-19.33a63.77 63.77 0 0 0-43.82 17.36L292.35 320H128a32 32 0 0 0-32 32v320a32 32 0 0 0 32 32h164.35l188.5 177.1a63.77 63.77 0 0 0 43.82 17.36H544a64.07 64.07 0 0 0 64-64V189.54a64.07 64.07 0 0 0-64-64zM256 656h-96V384h96z m288 178.46h-19.33L320 642.16V381.84l204.67-192.3H544v644.92z"  ></path></symbol><symbol id="icon-bianji1" viewBox="0 0 1024 1024"><path d="M896 604.16h-64V832H192V192h254.4V128H192a64 64 0 0 0-64 64v640a64 64 0 0 0 64 64h640a64 64 0 0 0 64-64V604.16z" fill="#2C3E77" ></path><path d="M419.456 653.12l-48.576-41.6 425.6-496.64 48.64 41.6z" fill="#2C3E77" ></path></symbol><symbol id="icon-renzhengshangjia" viewBox="0 0 1778 1024"><path d="M1334.595368 978.081684l-14.982736-6.521263c-248.724211-107.897263-409.546105-352.202105-409.546106-622.053053V159.582316l13.689263-11.264a643.880421 643.880421 0 0 1 822.056422 0l13.635368 11.264v189.925052c0 269.850947-160.606316 514.155789-409.330526 622.053053l-15.521685 6.521263zM985.734737 194.991158v154.51621c0 234.442105 136.353684 447.056842 348.914526 546.384843a603.513263 603.513263 0 0 0 348.968421-546.384843V194.991158a568.427789 568.427789 0 0 0-348.968421-119.808c-126.544842 0-249.694316 42.469053-348.914526 119.808z m321.913263 508.227368h-0.646737c-41.013895-0.323368-64.835368-37.888-68.985263-45.433263l-142.982737-152.037052a37.241263 37.241263 0 0 1 16.060632-50.661053 38.049684 38.049684 0 0 1 50.930526 15.898947l142.120421 150.905263c0.485053 0.646737 1.509053 1.994105 2.694737 3.17979 1.616842-1.886316 3.664842-4.742737 6.03621-8.623158l229.807158-331.991579a38.211368 38.211368 0 0 1 50.122106-18.647579 37.618526 37.618526 0 0 1 18.755368 49.798737l-231.693474 335.602526c-25.653895 43.493053-53.140211 52.008421-72.218947 52.008421z"  ></path><path d="M1028.958316 816.936421c-17.138526-50.822737-73.781895-58.098526-121.101474-78.524632-52.008421-22.474105-109.621895-48.505263-161.522526-70.278736l-44.409263-12.39579c-17.677474-12.395789-34.977684-53.786947-44.409264-74.374737l-28.240842-4.096c1.455158-31.797895 20.695579-33.522526 28.240842-57.882947 6.682947-21.396211 0.700632-49.259789 11.264-69.146947 7.329684-13.797053 23.929263-13.850947 32.175158-25.70779 7.545263-10.725053 12.449684-29.372632 14.767158-42.522947 4.311579-24.037053 8.030316-56.858947-3.125894-80.680421-6.413474-13.689263-10.401684-14.982737-12.234106-31.582316-2.155789-20.156632 5.820632-85.800421 6.144-99.974737 0.808421-36.810105-0.053895-39.828211-8.730947-75.66821 0 0-10.617263-32.444632-27.162947-42.253474L637.574737 45.972211 617.094737 26.624C534.905263-25.168842 446.679579 11.156211 399.467789 30.773895 331.452632 53.355789 288.390737 121.586526 318.410105 267.317895c5.12 24.791579-13.312 35.947789-12.126316 49.583158 2.694737 29.696 3.233684 101.106526 30.612211 118.67621 2.533053 1.616842 22.042947 6.629053 21.881263 5.281684l8.084211 86.770527c6.844632 19.240421 23.228632 21.288421 28.025263 48.505263l-21.018948 5.173895c-9.431579 20.641684-26.731789 61.978947-44.409263 74.374736l-44.409263 12.39579c-51.846737 21.827368-109.514105 47.804632-161.468631 70.278737-47.319579 20.48-104.016842 27.701895-121.101474 78.524631 0 34.492632-3.233684 115.927579-2.317474 161.145263H452.715789l33.253053-232.286315-27.648-59.661474 63.757474-31.312842 53.733052 30.666105-29.58821 61.44 52.277895 231.208421h432.774736c0.862316-45.271579-2.317474-126.706526-2.317473-161.199158z"  ></path></symbol><symbol id="icon-shenfenzhenghaomaguizheng" viewBox="0 0 1638 1024"><path d="M995.185376 834.694718h-125.843918v-128.965708h172.977814a142.527578 142.527578 0 0 1 112.077341-35.6191 143.090523 143.090523 0 0 1 77.788839 35.6191h65.301684v55.424549l141.094625-125.280973V104.24728C1438.581761 46.622127 1386.995478 0 1340.015113 0H106.396709C30.040822 0 0 46.622127 0 104.24728v778.29781c0 57.625153 49.590385 104.24728 110.695566 104.24728h989.248859l-67.860527-73.489983a145.086421 145.086421 0 0 1-36.898522-78.607669zM869.341458 189.86618h428.094501v128.965708h-428.094501v-128.965708z m0 257.931415h428.094501v128.965708h-428.094501V447.797595z m-728.758601 385.464171s-1.535306-90.941295 18.884264-110.234974c20.470747-19.242502 28.812577-53.991596 137.409891-69.805248 108.546137-15.813652 97.236049-72.159384 100.716076-70.368194-0.665299-21.340754-2.814728-51.381576-2.814728-51.381575s-56.499262-23.643713-73.182921-70.368194c-35.004978-13.868931-30.347883-22.722529-33.776733-40.68561 0 0-10.542435-72.517622 13.050101-71.033493 0 0 15.35306 0 11.617149-16.683659-1.228245-27.737862-1.228245-81.575928 0.614123-99.9996 1.893544-18.526026 15.813652-68.577003 55.21984-75.895295 39.406188-7.420646 23.541359-3.633558 36.744992-5.629456 13.152455-1.79119 9.416544-9.211836 33.776733-9.211836l50.613922-10.235374c24.360189 0 39.969134 39.252658 53.121589 41.197379 13.152455 1.842367 16.274244-5.629455 43.193277-0.716476 39.406188 7.420646 33.930264 60.235174 35.823807 78.812377 1.842367 18.423673 5.322394 68.730534 1.586483 85.363016-3.735911 16.683659 7.932415 14.841292 7.932415 14.841291 28.147277 0 19.344856 71.033493 19.344856 71.033493-4.298857 18.781911-16.120713 21.08487-42.272093 37.359114-16.683659 46.826834-69.856425 81.21769-69.856425 81.21769s-0.255884 38.740889-0.460592 47.236249c0.767653 3.27532-6.03887 51.535106 86.540084 65.148153 108.597314 15.813652 127.328048 50.562746 147.798795 69.805248 20.470747 19.293679 22.671353 110.234974 22.671353 110.234974H140.582857z m1483.719758-168.730134a54.196303 54.196303 0 0 0-34.186148-18.116612 53.940419 53.940419 0 0 0-42.118562 13.203632l-263.663224 234.031818-107.420246-116.376198a53.684535 53.684535 0 0 0-76.304711-2.763551 54.963956 54.963956 0 0 0-2.712374 77.021187l143.192877 155.21944c8.444183 9.211836 19.958979 14.994822 32.241427 16.427775a55.782786 55.782786 0 0 0 31.013182-5.424748 44.523875 44.523875 0 0 0 11.92421-7.318292l303.12059-268.985619a54.963956 54.963956 0 0 0 4.912979-76.918832z"  ></path></symbol><symbol id="icon-yonghujiaose_wushuju" viewBox="0 0 1692 1024"><path d="M454.529406 945.631607h31.639427A15.673428 15.673428 0 0 1 501.54969 961.305035c0 8.651732-6.750023 15.673428-15.380857 15.673428H454.529406v31.639426A15.673428 15.673428 0 0 1 438.855979 1023.998746a15.443551 15.443551 0 0 1-15.673428-15.380857V976.978463h-31.639427A15.673428 15.673428 0 0 1 376.162267 961.305035c0-8.651732 6.750023-15.673428 15.380857-15.673428h31.639427v-31.639426A15.673428 15.673428 0 0 1 438.855979 898.611324c8.651732 0 15.673428 6.750023 15.673427 15.380857v31.639426zM52.244759 512.000104h21.106883A10.448952 10.448952 0 0 1 83.591615 522.449056c0 5.767821-4.493049 10.448952-10.239973 10.448952H52.244759v21.106883A10.448952 10.448952 0 0 1 41.795807 564.244864a10.281769 10.281769 0 0 1-10.448951-10.239973V532.898008H10.239973A10.448952 10.448952 0 0 1 0 522.449056c0-5.767821 4.493049-10.448952 10.239973-10.448952H31.346856v-21.106882A10.448952 10.448952 0 0 1 41.795807 480.653249c5.767821 0 10.448952 4.493049 10.448952 10.239973v21.106882z m1567.342781-480.651786V10.241436A10.281769 10.281769 0 0 0 1609.138588 0.001463a10.448952 10.448952 0 0 0-10.448952 10.239973V31.348318h-21.106883A10.281769 10.281769 0 0 0 1567.342781 41.79727c0 5.600638 4.597539 10.448952 10.239972 10.448952h21.106883v21.106883c0 5.746924 4.68113 10.239973 10.448952 10.239973a10.448952 10.448952 0 0 0 10.448952-10.239973V52.246222h21.106883c5.746924 0 10.239973-4.68113 10.239972-10.448952a10.448952 10.448952 0 0 0-10.239972-10.448952H1619.58754zM543.345497 355.265826a20.897904 20.897904 0 0 1 20.877006-20.897903H752.324535a20.897904 20.897904 0 1 1 0 41.795807H564.243401A20.83521 20.83521 0 0 1 543.345497 355.265826z m0 125.387423c0-11.535643 9.299567-20.897904 20.751619-20.897904h251.067415c11.452051 0 20.751618 9.278669 20.751619 20.897904 0 11.535643-9.299567 20.897904-20.751619 20.897904H564.097116A20.772516 20.772516 0 0 1 543.345497 480.653249z m0 125.387422c0-11.535643 9.320465-20.897904 20.856108-20.897903h104.57311c11.514745 0 20.856108 9.278669 20.856108 20.897903 0 11.535643-9.320465 20.897904-20.856108 20.897904h-104.57311A20.814312 20.814312 0 0 1 543.345497 606.040671zM188.081134 229.878404a62.693711 62.693711 0 1 1 0-125.387422 62.693711 62.693711 0 0 1 0 125.387422z m73.142663 417.958075a31.346856 31.346856 0 1 1 0-62.693711 31.346856 31.346856 0 0 1 0 62.693711zM188.081134 198.531548a31.346856 31.346856 0 1 0 0-62.693711 31.346856 31.346856 0 0 0 0 62.693711zM1630.036492 501.551153a62.693711 62.693711 0 1 1 0-125.387423 62.693711 62.693711 0 0 1 0 125.387423z m0-31.346856a31.346856 31.346856 0 1 0 0-62.693711 31.346856 31.346856 0 0 0 0 62.693711zM1295.670032 1003.100842a41.795807 41.795807 0 1 1 0-83.591615 41.795807 41.795807 0 0 1 0 83.591615z m0-20.897903a20.897904 20.897904 0 1 0 0-41.795808 20.897904 20.897904 0 0 0 0 41.795808zM1037.727206 567.839303A167.245924 167.245924 0 0 1 1170.282609 731.428094c0 20.856108 0.543345 20.856108-165.594989 20.856108S835.91615 752.284202 835.91615 731.428094c0-80.456929 56.842298-147.64369 132.555403-163.588791l17.324362 17.303465H982.201476l-16.760119 83.842389c-2.298769 11.36846 2.654034 27.188173 11.034093 35.254764L1004.68762 731.428094l25.704422-26.707521c8.045693-8.359161 12.66413-24.32516 10.36536-35.735416L1023.997283 585.142768h-3.594439l17.324362-17.303465zM1003.09938 543.34696a83.591615 83.591615 0 1 1 0-167.18323 83.591615 83.591615 0 0 1 0 167.18323z m-606.039209 188.081134V292.572115c0-46.184367 37.428146-83.591615 83.758798-83.591615H501.54969V188.082597c0-46.184367 37.428146-83.591615 83.758798-83.591615h710.194361A83.612513 83.612513 0 0 1 1379.261647 188.082597v438.855978c0 46.184367-37.428146 83.591615-83.758798 83.591615H1274.772128v20.897904c0 15.234572-4.075091 29.50784-11.180378 41.795807h115.732591c11.493847 0 20.83521 9.278669 20.83521 20.897904 0 11.535643-9.46675 20.897904-20.83521 20.897904H355.20167A20.814312 20.814312 0 0 1 334.36646 794.121805c0-11.535643 9.46675-20.897904 20.83521-20.897904h53.03888A83.110963 83.110963 0 0 1 397.060171 731.428094z m877.711957-62.693711h20.83521A41.858501 41.858501 0 0 0 1337.465839 627.001269V188.019903A41.795807 41.795807 0 0 0 1295.607338 146.286789H585.203998A41.858501 41.858501 0 0 0 543.345497 188.019903V208.9805h647.667833A83.612513 83.612513 0 0 1 1274.772128 292.572115v376.162268zM438.855979 292.509422v438.981365A41.795807 41.795807 0 0 0 480.71448 773.223901h710.403339A41.858501 41.858501 0 0 0 1232.976321 731.490787V292.509422A41.795807 41.795807 0 0 0 1191.117819 250.776308H480.71448A41.858501 41.858501 0 0 0 438.855979 292.509422zM1441.955358 794.121805c0-11.535643 9.46675-20.897904 20.83521-20.897904h83.717002c11.493847 0 20.83521 9.278669 20.835211 20.897904 0 11.535643-9.46675 20.897904-20.835211 20.897904h-83.717002A20.814312 20.814312 0 0 1 1441.955358 794.121805z" fill="#8A96A3" ></path></symbol><symbol id="icon-paixu1" viewBox="0 0 1024 1024"><path d="M538.0745 7.143179l335.327905 401.296447a18.137693 18.137693 0 0 1-3.291114 26.328909A20.47804 20.47804 0 0 1 857.897603 438.864143H146.285714L506.991761 7.143179a20.551176 20.551176 0 0 1 31.082739 0zM516.938238 1016.856821L877.644284 585.135857H166.032396C155.208289 585.135857 146.285714 593.546481 146.285714 603.931772c0 4.168744 1.462717 8.264352 4.24188 11.628602l335.327904 401.296447a20.551176 20.551176 0 0 0 31.08274 0z" fill="#999999" ></path></symbol><symbol id="icon-kong" viewBox="0 0 1024 1024"><path d="M948.378 520.448h-46.08l-74.343-123.34c-0.102-0.206-0.102-0.36-0.46-0.564 0-0.154 0-0.358-0.205-0.358a6.349 6.349 0 0 0-1.434-1.434 4.096 4.096 0 0 0-1.946-1.075c-0.204-0.359-0.563-0.359-0.972-0.512h-0.359L623.36 329.37c59.494-36.864 87.603-73.216 88.166-73.933a4.506 4.506 0 0 0-0.972-6.298 4.506 4.506 0 0 0-6.298 0.922c-0.563 0.717-29.9 38.502-92.211 75.673l-101.12-32.41a9.574 9.574 0 0 0-5.376 0l-7.936 2.51-216.474 69.324H168.55a23.296 23.296 0 0 0 0 46.49h11.418l-37.171 62.362h-71.68a23.245 23.245 0 1 0 0 46.49h44.032l-18.74 31.436a9.523 9.523 0 0 0-1.075 7.014 9.728 9.728 0 0 0 4.455 5.53l75.878 39.731v119.245c0 3.226 1.792 6.298 4.66 7.885l2.969 1.638 289.28 162.407a8.858 8.858 0 0 0 8.448 5.734c0.717 0 1.229 0 1.997-0.205h0.102c0.768 0 1.434 0.205 2.355 0.205a11.264 11.264 0 0 0 3.943-0.922l332.851-165.324 1.843-0.922a8.704 8.704 0 0 0 5.018-7.936V663.45l51.61 1.075a23.194 23.194 0 1 0 0.972-46.439l-52.531-1.075v-25.446l59.238-24.679h59.904a23.296 23.296 0 0 0 0.052-46.438zM792.883 402.483L511.078 508.058v-127.95a499.61 499.61 0 0 0 91.444-38.604l190.361 60.98zM511.078 370.74v-58.521l79.565 25.497a490.342 490.342 0 0 1-79.565 33.024z m-17.97-54.579v60.006c-36.506 10.24-77.825 17.818-124.724 20.43a4.557 4.557 0 0 0-4.3 4.71 4.557 4.557 0 0 0 4.505 4.25h0.256a591.718 591.718 0 0 0 124.262-20.02v129.382l-15.053 5.53L221.184 403.2l271.923-87.04z m-303.924 80.026zM116.736 553.01l83.098-139.571L468.48 535.91l-73.523 162.97-205.21-107.622-73.011-38.247z m278.426 166.195a8.192 8.192 0 0 0 7.014 0.512 9.626 9.626 0 0 0 5.376-4.864l64.563-142.796V874.24L193.69 718.285V613.632l201.472 105.574z m416.102 1.383l-321.126 159.18V559.259l89.036 129.28c2.51 3.584 6.964 4.864 10.957 3.225l221.133-92.62v121.446z m5.58-143.155c-0.511 0.204-1.074 0.358-1.586 0.768L589.926 672.46l-95.692-138.855 322.201-120.678 79.36 131.482-78.95 33.024z" fill="#9C9C9C" ></path><path d="M485.58 901.222c-0.92 0-1.638-0.204-2.354-0.204h-0.103c-0.768 0.204-1.28 0.204-1.997 0.204a8.858 8.858 0 0 1-8.448-5.734l-289.28-162.406c-15.206 14.387-23.808 30.054-23.808 46.438 0 70.349 153.344 127.386 342.426 127.386 189.03 0 342.374-57.037 342.374-127.386 0-15.667-7.987-30.618-21.913-44.493L489.626 900.352a13.056 13.056 0 0 1-4.045 0.87z" fill="#E5E5E4" ></path><path d="M816.435 412.877L494.234 533.555l95.692 138.855 225.332-94.26c0.563-0.41 1.075-0.563 1.587-0.768l78.95-33.075-79.36-131.43z" fill="#FFFFFF" ></path><path d="M590.08 691.866a9.114 9.114 0 0 1-10.957-3.226l-89.037-129.28v320.512l321.127-159.18V599.346L590.08 691.866z" fill="#E5E5E4" ></path><path d="M511.078 370.74a487.629 487.629 0 0 0 79.565-33.076l-79.565-25.446v58.521z m0 137.318l281.805-105.575-190.31-60.979c-25.6 14.08-56.115 27.546-91.443 38.605v127.949z m-33.075 12.39l15.053-5.53V385.536c-36.454 10.035-77.67 17.408-124.16 20.02h-0.256a4.557 4.557 0 0 1-4.506-4.25 4.454 4.454 0 0 1 4.25-4.71 584.704 584.704 0 0 0 124.723-20.43V316.16L221.184 403.2l256.82 117.248z" fill="#FFFFFF" ></path><path d="M472.115 874.24V572.058l-64.563 142.796a9.626 9.626 0 0 1-8.243 5.428 8.5 8.5 0 0 1-4.147-1.076L193.69 613.632v104.653L472.115 874.24z" fill="#E5E5E4" ></path><path d="M394.957 698.88l73.523-162.97-268.646-122.47-83.098 139.571 73.011 38.298z" fill="#FFFFFF" ></path><path d="M221.389 326.912c267.417-11.213 405.35-159.59 406.63-161.075 1.639-1.843 1.536-4.66-0.307-6.349s-4.66-1.587-6.298 0.307c-1.382 1.434-136.704 147.098-400.435 158.106a4.608 4.608 0 0 0-4.3 4.71 4.608 4.608 0 0 0 4.505 4.301h0.205z" fill="#9C9C9C" ></path></symbol><symbol id="icon-shouji" viewBox="0 0 1024 1024"><path d="M256 960V64h512v896H256z m0 64h512a64 64 0 0 0 64-64V64a64 64 0 0 0-64-64H256a64 64 0 0 0-64 64v896a64 64 0 0 0 64 64zM256 192V128h512v64H256z m0 632.32v-64h512v64H256z m192 96v-64h128v64H448z"  ></path></symbol><symbol id="icon-yinhangqia1" viewBox="0 0 1024 1024"><path d="M887.0462301677038 159.14585414162968h-15.53445925925926c-13.315251313777777 0-22.19208430933333 8.876834209185184-22.19208430933333 22.19208430933333s8.876834209185184 22.19208430933333 22.19208430933333 22.19208430933333h15.53445925925926c11.096042154666666 0 22.19208430933333 8.876834209185184 22.19208552296296 22.19208552296296v106.5220056557037H119.20010141392589v-106.5220056557037c0-11.096042154666666 8.876834209185184-22.19208430933333 22.19208430933333-22.19208552296296h596.9670781155555c13.315251313777777 0 22.19208430933333-8.876834209185184 22.19208430933333-22.19208430933333s-8.876834209185184-22.19208430933333-22.19208430933333-22.19208430933333h-599.1862860610371c-35.50733562311111 0-66.57625414162963 28.849710573037036-66.57625414162963 66.57625414162963v565.8981583834073c0 35.50733562311111 28.849710573037036 66.57625414162963 66.57625414162963 66.57625414162963h747.8732523899258c35.50733562311111 0 66.57625414162963-28.849710573037036 66.57625414162963-66.57625414162963V225.72210828325927c0-37.72654356859259-31.06891851851852-66.57625414162963-66.57625414162963-66.57625414162963z m22.19208552296296 630.2552045795555c0 11.096042154666666-8.876834209185184 22.19208430933333-22.19208552296296 22.19208430933333H139.17297777777782c-11.096042154666666 0-22.19208430933333-8.876834209185184-22.19208430933333-22.19208430933333V376.62828377125925h790.038213063111v412.77277494992586z" fill="" ></path><path d="M216.8452740740741 538.6305014139259h310.6891851851852c13.315251313777777 0 22.19208430933333-8.876834209185184 22.19208430933333-22.19208430933333s-8.876834209185184-22.19208430933333-22.19208430933333-22.19208430933333h-310.6891851851852c-13.315251313777777 0-22.19208430933333 8.876834209185184-22.19208430933333 22.19208430933333s11.096042154666666 22.19208430933333 22.19208430933333 22.19208430933333zM618.5220068693334 538.6305014139259h55.480210773333326c13.315251313777777 0 22.19208430933333-8.876834209185184 22.19208552296296-22.19208430933333s-8.876834209185184-22.19208430933333-22.19208552296296-22.19208430933333h-55.480210773333326c-13.315251313777777 0-22.19208430933333 8.876834209185184-22.19208552296296 22.19208430933333s8.876834209185184 22.19208430933333 22.19208552296296 22.19208430933333zM216.8452740740741 658.4677583834074h288.49710087585186c13.315251313777777 0 22.19208430933333-8.876834209185184 22.19208430933333-22.19208430933333s-8.876834209185184-22.19208430933333-22.19208430933333-22.19208430933333h-288.49710087585186c-13.315251313777777 0-22.19208430933333 8.876834209185184-22.19208430933333 22.19208430933333s11.096042154666666 22.19208430933333 22.19208430933333 22.19208430933333z" fill="" ></path></symbol><symbol id="icon-shezhi2" viewBox="0 0 1024 1024"><path d="M870.592 421.488L811.2 456.096a285.824 285.824 0 0 1 0 111.808l59.456 34.608a51.424 51.424 0 0 1 18.592 69.936L838.4 761.152a50.56 50.56 0 0 1-69.36 18.736l-60.064-34.976a303.728 303.728 0 0 1-95.424 56.432V844.8a50.992 50.992 0 0 1-50.768 51.2h-101.568a50.992 50.992 0 0 1-50.784-51.2v-43.456a303.696 303.696 0 0 1-95.424-56.432l-60.064 34.976a50.544 50.544 0 0 1-69.344-18.736l-50.784-88.688a51.424 51.424 0 0 1 18.592-69.936l59.392-34.624a285.872 285.872 0 0 1 0-111.808l-59.392-34.608a51.424 51.424 0 0 1-18.592-69.936l50.784-88.688a50.544 50.544 0 0 1 69.36-18.736l60.064 34.96a303.696 303.696 0 0 1 95.424-56.432V179.2A50.992 50.992 0 0 1 461.216 128h101.552a50.992 50.992 0 0 1 50.784 51.2v43.456a303.696 303.696 0 0 1 95.424 56.432l60.064-34.96a50.544 50.544 0 0 1 69.36 18.736l50.768 88.688a51.424 51.424 0 0 1-18.576 69.936z m-38.08-66.512l-25.392-44.336a25.28 25.28 0 0 0-34.688-9.376L701.904 342.4a252.976 252.976 0 0 0-139.2-81.184V204.8a25.488 25.488 0 0 0-25.392-25.6h-50.704a25.488 25.488 0 0 0-25.392 25.6v56.336a252.96 252.96 0 0 0-139.2 81.184l-70.544-41.072a25.28 25.28 0 0 0-34.688 9.376l-25.392 44.336a25.712 25.712 0 0 0 9.296 34.976l70.832 41.232a248.928 248.928 0 0 0 0 161.6l-70.816 41.232a25.712 25.712 0 0 0-9.296 34.976l25.392 44.336a25.264 25.264 0 0 0 34.688 9.376l70.608-41.088a252.976 252.976 0 0 0 139.2 81.184V819.2a25.488 25.488 0 0 0 25.392 25.6h50.784a25.488 25.488 0 0 0 25.392-25.6v-56.336a252.976 252.976 0 0 0 139.2-81.184l70.544 41.072a25.264 25.264 0 0 0 34.688-9.376l25.392-44.336a25.712 25.712 0 0 0-9.296-34.976l-70.832-41.232a248.928 248.928 0 0 0 0-161.6l70.832-41.232a25.712 25.712 0 0 0 9.12-35.024zM512 640a128 128 0 1 1 126.944-128A127.472 127.472 0 0 1 512 640z m0-204.8a76.8 76.8 0 1 0 76.16 76.8A76.48 76.48 0 0 0 512 435.2z"  ></path></symbol><symbol id="icon-mingpian" viewBox="0 0 1024 1024"><path d="M428.544 525.824c27.136-21.504 44.544-54.272 44.544-91.648C473.088 369.664 420.864 317.44 356.352 317.44S239.616 369.664 239.616 434.176c0 37.376 17.408 70.144 44.544 91.648-71.68 28.672-122.368 98.816-122.368 180.736H220.16c0-75.264 60.928-136.192 136.192-136.192s136.192 60.928 136.192 136.192h58.368c0-81.92-50.688-152.064-122.368-180.736z m-72.192-33.28c-32.256 0-58.368-26.112-58.368-58.368 0-32.256 26.112-58.368 58.368-58.368S414.72 401.92 414.72 434.176c0 32.256-26.112 58.368-58.368 58.368z m476.672 0h-194.56c-16.384 0-29.184 12.8-29.184 29.184s12.8 29.184 29.184 29.184h194.56c16.384 0 29.184-12.8 29.184-29.184s-13.312-29.184-29.184-29.184z m0-136.192h-194.56c-16.384 0-29.184 12.8-29.184 29.184s12.8 29.184 29.184 29.184h194.56c16.384 0 29.184-12.8 29.184-29.184s-13.312-29.184-29.184-29.184zM920.576 122.88H103.424C60.416 122.88 25.6 157.696 25.6 200.704v622.592c0 43.008 34.816 77.824 77.824 77.824h817.152c43.008 0 77.824-34.816 77.824-77.824V200.704c0-43.008-34.816-77.824-77.824-77.824z m19.456 680.96c0 21.504-17.408 38.912-38.912 38.912H122.88c-21.504 0-38.912-17.408-38.912-38.912V220.16c0-21.504 17.408-38.912 38.912-38.912h778.24c21.504 0 38.912 17.408 38.912 38.912v583.68z m-184.832-175.104h-116.736c-16.384 0-29.184 12.8-29.184 29.184s12.8 29.184 29.184 29.184h116.736c16.384 0 29.184-12.8 29.184-29.184s-12.8-29.184-29.184-29.184z" fill="#333333" ></path></symbol><symbol id="icon-jinggao" viewBox="0 0 1024 1024"><path d="M919.893333 969.386667H104.106667c-37.546667 0-69.973333-18.773333-88.746667-51.2-18.773333-32.426667-18.773333-71.68 0-102.4L423.253333 105.813333c18.773333-32.426667 52.906667-51.2 88.746667-51.2 37.546667 0 69.973333 18.773333 88.746667 51.2l407.893333 708.266667c18.773333 32.426667 18.773333 71.68 0 102.4-17.066667 34.133333-51.2 52.906667-88.746667 52.906667zM452.266667 122.88l-409.6 708.266667c-11.946667 22.186667-11.946667 47.786667 0 68.266666s34.133333 34.133333 59.733333 34.133334h817.493333c25.6 0 47.786667-13.653333 59.733334-34.133334 11.946667-22.186667 11.946667-47.786667 0-68.266666L571.733333 122.88c-11.946667-22.186667-34.133333-34.133333-59.733333-34.133333s-47.786667 13.653333-59.733333 34.133333z" fill="#333333" ></path><path d="M512 626.346667c-10.24 0-17.066667-6.826667-17.066667-17.066667v-273.066667c0-10.24 6.826667-17.066667 17.066667-17.066666s17.066667 6.826667 17.066667 17.066666v273.066667c0 10.24-6.826667 17.066667-17.066667 17.066667z" fill="#333333" ></path><path d="M512 738.986667m-32.426667 0a32.426667 32.426667 0 1 0 64.853334 0 32.426667 32.426667 0 1 0-64.853334 0Z" fill="#333333" ></path></symbol><symbol id="icon-yincang1" viewBox="0 0 1024 1024"><path d="M927.4 512.9c0 0.4 0 0.7-0.1 1v0.5c0 0.3-0.1 0.5-0.1 0.8 0 0.3-0.1 0.6-0.1 0.9v0.1c-1 6.6-4 12.7-8.7 17.5-8.7 10.6-18.2 20.5-27.8 30.2-51.7 52.5-111.1 99.3-176 133.3-41.5 21.7-85.9 39.2-131.9 47.6-50.6 9.3-101.3 8.8-151.6-2.2-39.9-8.7-78-23.5-114.4-42.2l1.2-1.2 103.8-68.3c25.6 18.4 56.8 29.4 90.8 29.4 86 0 155.6-69.7 155.6-155.6 0-11.5-1.3-22.6-3.7-33.4l137.2-90.2c9.1 6.8 18.1 13.8 26.8 21 32 26.1 63.5 54.7 90 86.8 4.6 4.7 7.7 10.9 8.7 17.5v0.1c0 0.3 0.1 0.6 0.1 0.9 0 0.2 0.1 0.5 0.1 0.8v0.5c0 0.3 0.1 0.7 0.1 1 0 0.5 0.1 1 0.1 1.6 0 0.6 0 1.1-0.1 1.6z m-415 69.8c-5.1 0-10.1-0.5-14.9-1.5l90.9-59.8c-7.5 35-38.7 61.3-76 61.3z m341.4-275.5L179.6 748l-0.2 0.2c-3.1 2-6.7 3.2-10.6 3.2-10.7 0-19.5-8.7-19.5-19.5 0-6.8 3.5-12.8 8.8-16.3l674.2-440.8 0.2-0.2c3.1-2 6.7-3.2 10.6-3.2 10.7 0 19.5 8.7 19.5 19.5 0 6.8-3.5 12.8-8.8 16.3zM512.4 427c7.4 0 14.6 1.1 21.4 3l-98.6 65.8c4.4-38.7 37.3-68.8 77.2-68.8z m94.5-45.6c-26.2-20.1-58.9-32.1-94.5-32.1-86 0-155.6 69.7-155.6 155.6 0 13.7 2 27 5.3 39.7l-135 90-7.1 4.7c-8.1-6.1-16.1-12.4-23.9-18.8-32-26.1-63.5-54.7-90-86.8-11.6-14.1-11.6-30.7 0-44.7 8.7-10.6 18.2-20.5 27.8-30.2 51.7-52.5 111.1-99.4 176-133.3 41.5-21.7 85.9-39.2 131.9-47.6 50.6-9.3 101.2-8.8 151.6 2.1 37.5 8.2 73.4 21.8 107.8 38.9l-7.2 4.5-87.1 58z"  ></path></symbol><symbol id="icon-laba" viewBox="0 0 1024 1024"><path d="M858.584615 309.825641c-5.251282-5.251282-10.502564-10.502564-15.753846-13.128205-5.251282-5.251282-10.502564-10.502564-18.379487-13.128205v10.502564c-21.005128 0-39.384615 18.379487-39.384615 39.384615v2.625641c0 21.005128 18.379487 39.384615 39.384615 39.384616v18.379487c26.25641 34.133333 39.384615 73.517949 39.384615 118.153846s-15.753846 86.646154-39.384615 118.153846v15.753846c-21.005128 0-39.384615 18.379487-39.384615 39.384616v2.625641c0 21.005128 18.379487 39.384615 39.384615 39.384615v10.502564c7.876923-5.251282 13.128205-10.502564 21.005128-15.753846 5.251282-2.625641 10.502564-7.876923 13.128205-10.502564 52.512821-49.887179 86.646154-120.779487 86.646154-202.174359 0-78.769231-34.133333-149.661538-86.646154-199.548718z m-189.046153-191.671795h-7.876924c-7.876923 0-13.128205 2.625641-21.005128 7.876923l-330.830769 149.661539H157.538462c-44.635897 0-78.769231 34.133333-78.769231 78.76923v317.702565c2.625641 42.010256 36.758974 76.14359 78.769231 76.143589h39.384615c21.005128 0 39.384615-18.379487 39.384615-39.384615s-15.753846-36.758974-34.133333-39.384615H236.307692c-65.641026 0-78.769231-13.128205-78.76923-78.769231v2.625641-170.666667 7.876923c0-60.389744 10.502564-76.14359 65.641025-78.769231H315.076923c5.251282 0 10.502564-2.625641 15.753846-5.251282 2.625641 0 7.876923-2.625641 10.502564-5.251282l288.820513-131.282051v593.394872L375.466667 682.666667c-18.379487-13.128205-42.010256-7.876923-55.138462 7.876923-13.128205 18.379487-7.876923 42.010256 7.876923 55.138461L638.030769 892.717949c7.876923 5.251282 18.379487 7.876923 26.25641 7.876923h2.625642c21.005128 0 39.384615-18.379487 39.384615-39.384616L708.923077 157.538462c0-23.630769-18.379487-39.384615-39.384615-39.384616z m-506.748718 551.384616H157.538462h5.251282z m-5.251282-315.076924h21.005128H157.538462z"  ></path></symbol><symbol id="icon-kehuliuyan" viewBox="0 0 1024 1024"><path d="M878.592 73.216H145.408C65.536 73.216 0 138.24 0 218.112v440.832c0 79.872 65.536 145.408 145.408 145.408h1.024v146.432l244.224-146.432h488.448c79.872 0 145.408-65.536 145.408-145.408V218.112c-0.512-79.872-66.048-144.896-145.92-144.896zM219.648 512c-40.448 0-73.216-32.768-73.216-73.216S179.2 365.568 219.648 365.568s73.216 32.768 73.216 73.216S260.096 512 219.648 512z m292.352 0c-40.448 0-73.216-32.768-73.216-73.216s32.768-73.216 73.216-73.216 73.216 32.768 73.216 73.216S552.448 512 512 512z m292.864 0c-40.448 0-73.216-32.768-73.216-73.216s32.768-73.216 73.216-73.216 73.216 32.768 73.216 73.216-32.768 73.216-73.216 73.216z"  ></path></symbol><symbol id="icon-cuban2shangchuanyunduan" viewBox="0 0 1024 1024"><path d="M787.842844 793.053867c-4.3008 1.956978-8.988444 3.185778-14.017422 3.185778l-18.978133 0c-1.319822 0.022756-2.594133 0.2048-3.913956 0.2048-1.251556 0-2.4576-0.182044-3.731911-0.2048L648.533333 796.239644l0-68.266667 113.777778-0.955733 0 0c76.276622-5.893689 136.533333-68.949333 136.533333-146.750578 0-77.778489-60.256711-140.834133-136.533333-146.750578l0-1.160533-68.266667 0c0-113.117867-91.682133-204.8-204.8-204.8s-204.8 91.682133-204.8 204.8c0 7.736889 0.682667 15.268978 1.547378 22.755556L261.688889 455.111111l0 0 0 0c-75.389156 0-136.533333 61.144178-136.533333 136.533333 0 74.752 60.120178 135.281778 134.621867 136.328533L352.711111 727.972978l0 68.266667-87.404089 0c-1.206044 0.022756-2.389333 0.2048-3.618133 0.2048-1.319822 0-2.594133-0.182044-3.913956-0.2048l-7.350044 0c-0.864711 0-1.592889-0.432356-2.434844-0.477867C141.289244 788.662044 56.888889 700.120178 56.888889 591.621689c0-98.668089 69.791289-181.020444 162.724978-200.430933C239.479467 259.959467 352.4608 159.266133 489.244444 159.266133c127.226311 0 233.836089 87.153778 264.146489 204.936533 118.237867 1.342578 213.720178 97.4848 213.720178 216.041244C967.111111 687.012978 889.605689 775.509333 787.842844 793.053867zM338.3296 602.999467l138.148978-138.126222c13.334756-13.334756 34.929778-13.357511 48.264533 0l138.148978 138.126222c13.334756 13.334756 13.334756 34.952533 0 48.287289-13.334756 13.312-34.952533 13.312-48.264533-0.022756L534.755556 571.392 534.755556 830.577778c0 18.864356-15.268978 34.156089-34.133333 34.156089-18.8416 0-34.133333-15.291733-34.133333-34.156089L466.488889 571.392l-79.872 79.894756c-13.312 13.334756-34.952533 13.312-48.287289-0.022756S325.0176 616.334222 338.3296 602.999467z"  ></path></symbol><symbol id="icon-yincang" viewBox="0 0 1024 1024"><path d="M921.336 355.126c-26.714 43.135-61.03 80.714-100.382 112.396 0.44 0.86 1.053 1.58 1.405 2.493l50.305 129.37c5.282 13.628-1.282 29.136-14.657 34.56a25.276 25.276 0 0 1-9.6 1.868c-10.76 0-20.274-6.6-24.24-16.815l-46.69-120.084c-37.474 23.722-78.353 42.59-121.603 55.579l24.942 123.252c1.404 6.95 0.07 14.05-3.756 19.983-3.826 5.941-9.689 9.997-16.534 11.445a25.227 25.227 0 0 1-5.3 0.552c-12.287 0-23.012-8.933-25.504-21.248l-24.556-121.425a501.976 501.976 0 0 1-93.15 8.722c-33.946 0-67.365-3.598-99.873-10.207l-20.886 122.111c-2.23 12.77-13.025 22.046-25.68 22.046-1.44 0-2.931-0.123-4.563-0.386-6.829-1.22-12.813-5.099-16.815-10.917-4.02-5.82-5.565-12.885-4.37-19.888l21.553-125.98c-45.39-14.333-87.955-35.333-126.675-61.512L196.883 596.74c-3.721 10.479-13.551 17.509-24.486 17.509-3.072 0-6.073-0.545-8.917-1.624-6.565-2.44-11.795-7.328-14.727-13.779-2.949-6.442-3.23-13.656-0.842-20.334l43.213-120.751c-34.35-29.619-64.469-63.89-88.463-102.637-3.74-6.003-4.95-13.129-3.406-20.071 1.527-6.933 5.617-12.849 11.514-16.63 4.178-2.72 8.987-4.152 13.902-4.152 9.021 0 17.271 4.652 22.063 12.428 74.826 120.794 214.787 195.83 365.28 195.83 150.476 0 290.42-75.036 365.245-195.821 4.793-7.784 13.042-12.436 22.047-12.436a25.4 25.4 0 0 1 13.901 4.143c5.915 3.79 10.004 9.698 11.532 16.639 1.546 6.934 0.335 14.07-3.403 20.072z" fill="" ></path></symbol><symbol id="icon-xianshi" viewBox="0 0 1024 1024"><path d="M512 236.8C332.8 236.8 64 384 64 518.4c0 89.6 268.8 262.4 448 262.4s448-185.6 448-262.4c0-83.2-249.6-281.6-448-281.6z m0 486.4c-179.2 0-377.6-166.4-384-198.4 0-76.8 211.2-217.6 384-217.6 179.2 0 371.2 172.8 384 217.6-25.6 44.8-230.4 198.4-384 198.4z m0-371.2c-89.6 0-166.4 70.4-166.4 160S416 678.4 512 678.4c89.6 0 166.4-70.4 166.4-166.4 0-89.6-76.8-160-166.4-160z"  ></path></symbol><symbol id="icon-renzhengxinxi" viewBox="0 0 1024 1024"><path d="M485.648423 1024c-144.376948 0-412.841368-220.864564-412.841368-429.728646L72.807056 178.182433l41.04289-0.68044c0.866014 0 92.50888-1.948532 187.059079-40.331521 96.962668-39.403649 159.532198-84.652894 160.11985-85.054972l24.495832-17.846079 24.712335 17.846079c0.587653 0.433007 63.126253 45.651323 160.11985 85.054972 94.550199 38.382989 186.193065 40.331521 187.151867 40.331521l40.857315 0.68044 0.185574 416.057992C898.582578 803.104506 630.118159 1024 485.648423 1024L485.648423 1024M156.160928 257.948532l0 336.291893c0 161.511659 233.854778 346.374773 329.487495 346.374773 95.632717 0 329.487495-184.863115 329.487495-346.374773L815.135919 257.948532c-40.857315-4.422859-107.200193-15.588257-176.079256-43.548145-70.611091-28.702187-124.242117-59.909629-153.40824-78.498007-29.104265 18.588377-82.76622 49.79582-153.315452 78.498007C263.361121 242.391205 197.018243 253.525674 156.160928 257.948532L156.160928 257.948532M463.56506 750.586928 288.28996 601.261327l53.909387-63.404615 112.458137 95.725504 213.441585-245.886191 63.033466 54.682614L463.56506 750.586928 463.56506 750.586928M463.56506 750.586928 463.56506 750.586928z"  ></path></symbol><symbol id="icon-jibenxinxi" viewBox="0 0 1024 1024"><path d="M816.872727 635.345455c27.927273 0 32.581818-6.981818 32.581818-32.581819 0-13.963636-11.636364-27.927273-23.272727-34.909091l-2.327273-2.327272c-37.236364-27.927273-76.8-53.527273-121.018181-69.818182 58.181818-46.545455 93.090909-116.363636 93.090909-193.163636 0-139.636364-118.690909-256-267.636364-256S265.309091 160.581818 265.309091 302.545455c0 76.8 37.236364 146.618182 93.090909 193.163636C176.872727 560.872727 46.545455 730.763636 46.545455 926.254545c0 25.6 11.636364 44.218182 39.563636 44.218182s27.927273-18.618182 27.927273-44.218182c0-204.8 128-397.963636 418.909091-393.30909 88.436364 2.327273 190.836364 32.581818 253.672727 83.781818 16.290909 13.963636 20.945455 13.963636 27.927273 16.290909l2.327272 2.327273m-283.927272-148.945455c-137.309091 0-204.8-95.418182-204.8-183.854545 0-88.436364 76.8-193.163636 204.8-193.163637 148.945455 0 204.8 104.727273 204.8 195.490909 0 86.109091-88.436364 183.854545-204.8 181.527273m88.436363 269.963636c0 25.6 20.945455 37.236364 48.872727 37.236364h258.327273c27.927273 0 48.872727-11.636364 48.872727-37.236364s-20.945455-34.909091-48.872727-34.909091H670.254545c-27.927273 0-48.872727 9.309091-48.872727 34.909091M928.581818 907.636364H670.254545c-27.927273 0-48.872727 9.309091-48.872727 34.909091s20.945455 34.909091 48.872727 34.90909h258.327273c27.927273 0 48.872727-9.309091 48.872727-34.90909s-20.945455-34.909091-48.872727-34.909091"  ></path></symbol><symbol id="icon-anquanshezhi" viewBox="0 0 1024 1024"><path d="M513.3 701.4c-108.3 0-196.3-88-196.3-196.3 0-108.3 88-196.3 196.3-196.3s196.3 88 196.3 196.3c0 108.3-88 196.3-196.3 196.3z m0-314.8c-64.3 0-118.5 54.2-118.5 118.5S449 623.6 513.3 623.6s118.5-54.2 118.5-118.5c-0.1-64.3-54.2-118.5-118.5-118.5z m0 0"  ></path><path d="M367.7 985.7c-10.2 0-20.3-3.4-30.5-6.8-50.8-20.3-98.1-47.4-142.1-81.2-30.5-27.1-40.6-71.1-23.7-108.3 10.2-27.1 10.2-57.5-3.4-81.2-13.5-23.7-40.6-40.6-67.7-44-44-3.4-74.5-33.8-81.2-74.5C9 562.6 5.6 532.2 5.6 505.1c0-27.1 3.4-54.2 6.8-81.2 6.8-40.6 40.6-71.1 81.2-74.5 30.5-3.4 54.2-20.3 67.7-44s16.9-54.2 3.4-81.2c-16.9-40.6-6.8-84.6 27.1-111.7 44-33.8 91.4-60.9 142.1-81.2 37.2-13.5 81.2 0 108.3 33.8 16.9 23.7 44 37.2 71.1 37.2 30.5 0 57.5-13.5 74.5-37.2 23.7-33.8 67.7-47.4 104.9-33.8 50.8 20.3 98.1 47.4 142.1 81.2 30.5 27.1 40.6 71.1 23.7 108.3-10.2 27.1-10.2 57.5 3.4 81.2 13.5 23.7 40.6 40.6 67.7 44 44 3.4 74.5 33.8 81.2 74.5 3.4 27.1 6.8 57.5 6.8 84.6 0 27.1-3.4 54.2-6.8 81.2-6.8 40.6-40.6 71.1-81.2 74.5-30.5 3.4-54.1 20.3-67.7 44-13.5 23.7-16.9 54.2-3.4 81.2 16.9 37.2 6.8 84.6-23.7 108.3-40.6 33.8-91.4 60.9-142.1 81.2-37.2 13.5-81.2 0-108.3-33.8-16.9-23.7-44-37.2-71.1-37.2-30.5 0-57.5 13.5-74.5 37.2-13.5 30.4-44 44-71.1 44z m-3.3-883.4H361c-44 20.3-84.6 40.6-121.8 71.1-3.4 3.4-3.4 13.5 0 16.9 23.7 50.8 20.3 108.3-6.8 152.3-27.1 47.4-74.5 77.8-128.6 84.6-6.8 0-13.5 3.4-13.5 10.2-3.4 23.7-6.8 44-6.8 67.7 0 23.7 3.4 47.4 6.8 71.1 0 6.8 6.8 10.2 13.5 10.2 54.2 6.8 101.5 37.2 128.6 84.6 27.1 47.4 30.5 101.5 6.8 152.3-3.4 6.8-3.4 13.5 3.4 16.9 37.2 30.5 77.8 50.8 121.8 67.7 6.8 3.4 13.5-3.4 16.9-6.8 30.5-44 81.2-71.1 135.4-71.1s104.9 23.7 135.4 67.7c3.4 3.4 10.2 10.2 16.9 6.8 44-16.9 84.6-40.6 118.4-71.1 3.4-3.4 3.4-10.2 3.4-16.9-23.7-50.8-20.3-108.3 6.8-152.3 27.1-47.4 74.5-77.8 128.6-84.6 6.8 0 13.5-3.4 13.5-10.2 3.4-23.7 6.8-44 6.8-67.7 0-23.7-3.4-47.4-6.8-71.1 0-6.8-6.8-10.2-13.5-10.2-54.2-6.8-101.5-37.2-128.6-84.6-27.1-47.4-30.5-101.5-6.8-152.3 3.4-6.8 3.4-13.5-3.4-16.9-37.2-30.5-77.8-50.8-121.8-67.7-6.8-3.4-13.5 3.4-16.9 6.8-30.5 44-81.2 71.1-135.4 71.1s-104.9-23.7-135.4-67.7c-6.8-3.4-10.2-6.8-13.5-6.8z m0 0"  ></path></symbol><symbol id="icon-moban" viewBox="0 0 1093 1024"><path d="M172.872 363.733h740.079l-49.439 49.438V169.19l49.439 49.439H172.872l49.439-49.439v243.982l-49.439-49.438z m0 49.438V169.19h740.079v243.982H172.872zM894.774 517.507h24.72v-49.439H474.547v49.439h24.72zM894.774 625.371h24.72v-49.438H474.547v49.438h24.72zM894.774 733.236h24.72v-49.439H474.547v49.439h24.72zM894.774 841.1h24.72v-49.438H474.547v49.439h24.72zM172.872 802.9h246.693l-49.438 49.44V461.967l49.438 49.438H172.872l49.439-49.438v390.371l-49.439-49.438z m0 49.439V461.967h246.693v390.372H172.872z"  ></path></symbol><symbol id="icon-xiazai1" viewBox="0 0 1024 1024"><path d="M896 604.8l-384 353.28-384-353.28h256V129.92h256v474.88z"  ></path></symbol><symbol id="icon-edit" viewBox="0 0 1024 1024"><path d="M688.814 176.789l158.39 158.39-448.018 448.019-158.39-158.39zM192 832V673.6L350.4 832zM895.2 287.2L736.8 128.8 783.6 82c24-24 63.3-24 87.4 0l71 71c24 24 24 63.3 0 87.4l-46.8 46.8zM128 896h768v64H128zM64 768h64v192H64z" fill="" ></path><path d="M895.3 768h64v192h-64z" fill="" ></path></symbol><symbol id="icon-tianjiachengyuan" viewBox="0 0 1024 1024"><path d="M543.744 935.936h-422.4c-7.68 0-15.36-1.536-22.016-5.12-9.728-4.608-13.824-14.336-13.824-25.088v-93.696c0-3.072 1.024-6.144 2.048-8.704 54.784-128.512 148.992-213.504 284.16-251.904 4.608-1.024 9.728-1.024 14.336 0.512 61.952 21.504 123.392 21.504 184.832-0.512 3.584-1.024 8.192-1.536 11.264-0.512 19.968 5.632 39.424 11.264 73.728 25.6 0 0 55.808-36.352 52.736-39.424-25.6-24.064-58.368-28.672-60.416-29.696 3.072-2.56 5.12-4.608 7.68-7.168 54.784-49.664 86.016-111.104 92.672-184.832 11.776-131.072-71.68-252.928-198.656-288.768-15.36-4.096-30.72-5.632-46.592-8.704-2.048-0.512-4.096-1.024-5.632-1.536h-39.424c-14.336 2.56-28.672 3.584-43.008 7.68-109.056 29.696-178.176 100.352-202.24 210.432-21.504 97.792 6.144 183.296 75.776 255.488 5.632 6.144 12.288 11.264 18.432 16.896-12.8 5.632-25.6 10.752-37.888 16.896-114.176 56.832-193.536 145.408-240.64 263.68-1.024 2.048-2.048 4.608-3.072 6.656v122.368c1.024 4.608 2.048 9.216 3.584 13.824 11.264 35.328 34.816 57.344 71.68 65.024 1.024 0 2.048 1.024 3.072 1.536 158.72 3.072 363.52 1.536 440.32 1.536l-0.512-62.464zM266.24 292.352c-0.512-117.248 94.208-213.504 210.944-214.016 116.736-0.512 211.456 95.744 211.456 214.016 0 118.272-94.72 214.528-210.944 215.04-116.736 0-210.944-96.256-211.456-215.04z" fill="" ></path><path d="M736.768 742.4v-195.584h60.928v195.584h198.144v61.952h-198.144v196.608h-60.928v-196.608h-198.144v-61.952h198.144z" fill="" ></path></symbol><symbol id="icon-tishi1" viewBox="0 0 1024 1024"><path d="M922.42944 338.61632c-22.44096-53.0432-54.54848-100.67456-95.4624-141.58336-40.89856-40.89856-88.54016-73.02656-141.57824-95.4624C630.47168 78.34112 572.12928 66.56 512 66.56c-60.11904 0-118.4512 11.78112-173.37856 35.01056-53.03296 22.43584-100.67968 54.55872-141.58336 95.45728-40.9088 40.9088-73.02656 88.54528-95.4624 141.58336C78.35136 393.53344 66.56 451.87584 66.56 512s11.79136 118.46144 35.01568 173.37856c22.43584 53.0432 54.5536 100.67968 95.46752 141.58336 40.89856 40.90368 88.53504 73.02656 141.57824 95.4624C393.53856 945.65376 451.87584 957.44 512 957.44c60.1344 0 118.46144-11.78624 173.39392-35.01568 53.03808-22.43584 100.67968-54.5536 141.57824-95.4624 40.9088-40.90368 73.02144-88.54016 95.4624-141.58336C945.65888 630.46144 957.44 572.12416 957.44 512s-11.78112-118.46656-35.01056-173.38368z m-57.10848 322.63168c-19.30752 45.65504-46.97088 86.66624-82.18112 121.88672a382.43328 382.43328 0 0 1-121.8816 82.18112c-47.26784 19.98848-97.48992 30.12608-149.26336 30.12608-51.76832 0-101.98016-10.13248-149.248-30.12608-45.66016-19.31264-86.66112-46.96064-121.87648-82.18112a382.3104 382.3104 0 0 1-82.18112-121.88672c-19.9936-47.26784-30.1312-97.47968-30.1312-149.248s10.13248-101.98528 30.1312-149.248a382.17216 382.17216 0 0 1 82.18112-121.88672 382.26944 382.26944 0 0 1 121.87648-82.18112c47.26784-19.98848 97.47968-30.1312 149.248-30.1312 51.77344 0 101.98016 10.1376 149.25312 30.1312 45.66016 19.31264 86.66112 46.96064 121.8816 82.18112a382.17216 382.17216 0 0 1 82.18112 121.88672c19.99872 47.26272 30.1312 97.47968 30.1312 149.248s-10.13248 101.98016-30.12096 149.248z" fill="#333333" ></path><path d="M549.77024 580.46976c-2.56 27.95008-20.33152 41.0112-37.87264 41.0112-13.0304 0 0 0 0 0-16.66048-3.13856-29.59872-10.24512-35.28192-38.51264l-22.92224-264.25856c0-26.56256 32.29184-50.06848 59.68896-50.06848 27.40224 0 56.91392 24.58112 56.91392 51.0976l-20.52608 260.73088zM512 656.0512c-27.40224 0-49.6384 22.21056-49.6384 49.6384 0 27.43296 22.21056 49.67424 49.6384 49.67424 27.42272 0 49.64352-22.24128 49.64352-49.67424-0.00512-27.392-22.22592-49.6384-49.64352-49.6384z" fill="#333333" ></path></symbol><symbol id="icon-biaoqian" viewBox="0 0 1024 1024"><path d="M1024 778.752l0-534.2208-1024 0 117.76 278.528-117.76 255.6928z"  ></path></symbol><symbol id="icon-sandian" viewBox="0 0 1024 1024"><path d="M510.9248 913.6128m-110.3872 0a110.3872 110.3872 0 1 0 220.7744 0 110.3872 110.3872 0 1 0-220.7744 0Z"  ></path><path d="M510.9248 505.1392m-110.3872 0a110.3872 110.3872 0 1 0 220.7744 0 110.3872 110.3872 0 1 0-220.7744 0Z"  ></path><path d="M510.9248 110.3872m-110.3872 0a110.3872 110.3872 0 1 0 220.7744 0 110.3872 110.3872 0 1 0-220.7744 0Z"  ></path></symbol><symbol id="icon-fuzhi" viewBox="0 0 1024 1024"><path d="M715.436342 780.14204c-21.404496 0-38.724976 17.3389-38.724976 38.724976l0 30.31033c0 18.379603-14.938224 33.335223-33.316803 33.335223L176.316681 882.512568c-18.379603 0-33.354666-14.956643-33.354666-33.335223L142.962016 382.098441c0-18.379603 14.976086-33.316803 33.354666-33.316803l26.888394 0c21.404496 0 38.724976-17.3389 38.724976-38.724976s-17.320481-38.724976-38.724976-38.724976l-26.888394 0c-61.112869 0-110.803595 49.691749-110.803595 110.765733l0 467.078905c0 61.093427 49.691749 110.785176 110.803595 110.785176l467.078905 0c61.075007 0 110.765733-49.691749 110.765733-110.785176l0-30.31033C754.161319 797.48094 736.840838 780.14204 715.436342 780.14204z"  ></path><path d="M842.313008 64.037479 386.012587 64.037479c-64.062038 0-116.173906 52.111868-116.173906 116.173906l0 456.282001c0 64.062038 52.111868 116.173906 116.173906 116.173906l456.30042 0c64.062038 0 116.173906-52.111868 116.173906-116.173906l0-456.282001C958.486914 116.149347 906.375046 64.037479 842.313008 64.037479zM881.037984 636.493385c0 21.348214-17.358343 38.724976-38.724976 38.724976L386.012587 675.218362c-21.366633 0-38.724976-17.376763-38.724976-38.724976l0-456.282001c0-21.348214 17.358343-38.724976 38.724976-38.724976l456.30042 0c21.366633 0 38.724976 17.376763 38.724976 38.724976L881.037984 636.493385z"  ></path></symbol><symbol id="icon-zhangjie1" viewBox="0 0 1024 1024"><path d="M336.034909 233.029818l606.021818 0c19.572364 0 35.397818-22.202182 35.397818-47.918545s-15.848727-45.730909-35.397818-45.730909l-606.021818 0c-19.572364 0-35.397818 20.014545-35.397818 45.730909S316.462545 233.029818 336.034909 233.029818zM942.056727 488.029091l-606.021818 0c-19.572364 0-35.397818 23.226182-35.397818 45.963636 0 22.760727 15.825455 47.778909 35.397818 47.778909l606.021818 0c19.572364 0 35.397818-25.018182 35.397818-47.778909C977.454545 511.255273 961.605818 488.029091 942.056727 488.029091zM942.056727 813.870545l-606.021818 0c-19.572364 0-35.397818 20.852364-35.397818 43.566545s15.825455 50.385455 35.397818 50.385455l606.021818 0c19.572364 0 35.397818-27.671273 35.397818-50.385455S961.605818 813.870545 942.056727 813.870545zM105.984 139.776c-25.995636 0-47.057455 21.085091-47.057455 47.057455 0 25.995636 21.085091 47.057455 47.057455 47.057455 25.995636 0 47.057455-21.061818 47.057455-47.057455C153.064727 160.861091 131.979636 139.776 105.984 139.776zM105.984 488.866909c-25.995636 0-47.057455 21.085091-47.057455 47.057455 0 25.995636 21.085091 47.057455 47.057455 47.057455 25.995636 0 47.057455-21.061818 47.057455-47.057455C153.064727 509.952 131.979636 488.866909 105.984 488.866909zM105.984 814.685091c-25.995636 0-47.057455 21.085091-47.057455 47.057455 0 25.995636 21.085091 47.057455 47.057455 47.057455 25.995636 0 47.057455-21.061818 47.057455-47.057455C153.064727 835.770182 131.979636 814.685091 105.984 814.685091z"  ></path></symbol><symbol id="icon-tianjiadaohang" viewBox="0 0 1024 1024"><path d="M448 0h128v1024H448V0zM0 448h1024v128H0V448z" fill="#666666" ></path></symbol><symbol id="icon-shangchuantupian1" viewBox="0 0 1098 1024"><path d="M1020.0064 0H78.475636C35.309382 0 0 35.607273 0 79.127273v791.272727c0 43.52 35.309382 79.127273 78.466327 79.127273H745.378909v-79.127273H117.694836c-23.542691 0-39.228509-19.781818-39.228509-39.563636v-712.145455c0-19.781818 15.685818-39.563636 39.228509-39.563636h863.083055c23.542691 0 39.228509 19.781818 39.228509 39.563636V633.018182H1098.472727V79.127273c0-43.52-35.309382-79.127273-78.466327-79.127273z m-84.126255 618.607709c-7.838255-7.875491-15.6672-11.803927-27.424581-11.803927-11.748073 0-19.586327 3.928436-27.415273 11.803927L771.351273 728.808727c-15.676509 15.750982-15.676509 39.358836 0 55.109818 15.6672 15.732364 39.172655 15.732364 54.839854 0l43.101091-43.296581v244.0192c0 19.679418 15.657891 39.358836 39.163346 39.358836s39.172655-15.741673 39.172654-39.358836V740.621964l47.010909 47.225018c15.6672 15.741673 39.172655 15.741673 54.849164 0 15.6672-15.732364 15.6672-39.358836 0-55.100509l-113.608146-114.138764z m-513.182254-295.191273c19.586327-43.287273 7.838255-94.459345-23.505455-129.880436-35.253527-35.421091-90.093382-43.287273-133.185163-27.554909C222.906182 185.679127 195.490909 232.904145 195.490909 280.138473c0 62.966691 50.920727 114.129455 113.608146 114.129454 47.010909 0 94.021818-27.5456 113.598836-70.842182z m-148.852364-43.287272c0-11.813236 3.909818-19.679418 11.748073-27.554909 3.909818-11.803927 15.6672-15.741673 27.415273-15.741673 19.595636 0 39.181964 15.741673 39.181963 35.421091s-15.676509 39.358836-35.262836 43.287272c-23.505455 0-43.091782-15.732364-43.091782-35.411781zM142.689745 760.906473c15.7696 15.6672 39.433309 15.6672 55.20291 0l165.590109-164.463709L501.480727 733.500509c3.947055 3.909818 3.947055 3.909818 7.894109 3.909818 15.7696 7.838255 31.5392 7.838255 47.3088-3.909818l390.330182-387.658473c15.7696-15.6672 15.7696-39.163345 0-54.830545-15.778909-15.657891-39.433309-15.657891-55.202909 0l-362.728727 360.261818-137.988655-140.976873-3.947054-3.909818c-15.7696-11.748073-35.486255-11.748073-51.255855 3.909818L138.761309 706.094545c-11.822545 15.6672-11.822545 39.163345 3.937746 54.830546z"  ></path></symbol><symbol id="icon-pdf" viewBox="0 0 1024 1024"><path d="M905.185809 178.844158C898.576738 172.685485 891.19337 165.824412 883.21687 158.436127 860.422682 137.322863 837.434925 116.207791 815.697647 96.487895 813.243072 94.261877 813.243072 94.261877 810.786411 92.037081 781.783552 65.781062 757.590948 44.376502 739.713617 29.293612 729.254178 20.469111 721.020606 13.860686 714.970549 9.501727 710.955023 6.608611 707.690543 4.524745 704.47155 2.998714 700.417679 1.07689 696.638044-0.094029 691.307277 0.005928 677.045677 0.273349 665.6 11.769337 665.6 26.182727L665.6 77.352844 665.6 128.522961 665.6 230.863194 665.6 256.448252 691.2 256.448252 896 256.448252 870.4 230.863194 870.4 998.414942 896 972.829884 230.381436 972.829884C187.90385 972.829884 153.6 938.623723 153.6 896.20663L153.6 26.182727 128 51.767786 588.8 51.767786C602.93849 51.767786 614.4 40.312965 614.4 26.182727 614.4 12.05249 602.93849 0.597669 588.8 0.597669L128 0.597669 102.4 0.597669 102.4 26.182727 102.4 896.20663C102.4 966.91021 159.652833 1024 230.381436 1024L896 1024 921.6 1024 921.6 998.414942 921.6 230.863194 921.6 205.278135 896 205.278135 691.2 205.278135 716.8 230.863194 716.8 128.522961 716.8 77.352844 716.8 26.182727C716.8 39.813762 705.748075 50.91427 692.267725 51.167041 687.705707 51.252584 685.069822 50.435995 682.52845 49.231204 682.259458 49.103682 683.344977 49.796618 685.029451 51.010252 689.779394 54.432502 697.145822 60.34494 706.686383 68.394196 724.009052 83.009121 747.816448 104.072869 776.413589 129.961594 778.850014 132.168064 778.850014 132.168064 781.285216 134.376514 802.876774 153.964212 825.739479 174.96442 848.413564 195.966437 856.350957 203.3185 863.697005 210.144893 870.269888 216.269843 874.209847 219.941299 877.019309 222.565641 878.499674 223.951409 888.81866 233.610931 905.019017 233.081212 914.684179 222.768247 924.349344 212.455283 923.819315 196.264383 913.500326 186.604861 911.981323 185.182945 909.155025 182.542876 905.185809 178.844158ZM102.4 461.128719 0 461.128719 0 896.074709 512 896.074709 1024 896.074709 1024 461.128719 153.6 461.128719 153.6 460.531049 102.4 460.531049 102.4 461.128719ZM208.2 711 208.2 819.2 157.6 819.2 157.6 528 269 528C301.533495 528 327.366571 536.466581 346.5 553.4 365.633429 570.333419 375.2 592.733195 375.2 620.6 375.2 649.133476 365.833427 671.333254 347.1 687.2 328.366573 703.066746 302.133502 711 268.4 711L208.2 711ZM208.2 670.4 269 670.4C287.00009 670.4 300.733286 666.166709 310.2 657.7 319.666714 649.233291 324.4 637.000079 324.4 621 324.4 605.266588 319.600047 592.700047 310 583.3 300.399951 573.899953 287.200083 569.066669 270.4 568.8L208.2 568.8 208.2 670.4ZM419.4 819.2 419.4 528 505.4 528C531.133461 528 553.966566 533.733276 573.9 545.2 593.833434 556.666724 609.266611 572.933229 620.2 594 631.133389 615.066771 636.6 639.199863 636.6 666.4L636.6 681C636.6 708.600139 631.100055 732.866562 620.1 753.8 609.099945 774.733438 593.433436 790.866609 573.1 802.2 552.766564 813.533391 529.466799 819.2 503.2 819.2L419.4 819.2ZM470 568.8 470 778.8 503 778.8C529.533466 778.8 549.89993 770.500083 564.1 753.9 578.30007 737.299917 585.533331 713.466822 585.8 682.4L585.8 666.2C585.8 634.599842 578.933402 610.46675 565.2 593.8 551.466598 577.13325 531.533463 568.8 505.4 568.8L470 568.8ZM854.8 695.8 737.6 695.8 737.6 819.2 687 819.2 687 528 872 528 872 568.8 737.6 568.8 737.6 655.4 854.8 655.4 854.8 695.8Z"  ></path></symbol><symbol id="icon-shezhi1" viewBox="0 0 1024 1024"><path d="M927.744 429.056c-5.12-26.112-20.992-43.008-40.448-43.008h-4.096c-57.344 0-103.936-46.592-103.936-103.936 0-18.432 9.216-39.424 9.216-39.424 10.24-23.04 2.56-51.2-18.432-66.048l-1.536-1.024L663.552 117.76l-1.536-0.512c-6.656-3.072-14.336-4.608-22.528-4.608-16.384 0-32.256 6.656-43.008 17.408-11.264 11.776-51.2 46.08-81.92 46.08s-70.656-34.816-82.432-46.592c-10.752-11.264-26.624-17.92-43.008-17.92-7.68 0-14.848 1.536-22.016 4.096l-1.536 0.512-108.032 59.904-1.536 1.024c-20.48 14.336-28.672 42.496-18.432 65.536 0 0 9.216 20.992 9.216 39.424 0 57.344-46.592 103.936-103.936 103.936h-4.096c-19.968 0-35.84 16.896-40.448 43.008-0.512 2.048-8.704 47.616-8.704 82.944s8.704 80.896 8.704 82.944c5.12 26.112 20.992 43.008 40.448 43.008h4.608c57.344 0 103.936 46.592 103.936 103.936 0 18.432-8.704 39.424-9.216 39.424-10.24 23.04-2.56 51.2 18.432 66.048l1.024 1.024L360.448 906.24l1.536 0.512c6.656 3.072 14.336 4.608 22.016 4.608 16.384 0 32.768-6.656 43.008-18.432 14.848-15.872 54.272-48.64 83.456-48.64 31.744 0 72.704 36.864 84.48 49.664 10.752 11.776 26.624 18.432 43.52 18.432 7.68 0 14.848-1.536 22.016-4.608l1.536-0.512 107.008-58.88 1.536-1.024c20.48-14.336 28.672-42.496 18.432-65.536 0 0-9.216-20.992-9.216-39.424 0-57.344 46.592-103.936 103.936-103.936h4.096c19.968 0 35.84-16.896 40.96-43.008 0-0.512 8.704-46.592 8.704-82.944-1.024-35.84-9.216-81.408-9.728-83.456z m-416.768 232.96c-82.944 0-150.016-67.584-150.016-150.016 0-82.944 67.584-150.016 150.016-150.016 82.944 0 150.016 67.584 150.016 150.016s-67.072 150.016-150.016 150.016z"  ></path></symbol><symbol id="icon-zhiliangfenxi" viewBox="0 0 1024 1024"><path d="M928 150.613333h-384V85.333333h-64v65.28h-384a32.853333 32.853333 0 0 0-32 32.853334v522.666666a32.426667 32.426667 0 0 0 32 32.426667h384v51.626667l-152.746667 91.306666 32 57.173334 143.786667-85.333334h19.2l144.213333 85.333334 32-57.173334-154.453333-91.306666v-51.626667h384a32.426667 32.426667 0 0 0 32-32.426667V183.466667a32.853333 32.853333 0 0 0-32-32.853334zM896 673.28H128V215.893333h768z m-105.813333-392.106667l42.666666 49.066667-316.586666 276.906667-164.266667-140.373334-118.186667 101.12-42.666666-49.92L352.853333 384l162.986667 140.373333z"  ></path></symbol><symbol id="icon-shixundaibeijing" viewBox="0 0 1024 1024"><path d="M512.3 512.7m-415.7 0a415.7 415.7 0 1 0 831.4 0 415.7 415.7 0 1 0-831.4 0Z"  ></path><path d="M395 341.4c-9.2 0-16.7 7.5-16.7 16.7v338.4c0 9.2 7.5 16.7 16.7 16.7s16.7-7.5 16.7-16.7V358.1c0.1-9.2-7.4-16.7-16.7-16.7zM277.7 404.1c-9.2 0-16.7 7.5-16.7 16.7v200.5c0 9.2 7.5 16.7 16.7 16.7s16.7-7.5 16.7-16.7V420.8c0-9.3-7.4-16.7-16.7-16.7zM512.3 274.6c-9.2 0-16.7 7.5-16.7 16.7v442.8c0 9.2 7.5 16.7 16.7 16.7s16.7-7.5 16.7-16.7V291.3c0-9.2-7.5-16.7-16.7-16.7zM629.6 341.4c-9.2 0-16.7 7.5-16.7 16.7v338.4c0 9.2 7.5 16.7 16.7 16.7s16.7-7.5 16.7-16.7V358.1c0-9.2-7.5-16.7-16.7-16.7zM746.8 404.1c-9.2 0-16.7 7.5-16.7 16.7v200.5c0 9.2 7.5 16.7 16.7 16.7s16.7-7.5 16.7-16.7V420.8c0-9.3-7.4-16.7-16.7-16.7z" fill="#FFFFFF" ></path></symbol><symbol id="icon-chenggong" viewBox="0 0 1024 1024"><path d="M512 0C229.2224 0 0 229.2224 0 512s229.2224 512 512 512 512-229.2224 512-512S794.7776 0 512 0z m244.667733 422.0416l-263.68 263.662933c-6.656 6.673067-15.394133 10.001067-24.132266 10.001067s-17.4592-3.328-24.132267-10.001067l-143.240533-143.240533c-12.032-12.032-14.984533-31.402667-5.0688-45.2096a34.133333 34.133333 0 0 1 51.985066-4.386133l96.3072 96.3072a34.133333 34.133333 0 0 0 48.264534 0l216.746666-216.7296a34.133333 34.133333 0 0 1 51.985067 4.386133c9.949867 13.806933 6.980267 33.1776-5.034667 45.2096z" fill="#040000" ></path></symbol><symbol id="icon-trustie" viewBox="0 0 1024 1024"><path d="M240.8 181.3c40.2 0.6 95.6 20.3 99.9-13.9 3.4-27.6-62-39.5-141.1-24.6-23.5 8.5-77 42.8-52.4 95.1 5.3 11.8 17.1 13.9 17.1 13.9s27.8 176.3 1.1 380.5c1.1 8.6 25.7 23.5 33.1 0 1.1-17.1 18.2-253.3-2.1-394.4-3.2-13.8 10.4-57.1 44.4-56.6z"  ></path><path d="M310.8 458.1c9.1-31.6 16.7-221.1-15.4-242.5-7.5-4.3-22 7.4-21 14.9 0.5 3.6 3.1 36.7 5.2 77h-18.3c0.4-30.2 0.4-55.9-0.8-64.1-3.2-21.4-25.7-39.5-37.4-6.4 0 0 8.6 147.5 5.3 221.2-2.1 21.3 56.7 79 82.4-0.1z m-28.9-21.3c-1.1 11.8-17.1 43.8-21.4-4.3-1-12.5-0.4-47.6 0.2-84.4h20.8c1.3 33 1.8 66.1 0.4 88.7z"  ></path><path d="M513.7 276.4c-0.1-42.8-14.8-51.3-30.3-51.3h-28.7c5.7-17.6 14.8-44.3 23.8-66.3 15-36.3-7.5-55.6-31-55.6H340.8c-20.2 18.2-4.4 32.1 6.3 38.5 3.8 2.3 17.8 2.5 34.3 2.2-3.9 18.3-15.7 49.6-50.3 80.1-1 4.9-0.4 12.2 5 15.9-2.3 5.6-3.7 11.5-5 15.1 9.6 248-22.5 304.6-36.4 334.5-18.2 37.4 15 39.5 24.6 33.1 28.9-32.1 39.3-117.9 42.8-197.2 7.6 5.2 22.4 8.1 45.2 9v182.3s3.9 11 17.6 11c13.6 0 17.7-12.6 17.7-12.6V434.3c22.2-1.4 36.2-5.5 43.3-9.5 8.5 123.6 31.4 176.5 40.9 191.5 22.4 33.1 43.3-9.1 31-22.4-46.1-30-44-274.7-44.1-317.5z m-30.3-9.6c-0.6 21.3-0.9 41.4-0.8 60.3-7.3-4.7-19.8-9.3-40.1-11v-57c22.9 1.2 40.6 4.7 40.9 7.7z m-120.3 1.1c12.1-4.9 27.9-7.5 44.1-8.6v56.9c-22.5 2.1-36.2 7.9-43.7 12.5-0.1-33.9-0.9-57.6-0.4-60.8zM449.7 145c2.1 19.3-17.6 57.1-31 80.2h-36.2c9.8-13.7 32-50.8 33.9-82.2 18.2-0.6 32.9-0.6 33.3 2z m-87 265.3c0.8-23 1-45 1-64.7 8 4.6 22.3 7.2 43.6 8v43.6c-23.5 2.2-37.4 8.4-44.6 13.1z m79.8-13.2v-43.8c19.3-1.3 32.4-4.5 40.2-8 0.3 23.2 1 44.6 2.1 64.3-6.8-5.1-19.7-10.6-42.3-12.5zM667.7 142.3h126.6s12.8-6.8 12.8-22-13.6-22-13.6-22H667.7s-14.5 7.6-13.7 22c0.9 14.4 13.7 22 13.7 22zM870.5 198.4c2.4-12.8-7.2-40.9-42.5-40.9h-97.4-87.7c-35.3 0-44.9 28.1-42.5 40.9C614 334.7 586 386.8 586 386.8c0 43.3 31.3 24 37.7 9.6 17.6-42.5 11.2-166.7 10.4-177.9-0.8-11.2 6.4-24 20-24h162.8c13.6 0 20.8 12.8 20 24s-7.2 135.5 10.4 177.9c6.4 14.4 37.7 33.7 37.7-9.6-0.1 0-28.2-52.1-14.5-188.4z"  ></path><path d="M775.2 458.1c-2.2-6.7-3.8-16.7-4.9-28.9h36.9s13.4-6 13.4-19.3-14.2-19.3-14.2-19.3h-38.1c-1.5-58.4 2.1-130.5 2.1-140.1-11.2-44.1-88.2-25.4-88.2-25.4-31.3 18.7-1.6 39 7.2 36.6 60.1-15.2 44.9 12.8 44.9 36.9v2.4h-56.1c-9.9 0-17.4 13.4-17.4 20.8 0 7.5 7.7 20.8 17.4 20.8h56.6c0.2 14.3 0.3 30.6 0.1 47.9h-59.8s-15.1 6.7-14.2 19.3c0.8 12.6 14.2 19.3 14.2 19.3h59.1c-2 64-57.1 139.8-80.1 170.7-24.1 32.1 16.9 33.7 24.9 27.8 36.9-22.7 72.9-129.3 72.9-129.3 18.4 65.2 61.7 122.3 70.5 129.3 44.1 20.6 29.7-24.6 24.8-31-33.6-28.7-59.2-99.2-72-138.5z"  ></path><path d="M824.9 716.5c-27.3 0-31 38.2-31 38.2h62c-0.1 0-3.8-38.2-31-38.2z"  ></path><path d="M895.3 645H198.6c-6 130.1-16 203.3-32.6 234.3-34.7 62-37.9-31-31.5-53.4C148.3 787.3 166 645 166 645h-40c-15.9 0-29 13-29 29v221.2c0 15.9 13 29 29 29h769.3c15.9 0 29-13 29-29V673.9c-0.1-15.9-13.1-28.9-29-28.9z m-590.9 79.4l-41.1 27.8v93.9c0 12.4-10 22.4-22.4 22.4-12.4 0-22.4-10-22.4-22.4V740.4v-34.6c0-12.4 10-22.4 22.4-22.4 9.9 0 18.3 6.5 21.3 15.4l17-11.5c10.3-6.9 24.2-4.3 31.2 6 6.9 10.2 4.3 24.2-6 31.1zM444.1 810c0 30.3-26.3 64.1-64.1 64.1-38.6 0-61.6-35-61.6-68.9V702.6c0-12.4 10-22.4 22.4-22.4 12.4 0 22.4 10 22.4 22.4v102.6c0 8.4 4.9 24 16.7 24 11.8 0 19.2-13.5 19.2-19.2V702.6c0-12.4 10-22.4 22.4-22.4s22.4 10 22.4 22.4V810z m123.7 36.1c-35.3 49.2-94.6 24.6-110.8 5.6-18.4-27.5 5.5-47.3 21-40.3 21.4 9.6 20.4 20.8 38.5 20.8 24 0 16.6-18.4 11.8-22.4-21.2-17.6-56.1-23.5-65.7-43-18.2-47.3 11.8-78.8 39.5-88.4 36.3-9.1 56.2 11.7 63.1 27.5 3.2 7.4 4.8 25.9-3.8 31.8-24.1 10.7-29.8-8-48.8-11.2-16.8-1.6-21.1 24.3 1.2 27.8 73.8 17 60.3 76.8 54 91.8z m84.1-100.6h-7.4v102.2c0 12.4-10 22.4-22.4 22.4-12.4 0-22.4-10-22.4-22.4V745.5h-2.4c-12.4 0-22.4-10-22.4-22.4 0-12.4 10-22.4 22.4-22.4h2.4v-14.8c0-12.4 10-22.4 22.4-22.4 12.4 0 22.4 10 22.4 22.4v14.8h7.4c12.4 0 22.4 10 22.4 22.4 0 12.3-10 22.4-22.4 22.4z m80.8 106.2c0 12.4-10 22.4-22.4 22.4s-22.4-10-22.4-22.4v-101c0-12.4 10-22.4 22.4-22.4s22.4 10 22.4 22.4v101z m-22.5-135.2c-13.6 0-24.6-11-24.6-24.6 0-13.6 11-24.6 24.6-24.6 13.6 0 24.6 11 24.6 24.6 0 13.6-11 24.6-24.6 24.6z m181.1 69.7h-94.5c0 42.7 37.7 51.9 46.5 41.5 10.1-14.8 34.5-22.4 41.9-8.8 7.4 13.6-3.8 50.5-57.9 50.5-58.5 0-71.3-53.7-71.3-102.6 0-34.5 11.2-90.7 73.7-90.7 68.9 0 61.6 110.1 61.6 110.1z"  ></path></symbol><symbol id="icon-congshulianjie" viewBox="0 0 1024 1024"><path d="M844.8 665.6a128 128 0 0 0-125.44 102.4H358.4a102.4 102.4 0 0 1 0-204.8h307.2a153.6 153.6 0 0 0 0-307.2H304.64a128 128 0 1 0 0 51.2H665.6a102.4 102.4 0 0 1 0 204.8H358.4a153.6 153.6 0 0 0 0 307.2h360.96a128 128 0 1 0 125.44-153.6z m0 204.8a76.8 76.8 0 1 1 76.8-76.8 76.8 76.8 0 0 1-76.8 76.8z"  ></path></symbol><symbol id="icon-zhongzhi2" viewBox="0 0 1024 1024"><path d="M510.9 510.7m-128 0a128 128 0 1 0 256 0 128 128 0 1 0-256 0Z" fill="" ></path><path d="M959.6 383.6v-256L858.9 228.3C770.2 119.9 632.1 54.6 481.7 64.8 234.8 81.6 48.3 295.2 65 542.1 81.8 789 295.5 975.5 542.3 958.8c225.2-15.3 400.2-194.4 416.4-413.1l-64.6 4.4C876.1 733.3 727.8 882 538 894.9c-211.6 14.4-394.8-145.5-409.1-357.1S274.4 143 486 128.7c131.2-8.9 251.5 49.2 327.4 145.1L703.6 383.6h256z" fill="" ></path></symbol><symbol id="icon-shijian" viewBox="0 0 1024 1024"><path d="M506.678925 977.849905c-63.955231 0-125.966224-12.484061-184.395723-37.247527-56.382932-23.84251-107.035475-58.020186-150.627361-101.509743-43.489557-43.489557-77.667233-94.142101-101.509743-150.627361-24.763466-58.429499-37.247527-120.440492-37.247527-184.395723S45.382632 378.000999 70.043769 319.5715c23.84251-56.382932 58.020186-107.035475 101.509743-150.627361 43.489557-43.489557 94.142101-77.667233 150.627361-101.509743 58.429499-24.763466 120.440492-37.247527 184.395723-37.247527s125.966224 12.484061 184.395723 37.247527c56.382932 23.84251 107.035475 58.020186 150.627361 101.509743 43.489557 43.489557 77.667233 94.142101 101.509743 150.627361 24.763466 58.429499 37.247527 120.440492 37.247527 184.395723S967.872889 630.035775 943.211752 688.465274c-23.84251 56.382932-58.020186 107.035475-101.509743 150.627361-43.489557 43.489557-94.142101 77.667233-150.627361 101.509743C632.645148 965.263516 570.531828 977.849905 506.678925 977.849905zM506.678925 91.68622c-55.666633 0-109.696013 10.949136-160.553213 32.438093-49.117618 20.772659-93.221145 50.550215-131.082642 88.411712s-67.639053 81.965024-88.411712 131.082642c-21.488958 50.8572-32.438093 104.784251-32.438093 160.553213s10.949136 109.696013 32.438093 160.553213c20.772659 49.117618 50.550215 93.221145 88.411712 131.082642s81.965024 67.639053 131.082642 88.411712c50.8572 21.488958 104.784251 32.438093 160.553213 32.438093s109.696013-10.949136 160.553213-32.438093c49.117618-20.772659 93.221145-50.550215 131.082642-88.411712s67.639053-81.965024 88.411712-131.082642c21.488958-50.8572 32.438093-104.784251 32.438093-160.553213s-10.949136-109.696013-32.438093-160.553213c-20.772659-49.117618-50.550215-93.221145-88.411712-131.082642s-81.965024-67.639053-131.082642-88.411712C616.272609 102.533027 562.345558 91.68622 506.678925 91.68622z"  ></path><path d="M724.536025 499.874088l-204.65674 0-0.920955-280.993704c-0.102328-16.884181-13.81433-30.596183-30.698511-30.596183 0 0-0.102328 0-0.102328 0-16.986509 0.102328-30.698511 13.81433-30.596183 30.800839l1.023284 310.873588c0 0.204657 0 0.409313 0 0.61397 0 16.884181 13.712002 30.698511 30.698511 30.698511l235.355251 0c16.884181 0 30.698511-13.712002 30.698511-30.698511S741.522534 499.874088 724.536025 499.874088z"  ></path></symbol><symbol id="icon-qq" viewBox="0 0 1024 1024"><path d="M960.1 512c0-247.4-200.5-447.9-447.9-447.9S64.3 264.6 64.3 512s200.5 447.9 447.9 447.9S960.1 759.3 960.1 512z" fill="#04ACEE" ></path><path d="M690.8 445.2c0-185.5-96.1-241.6-178.6-241.6s-180.5 55.3-180.5 241.6c0 0-62.6 140.2-62.6 207.5s56.5-32.7 56.5-32.7-1.8 67.2 56.5 113.8c0 0-70.8 28.4-47.3 42.3 23.5 13.9 170.6 2.4 170.6 2.4h10s142.1 9.1 169.1 0-16.4-38.7-44.4-44.7c56.6-50.4 56.6-113.8 56.6-113.8s55.9 101.8 55.9 34.4-61.8-209.2-61.8-209.2z" fill="#FFFFFF" ></path></symbol><symbol id="icon-csdn" viewBox="0 0 1024 1024"><path d="M906.475693 943.728792c-49.491181 17.325597-152.164608 28.913517-295.537993 28.913517-412.545894 0-635.223462-193.912431-608.80579-450.249611C33.545364 216.96445 363.386627 45.025473 724.595296 45.025473c139.829675 0 222.1301 11.388375 299.383578 30.263258l-24.720008 205.822692c-51.434439-17.35118-171.688267-33.208333-269.12032-33.208333-212.388225 0-392.96493 63.425541-413.440264 263.878946-18.429745 179.328271 108.114346 265.024026 347.120812 265.024026 83.251076 0 205.89944-11.884678 262.580371-29.214369L906.475693 943.728792z" fill="#d81e06" ></path></symbol><symbol id="icon-weibo" viewBox="0 0 1024 1024"><path d="M521.1990464028488 988.8678975894004C249.27637860777747 988.8678975894004 28.94831437026488 768.5398317807978 28.94831437026488 496.8082556628046S249.27637860777747 4.748613736208938 521.0079562968607 4.748613736208938 1013.0675966523665 225.07667954481133 1013.0675966523665 496.8082556628046c0.191091677078182 271.7315761179932-220.13697413152437 492.0596419265958-491.86855024951745 492.0596419265958z m0.9554568143009067-624.6768809018033c-36.11622170474618 20.637841423023534-36.11622170474618 5.923824707433607-34.9696763555471-19.682386179812628 3.2485490837890745-140.45197574015296-240.77481555454784-40.320227602836155-309.75870988025116 142.17179612058655-38.98258900546889 110.8328506318949 23.504208723746245 206.5695043362235 120.0052244231176 248.41845907132517 235.61535441324702 89.81282742580501 407.21518239392327-58.66497518528153 436.45212571911514-154.7838091015865 38.98258900546889-144.27379828408652-73.57008200685962-116.5655852333403-73.57008200685962-116.5655852333403s-33.44094608110166 7.834736764945416-17.58038401631264-18.918021042589903c25.03293742710169-51.97678534062519-15.478380281722648-137.39451676235205-120.57849788326214-80.64045363458233zM713.627807483627 421.3272615984331c11.083285848734494 3.057457406710893 15.669471958800827-6.879279950644512 16.816018879089917-15.860562064789006 1.1465469202890857-8.981282114144499 20.637841423023534-130.51523681170752-103.95357068125038-116.5655852333403-9.363465468300863 1.1465469202890857-15.669471958800827 7.070371627722693-14.71401671558993 15.860563635879014 1.1465469202890857 8.79019200815632 8.025826870933594 13.758561472379021 13.376378118222659 13.18528644114448 5.350551247289063-0.7643651372227249 88.47519039952775-16.242745418945372 81.59591044888322 77.20081444480508 1.3376385973672678 8.59910033107814-4.39509600407816 23.12202536958988 6.879279950644512 26.179482776300777z m-94.7811968900277-232.9400787896025c-8.981282114144499 1.7198203804336283-29.236941754101668 10.127829034433585-29.42803343117986 27.899304727824408-0.191091677078182 17.962565799379 17.771474122300823 29.61912353716804 26.75275780753532 30.383488674390765 33.44094608110166 0 193.19312464691086-9.17237379122268 163.9561828928092 155.35708256173103-4.012914221011799 17.962565799379-7.070371627722693 45.67077885012523 12.994196335156298 51.40351188048065 18.34474758244536 4.968369464222703 29.42803343117986-15.28729017573447 34.587494572480736-30.956762134535296 2.2930938405781713-17.962565799379 76.24535763050417-253.76901188970422-208.8625981768016-234.08662570989156z m-184.40293263875455 513.461848486842c-111.59721576911762 16.433837096023556-210.39132688015715-35.925131598758-220.90133926874708-116.75667691041852-10.318920711511767-80.8315453116605 71.65917152043784-159.75217856580917 183.06529561247726-175.9949239847546 111.59721576911762-16.433837096023556 210.39132688015715 35.925131598758 220.71024759166895 116.7566753393285 10.701102494578127 80.8315453116605-71.27698816628147 159.56108688873104-182.8742039353991 175.99492555584456z m85.03554963866048-168.54237057396554c-8.79019200815632-49.30150971698068-63.25116129534787-79.49390671429325-121.34286302048483-67.64625729942603-58.09170172513699 11.847649414867213-98.22083765089495 61.531340914914246-89.23955553675046 110.8328506318949 8.79019200815632 49.30150971698068 63.25116129534787 79.49390671429325 121.34286302048483 67.64625729942603 58.09170172513699-12.038741091945395 98.02974597381682-61.531340914914246 89.23955553675046-110.8328506318949z m-68.79280421971512 20.828931529011715c-7.452553410789053 0-15.096198498656289-9.554555574289044-15.09620006974629-21.402204989156253 0-11.847649414867213 7.643645087867235-21.402204989156253 15.09620006974629-21.40220656024626 7.452553410789053 0 15.096198498656289 9.554555574289044 15.096198498656289 21.40220656024626 0 11.65655773778903-7.452553410789053 21.402204989156253-15.096198498656289 21.402204989156253z m-59.42934032250426 44.52423192983614c-20.064567962878993 0-36.49840505890254-14.71401671558993-36.498403487812546-33.058764298035285 0-18.34474758244536 16.242745418945372-33.058764298035285 36.498403487812546-33.058764298035285 20.064567962878993 0 36.307313381824365 14.71401671558993 36.307313381824365 33.058764298035285 0 18.153655905367184-16.242745418945372 33.058764298035285-36.307313381824365 33.058764298035285z" fill="" ></path></symbol><symbol id="icon-weixin2" viewBox="0 0 1000 1000"><path d="M320.85344 375.57045333c17.79989333 0 29.74528-12.10165333 29.74528-30.12885334 0-18.11146667-11.94549333-30.05216-29.74528-30.05215999-17.79242667 0-35.75210667 11.94069333-35.75210666 30.05215999C285.10122667 363.4688 303.06101334 375.57045333 320.85344 375.57045333zM487.12832 315.38826667c-17.79989333 0-35.67648 11.94069333-35.67648 30.05216 0 18.02826667 17.87658667 30.12885333 35.67648 30.12885332 17.94485333 0 29.81461333-12.10165333 29.81461333-30.12885332C516.94293333 327.33013332 505.07306667 315.38826667 487.12832 315.38826667zM695.07904001 538.16416c17.87658667 0 29.81354667-11.94602667 29.81354666-24.04341333 0-12.02069333-11.93696-24.12234667-29.81354666-24.12234668-11.7088 0-23.50293333 12.10165333-23.50293334 24.12234668C671.57717334 526.21813333 683.37024 538.16416 695.07904001 538.16416zM564.40490667 538.16416c18.02794667 0 29.73674667-11.94602667 29.73674667-24.04341333 0-12.02069333-11.7088-24.12234667-29.73674667-24.12234668-11.78666667 0-23.73098667 12.10165333-23.73098667 24.12234668C540.67392 526.21813333 552.61834667 538.16416 564.40490667 538.16416zM27.73770667 501.78784c0 258.68224 209.67338667 468.34592 468.36298667 468.34591999 258.6896 0 468.36298667-209.66368 468.36298667-468.34591999S754.79029333 33.44512 496.10069334 33.44512C237.41109333 33.44512 27.73770667 243.10559999 27.73770667 501.78784zM614.9072 380.64330667c-112.87530667 0-202.01962667 85.39381333-202.01962667 190.53855999 0 17.56352 2.73642667 34.42464 7.34144001 50.50122667-7.34144 0.62464-14.68181333 0.93696-22.16832 0.93696-29.66965333 0-53.552-6.08650667-83.21418667-12.09738667l-83.06176 42.22954667 23.73098666-72.4384c-59.4832-42.14954667-95.07434667-96.40181333-95.07434666-162.51701334 0-114.58581333 107.02090667-204.81898667 237.61930667-204.81898666 116.85461333 0 219.19477333 72.12288 239.71605334 169.07253333C630.29045334 381.19221333 622.63658668 380.64330667 614.9072 380.64330667zM831.76106667 568.36874667c0 54.2512-35.51552 102.336-83.21418667 138.55029332l17.87658667 60.26208-65.17770667-36.13973332c-23.81525333 6.01088-47.61450667 12.02069333-71.27616 12.02069332-113.02666667 0-202.17205333-78.29248-202.17205333-174.69439999 0-96.32085333 89.14538667-174.76682667 202.17205333-174.76682668C736.67808 393.60191999 831.76106667 472.048 831.76106667 568.36874667z" fill="#62b900" ></path></symbol><symbol id="icon-StackOverflow" viewBox="0 0 1025 1024"><path d="M513.27936 0.511744C230.796602 0.511744 1.535232 229.773113 1.535232 512.255872s229.261369 511.744128 511.744128 511.744128 511.744128-229.261369 511.744128-511.744128S796.273863 0.511744 513.27936 0.511744z m-15.864068 256.383808l214.932534 179.110445-35.822089 42.986507-214.932534-179.110445 35.822089-42.986507zM415.024488 373.573213l253.825087 118.212894-24.051974 50.662669-253.313343-118.212894 23.54023-50.662669z m-48.615692 126.912544l273.783108 57.315342-11.258371 54.756622-273.783108-57.315342 11.258371-54.756622z m-16.887557 126.4008H629.445277v55.78011H349.521239v-55.78011z m391.484258 167.852074H237.449275v-224.143928h55.78011v167.852074h391.484258v-167.852074h55.78011v224.143928z m-18.422788-369.479261l-166.828586-224.655672 45.033483-33.263368L767.616192 391.996002l-45.033483 33.263368z" fill="" ></path></symbol><symbol id="icon-linkedin" viewBox="0 0 1024 1024"><path d="M511.995437 511.995437m-511.995437 0a511.995437 511.995437 0 1 0 1023.990873 0 511.995437 511.995437 0 1 0-1023.990873 0Z" fill="#007AB9" ></path><path d="M817.907645 553.193829v211.084717H695.526333V567.340375c0-49.449023-17.669492-83.218197-61.980124-83.218197-33.814808 0-53.902903 22.734868-62.774156 44.748719-3.221762 7.867305-4.052301 18.792089-4.052301 29.826394v205.572128h-122.390438s1.642825-333.54817 0-368.074868h122.399565v52.159683c-0.246424 0.410706-0.593242 0.812286-0.812286 1.204738h0.812286v-1.204738c16.263964-25.025696 45.268947-60.802767 110.297423-60.802766 80.516663 0 140.881343 52.606897 140.881343 165.642361z m-501.609134-334.424343c-41.864649 0-69.254187 27.480806-69.254187 63.586442 0 35.338984 26.595506 63.613822 67.647869 63.613822h0.794032c42.686061 0 69.226806-28.274838 69.226807-63.613822-0.812286-36.105636-26.540745-63.586442-68.414521-63.586442z m-61.980125 545.50906H376.663191v-368.083995H254.318386v368.083995z" fill="#F1F2F2" ></path></symbol><symbol id="icon-github" viewBox="0 0 1024 1024"><path d="M511.6 76.3C264.3 76.2 64 276.4 64 523.5 64 718.9 189.3 885 363.8 946c23.5 5.9 19.9-10.8 19.9-22.2v-77.5c-135.7 15.9-141.2-73.9-150.3-88.9C215 726 171.5 718 184.5 703c30.9-15.9 62.4 4 98.9 57.9 26.4 39.1 77.9 32.5 104 26 5.7-23.5 17.9-44.5 34.7-60.8-140.6-25.2-199.2-111-199.2-213 0-49.5 16.3-95 48.3-131.7-20.4-60.5 1.9-112.3 4.9-120 58.1-5.2 118.5 41.6 123.2 45.3 33-8.9 70.7-13.6 112.9-13.6 42.4 0 80.2 4.9 113.5 13.9 11.3-8.6 67.3-48.8 121.3-43.9 2.9 7.7 24.7 58.3 5.5 118 32.4 36.8 48.9 82.7 48.9 132.3 0 102.2-59 188.1-200 212.9 23.5 23.2 38.1 55.4 38.1 91v112.5c0.8 9 0 17.9 15 17.9 177.1-59.7 304.6-227 304.6-424.1 0-247.2-200.4-447.3-447.5-447.3z" fill="#333333" ></path></symbol><symbol id="icon-net" viewBox="0 0 1024 1024"><path d="M512 81.53088c-124.22144 0-235.9808 53.1968-314.63424 137.6256-0.36864-0.28672-0.82944-0.53248-1.21856-0.8192L186.368 231.2704C121.22112 306.7392 81.53088 404.72576 81.53088 512c0 107.80672 40.13056 206.2336 105.86112 281.86624l8.7552 11.55584c0.33792-0.26624 0.75264-0.4864 1.09568-0.73216 78.65344 84.5312 190.464 137.7792 314.75712 137.7792 237.3632 0 430.46912-193.12128 430.46912-430.46912 0-237.37344-193.12128-430.46912-430.46912-430.46912z m24.38144 273.69984c58.95168-2.1504 115.44064-11.3664 166.98368-26.52672 14.99136 47.68768 24.1152 101.64224 26.18368 158.93504h-193.16736V355.23072z m0-48.7424V132.83328c61.14816 11.94496 114.5856 68.38784 149.81632 150.15936-46.1312 13.2608-96.768 21.43232-149.81632 23.5008z m-48.76288-173.66016v173.83424c-53.17632-1.63328-103.9616-9.43616-150.40512-22.28224 35.2256-82.55488 88.91392-139.53536 150.40512-151.552z m0 222.5664v132.224H294.4512c2.06848-56.68864 10.96704-110.17728 25.69728-157.50144 51.80416 14.72512 108.4416 23.5776 167.4752 25.28256zM245.7088 487.62368h-114.176c4.85376-76.3904 32.15872-146.55488 75.53536-204.2624a470.9632 470.9632 0 0 0 66.80064 31.59552c-16.26112 52.00384-26.0864 110.34624-28.16 172.66688z m0 48.76288c2.0736 62.14656 11.84768 120.34048 28.04224 172.24704a471.36768 471.36768 0 0 0-66.85184 31.7696c-43.27936-57.63584-70.51264-127.75424-75.3664-204.01664h114.176z m48.7424 0h193.16736v131.97312c-59.00288 1.70496-115.88096 10.01984-167.66976 24.84224-14.60224-47.1808-23.4496-100.4032-25.4976-156.81536z m193.16736 180.736v174.04928c-61.63456-12.03712-115.42016-69.28896-150.67648-152.13568 46.42304-12.94336 97.50016-20.28544 150.6816-21.9136z m48.76288 174.04928v-173.8752c53.07904 2.04288 103.936 9.79456 150.0672 23.15776-35.23584 82.08896-88.77568 138.752-150.0672 150.71744z m0-222.6432v-132.1472h193.16736c-2.06848 57.05216-11.12064 110.84288-26.0096 158.40768-51.52256-15.26784-108.1856-24.0896-167.15776-26.2656z m241.90464-132.1472h114.2016c-4.92544 77.24032-32.768 148.14208-76.99456 206.19264-20.28544-11.97056-42.42432-22.528-65.87392-31.8208 16.57344-52.41344 26.5728-111.39072 28.672-174.36672z m0-48.75776c-2.0992-63.0272-12.09344-122.02496-28.6976-174.49472a462.39232 462.39232 0 0 0 65.71008-31.93856c44.31872 58.09664 72.26368 129.09568 77.16352 206.43328h-114.176z m4.608-244.1728c-15.67744 8.75008-32.2048 16.8704-49.95584 23.9104-16.50688-39.15264-37.10976-73.1648-60.66176-101.2992 41.34912 19.23584 78.8736 45.37344 110.62272 77.3888zM351.744 166.03136c-23.94112 28.60032-44.86144 63.22176-61.5168 103.18336-18.11456-6.94784-34.95936-15.04256-50.95424-23.74656C271.4112 212.57728 309.53984 185.66144 351.744 166.03648z m-112.64 612.3264a423.6544 423.6544 0 0 1 51.02592-23.74656c16.67584 40.0384 37.64736 74.70592 61.61408 103.3728-42.27584-19.69664-80.4352-46.63808-112.64-79.62624z m433.17248 79.60576c23.552-28.16 44.15488-62.19776 60.68736-101.3504a421.9392 421.9392 0 0 1 50.10432 23.79264c-31.7952 32.08704-69.37088 58.27072-110.79168 77.55776z" fill="#272636" ></path></symbol><symbol id="icon-mstest" viewBox="0 0 1024 1024"><path d="M552.8 512l291.8-198.8-299.4-175.8-300.2 163z m167.2 78.8c61.6 0 104-12.8 116-34.4l1-11.6 1.4-14.4 12.4-137.4 4.6-50.6-287.6 196v34c56.2 11.8 108.6 18.4 152.2 18.4z m11 77.4c-49.8 0-105-6-163.2-17.6v231.2l251.4-221.6c-25.8 5.2-55.2 8-88.2 8zM236 416.6c8.4 9.2 18.4 18.6 30 27.8 53.4 43.2 132.4 81.2 222.4 107.6 16.6 4.8 33 9.2 49.4 13.2V538l-308-211.4 6.2 90z m230.8 209.2c-83.2-24.2-160.2-58.4-223.4-98.2l7.8 114.2 286.4 241.2V644.2c-23.2-5.2-46.8-11.4-70.8-18.4z" fill="#008CDB" ></path><path d="M848.4 431.6l-4.2 42.2c21.6 30.8 30.4 60.4 23 85.4-22.6 77.6-192 78.8-387.4 21.8-195-57-324.8-164-302.2-241.6 11.2-38.4 57.6-62.4 125.2-70l45.6-24.8c-119-6.4-207.6 18.2-224 74-25.2 86.6 133.4 214.8 350.8 278.4 217.6 63.4 410.8 54 436-32.4 11.4-38.8-13-86.4-62.8-133z" fill="#008CDB" ></path></symbol><symbol id="icon-vs" viewBox="0 0 1024 1024"><path d="M161.109333 259.163022l109.715911 392.612978 110.262044-392.612978 126.987378 0L365.499733 766.509511 176.150756 766.509511 34.133333 259.163022 161.109333 259.163022z"  ></path><path d="M989.866667 298.7008 718.654578 298.7008c-27.841422 0-50.699378 22.823822-50.699378 50.676622l0 134.200889L989.866667 483.578311l0 180.462933c0 55.694222-45.6704 101.910756-101.364622 101.910756L540.990578 765.952l0-40.664178 270.665956 0c27.841422 0 51.234133-22.823822 51.234133-50.665244L862.890667 524.8 540.990578 524.8 540.990578 359.401244c0-55.694222 45.6704-101.922133 101.922133-101.922133L989.866667 257.479111 989.866667 298.7008z"  ></path></symbol><symbol id="icon-base" viewBox="0 0 1024 1024"><path d="M25.28 328.49066666l474.88 230.592a25.6 25.6 0 0 0 12.352 2.56 41.472 41.472 0 0 0 13.44-2.56L1000.768 327.46666666a27.52 27.52 0 0 0 16-24.96 26.624 26.624 0 0 0-17.024-25.024L524.8 45.86666666a32.256 32.256 0 0 0-25.728 0L25.28 277.54666666a28.416 28.416 0 0 0-15.424 25.472 27.52 27.52 0 0 0 15.424 25.536z m487.232-221.44l399.168 194.88-399.168 194.88-399.104-194.88L512.512 107.11466666z m498.56 576c7.68 3.52 12.8 10.688 12.8 19.84 0 9.216-5.12 16.832-12.8 20.48l-488.768 238.72a22.528 22.528 0 0 1-9.792 1.984c-3.072 0-6.208-1.024-9.28-2.048L13.952 724.33066666a21.44 21.44 0 0 1-12.8-19.84c0-9.216 5.12-16.896 12.8-20.48l82.944-40.32c6.72-2.56 13.44-2.56 19.584 0l19.584 9.216c7.68 4.096 12.8 11.776 12.8 20.416 0 9.152-5.12 16.832-12.8 20.416l-21.632 10.24 394.496 191.744a13.312 13.312 0 0 0 10.816 0l392.96-192.832-22.144-10.688a21.44 21.44 0 0 1-12.928-19.84c0-9.216 5.12-16.896 12.928-20.48l19.008-9.152c5.12-2.56 12.928-2.56 18.56 0l82.944 40.32zM12.928 524.26666666a22.848 22.848 0 0 1-12.8-19.84c0-9.216 5.12-16.832 12.8-20.48l82.944-40.256c6.72-2.56 13.44-2.56 19.584 0l19.52 9.216c7.744 4.032 12.928 11.712 12.928 20.416 0 9.152-5.12 16.832-12.928 20.352l-21.568 10.24 395.008 191.808a13.312 13.312 0 0 0 10.816 0l392.96-192.832-22.144-10.752a22.144 22.144 0 0 1 0-40.32L909.056 442.66666666c5.12-2.56 12.928-2.56 18.56 0l82.944 40.32c7.68 3.584 12.8 10.688 12.8 19.84 0 9.216-5.12 16.896-12.8 20.48L521.28 762.02666666a22.528 22.528 0 0 1-9.792 2.048 30.336 30.336 0 0 1-9.28-2.048L12.928 524.39466666z"  ></path></symbol><symbol id="icon-dengluIpjiankong" viewBox="0 0 1024 1024"><path d="M924.208 126.176H100.832a35.936 35.936 0 0 0-35.968 35.968v567.568a36 36 0 0 0 35.968 36h823.376a36 36 0 0 0 35.952-36V162.144a35.952 35.952 0 0 0-35.952-35.968z m-54.08 328.64v0.368C801.264 593.84 662.272 682.4 512.512 682.4c-149.856 0-289.152-88.688-357.616-227.696-4.336-8.16-3.952-18.048 0-26.016C223.36 290.032 362.672 201.44 512.512 201.44c149.744 0 288.752 88.592 357.616 227.344a28.736 28.736 0 0 1 0 26.032z" fill="#FFFFFF" ></path><path d="M924.208 62.224H100.832C46.672 62.224 2.64 105.44 1.072 159.216v573.44c1.568 53.744 45.616 96.992 99.76 96.992h379.712v63.936H224.72a31.936 31.936 0 0 0-31.968 32c0 17.664 14.288 31.936 31.968 31.936h575.568a31.936 31.936 0 0 0 31.968-31.936c0-17.728-14.304-32-31.968-32H544.496v-63.936h379.696c55.152 0 99.92-44.8 99.92-99.92V162.144a99.872 99.872 0 0 0-99.904-99.92z m35.952 667.488a36 36 0 0 1-35.952 36H100.832a36 36 0 0 1-35.968-36V162.144a35.936 35.936 0 0 1 35.968-35.968h823.376a35.952 35.952 0 0 1 35.952 35.968v567.568z" fill="#23B294" ></path><path d="M689.392 313.808c-53.728-34.224-114.864-52.24-176.88-52.24-62 0-123.248 18.016-177.088 52.24a349.728 349.728 0 0 0-119.472 127.936 351.12 351.12 0 0 0 119.568 128.24c53.728 34.272 114.88 52.336 176.992 52.336 62.016 0 123.136-18.064 176.88-52.272a354.56 354.56 0 0 0 119.872-128.112c-28.848-52.32-70-96.496-119.872-128.128zM512.512 573.84c-70.56 0-127.904-57.376-127.904-127.808 0-70.56 57.344-128 127.904-128 70.544 0 127.904 57.344 127.904 128 0 70.432-57.36 127.808-127.904 127.808z" fill="#B8DFD7" ></path><path d="M512.512 381.984a64.032 64.032 0 0 0-63.952 64.048 63.968 63.968 0 0 0 127.904 0 64.096 64.096 0 0 0-63.952-64.048z" fill="#B8DFD7" ></path><path d="M512.512 201.44c-149.856 0-289.152 88.592-357.616 227.248-3.952 7.968-4.336 17.856 0 26.016C223.36 593.712 362.672 682.4 512.512 682.4c149.744 0 288.752-88.56 357.616-227.232v-0.368a28.704 28.704 0 0 0 0-26.016C801.264 290.032 662.272 201.44 512.512 201.44z m176.88 368.608c-53.728 34.208-114.864 52.272-176.88 52.272-62.096 0-123.248-18.064-176.992-52.336a350.992 350.992 0 0 1-119.568-128.24 349.728 349.728 0 0 1 119.472-127.936c53.84-34.224 115.088-52.24 177.088-52.24 62.016 0 123.136 18.016 176.88 52.24 49.872 31.632 91.024 75.792 119.872 128.112a354.48 354.48 0 0 1-119.872 128.128z" fill="#23B294" ></path><path d="M512.512 318.032c-70.56 0-127.904 57.44-127.904 128 0 70.432 57.344 127.808 127.904 127.808 70.544 0 127.904-57.376 127.904-127.808 0-70.656-57.36-128-127.904-128z m0 191.824a63.968 63.968 0 0 1-63.952-63.824 64.032 64.032 0 0 1 63.952-64.048 64.096 64.096 0 0 1 63.952 64.048 63.968 63.968 0 0 1-63.952 63.824z" fill="#23B294" ></path></symbol><symbol id="icon-itsm-liuchengguanli" viewBox="0 0 1181 1024"><path d="M1091.162219 638.818266h-110.040446v-168.30333H630.152877v-86.120894h99.564154a90.059349 90.059349 0 0 0 90.400682-89.271657V89.272445A90.059349 90.059349 0 0 0 729.717031 0.000788h-286.194431a90.033092 90.033092 0 0 0-90.374425 89.271657v205.84994a90.033092 90.033092 0 0 0 90.374425 89.271657h104.132763v86.120894H192.669242v168.30333H90.505707a90.059349 90.059349 0 0 0-90.400682 89.271658v206.637631A90.059349 90.059349 0 0 0 90.505707 1023.999212h286.194431a90.059349 90.059349 0 0 0 90.374425-89.271657v-206.637631a90.059349 90.059349 0 0 0-90.374425-89.271658H267.814973v-93.73524h638.029787v93.73524h-100.850716a90.059349 90.059349 0 0 0-90.400682 89.271658v206.637631a90.059349 90.059349 0 0 0 90.400682 89.271657h286.194431a90.033092 90.033092 0 0 0 90.374425-89.271657v-206.637631a90.033092 90.033092 0 0 0-90.374425-89.271658z m-714.567106 74.568091a14.572285 14.572285 0 0 1 15.0449 14.703567v206.637631a14.572285 14.572285 0 0 1-15.0449 14.703567h-286.194432a14.598542 14.598542 0 0 1-15.071156-14.703567v-206.637631a14.598542 14.598542 0 0 1 15.071156-14.703567h286.194432z m67.452614-403.297841a14.808593 14.808593 0 0 1-15.071156-14.966131V89.272445a14.808593 14.808593 0 0 1 15.071156-14.966131h286.194432a14.808593 14.808593 0 0 1 15.071156 14.966131v205.84994a14.808593 14.808593 0 0 1-15.071156 14.966131h-286.194432z m662.185648 624.639039a14.598542 14.598542 0 0 1-15.071156 14.703567h-286.194432a14.598542 14.598542 0 0 1-15.071156-14.703567v-206.637631a14.598542 14.598542 0 0 1 15.071156-14.703567h286.194432a14.598542 14.598542 0 0 1 15.071156 14.703567v206.637631z"  ></path></symbol><symbol id="icon-reset" viewBox="0 0 1024 1024"><path d="M256 512H170.666667c0 185.002667 156.288 341.333333 341.333333 341.333333s341.333333-156.330667 341.333333-341.333333-156.288-341.333333-341.333333-341.333333V85.333333L342.4 213.333333 512 341.333333V256c138.752 0 256 117.248 256 256s-117.248 256-256 256-256-117.248-256-256z" fill="" ></path><path d="M640 512c0-71.210667-56.704-128-128-128s-128 56.789333-128 128 56.704 128 128 128 128-56.789333 128-128z" fill="" ></path></symbol><symbol id="icon-zhongzhi1" viewBox="0 0 1024 1024"><path d="M511.99872 3.456C229.93792 3.456 1.28 231.13984 1.28 511.99744 1.28 792.86016 229.93792 1020.544 511.99872 1020.544 794.06592 1020.544 1022.72 792.86016 1022.72 511.99744 1022.72 231.13984 794.06592 3.456 511.99872 3.456L511.99872 3.456zM520.3072 872.28032c-188.20096 0-341.3312-152.47616-341.3312-339.87584 0-187.3984 153.13024-339.87456 341.3312-339.87456l0.02816 0L520.33536 118.64448l178.08384 118.21696-178.08384 118.21952L520.33536 281.1904l-0.02816 0c-139.10784 0-252.28544 112.69376-252.28544 251.21536 0 138.5152 113.1776 251.21152 252.28544 251.21152s252.28672-112.69632 252.28672-251.21152c0-24.50432 19.91168-44.33152 44.52224-44.33152 24.60928 0 44.52224 19.8272 44.52224 44.33152C861.63712 719.80416 708.50304 872.28032 520.3072 872.28032L520.3072 872.28032zM520.3072 872.28032"  ></path></symbol><symbol id="icon-default" viewBox="0 0 1024 1024"><path d="M512.020 73.677c-239.75 0-434.093 195.721-434.093 437.159s194.342 437.159 434.093 437.159 434.112-195.721 434.112-437.159-194.362-437.159-434.112-437.159zM729.087 523.45c0 18.589-14.961 33.649-33.397 33.649h-367.321c-18.434 0-33.377-15.058-33.377-33.649v-33.61c0-18.59 14.941-33.649 33.377-33.649h367.321c18.435 0 33.397 15.058 33.397 33.649v33.61z" fill="#555555" ></path></symbol><symbol id="icon-timefill" viewBox="0 0 1024 1024"><path d="M512 64C264.96 64 64 264.96 64 512s200.96 448 448 448 448-200.96 448-448S759.04 64 512 64zM671.264 576l-191.104 0C462.496 576 448 561.536 448 543.84L448 289.088c0-17.664 14.336-32 32-32s32 14.336 32 32L512 512l159.264 0c17.696 0 32 14.336 32 32C703.264 561.696 688.928 576 671.264 576z"  ></path></symbol><symbol id="icon-daimapeizhir" viewBox="0 0 1024 1024"><path d="M513.536 3.072C233.472 3.072 5.632 230.912 5.632 510.464c0 280.064 227.84 507.904 507.904 507.904 280.064 0 507.904-227.84 507.904-507.904C1020.928 230.912 793.6 3.072 513.536 3.072zM425.984 662.016c-4.608 5.12-10.752 7.168-16.896 7.168-5.632 0-11.264-2.048-15.36-6.144L246.272 527.36c-5.12-4.608-7.68-11.264-7.168-17.92-0.512-6.656 2.048-13.312 7.68-18.432L394.24 361.984c9.216-8.192 24.064-7.168 32.256 2.048 8.192 9.216 7.168 24.064-2.048 32.256L294.4 509.952 424.448 629.76C433.664 638.464 434.176 652.8 425.984 662.016zM574.976 309.76 512 718.336c-1.536 11.264-11.264 19.456-22.528 19.456-1.024 0-2.56 0-3.584-0.512-12.288-2.048-20.992-13.312-18.944-26.112l62.464-408.576c2.048-12.288 13.312-20.992 26.112-18.944C568.32 285.696 576.512 297.472 574.976 309.76zM803.328 534.528l-147.456 136.192c-4.608 4.096-9.728 6.144-15.36 6.144-6.144 0-12.288-2.56-16.896-7.168-8.704-9.216-8.192-23.552 1.536-32.256l130.048-119.808-129.536-113.664c-9.216-8.192-10.24-22.528-2.048-32.256 8.192-9.216 22.528-10.24 32.256-2.048l147.456 129.536c5.632 4.608 8.192 11.776 7.68 18.432C810.496 523.264 808.448 529.92 803.328 534.528z"  ></path></symbol><symbol id="icon-luyou" viewBox="0 0 1024 1024"><path d="M886.833275 403.841671l23.553517 0C903.017286 403.33592 894.997531 403.552671 886.833275 403.841671zM110.723206 403.841671l30.056022 0C130.519721 403.40817 119.898963 402.97467 110.723206 403.841671z"  ></path><path d="M926.281803 406.370423c-3.757003-1.083751-7.947506-1.806251-12.354759-2.239752-1.156001-0.07225-2.312002-0.21675-3.540253-0.289l-23.553517 0c-8.164256 0.21675-16.545262 0.65025-24.557793 0.65025-21.530516 0-42.627531 0.722501-61.629295-0.65025-1.156001-0.07225-2.246977-0.1445-3.323502-0.21675l0-192.040641c0-42.266281 5.129754-79.980809-30.207747-84.171312l-9.175757 0c-34.896776 4.768503-30.128272 42.049531-30.128272 82.29281l0 194.786143c-137.491851-0.578-277.295703 1.083751-413.703803-0.65025-5.996754-0.07225-11.993509-0.1445-17.990263-0.21675l0-192.040641c0-42.194031 5.491004-80.269809-30.128272-84.171312l-8.236506 0c-36.269527 4.624003-31.139773 43.566782-31.139773 86.844564l0 190.234389-65.819798 0c-6.141254 0-13.00501-0.36125-20.013265-0.65025l-30.056022 0c-5.996754 0.50575-11.415508 1.517251-15.750512 3.395752-15.606011 6.719255-28.394271 19.724264-32.946024 35.691526-1.734001 6.141254-2.456502 13.00501-2.601002 20.085515-0.07225 1.300501-0.07225 2.601002-0.07225 3.901503 0 10.476258 0.867001 21.169266 0.867001 30.850773l0 113.439808c0 11.119283-0.867001 22.823792-0.867001 33.87805 0 4.053228 0.07225 8.019756 0.4335 11.849009 0.289 3.179002 0.65025 6.285755 1.300501 9.182982 4.335003 20.808015 22.831017 40.31553 46.673534 42.988781 2.890002 0.36125 5.852254 0.578 8.742256 0.787526 8.092006 0.578 16.328512 0.794751 24.637268 0.794751 22.758767 0 46.167784-1.589501 68.998801-1.589501l614.6312 0c20.519015 0 42.844281 1.589501 62.785296 1.589501 3.460778 0 6.85653-0.07225 10.107782-0.1445 10.042757-0.368475 19.146264-1.307726 26.73252-3.330727 21.602766-5.700529 35.684301-23.763042 40.243279-46.594059l0-207.646652C958.794327 429.85169 948.67932 412.872927 926.281803 406.370423zM913.421294 648.6971c-15.172511 10.042757-67.8428 4.551753-96.880096 4.551753l-657.547732 0c-19.146264 0-39.665279 1.878501-48.479786-4.551753-6.141254-4.479503-9.175757-13.51076-10.548508-24.709518-2.167502-17.340013-0.4335-39.809779-0.4335-58.522543l0-46.601284c0-11.054258-0.289-20.880265 0.4335-29.189021 1.445001-16.184012 6.647005-26.73252 25.143018-29.405772 28.105271-3.973753 68.1318-0.867001 100.644324-0.867001l597.146687 0c25.721019 0 79.908559-4.190503 92.407818 6.430255 4.768503 4.046003 7.369505 11.776759 8.742256 21.602766l0 138.142101C922.452551 636.270091 919.273548 644.795597 913.421294 648.6971z"  ></path><path d="M964.668257 750.208424c0 2.442052 0 4.884104 0 7.326155-5.541579 26.479644-21.053665 42.959881-47.554985 48.472561-269.781698 0-539.58507 0-809.359543 0-28.285896-6.170155-45.864334-23.033317-47.56221-55.798716C361.698215 750.208424 663.168786 750.208424 964.668257 750.208424z"  ></path><path d="M634.82509 532.808015l0 63.724547c0 2.239752-1.806251 4.046003-4.046003 4.046003l-82.07606 0c-2.246977 0-4.118253-1.806251-4.118253-4.046003l0-63.724547c0-2.239752 1.878501-4.046003 4.118253-4.046003l82.07606 0C633.018839 528.762012 634.82509 530.568264 634.82509 532.808015z"  ></path><path d="M759.167431 532.808015l0 63.724547c0 2.239752-1.806251 4.046003-4.046003 4.046003l-82.07606 0c-2.239752 0-4.046003-1.806251-4.046003-4.046003l0-63.724547c0-2.239752 1.806251-4.046003 4.046003-4.046003l82.07606 0C757.36118 528.762012 759.167431 530.568264 759.167431 532.808015z"  ></path><path d="M884.449023 532.808015l0 63.724547c0 2.239752-1.806251 4.046003-4.046003 4.046003l-82.07606 0c-2.239752 0-4.046003-1.806251-4.046003-4.046003l0-63.724547c0-2.239752 1.806251-4.046003 4.046003-4.046003l82.07606 0C882.642771 528.762012 884.449023 530.568264 884.449023 532.808015z"  ></path><path d="M226.612291 403.841671l0 0.65025-65.819798 0c-6.141254 0-13.00501-0.36125-20.013265-0.65025L226.612291 403.841671z"  ></path><path d="M727.810908 403.841671l0 0.65025c-137.491851-0.578-277.295703 1.083751-413.703803-0.65025L727.810908 403.841671z"  ></path><path d="M886.833275 403.841671c-8.164256 0.21675-16.545262 0.65025-24.557793 0.65025-21.530516 0-42.627531 0.722501-61.629295-0.65025L886.833275 403.841671z"  ></path><path d="M913.927044 403.841671l0 0.289c-1.156001-0.07225-2.312002-0.21675-3.540253-0.289L913.927044 403.841671z"  ></path><path d="M141.140478 710.687646l-24.637268 0 0-0.794751C124.595216 710.470895 132.831722 710.687646 141.140478 710.687646z"  ></path><path d="M887.555775 710.687646 141.140478 710.687646c22.758767 0 46.167784-1.589501 68.998801-1.589501l614.6312 0C845.289494 709.098144 867.61476 710.687646 887.555775 710.687646z"  ></path><path d="M897.670782 710.543145l0 0.1445-10.107782 0C891.023778 710.687646 894.41953 710.615395 897.670782 710.543145z"  ></path><path d="M59.425669 463.014464c-0.07225 1.300501-0.07225 2.601002-0.07225 3.901503l0-3.901503L59.425669 463.014464z"  ></path><path d="M59.786919 656.933606l-0.4335 0 0-11.849009C59.353418 649.1306 59.425669 653.104353 59.786919 656.933606z"  ></path><path d="M60.220419 497.76674l0 113.439808c0 11.119283-0.867001 22.823792-0.867001 33.87805l0-178.16863C59.353418 477.392225 60.220419 488.085232 60.220419 497.76674z"  ></path><path d="M99.957948 489.674734l0 134.312848c-2.167502-17.340013-0.4335-39.809779-0.4335-58.522543l0-46.601284C99.524448 507.809497 99.235448 497.98349 99.957948 489.674734z"  ></path></symbol><symbol id="icon-zhinengjiankongtixi" viewBox="0 0 1024 1024"><path d="M692.6 560.7H605c-13.4 0-24.2-10.8-24.2-24.2V388.6c0-13.4 10.8-24.2 24.2-24.2h87.6c13.4 0 24.2 10.8 24.2 24.2v147.9c0 13.4-10.9 24.2-24.2 24.2z" fill="#80BAFF" ></path><path d="M730.7 846.5c-4.4 0-8-3.6-8-8v-61.1c0-4.4 3.6-8 8-8s8 3.6 8 8v61.1c0 4.4-3.6 8-8 8zM796.2 846.5c-4.4 0-8-3.6-8-8v-61.1c0-4.4 3.6-8 8-8s8 3.6 8 8v61.1c0 4.4-3.6 8-8 8zM761.3 846.5c-4.4 0-8-3.6-8-8v-33.4c0-4.4 3.6-8 8-8s8 3.6 8 8v33.4c0 4.4-3.6 8-8 8zM212.3 252.1c-4.4 0-8-3.6-8-8V183c0-4.4 3.6-8 8-8s8 3.6 8 8v61.1c0 4.4-3.6 8-8 8zM277.7 252.1c-4.4 0-8-3.6-8-8V183c0-4.4 3.6-8 8-8s8 3.6 8 8v61.1c0 4.4-3.6 8-8 8zM242.9 252.1c-4.4 0-8-3.6-8-8v-33.4c0-4.4 3.6-8 8-8s8 3.6 8 8v33.4c0 4.4-3.6 8-8 8zM828.8 394.7c-32 0-58.1-26.1-58.1-58.1s26.1-58.1 58.1-58.1 58.1 26.1 58.1 58.1-26.1 58.1-58.1 58.1z m0-100.2c-23.2 0-42.1 18.9-42.1 42.1s18.9 42.1 42.1 42.1 42.1-18.9 42.1-42.1-18.9-42.1-42.1-42.1zM830.1 629.1c-38.2 0-69.3-31.1-69.3-69.3s31.1-69.3 69.3-69.3c38.2 0 69.3 31.1 69.3 69.3s-31.1 69.3-69.3 69.3z m0-122.6c-29.4 0-53.3 23.9-53.3 53.3s23.9 53.3 53.3 53.3 53.3-23.9 53.3-53.3-23.9-53.3-53.3-53.3zM716.8 568.7h-134c-4.4 0-8-3.6-8-8V336.3c0-4.4 3.6-8 8-8h134c4.4 0 8 3.6 8 8v224.4c0 4.4-3.6 8-8 8z m-126-16h118V344.3h-118v208.4z" fill="#0084FF" ></path><path d="M632.3 849h-216c-4.4 0-8-3.6-8-8v-74.2c0-10-8.1-18.1-18.1-18.1h-36.8c-34.2 0-62.1-26.8-63.5-61.1-1.5-38.2-10.1-63.3-24.2-70.6-8-4.2-16-7.7-23-10.8-19.4-8.7-34.7-15.5-38.1-29-2.1-8.4 0.8-17.3 9.1-28.2 23.7-30.9 62.4-109 69.1-161.1 3.9-30.5 24.7-78.7 62.5-117.3 33-33.8 91.6-73.2 183.1-69.5 48.2 2 98.1 25.3 144.2 67.4 34.5 31.5 54.6 62 55.5 63.3 0.8 1.3 1.3 2.7 1.3 4.2 0.2 9.4 4 231.2-0.1 258.2-0.7 4.6-2.8 18.6-47.5 80.1-18.1 24.9-36 47.7-41.5 54.8V841c0 4.4-3.6 8-8 8z m-208-16h200V726.5c0-1.8 0.6-3.6 1.7-5 32.4-40.6 84.8-111.7 87.4-129.5 3.1-20.4 1.3-173.1 0-253.2-4.9-7-23.5-32.8-51.9-58.7-30.1-27.4-77.8-60.6-133.8-63-85.6-3.5-140.2 33.2-171 64.7-35.2 36-54.5 80.2-58 108.2-7.2 55.5-46.9 135.7-72.3 168.8-4.9 6.4-7.1 11.4-6.3 14.5 1.5 6 14.9 11.9 29.1 18.3 7.2 3.2 15.4 6.9 23.8 11.2 20 10.3 31.1 38.7 32.8 84.2 1 25.6 21.9 45.7 47.5 45.7h36.8c18.8 0 34.1 15.3 34.1 34.1V833z" fill="#0084FF" ></path><path d="M646.7 707.5c-0.4 0-0.8 0-1.1-0.1-63.8-9.1-121.2-38.6-165.9-85.4-43.9-45.9-74.8-107.5-89.2-178.1-6.8-33.3-5-66.5 5.5-98.8 8.3-25.7 22-50.8 40.8-74.6 31.8-40.3 66.7-62.8 68.2-63.8 3.7-2.4 8.7-1.3 11 2.4 2.4 3.7 1.3 8.7-2.4 11-0.3 0.2-34.4 22.2-64.5 60.6-39.8 50.7-54.3 104.5-42.9 159.9C434.7 580.3 525 674 647.8 691.6c4.4 0.6 7.4 4.7 6.8 9.1-0.6 3.9-4 6.8-7.9 6.8z" fill="#0084FF" ></path><path d="M578.8 456.5H408.4c-4.4 0-8-3.6-8-8s3.6-8 8-8h170.4c4.4 0 8 3.6 8 8s-3.6 8-8 8z" fill="#0084FF" ></path><path d="M401.9 459.8m-54.7 0a54.7 54.7 0 1 0 109.4 0 54.7 54.7 0 1 0-109.4 0Z" fill="#0084FF" ></path><path d="M777.7 345.6h-50.9c-4.4 0-8-3.6-8-8s3.6-8 8-8h50.9c4.4 0 8 3.6 8 8s-3.6 8-8 8zM763.4 567.8h-36.6c-4.4 0-8-3.6-8-8s3.6-8 8-8h36.6c4.4 0 8 3.6 8 8s-3.6 8-8 8z" fill="#0084FF" ></path></symbol><symbol id="icon-phpkaifa" viewBox="0 0 1024 1024"><path d="M365.789184 315.230208" fill="#333303" ></path><path d="M832.292864 374.351872l-21.512192 0-8.835072 45.45536 20.103168 0c0 0 24.457216 0.641024 25.61024-29.45024C848.809984 373.071872 832.292864 374.351872 832.292864 374.351872z" fill="#333303" ></path><path d="M808.7552 275.965952 594.432 231.424c0 0 9.703424 41.621504 9.740288 75.913216 0 0 0.393216 28.051456 0.720896 61.935616l2.28352-11.696128c0 0 29.835264 0.385024 49.42848 0 19.591168-0.385024 38.856704 13.459456 29.835264 44.816384-10.756096 37.390336-49.043456 34.318336-49.043456 34.318336l-21.768192-0.172032-6.148096 28.60032-4.255744 0c-0.12288 11.476992-0.364544 19.245056-0.77824 20.781056-2.121728 7.862272-2.648064 41.40032-77.84448 43.102208s-78.102528-43.37664-77.828096-48.277504l-0.280576-72.38656c0 0 1.009664-10.113024 11.362304-10.776576 10.348544-0.669696 11.360256 11.341824 11.360256 11.341824l0.657408 71.909376c0 0 4.411392 27.500544 55.832576 27.357184 51.423232-0.139264 51.843072-19.95776 53.481472-25.483264s0.561152-199.13728 0.561152-199.13728 2.883584-66.224128-72.577024-83.982336c0 0-9.037824-4.958208-35.616768-4.947968l-110.592 1.964032c0 0-114.581504 3.446784-132.212736 140.498944 0 0-3.166208 24.829952-3.201024 42.51648-0.034816 17.682432-0.256 309.11488-0.256 309.11488s-1.23904 20.412416-24.567808 25.667584c0 0-25.874432 3.432448-32.067584-25.790464l-0.571392-84.527104c0 0-2.56-32.014336-35.885056-34.803712 0 0-30.887936-0.018432-36.255744 34.813952l1.148928 90.066944c0 0 6.176768 54.76352 60.65152 79.110144 54.478848 24.346624 101.081088-6.545408 107.866112-12.109824 6.77888-5.564416 34.033664-25.554944 39.809024-64.768 0 0 1.511424-2.174976 1.511424-35.34848l0.415744-54.075392c0 0 5.410816-27.564032 35.043328-28.489728 29.630464-0.925696 35.043328 28.506112 35.043328 28.506112l0 201.140224c0 0 6.350848 26.646528 30.599168 21.338112l139.425792-12.1344c0 0 20.39808-4.298752 20.39808-24.168448l0-140.679168c0 0 4.110336-12.68736 16.379904-12.68736 12.26752 0 128.86016 0.17408 128.86016 0.17408s9.652224 1.181696 13.983744 12.51328c4.333568 11.329536-0.446464 0-0.446464 0l0.628736 133.349376c0 0 1.875968 23.334912 31.213568 22.534144l115.982336 15.910912 26.257408 3.602432c0 0 24.092672-2.768896 24.567808-24.530944L927.285248 402.868224C927.289344 402.868224 922.79808 300.591104 808.7552 275.965952zM365.789184 315.230208l-9.818112 11.270144c-11.4176-9.981952-24.342528-1.927168-24.342528-1.927168-13.641728 8.548352-6.572032 24.03328-6.572032 24.03328l-11.266048 3.545088c-6.324224 1.601536-10.907648-2.738176-10.907648-2.738176-4.796416-18.034688 7.24992-34.185216 7.24992-34.185216 19.597312-21.254144 46.995456-12.652544 46.995456-12.652544C370.640896 306.82112 365.789184 315.230208 365.789184 315.230208zM742.144 436.711424c0 0 5.593088-24.999936 8.044544-42.35264 1.005568-7.143424 5.402624-19.24096-6.244352-19.267584-9.752576-0.026624-24.338432-0.100352-24.338432-0.100352l-12.294144 61.720576-23.048192 0 21.512192-108.075008 23.6032 0-5.931008 28.932096 24.332288 0c0 0 32.268288-2.551808 28.42624 24.082432-3.842048 26.63424-11.014144 55.062528-11.014144 55.062528L742.144 436.713472zM870.068224 402.393088c-10.756096 37.390336-49.043456 34.318336-49.043456 34.318336l-21.768192-0.172032-6.146048 28.60032L769.80224 465.139712l21.00224-107.563008c0 0 29.835264 0.385024 49.42848 0C859.824128 357.19168 879.089664 371.03616 870.068224 402.393088z" fill="#333303" ></path><path d="M664.031232 390.356992c1.153024-17.28512-15.366144-16.00512-15.366144-16.00512l-21.51424 0-8.835072 45.45536 20.103168 0C638.420992 419.807232 662.880256 420.448256 664.031232 390.356992z" fill="#333303" ></path></symbol><symbol id="icon-SQLserver" viewBox="0 0 1024 1024"><path d="M541.6 883.6c-4.9 4.2-11 6.3-18.2 6.3-13.8 0-26-9.7-36.6-29.2l-35.2 21.2v0.2c8.3 16.4 18.2 28.4 29.8 36.1 11.7 7.7 25.3 11.5 41 11.5 20.1 0 36.4-5.9 48.9-17.7 12.5-11.8 18.7-26.7 18.7-44.8 0-9.3-1.8-17.8-5.3-25.7-3.5-7.8-9.6-16-18.1-24.6-3.4-3.5-13.1-12-29.1-25.3-17.1-14.4-27.4-23.9-30.7-28.3-2.5-3.3-3.8-6.8-3.8-10.5s1.8-7.1 5.3-10c3.5-2.9 8-4.4 13.5-4.4 11.3 0 22.4 7.6 33.3 22.7l31-27.4C574.7 720.3 563.9 711 554 706c-10-5.1-20.5-7.6-31.4-7.6-17.1 0-31.5 5.5-43.1 16.4-11.7 10.9-17.5 24-17.5 39.3 0 10.6 3.5 21.2 10.5 31.8 7 10.6 22.5 25.7 46.5 45.3 12.6 10.3 20.7 17.9 24.4 22.9 3.7 5 5.6 10 5.6 15 0 5.5-2.5 10.3-7.4 14.5zM799.2 732.1c-22.4-22.6-49.3-33.9-80.5-33.9-20.5 0-39.6 5.2-57.5 15.6-17.9 10.4-31.9 24.4-42.1 42-10.2 17.6-15.3 37-15.3 58.1 0 31.5 10.9 58.7 32.8 81.5 21.9 22.8 49.4 34.2 82.5 34.2 19.8 0 37.7-4.4 53.8-13.2l19.5 25.1h49.7L803.8 892c19.4-21.7 29.1-47.4 29.1-77.3 0-32.5-11.2-60.1-33.7-82.6z m-21.6 126l-19.9-25.6h-50l39.4 50.8c-8.8 3.9-18.2 5.9-28.2 5.9-17.4 0-33-5.6-46.7-16.6-17.4-14.3-26.2-33.6-26.2-58 0-21.9 7-39.9 20.9-54.1 13.9-14.2 31.1-21.3 51.7-21.3 20 0 37 7.3 51.1 21.8 14.1 14.6 21.2 32.3 21.2 53.2 0 16.1-4.4 30.7-13.3 43.9zM899 703.8h-41.9v220.3h103v-40H899z" fill="#333303" ></path><path d="M451.3 585c122.9 0 251.9-24.6 325.6-67.6v85.8h0.1c0.9 16.1 14.3 28.9 30.7 28.9s29.7-12.8 30.7-28.9h0.1V234.8c0-202.7-774.1-202.7-774.1 0v552.9c0 80.7 132.6 132.4 285.4 148.3 1.3 0.2 2.7 0.4 4.1 0.4 0.6 0.1 1.1 0.1 1.7 0.2v-0.2c16.7-0.3 30.1-13.9 30.1-30.7 0-17-13.8-30.7-30.7-30.7h-0.8c-147.5-15-228.3-61.8-228.3-87.4v-92.2c53 30.9 134.7 52.3 222.1 61.9 2.3 0.5 4.6 0.8 7 0.8h0.6c16.7-0.3 30.1-13.9 30.1-30.7 0-17-13.8-30.7-30.7-30.7h-1.3c-147.2-15.1-227.9-61.8-227.9-87.3v-92.2c73.6 43.2 202.6 67.8 325.5 67.8zM778 419.1c0 36.9-116.7 98.3-325.6 98.3-208.9 0-325.6-61.4-325.6-92.2V333c73.7 43 202.7 67.6 325.6 67.6 122.9 0 251.9-24.6 325.6-67.6v86.1zM451.3 142.6c208.9 0 325.6 61.4 325.6 92.1 0 30.7-116.7 92.2-325.6 92.2-208.9 0-325.6-61.4-325.6-92.2-0.1-30.6 116.7-92.1 325.6-92.1z" fill="#333303" ></path></symbol><symbol id="icon-mongodb1" viewBox="0 0 1024 1024"><path d="M646.625 227.507c-42.414-73.446-90-111.728-105.528-130.35C525.594 78.541 505.923 32 505.923 32c-4.122 48.394-41.365 57.917-99.303 126.208-57.928 68.27-110.694 204.826-110.694 334.126 0 129.316 48.62 214.144 88.97 273.111 31.068 45.394 68.792 72.975 91.628 94.142 1.602 1.469 3.174 2.97 4.725 4.5 0.246 0.225 0.466 0.466 0.697 0.712a111.427 111.427 0 0 1 3.604 3.691c0.563 0.6 1.034 1.198 1.572 1.797 0.747 0.845 1.52 1.71 2.196 2.55a53.29 53.29 0 0 1 3.17 4.311c15.524 23.793 13.445 104.494 13.445 104.494l26.905 10.353s3.113-106.558 9.319-117.94c6.205-11.381 29.977-28.968 43.443-41.38 13.445-12.41 29.998-32.06 66.207-78.617 36.203-46.556 68.27-146.908 75.504-240.302 7.255-93.384-38.272-212.808-80.686-286.249zM410.506 747.914c-41.303-60.375-83.533-137.963-83.533-255.58 0-126.244 51.979-253.542 103.312-314.06 19.743-23.271 36.674-39.056 51.604-52.967 8.55-7.967 16.722-15.6 24.039-23.624 0 0 15.524 180.654 15.524 381.358 0 200.684-15.524 326.252-15.524 326.252s2.852 36.075-25.672 12.15c-21.504-18.048-47.662-41.242-69.75-73.529z" fill="#333303" ></path></symbol><symbol id="icon-css3" viewBox="0 0 1024 1024"><path d="M157.110857 73.142857l860.013714 0-151.990857 761.709714-459.410286 152.576-398.848-152.576 40.594286-203.410286 169.691429 0-16.603429 83.968 241.152 92.013714 277.723429-92.013714 38.838857-193.682286-690.322286 0 33.133714-169.691429 690.834286 0 21.723429-109.129143-690.322286 0z" fill="#333303" ></path></symbol><symbol id="icon-html5" viewBox="0 0 1024 1024"><path d="M755.419429 341.138286l9.142857-99.986286-505.124571 0 26.843429 305.152 349.696 0-12.580571 130.267429-112.566857 30.281143-111.981714-30.281143-7.460571-80.018286-99.986286 0 12.580571 158.866286 206.848 57.124571 2.267429 0 0-0.585143 205.165714-56.539429 28.598857-310.857143-367.981714 0-8.557714-103.424 385.170286 0zM109.714286 73.142857l804.571429 0-73.142857 821.686857-330.313143 92.598857-327.972571-92.598857z" fill="#333303" ></path></symbol><symbol id="icon-linux" viewBox="0 0 1024 1024"><path d="M452.32912 234.848q-6.272 0.576-8.864 6.016t-4.864 5.44q-2.848 0.576-2.848-2.848 0-6.848 10.848-8.576l5.728 0zM502.05712 242.848q-2.272 0.576-6.56-3.712t-10.016-2.56q13.728-6.272 18.272 1.152 1.728 3.424-1.728 5.152zM301.48112 486.848q-2.272-0.576-3.424 1.728t-2.56 7.136-3.136 7.712-5.728 7.424q-4 5.728-0.576 6.848 2.272 0.576 7.136-4t7.136-10.272q0.576-1.728 1.152-4t1.152-3.424 0.864-2.56 0.288-2.272l0-1.728t-0.576-1.44-1.728-1.152zM790.05712 692q0-10.272-31.424-24 2.272-8.576 4.288-15.712t2.848-14.848 1.728-12.288 0.288-12.864-0.576-11.136-2.016-12.576-2.272-11.712-2.848-14.272-3.136-15.136q-5.728-27.424-26.848-58.848t-41.152-42.848q13.728 11.424 32.576 47.424 49.728 92.576 30.848 158.848-6.272 22.848-28.576 24-17.728 2.272-22.016-10.56t-4.576-47.712-6.56-61.152q-5.152-22.272-11.136-39.424t-11.136-26.016-8.864-14.016-7.424-8.576-4.288-4q-8-35.424-17.728-58.848t-16.864-32-13.44-18.848-8.576-22.848q-2.272-12 3.424-30.56t2.56-28.288-25.44-14.272q-8.576-1.728-25.44-10.272t-20.288-9.152q-4.576-0.576-6.272-14.848t4.576-29.152 20.576-15.424q21.152-1.728 29.152 17.152t2.272 33.152q-6.272 10.848-1.152 15.136t17.152 0.288q7.424-2.272 7.424-20.576l0-21.152q-2.848-17.152-7.712-28.576t-12-17.44-13.44-8.576-15.424-4.288q-61.152 4.576-50.848 76.576 0 8.576-0.576 8.576-5.152-5.152-16.864-6.016t-18.848 0.288-8.864-2.848q0.576-32.576-9.152-51.424t-25.728-19.424q-15.424-0.576-23.712 15.712t-9.44 34.016q-0.576 8.576 2.016 21.152t7.424 21.44 8.864 7.712q5.728-1.728 9.152-8 2.272-5.152-4-4.576-4 0-8.864-8.288t-5.44-19.136q-0.576-12.576 5.152-21.152t19.424-8q9.728 0 15.424 12t5.44 22.272-0.864 12.576q-12.576 8.576-17.728 16.576-4.576 6.848-15.712 13.44t-11.712 7.136q-7.424 8-8.864 15.424t4.288 10.272q8 4.576 14.272 11.136t9.152 10.848 10.56 7.424 20.288 3.712q26.848 1.152 58.272-8.576 1.152-0.576 13.152-4t19.712-6.016 16.864-7.424 12-10.016q5.152-8 11.424-4.576 2.848 1.728 3.712 4.864t-1.728 6.848-9.44 5.44q-11.424 3.424-32.288 12.288t-26.016 11.136q-25.152 10.848-40 13.152-14.272 2.848-45.152-1.152-5.728-1.152-5.152 1.152t9.728 10.848q14.272 13.152 38.272 12.576 9.728-0.576 20.576-4t20.576-8 19.136-10.016 17.152-9.728 14.016-6.848 10.016-1.44 4.864 6.272q0 1.152-0.576 2.56t-2.272 2.848-3.424 2.56-4.864 2.848-5.152 2.56-5.728 2.848-5.44 2.56q-16 8-38.56 25.152t-38.016 24.576-28 0.576q-12-6.272-36-41.728-12.576-17.728-14.272-12.576-0.576 1.728-0.576 5.728 0 14.272-8.576 32.288t-16.864 31.712-12 33.152 6.56 36q-13.152 3.424-35.712 51.424t-27.136 80.576q-1.152 10.272-0.864 39.424t-3.136 33.728q-4.576 13.728-16.576 1.728-18.272-17.728-20.576-53.728-1.152-16 2.272-32 2.272-10.848-0.576-10.272l-2.272 2.848q-20.576 37.152 5.728 94.848 2.848 6.848 14.272 16t13.728 11.424q11.424 13.152 59.424 51.712t53.152 43.712q9.152 8.576 10.016 21.728t-8 24.576-26.016 13.152q4.576 8.576 16.576 25.44t16 30.848 4 40.288q26.272-13.728 4-52.576-2.272-4.576-6.016-9.152t-5.44-6.848-1.152-3.424q1.728-2.848 7.424-5.44t11.424 1.44q26.272 29.728 94.848 20.576 76-8.576 101.152-49.728 13.152-21.728 19.424-17.152 6.848 3.424 5.728 29.728-0.576 14.272-13.152 52.576-5.152 13.152-3.424 21.44t13.728 8.864q1.728-10.848 8.288-44t7.712-51.424q1.152-12-3.712-42.016t-4.288-55.424 13.152-40.288q8.576-10.272 29.152-10.272 0.576-21.152 19.712-30.272t41.44-6.016 34.272 12.864zM431.20912 219.424q1.728-9.728-1.44-17.152t-6.56-8.576q-5.152-1.152-5.152 4 1.152 2.848 2.848 3.424 5.728 0 4 8.576-1.728 11.424 4.576 11.424 1.728 0 1.728-1.728zM670.63312 332q-1.152-4.576-3.712-6.56t-7.424-2.848-8.288-3.136q-2.848-1.728-5.44-4.576t-4-4.576-3.136-3.712-2.272-2.272-2.272 0.864q-8 9.152 4 24.864t22.272 18.016q5.152 0.576 8.288-4.576t2.016-11.424zM568.90512 210.272q0-6.272-2.848-11.136t-6.272-7.136-5.152-1.728q-8 0.576-4 4l2.272 1.152q8 2.272 10.272 17.728 0 1.728 4.576-1.152zM599.75312 77.152q0-1.152-1.44-2.848t-5.152-4-5.44-3.424q-8.576-8.576-13.728-8.576-5.152 0.576-6.56 4.288t-0.576 7.424-0.288 7.136q-0.576 2.272-3.424 6.016t-3.424 5.152 1.728 4.864q2.272 1.728 4.576 0t6.272-5.152 8.576-5.152q0.576-0.576 5.152-0.576t8.576-1.152 5.152-4zM922.63312 843.424q11.424 6.848 17.728 14.016t6.848 13.728-1.44 12.864-8.864 12.576-13.44 11.136-17.152 10.56-18.016 9.44-18.272 8.864-15.424 7.424q-21.728 10.848-48.864 32t-43.136 36.576q-9.728 9.152-38.848 11.136t-50.848-8.288q-10.272-5.152-16.864-13.44t-9.44-14.56-12.576-11.136-26.848-5.44q-25.152-0.576-74.272-0.576-10.848 0-32.576 0.864t-33.152 1.44q-25.152 0.576-45.44 8.576t-30.56 17.152-24.864 16.288-30.56 6.56q-16.576-0.576-63.424-17.728t-83.424-24.576q-10.848-2.272-29.152-5.44t-28.576-5.152-22.56-5.44-19.136-8.288-9.728-11.136q-5.728-13.152 4-38.016t10.272-31.136q0.576-9.152-2.272-22.848t-5.728-24.288-2.56-20.864 6.016-15.424q8-6.848 32.576-8t34.272-6.848q17.152-10.272 24-20t6.848-29.152q12 41.728-18.272 60.576-18.272 11.424-47.424 8.576-19.424-1.728-24.576 5.728-7.424 8.576 2.848 32.576 1.152 3.424 4.576 10.272t4.864 10.272 2.56 9.728 0.576 12.576q0 8.576-9.728 28t-8 27.424q1.728 9.728 21.152 14.848 11.424 3.424 48.288 10.56t56.864 11.712q13.728 3.424 42.272 12.576t47.136 13.152 31.712 2.272q24.576-3.424 36.864-16t13.152-27.424-4.288-33.44-10.848-29.728-11.424-20.864q-69.152-108.576-96.576-138.272-38.848-42.272-64.576-22.848-6.272 5.152-8.576-8.576-1.728-9.152-1.152-21.728 0.576-16.576 5.728-29.728t13.728-26.848 12.576-24q4.576-12 15.136-41.152t16.864-44.576 17.152-34.848 22.272-30.848q62.848-81.728 70.848-111.424-6.848-64-9.152-177.152-1.152-51.424 13.728-86.56t60.576-59.712q22.272-12 59.424-12 30.272-0.576 60.576 7.712t50.848 23.712q32.576 24 52.288 69.44t16.864 84.288q-2.848 54.272 17.152 122.272 19.424 64.576 76 124.576 31.424 33.728 56.864 93.152t34.016 109.152q4.576 28 2.848 48.288t-6.848 31.712-11.424 12.576q-5.728 1.152-13.44 10.848t-15.424 20.288-23.136 19.136-34.848 8q-10.272-0.576-18.016-2.848t-12.864-7.712-7.712-8.864-6.56-11.712-5.152-11.136q-12.576-21.152-23.424-17.152t-16 28 4 55.424q11.424 40 0.576 111.424-5.728 37.152 10.272 57.44t41.728 18.848 48.576-20.288q33.728-28 51.136-38.016t59.136-24.288q30.272-10.272 44-20.864t10.56-19.712-14.272-16.288-29.44-13.44q-18.848-6.272-28.288-27.424t-8.576-41.44 8.864-27.136q0.576 17.728 4.576 32.288t8.288 23.136 11.712 16.288 12 10.848 12.288 7.424 9.44 5.44z" fill="#333303" ></path></symbol><symbol id="icon-dashujucunchu" viewBox="0 0 1026 1024"><path d="M975.644444 662.755556V361.244444c28.444444-14.222222 51.2-42.666667 51.2-76.8 0-48.355556-36.977778-85.333333-85.333333-85.333333-19.911111 0-39.822222 8.533333-54.044444 19.911111L594.488889 65.422222C585.955556 28.444444 551.822222 0 512 0c-42.666667 0-79.644444 31.288889-85.333333 73.955556L145.066667 224.711111C130.844444 207.644444 108.088889 199.111111 85.333333 199.111111c-48.355556 0-85.333333 36.977778-85.333333 85.333333 0 39.822222 28.444444 73.955556 65.422222 82.488889v290.133334C28.444444 665.6 0 699.733333 0 739.555556c0 48.355556 36.977778 85.333333 85.333333 85.333333 22.755556 0 45.511111-8.533333 59.733334-25.6l281.6 150.755555c5.688889 42.666667 39.822222 73.955556 85.333333 73.955556 39.822222 0 73.955556-28.444444 82.488889-65.422222l290.133333-153.6c14.222222 11.377778 34.133333 19.911111 54.044445 19.911111 48.355556 0 85.333333-36.977778 85.333333-85.333333 0-34.133333-19.911111-62.577778-48.355556-76.8z m-96.711111 14.222222l-133.688889-65.422222v-199.111112l133.688889-65.422222c11.377778 11.377778 22.755556 17.066667 36.977778 19.911111v290.133334c-14.222222 2.844444-25.6 11.377778-36.977778 19.911111zM853.333333 295.822222l-139.377777 68.266667L540.444444 264.533333V164.977778c19.911111-8.533333 36.977778-22.755556 45.511112-39.822222l267.377777 142.222222v28.444444zM520.533333 705.422222l-170.666666-96.711111v-193.422222l170.666666-96.711111 170.666667 96.711111v193.422222l-170.666667 96.711111zM483.555556 164.977778v105.244444l-167.822223 96.711111L170.666667 295.822222V284.444444v-8.533333l270.222222-145.066667c8.533333 17.066667 25.6 28.444444 42.666667 34.133334zM145.066667 347.022222l147.911111 73.955556v184.888889l-147.911111 73.955555c-5.688889-5.688889-14.222222-11.377778-22.755556-17.066666V361.244444c8.533333-2.844444 14.222222-8.533333 22.755556-14.222222zM170.666667 728.177778l145.066666-73.955556 167.822223 96.711111v105.244445c-17.066667 5.688889-34.133333 17.066667-42.666667 34.133333l-270.222222-142.222222V739.555556v-11.377778z m369.777777 130.844444v-99.555555l176.355556-99.555556 139.377778 68.266667v11.377778c0 5.688889 0 11.377778 2.844444 17.066666l-267.377778 142.222222c-14.222222-19.911111-31.288889-34.133333-51.2-39.822222z" fill="#333303" ></path></symbol><symbol id="icon-VPN" viewBox="0 0 1024 1024"><path d="M787.8 193.9c-49 0-92.1 19.8-123.5 51.6l-0.3-0.3-1.5 2.3c-13.1 13.7-23.9 29.5-31.8 46.8L555.4 405l-70.7 96.8-96.6 133c-3.1 4.1-5.9 8.3-8.6 12.5l-5.2 7.7 0.5 0.2c-13.2 24.1-20.7 51.7-20.7 81 0 94.3 77.3 170.7 172.7 170.7 95.3 0 172.6-76.4 172.6-170.7 0-81.4-57.6-149.4-134.7-166.5L521.6 634c1.8-0.1 3.5-0.3 5.3-0.3 57.2 0 103.6 45.9 103.6 102.4-0.3 56.4-46.7 102.4-103.9 102.4S423 792.7 423 736.2c0-22.4 7.4-42.7 19.7-59.7h0.1l-0.1-0.6v-0.1s50.6-71.6 50.4-71.6c0 0 131.8-183.1 132.1-182.5l74.1-109.9c1.7-2.7 3.5-5.4 5.4-7.9l2.2-3.3 0.3 0.3c19-23.4 47.7-38.6 80.4-38.6 57.2 0 103.6 45.9 103.6 102.5s-46.4 102.4-103.6 102.4c-45.3 0-83.4-29-97.4-69.1l-43.4 64.6c31.2 43.9 82.5 72.7 140.8 72.7 95.4 0 172.7-76.4 172.7-170.7 0.1-94.3-77.5-170.8-172.5-170.8zM402.7 409.7l55.4 71 42.2-57.9-116.8-147c-7.2-11.8-15.8-22.8-25.8-32.4l-1.9-2.5-0.4 0.3c-31-29.3-72.8-47.3-119-47.3-95.3 0-172.6 76.5-172.6 170.8s77.3 170.7 172.6 170.7c79.5-0.1 146.3-53.3 166.3-125.7z m-167.4 57.4c-57.2 0-103.6-45.9-103.6-102.4 0-56.6 46.4-102.5 103.6-102.5s103.6 45.9 103.6 102.5c0 56.5-46.4 102.4-103.6 102.4z" fill="#333303" ></path><path d="M620.8 192l0.1 0.2-105.6 146.9-110.2-146.9z" fill="#333303" ></path></symbol><symbol id="icon-jquery" viewBox="0 0 1024 1024"><path d="M65.450667 250.624c-90.581333 130.133333-79.36 299.392-10.112 437.589333 1.578667 3.370667 3.328 6.570667 5.034666 9.770667 0.981333 2.218667 2.090667 4.266667 3.285334 6.357333 0.554667 1.194667 1.322667 2.432 2.005333 3.541334 1.109333 2.218667 2.304 4.352 3.456 6.485333l6.698667 11.306667c1.237333 2.090667 2.432 4.138667 3.84 6.229333 2.346667 4.010667 5.12 7.978667 7.552 11.989333 1.109333 1.664 2.133333 3.328 3.370666 4.992a271.36 271.36 0 0 0 13.226667 18.944c3.328 4.565333 6.656 9.002667 10.24 13.44 1.152 1.621333 2.432 3.242667 3.626667 4.864l9.429333 11.477334c1.152 1.322667 2.304 2.858667 3.541333 4.224 4.181333 5.034667 8.618667 9.941333 13.056 14.890666 0 0.085333 0.128 0.170667 0.213334 0.298667a133.546667 133.546667 0 0 0 18.090666 18.773333c3.413333 3.498667 6.826667 6.997333 10.453334 10.410667l4.309333 4.138667c4.736 4.437333 9.472 8.874667 14.464 13.141333 0.085333 0 0.128 0.085333 0.213333 0.128l2.432 2.133333c4.352 3.797333 8.746667 7.594667 13.226667 11.093334l5.333333 4.48c3.626667 2.901333 7.381333 5.674667 11.093334 8.533333l5.802666 4.437333c3.968 2.986667 8.192 5.930667 12.245334 8.832 1.493333 1.066667 2.986667 2.133333 4.522666 3.114667l1.237334 0.981333 11.989333 7.893334 5.12 3.413333c6.272 4.010667 12.501333 7.808 18.688 11.562667 1.792 0.896 3.584 1.877333 5.248 2.901333 4.608 2.645333 9.386667 5.333333 14.037333 7.808 2.56 1.450667 5.205333 2.688 7.850667 4.010667 3.2 1.792 6.528 3.541333 9.941333 5.333333a13.824 13.824 0 0 1 2.389334 0.981333c1.408 0.64 2.730667 1.322667 4.096 2.005334 5.12 2.56 10.453333 4.992 16 7.424 1.024 0.426667 2.133333 0.853333 3.242666 1.450666 6.144 2.688 12.288 5.248 18.645334 7.765334 1.450667 0.426667 2.986667 1.152 4.48 1.706666 5.76 2.176 11.690667 4.394667 17.536 6.485334l2.133333 0.768c6.528 2.218667 12.970667 4.352 19.584 6.4 1.536 0.426667 3.114667 0.981333 4.736 1.408 6.784 2.048 13.354667 4.48 20.181333 5.802666 437.76 79.786667 564.992-263.210667 564.992-263.210666-106.88 139.178667-296.533333 175.872-476.16 135.04-6.656-1.536-13.312-3.669333-20.010666-5.632a576.938667 576.938667 0 0 1-24.192-7.722667l-2.645334-1.024c-5.802667-1.962667-11.392-4.138667-17.066666-6.314667a68.821333 68.821333 0 0 0-4.693334-1.749333c-6.272-2.517333-12.373333-5.12-18.432-7.808-1.322667-0.426667-2.432-1.024-3.754666-1.536a998.826667 998.826667 0 0 1-15.402667-7.253333 63.274667 63.274667 0 0 1-4.522667-2.218667c-4.010667-1.877333-8.021333-4.010667-11.946666-6.058667a168.192 168.192 0 0 1-7.978667-4.096c-4.821333-2.56-9.642667-5.333333-14.464-7.978666-1.450667-1.024-3.114667-1.877333-4.778667-2.816a678.485333 678.485333 0 0 1-18.688-11.477334 89.770667 89.770667 0 0 1-5.034666-3.370666 256.085333 256.085333 0 0 1-13.312-8.789334c-1.493333-0.981333-2.858667-2.048-4.394667-3.114666a407.082667 407.082667 0 0 1-12.544-9.045334c-1.792-1.450667-3.712-2.816-5.632-4.266666-3.754667-2.944-7.552-5.76-11.306667-8.874667l-5.034666-4.010667a451.413333 451.413333 0 0 1-14.250667-11.989333 11.008 11.008 0 0 0-1.578667-1.28l-14.805333-13.482667-4.266667-4.010666c-3.498667-3.541333-7.082667-6.954667-10.666666-10.453334l-4.138667-4.266666a386.986667 386.986667 0 0 1-13.184-13.781334l-0.64-0.682666a765.610667 765.610667 0 0 1-13.354667-15.104c-1.152-1.322667-2.218667-2.730667-3.413333-4.138667l-9.642667-11.818667a906.581333 906.581333 0 0 1-14.506666-19.114666C92.16 502.869333 56.106667 315.136 135.850667 161.152" fill="#333303" ></path><path d="M346.496 141.013333c-65.664 94.250667-61.952 220.288-10.837333 319.957334a388.266667 388.266667 0 0 0 28.885333 48.298666c9.813333 14.08 20.650667 30.72 33.792 42.069334 4.565333 5.205333 9.514667 10.24 14.677333 15.317333l3.84 3.84c4.864 4.693333 9.856 9.301333 14.933334 13.866667l0.64 0.554666a420.48 420.48 0 0 0 17.664 14.592c1.450667 0.981333 2.688 2.133333 4.096 3.114667 5.973333 4.608 11.989333 9.045333 18.218666 13.44l0.64 0.384c2.645333 1.92 5.461333 3.669333 8.448 5.546667 1.194667 0.768 2.56 1.792 3.84 2.56 4.522667 2.901333 8.96 5.632 13.525334 8.405333 0.725333 0.298667 1.365333 0.682667 2.048 0.981333 3.84 2.346667 8.021333 4.608 12.032 6.698667 1.408 0.853333 2.773333 1.493333 4.224 2.304 2.858667 1.408 5.674667 2.901333 8.405333 4.352l1.365333 0.597333c5.76 2.816 11.648 5.461333 17.408 8.106667 1.450667 0.554667 2.688 1.024 3.925334 1.621333 4.736 2.048 9.557333 4.010667 14.293333 5.845334 2.133333 0.725333 4.138667 1.578667 6.144 2.218666 4.352 1.621333 8.917333 3.114667 13.226667 4.608l5.973333 1.92c6.229333 1.92 12.544 4.437333 19.114667 5.504 337.92 56.021333 416.170667-204.245333 416.170666-204.245333-70.442667 101.376-206.762667 149.674667-352.042666 111.957333a342.613333 342.613333 0 0 1-19.114667-5.546666c-2.048-0.554667-3.84-1.194667-5.802667-1.792-4.437333-1.536-9.002667-3.029333-13.312-4.650667l-6.144-2.304c-4.778667-1.92-9.642667-3.712-14.293333-5.76-1.450667-0.64-2.773333-1.066667-3.882667-1.706667-5.973333-2.688-11.989333-5.333333-17.792-8.192l-8.789333-4.565333-5.077333-2.56a241.92 241.92 0 0 1-11.306667-6.4 26.453333 26.453333 0 0 1-2.645333-1.450667c-4.522667-2.816-9.216-5.546667-13.525334-8.448-1.450667-0.810667-2.773333-1.792-4.138666-2.645333l-8.874667-5.802667c-6.144-4.266667-12.16-8.874667-18.218667-13.312-1.365333-1.237333-2.688-2.261333-4.010666-3.370666-63.872-50.218667-114.261333-118.869333-138.154667-196.608-25.173333-80.810667-19.626667-171.434667 23.850667-244.992" fill="#333303" ></path><path d="M582.826667 59.050667c-38.741333 56.832-42.453333 127.402667-15.786667 190.08 28.330667 66.56 86.272 118.826667 153.770667 143.573333 2.773333 1.066667 5.461333 1.962667 8.32 2.986667l3.754666 1.152c3.925333 1.237333 7.893333 2.688 11.946667 3.584 186.709333 36.010667 237.226667-95.872 250.837333-115.242667-44.458667 63.829333-118.997333 79.146667-210.432 56.917333a206.677333 206.677333 0 0 1-22.016-6.826666 270.677333 270.677333 0 0 1-26.325333-10.837334 278.229333 278.229333 0 0 1-46.08-28.16c-81.92-62.037333-132.650667-180.48-79.232-276.949333" fill="#333303" ></path></symbol><symbol id="icon-docker" viewBox="0 0 1024 1024"><path d="M205.653333 737.066667c-29.184 0-55.637333-23.893333-55.637333-52.906667s23.893333-53.034667 55.68-53.034667c31.914667 0 55.893333 23.893333 55.893333 52.992s-26.538667 52.906667-55.68 52.906667z m683.178667-288.554667c-5.76-42.325333-32-76.8-66.56-103.253333l-13.44-10.666667-10.837333 13.226667c-21.077333 23.893333-29.44 66.261333-26.88 97.92 2.56 23.978667 10.24 47.786667 23.637333 66.304-10.837333 5.546667-24.234667 10.666667-34.56 16.085333a225.706667 225.706667 0 0 1-71.68 10.666667H4.138667l-2.56 15.786666a297.813333 297.813333 0 0 0 23.978666 151.04l10.410667 18.56v2.56c64 105.941333 177.92 153.6 301.994667 153.6 238.677333 0 434.432-103.253333 527.232-325.674666 60.8 2.645333 122.197333-13.226667 151.04-71.509334l7.68-13.226666-12.8-7.978667c-34.56-21.077333-81.92-23.893333-121.6-13.226667l-0.768 0.085334z m-341.674667-42.325333h-103.594666v103.253333h103.68V406.101333l-0.085334 0.128z m0-129.834667h-103.594666v103.253333h103.68V276.48l-0.085334-0.128z m0-132.437333h-103.594666v103.253333h103.68v-103.253333h-0.085334z m126.72 262.272H570.88v103.253333h103.253333V406.101333l-0.298666 0.128z m-383.914666 0H187.008v103.253333h103.338667V406.101333l-0.426667 0.128z m129.28 0h-102.4v103.253333H419.84V406.101333l-0.64 0.128z m-257.28 0H59.733333v103.253333h103.594667V406.101333l-1.28 0.128z m257.28-129.834667h-102.4v103.253333H419.84V276.48l-0.64-0.128z m-129.92 0H187.178667v103.253333H290.133333V276.48l-0.682666-0.128z" fill="#333303" ></path></symbol><symbol id="icon-python" viewBox="0 0 1029 1024"><path d="M610.56 7.68l38.4 8.533333 31.146667 11.093334 25.173333 12.8 19.2 13.653333 14.506667 14.506667 10.666666 14.506666 6.826667 14.08 4.266667 12.8 1.706666 11.093334 0.853334 8.533333-0.426667 5.546667V362.666667l-2.133333 26.88-5.546667 23.466666-8.96 19.626667-11.093333 16.213333-12.8 13.226667-14.08 10.666667-14.933334 8.106666-14.933333 5.973334-14.08 4.266666-12.8 2.986667-11.093333 1.706667-8.96 0.853333H376.746667l-29.44 2.133333-25.173334 5.973334-21.333333 9.386666-17.493333 11.52-14.08 13.653334-11.52 14.933333-8.533334 15.36-6.4 15.786667-4.266666 14.933333-2.986667 13.653333-1.706667 11.52-0.853333 8.96v130.56H137.813333l-8.96-1.28-11.946666-2.986666-13.653334-5.12-14.933333-7.68-15.36-11.093334-15.36-15.36-14.933333-19.626666-13.653334-25.173334-11.946666-31.146666-8.96-37.546667-5.973334-44.8L0 510.72l2.56-52.053333 6.826667-44.373334 10.24-37.12 13.653333-30.293333 15.36-24.32 17.066667-18.773333 17.92-14.08 17.92-10.24 17.066666-6.826667 15.36-4.266667 13.653334-2.133333 10.24-0.426667h6.826666l2.56 0.426667h348.16v-35.413333H266.24l-0.426667-117.333334-0.853333-15.786666 2.133333-14.506667 4.693334-13.226667 7.253333-11.946666 10.666667-11.093334 13.226666-9.813333 16.213334-8.533333 18.773333-7.68 21.76-6.4 24.746667-5.12 27.306666-4.266667 30.293334-2.56 32.853333-1.706667 35.84-0.853333 54.186667 2.133333 45.653333 5.546667z m-268.8 84.48l-9.813333 14.08-3.413334 17.493333 3.413334 17.493334 9.813333 14.506666 14.08 9.386667 17.493333 3.84 17.493334-3.84 14.08-9.386667 9.813333-14.506666 3.413333-17.493334-3.413333-17.493333-9.813333-14.08-14.08-9.386667-17.493334-3.84-17.493333 3.84-14.08 9.386667z" fill="#333303" ></path><path d="M900.266667 260.693333l11.946666 2.56 13.653334 5.12 14.933333 7.68 15.36 11.52 15.36 14.933334 14.933333 20.053333 13.653334 25.173333 11.946666 31.146667 8.96 37.546667 5.973334 44.373333 2.133333 52.48-2.56 52.48-6.826667 44.373333-10.24 36.693334-13.653333 30.293333-15.36 24.32-17.066667 19.2-17.92 14.08-17.92 10.24-17.066666 6.826667-15.36 3.84-13.653334 2.133333-10.24 0.853333-6.826666-0.426666h-350.72v34.986666h249.173333l0.426667 117.76 0.853333 15.36-2.133333 14.506667-4.693334 13.226667-7.253333 12.373333-10.666667 10.666667-13.226666 10.24-16.213334 8.533333-18.773333 7.253333-21.76 6.4-24.746667 5.546667-27.306666 3.84-30.293334 2.986667-32.853333 1.706666-35.84 0.426667-54.186667-1.706667-45.653333-5.973333-38.4-8.533333-31.146667-10.666667-25.173333-12.8-19.2-14.08-14.506667-14.506667-10.666666-14.506666-6.826667-14.08-4.266667-12.8-1.706666-10.666667-0.853334-8.533333 0.426667-5.546667v-227.84l2.133333-27.306667 5.546667-23.04 8.96-19.626666 11.093333-16.213334 12.8-13.653333 14.08-10.24 14.933334-8.533333 14.933333-5.973334 14.08-4.266666 12.8-2.56 11.093333-1.706667 8.96-0.853333 5.546667-0.426667h249.173333l29.44-2.133333 25.173334-5.973334 21.333333-8.96 17.493333-11.946666 14.08-13.653334 11.52-14.933333 8.533334-15.36 6.4-15.36 4.266666-14.933333 2.986667-13.653334 1.706667-11.946666 0.853333-8.96V258.986667h89.173333l5.973334 0.426666 8.96 1.28z m-276.053334 608l-9.813333 14.08-3.413333 17.493334 3.413333 17.493333 9.813333 14.08 14.08 9.813333 17.493334 3.413334 17.493333-3.413334 14.08-9.813333 9.813333-14.08 3.413334-17.493333-3.413334-17.493334-9.813333-14.08-14.08-9.813333-17.493333-3.413333-17.493334 3.413333-14.08 9.813333z" fill="#333303" ></path></symbol><symbol id="icon-php" viewBox="0 0 1024 1024"><path d="M299.093333 435.498667h-40.277333l-21.973333 112.981333h35.754666c23.722667 0 41.386667-4.48 52.992-13.397333 11.605333-8.96 19.413333-23.850667 23.466667-44.757334 3.925333-20.053333 2.133333-34.218667-5.290667-42.453333-7.466667-8.234667-22.314667-12.373333-44.672-12.373333z" fill="#333303" ></path><path d="M512 242.688C229.248 242.688 0 363.264 0 512s229.248 269.354667 512 269.354667S1024 660.736 1024 512c0-148.736-229.248-269.312-512-269.312z m-139.093333 317.909333c-11.136 10.666667-24.533333 18.688-39.125334 23.509334-14.336 4.608-32.64 6.997333-54.826666 6.997333H228.565333l-13.952 71.722667H155.818667l52.48-269.909334h113.066666c34.005333 0 58.794667 8.917333 74.410667 26.794667 15.616 17.834667 20.309333 42.752 14.08 74.752a121.002667 121.002667 0 0 1-13.013333 36.138667c-6.101333 10.88-14.08 20.906667-23.936 29.994666z m171.690666 30.506667l23.168-119.424c2.688-13.568 1.664-22.869333-2.901333-27.776-4.565333-4.949333-14.336-7.424-29.312-7.424H488.96l-30.037333 154.666667H400.554667l52.48-269.952h58.325333l-13.952 71.765333h51.968c32.725333 0 55.253333 5.717333 67.669333 17.109333s16.128 29.866667 11.221334 55.424l-24.405334 125.610667h-59.264z m324.138667-96.64a118.698667 118.698667 0 0 1-13.013333 36.138667c-6.101333 10.88-14.08 20.906667-23.936 29.994666a104.106667 104.106667 0 0 1-39.125334 23.509334c-14.336 4.608-32.64 6.997333-54.869333 6.997333h-50.346667l-13.952 71.765333h-58.794666l52.48-269.909333h113.024c34.005333 0 58.794667 8.917333 74.410666 26.794667 15.616 17.792 20.352 42.709333 14.122667 74.709333z" fill="#333303" ></path><path d="M758.016 435.498667h-40.234667l-22.016 112.981333h35.754667c23.765333 0 41.429333-4.48 52.992-13.397333 11.605333-8.96 19.413333-23.850667 23.509333-44.757334 3.925333-20.053333 2.090667-34.218667-5.333333-42.453333s-22.357333-12.373333-44.672-12.373333z" fill="#333303" ></path></symbol><symbol id="icon-java" viewBox="0 0 1024 1024"><path d="M377.596784 791.989528s-39.199482 22.799699 27.799633 30.399598c81.198926 9.199878 122.598379 7.999894 211.997197-8.999881 0 0 23.599688 14.799804 56.399254 27.599635C473.395518 926.787745 220.198866 835.988946 377.596784 791.989528m-24.399677-112.198517s-43.799421 32.399572 23.199693 39.399479c86.598855 8.999881 155.197948 9.599873 273.596382-13.199825 0 0 16.399783 16.599781 42.199442 25.599661-242.596792 70.999061-512.593222 5.799923-338.995517-51.799315m206.397271-190.197485c49.399347 56.799249-12.999828 107.998572-12.999828 107.998572s125.398342-64.799143 67.799103-145.798072c-53.799289-75.599-94.998744-113.198503 128.198305-242.596792 0.199997 0-350.395367 87.598842-182.99758 280.396292m265.196493 385.194907s28.999617 23.799685-31.799579 42.399439c-115.798469 34.999537-481.593632 45.599397-583.192289 1.399982-36.599516-15.799791 31.999577-37.999498 53.599291-42.599437 22.399704-4.799937 35.399532-3.999947 35.399532-3.999947-40.599463-28.599622-262.596528 56.199257-112.798508 80.398937 408.3946 66.399122 744.790152-29.799606 638.791553-77.598974M396.396536 563.592548s-186.197538 44.199416-65.999128 60.199204c50.799328 6.79991 151.99799 5.199931 246.196745-2.599966 76.998982-6.399915 154.397958-20.39973 154.397958-20.39973s-27.19964 11.599847-46.799381 24.999669c-188.997501 49.799342-553.992675 26.599648-448.994063-24.19968 88.998823-42.799434 161.197869-37.999498 161.197869-37.999497m333.995583 186.597532c192.197459-99.79868 103.198635-195.797411 41.199456-182.797582-15.199799 3.199958-21.999709 5.999921-21.999709 5.99992s5.599926-8.799884 16.399783-12.599833c122.598379-43.199429 216.997131 127.198318-39.599477 194.597427 0-0.199997 2.99996-2.799963 3.999947-5.199932M614.393653 0s106.398593 106.398593-100.998664 269.99643c-166.197802 131.198265-37.999498 206.197274 0 291.596144-96.998717-87.598842-168.197776-164.597824-120.398408-236.396874C463.195652 220.197088 657.393085 168.997765 614.393653 0m-198.997369 1020.786502c184.397562 11.799844 467.593817-6.599913 474.19373-93.798759 0 0-12.799831 32.999564-152.397985 59.399214-157.397919 29.599609-351.595351 26.199654-466.59383 7.199905 0-0.199997 23.599688 19.399743 144.798085 27.19964" fill="#333303" ></path></symbol><symbol id="icon-mysql" viewBox="0 0 1024 1024"><path d="M1001.632 793.792c-7.84-13.856-26.016-37.536-93.12-83.2a1096.224 1096.224 0 0 0-125.152-74.144c-30.592-82.784-89.824-190.112-176.256-319.36-93.056-139.168-201.12-197.792-321.888-174.56a756.608 756.608 0 0 0-40.928-37.696C213.824 78.688 139.2 56.48 96.32 60.736c-19.424 1.952-34.016 9.056-43.36 21.088-21.664 27.904-14.432 68.064 85.504 198.912 19.008 55.616 23.072 84.672 23.072 99.296 0 30.912 15.968 66.368 49.984 110.752l-32 109.504c-28.544 97.792 23.328 224.288 71.616 268.384 25.76 23.552 47.456 20.032 58.176 15.84 21.504-8.448 38.848-29.472 50.048-89.504 5.728 14.112 11.808 29.312 18.208 45.6 34.56 87.744 68.352 136.288 106.336 152.736a32.032 32.032 0 0 0 25.44-58.688c-9.408-4.096-35.328-23.712-72.288-117.504-31.168-79.136-53.856-132.064-69.376-161.856a32.224 32.224 0 0 0-35.328-16.48 32.032 32.032 0 0 0-25.024 29.92c-3.872 91.04-13.056 130.4-19.2 147.008-26.496-30.464-68.128-125.984-47.232-197.536 20.768-71.232 32.992-112.928 36.64-125.248a31.936 31.936 0 0 0-5.888-29.28c-41.664-51.168-46.176-75.584-46.176-83.712 0-29.472-9.248-70.4-28.288-125.152a31.104 31.104 0 0 0-4.768-8.896c-53.824-70.112-73.6-105.216-80.832-121.888 25.632 1.216 74.336 15.04 91.008 29.376a660.8 660.8 0 0 1 49.024 46.304c8 8.448 19.968 11.872 31.232 8.928 100.192-25.92 188.928 21.152 271.072 144 87.808 131.328 146.144 238.048 173.408 317.216a32 32 0 0 0 16.384 18.432 1004.544 1004.544 0 0 1 128.8 75.264c7.392 5.024 14.048 9.696 20.064 14.016h-98.848a32.032 32.032 0 0 0-24.352 52.736 3098.752 3098.752 0 0 0 97.856 110.464 32 32 0 1 0 46.56-43.872 2237.6 2237.6 0 0 1-50.08-55.328h110.08a32.032 32.032 0 0 0 27.84-47.776z" fill="#333303" ></path><path d="M320 289.472c12.672 21.76 22.464 37.344 29.344 46.784 8.288 16.256 21.184 29.248 29.44 45.536l2.016-1.984c14.528-9.952 25.92-49.504 2.752-75.488-12.032-18.176-51.04-17.664-63.552-14.848z" fill="#333303" ></path></symbol><symbol id="icon-weizhi" viewBox="0 0 1024 1024"><path d="M515.5 260c-69.6 0-126 56.4-126 126s56.4 126 126 126 126-56.4 126-126-56.4-126-126-126z m0 212c-47.5 0-86-38.5-86-86s38.5-86 86-86 86 38.5 86 86-38.5 86-86 86z m-3-392h-1c-176.7 0-320 143.3-320 320 0 40.8 9.2 93.6 35.3 145.8C288.9 669.6 514.5 944 514.5 944h1s219.6-274.4 281.7-398.2c26.1-52.2 35.3-105.1 35.3-145.8 0-176.7-143.3-320-320-320z m4 801c-0.1 0.1-1-0.1-1 0-149-203-283-332.5-285-479-2.1-154.6 130.4-282 285-282h1c154.6 0 276 127.4 276 282 0 135-130 274-276 479z" fill="#333333" ></path></symbol><symbol id="icon-fork" viewBox="0 0 1024 1024"><path d="M752 100c-61.8 0-112 50.2-112 112 0 47.7 29.9 88.5 72 104.6v27.6L512 601.4 312 344.2v-27.6c42.1-16.1 72-56.9 72-104.6 0-61.8-50.2-112-112-112s-112 50.2-112 112c0 50.6 33.8 93.5 80 107.3v34.4c0 9.7 3.3 19.3 9.3 27L476 672.3v33.6c-44.2 15-76 56.9-76 106.1 0 61.8 50.2 112 112 112s112-50.2 112-112c0-49.2-31.8-91-76-106.1v-33.6l226.7-291.6c6-7.7 9.3-17.3 9.3-27v-34.4c46.2-13.8 80-56.7 80-107.3 0-61.8-50.2-112-112-112zM224 212c0-26.5 21.5-48 48-48s48 21.5 48 48-21.5 48-48 48-48-21.5-48-48z m336 600c0 26.5-21.5 48-48 48s-48-21.5-48-48 21.5-48 48-48 48 21.5 48 48z m192-552c-26.5 0-48-21.5-48-48s21.5-48 48-48 48 21.5 48 48-21.5 48-48 48z"  ></path></symbol><symbol id="icon-jia" viewBox="0 0 1024 1024"><path d="M1024 458.24H539.136V0h-54.272v458.24H0V512h484.864v512h54.272V512H1024z" fill="" ></path></symbol><symbol id="icon-gengduo1" viewBox="0 0 1024 1024"><path d="M104 520m-104 0a104 104 0 1 0 208 0 104 104 0 1 0-208 0Z" fill="" ></path><path d="M920 520m-104 0a104 104 0 1 0 208 0 104 104 0 1 0-208 0Z" fill="" ></path><path d="M512 512m-160 0a160 160 0 1 0 320 0 160 160 0 1 0-320 0Z" fill="" ></path></symbol><symbol id="icon-yinhangqia" viewBox="0 0 1024 1024"><path d="M917.048889 789.617778H91.022222c-22.755556 0-43.235556-18.204444-43.235555-40.96V432.355556h912.497777v318.577777c0 20.48-18.204444 38.684444-43.235555 38.684445zM134.257778 707.697778h170.666666v-40.96H134.257778v40.96z m427.804444-125.155556H134.257778v40.96h427.804444v-40.96zM47.786667 223.004444C47.786667 200.248889 68.266667 182.044444 91.022222 182.044444h826.026667c22.755556 0 43.235556 18.204444 43.235555 40.96v125.155556H47.786667V223.004444z m0 0" fill="" ></path></symbol><symbol id="icon-zuobiao" viewBox="0 0 1024 1024"><path d="M512 0C290.6752 0 110.5984 181.1392 110.5984 403.7696c0 86.5408 27.2 169.3184 78.1568 238.7264l240.9472 344.5632c17.7344 23.456 44.7488 36.9344 74.0864 36.9344 29.4976 0 56.576-13.568 74.3168-37.2736l256.6592-343.5648c51.4368-70.0736 78.6368-152.8448 78.6368-239.3856C913.4016 181.1392 733.3248 0 512 0L512 0zM796.4608 610.1184l-273.6384 366.2848c-6.432 8.5824-15.0208 9.8688-19.584 9.8688-4.5376 0-13.1008-1.2864-18.752-8.7104L227.712 610.3616c-45.4144-61.856-69.4336-134.9376-69.4336-211.3152C158.2784 202.592 316.9664 42.752 512 42.752c195.0272 0 353.7216 159.8464 353.7216 356.2944C865.7216 475.424 841.7088 548.5056 796.4608 610.1184L796.4608 610.1184zM778.624 601.6128"  ></path><path d="M512 215.4752c-103.3152 0-187.3536 84.4672-187.3536 188.2944 0 103.8528 84.0448 188.32 187.3536 188.32 103.3088 0 187.3536-84.4672 187.3536-188.32C699.3536 299.9488 615.3152 215.4752 512 215.4752L512 215.4752zM512 547.7376c-78.7072 0-142.7264-64.5696-142.7264-143.968 0-79.3664 64.0192-143.936 142.7264-143.936 78.7008 0 142.72 64.576 142.72 143.936C654.72 483.168 590.7008 547.7376 512 547.7376L512 547.7376zM512 519.3984"  ></path></symbol><symbol id="icon-roundclose" viewBox="0 0 1024 1024"><path d="M512 960C264.96 960 64 759.04 64 512S264.96 64 512 64s448 200.96 448 448S759.04 960 512 960zM512 128.288C300.416 128.288 128.288 300.416 128.288 512c0 211.552 172.128 383.712 383.712 383.712 211.552 0 383.712-172.16 383.712-383.712C895.712 300.416 723.552 128.288 512 128.288z"  ></path><path d="M557.056 513.376l138.368-136.864c12.576-12.416 12.672-32.672 0.256-45.248-12.416-12.576-32.704-12.672-45.248-0.256l-138.56 137.024-136.448-136.864c-12.512-12.512-32.736-12.576-45.248-0.064-12.512 12.48-12.544 32.736-0.064 45.248l136.256 136.672-137.376 135.904c-12.576 12.448-12.672 32.672-0.256 45.248 6.272 6.336 14.496 9.504 22.752 9.504 8.128 0 16.256-3.104 22.496-9.248l137.568-136.064 138.688 139.136c6.24 6.272 14.432 9.408 22.656 9.408 8.192 0 16.352-3.136 22.592-9.344 12.512-12.48 12.544-32.704 0.064-45.248L557.056 513.376z"  ></path></symbol><symbol id="icon-roundaddfill" viewBox="0 0 1024 1024"><path d="M828.704 196.576c-84.608-84.192-197.056-130.56-316.704-130.56s-232.128 46.368-316.736 130.56C110.624 280.8 64 392.832 64 512c0 119.2 46.624 231.2 131.232 315.424 84.608 84.192 197.088 130.56 316.736 130.56s232.128-46.368 316.704-130.56c84.672-84.256 131.296-196.288 131.264-315.456C959.968 392.8 913.376 280.8 828.704 196.576zM736 544l-192 0 0 192c0 17.696-14.336 32-32 32s-32-14.304-32-32l0-192L288 544c-17.664 0-32-14.336-32-32s14.336-32 32-32l192 0L480 288c0-17.664 14.336-32 32-32s32 14.336 32 32l0 192 192 0c17.696 0 32 14.336 32 32S753.696 544 736 544z"  ></path></symbol><symbol id="icon-tianjia" viewBox="0 0 1024 1024"><path d="M814.08 201.216A436.224 436.224 0 0 0 197.12 819.2a436.224 436.224 0 0 0 614.4-616.96z m-90.112 339.968h-187.392v187.904a31.232 31.232 0 1 1-62.464 0v-187.904H287.744a31.232 31.232 0 0 1 0-62.464h186.88V290.816a31.232 31.232 0 1 1 62.464 0v187.904h186.88a31.232 31.232 0 0 1 0 62.464z" fill="#666666" ></path></symbol><symbol id="icon-triangle" viewBox="0 0 1024 1024"><path d="M322.392 90.125l421.803 421.898-421.803 421.852v-843.75z" fill="#666666" ></path></symbol><symbol id="icon-suo" viewBox="0 0 1024 1024"><path d="M828.691531 408.944706h-61.229077V216.144786C767.564844 96.963104 679.919208 0 572.205179 0H452.613939c-107.714029 0-195.359664 96.963104-195.359664 216.144786v192.79992h-61.945806c-42.491751 0-77.09949 38.293771-77.09949 85.29067v444.473953c0 46.9969 34.607739 85.290671 77.09949 85.290671H828.691531c42.491751 0 77.09949-38.293771 77.09949-85.290671V494.235376c0-47.09929-34.607739-85.290671-77.09949-85.29067z m-482.358164-192.79992c0-64.812719 47.713629-117.543446 106.280572-117.543446h119.59124c58.566943 0 106.280572 52.730727 106.280572 117.543446v192.79992h-332.152384V216.144786z"  ></path></symbol><symbol id="icon-biyezhuanhuan" viewBox="0 0 1024 1024"><path d="M486.4 396.8c-28.8 0-60.8-3.2-83.2-12.8L54.4 262.4C19.2 246.4 12.8 227.2 12.8 217.6c0-9.6 6.4-28.8 41.6-41.6l348.8-121.6c41.6-16 115.2-19.2 163.2-3.2l348.8 124.8c28.8 12.8 44.8 25.6 44.8 44.8s-12.8 32-41.6 41.6L569.6 384c-22.4 6.4-54.4 12.8-83.2 12.8z m6.4-323.2c-28.8 0-57.6 3.2-76.8 12.8L67.2 208c-16 3.2-22.4 9.6-22.4 9.6s6.4 6.4 22.4 12.8L416 352c38.4 16 105.6 16 144 0l348.8-121.6c12.8-6.4 19.2-9.6 19.2-12.8 0 0-3.2-6.4-22.4-12.8L556.8 83.2c-16-6.4-41.6-9.6-64-9.6z" fill="#333303" ></path><path d="M435.2 748.8c-89.6 0-172.8-28.8-227.2-83.2-41.6-41.6-64-96-64-153.6V288h32v224c0 51.2 19.2 96 54.4 131.2 48 48 128 76.8 214.4 73.6h86.4c156.8 0 268.8-86.4 268.8-208v-224h32v224c0 137.6-128 240-300.8 240h-96zM896 326.4h32v352h-32v-352zM912 739.2c25.6 0 48 12.8 48 32s-22.4 96-48 96-48-76.8-48-96 22.4-32 48-32z" fill="#333303" ></path></symbol><symbol id="icon-weibiaoti12" viewBox="0 0 1024 1024"><path d="M960 576 64 576c-35.2 0-64-28.8-64-64 0-35.2 28.8-64 64-64l896 0c35.2 0 64 28.8 64 64C1024 547.2 995.2 576 960 576zM960 200 64 200c-35.2 0-64-28.8-64-64 0-35.2 28.8-64 64-64l896 0c35.2 0 64 28.8 64 64C1024 171.2 995.2 200 960 200zM64 824l896 0c35.2 0 64 28.8 64 64 0 35.2-28.8 64-64 64L64 952c-35.2 0-64-28.8-64-64C0 852.8 28.8 824 64 824z"  ></path></symbol><symbol id="icon-wenhao" viewBox="0 0 1024 1024"><path d="M502.757 960.219c-60.5 0-119.201-11.854-174.474-35.231-53.377-22.576-101.31-54.894-142.466-96.05-41.156-41.153-73.472-89.088-96.049-142.465C66.39 631.201 54.537 572.5 54.537 512S66.39 392.799 89.768 337.526c22.576-53.376 54.893-101.309 96.049-142.465 41.156-41.157 89.089-73.473 142.466-96.049 55.271-23.378 113.973-35.231 174.474-35.231 60.499 0 119.2 11.853 174.474 35.231 53.377 22.577 101.31 54.893 142.466 96.05 41.157 41.155 73.472 89.088 96.048 142.465 23.379 55.27 35.231 113.972 35.231 174.474s-11.854 119.204-35.232 174.473c-22.577 53.38-54.892 101.312-96.047 142.466-41.156 41.155-89.09 73.473-142.465 96.049C621.956 948.365 563.256 960.219 502.757 960.219zM502.757 94.48c-56.369 0-111.047 11.038-162.515 32.806-49.717 21.029-94.369 51.136-132.716 89.482-38.348 38.348-68.453 83-89.482 132.717C96.275 400.952 85.237 455.63 85.237 512c0 56.368 11.038 111.047 32.807 162.512 21.03 49.722 51.135 94.373 89.482 132.717 38.347 38.351 82.999 68.455 132.716 89.482 51.469 21.77 106.146 32.809 162.515 32.809s111.046-11.036 162.516-32.809c49.717-21.029 94.368-51.135 132.715-89.482 38.348-38.344 68.453-82.996 89.48-132.715 21.771-51.465 32.809-106.145 32.809-162.514 0-56.371-11.037-111.049-32.809-162.515-21.028-49.718-51.135-94.371-89.48-132.718-38.348-38.347-82.999-68.453-132.717-89.482C613.804 105.518 559.125 94.48 502.757 94.48zM446.479 719.294l0 74.638 89.476 0 0-74.638L446.479 719.294zM677.814 461.148c13.094-19.66 19.645-41.14 19.645-64.442 0-40.29-18.628-74.642-55.87-103.039-37.253-28.397-87.159-42.599-149.72-42.599-59.074 0-106.578 13.231-142.51 39.685-35.942 26.461-57.545 64.57-64.816 114.325l80.75 8.01c6.979-37.134 21.674-64.443 44.081-81.917 22.407-17.479 50.34-26.216 83.806-26.216 34.628 0 63.873 9.647 87.736 28.943 23.858 19.299 35.795 41.69 35.795 67.178 0 14.08-4.082 27.068-12.226 38.956-8.149 11.897-25.823 27.854-53.032 47.879-27.21 20.024-46.045 35.258-56.526 45.695-14.259 14.323-24.589 28.523-30.986 42.596-8.733 18.695-13.093 40.905-13.093 66.63 0 4.371 0.14 10.923 0.436 19.663l75.509 0c0.578-26.216 2.761-45.153 6.55-56.798 3.775-11.651 9.602-21.969 17.456-30.951 7.859-8.975 24.59-22.938 50.198-41.868C639.109 504.722 664.72 480.814 677.814 461.148L677.814 461.148z"  ></path></symbol><symbol id="icon-31" viewBox="0 0 1024 1024"><path d="M726.277689 227.555556l-91.886933 138.899911L539.420444 227.555556 726.277689 227.555556zM619.793067 398.222222 415.9488 398.222222l101.910756 387.629511L619.793067 398.222222zM422.752711 375.466667l190.225067 0-95.118222-139.127467L422.752711 375.466667zM401.351111 366.455467 496.310044 227.555556 309.464178 227.555556 401.351111 366.455467zM496.264533 793.156267 392.430933 398.222222 168.721067 398.222222 496.264533 793.156267zM169.039644 375.466667l210.989511 0-91.909689-138.934044L169.039644 375.466667zM747.463111 236.782933 655.712711 375.466667l210.625422 0L747.463111 236.782933zM643.310933 398.222222l-103.844978 394.899911L866.656711 398.222222 643.310933 398.222222z"  ></path></symbol><symbol id="icon-qizhi" viewBox="0 0 1024 1024"><path d="M756.022303 122.197333c86.04703 0 142.801455-9.122909 195.584-41.766788v516.406303c-52.782545 32.581818-107.799273 55.202909-193.846303 55.20291-85.98497 0-117.884121-9.836606-170.511515-42.635637-52.565333-32.519758-109.568-42.635636-195.52194-42.635636-85.922909 0-158.844121 31.930182-211.533575 64.57406V95.852606c52.689455-32.79903 125.641697-64.729212 211.533575-64.729212 85.953939 0 142.987636 10.20897 195.52194 42.635636 52.689455 32.519758 82.881939 48.438303 168.773818 48.438303z" fill="#666666" ></path><path d="M98.148848 1010.160485a31.030303 31.030303 0 0 1-31.030303-31.030303V63.425939a31.030303 31.030303 0 1 1 62.060607 0v915.704243a31.030303 31.030303 0 0 1-31.030304 31.030303z" fill="#666666" ></path></symbol><symbol id="icon-fujian" viewBox="0 0 1024 1024"><path d="M902.656 506.92096c-1.04448 1.00352-2.12992 2.06848-3.25632 3.25632L528.26112 881.37728l-0.1024 0.14336c-0.94208 0.65536-1.80224 1.47456-2.64192 2.31424-92.5696 89.68192-241.68448 88.61696-332.8-2.51904C101.43744 790.07744 100.53632 640.69632 190.6688 548.20864 197.0176 541.77792 612.02432 126.44352 616.18176 122.28608c65.00352-64.9216 170.7008-64.9216 235.64288 0 31.29344 31.35488 48.61952 73.05216 48.61952 117.4528-0.08192 44.56448-17.48992 86.44608-49.07008 117.92384L424.1408 784.81408c-36.06528 32.74752-91.15648 31.35488-125.7472-3.21536-34.59072-34.52928-35.71712-89.82528-2.68288-125.89056 0.63488-0.59392 1.18784-1.31072 1.67936-2.06848l0.14336-0.06144c0.16384-0.16384 0.3072-0.3072 0.43008-0.45056l1.08544-1.10592c0.08192-0.06144 0.2048-0.1024 0.3072-0.26624l371.42528-371.44576c9.80992-9.8304 9.80992-25.74336 0-35.59424-9.80992-9.8304-25.78432-9.8304-35.61472 0L263.92576 615.97696l-1.6384 1.57696c-0.28672 0.3072-0.63488 0.63488-0.96256 0.98304l-4.17792 4.11648 0 0c-1.65888 1.6384-3.01056 3.52256-4.11648 5.48864-45.64992 55.97184-42.00448 137.5232 9.64608 189.15328 53.92384 53.82144 139.89888 55.72608 195.95264 4.28032 0.22528-0.22528 0.49152-0.45056 0.75776-0.69632l427.54048-427.54048c41.12384-40.98048 63.77472-95.5392 63.77472-153.57952 0.04096-57.856-22.38464-112.2304-63.30368-153.06752-84.56192-84.54144-222.28992-84.54144-306.91328 0l-212.82816 212.992-146.3296 146.5344-66.19136 66.19136c-0.16384 0.22528-0.34816 0.38912-0.49152 0.55296l0 0c-109.40416 112.06656-108.31872 293.31456 2.39616 403.94752 55.808 55.82848 129.51552 83.7632 203.264 83.7632 71.35232 0 142.848-26.17344 198.12352-78.6432 0.43008-0.3072 0.8192-0.69632 1.20832-1.00352 0.43008-0.36864 0.7168-0.69632 1.14688-1.06496l2.68288-2.58048c0.1024-0.16384 0.18432-0.16384 0.3072-0.32768l371.4048-371.44576c0.04096-0.06144 0.18432-0.26624 0.22528-0.32768 0.63488-0.512 1.18784-1.20832 1.92512-1.8432 10.01472-9.54368 10.48576-25.41568 1.00352-35.5328C928.68608 497.84832 912.75264 497.37728 902.656 506.92096L902.656 506.92096 902.656 506.92096zM902.656 506.92096"  ></path></symbol><symbol id="icon-shezhi" viewBox="0 0 1024 1024"><path d="M509 349.5c-88.6 0-161.1 73.1-161.1 162.6 0 89.4 72.5 162.6 161.1 162.6s161.1-73.1 161.1-162.6S597.6 349.5 509 349.5zM380.1 85.3c16.1 0 34.2 6.1 44.3 16.3 12.1 14.2 54.4 50.8 86.6 50.8 32.2 0 74.5-36.6 86.6-48.8 10.1-12.2 28.2-18.3 44.3-18.3 10.1 0 16.1 0 24.2 4.1h2l110.7 63h2c22.1 16.3 30.2 46.7 20.1 71.1 0 0-10.1 22.4-10.1 42.7 0 61 48.3 109.7 108.7 109.7h4c20.1 0 36.2 18.3 42.3 46.7 2 2 10.1 50.8 10.1 89.4 0 40.6-10.1 89.4-10.1 89.4-4 28.4-22.1 46.7-42.3 46.7h-4c-60.4 0-108.7 48.8-108.7 109.7 0 20.3 10.1 42.7 10.1 42.7 10.1 24.4 2 52.8-20.1 69.1h-2l-110.7 63h-2c-6 2-14.1 4.1-22.1 4.1-18.1 0-36.2-8.1-46.3-20.3-12.1-14.2-56.4-52.8-88.6-52.8-30.2 0-70.5 36.6-86.6 52.8-10.1 12.2-26.2 20.3-44.3 20.3-10.1 0-16.1 0-24.2-4.1h-2l-108.7-61h-2c-22.3-16.2-30.3-46.7-20.3-71 0 0 10.1-22.4 10.1-42.7 0-61-48.3-109.7-108.7-109.7h-4c-20.1 0-36.2-18.3-42.3-46.7-2-2-10.1-50.8-10.1-89.4 0-36.6 8.1-85.3 10.1-89.4 4-28.4 22.1-46.7 42.3-46.7h2c60.4 0 108.7-48.8 108.7-109.7 0-20.3-10.1-42.7-10.1-42.7-10.1-24.4-2-52.8 20.1-69.1h2l114.8-65h2c6.1-2.2 14.2-4.2 22.2-4.2z" fill="#333333" ></path></symbol><symbol id="icon-wanchenggouxuan" viewBox="0 0 1024 1024"><path d="M762.7 760.6C863.4 660 893.5 508.6 839 377.1c-54.5-131.5-182.8-217.3-325.2-217.3-142.4 0-270.7 85.8-325.2 217.3S164.4 660 265.1 760.6c137.4 137.4 360.1 137.4 497.6 0z m42.2 42.3C687 921.2 509.4 956.7 355 892.9c-154.4-63.8-255-214.3-255-381.3S200.7 194 355 130.3c154.4-63.8 332-28.3 449.9 90 160.5 161.1 160.5 421.5 0 582.6z m0 0"  ></path><path d="M686.4 373.7c7.1-9.8 19.3-14.4 31.1-11.9s21 11.7 23.6 23.6c2.5 11.8-2.2 24-11.9 31.1L492.3 653.3c-13.6 12.8-34.9 12.8-48.5 0l-135-134c-9.8-7.1-14.4-19.3-11.9-31.1s11.7-21 23.6-23.6c11.8-2.5 24 2.2 31.1 11.9l113.6 116 221.2-218.8z m0 0"  ></path></symbol><symbol id="icon-xinzengtishi" viewBox="0 0 1024 1024"><path d="M229.4 293.6c-11.6-11.6-30.4-11.6-42 0-11.6 11.6-11.6 30.4 0 42l42 42c11.6 11.6 30.4 11.6 42 0 11.6-11.6 11.6-30.3 0-42l-42-42zM793.3 293.6l-42 42c-11.6 11.6-11.6 30.4 0 42 11.6 11.6 30.4 11.6 42 0l42-42c11.6-11.6 11.6-30.4 0-42-11.6-11.6-30.4-11.6-42 0M155.2 528.5H95.8c-16.4 0-29.7 13.3-29.7 29.7s13.3 29.7 29.7 29.7h59.4c16.4 0 29.7-13.3 29.7-29.7-0.1-16.4-13.4-29.7-29.7-29.7M926.9 528.5h-59.4c-16.4 0-29.7 13.3-29.7 29.7s13.3 29.7 29.7 29.7h59.4c16.4 0 29.7-13.3 29.7-29.7-0.1-16.4-13.4-29.7-29.7-29.7M481.7 187.1v59.4c0 16.4 13.3 29.7 29.7 29.7s29.7-13.3 29.7-29.7v-59.4c0-16.4-13.3-29.7-29.7-29.7-16.4 0.1-29.7 13.4-29.7 29.7M511.3 331.2c-147.5 0-267.1 119.6-267.1 267.1 0 147.6 119.6 267.2 267.1 267.2 147.5 0 267.1-119.6 267.1-267.2 0.1-147.5-119.5-267.1-267.1-267.1z m0 489.4c-122.8 0-222.3-99.5-222.3-222.3 0-122.7 99.5-222.2 222.3-222.2 122.8 0 222.3 99.5 222.3 222.2 0 122.8-99.5 222.3-222.3 222.3z"  ></path></symbol><symbol id="icon-htmal5icon19" viewBox="0 0 1024 1024"><path d="M625.425306 681.589466l-115.472941-115.472941-115.471918 115.472941-54.117548-54.118572 115.471918-115.471918-115.471918-115.472941 54.117548-54.117548 115.471918 115.471918 115.472941-115.471918 54.117548 54.117548-115.472941 115.472941 115.472941 115.471918L625.425306 681.589466zM780.543176 241.409189c-148.824537-148.824537-392.356063-148.824537-541.1806 0s-148.824537 392.355039 0 541.179576 392.356063 148.824537 541.1806 0C929.367713 633.765251 929.367713 390.233726 780.543176 241.409189z"  ></path></symbol><symbol id="icon-xiazai18" viewBox="0 0 1024 1024"><path d="M856.954985 385.981888c-0.576121 51.994188-17.180288 99.533924-39.609113 145.413857-33.606399 68.75185-78.228689 130.188084-126.728286 188.95349-45.148269 54.706973-93.597725 106.356306-145.30948 154.923442-18.070564 16.966417-34.56012 17.48728-53.085032 0.859577-95.919607-86.087681-182.122921-180.470281-247.924579-292.121174-10.708899-18.169825-20.417005-36.901445-28.77844-56.283888-7.924483-18.371416-1.090844-37.588083 16.018835-45.521776 17.158798-7.957229 36.875862-0.977257 45.222971 17.178241 39.327704 85.524862 96.852862 158.196998 159.714562 227.119741 24.238031 26.575262 49.630351 52.033074 75.916017 76.598562 3.251044 3.035126 5.296633 5.501294 9.914814 0.850367 87.10894-87.772043 168.662351-179.933045 228.0356-289.487184 17.307178-31.93534 31.737842-65.306378 36.57194-101.670587 7.284917-54.81749-3.724835-106.969267-29.730115-155.072845-49.526997-91.616604-126.402875-143.862525-231.327576-147.546428-119.527281-4.194532-225.729068 72.993454-263.348873 186.984648-9.450233 28.636201-14.455223 57.984622-14.845103 88.142479-0.278339 21.561062-14.415314 36.784788-33.901111 36.734646-19.547195-0.047072-33.82027-15.626909-33.762965-36.842093 0.442068-160.357198 110.895693-299.273061 266.558985-335.243297C575.346235 20.187785 713.3094 73.709769 791.261797 183.556573 834.320475 244.230444 855.712691 311.864844 856.954985 385.981888zM136.976186 921.538397c254.766404 0 508.070504 0 761.591545 0-0.037862-4.378727-2.922563-7.237845-4.750187-10.443863-33.05279-58.048067-66.178235-116.059296-99.363032-174.032662-7.121188-12.438287-7.562233-24.825408 0.360204-36.855396 7.136537-10.840906 17.59882-16.087397 30.610158-15.196097 11.692297 0.806365 20.893866 6.54916 26.681686 16.642029 45.293579 79.001285 90.644463 157.970848 135.468344 237.237169 13.837146 24.473391-3.272533 50.588165-32.371268 50.595328-151.58644 0.050142-303.172881 0.023536-454.755228 0.023536-138.542356 0-277.091876-0.693802-415.621952 0.533143-31.091112 0.277316-50.15326-28.113291-33.062-56.870242 44.724621-75.246775 87.2389-151.807475 130.681318-227.818659 9.356089-16.367783 23.981181-23.556509 39.297005-19.578917 22.651906 5.892197 32.509415 29.940916 20.503986 51.17452-23.185049 41.015136-46.706765 81.84096-70.065775 122.756835C160.695401 879.824343 149.256884 899.965056 136.976186 921.538397zM653.782655 380.311749c0.008186 74.774007-61.005422 135.555325-135.90632 135.38648-74.259284-0.165776-134.827755-60.983933-134.825708-135.37727 0.004093-74.859965 60.867276-135.492904 135.870504-135.352711C593.176322 245.105371 653.776516 305.924551 653.782655 380.311749zM518.829034 312.651766c-37.586037 0.010233-68.025303 30.203906-68.087725 67.536162-0.062422 37.753859 30.839379 68.179822 68.88488 67.822688 36.531008-0.342808 66.62849-31.17707 66.470901-68.095911C585.939501 343.05624 555.526841 312.64358 518.829034 312.651766z"  ></path></symbol><symbol id="icon-mail" viewBox="0 0 1024 1024"><path d="M809.6 790.4h-595.2c-51.2 0-89.6-38.4-89.6-89.6v-377.6c0-51.2 38.4-89.6 89.6-89.6h595.2c51.2 0 89.6 38.4 89.6 89.6v377.6c0 51.2-38.4 89.6-89.6 89.6z m0-505.6h-595.2c-19.2 0-38.4 19.2-38.4 38.4v377.6c0 19.2 19.2 38.4 38.4 38.4h595.2c19.2 0 38.4-19.2 38.4-38.4v-377.6c0-19.2-19.2-38.4-38.4-38.4z m-460.8 262.4c12.8-12.8 25.6-12.8 38.4 0 12.8 12.8 12.8 25.6 0 38.4-25.6 25.6-76.8 70.4-102.4 96-6.4 6.4-12.8 12.8-19.2 12.8-6.4 0-12.8-6.4-19.2-12.8 0 0-6.4-6.4-6.4-12.8s0-12.8 6.4-19.2l102.4-102.4z m352 0c-12.8-12.8-25.6-12.8-38.4 0-12.8 12.8-12.8 25.6 0 38.4 32 25.6 76.8 70.4 102.4 96 6.4 6.4 12.8 6.4 19.2 6.4 6.4 0 12.8 0 19.2-6.4 6.4-6.4 6.4-12.8 6.4-19.2 0-6.4 0-12.8-6.4-19.2-25.6-19.2-76.8-70.4-102.4-96z m-179.2-12.8c-32 0-64-6.4-89.6-25.6L262.656 384.576a28.416 28.416 0 0 1-6.336-39.424v-0.064a27.072 27.072 0 0 1 37.632-6.336L470.4 464c32 25.6 83.2 25.6 121.6-6.4l146.624-118.4a25.792 25.792 0 0 1 36.096 3.584 24.64 24.64 0 0 1-3.008 34.624L624 502.4c-32 19.2-64 32-102.4 32z" fill="#515151" ></path></symbol><symbol id="icon-weibiaoti-" viewBox="0 0 1024 1024"><path d="M772.654545 900.654545l-13.963636-4.654545C165.236364 714.472727 128 265.309091 125.672727 260.654545V232.727273l155.927273-116.363637 160.581818 209.454546-81.454545 90.763636c27.927273 95.418182 174.545455 200.145455 242.036363 242.036364l109.381819-74.472727 190.836363 169.890909-130.327273 146.618181zM172.218182 258.327273c2.327273 25.6 44.218182 416.581818 586.472727 588.8l83.781818-88.436364-128-114.036364-104.727272 69.818182-11.636364-6.981818c-9.309091-6.981818-249.018182-146.618182-279.272727-290.909091l-2.327273-11.636363 72.145454-79.127273L279.272727 183.854545l-107.054545 74.472728z"  ></path></symbol><symbol id="icon-sanjiaoxing-down" viewBox="0 0 1024 1024"><path d="M191.815 319.981h640.37l-320.184 384.016z"  ></path></symbol><symbol id="icon-sanjiaoxing-up" viewBox="0 0 1024 1024"><path d="M832.185 704.019h-640.37l320.184-384.016z"  ></path></symbol><symbol id="icon-youjiang" viewBox="0 0 1024 1024"><path d="M653.4 220.6c-31.8-37.2-86-10.9-86 41.9L567.4 406.9 135.5 406.9c-18.7 0-34 15.3-34 34L101.5 583.2c0 18.7 15.3 34 34 34l431.8 0L567.3 762.5c0 52.7 54.3 79.1 86 41.9l259.9-249.6c19.4-23.3 19.4-61.19999999 0-84.5l-259.8-249.7z m0 0"  ></path></symbol><symbol id="icon-xiajiang" viewBox="0 0 1024 1024"><path d="M803.4 653.4c37.2-31.8 10.9-86-41.9-86H617.1V135.5c0-18.7-15.3-34-34-34H440.8c-18.7 0-34 15.3-34 34v431.8H261.5c-52.7 0-79.1 54.3-41.9 86l249.6 259.9c23.3 19.4 61.2 19.4 84.5 0l249.7-259.8z m0 0"  ></path></symbol><symbol id="icon-shixing" viewBox="0 0 1024 1024"><path d="M538.4 102.3l114.7 232.4c4.4 8.9 12.9 15.1 22.7 16.5l256.4 37.3c24.7 3.6 34.6 34 16.7 51.4L763.3 620.7c-7.1 6.9-10.3 16.9-8.7 26.7l43.8 255.4c4.2 24.6-21.6 43.4-43.8 31.8L525.4 814c-8.8-4.6-19.3-4.6-28.1 0L267.9 934.6c-22.1 11.6-48-7.2-43.8-31.8L268 647.4c1.7-9.8-1.6-19.8-8.7-26.7L73.8 439.8c-17.9-17.4-8-47.8 16.7-51.4l256.4-37.3c9.8-1.4 18.3-7.6 22.7-16.5l114.7-232.4c11.1-22.3 43-22.3 54.1 0.1z"  ></path></symbol><symbol id="icon-kongxing" viewBox="0 0 1024 1024"><path d="M512.4 152l101.3 205.3c10.1 20.5 29.6 34.6 52.2 37.9l226.6 32.9L728.6 588c-16.3 15.9-23.8 38.9-19.9 61.3L747.3 875 544.7 768.5c-9.9-5.2-21.1-8-32.2-8-11.2 0-22.3 2.8-32.2 8L277.5 875l38.7-225.7c3.9-22.5-3.6-45.4-19.9-61.3l-164-159.8 226.6-32.9c22.6-3.3 42.1-17.5 52.2-37.9L512.4 152m0-53.8c-10.4 0-20.8 5.4-26.2 16.3L375.1 339.6c-4.3 8.6-12.5 14.6-22 16l-248.4 36.1c-24 3.5-33.5 32.9-16.2 49.8l179.8 175.2c6.9 6.7 10 16.4 8.4 25.9L234.3 890c-3.2 18.9 11.8 34.2 28.8 34.2 4.5 0 9.1-1.1 13.6-3.4L498.8 804c4.3-2.2 8.9-3.4 13.6-3.4 4.7 0 9.3 1.1 13.6 3.4l222.2 116.8c4.5 2.4 9.1 3.4 13.6 3.4 17 0 32-15.3 28.8-34.2l-42.4-247.4c-1.6-9.5 1.5-19.1 8.4-25.9l179.8-175.2c17.3-16.9 7.8-46.3-16.2-49.8l-248.4-36.1c-9.5-1.4-17.7-7.4-22-16L538.6 114.5c-5.3-10.8-15.8-16.3-26.2-16.3z"  ></path></symbol><symbol id="icon-xueyuanguanliyuan" viewBox="0 0 1024 1024"><path d="M347.2 510.4C276.3 475 228.4 404 228.4 318.9c0-117 95.8-212.8 212.8-212.8 117 0 212.8 95.8 212.8 212.8 0 115.3-90.4 209.3-205.7 212.8h-1.8c-175.6 0-319.2 143.6-319.2 319.2 0 10.6-7.1 17.7-17.7 17.7s-17.7-7.1-17.7-17.7C91.8 689.5 200 553 347.2 510.4z m94-14.2c97.5 0 177.3-79.8 177.3-177.3 0-97.5-79.8-177.3-177.3-177.3-97.5 0-177.3 79.8-177.3 177.3 0 97.5 79.8 177.3 177.3 177.3z m485.9 117.1l3.5 8.9-42.6 51.4c-7.1 8.9-7.1 23.1 0 31.9l42.6 49.7-3.5 8.9c-8.9 24.8-21.3 49.7-39 69.2l-7.1 7.1-65.6-10.6c-10.6-1.8-23.1 5.3-26.6 16l-23.1 63.8-8.9 1.8c-33.7 7.1-67.4 7.1-101.1 0l-10.6-1.8-21.3-62.1c-3.5-10.6-16-17.7-26.6-16l-67.4 10.6-7.1-7.1c-8.9-8.9-16-19.5-21.3-30.1-7.1-12.4-14.2-26.6-17.7-40.8l-3.5-8.9 44.3-49.7c7.1-8.9 7.1-23.1 0-30.1L482 623.9l3.5-8.9c8.9-26.6 23.1-49.7 40.8-70.9l7.1-7.1 63.8 10.6c10.6 1.8 23.1-5.3 28.4-16l23.1-62.1 8.9-1.8c31.9-7.1 65.6-7.1 99.3 0l10.6 1.8 21.3 60.3c3.5 10.6 16 19.5 28.4 17.7l65.6-8.9 7.1 7.1c8.9 10.6 16 19.5 21.3 31.9 5.3 9.1 10.6 23.3 15.9 35.7zM877.5 592c-3.5-7.1-7.1-12.4-12.4-19.5l-46.1 5.3c-28.4 3.5-56.7-14.2-65.6-40.8l-14.2-40.8c-21.3-3.5-42.6-3.5-63.8 0l-16 42.6c-8.9 26.6-39 44.3-67.4 39l-44.3-7.1c-10.6 12.4-17.7 28.4-24.8 42.6l30.1 35.5c17.7 21.3 17.7 55 0 76.3l-30.1 35.5c3.5 8.9 7.1 16 12.4 24.8 3.5 7.1 7.1 12.4 12.4 17.7l47.9-7.1c28.4-3.5 56.7 14.2 65.6 40.8l14.2 42.6c21.3 3.5 44.3 3.5 65.6 0l16-44.3c8.9-26.6 39-44.3 65.6-39l44.3 7.1c8.9-12.4 17.7-26.6 23.1-42.6l-28.4-33.7c-17.7-21.3-19.5-55-1.8-76.3l30.2-35.5c-3.7-7.1-7.2-14.2-12.5-23.1zM707.2 769.3c-44.3 0-79.8-35.5-79.8-79.8s35.5-79.8 79.8-79.8 79.8 35.5 79.8 79.8c0 44.4-37.2 79.8-79.8 79.8z m0-35.4c24.8 0 44.3-19.5 44.3-44.3 0-24.8-19.5-44.3-44.3-44.3-24.8 0-44.3 19.5-44.3 44.3 0 24.8 19.5 44.3 44.3 44.3z m0 0"  ></path></symbol><symbol id="icon-gengduo" viewBox="0 0 1024 1024"><path d="M568 826.5c-13.4 0-26.7-5.9-35.6-17.3-15.5-19.7-12.1-48.1 7.6-63.6l296.8-233.3-296.9-233.4c-19.7-15.5-23.1-43.9-7.6-63.6 15.5-19.7 44-23.1 63.6-7.6L938 476.6c10.9 8.6 17.3 21.7 17.3 35.6 0 13.9-6.4 27-17.3 35.6l-342.1 269c-8.3 6.5-18.1 9.7-27.9 9.7zM112.7 826.5c-13.4 0-26.7-5.9-35.6-17.3-15.5-19.7-12.1-48.2 7.6-63.6l296.8-233.3L84.7 278.9C65 263.4 61.6 235 77.1 215.3c15.5-19.7 44-23.1 63.6-7.6l342 268.9c10.9 8.6 17.3 21.7 17.3 35.6 0 13.9-6.4 27-17.3 35.6l-342 268.9c-8.3 6.6-18.2 9.8-28 9.8z"  ></path></symbol><symbol id="icon-xiangxiayi" viewBox="0 0 1024 1024"><path d="M827.2 195C652.7 20.6 369.9 20.6 195.5 195s-174.4 457.2 0 631.7 457.2 174.4 631.7 0 174.4-457.2 0-631.7zM705.7 558.1L529.1 734.8l-0.2 0.2c-0.3 0.2-0.5 0.5-0.8 0.7l-0.6 0.6c-0.3 0.2-0.5 0.4-0.8 0.6-0.2 0.2-0.5 0.4-0.7 0.5-0.2 0.2-0.5 0.3-0.8 0.5-0.3 0.2-0.5 0.4-0.8 0.5-0.2 0.1-0.5 0.3-0.7 0.4-0.3 0.2-0.6 0.3-0.9 0.5-0.2 0.1-0.5 0.2-0.7 0.4-0.3 0.1-0.6 0.3-0.9 0.4-0.1 0-0.2 0.1-0.2 0.1-0.2 0.1-0.4 0.1-0.6 0.2-0.3 0.1-0.6 0.2-0.8 0.3-0.4 0.1-0.7 0.2-1.1 0.3-0.2 0.1-0.4 0.1-0.6 0.2-0.4 0.1-0.9 0.2-1.3 0.3-0.2 0-0.3 0.1-0.5 0.1-0.5 0.1-0.9 0.2-1.4 0.2-0.1 0-0.3 0-0.4 0.1-0.5 0.1-1 0.1-1.5 0.1h-2.3c-0.5 0-1 0-1.4-0.1h-0.4c-0.5 0-0.9-0.1-1.4-0.2-0.2 0-0.3 0-0.5-0.1-0.4-0.1-0.9-0.2-1.3-0.3-0.2 0-0.3-0.1-0.5-0.1-0.4-0.1-0.9-0.2-1.3-0.4-0.2-0.1-0.3-0.1-0.5-0.2-0.4-0.1-0.8-0.3-1.3-0.5-0.1 0-0.2-0.1-0.3-0.1-0.1 0-0.1 0-0.2-0.1-0.4-0.2-0.8-0.4-1.2-0.5-0.2-0.1-0.3-0.2-0.5-0.3-0.4-0.2-0.7-0.4-1.1-0.6l-0.6-0.3-0.9-0.6c-0.2-0.1-0.4-0.3-0.7-0.4-0.3-0.2-0.5-0.4-0.8-0.6-0.2-0.2-0.5-0.4-0.7-0.6-0.2-0.2-0.4-0.4-0.6-0.5-0.3-0.2-0.5-0.5-0.8-0.7l-0.2-0.2-176.4-176.5c-9.8-9.8-9.8-25.8 0-35.6s25.8-9.8 35.6 0l133.7 133.7V304.8c0-13.9 11.3-25.2 25.2-25.2s25.2 11.3 25.2 25.2v351.4l133.7-133.7c9.8-9.8 25.8-9.8 35.6 0 9.7 9.9 9.7 25.8-0.2 35.6z"  ></path></symbol><symbol id="icon-xiangshangyi" viewBox="0 0 1024 1024"><path d="M827.2 195C652.7 20.6 369.9 20.6 195.5 195s-174.4 457.2 0 631.7 457.2 174.4 631.7 0 174.4-457.2 0-631.7zM705.7 499.2c-9.8 9.8-25.8 9.8-35.6 0L536.5 365.6V717c0 13.9-11.3 25.2-25.2 25.2s-25.2-11.3-25.2-25.2V365.6L352.5 499.2c-9.8 9.8-25.8 9.8-35.6 0s-9.8-25.8 0-35.6L493.5 287l0.2-0.2c0.3-0.3 0.5-0.5 0.8-0.7 0.2-0.2 0.4-0.4 0.6-0.5 0.2-0.2 0.5-0.4 0.7-0.6 0.3-0.2 0.5-0.4 0.8-0.6 0.2-0.2 0.4-0.3 0.7-0.4l0.9-0.6 0.6-0.3c0.4-0.2 0.7-0.4 1.1-0.6 0.2-0.1 0.3-0.2 0.5-0.3 0.4-0.2 0.8-0.4 1.2-0.5 0.1 0 0.1 0 0.2-0.1 0.1 0 0.2-0.1 0.3-0.1 0.4-0.2 0.8-0.3 1.3-0.5 0.2-0.1 0.3-0.1 0.5-0.2 0.4-0.1 0.9-0.3 1.3-0.4 0.2 0 0.3-0.1 0.5-0.1 0.4-0.1 0.9-0.2 1.3-0.3 0.2 0 0.3-0.1 0.5-0.1 0.5-0.1 0.9-0.1 1.4-0.2h0.4c0.5 0 0.9-0.1 1.4-0.1h2.3c0.5 0 1 0.1 1.5 0.1 0.1 0 0.3 0 0.4 0.1 0.5 0.1 0.9 0.1 1.4 0.2 0.2 0 0.3 0.1 0.5 0.1 0.4 0.1 0.9 0.2 1.3 0.3 0.2 0.1 0.4 0.1 0.6 0.2 0.4 0.1 0.7 0.2 1.1 0.3 0.3 0.1 0.6 0.2 0.8 0.3 0.2 0.1 0.4 0.1 0.6 0.2 0.1 0 0.2 0.1 0.2 0.1 0.3 0.1 0.6 0.3 0.9 0.4 0.2 0.1 0.5 0.2 0.7 0.4 0.3 0.2 0.6 0.3 0.9 0.5 0.2 0.1 0.5 0.3 0.7 0.4 0.3 0.2 0.5 0.3 0.8 0.5 0.3 0.2 0.5 0.3 0.8 0.5 0.2 0.2 0.5 0.4 0.7 0.5 0.3 0.2 0.5 0.4 0.8 0.6l0.6 0.6c0.3 0.2 0.5 0.5 0.8 0.7l0.2 0.2 176.6 176.6c9.7 10.1 9.7 26-0.2 35.8z"  ></path></symbol><symbol id="icon-chengyuanguanli" viewBox="0 0 1024 1024"><path d="M501 571c-129.8 0-234.8-105-234.8-234.8s105-234.8 234.8-234.8 234.8 105 234.8 234.8S630.9 571 501 571z m0-431.5c-108.8 0-196.6 87.8-196.6 196.6S392.2 532.7 501 532.7s196.6-87.8 196.6-196.6c0.1-108.7-87.7-196.6-196.6-196.6z m0 0"  ></path><path d="M478.1 532.8c-177.5 7.6-322.6 154.6-336 339.8 0 11.5 7.6 21 19.1 21 9.5 0 19.1-7.6 19.1-17.2 11.5-168 139.4-297.8 297.8-305.4 11.5 0 19.1-7.6 19.1-19.1 0-11.5-9.5-19.1-19.1-19.1zM882.8 719.9l-11.5-47.7c-3.8-11.5-15.3-22.9-28.6-24.8l-19.1-1.9c-1.9 0-3.8 0-5.7-1.9v-1.9c-1.9-1.9-1.9-5.7-1.9-7.6l1.9-19.1c1.9-15.3-5.7-28.6-17.2-34.4l-43.9-21h-1.9c-3.8 0-7.6-1.9-11.5-1.9-7.6 0-17.2 3.8-22.9 9.5l-13.4 13.4c-1.9 1.9-3.8 3.8-5.7 3.8-1.9 0-3.8-1.9-5.7-3.8l-13.4-13.4c-5.7-5.7-13.4-9.5-22.9-9.5-5.7 0-11.5 1.9-13.4 3.8l-43.9 21c-9.5 5.7-19.1 19.1-17.2 32.5l1.9 21c1.9 3.8 0 7.6 0 7.6 0 1.9-3.8 3.8-7.6 3.8l-19.1 1.9c-13.4 1.9-24.8 11.5-28.6 24.8L520 721.8c-3.8 13.4 1.9 28.6 13.4 36.3l15.3 9.5c1.9 0 3.8 3.8 5.7 5.7 0 1.9 0 5.7-1.9 7.6L541 798.1c-7.6 11.5-5.7 28.6 1.9 38.2l30.5 40.1c7.6 7.6 17.2 11.5 26.7 11.5 3.8 0 7.6 0 11.5-1.9l19.1-5.7c1.9-1.9 3.8-1.9 5.7-1.9h3.8c1.9 0 3.8 3.8 3.8 5.7l5.7 17.2c3.8 13.4 19.1 21 30.5 21h47.7c11.7 0 23.4-7.3 23.6-14.3 1.3-2 2.4-4.3 3.2-6.7l5.7-19.1c0.3-0.6 0.6-1.2 0.9-1.9h8.7l17.2 5.7c3.8 1.9 7.6 1.9 11.5 1.9 8 0 17.3-4 23.5-9.8 3-1.8 5.5-4.3 7-7.4l30.5-40.1c5.7-9.5 7.6-22.9 1.9-32.5L850.4 781c-1.2-2.5-2.5-5.7-3.2-8.2 2-1.7 5.1-3.4 5.1-5.1l17.2-11.5c9.5-7.7 17.2-24.9 13.3-36.3z m-324 91.3c0-0.9 0-1.7 0.2-2.4-0.1 0.7-0.2 1.6-0.2 2.4z m-2.4-141l17.2-1.9c5.6 0 14.4-3.1 20.9-7.8 3.3-1.8 6.2-4.3 7.8-7.5 3.8-5.7 7.6-17.2 5.7-24.8l-1.9-19.1v-0.4c0.2-2 2-5.3 3.8-5.3l43.9-21h1.9c1.9 0 3.8 1.9 3.8 1.9l13.4 13.4c5.7 5.7 15.3 11.5 24.8 11.5s21-3.8 26.7-11.5l13.4-13.4c0-1.9 1.9-1.9 3.8-1.9h1.9l43.9 19.1s1.9 3.8 1.9 5.7l-1.9 21c0 3.8 1.9 17.2 7.6 26.7 5.7 5.7 13.4 11.5 26.7 13.4l19.1 1.9c1.9 0 1.9 1.9 3.8 3.8l11.5 47.7c0 1.9-1.9 5.7-1.9 5.7L837 739c-3.8 3.8-15.3 13.4-17.2 22.9 0 9.5 1.9 21 7.6 28.6l11.5 17.2c1.9 1.9 1.9 3.8 0 5.7l-30.5 38.2c0 1.9-1.9 1.9-3.8 1.9h-1.9l-17.2-5.7c-5.7-1.9-9.5-1.9-15.3-1.9-5.7 0-11.5 1.9-13.4 3.8-7.6 3.8-13.4 13.4-17.2 22.9l-5.7 17.2c-1.9 1.9-3.8 3.8-5.7 3.8h-47.7l-3.8-1.9-5.7-17.2c-1.9-9.5-7.6-19.1-17.2-22.9-5.7-3.8-11.5-3.8-15.3-3.8-5.7 0-11.5 1.9-24.8 1.9l-17.2 5.7h-1.9c-1.9 0-3.8-1.9-3.8-1.9l-30.5-38.2v-7.6l6.3-11.4 5.1-7.7c3.3-4.9 6.5-14 6.2-21.4 0.1-2-0.1-3.8-0.5-5.4-1.9-11.5-13.4-19.1-17.2-22.9L543 727.5l-1.9-3.8c-0.4 0.4-0.6 0.9-0.7 1.4 0-1.2 0.2-2.3 0.7-3.3l11.5-47.7c0-3.2 2.7-6.5 5.9-7.4-1.5 1.1-2.8 2.6-3.9 4.1 0.6-0.3 1.2-0.6 1.8-0.6z m49.6-84c-2 1.2-3.8 2.7-5.5 4.4 1.7-1.8 3.5-3.4 5.5-4.4z m-28.6 63c3.2 0 6.5-1.2 9-2.6-1.3 1.4-3 2.6-7.1 2.6l-19.1 1.9 17.2-1.9z"  ></path><path d="M552.6 674.1l-11.5 49.6 11.5-47.7c0-1.4 0.8-3.3 2-5.2-1.1 0.7-2 2-2 3.3zM766.4 679.8c-15.3-15.3-38.2-24.8-61.1-24.8-47.7 0-85.9 38.2-85.9 85.9s38.2 85.9 85.9 85.9c45.8 0 84-38.2 85.9-85.9 0-22.9-7.6-43.9-24.8-61.1z m-61.1 118.3c-32.5 0-59.2-24.8-59.2-57.3s26.7-59.2 59.2-59.2c30.5 0 57.3 24.8 59.2 57.3 0 32.5-26.7 59.2-59.2 59.2z"  ></path></symbol><symbol id="icon-caidan" viewBox="0 0 1024 1024"><path d="M905.2 231.7H120.8c-12.6 0-22.8-10.2-22.8-22.8 0-12.6 10.2-22.8 22.8-22.8h784.4c12.6 0 22.8 10.2 22.8 22.8 0 12.6-10.2 22.8-22.8 22.8zM905.2 537.4H120.8c-12.6 0-22.8-10.2-22.8-22.8 0-12.6 10.2-22.8 22.8-22.8h784.4c12.6 0 22.8 10.2 22.8 22.8 0 12.6-10.2 22.8-22.8 22.8zM905.2 840.3H120.8c-12.6 0-22.8-10.2-22.8-22.8s10.2-22.8 22.8-22.8h784.4c12.6 0 22.8 10.2 22.8 22.8s-10.2 22.8-22.8 22.8z"  ></path></symbol><symbol id="icon-shijuan" viewBox="0 0 1024 1024"><path d="M200.4 924.8c-21.3 0-38.6-17.3-38.6-38.6v-746c0-21.3 17.3-38.6 38.6-38.6h617.4c21.3 0 38.6 17.3 38.6 38.6v457.9c0 16.2 20 23.8 30.7 11.7 2.9-3.2 4.4-7.4 4.4-11.7V140.2c0-40.8-33-73.8-73.8-73.8H200.4c-40.8 0-73.8 33-73.8 73.8v746c0 40.8 33 73.8 73.8 73.8h344.1c5 0 9.8-2.2 13.2-5.9 10.1-11.4 2-29.4-13.2-29.4H200.4z"  ></path><path d="M760.3 242.3H363.8c-13.3 0-24 10.8-24 24 0 13.3 10.8 24 24 24h396.5c13.3 0 24-10.8 24-24.1-0.1-13.2-10.8-23.9-24-23.9zM245.6 266.3c0 14.9 12.3 27 27.5 27s27.5-12.1 27.5-27-12.3-27-27.5-27-27.5 12.1-27.5 27z m0 0M760.3 423.8H363.8c-13.3 0-24 10.8-24 24 0 13.3 10.8 24 24 24h396.5c13.3 0 24-10.8 24-24.1-0.1-13.1-10.8-23.9-24-23.9zM245.6 447.8c0 14.9 12.3 27 27.5 27s27.5-12.1 27.5-27-12.3-27-27.5-27c-15.2 0.1-27.5 12.1-27.5 27z m0 0"  ></path><path d="M363.6 620.5H538c13.3 0 24 10.8 24 24 0 13.3-10.8 24-24 24H363.6c-13.3 0-24-10.7-24-24 0-13.2 10.8-24 24-24zM245.6 644.5c0 14.9 12.3 27 27.5 27s27.5-12.1 27.5-27-12.3-27-27.5-27c-15.2 0.1-27.5 12.1-27.5 27z m0 0"  ></path><path d="M552 785.7l88.1 65.2 219.5-187.6s14.7-12.5 27.6-2.7c3.8 2.8 8.3 11.2-1.7 24.2L656.3 933.7s-17.5 22.3-38.4-0.3l-99-123.8s-11.7-16.8 2.9-26.8c5.1-3.3 16.3-8.6 30.2 2.9z m0 0"  ></path></symbol><symbol id="icon-dongtai" viewBox="0 0 1024 1024"><path d="M513 630.8c-64.4 0-116.7-52.4-116.7-116.7 0-64.4 52.4-116.7 116.7-116.7s116.7 52.4 116.7 116.7c0 64.4-52.3 116.7-116.7 116.7z m0-193.3c-42.3 0-76.6 34.4-76.6 76.6 0 42.3 34.4 76.6 76.6 76.6 42.3 0 76.6-34.4 76.6-76.6 0-42.3-34.3-76.6-76.6-76.6zM720.4 514.1c0 61.3-26.8 116.5-69.3 154.4-13.7 12.3-5.1 35 13.4 35 4.9 0 9.7-1.7 13.3-5 50.7-45.4 82.7-111.2 82.7-184.4s-32-139.1-82.7-184.4c-3.6-3.3-8.4-5-13.3-5-18.4 0-27.1 22.7-13.4 35 42.5 37.9 69.3 93.1 69.3 154.4zM305.6 514.1c0-61.3 26.8-116.5 69.3-154.4 13.7-12.3 5.1-35-13.4-35-4.9 0-9.7 1.7-13.3 5-50.7 45.4-82.7 111.2-82.7 184.4s32 139.1 82.7 184.4c3.6 3.3 8.4 5 13.3 5 18.4 0 27.1-22.7 13.4-35-42.5-37.9-69.3-93.1-69.3-154.4z"  ></path><path d="M812.5 237h-0.7c-17 0-25.8 19.9-14.7 32.9 56.5 65.7 90.7 151 90.7 244.3 0 93.2-34.2 178.6-90.7 244.3-11.1 12.9-2.4 32.8 14.7 32.8h0.7c5.7 0 11.2-2.4 15-6.8C890.1 711.8 928 617.3 928 514.1c0-103.2-37.9-197.7-100.5-270.4-3.7-4.3-9.3-6.7-15-6.7zM214.2 791.2c17 0 25.8-19.9 14.7-32.8-56.5-65.7-90.7-151-90.7-244.3 0-93.2 34.2-178.6 90.8-244.3 11.1-12.9 2.4-32.9-14.7-32.9h-0.7c-5.7 0-11.2 2.4-15 6.8C135.9 316.4 98 410.9 98 514.1c0 103.2 37.9 197.7 100.5 270.4 3.7 4.3 9.2 6.8 15 6.8h0.7z"  ></path></symbol><symbol id="icon-wenjuan" viewBox="0 0 1024 1024"><path d="M636.8 278.1c30.1 26.1 45.1 61.9 45.1 107.5 0 36.6-9.5 67.1-28.6 91.7-6.5 8-27.6 27.6-63.1 58.6-14 11.5-24.6 24.5-31.6 39.1-8 14.5-12 31.1-12 49.6v12.8h-80.4v-12.8c0-29 5-52.9 15-71.4 9.5-20 37.8-51.1 84.9-93.2l12.8-14.3c14-18 21-36.3 21-54.9 0-25.5-7.3-46.1-21.8-61.6-15-15-36.3-22.5-63.9-22.5-34.1 0-58.6 10.8-73.6 32.3-8.8 11.8-14.8 26.7-17.8 44.9-3.1 18.5-19.7 31.8-38.4 31.8-25 0-43.4-23-38.4-47.5 6.8-32.8 21-60 42.8-81.8 31.6-32.1 75.1-48.1 130.8-48.1 48.6 0 87.6 13.2 117.2 39.8z m-90.9 414.8c10.5 9.5 15.8 22.3 15.8 38.3 0 15-5.5 28.1-16.5 39.1-11 10-24 15-39.1 15-15.5 0-28.6-5.3-39.1-15.8s-15.8-23.3-15.8-38.3c0-16 5.3-28.8 15.8-38.3 10-10 23-15 39.1-15 16.5 0 29.7 5 39.8 15zM752.7 905.4c-3.1 0-6.2-0.4-9.2-1.3-12.5-3.5-21.6-13.7-23.8-26.5l-21.9-129.5c-1.7-9.9 1.2-20 7.8-27.6 6.7-7.6 16.3-11.8 26.4-11.3l131.2 5.2c13 0.5 24.2 8.2 29.3 20.2 5.1 11.9 3 25.4-5.6 35.2L777.6 894c-6.4 7.4-15.5 11.4-24.9 11.4zM741 751.6l17.1 101.1 85.4-97.1-102.5-4z m-1.8-10.5z"  ></path><path d="M205.3 922.7c-21.3 0-38.6-17.3-38.6-38.6V139.3c0-21.3 17.3-38.6 38.6-38.6h616.4c21.3 0 38.6 17.3 38.6 38.6v660.9l35.1-39.5V139.3c0-40.7-33-73.7-73.7-73.7H205.3c-40.7 0-73.7 33-73.7 73.7v744.9c0 40.7 33 73.7 73.7 73.7h385.6c5 0 9.8-2.2 13.2-5.9 10.1-11.4 2-29.3-13.2-29.3H205.3z"  ></path></symbol><symbol id="icon-taolun" viewBox="0 0 1024 1024"><path d="M274.7 496c0 28 22.6 50.6 50.6 50.6s50.6-22.6 50.6-50.6-22.6-50.6-50.6-50.6c-28.1 0-50.6 22.6-50.6 50.6zM466.6 496c0 28 22.6 50.6 50.6 50.6s50.6-22.6 50.6-50.6-22.6-50.6-50.6-50.6-50.6 22.6-50.6 50.6zM652.7 496c0 28 22.6 50.6 50.6 50.6s50.6-22.6 50.6-50.6-22.6-50.6-50.6-50.6-50.6 22.6-50.6 50.6z"  ></path><path d="M511.3 120c-228 0-413.4 162.4-413.4 362.1 0 106.6 52.9 202.5 136.8 268.8v-53.5c-59.8-57-96.2-132.6-96.2-215.3 0-177.3 167.2-321.5 372.8-321.5s372.8 144.2 372.8 321.5-167.2 321.5-372.8 321.5c-30.2 0-59.5-3.2-87.6-9.1l-50.1 28.9c43.1 13.4 89.4 20.7 137.7 20.7 228 0 413.4-162.4 413.4-362.1 0-199.6-185.4-362-413.4-362zM267.2 847.4v-73.3c-11.3-7.2-22.1-14.9-32.5-23.1v152.7l138.9-80.2c-13.6-4.2-27-9-39.9-14.5l-66.5 38.4z"  ></path><path d="M379.3 782.7L333.7 809c12.9 5.4 26.3 10.2 39.9 14.5l50.1-28.9c-15.2-3.3-30-7.2-44.4-11.9zM267.2 724.8c-11.4-8.6-22.3-17.7-32.5-27.4v53.5c10.4 8.2 21.2 15.9 32.5 23.1v-49.2z"  ></path></symbol><symbol id="icon-fenban" viewBox="0 0 1024 1024"><path d="M261.2 339.5h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71v91.1c0 39.2-31.8 71-71 71z m-91.1-202.1c-22.1 0-40 17.9-40 40v91.1c0 22.1 18 40 40 40h91.1c22.1 0 40-18 40-40v-91.1c0-22.1-17.9-40-40-40h-91.1zM555.2 339.5h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71v91.1c0 39.2-31.9 71-71 71z m-91.1-202.1c-22.1 0-40 17.9-40 40v91.1c0 22.1 18 40 40 40h91.1c22.1 0 40-18 40-40v-91.1c0-22.1-17.9-40-40-40h-91.1zM853.9 339.5h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71v91.1c-0.1 39.2-31.9 71-71 71z m-91.1-202.1c-22.1 0-40 17.9-40 40v91.1c0 22.1 17.9 40 40 40h91.1c22.1 0 40-18 40-40v-91.1c0-22.1-18-40-40-40h-91.1zM261.2 634.2h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71v91.1c0 39.1-31.8 71-71 71z m-91.1-202.1c-22.1 0-40 18-40 40v91.1c0 22.1 18 40 40 40h91.1c22.1 0 40-18 40-40v-91.1c0-22.1-17.9-40-40-40h-91.1zM555.2 634.2h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71v91.1c0 39.1-31.9 71-71 71z m-91.1-202.1c-22.1 0-40 18-40 40v91.1c0 22.1 18 40 40 40h91.1c22.1 0 40-18 40-40v-91.1c0-22.1-17.9-40-40-40h-91.1zM853.9 634.2h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71v91.1c-0.1 39.1-31.9 71-71 71z m-91.1-202.1c-22.1 0-40 18-40 40v91.1c0 22.1 17.9 40 40 40h91.1c22.1 0 40-18 40-40v-91.1c0-22.1-18-40-40-40h-91.1zM261.2 920h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71V849c0 39.1-31.8 71-71 71z m-91.1-202.1c-22.1 0-40 18-40 40V849c0 22.1 18 40 40 40h91.1c22.1 0 40-17.9 40-40v-91.1c0-22.1-17.9-40-40-40h-91.1zM555.2 920h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71V849c0 39.1-31.9 71-71 71z m-91.1-202.1c-22.1 0-40 18-40 40V849c0 22.1 18 40 40 40h91.1c22.1 0 40-17.9 40-40v-91.1c0-22.1-17.9-40-40-40h-91.1zM853.9 920h-91.1c-39.1 0-71-31.8-71-71v-91.1c0-39.1 31.8-71 71-71h91.1c39.1 0 71 31.8 71 71V849c-0.1 39.1-31.9 71-71 71z m-91.1-202.1c-22.1 0-40 18-40 40V849c0 22.1 17.9 40 40 40h91.1c22.1 0 40-17.9 40-40v-91.1c0-22.1-18-40-40-40h-91.1z"  ></path></symbol><symbol id="icon-putongzuoye" viewBox="0 0 1024 1024"><path d="M830.1 64.2H195.9c-38 0-68.9 30.9-68.9 68.9v757.4c0 38 30.9 68.9 68.9 68.9h634.2c38 0 68.9-30.9 68.9-68.9V133.1c0-38-30.9-68.9-68.9-68.9z m-74 44.7v144.2h0.1c0 2.4-1.7 4.9-5.2 4.9l-77.9-48.9-77.9 48.9c-3.5-2.4-5.2-4.9-5.2-4.9V108.9c0-1.8 1.9-3.6 4.9-4.4H751c4 1.2 5.1 4.4 5.1 4.4z m102.6 781.6c0 15.8-12.8 28.6-28.6 28.6H195.9c-15.8 0-28.6-12.8-28.6-28.6V133.1c0-15.8 12.8-28.6 28.6-28.6h373v191.2s2.2 3.8 6.5 7.6l97.7-65.8 97.7 65.8c4.3 0 6.5-3.8 6.5-7.6V104.5h52.8c15.8 0 28.6 12.8 28.6 28.6v757.4z"  ></path><path d="M718.6 542.9H307.4c-11.1 0-20.1-9-20.1-20.1s9-20.1 20.1-20.1h411.2c11.1 0 20.1 9 20.1 20.1 0 11.1-9 20.1-20.1 20.1zM718.6 726.7H307.4c-11.1 0-20.1-9-20.1-20.1s9-20.1 20.1-20.1h411.2c11.1 0 20.1 9 20.1 20.1s-9 20.1-20.1 20.1z"  ></path></symbol><symbol id="icon-fenzuzuoye" viewBox="0 0 1024 1024"><path d="M325.8 527.1v-0.1c0-9.8-7.9-17.6-17.8-17.6-64.3 0-116.5-55.9-116.5-124.4 0-68.6 52.2-124.4 116.5-124.4 9.8 0 17.8-7.9 17.8-17.6 0-9.8-7.9-17.8-17.8-17.8-83.8 0-151.9 71.8-151.9 159.8 0 58.7 30.2 110 75.1 137.8C135.6 556.5 66.7 651.9 66.7 764c0 9.8 7.9 17.7 17.7 17.7 9.8 0 17.7-7.9 17.7-17.7 0-120.9 92.4-219.2 205.9-219.2 9.8 0 17.8-7.9 17.8-17.7zM700.2 536.1v-0.1c0-9.8 7.9-17.6 17.8-17.6 64.3 0 116.5-55.9 116.5-124.4 0-68.6-52.2-124.4-116.5-124.4-9.8 0-17.8-7.9-17.8-17.6 0-9.8 7.9-17.8 17.8-17.8 83.8 0 151.9 71.8 151.9 159.8 0 58.7-30.2 110-75.1 137.8C890.4 565.5 959.3 661 959.3 773c0 9.8-7.9 17.7-17.7 17.7-9.8 0-17.7-7.9-17.7-17.7 0-120.9-92.4-219.2-205.9-219.2-9.8 0-17.8-7.9-17.8-17.7z"  ></path><path d="M733.1 620.5c-1.5-1.7-39.9-42.1-86.1-62.8-19.3-8.7-37.2-14.7-52.2-19 61.3-30.3 103.7-93.3 103.7-166.2 0-102.2-83.2-185.4-185.5-185.4s-185.5 83.2-185.5 185.4c0 70.6 39.8 132.2 98 163.5-121.4 37.4-209.8 150.6-209.8 284.1 0 9.8 7.9 17.7 17.8 17.7 9.8 0 17.6-7.9 17.6-17.7 0-144.3 117.5-261.8 260.6-261.9 1.9 0.2 3.7 0.1 5.5-0.3 2.3-0.1 4.6-0.4 6.9-0.5 0.8 0 1.5 0.1 2.3 0.1 26.2 0.6 75.8 16.2 105.6 29.8 45.6 20.8 76.3 58.7 78 60.5 41.8 47.8 64.7 108.3 64.7 172.3 0 9.8 7.9 17.7 17.7 17.7s17.6-7.9 17.6-17.7c0.2-74.5-27-144.9-76.9-199.6z m-182.2-92.4zM363 372.5c0-82.8 67.3-150.1 150.1-150.1s150.1 67.3 150.1 150.1-67.3 150.1-150.1 150.1c-82.7-0.1-150.1-67.4-150.1-150.1z"  ></path></symbol><symbol id="icon-bianjidaibeijing" viewBox="0 0 1024 1024"><path d="M513 98.2c-229.2 0-415 185.8-415 415s185.8 415 415 415 415-185.8 415-415-185.8-415-415-415z m-181.7 608c-0.7 0-0.7 0-0.7-0.7 14.6-38 28.5-76.8 43.2-114.9 23.4 23.4 47.6 46.8 71 71-37.4 14.6-75.5 30-113.5 44.6z m376.3-303.5C640 469 531.5 576.3 470.4 637.3l-71.7-71.7c61.1-61.1 169.9-168.6 237.5-234.9 5.7-5.6 14.9-5.5 20.5 0.1l51.1 51.1c5.7 5.8 5.6 15.1-0.2 20.8z"  ></path></symbol><symbol id="icon-bofang" viewBox="0 0 1024 1024"><path d="M513 928.2c-228.8 0-415-186.2-415-415s186.2-415 415-415 415 186.2 415 415-186.2 415-415 415z m0-798.1c-211.2 0-383.1 171.9-383.1 383.1S301.8 896.3 513 896.3s383.1-171.9 383.1-383.1S724.2 130.1 513 130.1z"  ></path><path d="M718.4 509.8L401 313.1c-2.7-1.7-6.2 0.3-6.2 3.4v393.3c0 3.2 3.5 5.1 6.2 3.4l317.4-196.6c2.5-1.5 2.5-5.2 0-6.8z"  ></path></symbol><symbol id="icon-wancheng" viewBox="0 0 1024 1024"><path d="M513 98.2c-228.6 0-414 185.4-414 414s185.4 414 414 414 414-185.4 414-414-185.4-414-414-414zM743.1 430L468.2 676.8c-6.4 5.7-14.6 8.9-23.1 8.9-0.9 0-1.7 0-2.6-0.1-9.4-0.7-18.1-5.2-24.1-12.5L279.3 504.6c-12.2-14.7-10.1-36.6 4.7-48.8 14.8-12.2 36.6-10.1 48.8 4.7l116.1 140.6L697 378.4c14.2-12.8 36.1-11.6 48.9 2.6 12.6 14.3 11.5 36.2-2.8 49z"  ></path></symbol><symbol id="icon-zuojiantou" viewBox="0 0 1024 1024"><path d="M204.7 511.2c0-19.8 9.1-38.5 24.7-50.8L716.9 77.1c28-22 68.6-17.2 90.7 10.8 22 28 17.2 68.6-10.8 90.7l-423 332.6 423 332.6c28.1 22 32.9 62.7 10.8 90.7-22 28-62.6 32.9-90.7 10.8L229.3 562c-15.6-12.3-24.6-31-24.6-50.8z"  ></path></symbol><symbol id="icon-youjiantou" viewBox="0 0 1024 1024"><path d="M821.3 511.2c0-19.8-9.1-38.5-24.7-50.8L309.1 77.1c-28-22-68.6-17.2-90.7 10.8-22 28-17.2 68.6 10.8 90.7l423 332.6-423 332.6c-28.1 22-32.9 62.7-10.8 90.7 22 28 62.6 32.9 90.7 10.8L796.7 562c15.6-12.3 24.6-31 24.6-50.8z"  ></path></symbol><symbol id="icon-shangjiantou" viewBox="0 0 1024 1024"><path d="M512.3 202.1c-19.8 0-38.5 9.1-50.8 24.7L78.1 714.3c-22 28-17.2 68.6 10.8 90.7 28 22 68.6 17.2 90.7-10.8l332.6-423 332.6 423c22 28.1 62.7 32.9 90.7 10.8 28-22 32.9-62.6 10.8-90.7L563 226.8c-12.2-15.6-31-24.7-50.7-24.7z"  ></path></symbol><symbol id="icon-zhankai" viewBox="0 0 1024 1024"><path d="M573.6 402.8c-14 14-13.8 35.1 0.6 48.9 13.5 13 35.4 11.9 48.6-1.4l234.1-234.1v158.9c0 20.5 13.6 34.3 33.9 34.5 19.4 0.2 35.1-16 35.1-35.4V134.1c0-9.4-3.7-18.4-10.4-25-6.6-6.6-15.6-10.4-25-10.4h-241c-20.5 0-34.3 13.5-34.5 33.9-0.3 19.4 16 35.1 35.4 35.1h158L573.6 402.8z m234.9-234.9"  ></path><path d="M131.4 617c-20.7 0-34.5 13.8-34.5 34.5v241c0 9.4 3.7 18.4 10.4 25 6.6 6.6 15.6 10.4 25 10.4h241c20.5 0 34.3-13.6 34.5-33.9 0.2-19.4-16-35.1-35.4-35.1h-158L449.3 624c14-14 13.8-35.1-0.6-48.9-13.5-13-35.4-11.9-48.7 1.4L165.9 810.4V651.5c0-20.7-13.8-34.5-34.5-34.5z m0 0"  ></path></symbol><symbol id="icon-shousuo" viewBox="0 0 1024 1024"><path d="M915.5 156.8c13.9-13.9 13.8-35-0.6-48.8-13.5-13-35.3-11.9-48.6 1.4L632.5 343.2V184.5c0-20.5-13.5-34.2-33.9-34.5-19.4-0.2-35.1 16-35.1 35.4v239.8c0 9.4 3.7 18.4 10.3 25 6.6 6.6 15.6 10.3 25 10.3h240.7c20.5 0 34.2-13.5 34.5-33.9 0.2-19.4-16-35.1-35.4-35.1H680.8l234.7-234.7z"  ></path><path d="M425.5 875.8c20.7 0 34.5-13.8 34.5-34.5V600.6c0-9.4-3.7-18.4-10.3-25-6.6-6.6-15.6-10.3-25-10.3H184c-20.5 0-34.2 13.5-34.5 33.9-0.2 19.4 16 35.1 35.4 35.1h157.8L108 869c-13.9 13.9-13.8 35 0.6 48.8 13.5 13 35.3 11.9 48.6-1.4L391 682.6v158.7c0 20.7 13.8 34.5 34.5 34.5z"  ></path></symbol><symbol id="icon-gonggao" viewBox="0 0 1024 1024"><path d="M895.1 471.1H734.7c-18.2 0-32.9 14.8-32.9 33.1v10.3c0 18.3 14.7 33.1 32.9 33.1H895c18.2 0 32.9-14.8 32.9-33.1v-10.3c0.1-18.3-14.6-33.1-32.8-33.1zM523 187.4c-49.9 39.7-154.2 95.2-229.3 148.7l-0.1 0.1c-0.9 0.5-1.7 3.5-2.6 4-8.9 5-12.9 18.8-61.1 18.8h-94.1c-24.1 0-39.1 11.3-39.1 36.8v226.6c0 25.5 13.7 38.1 39.1 38.1h94.5c48 0.1 51.9 13.8 60.7 18.8 0.9 0.5 1.7 3.5 2.6 4l0.1 0.1c72.7 53.4 177.8 113.4 229.3 151.4 15.5 11.5 67.1 31.6 67.1-39.2v-572c0.1-70.9-51.9-48.2-67.1-36.2z m148.1 156.2c8.5 15 25.4 18.8 37.7 8.4l131.8-111.1c12.3-10.4 15.4-30.9 6.9-46l-4.8-8.5c-8.5-15-25.4-18.8-37.7-8.4L673.2 289.1c-12.3 10.4-15.4 31-6.9 46l4.8 8.5z m37.7 323.5c-12.3-10.4-29.2-6.6-37.7 8.4l-4.8 8.5c-8.5 15-5.4 35.6 6.9 46L805 841.1c12.3 10.4 29.2 6.6 37.7-8.4l4.8-8.5c8.5-15 5.4-35.6-6.9-46L708.8 667.1z m0 0" fill="" ></path></symbol><symbol id="icon-wenjian" viewBox="0 0 1024 1024"><path d="M896.3 368H97.7c-8.5 0-16.6 3.4-22.6 9.4s-9.4 14.1-9.4 22.6v447.2c0 35.1 28.7 63.9 63.9 63.9h766.7c35.1 0 63.9-28.8 63.9-63.9V431.9c0-35.1-28.7-63.9-63.9-63.9zM97.7 304.2h411.5c23.8 0 39.2-25 28.6-46.2l-55.1-110.1c-10.8-21.7-32.9-35.3-57.2-35.3H129.7c-35.3 0-63.9 28.6-63.9 63.9v95.8c0 8.5 3.4 16.6 9.4 22.6 5.9 5.9 14 9.3 22.5 9.3z m0 0"  ></path></symbol><symbol id="icon-huifu1" viewBox="0 0 1024 1024"><path d="M311.5 435.7m-37.6 0a37.6 37.6 0 1 0 75.2 0 37.6 37.6 0 1 0-75.2 0Z" fill="" ></path><path d="M511.3 435.7m-37.6 0a37.6 37.6 0 1 0 75.2 0 37.6 37.6 0 1 0-75.2 0Z" fill="" ></path><path d="M711.2 435.7m-37.6 0a37.6 37.6 0 1 0 75.2 0 37.6 37.6 0 1 0-75.2 0Z" fill="" ></path><path d="M300.8 929.8c-2 0-4.1-0.3-6.1-0.8-8.2-2.2-14.6-8.6-16.7-16.7l-37.3-139.1h-96.4c-52.2 0-94.7-42.5-94.7-94.7V192.9c0-52.2 42.5-94.7 94.7-94.7h734c52.2 0 94.7 42.5 94.7 94.7v485.4c0 52.2-42.5 94.7-94.7 94.7h-411L317.6 922.8c-4.5 4.5-10.6 7-16.8 7zM144.3 145.6c-26.1 0-47.4 21.2-47.4 47.4v485.4c0 26.1 21.2 47.4 47.4 47.4h114.5c10.7 0 20.1 7.2 22.9 17.6l31.4 117.1 127.7-127.7c4.4-4.4 10.5-6.9 16.7-6.9h420.8c26.1 0 47.4-21.2 47.4-47.4V192.9c0-26.1-21.2-47.4-47.4-47.4h-734z" fill="" ></path></symbol><symbol id="icon-fenzhi" viewBox="0 0 1024 1024"><path d="M739.9 279.2c58.3 0 105.6-47.2 105.6-105.3 0-58.2-47.3-105.3-105.7-105.3-35.8 0-69.1 18.2-88.5 48.3-19.4 30.1-22.1 68-7.3 100.6L474.4 371.2c-29.8-17.6-63.8-26.9-98.4-26.8-51.2-0.1-100.4 20.2-136.7 56.4-36.3 36.2-56.7 85.3-56.8 136.6 0.2 106.7 86.7 193.1 193.4 193 37.3 0 72.3-10.6 101.8-28.9l111.1 100.7c-15 32.6-12.3 70.6 7.2 100.8 19.4 30.2 53 48.4 88.9 48.2 58.3 0 105.6-47.2 105.6-105.3 0-58.2-47.3-105.3-105.6-105.3-22.6 0-43.5 7-60.7 19.1l-103.7-94.1c31.6-35.3 49-81 49-128.3 0-50.6-19.5-96.7-51.4-131.1L679.4 260c17 12.1 38.1 19.1 60.5 19.2z m0-155.4c27.7 0 50.3 22.5 50.3 50.2 0 27.8-22.5 50.3-50.3 50.3-27.8 0-50.3-22.5-50.3-50.3 0.1-27.8 22.7-50.2 50.3-50.2zM278.3 634.9c-26-25.8-40.5-60.9-40.4-97.5 0-36.8 14.3-71.4 40.4-97.5 25.9-25.9 61.1-40.5 97.7-40.3 36.7-0.1 71.8 14.4 97.7 40.3 26.1 26 40.4 60.6 40.4 97.5 0.1 36.6-14.5 71.7-40.4 97.5-25.9 25.9-61.1 40.5-97.7 40.3-36.7 0.2-71.9-14.4-97.7-40.3z m406.6 160.9c26.7 1.3 47.7 23.4 47.7 50.1 0 26.7-21 48.8-47.7 50.1-26.7-1.3-47.7-23.4-47.7-50.1 0-26.7 21-48.7 47.7-50.1z m0 0" fill="" ></path></symbol><symbol id="icon-wangzhikelong" viewBox="0 0 1024 1024"><path d="M824.2 719.3h-415c-57.3 0-103.7-46.5-103.7-103.7v-415c0-57.3 46.5-103.7 103.7-103.7h415c57.3 0 103.7 46.5 103.7 103.7v415c0.1 57.2-46.4 103.7-103.7 103.7z m51.9-518.7c0-28.6-23.2-51.9-51.9-51.9h-415c-28.6 0-51.9 23.2-51.9 51.9v415c0 28.6 23.2 51.9 51.9 51.9h415c28.6 0 51.9-23.2 51.9-51.9v-415zM149.9 408.1v415c0 28.6 23.2 51.9 51.9 51.9h415c28.7 0 51.9-23.2 51.9-51.9v-25.9c0-14.3 11.6-25.9 25.9-25.9 14.3 0 25.9 11.6 25.9 25.9V823c0 57.3-46.4 103.7-103.7 103.7h-415C144.5 926.8 98 880.3 98 823V408c0-57.3 46.4-103.7 103.7-103.7h25.9c14.3 0 25.9 11.6 25.9 25.9 0 14.3-11.6 25.9-25.9 25.9h-25.9c-28.6 0.1-51.8 23.3-51.8 52z m0 0" fill="" ></path></symbol><symbol id="icon-xiazai" viewBox="0 0 1024 1024"><path d="M763.8 813.3h-503c-108.4 0-196.6-88.2-196.6-196.6 0-50.9 20.3-100.4 56-137-0.1-2.1-0.1-4.2-0.1-6.2 0-98.8 80.3-179.1 179.1-179.1 18.6 0 36.9 2.8 54.5 8.5 52.3-66.8 132.8-106.3 218-106.3 138.8 0 257.3 105.4 274.6 241.9 68.7 32.1 114.1 102.3 114.1 178.2 0 108.5-88.2 196.6-196.6 196.6z m-464.6-482c-78.5 0-142.3 63.8-142.3 142.3 0 4 0.2 8 0.5 11.9 0.5 5.6-1.7 11.1-5.8 15C119.5 530.6 101 573 101 616.8c0 88.1 71.7 159.7 159.7 159.7h503c88.1 0 159.7-71.7 159.7-159.7 0-64.8-40.7-124.4-101.2-148.5-6.5-2.6-10.9-8.6-11.5-15.5-10.6-123-115.6-219.3-239.1-219.3-78 0-151.4 38.1-196.4 102-4.9 7-14.1 9.7-22 6.4-17.1-7-35.3-10.6-54-10.6z" fill="" ></path><path d="M512.3 684.5c-2.4 0-4.8-0.5-7-1.4-6.9-2.8-11.4-9.6-11.4-17V472.8c0-10.2 8.2-18.4 18.4-18.4s18.4 8.2 18.4 18.4v148.9l51.4-51.4c7.2-7.2 18.8-7.2 26 0s7.2 18.8 0 26l-82.8 82.8c-3.5 3.5-8.2 5.4-13 5.4z" fill="" ></path><path d="M512.3 684.5c-4.8 0-9.5-1.9-13-5.4l-82.8-82.8c-7.2-7.2-7.2-18.8 0-26s18.8-7.2 26 0l51.4 51.4V472.8c0-10.2 8.2-18.4 18.4-18.4s18.4 8.2 18.4 18.4v193.3c0 7.4-4.5 14.2-11.4 17-2.3 0.9-4.6 1.4-7 1.4z" fill="" ></path></symbol><symbol id="icon-daima" viewBox="0 0 1024 1024"><path d="M311.1 739c-6.1 0-12.2-2.3-16.8-7L69.7 507.4l224.6-224.6c9.3-9.3 24.3-9.3 33.6 0s9.3 24.3 0 33.6l-191 191 191 191c9.3 9.3 9.3 24.3 0 33.6-4.6 4.7-10.7 7-16.8 7zM711.5 739c-6.1 0-12.2-2.3-16.8-7-9.3-9.3-9.3-24.3 0-33.6l191-191-191-191c-9.3-9.3-9.3-24.3 0-33.6s24.3-9.3 33.6 0L953 507.4 728.3 732c-4.6 4.7-10.7 7-16.8 7zM418.5 814.7c-2.4 0-4.8-0.4-7.2-1.1-12.5-4-19.4-17.3-15.5-29.8l179.6-567.1c4-12.5 17.3-19.4 29.8-15.5 12.5 4 19.4 17.3 15.5 29.8L441.1 798.1a23.73 23.73 0 0 1-22.6 16.6z" fill="" ></path></symbol><symbol id="icon-tijiaojilu" viewBox="0 0 1024 1024"><path d="M480.4 875.2H250.1c-2.5 0-5.1-0.1-7.6-0.3-1.5-0.1-2.9-0.2-4.3-0.4 7.9 0.9 2.8 0.4 1 0-6-1.1-11.8-2.7-17.5-4.9-4.8-1.8 5.6 2.5 0.9 0.4l-3.7-1.8c-2.5-1.3-4.9-2.7-7.2-4.1-1.8-1.1-10.6-7.6-3.8-2.4-4.2-3.4-8.2-7.1-11.8-11.2l-2.7-3.1c-3.2-4 3.6 4.8 0.6 0.7-3.5-4.8-6.5-9.9-9.1-15.2-0.8-1.5-2.7-6.3 0.3 0.9-0.6-1.3-1-2.6-1.5-3.9-2-5.7-3.5-11.6-4.4-17.7 1.4 8.7 0-1.2-0.1-3.4-0.1-1.5-0.1-2.9-0.1-4.4V219c0-3.4 0.2-6.8 0.5-10.2 0.5-5.3-1 6.3-0.1 1 0.9-6 2.6-11.8 4.7-17.5 0.6-1.6 2.7-6.3-0.5 0.8l1.8-3.7c2.4-4.9 5.3-9.6 8.5-14.1 3-4.1-3.8 4.7-0.6 0.8 2.9-3.5 6-6.8 9.3-9.9 1.5-1.4 9-7.3 2.2-2.2 5.9-4.4 12.2-8.1 18.9-11-7.1 3.1-2.5 1-0.9 0.4 5.3-1.9 10.7-3.4 16.2-4.4 1.8-0.4 7-1-1 0 4.2-0.5 8.5-0.7 12.8-0.6h524.9c3.2 0 6.3 0.1 9.5 0.4 4.6 0.8 9.1 1.9 13.6 3.3 2.1 0.6 11 4.3 3.1 0.9 6.7 2.9 13 6.6 18.9 11-6.1-4.5-2.1-1.6-0.8-0.5 4.2 3.5 8 7.4 11.5 11.6 1.1 1.2 4.1 5.3-0.5-0.8 4.4 5.9 8.1 12.2 11 18.9-3.5-7.9 0.3 1.1 0.9 3 1.4 4.5 2.5 9 3.3 13.6 0.9 5.3-0.7-6.3-0.1-1 0.4 2.9 0.5 5.8 0.5 8.7v356.8c0 13.6 11.4 25 25 25 13.8-0.1 24.9-11.2 25-25V219.4c0-21.9-5.9-43.7-17.1-62.6-14.7-23.9-37.1-42.2-63.6-51.7-17.5-6.7-36-6.9-54.5-6.9H267c-16.2 0-31.9 0-48 4-52.3 13.2-90 63.2-90 116.8v582c0 35.1 13 68.9 39.3 92.7 21.3 19.1 48.5 30.2 77 31.5 5.7 0.3 11.3 0.1 17 0.1h218c13.8-0.1 24.9-11.2 25-25 0-13.8-11.1-24.9-24.9-25.1zM854.2 687l-97.5 101.6-90.3 94h35.4l-73.2-65.2c-10.2-9-25.4-10-35.4 0-9.2 9.3-10.2 26.3 0 35.4l73.3 65.2c10 9 25.5 10.3 35.4 0l97.5-101.6 90.3-94c9.7-9.8 9.7-25.6 0-35.4-9.9-9.7-25.7-9.7-35.5 0zM349.9 338.5h326.3c13.8-0.1 24.9-11.3 25-25-0.1-13.8-11.3-24.9-25-25H349.9c-13.8 0.1-24.9 11.3-25 25-0.1 13.6 11.3 25 25 25z m0 195.6h326.3c13.8-0.1 24.9-11.2 25-25-0.1-13.8-11.3-24.9-25-25H349.9c-13.8 0.1-24.9 11.3-25 25-0.1 13.6 11.3 25 25 25z m0 195.6h130.6c13.8-0.2 24.9-11.3 25-25-0.1-13.8-11.3-24.9-25-25H349.8c-13.8 0.2-24.9 11.3-25 25 0 13.6 11.4 25 25.1 25z m0 0" fill="#2A2A2A" ></path></symbol><symbol id="icon-xuanzeti" viewBox="0 0 1024 1024"><path d="M701 959.4H325c-116.4 0-211.1-100.4-211.1-223.8V357.9c0-117.6 86.8-215.6 197.6-223.1l2.7 39.1c-90.3 6.1-161.1 87-161.1 184v377.7c0 101.8 77.2 184.6 172 184.6H701c94.8 0 172-82.8 172-184.6V357.9c0-97.1-70.7-177.9-161.1-184l2.7-39.1c110.8 7.5 197.6 105.5 197.6 223.1v377.7C912.1 859 817.4 959.4 701 959.4z" fill="" ></path><path d="M741.5 429.3L485.8 736.1c-9.8 11.7-27.2 13.2-38.7 3.3L276.5 593.2c-11.5-9.8-12.8-27.1-3-38.5 9.8-11.4 27.1-12.8 38.5-3l128.5 110.1c11.6 9.9 29 8.4 38.7-3.3l220.2-264.3c9.7-11.6 26.9-13.2 38.5-3.5 11.7 9.7 13.3 27 3.6 38.6z m17.5-21M640.8 239.8H385.2c-48.4 0-87.8-39.4-87.8-87.8s39.4-87.8 87.8-87.8h255.7c48.4 0 87.8 39.4 87.8 87.8s-39.5 87.8-87.9 87.8zM385.2 103.4c-26.8 0-48.6 21.8-48.6 48.6s21.8 48.6 48.6 48.6h255.7c26.8 0 48.6-21.8 48.6-48.6s-21.8-48.6-48.6-48.6H385.2z" fill="" ></path></symbol><symbol id="icon-bianji" viewBox="0 0 1024 1024"><path d="M758.6 96C622.9 229 404.5 444.9 281.8 567.7l144 144C548.4 589 766.4 373.5 902.2 240.4c11.6-11.4 11.7-30.1 0.2-41.6L799.8 96.3c-11.3-11.4-29.7-11.5-41.2-0.3zM145 848.5c29.4-76.4 57.3-154.3 86.7-230.7 47 47 95.5 94 142.5 142.5-74.9 29.4-151.3 60.2-227.8 89.6-1.4 0.1-1.4 0.1-1.4-1.4z" fill="" ></path></symbol><symbol id="icon-xiangshang" viewBox="0 0 1024 1024"><path d="M804.4 373L554.6 112.8c-23.3-19.4-61.3-19.4-84.6 0L220.2 373c-37.2 31.8-10.9 86.1 41.9 86.1h145.4v432.2c0 18.7 15.3 34 34 34h142.4c18.7 0 34-15.3 34-34V459.1h144.6c52.8 0 79.1-54.3 41.9-86.1z m0 0" fill="" ></path></symbol><symbol id="icon-shanchudiao" viewBox="0 0 1024 1024"><path d="M379.6 668.7c-5.7 0-11.3-2.2-15.6-6.5-8.6-8.6-8.6-22.6 0-31.3l266.7-266.7c8.6-8.6 22.6-8.6 31.3 0 8.6 8.6 8.6 22.6 0 31.3L395.3 662.2c-4.4 4.3-10 6.5-15.7 6.5z" fill="" ></path><path d="M646.4 668.7c-5.7 0-11.3-2.2-15.6-6.5L364 395.5c-8.6-8.6-8.6-22.6 0-31.3 8.6-8.6 22.6-8.6 31.3 0L662 630.9c8.6 8.6 8.6 22.6 0 31.3-4.3 4.3-10 6.5-15.6 6.5z" fill="" ></path><path d="M513 927.7c-106.2 0-212.4-40.4-293.2-121.3-161.7-161.6-161.7-424.7 0-586.4s424.7-161.7 586.4 0 161.7 424.8 0 586.4c-80.8 80.9-187 121.3-293.2 121.3z m0-784.7c-94.9 0-189.7 36.1-261.9 108.3-144.4 144.4-144.4 379.4 0 523.9 144.5 144.4 379.5 144.4 523.9 0 144.4-144.4 144.4-379.4 0-523.9C702.7 179.1 607.9 143 513 143z" fill="" ></path></symbol><symbol id="icon-shangshengpaixu" viewBox="0 0 1024 1024"><path d="M806.2 373.9L555.4 112.8c-23.4-19.5-61.5-19.5-84.9 0L219.8 373.9c-37.4 31.9-10.9 86.4 42 86.4h145.9v433.8c0 18.8 15.4 34.2 34.2 34.2h142.9c18.8 0 34.2-15.4 34.2-34.2V460.3h145.1c53 0 79.5-54.5 42.1-86.4z m0 0" fill="" ></path></symbol><symbol id="icon-banbenku" viewBox="0 0 1024 1024"><path d="M512.6 140.2c21.8 0 42.1 8.4 57.3 23.6l290.9 290.9c31.6 31.6 31.6 83.1 0 114.7L570 860.2c-15.2 15.2-35.6 23.6-57.3 23.6-21.8 0-42.1-8.4-57.3-23.6l-291-290.9c-31.6-31.6-31.6-83.1 0-114.7l290.9-290.9c15.2-15.1 35.6-23.5 57.3-23.5m0-40.6c-31.2 0-62.4 11.8-86 35.5L135.7 426c-47.3 47.3-47.3 124.7 0 172l290.9 290.9c23.7 23.7 54.8 35.5 86 35.5 31.2 0 62.4-11.8 86-35.5L889.5 598c47.3-47.3 47.3-124.7 0-172L598.6 135.1c-23.6-23.6-54.8-35.5-86-35.5z" fill="" ></path><path d="M686.4 237.5L621.2 280c-5.4-2.9-11.2-5.1-17.5-6.5-34.4-7.2-68 14.7-75.2 49.1-1.3 6.3-1.7 12.5-1.2 18.6l-112 73.2c-5.5-3.2-11.6-5.5-18.2-6.9-34.4-7.2-68 14.7-75.2 49.1-5.9 28 7.6 55.5 31.4 68.6l0.4 0.7 0.3-0.2c5.2 2.7 10.8 4.8 16.8 6.1 34.4 7.2 68-14.7 75.2-49.1 1.3-6 1.7-12.1 1.2-17.9l99.2-64.7-45.3 215.4c-21.7 6.3-39.4 24.1-44.4 47.9-7.2 34.4 14.7 68 49.1 75.2 34.4 7.2 68-14.7 75.2-49.1 5-23.8-4-47.2-21.4-61.7l48.6-231.2c21.7-6.3 39.4-24.1 44.4-47.9 1.3-6.3 1.7-12.5 1.2-18.6l65.1-42.5" fill="" ></path></symbol><symbol id="icon-issue" viewBox="0 0 1024 1024"><path d="M515.4 935c-111.7 0-216.8-43.5-295.8-122.5C140.5 733.4 97 628.4 97 516.6s43.5-216.8 122.5-295.8S403.6 98.3 515.3 98.3c111.8 0 216.8 43.5 295.8 122.5s122.5 184.1 122.5 295.8-43.5 216.8-122.5 295.8C732.2 891.5 627.1 935 515.4 935z m0-792.1c-99.8 0-193.7 38.9-264.3 109.5-70.6 70.6-109.5 164.5-109.5 264.3S180.5 710.4 251.1 781c70.6 70.6 164.5 109.5 264.3 109.5 99.8 0 193.7-38.9 264.3-109.5 70.6-70.6 109.5-164.5 109.5-264.3S850.3 323 779.7 252.4c-70.6-70.7-164.5-109.5-264.3-109.5z" fill="" ></path><path d="M510 718c2 2.4 4.4 3.6 6.7 3.6 4.2 0 8.1-1.8 11.9-5.4 10.9-8.9 23.8-24.8 38.6-48l12.5 7.1c-36.1 62.6-74.5 94.1-114.9 94.1-15.5 0-27.7-4.4-36.9-13.1-9.1-8.7-13.7-19.8-13.7-33.1 0-8.9 2-20 6.1-33.7L470 518.7c4.8-16.2 7.1-28.5 7.1-36.9 0-5.4-2.4-10.1-6.9-14.3-4.6-4.2-10.7-6.1-18.4-6.1-3.8 0-8.1 0.2-12.9 0.4l4.4-14.3L564.5 428h21.2l-73.3 253.9c-3.8 14.5-5.7 24.2-5.7 28.9 0.1 2.6 1.3 4.8 3.3 7.2z m91-364.5c-10.3 10.1-22.8 15.3-37.3 15.3-14.3 0-26.4-5.2-36.7-15.3-10.1-10.3-15.3-22.6-15.3-37.1s5-26.9 15.1-37.3c10.1-10.3 22.4-15.5 36.9-15.5 14.9 0 27.4 5.2 37.5 15.5 10.1 10.3 15.3 22.8 15.3 37.3 0.1 14.5-5.2 26.8-15.5 37.1z m0 0" fill="" ></path></symbol><symbol id="icon-shangchuantupian" viewBox="0 0 1024 1024"><path d="M858.9 98.2H167.1c-38 0-69.2 31.1-69.2 69.2v691.8c0 38.1 31.1 69.2 69.2 69.2h691.8c38 0 69.2-31.1 69.2-69.2V167.3c0-38-31.2-69.1-69.2-69.1zM669.5 270.8c47.8 0 86.4 38.7 86.4 86.5s-38.6 86.5-86.4 86.5c-47.8 0-86.5-38.7-86.5-86.5 0.1-47.8 38.7-86.5 86.5-86.5z m68.3 484.6H288.2c-38 0-59.8-29.7-48.2-65.9l87.9-277.3c11.5-36.3 39.4-40.9 62-10.3L535.3 599c22.6 30.6 60.3 31.1 83.7 1.1l44.5-56.8c23.4-30 53.6-25.4 67.1 10.1l51.9 137.2c13.5 35.7-6.6 64.8-44.7 64.8z m0 0" fill="" ></path></symbol><symbol id="icon-ceping" viewBox="0 0 1024 1024"><path d="M513 98.2c-229.2 0-415 185.8-415 415s185.8 415 415 415 415-185.8 415-415-185.8-415-415-415z m178.3 438.1l-236 136.2c-7.1 4.1-15.7 4.1-22.8 0-7.1-4.1-11.4-11.6-11.4-19.7V380.3c0-8.1 4.3-15.7 11.4-19.7 7.1-4.1 15.7-4.1 22.8 0l236 136.2c15.2 8.8 15.2 30.7 0 39.5z m0 0" fill="#040000" ></path></symbol><symbol id="icon-qqzaixianzixun" viewBox="0 0 1024 1024"><path d="M216 425.1c-4.7 11 1.6 18.8 0 61.2 0 11-50.2 64.3-70.6 119.2-20.4 53.3-22 109.8 7.8 133.3 29.8 21.9 58-73.7 62.7-59.6 1.6 6.3 3.1 12.5 6.3 18.8 9.4 26.7 26.7 54.9 50.2 81.5 4.7 6.3-29.8 15.7-50.2 50.2-20.4 34.5 6.3 97.2 108.2 97.2 131.7 0 159.9-45.5 163.1-45.5h20.4c12.5 0 7.8 1.6 18.8 0 6.3 0 70.6 54.9 158.4 45.5 150.5-15.7 127-65.9 116-97.2-12.5-32.9-56.4-48.6-53.3-50.2 36.1-39.2 42.3-64.3 53.3-100.3 4.7-15.7 39.2 83.1 67.4 59.6 11-9.4 32.9-48.6 11-133.3-21.9-83.1-65.9-103.5-64.3-119.2 1.6-32.9 1.6-54.9-1.6-61.1-7.8-28.2-25.1-22-25.1-28.2 0-166.2-123.9-299.5-277.5-299.5-153.7 0-277.5 134.8-277.5 299.5-1.6 12.5-14.1 3.1-23.5 28.1z m0 0" fill="" ></path></symbol><symbol id="icon-erweima" viewBox="0 0 1024 1024"><path d="M224.2 353.4h127.4V226.1H224.2v127.3zM96.9 926.6H479V544.5H96.9v382.1z m63.6-318.4h254.7v254.7H160.5V608.2z m63.7 191h127.4V671.8H224.2v127.4zM542.6 98.7v382.1h382.1V98.7H542.6zM861 417.1H606.3V162.4H861v254.7z m0 254.7H733.7V544.5h-191v382.1h63.7V671.8H670v63.7h254.7v-191H861v127.3z m-764.1-191H479V98.7H96.9v382.1z m63.6-318.4h254.7v254.7H160.5V162.4z m636.8 63.7H670v127.4h127.4V226.1zM861 926.6h63.7V799.2H861v127.4z m-127.3 0h63.7V799.2h-63.7v127.4z m0 0" fill="" ></path></symbol><symbol id="icon-yijianfankui" viewBox="0 0 1024 1024"><path d="M795.9 355.3v505c0 17-13.9 31-31 31h-573c-17 0-31-13.9-31-31V227.6c0-17 13.9-31 31-31h440.4c19.9 0 35.9-16.1 35.9-35.9 0-18.3-14.7-33-33-33H199.1c-55.7 0-101.2 45.5-101.2 101.2v630c0 55.7 45.5 101.2 101.2 101.2h558.8c55.7 0 101.2-45.5 101.2-101.2v-503c0-17.5-14.3-31.9-31.9-31.9-17.2 0-31.3 14-31.3 31.3z m0 0" fill="#212121" ></path><path d="M452.5 447.6H250.6c-14.2 0-25.8-11.7-25.8-25.8v-12.2c0-14.2 11.7-25.8 25.8-25.8h201.9c14.2 0 25.8 11.7 25.8 25.8v12.2c0.2 14.2-11.5 25.8-25.8 25.8z m189.4 192.1H250.6c-14.2 0-25.8-11.7-25.8-25.8v-12.2c0-14.2 11.7-25.8 25.8-25.8h391.3c14.2 0 25.8 11.7 25.8 25.8v12.2c0 14.2-11.6 25.8-25.8 25.8z m277.7-524.1L596 441c-10.1 10.1-26.5 10.1-36.6 0.1l-8.7-8.7c-10.1-10.1-10.1-26.5-0.1-36.6L874.3 70.4c10.1-10.1 26.5-10.1 36.6-0.1l8.7 8.7c10.1 10.1 10.1 26.5 0 36.6z m0 0" fill="#212121" ></path></symbol><symbol id="icon-youxiangrenzheng" viewBox="0 0 1024 1024"><path d="M879.1 174.4H144.4c-45 0-81.5 36.6-81.5 81.5v516.2c0 45 36.6 81.5 81.5 81.5H879c45 0 81.5-36.6 81.5-81.5V255.9c0.1-44.9-36.5-81.5-81.4-81.5z m0 56.1c4.1 0 8 1 11.5 2.8L511.8 506.4 133 233.3c3.6-1.8 7.5-2.8 11.5-2.8h734.6z m0 567H144.4c-14 0-25.4-11.4-25.4-25.4V292.4l392.7 283.2 392.7-283.2v479.8c0.1 13.9-11.3 25.3-25.3 25.3z m0 0" fill="#3E3A39" ></path></symbol><symbol id="icon-shoujirenzheng" viewBox="0 0 1024 1024"><path d="M729.1 960.9H296.9c-25.6 0-46.3-20.7-46.3-46.3V111.9c0-25.6 20.8-46.3 46.3-46.3h432.2c25.6 0 46.3 20.7 46.3 46.3v802.7c0 25.6-20.7 46.3-46.3 46.3zM513 914.6c17.1 0 30.9-13.8 30.9-30.9 0-17.1-13.8-30.9-30.9-30.9-17.1 0-30.9 13.8-30.9 30.9 0 17.1 13.8 30.9 30.9 30.9z m216.1-756.4H296.9v648.3h432.2V158.2z m0 0" fill="" ></path></symbol><symbol id="icon-zhiyerenzheng" viewBox="0 0 1024 1024"><path d="M602 326H403.7L284.5 708.8l218.6 220.3 238.2-201.8L602 326z m0.6-33H403.7L308.3 98.2h390.9L602.6 293z m0 0" fill="" ></path></symbol><symbol id="icon-shenfenrenzheng" viewBox="0 0 1024 1024"><path d="M509.7 891.3c-109.2 0-218.5 0.1-327.8 0-71-0.1-118.4-45-118.8-116.1-0.9-175.8-0.9-351.5 0-527.3 0.5-71 47.9-115.9 118.9-116 219.4 0 438.6 0 657.9 0.1 71.1 0 118.5 45 118.8 116.1 0.9 175.8 0.9 351.5 0 527.3-0.4 71.4-47.6 115.9-118.8 116.1-110-0.1-220.2-0.2-330.2-0.2z m3-710.7c-106.5 0-213.1-0.2-319.6 0.1-54.8 0.1-79.3 25.4-79.3 80.3v501.2c0 54.9 24.6 80.2 79.4 80.3 211.4 0.2 422.9 0.1 634.5 0 56.3 0 80.7-25 80.7-81.7V264.5c0-60-23.5-83.9-83.1-83.9-104.4-0.1-208.4 0-312.6 0z m0 0" fill="" ></path><path d="M742.7 529.1c14 12.4 29.1 23.9 41.8 37.4 24.5 26.1 37 57.7 38.5 93.5 0.5 13.9-0.6 27.5-18.7 28.8-17.2 1.2-22.5-9.9-23.8-24.9-2.7-33.4-15.5-62.1-42.1-83.1-69-54.9-169.6-14.6-182.5 72.9-0.5 3.2-0.6 6.6-0.7 9.8-0.7 14.7-5.7 26.6-23 25.2-18.7-1.4-21.4-14.8-20-30.3 3.6-41.8 20.3-77.3 51.7-105.4 9.2-8.2 19.4-15 30.8-23.6-26.1-27.7-42.6-59.4-37.4-98.7 4-29.7 17.8-54.2 41.1-73.4 41.7-34.4 106.7-31.5 146.5 6.4 45 43.1 44.1 101.5-2.2 165.4z m-8.5-84c0.6-35.9-28.8-66.1-65.2-66.8-36.5-0.7-66.9 28-67.9 64.1-1 36.9 29.4 68.2 66.4 68.3 36.2 0.3 66.1-29.2 66.7-65.6z m0 0M219.1 335.6h201.1c11.1 0 20.2 9 20.2 20.2 0 11.1-9 20.2-20.2 20.2H219.1c-11.1 0-20.2-9-20.2-20.2 0-11.1 9.1-20.2 20.2-20.2zM217.8 648.2h202.7c10.8 0 19.6 8.8 19.6 19.6s-8.8 19.6-19.6 19.6H217.8c-10.8 0-19.6-8.8-19.6-19.6 0-10.9 8.8-19.6 19.6-19.6zM217.1 492.9h204.5c10.5 0 18.9 8.5 18.9 18.9 0 10.5-8.5 18.9-18.9 18.9H217.1c-10.5 0-18.9-8.5-18.9-18.9 0-10.4 8.5-18.9 18.9-18.9z" fill="" ></path></symbol><symbol id="icon-pingfen" viewBox="0 0 1024 1024"><path d="M513 96.7L647.9 370l301.5 43.8-218.2 212.7 51.5 300.4L513 785.1 243.3 926.9l51.5-300.4L76.6 413.8 378.1 370z" fill="" ></path></symbol><symbol id="icon-pingfen-xian" viewBox="0 0 1024 1024"><path d="M772.8 928.2c-2.4 0-4.8-0.6-7.1-1.7L513 793.6 260.2 926.5c-5.1 2.7-11.3 2.2-16-1.2-4.7-3.4-7-9.1-6-14.8L286.5 629 82 429.7c-4.1-4-5.6-10.1-3.8-15.6 1.8-5.5 6.5-9.5 12.2-10.3l282.6-41 126.4-256.1c2.6-5.2 7.8-8.5 13.6-8.5s11.1 3.3 13.6 8.5L653 362.8l282.6 41.1c5.7 0.8 10.5 4.8 12.2 10.3 1.8 5.5 0.3 11.5-3.8 15.6L739.5 629l48.3 281.5c1 5.7-1.4 11.4-6 14.8-2.7 1.9-5.8 2.9-9 2.9zM513 761.3c2.4 0 4.9 0.6 7.1 1.7l232.6 122.3-44.4-259c-0.8-4.9 0.8-9.9 4.4-13.4l188.2-183.4-260.1-37.8c-4.9-0.7-9.2-3.8-11.4-8.3L513 147.7 396.7 383.3c-2.2 4.5-6.5 7.6-11.4 8.3l-260.1 37.8 188.2 183.4c3.6 3.5 5.2 8.5 4.4 13.4l-44.4 259L505.9 763c2.2-1.1 4.7-1.7 7.1-1.7z" fill="" ></path></symbol><symbol id="icon-zuoye" viewBox="0 0 1024 1024"><path d="M885.1 268.1l-161.6-189c-3.3-3.8-8-6-13.1-6h-518c-15.2 0-29.6 5.9-40.4 16.7-10.8 10.8-16.7 25.1-16.7 40.4v765.9c0 31.5 25.6 57.1 57.1 57.1H832c31.5 0 57.1-25.6 57.1-57.1V279.3c0.1-4.1-1.4-8-4-11.2zM852 282.3H704.4V109.7L852 282.3z m-19.9 636.6H192.5c-12.5 0-22.7-10.2-22.7-22.7V130.3c0-6.1 2.4-11.8 6.7-16.1 4.3-4.3 10-6.7 16.1-6.7H670v192c0 9.5 7.7 17.2 17.2 17.2h167.6v579.5c0 12.5-10.2 22.7-22.7 22.7z m0 0" fill="" ></path><path d="M726.5 389.2H279.9c-9.5 0-17.2 7.7-17.2 17.2s7.7 17.2 17.2 17.2h446.6c9.5 0 17.2-7.7 17.2-17.2s-7.7-17.2-17.2-17.2z m0 0M726.5 572.1H279.9c-9.5 0-17.2 7.7-17.2 17.2s7.7 17.2 17.2 17.2h446.6c9.5 0 17.2-7.7 17.2-17.2s-7.7-17.2-17.2-17.2z m0 0M726.5 754.9H279.9c-9.5 0-17.2 7.7-17.2 17.2s7.7 17.2 17.2 17.2h446.6c9.5 0 17.2-7.7 17.2-17.2s-7.7-17.2-17.2-17.2z m0 0" fill="" ></path></symbol><symbol id="icon-tishicuowu" viewBox="0 0 1024 1024"><path d="M511.3 64.2c-246.2 0-447.6 201.4-447.6 447.6s201.4 447.6 447.6 447.6S958.9 758 958.9 511.8 757.5 64.2 511.3 64.2z m298.4 522.2H212.9c-44.8 0-74.6-29.8-74.6-74.6s29.8-74.6 74.6-74.6h596.8c44.8 0 74.6 29.8 74.6 74.6s-29.8 74.6-74.6 74.6z m0 0" fill="" ></path></symbol><symbol id="icon-ziyuan" viewBox="0 0 1024 1024"><path d="M508.5 583.3c-12.6 0-24.5-3.9-34.5-11.3L100.7 369.2c-3.8-2-7.2-4.6-10.2-7.6-11-11-17-25.7-16.9-41.3 0.1-15.6 6.2-30.3 17.3-41.3 3.3-3.3 7.2-6.1 11.4-8.3L482.5 79.2c10.1-7.3 22-11.2 34.5-11.2 12 0 23.4 3.6 33.2 10.4l372.9 177.2c4.6 2.2 8.7 5.1 12.3 8.7 11.1 11 17.2 26.4 16.9 42.1-0.3 15.3-6.4 29.7-17.3 40.6-2.8 2.8-6 5.2-9.4 7.2l-381.4 217c-10.3 8-22.7 12.1-35.7 12.1zM517 98.4c-6.3 0-12.2 2-17.2 5.8-0.8 0.6-1.6 1.1-2.4 1.5L116 297.9c-1.3 0.7-2.5 1.5-3.6 2.6-5.3 5.3-8.3 12.4-8.4 19.9 0 7.4 2.8 14.4 8 19.6 0.9 0.9 2 1.8 3.2 2.4l374.3 203.3c0.7 0.4 1.4 0.9 2.1 1.4 4.8 3.7 10.6 5.7 16.8 5.7 6.5 0 12.6-2.1 17.7-6.2 0.6-0.5 1.3-1 2-1.4l382.5-217.7c1.1-0.6 2.1-1.4 3-2.3 5.3-5.3 8.2-12.2 8.4-19.6 0.1-7.5-2.8-14.7-8-20-1.1-1.1-2.4-2-3.9-2.7L535.9 105.3c-0.9-0.4-1.7-0.9-2.5-1.5-4.7-3.5-10.4-5.4-16.4-5.4z" fill="" ></path><path d="M505.9 708.2c-12.4 0-24.6-4-34.5-11.3L98.2 494.1c-10.4-5.7-18-15-21.4-26.4-3.4-11.4-2.1-23.4 3.6-33.8 4-7.4 13.3-10.1 20.7-6.1 7.4 4 10.1 13.3 6.1 20.7-1.8 3.3-2.2 7-1.1 10.6 1.1 3.6 3.4 6.5 6.7 8.3L487 670.7c0.7 0.4 1.4 0.8 2.1 1.3 4.8 3.7 10.6 5.7 16.8 5.7 6.4 0 12.7-2.2 17.7-6.2 0.6-0.5 1.3-0.9 2-1.3l382.5-217.7c3.2-1.8 5.5-4.8 6.5-8.4 1-3.6 0.5-7.3-1.3-10.6-4.2-7.3-1.6-16.6 5.7-20.8 7.3-4.2 16.6-1.6 20.8 5.7 5.9 10.3 7.4 22.3 4.2 33.7-3.1 11.4-10.5 21-20.8 26.8L541.6 696.1c-10.2 7.8-22.8 12.1-35.7 12.1z" fill="" ></path><path d="M505.9 833.4c-12.4 0-24.6-4-34.5-11.3L98.2 619.3c-10.4-5.7-18-15-21.4-26.4-3.4-11.4-2.1-23.4 3.6-33.8 4-7.4 13.3-10.1 20.7-6.1 7.4 4 10.1 13.3 6.1 20.7-1.8 3.3-2.2 7-1.1 10.6 1.1 3.6 3.4 6.5 6.7 8.3L487 795.8c0.7 0.4 1.4 0.8 2.1 1.3 4.8 3.7 10.6 5.7 16.8 5.7 6.4 0 12.7-2.2 17.7-6.2 0.6-0.5 1.3-0.9 2-1.3l382.5-217.7c6.7-3.8 9-12.3 5.2-19-4.2-7.3-1.6-16.6 5.7-20.8 7.3-4.2 16.6-1.6 20.8 5.7 12.1 21.3 4.7 48.4-16.6 60.5L541.6 821.3c-10.2 7.8-22.8 12.1-35.7 12.1z" fill="" ></path><path d="M506 958.5c-0.1 0-0.1 0 0 0-12.4 0-24.6-4-34.5-11.3L98.2 744.4c-21.5-11.7-29.5-38.7-17.8-60.2 4-7.4 13.3-10.1 20.7-6.1 7.4 4 10.1 13.3 6.1 20.7-3.7 6.7-1.2 15.2 5.6 18.9L487 921c0.7 0.4 1.4 0.8 2.1 1.3 4.8 3.7 10.6 5.7 16.8 5.7 6.4 0 12.7-2.2 17.7-6.2 0.6-0.5 1.3-0.9 2-1.3l382.5-217.7c6.7-3.8 9-12.3 5.2-19-4.2-7.3-1.6-16.6 5.7-20.8 7.3-4.2 16.6-1.6 20.8 5.7 12.1 21.3 4.7 48.4-16.6 60.5L541.6 946.4c-10.2 7.8-22.8 12.1-35.6 12.1z" fill="" ></path></symbol><symbol id="icon-tishi" viewBox="0 0 1024 1024"><path d="M512 65.9c-247.1 0-447.3 200.3-447.3 447.3S264.9 960.6 512 960.6s447.3-200.3 447.3-447.3S759.1 65.9 512 65.9z m0.7 760.5c-34.5 0-62.5-26.2-62.5-58.5s28-58.4 62.5-58.4 62.5 26.2 62.5 58.4c0 32.3-28 58.5-62.5 58.5z m112-487.2l-49.6 276.4c0 0.3 0.1 0.6 0.1 0.9 0 32.3-28 58.5-62.5 58.5s-62.5-26.2-62.5-58.5c0-0.3 0.1-0.6 0.1-0.9l-49.7-276.4h0.7c-0.4-3.8-0.7-7.6-0.7-11.5 0-58.1 50.2-105.2 112-105.2 61.9 0 112 47.1 112 105.2 0 3.9-0.3 7.7-0.7 11.5h0.8z m0 0" fill="" ></path></symbol><symbol id="icon-chengyuan" viewBox="0 0 1024 1024"><path d="M375.2 529.5v-0.1c0-11.8-9.5-21.3-21.5-21.3-77.7 0-140.9-67.5-140.9-150.4 0-83 63.1-150.4 140.9-150.4 11.8 0 21.5-9.5 21.5-21.3s-9.5-21.5-21.5-21.5c-101.3 0-183.7 86.7-183.7 193.2 0 70.9 36.5 132.9 90.8 166.6C145.3 565 62 680.4 62 815.8c0 11.8 9.5 21.3 21.3 21.3s21.3-9.5 21.3-21.3c0-146.1 111.7-265 248.9-265 12 0 21.7-9.5 21.7-21.3z" fill="" ></path><path d="M867.5 642.3c-1.8-2-48.2-50.9-104.1-76-23.4-10.5-44.9-17.8-63.1-22.9 74.1-36.6 125.4-112.8 125.4-200.9 0-123.5-100.6-224.1-224.2-224.1-123.7 0-224.2 100.6-224.2 224.1 0 85.4 48.1 159.8 118.5 197.6-146.7 45.2-253.6 182-253.6 343.5 0 11.8 9.5 21.3 21.5 21.3 11.8 0 21.3-9.5 21.3-21.3 0-174.5 142-316.5 315-316.6 2.3 0.3 4.5 0.1 6.7-0.4 2.8-0.1 5.5-0.4 8.3-0.6 1 0 1.8 0.1 2.8 0.1 31.6 0.8 91.6 19.6 127.7 36 55.1 25.1 92.3 70.9 94.3 73.2 50.6 57.8 78.2 130.9 78.2 208.3 0 11.8 9.5 21.3 21.3 21.3s21.3-9.5 21.3-21.3c0.1-90-32.8-175.1-93.1-241.3zM647.3 530.7zM420.1 342.6c0-100.1 81.4-181.4 181.4-181.4s181.4 81.3 181.4 181.4c0 100.1-81.4 181.4-181.4 181.4-99.9 0-181.4-81.4-181.4-181.4z" fill="" ></path></symbol><symbol id="icon-xuanzhuan" viewBox="0 0 1024 1024"><path d="M867.9 777.2c-9.3-7.5-22.9-6-30.4 3.3-77 95.9-196 146-318.1 133.9C320.9 894.7 175.3 717.1 195 518.5c9.5-96.2 56-182.9 130.7-244.2 67.3-55.2 150.4-83.7 236.4-81.9L503 239c-9.4 7.4-11 21-3.6 30.3 4.3 5.4 10.6 8.3 17 8.3 4.7 0 9.4-1.5 13.3-4.6L638 187.9c5.2-4.1 8.3-10.4 8.3-17s-3-12.9-8.3-17L529.8 68.8c-9.4-7.4-23-5.7-30.3 3.6-7.4 9.4-5.8 23 3.6 30.3l59.1 46.5c-96.1-1.8-188.7 30.1-263.8 91.7-83.7 68.6-135.7 165.7-146.4 273.4C141.3 622 173.2 727.4 241.8 811c68.6 83.7 165.7 135.7 273.4 146.3 13.5 1.3 26.9 2 40.3 2 122.2 0 238-55.1 315.7-151.8 7.5-9.3 6-22.9-3.3-30.3z" fill="" ></path></symbol><symbol id="icon-shixun" viewBox="0 0 1024 1024"><path d="M302.1 207.7c-16.5 0-29.8 13.3-29.8 29.8v603.6c0 16.5 13.3 29.8 29.8 29.8s29.8-13.3 29.8-29.8V237.5c0.1-16.5-13.3-29.8-29.8-29.8zM92.9 319.5c-16.5 0-29.8 13.3-29.8 29.8V707c0 16.5 13.3 29.8 29.8 29.8s29.8-13.3 29.8-29.8V349.3c0-16.5-13.3-29.8-29.8-29.8zM511.3 88.5c-16.5 0-29.8 13.3-29.8 29.8v789.9c0 16.5 13.3 29.8 29.8 29.8s29.8-13.3 29.8-29.8V118.3c0-16.5-13.3-29.8-29.8-29.8zM720.5 207.7c-16.5 0-29.8 13.3-29.8 29.8v603.6c0 16.5 13.3 29.8 29.8 29.8s29.8-13.3 29.8-29.8V237.5c0-16.5-13.3-29.8-29.8-29.8zM929.7 319.5c-16.5 0-29.8 13.3-29.8 29.8V707c0 16.5 13.3 29.8 29.8 29.8s29.8-13.3 29.8-29.8V349.3c0-16.5-13.3-29.8-29.8-29.8z" fill="" ></path></symbol><symbol id="icon-suoxiao" viewBox="0 0 1024 1024"><path d="M714.9 537.8h-409c-13.2 0-24-10.7-24-24 0-13.2 10.7-24 24-24h409c13.2 0 24 10.7 24 24 0 13.2-10.8 24-24 24z" fill="" ></path><path d="M510.4 963.4c-247.9 0-449.6-201.7-449.6-449.6S262.5 64.2 510.4 64.2C758.3 64.2 960 265.9 960 513.8S758.3 963.4 510.4 963.4z m0-851.2c-221.5 0-401.6 180.2-401.6 401.6S289 915.4 510.4 915.4 912 735.2 912 513.8 731.9 112.2 510.4 112.2z" fill="" ></path></symbol><symbol id="icon-xiajiantou" viewBox="0 0 1024 1024"><path d="M905.1 237.9c-26-20.5-63.8-16-84.3 10.1L511.4 641.4 202.1 247.9c-20.5-26.1-58.3-30.6-84.3-10.1-26.1 20.5-30.6 58.3-10.1 84.3l356.6 453.5c11.4 14.5 28.8 22.9 47.2 22.9s35.8-8.4 47.2-22.9l356.6-453.5c20.4-26 15.9-63.7-10.2-84.2z" fill="" ></path></symbol><symbol id="icon-gouxuan" viewBox="0 0 1024 1024"><path d="M387.5 805.2c-1.6 0-3.2-0.1-4.8-0.2-17.4-1.3-33.5-9.6-44.5-23.1L81.3 470.7c-22.5-27.2-18.7-67.6 8.6-90.1 27.3-22.5 67.6-18.7 90.1 8.6L394.4 649l458.2-411.4c26.3-23.6 66.7-21.4 90.3 4.9 23.6 26.3 21.4 66.7-4.9 90.3l-507.8 456c-11.7 10.6-27 16.4-42.7 16.4z" fill="" ></path></symbol><symbol id="icon-liulanyan" viewBox="0 0 1024 1024"><path d="M513 201.6c-247.1 0-448.1 139.2-448.1 310.2S265.9 822 513 822s448.1-139.2 448.1-310.2-201-310.2-448.1-310.2z m0 585.9c-228.1 0-413.6-123.7-413.6-275.7S284.9 236.1 513 236.1s413.6 123.7 413.6 275.7S741.1 787.5 513 787.5z" fill="" ></path><path d="M513 356.7c-85.5 0-155.1 69.6-155.1 155.1S427.5 666.9 513 666.9s155.1-69.6 155.1-155.1S598.5 356.7 513 356.7z m0 275.7c-66.5 0-120.6-54.1-120.6-120.6S446.5 391.2 513 391.2s120.6 54.1 120.6 120.6S579.5 632.4 513 632.4z" fill="" ></path></symbol><symbol id="icon-jingyan" viewBox="0 0 1024 1024"><path d="M764.5 63.9H258.2c-72.4 0-131.3 59.9-131.3 133.5v95.7c0 13.2 1.9 26.3 5.7 38.9 1.7 9.1 4.8 17.6 9.2 25.4l300.3 530.7c14.4 25.4 40.2 40.6 69.1 40.6 28.9 0 54.7-15.2 69.1-40.6l300.3-530.7c4.4-7.8 7.5-16.3 9.2-25.4 3.8-12.6 5.7-25.7 5.7-38.9v-95.7c0.2-73.6-58.7-133.5-131-133.5z m93.7 229.2c0 9.8-1.5 19.5-4.4 28.9l-0.6 2.4c-0.9 5.3-2.6 10.1-5.1 14.5L547.8 869.6c-7.7 13.5-21.3 21.6-36.5 21.6s-28.8-8.1-36.5-21.6L174.5 338.9c-2.5-4.4-4.2-9.2-5.1-14.5-0.1-0.8-0.3-1.6-0.6-2.4-2.9-9.4-4.4-19.1-4.4-28.9v-95.7c0-53 42.1-96 93.8-96h506.3c51.7 0 93.8 43.1 93.8 96v95.7z" fill="" ></path><path d="M661.8 347.1c-8.8-5.4-20.4-2.7-25.8 6.1L512.7 552.7 386.6 353c-5.5-8.8-17.1-11.4-25.9-5.8-8.8 5.5-11.4 17.1-5.8 25.9l142.2 225c3.4 5.4 9.4 8.7 15.8 8.7h0.1c6.5 0 12.5-3.4 15.9-8.9l139.1-225c5.4-8.8 2.6-20.4-6.2-25.8z" fill="" ></path></symbol><symbol id="icon-shixunguanqia" viewBox="0 0 1024 1024"><path d="M762.5 64.2h-498C198.8 64.2 145 118 145 183.7v657.5c0 65.7 53.8 119.5 119.5 119.5h498.1c65.7 0 119.5-53.8 119.5-119.5V183.8c0-65.8-53.8-119.6-119.6-119.6z m79.7 777c0 43.9-35.8 79.7-79.7 79.7h-498c-43.9 0-79.7-35.8-79.7-79.7V183.8c0-43.9 35.8-79.7 79.7-79.7h498.1c43.9 0 79.7 35.8 79.7 79.7v657.4z" fill="" ></path><path d="M702.8 303.3H324.2c-11 0-19.9 8.9-19.9 19.9 0 11 8.9 19.9 19.9 19.9h378.5c11 0 19.9-8.9 19.9-19.9 0.1-11-8.8-19.9-19.8-19.9zM623.1 492.6H324.2c-11 0-19.9 8.9-19.9 19.9 0 11 8.9 19.9 19.9 19.9h298.9c11 0 19.9-8.9 19.9-19.9 0-11-8.9-19.9-19.9-19.9zM503.5 681.9H324.2c-11 0-19.9 8.9-19.9 19.9s8.9 19.9 19.9 19.9h179.3c11 0 19.9-8.9 19.9-19.9s-8.9-19.9-19.9-19.9z" fill="" ></path></symbol><symbol id="icon-fabu" viewBox="0 0 1024 1024"><path d="M844.9 443.9c-17.3-136.3-135.7-241.6-274.3-241.6-85.1 0-165.4 39.4-217.7 106.1-17.5-5.6-35.8-8.5-54.4-8.5-98.6 0-178.9 80.2-178.9 178.9 0 2 0 4.1 0.1 6.2-35.7 36.6-55.9 86-55.9 136.9 0 108.2 88.1 196.3 196.3 196.3h502.3c108.2 0 196.3-88.1 196.3-196.3 0.1-75.8-45.2-146-113.8-178z m-82.4 337.6H260.2c-88 0-159.5-71.6-159.5-159.5 0-43.7 18.4-86 50.6-116.2 4.1-3.8 6.2-9.3 5.7-14.9-0.3-3.9-0.5-7.9-0.5-11.9 0-78.3 63.7-142.1 142.1-142.1 18.6 0 36.8 3.6 54 10.6 7.9 3.3 17.1 0.6 22-6.4 45-63.8 118.3-101.9 196.1-101.9 123.4 0 228.3 96.2 238.8 219 0.6 6.9 5.1 12.9 11.5 15.5 60.4 24 101.1 83.6 101.1 148.3-0.1 87.9-71.6 159.5-159.6 159.5z" fill="" ></path><path d="M524.3 465.1c-0.2-0.2-0.5-0.3-0.7-0.5-0.7-0.6-1.4-1.1-2.2-1.6-0.8-0.5-1.5-1-2.3-1.4-0.3-0.1-0.5-0.3-0.7-0.4-0.5-0.2-1.1-0.2-1.7-0.4-0.9-0.3-1.8-0.5-2.7-0.7-0.9-0.1-1.7-0.1-2.6-0.1-0.9 0-1.7 0-2.6 0.1-0.9 0.1-1.8 0.4-2.8 0.7-0.5 0.2-1.1 0.2-1.7 0.4-0.3 0.1-0.5 0.3-0.7 0.4-0.8 0.4-1.6 0.9-2.4 1.4-0.8 0.5-1.5 1-2.2 1.6-0.2 0.2-0.5 0.3-0.7 0.5l-82.7 82.7c-7.2 7.2-7.2 18.8 0 26 7.2 7.2 18.8 7.2 26 0l51.3-51.3v148.6c0 10.2 8.2 18.4 18.4 18.4s18.4-8.2 18.4-18.4V522.5l51.3 51.3c7.2 7.2 18.8 7.2 26 0 7.2-7.2 7.2-18.8 0-26l-82.7-82.7z" fill="" ></path></symbol><symbol id="icon-xiangxiayidong" viewBox="0 0 1024 1024"><path d="M859.7 533.8c-17.6-17.6-46.2-17.6-63.8 0L556.1 773.5V143.3c0-24.9-20.2-45.1-45.1-45.1s-45.1 20.2-45.1 45.1v630.2L226.1 533.8c-17.6-17.6-46.2-17.6-63.8 0-17.6 17.6-17.6 46.2 0 63.8l316.8 316.8 0.1 0.1c0.3 0.3 0.7 0.6 1 1l0.3 0.3c0.3 0.3 0.6 0.5 0.9 0.8 0.1 0.1 0.3 0.2 0.4 0.4 0.3 0.2 0.5 0.4 0.8 0.7 0.2 0.1 0.4 0.3 0.6 0.4 0.2 0.2 0.5 0.4 0.7 0.5 0.2 0.2 0.5 0.3 0.7 0.5 0.2 0.1 0.4 0.3 0.6 0.4 0.3 0.2 0.6 0.4 0.8 0.6 0.2 0.1 0.3 0.2 0.5 0.3 0.3 0.2 0.6 0.4 1 0.6 0.1 0.1 0.3 0.2 0.4 0.2 0.4 0.2 0.7 0.4 1.1 0.6 0.1 0.1 0.2 0.1 0.3 0.2l1.2 0.6c0.1 0 0.2 0.1 0.3 0.1 0.4 0.2 0.9 0.4 1.3 0.6 0.1 0 0.1 0.1 0.2 0.1 0.4 0.2 0.9 0.4 1.4 0.6 0 0 0.1 0 0.1 0.1h0.1c0.5 0.2 0.9 0.4 1.4 0.6 0.1 0 0.1 0 0.2 0.1 0.5 0.2 0.9 0.3 1.4 0.5 0.1 0 0.1 0 0.2 0.1 0.5 0.1 0.9 0.3 1.4 0.4 0.1 0 0.2 0.1 0.3 0.1 0.4 0.1 0.9 0.2 1.3 0.3 0.1 0 0.2 0.1 0.3 0.1l1.2 0.3c0.1 0 0.3 0.1 0.4 0.1 0.4 0.1 0.7 0.1 1.1 0.2 0.2 0 0.4 0.1 0.5 0.1 0.3 0.1 0.7 0.1 1 0.2 0.2 0 0.4 0.1 0.6 0.1 0.3 0 0.6 0.1 0.9 0.1 0.2 0 0.5 0.1 0.7 0.1 0.3 0 0.6 0 0.9 0.1 0.3 0 0.5 0 0.8 0.1h4.8c0.3 0 0.6 0 0.8-0.1 0.3 0 0.5 0 0.8-0.1 0.3 0 0.6-0.1 0.9-0.1 0.3 0 0.5-0.1 0.8-0.1 0.3 0 0.6-0.1 0.9-0.1 0.3 0 0.5-0.1 0.8-0.1 0.3 0 0.6-0.1 0.9-0.2 0.2 0 0.5-0.1 0.7-0.1 0.3-0.1 0.6-0.1 0.9-0.2 0.2-0.1 0.5-0.1 0.7-0.2 0.3-0.1 0.6-0.2 0.9-0.2 0.2-0.1 0.5-0.1 0.7-0.2l0.9-0.3c0.2-0.1 0.4-0.1 0.7-0.2 0.3-0.1 0.6-0.2 1-0.3 0.2-0.1 0.4-0.1 0.6-0.2 0.4-0.1 0.7-0.3 1-0.4 0.2-0.1 0.3-0.1 0.5-0.2s0.3-0.1 0.5-0.2 0.5-0.2 0.7-0.3c0.1-0.1 0.2-0.1 0.4-0.2 0.4-0.2 0.8-0.4 1.2-0.5 0.1 0 0.2-0.1 0.3-0.1l1.2-0.6c0.1 0 0.1-0.1 0.2-0.1 0.4-0.2 0.9-0.5 1.3-0.7l0.1-0.1c0.4-0.3 0.9-0.5 1.3-0.8h0.1c0.5-0.3 0.9-0.6 1.3-0.9 1.4-0.9 2.7-2 4-3 0.4-0.4 0.8-0.7 1.2-1.1l0.1-0.1c0.4-0.3 0.7-0.7 1.1-1l0.1-0.1 316.8-316.8c17.6-17.8 17.6-46.4 0-64z" fill="" ></path></symbol><symbol id="icon-xiangshangyidong" viewBox="0 0 1024 1024"><path d="M511 927.6c-24.9 0-45.1-20.2-45.1-45.1V143.3c0-18.2 11-34.7 27.9-41.7s36.3-3.1 49.2 9.8l316.8 316.8c17.6 17.6 17.6 46.2 0 63.8-17.6 17.6-46.2 17.6-63.8 0L556.1 252.3v630.2c0 24.9-20.2 45.1-45.1 45.1z" fill="" ></path><path d="M511 927.6c-24.9 0-45.1-20.2-45.1-45.1V252.3L226.1 492c-17.6 17.6-46.2 17.6-63.8 0-17.6-17.6-17.6-46.2 0-63.8l316.8-316.8c12.9-12.9 32.3-16.8 49.2-9.8 16.9 7 27.9 23.4 27.9 41.7v739.2c-0.1 24.9-20.3 45.1-45.2 45.1z" fill="" ></path></symbol><symbol id="icon-guanbi" viewBox="0 0 1024 1024"><path d="M147.8 922.6c-12 0-24-4.6-33.2-13.8-18.3-18.3-18.3-48.1 0-66.4L845 112c18.3-18.3 48.1-18.3 66.4 0s18.3 48.1 0 66.4L181 908.8c-9.2 9.2-21.2 13.8-33.2 13.8z" fill="" ></path><path d="M878.2 922.6c-12 0-24-4.6-33.2-13.8L114.6 178.4c-18.3-18.3-18.3-48.1 0-66.4s48.1-18.3 66.4 0l730.4 730.4c18.3 18.3 18.3 48.1 0 66.4-9.2 9.2-21.2 13.8-33.2 13.8z" fill="" ></path></symbol><symbol id="icon-xinjian" viewBox="0 0 1024 1024"><path d="M761.8 928.3h-499c-75.5 0-137-61.4-137-137V235.1c0-75.5 61.4-137 137-137h352.9c14.1 0 25.4 11.4 25.4 25.4S629.7 149 615.7 149H262.8c-47.5 0-86.1 38.6-86.1 86.1v556.2c0 47.5 38.6 86.1 86.1 86.1h499c47.5 0 86.1-38.6 86.1-86.1V378.5c0-14.1 11.4-25.4 25.4-25.4 14.1 0 25.4 11.4 25.4 25.4v412.9c0 75.5-61.4 136.9-136.9 136.9z" fill="" ></path><path d="M519.3 538.7c-5.8 0-11.7-2-16.5-6.1-10.7-9.1-12-25.2-2.9-35.9l331.8-389.6c9.1-10.7 25.2-12 35.9-2.9s12 25.2 2.9 35.9L538.6 529.7c-5 5.9-12.1 9-19.3 9z" fill="" ></path></symbol><symbol id="icon-xiaoxilingdang" viewBox="0 0 1024 1024"><path d="M797.8 567.8c1.8-13.1 2.8-26.3 2.8-39.4v-177c0-158.6-129-287.6-287.6-287.6s-287.6 129-287.6 287.6v177c0 13.1 0.9 26.3 2.8 39.4-59.7 18-102.3 73.6-102.3 137.5 0 79.3 64.5 143.8 143.8 143.8h112.6c10.6 62.7 65.1 110.6 130.7 110.6s120.1-47.9 130.7-110.6h112.6c79.3 0 143.8-64.5 143.8-143.8 0-63.9-42.6-119.4-102.3-137.5zM513 915.5c-41.2 0-75.8-28.2-85.7-66.4h171.4c-9.9 38.1-44.5 66.4-85.7 66.4z m243.3-110.6H269.7c-54.9 0-99.5-44.7-99.5-99.5 0-49.6 37.2-92 86.5-98.6 6.1-0.8 11.6-4.2 15.2-9.2 3.6-5.1 4.8-11.4 3.5-17.4-3.7-17.1-5.6-34.5-5.6-51.7v-177c0-134.2 109.2-243.3 243.3-243.3s243.3 109.2 243.3 243.3v177c0 17.3-1.9 34.7-5.6 51.7-1.3 6-0.1 12.4 3.5 17.4 3.6 5.1 9.1 8.4 15.2 9.2 49.3 6.6 86.5 48.9 86.5 98.6-0.1 54.8-44.8 99.5-99.7 99.5z" fill="" ></path></symbol><symbol id="icon-sousuo" viewBox="0 0 1024 1024"><path d="M463.9 804.4c-194.7 0-353.1-158.4-353.1-353.1S269.2 98.2 463.9 98.2 817 256.6 817 451.3 658.6 804.4 463.9 804.4z m0-651.9c-164.8 0-298.8 134-298.8 298.8s134 298.8 298.8 298.8 298.8-134 298.8-298.8-134-298.8-298.8-298.8z" fill="" ></path><path d="M884.9 926.6c-7.2 0-14.4-2.9-19.8-8.6l-198-210.6c-10.3-10.9-9.7-28.1 1.2-38.4 10.9-10.3 28.1-9.8 38.4 1.2l198 210.6c10.3 10.9 9.7 28.1-1.2 38.4-5.2 5-11.9 7.4-18.6 7.4z" fill="" ></path></symbol><symbol id="icon-tianjiafangda" viewBox="0 0 1024 1024"><path d="M716.1 487H536.8V307.7c0-13.2-10.7-23.8-23.8-23.8s-23.8 10.7-23.8 23.8V487H309.9c-13.2 0-23.8 10.7-23.8 23.8 0 13.2 10.7 23.8 23.8 23.8h179.3v179.3c0 13.2 10.7 23.8 23.8 23.8s23.8-10.7 23.8-23.8V534.6h179.3c13.2 0 23.8-10.7 23.8-23.8 0-13.2-10.6-23.8-23.8-23.8z" fill="" ></path><path d="M513 64.2c-246.2 0-446.6 200.3-446.6 446.6C66.4 757 266.8 957.4 513 957.4c246.2 0 446.6-200.3 446.6-446.6 0-246.2-200.4-446.6-446.6-446.6z m0 845.5c-220 0-398.9-179-398.9-398.9S293 111.9 513 111.9s398.9 179 398.9 398.9S733 909.7 513 909.7z" fill="" ></path></symbol><symbol id="icon-jiangli" viewBox="0 0 1024 1024"><path d="M883.3 285.9h-79.5c7.4-4.1 14.1-8.1 19.4-12.2 30.1-22.7 41.7-69.3 26.9-108.2-7.8-20.5-22-37.2-41.3-48.2-20.9-11.9-46.6-16.8-76.4-14.4-63 5-117.9 22.7-158.8 51.3-23.9 16.7-43.3 37.3-57.7 61-0.7 1.1-1.3 2.2-2 3.3-0.6-1.1-1.3-2.2-2-3.3-14.4-23.8-33.8-44.3-57.7-61-40.8-28.6-95.7-46.4-158.8-51.3-29.9-2.4-55.6 2.5-76.4 14.4-19.2 11-33.5 27.6-41.3 48.2-14.8 39-3.2 85.5 26.9 108.2 5.4 4.1 12.1 8.2 19.6 12.2H138c-15.2 0-27.5 12.3-27.5 27.5V494c0 15.2 12.3 27.5 27.5 27.5h36v334c0 37.4 28.6 67.8 63.6 67.8h546.3c35.1 0 63.6-30.4 63.6-67.8v-334h35.7c15.2 0 27.5-12.3 27.5-27.5V313.5c0.1-15.2-12.2-27.6-27.4-27.6zM736.5 153.7c34.3-2.7 57.7 7.9 66 29.8 7.4 19.5 0.8 41.4-10 49.5-24.5 18.5-95 42.6-128.4 52.9H541.6c25.3-103 131.2-127.2 194.9-132.2z m-501 79.4c-10.8-8.1-17.4-30-9.9-49.5 8.3-21.9 31.8-32.5 66-29.8 63.7 5 169.6 29.2 194.9 132.2H371v-0.1c-39.9-11.1-112.1-35.2-135.5-52.8z m-73.8 103.8H485v133.7H161.7V336.9z m60.7 518.6v-334H485v353.2H237.6c-8.2 0.1-15.2-8.7-15.2-19.2z m576.7 0c0 10.5-6.9 19.3-15.2 19.3H536V521.6h263.1v333.9z m60.8-384.9H536V336.9h135.2v0.2l0.5-0.2h188.1l0.1 133.7z" fill="" ></path></symbol><symbol id="icon-shanchu" viewBox="0 0 1024 1024"><path d="M852.1 272.8c-14.5 0-26.3 11.8-26.3 26.3v476.3c0 72.4-58.9 131.4-131.4 131.4H301.9c-72.4 0-131.4-58.9-131.4-131.4V299.1c0-14.5-11.8-26.3-26.3-26.3s-26.3 11.8-26.3 26.3v476.3c0 101.4 82.5 183.9 183.9 183.9h392.5c101.4 0 183.9-82.5 183.9-183.9V299.1c0.2-14.5-11.6-26.3-26.1-26.3z" fill="" ></path><path d="M288.8 426.9v325.7c0 14.5 11.8 26.3 26.3 26.3s26.3-11.8 26.3-26.3V426.9c0-14.5-11.8-26.3-26.3-26.3s-26.3 11.8-26.3 26.3zM485.1 392.7v394.2c0 14.5 11.8 26.3 26.3 26.3s26.3-11.8 26.3-26.3V392.7c0-14.5-11.8-26.3-26.3-26.3s-26.3 11.8-26.3 26.3zM655 426.9v325.7c0 14.5 11.8 26.3 26.3 26.3s26.3-11.8 26.3-26.3V426.9c0-14.5-11.8-26.3-26.3-26.3S655 412.4 655 426.9zM144.3 230.6h707.9c14.5 0 26.3-11.8 26.3-26.3S866.7 178 852.2 178h-154l-44.8-98.5c-4.3-9.4-13.6-15.4-23.9-15.4H366.9c-10.3 0-19.6 6-23.9 15.4L298.1 178H144.3c-14.5 0-26.3 11.8-26.3 26.3 0 14.6 11.7 26.3 26.3 26.3z m239.5-113.8h228.7l27.9 61.3H355.9l27.9-61.3z" fill="" ></path></symbol><symbol id="icon-yincangbiyan" viewBox="0 0 1024 1024"><path d="M512.8 581.5C331 581.5 161.4 492 70.3 347.7c-9.1-14.3-4.8-33.2 9.5-42.2 14.3-9.1 33.2-4.8 42.2 9.5 80 126.6 229.8 205.2 390.8 205.2S823.5 441.6 903.5 315c9-14.3 27.9-18.6 42.2-9.5 14.3 9 18.6 27.9 9.5 42.2-91.1 144.2-260.6 233.8-442.4 233.8z m0 0" fill="#231815" ></path><path d="M355.2 722.7c-1.8 0-3.5-0.2-5.3-0.4-16.7-2.9-27.8-18.8-24.9-35.4l23.8-136.3c3-16.7 18.7-27.5 35.4-24.9 16.7 2.9 27.8 18.8 24.9 35.4l-23.8 136.3c-2.5 14.8-15.5 25.3-30.1 25.3z m0 0M666.8 722.7c-14.2 0-27-10-29.9-24.4L608.8 562c-3.4-16.5 7.2-32.7 23.8-36.2 16.3-3.3 32.7 7.2 36.2 23.8l28.1 136.3c3.4 16.5-7.2 32.7-23.8 36.2-2.1 0.4-4.2 0.6-6.3 0.6z m0 0M147.4 622c-3.5 0-7.1-0.6-10.5-1.9-15.9-5.8-24.1-23.4-18.3-39.2l49.8-136.4c5.8-15.9 23.4-24.1 39.2-18.3 15.9 5.8 24.1 23.4 18.3 39.2l-49.8 136.4c-4.4 12.5-16.2 20.2-28.7 20.2z m0 0M874.7 644.8c-12.2 0-23.7-7.3-28.5-19.3L792.1 489c-6.2-15.7 1.5-33.5 17.2-39.8 15.7-6.3 33.5 1.4 39.8 17.2l54.1 136.4c6.2 15.7-1.4 33.5-17.2 39.8-3.8 1.5-7.6 2.2-11.3 2.2z m0 0" fill="#231815" ></path></symbol><symbol id="icon-kaisuo" viewBox="0 0 1024 1024"><path d="M28.5 456v-1.5M463.4 376.1v-74.5c0-63.2-46.7-118.8-109.7-124.8-59.1-5.6-110.5 31.3-127.3 83.7-5.1 15.8-19.2 27-35.9 26.8h-1c-24.1-0.4-41.8-23.6-34.8-46.6 24.4-80.5 99.2-139.1 187.6-138.9 107.7 0.2 195.6 93.3 195.6 200.8v73.5h39.2M881 377.6H410.8c-43.3 0-78.4 35.1-78.4 78.4v390.3c0 43.3 35.1 78.4 78.4 78.4H881c43.3 0 78.4-35.1 78.4-78.4V456c-0.1-43.3-35.2-78.4-78.4-78.4zM724.2 651.9c0 43.3-35.1 78.4-78.4 78.4-43.3 0-78.4-35.1-78.4-78.4v-0.8-0.8c0-43.3 35.1-78.4 78.4-78.4 43.3 0 78.4 35.1 78.4 78.4v1.6z" fill="" ></path></symbol><symbol id="icon-guansuo" viewBox="0 0 1024 1024"><path d="M749.4 373.9H710v-78.8c0-108.7-88.2-197-197-197-108.7 0-197 88.2-197 197v78.8h-39.4c-43.5 0-78.8 35.3-78.8 78.8v393.9c0 43.5 35.3 78.8 78.8 78.8h472.7c43.5 0 78.8-35.3 78.8-78.8V452.7c0.1-43.5-35.2-78.8-78.7-78.8zM513 728.5c-43.5 0-78.8-35.3-78.8-78.8s35.3-78.8 78.8-78.8 78.8 35.3 78.8 78.8-35.3 78.8-78.8 78.8z m122.1-354.6H390.9v-78.8c0-67.4 54.8-122.1 122.1-122.1 67.4 0 122.1 54.8 122.1 122.1v78.8z m0 0" fill="" ></path></symbol><symbol id="icon-tpixiaoxitixing" viewBox="0 0 1024 1024"><path d="M104.3 898.8c-5.6 0-11.1-2.3-15-6.5-5-5.4-6.7-13-4.5-20l50.3-160.8C87.4 650.1 62.3 579 62.3 505.2c0-208.2 201.4-377.6 449-377.6s449 169.4 449 377.6-201.4 377.6-449 377.6c-65.5 0-128.6-11.6-187.6-34.4l-214.8 49.9c-1.5 0.3-3 0.5-4.6 0.5z m407-730.3c-225.1 0-408.2 151.1-408.2 336.8 0 67.7 24.4 133.1 70.5 189 4.4 5.3 5.8 12.5 3.7 19.1l-42.9 137.2 186.3-43.3c4.1-0.9 8.3-0.6 12.2 0.9 55.8 22.5 115.9 33.8 178.4 33.8 225.1 0 408.2-151.1 408.2-336.8S736.4 168.5 511.3 168.5z" fill="" ></path><path d="M339.1 513.2m-32.4 0a32.4 32.4 0 1 0 64.8 0 32.4 32.4 0 1 0-64.8 0Z" fill="" ></path><path d="M511.3 513.2m-32.4 0a32.4 32.4 0 1 0 64.8 0 32.4 32.4 0 1 0-64.8 0Z" fill="" ></path><path d="M683.6 513.2m-32.4 0a32.4 32.4 0 1 0 64.8 0 32.4 32.4 0 1 0-64.8 0Z" fill="" ></path></symbol><symbol id="icon-dianzan" viewBox="0 0 1024 1024"><path d="M265.1 387.4H137.7c-38.5 0-69.8 31.3-69.8 69.8v401.6c0 38.6 31.3 69.8 69.8 69.8h127.4V387.4zM943 413.5c-13.3-16.5-33.3-26.1-54.4-26.1H649.2c7.4-15.6 15.5-33.8 22.8-53.3 13.2-34.7 21.7-66.2 25.2-93.8 5-38.8 0.4-71.1-13.8-95.9C658 99.9 610 90.6 574.2 90.6c-38.6 0-71.4 20-97.4 59.3-19.5 29.5-34 67.5-48 104.2-30.7 80.6-54.2 133.4-99 133.4h-1.9 0.7v541.2h472.9c32.7 0 61.1-22.7 68.2-54.7v-0.2l87-401.5c4.6-20.7-0.5-42.3-13.7-58.8z" fill="" ></path></symbol><symbol id="icon-dianzan-xian" viewBox="0 0 1024 1024"><path d="M793.6 934.3H147.8c-45.8-0.1-83.2-37.4-83.2-83.2V460.5c0-45.8 37.4-83.2 83.2-83.2h186.9c33.7 0 55.3-49.7 82-119.9C430.6 220.9 445 183.2 465 153c28.4-42.8 64.5-64.5 107.5-64.5 38.9 0 91.2 10.4 119.5 60 15.5 27.1 20.6 61.7 15.3 102.9-3.6 28-12.2 59.9-25.4 94.8-3.8 10.1-8.1 20.5-12.7 31.2h209.2c25.3 0 49 11.3 64.9 31.1 15.9 19.8 21.8 45.3 16.4 70.1L875 868.1c-0.1 0.4-0.1 0.7-0.2 1-8.5 38.4-41.9 65.2-81.2 65.2zM147.8 407.8c-29 0-52.6 23.7-52.7 52.7v390.7c0 29 23.7 52.6 52.7 52.7h645.8c24.6 0 45.6-16.6 51.2-40.5 0-0.3 0.1-0.6 0.1-0.8L929.5 472c3.5-15.7-0.3-31.9-10.4-44.4s-25-19.7-41.1-19.7H645.3c-5.2 0-10.1-2.7-12.9-7.1-2.8-4.4-3.1-10-0.9-14.7 8.3-17.4 15.6-34.5 21.7-50.7 12.4-32.6 20.4-62.2 23.7-87.8 4.5-34.4 0.6-62.6-11.5-83.8-21.1-36.9-62.2-44.6-93-44.6-32.1 0-59.7 17.1-82.1 50.8-18.1 27.3-31.9 63.4-45.2 98.4C413 352.7 387.9 408 334.6 408H147.8z" fill="" ></path><path d="M317.6 935.6c-8.4 0-15.3-6.8-15.3-15.3V392.5c0-8.4 6.8-15.3 15.3-15.3 8.4 0 15.3 6.8 15.3 15.3v527.8c0 8.5-6.9 15.3-15.3 15.3z" fill="" ></path></symbol><symbol id="icon-fanhuishangcidaima" viewBox="0 0 1024 1024"><path d="M909.3 868.7s-8.1 20.8-18.9 0c0 0-120.6-361.5-414.6-270.5v112.2s-4.7 65.9-62.7 23L124 485.6s-61.3-33.2 3.7-78.4l292.2-249.3s44-31.1 54.5 19.9l0.4 121.1s548 26.1 434.5 569.8z m0 0" fill="" ></path></symbol><symbol id="icon-zhongzhi" viewBox="0 0 1024 1024"><path d="M882.2 527.3c0-78.3-23.6-151-63.9-210.9-0.6-1-1-2.1-1.5-3-5.2-7.4-10.6-14.2-16-21.2-0.6-0.8-1.3-1.7-1.8-2.6-37-45.8-83.4-81.4-135.7-104.7-1.6-0.6-2.9-1.4-4.4-2-8.4-3.6-17-6.6-25.7-9.7-3-1-6.1-2.2-9.2-3.2-7.6-2.4-15.1-4.2-22.8-6.1-4.2-1-8.6-2.1-12.8-3-2.1-0.4-4.1-1-6.2-1.5-5.7-1-11.4-1.5-17.2-2.3-4.1-0.5-7.9-1.1-11.9-1.5-9.7-1-19.3-1.4-28.8-1.5-1.8 0-3.5-0.3-5.2-0.3-0.3 0-0.6 0.1-0.9 0.1-73.7 0.1-145.7 22.9-207.4 67.5-19.6 14.1-24.5 42.1-10.7 62.4 13.7 20.1 41 25.2 60.7 10.9 47.6-34.3 103.3-51.6 160.3-51.2 8.2 0.1 16.4 0.5 24.3 1.3 2.5 0.2 4.8 0.6 7.3 1 6.5 0.8 13 1.7 19.6 3.2 2.8 0.5 5.6 1.3 8.3 1.9 6.4 1.5 12.5 3 18.7 4.9 2.1 0.6 3.9 1.3 5.7 2.1 7.1 2.4 14 4.8 20.7 7.8 0.8 0.2 1.4 0.8 2.1 1 40.7 18 76.3 45.5 104.2 80.2 0.1 0.1 0.2 0.4 0.4 0.6 39.1 49 62.7 111.6 62.7 179.7h-72.8l116.4 179.2 116.1-179.2h-72.6zM665.5 731.4c-48 34.6-104.3 51.8-161.8 51.2-7.6-0.1-15.1-0.7-22.6-1.3-3.1-0.3-6-0.8-9.1-1.3-5.9-0.8-11.8-1.5-17.5-2.8-3.6-0.6-7.1-1.7-10.5-2.5-5.6-1.3-11.3-2.6-16.7-4.2-2.6-1-5-1.9-7.7-3-6.4-2.1-12.7-4.3-18.8-6.9-1.4-0.6-2.8-1.2-4-1.7-7.1-3.4-14.2-6.8-21-10.5-0.3-0.2-0.6-0.3-0.9-0.5-23.2-13.1-44.3-29.2-62.9-48.4-0.3-0.3-0.6-0.7-0.9-1-5.7-5.9-11.3-12.1-16.5-18.7-1.1-1.4-2.1-2.7-3.3-4.2-37.6-48.4-60.3-109.8-60.3-176.5h72.7L187.4 319.9 71.1 499h72.6c0 78.4 23.9 151.2 64.4 211.5 0.5 0.9 0.8 1.9 1.4 2.6 4.2 6.2 8.9 11.9 13.3 17.6 1.8 2.1 3.3 4.2 5 6.6 6.5 8.1 13.7 15.9 20.8 23.5 0.8 0.8 1.4 1.4 2 2.1 24.4 25.1 51.7 46 81.7 63 0.8 0.5 1.5 0.8 2.4 1.4 8.6 4.7 17.5 9.2 26.4 13.1 2.3 1 4.4 2.1 6.6 3 7.7 3.4 15.6 6.1 23.5 9 3.8 1.4 7.4 2.6 11.3 3.9 6.9 2.1 14 3.9 21.2 5.5 4.7 1.2 9.4 2.4 14.2 3.4 2 0.5 3.8 1.2 5.8 1.4 6.8 1.3 13.5 1.9 20.2 2.8 2.5 0.5 4.9 0.9 7.3 1.2 12.1 1.2 24.2 2 36.3 2 73.8 0 145.9-23.2 207.7-67.6 19.7-14.2 24.5-42.2 10.8-62.3-13.7-20.8-40.8-25.6-60.5-11.3z" fill="" ></path></symbol><symbol id="icon-zhengyan" viewBox="0 0 1024 1024"><path d="M512 797.1c-250.9 0-447.4-125.3-447.4-285.3S261.1 226.5 512 226.5s447.4 125.3 447.4 285.3S762.9 797.1 512 797.1z m0-515.5c-216.3 0-392.3 103.3-392.3 230.2 0 126.9 176 230.2 392.3 230.2s392.3-103.3 392.3-230.2c0-126.9-176-230.2-392.3-230.2z" fill="" ></path><path d="M512 626.9c-95.4 0-170.1-50.6-170.1-115.1S416.6 396.7 512 396.7s170.1 50.5 170.1 115.1S607.4 626.9 512 626.9z m0-175.1c-67.8 0-115 31.6-115 59.9 0 28.4 47.2 60 115 60s115-31.6 115-60c0-28.3-47.2-59.9-115-59.9z" fill="" ></path></symbol><symbol id="icon-expand" viewBox="0 0 1024 1024"><path d="M504.571429 603.428571q0 7.428571-5.714286 13.142857l-189.714286 189.714286 82.285714 82.285714q10.857143 10.857143 10.857143 25.714286t-10.857143 25.714286-25.714286 10.857143l-256 0q-14.857143 0-25.714286-10.857143t-10.857143-25.714286l0-256q0-14.857143 10.857143-25.714286t25.714286-10.857143 25.714286 10.857143l82.285714 82.285714 189.714286-189.714286q5.714286-5.714286 13.142857-5.714286t13.142857 5.714286l65.142857 65.142857q5.714286 5.714286 5.714286 13.142857zm446.285714-493.714286l0 256q0 14.857143-10.857143 25.714286t-25.714286 10.857143-25.714286-10.857143l-82.285714-82.285714-189.714286 189.714286q-5.714286 5.714286-13.142857 5.714286t-13.142857-5.714286l-65.142857-65.142857q-5.714286-5.714286-5.714286-13.142857t5.714286-13.142857l189.714286-189.714286-82.285714-82.285714q-10.857143-10.857143-10.857143-25.714286t10.857143-25.714286 25.714286-10.857143l256 0q14.857143 0 25.714286 10.857143t10.857143 25.714286z"  ></path></symbol><symbol id="icon-compress" viewBox="0 0 1024 1024"><path d="M512 548.571429v256q0 14.857143-10.857143 25.714285t-25.714286 10.857143-25.714285-10.857143l-82.285715-82.285714-189.714285 189.714286q-5.714286 5.714286-13.142857 5.714285t-13.142858-5.714285L86.285714 872.571429q-5.714286-5.714286-5.714285-13.142858t5.714285-13.142857l189.714286-189.714285-82.285714-82.285715q-10.857143-10.857143-10.857143-25.714285t10.857143-25.714286 25.714285-10.857143h256q14.857143 0 25.714286 10.857143t10.857143 25.714286z m431.428571-384q0 7.428571-5.714285 13.142857l-189.714286 189.714285 82.285714 82.285715q10.857143 10.857143 10.857143 25.714285t-10.857143 25.714286-25.714285 10.857143H548.571429q-14.857143 0-25.714286-10.857143t-10.857143-25.714286V219.428571q0-14.857143 10.857143-25.714285t25.714286-10.857143 25.714285 10.857143l82.285715 82.285714 189.714285-189.714286q5.714286-5.714286 13.142857-5.714285t13.142858 5.714285l65.142857 65.142857q5.714286 5.714286 5.714285 13.142858z"  ></path></symbol><symbol id="icon-liwu" viewBox="0 0 1137 1024"><path d="M1135.142452 361.58628c0-57.196057-46.96342-103.728338-104.689952-103.728338l-30.177676 0c17.059174-26.554471 26.182729-57.38756 26.182729-89.711715 0.003072-44.940856-17.691033-87.18735-49.821636-118.9585-32.078374-31.719945-74.707875-49.187728-120.035835-49.187728-43.922918 0-84.252328 19.345951-119.868909 57.499185-23.783302 25.479184-45.446753 59.392715-64.514154 100.969459-17.11345-5.294509-35.72411-8.054412-54.706511-8.054412-19.031558 0-37.644265 2.754783-54.716752 8.042123-19.069449-41.573671-40.729827-75.481058-64.511081-100.95717-35.615557-38.153234-75.943943-57.499185-119.864813-57.499185-77.72892 0-145.290745 52.34088-164.2967 127.28327-1.192033 4.699517-0.407585 9.682704 2.171056 13.788253 2.578641 4.105549 6.726177 6.977077 11.476898 7.944836 12.89218 2.625749 26.425436 6.186485 40.225978 10.582873 4.684155 1.493113 9.778968 0.972879 14.065779-1.435764 4.286811-2.408643 7.38159-6.48859 8.543924-11.265937 9.871136-40.558805 46.122648-68.885964 88.156133-68.885964 55.479694 0 97.333964 76.670018 119.09163 127.878262-3.066104 6.287869-5.029271 13.069347-5.858779 20.262505-0.098312 0.412705-0.183311 0.830531-0.252948 1.251429-0.247828 1.030227-0.650293 2.929901-0.650293 5.285292 0 8.050316 1.776784 15.914249 5.246377 23.433066-25.727012-0.641076-70.702687-10.009387-142.334217-49.166222C284.052714 168.690016 218.537007 149.286716 159.276399 149.286716c-96.788128 0-144.740812 51.962993-150.014839 58.040925-0.124938 0.142348-0.247828 0.287767-0.36867 0.434211-6.680093 8.138387-9.757462 18.377169-8.66579 28.832031 1.093721 10.46408 6.2254 19.853896 14.460051 26.446942 6.997559 5.595589 15.792383 8.677055 24.765398 8.677055 11.874242 0 23.001927-5.234088 30.541226-14.360715 1.476728-1.69793 27.368617-30.395806 87.911377-30.395806 45.805182 0 98.956111 16.367918 157.964795 48.641892 71.328402 39.079005 133.05705 58.892962 183.469581 58.892962 6.2254 0 12.604413-0.403489 19.568177-1.251429 2.877673 1.943709 6.318592 3.038454 9.925412 3.038454l49.222547 0 0 136.466222L178.781083 472.749461l0-111.231794c0-13.914215 11.567017-25.234428 25.785385-25.234428l144.292264 0c0.00512 0 0.011265-0.001024 0.017409 0 9.792281 0 17.730972-7.938691 17.730972-17.730972 0-7.363156-4.487531-13.677652-10.876785-16.357677-16.577855-7.68267-30.463396-14.64029-43.685331-21.891821-14.312583-7.804536-28.696852-14.717096-43.974122-21.130928-2.173104-0.912458-4.505965-1.382512-6.863404-1.382512L204.566468 257.789329c-57.72858 0-104.694048 46.532281-104.694048 103.728338l0 171.927142c0 9.792281 7.938691 17.730972 17.730972 17.730972l47.506184 0 0 369.091784c0 57.198105 46.966492 103.732434 104.695072 103.732434l695.545875 0c57.729604 0 104.695072-46.533305 104.695072-103.732434L1070.045595 551.387766l47.714073 0c4.708733 0 9.223915-1.873048 12.550137-5.205414 3.326221-3.332366 5.190052-7.852668 5.180836-12.561401L1135.142452 361.58628zM991.000729 551.241323l0 369.094857c0 13.915239-11.53527 25.234428-25.715747 25.234428L656.963304 945.570607 656.963304 551.241323 991.000729 551.241323zM1056.309571 361.58628l0 111.231794L657.03499 472.818074l0-136.465198 373.488173 0C1044.74153 336.352877 1056.309571 347.67309 1056.309571 361.58628zM652.285293 232.670622c-8.512177 2.07172-20.320878 3.739951-34.773761 3.739951-5.044633 0-10.108723-0.226322-15.126729-0.674871-1.922204-2.101418-4.027718-3.939647-6.311423-5.506494 6.261243-0.809026 13.444161-1.321067 21.438152-1.321067C631.962367 228.909166 643.773115 230.586614 652.285293 232.670622zM856.257015 78.012591c50.15139 0 90.953927 40.247484 90.953927 89.717859 0 49.468327-40.802537 89.713763-90.953927 89.713763L738.192539 257.444213c3.771698-7.893631 5.729744-16.221474 5.729744-24.753109 0-9.199337-2.292922-18.360783-6.695454-26.944647C759.002929 154.539238 800.831597 78.012591 856.257015 78.012591zM578.125302 551.241323l0 394.330309L269.804648 945.571631c-14.179453 0-25.715747-11.320213-25.715747-25.234428L244.088901 551.241323 578.125302 551.241323z"  ></path></symbol><symbol id="icon-dianzan1" viewBox="0 0 1024 1024"><path d="M281.504 367.754v0c0 0 31.971-1.032 31.971 31.971v446.554c0 0 0 18.563-22.688 18.563h-109.317c0 0-26.814 0-26.814-26.814l-25.782-444.491c0 0 0-25.782 26.813-25.782h125.818zM841.501 367.754v0c0 0 53.628-5.156 53.628 50.533 0 0 0 102.099-78.379 368.174 0 0-24.751 78.379-54.659 78.379h-315.578c-22.688 0-78.379-15.47-78.379-56.722v-440.365c0 0 155.726-92.817 155.726-240.293 5.156-7.219-7.219-53.627 51.565-53.627 0 0 137.163-8.249 55.69 293.921h210.385zM571.3 113.024c14.438 4.125 26.814 19.596 31.971 30.939 30.939 62.909 7.219 150.571-9.282 213.479l-6.188 21.657c-6.187 23.72 0 26.814 25.782 26.814h208.323c26.814 0 34.033 9.282 31.971 38.159-2.063 18.563-5.156 28.878-8.249 44.347-16.501 88.692-41.252 201.104-67.034 286.702-15.47 49.503-36.096 50.534-81.472 50.534h-242.356c-38.159 0-48.471-26.813-48.471-56.722v-382.612c88.692-44.347 154.695-157.789 156.758-252.669 1.032-5.156 1.032-9.282 2.063-15.47 0-1.032 0-3.094 0-4.125 2.063-1.032 4.125-1.032 6.188-1.032zM169.093 406.944h105.193v418.708h-81.472l-23.72-418.708z"  ></path></symbol><symbol id="icon-dianzan11" viewBox="0 0 1024 1024"><path d="M890.908 429.534c-20.66-26.05-51.585-40.99-84.84-40.99l-189.34 0c10.34-28.83 17.18-60.165 19.615-90.48 3.785-47.147-3.465-89.02-20.955-121.095-21.53-39.46-58.18-64.072-105.997-71.177-21.662-3.22-40.292 0.945-55.377 12.372-30.495 23.102-36.092 67.065-42.575 117.97-5.182 40.692-11.055 86.817-30.79 119.877-13.172 22.065-38.807 51.397-109.092 51.397l-73.345 0c-48.842 0-88.58 39.722-88.58 88.545l0 334.754c0 48.82 39.737 88.545 88.58 88.545l534.336 0c24.33 0 48.22-8.325 67.275-23.43 19.06-15.11 32.605-36.475 38.145-60.155l73.52-314.264C919.058 489.054 911.553 455.569 890.908 429.534zM168.672 830.708 168.672 495.956c0-16.27 13.252-29.505 29.537-29.505l62.232 0 0 393.762-62.232 0C181.925 860.213 168.672 846.978 168.672 830.708zM853.998 507.956l-73.52 314.272c-5.23 22.36-24.94 37.985-47.93 37.985L319.484 860.213 319.484 462.169c49.877-9.52 87.4-34.92 111.86-75.895 26.05-43.64 32.75-96.257 38.662-142.68 2.67-20.977 5.193-40.79 9.2-55.99 4.297-16.302 8.745-21.08 10.457-22.377 1.96-1.485 5.677-1.835 11.05-1.035 29.615 4.4 50.175 17.83 62.84 41.052 25.99 47.642 14.505 128.052-10.265 182.86-5.93 13.127-4.83 28.167 2.96 40.232 7.78 12.052 21.01 19.247 35.395 19.247l214.424 0c15.125 0 29.185 6.792 38.58 18.637C854.028 478.049 857.438 493.261 853.998 507.956z"  ></path></symbol><symbol id="icon-gift" viewBox="0 0 1024 1024"><path d="M85.930667 950.016c0 24.576 7.125333 31.317333 29.44 31.317333l353.365333 0L468.736 511.744 85.930667 511.744 85.930667 950.016zM555.264 981.333333l353.365333 0c22.357333 0 29.44-6.698667 29.44-31.317333L938.069333 511.744l-382.848 0L555.221333 981.333333zM938.666667 256l-213.333333 0c51.498667-11.733333 105.898667-49.706667 112.597333-94.293333 7.850667-50.858667-52.565333-127.957333-125.653333-118.186667-87.424 12.117333-151.509333 89.258667-196.736 149.077333C470.656 133.930667 412.16 65.408 328.362667 45.482667c-81.152-19.2-136.746667 64.938667-135.253333 116.992C194.56 206.72 245.717333 244.309333 298.666667 256L85.333333 256C58.965333 256 42.666667 270.848 42.666667 298.666667l0 170.581333L469.333333 469.333333 469.333333 256l85.333333 0 0 213.333333 426.666667-0.085333L981.333333 298.666667C981.333333 270.848 964.992 256 938.666667 256zM251.648 178.176C236.885333 161.749333 246.869333 139.434667 256.128 122.581333c17.024-29.696 40.746667-47.744 81.152-30.933333 56.32 23.509333 97.792 73.216 131.584 117.802667C397.312 217.344 290.56 220.416 251.648 178.176zM562.944 208.682667c34.816-44.629333 75.221333-89.941333 131.157333-117.802667 58.581333-28.970667 113.024 49.322667 85.205333 86.912-21.418667 28.544-89.258667 31.232-125.909333 32.853333C623.317333 212.181333 592.896 211.456 562.944 208.682667z"  ></path></symbol><symbol id="icon-xiaoxi" viewBox="0 0 1879 1024"><path d="M1465.119075 459.616185H1244.189595c-25.008092 0-45.428902 20.716763-45.428901 46.168786v14.353757c0 25.452023 20.272832 46.168786 45.428901 46.168786H1464.971098c25.156069 0 45.428902-20.716763 45.428902-46.168786v-14.353757c0-25.452023-20.124855-46.168786-45.280925-46.168786zM952.675145 63.334104c-68.661272 55.343353-212.494798 133.031214-315.930636 207.759538h-0.147977c-1.183815 0.739884-2.36763 4.883237-3.551445 5.623121-12.282081 6.954913-17.757225 26.191908-84.198844 26.191908h-129.627746c-33.294798 0-54.011561 15.833526-54.011561 51.495953v316.670521c0 35.662428 18.94104 53.271676 54.011561 53.271676h130.071676c66.145665 0 71.472832 19.236994 83.606937 26.191907 1.183815 0.591908 2.36763 4.883237 3.551445 5.475145l0.147977 0.147977c100.180347 74.580347 244.901734 158.33526 315.930636 211.606936 21.308671 15.981503 92.485549 44.09711 92.485549-54.899422v-799.075144c0.147977-98.996532-71.620809-67.32948-92.337572-50.460116z m203.912138 218.265896c11.83815 21.012717 34.922543 26.339884 51.939885 11.83815l181.56763-155.375722c17.017341-14.501734 21.160694-43.209249 9.47052-64.221966l-6.510983-11.83815c-11.690173-21.012717-35.07052-26.339884-51.939884-11.83815L1159.398844 205.391908c-17.017341 14.501734-21.160694 43.209249-9.47052 64.369942l6.658959 11.83815z m233.507515 607.29711L1208.527168 733.669364c-17.017341-14.501734-40.249711-9.174566-51.939885 11.690174l-6.658959 11.83815c-11.83815 21.012717-7.546821 49.720231 9.47052 64.369942l181.56763 155.227746c17.017341 14.501734 40.249711 9.322543 51.939884-11.690174l6.65896-11.83815c11.690173-21.012717 7.398844-49.868208-9.47052-64.369942z" fill="#212121" ></path></symbol><symbol id="icon-chexiao" viewBox="0 0 1024 1024"><path d="M530.496 371.072h-6.144V234.368c0-51.136-29.312-72.448-65.472-43.328L122.816 461.376c-36.096 28.992-36.096 76.48 0.128 105.472l333.504 267.648c36.16 28.992 67.968-0.448 67.968-43.584v-144.256h50.496c145.856 0 257.152 62.976 325.248 184.576 13.376 22.08 27.456 17.28 27.456 0-2.944-216.576-186.368-460.16-397.12-460.16z"  ></path></symbol><symbol id="icon-wenjianjia" viewBox="0 0 1024 1024"><path d="M957.3 431.6v-56.7c0-57.8-47-104.8-104.8-104.8H510.1v-46.8c0-57.8-47-104.8-104.8-104.8H172.6c-57.8 0-104.8 47-104.8 104.8v208.3h889.5zM67.8 501.2v304.5c0 57.8 47 104.8 104.8 104.8h680c57.8 0 104.8-47 104.8-104.8V501.2H67.8z"  ></path></symbol></svg>',l=(c=document.getElementsByTagName("script"))[c.length-1].getAttribute("data-injectcss");if(l&&!z.__iconfont__svg__cssinject__){z.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(c){console&&console.log(c)}}!function(c){if(document.addEventListener)if(~["complete","loaded","interactive"].indexOf(document.readyState))setTimeout(c,0);else{var l=function(){document.removeEventListener("DOMContentLoaded",l,!1),c()};document.addEventListener("DOMContentLoaded",l,!1)}else document.attachEvent&&(h=c,i=z.document,t=!1,(o=function(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(o,50)}a()})(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,a())});function a(){t||(t=!0,h())}var h,i,t,o}(function(){var c,l,a,h,i,t;(c=document.createElement("div")).innerHTML=o,o=null,(l=c.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",a=l,(h=document.body).firstChild?(i=a,(t=h.firstChild).parentNode.insertBefore(i,t)):h.appendChild(a))})}(window);
\ No newline at end of file
diff --git a/public/css/iconfont.json b/public/css/iconfont.json
index 6ce3b939..506b4ce7 100644
--- a/public/css/iconfont.json
+++ b/public/css/iconfont.json
@@ -5,6 +5,202 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "14364807",
+      "name": "多行公式",
+      "font_class": "duohanggongshi",
+      "unicode": "e748",
+      "unicode_decimal": 59208
+    },
+    {
+      "icon_id": "14364804",
+      "name": "行内公式",
+      "font_class": "hangneigongshi",
+      "unicode": "e747",
+      "unicode_decimal": 59207
+    },
+    {
+      "icon_id": "14269491",
+      "name": "取消置顶",
+      "font_class": "quxiaozhiding",
+      "unicode": "e746",
+      "unicode_decimal": 59206
+    },
+    {
+      "icon_id": "14269490",
+      "name": "置顶",
+      "font_class": "zhiding1",
+      "unicode": "e745",
+      "unicode_decimal": 59205
+    },
+    {
+      "icon_id": "14240818",
+      "name": "新建简历、我的简历",
+      "font_class": "xinjianjianliwodejianli",
+      "unicode": "e744",
+      "unicode_decimal": 59204
+    },
+    {
+      "icon_id": "14108259",
+      "name": "回复",
+      "font_class": "huifu",
+      "unicode": "e743",
+      "unicode_decimal": 59203
+    },
+    {
+      "icon_id": "14102491",
+      "name": "图片",
+      "font_class": "tupian",
+      "unicode": "e742",
+      "unicode_decimal": 59202
+    },
+    {
+      "icon_id": "14102400",
+      "name": "问题列表",
+      "font_class": "wentiliebiao",
+      "unicode": "e741",
+      "unicode_decimal": 59201
+    },
+    {
+      "icon_id": "14101755",
+      "name": "职称",
+      "font_class": "zhicheng",
+      "unicode": "e73f",
+      "unicode_decimal": 59199
+    },
+    {
+      "icon_id": "11488156",
+      "name": "upload",
+      "font_class": "upload",
+      "unicode": "e76b",
+      "unicode_decimal": 59243
+    },
+    {
+      "icon_id": "13839898",
+      "name": "发布职位",
+      "font_class": "fabuzhiwei",
+      "unicode": "e73e",
+      "unicode_decimal": 59198
+    },
+    {
+      "icon_id": "13839895",
+      "name": "职位要求",
+      "font_class": "zhiweiyaoqiu",
+      "unicode": "e73d",
+      "unicode_decimal": 59197
+    },
+    {
+      "icon_id": "13839892",
+      "name": "公司介绍",
+      "font_class": "gongsijieshao",
+      "unicode": "e73c",
+      "unicode_decimal": 59196
+    },
+    {
+      "icon_id": "13839888",
+      "name": "公司地址",
+      "font_class": "gongsidizhi",
+      "unicode": "e73b",
+      "unicode_decimal": 59195
+    },
+    {
+      "icon_id": "13515025",
+      "name": "局部刷新键头",
+      "font_class": "jubushuaxinjiantou",
+      "unicode": "e73a",
+      "unicode_decimal": 59194
+    },
+    {
+      "icon_id": "13458315",
+      "name": "返回",
+      "font_class": "fanhui",
+      "unicode": "e739",
+      "unicode_decimal": 59193
+    },
+    {
+      "icon_id": "13458287",
+      "name": "统计",
+      "font_class": "tongji1",
+      "unicode": "e738",
+      "unicode_decimal": 59192
+    },
+    {
+      "icon_id": "13428689",
+      "name": "签到-02",
+      "font_class": "qiandao-1",
+      "unicode": "e736",
+      "unicode_decimal": 59190
+    },
+    {
+      "icon_id": "13428658",
+      "name": "下箭头",
+      "font_class": "xiajiantou2",
+      "unicode": "e737",
+      "unicode_decimal": 59191
+    },
+    {
+      "icon_id": "13427273",
+      "name": "签到-01",
+      "font_class": "qiandao-",
+      "unicode": "e735",
+      "unicode_decimal": 59189
+    },
+    {
+      "icon_id": "13353315",
+      "name": "移动",
+      "font_class": "yidong",
+      "unicode": "e734",
+      "unicode_decimal": 59188
+    },
+    {
+      "icon_id": "13247262",
+      "name": "下移2",
+      "font_class": "xiayi1",
+      "unicode": "e732",
+      "unicode_decimal": 59186
+    },
+    {
+      "icon_id": "13247261",
+      "name": "上移2",
+      "font_class": "shangyi1",
+      "unicode": "e731",
+      "unicode_decimal": 59185
+    },
+    {
+      "icon_id": "13247178",
+      "name": "下移",
+      "font_class": "xiayi",
+      "unicode": "e730",
+      "unicode_decimal": 59184
+    },
+    {
+      "icon_id": "13247175",
+      "name": "上移",
+      "font_class": "shangyi",
+      "unicode": "e72f",
+      "unicode_decimal": 59183
+    },
+    {
+      "icon_id": "13247173",
+      "name": "编辑",
+      "font_class": "bianji5",
+      "unicode": "e72e",
+      "unicode_decimal": 59182
+    },
+    {
+      "icon_id": "13247168",
+      "name": "删除",
+      "font_class": "shanchu3",
+      "unicode": "e72d",
+      "unicode_decimal": 59181
+    },
+    {
+      "icon_id": "13183780",
+      "name": "选择",
+      "font_class": "xuanze",
+      "unicode": "e72c",
+      "unicode_decimal": 59180
+    },
     {
       "icon_id": "2077714",
       "name": "编辑",
diff --git a/public/css/iconfont.svg b/public/css/iconfont.svg
index d4ddda3b..2a5dde63 100644
--- a/public/css/iconfont.svg
+++ b/public/css/iconfont.svg
@@ -20,6 +20,90 @@ Created by iconfont
   />
     <missing-glyph />
     
+    <glyph glyph-name="duohanggongshi" unicode="&#59208;" d="M665.6 418.133333h17.066667v113.777778H295.822222l193.422222-227.555555-216.177777-216.177778h409.6l34.133333 130.844444h-22.755556c0-11.377778-5.688889-17.066667-11.377777-28.444444s-17.066667-17.066667-28.444445-22.755556H426.666667l164.977777 164.977778-136.533333 159.288889H597.333333c22.755556-5.688889 45.511111-11.377778 56.888889-22.755556 5.688889-17.066667 11.377778-34.133333 11.377778-51.2zM807.822222-116.622222H233.244444c-62.577778 0-119.466667 51.2-119.466666 119.466666V748.088889C113.777778 810.666667 164.977778 867.555556 233.244444 867.555556h443.733334l244.622222-233.244445v-637.155555c0-62.577778-51.2-113.777778-113.777778-113.777778zM233.244444 810.666667c-34.133333 0-62.577778-28.444444-62.577777-62.577778v-750.933333c0-34.133333 28.444444-62.577778 62.577777-62.577778h574.577778c34.133333 0 62.577778 28.444444 62.577778 62.577778V611.555556L654.222222 810.666667H233.244444zM898.844444 594.488889h-176.355555c-45.511111 0-85.333333 39.822222-85.333333 85.333333V839.111111h56.888888v-159.288889c0-17.066667 11.377778-28.444444 28.444445-28.444444h176.355555v-56.888889z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="hangneigongshi" unicode="&#59207;" d="M907.946667 636.586667h34.133333V896H54.613333l443.733334-525.653333L0-128h942.08l81.92 307.2h-54.613333c0-20.48-13.653333-40.96-27.306667-68.266667s-34.133333-40.96-68.266667-47.786666H348.16l382.293333 375.466666-327.68 375.466667h327.68c61.44-6.826667 102.4-27.306667 129.706667-54.613333 34.133333-34.133333 47.786667-75.093333 47.786667-122.88z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="quxiaozhiding" unicode="&#59206;" d="M480.492308 29.538462c-31.507692 0-63.015385 15.753846-86.646154 31.507692v7.876923L86.646154 407.630769C70.892308 431.261538 55.138462 462.769231 55.138462 494.276923c0 31.507692 15.753846 63.015385 39.384615 78.769231 23.630769 15.753846 47.261538 31.507692 78.769231 31.507692h102.4V738.461538c0 63.015385 55.138462 118.153846 118.153846 118.153847h228.430769c63.015385 0 118.153846-55.138462 118.153846-118.153847v-133.907692h78.769231c63.015385 0 118.153846-55.138462 118.153846-118.153846 0-31.507692-15.753846-63.015385-31.507692-86.646154l-338.707692-338.707692c-23.630769-23.630769-55.138462-39.384615-86.646154-31.507692zM173.292308 525.784615c-7.876923 0-15.753846 0-23.63077-7.876923-15.753846-15.753846-15.753846-39.384615 0-55.138461l307.2-338.707693c7.876923-15.753846 15.753846-15.753846 23.63077-15.753846 15.753846 0 23.630769 0 31.507692 7.876923l338.707692 338.707693c7.876923 7.876923 7.876923 15.753846 7.876923 31.507692 0 23.630769-15.753846 39.384615-39.384615 39.384615h-157.538462V738.461538c0 23.630769-15.753846 39.384615-39.384615 39.384616H401.723077c-23.630769 0-39.384615-15.753846-39.384615-39.384616v-212.676923H173.292308zM913.723077-96.492308H102.4c-23.630769 0-39.384615 15.753846-39.384615 39.384616s15.753846 39.384615 39.384615 39.384615h811.323077c23.630769 0 39.384615-15.753846 39.384615-39.384615s-23.630769-39.384615-39.384615-39.384616z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zhiding1" unicode="&#59205;" d="M622.276923-88.615385H401.723077c-70.892308 0-118.153846 55.138462-118.153846 118.153847V163.446154H173.292308c-31.507692 0-55.138462 7.876923-78.769231 31.507692-47.261538 39.384615-47.261538 118.153846-7.876923 165.415385L393.846154 699.076923c23.630769 23.630769 55.138462 39.384615 86.646154 39.384615 31.507692 0 63.015385-15.753846 86.646154-31.507692l338.707692-338.707692c23.630769-23.630769 31.507692-55.138462 31.507692-86.646154 0-63.015385-55.138462-118.153846-118.153846-118.153846h-78.769231V29.538462c0-63.015385-47.261538-118.153846-118.153846-118.153847zM480.492308 659.692308c-7.876923 0-15.753846 0-23.63077-7.876923L149.661538 305.230769c-7.876923-7.876923-15.753846-15.753846-15.753846-23.630769 0-7.876923 7.876923-23.630769 15.753846-23.630769 7.876923-15.753846 15.753846-15.753846 23.63077-15.753846h181.16923V29.538462c0-23.630769 15.753846-39.384615 39.384616-39.384616h228.430769c23.630769 0 39.384615 15.753846 39.384615 39.384616V242.215385h157.538462c23.630769 0 39.384615 15.753846 39.384615 39.384615 0 7.876923-7.876923 23.630769-7.876923 31.507692L512 651.815385c-7.876923 7.876923-15.753846 15.753846-31.507692 7.876923zM913.723077 785.723077H102.4C78.769231 785.723077 63.015385 801.476923 63.015385 825.107692s15.753846 39.384615 39.384615 39.384616h811.323077c23.630769 0 39.384615-15.753846 39.384615-39.384616s-23.630769-39.384615-39.384615-39.384615z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xinjianjianliwodejianli" unicode="&#59204;" d="M698.181818-104.727273H139.636364c-79.127273 0-139.636364 60.509091-139.636364 139.636364V756.363636c0 79.127273 60.509091 139.636364 139.636364 139.636364h712.145454c79.127273 0 139.636364-60.509091 139.636364-139.636364v-595.781818L698.181818-104.727273zM139.636364 802.909091c-27.927273 0-46.545455-18.618182-46.545455-46.545455v-721.454545c0-27.927273 18.618182-46.545455 46.545455-46.545455h521.309091l237.381818 214.109091V756.363636c0 27.927273-18.618182 46.545455-46.545455 46.545455H139.636364zM735.418182-11.636364h-69.818182v181.527273c0 46.545455 37.236364 83.781818 83.781818 83.781818h153.6v-69.818182H744.727273c-4.654545 0-9.309091-4.654545-9.309091-9.30909v-186.181819zM451.490909 160.581818H279.272727c-18.618182 0-37.236364 13.963636-37.236363 37.236364s13.963636 37.236364 37.236363 37.236363h172.218182c18.618182 0 37.236364-13.963636 37.236364-37.236363s-13.963636-37.236364-37.236364-37.236364zM730.763636 356.072727H279.272727c-18.618182 0-37.236364 13.963636-37.236363 37.236364s18.618182 32.581818 37.236363 32.581818h451.490909c18.618182 0 37.236364-13.963636 37.236364-37.236364s-13.963636-32.581818-37.236364-32.581818zM730.763636 551.563636H279.272727c-18.618182 0-37.236364 13.963636-37.236363 37.236364s18.618182 32.581818 37.236363 32.581818h451.490909c18.618182 0 37.236364-13.963636 37.236364-37.236363s-13.963636-32.581818-37.236364-32.581819z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="huifu" unicode="&#59203;" d="M512-96H166.4c-44.8 6.4-70.4 51.2-64 96 19.2 96 12.8 121.6 12.8 121.6-12.8 25.6-32 51.2-44.8 83.2C44.8 256 32 320 32 384 32 646.4 249.6 864 512 864s480-217.6 480-480-217.6-480-480-480z m0 896C281.6 800 96 614.4 96 384c0-57.6 12.8-108.8 32-160 12.8-25.6 25.6-51.2 38.4-70.4 12.8-19.2 19.2-51.2-6.4-166.4 0-6.4 6.4-19.2 12.8-19.2H512c230.4 0 416 185.6 416 416S742.4 800 512 800zM288 384m-76.8 0a76.8 76.8 0 1 1 153.6 0 76.8 76.8 0 1 1-153.6 0ZM512 384m-76.8 0a76.8 76.8 0 1 1 153.6 0 76.8 76.8 0 1 1-153.6 0ZM736 384m-76.8 0a76.8 76.8 0 1 1 153.6 0 76.8 76.8 0 1 1-153.6 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tupian" unicode="&#59202;" d="M1185.684211-128H215.578947c-118.568421 0-215.578947 97.010526-215.578947 215.578947V680.421053c0 118.568421 97.010526 215.578947 215.578947 215.578947h970.105264c118.568421 0 215.578947-97.010526 215.578947-215.578947v-592.842106c0-118.568421-97.010526-215.578947-215.578947-215.578947zM215.578947 788.210526c-59.284211 0-107.789474-48.505263-107.789473-107.789473v-592.842106c0-59.284211 48.505263-107.789474 107.789473-107.789473h970.105264c59.284211 0 107.789474 48.505263 107.789473 107.789473V680.421053c0 59.284211-48.505263 107.789474-107.789473 107.789473H215.578947zM0 179.2l247.915789 145.515789c64.673684 37.726316 145.515789 37.726316 210.189474 5.389474l274.863158-145.515789 258.694737 274.863158c43.115789 43.115789 102.4 59.284211 161.68421 43.115789L1401.263158 427.115789V33.684211c0-91.621053-70.063158-161.684211-161.684211-161.684211H161.684211c-91.621053 0-161.684211 70.063158-161.684211 161.684211M210.189474 578.021053a107.789474 107.789474 0 1 1 215.578947 0 107.789474 107.789474 0 1 1-215.578947 0Z"  horiz-adv-x="1401" />
+
+    
+    <glyph glyph-name="wentiliebiao" unicode="&#59201;" d="M512 384m-512 0a512 512 0 1 1 1024 0 512 512 0 1 1-1024 0ZM512 175.261538c-55.138462 0-98.461538 19.692308-129.969231 55.138462-31.507692 35.446154-51.2 82.707692-51.2 141.784615 0 63.015385 15.753846 110.276923 51.2 149.661539 35.446154 35.446154 78.769231 55.138462 137.846154 55.138461 51.2 0 94.523077-19.692308 129.969231-55.138461s47.261538-82.707692 47.261538-141.784616c0-63.015385-15.753846-114.215385-51.2-149.661538l-23.630769-23.630769 110.276923-78.769231h-82.707692l-70.892308 55.138462c-23.630769-3.938462-43.323077-7.876923-66.953846-7.876924z m3.938462 358.4c-39.384615 0-74.830769-15.753846-98.461539-43.323076s-39.384615-66.953846-39.384615-114.215385 11.815385-86.646154 35.446154-114.215385c23.630769-27.569231 55.138462-43.323077 98.461538-43.323077s74.830769 15.753846 98.461538 43.323077c23.630769 27.569231 35.446154 66.953846 35.446154 114.215385 0 51.2-11.815385 90.584615-35.446154 118.153846-19.692308 23.630769-51.2 39.384615-94.523076 39.384615z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zhicheng" unicode="&#59199;" d="M1331.2-128h-1160.533333C75.093333-128 0-52.906667 0 42.666667v682.666666C0 820.906667 75.093333 896 170.666667 896h1160.533333C1426.773333 896 1501.866667 820.906667 1501.866667 725.333333v-682.666666c0-95.573333-75.093333-170.666667-170.666667-170.666667zM170.666667 827.733333C116.053333 827.733333 68.266667 779.946667 68.266667 725.333333v-682.666666c0-54.613333 47.786667-102.4 102.4-102.4h1160.533333c54.613333 0 102.4 47.786667 102.4 102.4v682.666666c0 54.613333-47.786667 102.4-102.4 102.4h-1160.533333zM750.933333 56.32c-20.48 0-34.133333 13.653333-34.133333 34.133333 0 129.706667-109.226667 238.933333-238.933333 238.933334s-238.933333-109.226667-238.933334-238.933334c0-20.48-13.653333-34.133333-34.133333-34.133333s-34.133333 13.653333-34.133333 34.133333c0 170.666667 136.533333 307.2 307.2 307.2s307.2-136.533333 307.2-307.2c0-20.48-13.653333-34.133333-34.133334-34.133333zM477.866667 363.52c-88.746667 0-163.84 75.093333-163.84 163.84S389.12 691.2 477.866667 691.2s163.84-75.093333 163.84-163.84S566.613333 363.52 477.866667 363.52zM477.866667 622.933333c-54.613333 0-95.573333-40.96-95.573334-95.573333S423.253333 431.786667 477.866667 431.786667s95.573333 40.96 95.573333 95.573333S532.48 622.933333 477.866667 622.933333zM1262.933333 76.8h-341.333333c-20.48 0-34.133333 13.653333-34.133333 34.133333s13.653333 34.133333 34.133333 34.133334h341.333333c20.48 0 34.133333-13.653333 34.133334-34.133334s-13.653333-34.133333-34.133334-34.133333zM1194.666667 315.733333h-273.066667c-20.48 0-34.133333 13.653333-34.133333 34.133334s13.653333 34.133333 34.133333 34.133333h273.066667c20.48 0 34.133333-13.653333 34.133333-34.133333s-13.653333-34.133333-34.133333-34.133334zM1058.133333 520.533333h-136.533333c-20.48 0-34.133333 13.653333-34.133333 34.133334s13.653333 34.133333 34.133333 34.133333h136.533333c20.48 0 34.133333-13.653333 34.133334-34.133333s-13.653333-34.133333-34.133334-34.133334z"  horiz-adv-x="1501" />
+
+    
+    <glyph glyph-name="upload" unicode="&#59243;" d="M704 554.666667h64a64 64 0 0 0 64-64v-362.666667a64 64 0 0 0-64-64H256a64 64 0 0 0-64 64V490.666667a64 64 0 0 0 64 64h64v-64h-64v-362.666667h512V490.666667h-64v64zM517.653333 771.370667l150.826667-150.826667-45.226667-45.269333-74.026666 74.005333v-304.768h-64V648.384l-73.173334-73.130667-45.248 45.248 150.826667 150.848z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fabuzhiwei" unicode="&#59198;" d="M851.781818-118.690909H139.636364c-79.127273 0-139.636364 60.509091-139.636364 139.636364V751.709091c0 79.127273 60.509091 139.636364 139.636364 139.636364h470.109091c27.927273 0 46.545455-18.618182 46.545454-46.545455s-18.618182-46.545455-46.545454-46.545455H139.636364c-27.927273 0-46.545455-18.618182-46.545455-46.545454v-730.763636c0-27.927273 18.618182-46.545455 46.545455-46.545455h712.145454c27.927273 0 46.545455 18.618182 46.545455 46.545455V528.290909c0 27.927273 18.618182 46.545455 46.545454 46.545455s46.545455-18.618182 46.545455-46.545455v-507.345454c0-74.472727-60.509091-139.636364-139.636364-139.636364zM721.454545 109.381818H269.963636c-18.618182 0-37.236364 13.963636-37.236363 37.236364s13.963636 37.236364 37.236363 37.236363h451.490909c18.618182 0 37.236364-13.963636 37.236364-37.236363s-13.963636-37.236364-37.236364-37.236364zM721.454545 342.109091H269.963636c-18.618182 0-37.236364 13.963636-37.236363 37.236364s13.963636 37.236364 37.236363 37.236363h451.490909c18.618182 0 37.236364-13.963636 37.236364-37.236363s-13.963636-37.236364-37.236364-37.236364zM442.181818 560.872727H269.963636c-18.618182 0-37.236364 13.963636-37.236363 32.581818s13.963636 37.236364 37.236363 37.236364h172.218182c18.618182 0 37.236364-13.963636 37.236364-37.236364s-13.963636-32.581818-37.236364-32.581818zM656.290909 528.290909c-13.963636 0-23.272727 4.654545-32.581818 13.963636-18.618182 18.618182-18.618182 46.545455 0 65.163637L893.672727 863.418182c18.618182 18.618182 46.545455 18.618182 65.163637 0 18.618182-18.618182 18.618182-46.545455 0-65.163637l-269.963637-256c-9.309091-9.309091-18.618182-13.963636-32.581818-13.963636z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zhiweiyaoqiu" unicode="&#59197;" d="M823.652174-128H200.347826c-75.686957 0-133.565217 57.878261-133.565217 133.565217V628.869565c0 75.686957 57.878261 133.565217 133.565217 133.565218h623.304348c75.686957 0 133.565217-57.878261 133.565217-133.565218v-623.304348c0-75.686957-57.878261-133.565217-133.565217-133.565217zM200.347826 673.391304c-26.713043 0-44.521739-17.808696-44.521739-44.521739v-623.304348c0-26.713043 17.808696-44.521739 44.521739-44.521739h623.304348c26.713043 0 44.521739 17.808696 44.521739 44.521739V628.869565c0 26.713043-17.808696 44.521739-44.521739 44.521739H200.347826zM311.652174 642.226087c-26.713043 0-44.521739 17.808696-44.521739 44.521739V838.121739c0 26.713043 17.808696 44.521739 44.521739 44.521739s44.521739-17.808696 44.521739-44.521739v-146.921739c0-26.713043-17.808696-48.973913-44.521739-48.973913zM756.869565 642.226087c-26.713043 0-44.521739 17.808696-44.521739 44.521739V838.121739c0 26.713043 17.808696 44.521739 44.521739 44.521739s44.521739-17.808696 44.521739-44.521739v-146.921739c0-26.713043-17.808696-48.973913-44.521739-48.973913zM721.252174 486.4H302.747826c-17.808696 0-35.617391 13.356522-35.617391 35.617391s13.356522 35.617391 35.617391 35.617392h414.052174c17.808696 0 35.617391-13.356522 35.617391-35.617392s-13.356522-35.617391-31.165217-35.617391zM721.252174 263.791304H302.747826c-17.808696 0-35.617391 13.356522-35.617391 35.617392s13.356522 35.617391 35.617391 35.617391h414.052174c17.808696 0 35.617391-13.356522 35.617391-35.617391s-13.356522-35.617391-31.165217-35.617392zM645.565217 58.991304H302.747826c-17.808696 0-35.617391 13.356522-35.617391 35.617392s13.356522 35.617391 35.617391 35.617391H645.565217c17.808696 0 35.617391-13.356522 35.617392-35.617391s-17.808696-35.617391-35.617392-35.617392z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="gongsijieshao" unicode="&#59196;" d="M487.619048 569.295238H414.47619c-39.009524 0-68.266667 34.133333-68.266666 73.142857s29.257143 68.266667 68.266666 68.266667H487.619048c39.009524 0 68.266667-29.257143 68.266666-68.266667s-29.257143-73.142857-68.266666-73.142857zM414.47619 661.942857c-9.752381 0-19.504762-9.752381-19.504761-19.504762s9.752381-19.504762 19.504761-19.504762H487.619048c9.752381 0 19.504762 9.752381 19.504762 19.504762s-9.752381 19.504762-19.504762 19.504762H414.47619zM487.619048 340.114286H414.47619c-39.009524 0-68.266667 29.257143-68.266666 68.266666s29.257143 68.266667 68.266666 68.266667H487.619048c39.009524 0 68.266667-29.257143 68.266666-68.266667s-29.257143-68.266667-68.266666-68.266666zM414.47619 427.885714c-9.752381 0-19.504762-9.752381-19.504761-19.504762s9.752381-19.504762 19.504761-19.504762H487.619048c9.752381 0 19.504762 9.752381 19.504762 19.504762s-9.752381 19.504762-19.504762 19.504762H414.47619zM487.619048 106.057143H414.47619c-39.009524 0-68.266667 29.257143-68.266666 68.266667s29.257143 68.266667 68.266666 68.266666H487.619048c39.009524 0 68.266667-29.257143 68.266666-68.266666s-29.257143-68.266667-68.266666-68.266667z m-73.142858 92.647619c-9.752381 0-19.504762-9.752381-19.504761-19.504762s9.752381-19.504762 19.504761-19.504762H487.619048c9.752381 0 19.504762 9.752381 19.504762 19.504762s-9.752381 19.504762-19.504762 19.504762H414.47619zM809.447619-79.238095h-633.904762V798.47619c0 53.638095 43.885714 97.52381 97.52381 97.52381h438.857143c53.638095 0 97.52381-43.885714 97.523809-97.52381v-877.714285z m-536.380952 97.523809h438.857143V798.47619h-438.857143v-780.190476zM1189.790476-79.238095h-463.238095V427.885714c0 53.638095 43.885714 97.52381 97.523809 97.52381h268.190477c53.638095 0 97.52381-43.885714 97.523809-97.52381V-79.238095z m-365.714286 97.523809h268.190477V427.885714h-268.190477V18.285714zM1297.066667-103.619048H68.266667c-29.257143 0-48.761905 19.504762-48.761905 48.761905s19.504762 48.761905 48.761905 48.761905h1223.923809c29.257143 0 48.761905-19.504762 48.761905-48.761905s-19.504762-48.761905-43.885714-48.761905z"  horiz-adv-x="1365" />
+
+    
+    <glyph glyph-name="gongsidizhi" unicode="&#59195;" d="M1015.466667-128H93.866667c-46.933333 0-85.333333 38.4-85.333334 85.333333v17.066667l59.733334 307.2c8.533333 38.4 42.666667 68.266667 85.333333 68.266667h85.333333v-85.333334h-85.333333L93.866667-42.666667h921.6l-59.733334 307.2h-89.6v85.333334h89.6c42.666667 0 76.8-29.866667 85.333334-68.266667l59.733333-307.2c4.266667-21.333333 0-46.933333-12.8-64-12.8-17.066667-34.133333-29.866667-55.466667-34.133333-8.533333-4.266667-12.8-4.266667-17.066666-4.266667zM554.666667 76.8l-29.866667 34.133333c-149.333333 153.6-243.2 264.533333-281.6 324.266667-34.133333 42.666667-46.933333 98.133333-46.933333 149.333333C196.266667 755.2 354.133333 896 554.666667 896s358.4-140.8 358.4-311.466667c0-55.466667-17.066667-110.933333-46.933334-157.866666-38.4-55.466667-132.266667-166.4-281.6-320l-29.866666-29.866667zM554.666667 810.666667C401.066667 810.666667 281.6 708.266667 281.6 584.533333c0-38.4 12.8-72.533333 34.133333-106.666666s85.333333-110.933333 243.2-277.333334c157.866667 166.4 217.6 238.933333 238.933334 273.066667 21.333333 34.133333 34.133333 68.266667 34.133333 106.666667-4.266667 128-123.733333 230.4-277.333333 230.4zM550.4 409.6c-72.533333 0-128 55.466667-128 128s55.466667 128 128 128 128-55.466667 128-128-59.733333-128-128-128z m0 213.333333c-46.933333 0-85.333333-38.4-85.333333-85.333333s38.4-85.333333 85.333333-85.333333 85.333333 38.4 85.333333 85.333333-38.4 85.333333-85.333333 85.333333z"  horiz-adv-x="1109" />
+
+    
+    <glyph glyph-name="jubushuaxinjiantou" unicode="&#59194;" d="M783.090347-128a35.498667 35.498667 0 0 0-22.528 8.192l-546.133334 477.866667a32.768 32.768 0 0 0-8.874666 22.528 34.133333 34.133333 0 0 0 11.605333 25.941333l546.133333 477.866667a32.768 32.768 0 0 0 47.786667 0 34.133333 34.133333 0 0 0 0-48.469334L288.83968 384l516.778667-449.194667a34.816 34.816 0 0 0 3.413333-48.469333 35.498667 35.498667 0 0 0-25.941333-14.336z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fanhui" unicode="&#59193;" d="M590.769231-107.362462H315.076923c-31.507692 0-63.015385 23.630769-63.015385 63.015385s23.630769 63.015385 63.015385 63.015385h275.692308c259.938462 0 378.092308 7.876923 378.092307 252.061538s-118.153846 252.061538-378.092307 252.061539H315.076923c-31.507692 0-63.015385 23.630769-63.015385 63.015384s31.507692 55.138462 63.015385 55.138462h275.692308c228.430769 0 496.246154 0 496.246154-378.092308s-267.815385-370.215385-496.246154-370.215385zM47.261538 514.914462l259.938462-196.923077c39.384615-23.630769 86.646154-15.753846 110.276923 15.753846 7.876923 15.753846 15.753846 31.507692 15.753846 47.261538v393.846154c0 47.261538-31.507692 78.769231-78.769231 78.769231-15.753846 0-31.507692-7.876923-47.261538-15.753846l-259.938462-196.923077c-39.384615-31.507692-47.261538-78.769231-15.753846-110.276923 0-7.876923 7.876923-15.753846 15.753846-15.753846z"  horiz-adv-x="1102" />
+
+    
+    <glyph glyph-name="tongji1" unicode="&#59192;" d="M702.171429 52.419048c-78.019048 0-141.409524 63.390476-141.409524 141.409523V754.590476c0 78.019048 63.390476 141.409524 141.409524 141.409524 78.019048 0 141.409524-63.390476 141.409523-141.409524v-565.638095c-4.87619-73.142857-68.266667-136.533333-141.409523-136.533333z m0 746.057142c-24.380952 0-43.885714-19.504762-43.885715-43.885714v-565.638095c0-24.380952 19.504762-43.885714 43.885715-43.885714s43.885714 19.504762 43.885714 43.885714V754.590476c-4.87619 24.380952-24.380952 43.885714-43.885714 43.885714zM1067.885714 52.419048c-78.019048 0-141.409524 63.390476-141.409524 141.409523V447.390476c0 78.019048 63.390476 141.409524 141.409524 141.409524s141.409524-63.390476 141.409524-141.409524v-253.561905c0-78.019048-63.390476-141.409524-141.409524-141.409523z m0 433.980952c-24.380952 0-43.885714-19.504762-43.885714-43.885714v-253.561905c0-24.380952 19.504762-43.885714 43.885714-43.885714s43.885714 19.504762 43.885715 43.885714V447.390476c0 19.504762-19.504762 39.009524-43.885715 39.009524zM331.580952 52.419048C253.561905 52.419048 195.047619 115.809524 195.047619 193.828571V447.390476c0 78.019048 63.390476 141.409524 141.409524 141.409524 78.019048 0 141.409524-63.390476 141.409524-141.409524v-253.561905c-4.87619-78.019048-68.266667-141.409524-146.285715-141.409523z m0 433.980952c-19.504762 0-39.009524-19.504762-39.009523-39.009524v-253.561905c0-24.380952 19.504762-43.885714 43.885714-43.885714s43.885714 19.504762 43.885714 43.885714V447.390476c-4.87619 19.504762-24.380952 39.009524-48.761905 39.009524zM1297.066667-108.495238H48.761905c-29.257143 0-48.761905 19.504762-48.761905 48.761905v536.380952c0 29.257143 19.504762 48.761905 48.761905 48.761905s48.761905-19.504762 48.761905-48.761905v-487.619048h1199.542857c29.257143 0 48.761905-19.504762 48.761904-48.761904s-24.380952-48.761905-48.761904-48.761905z"  horiz-adv-x="1365" />
+
+    
+    <glyph glyph-name="qiandao-1" unicode="&#59190;" d="M881.509434-128h-724.528302a157.584906 157.584906 0 0 0-156.981132 156.981132v603.773585a157.584906 157.584906 0 0 0 156.981132 156.981132h724.528302a157.584906 157.584906 0 0 0 156.981132-156.981132v-603.773585a157.584906 157.584906 0 0 0-156.981132-156.981132z m-724.528302 845.283019a84.528302 84.528302 0 0 1-84.528302-84.528302v-603.773585a84.528302 84.528302 0 0 1 84.528302-84.528302h724.528302a84.528302 84.528302 0 0 1 84.528302 84.528302v603.773585a84.528302 84.528302 0 0 1-84.528302 84.528302zM277.735849 859.773585v-241.509434M277.735849 582.037736a36.226415 36.226415 0 0 0-36.226415 36.226415v241.509434a36.226415 36.226415 0 1 0 72.45283 0v-241.509434a36.226415 36.226415 0 0 0-36.226415-36.226415zM760.754717 859.773585v-241.509434M760.754717 582.037736a36.226415 36.226415 0 0 0-36.226415 36.226415v241.509434a36.226415 36.226415 0 0 0 72.45283 0v-241.509434a36.226415 36.226415 0 0 0-36.226415-36.226415zM486.641509 149.735849a37.433962 37.433962 0 0 0-27.773584 10.867925l-175.09434 181.132075a36.226415 36.226415 0 0 0 0 51.320755 36.830189 36.830189 0 0 0 51.320755 0l152.754717-158.792453 281.962264 221.584906a36.226415 36.226415 0 0 0 50.716981-6.037736 36.830189 36.830189 0 0 0-6.037736-51.320755l-307.320755-241.509434a38.037736 38.037736 0 0 0-20.528302-7.245283z"  horiz-adv-x="1038" />
+
+    
+    <glyph glyph-name="xiajiantou2" unicode="&#59191;" d="M796.390468-127.928326a113.768929 113.768929 0 0 0-86.464386 39.819126l-682.613575 796.382503A113.768929 113.768929 0 1 0 200.24128 856.172911L796.390468 156.493997 1392.539656 851.622154a113.768929 113.768929 0 0 0 172.928773-147.899608l-682.613575-796.382504A113.768929 113.768929 0 0 0 796.390468-127.928326z"  horiz-adv-x="1592" />
+
+    
+    <glyph glyph-name="qiandao-" unicode="&#59189;" d="M881.509434-128h-724.528302a157.584906 157.584906 0 0 0-156.981132 156.981132v603.773585a157.584906 157.584906 0 0 0 156.981132 156.981132h724.528302a157.584906 157.584906 0 0 0 156.981132-156.981132v-603.773585a157.584906 157.584906 0 0 0-156.981132-156.981132z m-724.528302 845.283019a84.528302 84.528302 0 0 1-84.528302-84.528302v-603.773585a84.528302 84.528302 0 0 1 84.528302-84.528302h724.528302a84.528302 84.528302 0 0 1 84.528302 84.528302v603.773585a84.528302 84.528302 0 0 1-84.528302 84.528302zM277.735849 859.773585v-241.509434M277.735849 582.037736a36.226415 36.226415 0 0 0-36.226415 36.226415v241.509434a36.226415 36.226415 0 1 0 72.45283 0v-241.509434a36.226415 36.226415 0 0 0-36.226415-36.226415zM760.754717 859.773585v-241.509434M760.754717 582.037736a36.226415 36.226415 0 0 0-36.226415 36.226415v241.509434a36.226415 36.226415 0 0 0 72.45283 0v-241.509434a36.226415 36.226415 0 0 0-36.226415-36.226415zM486.641509 149.73584900000003a37.433962 37.433962 0 0 0-27.773584 10.867925l-175.09434 181.132075a36.226415 36.226415 0 0 0 0 51.320755 36.830189 36.830189 0 0 0 51.320755 0l152.754717-158.792453 281.962264 221.584906a36.226415 36.226415 0 0 0 50.716981-6.037736 36.830189 36.830189 0 0 0-6.037736-51.320755l-307.320755-241.509434a38.037736 38.037736 0 0 0-20.528302-7.245283z"  horiz-adv-x="1038" />
+
+    
+    <glyph glyph-name="yidong" unicode="&#59188;" d="M855.341176-121.976471H174.682353c-90.352941 0-156.611765 72.282353-156.611765 156.611765V721.317647C18.070588 811.670588 90.352941 877.929412 174.682353 877.929412h680.658823c90.352941 0 156.611765-72.282353 156.611765-156.611765v-78.305882h-90.352941V721.317647c0 36.141176-30.117647 66.258824-66.258824 66.258824H174.682353c-36.141176 0-66.258824-30.117647-66.258824-66.258824v-680.658823c0-36.141176 30.117647-66.258824 66.258824-66.258824h680.658823c36.141176 0 66.258824 30.117647 66.258824 66.258824v78.305882h90.352941v-78.305882c6.023529-90.352941-66.258824-162.635294-156.611765-162.635295zM951.717647 299.670588H271.058824c-24.094118 0-48.188235 18.070588-48.188236 48.188236s18.070588 48.188235 48.188236 48.188235h680.658823c24.094118 0 48.188235-18.070588 48.188235-48.188235s-24.094118-48.188235-48.188235-48.188236zM1084.235294 347.858824L921.6 173.176471V534.588235L1084.235294 359.905882v-12.047058z"  horiz-adv-x="1084" />
+
+    
+    <glyph glyph-name="xiayi1" unicode="&#59186;" d="M512 384m-481.882353 0a481.882353 481.882353 0 1 1 963.764706 0 481.882353 481.882353 0 1 1-963.764706 0ZM512-128C228.894118-128 0 100.894118 0 384S228.894118 896 512 896 1024 667.105882 1024 384 795.105882-128 512-128z m0 963.764706C265.035294 835.764706 60.235294 630.964706 60.235294 384S265.035294-67.764706 512-67.764706 963.764706 137.035294 963.764706 384 758.964706 835.764706 512 835.764706zM502.964706 143.058824c-18.070588 0-30.117647 12.047059-30.117647 30.117647V588.8c0 18.070588 12.047059 30.117647 30.117647 30.117647s30.117647-12.047059 30.117647-30.117647V173.176471c0-18.070588-12.047059-30.117647-30.117647-30.117647zM502.964706 88.847059c-6.023529 0-12.047059 0-18.070588 6.023529l-144.564706 132.517647c-12.047059 12.047059-12.047059 30.117647 0 42.164706 12.047059 12.047059 30.117647 12.047059 42.164706 0l126.494117-108.423529 132.517647 108.423529c12.047059 12.047059 30.117647 12.047059 42.164706-6.023529 6.023529-6.023529 6.023529-30.117647-12.047059-36.141177l-150.588235-132.517647c-6.023529 0-12.047059-6.023529-18.070588-6.023529z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shangyi1" unicode="&#59185;" d="M512 384m-481.882353 0a481.882353 481.882353 0 1 1 963.764706 0 481.882353 481.882353 0 1 1-963.764706 0ZM512-128C228.894118-128 0 100.894118 0 384S228.894118 896 512 896 1024 667.105882 1024 384 795.105882-128 512-128z m0 963.764706C265.035294 835.764706 60.235294 630.964706 60.235294 384S265.035294-67.764706 512-67.764706 963.764706 137.035294 963.764706 384 758.964706 835.764706 512 835.764706zM502.964706 106.917647c-18.070588 0-30.117647 12.047059-30.117647 30.117647V552.658824c0 18.070588 12.047059 30.117647 30.117647 30.117647s30.117647-12.047059 30.117647-30.117647v-415.62353c0-18.070588-12.047059-30.117647-30.117647-30.117647zM653.552941 444.235294c-6.023529 0-12.047059 0-18.070588 6.02353l-132.517647 114.447058-126.494118-108.423529c-12.047059-12.047059-30.117647-12.047059-42.164706 0-12.047059 12.047059-12.047059 30.117647 0 42.164706l144.564706 126.494117c12.047059 12.047059 30.117647 12.047059 42.164706 0l150.588235-126.494117c12.047059-12.047059 12.047059-30.117647 6.02353-42.164706-6.023529-6.023529-12.047059-12.047059-24.094118-12.047059z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xiayi" unicode="&#59184;" d="M512 384m-481.882353 0a481.882353 481.882353 0 1 1 963.764706 0 481.882353 481.882353 0 1 1-963.764706 0ZM512-128C228.894118-128 0 100.894118 0 384S228.894118 896 512 896 1024 667.105882 1024 384 795.105882-128 512-128z m0 963.764706C265.035294 835.764706 60.235294 630.964706 60.235294 384S265.035294-67.764706 512-67.764706 963.764706 137.035294 963.764706 384 758.964706 835.764706 512 835.764706zM502.964706 143.058824c-18.070588 0-30.117647 12.047059-30.117647 30.117647V588.8c0 18.070588 12.047059 30.117647 30.117647 30.117647s30.117647-12.047059 30.117647-30.117647V173.176471c0-18.070588-12.047059-30.117647-30.117647-30.117647zM502.964706 88.847059c-6.023529 0-12.047059 0-18.070588 6.023529l-144.564706 132.517647c-12.047059 12.047059-12.047059 30.117647 0 42.164706 12.047059 12.047059 30.117647 12.047059 42.164706 0l126.494117-108.423529 132.517647 108.423529c12.047059 12.047059 30.117647 12.047059 42.164706-6.023529 6.023529-6.023529 6.023529-30.117647-12.047059-36.141177l-150.588235-132.517647c-6.023529 0-12.047059-6.023529-18.070588-6.023529z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shangyi" unicode="&#59183;" d="M512 384m-481.882353 0a481.882353 481.882353 0 1 1 963.764706 0 481.882353 481.882353 0 1 1-963.764706 0ZM512-128C228.894118-128 0 100.894118 0 384S228.894118 896 512 896 1024 667.105882 1024 384 795.105882-128 512-128z m0 963.764706C265.035294 835.764706 60.235294 630.964706 60.235294 384S265.035294-67.764706 512-67.764706 963.764706 137.035294 963.764706 384 758.964706 835.764706 512 835.764706zM502.964706 106.917647c-18.070588 0-30.117647 12.047059-30.117647 30.117647V552.658824c0 18.070588 12.047059 30.117647 30.117647 30.117647s30.117647-12.047059 30.117647-30.117647v-415.62353c0-18.070588-12.047059-30.117647-30.117647-30.117647zM653.552941 444.235294c-6.023529 0-12.047059 0-18.070588 6.02353l-132.517647 114.447058-126.494118-108.423529c-12.047059-12.047059-30.117647-12.047059-42.164706 0-12.047059 12.047059-12.047059 30.117647 0 42.164706l144.564706 126.494117c12.047059 12.047059 30.117647 12.047059 42.164706 0l150.588235-126.494117c12.047059-12.047059 12.047059-30.117647 6.02353-42.164706-6.023529-6.023529-12.047059-12.047059-24.094118-12.047059z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bianji5" unicode="&#59182;" d="M704.752941-97.882353H198.776471c-78.305882 0-138.541176 60.235294-138.541177 132.517647V667.105882c0 72.282353 66.258824 132.517647 138.541177 132.517647h319.247058c18.070588 0 30.117647-12.047059 30.117647-30.117647s-12.047059-24.094118-30.117647-24.094117H198.776471c-42.164706 0-78.305882-36.141176-78.305883-72.282353v-632.470588c0-42.164706 36.141176-72.282353 78.305883-72.282353h499.952941c42.164706 0 78.305882 36.141176 78.305882 72.282353V293.647059c0 18.070588 12.047059 30.117647 30.117647 30.117647s30.117647-12.047059 30.117647-30.117647v-259.011765c6.023529-72.282353-60.235294-132.517647-132.517647-132.517647zM313.223529 161.129412c-24.094118 0-54.211765 18.070588-60.235294 48.188235v30.117647l36.141177 126.494118 445.741176 445.741176c48.188235 48.188235 120.470588 48.188235 168.658824 0 48.188235-48.188235 48.188235-120.470588 0-168.658823l-445.741177-445.741177-126.494117-30.117647c-6.023529-6.023529-12.047059-6.023529-18.070589-6.023529z m36.141177 174.682353l-36.141177-114.447059 120.470589 30.117647 433.694117 433.694118c12.047059 12.047059 18.070588 24.094118 18.070589 42.164705 0 18.070588-6.023529 30.117647-18.070589 42.164706-24.094118 24.094118-60.235294 24.094118-84.329411 0L349.364706 335.811765z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shanchu3" unicode="&#59181;" d="M654.222222-99.555556H375.466667c-68.266667 0-125.155556 56.888889-136.533334 142.222223L142.222222 571.733333c0 17.066667 5.688889 28.444444 22.755556 34.133334 17.066667 0 28.444444-5.688889 34.133333-22.755556l91.022222-534.755555c11.377778-51.2 45.511111-91.022222 85.333334-91.022223h278.755555c39.822222 0 73.955556 39.822222 85.333334 91.022223l91.022222 534.755555c0 17.066667 17.066667 28.444444 34.133333 22.755556 17.066667 0 28.444444-17.066667 22.755556-34.133334L796.444444 42.666667c-17.066667-85.333333-73.955556-142.222222-142.222222-142.222223zM597.333333 708.266667v5.688889c0 51.2-39.822222 96.711111-85.333333 96.711111s-85.333333-45.511111-85.333333-102.4h-56.888889C369.777778 793.6 432.355556 867.555556 512 867.555556c73.955556 0 136.533333-68.266667 142.222222-147.911112v-5.688888l-56.888889-5.688889zM398.222222 36.977778c-11.377778 0-28.444444 11.377778-28.444444 22.755555L284.444444 577.422222c0 17.066667 11.377778 34.133333 22.755556 34.133334 17.066667 5.688889 34.133333-5.688889 34.133333-22.755556l85.333334-517.688889c0-17.066667-5.688889-34.133333-28.444445-34.133333 5.688889 0 0 0 0 0zM625.777778 36.977778s-5.688889 0 0 0c-22.755556 5.688889-28.444444 17.066667-28.444445 34.133333L682.666667 588.8c0 17.066667 17.066667 28.444444 34.133333 22.755556 11.377778 0 22.755556-17.066667 22.755556-34.133334l-85.333334-517.688889c0-11.377778-17.066667-22.755556-28.444444-22.755555zM512 36.977778c-17.066667 0-28.444444 11.377778-28.444444 28.444444V583.111111c0 17.066667 11.377778 28.444444 28.444444 28.444445s28.444444-11.377778 28.444444-28.444445v-517.688889c0-17.066667-11.377778-28.444444-28.444444-28.444444zM938.666667 645.688889H85.333333c-17.066667 0-28.444444 17.066667-28.444444 28.444444s11.377778 28.444444 28.444444 28.444445h853.333334c17.066667 0 28.444444-11.377778 28.444444-28.444445s-11.377778-28.444444-28.444444-28.444444z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xuanze" unicode="&#59180;" d="M870.4 896H153.6C66.56 896 0 829.44 0 742.4v-716.8c0-87.04 66.56-153.6 153.6-153.6h716.8c87.04 0 153.6 66.56 153.6 153.6V742.4c0 87.04-66.56 153.6-153.6 153.6z m-40.96-394.24l-337.92-358.4c-10.24-10.24-25.6-15.36-40.96-15.36-10.24 0-20.48 5.12-30.72 10.24L174.08 332.8c-20.48 15.36-25.6 51.2-10.24 71.68 15.36 20.48 51.2 25.6 71.68 10.24l209.92-163.84 307.2 327.68c20.48 20.48 51.2 20.48 71.68 0 20.48-20.48 25.6-56.32 5.12-76.8z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="bianji4" unicode="&#59178;" d="M934.724189 617.173271L834.414864 516.863946 653.380212 697.898598l100.394659 100.351991A42.257063 42.257063 0 0 0 783.769535 810.666588c6.527999 0 19.157332-1.621333 29.951997-12.415999l121.002657-121.002656a42.538663 42.538663 0 0 0 0-60.074662zM299.374908-18.176009l-200.661316-19.626665 19.669331 200.661316L593.049551 637.52527 774.084202 456.533285l-474.709294-474.709294z m695.679942 755.79727L874.09486 858.581251A127.317323 127.317323 0 0 1 783.769535 895.999915c-32.725331 0-65.407995-12.458666-90.367993-37.418664l-646.229279-646.229279c-7.082666-7.082666-11.434666-16.469332-12.287999-26.495998l-26.197331-267.818645c-2.133333-25.002665 17.706665-46.037329 42.239996-46.037329 1.194667 0 2.432 0.042667 3.626666 0.128l267.818645 26.239998a42.12053 42.12053 0 0 1 26.495998 12.287999l646.186612 646.186613c49.919996 49.919996 49.919996 130.858656 0 180.778651z"  horiz-adv-x="1032" />
 
     
diff --git a/public/css/iconfont.ttf b/public/css/iconfont.ttf
index cd4b945b..363c0bfd 100644
Binary files a/public/css/iconfont.ttf and b/public/css/iconfont.ttf differ
diff --git a/public/css/iconfont.woff b/public/css/iconfont.woff
index 9426213f..18e4bab2 100644
Binary files a/public/css/iconfont.woff and b/public/css/iconfont.woff differ
diff --git a/public/css/iconfont.woff2 b/public/css/iconfont.woff2
index 7323aec5..ccd97975 100644
Binary files a/public/css/iconfont.woff2 and b/public/css/iconfont.woff2 differ
diff --git a/public/css/merge.css b/public/css/merge.css
index b6d923ce..29d9fb8f 100755
--- a/public/css/merge.css
+++ b/public/css/merge.css
@@ -1,23 +1,35 @@
-
 .CodeMirror-merge {
   position: relative;
   white-space: pre;
 }
 
-.CodeMirror-merge, .CodeMirror-merge .CodeMirror {
-  min-height:50px;
+.CodeMirror-merge,
+.CodeMirror-merge .CodeMirror {
+  min-height: 50px;
 }
 
-.CodeMirror-merge-2pane .CodeMirror-merge-pane { width: 48%; }
-.CodeMirror-merge-2pane .CodeMirror-merge-gap { width: 4%; }
-.CodeMirror-merge-3pane .CodeMirror-merge-pane { width: 31%; }
-.CodeMirror-merge-3pane .CodeMirror-merge-gap { width: 3.5%; }
+.CodeMirror-merge-2pane .CodeMirror-merge-pane {
+  width: 48%;
+}
+
+.CodeMirror-merge-2pane .CodeMirror-merge-gap {
+  width: 4%;
+}
+
+.CodeMirror-merge-3pane .CodeMirror-merge-pane {
+  width: 31%;
+}
+
+.CodeMirror-merge-3pane .CodeMirror-merge-gap {
+  width: 3.5%;
+}
 
 .CodeMirror-merge-pane {
   display: inline-block;
   white-space: normal;
   vertical-align: top;
 }
+
 .CodeMirror-merge-pane-rightmost {
   position: absolute;
   right: 0px;
@@ -25,20 +37,22 @@
 }
 
 .CodeMirror-merge-gap {
-    z-index: 2;
-    display: inline-block;
-    height: 100%;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-    position: relative;
-    background: #515151;
+  z-index: 2;
+  display: inline-block;
+  height: 100%;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  overflow: hidden;
+  position: relative;
+  background: #515151;
 }
 
 .CodeMirror-merge-scrolllock-wrap {
   position: absolute;
-  bottom: 0; left: 50%;
+  bottom: 0;
+  left: 50%;
 }
+
 .CodeMirror-merge-scrolllock {
   position: relative;
   left: -50%;
@@ -47,10 +61,13 @@
   line-height: 1;
 }
 
-.CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
+.CodeMirror-merge-copybuttons-left,
+.CodeMirror-merge-copybuttons-right {
   position: absolute;
-  left: 0; top: 0;
-  right: 0; bottom: 0;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
   line-height: 1;
 }
 
@@ -67,38 +84,70 @@
   color: #44c;
 }
 
-.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
-.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
+.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy {
+  left: 2px;
+}
 
-.CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted {
+.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy {
+  right: 2px;
+}
+
+.CodeMirror-merge-r-inserted,
+.CodeMirror-merge-l-inserted {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
   background-position: bottom left;
   background-repeat: repeat-x;
 }
 
-.CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted {
+.CodeMirror-merge-r-deleted,
+.CodeMirror-merge-l-deleted {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
   background-position: bottom left;
   background-repeat: repeat-x;
 }
 
-.CodeMirror-merge-r-chunk { background: #9a6868; }
-.CodeMirror-merge-r-chunk-start { /*border-top: 1px solid #ee8; */}
-.CodeMirror-merge-r-chunk-end {/* border-bottom: 1px solid #ee8; */}
-.CodeMirror-merge-r-connect { fill:#9a6868;}
+.CodeMirror-merge-r-chunk {
+  background: #9a6868;
+}
 
-.CodeMirror-merge-l-chunk { background: #eef; }
-.CodeMirror-merge-l-chunk-start { border-top: 1px solid #88e; }
-.CodeMirror-merge-l-chunk-end { border-bottom: 1px solid #88e; }
-.CodeMirror-merge-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
+.CodeMirror-merge-r-connect {
+  fill: #9a6868;
+}
 
-.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
-.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
-.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }
+.CodeMirror-merge-l-chunk {
+  background: #eef;
+}
+
+.CodeMirror-merge-l-chunk-start {
+  border-top: 1px solid #88e;
+}
+
+.CodeMirror-merge-l-chunk-end {
+  border-bottom: 1px solid #88e;
+}
+
+.CodeMirror-merge-l-connect {
+  fill: #eef;
+  stroke: #88e;
+  stroke-width: 1px;
+}
+
+.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk {
+  background: #dfd;
+}
+
+.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start {
+  border-top: 1px solid #4e4;
+}
+
+.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end {
+  border-bottom: 1px solid #4e4;
+}
 
 .CodeMirror-merge-collapsed-widget:before {
   content: "(...)";
 }
+
 .CodeMirror-merge-collapsed-widget {
   cursor: pointer;
   color: #88b;
@@ -108,4 +157,7 @@
   padding: 0 3px;
   border-radius: 4px;
 }
-.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt { display: none; }
+
+.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt {
+  display: none;
+}
\ No newline at end of file
diff --git a/public/css/taskstyle.css b/public/css/taskstyle.css
index 85960fa8..d5a9fe4a 100755
--- a/public/css/taskstyle.css
+++ b/public/css/taskstyle.css
@@ -1,397 +1,1997 @@
-/************新版公共****************/
-/************新版公共****************/
-html{height:100%;}
-/*.newContainer{ min-height:100%; height: auto !important; height: 100%;  position: relative;}
-.newMain{ margin: 0 auto; padding-bottom: 155px; }
-.newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px}
-.newHeader{background: #46484c;width:100%; height: 50px; min-width: 1200px}*/
-.w20_center{ width: 20px;text-align: center; }
-.task-container{ min-width:1300px; margin:0 auto; background: #f5f9fc; position: relative;}
+html {
+  height: 100%;
+}
+
+.w20_center {
+  width: 20px;
+  text-align: center;
+}
+
+.task-container {
+  min-width: 1300px;
+  margin: 0 auto;
+  background: #f5f9fc;
+  position: relative;
+}
+
 /*左侧导航*/
-.leftbar{  height: 100%; background: #1f212d; width:80px;}
-.user-info{ width:80px; height:100px;  padding-top:15px;}
-a.user-info-img{ display: block; width: 50px; height: 50px; margin:0 auto;  }
-a.user-info-img img{border-radius:100px;border:2px solid #666;}
-a.user-info-img img:hover{border:2px solid #888;}
-a.user-info-name{ display: block; font-size: 16px; color: #fff; max-width:100px; margin: 10px auto; text-align: center;    overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
-.leftnav-box{ width: 80px; height: 60px; background:#292b3a; padding:10px 0; margin-bottom:2px;}
-a.leftnav-box-inner{ display: block; width:77px;  border-left:3px solid #292b3a; background:#292b3a;  text-align: center; padding:10px 0; color:#575f6c;}
-a:hover.leftnav-box-inner,a.leftnav-active{border-left:3px solid #3498db;color: #fff!important;}
-a:hover.leftnav-box-inner .btn-cir{background:#fff;color:#333333}
-a.leftnav-box-reset-inner{ display: block; width:77px;  border-left:3px solid #292b3a; background:#292b3a;  text-align: center; color:#575f6c;}
-a:hover.leftnav-box-reset-inner{border-left:3px solid #3498db;color: #fff!important;}
+.leftbar {
+  height: 100%;
+  background: #1f212d;
+  width: 80px;
+}
+
+.user-info {
+  width: 80px;
+  height: 100px;
+  padding-top: 15px;
+}
+
+a.user-info-img {
+  display: block;
+  width: 50px;
+  height: 50px;
+  margin: 0 auto;
+}
+
+a.user-info-img img {
+  border-radius: 100px;
+  border: 2px solid #666;
+}
+
+a.user-info-img img:hover {
+  border: 2px solid #888;
+}
+
+a.user-info-name {
+  display: block;
+  font-size: 16px;
+  color: #fff;
+  max-width: 100px;
+  margin: 10px auto;
+  text-align: center;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.leftnav-box {
+  width: 80px;
+  height: 60px;
+  background: #292b3a;
+  padding: 10px 0;
+  margin-bottom: 2px;
+}
+
+a.leftnav-box-inner {
+  display: block;
+  width: 77px;
+  border-left: 3px solid #292b3a;
+  background: #292b3a;
+  text-align: center;
+  padding: 10px 0;
+  color: #575f6c;
+}
+
+a:hover.leftnav-box-inner,
+a.leftnav-active {
+  border-left: 3px solid #3498db;
+  color: #fff !important;
+}
+
+a:hover.leftnav-box-inner .btn-cir {
+  background: #fff;
+  color: #333333
+}
+
+a.leftnav-box-reset-inner {
+  display: block;
+  width: 77px;
+  border-left: 3px solid #292b3a;
+  background: #292b3a;
+  text-align: center;
+  color: #575f6c;
+}
+
+a:hover.leftnav-box-reset-inner {
+  border-left: 3px solid #3498db;
+  color: #fff !important;
+}
 
 
 
 /*右侧头部*/
-.rightbar-header{width: 100%; background:#282c37; height:60px; min-width:1000px;}
-.rightbar-score{ margin-top: 17px; font-size: 14px; margin-right:20px;}
-.rightbar-score li{ float: left; color:#fff; margin-right: 20px;}
-.rightbar-score li a{ color:#fff;}
-a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:15px; margin-top: 12px;}
-.rightbar-h2{ color:#fff; margin:12px 0 0 20px;  font-weight: normal;}
-.rightbar{background:#f5f9fc; color:#333; position: relative;}
+.rightbar-header {
+  width: 100%;
+  background: #282c37;
+  height: 60px;
+  min-width: 1000px;
+}
+
+.rightbar-score {
+  margin-top: 17px;
+  font-size: 14px;
+  margin-right: 20px;
+}
+
+.rightbar-score li {
+  float: left;
+  color: #fff;
+  margin-right: 20px;
+}
+
+.rightbar-score li a {
+  color: #fff;
+}
+
+a.rightbar-pause {
+  color: #29bd8b;
+  font-size: 18px;
+  margin-right: 15px;
+  margin-top: 12px;
+}
+
+.rightbar-h2 {
+  color: #fff;
+  margin: 12px 0 0 20px;
+  font-weight: normal;
+}
+
+.rightbar {
+  background: #f5f9fc;
+  color: #333;
+  position: relative;
+}
+
 /*右侧内容*/
-.content{ min-width:1000px;  }
-.content-row{ padding:15px; }
-.content-info{ width:49.5%; min-width:250px;}
-.content-editor{  width:49.3%; min-width:250px; margin-left:15px; }
-.panel-header{  border-bottom:1px solid #eee; padding:10px 15px; color:#898989;}
-.panel-header-border{  border:1px solid #eee; padding:10px 15px; border-bottom:none; }
+.content {
+  min-width: 1000px;
+}
+
+.content-row {
+  padding: 15px;
+}
+
+.content-info {
+  width: 49.5%;
+  min-width: 250px;
+}
+
+.content-editor {
+  width: 49.3%;
+  min-width: 250px;
+  margin-left: 15px;
+}
+
+.panel-header {
+  border-bottom: 1px solid #eee;
+  padding: 10px 15px;
+  color: #898989;
+}
+
+.panel-header-border {
+  border: 1px solid #eee;
+  padding: 10px 15px;
+  border-bottom: none;
+}
+
 /* tab */
-.tab_content{ width: 100%;  margin: 0 auto;  background:#fff;  }
-#tab_nav {height:42px;background: #fff; border-bottom: 1px solid #EEEEEE}
-#tab_nav li {float:left; padding:0 30px;text-align:center;height: 40px;line-height: 40px;  }
-#tab_nav li a{font-size:14px; }
-.tab_hover {border-bottom:2px solid #3498db; background: #fff;color: #3498db}
+.tab_content {
+  width: 100%;
+  margin: 0 auto;
+  background: #fff;
+}
+
+#tab_nav {
+  height: 42px;
+  background: #fff;
+  border-bottom: 1px solid #EEEEEE
+}
+
+#tab_nav li {
+  float: left;
+  padding: 0 30px;
+  text-align: center;
+  height: 40px;
+  line-height: 40px;
+}
+
+#tab_nav li a {
+  font-size: 14px;
+}
+
+.tab_hover {
+  border-bottom: 2px solid #3498db;
+  background: #fff;
+  color: #3498db
+}
+
 /*.tab_hover_setting{background:#FC7033;}*/
-.tab_hover a{ color:#3498db!important;}
+.tab_hover a {
+  color: #3498db !important;
+}
+
 /*.tab_hover_setting a{color:#fff;}*/
-.undis {display:none;}
-.dis {display:block;}
-.tab-info{ }
-.content-editor-inner{ overflow:auto;}
-.tab-info-inner{ overflow:auto; height:600px;  margin:0 0 0px 15px;padding-top: 15px}
-.content-history-inner{height:120px; overflow:auto; padding:15px;}
-.content-history{width:48.7%; min-width:500px; }
-.history-success{ width: 100%; height:40px; line-height: 40px;  background:#eef1f2; color:#666; }
-.history-fail{ width: 100%; height:40px; line-height: 40px;  background:#fdebeb; color:#e53238; }
-.icon-fail{ display:inline-block; padding:0 8px; background:#e53238; color:#fff;}
-.icon-success{ display:inline-block; padding:0 8px; background:#252e38; color:#fff;}
-.info-partly{display: block;box-flex:1;flex:1;-webkit-flex:1;position: relative;}
-.content-output{width:37.5%; min-width:200px;  }
-.content-submit{width:10%; min-width:135px; }
-.content-submitbox{ width:120px; margin: 15px auto; height:135px;}
-.panel-inner{ background:#EFF2F7; margin:15px; padding:15px;}
-.panel-inner-title{ font-size: 14px; color: #666; max-width:85%; line-height:30px;word-wrap: break-word; margin-bottom: 10px}
-.panel-footer{ min-width:1000px; height: 210px!important;}
+.undis {
+  display: none;
+}
+
+.dis {
+  display: block;
+}
+
+.tab-info {}
+
+.content-editor-inner {
+  overflow: auto;
+}
+
+.tab-info-inner {
+  overflow: auto;
+  height: 600px;
+  margin: 0 0 0px 15px;
+  padding-top: 15px
+}
+
+.content-history-inner {
+  height: 120px;
+  overflow: auto;
+  padding: 15px;
+}
+
+.content-history {
+  width: 48.7%;
+  min-width: 500px;
+}
+
+.history-success {
+  width: 100%;
+  height: 40px;
+  line-height: 40px;
+  background: #eef1f2;
+  color: #666;
+}
+
+.history-fail {
+  width: 100%;
+  height: 40px;
+  line-height: 40px;
+  background: #fdebeb;
+  color: #e53238;
+}
+
+.icon-fail {
+  display: inline-block;
+  padding: 0 8px;
+  background: #e53238;
+  color: #fff;
+}
+
+.icon-success {
+  display: inline-block;
+  padding: 0 8px;
+  background: #252e38;
+  color: #fff;
+}
+
+.info-partly {
+  display: block;
+  box-flex: 1;
+  flex: 1;
+  -webkit-flex: 1;
+  position: relative;
+}
+
+.content-output {
+  width: 37.5%;
+  min-width: 200px;
+}
+
+.content-submit {
+  width: 10%;
+  min-width: 135px;
+}
+
+.content-submitbox {
+  width: 120px;
+  margin: 15px auto;
+  height: 135px;
+}
+
+.panel-inner {
+  background: #EFF2F7;
+  margin: 15px;
+  padding: 15px;
+}
+
+.panel-inner-title {
+  font-size: 14px;
+  color: #666;
+  max-width: 85%;
+  line-height: 30px;
+  word-wrap: break-word;
+  margin-bottom: 10px
+}
+
+.panel-footer {
+  min-width: 1000px;
+  height: 210px !important;
+}
+
 /* 弹框 */
-.task-popup-text-center{ text-align: center; color: #333;}
-.task-popup-title{ border-bottom: 1px solid #eee; padding:10px 15px; }
-.task-popup-submit{ margin: 0 auto 15px; width: 120px;}
+.task-popup-text-center {
+  text-align: center;
+  color: #333;
+}
+
+.task-popup-title {
+  border-bottom: 1px solid #eee;
+  padding: 10px 15px;
+}
+
+.task-popup-submit {
+  margin: 0 auto 15px;
+  width: 120px;
+}
+
 /* TPM */
-.task-header{ width: 100%;min-width:1200px; background:url("/images/task/task-bg-header.png");height: 180px;background-size: cover;display: flex;align-items: center;}
-.task-header-info{ width: 1200px; margin: 0 auto; color:#fff}
-.task-header-info h2 a,.task-header-info h2{ font-weight: normal;color:#fff;}
-a.task-header-name{ max-width:200px;}
-.task-header-title{ display: block; max-width:750px;word-wrap: break-word;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.task-header-nav{ width: 100%;min-width:1200px; height:50px;}
-.task-header-navs{ width: 1200px; margin: 0 auto;}
+.task-header {
+  width: 100%;
+  min-width: 1200px;
+  background: url("/images/task/task-bg-header.png");
+  height: 180px;
+  background-size: cover;
+  display: flex;
+  align-items: center;
+}
 
-.task-header-navs li{ float: left;}
-.task-header-navs li{ display: block; height: 50px; padding:0 50px; color:#666; text-align: center; font-size: 16px; line-height: 50px;}
-.task-header-navs li:hover,.task-header-navs li:hover a{ color:#FC7033!important;}
-.task-header-navs li.active{border-bottom: 2px solid #FC7033;color:#FC7033;}
-.task-header-navs li.active a{color:#FC7033!important;}
-.task-header-navs li.active .edu-cir-grey,.task-header-navs li:hover .edu-cir-grey,.edu-cir-grey.active{background: #FF7500;color: #FFFFff}
+.task-header-info {
+  width: 1200px;
+  margin: 0 auto;
+  color: #fff
+}
 
-.task-pm-content{ width: 1200px; margin: 0 auto; min-height:566px}
-.task-pm-box{ width: 100%; background: #fff; border: 1px solid #e8e8e8;}
-.task-paner-con{ padding:15px; color:#666; line-height:2.0;}
-.task-paner-con img{ max-width: 100%}
-.panel-form{margin:0 30px 0px 20px; padding:30px 0;  }.panel-form li{ margin-bottom:20px; font-size: 14px; color:#666;}
+.task-header-info h2 a,
+.task-header-info h2 {
+  font-weight: normal;
+  color: #fff;
+}
+
+a.task-header-name {
+  max-width: 200px;
+}
+
+.task-header-title {
+  display: block;
+  max-width: 750px;
+  word-wrap: break-word;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.task-header-nav {
+  width: 100%;
+  min-width: 1200px;
+  height: 50px;
+}
+
+.task-header-navs {
+  width: 1200px;
+  margin: 0 auto;
+}
+
+.task-header-navs li {
+  float: left;
+}
+
+.task-header-navs li {
+  display: block;
+  height: 50px;
+  padding: 0 50px;
+  color: #666;
+  text-align: center;
+  font-size: 16px;
+  line-height: 50px;
+}
+
+.task-header-navs li:hover,
+.task-header-navs li:hover a {
+  color: #FC7033 !important;
+}
+
+.task-header-navs li.active {
+  border-bottom: 2px solid #FC7033;
+  color: #FC7033;
+}
+
+.task-header-navs li.active a {
+  color: #FC7033 !important;
+}
+
+.task-header-navs li.active .edu-cir-grey,
+.task-header-navs li:hover .edu-cir-grey,
+.edu-cir-grey.active {
+  background: #FF7500;
+  color: #FFFFff
+}
+
+.task-pm-content {
+  width: 1200px;
+  margin: 0 auto;
+  min-height: 566px
+}
+
+.task-pm-box {
+  width: 100%;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+}
+
+.task-paner-con {
+  padding: 15px;
+  color: #666;
+  line-height: 2.0;
+}
+
+.task-paner-con img {
+  max-width: 100%
+}
+
+.panel-form {
+  margin: 0 30px 0px 20px;
+  padding: 30px 0;
+}
+
+.panel-form li {
+  margin-bottom: 20px;
+  font-size: 14px;
+  color: #666;
+}
 
 
-.panel-form-label{ display:inline-block; width:10%; min-width:90px; text-align:right; line-height:40px; color: #666;}
-.panel-form-label1{ display:inline-block; width:20%; min-width:90px; text-align:right; line-height:40px; }
-.panel-form input,.panel-form textarea{ border:1px solid #e2e2e2;color:#666;line-height: 1.9;}
-.panel-box-sizing{-moz-box-sizing: border-box;  /*Firefox3.5+*/-webkit-box-sizing: border-box; /*Safari3.2+*/-o-box-sizing: border-box; /*Opera9.6*/-ms-box-sizing: border-box; /*IE8*/box-sizing: border-box; }
-input.panel-form-width-690{ padding:5px;width:90%; height:40px; min-width:700px;}
-input.panel-form-width-200{ padding:5px; height:40px; width:200px;}
-input.panel-form-width-100{ padding:5px;width:100%; height:40px; min-width:700px;}
-textarea.panel-form-width-100{ padding:5px;width:100%; height:150px; min-width:700px;}
-textarea.panel-form-width-40{ padding:5px;width:100%; height: 40px; min-width:700px;}
-textarea.panel-form-width-690{ padding:5px;width:90%; height:150px; min-width:700px;}
-textarea.panel-form-width2-100{ padding:5px;width:100%; height:40px; min-width:700px;}
-textarea.panel-form-width2-690{ padding:5px;width:90%; height:40px; min-width:700px;}
-textarea.panel-form-width2-695{ padding:5px;width:95%; height:40px; min-width:700px;}
-.panel-form-width-670{ width: 670px; padding:5px;}
-.panel-form-height-150{ height: 150px;}
-.panel-form-height-30{height: 30px;}
-.task-bg-grey{ background:#f3f3f3!important; width:90%; min-width:700px; padding:10px; border:1px solid #f3f3f3;}
-.task-bg-grey-ligh{line-height: 1.9;padding:5px 10px;}
-.task-bg-grey li{ margin-bottom: 0}
-.task-bd-grey{width:680px; padding:10 0px;}
-.panel-form-width-690{ padding:5px;width:90%; min-height:40px; min-width:700px;}
-input.task-tag-input{ border:none; background: none; height:30px; padding:0 5px; color:#888; line-height: 30px;}
-textarea.task-textarea-pd{ padding-bottom: 0; padding-top:0;}
-.task-setting-tab{ min-height:600px;}
-.task-pd15-box{ padding:15px;}
-.mb20{margin-bottom: 20px;}
-input.knowledge_frame{height:28px;line-height:28px;border:none;background:#f3f5f7;}
+.panel-form-label {
+  display: inline-block;
+  width: 10%;
+  min-width: 90px;
+  text-align: right;
+  line-height: 40px;
+  color: #666;
+}
+
+.panel-form-label1 {
+  display: inline-block;
+  width: 20%;
+  min-width: 90px;
+  text-align: right;
+  line-height: 40px;
+}
+
+.panel-form input,
+.panel-form textarea {
+  border: 1px solid #e2e2e2;
+  color: #666;
+  line-height: 1.9;
+}
+
+.panel-box-sizing {
+  -moz-box-sizing: border-box;
+  /*Firefox3.5+*/
+  -webkit-box-sizing: border-box;
+  /*Safari3.2+*/
+  -o-box-sizing: border-box;
+  /*Opera9.6*/
+  -ms-box-sizing: border-box;
+  /*IE8*/
+  box-sizing: border-box;
+}
+
+input.panel-form-width-690 {
+  padding: 5px;
+  width: 90%;
+  height: 40px;
+  min-width: 700px;
+}
+
+input.panel-form-width-200 {
+  padding: 5px;
+  height: 40px;
+  width: 200px;
+}
+
+input.panel-form-width-100 {
+  padding: 5px;
+  width: 100%;
+  height: 40px;
+  min-width: 700px;
+}
+
+textarea.panel-form-width-100 {
+  padding: 5px;
+  width: 100%;
+  height: 150px;
+  min-width: 700px;
+}
+
+textarea.panel-form-width-40 {
+  padding: 5px;
+  width: 100%;
+  height: 40px;
+  min-width: 700px;
+}
+
+textarea.panel-form-width-690 {
+  padding: 5px;
+  width: 90%;
+  height: 150px;
+  min-width: 700px;
+}
+
+textarea.panel-form-width2-100 {
+  padding: 5px;
+  width: 100%;
+  height: 40px;
+  min-width: 700px;
+}
+
+textarea.panel-form-width2-690 {
+  padding: 5px;
+  width: 90%;
+  height: 40px;
+  min-width: 700px;
+}
+
+textarea.panel-form-width2-695 {
+  padding: 5px;
+  width: 95%;
+  height: 40px;
+  min-width: 700px;
+}
+
+.panel-form-width-670 {
+  width: 670px;
+  padding: 5px;
+}
+
+.panel-form-height-150 {
+  height: 150px;
+}
+
+.panel-form-height-30 {
+  height: 30px;
+}
+
+.task-bg-grey {
+  background: #f3f3f3 !important;
+  width: 90%;
+  min-width: 700px;
+  padding: 10px;
+  border: 1px solid #f3f3f3;
+}
+
+.task-bg-grey-ligh {
+  line-height: 1.9;
+  padding: 5px 10px;
+}
+
+.task-bg-grey li {
+  margin-bottom: 0
+}
+
+.task-bd-grey {
+  width: 680px;
+  padding: 10 0px;
+}
+
+.panel-form-width-690 {
+  padding: 5px;
+  width: 90%;
+  min-height: 40px;
+  min-width: 700px;
+}
+
+input.task-tag-input {
+  border: none;
+  background: none;
+  height: 30px;
+  padding: 0 5px;
+  color: #888;
+  line-height: 30px;
+}
+
+textarea.task-textarea-pd {
+  padding-bottom: 0;
+  padding-top: 0;
+}
+
+.task-setting-tab {
+  min-height: 600px;
+}
+
+.task-pd15-box {
+  padding: 15px;
+}
+
+.mb20 {
+  margin-bottom: 20px;
+}
+
+input.knowledge_frame {
+  height: 28px;
+  line-height: 28px;
+  border: none;
+  background: #f3f5f7;
+}
+
 /* TPi全屏展示css */
-.content-all-fix{  position: absolute; top:75px; left:15px; right:15px; z-index:99; height: 91%; width: 98.5%;}
-.content-all-fix .big-tab-info-inner{ display: block; height:50%; overflow:auto; margin:15px 0 0px 15px; }
-.content-half-fix{ min-width:450px; margin:0; position: absolute; top:75px; left:15px; z-index:99;}
-.content-half-fix .content-history-inner{height:100%; overflow:auto; }
-.content-half-fix02{margin:0; position: absolute; top:65px; z-index:99; right:45px;}
-.content-history-extend{ height: 98%;overflow:auto;}
-.task-bg-grey .prettyprint{font-size: 9pt;font-family: Courier New,Arial;border: 1px solid #ddd;border-left: 5px solid #6CE26C;background: #f6f6f6;padding: 5px;}
+.content-all-fix {
+  position: absolute;
+  top: 75px;
+  left: 15px;
+  right: 15px;
+  z-index: 99;
+  height: 91%;
+  width: 98.5%;
+}
+
+.content-all-fix .big-tab-info-inner {
+  display: block;
+  height: 50%;
+  overflow: auto;
+  margin: 15px 0 0px 15px;
+}
+
+.content-half-fix {
+  min-width: 450px;
+  margin: 0;
+  position: absolute;
+  top: 75px;
+  left: 15px;
+  z-index: 99;
+}
+
+.content-half-fix .content-history-inner {
+  height: 100%;
+  overflow: auto;
+}
+
+.content-half-fix02 {
+  margin: 0;
+  position: absolute;
+  top: 65px;
+  z-index: 99;
+  right: 45px;
+}
+
+.content-history-extend {
+  height: 98%;
+  overflow: auto;
+}
+
+.task-bg-grey .prettyprint {
+  font-size: 9pt;
+  font-family: Courier New, Arial;
+  border: 1px solid #ddd;
+  border-left: 5px solid #6CE26C;
+  background: #f6f6f6;
+  padding: 5px;
+}
+
 /* 左右版TPI 20170410byLB */
-#game_task_pass img{cursor: pointer}
-.-fit { position: absolute; top: 0;  right: 0;  bottom: 0;  left: 0;}
-.-layout-v { display: flex; flex-direction: column;box-flex-direction: column;-webkit-flex-direction: column;}
-.page--header { position: fixed;top: 0; left:80px; right: 0; z-index: 7000;background:#33485F; height:44px; padding:10px 0; color:#fff;}
-.page--leftnav{position: fixed;top:0; left:0; right: 0; z-index: 9001;width:80px; height:100%;background:#282c37;}
-.page--body { position: relative;}
-.-margin-t-64 { margin-top: 64px;}
-.-flex { box-flex:1;flex:1;-webkit-flex:1;}
+#game_task_pass img {
+  cursor: pointer
+}
+
+.-fit {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
+
+.-layout-v {
+  display: flex;
+  flex-direction: column;
+  -webkit-flex-direction: column;
+}
+
+.page--header {
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 7000;
+  height: 44px;
+  color: #fff;
+  background: #05101A;
+  left: 0px;
+  padding: 5px 0;
+}
+
+.page--leftnav {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 9001;
+  width: 80px;
+  height: 100%;
+  background: #282c37;
+}
+
+.page--body {
+  position: relative;
+  margin-top: 54px;
+}
+
+.-margin-t-64 {
+  margin-top: 64px;
+}
+
+.-flex {
+  box-flex: 1;
+  flex: 1;
+  -webkit-flex: 1;
+}
+
 /*.-flex-auto{flex-basis:100%;}*/
-.split-panel.-fit {position: absolute;}
-.split-panel { position: relative;  overflow: hidden;  min-height: 200px; height: 100%;}
-.-stretch { align-items: stretch;}
-.-layout { display: flex;}
-.split-panel--first { overflow: hidden;}
-.-relative { position: relative;}
-.-bg-white { background-color: #eee;}
-.split-panel.-handle .split-panel--second { padding-left: 2px;}
-/* .split-panel--second { overflow: hidden;} */
-.task-answer-view { position: absolute; top: 0; right: 0; bottom: 0;left: 0; display: flex;
-    flex-direction: column; border-top: 1px solid #515151;}
-.-vertical { flex-direction: column;box-flex-direction: column;-webkit-flex-direction: column;}
-.-layout-h { display: flex;flex-direction: row;box-flex-direction: row;-webkit-flex-direction: row;}
-.-horizontal {flex-direction: row-reverse;box-flex-direction: row-reverse;-webkit-flex-direction: row-reverse;}
-.-scroll{ overflow:auto;}
-.-flex-basic0{flex-basis: 0%!important;box-flex-basis: 0%!important;-webkit-flex-basis: 0%!important; display: none}
+.split-panel.-fit {
+  position: absolute;
+}
+
+.split-panel {
+  position: relative;
+  overflow: hidden;
+  min-height: 200px;
+  height: 100%;
+}
+
+.-stretch {
+  align-items: stretch;
+}
+
+.-layout {
+  display: flex;
+}
+
+.split-panel--first {
+  overflow: hidden;
+}
+
+.-relative {
+  position: relative;
+}
+
+.-bg-white {
+  background-color: #eee;
+}
+
+.split-panel.-handle .split-panel--second {
+  padding-left: 2px;
+}
+
+.task-answer-view {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  display: flex;
+  flex-direction: column;
+  border-top: 1px solid #515151;
+}
+
+.-vertical {
+  flex-direction: column;
+  box-flex-direction: column;
+  -webkit-flex-direction: column;
+}
+
+.-layout-h {
+  display: flex;
+  flex-direction: row;
+  box-flex-direction: row;
+  -webkit-flex-direction: row;
+}
+
+.-horizontal {
+  flex-direction: row-reverse;
+  box-flex-direction: row-reverse;
+  -webkit-flex-direction: row-reverse;
+}
+
+.-scroll {
+  overflow: auto;
+}
+
+.-flex-basic0 {
+  flex-basis: 0% !important;
+  box-flex-basis: 0% !important;
+  -webkit-flex-basis: 0% !important;
+  display: none
+}
+
 /*王昌------------拖拽增加样式---------------修改*/
-.-flex-basic40{width:40%;box-flex:auto;flex:auto;-webkit-flex:auto;}
-.-flex-basic50{width:60%;box-flex:auto;flex:auto;-webkit-flex:auto;}
-.b-label{width:4px;cursor:ew-resize;background:#2b2b2b;}
-.h-center{height:4px;cursor:ns-resize;background:#333;}
-.-changebg{height:3px;}
-.-brother{width:100%;height:100%;position:absolute;left:0;top:0;z-index:999;}
-.-bg-weightblack{background:#000;}
-.-flex-basic70{box-flex:4 9 auto;flex:4 9 auto;-webkit-flex:4 9 auto;height:70%;}
+.-flex-basic40 {
+  width: 40%;
+  box-flex: auto;
+  flex: auto;
+  -webkit-flex: auto;
+}
+
+.-flex-basic50 {
+  width: 60%;
+  box-flex: auto;
+  flex: auto;
+  -webkit-flex: auto;
+}
+
+.b-label {
+  width: 4px;
+  cursor: ew-resize;
+  background: #2b2b2b;
+}
+
+.h-center {
+  height: 4px;
+  cursor: ns-resize;
+  background: #333;
+}
+
+.-changebg {
+  height: 3px;
+}
+
+.-brother {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 999;
+}
+
+.-bg-weightblack {
+  background: #000;
+}
+
+.-flex-basic70 {
+  box-flex: 4 9 auto;
+  flex: 4 9 auto;
+  -webkit-flex: 4 9 auto;
+  height: 70%;
+}
+
 /*---------------------------------------------*/
-.-flex-basic60{box-flex:2 1 auto;flex:2 1 auto;-webkit-flex:2 1 auto;height:30%;}
-.-flex-basic100{flex-basis: 100%!important;box-flex-basis: 100%!important;-webkit-flex-basis: 100%!important;}
-.-header-title{ max-width:500px; font-weight: normal;}
-.-header-right{ background:#333;border-radius:25px; padding:5px 15px; height: 30px; position: absolute; right:10px;line-height: 30px;}
-.-header-right-info{ padding:10px; background:#fff; border-radius:3px; top:50px; right:10px;   position: relative;display:none;color:#666;}
-.-header-right-info font { border: 1px solid #dddddd; display: block;border-width: 8px;  position: absolute;  top: -15px;right:20px;border-style: solid; border-color: transparent transparent #fff transparent;  font-size: 0; line-height: 0;}
-.-header-right-box:hover .-header-right-info{ display: block;}
-.-task-bar-bg{ width: 160px; height:15px; border-radius:15px; background:#ff9932; color:#fff; font-size: 12px; line-height: 15px; text-align: right; position: relative; padding-right:10px;}
-.-task-bar-inner{background:#ffc100; display: block; height: 15px;border-radius:15px; position: absolute; top:0; left:0;}
-.-task-widht-10{ width: 10%;}
-.-task-widht-20{ width: 20%;}
-.-task-widht-30{ width: 30%;}
-.-task-widht-40{ width: 40%;}
-.-task-widht-50{ width: 50%;}
-.-task-widht-60{ width: 60%;}
-.-task-widht-70{ width: 70%;}
-.-task-widht-80{ width: 80%;}
-.-task-widht-90{ width: 90%;}
-.-task-widht-100{ width: 100%;}
-.-footer-left{min-height:48px;background:#f5f5f5;}
-.-footer-left ul {width: 100%}
-.-footer-left ul li{ cursor: pointer; color:#666;}
-.-footer-left ul li:hover{ color:#888;}
-.-bg-black{ background:#2b2b2b; color:#f4f1ed;}
-.-bg-darkblack{background:#1D1D1D; color: #fff;}
-.task-answer-view{ border-top:1px solid #515151; background:#333;}
-#blacktab_nav {height:40px;background:#292929; }
-#blacktab_nav li {float:left; padding:0px 50px;text-align:center;height: 40px;line-height: 40px;  }
-#blacktab_nav .add-webssh{position:relative;}
-#blacktab_nav .add-webssh span{position:absolute;top:0;right:5px;color:#fff;cursor:pointer;}
-#blacktab_nav li a{font-size:14px; }
-#blacktab_nav li.code-file-tab{padding: 0px;width: 120px;box-sizing: border-box;padding: 0px 15px;}
-.code-flie-list{display:none;position: absolute;z-index: 5;top:40px;background: #515151;width: 300px;left: 0px;color: #fff;}
-.blue-line{border-left: 3px solid #199ED8!important;padding-left: 5px;}
-.codefile-all{max-height: 122px;overflow-y: auto;overflow-x: hidden;}
-.codefile-all p{text-align: left;cursor: pointer;height: 22px;line-height: 22px;margin-bottom: 3px;padding-left: 5px;border-left: 3px solid #515151;width: 273px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
-.codefile-all p:hover{background: #CCCCCC;color: #333;}
+.-flex-basic60 {
+  box-flex: 2 1 auto;
+  flex: 2 1 auto;
+  -webkit-flex: 2 1 auto;
+  height: 30%;
+}
+
+.-flex-basic100 {
+  flex-basis: 100% !important;
+  box-flex-basis: 100% !important;
+  -webkit-flex-basis: 100% !important;
+}
+
+.-header-title {
+  max-width: 500px;
+  font-weight: normal;
+}
+
+.-header-right {
+  background: #333;
+  border-radius: 25px;
+  padding: 5px 15px;
+  height: 30px;
+  position: absolute;
+  right: 10px;
+  line-height: 30px;
+}
+
+.-header-right-info {
+  padding: 10px;
+  background: #fff;
+  border-radius: 3px;
+  top: 50px;
+  right: 10px;
+  position: relative;
+  display: none;
+  color: #666;
+}
+
+.-header-right-info font {
+  border: 1px solid #dddddd;
+  display: block;
+  border-width: 8px;
+  position: absolute;
+  top: -15px;
+  right: 20px;
+  border-style: solid;
+  border-color: transparent transparent #fff transparent;
+  font-size: 0;
+  line-height: 0;
+}
+
+.-header-right-box:hover .-header-right-info {
+  display: block;
+}
+
+.-task-bar-bg {
+  width: 160px;
+  height: 15px;
+  border-radius: 15px;
+  background: #ff9932;
+  color: #fff;
+  font-size: 12px;
+  line-height: 15px;
+  text-align: right;
+  position: relative;
+  padding-right: 10px;
+}
+
+.-task-bar-inner {
+  background: #ffc100;
+  display: block;
+  height: 15px;
+  border-radius: 15px;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.-task-widht-10 {
+  width: 10%;
+}
+
+.-task-widht-20 {
+  width: 20%;
+}
+
+.-task-widht-30 {
+  width: 30%;
+}
+
+.-task-widht-40 {
+  width: 40%;
+}
+
+.-task-widht-50 {
+  width: 50%;
+}
+
+.-task-widht-60 {
+  width: 60%;
+}
+
+.-task-widht-70 {
+  width: 70%;
+}
+
+.-task-widht-80 {
+  width: 80%;
+}
+
+.-task-widht-90 {
+  width: 90%;
+}
+
+.-task-widht-100 {
+  width: 100%;
+}
+
+.-footer-left {
+  min-height: 48px;
+  background: #f5f5f5;
+}
+
+.-footer-left ul {
+  width: 100%
+}
+
+.-footer-left ul li {
+  cursor: pointer;
+  color: #666;
+}
+
+.-footer-left ul li:hover {
+  color: #888;
+}
+
+.-bg-black {
+  background: #2b2b2b;
+  color: #f4f1ed;
+}
+
+.-bg-darkblack {
+  background: #1D1D1D;
+  color: #fff;
+}
+
+.task-answer-view {
+  border-top: 1px solid #515151;
+  background: #333;
+}
+
+#blacktab_nav {
+  height: 40px;
+  background: #292929;
+}
+
+#blacktab_nav li {
+  float: left;
+  padding: 0px 50px;
+  text-align: center;
+  height: 40px;
+  line-height: 40px;
+}
+
+#blacktab_nav .add-webssh {
+  position: relative;
+}
+
+#blacktab_nav .add-webssh span {
+  position: absolute;
+  top: 0;
+  right: 5px;
+  color: #fff;
+  cursor: pointer;
+}
+
+#blacktab_nav li a {
+  font-size: 14px;
+}
+
+#blacktab_nav li.code-file-tab {
+  padding: 0px;
+  width: 120px;
+  box-sizing: border-box;
+  padding: 0px 15px;
+}
+
+.code-flie-list {
+  display: none;
+  position: absolute;
+  z-index: 5;
+  top: 40px;
+  background: #515151;
+  width: 300px;
+  left: 0px;
+  color: #fff;
+}
+
+.blue-line {
+  border-left: 3px solid #199ED8 !important;
+  padding-left: 5px;
+}
+
+.codefile-all {
+  max-height: 122px;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+.codefile-all p {
+  text-align: left;
+  cursor: pointer;
+  height: 22px;
+  line-height: 22px;
+  margin-bottom: 3px;
+  padding-left: 5px;
+  border-left: 3px solid #515151;
+  width: 273px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.codefile-all p:hover {
+  background: #CCCCCC;
+  color: #333;
+}
+
+.blacktab_hover a {
+  color: #fff;
+}
+
+.-task-ces-top {
+  padding: 5px 15px;
+  background: #515151;
+  color: #bfbfbf;
+}
+
+.-task-ces-info-left {
+  display: inline-block;
+  width: 100px;
+  text-align: right;
+}
+
+.-position-a-r15 {
+  position: absolute;
+  top: 5px;
+  right: 15px;
+}
+
+.-task-ml80 {
+  margin-left: 80px;
+}
+
+.page--over {
+  position: fixed;
+  top: 0;
+  left: 80px;
+  right: 0;
+  z-index: 8000;
+  height: 100%;
+  color: #fff;
+}
+
+.-task-list-header {
+  border-bottom: 1px solid #eee;
+  padding: 5px 15px;
+  color: #898989;
+  font-size: 14px;
+  font-weight: normal;
+}
+
+.-task-list-header h3 {
+  font-weight: normal;
+  font-size: 16px;
+  color: #333;
+}
+
+.-task-list-inner {
+  background: #EFF2F7;
+  margin: 10px;
+  padding: 5px;
+}
+
+.-task-list-title {
+  font-size: 14px;
+  color: #666;
+  word-wrap: break-word;
+  font-weight: normal;
+  max-width: 80%;
+}
+
+.greytab-inner {
+  background: #fff;
+}
+
+.blacktab-inner {
+  background: #333;
+}
+
+.task-padding16 {
+  padding: 16px;
+}
+
+.task-padding10 {
+  padding: 10px;
+}
+
+.task-padding-new {
+  padding-top: 16px
+}
 
-.blacktab_hover { background: #333;}
-.blacktab_hover a{ color:#fff; }
-.-task-ces-top{ padding:5px 15px; background:#515151; color:#bfbfbf;}
-.-task-ces-info-left{ display: inline-block; width:100px; text-align: right; }
-.-position-a-r15{ position: absolute; top:5px; right:15px;}
-.-task-ml80{ margin-left: 80px;}
-.page--over { position: fixed;top: 0; left:80px; right: 0; z-index:8000; height:100%; color:#fff;}
-.-task-list-header{  border-bottom:1px solid #eee; padding:5px 15px; color:#898989; font-size: 14px; font-weight: normal;}
-.-task-list-header h3{ font-weight: normal; font-size:16px; color:#333;}
-.-task-list-inner{ background:#EFF2F7; margin:10px; padding:5px;}
-.-task-list-title{ font-size: 14px; color: #666;word-wrap: break-word; font-weight: normal; max-width: 80%;}
-.greytab-inner{ background:#fff; }
-.blacktab-inner{ background:#333;}
-.task-padding16{ padding:16px;}
-.task-padding10{ padding:10px;}
-.task-padding-new{ padding-top: 16px}
 /* TPM统计 20170321byLB */
-.panel-warp-3{ width: 30%; background:#23b181; color:#fff; margin:2.5%; margin-right:0; position: relative; }
-.panel-warp-3-over{ background:#fff;opacity:0.8; color:#29bd8b; width: 100%; height:135px; position: absolute; top:0; left:0;  text-align: center; padding-top:130px;}
-.panel-warp-3-over a{color:#29bd8b; font-size: 18px; text-align:center; font-weight: bold;}
-.panel-warp-img{width: 30px; height: 30px; border-radius:100px;}
-.panel-warp-name{ display:block; max-width:100px;}
-.panel-warp-inner{ padding:15px;}
-.panel-warp-dbg{ background:#29bd8b; padding:15px; height:120px;}
-.panel-warp-dbg li{ margin-bottom:15px; }
-.panel-warp-dbg li:last-child{ margin-bottom:0;}
-.fa-icons-trophy{ position:relative; padding-top:10px;}
-.fa-icons-trophy span{ position:absolute; top:12px; right:10px; color:#f04b27; font-size:14px; font-weight: bold;}
-.fa-icons-flower{ display: inline-block; width: 14px; height: 14px; background:url("../images/task/icons-flower.png") 0 0 no-repeat;}
-.fa-icons-flower:hover{display:inline-block; width: 14px; height: 14px;background:url("../images/task/icons-flower.png") -18px 0 no-repeat;}
-/* 实训首页 20170330byLB */
-.task-index{ width: 1200px; margin:0 auto;}
-.task-index-head{     box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); }
-/*.task-index-head-top{background-image: linear-gradient(to right, rgb(106, 177, 216) 0%, rgb(1, 74, 78) 100%);background-color: rgb(1, 70, 74); padding:30px;}*/
+.panel-warp-3 {
+  width: 30%;
+  background: #23b181;
+  color: #fff;
+  margin: 2.5%;
+  margin-right: 0;
+  position: relative;
+}
 
-/*background: linear-gradient(to right, rgb(104, 177, 215) 0%, rgb(1,75,79) 100%);*/
-/*background: linear-gradient(to right,#5DDAE4,#23ADC9);*/
-.task-index-head-top{ padding:30px;background:#FCA24B;background: linear-gradient(to right, rgb(104, 177, 215) 0%, rgb(1,75,79) 100%);}
+.panel-warp-3-over {
+  background: #fff;
+  opacity: 0.8;
+  color: #29bd8b;
+  width: 100%;
+  height: 135px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  text-align: center;
+  padding-top: 130px;
+}
+
+.panel-warp-3-over a {
+  color: #29bd8b;
+  font-size: 18px;
+  text-align: center;
+  font-weight: bold;
+}
+
+.panel-warp-img {
+  width: 30px;
+  height: 30px;
+  border-radius: 100px;
+}
+
+.panel-warp-name {
+  display: block;
+  max-width: 100px;
+}
+
+.panel-warp-inner {
+  padding: 15px;
+}
+
+.panel-warp-dbg {
+  background: #29bd8b;
+  padding: 15px;
+  height: 120px;
+}
+
+.panel-warp-dbg li {
+  margin-bottom: 15px;
+}
+
+.panel-warp-dbg li:last-child {
+  margin-bottom: 0;
+}
+
+.fa-icons-trophy {
+  position: relative;
+  padding-top: 10px;
+}
+
+.fa-icons-trophy span {
+  position: absolute;
+  top: 12px;
+  right: 10px;
+  color: #f04b27;
+  font-size: 14px;
+  font-weight: bold;
+}
+
+.fa-icons-flower {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  background: url("../images/task/icons-flower.png") 0 0 no-repeat;
+}
+
+.fa-icons-flower:hover {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  background: url("../images/task/icons-flower.png") -18px 0 no-repeat;
+}
+
+/* 实训首页 20170330byLB */
+.task-index {
+  width: 1200px;
+  margin: 0 auto;
+}
+
+.task-index-head {
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);
+}
+
+.task-index-head-top {
+  padding: 30px;
+  background: #FCA24B;
+  background: linear-gradient(to right, rgb(104, 177, 215) 0%, rgb(1, 75, 79) 100%);
+}
 
 /*.task-index-head-top{ padding:30px;background:#FFA65E;}*/
-.top-xz{position: absolute;border:14px solid #FFFFFF;border-radius: 50%;box-shadow: 0px 2px 10px rgba(142,142,142,0.6);
-    opacity: 0.4;}
+.top-xz {
+  position: absolute;
+  border: 14px solid #FFFFFF;
+  border-radius: 50%;
+  box-shadow: 0px 2px 10px rgba(142, 142, 142, 0.6);
+  opacity: 0.4;
+}
 
-.task-index-head-top-course{padding:30px;background:linear-gradient(to right, rgb(69, 191, 165) 0%, rgb(164, 175, 247) 100%);}
-/*linear-gradient(to right, rgb(69, 191, 165) 0%, rgb(164, 175, 247) 100%);*/
-.task-inde-head-title{ color:#fff; }
-.task-index-head-info{ background:#fff; padding:10px 30px;}
-.task-index-head-info li{ width:100px; float: left; text-align: center;  color:#666;}
+.task-index-head-top-course {
+  padding: 30px;
+  background: linear-gradient(to right, rgb(69, 191, 165) 0%, rgb(164, 175, 247) 100%);
+}
 
-.task-index-list{ width: 1200px;}
+.task-inde-head-title {
+  color: #fff;
+}
+
+.task-index-head-info {
+  background: #fff;
+  padding: 10px 30px;
+}
+
+.task-index-head-info li {
+  width: 100px;
+  float: left;
+  text-align: center;
+  color: #666;
+}
+
+.task-index-list {
+  width: 1200px;
+}
 
 
-.task-index-list-box{box-sizing:border-box; width:23.87%;margin: 0 1.5% 30px 0px; border-radius:2px;border:1px solid #eee; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); color:#666; position:relative; }
-.task-index-list-box:hover{-webkit-animation: bounce-down 1s linear 1;animation: bounce-down 1s linear 1; }
-.task-index-list-box:hover .black-half{display: block;}
-.task-index-list-box:nth-child(4n+0) {margin: 0 0 30px 0;}
-.task-mg8{ margin:0 15px 15px 0px; border-radius:2px; border:1px solid #eee;    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); color:#666; position:relative; }
-.task-index-list-box-top{padding:16px; padding-top:30px; background:#fff; text-align: center; position:relative; height: 160px;}
-.task-index-list-title{ max-width:80%; display: block; margin:10px auto 0px; font-size:14px; font-weight: bold;}
-.task-index-list-user{padding:5px 10px; border-radius:25px;background: #F5F6F7; margin:0px auto 20px; display: inline-block;}
-.task-index-list-box-bottom{ background: #F5F6F7; color:#666; padding:10px 10%; text-align: center;}
-.task-index-list-box-bottom li{ display: inline; margin: 0 5px;}
-.task-index-list-box-bottom2{ background: #fff; color:#666; padding:10px 10%; text-align: center;}
-.task-index-list-box-bottom2 li{ display: inline; margin: 0 5px;}
-.task-vip{ position: absolute; right:15px; top:15px;}
+.task-index-list-box {
+  box-sizing: border-box;
+  width: 23.87%;
+  margin: 0 1.5% 30px 0px;
+  border-radius: 2px;
+  border: 1px solid #eee;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);
+  color: #666;
+  position: relative;
+}
+
+.task-index-list-box:hover {
+  -webkit-animation: bounce-down 1s linear 1;
+  animation: bounce-down 1s linear 1;
+}
+
+.task-index-list-box:hover .black-half {
+  display: block;
+}
+
+.task-index-list-box:nth-child(4n+0) {
+  margin: 0 0 30px 0;
+}
+
+.task-mg8 {
+  margin: 0 15px 15px 0px;
+  border-radius: 2px;
+  border: 1px solid #eee;
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);
+  color: #666;
+  position: relative;
+}
+
+.task-index-list-box-top {
+  padding: 16px;
+  padding-top: 30px;
+  background: #fff;
+  text-align: center;
+  position: relative;
+  height: 160px;
+}
+
+.task-index-list-title {
+  max-width: 80%;
+  display: block;
+  margin: 10px auto 0px;
+  font-size: 14px;
+  font-weight: bold;
+}
+
+.task-index-list-user {
+  padding: 5px 10px;
+  border-radius: 25px;
+  background: #F5F6F7;
+  margin: 0px auto 20px;
+  display: inline-block;
+}
+
+.task-index-list-box-bottom {
+  background: #F5F6F7;
+  color: #666;
+  padding: 10px 10%;
+  text-align: center;
+}
+
+.task-index-list-box-bottom li {
+  display: inline;
+  margin: 0 5px;
+}
+
+.task-index-list-box-bottom2 {
+  background: #fff;
+  color: #666;
+  padding: 10px 10%;
+  text-align: center;
+}
+
+.task-index-list-box-bottom2 li {
+  display: inline;
+  margin: 0 5px;
+}
+
+.task-vip {
+  position: absolute;
+  right: 15px;
+  top: 15px;
+}
+
 @-webkit-keyframes bounce-down {
-    25% {-webkit-transform: translateY(-10px);}
-    50%, 100% {-webkit-transform: translateY(0);}
+  25% {
+    -webkit-transform: translateY(-10px);
+  }
+
+  50%,
+  100% {
+    -webkit-transform: translateY(0);
+  }
 }
 
 @keyframes bounce-down {
-    25% {transform: translateY(-10px);}
-    50%, 100% {transform: translateY(0);}
-}
-.task-index-list-hover{ position:absolute; top:0; left:0; color:#fff;  width: 100%; height: 100%; border-radius:2px 2px 0 0; }
-.task-index-list-hover p{ margin:15px;overflow:hidden; text-align: left; height: 85%;}
-.task-index-list-hover{ display: none; }
-.task-mg8:hover .task-index-list-hover{display: block;}
-.task-mg8:hover{ box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.15);cursor: pointer;}
-.task-dropdown{}
-.task-dropdown-menu{ min-width: 100px; border: 1px solid rgba(0,0,0,.05);box-shadow: 0 6px 12px rgba(0,0,0,.15);}
-.task-dropdown-menu li a{ color:#666; }
-/* 伸展型搜索 20170330byLB */
-.search-wrapper {position: absolute; font-size:14px; }
-.search-wrapper .input-holder { overflow: hidden; height: 30px;  position: relative; width:32px;background: none;}
-.search-wrapper.active .input-holder { width:320px; border:none; border-bottom:2px solid #ccc;  }
-.search-wrapper .input-holder .search-input { width:100%; height: 30px; font-size:14px;   position: absolute; top:0px; left:0; border:none;   opacity: 0; }
-.search-wrapper.active .input-holder .search-input {  opacity: 1; outline:none; background: none;}
-.search-wrapper .search-icon { width:20px;  height:20px;  border:none;  padding:0px;  outline:none;  position: relative;  z-index: 2;  float:right;  cursor: pointer; background: none; color: #666; top:2px;}
-.search-wrapper .close { position: absolute; z-index: 1;  top:2px; right:20px; width:25px; height:25px; cursor: pointer; opacity: 0;color: #666;}
-.search-wrapper.active .close {right:-35px; opacity: 1;}
-a.sortArrowActiveD {background:url(../images/post_image_list.png) -0px -20px no-repeat; width:7px; height:9px; float:left; margin-top: 10px;margin-left: 5px;}
-a.sortArrowActiveU {background:url(../images/post_image_list.png) -17px -20px no-repeat; width:7px; height:9px; float:left; margin-left:5px; margin-top:10px;}
-.postSort {width:75px; float:right}
-.shixunPostSort {width:60px; float:right}
-.remove_li li{ list-style-type: none!important;}
+  25% {
+    transform: translateY(-10px);
+  }
 
-a.shixun-task-btn { display: inline-block;font-weight: bold;border: none;padding: 0 12px;color: #666;letter-spacing: 1px;text-align: center;font-size: 14px;height: 30px;line-height: 30px;border-radius: 3px; }
-a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weight: bold;border: none;padding: 0 12px;color: #666;letter-spacing: 1px;text-align: center;font-size: 14px;height: 30px;line-height: 30px;border-radius: 3px;  cursor: default;}
-.shixun-panel-list > div:nth-child(odd){ background:#f9f9f9; }
-.shixun-panel-list > div:nth-child(even){ background:#fff; }
-.shixun-panel-list {background: #fff; margin: 0 1px;}
-.shixun-panel-inner { background: #EFF2F7; padding: 15px; height: 70px;}
-.challange_operate{display: none}
-.shixun-panel-inner:hover .challange_operate{display: block}
-.shixun_title {color: #333;font-size: 16px;}
-.g_frame{border: 1px solid #29bd8b;color: #29bd8b;padding:0 5px;border-radius: 3px;text-align:center;}
-.loading-center{text-align: center; align-items: center;justify-content: center;}
-.center{vertical-align: middle;text-align: center; }
-.itoblock_w150{ display: block; float:left; width:150px }
-.itoblock_w75{ display: block; float:left; width:75px }
+  50%,
+  100% {
+    transform: translateY(0);
+  }
+}
+
+.task-index-list-hover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  color: #fff;
+  width: 100%;
+  height: 100%;
+  border-radius: 2px 2px 0 0;
+}
+
+.task-index-list-hover p {
+  margin: 15px;
+  overflow: hidden;
+  text-align: left;
+  height: 85%;
+}
+
+.task-index-list-hover {
+  display: none;
+}
+
+.task-mg8:hover .task-index-list-hover {
+  display: block;
+}
+
+.task-mg8:hover {
+  box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.15);
+  cursor: pointer;
+}
+
+.task-dropdown {}
+
+.task-dropdown-menu {
+  min-width: 100px;
+  border: 1px solid rgba(0, 0, 0, .05);
+  box-shadow: 0 6px 12px rgba(0, 0, 0, .15);
+}
+
+.task-dropdown-menu li a {
+  color: #666;
+}
+
+/* 伸展型搜索 20170330byLB */
+.search-wrapper {
+  position: absolute;
+  font-size: 14px;
+}
+
+.search-wrapper .input-holder {
+  overflow: hidden;
+  height: 30px;
+  position: relative;
+  width: 32px;
+  background: none;
+}
+
+.search-wrapper.active .input-holder {
+  width: 320px;
+  border: none;
+  border-bottom: 2px solid #ccc;
+}
+
+.search-wrapper .input-holder .search-input {
+  width: 100%;
+  height: 30px;
+  font-size: 14px;
+  position: absolute;
+  top: 0px;
+  left: 0;
+  border: none;
+  opacity: 0;
+}
+
+.search-wrapper.active .input-holder .search-input {
+  opacity: 1;
+  outline: none;
+  background: none;
+}
+
+.search-wrapper .search-icon {
+  width: 20px;
+  height: 20px;
+  border: none;
+  padding: 0px;
+  outline: none;
+  position: relative;
+  z-index: 2;
+  float: right;
+  cursor: pointer;
+  background: none;
+  color: #666;
+  top: 2px;
+}
+
+.search-wrapper .close {
+  position: absolute;
+  z-index: 1;
+  top: 2px;
+  right: 20px;
+  width: 25px;
+  height: 25px;
+  cursor: pointer;
+  opacity: 0;
+  color: #666;
+}
+
+.search-wrapper.active .close {
+  right: -35px;
+  opacity: 1;
+}
+
+a.sortArrowActiveD {
+  background: url(../images/post_image_list.png) -0px -20px no-repeat;
+  width: 7px;
+  height: 9px;
+  float: left;
+  margin-top: 10px;
+  margin-left: 5px;
+}
+
+a.sortArrowActiveU {
+  background: url(../images/post_image_list.png) -17px -20px no-repeat;
+  width: 7px;
+  height: 9px;
+  float: left;
+  margin-left: 5px;
+  margin-top: 10px;
+}
+
+.postSort {
+  width: 75px;
+  float: right
+}
+
+.shixunPostSort {
+  width: 60px;
+  float: right
+}
+
+.remove_li li {
+  list-style-type: none !important;
+}
+
+a.shixun-task-btn {
+  display: inline-block;
+  font-weight: bold;
+  border: none;
+  padding: 0 12px;
+  color: #666;
+  letter-spacing: 1px;
+  text-align: center;
+  font-size: 14px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 3px;
+}
+
+a.shixun-task-ban-btn {
+  background-color: #c2c4c6;
+  display: inline-block;
+  font-weight: bold;
+  border: none;
+  padding: 0 12px;
+  color: #666;
+  letter-spacing: 1px;
+  text-align: center;
+  font-size: 14px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 3px;
+  cursor: default;
+}
+
+.shixun-panel-list>div:nth-child(odd) {
+  background: #f9f9f9;
+}
+
+.shixun-panel-list>div:nth-child(even) {
+  background: #fff;
+}
+
+.shixun-panel-list {
+  background: #fff;
+  margin: 0 1px;
+}
+
+.shixun-panel-inner {
+  background: #EFF2F7;
+  padding: 15px;
+  height: 70px;
+}
+
+.challange_operate {
+  display: none
+}
+
+.shixun-panel-inner:hover .challange_operate {
+  display: block
+}
+
+.shixun_title {
+  color: #333;
+  font-size: 16px;
+}
+
+.g_frame {
+  border: 1px solid #29bd8b;
+  color: #29bd8b;
+  padding: 0 5px;
+  border-radius: 3px;
+  text-align: center;
+}
+
+.loading-center {
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+}
+
+.center {
+  vertical-align: middle;
+  text-align: center;
+}
+
+.itoblock_w150 {
+  display: block;
+  float: left;
+  width: 150px
+}
+
+.itoblock_w75 {
+  display: block;
+  float: left;
+  width: 75px
+}
 
 /*实训--技能勋章*/
-.modal-list li{float: left;padding: 0px 15px;background:#ff7500;color: #ffffff;border-radius: 4px;margin-right: 10px}
-.modal-list li:before{content: '●';color: #FFFFFF;margin-right: 5px;font-size: 14px}
-.modal-list span{width: 8px;height: 8px;border-radius: 50%;background: #ffffff;display: block;float: left;margin-right: 5px;margin-top:10px;}
+.modal-list li {
+  float: left;
+  padding: 0px 15px;
+  background: #ff7500;
+  color: #ffffff;
+  border-radius: 4px;
+  margin-right: 10px
+}
+
+.modal-list li:before {
+  content: '●';
+  color: #FFFFFF;
+  margin-right: 5px;
+  font-size: 14px
+}
+
+.modal-list span {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background: #ffffff;
+  display: block;
+  float: left;
+  margin-right: 5px;
+  margin-top: 10px;
+}
 
 /* 合作者 20170516byLB */
-.task-partner-list{ padding:15px; border-bottom:1px solid #eee;}
-.task-width33{ width:33.3%;}
+.task-partner-list {
+  padding: 15px;
+  border-bottom: 1px solid #eee;
+}
 
-.read_only{ -moz-user-select: none; -webkit-user-select: none; }
+.task-width33 {
+  width: 33.3%;
+}
 
-.task-form-28{width: 28%;padding:0px 10px}
+.read_only {
+  -moz-user-select: none;
+  -webkit-user-select: none;
+}
+
+.task-form-28 {
+  width: 28%;
+  padding: 0px 10px
+}
 
 
 /* 实训首页的搜索 */
-.xy_box{padding:16px;height:180px}
-.task_yx_bo{margin: 0px auto 13px;}
-.course-nav-box{padding:0px 10px;margin:30px 0px}
-.xy_level{width: 80%;margin: 0px auto;border-top: 1px solid #eee;margin-top: 5px;line-height: 35px;}
-.course-nav-row{padding:7px 0px}
-.course-nav-row_item li{width:auto;height: 30px;line-height: 30px;margin: 5px;padding:0px 15px;}
-.course-nav-row_item label{cursor: pointer;}
-.check_item{height:40px;line-height: 40px;padding: 0px 15px;}
-.more_check{position: absolute;bottom: 5px;right: 10px;cursor: pointer;}
+.xy_box {
+  padding: 16px;
+  height: 180px
+}
+
+.task_yx_bo {
+  margin: 0px auto 13px;
+}
+
+.course-nav-box {
+  padding: 0px 10px;
+  margin: 30px 0px
+}
+
+.xy_level {
+  width: 80%;
+  margin: 0px auto;
+  border-top: 1px solid #eee;
+  margin-top: 5px;
+  line-height: 35px;
+}
+
+.course-nav-row {
+  padding: 7px 0px
+}
+
+.course-nav-row_item li {
+  width: auto;
+  height: 30px;
+  line-height: 30px;
+  margin: 5px;
+  padding: 0px 15px;
+}
+
+.course-nav-row_item label {
+  cursor: pointer;
+}
+
+.check_item {
+  height: 40px;
+  line-height: 40px;
+  padding: 0px 15px;
+}
+
+.more_check {
+  position: absolute;
+  bottom: 5px;
+  right: 10px;
+  cursor: pointer;
+}
 
 
-.bottomdashed1{border-bottom: 1px dashed #eeeeee;}
+.bottomdashed1 {
+  border-bottom: 1px dashed #eeeeee;
+}
 
 /*更多和收起*/
-.two_line_lesson{height: 80px;overflow: hidden;}
-.more_line_lesson{max-height: 200px;display: block;}
-.scroll_lesson{overflow-x: hidden;overflow-y: scroll;}
+.two_line_lesson {
+  height: 80px;
+  overflow: hidden;
+}
 
-.searchFor{width:auto;}
-.searchFor .searchCon{width:250px;border-bottom:1px solid #cccccc;float: left;height: 30px;}
-.searchFor .searchCon input{border: none;outline: none;height: 29px;width:91%;}
-.searchFor .searchImg{margin:5px 10px 0px 0px;cursor: pointer;}
-.searchFor .search_close{font-size: 18px;float: right;color: #666;height: 29px;line-height: 29px;cursor: pointer;}
+.more_line_lesson {
+  max-height: 200px;
+  display: block;
+}
 
-.tab_color{color: #bfbfbf!important;}
+.scroll_lesson {
+  overflow-x: hidden;
+  overflow-y: scroll;
+}
+
+.searchFor {
+  width: auto;
+}
+
+.searchFor .searchCon {
+  width: 250px;
+  border-bottom: 1px solid #cccccc;
+  float: left;
+  height: 30px;
+}
+
+.searchFor .searchCon input {
+  border: none;
+  outline: none;
+  height: 29px;
+  width: 91%;
+}
+
+.searchFor .searchImg {
+  margin: 5px 10px 0px 0px;
+  cursor: pointer;
+}
+
+.searchFor .search_close {
+  font-size: 18px;
+  float: right;
+  color: #666;
+  height: 29px;
+  line-height: 29px;
+  cursor: pointer;
+}
+
+.tab_color {
+  color: #bfbfbf !important;
+}
 
 /*_game_show.html.erb页面新增的一个tab*/
-.comments_item_content img{border-radius: 50%;margin-right: 5px}
-.comment_item_one{flex: 1;}
-.comment_item_bottom{border-bottom: 1px solid #efefef;display: flex}
-.comment_item_top{border-top: 1px solid #efefef}
-.comment_item_left_green{border-left: 3px solid #29bd8b}
-.return_item{height: 20px;line-height: 20px;margin-top: 5px;}
-.comment-input{width: 100%;margin: 10px;margin-right: 17px;}
-.comment-input textarea{border: none !important;width:100%; outline: none;height: 30px;border-radius: 4px;padding-left: 5px;float:left}
-.comment_position{ position: absolute;bottom: 8px;right: 20px}
+.comments_item_content img {
+  border-radius: 50%;
+  margin-right: 5px
+}
+
+.comment_item_one {
+  flex: 1;
+}
+
+.comment_item_bottom {
+  border-bottom: 1px solid #efefef;
+  display: flex
+}
+
+.comment_item_top {
+  border-top: 1px solid #efefef
+}
+
+.comment_item_left_green {
+  border-left: 3px solid #29bd8b
+}
+
+.return_item {
+  height: 20px;
+  line-height: 20px;
+  margin-top: 5px;
+}
+
+.comment-input {
+  width: 100%;
+  margin: 10px;
+  margin-right: 17px;
+}
+
+.comment-input textarea {
+  border: none !important;
+  width: 100%;
+  outline: none;
+  height: 30px;
+  border-radius: 4px;
+  padding-left: 5px;
+  float: left
+}
+
+.comment_position {
+  position: absolute;
+  bottom: 8px;
+  right: 20px
+}
 
 /*-------新建阶段添加选项部分----------*/
-.option-item{border:1px solid #e2e2e2;}
-.option-item,.add-option-item{display: block;width: 38px;height: 38px;text-align: center;line-height: 38px;border-radius: 4px}
-.check-option-bg{background: #FF7500;color: #ffffff!important;border: 1px solid #FF7500}
-.add-option-input{padding: 5px;width: 90%;height: 40px;min-width: 700px;}
-.add-option-input a{display: block;width: 100%;height: 100%;cursor: pointer}
-.position-delete{position: absolute;right: -22px;top: 12px;cursor: pointer}
+.option-item {
+  border: 1px solid #e2e2e2;
+}
+
+.option-item,
+.add-option-item {
+  display: block;
+  width: 38px;
+  height: 38px;
+  text-align: center;
+  line-height: 38px;
+  border-radius: 4px
+}
+
+.check-option-bg {
+  background: #FF7500;
+  color: #ffffff !important;
+  border: 1px solid #FF7500
+}
+
+.add-option-input {
+  padding: 5px;
+  width: 90%;
+  height: 40px;
+  min-width: 700px;
+}
+
+.add-option-input a {
+  display: block;
+  width: 100%;
+  height: 100%;
+  cursor: pointer
+}
+
+.position-delete {
+  position: absolute;
+  right: -22px;
+  top: 12px;
+  cursor: pointer
+}
 
 /*--------TPI的答案选项卡------*/
-.quiz-task-options:not(.-compact) {padding:10px;}
-.card {position: relative;border-radius: 2px;overflow: hidden;}
+.quiz-task-options:not(.-compact) {
+  padding: 10px;
+}
+
+.card {
+  position: relative;
+  border-radius: 2px;
+  overflow: hidden;
+}
+
 /*.card:hover{background: #3f3f3f;}*/
-.card-check{background: #3498db!important;}
-.-justify {justify-content: space-between;}
-.-center { align-items: center;min-height: 66px;}
-.markdown {letter-spacing: 0;line-height: 1.6;word-wrap: break-word;word-break: break-word;}
-.markdown code {padding:0;line-height: 23px;margin: 0;font-family: "微软雅黑","宋体";}
+.card-check {
+  background: #3498db !important;
+}
+
+.-justify {
+  justify-content: space-between;
+}
+
+.-center {
+  align-items: center;
+  min-height: 66px;
+}
+
+.markdown {
+  letter-spacing: 0;
+  line-height: 1.6;
+  word-wrap: break-word;
+  word-break: break-word;
+}
+
+.markdown code {
+  padding: 0;
+  line-height: 23px;
+  margin: 0;
+  font-family: "微软雅黑", "宋体";
+}
 
 
 /*模拟实战---加载等待*/
-.loading_all{background:#ffffff;z-index: 100000;width: 100%;height: 100%;position: fixed;left: 0px;top:0px;text-align: center;}
-.loading_main img{border-radius: 4px;}
-.loading_main span{font-size: 44px;font-weight: bold;color: #ff7500;letter-spacing: 5px;margin-left: 5px;}
-.load{width: auto;top:50%;margin-top:-100px;position: relative;}
-.loading_seconde{color: #ff7500;letter-spacing: 3px;font-size: 16px;}
+.loading_all {
+  background: #ffffff;
+  z-index: 100000;
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  left: 0px;
+  top: 0px;
+  text-align: center;
+}
+
+.loading_main img {
+  border-radius: 4px;
+}
+
+.loading_main span {
+  font-size: 44px;
+  font-weight: bold;
+  color: #ff7500;
+  letter-spacing: 5px;
+  margin-left: 5px;
+}
+
+.load {
+  width: auto;
+  top: 50%;
+  margin-top: -100px;
+  position: relative;
+}
+
+.loading_seconde {
+  color: #ff7500;
+  letter-spacing: 3px;
+  font-size: 16px;
+}
+
 #ajax-indicator-base {
-    position: absolute; /* fixed not supported by IE*//*
+  position: absolute;
+  /* fixed not supported by IE*/
+  /*
 
     top: 50%;
     left: 50%;
@@ -399,126 +1999,484 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh
     margin-top: -40px;
     width: 20%;
     height: 5%; */
-    width: 100%;
-    height: 100%;
-    font-weight:bold;
-    text-align:center;
-    /*padding:0.6em;*/
-    z-index:9999;
-    background: rgba(225,225,225,0);
+  width: 100%;
+  height: 100%;
+  font-weight: bold;
+  text-align: center;
+  /*padding:0.6em;*/
+  z-index: 9999;
+  background: rgba(225, 225, 225, 0);
 }
-html>body #ajax-indicator-base { position: fixed; }
 
-#ajax-indicator-base embed{
-    position: relative;
-    top: 40%;
-    width: 40px;
-    height: 40px;
-    margin-left: -40px;
-    left: 50%;
+html>body #ajax-indicator-base {
+  position: fixed;
 }
+
+#ajax-indicator-base embed {
+  position: relative;
+  top: 40%;
+  width: 40px;
+  height: 40px;
+  margin-left: -40px;
+  left: 50%;
+}
+
 /*#ajax-indicator-base span{
     color:#fff;
     background-position: 0% 40%;
     background-repeat: no-repeat;
-    *//*background-image: url(/images/loading.gif);*//*
+    */
+/*background-image: url(/images/loading.gif);*/
+/*
     padding-left: 26px;
     vertical-align: bottom;
     z-index:999;
 }*/
 
-.save-tip{display:none;position: fixed;top:0px;left: 0px;width: 100%;height: 100%;}
-.save-tip-content{position: absolute;top:50%;left: 50%;margin-left: -36px;margin-top:-19px;background: rgba(0,0,0,0.7);color:#fff;padding:5px 15px;border-radius: 4px}
-.empty{background: #494A4C;display: inline; margin: 0 2px; padding: 0 3px;}
-.tab-key{background: #494A4C;display: inline; margin: 0 2px; padding: 0 6px;}
+.save-tip {
+  display: none;
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  height: 100%;
+}
+
+.save-tip-content {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  margin-left: -36px;
+  margin-top: -19px;
+  background: rgba(0, 0, 0, 0.7);
+  color: #fff;
+  padding: 5px 15px;
+  border-radius: 4px
+}
+
+.empty {
+  background: #494A4C;
+  display: inline;
+  margin: 0 2px;
+  padding: 0 3px;
+}
+
+.tab-key {
+  background: #494A4C;
+  display: inline;
+  margin: 0 2px;
+  padding: 0 6px;
+}
 
 /*二次回复的提示语的样式*/
-.points-data-tip-top{position:absolute;left:100px;top:-30px;opacity:.7;width:150px;height:30px;z-index:9999;display:none;}
-.data-tip-top1{position:relative;box-shadow:0px 0px 8px #000;background:#000;color:#fff;word-wrap: break-word;
-    text-align:center;border-radius:4px;padding:0 10px;border:1px solid #000;}
-.data-tip-top1:after,.data-tip-top1:before{position: absolute;content:'';width:0;height:0;left: 45%;bottom:-10px;border-left: 5px solid transparent;
-    border-right: 5px solid transparent;border-top: 10px solid #000;}
-.data-tip-top1:before{bottom:-11px;}
+.points-data-tip-top {
+  position: absolute;
+  left: 100px;
+  top: -30px;
+  opacity: .7;
+  width: 150px;
+  height: 30px;
+  z-index: 9999;
+  display: none;
+}
+
+.data-tip-top1 {
+  position: relative;
+  box-shadow: 0px 0px 8px #000;
+  background: #000;
+  color: #fff;
+  word-wrap: break-word;
+  text-align: center;
+  border-radius: 4px;
+  padding: 0 10px;
+  border: 1px solid #000;
+}
+
+.data-tip-top1:after,
+.data-tip-top1:before {
+  position: absolute;
+  content: '';
+  width: 0;
+  height: 0;
+  left: 45%;
+  bottom: -10px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top: 10px solid #000;
+}
+
+.data-tip-top1:before {
+  bottom: -11px;
+}
+
 /*选择题tab切换*/
-.nav_option li{overflow: hidden;width: 110px; text-align: center;cursor: pointer;height: 38px;line-height: 38px;border-top-right-radius: 5px;border-top-left-radius: 5px;border:1px solid #e2e2e2;border-bottom: 0px;color: #FF7500;border-right: none;}
-.nav_option li:last-child{border-right: 1px solid #e2e2e2;}
-.nav_option li a{width: 100%;height: 100%;display: block;}
+.nav_option li {
+  overflow: hidden;
+  width: 110px;
+  text-align: center;
+  cursor: pointer;
+  height: 38px;
+  line-height: 38px;
+  border-top-right-radius: 5px;
+  border-top-left-radius: 5px;
+  border: 1px solid #e2e2e2;
+  border-bottom: 0px;
+  color: #FF7500;
+  border-right: none;
+}
+
+.nav_option li:last-child {
+  border-right: 1px solid #e2e2e2;
+}
+
+.nav_option li a {
+  width: 100%;
+  height: 100%;
+  display: block;
+}
 
 /*---------------------试卷----------------------*/
-.question_item_con{font-weight: normal!important;border:1px solid #EEEEEE!important;color: #333!important;background: #FFFFff!important;position: relative}
-.exam_operator{cursor: pointer;position: absolute;right: 15px;top: 11px;}
-.question_item_con .write_answer{border-top:1px solid #EEEEEE;background:#EFF9FD;padding: 10px 15px;text-align:justify;}
-.add_item_part{width: auto;padding: 2px 20px;border: 1px solid #ff7500;border-radius: 3px;margin-left: 15px;cursor: pointer;color: #ff7500!important;}
-.add_item_part:hover{color:#fff!important;background-color: #ff7500}
+.question_item_con {
+  font-weight: normal !important;
+  border: 1px solid #EEEEEE !important;
+  color: #333 !important;
+  background: #FFFFff !important;
+  position: relative
+}
+
+.exam_operator {
+  cursor: pointer;
+  position: absolute;
+  right: 15px;
+  top: 11px;
+}
+
+.question_item_con .write_answer {
+  border-top: 1px solid #EEEEEE;
+  background: #EFF9FD;
+  padding: 10px 15px;
+  text-align: justify;
+}
+
+.add_item_part {
+  width: auto;
+  padding: 2px 20px;
+  border: 1px solid #ff7500;
+  border-radius: 3px;
+  margin-left: 15px;
+  cursor: pointer;
+  color: #ff7500 !important;
+}
+
+.add_item_part:hover {
+  color: #fff !important;
+  background-color: #ff7500
+}
 
 /*作业问答*/
-.work_search_ul{border: 1px solid #EEEEEE;border-radius: 4px;}
-.work_search_ul li span{display:block;float: left;height: 38px;line-height: 38px}
-.work_search_ul li{border-bottom: 1px dashed #EEEEEE;}
-.work_search_ul li:last-child{border-bottom: none}
-.work_search_ul .magic-radio + label,.work_search_ul .magic-checkbox + label{top:5px}
+.work_search_ul {
+  border: 1px solid #EEEEEE;
+  border-radius: 4px;
+}
+
+.work_search_ul li span {
+  display: block;
+  float: left;
+  height: 38px;
+  line-height: 38px
+}
+
+.work_search_ul li {
+  border-bottom: 1px dashed #EEEEEE;
+}
+
+.work_search_ul li:last-child {
+  border-bottom: none
+}
+
+.work_search_ul .magic-radio+label,
+.work_search_ul .magic-checkbox+label {
+  top: 5px
+}
 
 /*更新提示*/
-.update_back_main{display: none;position: fixed;left: 0px;top:0px;background: rgba(0,0,0,0.3);width: 100%;z-index: 7001;height: 100%;}
-.tip-panel-animate-left{position: absolute;z-index: 9000;left: 80px;top:290px;background: #FFFFff;width: 430px;height: 140px;border-radius: 3px;}
-.tip-panel-animate{position: absolute;z-index: 10001;right: 4px;top:40px;background: #FFFFff;width: 430px;height: 140px;border-radius: 3px;display: none}
-.tip-panel-animate .tip-img,.tip-panel-animate-left .tip-img{width: 130px;text-align: center;background-color: #E8E9ED;height: 100%;}
-.tip-panel-animate .tip-img img,.tip-panel-animate-left .tip-img img{width: 70px;height: 70px;margin: 35px 30px;}
-.tip-right-con{width: 69.7%;height: 100%;}
-.tip-operator-btn{width:100%;border-top: 1px solid #eee;height: 40px;position: absolute;right: 0px;bottom: 0px;text-align: center;}
-.tip-operator-btn a,.tip-operator-btn span{height: 100%;text-align: center;line-height: 40px;width: 50%}
-.tip-operator-btn a:hover,.tip-operator-btn span:hover{background-color:#f9f9f9}
-.tip-operator-btn a:first-child,.tip-operator-btn span:first-child{border-right: 1px solid #eee;width: 49.5%}
-.animate-tip{animation:rightToleft 1s;}
-.animate-tip-hide{animation:leftToright 1s;}
-@keyframes rightToleft
-{
-    from {right: -400px;}
-    to {right: 4px;}
-}
-@keyframes leftToright
-{
-    from {right: 4px;}
-    to {right: -420px;}
-}
-.animate-tip-l{animation:rightToleft-l 1s;}
-.animate-tip-hide-l{animation:leftToright-l 1s;}
-@keyframes rightToleft-l
-{
-    from {left: -400px;}
-    to {left: 80px;}
-}
-@keyframes leftToright-l
-{
-    from {left: 80px;}
-    to {left: -420px;}
+.update_back_main {
+  display: none;
+  position: fixed;
+  left: 0px;
+  top: 0px;
+  background: rgba(0, 0, 0, 0.3);
+  width: 100%;
+  z-index: 7001;
+  height: 100%;
 }
 
+.tip-panel-animate-left {
+  position: absolute;
+  z-index: 9000;
+  left: 80px;
+  top: 290px;
+  background: #FFFFff;
+  width: 430px;
+  height: 140px;
+  border-radius: 3px;
+}
+
+.tip-panel-animate {
+  position: absolute;
+  z-index: 10001;
+  right: 4px;
+  top: 40px;
+  background: #FFFFff;
+  width: 430px;
+  height: 140px;
+  border-radius: 3px;
+  display: none
+}
+
+.tip-panel-animate .tip-img,
+.tip-panel-animate-left .tip-img {
+  width: 130px;
+  text-align: center;
+  background-color: #E8E9ED;
+  height: 100%;
+}
+
+.tip-panel-animate .tip-img img,
+.tip-panel-animate-left .tip-img img {
+  width: 70px;
+  height: 70px;
+  margin: 35px 30px;
+}
+
+.tip-right-con {
+  width: 69.7%;
+  height: 100%;
+}
+
+.tip-operator-btn {
+  width: 100%;
+  border-top: 1px solid #eee;
+  height: 40px;
+  position: absolute;
+  right: 0px;
+  bottom: 0px;
+  text-align: center;
+}
+
+.tip-operator-btn a,
+.tip-operator-btn span {
+  height: 100%;
+  text-align: center;
+  line-height: 40px;
+  width: 50%
+}
+
+.tip-operator-btn a:hover,
+.tip-operator-btn span:hover {
+  background-color: #f9f9f9
+}
+
+.tip-operator-btn a:first-child,
+.tip-operator-btn span:first-child {
+  border-right: 1px solid #eee;
+  width: 49.5%
+}
+
+.animate-tip {
+  animation: rightToleft 1s;
+}
+
+.animate-tip-hide {
+  animation: leftToright 1s;
+}
+
+@keyframes rightToleft {
+  from {
+    right: -400px;
+  }
+
+  to {
+    right: 4px;
+  }
+}
+
+@keyframes leftToright {
+  from {
+    right: 4px;
+  }
+
+  to {
+    right: -420px;
+  }
+}
+
+.animate-tip-l {
+  animation: rightToleft-l 1s;
+}
+
+.animate-tip-hide-l {
+  animation: leftToright-l 1s;
+}
+
+@keyframes rightToleft-l {
+  from {
+    left: -400px;
+  }
+
+  to {
+    left: 80px;
+  }
+}
+
+@keyframes leftToright-l {
+  from {
+    left: 80px;
+  }
+
+  to {
+    left: -420px;
+  }
+}
 
 /*----------实训TPI图片查看效果--------------*/
-.photo_display{box-sizing: border-box;width: 100%;position: fixed;top: 0px;left: 0px;padding-top: 64px;padding-left: 80px;background: rgba(0,0,0,0);height: 100%;z-index: 100}
-.photo_display .task-popup{width: 100%!important;height: 100%!important;}
-#picture-content img{max-width: 100%;height: 400px;display: block; margin:0px auto;margin-bottom: 20px;}
-#box-img{width:100%;height:100%;display:table;text-align:center;background:#fff;}
-#box-img span{display:table-cell;vertical-align:middle;}
+.photo_display {
+  box-sizing: border-box;
+  width: 100%;
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  padding-top: 64px;
+  padding-left: 80px;
+  background: rgba(0, 0, 0, 0);
+  height: 100%;
+  z-index: 100
+}
+
+.photo_display .task-popup {
+  width: 100% !important;
+  height: 100% !important;
+}
+
+#picture-content img {
+  max-width: 100%;
+  height: 400px;
+  display: block;
+  margin: 0px auto;
+  margin-bottom: 20px;
+}
+
+#box-img {
+  width: 100%;
+  height: 100%;
+  display: table;
+  text-align: center;
+  background: #fff;
+}
+
+#box-img span {
+  display: table-cell;
+  vertical-align: middle;
+}
 
 /*-------------学员统计  通关排行榜------------*/
-.rankings_num{position: absolute;width: 100%;top: 3px;height: 15px;line-height: 15px;left: 0px;font-size: 12px;color: #F24B27;text-align: center}
+.rankings_num {
+  position: absolute;
+  width: 100%;
+  top: 3px;
+  height: 15px;
+  line-height: 15px;
+  left: 0px;
+  font-size: 12px;
+  color: #F24B27;
+  text-align: center
+}
 
-.census_main{width: 1086px;overflow: hidden;position: relative;min-height: 350px;margin:0px 45px;}
-.census_main ul{position: absolute;min-width: 1086px;}
-.census_main ul>li{float:left;width: 260px;margin:6px 6px;min-height: 335px}
-.census_main ul>li:nth-child(4n){margin-right: 0px;}
-.part_main{border-radius: 5px;background: #FFFFff;border:1px solid #EEEEEE}
-.part_main .part_top{background: #FF9E6A;color: #FFFFff;padding: 10px 15px;border-radius: 5px 5px 0px 0px;}
-.wipe{display: none;cursor: pointer;line-height: 332px;color:#FFFFff!important;font-size:16px ;width: 100%;position: absolute;left: 0px;top:0px;background:rgba(0,0,0,0.3);height: 100%;z-index: 3;text-align: center;border-radius: 5px; }
-.part_main:hover .wipe{display: block;}
+.census_main {
+  width: 1086px;
+  overflow: hidden;
+  position: relative;
+  min-height: 350px;
+  margin: 0px 45px;
+}
+
+.census_main ul {
+  position: absolute;
+  min-width: 1086px;
+}
+
+.census_main ul>li {
+  float: left;
+  width: 260px;
+  margin: 6px 6px;
+  min-height: 335px
+}
+
+.census_main ul>li:nth-child(4n) {
+  margin-right: 0px;
+}
+
+.part_main {
+  border-radius: 5px;
+  background: #FFFFff;
+  border: 1px solid #EEEEEE
+}
+
+.part_main .part_top {
+  background: #FF9E6A;
+  color: #FFFFff;
+  padding: 10px 15px;
+  border-radius: 5px 5px 0px 0px;
+}
+
+.wipe {
+  display: none;
+  cursor: pointer;
+  line-height: 332px;
+  color: #FFFFff !important;
+  font-size: 16px;
+  width: 100%;
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  background: rgba(0, 0, 0, 0.3);
+  height: 100%;
+  z-index: 3;
+  text-align: center;
+  border-radius: 5px;
+}
+
+.part_main:hover .wipe {
+  display: block;
+}
 
 
-#census_left,#census_right{display: none;position: absolute;cursor: pointer;background: #FCF2EC;padding: 10px 5px;width: 35px;box-sizing: border-box;top:122.5px;text-align: center}
-#census_left i,#census_right i{color:#FBBD81;}
+#census_left,
+#census_right {
+  display: none;
+  position: absolute;
+  cursor: pointer;
+  background: #FCF2EC;
+  padding: 10px 5px;
+  width: 35px;
+  box-sizing: border-box;
+  top: 122.5px;
+  text-align: center
+}
+
+#census_left i,
+#census_right i {
+  color: #FBBD81;
+}
 
 
 /*-----------实训配置、评测脚本-------------*/
-.edit_script_text .test_script_text{word-break: break-all;background-color: #f7f7f7;}
-.edit_script_text .CodeMirror-lines{padding: 0px!important;padding-bottom: 4px}
\ No newline at end of file
+.edit_script_text .test_script_text {
+  word-break: break-all;
+  background-color: #f7f7f7;
+}
+
+.edit_script_text .CodeMirror-lines {
+  padding: 0px !important;
+  padding-bottom: 4px
+}
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 0843aee7..70396e4c 100755
--- a/public/index.html
+++ b/public/index.html
@@ -1,103 +1,53 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
 
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+<head>
 
-    <meta name=”Keywords” Content=”EduCoder,信息技术实践教学,精品课程网,慕课MOOC″>
-    <meta name=”Keywords” Content=”实践课程,项目实战,java实训,python实战,人工智能技术,后端开发学习,移动开发入门″>
-    <meta name=”Keywords” Content=”翻转课堂,高效课堂创建,教学模式″>
-    <meta name=”Keywords” Content=”实训项目,python教程,C语言入门,java书,php后端开发,app前端开发,数据库技术″>
-    <meta name=”Keywords” Content=”在线竞赛,计算机应用大赛,编程大赛,大学生计算机设计大赛,全国高校绿色计算机大赛″>
-    <meta name=”Description” Content=”EduCoder是信息技术类实践教学平台。EduCoder涵盖了计算机、大数据、云计算、人工智能、软件工程、物联网等专业课程。超10000个实训案例及22000个技能评测点，建立学、练、评、测一体化实验环境。”>
-    <meta name=”Description” Content=”EduCoder实践课程，旨在于通过企业级实战实训案例，帮助众多程序员提升各项业务能力。解决学生、学员、企业员工等程序设计能力、算法设计能力、问题求解能力、应用开发能力、系统运维能力等。”>
-    <meta name=”Description” Content=”EduCoder翻转课堂教学模式，颠覆了传统教学模式，让教师与学生的关系由“权威”变成了“伙伴”。将学习的主动权转交给学生，使学生可个性化化学，学生的学习主体得到了彰显。”>
-    <meta name=”Description” Content=”EduCoder实训项目为单个知识点关卡实践训练，帮助学生巩固单一弱点，强化学习。 ”>
-    <meta name=”Description” Content=”EduCoder实践教学平台，各类大赛为进一步提高各类学生综合运用高级语言程序设计能力，培养创新意识和实践探索精神，发掘优秀软件人才。 ”>
-    <meta name="viewport" id="viewport" content="width=device-width, initial-scale=0.3, maximum-scale=0.3">
+  <meta charset="utf-8">
+  <meta name=”Keywords” Content=”EduCoder,信息技术实践教学,精品课程网,慕课MOOC″>
+  <meta name=”Keywords” Content=”实践课程,项目实战,java实训,python实战,人工智能技术,后端开发学习,移动开发入门″>
+  <meta name=”Keywords” Content=”翻转课堂,高效课堂创建,教学模式″>
+  <meta name=”Keywords” Content=”实训项目,python教程,C语言入门,java书,php后端开发,app前端开发,数据库技术″>
+  <meta name=”Keywords” Content=”在线竞赛,计算机应用大赛,编程大赛,大学生计算机设计大赛,全国高校绿色计算机大赛″>
+  <meta name=”Description”
+    Content=”EduCoder是信息技术类实践教学平台。EduCoder涵盖了计算机、大数据、云计算、人工智能、软件工程、物联网等专业课程。超10000个实训案例及22000个技能评测点，建立学、练、评、测一体化实验环境。”>
+  <meta name=”Description”
+    Content=”EduCoder实践课程，旨在于通过企业级实战实训案例，帮助众多程序员提升各项业务能力。解决学生、学员、企业员工等程序设计能力、算法设计能力、问题求解能力、应用开发能力、系统运维能力等。”>
+  <meta name=”Description”
+    Content=”EduCoder翻转课堂教学模式，颠覆了传统教学模式，让教师与学生的关系由“权威”变成了“伙伴”。将学习的主动权转交给学生，使学生可个性化化学，学生的学习主体得到了彰显。”>
+  <meta name=”Description” Content=”EduCoder实训项目为单个知识点关卡实践训练，帮助学生巩固单一弱点，强化学习。 ”>
+  <meta name=”Description” Content=”EduCoder实践教学平台，各类大赛为进一步提高各类学生综合运用高级语言程序设计能力，培养创新意识和实践探索精神，发掘优秀软件人才。 ”>
+  <meta name="theme-color" content="#000000">
+  <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
 
-    <meta name="theme-color" content="#000000">
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
+  <script type="text/javascript">
+    window.__isR = true;
+    if (
+      (navigator.userAgent.indexOf('MSIE 9') != -1
+        || navigator.userAgent.indexOf('MSIE 10') != -1)
+      &&
+      location.pathname.indexOf("/compatibility") == -1) {
+      location.href = '/compatibility.html'
+    }
+  </script>
 
-    <script type="text/javascript">
+  <link rel=" stylesheet" type="text/css" href="%PUBLIC_URL%css/iconfont.css">
+  <link rel=" stylesheet" type="text/css" href="%PUBLIC_URL%css/edu-purge.css">
+  <link rel="stylesheet" type="text/css" href="%PUBLIC_URL%css/editormd.min.css">
+  <link rel="stylesheet" type="text/css" href="%PUBLIC_URL%css/merge.css">
+  <%= htmlWebpackPlugin.tags.headTags %>
+</head>
 
-      window.__isR = true;
-      // 不支持ie9 ie10
-      if (
-          ( navigator.userAgent.indexOf('MSIE 9') != -1
-            || navigator.userAgent.indexOf('MSIE 10') != -1 )
-          &&
-          location.pathname.indexOf("/compatibility") == -1) {
-        debugger;
-        // location.href = './compatibility'
-        location.href = '/compatibility.html'
-      }
-      // const isMobile = (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase()));
-      const isWeiXin = (/MicroMessenger/i.test(navigator.userAgent.toLowerCase()));
-      if (isWeiXin) {
-        document.write('<script type="text/javascript" src="/javascripts/wx/jweixin-1.3.0.js"><\/script>');
-      }
-    </script>
-  
-    <link rel="stylesheet" type="text/css" href="/css/css_min_all.css">
-      <!--需要去build js配置-->
-      <link rel="stylesheet" type="text/css" href="/css/iconfont.css">
+<body>
+  <!--用于markdown转html -->
+  <div id="md_div" style="display: none;"></div>
+  <div id="root" class="page -layout-v -fit widthunit"></div>
+  <div id="picture_display" style="display: none;"></div>
+  <script src="%PUBLIC_URL%js/js_min_all.js"></script>
+  <script src="%PUBLIC_URL%js/codemirror/codemirror.js"></script>
+  <script src="%PUBLIC_URL%js/editormd/editormd.min.js"></script>
+  <script src="%PUBLIC_URL%js/codemirror/merge/merge.js"></script>
+  <%= htmlWebpackPlugin.tags.bodyTags %>
+</body>
 
-      <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.css">
-    <style>
-        /*<!--去除浏览器点击操作后有蓝色的底块-->*/
-        -moz-user-select: none;
-        -webkit-user-select: none;
-        -ms-user-select: none;
-        user-select: none;
-    </style>
-
-  </head>
-  <body>
-
-    <noscript>
-      You need to enable JavaScript to run this app.
-    </noscript>
-	<!--用于markdown转html -->
-    <div id="md_div" style="display: none;"></div>
-    <div id="root" class="page -layout-v -fit widthunit">
-      
-    </div>
-    <div id="picture_display" style="display: none;"></div>
-    <!-- js css合并  文件优先级的问题 -->
-    <script type="text/javascript" src="/js/js_min_all.js"></script>
-    
-    <!-- 在tpi js里加载这3个脚本 -->
-    <script>
-      (function() { // Scoping function to avoid globals
-	    var href = location.href;
-        if(window.location.port === "3007"){
-            if (href.indexOf('/tasks/') != -1) {
-                document.write('<script type="text/javascript" src="https://newweb.educoder.net/assets/kindeditor/kindeditor.js"><\/script>');
-                // build.js中会将这个url附加一个前缀 react/build
-                document.write('<script type="text/javascript" src="/js/create_kindeditor.js"><\/script>');
-                document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>');
-            } else if (href.indexOf('/paths/') != -1) {
-                document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>');
-
-            }
-        }else{
-            if (href.indexOf('/tasks/') != -1) {
-                document.write('<script type="text/javascript" src="/assets/kindeditor/kindeditor.js"><\/script>');
-                // build.js中会将这个url附加一个前缀 react/build
-                document.write('<script type="text/javascript" src="/js/create_kindeditor.js"><\/script>');
-                document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>');
-            } else if (href.indexOf('/paths/') != -1) {
-                document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>');
-
-            }
-        }
-
-
-      })();
-    </script>
-    <script type="text/javascript" src="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.js"></script>
-
-  </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/public/js/applications.js b/public/js/applications.js
index ad46a5aa..e99bf61c 100644
--- a/public/js/applications.js
+++ b/public/js/applications.js
@@ -11267,7 +11267,7 @@ Copyright © 2018 Basecamp, LLC
       type: "GET",
       dataType: "script",
       cache: true,
-      async: false,
+      async: true,
       global: false,
 
       // Only evaluate the response if it is successful (gh-4126)
diff --git a/public/js/create_kindeditor.js b/public/js/create_kindeditor.js
old mode 100755
new mode 100644
index 66f97665..fb762e36
--- a/public/js/create_kindeditor.js
+++ b/public/js/create_kindeditor.js
@@ -1,5 +1,5 @@
 //需求：表情栏可以隐藏显示，高度只要一点高
-function sd_create_editor(params){
+function sd_create_editor(params) {
     // var minHeight;  //最小高度
     var paramsHeight = params.height; //设定的高度
     var id = arguments[1] ? arguments[1] : undefined;
@@ -7,40 +7,40 @@ function sd_create_editor(params){
     var paramsWidth = params.width == undefined ? "100%" : params.width;
 
     var editor = params.kindutil.create(params.textarea, {
-        resizeType : 1,minWidth:"1px",width:"94%",
-        height:"33px",// == undefined ? "30px":paramsHeight+"px",
-        minHeight:"33px",// == undefined ? "30px":paramsHeight+"px",
-        width:params.width,
+        resizeType: 1, minWidth: "1px", width: "94%",
+        height: "33px",// == undefined ? "30px":paramsHeight+"px",
+        minHeight: "33px",// == undefined ? "30px":paramsHeight+"px",
+        width: params.width,
         /*
         items:['emoticons','fontname',
             'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
             'formatblock', 'fontsize', '|','indent', 'outdent',
             '|','imagedirectupload','more'],*/
-        items : ['code','emoticons','fontname',
-            'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
-            'formatblock', 'fontsize', '|','indent', 'outdent',
-            '|','imagedirectupload','table',   'media', 'preview',"more"
+        items: ['code', 'emoticons', 'fontname',
+            'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist', 'insertunorderedlist', '|',
+            'formatblock', 'fontsize', '|', 'indent', 'outdent',
+            '|', 'imagedirectupload', 'table', 'media', 'preview', "more"
         ],
-        afterChange:function(){//按键事件
+        afterChange: function () {//按键事件
             var edit = this.edit;
             var body = edit.doc.body;
             edit.iframe.height(paramsHeight);
-            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight+7))  , paramsHeight));
+            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight + 26 : body.offsetHeight + 7)), paramsHeight));
         },
-        afterBlur:function(){
+        afterBlur: function () {
             //params.toolbar_container.hide();
             params.textarea.blur();
-            sd_check_editor_form_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
-            if(this.isEmpty()) {
+            sd_check_editor_form_field({ content: this, contentmsg: params.contentmsg, textarea: params.textarea });
+            if (this.isEmpty()) {
                 this.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>我要回复</span>");
             }
             //params.toolbar_container.hide();
             $('#reply_image_' + id).addClass('imageFuzzy');
-            if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(this.edit.html())){
+            if (/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(this.edit.html())) {
                 params.submit_btn.hide();
                 params.toolbar_container.hide();
                 this.resize("100%", null);
-            }else if(this.edit.html().trim() != ""){
+            } else if (this.edit.html().trim() != "") {
                 params.submit_btn.show();
                 params.toolbar_container.show();
             }
@@ -48,10 +48,10 @@ function sd_create_editor(params){
             //params.submit_btn.css("display","none");
 
         },
-        afterFocus: function(){
+        afterFocus: function () {
             var edit = this.edit;
             var body = edit.doc.body;
-            if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())){
+            if (/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())) {
                 edit.html('');
             }
             params.submit_btn.show();
@@ -67,12 +67,12 @@ function sd_create_editor(params){
 
         },
 
-        afterCreate:function(){
+        afterCreate: function () {
             //params.submit_btn.hide();
-            var toolbar = $("div[class='ke-toolbar']",params.div_form);
-            toolbar.css('display','inline');
-            toolbar.css('padding',0);
-            $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
+            var toolbar = $("div[class='ke-toolbar']", params.div_form);
+            toolbar.css('display', 'inline');
+            toolbar.css('padding', 0);
+            $(".ke-outline>.ke-toolbar-icon", toolbar).append('表情');
             params.toolbar_container.append(toolbar);
             params.toolbar_container.hide();
             params.submit_btn.hide();
@@ -85,9 +85,9 @@ function sd_create_editor(params){
             paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
             edit.iframe.height(paramsHeight);
             edit.html("<span id='hint' style='color:#999999;font-size:12px;'>我要回复</span>");
-            this.resize(null,paramsHeight);// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
+            this.resize(null, paramsHeight);// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
             // params.toolbar_container.hide();
-            if(typeof enableAt === 'function'){
+            if (typeof enableAt === 'function') {
                 enableAt(this, id, type);
             }
         }
@@ -95,7 +95,7 @@ function sd_create_editor(params){
     return editor;
 }
 
-function sd_create_shixun_editor(params){
+function sd_create_shixun_editor(params) {
     // var minHeight;  //最小高度
     var paramsHeight = params.height; //设定的高度
     var id = arguments[1] ? arguments[1] : undefined;
@@ -103,20 +103,20 @@ function sd_create_shixun_editor(params){
     var paramsWidth = params.width == undefined ? "100%" : params.width;
 
     var editor = params.kindutil.create(params.textarea, {
-        resizeType : 1,minWidth:"1px",width:"94%",
-        height:"33px",// == undefined ? "30px":paramsHeight+"px",
-        minHeight:"33px",// == undefined ? "30px":paramsHeight+"px",
-        width:params.width,
+        resizeType: 1, minWidth: "1px", width: "94%",
+        height: "33px",// == undefined ? "30px":paramsHeight+"px",
+        minHeight: "33px",// == undefined ? "30px":paramsHeight+"px",
+        width: params.width,
         /*
          items:['emoticons','fontname',
          'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
          'formatblock', 'fontsize', '|','indent', 'outdent',
          '|','imagedirectupload','more'],*/
-        items : ['imagedirectupload'],
-        afterChange:function(){//按键事件
-            if(this.isEmpty() || this.edit.doc.body.innerText == '说点什么') {
-                $('#mini_comment_section').height('auto') 
-            } else { 
+        items: ['imagedirectupload'],
+        afterChange: function () {//按键事件
+            if (this.isEmpty() || this.edit.doc.body.innerText == '说点什么') {
+                $('#mini_comment_section').height('auto')
+            } else {
                 var edit = this.edit;
                 var body = edit.doc.body;
                 var newHeight = 0;
@@ -125,14 +125,14 @@ function sd_create_shixun_editor(params){
                 if (FF) {   // 火狐下处理方式不一样
                     newHeight = $(body).height()
                 } else {
-                    $(body).children().each(function(){newHeight+=$(this).height()});
+                    $(body).children().each(function () { newHeight += $(this).height() });
                 }
                 // var newHeight = $(body).height()
-                
+
                 var maxHeight = 357 // $(window).height() - 150 - 57; //  150 上部距离  57 下部距离
 
                 newHeight = newHeight <= maxHeight ? newHeight : maxHeight
-                
+
 
                 if (newHeight > 150) {
                     if (FF) {   // 火狐下处理方式不一样
@@ -140,9 +140,9 @@ function sd_create_shixun_editor(params){
                     } else {
                         this.resize("100%", newHeight + 'px');
                     }
-                    $('#mini_comment_section').height(newHeight+57)
+                    $('#mini_comment_section').height(newHeight + 57)
                 } else {
-                    this.resize("100%",  '150px');
+                    this.resize("100%", '150px');
                     $('#mini_comment_section').height('auto')
                 }
             }
@@ -150,19 +150,19 @@ function sd_create_shixun_editor(params){
             //edit.iframe.height(paramsHeight);
             //this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight+7))  , 15));
         },
-        afterBlur:function(){
+        afterBlur: function () {
             //params.toolbar_container.hide();
             params.textarea.blur();
-            sd_check_editor_form_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
-            if(this.isEmpty()) {
+            sd_check_editor_form_field({ content: this, contentmsg: params.contentmsg, textarea: params.textarea });
+            if (this.isEmpty()) {
                 $('#mini_comment_section').height('auto')
                 this.edit.html("<span id='hint' style='color:#999999;font-size:14px;'>说点什么</span>");
                 params.submit_btn.hide();
                 params.toolbar_container.hide();
                 this.resize("100%", "30px");
                 $("#dis_reply_id").val("");
-                if($("#editor_panel").length>0){
-                    $("#editor_panel").attr("style","margin-top:9px;flex: 1;");
+                if ($("#editor_panel").length > 0) {
+                    $("#editor_panel").attr("style", "margin-top:9px;flex: 1;");
                     $("#editor_panel").parents("form").addClass("df")
                 }
             }
@@ -180,10 +180,10 @@ function sd_create_shixun_editor(params){
 
             // $('#mini_comment_section').height('auto')
         },
-        afterFocus: function(){
+        afterFocus: function () {
             var edit = this.edit;
             var body = edit.doc.body;
-            if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())){
+            if (/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(edit.html())) {
                 edit.html("");
             }
             params.submit_btn.show();
@@ -192,14 +192,14 @@ function sd_create_shixun_editor(params){
             // params.toolbar_container.show();
             $('#reply_image_' + id).removeClass('imageFuzzy');
             //edit.iframe.width(paramsWidth);
-            
+
             var newHeight = $(body).height()
             if (newHeight < 150) {
                 this.resize("100%", "150px");
                 this.resize(paramsWidth, "150px");
             }
-            if($("#editor_panel").length>0){
-                $("#editor_panel").attr("style","width:100%;margin-top:9px;");
+            if ($("#editor_panel").length > 0) {
+                $("#editor_panel").attr("style", "width:100%;margin-top:9px;");
                 $("#editor_panel").parents("form").removeClass("df")
             }
             //params.submit_btn.show();
@@ -207,12 +207,12 @@ function sd_create_shixun_editor(params){
             // $('#mini_comment_section').height('244px')
         },
 
-        afterCreate:function(){
+        afterCreate: function () {
             //params.submit_btn.hide();
-            var toolbar = $("div[class='ke-toolbar']",params.div_form);
-            toolbar.css('display','inline');
-            toolbar.css('padding',0);
-            $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
+            var toolbar = $("div[class='ke-toolbar']", params.div_form);
+            toolbar.css('display', 'inline');
+            toolbar.css('padding', 0);
+            $(".ke-outline>.ke-toolbar-icon", toolbar).append('表情');
             params.toolbar_container.append(toolbar);
             params.toolbar_container.hide();
             params.submit_btn.hide();
@@ -221,16 +221,16 @@ function sd_create_shixun_editor(params){
             var body = edit.doc.body;
             edit.iframe[0].scroll = 'no';
             // body.style.overflowY = 'hidden';
-            body.style['padding-top']= '2px';
-            body.style['padding-left']= '5px';
+            body.style['padding-top'] = '2px';
+            body.style['padding-left'] = '5px';
             // <style type='text/css'>body{padding-top: 2px;padding-left: 5px;}</style> 
             //reset height
             paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
             edit.iframe.height(paramsHeight);
             edit.html("<span id='hint' style='color:#999999;font-size:14px;'>说点什么</span>");
-            this.resize(null,paramsHeight);// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
+            this.resize(null, paramsHeight);// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight)
             // params.toolbar_container.hide();
-            if(typeof enableAt === 'function'){
+            if (typeof enableAt === 'function') {
                 enableAt(this, id, type);
             }
 
@@ -242,43 +242,43 @@ function sd_create_shixun_editor(params){
     return editor;
 }
 
-function sd_check_editor_form_field(params){
-    var result=true;
-    if(params.content!=undefined){
-        if(params.content.isEmpty()){
-            result=false;
+function sd_check_editor_form_field(params) {
+    var result = true;
+    if (params.content != undefined) {
+        if (params.content.isEmpty()) {
+            result = false;
         }
-        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+        if (params.content.html() != params.textarea.html() || params.issubmit == true) {
             params.textarea.html(params.content.html());
             params.content.sync();
-            if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
+            if (params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())) {
                 params.contentmsg.html('内容不能为空');
-                params.contentmsg.css({color:'#ff0000'});
-            }else{
+                params.contentmsg.css({ color: '#ff0000' });
+            } else {
                 params.contentmsg.html('填写正确');
-                params.contentmsg.css({color:'#008000'});
+                params.contentmsg.css({ color: '#008000' });
             }
             params.contentmsg.show();
         }
     }
     return result;
 }
-function sd_create_form(params){
-    params.form.submit(function(){
+function sd_create_form(params) {
+    params.form.submit(function () {
         var flag = false;
-        if(params.form.attr('data-remote') != undefined ){
+        if (params.form.attr('data-remote') != undefined) {
             flag = true
         }
         var is_checked = sd_check_editor_form_field({
-            issubmit:true,
-            content:params.editor,
-            contentmsg:params.contentmsg,
-            textarea:params.textarea
+            issubmit: true,
+            content: params.editor,
+            contentmsg: params.contentmsg,
+            textarea: params.textarea
         });
-        if(is_checked){
-            if(flag){
+        if (is_checked) {
+            if (flag) {
                 return true;
-            }else{
+            } else {
                 $(this)[0].submit();
                 return false;
             }
@@ -286,144 +286,142 @@ function sd_create_form(params){
         return false;
     });
 }
-function sd_reset_editor_form(params){
+function sd_reset_editor_form(params) {
     params.form[0].reset();
     params.textarea.empty();
-    if(params.editor != undefined){
+    if (params.editor != undefined) {
         params.editor.html(params.textarea.html());
     }
     params.contentmsg.hide();
 }
 //第二个参数是高度，可以传，可以不传
-function sd_create_editor_from_data(id){
+function sd_create_editor_from_data(id) {
     var height = arguments[1] ? arguments[1] : undefined;
     var width = arguments[2] ? arguments[2] : undefined;
     var type = arguments[3] ? arguments[3] : undefined;
-    // KindEditor.ready(function (K) {
-        // react 环境不需要ready方法，页面已经加载完了才执行sd_create_editor_from_data
-        var K = KindEditor;
-        $("div[nhname='new_message_" + id + "']").each(function () {
-            var params = {};
-            params.kindutil = K;
-            params.div_form = $(this);
-            params.form = $("form", params.div_form);
-            if (params.form == undefined || params.form.length == 0) {
-                return;
-            }
-            params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
-            params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form);
-            params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
-            params.cancel_btn = $("#new_message_cancel_btn_" + id);
-            params.submit_btn = $("#new_message_submit_btn_" + id);
-            params.height = height;
-            params.width = width;
-            if (params.textarea.data('init') == undefined) {
-                params.editor = sd_create_editor(params,id, type);
-                sd_create_form(params);
-                params.cancel_btn.click(function () {
-                    sd_reset_editor_form(params);
-                });
-                params.submit_btn.click(function () {
-                    var tContents = $("#comment_news_" + id).val();
-                    if(tContents != undefined){
-                        var beforeImage = tContents.split("<img");
-                        var afterImage = tContents.split("/>");
-                        if(beforeImage[0] == "" && afterImage[1] == ""){
-                            notice_box('不支持纯图片评论<br/>请在评论中增加文字信息');
-                            return;
-                        }
-
-                        if (tContents.startsWith('<') && tContents.endsWith('>') 
-                            && (tContents.indexOf('<link') != -1 || tContents.indexOf('<script') != -1 )) {
-                            notice_box('不支持包含link或script标签的html内容');
-                            return;    
-                        }
+    var K = KindEditor;
+    $("div[nhname='new_message_" + id + "']").each(function () {
+        var params = {};
+        params.kindutil = K;
+        params.div_form = $(this);
+        params.form = $("form", params.div_form);
+        if (params.form == undefined || params.form.length == 0) {
+            return;
+        }
+        params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
+        params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form);
+        params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
+        params.cancel_btn = $("#new_message_cancel_btn_" + id);
+        params.submit_btn = $("#new_message_submit_btn_" + id);
+        params.height = height;
+        params.width = width;
+        if (params.textarea.data('init') == undefined) {
+            params.editor = sd_create_editor(params, id, type);
+            sd_create_form(params);
+            params.cancel_btn.click(function () {
+                sd_reset_editor_form(params);
+            });
+            params.submit_btn.click(function () {
+                var tContents = $("#comment_news_" + id).val();
+                if (tContents != undefined) {
+                    var beforeImage = tContents.split("<img");
+                    var afterImage = tContents.split("/>");
+                    if (beforeImage[0] == "" && afterImage[1] == "") {
+                        notice_box('不支持纯图片评论<br/>请在评论中增加文字信息');
+                        return;
                     }
-                    // react环境下，发消息给react组件
-                    if (window['__isR'] === true) {
-                        $(document).trigger("onReply", { commentContent:tContents, id:id, editor:params.editor } );
-                    } else {
-                        params.form.submit();
-                    }
-                });
-                params.textarea.focus(function (){
-                    params.editor.focus();
-                });
-                params.textarea.data('init', 1);
-                $(this).show();
 
-                __editor = params.editor
-            }
-        });
+                    if (tContents.startsWith('<') && tContents.endsWith('>')
+                        && (tContents.indexOf('<link') != -1 || tContents.indexOf('<script') != -1)) {
+                        notice_box('不支持包含link或script标签的html内容');
+                        return;
+                    }
+                }
+                // react环境下，发消息给react组件
+                if (window['__isR'] === true) {
+                    $(document).trigger("onReply", { commentContent: tContents, id: id, editor: params.editor });
+                } else {
+                    params.form.submit();
+                }
+            });
+            params.textarea.focus(function () {
+                params.editor.focus();
+            });
+            params.textarea.data('init', 1);
+            $(this).show();
+
+            __editor = params.editor
+        }
+    });
     // });
 
     div_form = $("div[nhname='new_message_" + id + "']");
-    $(".ke-edit", div_form).css("height","33px");
-    $(".ke-edit-iframe",div_form).css("height","33px");
+    $(".ke-edit", div_form).css("height", "33px");
+    $(".ke-edit-iframe", div_form).css("height", "33px");
 
     return __editor;
 }
 
 
 //第二个参数是高度，可以传，可以不传
-function sd_create_editor_from_shixun_data(id){
+function sd_create_editor_from_shixun_data(id) {
     var height = arguments[1] ? arguments[1] : undefined;
     var width = arguments[2] ? arguments[2] : undefined;
     var type = arguments[3] ? arguments[3] : undefined;
     // KindEditor.ready(function (K) {
-        // react 环境不需要ready方法，页面已经加载完了才执行sd_create_editor_from_data
-        var K = KindEditor;
-    
-        $("div[nhname='new_message_" + id + "']").each(function () {
-            var params = {};
-            params.kindutil = K;
-            params.div_form = $(this);
-            params.form = $("form", params.div_form);
-            if (params.form == undefined || params.form.length == 0) {
-                return;
-            }
-            params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
-            params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form);
-            params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
-            params.cancel_btn = $("#new_message_cancel_btn_" + id);
-            params.submit_btn = $("#new_message_submit_btn_" + id);
-            params.height = height;
-            params.width = width;
-            if (params.textarea.data('init') == undefined) {
-                params.editor = sd_create_shixun_editor(params,id, type);
-                window._commentInput = params.editor;
-                sd_create_form(params);
-                params.cancel_btn.click(function () {
-                    sd_reset_editor_form(params);
-                });
-                // 在react组件中hide
-                // params.submit_btn.click(function () {
-                    // $(this).hide()
-                // });
-                // 非react环境才监听这个click
-                !window['__isR'] && params.submit_btn.click(function () {
-                    var tContents = $("#comment_news_" + id).val();
-                    
-                    if(tContents != undefined){
-                        var beforeImage = tContents.split("<img");
-                        var afterImage = tContents.split("/>");
-                        if(beforeImage[0] == "" && afterImage[1] == ""){
-                            notice_box('不支持纯图片评论<br/>请在评论中增加文字信息');
-                            return;
-                        }
+    // react 环境不需要ready方法，页面已经加载完了才执行sd_create_editor_from_data
+    var K = KindEditor;
+
+    $("div[nhname='new_message_" + id + "']").each(function () {
+        var params = {};
+        params.kindutil = K;
+        params.div_form = $(this);
+        params.form = $("form", params.div_form);
+        if (params.form == undefined || params.form.length == 0) {
+            return;
+        }
+        params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
+        params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form);
+        params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
+        params.cancel_btn = $("#new_message_cancel_btn_" + id);
+        params.submit_btn = $("#new_message_submit_btn_" + id);
+        params.height = height;
+        params.width = width;
+        if (params.textarea.data('init') == undefined) {
+            params.editor = sd_create_shixun_editor(params, id, type);
+            window._commentInput = params.editor;
+            sd_create_form(params);
+            params.cancel_btn.click(function () {
+                sd_reset_editor_form(params);
+            });
+            // 在react组件中hide
+            // params.submit_btn.click(function () {
+            // $(this).hide()
+            // });
+            // 非react环境才监听这个click
+            !window['__isR'] && params.submit_btn.click(function () {
+                var tContents = $("#comment_news_" + id).val();
+
+                if (tContents != undefined) {
+                    var beforeImage = tContents.split("<img");
+                    var afterImage = tContents.split("/>");
+                    if (beforeImage[0] == "" && afterImage[1] == "") {
+                        notice_box('不支持纯图片评论<br/>请在评论中增加文字信息');
+                        return;
                     }
-                    params.form.submit();
-                });
-                params.textarea.focus(function (){
-                    params.editor.focus();
-                });
-                params.textarea.data('init', 1);
-                $(this).show();
-            }
-        });
+                }
+                params.form.submit();
+            });
+            params.textarea.focus(function () {
+                params.editor.focus();
+            });
+            params.textarea.data('init', 1);
+            $(this).show();
+        }
+    });
     // });
 
     div_form = $("div[nhname='new_message_" + id + "']");
-    $(".ke-edit", div_form).css("height","33px");
-    $(".ke-edit-iframe",div_form).css("height","33px");
+    $(".ke-edit", div_form).css("height", "33px");
+    $(".ke-edit-iframe", div_form).css("height", "33px");
 }
\ No newline at end of file
diff --git a/public/js/editormd/editormd.min.js b/public/js/editormd/editormd.min.js
index 289f1f17..c60e4771 100755
--- a/public/js/editormd/editormd.min.js
+++ b/public/js/editormd/editormd.min.js
@@ -10,12 +10,11 @@
  * @updateTime  2015-06-09
  */
 
-;(function(factory) {
+; (function (factory) {
     "use strict";
-    
+
     // CommonJS/Node.js
-    if (typeof require === "function" && typeof exports === "object" && typeof module === "object")
-    { 
+    if (typeof require === "function" && typeof exports === "object" && typeof module === "object") {
         module.exports = factory;
     }
     else if (typeof define === "function")  // AMD/CMD/Sea.js
@@ -23,29 +22,27 @@
         if (define.amd) // for Require.js
         {
             /* Require.js define replace */
-        } 
-        else 
-        {
+        }
+        else {
             define(["../../../../editormd/examples/js/jquery.min"], factory);  // for Sea.js
         }
-    } 
-    else
-    { 
+    }
+    else {
         window.editormd = factory();
     }
-    
-}(function() {    
+
+}(function () {
 
     /* Require.js assignment replace */
-    
+
     "use strict";
-    
+
     var $ = (typeof (jQuery) !== "undefined") ? jQuery : Zepto;
 
     if (typeof ($) === "undefined") {
-        return ;
+        return;
     }
-    
+
     /**
      * editormd
      * 
@@ -53,298 +50,297 @@
      * @param   {Object} options      配置选项 Key/Value
      * @returns {Object} editormd     返回editormd对象
      */
-    
-    var editormd         = function (id, options) {
+
+    var editormd = function (id, options) {
         return new editormd.fn.init(id, options);
     };
-    
-    editormd.title        = editormd.$name = "Editor.md";
-    editormd.version      = "1.5.0";
-    editormd.homePage     = "https://pandao.github.io/editor.md/";
-    editormd.classPrefix  = "editormd-";
-    
+
+    editormd.title = editormd.$name = "Editor.md";
+    editormd.version = "1.5.0";
+    editormd.homePage = "https://pandao.github.io/editor.md/";
+    editormd.classPrefix = "editormd-";
+
     editormd.toolbarModes = {
-        full : [
-            "undo", "redo", "|", 
-            "bold", "del", "italic", "quote", "ucwords", "uppercase", "lowercase", "|", 
-            "h1", "h2", "h3", "h4", "h5", "h6", "|", 
+        full: [
+            "undo", "redo", "|",
+            "bold", "del", "italic", "quote", "ucwords", "uppercase", "lowercase", "|",
+            "h1", "h2", "h3", "h4", "h5", "h6", "|",
             "list-ul", "list-ol", "hr", "|",
             "link", "reference-link", "image", "code", "preformatted-text", "code-block", "table", "datetime", "emoji", "html-entities", "pagebreak", "|",
             "goto-line", "watch", "preview", "fullscreen", "clear", "search", "|",
             "help", "info"
         ],
-        simple : [
-            "undo", "redo", "|", 
-            "bold", "del", "italic", "quote", "uppercase", "lowercase", "|", 
-            "h1", "h2", "h3", "h4", "h5", "h6", "|", 
+        simple: [
+            "undo", "redo", "|",
+            "bold", "del", "italic", "quote", "uppercase", "lowercase", "|",
+            "h1", "h2", "h3", "h4", "h5", "h6", "|",
             "list-ul", "list-ol", "hr", "|",
             "watch", "preview", "fullscreen", "|",
             "help", "info"
         ],
-        mini : [
+        mini: [
             "undo", "redo", "|",
             "watch", "preview", "|",
             "help", "info"
         ]
     };
-    
-    editormd.defaults     = {
-        mode                 : "gfm",          //gfm or markdown
-        name                 : "",             // Form element name
-        value                : "",             // value for CodeMirror, if mode not gfm/markdown
-        theme                : "",             // Editor.md self themes, before v1.5.0 is CodeMirror theme, default empty
-        editorTheme          : "default",      // Editor area, this is CodeMirror theme at v1.5.0
-        previewTheme         : "",             // Preview area theme, default empty
-        markdown             : "",             // Markdown source code
-        appendMarkdown       : "",             // if in init textarea value not empty, append markdown to textarea
-        width                : "100%",
-        height               : "100%",
-        path                 : "./lib/",       // Dependents module file directory
-        pluginPath           : "",             // If this empty, default use settings.path + "../plugins/"
-        delay                : 500,            // Delay parse markdown to html, Uint : ms
-        autoLoadModules      : true,           // Automatic load dependent module files
-        watch                : true,
-        placeholder          : "Enjoy Markdown! coding now...",
-        gotoLine             : true,
-        codeFold             : false,
-        autoHeight           : false,
-        autoFocus            : true,
-        autoCloseTags        : true,
-        searchReplace        : true,
-        syncScrolling        : true,           // true | false | "single", default true
-        readOnly             : false,
-        tabSize              : 4,
-        indentUnit           : 4,
-        lineNumbers          : true,
-        lineWrapping         : true,
-        autoCloseBrackets    : true,
-        showTrailingSpace    : true,
-        matchBrackets        : true,
-        indentWithTabs       : true,
-        styleSelectedText    : true,
-        matchWordHighlight   : true,           // options: true, false, "onselected"
-        styleActiveLine      : true,           // Highlight the current line
-        dialogLockScreen     : true,
-        dialogShowMask       : true,
-        dialogDraggable      : true,
-        dialogMaskBgColor    : "#fff",
-        dialogMaskOpacity    : 0.1,
-        fontSize             : "13px",
-        saveHTMLToTextarea   : false,
-        disabledKeyMaps      : [],
-        
-        onload               : function() {},
-        onresize             : function() {},
-        onchange             : function() {},
-        onwatch              : null,
-        onunwatch            : null,
-        onpreviewing         : function() {},
-        onpreviewed          : function() {},
-        onfullscreen         : function() {},
-        onfullscreenExit     : function() {},
-        onscroll             : function() {},
-        onpreviewscroll      : function() {},
-        
-        imageUpload          : false,
-        imageFormats         : ["jpg", "jpeg", "gif", "png", "bmp", "webp"],
-        imageUploadURL       : "",
-        crossDomainUpload    : false,
-        uploadCallbackURL    : "",
-        
-        toc                  : true,           // Table of contents
-        tocm                 : false,           // Using [TOCM], auto create ToC dropdown menu
-        tocTitle             : "",             // for ToC dropdown menu btn
-        tocDropdown          : false,
-        tocContainer         : "",
-        tocStartLevel        : 1,              // Said from H1 to create ToC
-        htmlDecode           : "style,iframe|on*", // Open the HTML tag identification
-        pageBreak            : true,           // Enable parse page break [========]
-        atLink               : true,           // for @link
-        emailLink            : true,           // for email address auto link
-        taskList             : false,          // Enable Github Flavored Markdown task lists
-        emoji                : false,          // :emoji: , Support Github emoji, Twitter Emoji (Twemoji);
-                                               // Support FontAwesome icon emoji :fa-xxx: > Using fontAwesome icon web fonts;
-                                               // Support Editor.md logo icon emoji :editormd-logo: :editormd-logo-1x: > 1~8x;
-        tex                  : false,          // TeX(LaTeX), based on KaTeX
-        flowChart            : false,          // flowChart.js only support IE9+
-        sequenceDiagram      : false,          // sequenceDiagram.js only support IE9+
-        previewCodeHighlight : true,
-                
-        toolbar              : true,           // show/hide toolbar
-        toolbarAutoFixed     : true,           // on window scroll auto fixed position
-        toolbarIcons         : "full",
-        toolbarTitles        : {},
-        toolbarHandlers      : {
-            ucwords : function() {
+
+    editormd.defaults = {
+        mode: "gfm",          //gfm or markdown
+        name: "",             // Form element name
+        value: "",             // value for CodeMirror, if mode not gfm/markdown
+        theme: "",             // Editor.md self themes, before v1.5.0 is CodeMirror theme, default empty
+        editorTheme: "default",      // Editor area, this is CodeMirror theme at v1.5.0
+        previewTheme: "",             // Preview area theme, default empty
+        markdown: "",             // Markdown source code
+        appendMarkdown: "",             // if in init textarea value not empty, append markdown to textarea
+        width: "100%",
+        height: "100%",
+        path: "./lib/",       // Dependents module file directory
+        pluginPath: "",             // If this empty, default use settings.path + "../plugins/"
+        delay: 300,            // Delay parse markdown to html, Uint : ms
+        autoLoadModules: true,           // Automatic load dependent module files
+        watch: true,
+        placeholder: "Enjoy Markdown! coding now...",
+        gotoLine: true,
+        codeFold: false,
+        autoHeight: false,
+        autoFocus: true,
+        autoCloseTags: true,
+        searchReplace: true,
+        syncScrolling: true,           // true | false | "single", default true
+        readOnly: false,
+        tabSize: 4,
+        indentUnit: 4,
+        lineNumbers: true,
+        lineWrapping: true,
+        autoCloseBrackets: true,
+        showTrailingSpace: true,
+        matchBrackets: true,
+        indentWithTabs: true,
+        styleSelectedText: true,
+        matchWordHighlight: true,           // options: true, false, "onselected"
+        styleActiveLine: true,           // Highlight the current line
+        dialogLockScreen: true,
+        dialogShowMask: true,
+        dialogDraggable: true,
+        dialogMaskBgColor: "#fff",
+        dialogMaskOpacity: 0.1,
+        fontSize: "13px",
+        saveHTMLToTextarea: false,
+        disabledKeyMaps: [],
+
+        onload: function () { },
+        onresize: function () { },
+        onchange: function () { },
+        onwatch: null,
+        onunwatch: null,
+        onpreviewing: function () { },
+        onpreviewed: function () { },
+        onfullscreen: function () { },
+        onfullscreenExit: function () { },
+        onscroll: function () { },
+        onpreviewscroll: function () { },
+
+        imageUpload: false,
+        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp"],
+        imageUploadURL: "",
+        crossDomainUpload: false,
+        uploadCallbackURL: "",
+
+        toc: true,           // Table of contents
+        tocm: false,           // Using [TOCM], auto create ToC dropdown menu
+        tocTitle: "",             // for ToC dropdown menu btn
+        tocDropdown: false,
+        tocContainer: "",
+        tocStartLevel: 1,              // Said from H1 to create ToC
+        htmlDecode: "style,iframe|on*", // Open the HTML tag identification
+        pageBreak: true,           // Enable parse page break [========]
+        atLink: true,           // for @link
+        emailLink: true,           // for email address auto link
+        taskList: false,          // Enable Github Flavored Markdown task lists
+        emoji: false,          // :emoji: , Support Github emoji, Twitter Emoji (Twemoji);
+        // Support FontAwesome icon emoji :fa-xxx: > Using fontAwesome icon web fonts;
+        // Support Editor.md logo icon emoji :editormd-logo: :editormd-logo-1x: > 1~8x;
+        tex: false,          // TeX(LaTeX), based on KaTeX
+        flowChart: false,          // flowChart.js only support IE9+
+        sequenceDiagram: false,          // sequenceDiagram.js only support IE9+
+        previewCodeHighlight: true,
+
+        toolbar: true,           // show/hide toolbar
+        toolbarAutoFixed: true,           // on window scroll auto fixed position
+        toolbarIcons: "full",
+        toolbarTitles: {},
+        toolbarHandlers: {
+            ucwords: function () {
                 return editormd.toolbarHandlers.ucwords;
             },
-            lowercase : function() {
+            lowercase: function () {
                 return editormd.toolbarHandlers.lowercase;
             }
         },
-        toolbarCustomIcons   : {               // using html tag create toolbar icon, unused default <a> tag.
-            lowercase        : "<a href=\"javascript:;\" title=\"Lowercase\" unselectable=\"on\"><i class=\"fa\" name=\"lowercase\" style=\"font-size:24px;margin-top: -10px;\">a</i></a>",
-            "ucwords"        : "<a href=\"javascript:;\" title=\"ucwords\" unselectable=\"on\"><i class=\"fa\" name=\"ucwords\" style=\"font-size:20px;margin-top: -3px;\">Aa</i></a>"
-        }, 
-        toolbarIconsClass    : {
-            undo             : "fa-undo",
-            redo             : "fa-repeat",
-            bold             : "fa-bold",
-            del              : "fa-strikethrough",
-            italic           : "fa-italic",
-            quote            : "fa-quote-left",
-            uppercase        : "fa-font",
-            h1               : editormd.classPrefix + "bold",
-            h2               : editormd.classPrefix + "bold",
-            h3               : editormd.classPrefix + "bold",
-            h4               : editormd.classPrefix + "bold",
-            h5               : editormd.classPrefix + "bold",
-            h6               : editormd.classPrefix + "bold",
-            "list-ul"        : "fa-list-ul",
-            "list-ol"        : "fa-list-ol",
-            hr               : "fa-minus",
-            link             : "fa-link",
-            "reference-link" : "fa-anchor",
-            image            : "fa-picture-o",
-            code             : "fa-code",
-            "preformatted-text" : "fa-file-code-o",
-            "code-block"     : "fa-file-code-o",
-            table            : "fa-table",
-            datetime         : "fa-clock-o",
-            emoji            : "fa-smile-o",
-            "html-entities"  : "fa-copyright",
-            pagebreak        : "fa-newspaper-o",
-            "goto-line"      : "fa-terminal", // fa-crosshairs
-            watch            : "fa-eye-slash",
-            unwatch          : "fa-eye",
-            preview          : "fa-desktop",
-            search           : "fa-search",
-            fullscreen       : "fa-arrows-alt",
-            clear            : "fa-eraser",
-            help             : "fa-question-circle",
-            info             : "fa-info-circle"
-        },        
-        toolbarIconTexts     : {},
-        
-        lang : {
-            name        : "zh-cn",
-            description : "开源在线Markdown编辑器<br/>Open source online Markdown editor.",
-            tocTitle    : "目录",
-            toolbar     : {
-                undo             : "撤销（Ctrl+Z）",
-                redo             : "重做（Ctrl+Y）",
-                bold             : "粗体",
-                del              : "删除线",
-                italic           : "斜体",
-                quote            : "引用",
-                ucwords          : "将每个单词首字母转成大写",
-                uppercase        : "将所选转换成大写",
-                lowercase        : "将所选转换成小写",
-                h1               : "标题1",
-                h2               : "标题2",
-                h3               : "标题3",
-                h4               : "标题4",
-                h5               : "标题5",
-                h6               : "标题6",
-                "list-ul"        : "无序列表",
-                "list-ol"        : "有序列表",
-                hr               : "横线",
-                link             : "链接",
-                "reference-link" : "引用链接",
-                image            : "添加图片",
-                code             : "行内代码",
-                "preformatted-text" : "预格式文本 / 代码块（缩进风格）",
-                "code-block"     : "代码块（多语言风格）",
-                table            : "添加表格",
-                datetime         : "日期时间",
-                emoji            : "Emoji表情",
-                "html-entities"  : "HTML实体字符",
-                pagebreak        : "插入分页符",
-                "goto-line"      : "跳转到行",
-                watch            : "关闭实时预览",
-                unwatch          : "开启实时预览",
-                preview          : "全窗口预览HTML（按 Shift + ESC还原）",
-                fullscreen       : "全屏（按ESC还原）",
-                clear            : "清空",
-                search           : "搜索",
-                help             : "使用帮助",
-                info             : "关于" + editormd.title
+        toolbarCustomIcons: {               // using html tag create toolbar icon, unused default <a> tag.
+            lowercase: "<a href=\"javascript:;\" title=\"Lowercase\" unselectable=\"on\"><i class=\"fa\" name=\"lowercase\" style=\"font-size:24px;margin-top: -10px;\">a</i></a>",
+            "ucwords": "<a href=\"javascript:;\" title=\"ucwords\" unselectable=\"on\"><i class=\"fa\" name=\"ucwords\" style=\"font-size:20px;margin-top: -3px;\">Aa</i></a>"
+        },
+        toolbarIconsClass: {
+            undo: "fa-undo",
+            redo: "fa-repeat",
+            bold: "fa-bold",
+            del: "fa-strikethrough",
+            italic: "fa-italic",
+            quote: "fa-quote-left",
+            uppercase: "fa-font",
+            h1: editormd.classPrefix + "bold",
+            h2: editormd.classPrefix + "bold",
+            h3: editormd.classPrefix + "bold",
+            h4: editormd.classPrefix + "bold",
+            h5: editormd.classPrefix + "bold",
+            h6: editormd.classPrefix + "bold",
+            "list-ul": "fa-list-ul",
+            "list-ol": "fa-list-ol",
+            hr: "fa-minus",
+            link: "fa-link",
+            "reference-link": "fa-anchor",
+            image: "fa-picture-o",
+            code: "fa-code",
+            "preformatted-text": "fa-file-code-o",
+            "code-block": "fa-file-code-o",
+            table: "fa-table",
+            datetime: "fa-clock-o",
+            emoji: "fa-smile-o",
+            "html-entities": "fa-copyright",
+            pagebreak: "fa-newspaper-o",
+            "goto-line": "fa-terminal", // fa-crosshairs
+            watch: "fa-eye-slash",
+            unwatch: "fa-eye",
+            preview: "fa-desktop",
+            search: "fa-search",
+            fullscreen: "fa-arrows-alt",
+            clear: "fa-eraser",
+            help: "fa-question-circle",
+            info: "fa-info-circle"
+        },
+        toolbarIconTexts: {},
+
+        lang: {
+            name: "zh-cn",
+            description: "开源在线Markdown编辑器<br/>Open source online Markdown editor.",
+            tocTitle: "目录",
+            toolbar: {
+                undo: "撤销（Ctrl+Z）",
+                redo: "重做（Ctrl+Y）",
+                bold: "粗体",
+                del: "删除线",
+                italic: "斜体",
+                quote: "引用",
+                ucwords: "将每个单词首字母转成大写",
+                uppercase: "将所选转换成大写",
+                lowercase: "将所选转换成小写",
+                h1: "标题1",
+                h2: "标题2",
+                h3: "标题3",
+                h4: "标题4",
+                h5: "标题5",
+                h6: "标题6",
+                "list-ul": "无序列表",
+                "list-ol": "有序列表",
+                hr: "横线",
+                link: "链接",
+                "reference-link": "引用链接",
+                image: "添加图片",
+                code: "行内代码",
+                "preformatted-text": "预格式文本 / 代码块（缩进风格）",
+                "code-block": "代码块（多语言风格）",
+                table: "添加表格",
+                datetime: "日期时间",
+                emoji: "Emoji表情",
+                "html-entities": "HTML实体字符",
+                pagebreak: "插入分页符",
+                "goto-line": "跳转到行",
+                watch: "关闭实时预览",
+                unwatch: "开启实时预览",
+                preview: "全窗口预览HTML（按 Shift + ESC还原）",
+                fullscreen: "全屏（按ESC还原）",
+                clear: "清空",
+                search: "搜索",
+                help: "使用帮助",
+                info: "关于" + editormd.title
             },
-            buttons : {
-                enter  : "确定",
-                cancel : "取消",
-                close  : "关闭"
+            buttons: {
+                enter: "确定",
+                cancel: "取消",
+                close: "关闭"
             },
-            dialog : {
-                link : {
-                    title    : "添加链接",
-                    url      : "链接地址",
-                    urlTitle : "链接标题",
-                    urlEmpty : "错误：请填写链接地址。"
+            dialog: {
+                link: {
+                    title: "添加链接",
+                    url: "链接地址",
+                    urlTitle: "链接标题",
+                    urlEmpty: "错误：请填写链接地址。"
                 },
-                referenceLink : {
-                    title    : "添加引用链接",
-                    name     : "引用名称",
-                    url      : "链接地址",
-                    urlId    : "链接ID",
-                    urlTitle : "链接标题",
+                referenceLink: {
+                    title: "添加引用链接",
+                    name: "引用名称",
+                    url: "链接地址",
+                    urlId: "链接ID",
+                    urlTitle: "链接标题",
                     nameEmpty: "错误：引用链接的名称不能为空。",
-                    idEmpty  : "错误：请填写引用链接的ID。",
-                    urlEmpty : "错误：请填写引用链接的URL地址。"
+                    idEmpty: "错误：请填写引用链接的ID。",
+                    urlEmpty: "错误：请填写引用链接的URL地址。"
                 },
-                image : {
-                    title    : "添加图片",
-                    url      : "图片地址",
-                    link     : "图片链接",
-                    alt      : "图片描述",
-                    uploadButton     : "本地上传",
-                    imageURLEmpty    : "错误：图片地址不能为空。",
-                    uploadFileEmpty  : "错误：上传的图片不能为空。",
-                    formatNotAllowed : "错误：只允许上传图片文件，允许上传的图片文件格式有："
+                image: {
+                    title: "添加图片",
+                    url: "图片地址",
+                    link: "图片链接",
+                    alt: "图片描述",
+                    uploadButton: "本地上传",
+                    imageURLEmpty: "错误：图片地址不能为空。",
+                    uploadFileEmpty: "错误：上传的图片不能为空。",
+                    formatNotAllowed: "错误：只允许上传图片文件，允许上传的图片文件格式有："
                 },
-                preformattedText : {
-                    title             : "添加预格式文本或代码块", 
-                    emptyAlert        : "错误：请填写预格式文本或代码的内容。"
+                preformattedText: {
+                    title: "添加预格式文本或代码块",
+                    emptyAlert: "错误：请填写预格式文本或代码的内容。"
                 },
-                codeBlock : {
-                    title             : "添加代码块",                    
-                    selectLabel       : "代码语言：",
-                    selectDefaultText : "请选择代码语言",
-                    otherLanguage     : "其他语言",
-                    unselectedLanguageAlert : "错误：请选择代码所属的语言类型。",
-                    codeEmptyAlert    : "错误：请填写代码内容。"
+                codeBlock: {
+                    title: "添加代码块",
+                    selectLabel: "代码语言：",
+                    selectDefaultText: "请选择代码语言",
+                    otherLanguage: "其他语言",
+                    unselectedLanguageAlert: "错误：请选择代码所属的语言类型。",
+                    codeEmptyAlert: "错误：请填写代码内容。"
                 },
-                htmlEntities : {
-                    title : "HTML 实体字符"
+                htmlEntities: {
+                    title: "HTML 实体字符"
                 },
-                help : {
-                    title : "使用帮助"
+                help: {
+                    title: "使用帮助"
                 }
             }
         }
     };
-    
-    editormd.classNames  = {
-        tex : editormd.classPrefix + "tex"
+
+    editormd.classNames = {
+        tex: editormd.classPrefix + "tex"
     };
 
     editormd.dialogZindex = 99999;
-    
-    editormd.$katex       = null;
-    editormd.$marked      = null;
-    editormd.$CodeMirror  = null;
+
+    editormd.$katex = null;
+    editormd.$marked = null;
+    editormd.$CodeMirror = null;
     editormd.$prettyPrint = null;
-    
+
     var timer, flowchartTimer;
-    var settingNew;
-    editormd.prototype    = editormd.fn = {
-        state : {
-            watching   : false,
-            loaded     : false,
-            preview    : false,
-            fullscreen : false
+    editormd.prototype = editormd.fn = {
+        state: {
+            watching: false,
+            loaded: false,
+            preview: false,
+            fullscreen: false
         },
-        
+
         /**
          * 构造函数/实例初始化
          * Constructor / instance initialization
@@ -353,185 +349,170 @@
          * @param   {Object}   [options={}]  配置选项 Key/Value
          * @returns {editormd}               返回editormd的实例对象
          */
-        
-        init : function (id, options) {
-            
-            options              = options || {};
-            
-            if (typeof id === "object")
-            {
+
+        init: function (id, options) {
+
+            options = options || {};
+
+            if (typeof id === "object") {
                 options = id;
             }
-            
-            var _this            = this;
-            var classPrefix      = this.classPrefix  = editormd.classPrefix; 
-            var settings         = settingNew     = $.extend(true, editormd.defaults, options);
-            this.settings        = settings;
-            
-            id                   = (typeof id === "object") ? settings.id : id;
-            
-            var editor           = this.editor       = $("#" + id);
-            
-            this.id              = id;
-            this.lang            = settings.lang;
-            
-            var classNames       = this.classNames   = {
-                textarea : {
-                    html     : classPrefix + "html-textarea",
-                    markdown : classPrefix + "markdown-textarea"
+
+            var _this = this;
+            var classPrefix = this.classPrefix = editormd.classPrefix;
+            var defaultConfig = {}
+            $.each(editormd.defaults, function (k, v) {
+                defaultConfig[k] = v;
+            })
+            var settings = this.settings = $.extend(true, {}, defaultConfig, options);
+
+            id = (typeof id === "object") ? settings.id : id;
+
+            var editor = this.editor = $("#" + id);
+
+            this.id = id;
+            this.lang = settings.lang;
+
+            var classNames = this.classNames = {
+                textarea: {
+                    html: classPrefix + "html-textarea",
+                    markdown: classPrefix + "markdown-textarea"
                 }
             };
-            
-            settings.pluginPath = (settings.pluginPath === "") ? settings.path + "../plugins/" : settings.pluginPath; 
-            
+
+            settings.pluginPath = (settings.pluginPath === "") ? settings.path + "../plugins/" : settings.pluginPath;
+
             this.state.watching = (settings.watch) ? true : false;
-            
-            if ( !editor.hasClass("editormd") ) {
+
+            if (!editor.hasClass("editormd")) {
                 editor.addClass("editormd");
             }
-            
+
             editor.css({
-                width  : (typeof settings.width  === "number") ? settings.width  + "px" : settings.width,
-                height : (typeof settings.height === "number") ? settings.height + "px" : settings.height
+                width: (typeof settings.width === "number") ? settings.width + "px" : settings.width,
+                height: (typeof settings.height === "number") ? settings.height + "px" : settings.height
             });
-            
-            if (settings.autoHeight)
-            {
+
+            if (settings.autoHeight) {
                 editor.css("height", "auto");
             }
-                        
+
             var markdownTextarea = this.markdownTextarea = editor.children("textarea");
-            
-            if (markdownTextarea.length < 1)
-            {
+
+            if (markdownTextarea.length < 1) {
                 editor.append("<textarea></textarea>");
                 markdownTextarea = this.markdownTextarea = editor.children("textarea");
             }
-            
+
             markdownTextarea.addClass(classNames.textarea.markdown).attr("placeholder", settings.placeholder);
-            
-            if (typeof markdownTextarea.attr("name") === "undefined" || markdownTextarea.attr("name") === "")
-            {
+
+            if (typeof markdownTextarea.attr("name") === "undefined" || markdownTextarea.attr("name") === "") {
                 markdownTextarea.attr("name", (settings.name !== "") ? settings.name : id + "-markdown-doc");
             }
-            
+
             var appendElements = [
                 (!settings.readOnly) ? "<a href=\"javascript:;\" class=\"fa fa-close " + classPrefix + "preview-close-btn\"></a>" : "",
-                ( (settings.saveHTMLToTextarea) ? "<textarea class=\"" + classNames.textarea.html + "\" name=\"" + id + "-html-code\"></textarea>" : "" ),
+                ((settings.saveHTMLToTextarea) ? "<textarea class=\"" + classNames.textarea.html + "\" name=\"" + id + "-html-code\"></textarea>" : ""),
                 "<div class=\"" + classPrefix + "preview\"><div class=\"markdown-body " + classPrefix + "preview-container\"></div></div>",
                 "<div class=\"" + classPrefix + "container-mask\" style=\"display:block;\"></div>",
                 "<div class=\"" + classPrefix + "mask\"></div>"
             ].join("\n");
-            
+
             editor.append(appendElements).addClass(classPrefix + "vertical");
-            
-            if (settings.theme !== "") 
-            {
+
+            if (settings.theme !== "") {
                 editor.addClass(classPrefix + "theme-" + settings.theme);
             }
-            
-            this.mask          = editor.children("." + classPrefix + "mask");    
-            this.containerMask = editor.children("." + classPrefix  + "container-mask");
-            
-            if (settings.markdown !== "")
-            {
+
+            this.mask = editor.children("." + classPrefix + "mask");
+            this.containerMask = editor.children("." + classPrefix + "container-mask");
+
+            if (settings.markdown !== "") {
                 markdownTextarea.val(settings.markdown);
             }
-            
-            if (settings.appendMarkdown !== "")
-            {
+
+            if (settings.appendMarkdown !== "") {
                 markdownTextarea.val(markdownTextarea.val() + settings.appendMarkdown);
             }
-            
-            this.htmlTextarea     = editor.children("." + classNames.textarea.html);            
-            this.preview          = editor.children("." + classPrefix + "preview");
+
+            this.htmlTextarea = editor.children("." + classNames.textarea.html);
+            this.preview = editor.children("." + classPrefix + "preview");
             this.previewContainer = this.preview.children("." + classPrefix + "preview-container");
-            
-            if (settings.previewTheme !== "") 
-            {
+
+            if (settings.previewTheme !== "") {
                 this.preview.addClass(classPrefix + "preview-theme-" + settings.previewTheme);
             }
-            
-            if (typeof define === "function" && define.amd)
-            {
-                if (typeof katex !== "undefined") 
-                {
+
+            if (typeof define === "function" && define.amd) {
+                if (typeof katex !== "undefined") {
                     editormd.$katex = katex;
                 }
-                
-                if (settings.searchReplace && !settings.readOnly) 
-                {
+
+                if (settings.searchReplace && !settings.readOnly) {
                     editormd.loadCSS(settings.path + "codemirror/addon/dialog/dialog");
                     editormd.loadCSS(settings.path + "codemirror/addon/search/matchesonscrollbar");
                 }
             }
-            
-            if ((typeof define === "function" && define.amd) || !settings.autoLoadModules)
-            {
+
+            if ((typeof define === "function" && define.amd) || !settings.autoLoadModules) {
                 if (typeof CodeMirror !== "undefined") {
                     editormd.$CodeMirror = CodeMirror;
                 }
-                
-                if (typeof marked     !== "undefined") {
-                    editormd.$marked     = marked;
+
+                if (typeof marked !== "undefined") {
+                    editormd.$marked = marked;
                 }
-                
+
                 this.setCodeMirror().setToolbar().loadedDisplay();
-            } 
-            else 
-            {
+            }
+            else {
                 this.loadQueues();
             }
 
             return this;
         },
-        
+
         /**
          * 所需组件加载队列
          * Required components loading queue
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        loadQueues : function() {
-            var _this        = this;
-            var settings     = settingNew;
-            var loadPath     = settings.path;
-                                
-            var loadFlowChartOrSequenceDiagram = function() {
-                
-                if (editormd.isIE8) 
-                {
+
+        loadQueues: function () {
+            var _this = this;
+            var settings = this.settings;
+            var loadPath = settings.path;
+
+            var loadFlowChartOrSequenceDiagram = function () {
+
+                if (editormd.isIE8) {
                     _this.loadedDisplay();
-                    
-                    return ;
+
+                    return;
                 }
 
-                if (settings.flowChart || settings.sequenceDiagram) 
-                {
-                    editormd.loadScript(loadPath + "raphael.min", function() {
+                if (settings.flowChart || settings.sequenceDiagram) {
+                    editormd.loadScript(loadPath + "raphael.min", function () {
 
-                        editormd.loadScript(loadPath + "underscore.min", function() {  
+                        editormd.loadScript(loadPath + "underscore.min", function () {
 
-                            if (!settings.flowChart && settings.sequenceDiagram) 
-                            {
-                                editormd.loadScript(loadPath + "sequence-diagram.min", function() {
+                            if (!settings.flowChart && settings.sequenceDiagram) {
+                                editormd.loadScript(loadPath + "sequence-diagram.min", function () {
                                     _this.loadedDisplay();
                                 });
                             }
-                            else if (settings.flowChart && !settings.sequenceDiagram) 
-                            {      
-                                editormd.loadScript(loadPath + "flowchart.min", function() {  
-                                    editormd.loadScript(loadPath + "jquery.flowchart.min", function() {
+                            else if (settings.flowChart && !settings.sequenceDiagram) {
+                                editormd.loadScript(loadPath + "flowchart.min", function () {
+                                    editormd.loadScript(loadPath + "jquery.flowchart.min", function () {
                                         _this.loadedDisplay();
                                     });
                                 });
                             }
-                            else if (settings.flowChart && settings.sequenceDiagram) 
-                            {  
-                                editormd.loadScript(loadPath + "flowchart.min", function() {  
-                                    editormd.loadScript(loadPath + "jquery.flowchart.min", function() {
-                                        editormd.loadScript(loadPath + "sequence-diagram.min", function() {
+                            else if (settings.flowChart && settings.sequenceDiagram) {
+                                editormd.loadScript(loadPath + "flowchart.min", function () {
+                                    editormd.loadScript(loadPath + "jquery.flowchart.min", function () {
+                                        editormd.loadScript(loadPath + "sequence-diagram.min", function () {
                                             _this.loadedDisplay();
                                         });
                                     });
@@ -540,265 +521,254 @@
                         });
 
                     });
-                } 
-                else
-                {
+                }
+                else {
                     _this.loadedDisplay();
                 }
-            }; 
+            };
 
             // codemirror 已经加载了
             // editormd.loadCSS(loadPath + "codemirror/codemirror.min");
-            
-            if (settings.searchReplace && !settings.readOnly)
-            {
+
+            if (settings.searchReplace && !settings.readOnly) {
                 editormd.loadCSS(loadPath + "codemirror/addon/dialog/dialog");
                 editormd.loadCSS(loadPath + "codemirror/addon/search/matchesonscrollbar");
             }
-            
-            if (settings.codeFold)
-            {
-                editormd.loadCSS(loadPath + "codemirror/addon/fold/foldgutter");            
+
+            if (settings.codeFold) {
+                editormd.loadCSS(loadPath + "codemirror/addon/fold/foldgutter");
             }
-            
+
             // codemirror 已经加载了，codemirror会有插件，重复加载会使得之前加载的插件失效
-            
+
             // editormd.loadScript(loadPath + "codemirror/codemirror.min", function() {
-                editormd.$CodeMirror = CodeMirror;
-                
-                editormd.loadScript(loadPath + "codemirror/modes.min", function() {
-                    
-                    editormd.loadScript(loadPath + "codemirror/addons.min", function() {
-                        
-                        _this.setCodeMirror();
-                        
-                        if (settings.mode !== "gfm" && settings.mode !== "markdown") 
-                        {
-                            _this.loadedDisplay();
-                            
-                            return false;
-                        }
-                        
-                        _this.setToolbar();
+            editormd.$CodeMirror = CodeMirror;
 
-                        editormd.loadScript(loadPath + "marked.min", function() {
+            editormd.loadScript(loadPath + "codemirror/modes.min", function () {
 
-                            editormd.$marked = marked;
-                                
-                            if (settings.previewCodeHighlight) 
-                            {
-                                editormd.loadScript(loadPath + "prettify.min", function() {
-                                    loadFlowChartOrSequenceDiagram();
-                                });
-                            } 
-                            else
-                            {                  
+                editormd.loadScript(loadPath + "codemirror/addons.min", function () {
+
+                    _this.setCodeMirror();
+
+                    if (settings.mode !== "gfm" && settings.mode !== "markdown") {
+                        _this.loadedDisplay();
+
+                        return false;
+                    }
+
+                    _this.setToolbar();
+
+                    editormd.loadScript(loadPath + "marked.min", function () {
+
+                        editormd.$marked = marked;
+
+                        if (settings.previewCodeHighlight) {
+                            editormd.loadScript(loadPath + "prettify.min", function () {
                                 loadFlowChartOrSequenceDiagram();
-                            }
-                        });
-                        
+                            });
+                        }
+                        else {
+                            loadFlowChartOrSequenceDiagram();
+                        }
                     });
-                    
+
                 });
-                
+
+            });
+
             // });
 
             return this;
         },
-        
+
         /**
          * 设置 Editor.md 的整体主题，主要是工具栏
          * Setting Editor.md theme
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        setTheme : function(theme) {
-            var editor      = this.editor;
-            var oldTheme    = settingNew.theme;
+
+        setTheme: function (theme) {
+            var editor = this.editor;
+            var oldTheme = this.settings.theme;
             var themePrefix = this.classPrefix + "theme-";
-            
+
             editor.removeClass(themePrefix + oldTheme).addClass(themePrefix + theme);
-            
-            settingNew.theme = theme;
-            
+
+            this.settings.theme = theme;
+
             return this;
         },
-        
+
         /**
          * 设置 CodeMirror（编辑区）的主题
          * Setting CodeMirror (Editor area) theme
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        setEditorTheme : function(theme) {  
-            var settings   = settingNew;  
-            settings.editorTheme = theme;  
-            
-            if (theme !== "default")
-            {
+
+        setEditorTheme: function (theme) {
+            var settings = this.settings;
+            settings.editorTheme = theme;
+
+            if (theme !== "default") {
                 editormd.loadCSS(settings.path + "codemirror/theme/" + settings.editorTheme);
             }
-            
+
             this.cm.setOption("theme", theme);
-            
+
             return this;
         },
-        
+
         /**
          * setEditorTheme() 的别名
          * setEditorTheme() alias
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        setCodeMirrorTheme : function (theme) {            
+
+        setCodeMirrorTheme: function (theme) {
             this.setEditorTheme(theme);
-            
+
             return this;
         },
-        
+
         /**
          * 设置 Editor.md 的主题
          * Setting Editor.md theme
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        setPreviewTheme : function(theme) {  
-            var preview     = this.preview;
-            var oldTheme    = settingNew.previewTheme;
+
+        setPreviewTheme: function (theme) {
+            var preview = this.preview;
+            var oldTheme = this.settings.previewTheme;
             var themePrefix = this.classPrefix + "preview-theme-";
-            
+
             preview.removeClass(themePrefix + oldTheme).addClass(themePrefix + theme);
-            
-            settingNew.previewTheme = theme;
-            
+
+            this.settings.previewTheme = theme;
+
             return this;
         },
-        
+
         /**
          * 配置和初始化CodeMirror组件
          * CodeMirror initialization
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        setCodeMirror : function() { 
-            var settings         = settingNew;
-            var editor           = this.editor;
-            
-            if (settings.editorTheme !== "default")
-            {
+
+        setCodeMirror: function () {
+            var settings = this.settings;
+            var editor = this.editor;
+
+            if (settings.editorTheme !== "default") {
                 editormd.loadCSS(settings.path + "codemirror/theme/" + settings.editorTheme);
             }
-            
+
             var codeMirrorConfig = {
-                mode                      : settings.mode,
-                theme                     : settings.editorTheme,
-                tabSize                   : settings.tabSize,
-                dragDrop                  : false,
-                autofocus                 : settings.autoFocus,
-                autoCloseTags             : settings.autoCloseTags,
-                readOnly                  : (settings.readOnly) ? "nocursor" : false,
-                indentUnit                : settings.indentUnit,
-                lineNumbers               : settings.lineNumbers,
-                lineWrapping              : settings.lineWrapping,
-                extraKeys                 : {
-                                                "Ctrl-Q": function(cm) { 
-                                                    cm.foldCode(cm.getCursor()); 
-                                                }
-                                            },
-                foldGutter                : settings.codeFold,
-                gutters                   : ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
-                matchBrackets             : settings.matchBrackets,
-                indentWithTabs            : settings.indentWithTabs,
-                styleActiveLine           : settings.styleActiveLine,
-                styleSelectedText         : settings.styleSelectedText,
-                autoCloseBrackets         : settings.autoCloseBrackets,
-                showTrailingSpace         : settings.showTrailingSpace,
-                highlightSelectionMatches : ( (!settings.matchWordHighlight) ? false : { showToken: (settings.matchWordHighlight === "onselected") ? false : /\w/ } )
+                mode: settings.mode,
+                theme: settings.editorTheme,
+                tabSize: settings.tabSize,
+                dragDrop: false,
+                autofocus: settings.autoFocus,
+                autoCloseTags: settings.autoCloseTags,
+                readOnly: (settings.readOnly) ? "nocursor" : false,
+                indentUnit: settings.indentUnit,
+                lineNumbers: settings.lineNumbers,
+                lineWrapping: settings.lineWrapping,
+                extraKeys: {
+                    "Ctrl-Q": function (cm) {
+                        cm.foldCode(cm.getCursor());
+                    }
+                },
+                foldGutter: settings.codeFold,
+                gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
+                matchBrackets: settings.matchBrackets,
+                indentWithTabs: settings.indentWithTabs,
+                styleActiveLine: settings.styleActiveLine,
+                styleSelectedText: settings.styleSelectedText,
+                autoCloseBrackets: settings.autoCloseBrackets,
+                showTrailingSpace: settings.showTrailingSpace,
+                highlightSelectionMatches: ((!settings.matchWordHighlight) ? false : { showToken: (settings.matchWordHighlight === "onselected") ? false : /\w/ })
             };
-            
-            this.codeEditor = this.cm        = editormd.$CodeMirror.fromTextArea(this.markdownTextarea[0], codeMirrorConfig);
+
+            this.codeEditor = this.cm = editormd.$CodeMirror.fromTextArea(this.markdownTextarea[0], codeMirrorConfig);
             this.codeMirror = this.cmElement = editor.children(".CodeMirror");
-            
-            if (settings.value !== "")
-            {
+
+            if (settings.value !== "") {
                 this.cm.setValue(settings.value);
             }
 
             this.codeMirror.css({
-                fontSize : settings.fontSize,
-                width    : (!settings.watch) ? "100%" : "50%"
+                fontSize: settings.fontSize,
+                width: (!settings.watch) ? "100%" : "50%"
             });
-            
-            if (settings.autoHeight)
-            {
+
+            if (settings.autoHeight) {
                 this.codeMirror.css("height", "auto");
                 this.cm.setOption("viewportMargin", Infinity);
             }
-            
-            if (!settings.lineNumbers)
-            {
+
+            if (!settings.lineNumbers) {
                 this.codeMirror.find(".CodeMirror-gutters").css("border-right", "none");
             }
 
             return this;
         },
-        
+
         /**
          * 获取CodeMirror的配置选项
          * Get CodeMirror setting options
          * 
          * @returns {Mixed}                  return CodeMirror setting option value
          */
-        
-        getCodeMirrorOption : function(key) {            
+
+        getCodeMirrorOption: function (key) {
             return this.cm.getOption(key);
         },
-        
+
         /**
          * 配置和重配置CodeMirror的选项
          * CodeMirror setting options / resettings
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        setCodeMirrorOption : function(key, value) {
-            
+
+        setCodeMirrorOption: function (key, value) {
+
             this.cm.setOption(key, value);
-            
+
             return this;
         },
-        
+
         /**
          * 添加 CodeMirror 键盘快捷键
          * Add CodeMirror keyboard shortcuts key map
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        addKeyMap : function(map, bottom) {
+
+        addKeyMap: function (map, bottom) {
             this.cm.addKeyMap(map, bottom);
-            
+
             return this;
         },
-        
+
         /**
          * 移除 CodeMirror 键盘快捷键
          * Remove CodeMirror keyboard shortcuts key map
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        removeKeyMap : function(map) {
+
+        removeKeyMap: function (map) {
             this.cm.removeKeyMap(map);
-            
+
             return this;
         },
-        
+
         /**
          * 跳转到指定的行
          * Goto CodeMirror line
@@ -806,109 +776,96 @@
          * @param   {String|Intiger}   line      line number or "first"|"last"
          * @returns {editormd}                   返回editormd的实例对象
          */
-        
-        gotoLine : function (line) {
-            
-            var settings = settingNew;
-            
-            if (!settings.gotoLine)
-            {
+
+        gotoLine: function (line) {
+
+            var settings = this.settings;
+
+            if (!settings.gotoLine) {
                 return this;
             }
-            
-            var cm       = this.cm;
-            var editor   = this.editor;
-            var count    = cm.lineCount();
-            var preview  = this.preview;
-            
-            if (typeof line === "string")
-            {
-                if(line === "last")
-                {
+
+            var cm = this.cm;
+            var editor = this.editor;
+            var count = cm.lineCount();
+            var preview = this.preview;
+
+            if (typeof line === "string") {
+                if (line === "last") {
                     line = count;
                 }
-            
-                if (line === "first")
-                {
+
+                if (line === "first") {
                     line = 1;
                 }
             }
-            
-            if (typeof line !== "number") 
-            {  
+
+            if (typeof line !== "number") {
                 alert("Error: The line number must be an integer.");
                 return this;
             }
-            
-            line  = parseInt(line) - 1;
-            
-            if (line > count)
-            {
+
+            line = parseInt(line) - 1;
+
+            if (line > count) {
                 alert("Error: The line number range 1-" + count);
-                
+
                 return this;
             }
-            
-            cm.setCursor( {line : line, ch : 0} );
-            
-            var scrollInfo   = cm.getScrollInfo();
-            var clientHeight = scrollInfo.clientHeight; 
-            var coords       = cm.charCoords({line : line, ch : 0}, "local");
-            
-            cm.scrollTo(null, (coords.top + coords.bottom - clientHeight) / 2);
-            
-            if (settings.watch)
-            {            
-                var cmScroll  = this.codeMirror.find(".CodeMirror-scroll")[0];
-                var height    = $(cmScroll).height(); 
-                var scrollTop = cmScroll.scrollTop;         
-                var percent   = (scrollTop / cmScroll.scrollHeight);
 
-                if (scrollTop === 0)
-                {
+            cm.setCursor({ line: line, ch: 0 });
+
+            var scrollInfo = cm.getScrollInfo();
+            var clientHeight = scrollInfo.clientHeight;
+            var coords = cm.charCoords({ line: line, ch: 0 }, "local");
+
+            cm.scrollTo(null, (coords.top + coords.bottom - clientHeight) / 2);
+
+            if (settings.watch) {
+                var cmScroll = this.codeMirror.find(".CodeMirror-scroll")[0];
+                var height = $(cmScroll).height();
+                var scrollTop = cmScroll.scrollTop;
+                var percent = (scrollTop / cmScroll.scrollHeight);
+
+                if (scrollTop === 0) {
                     preview.scrollTop(0);
-                } 
-                else if (scrollTop + height >= cmScroll.scrollHeight - 16)
-                { 
-                    preview.scrollTop(preview[0].scrollHeight);                    
-                } 
-                else
-                {                    
+                }
+                else if (scrollTop + height >= cmScroll.scrollHeight - 16) {
+                    preview.scrollTop(preview[0].scrollHeight);
+                }
+                else {
                     preview.scrollTop(preview[0].scrollHeight * percent);
                 }
             }
 
             cm.focus();
-            
+
             return this;
         },
-        
+
         /**
          * 扩展当前实例对象，可同时设置多个或者只设置一个
          * Extend editormd instance object, can mutil setting.
          * 
          * @returns {editormd}                  this(editormd instance object.)
          */
-        
-        extend : function() {
-            if (typeof arguments[1] !== "undefined")
-            {
-                if (typeof arguments[1] === "function")
-                {
+
+        extend: function () {
+            if (typeof arguments[1] !== "undefined") {
+                if (typeof arguments[1] === "function") {
                     arguments[1] = $.proxy(arguments[1], this);
                 }
 
                 this[arguments[0]] = arguments[1];
             }
-            
-            if (typeof arguments[0] === "object" && typeof arguments[0].length === "undefined")
-            {
+
+            if (typeof arguments[0] === "object" && typeof arguments[0].length === "undefined") {
                 $.extend(true, this, arguments[0]);
             }
 
             return this;
         },
-        
+
         /**
          * 设置或扩展当前实例对象，单个设置
          * Extend editormd instance object, one by one
@@ -917,19 +874,18 @@
          * @param   {String|Object}   value     option value
          * @returns {editormd}                  this(editormd instance object.)
          */
-        
-        set : function (key, value) {
-            
-            if (typeof value !== "undefined" && typeof value === "function")
-            {
+
+        set: function (key, value) {
+
+            if (typeof value !== "undefined" && typeof value === "function") {
                 value = $.proxy(value, this);
             }
-            
+
             this[key] = value;
 
             return this;
         },
-        
+
         /**
          * 重新配置
          * Resetting editor options
@@ -938,26 +894,24 @@
          * @param   {String|Object}   value     option value
          * @returns {editormd}                  this(editormd instance object.)
          */
-        
-        config : function(key, value) {
-            var settings = settingNew;
-            
-            if (typeof key === "object")
-            {
+
+        config: function (key, value) {
+            var settings = this.settings;
+
+            if (typeof key === "object") {
                 settings = $.extend(true, settings, key);
             }
-            
-            if (typeof key === "string")
-            {
+
+            if (typeof key === "string") {
                 settings[key] = value;
             }
-            
-            settingNew = settings;
+
+            this.settings = settings;
             this.recreate();
-            
+
             return this;
         },
-        
+
         /**
          * 注册事件处理方法
          * Bind editor event handle
@@ -966,18 +920,17 @@
          * @param   {Function}   callback       回调函数
          * @returns {editormd}                  this(editormd instance object.)
          */
-        
-        on : function(eventType, callback) {
-            var settings = settingNew;
-            
-            if (typeof settings["on" + eventType] !== "undefined") 
-            {                
-                settings["on" + eventType] = $.proxy(callback, this);      
+
+        on: function (eventType, callback) {
+            var settings = this.settings;
+
+            if (typeof settings["on" + eventType] !== "undefined") {
+                settings["on" + eventType] = $.proxy(callback, this);
             }
 
             return this;
         },
-        
+
         /**
          * 解除事件处理方法
          * Unbind editor event handle
@@ -985,18 +938,17 @@
          * @param   {String}   eventType          event type
          * @returns {editormd}                    this(editormd instance object.)
          */
-        
-        off : function(eventType) {
-            var settings = settingNew;
-            
-            if (typeof settings["on" + eventType] !== "undefined") 
-            {
-                settings["on" + eventType] = function(){};
+
+        off: function (eventType) {
+            var settings = this.settings;
+
+            if (typeof settings["on" + eventType] !== "undefined") {
+                settings["on" + eventType] = function () { };
             }
-            
+
             return this;
         },
-        
+
         /**
          * 显示工具栏
          * Display toolbar
@@ -1004,29 +956,28 @@
          * @param   {Function} [callback=function(){}] 回调函数
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        showToolbar : function(callback) {
-            var settings = settingNew;
-            
-            if(settings.readOnly) {
+
+        showToolbar: function (callback) {
+            var settings = this.settings;
+
+            if (settings.readOnly) {
                 return this;
             }
-            
-            if (settings.toolbar && (this.toolbar.length < 1 || this.toolbar.find("." + this.classPrefix + "menu").html() === "") )
-            {
+
+            if (settings.toolbar && (this.toolbar.length < 1 || this.toolbar.find("." + this.classPrefix + "menu").html() === "")) {
                 this.setToolbar();
             }
-            
-            settings.toolbar = true; 
-            
+
+            settings.toolbar = true;
+
             this.toolbar.show();
             this.resize();
-            
-            $.proxy(callback || function(){}, this)();
+
+            $.proxy(callback || function () { }, this)();
 
             return this;
         },
-        
+
         /**
          * 隐藏工具栏
          * Hide toolbar
@@ -1034,155 +985,142 @@
          * @param   {Function} [callback=function(){}] 回调函数
          * @returns {editormd}                         this(editormd instance object.)
          */
-        
-        hideToolbar : function(callback) { 
-            var settings = settingNew;
-            
-            settings.toolbar = false;  
+
+        hideToolbar: function (callback) {
+            var settings = this.settings;
+
+            settings.toolbar = false;
             this.toolbar.hide();
             this.resize();
-            
-            $.proxy(callback || function(){}, this)();
+
+            $.proxy(callback || function () { }, this)();
 
             return this;
         },
-        
+
         /**
          * 页面滚动时工具栏的固定定位
          * Set toolbar in window scroll auto fixed position
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        setToolbarAutoFixed : function(fixed) {
-            
-            var state    = this.state;
-            var editor   = this.editor;
-            var toolbar  = this.toolbar;
-            var settings = settingNew;
-            
-            if (typeof fixed !== "undefined")
-            {
+
+        setToolbarAutoFixed: function (fixed) {
+
+            var state = this.state;
+            var editor = this.editor;
+            var toolbar = this.toolbar;
+            var settings = this.settings;
+
+            if (typeof fixed !== "undefined") {
                 settings.toolbarAutoFixed = fixed;
             }
-            
-            var autoFixedHandle = function(){
+
+            var autoFixedHandle = function () {
                 var $window = $(window);
-                var top     = $window.scrollTop();
-                
-                if (!settings.toolbarAutoFixed)
-                {
+                var top = $window.scrollTop();
+
+                if (!settings.toolbarAutoFixed) {
                     return false;
                 }
 
-                if (top - editor.offset().top > 10 && top < editor.height())
-                {
+                if (top - editor.offset().top > 10 && top < editor.height()) {
                     toolbar.css({
-                        position : "fixed",
-                        width    : editor.width() + "px",
-                        left     : ($window.width() - editor.width()) / 2 + "px"
+                        position: "fixed",
+                        width: editor.width() + "px",
+                        left: ($window.width() - editor.width()) / 2 + "px"
                     });
                 }
-                else
-                {
+                else {
                     toolbar.css({
-                        position : "absolute",
-                        width    : "100%",
-                        left     : 0
+                        position: "absolute",
+                        width: "100%",
+                        left: 0
                     });
                 }
             };
-            
-            if (!state.fullscreen && !state.preview && settings.toolbar && settings.toolbarAutoFixed)
-            {
+
+            if (!state.fullscreen && !state.preview && settings.toolbar && settings.toolbarAutoFixed) {
                 $(window).bind("scroll", autoFixedHandle);
             }
 
             return this;
         },
-        
+
         /**
          * 配置和初始化工具栏
          * Set toolbar and Initialization
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        setToolbar : function() {
-            var settings    = settingNew;  
-            
-            if(settings.readOnly) {
+
+        setToolbar: function () {
+            var settings = this.settings;
+
+            if (settings.readOnly) {
                 return this;
             }
-            
-            var editor      = this.editor;
-            var preview     = this.preview;
+
+            var editor = this.editor;
+            var preview = this.preview;
             var classPrefix = this.classPrefix;
-            
-            var toolbar     = this.toolbar = editor.children("." + classPrefix + "toolbar");
-            
-            if (settings.toolbar && toolbar.length < 1)
-            {            
+
+            var toolbar = this.toolbar = editor.children("." + classPrefix + "toolbar");
+
+            if (settings.toolbar && toolbar.length < 1) {
                 var toolbarHTML = "<div class=\"" + classPrefix + "toolbar\"><div class=\"" + classPrefix + "toolbar-container\"><ul class=\"" + classPrefix + "menu\"></ul></div></div>";
-                
+
                 editor.append(toolbarHTML);
                 toolbar = this.toolbar = editor.children("." + classPrefix + "toolbar");
             }
-            
-            if (!settings.toolbar) 
-            {
+
+            if (!settings.toolbar) {
                 toolbar.hide();
-                
+
                 return this;
             }
-            
+
             toolbar.show();
-            
-            var icons       = (typeof settings.toolbarIcons === "function") ? settings.toolbarIcons(this) 
-                            : ((typeof settings.toolbarIcons === "string")  ? editormd.toolbarModes[settings.toolbarIcons] : settings.toolbarIcons);
-            
+
+            var icons = (typeof settings.toolbarIcons === "function") ? settings.toolbarIcons(this)
+                : ((typeof settings.toolbarIcons === "string") ? editormd.toolbarModes[settings.toolbarIcons] : settings.toolbarIcons);
+
             var toolbarMenu = toolbar.find("." + this.classPrefix + "menu"), menu = "";
-            var pullRight   = false;
-            
-            for (var i = 0, len = icons.length; i < len; i++)
-            {
+            var pullRight = false;
+
+            for (var i = 0, len = icons.length; i < len; i++) {
                 var name = icons[i];
 
-                if (name === "||") 
-                { 
+                if (name === "||") {
                     pullRight = true;
-                } 
-                else if (name === "|")
-                {
+                }
+                else if (name === "|") {
                     menu += "<li class=\"divider\" unselectable=\"on\">|</li>";
                 }
-                else
-                {
+                else {
                     var isHeader = (/h(\d)/.test(name));
-                    var index    = name;
-                    
+                    var index = name;
+
                     if (name === "watch" && !settings.watch) {
                         index = "unwatch";
                     }
-                    
-                    var title     = settings.lang.toolbar[index];
+
+                    var title = settings.lang.toolbar[index];
                     var iconTexts = settings.toolbarIconTexts[index];
                     var iconClass = settings.toolbarIconsClass[index];
-                    
-                    title     = (typeof title     === "undefined") ? "" : title;
+
+                    title = (typeof title === "undefined") ? "" : title;
                     iconTexts = (typeof iconTexts === "undefined") ? "" : iconTexts;
                     iconClass = (typeof iconClass === "undefined") ? "" : iconClass;
 
                     var menuItem = pullRight ? "<li class=\"pull-right\">" : "<li>";
-                    
-                    if (typeof settings.toolbarCustomIcons[name] !== "undefined" && typeof settings.toolbarCustomIcons[name] !== "function")
-                    {
+
+                    if (typeof settings.toolbarCustomIcons[name] !== "undefined" && typeof settings.toolbarCustomIcons[name] !== "function") {
                         menuItem += settings.toolbarCustomIcons[name];
                     }
-                    else 
-                    {
+                    else {
                         menuItem += "<a href=\"javascript:;\" title=\"" + title + "\" unselectable=\"on\">";
-                        menuItem += "<i class=\"fa " + iconClass + "\" name=\""+name+"\" unselectable=\"on\">"+((isHeader) ? name.toUpperCase() : ( (iconClass === "") ? iconTexts : "") ) + "</i>";
+                        menuItem += "<i class=\"fa " + iconClass + "\" name=\"" + name + "\" unselectable=\"on\">" + ((isHeader) ? name.toUpperCase() : ((iconClass === "") ? iconTexts : "")) + "</i>";
                         menuItem += "</a>";
                     }
 
@@ -1193,16 +1131,16 @@
             }
 
             toolbarMenu.html(menu);
-            
+
             toolbarMenu.find("[title=\"Lowercase\"]").attr("title", settings.lang.toolbar.lowercase);
             toolbarMenu.find("[title=\"ucwords\"]").attr("title", settings.lang.toolbar.ucwords);
-            
+
             this.setToolbarHandler();
             this.setToolbarAutoFixed();
 
             return this;
         },
-        
+
         /**
          * 工具栏图标事件处理对象序列
          * Get toolbar icons event handlers
@@ -1211,74 +1149,70 @@
          * @param   {String}   name  要获取的事件处理器名称
          * @returns {Object}         返回处理对象序列
          */
-            
-        dialogLockScreen : function() {
+
+        dialogLockScreen: function () {
             $.proxy(editormd.dialogLockScreen, this)();
-            
+
             return this;
         },
 
-        dialogShowMask : function(dialog) {
+        dialogShowMask: function (dialog) {
             $.proxy(editormd.dialogShowMask, this)(dialog);
-            
+
             return this;
         },
-        
-        getToolbarHandles : function(name) {  
+
+        getToolbarHandles: function (name) {
             var toolbarHandlers = this.toolbarHandlers = editormd.toolbarHandlers;
-            
+
             return (name && typeof toolbarIconHandlers[name] !== "undefined") ? toolbarHandlers[name] : toolbarHandlers;
         },
-        
+
         /**
          * 工具栏图标事件处理器
          * Bind toolbar icons event handle
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        setToolbarHandler : function() {
-            var _this               = this;
-            var settings            = settingNew;
-            
+
+        setToolbarHandler: function () {
+            var _this = this;
+            var settings = this.settings;
+
             if (!settings.toolbar || settings.readOnly) {
                 return this;
             }
-            
-            var toolbar             = this.toolbar;
-            var cm                  = this.cm;
-            var classPrefix         = this.classPrefix;           
-            var toolbarIcons        = this.toolbarIcons = toolbar.find("." + classPrefix + "menu > li > a");  
-            var toolbarIconHandlers = this.getToolbarHandles();  
-                
-            toolbarIcons.bind(editormd.mouseOrTouch("click", "touchend"), function(event) {
 
-                var icon                = $(this).children(".fa");
-                var name                = icon.attr("name");
-                var cursor              = cm.getCursor();
-                var selection           = cm.getSelection();
+            var toolbar = this.toolbar;
+            var cm = this.cm;
+            var classPrefix = this.classPrefix;
+            var toolbarIcons = this.toolbarIcons = toolbar.find("." + classPrefix + "menu > li > a");
+            var toolbarIconHandlers = this.getToolbarHandles();
+
+            toolbarIcons.bind(editormd.mouseOrTouch("click", "touchend"), function (event) {
+
+                var icon = $(this).children(".fa");
+                var name = icon.attr("name");
+                var cursor = cm.getCursor();
+                var selection = cm.getSelection();
 
                 if (name === "") {
-                    return ;
+                    return;
                 }
-                
+
                 _this.activeIcon = icon;
 
-                if (typeof toolbarIconHandlers[name] !== "undefined") 
-                {
+                if (typeof toolbarIconHandlers[name] !== "undefined") {
                     $.proxy(toolbarIconHandlers[name], _this)(cm);
                 }
-                else 
-                {
-                    if (typeof settings.toolbarHandlers[name] !== "undefined") 
-                    {
+                else {
+                    if (typeof settings.toolbarHandlers[name] !== "undefined") {
                         $.proxy(settings.toolbarHandlers[name], _this)(cm, icon, cursor, selection);
                     }
                 }
-                
-                if (name !== "link" && name !== "reference-link" && name !== "image" && name !== "code-block" && 
-                    name !== "preformatted-text" && name !== "watch" && name !== "preview" && name !== "search" && name !== "fullscreen" && name !== "info") 
-                {
+
+                if (name !== "link" && name !== "reference-link" && name !== "image" && name !== "code-block" &&
+                    name !== "preformatted-text" && name !== "watch" && name !== "preview" && name !== "search" && name !== "fullscreen" && name !== "info") {
                     cm.focus();
                 }
 
@@ -1288,7 +1222,7 @@
 
             return this;
         },
-        
+
         /**
          * 动态创建对话框
          * Creating custom dialogs
@@ -1296,23 +1230,23 @@
          * @param   {Object} options  配置项键值对 Key/Value
          * @returns {dialog}          返回创建的dialog的jQuery实例对象
          */
-        
-        createDialog : function(options) {            
+
+        createDialog: function (options) {
             return $.proxy(editormd.createDialog, this)(options);
         },
-        
+
         /**
          * 创建关于Editor.md的对话框
          * Create about Editor.md dialog
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        createInfoDialog : function() {
-            var _this        = this;
-            var editor       = this.editor;
-            var classPrefix  = this.classPrefix;  
-            
+
+        createInfoDialog: function () {
+            var _this = this;
+            var editor = this.editor;
+            var classPrefix = this.classPrefix;
+
             var infoDialogHTML = [
                 "<div class=\"" + classPrefix + "dialog " + classPrefix + "dialog-info\" style=\"\">",
                 "<div class=\"" + classPrefix + "dialog-container\">",
@@ -1326,71 +1260,70 @@
             ].join("\n");
 
             editor.append(infoDialogHTML);
-            
-            var infoDialog  = this.infoDialog = editor.children("." + classPrefix + "dialog-info");
 
-            infoDialog.find("." + classPrefix + "dialog-close").bind(editormd.mouseOrTouch("click", "touchend"), function() {
+            var infoDialog = this.infoDialog = editor.children("." + classPrefix + "dialog-info");
+
+            infoDialog.find("." + classPrefix + "dialog-close").bind(editormd.mouseOrTouch("click", "touchend"), function () {
                 _this.hideInfoDialog();
             });
-            
+
             infoDialog.css("border", (editormd.isIE8) ? "1px solid #ddd" : "").css("z-index", editormd.dialogZindex).show();
-            
+
             this.infoDialogPosition();
 
             return this;
         },
-        
+
         /**
          * 关于Editor.md对话居中定位
          * Editor.md dialog position handle
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        infoDialogPosition : function() {
+
+        infoDialogPosition: function () {
             var infoDialog = this.infoDialog;
-            
-            var _infoDialogPosition = function() {
+
+            var _infoDialogPosition = function () {
                 infoDialog.css({
-                    top  : ($(window).height() - infoDialog.height()) / 2 + "px",
-                    left : ($(window).width()  - infoDialog.width()) / 2  + "px"
+                    top: ($(window).height() - infoDialog.height()) / 2 + "px",
+                    left: ($(window).width() - infoDialog.width()) / 2 + "px"
                 });
             };
 
             _infoDialogPosition();
 
             $(window).resize(_infoDialogPosition);
-            
+
             return this;
         },
-        
+
         /**
          * 显示关于Editor.md
          * Display about Editor.md dialog
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        showInfoDialog : function() {
+
+        showInfoDialog: function () {
 
             $("html,body").css("overflow-x", "hidden");
-            
-            var _this       = this;
-            var editor      = this.editor;
-            var settings    = settingNew;         
-            var infoDialog  = this.infoDialog = editor.children("." + this.classPrefix + "dialog-info");
-            
-            if (infoDialog.length < 1)
-            {
+
+            var _this = this;
+            var editor = this.editor;
+            var settings = this.settings;
+            var infoDialog = this.infoDialog = editor.children("." + this.classPrefix + "dialog-info");
+
+            if (infoDialog.length < 1) {
                 this.createInfoDialog();
             }
-            
+
             this.lockScreen(true);
-            
+
             this.mask.css({
-                        opacity         : settings.dialogMaskOpacity,
-                        backgroundColor : settings.dialogMaskBgColor
-                    }).show();
+                opacity: settings.dialogMaskOpacity,
+                backgroundColor: settings.dialogMaskBgColor
+            }).show();
 
             infoDialog.css("z-index", editormd.dialogZindex).show();
 
@@ -1398,15 +1331,15 @@
 
             return this;
         },
-        
+
         /**
          * 隐藏关于Editor.md
          * Hide about Editor.md dialog
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        hideInfoDialog : function() {            
+
+        hideInfoDialog: function () {
             $("html,body").css("overflow-x", "");
             this.infoDialog.hide();
             this.mask.hide();
@@ -1414,7 +1347,7 @@
 
             return this;
         },
-        
+
         /**
          * 锁屏
          * lock screen
@@ -1422,108 +1355,103 @@
          * @param   {Boolean}    lock    Boolean 布尔值，是否锁屏
          * @returns {editormd}           返回editormd的实例对象
          */
-        
-        lockScreen : function(lock) {
+
+        lockScreen: function (lock) {
             editormd.lockScreen(lock);
             this.resize();
 
             return this;
         },
-        
+
         /**
          * 编辑器界面重建，用于动态语言包或模块加载等
          * Recreate editor
          * 
          * @returns {editormd}  返回editormd的实例对象
          */
-        
-        recreate : function() {
-            var _this            = this;
-            var editor           = this.editor;
-            var settings         = settingNew;
-            
+
+        recreate: function () {
+            var _this = this;
+            var editor = this.editor;
+            var settings = this.settings;
+
             this.codeMirror.remove();
-            
+
             this.setCodeMirror();
 
-            if (!settings.readOnly) 
-            {
+            if (!settings.readOnly) {
                 if (editor.find(".editormd-dialog").length > 0) {
                     editor.find(".editormd-dialog").remove();
                 }
-                
-                if (settings.toolbar) 
-                {  
-                    this.getToolbarHandles();                  
+
+                if (settings.toolbar) {
+                    this.getToolbarHandles();
                     this.setToolbar();
                 }
             }
-            
+
             this.loadedDisplay(true);
 
             return this;
         },
-        
+
         /**
          * 高亮预览HTML的pre代码部分
          * highlight of preview codes
          * 
          * @returns {editormd}             返回editormd的实例对象
          */
-        
-        previewCodeHighlight : function() {    
-            var settings         = settingNew;
+
+        previewCodeHighlight: function () {
+            var settings = this.settings;
             var previewContainer = this.previewContainer;
-            
-            if (settings.previewCodeHighlight) 
-            {
+
+            if (settings.previewCodeHighlight) {
                 previewContainer.find("pre").addClass("prettyprint linenums");
-                
-                if (typeof prettyPrint !== "undefined")
-                {                    
+
+                if (typeof prettyPrint !== "undefined") {
                     prettyPrint();
                 }
             }
 
             return this;
         },
-        
+
         /**
          * 解析TeX(KaTeX)科学公式
          * TeX(KaTeX) Renderer
          * 
          * @returns {editormd}             返回editormd的实例对象
          */
-        
-        katexRender : function() {
-            
-            if (timer === null)
-            {
+
+        katexRender: function () {
+
+            if (timer === null) {
                 return this;
             }
-            
-            this.previewContainer.find("." + editormd.classNames.tex).each(function(){
-                var tex  = $(this);
+
+            this.previewContainer.find("." + editormd.classNames.tex).each(function () {
+                var tex = $(this);
                 editormd.$katex.render(tex.text(), tex[0]);
-                
+
                 tex.find(".katex").css("font-size", "1.0em");
-            });   
+            });
 
             return this;
         },
-        
+
         /**
          * 解析和渲染流程图及时序图
          * FlowChart and SequenceDiagram Renderer
          * 
          * @returns {editormd}             返回editormd的实例对象
          */
-        
-        flowChartAndSequenceDiagramRender : function() {
-            var $this            = this;
-            var settings         = settingNew;
+
+        flowChartAndSequenceDiagramRender: function () {
+            var $this = this;
+            var settings = this.settings;
             var previewContainer = this.previewContainer;
-            
+
             if (editormd.isIE8) {
                 return this;
             }
@@ -1532,46 +1460,43 @@
                 if (flowchartTimer === null) {
                     return this;
                 }
-                
-                previewContainer.find(".flowchart").flowChart(); 
+
+                previewContainer.find(".flowchart").flowChart();
             }
 
             if (settings.sequenceDiagram) {
-                previewContainer.find(".sequence-diagram").sequenceDiagram({theme: "simple"});
+                previewContainer.find(".sequence-diagram").sequenceDiagram({ theme: "simple" });
             }
-                    
-            var preview    = $this.preview;
-            var codeMirror = $this.codeMirror;
-            var codeView   = codeMirror.find(".CodeMirror-scroll");
 
-            var height    = codeView.height();
-            var scrollTop = codeView.scrollTop();                    
-            var percent   = (scrollTop / codeView[0].scrollHeight);
+            var preview = $this.preview;
+            var codeMirror = $this.codeMirror;
+            var codeView = codeMirror.find(".CodeMirror-scroll");
+
+            var height = codeView.height();
+            var scrollTop = codeView.scrollTop();
+            var percent = (scrollTop / codeView[0].scrollHeight);
             var tocHeight = 0;
 
-            preview.find(".markdown-toc-list").each(function(){
+            preview.find(".markdown-toc-list").each(function () {
                 tocHeight += $(this).height();
             });
 
-            var tocMenuHeight = preview.find(".editormd-toc-menu").height(); 
+            var tocMenuHeight = preview.find(".editormd-toc-menu").height();
             tocMenuHeight = (!tocMenuHeight) ? 0 : tocMenuHeight;
 
-            if (scrollTop === 0) 
-            {
+            if (scrollTop === 0) {
                 preview.scrollTop(0);
-            } 
-            else if (scrollTop + height >= codeView[0].scrollHeight - 16)
-            { 
-                preview.scrollTop(preview[0].scrollHeight);                        
-            } 
-            else
-            {                  
+            }
+            else if (scrollTop + height >= codeView[0].scrollHeight - 16) {
+                preview.scrollTop(preview[0].scrollHeight);
+            }
+            else {
                 preview.scrollTop((preview[0].scrollHeight + tocHeight + tocMenuHeight) * percent);
             }
 
             return this;
         },
-        
+
         /**
          * 注册键盘快捷键处理
          * Register CodeMirror keyMaps (keyboard shortcuts).
@@ -1579,73 +1504,65 @@
          * @param   {Object}    keyMap      KeyMap key/value {"(Ctrl/Shift/Alt)-Key" : function(){}}
          * @returns {editormd}              return this
          */
-        
-        registerKeyMaps : function(keyMap) {
-            
-            var _this           = this;
-            var cm              = this.cm;
-            var settings        = settingNew;
+
+        registerKeyMaps: function (keyMap) {
+
+            var _this = this;
+            var cm = this.cm;
+            var settings = this.settings;
             var toolbarHandlers = editormd.toolbarHandlers;
             var disabledKeyMaps = settings.disabledKeyMaps;
-            
-            keyMap              = keyMap || null;
-            
-            if (keyMap)
-            {
-                for (var i in keyMap)
-                {
-                    if ($.inArray(i, disabledKeyMaps) < 0)
-                    {
+
+            keyMap = keyMap || null;
+
+            if (keyMap) {
+                for (var i in keyMap) {
+                    if ($.inArray(i, disabledKeyMaps) < 0) {
                         var map = {};
-                        map[i]  = keyMap[i];
+                        map[i] = keyMap[i];
 
                         cm.addKeyMap(keyMap);
                     }
                 }
             }
-            else
-            {
-                for (var k in editormd.keyMaps)
-                {
+            else {
+                for (var k in editormd.keyMaps) {
                     var _keyMap = editormd.keyMaps[k];
                     var handle = (typeof _keyMap === "string") ? $.proxy(toolbarHandlers[_keyMap], _this) : $.proxy(_keyMap, _this);
-                    
-                    if ($.inArray(k, ["F9", "F10", "F11"]) < 0 && $.inArray(k, disabledKeyMaps) < 0)
-                    {
+
+                    if ($.inArray(k, ["F9", "F10", "F11"]) < 0 && $.inArray(k, disabledKeyMaps) < 0) {
                         var _map = {};
                         _map[k] = handle;
 
                         cm.addKeyMap(_map);
                     }
                 }
-                
-                $(window).keydown(function(event) {
-                    
+
+                $(window).keydown(function (event) {
+
                     var keymaps = {
-                        "120" : "F9",
-                        "121" : "F10",
-                        "122" : "F11"
+                        "120": "F9",
+                        "121": "F10",
+                        "122": "F11"
                     };
-                    
-                    if ( $.inArray(keymaps[event.keyCode], disabledKeyMaps) < 0 )
-                    {
-                        switch (event.keyCode)
-                        {
+
+                    if ($.inArray(keymaps[event.keyCode], disabledKeyMaps) < 0) {
+                        switch (event.keyCode) {
                             case 120:
-                                    $.proxy(toolbarHandlers["watch"], _this)();
-                                    return false;
+                                $.proxy(toolbarHandlers["watch"], _this)();
+                                return false;
                                 break;
-                                
+
                             case 121:
-                                    $.proxy(toolbarHandlers["preview"], _this)();
-                                    return false;
+                                $.proxy(toolbarHandlers["preview"], _this)();
+                                return false;
                                 break;
-                                
+
                             case 122:
-                                    $.proxy(toolbarHandlers["fullscreen"], _this)();                        
-                                    return false;
+                                $.proxy(toolbarHandlers["fullscreen"], _this)();
+                                return false;
                                 break;
-                                
+
                             default:
                                 break;
                         }
@@ -1655,130 +1572,123 @@
 
             return this;
         },
-        
+
         /**
          * 绑定同步滚动
          * 
          * @returns {editormd} return this
          */
-        
-        bindScrollEvent : function() {
-            
-            var _this            = this;
-            var preview          = this.preview;
-            var settings         = settingNew;
-            var codeMirror       = this.codeMirror;
-            var mouseOrTouch     = editormd.mouseOrTouch;
-            
+
+        bindScrollEvent: function () {
+
+            var _this = this;
+            var preview = this.preview;
+            var settings = this.settings;
+            var codeMirror = this.codeMirror;
+            var mouseOrTouch = editormd.mouseOrTouch;
+
             if (!settings.syncScrolling) {
                 return this;
             }
-                
-            var cmBindScroll = function() {    
-                codeMirror.find(".CodeMirror-scroll").bind(mouseOrTouch("scroll", "touchmove"), function(event) {
-                    var height    = $(this).height();
-                    var scrollTop = $(this).scrollTop();                    
-                    var percent   = (scrollTop / $(this)[0].scrollHeight);
-                    
+
+            var cmBindScroll = function () {
+                codeMirror.find(".CodeMirror-scroll").bind(mouseOrTouch("scroll", "touchmove"), function (event) {
+                    var height = $(this).height();
+                    var scrollTop = $(this).scrollTop();
+                    var percent = (scrollTop / $(this)[0].scrollHeight);
+
                     var tocHeight = 0;
-                    
-                    preview.find(".markdown-toc-list").each(function(){
+
+                    preview.find(".markdown-toc-list").each(function () {
                         tocHeight += $(this).height();
                     });
-                    
+
                     var tocMenuHeight = preview.find(".editormd-toc-menu").height();
                     tocMenuHeight = (!tocMenuHeight) ? 0 : tocMenuHeight;
 
-                    if (scrollTop === 0) 
-                    {
+                    if (scrollTop === 0) {
                         preview.scrollTop(0);
-                    } 
-                    else if (scrollTop + height >= $(this)[0].scrollHeight - 16)
-                    { 
-                        preview.scrollTop(preview[0].scrollHeight);                        
-                    } 
-                    else
-                    {
-                        preview.scrollTop((preview[0].scrollHeight  + tocHeight + tocMenuHeight) * percent);
                     }
-                    
+                    else if (scrollTop + height >= $(this)[0].scrollHeight - 16) {
+                        preview.scrollTop(preview[0].scrollHeight);
+                    }
+                    else {
+                        preview.scrollTop((preview[0].scrollHeight + tocHeight + tocMenuHeight) * percent);
+                    }
+
                     $.proxy(settings.onscroll, _this)(event);
                 });
             };
 
-            var cmUnbindScroll = function() {
+            var cmUnbindScroll = function () {
                 codeMirror.find(".CodeMirror-scroll").unbind(mouseOrTouch("scroll", "touchmove"));
             };
 
-            var previewBindScroll = function() {
-                
-                preview.bind(mouseOrTouch("scroll", "touchmove"), function(event) {
-                    var height    = $(this).height();
-                    var scrollTop = $(this).scrollTop();         
-                    var percent   = (scrollTop / $(this)[0].scrollHeight);
-                    var codeView  = codeMirror.find(".CodeMirror-scroll");
+            var previewBindScroll = function () {
 
-                    if(scrollTop === 0) 
-                    {
+                preview.bind(mouseOrTouch("scroll", "touchmove"), function (event) {
+                    var height = $(this).height();
+                    var scrollTop = $(this).scrollTop();
+                    var percent = (scrollTop / $(this)[0].scrollHeight);
+                    var codeView = codeMirror.find(".CodeMirror-scroll");
+
+                    if (scrollTop === 0) {
                         codeView.scrollTop(0);
                     }
-                    else if (scrollTop + height >= $(this)[0].scrollHeight)
-                    {
-                        codeView.scrollTop(codeView[0].scrollHeight);                        
+                    else if (scrollTop + height >= $(this)[0].scrollHeight) {
+                        codeView.scrollTop(codeView[0].scrollHeight);
                     }
-                    else 
-                    {
+                    else {
                         codeView.scrollTop(codeView[0].scrollHeight * percent);
                     }
-                    
+
                     $.proxy(settings.onpreviewscroll, _this)(event);
                 });
 
             };
 
-            var previewUnbindScroll = function() {
+            var previewUnbindScroll = function () {
                 preview.unbind(mouseOrTouch("scroll", "touchmove"));
-            }; 
+            };
 
             codeMirror.bind({
-                mouseover  : cmBindScroll,
-                mouseout   : cmUnbindScroll,
-                touchstart : cmBindScroll,
-                touchend   : cmUnbindScroll
+                mouseover: cmBindScroll,
+                mouseout: cmUnbindScroll,
+                touchstart: cmBindScroll,
+                touchend: cmUnbindScroll
             });
-            
+
             if (settings.syncScrolling === "single") {
                 return this;
             }
-            
+
             preview.bind({
-                mouseover  : previewBindScroll,
-                mouseout   : previewUnbindScroll,
-                touchstart : previewBindScroll,
-                touchend   : previewUnbindScroll
+                mouseover: previewBindScroll,
+                mouseout: previewUnbindScroll,
+                touchstart: previewBindScroll,
+                touchend: previewUnbindScroll
             });
 
             return this;
         },
-        
-        bindChangeEvent : function() {
-            
-            var _this            = this;
-            var cm               = this.cm;
-            var settings         = settingNew;
-            
+
+        bindChangeEvent: function () {
+
+            var _this = this;
+            var cm = this.cm;
+            var settings = this.settings;
+
             if (!settings.syncScrolling) {
                 return this;
             }
-            
-            cm.on("change", function(_cm, changeObj) {
-                
-                if (settings.watch)
-                {
+
+            cm.on("change", function (_cm, changeObj) {
+
+                if (settings.watch) {
                     _this.previewContainer.css("padding", settings.autoHeight ? "20px 20px 50px 40px" : "20px");
                 }
-                
-                timer = setTimeout(function() {
+
+                timer = setTimeout(function () {
                     clearTimeout(timer);
                     _this.save();
                     timer = null;
@@ -1787,7 +1697,7 @@
 
             return this;
         },
-        
+
         /**
          * 加载队列完成之后的显示处理
          * Display handle of the module queues loaded after.
@@ -1795,47 +1705,46 @@
          * @param   {Boolean}   recreate   是否为重建编辑器
          * @returns {editormd}             返回editormd的实例对象
          */
-        
-        loadedDisplay : function(recreate) {
-            
-            recreate             = recreate || false;
-            
-            var _this            = this;
-            var editor           = this.editor;
-            var preview          = this.preview;
-            var settings         = settingNew;
-            
+
+        loadedDisplay: function (recreate) {
+
+            recreate = recreate || false;
+
+            var _this = this;
+            var editor = this.editor;
+            var preview = this.preview;
+            var settings = this.settings;
+
             this.containerMask.hide();
-            
+
             this.save();
-            
+
             if (settings.watch) {
                 preview.show();
             }
-            
+
             editor.data("oldWidth", editor.width()).data("oldHeight", editor.height()); // 为了兼容Zepto
-            
+
             this.resize();
             this.registerKeyMaps();
-            
-            $(window).resize(function(){
+
+            $(window).resize(function () {
                 _this.resize();
             });
-            
+
             this.bindScrollEvent().bindChangeEvent();
-            
-            if (!recreate)
-            {
+
+            if (!recreate) {
                 // TODO url完善
-                settings.imageUploadURL && initEditormdPasteUpload( this ,  settings.imageUploadURL)
+                settings.imageUploadURL && initEditormdPasteUpload(this, settings.imageUploadURL)
                 $.proxy(settings.onload, this)();
             }
-            
+
             this.state.loaded = true;
 
             return this;
         },
-        
+
         /**
          * 设置编辑器的宽度
          * Set editor width
@@ -1843,15 +1752,15 @@
          * @param   {Number|String} width  编辑器宽度值
          * @returns {editormd}             返回editormd的实例对象
          */
-        
-        width : function(width) {
-                
-            this.editor.css("width", (typeof width === "number") ? width  + "px" : width);            
+
+        width: function (width) {
+
+            this.editor.css("width", (typeof width === "number") ? width + "px" : width);
             this.resize();
-            
+
             return this;
         },
-        
+
         /**
          * 设置编辑器的高度
          * Set editor height
@@ -1859,15 +1768,15 @@
          * @param   {Number|String} height  编辑器高度值
          * @returns {editormd}              返回editormd的实例对象
          */
-        
-        height : function(height) {
-                
-            this.editor.css("height", (typeof height === "number")  ? height  + "px" : height);            
+
+        height: function (height) {
+
+            this.editor.css("height", (typeof height === "number") ? height + "px" : height);
             this.resize();
-            
+
             return this;
         },
-        
+
         /**
          * 调整编辑器的尺寸和布局
          * Resize editor layout
@@ -1876,246 +1785,219 @@
          * @param   {Number|String} [height=null] 编辑器高度值
          * @returns {editormd}                    返回editormd的实例对象
          */
-        
-        resize : function(width, height) {
-            
-            width  = width  || null;
+
+        resize: function (width, height) {
+
+            width = width || null;
             height = height || null;
-            
-            var state      = this.state;
-            var editor     = this.editor;
-            var preview    = this.preview;
-            var toolbar    = this.toolbar;
-            var settings   = settingNew;
+
+            var state = this.state;
+            var editor = this.editor;
+            var preview = this.preview;
+            var toolbar = this.toolbar;
+            var settings = this.settings;
             var codeMirror = this.codeMirror;
-            
-            if (width)
-            {
-                editor.css("width", (typeof width  === "number") ? width  + "px" : width);
+
+            if (width) {
+                editor.css("width", (typeof width === "number") ? width + "px" : width);
             }
-            
-            if (settings.autoHeight && !state.fullscreen && !state.preview)
-            {
+
+            if (settings.autoHeight && !state.fullscreen && !state.preview) {
                 editor.css("height", "auto");
                 codeMirror.css("height", "auto");
-            } 
-            else 
-            {
-                if (height) 
-                {
+            }
+            else {
+                if (height) {
                     editor.css("height", (typeof height === "number") ? height + "px" : height);
                 }
-                
-                if (state.fullscreen)
-                {
+
+                if (state.fullscreen) {
                     editor.height($(window).height());
                 }
 
-                if (settings.toolbar && !settings.readOnly) 
-                {
+                if (settings.toolbar && !settings.readOnly) {
                     codeMirror.css("margin-top", toolbar.height() + 1).height(editor.height() - toolbar.height());
-                } 
-                else
-                {
+                }
+                else {
                     codeMirror.css("margin-top", 0).height(editor.height());
                 }
             }
-            
-            if(settings.watch) 
-            {
+
+            if (settings.watch) {
                 codeMirror.width(editor.width() / 2);
                 preview.width((!state.preview) ? editor.width() / 2 : editor.width());
-                
+
                 this.previewContainer.css("padding", settings.autoHeight ? "20px 20px 50px 40px" : "20px");
-                
-                if (settings.toolbar && !settings.readOnly) 
-                {
+
+                if (settings.toolbar && !settings.readOnly) {
                     preview.css("top", toolbar.height() + 1);
-                } 
-                else 
-                {
+                }
+                else {
                     preview.css("top", 0);
                 }
-                
-                if (settings.autoHeight && !state.fullscreen && !state.preview)
-                {
+
+                if (settings.autoHeight && !state.fullscreen && !state.preview) {
                     preview.height("");
                 }
-                else
-                {                
+                else {
                     var previewHeight = (settings.toolbar && !settings.readOnly) ? editor.height() - toolbar.height() : editor.height();
-                    
+
                     preview.height(previewHeight);
                 }
-            } 
-            else 
-            {
+            }
+            else {
                 codeMirror.width(editor.width());
                 preview.hide();
             }
-            
-            if (state.loaded) 
-            {
+
+            if (state.loaded) {
                 $.proxy(settings.onresize, this)();
             }
 
             return this;
         },
-        
+
         /**
          * 解析和保存Markdown代码
          * Parse & Saving Markdown source code
          * 
          * @returns {editormd}     返回editormd的实例对象
          */
-        
-        save : function() {
-            
-            if (timer === null)
-            {
+
+        save: function () {
+
+            if (timer === null) {
                 return this;
             }
-            
-            var _this            = this;
-            var state            = this.state;
-            var settings         = settingNew;
-            var cm               = this.cm;            
-            var cmValue          = cm.getValue();
+
+            var _this = this;
+            var state = this.state;
+            var settings = this.settings;
+            var cm = this.cm;
+            var cmValue = cm.getValue();
             var previewContainer = this.previewContainer;
 
-            if (settings.mode !== "gfm" && settings.mode !== "markdown") 
-            {
+            if (settings.mode !== "gfm" && settings.mode !== "markdown") {
                 this.markdownTextarea.val(cmValue);
-                
+
                 return this;
             }
-            
-            var marked          = editormd.$marked;
-            var markdownToC     = this.markdownToC = [];            
-            var rendererOptions = this.markedRendererOptions = {  
-                toc                  : settings.toc,
-                tocm                 : settings.tocm,
-                tocStartLevel        : settings.tocStartLevel,
-                pageBreak            : settings.pageBreak,
-                taskList             : settings.taskList,
-                emoji                : settings.emoji,
-                tex                  : settings.tex,
-                atLink               : settings.atLink,           // for @link
-                emailLink            : settings.emailLink,        // for mail address auto link
-                flowChart            : settings.flowChart,
-                sequenceDiagram      : settings.sequenceDiagram,
-                previewCodeHighlight : settings.previewCodeHighlight,
+
+            var marked = editormd.$marked;
+            var markdownToC = this.markdownToC = [];
+            var rendererOptions = this.markedRendererOptions = {
+                toc: settings.toc,
+                tocm: settings.tocm,
+                tocStartLevel: settings.tocStartLevel,
+                pageBreak: settings.pageBreak,
+                taskList: settings.taskList,
+                emoji: settings.emoji,
+                tex: settings.tex,
+                atLink: settings.atLink,           // for @link
+                emailLink: settings.emailLink,        // for mail address auto link
+                flowChart: settings.flowChart,
+                sequenceDiagram: settings.sequenceDiagram,
+                previewCodeHighlight: settings.previewCodeHighlight,
             };
-            
+
             var markedOptions = this.markedOptions = {
-                renderer    : editormd.markedRenderer(markdownToC, rendererOptions),
-                gfm         : true,
-                tables      : true,
-                breaks      : true,
-                pedantic    : false,
-                sanitize    : (settings.htmlDecode) ? false : true,  // 关闭忽略HTML标签，即开启识别HTML标签，默认为false
-                smartLists  : true,
-                smartypants : true
+                renderer: editormd.markedRenderer(markdownToC, rendererOptions),
+                gfm: true,
+                tables: true,
+                breaks: true,
+                pedantic: false,
+                sanitize: (settings.htmlDecode) ? false : true,  // 关闭忽略HTML标签，即开启识别HTML标签，默认为false
+                smartLists: true,
+                smartypants: true
             };
-            
+
             marked.setOptions(markedOptions);
-                    
+
             var newMarkdownDoc = editormd.$marked(cmValue, markedOptions);
-            
+
             //console.info("cmValue", cmValue, newMarkdownDoc);
-            
+
             newMarkdownDoc = editormd.filterHTMLTags(newMarkdownDoc, settings.htmlDecode);
-            
+
             //console.error("cmValue", cmValue, newMarkdownDoc);
-            
+
             this.markdownTextarea.text(cmValue);
-            
+
             cm.save();
-            
-            if (settings.saveHTMLToTextarea) 
-            {
+
+            if (settings.saveHTMLToTextarea) {
                 this.htmlTextarea.text(newMarkdownDoc);
             }
-            
-            if(settings.watch || (!settings.watch && state.preview))
-            {
+
+            if (settings.watch || (!settings.watch && state.preview)) {
                 previewContainer.html(newMarkdownDoc);
 
                 this.previewCodeHighlight();
-                
-                if (settings.toc) 
-                {
+
+                if (settings.toc) {
                     var tocContainer = (settings.tocContainer === "") ? previewContainer : $(settings.tocContainer);
-                    var tocMenu      = tocContainer.find("." + this.classPrefix + "toc-menu");
-                    
+                    var tocMenu = tocContainer.find("." + this.classPrefix + "toc-menu");
+
                     tocContainer.attr("previewContainer", (settings.tocContainer === "") ? "true" : "false");
-                    
-                    if (settings.tocContainer !== "" && tocMenu.length > 0)
-                    {
+
+                    if (settings.tocContainer !== "" && tocMenu.length > 0) {
                         tocMenu.remove();
                     }
-                    
+
                     editormd.markdownToCRenderer(markdownToC, tocContainer, settings.tocDropdown, settings.tocStartLevel);
-            
-                    if (settings.tocDropdown || tocContainer.find("." + this.classPrefix + "toc-menu").length > 0)
-                    {
+
+                    if (settings.tocDropdown || tocContainer.find("." + this.classPrefix + "toc-menu").length > 0) {
                         editormd.tocDropdownMenu(tocContainer, (settings.tocTitle !== "") ? settings.tocTitle : this.lang.tocTitle);
                     }
-            
-                    if (settings.tocContainer !== "")
-                    {
+
+                    if (settings.tocContainer !== "") {
                         previewContainer.find(".markdown-toc").css("border", "none");
                     }
                 }
-                
-                if (settings.tex)
-                {
-                    if (!editormd.kaTeXLoaded && settings.autoLoadModules) 
-                    {
-                        editormd.loadKaTeX(function() {
+
+                if (settings.tex) {
+                    if (!editormd.kaTeXLoaded && settings.autoLoadModules) {
+                        editormd.loadKaTeX(function () {
                             editormd.$katex = katex;
                             editormd.kaTeXLoaded = true;
                             _this.katexRender();
                         });
-                    } 
-                    else 
-                    {
+                    }
+                    else {
                         editormd.$katex = katex;
                         this.katexRender();
                     }
-                }                
-                
-                if (settings.flowChart || settings.sequenceDiagram)
-                {
-                    flowchartTimer = setTimeout(function(){
+                }
+
+                if (settings.flowChart || settings.sequenceDiagram) {
+                    flowchartTimer = setTimeout(function () {
                         clearTimeout(flowchartTimer);
                         _this.flowChartAndSequenceDiagramRender();
                         flowchartTimer = null;
                     }, 10);
                 }
 
-                if (state.loaded) 
-                {
+                if (state.loaded) {
                     $.proxy(settings.onchange, this)();
                 }
             }
 
             return this;
         },
-        
+
         /**
          * 聚焦光标位置
          * Focusing the cursor position
          * 
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        focus : function() {
+
+        focus: function () {
             this.cm.focus();
 
             return this;
         },
-        
+
         /**
          * 设置光标的位置
          * Set cursor position
@@ -2123,24 +2005,24 @@
          * @param   {Object}    cursor 要设置的光标位置键值对象，例：{line:1, ch:0}
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        setCursor : function(cursor) {
+
+        setCursor: function (cursor) {
             this.cm.setCursor(cursor);
 
             return this;
         },
-        
+
         /**
          * 获取当前光标的位置
          * Get the current position of the cursor
          * 
          * @returns {Cursor}         返回一个光标Cursor对象
          */
-        
-        getCursor : function() {
+
+        getCursor: function () {
             return this.cm.getCursor();
         },
-        
+
         /**
          * 设置光标选中的范围
          * Set cursor selected ranges
@@ -2149,25 +2031,25 @@
          * @param   {Object}    to     结束位置的光标键值对象，例：{line:1, ch:0}
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        setSelection : function(from, to) {
-        
+
+        setSelection: function (from, to) {
+
             this.cm.setSelection(from, to);
-        
+
             return this;
         },
-        
+
         /**
          * 获取光标选中的文本
          * Get the texts from cursor selected
          * 
          * @returns {String}         返回选中文本的字符串形式
          */
-        
-        getSelection : function() {
+
+        getSelection: function () {
             return this.cm.getSelection();
         },
-        
+
         /**
          * 设置光标选中的文本范围
          * Set the cursor selection ranges
@@ -2175,24 +2057,24 @@
          * @param   {Array}    ranges  cursor selection ranges array
          * @returns {Array}            return this
          */
-        
-        setSelections : function(ranges) {
+
+        setSelections: function (ranges) {
             this.cm.setSelections(ranges);
-            
+
             return this;
         },
-        
+
         /**
          * 获取光标选中的文本范围
          * Get the cursor selection ranges
          * 
          * @returns {Array}         return selection ranges array
          */
-        
-        getSelections : function() {
+
+        getSelections: function () {
             return this.cm.getSelections();
         },
-        
+
         /**
          * 替换当前光标选中的文本或在当前光标处插入新字符
          * Replace the text at the current cursor selected or insert a new character at the current cursor position
@@ -2200,13 +2082,13 @@
          * @param   {String}    value  要插入的字符值
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        replaceSelection : function(value) {
+
+        replaceSelection: function (value) {
             this.cm.replaceSelection(value);
 
             return this;
         },
-        
+
         /**
          * 在当前光标处插入新字符
          * Insert a new character at the current cursor position
@@ -2217,13 +2099,13 @@
          * @param   {String}    value  要插入的字符值
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        insertValue : function(value) {
+
+        insertValue: function (value) {
             this.replaceSelection(value);
 
             return this;
         },
-        
+
         /**
          * 追加markdown
          * append Markdown to editor
@@ -2231,16 +2113,16 @@
          * @param   {String}    md     要追加的markdown源文档
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        appendMarkdown : function(md) {
-            var settings = settingNew;
-            var cm       = this.cm;
-            
+
+        appendMarkdown: function (md) {
+            var settings = this.settings;
+            var cm = this.cm;
+
             cm.setValue(cm.getValue() + md);
-            
+
             return this;
         },
-        
+
         /**
          * 设置和传入编辑器的markdown源文档
          * Set Markdown source document
@@ -2248,35 +2130,35 @@
          * @param   {String}    md     要传入的markdown源文档
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        setMarkdown : function(md) {
-            this.cm.setValue(md || settingNew.markdown);
-            
+
+        setMarkdown: function (md) {
+            this.cm.setValue(md || this.settings.markdown);
+
             return this;
         },
-        
+
         /**
          * 获取编辑器的markdown源文档
          * Set Editor.md markdown/CodeMirror value
          * 
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        getMarkdown : function() {
+
+        getMarkdown: function () {
             return this.cm.getValue();
         },
-        
+
         /**
          * 获取编辑器的源文档
          * Get CodeMirror value
          * 
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        getValue : function() {
+
+        getValue: function () {
             return this.cm.getValue();
         },
-        
+
         /**
          * 设置编辑器的源文档
          * Set CodeMirror value
@@ -2284,153 +2166,146 @@
          * @param   {String}     value   set code/value/string/text
          * @returns {editormd}           返回editormd的实例对象
          */
-        
-        setValue : function(value) {
+
+        setValue: function (value) {
             this.cm.setValue(value);
-            
+
             return this;
         },
-        
+
         /**
          * 清空编辑器
          * Empty CodeMirror editor container
          * 
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        clear : function() {
+
+        clear: function () {
             this.cm.setValue("");
-            
+
             return this;
         },
-        
+
         /**
          * 获取解析后存放在Textarea的HTML源码
          * Get parsed html code from Textarea
          * 
          * @returns {String}               返回HTML源码
          */
-        
-        getHTML : function() {
-            if (!settingNew.saveHTMLToTextarea)
-            {
+
+        getHTML: function () {
+            if (!this.settings.saveHTMLToTextarea) {
                 alert("Error: settings.saveHTMLToTextarea == false");
 
                 return false;
             }
-            
+
             return this.htmlTextarea.val();
         },
-        
+
         /**
          * getHTML()的别名
          * getHTML (alias)
          * 
          * @returns {String}           Return html code 返回HTML源码
          */
-        
-        getTextareaSavedHTML : function() {
+
+        getTextareaSavedHTML: function () {
             return this.getHTML();
         },
-        
+
         /**
          * 获取预览窗口的HTML源码
          * Get html from preview container
          * 
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        getPreviewedHTML : function() {
-            if (!settingNew.watch)
-            {
+
+        getPreviewedHTML: function () {
+            if (!this.settings.watch) {
                 alert("Error: settings.watch == false");
 
                 return false;
             }
-            
+
             return this.previewContainer.html();
         },
-        
+
         /**
          * 开启实时预览
          * Enable real-time watching
          * 
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        watch : function(callback) {     
-            var settings        = settingNew;
-            
-            if ($.inArray(settings.mode, ["gfm", "markdown"]) < 0)
-            {
+
+        watch: function (callback) {
+            var settings = this.settings;
+
+            if ($.inArray(settings.mode, ["gfm", "markdown"]) < 0) {
                 return this;
             }
-            
+
             this.state.watching = settings.watch = true;
             this.preview.show();
-            
-            if (this.toolbar)
-            {
-                var watchIcon   = settings.toolbarIconsClass.watch;
+
+            if (this.toolbar) {
+                var watchIcon = settings.toolbarIconsClass.watch;
                 var unWatchIcon = settings.toolbarIconsClass.unwatch;
-                
-                var icon        = this.toolbar.find(".fa[name=watch]");
+
+                var icon = this.toolbar.find(".fa[name=watch]");
                 icon.parent().attr("title", settings.lang.toolbar.watch);
                 icon.removeClass(unWatchIcon).addClass(watchIcon);
             }
-            
-            this.codeMirror.css("border-right", "1px solid #ddd").width(this.editor.width() / 2); 
-            
+
+            this.codeMirror.css("border-right", "1px solid #ddd").width(this.editor.width() / 2);
+
             timer = 0;
-            
+
             this.save().resize();
-            
-            if (!settings.onwatch)
-            {
-                settings.onwatch = callback || function() {};
+
+            if (!settings.onwatch) {
+                settings.onwatch = callback || function () { };
             }
-            
+
             $.proxy(settings.onwatch, this)();
-            
+
             return this;
         },
-        
+
         /**
          * 关闭实时预览
          * Disable real-time watching
          * 
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        unwatch : function(callback) {
-            var settings        = settingNew;
+
+        unwatch: function (callback) {
+            var settings = this.settings;
             this.state.watching = settings.watch = false;
             this.preview.hide();
-            
-            if (this.toolbar) 
-            {
-                var watchIcon   = settings.toolbarIconsClass.watch;
+
+            if (this.toolbar) {
+                var watchIcon = settings.toolbarIconsClass.watch;
                 var unWatchIcon = settings.toolbarIconsClass.unwatch;
-                
-                var icon    = this.toolbar.find(".fa[name=watch]");
+
+                var icon = this.toolbar.find(".fa[name=watch]");
                 icon.parent().attr("title", settings.lang.toolbar.unwatch);
                 icon.removeClass(watchIcon).addClass(unWatchIcon);
             }
-            
+
             this.codeMirror.css("border-right", "none").width(this.editor.width());
-            
+
             this.resize();
-            
-            if (!settings.onunwatch)
-            {
-                settings.onunwatch = callback || function() {};
+
+            if (!settings.onunwatch) {
+                settings.onunwatch = callback || function () { };
             }
-            
+
             $.proxy(settings.onunwatch, this)();
-            
+
             return this;
         },
-        
+
         /**
          * 显示编辑器
          * Show editor
@@ -2438,18 +2313,18 @@
          * @param   {Function} [callback=function()] 回调函数
          * @returns {editormd}                       返回editormd的实例对象
          */
-        
-        show : function(callback) {
-            callback  = callback || function() {};
-            
+
+        show: function (callback) {
+            callback = callback || function () { };
+
             var _this = this;
-            this.editor.show(0, function() {
+            this.editor.show(0, function () {
                 $.proxy(callback, _this)();
             });
-            
+
             return this;
         },
-        
+
         /**
          * 隐藏编辑器
          * Hide editor
@@ -2457,47 +2332,47 @@
          * @param   {Function} [callback=function()] 回调函数
          * @returns {editormd}                       返回editormd的实例对象
          */
-        
-        hide : function(callback) {
-            callback  = callback || function() {};
-            
+
+        hide: function (callback) {
+            callback = callback || function () { };
+
             var _this = this;
-            this.editor.hide(0, function() {
+            this.editor.hide(0, function () {
                 $.proxy(callback, _this)();
             });
-            
+
             return this;
         },
-        
+
         /**
          * 隐藏编辑器部分，只预览HTML
          * Enter preview html state
          * 
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        previewing : function() {
-            
-            var _this            = this;
-            var editor           = this.editor;
-            var preview          = this.preview;
-            var toolbar          = this.toolbar;
-            var settings         = settingNew;
-            var codeMirror       = this.codeMirror;
+
+        previewing: function () {
+
+            var _this = this;
+            var editor = this.editor;
+            var preview = this.preview;
+            var toolbar = this.toolbar;
+            var settings = this.settings;
+            var codeMirror = this.codeMirror;
             var previewContainer = this.previewContainer;
-            
+
             if ($.inArray(settings.mode, ["gfm", "markdown"]) < 0) {
                 return this;
             }
-            
+
             if (settings.toolbar && toolbar) {
                 toolbar.toggle();
                 toolbar.find(".fa[name=preview]").toggleClass("active");
             }
-            
+
             codeMirror.toggle();
-            
-            var escHandle = function(event) {
+
+            var escHandle = function (event) {
                 if (event.shiftKey && event.keyCode === 27) {
                     _this.previewed();
                 }
@@ -2505,190 +2380,180 @@
 
             if (codeMirror.css("display") === "none") // 为了兼容Zepto，而不使用codeMirror.is(":hidden")
             {
-                this.state.preview = true;
+                // this.state.preview = true;
 
                 if (this.state.fullscreen) {
                     preview.css("background", "#fff");
                 }
-                
-                editor.find("." + this.classPrefix + "preview-close-btn").show().bind(editormd.mouseOrTouch("click", "touchend"), function(){
+
+                editor.find("." + this.classPrefix + "preview-close-btn").show().bind(editormd.mouseOrTouch("click", "touchend"), function () {
                     _this.previewed();
                 });
-            
-                if (!settings.watch)
-                {
+
+                if (!settings.watch) {
                     this.save();
-                } 
-                else 
-                {
+                }
+                else {
                     previewContainer.css("padding", "");
                 }
-                
+
                 previewContainer.addClass(this.classPrefix + "preview-active");
 
                 preview.show().css({
-                    position  : "",
-                    top       : 0,
-                    width     : editor.width(),
-                    height    : (settings.autoHeight && !this.state.fullscreen) ? "auto" : editor.height()
+                    position: "",
+                    top: 0,
+                    width: editor.width(),
+                    height: (settings.autoHeight && !this.state.fullscreen) ? "auto" : editor.height()
                 });
-                
-                if (this.state.loaded)
-                {
+
+                if (this.state.loaded) {
                     $.proxy(settings.onpreviewing, this)();
                 }
 
                 $(window).bind("keyup", escHandle);
-            } 
-            else 
-            {
+            }
+            else {
                 $(window).unbind("keyup", escHandle);
                 this.previewed();
             }
         },
-        
+
         /**
          * 显示编辑器部分，退出只预览HTML
          * Exit preview html state
          * 
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        previewed : function() {
-            
-            var editor           = this.editor;
-            var preview          = this.preview;
-            var toolbar          = this.toolbar;
-            var settings         = settingNew;
-            var previewContainer = this.previewContainer;
-            var previewCloseBtn  = editor.find("." + this.classPrefix + "preview-close-btn");
 
-            this.state.preview   = false;
-            
+        previewed: function () {
+
+            var editor = this.editor;
+            var preview = this.preview;
+            var toolbar = this.toolbar;
+            var settings = this.settings;
+            var previewContainer = this.previewContainer;
+            var previewCloseBtn = editor.find("." + this.classPrefix + "preview-close-btn");
+
+            this.state.preview = false;
+
             this.codeMirror.show();
-            
+
             if (settings.toolbar) {
                 toolbar.show();
             }
-            
+
             preview[(settings.watch) ? "show" : "hide"]();
-            
+
             previewCloseBtn.hide().unbind(editormd.mouseOrTouch("click", "touchend"));
-                
+
             previewContainer.removeClass(this.classPrefix + "preview-active");
-                
-            if (settings.watch)
-            {
+
+            if (settings.watch) {
                 previewContainer.css("padding", "20px");
             }
-            
-            preview.css({ 
-                background : null,
-                position   : "absolute",
-                width      : editor.width() / 2,
-                height     : (settings.autoHeight && !this.state.fullscreen) ? "auto" : editor.height() - toolbar.height(),
-                top        : (settings.toolbar)    ? toolbar.height() : 0
+
+            preview.css({
+                background: null,
+                position: "absolute",
+                width: editor.width() / 2,
+                height: (settings.autoHeight && !this.state.fullscreen) ? "auto" : editor.height() - toolbar.height(),
+                top: (settings.toolbar) ? toolbar.height() : 0
             });
 
-            if (this.state.loaded)
-            {
+            if (this.state.loaded) {
                 $.proxy(settings.onpreviewed, this)();
             }
-            
+
             return this;
         },
-        
+
         /**
          * 编辑器全屏显示
          * Fullscreen show
          * 
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        fullscreen : function() {
-            
-            var _this            = this;
-            var state            = this.state;
-            var editor           = this.editor;
-            var preview          = this.preview;
-            var toolbar          = this.toolbar;
-            var settings         = settingNew;
-            var fullscreenClass  = this.classPrefix + "fullscreen";
-            
+
+        fullscreen: function () {
+
+            var _this = this;
+            var state = this.state;
+            var editor = this.editor;
+            var preview = this.preview;
+            var toolbar = this.toolbar;
+            var settings = this.settings;
+            var fullscreenClass = this.classPrefix + "fullscreen";
+
             if (toolbar) {
-                toolbar.find(".fa[name=fullscreen]").parent().toggleClass("active"); 
+                toolbar.find(".fa[name=fullscreen]").parent().toggleClass("active");
             }
-            
-            var escHandle = function(event) {
-                if (!event.shiftKey && event.keyCode === 27) 
-                {
-                    if (state.fullscreen)
-                    {
+
+            var escHandle = function (event) {
+                if (!event.shiftKey && event.keyCode === 27) {
+                    if (state.fullscreen) {
                         _this.fullscreenExit();
                     }
                 }
             };
 
-            if (!editor.hasClass(fullscreenClass)) 
-            {
+            if (!editor.hasClass(fullscreenClass)) {
                 state.fullscreen = true;
 
                 $("html,body").css("overflow", "hidden");
-                
+
                 editor.css({
-                    width    : $(window).width(),
-                    height   : $(window).height()
+                    width: $(window).width(),
+                    height: $(window).height()
                 }).addClass(fullscreenClass);
 
                 this.resize();
-    
+
                 $.proxy(settings.onfullscreen, this)();
 
                 $(window).bind("keyup", escHandle);
             }
-            else
-            {           
-                $(window).unbind("keyup", escHandle); 
+            else {
+                $(window).unbind("keyup", escHandle);
                 this.fullscreenExit();
             }
 
             return this;
         },
-        
+
         /**
          * 编辑器退出全屏显示
          * Exit fullscreen state
          * 
          * @returns {editormd}         返回editormd的实例对象
          */
-        
-        fullscreenExit : function() {
-            
-            var editor            = this.editor;
-            var settings          = settingNew;
-            var toolbar           = this.toolbar;
-            var fullscreenClass   = this.classPrefix + "fullscreen";  
-            
+
+        fullscreenExit: function () {
+
+            var editor = this.editor;
+            var settings = this.settings;
+            var toolbar = this.toolbar;
+            var fullscreenClass = this.classPrefix + "fullscreen";
+
             this.state.fullscreen = false;
-            
+
             if (toolbar) {
-                toolbar.find(".fa[name=fullscreen]").parent().removeClass("active"); 
+                toolbar.find(".fa[name=fullscreen]").parent().removeClass("active");
             }
 
             $("html,body").css("overflow", "");
 
             editor.css({
-                width    : editor.data("oldWidth"),
-                height   : editor.data("oldHeight")
+                width: editor.data("oldWidth"),
+                height: editor.data("oldHeight")
             }).removeClass(fullscreenClass);
 
             this.resize();
-            
+
             $.proxy(settings.onfullscreenExit, this)();
 
             return this;
         },
-        
+
         /**
          * 加载并执行插件
          * Load and execute the plugin
@@ -2697,44 +2562,40 @@
          * @param   {String}     path    plugin load path
          * @returns {editormd}           返回editormd的实例对象
          */
-        
-        executePlugin : function(name, path) {
-            
-            var _this    = this;
-            var cm       = this.cm;
-            var settings = settingNew;
-            
+
+        executePlugin: function (name, path) {
+
+            var _this = this;
+            var cm = this.cm;
+            var settings = this.settings;
+
             path = settings.pluginPath + path;
-            
-            if (typeof define === "function") 
-            {            
-                if (typeof this[name] === "undefined")
-                {
+
+            if (typeof define === "function") {
+                if (typeof this[name] === "undefined") {
                     alert("Error: " + name + " plugin is not found, you are not load this plugin.");
-                    
+
                     return this;
                 }
-                
+
                 this[name](cm);
-                
+
                 return this;
             }
-            
-            if ($.inArray(path, editormd.loadFiles.plugin) < 0)
-            {
-                editormd.loadPlugin(path, function() {
+
+            if ($.inArray(path, editormd.loadFiles.plugin) < 0) {
+                editormd.loadPlugin(path, function () {
                     editormd.loadPlugins[name] = _this[name];
                     _this[name](cm);
                 });
             }
-            else
-            {
+            else {
                 $.proxy(editormd.loadPlugins[name], this)(cm);
             }
-            
+
             return this;
         },
-                
+
         /**
          * 搜索替换
          * Search & replace
@@ -2742,39 +2603,37 @@
          * @param   {String}     command    CodeMirror serach commands, "find, fintNext, fintPrev, clearSearch, replace, replaceAll"
          * @returns {editormd}              return this
          */
-        
-        search : function(command) {
-            var settings = settingNew;
-            
-            if (!settings.searchReplace)
-            {
+
+        search: function (command) {
+            var settings = this.settings;
+
+            if (!settings.searchReplace) {
                 alert("Error: settings.searchReplace == false");
                 return this;
             }
-            
-            if (!settings.readOnly)
-            {
+
+            if (!settings.readOnly) {
                 this.cm.execCommand(command || "find");
             }
-            
+
             return this;
         },
-        
-        searchReplace : function() {            
+
+        searchReplace: function () {
             this.search("replace");
-            
+
             return this;
         },
-        
-        searchReplaceAll : function() {          
+
+        searchReplaceAll: function () {
             this.search("replaceAll");
-            
+
             return this;
         }
     };
-    
-    editormd.fn.init.prototype = editormd.fn; 
-   
+
+    editormd.fn.init.prototype = editormd.fn;
+
     /**
      * 锁屏
      * lock screen when dialog opening
@@ -2782,16 +2641,15 @@
      * @returns {void}
      */
 
-    editormd.dialogLockScreen = function() {
-        var settings = settingNew || {dialogLockScreen : true};
-        
-        if (settings.dialogLockScreen) 
-        {            
+    editormd.dialogLockScreen = function () {
+        var settings = this.settings || { dialogLockScreen: true };
+
+        if (settings.dialogLockScreen) {
             $("html,body").css("overflow", "hidden");
             this.resize();
         }
     };
-   
+
     /**
      * 显示透明背景层
      * Display mask layer when dialog opening
@@ -2799,14 +2657,14 @@
      * @param   {Object}     dialog    dialog jQuery object
      * @returns {void}
      */
-    
-    editormd.dialogShowMask = function(dialog) {
-        var editor   = this.editor;
-        var settings = settingNew || {dialogShowMask : true};
-        
+
+    editormd.dialogShowMask = function (dialog) {
+        var editor = this.editor;
+        var settings = this.settings || { dialogShowMask: true };
+
         dialog.css({
-            top  : ($(window).height() - dialog.height()) / 2 + "px",
-            left : ($(window).width()  - dialog.width())  / 2 + "px"
+            top: ($(window).height() - dialog.height()) / 2 + "px",
+            left: ($(window).width() - dialog.width()) / 2 + "px"
         });
 
         if (settings.dialogShowMask) {
@@ -2815,224 +2673,207 @@
     };
 
     editormd.toolbarHandlers = {
-        undo : function() {
+        undo: function () {
             this.cm.undo();
         },
-        
-        redo : function() {
+
+        redo: function () {
             this.cm.redo();
         },
-        
-        bold : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+
+        bold: function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
             cm.replaceSelection("**" + selection + "**");
 
-            if(selection === "") {
+            if (selection === "") {
                 cm.setCursor(cursor.line, cursor.ch + 2);
             }
         },
-        
-        del : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+
+        del: function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
             cm.replaceSelection("~~" + selection + "~~");
 
-            if(selection === "") {
+            if (selection === "") {
                 cm.setCursor(cursor.line, cursor.ch + 2);
             }
         },
 
-        italic : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+        italic: function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
             cm.replaceSelection("*" + selection + "*");
 
-            if(selection === "") {
+            if (selection === "") {
                 cm.setCursor(cursor.line, cursor.ch + 1);
             }
         },
 
-        quote : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+        quote: function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
-            if (cursor.ch !== 0)
-            {
+            if (cursor.ch !== 0) {
                 cm.setCursor(cursor.line, 0);
                 cm.replaceSelection("> " + selection);
                 cm.setCursor(cursor.line, cursor.ch + 2);
             }
-            else
-            {
+            else {
                 cm.replaceSelection("> " + selection);
             }
 
             //cm.replaceSelection("> " + selection);
             //cm.setCursor(cursor.line, (selection === "") ? cursor.ch + 2 : cursor.ch + selection.length + 2);
         },
-        
-        ucfirst : function() {
-            var cm         = this.cm;
-            var selection  = cm.getSelection();
+
+        ucfirst: function () {
+            var cm = this.cm;
+            var selection = cm.getSelection();
             var selections = cm.listSelections();
 
             cm.replaceSelection(editormd.firstUpperCase(selection));
             cm.setSelections(selections);
         },
-        
-        ucwords : function() {
-            var cm         = this.cm;
-            var selection  = cm.getSelection();
+
+        ucwords: function () {
+            var cm = this.cm;
+            var selection = cm.getSelection();
             var selections = cm.listSelections();
 
             cm.replaceSelection(editormd.wordsFirstUpperCase(selection));
             cm.setSelections(selections);
         },
-        
-        uppercase : function() {
-            var cm         = this.cm;
-            var selection  = cm.getSelection();
+
+        uppercase: function () {
+            var cm = this.cm;
+            var selection = cm.getSelection();
             var selections = cm.listSelections();
 
             cm.replaceSelection(selection.toUpperCase());
             cm.setSelections(selections);
         },
-        
-        lowercase : function() {
-            var cm         = this.cm;
-            var cursor     = cm.getCursor();
-            var selection  = cm.getSelection();
+
+        lowercase: function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
+            var selection = cm.getSelection();
             var selections = cm.listSelections();
-            
+
             cm.replaceSelection(selection.toLowerCase());
             cm.setSelections(selections);
         },
 
-        h1 : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+        h1: function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
-            if (cursor.ch !== 0)
-            {
+            if (cursor.ch !== 0) {
                 cm.setCursor(cursor.line, 0);
                 cm.replaceSelection("# " + selection);
                 cm.setCursor(cursor.line, cursor.ch + 2);
             }
-            else
-            {
+            else {
                 cm.replaceSelection("# " + selection);
             }
         },
 
-        h2 : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+        h2: function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
-            if (cursor.ch !== 0)
-            {
+            if (cursor.ch !== 0) {
                 cm.setCursor(cursor.line, 0);
                 cm.replaceSelection("## " + selection);
                 cm.setCursor(cursor.line, cursor.ch + 3);
             }
-            else
-            {
+            else {
                 cm.replaceSelection("## " + selection);
             }
         },
 
-        h3 : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+        h3: function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
-            if (cursor.ch !== 0)
-            {
+            if (cursor.ch !== 0) {
                 cm.setCursor(cursor.line, 0);
                 cm.replaceSelection("### " + selection);
                 cm.setCursor(cursor.line, cursor.ch + 4);
             }
-            else
-            {
+            else {
                 cm.replaceSelection("### " + selection);
             }
         },
 
-        h4 : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+        h4: function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
-            if (cursor.ch !== 0)
-            {
+            if (cursor.ch !== 0) {
                 cm.setCursor(cursor.line, 0);
                 cm.replaceSelection("#### " + selection);
                 cm.setCursor(cursor.line, cursor.ch + 5);
             }
-            else
-            {
+            else {
                 cm.replaceSelection("#### " + selection);
             }
         },
 
-        h5 : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+        h5: function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
-            if (cursor.ch !== 0)
-            {
+            if (cursor.ch !== 0) {
                 cm.setCursor(cursor.line, 0);
                 cm.replaceSelection("##### " + selection);
                 cm.setCursor(cursor.line, cursor.ch + 6);
             }
-            else
-            {
+            else {
                 cm.replaceSelection("##### " + selection);
             }
         },
 
-        h6 : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+        h6: function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
-            if (cursor.ch !== 0)
-            {
+            if (cursor.ch !== 0) {
                 cm.setCursor(cursor.line, 0);
                 cm.replaceSelection("###### " + selection);
                 cm.setCursor(cursor.line, cursor.ch + 7);
             }
-            else
-            {
+            else {
                 cm.replaceSelection("###### " + selection);
             }
         },
 
-        "list-ul" : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+        "list-ul": function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
-            if (selection === "") 
-            {
+            if (selection === "") {
                 cm.replaceSelection("- " + selection);
-            } 
-            else 
-            {
+            }
+            else {
                 var selectionText = selection.split("\n");
 
-                for (var i = 0, len = selectionText.length; i < len; i++) 
-                {
+                for (var i = 0, len = selectionText.length; i < len; i++) {
                     selectionText[i] = (selectionText[i] === "") ? "" : "- " + selectionText[i];
                 }
 
@@ -3040,82 +2881,77 @@
             }
         },
 
-        "list-ol" : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+        "list-ol": function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
-            if(selection === "") 
-            {
+            if (selection === "") {
                 cm.replaceSelection("1. " + selection);
             }
-            else
-            {
+            else {
                 var selectionText = selection.split("\n");
 
-                for (var i = 0, len = selectionText.length; i < len; i++) 
-                {
-                    selectionText[i] = (selectionText[i] === "") ? "" : (i+1) + ". " + selectionText[i];
+                for (var i = 0, len = selectionText.length; i < len; i++) {
+                    selectionText[i] = (selectionText[i] === "") ? "" : (i + 1) + ". " + selectionText[i];
                 }
 
                 cm.replaceSelection(selectionText.join("\n"));
             }
         },
 
-        hr : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+        hr: function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
             cm.replaceSelection(((cursor.ch !== 0) ? "\n\n" : "\n") + "------------\n\n");
         },
 
-        tex : function() {
-            if (!settingNew.tex)
-            {
+        tex: function () {
+            if (!this.settings.tex) {
                 alert("settings.tex === false");
                 return this;
             }
-            
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
             cm.replaceSelection("$$" + selection + "$$");
 
-            if(selection === "") {
+            if (selection === "") {
                 cm.setCursor(cursor.line, cursor.ch + 2);
             }
         },
 
-        link : function() {
+        link: function () {
             this.executePlugin("linkDialog", "link-dialog/link-dialog");
         },
 
-        "reference-link" : function() {
+        "reference-link": function () {
             this.executePlugin("referenceLinkDialog", "reference-link-dialog/reference-link-dialog");
         },
 
-        pagebreak : function() {
-            if (!settingNew.pageBreak)
-            {
+        pagebreak: function () {
+            if (!this.settings.pageBreak) {
                 alert("settings.pageBreak === false");
                 return this;
             }
-            
-            var cm        = this.cm;
+
+            var cm = this.cm;
             var selection = cm.getSelection();
 
             cm.replaceSelection("\r\n[========]\r\n");
         },
 
-        image : function() {
+        image: function () {
             this.executePlugin("imageDialog", "image-dialog/image-dialog");
         },
-        
-        code : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+
+        code: function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
 
             cm.replaceSelection("`" + selection + "`");
@@ -3125,88 +2961,87 @@
             }
         },
 
-        "code-block" : function() {
-            this.executePlugin("codeBlockDialog", "code-block-dialog/code-block-dialog");            
+        "code-block": function () {
+            this.executePlugin("codeBlockDialog", "code-block-dialog/code-block-dialog");
         },
 
-        "preformatted-text" : function() {
+        "preformatted-text": function () {
             this.executePlugin("preformattedTextDialog", "preformatted-text-dialog/preformatted-text-dialog");
         },
-        
-        table : function() {
-            this.executePlugin("tableDialog", "table-dialog/table-dialog");         
+
+        table: function () {
+            this.executePlugin("tableDialog", "table-dialog/table-dialog");
         },
-        
-        datetime : function() {
-            var cm        = this.cm;
+
+        datetime: function () {
+            var cm = this.cm;
             var selection = cm.getSelection();
-            var date      = new Date();
-            var langName  = settingNew.lang.name;
-            var datefmt   = editormd.dateFormat() + " " + editormd.dateFormat((langName === "zh-cn" || langName === "zh-tw") ? "cn-week-day" : "week-day");
+            var date = new Date();
+            var langName = this.settings.lang.name;
+            var datefmt = editormd.dateFormat() + " " + editormd.dateFormat((langName === "zh-cn" || langName === "zh-tw") ? "cn-week-day" : "week-day");
 
             cm.replaceSelection(datefmt);
         },
-        
-        emoji : function() {
+
+        emoji: function () {
             this.executePlugin("emojiDialog", "emoji-dialog/emoji-dialog");
         },
-                
-        "html-entities" : function() {
+
+        "html-entities": function () {
             this.executePlugin("htmlEntitiesDialog", "html-entities-dialog/html-entities-dialog");
         },
-                
-        "goto-line" : function() {
+
+        "goto-line": function () {
             this.executePlugin("gotoLineDialog", "goto-line-dialog/goto-line-dialog");
         },
 
-        watch : function() {    
-            this[settingNew.watch ? "unwatch" : "watch"]();
+        watch: function () {
+            this[this.settings.watch ? "unwatch" : "watch"]();
         },
 
-        preview : function() {
+        preview: function () {
             this.previewing();
         },
 
-        fullscreen : function() {
+        fullscreen: function () {
             this.fullscreen();
         },
 
-        clear : function() {
+        clear: function () {
             this.clear();
         },
-        
-        search : function() {
+
+        search: function () {
             this.search();
         },
 
-        help : function() {
+        help: function () {
             this.executePlugin("helpDialog", "help-dialog/help-dialog");
         },
 
-        info : function() {
+        info: function () {
             this.showInfoDialog();
         }
     };
-    
+
     editormd.keyMaps = {
-        "Ctrl-1"       : "h1",
-        "Ctrl-2"       : "h2",
-        "Ctrl-3"       : "h3",
-        "Ctrl-4"       : "h4",
-        "Ctrl-5"       : "h5",
-        "Ctrl-6"       : "h6",
-        "Ctrl-B"       : "bold",  // if this is string ==  editormd.toolbarHandlers.xxxx
-        "Ctrl-D"       : "datetime",
-        
-        "Ctrl-E"       : function() { // emoji
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+        "Ctrl-1": "h1",
+        "Ctrl-2": "h2",
+        "Ctrl-3": "h3",
+        "Ctrl-4": "h4",
+        "Ctrl-5": "h5",
+        "Ctrl-6": "h6",
+        "Ctrl-B": "bold",  // if this is string ==  editormd.toolbarHandlers.xxxx
+        "Ctrl-D": "datetime",
+
+        "Ctrl-E": function () { // emoji
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
-            
-            if (!settingNew.emoji)
-            {
+
+            if (!this.settings.emoji) {
                 alert("Error: settings.emoji == false");
-                return ;
+                return;
             }
 
             cm.replaceSelection(":" + selection + ":");
@@ -3215,35 +3050,34 @@
                 cm.setCursor(cursor.line, cursor.ch + 1);
             }
         },
-        "Ctrl-Alt-G"   : "goto-line",
-        "Ctrl-H"       : "hr",
-        "Ctrl-I"       : "italic",
-        "Ctrl-K"       : "code",
-        
-        "Ctrl-L"        : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
-            var selection = cm.getSelection();
-            
-            var title = (selection === "") ? "" : " \""+selection+"\"";
+        "Ctrl-Alt-G": "goto-line",
+        "Ctrl-H": "hr",
+        "Ctrl-I": "italic",
+        "Ctrl-K": "code",
 
-            cm.replaceSelection("[" + selection + "]("+title+")");
+        "Ctrl-L": function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
+            var selection = cm.getSelection();
+
+            var title = (selection === "") ? "" : " \"" + selection + "\"";
+
+            cm.replaceSelection("[" + selection + "](" + title + ")");
 
             if (selection === "") {
                 cm.setCursor(cursor.line, cursor.ch + 1);
             }
         },
-        "Ctrl-U"         : "list-ul",
-        
-        "Shift-Ctrl-A"   : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+        "Ctrl-U": "list-ul",
+
+        "Shift-Ctrl-A": function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
-            
-            if (!settingNew.atLink)
-            {
+
+            if (!this.settings.atLink) {
                 alert("Error: settings.atLink == false");
-                return ;
+                return;
             }
 
             cm.replaceSelection("@" + selection);
@@ -3252,58 +3086,58 @@
                 cm.setCursor(cursor.line, cursor.ch + 1);
             }
         },
-        
-        "Shift-Ctrl-C"     : "code",
-        "Shift-Ctrl-Q"     : "quote",
-        "Shift-Ctrl-S"     : "del",
-        "Shift-Ctrl-K"     : "tex",  // KaTeX
-        
-        "Shift-Alt-C"      : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
+
+        "Shift-Ctrl-C": "code",
+        "Shift-Ctrl-Q": "quote",
+        "Shift-Ctrl-S": "del",
+        "Shift-Ctrl-K": "tex",  // KaTeX
+
+        "Shift-Alt-C": function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
             var selection = cm.getSelection();
-            
+
             cm.replaceSelection(["```", selection, "```"].join("\n"));
 
             if (selection === "") {
                 cm.setCursor(cursor.line, cursor.ch + 3);
-            } 
+            }
         },
-        
-        "Shift-Ctrl-Alt-C" : "code-block",
-        "Shift-Ctrl-H"     : "html-entities",
-        "Shift-Alt-H"      : "help",
-        "Shift-Ctrl-E"     : "emoji",
-        "Shift-Ctrl-U"     : "uppercase",
-        "Shift-Alt-U"      : "ucwords",
-        "Shift-Ctrl-Alt-U" : "ucfirst",
-        "Shift-Alt-L"      : "lowercase",
-        
-        "Shift-Ctrl-I"     : function() {
-            var cm        = this.cm;
-            var cursor    = cm.getCursor();
-            var selection = cm.getSelection();
-            
-            var title = (selection === "") ? "" : " \""+selection+"\"";
 
-            cm.replaceSelection("![" + selection + "]("+title+")");
+        "Shift-Ctrl-Alt-C": "code-block",
+        "Shift-Ctrl-H": "html-entities",
+        "Shift-Alt-H": "help",
+        "Shift-Ctrl-E": "emoji",
+        "Shift-Ctrl-U": "uppercase",
+        "Shift-Alt-U": "ucwords",
+        "Shift-Ctrl-Alt-U": "ucfirst",
+        "Shift-Alt-L": "lowercase",
+
+        "Shift-Ctrl-I": function () {
+            var cm = this.cm;
+            var cursor = cm.getCursor();
+            var selection = cm.getSelection();
+
+            var title = (selection === "") ? "" : " \"" + selection + "\"";
+
+            cm.replaceSelection("![" + selection + "](" + title + ")");
 
             if (selection === "") {
                 cm.setCursor(cursor.line, cursor.ch + 4);
             }
         },
-        
-        "Shift-Ctrl-Alt-I" : "image",
-        "Shift-Ctrl-L"     : "link",
-        "Shift-Ctrl-O"     : "list-ol",
-        "Shift-Ctrl-P"     : "preformatted-text",
-        "Shift-Ctrl-T"     : "table",
-        "Shift-Alt-P"      : "pagebreak",
-        "F9"               : "watch",
-        "F10"              : "preview",
-        "F11"              : "fullscreen",
+
+        "Shift-Ctrl-Alt-I": "image",
+        "Shift-Ctrl-L": "link",
+        "Shift-Ctrl-O": "list-ol",
+        "Shift-Ctrl-P": "preformatted-text",
+        "Shift-Ctrl-T": "table",
+        "Shift-Alt-P": "pagebreak",
+        "F9": "watch",
+        "F10": "preview",
+        "F11": "fullscreen",
     };
-    
+
     /**
      * 清除字符串两边的空格
      * Clear the space of strings both sides.
@@ -3311,13 +3145,13 @@
      * @param   {String}    str            string
      * @returns {String}                   trimed string    
      */
-    
-    var trim = function(str) {
+
+    var trim = function (str) {
         return (!String.prototype.trim) ? str.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, "") : str.trim();
     };
-    
+
     editormd.trim = trim;
-    
+
     /**
      * 所有单词首字母大写
      * Words first to uppercase
@@ -3325,15 +3159,15 @@
      * @param   {String}    str            string
      * @returns {String}                   string
      */
-    
+
     var ucwords = function (str) {
-        return str.toLowerCase().replace(/\b(\w)|\s(\w)/g, function($1) {  
+        return str.toLowerCase().replace(/\b(\w)|\s(\w)/g, function ($1) {
             return $1.toUpperCase();
         });
     };
-    
+
     editormd.ucwords = editormd.wordsFirstUpperCase = ucwords;
-    
+
     /**
      * 字符串首字母大写
      * Only string first char to uppercase
@@ -3341,45 +3175,45 @@
      * @param   {String}    str            string
      * @returns {String}                   string
      */
-    
-    var firstUpperCase = function(str) {        
-        return str.toLowerCase().replace(/\b(\w)/, function($1){
+
+    var firstUpperCase = function (str) {
+        return str.toLowerCase().replace(/\b(\w)/, function ($1) {
             return $1.toUpperCase();
         });
     };
-    
+
     var ucfirst = firstUpperCase;
-    
+
     editormd.firstUpperCase = editormd.ucfirst = firstUpperCase;
-    
+
     editormd.urls = {
-        atLinkBase : "https://github.com/"
+        atLinkBase: "https://github.com/"
     };
-    
+
     editormd.regexs = {
-        atLink        : /@(\w+)/g,
-        email         : /(\w+)@(\w+)\.(\w+)\.?(\w+)?/g,
-        emailLink     : /(mailto:)?([\w\.\_]+)@(\w+)\.(\w+)\.?(\w+)?/g,
-        emoji         : /:([\w\+-]+):/g,
-        emojiDatetime : /(\d{2}:\d{2}:\d{2})/g,
-        twemoji       : /:(tw-([\w]+)-?(\w+)?):/g,
-        fontAwesome   : /:(fa-([\w]+)(-(\w+)){0,}):/g,
-        editormdLogo  : /:(editormd-logo-?(\w+)?):/g,
-        pageBreak     : /^\[[=]{8,}\]$/
+        atLink: /@(\w+)/g,
+        email: /(\w+)@(\w+)\.(\w+)\.?(\w+)?/g,
+        emailLink: /(mailto:)?([\w\.\_]+)@(\w+)\.(\w+)\.?(\w+)?/g,
+        emoji: /:([\w\+-]+):/g,
+        emojiDatetime: /(\d{2}:\d{2}:\d{2})/g,
+        twemoji: /:(tw-([\w]+)-?(\w+)?):/g,
+        fontAwesome: /:(fa-([\w]+)(-(\w+)){0,}):/g,
+        editormdLogo: /:(editormd-logo-?(\w+)?):/g,
+        pageBreak: /^\[[=]{8,}\]$/
     };
 
     // Emoji graphics files url path
-    editormd.emoji     = {
+    editormd.emoji = {
         // path  : "http://www.emoji-cheat-sheet.com/graphics/emojis/",
-        path  : "/editormd/emoji/",
-        
-        ext   : ".png"
+        path: "/editormd/emoji/",
+
+        ext: ".png"
     };
 
     // Twitter Emoji (Twemoji)  graphics files url path    
     editormd.twemoji = {
-        path : "http://twemoji.maxcdn.com/36x36/",
-        ext  : ".png"
+        path: "http://twemoji.maxcdn.com/36x36/",
+        ext: ".png"
     };
 
     /**
@@ -3390,93 +3224,84 @@
      * @returns {Renderer} markedRenderer  返回marked的Renderer自定义对象
      */
 
-    editormd.markedRenderer = function(markdownToC, options) {
+    editormd.markedRenderer = function (markdownToC, options) {
         var defaults = {
-            toc                  : true,           // Table of contents
-            tocm                 : false,
-            tocStartLevel        : 1,              // Said from H1 to create ToC  
-            pageBreak            : true,
-            atLink               : true,           // for @link
-            emailLink            : true,           // for mail address auto link
-            taskList             : false,          // Enable Github Flavored Markdown task lists
-            emoji                : false,          // :emoji: , Support Twemoji, fontAwesome, Editor.md logo emojis.
-            tex                  : false,          // TeX(LaTeX), based on KaTeX
-            flowChart            : false,          // flowChart.js only support IE9+
-            sequenceDiagram      : false,          // sequenceDiagram.js only support IE9+
+            toc: true,           // Table of contents
+            tocm: false,
+            tocStartLevel: 1,              // Said from H1 to create ToC  
+            pageBreak: true,
+            atLink: true,           // for @link
+            emailLink: true,           // for mail address auto link
+            taskList: false,          // Enable Github Flavored Markdown task lists
+            emoji: false,          // :emoji: , Support Twemoji, fontAwesome, Editor.md logo emojis.
+            tex: false,          // TeX(LaTeX), based on KaTeX
+            flowChart: false,          // flowChart.js only support IE9+
+            sequenceDiagram: false,          // sequenceDiagram.js only support IE9+
         };
-        
-        var settings        = $.extend(defaults, options || {});    
-        var marked          = editormd.$marked;
-        var markedRenderer  = new marked.Renderer();
-        markdownToC         = markdownToC || [];        
-            
-        var regexs          = editormd.regexs;
-        var atLinkReg       = regexs.atLink;
-        var emojiReg        = regexs.emoji;
-        var emailReg        = regexs.email;
-        var emailLinkReg    = regexs.emailLink;
-        var twemojiReg      = regexs.twemoji;
-        var faIconReg       = regexs.fontAwesome;
-        var editormdLogoReg = regexs.editormdLogo;
-        var pageBreakReg    = regexs.pageBreak;
 
-        markedRenderer.emoji = function(text) {
-            
-            text = text.replace(editormd.regexs.emojiDatetime, function($1) {           
+        var settings = $.extend(defaults, options || {});
+        var marked = editormd.$marked;
+        var markedRenderer = new marked.Renderer();
+        markdownToC = markdownToC || [];
+
+        var regexs = editormd.regexs;
+        var atLinkReg = regexs.atLink;
+        var emojiReg = regexs.emoji;
+        var emailReg = regexs.email;
+        var emailLinkReg = regexs.emailLink;
+        var twemojiReg = regexs.twemoji;
+        var faIconReg = regexs.fontAwesome;
+        var editormdLogoReg = regexs.editormdLogo;
+        var pageBreakReg = regexs.pageBreak;
+
+        markedRenderer.emoji = function (text) {
+
+            text = text.replace(editormd.regexs.emojiDatetime, function ($1) {
                 return $1.replace(/:/g, "&#58;");
             });
-            
+
             var matchs = text.match(emojiReg);
 
             if (!matchs || !settings.emoji) {
                 return text;
             }
 
-            for (var i = 0, len = matchs.length; i < len; i++)
-            {            
+            for (var i = 0, len = matchs.length; i < len; i++) {
                 if (matchs[i] === ":+1:") {
                     matchs[i] = ":\\+1:";
                 }
 
-                text = text.replace(new RegExp(matchs[i]), function($1, $2){
+                text = text.replace(new RegExp(matchs[i]), function ($1, $2) {
                     var faMatchs = $1.match(faIconReg);
-                    var name     = $1.replace(/:/g, "");
+                    var name = $1.replace(/:/g, "");
 
-                    if (faMatchs)
-                    {                        
-                        for (var fa = 0, len1 = faMatchs.length; fa < len1; fa++)
-                        {
+                    if (faMatchs) {
+                        for (var fa = 0, len1 = faMatchs.length; fa < len1; fa++) {
                             var faName = faMatchs[fa].replace(/:/g, "");
-                            
+
                             return "<i class=\"fa " + faName + " fa-emoji\" title=\"" + faName.replace("fa-", "") + "\"></i>";
                         }
                     }
-                    else
-                    {
+                    else {
                         var emdlogoMathcs = $1.match(editormdLogoReg);
                         var twemojiMatchs = $1.match(twemojiReg);
 
-                        if (emdlogoMathcs)                                        
-                        {                            
-                            for (var x = 0, len2 = emdlogoMathcs.length; x < len2; x++)
-                            {
+                        if (emdlogoMathcs) {
+                            for (var x = 0, len2 = emdlogoMathcs.length; x < len2; x++) {
                                 var logoName = emdlogoMathcs[x].replace(/:/g, "");
                                 return "<i class=\"" + logoName + "\" title=\"Editor.md logo (" + logoName + ")\"></i>";
                             }
                         }
-                        else if (twemojiMatchs) 
-                        {
-                            for (var t = 0, len3 = twemojiMatchs.length; t < len3; t++)
-                            {
+                        else if (twemojiMatchs) {
+                            for (var t = 0, len3 = twemojiMatchs.length; t < len3; t++) {
                                 var twe = twemojiMatchs[t].replace(/:/g, "").replace("tw-", "");
                                 return "<img src=\"" + editormd.twemoji.path + twe + editormd.twemoji.ext + "\" title=\"twemoji-" + twe + "\" alt=\"twemoji-" + twe + "\" class=\"emoji twemoji\" />";
                             }
                         }
-                        else
-                        {
+                        else {
                             var src = (name === "+1") ? "plus1" : name;
-                            src     = (src === "black_large_square") ? "black_square" : src;
-                            src     = (src === "moon") ? "waxing_gibbous_moon" : src;
+                            src = (src === "black_large_square") ? "black_square" : src;
+                            src = (src === "moon") ? "waxing_gibbous_moon" : src;
 
                             return "<img src=\"" + editormd.emoji.path + src + editormd.emoji.ext + "\" class=\"emoji\" title=\"&#58;" + name + "&#58;\" alt=\"&#58;" + name + "&#58;\" />";
                         }
@@ -3487,25 +3312,22 @@
             return text;
         };
 
-        markedRenderer.atLink = function(text) {
+        markedRenderer.atLink = function (text) {
 
-            if (atLinkReg.test(text))
-            { 
-                if (settings.atLink) 
-                {
-                    text = text.replace(emailReg, function($1, $2, $3, $4) {
+            if (atLinkReg.test(text)) {
+                if (settings.atLink) {
+                    text = text.replace(emailReg, function ($1, $2, $3, $4) {
                         return $1.replace(/@/g, "_#_&#64;_#_");
                     });
 
-                    text = text.replace(atLinkReg, function($1, $2) {
+                    text = text.replace(atLinkReg, function ($1, $2) {
                         return "<a href=\"" + editormd.urls.atLinkBase + "" + $2 + "\" title=\"&#64;" + $2 + "\" class=\"at-link\">" + $1 + "</a>";
                     }).replace(/_#_&#64;_#_/g, "@");
                 }
-                
-                if (settings.emailLink)
-                {
-                    text = text.replace(emailLinkReg, function($1, $2, $3, $4, $5) {
-                        return (!$2 && $.inArray($5, "jpg|jpeg|png|gif|webp|ico|icon|pdf".split("|")) < 0) ? "<a href=\"mailto:" + $1 + "\">"+$1+"</a>" : $1;
+
+                if (settings.emailLink) {
+                    text = text.replace(emailLinkReg, function ($1, $2, $3, $4, $5) {
+                        return (!$2 && $.inArray($5, "jpg|jpeg|png|gif|webp|ico|icon|pdf".split("|")) < 0) ? "<a href=\"mailto:" + $1 + "\">" + $1 + "</a>" : $1;
                     });
                 }
 
@@ -3514,13 +3336,13 @@
 
             return text;
         };
-                
+
         markedRenderer.link = function (href, title, text) {
 
             if (this.options.sanitize) {
                 try {
-                    var prot = decodeURIComponent(unescape(href)).replace(/[^\w:]/g,"").toLowerCase();
-                } catch(e) {
+                    var prot = decodeURIComponent(unescape(href)).replace(/[^\w:]/g, "").toLowerCase();
+                } catch (e) {
                     return "";
                 }
 
@@ -3530,14 +3352,12 @@
             }
 
             var out = "<a href=\"" + href + "\"";
-            
-            if (atLinkReg.test(title) || atLinkReg.test(text))
-            {
-                if (title)
-                {
+
+            if (atLinkReg.test(title) || atLinkReg.test(text)) {
+                if (title) {
                     out += " title=\"" + title.replace(/@/g, "&#64;");
                 }
-                
+
                 return out + "\">" + text.replace(/@/g, "&#64;") + "</a>";
             }
 
@@ -3549,135 +3369,117 @@
 
             return out;
         };
-        
-        markedRenderer.heading = function(text, level, raw) {
-                    
-            var linkText       = text;
-            var hasLinkReg     = /\s*\<a\s*href\=\"(.*)\"\s*([^\>]*)\>(.*)\<\/a\>\s*/;
+
+        markedRenderer.heading = function (text, level, raw) {
+
+            var linkText = text;
+            var hasLinkReg = /\s*\<a\s*href\=\"(.*)\"\s*([^\>]*)\>(.*)\<\/a\>\s*/;
             var getLinkTextReg = /\s*\<a\s*([^\>]+)\>([^\>]*)\<\/a\>\s*/g;
 
-            if (hasLinkReg.test(text)) 
-            {
+            if (hasLinkReg.test(text)) {
                 var tempText = [];
-                text         = text.split(/\<a\s*([^\>]+)\>([^\>]*)\<\/a\>/);
+                text = text.split(/\<a\s*([^\>]+)\>([^\>]*)\<\/a\>/);
 
-                for (var i = 0, len = text.length; i < len; i++)
-                {
+                for (var i = 0, len = text.length; i < len; i++) {
                     tempText.push(text[i].replace(/\s*href\=\"(.*)\"\s*/g, ""));
                 }
 
                 text = tempText.join(" ");
             }
-            
+
             text = trim(text);
-            
-            var escapedText    = text.toLowerCase().replace(/[^\w]+/g, "-");
+
+            var escapedText = text.toLowerCase().replace(/[^\w]+/g, "-");
             var toc = {
-                text  : text,
-                level : level,
-                slug  : escapedText
+                text: text,
+                level: level,
+                slug: escapedText
             };
-            
+
             var isChinese = /^[\u4e00-\u9fa5]+$/.test(text);
-            var id        = (isChinese) ? escape(text).replace(/\%/g, "") : text.toLowerCase().replace(/[^\w]+/g, "-");
+            var id = (isChinese) ? escape(text).replace(/\%/g, "") : text.toLowerCase().replace(/[^\w]+/g, "-");
 
             markdownToC.push(toc);
-            
-            var headingHTML = "<h" + level + " id=\"h"+ level + "-" + this.options.headerPrefix + id +"\">";
-            
-            headingHTML    += "<a name=\"" + text + "\" class=\"reference-link\"></a>";
-            headingHTML    += "<span class=\"header-link octicon octicon-link\"></span>";
-            headingHTML    += (hasLinkReg) ? this.atLink(this.emoji(linkText)) : this.atLink(this.emoji(text));
-            headingHTML    += "</h" + level + ">";
+
+            var headingHTML = "<h" + level + " id=\"h" + level + "-" + this.options.headerPrefix + id + "\">";
+
+            headingHTML += "<a name=\"" + text + "\" class=\"reference-link\"></a>";
+            headingHTML += "<span class=\"header-link octicon octicon-link\"></span>";
+            headingHTML += (hasLinkReg) ? this.atLink(this.emoji(linkText)) : this.atLink(this.emoji(text));
+            headingHTML += "</h" + level + ">";
 
             return headingHTML;
         };
-        
-        markedRenderer.pageBreak = function(text) {
-            if (pageBreakReg.test(text) && settings.pageBreak)
-            {
+
+        markedRenderer.pageBreak = function (text) {
+            if (pageBreakReg.test(text) && settings.pageBreak) {
                 text = "<hr style=\"page-break-after:always;\" class=\"page-break editormd-page-break\" />";
             }
-            
+
             return text;
         };
-        markedRenderer.em = function (text, capInput) {
-            if (text && text.indexOf('$$') != -1 || (capInput && capInput.indexOf('$$') != -1)) {
-                return '_' + text + '_';
-            } else {
-                return '<em>' + text + '</em>';
-            }
-        };
 
-        markedRenderer.paragraph = function(text) {
-            var isTeXInline     = /\$\$(.*)\$\$/g.test(text);
-            var isTeXLine       = /^\$\$(.*)\$\$$/.test(text);
-            var isTeXAddClass   = (isTeXLine)     ? " class=\"" + editormd.classNames.tex + "\"" : "";
-            var isToC           = (settings.tocm) ? /^(\[TOC\]|\[TOCM\])$/.test(text) : /^\[TOC\]$/.test(text);
-            var isToCMenu       = /^\[TOCM\]$/.test(text);
-            
-            if (!isTeXLine && isTeXInline) 
-            {
-                text = text.replace(/(\$\$([^\$]*)\$\$)+/g, function($1, $2) {
+        markedRenderer.paragraph = function (text) {
+            var isTeXInline = /\$\$(.*)\$\$/g.test(text);
+            var isTeXLine = /^\$\$(.*)\$\$$/.test(text);
+            var isTeXAddClass = (isTeXLine) ? " class=\"" + editormd.classNames.tex + "\"" : "";
+            var isToC = (settings.tocm) ? /^(\[TOC\]|\[TOCM\])$/.test(text) : /^\[TOC\]$/.test(text);
+            var isToCMenu = /^\[TOCM\]$/.test(text);
+
+            if (!isTeXLine && isTeXInline) {
+                text = text.replace(/(\$\$([^\$]*)\$\$)+/g, function ($1, $2) {
                     return "<span class=\"" + editormd.classNames.tex + "\">" + $2.replace(/\$/g, "") + "</span>";
                 });
-            } 
-            else 
-            {
+            }
+            else {
                 text = (isTeXLine) ? text.replace(/\$/g, "") : text;
             }
-            
+
             var tocHTML = "<div class=\"markdown-toc editormd-markdown-toc\">" + text + "</div>";
-            
-            return (isToC) ? ( (isToCMenu) ? "<div class=\"editormd-toc-menu\">" + tocHTML + "</div><br/>" : tocHTML )
-                           : ( (pageBreakReg.test(text)) ? this.pageBreak(text) : "<p" + isTeXAddClass + ">" + this.atLink(this.emoji(text)) + "</p>\n" );
+
+            return (isToC) ? ((isToCMenu) ? "<div class=\"editormd-toc-menu\">" + tocHTML + "</div><br/>" : tocHTML)
+                : ((pageBreakReg.test(text)) ? this.pageBreak(text) : "<p" + isTeXAddClass + ">" + this.atLink(this.emoji(text)) + "</p>\n");
         };
 
-        markedRenderer.code = function (code, lang, escaped) { 
+        markedRenderer.code = function (code, lang, escaped) {
 
-            if (lang === "seq" || lang === "sequence")
-            {
+            if (lang === "seq" || lang === "sequence") {
                 return "<div class=\"sequence-diagram\">" + code + "</div>";
-            } 
-            else if ( lang === "flow")
-            {
+            }
+            else if (lang === "flow") {
                 return "<div class=\"flowchart\">" + code + "</div>";
-            } 
-            else if ( lang === "math" || lang === "latex" || lang === "katex")
-            {
+            }
+            else if (lang === "math" || lang === "latex" || lang === "katex") {
                 return "<p class=\"" + editormd.classNames.tex + "\">" + code + "</p>";
-            } 
-            else 
-            {
+            }
+            else {
 
                 return marked.Renderer.prototype.code.apply(this, arguments);
             }
         };
 
-        markedRenderer.tablecell = function(content, flags) {
+        markedRenderer.tablecell = function (content, flags) {
             var type = (flags.header) ? "th" : "td";
-            var tag  = (flags.align)  ? "<" + type +" style=\"text-align:" + flags.align + "\">" : "<" + type + ">";
-            
+            var tag = (flags.align) ? "<" + type + " style=\"text-align:" + flags.align + "\">" : "<" + type + ">";
+
             return tag + this.atLink(this.emoji(content)) + "</" + type + ">\n";
         };
 
-        markedRenderer.listitem = function(text) {
-            if (settings.taskList && /^\s*\[[x\s]\]\s*/.test(text)) 
-            {
+        markedRenderer.listitem = function (text) {
+            if (settings.taskList && /^\s*\[[x\s]\]\s*/.test(text)) {
                 text = text.replace(/^\s*\[\s\]\s*/, "<input type=\"checkbox\" class=\"task-list-item-checkbox\" /> ")
-                           .replace(/^\s*\[x\]\s*/,  "<input type=\"checkbox\" class=\"task-list-item-checkbox\" checked disabled /> ");
+                    .replace(/^\s*\[x\]\s*/, "<input type=\"checkbox\" class=\"task-list-item-checkbox\" checked disabled /> ");
 
                 return "<li style=\"list-style: none;\">" + this.atLink(this.emoji(text)) + "</li>";
             }
-            else 
-            {
+            else {
                 return "<li>" + this.atLink(this.emoji(text)) + "</li>";
             }
         };
-        
+
         return markedRenderer;
     };
-    
+
     /**
      *
      * 生成TOC(Table of Contents)
@@ -3688,64 +3490,58 @@
      * @param   {Integer}  startLevel      Hx 起始层级
      * @returns {Object}   tocContainer    返回ToC列表容器层的jQuery对象元素
      */
-    
-    editormd.markdownToCRenderer = function(toc, container, tocDropdown, startLevel) {
-        
-        var html        = "";    
-        var lastLevel   = 0;
+
+    editormd.markdownToCRenderer = function (toc, container, tocDropdown, startLevel) {
+
+        var html = "";
+        var lastLevel = 0;
         var classPrefix = this.classPrefix;
-        
-        startLevel      = startLevel  || 1;
-        
-        for (var i = 0, len = toc.length; i < len; i++) 
-        {
-            var text  = toc[i].text;
+
+        startLevel = startLevel || 1;
+
+        for (var i = 0, len = toc.length; i < len; i++) {
+            var text = toc[i].text;
             var level = toc[i].level;
-            
+
             if (level < startLevel) {
                 continue;
             }
-            
-            if (level > lastLevel) 
-            {
+
+            if (level > lastLevel) {
                 html += "";
             }
-            else if (level < lastLevel) 
-            {
+            else if (level < lastLevel) {
                 html += (new Array(lastLevel - level + 2)).join("</ul></li>");
-            } 
-            else 
-            {
+            }
+            else {
                 html += "</ul></li>";
             }
 
             html += "<li><a class=\"toc-level-" + level + "\" href=\"#" + text + "\" level=\"" + level + "\">" + text + "</a><ul>";
             lastLevel = level;
         }
-        
+
         var tocContainer = container.find(".markdown-toc");
-        
-        if ((tocContainer.length < 1 && container.attr("previewContainer") === "false"))
-        {
+
+        if ((tocContainer.length < 1 && container.attr("previewContainer") === "false")) {
             var tocHTML = "<div class=\"markdown-toc " + classPrefix + "markdown-toc\"></div>";
-            
+
             tocHTML = (tocDropdown) ? "<div class=\"" + classPrefix + "toc-menu\">" + tocHTML + "</div>" : tocHTML;
-            
+
             container.html(tocHTML);
-            
+
             tocContainer = container.find(".markdown-toc");
         }
-        
-        if (tocDropdown)
-        {
+
+        if (tocDropdown) {
             tocContainer.wrap("<div class=\"" + classPrefix + "toc-menu\"></div><br/>");
         }
-        
+
         tocContainer.html("<ul class=\"markdown-toc-list\"></ul>").children(".markdown-toc-list").html(html.replace(/\r?\n?\<ul\>\<\/ul\>/g, ""));
-        
+
         return tocContainer;
     };
-    
+
     /**
      *
      * 生成TOC下拉菜单
@@ -3755,63 +3551,60 @@
      * @param   {String}   tocTitle        ToC title
      * @returns {Object}                   return toc-menu object
      */
-    
-    editormd.tocDropdownMenu = function(container, tocTitle) {
-        
-        tocTitle      = tocTitle || "Table of Contents";
-        
-        var zindex    = 400;
-        var tocMenus  = container.find("." + this.classPrefix + "toc-menu");
 
-        tocMenus.each(function() {
-            var $this  = $(this);
-            var toc    = $this.children(".markdown-toc");
-            var icon   = "<i class=\"fa fa-angle-down\"></i>";
-            var btn    = "<a href=\"javascript:;\" class=\"toc-menu-btn\">" + icon + tocTitle + "</a>";
-            var menu   = toc.children("ul");            
-            var list   = menu.find("li");
-            
+    editormd.tocDropdownMenu = function (container, tocTitle) {
+
+        tocTitle = tocTitle || "Table of Contents";
+
+        var zindex = 400;
+        var tocMenus = container.find("." + this.classPrefix + "toc-menu");
+
+        tocMenus.each(function () {
+            var $this = $(this);
+            var toc = $this.children(".markdown-toc");
+            var icon = "<i class=\"fa fa-angle-down\"></i>";
+            var btn = "<a href=\"javascript:;\" class=\"toc-menu-btn\">" + icon + tocTitle + "</a>";
+            var menu = toc.children("ul");
+            var list = menu.find("li");
+
             toc.append(btn);
-            
+
             list.first().before("<li><h1>" + tocTitle + " " + icon + "</h1></li>");
-            
-            $this.mouseover(function(){
+
+            $this.mouseover(function () {
                 menu.show();
 
-                list.each(function(){
+                list.each(function () {
                     var li = $(this);
                     var ul = li.children("ul");
 
-                    if (ul.html() === "")
-                    {
+                    if (ul.html() === "") {
                         ul.remove();
                     }
 
-                    if (ul.length > 0 && ul.html() !== "")
-                    {
+                    if (ul.length > 0 && ul.html() !== "") {
                         var firstA = li.children("a").first();
 
-                        if (firstA.children(".fa").length < 1)
-                        {
-                            firstA.append( $(icon).css({ float:"right", paddingTop:"4px" }) );
+                        if (firstA.children(".fa").length < 1) {
+                            firstA.append($(icon).css({ float: "right", paddingTop: "4px" }));
                         }
                     }
 
-                    li.mouseover(function(){
+                    li.mouseover(function () {
                         ul.css("z-index", zindex).show();
                         zindex += 1;
-                    }).mouseleave(function(){
+                    }).mouseleave(function () {
                         ul.hide();
                     });
                 });
-            }).mouseleave(function(){
+            }).mouseleave(function () {
                 menu.hide();
-            }); 
-        });       
-        
+            });
+        });
+
         return tocMenus;
     };
-    
+
     /**
      * 简单地过滤指定的HTML标签
      * Filter custom html tags
@@ -3820,72 +3613,67 @@
      * @param   {String}   filters       要过滤的标签
      * @returns {String}   html          返回过滤的HTML
      */
-    
-    editormd.filterHTMLTags = function(html, filters) {
-        
+
+    editormd.filterHTMLTags = function (html, filters) {
+
         if (typeof html !== "string") {
             html = new String(html);
         }
-            
+
         if (typeof filters !== "string") {
             return html;
         }
 
         var expression = filters.split("|");
         var filterTags = expression[0].split(",");
-        var attrs      = expression[1];
+        var attrs = expression[1];
 
-        for (var i = 0, len = filterTags.length; i < len; i++)
-        {
+        for (var i = 0, len = filterTags.length; i < len; i++) {
             var tag = filterTags[i];
 
             html = html.replace(new RegExp("\<\s*" + tag + "\s*([^\>]*)\>([^\>]*)\<\s*\/" + tag + "\s*\>", "igm"), "");
         }
-        
+
         //return html;
 
-        if (typeof attrs !== "undefined")
-        {
+        if (typeof attrs !== "undefined") {
             var htmlTagRegex = /\<(\w+)\s*([^\>]*)\>([^\>]*)\<\/(\w+)\>/ig;
 
-            if (attrs === "*")
-            {
-                html = html.replace(htmlTagRegex, function($1, $2, $3, $4, $5) {
+            if (attrs === "*") {
+                html = html.replace(htmlTagRegex, function ($1, $2, $3, $4, $5) {
                     return "<" + $2 + ">" + $4 + "</" + $5 + ">";
-                });         
+                });
             }
-            else if (attrs === "on*")
-            {
-                html = html.replace(htmlTagRegex, function($1, $2, $3, $4, $5) {
+            else if (attrs === "on*") {
+                html = html.replace(htmlTagRegex, function ($1, $2, $3, $4, $5) {
                     var el = $("<" + $2 + ">" + $4 + "</" + $5 + ">");
                     var _attrs = $($1)[0].attributes;
                     var $attrs = {};
-                    
-                    $.each(_attrs, function(i, e) {
+
+                    $.each(_attrs, function (i, e) {
                         if (e.nodeName !== '"') $attrs[e.nodeName] = e.nodeValue;
                     });
-                    
-                    $.each($attrs, function(i) {                        
+
+                    $.each($attrs, function (i) {
                         if (i.indexOf("on") === 0) {
                             delete $attrs[i];
                         }
                     });
-                    
+
                     el.attr($attrs);
-                    
+
                     var text = (typeof el[1] !== "undefined") ? $(el[1]).text() : "";
 
                     return el[0].outerHTML + text;
                 });
             }
-            else
-            {
-                html = html.replace(htmlTagRegex, function($1, $2, $3, $4) {
+            else {
+                html = html.replace(htmlTagRegex, function ($1, $2, $3, $4) {
                     var filterAttrs = attrs.split(",");
                     var el = $($1);
                     el.html($4);
 
-                    $.each(filterAttrs, function(i) {
+                    $.each(filterAttrs, function (i) {
                         el.attr(filterAttrs[i], null);
                     });
 
@@ -3893,10 +3681,10 @@
                 });
             }
         }
-        
+
         return html;
     };
-    
+
     /**
      * 将Markdown文档解析为HTML用于前台显示
      * Parse Markdown to HTML for Font-end preview.
@@ -3905,167 +3693,154 @@
      * @param   {Object}   [options={}]  配置选项，可选
      * @returns {Object}   div           返回jQuery对象元素
      */
-    
-    editormd.markdownToHTML = function(id, options) {
+
+    editormd.markdownToHTML = function (id, options) {
         var defaults = {
-            gfm                  : true,
-            toc                  : true,
-            tocm                 : false,
-            tocStartLevel        : 1,
-            tocTitle             : "目录",
-            tocDropdown          : false,
-            tocContainer         : "",
-            markdown             : "",
-            markdownSourceCode   : false,
-            htmlDecode           : false,
-            autoLoadKaTeX        : true,
-            pageBreak            : true,
-            atLink               : true,    // for @link
-            emailLink            : true,    // for mail address auto link
-            tex                  : false,
-            taskList             : false,   // Github Flavored Markdown task lists
-            emoji                : false,
-            flowChart            : false,
-            sequenceDiagram      : false,
-            previewCodeHighlight : true
+            gfm: true,
+            toc: true,
+            tocm: false,
+            tocStartLevel: 1,
+            tocTitle: "目录",
+            tocDropdown: false,
+            tocContainer: "",
+            markdown: "",
+            markdownSourceCode: false,
+            htmlDecode: false,
+            autoLoadKaTeX: true,
+            pageBreak: true,
+            atLink: true,    // for @link
+            emailLink: true,    // for mail address auto link
+            tex: false,
+            taskList: false,   // Github Flavored Markdown task lists
+            emoji: false,
+            flowChart: false,
+            sequenceDiagram: false,
+            previewCodeHighlight: true
         };
-        
-        editormd.$marked  = marked;
 
-        var div           = $("#" + id);
-        var settings      = div.settings = $.extend(true, defaults, options || {});
-        var saveTo        = div.find("textarea");
-        
-        if (saveTo.length < 1)
-        {
+        editormd.$marked = marked;
+
+        var div = $("#" + id);
+        var settings = div.settings = $.extend(true, defaults, options || {});
+        var saveTo = div.find("textarea");
+
+        if (saveTo.length < 1) {
             div.append("<textarea></textarea>");
-            saveTo        = div.find("textarea");
-        }        
-        
-        var markdownDoc   = (settings.markdown === "") ? saveTo.val() : settings.markdown; 
-        var markdownToC   = [];
+            saveTo = div.find("textarea");
+        }
 
-        var rendererOptions = {  
-            toc                  : settings.toc,
-            tocm                 : settings.tocm,
-            tocStartLevel        : settings.tocStartLevel,
-            taskList             : settings.taskList,
-            emoji                : settings.emoji,
-            tex                  : settings.tex,
-            pageBreak            : settings.pageBreak,
-            atLink               : settings.atLink,           // for @link
-            emailLink            : settings.emailLink,        // for mail address auto link
-            flowChart            : settings.flowChart,
-            sequenceDiagram      : settings.sequenceDiagram,
-            previewCodeHighlight : settings.previewCodeHighlight,
+        var markdownDoc = (settings.markdown === "") ? saveTo.val() : settings.markdown;
+        var markdownToC = [];
+
+        var rendererOptions = {
+            toc: settings.toc,
+            tocm: settings.tocm,
+            tocStartLevel: settings.tocStartLevel,
+            taskList: settings.taskList,
+            emoji: settings.emoji,
+            tex: settings.tex,
+            pageBreak: settings.pageBreak,
+            atLink: settings.atLink,           // for @link
+            emailLink: settings.emailLink,        // for mail address auto link
+            flowChart: settings.flowChart,
+            sequenceDiagram: settings.sequenceDiagram,
+            previewCodeHighlight: settings.previewCodeHighlight,
         };
 
         var markedOptions = {
-            renderer    : editormd.markedRenderer(markdownToC, rendererOptions),
-            gfm         : settings.gfm,
-            tables      : true,
-            breaks      : true,
-            pedantic    : false,
-            sanitize    : (settings.htmlDecode) ? false : true, // 是否忽略HTML标签，即是否开启HTML标签解析，为了安全性，默认不开启
-            smartLists  : true,
-            smartypants : true
+            renderer: editormd.markedRenderer(markdownToC, rendererOptions),
+            gfm: settings.gfm,
+            tables: true,
+            breaks: true,
+            pedantic: false,
+            sanitize: (settings.htmlDecode) ? false : true, // 是否忽略HTML标签，即是否开启HTML标签解析，为了安全性，默认不开启
+            smartLists: true,
+            smartypants: true
         };
-        
+
         markdownDoc = new String(markdownDoc);
-        
+
         var markdownParsed = marked(markdownDoc, markedOptions);
-        
+
         markdownParsed = editormd.filterHTMLTags(markdownParsed, settings.htmlDecode);
-        
+
         if (settings.markdownSourceCode) {
             saveTo.text(markdownDoc);
         } else {
             saveTo.remove();
         }
-        
+
         div.addClass("markdown-body " + this.classPrefix + "html-preview").append(markdownParsed);
-        
+
         var tocContainer = (settings.tocContainer !== "") ? $(settings.tocContainer) : div;
-        
-        if (settings.tocContainer !== "")
-        {
+
+        if (settings.tocContainer !== "") {
             tocContainer.attr("previewContainer", false);
         }
-         
-        if (settings.toc) 
-        {
+
+        if (settings.toc) {
             div.tocContainer = this.markdownToCRenderer(markdownToC, tocContainer, settings.tocDropdown, settings.tocStartLevel);
-            
-            if (settings.tocDropdown || div.find("." + this.classPrefix + "toc-menu").length > 0)
-            {
+
+            if (settings.tocDropdown || div.find("." + this.classPrefix + "toc-menu").length > 0) {
                 this.tocDropdownMenu(div, settings.tocTitle);
             }
-            
-            if (settings.tocContainer !== "")
-            {
+
+            if (settings.tocContainer !== "") {
                 div.find(".editormd-toc-menu, .editormd-markdown-toc").remove();
             }
         }
-            
-        if (settings.previewCodeHighlight) 
-        {
+
+        if (settings.previewCodeHighlight) {
             div.find("pre").addClass("prettyprint linenums");
             prettyPrint();
         }
-        
-        if (!editormd.isIE8) 
-        {
+
+        if (!editormd.isIE8) {
             if (settings.flowChart) {
-                div.find(".flowchart").flowChart(); 
+                div.find(".flowchart").flowChart();
             }
 
             if (settings.sequenceDiagram) {
-                div.find(".sequence-diagram").sequenceDiagram({theme: "simple"});
+                div.find(".sequence-diagram").sequenceDiagram({ theme: "simple" });
             }
         }
 
-        if (settings.tex)
-        {
-            var katexHandle = function() {
-                div.find("." + editormd.classNames.tex).each(function(){
-                    var tex  = $(this);            
-                    // 和线上的不一样？
-                    // http://editor.md.ipandao.com/examples/html-preview-markdown-to-html-custom-toc-container.html#Editor.md
-                    //  katex.render(tex.html().replace(/&lt;/g, "<").replace(/&gt;/g, ">"), tex[0]);
+        if (settings.tex) {
+            var katexHandle = function () {
+                div.find("." + editormd.classNames.tex).each(function () {
+                    var tex = $(this);
                     katex.render(tex.text(), tex[0]);
                     tex.find(".katex").css("font-size", "1.0em");
                 });
             };
-            
-            if (settings.autoLoadKaTeX && !editormd.$katex && !editormd.kaTeXLoaded)
-            {
-                this.loadKaTeX(function() {
-                    editormd.$katex      = katex;
+
+            if (settings.autoLoadKaTeX && !editormd.$katex && !editormd.kaTeXLoaded) {
+                this.loadKaTeX(function () {
+                    editormd.$katex = katex;
                     editormd.kaTeXLoaded = true;
                     katexHandle();
                 });
             }
-            else
-            {
+            else {
                 katexHandle();
             }
         }
-        
-        div.getMarkdown = function() {            
+
+        div.getMarkdown = function () {
             return saveTo.val();
         };
-        
+
         return div;
     };
-    
+
     // Editor.md themes, change toolbar themes etc.
     // added @1.5.0
-    editormd.themes        = ["default", "dark"];
-    
+    editormd.themes = ["default", "dark"];
+
     // Preview area themes
     // added @1.5.0
     editormd.previewThemes = ["default", "dark"];
-    
+
     // CodeMirror / editor area themes
     // @1.5.0 rename -> editorThemes, old version -> themes
     editormd.editorThemes = [
@@ -4086,13 +3861,13 @@
     ];
 
     editormd.loadPlugins = {};
-    
+
     editormd.loadFiles = {
-        js     : [],
-        css    : [],
-        plugin : []
+        js: [],
+        css: [],
+        plugin: []
     };
-    
+
     /**
      * 动态加载Editor.md插件，但不立即执行
      * Load editor.md plugins
@@ -4101,16 +3876,16 @@
      * @param {Function} [callback=function()] 加载成功后执行的回调函数
      * @param {String}   [into="head"]         嵌入页面的位置
      */
-    
-    editormd.loadPlugin = function(fileName, callback, into) {
-        callback   = callback || function() {};
-        
-        this.loadScript(fileName, function() {
+
+    editormd.loadPlugin = function (fileName, callback, into) {
+        callback = callback || function () { };
+
+        this.loadScript(fileName, function () {
             editormd.loadFiles.plugin.push(fileName);
             callback();
         }, into);
     };
-    
+
     /**
      * 动态加载CSS文件的方法
      * Load css file method
@@ -4119,30 +3894,30 @@
      * @param {Function} [callback=function()] 加载成功后执行的回调函数
      * @param {String}   [into="head"]         嵌入页面的位置
      */
-    
-    editormd.loadCSS   = function(fileName, callback, into) {
-        into       = into     || "head";        
-        callback   = callback || function() {};
-        
-        var css    = document.createElement("link");
-        css.type   = "text/css";
-        css.rel    = "stylesheet";
-        css.onload = css.onreadystatechange = function() {
+
+    editormd.loadCSS = function (fileName, callback, into) {
+        into = into || "head";
+        callback = callback || function () { };
+
+        var css = document.createElement("link");
+        css.type = "text/css";
+        css.rel = "stylesheet";
+        css.onload = css.onreadystatechange = function () {
             editormd.loadFiles.css.push(fileName);
             callback();
         };
 
-        css.href   = fileName + ".css";
+        css.href = fileName + ".css";
 
-        if(into === "head") {
+        if (into === "head") {
             document.getElementsByTagName("head")[0].appendChild(css);
         } else {
             document.body.appendChild(css);
         }
     };
-    
-    editormd.isIE    = (navigator.appName == "Microsoft Internet Explorer");
-    editormd.isIE8   = (editormd.isIE && navigator.appVersion.match(/8./i) == "8.");
+
+    editormd.isIE = (navigator.appName == "Microsoft Internet Explorer");
+    editormd.isIE8 = (editormd.isIE && navigator.appVersion.match(/8./i) == "8.");
 
     /**
      * 动态加载JS文件的方法
@@ -4153,34 +3928,30 @@
      * @param {String}   [into="head"]         嵌入页面的位置
      */
 
-    editormd.loadScript = function(fileName, callback, into) {
-        
-        into          = into     || "head";
-        callback      = callback || function() {};
-        
-        var script    = null; 
-        script        = document.createElement("script");
-        script.id     = fileName.replace(/[\./]+/g, "-");
-        script.type   = "text/javascript";        
-        script.src    = fileName + ".js";
-        
-        if (editormd.isIE8) 
-        {            
-            script.onreadystatechange = function() {
-                if(script.readyState) 
-                {
-                    if (script.readyState === "loaded" || script.readyState === "complete") 
-                    {
-                        script.onreadystatechange = null; 
+    editormd.loadScript = function (fileName, callback, into) {
+
+        into = into || "head";
+        callback = callback || function () { };
+
+        var script = null;
+        script = document.createElement("script");
+        script.id = fileName.replace(/[\./]+/g, "-");
+        script.type = "text/javascript";
+        script.src = fileName + ".js";
+
+        if (editormd.isIE8) {
+            script.onreadystatechange = function () {
+                if (script.readyState) {
+                    if (script.readyState === "loaded" || script.readyState === "complete") {
+                        script.onreadystatechange = null;
                         editormd.loadFiles.js.push(fileName);
                         callback();
                     }
-                } 
+                }
             };
         }
-        else
-        {
-            script.onload = function() {
+        else {
+            script.onload = function () {
                 editormd.loadFiles.js.push(fileName);
                 callback();
             };
@@ -4192,29 +3963,29 @@
             document.body.appendChild(script);
         }
     };
-    
+
     // 使用国外的CDN，加载速度有时会很慢，或者自定义URL
     // You can custom KaTeX load url.
-    editormd.katexURL  = {
-        css : "/katex/katex.min",
-        js  : "/katex/katex.min"
+    editormd.katexURL = {
+        css: "/katex/katex.min",
+        js: "/katex/katex.min"
     };
-    
+
     editormd.kaTeXLoaded = false;
-    
+
     /**
      * 加载KaTeX文件
      * load KaTeX files
      * 
      * @param {Function} [callback=function()]  加载成功后执行的回调函数
      */
-    
+
     editormd.loadKaTeX = function (callback) {
-        editormd.loadCSS(editormd.katexURL.css, function(){
-            editormd.loadScript(editormd.katexURL.js, callback || function(){});
+        editormd.loadCSS(editormd.katexURL.css, function () {
+            editormd.loadScript(editormd.katexURL.js, callback || function () { });
         });
     };
-        
+
     /**
      * 锁屏
      * lock screen
@@ -4222,11 +3993,11 @@
      * @param   {Boolean}   lock   Boolean 布尔值，是否锁屏
      * @returns {void}
      */
-    
-    editormd.lockScreen = function(lock) {
+
+    editormd.lockScreen = function (lock) {
         $("html,body").css("overflow", (lock) ? "hidden" : "");
     };
-        
+
     /**
      * 动态创建对话框
      * Creating custom dialogs
@@ -4235,53 +4006,50 @@
      * @returns {dialog} 返回创建的dialog的jQuery实例对象
      */
 
-    editormd.createDialog = function(options) {
+    editormd.createDialog = function (options) {
         var defaults = {
-            name : "",
-            width : 420,
+            name: "",
+            width: 420,
             height: 240,
-            title : "",
-            drag  : true,
-            closed : true,
-            content : "",
-            mask : true,
-            maskStyle : {
-                backgroundColor : "#fff",
-                opacity : 0.1
+            title: "",
+            drag: true,
+            closed: true,
+            content: "",
+            mask: true,
+            maskStyle: {
+                backgroundColor: "#fff",
+                opacity: 0.1
             },
-            lockScreen : true,
-            footer : true,
-            buttons : false
+            lockScreen: true,
+            footer: true,
+            buttons: false
         };
 
-        options          = $.extend(true, defaults, options);
-        
-        var $this        = this;
-        var editor       = this.editor;
-        var classPrefix  = editormd.classPrefix;
-        var guid         = (new Date()).getTime();
-        var dialogName   = ( (options.name === "") ? classPrefix + "dialog-" + guid : options.name);
+        options = $.extend(true, defaults, options);
+
+        var $this = this;
+        var editor = this.editor;
+        var classPrefix = editormd.classPrefix;
+        var guid = (new Date()).getTime();
+        var dialogName = ((options.name === "") ? classPrefix + "dialog-" + guid : options.name);
         var mouseOrTouch = editormd.mouseOrTouch;
 
-        var html         = "<div class=\"" + classPrefix + "dialog " + dialogName + "\">";
+        var html = "<div class=\"" + classPrefix + "dialog " + dialogName + "\">";
 
-        if (options.title !== "")
-        {
-            html += "<div class=\"" + classPrefix + "dialog-header\"" + ( (options.drag) ? " style=\"cursor: move;\"" : "" ) + ">";
+        if (options.title !== "") {
+            html += "<div class=\"" + classPrefix + "dialog-header\"" + ((options.drag) ? " style=\"cursor: move;\"" : "") + ">";
             html += "<strong class=\"" + classPrefix + "dialog-title\">" + options.title + "</strong>";
             html += "</div>";
         }
 
-        if (options.closed)
-        {
+        if (options.closed) {
             html += "<a href=\"javascript:;\" class=\"fa fa-close " + classPrefix + "dialog-close\"></a>";
         }
 
-        html += "<div class=\"" + classPrefix + "dialog-container\">" + options.content;                    
+        html += "<div class=\"" + classPrefix + "dialog-container\">" + options.content;
 
-        if (options.footer || typeof options.footer === "string") 
-        {
-            html += "<div class=\"" + classPrefix + "dialog-footer\">" + ( (typeof options.footer === "boolean") ? "" : options.footer) + "</div>";
+        if (options.footer || typeof options.footer === "string") {
+            html += "<div class=\"" + classPrefix + "dialog-footer\">" + ((typeof options.footer === "boolean") ? "" : options.footer) + "</div>";
         }
 
         html += "</div>";
@@ -4294,9 +4062,8 @@
 
         var dialog = editor.find("." + dialogName);
 
-        dialog.lockScreen = function(lock) {
-            if (options.lockScreen)
-            {                
+        dialog.lockScreen = function (lock) {
+            if (options.lockScreen) {
                 $("html,body").css("overflow", (lock) ? "hidden" : "");
                 $this.resize();
             }
@@ -4304,24 +4071,22 @@
             return dialog;
         };
 
-        dialog.showMask = function() {
-            if (options.mask)
-            {
+        dialog.showMask = function () {
+            if (options.mask) {
                 editor.find("." + classPrefix + "mask").css(options.maskStyle).css("z-index", editormd.dialogZindex - 1).show();
             }
             return dialog;
         };
 
-        dialog.hideMask = function() {
-            if (options.mask)
-            {
+        dialog.hideMask = function () {
+            if (options.mask) {
                 editor.find("." + classPrefix + "mask").hide();
             }
 
             return dialog;
         };
 
-        dialog.loading = function(show) {                        
+        dialog.loading = function (show) {
             var loading = dialog.find("." + classPrefix + "dialog-mask");
             loading[(show) ? "show" : "hide"]();
 
@@ -4331,16 +4096,16 @@
         dialog.lockScreen(true).showMask();
 
         dialog.show().css({
-            zIndex : editormd.dialogZindex,
-            border : (editormd.isIE8) ? "1px solid #ddd" : "",
-            width  : (typeof options.width  === "number") ? options.width + "px"  : options.width,
-            height : (typeof options.height === "number") ? options.height + "px" : options.height
+            zIndex: editormd.dialogZindex,
+            border: (editormd.isIE8) ? "1px solid #ddd" : "",
+            width: (typeof options.width === "number") ? options.width + "px" : options.width,
+            height: (typeof options.height === "number") ? options.height + "px" : options.height
         });
 
-        var dialogPosition = function(){
+        var dialogPosition = function () {
             dialog.css({
-                top    : ($(window).height() - dialog.height()) / 2 + "px",
-                left   : ($(window).width() - dialog.width()) / 2 + "px"
+                top: ($(window).height() - dialog.height()) / 2 + "px",
+                left: ($(window).width() - dialog.width()) / 2 + "px"
             });
         };
 
@@ -4348,16 +4113,14 @@
 
         $(window).resize(dialogPosition);
 
-        dialog.children("." + classPrefix + "dialog-close").bind(mouseOrTouch("click", "touchend"), function() {
+        dialog.children("." + classPrefix + "dialog-close").bind(mouseOrTouch("click", "touchend"), function () {
             dialog.hide().lockScreen(false).hideMask();
         });
 
-        if (typeof options.buttons === "object")
-        {
+        if (typeof options.buttons === "object") {
             var footer = dialog.footer = dialog.find("." + classPrefix + "dialog-footer");
 
-            for (var key in options.buttons)
-            {
+            for (var key in options.buttons) {
                 var btn = options.buttons[key];
                 var btnClassName = classPrefix + key + "-btn";
 
@@ -4367,24 +4130,23 @@
             }
         }
 
-        if (options.title !== "" && options.drag)
-        {                        
+        if (options.title !== "" && options.drag) {
             var posX, posY;
             var dialogHeader = dialog.children("." + classPrefix + "dialog-header");
 
             if (!options.mask) {
-                dialogHeader.bind(mouseOrTouch("click", "touchend"), function(){
+                dialogHeader.bind(mouseOrTouch("click", "touchend"), function () {
                     editormd.dialogZindex += 2;
                     dialog.css("z-index", editormd.dialogZindex);
                 });
             }
 
-            dialogHeader.mousedown(function(e) {
+            dialogHeader.mousedown(function (e) {
                 e = e || window.event;  //IE
                 posX = e.clientX - parseInt(dialog[0].style.left);
                 posY = e.clientY - parseInt(dialog[0].style.top);
 
-                document.onmousemove = moveAction;                   
+                document.onmousemove = moveAction;
             });
 
             var userCanSelect = function (obj) {
@@ -4392,7 +4154,7 @@
             };
 
             var userUnselect = function (obj) {
-                obj.addClass(classPrefix + "user-unselect").on("selectstart", function(event) { // selectstart for IE                        
+                obj.addClass(classPrefix + "user-unselect").on("selectstart", function (event) { // selectstart for IE                        
                     return false;
                 });
             };
@@ -4402,10 +4164,10 @@
 
                 var left, top, nowLeft = parseInt(dialog[0].style.left), nowTop = parseInt(dialog[0].style.top);
 
-                if( nowLeft >= 0 ) {
-                    if( nowLeft + dialog.width() <= $(window).width()) {
+                if (nowLeft >= 0) {
+                    if (nowLeft + dialog.width() <= $(window).width()) {
                         left = e.clientX - posX;
-                    } else {    
+                    } else {
                         left = $(window).width() - dialog.width();
                         document.onmousemove = null;
                     }
@@ -4414,7 +4176,7 @@
                     document.onmousemove = null;
                 }
 
-                if( nowTop >= 0 ) {
+                if (nowTop >= 0) {
                     top = e.clientY - posY;
                 } else {
                     top = 0;
@@ -4422,43 +4184,43 @@
                 }
 
 
-                document.onselectstart = function() {
+                document.onselectstart = function () {
                     return false;
                 };
 
                 userUnselect($("body"));
                 userUnselect(dialog);
                 dialog[0].style.left = left + "px";
-                dialog[0].style.top  = top + "px";
+                dialog[0].style.top = top + "px";
             };
 
-            document.onmouseup = function() {                            
+            document.onmouseup = function () {
                 userCanSelect($("body"));
                 userCanSelect(dialog);
 
-                document.onselectstart = null;         
+                document.onselectstart = null;
                 document.onmousemove = null;
             };
 
-            dialogHeader.touchDraggable = function() {
+            dialogHeader.touchDraggable = function () {
                 var offset = null;
-                var start  = function(e) {
-                    var orig = e.originalEvent; 
-                    var pos  = $(this).parent().position();
+                var start = function (e) {
+                    var orig = e.originalEvent;
+                    var pos = $(this).parent().position();
 
                     offset = {
-                        x : orig.changedTouches[0].pageX - pos.left,
-                        y : orig.changedTouches[0].pageY - pos.top
+                        x: orig.changedTouches[0].pageX - pos.left,
+                        y: orig.changedTouches[0].pageY - pos.top
                     };
                 };
 
-                var move = function(e) {
+                var move = function (e) {
                     e.preventDefault();
                     var orig = e.originalEvent;
 
                     $(this).parent().css({
-                        top  : orig.changedTouches[0].pageY - offset.y,
-                        left : orig.changedTouches[0].pageX - offset.x
+                        top: orig.changedTouches[0].pageY - offset.y,
+                        left: orig.changedTouches[0].pageX - offset.x
                     });
                 };
 
@@ -4472,7 +4234,7 @@
         $("body").removeAttr("style");
         return dialog;
     };
-    
+
     /**
      * 鼠标和触摸事件的判断/选择方法
      * MouseEvent or TouchEvent type switch
@@ -4481,21 +4243,21 @@
      * @param   {String} [touchEventType="touchend"] 供选择的触摸事件
      * @returns {String} EventType                   返回事件类型名称
      */
-    
-    editormd.mouseOrTouch = function(mouseEventType, touchEventType) {
+
+    editormd.mouseOrTouch = function (mouseEventType, touchEventType) {
         mouseEventType = mouseEventType || "click";
         touchEventType = touchEventType || "touchend";
-        
-        var eventType  = mouseEventType;
+
+        var eventType = mouseEventType;
 
         try {
             document.createEvent("TouchEvent");
             eventType = touchEventType;
-        } catch(e) {}
+        } catch (e) { }
 
         return eventType;
     };
-    
+
     /**
      * 日期时间的格式化方法
      * Datetime format method
@@ -4503,107 +4265,106 @@
      * @param   {String}   [format=""]  日期时间的格式，类似PHP的格式
      * @returns {String}   datefmt      返回格式化后的日期时间字符串
      */
-    
-    editormd.dateFormat = function(format) {                
-        format      = format || "";
 
-        var addZero = function(d) {
+    editormd.dateFormat = function (format) {
+        format = format || "";
+
+        var addZero = function (d) {
             return (d < 10) ? "0" + d : d;
         };
 
-        var date    = new Date(); 
-        var year    = date.getFullYear();
-        var year2   = year.toString().slice(2, 4);
-        var month   = addZero(date.getMonth() + 1);
-        var day     = addZero(date.getDate());
+        var date = new Date();
+        var year = date.getFullYear();
+        var year2 = year.toString().slice(2, 4);
+        var month = addZero(date.getMonth() + 1);
+        var day = addZero(date.getDate());
         var weekDay = date.getDay();
-        var hour    = addZero(date.getHours());
-        var min     = addZero(date.getMinutes());
-        var second  = addZero(date.getSeconds());
-        var ms      = addZero(date.getMilliseconds()); 
+        var hour = addZero(date.getHours());
+        var min = addZero(date.getMinutes());
+        var second = addZero(date.getSeconds());
+        var ms = addZero(date.getMilliseconds());
         var datefmt = "";
 
-        var ymd     = year2 + "-" + month + "-" + day;
-        var fymd    = year  + "-" + month + "-" + day;
-        var hms     = hour  + ":" + min   + ":" + second;
+        var ymd = year2 + "-" + month + "-" + day;
+        var fymd = year + "-" + month + "-" + day;
+        var hms = hour + ":" + min + ":" + second;
 
-        switch (format) 
-        {
-            case "UNIX Time" :
-                    datefmt = date.getTime();
+        switch (format) {
+            case "UNIX Time":
+                datefmt = date.getTime();
                 break;
 
-            case "UTC" :
-                    datefmt = date.toUTCString();
-                break;  
-
-            case "yy" :
-                    datefmt = year2;
-                break;  
-
-            case "year" :
-            case "yyyy" :
-                    datefmt = year;
+            case "UTC":
+                datefmt = date.toUTCString();
                 break;
 
-            case "month" :
-            case "mm" :
-                    datefmt = month;
-                break;                        
-
-            case "cn-week-day" :
-            case "cn-wd" :
-                    var cnWeekDays = ["日", "一", "二", "三", "四", "五", "六"];
-                    datefmt = "星期" + cnWeekDays[weekDay];
+            case "yy":
+                datefmt = year2;
                 break;
 
-            case "week-day" :
-            case "wd" :
-                    var weekDays = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
-                    datefmt = weekDays[weekDay];
+            case "year":
+            case "yyyy":
+                datefmt = year;
                 break;
 
-            case "day" :
-            case "dd" :
-                    datefmt = day;
+            case "month":
+            case "mm":
+                datefmt = month;
                 break;
 
-            case "hour" :
-            case "hh" :
-                    datefmt = hour;
+            case "cn-week-day":
+            case "cn-wd":
+                var cnWeekDays = ["日", "一", "二", "三", "四", "五", "六"];
+                datefmt = "星期" + cnWeekDays[weekDay];
                 break;
 
-            case "min" :
-            case "ii" :
-                    datefmt = min;
+            case "week-day":
+            case "wd":
+                var weekDays = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
+                datefmt = weekDays[weekDay];
                 break;
 
-            case "second" :
-            case "ss" :
-                    datefmt = second;
+            case "day":
+            case "dd":
+                datefmt = day;
                 break;
 
-            case "ms" :
-                    datefmt = ms;
+            case "hour":
+            case "hh":
+                datefmt = hour;
                 break;
 
-            case "yy-mm-dd" :
-                    datefmt = ymd;
+            case "min":
+            case "ii":
+                datefmt = min;
                 break;
 
-            case "yyyy-mm-dd" :
-                    datefmt = fymd;
+            case "second":
+            case "ss":
+                datefmt = second;
                 break;
 
-            case "yyyy-mm-dd h:i:s ms" :
-            case "full + ms" : 
-                    datefmt = fymd + " " + hms + " " + ms;
+            case "ms":
+                datefmt = ms;
                 break;
 
-            case "full" :
-            case "yyyy-mm-dd h:i:s" :
-                default:
-                    datefmt = fymd + " " + hms;
+            case "yy-mm-dd":
+                datefmt = ymd;
+                break;
+
+            case "yyyy-mm-dd":
+                datefmt = fymd;
+                break;
+
+            case "yyyy-mm-dd h:i:s ms":
+            case "full + ms":
+                datefmt = fymd + " " + hms + " " + ms;
+                break;
+
+            case "full":
+            case "yyyy-mm-dd h:i:s":
+            default:
+                datefmt = fymd + " " + hms;
                 break;
         }
 
@@ -4620,58 +4381,57 @@
     action: 图片上传url
     callback: 图片上传xhr回调
  */
-window._whenPasterDoUpload = function(event, action, callback){
+window._whenPasterDoUpload = function (event, action, callback) {
     var clipboardData = event.clipboardData,
         i = 0, items, item, types;
-    if( clipboardData ){
+    if (clipboardData) {
         items = clipboardData.items;
-        if( !items )
+        if (!items)
             return;
         item = items[0];
         // 保存在剪贴板中的数据类型
         types = clipboardData.types || [];
 
-        for( ; i < types.length; i++ ){
-            if( types[i] === 'Files' ){
+        for (; i < types.length; i++) {
+            if (types[i] === 'Files') {
                 item = items[i];
                 break;
             }
         }
         // 判断是否为图片数据
-        if( item && item.kind === 'file' && item.type.match(/^image\//i) ){
+        if (item && item.kind === 'file' && item.type.match(/^image\//i)) {
             // 读取该图片
             var file = item.getAsFile();
             var oMyForm = new FormData();
-            oMyForm.append("editormd-image-file",file);
+            oMyForm.append("editormd-image-file", file);
             oMyForm.append("file_param_name", "editormd-image-file");
-            oMyForm.append("byxhr","true");
+            oMyForm.append("byxhr", "true");
             var xhr = new window.XMLHttpRequest();
             xhr.addEventListener("load",
-                function(_xhr){
-                    var response=_xhr.target, json=JSON.parse(response.responseText);
+                function (_xhr) {
+                    var response = _xhr.target, json = JSON.parse(response.responseText);
 
                     if (json.success === 1) {
                         callback && callback(json)
                         // input.value=json.url;
                     }
-                    else
-                    {
+                    else {
                         callback && callback(json)
                         console.log(json.message);
                     }
                 }, false);
-            xhr.addEventListener("error", function(){console.error("error");}, false);
+            xhr.addEventListener("error", function () { console.error("error"); }, false);
             xhr.open("POST", action);
             xhr.send(oMyForm);
         }
     }
 }
 function initEditormdPasteUpload(editormd, url, callback) {
-    editormd.cm.getInputField().addEventListener("paste", function(event) {
-        _whenPasterDoUpload(event, url, function(resJson) {
+    editormd.cm.getInputField().addEventListener("paste", function (event) {
+        _whenPasterDoUpload(event, url, function (resJson) {
             // TODO 插入图片url到cm
             if (resJson.id) {
-                editormd.cm.replaceSelection("![](/api/attachments/"+resJson.id+")")
+                editormd.cm.replaceSelection("![](/api/attachments/" + resJson.id + ")")
             }
         });
     })
diff --git a/public/js/edu_application.js b/public/js/edu_application.js
new file mode 100644
index 00000000..e69de29b
diff --git a/public/js/flv.min.js b/public/js/flv.min.js
new file mode 100644
index 00000000..fed09f7e
--- /dev/null
+++ b/public/js/flv.min.js
@@ -0,0 +1,7 @@
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.flvjs=e()}}(function(){var e;return function e(t,n,i){function r(a,o){if(!n[a]){if(!t[a]){var u="function"==typeof require&&require;if(!o&&u)return u(a,!0);if(s)return s(a,!0);var l=new Error("Cannot find module '"+a+"'");throw l.code="MODULE_NOT_FOUND",l}var d=n[a]={exports:{}};t[a][0].call(d.exports,function(e){var n=t[a][1][e];return r(n||e)},d,d.exports,e,t,n,i)}return n[a].exports}for(var s="function"==typeof require&&require,a=0;a<i.length;a++)r(i[a]);return r}({1:[function(t,n,i){(function(r,s){!function(t,r){"object"==typeof i&&void 0!==n?n.exports=r():"function"==typeof e&&e.amd?e(r):t.ES6Promise=r()}(this,function(){"use strict";function e(e){var t=typeof e;return null!==e&&("object"===t||"function"===t)}function n(e){return"function"==typeof e}function i(e){V=e}function a(e){z=e}function o(){return void 0!==G?function(){G(l)}:u()}function u(){var e=setTimeout;return function(){return e(l,1)}}function l(){for(var e=0;e<F;e+=2){(0,Y[e])(Y[e+1]),Y[e]=void 0,Y[e+1]=void 0}F=0}function d(e,t){var n=this,i=new this.constructor(f);void 0===i[Q]&&C(i);var r=n._state;if(r){var s=arguments[r-1];z(function(){return w(r,i,s,n._result)})}else L(n,i,e,t);return i}function h(e){var t=this;if(e&&"object"==typeof e&&e.constructor===t)return e;var n=new t(f);return E(n,e),n}function f(){}function c(){return new TypeError("You cannot resolve a promise with itself")}function _(){return new TypeError("A promises callback cannot return that same promise.")}function m(e){try{return e.then}catch(e){return te.error=e,te}}function p(e,t,n,i){try{e.call(t,n,i)}catch(e){return e}}function v(e,t,n){z(function(e){var i=!1,r=p(n,t,function(n){i||(i=!0,t!==n?E(e,n):S(e,n))},function(t){i||(i=!0,k(e,t))},"Settle: "+(e._label||" unknown promise"));!i&&r&&(i=!0,k(e,r))},e)}function g(e,t){t._state===$?S(e,t._result):t._state===ee?k(e,t._result):L(t,void 0,function(t){return E(e,t)},function(t){return k(e,t)})}function y(e,t,i){t.constructor===e.constructor&&i===d&&t.constructor.resolve===h?g(e,t):i===te?(k(e,te.error),te.error=null):void 0===i?S(e,t):n(i)?v(e,t,i):S(e,t)}function E(t,n){t===n?k(t,c()):e(n)?y(t,n,m(n)):S(t,n)}function b(e){e._onerror&&e._onerror(e._result),R(e)}function S(e,t){e._state===J&&(e._result=t,e._state=$,0!==e._subscribers.length&&z(R,e))}function k(e,t){e._state===J&&(e._state=ee,e._result=t,z(b,e))}function L(e,t,n,i){var r=e._subscribers,s=r.length;e._onerror=null,r[s]=t,r[s+$]=n,r[s+ee]=i,0===s&&e._state&&z(R,e)}function R(e){var t=e._subscribers,n=e._state;if(0!==t.length){for(var i=void 0,r=void 0,s=e._result,a=0;a<t.length;a+=3)i=t[a],r=t[a+n],i?w(n,i,r,s):r(s);e._subscribers.length=0}}function A(e,t){try{return e(t)}catch(e){return te.error=e,te}}function w(e,t,i,r){var s=n(i),a=void 0,o=void 0,u=void 0,l=void 0;if(s){if(a=A(i,r),a===te?(l=!0,o=a.error,a.error=null):u=!0,t===a)return void k(t,_())}else a=r,u=!0;t._state!==J||(s&&u?E(t,a):l?k(t,o):e===$?S(t,a):e===ee&&k(t,a))}function T(e,t){try{t(function(t){E(e,t)},function(t){k(e,t)})}catch(t){k(e,t)}}function O(){return ne++}function C(e){e[Q]=ne++,e._state=void 0,e._result=void 0,e._subscribers=[]}function I(){return new Error("Array Methods must be provided an Array")}function D(e){return new ie(this,e).promise}function x(e){var t=this;return new t(N(e)?function(n,i){for(var r=e.length,s=0;s<r;s++)t.resolve(e[s]).then(n,i)}:function(e,t){return t(new TypeError("You must pass an array to race."))})}function M(e){var t=this,n=new t(f);return k(n,e),n}function B(){throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")}function j(){throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")}function P(){var e=void 0;if(void 0!==s)e=s;else if("undefined"!=typeof self)e=self;else try{e=Function("return this")()}catch(e){throw new Error("polyfill failed because global object is unavailable in this environment")}var t=e.Promise;if(t){var n=null;try{n=Object.prototype.toString.call(t.resolve())}catch(e){}if("[object Promise]"===n&&!t.cast)return}e.Promise=re}var U=void 0;U=Array.isArray?Array.isArray:function(e){return"[object Array]"===Object.prototype.toString.call(e)};var N=U,F=0,G=void 0,V=void 0,z=function(e,t){Y[F]=e,Y[F+1]=t,2===(F+=2)&&(V?V(l):Z())},H="undefined"!=typeof window?window:void 0,K=H||{},q=K.MutationObserver||K.WebKitMutationObserver,W="undefined"==typeof self&&void 0!==r&&"[object process]"==={}.toString.call(r),X="undefined"!=typeof Uint8ClampedArray&&"undefined"!=typeof importScripts&&"undefined"!=typeof MessageChannel,Y=new Array(1e3),Z=void 0;Z=W?function(){return function(){return r.nextTick(l)}}():q?function(){var e=0,t=new q(l),n=document.createTextNode("");return t.observe(n,{characterData:!0}),function(){n.data=e=++e%2}}():X?function(){var e=new MessageChannel;return e.port1.onmessage=l,function(){return e.port2.postMessage(0)}}():void 0===H&&"function"==typeof t?function(){try{var e=Function("return this")().require("vertx");return G=e.runOnLoop||e.runOnContext,o()}catch(e){return u()}}():u();var Q=Math.random().toString(36).substring(2),J=void 0,$=1,ee=2,te={error:null},ne=0,ie=function(){function e(e,t){this._instanceConstructor=e,this.promise=new e(f),this.promise[Q]||C(this.promise),N(t)?(this.length=t.length,this._remaining=t.length,this._result=new Array(this.length),0===this.length?S(this.promise,this._result):(this.length=this.length||0,this._enumerate(t),0===this._remaining&&S(this.promise,this._result))):k(this.promise,I())}return e.prototype._enumerate=function(e){for(var t=0;this._state===J&&t<e.length;t++)this._eachEntry(e[t],t)},e.prototype._eachEntry=function(e,t){var n=this._instanceConstructor,i=n.resolve;if(i===h){var r=m(e);if(r===d&&e._state!==J)this._settledAt(e._state,t,e._result);else if("function"!=typeof r)this._remaining--,this._result[t]=e;else if(n===re){var s=new n(f);y(s,e,r),this._willSettleAt(s,t)}else this._willSettleAt(new n(function(t){return t(e)}),t)}else this._willSettleAt(i(e),t)},e.prototype._settledAt=function(e,t,n){var i=this.promise;i._state===J&&(this._remaining--,e===ee?k(i,n):this._result[t]=n),0===this._remaining&&S(i,this._result)},e.prototype._willSettleAt=function(e,t){var n=this;L(e,void 0,function(e){return n._settledAt($,t,e)},function(e){return n._settledAt(ee,t,e)})},e}(),re=function(){function e(t){this[Q]=O(),this._result=this._state=void 0,this._subscribers=[],f!==t&&("function"!=typeof t&&B(),this instanceof e?T(this,t):j())}return e.prototype.catch=function(e){return this.then(null,e)},e.prototype.finally=function(e){var t=this,i=t.constructor;return n(e)?t.then(function(t){return i.resolve(e()).then(function(){return t})},function(t){return i.resolve(e()).then(function(){throw t})}):t.then(e,e)},e}();return re.prototype.then=d,re.all=D,re.race=x,re.resolve=h,re.reject=M,re._setScheduler=i,re._setAsap=a,re._asap=z,re.polyfill=P,re.Promise=re,re})}).call(this,t("_process"),"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{_process:3}],2:[function(e,t,n){function i(){this._events=this._events||{},this._maxListeners=this._maxListeners||void 0}function r(e){return"function"==typeof e}function s(e){return"number"==typeof e}function a(e){return"object"==typeof e&&null!==e}function o(e){return void 0===e}t.exports=i,i.EventEmitter=i,i.prototype._events=void 0,i.prototype._maxListeners=void 0,i.defaultMaxListeners=10,i.prototype.setMaxListeners=function(e){if(!s(e)||e<0||isNaN(e))throw TypeError("n must be a positive number");return this._maxListeners=e,this},i.prototype.emit=function(e){var t,n,i,s,u,l;if(this._events||(this._events={}),"error"===e&&(!this._events.error||a(this._events.error)&&!this._events.error.length)){if((t=arguments[1])instanceof Error)throw t;var d=new Error('Uncaught, unspecified "error" event. ('+t+")");throw d.context=t,d}if(n=this._events[e],o(n))return!1;if(r(n))switch(arguments.length){case 1:n.call(this);break;case 2:n.call(this,arguments[1]);break;case 3:n.call(this,arguments[1],arguments[2]);break;default:s=Array.prototype.slice.call(arguments,1),n.apply(this,s)}else if(a(n))for(s=Array.prototype.slice.call(arguments,1),l=n.slice(),i=l.length,u=0;u<i;u++)l[u].apply(this,s);return!0},i.prototype.addListener=function(e,t){var n;if(!r(t))throw TypeError("listener must be a function");return this._events||(this._events={}),this._events.newListener&&this.emit("newListener",e,r(t.listener)?t.listener:t),this._events[e]?a(this._events[e])?this._events[e].push(t):this._events[e]=[this._events[e],t]:this._events[e]=t,a(this._events[e])&&!this._events[e].warned&&(n=o(this._maxListeners)?i.defaultMaxListeners:this._maxListeners)&&n>0&&this._events[e].length>n&&(this._events[e].warned=!0,console.error("(node) warning: possible EventEmitter memory leak detected. %d listeners added. Use emitter.setMaxListeners() to increase limit.",this._events[e].length),"function"==typeof console.trace&&console.trace()),this},i.prototype.on=i.prototype.addListener,i.prototype.once=function(e,t){function n(){this.removeListener(e,n),i||(i=!0,t.apply(this,arguments))}if(!r(t))throw TypeError("listener must be a function");var i=!1;return n.listener=t,this.on(e,n),this},i.prototype.removeListener=function(e,t){var n,i,s,o;if(!r(t))throw TypeError("listener must be a function");if(!this._events||!this._events[e])return this;if(n=this._events[e],s=n.length,i=-1,n===t||r(n.listener)&&n.listener===t)delete this._events[e],this._events.removeListener&&this.emit("removeListener",e,t);else if(a(n)){for(o=s;o-- >0;)if(n[o]===t||n[o].listener&&n[o].listener===t){i=o;break}if(i<0)return this;1===n.length?(n.length=0,delete this._events[e]):n.splice(i,1),this._events.removeListener&&this.emit("removeListener",e,t)}return this},i.prototype.removeAllListeners=function(e){var t,n;if(!this._events)return this;if(!this._events.removeListener)return 0===arguments.length?this._events={}:this._events[e]&&delete this._events[e],this;if(0===arguments.length){for(t in this._events)"removeListener"!==t&&this.removeAllListeners(t);return this.removeAllListeners("removeListener"),this._events={},this}if(n=this._events[e],r(n))this.removeListener(e,n);else if(n)for(;n.length;)this.removeListener(e,n[n.length-1]);return delete this._events[e],this},i.prototype.listeners=function(e){return this._events&&this._events[e]?r(this._events[e])?[this._events[e]]:this._events[e].slice():[]},i.prototype.listenerCount=function(e){if(this._events){var t=this._events[e];if(r(t))return 1;if(t)return t.length}return 0},i.listenerCount=function(e,t){return e.listenerCount(t)}},{}],3:[function(e,t,n){function i(){throw new Error("setTimeout has not been defined")}function r(){throw new Error("clearTimeout has not been defined")}function s(e){if(h===setTimeout)return setTimeout(e,0);if((h===i||!h)&&setTimeout)return h=setTimeout,setTimeout(e,0);try{return h(e,0)}catch(t){try{return h.call(null,e,0)}catch(t){return h.call(this,e,0)}}}function a(e){if(f===clearTimeout)return clearTimeout(e);if((f===r||!f)&&clearTimeout)return f=clearTimeout,clearTimeout(e);try{return f(e)}catch(t){try{return f.call(null,e)}catch(t){return f.call(this,e)}}}function o(){p&&_&&(p=!1,_.length?m=_.concat(m):v=-1,m.length&&u())}function u(){if(!p){var e=s(o);p=!0;for(var t=m.length;t;){for(_=m,m=[];++v<t;)_&&_[v].run();v=-1,t=m.length}_=null,p=!1,a(e)}}function l(e,t){this.fun=e,this.array=t}function d(){}var h,f,c=t.exports={};!function(){try{h="function"==typeof setTimeout?setTimeout:i}catch(e){h=i}try{f="function"==typeof clearTimeout?clearTimeout:r}catch(e){f=r}}();var _,m=[],p=!1,v=-1;c.nextTick=function(e){var t=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];m.push(new l(e,t)),1!==m.length||p||s(u)},l.prototype.run=function(){this.fun.apply(null,this.array)},c.title="browser",c.browser=!0,c.env={},c.argv=[],c.version="",c.versions={},c.on=d,c.addListener=d,c.once=d,c.off=d,c.removeListener=d,c.removeAllListeners=d,c.emit=d,c.prependListener=d,c.prependOnceListener=d,c.listeners=function(e){return[]},c.binding=function(e){throw new Error("process.binding is not supported")},c.cwd=function(){return"/"},c.chdir=function(e){throw new Error("process.chdir is not supported")},c.umask=function(){return 0}},{}],4:[function(e,t,n){var i=arguments[3],r=arguments[4],s=arguments[5],a=JSON.stringify;t.exports=function(e,t){function n(e){p[e]=!0;for(var t in r[e][1]){var i=r[e][1][t];p[i]||n(i)}}for(var o,u=Object.keys(s),l=0,d=u.length;l<d;l++){var h=u[l],f=s[h].exports;if(f===e||f&&f.default===e){o=h;break}}if(!o){o=Math.floor(Math.pow(16,8)*Math.random()).toString(16);for(var c={},l=0,d=u.length;l<d;l++){var h=u[l];c[h]=h}r[o]=["function(require,module,exports){"+e+"(self); }",c]}var _=Math.floor(Math.pow(16,8)*Math.random()).toString(16),m={};m[o]=o,r[_]=["function(require,module,exports){var f = require("+a(o)+");(f.default ? f.default : f)(self);}",m];var p={};n(_);var v="("+i+")({"+Object.keys(p).map(function(e){return a(e)+":["+r[e][0]+","+a(r[e][1])+"]"}).join(",")+"},{},["+a(_)+"])",g=window.URL||window.webkitURL||window.mozURL||window.msURL,y=new Blob([v],{type:"text/javascript"});if(t&&t.bare)return y;var E=g.createObjectURL(y),b=new Worker(E);return b.objectURL=E,b}},{}],5:[function(e,t,n){"use strict";function i(){return Object.assign({},r)}Object.defineProperty(n,"__esModule",{value:!0}),n.createDefaultConfig=i;var r=n.defaultConfig={enableWorker:!1,enableStashBuffer:!0,stashInitialSize:void 0,isLive:!1,lazyLoad:!0,lazyLoadMaxDuration:180,lazyLoadRecoverDuration:30,deferLoadAfterSourceOpen:!0,autoCleanupMaxBackwardDuration:180,autoCleanupMinBackwardDuration:120,statisticsInfoReportInterval:600,fixAudioTimestampGap:!0,accurateSeek:!1,seekType:"range",seekParamStart:"bstart",seekParamEnd:"bend",rangeLoadZeroStart:!1,customSeekHandler:void 0,reuseRedirectedURL:!1,headers:void 0,customLoader:void 0}},{}],6:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var r=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),s=e("../io/io-controller.js"),a=function(e){return e&&e.__esModule?e:{default:e}}(s),o=e("../config.js"),u=function(){function e(){i(this,e)}return r(e,null,[{key:"supportMSEH264Playback",value:function(){return window.MediaSource&&window.MediaSource.isTypeSupported('video/mp4; codecs="avc1.42E01E,mp4a.40.2"')}},{key:"supportNetworkStreamIO",value:function(){var e=new a.default({},(0,o.createDefaultConfig)()),t=e.loaderType;return e.destroy(),"fetch-stream-loader"==t||"xhr-moz-chunked-loader"==t}},{key:"getNetworkLoaderTypeName",value:function(){var e=new a.default({},(0,o.createDefaultConfig)()),t=e.loaderType;return e.destroy(),t}},{key:"supportNativeMediaPlayback",value:function(t){void 0==e.videoElement&&(e.videoElement=window.document.createElement("video"));var n=e.videoElement.canPlayType(t);return"probably"===n||"maybe"==n}},{key:"getFeatureList",value:function(){var t={mseFlvPlayback:!1,mseLiveFlvPlayback:!1,networkStreamIO:!1,networkLoaderName:"",nativeMP4H264Playback:!1,nativeWebmVP8Playback:!1,nativeWebmVP9Playback:!1};return t.mseFlvPlayback=e.supportMSEH264Playback(),t.networkStreamIO=e.supportNetworkStreamIO(),t.networkLoaderName=e.getNetworkLoaderTypeName(),t.mseLiveFlvPlayback=t.mseFlvPlayback&&t.networkStreamIO,t.nativeMP4H264Playback=e.supportNativeMediaPlayback('video/mp4; codecs="avc1.42001E, mp4a.40.2"'),t.nativeWebmVP8Playback=e.supportNativeMediaPlayback('video/webm; codecs="vp8.0, vorbis"'),t.nativeWebmVP9Playback=e.supportNativeMediaPlayback('video/webm; codecs="vp9"'),t}}]),e}();n.default=u},{"../config.js":5,"../io/io-controller.js":23}],7:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var r=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),s=function(){function e(){i(this,e),this.mimeType=null,this.duration=null,this.hasAudio=null,this.hasVideo=null,this.audioCodec=null,this.videoCodec=null,this.audioDataRate=null,this.videoDataRate=null,this.audioSampleRate=null,this.audioChannelCount=null,this.width=null,this.height=null,this.fps=null,this.profile=null,this.level=null,this.refFrames=null,this.chromaFormat=null,this.sarNum=null,this.sarDen=null,this.metadata=null,this.segments=null,this.segmentCount=null,this.hasKeyframesIndex=null,this.keyframesIndex=null}return r(e,[{key:"isComplete",value:function(){var e=!1===this.hasAudio||!0===this.hasAudio&&null!=this.audioCodec&&null!=this.audioSampleRate&&null!=this.audioChannelCount,t=!1===this.hasVideo||!0===this.hasVideo&&null!=this.videoCodec&&null!=this.width&&null!=this.height&&null!=this.fps&&null!=this.profile&&null!=this.level&&null!=this.refFrames&&null!=this.chromaFormat&&null!=this.sarNum&&null!=this.sarDen;return null!=this.mimeType&&null!=this.duration&&null!=this.metadata&&null!=this.hasKeyframesIndex&&e&&t}},{key:"isSeekable",value:function(){return!0===this.hasKeyframesIndex}},{key:"getNearestKeyframe",value:function(e){if(null==this.keyframesIndex)return null;var t=this.keyframesIndex,n=this._search(t.times,e);return{index:n,milliseconds:t.times[n],fileposition:t.filepositions[n]}}},{key:"_search",value:function(e,t){var n=0,i=e.length-1,r=0,s=0,a=i;for(t<e[0]&&(n=0,s=a+1);s<=a;){if((r=s+Math.floor((a-s)/2))===i||t>=e[r]&&t<e[r+1]){n=r;break}e[r]<t?s=r+1:a=r-1}return n}}]),e}();n.default=s},{}],8:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var r=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}();n.SampleInfo=function e(t,n,r,s,a){i(this,e),this.dts=t,this.pts=n,this.duration=r,this.originalDts=s,this.isSyncPoint=a,this.fileposition=null},n.MediaSegmentInfo=function(){function e(){i(this,e),this.beginDts=0,this.endDts=0,this.beginPts=0,this.endPts=0,this.originalBeginDts=0,this.originalEndDts=0,this.syncPoints=[],this.firstSample=null,this.lastSample=null}return r(e,[{key:"appendSyncPoint",value:function(e){e.isSyncPoint=!0,this.syncPoints.push(e)}}]),e}(),n.IDRSampleList=function(){function e(){i(this,e),this._list=[]}return r(e,[{key:"clear",value:function(){this._list=[]}},{key:"appendArray",value:function(e){var t=this._list;0!==e.length&&(t.length>0&&e[0].originalDts<t[t.length-1].originalDts&&this.clear(),Array.prototype.push.apply(t,e))}},{key:"getLastSyncPointBeforeDts",value:function(e){if(0==this._list.length)return null;var t=this._list,n=0,i=t.length-1,r=0,s=0,a=i;for(e<t[0].dts&&(n=0,s=a+1);s<=a;){if((r=s+Math.floor((a-s)/2))===i||e>=t[r].dts&&e<t[r+1].dts){n=r;break}t[r].dts<e?s=r+1:a=r-1}return this._list[n]}}]),e}(),n.MediaSegmentInfoList=function(){function e(t){i(this,e),this._type=t,this._list=[],this._lastAppendLocation=-1}return r(e,[{key:"isEmpty",value:function(){return 0===this._list.length}},{key:"clear",value:function(){this._list=[],this._lastAppendLocation=-1}},{key:"_searchNearestSegmentBefore",value:function(e){var t=this._list;if(0===t.length)return-2;var n=t.length-1,i=0,r=0,s=n,a=0;if(e<t[0].originalBeginDts)return a=-1;for(;r<=s;){if((i=r+Math.floor((s-r)/2))===n||e>t[i].lastSample.originalDts&&e<t[i+1].originalBeginDts){a=i;break}t[i].originalBeginDts<e?r=i+1:s=i-1}return a}},{key:"_searchNearestSegmentAfter",value:function(e){return this._searchNearestSegmentBefore(e)+1}},{key:"append",value:function(e){var t=this._list,n=e,i=this._lastAppendLocation,r=0;-1!==i&&i<t.length&&n.originalBeginDts>=t[i].lastSample.originalDts&&(i===t.length-1||i<t.length-1&&n.originalBeginDts<t[i+1].originalBeginDts)?r=i+1:t.length>0&&(r=this._searchNearestSegmentBefore(n.originalBeginDts)+1),this._lastAppendLocation=r,this._list.splice(r,0,n)}},{key:"getLastSegmentBefore",value:function(e){var t=this._searchNearestSegmentBefore(e);return t>=0?this._list[t]:null}},{key:"getLastSampleBefore",value:function(e){var t=this.getLastSegmentBefore(e);return null!=t?t.lastSample:null}},{key:"getLastSyncPointBefore",value:function(e){for(var t=this._searchNearestSegmentBefore(e),n=this._list[t].syncPoints;0===n.length&&t>0;)t--,n=this._list[t].syncPoints;return n.length>0?n[n.length-1]:null}},{key:"type",get:function(){return this._type}},{key:"length",get:function(){return this._list.length}}]),e}()},{}],9:[function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),a=e("events"),o=i(a),u=e("../utils/logger.js"),l=i(u),d=e("../utils/browser.js"),h=i(d),f=e("./mse-events.js"),c=i(f),_=e("./media-segment-info.js"),m=e("../utils/exception.js"),p=function(){function e(t){r(this,e),this.TAG="MSEController",this._config=t,this._emitter=new o.default,this._config.isLive&&void 0==this._config.autoCleanupSourceBuffer&&(this._config.autoCleanupSourceBuffer=!0),this.e={onSourceOpen:this._onSourceOpen.bind(this),onSourceEnded:this._onSourceEnded.bind(this),onSourceClose:this._onSourceClose.bind(this),onSourceBufferError:this._onSourceBufferError.bind(this),onSourceBufferUpdateEnd:this._onSourceBufferUpdateEnd.bind(this)},this._mediaSource=null,this._mediaSourceObjectURL=null,this._mediaElement=null,this._isBufferFull=!1,this._hasPendingEos=!1,this._requireSetMediaDuration=!1,this._pendingMediaDuration=0,this._pendingSourceBufferInit=[],this._mimeTypes={video:null,audio:null},this._sourceBuffers={video:null,audio:null},this._lastInitSegments={video:null,audio:null},this._pendingSegments={video:[],audio:[]},this._pendingRemoveRanges={video:[],audio:[]},this._idrList=new _.IDRSampleList}return s(e,[{key:"destroy",value:function(){(this._mediaElement||this._mediaSource)&&this.detachMediaElement(),this.e=null,this._emitter.removeAllListeners(),this._emitter=null}},{key:"on",value:function(e,t){this._emitter.addListener(e,t)}},{key:"off",value:function(e,t){this._emitter.removeListener(e,t)}},{key:"attachMediaElement",value:function(e){if(this._mediaSource)throw new m.IllegalStateException("MediaSource has been attached to an HTMLMediaElement!");var t=this._mediaSource=new window.MediaSource;t.addEventListener("sourceopen",this.e.onSourceOpen),t.addEventListener("sourceended",this.e.onSourceEnded),t.addEventListener("sourceclose",this.e.onSourceClose),this._mediaElement=e,this._mediaSourceObjectURL=window.URL.createObjectURL(this._mediaSource),e.src=this._mediaSourceObjectURL}},{key:"detachMediaElement",value:function(){if(this._mediaSource){var e=this._mediaSource;for(var t in this._sourceBuffers){var n=this._pendingSegments[t];n.splice(0,n.length),this._pendingSegments[t]=null,this._pendingRemoveRanges[t]=null,this._lastInitSegments[t]=null;var i=this._sourceBuffers[t];if(i){if("closed"!==e.readyState){try{e.removeSourceBuffer(i)}catch(e){l.default.e(this.TAG,e.message)}i.removeEventListener("error",this.e.onSourceBufferError),i.removeEventListener("updateend",this.e.onSourceBufferUpdateEnd)}this._mimeTypes[t]=null,this._sourceBuffers[t]=null}}if("open"===e.readyState)try{e.endOfStream()}catch(e){l.default.e(this.TAG,e.message)}e.removeEventListener("sourceopen",this.e.onSourceOpen),e.removeEventListener("sourceended",this.e.onSourceEnded),e.removeEventListener("sourceclose",this.e.onSourceClose),this._pendingSourceBufferInit=[],this._isBufferFull=!1,this._idrList.clear(),this._mediaSource=null}this._mediaElement&&(this._mediaElement.src="",this._mediaElement.removeAttribute("src"),this._mediaElement=null),this._mediaSourceObjectURL&&(window.URL.revokeObjectURL(this._mediaSourceObjectURL),this._mediaSourceObjectURL=null)}},{key:"appendInitSegment",value:function(e,t){if(!this._mediaSource||"open"!==this._mediaSource.readyState)return this._pendingSourceBufferInit.push(e),void this._pendingSegments[e.type].push(e);var n=e,i=""+n.container;n.codec&&n.codec.length>0&&(i+=";codecs="+n.codec);var r=!1;if(l.default.v(this.TAG,"Received Initialization Segment, mimeType: "+i),this._lastInitSegments[n.type]=n,i!==this._mimeTypes[n.type]){if(this._mimeTypes[n.type])l.default.v(this.TAG,"Notice: "+n.type+" mimeType changed, origin: "+this._mimeTypes[n.type]+", target: "+i);else{r=!0;try{var s=this._sourceBuffers[n.type]=this._mediaSource.addSourceBuffer(i);s.addEventListener("error",this.e.onSourceBufferError),s.addEventListener("updateend",this.e.onSourceBufferUpdateEnd)}catch(e){return l.default.e(this.TAG,e.message),void this._emitter.emit(c.default.ERROR,{code:e.code,msg:e.message})}}this._mimeTypes[n.type]=i}t||this._pendingSegments[n.type].push(n),r||this._sourceBuffers[n.type]&&!this._sourceBuffers[n.type].updating&&this._doAppendSegments(),h.default.safari&&"audio/mpeg"===n.container&&n.mediaDuration>0&&(this._requireSetMediaDuration=!0,this._pendingMediaDuration=n.mediaDuration/1e3,this._updateMediaSourceDuration())}},{key:"appendMediaSegment",value:function(e){var t=e;this._pendingSegments[t.type].push(t),this._config.autoCleanupSourceBuffer&&this._needCleanupSourceBuffer()&&this._doCleanupSourceBuffer();var n=this._sourceBuffers[t.type];!n||n.updating||this._hasPendingRemoveRanges()||this._doAppendSegments()}},{key:"seek",value:function(e){for(var t in this._sourceBuffers)if(this._sourceBuffers[t]){var n=this._sourceBuffers[t];if("open"===this._mediaSource.readyState)try{n.abort()}catch(e){l.default.e(this.TAG,e.message)}this._idrList.clear();var i=this._pendingSegments[t];if(i.splice(0,i.length),"closed"!==this._mediaSource.readyState){for(var r=0;r<n.buffered.length;r++){var s=n.buffered.start(r),a=n.buffered.end(r);this._pendingRemoveRanges[t].push({start:s,end:a})}if(n.updating||this._doRemoveRanges(),h.default.safari){var o=this._lastInitSegments[t];o&&(this._pendingSegments[t].push(o),n.updating||this._doAppendSegments())}}}}},{key:"endOfStream",value:function(){var e=this._mediaSource,t=this._sourceBuffers;if(!e||"open"!==e.readyState)return void(e&&"closed"===e.readyState&&this._hasPendingSegments()&&(this._hasPendingEos=!0));t.video&&t.video.updating||t.audio&&t.audio.updating?this._hasPendingEos=!0:(this._hasPendingEos=!1,e.endOfStream())}},{key:"getNearestKeyframe",value:function(e){return this._idrList.getLastSyncPointBeforeDts(e)}},{key:"_needCleanupSourceBuffer",value:function(){if(!this._config.autoCleanupSourceBuffer)return!1;var e=this._mediaElement.currentTime;for(var t in this._sourceBuffers){var n=this._sourceBuffers[t];if(n){var i=n.buffered;if(i.length>=1&&e-i.start(0)>=this._config.autoCleanupMaxBackwardDuration)return!0}}return!1}},{key:"_doCleanupSourceBuffer",value:function(){var e=this._mediaElement.currentTime;for(var t in this._sourceBuffers){var n=this._sourceBuffers[t];if(n){for(var i=n.buffered,r=!1,s=0;s<i.length;s++){var a=i.start(s),o=i.end(s);if(a<=e&&e<o+3){if(e-a>=this._config.autoCleanupMaxBackwardDuration){r=!0;var u=e-this._config.autoCleanupMinBackwardDuration;this._pendingRemoveRanges[t].push({start:a,end:u})}}else o<e&&(r=!0,this._pendingRemoveRanges[t].push({start:a,end:o}))}r&&!n.updating&&this._doRemoveRanges()}}}},{key:"_updateMediaSourceDuration",value:function(){var e=this._sourceBuffers;if(0!==this._mediaElement.readyState&&"open"===this._mediaSource.readyState&&!(e.video&&e.video.updating||e.audio&&e.audio.updating)){var t=this._mediaSource.duration,n=this._pendingMediaDuration;n>0&&(isNaN(t)||n>t)&&(l.default.v(this.TAG,"Update MediaSource duration from "+t+" to "+n),this._mediaSource.duration=n),this._requireSetMediaDuration=!1,this._pendingMediaDuration=0}}},{key:"_doRemoveRanges",value:function(){for(var e in this._pendingRemoveRanges)if(this._sourceBuffers[e]&&!this._sourceBuffers[e].updating)for(var t=this._sourceBuffers[e],n=this._pendingRemoveRanges[e];n.length&&!t.updating;){var i=n.shift();t.remove(i.start,i.end)}}},{key:"_doAppendSegments",value:function(){var e=this._pendingSegments;for(var t in e)if(this._sourceBuffers[t]&&!this._sourceBuffers[t].updating&&e[t].length>0){var n=e[t].shift();if(n.timestampOffset){var i=this._sourceBuffers[t].timestampOffset,r=n.timestampOffset/1e3,s=Math.abs(i-r);s>.1&&(l.default.v(this.TAG,"Update MPEG audio timestampOffset from "+i+" to "+r),this._sourceBuffers[t].timestampOffset=r),delete n.timestampOffset}if(!n.data||0===n.data.byteLength)continue;try{this._sourceBuffers[t].appendBuffer(n.data),this._isBufferFull=!1,"video"===t&&n.hasOwnProperty("info")&&this._idrList.appendArray(n.info.syncPoints)}catch(e){this._pendingSegments[t].unshift(n),22===e.code?(this._isBufferFull||this._emitter.emit(c.default.BUFFER_FULL),this._isBufferFull=!0):(l.default.e(this.TAG,e.message),this._emitter.emit(c.default.ERROR,{code:e.code,msg:e.message}))}}}},{key:"_onSourceOpen",value:function(){if(l.default.v(this.TAG,"MediaSource onSourceOpen"),this._mediaSource.removeEventListener("sourceopen",this.e.onSourceOpen),this._pendingSourceBufferInit.length>0)for(var e=this._pendingSourceBufferInit;e.length;){var t=e.shift();this.appendInitSegment(t,!0)}this._hasPendingSegments()&&this._doAppendSegments(),this._emitter.emit(c.default.SOURCE_OPEN)}},{key:"_onSourceEnded",value:function(){l.default.v(this.TAG,"MediaSource onSourceEnded")}},{key:"_onSourceClose",value:function(){l.default.v(this.TAG,"MediaSource onSourceClose"),this._mediaSource&&null!=this.e&&(this._mediaSource.removeEventListener("sourceopen",this.e.onSourceOpen),this._mediaSource.removeEventListener("sourceended",this.e.onSourceEnded),this._mediaSource.removeEventListener("sourceclose",this.e.onSourceClose))}},{key:"_hasPendingSegments",value:function(){var e=this._pendingSegments;return e.video.length>0||e.audio.length>0}},{key:"_hasPendingRemoveRanges",value:function(){var e=this._pendingRemoveRanges;return e.video.length>0||e.audio.length>0}},{key:"_onSourceBufferUpdateEnd",value:function(){this._requireSetMediaDuration?this._updateMediaSourceDuration():this._hasPendingRemoveRanges()?this._doRemoveRanges():this._hasPendingSegments()?this._doAppendSegments():this._hasPendingEos&&this.endOfStream(),this._emitter.emit(c.default.UPDATE_END)}},{key:"_onSourceBufferError",value:function(e){l.default.e(this.TAG,"SourceBuffer Error: "+e)}}]),e}();n.default=p},{"../utils/browser.js":39,"../utils/exception.js":40,"../utils/logger.js":41,"./media-segment-info.js":8,"./mse-events.js":10,events:2}],10:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var i={ERROR:"error",SOURCE_OPEN:"source_open",UPDATE_END:"update_end",BUFFER_FULL:"buffer_full"};n.default=i},{}],11:[function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var s=function(){
+function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),a=e("events"),o=i(a),u=e("../utils/logger.js"),l=i(u),d=e("../utils/logging-control.js"),h=i(d),f=e("./transmuxing-controller.js"),c=i(f),_=e("./transmuxing-events.js"),m=i(_),p=e("./transmuxing-worker.js"),v=i(p),g=e("./media-info.js"),y=i(g),E=function(){function t(n,i){if(r(this,t),this.TAG="Transmuxer",this._emitter=new o.default,i.enableWorker&&"undefined"!=typeof Worker)try{var s=e("webworkify");this._worker=s(v.default),this._workerDestroying=!1,this._worker.addEventListener("message",this._onWorkerMessage.bind(this)),this._worker.postMessage({cmd:"init",param:[n,i]}),this.e={onLoggingConfigChanged:this._onLoggingConfigChanged.bind(this)},h.default.registerListener(this.e.onLoggingConfigChanged),this._worker.postMessage({cmd:"logging_config",param:h.default.getConfig()})}catch(e){l.default.e(this.TAG,"Error while initialize transmuxing worker, fallback to inline transmuxing"),this._worker=null,this._controller=new c.default(n,i)}else this._controller=new c.default(n,i);if(this._controller){var a=this._controller;a.on(m.default.IO_ERROR,this._onIOError.bind(this)),a.on(m.default.DEMUX_ERROR,this._onDemuxError.bind(this)),a.on(m.default.INIT_SEGMENT,this._onInitSegment.bind(this)),a.on(m.default.MEDIA_SEGMENT,this._onMediaSegment.bind(this)),a.on(m.default.LOADING_COMPLETE,this._onLoadingComplete.bind(this)),a.on(m.default.RECOVERED_EARLY_EOF,this._onRecoveredEarlyEof.bind(this)),a.on(m.default.MEDIA_INFO,this._onMediaInfo.bind(this)),a.on(m.default.METADATA_ARRIVED,this._onMetaDataArrived.bind(this)),a.on(m.default.SCRIPTDATA_ARRIVED,this._onScriptDataArrived.bind(this)),a.on(m.default.STATISTICS_INFO,this._onStatisticsInfo.bind(this)),a.on(m.default.RECOMMEND_SEEKPOINT,this._onRecommendSeekpoint.bind(this))}}return s(t,[{key:"destroy",value:function(){this._worker?this._workerDestroying||(this._workerDestroying=!0,this._worker.postMessage({cmd:"destroy"}),h.default.removeListener(this.e.onLoggingConfigChanged),this.e=null):(this._controller.destroy(),this._controller=null),this._emitter.removeAllListeners(),this._emitter=null}},{key:"on",value:function(e,t){this._emitter.addListener(e,t)}},{key:"off",value:function(e,t){this._emitter.removeListener(e,t)}},{key:"hasWorker",value:function(){return null!=this._worker}},{key:"open",value:function(){this._worker?this._worker.postMessage({cmd:"start"}):this._controller.start()}},{key:"close",value:function(){this._worker?this._worker.postMessage({cmd:"stop"}):this._controller.stop()}},{key:"seek",value:function(e){this._worker?this._worker.postMessage({cmd:"seek",param:e}):this._controller.seek(e)}},{key:"pause",value:function(){this._worker?this._worker.postMessage({cmd:"pause"}):this._controller.pause()}},{key:"resume",value:function(){this._worker?this._worker.postMessage({cmd:"resume"}):this._controller.resume()}},{key:"_onInitSegment",value:function(e,t){var n=this;Promise.resolve().then(function(){n._emitter.emit(m.default.INIT_SEGMENT,e,t)})}},{key:"_onMediaSegment",value:function(e,t){var n=this;Promise.resolve().then(function(){n._emitter.emit(m.default.MEDIA_SEGMENT,e,t)})}},{key:"_onLoadingComplete",value:function(){var e=this;Promise.resolve().then(function(){e._emitter.emit(m.default.LOADING_COMPLETE)})}},{key:"_onRecoveredEarlyEof",value:function(){var e=this;Promise.resolve().then(function(){e._emitter.emit(m.default.RECOVERED_EARLY_EOF)})}},{key:"_onMediaInfo",value:function(e){var t=this;Promise.resolve().then(function(){t._emitter.emit(m.default.MEDIA_INFO,e)})}},{key:"_onMetaDataArrived",value:function(e){var t=this;Promise.resolve().then(function(){t._emitter.emit(m.default.METADATA_ARRIVED,e)})}},{key:"_onScriptDataArrived",value:function(e){var t=this;Promise.resolve().then(function(){t._emitter.emit(m.default.SCRIPTDATA_ARRIVED,e)})}},{key:"_onStatisticsInfo",value:function(e){var t=this;Promise.resolve().then(function(){t._emitter.emit(m.default.STATISTICS_INFO,e)})}},{key:"_onIOError",value:function(e,t){var n=this;Promise.resolve().then(function(){n._emitter.emit(m.default.IO_ERROR,e,t)})}},{key:"_onDemuxError",value:function(e,t){var n=this;Promise.resolve().then(function(){n._emitter.emit(m.default.DEMUX_ERROR,e,t)})}},{key:"_onRecommendSeekpoint",value:function(e){var t=this;Promise.resolve().then(function(){t._emitter.emit(m.default.RECOMMEND_SEEKPOINT,e)})}},{key:"_onLoggingConfigChanged",value:function(e){this._worker&&this._worker.postMessage({cmd:"logging_config",param:e})}},{key:"_onWorkerMessage",value:function(e){var t=e.data,n=t.data;if("destroyed"===t.msg||this._workerDestroying)return this._workerDestroying=!1,this._worker.terminate(),void(this._worker=null);switch(t.msg){case m.default.INIT_SEGMENT:case m.default.MEDIA_SEGMENT:this._emitter.emit(t.msg,n.type,n.data);break;case m.default.LOADING_COMPLETE:case m.default.RECOVERED_EARLY_EOF:this._emitter.emit(t.msg);break;case m.default.MEDIA_INFO:Object.setPrototypeOf(n,y.default.prototype),this._emitter.emit(t.msg,n);break;case m.default.METADATA_ARRIVED:case m.default.SCRIPTDATA_ARRIVED:case m.default.STATISTICS_INFO:this._emitter.emit(t.msg,n);break;case m.default.IO_ERROR:case m.default.DEMUX_ERROR:this._emitter.emit(t.msg,n.type,n.info);break;case m.default.RECOMMEND_SEEKPOINT:this._emitter.emit(t.msg,n);break;case"logcat_callback":l.default.emitter.emit("log",n.type,n.logcat)}}}]),t}();n.default=E},{"../utils/logger.js":41,"../utils/logging-control.js":42,"./media-info.js":7,"./transmuxing-controller.js":12,"./transmuxing-events.js":13,"./transmuxing-worker.js":14,events:2,webworkify:4}],12:[function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),a=e("events"),o=i(a),u=e("../utils/logger.js"),l=i(u),d=e("../utils/browser.js"),h=i(d),f=e("./media-info.js"),c=i(f),_=e("../demux/flv-demuxer.js"),m=i(_),p=e("../remux/mp4-remuxer.js"),v=i(p),g=e("../demux/demux-errors.js"),y=i(g),E=e("../io/io-controller.js"),b=i(E),S=e("./transmuxing-events.js"),k=i(S),L=(e("../io/loader.js"),function(){function e(t,n){r(this,e),this.TAG="TransmuxingController",this._emitter=new o.default,this._config=n,t.segments||(t.segments=[{duration:t.duration,filesize:t.filesize,url:t.url}]),"boolean"!=typeof t.cors&&(t.cors=!0),"boolean"!=typeof t.withCredentials&&(t.withCredentials=!1),this._mediaDataSource=t,this._currentSegmentIndex=0;var i=0;this._mediaDataSource.segments.forEach(function(e){e.timestampBase=i,i+=e.duration,e.cors=t.cors,e.withCredentials=t.withCredentials,n.referrerPolicy&&(e.referrerPolicy=n.referrerPolicy)}),isNaN(i)||this._mediaDataSource.duration===i||(this._mediaDataSource.duration=i),this._mediaInfo=null,this._demuxer=null,this._remuxer=null,this._ioctl=null,this._pendingSeekTime=null,this._pendingResolveSeekPoint=null,this._statisticsReporter=null}return s(e,[{key:"destroy",value:function(){this._mediaInfo=null,this._mediaDataSource=null,this._statisticsReporter&&this._disableStatisticsReporter(),this._ioctl&&(this._ioctl.destroy(),this._ioctl=null),this._demuxer&&(this._demuxer.destroy(),this._demuxer=null),this._remuxer&&(this._remuxer.destroy(),this._remuxer=null),this._emitter.removeAllListeners(),this._emitter=null}},{key:"on",value:function(e,t){this._emitter.addListener(e,t)}},{key:"off",value:function(e,t){this._emitter.removeListener(e,t)}},{key:"start",value:function(){this._loadSegment(0),this._enableStatisticsReporter()}},{key:"_loadSegment",value:function(e,t){this._currentSegmentIndex=e;var n=this._mediaDataSource.segments[e],i=this._ioctl=new b.default(n,this._config,e);i.onError=this._onIOException.bind(this),i.onSeeked=this._onIOSeeked.bind(this),i.onComplete=this._onIOComplete.bind(this),i.onRedirect=this._onIORedirect.bind(this),i.onRecoveredEarlyEof=this._onIORecoveredEarlyEof.bind(this),t?this._demuxer.bindDataSource(this._ioctl):i.onDataArrival=this._onInitChunkArrival.bind(this),i.open(t)}},{key:"stop",value:function(){this._internalAbort(),this._disableStatisticsReporter()}},{key:"_internalAbort",value:function(){this._ioctl&&(this._ioctl.destroy(),this._ioctl=null)}},{key:"pause",value:function(){this._ioctl&&this._ioctl.isWorking()&&(this._ioctl.pause(),this._disableStatisticsReporter())}},{key:"resume",value:function(){this._ioctl&&this._ioctl.isPaused()&&(this._ioctl.resume(),this._enableStatisticsReporter())}},{key:"seek",value:function(e){if(null!=this._mediaInfo&&this._mediaInfo.isSeekable()){var t=this._searchSegmentIndexContains(e);if(t===this._currentSegmentIndex){var n=this._mediaInfo.segments[t];if(void 0==n)this._pendingSeekTime=e;else{var i=n.getNearestKeyframe(e);this._remuxer.seek(i.milliseconds),this._ioctl.seek(i.fileposition),this._pendingResolveSeekPoint=i.milliseconds}}else{var r=this._mediaInfo.segments[t];if(void 0==r)this._pendingSeekTime=e,this._internalAbort(),this._remuxer.seek(),this._remuxer.insertDiscontinuity(),this._loadSegment(t);else{var s=r.getNearestKeyframe(e);this._internalAbort(),this._remuxer.seek(e),this._remuxer.insertDiscontinuity(),this._demuxer.resetMediaInfo(),this._demuxer.timestampBase=this._mediaDataSource.segments[t].timestampBase,this._loadSegment(t,s.fileposition),this._pendingResolveSeekPoint=s.milliseconds,this._reportSegmentMediaInfo(t)}}this._enableStatisticsReporter()}}},{key:"_searchSegmentIndexContains",value:function(e){for(var t=this._mediaDataSource.segments,n=t.length-1,i=0;i<t.length;i++)if(e<t[i].timestampBase){n=i-1;break}return n}},{key:"_onInitChunkArrival",value:function(e,t){var n=this,i=null,r=0;if(t>0)this._demuxer.bindDataSource(this._ioctl),this._demuxer.timestampBase=this._mediaDataSource.segments[this._currentSegmentIndex].timestampBase,r=this._demuxer.parseChunks(e,t);else if((i=m.default.probe(e)).match){this._demuxer=new m.default(i,this._config),this._remuxer||(this._remuxer=new v.default(this._config));var s=this._mediaDataSource;void 0==s.duration||isNaN(s.duration)||(this._demuxer.overridedDuration=s.duration),"boolean"==typeof s.hasAudio&&(this._demuxer.overridedHasAudio=s.hasAudio),"boolean"==typeof s.hasVideo&&(this._demuxer.overridedHasVideo=s.hasVideo),this._demuxer.timestampBase=s.segments[this._currentSegmentIndex].timestampBase,this._demuxer.onError=this._onDemuxException.bind(this),this._demuxer.onMediaInfo=this._onMediaInfo.bind(this),this._demuxer.onMetaDataArrived=this._onMetaDataArrived.bind(this),this._demuxer.onScriptDataArrived=this._onScriptDataArrived.bind(this),this._remuxer.bindDataSource(this._demuxer.bindDataSource(this._ioctl)),this._remuxer.onInitSegment=this._onRemuxerInitSegmentArrival.bind(this),this._remuxer.onMediaSegment=this._onRemuxerMediaSegmentArrival.bind(this),r=this._demuxer.parseChunks(e,t)}else i=null,l.default.e(this.TAG,"Non-FLV, Unsupported media type!"),Promise.resolve().then(function(){n._internalAbort()}),this._emitter.emit(k.default.DEMUX_ERROR,y.default.FORMAT_UNSUPPORTED,"Non-FLV, Unsupported media type"),r=0;return r}},{key:"_onMediaInfo",value:function(e){var t=this;null==this._mediaInfo&&(this._mediaInfo=Object.assign({},e),this._mediaInfo.keyframesIndex=null,this._mediaInfo.segments=[],this._mediaInfo.segmentCount=this._mediaDataSource.segments.length,Object.setPrototypeOf(this._mediaInfo,c.default.prototype));var n=Object.assign({},e);Object.setPrototypeOf(n,c.default.prototype),this._mediaInfo.segments[this._currentSegmentIndex]=n,this._reportSegmentMediaInfo(this._currentSegmentIndex),null!=this._pendingSeekTime&&Promise.resolve().then(function(){var e=t._pendingSeekTime;t._pendingSeekTime=null,t.seek(e)})}},{key:"_onMetaDataArrived",value:function(e){this._emitter.emit(k.default.METADATA_ARRIVED,e)}},{key:"_onScriptDataArrived",value:function(e){this._emitter.emit(k.default.SCRIPTDATA_ARRIVED,e)}},{key:"_onIOSeeked",value:function(){this._remuxer.insertDiscontinuity()}},{key:"_onIOComplete",value:function(e){var t=e,n=t+1;n<this._mediaDataSource.segments.length?(this._internalAbort(),this._remuxer.flushStashedSamples(),this._loadSegment(n)):(this._remuxer.flushStashedSamples(),this._emitter.emit(k.default.LOADING_COMPLETE),this._disableStatisticsReporter())}},{key:"_onIORedirect",value:function(e){var t=this._ioctl.extraData;this._mediaDataSource.segments[t].redirectedURL=e}},{key:"_onIORecoveredEarlyEof",value:function(){this._emitter.emit(k.default.RECOVERED_EARLY_EOF)}},{key:"_onIOException",value:function(e,t){l.default.e(this.TAG,"IOException: type = "+e+", code = "+t.code+", msg = "+t.msg),this._emitter.emit(k.default.IO_ERROR,e,t),this._disableStatisticsReporter()}},{key:"_onDemuxException",value:function(e,t){l.default.e(this.TAG,"DemuxException: type = "+e+", info = "+t),this._emitter.emit(k.default.DEMUX_ERROR,e,t)}},{key:"_onRemuxerInitSegmentArrival",value:function(e,t){this._emitter.emit(k.default.INIT_SEGMENT,e,t)}},{key:"_onRemuxerMediaSegmentArrival",value:function(e,t){if(null==this._pendingSeekTime&&(this._emitter.emit(k.default.MEDIA_SEGMENT,e,t),null!=this._pendingResolveSeekPoint&&"video"===e)){var n=t.info.syncPoints,i=this._pendingResolveSeekPoint;this._pendingResolveSeekPoint=null,h.default.safari&&n.length>0&&n[0].originalDts===i&&(i=n[0].pts),this._emitter.emit(k.default.RECOMMEND_SEEKPOINT,i)}}},{key:"_enableStatisticsReporter",value:function(){null==this._statisticsReporter&&(this._statisticsReporter=self.setInterval(this._reportStatisticsInfo.bind(this),this._config.statisticsInfoReportInterval))}},{key:"_disableStatisticsReporter",value:function(){this._statisticsReporter&&(self.clearInterval(this._statisticsReporter),this._statisticsReporter=null)}},{key:"_reportSegmentMediaInfo",value:function(e){var t=this._mediaInfo.segments[e],n=Object.assign({},t);n.duration=this._mediaInfo.duration,n.segmentCount=this._mediaInfo.segmentCount,delete n.segments,delete n.keyframesIndex,this._emitter.emit(k.default.MEDIA_INFO,n)}},{key:"_reportStatisticsInfo",value:function(){var e={};e.url=this._ioctl.currentURL,e.hasRedirect=this._ioctl.hasRedirect,e.hasRedirect&&(e.redirectedURL=this._ioctl.currentRedirectedURL),e.speed=this._ioctl.currentSpeed,e.loaderType=this._ioctl.loaderType,e.currentSegmentIndex=this._currentSegmentIndex,e.totalSegmentCount=this._mediaDataSource.segments.length,this._emitter.emit(k.default.STATISTICS_INFO,e)}}]),e}());n.default=L},{"../demux/demux-errors.js":16,"../demux/flv-demuxer.js":18,"../io/io-controller.js":23,"../io/loader.js":24,"../remux/mp4-remuxer.js":38,"../utils/browser.js":39,"../utils/logger.js":41,"./media-info.js":7,"./transmuxing-events.js":13,events:2}],13:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var i={IO_ERROR:"io_error",DEMUX_ERROR:"demux_error",INIT_SEGMENT:"init_segment",MEDIA_SEGMENT:"media_segment",LOADING_COMPLETE:"loading_complete",RECOVERED_EARLY_EOF:"recovered_early_eof",MEDIA_INFO:"media_info",METADATA_ARRIVED:"metadata_arrived",SCRIPTDATA_ARRIVED:"scriptdata_arrived",STATISTICS_INFO:"statistics_info",RECOMMEND_SEEKPOINT:"recommend_seekpoint"};n.default=i},{}],14:[function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(n,"__esModule",{value:!0});var r=e("../utils/logger.js"),s=(i(r),e("../utils/logging-control.js")),a=i(s),o=e("../utils/polyfill.js"),u=i(o),l=e("./transmuxing-controller.js"),d=i(l),h=e("./transmuxing-events.js"),f=i(h),c=function(e){function t(t,n){var i={msg:f.default.INIT_SEGMENT,data:{type:t,data:n}};e.postMessage(i,[n.data])}function n(t,n){var i={msg:f.default.MEDIA_SEGMENT,data:{type:t,data:n}};e.postMessage(i,[n.data])}function i(){var t={msg:f.default.LOADING_COMPLETE};e.postMessage(t)}function r(){var t={msg:f.default.RECOVERED_EARLY_EOF};e.postMessage(t)}function s(t){var n={msg:f.default.MEDIA_INFO,data:t};e.postMessage(n)}function o(t){var n={msg:f.default.METADATA_ARRIVED,data:t};e.postMessage(n)}function l(t){var n={msg:f.default.SCRIPTDATA_ARRIVED,data:t};e.postMessage(n)}function h(t){var n={msg:f.default.STATISTICS_INFO,data:t};e.postMessage(n)}function c(t,n){e.postMessage({msg:f.default.IO_ERROR,data:{type:t,info:n}})}function _(t,n){e.postMessage({msg:f.default.DEMUX_ERROR,data:{type:t,info:n}})}function m(t){e.postMessage({msg:f.default.RECOMMEND_SEEKPOINT,data:t})}function p(t,n){e.postMessage({msg:"logcat_callback",data:{type:t,logcat:n}})}var v=null,g=p.bind(this);u.default.install(),e.addEventListener("message",function(u){switch(u.data.cmd){case"init":v=new d.default(u.data.param[0],u.data.param[1]),v.on(f.default.IO_ERROR,c.bind(this)),v.on(f.default.DEMUX_ERROR,_.bind(this)),v.on(f.default.INIT_SEGMENT,t.bind(this)),v.on(f.default.MEDIA_SEGMENT,n.bind(this)),v.on(f.default.LOADING_COMPLETE,i.bind(this)),v.on(f.default.RECOVERED_EARLY_EOF,r.bind(this)),v.on(f.default.MEDIA_INFO,s.bind(this)),v.on(f.default.METADATA_ARRIVED,o.bind(this)),v.on(f.default.SCRIPTDATA_ARRIVED,l.bind(this)),v.on(f.default.STATISTICS_INFO,h.bind(this)),v.on(f.default.RECOMMEND_SEEKPOINT,m.bind(this));break;case"destroy":v&&(v.destroy(),v=null),e.postMessage({msg:"destroyed"});break;case"start":v.start();break;case"stop":v.stop();break;case"seek":v.seek(u.data.param);break;case"pause":v.pause();break;case"resume":v.resume();break;case"logging_config":var p=u.data.param;a.default.applyConfig(p),!0===p.enableCallback?a.default.addLogListener(g):a.default.removeLogListener(g)}})};n.default=c},{"../utils/logger.js":41,"../utils/logging-control.js":42,"../utils/polyfill.js":43,"./transmuxing-controller.js":12,"./transmuxing-events.js":13}],15:[function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),a=e("../utils/logger.js"),o=i(a),u=e("../utils/utf8-conv.js"),l=i(u),d=e("../utils/exception.js"),h=function(){var e=new ArrayBuffer(2);return new DataView(e).setInt16(0,256,!0),256===new Int16Array(e)[0]}(),f=function(){function e(){r(this,e)}return s(e,null,[{key:"parseScriptData",value:function(t,n,i){var r={};try{var s=e.parseValue(t,n,i),a=e.parseValue(t,n+s.size,i-s.size);r[s.data]=a.data}catch(e){o.default.e("AMF",e.toString())}return r}},{key:"parseObject",value:function(t,n,i){if(i<3)throw new d.IllegalStateException("Data not enough when parse ScriptDataObject");var r=e.parseString(t,n,i),s=e.parseValue(t,n+r.size,i-r.size),a=s.objectEnd;return{data:{name:r.data,value:s.data},size:r.size+s.size,objectEnd:a}}},{key:"parseVariable",value:function(t,n,i){return e.parseObject(t,n,i)}},{key:"parseString",value:function(e,t,n){if(n<2)throw new d.IllegalStateException("Data not enough when parse String");var i=new DataView(e,t,n),r=i.getUint16(0,!h),s=void 0;return s=r>0?(0,l.default)(new Uint8Array(e,t+2,r)):"",{data:s,size:2+r}}},{key:"parseLongString",value:function(e,t,n){if(n<4)throw new d.IllegalStateException("Data not enough when parse LongString");var i=new DataView(e,t,n),r=i.getUint32(0,!h),s=void 0;return s=r>0?(0,l.default)(new Uint8Array(e,t+4,r)):"",{data:s,size:4+r}}},{key:"parseDate",value:function(e,t,n){if(n<10)throw new d.IllegalStateException("Data size invalid when parse Date");var i=new DataView(e,t,n),r=i.getFloat64(0,!h);return r+=60*i.getInt16(8,!h)*1e3,{data:new Date(r),size:10}}},{key:"parseValue",value:function(t,n,i){if(i<1)throw new d.IllegalStateException("Data not enough when parse Value");var r=new DataView(t,n,i),s=1,a=r.getUint8(0),u=void 0,l=!1;try{switch(a){case 0:u=r.getFloat64(1,!h),s+=8;break;case 1:u=!!r.getUint8(1),s+=1;break;case 2:var f=e.parseString(t,n+1,i-1);u=f.data,s+=f.size;break;case 3:u={};var c=0;for(9==(16777215&r.getUint32(i-4,!h))&&(c=3);s<i-4;){var _=e.parseObject(t,n+s,i-s-c);if(_.objectEnd)break;u[_.data.name]=_.data.value,s+=_.size}if(s<=i-3){9===(16777215&r.getUint32(s-1,!h))&&(s+=3)}break;case 8:u={},s+=4;var m=0;for(9==(16777215&r.getUint32(i-4,!h))&&(m=3);s<i-8;){var p=e.parseVariable(t,n+s,i-s-m);if(p.objectEnd)break;u[p.data.name]=p.data.value,s+=p.size}if(s<=i-3){9===(16777215&r.getUint32(s-1,!h))&&(s+=3)}break;case 9:u=void 0,s=1,l=!0;break;case 10:u=[];var v=r.getUint32(1,!h);s+=4;for(var g=0;g<v;g++){var y=e.parseValue(t,n+s,i-s);u.push(y.data),s+=y.size}break;case 11:var E=e.parseDate(t,n+1,i-1);u=E.data,s+=E.size;break;case 12:var b=e.parseString(t,n+1,i-1);u=b.data,s+=b.size;break;default:s=i,o.default.w("AMF","Unsupported AMF value type "+a)}}catch(e){o.default.e("AMF",e.toString())}return{data:u,size:s,objectEnd:l}}}]),e}();n.default=f},{"../utils/exception.js":40,"../utils/logger.js":41,"../utils/utf8-conv.js":44}],16:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var i={OK:"OK",FORMAT_ERROR:"FormatError",FORMAT_UNSUPPORTED:"FormatUnsupported",CODEC_UNSUPPORTED:"CodecUnsupported"};n.default=i},{}],17:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var r=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),s=e("../utils/exception.js"),a=function(){function e(t){i(this,e),this.TAG="ExpGolomb",this._buffer=t,this._buffer_index=0,this._total_bytes=t.byteLength,this._total_bits=8*t.byteLength,this._current_word=0,this._current_word_bits_left=0}return r(e,[{key:"destroy",value:function(){this._buffer=null}},{key:"_fillCurrentWord",value:function(){var e=this._total_bytes-this._buffer_index;if(e<=0)throw new s.IllegalStateException("ExpGolomb: _fillCurrentWord() but no bytes available");var t=Math.min(4,e),n=new Uint8Array(4);n.set(this._buffer.subarray(this._buffer_index,this._buffer_index+t)),this._current_word=new DataView(n.buffer).getUint32(0,!1),this._buffer_index+=t,this._current_word_bits_left=8*t}},{key:"readBits",value:function(e){if(e>32)throw new s.InvalidArgumentException("ExpGolomb: readBits() bits exceeded max 32bits!");if(e<=this._current_word_bits_left){var t=this._current_word>>>32-e;return this._current_word<<=e,this._current_word_bits_left-=e,t}var n=this._current_word_bits_left?this._current_word:0;n>>>=32-this._current_word_bits_left;var i=e-this._current_word_bits_left;this._fillCurrentWord();var r=Math.min(i,this._current_word_bits_left),a=this._current_word>>>32-r;return this._current_word<<=r,this._current_word_bits_left-=r,n=n<<r|a}},{key:"readBool",value:function(){return 1===this.readBits(1)}},{key:"readByte",value:function(){return this.readBits(8)}},{key:"_skipLeadingZero",value:function(){var e=void 0;for(e=0;e<this._current_word_bits_left;e++)if(0!=(this._current_word&2147483648>>>e))return this._current_word<<=e,this._current_word_bits_left-=e,e;return this._fillCurrentWord(),e+this._skipLeadingZero()}},{key:"readUEG",value:function(){var e=this._skipLeadingZero();return this.readBits(e+1)-1}},{key:"readSEG",value:function(){var e=this.readUEG();return 1&e?e+1>>>1:-1*(e>>>1)}}]),e}();n.default=a},{"../utils/exception.js":40}],18:[function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function s(e,t){return e[t]<<24|e[t+1]<<16|e[t+2]<<8|e[t+3]}Object.defineProperty(n,"__esModule",{value:!0});var a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),u=e("../utils/logger.js"),l=i(u),d=e("./amf-parser.js"),h=i(d),f=e("./sps-parser.js"),c=i(f),_=e("./demux-errors.js"),m=i(_),p=e("../core/media-info.js"),v=i(p),g=e("../utils/exception.js"),y=function(){function e(t,n){r(this,e),this.TAG="FLVDemuxer",this._config=n,this._onError=null,this._onMediaInfo=null,this._onMetaDataArrived=null,this._onScriptDataArrived=null,this._onTrackMetadata=null,this._onDataAvailable=null,this._dataOffset=t.dataOffset,this._firstParse=!0,this._dispatch=!1,this._hasAudio=t.hasAudioTrack,this._hasVideo=t.hasVideoTrack,this._hasAudioFlagOverrided=!1,this._hasVideoFlagOverrided=!1,this._audioInitialMetadataDispatched=!1,this._videoInitialMetadataDispatched=!1,this._mediaInfo=new v.default,this._mediaInfo.hasAudio=this._hasAudio,this._mediaInfo.hasVideo=this._hasVideo,this._metadata=null,this._audioMetadata=null,this._videoMetadata=null,this._naluLengthSize=4,this._timestampBase=0,this._timescale=1e3,this._duration=0,this._durationOverrided=!1,this._referenceFrameRate={fixed:!0,fps:23.976,fps_num:23976,fps_den:1e3},this._flvSoundRateTable=[5500,11025,22050,44100,48e3],this._mpegSamplingRates=[96e3,88200,64e3,48e3,44100,32e3,24e3,22050,16e3,12e3,11025,8e3,7350],this._mpegAudioV10SampleRateTable=[44100,48e3,32e3,0],this._mpegAudioV20SampleRateTable=[22050,24e3,16e3,0],this._mpegAudioV25SampleRateTable=[11025,12e3,8e3,0],this._mpegAudioL1BitRateTable=[0,32,64,96,128,160,192,224,256,288,320,352,384,416,448,-1],this._mpegAudioL2BitRateTable=[0,32,48,56,64,80,96,112,128,160,192,224,256,320,384,-1],this._mpegAudioL3BitRateTable=[0,32,40,48,56,64,80,96,112,128,160,192,224,256,320,-1],this._videoTrack={type:"video",id:1,sequenceNumber:0,samples:[],length:0},this._audioTrack={type:"audio",id:2,sequenceNumber:0,samples:[],length:0},this._littleEndian=function(){var e=new ArrayBuffer(2);return new DataView(e).setInt16(0,256,!0),256===new Int16Array(e)[0]}()}return o(e,[{key:"destroy",value:function(){this._mediaInfo=null,this._metadata=null,this._audioMetadata=null,this._videoMetadata=null,this._videoTrack=null,this._audioTrack=null,this._onError=null,this._onMediaInfo=null,this._onMetaDataArrived=null,this._onScriptDataArrived=null,this._onTrackMetadata=null,this._onDataAvailable=null}},{key:"bindDataSource",value:function(e){return e.onDataArrival=this.parseChunks.bind(this),this}},{key:"resetMediaInfo",value:function(){this._mediaInfo=new v.default}},{key:"_isInitialMetadataDispatched",value:function(){return this._hasAudio&&this._hasVideo?this._audioInitialMetadataDispatched&&this._videoInitialMetadataDispatched:this._hasAudio&&!this._hasVideo?this._audioInitialMetadataDispatched:!(this._hasAudio||!this._hasVideo)&&this._videoInitialMetadataDispatched}},{key:"parseChunks",value:function(t,n){if(!(this._onError&&this._onMediaInfo&&this._onTrackMetadata&&this._onDataAvailable))throw new g.IllegalStateException("Flv: onError & onMediaInfo & onTrackMetadata & onDataAvailable callback must be specified");var i=0,r=this._littleEndian;if(0===n){if(!(t.byteLength>13))return 0;i=e.probe(t).dataOffset}if(this._firstParse){this._firstParse=!1,n+i!==this._dataOffset&&l.default.w(this.TAG,"First time parsing but chunk byteStart invalid!");0!==new DataView(t,i).getUint32(0,!r)&&l.default.w(this.TAG,"PrevTagSize0 !== 0 !!!"),i+=4}for(;i<t.byteLength;){this._dispatch=!0;var s=new DataView(t,i);if(i+11+4>t.byteLength)break;var a=s.getUint8(0),o=16777215&s.getUint32(0,!r);if(i+11+o+4>t.byteLength)break;if(8===a||9===a||18===a){var u=s.getUint8(4),d=s.getUint8(5),h=s.getUint8(6),f=s.getUint8(7),c=h|d<<8|u<<16|f<<24;0!==(16777215&s.getUint32(7,!r))&&l.default.w(this.TAG,"Meet tag which has StreamID != 0!");var _=i+11;switch(a){case 8:this._parseAudioData(t,_,o,c);break;case 9:this._parseVideoData(t,_,o,c,n+i);break;case 18:this._parseScriptData(t,_,o)}var m=s.getUint32(11+o,!r);m!==11+o&&l.default.w(this.TAG,"Invalid PrevTagSize "+m),i+=11+o+4}else l.default.w(this.TAG,"Unsupported tag type "+a+", skipped"),i+=11+o+4}return this._isInitialMetadataDispatched()&&this._dispatch&&(this._audioTrack.length||this._videoTrack.length)&&this._onDataAvailable(this._audioTrack,this._videoTrack),i}},{key:"_parseScriptData",value:function(e,t,n){var i=h.default.parseScriptData(e,t,n);if(i.hasOwnProperty("onMetaData")){if(null==i.onMetaData||"object"!==a(i.onMetaData))return void l.default.w(this.TAG,"Invalid onMetaData structure!");this._metadata&&l.default.w(this.TAG,"Found another onMetaData tag!"),this._metadata=i;var r=this._metadata.onMetaData;if(this._onMetaDataArrived&&this._onMetaDataArrived(Object.assign({},r)),"boolean"==typeof r.hasAudio&&!1===this._hasAudioFlagOverrided&&(this._hasAudio=r.hasAudio,this._mediaInfo.hasAudio=this._hasAudio),"boolean"==typeof r.hasVideo&&!1===this._hasVideoFlagOverrided&&(this._hasVideo=r.hasVideo,this._mediaInfo.hasVideo=this._hasVideo),"number"==typeof r.audiodatarate&&(this._mediaInfo.audioDataRate=r.audiodatarate),"number"==typeof r.videodatarate&&(this._mediaInfo.videoDataRate=r.videodatarate),"number"==typeof r.width&&(this._mediaInfo.width=r.width),"number"==typeof r.height&&(this._mediaInfo.height=r.height),"number"==typeof r.duration){if(!this._durationOverrided){var s=Math.floor(r.duration*this._timescale);this._duration=s,this._mediaInfo.duration=s}}else this._mediaInfo.duration=0;if("number"==typeof r.framerate){var o=Math.floor(1e3*r.framerate);if(o>0){var u=o/1e3;this._referenceFrameRate.fixed=!0,this._referenceFrameRate.fps=u,this._referenceFrameRate.fps_num=o,this._referenceFrameRate.fps_den=1e3,this._mediaInfo.fps=u}}if("object"===a(r.keyframes)){this._mediaInfo.hasKeyframesIndex=!0;var d=r.keyframes;this._mediaInfo.keyframesIndex=this._parseKeyframesIndex(d),r.keyframes=null}else this._mediaInfo.hasKeyframesIndex=!1;this._dispatch=!1,this._mediaInfo.metadata=r,l.default.v(this.TAG,"Parsed onMetaData"),this._mediaInfo.isComplete()&&this._onMediaInfo(this._mediaInfo)}Object.keys(i).length>0&&this._onScriptDataArrived&&this._onScriptDataArrived(Object.assign({},i))}},{key:"_parseKeyframesIndex",value:function(e){for(var t=[],n=[],i=1;i<e.times.length;i++){var r=this._timestampBase+Math.floor(1e3*e.times[i]);t.push(r),n.push(e.filepositions[i])}return{times:t,filepositions:n}}},{key:"_parseAudioData",value:function(e,t,n,i){if(n<=1)return void l.default.w(this.TAG,"Flv: Invalid audio packet, missing SoundData payload!");if(!0!==this._hasAudioFlagOverrided||!1!==this._hasAudio){var r=(this._littleEndian,new DataView(e,t,n)),s=r.getUint8(0),a=s>>>4;if(2!==a&&10!==a)return void this._onError(m.default.CODEC_UNSUPPORTED,"Flv: Unsupported audio codec idx: "+a);var o=0,u=(12&s)>>>2;if(!(u>=0&&u<=4))return void this._onError(m.default.FORMAT_ERROR,"Flv: Invalid audio sample rate idx: "+u);o=this._flvSoundRateTable[u];var d=1&s,h=this._audioMetadata,f=this._audioTrack;if(h||(!1===this._hasAudio&&!1===this._hasAudioFlagOverrided&&(this._hasAudio=!0,this._mediaInfo.hasAudio=!0),h=this._audioMetadata={},h.type="audio",h.id=f.id,h.timescale=this._timescale,h.duration=this._duration,h.audioSampleRate=o,h.channelCount=0===d?1:2),10===a){var c=this._parseAACAudioData(e,t+1,n-1);if(void 0==c)return;if(0===c.packetType){h.config&&l.default.w(this.TAG,"Found another AudioSpecificConfig!");var _=c.data;h.audioSampleRate=_.samplingRate,h.channelCount=_.channelCount,h.codec=_.codec,h.originalCodec=_.originalCodec,h.config=_.config,
+h.refSampleDuration=1024/h.audioSampleRate*h.timescale,l.default.v(this.TAG,"Parsed AudioSpecificConfig"),this._isInitialMetadataDispatched()?this._dispatch&&(this._audioTrack.length||this._videoTrack.length)&&this._onDataAvailable(this._audioTrack,this._videoTrack):this._audioInitialMetadataDispatched=!0,this._dispatch=!1,this._onTrackMetadata("audio",h);var p=this._mediaInfo;p.audioCodec=h.originalCodec,p.audioSampleRate=h.audioSampleRate,p.audioChannelCount=h.channelCount,p.hasVideo?null!=p.videoCodec&&(p.mimeType='video/x-flv; codecs="'+p.videoCodec+","+p.audioCodec+'"'):p.mimeType='video/x-flv; codecs="'+p.audioCodec+'"',p.isComplete()&&this._onMediaInfo(p)}else if(1===c.packetType){var v=this._timestampBase+i,g={unit:c.data,length:c.data.byteLength,dts:v,pts:v};f.samples.push(g),f.length+=c.data.length}else l.default.e(this.TAG,"Flv: Unsupported AAC data type "+c.packetType)}else if(2===a){if(!h.codec){var y=this._parseMP3AudioData(e,t+1,n-1,!0);if(void 0==y)return;h.audioSampleRate=y.samplingRate,h.channelCount=y.channelCount,h.codec=y.codec,h.originalCodec=y.originalCodec,h.refSampleDuration=1152/h.audioSampleRate*h.timescale,l.default.v(this.TAG,"Parsed MPEG Audio Frame Header"),this._audioInitialMetadataDispatched=!0,this._onTrackMetadata("audio",h);var E=this._mediaInfo;E.audioCodec=h.codec,E.audioSampleRate=h.audioSampleRate,E.audioChannelCount=h.channelCount,E.audioDataRate=y.bitRate,E.hasVideo?null!=E.videoCodec&&(E.mimeType='video/x-flv; codecs="'+E.videoCodec+","+E.audioCodec+'"'):E.mimeType='video/x-flv; codecs="'+E.audioCodec+'"',E.isComplete()&&this._onMediaInfo(E)}var b=this._parseMP3AudioData(e,t+1,n-1,!1);if(void 0==b)return;var S=this._timestampBase+i,k={unit:b,length:b.byteLength,dts:S,pts:S};f.samples.push(k),f.length+=b.length}}}},{key:"_parseAACAudioData",value:function(e,t,n){if(n<=1)return void l.default.w(this.TAG,"Flv: Invalid AAC packet, missing AACPacketType or/and Data!");var i={},r=new Uint8Array(e,t,n);return i.packetType=r[0],0===r[0]?i.data=this._parseAACAudioSpecificConfig(e,t+1,n-1):i.data=r.subarray(1),i}},{key:"_parseAACAudioSpecificConfig",value:function(e,t,n){var i=new Uint8Array(e,t,n),r=null,s=0,a=0,o=0,u=null;if(s=a=i[0]>>>3,(o=(7&i[0])<<1|i[1]>>>7)<0||o>=this._mpegSamplingRates.length)return void this._onError(m.default.FORMAT_ERROR,"Flv: AAC invalid sampling frequency index!");var l=this._mpegSamplingRates[o],d=(120&i[1])>>>3;if(d<0||d>=8)return void this._onError(m.default.FORMAT_ERROR,"Flv: AAC invalid channel configuration");5===s&&(u=(7&i[1])<<1|i[2]>>>7,i[2]);var h=self.navigator.userAgent.toLowerCase();return-1!==h.indexOf("firefox")?o>=6?(s=5,r=new Array(4),u=o-3):(s=2,r=new Array(2),u=o):-1!==h.indexOf("android")?(s=2,r=new Array(2),u=o):(s=5,u=o,r=new Array(4),o>=6?u=o-3:1===d&&(s=2,r=new Array(2),u=o)),r[0]=s<<3,r[0]|=(15&o)>>>1,r[1]=(15&o)<<7,r[1]|=(15&d)<<3,5===s&&(r[1]|=(15&u)>>>1,r[2]=(1&u)<<7,r[2]|=8,r[3]=0),{config:r,samplingRate:l,channelCount:d,codec:"mp4a.40."+s,originalCodec:"mp4a.40."+a}}},{key:"_parseMP3AudioData",value:function(e,t,n,i){if(n<4)return void l.default.w(this.TAG,"Flv: Invalid MP3 packet, header missing!");var r=(this._littleEndian,new Uint8Array(e,t,n)),s=null;if(i){if(255!==r[0])return;var a=r[1]>>>3&3,o=(6&r[1])>>1,u=(240&r[2])>>>4,d=(12&r[2])>>>2,h=r[3]>>>6&3,f=3!==h?2:1,c=0,_=0;switch(a){case 0:c=this._mpegAudioV25SampleRateTable[d];break;case 2:c=this._mpegAudioV20SampleRateTable[d];break;case 3:c=this._mpegAudioV10SampleRateTable[d]}switch(o){case 1:34,u<this._mpegAudioL3BitRateTable.length&&(_=this._mpegAudioL3BitRateTable[u]);break;case 2:33,u<this._mpegAudioL2BitRateTable.length&&(_=this._mpegAudioL2BitRateTable[u]);break;case 3:32,u<this._mpegAudioL1BitRateTable.length&&(_=this._mpegAudioL1BitRateTable[u])}s={bitRate:_,samplingRate:c,channelCount:f,codec:"mp3",originalCodec:"mp3"}}else s=r;return s}},{key:"_parseVideoData",value:function(e,t,n,i,r){if(n<=1)return void l.default.w(this.TAG,"Flv: Invalid video packet, missing VideoData payload!");if(!0!==this._hasVideoFlagOverrided||!1!==this._hasVideo){var s=new Uint8Array(e,t,n)[0],a=(240&s)>>>4,o=15&s;if(7!==o)return void this._onError(m.default.CODEC_UNSUPPORTED,"Flv: Unsupported codec in video frame: "+o);this._parseAVCVideoPacket(e,t+1,n-1,i,r,a)}}},{key:"_parseAVCVideoPacket",value:function(e,t,n,i,r,s){if(n<4)return void l.default.w(this.TAG,"Flv: Invalid AVC packet, missing AVCPacketType or/and CompositionTime");var a=this._littleEndian,o=new DataView(e,t,n),u=o.getUint8(0),d=16777215&o.getUint32(0,!a),h=d<<8>>8;if(0===u)this._parseAVCDecoderConfigurationRecord(e,t+4,n-4);else if(1===u)this._parseAVCVideoData(e,t+4,n-4,i,r,s,h);else if(2!==u)return void this._onError(m.default.FORMAT_ERROR,"Flv: Invalid video packet type "+u)}},{key:"_parseAVCDecoderConfigurationRecord",value:function(e,t,n){if(n<7)return void l.default.w(this.TAG,"Flv: Invalid AVCDecoderConfigurationRecord, lack of data!");var i=this._videoMetadata,r=this._videoTrack,s=this._littleEndian,a=new DataView(e,t,n);i?void 0!==i.avcc&&l.default.w(this.TAG,"Found another AVCDecoderConfigurationRecord!"):(!1===this._hasVideo&&!1===this._hasVideoFlagOverrided&&(this._hasVideo=!0,this._mediaInfo.hasVideo=!0),i=this._videoMetadata={},i.type="video",i.id=r.id,i.timescale=this._timescale,i.duration=this._duration);var o=a.getUint8(0),u=a.getUint8(1);a.getUint8(2),a.getUint8(3);if(1!==o||0===u)return void this._onError(m.default.FORMAT_ERROR,"Flv: Invalid AVCDecoderConfigurationRecord");if(this._naluLengthSize=1+(3&a.getUint8(4)),3!==this._naluLengthSize&&4!==this._naluLengthSize)return void this._onError(m.default.FORMAT_ERROR,"Flv: Strange NaluLengthSizeMinusOne: "+(this._naluLengthSize-1));var d=31&a.getUint8(5);if(0===d)return void this._onError(m.default.FORMAT_ERROR,"Flv: Invalid AVCDecoderConfigurationRecord: No SPS");d>1&&l.default.w(this.TAG,"Flv: Strange AVCDecoderConfigurationRecord: SPS Count = "+d);for(var h=6,f=0;f<d;f++){var _=a.getUint16(h,!s);if(h+=2,0!==_){var p=new Uint8Array(e,t+h,_);h+=_;var v=c.default.parseSPS(p);if(0===f){i.codecWidth=v.codec_size.width,i.codecHeight=v.codec_size.height,i.presentWidth=v.present_size.width,i.presentHeight=v.present_size.height,i.profile=v.profile_string,i.level=v.level_string,i.bitDepth=v.bit_depth,i.chromaFormat=v.chroma_format,i.sarRatio=v.sar_ratio,i.frameRate=v.frame_rate,!1!==v.frame_rate.fixed&&0!==v.frame_rate.fps_num&&0!==v.frame_rate.fps_den||(i.frameRate=this._referenceFrameRate);var g=i.frameRate.fps_den,y=i.frameRate.fps_num;i.refSampleDuration=i.timescale*(g/y);for(var E=p.subarray(1,4),b="avc1.",S=0;S<3;S++){var k=E[S].toString(16);k.length<2&&(k="0"+k),b+=k}i.codec=b;var L=this._mediaInfo;L.width=i.codecWidth,L.height=i.codecHeight,L.fps=i.frameRate.fps,L.profile=i.profile,L.level=i.level,L.refFrames=v.ref_frames,L.chromaFormat=v.chroma_format_string,L.sarNum=i.sarRatio.width,L.sarDen=i.sarRatio.height,L.videoCodec=b,L.hasAudio?null!=L.audioCodec&&(L.mimeType='video/x-flv; codecs="'+L.videoCodec+","+L.audioCodec+'"'):L.mimeType='video/x-flv; codecs="'+L.videoCodec+'"',L.isComplete()&&this._onMediaInfo(L)}}}var R=a.getUint8(h);if(0===R)return void this._onError(m.default.FORMAT_ERROR,"Flv: Invalid AVCDecoderConfigurationRecord: No PPS");R>1&&l.default.w(this.TAG,"Flv: Strange AVCDecoderConfigurationRecord: PPS Count = "+R),h++;for(var A=0;A<R;A++){var w=a.getUint16(h,!s);h+=2,0!==w&&(h+=w)}i.avcc=new Uint8Array(n),i.avcc.set(new Uint8Array(e,t,n),0),l.default.v(this.TAG,"Parsed AVCDecoderConfigurationRecord"),this._isInitialMetadataDispatched()?this._dispatch&&(this._audioTrack.length||this._videoTrack.length)&&this._onDataAvailable(this._audioTrack,this._videoTrack):this._videoInitialMetadataDispatched=!0,this._dispatch=!1,this._onTrackMetadata("video",i)}},{key:"_parseAVCVideoData",value:function(e,t,n,i,r,s,a){for(var o=this._littleEndian,u=new DataView(e,t,n),d=[],h=0,f=0,c=this._naluLengthSize,_=this._timestampBase+i,m=1===s;f<n;){if(f+4>=n){l.default.w(this.TAG,"Malformed Nalu near timestamp "+_+", offset = "+f+", dataSize = "+n);break}var p=u.getUint32(f,!o);if(3===c&&(p>>>=8),p>n-c)return void l.default.w(this.TAG,"Malformed Nalus near timestamp "+_+", NaluSize > DataSize!");var v=31&u.getUint8(f+c);5===v&&(m=!0);var g=new Uint8Array(e,t+f,c+p),y={type:v,data:g};d.push(y),h+=g.byteLength,f+=c+p}if(d.length){var E=this._videoTrack,b={units:d,length:h,isKeyframe:m,dts:_,cts:a,pts:_+a};m&&(b.fileposition=r),E.samples.push(b),E.length+=h}}},{key:"onTrackMetadata",get:function(){return this._onTrackMetadata},set:function(e){this._onTrackMetadata=e}},{key:"onMediaInfo",get:function(){return this._onMediaInfo},set:function(e){this._onMediaInfo=e}},{key:"onMetaDataArrived",get:function(){return this._onMetaDataArrived},set:function(e){this._onMetaDataArrived=e}},{key:"onScriptDataArrived",get:function(){return this._onScriptDataArrived},set:function(e){this._onScriptDataArrived=e}},{key:"onError",get:function(){return this._onError},set:function(e){this._onError=e}},{key:"onDataAvailable",get:function(){return this._onDataAvailable},set:function(e){this._onDataAvailable=e}},{key:"timestampBase",get:function(){return this._timestampBase},set:function(e){this._timestampBase=e}},{key:"overridedDuration",get:function(){return this._duration},set:function(e){this._durationOverrided=!0,this._duration=e,this._mediaInfo.duration=e}},{key:"overridedHasAudio",set:function(e){this._hasAudioFlagOverrided=!0,this._hasAudio=e,this._mediaInfo.hasAudio=e}},{key:"overridedHasVideo",set:function(e){this._hasVideoFlagOverrided=!0,this._hasVideo=e,this._mediaInfo.hasVideo=e}}],[{key:"probe",value:function(e){var t=new Uint8Array(e),n={match:!1};if(70!==t[0]||76!==t[1]||86!==t[2]||1!==t[3])return n;var i=(4&t[4])>>>2!=0,r=0!=(1&t[4]),a=s(t,5);return a<9?n:{match:!0,consumed:a,dataOffset:a,hasAudioTrack:i,hasVideoTrack:r}}}]),e}();n.default=y},{"../core/media-info.js":7,"../utils/exception.js":40,"../utils/logger.js":41,"./amf-parser.js":15,"./demux-errors.js":16,"./sps-parser.js":19}],19:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var r=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),s=e("./exp-golomb.js"),a=function(e){return e&&e.__esModule?e:{default:e}}(s),o=function(){function e(){i(this,e)}return r(e,null,[{key:"_ebsp2rbsp",value:function(e){for(var t=e,n=t.byteLength,i=new Uint8Array(n),r=0,s=0;s<n;s++)s>=2&&3===t[s]&&0===t[s-1]&&0===t[s-2]||(i[r]=t[s],r++);return new Uint8Array(i.buffer,0,r)}},{key:"parseSPS",value:function(t){var n=e._ebsp2rbsp(t),i=new a.default(n);i.readByte();var r=i.readByte();i.readByte();var s=i.readByte();i.readUEG();var o=e.getProfileString(r),u=e.getLevelString(s),l=1,d=420,h=[0,420,422,444],f=8;if((100===r||110===r||122===r||244===r||44===r||83===r||86===r||118===r||128===r||138===r||144===r)&&(l=i.readUEG(),3===l&&i.readBits(1),l<=3&&(d=h[l]),f=i.readUEG()+8,i.readUEG(),i.readBits(1),i.readBool()))for(var c=3!==l?8:12,_=0;_<c;_++)i.readBool()&&(_<6?e._skipScalingList(i,16):e._skipScalingList(i,64));i.readUEG();var m=i.readUEG();if(0===m)i.readUEG();else if(1===m){i.readBits(1),i.readSEG(),i.readSEG();for(var p=i.readUEG(),v=0;v<p;v++)i.readSEG()}var g=i.readUEG();i.readBits(1);var y=i.readUEG(),E=i.readUEG(),b=i.readBits(1);0===b&&i.readBits(1),i.readBits(1);var S=0,k=0,L=0,R=0;i.readBool()&&(S=i.readUEG(),k=i.readUEG(),L=i.readUEG(),R=i.readUEG());var A=1,w=1,T=0,O=!0,C=0,I=0;if(i.readBool()){if(i.readBool()){var D=i.readByte(),x=[1,12,10,16,40,24,20,32,80,18,15,64,160,4,3,2],M=[1,11,11,11,33,11,11,11,33,11,11,33,99,3,2,1];D>0&&D<16?(A=x[D-1],w=M[D-1]):255===D&&(A=i.readByte()<<8|i.readByte(),w=i.readByte()<<8|i.readByte())}if(i.readBool()&&i.readBool(),i.readBool()&&(i.readBits(4),i.readBool()&&i.readBits(24)),i.readBool()&&(i.readUEG(),i.readUEG()),i.readBool()){var B=i.readBits(32),j=i.readBits(32);O=i.readBool(),C=j,I=2*B,T=C/I}}var P=1;1===A&&1===w||(P=A/w);var U=0,N=0;if(0===l)U=1,N=2-b;else{var F=3===l?1:2,G=1===l?2:1;U=F,N=G*(2-b)}var V=16*(y+1),z=16*(E+1)*(2-b);V-=(S+k)*U,z-=(L+R)*N;var H=Math.ceil(V*P);return i.destroy(),i=null,{profile_string:o,level_string:u,bit_depth:f,ref_frames:g,chroma_format:d,chroma_format_string:e.getChromaFormatString(d),frame_rate:{fixed:O,fps:T,fps_den:I,fps_num:C},sar_ratio:{width:A,height:w},codec_size:{width:V,height:z},present_size:{width:H,height:z}}}},{key:"_skipScalingList",value:function(e,t){for(var n=8,i=8,r=0,s=0;s<t;s++)0!==i&&(r=e.readSEG(),i=(n+r+256)%256),n=0===i?n:i}},{key:"getProfileString",value:function(e){switch(e){case 66:return"Baseline";case 77:return"Main";case 88:return"Extended";case 100:return"High";case 110:return"High10";case 122:return"High422";case 244:return"High444";default:return"Unknown"}}},{key:"getLevelString",value:function(e){return(e/10).toFixed(1)}},{key:"getChromaFormatString",value:function(e){switch(e){case 420:return"4:2:0";case 422:return"4:2:2";case 444:return"4:4:4";default:return"Unknown"}}}]),e}();n.default=o},{"./exp-golomb.js":17}],20:[function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function r(e,t){var n=e;if(null==n||"object"!==(void 0===n?"undefined":o(n)))throw new S.InvalidArgumentException("MediaDataSource must be an javascript object!");if(!n.hasOwnProperty("type"))throw new S.InvalidArgumentException("MediaDataSource must has type field to indicate video file type!");switch(n.type){case"flv":return new _.default(n,t);default:return new p.default(n,t)}}function s(){return h.default.supportMSEH264Playback()}function a(){return h.default.getFeatureList()}Object.defineProperty(n,"__esModule",{value:!0});var o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},u=e("./utils/polyfill.js"),l=i(u),d=e("./core/features.js"),h=i(d),f=e("./io/loader.js"),c=e("./player/flv-player.js"),_=i(c),m=e("./player/native-player.js"),p=i(m),v=e("./player/player-events.js"),g=i(v),y=e("./player/player-errors.js"),E=e("./utils/logging-control.js"),b=i(E),S=e("./utils/exception.js");l.default.install();var k={};k.createPlayer=r,k.isSupported=s,k.getFeatureList=a,k.BaseLoader=f.BaseLoader,k.LoaderStatus=f.LoaderStatus,k.LoaderErrors=f.LoaderErrors,k.Events=g.default,k.ErrorTypes=y.ErrorTypes,k.ErrorDetails=y.ErrorDetails,k.FlvPlayer=_.default,k.NativePlayer=p.default,k.LoggingControl=b.default,Object.defineProperty(k,"version",{enumerable:!0,get:function(){return"1.5.0"}}),n.default=k},{"./core/features.js":6,"./io/loader.js":24,"./player/flv-player.js":32,"./player/native-player.js":33,"./player/player-errors.js":34,"./player/player-events.js":35,"./utils/exception.js":40,"./utils/logging-control.js":42,"./utils/polyfill.js":43}],21:[function(e,t,n){"use strict";t.exports=e("./flv.js").default},{"./flv.js":20}],22:[function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function s(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(n,"__esModule",{value:!0});var o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},u=function e(t,n,i){null===t&&(t=Function.prototype);var r=Object.getOwnPropertyDescriptor(t,n);if(void 0===r){var s=Object.getPrototypeOf(t);return null===s?void 0:e(s,n,i)}if("value"in r)return r.value;var a=r.get;if(void 0!==a)return a.call(i)},l=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),d=e("../utils/logger.js"),h=(i(d),e("../utils/browser.js")),f=i(h),c=e("./loader.js"),_=e("../utils/exception.js"),m=function(e){function t(e,n){r(this,t);var i=s(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,"fetch-stream-loader"));return i.TAG="FetchStreamLoader",i._seekHandler=e,i._config=n,i._needStash=!0,i._requestAbort=!1,i._contentLength=null,i._receivedLength=0,i}return a(t,e),l(t,null,[{key:"isSupported",value:function(){try{var e=f.default.msedge&&f.default.version.minor>=15048,t=!f.default.msedge||e;return self.fetch&&self.ReadableStream&&t}catch(e){return!1}}}]),l(t,[{key:"destroy",value:function(){this.isWorking()&&this.abort(),u(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),"destroy",this).call(this)}},{key:"open",value:function(e,t){var n=this;this._dataSource=e,this._range=t;var i=e.url;this._config.reuseRedirectedURL&&void 0!=e.redirectedURL&&(i=e.redirectedURL);var r=this._seekHandler.getConfig(i,t),s=new self.Headers;if("object"===o(r.headers)){var a=r.headers;for(var u in a)a.hasOwnProperty(u)&&s.append(u,a[u])}var l={method:"GET",headers:s,mode:"cors",cache:"default",referrerPolicy:"no-referrer-when-downgrade"};if("object"===o(this._config.headers))for(var d in this._config.headers)s.append(d,this._config.headers[d]);!1===e.cors&&(l.mode="same-origin"),e.withCredentials&&(l.credentials="include"),e.referrerPolicy&&(l.referrerPolicy=e.referrerPolicy),this._status=c.LoaderStatus.kConnecting,self.fetch(r.url,l).then(function(e){if(n._requestAbort)return n._requestAbort=!1,void(n._status=c.LoaderStatus.kIdle);if(e.ok&&e.status>=200&&e.status<=299){if(e.url!==r.url&&n._onURLRedirect){var t=n._seekHandler.removeURLParameters(e.url);n._onURLRedirect(t)}var i=e.headers.get("Content-Length");return null!=i&&(n._contentLength=parseInt(i),0!==n._contentLength&&n._onContentLengthKnown&&n._onContentLengthKnown(n._contentLength)),n._pump.call(n,e.body.getReader())}if(n._status=c.LoaderStatus.kError,!n._onError)throw new _.RuntimeException("FetchStreamLoader: Http code invalid, "+e.status+" "+e.statusText);n._onError(c.LoaderErrors.HTTP_STATUS_CODE_INVALID,{code:e.status,msg:e.statusText})}).catch(function(e){if(n._status=c.LoaderStatus.kError,!n._onError)throw e;n._onError(c.LoaderErrors.EXCEPTION,{code:-1,msg:e.message})})}},{key:"abort",value:function(){this._requestAbort=!0}},{key:"_pump",value:function(e){var t=this;return e.read().then(function(n){if(n.done)if(null!==t._contentLength&&t._receivedLength<t._contentLength){t._status=c.LoaderStatus.kError;var i=c.LoaderErrors.EARLY_EOF,r={code:-1,msg:"Fetch stream meet Early-EOF"};if(!t._onError)throw new _.RuntimeException(r.msg);t._onError(i,r)}else t._status=c.LoaderStatus.kComplete,t._onComplete&&t._onComplete(t._range.from,t._range.from+t._receivedLength-1);else{if(!0===t._requestAbort)return t._requestAbort=!1,t._status=c.LoaderStatus.kComplete,e.cancel();t._status=c.LoaderStatus.kBuffering;var s=n.value.buffer,a=t._range.from+t._receivedLength;t._receivedLength+=s.byteLength,t._onDataArrival&&t._onDataArrival(s,a,t._receivedLength),t._pump(e)}}).catch(function(e){if(11!==e.code||!f.default.msedge){t._status=c.LoaderStatus.kError;var n=0,i=null;if(19!==e.code&&"network error"!==e.message||!(null===t._contentLength||null!==t._contentLength&&t._receivedLength<t._contentLength)?(n=c.LoaderErrors.EXCEPTION,i={code:e.code,msg:e.message}):(n=c.LoaderErrors.EARLY_EOF,i={code:e.code,msg:"Fetch stream meet Early-EOF"}),!t._onError)throw new _.RuntimeException(i.msg);t._onError(n,i)}})}}]),t}(c.BaseLoader);n.default=m},{"../utils/browser.js":39,"../utils/exception.js":40,"../utils/logger.js":41,"./loader.js":24}],23:[function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),a=e("../utils/logger.js"),o=i(a),u=e("./speed-sampler.js"),l=i(u),d=e("./loader.js"),h=e("./fetch-stream-loader.js"),f=i(h),c=e("./xhr-moz-chunked-loader.js"),_=i(c),m=e("./xhr-msstream-loader.js"),p=(i(m),e("./xhr-range-loader.js")),v=i(p),g=e("./websocket-loader.js"),y=i(g),E=e("./range-seek-handler.js"),b=i(E),S=e("./param-seek-handler.js"),k=i(S),L=e("../utils/exception.js"),R=function(){function e(t,n,i){r(this,e),this.TAG="IOController",this._config=n,this._extraData=i,this._stashInitialSize=393216,void 0!=n.stashInitialSize&&n.stashInitialSize>0&&(this._stashInitialSize=n.stashInitialSize),this._stashUsed=0,this._stashSize=this._stashInitialSize,this._bufferSize=3145728,this._stashBuffer=new ArrayBuffer(this._bufferSize),this._stashByteStart=0,this._enableStash=!0,!1===n.enableStashBuffer&&(this._enableStash=!1),this._loader=null,this._loaderClass=null,this._seekHandler=null,this._dataSource=t,this._isWebSocketURL=/wss?:\/\/(.+?)/.test(t.url),this._refTotalLength=t.filesize?t.filesize:null,this._totalLength=this._refTotalLength,this._fullRequestFlag=!1,this._currentRange=null,this._redirectedURL=null,this._speedNormalized=0,this._speedSampler=new l.default,this._speedNormalizeList=[64,128,256,384,512,768,1024,1536,2048,3072,4096],this._isEarlyEofReconnecting=!1,this._paused=!1,this._resumeFrom=0,this._onDataArrival=null,this._onSeeked=null,this._onError=null,this._onComplete=null,this._onRedirect=null,this._onRecoveredEarlyEof=null,this._selectSeekHandler(),this._selectLoader(),this._createLoader()}return s(e,[{key:"destroy",value:function(){this._loader.isWorking()&&this._loader.abort(),this._loader.destroy(),this._loader=null,this._loaderClass=null,this._dataSource=null,this._stashBuffer=null,this._stashUsed=this._stashSize=this._bufferSize=this._stashByteStart=0,this._currentRange=null,this._speedSampler=null,this._isEarlyEofReconnecting=!1,this._onDataArrival=null,this._onSeeked=null,this._onError=null,this._onComplete=null,this._onRedirect=null,this._onRecoveredEarlyEof=null,this._extraData=null}},{key:"isWorking",value:function(){return this._loader&&this._loader.isWorking()&&!this._paused}},{key:"isPaused",value:function(){return this._paused}},{key:"_selectSeekHandler",value:function(){var e=this._config;if("range"===e.seekType)this._seekHandler=new b.default(this._config.rangeLoadZeroStart);else if("param"===e.seekType){var t=e.seekParamStart||"bstart",n=e.seekParamEnd||"bend";this._seekHandler=new k.default(t,n)}else{if("custom"!==e.seekType)throw new L.InvalidArgumentException("Invalid seekType in config: "+e.seekType);if("function"!=typeof e.customSeekHandler)throw new L.InvalidArgumentException("Custom seekType specified in config but invalid customSeekHandler!");this._seekHandler=new e.customSeekHandler}}},{key:"_selectLoader",value:function(){if(null!=this._config.customLoader)this._loaderClass=this._config.customLoader;else if(this._isWebSocketURL)this._loaderClass=y.default;else if(f.default.isSupported())this._loaderClass=f.default;else if(_.default.isSupported())this._loaderClass=_.default;else{if(!v.default.isSupported())throw new L.RuntimeException("Your browser doesn't support xhr with arraybuffer responseType!");this._loaderClass=v.default}}},{key:"_createLoader",value:function(){this._loader=new this._loaderClass(this._seekHandler,this._config),!1===this._loader.needStashBuffer&&(this._enableStash=!1),this._loader.onContentLengthKnown=this._onContentLengthKnown.bind(this),this._loader.onURLRedirect=this._onURLRedirect.bind(this),this._loader.onDataArrival=this._onLoaderChunkArrival.bind(this),this._loader.onComplete=this._onLoaderComplete.bind(this),this._loader.onError=this._onLoaderError.bind(this)}},{key:"open",value:function(e){this._currentRange={from:0,to:-1},e&&(this._currentRange.from=e),this._speedSampler.reset(),e||(this._fullRequestFlag=!0),this._loader.open(this._dataSource,Object.assign({},this._currentRange))}},{key:"abort",value:function(){this._loader.abort(),this._paused&&(this._paused=!1,this._resumeFrom=0)}},{key:"pause",value:function(){this.isWorking()&&(this._loader.abort(),0!==this._stashUsed?(this._resumeFrom=this._stashByteStart,this._currentRange.to=this._stashByteStart-1):this._resumeFrom=this._currentRange.to+1,this._stashUsed=0,this._stashByteStart=0,this._paused=!0)}},{key:"resume",value:function(){if(this._paused){this._paused=!1;var e=this._resumeFrom;this._resumeFrom=0,this._internalSeek(e,!0)}}},{key:"seek",value:function(e){this._paused=!1,this._stashUsed=0,this._stashByteStart=0,this._internalSeek(e,!0)}},{key:"_internalSeek",value:function(e,t){this._loader.isWorking()&&this._loader.abort(),this._flushStashBuffer(t),this._loader.destroy(),this._loader=null;var n={from:e,to:-1};this._currentRange={from:n.from,to:-1},this._speedSampler.reset(),this._stashSize=this._stashInitialSize,this._createLoader(),this._loader.open(this._dataSource,n),this._onSeeked&&this._onSeeked()}},{key:"updateUrl",value:function(e){if(!e||"string"!=typeof e||0===e.length)throw new L.InvalidArgumentException("Url must be a non-empty string!");this._dataSource.url=e}},{key:"_expandBuffer",value:function(e){for(var t=this._stashSize;t+1048576<e;)t*=2;if((t+=1048576)!==this._bufferSize){var n=new ArrayBuffer(t);if(this._stashUsed>0){var i=new Uint8Array(this._stashBuffer,0,this._stashUsed);new Uint8Array(n,0,t).set(i,0)}this._stashBuffer=n,this._bufferSize=t}}},{key:"_normalizeSpeed",value:function(e){var t=this._speedNormalizeList,n=t.length-1,i=0,r=0,s=n;if(e<t[0])return t[0];for(;r<=s;){if((i=r+Math.floor((s-r)/2))===n||e>=t[i]&&e<t[i+1])return t[i];t[i]<e?r=i+1:s=i-1}}},{key:"_adjustStashSize",value:function(e){var t=0;(t=this._config.isLive?e:e<512?e:e>=512&&e<=1024?Math.floor(1.5*e):2*e)>8192&&(t=8192);var n=1024*t+1048576;this._bufferSize<n&&this._expandBuffer(n),this._stashSize=1024*t}},{key:"_dispatchChunks",value:function(e,t){return this._currentRange.to=t+e.byteLength-1,this._onDataArrival(e,t)}},{key:"_onURLRedirect",value:function(e){this._redirectedURL=e,this._onRedirect&&this._onRedirect(e)}},{key:"_onContentLengthKnown",value:function(e){e&&this._fullRequestFlag&&(this._totalLength=e,this._fullRequestFlag=!1)}},{key:"_onLoaderChunkArrival",value:function(e,t,n){if(!this._onDataArrival)throw new L.IllegalStateException("IOController: No existing consumer (onDataArrival) callback!");if(!this._paused){this._isEarlyEofReconnecting&&(this._isEarlyEofReconnecting=!1,this._onRecoveredEarlyEof&&this._onRecoveredEarlyEof()),this._speedSampler.addBytes(e.byteLength);var i=this._speedSampler.lastSecondKBps;if(0!==i){var r=this._normalizeSpeed(i);this._speedNormalized!==r&&(this._speedNormalized=r,this._adjustStashSize(r))}if(this._enableStash)if(0===this._stashUsed&&0===this._stashByteStart&&(this._stashByteStart=t),this._stashUsed+e.byteLength<=this._stashSize){var s=new Uint8Array(this._stashBuffer,0,this._stashSize);s.set(new Uint8Array(e),this._stashUsed),this._stashUsed+=e.byteLength}else{var a=new Uint8Array(this._stashBuffer,0,this._bufferSize);if(this._stashUsed>0){var o=this._stashBuffer.slice(0,this._stashUsed),u=this._dispatchChunks(o,this._stashByteStart);if(u<o.byteLength){if(u>0){var l=new Uint8Array(o,u);a.set(l,0),this._stashUsed=l.byteLength,this._stashByteStart+=u}}else this._stashUsed=0,this._stashByteStart+=u;this._stashUsed+e.byteLength>this._bufferSize&&(this._expandBuffer(this._stashUsed+e.byteLength),a=new Uint8Array(this._stashBuffer,0,this._bufferSize)),a.set(new Uint8Array(e),this._stashUsed),this._stashUsed+=e.byteLength}else{var d=this._dispatchChunks(e,t);if(d<e.byteLength){var h=e.byteLength-d;h>this._bufferSize&&(this._expandBuffer(h),a=new Uint8Array(this._stashBuffer,0,this._bufferSize)),a.set(new Uint8Array(e,d),0),this._stashUsed+=h,this._stashByteStart=t+d}}}else if(0===this._stashUsed){var f=this._dispatchChunks(e,t);if(f<e.byteLength){var c=e.byteLength-f;c>this._bufferSize&&this._expandBuffer(c);var _=new Uint8Array(this._stashBuffer,0,this._bufferSize);_.set(new Uint8Array(e,f),0),this._stashUsed+=c,this._stashByteStart=t+f}}else{this._stashUsed+e.byteLength>this._bufferSize&&this._expandBuffer(this._stashUsed+e.byteLength);var m=new Uint8Array(this._stashBuffer,0,this._bufferSize);m.set(new Uint8Array(e),this._stashUsed),this._stashUsed+=e.byteLength;var p=this._dispatchChunks(this._stashBuffer.slice(0,this._stashUsed),this._stashByteStart);if(p<this._stashUsed&&p>0){var v=new Uint8Array(this._stashBuffer,p);m.set(v,0)}this._stashUsed-=p,this._stashByteStart+=p}}}},{key:"_flushStashBuffer",value:function(e){if(this._stashUsed>0){var t=this._stashBuffer.slice(0,this._stashUsed),n=this._dispatchChunks(t,this._stashByteStart),i=t.byteLength-n;if(n<t.byteLength){if(!e){if(n>0){var r=new Uint8Array(this._stashBuffer,0,this._bufferSize),s=new Uint8Array(t,n);r.set(s,0),this._stashUsed=s.byteLength,this._stashByteStart+=n}return 0}o.default.w(this.TAG,i+" bytes unconsumed data remain when flush buffer, dropped")}return this._stashUsed=0,this._stashByteStart=0,i}return 0}},{key:"_onLoaderComplete",value:function(e,t){this._flushStashBuffer(!0),this._onComplete&&this._onComplete(this._extraData)}},{key:"_onLoaderError",value:function(e,t){switch(o.default.e(this.TAG,"Loader error, code = "+t.code+", msg = "+t.msg),this._flushStashBuffer(!1),this._isEarlyEofReconnecting&&(this._isEarlyEofReconnecting=!1,e=d.LoaderErrors.UNRECOVERABLE_EARLY_EOF),e){case d.LoaderErrors.EARLY_EOF:if(!this._config.isLive&&this._totalLength){var n=this._currentRange.to+1;return void(n<this._totalLength&&(o.default.w(this.TAG,"Connection lost, trying reconnect..."),this._isEarlyEofReconnecting=!0,this._internalSeek(n,!1)))}e=d.LoaderErrors.UNRECOVERABLE_EARLY_EOF;break;case d.LoaderErrors.UNRECOVERABLE_EARLY_EOF:case d.LoaderErrors.CONNECTING_TIMEOUT:case d.LoaderErrors.HTTP_STATUS_CODE_INVALID:case d.LoaderErrors.EXCEPTION:}if(!this._onError)throw new L.RuntimeException("IOException: "+t.msg);this._onError(e,t)}},{key:"status",get:function(){return this._loader.status}},{key:"extraData",get:function(){return this._extraData},set:function(e){this._extraData=e}},{key:"onDataArrival",get:function(){return this._onDataArrival},set:function(e){this._onDataArrival=e}},{key:"onSeeked",get:function(){return this._onSeeked},set:function(e){this._onSeeked=e}},{key:"onError",get:function(){return this._onError},set:function(e){this._onError=e}},{key:"onComplete",get:function(){return this._onComplete},set:function(e){this._onComplete=e}},{key:"onRedirect",get:function(){return this._onRedirect},set:function(e){this._onRedirect=e}},{key:"onRecoveredEarlyEof",get:function(){return this._onRecoveredEarlyEof},set:function(e){this._onRecoveredEarlyEof=e}},{key:"currentURL",get:function(){return this._dataSource.url}},{key:"hasRedirect",get:function(){return null!=this._redirectedURL||void 0!=this._dataSource.redirectedURL}},{key:"currentRedirectedURL",get:function(){return this._redirectedURL||this._dataSource.redirectedURL}},{key:"currentSpeed",get:function(){return this._loaderClass===v.default?this._loader.currentSpeed:this._speedSampler.lastSecondKBps}},{key:"loaderType",get:function(){return this._loader.type}}]),e}();n.default=R},{"../utils/exception.js":40,"../utils/logger.js":41,"./fetch-stream-loader.js":22,"./loader.js":24,
+"./param-seek-handler.js":25,"./range-seek-handler.js":26,"./speed-sampler.js":27,"./websocket-loader.js":28,"./xhr-moz-chunked-loader.js":29,"./xhr-msstream-loader.js":30,"./xhr-range-loader.js":31}],24:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0}),n.BaseLoader=n.LoaderErrors=n.LoaderStatus=void 0;var r=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),s=e("../utils/exception.js"),a=n.LoaderStatus={kIdle:0,kConnecting:1,kBuffering:2,kError:3,kComplete:4};n.LoaderErrors={OK:"OK",EXCEPTION:"Exception",HTTP_STATUS_CODE_INVALID:"HttpStatusCodeInvalid",CONNECTING_TIMEOUT:"ConnectingTimeout",EARLY_EOF:"EarlyEof",UNRECOVERABLE_EARLY_EOF:"UnrecoverableEarlyEof"},n.BaseLoader=function(){function e(t){i(this,e),this._type=t||"undefined",this._status=a.kIdle,this._needStash=!1,this._onContentLengthKnown=null,this._onURLRedirect=null,this._onDataArrival=null,this._onError=null,this._onComplete=null}return r(e,[{key:"destroy",value:function(){this._status=a.kIdle,this._onContentLengthKnown=null,this._onURLRedirect=null,this._onDataArrival=null,this._onError=null,this._onComplete=null}},{key:"isWorking",value:function(){return this._status===a.kConnecting||this._status===a.kBuffering}},{key:"open",value:function(e,t){throw new s.NotImplementedException("Unimplemented abstract function!")}},{key:"abort",value:function(){throw new s.NotImplementedException("Unimplemented abstract function!")}},{key:"type",get:function(){return this._type}},{key:"status",get:function(){return this._status}},{key:"needStashBuffer",get:function(){return this._needStash}},{key:"onContentLengthKnown",get:function(){return this._onContentLengthKnown},set:function(e){this._onContentLengthKnown=e}},{key:"onURLRedirect",get:function(){return this._onURLRedirect},set:function(e){this._onURLRedirect=e}},{key:"onDataArrival",get:function(){return this._onDataArrival},set:function(e){this._onDataArrival=e}},{key:"onError",get:function(){return this._onError},set:function(e){this._onError=e}},{key:"onComplete",get:function(){return this._onComplete},set:function(e){this._onComplete=e}}]),e}()},{"../utils/exception.js":40}],25:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var r=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),s=function(){function e(t,n){i(this,e),this._startName=t,this._endName=n}return r(e,[{key:"getConfig",value:function(e,t){var n=e;if(0!==t.from||-1!==t.to){var i=!0;-1===n.indexOf("?")&&(n+="?",i=!1),i&&(n+="&"),n+=this._startName+"="+t.from.toString(),-1!==t.to&&(n+="&"+this._endName+"="+t.to.toString())}return{url:n,headers:{}}}},{key:"removeURLParameters",value:function(e){var t=e.split("?")[0],n=void 0,i=e.indexOf("?");-1!==i&&(n=e.substring(i+1));var r="";if(void 0!=n&&n.length>0)for(var s=n.split("&"),a=0;a<s.length;a++){var o=s[a].split("="),u=a>0;o[0]!==this._startName&&o[0]!==this._endName&&(u&&(r+="&"),r+=s[a])}return 0===r.length?t:t+"?"+r}}]),e}();n.default=s},{}],26:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var r=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),s=function(){function e(t){i(this,e),this._zeroStart=t||!1}return r(e,[{key:"getConfig",value:function(e,t){var n={};if(0!==t.from||-1!==t.to){var i=void 0;i=-1!==t.to?"bytes="+t.from.toString()+"-"+t.to.toString():"bytes="+t.from.toString()+"-",n.Range=i}else this._zeroStart&&(n.Range="bytes=0-");return{url:e,headers:n}}},{key:"removeURLParameters",value:function(e){return e}}]),e}();n.default=s},{}],27:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var r=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),s=function(){function e(){i(this,e),this._firstCheckpoint=0,this._lastCheckpoint=0,this._intervalBytes=0,this._totalBytes=0,this._lastSecondBytes=0,self.performance&&self.performance.now?this._now=self.performance.now.bind(self.performance):this._now=Date.now}return r(e,[{key:"reset",value:function(){this._firstCheckpoint=this._lastCheckpoint=0,this._totalBytes=this._intervalBytes=0,this._lastSecondBytes=0}},{key:"addBytes",value:function(e){0===this._firstCheckpoint?(this._firstCheckpoint=this._now(),this._lastCheckpoint=this._firstCheckpoint,this._intervalBytes+=e,this._totalBytes+=e):this._now()-this._lastCheckpoint<1e3?(this._intervalBytes+=e,this._totalBytes+=e):(this._lastSecondBytes=this._intervalBytes,this._intervalBytes=e,this._totalBytes+=e,this._lastCheckpoint=this._now())}},{key:"currentKBps",get:function(){this.addBytes(0);var e=(this._now()-this._lastCheckpoint)/1e3;return 0==e&&(e=1),this._intervalBytes/e/1024}},{key:"lastSecondKBps",get:function(){return this.addBytes(0),0!==this._lastSecondBytes?this._lastSecondBytes/1024:this._now()-this._lastCheckpoint>=500?this.currentKBps:0}},{key:"averageKBps",get:function(){var e=(this._now()-this._firstCheckpoint)/1e3;return this._totalBytes/e/1024}}]),e}();n.default=s},{}],28:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function r(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(n,"__esModule",{value:!0});var a=function e(t,n,i){null===t&&(t=Function.prototype);var r=Object.getOwnPropertyDescriptor(t,n);if(void 0===r){var s=Object.getPrototypeOf(t);return null===s?void 0:e(s,n,i)}if("value"in r)return r.value;var a=r.get;if(void 0!==a)return a.call(i)},o=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),u=e("../utils/logger.js"),l=(function(e){e&&e.__esModule}(u),e("./loader.js")),d=e("../utils/exception.js"),h=function(e){function t(){i(this,t);var e=r(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,"websocket-loader"));return e.TAG="WebSocketLoader",e._needStash=!0,e._ws=null,e._requestAbort=!1,e._receivedLength=0,e}return s(t,e),o(t,null,[{key:"isSupported",value:function(){try{return void 0!==self.WebSocket}catch(e){return!1}}}]),o(t,[{key:"destroy",value:function(){this._ws&&this.abort(),a(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),"destroy",this).call(this)}},{key:"open",value:function(e){try{var t=this._ws=new self.WebSocket(e.url);t.binaryType="arraybuffer",t.onopen=this._onWebSocketOpen.bind(this),t.onclose=this._onWebSocketClose.bind(this),t.onmessage=this._onWebSocketMessage.bind(this),t.onerror=this._onWebSocketError.bind(this),this._status=l.LoaderStatus.kConnecting}catch(e){this._status=l.LoaderStatus.kError;var n={code:e.code,msg:e.message};if(!this._onError)throw new d.RuntimeException(n.msg);this._onError(l.LoaderErrors.EXCEPTION,n)}}},{key:"abort",value:function(){var e=this._ws;!e||0!==e.readyState&&1!==e.readyState||(this._requestAbort=!0,e.close()),this._ws=null,this._status=l.LoaderStatus.kComplete}},{key:"_onWebSocketOpen",value:function(e){this._status=l.LoaderStatus.kBuffering}},{key:"_onWebSocketClose",value:function(e){if(!0===this._requestAbort)return void(this._requestAbort=!1);this._status=l.LoaderStatus.kComplete,this._onComplete&&this._onComplete(0,this._receivedLength-1)}},{key:"_onWebSocketMessage",value:function(e){var t=this;if(e.data instanceof ArrayBuffer)this._dispatchArrayBuffer(e.data);else if(e.data instanceof Blob){var n=new FileReader;n.onload=function(){t._dispatchArrayBuffer(n.result)},n.readAsArrayBuffer(e.data)}else{this._status=l.LoaderStatus.kError;var i={code:-1,msg:"Unsupported WebSocket message type: "+e.data.constructor.name};if(!this._onError)throw new d.RuntimeException(i.msg);this._onError(l.LoaderErrors.EXCEPTION,i)}}},{key:"_dispatchArrayBuffer",value:function(e){var t=e,n=this._receivedLength;this._receivedLength+=t.byteLength,this._onDataArrival&&this._onDataArrival(t,n,this._receivedLength)}},{key:"_onWebSocketError",value:function(e){this._status=l.LoaderStatus.kError;var t={code:e.code,msg:e.message};if(!this._onError)throw new d.RuntimeException(t.msg);this._onError(l.LoaderErrors.EXCEPTION,t)}}]),t}(l.BaseLoader);n.default=h},{"../utils/exception.js":40,"../utils/logger.js":41,"./loader.js":24}],29:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function r(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(n,"__esModule",{value:!0});var a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o=function e(t,n,i){null===t&&(t=Function.prototype);var r=Object.getOwnPropertyDescriptor(t,n);if(void 0===r){var s=Object.getPrototypeOf(t);return null===s?void 0:e(s,n,i)}if("value"in r)return r.value;var a=r.get;if(void 0!==a)return a.call(i)},u=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),l=e("../utils/logger.js"),d=function(e){return e&&e.__esModule?e:{default:e}}(l),h=e("./loader.js"),f=e("../utils/exception.js"),c=function(e){function t(e,n){i(this,t);var s=r(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,"xhr-moz-chunked-loader"));return s.TAG="MozChunkedLoader",s._seekHandler=e,s._config=n,s._needStash=!0,s._xhr=null,s._requestAbort=!1,s._contentLength=null,s._receivedLength=0,s}return s(t,e),u(t,null,[{key:"isSupported",value:function(){try{var e=new XMLHttpRequest;return e.open("GET","https://example.com",!0),e.responseType="moz-chunked-arraybuffer","moz-chunked-arraybuffer"===e.responseType}catch(e){return d.default.w("MozChunkedLoader",e.message),!1}}}]),u(t,[{key:"destroy",value:function(){this.isWorking()&&this.abort(),this._xhr&&(this._xhr.onreadystatechange=null,this._xhr.onprogress=null,this._xhr.onloadend=null,this._xhr.onerror=null,this._xhr=null),o(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),"destroy",this).call(this)}},{key:"open",value:function(e,t){this._dataSource=e,this._range=t;var n=e.url;this._config.reuseRedirectedURL&&void 0!=e.redirectedURL&&(n=e.redirectedURL);var i=this._seekHandler.getConfig(n,t);this._requestURL=i.url;var r=this._xhr=new XMLHttpRequest;if(r.open("GET",i.url,!0),r.responseType="moz-chunked-arraybuffer",r.onreadystatechange=this._onReadyStateChange.bind(this),r.onprogress=this._onProgress.bind(this),r.onloadend=this._onLoadEnd.bind(this),r.onerror=this._onXhrError.bind(this),e.withCredentials&&(r.withCredentials=!0),"object"===a(i.headers)){var s=i.headers;for(var o in s)s.hasOwnProperty(o)&&r.setRequestHeader(o,s[o])}if("object"===a(this._config.headers)){var u=this._config.headers;for(var l in u)u.hasOwnProperty(l)&&r.setRequestHeader(l,u[l])}this._status=h.LoaderStatus.kConnecting,r.send()}},{key:"abort",value:function(){this._requestAbort=!0,this._xhr&&this._xhr.abort(),this._status=h.LoaderStatus.kComplete}},{key:"_onReadyStateChange",value:function(e){var t=e.target;if(2===t.readyState){if(void 0!=t.responseURL&&t.responseURL!==this._requestURL&&this._onURLRedirect){var n=this._seekHandler.removeURLParameters(t.responseURL);this._onURLRedirect(n)}if(0!==t.status&&(t.status<200||t.status>299)){if(this._status=h.LoaderStatus.kError,!this._onError)throw new f.RuntimeException("MozChunkedLoader: Http code invalid, "+t.status+" "+t.statusText);this._onError(h.LoaderErrors.HTTP_STATUS_CODE_INVALID,{code:t.status,msg:t.statusText})}else this._status=h.LoaderStatus.kBuffering}}},{key:"_onProgress",value:function(e){if(this._status!==h.LoaderStatus.kError){null===this._contentLength&&null!==e.total&&0!==e.total&&(this._contentLength=e.total,this._onContentLengthKnown&&this._onContentLengthKnown(this._contentLength));var t=e.target.response,n=this._range.from+this._receivedLength;this._receivedLength+=t.byteLength,this._onDataArrival&&this._onDataArrival(t,n,this._receivedLength)}}},{key:"_onLoadEnd",value:function(e){if(!0===this._requestAbort)return void(this._requestAbort=!1);this._status!==h.LoaderStatus.kError&&(this._status=h.LoaderStatus.kComplete,this._onComplete&&this._onComplete(this._range.from,this._range.from+this._receivedLength-1))}},{key:"_onXhrError",value:function(e){this._status=h.LoaderStatus.kError;var t=0,n=null;if(this._contentLength&&e.loaded<this._contentLength?(t=h.LoaderErrors.EARLY_EOF,n={code:-1,msg:"Moz-Chunked stream meet Early-Eof"}):(t=h.LoaderErrors.EXCEPTION,n={code:-1,msg:e.constructor.name+" "+e.type}),!this._onError)throw new f.RuntimeException(n.msg);this._onError(t,n)}}]),t}(h.BaseLoader);n.default=c},{"../utils/exception.js":40,"../utils/logger.js":41,"./loader.js":24}],30:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function r(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(n,"__esModule",{value:!0});var a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o=function e(t,n,i){null===t&&(t=Function.prototype);var r=Object.getOwnPropertyDescriptor(t,n);if(void 0===r){var s=Object.getPrototypeOf(t);return null===s?void 0:e(s,n,i)}if("value"in r)return r.value;var a=r.get;if(void 0!==a)return a.call(i)},u=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),l=e("../utils/logger.js"),d=function(e){return e&&e.__esModule?e:{default:e}}(l),h=e("./loader.js"),f=e("../utils/exception.js"),c=function(e){function t(e,n){i(this,t);var s=r(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,"xhr-msstream-loader"));return s.TAG="MSStreamLoader",s._seekHandler=e,s._config=n,s._needStash=!0,s._xhr=null,s._reader=null,s._totalRange=null,s._currentRange=null,s._currentRequestURL=null,s._currentRedirectedURL=null,s._contentLength=null,s._receivedLength=0,s._bufferLimit=16777216,s._lastTimeBufferSize=0,s._isReconnecting=!1,s}return s(t,e),u(t,null,[{key:"isSupported",value:function(){try{if(void 0===self.MSStream||void 0===self.MSStreamReader)return!1;var e=new XMLHttpRequest;return e.open("GET","https://example.com",!0),e.responseType="ms-stream","ms-stream"===e.responseType}catch(e){return d.default.w("MSStreamLoader",e.message),!1}}}]),u(t,[{key:"destroy",value:function(){this.isWorking()&&this.abort(),this._reader&&(this._reader.onprogress=null,this._reader.onload=null,this._reader.onerror=null,this._reader=null),this._xhr&&(this._xhr.onreadystatechange=null,this._xhr=null),o(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),"destroy",this).call(this)}},{key:"open",value:function(e,t){this._internalOpen(e,t,!1)}},{key:"_internalOpen",value:function(e,t,n){this._dataSource=e,n?this._currentRange=t:this._totalRange=t;var i=e.url;this._config.reuseRedirectedURL&&(void 0!=this._currentRedirectedURL?i=this._currentRedirectedURL:void 0!=e.redirectedURL&&(i=e.redirectedURL));var r=this._seekHandler.getConfig(i,t);this._currentRequestURL=r.url;var s=this._reader=new self.MSStreamReader;s.onprogress=this._msrOnProgress.bind(this),s.onload=this._msrOnLoad.bind(this),s.onerror=this._msrOnError.bind(this);var o=this._xhr=new XMLHttpRequest;if(o.open("GET",r.url,!0),o.responseType="ms-stream",o.onreadystatechange=this._xhrOnReadyStateChange.bind(this),o.onerror=this._xhrOnError.bind(this),e.withCredentials&&(o.withCredentials=!0),"object"===a(r.headers)){var u=r.headers;for(var l in u)u.hasOwnProperty(l)&&o.setRequestHeader(l,u[l])}if("object"===a(this._config.headers)){var d=this._config.headers;for(var f in d)d.hasOwnProperty(f)&&o.setRequestHeader(f,d[f])}this._isReconnecting?this._isReconnecting=!1:this._status=h.LoaderStatus.kConnecting,o.send()}},{key:"abort",value:function(){this._internalAbort(),this._status=h.LoaderStatus.kComplete}},{key:"_internalAbort",value:function(){this._reader&&(1===this._reader.readyState&&this._reader.abort(),this._reader.onprogress=null,this._reader.onload=null,this._reader.onerror=null,this._reader=null),this._xhr&&(this._xhr.abort(),this._xhr.onreadystatechange=null,this._xhr=null)}},{key:"_xhrOnReadyStateChange",value:function(e){var t=e.target;if(2===t.readyState)if(t.status>=200&&t.status<=299){if(this._status=h.LoaderStatus.kBuffering,void 0!=t.responseURL){var n=this._seekHandler.removeURLParameters(t.responseURL);t.responseURL!==this._currentRequestURL&&n!==this._currentRedirectedURL&&(this._currentRedirectedURL=n,this._onURLRedirect&&this._onURLRedirect(n))}var i=t.getResponseHeader("Content-Length");if(null!=i&&null==this._contentLength){var r=parseInt(i);r>0&&(this._contentLength=r,this._onContentLengthKnown&&this._onContentLengthKnown(this._contentLength))}}else{if(this._status=h.LoaderStatus.kError,!this._onError)throw new f.RuntimeException("MSStreamLoader: Http code invalid, "+t.status+" "+t.statusText);this._onError(h.LoaderErrors.HTTP_STATUS_CODE_INVALID,{code:t.status,msg:t.statusText})}else if(3===t.readyState&&t.status>=200&&t.status<=299){this._status=h.LoaderStatus.kBuffering;var s=t.response;this._reader.readAsArrayBuffer(s)}}},{key:"_xhrOnError",value:function(e){this._status=h.LoaderStatus.kError;var t=h.LoaderErrors.EXCEPTION,n={code:-1,msg:e.constructor.name+" "+e.type};if(!this._onError)throw new f.RuntimeException(n.msg);this._onError(t,n)}},{key:"_msrOnProgress",value:function(e){var t=e.target,n=t.result;if(null==n)return void this._doReconnectIfNeeded();var i=n.slice(this._lastTimeBufferSize);this._lastTimeBufferSize=n.byteLength;var r=this._totalRange.from+this._receivedLength;this._receivedLength+=i.byteLength,this._onDataArrival&&this._onDataArrival(i,r,this._receivedLength),n.byteLength>=this._bufferLimit&&(d.default.v(this.TAG,"MSStream buffer exceeded max size near "+(r+i.byteLength)+", reconnecting..."),this._doReconnectIfNeeded())}},{key:"_doReconnectIfNeeded",value:function(){if(null==this._contentLength||this._receivedLength<this._contentLength){this._isReconnecting=!0,this._lastTimeBufferSize=0,this._internalAbort();var e={from:this._totalRange.from+this._receivedLength,to:-1};this._internalOpen(this._dataSource,e,!0)}}},{key:"_msrOnLoad",value:function(e){this._status=h.LoaderStatus.kComplete,this._onComplete&&this._onComplete(this._totalRange.from,this._totalRange.from+this._receivedLength-1)}},{key:"_msrOnError",value:function(e){this._status=h.LoaderStatus.kError;var t=0,n=null;if(this._contentLength&&this._receivedLength<this._contentLength?(t=h.LoaderErrors.EARLY_EOF,n={code:-1,msg:"MSStream meet Early-Eof"}):(t=h.LoaderErrors.EARLY_EOF,n={code:-1,msg:e.constructor.name+" "+e.type}),!this._onError)throw new f.RuntimeException(n.msg);this._onError(t,n)}}]),t}(h.BaseLoader);n.default=c},{"../utils/exception.js":40,"../utils/logger.js":41,"./loader.js":24}],31:[function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function s(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(n,"__esModule",{value:!0});var o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},u=function e(t,n,i){null===t&&(t=Function.prototype);var r=Object.getOwnPropertyDescriptor(t,n);if(void 0===r){var s=Object.getPrototypeOf(t);return null===s?void 0:e(s,n,i)}if("value"in r)return r.value;var a=r.get;if(void 0!==a)return a.call(i)},l=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),d=e("../utils/logger.js"),h=i(d),f=e("./speed-sampler.js"),c=i(f),_=e("./loader.js"),m=e("../utils/exception.js"),p=function(e){function t(e,n){r(this,t);var i=s(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,"xhr-range-loader"));return i.TAG="RangeLoader",i._seekHandler=e,i._config=n,i._needStash=!1,i._chunkSizeKBList=[128,256,384,512,768,1024,1536,2048,3072,4096,5120,6144,7168,8192],i._currentChunkSizeKB=384,i._currentSpeedNormalized=0,i._zeroSpeedChunkCount=0,i._xhr=null,i._speedSampler=new c.default,i._requestAbort=!1,i._waitForTotalLength=!1,i._totalLengthReceived=!1,i._currentRequestURL=null,i._currentRedirectedURL=null,i._currentRequestRange=null,i._totalLength=null,i._contentLength=null,i._receivedLength=0,i._lastTimeLoaded=0,i}return a(t,e),l(t,null,[{key:"isSupported",value:function(){try{var e=new XMLHttpRequest;return e.open("GET","https://example.com",!0),e.responseType="arraybuffer","arraybuffer"===e.responseType}catch(e){return h.default.w("RangeLoader",e.message),!1}}}]),l(t,[{key:"destroy",value:function(){this.isWorking()&&this.abort(),this._xhr&&(this._xhr.onreadystatechange=null,this._xhr.onprogress=null,this._xhr.onload=null,this._xhr.onerror=null,this._xhr=null),u(t.prototype.__proto__||Object.getPrototypeOf(t.prototype),"destroy",this).call(this)}},{key:"open",value:function(e,t){this._dataSource=e,this._range=t,this._status=_.LoaderStatus.kConnecting;var n=!1;void 0!=this._dataSource.filesize&&0!==this._dataSource.filesize&&(n=!0,this._totalLength=this._dataSource.filesize),this._totalLengthReceived||n?this._openSubRange():(this._waitForTotalLength=!0,this._internalOpen(this._dataSource,{from:0,to:-1}))}},{key:"_openSubRange",value:function(){var e=1024*this._currentChunkSizeKB,t=this._range.from+this._receivedLength,n=t+e;null!=this._contentLength&&n-this._range.from>=this._contentLength&&(n=this._range.from+this._contentLength-1),this._currentRequestRange={from:t,to:n},this._internalOpen(this._dataSource,this._currentRequestRange)}},{key:"_internalOpen",value:function(e,t){this._lastTimeLoaded=0;var n=e.url;this._config.reuseRedirectedURL&&(void 0!=this._currentRedirectedURL?n=this._currentRedirectedURL:void 0!=e.redirectedURL&&(n=e.redirectedURL));var i=this._seekHandler.getConfig(n,t);this._currentRequestURL=i.url;var r=this._xhr=new XMLHttpRequest;if(r.open("GET",i.url,!0),r.responseType="arraybuffer",r.onreadystatechange=this._onReadyStateChange.bind(this),r.onprogress=this._onProgress.bind(this),r.onload=this._onLoad.bind(this),r.onerror=this._onXhrError.bind(this),e.withCredentials&&(r.withCredentials=!0),"object"===o(i.headers)){var s=i.headers;for(var a in s)s.hasOwnProperty(a)&&r.setRequestHeader(a,s[a])}if("object"===o(this._config.headers)){var u=this._config.headers;for(var l in u)u.hasOwnProperty(l)&&r.setRequestHeader(l,u[l])}r.send()}},{key:"abort",value:function(){this._requestAbort=!0,this._internalAbort(),this._status=_.LoaderStatus.kComplete}},{key:"_internalAbort",value:function(){this._xhr&&(this._xhr.onreadystatechange=null,this._xhr.onprogress=null,this._xhr.onload=null,this._xhr.onerror=null,this._xhr.abort(),this._xhr=null)}},{key:"_onReadyStateChange",value:function(e){var t=e.target;if(2===t.readyState){if(void 0!=t.responseURL){var n=this._seekHandler.removeURLParameters(t.responseURL);t.responseURL!==this._currentRequestURL&&n!==this._currentRedirectedURL&&(this._currentRedirectedURL=n,this._onURLRedirect&&this._onURLRedirect(n))}if(t.status>=200&&t.status<=299){if(this._waitForTotalLength)return;this._status=_.LoaderStatus.kBuffering}else{if(this._status=_.LoaderStatus.kError,!this._onError)throw new m.RuntimeException("RangeLoader: Http code invalid, "+t.status+" "+t.statusText);this._onError(_.LoaderErrors.HTTP_STATUS_CODE_INVALID,{code:t.status,msg:t.statusText})}}}},{key:"_onProgress",value:function(e){if(this._status!==_.LoaderStatus.kError){if(null===this._contentLength){var t=!1;if(this._waitForTotalLength){this._waitForTotalLength=!1,this._totalLengthReceived=!0,t=!0;var n=e.total;this._internalAbort(),null!=n&0!==n&&(this._totalLength=n)}if(-1===this._range.to?this._contentLength=this._totalLength-this._range.from:this._contentLength=this._range.to-this._range.from+1,t)return void this._openSubRange();this._onContentLengthKnown&&this._onContentLengthKnown(this._contentLength)}var i=e.loaded-this._lastTimeLoaded;this._lastTimeLoaded=e.loaded,this._speedSampler.addBytes(i)}}},{key:"_normalizeSpeed",value:function(e){var t=this._chunkSizeKBList,n=t.length-1,i=0,r=0,s=n;if(e<t[0])return t[0];for(;r<=s;){if((i=r+Math.floor((s-r)/2))===n||e>=t[i]&&e<t[i+1])return t[i];t[i]<e?r=i+1:s=i-1}}},{key:"_onLoad",value:function(e){if(this._status!==_.LoaderStatus.kError){if(this._waitForTotalLength)return void(this._waitForTotalLength=!1);this._lastTimeLoaded=0;var t=this._speedSampler.lastSecondKBps;if(0===t&&++this._zeroSpeedChunkCount>=3&&(t=this._speedSampler.currentKBps),0!==t){var n=this._normalizeSpeed(t);this._currentSpeedNormalized!==n&&(this._currentSpeedNormalized=n,this._currentChunkSizeKB=n)}var i=e.target.response,r=this._range.from+this._receivedLength;this._receivedLength+=i.byteLength;var s=!1;null!=this._contentLength&&this._receivedLength<this._contentLength?this._openSubRange():s=!0,this._onDataArrival&&this._onDataArrival(i,r,this._receivedLength),s&&(this._status=_.LoaderStatus.kComplete,this._onComplete&&this._onComplete(this._range.from,this._range.from+this._receivedLength-1))}}},{key:"_onXhrError",value:function(e){this._status=_.LoaderStatus.kError;var t=0,n=null;if(this._contentLength&&this._receivedLength>0&&this._receivedLength<this._contentLength?(t=_.LoaderErrors.EARLY_EOF,n={code:-1,msg:"RangeLoader meet Early-Eof"}):(t=_.LoaderErrors.EXCEPTION,n={code:-1,msg:e.constructor.name+" "+e.type}),!this._onError)throw new m.RuntimeException(n.msg);this._onError(t,n)}},{key:"currentSpeed",get:function(){return this._speedSampler.lastSecondKBps}}]),t}(_.BaseLoader);n.default=p},{"../utils/exception.js":40,"../utils/logger.js":41,"./loader.js":24,"./speed-sampler.js":27}],32:[function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),o=e("events"),u=i(o),l=e("../utils/logger.js"),d=i(l),h=e("../utils/browser.js"),f=i(h),c=e("./player-events.js"),_=i(c),m=e("../core/transmuxer.js"),p=i(m),v=e("../core/transmuxing-events.js"),g=i(v),y=e("../core/mse-controller.js"),E=i(y),b=e("../core/mse-events.js"),S=i(b),k=e("./player-errors.js"),L=e("../config.js"),R=e("../utils/exception.js"),A=function(){function e(t,n){if(r(this,e),this.TAG="FlvPlayer",this._type="FlvPlayer",this._emitter=new u.default,this._config=(0,L.createDefaultConfig)(),"object"===(void 0===n?"undefined":s(n))&&Object.assign(this._config,n),"flv"!==t.type.toLowerCase())throw new R.InvalidArgumentException("FlvPlayer requires an flv MediaDataSource input!");!0===t.isLive&&(this._config.isLive=!0),this.e={onvLoadedMetadata:this._onvLoadedMetadata.bind(this),onvSeeking:this._onvSeeking.bind(this),onvCanPlay:this._onvCanPlay.bind(this),onvStalled:this._onvStalled.bind(this),onvProgress:this._onvProgress.bind(this)},self.performance&&self.performance.now?this._now=self.performance.now.bind(self.performance):this._now=Date.now,this._pendingSeekTime=null,this._requestSetTime=!1,this._seekpointRecord=null,this._progressChecker=null,this._mediaDataSource=t,this._mediaElement=null,this._msectl=null,this._transmuxer=null,this._mseSourceOpened=!1,this._hasPendingLoad=!1,this._receivedCanPlay=!1,this._mediaInfo=null,this._statisticsInfo=null;var i=f.default.chrome&&(f.default.version.major<50||50===f.default.version.major&&f.default.version.build<2661);this._alwaysSeekKeyframe=!!(i||f.default.msedge||f.default.msie),this._alwaysSeekKeyframe&&(this._config.accurateSeek=!1)}return a(e,[{key:"destroy",value:function(){null!=this._progressChecker&&(window.clearInterval(this._progressChecker),this._progressChecker=null),this._transmuxer&&this.unload(),this._mediaElement&&this.detachMediaElement(),this.e=null,this._mediaDataSource=null,this._emitter.removeAllListeners(),this._emitter=null}},{key:"on",value:function(e,t){var n=this;e===_.default.MEDIA_INFO?null!=this._mediaInfo&&Promise.resolve().then(function(){n._emitter.emit(_.default.MEDIA_INFO,n.mediaInfo)}):e===_.default.STATISTICS_INFO&&null!=this._statisticsInfo&&Promise.resolve().then(function(){n._emitter.emit(_.default.STATISTICS_INFO,n.statisticsInfo)}),this._emitter.addListener(e,t)}},{key:"off",value:function(e,t){this._emitter.removeListener(e,t)}},{
+key:"attachMediaElement",value:function(e){var t=this;if(this._mediaElement=e,e.addEventListener("loadedmetadata",this.e.onvLoadedMetadata),e.addEventListener("seeking",this.e.onvSeeking),e.addEventListener("canplay",this.e.onvCanPlay),e.addEventListener("stalled",this.e.onvStalled),e.addEventListener("progress",this.e.onvProgress),this._msectl=new E.default(this._config),this._msectl.on(S.default.UPDATE_END,this._onmseUpdateEnd.bind(this)),this._msectl.on(S.default.BUFFER_FULL,this._onmseBufferFull.bind(this)),this._msectl.on(S.default.SOURCE_OPEN,function(){t._mseSourceOpened=!0,t._hasPendingLoad&&(t._hasPendingLoad=!1,t.load())}),this._msectl.on(S.default.ERROR,function(e){t._emitter.emit(_.default.ERROR,k.ErrorTypes.MEDIA_ERROR,k.ErrorDetails.MEDIA_MSE_ERROR,e)}),this._msectl.attachMediaElement(e),null!=this._pendingSeekTime)try{e.currentTime=this._pendingSeekTime,this._pendingSeekTime=null}catch(e){}}},{key:"detachMediaElement",value:function(){this._mediaElement&&(this._msectl.detachMediaElement(),this._mediaElement.removeEventListener("loadedmetadata",this.e.onvLoadedMetadata),this._mediaElement.removeEventListener("seeking",this.e.onvSeeking),this._mediaElement.removeEventListener("canplay",this.e.onvCanPlay),this._mediaElement.removeEventListener("stalled",this.e.onvStalled),this._mediaElement.removeEventListener("progress",this.e.onvProgress),this._mediaElement=null),this._msectl&&(this._msectl.destroy(),this._msectl=null)}},{key:"load",value:function(){var e=this;if(!this._mediaElement)throw new R.IllegalStateException("HTMLMediaElement must be attached before load()!");if(this._transmuxer)throw new R.IllegalStateException("FlvPlayer.load() has been called, please call unload() first!");if(!this._hasPendingLoad){if(this._config.deferLoadAfterSourceOpen&&!1===this._mseSourceOpened)return void(this._hasPendingLoad=!0);this._mediaElement.readyState>0&&(this._requestSetTime=!0,this._mediaElement.currentTime=0),this._transmuxer=new p.default(this._mediaDataSource,this._config),this._transmuxer.on(g.default.INIT_SEGMENT,function(t,n){e._msectl.appendInitSegment(n)}),this._transmuxer.on(g.default.MEDIA_SEGMENT,function(t,n){if(e._msectl.appendMediaSegment(n),e._config.lazyLoad&&!e._config.isLive){var i=e._mediaElement.currentTime;n.info.endDts>=1e3*(i+e._config.lazyLoadMaxDuration)&&null==e._progressChecker&&(d.default.v(e.TAG,"Maximum buffering duration exceeded, suspend transmuxing task"),e._suspendTransmuxer())}}),this._transmuxer.on(g.default.LOADING_COMPLETE,function(){e._msectl.endOfStream(),e._emitter.emit(_.default.LOADING_COMPLETE)}),this._transmuxer.on(g.default.RECOVERED_EARLY_EOF,function(){e._emitter.emit(_.default.RECOVERED_EARLY_EOF)}),this._transmuxer.on(g.default.IO_ERROR,function(t,n){e._emitter.emit(_.default.ERROR,k.ErrorTypes.NETWORK_ERROR,t,n)}),this._transmuxer.on(g.default.DEMUX_ERROR,function(t,n){e._emitter.emit(_.default.ERROR,k.ErrorTypes.MEDIA_ERROR,t,{code:-1,msg:n})}),this._transmuxer.on(g.default.MEDIA_INFO,function(t){e._mediaInfo=t,e._emitter.emit(_.default.MEDIA_INFO,Object.assign({},t))}),this._transmuxer.on(g.default.METADATA_ARRIVED,function(t){e._emitter.emit(_.default.METADATA_ARRIVED,t)}),this._transmuxer.on(g.default.SCRIPTDATA_ARRIVED,function(t){e._emitter.emit(_.default.SCRIPTDATA_ARRIVED,t)}),this._transmuxer.on(g.default.STATISTICS_INFO,function(t){e._statisticsInfo=e._fillStatisticsInfo(t),e._emitter.emit(_.default.STATISTICS_INFO,Object.assign({},e._statisticsInfo))}),this._transmuxer.on(g.default.RECOMMEND_SEEKPOINT,function(t){e._mediaElement&&!e._config.accurateSeek&&(e._requestSetTime=!0,e._mediaElement.currentTime=t/1e3)}),this._transmuxer.open()}}},{key:"unload",value:function(){this._mediaElement&&this._mediaElement.pause(),this._msectl&&this._msectl.seek(0),this._transmuxer&&(this._transmuxer.close(),this._transmuxer.destroy(),this._transmuxer=null)}},{key:"play",value:function(){return this._mediaElement.play()}},{key:"pause",value:function(){this._mediaElement.pause()}},{key:"_fillStatisticsInfo",value:function(e){if(e.playerType=this._type,!(this._mediaElement instanceof HTMLVideoElement))return e;var t=!0,n=0,i=0;if(this._mediaElement.getVideoPlaybackQuality){var r=this._mediaElement.getVideoPlaybackQuality();n=r.totalVideoFrames,i=r.droppedVideoFrames}else void 0!=this._mediaElement.webkitDecodedFrameCount?(n=this._mediaElement.webkitDecodedFrameCount,i=this._mediaElement.webkitDroppedFrameCount):t=!1;return t&&(e.decodedFrames=n,e.droppedFrames=i),e}},{key:"_onmseUpdateEnd",value:function(){if(this._config.lazyLoad&&!this._config.isLive){for(var e=this._mediaElement.buffered,t=this._mediaElement.currentTime,n=0,i=0;i<e.length;i++){var r=e.start(i),s=e.end(i);if(r<=t&&t<s){r,n=s;break}}n>=t+this._config.lazyLoadMaxDuration&&null==this._progressChecker&&(d.default.v(this.TAG,"Maximum buffering duration exceeded, suspend transmuxing task"),this._suspendTransmuxer())}}},{key:"_onmseBufferFull",value:function(){d.default.v(this.TAG,"MSE SourceBuffer is full, suspend transmuxing task"),null==this._progressChecker&&this._suspendTransmuxer()}},{key:"_suspendTransmuxer",value:function(){this._transmuxer&&(this._transmuxer.pause(),null==this._progressChecker&&(this._progressChecker=window.setInterval(this._checkProgressAndResume.bind(this),1e3)))}},{key:"_checkProgressAndResume",value:function(){for(var e=this._mediaElement.currentTime,t=this._mediaElement.buffered,n=!1,i=0;i<t.length;i++){var r=t.start(i),s=t.end(i);if(e>=r&&e<s){e>=s-this._config.lazyLoadRecoverDuration&&(n=!0);break}}n&&(window.clearInterval(this._progressChecker),this._progressChecker=null,n&&(d.default.v(this.TAG,"Continue loading from paused position"),this._transmuxer.resume()))}},{key:"_isTimepointBuffered",value:function(e){for(var t=this._mediaElement.buffered,n=0;n<t.length;n++){var i=t.start(n),r=t.end(n);if(e>=i&&e<r)return!0}return!1}},{key:"_internalSeek",value:function(e){var t=this._isTimepointBuffered(e),n=!1,i=0;if(e<1&&this._mediaElement.buffered.length>0){var r=this._mediaElement.buffered.start(0);(r<1&&e<r||f.default.safari)&&(n=!0,i=f.default.safari?.1:r)}if(n)this._requestSetTime=!0,this._mediaElement.currentTime=i;else if(t){if(this._alwaysSeekKeyframe){var s=this._msectl.getNearestKeyframe(Math.floor(1e3*e));this._requestSetTime=!0,this._mediaElement.currentTime=null!=s?s.dts/1e3:e}else this._requestSetTime=!0,this._mediaElement.currentTime=e;null!=this._progressChecker&&this._checkProgressAndResume()}else null!=this._progressChecker&&(window.clearInterval(this._progressChecker),this._progressChecker=null),this._msectl.seek(e),this._transmuxer.seek(Math.floor(1e3*e)),this._config.accurateSeek&&(this._requestSetTime=!0,this._mediaElement.currentTime=e)}},{key:"_checkAndApplyUnbufferedSeekpoint",value:function(){if(this._seekpointRecord)if(this._seekpointRecord.recordTime<=this._now()-100){var e=this._mediaElement.currentTime;this._seekpointRecord=null,this._isTimepointBuffered(e)||(null!=this._progressChecker&&(window.clearTimeout(this._progressChecker),this._progressChecker=null),this._msectl.seek(e),this._transmuxer.seek(Math.floor(1e3*e)),this._config.accurateSeek&&(this._requestSetTime=!0,this._mediaElement.currentTime=e))}else window.setTimeout(this._checkAndApplyUnbufferedSeekpoint.bind(this),50)}},{key:"_checkAndResumeStuckPlayback",value:function(e){var t=this._mediaElement;if(e||!this._receivedCanPlay||t.readyState<2){var n=t.buffered;n.length>0&&t.currentTime<n.start(0)&&(d.default.w(this.TAG,"Playback seems stuck at "+t.currentTime+", seek to "+n.start(0)),this._requestSetTime=!0,this._mediaElement.currentTime=n.start(0),this._mediaElement.removeEventListener("progress",this.e.onvProgress))}else this._mediaElement.removeEventListener("progress",this.e.onvProgress)}},{key:"_onvLoadedMetadata",value:function(e){null!=this._pendingSeekTime&&(this._mediaElement.currentTime=this._pendingSeekTime,this._pendingSeekTime=null)}},{key:"_onvSeeking",value:function(e){var t=this._mediaElement.currentTime,n=this._mediaElement.buffered;if(this._requestSetTime)return void(this._requestSetTime=!1);if(t<1&&n.length>0){var i=n.start(0);if(i<1&&t<i||f.default.safari)return this._requestSetTime=!0,void(this._mediaElement.currentTime=f.default.safari?.1:i)}if(this._isTimepointBuffered(t)){if(this._alwaysSeekKeyframe){var r=this._msectl.getNearestKeyframe(Math.floor(1e3*t));null!=r&&(this._requestSetTime=!0,this._mediaElement.currentTime=r.dts/1e3)}return void(null!=this._progressChecker&&this._checkProgressAndResume())}this._seekpointRecord={seekPoint:t,recordTime:this._now()},window.setTimeout(this._checkAndApplyUnbufferedSeekpoint.bind(this),50)}},{key:"_onvCanPlay",value:function(e){this._receivedCanPlay=!0,this._mediaElement.removeEventListener("canplay",this.e.onvCanPlay)}},{key:"_onvStalled",value:function(e){this._checkAndResumeStuckPlayback(!0)}},{key:"_onvProgress",value:function(e){this._checkAndResumeStuckPlayback()}},{key:"type",get:function(){return this._type}},{key:"buffered",get:function(){return this._mediaElement.buffered}},{key:"duration",get:function(){return this._mediaElement.duration}},{key:"volume",get:function(){return this._mediaElement.volume},set:function(e){this._mediaElement.volume=e}},{key:"muted",get:function(){return this._mediaElement.muted},set:function(e){this._mediaElement.muted=e}},{key:"currentTime",get:function(){return this._mediaElement?this._mediaElement.currentTime:0},set:function(e){this._mediaElement?this._internalSeek(e):this._pendingSeekTime=e}},{key:"mediaInfo",get:function(){return Object.assign({},this._mediaInfo)}},{key:"statisticsInfo",get:function(){return null==this._statisticsInfo&&(this._statisticsInfo={}),this._statisticsInfo=this._fillStatisticsInfo(this._statisticsInfo),Object.assign({},this._statisticsInfo)}}]),e}();n.default=A},{"../config.js":5,"../core/mse-controller.js":9,"../core/mse-events.js":10,"../core/transmuxer.js":11,"../core/transmuxing-events.js":13,"../utils/browser.js":39,"../utils/exception.js":40,"../utils/logger.js":41,"./player-errors.js":34,"./player-events.js":35,events:2}],33:[function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),o=e("events"),u=i(o),l=e("./player-events.js"),d=i(l),h=e("../config.js"),f=e("../utils/exception.js"),c=function(){function e(t,n){if(r(this,e),this.TAG="NativePlayer",this._type="NativePlayer",this._emitter=new u.default,this._config=(0,h.createDefaultConfig)(),"object"===(void 0===n?"undefined":s(n))&&Object.assign(this._config,n),"flv"===t.type.toLowerCase())throw new f.InvalidArgumentException("NativePlayer does't support flv MediaDataSource input!");if(t.hasOwnProperty("segments"))throw new f.InvalidArgumentException("NativePlayer("+t.type+") doesn't support multipart playback!");this.e={onvLoadedMetadata:this._onvLoadedMetadata.bind(this)},this._pendingSeekTime=null,this._statisticsReporter=null,this._mediaDataSource=t,this._mediaElement=null}return a(e,[{key:"destroy",value:function(){this._mediaElement&&(this.unload(),this.detachMediaElement()),this.e=null,this._mediaDataSource=null,this._emitter.removeAllListeners(),this._emitter=null}},{key:"on",value:function(e,t){var n=this;e===d.default.MEDIA_INFO?null!=this._mediaElement&&0!==this._mediaElement.readyState&&Promise.resolve().then(function(){n._emitter.emit(d.default.MEDIA_INFO,n.mediaInfo)}):e===d.default.STATISTICS_INFO&&null!=this._mediaElement&&0!==this._mediaElement.readyState&&Promise.resolve().then(function(){n._emitter.emit(d.default.STATISTICS_INFO,n.statisticsInfo)}),this._emitter.addListener(e,t)}},{key:"off",value:function(e,t){this._emitter.removeListener(e,t)}},{key:"attachMediaElement",value:function(e){if(this._mediaElement=e,e.addEventListener("loadedmetadata",this.e.onvLoadedMetadata),null!=this._pendingSeekTime)try{e.currentTime=this._pendingSeekTime,this._pendingSeekTime=null}catch(e){}}},{key:"detachMediaElement",value:function(){this._mediaElement&&(this._mediaElement.src="",this._mediaElement.removeAttribute("src"),this._mediaElement.removeEventListener("loadedmetadata",this.e.onvLoadedMetadata),this._mediaElement=null),null!=this._statisticsReporter&&(window.clearInterval(this._statisticsReporter),this._statisticsReporter=null)}},{key:"load",value:function(){if(!this._mediaElement)throw new f.IllegalStateException("HTMLMediaElement must be attached before load()!");this._mediaElement.src=this._mediaDataSource.url,this._mediaElement.readyState>0&&(this._mediaElement.currentTime=0),this._mediaElement.preload="auto",this._mediaElement.load(),this._statisticsReporter=window.setInterval(this._reportStatisticsInfo.bind(this),this._config.statisticsInfoReportInterval)}},{key:"unload",value:function(){this._mediaElement&&(this._mediaElement.src="",this._mediaElement.removeAttribute("src")),null!=this._statisticsReporter&&(window.clearInterval(this._statisticsReporter),this._statisticsReporter=null)}},{key:"play",value:function(){return this._mediaElement.play()}},{key:"pause",value:function(){this._mediaElement.pause()}},{key:"_onvLoadedMetadata",value:function(e){null!=this._pendingSeekTime&&(this._mediaElement.currentTime=this._pendingSeekTime,this._pendingSeekTime=null),this._emitter.emit(d.default.MEDIA_INFO,this.mediaInfo)}},{key:"_reportStatisticsInfo",value:function(){this._emitter.emit(d.default.STATISTICS_INFO,this.statisticsInfo)}},{key:"type",get:function(){return this._type}},{key:"buffered",get:function(){return this._mediaElement.buffered}},{key:"duration",get:function(){return this._mediaElement.duration}},{key:"volume",get:function(){return this._mediaElement.volume},set:function(e){this._mediaElement.volume=e}},{key:"muted",get:function(){return this._mediaElement.muted},set:function(e){this._mediaElement.muted=e}},{key:"currentTime",get:function(){return this._mediaElement?this._mediaElement.currentTime:0},set:function(e){this._mediaElement?this._mediaElement.currentTime=e:this._pendingSeekTime=e}},{key:"mediaInfo",get:function(){var e=this._mediaElement instanceof HTMLAudioElement?"audio/":"video/",t={mimeType:e+this._mediaDataSource.type};return this._mediaElement&&(t.duration=Math.floor(1e3*this._mediaElement.duration),this._mediaElement instanceof HTMLVideoElement&&(t.width=this._mediaElement.videoWidth,t.height=this._mediaElement.videoHeight)),t}},{key:"statisticsInfo",get:function(){var e={playerType:this._type,url:this._mediaDataSource.url};if(!(this._mediaElement instanceof HTMLVideoElement))return e;var t=!0,n=0,i=0;if(this._mediaElement.getVideoPlaybackQuality){var r=this._mediaElement.getVideoPlaybackQuality();n=r.totalVideoFrames,i=r.droppedVideoFrames}else void 0!=this._mediaElement.webkitDecodedFrameCount?(n=this._mediaElement.webkitDecodedFrameCount,i=this._mediaElement.webkitDroppedFrameCount):t=!1;return t&&(e.decodedFrames=n,e.droppedFrames=i),e}}]),e}();n.default=c},{"../config.js":5,"../utils/exception.js":40,"./player-events.js":35,events:2}],34:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.ErrorDetails=n.ErrorTypes=void 0;var i=e("../io/loader.js"),r=e("../demux/demux-errors.js"),s=function(e){return e&&e.__esModule?e:{default:e}}(r);n.ErrorTypes={NETWORK_ERROR:"NetworkError",MEDIA_ERROR:"MediaError",OTHER_ERROR:"OtherError"},n.ErrorDetails={NETWORK_EXCEPTION:i.LoaderErrors.EXCEPTION,NETWORK_STATUS_CODE_INVALID:i.LoaderErrors.HTTP_STATUS_CODE_INVALID,NETWORK_TIMEOUT:i.LoaderErrors.CONNECTING_TIMEOUT,NETWORK_UNRECOVERABLE_EARLY_EOF:i.LoaderErrors.UNRECOVERABLE_EARLY_EOF,MEDIA_MSE_ERROR:"MediaMSEError",MEDIA_FORMAT_ERROR:s.default.FORMAT_ERROR,MEDIA_FORMAT_UNSUPPORTED:s.default.FORMAT_UNSUPPORTED,MEDIA_CODEC_UNSUPPORTED:s.default.CODEC_UNSUPPORTED}},{"../demux/demux-errors.js":16,"../io/loader.js":24}],35:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var i={ERROR:"error",LOADING_COMPLETE:"loading_complete",RECOVERED_EARLY_EOF:"recovered_early_eof",MEDIA_INFO:"media_info",METADATA_ARRIVED:"metadata_arrived",SCRIPTDATA_ARRIVED:"scriptdata_arrived",STATISTICS_INFO:"statistics_info"};n.default=i},{}],36:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var r=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),s=function(){function e(){i(this,e)}return r(e,null,[{key:"getSilentFrame",value:function(e,t){if("mp4a.40.2"===e){if(1===t)return new Uint8Array([0,200,0,128,35,128]);if(2===t)return new Uint8Array([33,0,73,144,2,25,0,35,128]);if(3===t)return new Uint8Array([0,200,0,128,32,132,1,38,64,8,100,0,142]);if(4===t)return new Uint8Array([0,200,0,128,32,132,1,38,64,8,100,0,128,44,128,8,2,56]);if(5===t)return new Uint8Array([0,200,0,128,32,132,1,38,64,8,100,0,130,48,4,153,0,33,144,2,56]);if(6===t)return new Uint8Array([0,200,0,128,32,132,1,38,64,8,100,0,130,48,4,153,0,33,144,2,0,178,0,32,8,224])}else{if(1===t)return new Uint8Array([1,64,34,128,163,78,230,128,186,8,0,0,0,28,6,241,193,10,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,94]);if(2===t)return new Uint8Array([1,64,34,128,163,94,230,128,186,8,0,0,0,0,149,0,6,241,161,10,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,94]);if(3===t)return new Uint8Array([1,64,34,128,163,94,230,128,186,8,0,0,0,0,149,0,6,241,161,10,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,94])}return null}}]),e}();n.default=s},{}],37:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var r=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),s=function(){function e(){i(this,e)}return r(e,null,[{key:"init",value:function(){e.types={avc1:[],avcC:[],btrt:[],dinf:[],dref:[],esds:[],ftyp:[],hdlr:[],mdat:[],mdhd:[],mdia:[],mfhd:[],minf:[],moof:[],moov:[],mp4a:[],mvex:[],mvhd:[],sdtp:[],stbl:[],stco:[],stsc:[],stsd:[],stsz:[],stts:[],tfdt:[],tfhd:[],traf:[],trak:[],trun:[],trex:[],tkhd:[],vmhd:[],smhd:[],".mp3":[]};for(var t in e.types)e.types.hasOwnProperty(t)&&(e.types[t]=[t.charCodeAt(0),t.charCodeAt(1),t.charCodeAt(2),t.charCodeAt(3)]);var n=e.constants={};n.FTYP=new Uint8Array([105,115,111,109,0,0,0,1,105,115,111,109,97,118,99,49]),n.STSD_PREFIX=new Uint8Array([0,0,0,0,0,0,0,1]),n.STTS=new Uint8Array([0,0,0,0,0,0,0,0]),n.STSC=n.STCO=n.STTS,n.STSZ=new Uint8Array([0,0,0,0,0,0,0,0,0,0,0,0]),n.HDLR_VIDEO=new Uint8Array([0,0,0,0,0,0,0,0,118,105,100,101,0,0,0,0,0,0,0,0,0,0,0,0,86,105,100,101,111,72,97,110,100,108,101,114,0]),n.HDLR_AUDIO=new Uint8Array([0,0,0,0,0,0,0,0,115,111,117,110,0,0,0,0,0,0,0,0,0,0,0,0,83,111,117,110,100,72,97,110,100,108,101,114,0]),n.DREF=new Uint8Array([0,0,0,0,0,0,0,1,0,0,0,12,117,114,108,32,0,0,0,1]),n.SMHD=new Uint8Array([0,0,0,0,0,0,0,0]),n.VMHD=new Uint8Array([0,0,0,1,0,0,0,0,0,0,0,0])}},{key:"box",value:function(e){for(var t=8,n=null,i=Array.prototype.slice.call(arguments,1),r=i.length,s=0;s<r;s++)t+=i[s].byteLength;n=new Uint8Array(t),n[0]=t>>>24&255,n[1]=t>>>16&255,n[2]=t>>>8&255,n[3]=255&t,n.set(e,4);for(var a=8,o=0;o<r;o++)n.set(i[o],a),a+=i[o].byteLength;return n}},{key:"generateInitSegment",value:function(t){var n=e.box(e.types.ftyp,e.constants.FTYP),i=e.moov(t),r=new Uint8Array(n.byteLength+i.byteLength);return r.set(n,0),r.set(i,n.byteLength),r}},{key:"moov",value:function(t){var n=e.mvhd(t.timescale,t.duration),i=e.trak(t),r=e.mvex(t);return e.box(e.types.moov,n,i,r)}},{key:"mvhd",value:function(t,n){return e.box(e.types.mvhd,new Uint8Array([0,0,0,0,0,0,0,0,0,0,0,0,t>>>24&255,t>>>16&255,t>>>8&255,255&t,n>>>24&255,n>>>16&255,n>>>8&255,255&n,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255]))}},{key:"trak",value:function(t){return e.box(e.types.trak,e.tkhd(t),e.mdia(t))}},{key:"tkhd",value:function(t){var n=t.id,i=t.duration,r=t.presentWidth,s=t.presentHeight;return e.box(e.types.tkhd,new Uint8Array([0,0,0,7,0,0,0,0,0,0,0,0,n>>>24&255,n>>>16&255,n>>>8&255,255&n,0,0,0,0,i>>>24&255,i>>>16&255,i>>>8&255,255&i,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,0,0,r>>>8&255,255&r,0,0,s>>>8&255,255&s,0,0]))}},{key:"mdia",value:function(t){return e.box(e.types.mdia,e.mdhd(t),e.hdlr(t),e.minf(t))}},{key:"mdhd",value:function(t){var n=t.timescale,i=t.duration;return e.box(e.types.mdhd,new Uint8Array([0,0,0,0,0,0,0,0,0,0,0,0,n>>>24&255,n>>>16&255,n>>>8&255,255&n,i>>>24&255,i>>>16&255,i>>>8&255,255&i,85,196,0,0]))}},{key:"hdlr",value:function(t){var n=null;return n="audio"===t.type?e.constants.HDLR_AUDIO:e.constants.HDLR_VIDEO,e.box(e.types.hdlr,n)}},{key:"minf",value:function(t){var n=null;return n="audio"===t.type?e.box(e.types.smhd,e.constants.SMHD):e.box(e.types.vmhd,e.constants.VMHD),e.box(e.types.minf,n,e.dinf(),e.stbl(t))}},{key:"dinf",value:function(){return e.box(e.types.dinf,e.box(e.types.dref,e.constants.DREF))}},{key:"stbl",value:function(t){return e.box(e.types.stbl,e.stsd(t),e.box(e.types.stts,e.constants.STTS),e.box(e.types.stsc,e.constants.STSC),e.box(e.types.stsz,e.constants.STSZ),e.box(e.types.stco,e.constants.STCO))}},{key:"stsd",value:function(t){return"audio"===t.type?"mp3"===t.codec?e.box(e.types.stsd,e.constants.STSD_PREFIX,e.mp3(t)):e.box(e.types.stsd,e.constants.STSD_PREFIX,e.mp4a(t)):e.box(e.types.stsd,e.constants.STSD_PREFIX,e.avc1(t))}},{key:"mp3",value:function(t){var n=t.channelCount,i=t.audioSampleRate,r=new Uint8Array([0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,n,0,16,0,0,0,0,i>>>8&255,255&i,0,0]);return e.box(e.types[".mp3"],r)}},{key:"mp4a",value:function(t){var n=t.channelCount,i=t.audioSampleRate,r=new Uint8Array([0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,n,0,16,0,0,0,0,i>>>8&255,255&i,0,0]);return e.box(e.types.mp4a,r,e.esds(t))}},{key:"esds",value:function(t){var n=t.config||[],i=n.length,r=new Uint8Array([0,0,0,0,3,23+i,0,1,0,4,15+i,64,21,0,0,0,0,0,0,0,0,0,0,0,5].concat([i]).concat(n).concat([6,1,2]));return e.box(e.types.esds,r)}},{key:"avc1",value:function(t){var n=t.avcc,i=t.codecWidth,r=t.codecHeight,s=new Uint8Array([0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,i>>>8&255,255&i,r>>>8&255,255&r,0,72,0,0,0,72,0,0,0,0,0,0,0,1,10,120,113,113,47,102,108,118,46,106,115,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,255,255]);return e.box(e.types.avc1,s,e.box(e.types.avcC,n))}},{key:"mvex",value:function(t){return e.box(e.types.mvex,e.trex(t))}},{key:"trex",value:function(t){var n=t.id,i=new Uint8Array([0,0,0,0,n>>>24&255,n>>>16&255,n>>>8&255,255&n,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,1]);return e.box(e.types.trex,i)}},{key:"moof",value:function(t,n){return e.box(e.types.moof,e.mfhd(t.sequenceNumber),e.traf(t,n))}},{key:"mfhd",value:function(t){var n=new Uint8Array([0,0,0,0,t>>>24&255,t>>>16&255,t>>>8&255,255&t]);return e.box(e.types.mfhd,n)}},{key:"traf",value:function(t,n){var i=t.id,r=e.box(e.types.tfhd,new Uint8Array([0,0,0,0,i>>>24&255,i>>>16&255,i>>>8&255,255&i])),s=e.box(e.types.tfdt,new Uint8Array([0,0,0,0,n>>>24&255,n>>>16&255,n>>>8&255,255&n])),a=e.sdtp(t),o=e.trun(t,a.byteLength+16+16+8+16+8+8);return e.box(e.types.traf,r,s,o,a)}},{key:"sdtp",value:function(t){for(var n=t.samples||[],i=n.length,r=new Uint8Array(4+i),s=0;s<i;s++){var a=n[s].flags;r[s+4]=a.isLeading<<6|a.dependsOn<<4|a.isDependedOn<<2|a.hasRedundancy}return e.box(e.types.sdtp,r)}},{key:"trun",value:function(t,n){var i=t.samples||[],r=i.length,s=12+16*r,a=new Uint8Array(s);n+=8+s,a.set([0,0,15,1,r>>>24&255,r>>>16&255,r>>>8&255,255&r,n>>>24&255,n>>>16&255,n>>>8&255,255&n],0);for(var o=0;o<r;o++){var u=i[o].duration,l=i[o].size,d=i[o].flags,h=i[o].cts;a.set([u>>>24&255,u>>>16&255,u>>>8&255,255&u,l>>>24&255,l>>>16&255,l>>>8&255,255&l,d.isLeading<<2|d.dependsOn,d.isDependedOn<<6|d.hasRedundancy<<4|d.isNonSync,0,0,h>>>24&255,h>>>16&255,h>>>8&255,255&h],12+16*o)}return e.box(e.types.trun,a)}},{key:"mdat",value:function(t){return e.box(e.types.mdat,t)}}]),e}();s.init(),n.default=s},{}],38:[function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),a=e("../utils/logger.js"),o=i(a),u=e("./mp4-generator.js"),l=i(u),d=e("./aac-silent.js"),h=i(d),f=e("../utils/browser.js"),c=i(f),_=e("../core/media-segment-info.js"),m=e("../utils/exception.js"),p=function(){function e(t){r(this,e),this.TAG="MP4Remuxer",this._config=t,this._isLive=!0===t.isLive,this._dtsBase=-1,this._dtsBaseInited=!1,this._audioDtsBase=1/0,this._videoDtsBase=1/0,this._audioNextDts=void 0,this._videoNextDts=void 0,this._audioStashedLastSample=null,this._videoStashedLastSample=null,this._audioMeta=null,this._videoMeta=null,this._audioSegmentInfoList=new _.MediaSegmentInfoList("audio"),this._videoSegmentInfoList=new _.MediaSegmentInfoList("video"),this._onInitSegment=null,this._onMediaSegment=null,this._forceFirstIDR=!(!c.default.chrome||!(c.default.version.major<50||50===c.default.version.major&&c.default.version.build<2661)),this._fillSilentAfterSeek=c.default.msedge||c.default.msie,this._mp3UseMpegAudio=!c.default.firefox,this._fillAudioTimestampGap=this._config.fixAudioTimestampGap}return s(e,[{key:"destroy",value:function(){this._dtsBase=-1,this._dtsBaseInited=!1,this._audioMeta=null,this._videoMeta=null,this._audioSegmentInfoList.clear(),this._audioSegmentInfoList=null,this._videoSegmentInfoList.clear(),this._videoSegmentInfoList=null,this._onInitSegment=null,this._onMediaSegment=null}},{key:"bindDataSource",value:function(e){return e.onDataAvailable=this.remux.bind(this),e.onTrackMetadata=this._onTrackMetadataReceived.bind(this),this}},{key:"insertDiscontinuity",value:function(){this._audioNextDts=this._videoNextDts=void 0}},{key:"seek",value:function(e){this._audioStashedLastSample=null,this._videoStashedLastSample=null,this._videoSegmentInfoList.clear(),this._audioSegmentInfoList.clear()}},{key:"remux",value:function(e,t){if(!this._onMediaSegment)throw new m.IllegalStateException("MP4Remuxer: onMediaSegment callback must be specificed!");this._dtsBaseInited||this._calculateDtsBase(e,t),this._remuxVideo(t),this._remuxAudio(e)}},{key:"_onTrackMetadataReceived",value:function(e,t){var n=null,i="mp4",r=t.codec;if("audio"===e)this._audioMeta=t,"mp3"===t.codec&&this._mp3UseMpegAudio?(i="mpeg",r="",n=new Uint8Array):n=l.default.generateInitSegment(t);else{if("video"!==e)return;this._videoMeta=t,n=l.default.generateInitSegment(t)}if(!this._onInitSegment)throw new m.IllegalStateException("MP4Remuxer: onInitSegment callback must be specified!");this._onInitSegment(e,{type:e,data:n.buffer,codec:r,container:e+"/"+i,mediaDuration:t.duration})}},{key:"_calculateDtsBase",value:function(e,t){this._dtsBaseInited||(e.samples&&e.samples.length&&(this._audioDtsBase=e.samples[0].dts),t.samples&&t.samples.length&&(this._videoDtsBase=t.samples[0].dts),this._dtsBase=Math.min(this._audioDtsBase,this._videoDtsBase),this._dtsBaseInited=!0)}},{key:"flushStashedSamples",value:function(){var e=this._videoStashedLastSample,t=this._audioStashedLastSample,n={type:"video",id:1,sequenceNumber:0,samples:[],length:0};null!=e&&(n.samples.push(e),n.length=e.length);var i={type:"audio",id:2,sequenceNumber:0,samples:[],length:0};null!=t&&(i.samples.push(t),i.length=t.length),this._videoStashedLastSample=null,this._audioStashedLastSample=null,this._remuxVideo(n,!0),this._remuxAudio(i,!0)}},{key:"_remuxAudio",value:function(e,t){if(null!=this._audioMeta){var n=e,i=n.samples,r=void 0,s=-1,a=-1,u=this._audioMeta.refSampleDuration,d="mp3"===this._audioMeta.codec&&this._mp3UseMpegAudio,f=this._dtsBaseInited&&void 0===this._audioNextDts,m=!1;if(i&&0!==i.length&&(1!==i.length||t)){var p=0,v=null,g=0;d?(p=0,g=n.length):(p=8,g=8+n.length);var y=null;if(i.length>1&&(y=i.pop(),g-=y.length),null!=this._audioStashedLastSample){var E=this._audioStashedLastSample;this._audioStashedLastSample=null,i.unshift(E),g+=E.length}null!=y&&(this._audioStashedLastSample=y);var b=i[0].dts-this._dtsBase;if(this._audioNextDts)r=b-this._audioNextDts;else if(this._audioSegmentInfoList.isEmpty())r=0,this._fillSilentAfterSeek&&!this._videoSegmentInfoList.isEmpty()&&"mp3"!==this._audioMeta.originalCodec&&(m=!0);else{var S=this._audioSegmentInfoList.getLastSampleBefore(b);if(null!=S){var k=b-(S.originalDts+S.duration);k<=3&&(k=0);var L=S.dts+S.duration+k;r=b-L}else r=0}if(m){var R=b-r,A=this._videoSegmentInfoList.getLastSegmentBefore(b);if(null!=A&&A.beginDts<R){var w=h.default.getSilentFrame(this._audioMeta.originalCodec,this._audioMeta.channelCount);if(w){var T=A.beginDts,O=R-A.beginDts;o.default.v(this.TAG,"InsertPrefixSilentAudio: dts: "+T+", duration: "+O),i.unshift({unit:w,dts:T,pts:T}),g+=w.byteLength}}else m=!1}for(var C=[],I=0;I<i.length;I++){var D=i[I],x=D.unit,M=D.dts-this._dtsBase,B=M-r;-1===s&&(s=B);var j=0;if(I!==i.length-1){j=i[I+1].dts-this._dtsBase-r-B}else if(null!=y){var P=y.dts-this._dtsBase-r;j=P-B}else j=C.length>=1?C[C.length-1].duration:Math.floor(u);var U=!1,N=null;if(j>1.5*u&&"mp3"!==this._audioMeta.codec&&this._fillAudioTimestampGap&&!c.default.safari){U=!0;var F=Math.abs(j-u),G=Math.ceil(F/u),V=B+u;o.default.w(this.TAG,"Large audio timestamp gap detected, may cause AV sync to drift. Silent frames will be generated to avoid unsync.\ndts: "+(B+j)+" ms, expected: "+(B+Math.round(u))+" ms, delta: "+Math.round(F)+" ms, generate: "+G+" frames");var z=h.default.getSilentFrame(this._audioMeta.originalCodec,this._audioMeta.channelCount);null==z&&(o.default.w(this.TAG,"Unable to generate silent frame for "+this._audioMeta.originalCodec+" with "+this._audioMeta.channelCount+" channels, repeat last frame"),z=x),N=[];for(var H=0;H<G;H++){var K=Math.round(V);if(N.length>0){var q=N[N.length-1];q.duration=K-q.dts}var W={dts:K,pts:K,cts:0,unit:z,size:z.byteLength,duration:0,originalDts:M,flags:{isLeading:0,dependsOn:1,isDependedOn:0,hasRedundancy:0}};N.push(W),g+=W.size,V+=u}var X=N[N.length-1];X.duration=B+j-X.dts,j=Math.round(u)}C.push({dts:B,pts:B,cts:0,unit:D.unit,size:D.unit.byteLength,duration:j,originalDts:M,flags:{isLeading:0,dependsOn:1,isDependedOn:0,hasRedundancy:0}}),U&&C.push.apply(C,N)}d?v=new Uint8Array(g):(v=new Uint8Array(g),v[0]=g>>>24&255,v[1]=g>>>16&255,v[2]=g>>>8&255,v[3]=255&g,v.set(l.default.types.mdat,4));for(var Y=0;Y<C.length;Y++){var Z=C[Y].unit;v.set(Z,p),p+=Z.byteLength}var Q=C[C.length-1];a=Q.dts+Q.duration,this._audioNextDts=a;var J=new _.MediaSegmentInfo;J.beginDts=s,J.endDts=a,J.beginPts=s,J.endPts=a,J.originalBeginDts=C[0].originalDts,J.originalEndDts=Q.originalDts+Q.duration,
+J.firstSample=new _.SampleInfo(C[0].dts,C[0].pts,C[0].duration,C[0].originalDts,!1),J.lastSample=new _.SampleInfo(Q.dts,Q.pts,Q.duration,Q.originalDts,!1),this._isLive||this._audioSegmentInfoList.append(J),n.samples=C,n.sequenceNumber++;var $=null;$=d?new Uint8Array:l.default.moof(n,s),n.samples=[],n.length=0;var ee={type:"audio",data:this._mergeBoxes($,v).buffer,sampleCount:C.length,info:J};d&&f&&(ee.timestampOffset=s),this._onMediaSegment("audio",ee)}}}},{key:"_remuxVideo",value:function(e,t){if(null!=this._videoMeta){var n=e,i=n.samples,r=void 0,s=-1,a=-1,o=-1,u=-1;if(i&&0!==i.length&&(1!==i.length||t)){var d=8,h=null,f=8+e.length,c=null;if(i.length>1&&(c=i.pop(),f-=c.length),null!=this._videoStashedLastSample){var m=this._videoStashedLastSample;this._videoStashedLastSample=null,i.unshift(m),f+=m.length}null!=c&&(this._videoStashedLastSample=c);var p=i[0].dts-this._dtsBase;if(this._videoNextDts)r=p-this._videoNextDts;else if(this._videoSegmentInfoList.isEmpty())r=0;else{var v=this._videoSegmentInfoList.getLastSampleBefore(p);if(null!=v){var g=p-(v.originalDts+v.duration);g<=3&&(g=0);var y=v.dts+v.duration+g;r=p-y}else r=0}for(var E=new _.MediaSegmentInfo,b=[],S=0;S<i.length;S++){var k=i[S],L=k.dts-this._dtsBase,R=k.isKeyframe,A=L-r,w=k.cts,T=A+w;-1===s&&(s=A,o=T);var O=0;if(S!==i.length-1){O=i[S+1].dts-this._dtsBase-r-A}else if(null!=c){var C=c.dts-this._dtsBase-r;O=C-A}else O=b.length>=1?b[b.length-1].duration:Math.floor(this._videoMeta.refSampleDuration);if(R){var I=new _.SampleInfo(A,T,O,k.dts,!0);I.fileposition=k.fileposition,E.appendSyncPoint(I)}b.push({dts:A,pts:T,cts:w,units:k.units,size:k.length,isKeyframe:R,duration:O,originalDts:L,flags:{isLeading:0,dependsOn:R?2:1,isDependedOn:R?1:0,hasRedundancy:0,isNonSync:R?0:1}})}h=new Uint8Array(f),h[0]=f>>>24&255,h[1]=f>>>16&255,h[2]=f>>>8&255,h[3]=255&f,h.set(l.default.types.mdat,4);for(var D=0;D<b.length;D++)for(var x=b[D].units;x.length;){var M=x.shift(),B=M.data;h.set(B,d),d+=B.byteLength}var j=b[b.length-1];if(a=j.dts+j.duration,u=j.pts+j.duration,this._videoNextDts=a,E.beginDts=s,E.endDts=a,E.beginPts=o,E.endPts=u,E.originalBeginDts=b[0].originalDts,E.originalEndDts=j.originalDts+j.duration,E.firstSample=new _.SampleInfo(b[0].dts,b[0].pts,b[0].duration,b[0].originalDts,b[0].isKeyframe),E.lastSample=new _.SampleInfo(j.dts,j.pts,j.duration,j.originalDts,j.isKeyframe),this._isLive||this._videoSegmentInfoList.append(E),n.samples=b,n.sequenceNumber++,this._forceFirstIDR){var P=b[0].flags;P.dependsOn=2,P.isNonSync=0}var U=l.default.moof(n,s);n.samples=[],n.length=0,this._onMediaSegment("video",{type:"video",data:this._mergeBoxes(U,h).buffer,sampleCount:b.length,info:E})}}}},{key:"_mergeBoxes",value:function(e,t){var n=new Uint8Array(e.byteLength+t.byteLength);return n.set(e,0),n.set(t,e.byteLength),n}},{key:"onInitSegment",get:function(){return this._onInitSegment},set:function(e){this._onInitSegment=e}},{key:"onMediaSegment",get:function(){return this._onMediaSegment},set:function(e){this._onMediaSegment=e}}]),e}();n.default=p},{"../core/media-segment-info.js":8,"../utils/browser.js":39,"../utils/exception.js":40,"../utils/logger.js":41,"./aac-silent.js":36,"./mp4-generator.js":37}],39:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var i={};!function(){var e=self.navigator.userAgent.toLowerCase(),t=/(edge)\/([\w.]+)/.exec(e)||/(opr)[\/]([\w.]+)/.exec(e)||/(chrome)[ \/]([\w.]+)/.exec(e)||/(iemobile)[\/]([\w.]+)/.exec(e)||/(version)(applewebkit)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+).*(version)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("trident")>=0&&/(rv)(?::| )([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(firefox)[ \/]([\w.]+)/.exec(e)||[],n=/(ipad)/.exec(e)||/(ipod)/.exec(e)||/(windows phone)/.exec(e)||/(iphone)/.exec(e)||/(kindle)/.exec(e)||/(android)/.exec(e)||/(windows)/.exec(e)||/(mac)/.exec(e)||/(linux)/.exec(e)||/(cros)/.exec(e)||[],r={browser:t[5]||t[3]||t[1]||"",version:t[2]||t[4]||"0",majorVersion:t[4]||t[2]||"0",platform:n[0]||""},s={};if(r.browser){s[r.browser]=!0;var a=r.majorVersion.split(".");s.version={major:parseInt(r.majorVersion,10),string:r.version},a.length>1&&(s.version.minor=parseInt(a[1],10)),a.length>2&&(s.version.build=parseInt(a[2],10))}r.platform&&(s[r.platform]=!0),(s.chrome||s.opr||s.safari)&&(s.webkit=!0),(s.rv||s.iemobile)&&(s.rv&&delete s.rv,r.browser="msie",s.msie=!0),s.edge&&(delete s.edge,r.browser="msedge",s.msedge=!0),s.opr&&(r.browser="opera",s.opera=!0),s.safari&&s.android&&(r.browser="android",s.android=!0),s.name=r.browser,s.platform=r.platform;for(var o in i)i.hasOwnProperty(o)&&delete i[o];Object.assign(i,s)}(),n.default=i},{}],40:[function(e,t,n){"use strict";function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function r(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function s(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var a=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),o=n.RuntimeException=function(){function e(t){s(this,e),this._message=t}return a(e,[{key:"toString",value:function(){return this.name+": "+this.message}},{key:"name",get:function(){return"RuntimeException"}},{key:"message",get:function(){return this._message}}]),e}();n.IllegalStateException=function(e){function t(e){return s(this,t),i(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e))}return r(t,e),a(t,[{key:"name",get:function(){return"IllegalStateException"}}]),t}(o),n.InvalidArgumentException=function(e){function t(e){return s(this,t),i(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e))}return r(t,e),a(t,[{key:"name",get:function(){return"InvalidArgumentException"}}]),t}(o),n.NotImplementedException=function(e){function t(e){return s(this,t),i(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e))}return r(t,e),a(t,[{key:"name",get:function(){return"NotImplementedException"}}]),t}(o)},{}],41:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var r=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),s=e("events"),a=function(e){return e&&e.__esModule?e:{default:e}}(s),o=function(){function e(){i(this,e)}return r(e,null,[{key:"e",value:function(t,n){t&&!e.FORCE_GLOBAL_TAG||(t=e.GLOBAL_TAG);var i="["+t+"] > "+n;e.ENABLE_CALLBACK&&e.emitter.emit("log","error",i),e.ENABLE_ERROR&&(console.error?console.error(i):console.warn?console.warn(i):console.log(i))}},{key:"i",value:function(t,n){t&&!e.FORCE_GLOBAL_TAG||(t=e.GLOBAL_TAG);var i="["+t+"] > "+n;e.ENABLE_CALLBACK&&e.emitter.emit("log","info",i),e.ENABLE_INFO&&(console.info?console.info(i):console.log(i))}},{key:"w",value:function(t,n){t&&!e.FORCE_GLOBAL_TAG||(t=e.GLOBAL_TAG);var i="["+t+"] > "+n;e.ENABLE_CALLBACK&&e.emitter.emit("log","warn",i),e.ENABLE_WARN&&(console.warn?console.warn(i):console.log(i))}},{key:"d",value:function(t,n){t&&!e.FORCE_GLOBAL_TAG||(t=e.GLOBAL_TAG);var i="["+t+"] > "+n;e.ENABLE_CALLBACK&&e.emitter.emit("log","debug",i),e.ENABLE_DEBUG&&(console.debug?console.debug(i):console.log(i))}},{key:"v",value:function(t,n){t&&!e.FORCE_GLOBAL_TAG||(t=e.GLOBAL_TAG);var i="["+t+"] > "+n;e.ENABLE_CALLBACK&&e.emitter.emit("log","verbose",i),e.ENABLE_VERBOSE&&console.log(i)}}]),e}();o.GLOBAL_TAG="flv.js",o.FORCE_GLOBAL_TAG=!1,o.ENABLE_ERROR=!0,o.ENABLE_INFO=!0,o.ENABLE_WARN=!0,o.ENABLE_DEBUG=!0,o.ENABLE_VERBOSE=!0,o.ENABLE_CALLBACK=!1,o.emitter=new a.default,n.default=o},{events:2}],42:[function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),a=e("events"),o=i(a),u=e("./logger.js"),l=i(u),d=function(){function e(){r(this,e)}return s(e,null,[{key:"getConfig",value:function(){return{globalTag:l.default.GLOBAL_TAG,forceGlobalTag:l.default.FORCE_GLOBAL_TAG,enableVerbose:l.default.ENABLE_VERBOSE,enableDebug:l.default.ENABLE_DEBUG,enableInfo:l.default.ENABLE_INFO,enableWarn:l.default.ENABLE_WARN,enableError:l.default.ENABLE_ERROR,enableCallback:l.default.ENABLE_CALLBACK}}},{key:"applyConfig",value:function(e){l.default.GLOBAL_TAG=e.globalTag,l.default.FORCE_GLOBAL_TAG=e.forceGlobalTag,l.default.ENABLE_VERBOSE=e.enableVerbose,l.default.ENABLE_DEBUG=e.enableDebug,l.default.ENABLE_INFO=e.enableInfo,l.default.ENABLE_WARN=e.enableWarn,l.default.ENABLE_ERROR=e.enableError,l.default.ENABLE_CALLBACK=e.enableCallback}},{key:"_notifyChange",value:function(){var t=e.emitter;if(t.listenerCount("change")>0){var n=e.getConfig();t.emit("change",n)}}},{key:"registerListener",value:function(t){e.emitter.addListener("change",t)}},{key:"removeListener",value:function(t){e.emitter.removeListener("change",t)}},{key:"addLogListener",value:function(t){l.default.emitter.addListener("log",t),l.default.emitter.listenerCount("log")>0&&(l.default.ENABLE_CALLBACK=!0,e._notifyChange())}},{key:"removeLogListener",value:function(t){l.default.emitter.removeListener("log",t),0===l.default.emitter.listenerCount("log")&&(l.default.ENABLE_CALLBACK=!1,e._notifyChange())}},{key:"forceGlobalTag",get:function(){return l.default.FORCE_GLOBAL_TAG},set:function(t){l.default.FORCE_GLOBAL_TAG=t,e._notifyChange()}},{key:"globalTag",get:function(){return l.default.GLOBAL_TAG},set:function(t){l.default.GLOBAL_TAG=t,e._notifyChange()}},{key:"enableAll",get:function(){return l.default.ENABLE_VERBOSE&&l.default.ENABLE_DEBUG&&l.default.ENABLE_INFO&&l.default.ENABLE_WARN&&l.default.ENABLE_ERROR},set:function(t){l.default.ENABLE_VERBOSE=t,l.default.ENABLE_DEBUG=t,l.default.ENABLE_INFO=t,l.default.ENABLE_WARN=t,l.default.ENABLE_ERROR=t,e._notifyChange()}},{key:"enableDebug",get:function(){return l.default.ENABLE_DEBUG},set:function(t){l.default.ENABLE_DEBUG=t,e._notifyChange()}},{key:"enableVerbose",get:function(){return l.default.ENABLE_VERBOSE},set:function(t){l.default.ENABLE_VERBOSE=t,e._notifyChange()}},{key:"enableInfo",get:function(){return l.default.ENABLE_INFO},set:function(t){l.default.ENABLE_INFO=t,e._notifyChange()}},{key:"enableWarn",get:function(){return l.default.ENABLE_WARN},set:function(t){l.default.ENABLE_WARN=t,e._notifyChange()}},{key:"enableError",get:function(){return l.default.ENABLE_ERROR},set:function(t){l.default.ENABLE_ERROR=t,e._notifyChange()}}]),e}();d.emitter=new o.default,n.default=d},{"./logger.js":41,events:2}],43:[function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(n,"__esModule",{value:!0});var r=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),s=function(){function t(){i(this,t)}return r(t,null,[{key:"install",value:function(){Object.setPrototypeOf=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e},Object.assign=Object.assign||function(e){if(void 0===e||null===e)throw new TypeError("Cannot convert undefined or null to object");for(var t=Object(e),n=1;n<arguments.length;n++){var i=arguments[n];if(void 0!==i&&null!==i)for(var r in i)i.hasOwnProperty(r)&&(t[r]=i[r])}return t},"function"!=typeof self.Promise&&e("es6-promise").polyfill()}}]),t}();s.install(),n.default=s},{"es6-promise":1}],44:[function(e,t,n){"use strict";function i(e,t,n){var i=e;if(t+n<i.length){for(;n--;)if(128!=(192&i[++t]))return!1;return!0}return!1}function r(e){for(var t=[],n=e,r=0,s=e.length;r<s;)if(n[r]<128)t.push(String.fromCharCode(n[r])),++r;else{if(n[r]<192);else if(n[r]<224){if(i(n,r,1)){var a=(31&n[r])<<6|63&n[r+1];if(a>=128){t.push(String.fromCharCode(65535&a)),r+=2;continue}}}else if(n[r]<240){if(i(n,r,2)){var o=(15&n[r])<<12|(63&n[r+1])<<6|63&n[r+2];if(o>=2048&&55296!=(63488&o)){t.push(String.fromCharCode(65535&o)),r+=3;continue}}}else if(n[r]<248&&i(n,r,3)){var u=(7&n[r])<<18|(63&n[r+1])<<12|(63&n[r+2])<<6|63&n[r+3];if(u>65536&&u<1114112){u-=65536,t.push(String.fromCharCode(u>>>10|55296)),t.push(String.fromCharCode(1023&u|56320)),r+=4;continue}}t.push(String.fromCharCode(65533)),++r}return t.join("")}Object.defineProperty(n,"__esModule",{value:!0}),n.default=r},{}]},{},[21])(21)});
+//# sourceMappingURL=flv.min.js.map
diff --git a/public/js/jsFromMiddleLayer/main.js b/public/js/jsFromMiddleLayer/main.js
index 53aaec21..f77f9926 100755
--- a/public/js/jsFromMiddleLayer/main.js
+++ b/public/js/jsFromMiddleLayer/main.js
@@ -13,7 +13,7 @@
  */
 function openTerminal(options) {
     // 为了多个实例能同时存在
-    (function () { 
+    (function () {
         var heartBeatInterval;
         var force_close_socket = false;
         //var CONNECT_TIME = 0; // 请求连接次数
@@ -21,20 +21,21 @@ function openTerminal(options) {
         var parentDomId = options.parentDomId || ''
         var client = new WSSHClient();
         var base64 = new Base64();
-        var term = new Terminal({cols: options.columns, rows: Rows, screenKeys: true, useStyle: true
-        // TODO 默认是canvas，可能被其他样式影响了 canvas用不了
+        var term = new Terminal({
+            cols: options.columns, rows: Rows, screenKeys: true, useStyle: true
+            // TODO 默认是canvas，可能被其他样式影响了 canvas用不了
             , rendererType: 'dom'
             , fontSize: 16
-            });
+        });
         term.on('data', function (data) {
             console.log("xterm data: ");
             console.log(data);
             client.sendClientData(data);
-        
-            window.parent.postMessage({tp: 'sshWorking'}, "*");
+
+            window.parent.postMessage({ tp: 'sshWorking' }, "*");
         });
         term.open();
-        $('body>.terminal').detach().appendTo( parentDomId + ' #term' );
+        $('body>.terminal').detach().appendTo(parentDomId + ' #term');
         $(parentDomId + " #term").show();
         term.write("Connecting...");
         console.log(options)
@@ -43,7 +44,7 @@ function openTerminal(options) {
         //var interTime = setInterval(client_connect, 1000)
         setTimeout(client_connect, 3000);
 
-        heartBeatInterval = setInterval(function(){
+        heartBeatInterval = setInterval(function () {
             client.sendHeartBeat()
         }, 30 * 1000)
         /**
@@ -67,13 +68,13 @@ function openTerminal(options) {
         window.addEventListener("message", function (event) {
             console.log("post message: ");
             console.log(event.data);
-            if(event.data.tp === 'resize'){
+            if (event.data.tp === 'resize') {
                 resizeTerminal(event.data);
             } else if (event.data.tp === 'reload') {
                 window.location.reload()
             } else if (event.data.tp === 'close_ssh_cocket') {
                 force_close_socket = true;  // 强制关闭socket，用于不开启自动重连
-                client && client.close(); 
+                client && client.close();
             }
         }, false);
 
@@ -94,10 +95,9 @@ function openTerminal(options) {
                     term.focus();
                 },
                 onClose: function () {
-                    debugger;
 
                     clearInterval(heartBeatInterval);
-                    
+
                     console.log("连接关闭");
                     term.write("\r\nconnection closed");
                     if (CONNECTED) {
@@ -106,7 +106,7 @@ function openTerminal(options) {
                     }
                     if (force_close_socket === false) {
                         // $(window).trigger('setSSHConnectStatus');
-                        window.parent.postMessage({tp: 'setSSHConnectStatus', tab: options.tab}, "*");
+                        window.parent.postMessage({ tp: 'setSSHConnectStatus', tab: options.tab }, "*");
                     } else {
                         // 主动关闭连接时，不自动重连
                         force_close_socket = false;
@@ -116,10 +116,10 @@ function openTerminal(options) {
                     if (!CONNECTED) {
                         console.log("first connected.");
                         // 问题重现的实训 带代码tab的 命令行实训 https://www.educoder.net/tasks/83hflni9es7tl
-                        setTimeout(function() {
+                        setTimeout(function () {
                             // TODO canvas模式下，没有body
-                            if ( term && term.body && term.body.innerText 
-                                    && term.body.innerText.indexOf('Connecting') != -1 ) {
+                            if (term && term.body && term.body.innerText
+                                && term.body.innerText.indexOf('Connecting') != -1) {
                                 term.clear();   // 有的连上后还出现了“Connecting。。。”
                             }
                         }, 1000)
@@ -179,10 +179,10 @@ function connect() {
         username: $("#username").val(),
         secret: $("#password").val(),
         gameid: $("#gameid").val(),
-        rows: parseInt( $("#terminalRow").val() ),
-        columns: parseInt( $("#terminalColumn").val() ),
-        width: parseInt( $("#terminalWidth").val() ),
-        height: parseInt( $("#terminalHeight").val() ),
+        rows: parseInt($("#terminalRow").val()),
+        columns: parseInt($("#terminalColumn").val()),
+        width: parseInt($("#terminalWidth").val()),
+        height: parseInt($("#terminalHeight").val()),
         tab: $("#terminalTab").val(),
     }
     if (remember) {
diff --git a/public/js/js_min_all.js b/public/js/js_min_all.js
index 497e267b..f05ef117 100755
--- a/public/js/js_min_all.js
+++ b/public/js/js_min_all.js
@@ -7,24 +7,27 @@
  * Details and documentation:
  * https://github.com/paulmillr/es6-shim/
  */
-(function(e,t){if(typeof define==="function"&&define.amd){define(t)}else if(typeof exports==="object"){module.exports=t()}else{e.returnExports=t()}})(this,function(){"use strict";var e=Function.call.bind(Function.apply);var t=Function.call.bind(Function.call);var r=Array.isArray;var n=Object.keys;var o=function notThunker(t){return function notThunk(){return!e(t,this,arguments)}};var i=function(e){try{e();return false}catch(t){return true}};var a=function valueOrFalseIfThrows(e){try{return e()}catch(t){return false}};var u=o(i);var f=function(){return!i(function(){return Object.defineProperty({},"x",{get:function(){}})})};var s=!!Object.defineProperty&&f();var c=function foo(){}.name==="foo";var l=Function.call.bind(Array.prototype.forEach);var p=Function.call.bind(Array.prototype.reduce);var v=Function.call.bind(Array.prototype.filter);var y=Function.call.bind(Array.prototype.some);var h=function(e,t,r,n){if(!n&&t in e){return}if(s){Object.defineProperty(e,t,{configurable:true,enumerable:false,writable:true,value:r})}else{e[t]=r}};var b=function(e,t,r){l(n(t),function(n){var o=t[n];h(e,n,o,!!r)})};var g=Function.call.bind(Object.prototype.toString);var d=typeof/abc/==="function"?function IsCallableSlow(e){return typeof e==="function"&&g(e)==="[object Function]"}:function IsCallableFast(e){return typeof e==="function"};var m={getter:function(e,t,r){if(!s){throw new TypeError("getters require true ES5 support")}Object.defineProperty(e,t,{configurable:true,enumerable:false,get:r})},proxy:function(e,t,r){if(!s){throw new TypeError("getters require true ES5 support")}var n=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(r,t,{configurable:n.configurable,enumerable:n.enumerable,get:function getKey(){return e[t]},set:function setKey(r){e[t]=r}})},redefine:function(e,t,r){if(s){var n=Object.getOwnPropertyDescriptor(e,t);n.value=r;Object.defineProperty(e,t,n)}else{e[t]=r}},defineByDescriptor:function(e,t,r){if(s){Object.defineProperty(e,t,r)}else if("value"in r){e[t]=r.value}},preserveToString:function(e,t){if(t&&d(t.toString)){h(e,"toString",t.toString.bind(t),true)}}};var O=Object.create||function(e,t){var r=function Prototype(){};r.prototype=e;var o=new r;if(typeof t!=="undefined"){n(t).forEach(function(e){m.defineByDescriptor(o,e,t[e])})}return o};var w=function(e,t){if(!Object.setPrototypeOf){return false}return a(function(){var r=function Subclass(t){var r=new e(t);Object.setPrototypeOf(r,Subclass.prototype);return r};Object.setPrototypeOf(r,e);r.prototype=O(e.prototype,{constructor:{value:r}});return t(r)})};var j=function(){if(typeof self!=="undefined"){return self}if(typeof window!=="undefined"){return window}if(typeof global!=="undefined"){return global}throw new Error("unable to locate global object")};var S=j();var T=S.isFinite;var I=Function.call.bind(String.prototype.indexOf);var E=Function.apply.bind(Array.prototype.indexOf);var P=Function.call.bind(Array.prototype.concat);var C=Function.call.bind(String.prototype.slice);var M=Function.call.bind(Array.prototype.push);var x=Function.apply.bind(Array.prototype.push);var N=Function.call.bind(Array.prototype.shift);var A=Math.max;var R=Math.min;var _=Math.floor;var k=Math.abs;var L=Math.exp;var F=Math.log;var D=Math.sqrt;var z=Function.call.bind(Object.prototype.hasOwnProperty);var q;var W=function(){};var G=S.Map;var H=G&&G.prototype["delete"];var V=G&&G.prototype.get;var B=G&&G.prototype.has;var U=G&&G.prototype.set;var $=S.Symbol||{};var J=$.species||"@@species";var X=Number.isNaN||function isNaN(e){return e!==e};var K=Number.isFinite||function isFinite(e){return typeof e==="number"&&T(e)};var Z=d(Math.sign)?Math.sign:function sign(e){var t=Number(e);if(t===0){return t}if(X(t)){return t}return t<0?-1:1};var Y=function log1p(e){var t=Number(e);if(t<-1||X(t)){return NaN}if(t===0||t===Infinity){return t}if(t===-1){return-Infinity}return 1+t-1===0?t:t*(F(1+t)/(1+t-1))};var Q=function isArguments(e){return g(e)==="[object Arguments]"};var ee=function isArguments(e){return e!==null&&typeof e==="object"&&typeof e.length==="number"&&e.length>=0&&g(e)!=="[object Array]"&&g(e.callee)==="[object Function]"};var te=Q(arguments)?Q:ee;var re={primitive:function(e){return e===null||typeof e!=="function"&&typeof e!=="object"},string:function(e){return g(e)==="[object String]"},regex:function(e){return g(e)==="[object RegExp]"},symbol:function(e){return typeof S.Symbol==="function"&&typeof e==="symbol"}};var ne=function overrideNative(e,t,r){var n=e[t];h(e,t,r,true);m.preserveToString(e[t],n)};var oe=typeof $==="function"&&typeof $["for"]==="function"&&re.symbol($());var ie=re.symbol($.iterator)?$.iterator:"_es6-shim iterator_";if(S.Set&&typeof(new S.Set)["@@iterator"]==="function"){ie="@@iterator"}if(!S.Reflect){h(S,"Reflect",{},true)}var ae=S.Reflect;var ue=String;var fe=typeof document==="undefined"||!document?null:document.all;var se=fe==null?function isNullOrUndefined(e){return e==null}:function isNullOrUndefinedAndNotDocumentAll(e){return e==null&&e!==fe};var ce={Call:function Call(t,r){var n=arguments.length>2?arguments[2]:[];if(!ce.IsCallable(t)){throw new TypeError(t+" is not a function")}return e(t,r,n)},RequireObjectCoercible:function(e,t){if(se(e)){throw new TypeError(t||"Cannot call method on "+e)}return e},TypeIsObject:function(e){if(e===void 0||e===null||e===true||e===false){return false}return typeof e==="function"||typeof e==="object"||e===fe},ToObject:function(e,t){return Object(ce.RequireObjectCoercible(e,t))},IsCallable:d,IsConstructor:function(e){return ce.IsCallable(e)},ToInt32:function(e){return ce.ToNumber(e)>>0},ToUint32:function(e){return ce.ToNumber(e)>>>0},ToNumber:function(e){if(g(e)==="[object Symbol]"){throw new TypeError("Cannot convert a Symbol value to a number")}return+e},ToInteger:function(e){var t=ce.ToNumber(e);if(X(t)){return 0}if(t===0||!K(t)){return t}return(t>0?1:-1)*_(k(t))},ToLength:function(e){var t=ce.ToInteger(e);if(t<=0){return 0}if(t>Number.MAX_SAFE_INTEGER){return Number.MAX_SAFE_INTEGER}return t},SameValue:function(e,t){if(e===t){if(e===0){return 1/e===1/t}return true}return X(e)&&X(t)},SameValueZero:function(e,t){return e===t||X(e)&&X(t)},IsIterable:function(e){return ce.TypeIsObject(e)&&(typeof e[ie]!=="undefined"||te(e))},GetIterator:function(e){if(te(e)){return new q(e,"value")}var t=ce.GetMethod(e,ie);if(!ce.IsCallable(t)){throw new TypeError("value is not an iterable")}var r=ce.Call(t,e);if(!ce.TypeIsObject(r)){throw new TypeError("bad iterator")}return r},GetMethod:function(e,t){var r=ce.ToObject(e)[t];if(se(r)){return void 0}if(!ce.IsCallable(r)){throw new TypeError("Method not callable: "+t)}return r},IteratorComplete:function(e){return!!e.done},IteratorClose:function(e,t){var r=ce.GetMethod(e,"return");if(r===void 0){return}var n,o;try{n=ce.Call(r,e)}catch(i){o=i}if(t){return}if(o){throw o}if(!ce.TypeIsObject(n)){throw new TypeError("Iterator's return method returned a non-object.")}},IteratorNext:function(e){var t=arguments.length>1?e.next(arguments[1]):e.next();if(!ce.TypeIsObject(t)){throw new TypeError("bad iterator")}return t},IteratorStep:function(e){var t=ce.IteratorNext(e);var r=ce.IteratorComplete(t);return r?false:t},Construct:function(e,t,r,n){var o=typeof r==="undefined"?e:r;if(!n&&ae.construct){return ae.construct(e,t,o)}var i=o.prototype;if(!ce.TypeIsObject(i)){i=Object.prototype}var a=O(i);var u=ce.Call(e,a,t);return ce.TypeIsObject(u)?u:a},SpeciesConstructor:function(e,t){var r=e.constructor;if(r===void 0){return t}if(!ce.TypeIsObject(r)){throw new TypeError("Bad constructor")}var n=r[J];if(se(n)){return t}if(!ce.IsConstructor(n)){throw new TypeError("Bad @@species")}return n},CreateHTML:function(e,t,r,n){var o=ce.ToString(e);var i="<"+t;if(r!==""){var a=ce.ToString(n);var u=a.replace(/"/g,"&quot;");i+=" "+r+'="'+u+'"'}var f=i+">";var s=f+o;return s+"</"+t+">"},IsRegExp:function IsRegExp(e){if(!ce.TypeIsObject(e)){return false}var t=e[$.match];if(typeof t!=="undefined"){return!!t}return re.regex(e)},ToString:function ToString(e){return ue(e)}};if(s&&oe){var le=function defineWellKnownSymbol(e){if(re.symbol($[e])){return $[e]}var t=$["for"]("Symbol."+e);Object.defineProperty($,e,{configurable:false,enumerable:false,writable:false,value:t});return t};if(!re.symbol($.search)){var pe=le("search");var ve=String.prototype.search;h(RegExp.prototype,pe,function search(e){return ce.Call(ve,e,[this])});var ye=function search(e){var t=ce.RequireObjectCoercible(this);if(!se(e)){var r=ce.GetMethod(e,pe);if(typeof r!=="undefined"){return ce.Call(r,e,[t])}}return ce.Call(ve,t,[ce.ToString(e)])};ne(String.prototype,"search",ye)}if(!re.symbol($.replace)){var he=le("replace");var be=String.prototype.replace;h(RegExp.prototype,he,function replace(e,t){return ce.Call(be,e,[this,t])});var ge=function replace(e,t){var r=ce.RequireObjectCoercible(this);if(!se(e)){var n=ce.GetMethod(e,he);if(typeof n!=="undefined"){return ce.Call(n,e,[r,t])}}return ce.Call(be,r,[ce.ToString(e),t])};ne(String.prototype,"replace",ge)}if(!re.symbol($.split)){var de=le("split");var me=String.prototype.split;h(RegExp.prototype,de,function split(e,t){return ce.Call(me,e,[this,t])});var Oe=function split(e,t){var r=ce.RequireObjectCoercible(this);if(!se(e)){var n=ce.GetMethod(e,de);if(typeof n!=="undefined"){return ce.Call(n,e,[r,t])}}return ce.Call(me,r,[ce.ToString(e),t])};ne(String.prototype,"split",Oe)}var we=re.symbol($.match);var je=we&&function(){var e={};e[$.match]=function(){return 42};return"a".match(e)!==42}();if(!we||je){var Se=le("match");var Te=String.prototype.match;h(RegExp.prototype,Se,function match(e){return ce.Call(Te,e,[this])});var Ie=function match(e){var t=ce.RequireObjectCoercible(this);if(!se(e)){var r=ce.GetMethod(e,Se);if(typeof r!=="undefined"){return ce.Call(r,e,[t])}}return ce.Call(Te,t,[ce.ToString(e)])};ne(String.prototype,"match",Ie)}}var Ee=function wrapConstructor(e,t,r){m.preserveToString(t,e);if(Object.setPrototypeOf){Object.setPrototypeOf(e,t)}if(s){l(Object.getOwnPropertyNames(e),function(n){if(n in W||r[n]){return}m.proxy(e,n,t)})}else{l(Object.keys(e),function(n){if(n in W||r[n]){return}t[n]=e[n]})}t.prototype=e.prototype;m.redefine(e.prototype,"constructor",t)};var Pe=function(){return this};var Ce=function(e){if(s&&!z(e,J)){m.getter(e,J,Pe)}};var Me=function(e,t){var r=t||function iterator(){return this};h(e,ie,r);if(!e[ie]&&re.symbol(ie)){e[ie]=r}};var xe=function createDataProperty(e,t,r){if(s){Object.defineProperty(e,t,{configurable:true,enumerable:true,writable:true,value:r})}else{e[t]=r}};var Ne=function createDataPropertyOrThrow(e,t,r){xe(e,t,r);if(!ce.SameValue(e[t],r)){throw new TypeError("property is nonconfigurable")}};var Ae=function(e,t,r,n){if(!ce.TypeIsObject(e)){throw new TypeError("Constructor requires `new`: "+t.name)}var o=t.prototype;if(!ce.TypeIsObject(o)){o=r}var i=O(o);for(var a in n){if(z(n,a)){var u=n[a];h(i,a,u,true)}}return i};if(String.fromCodePoint&&String.fromCodePoint.length!==1){var Re=String.fromCodePoint;ne(String,"fromCodePoint",function fromCodePoint(e){return ce.Call(Re,this,arguments)})}var _e={fromCodePoint:function fromCodePoint(e){var t=[];var r;for(var n=0,o=arguments.length;n<o;n++){r=Number(arguments[n]);if(!ce.SameValue(r,ce.ToInteger(r))||r<0||r>1114111){throw new RangeError("Invalid code point "+r)}if(r<65536){M(t,String.fromCharCode(r))}else{r-=65536;M(t,String.fromCharCode((r>>10)+55296));M(t,String.fromCharCode(r%1024+56320))}}return t.join("")},raw:function raw(e){var t=ce.ToObject(e,"bad callSite");var r=ce.ToObject(t.raw,"bad raw value");var n=r.length;var o=ce.ToLength(n);if(o<=0){return""}var i=[];var a=0;var u,f,s,c;while(a<o){u=ce.ToString(a);s=ce.ToString(r[u]);M(i,s);if(a+1>=o){break}f=a+1<arguments.length?arguments[a+1]:"";c=ce.ToString(f);M(i,c);a+=1}return i.join("")}};if(String.raw&&String.raw({raw:{0:"x",1:"y",length:2}})!=="xy"){ne(String,"raw",_e.raw)}b(String,_e);var ke=function repeat(e,t){if(t<1){return""}if(t%2){return repeat(e,t-1)+e}var r=repeat(e,t/2);return r+r};var Le=Infinity;var Fe={repeat:function repeat(e){var t=ce.ToString(ce.RequireObjectCoercible(this));var r=ce.ToInteger(e);if(r<0||r>=Le){throw new RangeError("repeat count must be less than infinity and not overflow maximum string size")}return ke(t,r)},startsWith:function startsWith(e){var t=ce.ToString(ce.RequireObjectCoercible(this));if(ce.IsRegExp(e)){throw new TypeError('Cannot call method "startsWith" with a regex')}var r=ce.ToString(e);var n;if(arguments.length>1){n=arguments[1]}var o=A(ce.ToInteger(n),0);return C(t,o,o+r.length)===r},endsWith:function endsWith(e){var t=ce.ToString(ce.RequireObjectCoercible(this));if(ce.IsRegExp(e)){throw new TypeError('Cannot call method "endsWith" with a regex')}var r=ce.ToString(e);var n=t.length;var o;if(arguments.length>1){o=arguments[1]}var i=typeof o==="undefined"?n:ce.ToInteger(o);var a=R(A(i,0),n);return C(t,a-r.length,a)===r},includes:function includes(e){if(ce.IsRegExp(e)){throw new TypeError('"includes" does not accept a RegExp')}var t=ce.ToString(e);var r;if(arguments.length>1){r=arguments[1]}return I(this,t,r)!==-1},codePointAt:function codePointAt(e){var t=ce.ToString(ce.RequireObjectCoercible(this));var r=ce.ToInteger(e);var n=t.length;if(r>=0&&r<n){var o=t.charCodeAt(r);var i=r+1===n;if(o<55296||o>56319||i){return o}var a=t.charCodeAt(r+1);if(a<56320||a>57343){return o}return(o-55296)*1024+(a-56320)+65536}}};if(String.prototype.includes&&"a".includes("a",Infinity)!==false){ne(String.prototype,"includes",Fe.includes)}if(String.prototype.startsWith&&String.prototype.endsWith){var De=i(function(){return"/a/".startsWith(/a/)});var ze=a(function(){return"abc".startsWith("a",Infinity)===false});if(!De||!ze){ne(String.prototype,"startsWith",Fe.startsWith);ne(String.prototype,"endsWith",Fe.endsWith)}}if(oe){var qe=a(function(){var e=/a/;e[$.match]=false;return"/a/".startsWith(e)});if(!qe){ne(String.prototype,"startsWith",Fe.startsWith)}var We=a(function(){var e=/a/;e[$.match]=false;return"/a/".endsWith(e)});if(!We){ne(String.prototype,"endsWith",Fe.endsWith)}var Ge=a(function(){var e=/a/;e[$.match]=false;return"/a/".includes(e)});if(!Ge){ne(String.prototype,"includes",Fe.includes)}}b(String.prototype,Fe);var He=["\t\n\x0B\f\r \xa0\u1680\u180e\u2000\u2001\u2002\u2003","\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028","\u2029\ufeff"].join("");var Ve=new RegExp("(^["+He+"]+)|(["+He+"]+$)","g");var Be=function trim(){return ce.ToString(ce.RequireObjectCoercible(this)).replace(Ve,"")};var Ue=["\x85","\u200b","\ufffe"].join("");var $e=new RegExp("["+Ue+"]","g");var Je=/^[-+]0x[0-9a-f]+$/i;var Xe=Ue.trim().length!==Ue.length;h(String.prototype,"trim",Be,Xe);var Ke=function(e){return{value:e,done:arguments.length===0}};var Ze=function(e){ce.RequireObjectCoercible(e);this._s=ce.ToString(e);this._i=0};Ze.prototype.next=function(){var e=this._s;var t=this._i;if(typeof e==="undefined"||t>=e.length){this._s=void 0;return Ke()}var r=e.charCodeAt(t);var n,o;if(r<55296||r>56319||t+1===e.length){o=1}else{n=e.charCodeAt(t+1);o=n<56320||n>57343?1:2}this._i=t+o;return Ke(e.substr(t,o))};Me(Ze.prototype);Me(String.prototype,function(){return new Ze(this)});var Ye={from:function from(e){var r=this;var n;if(arguments.length>1){n=arguments[1]}var o,i;if(typeof n==="undefined"){o=false}else{if(!ce.IsCallable(n)){throw new TypeError("Array.from: when provided, the second argument must be a function")}if(arguments.length>2){i=arguments[2]}o=true}var a=typeof(te(e)||ce.GetMethod(e,ie))!=="undefined";var u,f,s;if(a){f=ce.IsConstructor(r)?Object(new r):[];var c=ce.GetIterator(e);var l,p;s=0;while(true){l=ce.IteratorStep(c);if(l===false){break}p=l.value;try{if(o){p=typeof i==="undefined"?n(p,s):t(n,i,p,s)}f[s]=p}catch(v){ce.IteratorClose(c,true);throw v}s+=1}u=s}else{var y=ce.ToObject(e);u=ce.ToLength(y.length);f=ce.IsConstructor(r)?Object(new r(u)):new Array(u);var h;for(s=0;s<u;++s){h=y[s];if(o){h=typeof i==="undefined"?n(h,s):t(n,i,h,s)}Ne(f,s,h)}}f.length=u;return f},of:function of(){var e=arguments.length;var t=this;var n=r(t)||!ce.IsCallable(t)?new Array(e):ce.Construct(t,[e]);for(var o=0;o<e;++o){Ne(n,o,arguments[o])}n.length=e;return n}};b(Array,Ye);Ce(Array);q=function(e,t){this.i=0;this.array=e;this.kind=t};b(q.prototype,{next:function(){var e=this.i;var t=this.array;if(!(this instanceof q)){throw new TypeError("Not an ArrayIterator")}if(typeof t!=="undefined"){var r=ce.ToLength(t.length);for(;e<r;e++){var n=this.kind;var o;if(n==="key"){o=e}else if(n==="value"){o=t[e]}else if(n==="entry"){o=[e,t[e]]}this.i=e+1;return Ke(o)}}this.array=void 0;return Ke()}});Me(q.prototype);var Qe=Array.of===Ye.of||function(){var e=function Foo(e){this.length=e};e.prototype=[];var t=Array.of.apply(e,[1,2]);return t instanceof e&&t.length===2}();if(!Qe){ne(Array,"of",Ye.of)}var et={copyWithin:function copyWithin(e,t){var r=ce.ToObject(this);var n=ce.ToLength(r.length);var o=ce.ToInteger(e);var i=ce.ToInteger(t);var a=o<0?A(n+o,0):R(o,n);var u=i<0?A(n+i,0):R(i,n);var f;if(arguments.length>2){f=arguments[2]}var s=typeof f==="undefined"?n:ce.ToInteger(f);var c=s<0?A(n+s,0):R(s,n);var l=R(c-u,n-a);var p=1;if(u<a&&a<u+l){p=-1;u+=l-1;a+=l-1}while(l>0){if(u in r){r[a]=r[u]}else{delete r[a]}u+=p;a+=p;l-=1}return r},fill:function fill(e){var t;if(arguments.length>1){t=arguments[1]}var r;if(arguments.length>2){r=arguments[2]}var n=ce.ToObject(this);var o=ce.ToLength(n.length);t=ce.ToInteger(typeof t==="undefined"?0:t);r=ce.ToInteger(typeof r==="undefined"?o:r);var i=t<0?A(o+t,0):R(t,o);var a=r<0?o+r:r;for(var u=i;u<o&&u<a;++u){n[u]=e}return n},find:function find(e){var r=ce.ToObject(this);var n=ce.ToLength(r.length);if(!ce.IsCallable(e)){throw new TypeError("Array#find: predicate must be a function")}var o=arguments.length>1?arguments[1]:null;for(var i=0,a;i<n;i++){a=r[i];if(o){if(t(e,o,a,i,r)){return a}}else if(e(a,i,r)){return a}}},findIndex:function findIndex(e){var r=ce.ToObject(this);var n=ce.ToLength(r.length);if(!ce.IsCallable(e)){throw new TypeError("Array#findIndex: predicate must be a function")}var o=arguments.length>1?arguments[1]:null;for(var i=0;i<n;i++){if(o){if(t(e,o,r[i],i,r)){return i}}else if(e(r[i],i,r)){return i}}return-1},keys:function keys(){return new q(this,"key")},values:function values(){return new q(this,"value")},entries:function entries(){return new q(this,"entry")}};if(Array.prototype.keys&&!ce.IsCallable([1].keys().next)){delete Array.prototype.keys}if(Array.prototype.entries&&!ce.IsCallable([1].entries().next)){delete Array.prototype.entries}if(Array.prototype.keys&&Array.prototype.entries&&!Array.prototype.values&&Array.prototype[ie]){b(Array.prototype,{values:Array.prototype[ie]});if(re.symbol($.unscopables)){Array.prototype[$.unscopables].values=true}}if(c&&Array.prototype.values&&Array.prototype.values.name!=="values"){var tt=Array.prototype.values;ne(Array.prototype,"values",function values(){return ce.Call(tt,this,arguments)});h(Array.prototype,ie,Array.prototype.values,true)}b(Array.prototype,et);if(1/[true].indexOf(true,-0)<0){h(Array.prototype,"indexOf",function indexOf(e){var t=E(this,arguments);if(t===0&&1/t<0){return 0}return t},true)}Me(Array.prototype,function(){return this.values()});if(Object.getPrototypeOf){Me(Object.getPrototypeOf([].values()))}var rt=function(){return a(function(){return Array.from({length:-1}).length===0})}();var nt=function(){var e=Array.from([0].entries());return e.length===1&&r(e[0])&&e[0][0]===0&&e[0][1]===0}();if(!rt||!nt){ne(Array,"from",Ye.from)}var ot=function(){return a(function(){return Array.from([0],void 0)})}();if(!ot){var it=Array.from;ne(Array,"from",function from(e){if(arguments.length>1&&typeof arguments[1]!=="undefined"){return ce.Call(it,this,arguments)}else{return t(it,this,e)}})}var at=-(Math.pow(2,32)-1);var ut=function(e,r){var n={length:at};n[r?(n.length>>>0)-1:0]=true;return a(function(){t(e,n,function(){throw new RangeError("should not reach here")},[]);return true})};if(!ut(Array.prototype.forEach)){var ft=Array.prototype.forEach;ne(Array.prototype,"forEach",function forEach(e){return ce.Call(ft,this.length>=0?this:[],arguments)},true)}if(!ut(Array.prototype.map)){var st=Array.prototype.map;ne(Array.prototype,"map",function map(e){return ce.Call(st,this.length>=0?this:[],arguments)},true)}if(!ut(Array.prototype.filter)){var ct=Array.prototype.filter;ne(Array.prototype,"filter",function filter(e){return ce.Call(ct,this.length>=0?this:[],arguments)},true)}if(!ut(Array.prototype.some)){var lt=Array.prototype.some;ne(Array.prototype,"some",function some(e){return ce.Call(lt,this.length>=0?this:[],arguments)},true)}if(!ut(Array.prototype.every)){var pt=Array.prototype.every;ne(Array.prototype,"every",function every(e){return ce.Call(pt,this.length>=0?this:[],arguments)},true)}if(!ut(Array.prototype.reduce)){var vt=Array.prototype.reduce;ne(Array.prototype,"reduce",function reduce(e){return ce.Call(vt,this.length>=0?this:[],arguments)},true)}if(!ut(Array.prototype.reduceRight,true)){var yt=Array.prototype.reduceRight;ne(Array.prototype,"reduceRight",function reduceRight(e){return ce.Call(yt,this.length>=0?this:[],arguments)},true)}var ht=Number("0o10")!==8;var bt=Number("0b10")!==2;var gt=y(Ue,function(e){return Number(e+0+e)===0});if(ht||bt||gt){var dt=Number;var mt=/^0b[01]+$/i;var Ot=/^0o[0-7]+$/i;var wt=mt.test.bind(mt);var jt=Ot.test.bind(Ot);var St=function(e){var t;if(typeof e.valueOf==="function"){t=e.valueOf();if(re.primitive(t)){return t}}if(typeof e.toString==="function"){t=e.toString();if(re.primitive(t)){return t}}throw new TypeError("No default value")};var Tt=$e.test.bind($e);var It=Je.test.bind(Je);var Et=function(){var e=function Number(t){var r;if(arguments.length>0){r=re.primitive(t)?t:St(t,"number")}else{r=0}if(typeof r==="string"){r=ce.Call(Be,r);if(wt(r)){r=parseInt(C(r,2),2)}else if(jt(r)){r=parseInt(C(r,2),8)}else if(Tt(r)||It(r)){r=NaN}}var n=this;var o=a(function(){dt.prototype.valueOf.call(n);return true});if(n instanceof e&&!o){return new dt(r)}return dt(r)};return e}();Ee(dt,Et,{});b(Et,{NaN:dt.NaN,MAX_VALUE:dt.MAX_VALUE,MIN_VALUE:dt.MIN_VALUE,NEGATIVE_INFINITY:dt.NEGATIVE_INFINITY,POSITIVE_INFINITY:dt.POSITIVE_INFINITY});Number=Et;m.redefine(S,"Number",Et)}var Pt=Math.pow(2,53)-1;b(Number,{MAX_SAFE_INTEGER:Pt,MIN_SAFE_INTEGER:-Pt,EPSILON:2.220446049250313e-16,parseInt:S.parseInt,parseFloat:S.parseFloat,isFinite:K,isInteger:function isInteger(e){return K(e)&&ce.ToInteger(e)===e},isSafeInteger:function isSafeInteger(e){return Number.isInteger(e)&&k(e)<=Number.MAX_SAFE_INTEGER},isNaN:X});h(Number,"parseInt",S.parseInt,Number.parseInt!==S.parseInt);if([,1].find(function(){return true})===1){ne(Array.prototype,"find",et.find)}if([,1].findIndex(function(){return true})!==0){ne(Array.prototype,"findIndex",et.findIndex)}var Ct=Function.bind.call(Function.bind,Object.prototype.propertyIsEnumerable);var Mt=function ensureEnumerable(e,t){if(s&&Ct(e,t)){Object.defineProperty(e,t,{enumerable:false})}};var xt=function sliceArgs(){var e=Number(this);var t=arguments.length;var r=t-e;var n=new Array(r<0?0:r);for(var o=e;o<t;++o){n[o-e]=arguments[o]}return n};var Nt=function assignTo(e){return function assignToSource(t,r){t[r]=e[r];return t}};var At=function(e,t){var r=n(Object(t));var o;if(ce.IsCallable(Object.getOwnPropertySymbols)){o=v(Object.getOwnPropertySymbols(Object(t)),Ct(t))}return p(P(r,o||[]),Nt(t),e)};var Rt={assign:function(e,t){var r=ce.ToObject(e,"Cannot convert undefined or null to object");return p(ce.Call(xt,1,arguments),At,r)},is:function is(e,t){return ce.SameValue(e,t)}};var _t=Object.assign&&Object.preventExtensions&&function(){var e=Object.preventExtensions({1:2});try{Object.assign(e,"xy")}catch(t){return e[1]==="y"}}();if(_t){ne(Object,"assign",Rt.assign)}b(Object,Rt);if(s){var kt={setPrototypeOf:function(e,r){var n;var o=function(e,t){if(!ce.TypeIsObject(e)){throw new TypeError("cannot set prototype on a non-object")}if(!(t===null||ce.TypeIsObject(t))){throw new TypeError("can only set prototype to an object or null"+t)}};var i=function(e,r){o(e,r);t(n,e,r);return e};try{n=e.getOwnPropertyDescriptor(e.prototype,r).set;t(n,{},null)}catch(a){if(e.prototype!=={}[r]){return}n=function(e){this[r]=e};i.polyfill=i(i({},null),e.prototype)instanceof e}return i}(Object,"__proto__")};b(Object,kt)}if(Object.setPrototypeOf&&Object.getPrototypeOf&&Object.getPrototypeOf(Object.setPrototypeOf({},null))!==null&&Object.getPrototypeOf(Object.create(null))===null){(function(){var e=Object.create(null);var t=Object.getPrototypeOf;var r=Object.setPrototypeOf;Object.getPrototypeOf=function(r){var n=t(r);return n===e?null:n};Object.setPrototypeOf=function(t,n){var o=n===null?e:n;return r(t,o)};Object.setPrototypeOf.polyfill=false})()}var Lt=!i(function(){return Object.keys("foo")});if(!Lt){var Ft=Object.keys;ne(Object,"keys",function keys(e){return Ft(ce.ToObject(e))});n=Object.keys}var Dt=i(function(){return Object.keys(/a/g)});if(Dt){var zt=Object.keys;ne(Object,"keys",function keys(e){if(re.regex(e)){var t=[];for(var r in e){if(z(e,r)){M(t,r)}}return t}return zt(e)});n=Object.keys}if(Object.getOwnPropertyNames){var qt=!i(function(){return Object.getOwnPropertyNames("foo")});if(!qt){var Wt=typeof window==="object"?Object.getOwnPropertyNames(window):[];var Gt=Object.getOwnPropertyNames;ne(Object,"getOwnPropertyNames",function getOwnPropertyNames(e){var t=ce.ToObject(e);if(g(t)==="[object Window]"){try{return Gt(t)}catch(r){return P([],Wt)}}return Gt(t)})}}if(Object.getOwnPropertyDescriptor){var Ht=!i(function(){return Object.getOwnPropertyDescriptor("foo","bar")});if(!Ht){var Vt=Object.getOwnPropertyDescriptor;ne(Object,"getOwnPropertyDescriptor",function getOwnPropertyDescriptor(e,t){return Vt(ce.ToObject(e),t)})}}if(Object.seal){var Bt=!i(function(){return Object.seal("foo")});if(!Bt){var Ut=Object.seal;ne(Object,"seal",function seal(e){if(!ce.TypeIsObject(e)){return e}return Ut(e)})}}if(Object.isSealed){var $t=!i(function(){return Object.isSealed("foo")});if(!$t){var Jt=Object.isSealed;ne(Object,"isSealed",function isSealed(e){if(!ce.TypeIsObject(e)){return true}return Jt(e)})}}if(Object.freeze){var Xt=!i(function(){return Object.freeze("foo")});if(!Xt){var Kt=Object.freeze;ne(Object,"freeze",function freeze(e){if(!ce.TypeIsObject(e)){return e}return Kt(e)})}}if(Object.isFrozen){var Zt=!i(function(){return Object.isFrozen("foo")});if(!Zt){var Yt=Object.isFrozen;ne(Object,"isFrozen",function isFrozen(e){if(!ce.TypeIsObject(e)){return true}return Yt(e)})}}if(Object.preventExtensions){var Qt=!i(function(){return Object.preventExtensions("foo")});if(!Qt){var er=Object.preventExtensions;ne(Object,"preventExtensions",function preventExtensions(e){if(!ce.TypeIsObject(e)){return e}return er(e)})}}if(Object.isExtensible){var tr=!i(function(){return Object.isExtensible("foo")});if(!tr){var rr=Object.isExtensible;ne(Object,"isExtensible",function isExtensible(e){if(!ce.TypeIsObject(e)){return false}return rr(e)})}}if(Object.getPrototypeOf){var nr=!i(function(){return Object.getPrototypeOf("foo")});if(!nr){var or=Object.getPrototypeOf;ne(Object,"getPrototypeOf",function getPrototypeOf(e){return or(ce.ToObject(e))})}}var ir=s&&function(){var e=Object.getOwnPropertyDescriptor(RegExp.prototype,"flags");return e&&ce.IsCallable(e.get)}();if(s&&!ir){var ar=function flags(){if(!ce.TypeIsObject(this)){throw new TypeError("Method called on incompatible type: must be an object.")}var e="";if(this.global){e+="g"}if(this.ignoreCase){e+="i"}if(this.multiline){e+="m"}if(this.unicode){e+="u"}if(this.sticky){e+="y"}return e};m.getter(RegExp.prototype,"flags",ar)}var ur=s&&a(function(){return String(new RegExp(/a/g,"i"))==="/a/i"});var fr=oe&&s&&function(){var e=/./;e[$.match]=false;return RegExp(e)===e}();var sr=a(function(){return RegExp.prototype.toString.call({source:"abc"})==="/abc/"});var cr=sr&&a(function(){return RegExp.prototype.toString.call({source:"a",flags:"b"})==="/a/b"});if(!sr||!cr){var lr=RegExp.prototype.toString;h(RegExp.prototype,"toString",function toString(){var e=ce.RequireObjectCoercible(this);if(re.regex(e)){return t(lr,e)}var r=ue(e.source);var n=ue(e.flags);return"/"+r+"/"+n},true);m.preserveToString(RegExp.prototype.toString,lr)}if(s&&(!ur||fr)){var pr=Object.getOwnPropertyDescriptor(RegExp.prototype,"flags").get;var vr=Object.getOwnPropertyDescriptor(RegExp.prototype,"source")||{};var yr=function(){return this.source};var hr=ce.IsCallable(vr.get)?vr.get:yr;var br=RegExp;var gr=function(){return function RegExp(e,t){var r=ce.IsRegExp(e);var n=this instanceof RegExp;if(!n&&r&&typeof t==="undefined"&&e.constructor===RegExp){return e}var o=e;var i=t;if(re.regex(e)){o=ce.Call(hr,e);i=typeof t==="undefined"?ce.Call(pr,e):t;return new RegExp(o,i)}else if(r){o=e.source;i=typeof t==="undefined"?e.flags:t}return new br(e,t)}}();Ee(br,gr,{$input:true});RegExp=gr;m.redefine(S,"RegExp",gr)}if(s){var dr={input:"$_",lastMatch:"$&",lastParen:"$+",leftContext:"$`",rightContext:"$'"};l(n(dr),function(e){if(e in RegExp&&!(dr[e]in RegExp)){m.getter(RegExp,dr[e],function get(){return RegExp[e]})}})}Ce(RegExp);var mr=1/Number.EPSILON;var Or=function roundTiesToEven(e){return e+mr-mr};var wr=Math.pow(2,-23);var jr=Math.pow(2,127)*(2-wr);var Sr=Math.pow(2,-126);var Tr=Math.E;var Ir=Math.LOG2E;var Er=Math.LOG10E;var Pr=Number.prototype.clz;delete Number.prototype.clz;var Cr={acosh:function acosh(e){var t=Number(e);if(X(t)||e<1){return NaN}if(t===1){return 0}if(t===Infinity){return t}var r=1/(t*t);if(t<2){return Y(t-1+D(1-r)*t)}var n=t/2;return Y(n+D(1-r)*n-1)+1/Ir},asinh:function asinh(e){var t=Number(e);if(t===0||!T(t)){return t}var r=k(t);var n=r*r;var o=Z(t);if(r<1){return o*Y(r+n/(D(n+1)+1))}return o*(Y(r/2+D(1+1/n)*r/2-1)+1/Ir)},atanh:function atanh(e){var t=Number(e);if(t===0){return t}if(t===-1){return-Infinity}if(t===1){return Infinity}if(X(t)||t<-1||t>1){return NaN}var r=k(t);return Z(t)*Y(2*r/(1-r))/2},cbrt:function cbrt(e){var t=Number(e);if(t===0){return t}var r=t<0;var n;if(r){t=-t}if(t===Infinity){n=Infinity}else{n=L(F(t)/3);n=(t/(n*n)+2*n)/3}return r?-n:n},clz32:function clz32(e){var t=Number(e);var r=ce.ToUint32(t);if(r===0){return 32}return Pr?ce.Call(Pr,r):31-_(F(r+.5)*Ir)},cosh:function cosh(e){var t=Number(e);if(t===0){return 1}if(X(t)){return NaN}if(!T(t)){return Infinity}var r=L(k(t)-1);return(r+1/(r*Tr*Tr))*(Tr/2)},expm1:function expm1(e){var t=Number(e);if(t===-Infinity){return-1}if(!T(t)||t===0){return t}if(k(t)>.5){return L(t)-1}var r=t;var n=0;var o=1;while(n+r!==n){n+=r;o+=1;r*=t/o}return n},hypot:function hypot(e,t){var r=0;var n=0;for(var o=0;o<arguments.length;++o){var i=k(Number(arguments[o]));if(n<i){r*=n/i*(n/i);r+=1;n=i}else{r+=i>0?i/n*(i/n):i}}return n===Infinity?Infinity:n*D(r)},log2:function log2(e){return F(e)*Ir},log10:function log10(e){return F(e)*Er},log1p:Y,sign:Z,sinh:function sinh(e){var t=Number(e);if(!T(t)||t===0){return t}var r=k(t);if(r<1){var n=Math.expm1(r);return Z(t)*n*(1+1/(n+1))/2}var o=L(r-1);return Z(t)*(o-1/(o*Tr*Tr))*(Tr/2)},tanh:function tanh(e){var t=Number(e);if(X(t)||t===0){return t}if(t>=20){return 1}if(t<=-20){return-1}return(Math.expm1(t)-Math.expm1(-t))/(L(t)+L(-t))},trunc:function trunc(e){var t=Number(e);return t<0?-_(-t):_(t)},imul:function imul(e,t){var r=ce.ToUint32(e);var n=ce.ToUint32(t);var o=r>>>16&65535;var i=r&65535;var a=n>>>16&65535;var u=n&65535;return i*u+(o*u+i*a<<16>>>0)|0},fround:function fround(e){var t=Number(e);if(t===0||t===Infinity||t===-Infinity||X(t)){return t}var r=Z(t);var n=k(t);if(n<Sr){return r*Or(n/Sr/wr)*Sr*wr}var o=(1+wr/Number.EPSILON)*n;var i=o-(o-n);if(i>jr||X(i)){return r*Infinity}return r*i}};var Mr=function withinULPDistance(e,t,r){return k(1-e/t)/Number.EPSILON<(r||8)};b(Math,Cr);h(Math,"sinh",Cr.sinh,Math.sinh(710)===Infinity);h(Math,"cosh",Cr.cosh,Math.cosh(710)===Infinity);h(Math,"log1p",Cr.log1p,Math.log1p(-1e-17)!==-1e-17);h(Math,"asinh",Cr.asinh,Math.asinh(-1e7)!==-Math.asinh(1e7));h(Math,"asinh",Cr.asinh,Math.asinh(1e300)===Infinity);h(Math,"atanh",Cr.atanh,Math.atanh(1e-300)===0);h(Math,"tanh",Cr.tanh,Math.tanh(-2e-17)!==-2e-17);
-h(Math,"acosh",Cr.acosh,Math.acosh(Number.MAX_VALUE)===Infinity);h(Math,"acosh",Cr.acosh,!Mr(Math.acosh(1+Number.EPSILON),Math.sqrt(2*Number.EPSILON)));h(Math,"cbrt",Cr.cbrt,!Mr(Math.cbrt(1e-300),1e-100));h(Math,"sinh",Cr.sinh,Math.sinh(-2e-17)!==-2e-17);var xr=Math.expm1(10);h(Math,"expm1",Cr.expm1,xr>22025.465794806718||xr<22025.465794806718);var Nr=Math.round;var Ar=Math.round(.5-Number.EPSILON/4)===0&&Math.round(-.5+Number.EPSILON/3.99)===1;var Rr=mr+1;var _r=2*mr-1;var kr=[Rr,_r].every(function(e){return Math.round(e)===e});h(Math,"round",function round(e){var t=_(e);var r=t===-1?-0:t+1;return e-t<.5?t:r},!Ar||!kr);m.preserveToString(Math.round,Nr);var Lr=Math.imul;if(Math.imul(4294967295,5)!==-5){Math.imul=Cr.imul;m.preserveToString(Math.imul,Lr)}if(Math.imul.length!==2){ne(Math,"imul",function imul(e,t){return ce.Call(Lr,Math,arguments)})}var Fr=function(){var e=S.setTimeout;if(typeof e!=="function"&&typeof e!=="object"){return}ce.IsPromise=function(e){if(!ce.TypeIsObject(e)){return false}if(typeof e._promise==="undefined"){return false}return true};var r=function(e){if(!ce.IsConstructor(e)){throw new TypeError("Bad promise constructor")}var t=this;var r=function(e,r){if(t.resolve!==void 0||t.reject!==void 0){throw new TypeError("Bad Promise implementation!")}t.resolve=e;t.reject=r};t.resolve=void 0;t.reject=void 0;t.promise=new e(r);if(!(ce.IsCallable(t.resolve)&&ce.IsCallable(t.reject))){throw new TypeError("Bad promise constructor")}};var n;if(typeof window!=="undefined"&&ce.IsCallable(window.postMessage)){n=function(){var e=[];var t="zero-timeout-message";var r=function(r){M(e,r);window.postMessage(t,"*")};var n=function(r){if(r.source===window&&r.data===t){r.stopPropagation();if(e.length===0){return}var n=N(e);n()}};window.addEventListener("message",n,true);return r}}var o=function(){var e=S.Promise;var t=e&&e.resolve&&e.resolve();return t&&function(e){return t.then(e)}};var i=ce.IsCallable(S.setImmediate)?S.setImmediate:typeof process==="object"&&process.nextTick?process.nextTick:o()||(ce.IsCallable(n)?n():function(t){e(t,0)});var a=function(e){return e};var u=function(e){throw e};var f=0;var s=1;var c=2;var l=0;var p=1;var v=2;var y={};var h=function(e,t,r){i(function(){g(e,t,r)})};var g=function(e,t,r){var n,o;if(t===y){return e(r)}try{n=e(r);o=t.resolve}catch(i){n=i;o=t.reject}o(n)};var d=function(e,t){var r=e._promise;var n=r.reactionLength;if(n>0){h(r.fulfillReactionHandler0,r.reactionCapability0,t);r.fulfillReactionHandler0=void 0;r.rejectReactions0=void 0;r.reactionCapability0=void 0;if(n>1){for(var o=1,i=0;o<n;o++,i+=3){h(r[i+l],r[i+v],t);e[i+l]=void 0;e[i+p]=void 0;e[i+v]=void 0}}}r.result=t;r.state=s;r.reactionLength=0};var m=function(e,t){var r=e._promise;var n=r.reactionLength;if(n>0){h(r.rejectReactionHandler0,r.reactionCapability0,t);r.fulfillReactionHandler0=void 0;r.rejectReactions0=void 0;r.reactionCapability0=void 0;if(n>1){for(var o=1,i=0;o<n;o++,i+=3){h(r[i+p],r[i+v],t);e[i+l]=void 0;e[i+p]=void 0;e[i+v]=void 0}}}r.result=t;r.state=c;r.reactionLength=0};var O=function(e){var t=false;var r=function(r){var n;if(t){return}t=true;if(r===e){return m(e,new TypeError("Self resolution"))}if(!ce.TypeIsObject(r)){return d(e,r)}try{n=r.then}catch(o){return m(e,o)}if(!ce.IsCallable(n)){return d(e,r)}i(function(){j(e,r,n)})};var n=function(r){if(t){return}t=true;return m(e,r)};return{resolve:r,reject:n}};var w=function(e,r,n,o){if(e===I){t(e,r,n,o,y)}else{t(e,r,n,o)}};var j=function(e,t,r){var n=O(e);var o=n.resolve;var i=n.reject;try{w(r,t,o,i)}catch(a){i(a)}};var T,I;var E=function(){var e=function Promise(t){if(!(this instanceof e)){throw new TypeError('Constructor Promise requires "new"')}if(this&&this._promise){throw new TypeError("Bad construction")}if(!ce.IsCallable(t)){throw new TypeError("not a valid resolver")}var r=Ae(this,e,T,{_promise:{result:void 0,state:f,reactionLength:0,fulfillReactionHandler0:void 0,rejectReactionHandler0:void 0,reactionCapability0:void 0}});var n=O(r);var o=n.reject;try{t(n.resolve,o)}catch(i){o(i)}return r};return e}();T=E.prototype;var P=function(e,t,r,n){var o=false;return function(i){if(o){return}o=true;t[e]=i;if(--n.count===0){var a=r.resolve;a(t)}}};var C=function(e,t,r){var n=e.iterator;var o=[];var i={count:1};var a,u;var f=0;while(true){try{a=ce.IteratorStep(n);if(a===false){e.done=true;break}u=a.value}catch(s){e.done=true;throw s}o[f]=void 0;var c=t.resolve(u);var l=P(f,o,r,i);i.count+=1;w(c.then,c,l,r.reject);f+=1}if(--i.count===0){var p=r.resolve;p(o)}return r.promise};var x=function(e,t,r){var n=e.iterator;var o,i,a;while(true){try{o=ce.IteratorStep(n);if(o===false){e.done=true;break}i=o.value}catch(u){e.done=true;throw u}a=t.resolve(i);w(a.then,a,r.resolve,r.reject)}return r.promise};b(E,{all:function all(e){var t=this;if(!ce.TypeIsObject(t)){throw new TypeError("Promise is not object")}var n=new r(t);var o,i;try{o=ce.GetIterator(e);i={iterator:o,done:false};return C(i,t,n)}catch(a){var u=a;if(i&&!i.done){try{ce.IteratorClose(o,true)}catch(f){u=f}}var s=n.reject;s(u);return n.promise}},race:function race(e){var t=this;if(!ce.TypeIsObject(t)){throw new TypeError("Promise is not object")}var n=new r(t);var o,i;try{o=ce.GetIterator(e);i={iterator:o,done:false};return x(i,t,n)}catch(a){var u=a;if(i&&!i.done){try{ce.IteratorClose(o,true)}catch(f){u=f}}var s=n.reject;s(u);return n.promise}},reject:function reject(e){var t=this;if(!ce.TypeIsObject(t)){throw new TypeError("Bad promise constructor")}var n=new r(t);var o=n.reject;o(e);return n.promise},resolve:function resolve(e){var t=this;if(!ce.TypeIsObject(t)){throw new TypeError("Bad promise constructor")}if(ce.IsPromise(e)){var n=e.constructor;if(n===t){return e}}var o=new r(t);var i=o.resolve;i(e);return o.promise}});b(T,{"catch":function(e){return this.then(null,e)},then:function then(e,t){var n=this;if(!ce.IsPromise(n)){throw new TypeError("not a promise")}var o=ce.SpeciesConstructor(n,E);var i;var b=arguments.length>2&&arguments[2]===y;if(b&&o===E){i=y}else{i=new r(o)}var g=ce.IsCallable(e)?e:a;var d=ce.IsCallable(t)?t:u;var m=n._promise;var O;if(m.state===f){if(m.reactionLength===0){m.fulfillReactionHandler0=g;m.rejectReactionHandler0=d;m.reactionCapability0=i}else{var w=3*(m.reactionLength-1);m[w+l]=g;m[w+p]=d;m[w+v]=i}m.reactionLength+=1}else if(m.state===s){O=m.result;h(g,i,O)}else if(m.state===c){O=m.result;h(d,i,O)}else{throw new TypeError("unexpected Promise state")}return i.promise}});y=new r(E);I=T.then;return E}();if(S.Promise){delete S.Promise.accept;delete S.Promise.defer;delete S.Promise.prototype.chain}if(typeof Fr==="function"){b(S,{Promise:Fr});var Dr=w(S.Promise,function(e){return e.resolve(42).then(function(){})instanceof e});var zr=!i(function(){return S.Promise.reject(42).then(null,5).then(null,W)});var qr=i(function(){return S.Promise.call(3,W)});var Wr=function(e){var t=e.resolve(5);t.constructor={};var r=e.resolve(t);try{r.then(null,W).then(null,W)}catch(n){return true}return t===r}(S.Promise);var Gr=s&&function(){var e=0;var t=Object.defineProperty({},"then",{get:function(){e+=1}});Promise.resolve(t);return e===1}();var Hr=function BadResolverPromise(e){var t=new Promise(e);e(3,function(){});this.then=t.then;this.constructor=BadResolverPromise};Hr.prototype=Promise.prototype;Hr.all=Promise.all;var Vr=a(function(){return!!Hr.all([1,2])});if(!Dr||!zr||!qr||Wr||!Gr||Vr){Promise=Fr;ne(S,"Promise",Fr)}if(Promise.all.length!==1){var Br=Promise.all;ne(Promise,"all",function all(e){return ce.Call(Br,this,arguments)})}if(Promise.race.length!==1){var Ur=Promise.race;ne(Promise,"race",function race(e){return ce.Call(Ur,this,arguments)})}if(Promise.resolve.length!==1){var $r=Promise.resolve;ne(Promise,"resolve",function resolve(e){return ce.Call($r,this,arguments)})}if(Promise.reject.length!==1){var Jr=Promise.reject;ne(Promise,"reject",function reject(e){return ce.Call(Jr,this,arguments)})}Mt(Promise,"all");Mt(Promise,"race");Mt(Promise,"resolve");Mt(Promise,"reject");Ce(Promise)}var Xr=function(e){var t=n(p(e,function(e,t){e[t]=true;return e},{}));return e.join(":")===t.join(":")};var Kr=Xr(["z","a","bb"]);var Zr=Xr(["z",1,"a","3",2]);if(s){var Yr=function fastkey(e,t){if(!t&&!Kr){return null}if(se(e)){return"^"+ce.ToString(e)}else if(typeof e==="string"){return"$"+e}else if(typeof e==="number"){if(!Zr){return"n"+e}return e}else if(typeof e==="boolean"){return"b"+e}return null};var Qr=function emptyObject(){return Object.create?Object.create(null):{}};var en=function addIterableToMap(e,n,o){if(r(o)||re.string(o)){l(o,function(e){if(!ce.TypeIsObject(e)){throw new TypeError("Iterator value "+e+" is not an entry object")}n.set(e[0],e[1])})}else if(o instanceof e){t(e.prototype.forEach,o,function(e,t){n.set(t,e)})}else{var i,a;if(!se(o)){a=n.set;if(!ce.IsCallable(a)){throw new TypeError("bad map")}i=ce.GetIterator(o)}if(typeof i!=="undefined"){while(true){var u=ce.IteratorStep(i);if(u===false){break}var f=u.value;try{if(!ce.TypeIsObject(f)){throw new TypeError("Iterator value "+f+" is not an entry object")}t(a,n,f[0],f[1])}catch(s){ce.IteratorClose(i,true);throw s}}}}};var tn=function addIterableToSet(e,n,o){if(r(o)||re.string(o)){l(o,function(e){n.add(e)})}else if(o instanceof e){t(e.prototype.forEach,o,function(e){n.add(e)})}else{var i,a;if(!se(o)){a=n.add;if(!ce.IsCallable(a)){throw new TypeError("bad set")}i=ce.GetIterator(o)}if(typeof i!=="undefined"){while(true){var u=ce.IteratorStep(i);if(u===false){break}var f=u.value;try{t(a,n,f)}catch(s){ce.IteratorClose(i,true);throw s}}}}};var rn={Map:function(){var e={};var r=function MapEntry(e,t){this.key=e;this.value=t;this.next=null;this.prev=null};r.prototype.isRemoved=function isRemoved(){return this.key===e};var n=function isMap(e){return!!e._es6map};var o=function requireMapSlot(e,t){if(!ce.TypeIsObject(e)||!n(e)){throw new TypeError("Method Map.prototype."+t+" called on incompatible receiver "+ce.ToString(e))}};var i=function MapIterator(e,t){o(e,"[[MapIterator]]");this.head=e._head;this.i=this.head;this.kind=t};i.prototype={isMapIterator:true,next:function next(){if(!this.isMapIterator){throw new TypeError("Not a MapIterator")}var e=this.i;var t=this.kind;var r=this.head;if(typeof this.i==="undefined"){return Ke()}while(e.isRemoved()&&e!==r){e=e.prev}var n;while(e.next!==r){e=e.next;if(!e.isRemoved()){if(t==="key"){n=e.key}else if(t==="value"){n=e.value}else{n=[e.key,e.value]}this.i=e;return Ke(n)}}this.i=void 0;return Ke()}};Me(i.prototype);var a;var u=function Map(){if(!(this instanceof Map)){throw new TypeError('Constructor Map requires "new"')}if(this&&this._es6map){throw new TypeError("Bad construction")}var e=Ae(this,Map,a,{_es6map:true,_head:null,_map:G?new G:null,_size:0,_storage:Qr()});var t=new r(null,null);t.next=t.prev=t;e._head=t;if(arguments.length>0){en(Map,e,arguments[0])}return e};a=u.prototype;m.getter(a,"size",function(){if(typeof this._size==="undefined"){throw new TypeError("size method called on incompatible Map")}return this._size});b(a,{get:function get(e){o(this,"get");var t;var r=Yr(e,true);if(r!==null){t=this._storage[r];if(t){return t.value}else{return}}if(this._map){t=V.call(this._map,e);if(t){return t.value}else{return}}var n=this._head;var i=n;while((i=i.next)!==n){if(ce.SameValueZero(i.key,e)){return i.value}}},has:function has(e){o(this,"has");var t=Yr(e,true);if(t!==null){return typeof this._storage[t]!=="undefined"}if(this._map){return B.call(this._map,e)}var r=this._head;var n=r;while((n=n.next)!==r){if(ce.SameValueZero(n.key,e)){return true}}return false},set:function set(e,t){o(this,"set");var n=this._head;var i=n;var a;var u=Yr(e,true);if(u!==null){if(typeof this._storage[u]!=="undefined"){this._storage[u].value=t;return this}else{a=this._storage[u]=new r(e,t);i=n.prev}}else if(this._map){if(B.call(this._map,e)){V.call(this._map,e).value=t}else{a=new r(e,t);U.call(this._map,e,a);i=n.prev}}while((i=i.next)!==n){if(ce.SameValueZero(i.key,e)){i.value=t;return this}}a=a||new r(e,t);if(ce.SameValue(-0,e)){a.key=+0}a.next=this._head;a.prev=this._head.prev;a.prev.next=a;a.next.prev=a;this._size+=1;return this},"delete":function(t){o(this,"delete");var r=this._head;var n=r;var i=Yr(t,true);if(i!==null){if(typeof this._storage[i]==="undefined"){return false}n=this._storage[i].prev;delete this._storage[i]}else if(this._map){if(!B.call(this._map,t)){return false}n=V.call(this._map,t).prev;H.call(this._map,t)}while((n=n.next)!==r){if(ce.SameValueZero(n.key,t)){n.key=e;n.value=e;n.prev.next=n.next;n.next.prev=n.prev;this._size-=1;return true}}return false},clear:function clear(){o(this,"clear");this._map=G?new G:null;this._size=0;this._storage=Qr();var t=this._head;var r=t;var n=r.next;while((r=n)!==t){r.key=e;r.value=e;n=r.next;r.next=r.prev=t}t.next=t.prev=t},keys:function keys(){o(this,"keys");return new i(this,"key")},values:function values(){o(this,"values");return new i(this,"value")},entries:function entries(){o(this,"entries");return new i(this,"key+value")},forEach:function forEach(e){o(this,"forEach");var r=arguments.length>1?arguments[1]:null;var n=this.entries();for(var i=n.next();!i.done;i=n.next()){if(r){t(e,r,i.value[1],i.value[0],this)}else{e(i.value[1],i.value[0],this)}}}});Me(a,a.entries);return u}(),Set:function(){var e=function isSet(e){return e._es6set&&typeof e._storage!=="undefined"};var r=function requireSetSlot(t,r){if(!ce.TypeIsObject(t)||!e(t)){throw new TypeError("Set.prototype."+r+" called on incompatible receiver "+ce.ToString(t))}};var o;var i=function Set(){if(!(this instanceof Set)){throw new TypeError('Constructor Set requires "new"')}if(this&&this._es6set){throw new TypeError("Bad construction")}var e=Ae(this,Set,o,{_es6set:true,"[[SetData]]":null,_storage:Qr()});if(!e._es6set){throw new TypeError("bad set")}if(arguments.length>0){tn(Set,e,arguments[0])}return e};o=i.prototype;var a=function(e){var t=e;if(t==="^null"){return null}else if(t==="^undefined"){return void 0}else{var r=t.charAt(0);if(r==="$"){return C(t,1)}else if(r==="n"){return+C(t,1)}else if(r==="b"){return t==="btrue"}}return+t};var u=function ensureMap(e){if(!e["[[SetData]]"]){var t=new rn.Map;e["[[SetData]]"]=t;l(n(e._storage),function(e){var r=a(e);t.set(r,r)});e["[[SetData]]"]=t}e._storage=null};m.getter(i.prototype,"size",function(){r(this,"size");if(this._storage){return n(this._storage).length}u(this);return this["[[SetData]]"].size});b(i.prototype,{has:function has(e){r(this,"has");var t;if(this._storage&&(t=Yr(e))!==null){return!!this._storage[t]}u(this);return this["[[SetData]]"].has(e)},add:function add(e){r(this,"add");var t;if(this._storage&&(t=Yr(e))!==null){this._storage[t]=true;return this}u(this);this["[[SetData]]"].set(e,e);return this},"delete":function(e){r(this,"delete");var t;if(this._storage&&(t=Yr(e))!==null){var n=z(this._storage,t);return delete this._storage[t]&&n}u(this);return this["[[SetData]]"]["delete"](e)},clear:function clear(){r(this,"clear");if(this._storage){this._storage=Qr()}if(this["[[SetData]]"]){this["[[SetData]]"].clear()}},values:function values(){r(this,"values");u(this);return new f(this["[[SetData]]"].values())},entries:function entries(){r(this,"entries");u(this);return new f(this["[[SetData]]"].entries())},forEach:function forEach(e){r(this,"forEach");var n=arguments.length>1?arguments[1]:null;var o=this;u(o);this["[[SetData]]"].forEach(function(r,i){if(n){t(e,n,i,i,o)}else{e(i,i,o)}})}});h(i.prototype,"keys",i.prototype.values,true);Me(i.prototype,i.prototype.values);var f=function SetIterator(e){this.it=e};f.prototype={isSetIterator:true,next:function next(){if(!this.isSetIterator){throw new TypeError("Not a SetIterator")}return this.it.next()}};Me(f.prototype);return i}()};var nn=S.Set&&!Set.prototype["delete"]&&Set.prototype.remove&&Set.prototype.items&&Set.prototype.map&&Array.isArray((new Set).keys);if(nn){S.Set=rn.Set}if(S.Map||S.Set){var on=a(function(){return new Map([[1,2]]).get(1)===2});if(!on){S.Map=function Map(){if(!(this instanceof Map)){throw new TypeError('Constructor Map requires "new"')}var e=new G;if(arguments.length>0){en(Map,e,arguments[0])}delete e.constructor;Object.setPrototypeOf(e,S.Map.prototype);return e};S.Map.prototype=O(G.prototype);h(S.Map.prototype,"constructor",S.Map,true);m.preserveToString(S.Map,G)}var an=new Map;var un=function(){var e=new Map([[1,0],[2,0],[3,0],[4,0]]);e.set(-0,e);return e.get(0)===e&&e.get(-0)===e&&e.has(0)&&e.has(-0)}();var fn=an.set(1,2)===an;if(!un||!fn){ne(Map.prototype,"set",function set(e,r){t(U,this,e===0?0:e,r);return this})}if(!un){b(Map.prototype,{get:function get(e){return t(V,this,e===0?0:e)},has:function has(e){return t(B,this,e===0?0:e)}},true);m.preserveToString(Map.prototype.get,V);m.preserveToString(Map.prototype.has,B)}var sn=new Set;var cn=Set.prototype["delete"]&&Set.prototype.add&&Set.prototype.has&&function(e){e["delete"](0);e.add(-0);return!e.has(0)}(sn);var ln=sn.add(1)===sn;if(!cn||!ln){var pn=Set.prototype.add;Set.prototype.add=function add(e){t(pn,this,e===0?0:e);return this};m.preserveToString(Set.prototype.add,pn)}if(!cn){var vn=Set.prototype.has;Set.prototype.has=function has(e){return t(vn,this,e===0?0:e)};m.preserveToString(Set.prototype.has,vn);var yn=Set.prototype["delete"];Set.prototype["delete"]=function SetDelete(e){return t(yn,this,e===0?0:e)};m.preserveToString(Set.prototype["delete"],yn)}var hn=w(S.Map,function(e){var t=new e([]);t.set(42,42);return t instanceof e});var bn=Object.setPrototypeOf&&!hn;var gn=function(){try{return!(S.Map()instanceof S.Map)}catch(e){return e instanceof TypeError}}();if(S.Map.length!==0||bn||!gn){S.Map=function Map(){if(!(this instanceof Map)){throw new TypeError('Constructor Map requires "new"')}var e=new G;if(arguments.length>0){en(Map,e,arguments[0])}delete e.constructor;Object.setPrototypeOf(e,Map.prototype);return e};S.Map.prototype=G.prototype;h(S.Map.prototype,"constructor",S.Map,true);m.preserveToString(S.Map,G)}var dn=w(S.Set,function(e){var t=new e([]);t.add(42,42);return t instanceof e});var mn=Object.setPrototypeOf&&!dn;var On=function(){try{return!(S.Set()instanceof S.Set)}catch(e){return e instanceof TypeError}}();if(S.Set.length!==0||mn||!On){var wn=S.Set;S.Set=function Set(){if(!(this instanceof Set)){throw new TypeError('Constructor Set requires "new"')}var e=new wn;if(arguments.length>0){tn(Set,e,arguments[0])}delete e.constructor;Object.setPrototypeOf(e,Set.prototype);return e};S.Set.prototype=wn.prototype;h(S.Set.prototype,"constructor",S.Set,true);m.preserveToString(S.Set,wn)}var jn=new S.Map;var Sn=!a(function(){return jn.keys().next().done});if(typeof S.Map.prototype.clear!=="function"||(new S.Set).size!==0||jn.size!==0||typeof S.Map.prototype.keys!=="function"||typeof S.Set.prototype.keys!=="function"||typeof S.Map.prototype.forEach!=="function"||typeof S.Set.prototype.forEach!=="function"||u(S.Map)||u(S.Set)||typeof jn.keys().next!=="function"||Sn||!hn){b(S,{Map:rn.Map,Set:rn.Set},true)}if(S.Set.prototype.keys!==S.Set.prototype.values){h(S.Set.prototype,"keys",S.Set.prototype.values,true)}Me(Object.getPrototypeOf((new S.Map).keys()));Me(Object.getPrototypeOf((new S.Set).keys()));if(c&&S.Set.prototype.has.name!=="has"){var Tn=S.Set.prototype.has;ne(S.Set.prototype,"has",function has(e){return t(Tn,this,e)})}}b(S,rn);Ce(S.Map);Ce(S.Set)}var In=function throwUnlessTargetIsObject(e){if(!ce.TypeIsObject(e)){throw new TypeError("target must be an object")}};var En={apply:function apply(){return ce.Call(ce.Call,null,arguments)},construct:function construct(e,t){if(!ce.IsConstructor(e)){throw new TypeError("First argument must be a constructor.")}var r=arguments.length>2?arguments[2]:e;if(!ce.IsConstructor(r)){throw new TypeError("new.target must be a constructor.")}return ce.Construct(e,t,r,"internal")},deleteProperty:function deleteProperty(e,t){In(e);if(s){var r=Object.getOwnPropertyDescriptor(e,t);if(r&&!r.configurable){return false}}return delete e[t]},has:function has(e,t){In(e);return t in e}};if(Object.getOwnPropertyNames){Object.assign(En,{ownKeys:function ownKeys(e){In(e);var t=Object.getOwnPropertyNames(e);if(ce.IsCallable(Object.getOwnPropertySymbols)){x(t,Object.getOwnPropertySymbols(e))}return t}})}var Pn=function ConvertExceptionToBoolean(e){return!i(e)};if(Object.preventExtensions){Object.assign(En,{isExtensible:function isExtensible(e){In(e);return Object.isExtensible(e)},preventExtensions:function preventExtensions(e){In(e);return Pn(function(){return Object.preventExtensions(e)})}})}if(s){var Cn=function get(e,t,r){var n=Object.getOwnPropertyDescriptor(e,t);if(!n){var o=Object.getPrototypeOf(e);if(o===null){return void 0}return Cn(o,t,r)}if("value"in n){return n.value}if(n.get){return ce.Call(n.get,r)}return void 0};var Mn=function set(e,r,n,o){var i=Object.getOwnPropertyDescriptor(e,r);if(!i){var a=Object.getPrototypeOf(e);if(a!==null){return Mn(a,r,n,o)}i={value:void 0,writable:true,enumerable:true,configurable:true}}if("value"in i){if(!i.writable){return false}if(!ce.TypeIsObject(o)){return false}var u=Object.getOwnPropertyDescriptor(o,r);if(u){return ae.defineProperty(o,r,{value:n})}else{return ae.defineProperty(o,r,{value:n,writable:true,enumerable:true,configurable:true})}}if(i.set){t(i.set,o,n);return true}return false};Object.assign(En,{defineProperty:function defineProperty(e,t,r){In(e);return Pn(function(){return Object.defineProperty(e,t,r)})},getOwnPropertyDescriptor:function getOwnPropertyDescriptor(e,t){In(e);return Object.getOwnPropertyDescriptor(e,t)},get:function get(e,t){In(e);var r=arguments.length>2?arguments[2]:e;return Cn(e,t,r)},set:function set(e,t,r){In(e);var n=arguments.length>3?arguments[3]:e;return Mn(e,t,r,n)}})}if(Object.getPrototypeOf){var xn=Object.getPrototypeOf;En.getPrototypeOf=function getPrototypeOf(e){In(e);return xn(e)}}if(Object.setPrototypeOf&&En.getPrototypeOf){var Nn=function(e,t){var r=t;while(r){if(e===r){return true}r=En.getPrototypeOf(r)}return false};Object.assign(En,{setPrototypeOf:function setPrototypeOf(e,t){In(e);if(t!==null&&!ce.TypeIsObject(t)){throw new TypeError("proto must be an object or null")}if(t===ae.getPrototypeOf(e)){return true}if(ae.isExtensible&&!ae.isExtensible(e)){return false}if(Nn(e,t)){return false}Object.setPrototypeOf(e,t);return true}})}var An=function(e,t){if(!ce.IsCallable(S.Reflect[e])){h(S.Reflect,e,t)}else{var r=a(function(){S.Reflect[e](1);S.Reflect[e](NaN);S.Reflect[e](true);return true});if(r){ne(S.Reflect,e,t)}}};Object.keys(En).forEach(function(e){An(e,En[e])});var Rn=S.Reflect.getPrototypeOf;if(c&&Rn&&Rn.name!=="getPrototypeOf"){ne(S.Reflect,"getPrototypeOf",function getPrototypeOf(e){return t(Rn,S.Reflect,e)})}if(S.Reflect.setPrototypeOf){if(a(function(){S.Reflect.setPrototypeOf(1,{});return true})){ne(S.Reflect,"setPrototypeOf",En.setPrototypeOf)}}if(S.Reflect.defineProperty){if(!a(function(){var e=!S.Reflect.defineProperty(1,"test",{value:1});var t=typeof Object.preventExtensions!=="function"||!S.Reflect.defineProperty(Object.preventExtensions({}),"test",{});return e&&t})){ne(S.Reflect,"defineProperty",En.defineProperty)}}if(S.Reflect.construct){if(!a(function(){var e=function F(){};return S.Reflect.construct(function(){},[],e)instanceof e})){ne(S.Reflect,"construct",En.construct)}}if(String(new Date(NaN))!=="Invalid Date"){var _n=Date.prototype.toString;var kn=function toString(){var e=+this;if(e!==e){return"Invalid Date"}return ce.Call(_n,this)};ne(Date.prototype,"toString",kn)}var Ln={anchor:function anchor(e){return ce.CreateHTML(this,"a","name",e)},big:function big(){return ce.CreateHTML(this,"big","","")},blink:function blink(){return ce.CreateHTML(this,"blink","","")},bold:function bold(){return ce.CreateHTML(this,"b","","")},fixed:function fixed(){return ce.CreateHTML(this,"tt","","")},fontcolor:function fontcolor(e){return ce.CreateHTML(this,"font","color",e)},fontsize:function fontsize(e){return ce.CreateHTML(this,"font","size",e)},italics:function italics(){return ce.CreateHTML(this,"i","","")},link:function link(e){return ce.CreateHTML(this,"a","href",e)},small:function small(){return ce.CreateHTML(this,"small","","")},strike:function strike(){return ce.CreateHTML(this,"strike","","")},sub:function sub(){return ce.CreateHTML(this,"sub","","")},sup:function sub(){return ce.CreateHTML(this,"sup","","")}};l(Object.keys(Ln),function(e){var r=String.prototype[e];var n=false;if(ce.IsCallable(r)){var o=t(r,"",' " ');var i=P([],o.match(/"/g)).length;n=o!==o.toLowerCase()||i>2}else{n=true}if(n){ne(String.prototype,e,Ln[e])}});var Fn=function(){if(!oe){return false}var e=typeof JSON==="object"&&typeof JSON.stringify==="function"?JSON.stringify:null;if(!e){return false}if(typeof e($())!=="undefined"){return true}if(e([$()])!=="[null]"){return true}var t={a:$()};t[$()]=true;if(e(t)!=="{}"){return true}return false}();var Dn=a(function(){if(!oe){return true}return JSON.stringify(Object($()))==="{}"&&JSON.stringify([Object($())])==="[{}]"});if(Fn||!Dn){var zn=JSON.stringify;ne(JSON,"stringify",function stringify(e){if(typeof e==="symbol"){return}var n;if(arguments.length>1){n=arguments[1]}var o=[e];if(!r(n)){var i=ce.IsCallable(n)?n:null;var a=function(e,r){var n=i?t(i,this,e,r):r;if(typeof n!=="symbol"){if(re.symbol(n)){return Nt({})(n)}else{return n}}};o.push(a)}else{o.push(n)}if(arguments.length>2){o.push(arguments[2])}return zn.apply(this,o)})}return S});
+(function (e, t) { if (typeof define === "function" && define.amd) { define(t) } else if (typeof exports === "object") { module.exports = t() } else { e.returnExports = t() } })(this, function () {
+    "use strict"; var e = Function.call.bind(Function.apply); var t = Function.call.bind(Function.call); var r = Array.isArray; var n = Object.keys; var o = function notThunker(t) { return function notThunk() { return !e(t, this, arguments) } }; var i = function (e) { try { e(); return false } catch (t) { return true } }; var a = function valueOrFalseIfThrows(e) { try { return e() } catch (t) { return false } }; var u = o(i); var f = function () { return !i(function () { return Object.defineProperty({}, "x", { get: function () { } }) }) }; var s = !!Object.defineProperty && f(); var c = function foo() { }.name === "foo"; var l = Function.call.bind(Array.prototype.forEach); var p = Function.call.bind(Array.prototype.reduce); var v = Function.call.bind(Array.prototype.filter); var y = Function.call.bind(Array.prototype.some); var h = function (e, t, r, n) { if (!n && t in e) { return } if (s) { Object.defineProperty(e, t, { configurable: true, enumerable: false, writable: true, value: r }) } else { e[t] = r } }; var b = function (e, t, r) { l(n(t), function (n) { var o = t[n]; h(e, n, o, !!r) }) }; var g = Function.call.bind(Object.prototype.toString); var d = typeof /abc/ === "function" ? function IsCallableSlow(e) { return typeof e === "function" && g(e) === "[object Function]" } : function IsCallableFast(e) { return typeof e === "function" }; var m = { getter: function (e, t, r) { if (!s) { throw new TypeError("getters require true ES5 support") } Object.defineProperty(e, t, { configurable: true, enumerable: false, get: r }) }, proxy: function (e, t, r) { if (!s) { throw new TypeError("getters require true ES5 support") } var n = Object.getOwnPropertyDescriptor(e, t); Object.defineProperty(r, t, { configurable: n.configurable, enumerable: n.enumerable, get: function getKey() { return e[t] }, set: function setKey(r) { e[t] = r } }) }, redefine: function (e, t, r) { if (s) { var n = Object.getOwnPropertyDescriptor(e, t); n.value = r; Object.defineProperty(e, t, n) } else { e[t] = r } }, defineByDescriptor: function (e, t, r) { if (s) { Object.defineProperty(e, t, r) } else if ("value" in r) { e[t] = r.value } }, preserveToString: function (e, t) { if (t && d(t.toString)) { h(e, "toString", t.toString.bind(t), true) } } }; var O = Object.create || function (e, t) { var r = function Prototype() { }; r.prototype = e; var o = new r; if (typeof t !== "undefined") { n(t).forEach(function (e) { m.defineByDescriptor(o, e, t[e]) }) } return o }; var w = function (e, t) { if (!Object.setPrototypeOf) { return false } return a(function () { var r = function Subclass(t) { var r = new e(t); Object.setPrototypeOf(r, Subclass.prototype); return r }; Object.setPrototypeOf(r, e); r.prototype = O(e.prototype, { constructor: { value: r } }); return t(r) }) }; var j = function () { if (typeof self !== "undefined") { return self } if (typeof window !== "undefined") { return window } if (typeof global !== "undefined") { return global } throw new Error("unable to locate global object") }; var S = j(); var T = S.isFinite; var I = Function.call.bind(String.prototype.indexOf); var E = Function.apply.bind(Array.prototype.indexOf); var P = Function.call.bind(Array.prototype.concat); var C = Function.call.bind(String.prototype.slice); var M = Function.call.bind(Array.prototype.push); var x = Function.apply.bind(Array.prototype.push); var N = Function.call.bind(Array.prototype.shift); var A = Math.max; var R = Math.min; var _ = Math.floor; var k = Math.abs; var L = Math.exp; var F = Math.log; var D = Math.sqrt; var z = Function.call.bind(Object.prototype.hasOwnProperty); var q; var W = function () { }; var G = S.Map; var H = G && G.prototype["delete"]; var V = G && G.prototype.get; var B = G && G.prototype.has; var U = G && G.prototype.set; var $ = S.Symbol || {}; var J = $.species || "@@species"; var X = Number.isNaN || function isNaN(e) { return e !== e }; var K = Number.isFinite || function isFinite(e) { return typeof e === "number" && T(e) }; var Z = d(Math.sign) ? Math.sign : function sign(e) { var t = Number(e); if (t === 0) { return t } if (X(t)) { return t } return t < 0 ? -1 : 1 }; var Y = function log1p(e) { var t = Number(e); if (t < -1 || X(t)) { return NaN } if (t === 0 || t === Infinity) { return t } if (t === -1) { return -Infinity } return 1 + t - 1 === 0 ? t : t * (F(1 + t) / (1 + t - 1)) }; var Q = function isArguments(e) { return g(e) === "[object Arguments]" }; var ee = function isArguments(e) { return e !== null && typeof e === "object" && typeof e.length === "number" && e.length >= 0 && g(e) !== "[object Array]" && g(e.callee) === "[object Function]" }; var te = Q(arguments) ? Q : ee; var re = { primitive: function (e) { return e === null || typeof e !== "function" && typeof e !== "object" }, string: function (e) { return g(e) === "[object String]" }, regex: function (e) { return g(e) === "[object RegExp]" }, symbol: function (e) { return typeof S.Symbol === "function" && typeof e === "symbol" } }; var ne = function overrideNative(e, t, r) { var n = e[t]; h(e, t, r, true); m.preserveToString(e[t], n) }; var oe = typeof $ === "function" && typeof $["for"] === "function" && re.symbol($()); var ie = re.symbol($.iterator) ? $.iterator : "_es6-shim iterator_"; if (S.Set && typeof (new S.Set)["@@iterator"] === "function") { ie = "@@iterator" } if (!S.Reflect) { h(S, "Reflect", {}, true) } var ae = S.Reflect; var ue = String; var fe = typeof document === "undefined" || !document ? null : document.all; var se = fe == null ? function isNullOrUndefined(e) { return e == null } : function isNullOrUndefinedAndNotDocumentAll(e) { return e == null && e !== fe }; var ce = { Call: function Call(t, r) { var n = arguments.length > 2 ? arguments[2] : []; if (!ce.IsCallable(t)) { throw new TypeError(t + " is not a function") } return e(t, r, n) }, RequireObjectCoercible: function (e, t) { if (se(e)) { throw new TypeError(t || "Cannot call method on " + e) } return e }, TypeIsObject: function (e) { if (e === void 0 || e === null || e === true || e === false) { return false } return typeof e === "function" || typeof e === "object" || e === fe }, ToObject: function (e, t) { return Object(ce.RequireObjectCoercible(e, t)) }, IsCallable: d, IsConstructor: function (e) { return ce.IsCallable(e) }, ToInt32: function (e) { return ce.ToNumber(e) >> 0 }, ToUint32: function (e) { return ce.ToNumber(e) >>> 0 }, ToNumber: function (e) { if (g(e) === "[object Symbol]") { throw new TypeError("Cannot convert a Symbol value to a number") } return +e }, ToInteger: function (e) { var t = ce.ToNumber(e); if (X(t)) { return 0 } if (t === 0 || !K(t)) { return t } return (t > 0 ? 1 : -1) * _(k(t)) }, ToLength: function (e) { var t = ce.ToInteger(e); if (t <= 0) { return 0 } if (t > Number.MAX_SAFE_INTEGER) { return Number.MAX_SAFE_INTEGER } return t }, SameValue: function (e, t) { if (e === t) { if (e === 0) { return 1 / e === 1 / t } return true } return X(e) && X(t) }, SameValueZero: function (e, t) { return e === t || X(e) && X(t) }, IsIterable: function (e) { return ce.TypeIsObject(e) && (typeof e[ie] !== "undefined" || te(e)) }, GetIterator: function (e) { if (te(e)) { return new q(e, "value") } var t = ce.GetMethod(e, ie); if (!ce.IsCallable(t)) { throw new TypeError("value is not an iterable") } var r = ce.Call(t, e); if (!ce.TypeIsObject(r)) { throw new TypeError("bad iterator") } return r }, GetMethod: function (e, t) { var r = ce.ToObject(e)[t]; if (se(r)) { return void 0 } if (!ce.IsCallable(r)) { throw new TypeError("Method not callable: " + t) } return r }, IteratorComplete: function (e) { return !!e.done }, IteratorClose: function (e, t) { var r = ce.GetMethod(e, "return"); if (r === void 0) { return } var n, o; try { n = ce.Call(r, e) } catch (i) { o = i } if (t) { return } if (o) { throw o } if (!ce.TypeIsObject(n)) { throw new TypeError("Iterator's return method returned a non-object.") } }, IteratorNext: function (e) { var t = arguments.length > 1 ? e.next(arguments[1]) : e.next(); if (!ce.TypeIsObject(t)) { throw new TypeError("bad iterator") } return t }, IteratorStep: function (e) { var t = ce.IteratorNext(e); var r = ce.IteratorComplete(t); return r ? false : t }, Construct: function (e, t, r, n) { var o = typeof r === "undefined" ? e : r; if (!n && ae.construct) { return ae.construct(e, t, o) } var i = o.prototype; if (!ce.TypeIsObject(i)) { i = Object.prototype } var a = O(i); var u = ce.Call(e, a, t); return ce.TypeIsObject(u) ? u : a }, SpeciesConstructor: function (e, t) { var r = e.constructor; if (r === void 0) { return t } if (!ce.TypeIsObject(r)) { throw new TypeError("Bad constructor") } var n = r[J]; if (se(n)) { return t } if (!ce.IsConstructor(n)) { throw new TypeError("Bad @@species") } return n }, CreateHTML: function (e, t, r, n) { var o = ce.ToString(e); var i = "<" + t; if (r !== "") { var a = ce.ToString(n); var u = a.replace(/"/g, "&quot;"); i += " " + r + '="' + u + '"' } var f = i + ">"; var s = f + o; return s + "</" + t + ">" }, IsRegExp: function IsRegExp(e) { if (!ce.TypeIsObject(e)) { return false } var t = e[$.match]; if (typeof t !== "undefined") { return !!t } return re.regex(e) }, ToString: function ToString(e) { return ue(e) } }; if (s && oe) { var le = function defineWellKnownSymbol(e) { if (re.symbol($[e])) { return $[e] } var t = $["for"]("Symbol." + e); Object.defineProperty($, e, { configurable: false, enumerable: false, writable: false, value: t }); return t }; if (!re.symbol($.search)) { var pe = le("search"); var ve = String.prototype.search; h(RegExp.prototype, pe, function search(e) { return ce.Call(ve, e, [this]) }); var ye = function search(e) { var t = ce.RequireObjectCoercible(this); if (!se(e)) { var r = ce.GetMethod(e, pe); if (typeof r !== "undefined") { return ce.Call(r, e, [t]) } } return ce.Call(ve, t, [ce.ToString(e)]) }; ne(String.prototype, "search", ye) } if (!re.symbol($.replace)) { var he = le("replace"); var be = String.prototype.replace; h(RegExp.prototype, he, function replace(e, t) { return ce.Call(be, e, [this, t]) }); var ge = function replace(e, t) { var r = ce.RequireObjectCoercible(this); if (!se(e)) { var n = ce.GetMethod(e, he); if (typeof n !== "undefined") { return ce.Call(n, e, [r, t]) } } return ce.Call(be, r, [ce.ToString(e), t]) }; ne(String.prototype, "replace", ge) } if (!re.symbol($.split)) { var de = le("split"); var me = String.prototype.split; h(RegExp.prototype, de, function split(e, t) { return ce.Call(me, e, [this, t]) }); var Oe = function split(e, t) { var r = ce.RequireObjectCoercible(this); if (!se(e)) { var n = ce.GetMethod(e, de); if (typeof n !== "undefined") { return ce.Call(n, e, [r, t]) } } return ce.Call(me, r, [ce.ToString(e), t]) }; ne(String.prototype, "split", Oe) } var we = re.symbol($.match); var je = we && function () { var e = {}; e[$.match] = function () { return 42 }; return "a".match(e) !== 42 }(); if (!we || je) { var Se = le("match"); var Te = String.prototype.match; h(RegExp.prototype, Se, function match(e) { return ce.Call(Te, e, [this]) }); var Ie = function match(e) { var t = ce.RequireObjectCoercible(this); if (!se(e)) { var r = ce.GetMethod(e, Se); if (typeof r !== "undefined") { return ce.Call(r, e, [t]) } } return ce.Call(Te, t, [ce.ToString(e)]) }; ne(String.prototype, "match", Ie) } } var Ee = function wrapConstructor(e, t, r) { m.preserveToString(t, e); if (Object.setPrototypeOf) { Object.setPrototypeOf(e, t) } if (s) { l(Object.getOwnPropertyNames(e), function (n) { if (n in W || r[n]) { return } m.proxy(e, n, t) }) } else { l(Object.keys(e), function (n) { if (n in W || r[n]) { return } t[n] = e[n] }) } t.prototype = e.prototype; m.redefine(e.prototype, "constructor", t) }; var Pe = function () { return this }; var Ce = function (e) { if (s && !z(e, J)) { m.getter(e, J, Pe) } }; var Me = function (e, t) { var r = t || function iterator() { return this }; h(e, ie, r); if (!e[ie] && re.symbol(ie)) { e[ie] = r } }; var xe = function createDataProperty(e, t, r) { if (s) { Object.defineProperty(e, t, { configurable: true, enumerable: true, writable: true, value: r }) } else { e[t] = r } }; var Ne = function createDataPropertyOrThrow(e, t, r) { xe(e, t, r); if (!ce.SameValue(e[t], r)) { throw new TypeError("property is nonconfigurable") } }; var Ae = function (e, t, r, n) { if (!ce.TypeIsObject(e)) { throw new TypeError("Constructor requires `new`: " + t.name) } var o = t.prototype; if (!ce.TypeIsObject(o)) { o = r } var i = O(o); for (var a in n) { if (z(n, a)) { var u = n[a]; h(i, a, u, true) } } return i }; if (String.fromCodePoint && String.fromCodePoint.length !== 1) { var Re = String.fromCodePoint; ne(String, "fromCodePoint", function fromCodePoint(e) { return ce.Call(Re, this, arguments) }) } var _e = { fromCodePoint: function fromCodePoint(e) { var t = []; var r; for (var n = 0, o = arguments.length; n < o; n++) { r = Number(arguments[n]); if (!ce.SameValue(r, ce.ToInteger(r)) || r < 0 || r > 1114111) { throw new RangeError("Invalid code point " + r) } if (r < 65536) { M(t, String.fromCharCode(r)) } else { r -= 65536; M(t, String.fromCharCode((r >> 10) + 55296)); M(t, String.fromCharCode(r % 1024 + 56320)) } } return t.join("") }, raw: function raw(e) { var t = ce.ToObject(e, "bad callSite"); var r = ce.ToObject(t.raw, "bad raw value"); var n = r.length; var o = ce.ToLength(n); if (o <= 0) { return "" } var i = []; var a = 0; var u, f, s, c; while (a < o) { u = ce.ToString(a); s = ce.ToString(r[u]); M(i, s); if (a + 1 >= o) { break } f = a + 1 < arguments.length ? arguments[a + 1] : ""; c = ce.ToString(f); M(i, c); a += 1 } return i.join("") } }; if (String.raw && String.raw({ raw: { 0: "x", 1: "y", length: 2 } }) !== "xy") { ne(String, "raw", _e.raw) } b(String, _e); var ke = function repeat(e, t) { if (t < 1) { return "" } if (t % 2) { return repeat(e, t - 1) + e } var r = repeat(e, t / 2); return r + r }; var Le = Infinity; var Fe = { repeat: function repeat(e) { var t = ce.ToString(ce.RequireObjectCoercible(this)); var r = ce.ToInteger(e); if (r < 0 || r >= Le) { throw new RangeError("repeat count must be less than infinity and not overflow maximum string size") } return ke(t, r) }, startsWith: function startsWith(e) { var t = ce.ToString(ce.RequireObjectCoercible(this)); if (ce.IsRegExp(e)) { throw new TypeError('Cannot call method "startsWith" with a regex') } var r = ce.ToString(e); var n; if (arguments.length > 1) { n = arguments[1] } var o = A(ce.ToInteger(n), 0); return C(t, o, o + r.length) === r }, endsWith: function endsWith(e) { var t = ce.ToString(ce.RequireObjectCoercible(this)); if (ce.IsRegExp(e)) { throw new TypeError('Cannot call method "endsWith" with a regex') } var r = ce.ToString(e); var n = t.length; var o; if (arguments.length > 1) { o = arguments[1] } var i = typeof o === "undefined" ? n : ce.ToInteger(o); var a = R(A(i, 0), n); return C(t, a - r.length, a) === r }, includes: function includes(e) { if (ce.IsRegExp(e)) { throw new TypeError('"includes" does not accept a RegExp') } var t = ce.ToString(e); var r; if (arguments.length > 1) { r = arguments[1] } return I(this, t, r) !== -1 }, codePointAt: function codePointAt(e) { var t = ce.ToString(ce.RequireObjectCoercible(this)); var r = ce.ToInteger(e); var n = t.length; if (r >= 0 && r < n) { var o = t.charCodeAt(r); var i = r + 1 === n; if (o < 55296 || o > 56319 || i) { return o } var a = t.charCodeAt(r + 1); if (a < 56320 || a > 57343) { return o } return (o - 55296) * 1024 + (a - 56320) + 65536 } } }; if (String.prototype.includes && "a".includes("a", Infinity) !== false) { ne(String.prototype, "includes", Fe.includes) } if (String.prototype.startsWith && String.prototype.endsWith) { var De = i(function () { return "/a/".startsWith(/a/) }); var ze = a(function () { return "abc".startsWith("a", Infinity) === false }); if (!De || !ze) { ne(String.prototype, "startsWith", Fe.startsWith); ne(String.prototype, "endsWith", Fe.endsWith) } } if (oe) { var qe = a(function () { var e = /a/; e[$.match] = false; return "/a/".startsWith(e) }); if (!qe) { ne(String.prototype, "startsWith", Fe.startsWith) } var We = a(function () { var e = /a/; e[$.match] = false; return "/a/".endsWith(e) }); if (!We) { ne(String.prototype, "endsWith", Fe.endsWith) } var Ge = a(function () { var e = /a/; e[$.match] = false; return "/a/".includes(e) }); if (!Ge) { ne(String.prototype, "includes", Fe.includes) } } b(String.prototype, Fe); var He = ["\t\n\x0B\f\r \xa0\u1680\u180e\u2000\u2001\u2002\u2003", "\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028", "\u2029\ufeff"].join(""); var Ve = new RegExp("(^[" + He + "]+)|([" + He + "]+$)", "g"); var Be = function trim() { return ce.ToString(ce.RequireObjectCoercible(this)).replace(Ve, "") }; var Ue = ["\x85", "\u200b", "\ufffe"].join(""); var $e = new RegExp("[" + Ue + "]", "g"); var Je = /^[-+]0x[0-9a-f]+$/i; var Xe = Ue.trim().length !== Ue.length; h(String.prototype, "trim", Be, Xe); var Ke = function (e) { return { value: e, done: arguments.length === 0 } }; var Ze = function (e) { ce.RequireObjectCoercible(e); this._s = ce.ToString(e); this._i = 0 }; Ze.prototype.next = function () { var e = this._s; var t = this._i; if (typeof e === "undefined" || t >= e.length) { this._s = void 0; return Ke() } var r = e.charCodeAt(t); var n, o; if (r < 55296 || r > 56319 || t + 1 === e.length) { o = 1 } else { n = e.charCodeAt(t + 1); o = n < 56320 || n > 57343 ? 1 : 2 } this._i = t + o; return Ke(e.substr(t, o)) }; Me(Ze.prototype); Me(String.prototype, function () { return new Ze(this) }); var Ye = { from: function from(e) { var r = this; var n; if (arguments.length > 1) { n = arguments[1] } var o, i; if (typeof n === "undefined") { o = false } else { if (!ce.IsCallable(n)) { throw new TypeError("Array.from: when provided, the second argument must be a function") } if (arguments.length > 2) { i = arguments[2] } o = true } var a = typeof (te(e) || ce.GetMethod(e, ie)) !== "undefined"; var u, f, s; if (a) { f = ce.IsConstructor(r) ? Object(new r) : []; var c = ce.GetIterator(e); var l, p; s = 0; while (true) { l = ce.IteratorStep(c); if (l === false) { break } p = l.value; try { if (o) { p = typeof i === "undefined" ? n(p, s) : t(n, i, p, s) } f[s] = p } catch (v) { ce.IteratorClose(c, true); throw v } s += 1 } u = s } else { var y = ce.ToObject(e); u = ce.ToLength(y.length); f = ce.IsConstructor(r) ? Object(new r(u)) : new Array(u); var h; for (s = 0; s < u; ++s) { h = y[s]; if (o) { h = typeof i === "undefined" ? n(h, s) : t(n, i, h, s) } Ne(f, s, h) } } f.length = u; return f }, of: function of() { var e = arguments.length; var t = this; var n = r(t) || !ce.IsCallable(t) ? new Array(e) : ce.Construct(t, [e]); for (var o = 0; o < e; ++o) { Ne(n, o, arguments[o]) } n.length = e; return n } }; b(Array, Ye); Ce(Array); q = function (e, t) { this.i = 0; this.array = e; this.kind = t }; b(q.prototype, { next: function () { var e = this.i; var t = this.array; if (!(this instanceof q)) { throw new TypeError("Not an ArrayIterator") } if (typeof t !== "undefined") { var r = ce.ToLength(t.length); for (; e < r; e++) { var n = this.kind; var o; if (n === "key") { o = e } else if (n === "value") { o = t[e] } else if (n === "entry") { o = [e, t[e]] } this.i = e + 1; return Ke(o) } } this.array = void 0; return Ke() } }); Me(q.prototype); var Qe = Array.of === Ye.of || function () { var e = function Foo(e) { this.length = e }; e.prototype = []; var t = Array.of.apply(e, [1, 2]); return t instanceof e && t.length === 2 }(); if (!Qe) { ne(Array, "of", Ye.of) } var et = { copyWithin: function copyWithin(e, t) { var r = ce.ToObject(this); var n = ce.ToLength(r.length); var o = ce.ToInteger(e); var i = ce.ToInteger(t); var a = o < 0 ? A(n + o, 0) : R(o, n); var u = i < 0 ? A(n + i, 0) : R(i, n); var f; if (arguments.length > 2) { f = arguments[2] } var s = typeof f === "undefined" ? n : ce.ToInteger(f); var c = s < 0 ? A(n + s, 0) : R(s, n); var l = R(c - u, n - a); var p = 1; if (u < a && a < u + l) { p = -1; u += l - 1; a += l - 1 } while (l > 0) { if (u in r) { r[a] = r[u] } else { delete r[a] } u += p; a += p; l -= 1 } return r }, fill: function fill(e) { var t; if (arguments.length > 1) { t = arguments[1] } var r; if (arguments.length > 2) { r = arguments[2] } var n = ce.ToObject(this); var o = ce.ToLength(n.length); t = ce.ToInteger(typeof t === "undefined" ? 0 : t); r = ce.ToInteger(typeof r === "undefined" ? o : r); var i = t < 0 ? A(o + t, 0) : R(t, o); var a = r < 0 ? o + r : r; for (var u = i; u < o && u < a; ++u) { n[u] = e } return n }, find: function find(e) { var r = ce.ToObject(this); var n = ce.ToLength(r.length); if (!ce.IsCallable(e)) { throw new TypeError("Array#find: predicate must be a function") } var o = arguments.length > 1 ? arguments[1] : null; for (var i = 0, a; i < n; i++) { a = r[i]; if (o) { if (t(e, o, a, i, r)) { return a } } else if (e(a, i, r)) { return a } } }, findIndex: function findIndex(e) { var r = ce.ToObject(this); var n = ce.ToLength(r.length); if (!ce.IsCallable(e)) { throw new TypeError("Array#findIndex: predicate must be a function") } var o = arguments.length > 1 ? arguments[1] : null; for (var i = 0; i < n; i++) { if (o) { if (t(e, o, r[i], i, r)) { return i } } else if (e(r[i], i, r)) { return i } } return -1 }, keys: function keys() { return new q(this, "key") }, values: function values() { return new q(this, "value") }, entries: function entries() { return new q(this, "entry") } }; if (Array.prototype.keys && !ce.IsCallable([1].keys().next)) { delete Array.prototype.keys } if (Array.prototype.entries && !ce.IsCallable([1].entries().next)) { delete Array.prototype.entries } if (Array.prototype.keys && Array.prototype.entries && !Array.prototype.values && Array.prototype[ie]) { b(Array.prototype, { values: Array.prototype[ie] }); if (re.symbol($.unscopables)) { Array.prototype[$.unscopables].values = true } } if (c && Array.prototype.values && Array.prototype.values.name !== "values") { var tt = Array.prototype.values; ne(Array.prototype, "values", function values() { return ce.Call(tt, this, arguments) }); h(Array.prototype, ie, Array.prototype.values, true) } b(Array.prototype, et); if (1 / [true].indexOf(true, -0) < 0) { h(Array.prototype, "indexOf", function indexOf(e) { var t = E(this, arguments); if (t === 0 && 1 / t < 0) { return 0 } return t }, true) } Me(Array.prototype, function () { return this.values() }); if (Object.getPrototypeOf) { Me(Object.getPrototypeOf([].values())) } var rt = function () { return a(function () { return Array.from({ length: -1 }).length === 0 }) }(); var nt = function () { var e = Array.from([0].entries()); return e.length === 1 && r(e[0]) && e[0][0] === 0 && e[0][1] === 0 }(); if (!rt || !nt) { ne(Array, "from", Ye.from) } var ot = function () { return a(function () { return Array.from([0], void 0) }) }(); if (!ot) { var it = Array.from; ne(Array, "from", function from(e) { if (arguments.length > 1 && typeof arguments[1] !== "undefined") { return ce.Call(it, this, arguments) } else { return t(it, this, e) } }) } var at = -(Math.pow(2, 32) - 1); var ut = function (e, r) { var n = { length: at }; n[r ? (n.length >>> 0) - 1 : 0] = true; return a(function () { t(e, n, function () { throw new RangeError("should not reach here") }, []); return true }) }; if (!ut(Array.prototype.forEach)) { var ft = Array.prototype.forEach; ne(Array.prototype, "forEach", function forEach(e) { return ce.Call(ft, this.length >= 0 ? this : [], arguments) }, true) } if (!ut(Array.prototype.map)) { var st = Array.prototype.map; ne(Array.prototype, "map", function map(e) { return ce.Call(st, this.length >= 0 ? this : [], arguments) }, true) } if (!ut(Array.prototype.filter)) { var ct = Array.prototype.filter; ne(Array.prototype, "filter", function filter(e) { return ce.Call(ct, this.length >= 0 ? this : [], arguments) }, true) } if (!ut(Array.prototype.some)) { var lt = Array.prototype.some; ne(Array.prototype, "some", function some(e) { return ce.Call(lt, this.length >= 0 ? this : [], arguments) }, true) } if (!ut(Array.prototype.every)) { var pt = Array.prototype.every; ne(Array.prototype, "every", function every(e) { return ce.Call(pt, this.length >= 0 ? this : [], arguments) }, true) } if (!ut(Array.prototype.reduce)) { var vt = Array.prototype.reduce; ne(Array.prototype, "reduce", function reduce(e) { return ce.Call(vt, this.length >= 0 ? this : [], arguments) }, true) } if (!ut(Array.prototype.reduceRight, true)) { var yt = Array.prototype.reduceRight; ne(Array.prototype, "reduceRight", function reduceRight(e) { return ce.Call(yt, this.length >= 0 ? this : [], arguments) }, true) } var ht = Number("0o10") !== 8; var bt = Number("0b10") !== 2; var gt = y(Ue, function (e) { return Number(e + 0 + e) === 0 }); if (ht || bt || gt) { var dt = Number; var mt = /^0b[01]+$/i; var Ot = /^0o[0-7]+$/i; var wt = mt.test.bind(mt); var jt = Ot.test.bind(Ot); var St = function (e) { var t; if (typeof e.valueOf === "function") { t = e.valueOf(); if (re.primitive(t)) { return t } } if (typeof e.toString === "function") { t = e.toString(); if (re.primitive(t)) { return t } } throw new TypeError("No default value") }; var Tt = $e.test.bind($e); var It = Je.test.bind(Je); var Et = function () { var e = function Number(t) { var r; if (arguments.length > 0) { r = re.primitive(t) ? t : St(t, "number") } else { r = 0 } if (typeof r === "string") { r = ce.Call(Be, r); if (wt(r)) { r = parseInt(C(r, 2), 2) } else if (jt(r)) { r = parseInt(C(r, 2), 8) } else if (Tt(r) || It(r)) { r = NaN } } var n = this; var o = a(function () { dt.prototype.valueOf.call(n); return true }); if (n instanceof e && !o) { return new dt(r) } return dt(r) }; return e }(); Ee(dt, Et, {}); b(Et, { NaN: dt.NaN, MAX_VALUE: dt.MAX_VALUE, MIN_VALUE: dt.MIN_VALUE, NEGATIVE_INFINITY: dt.NEGATIVE_INFINITY, POSITIVE_INFINITY: dt.POSITIVE_INFINITY }); Number = Et; m.redefine(S, "Number", Et) } var Pt = Math.pow(2, 53) - 1; b(Number, { MAX_SAFE_INTEGER: Pt, MIN_SAFE_INTEGER: -Pt, EPSILON: 2.220446049250313e-16, parseInt: S.parseInt, parseFloat: S.parseFloat, isFinite: K, isInteger: function isInteger(e) { return K(e) && ce.ToInteger(e) === e }, isSafeInteger: function isSafeInteger(e) { return Number.isInteger(e) && k(e) <= Number.MAX_SAFE_INTEGER }, isNaN: X }); h(Number, "parseInt", S.parseInt, Number.parseInt !== S.parseInt); if ([, 1].find(function () { return true }) === 1) { ne(Array.prototype, "find", et.find) } if ([, 1].findIndex(function () { return true }) !== 0) { ne(Array.prototype, "findIndex", et.findIndex) } var Ct = Function.bind.call(Function.bind, Object.prototype.propertyIsEnumerable); var Mt = function ensureEnumerable(e, t) { if (s && Ct(e, t)) { Object.defineProperty(e, t, { enumerable: false }) } }; var xt = function sliceArgs() { var e = Number(this); var t = arguments.length; var r = t - e; var n = new Array(r < 0 ? 0 : r); for (var o = e; o < t; ++o) { n[o - e] = arguments[o] } return n }; var Nt = function assignTo(e) { return function assignToSource(t, r) { t[r] = e[r]; return t } }; var At = function (e, t) { var r = n(Object(t)); var o; if (ce.IsCallable(Object.getOwnPropertySymbols)) { o = v(Object.getOwnPropertySymbols(Object(t)), Ct(t)) } return p(P(r, o || []), Nt(t), e) }; var Rt = { assign: function (e, t) { var r = ce.ToObject(e, "Cannot convert undefined or null to object"); return p(ce.Call(xt, 1, arguments), At, r) }, is: function is(e, t) { return ce.SameValue(e, t) } }; var _t = Object.assign && Object.preventExtensions && function () { var e = Object.preventExtensions({ 1: 2 }); try { Object.assign(e, "xy") } catch (t) { return e[1] === "y" } }(); if (_t) { ne(Object, "assign", Rt.assign) } b(Object, Rt); if (s) { var kt = { setPrototypeOf: function (e, r) { var n; var o = function (e, t) { if (!ce.TypeIsObject(e)) { throw new TypeError("cannot set prototype on a non-object") } if (!(t === null || ce.TypeIsObject(t))) { throw new TypeError("can only set prototype to an object or null" + t) } }; var i = function (e, r) { o(e, r); t(n, e, r); return e }; try { n = e.getOwnPropertyDescriptor(e.prototype, r).set; t(n, {}, null) } catch (a) { if (e.prototype !== {}[r]) { return } n = function (e) { this[r] = e }; i.polyfill = i(i({}, null), e.prototype) instanceof e } return i }(Object, "__proto__") }; b(Object, kt) } if (Object.setPrototypeOf && Object.getPrototypeOf && Object.getPrototypeOf(Object.setPrototypeOf({}, null)) !== null && Object.getPrototypeOf(Object.create(null)) === null) { (function () { var e = Object.create(null); var t = Object.getPrototypeOf; var r = Object.setPrototypeOf; Object.getPrototypeOf = function (r) { var n = t(r); return n === e ? null : n }; Object.setPrototypeOf = function (t, n) { var o = n === null ? e : n; return r(t, o) }; Object.setPrototypeOf.polyfill = false })() } var Lt = !i(function () { return Object.keys("foo") }); if (!Lt) { var Ft = Object.keys; ne(Object, "keys", function keys(e) { return Ft(ce.ToObject(e)) }); n = Object.keys } var Dt = i(function () { return Object.keys(/a/g) }); if (Dt) { var zt = Object.keys; ne(Object, "keys", function keys(e) { if (re.regex(e)) { var t = []; for (var r in e) { if (z(e, r)) { M(t, r) } } return t } return zt(e) }); n = Object.keys } if (Object.getOwnPropertyNames) { var qt = !i(function () { return Object.getOwnPropertyNames("foo") }); if (!qt) { var Wt = typeof window === "object" ? Object.getOwnPropertyNames(window) : []; var Gt = Object.getOwnPropertyNames; ne(Object, "getOwnPropertyNames", function getOwnPropertyNames(e) { var t = ce.ToObject(e); if (g(t) === "[object Window]") { try { return Gt(t) } catch (r) { return P([], Wt) } } return Gt(t) }) } } if (Object.getOwnPropertyDescriptor) { var Ht = !i(function () { return Object.getOwnPropertyDescriptor("foo", "bar") }); if (!Ht) { var Vt = Object.getOwnPropertyDescriptor; ne(Object, "getOwnPropertyDescriptor", function getOwnPropertyDescriptor(e, t) { return Vt(ce.ToObject(e), t) }) } } if (Object.seal) { var Bt = !i(function () { return Object.seal("foo") }); if (!Bt) { var Ut = Object.seal; ne(Object, "seal", function seal(e) { if (!ce.TypeIsObject(e)) { return e } return Ut(e) }) } } if (Object.isSealed) { var $t = !i(function () { return Object.isSealed("foo") }); if (!$t) { var Jt = Object.isSealed; ne(Object, "isSealed", function isSealed(e) { if (!ce.TypeIsObject(e)) { return true } return Jt(e) }) } } if (Object.freeze) { var Xt = !i(function () { return Object.freeze("foo") }); if (!Xt) { var Kt = Object.freeze; ne(Object, "freeze", function freeze(e) { if (!ce.TypeIsObject(e)) { return e } return Kt(e) }) } } if (Object.isFrozen) { var Zt = !i(function () { return Object.isFrozen("foo") }); if (!Zt) { var Yt = Object.isFrozen; ne(Object, "isFrozen", function isFrozen(e) { if (!ce.TypeIsObject(e)) { return true } return Yt(e) }) } } if (Object.preventExtensions) { var Qt = !i(function () { return Object.preventExtensions("foo") }); if (!Qt) { var er = Object.preventExtensions; ne(Object, "preventExtensions", function preventExtensions(e) { if (!ce.TypeIsObject(e)) { return e } return er(e) }) } } if (Object.isExtensible) { var tr = !i(function () { return Object.isExtensible("foo") }); if (!tr) { var rr = Object.isExtensible; ne(Object, "isExtensible", function isExtensible(e) { if (!ce.TypeIsObject(e)) { return false } return rr(e) }) } } if (Object.getPrototypeOf) { var nr = !i(function () { return Object.getPrototypeOf("foo") }); if (!nr) { var or = Object.getPrototypeOf; ne(Object, "getPrototypeOf", function getPrototypeOf(e) { return or(ce.ToObject(e)) }) } } var ir = s && function () { var e = Object.getOwnPropertyDescriptor(RegExp.prototype, "flags"); return e && ce.IsCallable(e.get) }(); if (s && !ir) { var ar = function flags() { if (!ce.TypeIsObject(this)) { throw new TypeError("Method called on incompatible type: must be an object.") } var e = ""; if (this.global) { e += "g" } if (this.ignoreCase) { e += "i" } if (this.multiline) { e += "m" } if (this.unicode) { e += "u" } if (this.sticky) { e += "y" } return e }; m.getter(RegExp.prototype, "flags", ar) } var ur = s && a(function () { return String(new RegExp(/a/g, "i")) === "/a/i" }); var fr = oe && s && function () { var e = /./; e[$.match] = false; return RegExp(e) === e }(); var sr = a(function () { return RegExp.prototype.toString.call({ source: "abc" }) === "/abc/" }); var cr = sr && a(function () { return RegExp.prototype.toString.call({ source: "a", flags: "b" }) === "/a/b" }); if (!sr || !cr) { var lr = RegExp.prototype.toString; h(RegExp.prototype, "toString", function toString() { var e = ce.RequireObjectCoercible(this); if (re.regex(e)) { return t(lr, e) } var r = ue(e.source); var n = ue(e.flags); return "/" + r + "/" + n }, true); m.preserveToString(RegExp.prototype.toString, lr) } if (s && (!ur || fr)) { var pr = Object.getOwnPropertyDescriptor(RegExp.prototype, "flags").get; var vr = Object.getOwnPropertyDescriptor(RegExp.prototype, "source") || {}; var yr = function () { return this.source }; var hr = ce.IsCallable(vr.get) ? vr.get : yr; var br = RegExp; var gr = function () { return function RegExp(e, t) { var r = ce.IsRegExp(e); var n = this instanceof RegExp; if (!n && r && typeof t === "undefined" && e.constructor === RegExp) { return e } var o = e; var i = t; if (re.regex(e)) { o = ce.Call(hr, e); i = typeof t === "undefined" ? ce.Call(pr, e) : t; return new RegExp(o, i) } else if (r) { o = e.source; i = typeof t === "undefined" ? e.flags : t } return new br(e, t) } }(); Ee(br, gr, { $input: true }); RegExp = gr; m.redefine(S, "RegExp", gr) } if (s) { var dr = { input: "$_", lastMatch: "$&", lastParen: "$+", leftContext: "$`", rightContext: "$'" }; l(n(dr), function (e) { if (e in RegExp && !(dr[e] in RegExp)) { m.getter(RegExp, dr[e], function get() { return RegExp[e] }) } }) } Ce(RegExp); var mr = 1 / Number.EPSILON; var Or = function roundTiesToEven(e) { return e + mr - mr }; var wr = Math.pow(2, -23); var jr = Math.pow(2, 127) * (2 - wr); var Sr = Math.pow(2, -126); var Tr = Math.E; var Ir = Math.LOG2E; var Er = Math.LOG10E; var Pr = Number.prototype.clz; delete Number.prototype.clz; var Cr = { acosh: function acosh(e) { var t = Number(e); if (X(t) || e < 1) { return NaN } if (t === 1) { return 0 } if (t === Infinity) { return t } var r = 1 / (t * t); if (t < 2) { return Y(t - 1 + D(1 - r) * t) } var n = t / 2; return Y(n + D(1 - r) * n - 1) + 1 / Ir }, asinh: function asinh(e) { var t = Number(e); if (t === 0 || !T(t)) { return t } var r = k(t); var n = r * r; var o = Z(t); if (r < 1) { return o * Y(r + n / (D(n + 1) + 1)) } return o * (Y(r / 2 + D(1 + 1 / n) * r / 2 - 1) + 1 / Ir) }, atanh: function atanh(e) { var t = Number(e); if (t === 0) { return t } if (t === -1) { return -Infinity } if (t === 1) { return Infinity } if (X(t) || t < -1 || t > 1) { return NaN } var r = k(t); return Z(t) * Y(2 * r / (1 - r)) / 2 }, cbrt: function cbrt(e) { var t = Number(e); if (t === 0) { return t } var r = t < 0; var n; if (r) { t = -t } if (t === Infinity) { n = Infinity } else { n = L(F(t) / 3); n = (t / (n * n) + 2 * n) / 3 } return r ? -n : n }, clz32: function clz32(e) { var t = Number(e); var r = ce.ToUint32(t); if (r === 0) { return 32 } return Pr ? ce.Call(Pr, r) : 31 - _(F(r + .5) * Ir) }, cosh: function cosh(e) { var t = Number(e); if (t === 0) { return 1 } if (X(t)) { return NaN } if (!T(t)) { return Infinity } var r = L(k(t) - 1); return (r + 1 / (r * Tr * Tr)) * (Tr / 2) }, expm1: function expm1(e) { var t = Number(e); if (t === -Infinity) { return -1 } if (!T(t) || t === 0) { return t } if (k(t) > .5) { return L(t) - 1 } var r = t; var n = 0; var o = 1; while (n + r !== n) { n += r; o += 1; r *= t / o } return n }, hypot: function hypot(e, t) { var r = 0; var n = 0; for (var o = 0; o < arguments.length; ++o) { var i = k(Number(arguments[o])); if (n < i) { r *= n / i * (n / i); r += 1; n = i } else { r += i > 0 ? i / n * (i / n) : i } } return n === Infinity ? Infinity : n * D(r) }, log2: function log2(e) { return F(e) * Ir }, log10: function log10(e) { return F(e) * Er }, log1p: Y, sign: Z, sinh: function sinh(e) { var t = Number(e); if (!T(t) || t === 0) { return t } var r = k(t); if (r < 1) { var n = Math.expm1(r); return Z(t) * n * (1 + 1 / (n + 1)) / 2 } var o = L(r - 1); return Z(t) * (o - 1 / (o * Tr * Tr)) * (Tr / 2) }, tanh: function tanh(e) { var t = Number(e); if (X(t) || t === 0) { return t } if (t >= 20) { return 1 } if (t <= -20) { return -1 } return (Math.expm1(t) - Math.expm1(-t)) / (L(t) + L(-t)) }, trunc: function trunc(e) { var t = Number(e); return t < 0 ? -_(-t) : _(t) }, imul: function imul(e, t) { var r = ce.ToUint32(e); var n = ce.ToUint32(t); var o = r >>> 16 & 65535; var i = r & 65535; var a = n >>> 16 & 65535; var u = n & 65535; return i * u + (o * u + i * a << 16 >>> 0) | 0 }, fround: function fround(e) { var t = Number(e); if (t === 0 || t === Infinity || t === -Infinity || X(t)) { return t } var r = Z(t); var n = k(t); if (n < Sr) { return r * Or(n / Sr / wr) * Sr * wr } var o = (1 + wr / Number.EPSILON) * n; var i = o - (o - n); if (i > jr || X(i)) { return r * Infinity } return r * i } }; var Mr = function withinULPDistance(e, t, r) { return k(1 - e / t) / Number.EPSILON < (r || 8) }; b(Math, Cr); h(Math, "sinh", Cr.sinh, Math.sinh(710) === Infinity); h(Math, "cosh", Cr.cosh, Math.cosh(710) === Infinity); h(Math, "log1p", Cr.log1p, Math.log1p(-1e-17) !== -1e-17); h(Math, "asinh", Cr.asinh, Math.asinh(-1e7) !== -Math.asinh(1e7)); h(Math, "asinh", Cr.asinh, Math.asinh(1e300) === Infinity); h(Math, "atanh", Cr.atanh, Math.atanh(1e-300) === 0); h(Math, "tanh", Cr.tanh, Math.tanh(-2e-17) !== -2e-17);
+    h(Math, "acosh", Cr.acosh, Math.acosh(Number.MAX_VALUE) === Infinity); h(Math, "acosh", Cr.acosh, !Mr(Math.acosh(1 + Number.EPSILON), Math.sqrt(2 * Number.EPSILON))); h(Math, "cbrt", Cr.cbrt, !Mr(Math.cbrt(1e-300), 1e-100)); h(Math, "sinh", Cr.sinh, Math.sinh(-2e-17) !== -2e-17); var xr = Math.expm1(10); h(Math, "expm1", Cr.expm1, xr > 22025.465794806718 || xr < 22025.465794806718); var Nr = Math.round; var Ar = Math.round(.5 - Number.EPSILON / 4) === 0 && Math.round(-.5 + Number.EPSILON / 3.99) === 1; var Rr = mr + 1; var _r = 2 * mr - 1; var kr = [Rr, _r].every(function (e) { return Math.round(e) === e }); h(Math, "round", function round(e) { var t = _(e); var r = t === -1 ? -0 : t + 1; return e - t < .5 ? t : r }, !Ar || !kr); m.preserveToString(Math.round, Nr); var Lr = Math.imul; if (Math.imul(4294967295, 5) !== -5) { Math.imul = Cr.imul; m.preserveToString(Math.imul, Lr) } if (Math.imul.length !== 2) { ne(Math, "imul", function imul(e, t) { return ce.Call(Lr, Math, arguments) }) } var Fr = function () { var e = S.setTimeout; if (typeof e !== "function" && typeof e !== "object") { return } ce.IsPromise = function (e) { if (!ce.TypeIsObject(e)) { return false } if (typeof e._promise === "undefined") { return false } return true }; var r = function (e) { if (!ce.IsConstructor(e)) { throw new TypeError("Bad promise constructor") } var t = this; var r = function (e, r) { if (t.resolve !== void 0 || t.reject !== void 0) { throw new TypeError("Bad Promise implementation!") } t.resolve = e; t.reject = r }; t.resolve = void 0; t.reject = void 0; t.promise = new e(r); if (!(ce.IsCallable(t.resolve) && ce.IsCallable(t.reject))) { throw new TypeError("Bad promise constructor") } }; var n; if (typeof window !== "undefined" && ce.IsCallable(window.postMessage)) { n = function () { var e = []; var t = "zero-timeout-message"; var r = function (r) { M(e, r); window.postMessage(t, "*") }; var n = function (r) { if (r.source === window && r.data === t) { r.stopPropagation(); if (e.length === 0) { return } var n = N(e); n() } }; window.addEventListener("message", n, true); return r } } var o = function () { var e = S.Promise; var t = e && e.resolve && e.resolve(); return t && function (e) { return t.then(e) } }; var i = ce.IsCallable(S.setImmediate) ? S.setImmediate : typeof process === "object" && process.nextTick ? process.nextTick : o() || (ce.IsCallable(n) ? n() : function (t) { e(t, 0) }); var a = function (e) { return e }; var u = function (e) { throw e }; var f = 0; var s = 1; var c = 2; var l = 0; var p = 1; var v = 2; var y = {}; var h = function (e, t, r) { i(function () { g(e, t, r) }) }; var g = function (e, t, r) { var n, o; if (t === y) { return e(r) } try { n = e(r); o = t.resolve } catch (i) { n = i; o = t.reject } o(n) }; var d = function (e, t) { var r = e._promise; var n = r.reactionLength; if (n > 0) { h(r.fulfillReactionHandler0, r.reactionCapability0, t); r.fulfillReactionHandler0 = void 0; r.rejectReactions0 = void 0; r.reactionCapability0 = void 0; if (n > 1) { for (var o = 1, i = 0; o < n; o++, i += 3) { h(r[i + l], r[i + v], t); e[i + l] = void 0; e[i + p] = void 0; e[i + v] = void 0 } } } r.result = t; r.state = s; r.reactionLength = 0 }; var m = function (e, t) { var r = e._promise; var n = r.reactionLength; if (n > 0) { h(r.rejectReactionHandler0, r.reactionCapability0, t); r.fulfillReactionHandler0 = void 0; r.rejectReactions0 = void 0; r.reactionCapability0 = void 0; if (n > 1) { for (var o = 1, i = 0; o < n; o++, i += 3) { h(r[i + p], r[i + v], t); e[i + l] = void 0; e[i + p] = void 0; e[i + v] = void 0 } } } r.result = t; r.state = c; r.reactionLength = 0 }; var O = function (e) { var t = false; var r = function (r) { var n; if (t) { return } t = true; if (r === e) { return m(e, new TypeError("Self resolution")) } if (!ce.TypeIsObject(r)) { return d(e, r) } try { n = r.then } catch (o) { return m(e, o) } if (!ce.IsCallable(n)) { return d(e, r) } i(function () { j(e, r, n) }) }; var n = function (r) { if (t) { return } t = true; return m(e, r) }; return { resolve: r, reject: n } }; var w = function (e, r, n, o) { if (e === I) { t(e, r, n, o, y) } else { t(e, r, n, o) } }; var j = function (e, t, r) { var n = O(e); var o = n.resolve; var i = n.reject; try { w(r, t, o, i) } catch (a) { i(a) } }; var T, I; var E = function () { var e = function Promise(t) { if (!(this instanceof e)) { throw new TypeError('Constructor Promise requires "new"') } if (this && this._promise) { throw new TypeError("Bad construction") } if (!ce.IsCallable(t)) { throw new TypeError("not a valid resolver") } var r = Ae(this, e, T, { _promise: { result: void 0, state: f, reactionLength: 0, fulfillReactionHandler0: void 0, rejectReactionHandler0: void 0, reactionCapability0: void 0 } }); var n = O(r); var o = n.reject; try { t(n.resolve, o) } catch (i) { o(i) } return r }; return e }(); T = E.prototype; var P = function (e, t, r, n) { var o = false; return function (i) { if (o) { return } o = true; t[e] = i; if (--n.count === 0) { var a = r.resolve; a(t) } } }; var C = function (e, t, r) { var n = e.iterator; var o = []; var i = { count: 1 }; var a, u; var f = 0; while (true) { try { a = ce.IteratorStep(n); if (a === false) { e.done = true; break } u = a.value } catch (s) { e.done = true; throw s } o[f] = void 0; var c = t.resolve(u); var l = P(f, o, r, i); i.count += 1; w(c.then, c, l, r.reject); f += 1 } if (--i.count === 0) { var p = r.resolve; p(o) } return r.promise }; var x = function (e, t, r) { var n = e.iterator; var o, i, a; while (true) { try { o = ce.IteratorStep(n); if (o === false) { e.done = true; break } i = o.value } catch (u) { e.done = true; throw u } a = t.resolve(i); w(a.then, a, r.resolve, r.reject) } return r.promise }; b(E, { all: function all(e) { var t = this; if (!ce.TypeIsObject(t)) { throw new TypeError("Promise is not object") } var n = new r(t); var o, i; try { o = ce.GetIterator(e); i = { iterator: o, done: false }; return C(i, t, n) } catch (a) { var u = a; if (i && !i.done) { try { ce.IteratorClose(o, true) } catch (f) { u = f } } var s = n.reject; s(u); return n.promise } }, race: function race(e) { var t = this; if (!ce.TypeIsObject(t)) { throw new TypeError("Promise is not object") } var n = new r(t); var o, i; try { o = ce.GetIterator(e); i = { iterator: o, done: false }; return x(i, t, n) } catch (a) { var u = a; if (i && !i.done) { try { ce.IteratorClose(o, true) } catch (f) { u = f } } var s = n.reject; s(u); return n.promise } }, reject: function reject(e) { var t = this; if (!ce.TypeIsObject(t)) { throw new TypeError("Bad promise constructor") } var n = new r(t); var o = n.reject; o(e); return n.promise }, resolve: function resolve(e) { var t = this; if (!ce.TypeIsObject(t)) { throw new TypeError("Bad promise constructor") } if (ce.IsPromise(e)) { var n = e.constructor; if (n === t) { return e } } var o = new r(t); var i = o.resolve; i(e); return o.promise } }); b(T, { "catch": function (e) { return this.then(null, e) }, then: function then(e, t) { var n = this; if (!ce.IsPromise(n)) { throw new TypeError("not a promise") } var o = ce.SpeciesConstructor(n, E); var i; var b = arguments.length > 2 && arguments[2] === y; if (b && o === E) { i = y } else { i = new r(o) } var g = ce.IsCallable(e) ? e : a; var d = ce.IsCallable(t) ? t : u; var m = n._promise; var O; if (m.state === f) { if (m.reactionLength === 0) { m.fulfillReactionHandler0 = g; m.rejectReactionHandler0 = d; m.reactionCapability0 = i } else { var w = 3 * (m.reactionLength - 1); m[w + l] = g; m[w + p] = d; m[w + v] = i } m.reactionLength += 1 } else if (m.state === s) { O = m.result; h(g, i, O) } else if (m.state === c) { O = m.result; h(d, i, O) } else { throw new TypeError("unexpected Promise state") } return i.promise } }); y = new r(E); I = T.then; return E }(); if (S.Promise) { delete S.Promise.accept; delete S.Promise.defer; delete S.Promise.prototype.chain } if (typeof Fr === "function") { b(S, { Promise: Fr }); var Dr = w(S.Promise, function (e) { return e.resolve(42).then(function () { }) instanceof e }); var zr = !i(function () { return S.Promise.reject(42).then(null, 5).then(null, W) }); var qr = i(function () { return S.Promise.call(3, W) }); var Wr = function (e) { var t = e.resolve(5); t.constructor = {}; var r = e.resolve(t); try { r.then(null, W).then(null, W) } catch (n) { return true } return t === r }(S.Promise); var Gr = s && function () { var e = 0; var t = Object.defineProperty({}, "then", { get: function () { e += 1 } }); Promise.resolve(t); return e === 1 }(); var Hr = function BadResolverPromise(e) { var t = new Promise(e); e(3, function () { }); this.then = t.then; this.constructor = BadResolverPromise }; Hr.prototype = Promise.prototype; Hr.all = Promise.all; var Vr = a(function () { return !!Hr.all([1, 2]) }); if (!Dr || !zr || !qr || Wr || !Gr || Vr) { Promise = Fr; ne(S, "Promise", Fr) } if (Promise.all.length !== 1) { var Br = Promise.all; ne(Promise, "all", function all(e) { return ce.Call(Br, this, arguments) }) } if (Promise.race.length !== 1) { var Ur = Promise.race; ne(Promise, "race", function race(e) { return ce.Call(Ur, this, arguments) }) } if (Promise.resolve.length !== 1) { var $r = Promise.resolve; ne(Promise, "resolve", function resolve(e) { return ce.Call($r, this, arguments) }) } if (Promise.reject.length !== 1) { var Jr = Promise.reject; ne(Promise, "reject", function reject(e) { return ce.Call(Jr, this, arguments) }) } Mt(Promise, "all"); Mt(Promise, "race"); Mt(Promise, "resolve"); Mt(Promise, "reject"); Ce(Promise) } var Xr = function (e) { var t = n(p(e, function (e, t) { e[t] = true; return e }, {})); return e.join(":") === t.join(":") }; var Kr = Xr(["z", "a", "bb"]); var Zr = Xr(["z", 1, "a", "3", 2]); if (s) { var Yr = function fastkey(e, t) { if (!t && !Kr) { return null } if (se(e)) { return "^" + ce.ToString(e) } else if (typeof e === "string") { return "$" + e } else if (typeof e === "number") { if (!Zr) { return "n" + e } return e } else if (typeof e === "boolean") { return "b" + e } return null }; var Qr = function emptyObject() { return Object.create ? Object.create(null) : {} }; var en = function addIterableToMap(e, n, o) { if (r(o) || re.string(o)) { l(o, function (e) { if (!ce.TypeIsObject(e)) { throw new TypeError("Iterator value " + e + " is not an entry object") } n.set(e[0], e[1]) }) } else if (o instanceof e) { t(e.prototype.forEach, o, function (e, t) { n.set(t, e) }) } else { var i, a; if (!se(o)) { a = n.set; if (!ce.IsCallable(a)) { throw new TypeError("bad map") } i = ce.GetIterator(o) } if (typeof i !== "undefined") { while (true) { var u = ce.IteratorStep(i); if (u === false) { break } var f = u.value; try { if (!ce.TypeIsObject(f)) { throw new TypeError("Iterator value " + f + " is not an entry object") } t(a, n, f[0], f[1]) } catch (s) { ce.IteratorClose(i, true); throw s } } } } }; var tn = function addIterableToSet(e, n, o) { if (r(o) || re.string(o)) { l(o, function (e) { n.add(e) }) } else if (o instanceof e) { t(e.prototype.forEach, o, function (e) { n.add(e) }) } else { var i, a; if (!se(o)) { a = n.add; if (!ce.IsCallable(a)) { throw new TypeError("bad set") } i = ce.GetIterator(o) } if (typeof i !== "undefined") { while (true) { var u = ce.IteratorStep(i); if (u === false) { break } var f = u.value; try { t(a, n, f) } catch (s) { ce.IteratorClose(i, true); throw s } } } } }; var rn = { Map: function () { var e = {}; var r = function MapEntry(e, t) { this.key = e; this.value = t; this.next = null; this.prev = null }; r.prototype.isRemoved = function isRemoved() { return this.key === e }; var n = function isMap(e) { return !!e._es6map }; var o = function requireMapSlot(e, t) { if (!ce.TypeIsObject(e) || !n(e)) { throw new TypeError("Method Map.prototype." + t + " called on incompatible receiver " + ce.ToString(e)) } }; var i = function MapIterator(e, t) { o(e, "[[MapIterator]]"); this.head = e._head; this.i = this.head; this.kind = t }; i.prototype = { isMapIterator: true, next: function next() { if (!this.isMapIterator) { throw new TypeError("Not a MapIterator") } var e = this.i; var t = this.kind; var r = this.head; if (typeof this.i === "undefined") { return Ke() } while (e.isRemoved() && e !== r) { e = e.prev } var n; while (e.next !== r) { e = e.next; if (!e.isRemoved()) { if (t === "key") { n = e.key } else if (t === "value") { n = e.value } else { n = [e.key, e.value] } this.i = e; return Ke(n) } } this.i = void 0; return Ke() } }; Me(i.prototype); var a; var u = function Map() { if (!(this instanceof Map)) { throw new TypeError('Constructor Map requires "new"') } if (this && this._es6map) { throw new TypeError("Bad construction") } var e = Ae(this, Map, a, { _es6map: true, _head: null, _map: G ? new G : null, _size: 0, _storage: Qr() }); var t = new r(null, null); t.next = t.prev = t; e._head = t; if (arguments.length > 0) { en(Map, e, arguments[0]) } return e }; a = u.prototype; m.getter(a, "size", function () { if (typeof this._size === "undefined") { throw new TypeError("size method called on incompatible Map") } return this._size }); b(a, { get: function get(e) { o(this, "get"); var t; var r = Yr(e, true); if (r !== null) { t = this._storage[r]; if (t) { return t.value } else { return } } if (this._map) { t = V.call(this._map, e); if (t) { return t.value } else { return } } var n = this._head; var i = n; while ((i = i.next) !== n) { if (ce.SameValueZero(i.key, e)) { return i.value } } }, has: function has(e) { o(this, "has"); var t = Yr(e, true); if (t !== null) { return typeof this._storage[t] !== "undefined" } if (this._map) { return B.call(this._map, e) } var r = this._head; var n = r; while ((n = n.next) !== r) { if (ce.SameValueZero(n.key, e)) { return true } } return false }, set: function set(e, t) { o(this, "set"); var n = this._head; var i = n; var a; var u = Yr(e, true); if (u !== null) { if (typeof this._storage[u] !== "undefined") { this._storage[u].value = t; return this } else { a = this._storage[u] = new r(e, t); i = n.prev } } else if (this._map) { if (B.call(this._map, e)) { V.call(this._map, e).value = t } else { a = new r(e, t); U.call(this._map, e, a); i = n.prev } } while ((i = i.next) !== n) { if (ce.SameValueZero(i.key, e)) { i.value = t; return this } } a = a || new r(e, t); if (ce.SameValue(-0, e)) { a.key = +0 } a.next = this._head; a.prev = this._head.prev; a.prev.next = a; a.next.prev = a; this._size += 1; return this }, "delete": function (t) { o(this, "delete"); var r = this._head; var n = r; var i = Yr(t, true); if (i !== null) { if (typeof this._storage[i] === "undefined") { return false } n = this._storage[i].prev; delete this._storage[i] } else if (this._map) { if (!B.call(this._map, t)) { return false } n = V.call(this._map, t).prev; H.call(this._map, t) } while ((n = n.next) !== r) { if (ce.SameValueZero(n.key, t)) { n.key = e; n.value = e; n.prev.next = n.next; n.next.prev = n.prev; this._size -= 1; return true } } return false }, clear: function clear() { o(this, "clear"); this._map = G ? new G : null; this._size = 0; this._storage = Qr(); var t = this._head; var r = t; var n = r.next; while ((r = n) !== t) { r.key = e; r.value = e; n = r.next; r.next = r.prev = t } t.next = t.prev = t }, keys: function keys() { o(this, "keys"); return new i(this, "key") }, values: function values() { o(this, "values"); return new i(this, "value") }, entries: function entries() { o(this, "entries"); return new i(this, "key+value") }, forEach: function forEach(e) { o(this, "forEach"); var r = arguments.length > 1 ? arguments[1] : null; var n = this.entries(); for (var i = n.next(); !i.done; i = n.next()) { if (r) { t(e, r, i.value[1], i.value[0], this) } else { e(i.value[1], i.value[0], this) } } } }); Me(a, a.entries); return u }(), Set: function () { var e = function isSet(e) { return e._es6set && typeof e._storage !== "undefined" }; var r = function requireSetSlot(t, r) { if (!ce.TypeIsObject(t) || !e(t)) { throw new TypeError("Set.prototype." + r + " called on incompatible receiver " + ce.ToString(t)) } }; var o; var i = function Set() { if (!(this instanceof Set)) { throw new TypeError('Constructor Set requires "new"') } if (this && this._es6set) { throw new TypeError("Bad construction") } var e = Ae(this, Set, o, { _es6set: true, "[[SetData]]": null, _storage: Qr() }); if (!e._es6set) { throw new TypeError("bad set") } if (arguments.length > 0) { tn(Set, e, arguments[0]) } return e }; o = i.prototype; var a = function (e) { var t = e; if (t === "^null") { return null } else if (t === "^undefined") { return void 0 } else { var r = t.charAt(0); if (r === "$") { return C(t, 1) } else if (r === "n") { return +C(t, 1) } else if (r === "b") { return t === "btrue" } } return +t }; var u = function ensureMap(e) { if (!e["[[SetData]]"]) { var t = new rn.Map; e["[[SetData]]"] = t; l(n(e._storage), function (e) { var r = a(e); t.set(r, r) }); e["[[SetData]]"] = t } e._storage = null }; m.getter(i.prototype, "size", function () { r(this, "size"); if (this._storage) { return n(this._storage).length } u(this); return this["[[SetData]]"].size }); b(i.prototype, { has: function has(e) { r(this, "has"); var t; if (this._storage && (t = Yr(e)) !== null) { return !!this._storage[t] } u(this); return this["[[SetData]]"].has(e) }, add: function add(e) { r(this, "add"); var t; if (this._storage && (t = Yr(e)) !== null) { this._storage[t] = true; return this } u(this); this["[[SetData]]"].set(e, e); return this }, "delete": function (e) { r(this, "delete"); var t; if (this._storage && (t = Yr(e)) !== null) { var n = z(this._storage, t); return delete this._storage[t] && n } u(this); return this["[[SetData]]"]["delete"](e) }, clear: function clear() { r(this, "clear"); if (this._storage) { this._storage = Qr() } if (this["[[SetData]]"]) { this["[[SetData]]"].clear() } }, values: function values() { r(this, "values"); u(this); return new f(this["[[SetData]]"].values()) }, entries: function entries() { r(this, "entries"); u(this); return new f(this["[[SetData]]"].entries()) }, forEach: function forEach(e) { r(this, "forEach"); var n = arguments.length > 1 ? arguments[1] : null; var o = this; u(o); this["[[SetData]]"].forEach(function (r, i) { if (n) { t(e, n, i, i, o) } else { e(i, i, o) } }) } }); h(i.prototype, "keys", i.prototype.values, true); Me(i.prototype, i.prototype.values); var f = function SetIterator(e) { this.it = e }; f.prototype = { isSetIterator: true, next: function next() { if (!this.isSetIterator) { throw new TypeError("Not a SetIterator") } return this.it.next() } }; Me(f.prototype); return i }() }; var nn = S.Set && !Set.prototype["delete"] && Set.prototype.remove && Set.prototype.items && Set.prototype.map && Array.isArray((new Set).keys); if (nn) { S.Set = rn.Set } if (S.Map || S.Set) { var on = a(function () { return new Map([[1, 2]]).get(1) === 2 }); if (!on) { S.Map = function Map() { if (!(this instanceof Map)) { throw new TypeError('Constructor Map requires "new"') } var e = new G; if (arguments.length > 0) { en(Map, e, arguments[0]) } delete e.constructor; Object.setPrototypeOf(e, S.Map.prototype); return e }; S.Map.prototype = O(G.prototype); h(S.Map.prototype, "constructor", S.Map, true); m.preserveToString(S.Map, G) } var an = new Map; var un = function () { var e = new Map([[1, 0], [2, 0], [3, 0], [4, 0]]); e.set(-0, e); return e.get(0) === e && e.get(-0) === e && e.has(0) && e.has(-0) }(); var fn = an.set(1, 2) === an; if (!un || !fn) { ne(Map.prototype, "set", function set(e, r) { t(U, this, e === 0 ? 0 : e, r); return this }) } if (!un) { b(Map.prototype, { get: function get(e) { return t(V, this, e === 0 ? 0 : e) }, has: function has(e) { return t(B, this, e === 0 ? 0 : e) } }, true); m.preserveToString(Map.prototype.get, V); m.preserveToString(Map.prototype.has, B) } var sn = new Set; var cn = Set.prototype["delete"] && Set.prototype.add && Set.prototype.has && function (e) { e["delete"](0); e.add(-0); return !e.has(0) }(sn); var ln = sn.add(1) === sn; if (!cn || !ln) { var pn = Set.prototype.add; Set.prototype.add = function add(e) { t(pn, this, e === 0 ? 0 : e); return this }; m.preserveToString(Set.prototype.add, pn) } if (!cn) { var vn = Set.prototype.has; Set.prototype.has = function has(e) { return t(vn, this, e === 0 ? 0 : e) }; m.preserveToString(Set.prototype.has, vn); var yn = Set.prototype["delete"]; Set.prototype["delete"] = function SetDelete(e) { return t(yn, this, e === 0 ? 0 : e) }; m.preserveToString(Set.prototype["delete"], yn) } var hn = w(S.Map, function (e) { var t = new e([]); t.set(42, 42); return t instanceof e }); var bn = Object.setPrototypeOf && !hn; var gn = function () { try { return !(S.Map() instanceof S.Map) } catch (e) { return e instanceof TypeError } }(); if (S.Map.length !== 0 || bn || !gn) { S.Map = function Map() { if (!(this instanceof Map)) { throw new TypeError('Constructor Map requires "new"') } var e = new G; if (arguments.length > 0) { en(Map, e, arguments[0]) } delete e.constructor; Object.setPrototypeOf(e, Map.prototype); return e }; S.Map.prototype = G.prototype; h(S.Map.prototype, "constructor", S.Map, true); m.preserveToString(S.Map, G) } var dn = w(S.Set, function (e) { var t = new e([]); t.add(42, 42); return t instanceof e }); var mn = Object.setPrototypeOf && !dn; var On = function () { try { return !(S.Set() instanceof S.Set) } catch (e) { return e instanceof TypeError } }(); if (S.Set.length !== 0 || mn || !On) { var wn = S.Set; S.Set = function Set() { if (!(this instanceof Set)) { throw new TypeError('Constructor Set requires "new"') } var e = new wn; if (arguments.length > 0) { tn(Set, e, arguments[0]) } delete e.constructor; Object.setPrototypeOf(e, Set.prototype); return e }; S.Set.prototype = wn.prototype; h(S.Set.prototype, "constructor", S.Set, true); m.preserveToString(S.Set, wn) } var jn = new S.Map; var Sn = !a(function () { return jn.keys().next().done }); if (typeof S.Map.prototype.clear !== "function" || (new S.Set).size !== 0 || jn.size !== 0 || typeof S.Map.prototype.keys !== "function" || typeof S.Set.prototype.keys !== "function" || typeof S.Map.prototype.forEach !== "function" || typeof S.Set.prototype.forEach !== "function" || u(S.Map) || u(S.Set) || typeof jn.keys().next !== "function" || Sn || !hn) { b(S, { Map: rn.Map, Set: rn.Set }, true) } if (S.Set.prototype.keys !== S.Set.prototype.values) { h(S.Set.prototype, "keys", S.Set.prototype.values, true) } Me(Object.getPrototypeOf((new S.Map).keys())); Me(Object.getPrototypeOf((new S.Set).keys())); if (c && S.Set.prototype.has.name !== "has") { var Tn = S.Set.prototype.has; ne(S.Set.prototype, "has", function has(e) { return t(Tn, this, e) }) } } b(S, rn); Ce(S.Map); Ce(S.Set) } var In = function throwUnlessTargetIsObject(e) { if (!ce.TypeIsObject(e)) { throw new TypeError("target must be an object") } }; var En = { apply: function apply() { return ce.Call(ce.Call, null, arguments) }, construct: function construct(e, t) { if (!ce.IsConstructor(e)) { throw new TypeError("First argument must be a constructor.") } var r = arguments.length > 2 ? arguments[2] : e; if (!ce.IsConstructor(r)) { throw new TypeError("new.target must be a constructor.") } return ce.Construct(e, t, r, "internal") }, deleteProperty: function deleteProperty(e, t) { In(e); if (s) { var r = Object.getOwnPropertyDescriptor(e, t); if (r && !r.configurable) { return false } } return delete e[t] }, has: function has(e, t) { In(e); return t in e } }; if (Object.getOwnPropertyNames) { Object.assign(En, { ownKeys: function ownKeys(e) { In(e); var t = Object.getOwnPropertyNames(e); if (ce.IsCallable(Object.getOwnPropertySymbols)) { x(t, Object.getOwnPropertySymbols(e)) } return t } }) } var Pn = function ConvertExceptionToBoolean(e) { return !i(e) }; if (Object.preventExtensions) { Object.assign(En, { isExtensible: function isExtensible(e) { In(e); return Object.isExtensible(e) }, preventExtensions: function preventExtensions(e) { In(e); return Pn(function () { return Object.preventExtensions(e) }) } }) } if (s) { var Cn = function get(e, t, r) { var n = Object.getOwnPropertyDescriptor(e, t); if (!n) { var o = Object.getPrototypeOf(e); if (o === null) { return void 0 } return Cn(o, t, r) } if ("value" in n) { return n.value } if (n.get) { return ce.Call(n.get, r) } return void 0 }; var Mn = function set(e, r, n, o) { var i = Object.getOwnPropertyDescriptor(e, r); if (!i) { var a = Object.getPrototypeOf(e); if (a !== null) { return Mn(a, r, n, o) } i = { value: void 0, writable: true, enumerable: true, configurable: true } } if ("value" in i) { if (!i.writable) { return false } if (!ce.TypeIsObject(o)) { return false } var u = Object.getOwnPropertyDescriptor(o, r); if (u) { return ae.defineProperty(o, r, { value: n }) } else { return ae.defineProperty(o, r, { value: n, writable: true, enumerable: true, configurable: true }) } } if (i.set) { t(i.set, o, n); return true } return false }; Object.assign(En, { defineProperty: function defineProperty(e, t, r) { In(e); return Pn(function () { return Object.defineProperty(e, t, r) }) }, getOwnPropertyDescriptor: function getOwnPropertyDescriptor(e, t) { In(e); return Object.getOwnPropertyDescriptor(e, t) }, get: function get(e, t) { In(e); var r = arguments.length > 2 ? arguments[2] : e; return Cn(e, t, r) }, set: function set(e, t, r) { In(e); var n = arguments.length > 3 ? arguments[3] : e; return Mn(e, t, r, n) } }) } if (Object.getPrototypeOf) { var xn = Object.getPrototypeOf; En.getPrototypeOf = function getPrototypeOf(e) { In(e); return xn(e) } } if (Object.setPrototypeOf && En.getPrototypeOf) { var Nn = function (e, t) { var r = t; while (r) { if (e === r) { return true } r = En.getPrototypeOf(r) } return false }; Object.assign(En, { setPrototypeOf: function setPrototypeOf(e, t) { In(e); if (t !== null && !ce.TypeIsObject(t)) { throw new TypeError("proto must be an object or null") } if (t === ae.getPrototypeOf(e)) { return true } if (ae.isExtensible && !ae.isExtensible(e)) { return false } if (Nn(e, t)) { return false } Object.setPrototypeOf(e, t); return true } }) } var An = function (e, t) { if (!ce.IsCallable(S.Reflect[e])) { h(S.Reflect, e, t) } else { var r = a(function () { S.Reflect[e](1); S.Reflect[e](NaN); S.Reflect[e](true); return true }); if (r) { ne(S.Reflect, e, t) } } }; Object.keys(En).forEach(function (e) { An(e, En[e]) }); var Rn = S.Reflect.getPrototypeOf; if (c && Rn && Rn.name !== "getPrototypeOf") { ne(S.Reflect, "getPrototypeOf", function getPrototypeOf(e) { return t(Rn, S.Reflect, e) }) } if (S.Reflect.setPrototypeOf) { if (a(function () { S.Reflect.setPrototypeOf(1, {}); return true })) { ne(S.Reflect, "setPrototypeOf", En.setPrototypeOf) } } if (S.Reflect.defineProperty) { if (!a(function () { var e = !S.Reflect.defineProperty(1, "test", { value: 1 }); var t = typeof Object.preventExtensions !== "function" || !S.Reflect.defineProperty(Object.preventExtensions({}), "test", {}); return e && t })) { ne(S.Reflect, "defineProperty", En.defineProperty) } } if (S.Reflect.construct) { if (!a(function () { var e = function F() { }; return S.Reflect.construct(function () { }, [], e) instanceof e })) { ne(S.Reflect, "construct", En.construct) } } if (String(new Date(NaN)) !== "Invalid Date") { var _n = Date.prototype.toString; var kn = function toString() { var e = +this; if (e !== e) { return "Invalid Date" } return ce.Call(_n, this) }; ne(Date.prototype, "toString", kn) } var Ln = { anchor: function anchor(e) { return ce.CreateHTML(this, "a", "name", e) }, big: function big() { return ce.CreateHTML(this, "big", "", "") }, blink: function blink() { return ce.CreateHTML(this, "blink", "", "") }, bold: function bold() { return ce.CreateHTML(this, "b", "", "") }, fixed: function fixed() { return ce.CreateHTML(this, "tt", "", "") }, fontcolor: function fontcolor(e) { return ce.CreateHTML(this, "font", "color", e) }, fontsize: function fontsize(e) { return ce.CreateHTML(this, "font", "size", e) }, italics: function italics() { return ce.CreateHTML(this, "i", "", "") }, link: function link(e) { return ce.CreateHTML(this, "a", "href", e) }, small: function small() { return ce.CreateHTML(this, "small", "", "") }, strike: function strike() { return ce.CreateHTML(this, "strike", "", "") }, sub: function sub() { return ce.CreateHTML(this, "sub", "", "") }, sup: function sub() { return ce.CreateHTML(this, "sup", "", "") } }; l(Object.keys(Ln), function (e) { var r = String.prototype[e]; var n = false; if (ce.IsCallable(r)) { var o = t(r, "", ' " '); var i = P([], o.match(/"/g)).length; n = o !== o.toLowerCase() || i > 2 } else { n = true } if (n) { ne(String.prototype, e, Ln[e]) } }); var Fn = function () { if (!oe) { return false } var e = typeof JSON === "object" && typeof JSON.stringify === "function" ? JSON.stringify : null; if (!e) { return false } if (typeof e($()) !== "undefined") { return true } if (e([$()]) !== "[null]") { return true } var t = { a: $() }; t[$()] = true; if (e(t) !== "{}") { return true } return false }(); var Dn = a(function () { if (!oe) { return true } return JSON.stringify(Object($())) === "{}" && JSON.stringify([Object($())]) === "[{}]" }); if (Fn || !Dn) { var zn = JSON.stringify; ne(JSON, "stringify", function stringify(e) { if (typeof e === "symbol") { return } var n; if (arguments.length > 1) { n = arguments[1] } var o = [e]; if (!r(n)) { var i = ce.IsCallable(n) ? n : null; var a = function (e, r) { var n = i ? t(i, this, e, r) : r; if (typeof n !== "symbol") { if (re.symbol(n)) { return Nt({})(n) } else { return n } } }; o.push(a) } else { o.push(n) } if (arguments.length > 2) { o.push(arguments[2]) } return zn.apply(this, o) }) } return S
+});
 //# sourceMappingURL=es6-shim.map
 
 /*! jQuery v1.8.3 jquery.com | jquery.org/license */
-(function(e,t){function _(e){var t=M[e]={};return v.each(e.split(y),function(e,n){t[n]=!0}),t}function H(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else r=t}return r}function B(e){var t;for(t in e){if(t==="data"&&v.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function et(){return!1}function tt(){return!0}function ut(e){return!e||!e.parentNode||e.parentNode.nodeType===11}function at(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function ft(e,t,n){t=t||0;if(v.isFunction(t))return v.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return v.grep(e,function(e,r){return e===t===n});if(typeof t=="string"){var r=v.grep(e,function(e){return e.nodeType===1});if(it.test(t))return v.filter(t,r,!n);t=v.filter(t,r)}return v.grep(e,function(e,r){return v.inArray(e,t)>=0===n})}function lt(e){var t=ct.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function At(e,t){if(t.nodeType!==1||!v.hasData(e))return;var n,r,i,s=v._data(e),o=v._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r<i;r++)v.event.add(t,n,u[n][r])}o.data&&(o.data=v.extend({},o.data))}function Ot(e,t){var n;if(t.nodeType!==1)return;t.clearAttributes&&t.clearAttributes(),t.mergeAttributes&&t.mergeAttributes(e),n=t.nodeName.toLowerCase(),n==="object"?(t.parentNode&&(t.outerHTML=e.outerHTML),v.support.html5Clone&&e.innerHTML&&!v.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):n==="input"&&Et.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):n==="option"?t.selected=e.defaultSelected:n==="input"||n==="textarea"?t.defaultValue=e.defaultValue:n==="script"&&t.text!==e.text&&(t.text=e.text),t.removeAttribute(v.expando)}function Mt(e){return typeof e.getElementsByTagName!="undefined"?e.getElementsByTagName("*"):typeof e.querySelectorAll!="undefined"?e.querySelectorAll("*"):[]}function _t(e){Et.test(e.type)&&(e.defaultChecked=e.checked)}function Qt(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Jt.length;while(i--){t=Jt[i]+n;if(t in e)return t}return r}function Gt(e,t){return e=t||e,v.css(e,"display")==="none"||!v.contains(e.ownerDocument,e)}function Yt(e,t){var n,r,i=[],s=0,o=e.length;for(;s<o;s++){n=e[s];if(!n.style)continue;i[s]=v._data(n,"olddisplay"),t?(!i[s]&&n.style.display==="none"&&(n.style.display=""),n.style.display===""&&Gt(n)&&(i[s]=v._data(n,"olddisplay",nn(n.nodeName)))):(r=Dt(n,"display"),!i[s]&&r!=="none"&&v._data(n,"olddisplay",r))}for(s=0;s<o;s++){n=e[s];if(!n.style)continue;if(!t||n.style.display==="none"||n.style.display==="")n.style.display=t?i[s]||"":"none"}return e}function Zt(e,t,n){var r=Rt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function en(e,t,n,r){var i=n===(r?"border":"content")?4:t==="width"?1:0,s=0;for(;i<4;i+=2)n==="margin"&&(s+=v.css(e,n+$t[i],!0)),r?(n==="content"&&(s-=parseFloat(Dt(e,"padding"+$t[i]))||0),n!=="margin"&&(s-=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0)):(s+=parseFloat(Dt(e,"padding"+$t[i]))||0,n!=="padding"&&(s+=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0));return s}function tn(e,t,n){var r=t==="width"?e.offsetWidth:e.offsetHeight,i=!0,s=v.support.boxSizing&&v.css(e,"boxSizing")==="border-box";if(r<=0||r==null){r=Dt(e,t);if(r<0||r==null)r=e.style[t];if(Ut.test(r))return r;i=s&&(v.support.boxSizingReliable||r===e.style[t]),r=parseFloat(r)||0}return r+en(e,t,n||(s?"border":"content"),i)+"px"}function nn(e){if(Wt[e])return Wt[e];var t=v("<"+e+">").appendTo(i.body),n=t.css("display");t.remove();if(n==="none"||n===""){Pt=i.body.appendChild(Pt||v.extend(i.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!Ht||!Pt.createElement)Ht=(Pt.contentWindow||Pt.contentDocument).document,Ht.write("<!doctype html><html><body>"),Ht.close();t=Ht.body.appendChild(Ht.createElement(e)),n=Dt(t,"display"),i.body.removeChild(Pt)}return Wt[e]=n,n}function fn(e,t,n,r){var i;if(v.isArray(t))v.each(t,function(t,i){n||sn.test(e)?r(e,i):fn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&v.type(t)==="object")for(i in t)fn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Cn(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i,s,o=t.toLowerCase().split(y),u=0,a=o.length;if(v.isFunction(n))for(;u<a;u++)r=o[u],s=/^\+/.test(r),s&&(r=r.substr(1)||"*"),i=e[r]=e[r]||[],i[s?"unshift":"push"](n)}}function kn(e,n,r,i,s,o){s=s||n.dataTypes[0],o=o||{},o[s]=!0;var u,a=e[s],f=0,l=a?a.length:0,c=e===Sn;for(;f<l&&(c||!u);f++)u=a[f](n,r,i),typeof u=="string"&&(!c||o[u]?u=t:(n.dataTypes.unshift(u),u=kn(e,n,r,i,u,o)));return(c||!u)&&!o["*"]&&(u=kn(e,n,r,i,"*",o)),u}function Ln(e,n){var r,i,s=v.ajaxSettings.flatOptions||{};for(r in n)n[r]!==t&&((s[r]?e:i||(i={}))[r]=n[r]);i&&v.extend(!0,e,i)}function An(e,n,r){var i,s,o,u,a=e.contents,f=e.dataTypes,l=e.responseFields;for(s in l)s in r&&(n[l[s]]=r[s]);while(f[0]==="*")f.shift(),i===t&&(i=e.mimeType||n.getResponseHeader("content-type"));if(i)for(s in a)if(a[s]&&a[s].test(i)){f.unshift(s);break}if(f[0]in r)o=f[0];else{for(s in r){if(!f[0]||e.converters[s+" "+f[0]]){o=s;break}u||(u=s)}o=o||u}if(o)return o!==f[0]&&f.unshift(o),r[o]}function On(e,t){var n,r,i,s,o=e.dataTypes.slice(),u=o[0],a={},f=0;e.dataFilter&&(t=e.dataFilter(t,e.dataType));if(o[1])for(n in e.converters)a[n.toLowerCase()]=e.converters[n];for(;i=o[++f];)if(i!=="*"){if(u!=="*"&&u!==i){n=a[u+" "+i]||a["* "+i];if(!n)for(r in a){s=r.split(" ");if(s[1]===i){n=a[u+" "+s[0]]||a["* "+s[0]];if(n){n===!0?n=a[r]:a[r]!==!0&&(i=s[0],o.splice(f--,0,i));break}}}if(n!==!0)if(n&&e["throws"])t=n(t);else try{t=n(t)}catch(l){return{state:"parsererror",error:n?l:"No conversion from "+u+" to "+i}}}u=i}return{state:"success",data:t}}function Fn(){try{return new e.XMLHttpRequest}catch(t){}}function In(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function $n(){return setTimeout(function(){qn=t},0),qn=v.now()}function Jn(e,t){v.each(t,function(t,n){var r=(Vn[t]||[]).concat(Vn["*"]),i=0,s=r.length;for(;i<s;i++)if(r[i].call(e,t,n))return})}function Kn(e,t,n){var r,i=0,s=0,o=Xn.length,u=v.Deferred().always(function(){delete a.elem}),a=function(){var t=qn||$n(),n=Math.max(0,f.startTime+f.duration-t),r=n/f.duration||0,i=1-r,s=0,o=f.tweens.length;for(;s<o;s++)f.tweens[s].run(i);return u.notifyWith(e,[f,i,n]),i<1&&o?n:(u.resolveWith(e,[f]),!1)},f=u.promise({elem:e,props:v.extend({},t),opts:v.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:qn||$n(),duration:n.duration,tweens:[],createTween:function(t,n,r){var i=v.Tween(e,f.opts,t,n,f.opts.specialEasing[t]||f.opts.easing);return f.tweens.push(i),i},stop:function(t){var n=0,r=t?f.tweens.length:0;for(;n<r;n++)f.tweens[n].run(1);return t?u.resolveWith(e,[f,t]):u.rejectWith(e,[f,t]),this}}),l=f.props;Qn(l,f.opts.specialEasing);for(;i<o;i++){r=Xn[i].call(f,e,l,f.opts);if(r)return r}return Jn(f,l),v.isFunction(f.opts.start)&&f.opts.start.call(e,f),v.fx.timer(v.extend(a,{anim:f,queue:f.opts.queue,elem:e})),f.progress(f.opts.progress).done(f.opts.done,f.opts.complete).fail(f.opts.fail).always(f.opts.always)}function Qn(e,t){var n,r,i,s,o;for(n in e){r=v.camelCase(n),i=t[r],s=e[n],v.isArray(s)&&(i=s[1],s=e[n]=s[0]),n!==r&&(e[r]=s,delete e[n]),o=v.cssHooks[r];if(o&&"expand"in o){s=o.expand(s),delete e[r];for(n in s)n in e||(e[n]=s[n],t[n]=i)}else t[r]=i}}function Gn(e,t,n){var r,i,s,o,u,a,f,l,c,h=this,p=e.style,d={},m=[],g=e.nodeType&&Gt(e);n.queue||(l=v._queueHooks(e,"fx"),l.unqueued==null&&(l.unqueued=0,c=l.empty.fire,l.empty.fire=function(){l.unqueued||c()}),l.unqueued++,h.always(function(){h.always(function(){l.unqueued--,v.queue(e,"fx").length||l.empty.fire()})})),e.nodeType===1&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],v.css(e,"display")==="inline"&&v.css(e,"float")==="none"&&(!v.support.inlineBlockNeedsLayout||nn(e.nodeName)==="inline"?p.display="inline-block":p.zoom=1)),n.overflow&&(p.overflow="hidden",v.support.shrinkWrapBlocks||h.done(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t){s=t[r];if(Un.exec(s)){delete t[r],a=a||s==="toggle";if(s===(g?"hide":"show"))continue;m.push(r)}}o=m.length;if(o){u=v._data(e,"fxshow")||v._data(e,"fxshow",{}),"hidden"in u&&(g=u.hidden),a&&(u.hidden=!g),g?v(e).show():h.done(function(){v(e).hide()}),h.done(function(){var t;v.removeData(e,"fxshow",!0);for(t in d)v.style(e,t,d[t])});for(r=0;r<o;r++)i=m[r],f=h.createTween(i,g?u[i]:0),d[i]=u[i]||v.style(e,i),i in u||(u[i]=f.start,g&&(f.end=f.start,f.start=i==="width"||i==="height"?1:0))}}function Yn(e,t,n,r,i){return new Yn.prototype.init(e,t,n,r,i)}function Zn(e,t){var n,r={height:e},i=0;t=t?1:0;for(;i<4;i+=2-t)n=$t[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function tr(e){return v.isWindow(e)?e:e.nodeType===9?e.defaultView||e.parentWindow:!1}var n,r,i=e.document,s=e.location,o=e.navigator,u=e.jQuery,a=e.$,f=Array.prototype.push,l=Array.prototype.slice,c=Array.prototype.indexOf,h=Object.prototype.toString,p=Object.prototype.hasOwnProperty,d=String.prototype.trim,v=function(e,t){return new v.fn.init(e,t,n)},m=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,g=/\S/,y=/\s+/,b=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,w=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,T=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,N=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,C=/^-ms-/,k=/-([\da-z])/gi,L=function(e,t){return(t+"").toUpperCase()},A=function(){i.addEventListener?(i.removeEventListener("DOMContentLoaded",A,!1),v.ready()):i.readyState==="complete"&&(i.detachEvent("onreadystatechange",A),v.ready())},O={};v.fn=v.prototype={constructor:v,init:function(e,n,r){var s,o,u,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?s=[null,e,null]:s=w.exec(e);if(s&&(s[1]||!n)){if(s[1])return n=n instanceof v?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:i,e=v.parseHTML(s[1],a,!0),E.test(s[1])&&v.isPlainObject(n)&&this.attr.call(e,n,!0),v.merge(this,e);o=i.getElementById(s[2]);if(o&&o.parentNode){if(o.id!==s[2])return r.find(e);this.length=1,this[0]=o}return this.context=i,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return v.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),v.makeArray(e,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return l.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=v.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,t==="find"?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return v.each(this,e,t)},ready:function(e){return v.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(l.apply(this,arguments),"slice",l.call(arguments).join(","))},map:function(e){return this.pushStack(v.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:[].sort,splice:[].splice},v.fn.init.prototype=v.fn,v.extend=v.fn.extend=function(){var e,n,r,i,s,o,u=arguments[0]||{},a=1,f=arguments.length,l=!1;typeof u=="boolean"&&(l=u,u=arguments[1]||{},a=2),typeof u!="object"&&!v.isFunction(u)&&(u={}),f===a&&(u=this,--a);for(;a<f;a++)if((e=arguments[a])!=null)for(n in e){r=u[n],i=e[n];if(u===i)continue;l&&i&&(v.isPlainObject(i)||(s=v.isArray(i)))?(s?(s=!1,o=r&&v.isArray(r)?r:[]):o=r&&v.isPlainObject(r)?r:{},u[n]=v.extend(l,o,i)):i!==t&&(u[n]=i)}return u},v.extend({noConflict:function(t){return e.$===v&&(e.$=a),t&&e.jQuery===v&&(e.jQuery=u),v},isReady:!1,readyWait:1,holdReady:function(e){e?v.readyWait++:v.ready(!0)},ready:function(e){if(e===!0?--v.readyWait:v.isReady)return;if(!i.body)return setTimeout(v.ready,1);v.isReady=!0;if(e!==!0&&--v.readyWait>0)return;r.resolveWith(i,[v]),v.fn.trigger&&v(i).trigger("ready").off("ready")},isFunction:function(e){return v.type(e)==="function"},isArray:Array.isArray||function(e){return v.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return e==null?String(e):O[h.call(e)]||"object"},isPlainObject:function(e){if(!e||v.type(e)!=="object"||e.nodeType||v.isWindow(e))return!1;try{if(e.constructor&&!p.call(e,"constructor")&&!p.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||p.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return!e||typeof e!="string"?null:(typeof t=="boolean"&&(n=t,t=0),t=t||i,(r=E.exec(e))?[t.createElement(r[1])]:(r=v.buildFragment([e],t,n?null:[]),v.merge([],(r.cacheable?v.clone(r.fragment):r.fragment).childNodes)))},parseJSON:function(t){if(!t||typeof t!="string")return null;t=v.trim(t);if(e.JSON&&e.JSON.parse)return e.JSON.parse(t);if(S.test(t.replace(T,"@").replace(N,"]").replace(x,"")))return(new Function("return "+t))();v.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!="string")return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(s){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&v.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&g.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(C,"ms-").replace(k,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,n,r){var i,s=0,o=e.length,u=o===t||v.isFunction(e);if(r){if(u){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;s<o;)if(n.apply(e[s++],r)===!1)break}else if(u){for(i in e)if(n.call(e[i],i,e[i])===!1)break}else for(;s<o;)if(n.call(e[s],s,e[s++])===!1)break;return e},trim:d&&!d.call("\ufeff\u00a0")?function(e){return e==null?"":d.call(e)}:function(e){return e==null?"":(e+"").replace(b,"")},makeArray:function(e,t){var n,r=t||[];return e!=null&&(n=v.type(e),e.length==null||n==="string"||n==="function"||n==="regexp"||v.isWindow(e)?f.call(r,e):v.merge(r,e)),r},inArray:function(e,t,n){var r;if(t){if(c)return c.call(t,e,n);r=t.length,n=n?n<0?Math.max(0,r+n):n:0;for(;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,s=0;if(typeof r=="number")for(;s<r;s++)e[i++]=n[s];else while(n[s]!==t)e[i++]=n[s++];return e.length=i,e},grep:function(e,t,n){var r,i=[],s=0,o=e.length;n=!!n;for(;s<o;s++)r=!!t(e[s],s),n!==r&&i.push(e[s]);return i},map:function(e,n,r){var i,s,o=[],u=0,a=e.length,f=e instanceof v||a!==t&&typeof a=="number"&&(a>0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u<a;u++)i=n(e[u],u,r),i!=null&&(o[o.length]=i);else for(s in e)i=n(e[s],s,r),i!=null&&(o[o.length]=i);return o.concat.apply([],o)},guid:1,proxy:function(e,n){var r,i,s;return typeof n=="string"&&(r=e[n],n=e,e=r),v.isFunction(e)?(i=l.call(arguments,2),s=function(){return e.apply(n,i.concat(l.call(arguments)))},s.guid=e.guid=e.guid||v.guid++,s):t},access:function(e,n,r,i,s,o,u){var a,f=r==null,l=0,c=e.length;if(r&&typeof r=="object"){for(l in r)v.access(e,n,l,r[l],1,o,i);s=1}else if(i!==t){a=u===t&&v.isFunction(i),f&&(a?(a=n,n=function(e,t,n){return a.call(v(e),n)}):(n.call(e,i),n=null));if(n)for(;l<c;l++)n(e[l],r,a?i.call(e[l],l,n(e[l],r)):i,u);s=1}return s?e:f?n.call(e):c?n(e[0],r):o},now:function(){return(new Date).getTime()}}),v.ready.promise=function(t){if(!r){r=v.Deferred();if(i.readyState==="complete")setTimeout(v.ready,1);else if(i.addEventListener)i.addEventListener("DOMContentLoaded",A,!1),e.addEventListener("load",v.ready,!1);else{i.attachEvent("onreadystatechange",A),e.attachEvent("onload",v.ready);var n=!1;try{n=e.frameElement==null&&i.documentElement}catch(s){}n&&n.doScroll&&function o(){if(!v.isReady){try{n.doScroll("left")}catch(e){return setTimeout(o,50)}v.ready()}}()}}return r.promise(t)},v.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(e,t){O["[object "+t+"]"]=t.toLowerCase()}),n=v(i);var M={};v.Callbacks=function(e){e=typeof e=="string"?M[e]||_(e):v.extend({},e);var n,r,i,s,o,u,a=[],f=!e.once&&[],l=function(t){n=e.memory&&t,r=!0,u=s||0,s=0,o=a.length,i=!0;for(;a&&u<o;u++)if(a[u].apply(t[0],t[1])===!1&&e.stopOnFalse){n=!1;break}i=!1,a&&(f?f.length&&l(f.shift()):n?a=[]:c.disable())},c={add:function(){if(a){var t=a.length;(function r(t){v.each(t,function(t,n){var i=v.type(n);i==="function"?(!e.unique||!c.has(n))&&a.push(n):n&&n.length&&i!=="string"&&r(n)})})(arguments),i?o=a.length:n&&(s=t,l(n))}return this},remove:function(){return a&&v.each(arguments,function(e,t){var n;while((n=v.inArray(t,a,n))>-1)a.splice(n,1),i&&(n<=o&&o--,n<=u&&u--)}),this},has:function(e){return v.inArray(e,a)>-1},empty:function(){return a=[],this},disable:function(){return a=f=n=t,this},disabled:function(){return!a},lock:function(){return f=t,n||c.disable(),this},locked:function(){return!f},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],a&&(!r||f)&&(i?f.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},v.extend({Deferred:function(e){var t=[["resolve","done",v.Callbacks("once memory"),"resolved"],["reject","fail",v.Callbacks("once memory"),"rejected"],["notify","progress",v.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return v.Deferred(function(n){v.each(t,function(t,r){var s=r[0],o=e[t];i[r[1]](v.isFunction(o)?function(){var e=o.apply(this,arguments);e&&v.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===i?n:this,[e])}:n[s])}),e=null}).promise()},promise:function(e){return e!=null?v.extend(e,r):r}},i={};return r.pipe=r.then,v.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=o.fire,i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=l.call(arguments),r=n.length,i=r!==1||e&&v.isFunction(e.promise)?r:0,s=i===1?e:v.Deferred(),o=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?l.call(arguments):r,n===u?s.notifyWith(t,n):--i||s.resolveWith(t,n)}},u,a,f;if(r>1){u=new Array(r),a=new Array(r),f=new Array(r);for(;t<r;t++)n[t]&&v.isFunction(n[t].promise)?n[t].promise().done(o(t,f,n)).fail(s.reject).progress(o(t,a,u)):--i}return i||s.resolveWith(f,n),s.promise()}}),v.support=function(){var t,n,r,s,o,u,a,f,l,c,h,p=i.createElement("div");p.setAttribute("className","t"),p.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=p.getElementsByTagName("*"),r=p.getElementsByTagName("a")[0];if(!n||!r||!n.length)return{};s=i.createElement("select"),o=s.appendChild(i.createElement("option")),u=p.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:r.getAttribute("href")==="/a",opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:u.value==="on",optSelected:o.selected,getSetAttribute:p.className!=="t",enctype:!!i.createElement("form").enctype,html5Clone:i.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:i.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},u.checked=!0,t.noCloneChecked=u.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!o.disabled;try{delete p.test}catch(d){t.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",h=function(){t.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick"),p.detachEvent("onclick",h)),u=i.createElement("input"),u.value="t",u.setAttribute("type","radio"),t.radioValue=u.value==="t",u.setAttribute("checked","checked"),u.setAttribute("name","t"),p.appendChild(u),a=i.createDocumentFragment(),a.appendChild(p.lastChild),t.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,t.appendChecked=u.checked,a.removeChild(u),a.appendChild(p);if(p.attachEvent)for(l in{submit:!0,change:!0,focusin:!0})f="on"+l,c=f in p,c||(p.setAttribute(f,"return;"),c=typeof p[f]=="function"),t[l+"Bubbles"]=c;return v(function(){var n,r,s,o,u="padding:0;margin:0;border:0;display:block;overflow:hidden;",a=i.getElementsByTagName("body")[0];if(!a)return;n=i.createElement("div"),n.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",a.insertBefore(n,a.firstChild),r=i.createElement("div"),n.appendChild(r),r.innerHTML="<table><tr><td></td><td>t</td></tr></table>",s=r.getElementsByTagName("td"),s[0].style.cssText="padding:0;margin:0;border:0;display:none",c=s[0].offsetHeight===0,s[0].style.display="",s[1].style.display="none",t.reliableHiddenOffsets=c&&s[0].offsetHeight===0,r.innerHTML="",r.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=r.offsetWidth===4,t.doesNotIncludeMarginInBodyOffset=a.offsetTop!==1,e.getComputedStyle&&(t.pixelPosition=(e.getComputedStyle(r,null)||{}).top!=="1%",t.boxSizingReliable=(e.getComputedStyle(r,null)||{width:"4px"}).width==="4px",o=i.createElement("div"),o.style.cssText=r.style.cssText=u,o.style.marginRight=o.style.width="0",r.style.width="1px",r.appendChild(o),t.reliableMarginRight=!parseFloat((e.getComputedStyle(o,null)||{}).marginRight)),typeof r.style.zoom!="undefined"&&(r.innerHTML="",r.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=r.offsetWidth===3,r.style.display="block",r.style.overflow="visible",r.innerHTML="<div></div>",r.firstChild.style.width="5px",t.shrinkWrapBlocks=r.offsetWidth!==3,n.style.zoom=1),a.removeChild(n),n=r=s=o=null}),a.removeChild(p),n=r=s=o=u=a=p=null,t}();var D=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;v.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(v.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?v.cache[e[v.expando]]:e[v.expando],!!e&&!B(e)},data:function(e,n,r,i){if(!v.acceptData(e))return;var s,o,u=v.expando,a=typeof n=="string",f=e.nodeType,l=f?v.cache:e,c=f?e[u]:e[u]&&u;if((!c||!l[c]||!i&&!l[c].data)&&a&&r===t)return;c||(f?e[u]=c=v.deletedIds.pop()||v.guid++:c=u),l[c]||(l[c]={},f||(l[c].toJSON=v.noop));if(typeof n=="object"||typeof n=="function")i?l[c]=v.extend(l[c],n):l[c].data=v.extend(l[c].data,n);return s=l[c],i||(s.data||(s.data={}),s=s.data),r!==t&&(s[v.camelCase(n)]=r),a?(o=s[n],o==null&&(o=s[v.camelCase(n)])):o=s,o},removeData:function(e,t,n){if(!v.acceptData(e))return;var r,i,s,o=e.nodeType,u=o?v.cache:e,a=o?e[v.expando]:v.expando;if(!u[a])return;if(t){r=n?u[a]:u[a].data;if(r){v.isArray(t)||(t in r?t=[t]:(t=v.camelCase(t),t in r?t=[t]:t=t.split(" ")));for(i=0,s=t.length;i<s;i++)delete r[t[i]];if(!(n?B:v.isEmptyObject)(r))return}}if(!n){delete u[a].data;if(!B(u[a]))return}o?v.cleanData([e],!0):v.support.deleteExpando||u!=u.window?delete u[a]:u[a]=null},_data:function(e,t,n){return v.data(e,t,n,!0)},acceptData:function(e){var t=e.nodeName&&v.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),v.fn.extend({data:function(e,n){var r,i,s,o,u,a=this[0],f=0,l=null;if(e===t){if(this.length){l=v.data(a);if(a.nodeType===1&&!v._data(a,"parsedAttrs")){s=a.attributes;for(u=s.length;f<u;f++)o=s[f].name,o.indexOf("data-")||(o=v.camelCase(o.substring(5)),H(a,o,l[o]));v._data(a,"parsedAttrs",!0)}}return l}return typeof e=="object"?this.each(function(){v.data(this,e)}):(r=e.split(".",2),r[1]=r[1]?"."+r[1]:"",i=r[1]+"!",v.access(this,function(n){if(n===t)return l=this.triggerHandler("getData"+i,[r[0]]),l===t&&a&&(l=v.data(a,e),l=H(a,e,l)),l===t&&r[1]?this.data(r[0]):l;r[1]=n,this.each(function(){var t=v(this);t.triggerHandler("setData"+i,r),v.data(this,e,n),t.triggerHandler("changeData"+i,r)})},null,n,arguments.length>1,null,!1))},removeData:function(e){return this.each(function(){v.removeData(this,e)})}}),v.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=v._data(e,t),n&&(!r||v.isArray(n)?r=v._data(e,t,v.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=v.queue(e,t),r=n.length,i=n.shift(),s=v._queueHooks(e,t),o=function(){v.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return v._data(e,n)||v._data(e,n,{empty:v.Callbacks("once memory").add(function(){v.removeData(e,t+"queue",!0),v.removeData(e,n,!0)})})}}),v.fn.extend({queue:function(e,n){var r=2;return typeof e!="string"&&(n=e,e="fx",r--),arguments.length<r?v.queue(this[0],e):n===t?this:this.each(function(){var t=v.queue(this,e,n);v._queueHooks(this,e),e==="fx"&&t[0]!=="inprogress"&&v.dequeue(this,e)})},dequeue:function(e){return this.each(function(){v.dequeue(this,e)})},delay:function(e,t){return e=v.fx?v.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,s=v.Deferred(),o=this,u=this.length,a=function(){--i||s.resolveWith(o,[o])};typeof e!="string"&&(n=e,e=t),e=e||"fx";while(u--)r=v._data(o[u],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(a));return a(),s.promise(n)}});var j,F,I,q=/[\t\r\n]/g,R=/\r/g,U=/^(?:button|input)$/i,z=/^(?:button|input|object|select|textarea)$/i,W=/^a(?:rea|)$/i,X=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,V=v.support.getSetAttribute;v.fn.extend({attr:function(e,t){return v.access(this,v.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){v.removeAttr(this,e)})},prop:function(e,t){return v.access(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return e=v.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o,u;if(v.isFunction(e))return this.each(function(t){v(this).addClass(e.call(this,t,this.className))});if(e&&typeof e=="string"){t=e.split(y);for(n=0,r=this.length;n<r;n++){i=this[n];if(i.nodeType===1)if(!i.className&&t.length===1)i.className=e;else{s=" "+i.className+" ";for(o=0,u=t.length;o<u;o++)s.indexOf(" "+t[o]+" ")<0&&(s+=t[o]+" ");i.className=v.trim(s)}}}return this},removeClass:function(e){var n,r,i,s,o,u,a;if(v.isFunction(e))return this.each(function(t){v(this).removeClass(e.call(this,t,this.className))});if(e&&typeof e=="string"||e===t){n=(e||"").split(y);for(u=0,a=this.length;u<a;u++){i=this[u];if(i.nodeType===1&&i.className){r=(" "+i.className+" ").replace(q," ");for(s=0,o=n.length;s<o;s++)while(r.indexOf(" "+n[s]+" ")>=0)r=r.replace(" "+n[s]+" "," ");i.className=e?v.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e,r=typeof t=="boolean";return v.isFunction(e)?this.each(function(n){v(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var i,s=0,o=v(this),u=t,a=e.split(y);while(i=a[s++])u=r?u:!o.hasClass(i),o[u?"addClass":"removeClass"](i)}else if(n==="undefined"||n==="boolean")this.className&&v._data(this,"__className__",this.className),this.className=this.className||e===!1?"":v._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n<r;n++)if(this[n].nodeType===1&&(" "+this[n].className+" ").replace(q," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s)return n=v.valHooks[s.type]||v.valHooks[s.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(s,"value"))!==t?r:(r=s.value,typeof r=="string"?r.replace(R,""):r==null?"":r);return}return i=v.isFunction(e),this.each(function(r){var s,o=v(this);if(this.nodeType!==1)return;i?s=e.call(this,r,o.val()):s=e,s==null?s="":typeof s=="number"?s+="":v.isArray(s)&&(s=v.map(s,function(e){return e==null?"":e+""})),n=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()];if(!n||!("set"in n)||n.set(this,s,"value")===t)this.value=s})}}),v.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a<u;a++){n=r[a];if((n.selected||a===i)&&(v.support.optDisabled?!n.disabled:n.getAttribute("disabled")===null)&&(!n.parentNode.disabled||!v.nodeName(n.parentNode,"optgroup"))){t=v(n).val();if(s)return t;o.push(t)}}return o},set:function(e,t){var n=v.makeArray(t);return v(e).find("option").each(function(){this.selected=v.inArray(v(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var s,o,u,a=e.nodeType;if(!e||a===3||a===8||a===2)return;if(i&&v.isFunction(v.fn[n]))return v(e)[n](r);if(typeof e.getAttribute=="undefined")return v.prop(e,n,r);u=a!==1||!v.isXMLDoc(e),u&&(n=n.toLowerCase(),o=v.attrHooks[n]||(X.test(n)?F:j));if(r!==t){if(r===null){v.removeAttr(e,n);return}return o&&"set"in o&&u&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r)}return o&&"get"in o&&u&&(s=o.get(e,n))!==null?s:(s=e.getAttribute(n),s===null?t:s)},removeAttr:function(e,t){var n,r,i,s,o=0;if(t&&e.nodeType===1){r=t.split(y);for(;o<r.length;o++)i=r[o],i&&(n=v.propFix[i]||i,s=X.test(i),s||v.attr(e,i,""),e.removeAttribute(V?i:n),s&&n in e&&(e[n]=!1))}},attrHooks:{type:{set:function(e,t){if(U.test(e.nodeName)&&e.parentNode)v.error("type property can't be changed");else if(!v.support.radioValue&&t==="radio"&&v.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}},value:{get:function(e,t){return j&&v.nodeName(e,"button")?j.get(e,t):t in e?e.value:null},set:function(e,t,n){if(j&&v.nodeName(e,"button"))return j.set(e,t,n);e.value=t}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,s,o,u=e.nodeType;if(!e||u===3||u===8||u===2)return;return o=u!==1||!v.isXMLDoc(e),o&&(n=v.propFix[n]||n,s=v.propHooks[n]),r!==t?s&&"set"in s&&(i=s.set(e,r,n))!==t?i:e[n]=r:s&&"get"in s&&(i=s.get(e,n))!==null?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):z.test(e.nodeName)||W.test(e.nodeName)&&e.href?0:t}}}}),F={get:function(e,n){var r,i=v.prop(e,n);return i===!0||typeof i!="boolean"&&(r=e.getAttributeNode(n))&&r.nodeValue!==!1?n.toLowerCase():t},set:function(e,t,n){var r;return t===!1?v.removeAttr(e,n):(r=v.propFix[n]||n,r in e&&(e[r]=!0),e.setAttribute(n,n.toLowerCase())),n}},V||(I={name:!0,id:!0,coords:!0},j=v.valHooks.button={get:function(e,n){var r;return r=e.getAttributeNode(n),r&&(I[n]?r.value!=="":r.specified)?r.value:t},set:function(e,t,n){var r=e.getAttributeNode(n);return r||(r=i.createAttribute(n),e.setAttributeNode(r)),r.value=t+""}},v.each(["width","height"],function(e,t){v.attrHooks[t]=v.extend(v.attrHooks[t],{set:function(e,n){if(n==="")return e.setAttribute(t,"auto"),n}})}),v.attrHooks.contenteditable={get:j.get,set:function(e,t,n){t===""&&(t="false"),j.set(e,t,n)}}),v.support.hrefNormalized||v.each(["href","src","width","height"],function(e,n){v.attrHooks[n]=v.extend(v.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return r===null?t:r}})}),v.support.style||(v.attrHooks.style={get:function(e){return e.style.cssText.toLowerCase()||t},set:function(e,t){return e.style.cssText=t+""}}),v.support.optSelected||(v.propHooks.selected=v.extend(v.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),v.support.enctype||(v.propFix.enctype="encoding"),v.support.checkOn||v.each(["radio","checkbox"],function(){v.valHooks[this]={get:function(e){return e.getAttribute("value")===null?"on":e.value}}}),v.each(["radio","checkbox"],function(){v.valHooks[this]=v.extend(v.valHooks[this],{set:function(e,t){if(v.isArray(t))return e.checked=v.inArray(v(e).val(),t)>=0}})});var $=/^(?:textarea|input|select)$/i,J=/^([^\.]*|)(?:\.(.+)|)$/,K=/(?:^|\s)hover(\.\S+|)\b/,Q=/^key/,G=/^(?:mouse|contextmenu)|click/,Y=/^(?:focusinfocus|focusoutblur)$/,Z=function(e){return v.event.special.hover?e:e.replace(K,"mouseenter$1 mouseleave$1")};v.event={add:function(e,n,r,i,s){var o,u,a,f,l,c,h,p,d,m,g;if(e.nodeType===3||e.nodeType===8||!n||!r||!(o=v._data(e)))return;r.handler&&(d=r,r=d.handler,s=d.selector),r.guid||(r.guid=v.guid++),a=o.events,a||(o.events=a={}),u=o.handle,u||(o.handle=u=function(e){return typeof v=="undefined"||!!e&&v.event.triggered===e.type?t:v.event.dispatch.apply(u.elem,arguments)},u.elem=e),n=v.trim(Z(n)).split(" ");for(f=0;f<n.length;f++){l=J.exec(n[f])||[],c=l[1],h=(l[2]||"").split(".").sort(),g=v.event.special[c]||{},c=(s?g.delegateType:g.bindType)||c,g=v.event.special[c]||{},p=v.extend({type:c,origType:l[1],data:i,handler:r,guid:r.guid,selector:s,needsContext:s&&v.expr.match.needsContext.test(s),namespace:h.join(".")},d),m=a[c];if(!m){m=a[c]=[],m.delegateCount=0;if(!g.setup||g.setup.call(e,i,h,u)===!1)e.addEventListener?e.addEventListener(c,u,!1):e.attachEvent&&e.attachEvent("on"+c,u)}g.add&&(g.add.call(e,p),p.handler.guid||(p.handler.guid=r.guid)),s?m.splice(m.delegateCount++,0,p):m.push(p),v.event.global[c]=!0}e=null},global:{},remove:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,p,d,m,g=v.hasData(e)&&v._data(e);if(!g||!(h=g.events))return;t=v.trim(Z(t||"")).split(" ");for(s=0;s<t.length;s++){o=J.exec(t[s])||[],u=a=o[1],f=o[2];if(!u){for(u in h)v.event.remove(e,u+t[s],n,r,!0);continue}p=v.event.special[u]||{},u=(r?p.delegateType:p.bindType)||u,d=h[u]||[],l=d.length,f=f?new RegExp("(^|\\.)"+f.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(c=0;c<d.length;c++)m=d[c],(i||a===m.origType)&&(!n||n.guid===m.guid)&&(!f||f.test(m.namespace))&&(!r||r===m.selector||r==="**"&&m.selector)&&(d.splice(c--,1),m.selector&&d.delegateCount--,p.remove&&p.remove.call(e,m));d.length===0&&l!==d.length&&((!p.teardown||p.teardown.call(e,f,g.handle)===!1)&&v.removeEvent(e,u,g.handle),delete h[u])}v.isEmptyObject(h)&&(delete g.handle,v.removeData(e,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(n,r,s,o){if(!s||s.nodeType!==3&&s.nodeType!==8){var u,a,f,l,c,h,p,d,m,g,y=n.type||n,b=[];if(Y.test(y+v.event.triggered))return;y.indexOf("!")>=0&&(y=y.slice(0,-1),a=!0),y.indexOf(".")>=0&&(b=y.split("."),y=b.shift(),b.sort());if((!s||v.event.customEvent[y])&&!v.event.global[y])return;n=typeof n=="object"?n[v.expando]?n:new v.Event(y,n):new v.Event(y),n.type=y,n.isTrigger=!0,n.exclusive=a,n.namespace=b.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,h=y.indexOf(":")<0?"on"+y:"";if(!s){u=v.cache;for(f in u)u[f].events&&u[f].events[y]&&v.event.trigger(n,r,u[f].handle.elem,!0);return}n.result=t,n.target||(n.target=s),r=r!=null?v.makeArray(r):[],r.unshift(n),p=v.event.special[y]||{};if(p.trigger&&p.trigger.apply(s,r)===!1)return;m=[[s,p.bindType||y]];if(!o&&!p.noBubble&&!v.isWindow(s)){g=p.delegateType||y,l=Y.test(g+y)?s:s.parentNode;for(c=s;l;l=l.parentNode)m.push([l,g]),c=l;c===(s.ownerDocument||i)&&m.push([c.defaultView||c.parentWindow||e,g])}for(f=0;f<m.length&&!n.isPropagationStopped();f++)l=m[f][0],n.type=m[f][1],d=(v._data(l,"events")||{})[n.type]&&v._data(l,"handle"),d&&d.apply(l,r),d=h&&l[h],d&&v.acceptData(l)&&d.apply&&d.apply(l,r)===!1&&n.preventDefault();return n.type=y,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(s.ownerDocument,r)===!1)&&(y!=="click"||!v.nodeName(s,"a"))&&v.acceptData(s)&&h&&s[y]&&(y!=="focus"&&y!=="blur"||n.target.offsetWidth!==0)&&!v.isWindow(s)&&(c=s[h],c&&(s[h]=null),v.event.triggered=y,s[y](),v.event.triggered=t,c&&(s[h]=c)),n.result}return},dispatch:function(n){n=v.event.fix(n||e.event);var r,i,s,o,u,a,f,c,h,p,d=(v._data(this,"events")||{})[n.type]||[],m=d.delegateCount,g=l.call(arguments),y=!n.exclusive&&!n.namespace,b=v.event.special[n.type]||{},w=[];g[0]=n,n.delegateTarget=this;if(b.preDispatch&&b.preDispatch.call(this,n)===!1)return;if(m&&(!n.button||n.type!=="click"))for(s=n.target;s!=this;s=s.parentNode||this)if(s.disabled!==!0||n.type!=="click"){u={},f=[];for(r=0;r<m;r++)c=d[r],h=c.selector,u[h]===t&&(u[h]=c.needsContext?v(h,this).index(s)>=0:v.find(h,this,null,[s]).length),u[h]&&f.push(c);f.length&&w.push({elem:s,matches:f})}d.length>m&&w.push({elem:this,matches:d.slice(m)});for(r=0;r<w.length&&!n.isPropagationStopped();r++){a=w[r],n.currentTarget=a.elem;for(i=0;i<a.matches.length&&!n.isImmediatePropagationStopped();i++){c=a.matches[i];if(y||!n.namespace&&!c.namespace||n.namespace_re&&n.namespace_re.test(c.namespace))n.data=c.data,n.handleObj=c,o=((v.event.special[c.origType]||{}).handle||c.handler).apply(a.elem,g),o!==t&&(n.result=o,o===!1&&(n.preventDefault(),n.stopPropagation()))}}return b.postDispatch&&b.postDispatch.call(this,n),n.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return e.which==null&&(e.which=t.charCode!=null?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,s,o,u=n.button,a=n.fromElement;return e.pageX==null&&n.clientX!=null&&(r=e.target.ownerDocument||i,s=r.documentElement,o=r.body,e.pageX=n.clientX+(s&&s.scrollLeft||o&&o.scrollLeft||0)-(s&&s.clientLeft||o&&o.clientLeft||0),e.pageY=n.clientY+(s&&s.scrollTop||o&&o.scrollTop||0)-(s&&s.clientTop||o&&o.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?n.toElement:a),!e.which&&u!==t&&(e.which=u&1?1:u&2?3:u&4?2:0),e}},fix:function(e){if(e[v.expando])return e;var t,n,r=e,s=v.event.fixHooks[e.type]||{},o=s.props?this.props.concat(s.props):this.props;e=v.Event(r);for(t=o.length;t;)n=o[--t],e[n]=r[n];return e.target||(e.target=r.srcElement||i),e.target.nodeType===3&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,r):e},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(e,t,n){v.isWindow(this)&&(this.onbeforeunload=n)},teardown:function(e,t){this.onbeforeunload===t&&(this.onbeforeunload=null)}}},simulate:function(e,t,n,r){var i=v.extend(new v.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?v.event.trigger(i,null,t):v.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},v.event.handle=v.event.dispatch,v.removeEvent=i.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]=="undefined"&&(e[r]=null),e.detachEvent(r,n))},v.Event=function(e,t){if(!(this instanceof v.Event))return new v.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?tt:et):this.type=e,t&&v.extend(this,t),this.timeStamp=e&&e.timeStamp||v.now(),this[v.expando]=!0},v.Event.prototype={preventDefault:function(){this.isDefaultPrevented=tt;var e=this.originalEvent;if(!e)return;e.preventDefault?e.preventDefault():e.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=tt;var e=this.originalEvent;if(!e)return;e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=tt,this.stopPropagation()},isDefaultPrevented:et,isPropagationStopped:et,isImmediatePropagationStopped:et},v.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){v.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,s=e.handleObj,o=s.selector;if(!i||i!==r&&!v.contains(r,i))e.type=s.origType,n=s.handler.apply(this,arguments),e.type=t;return n}}}),v.support.submitBubbles||(v.event.special.submit={setup:function(){if(v.nodeName(this,"form"))return!1;v.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=v.nodeName(n,"input")||v.nodeName(n,"button")?n.form:t;r&&!v._data(r,"_submit_attached")&&(v.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),v._data(r,"_submit_attached",!0))})},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&v.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){if(v.nodeName(this,"form"))return!1;v.event.remove(this,"._submit")}}),v.support.changeBubbles||(v.event.special.change={setup:function(){if($.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")v.event.add(this,"propertychange._change",function(e){e.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),v.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),v.event.simulate("change",this,e,!0)});return!1}v.event.add(this,"beforeactivate._change",function(e){var t=e.target;$.test(t.nodeName)&&!v._data(t,"_change_attached")&&(v.event.add(t,"change._change",function(e){this.parentNode&&!e.isSimulated&&!e.isTrigger&&v.event.simulate("change",this.parentNode,e,!0)}),v._data(t,"_change_attached",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||t.type!=="radio"&&t.type!=="checkbox")return e.handleObj.handler.apply(this,arguments)},teardown:function(){return v.event.remove(this,"._change"),!$.test(this.nodeName)}}),v.support.focusinBubbles||v.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){v.event.simulate(t,e.target,v.event.fix(e),!0)};v.event.special[t]={setup:function(){n++===0&&i.addEventListener(e,r,!0)},teardown:function(){--n===0&&i.removeEventListener(e,r,!0)}}}),v.fn.extend({on:function(e,n,r,i,s){var o,u;if(typeof e=="object"){typeof n!="string"&&(r=r||n,n=t);for(u in e)this.on(u,n,r,e[u],s);return this}r==null&&i==null?(i=n,r=n=t):i==null&&(typeof n=="string"?(i=r,r=t):(i=r,r=n,n=t));if(i===!1)i=et;else if(!i)return this;return s===1&&(o=i,i=function(e){return v().off(e),o.apply(this,arguments)},i.guid=o.guid||(o.guid=v.guid++)),this.each(function(){v.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,s;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,v(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if(typeof e=="object"){for(s in e)this.off(s,n,e[s]);return this}if(n===!1||typeof n=="function")r=n,n=t;return r===!1&&(r=et),this.each(function(){v.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},live:function(e,t,n){return v(this.context).on(e,this.selector,t,n),this},die:function(e,t){return v(this.context).off(e,this.selector||"**",t),this},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return arguments.length===1?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){v.event.trigger(e,t,this)})},triggerHandler:function(e,t){if(this[0])return v.event.trigger(e,t,this[0],!0)},toggle:function(e){var t=arguments,n=e.guid||v.guid++,r=0,i=function(n){var i=(v._data(this,"lastToggle"+e.guid)||0)%r;return v._data(this,"lastToggle"+e.guid,i+1),n.preventDefault(),t[i].apply(this,arguments)||!1};i.guid=n;while(r<t.length)t[r++].guid=n;return this.click(i)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),v.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){v.fn[t]=function(e,n){return n==null&&(n=e,e=null),arguments.length>0?this.on(t,null,e,n):this.trigger(t)},Q.test(t)&&(v.event.fixHooks[t]=v.event.keyHooks),G.test(t)&&(v.event.fixHooks[t]=v.event.mouseHooks)}),function(e,t){function nt(e,t,n,r){n=n||[],t=t||g;var i,s,a,f,l=t.nodeType;if(!e||typeof e!="string")return n;if(l!==1&&l!==9)return[];a=o(t);if(!a&&!r)if(i=R.exec(e))if(f=i[1]){if(l===9){s=t.getElementById(f);if(!s||!s.parentNode)return n;if(s.id===f)return n.push(s),n}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(f))&&u(t,s)&&s.id===f)return n.push(s),n}else{if(i[2])return S.apply(n,x.call(t.getElementsByTagName(e),0)),n;if((f=i[3])&&Z&&t.getElementsByClassName)return S.apply(n,x.call(t.getElementsByClassName(f),0)),n}return vt(e.replace(j,"$1"),t,n,r,a)}function rt(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function it(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function st(e){return N(function(t){return t=+t,N(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ot(e,t,n){if(e===t)return n;var r=e.nextSibling;while(r){if(r===t)return-1;r=r.nextSibling}return 1}function ut(e,t){var n,r,s,o,u,a,f,l=L[d][e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=i.preFilter;while(u){if(!n||(r=F.exec(u)))r&&(u=u.slice(r[0].length)||u),a.push(s=[]);n=!1;if(r=I.exec(u))s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=r[0].replace(j," ");for(o in i.filter)(r=J[o].exec(u))&&(!f[o]||(r=f[o](r)))&&(s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=o,n.matches=r);if(!n)break}return t?u.length:u?nt.error(e):L(e,a).slice(0)}function at(e,t,r){var i=t.dir,s=r&&t.dir==="parentNode",o=w++;return t.first?function(t,n,r){while(t=t[i])if(s||t.nodeType===1)return e(t,n,r)}:function(t,r,u){if(!u){var a,f=b+" "+o+" ",l=f+n;while(t=t[i])if(s||t.nodeType===1){if((a=t[d])===l)return t.sizset;if(typeof a=="string"&&a.indexOf(f)===0){if(t.sizset)return t}else{t[d]=l;if(e(t,r,u))return t.sizset=!0,t;t.sizset=!1}}}else while(t=t[i])if(s||t.nodeType===1)if(e(t,r,u))return t}}function ft(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function lt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u<a;u++)if(s=e[u])if(!n||n(s,r,i))o.push(s),f&&t.push(u);return o}function ct(e,t,n,r,i,s){return r&&!r[d]&&(r=ct(r)),i&&!i[d]&&(i=ct(i,s)),N(function(s,o,u,a){var f,l,c,h=[],p=[],d=o.length,v=s||dt(t||"*",u.nodeType?[u]:u,[]),m=e&&(s||!t)?lt(v,h,e,u,a):v,g=n?i||(s?e:d||r)?[]:o:m;n&&n(m,g,u,a);if(r){f=lt(g,p),r(f,[],u,a),l=f.length;while(l--)if(c=f[l])g[p[l]]=!(m[p[l]]=c)}if(s){if(i||e){if(i){f=[],l=g.length;while(l--)(c=g[l])&&f.push(m[l]=c);i(null,g=[],f,a)}l=g.length;while(l--)(c=g[l])&&(f=i?T.call(s,c):h[l])>-1&&(s[f]=!(o[f]=c))}}else g=lt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):S.apply(o,g)})}function ht(e){var t,n,r,s=e.length,o=i.relative[e[0].type],u=o||i.relative[" "],a=o?1:0,f=at(function(e){return e===t},u,!0),l=at(function(e){return T.call(t,e)>-1},u,!0),h=[function(e,n,r){return!o&&(r||n!==c)||((t=n).nodeType?f(e,n,r):l(e,n,r))}];for(;a<s;a++)if(n=i.relative[e[a].type])h=[at(ft(h),n)];else{n=i.filter[e[a].type].apply(null,e[a].matches);if(n[d]){r=++a;for(;r<s;r++)if(i.relative[e[r].type])break;return ct(a>1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a<r&&ht(e.slice(a,r)),r<s&&ht(e=e.slice(r)),r<s&&e.join(""))}h.push(n)}return ft(h)}function pt(e,t){var r=t.length>0,s=e.length>0,o=function(u,a,f,l,h){var p,d,v,m=[],y=0,w="0",x=u&&[],T=h!=null,N=c,C=u||s&&i.find.TAG("*",h&&a.parentNode||a),k=b+=N==null?1:Math.E;T&&(c=a!==g&&a,n=o.el);for(;(p=C[w])!=null;w++){if(s&&p){for(d=0;v=e[d];d++)if(v(p,a,f)){l.push(p);break}T&&(b=k,n=++o.el)}r&&((p=!v&&p)&&y--,u&&x.push(p))}y+=w;if(r&&w!==y){for(d=0;v=t[d];d++)v(x,m,a,f);if(u){if(y>0)while(w--)!x[w]&&!m[w]&&(m[w]=E.call(l));m=lt(m)}S.apply(l,m),T&&!u&&m.length>0&&y+t.length>1&&nt.uniqueSort(l)}return T&&(b=k,c=N),x};return o.el=0,r?N(o):o}function dt(e,t,n){var r=0,i=t.length;for(;r<i;r++)nt(e,t[r],n);return n}function vt(e,t,n,r,s){var o,u,f,l,c,h=ut(e),p=h.length;if(!r&&h.length===1){u=h[0]=h[0].slice(0);if(u.length>2&&(f=u[0]).type==="ID"&&t.nodeType===9&&!s&&i.relative[u[1].type]){t=i.find.ID(f.matches[0].replace($,""),t,s)[0];if(!t)return n;e=e.slice(u.shift().length)}for(o=J.POS.test(e)?-1:u.length-1;o>=0;o--){f=u[o];if(i.relative[l=f.type])break;if(c=i.find[l])if(r=c(f.matches[0].replace($,""),z.test(u[0].type)&&t.parentNode||t,s)){u.splice(o,1),e=r.length&&u.join("");if(!e)return S.apply(n,x.call(r,0)),n;break}}}return a(e,h)(r,t,s,n,z.test(e)),n}function mt(){}var n,r,i,s,o,u,a,f,l,c,h=!0,p="undefined",d=("sizcache"+Math.random()).replace(".",""),m=String,g=e.document,y=g.documentElement,b=0,w=0,E=[].pop,S=[].push,x=[].slice,T=[].indexOf||function(e){var t=0,n=this.length;for(;t<n;t++)if(this[t]===e)return t;return-1},N=function(e,t){return e[d]=t==null||t,e},C=function(){var e={},t=[];return N(function(n,r){return t.push(n)>i.cacheLength&&delete e[t.shift()],e[n+" "]=r},e)},k=C(),L=C(),A=C(),O="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",_=M.replace("w","w#"),D="([*^$|!~]?=)",P="\\["+O+"*("+M+")"+O+"*(?:"+D+O+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+_+")|)|)"+O+"*\\]",H=":("+M+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+P+")|[^:]|\\\\.)*|.*))\\)|)",B=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+O+"*((?:-\\d)?\\d*)"+O+"*\\)|)(?=[^-]|$)",j=new RegExp("^"+O+"+|((?:^|[^\\\\])(?:\\\\.)*)"+O+"+$","g"),F=new RegExp("^"+O+"*,"+O+"*"),I=new RegExp("^"+O+"*([\\x20\\t\\r\\n\\f>+~])"+O+"*"),q=new RegExp(H),R=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,U=/^:not/,z=/[\x20\t\r\n\f]*[+~]/,W=/:not\($/,X=/h\d/i,V=/input|select|textarea|button/i,$=/\\(?!\\)/g,J={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),NAME:new RegExp("^\\[name=['\"]?("+M+")['\"]?\\]"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+H),POS:new RegExp(B,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+O+"*(even|odd|(([+-]|)(\\d*)n|)"+O+"*(?:([+-]|)"+O+"*(\\d+)|))"+O+"*\\)|)","i"),needsContext:new RegExp("^"+O+"*[>+~]|"+B,"i")},K=function(e){var t=g.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}},Q=K(function(e){return e.appendChild(g.createComment("")),!e.getElementsByTagName("*").length}),G=K(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==p&&e.firstChild.getAttribute("href")==="#"}),Y=K(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return t!=="boolean"&&t!=="string"}),Z=K(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!e.getElementsByClassName||!e.getElementsByClassName("e").length?!1:(e.lastChild.className="e",e.getElementsByClassName("e").length===2)}),et=K(function(e){e.id=d+0,e.innerHTML="<a name='"+d+"'></a><div name='"+d+"'></div>",y.insertBefore(e,y.firstChild);var t=g.getElementsByName&&g.getElementsByName(d).length===2+g.getElementsByName(d+0).length;return r=!g.getElementById(d),y.removeChild(e),t});try{x.call(y.childNodes,0)[0].nodeType}catch(tt){x=function(e){var t,n=[];for(;t=this[e];e++)n.push(t);return n}}nt.matches=function(e,t){return nt(e,null,null,t)},nt.matchesSelector=function(e,t){return nt(t,null,null,[e]).length>0},s=nt.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(i===1||i===9||i===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=s(e)}else if(i===3||i===4)return e.nodeValue}else for(;t=e[r];r++)n+=s(t);return n},o=nt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},u=nt.contains=y.contains?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&n.contains&&n.contains(r))}:y.compareDocumentPosition?function(e,t){return t&&!!(e.compareDocumentPosition(t)&16)}:function(e,t){while(t=t.parentNode)if(t===e)return!0;return!1},nt.attr=function(e,t){var n,r=o(e);return r||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):r||Y?e.getAttribute(t):(n=e.getAttributeNode(t),n?typeof e[t]=="boolean"?e[t]?t:null:n.specified?n.value:null:null)},i=nt.selectors={cacheLength:50,createPseudo:N,match:J,attrHandle:G?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},find:{ID:r?function(e,t,n){if(typeof t.getElementById!==p&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==p&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==p&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:Q?function(e,t){if(typeof t.getElementsByTagName!==p)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if(e==="*"){var r,i=[],s=0;for(;r=n[s];s++)r.nodeType===1&&i.push(r);return i}return n},NAME:et&&function(e,t){if(typeof t.getElementsByName!==p)return t.getElementsByName(name)},CLASS:Z&&function(e,t,n){if(typeof t.getElementsByClassName!==p&&!n)return t.getElementsByClassName(e)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace($,""),e[3]=(e[4]||e[5]||"").replace($,""),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1]==="nth"?(e[2]||nt.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*(e[2]==="even"||e[2]==="odd")),e[4]=+(e[6]+e[7]||e[2]==="odd")):e[2]&&nt.error(e[0]),e},PSEUDO:function(e){var t,n;if(J.CHILD.test(e[0]))return null;if(e[3])e[2]=e[3];else if(t=e[4])q.test(t)&&(n=ut(t,!0))&&(n=t.indexOf(")",t.length-n)-t.length)&&(t=t.slice(0,n),e[0]=e[0].slice(0,n)),e[2]=t;return e.slice(0,3)}},filter:{ID:r?function(e){return e=e.replace($,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace($,""),function(t){var n=typeof t.getAttributeNode!==p&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return e==="*"?function(){return!0}:(e=e.replace($,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[d][e+" "];return t||(t=new RegExp("(^|"+O+")"+e+"("+O+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==p&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r,i){var s=nt.attr(r,e);return s==null?t==="!=":t?(s+="",t==="="?s===n:t==="!="?s!==n:t==="^="?n&&s.indexOf(n)===0:t==="*="?n&&s.indexOf(n)>-1:t==="$="?n&&s.substr(s.length-n.length)===n:t==="~="?(" "+s+" ").indexOf(n)>-1:t==="|="?s===n||s.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r){return e==="nth"?function(e){var t,i,s=e.parentNode;if(n===1&&r===0)return!0;if(s){i=0;for(t=s.firstChild;t;t=t.nextSibling)if(t.nodeType===1){i++;if(e===t)break}}return i-=r,i===n||i%n===0&&i/n>=0}:function(t){var n=t;switch(e){case"only":case"first":while(n=n.previousSibling)if(n.nodeType===1)return!1;if(e==="first")return!0;n=t;case"last":while(n=n.nextSibling)if(n.nodeType===1)return!1;return!0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||nt.error("unsupported pseudo: "+e);return r[d]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?N(function(e,n){var i,s=r(e,t),o=s.length;while(o--)i=T.call(e,s[o]),e[i]=!(n[i]=s[o])}):function(e){return r(e,0,n)}):r}},pseudos:{not:N(function(e){var t=[],n=[],r=a(e.replace(j,"$1"));return r[d]?N(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:N(function(e){return function(t){return nt(e,t).length>0}}),contains:N(function(e){return function(t){return(t.textContent||t.innerText||s(t)).indexOf(e)>-1}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!i.pseudos.empty(e)},empty:function(e){var t;e=e.firstChild;while(e){if(e.nodeName>"@"||(t=e.nodeType)===3||t===4)return!1;e=e.nextSibling}return!0},header:function(e){return X.test(e.nodeName)},text:function(e){var t,n;return e.nodeName.toLowerCase()==="input"&&(t=e.type)==="text"&&((n=e.getAttribute("type"))==null||n.toLowerCase()===t)},radio:rt("radio"),checkbox:rt("checkbox"),file:rt("file"),password:rt("password"),image:rt("image"),submit:it("submit"),reset:it("reset"),button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},input:function(e){return V.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},active:function(e){return e===e.ownerDocument.activeElement},first:st(function(){return[0]}),last:st(function(e,t){return[t-1]}),eq:st(function(e,t,n){return[n<0?n+t:n]}),even:st(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:st(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:st(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},f=y.compareDocumentPosition?function(e,t){return e===t?(l=!0,0):(!e.compareDocumentPosition||!t.compareDocumentPosition?e.compareDocumentPosition:e.compareDocumentPosition(t)&4)?-1:1}:function(e,t){if(e===t)return l=!0,0;if(e.sourceIndex&&t.sourceIndex)return e.sourceIndex-t.sourceIndex;var n,r,i=[],s=[],o=e.parentNode,u=t.parentNode,a=o;if(o===u)return ot(e,t);if(!o)return-1;if(!u)return 1;while(a)i.unshift(a),a=a.parentNode;a=u;while(a)s.unshift(a),a=a.parentNode;n=i.length,r=s.length;for(var f=0;f<n&&f<r;f++)if(i[f]!==s[f])return ot(i[f],s[f]);return f===n?ot(e,s[f],-1):ot(i[f],t,1)},[0,0].sort(f),h=!l,nt.uniqueSort=function(e){var t,n=[],r=1,i=0;l=h,e.sort(f);if(l){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e},nt.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},a=nt.compile=function(e,t){var n,r=[],i=[],s=A[d][e+" "];if(!s){t||(t=ut(e)),n=t.length;while(n--)s=ht(t[n]),s[d]?r.push(s):i.push(s);s=A(e,pt(i,r))}return s},g.querySelectorAll&&function(){var e,t=vt,n=/'|\\/g,r=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,i=[":focus"],s=[":active"],u=y.matchesSelector||y.mozMatchesSelector||y.webkitMatchesSelector||y.oMatchesSelector||y.msMatchesSelector;K(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||i.push("\\["+O+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||i.push(":checked")}),K(function(e){e.innerHTML="<p test=''></p>",e.querySelectorAll("[test^='']").length&&i.push("[*^$]="+O+"*(?:\"\"|'')"),e.innerHTML="<input type='hidden'/>",e.querySelectorAll(":enabled").length||i.push(":enabled",":disabled")}),i=new RegExp(i.join("|")),vt=function(e,r,s,o,u){if(!o&&!u&&!i.test(e)){var a,f,l=!0,c=d,h=r,p=r.nodeType===9&&e;if(r.nodeType===1&&r.nodeName.toLowerCase()!=="object"){a=ut(e),(l=r.getAttribute("id"))?c=l.replace(n,"\\$&"):r.setAttribute("id",c),c="[id='"+c+"'] ",f=a.length;while(f--)a[f]=c+a[f].join("");h=z.test(e)&&r.parentNode||r,p=a.join(",")}if(p)try{return S.apply(s,x.call(h.querySelectorAll(p),0)),s}catch(v){}finally{l||r.removeAttribute("id")}}return t(e,r,s,o,u)},u&&(K(function(t){e=u.call(t,"div");try{u.call(t,"[test!='']:sizzle"),s.push("!=",H)}catch(n){}}),s=new RegExp(s.join("|")),nt.matchesSelector=function(t,n){n=n.replace(r,"='$1']");if(!o(t)&&!s.test(n)&&!i.test(n))try{var a=u.call(t,n);if(a||e||t.document&&t.document.nodeType!==11)return a}catch(f){}return nt(n,null,null,[t]).length>0})}(),i.pseudos.nth=i.pseudos.eq,i.filters=mt.prototype=i.pseudos,i.setFilters=new mt,nt.attr=v.attr,v.find=nt,v.expr=nt.selectors,v.expr[":"]=v.expr.pseudos,v.unique=nt.uniqueSort,v.text=nt.getText,v.isXMLDoc=nt.isXML,v.contains=nt.contains}(e);var nt=/Until$/,rt=/^(?:parents|prev(?:Until|All))/,it=/^.[^:#\[\.,]*$/,st=v.expr.match.needsContext,ot={children:!0,contents:!0,next:!0,prev:!0};v.fn.extend({find:function(e){var t,n,r,i,s,o,u=this;if(typeof e!="string")return v(e).filter(function(){for(t=0,n=u.length;t<n;t++)if(v.contains(u[t],this))return!0});o=this.pushStack("","find",e);for(t=0,n=this.length;t<n;t++){r=o.length,v.find(e,this[t],o);if(t>0)for(i=r;i<o.length;i++)for(s=0;s<r;s++)if(o[s]===o[i]){o.splice(i--,1);break}}return o},has:function(e){var t,n=v(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(v.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1),"not",e)},filter:function(e){return this.pushStack(ft(this,e,!0),"filter",e)},is:function(e){return!!e&&(typeof e=="string"?st.test(e)?v(e,this.context).index(this[0])>=0:v.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,s=[],o=st.test(e)||typeof e!="string"?v(e,t||this.context):0;for(;r<i;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&n.nodeType!==11){if(o?o.index(n)>-1:v.find.matchesSelector(n,e)){s.push(n);break}n=n.parentNode}}return s=s.length>1?v.unique(s):s,this.pushStack(s,"closest",e)},index:function(e){return e?typeof e=="string"?v.inArray(this[0],v(e)):v.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(e,t){var n=typeof e=="string"?v(e,t):v.makeArray(e&&e.nodeType?[e]:e),r=v.merge(this.get(),n);return this.pushStack(ut(n[0])||ut(r[0])?r:v.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}}),v.fn.andSelf=v.fn.addBack,v.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return v.dir(e,"parentNode")},parentsUntil:function(e,t,n){return v.dir(e,"parentNode",n)},next:function(e){return at(e,"nextSibling")},prev:function(e){return at(e,"previousSibling")},nextAll:function(e){return v.dir(e,"nextSibling")},prevAll:function(e){return v.dir(e,"previousSibling")},nextUntil:function(e,t,n){return v.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return v.dir(e,"previousSibling",n)},siblings:function(e){return v.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return v.sibling(e.firstChild)},contents:function(e){return v.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:v.merge([],e.childNodes)}},function(e,t){v.fn[e]=function(n,r){var i=v.map(this,t,n);return nt.test(e)||(r=n),r&&typeof r=="string"&&(i=v.filter(r,i)),i=this.length>1&&!ot[e]?v.unique(i):i,this.length>1&&rt.test(e)&&(i=i.reverse()),this.pushStack(i,e,l.call(arguments).join(","))}}),v.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),t.length===1?v.find.matchesSelector(t[0],e)?[t[0]]:[]:v.find.matches(e,t)},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!v(s).is(r)))s.nodeType===1&&i.push(s),s=s[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)e.nodeType===1&&e!==t&&n.push(e);return n}});var ct="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",ht=/ jQuery\d+="(?:null|\d+)"/g,pt=/^\s+/,dt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,vt=/<([\w:]+)/,mt=/<tbody/i,gt=/<|&#?\w+;/,yt=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,wt=new RegExp("<(?:"+ct+")[\\s/>]","i"),Et=/^(?:checkbox|radio)$/,St=/checked\s*(?:[^=]|=\s*.checked.)/i,xt=/\/(java|ecma)script/i,Tt=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,Nt={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},Ct=lt(i),kt=Ct.appendChild(i.createElement("div"));Nt.optgroup=Nt.option,Nt.tbody=Nt.tfoot=Nt.colgroup=Nt.caption=Nt.thead,Nt.th=Nt.td,v.support.htmlSerialize||(Nt._default=[1,"X<div>","</div>"]),v.fn.extend({text:function(e){return v.access(this,function(e){return e===t?v.text(this):this.empty().append((this[0]&&this[0].ownerDocument||i).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(v.isFunction(e))return this.each(function(t){v(this).wrapAll(e.call(this,t))});if(this[0]){var t=v(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return v.isFunction(e)?this.each(function(t){v(this).wrapInner(e.call(this,t))}):this.each(function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=v.isFunction(e);return this.each(function(n){v(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){v.nodeName(this,"body")||v(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(e,this),"before",this.selector)}},after:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(this,e),"after",this.selector)}},remove:function(e,t){var n,r=0;for(;(n=this[r])!=null;r++)if(!e||v.filter(e,[n]).length)!t&&n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),v.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n);return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&v.cleanData(e.getElementsByTagName("*"));while(e.firstChild)e.removeChild(e.firstChild)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return v.clone(this,e,t)})},html:function(e){return v.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return n.nodeType===1?n.innerHTML.replace(ht,""):t;if(typeof e=="string"&&!yt.test(e)&&(v.support.htmlSerialize||!wt.test(e))&&(v.support.leadingWhitespace||!pt.test(e))&&!Nt[(vt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(dt,"<$1></$2>");try{for(;r<i;r++)n=this[r]||{},n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),n.innerHTML=e);n=0}catch(s){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){return ut(this[0])?this.length?this.pushStack(v(v.isFunction(e)?e():e),"replaceWith",e):this:v.isFunction(e)?this.each(function(t){var n=v(this),r=n.html();n.replaceWith(e.call(this,t,r))}):(typeof e!="string"&&(e=v(e).detach()),this.each(function(){var t=this.nextSibling,n=this.parentNode;v(this).remove(),t?v(t).before(e):v(n).append(e)}))},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=[].concat.apply([],e);var i,s,o,u,a=0,f=e[0],l=[],c=this.length;if(!v.support.checkClone&&c>1&&typeof f=="string"&&St.test(f))return this.each(function(){v(this).domManip(e,n,r)});if(v.isFunction(f))return this.each(function(i){var s=v(this);e[0]=f.call(this,i,n?s.html():t),s.domManip(e,n,r)});if(this[0]){i=v.buildFragment(e,this,l),o=i.fragment,s=o.firstChild,o.childNodes.length===1&&(o=s);if(s){n=n&&v.nodeName(s,"tr");for(u=i.cacheable||c-1;a<c;a++)r.call(n&&v.nodeName(this[a],"table")?Lt(this[a],"tbody"):this[a],a===u?o:v.clone(o,!0,!0))}o=s=null,l.length&&v.each(l,function(e,t){t.src?v.ajax?v.ajax({url:t.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):v.error("no ajax"):v.globalEval((t.text||t.textContent||t.innerHTML||"").replace(Tt,"")),t.parentNode&&t.parentNode.removeChild(t)})}return this}}),v.buildFragment=function(e,n,r){var s,o,u,a=e[0];return n=n||i,n=!n.nodeType&&n[0]||n,n=n.ownerDocument||n,e.length===1&&typeof a=="string"&&a.length<512&&n===i&&a.charAt(0)==="<"&&!bt.test(a)&&(v.support.checkClone||!St.test(a))&&(v.support.html5Clone||!wt.test(a))&&(o=!0,s=v.fragments[a],u=s!==t),s||(s=n.createDocumentFragment(),v.clean(e,n,s,r),o&&(v.fragments[a]=u&&s)),{fragment:s,cacheable:o}},v.fragments={},v.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){v.fn[e]=function(n){var r,i=0,s=[],o=v(n),u=o.length,a=this.length===1&&this[0].parentNode;if((a==null||a&&a.nodeType===11&&a.childNodes.length===1)&&u===1)return o[t](this[0]),this;for(;i<u;i++)r=(i>0?this.clone(!0):this).get(),v(o[i])[t](r),s=s.concat(r);return this.pushStack(s,e,o.selector)}}),v.extend({clone:function(e,t,n){var r,i,s,o;v.support.html5Clone||v.isXMLDoc(e)||!wt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(kt.innerHTML=e.outerHTML,kt.removeChild(o=kt.firstChild));if((!v.support.noCloneEvent||!v.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!v.isXMLDoc(e)){Ot(e,o),r=Mt(e),i=Mt(o);for(s=0;r[s];++s)i[s]&&Ot(r[s],i[s])}if(t){At(e,o);if(n){r=Mt(e),i=Mt(o);for(s=0;r[s];++s)At(r[s],i[s])}}return r=i=null,o},clean:function(e,t,n,r){var s,o,u,a,f,l,c,h,p,d,m,g,y=t===i&&Ct,b=[];if(!t||typeof t.createDocumentFragment=="undefined")t=i;for(s=0;(u=e[s])!=null;s++){typeof u=="number"&&(u+="");if(!u)continue;if(typeof u=="string")if(!gt.test(u))u=t.createTextNode(u);else{y=y||lt(t),c=t.createElement("div"),y.appendChild(c),u=u.replace(dt,"<$1></$2>"),a=(vt.exec(u)||["",""])[1].toLowerCase(),f=Nt[a]||Nt._default,l=f[0],c.innerHTML=f[1]+u+f[2];while(l--)c=c.lastChild;if(!v.support.tbody){h=mt.test(u),p=a==="table"&&!h?c.firstChild&&c.firstChild.childNodes:f[1]==="<table>"&&!h?c.childNodes:[];for(o=p.length-1;o>=0;--o)v.nodeName(p[o],"tbody")&&!p[o].childNodes.length&&p[o].parentNode.removeChild(p[o])}!v.support.leadingWhitespace&&pt.test(u)&&c.insertBefore(t.createTextNode(pt.exec(u)[0]),c.firstChild),u=c.childNodes,c.parentNode.removeChild(c)}u.nodeType?b.push(u):v.merge(b,u)}c&&(u=c=y=null);if(!v.support.appendChecked)for(s=0;(u=b[s])!=null;s++)v.nodeName(u,"input")?_t(u):typeof u.getElementsByTagName!="undefined"&&v.grep(u.getElementsByTagName("input"),_t);if(n){m=function(e){if(!e.type||xt.test(e.type))return r?r.push(e.parentNode?e.parentNode.removeChild(e):e):n.appendChild(e)};for(s=0;(u=b[s])!=null;s++)if(!v.nodeName(u,"script")||!m(u))n.appendChild(u),typeof u.getElementsByTagName!="undefined"&&(g=v.grep(v.merge([],u.getElementsByTagName("script")),m),b.splice.apply(b,[s+1,0].concat(g)),s+=g.length)}return b},cleanData:function(e,t){var n,r,i,s,o=0,u=v.expando,a=v.cache,f=v.support.deleteExpando,l=v.event.special;for(;(i=e[o])!=null;o++)if(t||v.acceptData(i)){r=i[u],n=r&&a[r];if(n){if(n.events)for(s in n.events)l[s]?v.event.remove(i,s):v.removeEvent(i,s,n.handle);a[r]&&(delete a[r],f?delete i[u]:i.removeAttribute?i.removeAttribute(u):i[u]=null,v.deletedIds.push(r))}}}}),function(){var e,t;v.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e=v.uaMatch(o.userAgent),t={},e.browser&&(t[e.browser]=!0,t.version=e.version),t.chrome?t.webkit=!0:t.webkit&&(t.safari=!0),v.browser=t,v.sub=function(){function e(t,n){return new e.fn.init(t,n)}v.extend(!0,e,this),e.superclass=this,e.fn=e.prototype=this(),e.fn.constructor=e,e.sub=this.sub,e.fn.init=function(r,i){return i&&i instanceof v&&!(i instanceof e)&&(i=e(i)),v.fn.init.call(this,r,i,t)},e.fn.init.prototype=e.fn;var t=e(i);return e}}();var Dt,Pt,Ht,Bt=/alpha\([^)]*\)/i,jt=/opacity=([^)]*)/,Ft=/^(top|right|bottom|left)$/,It=/^(none|table(?!-c[ea]).+)/,qt=/^margin/,Rt=new RegExp("^("+m+")(.*)$","i"),Ut=new RegExp("^("+m+")(?!px)[a-z%]+$","i"),zt=new RegExp("^([-+])=("+m+")","i"),Wt={BODY:"block"},Xt={position:"absolute",visibility:"hidden",display:"block"},Vt={letterSpacing:0,fontWeight:400},$t=["Top","Right","Bottom","Left"],Jt=["Webkit","O","Moz","ms"],Kt=v.fn.toggle;v.fn.extend({css:function(e,n){return v.access(this,function(e,n,r){return r!==t?v.style(e,n,r):v.css(e,n)},e,n,arguments.length>1)},show:function(){return Yt(this,!0)},hide:function(){return Yt(this)},toggle:function(e,t){var n=typeof e=="boolean";return v.isFunction(e)&&v.isFunction(t)?Kt.apply(this,arguments):this.each(function(){(n?e:Gt(this))?v(this).show():v(this).hide()})}}),v.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Dt(e,"opacity");return n===""?"1":n}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":v.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style)return;var s,o,u,a=v.camelCase(n),f=e.style;n=v.cssProps[a]||(v.cssProps[a]=Qt(f,a)),u=v.cssHooks[n]||v.cssHooks[a];if(r===t)return u&&"get"in u&&(s=u.get(e,!1,i))!==t?s:f[n];o=typeof r,o==="string"&&(s=zt.exec(r))&&(r=(s[1]+1)*s[2]+parseFloat(v.css(e,n)),o="number");if(r==null||o==="number"&&isNaN(r))return;o==="number"&&!v.cssNumber[a]&&(r+="px");if(!u||!("set"in u)||(r=u.set(e,r,i))!==t)try{f[n]=r}catch(l){}},css:function(e,n,r,i){var s,o,u,a=v.camelCase(n);return n=v.cssProps[a]||(v.cssProps[a]=Qt(e.style,a)),u=v.cssHooks[n]||v.cssHooks[a],u&&"get"in u&&(s=u.get(e,!0,i)),s===t&&(s=Dt(e,n)),s==="normal"&&n in Vt&&(s=Vt[n]),r||i!==t?(o=parseFloat(s),r||v.isNumeric(o)?o||0:s):s},swap:function(e,t,n){var r,i,s={};for(i in t)s[i]=e.style[i],e.style[i]=t[i];r=n.call(e);for(i in t)e.style[i]=s[i];return r}}),e.getComputedStyle?Dt=function(t,n){var r,i,s,o,u=e.getComputedStyle(t,null),a=t.style;return u&&(r=u.getPropertyValue(n)||u[n],r===""&&!v.contains(t.ownerDocument,t)&&(r=v.style(t,n)),Ut.test(r)&&qt.test(n)&&(i=a.width,s=a.minWidth,o=a.maxWidth,a.minWidth=a.maxWidth=a.width=r,r=u.width,a.width=i,a.minWidth=s,a.maxWidth=o)),r}:i.documentElement.currentStyle&&(Dt=function(e,t){var n,r,i=e.currentStyle&&e.currentStyle[t],s=e.style;return i==null&&s&&s[t]&&(i=s[t]),Ut.test(i)&&!Ft.test(t)&&(n=s.left,r=e.runtimeStyle&&e.runtimeStyle.left,r&&(e.runtimeStyle.left=e.currentStyle.left),s.left=t==="fontSize"?"1em":i,i=s.pixelLeft+"px",s.left=n,r&&(e.runtimeStyle.left=r)),i===""?"auto":i}),v.each(["height","width"],function(e,t){v.cssHooks[t]={get:function(e,n,r){if(n)return e.offsetWidth===0&&It.test(Dt(e,"display"))?v.swap(e,Xt,function(){return tn(e,t,r)}):tn(e,t,r)},set:function(e,n,r){return Zt(e,n,r?en(e,t,r,v.support.boxSizing&&v.css(e,"boxSizing")==="border-box"):0)}}}),v.support.opacity||(v.cssHooks.opacity={get:function(e,t){return jt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=v.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if(t>=1&&v.trim(s.replace(Bt,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(r&&!r.filter)return}n.filter=Bt.test(s)?s.replace(Bt,i):s+" "+i}}),v(function(){v.support.reliableMarginRight||(v.cssHooks.marginRight={get:function(e,t){return v.swap(e,{display:"inline-block"},function(){if(t)return Dt(e,"marginRight")})}}),!v.support.pixelPosition&&v.fn.position&&v.each(["top","left"],function(e,t){v.cssHooks[t]={get:function(e,n){if(n){var r=Dt(e,t);return Ut.test(r)?v(e).position()[t]+"px":r}}}})}),v.expr&&v.expr.filters&&(v.expr.filters.hidden=function(e){return e.offsetWidth===0&&e.offsetHeight===0||!v.support.reliableHiddenOffsets&&(e.style&&e.style.display||Dt(e,"display"))==="none"},v.expr.filters.visible=function(e){return!v.expr.filters.hidden(e)}),v.each({margin:"",padding:"",border:"Width"},function(e,t){v.cssHooks[e+t]={expand:function(n){var r,i=typeof n=="string"?n.split(" "):[n],s={};for(r=0;r<4;r++)s[e+$t[r]+t]=i[r]||i[r-2]||i[0];return s}},qt.test(e)||(v.cssHooks[e+t].set=Zt)});var rn=/%20/g,sn=/\[\]$/,on=/\r?\n/g,un=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,an=/^(?:select|textarea)/i;v.fn.extend({serialize:function(){return v.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?v.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||an.test(this.nodeName)||un.test(this.type))}).map(function(e,t){var n=v(this).val();return n==null?null:v.isArray(n)?v.map(n,function(e,n){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),v.param=function(e,n){var r,i=[],s=function(e,t){t=v.isFunction(t)?t():t==null?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};n===t&&(n=v.ajaxSettings&&v.ajaxSettings.traditional);if(v.isArray(e)||e.jquery&&!v.isPlainObject(e))v.each(e,function(){s(this.name,this.value)});else for(r in e)fn(r,e[r],n,s);return i.join("&").replace(rn,"+")};var ln,cn,hn=/#.*$/,pn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,dn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,vn=/^(?:GET|HEAD)$/,mn=/^\/\//,gn=/\?/,yn=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bn=/([?&])_=[^&]*/,wn=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,En=v.fn.load,Sn={},xn={},Tn=["*/"]+["*"];try{cn=s.href}catch(Nn){cn=i.createElement("a"),cn.href="",cn=cn.href}ln=wn.exec(cn.toLowerCase())||[],v.fn.load=function(e,n,r){if(typeof e!="string"&&En)return En.apply(this,arguments);if(!this.length)return this;var i,s,o,u=this,a=e.indexOf(" ");return a>=0&&(i=e.slice(a,e.length),e=e.slice(0,a)),v.isFunction(n)?(r=n,n=t):n&&typeof n=="object"&&(s="POST"),v.ajax({url:e,type:s,dataType:"html",data:n,complete:function(e,t){r&&u.each(r,o||[e.responseText,t,e])}}).done(function(e){o=arguments,u.html(i?v("<div>").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r<i;r++)n=e[r],Vn[n]=Vn[n]||[],Vn[n].unshift(t)},prefilter:function(e,t){t?Xn.unshift(e):Xn.push(e)}}),v.Tween=Yn,Yn.prototype={constructor:Yn,init:function(e,t,n,r,i,s){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=s||(v.cssNumber[n]?"":"px")},cur:function(){var e=Yn.propHooks[this.prop];return e&&e.get?e.get(this):Yn.propHooks._default.get(this)},run:function(e){var t,n=Yn.propHooks[this.prop];return this.options.duration?this.pos=t=v.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Yn.propHooks._default.set(this),this}},Yn.prototype.init.prototype=Yn.prototype,Yn.propHooks={_default:{get:function(e){var t;return e.elem[e.prop]==null||!!e.elem.style&&e.elem.style[e.prop]!=null?(t=v.css(e.elem,e.prop,!1,""),!t||t==="auto"?0:t):e.elem[e.prop]},set:function(e){v.fx.step[e.prop]?v.fx.step[e.prop](e):e.elem.style&&(e.elem.style[v.cssProps[e.prop]]!=null||v.cssHooks[e.prop])?v.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},Yn.propHooks.scrollTop=Yn.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},v.each(["toggle","show","hide"],function(e,t){var n=v.fn[t];v.fn[t]=function(r,i,s){return r==null||typeof r=="boolean"||!e&&v.isFunction(r)&&v.isFunction(i)?n.apply(this,arguments):this.animate(Zn(t,!0),r,i,s)}}),v.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Gt).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=v.isEmptyObject(e),s=v.speed(t,n,r),o=function(){var t=Kn(this,v.extend({},e),s);i&&t.stop(!0)};return i||s.queue===!1?this.each(o):this.queue(s.queue,o)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return typeof e!="string"&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=e!=null&&e+"queueHooks",s=v.timers,o=v._data(this);if(n)o[n]&&o[n].stop&&i(o[n]);else for(n in o)o[n]&&o[n].stop&&Wn.test(n)&&i(o[n]);for(n=s.length;n--;)s[n].elem===this&&(e==null||s[n].queue===e)&&(s[n].anim.stop(r),t=!1,s.splice(n,1));(t||!r)&&v.dequeue(this,e)})}}),v.each({slideDown:Zn("show"),slideUp:Zn("hide"),slideToggle:Zn("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){v.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),v.speed=function(e,t,n){var r=e&&typeof e=="object"?v.extend({},e):{complete:n||!n&&t||v.isFunction(e)&&e,duration:e,easing:n&&t||t&&!v.isFunction(t)&&t};r.duration=v.fx.off?0:typeof r.duration=="number"?r.duration:r.duration in v.fx.speeds?v.fx.speeds[r.duration]:v.fx.speeds._default;if(r.queue==null||r.queue===!0)r.queue="fx";return r.old=r.complete,r.complete=function(){v.isFunction(r.old)&&r.old.call(this),r.queue&&v.dequeue(this,r.queue)},r},v.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},v.timers=[],v.fx=Yn.prototype.init,v.fx.tick=function(){var e,n=v.timers,r=0;qn=v.now();for(;r<n.length;r++)e=n[r],!e()&&n[r]===e&&n.splice(r--,1);n.length||v.fx.stop(),qn=t},v.fx.timer=function(e){e()&&v.timers.push(e)&&!Rn&&(Rn=setInterval(v.fx.tick,v.fx.interval))},v.fx.interval=13,v.fx.stop=function(){clearInterval(Rn),Rn=null},v.fx.speeds={slow:600,fast:200,_default:400},v.fx.step={},v.expr&&v.expr.filters&&(v.expr.filters.animated=function(e){return v.grep(v.timers,function(t){return e===t.elem}).length});var er=/^(?:body|html)$/i;v.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){v.offset.setOffset(this,e,t)});var n,r,i,s,o,u,a,f={top:0,left:0},l=this[0],c=l&&l.ownerDocument;if(!c)return;return(r=c.body)===l?v.offset.bodyOffset(l):(n=c.documentElement,v.contains(n,l)?(typeof l.getBoundingClientRect!="undefined"&&(f=l.getBoundingClientRect()),i=tr(c),s=n.clientTop||r.clientTop||0,o=n.clientLeft||r.clientLeft||0,u=i.pageYOffset||n.scrollTop,a=i.pageXOffset||n.scrollLeft,{top:f.top+u-s,left:f.left+a-o}):f)},v.offset={bodyOffset:function(e){var t=e.offsetTop,n=e.offsetLeft;return v.support.doesNotIncludeMarginInBodyOffset&&(t+=parseFloat(v.css(e,"marginTop"))||0,n+=parseFloat(v.css(e,"marginLeft"))||0),{top:t,left:n}},setOffset:function(e,t,n){var r=v.css(e,"position");r==="static"&&(e.style.position="relative");var i=v(e),s=i.offset(),o=v.css(e,"top"),u=v.css(e,"left"),a=(r==="absolute"||r==="fixed")&&v.inArray("auto",[o,u])>-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return v})})(window);/*  |xGv00|7bc34cbc4ef65454c6e072f374506f55 */
+(function (e, t) { function _(e) { var t = M[e] = {}; return v.each(e.split(y), function (e, n) { t[n] = !0 }), t } function H(e, n, r) { if (r === t && e.nodeType === 1) { var i = "data-" + n.replace(P, "-$1").toLowerCase(); r = e.getAttribute(i); if (typeof r == "string") { try { r = r === "true" ? !0 : r === "false" ? !1 : r === "null" ? null : +r + "" === r ? +r : D.test(r) ? v.parseJSON(r) : r } catch (s) { } v.data(e, n, r) } else r = t } return r } function B(e) { var t; for (t in e) { if (t === "data" && v.isEmptyObject(e[t])) continue; if (t !== "toJSON") return !1 } return !0 } function et() { return !1 } function tt() { return !0 } function ut(e) { return !e || !e.parentNode || e.parentNode.nodeType === 11 } function at(e, t) { do e = e[t]; while (e && e.nodeType !== 1); return e } function ft(e, t, n) { t = t || 0; if (v.isFunction(t)) return v.grep(e, function (e, r) { var i = !!t.call(e, r, e); return i === n }); if (t.nodeType) return v.grep(e, function (e, r) { return e === t === n }); if (typeof t == "string") { var r = v.grep(e, function (e) { return e.nodeType === 1 }); if (it.test(t)) return v.filter(t, r, !n); t = v.filter(t, r) } return v.grep(e, function (e, r) { return v.inArray(e, t) >= 0 === n }) } function lt(e) { var t = ct.split("|"), n = e.createDocumentFragment(); if (n.createElement) while (t.length) n.createElement(t.pop()); return n } function Lt(e, t) { return e.getElementsByTagName(t)[0] || e.appendChild(e.ownerDocument.createElement(t)) } function At(e, t) { if (t.nodeType !== 1 || !v.hasData(e)) return; var n, r, i, s = v._data(e), o = v._data(t, s), u = s.events; if (u) { delete o.handle, o.events = {}; for (n in u) for (r = 0, i = u[n].length; r < i; r++)v.event.add(t, n, u[n][r]) } o.data && (o.data = v.extend({}, o.data)) } function Ot(e, t) { var n; if (t.nodeType !== 1) return; t.clearAttributes && t.clearAttributes(), t.mergeAttributes && t.mergeAttributes(e), n = t.nodeName.toLowerCase(), n === "object" ? (t.parentNode && (t.outerHTML = e.outerHTML), v.support.html5Clone && e.innerHTML && !v.trim(t.innerHTML) && (t.innerHTML = e.innerHTML)) : n === "input" && Et.test(e.type) ? (t.defaultChecked = t.checked = e.checked, t.value !== e.value && (t.value = e.value)) : n === "option" ? t.selected = e.defaultSelected : n === "input" || n === "textarea" ? t.defaultValue = e.defaultValue : n === "script" && t.text !== e.text && (t.text = e.text), t.removeAttribute(v.expando) } function Mt(e) { return typeof e.getElementsByTagName != "undefined" ? e.getElementsByTagName("*") : typeof e.querySelectorAll != "undefined" ? e.querySelectorAll("*") : [] } function _t(e) { Et.test(e.type) && (e.defaultChecked = e.checked) } function Qt(e, t) { if (t in e) return t; var n = t.charAt(0).toUpperCase() + t.slice(1), r = t, i = Jt.length; while (i--) { t = Jt[i] + n; if (t in e) return t } return r } function Gt(e, t) { return e = t || e, v.css(e, "display") === "none" || !v.contains(e.ownerDocument, e) } function Yt(e, t) { var n, r, i = [], s = 0, o = e.length; for (; s < o; s++) { n = e[s]; if (!n.style) continue; i[s] = v._data(n, "olddisplay"), t ? (!i[s] && n.style.display === "none" && (n.style.display = ""), n.style.display === "" && Gt(n) && (i[s] = v._data(n, "olddisplay", nn(n.nodeName)))) : (r = Dt(n, "display"), !i[s] && r !== "none" && v._data(n, "olddisplay", r)) } for (s = 0; s < o; s++) { n = e[s]; if (!n.style) continue; if (!t || n.style.display === "none" || n.style.display === "") n.style.display = t ? i[s] || "" : "none" } return e } function Zt(e, t, n) { var r = Rt.exec(t); return r ? Math.max(0, r[1] - (n || 0)) + (r[2] || "px") : t } function en(e, t, n, r) { var i = n === (r ? "border" : "content") ? 4 : t === "width" ? 1 : 0, s = 0; for (; i < 4; i += 2)n === "margin" && (s += v.css(e, n + $t[i], !0)), r ? (n === "content" && (s -= parseFloat(Dt(e, "padding" + $t[i])) || 0), n !== "margin" && (s -= parseFloat(Dt(e, "border" + $t[i] + "Width")) || 0)) : (s += parseFloat(Dt(e, "padding" + $t[i])) || 0, n !== "padding" && (s += parseFloat(Dt(e, "border" + $t[i] + "Width")) || 0)); return s } function tn(e, t, n) { var r = t === "width" ? e.offsetWidth : e.offsetHeight, i = !0, s = v.support.boxSizing && v.css(e, "boxSizing") === "border-box"; if (r <= 0 || r == null) { r = Dt(e, t); if (r < 0 || r == null) r = e.style[t]; if (Ut.test(r)) return r; i = s && (v.support.boxSizingReliable || r === e.style[t]), r = parseFloat(r) || 0 } return r + en(e, t, n || (s ? "border" : "content"), i) + "px" } function nn(e) { if (Wt[e]) return Wt[e]; var t = v("<" + e + ">").appendTo(i.body), n = t.css("display"); t.remove(); if (n === "none" || n === "") { Pt = i.body.appendChild(Pt || v.extend(i.createElement("iframe"), { frameBorder: 0, width: 0, height: 0 })); if (!Ht || !Pt.createElement) Ht = (Pt.contentWindow || Pt.contentDocument).document, Ht.write("<!doctype html><html><body>"), Ht.close(); t = Ht.body.appendChild(Ht.createElement(e)), n = Dt(t, "display"), i.body.removeChild(Pt) } return Wt[e] = n, n } function fn(e, t, n, r) { var i; if (v.isArray(t)) v.each(t, function (t, i) { n || sn.test(e) ? r(e, i) : fn(e + "[" + (typeof i == "object" ? t : "") + "]", i, n, r) }); else if (!n && v.type(t) === "object") for (i in t) fn(e + "[" + i + "]", t[i], n, r); else r(e, t) } function Cn(e) { return function (t, n) { typeof t != "string" && (n = t, t = "*"); var r, i, s, o = t.toLowerCase().split(y), u = 0, a = o.length; if (v.isFunction(n)) for (; u < a; u++)r = o[u], s = /^\+/.test(r), s && (r = r.substr(1) || "*"), i = e[r] = e[r] || [], i[s ? "unshift" : "push"](n) } } function kn(e, n, r, i, s, o) { s = s || n.dataTypes[0], o = o || {}, o[s] = !0; var u, a = e[s], f = 0, l = a ? a.length : 0, c = e === Sn; for (; f < l && (c || !u); f++)u = a[f](n, r, i), typeof u == "string" && (!c || o[u] ? u = t : (n.dataTypes.unshift(u), u = kn(e, n, r, i, u, o))); return (c || !u) && !o["*"] && (u = kn(e, n, r, i, "*", o)), u } function Ln(e, n) { var r, i, s = v.ajaxSettings.flatOptions || {}; for (r in n) n[r] !== t && ((s[r] ? e : i || (i = {}))[r] = n[r]); i && v.extend(!0, e, i) } function An(e, n, r) { var i, s, o, u, a = e.contents, f = e.dataTypes, l = e.responseFields; for (s in l) s in r && (n[l[s]] = r[s]); while (f[0] === "*") f.shift(), i === t && (i = e.mimeType || n.getResponseHeader("content-type")); if (i) for (s in a) if (a[s] && a[s].test(i)) { f.unshift(s); break } if (f[0] in r) o = f[0]; else { for (s in r) { if (!f[0] || e.converters[s + " " + f[0]]) { o = s; break } u || (u = s) } o = o || u } if (o) return o !== f[0] && f.unshift(o), r[o] } function On(e, t) { var n, r, i, s, o = e.dataTypes.slice(), u = o[0], a = {}, f = 0; e.dataFilter && (t = e.dataFilter(t, e.dataType)); if (o[1]) for (n in e.converters) a[n.toLowerCase()] = e.converters[n]; for (; i = o[++f];)if (i !== "*") { if (u !== "*" && u !== i) { n = a[u + " " + i] || a["* " + i]; if (!n) for (r in a) { s = r.split(" "); if (s[1] === i) { n = a[u + " " + s[0]] || a["* " + s[0]]; if (n) { n === !0 ? n = a[r] : a[r] !== !0 && (i = s[0], o.splice(f--, 0, i)); break } } } if (n !== !0) if (n && e["throws"]) t = n(t); else try { t = n(t) } catch (l) { return { state: "parsererror", error: n ? l : "No conversion from " + u + " to " + i } } } u = i } return { state: "success", data: t } } function Fn() { try { return new e.XMLHttpRequest } catch (t) { } } function In() { try { return new e.ActiveXObject("Microsoft.XMLHTTP") } catch (t) { } } function $n() { return setTimeout(function () { qn = t }, 0), qn = v.now() } function Jn(e, t) { v.each(t, function (t, n) { var r = (Vn[t] || []).concat(Vn["*"]), i = 0, s = r.length; for (; i < s; i++)if (r[i].call(e, t, n)) return }) } function Kn(e, t, n) { var r, i = 0, s = 0, o = Xn.length, u = v.Deferred().always(function () { delete a.elem }), a = function () { var t = qn || $n(), n = Math.max(0, f.startTime + f.duration - t), r = n / f.duration || 0, i = 1 - r, s = 0, o = f.tweens.length; for (; s < o; s++)f.tweens[s].run(i); return u.notifyWith(e, [f, i, n]), i < 1 && o ? n : (u.resolveWith(e, [f]), !1) }, f = u.promise({ elem: e, props: v.extend({}, t), opts: v.extend(!0, { specialEasing: {} }, n), originalProperties: t, originalOptions: n, startTime: qn || $n(), duration: n.duration, tweens: [], createTween: function (t, n, r) { var i = v.Tween(e, f.opts, t, n, f.opts.specialEasing[t] || f.opts.easing); return f.tweens.push(i), i }, stop: function (t) { var n = 0, r = t ? f.tweens.length : 0; for (; n < r; n++)f.tweens[n].run(1); return t ? u.resolveWith(e, [f, t]) : u.rejectWith(e, [f, t]), this } }), l = f.props; Qn(l, f.opts.specialEasing); for (; i < o; i++) { r = Xn[i].call(f, e, l, f.opts); if (r) return r } return Jn(f, l), v.isFunction(f.opts.start) && f.opts.start.call(e, f), v.fx.timer(v.extend(a, { anim: f, queue: f.opts.queue, elem: e })), f.progress(f.opts.progress).done(f.opts.done, f.opts.complete).fail(f.opts.fail).always(f.opts.always) } function Qn(e, t) { var n, r, i, s, o; for (n in e) { r = v.camelCase(n), i = t[r], s = e[n], v.isArray(s) && (i = s[1], s = e[n] = s[0]), n !== r && (e[r] = s, delete e[n]), o = v.cssHooks[r]; if (o && "expand" in o) { s = o.expand(s), delete e[r]; for (n in s) n in e || (e[n] = s[n], t[n] = i) } else t[r] = i } } function Gn(e, t, n) { var r, i, s, o, u, a, f, l, c, h = this, p = e.style, d = {}, m = [], g = e.nodeType && Gt(e); n.queue || (l = v._queueHooks(e, "fx"), l.unqueued == null && (l.unqueued = 0, c = l.empty.fire, l.empty.fire = function () { l.unqueued || c() }), l.unqueued++, h.always(function () { h.always(function () { l.unqueued--, v.queue(e, "fx").length || l.empty.fire() }) })), e.nodeType === 1 && ("height" in t || "width" in t) && (n.overflow = [p.overflow, p.overflowX, p.overflowY], v.css(e, "display") === "inline" && v.css(e, "float") === "none" && (!v.support.inlineBlockNeedsLayout || nn(e.nodeName) === "inline" ? p.display = "inline-block" : p.zoom = 1)), n.overflow && (p.overflow = "hidden", v.support.shrinkWrapBlocks || h.done(function () { p.overflow = n.overflow[0], p.overflowX = n.overflow[1], p.overflowY = n.overflow[2] })); for (r in t) { s = t[r]; if (Un.exec(s)) { delete t[r], a = a || s === "toggle"; if (s === (g ? "hide" : "show")) continue; m.push(r) } } o = m.length; if (o) { u = v._data(e, "fxshow") || v._data(e, "fxshow", {}), "hidden" in u && (g = u.hidden), a && (u.hidden = !g), g ? v(e).show() : h.done(function () { v(e).hide() }), h.done(function () { var t; v.removeData(e, "fxshow", !0); for (t in d) v.style(e, t, d[t]) }); for (r = 0; r < o; r++)i = m[r], f = h.createTween(i, g ? u[i] : 0), d[i] = u[i] || v.style(e, i), i in u || (u[i] = f.start, g && (f.end = f.start, f.start = i === "width" || i === "height" ? 1 : 0)) } } function Yn(e, t, n, r, i) { return new Yn.prototype.init(e, t, n, r, i) } function Zn(e, t) { var n, r = { height: e }, i = 0; t = t ? 1 : 0; for (; i < 4; i += 2 - t)n = $t[i], r["margin" + n] = r["padding" + n] = e; return t && (r.opacity = r.width = e), r } function tr(e) { return v.isWindow(e) ? e : e.nodeType === 9 ? e.defaultView || e.parentWindow : !1 } var n, r, i = e.document, s = e.location, o = e.navigator, u = e.jQuery, a = e.$, f = Array.prototype.push, l = Array.prototype.slice, c = Array.prototype.indexOf, h = Object.prototype.toString, p = Object.prototype.hasOwnProperty, d = String.prototype.trim, v = function (e, t) { return new v.fn.init(e, t, n) }, m = /[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source, g = /\S/, y = /\s+/, b = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, w = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/, E = /^<(\w+)\s*\/?>(?:<\/\1>|)$/, S = /^[\],:{}\s]*$/, x = /(?:^|:|,)(?:\s*\[)+/g, T = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g, N = /"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g, C = /^-ms-/, k = /-([\da-z])/gi, L = function (e, t) { return (t + "").toUpperCase() }, A = function () { i.addEventListener ? (i.removeEventListener("DOMContentLoaded", A, !1), v.ready()) : i.readyState === "complete" && (i.detachEvent("onreadystatechange", A), v.ready()) }, O = {}; v.fn = v.prototype = { constructor: v, init: function (e, n, r) { var s, o, u, a; if (!e) return this; if (e.nodeType) return this.context = this[0] = e, this.length = 1, this; if (typeof e == "string") { e.charAt(0) === "<" && e.charAt(e.length - 1) === ">" && e.length >= 3 ? s = [null, e, null] : s = w.exec(e); if (s && (s[1] || !n)) { if (s[1]) return n = n instanceof v ? n[0] : n, a = n && n.nodeType ? n.ownerDocument || n : i, e = v.parseHTML(s[1], a, !0), E.test(s[1]) && v.isPlainObject(n) && this.attr.call(e, n, !0), v.merge(this, e); o = i.getElementById(s[2]); if (o && o.parentNode) { if (o.id !== s[2]) return r.find(e); this.length = 1, this[0] = o } return this.context = i, this.selector = e, this } return !n || n.jquery ? (n || r).find(e) : this.constructor(n).find(e) } return v.isFunction(e) ? r.ready(e) : (e.selector !== t && (this.selector = e.selector, this.context = e.context), v.makeArray(e, this)) }, selector: "", jquery: "1.8.3", length: 0, size: function () { return this.length }, toArray: function () { return l.call(this) }, get: function (e) { return e == null ? this.toArray() : e < 0 ? this[this.length + e] : this[e] }, pushStack: function (e, t, n) { var r = v.merge(this.constructor(), e); return r.prevObject = this, r.context = this.context, t === "find" ? r.selector = this.selector + (this.selector ? " " : "") + n : t && (r.selector = this.selector + "." + t + "(" + n + ")"), r }, each: function (e, t) { return v.each(this, e, t) }, ready: function (e) { return v.ready.promise().done(e), this }, eq: function (e) { return e = +e, e === -1 ? this.slice(e) : this.slice(e, e + 1) }, first: function () { return this.eq(0) }, last: function () { return this.eq(-1) }, slice: function () { return this.pushStack(l.apply(this, arguments), "slice", l.call(arguments).join(",")) }, map: function (e) { return this.pushStack(v.map(this, function (t, n) { return e.call(t, n, t) })) }, end: function () { return this.prevObject || this.constructor(null) }, push: f, sort: [].sort, splice: [].splice }, v.fn.init.prototype = v.fn, v.extend = v.fn.extend = function () { var e, n, r, i, s, o, u = arguments[0] || {}, a = 1, f = arguments.length, l = !1; typeof u == "boolean" && (l = u, u = arguments[1] || {}, a = 2), typeof u != "object" && !v.isFunction(u) && (u = {}), f === a && (u = this, --a); for (; a < f; a++)if ((e = arguments[a]) != null) for (n in e) { r = u[n], i = e[n]; if (u === i) continue; l && i && (v.isPlainObject(i) || (s = v.isArray(i))) ? (s ? (s = !1, o = r && v.isArray(r) ? r : []) : o = r && v.isPlainObject(r) ? r : {}, u[n] = v.extend(l, o, i)) : i !== t && (u[n] = i) } return u }, v.extend({ noConflict: function (t) { return e.$ === v && (e.$ = a), t && e.jQuery === v && (e.jQuery = u), v }, isReady: !1, readyWait: 1, holdReady: function (e) { e ? v.readyWait++ : v.ready(!0) }, ready: function (e) { if (e === !0 ? --v.readyWait : v.isReady) return; if (!i.body) return setTimeout(v.ready, 1); v.isReady = !0; if (e !== !0 && --v.readyWait > 0) return; r.resolveWith(i, [v]), v.fn.trigger && v(i).trigger("ready").off("ready") }, isFunction: function (e) { return v.type(e) === "function" }, isArray: Array.isArray || function (e) { return v.type(e) === "array" }, isWindow: function (e) { return e != null && e == e.window }, isNumeric: function (e) { return !isNaN(parseFloat(e)) && isFinite(e) }, type: function (e) { return e == null ? String(e) : O[h.call(e)] || "object" }, isPlainObject: function (e) { if (!e || v.type(e) !== "object" || e.nodeType || v.isWindow(e)) return !1; try { if (e.constructor && !p.call(e, "constructor") && !p.call(e.constructor.prototype, "isPrototypeOf")) return !1 } catch (n) { return !1 } var r; for (r in e); return r === t || p.call(e, r) }, isEmptyObject: function (e) { var t; for (t in e) return !1; return !0 }, error: function (e) { throw new Error(e) }, parseHTML: function (e, t, n) { var r; return !e || typeof e != "string" ? null : (typeof t == "boolean" && (n = t, t = 0), t = t || i, (r = E.exec(e)) ? [t.createElement(r[1])] : (r = v.buildFragment([e], t, n ? null : []), v.merge([], (r.cacheable ? v.clone(r.fragment) : r.fragment).childNodes))) }, parseJSON: function (t) { if (!t || typeof t != "string") return null; t = v.trim(t); if (e.JSON && e.JSON.parse) return e.JSON.parse(t); if (S.test(t.replace(T, "@").replace(N, "]").replace(x, ""))) return (new Function("return " + t))(); v.error("Invalid JSON: " + t) }, parseXML: function (n) { var r, i; if (!n || typeof n != "string") return null; try { e.DOMParser ? (i = new DOMParser, r = i.parseFromString(n, "text/xml")) : (r = new ActiveXObject("Microsoft.XMLDOM"), r.async = "false", r.loadXML(n)) } catch (s) { r = t } return (!r || !r.documentElement || r.getElementsByTagName("parsererror").length) && v.error("Invalid XML: " + n), r }, noop: function () { }, globalEval: function (t) { t && g.test(t) && (e.execScript || function (t) { e.eval.call(e, t) })(t) }, camelCase: function (e) { return e.replace(C, "ms-").replace(k, L) }, nodeName: function (e, t) { return e.nodeName && e.nodeName.toLowerCase() === t.toLowerCase() }, each: function (e, n, r) { var i, s = 0, o = e.length, u = o === t || v.isFunction(e); if (r) { if (u) { for (i in e) if (n.apply(e[i], r) === !1) break } else for (; s < o;)if (n.apply(e[s++], r) === !1) break } else if (u) { for (i in e) if (n.call(e[i], i, e[i]) === !1) break } else for (; s < o;)if (n.call(e[s], s, e[s++]) === !1) break; return e }, trim: d && !d.call("\ufeff\u00a0") ? function (e) { return e == null ? "" : d.call(e) } : function (e) { return e == null ? "" : (e + "").replace(b, "") }, makeArray: function (e, t) { var n, r = t || []; return e != null && (n = v.type(e), e.length == null || n === "string" || n === "function" || n === "regexp" || v.isWindow(e) ? f.call(r, e) : v.merge(r, e)), r }, inArray: function (e, t, n) { var r; if (t) { if (c) return c.call(t, e, n); r = t.length, n = n ? n < 0 ? Math.max(0, r + n) : n : 0; for (; n < r; n++)if (n in t && t[n] === e) return n } return -1 }, merge: function (e, n) { var r = n.length, i = e.length, s = 0; if (typeof r == "number") for (; s < r; s++)e[i++] = n[s]; else while (n[s] !== t) e[i++] = n[s++]; return e.length = i, e }, grep: function (e, t, n) { var r, i = [], s = 0, o = e.length; n = !!n; for (; s < o; s++)r = !!t(e[s], s), n !== r && i.push(e[s]); return i }, map: function (e, n, r) { var i, s, o = [], u = 0, a = e.length, f = e instanceof v || a !== t && typeof a == "number" && (a > 0 && e[0] && e[a - 1] || a === 0 || v.isArray(e)); if (f) for (; u < a; u++)i = n(e[u], u, r), i != null && (o[o.length] = i); else for (s in e) i = n(e[s], s, r), i != null && (o[o.length] = i); return o.concat.apply([], o) }, guid: 1, proxy: function (e, n) { var r, i, s; return typeof n == "string" && (r = e[n], n = e, e = r), v.isFunction(e) ? (i = l.call(arguments, 2), s = function () { return e.apply(n, i.concat(l.call(arguments))) }, s.guid = e.guid = e.guid || v.guid++, s) : t }, access: function (e, n, r, i, s, o, u) { var a, f = r == null, l = 0, c = e.length; if (r && typeof r == "object") { for (l in r) v.access(e, n, l, r[l], 1, o, i); s = 1 } else if (i !== t) { a = u === t && v.isFunction(i), f && (a ? (a = n, n = function (e, t, n) { return a.call(v(e), n) }) : (n.call(e, i), n = null)); if (n) for (; l < c; l++)n(e[l], r, a ? i.call(e[l], l, n(e[l], r)) : i, u); s = 1 } return s ? e : f ? n.call(e) : c ? n(e[0], r) : o }, now: function () { return (new Date).getTime() } }), v.ready.promise = function (t) { if (!r) { r = v.Deferred(); if (i.readyState === "complete") setTimeout(v.ready, 1); else if (i.addEventListener) i.addEventListener("DOMContentLoaded", A, !1), e.addEventListener("load", v.ready, !1); else { i.attachEvent("onreadystatechange", A), e.attachEvent("onload", v.ready); var n = !1; try { n = e.frameElement == null && i.documentElement } catch (s) { } n && n.doScroll && function o() { if (!v.isReady) { try { n.doScroll("left") } catch (e) { return setTimeout(o, 50) } v.ready() } }() } } return r.promise(t) }, v.each("Boolean Number String Function Array Date RegExp Object".split(" "), function (e, t) { O["[object " + t + "]"] = t.toLowerCase() }), n = v(i); var M = {}; v.Callbacks = function (e) { e = typeof e == "string" ? M[e] || _(e) : v.extend({}, e); var n, r, i, s, o, u, a = [], f = !e.once && [], l = function (t) { n = e.memory && t, r = !0, u = s || 0, s = 0, o = a.length, i = !0; for (; a && u < o; u++)if (a[u].apply(t[0], t[1]) === !1 && e.stopOnFalse) { n = !1; break } i = !1, a && (f ? f.length && l(f.shift()) : n ? a = [] : c.disable()) }, c = { add: function () { if (a) { var t = a.length; (function r(t) { v.each(t, function (t, n) { var i = v.type(n); i === "function" ? (!e.unique || !c.has(n)) && a.push(n) : n && n.length && i !== "string" && r(n) }) })(arguments), i ? o = a.length : n && (s = t, l(n)) } return this }, remove: function () { return a && v.each(arguments, function (e, t) { var n; while ((n = v.inArray(t, a, n)) > -1) a.splice(n, 1), i && (n <= o && o--, n <= u && u--) }), this }, has: function (e) { return v.inArray(e, a) > -1 }, empty: function () { return a = [], this }, disable: function () { return a = f = n = t, this }, disabled: function () { return !a }, lock: function () { return f = t, n || c.disable(), this }, locked: function () { return !f }, fireWith: function (e, t) { return t = t || [], t = [e, t.slice ? t.slice() : t], a && (!r || f) && (i ? f.push(t) : l(t)), this }, fire: function () { return c.fireWith(this, arguments), this }, fired: function () { return !!r } }; return c }, v.extend({ Deferred: function (e) { var t = [["resolve", "done", v.Callbacks("once memory"), "resolved"], ["reject", "fail", v.Callbacks("once memory"), "rejected"], ["notify", "progress", v.Callbacks("memory")]], n = "pending", r = { state: function () { return n }, always: function () { return i.done(arguments).fail(arguments), this }, then: function () { var e = arguments; return v.Deferred(function (n) { v.each(t, function (t, r) { var s = r[0], o = e[t]; i[r[1]](v.isFunction(o) ? function () { var e = o.apply(this, arguments); e && v.isFunction(e.promise) ? e.promise().done(n.resolve).fail(n.reject).progress(n.notify) : n[s + "With"](this === i ? n : this, [e]) } : n[s]) }), e = null }).promise() }, promise: function (e) { return e != null ? v.extend(e, r) : r } }, i = {}; return r.pipe = r.then, v.each(t, function (e, s) { var o = s[2], u = s[3]; r[s[1]] = o.add, u && o.add(function () { n = u }, t[e ^ 1][2].disable, t[2][2].lock), i[s[0]] = o.fire, i[s[0] + "With"] = o.fireWith }), r.promise(i), e && e.call(i, i), i }, when: function (e) { var t = 0, n = l.call(arguments), r = n.length, i = r !== 1 || e && v.isFunction(e.promise) ? r : 0, s = i === 1 ? e : v.Deferred(), o = function (e, t, n) { return function (r) { t[e] = this, n[e] = arguments.length > 1 ? l.call(arguments) : r, n === u ? s.notifyWith(t, n) : --i || s.resolveWith(t, n) } }, u, a, f; if (r > 1) { u = new Array(r), a = new Array(r), f = new Array(r); for (; t < r; t++)n[t] && v.isFunction(n[t].promise) ? n[t].promise().done(o(t, f, n)).fail(s.reject).progress(o(t, a, u)) : --i } return i || s.resolveWith(f, n), s.promise() } }), v.support = function () { var t, n, r, s, o, u, a, f, l, c, h, p = i.createElement("div"); p.setAttribute("className", "t"), p.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>", n = p.getElementsByTagName("*"), r = p.getElementsByTagName("a")[0]; if (!n || !r || !n.length) return {}; s = i.createElement("select"), o = s.appendChild(i.createElement("option")), u = p.getElementsByTagName("input")[0], r.style.cssText = "top:1px;float:left;opacity:.5", t = { leadingWhitespace: p.firstChild.nodeType === 3, tbody: !p.getElementsByTagName("tbody").length, htmlSerialize: !!p.getElementsByTagName("link").length, style: /top/.test(r.getAttribute("style")), hrefNormalized: r.getAttribute("href") === "/a", opacity: /^0.5/.test(r.style.opacity), cssFloat: !!r.style.cssFloat, checkOn: u.value === "on", optSelected: o.selected, getSetAttribute: p.className !== "t", enctype: !!i.createElement("form").enctype, html5Clone: i.createElement("nav").cloneNode(!0).outerHTML !== "<:nav></:nav>", boxModel: i.compatMode === "CSS1Compat", submitBubbles: !0, changeBubbles: !0, focusinBubbles: !1, deleteExpando: !0, noCloneEvent: !0, inlineBlockNeedsLayout: !1, shrinkWrapBlocks: !1, reliableMarginRight: !0, boxSizingReliable: !0, pixelPosition: !1 }, u.checked = !0, t.noCloneChecked = u.cloneNode(!0).checked, s.disabled = !0, t.optDisabled = !o.disabled; try { delete p.test } catch (d) { t.deleteExpando = !1 } !p.addEventListener && p.attachEvent && p.fireEvent && (p.attachEvent("onclick", h = function () { t.noCloneEvent = !1 }), p.cloneNode(!0).fireEvent("onclick"), p.detachEvent("onclick", h)), u = i.createElement("input"), u.value = "t", u.setAttribute("type", "radio"), t.radioValue = u.value === "t", u.setAttribute("checked", "checked"), u.setAttribute("name", "t"), p.appendChild(u), a = i.createDocumentFragment(), a.appendChild(p.lastChild), t.checkClone = a.cloneNode(!0).cloneNode(!0).lastChild.checked, t.appendChecked = u.checked, a.removeChild(u), a.appendChild(p); if (p.attachEvent) for (l in { submit: !0, change: !0, focusin: !0 }) f = "on" + l, c = f in p, c || (p.setAttribute(f, "return;"), c = typeof p[f] == "function"), t[l + "Bubbles"] = c; return v(function () { var n, r, s, o, u = "padding:0;margin:0;border:0;display:block;overflow:hidden;", a = i.getElementsByTagName("body")[0]; if (!a) return; n = i.createElement("div"), n.style.cssText = "visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px", a.insertBefore(n, a.firstChild), r = i.createElement("div"), n.appendChild(r), r.innerHTML = "<table><tr><td></td><td>t</td></tr></table>", s = r.getElementsByTagName("td"), s[0].style.cssText = "padding:0;margin:0;border:0;display:none", c = s[0].offsetHeight === 0, s[0].style.display = "", s[1].style.display = "none", t.reliableHiddenOffsets = c && s[0].offsetHeight === 0, r.innerHTML = "", r.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;", t.boxSizing = r.offsetWidth === 4, t.doesNotIncludeMarginInBodyOffset = a.offsetTop !== 1, e.getComputedStyle && (t.pixelPosition = (e.getComputedStyle(r, null) || {}).top !== "1%", t.boxSizingReliable = (e.getComputedStyle(r, null) || { width: "4px" }).width === "4px", o = i.createElement("div"), o.style.cssText = r.style.cssText = u, o.style.marginRight = o.style.width = "0", r.style.width = "1px", r.appendChild(o), t.reliableMarginRight = !parseFloat((e.getComputedStyle(o, null) || {}).marginRight)), typeof r.style.zoom != "undefined" && (r.innerHTML = "", r.style.cssText = u + "width:1px;padding:1px;display:inline;zoom:1", t.inlineBlockNeedsLayout = r.offsetWidth === 3, r.style.display = "block", r.style.overflow = "visible", r.innerHTML = "<div></div>", r.firstChild.style.width = "5px", t.shrinkWrapBlocks = r.offsetWidth !== 3, n.style.zoom = 1), a.removeChild(n), n = r = s = o = null }), a.removeChild(p), n = r = s = o = u = a = p = null, t }(); var D = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/, P = /([A-Z])/g; v.extend({ cache: {}, deletedIds: [], uuid: 0, expando: "jQuery" + (v.fn.jquery + Math.random()).replace(/\D/g, ""), noData: { embed: !0, object: "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", applet: !0 }, hasData: function (e) { return e = e.nodeType ? v.cache[e[v.expando]] : e[v.expando], !!e && !B(e) }, data: function (e, n, r, i) { if (!v.acceptData(e)) return; var s, o, u = v.expando, a = typeof n == "string", f = e.nodeType, l = f ? v.cache : e, c = f ? e[u] : e[u] && u; if ((!c || !l[c] || !i && !l[c].data) && a && r === t) return; c || (f ? e[u] = c = v.deletedIds.pop() || v.guid++ : c = u), l[c] || (l[c] = {}, f || (l[c].toJSON = v.noop)); if (typeof n == "object" || typeof n == "function") i ? l[c] = v.extend(l[c], n) : l[c].data = v.extend(l[c].data, n); return s = l[c], i || (s.data || (s.data = {}), s = s.data), r !== t && (s[v.camelCase(n)] = r), a ? (o = s[n], o == null && (o = s[v.camelCase(n)])) : o = s, o }, removeData: function (e, t, n) { if (!v.acceptData(e)) return; var r, i, s, o = e.nodeType, u = o ? v.cache : e, a = o ? e[v.expando] : v.expando; if (!u[a]) return; if (t) { r = n ? u[a] : u[a].data; if (r) { v.isArray(t) || (t in r ? t = [t] : (t = v.camelCase(t), t in r ? t = [t] : t = t.split(" "))); for (i = 0, s = t.length; i < s; i++)delete r[t[i]]; if (!(n ? B : v.isEmptyObject)(r)) return } } if (!n) { delete u[a].data; if (!B(u[a])) return } o ? v.cleanData([e], !0) : v.support.deleteExpando || u != u.window ? delete u[a] : u[a] = null }, _data: function (e, t, n) { return v.data(e, t, n, !0) }, acceptData: function (e) { var t = e.nodeName && v.noData[e.nodeName.toLowerCase()]; return !t || t !== !0 && e.getAttribute("classid") === t } }), v.fn.extend({ data: function (e, n) { var r, i, s, o, u, a = this[0], f = 0, l = null; if (e === t) { if (this.length) { l = v.data(a); if (a.nodeType === 1 && !v._data(a, "parsedAttrs")) { s = a.attributes; for (u = s.length; f < u; f++)o = s[f].name, o.indexOf("data-") || (o = v.camelCase(o.substring(5)), H(a, o, l[o])); v._data(a, "parsedAttrs", !0) } } return l } return typeof e == "object" ? this.each(function () { v.data(this, e) }) : (r = e.split(".", 2), r[1] = r[1] ? "." + r[1] : "", i = r[1] + "!", v.access(this, function (n) { if (n === t) return l = this.triggerHandler("getData" + i, [r[0]]), l === t && a && (l = v.data(a, e), l = H(a, e, l)), l === t && r[1] ? this.data(r[0]) : l; r[1] = n, this.each(function () { var t = v(this); t.triggerHandler("setData" + i, r), v.data(this, e, n), t.triggerHandler("changeData" + i, r) }) }, null, n, arguments.length > 1, null, !1)) }, removeData: function (e) { return this.each(function () { v.removeData(this, e) }) } }), v.extend({ queue: function (e, t, n) { var r; if (e) return t = (t || "fx") + "queue", r = v._data(e, t), n && (!r || v.isArray(n) ? r = v._data(e, t, v.makeArray(n)) : r.push(n)), r || [] }, dequeue: function (e, t) { t = t || "fx"; var n = v.queue(e, t), r = n.length, i = n.shift(), s = v._queueHooks(e, t), o = function () { v.dequeue(e, t) }; i === "inprogress" && (i = n.shift(), r--), i && (t === "fx" && n.unshift("inprogress"), delete s.stop, i.call(e, o, s)), !r && s && s.empty.fire() }, _queueHooks: function (e, t) { var n = t + "queueHooks"; return v._data(e, n) || v._data(e, n, { empty: v.Callbacks("once memory").add(function () { v.removeData(e, t + "queue", !0), v.removeData(e, n, !0) }) }) } }), v.fn.extend({ queue: function (e, n) { var r = 2; return typeof e != "string" && (n = e, e = "fx", r--), arguments.length < r ? v.queue(this[0], e) : n === t ? this : this.each(function () { var t = v.queue(this, e, n); v._queueHooks(this, e), e === "fx" && t[0] !== "inprogress" && v.dequeue(this, e) }) }, dequeue: function (e) { return this.each(function () { v.dequeue(this, e) }) }, delay: function (e, t) { return e = v.fx ? v.fx.speeds[e] || e : e, t = t || "fx", this.queue(t, function (t, n) { var r = setTimeout(t, e); n.stop = function () { clearTimeout(r) } }) }, clearQueue: function (e) { return this.queue(e || "fx", []) }, promise: function (e, n) { var r, i = 1, s = v.Deferred(), o = this, u = this.length, a = function () { --i || s.resolveWith(o, [o]) }; typeof e != "string" && (n = e, e = t), e = e || "fx"; while (u--) r = v._data(o[u], e + "queueHooks"), r && r.empty && (i++, r.empty.add(a)); return a(), s.promise(n) } }); var j, F, I, q = /[\t\r\n]/g, R = /\r/g, U = /^(?:button|input)$/i, z = /^(?:button|input|object|select|textarea)$/i, W = /^a(?:rea|)$/i, X = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, V = v.support.getSetAttribute; v.fn.extend({ attr: function (e, t) { return v.access(this, v.attr, e, t, arguments.length > 1) }, removeAttr: function (e) { return this.each(function () { v.removeAttr(this, e) }) }, prop: function (e, t) { return v.access(this, v.prop, e, t, arguments.length > 1) }, removeProp: function (e) { return e = v.propFix[e] || e, this.each(function () { try { this[e] = t, delete this[e] } catch (n) { } }) }, addClass: function (e) { var t, n, r, i, s, o, u; if (v.isFunction(e)) return this.each(function (t) { v(this).addClass(e.call(this, t, this.className)) }); if (e && typeof e == "string") { t = e.split(y); for (n = 0, r = this.length; n < r; n++) { i = this[n]; if (i.nodeType === 1) if (!i.className && t.length === 1) i.className = e; else { s = " " + i.className + " "; for (o = 0, u = t.length; o < u; o++)s.indexOf(" " + t[o] + " ") < 0 && (s += t[o] + " "); i.className = v.trim(s) } } } return this }, removeClass: function (e) { var n, r, i, s, o, u, a; if (v.isFunction(e)) return this.each(function (t) { v(this).removeClass(e.call(this, t, this.className)) }); if (e && typeof e == "string" || e === t) { n = (e || "").split(y); for (u = 0, a = this.length; u < a; u++) { i = this[u]; if (i.nodeType === 1 && i.className) { r = (" " + i.className + " ").replace(q, " "); for (s = 0, o = n.length; s < o; s++)while (r.indexOf(" " + n[s] + " ") >= 0) r = r.replace(" " + n[s] + " ", " "); i.className = e ? v.trim(r) : "" } } } return this }, toggleClass: function (e, t) { var n = typeof e, r = typeof t == "boolean"; return v.isFunction(e) ? this.each(function (n) { v(this).toggleClass(e.call(this, n, this.className, t), t) }) : this.each(function () { if (n === "string") { var i, s = 0, o = v(this), u = t, a = e.split(y); while (i = a[s++]) u = r ? u : !o.hasClass(i), o[u ? "addClass" : "removeClass"](i) } else if (n === "undefined" || n === "boolean") this.className && v._data(this, "__className__", this.className), this.className = this.className || e === !1 ? "" : v._data(this, "__className__") || "" }) }, hasClass: function (e) { var t = " " + e + " ", n = 0, r = this.length; for (; n < r; n++)if (this[n].nodeType === 1 && (" " + this[n].className + " ").replace(q, " ").indexOf(t) >= 0) return !0; return !1 }, val: function (e) { var n, r, i, s = this[0]; if (!arguments.length) { if (s) return n = v.valHooks[s.type] || v.valHooks[s.nodeName.toLowerCase()], n && "get" in n && (r = n.get(s, "value")) !== t ? r : (r = s.value, typeof r == "string" ? r.replace(R, "") : r == null ? "" : r); return } return i = v.isFunction(e), this.each(function (r) { var s, o = v(this); if (this.nodeType !== 1) return; i ? s = e.call(this, r, o.val()) : s = e, s == null ? s = "" : typeof s == "number" ? s += "" : v.isArray(s) && (s = v.map(s, function (e) { return e == null ? "" : e + "" })), n = v.valHooks[this.type] || v.valHooks[this.nodeName.toLowerCase()]; if (!n || !("set" in n) || n.set(this, s, "value") === t) this.value = s }) } }), v.extend({ valHooks: { option: { get: function (e) { var t = e.attributes.value; return !t || t.specified ? e.value : e.text } }, select: { get: function (e) { var t, n, r = e.options, i = e.selectedIndex, s = e.type === "select-one" || i < 0, o = s ? null : [], u = s ? i + 1 : r.length, a = i < 0 ? u : s ? i : 0; for (; a < u; a++) { n = r[a]; if ((n.selected || a === i) && (v.support.optDisabled ? !n.disabled : n.getAttribute("disabled") === null) && (!n.parentNode.disabled || !v.nodeName(n.parentNode, "optgroup"))) { t = v(n).val(); if (s) return t; o.push(t) } } return o }, set: function (e, t) { var n = v.makeArray(t); return v(e).find("option").each(function () { this.selected = v.inArray(v(this).val(), n) >= 0 }), n.length || (e.selectedIndex = -1), n } } }, attrFn: {}, attr: function (e, n, r, i) { var s, o, u, a = e.nodeType; if (!e || a === 3 || a === 8 || a === 2) return; if (i && v.isFunction(v.fn[n])) return v(e)[n](r); if (typeof e.getAttribute == "undefined") return v.prop(e, n, r); u = a !== 1 || !v.isXMLDoc(e), u && (n = n.toLowerCase(), o = v.attrHooks[n] || (X.test(n) ? F : j)); if (r !== t) { if (r === null) { v.removeAttr(e, n); return } return o && "set" in o && u && (s = o.set(e, r, n)) !== t ? s : (e.setAttribute(n, r + ""), r) } return o && "get" in o && u && (s = o.get(e, n)) !== null ? s : (s = e.getAttribute(n), s === null ? t : s) }, removeAttr: function (e, t) { var n, r, i, s, o = 0; if (t && e.nodeType === 1) { r = t.split(y); for (; o < r.length; o++)i = r[o], i && (n = v.propFix[i] || i, s = X.test(i), s || v.attr(e, i, ""), e.removeAttribute(V ? i : n), s && n in e && (e[n] = !1)) } }, attrHooks: { type: { set: function (e, t) { if (U.test(e.nodeName) && e.parentNode) v.error("type property can't be changed"); else if (!v.support.radioValue && t === "radio" && v.nodeName(e, "input")) { var n = e.value; return e.setAttribute("type", t), n && (e.value = n), t } } }, value: { get: function (e, t) { return j && v.nodeName(e, "button") ? j.get(e, t) : t in e ? e.value : null }, set: function (e, t, n) { if (j && v.nodeName(e, "button")) return j.set(e, t, n); e.value = t } } }, propFix: { tabindex: "tabIndex", readonly: "readOnly", "for": "htmlFor", "class": "className", maxlength: "maxLength", cellspacing: "cellSpacing", cellpadding: "cellPadding", rowspan: "rowSpan", colspan: "colSpan", usemap: "useMap", frameborder: "frameBorder", contenteditable: "contentEditable" }, prop: function (e, n, r) { var i, s, o, u = e.nodeType; if (!e || u === 3 || u === 8 || u === 2) return; return o = u !== 1 || !v.isXMLDoc(e), o && (n = v.propFix[n] || n, s = v.propHooks[n]), r !== t ? s && "set" in s && (i = s.set(e, r, n)) !== t ? i : e[n] = r : s && "get" in s && (i = s.get(e, n)) !== null ? i : e[n] }, propHooks: { tabIndex: { get: function (e) { var n = e.getAttributeNode("tabindex"); return n && n.specified ? parseInt(n.value, 10) : z.test(e.nodeName) || W.test(e.nodeName) && e.href ? 0 : t } } } }), F = { get: function (e, n) { var r, i = v.prop(e, n); return i === !0 || typeof i != "boolean" && (r = e.getAttributeNode(n)) && r.nodeValue !== !1 ? n.toLowerCase() : t }, set: function (e, t, n) { var r; return t === !1 ? v.removeAttr(e, n) : (r = v.propFix[n] || n, r in e && (e[r] = !0), e.setAttribute(n, n.toLowerCase())), n } }, V || (I = { name: !0, id: !0, coords: !0 }, j = v.valHooks.button = { get: function (e, n) { var r; return r = e.getAttributeNode(n), r && (I[n] ? r.value !== "" : r.specified) ? r.value : t }, set: function (e, t, n) { var r = e.getAttributeNode(n); return r || (r = i.createAttribute(n), e.setAttributeNode(r)), r.value = t + "" } }, v.each(["width", "height"], function (e, t) { v.attrHooks[t] = v.extend(v.attrHooks[t], { set: function (e, n) { if (n === "") return e.setAttribute(t, "auto"), n } }) }), v.attrHooks.contenteditable = { get: j.get, set: function (e, t, n) { t === "" && (t = "false"), j.set(e, t, n) } }), v.support.hrefNormalized || v.each(["href", "src", "width", "height"], function (e, n) { v.attrHooks[n] = v.extend(v.attrHooks[n], { get: function (e) { var r = e.getAttribute(n, 2); return r === null ? t : r } }) }), v.support.style || (v.attrHooks.style = { get: function (e) { return e.style.cssText.toLowerCase() || t }, set: function (e, t) { return e.style.cssText = t + "" } }), v.support.optSelected || (v.propHooks.selected = v.extend(v.propHooks.selected, { get: function (e) { var t = e.parentNode; return t && (t.selectedIndex, t.parentNode && t.parentNode.selectedIndex), null } })), v.support.enctype || (v.propFix.enctype = "encoding"), v.support.checkOn || v.each(["radio", "checkbox"], function () { v.valHooks[this] = { get: function (e) { return e.getAttribute("value") === null ? "on" : e.value } } }), v.each(["radio", "checkbox"], function () { v.valHooks[this] = v.extend(v.valHooks[this], { set: function (e, t) { if (v.isArray(t)) return e.checked = v.inArray(v(e).val(), t) >= 0 } }) }); var $ = /^(?:textarea|input|select)$/i, J = /^([^\.]*|)(?:\.(.+)|)$/, K = /(?:^|\s)hover(\.\S+|)\b/, Q = /^key/, G = /^(?:mouse|contextmenu)|click/, Y = /^(?:focusinfocus|focusoutblur)$/, Z = function (e) { return v.event.special.hover ? e : e.replace(K, "mouseenter$1 mouseleave$1") }; v.event = { add: function (e, n, r, i, s) { var o, u, a, f, l, c, h, p, d, m, g; if (e.nodeType === 3 || e.nodeType === 8 || !n || !r || !(o = v._data(e))) return; r.handler && (d = r, r = d.handler, s = d.selector), r.guid || (r.guid = v.guid++), a = o.events, a || (o.events = a = {}), u = o.handle, u || (o.handle = u = function (e) { return typeof v == "undefined" || !!e && v.event.triggered === e.type ? t : v.event.dispatch.apply(u.elem, arguments) }, u.elem = e), n = v.trim(Z(n)).split(" "); for (f = 0; f < n.length; f++) { l = J.exec(n[f]) || [], c = l[1], h = (l[2] || "").split(".").sort(), g = v.event.special[c] || {}, c = (s ? g.delegateType : g.bindType) || c, g = v.event.special[c] || {}, p = v.extend({ type: c, origType: l[1], data: i, handler: r, guid: r.guid, selector: s, needsContext: s && v.expr.match.needsContext.test(s), namespace: h.join(".") }, d), m = a[c]; if (!m) { m = a[c] = [], m.delegateCount = 0; if (!g.setup || g.setup.call(e, i, h, u) === !1) e.addEventListener ? e.addEventListener(c, u, !1) : e.attachEvent && e.attachEvent("on" + c, u) } g.add && (g.add.call(e, p), p.handler.guid || (p.handler.guid = r.guid)), s ? m.splice(m.delegateCount++, 0, p) : m.push(p), v.event.global[c] = !0 } e = null }, global: {}, remove: function (e, t, n, r, i) { var s, o, u, a, f, l, c, h, p, d, m, g = v.hasData(e) && v._data(e); if (!g || !(h = g.events)) return; t = v.trim(Z(t || "")).split(" "); for (s = 0; s < t.length; s++) { o = J.exec(t[s]) || [], u = a = o[1], f = o[2]; if (!u) { for (u in h) v.event.remove(e, u + t[s], n, r, !0); continue } p = v.event.special[u] || {}, u = (r ? p.delegateType : p.bindType) || u, d = h[u] || [], l = d.length, f = f ? new RegExp("(^|\\.)" + f.split(".").sort().join("\\.(?:.*\\.|)") + "(\\.|$)") : null; for (c = 0; c < d.length; c++)m = d[c], (i || a === m.origType) && (!n || n.guid === m.guid) && (!f || f.test(m.namespace)) && (!r || r === m.selector || r === "**" && m.selector) && (d.splice(c--, 1), m.selector && d.delegateCount--, p.remove && p.remove.call(e, m)); d.length === 0 && l !== d.length && ((!p.teardown || p.teardown.call(e, f, g.handle) === !1) && v.removeEvent(e, u, g.handle), delete h[u]) } v.isEmptyObject(h) && (delete g.handle, v.removeData(e, "events", !0)) }, customEvent: { getData: !0, setData: !0, changeData: !0 }, trigger: function (n, r, s, o) { if (!s || s.nodeType !== 3 && s.nodeType !== 8) { var u, a, f, l, c, h, p, d, m, g, y = n.type || n, b = []; if (Y.test(y + v.event.triggered)) return; y.indexOf("!") >= 0 && (y = y.slice(0, -1), a = !0), y.indexOf(".") >= 0 && (b = y.split("."), y = b.shift(), b.sort()); if ((!s || v.event.customEvent[y]) && !v.event.global[y]) return; n = typeof n == "object" ? n[v.expando] ? n : new v.Event(y, n) : new v.Event(y), n.type = y, n.isTrigger = !0, n.exclusive = a, n.namespace = b.join("."), n.namespace_re = n.namespace ? new RegExp("(^|\\.)" + b.join("\\.(?:.*\\.|)") + "(\\.|$)") : null, h = y.indexOf(":") < 0 ? "on" + y : ""; if (!s) { u = v.cache; for (f in u) u[f].events && u[f].events[y] && v.event.trigger(n, r, u[f].handle.elem, !0); return } n.result = t, n.target || (n.target = s), r = r != null ? v.makeArray(r) : [], r.unshift(n), p = v.event.special[y] || {}; if (p.trigger && p.trigger.apply(s, r) === !1) return; m = [[s, p.bindType || y]]; if (!o && !p.noBubble && !v.isWindow(s)) { g = p.delegateType || y, l = Y.test(g + y) ? s : s.parentNode; for (c = s; l; l = l.parentNode)m.push([l, g]), c = l; c === (s.ownerDocument || i) && m.push([c.defaultView || c.parentWindow || e, g]) } for (f = 0; f < m.length && !n.isPropagationStopped(); f++)l = m[f][0], n.type = m[f][1], d = (v._data(l, "events") || {})[n.type] && v._data(l, "handle"), d && d.apply(l, r), d = h && l[h], d && v.acceptData(l) && d.apply && d.apply(l, r) === !1 && n.preventDefault(); return n.type = y, !o && !n.isDefaultPrevented() && (!p._default || p._default.apply(s.ownerDocument, r) === !1) && (y !== "click" || !v.nodeName(s, "a")) && v.acceptData(s) && h && s[y] && (y !== "focus" && y !== "blur" || n.target.offsetWidth !== 0) && !v.isWindow(s) && (c = s[h], c && (s[h] = null), v.event.triggered = y, s[y](), v.event.triggered = t, c && (s[h] = c)), n.result } return }, dispatch: function (n) { n = v.event.fix(n || e.event); var r, i, s, o, u, a, f, c, h, p, d = (v._data(this, "events") || {})[n.type] || [], m = d.delegateCount, g = l.call(arguments), y = !n.exclusive && !n.namespace, b = v.event.special[n.type] || {}, w = []; g[0] = n, n.delegateTarget = this; if (b.preDispatch && b.preDispatch.call(this, n) === !1) return; if (m && (!n.button || n.type !== "click")) for (s = n.target; s != this; s = s.parentNode || this)if (s.disabled !== !0 || n.type !== "click") { u = {}, f = []; for (r = 0; r < m; r++)c = d[r], h = c.selector, u[h] === t && (u[h] = c.needsContext ? v(h, this).index(s) >= 0 : v.find(h, this, null, [s]).length), u[h] && f.push(c); f.length && w.push({ elem: s, matches: f }) } d.length > m && w.push({ elem: this, matches: d.slice(m) }); for (r = 0; r < w.length && !n.isPropagationStopped(); r++) { a = w[r], n.currentTarget = a.elem; for (i = 0; i < a.matches.length && !n.isImmediatePropagationStopped(); i++) { c = a.matches[i]; if (y || !n.namespace && !c.namespace || n.namespace_re && n.namespace_re.test(c.namespace)) n.data = c.data, n.handleObj = c, o = ((v.event.special[c.origType] || {}).handle || c.handler).apply(a.elem, g), o !== t && (n.result = o, o === !1 && (n.preventDefault(), n.stopPropagation())) } } return b.postDispatch && b.postDispatch.call(this, n), n.result }, props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), fixHooks: {}, keyHooks: { props: "char charCode key keyCode".split(" "), filter: function (e, t) { return e.which == null && (e.which = t.charCode != null ? t.charCode : t.keyCode), e } }, mouseHooks: { props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), filter: function (e, n) { var r, s, o, u = n.button, a = n.fromElement; return e.pageX == null && n.clientX != null && (r = e.target.ownerDocument || i, s = r.documentElement, o = r.body, e.pageX = n.clientX + (s && s.scrollLeft || o && o.scrollLeft || 0) - (s && s.clientLeft || o && o.clientLeft || 0), e.pageY = n.clientY + (s && s.scrollTop || o && o.scrollTop || 0) - (s && s.clientTop || o && o.clientTop || 0)), !e.relatedTarget && a && (e.relatedTarget = a === e.target ? n.toElement : a), !e.which && u !== t && (e.which = u & 1 ? 1 : u & 2 ? 3 : u & 4 ? 2 : 0), e } }, fix: function (e) { if (e[v.expando]) return e; var t, n, r = e, s = v.event.fixHooks[e.type] || {}, o = s.props ? this.props.concat(s.props) : this.props; e = v.Event(r); for (t = o.length; t;)n = o[--t], e[n] = r[n]; return e.target || (e.target = r.srcElement || i), e.target.nodeType === 3 && (e.target = e.target.parentNode), e.metaKey = !!e.metaKey, s.filter ? s.filter(e, r) : e }, special: { load: { noBubble: !0 }, focus: { delegateType: "focusin" }, blur: { delegateType: "focusout" }, beforeunload: { setup: function (e, t, n) { v.isWindow(this) && (this.onbeforeunload = n) }, teardown: function (e, t) { this.onbeforeunload === t && (this.onbeforeunload = null) } } }, simulate: function (e, t, n, r) { var i = v.extend(new v.Event, n, { type: e, isSimulated: !0, originalEvent: {} }); r ? v.event.trigger(i, null, t) : v.event.dispatch.call(t, i), i.isDefaultPrevented() && n.preventDefault() } }, v.event.handle = v.event.dispatch, v.removeEvent = i.removeEventListener ? function (e, t, n) { e.removeEventListener && e.removeEventListener(t, n, !1) } : function (e, t, n) { var r = "on" + t; e.detachEvent && (typeof e[r] == "undefined" && (e[r] = null), e.detachEvent(r, n)) }, v.Event = function (e, t) { if (!(this instanceof v.Event)) return new v.Event(e, t); e && e.type ? (this.originalEvent = e, this.type = e.type, this.isDefaultPrevented = e.defaultPrevented || e.returnValue === !1 || e.getPreventDefault && e.getPreventDefault() ? tt : et) : this.type = e, t && v.extend(this, t), this.timeStamp = e && e.timeStamp || v.now(), this[v.expando] = !0 }, v.Event.prototype = { preventDefault: function () { this.isDefaultPrevented = tt; var e = this.originalEvent; if (!e) return; e.preventDefault ? e.preventDefault() : e.returnValue = !1 }, stopPropagation: function () { this.isPropagationStopped = tt; var e = this.originalEvent; if (!e) return; e.stopPropagation && e.stopPropagation(), e.cancelBubble = !0 }, stopImmediatePropagation: function () { this.isImmediatePropagationStopped = tt, this.stopPropagation() }, isDefaultPrevented: et, isPropagationStopped: et, isImmediatePropagationStopped: et }, v.each({ mouseenter: "mouseover", mouseleave: "mouseout" }, function (e, t) { v.event.special[e] = { delegateType: t, bindType: t, handle: function (e) { var n, r = this, i = e.relatedTarget, s = e.handleObj, o = s.selector; if (!i || i !== r && !v.contains(r, i)) e.type = s.origType, n = s.handler.apply(this, arguments), e.type = t; return n } } }), v.support.submitBubbles || (v.event.special.submit = { setup: function () { if (v.nodeName(this, "form")) return !1; v.event.add(this, "click._submit keypress._submit", function (e) { var n = e.target, r = v.nodeName(n, "input") || v.nodeName(n, "button") ? n.form : t; r && !v._data(r, "_submit_attached") && (v.event.add(r, "submit._submit", function (e) { e._submit_bubble = !0 }), v._data(r, "_submit_attached", !0)) }) }, postDispatch: function (e) { e._submit_bubble && (delete e._submit_bubble, this.parentNode && !e.isTrigger && v.event.simulate("submit", this.parentNode, e, !0)) }, teardown: function () { if (v.nodeName(this, "form")) return !1; v.event.remove(this, "._submit") } }), v.support.changeBubbles || (v.event.special.change = { setup: function () { if ($.test(this.nodeName)) { if (this.type === "checkbox" || this.type === "radio") v.event.add(this, "propertychange._change", function (e) { e.originalEvent.propertyName === "checked" && (this._just_changed = !0) }), v.event.add(this, "click._change", function (e) { this._just_changed && !e.isTrigger && (this._just_changed = !1), v.event.simulate("change", this, e, !0) }); return !1 } v.event.add(this, "beforeactivate._change", function (e) { var t = e.target; $.test(t.nodeName) && !v._data(t, "_change_attached") && (v.event.add(t, "change._change", function (e) { this.parentNode && !e.isSimulated && !e.isTrigger && v.event.simulate("change", this.parentNode, e, !0) }), v._data(t, "_change_attached", !0)) }) }, handle: function (e) { var t = e.target; if (this !== t || e.isSimulated || e.isTrigger || t.type !== "radio" && t.type !== "checkbox") return e.handleObj.handler.apply(this, arguments) }, teardown: function () { return v.event.remove(this, "._change"), !$.test(this.nodeName) } }), v.support.focusinBubbles || v.each({ focus: "focusin", blur: "focusout" }, function (e, t) { var n = 0, r = function (e) { v.event.simulate(t, e.target, v.event.fix(e), !0) }; v.event.special[t] = { setup: function () { n++ === 0 && i.addEventListener(e, r, !0) }, teardown: function () { --n === 0 && i.removeEventListener(e, r, !0) } } }), v.fn.extend({ on: function (e, n, r, i, s) { var o, u; if (typeof e == "object") { typeof n != "string" && (r = r || n, n = t); for (u in e) this.on(u, n, r, e[u], s); return this } r == null && i == null ? (i = n, r = n = t) : i == null && (typeof n == "string" ? (i = r, r = t) : (i = r, r = n, n = t)); if (i === !1) i = et; else if (!i) return this; return s === 1 && (o = i, i = function (e) { return v().off(e), o.apply(this, arguments) }, i.guid = o.guid || (o.guid = v.guid++)), this.each(function () { v.event.add(this, e, i, r, n) }) }, one: function (e, t, n, r) { return this.on(e, t, n, r, 1) }, off: function (e, n, r) { var i, s; if (e && e.preventDefault && e.handleObj) return i = e.handleObj, v(e.delegateTarget).off(i.namespace ? i.origType + "." + i.namespace : i.origType, i.selector, i.handler), this; if (typeof e == "object") { for (s in e) this.off(s, n, e[s]); return this } if (n === !1 || typeof n == "function") r = n, n = t; return r === !1 && (r = et), this.each(function () { v.event.remove(this, e, r, n) }) }, bind: function (e, t, n) { return this.on(e, null, t, n) }, unbind: function (e, t) { return this.off(e, null, t) }, live: function (e, t, n) { return v(this.context).on(e, this.selector, t, n), this }, die: function (e, t) { return v(this.context).off(e, this.selector || "**", t), this }, delegate: function (e, t, n, r) { return this.on(t, e, n, r) }, undelegate: function (e, t, n) { return arguments.length === 1 ? this.off(e, "**") : this.off(t, e || "**", n) }, trigger: function (e, t) { return this.each(function () { v.event.trigger(e, t, this) }) }, triggerHandler: function (e, t) { if (this[0]) return v.event.trigger(e, t, this[0], !0) }, toggle: function (e) { var t = arguments, n = e.guid || v.guid++, r = 0, i = function (n) { var i = (v._data(this, "lastToggle" + e.guid) || 0) % r; return v._data(this, "lastToggle" + e.guid, i + 1), n.preventDefault(), t[i].apply(this, arguments) || !1 }; i.guid = n; while (r < t.length) t[r++].guid = n; return this.click(i) }, hover: function (e, t) { return this.mouseenter(e).mouseleave(t || e) } }), v.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "), function (e, t) { v.fn[t] = function (e, n) { return n == null && (n = e, e = null), arguments.length > 0 ? this.on(t, null, e, n) : this.trigger(t) }, Q.test(t) && (v.event.fixHooks[t] = v.event.keyHooks), G.test(t) && (v.event.fixHooks[t] = v.event.mouseHooks) }), function (e, t) { function nt(e, t, n, r) { n = n || [], t = t || g; var i, s, a, f, l = t.nodeType; if (!e || typeof e != "string") return n; if (l !== 1 && l !== 9) return []; a = o(t); if (!a && !r) if (i = R.exec(e)) if (f = i[1]) { if (l === 9) { s = t.getElementById(f); if (!s || !s.parentNode) return n; if (s.id === f) return n.push(s), n } else if (t.ownerDocument && (s = t.ownerDocument.getElementById(f)) && u(t, s) && s.id === f) return n.push(s), n } else { if (i[2]) return S.apply(n, x.call(t.getElementsByTagName(e), 0)), n; if ((f = i[3]) && Z && t.getElementsByClassName) return S.apply(n, x.call(t.getElementsByClassName(f), 0)), n } return vt(e.replace(j, "$1"), t, n, r, a) } function rt(e) { return function (t) { var n = t.nodeName.toLowerCase(); return n === "input" && t.type === e } } function it(e) { return function (t) { var n = t.nodeName.toLowerCase(); return (n === "input" || n === "button") && t.type === e } } function st(e) { return N(function (t) { return t = +t, N(function (n, r) { var i, s = e([], n.length, t), o = s.length; while (o--) n[i = s[o]] && (n[i] = !(r[i] = n[i])) }) }) } function ot(e, t, n) { if (e === t) return n; var r = e.nextSibling; while (r) { if (r === t) return -1; r = r.nextSibling } return 1 } function ut(e, t) { var n, r, s, o, u, a, f, l = L[d][e + " "]; if (l) return t ? 0 : l.slice(0); u = e, a = [], f = i.preFilter; while (u) { if (!n || (r = F.exec(u))) r && (u = u.slice(r[0].length) || u), a.push(s = []); n = !1; if (r = I.exec(u)) s.push(n = new m(r.shift())), u = u.slice(n.length), n.type = r[0].replace(j, " "); for (o in i.filter) (r = J[o].exec(u)) && (!f[o] || (r = f[o](r))) && (s.push(n = new m(r.shift())), u = u.slice(n.length), n.type = o, n.matches = r); if (!n) break } return t ? u.length : u ? nt.error(e) : L(e, a).slice(0) } function at(e, t, r) { var i = t.dir, s = r && t.dir === "parentNode", o = w++; return t.first ? function (t, n, r) { while (t = t[i]) if (s || t.nodeType === 1) return e(t, n, r) } : function (t, r, u) { if (!u) { var a, f = b + " " + o + " ", l = f + n; while (t = t[i]) if (s || t.nodeType === 1) { if ((a = t[d]) === l) return t.sizset; if (typeof a == "string" && a.indexOf(f) === 0) { if (t.sizset) return t } else { t[d] = l; if (e(t, r, u)) return t.sizset = !0, t; t.sizset = !1 } } } else while (t = t[i]) if (s || t.nodeType === 1) if (e(t, r, u)) return t } } function ft(e) { return e.length > 1 ? function (t, n, r) { var i = e.length; while (i--) if (!e[i](t, n, r)) return !1; return !0 } : e[0] } function lt(e, t, n, r, i) { var s, o = [], u = 0, a = e.length, f = t != null; for (; u < a; u++)if (s = e[u]) if (!n || n(s, r, i)) o.push(s), f && t.push(u); return o } function ct(e, t, n, r, i, s) { return r && !r[d] && (r = ct(r)), i && !i[d] && (i = ct(i, s)), N(function (s, o, u, a) { var f, l, c, h = [], p = [], d = o.length, v = s || dt(t || "*", u.nodeType ? [u] : u, []), m = e && (s || !t) ? lt(v, h, e, u, a) : v, g = n ? i || (s ? e : d || r) ? [] : o : m; n && n(m, g, u, a); if (r) { f = lt(g, p), r(f, [], u, a), l = f.length; while (l--) if (c = f[l]) g[p[l]] = !(m[p[l]] = c) } if (s) { if (i || e) { if (i) { f = [], l = g.length; while (l--) (c = g[l]) && f.push(m[l] = c); i(null, g = [], f, a) } l = g.length; while (l--) (c = g[l]) && (f = i ? T.call(s, c) : h[l]) > -1 && (s[f] = !(o[f] = c)) } } else g = lt(g === o ? g.splice(d, g.length) : g), i ? i(null, o, g, a) : S.apply(o, g) }) } function ht(e) { var t, n, r, s = e.length, o = i.relative[e[0].type], u = o || i.relative[" "], a = o ? 1 : 0, f = at(function (e) { return e === t }, u, !0), l = at(function (e) { return T.call(t, e) > -1 }, u, !0), h = [function (e, n, r) { return !o && (r || n !== c) || ((t = n).nodeType ? f(e, n, r) : l(e, n, r)) }]; for (; a < s; a++)if (n = i.relative[e[a].type]) h = [at(ft(h), n)]; else { n = i.filter[e[a].type].apply(null, e[a].matches); if (n[d]) { r = ++a; for (; r < s; r++)if (i.relative[e[r].type]) break; return ct(a > 1 && ft(h), a > 1 && e.slice(0, a - 1).join("").replace(j, "$1"), n, a < r && ht(e.slice(a, r)), r < s && ht(e = e.slice(r)), r < s && e.join("")) } h.push(n) } return ft(h) } function pt(e, t) { var r = t.length > 0, s = e.length > 0, o = function (u, a, f, l, h) { var p, d, v, m = [], y = 0, w = "0", x = u && [], T = h != null, N = c, C = u || s && i.find.TAG("*", h && a.parentNode || a), k = b += N == null ? 1 : Math.E; T && (c = a !== g && a, n = o.el); for (; (p = C[w]) != null; w++) { if (s && p) { for (d = 0; v = e[d]; d++)if (v(p, a, f)) { l.push(p); break } T && (b = k, n = ++o.el) } r && ((p = !v && p) && y--, u && x.push(p)) } y += w; if (r && w !== y) { for (d = 0; v = t[d]; d++)v(x, m, a, f); if (u) { if (y > 0) while (w--) !x[w] && !m[w] && (m[w] = E.call(l)); m = lt(m) } S.apply(l, m), T && !u && m.length > 0 && y + t.length > 1 && nt.uniqueSort(l) } return T && (b = k, c = N), x }; return o.el = 0, r ? N(o) : o } function dt(e, t, n) { var r = 0, i = t.length; for (; r < i; r++)nt(e, t[r], n); return n } function vt(e, t, n, r, s) { var o, u, f, l, c, h = ut(e), p = h.length; if (!r && h.length === 1) { u = h[0] = h[0].slice(0); if (u.length > 2 && (f = u[0]).type === "ID" && t.nodeType === 9 && !s && i.relative[u[1].type]) { t = i.find.ID(f.matches[0].replace($, ""), t, s)[0]; if (!t) return n; e = e.slice(u.shift().length) } for (o = J.POS.test(e) ? -1 : u.length - 1; o >= 0; o--) { f = u[o]; if (i.relative[l = f.type]) break; if (c = i.find[l]) if (r = c(f.matches[0].replace($, ""), z.test(u[0].type) && t.parentNode || t, s)) { u.splice(o, 1), e = r.length && u.join(""); if (!e) return S.apply(n, x.call(r, 0)), n; break } } } return a(e, h)(r, t, s, n, z.test(e)), n } function mt() { } var n, r, i, s, o, u, a, f, l, c, h = !0, p = "undefined", d = ("sizcache" + Math.random()).replace(".", ""), m = String, g = e.document, y = g.documentElement, b = 0, w = 0, E = [].pop, S = [].push, x = [].slice, T = [].indexOf || function (e) { var t = 0, n = this.length; for (; t < n; t++)if (this[t] === e) return t; return -1 }, N = function (e, t) { return e[d] = t == null || t, e }, C = function () { var e = {}, t = []; return N(function (n, r) { return t.push(n) > i.cacheLength && delete e[t.shift()], e[n + " "] = r }, e) }, k = C(), L = C(), A = C(), O = "[\\x20\\t\\r\\n\\f]", M = "(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+", _ = M.replace("w", "w#"), D = "([*^$|!~]?=)", P = "\\[" + O + "*(" + M + ")" + O + "*(?:" + D + O + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + _ + ")|)|)" + O + "*\\]", H = ":(" + M + ")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:" + P + ")|[^:]|\\\\.)*|.*))\\)|)", B = ":(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + O + "*((?:-\\d)?\\d*)" + O + "*\\)|)(?=[^-]|$)", j = new RegExp("^" + O + "+|((?:^|[^\\\\])(?:\\\\.)*)" + O + "+$", "g"), F = new RegExp("^" + O + "*," + O + "*"), I = new RegExp("^" + O + "*([\\x20\\t\\r\\n\\f>+~])" + O + "*"), q = new RegExp(H), R = /^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/, U = /^:not/, z = /[\x20\t\r\n\f]*[+~]/, W = /:not\($/, X = /h\d/i, V = /input|select|textarea|button/i, $ = /\\(?!\\)/g, J = { ID: new RegExp("^#(" + M + ")"), CLASS: new RegExp("^\\.(" + M + ")"), NAME: new RegExp("^\\[name=['\"]?(" + M + ")['\"]?\\]"), TAG: new RegExp("^(" + M.replace("w", "w*") + ")"), ATTR: new RegExp("^" + P), PSEUDO: new RegExp("^" + H), POS: new RegExp(B, "i"), CHILD: new RegExp("^:(only|nth|first|last)-child(?:\\(" + O + "*(even|odd|(([+-]|)(\\d*)n|)" + O + "*(?:([+-]|)" + O + "*(\\d+)|))" + O + "*\\)|)", "i"), needsContext: new RegExp("^" + O + "*[>+~]|" + B, "i") }, K = function (e) { var t = g.createElement("div"); try { return e(t) } catch (n) { return !1 } finally { t = null } }, Q = K(function (e) { return e.appendChild(g.createComment("")), !e.getElementsByTagName("*").length }), G = K(function (e) { return e.innerHTML = "<a href='#'></a>", e.firstChild && typeof e.firstChild.getAttribute !== p && e.firstChild.getAttribute("href") === "#" }), Y = K(function (e) { e.innerHTML = "<select></select>"; var t = typeof e.lastChild.getAttribute("multiple"); return t !== "boolean" && t !== "string" }), Z = K(function (e) { return e.innerHTML = "<div class='hidden e'></div><div class='hidden'></div>", !e.getElementsByClassName || !e.getElementsByClassName("e").length ? !1 : (e.lastChild.className = "e", e.getElementsByClassName("e").length === 2) }), et = K(function (e) { e.id = d + 0, e.innerHTML = "<a name='" + d + "'></a><div name='" + d + "'></div>", y.insertBefore(e, y.firstChild); var t = g.getElementsByName && g.getElementsByName(d).length === 2 + g.getElementsByName(d + 0).length; return r = !g.getElementById(d), y.removeChild(e), t }); try { x.call(y.childNodes, 0)[0].nodeType } catch (tt) { x = function (e) { var t, n = []; for (; t = this[e]; e++)n.push(t); return n } } nt.matches = function (e, t) { return nt(e, null, null, t) }, nt.matchesSelector = function (e, t) { return nt(t, null, null, [e]).length > 0 }, s = nt.getText = function (e) { var t, n = "", r = 0, i = e.nodeType; if (i) { if (i === 1 || i === 9 || i === 11) { if (typeof e.textContent == "string") return e.textContent; for (e = e.firstChild; e; e = e.nextSibling)n += s(e) } else if (i === 3 || i === 4) return e.nodeValue } else for (; t = e[r]; r++)n += s(t); return n }, o = nt.isXML = function (e) { var t = e && (e.ownerDocument || e).documentElement; return t ? t.nodeName !== "HTML" : !1 }, u = nt.contains = y.contains ? function (e, t) { var n = e.nodeType === 9 ? e.documentElement : e, r = t && t.parentNode; return e === r || !!(r && r.nodeType === 1 && n.contains && n.contains(r)) } : y.compareDocumentPosition ? function (e, t) { return t && !!(e.compareDocumentPosition(t) & 16) } : function (e, t) { while (t = t.parentNode) if (t === e) return !0; return !1 }, nt.attr = function (e, t) { var n, r = o(e); return r || (t = t.toLowerCase()), (n = i.attrHandle[t]) ? n(e) : r || Y ? e.getAttribute(t) : (n = e.getAttributeNode(t), n ? typeof e[t] == "boolean" ? e[t] ? t : null : n.specified ? n.value : null : null) }, i = nt.selectors = { cacheLength: 50, createPseudo: N, match: J, attrHandle: G ? {} : { href: function (e) { return e.getAttribute("href", 2) }, type: function (e) { return e.getAttribute("type") } }, find: { ID: r ? function (e, t, n) { if (typeof t.getElementById !== p && !n) { var r = t.getElementById(e); return r && r.parentNode ? [r] : [] } } : function (e, n, r) { if (typeof n.getElementById !== p && !r) { var i = n.getElementById(e); return i ? i.id === e || typeof i.getAttributeNode !== p && i.getAttributeNode("id").value === e ? [i] : t : [] } }, TAG: Q ? function (e, t) { if (typeof t.getElementsByTagName !== p) return t.getElementsByTagName(e) } : function (e, t) { var n = t.getElementsByTagName(e); if (e === "*") { var r, i = [], s = 0; for (; r = n[s]; s++)r.nodeType === 1 && i.push(r); return i } return n }, NAME: et && function (e, t) { if (typeof t.getElementsByName !== p) return t.getElementsByName(name) }, CLASS: Z && function (e, t, n) { if (typeof t.getElementsByClassName !== p && !n) return t.getElementsByClassName(e) } }, relative: { ">": { dir: "parentNode", first: !0 }, " ": { dir: "parentNode" }, "+": { dir: "previousSibling", first: !0 }, "~": { dir: "previousSibling" } }, preFilter: { ATTR: function (e) { return e[1] = e[1].replace($, ""), e[3] = (e[4] || e[5] || "").replace($, ""), e[2] === "~=" && (e[3] = " " + e[3] + " "), e.slice(0, 4) }, CHILD: function (e) { return e[1] = e[1].toLowerCase(), e[1] === "nth" ? (e[2] || nt.error(e[0]), e[3] = +(e[3] ? e[4] + (e[5] || 1) : 2 * (e[2] === "even" || e[2] === "odd")), e[4] = +(e[6] + e[7] || e[2] === "odd")) : e[2] && nt.error(e[0]), e }, PSEUDO: function (e) { var t, n; if (J.CHILD.test(e[0])) return null; if (e[3]) e[2] = e[3]; else if (t = e[4]) q.test(t) && (n = ut(t, !0)) && (n = t.indexOf(")", t.length - n) - t.length) && (t = t.slice(0, n), e[0] = e[0].slice(0, n)), e[2] = t; return e.slice(0, 3) } }, filter: { ID: r ? function (e) { return e = e.replace($, ""), function (t) { return t.getAttribute("id") === e } } : function (e) { return e = e.replace($, ""), function (t) { var n = typeof t.getAttributeNode !== p && t.getAttributeNode("id"); return n && n.value === e } }, TAG: function (e) { return e === "*" ? function () { return !0 } : (e = e.replace($, "").toLowerCase(), function (t) { return t.nodeName && t.nodeName.toLowerCase() === e }) }, CLASS: function (e) { var t = k[d][e + " "]; return t || (t = new RegExp("(^|" + O + ")" + e + "(" + O + "|$)")) && k(e, function (e) { return t.test(e.className || typeof e.getAttribute !== p && e.getAttribute("class") || "") }) }, ATTR: function (e, t, n) { return function (r, i) { var s = nt.attr(r, e); return s == null ? t === "!=" : t ? (s += "", t === "=" ? s === n : t === "!=" ? s !== n : t === "^=" ? n && s.indexOf(n) === 0 : t === "*=" ? n && s.indexOf(n) > -1 : t === "$=" ? n && s.substr(s.length - n.length) === n : t === "~=" ? (" " + s + " ").indexOf(n) > -1 : t === "|=" ? s === n || s.substr(0, n.length + 1) === n + "-" : !1) : !0 } }, CHILD: function (e, t, n, r) { return e === "nth" ? function (e) { var t, i, s = e.parentNode; if (n === 1 && r === 0) return !0; if (s) { i = 0; for (t = s.firstChild; t; t = t.nextSibling)if (t.nodeType === 1) { i++; if (e === t) break } } return i -= r, i === n || i % n === 0 && i / n >= 0 } : function (t) { var n = t; switch (e) { case "only": case "first": while (n = n.previousSibling) if (n.nodeType === 1) return !1; if (e === "first") return !0; n = t; case "last": while (n = n.nextSibling) if (n.nodeType === 1) return !1; return !0 } } }, PSEUDO: function (e, t) { var n, r = i.pseudos[e] || i.setFilters[e.toLowerCase()] || nt.error("unsupported pseudo: " + e); return r[d] ? r(t) : r.length > 1 ? (n = [e, e, "", t], i.setFilters.hasOwnProperty(e.toLowerCase()) ? N(function (e, n) { var i, s = r(e, t), o = s.length; while (o--) i = T.call(e, s[o]), e[i] = !(n[i] = s[o]) }) : function (e) { return r(e, 0, n) }) : r } }, pseudos: { not: N(function (e) { var t = [], n = [], r = a(e.replace(j, "$1")); return r[d] ? N(function (e, t, n, i) { var s, o = r(e, null, i, []), u = e.length; while (u--) if (s = o[u]) e[u] = !(t[u] = s) }) : function (e, i, s) { return t[0] = e, r(t, null, s, n), !n.pop() } }), has: N(function (e) { return function (t) { return nt(e, t).length > 0 } }), contains: N(function (e) { return function (t) { return (t.textContent || t.innerText || s(t)).indexOf(e) > -1 } }), enabled: function (e) { return e.disabled === !1 }, disabled: function (e) { return e.disabled === !0 }, checked: function (e) { var t = e.nodeName.toLowerCase(); return t === "input" && !!e.checked || t === "option" && !!e.selected }, selected: function (e) { return e.parentNode && e.parentNode.selectedIndex, e.selected === !0 }, parent: function (e) { return !i.pseudos.empty(e) }, empty: function (e) { var t; e = e.firstChild; while (e) { if (e.nodeName > "@" || (t = e.nodeType) === 3 || t === 4) return !1; e = e.nextSibling } return !0 }, header: function (e) { return X.test(e.nodeName) }, text: function (e) { var t, n; return e.nodeName.toLowerCase() === "input" && (t = e.type) === "text" && ((n = e.getAttribute("type")) == null || n.toLowerCase() === t) }, radio: rt("radio"), checkbox: rt("checkbox"), file: rt("file"), password: rt("password"), image: rt("image"), submit: it("submit"), reset: it("reset"), button: function (e) { var t = e.nodeName.toLowerCase(); return t === "input" && e.type === "button" || t === "button" }, input: function (e) { return V.test(e.nodeName) }, focus: function (e) { var t = e.ownerDocument; return e === t.activeElement && (!t.hasFocus || t.hasFocus()) && !!(e.type || e.href || ~e.tabIndex) }, active: function (e) { return e === e.ownerDocument.activeElement }, first: st(function () { return [0] }), last: st(function (e, t) { return [t - 1] }), eq: st(function (e, t, n) { return [n < 0 ? n + t : n] }), even: st(function (e, t) { for (var n = 0; n < t; n += 2)e.push(n); return e }), odd: st(function (e, t) { for (var n = 1; n < t; n += 2)e.push(n); return e }), lt: st(function (e, t, n) { for (var r = n < 0 ? n + t : n; --r >= 0;)e.push(r); return e }), gt: st(function (e, t, n) { for (var r = n < 0 ? n + t : n; ++r < t;)e.push(r); return e }) } }, f = y.compareDocumentPosition ? function (e, t) { return e === t ? (l = !0, 0) : (!e.compareDocumentPosition || !t.compareDocumentPosition ? e.compareDocumentPosition : e.compareDocumentPosition(t) & 4) ? -1 : 1 } : function (e, t) { if (e === t) return l = !0, 0; if (e.sourceIndex && t.sourceIndex) return e.sourceIndex - t.sourceIndex; var n, r, i = [], s = [], o = e.parentNode, u = t.parentNode, a = o; if (o === u) return ot(e, t); if (!o) return -1; if (!u) return 1; while (a) i.unshift(a), a = a.parentNode; a = u; while (a) s.unshift(a), a = a.parentNode; n = i.length, r = s.length; for (var f = 0; f < n && f < r; f++)if (i[f] !== s[f]) return ot(i[f], s[f]); return f === n ? ot(e, s[f], -1) : ot(i[f], t, 1) }, [0, 0].sort(f), h = !l, nt.uniqueSort = function (e) { var t, n = [], r = 1, i = 0; l = h, e.sort(f); if (l) { for (; t = e[r]; r++)t === e[r - 1] && (i = n.push(r)); while (i--) e.splice(n[i], 1) } return e }, nt.error = function (e) { throw new Error("Syntax error, unrecognized expression: " + e) }, a = nt.compile = function (e, t) { var n, r = [], i = [], s = A[d][e + " "]; if (!s) { t || (t = ut(e)), n = t.length; while (n--) s = ht(t[n]), s[d] ? r.push(s) : i.push(s); s = A(e, pt(i, r)) } return s }, g.querySelectorAll && function () { var e, t = vt, n = /'|\\/g, r = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g, i = [":focus"], s = [":active"], u = y.matchesSelector || y.mozMatchesSelector || y.webkitMatchesSelector || y.oMatchesSelector || y.msMatchesSelector; K(function (e) { e.innerHTML = "<select><option selected=''></option></select>", e.querySelectorAll("[selected]").length || i.push("\\[" + O + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)"), e.querySelectorAll(":checked").length || i.push(":checked") }), K(function (e) { e.innerHTML = "<p test=''></p>", e.querySelectorAll("[test^='']").length && i.push("[*^$]=" + O + "*(?:\"\"|'')"), e.innerHTML = "<input type='hidden'/>", e.querySelectorAll(":enabled").length || i.push(":enabled", ":disabled") }), i = new RegExp(i.join("|")), vt = function (e, r, s, o, u) { if (!o && !u && !i.test(e)) { var a, f, l = !0, c = d, h = r, p = r.nodeType === 9 && e; if (r.nodeType === 1 && r.nodeName.toLowerCase() !== "object") { a = ut(e), (l = r.getAttribute("id")) ? c = l.replace(n, "\\$&") : r.setAttribute("id", c), c = "[id='" + c + "'] ", f = a.length; while (f--) a[f] = c + a[f].join(""); h = z.test(e) && r.parentNode || r, p = a.join(",") } if (p) try { return S.apply(s, x.call(h.querySelectorAll(p), 0)), s } catch (v) { } finally { l || r.removeAttribute("id") } } return t(e, r, s, o, u) }, u && (K(function (t) { e = u.call(t, "div"); try { u.call(t, "[test!='']:sizzle"), s.push("!=", H) } catch (n) { } }), s = new RegExp(s.join("|")), nt.matchesSelector = function (t, n) { n = n.replace(r, "='$1']"); if (!o(t) && !s.test(n) && !i.test(n)) try { var a = u.call(t, n); if (a || e || t.document && t.document.nodeType !== 11) return a } catch (f) { } return nt(n, null, null, [t]).length > 0 }) }(), i.pseudos.nth = i.pseudos.eq, i.filters = mt.prototype = i.pseudos, i.setFilters = new mt, nt.attr = v.attr, v.find = nt, v.expr = nt.selectors, v.expr[":"] = v.expr.pseudos, v.unique = nt.uniqueSort, v.text = nt.getText, v.isXMLDoc = nt.isXML, v.contains = nt.contains }(e); var nt = /Until$/, rt = /^(?:parents|prev(?:Until|All))/, it = /^.[^:#\[\.,]*$/, st = v.expr.match.needsContext, ot = { children: !0, contents: !0, next: !0, prev: !0 }; v.fn.extend({ find: function (e) { var t, n, r, i, s, o, u = this; if (typeof e != "string") return v(e).filter(function () { for (t = 0, n = u.length; t < n; t++)if (v.contains(u[t], this)) return !0 }); o = this.pushStack("", "find", e); for (t = 0, n = this.length; t < n; t++) { r = o.length, v.find(e, this[t], o); if (t > 0) for (i = r; i < o.length; i++)for (s = 0; s < r; s++)if (o[s] === o[i]) { o.splice(i--, 1); break } } return o }, has: function (e) { var t, n = v(e, this), r = n.length; return this.filter(function () { for (t = 0; t < r; t++)if (v.contains(this, n[t])) return !0 }) }, not: function (e) { return this.pushStack(ft(this, e, !1), "not", e) }, filter: function (e) { return this.pushStack(ft(this, e, !0), "filter", e) }, is: function (e) { return !!e && (typeof e == "string" ? st.test(e) ? v(e, this.context).index(this[0]) >= 0 : v.filter(e, this).length > 0 : this.filter(e).length > 0) }, closest: function (e, t) { var n, r = 0, i = this.length, s = [], o = st.test(e) || typeof e != "string" ? v(e, t || this.context) : 0; for (; r < i; r++) { n = this[r]; while (n && n.ownerDocument && n !== t && n.nodeType !== 11) { if (o ? o.index(n) > -1 : v.find.matchesSelector(n, e)) { s.push(n); break } n = n.parentNode } } return s = s.length > 1 ? v.unique(s) : s, this.pushStack(s, "closest", e) }, index: function (e) { return e ? typeof e == "string" ? v.inArray(this[0], v(e)) : v.inArray(e.jquery ? e[0] : e, this) : this[0] && this[0].parentNode ? this.prevAll().length : -1 }, add: function (e, t) { var n = typeof e == "string" ? v(e, t) : v.makeArray(e && e.nodeType ? [e] : e), r = v.merge(this.get(), n); return this.pushStack(ut(n[0]) || ut(r[0]) ? r : v.unique(r)) }, addBack: function (e) { return this.add(e == null ? this.prevObject : this.prevObject.filter(e)) } }), v.fn.andSelf = v.fn.addBack, v.each({ parent: function (e) { var t = e.parentNode; return t && t.nodeType !== 11 ? t : null }, parents: function (e) { return v.dir(e, "parentNode") }, parentsUntil: function (e, t, n) { return v.dir(e, "parentNode", n) }, next: function (e) { return at(e, "nextSibling") }, prev: function (e) { return at(e, "previousSibling") }, nextAll: function (e) { return v.dir(e, "nextSibling") }, prevAll: function (e) { return v.dir(e, "previousSibling") }, nextUntil: function (e, t, n) { return v.dir(e, "nextSibling", n) }, prevUntil: function (e, t, n) { return v.dir(e, "previousSibling", n) }, siblings: function (e) { return v.sibling((e.parentNode || {}).firstChild, e) }, children: function (e) { return v.sibling(e.firstChild) }, contents: function (e) { return v.nodeName(e, "iframe") ? e.contentDocument || e.contentWindow.document : v.merge([], e.childNodes) } }, function (e, t) { v.fn[e] = function (n, r) { var i = v.map(this, t, n); return nt.test(e) || (r = n), r && typeof r == "string" && (i = v.filter(r, i)), i = this.length > 1 && !ot[e] ? v.unique(i) : i, this.length > 1 && rt.test(e) && (i = i.reverse()), this.pushStack(i, e, l.call(arguments).join(",")) } }), v.extend({ filter: function (e, t, n) { return n && (e = ":not(" + e + ")"), t.length === 1 ? v.find.matchesSelector(t[0], e) ? [t[0]] : [] : v.find.matches(e, t) }, dir: function (e, n, r) { var i = [], s = e[n]; while (s && s.nodeType !== 9 && (r === t || s.nodeType !== 1 || !v(s).is(r))) s.nodeType === 1 && i.push(s), s = s[n]; return i }, sibling: function (e, t) { var n = []; for (; e; e = e.nextSibling)e.nodeType === 1 && e !== t && n.push(e); return n } }); var ct = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video", ht = / jQuery\d+="(?:null|\d+)"/g, pt = /^\s+/, dt = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, vt = /<([\w:]+)/, mt = /<tbody/i, gt = /<|&#?\w+;/, yt = /<(?:script|style|link)/i, bt = /<(?:script|object|embed|option|style)/i, wt = new RegExp("<(?:" + ct + ")[\\s/>]", "i"), Et = /^(?:checkbox|radio)$/, St = /checked\s*(?:[^=]|=\s*.checked.)/i, xt = /\/(java|ecma)script/i, Tt = /^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g, Nt = { option: [1, "<select multiple='multiple'>", "</select>"], legend: [1, "<fieldset>", "</fieldset>"], thead: [1, "<table>", "</table>"], tr: [2, "<table><tbody>", "</tbody></table>"], td: [3, "<table><tbody><tr>", "</tr></tbody></table>"], col: [2, "<table><tbody></tbody><colgroup>", "</colgroup></table>"], area: [1, "<map>", "</map>"], _default: [0, "", ""] }, Ct = lt(i), kt = Ct.appendChild(i.createElement("div")); Nt.optgroup = Nt.option, Nt.tbody = Nt.tfoot = Nt.colgroup = Nt.caption = Nt.thead, Nt.th = Nt.td, v.support.htmlSerialize || (Nt._default = [1, "X<div>", "</div>"]), v.fn.extend({ text: function (e) { return v.access(this, function (e) { return e === t ? v.text(this) : this.empty().append((this[0] && this[0].ownerDocument || i).createTextNode(e)) }, null, e, arguments.length) }, wrapAll: function (e) { if (v.isFunction(e)) return this.each(function (t) { v(this).wrapAll(e.call(this, t)) }); if (this[0]) { var t = v(e, this[0].ownerDocument).eq(0).clone(!0); this[0].parentNode && t.insertBefore(this[0]), t.map(function () { var e = this; while (e.firstChild && e.firstChild.nodeType === 1) e = e.firstChild; return e }).append(this) } return this }, wrapInner: function (e) { return v.isFunction(e) ? this.each(function (t) { v(this).wrapInner(e.call(this, t)) }) : this.each(function () { var t = v(this), n = t.contents(); n.length ? n.wrapAll(e) : t.append(e) }) }, wrap: function (e) { var t = v.isFunction(e); return this.each(function (n) { v(this).wrapAll(t ? e.call(this, n) : e) }) }, unwrap: function () { return this.parent().each(function () { v.nodeName(this, "body") || v(this).replaceWith(this.childNodes) }).end() }, append: function () { return this.domManip(arguments, !0, function (e) { (this.nodeType === 1 || this.nodeType === 11) && this.appendChild(e) }) }, prepend: function () { return this.domManip(arguments, !0, function (e) { (this.nodeType === 1 || this.nodeType === 11) && this.insertBefore(e, this.firstChild) }) }, before: function () { if (!ut(this[0])) return this.domManip(arguments, !1, function (e) { this.parentNode.insertBefore(e, this) }); if (arguments.length) { var e = v.clean(arguments); return this.pushStack(v.merge(e, this), "before", this.selector) } }, after: function () { if (!ut(this[0])) return this.domManip(arguments, !1, function (e) { this.parentNode.insertBefore(e, this.nextSibling) }); if (arguments.length) { var e = v.clean(arguments); return this.pushStack(v.merge(this, e), "after", this.selector) } }, remove: function (e, t) { var n, r = 0; for (; (n = this[r]) != null; r++)if (!e || v.filter(e, [n]).length) !t && n.nodeType === 1 && (v.cleanData(n.getElementsByTagName("*")), v.cleanData([n])), n.parentNode && n.parentNode.removeChild(n); return this }, empty: function () { var e, t = 0; for (; (e = this[t]) != null; t++) { e.nodeType === 1 && v.cleanData(e.getElementsByTagName("*")); while (e.firstChild) e.removeChild(e.firstChild) } return this }, clone: function (e, t) { return e = e == null ? !1 : e, t = t == null ? e : t, this.map(function () { return v.clone(this, e, t) }) }, html: function (e) { return v.access(this, function (e) { var n = this[0] || {}, r = 0, i = this.length; if (e === t) return n.nodeType === 1 ? n.innerHTML.replace(ht, "") : t; if (typeof e == "string" && !yt.test(e) && (v.support.htmlSerialize || !wt.test(e)) && (v.support.leadingWhitespace || !pt.test(e)) && !Nt[(vt.exec(e) || ["", ""])[1].toLowerCase()]) { e = e.replace(dt, "<$1></$2>"); try { for (; r < i; r++)n = this[r] || {}, n.nodeType === 1 && (v.cleanData(n.getElementsByTagName("*")), n.innerHTML = e); n = 0 } catch (s) { } } n && this.empty().append(e) }, null, e, arguments.length) }, replaceWith: function (e) { return ut(this[0]) ? this.length ? this.pushStack(v(v.isFunction(e) ? e() : e), "replaceWith", e) : this : v.isFunction(e) ? this.each(function (t) { var n = v(this), r = n.html(); n.replaceWith(e.call(this, t, r)) }) : (typeof e != "string" && (e = v(e).detach()), this.each(function () { var t = this.nextSibling, n = this.parentNode; v(this).remove(), t ? v(t).before(e) : v(n).append(e) })) }, detach: function (e) { return this.remove(e, !0) }, domManip: function (e, n, r) { e = [].concat.apply([], e); var i, s, o, u, a = 0, f = e[0], l = [], c = this.length; if (!v.support.checkClone && c > 1 && typeof f == "string" && St.test(f)) return this.each(function () { v(this).domManip(e, n, r) }); if (v.isFunction(f)) return this.each(function (i) { var s = v(this); e[0] = f.call(this, i, n ? s.html() : t), s.domManip(e, n, r) }); if (this[0]) { i = v.buildFragment(e, this, l), o = i.fragment, s = o.firstChild, o.childNodes.length === 1 && (o = s); if (s) { n = n && v.nodeName(s, "tr"); for (u = i.cacheable || c - 1; a < c; a++)r.call(n && v.nodeName(this[a], "table") ? Lt(this[a], "tbody") : this[a], a === u ? o : v.clone(o, !0, !0)) } o = s = null, l.length && v.each(l, function (e, t) { t.src ? v.ajax ? v.ajax({ url: t.src, type: "GET", dataType: "script", async: !1, global: !1, "throws": !0 }) : v.error("no ajax") : v.globalEval((t.text || t.textContent || t.innerHTML || "").replace(Tt, "")), t.parentNode && t.parentNode.removeChild(t) }) } return this } }), v.buildFragment = function (e, n, r) { var s, o, u, a = e[0]; return n = n || i, n = !n.nodeType && n[0] || n, n = n.ownerDocument || n, e.length === 1 && typeof a == "string" && a.length < 512 && n === i && a.charAt(0) === "<" && !bt.test(a) && (v.support.checkClone || !St.test(a)) && (v.support.html5Clone || !wt.test(a)) && (o = !0, s = v.fragments[a], u = s !== t), s || (s = n.createDocumentFragment(), v.clean(e, n, s, r), o && (v.fragments[a] = u && s)), { fragment: s, cacheable: o } }, v.fragments = {}, v.each({ appendTo: "append", prependTo: "prepend", insertBefore: "before", insertAfter: "after", replaceAll: "replaceWith" }, function (e, t) { v.fn[e] = function (n) { var r, i = 0, s = [], o = v(n), u = o.length, a = this.length === 1 && this[0].parentNode; if ((a == null || a && a.nodeType === 11 && a.childNodes.length === 1) && u === 1) return o[t](this[0]), this; for (; i < u; i++)r = (i > 0 ? this.clone(!0) : this).get(), v(o[i])[t](r), s = s.concat(r); return this.pushStack(s, e, o.selector) } }), v.extend({ clone: function (e, t, n) { var r, i, s, o; v.support.html5Clone || v.isXMLDoc(e) || !wt.test("<" + e.nodeName + ">") ? o = e.cloneNode(!0) : (kt.innerHTML = e.outerHTML, kt.removeChild(o = kt.firstChild)); if ((!v.support.noCloneEvent || !v.support.noCloneChecked) && (e.nodeType === 1 || e.nodeType === 11) && !v.isXMLDoc(e)) { Ot(e, o), r = Mt(e), i = Mt(o); for (s = 0; r[s]; ++s)i[s] && Ot(r[s], i[s]) } if (t) { At(e, o); if (n) { r = Mt(e), i = Mt(o); for (s = 0; r[s]; ++s)At(r[s], i[s]) } } return r = i = null, o }, clean: function (e, t, n, r) { var s, o, u, a, f, l, c, h, p, d, m, g, y = t === i && Ct, b = []; if (!t || typeof t.createDocumentFragment == "undefined") t = i; for (s = 0; (u = e[s]) != null; s++) { typeof u == "number" && (u += ""); if (!u) continue; if (typeof u == "string") if (!gt.test(u)) u = t.createTextNode(u); else { y = y || lt(t), c = t.createElement("div"), y.appendChild(c), u = u.replace(dt, "<$1></$2>"), a = (vt.exec(u) || ["", ""])[1].toLowerCase(), f = Nt[a] || Nt._default, l = f[0], c.innerHTML = f[1] + u + f[2]; while (l--) c = c.lastChild; if (!v.support.tbody) { h = mt.test(u), p = a === "table" && !h ? c.firstChild && c.firstChild.childNodes : f[1] === "<table>" && !h ? c.childNodes : []; for (o = p.length - 1; o >= 0; --o)v.nodeName(p[o], "tbody") && !p[o].childNodes.length && p[o].parentNode.removeChild(p[o]) } !v.support.leadingWhitespace && pt.test(u) && c.insertBefore(t.createTextNode(pt.exec(u)[0]), c.firstChild), u = c.childNodes, c.parentNode.removeChild(c) } u.nodeType ? b.push(u) : v.merge(b, u) } c && (u = c = y = null); if (!v.support.appendChecked) for (s = 0; (u = b[s]) != null; s++)v.nodeName(u, "input") ? _t(u) : typeof u.getElementsByTagName != "undefined" && v.grep(u.getElementsByTagName("input"), _t); if (n) { m = function (e) { if (!e.type || xt.test(e.type)) return r ? r.push(e.parentNode ? e.parentNode.removeChild(e) : e) : n.appendChild(e) }; for (s = 0; (u = b[s]) != null; s++)if (!v.nodeName(u, "script") || !m(u)) n.appendChild(u), typeof u.getElementsByTagName != "undefined" && (g = v.grep(v.merge([], u.getElementsByTagName("script")), m), b.splice.apply(b, [s + 1, 0].concat(g)), s += g.length) } return b }, cleanData: function (e, t) { var n, r, i, s, o = 0, u = v.expando, a = v.cache, f = v.support.deleteExpando, l = v.event.special; for (; (i = e[o]) != null; o++)if (t || v.acceptData(i)) { r = i[u], n = r && a[r]; if (n) { if (n.events) for (s in n.events) l[s] ? v.event.remove(i, s) : v.removeEvent(i, s, n.handle); a[r] && (delete a[r], f ? delete i[u] : i.removeAttribute ? i.removeAttribute(u) : i[u] = null, v.deletedIds.push(r)) } } } }), function () { var e, t; v.uaMatch = function (e) { e = e.toLowerCase(); var t = /(chrome)[ \/]([\w.]+)/.exec(e) || /(webkit)[ \/]([\w.]+)/.exec(e) || /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e) || /(msie) ([\w.]+)/.exec(e) || e.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e) || []; return { browser: t[1] || "", version: t[2] || "0" } }, e = v.uaMatch(o.userAgent), t = {}, e.browser && (t[e.browser] = !0, t.version = e.version), t.chrome ? t.webkit = !0 : t.webkit && (t.safari = !0), v.browser = t, v.sub = function () { function e(t, n) { return new e.fn.init(t, n) } v.extend(!0, e, this), e.superclass = this, e.fn = e.prototype = this(), e.fn.constructor = e, e.sub = this.sub, e.fn.init = function (r, i) { return i && i instanceof v && !(i instanceof e) && (i = e(i)), v.fn.init.call(this, r, i, t) }, e.fn.init.prototype = e.fn; var t = e(i); return e } }(); var Dt, Pt, Ht, Bt = /alpha\([^)]*\)/i, jt = /opacity=([^)]*)/, Ft = /^(top|right|bottom|left)$/, It = /^(none|table(?!-c[ea]).+)/, qt = /^margin/, Rt = new RegExp("^(" + m + ")(.*)$", "i"), Ut = new RegExp("^(" + m + ")(?!px)[a-z%]+$", "i"), zt = new RegExp("^([-+])=(" + m + ")", "i"), Wt = { BODY: "block" }, Xt = { position: "absolute", visibility: "hidden", display: "block" }, Vt = { letterSpacing: 0, fontWeight: 400 }, $t = ["Top", "Right", "Bottom", "Left"], Jt = ["Webkit", "O", "Moz", "ms"], Kt = v.fn.toggle; v.fn.extend({ css: function (e, n) { return v.access(this, function (e, n, r) { return r !== t ? v.style(e, n, r) : v.css(e, n) }, e, n, arguments.length > 1) }, show: function () { return Yt(this, !0) }, hide: function () { return Yt(this) }, toggle: function (e, t) { var n = typeof e == "boolean"; return v.isFunction(e) && v.isFunction(t) ? Kt.apply(this, arguments) : this.each(function () { (n ? e : Gt(this)) ? v(this).show() : v(this).hide() }) } }), v.extend({ cssHooks: { opacity: { get: function (e, t) { if (t) { var n = Dt(e, "opacity"); return n === "" ? "1" : n } } } }, cssNumber: { fillOpacity: !0, fontWeight: !0, lineHeight: !0, opacity: !0, orphans: !0, widows: !0, zIndex: !0, zoom: !0 }, cssProps: { "float": v.support.cssFloat ? "cssFloat" : "styleFloat" }, style: function (e, n, r, i) { if (!e || e.nodeType === 3 || e.nodeType === 8 || !e.style) return; var s, o, u, a = v.camelCase(n), f = e.style; n = v.cssProps[a] || (v.cssProps[a] = Qt(f, a)), u = v.cssHooks[n] || v.cssHooks[a]; if (r === t) return u && "get" in u && (s = u.get(e, !1, i)) !== t ? s : f[n]; o = typeof r, o === "string" && (s = zt.exec(r)) && (r = (s[1] + 1) * s[2] + parseFloat(v.css(e, n)), o = "number"); if (r == null || o === "number" && isNaN(r)) return; o === "number" && !v.cssNumber[a] && (r += "px"); if (!u || !("set" in u) || (r = u.set(e, r, i)) !== t) try { f[n] = r } catch (l) { } }, css: function (e, n, r, i) { var s, o, u, a = v.camelCase(n); return n = v.cssProps[a] || (v.cssProps[a] = Qt(e.style, a)), u = v.cssHooks[n] || v.cssHooks[a], u && "get" in u && (s = u.get(e, !0, i)), s === t && (s = Dt(e, n)), s === "normal" && n in Vt && (s = Vt[n]), r || i !== t ? (o = parseFloat(s), r || v.isNumeric(o) ? o || 0 : s) : s }, swap: function (e, t, n) { var r, i, s = {}; for (i in t) s[i] = e.style[i], e.style[i] = t[i]; r = n.call(e); for (i in t) e.style[i] = s[i]; return r } }), e.getComputedStyle ? Dt = function (t, n) { var r, i, s, o, u = e.getComputedStyle(t, null), a = t.style; return u && (r = u.getPropertyValue(n) || u[n], r === "" && !v.contains(t.ownerDocument, t) && (r = v.style(t, n)), Ut.test(r) && qt.test(n) && (i = a.width, s = a.minWidth, o = a.maxWidth, a.minWidth = a.maxWidth = a.width = r, r = u.width, a.width = i, a.minWidth = s, a.maxWidth = o)), r } : i.documentElement.currentStyle && (Dt = function (e, t) { var n, r, i = e.currentStyle && e.currentStyle[t], s = e.style; return i == null && s && s[t] && (i = s[t]), Ut.test(i) && !Ft.test(t) && (n = s.left, r = e.runtimeStyle && e.runtimeStyle.left, r && (e.runtimeStyle.left = e.currentStyle.left), s.left = t === "fontSize" ? "1em" : i, i = s.pixelLeft + "px", s.left = n, r && (e.runtimeStyle.left = r)), i === "" ? "auto" : i }), v.each(["height", "width"], function (e, t) { v.cssHooks[t] = { get: function (e, n, r) { if (n) return e.offsetWidth === 0 && It.test(Dt(e, "display")) ? v.swap(e, Xt, function () { return tn(e, t, r) }) : tn(e, t, r) }, set: function (e, n, r) { return Zt(e, n, r ? en(e, t, r, v.support.boxSizing && v.css(e, "boxSizing") === "border-box") : 0) } } }), v.support.opacity || (v.cssHooks.opacity = { get: function (e, t) { return jt.test((t && e.currentStyle ? e.currentStyle.filter : e.style.filter) || "") ? .01 * parseFloat(RegExp.$1) + "" : t ? "1" : "" }, set: function (e, t) { var n = e.style, r = e.currentStyle, i = v.isNumeric(t) ? "alpha(opacity=" + t * 100 + ")" : "", s = r && r.filter || n.filter || ""; n.zoom = 1; if (t >= 1 && v.trim(s.replace(Bt, "")) === "" && n.removeAttribute) { n.removeAttribute("filter"); if (r && !r.filter) return } n.filter = Bt.test(s) ? s.replace(Bt, i) : s + " " + i } }), v(function () { v.support.reliableMarginRight || (v.cssHooks.marginRight = { get: function (e, t) { return v.swap(e, { display: "inline-block" }, function () { if (t) return Dt(e, "marginRight") }) } }), !v.support.pixelPosition && v.fn.position && v.each(["top", "left"], function (e, t) { v.cssHooks[t] = { get: function (e, n) { if (n) { var r = Dt(e, t); return Ut.test(r) ? v(e).position()[t] + "px" : r } } } }) }), v.expr && v.expr.filters && (v.expr.filters.hidden = function (e) { return e.offsetWidth === 0 && e.offsetHeight === 0 || !v.support.reliableHiddenOffsets && (e.style && e.style.display || Dt(e, "display")) === "none" }, v.expr.filters.visible = function (e) { return !v.expr.filters.hidden(e) }), v.each({ margin: "", padding: "", border: "Width" }, function (e, t) { v.cssHooks[e + t] = { expand: function (n) { var r, i = typeof n == "string" ? n.split(" ") : [n], s = {}; for (r = 0; r < 4; r++)s[e + $t[r] + t] = i[r] || i[r - 2] || i[0]; return s } }, qt.test(e) || (v.cssHooks[e + t].set = Zt) }); var rn = /%20/g, sn = /\[\]$/, on = /\r?\n/g, un = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i, an = /^(?:select|textarea)/i; v.fn.extend({ serialize: function () { return v.param(this.serializeArray()) }, serializeArray: function () { return this.map(function () { return this.elements ? v.makeArray(this.elements) : this }).filter(function () { return this.name && !this.disabled && (this.checked || an.test(this.nodeName) || un.test(this.type)) }).map(function (e, t) { var n = v(this).val(); return n == null ? null : v.isArray(n) ? v.map(n, function (e, n) { return { name: t.name, value: e.replace(on, "\r\n") } }) : { name: t.name, value: n.replace(on, "\r\n") } }).get() } }), v.param = function (e, n) { var r, i = [], s = function (e, t) { t = v.isFunction(t) ? t() : t == null ? "" : t, i[i.length] = encodeURIComponent(e) + "=" + encodeURIComponent(t) }; n === t && (n = v.ajaxSettings && v.ajaxSettings.traditional); if (v.isArray(e) || e.jquery && !v.isPlainObject(e)) v.each(e, function () { s(this.name, this.value) }); else for (r in e) fn(r, e[r], n, s); return i.join("&").replace(rn, "+") }; var ln, cn, hn = /#.*$/, pn = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, dn = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/, vn = /^(?:GET|HEAD)$/, mn = /^\/\//, gn = /\?/, yn = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, bn = /([?&])_=[^&]*/, wn = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/, En = v.fn.load, Sn = {}, xn = {}, Tn = ["*/"] + ["*"]; try { cn = s.href } catch (Nn) { cn = i.createElement("a"), cn.href = "", cn = cn.href } ln = wn.exec(cn.toLowerCase()) || [], v.fn.load = function (e, n, r) { if (typeof e != "string" && En) return En.apply(this, arguments); if (!this.length) return this; var i, s, o, u = this, a = e.indexOf(" "); return a >= 0 && (i = e.slice(a, e.length), e = e.slice(0, a)), v.isFunction(n) ? (r = n, n = t) : n && typeof n == "object" && (s = "POST"), v.ajax({ url: e, type: s, dataType: "html", data: n, complete: function (e, t) { r && u.each(r, o || [e.responseText, t, e]) } }).done(function (e) { o = arguments, u.html(i ? v("<div>").append(e.replace(yn, "")).find(i) : e) }), this }, v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function (e, t) { v.fn[t] = function (e) { return this.on(t, e) } }), v.each(["get", "post"], function (e, n) { v[n] = function (e, r, i, s) { return v.isFunction(r) && (s = s || i, i = r, r = t), v.ajax({ type: n, url: e, data: r, success: i, dataType: s }) } }), v.extend({ getScript: function (e, n) { return v.get(e, t, n, "script") }, getJSON: function (e, t, n) { return v.get(e, t, n, "json") }, ajaxSetup: function (e, t) { return t ? Ln(e, v.ajaxSettings) : (t = e, e = v.ajaxSettings), Ln(e, t), e }, ajaxSettings: { url: cn, isLocal: dn.test(ln[1]), global: !0, type: "GET", contentType: "application/x-www-form-urlencoded; charset=UTF-8", processData: !0, async: !0, accepts: { xml: "application/xml, text/xml", html: "text/html", text: "text/plain", json: "application/json, text/javascript", "*": Tn }, contents: { xml: /xml/, html: /html/, json: /json/ }, responseFields: { xml: "responseXML", text: "responseText" }, converters: { "* text": e.String, "text html": !0, "text json": v.parseJSON, "text xml": v.parseXML }, flatOptions: { context: !0, url: !0 } }, ajaxPrefilter: Cn(Sn), ajaxTransport: Cn(xn), ajax: function (e, n) { function T(e, n, s, a) { var l, y, b, w, S, T = n; if (E === 2) return; E = 2, u && clearTimeout(u), o = t, i = a || "", x.readyState = e > 0 ? 4 : 0, s && (w = An(c, x, s)); if (e >= 200 && e < 300 || e === 304) c.ifModified && (S = x.getResponseHeader("Last-Modified"), S && (v.lastModified[r] = S), S = x.getResponseHeader("Etag"), S && (v.etag[r] = S)), e === 304 ? (T = "notmodified", l = !0) : (l = On(c, w), T = l.state, y = l.data, b = l.error, l = !b); else { b = T; if (!T || e) T = "error", e < 0 && (e = 0) } x.status = e, x.statusText = (n || T) + "", l ? d.resolveWith(h, [y, T, x]) : d.rejectWith(h, [x, T, b]), x.statusCode(g), g = t, f && p.trigger("ajax" + (l ? "Success" : "Error"), [x, c, l ? y : b]), m.fireWith(h, [x, T]), f && (p.trigger("ajaxComplete", [x, c]), --v.active || v.event.trigger("ajaxStop")) } typeof e == "object" && (n = e, e = t), n = n || {}; var r, i, s, o, u, a, f, l, c = v.ajaxSetup({}, n), h = c.context || c, p = h !== c && (h.nodeType || h instanceof v) ? v(h) : v.event, d = v.Deferred(), m = v.Callbacks("once memory"), g = c.statusCode || {}, b = {}, w = {}, E = 0, S = "canceled", x = { readyState: 0, setRequestHeader: function (e, t) { if (!E) { var n = e.toLowerCase(); e = w[n] = w[n] || e, b[e] = t } return this }, getAllResponseHeaders: function () { return E === 2 ? i : null }, getResponseHeader: function (e) { var n; if (E === 2) { if (!s) { s = {}; while (n = pn.exec(i)) s[n[1].toLowerCase()] = n[2] } n = s[e.toLowerCase()] } return n === t ? null : n }, overrideMimeType: function (e) { return E || (c.mimeType = e), this }, abort: function (e) { return e = e || S, o && o.abort(e), T(0, e), this } }; d.promise(x), x.success = x.done, x.error = x.fail, x.complete = m.add, x.statusCode = function (e) { if (e) { var t; if (E < 2) for (t in e) g[t] = [g[t], e[t]]; else t = e[x.status], x.always(t) } return this }, c.url = ((e || c.url) + "").replace(hn, "").replace(mn, ln[1] + "//"), c.dataTypes = v.trim(c.dataType || "*").toLowerCase().split(y), c.crossDomain == null && (a = wn.exec(c.url.toLowerCase()), c.crossDomain = !(!a || a[1] === ln[1] && a[2] === ln[2] && (a[3] || (a[1] === "http:" ? 80 : 443)) == (ln[3] || (ln[1] === "http:" ? 80 : 443)))), c.data && c.processData && typeof c.data != "string" && (c.data = v.param(c.data, c.traditional)), kn(Sn, c, n, x); if (E === 2) return x; f = c.global, c.type = c.type.toUpperCase(), c.hasContent = !vn.test(c.type), f && v.active++ === 0 && v.event.trigger("ajaxStart"); if (!c.hasContent) { c.data && (c.url += (gn.test(c.url) ? "&" : "?") + c.data, delete c.data), r = c.url; if (c.cache === !1) { var N = v.now(), C = c.url.replace(bn, "$1_=" + N); c.url = C + (C === c.url ? (gn.test(c.url) ? "&" : "?") + "_=" + N : "") } } (c.data && c.hasContent && c.contentType !== !1 || n.contentType) && x.setRequestHeader("Content-Type", c.contentType), c.ifModified && (r = r || c.url, v.lastModified[r] && x.setRequestHeader("If-Modified-Since", v.lastModified[r]), v.etag[r] && x.setRequestHeader("If-None-Match", v.etag[r])), x.setRequestHeader("Accept", c.dataTypes[0] && c.accepts[c.dataTypes[0]] ? c.accepts[c.dataTypes[0]] + (c.dataTypes[0] !== "*" ? ", " + Tn + "; q=0.01" : "") : c.accepts["*"]); for (l in c.headers) x.setRequestHeader(l, c.headers[l]); if (!c.beforeSend || c.beforeSend.call(h, x, c) !== !1 && E !== 2) { S = "abort"; for (l in { success: 1, error: 1, complete: 1 }) x[l](c[l]); o = kn(xn, c, n, x); if (!o) T(-1, "No Transport"); else { x.readyState = 1, f && p.trigger("ajaxSend", [x, c]), c.async && c.timeout > 0 && (u = setTimeout(function () { x.abort("timeout") }, c.timeout)); try { E = 1, o.send(b, T) } catch (k) { if (!(E < 2)) throw k; T(-1, k) } } return x } return x.abort() }, active: 0, lastModified: {}, etag: {} }); var Mn = [], _n = /\?/, Dn = /(=)\?(?=&|$)|\?\?/, Pn = v.now(); v.ajaxSetup({ jsonp: "callback", jsonpCallback: function () { var e = Mn.pop() || v.expando + "_" + Pn++; return this[e] = !0, e } }), v.ajaxPrefilter("json jsonp", function (n, r, i) { var s, o, u, a = n.data, f = n.url, l = n.jsonp !== !1, c = l && Dn.test(f), h = l && !c && typeof a == "string" && !(n.contentType || "").indexOf("application/x-www-form-urlencoded") && Dn.test(a); if (n.dataTypes[0] === "jsonp" || c || h) return s = n.jsonpCallback = v.isFunction(n.jsonpCallback) ? n.jsonpCallback() : n.jsonpCallback, o = e[s], c ? n.url = f.replace(Dn, "$1" + s) : h ? n.data = a.replace(Dn, "$1" + s) : l && (n.url += (_n.test(f) ? "&" : "?") + n.jsonp + "=" + s), n.converters["script json"] = function () { return u || v.error(s + " was not called"), u[0] }, n.dataTypes[0] = "json", e[s] = function () { u = arguments }, i.always(function () { e[s] = o, n[s] && (n.jsonpCallback = r.jsonpCallback, Mn.push(s)), u && v.isFunction(o) && o(u[0]), u = o = t }), "script" }), v.ajaxSetup({ accepts: { script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript" }, contents: { script: /javascript|ecmascript/ }, converters: { "text script": function (e) { return v.globalEval(e), e } } }), v.ajaxPrefilter("script", function (e) { e.cache === t && (e.cache = !1), e.crossDomain && (e.type = "GET", e.global = !1) }), v.ajaxTransport("script", function (e) { if (e.crossDomain) { var n, r = i.head || i.getElementsByTagName("head")[0] || i.documentElement; return { send: function (s, o) { n = i.createElement("script"), n.async = "async", e.scriptCharset && (n.charset = e.scriptCharset), n.src = e.url, n.onload = n.onreadystatechange = function (e, i) { if (i || !n.readyState || /loaded|complete/.test(n.readyState)) n.onload = n.onreadystatechange = null, r && n.parentNode && r.removeChild(n), n = t, i || o(200, "success") }, r.insertBefore(n, r.firstChild) }, abort: function () { n && n.onload(0, 1) } } } }); var Hn, Bn = e.ActiveXObject ? function () { for (var e in Hn) Hn[e](0, 1) } : !1, jn = 0; v.ajaxSettings.xhr = e.ActiveXObject ? function () { return !this.isLocal && Fn() || In() } : Fn, function (e) { v.extend(v.support, { ajax: !!e, cors: !!e && "withCredentials" in e }) }(v.ajaxSettings.xhr()), v.support.ajax && v.ajaxTransport(function (n) { if (!n.crossDomain || v.support.cors) { var r; return { send: function (i, s) { var o, u, a = n.xhr(); n.username ? a.open(n.type, n.url, n.async, n.username, n.password) : a.open(n.type, n.url, n.async); if (n.xhrFields) for (u in n.xhrFields) a[u] = n.xhrFields[u]; n.mimeType && a.overrideMimeType && a.overrideMimeType(n.mimeType), !n.crossDomain && !i["X-Requested-With"] && (i["X-Requested-With"] = "XMLHttpRequest"); try { for (u in i) a.setRequestHeader(u, i[u]) } catch (f) { } a.send(n.hasContent && n.data || null), r = function (e, i) { var u, f, l, c, h; try { if (r && (i || a.readyState === 4)) { r = t, o && (a.onreadystatechange = v.noop, Bn && delete Hn[o]); if (i) a.readyState !== 4 && a.abort(); else { u = a.status, l = a.getAllResponseHeaders(), c = {}, h = a.responseXML, h && h.documentElement && (c.xml = h); try { c.text = a.responseText } catch (p) { } try { f = a.statusText } catch (p) { f = "" } !u && n.isLocal && !n.crossDomain ? u = c.text ? 200 : 404 : u === 1223 && (u = 204) } } } catch (d) { i || s(-1, d) } c && s(u, f, c, l) }, n.async ? a.readyState === 4 ? setTimeout(r, 0) : (o = ++jn, Bn && (Hn || (Hn = {}, v(e).unload(Bn)), Hn[o] = r), a.onreadystatechange = r) : r() }, abort: function () { r && r(0, 1) } } } }); var qn, Rn, Un = /^(?:toggle|show|hide)$/, zn = new RegExp("^(?:([-+])=|)(" + m + ")([a-z%]*)$", "i"), Wn = /queueHooks$/, Xn = [Gn], Vn = { "*": [function (e, t) { var n, r, i = this.createTween(e, t), s = zn.exec(t), o = i.cur(), u = +o || 0, a = 1, f = 20; if (s) { n = +s[2], r = s[3] || (v.cssNumber[e] ? "" : "px"); if (r !== "px" && u) { u = v.css(i.elem, e, !0) || n || 1; do a = a || ".5", u /= a, v.style(i.elem, e, u + r); while (a !== (a = i.cur() / o) && a !== 1 && --f) } i.unit = r, i.start = u, i.end = s[1] ? u + (s[1] + 1) * n : n } return i }] }; v.Animation = v.extend(Kn, { tweener: function (e, t) { v.isFunction(e) ? (t = e, e = ["*"]) : e = e.split(" "); var n, r = 0, i = e.length; for (; r < i; r++)n = e[r], Vn[n] = Vn[n] || [], Vn[n].unshift(t) }, prefilter: function (e, t) { t ? Xn.unshift(e) : Xn.push(e) } }), v.Tween = Yn, Yn.prototype = { constructor: Yn, init: function (e, t, n, r, i, s) { this.elem = e, this.prop = n, this.easing = i || "swing", this.options = t, this.start = this.now = this.cur(), this.end = r, this.unit = s || (v.cssNumber[n] ? "" : "px") }, cur: function () { var e = Yn.propHooks[this.prop]; return e && e.get ? e.get(this) : Yn.propHooks._default.get(this) }, run: function (e) { var t, n = Yn.propHooks[this.prop]; return this.options.duration ? this.pos = t = v.easing[this.easing](e, this.options.duration * e, 0, 1, this.options.duration) : this.pos = t = e, this.now = (this.end - this.start) * t + this.start, this.options.step && this.options.step.call(this.elem, this.now, this), n && n.set ? n.set(this) : Yn.propHooks._default.set(this), this } }, Yn.prototype.init.prototype = Yn.prototype, Yn.propHooks = { _default: { get: function (e) { var t; return e.elem[e.prop] == null || !!e.elem.style && e.elem.style[e.prop] != null ? (t = v.css(e.elem, e.prop, !1, ""), !t || t === "auto" ? 0 : t) : e.elem[e.prop] }, set: function (e) { v.fx.step[e.prop] ? v.fx.step[e.prop](e) : e.elem.style && (e.elem.style[v.cssProps[e.prop]] != null || v.cssHooks[e.prop]) ? v.style(e.elem, e.prop, e.now + e.unit) : e.elem[e.prop] = e.now } } }, Yn.propHooks.scrollTop = Yn.propHooks.scrollLeft = { set: function (e) { e.elem.nodeType && e.elem.parentNode && (e.elem[e.prop] = e.now) } }, v.each(["toggle", "show", "hide"], function (e, t) { var n = v.fn[t]; v.fn[t] = function (r, i, s) { return r == null || typeof r == "boolean" || !e && v.isFunction(r) && v.isFunction(i) ? n.apply(this, arguments) : this.animate(Zn(t, !0), r, i, s) } }), v.fn.extend({ fadeTo: function (e, t, n, r) { return this.filter(Gt).css("opacity", 0).show().end().animate({ opacity: t }, e, n, r) }, animate: function (e, t, n, r) { var i = v.isEmptyObject(e), s = v.speed(t, n, r), o = function () { var t = Kn(this, v.extend({}, e), s); i && t.stop(!0) }; return i || s.queue === !1 ? this.each(o) : this.queue(s.queue, o) }, stop: function (e, n, r) { var i = function (e) { var t = e.stop; delete e.stop, t(r) }; return typeof e != "string" && (r = n, n = e, e = t), n && e !== !1 && this.queue(e || "fx", []), this.each(function () { var t = !0, n = e != null && e + "queueHooks", s = v.timers, o = v._data(this); if (n) o[n] && o[n].stop && i(o[n]); else for (n in o) o[n] && o[n].stop && Wn.test(n) && i(o[n]); for (n = s.length; n--;)s[n].elem === this && (e == null || s[n].queue === e) && (s[n].anim.stop(r), t = !1, s.splice(n, 1)); (t || !r) && v.dequeue(this, e) }) } }), v.each({ slideDown: Zn("show"), slideUp: Zn("hide"), slideToggle: Zn("toggle"), fadeIn: { opacity: "show" }, fadeOut: { opacity: "hide" }, fadeToggle: { opacity: "toggle" } }, function (e, t) { v.fn[e] = function (e, n, r) { return this.animate(t, e, n, r) } }), v.speed = function (e, t, n) { var r = e && typeof e == "object" ? v.extend({}, e) : { complete: n || !n && t || v.isFunction(e) && e, duration: e, easing: n && t || t && !v.isFunction(t) && t }; r.duration = v.fx.off ? 0 : typeof r.duration == "number" ? r.duration : r.duration in v.fx.speeds ? v.fx.speeds[r.duration] : v.fx.speeds._default; if (r.queue == null || r.queue === !0) r.queue = "fx"; return r.old = r.complete, r.complete = function () { v.isFunction(r.old) && r.old.call(this), r.queue && v.dequeue(this, r.queue) }, r }, v.easing = { linear: function (e) { return e }, swing: function (e) { return .5 - Math.cos(e * Math.PI) / 2 } }, v.timers = [], v.fx = Yn.prototype.init, v.fx.tick = function () { var e, n = v.timers, r = 0; qn = v.now(); for (; r < n.length; r++)e = n[r], !e() && n[r] === e && n.splice(r--, 1); n.length || v.fx.stop(), qn = t }, v.fx.timer = function (e) { e() && v.timers.push(e) && !Rn && (Rn = setInterval(v.fx.tick, v.fx.interval)) }, v.fx.interval = 13, v.fx.stop = function () { clearInterval(Rn), Rn = null }, v.fx.speeds = { slow: 600, fast: 200, _default: 400 }, v.fx.step = {}, v.expr && v.expr.filters && (v.expr.filters.animated = function (e) { return v.grep(v.timers, function (t) { return e === t.elem }).length }); var er = /^(?:body|html)$/i; v.fn.offset = function (e) { if (arguments.length) return e === t ? this : this.each(function (t) { v.offset.setOffset(this, e, t) }); var n, r, i, s, o, u, a, f = { top: 0, left: 0 }, l = this[0], c = l && l.ownerDocument; if (!c) return; return (r = c.body) === l ? v.offset.bodyOffset(l) : (n = c.documentElement, v.contains(n, l) ? (typeof l.getBoundingClientRect != "undefined" && (f = l.getBoundingClientRect()), i = tr(c), s = n.clientTop || r.clientTop || 0, o = n.clientLeft || r.clientLeft || 0, u = i.pageYOffset || n.scrollTop, a = i.pageXOffset || n.scrollLeft, { top: f.top + u - s, left: f.left + a - o }) : f) }, v.offset = { bodyOffset: function (e) { var t = e.offsetTop, n = e.offsetLeft; return v.support.doesNotIncludeMarginInBodyOffset && (t += parseFloat(v.css(e, "marginTop")) || 0, n += parseFloat(v.css(e, "marginLeft")) || 0), { top: t, left: n } }, setOffset: function (e, t, n) { var r = v.css(e, "position"); r === "static" && (e.style.position = "relative"); var i = v(e), s = i.offset(), o = v.css(e, "top"), u = v.css(e, "left"), a = (r === "absolute" || r === "fixed") && v.inArray("auto", [o, u]) > -1, f = {}, l = {}, c, h; a ? (l = i.position(), c = l.top, h = l.left) : (c = parseFloat(o) || 0, h = parseFloat(u) || 0), v.isFunction(t) && (t = t.call(e, n, s)), t.top != null && (f.top = t.top - s.top + c), t.left != null && (f.left = t.left - s.left + h), "using" in t ? t.using.call(e, f) : i.css(f) } }, v.fn.extend({ position: function () { if (!this[0]) return; var e = this[0], t = this.offsetParent(), n = this.offset(), r = er.test(t[0].nodeName) ? { top: 0, left: 0 } : t.offset(); return n.top -= parseFloat(v.css(e, "marginTop")) || 0, n.left -= parseFloat(v.css(e, "marginLeft")) || 0, r.top += parseFloat(v.css(t[0], "borderTopWidth")) || 0, r.left += parseFloat(v.css(t[0], "borderLeftWidth")) || 0, { top: n.top - r.top, left: n.left - r.left } }, offsetParent: function () { return this.map(function () { var e = this.offsetParent || i.body; while (e && !er.test(e.nodeName) && v.css(e, "position") === "static") e = e.offsetParent; return e || i.body }) } }), v.each({ scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function (e, n) { var r = /Y/.test(n); v.fn[e] = function (i) { return v.access(this, function (e, i, s) { var o = tr(e); if (s === t) return o ? n in o ? o[n] : o.document.documentElement[i] : e[i]; o ? o.scrollTo(r ? v(o).scrollLeft() : s, r ? s : v(o).scrollTop()) : e[i] = s }, e, i, arguments.length, null) } }), v.each({ Height: "height", Width: "width" }, function (e, n) { v.each({ padding: "inner" + e, content: n, "": "outer" + e }, function (r, i) { v.fn[i] = function (i, s) { var o = arguments.length && (r || typeof i != "boolean"), u = r || (i === !0 || s === !0 ? "margin" : "border"); return v.access(this, function (n, r, i) { var s; return v.isWindow(n) ? n.document.documentElement["client" + e] : n.nodeType === 9 ? (s = n.documentElement, Math.max(n.body["scroll" + e], s["scroll" + e], n.body["offset" + e], s["offset" + e], s["client" + e])) : i === t ? v.css(n, r, i, u) : v.style(n, r, i, u) }, n, o ? i : t, o, null) } }) }), e.jQuery = e.$ = v, typeof define == "function" && define.amd && define.amd.jQuery && define("jquery", [], function () { return v }) })(window);/*  |xGv00|7bc34cbc4ef65454c6e072f374506f55 */
 //     Underscore.js 1.8.2
 //     http://underscorejs.org
 //     (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
 //     Underscore may be freely distributed under the MIT license.
-(function(){function n(n){function t(t,r,e,u,i,o){for(;i>=0&&o>i;i+=n){var a=u?u[i]:i;e=r(e,t[a],a,t)}return e}return function(r,e,u,i){e=d(e,i,4);var o=!w(r)&&m.keys(r),a=(o||r).length,c=n>0?0:a-1;return arguments.length<3&&(u=r[o?o[c]:c],c+=n),t(r,e,u,o,c,a)}}function t(n){return function(t,r,e){r=b(r,e);for(var u=null!=t&&t.length,i=n>0?0:u-1;i>=0&&u>i;i+=n)if(r(t[i],i,t))return i;return-1}}function r(n,t){var r=S.length,e=n.constructor,u=m.isFunction(e)&&e.prototype||o,i="constructor";for(m.has(n,i)&&!m.contains(t,i)&&t.push(i);r--;)i=S[r],i in n&&n[i]!==u[i]&&!m.contains(t,i)&&t.push(i)}var e=this,u=e._,i=Array.prototype,o=Object.prototype,a=Function.prototype,c=i.push,l=i.slice,f=o.toString,s=o.hasOwnProperty,p=Array.isArray,h=Object.keys,v=a.bind,g=Object.create,y=function(){},m=function(n){return n instanceof m?n:this instanceof m?void(this._wrapped=n):new m(n)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=m),exports._=m):e._=m,m.VERSION="1.8.2";var d=function(n,t,r){if(t===void 0)return n;switch(null==r?3:r){case 1:return function(r){return n.call(t,r)};case 2:return function(r,e){return n.call(t,r,e)};case 3:return function(r,e,u){return n.call(t,r,e,u)};case 4:return function(r,e,u,i){return n.call(t,r,e,u,i)}}return function(){return n.apply(t,arguments)}},b=function(n,t,r){return null==n?m.identity:m.isFunction(n)?d(n,t,r):m.isObject(n)?m.matcher(n):m.property(n)};m.iteratee=function(n,t){return b(n,t,1/0)};var x=function(n,t){return function(r){var e=arguments.length;if(2>e||null==r)return r;for(var u=1;e>u;u++)for(var i=arguments[u],o=n(i),a=o.length,c=0;a>c;c++){var l=o[c];t&&r[l]!==void 0||(r[l]=i[l])}return r}},_=function(n){if(!m.isObject(n))return{};if(g)return g(n);y.prototype=n;var t=new y;return y.prototype=null,t},j=Math.pow(2,53)-1,w=function(n){var t=n&&n.length;return"number"==typeof t&&t>=0&&j>=t};m.each=m.forEach=function(n,t,r){t=d(t,r);var e,u;if(w(n))for(e=0,u=n.length;u>e;e++)t(n[e],e,n);else{var i=m.keys(n);for(e=0,u=i.length;u>e;e++)t(n[i[e]],i[e],n)}return n},m.map=m.collect=function(n,t,r){t=b(t,r);for(var e=!w(n)&&m.keys(n),u=(e||n).length,i=Array(u),o=0;u>o;o++){var a=e?e[o]:o;i[o]=t(n[a],a,n)}return i},m.reduce=m.foldl=m.inject=n(1),m.reduceRight=m.foldr=n(-1),m.find=m.detect=function(n,t,r){var e;return e=w(n)?m.findIndex(n,t,r):m.findKey(n,t,r),e!==void 0&&e!==-1?n[e]:void 0},m.filter=m.select=function(n,t,r){var e=[];return t=b(t,r),m.each(n,function(n,r,u){t(n,r,u)&&e.push(n)}),e},m.reject=function(n,t,r){return m.filter(n,m.negate(b(t)),r)},m.every=m.all=function(n,t,r){t=b(t,r);for(var e=!w(n)&&m.keys(n),u=(e||n).length,i=0;u>i;i++){var o=e?e[i]:i;if(!t(n[o],o,n))return!1}return!0},m.some=m.any=function(n,t,r){t=b(t,r);for(var e=!w(n)&&m.keys(n),u=(e||n).length,i=0;u>i;i++){var o=e?e[i]:i;if(t(n[o],o,n))return!0}return!1},m.contains=m.includes=m.include=function(n,t,r){return w(n)||(n=m.values(n)),m.indexOf(n,t,"number"==typeof r&&r)>=0},m.invoke=function(n,t){var r=l.call(arguments,2),e=m.isFunction(t);return m.map(n,function(n){var u=e?t:n[t];return null==u?u:u.apply(n,r)})},m.pluck=function(n,t){return m.map(n,m.property(t))},m.where=function(n,t){return m.filter(n,m.matcher(t))},m.findWhere=function(n,t){return m.find(n,m.matcher(t))},m.max=function(n,t,r){var e,u,i=-1/0,o=-1/0;if(null==t&&null!=n){n=w(n)?n:m.values(n);for(var a=0,c=n.length;c>a;a++)e=n[a],e>i&&(i=e)}else t=b(t,r),m.each(n,function(n,r,e){u=t(n,r,e),(u>o||u===-1/0&&i===-1/0)&&(i=n,o=u)});return i},m.min=function(n,t,r){var e,u,i=1/0,o=1/0;if(null==t&&null!=n){n=w(n)?n:m.values(n);for(var a=0,c=n.length;c>a;a++)e=n[a],i>e&&(i=e)}else t=b(t,r),m.each(n,function(n,r,e){u=t(n,r,e),(o>u||1/0===u&&1/0===i)&&(i=n,o=u)});return i},m.shuffle=function(n){for(var t,r=w(n)?n:m.values(n),e=r.length,u=Array(e),i=0;e>i;i++)t=m.random(0,i),t!==i&&(u[i]=u[t]),u[t]=r[i];return u},m.sample=function(n,t,r){return null==t||r?(w(n)||(n=m.values(n)),n[m.random(n.length-1)]):m.shuffle(n).slice(0,Math.max(0,t))},m.sortBy=function(n,t,r){return t=b(t,r),m.pluck(m.map(n,function(n,r,e){return{value:n,index:r,criteria:t(n,r,e)}}).sort(function(n,t){var r=n.criteria,e=t.criteria;if(r!==e){if(r>e||r===void 0)return 1;if(e>r||e===void 0)return-1}return n.index-t.index}),"value")};var A=function(n){return function(t,r,e){var u={};return r=b(r,e),m.each(t,function(e,i){var o=r(e,i,t);n(u,e,o)}),u}};m.groupBy=A(function(n,t,r){m.has(n,r)?n[r].push(t):n[r]=[t]}),m.indexBy=A(function(n,t,r){n[r]=t}),m.countBy=A(function(n,t,r){m.has(n,r)?n[r]++:n[r]=1}),m.toArray=function(n){return n?m.isArray(n)?l.call(n):w(n)?m.map(n,m.identity):m.values(n):[]},m.size=function(n){return null==n?0:w(n)?n.length:m.keys(n).length},m.partition=function(n,t,r){t=b(t,r);var e=[],u=[];return m.each(n,function(n,r,i){(t(n,r,i)?e:u).push(n)}),[e,u]},m.first=m.head=m.take=function(n,t,r){return null==n?void 0:null==t||r?n[0]:m.initial(n,n.length-t)},m.initial=function(n,t,r){return l.call(n,0,Math.max(0,n.length-(null==t||r?1:t)))},m.last=function(n,t,r){return null==n?void 0:null==t||r?n[n.length-1]:m.rest(n,Math.max(0,n.length-t))},m.rest=m.tail=m.drop=function(n,t,r){return l.call(n,null==t||r?1:t)},m.compact=function(n){return m.filter(n,m.identity)};var k=function(n,t,r,e){for(var u=[],i=0,o=e||0,a=n&&n.length;a>o;o++){var c=n[o];if(w(c)&&(m.isArray(c)||m.isArguments(c))){t||(c=k(c,t,r));var l=0,f=c.length;for(u.length+=f;f>l;)u[i++]=c[l++]}else r||(u[i++]=c)}return u};m.flatten=function(n,t){return k(n,t,!1)},m.without=function(n){return m.difference(n,l.call(arguments,1))},m.uniq=m.unique=function(n,t,r,e){if(null==n)return[];m.isBoolean(t)||(e=r,r=t,t=!1),null!=r&&(r=b(r,e));for(var u=[],i=[],o=0,a=n.length;a>o;o++){var c=n[o],l=r?r(c,o,n):c;t?(o&&i===l||u.push(c),i=l):r?m.contains(i,l)||(i.push(l),u.push(c)):m.contains(u,c)||u.push(c)}return u},m.union=function(){return m.uniq(k(arguments,!0,!0))},m.intersection=function(n){if(null==n)return[];for(var t=[],r=arguments.length,e=0,u=n.length;u>e;e++){var i=n[e];if(!m.contains(t,i)){for(var o=1;r>o&&m.contains(arguments[o],i);o++);o===r&&t.push(i)}}return t},m.difference=function(n){var t=k(arguments,!0,!0,1);return m.filter(n,function(n){return!m.contains(t,n)})},m.zip=function(){return m.unzip(arguments)},m.unzip=function(n){for(var t=n&&m.max(n,"length").length||0,r=Array(t),e=0;t>e;e++)r[e]=m.pluck(n,e);return r},m.object=function(n,t){for(var r={},e=0,u=n&&n.length;u>e;e++)t?r[n[e]]=t[e]:r[n[e][0]]=n[e][1];return r},m.indexOf=function(n,t,r){var e=0,u=n&&n.length;if("number"==typeof r)e=0>r?Math.max(0,u+r):r;else if(r&&u)return e=m.sortedIndex(n,t),n[e]===t?e:-1;if(t!==t)return m.findIndex(l.call(n,e),m.isNaN);for(;u>e;e++)if(n[e]===t)return e;return-1},m.lastIndexOf=function(n,t,r){var e=n?n.length:0;if("number"==typeof r&&(e=0>r?e+r+1:Math.min(e,r+1)),t!==t)return m.findLastIndex(l.call(n,0,e),m.isNaN);for(;--e>=0;)if(n[e]===t)return e;return-1},m.findIndex=t(1),m.findLastIndex=t(-1),m.sortedIndex=function(n,t,r,e){r=b(r,e,1);for(var u=r(t),i=0,o=n.length;o>i;){var a=Math.floor((i+o)/2);r(n[a])<u?i=a+1:o=a}return i},m.range=function(n,t,r){arguments.length<=1&&(t=n||0,n=0),r=r||1;for(var e=Math.max(Math.ceil((t-n)/r),0),u=Array(e),i=0;e>i;i++,n+=r)u[i]=n;return u};var O=function(n,t,r,e,u){if(!(e instanceof t))return n.apply(r,u);var i=_(n.prototype),o=n.apply(i,u);return m.isObject(o)?o:i};m.bind=function(n,t){if(v&&n.bind===v)return v.apply(n,l.call(arguments,1));if(!m.isFunction(n))throw new TypeError("Bind must be called on a function");var r=l.call(arguments,2),e=function(){return O(n,e,t,this,r.concat(l.call(arguments)))};return e},m.partial=function(n){var t=l.call(arguments,1),r=function(){for(var e=0,u=t.length,i=Array(u),o=0;u>o;o++)i[o]=t[o]===m?arguments[e++]:t[o];for(;e<arguments.length;)i.push(arguments[e++]);return O(n,r,this,this,i)};return r},m.bindAll=function(n){var t,r,e=arguments.length;if(1>=e)throw new Error("bindAll must be passed function names");for(t=1;e>t;t++)r=arguments[t],n[r]=m.bind(n[r],n);return n},m.memoize=function(n,t){var r=function(e){var u=r.cache,i=""+(t?t.apply(this,arguments):e);return m.has(u,i)||(u[i]=n.apply(this,arguments)),u[i]};return r.cache={},r},m.delay=function(n,t){var r=l.call(arguments,2);return setTimeout(function(){return n.apply(null,r)},t)},m.defer=m.partial(m.delay,m,1),m.throttle=function(n,t,r){var e,u,i,o=null,a=0;r||(r={});var c=function(){a=r.leading===!1?0:m.now(),o=null,i=n.apply(e,u),o||(e=u=null)};return function(){var l=m.now();a||r.leading!==!1||(a=l);var f=t-(l-a);return e=this,u=arguments,0>=f||f>t?(o&&(clearTimeout(o),o=null),a=l,i=n.apply(e,u),o||(e=u=null)):o||r.trailing===!1||(o=setTimeout(c,f)),i}},m.debounce=function(n,t,r){var e,u,i,o,a,c=function(){var l=m.now()-o;t>l&&l>=0?e=setTimeout(c,t-l):(e=null,r||(a=n.apply(i,u),e||(i=u=null)))};return function(){i=this,u=arguments,o=m.now();var l=r&&!e;return e||(e=setTimeout(c,t)),l&&(a=n.apply(i,u),i=u=null),a}},m.wrap=function(n,t){return m.partial(t,n)},m.negate=function(n){return function(){return!n.apply(this,arguments)}},m.compose=function(){var n=arguments,t=n.length-1;return function(){for(var r=t,e=n[t].apply(this,arguments);r--;)e=n[r].call(this,e);return e}},m.after=function(n,t){return function(){return--n<1?t.apply(this,arguments):void 0}},m.before=function(n,t){var r;return function(){return--n>0&&(r=t.apply(this,arguments)),1>=n&&(t=null),r}},m.once=m.partial(m.before,2);var F=!{toString:null}.propertyIsEnumerable("toString"),S=["valueOf","isPrototypeOf","toString","propertyIsEnumerable","hasOwnProperty","toLocaleString"];m.keys=function(n){if(!m.isObject(n))return[];if(h)return h(n);var t=[];for(var e in n)m.has(n,e)&&t.push(e);return F&&r(n,t),t},m.allKeys=function(n){if(!m.isObject(n))return[];var t=[];for(var e in n)t.push(e);return F&&r(n,t),t},m.values=function(n){for(var t=m.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=n[t[u]];return e},m.mapObject=function(n,t,r){t=b(t,r);for(var e,u=m.keys(n),i=u.length,o={},a=0;i>a;a++)e=u[a],o[e]=t(n[e],e,n);return o},m.pairs=function(n){for(var t=m.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=[t[u],n[t[u]]];return e},m.invert=function(n){for(var t={},r=m.keys(n),e=0,u=r.length;u>e;e++)t[n[r[e]]]=r[e];return t},m.functions=m.methods=function(n){var t=[];for(var r in n)m.isFunction(n[r])&&t.push(r);return t.sort()},m.extend=x(m.allKeys),m.extendOwn=m.assign=x(m.keys),m.findKey=function(n,t,r){t=b(t,r);for(var e,u=m.keys(n),i=0,o=u.length;o>i;i++)if(e=u[i],t(n[e],e,n))return e},m.pick=function(n,t,r){var e,u,i={},o=n;if(null==o)return i;m.isFunction(t)?(u=m.allKeys(o),e=d(t,r)):(u=k(arguments,!1,!1,1),e=function(n,t,r){return t in r},o=Object(o));for(var a=0,c=u.length;c>a;a++){var l=u[a],f=o[l];e(f,l,o)&&(i[l]=f)}return i},m.omit=function(n,t,r){if(m.isFunction(t))t=m.negate(t);else{var e=m.map(k(arguments,!1,!1,1),String);t=function(n,t){return!m.contains(e,t)}}return m.pick(n,t,r)},m.defaults=x(m.allKeys,!0),m.clone=function(n){return m.isObject(n)?m.isArray(n)?n.slice():m.extend({},n):n},m.tap=function(n,t){return t(n),n},m.isMatch=function(n,t){var r=m.keys(t),e=r.length;if(null==n)return!e;for(var u=Object(n),i=0;e>i;i++){var o=r[i];if(t[o]!==u[o]||!(o in u))return!1}return!0};var E=function(n,t,r,e){if(n===t)return 0!==n||1/n===1/t;if(null==n||null==t)return n===t;n instanceof m&&(n=n._wrapped),t instanceof m&&(t=t._wrapped);var u=f.call(n);if(u!==f.call(t))return!1;switch(u){case"[object RegExp]":case"[object String]":return""+n==""+t;case"[object Number]":return+n!==+n?+t!==+t:0===+n?1/+n===1/t:+n===+t;case"[object Date]":case"[object Boolean]":return+n===+t}var i="[object Array]"===u;if(!i){if("object"!=typeof n||"object"!=typeof t)return!1;var o=n.constructor,a=t.constructor;if(o!==a&&!(m.isFunction(o)&&o instanceof o&&m.isFunction(a)&&a instanceof a)&&"constructor"in n&&"constructor"in t)return!1}r=r||[],e=e||[];for(var c=r.length;c--;)if(r[c]===n)return e[c]===t;if(r.push(n),e.push(t),i){if(c=n.length,c!==t.length)return!1;for(;c--;)if(!E(n[c],t[c],r,e))return!1}else{var l,s=m.keys(n);if(c=s.length,m.keys(t).length!==c)return!1;for(;c--;)if(l=s[c],!m.has(t,l)||!E(n[l],t[l],r,e))return!1}return r.pop(),e.pop(),!0};m.isEqual=function(n,t){return E(n,t)},m.isEmpty=function(n){return null==n?!0:w(n)&&(m.isArray(n)||m.isString(n)||m.isArguments(n))?0===n.length:0===m.keys(n).length},m.isElement=function(n){return!(!n||1!==n.nodeType)},m.isArray=p||function(n){return"[object Array]"===f.call(n)},m.isObject=function(n){var t=typeof n;return"function"===t||"object"===t&&!!n},m.each(["Arguments","Function","String","Number","Date","RegExp","Error"],function(n){m["is"+n]=function(t){return f.call(t)==="[object "+n+"]"}}),m.isArguments(arguments)||(m.isArguments=function(n){return m.has(n,"callee")}),"function"!=typeof/./&&"object"!=typeof Int8Array&&(m.isFunction=function(n){return"function"==typeof n||!1}),m.isFinite=function(n){return isFinite(n)&&!isNaN(parseFloat(n))},m.isNaN=function(n){return m.isNumber(n)&&n!==+n},m.isBoolean=function(n){return n===!0||n===!1||"[object Boolean]"===f.call(n)},m.isNull=function(n){return null===n},m.isUndefined=function(n){return n===void 0},m.has=function(n,t){return null!=n&&s.call(n,t)},m.noConflict=function(){return e._=u,this},m.identity=function(n){return n},m.constant=function(n){return function(){return n}},m.noop=function(){},m.property=function(n){return function(t){return null==t?void 0:t[n]}},m.propertyOf=function(n){return null==n?function(){}:function(t){return n[t]}},m.matcher=m.matches=function(n){return n=m.extendOwn({},n),function(t){return m.isMatch(t,n)}},m.times=function(n,t,r){var e=Array(Math.max(0,n));t=d(t,r,1);for(var u=0;n>u;u++)e[u]=t(u);return e},m.random=function(n,t){return null==t&&(t=n,n=0),n+Math.floor(Math.random()*(t-n+1))},m.now=Date.now||function(){return(new Date).getTime()};var M={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},N=m.invert(M),I=function(n){var t=function(t){return n[t]},r="(?:"+m.keys(n).join("|")+")",e=RegExp(r),u=RegExp(r,"g");return function(n){return n=null==n?"":""+n,e.test(n)?n.replace(u,t):n}};m.escape=I(M),m.unescape=I(N),m.result=function(n,t,r){var e=null==n?void 0:n[t];return e===void 0&&(e=r),m.isFunction(e)?e.call(n):e};var B=0;m.uniqueId=function(n){var t=++B+"";return n?n+t:t},m.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var T=/(.)^/,R={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},q=/\\|'|\r|\n|\u2028|\u2029/g,K=function(n){return"\\"+R[n]};m.template=function(n,t,r){!t&&r&&(t=r),t=m.defaults({},t,m.templateSettings);var e=RegExp([(t.escape||T).source,(t.interpolate||T).source,(t.evaluate||T).source].join("|")+"|$","g"),u=0,i="__p+='";n.replace(e,function(t,r,e,o,a){return i+=n.slice(u,a).replace(q,K),u=a+t.length,r?i+="'+\n((__t=("+r+"))==null?'':_.escape(__t))+\n'":e?i+="'+\n((__t=("+e+"))==null?'':__t)+\n'":o&&(i+="';\n"+o+"\n__p+='"),t}),i+="';\n",t.variable||(i="with(obj||{}){\n"+i+"}\n"),i="var __t,__p='',__j=Array.prototype.join,"+"print=function(){__p+=__j.call(arguments,'');};\n"+i+"return __p;\n";try{var o=new Function(t.variable||"obj","_",i)}catch(a){throw a.source=i,a}var c=function(n){return o.call(this,n,m)},l=t.variable||"obj";return c.source="function("+l+"){\n"+i+"}",c},m.chain=function(n){var t=m(n);return t._chain=!0,t};var z=function(n,t){return n._chain?m(t).chain():t};m.mixin=function(n){m.each(m.functions(n),function(t){var r=m[t]=n[t];m.prototype[t]=function(){var n=[this._wrapped];return c.apply(n,arguments),z(this,r.apply(m,n))}})},m.mixin(m),m.each(["pop","push","reverse","shift","sort","splice","unshift"],function(n){var t=i[n];m.prototype[n]=function(){var r=this._wrapped;return t.apply(r,arguments),"shift"!==n&&"splice"!==n||0!==r.length||delete r[0],z(this,r)}}),m.each(["concat","join","slice"],function(n){var t=i[n];m.prototype[n]=function(){return z(this,t.apply(this._wrapped,arguments))}}),m.prototype.value=function(){return this._wrapped},m.prototype.valueOf=m.prototype.toJSON=m.prototype.value,m.prototype.toString=function(){return""+this._wrapped},"function"==typeof define&&define.amd&&define("underscore",[],function(){return m})}).call(this);
+(function () { function n(n) { function t(t, r, e, u, i, o) { for (; i >= 0 && o > i; i += n) { var a = u ? u[i] : i; e = r(e, t[a], a, t) } return e } return function (r, e, u, i) { e = d(e, i, 4); var o = !w(r) && m.keys(r), a = (o || r).length, c = n > 0 ? 0 : a - 1; return arguments.length < 3 && (u = r[o ? o[c] : c], c += n), t(r, e, u, o, c, a) } } function t(n) { return function (t, r, e) { r = b(r, e); for (var u = null != t && t.length, i = n > 0 ? 0 : u - 1; i >= 0 && u > i; i += n)if (r(t[i], i, t)) return i; return -1 } } function r(n, t) { var r = S.length, e = n.constructor, u = m.isFunction(e) && e.prototype || o, i = "constructor"; for (m.has(n, i) && !m.contains(t, i) && t.push(i); r--;)i = S[r], i in n && n[i] !== u[i] && !m.contains(t, i) && t.push(i) } var e = this, u = e._, i = Array.prototype, o = Object.prototype, a = Function.prototype, c = i.push, l = i.slice, f = o.toString, s = o.hasOwnProperty, p = Array.isArray, h = Object.keys, v = a.bind, g = Object.create, y = function () { }, m = function (n) { return n instanceof m ? n : this instanceof m ? void (this._wrapped = n) : new m(n) }; "undefined" != typeof exports ? ("undefined" != typeof module && module.exports && (exports = module.exports = m), exports._ = m) : e._ = m, m.VERSION = "1.8.2"; var d = function (n, t, r) { if (t === void 0) return n; switch (null == r ? 3 : r) { case 1: return function (r) { return n.call(t, r) }; case 2: return function (r, e) { return n.call(t, r, e) }; case 3: return function (r, e, u) { return n.call(t, r, e, u) }; case 4: return function (r, e, u, i) { return n.call(t, r, e, u, i) } }return function () { return n.apply(t, arguments) } }, b = function (n, t, r) { return null == n ? m.identity : m.isFunction(n) ? d(n, t, r) : m.isObject(n) ? m.matcher(n) : m.property(n) }; m.iteratee = function (n, t) { return b(n, t, 1 / 0) }; var x = function (n, t) { return function (r) { var e = arguments.length; if (2 > e || null == r) return r; for (var u = 1; e > u; u++)for (var i = arguments[u], o = n(i), a = o.length, c = 0; a > c; c++) { var l = o[c]; t && r[l] !== void 0 || (r[l] = i[l]) } return r } }, _ = function (n) { if (!m.isObject(n)) return {}; if (g) return g(n); y.prototype = n; var t = new y; return y.prototype = null, t }, j = Math.pow(2, 53) - 1, w = function (n) { var t = n && n.length; return "number" == typeof t && t >= 0 && j >= t }; m.each = m.forEach = function (n, t, r) { t = d(t, r); var e, u; if (w(n)) for (e = 0, u = n.length; u > e; e++)t(n[e], e, n); else { var i = m.keys(n); for (e = 0, u = i.length; u > e; e++)t(n[i[e]], i[e], n) } return n }, m.map = m.collect = function (n, t, r) { t = b(t, r); for (var e = !w(n) && m.keys(n), u = (e || n).length, i = Array(u), o = 0; u > o; o++) { var a = e ? e[o] : o; i[o] = t(n[a], a, n) } return i }, m.reduce = m.foldl = m.inject = n(1), m.reduceRight = m.foldr = n(-1), m.find = m.detect = function (n, t, r) { var e; return e = w(n) ? m.findIndex(n, t, r) : m.findKey(n, t, r), e !== void 0 && e !== -1 ? n[e] : void 0 }, m.filter = m.select = function (n, t, r) { var e = []; return t = b(t, r), m.each(n, function (n, r, u) { t(n, r, u) && e.push(n) }), e }, m.reject = function (n, t, r) { return m.filter(n, m.negate(b(t)), r) }, m.every = m.all = function (n, t, r) { t = b(t, r); for (var e = !w(n) && m.keys(n), u = (e || n).length, i = 0; u > i; i++) { var o = e ? e[i] : i; if (!t(n[o], o, n)) return !1 } return !0 }, m.some = m.any = function (n, t, r) { t = b(t, r); for (var e = !w(n) && m.keys(n), u = (e || n).length, i = 0; u > i; i++) { var o = e ? e[i] : i; if (t(n[o], o, n)) return !0 } return !1 }, m.contains = m.includes = m.include = function (n, t, r) { return w(n) || (n = m.values(n)), m.indexOf(n, t, "number" == typeof r && r) >= 0 }, m.invoke = function (n, t) { var r = l.call(arguments, 2), e = m.isFunction(t); return m.map(n, function (n) { var u = e ? t : n[t]; return null == u ? u : u.apply(n, r) }) }, m.pluck = function (n, t) { return m.map(n, m.property(t)) }, m.where = function (n, t) { return m.filter(n, m.matcher(t)) }, m.findWhere = function (n, t) { return m.find(n, m.matcher(t)) }, m.max = function (n, t, r) { var e, u, i = -1 / 0, o = -1 / 0; if (null == t && null != n) { n = w(n) ? n : m.values(n); for (var a = 0, c = n.length; c > a; a++)e = n[a], e > i && (i = e) } else t = b(t, r), m.each(n, function (n, r, e) { u = t(n, r, e), (u > o || u === -1 / 0 && i === -1 / 0) && (i = n, o = u) }); return i }, m.min = function (n, t, r) { var e, u, i = 1 / 0, o = 1 / 0; if (null == t && null != n) { n = w(n) ? n : m.values(n); for (var a = 0, c = n.length; c > a; a++)e = n[a], i > e && (i = e) } else t = b(t, r), m.each(n, function (n, r, e) { u = t(n, r, e), (o > u || 1 / 0 === u && 1 / 0 === i) && (i = n, o = u) }); return i }, m.shuffle = function (n) { for (var t, r = w(n) ? n : m.values(n), e = r.length, u = Array(e), i = 0; e > i; i++)t = m.random(0, i), t !== i && (u[i] = u[t]), u[t] = r[i]; return u }, m.sample = function (n, t, r) { return null == t || r ? (w(n) || (n = m.values(n)), n[m.random(n.length - 1)]) : m.shuffle(n).slice(0, Math.max(0, t)) }, m.sortBy = function (n, t, r) { return t = b(t, r), m.pluck(m.map(n, function (n, r, e) { return { value: n, index: r, criteria: t(n, r, e) } }).sort(function (n, t) { var r = n.criteria, e = t.criteria; if (r !== e) { if (r > e || r === void 0) return 1; if (e > r || e === void 0) return -1 } return n.index - t.index }), "value") }; var A = function (n) { return function (t, r, e) { var u = {}; return r = b(r, e), m.each(t, function (e, i) { var o = r(e, i, t); n(u, e, o) }), u } }; m.groupBy = A(function (n, t, r) { m.has(n, r) ? n[r].push(t) : n[r] = [t] }), m.indexBy = A(function (n, t, r) { n[r] = t }), m.countBy = A(function (n, t, r) { m.has(n, r) ? n[r]++ : n[r] = 1 }), m.toArray = function (n) { return n ? m.isArray(n) ? l.call(n) : w(n) ? m.map(n, m.identity) : m.values(n) : [] }, m.size = function (n) { return null == n ? 0 : w(n) ? n.length : m.keys(n).length }, m.partition = function (n, t, r) { t = b(t, r); var e = [], u = []; return m.each(n, function (n, r, i) { (t(n, r, i) ? e : u).push(n) }), [e, u] }, m.first = m.head = m.take = function (n, t, r) { return null == n ? void 0 : null == t || r ? n[0] : m.initial(n, n.length - t) }, m.initial = function (n, t, r) { return l.call(n, 0, Math.max(0, n.length - (null == t || r ? 1 : t))) }, m.last = function (n, t, r) { return null == n ? void 0 : null == t || r ? n[n.length - 1] : m.rest(n, Math.max(0, n.length - t)) }, m.rest = m.tail = m.drop = function (n, t, r) { return l.call(n, null == t || r ? 1 : t) }, m.compact = function (n) { return m.filter(n, m.identity) }; var k = function (n, t, r, e) { for (var u = [], i = 0, o = e || 0, a = n && n.length; a > o; o++) { var c = n[o]; if (w(c) && (m.isArray(c) || m.isArguments(c))) { t || (c = k(c, t, r)); var l = 0, f = c.length; for (u.length += f; f > l;)u[i++] = c[l++] } else r || (u[i++] = c) } return u }; m.flatten = function (n, t) { return k(n, t, !1) }, m.without = function (n) { return m.difference(n, l.call(arguments, 1)) }, m.uniq = m.unique = function (n, t, r, e) { if (null == n) return []; m.isBoolean(t) || (e = r, r = t, t = !1), null != r && (r = b(r, e)); for (var u = [], i = [], o = 0, a = n.length; a > o; o++) { var c = n[o], l = r ? r(c, o, n) : c; t ? (o && i === l || u.push(c), i = l) : r ? m.contains(i, l) || (i.push(l), u.push(c)) : m.contains(u, c) || u.push(c) } return u }, m.union = function () { return m.uniq(k(arguments, !0, !0)) }, m.intersection = function (n) { if (null == n) return []; for (var t = [], r = arguments.length, e = 0, u = n.length; u > e; e++) { var i = n[e]; if (!m.contains(t, i)) { for (var o = 1; r > o && m.contains(arguments[o], i); o++); o === r && t.push(i) } } return t }, m.difference = function (n) { var t = k(arguments, !0, !0, 1); return m.filter(n, function (n) { return !m.contains(t, n) }) }, m.zip = function () { return m.unzip(arguments) }, m.unzip = function (n) { for (var t = n && m.max(n, "length").length || 0, r = Array(t), e = 0; t > e; e++)r[e] = m.pluck(n, e); return r }, m.object = function (n, t) { for (var r = {}, e = 0, u = n && n.length; u > e; e++)t ? r[n[e]] = t[e] : r[n[e][0]] = n[e][1]; return r }, m.indexOf = function (n, t, r) { var e = 0, u = n && n.length; if ("number" == typeof r) e = 0 > r ? Math.max(0, u + r) : r; else if (r && u) return e = m.sortedIndex(n, t), n[e] === t ? e : -1; if (t !== t) return m.findIndex(l.call(n, e), m.isNaN); for (; u > e; e++)if (n[e] === t) return e; return -1 }, m.lastIndexOf = function (n, t, r) { var e = n ? n.length : 0; if ("number" == typeof r && (e = 0 > r ? e + r + 1 : Math.min(e, r + 1)), t !== t) return m.findLastIndex(l.call(n, 0, e), m.isNaN); for (; --e >= 0;)if (n[e] === t) return e; return -1 }, m.findIndex = t(1), m.findLastIndex = t(-1), m.sortedIndex = function (n, t, r, e) { r = b(r, e, 1); for (var u = r(t), i = 0, o = n.length; o > i;) { var a = Math.floor((i + o) / 2); r(n[a]) < u ? i = a + 1 : o = a } return i }, m.range = function (n, t, r) { arguments.length <= 1 && (t = n || 0, n = 0), r = r || 1; for (var e = Math.max(Math.ceil((t - n) / r), 0), u = Array(e), i = 0; e > i; i++, n += r)u[i] = n; return u }; var O = function (n, t, r, e, u) { if (!(e instanceof t)) return n.apply(r, u); var i = _(n.prototype), o = n.apply(i, u); return m.isObject(o) ? o : i }; m.bind = function (n, t) { if (v && n.bind === v) return v.apply(n, l.call(arguments, 1)); if (!m.isFunction(n)) throw new TypeError("Bind must be called on a function"); var r = l.call(arguments, 2), e = function () { return O(n, e, t, this, r.concat(l.call(arguments))) }; return e }, m.partial = function (n) { var t = l.call(arguments, 1), r = function () { for (var e = 0, u = t.length, i = Array(u), o = 0; u > o; o++)i[o] = t[o] === m ? arguments[e++] : t[o]; for (; e < arguments.length;)i.push(arguments[e++]); return O(n, r, this, this, i) }; return r }, m.bindAll = function (n) { var t, r, e = arguments.length; if (1 >= e) throw new Error("bindAll must be passed function names"); for (t = 1; e > t; t++)r = arguments[t], n[r] = m.bind(n[r], n); return n }, m.memoize = function (n, t) { var r = function (e) { var u = r.cache, i = "" + (t ? t.apply(this, arguments) : e); return m.has(u, i) || (u[i] = n.apply(this, arguments)), u[i] }; return r.cache = {}, r }, m.delay = function (n, t) { var r = l.call(arguments, 2); return setTimeout(function () { return n.apply(null, r) }, t) }, m.defer = m.partial(m.delay, m, 1), m.throttle = function (n, t, r) { var e, u, i, o = null, a = 0; r || (r = {}); var c = function () { a = r.leading === !1 ? 0 : m.now(), o = null, i = n.apply(e, u), o || (e = u = null) }; return function () { var l = m.now(); a || r.leading !== !1 || (a = l); var f = t - (l - a); return e = this, u = arguments, 0 >= f || f > t ? (o && (clearTimeout(o), o = null), a = l, i = n.apply(e, u), o || (e = u = null)) : o || r.trailing === !1 || (o = setTimeout(c, f)), i } }, m.debounce = function (n, t, r) { var e, u, i, o, a, c = function () { var l = m.now() - o; t > l && l >= 0 ? e = setTimeout(c, t - l) : (e = null, r || (a = n.apply(i, u), e || (i = u = null))) }; return function () { i = this, u = arguments, o = m.now(); var l = r && !e; return e || (e = setTimeout(c, t)), l && (a = n.apply(i, u), i = u = null), a } }, m.wrap = function (n, t) { return m.partial(t, n) }, m.negate = function (n) { return function () { return !n.apply(this, arguments) } }, m.compose = function () { var n = arguments, t = n.length - 1; return function () { for (var r = t, e = n[t].apply(this, arguments); r--;)e = n[r].call(this, e); return e } }, m.after = function (n, t) { return function () { return --n < 1 ? t.apply(this, arguments) : void 0 } }, m.before = function (n, t) { var r; return function () { return --n > 0 && (r = t.apply(this, arguments)), 1 >= n && (t = null), r } }, m.once = m.partial(m.before, 2); var F = !{ toString: null }.propertyIsEnumerable("toString"), S = ["valueOf", "isPrototypeOf", "toString", "propertyIsEnumerable", "hasOwnProperty", "toLocaleString"]; m.keys = function (n) { if (!m.isObject(n)) return []; if (h) return h(n); var t = []; for (var e in n) m.has(n, e) && t.push(e); return F && r(n, t), t }, m.allKeys = function (n) { if (!m.isObject(n)) return []; var t = []; for (var e in n) t.push(e); return F && r(n, t), t }, m.values = function (n) { for (var t = m.keys(n), r = t.length, e = Array(r), u = 0; r > u; u++)e[u] = n[t[u]]; return e }, m.mapObject = function (n, t, r) { t = b(t, r); for (var e, u = m.keys(n), i = u.length, o = {}, a = 0; i > a; a++)e = u[a], o[e] = t(n[e], e, n); return o }, m.pairs = function (n) { for (var t = m.keys(n), r = t.length, e = Array(r), u = 0; r > u; u++)e[u] = [t[u], n[t[u]]]; return e }, m.invert = function (n) { for (var t = {}, r = m.keys(n), e = 0, u = r.length; u > e; e++)t[n[r[e]]] = r[e]; return t }, m.functions = m.methods = function (n) { var t = []; for (var r in n) m.isFunction(n[r]) && t.push(r); return t.sort() }, m.extend = x(m.allKeys), m.extendOwn = m.assign = x(m.keys), m.findKey = function (n, t, r) { t = b(t, r); for (var e, u = m.keys(n), i = 0, o = u.length; o > i; i++)if (e = u[i], t(n[e], e, n)) return e }, m.pick = function (n, t, r) { var e, u, i = {}, o = n; if (null == o) return i; m.isFunction(t) ? (u = m.allKeys(o), e = d(t, r)) : (u = k(arguments, !1, !1, 1), e = function (n, t, r) { return t in r }, o = Object(o)); for (var a = 0, c = u.length; c > a; a++) { var l = u[a], f = o[l]; e(f, l, o) && (i[l] = f) } return i }, m.omit = function (n, t, r) { if (m.isFunction(t)) t = m.negate(t); else { var e = m.map(k(arguments, !1, !1, 1), String); t = function (n, t) { return !m.contains(e, t) } } return m.pick(n, t, r) }, m.defaults = x(m.allKeys, !0), m.clone = function (n) { return m.isObject(n) ? m.isArray(n) ? n.slice() : m.extend({}, n) : n }, m.tap = function (n, t) { return t(n), n }, m.isMatch = function (n, t) { var r = m.keys(t), e = r.length; if (null == n) return !e; for (var u = Object(n), i = 0; e > i; i++) { var o = r[i]; if (t[o] !== u[o] || !(o in u)) return !1 } return !0 }; var E = function (n, t, r, e) { if (n === t) return 0 !== n || 1 / n === 1 / t; if (null == n || null == t) return n === t; n instanceof m && (n = n._wrapped), t instanceof m && (t = t._wrapped); var u = f.call(n); if (u !== f.call(t)) return !1; switch (u) { case "[object RegExp]": case "[object String]": return "" + n == "" + t; case "[object Number]": return +n !== +n ? +t !== +t : 0 === +n ? 1 / +n === 1 / t : +n === +t; case "[object Date]": case "[object Boolean]": return +n === +t }var i = "[object Array]" === u; if (!i) { if ("object" != typeof n || "object" != typeof t) return !1; var o = n.constructor, a = t.constructor; if (o !== a && !(m.isFunction(o) && o instanceof o && m.isFunction(a) && a instanceof a) && "constructor" in n && "constructor" in t) return !1 } r = r || [], e = e || []; for (var c = r.length; c--;)if (r[c] === n) return e[c] === t; if (r.push(n), e.push(t), i) { if (c = n.length, c !== t.length) return !1; for (; c--;)if (!E(n[c], t[c], r, e)) return !1 } else { var l, s = m.keys(n); if (c = s.length, m.keys(t).length !== c) return !1; for (; c--;)if (l = s[c], !m.has(t, l) || !E(n[l], t[l], r, e)) return !1 } return r.pop(), e.pop(), !0 }; m.isEqual = function (n, t) { return E(n, t) }, m.isEmpty = function (n) { return null == n ? !0 : w(n) && (m.isArray(n) || m.isString(n) || m.isArguments(n)) ? 0 === n.length : 0 === m.keys(n).length }, m.isElement = function (n) { return !(!n || 1 !== n.nodeType) }, m.isArray = p || function (n) { return "[object Array]" === f.call(n) }, m.isObject = function (n) { var t = typeof n; return "function" === t || "object" === t && !!n }, m.each(["Arguments", "Function", "String", "Number", "Date", "RegExp", "Error"], function (n) { m["is" + n] = function (t) { return f.call(t) === "[object " + n + "]" } }), m.isArguments(arguments) || (m.isArguments = function (n) { return m.has(n, "callee") }), "function" != typeof /./ && "object" != typeof Int8Array && (m.isFunction = function (n) { return "function" == typeof n || !1 }), m.isFinite = function (n) { return isFinite(n) && !isNaN(parseFloat(n)) }, m.isNaN = function (n) { return m.isNumber(n) && n !== +n }, m.isBoolean = function (n) { return n === !0 || n === !1 || "[object Boolean]" === f.call(n) }, m.isNull = function (n) { return null === n }, m.isUndefined = function (n) { return n === void 0 }, m.has = function (n, t) { return null != n && s.call(n, t) }, m.noConflict = function () { return e._ = u, this }, m.identity = function (n) { return n }, m.constant = function (n) { return function () { return n } }, m.noop = function () { }, m.property = function (n) { return function (t) { return null == t ? void 0 : t[n] } }, m.propertyOf = function (n) { return null == n ? function () { } : function (t) { return n[t] } }, m.matcher = m.matches = function (n) { return n = m.extendOwn({}, n), function (t) { return m.isMatch(t, n) } }, m.times = function (n, t, r) { var e = Array(Math.max(0, n)); t = d(t, r, 1); for (var u = 0; n > u; u++)e[u] = t(u); return e }, m.random = function (n, t) { return null == t && (t = n, n = 0), n + Math.floor(Math.random() * (t - n + 1)) }, m.now = Date.now || function () { return (new Date).getTime() }; var M = { "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#x27;", "`": "&#x60;" }, N = m.invert(M), I = function (n) { var t = function (t) { return n[t] }, r = "(?:" + m.keys(n).join("|") + ")", e = RegExp(r), u = RegExp(r, "g"); return function (n) { return n = null == n ? "" : "" + n, e.test(n) ? n.replace(u, t) : n } }; m.escape = I(M), m.unescape = I(N), m.result = function (n, t, r) { var e = null == n ? void 0 : n[t]; return e === void 0 && (e = r), m.isFunction(e) ? e.call(n) : e }; var B = 0; m.uniqueId = function (n) { var t = ++B + ""; return n ? n + t : t }, m.templateSettings = { evaluate: /<%([\s\S]+?)%>/g, interpolate: /<%=([\s\S]+?)%>/g, escape: /<%-([\s\S]+?)%>/g }; var T = /(.)^/, R = { "'": "'", "\\": "\\", "\r": "r", "\n": "n", "\u2028": "u2028", "\u2029": "u2029" }, q = /\\|'|\r|\n|\u2028|\u2029/g, K = function (n) { return "\\" + R[n] }; m.template = function (n, t, r) { !t && r && (t = r), t = m.defaults({}, t, m.templateSettings); var e = RegExp([(t.escape || T).source, (t.interpolate || T).source, (t.evaluate || T).source].join("|") + "|$", "g"), u = 0, i = "__p+='"; n.replace(e, function (t, r, e, o, a) { return i += n.slice(u, a).replace(q, K), u = a + t.length, r ? i += "'+\n((__t=(" + r + "))==null?'':_.escape(__t))+\n'" : e ? i += "'+\n((__t=(" + e + "))==null?'':__t)+\n'" : o && (i += "';\n" + o + "\n__p+='"), t }), i += "';\n", t.variable || (i = "with(obj||{}){\n" + i + "}\n"), i = "var __t,__p='',__j=Array.prototype.join," + "print=function(){__p+=__j.call(arguments,'');};\n" + i + "return __p;\n"; try { var o = new Function(t.variable || "obj", "_", i) } catch (a) { throw a.source = i, a } var c = function (n) { return o.call(this, n, m) }, l = t.variable || "obj"; return c.source = "function(" + l + "){\n" + i + "}", c }, m.chain = function (n) { var t = m(n); return t._chain = !0, t }; var z = function (n, t) { return n._chain ? m(t).chain() : t }; m.mixin = function (n) { m.each(m.functions(n), function (t) { var r = m[t] = n[t]; m.prototype[t] = function () { var n = [this._wrapped]; return c.apply(n, arguments), z(this, r.apply(m, n)) } }) }, m.mixin(m), m.each(["pop", "push", "reverse", "shift", "sort", "splice", "unshift"], function (n) { var t = i[n]; m.prototype[n] = function () { var r = this._wrapped; return t.apply(r, arguments), "shift" !== n && "splice" !== n || 0 !== r.length || delete r[0], z(this, r) } }), m.each(["concat", "join", "slice"], function (n) { var t = i[n]; m.prototype[n] = function () { return z(this, t.apply(this._wrapped, arguments)) } }), m.prototype.value = function () { return this._wrapped }, m.prototype.valueOf = m.prototype.toJSON = m.prototype.value, m.prototype.toString = function () { return "" + this._wrapped }, "function" == typeof define && define.amd && define("underscore", [], function () { return m }) }).call(this);
+
 /**
  * marked v0.3.3 - a markdown parser
  * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
  * https://github.com/chjj/marked
    升级到v0.4.0 从/educoder/public/editormd/lib/marked.min.js复制
  */
-!function(e){"use strict";var t={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:d,hr:/^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,heading:/^ *(#{1,6})*([^\n]+?) *(?:#+ *)?(?:\n+|$)/,nptable:d,blockquote:/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:"^ {0,3}(?:<(script|pre|style)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?\\?>\\n*|<![A-Z][\\s\\S]*?>\\n*|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>\\n*|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:\\n{2,}|$)|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$)|</(?!script|pre|style)[a-z][\\w-]*\\s*>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$))",def:/^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,table:d,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,paragraph:/^([^\n]+(?:\n(?!hr|heading|lheading| {0,3}>|<\/?(?:tag)(?: +|\n|\/?>)|<(?:script|pre|style|!--))[^\n]+)*)/,text:/^[^\n]+/};function n(e){this.tokens=[],this.tokens.links={},this.options=e||m.defaults,this.rules=t.normal,this.options.pedantic?this.rules=t.pedantic:this.options.gfm&&(this.options.tables?this.rules=t.tables:this.rules=t.gfm)}t._label=/(?!\s*\])(?:\\[\[\]]|[^\[\]])+/,t._title=/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/,t.def=p(t.def).replace("label",t._label).replace("title",t._title).getRegex(),t.bullet=/(?:[*+-]|\d+\.)/,t.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/,t.item=p(t.item,"gm").replace(/bull/g,t.bullet).getRegex(),t.list=p(t.list).replace(/bull/g,t.bullet).replace("hr","\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))").replace("def","\\n+(?="+t.def.source+")").getRegex(),t._tag="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",t._comment=/<!--(?!-?>)[\s\S]*?-->/,t.html=p(t.html,"i").replace("comment",t._comment).replace("tag",t._tag).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),t.paragraph=p(t.paragraph).replace("hr",t.hr).replace("heading",t.heading).replace("lheading",t.lheading).replace("tag",t._tag).getRegex(),t.blockquote=p(t.blockquote).replace("paragraph",t.paragraph).getRegex(),t.normal=f({},t),t.gfm=f({},t.normal,{fences:/^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\n? *\1 *(?:\n+|$)/,paragraph:/^/,heading:/^ *(#{1,6})+([^\n]+?) *#* *(?:\n+|$)/}),t.gfm.paragraph=p(t.paragraph).replace("(?!","(?!"+t.gfm.fences.source.replace("\\1","\\2")+"|"+t.list.source.replace("\\1","\\3")+"|").getRegex(),t.tables=f({},t.gfm,{nptable:/^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,table:/^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/}),t.pedantic=f({},t.normal,{html:p("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)|<tag(?:\"[^\"]*\"|'[^']*'|\\s[^'\"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))").replace("comment",t._comment).replace(/tag/g,"(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(),def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/}),n.rules=t,n.lex=function(e,t){return new n(t).lex(e)},n.prototype.lex=function(e){return e=e.replace(/\r\n|\r/g,"\n").replace(/\t/g,"    ").replace(/\u00a0/g," ").replace(/\u2424/g,"\n"),this.token(e,!0)},n.prototype.token=function(e,n){var r,s,i,l,o,a,h,p,u,c,g,d,f;for(e=e.replace(/^ +$/gm,"");e;)if((i=this.rules.newline.exec(e))&&(e=e.substring(i[0].length),i[0].length>1&&this.tokens.push({type:"space"})),i=this.rules.code.exec(e))e=e.substring(i[0].length),i=i[0].replace(/^ {4}/gm,""),this.tokens.push({type:"code",text:this.options.pedantic?i:i.replace(/\n+$/,"")});else if(i=this.rules.fences.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"code",lang:i[2],text:i[3]||""});else if(i=this.rules.heading.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"heading",depth:i[1].length,text:i[2]});else if(n&&(i=this.rules.nptable.exec(e))&&(a={type:"table",header:i[1].replace(/^ *| *\| *$/g, "").split(/ *\| */),align:i[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:i[3]?i[3].replace(/\n$/,"").split("\n"):[]}).header.length){for(e=e.substring(i[0].length),p=0;p<a.align.length;p++)/^ *-+: *$/.test(a.align[p])?a.align[p]="right":/^ *:-+: *$/.test(a.align[p])?a.align[p]="center":/^ *:-+ *$/.test(a.align[p])?a.align[p]="left":a.align[p]=null;for(p=0;p<a.cells.length;p++)a.cells[p]=a.cells[p].replace(/^ *\| *| *\| *$/g, "").split(/ *\| */);this.tokens.push(a)}else if(i=this.rules.hr.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"hr"});else if(i=this.rules.blockquote.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"blockquote_start"}),i=i[0].replace(/^ *> ?/gm,""),this.token(i,n),this.tokens.push({type:"blockquote_end"});else if(i=this.rules.list.exec(e)){for(e=e.substring(i[0].length),g=(l=i[2]).length>1,this.tokens.push({type:"list_start",ordered:g,start:g?+l:""}),r=!1,c=(i=i[0].match(this.rules.item)).length,p=0;p<c;p++)h=(a=i[p]).length,~(a=a.replace(/^ *([*+-]|\d+\.) +/,"")).indexOf("\n ")&&(h-=a.length,a=this.options.pedantic?a.replace(/^ {1,4}/gm,""):a.replace(new RegExp("^ {1,"+h+"}","gm"),"")),this.options.smartLists&&p!==c-1&&(l===(o=t.bullet.exec(i[p+1])[0])||l.length>1&&o.length>1||(e=i.slice(p+1).join("\n")+e,p=c-1)),s=r||/\n\n(?!\s*$)/.test(a),p!==c-1&&(r="\n"===a.charAt(a.length-1),s||(s=r)),f=void 0,(d=/^\[[ xX]\] /.test(a))&&(f=" "!==a[1],a=a.replace(/^\[[ xX]\] +/,"")),this.tokens.push({type:s?"loose_item_start":"list_item_start",task:d,checked:f}),this.token(a,!1),this.tokens.push({type:"list_item_end"});this.tokens.push({type:"list_end"})}else if(i=this.rules.html.exec(e))e=e.substring(i[0].length),this.tokens.push({type:this.options.sanitize?"paragraph":"html",pre:!this.options.sanitizer&&("pre"===i[1]||"script"===i[1]||"style"===i[1]),text:i[0]});else if(n&&(i=this.rules.def.exec(e)))e=e.substring(i[0].length),i[3]&&(i[3]=i[3].substring(1,i[3].length-1)),u=i[1].toLowerCase().replace(/\s+/g," "),this.tokens.links[u]||(this.tokens.links[u]={href:i[2],title:i[3]});else if(n&&(i=this.rules.table.exec(e))&&(a={type:"table",header:i[1].replace(/^ *| *\| *$/g, "").split(/ *\| */),align:i[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:i[3]?i[3].replace(/\n$/, "").split("\n"):[]}).header.length){for(e=e.substring(i[0].length),p=0;p<a.align.length;p++)/^ *-+: *$/.test(a.align[p])?a.align[p]="right":/^ *:-+: *$/.test(a.align[p])?a.align[p]="center":/^ *:-+ *$/.test(a.align[p])?a.align[p]="left":a.align[p]=null;for(p=0;p<a.cells.length;p++)a.cells[p]=a.cells[p].replace(/^ *\| *| *\| *$/g, "").split(/ *\| */);this.tokens.push(a)}else if(i=this.rules.lheading.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"heading",depth:"="===i[2]?1:2,text:i[1]});else if(n&&(i=this.rules.paragraph.exec(e)))e=e.substring(i[0].length),this.tokens.push({type:"paragraph",text:"\n"===i[1].charAt(i[1].length-1)?i[1].slice(0,-1):i[1]});else if(i=this.rules.text.exec(e))e=e.substring(i[0].length),this.tokens.push({type:"text",text:i[0]});else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0));return this.tokens};var r={escape:/^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,autolink:/^<(scheme:[^\s\x00-\x1f<>]*|email)>/,url:d,tag:"^comment|^</[a-zA-Z][\\w:-]*\\s*>|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^<![a-zA-Z]+\\s[\\s\\S]*?>|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>",link:/^!?\[(label)\]\(href(?:\s+(title))?\s*\)/,reflink:/^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,nolink:/^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,strong:/^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)|^__([^\s])__(?!_)|^\*\*([^\s])\*\*(?!\*)/,em:/^_([^\s][\s\S]*?[^\s_])_(?!_)|^_([^\s_][\s\S]*?[^\s])_(?!_)|^\*([^\s][\s\S]*?[^\s*])\*(?!\*)|^\*([^\s*][\s\S]*?[^\s])\*(?!\*)|^_([^\s_])_(?!_)|^\*([^\s*])\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`]?)\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:d,text:/^[\s\S]+?(?=[\\<!\[`*]|\b_| {2,}\n|$)/};function s(e,t){if(this.options=t||m.defaults,this.links=e,this.rules=r.normal,this.renderer=this.options.renderer||new i,this.renderer.options=this.options,!this.links)throw new Error("Tokens array requires a `links` property.");this.options.pedantic?this.rules=r.pedantic:this.options.gfm&&(this.options.breaks?this.rules=r.breaks:this.rules=r.gfm)}function i(e){this.options=e||m.defaults}function l(){}function o(e){this.tokens=[],this.token=null,this.options=e||m.defaults,this.options.renderer=this.options.renderer||new i,this.renderer=this.options.renderer,this.renderer.options=this.options}function a(e,t){return e.replace(t?/&/g:/&(?!#?\w+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#39;")}function h(e){return e.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/gi,function(e,t){return"colon"===(t=t.toLowerCase())?":":"#"===t.charAt(0)?"x"===t.charAt(1)?String.fromCharCode(parseInt(t.substring(2),16)):String.fromCharCode(+t.substring(1)):""})}function p(e,t){return e=e.source||e,t=t||"",{replace:function(t,n){return n=(n=n.source||n).replace(/(^|[^\[])\^/g,"$1"),e=e.replace(t,n),this},getRegex:function(){return new RegExp(e,t)}}}function u(e,t){return c[" "+e]||(/^[^:]+:\/*[^/]*$/.test(e)?c[" "+e]=e+"/":c[" "+e]=e.replace(/[^/]*$/,"")),e=c[" "+e],"//"===t.slice(0,2)?e.replace(/:[\s\S]*/,":")+t:"/"===t.charAt(0)?e.replace(/(:\/*[^/]*)[\s\S]*/,"$1")+t:e+t}r._escapes=/\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g,r._scheme=/[a-zA-Z][a-zA-Z0-9+.-]{1,31}/,r._email=/[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/,r.autolink=p(r.autolink).replace("scheme",r._scheme).replace("email",r._email).getRegex(),r._attribute=/\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/,r.tag=p(r.tag).replace("comment",t._comment).replace("attribute",r._attribute).getRegex(),r._label=/(?:\[[^\[\]]*\]|\\[\[\]]?|`[^`]*`|[^\[\]\\])*?/,r._href=/\s*(<(?:\\[<>]?|[^\s<>\\])*>|(?:\\[()]?|\([^\s\x00-\x1f()\\]*\)|[^\s\x00-\x1f()\\])*?)/,r._title=/"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/,r.link=p(r.link).replace("label",r._label).replace("href",r._href).replace("title",r._title).getRegex(),r.reflink=p(r.reflink).replace("label",r._label).getRegex(),r.normal=f({},r),r.pedantic=f({},r.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/,link:p(/^!?\[(label)\]\((.*?)\)/).replace("label",r._label).getRegex(),reflink:p(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace("label",r._label).getRegex()}),r.gfm=f({},r.normal,{escape:p(r.escape).replace("])","~|])").getRegex(),url:p(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/).replace("email",r._email).getRegex(),_backpedal:/(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,del:/^~~(?=\S)([\s\S]*?\S)~~/,text:p(r.text).replace("]|","~]|").replace("|","|https?://|ftp://|www\\.|[a-zA-Z0-9.!#$%&'*+/=?^_`{\\|}~-]+@|").getRegex()}),r.breaks=f({},r.gfm,{br:p(r.br).replace("{2,}","*").getRegex(),text:p(r.gfm.text).replace("{2,}","*").getRegex()}),s.rules=r,s.output=function(e,t,n){return new s(t,n).output(e)},s.prototype.output=function(e){for(var t,n,r,i,l,o="";e;)if(l=this.rules.escape.exec(e))e=e.substring(l[0].length),o+=l[1];else if(l=this.rules.autolink.exec(e))e=e.substring(l[0].length),r="@"===l[2]?"mailto:"+(n=a(this.mangle(l[1]))):n=a(l[1]),o+=this.renderer.link(r,null,n);else if(this.inLink||!(l=this.rules.url.exec(e))){if(l=this.rules.tag.exec(e))!this.inLink&&/^<a /i.test(l[0])?this.inLink=!0:this.inLink&&/^<\/a>/i.test(l[0])&&(this.inLink=!1),e=e.substring(l[0].length),o+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(l[0]):a(l[0]):l[0];else if(l=this.rules.link.exec(e))e=e.substring(l[0].length),this.inLink=!0,r=l[2],this.options.pedantic?(t=/^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(r))?(r=t[1],i=t[3]):i="":i=l[3]?l[3].slice(1,-1):"",r=r.trim().replace(/^<([\s\S]*)>$/,"$1"),o+=this.outputLink(l,{href:s.escapes(r),title:s.escapes(i)}),this.inLink=!1;else if((l=this.rules.reflink.exec(e))||(l=this.rules.nolink.exec(e))){if(e=e.substring(l[0].length),t=(l[2]||l[1]).replace(/\s+/g," "),!(t=this.links[t.toLowerCase()])||!t.href){o+=l[0].charAt(0),e=l[0].substring(1)+e;continue}this.inLink=!0,o+=this.outputLink(l,t),this.inLink=!1}else if(l=this.rules.strong.exec(e))e=e.substring(l[0].length),o+=this.renderer.strong(this.output(l[4]||l[3]||l[2]||l[1]));else if(l=this.rules.em.exec(e))e=e.substring(l[0].length),o+=this.renderer.em(this.output(l[6]||l[5]||l[4]||l[3]||l[2]||l[1]));else if(l=this.rules.code.exec(e))e=e.substring(l[0].length),o+=this.renderer.codespan(a(l[2].trim(),!0));else if(l=this.rules.br.exec(e))e=e.substring(l[0].length),o+=this.renderer.br();else if(l=this.rules.del.exec(e))e=e.substring(l[0].length),o+=this.renderer.del(this.output(l[1]));else if(l=this.rules.text.exec(e))e=e.substring(l[0].length),o+=this.renderer.text(a(this.smartypants(l[0])));else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0))}else l[0]=this.rules._backpedal.exec(l[0])[0],e=e.substring(l[0].length),"@"===l[2]?r="mailto:"+(n=a(l[0])):(n=a(l[0]),r="www."===l[1]?"http://"+n:n),o+=this.renderer.link(r,null,n);return o},s.escapes=function(e){return e?e.replace(s.rules._escapes,"$1"):e},s.prototype.outputLink=function(e,t){var n=t.href,r=t.title?a(t.title):null;return"!"!==e[0].charAt(0)?this.renderer.link(n,r,this.output(e[1])):this.renderer.image(n,r,a(e[1]))},s.prototype.smartypants=function(e){return this.options.smartypants?e.replace(/---/g,"—").replace(/--/g,"–").replace(/(^|[-\u2014/(\[{"\s])'/g,"$1‘").replace(/'/g,"’").replace(/(^|[-\u2014/(\[{\u2018\s])"/g,"$1“").replace(/"/g,"”").replace(/\.{3}/g,"…"):e},s.prototype.mangle=function(e){if(!this.options.mangle)return e;for(var t,n="",r=e.length,s=0;s<r;s++)t=e.charCodeAt(s),Math.random()>.5&&(t="x"+t.toString(16)),n+="&#"+t+";";return n},i.prototype.code=function(e,t,n){if(this.options.highlight){var r=this.options.highlight(e,t);null!=r&&r!==e&&(n=!0,e=r)}return t?'<pre><code class="'+this.options.langPrefix+a(t,!0)+'">'+(n?e:a(e,!0))+"</code></pre>\n":"<pre><code>"+(n?e:a(e,!0))+"</code></pre>"},i.prototype.blockquote=function(e){return"<blockquote>\n"+e+"</blockquote>\n"},i.prototype.html=function(e){return e},i.prototype.heading=function(e,t,n){return this.options.headerIds?"<h"+t+' id="'+this.options.headerPrefix+n.toLowerCase().replace(/[^\w]+/g,"-")+'">'+e+"</h"+t+">\n":"<h"+t+">"+e+"</h"+t+">\n"},i.prototype.hr=function(){return this.options.xhtml?"<hr/>\n":"<hr>\n"},i.prototype.list=function(e,t,n){var r=t?"ol":"ul";return"<"+r+(t&&1!==n?' start="'+n+'"':"")+">\n"+e+"</"+r+">\n"},i.prototype.listitem=function(e){return"<li>"+e+"</li>\n"},i.prototype.checkbox=function(e){return"<input "+(e?'checked="" ':"")+'disabled="" type="checkbox"'+(this.options.xhtml?" /":"")+"> "},i.prototype.paragraph=function(e){return"<p>"+e+"</p>\n"},i.prototype.table=function(e,t){return t&&(t="<tbody>"+t+"</tbody>"),"<table>\n<thead>\n"+e+"</thead>\n"+t+"</table>\n"},i.prototype.tablerow=function(e){return"<tr>\n"+e+"</tr>\n"},i.prototype.tablecell=function(e,t){var n=t.header?"th":"td";return(t.align?"<"+n+' align="'+t.align+'">':"<"+n+">")+e+"</"+n+">\n"},i.prototype.strong=function(e){return"<strong>"+e+"</strong>"},i.prototype.em=function(e){return"<em>"+e+"</em>"},i.prototype.codespan=function(e){return"<code>"+e+"</code>"},i.prototype.br=function(){return this.options.xhtml?"<br/>":"<br>"},i.prototype.del=function(e){return"<del>"+e+"</del>"},i.prototype.link=function(e,t,n){if(this.options.sanitize){try{var r=decodeURIComponent(h(e)).replace(/[^\w:]/g,"").toLowerCase()}catch(e){return n}if(0===r.indexOf("javascript:")||0===r.indexOf("vbscript:")||0===r.indexOf("data:"))return n}this.options.baseUrl&&!g.test(e)&&(e=u(this.options.baseUrl,e));try{e=encodeURI(e).replace(/%25/g,"%")}catch(e){return n}var s='<a href="'+a(e)+'"';return t&&(s+=' title="'+t+'"'),s+=">"+n+"</a>"},i.prototype.image=function(e,t,n){this.options.baseUrl&&!g.test(e)&&(e=u(this.options.baseUrl,e));var r='<img src="'+e+'" alt="'+n+'"';return t&&(r+=' title="'+t+'"'),r+=this.options.xhtml?"/>":">"},i.prototype.text=function(e){return e},l.prototype.strong=l.prototype.em=l.prototype.codespan=l.prototype.del=l.prototype.text=function(e){return e},l.prototype.link=l.prototype.image=function(e,t,n){return""+n},l.prototype.br=function(){return""},o.parse=function(e,t){return new o(t).parse(e)},o.prototype.parse=function(e){this.inline=new s(e.links,this.options),this.inlineText=new s(e.links,f({},this.options,{renderer:new l})),this.tokens=e.reverse();for(var t="";this.next();)t+=this.tok();return t},o.prototype.next=function(){return this.token=this.tokens.pop()},o.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0},o.prototype.parseText=function(){for(var e=this.token.text;"text"===this.peek().type;)e+="\n"+this.next().text;return this.inline.output(e)},o.prototype.tok=function(){switch(this.token.type){case"space":return"";case"hr":return this.renderer.hr();case"heading":return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,h(this.inlineText.output(this.token.text)));case"code":return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);case"table":var e,t,n,r,s="",i="";for(n="",e=0;e<this.token.header.length;e++)n+=this.renderer.tablecell(this.inline.output(this.token.header[e]),{header:!0,align:this.token.align[e]});for(s+=this.renderer.tablerow(n),e=0;e<this.token.cells.length;e++){for(t=this.token.cells[e],n="",r=0;r<t.length;r++)n+=this.renderer.tablecell(this.inline.output(t[r]),{header:!1,align:this.token.align[r]});i+=this.renderer.tablerow(n)}return this.renderer.table(s,i);case"blockquote_start":for(i="";"blockquote_end"!==this.next().type;)i+=this.tok();return this.renderer.blockquote(i);case"list_start":i="";for(var l=this.token.ordered,o=this.token.start;"list_end"!==this.next().type;)i+=this.tok();return this.renderer.list(i,l,o);case"list_item_start":for(i="",this.token.task&&(i+=this.renderer.checkbox(this.token.checked));"list_item_end"!==this.next().type;)i+="text"===this.token.type?this.parseText():this.tok();return this.renderer.listitem(i);case"loose_item_start":for(i="";"list_item_end"!==this.next().type;)i+=this.tok();return this.renderer.listitem(i);case"html":return this.renderer.html(this.token.text);case"paragraph":return this.renderer.paragraph(this.inline.output(this.token.text));case"text":return this.renderer.paragraph(this.parseText())}};var c={},g=/^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;function d(){}function f(e){for(var t,n,r=1;r<arguments.length;r++)for(n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}function b(e,t){var n=e.replace(/([^\\])\|/g,"$1 |").split(/ +\| */),r=0;if(n.length>t)n.splice(t);else for(;n.length<t;)n.push("");for(;r<n.length;r++)n[r]=n[r].replace(/\\\|/g,"|");return n}function m(e,t,r){if(null==e)throw new Error("marked(): input parameter is undefined or null");/*if("string"!=typeof e)throw new Error("marked(): input parameter is of type "+Object.prototype.toString.call(e)+", string expected");*/if(r||"function"==typeof t){r||(r=t,t=null);var s,i,l=(t=f({},m.defaults,t||{})).highlight,h=0;try{s=n.lex(e,t)}catch(e){return r(e)}i=s.length;var p=function(e){if(e)return t.highlight=l,r(e);var n;try{n=o.parse(s,t)}catch(t){e=t}return t.highlight=l,e?r(e):r(null,n)};if(!l||l.length<3)return p();if(delete t.highlight,!i)return p();for(;h<s.length;h++)!function(e){"code"!==e.type?--i||p():l(e.text,e.lang,function(t,n){return t?p(t):null==n||n===e.text?--i||p():(e.text=n,e.escaped=!0,void(--i||p()))})}(s[h])}else try{return t&&(t=f({},m.defaults,t)),o.parse(n.lex(e,t),t)}catch(e){if(e.message+="\nPlease report this to https://github.com/markedjs/marked.",(t||m.defaults).silent)return"<p>An error occurred:</p><pre>"+a(e.message+"",!0)+"</pre>";throw e}}d.exec=d,m.options=m.setOptions=function(e){return f(m.defaults,e),m},m.getDefaults=function(){return{baseUrl:null,breaks:!1,gfm:!0,headerIds:!0,headerPrefix:"",highlight:null,langPrefix:"language-",mangle:!0,pedantic:!1,renderer:new i,sanitize:!1,sanitizer:null,silent:!1,smartLists:!1,smartypants:!1,tables:!0,xhtml:!1}},m.defaults=m.getDefaults(),m.Parser=o,m.parser=o.parse,m.Renderer=i,m.TextRenderer=l,m.Lexer=n,m.lexer=n.lex,m.InlineLexer=s,m.inlineLexer=s.output,m.parse=m,"undefined"!=typeof module&&"object"==typeof exports?module.exports=m:"function"==typeof define&&define.amd?define(function(){return m}):e.marked=m}(this||("undefined"!=typeof window?window:global));
+!function (e) { "use strict"; var t = { newline: /^\n+/, code: /^( {4}[^\n]+\n*)+/, fences: d, hr: /^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/, heading: /^ *(#{1,6})*([^\n]+?) *(?:#+ *)?(?:\n+|$)/, nptable: d, blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/, list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/, html: "^ {0,3}(?:<(script|pre|style)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?\\?>\\n*|<![A-Z][\\s\\S]*?>\\n*|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>\\n*|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:\\n{2,}|$)|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$)|</(?!script|pre|style)[a-z][\\w-]*\\s*>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$))", def: /^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/, table: d, lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/, paragraph: /^([^\n]+(?:\n(?!hr|heading|lheading| {0,3}>|<\/?(?:tag)(?: +|\n|\/?>)|<(?:script|pre|style|!--))[^\n]+)*)/, text: /^[^\n]+/ }; function n(e) { this.tokens = [], this.tokens.links = {}, this.options = e || m.defaults, this.rules = t.normal, this.options.pedantic ? this.rules = t.pedantic : this.options.gfm && (this.options.tables ? this.rules = t.tables : this.rules = t.gfm) } t._label = /(?!\s*\])(?:\\[\[\]]|[^\[\]])+/, t._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/, t.def = p(t.def).replace("label", t._label).replace("title", t._title).getRegex(), t.bullet = /(?:[*+-]|\d+\.)/, t.item = /^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/, t.item = p(t.item, "gm").replace(/bull/g, t.bullet).getRegex(), t.list = p(t.list).replace(/bull/g, t.bullet).replace("hr", "\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))").replace("def", "\\n+(?=" + t.def.source + ")").getRegex(), t._tag = "address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul", t._comment = /<!--(?!-?>)[\s\S]*?-->/, t.html = p(t.html, "i").replace("comment", t._comment).replace("tag", t._tag).replace("attribute", / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(), t.paragraph = p(t.paragraph).replace("hr", t.hr).replace("heading", t.heading).replace("lheading", t.lheading).replace("tag", t._tag).getRegex(), t.blockquote = p(t.blockquote).replace("paragraph", t.paragraph).getRegex(), t.normal = f({}, t), t.gfm = f({}, t.normal, { fences: /^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\n? *\1 *(?:\n+|$)/, paragraph: /^/, heading: /^ *(#{1,6})+([^\n]+?) *#* *(?:\n+|$)/ }), t.gfm.paragraph = p(t.paragraph).replace("(?!", "(?!" + t.gfm.fences.source.replace("\\1", "\\2") + "|" + t.list.source.replace("\\1", "\\3") + "|").getRegex(), t.tables = f({}, t.gfm, { nptable: /^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/, table: /^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/ }), t.pedantic = f({}, t.normal, { html: p("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)|<tag(?:\"[^\"]*\"|'[^']*'|\\s[^'\"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))").replace("comment", t._comment).replace(/tag/g, "(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(), def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/ }), n.rules = t, n.lex = function (e, t) { return new n(t).lex(e) }, n.prototype.lex = function (e) { return e = e.replace(/\r\n|\r/g, "\n").replace(/\t/g, "    ").replace(/\u00a0/g, " ").replace(/\u2424/g, "\n"), this.token(e, !0) }, n.prototype.token = function (e, n) { var r, s, i, l, o, a, h, p, u, c, g, d, f; for (e = e.replace(/^ +$/gm, ""); e;)if ((i = this.rules.newline.exec(e)) && (e = e.substring(i[0].length), i[0].length > 1 && this.tokens.push({ type: "space" })), i = this.rules.code.exec(e)) e = e.substring(i[0].length), i = i[0].replace(/^ {4}/gm, ""), this.tokens.push({ type: "code", text: this.options.pedantic ? i : i.replace(/\n+$/, "") }); else if (i = this.rules.fences.exec(e)) e = e.substring(i[0].length), this.tokens.push({ type: "code", lang: i[2], text: i[3] || "" }); else if (i = this.rules.heading.exec(e)) e = e.substring(i[0].length), this.tokens.push({ type: "heading", depth: i[1].length, text: i[2] }); else if (n && (i = this.rules.nptable.exec(e)) && (a = { type: "table", header: i[1].replace(/^ *| *\| *$/g, "").split(/ *\| */), align: i[2].replace(/^ *|\| *$/g, "").split(/ *\| */), cells: i[3] ? i[3].replace(/\n$/, "").split("\n") : [] }).header.length) { for (e = e.substring(i[0].length), p = 0; p < a.align.length; p++)/^ *-+: *$/.test(a.align[p]) ? a.align[p] = "right" : /^ *:-+: *$/.test(a.align[p]) ? a.align[p] = "center" : /^ *:-+ *$/.test(a.align[p]) ? a.align[p] = "left" : a.align[p] = null; for (p = 0; p < a.cells.length; p++)a.cells[p] = a.cells[p].replace(/^ *\| *| *\| *$/g, "").split(/ *\| */); this.tokens.push(a) } else if (i = this.rules.hr.exec(e)) e = e.substring(i[0].length), this.tokens.push({ type: "hr" }); else if (i = this.rules.blockquote.exec(e)) e = e.substring(i[0].length), this.tokens.push({ type: "blockquote_start" }), i = i[0].replace(/^ *> ?/gm, ""), this.token(i, n), this.tokens.push({ type: "blockquote_end" }); else if (i = this.rules.list.exec(e)) { for (e = e.substring(i[0].length), g = (l = i[2]).length > 1, this.tokens.push({ type: "list_start", ordered: g, start: g ? +l : "" }), r = !1, c = (i = i[0].match(this.rules.item)).length, p = 0; p < c; p++)h = (a = i[p]).length, ~(a = a.replace(/^ *([*+-]|\d+\.) +/, "")).indexOf("\n ") && (h -= a.length, a = this.options.pedantic ? a.replace(/^ {1,4}/gm, "") : a.replace(new RegExp("^ {1," + h + "}", "gm"), "")), this.options.smartLists && p !== c - 1 && (l === (o = t.bullet.exec(i[p + 1])[0]) || l.length > 1 && o.length > 1 || (e = i.slice(p + 1).join("\n") + e, p = c - 1)), s = r || /\n\n(?!\s*$)/.test(a), p !== c - 1 && (r = "\n" === a.charAt(a.length - 1), s || (s = r)), f = void 0, (d = /^\[[ xX]\] /.test(a)) && (f = " " !== a[1], a = a.replace(/^\[[ xX]\] +/, "")), this.tokens.push({ type: s ? "loose_item_start" : "list_item_start", task: d, checked: f }), this.token(a, !1), this.tokens.push({ type: "list_item_end" }); this.tokens.push({ type: "list_end" }) } else if (i = this.rules.html.exec(e)) e = e.substring(i[0].length), this.tokens.push({ type: this.options.sanitize ? "paragraph" : "html", pre: !this.options.sanitizer && ("pre" === i[1] || "script" === i[1] || "style" === i[1]), text: i[0] }); else if (n && (i = this.rules.def.exec(e))) e = e.substring(i[0].length), i[3] && (i[3] = i[3].substring(1, i[3].length - 1)), u = i[1].toLowerCase().replace(/\s+/g, " "), this.tokens.links[u] || (this.tokens.links[u] = { href: i[2], title: i[3] }); else if (n && (i = this.rules.table.exec(e)) && (a = { type: "table", header: i[1].replace(/^ *| *\| *$/g, "").split(/ *\| */), align: i[2].replace(/^ *|\| *$/g, "").split(/ *\| */), cells: i[3] ? i[3].replace(/\n$/, "").split("\n") : [] }).header.length) { for (e = e.substring(i[0].length), p = 0; p < a.align.length; p++)/^ *-+: *$/.test(a.align[p]) ? a.align[p] = "right" : /^ *:-+: *$/.test(a.align[p]) ? a.align[p] = "center" : /^ *:-+ *$/.test(a.align[p]) ? a.align[p] = "left" : a.align[p] = null; for (p = 0; p < a.cells.length; p++)a.cells[p] = a.cells[p].replace(/^ *\| *| *\| *$/g, "").split(/ *\| */); this.tokens.push(a) } else if (i = this.rules.lheading.exec(e)) e = e.substring(i[0].length), this.tokens.push({ type: "heading", depth: "=" === i[2] ? 1 : 2, text: i[1] }); else if (n && (i = this.rules.paragraph.exec(e))) e = e.substring(i[0].length), this.tokens.push({ type: "paragraph", text: "\n" === i[1].charAt(i[1].length - 1) ? i[1].slice(0, -1) : i[1] }); else if (i = this.rules.text.exec(e)) e = e.substring(i[0].length), this.tokens.push({ type: "text", text: i[0] }); else if (e) throw new Error("Infinite loop on byte: " + e.charCodeAt(0)); return this.tokens }; var r = { escape: /^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/, autolink: /^<(scheme:[^\s\x00-\x1f<>]*|email)>/, url: d, tag: "^comment|^</[a-zA-Z][\\w:-]*\\s*>|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^<![a-zA-Z]+\\s[\\s\\S]*?>|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>", link: /^!?\[(label)\]\(href(?:\s+(title))?\s*\)/, reflink: /^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/, nolink: /^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/, strong: /^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)|^__([^\s])__(?!_)|^\*\*([^\s])\*\*(?!\*)/, em: /^_([^\s][\s\S]*?[^\s_])_(?!_)|^_([^\s_][\s\S]*?[^\s])_(?!_)|^\*([^\s][\s\S]*?[^\s*])\*(?!\*)|^\*([^\s*][\s\S]*?[^\s])\*(?!\*)|^_([^\s_])_(?!_)|^\*([^\s*])\*(?!\*)/, code: /^(`+)\s*([\s\S]*?[^`]?)\s*\1(?!`)/, br: /^ {2,}\n(?!\s*$)/, del: d, text: /^[\s\S]+?(?=[\\<!\[`*]|\b_| {2,}\n|$)/ }; function s(e, t) { if (this.options = t || m.defaults, this.links = e, this.rules = r.normal, this.renderer = this.options.renderer || new i, this.renderer.options = this.options, !this.links) throw new Error("Tokens array requires a `links` property."); this.options.pedantic ? this.rules = r.pedantic : this.options.gfm && (this.options.breaks ? this.rules = r.breaks : this.rules = r.gfm) } function i(e) { this.options = e || m.defaults } function l() { } function o(e) { this.tokens = [], this.token = null, this.options = e || m.defaults, this.options.renderer = this.options.renderer || new i, this.renderer = this.options.renderer, this.renderer.options = this.options } function a(e, t) { return e.replace(t ? /&/g : /&(?!#?\w+;)/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;") } function h(e) { return e.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/gi, function (e, t) { return "colon" === (t = t.toLowerCase()) ? ":" : "#" === t.charAt(0) ? "x" === t.charAt(1) ? String.fromCharCode(parseInt(t.substring(2), 16)) : String.fromCharCode(+t.substring(1)) : "" }) } function p(e, t) { return e = e.source || e, t = t || "", { replace: function (t, n) { return n = (n = n.source || n).replace(/(^|[^\[])\^/g, "$1"), e = e.replace(t, n), this }, getRegex: function () { return new RegExp(e, t) } } } function u(e, t) { return c[" " + e] || (/^[^:]+:\/*[^/]*$/.test(e) ? c[" " + e] = e + "/" : c[" " + e] = e.replace(/[^/]*$/, "")), e = c[" " + e], "//" === t.slice(0, 2) ? e.replace(/:[\s\S]*/, ":") + t : "/" === t.charAt(0) ? e.replace(/(:\/*[^/]*)[\s\S]*/, "$1") + t : e + t } r._escapes = /\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g, r._scheme = /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/, r._email = /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/, r.autolink = p(r.autolink).replace("scheme", r._scheme).replace("email", r._email).getRegex(), r._attribute = /\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/, r.tag = p(r.tag).replace("comment", t._comment).replace("attribute", r._attribute).getRegex(), r._label = /(?:\[[^\[\]]*\]|\\[\[\]]?|`[^`]*`|[^\[\]\\])*?/, r._href = /\s*(<(?:\\[<>]?|[^\s<>\\])*>|(?:\\[()]?|\([^\s\x00-\x1f()\\]*\)|[^\s\x00-\x1f()\\])*?)/, r._title = /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/, r.link = p(r.link).replace("label", r._label).replace("href", r._href).replace("title", r._title).getRegex(), r.reflink = p(r.reflink).replace("label", r._label).getRegex(), r.normal = f({}, r), r.pedantic = f({}, r.normal, { strong: /^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/, em: /^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/, link: p(/^!?\[(label)\]\((.*?)\)/).replace("label", r._label).getRegex(), reflink: p(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace("label", r._label).getRegex() }), r.gfm = f({}, r.normal, { escape: p(r.escape).replace("])", "~|])").getRegex(), url: p(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/).replace("email", r._email).getRegex(), _backpedal: /(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/, del: /^~~(?=\S)([\s\S]*?\S)~~/, text: p(r.text).replace("]|", "~]|").replace("|", "|https?://|ftp://|www\\.|[a-zA-Z0-9.!#$%&'*+/=?^_`{\\|}~-]+@|").getRegex() }), r.breaks = f({}, r.gfm, { br: p(r.br).replace("{2,}", "*").getRegex(), text: p(r.gfm.text).replace("{2,}", "*").getRegex() }), s.rules = r, s.output = function (e, t, n) { return new s(t, n).output(e) }, s.prototype.output = function (e) { for (var t, n, r, i, l, o = ""; e;)if (l = this.rules.escape.exec(e)) e = e.substring(l[0].length), o += l[1]; else if (l = this.rules.autolink.exec(e)) e = e.substring(l[0].length), r = "@" === l[2] ? "mailto:" + (n = a(this.mangle(l[1]))) : n = a(l[1]), o += this.renderer.link(r, null, n); else if (this.inLink || !(l = this.rules.url.exec(e))) { if (l = this.rules.tag.exec(e)) !this.inLink && /^<a /i.test(l[0]) ? this.inLink = !0 : this.inLink && /^<\/a>/i.test(l[0]) && (this.inLink = !1), e = e.substring(l[0].length), o += this.options.sanitize ? this.options.sanitizer ? this.options.sanitizer(l[0]) : a(l[0]) : l[0]; else if (l = this.rules.link.exec(e)) e = e.substring(l[0].length), this.inLink = !0, r = l[2], this.options.pedantic ? (t = /^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(r)) ? (r = t[1], i = t[3]) : i = "" : i = l[3] ? l[3].slice(1, -1) : "", r = r.trim().replace(/^<([\s\S]*)>$/, "$1"), o += this.outputLink(l, { href: s.escapes(r), title: s.escapes(i) }), this.inLink = !1; else if ((l = this.rules.reflink.exec(e)) || (l = this.rules.nolink.exec(e))) { if (e = e.substring(l[0].length), t = (l[2] || l[1]).replace(/\s+/g, " "), !(t = this.links[t.toLowerCase()]) || !t.href) { o += l[0].charAt(0), e = l[0].substring(1) + e; continue } this.inLink = !0, o += this.outputLink(l, t), this.inLink = !1 } else if (l = this.rules.strong.exec(e)) e = e.substring(l[0].length), o += this.renderer.strong(this.output(l[4] || l[3] || l[2] || l[1])); else if (l = this.rules.em.exec(e)) e = e.substring(l[0].length), o += this.renderer.em(this.output(l[6] || l[5] || l[4] || l[3] || l[2] || l[1])); else if (l = this.rules.code.exec(e)) e = e.substring(l[0].length), o += this.renderer.codespan(a(l[2].trim(), !0)); else if (l = this.rules.br.exec(e)) e = e.substring(l[0].length), o += this.renderer.br(); else if (l = this.rules.del.exec(e)) e = e.substring(l[0].length), o += this.renderer.del(this.output(l[1])); else if (l = this.rules.text.exec(e)) e = e.substring(l[0].length), o += this.renderer.text(a(this.smartypants(l[0]))); else if (e) throw new Error("Infinite loop on byte: " + e.charCodeAt(0)) } else l[0] = this.rules._backpedal.exec(l[0])[0], e = e.substring(l[0].length), "@" === l[2] ? r = "mailto:" + (n = a(l[0])) : (n = a(l[0]), r = "www." === l[1] ? "http://" + n : n), o += this.renderer.link(r, null, n); return o }, s.escapes = function (e) { return e ? e.replace(s.rules._escapes, "$1") : e }, s.prototype.outputLink = function (e, t) { var n = t.href, r = t.title ? a(t.title) : null; return "!" !== e[0].charAt(0) ? this.renderer.link(n, r, this.output(e[1])) : this.renderer.image(n, r, a(e[1])) }, s.prototype.smartypants = function (e) { return this.options.smartypants ? e.replace(/---/g, "—").replace(/--/g, "–").replace(/(^|[-\u2014/(\[{"\s])'/g, "$1‘").replace(/'/g, "’").replace(/(^|[-\u2014/(\[{\u2018\s])"/g, "$1“").replace(/"/g, "”").replace(/\.{3}/g, "…") : e }, s.prototype.mangle = function (e) { if (!this.options.mangle) return e; for (var t, n = "", r = e.length, s = 0; s < r; s++)t = e.charCodeAt(s), Math.random() > .5 && (t = "x" + t.toString(16)), n += "&#" + t + ";"; return n }, i.prototype.code = function (e, t, n) { if (this.options.highlight) { var r = this.options.highlight(e, t); null != r && r !== e && (n = !0, e = r) } return t ? '<pre><code class="' + this.options.langPrefix + a(t, !0) + '">' + (n ? e : a(e, !0)) + "</code></pre>\n" : "<pre><code>" + (n ? e : a(e, !0)) + "</code></pre>" }, i.prototype.blockquote = function (e) { return "<blockquote>\n" + e + "</blockquote>\n" }, i.prototype.html = function (e) { return e }, i.prototype.heading = function (e, t, n) { return this.options.headerIds ? "<h" + t + ' id="' + this.options.headerPrefix + n.toLowerCase().replace(/[^\w]+/g, "-") + '">' + e + "</h" + t + ">\n" : "<h" + t + ">" + e + "</h" + t + ">\n" }, i.prototype.hr = function () { return this.options.xhtml ? "<hr/>\n" : "<hr>\n" }, i.prototype.list = function (e, t, n) { var r = t ? "ol" : "ul"; return "<" + r + (t && 1 !== n ? ' start="' + n + '"' : "") + ">\n" + e + "</" + r + ">\n" }, i.prototype.listitem = function (e) { return "<li>" + e + "</li>\n" }, i.prototype.checkbox = function (e) { return "<input " + (e ? 'checked="" ' : "") + 'disabled="" type="checkbox"' + (this.options.xhtml ? " /" : "") + "> " }, i.prototype.paragraph = function (e) { return "<p>" + e + "</p>\n" }, i.prototype.table = function (e, t) { return t && (t = "<tbody>" + t + "</tbody>"), "<table>\n<thead>\n" + e + "</thead>\n" + t + "</table>\n" }, i.prototype.tablerow = function (e) { return "<tr>\n" + e + "</tr>\n" }, i.prototype.tablecell = function (e, t) { var n = t.header ? "th" : "td"; return (t.align ? "<" + n + ' align="' + t.align + '">' : "<" + n + ">") + e + "</" + n + ">\n" }, i.prototype.strong = function (e) { return "<strong>" + e + "</strong>" }, i.prototype.em = function (e) { return "<em>" + e + "</em>" }, i.prototype.codespan = function (e) { return "<code>" + e + "</code>" }, i.prototype.br = function () { return this.options.xhtml ? "<br/>" : "<br>" }, i.prototype.del = function (e) { return "<del>" + e + "</del>" }, i.prototype.link = function (e, t, n) { if (this.options.sanitize) { try { var r = decodeURIComponent(h(e)).replace(/[^\w:]/g, "").toLowerCase() } catch (e) { return n } if (0 === r.indexOf("javascript:") || 0 === r.indexOf("vbscript:") || 0 === r.indexOf("data:")) return n } this.options.baseUrl && !g.test(e) && (e = u(this.options.baseUrl, e)); try { e = encodeURI(e).replace(/%25/g, "%") } catch (e) { return n } var s = '<a href="' + a(e) + '"'; return t && (s += ' title="' + t + '"'), s += ">" + n + "</a>" }, i.prototype.image = function (e, t, n) { this.options.baseUrl && !g.test(e) && (e = u(this.options.baseUrl, e)); var r = '<img src="' + e + '" alt="' + n + '"'; return t && (r += ' title="' + t + '"'), r += this.options.xhtml ? "/>" : ">" }, i.prototype.text = function (e) { return e }, l.prototype.strong = l.prototype.em = l.prototype.codespan = l.prototype.del = l.prototype.text = function (e) { return e }, l.prototype.link = l.prototype.image = function (e, t, n) { return "" + n }, l.prototype.br = function () { return "" }, o.parse = function (e, t) { return new o(t).parse(e) }, o.prototype.parse = function (e) { this.inline = new s(e.links, this.options), this.inlineText = new s(e.links, f({}, this.options, { renderer: new l })), this.tokens = e.reverse(); for (var t = ""; this.next();)t += this.tok(); return t }, o.prototype.next = function () { return this.token = this.tokens.pop() }, o.prototype.peek = function () { return this.tokens[this.tokens.length - 1] || 0 }, o.prototype.parseText = function () { for (var e = this.token.text; "text" === this.peek().type;)e += "\n" + this.next().text; return this.inline.output(e) }, o.prototype.tok = function () { switch (this.token.type) { case "space": return ""; case "hr": return this.renderer.hr(); case "heading": return this.renderer.heading(this.inline.output(this.token.text), this.token.depth, h(this.inlineText.output(this.token.text))); case "code": return this.renderer.code(this.token.text, this.token.lang, this.token.escaped); case "table": var e, t, n, r, s = "", i = ""; for (n = "", e = 0; e < this.token.header.length; e++)n += this.renderer.tablecell(this.inline.output(this.token.header[e]), { header: !0, align: this.token.align[e] }); for (s += this.renderer.tablerow(n), e = 0; e < this.token.cells.length; e++) { for (t = this.token.cells[e], n = "", r = 0; r < t.length; r++)n += this.renderer.tablecell(this.inline.output(t[r]), { header: !1, align: this.token.align[r] }); i += this.renderer.tablerow(n) } return this.renderer.table(s, i); case "blockquote_start": for (i = ""; "blockquote_end" !== this.next().type;)i += this.tok(); return this.renderer.blockquote(i); case "list_start": i = ""; for (var l = this.token.ordered, o = this.token.start; "list_end" !== this.next().type;)i += this.tok(); return this.renderer.list(i, l, o); case "list_item_start": for (i = "", this.token.task && (i += this.renderer.checkbox(this.token.checked)); "list_item_end" !== this.next().type;)i += "text" === this.token.type ? this.parseText() : this.tok(); return this.renderer.listitem(i); case "loose_item_start": for (i = ""; "list_item_end" !== this.next().type;)i += this.tok(); return this.renderer.listitem(i); case "html": return this.renderer.html(this.token.text); case "paragraph": return this.renderer.paragraph(this.inline.output(this.token.text)); case "text": return this.renderer.paragraph(this.parseText()) } }; var c = {}, g = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i; function d() { } function f(e) { for (var t, n, r = 1; r < arguments.length; r++)for (n in t = arguments[r]) Object.prototype.hasOwnProperty.call(t, n) && (e[n] = t[n]); return e } function b(e, t) { var n = e.replace(/([^\\])\|/g, "$1 |").split(/ +\| */), r = 0; if (n.length > t) n.splice(t); else for (; n.length < t;)n.push(""); for (; r < n.length; r++)n[r] = n[r].replace(/\\\|/g, "|"); return n } function m(e, t, r) { if (null == e) throw new Error("marked(): input parameter is undefined or null");/*if("string"!=typeof e)throw new Error("marked(): input parameter is of type "+Object.prototype.toString.call(e)+", string expected");*/if (r || "function" == typeof t) { r || (r = t, t = null); var s, i, l = (t = f({}, m.defaults, t || {})).highlight, h = 0; try { s = n.lex(e, t) } catch (e) { return r(e) } i = s.length; var p = function (e) { if (e) return t.highlight = l, r(e); var n; try { n = o.parse(s, t) } catch (t) { e = t } return t.highlight = l, e ? r(e) : r(null, n) }; if (!l || l.length < 3) return p(); if (delete t.highlight, !i) return p(); for (; h < s.length; h++)!function (e) { "code" !== e.type ? --i || p() : l(e.text, e.lang, function (t, n) { return t ? p(t) : null == n || n === e.text ? --i || p() : (e.text = n, e.escaped = !0, void (--i || p())) }) }(s[h]) } else try { return t && (t = f({}, m.defaults, t)), o.parse(n.lex(e, t), t) } catch (e) { if (e.message += "\nPlease report this to https://github.com/markedjs/marked.", (t || m.defaults).silent) return "<p>An error occurred:</p><pre>" + a(e.message + "", !0) + "</pre>"; throw e } } d.exec = d, m.options = m.setOptions = function (e) { return f(m.defaults, e), m }, m.getDefaults = function () { return { baseUrl: null, breaks: !1, gfm: !0, headerIds: !0, headerPrefix: "", highlight: null, langPrefix: "language-", mangle: !0, pedantic: !1, renderer: new i, sanitize: !1, sanitizer: null, silent: !1, smartLists: !1, smartypants: !1, tables: !0, xhtml: !1 } }, m.defaults = m.getDefaults(), m.Parser = o, m.parser = o.parse, m.Renderer = i, m.TextRenderer = l, m.Lexer = n, m.lexer = n.lex, m.InlineLexer = s, m.inlineLexer = s.output, m.parse = m, "undefined" != typeof module && "object" == typeof exports ? module.exports = m : "function" == typeof define && define.amd ? define(function () { return m }) : e.marked = m }(this || ("undefined" != typeof window ? window : global));
 // Copyright (C) 2006 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,7 +42,7 @@ h(Math,"acosh",Cr.acosh,Math.acosh(Number.MAX_VALUE)===Infinity);h(Math,"acosh",
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-var IN_GLOBAL_SCOPE=true;window["PR_SHOULD_USE_CONTINUATION"]=true;var prettyPrintOne;var prettyPrint;(function(){var P=window;var i=["break,continue,do,else,for,if,return,while"];var u=[i,"auto,case,char,const,default,"+"double,enum,extern,float,goto,inline,int,long,register,short,signed,"+"sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var p=[u,"catch,class,delete,false,import,"+"new,operator,private,protected,public,this,throw,true,try,typeof"];var l=[p,"alignof,align_union,asm,axiom,bool,"+"concept,concept_map,const_cast,constexpr,decltype,delegate,"+"dynamic_cast,explicit,export,friend,generic,late_check,"+"mutable,namespace,nullptr,property,reinterpret_cast,static_assert,"+"static_cast,template,typeid,typename,using,virtual,where"];var y=[p,"abstract,assert,boolean,byte,extends,final,finally,implements,import,"+"instanceof,interface,null,native,package,strictfp,super,synchronized,"+"throws,transient"];var U=[y,"as,base,by,checked,decimal,delegate,descending,dynamic,event,"+"fixed,foreach,from,group,implicit,in,internal,into,is,let,"+"lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,"+"sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,"+"var,virtual,where"];var r="all,and,by,catch,class,else,extends,false,finally,"+"for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,"+"throw,true,try,unless,until,when,while,yes";var x=[p,"debugger,eval,export,function,get,null,set,undefined,var,with,"+"Infinity,NaN"];var s="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,"+"goto,if,import,last,local,my,next,no,our,print,package,redo,require,"+"sub,undef,unless,until,use,wantarray,while,BEGIN,END";var K=[i,"and,as,assert,class,def,del,"+"elif,except,exec,finally,from,global,import,in,is,lambda,"+"nonlocal,not,or,pass,print,raise,try,with,yield,"+"False,True,None"];var g=[i,"alias,and,begin,case,class,"+"def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,"+"rescue,retry,self,super,then,true,undef,unless,until,when,yield,"+"BEGIN,END"];var z=[i,"as,assert,const,copy,drop,"+"enum,extern,fail,false,fn,impl,let,log,loop,match,mod,move,mut,priv,"+"pub,pure,ref,self,static,struct,true,trait,type,unsafe,use"];var J=[i,"case,done,elif,esac,eval,fi,"+"function,in,local,set,then,until"];var C=[l,U,x,s,K,g,J];var e=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/;var E="str";var B="kwd";var j="com";var R="typ";var I="lit";var N="pun";var H="pln";var m="tag";var G="dec";var L="src";var S="atn";var n="atv";var Q="nocode";var O="(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<<?=?|>>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function k(ac){var ag=0;var V=false;var af=false;for(var Y=0,X=ac.length;Y<X;++Y){var ah=ac[Y];if(ah.ignoreCase){af=true}else{if(/[a-z]/i.test(ah.source.replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi,""))){V=true;af=false;break}}}var ab={"b":8,"t":9,"n":10,"v":11,"f":12,"r":13};function ae(ak){var aj=ak.charCodeAt(0);if(aj!==92){return aj}var ai=ak.charAt(1);aj=ab[ai];if(aj){return aj}else{if("0"<=ai&&ai<="7"){return parseInt(ak.substring(1),8)}else{if(ai==="u"||ai==="x"){return parseInt(ak.substring(2),16)}else{return ak.charCodeAt(1)}}}}function W(ai){if(ai<32){return(ai<16?"\\x0":"\\x")+ai.toString(16)}var aj=String.fromCharCode(ai);return(aj==="\\"||aj==="-"||aj==="]"||aj==="^")?"\\"+aj:aj}function aa(ao){var at=ao.substring(1,ao.length-1).match(new RegExp("\\\\u[0-9A-Fa-f]{4}"+"|\\\\x[0-9A-Fa-f]{2}"+"|\\\\[0-3][0-7]{0,2}"+"|\\\\[0-7]{1,2}"+"|\\\\[\\s\\S]"+"|-"+"|[^-\\\\]","g"));var ai=[];var aq=at[0]==="^";var ap=["["];if(aq){ap.push("^")}for(var au=aq?1:0,am=at.length;au<am;++au){var ak=at[au];if(/\\[bdsw]/i.test(ak)){ap.push(ak)}else{var aj=ae(ak);var an;if(au+2<am&&"-"===at[au+1]){an=ae(at[au+2]);au+=2}else{an=aj}ai.push([aj,an]);if(!(an<65||aj>122)){if(!(an<65||aj>90)){ai.push([Math.max(65,aj)|32,Math.min(an,90)|32])}if(!(an<97||aj>122)){ai.push([Math.max(97,aj)&~32,Math.min(an,122)&~32])}}}}ai.sort(function(ax,aw){return(ax[0]-aw[0])||(aw[1]-ax[1])});var al=[];var ar=[];for(var au=0;au<ai.length;++au){var av=ai[au];if(av[0]<=ar[1]+1){ar[1]=Math.max(ar[1],av[1])}else{al.push(ar=av)}}for(var au=0;au<al.length;++au){var av=al[au];ap.push(W(av[0]));if(av[1]>av[0]){if(av[1]+1>av[0]){ap.push("-")}ap.push(W(av[1]))}}ap.push("]");return ap.join("")}function Z(ao){var am=ao.source.match(new RegExp("(?:"+"\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]"+"|\\\\u[A-Fa-f0-9]{4}"+"|\\\\x[A-Fa-f0-9]{2}"+"|\\\\[0-9]+"+"|\\\\[^ux0-9]"+"|\\(\\?[:!=]"+"|[\\(\\)\\^]"+"|[^\\x5B\\x5C\\(\\)\\^]+"+")","g"));var ak=am.length;var aq=[];for(var an=0,ap=0;an<ak;++an){var aj=am[an];if(aj==="("){++ap}else{if("\\"===aj.charAt(0)){var ai=+aj.substring(1);if(ai){if(ai<=ap){aq[ai]=-1}else{am[an]=W(ai)}}}}}for(var an=1;an<aq.length;++an){if(-1===aq[an]){aq[an]=++ag}}for(var an=0,ap=0;an<ak;++an){var aj=am[an];if(aj==="("){++ap;if(!aq[ap]){am[an]="(?:"}}else{if("\\"===aj.charAt(0)){var ai=+aj.substring(1);if(ai&&ai<=ap){am[an]="\\"+aq[ai]}}}}for(var an=0;an<ak;++an){if("^"===am[an]&&"^"!==am[an+1]){am[an]=""}}if(ao.ignoreCase&&V){for(var an=0;an<ak;++an){var aj=am[an];var al=aj.charAt(0);if(aj.length>=2&&al==="["){am[an]=aa(aj)}else{if(al!=="\\"){am[an]=aj.replace(/[a-zA-Z]/g,function(ar){var at=ar.charCodeAt(0);return"["+String.fromCharCode(at&~32,at|32)+"]"})}}}}return am.join("")}var ad=[];for(var Y=0,X=ac.length;Y<X;++Y){var ah=ac[Y];if(ah.global||ah.multiline){throw new Error(""+ah)}ad.push("(?:"+Z(ah)+")")}return new RegExp(ad.join("|"),af?"gi":"g")}function b(ab,Z){var X=/(?:^|\s)nocode(?:\s|$)/;var ac=[];var aa=0;var Y=[];var W=0;function V(ae){var ad=ae.nodeType;if(ad==1){if(X.test(ae.className)){return}for(var ah=ae.firstChild;ah;ah=ah.nextSibling){V(ah)}var ag=ae.nodeName.toLowerCase();if("br"===ag||"li"===ag){ac[W]="\n";Y[W<<1]=aa++;Y[(W++<<1)|1]=ae}}else{if(ad==3||ad==4){var af=ae.nodeValue;if(af.length){if(!Z){af=af.replace(/[ \t\r\n]+/g," ")}else{af=af.replace(/\r\n?/g,"\n")}ac[W]=af;Y[W<<1]=aa;aa+=af.length;Y[(W++<<1)|1]=ae}}}}V(ab);return{sourceCode:ac.join("").replace(/\n$/,""),spans:Y}}function D(V,X,Z,W){if(!X){return}var Y={sourceCode:X,basePos:V};Z(Y);W.push.apply(W,Y.decorations)}var v=/\S/;function o(V){var Y=undefined;for(var X=V.firstChild;X;X=X.nextSibling){var W=X.nodeType;Y=(W===1)?(Y?V:X):(W===3)?(v.test(X.nodeValue)?V:Y):Y}return Y===V?undefined:Y}function f(X,W){var V={};var Y;(function(){var ag=X.concat(W);var ak=[];var aj={};for(var ae=0,ac=ag.length;ae<ac;++ae){var ab=ag[ae];var af=ab[3];if(af){for(var ah=af.length;--ah>=0;){V[af.charAt(ah)]=ab}}var ai=ab[1];var ad=""+ai;if(!aj.hasOwnProperty(ad)){ak.push(ai);aj[ad]=null}}ak.push(/[\0-\uffff]/);Y=k(ak)})();var aa=W.length;var Z=function(ak){var ac=ak.sourceCode,ab=ak.basePos;var ag=[ab,H];var ai=0;var aq=ac.match(Y)||[];var am={};for(var ah=0,au=aq.length;ah<au;++ah){var aj=aq[ah];var at=am[aj];var al=void 0;var ap;if(typeof at==="string"){ap=false}else{var ad=V[aj.charAt(0)];if(ad){al=aj.match(ad[1]);at=ad[0]}else{for(var ar=0;ar<aa;++ar){ad=W[ar];al=aj.match(ad[1]);if(al){at=ad[0];break}}if(!al){at=H}}ap=at.length>=5&&"lang-"===at.substring(0,5);if(ap&&!(al&&typeof al[1]==="string")){ap=false;at=L}if(!ap){am[aj]=at}}var ae=ai;ai+=aj.length;if(!ap){ag.push(ab+ae,at)}else{var ao=al[1];var an=aj.indexOf(ao);var af=an+ao.length;if(al[2]){af=aj.length-al[2].length;an=af-ao.length}var av=at.substring(5);D(ab+ae,aj.substring(0,an),Z,ag);D(ab+ae+an,ao,q(av,ao),ag);D(ab+ae+af,aj.substring(af),Z,ag)}}ak.decorations=ag};return Z}function h(af){var X=[],ab=[];if(af["tripleQuotedStrings"]){X.push([E,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(af["multiLineStrings"]){X.push([E,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{X.push([E,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(af["verbatimStrings"]){ab.push([E,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var ad=af["hashComments"];if(ad){if(af["cStyleComments"]){if(ad>1){X.push([j,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{X.push([j,/^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}ab.push([E,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/,null])}else{X.push([j,/^#[^\r\n]*/,null,"#"])}}if(af["cStyleComments"]){ab.push([j,/^\/\/[^\r\n]*/,null]);ab.push([j,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}var W=af["regexLiterals"];if(W){var Y=W>1?"":"\n\r";var aa=Y?".":"[\\S\\s]";var Z=("/(?=[^/*"+Y+"])"+"(?:[^/\\x5B\\x5C"+Y+"]"+"|\\x5C"+aa+"|\\x5B(?:[^\\x5C\\x5D"+Y+"]"+"|\\x5C"+aa+")*(?:\\x5D|$))+"+"/");ab.push(["lang-regex",RegExp("^"+O+"("+Z+")")])}var ae=af["types"];if(ae){ab.push([R,ae])}var ac=(""+af["keywords"]).replace(/^ | $/g,"");if(ac.length){ab.push([B,new RegExp("^(?:"+ac.replace(/[\s,]+/g,"|")+")\\b"),null])}X.push([H,/^\s+/,null," \r\n\t\xA0"]);var V="^.[^\\s\\w.$@'\"`/\\\\]*";if(af["regexLiterals"]){V+="(?!s*/)"}ab.push([I,/^@[a-z_$][a-z_$@0-9]*/i,null],[R,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[H,/^[a-z_$][a-z_$@0-9]*/i,null],[I,new RegExp("^(?:"+"0x[a-f0-9]+"+"|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)"+"(?:e[+\\-]?\\d+)?"+")"+"[a-z]*","i"),null,"0123456789"],[H,/^\\[\s\S]?/,null],[N,new RegExp(V),null]);return f(X,ab)}var M=h({"keywords":C,"hashComments":true,"cStyleComments":true,"multiLineStrings":true,"regexLiterals":true});function T(X,ai,ab){var W=/(?:^|\s)nocode(?:\s|$)/;var ad=/\r\n?|\n/;var ae=X.ownerDocument;var ah=ae.createElement("li");while(X.firstChild){ah.appendChild(X.firstChild)}var Y=[ah];function ag(ao){var an=ao.nodeType;if(an==1&&!W.test(ao.className)){if("br"===ao.nodeName){af(ao);if(ao.parentNode){ao.parentNode.removeChild(ao)}}else{for(var aq=ao.firstChild;aq;aq=aq.nextSibling){ag(aq)}}}else{if((an==3||an==4)&&ab){var ap=ao.nodeValue;var al=ap.match(ad);if(al){var ak=ap.substring(0,al.index);ao.nodeValue=ak;var aj=ap.substring(al.index+al[0].length);if(aj){var am=ao.parentNode;am.insertBefore(ae.createTextNode(aj),ao.nextSibling)}af(ao);if(!ak){ao.parentNode.removeChild(ao)}}}}}function af(am){while(!am.nextSibling){am=am.parentNode;if(!am){return}}function ak(an,au){var at=au?an.cloneNode(false):an;var aq=an.parentNode;if(aq){var ar=ak(aq,1);var ap=an.nextSibling;ar.appendChild(at);for(var ao=ap;ao;ao=ap){ap=ao.nextSibling;ar.appendChild(ao)}}return at}var aj=ak(am.nextSibling,0);for(var al;(al=aj.parentNode)&&al.nodeType===1;){aj=al}Y.push(aj)}for(var aa=0;aa<Y.length;++aa){ag(Y[aa])}if(ai===(ai|0)){Y[0].setAttribute("value",ai)}var ac=ae.createElement("ol");ac.className="linenums";var Z=Math.max(0,((ai-1))|0)||0;for(var aa=0,V=Y.length;aa<V;++aa){ah=Y[aa];ah.className="L"+((aa+Z)%10);if(!ah.firstChild){ah.appendChild(ae.createTextNode("\xA0"))}ac.appendChild(ah)}X.appendChild(ac)}function F(ag){var Y=/\bMSIE\s(\d+)/.exec(navigator.userAgent);Y=Y&&+Y[1]<=8;var ap=/\n/g;var ao=ag.sourceCode;var aq=ao.length;var Z=0;var ae=ag.spans;var W=ae.length;var ak=0;var ab=ag.decorations;var ac=ab.length;var ad=0;ab[ac]=aq;var aw,au;for(au=aw=0;au<ac;){if(ab[au]!==ab[au+2]){ab[aw++]=ab[au++];ab[aw++]=ab[au++]}else{au+=2}}ac=aw;for(au=aw=0;au<ac;){var ax=ab[au];var af=ab[au+1];var aa=au+2;while(aa+2<=ac&&ab[aa+1]===af){aa+=2}ab[aw++]=ax;ab[aw++]=af;au=aa}ac=ab.length=aw;var av=ag.sourceNode;var al;if(av){al=av.style.display;av.style.display="none"}try{var ai=null;while(ak<W){var aj=ae[ak];var V=ae[ak+2]||aq;var at=ab[ad+2]||aq;var aa=Math.min(V,at);var an=ae[ak+1];var X;if(an.nodeType!==1&&(X=ao.substring(Z,aa))){if(Y){X=X.replace(ap,"\r")}an.nodeValue=X;var am=an.ownerDocument;var ar=am.createElement("span");ar.className=ab[ad+1];var ah=an.parentNode;ah.replaceChild(ar,an);ar.appendChild(an);if(Z<V){ae[ak+1]=an=am.createTextNode(ao.substring(aa,V));ah.insertBefore(an,ar.nextSibling)}}Z=aa;if(Z>=V){ak+=2}if(Z>=at){ad+=2}}}finally{if(av){av.style.display=al}}}var t={};function c(X,Y){for(var V=Y.length;--V>=0;){var W=Y[V];if(!t.hasOwnProperty(W)){t[W]=X}else{if(P["console"]){console["warn"]("cannot override language handler %s",W)}}}}function q(W,V){if(!(W&&t.hasOwnProperty(W))){W=/^\s*</.test(V)?"default-markup":"default-code"}return t[W]}c(M,["default-code"]);c(f([],[[H,/^[^<?]+/],[G,/^<!\w[^>]*(?:>|$)/],[j,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[N,/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);c(f([[H,/^[\s]+/,null," \t\r\n"],[n,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[m,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[S,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[N,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);c(f([],[[n,/^[\s\S]+/]]),["uq.val"]);c(h({"keywords":l,"hashComments":true,"cStyleComments":true,"types":e}),["c","cc","cpp","cxx","cyc","m"]);c(h({"keywords":"null,true,false"}),["json"]);c(h({"keywords":U,"hashComments":true,"cStyleComments":true,"verbatimStrings":true,"types":e}),["cs"]);c(h({"keywords":y,"cStyleComments":true}),["java"]);c(h({"keywords":J,"hashComments":true,"multiLineStrings":true}),["bash","bsh","csh","sh"]);c(h({"keywords":K,"hashComments":true,"multiLineStrings":true,"tripleQuotedStrings":true}),["cv","py","python"]);c(h({"keywords":s,"hashComments":true,"multiLineStrings":true,"regexLiterals":2}),["perl","pl","pm"]);c(h({"keywords":g,"hashComments":true,"multiLineStrings":true,"regexLiterals":true}),["rb","ruby"]);c(h({"keywords":x,"cStyleComments":true,"regexLiterals":true}),["javascript","js"]);c(h({"keywords":r,"hashComments":3,"cStyleComments":true,"multilineStrings":true,"tripleQuotedStrings":true,"regexLiterals":true}),["coffee"]);c(h({"keywords":z,"cStyleComments":true,"multilineStrings":true}),["rc","rs","rust"]);c(f([],[[E,/^[\s\S]+/]]),["regex"]);function d(Y){var X=Y.langExtension;try{var V=b(Y.sourceNode,Y.pre);var W=V.sourceCode;Y.sourceCode=W;Y.spans=V.spans;Y.basePos=0;q(X,W)(Y);F(Y)}catch(Z){if(P["console"]){console["log"](Z&&Z["stack"]||Z)}}}function A(Z,Y,X){var V=document.createElement("div");V.innerHTML="<pre>"+Z+"</pre>";V=V.firstChild;if(X){T(V,X,true)}var W={langExtension:Y,numberLines:X,sourceNode:V,pre:1};d(W);return V.innerHTML}function w(al,ab){var ah=ab||document.body;var ao=ah.ownerDocument||document;function aa(aq){return ah.getElementsByTagName(aq)}var ad=[aa("pre"),aa("code"),aa("xmp")];var ae=[];for(var ak=0;ak<ad.length;++ak){for(var aj=0,ag=ad[ak].length;aj<ag;++aj){ae.push(ad[ak][aj])}}ad=null;var ap=Date;if(!ap["now"]){ap={"now":function(){return +(new Date)}}}var ai=0;var ac;var X=/\blang(?:uage)?-([\w.]+)(?!\S)/;var an=/\bprettyprint\b/;var W=/\bprettyprinted\b/;var Z=/pre|xmp/i;var V=/^code$/i;var Y=/^(?:pre|code|xmp)$/i;var am={};function af(){var ay=(P["PR_SHOULD_USE_CONTINUATION"]?ap["now"]()+250:Infinity);for(;ai<ae.length&&ap["now"]()<ay;ai++){var aA=ae[ai];var aH=am;for(var ax=aA;(ax=ax.previousSibling);){var aE=ax.nodeType;var aF=(aE===7||aE===8)&&ax.nodeValue;if(aF?!/^\??prettify\b/.test(aF):(aE!==3||/\S/.test(ax.nodeValue))){break}if(aF){aH={};aF.replace(/\b(\w+)=([\w:.%+-]+)/g,function(aJ,aI,aK){aH[aI]=aK});break}}var aB=aA.className;if((aH!==am||an.test(aB))&&!W.test(aB)){var aD=false;for(var au=aA.parentNode;au;au=au.parentNode){var aG=au.tagName;if(Y.test(aG)&&au.className&&an.test(au.className)){aD=true;break}}if(!aD){aA.className+=" prettyprinted";var aw=aH["lang"];if(!aw){aw=aB.match(X);var ar;if(!aw&&(ar=o(aA))&&V.test(ar.tagName)){aw=ar.className.match(X)}if(aw){aw=aw[1]}}var av;if(Z.test(aA.tagName)){av=1}else{var at=aA["currentStyle"];var az=ao.defaultView;var aq=(at?at["whiteSpace"]:(az&&az.getComputedStyle)?az.getComputedStyle(aA,null).getPropertyValue("white-space"):0);av=aq&&"pre"===aq.substring(0,3)}var aC=aH["linenums"];if(!(aC=aC==="true"||+aC)){aC=aB.match(/\blinenums\b(?::(\d+))?/);aC=aC?aC[1]&&aC[1].length?+aC[1]:true:false}if(aC){T(aA,aC,av)}ac={langExtension:aw,sourceNode:aA,numberLines:aC,pre:av};d(ac)}}}if(ai<ae.length){setTimeout(af,250)}else{if("function"===typeof al){al()}}}af()}var a=P["PR"]={"createSimpleLexer":f,"registerLangHandler":c,"sourceDecorator":h,"PR_ATTRIB_NAME":S,"PR_ATTRIB_VALUE":n,"PR_COMMENT":j,"PR_DECLARATION":G,"PR_KEYWORD":B,"PR_LITERAL":I,"PR_NOCODE":Q,"PR_PLAIN":H,"PR_PUNCTUATION":N,"PR_SOURCE":L,"PR_STRING":E,"PR_TAG":m,"PR_TYPE":R,"prettyPrintOne":IN_GLOBAL_SCOPE?(P["prettyPrintOne"]=A):(prettyPrintOne=A),"prettyPrint":prettyPrint=IN_GLOBAL_SCOPE?(P["prettyPrint"]=w):(prettyPrint=w)};if(typeof define==="function"&&define["amd"]){define("google-code-prettify",[],function(){return a})}})();
+var IN_GLOBAL_SCOPE = true; window["PR_SHOULD_USE_CONTINUATION"] = true; var prettyPrintOne; var prettyPrint; (function () { var P = window; var i = ["break,continue,do,else,for,if,return,while"]; var u = [i, "auto,case,char,const,default," + "double,enum,extern,float,goto,inline,int,long,register,short,signed," + "sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"]; var p = [u, "catch,class,delete,false,import," + "new,operator,private,protected,public,this,throw,true,try,typeof"]; var l = [p, "alignof,align_union,asm,axiom,bool," + "concept,concept_map,const_cast,constexpr,decltype,delegate," + "dynamic_cast,explicit,export,friend,generic,late_check," + "mutable,namespace,nullptr,property,reinterpret_cast,static_assert," + "static_cast,template,typeid,typename,using,virtual,where"]; var y = [p, "abstract,assert,boolean,byte,extends,final,finally,implements,import," + "instanceof,interface,null,native,package,strictfp,super,synchronized," + "throws,transient"]; var U = [y, "as,base,by,checked,decimal,delegate,descending,dynamic,event," + "fixed,foreach,from,group,implicit,in,internal,into,is,let," + "lock,object,out,override,orderby,params,partial,readonly,ref,sbyte," + "sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort," + "var,virtual,where"]; var r = "all,and,by,catch,class,else,extends,false,finally," + "for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then," + "throw,true,try,unless,until,when,while,yes"; var x = [p, "debugger,eval,export,function,get,null,set,undefined,var,with," + "Infinity,NaN"]; var s = "caller,delete,die,do,dump,elsif,eval,exit,foreach,for," + "goto,if,import,last,local,my,next,no,our,print,package,redo,require," + "sub,undef,unless,until,use,wantarray,while,BEGIN,END"; var K = [i, "and,as,assert,class,def,del," + "elif,except,exec,finally,from,global,import,in,is,lambda," + "nonlocal,not,or,pass,print,raise,try,with,yield," + "False,True,None"]; var g = [i, "alias,and,begin,case,class," + "def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo," + "rescue,retry,self,super,then,true,undef,unless,until,when,yield," + "BEGIN,END"]; var z = [i, "as,assert,const,copy,drop," + "enum,extern,fail,false,fn,impl,let,log,loop,match,mod,move,mut,priv," + "pub,pure,ref,self,static,struct,true,trait,type,unsafe,use"]; var J = [i, "case,done,elif,esac,eval,fi," + "function,in,local,set,then,until"]; var C = [l, U, x, s, K, g, J]; var e = /^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/; var E = "str"; var B = "kwd"; var j = "com"; var R = "typ"; var I = "lit"; var N = "pun"; var H = "pln"; var m = "tag"; var G = "dec"; var L = "src"; var S = "atn"; var n = "atv"; var Q = "nocode"; var O = "(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<<?=?|>>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*"; function k(ac) { var ag = 0; var V = false; var af = false; for (var Y = 0, X = ac.length; Y < X; ++Y) { var ah = ac[Y]; if (ah.ignoreCase) { af = true } else { if (/[a-z]/i.test(ah.source.replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi, ""))) { V = true; af = false; break } } } var ab = { "b": 8, "t": 9, "n": 10, "v": 11, "f": 12, "r": 13 }; function ae(ak) { var aj = ak.charCodeAt(0); if (aj !== 92) { return aj } var ai = ak.charAt(1); aj = ab[ai]; if (aj) { return aj } else { if ("0" <= ai && ai <= "7") { return parseInt(ak.substring(1), 8) } else { if (ai === "u" || ai === "x") { return parseInt(ak.substring(2), 16) } else { return ak.charCodeAt(1) } } } } function W(ai) { if (ai < 32) { return (ai < 16 ? "\\x0" : "\\x") + ai.toString(16) } var aj = String.fromCharCode(ai); return (aj === "\\" || aj === "-" || aj === "]" || aj === "^") ? "\\" + aj : aj } function aa(ao) { var at = ao.substring(1, ao.length - 1).match(new RegExp("\\\\u[0-9A-Fa-f]{4}" + "|\\\\x[0-9A-Fa-f]{2}" + "|\\\\[0-3][0-7]{0,2}" + "|\\\\[0-7]{1,2}" + "|\\\\[\\s\\S]" + "|-" + "|[^-\\\\]", "g")); var ai = []; var aq = at[0] === "^"; var ap = ["["]; if (aq) { ap.push("^") } for (var au = aq ? 1 : 0, am = at.length; au < am; ++au) { var ak = at[au]; if (/\\[bdsw]/i.test(ak)) { ap.push(ak) } else { var aj = ae(ak); var an; if (au + 2 < am && "-" === at[au + 1]) { an = ae(at[au + 2]); au += 2 } else { an = aj } ai.push([aj, an]); if (!(an < 65 || aj > 122)) { if (!(an < 65 || aj > 90)) { ai.push([Math.max(65, aj) | 32, Math.min(an, 90) | 32]) } if (!(an < 97 || aj > 122)) { ai.push([Math.max(97, aj) & ~32, Math.min(an, 122) & ~32]) } } } } ai.sort(function (ax, aw) { return (ax[0] - aw[0]) || (aw[1] - ax[1]) }); var al = []; var ar = []; for (var au = 0; au < ai.length; ++au) { var av = ai[au]; if (av[0] <= ar[1] + 1) { ar[1] = Math.max(ar[1], av[1]) } else { al.push(ar = av) } } for (var au = 0; au < al.length; ++au) { var av = al[au]; ap.push(W(av[0])); if (av[1] > av[0]) { if (av[1] + 1 > av[0]) { ap.push("-") } ap.push(W(av[1])) } } ap.push("]"); return ap.join("") } function Z(ao) { var am = ao.source.match(new RegExp("(?:" + "\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]" + "|\\\\u[A-Fa-f0-9]{4}" + "|\\\\x[A-Fa-f0-9]{2}" + "|\\\\[0-9]+" + "|\\\\[^ux0-9]" + "|\\(\\?[:!=]" + "|[\\(\\)\\^]" + "|[^\\x5B\\x5C\\(\\)\\^]+" + ")", "g")); var ak = am.length; var aq = []; for (var an = 0, ap = 0; an < ak; ++an) { var aj = am[an]; if (aj === "(") { ++ap } else { if ("\\" === aj.charAt(0)) { var ai = +aj.substring(1); if (ai) { if (ai <= ap) { aq[ai] = -1 } else { am[an] = W(ai) } } } } } for (var an = 1; an < aq.length; ++an) { if (-1 === aq[an]) { aq[an] = ++ag } } for (var an = 0, ap = 0; an < ak; ++an) { var aj = am[an]; if (aj === "(") { ++ap; if (!aq[ap]) { am[an] = "(?:" } } else { if ("\\" === aj.charAt(0)) { var ai = +aj.substring(1); if (ai && ai <= ap) { am[an] = "\\" + aq[ai] } } } } for (var an = 0; an < ak; ++an) { if ("^" === am[an] && "^" !== am[an + 1]) { am[an] = "" } } if (ao.ignoreCase && V) { for (var an = 0; an < ak; ++an) { var aj = am[an]; var al = aj.charAt(0); if (aj.length >= 2 && al === "[") { am[an] = aa(aj) } else { if (al !== "\\") { am[an] = aj.replace(/[a-zA-Z]/g, function (ar) { var at = ar.charCodeAt(0); return "[" + String.fromCharCode(at & ~32, at | 32) + "]" }) } } } } return am.join("") } var ad = []; for (var Y = 0, X = ac.length; Y < X; ++Y) { var ah = ac[Y]; if (ah.global || ah.multiline) { throw new Error("" + ah) } ad.push("(?:" + Z(ah) + ")") } return new RegExp(ad.join("|"), af ? "gi" : "g") } function b(ab, Z) { var X = /(?:^|\s)nocode(?:\s|$)/; var ac = []; var aa = 0; var Y = []; var W = 0; function V(ae) { var ad = ae.nodeType; if (ad == 1) { if (X.test(ae.className)) { return } for (var ah = ae.firstChild; ah; ah = ah.nextSibling) { V(ah) } var ag = ae.nodeName.toLowerCase(); if ("br" === ag || "li" === ag) { ac[W] = "\n"; Y[W << 1] = aa++; Y[(W++ << 1) | 1] = ae } } else { if (ad == 3 || ad == 4) { var af = ae.nodeValue; if (af.length) { if (!Z) { af = af.replace(/[ \t\r\n]+/g, " ") } else { af = af.replace(/\r\n?/g, "\n") } ac[W] = af; Y[W << 1] = aa; aa += af.length; Y[(W++ << 1) | 1] = ae } } } } V(ab); return { sourceCode: ac.join("").replace(/\n$/, ""), spans: Y } } function D(V, X, Z, W) { if (!X) { return } var Y = { sourceCode: X, basePos: V }; Z(Y); W.push.apply(W, Y.decorations) } var v = /\S/; function o(V) { var Y = undefined; for (var X = V.firstChild; X; X = X.nextSibling) { var W = X.nodeType; Y = (W === 1) ? (Y ? V : X) : (W === 3) ? (v.test(X.nodeValue) ? V : Y) : Y } return Y === V ? undefined : Y } function f(X, W) { var V = {}; var Y; (function () { var ag = X.concat(W); var ak = []; var aj = {}; for (var ae = 0, ac = ag.length; ae < ac; ++ae) { var ab = ag[ae]; var af = ab[3]; if (af) { for (var ah = af.length; --ah >= 0;) { V[af.charAt(ah)] = ab } } var ai = ab[1]; var ad = "" + ai; if (!aj.hasOwnProperty(ad)) { ak.push(ai); aj[ad] = null } } ak.push(/[\0-\uffff]/); Y = k(ak) })(); var aa = W.length; var Z = function (ak) { var ac = ak.sourceCode, ab = ak.basePos; var ag = [ab, H]; var ai = 0; var aq = ac.match(Y) || []; var am = {}; for (var ah = 0, au = aq.length; ah < au; ++ah) { var aj = aq[ah]; var at = am[aj]; var al = void 0; var ap; if (typeof at === "string") { ap = false } else { var ad = V[aj.charAt(0)]; if (ad) { al = aj.match(ad[1]); at = ad[0] } else { for (var ar = 0; ar < aa; ++ar) { ad = W[ar]; al = aj.match(ad[1]); if (al) { at = ad[0]; break } } if (!al) { at = H } } ap = at.length >= 5 && "lang-" === at.substring(0, 5); if (ap && !(al && typeof al[1] === "string")) { ap = false; at = L } if (!ap) { am[aj] = at } } var ae = ai; ai += aj.length; if (!ap) { ag.push(ab + ae, at) } else { var ao = al[1]; var an = aj.indexOf(ao); var af = an + ao.length; if (al[2]) { af = aj.length - al[2].length; an = af - ao.length } var av = at.substring(5); D(ab + ae, aj.substring(0, an), Z, ag); D(ab + ae + an, ao, q(av, ao), ag); D(ab + ae + af, aj.substring(af), Z, ag) } } ak.decorations = ag }; return Z } function h(af) { var X = [], ab = []; if (af["tripleQuotedStrings"]) { X.push([E, /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/, null, "'\""]) } else { if (af["multiLineStrings"]) { X.push([E, /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/, null, "'\"`"]) } else { X.push([E, /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/, null, "\"'"]) } } if (af["verbatimStrings"]) { ab.push([E, /^@\"(?:[^\"]|\"\")*(?:\"|$)/, null]) } var ad = af["hashComments"]; if (ad) { if (af["cStyleComments"]) { if (ad > 1) { X.push([j, /^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/, null, "#"]) } else { X.push([j, /^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\r\n]*)/, null, "#"]) } ab.push([E, /^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/, null]) } else { X.push([j, /^#[^\r\n]*/, null, "#"]) } } if (af["cStyleComments"]) { ab.push([j, /^\/\/[^\r\n]*/, null]); ab.push([j, /^\/\*[\s\S]*?(?:\*\/|$)/, null]) } var W = af["regexLiterals"]; if (W) { var Y = W > 1 ? "" : "\n\r"; var aa = Y ? "." : "[\\S\\s]"; var Z = ("/(?=[^/*" + Y + "])" + "(?:[^/\\x5B\\x5C" + Y + "]" + "|\\x5C" + aa + "|\\x5B(?:[^\\x5C\\x5D" + Y + "]" + "|\\x5C" + aa + ")*(?:\\x5D|$))+" + "/"); ab.push(["lang-regex", RegExp("^" + O + "(" + Z + ")")]) } var ae = af["types"]; if (ae) { ab.push([R, ae]) } var ac = ("" + af["keywords"]).replace(/^ | $/g, ""); if (ac.length) { ab.push([B, new RegExp("^(?:" + ac.replace(/[\s,]+/g, "|") + ")\\b"), null]) } X.push([H, /^\s+/, null, " \r\n\t\xA0"]); var V = "^.[^\\s\\w.$@'\"`/\\\\]*"; if (af["regexLiterals"]) { V += "(?!s*/)" } ab.push([I, /^@[a-z_$][a-z_$@0-9]*/i, null], [R, /^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/, null], [H, /^[a-z_$][a-z_$@0-9]*/i, null], [I, new RegExp("^(?:" + "0x[a-f0-9]+" + "|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)" + "(?:e[+\\-]?\\d+)?" + ")" + "[a-z]*", "i"), null, "0123456789"], [H, /^\\[\s\S]?/, null], [N, new RegExp(V), null]); return f(X, ab) } var M = h({ "keywords": C, "hashComments": true, "cStyleComments": true, "multiLineStrings": true, "regexLiterals": true }); function T(X, ai, ab) { var W = /(?:^|\s)nocode(?:\s|$)/; var ad = /\r\n?|\n/; var ae = X.ownerDocument; var ah = ae.createElement("li"); while (X.firstChild) { ah.appendChild(X.firstChild) } var Y = [ah]; function ag(ao) { var an = ao.nodeType; if (an == 1 && !W.test(ao.className)) { if ("br" === ao.nodeName) { af(ao); if (ao.parentNode) { ao.parentNode.removeChild(ao) } } else { for (var aq = ao.firstChild; aq; aq = aq.nextSibling) { ag(aq) } } } else { if ((an == 3 || an == 4) && ab) { var ap = ao.nodeValue; var al = ap.match(ad); if (al) { var ak = ap.substring(0, al.index); ao.nodeValue = ak; var aj = ap.substring(al.index + al[0].length); if (aj) { var am = ao.parentNode; am.insertBefore(ae.createTextNode(aj), ao.nextSibling) } af(ao); if (!ak) { ao.parentNode.removeChild(ao) } } } } } function af(am) { while (!am.nextSibling) { am = am.parentNode; if (!am) { return } } function ak(an, au) { var at = au ? an.cloneNode(false) : an; var aq = an.parentNode; if (aq) { var ar = ak(aq, 1); var ap = an.nextSibling; ar.appendChild(at); for (var ao = ap; ao; ao = ap) { ap = ao.nextSibling; ar.appendChild(ao) } } return at } var aj = ak(am.nextSibling, 0); for (var al; (al = aj.parentNode) && al.nodeType === 1;) { aj = al } Y.push(aj) } for (var aa = 0; aa < Y.length; ++aa) { ag(Y[aa]) } if (ai === (ai | 0)) { Y[0].setAttribute("value", ai) } var ac = ae.createElement("ol"); ac.className = "linenums"; var Z = Math.max(0, ((ai - 1)) | 0) || 0; for (var aa = 0, V = Y.length; aa < V; ++aa) { ah = Y[aa]; ah.className = "L" + ((aa + Z) % 10); if (!ah.firstChild) { ah.appendChild(ae.createTextNode("\xA0")) } ac.appendChild(ah) } X.appendChild(ac) } function F(ag) { var Y = /\bMSIE\s(\d+)/.exec(navigator.userAgent); Y = Y && +Y[1] <= 8; var ap = /\n/g; var ao = ag.sourceCode; var aq = ao.length; var Z = 0; var ae = ag.spans; var W = ae.length; var ak = 0; var ab = ag.decorations; var ac = ab.length; var ad = 0; ab[ac] = aq; var aw, au; for (au = aw = 0; au < ac;) { if (ab[au] !== ab[au + 2]) { ab[aw++] = ab[au++]; ab[aw++] = ab[au++] } else { au += 2 } } ac = aw; for (au = aw = 0; au < ac;) { var ax = ab[au]; var af = ab[au + 1]; var aa = au + 2; while (aa + 2 <= ac && ab[aa + 1] === af) { aa += 2 } ab[aw++] = ax; ab[aw++] = af; au = aa } ac = ab.length = aw; var av = ag.sourceNode; var al; if (av) { al = av.style.display; av.style.display = "none" } try { var ai = null; while (ak < W) { var aj = ae[ak]; var V = ae[ak + 2] || aq; var at = ab[ad + 2] || aq; var aa = Math.min(V, at); var an = ae[ak + 1]; var X; if (an.nodeType !== 1 && (X = ao.substring(Z, aa))) { if (Y) { X = X.replace(ap, "\r") } an.nodeValue = X; var am = an.ownerDocument; var ar = am.createElement("span"); ar.className = ab[ad + 1]; var ah = an.parentNode; ah.replaceChild(ar, an); ar.appendChild(an); if (Z < V) { ae[ak + 1] = an = am.createTextNode(ao.substring(aa, V)); ah.insertBefore(an, ar.nextSibling) } } Z = aa; if (Z >= V) { ak += 2 } if (Z >= at) { ad += 2 } } } finally { if (av) { av.style.display = al } } } var t = {}; function c(X, Y) { for (var V = Y.length; --V >= 0;) { var W = Y[V]; if (!t.hasOwnProperty(W)) { t[W] = X } else { if (P["console"]) { console["warn"]("cannot override language handler %s", W) } } } } function q(W, V) { if (!(W && t.hasOwnProperty(W))) { W = /^\s*</.test(V) ? "default-markup" : "default-code" } return t[W] } c(M, ["default-code"]); c(f([], [[H, /^[^<?]+/], [G, /^<!\w[^>]*(?:>|$)/], [j, /^<\!--[\s\S]*?(?:-\->|$)/], ["lang-", /^<\?([\s\S]+?)(?:\?>|$)/], ["lang-", /^<%([\s\S]+?)(?:%>|$)/], [N, /^(?:<[%?]|[%?]>)/], ["lang-", /^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i], ["lang-js", /^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i], ["lang-css", /^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i], ["lang-in.tag", /^(<\/?[a-z][^<>]*>)/i]]), ["default-markup", "htm", "html", "mxml", "xhtml", "xml", "xsl"]); c(f([[H, /^[\s]+/, null, " \t\r\n"], [n, /^(?:\"[^\"]*\"?|\'[^\']*\'?)/, null, "\"'"]], [[m, /^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i], [S, /^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i], ["lang-uq.val", /^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/], [N, /^[=<>\/]+/], ["lang-js", /^on\w+\s*=\s*\"([^\"]+)\"/i], ["lang-js", /^on\w+\s*=\s*\'([^\']+)\'/i], ["lang-js", /^on\w+\s*=\s*([^\"\'>\s]+)/i], ["lang-css", /^style\s*=\s*\"([^\"]+)\"/i], ["lang-css", /^style\s*=\s*\'([^\']+)\'/i], ["lang-css", /^style\s*=\s*([^\"\'>\s]+)/i]]), ["in.tag"]); c(f([], [[n, /^[\s\S]+/]]), ["uq.val"]); c(h({ "keywords": l, "hashComments": true, "cStyleComments": true, "types": e }), ["c", "cc", "cpp", "cxx", "cyc", "m"]); c(h({ "keywords": "null,true,false" }), ["json"]); c(h({ "keywords": U, "hashComments": true, "cStyleComments": true, "verbatimStrings": true, "types": e }), ["cs"]); c(h({ "keywords": y, "cStyleComments": true }), ["java"]); c(h({ "keywords": J, "hashComments": true, "multiLineStrings": true }), ["bash", "bsh", "csh", "sh"]); c(h({ "keywords": K, "hashComments": true, "multiLineStrings": true, "tripleQuotedStrings": true }), ["cv", "py", "python"]); c(h({ "keywords": s, "hashComments": true, "multiLineStrings": true, "regexLiterals": 2 }), ["perl", "pl", "pm"]); c(h({ "keywords": g, "hashComments": true, "multiLineStrings": true, "regexLiterals": true }), ["rb", "ruby"]); c(h({ "keywords": x, "cStyleComments": true, "regexLiterals": true }), ["javascript", "js"]); c(h({ "keywords": r, "hashComments": 3, "cStyleComments": true, "multilineStrings": true, "tripleQuotedStrings": true, "regexLiterals": true }), ["coffee"]); c(h({ "keywords": z, "cStyleComments": true, "multilineStrings": true }), ["rc", "rs", "rust"]); c(f([], [[E, /^[\s\S]+/]]), ["regex"]); function d(Y) { var X = Y.langExtension; try { var V = b(Y.sourceNode, Y.pre); var W = V.sourceCode; Y.sourceCode = W; Y.spans = V.spans; Y.basePos = 0; q(X, W)(Y); F(Y) } catch (Z) { if (P["console"]) { console["log"](Z && Z["stack"] || Z) } } } function A(Z, Y, X) { var V = document.createElement("div"); V.innerHTML = "<pre>" + Z + "</pre>"; V = V.firstChild; if (X) { T(V, X, true) } var W = { langExtension: Y, numberLines: X, sourceNode: V, pre: 1 }; d(W); return V.innerHTML } function w(al, ab) { var ah = ab || document.body; var ao = ah.ownerDocument || document; function aa(aq) { return ah.getElementsByTagName(aq) } var ad = [aa("pre"), aa("code"), aa("xmp")]; var ae = []; for (var ak = 0; ak < ad.length; ++ak) { for (var aj = 0, ag = ad[ak].length; aj < ag; ++aj) { ae.push(ad[ak][aj]) } } ad = null; var ap = Date; if (!ap["now"]) { ap = { "now": function () { return +(new Date) } } } var ai = 0; var ac; var X = /\blang(?:uage)?-([\w.]+)(?!\S)/; var an = /\bprettyprint\b/; var W = /\bprettyprinted\b/; var Z = /pre|xmp/i; var V = /^code$/i; var Y = /^(?:pre|code|xmp)$/i; var am = {}; function af() { var ay = (P["PR_SHOULD_USE_CONTINUATION"] ? ap["now"]() + 250 : Infinity); for (; ai < ae.length && ap["now"]() < ay; ai++) { var aA = ae[ai]; var aH = am; for (var ax = aA; (ax = ax.previousSibling);) { var aE = ax.nodeType; var aF = (aE === 7 || aE === 8) && ax.nodeValue; if (aF ? !/^\??prettify\b/.test(aF) : (aE !== 3 || /\S/.test(ax.nodeValue))) { break } if (aF) { aH = {}; aF.replace(/\b(\w+)=([\w:.%+-]+)/g, function (aJ, aI, aK) { aH[aI] = aK }); break } } var aB = aA.className; if ((aH !== am || an.test(aB)) && !W.test(aB)) { var aD = false; for (var au = aA.parentNode; au; au = au.parentNode) { var aG = au.tagName; if (Y.test(aG) && au.className && an.test(au.className)) { aD = true; break } } if (!aD) { aA.className += " prettyprinted"; var aw = aH["lang"]; if (!aw) { aw = aB.match(X); var ar; if (!aw && (ar = o(aA)) && V.test(ar.tagName)) { aw = ar.className.match(X) } if (aw) { aw = aw[1] } } var av; if (Z.test(aA.tagName)) { av = 1 } else { var at = aA["currentStyle"]; var az = ao.defaultView; var aq = (at ? at["whiteSpace"] : (az && az.getComputedStyle) ? az.getComputedStyle(aA, null).getPropertyValue("white-space") : 0); av = aq && "pre" === aq.substring(0, 3) } var aC = aH["linenums"]; if (!(aC = aC === "true" || +aC)) { aC = aB.match(/\blinenums\b(?::(\d+))?/); aC = aC ? aC[1] && aC[1].length ? +aC[1] : true : false } if (aC) { T(aA, aC, av) } ac = { langExtension: aw, sourceNode: aA, numberLines: aC, pre: av }; d(ac) } } } if (ai < ae.length) { setTimeout(af, 250) } else { if ("function" === typeof al) { al() } } } af() } var a = P["PR"] = { "createSimpleLexer": f, "registerLangHandler": c, "sourceDecorator": h, "PR_ATTRIB_NAME": S, "PR_ATTRIB_VALUE": n, "PR_COMMENT": j, "PR_DECLARATION": G, "PR_KEYWORD": B, "PR_LITERAL": I, "PR_NOCODE": Q, "PR_PLAIN": H, "PR_PUNCTUATION": N, "PR_SOURCE": L, "PR_STRING": E, "PR_TAG": m, "PR_TYPE": R, "prettyPrintOne": IN_GLOBAL_SCOPE ? (P["prettyPrintOne"] = A) : (prettyPrintOne = A), "prettyPrint": prettyPrint = IN_GLOBAL_SCOPE ? (P["prettyPrint"] = w) : (prettyPrint = w) }; if (typeof define === "function" && define["amd"]) { define("google-code-prettify", [], function () { return a }) } })();
 // ┌────────────────────────────────────────────────────────────────────┐ \\
 // │ Raphaël 2.1.3 - JavaScript Vector Library                          │ \\
 // ├────────────────────────────────────────────────────────────────────┤ \\
@@ -50,107 +53,166 @@ var IN_GLOBAL_SCOPE=true;window["PR_SHOULD_USE_CONTINUATION"]=true;var prettyPri
 // └────────────────────────────────────────────────────────────────────┘ \\
 
 // Element= -> __Element=
-!function(a){var b,c,d="0.4.2",e="hasOwnProperty",f=/[\.\/]/,g="*",h=function(){},i=function(a,b){return a-b},j={n:{}},k=function(a,d){a=String(a);var e,f=c,g=Array.prototype.slice.call(arguments,2),h=k.listeners(a),j=0,l=[],m={},n=[],o=b;b=a,c=0;for(var p=0,q=h.length;q>p;p++)"zIndex"in h[p]&&(l.push(h[p].zIndex),h[p].zIndex<0&&(m[h[p].zIndex]=h[p]));for(l.sort(i);l[j]<0;)if(e=m[l[j++]],n.push(e.apply(d,g)),c)return c=f,n;for(p=0;q>p;p++)if(e=h[p],"zIndex"in e)if(e.zIndex==l[j]){if(n.push(e.apply(d,g)),c)break;do if(j++,e=m[l[j]],e&&n.push(e.apply(d,g)),c)break;while(e)}else m[e.zIndex]=e;else if(n.push(e.apply(d,g)),c)break;return c=f,b=o,n.length?n:null};k._events=j,k.listeners=function(a){var b,c,d,e,h,i,k,l,m=a.split(f),n=j,o=[n],p=[];for(e=0,h=m.length;h>e;e++){for(l=[],i=0,k=o.length;k>i;i++)for(n=o[i].n,c=[n[m[e]],n[g]],d=2;d--;)b=c[d],b&&(l.push(b),p=p.concat(b.f||[]));o=l}return p},k.on=function(a,b){if(a=String(a),"function"!=typeof b)return function(){};for(var c=a.split(f),d=j,e=0,g=c.length;g>e;e++)d=d.n,d=d.hasOwnProperty(c[e])&&d[c[e]]||(d[c[e]]={n:{}});for(d.f=d.f||[],e=0,g=d.f.length;g>e;e++)if(d.f[e]==b)return h;return d.f.push(b),function(a){+a==+a&&(b.zIndex=+a)}},k.f=function(a){var b=[].slice.call(arguments,1);return function(){k.apply(null,[a,null].concat(b).concat([].slice.call(arguments,0)))}},k.stop=function(){c=1},k.nt=function(a){return a?new RegExp("(?:\\.|\\/|^)"+a+"(?:\\.|\\/|$)").test(b):b},k.nts=function(){return b.split(f)},k.off=k.unbind=function(a,b){if(!a)return void(k._events=j={n:{}});var c,d,h,i,l,m,n,o=a.split(f),p=[j];for(i=0,l=o.length;l>i;i++)for(m=0;m<p.length;m+=h.length-2){if(h=[m,1],c=p[m].n,o[i]!=g)c[o[i]]&&h.push(c[o[i]]);else for(d in c)c[e](d)&&h.push(c[d]);p.splice.apply(p,h)}for(i=0,l=p.length;l>i;i++)for(c=p[i];c.n;){if(b){if(c.f){for(m=0,n=c.f.length;n>m;m++)if(c.f[m]==b){c.f.splice(m,1);break}!c.f.length&&delete c.f}for(d in c.n)if(c.n[e](d)&&c.n[d].f){var q=c.n[d].f;for(m=0,n=q.length;n>m;m++)if(q[m]==b){q.splice(m,1);break}!q.length&&delete c.n[d].f}}else{delete c.f;for(d in c.n)c.n[e](d)&&c.n[d].f&&delete c.n[d].f}c=c.n}},k.once=function(a,b){var c=function(){return k.unbind(a,c),b.apply(this,arguments)};return k.on(a,c)},k.version=d,k.toString=function(){return"You are running Eve "+d},"undefined"!=typeof module&&module.exports?module.exports=k:"undefined"!=typeof define?define("eve",[],function(){return k}):a.eve=k}(window||this),function(a,b){"function"==typeof define&&define.amd?define(["eve"],function(c){return b(a,c)}):b(a,a.eve||"function"==typeof require&&require("eve"))}(this,function(a,b){function c(a){if(c.is(a,"function"))return u?a():b.on("raphael.DOMload",a);if(c.is(a,V))return c._engine.create[D](c,a.splice(0,3+c.is(a[0],T))).add(a);var d=Array.prototype.slice.call(arguments,0);if(c.is(d[d.length-1],"function")){var e=d.pop();return u?e.call(c._engine.create[D](c,d)):b.on("raphael.DOMload",function(){e.call(c._engine.create[D](c,d))})}return c._engine.create[D](c,arguments)}function d(a){if("function"==typeof a||Object(a)!==a)return a;var b=new a.constructor;for(var c in a)a[z](c)&&(b[c]=d(a[c]));return b}function e(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return a.push(a.splice(c,1)[0])}function f(a,b,c){function d(){var f=Array.prototype.slice.call(arguments,0),g=f.join("␀"),h=d.cache=d.cache||{},i=d.count=d.count||[];return h[z](g)?(e(i,g),c?c(h[g]):h[g]):(i.length>=1e3&&delete h[i.shift()],i.push(g),h[g]=a[D](b,f),c?c(h[g]):h[g])}return d}function g(){return this.hex}function h(a,b){for(var c=[],d=0,e=a.length;e-2*!b>d;d+=2){var f=[{x:+a[d-2],y:+a[d-1]},{x:+a[d],y:+a[d+1]},{x:+a[d+2],y:+a[d+3]},{x:+a[d+4],y:+a[d+5]}];b?d?e-4==d?f[3]={x:+a[0],y:+a[1]}:e-2==d&&(f[2]={x:+a[0],y:+a[1]},f[3]={x:+a[2],y:+a[3]}):f[0]={x:+a[e-2],y:+a[e-1]}:e-4==d?f[3]=f[2]:d||(f[0]={x:+a[d],y:+a[d+1]}),c.push(["C",(-f[0].x+6*f[1].x+f[2].x)/6,(-f[0].y+6*f[1].y+f[2].y)/6,(f[1].x+6*f[2].x-f[3].x)/6,(f[1].y+6*f[2].y-f[3].y)/6,f[2].x,f[2].y])}return c}function i(a,b,c,d,e){var f=-3*b+9*c-9*d+3*e,g=a*f+6*b-12*c+6*d;return a*g-3*b+3*c}function j(a,b,c,d,e,f,g,h,j){null==j&&(j=1),j=j>1?1:0>j?0:j;for(var k=j/2,l=12,m=[-.1252,.1252,-.3678,.3678,-.5873,.5873,-.7699,.7699,-.9041,.9041,-.9816,.9816],n=[.2491,.2491,.2335,.2335,.2032,.2032,.1601,.1601,.1069,.1069,.0472,.0472],o=0,p=0;l>p;p++){var q=k*m[p]+k,r=i(q,a,c,e,g),s=i(q,b,d,f,h),t=r*r+s*s;o+=n[p]*N.sqrt(t)}return k*o}function k(a,b,c,d,e,f,g,h,i){if(!(0>i||j(a,b,c,d,e,f,g,h)<i)){var k,l=1,m=l/2,n=l-m,o=.01;for(k=j(a,b,c,d,e,f,g,h,n);Q(k-i)>o;)m/=2,n+=(i>k?1:-1)*m,k=j(a,b,c,d,e,f,g,h,n);return n}}function l(a,b,c,d,e,f,g,h){if(!(O(a,c)<P(e,g)||P(a,c)>O(e,g)||O(b,d)<P(f,h)||P(b,d)>O(f,h))){var i=(a*d-b*c)*(e-g)-(a-c)*(e*h-f*g),j=(a*d-b*c)*(f-h)-(b-d)*(e*h-f*g),k=(a-c)*(f-h)-(b-d)*(e-g);if(k){var l=i/k,m=j/k,n=+l.toFixed(2),o=+m.toFixed(2);if(!(n<+P(a,c).toFixed(2)||n>+O(a,c).toFixed(2)||n<+P(e,g).toFixed(2)||n>+O(e,g).toFixed(2)||o<+P(b,d).toFixed(2)||o>+O(b,d).toFixed(2)||o<+P(f,h).toFixed(2)||o>+O(f,h).toFixed(2)))return{x:l,y:m}}}}function m(a,b,d){var e=c.bezierBBox(a),f=c.bezierBBox(b);if(!c.isBBoxIntersect(e,f))return d?0:[];for(var g=j.apply(0,a),h=j.apply(0,b),i=O(~~(g/5),1),k=O(~~(h/5),1),m=[],n=[],o={},p=d?0:[],q=0;i+1>q;q++){var r=c.findDotsAtSegment.apply(c,a.concat(q/i));m.push({x:r.x,y:r.y,t:q/i})}for(q=0;k+1>q;q++)r=c.findDotsAtSegment.apply(c,b.concat(q/k)),n.push({x:r.x,y:r.y,t:q/k});for(q=0;i>q;q++)for(var s=0;k>s;s++){var t=m[q],u=m[q+1],v=n[s],w=n[s+1],x=Q(u.x-t.x)<.001?"y":"x",y=Q(w.x-v.x)<.001?"y":"x",z=l(t.x,t.y,u.x,u.y,v.x,v.y,w.x,w.y);if(z){if(o[z.x.toFixed(4)]==z.y.toFixed(4))continue;o[z.x.toFixed(4)]=z.y.toFixed(4);var A=t.t+Q((z[x]-t[x])/(u[x]-t[x]))*(u.t-t.t),B=v.t+Q((z[y]-v[y])/(w[y]-v[y]))*(w.t-v.t);A>=0&&1.001>=A&&B>=0&&1.001>=B&&(d?p++:p.push({x:z.x,y:z.y,t1:P(A,1),t2:P(B,1)}))}}return p}function n(a,b,d){a=c._path2curve(a),b=c._path2curve(b);for(var e,f,g,h,i,j,k,l,n,o,p=d?0:[],q=0,r=a.length;r>q;q++){var s=a[q];if("M"==s[0])e=i=s[1],f=j=s[2];else{"C"==s[0]?(n=[e,f].concat(s.slice(1)),e=n[6],f=n[7]):(n=[e,f,e,f,i,j,i,j],e=i,f=j);for(var t=0,u=b.length;u>t;t++){var v=b[t];if("M"==v[0])g=k=v[1],h=l=v[2];else{"C"==v[0]?(o=[g,h].concat(v.slice(1)),g=o[6],h=o[7]):(o=[g,h,g,h,k,l,k,l],g=k,h=l);var w=m(n,o,d);if(d)p+=w;else{for(var x=0,y=w.length;y>x;x++)w[x].segment1=q,w[x].segment2=t,w[x].bez1=n,w[x].bez2=o;p=p.concat(w)}}}}}return p}function o(a,b,c,d,e,f){null!=a?(this.a=+a,this.b=+b,this.c=+c,this.d=+d,this.e=+e,this.f=+f):(this.a=1,this.b=0,this.c=0,this.d=1,this.e=0,this.f=0)}function p(){return this.x+H+this.y+H+this.width+" × "+this.height}function q(a,b,c,d,e,f){function g(a){return((l*a+k)*a+j)*a}function h(a,b){var c=i(a,b);return((o*c+n)*c+m)*c}function i(a,b){var c,d,e,f,h,i;for(e=a,i=0;8>i;i++){if(f=g(e)-a,Q(f)<b)return e;if(h=(3*l*e+2*k)*e+j,Q(h)<1e-6)break;e-=f/h}if(c=0,d=1,e=a,c>e)return c;if(e>d)return d;for(;d>c;){if(f=g(e),Q(f-a)<b)return e;a>f?c=e:d=e,e=(d-c)/2+c}return e}var j=3*b,k=3*(d-b)-j,l=1-j-k,m=3*c,n=3*(e-c)-m,o=1-m-n;return h(a,1/(200*f))}function r(a,b){var c=[],d={};if(this.ms=b,this.times=1,a){for(var e in a)a[z](e)&&(d[_(e)]=a[e],c.push(_(e)));c.sort(lb)}this.anim=d,this.top=c[c.length-1],this.percents=c}function s(a,d,e,f,g,h){e=_(e);var i,j,k,l,m,n,p=a.ms,r={},s={},t={};if(f)for(v=0,x=ic.length;x>v;v++){var u=ic[v];if(u.el.id==d.id&&u.anim==a){u.percent!=e?(ic.splice(v,1),k=1):j=u,d.attr(u.totalOrigin);break}}else f=+s;for(var v=0,x=a.percents.length;x>v;v++){if(a.percents[v]==e||a.percents[v]>f*a.top){e=a.percents[v],m=a.percents[v-1]||0,p=p/a.top*(e-m),l=a.percents[v+1],i=a.anim[e];break}f&&d.attr(a.anim[a.percents[v]])}if(i){if(j)j.initstatus=f,j.start=new Date-j.ms*f;else{for(var y in i)if(i[z](y)&&(db[z](y)||d.paper.customAttributes[z](y)))switch(r[y]=d.attr(y),null==r[y]&&(r[y]=cb[y]),s[y]=i[y],db[y]){case T:t[y]=(s[y]-r[y])/p;break;case"colour":r[y]=c.getRGB(r[y]);var A=c.getRGB(s[y]);t[y]={r:(A.r-r[y].r)/p,g:(A.g-r[y].g)/p,b:(A.b-r[y].b)/p};break;case"path":var B=Kb(r[y],s[y]),C=B[1];for(r[y]=B[0],t[y]=[],v=0,x=r[y].length;x>v;v++){t[y][v]=[0];for(var D=1,F=r[y][v].length;F>D;D++)t[y][v][D]=(C[v][D]-r[y][v][D])/p}break;case"transform":var G=d._,H=Pb(G[y],s[y]);if(H)for(r[y]=H.from,s[y]=H.to,t[y]=[],t[y].real=!0,v=0,x=r[y].length;x>v;v++)for(t[y][v]=[r[y][v][0]],D=1,F=r[y][v].length;F>D;D++)t[y][v][D]=(s[y][v][D]-r[y][v][D])/p;else{var K=d.matrix||new o,L={_:{transform:G.transform},getBBox:function(){return d.getBBox(1)}};r[y]=[K.a,K.b,K.c,K.d,K.e,K.f],Nb(L,s[y]),s[y]=L._.transform,t[y]=[(L.matrix.a-K.a)/p,(L.matrix.b-K.b)/p,(L.matrix.c-K.c)/p,(L.matrix.d-K.d)/p,(L.matrix.e-K.e)/p,(L.matrix.f-K.f)/p]}break;case"csv":var M=I(i[y])[J](w),N=I(r[y])[J](w);if("clip-rect"==y)for(r[y]=N,t[y]=[],v=N.length;v--;)t[y][v]=(M[v]-r[y][v])/p;s[y]=M;break;default:for(M=[][E](i[y]),N=[][E](r[y]),t[y]=[],v=d.paper.customAttributes[y].length;v--;)t[y][v]=((M[v]||0)-(N[v]||0))/p}var O=i.easing,P=c.easing_formulas[O];if(!P)if(P=I(O).match(Z),P&&5==P.length){var Q=P;P=function(a){return q(a,+Q[1],+Q[2],+Q[3],+Q[4],p)}}else P=nb;if(n=i.start||a.start||+new Date,u={anim:a,percent:e,timestamp:n,start:n+(a.del||0),status:0,initstatus:f||0,stop:!1,ms:p,easing:P,from:r,diff:t,to:s,el:d,callback:i.callback,prev:m,next:l,repeat:h||a.times,origin:d.attr(),totalOrigin:g},ic.push(u),f&&!j&&!k&&(u.stop=!0,u.start=new Date-p*f,1==ic.length))return kc();k&&(u.start=new Date-u.ms*f),1==ic.length&&jc(kc)}b("raphael.anim.start."+d.id,d,a)}}function t(a){for(var b=0;b<ic.length;b++)ic[b].el.paper==a&&ic.splice(b--,1)}c.version="2.1.2",c.eve=b;var u,v,w=/[, ]+/,x={circle:1,rect:1,path:1,ellipse:1,text:1,image:1},y=/\{(\d+)\}/g,z="hasOwnProperty",A={doc:document,win:a},B={was:Object.prototype[z].call(A.win,"Raphael"),is:A.win.Raphael},C=function(){this.ca=this.customAttributes={}},D="apply",E="concat",F="ontouchstart"in A.win||A.win.DocumentTouch&&A.doc instanceof DocumentTouch,G="",H=" ",I=String,J="split",K="click dblclick mousedown mousemove mouseout mouseover mouseup touchstart touchmove touchend touchcancel"[J](H),L={mousedown:"touchstart",mousemove:"touchmove",mouseup:"touchend"},M=I.prototype.toLowerCase,N=Math,O=N.max,P=N.min,Q=N.abs,R=N.pow,S=N.PI,T="number",U="string",V="array",W=Object.prototype.toString,X=(c._ISURL=/^url\(['"]?(.+?)['"]?\)$/i,/^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgba?\(\s*([\d\.]+%?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+%?(?:\s*,\s*[\d\.]+%?)?)\s*\)|hsba?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\)|hsla?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\))\s*$/i),Y={NaN:1,Infinity:1,"-Infinity":1},Z=/^(?:cubic-)?bezier\(([^,]+),([^,]+),([^,]+),([^\)]+)\)/,$=N.round,_=parseFloat,ab=parseInt,bb=I.prototype.toUpperCase,cb=c._availableAttrs={"arrow-end":"none","arrow-start":"none",blur:0,"clip-rect":"0 0 1e9 1e9",cursor:"default",cx:0,cy:0,fill:"#fff","fill-opacity":1,font:'10px "Arial"',"font-family":'"Arial"',"font-size":"10","font-style":"normal","font-weight":400,gradient:0,height:0,href:"http://raphaeljs.com/","letter-spacing":0,opacity:1,path:"M0,0",r:0,rx:0,ry:0,src:"",stroke:"#000","stroke-dasharray":"","stroke-linecap":"butt","stroke-linejoin":"butt","stroke-miterlimit":0,"stroke-opacity":1,"stroke-width":1,target:"_blank","text-anchor":"middle",title:"Raphael",transform:"",width:0,x:0,y:0},db=c._availableAnimAttrs={blur:T,"clip-rect":"csv",cx:T,cy:T,fill:"colour","fill-opacity":T,"font-size":T,height:T,opacity:T,path:"path",r:T,rx:T,ry:T,stroke:"colour","stroke-opacity":T,"stroke-width":T,transform:"transform",width:T,x:T,y:T},eb=/[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*/,fb={hs:1,rg:1},gb=/,?([achlmqrstvxz]),?/gi,hb=/([achlmrqstvz])[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*)+)/gi,ib=/([rstm])[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*)+)/gi,jb=/(-?\d*\.?\d*(?:e[\-+]?\d+)?)[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*/gi,kb=(c._radial_gradient=/^r(?:\(([^,]+?)[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*([^\)]+?)\))?/,{}),lb=function(a,b){return _(a)-_(b)},mb=function(){},nb=function(a){return a},ob=c._rectPath=function(a,b,c,d,e){return e?[["M",a+e,b],["l",c-2*e,0],["a",e,e,0,0,1,e,e],["l",0,d-2*e],["a",e,e,0,0,1,-e,e],["l",2*e-c,0],["a",e,e,0,0,1,-e,-e],["l",0,2*e-d],["a",e,e,0,0,1,e,-e],["z"]]:[["M",a,b],["l",c,0],["l",0,d],["l",-c,0],["z"]]},pb=function(a,b,c,d){return null==d&&(d=c),[["M",a,b],["m",0,-d],["a",c,d,0,1,1,0,2*d],["a",c,d,0,1,1,0,-2*d],["z"]]},qb=c._getPath={path:function(a){return a.attr("path")},circle:function(a){var b=a.attrs;return pb(b.cx,b.cy,b.r)},ellipse:function(a){var b=a.attrs;return pb(b.cx,b.cy,b.rx,b.ry)},rect:function(a){var b=a.attrs;return ob(b.x,b.y,b.width,b.height,b.r)},image:function(a){var b=a.attrs;return ob(b.x,b.y,b.width,b.height)},text:function(a){var b=a._getBBox();return ob(b.x,b.y,b.width,b.height)},set:function(a){var b=a._getBBox();return ob(b.x,b.y,b.width,b.height)}},rb=c.mapPath=function(a,b){if(!b)return a;var c,d,e,f,g,h,i;for(a=Kb(a),e=0,g=a.length;g>e;e++)for(i=a[e],f=1,h=i.length;h>f;f+=2)c=b.x(i[f],i[f+1]),d=b.y(i[f],i[f+1]),i[f]=c,i[f+1]=d;return a};if(c._g=A,c.type=A.win.SVGAngle||A.doc.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1")?"SVG":"VML","VML"==c.type){var sb,tb=A.doc.createElement("div");if(tb.innerHTML='<v:shape adj="1"/>',sb=tb.firstChild,sb.style.behavior="url(#default#VML)",!sb||"object"!=typeof sb.adj)return c.type=G;tb=null}c.svg=!(c.vml="VML"==c.type),c._Paper=C,c.fn=v=C.prototype=c.prototype,c._id=0,c._oid=0,c.is=function(a,b){return b=M.call(b),"finite"==b?!Y[z](+a):"array"==b?a instanceof Array:"null"==b&&null===a||b==typeof a&&null!==a||"object"==b&&a===Object(a)||"array"==b&&Array.isArray&&Array.isArray(a)||W.call(a).slice(8,-1).toLowerCase()==b},c.angle=function(a,b,d,e,f,g){if(null==f){var h=a-d,i=b-e;return h||i?(180+180*N.atan2(-i,-h)/S+360)%360:0}return c.angle(a,b,f,g)-c.angle(d,e,f,g)},c.rad=function(a){return a%360*S/180},c.deg=function(a){return 180*a/S%360},c.snapTo=function(a,b,d){if(d=c.is(d,"finite")?d:10,c.is(a,V)){for(var e=a.length;e--;)if(Q(a[e]-b)<=d)return a[e]}else{a=+a;var f=b%a;if(d>f)return b-f;if(f>a-d)return b-f+a}return b};c.createUUID=function(a,b){return function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(a,b).toUpperCase()}}(/[xy]/g,function(a){var b=16*N.random()|0,c="x"==a?b:3&b|8;return c.toString(16)});c.setWindow=function(a){b("raphael.setWindow",c,A.win,a),A.win=a,A.doc=A.win.document,c._engine.initWin&&c._engine.initWin(A.win)};var ub=function(a){if(c.vml){var b,d=/^\s+|\s+$/g;try{var e=new ActiveXObject("htmlfile");e.write("<body>"),e.close(),b=e.body}catch(g){b=createPopup().document.body}var h=b.createTextRange();ub=f(function(a){try{b.style.color=I(a).replace(d,G);var c=h.queryCommandValue("ForeColor");return c=(255&c)<<16|65280&c|(16711680&c)>>>16,"#"+("000000"+c.toString(16)).slice(-6)}catch(e){return"none"}})}else{var i=A.doc.createElement("i");i.title="Raphaël Colour Picker",i.style.display="none",A.doc.body.appendChild(i),ub=f(function(a){return i.style.color=a,A.doc.defaultView.getComputedStyle(i,G).getPropertyValue("color")})}return ub(a)},vb=function(){return"hsb("+[this.h,this.s,this.b]+")"},wb=function(){return"hsl("+[this.h,this.s,this.l]+")"},xb=function(){return this.hex},yb=function(a,b,d){if(null==b&&c.is(a,"object")&&"r"in a&&"g"in a&&"b"in a&&(d=a.b,b=a.g,a=a.r),null==b&&c.is(a,U)){var e=c.getRGB(a);a=e.r,b=e.g,d=e.b}return(a>1||b>1||d>1)&&(a/=255,b/=255,d/=255),[a,b,d]},zb=function(a,b,d,e){a*=255,b*=255,d*=255;var f={r:a,g:b,b:d,hex:c.rgb(a,b,d),toString:xb};return c.is(e,"finite")&&(f.opacity=e),f};c.color=function(a){var b;return c.is(a,"object")&&"h"in a&&"s"in a&&"b"in a?(b=c.hsb2rgb(a),a.r=b.r,a.g=b.g,a.b=b.b,a.hex=b.hex):c.is(a,"object")&&"h"in a&&"s"in a&&"l"in a?(b=c.hsl2rgb(a),a.r=b.r,a.g=b.g,a.b=b.b,a.hex=b.hex):(c.is(a,"string")&&(a=c.getRGB(a)),c.is(a,"object")&&"r"in a&&"g"in a&&"b"in a?(b=c.rgb2hsl(a),a.h=b.h,a.s=b.s,a.l=b.l,b=c.rgb2hsb(a),a.v=b.b):(a={hex:"none"},a.r=a.g=a.b=a.h=a.s=a.v=a.l=-1)),a.toString=xb,a},c.hsb2rgb=function(a,b,c,d){this.is(a,"object")&&"h"in a&&"s"in a&&"b"in a&&(c=a.b,b=a.s,d=a.o,a=a.h),a*=360;var e,f,g,h,i;return a=a%360/60,i=c*b,h=i*(1-Q(a%2-1)),e=f=g=c-i,a=~~a,e+=[i,h,0,0,h,i][a],f+=[h,i,i,h,0,0][a],g+=[0,0,h,i,i,h][a],zb(e,f,g,d)},c.hsl2rgb=function(a,b,c,d){this.is(a,"object")&&"h"in a&&"s"in a&&"l"in a&&(c=a.l,b=a.s,a=a.h),(a>1||b>1||c>1)&&(a/=360,b/=100,c/=100),a*=360;var e,f,g,h,i;return a=a%360/60,i=2*b*(.5>c?c:1-c),h=i*(1-Q(a%2-1)),e=f=g=c-i/2,a=~~a,e+=[i,h,0,0,h,i][a],f+=[h,i,i,h,0,0][a],g+=[0,0,h,i,i,h][a],zb(e,f,g,d)},c.rgb2hsb=function(a,b,c){c=yb(a,b,c),a=c[0],b=c[1],c=c[2];var d,e,f,g;return f=O(a,b,c),g=f-P(a,b,c),d=0==g?null:f==a?(b-c)/g:f==b?(c-a)/g+2:(a-b)/g+4,d=(d+360)%6*60/360,e=0==g?0:g/f,{h:d,s:e,b:f,toString:vb}},c.rgb2hsl=function(a,b,c){c=yb(a,b,c),a=c[0],b=c[1],c=c[2];var d,e,f,g,h,i;return g=O(a,b,c),h=P(a,b,c),i=g-h,d=0==i?null:g==a?(b-c)/i:g==b?(c-a)/i+2:(a-b)/i+4,d=(d+360)%6*60/360,f=(g+h)/2,e=0==i?0:.5>f?i/(2*f):i/(2-2*f),{h:d,s:e,l:f,toString:wb}},c._path2string=function(){return this.join(",").replace(gb,"$1")};c._preload=function(a,b){var c=A.doc.createElement("img");c.style.cssText="position:absolute;left:-9999em;top:-9999em",c.onload=function(){b.call(this),this.onload=null,A.doc.body.removeChild(this)},c.onerror=function(){A.doc.body.removeChild(this)},A.doc.body.appendChild(c),c.src=a};c.getRGB=f(function(a){if(!a||(a=I(a)).indexOf("-")+1)return{r:-1,g:-1,b:-1,hex:"none",error:1,toString:g};if("none"==a)return{r:-1,g:-1,b:-1,hex:"none",toString:g};!(fb[z](a.toLowerCase().substring(0,2))||"#"==a.charAt())&&(a=ub(a));var b,d,e,f,h,i,j=a.match(X);return j?(j[2]&&(e=ab(j[2].substring(5),16),d=ab(j[2].substring(3,5),16),b=ab(j[2].substring(1,3),16)),j[3]&&(e=ab((h=j[3].charAt(3))+h,16),d=ab((h=j[3].charAt(2))+h,16),b=ab((h=j[3].charAt(1))+h,16)),j[4]&&(i=j[4][J](eb),b=_(i[0]),"%"==i[0].slice(-1)&&(b*=2.55),d=_(i[1]),"%"==i[1].slice(-1)&&(d*=2.55),e=_(i[2]),"%"==i[2].slice(-1)&&(e*=2.55),"rgba"==j[1].toLowerCase().slice(0,4)&&(f=_(i[3])),i[3]&&"%"==i[3].slice(-1)&&(f/=100)),j[5]?(i=j[5][J](eb),b=_(i[0]),"%"==i[0].slice(-1)&&(b*=2.55),d=_(i[1]),"%"==i[1].slice(-1)&&(d*=2.55),e=_(i[2]),"%"==i[2].slice(-1)&&(e*=2.55),("deg"==i[0].slice(-3)||"°"==i[0].slice(-1))&&(b/=360),"hsba"==j[1].toLowerCase().slice(0,4)&&(f=_(i[3])),i[3]&&"%"==i[3].slice(-1)&&(f/=100),c.hsb2rgb(b,d,e,f)):j[6]?(i=j[6][J](eb),b=_(i[0]),"%"==i[0].slice(-1)&&(b*=2.55),d=_(i[1]),"%"==i[1].slice(-1)&&(d*=2.55),e=_(i[2]),"%"==i[2].slice(-1)&&(e*=2.55),("deg"==i[0].slice(-3)||"°"==i[0].slice(-1))&&(b/=360),"hsla"==j[1].toLowerCase().slice(0,4)&&(f=_(i[3])),i[3]&&"%"==i[3].slice(-1)&&(f/=100),c.hsl2rgb(b,d,e,f)):(j={r:b,g:d,b:e,toString:g},j.hex="#"+(16777216|e|d<<8|b<<16).toString(16).slice(1),c.is(f,"finite")&&(j.opacity=f),j)):{r:-1,g:-1,b:-1,hex:"none",error:1,toString:g}},c),c.hsb=f(function(a,b,d){return c.hsb2rgb(a,b,d).hex}),c.hsl=f(function(a,b,d){return c.hsl2rgb(a,b,d).hex}),c.rgb=f(function(a,b,c){return"#"+(16777216|c|b<<8|a<<16).toString(16).slice(1)}),c.getColor=function(a){var b=this.getColor.start=this.getColor.start||{h:0,s:1,b:a||.75},c=this.hsb2rgb(b.h,b.s,b.b);return b.h+=.075,b.h>1&&(b.h=0,b.s-=.2,b.s<=0&&(this.getColor.start={h:0,s:1,b:b.b})),c.hex},c.getColor.reset=function(){delete this.start},c.parsePathString=function(a){if(!a)return null;var b=Ab(a);if(b.arr)return Cb(b.arr);var d={a:7,c:6,h:1,l:2,m:2,r:4,q:4,s:4,t:2,v:1,z:0},e=[];return c.is(a,V)&&c.is(a[0],V)&&(e=Cb(a)),e.length||I(a).replace(hb,function(a,b,c){var f=[],g=b.toLowerCase();if(c.replace(jb,function(a,b){b&&f.push(+b)}),"m"==g&&f.length>2&&(e.push([b][E](f.splice(0,2))),g="l",b="m"==b?"l":"L"),"r"==g)e.push([b][E](f));else for(;f.length>=d[g]&&(e.push([b][E](f.splice(0,d[g]))),d[g]););}),e.toString=c._path2string,b.arr=Cb(e),e},c.parseTransformString=f(function(a){if(!a)return null;var b=[];return c.is(a,V)&&c.is(a[0],V)&&(b=Cb(a)),b.length||I(a).replace(ib,function(a,c,d){{var e=[];M.call(c)}d.replace(jb,function(a,b){b&&e.push(+b)}),b.push([c][E](e))}),b.toString=c._path2string,b});var Ab=function(a){var b=Ab.ps=Ab.ps||{};return b[a]?b[a].sleep=100:b[a]={sleep:100},setTimeout(function(){for(var c in b)b[z](c)&&c!=a&&(b[c].sleep--,!b[c].sleep&&delete b[c])}),b[a]};c.findDotsAtSegment=function(a,b,c,d,e,f,g,h,i){var j=1-i,k=R(j,3),l=R(j,2),m=i*i,n=m*i,o=k*a+3*l*i*c+3*j*i*i*e+n*g,p=k*b+3*l*i*d+3*j*i*i*f+n*h,q=a+2*i*(c-a)+m*(e-2*c+a),r=b+2*i*(d-b)+m*(f-2*d+b),s=c+2*i*(e-c)+m*(g-2*e+c),t=d+2*i*(f-d)+m*(h-2*f+d),u=j*a+i*c,v=j*b+i*d,w=j*e+i*g,x=j*f+i*h,y=90-180*N.atan2(q-s,r-t)/S;return(q>s||t>r)&&(y+=180),{x:o,y:p,m:{x:q,y:r},n:{x:s,y:t},start:{x:u,y:v},end:{x:w,y:x},alpha:y}},c.bezierBBox=function(a,b,d,e,f,g,h,i){c.is(a,"array")||(a=[a,b,d,e,f,g,h,i]);var j=Jb.apply(null,a);return{x:j.min.x,y:j.min.y,x2:j.max.x,y2:j.max.y,width:j.max.x-j.min.x,height:j.max.y-j.min.y}},c.isPointInsideBBox=function(a,b,c){return b>=a.x&&b<=a.x2&&c>=a.y&&c<=a.y2},c.isBBoxIntersect=function(a,b){var d=c.isPointInsideBBox;return d(b,a.x,a.y)||d(b,a.x2,a.y)||d(b,a.x,a.y2)||d(b,a.x2,a.y2)||d(a,b.x,b.y)||d(a,b.x2,b.y)||d(a,b.x,b.y2)||d(a,b.x2,b.y2)||(a.x<b.x2&&a.x>b.x||b.x<a.x2&&b.x>a.x)&&(a.y<b.y2&&a.y>b.y||b.y<a.y2&&b.y>a.y)},c.pathIntersection=function(a,b){return n(a,b)},c.pathIntersectionNumber=function(a,b){return n(a,b,1)},c.isPointInsidePath=function(a,b,d){var e=c.pathBBox(a);return c.isPointInsideBBox(e,b,d)&&n(a,[["M",b,d],["H",e.x2+10]],1)%2==1},c._removedFactory=function(a){return function(){b("raphael.log",null,"Raphaël: you are calling to method “"+a+"” of removed object",a)}};var Bb=c.pathBBox=function(a){var b=Ab(a);if(b.bbox)return d(b.bbox);if(!a)return{x:0,y:0,width:0,height:0,x2:0,y2:0};a=Kb(a);for(var c,e=0,f=0,g=[],h=[],i=0,j=a.length;j>i;i++)if(c=a[i],"M"==c[0])e=c[1],f=c[2],g.push(e),h.push(f);else{var k=Jb(e,f,c[1],c[2],c[3],c[4],c[5],c[6]);g=g[E](k.min.x,k.max.x),h=h[E](k.min.y,k.max.y),e=c[5],f=c[6]}var l=P[D](0,g),m=P[D](0,h),n=O[D](0,g),o=O[D](0,h),p=n-l,q=o-m,r={x:l,y:m,x2:n,y2:o,width:p,height:q,cx:l+p/2,cy:m+q/2};return b.bbox=d(r),r},Cb=function(a){var b=d(a);return b.toString=c._path2string,b},Db=c._pathToRelative=function(a){var b=Ab(a);if(b.rel)return Cb(b.rel);c.is(a,V)&&c.is(a&&a[0],V)||(a=c.parsePathString(a));var d=[],e=0,f=0,g=0,h=0,i=0;"M"==a[0][0]&&(e=a[0][1],f=a[0][2],g=e,h=f,i++,d.push(["M",e,f]));for(var j=i,k=a.length;k>j;j++){var l=d[j]=[],m=a[j];if(m[0]!=M.call(m[0]))switch(l[0]=M.call(m[0]),l[0]){case"a":l[1]=m[1],l[2]=m[2],l[3]=m[3],l[4]=m[4],l[5]=m[5],l[6]=+(m[6]-e).toFixed(3),l[7]=+(m[7]-f).toFixed(3);break;case"v":l[1]=+(m[1]-f).toFixed(3);break;case"m":g=m[1],h=m[2];default:for(var n=1,o=m.length;o>n;n++)l[n]=+(m[n]-(n%2?e:f)).toFixed(3)}else{l=d[j]=[],"m"==m[0]&&(g=m[1]+e,h=m[2]+f);for(var p=0,q=m.length;q>p;p++)d[j][p]=m[p]}var r=d[j].length;switch(d[j][0]){case"z":e=g,f=h;break;case"h":e+=+d[j][r-1];break;case"v":f+=+d[j][r-1];break;default:e+=+d[j][r-2],f+=+d[j][r-1]}}return d.toString=c._path2string,b.rel=Cb(d),d},Eb=c._pathToAbsolute=function(a){var b=Ab(a);if(b.abs)return Cb(b.abs);if(c.is(a,V)&&c.is(a&&a[0],V)||(a=c.parsePathString(a)),!a||!a.length)return[["M",0,0]];var d=[],e=0,f=0,g=0,i=0,j=0;"M"==a[0][0]&&(e=+a[0][1],f=+a[0][2],g=e,i=f,j++,d[0]=["M",e,f]);for(var k,l,m=3==a.length&&"M"==a[0][0]&&"R"==a[1][0].toUpperCase()&&"Z"==a[2][0].toUpperCase(),n=j,o=a.length;o>n;n++){if(d.push(k=[]),l=a[n],l[0]!=bb.call(l[0]))switch(k[0]=bb.call(l[0]),k[0]){case"A":k[1]=l[1],k[2]=l[2],k[3]=l[3],k[4]=l[4],k[5]=l[5],k[6]=+(l[6]+e),k[7]=+(l[7]+f);break;case"V":k[1]=+l[1]+f;break;case"H":k[1]=+l[1]+e;break;case"R":for(var p=[e,f][E](l.slice(1)),q=2,r=p.length;r>q;q++)p[q]=+p[q]+e,p[++q]=+p[q]+f;d.pop(),d=d[E](h(p,m));break;case"M":g=+l[1]+e,i=+l[2]+f;default:for(q=1,r=l.length;r>q;q++)k[q]=+l[q]+(q%2?e:f)}else if("R"==l[0])p=[e,f][E](l.slice(1)),d.pop(),d=d[E](h(p,m)),k=["R"][E](l.slice(-2));else for(var s=0,t=l.length;t>s;s++)k[s]=l[s];switch(k[0]){case"Z":e=g,f=i;break;case"H":e=k[1];break;case"V":f=k[1];break;case"M":g=k[k.length-2],i=k[k.length-1];default:e=k[k.length-2],f=k[k.length-1]}}return d.toString=c._path2string,b.abs=Cb(d),d},Fb=function(a,b,c,d){return[a,b,c,d,c,d]},Gb=function(a,b,c,d,e,f){var g=1/3,h=2/3;return[g*a+h*c,g*b+h*d,g*e+h*c,g*f+h*d,e,f]},Hb=function(a,b,c,d,e,g,h,i,j,k){var l,m=120*S/180,n=S/180*(+e||0),o=[],p=f(function(a,b,c){var d=a*N.cos(c)-b*N.sin(c),e=a*N.sin(c)+b*N.cos(c);return{x:d,y:e}});if(k)y=k[0],z=k[1],w=k[2],x=k[3];else{l=p(a,b,-n),a=l.x,b=l.y,l=p(i,j,-n),i=l.x,j=l.y;var q=(N.cos(S/180*e),N.sin(S/180*e),(a-i)/2),r=(b-j)/2,s=q*q/(c*c)+r*r/(d*d);s>1&&(s=N.sqrt(s),c=s*c,d=s*d);var t=c*c,u=d*d,v=(g==h?-1:1)*N.sqrt(Q((t*u-t*r*r-u*q*q)/(t*r*r+u*q*q))),w=v*c*r/d+(a+i)/2,x=v*-d*q/c+(b+j)/2,y=N.asin(((b-x)/d).toFixed(9)),z=N.asin(((j-x)/d).toFixed(9));y=w>a?S-y:y,z=w>i?S-z:z,0>y&&(y=2*S+y),0>z&&(z=2*S+z),h&&y>z&&(y-=2*S),!h&&z>y&&(z-=2*S)}var A=z-y;if(Q(A)>m){var B=z,C=i,D=j;z=y+m*(h&&z>y?1:-1),i=w+c*N.cos(z),j=x+d*N.sin(z),o=Hb(i,j,c,d,e,0,h,C,D,[z,B,w,x])}A=z-y;var F=N.cos(y),G=N.sin(y),H=N.cos(z),I=N.sin(z),K=N.tan(A/4),L=4/3*c*K,M=4/3*d*K,O=[a,b],P=[a+L*G,b-M*F],R=[i+L*I,j-M*H],T=[i,j];if(P[0]=2*O[0]-P[0],P[1]=2*O[1]-P[1],k)return[P,R,T][E](o);o=[P,R,T][E](o).join()[J](",");for(var U=[],V=0,W=o.length;W>V;V++)U[V]=V%2?p(o[V-1],o[V],n).y:p(o[V],o[V+1],n).x;return U},Ib=function(a,b,c,d,e,f,g,h,i){var j=1-i;return{x:R(j,3)*a+3*R(j,2)*i*c+3*j*i*i*e+R(i,3)*g,y:R(j,3)*b+3*R(j,2)*i*d+3*j*i*i*f+R(i,3)*h}},Jb=f(function(a,b,c,d,e,f,g,h){var i,j=e-2*c+a-(g-2*e+c),k=2*(c-a)-2*(e-c),l=a-c,m=(-k+N.sqrt(k*k-4*j*l))/2/j,n=(-k-N.sqrt(k*k-4*j*l))/2/j,o=[b,h],p=[a,g];return Q(m)>"1e12"&&(m=.5),Q(n)>"1e12"&&(n=.5),m>0&&1>m&&(i=Ib(a,b,c,d,e,f,g,h,m),p.push(i.x),o.push(i.y)),n>0&&1>n&&(i=Ib(a,b,c,d,e,f,g,h,n),p.push(i.x),o.push(i.y)),j=f-2*d+b-(h-2*f+d),k=2*(d-b)-2*(f-d),l=b-d,m=(-k+N.sqrt(k*k-4*j*l))/2/j,n=(-k-N.sqrt(k*k-4*j*l))/2/j,Q(m)>"1e12"&&(m=.5),Q(n)>"1e12"&&(n=.5),m>0&&1>m&&(i=Ib(a,b,c,d,e,f,g,h,m),p.push(i.x),o.push(i.y)),n>0&&1>n&&(i=Ib(a,b,c,d,e,f,g,h,n),p.push(i.x),o.push(i.y)),{min:{x:P[D](0,p),y:P[D](0,o)},max:{x:O[D](0,p),y:O[D](0,o)}}}),Kb=c._path2curve=f(function(a,b){var c=!b&&Ab(a);if(!b&&c.curve)return Cb(c.curve);for(var d=Eb(a),e=b&&Eb(b),f={x:0,y:0,bx:0,by:0,X:0,Y:0,qx:null,qy:null},g={x:0,y:0,bx:0,by:0,X:0,Y:0,qx:null,qy:null},h=(function(a,b,c){var d,e,f={T:1,Q:1};if(!a)return["C",b.x,b.y,b.x,b.y,b.x,b.y];switch(!(a[0]in f)&&(b.qx=b.qy=null),a[0]){case"M":b.X=a[1],b.Y=a[2];break;case"A":a=["C"][E](Hb[D](0,[b.x,b.y][E](a.slice(1))));break;case"S":"C"==c||"S"==c?(d=2*b.x-b.bx,e=2*b.y-b.by):(d=b.x,e=b.y),a=["C",d,e][E](a.slice(1));break;case"T":"Q"==c||"T"==c?(b.qx=2*b.x-b.qx,b.qy=2*b.y-b.qy):(b.qx=b.x,b.qy=b.y),a=["C"][E](Gb(b.x,b.y,b.qx,b.qy,a[1],a[2]));break;case"Q":b.qx=a[1],b.qy=a[2],a=["C"][E](Gb(b.x,b.y,a[1],a[2],a[3],a[4]));break;case"L":a=["C"][E](Fb(b.x,b.y,a[1],a[2]));break;case"H":a=["C"][E](Fb(b.x,b.y,a[1],b.y));break;case"V":a=["C"][E](Fb(b.x,b.y,b.x,a[1]));break;case"Z":a=["C"][E](Fb(b.x,b.y,b.X,b.Y))}return a}),i=function(a,b){if(a[b].length>7){a[b].shift();for(var c=a[b];c.length;)k[b]="A",e&&(l[b]="A"),a.splice(b++,0,["C"][E](c.splice(0,6)));a.splice(b,1),p=O(d.length,e&&e.length||0)}},j=function(a,b,c,f,g){a&&b&&"M"==a[g][0]&&"M"!=b[g][0]&&(b.splice(g,0,["M",f.x,f.y]),c.bx=0,c.by=0,c.x=a[g][1],c.y=a[g][2],p=O(d.length,e&&e.length||0))},k=[],l=[],m="",n="",o=0,p=O(d.length,e&&e.length||0);p>o;o++){d[o]&&(m=d[o][0]),"C"!=m&&(k[o]=m,o&&(n=k[o-1])),d[o]=h(d[o],f,n),"A"!=k[o]&&"C"==m&&(k[o]="C"),i(d,o),e&&(e[o]&&(m=e[o][0]),"C"!=m&&(l[o]=m,o&&(n=l[o-1])),e[o]=h(e[o],g,n),"A"!=l[o]&&"C"==m&&(l[o]="C"),i(e,o)),j(d,e,f,g,o),j(e,d,g,f,o);var q=d[o],r=e&&e[o],s=q.length,t=e&&r.length;f.x=q[s-2],f.y=q[s-1],f.bx=_(q[s-4])||f.x,f.by=_(q[s-3])||f.y,g.bx=e&&(_(r[t-4])||g.x),g.by=e&&(_(r[t-3])||g.y),g.x=e&&r[t-2],g.y=e&&r[t-1]}return e||(c.curve=Cb(d)),e?[d,e]:d},null,Cb),Lb=(c._parseDots=f(function(a){for(var b=[],d=0,e=a.length;e>d;d++){var f={},g=a[d].match(/^([^:]*):?([\d\.]*)/);if(f.color=c.getRGB(g[1]),f.color.error)return null;f.color=f.color.hex,g[2]&&(f.offset=g[2]+"%"),b.push(f)}for(d=1,e=b.length-1;e>d;d++)if(!b[d].offset){for(var h=_(b[d-1].offset||0),i=0,j=d+1;e>j;j++)if(b[j].offset){i=b[j].offset;break}i||(i=100,j=e),i=_(i);for(var k=(i-h)/(j-d+1);j>d;d++)h+=k,b[d].offset=h+"%"}return b}),c._tear=function(a,b){a==b.top&&(b.top=a.prev),a==b.bottom&&(b.bottom=a.next),a.next&&(a.next.prev=a.prev),a.prev&&(a.prev.next=a.next)}),Mb=(c._tofront=function(a,b){b.top!==a&&(Lb(a,b),a.next=null,a.prev=b.top,b.top.next=a,b.top=a)},c._toback=function(a,b){b.bottom!==a&&(Lb(a,b),a.next=b.bottom,a.prev=null,b.bottom.prev=a,b.bottom=a)},c._insertafter=function(a,b,c){Lb(a,c),b==c.top&&(c.top=a),b.next&&(b.next.prev=a),a.next=b.next,a.prev=b,b.next=a},c._insertbefore=function(a,b,c){Lb(a,c),b==c.bottom&&(c.bottom=a),b.prev&&(b.prev.next=a),a.prev=b.prev,b.prev=a,a.next=b},c.toMatrix=function(a,b){var c=Bb(a),d={_:{transform:G},getBBox:function(){return c}};return Nb(d,b),d.matrix}),Nb=(c.transformPath=function(a,b){return rb(a,Mb(a,b))},c._extractTransform=function(a,b){if(null==b)return a._.transform;b=I(b).replace(/\.{3}|\u2026/g,a._.transform||G);var d=c.parseTransformString(b),e=0,f=0,g=0,h=1,i=1,j=a._,k=new o;if(j.transform=d||[],d)for(var l=0,m=d.length;m>l;l++){var n,p,q,r,s,t=d[l],u=t.length,v=I(t[0]).toLowerCase(),w=t[0]!=v,x=w?k.invert():0;"t"==v&&3==u?w?(n=x.x(0,0),p=x.y(0,0),q=x.x(t[1],t[2]),r=x.y(t[1],t[2]),k.translate(q-n,r-p)):k.translate(t[1],t[2]):"r"==v?2==u?(s=s||a.getBBox(1),k.rotate(t[1],s.x+s.width/2,s.y+s.height/2),e+=t[1]):4==u&&(w?(q=x.x(t[2],t[3]),r=x.y(t[2],t[3]),k.rotate(t[1],q,r)):k.rotate(t[1],t[2],t[3]),e+=t[1]):"s"==v?2==u||3==u?(s=s||a.getBBox(1),k.scale(t[1],t[u-1],s.x+s.width/2,s.y+s.height/2),h*=t[1],i*=t[u-1]):5==u&&(w?(q=x.x(t[3],t[4]),r=x.y(t[3],t[4]),k.scale(t[1],t[2],q,r)):k.scale(t[1],t[2],t[3],t[4]),h*=t[1],i*=t[2]):"m"==v&&7==u&&k.add(t[1],t[2],t[3],t[4],t[5],t[6]),j.dirtyT=1,a.matrix=k}a.matrix=k,j.sx=h,j.sy=i,j.deg=e,j.dx=f=k.e,j.dy=g=k.f,1==h&&1==i&&!e&&j.bbox?(j.bbox.x+=+f,j.bbox.y+=+g):j.dirtyT=1}),Ob=function(a){var b=a[0];switch(b.toLowerCase()){case"t":return[b,0,0];case"m":return[b,1,0,0,1,0,0];case"r":return 4==a.length?[b,0,a[2],a[3]]:[b,0];case"s":return 5==a.length?[b,1,1,a[3],a[4]]:3==a.length?[b,1,1]:[b,1]}},Pb=c._equaliseTransform=function(a,b){b=I(b).replace(/\.{3}|\u2026/g,a),a=c.parseTransformString(a)||[],b=c.parseTransformString(b)||[];
-for(var d,e,f,g,h=O(a.length,b.length),i=[],j=[],k=0;h>k;k++){if(f=a[k]||Ob(b[k]),g=b[k]||Ob(f),f[0]!=g[0]||"r"==f[0].toLowerCase()&&(f[2]!=g[2]||f[3]!=g[3])||"s"==f[0].toLowerCase()&&(f[3]!=g[3]||f[4]!=g[4]))return;for(i[k]=[],j[k]=[],d=0,e=O(f.length,g.length);e>d;d++)d in f&&(i[k][d]=f[d]),d in g&&(j[k][d]=g[d])}return{from:i,to:j}};c._getContainer=function(a,b,d,e){var f;return f=null!=e||c.is(a,"object")?a:A.doc.getElementById(a),null!=f?f.tagName?null==b?{container:f,width:f.style.pixelWidth||f.offsetWidth,height:f.style.pixelHeight||f.offsetHeight}:{container:f,width:b,height:d}:{container:1,x:a,y:b,width:d,height:e}:void 0},c.pathToRelative=Db,c._engine={},c.path2curve=Kb,c.matrix=function(a,b,c,d,e,f){return new o(a,b,c,d,e,f)},function(a){function b(a){return a[0]*a[0]+a[1]*a[1]}function d(a){var c=N.sqrt(b(a));a[0]&&(a[0]/=c),a[1]&&(a[1]/=c)}a.add=function(a,b,c,d,e,f){var g,h,i,j,k=[[],[],[]],l=[[this.a,this.c,this.e],[this.b,this.d,this.f],[0,0,1]],m=[[a,c,e],[b,d,f],[0,0,1]];for(a&&a instanceof o&&(m=[[a.a,a.c,a.e],[a.b,a.d,a.f],[0,0,1]]),g=0;3>g;g++)for(h=0;3>h;h++){for(j=0,i=0;3>i;i++)j+=l[g][i]*m[i][h];k[g][h]=j}this.a=k[0][0],this.b=k[1][0],this.c=k[0][1],this.d=k[1][1],this.e=k[0][2],this.f=k[1][2]},a.invert=function(){var a=this,b=a.a*a.d-a.b*a.c;return new o(a.d/b,-a.b/b,-a.c/b,a.a/b,(a.c*a.f-a.d*a.e)/b,(a.b*a.e-a.a*a.f)/b)},a.clone=function(){return new o(this.a,this.b,this.c,this.d,this.e,this.f)},a.translate=function(a,b){this.add(1,0,0,1,a,b)},a.scale=function(a,b,c,d){null==b&&(b=a),(c||d)&&this.add(1,0,0,1,c,d),this.add(a,0,0,b,0,0),(c||d)&&this.add(1,0,0,1,-c,-d)},a.rotate=function(a,b,d){a=c.rad(a),b=b||0,d=d||0;var e=+N.cos(a).toFixed(9),f=+N.sin(a).toFixed(9);this.add(e,f,-f,e,b,d),this.add(1,0,0,1,-b,-d)},a.x=function(a,b){return a*this.a+b*this.c+this.e},a.y=function(a,b){return a*this.b+b*this.d+this.f},a.get=function(a){return+this[I.fromCharCode(97+a)].toFixed(4)},a.toString=function(){return c.svg?"matrix("+[this.get(0),this.get(1),this.get(2),this.get(3),this.get(4),this.get(5)].join()+")":[this.get(0),this.get(2),this.get(1),this.get(3),0,0].join()},a.toFilter=function(){return"progid:DXImageTransform.Microsoft.Matrix(M11="+this.get(0)+", M12="+this.get(2)+", M21="+this.get(1)+", M22="+this.get(3)+", Dx="+this.get(4)+", Dy="+this.get(5)+", sizingmethod='auto expand')"},a.offset=function(){return[this.e.toFixed(4),this.f.toFixed(4)]},a.split=function(){var a={};a.dx=this.e,a.dy=this.f;var e=[[this.a,this.c],[this.b,this.d]];a.scalex=N.sqrt(b(e[0])),d(e[0]),a.shear=e[0][0]*e[1][0]+e[0][1]*e[1][1],e[1]=[e[1][0]-e[0][0]*a.shear,e[1][1]-e[0][1]*a.shear],a.scaley=N.sqrt(b(e[1])),d(e[1]),a.shear/=a.scaley;var f=-e[0][1],g=e[1][1];return 0>g?(a.rotate=c.deg(N.acos(g)),0>f&&(a.rotate=360-a.rotate)):a.rotate=c.deg(N.asin(f)),a.isSimple=!(+a.shear.toFixed(9)||a.scalex.toFixed(9)!=a.scaley.toFixed(9)&&a.rotate),a.isSuperSimple=!+a.shear.toFixed(9)&&a.scalex.toFixed(9)==a.scaley.toFixed(9)&&!a.rotate,a.noRotation=!+a.shear.toFixed(9)&&!a.rotate,a},a.toTransformString=function(a){var b=a||this[J]();return b.isSimple?(b.scalex=+b.scalex.toFixed(4),b.scaley=+b.scaley.toFixed(4),b.rotate=+b.rotate.toFixed(4),(b.dx||b.dy?"t"+[b.dx,b.dy]:G)+(1!=b.scalex||1!=b.scaley?"s"+[b.scalex,b.scaley,0,0]:G)+(b.rotate?"r"+[b.rotate,0,0]:G)):"m"+[this.get(0),this.get(1),this.get(2),this.get(3),this.get(4),this.get(5)]}}(o.prototype);var Qb=navigator.userAgent.match(/Version\/(.*?)\s/)||navigator.userAgent.match(/Chrome\/(\d+)/);v.safari="Apple Computer, Inc."==navigator.vendor&&(Qb&&Qb[1]<4||"iP"==navigator.platform.slice(0,2))||"Google Inc."==navigator.vendor&&Qb&&Qb[1]<8?function(){var a=this.rect(-99,-99,this.width+99,this.height+99).attr({stroke:"none"});setTimeout(function(){a.remove()})}:mb;for(var Rb=function(){this.returnValue=!1},Sb=function(){return this.originalEvent.preventDefault()},Tb=function(){this.cancelBubble=!0},Ub=function(){return this.originalEvent.stopPropagation()},Vb=function(a){var b=A.doc.documentElement.scrollTop||A.doc.body.scrollTop,c=A.doc.documentElement.scrollLeft||A.doc.body.scrollLeft;return{x:a.clientX+c,y:a.clientY+b}},Wb=function(){return A.doc.addEventListener?function(a,b,c,d){var e=function(a){var b=Vb(a);return c.call(d,a,b.x,b.y)};if(a.addEventListener(b,e,!1),F&&L[b]){var f=function(b){for(var e=Vb(b),f=b,g=0,h=b.targetTouches&&b.targetTouches.length;h>g;g++)if(b.targetTouches[g].target==a){b=b.targetTouches[g],b.originalEvent=f,b.preventDefault=Sb,b.stopPropagation=Ub;break}return c.call(d,b,e.x,e.y)};a.addEventListener(L[b],f,!1)}return function(){return a.removeEventListener(b,e,!1),F&&L[b]&&a.removeEventListener(L[b],f,!1),!0}}:A.doc.attachEvent?function(a,b,c,d){var e=function(a){a=a||A.win.event;var b=A.doc.documentElement.scrollTop||A.doc.body.scrollTop,e=A.doc.documentElement.scrollLeft||A.doc.body.scrollLeft,f=a.clientX+e,g=a.clientY+b;return a.preventDefault=a.preventDefault||Rb,a.stopPropagation=a.stopPropagation||Tb,c.call(d,a,f,g)};a.attachEvent("on"+b,e);var f=function(){return a.detachEvent("on"+b,e),!0};return f}:void 0}(),Xb=[],Yb=function(a){for(var c,d=a.clientX,e=a.clientY,f=A.doc.documentElement.scrollTop||A.doc.body.scrollTop,g=A.doc.documentElement.scrollLeft||A.doc.body.scrollLeft,h=Xb.length;h--;){if(c=Xb[h],F&&a.touches){for(var i,j=a.touches.length;j--;)if(i=a.touches[j],i.identifier==c.el._drag.id){d=i.clientX,e=i.clientY,(a.originalEvent?a.originalEvent:a).preventDefault();break}}else a.preventDefault();var k,l=c.el.node,m=l.nextSibling,n=l.parentNode,o=l.style.display;A.win.opera&&n.removeChild(l),l.style.display="none",k=c.el.paper.getElementByPoint(d,e),l.style.display=o,A.win.opera&&(m?n.insertBefore(l,m):n.appendChild(l)),k&&b("raphael.drag.over."+c.el.id,c.el,k),d+=g,e+=f,b("raphael.drag.move."+c.el.id,c.move_scope||c.el,d-c.el._drag.x,e-c.el._drag.y,d,e,a)}},Zb=function(a){c.unmousemove(Yb).unmouseup(Zb);for(var d,e=Xb.length;e--;)d=Xb[e],d.el._drag={},b("raphael.drag.end."+d.el.id,d.end_scope||d.start_scope||d.move_scope||d.el,a);Xb=[]},$b=c.el={},_b=K.length;_b--;)!function(a){c[a]=$b[a]=function(b,d){return c.is(b,"function")&&(this.events=this.events||[],this.events.push({name:a,f:b,unbind:Wb(this.shape||this.node||A.doc,a,b,d||this)})),this},c["un"+a]=$b["un"+a]=function(b){for(var d=this.events||[],e=d.length;e--;)d[e].name!=a||!c.is(b,"undefined")&&d[e].f!=b||(d[e].unbind(),d.splice(e,1),!d.length&&delete this.events);return this}}(K[_b]);$b.data=function(a,d){var e=kb[this.id]=kb[this.id]||{};if(0==arguments.length)return e;if(1==arguments.length){if(c.is(a,"object")){for(var f in a)a[z](f)&&this.data(f,a[f]);return this}return b("raphael.data.get."+this.id,this,e[a],a),e[a]}return e[a]=d,b("raphael.data.set."+this.id,this,d,a),this},$b.removeData=function(a){return null==a?kb[this.id]={}:kb[this.id]&&delete kb[this.id][a],this},$b.getData=function(){return d(kb[this.id]||{})},$b.hover=function(a,b,c,d){return this.mouseover(a,c).mouseout(b,d||c)},$b.unhover=function(a,b){return this.unmouseover(a).unmouseout(b)};var ac=[];$b.drag=function(a,d,e,f,g,h){function i(i){(i.originalEvent||i).preventDefault();var j=i.clientX,k=i.clientY,l=A.doc.documentElement.scrollTop||A.doc.body.scrollTop,m=A.doc.documentElement.scrollLeft||A.doc.body.scrollLeft;if(this._drag.id=i.identifier,F&&i.touches)for(var n,o=i.touches.length;o--;)if(n=i.touches[o],this._drag.id=n.identifier,n.identifier==this._drag.id){j=n.clientX,k=n.clientY;break}this._drag.x=j+m,this._drag.y=k+l,!Xb.length&&c.mousemove(Yb).mouseup(Zb),Xb.push({el:this,move_scope:f,start_scope:g,end_scope:h}),d&&b.on("raphael.drag.start."+this.id,d),a&&b.on("raphael.drag.move."+this.id,a),e&&b.on("raphael.drag.end."+this.id,e),b("raphael.drag.start."+this.id,g||f||this,i.clientX+m,i.clientY+l,i)}return this._drag={},ac.push({el:this,start:i}),this.mousedown(i),this},$b.onDragOver=function(a){a?b.on("raphael.drag.over."+this.id,a):b.unbind("raphael.drag.over."+this.id)},$b.undrag=function(){for(var a=ac.length;a--;)ac[a].el==this&&(this.unmousedown(ac[a].start),ac.splice(a,1),b.unbind("raphael.drag.*."+this.id));!ac.length&&c.unmousemove(Yb).unmouseup(Zb),Xb=[]},v.circle=function(a,b,d){var e=c._engine.circle(this,a||0,b||0,d||0);return this.__set__&&this.__set__.push(e),e},v.rect=function(a,b,d,e,f){var g=c._engine.rect(this,a||0,b||0,d||0,e||0,f||0);return this.__set__&&this.__set__.push(g),g},v.ellipse=function(a,b,d,e){var f=c._engine.ellipse(this,a||0,b||0,d||0,e||0);return this.__set__&&this.__set__.push(f),f},v.path=function(a){a&&!c.is(a,U)&&!c.is(a[0],V)&&(a+=G);var b=c._engine.path(c.format[D](c,arguments),this);return this.__set__&&this.__set__.push(b),b},v.image=function(a,b,d,e,f){var g=c._engine.image(this,a||"about:blank",b||0,d||0,e||0,f||0);return this.__set__&&this.__set__.push(g),g},v.text=function(a,b,d){var e=c._engine.text(this,a||0,b||0,I(d));return this.__set__&&this.__set__.push(e),e},v.set=function(a){!c.is(a,"array")&&(a=Array.prototype.splice.call(arguments,0,arguments.length));var b=new mc(a);return this.__set__&&this.__set__.push(b),b.paper=this,b.type="set",b},v.setStart=function(a){this.__set__=a||this.set()},v.setFinish=function(){var a=this.__set__;return delete this.__set__,a},v.getSize=function(){var a=this.canvas.parentNode;return{width:a.offsetWidth,height:a.offsetHeight}},v.setSize=function(a,b){return c._engine.setSize.call(this,a,b)},v.setViewBox=function(a,b,d,e,f){return c._engine.setViewBox.call(this,a,b,d,e,f)},v.top=v.bottom=null,v.raphael=c;var bc=function(a){var b=a.getBoundingClientRect(),c=a.ownerDocument,d=c.body,e=c.documentElement,f=e.clientTop||d.clientTop||0,g=e.clientLeft||d.clientLeft||0,h=b.top+(A.win.pageYOffset||e.scrollTop||d.scrollTop)-f,i=b.left+(A.win.pageXOffset||e.scrollLeft||d.scrollLeft)-g;return{y:h,x:i}};v.getElementByPoint=function(a,b){var c=this,d=c.canvas,e=A.doc.elementFromPoint(a,b);if(A.win.opera&&"svg"==e.tagName){var f=bc(d),g=d.createSVGRect();g.x=a-f.x,g.y=b-f.y,g.width=g.height=1;var h=d.getIntersectionList(g,null);h.length&&(e=h[h.length-1])}if(!e)return null;for(;e.parentNode&&e!=d.parentNode&&!e.raphael;)e=e.parentNode;return e==c.canvas.parentNode&&(e=d),e=e&&e.raphael?c.getById(e.raphaelid):null},v.getElementsByBBox=function(a){var b=this.set();return this.forEach(function(d){c.isBBoxIntersect(d.getBBox(),a)&&b.push(d)}),b},v.getById=function(a){for(var b=this.bottom;b;){if(b.id==a)return b;b=b.next}return null},v.forEach=function(a,b){for(var c=this.bottom;c;){if(a.call(b,c)===!1)return this;c=c.next}return this},v.getElementsByPoint=function(a,b){var c=this.set();return this.forEach(function(d){d.isPointInside(a,b)&&c.push(d)}),c},$b.isPointInside=function(a,b){var d=this.realPath=qb[this.type](this);return this.attr("transform")&&this.attr("transform").length&&(d=c.transformPath(d,this.attr("transform"))),c.isPointInsidePath(d,a,b)},$b.getBBox=function(a){if(this.removed)return{};var b=this._;return a?((b.dirty||!b.bboxwt)&&(this.realPath=qb[this.type](this),b.bboxwt=Bb(this.realPath),b.bboxwt.toString=p,b.dirty=0),b.bboxwt):((b.dirty||b.dirtyT||!b.bbox)&&((b.dirty||!this.realPath)&&(b.bboxwt=0,this.realPath=qb[this.type](this)),b.bbox=Bb(rb(this.realPath,this.matrix)),b.bbox.toString=p,b.dirty=b.dirtyT=0),b.bbox)},$b.clone=function(){if(this.removed)return null;var a=this.paper[this.type]().attr(this.attr());return this.__set__&&this.__set__.push(a),a},$b.glow=function(a){if("text"==this.type)return null;a=a||{};var b={width:(a.width||10)+(+this.attr("stroke-width")||1),fill:a.fill||!1,opacity:a.opacity||.5,offsetx:a.offsetx||0,offsety:a.offsety||0,color:a.color||"#000"},c=b.width/2,d=this.paper,e=d.set(),f=this.realPath||qb[this.type](this);f=this.matrix?rb(f,this.matrix):f;for(var g=1;c+1>g;g++)e.push(d.path(f).attr({stroke:b.color,fill:b.fill?b.color:"none","stroke-linejoin":"round","stroke-linecap":"round","stroke-width":+(b.width/c*g).toFixed(3),opacity:+(b.opacity/c).toFixed(3)}));return e.insertBefore(this).translate(b.offsetx,b.offsety)};var cc=function(a,b,d,e,f,g,h,i,l){return null==l?j(a,b,d,e,f,g,h,i):c.findDotsAtSegment(a,b,d,e,f,g,h,i,k(a,b,d,e,f,g,h,i,l))},dc=function(a,b){return function(d,e,f){d=Kb(d);for(var g,h,i,j,k,l="",m={},n=0,o=0,p=d.length;p>o;o++){if(i=d[o],"M"==i[0])g=+i[1],h=+i[2];else{if(j=cc(g,h,i[1],i[2],i[3],i[4],i[5],i[6]),n+j>e){if(b&&!m.start){if(k=cc(g,h,i[1],i[2],i[3],i[4],i[5],i[6],e-n),l+=["C"+k.start.x,k.start.y,k.m.x,k.m.y,k.x,k.y],f)return l;m.start=l,l=["M"+k.x,k.y+"C"+k.n.x,k.n.y,k.end.x,k.end.y,i[5],i[6]].join(),n+=j,g=+i[5],h=+i[6];continue}if(!a&&!b)return k=cc(g,h,i[1],i[2],i[3],i[4],i[5],i[6],e-n),{x:k.x,y:k.y,alpha:k.alpha}}n+=j,g=+i[5],h=+i[6]}l+=i.shift()+i}return m.end=l,k=a?n:b?m:c.findDotsAtSegment(g,h,i[0],i[1],i[2],i[3],i[4],i[5],1),k.alpha&&(k={x:k.x,y:k.y,alpha:k.alpha}),k}},ec=dc(1),fc=dc(),gc=dc(0,1);c.getTotalLength=ec,c.getPointAtLength=fc,c.getSubpath=function(a,b,c){if(this.getTotalLength(a)-c<1e-6)return gc(a,b).end;var d=gc(a,c,1);return b?gc(d,b).end:d},$b.getTotalLength=function(){var a=this.getPath();if(a)return this.node.getTotalLength?this.node.getTotalLength():ec(a)},$b.getPointAtLength=function(a){var b=this.getPath();if(b)return fc(b,a)},$b.getPath=function(){var a,b=c._getPath[this.type];if("text"!=this.type&&"set"!=this.type)return b&&(a=b(this)),a},$b.getSubpath=function(a,b){var d=this.getPath();if(d)return c.getSubpath(d,a,b)};var hc=c.easing_formulas={linear:function(a){return a},"<":function(a){return R(a,1.7)},">":function(a){return R(a,.48)},"<>":function(a){var b=.48-a/1.04,c=N.sqrt(.1734+b*b),d=c-b,e=R(Q(d),1/3)*(0>d?-1:1),f=-c-b,g=R(Q(f),1/3)*(0>f?-1:1),h=e+g+.5;return 3*(1-h)*h*h+h*h*h},backIn:function(a){var b=1.70158;return a*a*((b+1)*a-b)},backOut:function(a){a-=1;var b=1.70158;return a*a*((b+1)*a+b)+1},elastic:function(a){return a==!!a?a:R(2,-10*a)*N.sin(2*(a-.075)*S/.3)+1},bounce:function(a){var b,c=7.5625,d=2.75;return 1/d>a?b=c*a*a:2/d>a?(a-=1.5/d,b=c*a*a+.75):2.5/d>a?(a-=2.25/d,b=c*a*a+.9375):(a-=2.625/d,b=c*a*a+.984375),b}};hc.easeIn=hc["ease-in"]=hc["<"],hc.easeOut=hc["ease-out"]=hc[">"],hc.easeInOut=hc["ease-in-out"]=hc["<>"],hc["back-in"]=hc.backIn,hc["back-out"]=hc.backOut;var ic=[],jc=a.requestAnimationFrame||a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame||a.msRequestAnimationFrame||function(a){setTimeout(a,16)},kc=function(){for(var a=+new Date,d=0;d<ic.length;d++){var e=ic[d];if(!e.el.removed&&!e.paused){var f,g,h=a-e.start,i=e.ms,j=e.easing,k=e.from,l=e.diff,m=e.to,n=(e.t,e.el),o={},p={};if(e.initstatus?(h=(e.initstatus*e.anim.top-e.prev)/(e.percent-e.prev)*i,e.status=e.initstatus,delete e.initstatus,e.stop&&ic.splice(d--,1)):e.status=(e.prev+(e.percent-e.prev)*(h/i))/e.anim.top,!(0>h))if(i>h){var q=j(h/i);for(var r in k)if(k[z](r)){switch(db[r]){case T:f=+k[r]+q*i*l[r];break;case"colour":f="rgb("+[lc($(k[r].r+q*i*l[r].r)),lc($(k[r].g+q*i*l[r].g)),lc($(k[r].b+q*i*l[r].b))].join(",")+")";break;case"path":f=[];for(var t=0,u=k[r].length;u>t;t++){f[t]=[k[r][t][0]];for(var v=1,w=k[r][t].length;w>v;v++)f[t][v]=+k[r][t][v]+q*i*l[r][t][v];f[t]=f[t].join(H)}f=f.join(H);break;case"transform":if(l[r].real)for(f=[],t=0,u=k[r].length;u>t;t++)for(f[t]=[k[r][t][0]],v=1,w=k[r][t].length;w>v;v++)f[t][v]=k[r][t][v]+q*i*l[r][t][v];else{var x=function(a){return+k[r][a]+q*i*l[r][a]};f=[["m",x(0),x(1),x(2),x(3),x(4),x(5)]]}break;case"csv":if("clip-rect"==r)for(f=[],t=4;t--;)f[t]=+k[r][t]+q*i*l[r][t];break;default:var y=[][E](k[r]);for(f=[],t=n.paper.customAttributes[r].length;t--;)f[t]=+y[t]+q*i*l[r][t]}o[r]=f}n.attr(o),function(a,c,d){setTimeout(function(){b("raphael.anim.frame."+a,c,d)})}(n.id,n,e.anim)}else{if(function(a,d,e){setTimeout(function(){b("raphael.anim.frame."+d.id,d,e),b("raphael.anim.finish."+d.id,d,e),c.is(a,"function")&&a.call(d)})}(e.callback,n,e.anim),n.attr(m),ic.splice(d--,1),e.repeat>1&&!e.next){for(g in m)m[z](g)&&(p[g]=e.totalOrigin[g]);e.el.attr(p),s(e.anim,e.el,e.anim.percents[0],null,e.totalOrigin,e.repeat-1)}e.next&&!e.stop&&s(e.anim,e.el,e.next,null,e.totalOrigin,e.repeat)}}}c.svg&&n&&n.paper&&n.paper.safari(),ic.length&&jc(kc)},lc=function(a){return a>255?255:0>a?0:a};$b.animateWith=function(a,b,d,e,f,g){var h=this;if(h.removed)return g&&g.call(h),h;var i=d instanceof r?d:c.animation(d,e,f,g);s(i,h,i.percents[0],null,h.attr());for(var j=0,k=ic.length;k>j;j++)if(ic[j].anim==b&&ic[j].el==a){ic[k-1].start=ic[j].start;break}return h},$b.onAnimation=function(a){return a?b.on("raphael.anim.frame."+this.id,a):b.unbind("raphael.anim.frame."+this.id),this},r.prototype.delay=function(a){var b=new r(this.anim,this.ms);return b.times=this.times,b.del=+a||0,b},r.prototype.repeat=function(a){var b=new r(this.anim,this.ms);return b.del=this.del,b.times=N.floor(O(a,0))||1,b},c.animation=function(a,b,d,e){if(a instanceof r)return a;(c.is(d,"function")||!d)&&(e=e||d||null,d=null),a=Object(a),b=+b||0;var f,g,h={};for(g in a)a[z](g)&&_(g)!=g&&_(g)+"%"!=g&&(f=!0,h[g]=a[g]);if(f)return d&&(h.easing=d),e&&(h.callback=e),new r({100:h},b);if(e){var i=0;for(var j in a){var k=ab(j);a[z](j)&&k>i&&(i=k)}i+="%",!a[i].callback&&(a[i].callback=e)}return new r(a,b)},$b.animate=function(a,b,d,e){var f=this;if(f.removed)return e&&e.call(f),f;var g=a instanceof r?a:c.animation(a,b,d,e);return s(g,f,g.percents[0],null,f.attr()),f},$b.setTime=function(a,b){return a&&null!=b&&this.status(a,P(b,a.ms)/a.ms),this},$b.status=function(a,b){var c,d,e=[],f=0;if(null!=b)return s(a,this,-1,P(b,1)),this;for(c=ic.length;c>f;f++)if(d=ic[f],d.el.id==this.id&&(!a||d.anim==a)){if(a)return d.status;e.push({anim:d.anim,status:d.status})}return a?0:e},$b.pause=function(a){for(var c=0;c<ic.length;c++)ic[c].el.id!=this.id||a&&ic[c].anim!=a||b("raphael.anim.pause."+this.id,this,ic[c].anim)!==!1&&(ic[c].paused=!0);return this},$b.resume=function(a){for(var c=0;c<ic.length;c++)if(ic[c].el.id==this.id&&(!a||ic[c].anim==a)){var d=ic[c];b("raphael.anim.resume."+this.id,this,d.anim)!==!1&&(delete d.paused,this.status(d.anim,d.status))}return this},$b.stop=function(a){for(var c=0;c<ic.length;c++)ic[c].el.id!=this.id||a&&ic[c].anim!=a||b("raphael.anim.stop."+this.id,this,ic[c].anim)!==!1&&ic.splice(c--,1);return this},b.on("raphael.remove",t),b.on("raphael.clear",t),$b.toString=function(){return"Raphaël’s object"};var mc=function(a){if(this.items=[],this.length=0,this.type="set",a)for(var b=0,c=a.length;c>b;b++)!a[b]||a[b].constructor!=$b.constructor&&a[b].constructor!=mc||(this[this.items.length]=this.items[this.items.length]=a[b],this.length++)},nc=mc.prototype;nc.push=function(){for(var a,b,c=0,d=arguments.length;d>c;c++)a=arguments[c],!a||a.constructor!=$b.constructor&&a.constructor!=mc||(b=this.items.length,this[b]=this.items[b]=a,this.length++);return this},nc.pop=function(){return this.length&&delete this[this.length--],this.items.pop()},nc.forEach=function(a,b){for(var c=0,d=this.items.length;d>c;c++)if(a.call(b,this.items[c],c)===!1)return this;return this};for(var oc in $b)$b[z](oc)&&(nc[oc]=function(a){return function(){var b=arguments;return this.forEach(function(c){c[a][D](c,b)})}}(oc));return nc.attr=function(a,b){if(a&&c.is(a,V)&&c.is(a[0],"object"))for(var d=0,e=a.length;e>d;d++)this.items[d].attr(a[d]);else for(var f=0,g=this.items.length;g>f;f++)this.items[f].attr(a,b);return this},nc.clear=function(){for(;this.length;)this.pop()},nc.splice=function(a,b){a=0>a?O(this.length+a,0):a,b=O(0,P(this.length-a,b));var c,d=[],e=[],f=[];for(c=2;c<arguments.length;c++)f.push(arguments[c]);for(c=0;b>c;c++)e.push(this[a+c]);for(;c<this.length-a;c++)d.push(this[a+c]);var g=f.length;for(c=0;c<g+d.length;c++)this.items[a+c]=this[a+c]=g>c?f[c]:d[c-g];for(c=this.items.length=this.length-=b-g;this[c];)delete this[c++];return new mc(e)},nc.exclude=function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]==a)return this.splice(b,1),!0},nc.animate=function(a,b,d,e){(c.is(d,"function")||!d)&&(e=d||null);var f,g,h=this.items.length,i=h,j=this;if(!h)return this;e&&(g=function(){!--h&&e.call(j)}),d=c.is(d,U)?d:g;var k=c.animation(a,b,d,g);for(f=this.items[--i].animate(k);i--;)this.items[i]&&!this.items[i].removed&&this.items[i].animateWith(f,k,k),this.items[i]&&!this.items[i].removed||h--;return this},nc.insertAfter=function(a){for(var b=this.items.length;b--;)this.items[b].insertAfter(a);return this},nc.getBBox=function(){for(var a=[],b=[],c=[],d=[],e=this.items.length;e--;)if(!this.items[e].removed){var f=this.items[e].getBBox();a.push(f.x),b.push(f.y),c.push(f.x+f.width),d.push(f.y+f.height)}return a=P[D](0,a),b=P[D](0,b),c=O[D](0,c),d=O[D](0,d),{x:a,y:b,x2:c,y2:d,width:c-a,height:d-b}},nc.clone=function(a){a=this.paper.set();for(var b=0,c=this.items.length;c>b;b++)a.push(this.items[b].clone());return a},nc.toString=function(){return"Raphaël‘s set"},nc.glow=function(a){var b=this.paper.set();return this.forEach(function(c){var d=c.glow(a);null!=d&&d.forEach(function(a){b.push(a)})}),b},nc.isPointInside=function(a,b){var c=!1;return this.forEach(function(d){return d.isPointInside(a,b)?(c=!0,!1):void 0}),c},c.registerFont=function(a){if(!a.face)return a;this.fonts=this.fonts||{};var b={w:a.w,face:{},glyphs:{}},c=a.face["font-family"];for(var d in a.face)a.face[z](d)&&(b.face[d]=a.face[d]);if(this.fonts[c]?this.fonts[c].push(b):this.fonts[c]=[b],!a.svg){b.face["units-per-em"]=ab(a.face["units-per-em"],10);for(var e in a.glyphs)if(a.glyphs[z](e)){var f=a.glyphs[e];if(b.glyphs[e]={w:f.w,k:{},d:f.d&&"M"+f.d.replace(/[mlcxtrv]/g,function(a){return{l:"L",c:"C",x:"z",t:"m",r:"l",v:"c"}[a]||"M"})+"z"},f.k)for(var g in f.k)f[z](g)&&(b.glyphs[e].k[g]=f.k[g])}}return a},v.getFont=function(a,b,d,e){if(e=e||"normal",d=d||"normal",b=+b||{normal:400,bold:700,lighter:300,bolder:800}[b]||400,c.fonts){var f=c.fonts[a];if(!f){var g=new RegExp("(^|\\s)"+a.replace(/[^\w\d\s+!~.:_-]/g,G)+"(\\s|$)","i");for(var h in c.fonts)if(c.fonts[z](h)&&g.test(h)){f=c.fonts[h];break}}var i;if(f)for(var j=0,k=f.length;k>j&&(i=f[j],i.face["font-weight"]!=b||i.face["font-style"]!=d&&i.face["font-style"]||i.face["font-stretch"]!=e);j++);return i}},v.print=function(a,b,d,e,f,g,h,i){g=g||"middle",h=O(P(h||0,1),-1),i=O(P(i||1,3),1);var j,k=I(d)[J](G),l=0,m=0,n=G;if(c.is(e,"string")&&(e=this.getFont(e)),e){j=(f||16)/e.face["units-per-em"];for(var o=e.face.bbox[J](w),p=+o[0],q=o[3]-o[1],r=0,s=+o[1]+("baseline"==g?q+ +e.face.descent:q/2),t=0,u=k.length;u>t;t++){if("\n"==k[t])l=0,x=0,m=0,r+=q*i;else{var v=m&&e.glyphs[k[t-1]]||{},x=e.glyphs[k[t]];l+=m?(v.w||e.w)+(v.k&&v.k[k[t]]||0)+e.w*h:0,m=1}x&&x.d&&(n+=c.transformPath(x.d,["t",l*j,r*j,"s",j,j,p,s,"t",(a-p)/j,(b-s)/j]))}}return this.path(n).attr({fill:"#000",stroke:"none"})},v.add=function(a){if(c.is(a,"array"))for(var b,d=this.set(),e=0,f=a.length;f>e;e++)b=a[e]||{},x[z](b.type)&&d.push(this[b.type]().attr(b));return d},c.format=function(a,b){var d=c.is(b,V)?[0][E](b):arguments;return a&&c.is(a,U)&&d.length-1&&(a=a.replace(y,function(a,b){return null==d[++b]?G:d[b]})),a||G},c.fullfill=function(){var a=/\{([^\}]+)\}/g,b=/(?:(?:^|\.)(.+?)(?=\[|\.|$|\()|\[('|")(.+?)\2\])(\(\))?/g,c=function(a,c,d){var e=d;return c.replace(b,function(a,b,c,d,f){b=b||d,e&&(b in e&&(e=e[b]),"function"==typeof e&&f&&(e=e()))}),e=(null==e||e==d?a:e)+""};return function(b,d){return String(b).replace(a,function(a,b){return c(a,b,d)})}}(),c.ninja=function(){return B.was?A.win.Raphael=B.is:delete Raphael,c},c.st=nc,b.on("raphael.DOMload",function(){u=!0}),function(a,b,d){function e(){/in/.test(a.readyState)?setTimeout(e,9):c.eve("raphael.DOMload")}null==a.readyState&&a.addEventListener&&(a.addEventListener(b,d=function(){a.removeEventListener(b,d,!1),a.readyState="complete"},!1),a.readyState="loading"),e()}(document,"DOMContentLoaded"),function(){if(c.svg){var a="hasOwnProperty",b=String,d=parseFloat,e=parseInt,f=Math,g=f.max,h=f.abs,i=f.pow,j=/[, ]+/,k=c.eve,l="",m=" ",n="http://www.w3.org/1999/xlink",o={block:"M5,0 0,2.5 5,5z",classic:"M5,0 0,2.5 5,5 3.5,3 3.5,2z",diamond:"M2.5,0 5,2.5 2.5,5 0,2.5z",open:"M6,1 1,3.5 6,6",oval:"M2.5,0A2.5,2.5,0,0,1,2.5,5 2.5,2.5,0,0,1,2.5,0z"},p={};c.toString=function(){return"Your browser supports SVG.\nYou are running Raphaël "+this.version};var q=function(d,e){if(e){"string"==typeof d&&(d=q(d));for(var f in e)e[a](f)&&("xlink:"==f.substring(0,6)?d.setAttributeNS(n,f.substring(6),b(e[f])):d.setAttribute(f,b(e[f])))}else d=c._g.doc.createElementNS("http://www.w3.org/2000/svg",d),d.style&&(d.style.webkitTapHighlightColor="rgba(0,0,0,0)");return d},r=function(a,e){var j="linear",k=a.id+e,m=.5,n=.5,o=a.node,p=a.paper,r=o.style,s=c._g.doc.getElementById(k);if(!s){if(e=b(e).replace(c._radial_gradient,function(a,b,c){if(j="radial",b&&c){m=d(b),n=d(c);var e=2*(n>.5)-1;i(m-.5,2)+i(n-.5,2)>.25&&(n=f.sqrt(.25-i(m-.5,2))*e+.5)&&.5!=n&&(n=n.toFixed(5)-1e-5*e)}return l}),e=e.split(/\s*\-\s*/),"linear"==j){var t=e.shift();if(t=-d(t),isNaN(t))return null;var u=[0,0,f.cos(c.rad(t)),f.sin(c.rad(t))],v=1/(g(h(u[2]),h(u[3]))||1);u[2]*=v,u[3]*=v,u[2]<0&&(u[0]=-u[2],u[2]=0),u[3]<0&&(u[1]=-u[3],u[3]=0)}var w=c._parseDots(e);if(!w)return null;if(k=k.replace(/[\(\)\s,\xb0#]/g,"_"),a.gradient&&k!=a.gradient.id&&(p.defs.removeChild(a.gradient),delete a.gradient),!a.gradient){s=q(j+"Gradient",{id:k}),a.gradient=s,q(s,"radial"==j?{fx:m,fy:n}:{x1:u[0],y1:u[1],x2:u[2],y2:u[3],gradientTransform:a.matrix.invert()}),p.defs.appendChild(s);for(var x=0,y=w.length;y>x;x++)s.appendChild(q("stop",{offset:w[x].offset?w[x].offset:x?"100%":"0%","stop-color":w[x].color||"#fff"}))}}return q(o,{fill:"url("+document.location+"#"+k+")",opacity:1,"fill-opacity":1}),r.fill=l,r.opacity=1,r.fillOpacity=1,1},s=function(a){var b=a.getBBox(1);q(a.pattern,{patternTransform:a.matrix.invert()+" translate("+b.x+","+b.y+")"})},t=function(d,e,f){if("path"==d.type){for(var g,h,i,j,k,m=b(e).toLowerCase().split("-"),n=d.paper,r=f?"end":"start",s=d.node,t=d.attrs,u=t["stroke-width"],v=m.length,w="classic",x=3,y=3,z=5;v--;)switch(m[v]){case"block":case"classic":case"oval":case"diamond":case"open":case"none":w=m[v];break;case"wide":y=5;break;case"narrow":y=2;break;case"long":x=5;break;case"short":x=2}if("open"==w?(x+=2,y+=2,z+=2,i=1,j=f?4:1,k={fill:"none",stroke:t.stroke}):(j=i=x/2,k={fill:t.stroke,stroke:"none"}),d._.arrows?f?(d._.arrows.endPath&&p[d._.arrows.endPath]--,d._.arrows.endMarker&&p[d._.arrows.endMarker]--):(d._.arrows.startPath&&p[d._.arrows.startPath]--,d._.arrows.startMarker&&p[d._.arrows.startMarker]--):d._.arrows={},"none"!=w){var A="raphael-marker-"+w,B="raphael-marker-"+r+w+x+y+"-obj"+d.id;c._g.doc.getElementById(A)?p[A]++:(n.defs.appendChild(q(q("path"),{"stroke-linecap":"round",d:o[w],id:A})),p[A]=1);var C,D=c._g.doc.getElementById(B);D?(p[B]++,C=D.getElementsByTagName("use")[0]):(D=q(q("marker"),{id:B,markerHeight:y,markerWidth:x,orient:"auto",refX:j,refY:y/2}),C=q(q("use"),{"xlink:href":"#"+A,transform:(f?"rotate(180 "+x/2+" "+y/2+") ":l)+"scale("+x/z+","+y/z+")","stroke-width":(1/((x/z+y/z)/2)).toFixed(4)}),D.appendChild(C),n.defs.appendChild(D),p[B]=1),q(C,k);var E=i*("diamond"!=w&&"oval"!=w);f?(g=d._.arrows.startdx*u||0,h=c.getTotalLength(t.path)-E*u):(g=E*u,h=c.getTotalLength(t.path)-(d._.arrows.enddx*u||0)),k={},k["marker-"+r]="url(#"+B+")",(h||g)&&(k.d=c.getSubpath(t.path,g,h)),q(s,k),d._.arrows[r+"Path"]=A,d._.arrows[r+"Marker"]=B,d._.arrows[r+"dx"]=E,d._.arrows[r+"Type"]=w,d._.arrows[r+"String"]=e}else f?(g=d._.arrows.startdx*u||0,h=c.getTotalLength(t.path)-g):(g=0,h=c.getTotalLength(t.path)-(d._.arrows.enddx*u||0)),d._.arrows[r+"Path"]&&q(s,{d:c.getSubpath(t.path,g,h)}),delete d._.arrows[r+"Path"],delete d._.arrows[r+"Marker"],delete d._.arrows[r+"dx"],delete d._.arrows[r+"Type"],delete d._.arrows[r+"String"];for(k in p)if(p[a](k)&&!p[k]){var F=c._g.doc.getElementById(k);F&&F.parentNode.removeChild(F)}}},u={"":[0],none:[0],"-":[3,1],".":[1,1],"-.":[3,1,1,1],"-..":[3,1,1,1,1,1],". ":[1,3],"- ":[4,3],"--":[8,3],"- .":[4,3,1,3],"--.":[8,3,1,3],"--..":[8,3,1,3,1,3]},v=function(a,c,d){if(c=u[b(c).toLowerCase()]){for(var e=a.attrs["stroke-width"]||"1",f={round:e,square:e,butt:0}[a.attrs["stroke-linecap"]||d["stroke-linecap"]]||0,g=[],h=c.length;h--;)g[h]=c[h]*e+(h%2?1:-1)*f;q(a.node,{"stroke-dasharray":g.join(",")})}},w=function(d,f){var i=d.node,k=d.attrs,m=i.style.visibility;i.style.visibility="hidden";for(var o in f)if(f[a](o)){if(!c._availableAttrs[a](o))continue;var p=f[o];switch(k[o]=p,o){case"blur":d.blur(p);break;case"title":var u=i.getElementsByTagName("title");if(u.length&&(u=u[0]))u.firstChild.nodeValue=p;else{u=q("title");var w=c._g.doc.createTextNode(p);u.appendChild(w),i.appendChild(u)}break;case"href":case"target":var x=i.parentNode;if("a"!=x.tagName.toLowerCase()){var z=q("a");x.insertBefore(z,i),z.appendChild(i),x=z}"target"==o?x.setAttributeNS(n,"show","blank"==p?"new":p):x.setAttributeNS(n,o,p);break;case"cursor":i.style.cursor=p;break;case"transform":d.transform(p);break;case"arrow-start":t(d,p);break;case"arrow-end":t(d,p,1);break;case"clip-rect":var A=b(p).split(j);if(4==A.length){d.clip&&d.clip.parentNode.parentNode.removeChild(d.clip.parentNode);var B=q("clipPath"),C=q("rect");B.id=c.createUUID(),q(C,{x:A[0],y:A[1],width:A[2],height:A[3]}),B.appendChild(C),d.paper.defs.appendChild(B),q(i,{"clip-path":"url(#"+B.id+")"}),d.clip=C}if(!p){var D=i.getAttribute("clip-path");if(D){var E=c._g.doc.getElementById(D.replace(/(^url\(#|\)$)/g,l));E&&E.parentNode.removeChild(E),q(i,{"clip-path":l}),delete d.clip}}break;case"path":"path"==d.type&&(q(i,{d:p?k.path=c._pathToAbsolute(p):"M0,0"}),d._.dirty=1,d._.arrows&&("startString"in d._.arrows&&t(d,d._.arrows.startString),"endString"in d._.arrows&&t(d,d._.arrows.endString,1)));break;case"width":if(i.setAttribute(o,p),d._.dirty=1,!k.fx)break;o="x",p=k.x;case"x":k.fx&&(p=-k.x-(k.width||0));case"rx":if("rx"==o&&"rect"==d.type)break;case"cx":i.setAttribute(o,p),d.pattern&&s(d),d._.dirty=1;break;case"height":if(i.setAttribute(o,p),d._.dirty=1,!k.fy)break;o="y",p=k.y;case"y":k.fy&&(p=-k.y-(k.height||0));case"ry":if("ry"==o&&"rect"==d.type)break;case"cy":i.setAttribute(o,p),d.pattern&&s(d),d._.dirty=1;break;case"r":"rect"==d.type?q(i,{rx:p,ry:p}):i.setAttribute(o,p),d._.dirty=1;break;case"src":"image"==d.type&&i.setAttributeNS(n,"href",p);break;case"stroke-width":(1!=d._.sx||1!=d._.sy)&&(p/=g(h(d._.sx),h(d._.sy))||1),i.setAttribute(o,p),k["stroke-dasharray"]&&v(d,k["stroke-dasharray"],f),d._.arrows&&("startString"in d._.arrows&&t(d,d._.arrows.startString),"endString"in d._.arrows&&t(d,d._.arrows.endString,1));break;case"stroke-dasharray":v(d,p,f);break;case"fill":var F=b(p).match(c._ISURL);if(F){B=q("pattern");var G=q("image");B.id=c.createUUID(),q(B,{x:0,y:0,patternUnits:"userSpaceOnUse",height:1,width:1}),q(G,{x:0,y:0,"xlink:href":F[1]}),B.appendChild(G),function(a){c._preload(F[1],function(){var b=this.offsetWidth,c=this.offsetHeight;q(a,{width:b,height:c}),q(G,{width:b,height:c}),d.paper.safari()})}(B),d.paper.defs.appendChild(B),q(i,{fill:"url(#"+B.id+")"}),d.pattern=B,d.pattern&&s(d);break}var H=c.getRGB(p);if(H.error){if(("circle"==d.type||"ellipse"==d.type||"r"!=b(p).charAt())&&r(d,p)){if("opacity"in k||"fill-opacity"in k){var I=c._g.doc.getElementById(i.getAttribute("fill").replace(/^url\(#|\)$/g,l));if(I){var J=I.getElementsByTagName("stop");q(J[J.length-1],{"stop-opacity":("opacity"in k?k.opacity:1)*("fill-opacity"in k?k["fill-opacity"]:1)})}}k.gradient=p,k.fill="none";break}}else delete f.gradient,delete k.gradient,!c.is(k.opacity,"undefined")&&c.is(f.opacity,"undefined")&&q(i,{opacity:k.opacity}),!c.is(k["fill-opacity"],"undefined")&&c.is(f["fill-opacity"],"undefined")&&q(i,{"fill-opacity":k["fill-opacity"]});H[a]("opacity")&&q(i,{"fill-opacity":H.opacity>1?H.opacity/100:H.opacity});case"stroke":H=c.getRGB(p),i.setAttribute(o,H.hex),"stroke"==o&&H[a]("opacity")&&q(i,{"stroke-opacity":H.opacity>1?H.opacity/100:H.opacity}),"stroke"==o&&d._.arrows&&("startString"in d._.arrows&&t(d,d._.arrows.startString),"endString"in d._.arrows&&t(d,d._.arrows.endString,1));break;case"gradient":("circle"==d.type||"ellipse"==d.type||"r"!=b(p).charAt())&&r(d,p);break;
-case"opacity":k.gradient&&!k[a]("stroke-opacity")&&q(i,{"stroke-opacity":p>1?p/100:p});case"fill-opacity":if(k.gradient){I=c._g.doc.getElementById(i.getAttribute("fill").replace(/^url\(#|\)$/g,l)),I&&(J=I.getElementsByTagName("stop"),q(J[J.length-1],{"stop-opacity":p}));break}default:"font-size"==o&&(p=e(p,10)+"px");var K=o.replace(/(\-.)/g,function(a){return a.substring(1).toUpperCase()});i.style[K]=p,d._.dirty=1,i.setAttribute(o,p)}}y(d,f),i.style.visibility=m},x=1.2,y=function(d,f){if("text"==d.type&&(f[a]("text")||f[a]("font")||f[a]("font-size")||f[a]("x")||f[a]("y"))){var g=d.attrs,h=d.node,i=h.firstChild?e(c._g.doc.defaultView.getComputedStyle(h.firstChild,l).getPropertyValue("font-size"),10):10;if(f[a]("text")){for(g.text=f.text;h.firstChild;)h.removeChild(h.firstChild);for(var j,k=b(f.text).split("\n"),m=[],n=0,o=k.length;o>n;n++)j=q("tspan"),n&&q(j,{dy:i*x,x:g.x}),j.appendChild(c._g.doc.createTextNode(k[n])),h.appendChild(j),m[n]=j}else for(m=h.getElementsByTagName("tspan"),n=0,o=m.length;o>n;n++)n?q(m[n],{dy:i*x,x:g.x}):q(m[0],{dy:0});q(h,{x:g.x,y:g.y}),d._.dirty=1;var p=d._getBBox(),r=g.y-(p.y+p.height/2);r&&c.is(r,"finite")&&q(m[0],{dy:r})}},z=function(a){return a.parentNode&&"a"===a.parentNode.tagName.toLowerCase()?a.parentNode:a};__Element=function(a,b){this[0]=this.node=a,a.raphael=!0,this.id=c._oid++,a.raphaelid=this.id,this.matrix=c.matrix(),this.realPath=null,this.paper=b,this.attrs=this.attrs||{},this._={transform:[],sx:1,sy:1,deg:0,dx:0,dy:0,dirty:1},!b.bottom&&(b.bottom=this),this.prev=b.top,b.top&&(b.top.next=this),b.top=this,this.next=null},$b=c.el,Element.prototype=$b,$b.constructor=Element,c._engine.path=function(a,b){var c=q("path");b.canvas&&b.canvas.appendChild(c);var d=new __Element(c,b);return d.type="path",w(d,{fill:"none",stroke:"#000",path:a}),d},$b.rotate=function(a,c,e){if(this.removed)return this;if(a=b(a).split(j),a.length-1&&(c=d(a[1]),e=d(a[2])),a=d(a[0]),null==e&&(c=e),null==c||null==e){var f=this.getBBox(1);c=f.x+f.width/2,e=f.y+f.height/2}return this.transform(this._.transform.concat([["r",a,c,e]])),this},$b.scale=function(a,c,e,f){if(this.removed)return this;if(a=b(a).split(j),a.length-1&&(c=d(a[1]),e=d(a[2]),f=d(a[3])),a=d(a[0]),null==c&&(c=a),null==f&&(e=f),null==e||null==f)var g=this.getBBox(1);return e=null==e?g.x+g.width/2:e,f=null==f?g.y+g.height/2:f,this.transform(this._.transform.concat([["s",a,c,e,f]])),this},$b.translate=function(a,c){return this.removed?this:(a=b(a).split(j),a.length-1&&(c=d(a[1])),a=d(a[0])||0,c=+c||0,this.transform(this._.transform.concat([["t",a,c]])),this)},$b.transform=function(b){var d=this._;if(null==b)return d.transform;if(c._extractTransform(this,b),this.clip&&q(this.clip,{transform:this.matrix.invert()}),this.pattern&&s(this),this.node&&q(this.node,{transform:this.matrix}),1!=d.sx||1!=d.sy){var e=this.attrs[a]("stroke-width")?this.attrs["stroke-width"]:1;this.attr({"stroke-width":e})}return this},$b.hide=function(){return!this.removed&&this.paper.safari(this.node.style.display="none"),this},$b.show=function(){return!this.removed&&this.paper.safari(this.node.style.display=""),this},$b.remove=function(){var a=z(this.node);if(!this.removed&&a.parentNode){var b=this.paper;b.__set__&&b.__set__.exclude(this),k.unbind("raphael.*.*."+this.id),this.gradient&&b.defs.removeChild(this.gradient),c._tear(this,b),a.parentNode.removeChild(a),this.removeData();for(var d in this)this[d]="function"==typeof this[d]?c._removedFactory(d):null;this.removed=!0}},$b._getBBox=function(){if("none"==this.node.style.display){this.show();var a=!0}var b,c=!1;this.paper.canvas.parentElement?b=this.paper.canvas.parentElement.style:this.paper.canvas.parentNode&&(b=this.paper.canvas.parentNode.style),b&&"none"==b.display&&(c=!0,b.display="");var d={};try{d=this.node.getBBox()}catch(e){d={x:this.node.clientLeft,y:this.node.clientTop,width:this.node.clientWidth,height:this.node.clientHeight}}finally{d=d||{},c&&(b.display="none")}return a&&this.hide(),d},$b.attr=function(b,d){if(this.removed)return this;if(null==b){var e={};for(var f in this.attrs)this.attrs[a](f)&&(e[f]=this.attrs[f]);return e.gradient&&"none"==e.fill&&(e.fill=e.gradient)&&delete e.gradient,e.transform=this._.transform,e}if(null==d&&c.is(b,"string")){if("fill"==b&&"none"==this.attrs.fill&&this.attrs.gradient)return this.attrs.gradient;if("transform"==b)return this._.transform;for(var g=b.split(j),h={},i=0,l=g.length;l>i;i++)b=g[i],h[b]=b in this.attrs?this.attrs[b]:c.is(this.paper.customAttributes[b],"function")?this.paper.customAttributes[b].def:c._availableAttrs[b];return l-1?h:h[g[0]]}if(null==d&&c.is(b,"array")){for(h={},i=0,l=b.length;l>i;i++)h[b[i]]=this.attr(b[i]);return h}if(null!=d){var m={};m[b]=d}else null!=b&&c.is(b,"object")&&(m=b);for(var n in m)k("raphael.attr."+n+"."+this.id,this,m[n]);for(n in this.paper.customAttributes)if(this.paper.customAttributes[a](n)&&m[a](n)&&c.is(this.paper.customAttributes[n],"function")){var o=this.paper.customAttributes[n].apply(this,[].concat(m[n]));this.attrs[n]=m[n];for(var p in o)o[a](p)&&(m[p]=o[p])}return w(this,m),this},$b.toFront=function(){if(this.removed)return this;var a=z(this.node);a.parentNode.appendChild(a);var b=this.paper;return b.top!=this&&c._tofront(this,b),this},$b.toBack=function(){if(this.removed)return this;var a=z(this.node),b=a.parentNode;b.insertBefore(a,b.firstChild),c._toback(this,this.paper);this.paper;return this},$b.insertAfter=function(a){if(this.removed||!a)return this;var b=z(this.node),d=z(a.node||a[a.length-1].node);return d.nextSibling?d.parentNode.insertBefore(b,d.nextSibling):d.parentNode.appendChild(b),c._insertafter(this,a,this.paper),this},$b.insertBefore=function(a){if(this.removed||!a)return this;var b=z(this.node),d=z(a.node||a[0].node);return d.parentNode.insertBefore(b,d),c._insertbefore(this,a,this.paper),this},$b.blur=function(a){var b=this;if(0!==+a){var d=q("filter"),e=q("feGaussianBlur");b.attrs.blur=a,d.id=c.createUUID(),q(e,{stdDeviation:+a||1.5}),d.appendChild(e),b.paper.defs.appendChild(d),b._blur=d,q(b.node,{filter:"url(#"+d.id+")"})}else b._blur&&(b._blur.parentNode.removeChild(b._blur),delete b._blur,delete b.attrs.blur),b.node.removeAttribute("filter");return b},c._engine.circle=function(a,b,c,d){var e=q("circle");a.canvas&&a.canvas.appendChild(e);var f=new __Element(e,a);return f.attrs={cx:b,cy:c,r:d,fill:"none",stroke:"#000"},f.type="circle",q(e,f.attrs),f},c._engine.rect=function(a,b,c,d,e,f){var g=q("rect");a.canvas&&a.canvas.appendChild(g);var h=new __Element(g,a);return h.attrs={x:b,y:c,width:d,height:e,rx:f||0,ry:f||0,fill:"none",stroke:"#000"},h.type="rect",q(g,h.attrs),h},c._engine.ellipse=function(a,b,c,d,e){var f=q("ellipse");a.canvas&&a.canvas.appendChild(f);var g=new __Element(f,a);return g.attrs={cx:b,cy:c,rx:d,ry:e,fill:"none",stroke:"#000"},g.type="ellipse",q(f,g.attrs),g},c._engine.image=function(a,b,c,d,e,f){var g=q("image");q(g,{x:c,y:d,width:e,height:f,preserveAspectRatio:"none"}),g.setAttributeNS(n,"href",b),a.canvas&&a.canvas.appendChild(g);var h=new __Element(g,a);return h.attrs={x:c,y:d,width:e,height:f,src:b},h.type="image",h},c._engine.text=function(a,b,d,e){var f=q("text");a.canvas&&a.canvas.appendChild(f);var g=new __Element(f,a);return g.attrs={x:b,y:d,"text-anchor":"middle",text:e,"font-family":c._availableAttrs["font-family"],"font-size":c._availableAttrs["font-size"],stroke:"none",fill:"#000"},g.type="text",w(g,g.attrs),g},c._engine.setSize=function(a,b){return this.width=a||this.width,this.height=b||this.height,this.canvas.setAttribute("width",this.width),this.canvas.setAttribute("height",this.height),this._viewBox&&this.setViewBox.apply(this,this._viewBox),this},c._engine.create=function(){var a=c._getContainer.apply(0,arguments),b=a&&a.container,d=a.x,e=a.y,f=a.width,g=a.height;if(!b)throw new Error("SVG container not found.");var h,i=q("svg"),j="overflow:hidden;";return d=d||0,e=e||0,f=f||512,g=g||342,q(i,{height:g,version:1.1,width:f,xmlns:"http://www.w3.org/2000/svg","xmlns:xlink":"http://www.w3.org/1999/xlink"}),1==b?(i.style.cssText=j+"position:absolute;left:"+d+"px;top:"+e+"px",c._g.doc.body.appendChild(i),h=1):(i.style.cssText=j+"position:relative",b.firstChild?b.insertBefore(i,b.firstChild):b.appendChild(i)),b=new c._Paper,b.width=f,b.height=g,b.canvas=i,b.clear(),b._left=b._top=0,h&&(b.renderfix=function(){}),b.renderfix(),b},c._engine.setViewBox=function(a,b,c,d,e){k("raphael.setViewBox",this,this._viewBox,[a,b,c,d,e]);var f,h,i=this.getSize(),j=g(c/i.width,d/i.height),l=this.top,n=e?"xMidYMid meet":"xMinYMin";for(null==a?(this._vbSize&&(j=1),delete this._vbSize,f="0 0 "+this.width+m+this.height):(this._vbSize=j,f=a+m+b+m+c+m+d),q(this.canvas,{viewBox:f,preserveAspectRatio:n});j&&l;)h="stroke-width"in l.attrs?l.attrs["stroke-width"]:1,l.attr({"stroke-width":h}),l._.dirty=1,l._.dirtyT=1,l=l.prev;return this._viewBox=[a,b,c,d,!!e],this},c.prototype.renderfix=function(){var a,b=this.canvas,c=b.style;try{a=b.getScreenCTM()||b.createSVGMatrix()}catch(d){a=b.createSVGMatrix()}var e=-a.e%1,f=-a.f%1;(e||f)&&(e&&(this._left=(this._left+e)%1,c.left=this._left+"px"),f&&(this._top=(this._top+f)%1,c.top=this._top+"px"))},c.prototype.clear=function(){c.eve("raphael.clear",this);for(var a=this.canvas;a.firstChild;)a.removeChild(a.firstChild);this.bottom=this.top=null,(this.desc=q("desc")).appendChild(c._g.doc.createTextNode("Created with Raphaël "+c.version)),a.appendChild(this.desc),a.appendChild(this.defs=q("defs"))},c.prototype.remove=function(){k("raphael.remove",this),this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas);for(var a in this)this[a]="function"==typeof this[a]?c._removedFactory(a):null};var A=c.st;for(var B in $b)$b[a](B)&&!A[a](B)&&(A[B]=function(a){return function(){var b=arguments;return this.forEach(function(c){c[a].apply(c,b)})}}(B))}}(),function(){if(c.vml){var a="hasOwnProperty",b=String,d=parseFloat,e=Math,f=e.round,g=e.max,h=e.min,i=e.abs,j="fill",k=/[, ]+/,l=c.eve,m=" progid:DXImageTransform.Microsoft",n=" ",o="",p={M:"m",L:"l",C:"c",Z:"x",m:"t",l:"r",c:"v",z:"x"},q=/([clmz]),?([^clmz]*)/gi,r=/ progid:\S+Blur\([^\)]+\)/g,s=/-?[^,\s-]+/g,t="position:absolute;left:0;top:0;width:1px;height:1px;behavior:url(#default#VML)",u=21600,v={path:1,rect:1,image:1},w={circle:1,ellipse:1},x=function(a){var d=/[ahqstv]/gi,e=c._pathToAbsolute;if(b(a).match(d)&&(e=c._path2curve),d=/[clmz]/g,e==c._pathToAbsolute&&!b(a).match(d)){var g=b(a).replace(q,function(a,b,c){var d=[],e="m"==b.toLowerCase(),g=p[b];return c.replace(s,function(a){e&&2==d.length&&(g+=d+p["m"==b?"l":"L"],d=[]),d.push(f(a*u))}),g+d});return g}var h,i,j=e(a);g=[];for(var k=0,l=j.length;l>k;k++){h=j[k],i=j[k][0].toLowerCase(),"z"==i&&(i="x");for(var m=1,r=h.length;r>m;m++)i+=f(h[m]*u)+(m!=r-1?",":o);g.push(i)}return g.join(n)},y=function(a,b,d){var e=c.matrix();return e.rotate(-a,.5,.5),{dx:e.x(b,d),dy:e.y(b,d)}},z=function(a,b,c,d,e,f){var g=a._,h=a.matrix,k=g.fillpos,l=a.node,m=l.style,o=1,p="",q=u/b,r=u/c;if(m.visibility="hidden",b&&c){if(l.coordsize=i(q)+n+i(r),m.rotation=f*(0>b*c?-1:1),f){var s=y(f,d,e);d=s.dx,e=s.dy}if(0>b&&(p+="x"),0>c&&(p+=" y")&&(o=-1),m.flip=p,l.coordorigin=d*-q+n+e*-r,k||g.fillsize){var t=l.getElementsByTagName(j);t=t&&t[0],l.removeChild(t),k&&(s=y(f,h.x(k[0],k[1]),h.y(k[0],k[1])),t.position=s.dx*o+n+s.dy*o),g.fillsize&&(t.size=g.fillsize[0]*i(b)+n+g.fillsize[1]*i(c)),l.appendChild(t)}m.visibility="visible"}};c.toString=function(){return"Your browser doesn’t support SVG. Falling down to VML.\nYou are running Raphaël "+this.version};var A=function(a,c,d){for(var e=b(c).toLowerCase().split("-"),f=d?"end":"start",g=e.length,h="classic",i="medium",j="medium";g--;)switch(e[g]){case"block":case"classic":case"oval":case"diamond":case"open":case"none":h=e[g];break;case"wide":case"narrow":j=e[g];break;case"long":case"short":i=e[g]}var k=a.node.getElementsByTagName("stroke")[0];k[f+"arrow"]=h,k[f+"arrowlength"]=i,k[f+"arrowwidth"]=j},B=function(e,i){e.attrs=e.attrs||{};var l=e.node,m=e.attrs,p=l.style,q=v[e.type]&&(i.x!=m.x||i.y!=m.y||i.width!=m.width||i.height!=m.height||i.cx!=m.cx||i.cy!=m.cy||i.rx!=m.rx||i.ry!=m.ry||i.r!=m.r),r=w[e.type]&&(m.cx!=i.cx||m.cy!=i.cy||m.r!=i.r||m.rx!=i.rx||m.ry!=i.ry),s=e;for(var t in i)i[a](t)&&(m[t]=i[t]);if(q&&(m.path=c._getPath[e.type](e),e._.dirty=1),i.href&&(l.href=i.href),i.title&&(l.title=i.title),i.target&&(l.target=i.target),i.cursor&&(p.cursor=i.cursor),"blur"in i&&e.blur(i.blur),(i.path&&"path"==e.type||q)&&(l.path=x(~b(m.path).toLowerCase().indexOf("r")?c._pathToAbsolute(m.path):m.path),e._.dirty=1,"image"==e.type&&(e._.fillpos=[m.x,m.y],e._.fillsize=[m.width,m.height],z(e,1,1,0,0,0))),"transform"in i&&e.transform(i.transform),r){var y=+m.cx,B=+m.cy,D=+m.rx||+m.r||0,E=+m.ry||+m.r||0;l.path=c.format("ar{0},{1},{2},{3},{4},{1},{4},{1}x",f((y-D)*u),f((B-E)*u),f((y+D)*u),f((B+E)*u),f(y*u)),e._.dirty=1}if("clip-rect"in i){var G=b(i["clip-rect"]).split(k);if(4==G.length){G[2]=+G[2]+ +G[0],G[3]=+G[3]+ +G[1];var H=l.clipRect||c._g.doc.createElement("div"),I=H.style;I.clip=c.format("rect({1}px {2}px {3}px {0}px)",G),l.clipRect||(I.position="absolute",I.top=0,I.left=0,I.width=e.paper.width+"px",I.height=e.paper.height+"px",l.parentNode.insertBefore(H,l),H.appendChild(l),l.clipRect=H)}i["clip-rect"]||l.clipRect&&(l.clipRect.style.clip="auto")}if(e.textpath){var J=e.textpath.style;i.font&&(J.font=i.font),i["font-family"]&&(J.fontFamily='"'+i["font-family"].split(",")[0].replace(/^['"]+|['"]+$/g,o)+'"'),i["font-size"]&&(J.fontSize=i["font-size"]),i["font-weight"]&&(J.fontWeight=i["font-weight"]),i["font-style"]&&(J.fontStyle=i["font-style"])}if("arrow-start"in i&&A(s,i["arrow-start"]),"arrow-end"in i&&A(s,i["arrow-end"],1),null!=i.opacity||null!=i["stroke-width"]||null!=i.fill||null!=i.src||null!=i.stroke||null!=i["stroke-width"]||null!=i["stroke-opacity"]||null!=i["fill-opacity"]||null!=i["stroke-dasharray"]||null!=i["stroke-miterlimit"]||null!=i["stroke-linejoin"]||null!=i["stroke-linecap"]){var K=l.getElementsByTagName(j),L=!1;if(K=K&&K[0],!K&&(L=K=F(j)),"image"==e.type&&i.src&&(K.src=i.src),i.fill&&(K.on=!0),(null==K.on||"none"==i.fill||null===i.fill)&&(K.on=!1),K.on&&i.fill){var M=b(i.fill).match(c._ISURL);if(M){K.parentNode==l&&l.removeChild(K),K.rotate=!0,K.src=M[1],K.type="tile";var N=e.getBBox(1);K.position=N.x+n+N.y,e._.fillpos=[N.x,N.y],c._preload(M[1],function(){e._.fillsize=[this.offsetWidth,this.offsetHeight]})}else K.color=c.getRGB(i.fill).hex,K.src=o,K.type="solid",c.getRGB(i.fill).error&&(s.type in{circle:1,ellipse:1}||"r"!=b(i.fill).charAt())&&C(s,i.fill,K)&&(m.fill="none",m.gradient=i.fill,K.rotate=!1)}if("fill-opacity"in i||"opacity"in i){var O=((+m["fill-opacity"]+1||2)-1)*((+m.opacity+1||2)-1)*((+c.getRGB(i.fill).o+1||2)-1);O=h(g(O,0),1),K.opacity=O,K.src&&(K.color="none")}l.appendChild(K);var P=l.getElementsByTagName("stroke")&&l.getElementsByTagName("stroke")[0],Q=!1;!P&&(Q=P=F("stroke")),(i.stroke&&"none"!=i.stroke||i["stroke-width"]||null!=i["stroke-opacity"]||i["stroke-dasharray"]||i["stroke-miterlimit"]||i["stroke-linejoin"]||i["stroke-linecap"])&&(P.on=!0),("none"==i.stroke||null===i.stroke||null==P.on||0==i.stroke||0==i["stroke-width"])&&(P.on=!1);var R=c.getRGB(i.stroke);P.on&&i.stroke&&(P.color=R.hex),O=((+m["stroke-opacity"]+1||2)-1)*((+m.opacity+1||2)-1)*((+R.o+1||2)-1);var S=.75*(d(i["stroke-width"])||1);if(O=h(g(O,0),1),null==i["stroke-width"]&&(S=m["stroke-width"]),i["stroke-width"]&&(P.weight=S),S&&1>S&&(O*=S)&&(P.weight=1),P.opacity=O,i["stroke-linejoin"]&&(P.joinstyle=i["stroke-linejoin"]||"miter"),P.miterlimit=i["stroke-miterlimit"]||8,i["stroke-linecap"]&&(P.endcap="butt"==i["stroke-linecap"]?"flat":"square"==i["stroke-linecap"]?"square":"round"),"stroke-dasharray"in i){var T={"-":"shortdash",".":"shortdot","-.":"shortdashdot","-..":"shortdashdotdot",". ":"dot","- ":"dash","--":"longdash","- .":"dashdot","--.":"longdashdot","--..":"longdashdotdot"};P.dashstyle=T[a](i["stroke-dasharray"])?T[i["stroke-dasharray"]]:o}Q&&l.appendChild(P)}if("text"==s.type){s.paper.canvas.style.display=o;var U=s.paper.span,V=100,W=m.font&&m.font.match(/\d+(?:\.\d*)?(?=px)/);p=U.style,m.font&&(p.font=m.font),m["font-family"]&&(p.fontFamily=m["font-family"]),m["font-weight"]&&(p.fontWeight=m["font-weight"]),m["font-style"]&&(p.fontStyle=m["font-style"]),W=d(m["font-size"]||W&&W[0])||10,p.fontSize=W*V+"px",s.textpath.string&&(U.innerHTML=b(s.textpath.string).replace(/</g,"&#60;").replace(/&/g,"&#38;").replace(/\n/g,"<br>"));var X=U.getBoundingClientRect();s.W=m.w=(X.right-X.left)/V,s.H=m.h=(X.bottom-X.top)/V,s.X=m.x,s.Y=m.y+s.H/2,("x"in i||"y"in i)&&(s.path.v=c.format("m{0},{1}l{2},{1}",f(m.x*u),f(m.y*u),f(m.x*u)+1));for(var Y=["x","y","text","font","font-family","font-weight","font-style","font-size"],Z=0,$=Y.length;$>Z;Z++)if(Y[Z]in i){s._.dirty=1;break}switch(m["text-anchor"]){case"start":s.textpath.style["v-text-align"]="left",s.bbx=s.W/2;break;case"end":s.textpath.style["v-text-align"]="right",s.bbx=-s.W/2;break;default:s.textpath.style["v-text-align"]="center",s.bbx=0}s.textpath.style["v-text-kern"]=!0}},C=function(a,f,g){a.attrs=a.attrs||{};var h=(a.attrs,Math.pow),i="linear",j=".5 .5";if(a.attrs.gradient=f,f=b(f).replace(c._radial_gradient,function(a,b,c){return i="radial",b&&c&&(b=d(b),c=d(c),h(b-.5,2)+h(c-.5,2)>.25&&(c=e.sqrt(.25-h(b-.5,2))*(2*(c>.5)-1)+.5),j=b+n+c),o}),f=f.split(/\s*\-\s*/),"linear"==i){var k=f.shift();if(k=-d(k),isNaN(k))return null}var l=c._parseDots(f);if(!l)return null;if(a=a.shape||a.node,l.length){a.removeChild(g),g.on=!0,g.method="none",g.color=l[0].color,g.color2=l[l.length-1].color;for(var m=[],p=0,q=l.length;q>p;p++)l[p].offset&&m.push(l[p].offset+n+l[p].color);g.colors=m.length?m.join():"0% "+g.color,"radial"==i?(g.type="gradientTitle",g.focus="100%",g.focussize="0 0",g.focusposition=j,g.angle=0):(g.type="gradient",g.angle=(270-k)%360),a.appendChild(g)}return 1},D=function(a,b){this[0]=this.node=a,a.raphael=!0,this.id=c._oid++,a.raphaelid=this.id,this.X=0,this.Y=0,this.attrs={},this.paper=b,this.matrix=c.matrix(),this._={transform:[],sx:1,sy:1,dx:0,dy:0,deg:0,dirty:1,dirtyT:1},!b.bottom&&(b.bottom=this),this.prev=b.top,b.top&&(b.top.next=this),b.top=this,this.next=null},E=c.el;D.prototype=E,E.constructor=D,E.transform=function(a){if(null==a)return this._.transform;var d,e=this.paper._viewBoxShift,f=e?"s"+[e.scale,e.scale]+"-1-1t"+[e.dx,e.dy]:o;e&&(d=a=b(a).replace(/\.{3}|\u2026/g,this._.transform||o)),c._extractTransform(this,f+a);var g,h=this.matrix.clone(),i=this.skew,j=this.node,k=~b(this.attrs.fill).indexOf("-"),l=!b(this.attrs.fill).indexOf("url(");if(h.translate(1,1),l||k||"image"==this.type)if(i.matrix="1 0 0 1",i.offset="0 0",g=h.split(),k&&g.noRotation||!g.isSimple){j.style.filter=h.toFilter();var m=this.getBBox(),p=this.getBBox(1),q=m.x-p.x,r=m.y-p.y;j.coordorigin=q*-u+n+r*-u,z(this,1,1,q,r,0)}else j.style.filter=o,z(this,g.scalex,g.scaley,g.dx,g.dy,g.rotate);else j.style.filter=o,i.matrix=b(h),i.offset=h.offset();return null!==d&&(this._.transform=d,c._extractTransform(this,d)),this},E.rotate=function(a,c,e){if(this.removed)return this;if(null!=a){if(a=b(a).split(k),a.length-1&&(c=d(a[1]),e=d(a[2])),a=d(a[0]),null==e&&(c=e),null==c||null==e){var f=this.getBBox(1);c=f.x+f.width/2,e=f.y+f.height/2}return this._.dirtyT=1,this.transform(this._.transform.concat([["r",a,c,e]])),this}},E.translate=function(a,c){return this.removed?this:(a=b(a).split(k),a.length-1&&(c=d(a[1])),a=d(a[0])||0,c=+c||0,this._.bbox&&(this._.bbox.x+=a,this._.bbox.y+=c),this.transform(this._.transform.concat([["t",a,c]])),this)},E.scale=function(a,c,e,f){if(this.removed)return this;if(a=b(a).split(k),a.length-1&&(c=d(a[1]),e=d(a[2]),f=d(a[3]),isNaN(e)&&(e=null),isNaN(f)&&(f=null)),a=d(a[0]),null==c&&(c=a),null==f&&(e=f),null==e||null==f)var g=this.getBBox(1);return e=null==e?g.x+g.width/2:e,f=null==f?g.y+g.height/2:f,this.transform(this._.transform.concat([["s",a,c,e,f]])),this._.dirtyT=1,this},E.hide=function(){return!this.removed&&(this.node.style.display="none"),this},E.show=function(){return!this.removed&&(this.node.style.display=o),this},E.auxGetBBox=c.el.getBBox,E.getBBox=function(){var a=this.auxGetBBox();if(this.paper&&this.paper._viewBoxShift){var b={},c=1/this.paper._viewBoxShift.scale;return b.x=a.x-this.paper._viewBoxShift.dx,b.x*=c,b.y=a.y-this.paper._viewBoxShift.dy,b.y*=c,b.width=a.width*c,b.height=a.height*c,b.x2=b.x+b.width,b.y2=b.y+b.height,b}return a},E._getBBox=function(){return this.removed?{}:{x:this.X+(this.bbx||0)-this.W/2,y:this.Y-this.H,width:this.W,height:this.H}},E.remove=function(){if(!this.removed&&this.node.parentNode){this.paper.__set__&&this.paper.__set__.exclude(this),c.eve.unbind("raphael.*.*."+this.id),c._tear(this,this.paper),this.node.parentNode.removeChild(this.node),this.shape&&this.shape.parentNode.removeChild(this.shape);for(var a in this)this[a]="function"==typeof this[a]?c._removedFactory(a):null;this.removed=!0}},E.attr=function(b,d){if(this.removed)return this;if(null==b){var e={};for(var f in this.attrs)this.attrs[a](f)&&(e[f]=this.attrs[f]);return e.gradient&&"none"==e.fill&&(e.fill=e.gradient)&&delete e.gradient,e.transform=this._.transform,e}if(null==d&&c.is(b,"string")){if(b==j&&"none"==this.attrs.fill&&this.attrs.gradient)return this.attrs.gradient;for(var g=b.split(k),h={},i=0,m=g.length;m>i;i++)b=g[i],h[b]=b in this.attrs?this.attrs[b]:c.is(this.paper.customAttributes[b],"function")?this.paper.customAttributes[b].def:c._availableAttrs[b];return m-1?h:h[g[0]]}if(this.attrs&&null==d&&c.is(b,"array")){for(h={},i=0,m=b.length;m>i;i++)h[b[i]]=this.attr(b[i]);return h}var n;null!=d&&(n={},n[b]=d),null==d&&c.is(b,"object")&&(n=b);for(var o in n)l("raphael.attr."+o+"."+this.id,this,n[o]);if(n){for(o in this.paper.customAttributes)if(this.paper.customAttributes[a](o)&&n[a](o)&&c.is(this.paper.customAttributes[o],"function")){var p=this.paper.customAttributes[o].apply(this,[].concat(n[o]));this.attrs[o]=n[o];for(var q in p)p[a](q)&&(n[q]=p[q])}n.text&&"text"==this.type&&(this.textpath.string=n.text),B(this,n)}return this},E.toFront=function(){return!this.removed&&this.node.parentNode.appendChild(this.node),this.paper&&this.paper.top!=this&&c._tofront(this,this.paper),this},E.toBack=function(){return this.removed?this:(this.node.parentNode.firstChild!=this.node&&(this.node.parentNode.insertBefore(this.node,this.node.parentNode.firstChild),c._toback(this,this.paper)),this)},E.insertAfter=function(a){return this.removed?this:(a.constructor==c.st.constructor&&(a=a[a.length-1]),a.node.nextSibling?a.node.parentNode.insertBefore(this.node,a.node.nextSibling):a.node.parentNode.appendChild(this.node),c._insertafter(this,a,this.paper),this)},E.insertBefore=function(a){return this.removed?this:(a.constructor==c.st.constructor&&(a=a[0]),a.node.parentNode.insertBefore(this.node,a.node),c._insertbefore(this,a,this.paper),this)},E.blur=function(a){var b=this.node.runtimeStyle,d=b.filter;return d=d.replace(r,o),0!==+a?(this.attrs.blur=a,b.filter=d+n+m+".Blur(pixelradius="+(+a||1.5)+")",b.margin=c.format("-{0}px 0 0 -{0}px",f(+a||1.5))):(b.filter=d,b.margin=0,delete this.attrs.blur),this},c._engine.path=function(a,b){var c=F("shape");c.style.cssText=t,c.coordsize=u+n+u,c.coordorigin=b.coordorigin;var d=new D(c,b),e={fill:"none",stroke:"#000"};a&&(e.path=a),d.type="path",d.path=[],d.Path=o,B(d,e),b.canvas.appendChild(c);var f=F("skew");return f.on=!0,c.appendChild(f),d.skew=f,d.transform(o),d},c._engine.rect=function(a,b,d,e,f,g){var h=c._rectPath(b,d,e,f,g),i=a.path(h),j=i.attrs;return i.X=j.x=b,i.Y=j.y=d,i.W=j.width=e,i.H=j.height=f,j.r=g,j.path=h,i.type="rect",i},c._engine.ellipse=function(a,b,c,d,e){{var f=a.path();f.attrs}return f.X=b-d,f.Y=c-e,f.W=2*d,f.H=2*e,f.type="ellipse",B(f,{cx:b,cy:c,rx:d,ry:e}),f},c._engine.circle=function(a,b,c,d){{var e=a.path();e.attrs}return e.X=b-d,e.Y=c-d,e.W=e.H=2*d,e.type="circle",B(e,{cx:b,cy:c,r:d}),e},c._engine.image=function(a,b,d,e,f,g){var h=c._rectPath(d,e,f,g),i=a.path(h).attr({stroke:"none"}),k=i.attrs,l=i.node,m=l.getElementsByTagName(j)[0];return k.src=b,i.X=k.x=d,i.Y=k.y=e,i.W=k.width=f,i.H=k.height=g,k.path=h,i.type="image",m.parentNode==l&&l.removeChild(m),m.rotate=!0,m.src=b,m.type="tile",i._.fillpos=[d,e],i._.fillsize=[f,g],l.appendChild(m),z(i,1,1,0,0,0),i},c._engine.text=function(a,d,e,g){var h=F("shape"),i=F("path"),j=F("textpath");d=d||0,e=e||0,g=g||"",i.v=c.format("m{0},{1}l{2},{1}",f(d*u),f(e*u),f(d*u)+1),i.textpathok=!0,j.string=b(g),j.on=!0,h.style.cssText=t,h.coordsize=u+n+u,h.coordorigin="0 0";var k=new D(h,a),l={fill:"#000",stroke:"none",font:c._availableAttrs.font,text:g};k.shape=h,k.path=i,k.textpath=j,k.type="text",k.attrs.text=b(g),k.attrs.x=d,k.attrs.y=e,k.attrs.w=1,k.attrs.h=1,B(k,l),h.appendChild(j),h.appendChild(i),a.canvas.appendChild(h);var m=F("skew");return m.on=!0,h.appendChild(m),k.skew=m,k.transform(o),k},c._engine.setSize=function(a,b){var d=this.canvas.style;return this.width=a,this.height=b,a==+a&&(a+="px"),b==+b&&(b+="px"),d.width=a,d.height=b,d.clip="rect(0 "+a+" "+b+" 0)",this._viewBox&&c._engine.setViewBox.apply(this,this._viewBox),this},c._engine.setViewBox=function(a,b,d,e,f){c.eve("raphael.setViewBox",this,this._viewBox,[a,b,d,e,f]);var g,h,i=this.getSize(),j=i.width,k=i.height;return f&&(g=k/e,h=j/d,j>d*g&&(a-=(j-d*g)/2/g),k>e*h&&(b-=(k-e*h)/2/h)),this._viewBox=[a,b,d,e,!!f],this._viewBoxShift={dx:-a,dy:-b,scale:size},this.forEach(function(a){a.transform("...")}),this};var F;c._engine.initWin=function(a){var b=a.document;b.styleSheets.length<31?b.createStyleSheet().addRule(".rvml","behavior:url(#default#VML)"):b.styleSheets[0].addRule(".rvml","behavior:url(#default#VML)");try{!b.namespaces.rvml&&b.namespaces.add("rvml","urn:schemas-microsoft-com:vml"),F=function(a){return b.createElement("<rvml:"+a+' class="rvml">')}}catch(c){F=function(a){return b.createElement("<"+a+' xmlns="urn:schemas-microsoft.com:vml" class="rvml">')}}},c._engine.initWin(c._g.win),c._engine.create=function(){var a=c._getContainer.apply(0,arguments),b=a.container,d=a.height,e=a.width,f=a.x,g=a.y;if(!b)throw new Error("VML container not found.");var h=new c._Paper,i=h.canvas=c._g.doc.createElement("div"),j=i.style;return f=f||0,g=g||0,e=e||512,d=d||342,h.width=e,h.height=d,e==+e&&(e+="px"),d==+d&&(d+="px"),h.coordsize=1e3*u+n+1e3*u,h.coordorigin="0 0",h.span=c._g.doc.createElement("span"),h.span.style.cssText="position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;",i.appendChild(h.span),j.cssText=c.format("top:0;left:0;width:{0};height:{1};display:inline-block;position:relative;clip:rect(0 {0} {1} 0);overflow:hidden",e,d),1==b?(c._g.doc.body.appendChild(i),j.left=f+"px",j.top=g+"px",j.position="absolute"):b.firstChild?b.insertBefore(i,b.firstChild):b.appendChild(i),h.renderfix=function(){},h},c.prototype.clear=function(){c.eve("raphael.clear",this),this.canvas.innerHTML=o,this.span=c._g.doc.createElement("span"),this.span.style.cssText="position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;",this.canvas.appendChild(this.span),this.bottom=this.top=null},c.prototype.remove=function(){c.eve("raphael.remove",this),this.canvas.parentNode.removeChild(this.canvas);for(var a in this)this[a]="function"==typeof this[a]?c._removedFactory(a):null;return!0};var G=c.st;for(var H in E)E[a](H)&&!G[a](H)&&(G[H]=function(a){return function(){var b=arguments;return this.forEach(function(c){c[a].apply(c,b)})}}(H))}}(),B.was?A.win.Raphael=c:Raphael=c,"object"==typeof exports&&(module.exports=c),c});
+!function (a) { var b, c, d = "0.4.2", e = "hasOwnProperty", f = /[\.\/]/, g = "*", h = function () { }, i = function (a, b) { return a - b }, j = { n: {} }, k = function (a, d) { a = String(a); var e, f = c, g = Array.prototype.slice.call(arguments, 2), h = k.listeners(a), j = 0, l = [], m = {}, n = [], o = b; b = a, c = 0; for (var p = 0, q = h.length; q > p; p++)"zIndex" in h[p] && (l.push(h[p].zIndex), h[p].zIndex < 0 && (m[h[p].zIndex] = h[p])); for (l.sort(i); l[j] < 0;)if (e = m[l[j++]], n.push(e.apply(d, g)), c) return c = f, n; for (p = 0; q > p; p++)if (e = h[p], "zIndex" in e) if (e.zIndex == l[j]) { if (n.push(e.apply(d, g)), c) break; do if (j++, e = m[l[j]], e && n.push(e.apply(d, g)), c) break; while (e) } else m[e.zIndex] = e; else if (n.push(e.apply(d, g)), c) break; return c = f, b = o, n.length ? n : null }; k._events = j, k.listeners = function (a) { var b, c, d, e, h, i, k, l, m = a.split(f), n = j, o = [n], p = []; for (e = 0, h = m.length; h > e; e++) { for (l = [], i = 0, k = o.length; k > i; i++)for (n = o[i].n, c = [n[m[e]], n[g]], d = 2; d--;)b = c[d], b && (l.push(b), p = p.concat(b.f || [])); o = l } return p }, k.on = function (a, b) { if (a = String(a), "function" != typeof b) return function () { }; for (var c = a.split(f), d = j, e = 0, g = c.length; g > e; e++)d = d.n, d = d.hasOwnProperty(c[e]) && d[c[e]] || (d[c[e]] = { n: {} }); for (d.f = d.f || [], e = 0, g = d.f.length; g > e; e++)if (d.f[e] == b) return h; return d.f.push(b), function (a) { +a == +a && (b.zIndex = +a) } }, k.f = function (a) { var b = [].slice.call(arguments, 1); return function () { k.apply(null, [a, null].concat(b).concat([].slice.call(arguments, 0))) } }, k.stop = function () { c = 1 }, k.nt = function (a) { return a ? new RegExp("(?:\\.|\\/|^)" + a + "(?:\\.|\\/|$)").test(b) : b }, k.nts = function () { return b.split(f) }, k.off = k.unbind = function (a, b) { if (!a) return void (k._events = j = { n: {} }); var c, d, h, i, l, m, n, o = a.split(f), p = [j]; for (i = 0, l = o.length; l > i; i++)for (m = 0; m < p.length; m += h.length - 2) { if (h = [m, 1], c = p[m].n, o[i] != g) c[o[i]] && h.push(c[o[i]]); else for (d in c) c[e](d) && h.push(c[d]); p.splice.apply(p, h) } for (i = 0, l = p.length; l > i; i++)for (c = p[i]; c.n;) { if (b) { if (c.f) { for (m = 0, n = c.f.length; n > m; m++)if (c.f[m] == b) { c.f.splice(m, 1); break } !c.f.length && delete c.f } for (d in c.n) if (c.n[e](d) && c.n[d].f) { var q = c.n[d].f; for (m = 0, n = q.length; n > m; m++)if (q[m] == b) { q.splice(m, 1); break } !q.length && delete c.n[d].f } } else { delete c.f; for (d in c.n) c.n[e](d) && c.n[d].f && delete c.n[d].f } c = c.n } }, k.once = function (a, b) { var c = function () { return k.unbind(a, c), b.apply(this, arguments) }; return k.on(a, c) }, k.version = d, k.toString = function () { return "You are running Eve " + d }, "undefined" != typeof module && module.exports ? module.exports = k : "undefined" != typeof define ? define("eve", [], function () { return k }) : a.eve = k }(window || this), function (a, b) { "function" == typeof define && define.amd ? define(["eve"], function (c) { return b(a, c) }) : b(a, a.eve || "function" == typeof require && require("eve")) }(this, function (a, b) {
+    function c(a) { if (c.is(a, "function")) return u ? a() : b.on("raphael.DOMload", a); if (c.is(a, V)) return c._engine.create[D](c, a.splice(0, 3 + c.is(a[0], T))).add(a); var d = Array.prototype.slice.call(arguments, 0); if (c.is(d[d.length - 1], "function")) { var e = d.pop(); return u ? e.call(c._engine.create[D](c, d)) : b.on("raphael.DOMload", function () { e.call(c._engine.create[D](c, d)) }) } return c._engine.create[D](c, arguments) } function d(a) { if ("function" == typeof a || Object(a) !== a) return a; var b = new a.constructor; for (var c in a) a[z](c) && (b[c] = d(a[c])); return b } function e(a, b) { for (var c = 0, d = a.length; d > c; c++)if (a[c] === b) return a.push(a.splice(c, 1)[0]) } function f(a, b, c) { function d() { var f = Array.prototype.slice.call(arguments, 0), g = f.join("␀"), h = d.cache = d.cache || {}, i = d.count = d.count || []; return h[z](g) ? (e(i, g), c ? c(h[g]) : h[g]) : (i.length >= 1e3 && delete h[i.shift()], i.push(g), h[g] = a[D](b, f), c ? c(h[g]) : h[g]) } return d } function g() { return this.hex } function h(a, b) { for (var c = [], d = 0, e = a.length; e - 2 * !b > d; d += 2) { var f = [{ x: +a[d - 2], y: +a[d - 1] }, { x: +a[d], y: +a[d + 1] }, { x: +a[d + 2], y: +a[d + 3] }, { x: +a[d + 4], y: +a[d + 5] }]; b ? d ? e - 4 == d ? f[3] = { x: +a[0], y: +a[1] } : e - 2 == d && (f[2] = { x: +a[0], y: +a[1] }, f[3] = { x: +a[2], y: +a[3] }) : f[0] = { x: +a[e - 2], y: +a[e - 1] } : e - 4 == d ? f[3] = f[2] : d || (f[0] = { x: +a[d], y: +a[d + 1] }), c.push(["C", (-f[0].x + 6 * f[1].x + f[2].x) / 6, (-f[0].y + 6 * f[1].y + f[2].y) / 6, (f[1].x + 6 * f[2].x - f[3].x) / 6, (f[1].y + 6 * f[2].y - f[3].y) / 6, f[2].x, f[2].y]) } return c } function i(a, b, c, d, e) { var f = -3 * b + 9 * c - 9 * d + 3 * e, g = a * f + 6 * b - 12 * c + 6 * d; return a * g - 3 * b + 3 * c } function j(a, b, c, d, e, f, g, h, j) { null == j && (j = 1), j = j > 1 ? 1 : 0 > j ? 0 : j; for (var k = j / 2, l = 12, m = [-.1252, .1252, -.3678, .3678, -.5873, .5873, -.7699, .7699, -.9041, .9041, -.9816, .9816], n = [.2491, .2491, .2335, .2335, .2032, .2032, .1601, .1601, .1069, .1069, .0472, .0472], o = 0, p = 0; l > p; p++) { var q = k * m[p] + k, r = i(q, a, c, e, g), s = i(q, b, d, f, h), t = r * r + s * s; o += n[p] * N.sqrt(t) } return k * o } function k(a, b, c, d, e, f, g, h, i) { if (!(0 > i || j(a, b, c, d, e, f, g, h) < i)) { var k, l = 1, m = l / 2, n = l - m, o = .01; for (k = j(a, b, c, d, e, f, g, h, n); Q(k - i) > o;)m /= 2, n += (i > k ? 1 : -1) * m, k = j(a, b, c, d, e, f, g, h, n); return n } } function l(a, b, c, d, e, f, g, h) { if (!(O(a, c) < P(e, g) || P(a, c) > O(e, g) || O(b, d) < P(f, h) || P(b, d) > O(f, h))) { var i = (a * d - b * c) * (e - g) - (a - c) * (e * h - f * g), j = (a * d - b * c) * (f - h) - (b - d) * (e * h - f * g), k = (a - c) * (f - h) - (b - d) * (e - g); if (k) { var l = i / k, m = j / k, n = +l.toFixed(2), o = +m.toFixed(2); if (!(n < +P(a, c).toFixed(2) || n > +O(a, c).toFixed(2) || n < +P(e, g).toFixed(2) || n > +O(e, g).toFixed(2) || o < +P(b, d).toFixed(2) || o > +O(b, d).toFixed(2) || o < +P(f, h).toFixed(2) || o > +O(f, h).toFixed(2))) return { x: l, y: m } } } } function m(a, b, d) { var e = c.bezierBBox(a), f = c.bezierBBox(b); if (!c.isBBoxIntersect(e, f)) return d ? 0 : []; for (var g = j.apply(0, a), h = j.apply(0, b), i = O(~~(g / 5), 1), k = O(~~(h / 5), 1), m = [], n = [], o = {}, p = d ? 0 : [], q = 0; i + 1 > q; q++) { var r = c.findDotsAtSegment.apply(c, a.concat(q / i)); m.push({ x: r.x, y: r.y, t: q / i }) } for (q = 0; k + 1 > q; q++)r = c.findDotsAtSegment.apply(c, b.concat(q / k)), n.push({ x: r.x, y: r.y, t: q / k }); for (q = 0; i > q; q++)for (var s = 0; k > s; s++) { var t = m[q], u = m[q + 1], v = n[s], w = n[s + 1], x = Q(u.x - t.x) < .001 ? "y" : "x", y = Q(w.x - v.x) < .001 ? "y" : "x", z = l(t.x, t.y, u.x, u.y, v.x, v.y, w.x, w.y); if (z) { if (o[z.x.toFixed(4)] == z.y.toFixed(4)) continue; o[z.x.toFixed(4)] = z.y.toFixed(4); var A = t.t + Q((z[x] - t[x]) / (u[x] - t[x])) * (u.t - t.t), B = v.t + Q((z[y] - v[y]) / (w[y] - v[y])) * (w.t - v.t); A >= 0 && 1.001 >= A && B >= 0 && 1.001 >= B && (d ? p++ : p.push({ x: z.x, y: z.y, t1: P(A, 1), t2: P(B, 1) })) } } return p } function n(a, b, d) { a = c._path2curve(a), b = c._path2curve(b); for (var e, f, g, h, i, j, k, l, n, o, p = d ? 0 : [], q = 0, r = a.length; r > q; q++) { var s = a[q]; if ("M" == s[0]) e = i = s[1], f = j = s[2]; else { "C" == s[0] ? (n = [e, f].concat(s.slice(1)), e = n[6], f = n[7]) : (n = [e, f, e, f, i, j, i, j], e = i, f = j); for (var t = 0, u = b.length; u > t; t++) { var v = b[t]; if ("M" == v[0]) g = k = v[1], h = l = v[2]; else { "C" == v[0] ? (o = [g, h].concat(v.slice(1)), g = o[6], h = o[7]) : (o = [g, h, g, h, k, l, k, l], g = k, h = l); var w = m(n, o, d); if (d) p += w; else { for (var x = 0, y = w.length; y > x; x++)w[x].segment1 = q, w[x].segment2 = t, w[x].bez1 = n, w[x].bez2 = o; p = p.concat(w) } } } } } return p } function o(a, b, c, d, e, f) { null != a ? (this.a = +a, this.b = +b, this.c = +c, this.d = +d, this.e = +e, this.f = +f) : (this.a = 1, this.b = 0, this.c = 0, this.d = 1, this.e = 0, this.f = 0) } function p() { return this.x + H + this.y + H + this.width + " × " + this.height } function q(a, b, c, d, e, f) { function g(a) { return ((l * a + k) * a + j) * a } function h(a, b) { var c = i(a, b); return ((o * c + n) * c + m) * c } function i(a, b) { var c, d, e, f, h, i; for (e = a, i = 0; 8 > i; i++) { if (f = g(e) - a, Q(f) < b) return e; if (h = (3 * l * e + 2 * k) * e + j, Q(h) < 1e-6) break; e -= f / h } if (c = 0, d = 1, e = a, c > e) return c; if (e > d) return d; for (; d > c;) { if (f = g(e), Q(f - a) < b) return e; a > f ? c = e : d = e, e = (d - c) / 2 + c } return e } var j = 3 * b, k = 3 * (d - b) - j, l = 1 - j - k, m = 3 * c, n = 3 * (e - c) - m, o = 1 - m - n; return h(a, 1 / (200 * f)) } function r(a, b) { var c = [], d = {}; if (this.ms = b, this.times = 1, a) { for (var e in a) a[z](e) && (d[_(e)] = a[e], c.push(_(e))); c.sort(lb) } this.anim = d, this.top = c[c.length - 1], this.percents = c } function s(a, d, e, f, g, h) { e = _(e); var i, j, k, l, m, n, p = a.ms, r = {}, s = {}, t = {}; if (f) for (v = 0, x = ic.length; x > v; v++) { var u = ic[v]; if (u.el.id == d.id && u.anim == a) { u.percent != e ? (ic.splice(v, 1), k = 1) : j = u, d.attr(u.totalOrigin); break } } else f = +s; for (var v = 0, x = a.percents.length; x > v; v++) { if (a.percents[v] == e || a.percents[v] > f * a.top) { e = a.percents[v], m = a.percents[v - 1] || 0, p = p / a.top * (e - m), l = a.percents[v + 1], i = a.anim[e]; break } f && d.attr(a.anim[a.percents[v]]) } if (i) { if (j) j.initstatus = f, j.start = new Date - j.ms * f; else { for (var y in i) if (i[z](y) && (db[z](y) || d.paper.customAttributes[z](y))) switch (r[y] = d.attr(y), null == r[y] && (r[y] = cb[y]), s[y] = i[y], db[y]) { case T: t[y] = (s[y] - r[y]) / p; break; case "colour": r[y] = c.getRGB(r[y]); var A = c.getRGB(s[y]); t[y] = { r: (A.r - r[y].r) / p, g: (A.g - r[y].g) / p, b: (A.b - r[y].b) / p }; break; case "path": var B = Kb(r[y], s[y]), C = B[1]; for (r[y] = B[0], t[y] = [], v = 0, x = r[y].length; x > v; v++) { t[y][v] = [0]; for (var D = 1, F = r[y][v].length; F > D; D++)t[y][v][D] = (C[v][D] - r[y][v][D]) / p } break; case "transform": var G = d._, H = Pb(G[y], s[y]); if (H) for (r[y] = H.from, s[y] = H.to, t[y] = [], t[y].real = !0, v = 0, x = r[y].length; x > v; v++)for (t[y][v] = [r[y][v][0]], D = 1, F = r[y][v].length; F > D; D++)t[y][v][D] = (s[y][v][D] - r[y][v][D]) / p; else { var K = d.matrix || new o, L = { _: { transform: G.transform }, getBBox: function () { return d.getBBox(1) } }; r[y] = [K.a, K.b, K.c, K.d, K.e, K.f], Nb(L, s[y]), s[y] = L._.transform, t[y] = [(L.matrix.a - K.a) / p, (L.matrix.b - K.b) / p, (L.matrix.c - K.c) / p, (L.matrix.d - K.d) / p, (L.matrix.e - K.e) / p, (L.matrix.f - K.f) / p] } break; case "csv": var M = I(i[y])[J](w), N = I(r[y])[J](w); if ("clip-rect" == y) for (r[y] = N, t[y] = [], v = N.length; v--;)t[y][v] = (M[v] - r[y][v]) / p; s[y] = M; break; default: for (M = [][E](i[y]), N = [][E](r[y]), t[y] = [], v = d.paper.customAttributes[y].length; v--;)t[y][v] = ((M[v] || 0) - (N[v] || 0)) / p }var O = i.easing, P = c.easing_formulas[O]; if (!P) if (P = I(O).match(Z), P && 5 == P.length) { var Q = P; P = function (a) { return q(a, +Q[1], +Q[2], +Q[3], +Q[4], p) } } else P = nb; if (n = i.start || a.start || +new Date, u = { anim: a, percent: e, timestamp: n, start: n + (a.del || 0), status: 0, initstatus: f || 0, stop: !1, ms: p, easing: P, from: r, diff: t, to: s, el: d, callback: i.callback, prev: m, next: l, repeat: h || a.times, origin: d.attr(), totalOrigin: g }, ic.push(u), f && !j && !k && (u.stop = !0, u.start = new Date - p * f, 1 == ic.length)) return kc(); k && (u.start = new Date - u.ms * f), 1 == ic.length && jc(kc) } b("raphael.anim.start." + d.id, d, a) } } function t(a) { for (var b = 0; b < ic.length; b++)ic[b].el.paper == a && ic.splice(b--, 1) } c.version = "2.1.2", c.eve = b; var u, v, w = /[, ]+/, x = { circle: 1, rect: 1, path: 1, ellipse: 1, text: 1, image: 1 }, y = /\{(\d+)\}/g, z = "hasOwnProperty", A = { doc: document, win: a }, B = { was: Object.prototype[z].call(A.win, "Raphael"), is: A.win.Raphael }, C = function () { this.ca = this.customAttributes = {} }, D = "apply", E = "concat", F = "ontouchstart" in A.win || A.win.DocumentTouch && A.doc instanceof DocumentTouch, G = "", H = " ", I = String, J = "split", K = "click dblclick mousedown mousemove mouseout mouseover mouseup touchstart touchmove touchend touchcancel"[J](H), L = { mousedown: "touchstart", mousemove: "touchmove", mouseup: "touchend" }, M = I.prototype.toLowerCase, N = Math, O = N.max, P = N.min, Q = N.abs, R = N.pow, S = N.PI, T = "number", U = "string", V = "array", W = Object.prototype.toString, X = (c._ISURL = /^url\(['"]?(.+?)['"]?\)$/i, /^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgba?\(\s*([\d\.]+%?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+%?(?:\s*,\s*[\d\.]+%?)?)\s*\)|hsba?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\)|hsla?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\))\s*$/i), Y = { NaN: 1, Infinity: 1, "-Infinity": 1 }, Z = /^(?:cubic-)?bezier\(([^,]+),([^,]+),([^,]+),([^\)]+)\)/, $ = N.round, _ = parseFloat, ab = parseInt, bb = I.prototype.toUpperCase, cb = c._availableAttrs = { "arrow-end": "none", "arrow-start": "none", blur: 0, "clip-rect": "0 0 1e9 1e9", cursor: "default", cx: 0, cy: 0, fill: "#fff", "fill-opacity": 1, font: '10px "Arial"', "font-family": '"Arial"', "font-size": "10", "font-style": "normal", "font-weight": 400, gradient: 0, height: 0, href: "http://raphaeljs.com/", "letter-spacing": 0, opacity: 1, path: "M0,0", r: 0, rx: 0, ry: 0, src: "", stroke: "#000", "stroke-dasharray": "", "stroke-linecap": "butt", "stroke-linejoin": "butt", "stroke-miterlimit": 0, "stroke-opacity": 1, "stroke-width": 1, target: "_blank", "text-anchor": "middle", title: "Raphael", transform: "", width: 0, x: 0, y: 0 }, db = c._availableAnimAttrs = { blur: T, "clip-rect": "csv", cx: T, cy: T, fill: "colour", "fill-opacity": T, "font-size": T, height: T, opacity: T, path: "path", r: T, rx: T, ry: T, stroke: "colour", "stroke-opacity": T, "stroke-width": T, transform: "transform", width: T, x: T, y: T }, eb = /[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*/, fb = { hs: 1, rg: 1 }, gb = /,?([achlmqrstvxz]),?/gi, hb = /([achlmrqstvz])[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*)+)/gi, ib = /([rstm])[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*)+)/gi, jb = /(-?\d*\.?\d*(?:e[\-+]?\d+)?)[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*/gi, kb = (c._radial_gradient = /^r(?:\(([^,]+?)[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*([^\)]+?)\))?/, {}), lb = function (a, b) { return _(a) - _(b) }, mb = function () { }, nb = function (a) { return a }, ob = c._rectPath = function (a, b, c, d, e) { return e ? [["M", a + e, b], ["l", c - 2 * e, 0], ["a", e, e, 0, 0, 1, e, e], ["l", 0, d - 2 * e], ["a", e, e, 0, 0, 1, -e, e], ["l", 2 * e - c, 0], ["a", e, e, 0, 0, 1, -e, -e], ["l", 0, 2 * e - d], ["a", e, e, 0, 0, 1, e, -e], ["z"]] : [["M", a, b], ["l", c, 0], ["l", 0, d], ["l", -c, 0], ["z"]] }, pb = function (a, b, c, d) { return null == d && (d = c), [["M", a, b], ["m", 0, -d], ["a", c, d, 0, 1, 1, 0, 2 * d], ["a", c, d, 0, 1, 1, 0, -2 * d], ["z"]] }, qb = c._getPath = { path: function (a) { return a.attr("path") }, circle: function (a) { var b = a.attrs; return pb(b.cx, b.cy, b.r) }, ellipse: function (a) { var b = a.attrs; return pb(b.cx, b.cy, b.rx, b.ry) }, rect: function (a) { var b = a.attrs; return ob(b.x, b.y, b.width, b.height, b.r) }, image: function (a) { var b = a.attrs; return ob(b.x, b.y, b.width, b.height) }, text: function (a) { var b = a._getBBox(); return ob(b.x, b.y, b.width, b.height) }, set: function (a) { var b = a._getBBox(); return ob(b.x, b.y, b.width, b.height) } }, rb = c.mapPath = function (a, b) { if (!b) return a; var c, d, e, f, g, h, i; for (a = Kb(a), e = 0, g = a.length; g > e; e++)for (i = a[e], f = 1, h = i.length; h > f; f += 2)c = b.x(i[f], i[f + 1]), d = b.y(i[f], i[f + 1]), i[f] = c, i[f + 1] = d; return a }; if (c._g = A, c.type = A.win.SVGAngle || A.doc.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") ? "SVG" : "VML", "VML" == c.type) { var sb, tb = A.doc.createElement("div"); if (tb.innerHTML = '<v:shape adj="1"/>', sb = tb.firstChild, sb.style.behavior = "url(#default#VML)", !sb || "object" != typeof sb.adj) return c.type = G; tb = null } c.svg = !(c.vml = "VML" == c.type), c._Paper = C, c.fn = v = C.prototype = c.prototype, c._id = 0, c._oid = 0, c.is = function (a, b) { return b = M.call(b), "finite" == b ? !Y[z](+a) : "array" == b ? a instanceof Array : "null" == b && null === a || b == typeof a && null !== a || "object" == b && a === Object(a) || "array" == b && Array.isArray && Array.isArray(a) || W.call(a).slice(8, -1).toLowerCase() == b }, c.angle = function (a, b, d, e, f, g) { if (null == f) { var h = a - d, i = b - e; return h || i ? (180 + 180 * N.atan2(-i, -h) / S + 360) % 360 : 0 } return c.angle(a, b, f, g) - c.angle(d, e, f, g) }, c.rad = function (a) { return a % 360 * S / 180 }, c.deg = function (a) { return 180 * a / S % 360 }, c.snapTo = function (a, b, d) { if (d = c.is(d, "finite") ? d : 10, c.is(a, V)) { for (var e = a.length; e--;)if (Q(a[e] - b) <= d) return a[e] } else { a = +a; var f = b % a; if (d > f) return b - f; if (f > a - d) return b - f + a } return b }; c.createUUID = function (a, b) { return function () { return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(a, b).toUpperCase() } }(/[xy]/g, function (a) { var b = 16 * N.random() | 0, c = "x" == a ? b : 3 & b | 8; return c.toString(16) }); c.setWindow = function (a) { b("raphael.setWindow", c, A.win, a), A.win = a, A.doc = A.win.document, c._engine.initWin && c._engine.initWin(A.win) }; var ub = function (a) { if (c.vml) { var b, d = /^\s+|\s+$/g; try { var e = new ActiveXObject("htmlfile"); e.write("<body>"), e.close(), b = e.body } catch (g) { b = createPopup().document.body } var h = b.createTextRange(); ub = f(function (a) { try { b.style.color = I(a).replace(d, G); var c = h.queryCommandValue("ForeColor"); return c = (255 & c) << 16 | 65280 & c | (16711680 & c) >>> 16, "#" + ("000000" + c.toString(16)).slice(-6) } catch (e) { return "none" } }) } else { var i = A.doc.createElement("i"); i.title = "Raphaël Colour Picker", i.style.display = "none", A.doc.body.appendChild(i), ub = f(function (a) { return i.style.color = a, A.doc.defaultView.getComputedStyle(i, G).getPropertyValue("color") }) } return ub(a) }, vb = function () { return "hsb(" + [this.h, this.s, this.b] + ")" }, wb = function () { return "hsl(" + [this.h, this.s, this.l] + ")" }, xb = function () { return this.hex }, yb = function (a, b, d) { if (null == b && c.is(a, "object") && "r" in a && "g" in a && "b" in a && (d = a.b, b = a.g, a = a.r), null == b && c.is(a, U)) { var e = c.getRGB(a); a = e.r, b = e.g, d = e.b } return (a > 1 || b > 1 || d > 1) && (a /= 255, b /= 255, d /= 255), [a, b, d] }, zb = function (a, b, d, e) { a *= 255, b *= 255, d *= 255; var f = { r: a, g: b, b: d, hex: c.rgb(a, b, d), toString: xb }; return c.is(e, "finite") && (f.opacity = e), f }; c.color = function (a) { var b; return c.is(a, "object") && "h" in a && "s" in a && "b" in a ? (b = c.hsb2rgb(a), a.r = b.r, a.g = b.g, a.b = b.b, a.hex = b.hex) : c.is(a, "object") && "h" in a && "s" in a && "l" in a ? (b = c.hsl2rgb(a), a.r = b.r, a.g = b.g, a.b = b.b, a.hex = b.hex) : (c.is(a, "string") && (a = c.getRGB(a)), c.is(a, "object") && "r" in a && "g" in a && "b" in a ? (b = c.rgb2hsl(a), a.h = b.h, a.s = b.s, a.l = b.l, b = c.rgb2hsb(a), a.v = b.b) : (a = { hex: "none" }, a.r = a.g = a.b = a.h = a.s = a.v = a.l = -1)), a.toString = xb, a }, c.hsb2rgb = function (a, b, c, d) { this.is(a, "object") && "h" in a && "s" in a && "b" in a && (c = a.b, b = a.s, d = a.o, a = a.h), a *= 360; var e, f, g, h, i; return a = a % 360 / 60, i = c * b, h = i * (1 - Q(a % 2 - 1)), e = f = g = c - i, a = ~~a, e += [i, h, 0, 0, h, i][a], f += [h, i, i, h, 0, 0][a], g += [0, 0, h, i, i, h][a], zb(e, f, g, d) }, c.hsl2rgb = function (a, b, c, d) { this.is(a, "object") && "h" in a && "s" in a && "l" in a && (c = a.l, b = a.s, a = a.h), (a > 1 || b > 1 || c > 1) && (a /= 360, b /= 100, c /= 100), a *= 360; var e, f, g, h, i; return a = a % 360 / 60, i = 2 * b * (.5 > c ? c : 1 - c), h = i * (1 - Q(a % 2 - 1)), e = f = g = c - i / 2, a = ~~a, e += [i, h, 0, 0, h, i][a], f += [h, i, i, h, 0, 0][a], g += [0, 0, h, i, i, h][a], zb(e, f, g, d) }, c.rgb2hsb = function (a, b, c) { c = yb(a, b, c), a = c[0], b = c[1], c = c[2]; var d, e, f, g; return f = O(a, b, c), g = f - P(a, b, c), d = 0 == g ? null : f == a ? (b - c) / g : f == b ? (c - a) / g + 2 : (a - b) / g + 4, d = (d + 360) % 6 * 60 / 360, e = 0 == g ? 0 : g / f, { h: d, s: e, b: f, toString: vb } }, c.rgb2hsl = function (a, b, c) { c = yb(a, b, c), a = c[0], b = c[1], c = c[2]; var d, e, f, g, h, i; return g = O(a, b, c), h = P(a, b, c), i = g - h, d = 0 == i ? null : g == a ? (b - c) / i : g == b ? (c - a) / i + 2 : (a - b) / i + 4, d = (d + 360) % 6 * 60 / 360, f = (g + h) / 2, e = 0 == i ? 0 : .5 > f ? i / (2 * f) : i / (2 - 2 * f), { h: d, s: e, l: f, toString: wb } }, c._path2string = function () { return this.join(",").replace(gb, "$1") }; c._preload = function (a, b) { var c = A.doc.createElement("img"); c.style.cssText = "position:absolute;left:-9999em;top:-9999em", c.onload = function () { b.call(this), this.onload = null, A.doc.body.removeChild(this) }, c.onerror = function () { A.doc.body.removeChild(this) }, A.doc.body.appendChild(c), c.src = a }; c.getRGB = f(function (a) { if (!a || (a = I(a)).indexOf("-") + 1) return { r: -1, g: -1, b: -1, hex: "none", error: 1, toString: g }; if ("none" == a) return { r: -1, g: -1, b: -1, hex: "none", toString: g }; !(fb[z](a.toLowerCase().substring(0, 2)) || "#" == a.charAt()) && (a = ub(a)); var b, d, e, f, h, i, j = a.match(X); return j ? (j[2] && (e = ab(j[2].substring(5), 16), d = ab(j[2].substring(3, 5), 16), b = ab(j[2].substring(1, 3), 16)), j[3] && (e = ab((h = j[3].charAt(3)) + h, 16), d = ab((h = j[3].charAt(2)) + h, 16), b = ab((h = j[3].charAt(1)) + h, 16)), j[4] && (i = j[4][J](eb), b = _(i[0]), "%" == i[0].slice(-1) && (b *= 2.55), d = _(i[1]), "%" == i[1].slice(-1) && (d *= 2.55), e = _(i[2]), "%" == i[2].slice(-1) && (e *= 2.55), "rgba" == j[1].toLowerCase().slice(0, 4) && (f = _(i[3])), i[3] && "%" == i[3].slice(-1) && (f /= 100)), j[5] ? (i = j[5][J](eb), b = _(i[0]), "%" == i[0].slice(-1) && (b *= 2.55), d = _(i[1]), "%" == i[1].slice(-1) && (d *= 2.55), e = _(i[2]), "%" == i[2].slice(-1) && (e *= 2.55), ("deg" == i[0].slice(-3) || "°" == i[0].slice(-1)) && (b /= 360), "hsba" == j[1].toLowerCase().slice(0, 4) && (f = _(i[3])), i[3] && "%" == i[3].slice(-1) && (f /= 100), c.hsb2rgb(b, d, e, f)) : j[6] ? (i = j[6][J](eb), b = _(i[0]), "%" == i[0].slice(-1) && (b *= 2.55), d = _(i[1]), "%" == i[1].slice(-1) && (d *= 2.55), e = _(i[2]), "%" == i[2].slice(-1) && (e *= 2.55), ("deg" == i[0].slice(-3) || "°" == i[0].slice(-1)) && (b /= 360), "hsla" == j[1].toLowerCase().slice(0, 4) && (f = _(i[3])), i[3] && "%" == i[3].slice(-1) && (f /= 100), c.hsl2rgb(b, d, e, f)) : (j = { r: b, g: d, b: e, toString: g }, j.hex = "#" + (16777216 | e | d << 8 | b << 16).toString(16).slice(1), c.is(f, "finite") && (j.opacity = f), j)) : { r: -1, g: -1, b: -1, hex: "none", error: 1, toString: g } }, c), c.hsb = f(function (a, b, d) { return c.hsb2rgb(a, b, d).hex }), c.hsl = f(function (a, b, d) { return c.hsl2rgb(a, b, d).hex }), c.rgb = f(function (a, b, c) { return "#" + (16777216 | c | b << 8 | a << 16).toString(16).slice(1) }), c.getColor = function (a) { var b = this.getColor.start = this.getColor.start || { h: 0, s: 1, b: a || .75 }, c = this.hsb2rgb(b.h, b.s, b.b); return b.h += .075, b.h > 1 && (b.h = 0, b.s -= .2, b.s <= 0 && (this.getColor.start = { h: 0, s: 1, b: b.b })), c.hex }, c.getColor.reset = function () { delete this.start }, c.parsePathString = function (a) { if (!a) return null; var b = Ab(a); if (b.arr) return Cb(b.arr); var d = { a: 7, c: 6, h: 1, l: 2, m: 2, r: 4, q: 4, s: 4, t: 2, v: 1, z: 0 }, e = []; return c.is(a, V) && c.is(a[0], V) && (e = Cb(a)), e.length || I(a).replace(hb, function (a, b, c) { var f = [], g = b.toLowerCase(); if (c.replace(jb, function (a, b) { b && f.push(+b) }), "m" == g && f.length > 2 && (e.push([b][E](f.splice(0, 2))), g = "l", b = "m" == b ? "l" : "L"), "r" == g) e.push([b][E](f)); else for (; f.length >= d[g] && (e.push([b][E](f.splice(0, d[g]))), d[g]);); }), e.toString = c._path2string, b.arr = Cb(e), e }, c.parseTransformString = f(function (a) { if (!a) return null; var b = []; return c.is(a, V) && c.is(a[0], V) && (b = Cb(a)), b.length || I(a).replace(ib, function (a, c, d) { { var e = []; M.call(c) } d.replace(jb, function (a, b) { b && e.push(+b) }), b.push([c][E](e)) }), b.toString = c._path2string, b }); var Ab = function (a) { var b = Ab.ps = Ab.ps || {}; return b[a] ? b[a].sleep = 100 : b[a] = { sleep: 100 }, setTimeout(function () { for (var c in b) b[z](c) && c != a && (b[c].sleep--, !b[c].sleep && delete b[c]) }), b[a] }; c.findDotsAtSegment = function (a, b, c, d, e, f, g, h, i) { var j = 1 - i, k = R(j, 3), l = R(j, 2), m = i * i, n = m * i, o = k * a + 3 * l * i * c + 3 * j * i * i * e + n * g, p = k * b + 3 * l * i * d + 3 * j * i * i * f + n * h, q = a + 2 * i * (c - a) + m * (e - 2 * c + a), r = b + 2 * i * (d - b) + m * (f - 2 * d + b), s = c + 2 * i * (e - c) + m * (g - 2 * e + c), t = d + 2 * i * (f - d) + m * (h - 2 * f + d), u = j * a + i * c, v = j * b + i * d, w = j * e + i * g, x = j * f + i * h, y = 90 - 180 * N.atan2(q - s, r - t) / S; return (q > s || t > r) && (y += 180), { x: o, y: p, m: { x: q, y: r }, n: { x: s, y: t }, start: { x: u, y: v }, end: { x: w, y: x }, alpha: y } }, c.bezierBBox = function (a, b, d, e, f, g, h, i) { c.is(a, "array") || (a = [a, b, d, e, f, g, h, i]); var j = Jb.apply(null, a); return { x: j.min.x, y: j.min.y, x2: j.max.x, y2: j.max.y, width: j.max.x - j.min.x, height: j.max.y - j.min.y } }, c.isPointInsideBBox = function (a, b, c) { return b >= a.x && b <= a.x2 && c >= a.y && c <= a.y2 }, c.isBBoxIntersect = function (a, b) { var d = c.isPointInsideBBox; return d(b, a.x, a.y) || d(b, a.x2, a.y) || d(b, a.x, a.y2) || d(b, a.x2, a.y2) || d(a, b.x, b.y) || d(a, b.x2, b.y) || d(a, b.x, b.y2) || d(a, b.x2, b.y2) || (a.x < b.x2 && a.x > b.x || b.x < a.x2 && b.x > a.x) && (a.y < b.y2 && a.y > b.y || b.y < a.y2 && b.y > a.y) }, c.pathIntersection = function (a, b) { return n(a, b) }, c.pathIntersectionNumber = function (a, b) { return n(a, b, 1) }, c.isPointInsidePath = function (a, b, d) { var e = c.pathBBox(a); return c.isPointInsideBBox(e, b, d) && n(a, [["M", b, d], ["H", e.x2 + 10]], 1) % 2 == 1 }, c._removedFactory = function (a) { return function () { b("raphael.log", null, "Raphaël: you are calling to method “" + a + "” of removed object", a) } }; var Bb = c.pathBBox = function (a) { var b = Ab(a); if (b.bbox) return d(b.bbox); if (!a) return { x: 0, y: 0, width: 0, height: 0, x2: 0, y2: 0 }; a = Kb(a); for (var c, e = 0, f = 0, g = [], h = [], i = 0, j = a.length; j > i; i++)if (c = a[i], "M" == c[0]) e = c[1], f = c[2], g.push(e), h.push(f); else { var k = Jb(e, f, c[1], c[2], c[3], c[4], c[5], c[6]); g = g[E](k.min.x, k.max.x), h = h[E](k.min.y, k.max.y), e = c[5], f = c[6] } var l = P[D](0, g), m = P[D](0, h), n = O[D](0, g), o = O[D](0, h), p = n - l, q = o - m, r = { x: l, y: m, x2: n, y2: o, width: p, height: q, cx: l + p / 2, cy: m + q / 2 }; return b.bbox = d(r), r }, Cb = function (a) { var b = d(a); return b.toString = c._path2string, b }, Db = c._pathToRelative = function (a) { var b = Ab(a); if (b.rel) return Cb(b.rel); c.is(a, V) && c.is(a && a[0], V) || (a = c.parsePathString(a)); var d = [], e = 0, f = 0, g = 0, h = 0, i = 0; "M" == a[0][0] && (e = a[0][1], f = a[0][2], g = e, h = f, i++, d.push(["M", e, f])); for (var j = i, k = a.length; k > j; j++) { var l = d[j] = [], m = a[j]; if (m[0] != M.call(m[0])) switch (l[0] = M.call(m[0]), l[0]) { case "a": l[1] = m[1], l[2] = m[2], l[3] = m[3], l[4] = m[4], l[5] = m[5], l[6] = +(m[6] - e).toFixed(3), l[7] = +(m[7] - f).toFixed(3); break; case "v": l[1] = +(m[1] - f).toFixed(3); break; case "m": g = m[1], h = m[2]; default: for (var n = 1, o = m.length; o > n; n++)l[n] = +(m[n] - (n % 2 ? e : f)).toFixed(3) } else { l = d[j] = [], "m" == m[0] && (g = m[1] + e, h = m[2] + f); for (var p = 0, q = m.length; q > p; p++)d[j][p] = m[p] } var r = d[j].length; switch (d[j][0]) { case "z": e = g, f = h; break; case "h": e += +d[j][r - 1]; break; case "v": f += +d[j][r - 1]; break; default: e += +d[j][r - 2], f += +d[j][r - 1] } } return d.toString = c._path2string, b.rel = Cb(d), d }, Eb = c._pathToAbsolute = function (a) { var b = Ab(a); if (b.abs) return Cb(b.abs); if (c.is(a, V) && c.is(a && a[0], V) || (a = c.parsePathString(a)), !a || !a.length) return [["M", 0, 0]]; var d = [], e = 0, f = 0, g = 0, i = 0, j = 0; "M" == a[0][0] && (e = +a[0][1], f = +a[0][2], g = e, i = f, j++, d[0] = ["M", e, f]); for (var k, l, m = 3 == a.length && "M" == a[0][0] && "R" == a[1][0].toUpperCase() && "Z" == a[2][0].toUpperCase(), n = j, o = a.length; o > n; n++) { if (d.push(k = []), l = a[n], l[0] != bb.call(l[0])) switch (k[0] = bb.call(l[0]), k[0]) { case "A": k[1] = l[1], k[2] = l[2], k[3] = l[3], k[4] = l[4], k[5] = l[5], k[6] = +(l[6] + e), k[7] = +(l[7] + f); break; case "V": k[1] = +l[1] + f; break; case "H": k[1] = +l[1] + e; break; case "R": for (var p = [e, f][E](l.slice(1)), q = 2, r = p.length; r > q; q++)p[q] = +p[q] + e, p[++q] = +p[q] + f; d.pop(), d = d[E](h(p, m)); break; case "M": g = +l[1] + e, i = +l[2] + f; default: for (q = 1, r = l.length; r > q; q++)k[q] = +l[q] + (q % 2 ? e : f) } else if ("R" == l[0]) p = [e, f][E](l.slice(1)), d.pop(), d = d[E](h(p, m)), k = ["R"][E](l.slice(-2)); else for (var s = 0, t = l.length; t > s; s++)k[s] = l[s]; switch (k[0]) { case "Z": e = g, f = i; break; case "H": e = k[1]; break; case "V": f = k[1]; break; case "M": g = k[k.length - 2], i = k[k.length - 1]; default: e = k[k.length - 2], f = k[k.length - 1] } } return d.toString = c._path2string, b.abs = Cb(d), d }, Fb = function (a, b, c, d) { return [a, b, c, d, c, d] }, Gb = function (a, b, c, d, e, f) { var g = 1 / 3, h = 2 / 3; return [g * a + h * c, g * b + h * d, g * e + h * c, g * f + h * d, e, f] }, Hb = function (a, b, c, d, e, g, h, i, j, k) { var l, m = 120 * S / 180, n = S / 180 * (+e || 0), o = [], p = f(function (a, b, c) { var d = a * N.cos(c) - b * N.sin(c), e = a * N.sin(c) + b * N.cos(c); return { x: d, y: e } }); if (k) y = k[0], z = k[1], w = k[2], x = k[3]; else { l = p(a, b, -n), a = l.x, b = l.y, l = p(i, j, -n), i = l.x, j = l.y; var q = (N.cos(S / 180 * e), N.sin(S / 180 * e), (a - i) / 2), r = (b - j) / 2, s = q * q / (c * c) + r * r / (d * d); s > 1 && (s = N.sqrt(s), c = s * c, d = s * d); var t = c * c, u = d * d, v = (g == h ? -1 : 1) * N.sqrt(Q((t * u - t * r * r - u * q * q) / (t * r * r + u * q * q))), w = v * c * r / d + (a + i) / 2, x = v * -d * q / c + (b + j) / 2, y = N.asin(((b - x) / d).toFixed(9)), z = N.asin(((j - x) / d).toFixed(9)); y = w > a ? S - y : y, z = w > i ? S - z : z, 0 > y && (y = 2 * S + y), 0 > z && (z = 2 * S + z), h && y > z && (y -= 2 * S), !h && z > y && (z -= 2 * S) } var A = z - y; if (Q(A) > m) { var B = z, C = i, D = j; z = y + m * (h && z > y ? 1 : -1), i = w + c * N.cos(z), j = x + d * N.sin(z), o = Hb(i, j, c, d, e, 0, h, C, D, [z, B, w, x]) } A = z - y; var F = N.cos(y), G = N.sin(y), H = N.cos(z), I = N.sin(z), K = N.tan(A / 4), L = 4 / 3 * c * K, M = 4 / 3 * d * K, O = [a, b], P = [a + L * G, b - M * F], R = [i + L * I, j - M * H], T = [i, j]; if (P[0] = 2 * O[0] - P[0], P[1] = 2 * O[1] - P[1], k) return [P, R, T][E](o); o = [P, R, T][E](o).join()[J](","); for (var U = [], V = 0, W = o.length; W > V; V++)U[V] = V % 2 ? p(o[V - 1], o[V], n).y : p(o[V], o[V + 1], n).x; return U }, Ib = function (a, b, c, d, e, f, g, h, i) { var j = 1 - i; return { x: R(j, 3) * a + 3 * R(j, 2) * i * c + 3 * j * i * i * e + R(i, 3) * g, y: R(j, 3) * b + 3 * R(j, 2) * i * d + 3 * j * i * i * f + R(i, 3) * h } }, Jb = f(function (a, b, c, d, e, f, g, h) { var i, j = e - 2 * c + a - (g - 2 * e + c), k = 2 * (c - a) - 2 * (e - c), l = a - c, m = (-k + N.sqrt(k * k - 4 * j * l)) / 2 / j, n = (-k - N.sqrt(k * k - 4 * j * l)) / 2 / j, o = [b, h], p = [a, g]; return Q(m) > "1e12" && (m = .5), Q(n) > "1e12" && (n = .5), m > 0 && 1 > m && (i = Ib(a, b, c, d, e, f, g, h, m), p.push(i.x), o.push(i.y)), n > 0 && 1 > n && (i = Ib(a, b, c, d, e, f, g, h, n), p.push(i.x), o.push(i.y)), j = f - 2 * d + b - (h - 2 * f + d), k = 2 * (d - b) - 2 * (f - d), l = b - d, m = (-k + N.sqrt(k * k - 4 * j * l)) / 2 / j, n = (-k - N.sqrt(k * k - 4 * j * l)) / 2 / j, Q(m) > "1e12" && (m = .5), Q(n) > "1e12" && (n = .5), m > 0 && 1 > m && (i = Ib(a, b, c, d, e, f, g, h, m), p.push(i.x), o.push(i.y)), n > 0 && 1 > n && (i = Ib(a, b, c, d, e, f, g, h, n), p.push(i.x), o.push(i.y)), { min: { x: P[D](0, p), y: P[D](0, o) }, max: { x: O[D](0, p), y: O[D](0, o) } } }), Kb = c._path2curve = f(function (a, b) { var c = !b && Ab(a); if (!b && c.curve) return Cb(c.curve); for (var d = Eb(a), e = b && Eb(b), f = { x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null }, g = { x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null }, h = (function (a, b, c) { var d, e, f = { T: 1, Q: 1 }; if (!a) return ["C", b.x, b.y, b.x, b.y, b.x, b.y]; switch (!(a[0] in f) && (b.qx = b.qy = null), a[0]) { case "M": b.X = a[1], b.Y = a[2]; break; case "A": a = ["C"][E](Hb[D](0, [b.x, b.y][E](a.slice(1)))); break; case "S": "C" == c || "S" == c ? (d = 2 * b.x - b.bx, e = 2 * b.y - b.by) : (d = b.x, e = b.y), a = ["C", d, e][E](a.slice(1)); break; case "T": "Q" == c || "T" == c ? (b.qx = 2 * b.x - b.qx, b.qy = 2 * b.y - b.qy) : (b.qx = b.x, b.qy = b.y), a = ["C"][E](Gb(b.x, b.y, b.qx, b.qy, a[1], a[2])); break; case "Q": b.qx = a[1], b.qy = a[2], a = ["C"][E](Gb(b.x, b.y, a[1], a[2], a[3], a[4])); break; case "L": a = ["C"][E](Fb(b.x, b.y, a[1], a[2])); break; case "H": a = ["C"][E](Fb(b.x, b.y, a[1], b.y)); break; case "V": a = ["C"][E](Fb(b.x, b.y, b.x, a[1])); break; case "Z": a = ["C"][E](Fb(b.x, b.y, b.X, b.Y)) }return a }), i = function (a, b) { if (a[b].length > 7) { a[b].shift(); for (var c = a[b]; c.length;)k[b] = "A", e && (l[b] = "A"), a.splice(b++, 0, ["C"][E](c.splice(0, 6))); a.splice(b, 1), p = O(d.length, e && e.length || 0) } }, j = function (a, b, c, f, g) { a && b && "M" == a[g][0] && "M" != b[g][0] && (b.splice(g, 0, ["M", f.x, f.y]), c.bx = 0, c.by = 0, c.x = a[g][1], c.y = a[g][2], p = O(d.length, e && e.length || 0)) }, k = [], l = [], m = "", n = "", o = 0, p = O(d.length, e && e.length || 0); p > o; o++) { d[o] && (m = d[o][0]), "C" != m && (k[o] = m, o && (n = k[o - 1])), d[o] = h(d[o], f, n), "A" != k[o] && "C" == m && (k[o] = "C"), i(d, o), e && (e[o] && (m = e[o][0]), "C" != m && (l[o] = m, o && (n = l[o - 1])), e[o] = h(e[o], g, n), "A" != l[o] && "C" == m && (l[o] = "C"), i(e, o)), j(d, e, f, g, o), j(e, d, g, f, o); var q = d[o], r = e && e[o], s = q.length, t = e && r.length; f.x = q[s - 2], f.y = q[s - 1], f.bx = _(q[s - 4]) || f.x, f.by = _(q[s - 3]) || f.y, g.bx = e && (_(r[t - 4]) || g.x), g.by = e && (_(r[t - 3]) || g.y), g.x = e && r[t - 2], g.y = e && r[t - 1] } return e || (c.curve = Cb(d)), e ? [d, e] : d }, null, Cb), Lb = (c._parseDots = f(function (a) { for (var b = [], d = 0, e = a.length; e > d; d++) { var f = {}, g = a[d].match(/^([^:]*):?([\d\.]*)/); if (f.color = c.getRGB(g[1]), f.color.error) return null; f.color = f.color.hex, g[2] && (f.offset = g[2] + "%"), b.push(f) } for (d = 1, e = b.length - 1; e > d; d++)if (!b[d].offset) { for (var h = _(b[d - 1].offset || 0), i = 0, j = d + 1; e > j; j++)if (b[j].offset) { i = b[j].offset; break } i || (i = 100, j = e), i = _(i); for (var k = (i - h) / (j - d + 1); j > d; d++)h += k, b[d].offset = h + "%" } return b }), c._tear = function (a, b) { a == b.top && (b.top = a.prev), a == b.bottom && (b.bottom = a.next), a.next && (a.next.prev = a.prev), a.prev && (a.prev.next = a.next) }), Mb = (c._tofront = function (a, b) { b.top !== a && (Lb(a, b), a.next = null, a.prev = b.top, b.top.next = a, b.top = a) }, c._toback = function (a, b) { b.bottom !== a && (Lb(a, b), a.next = b.bottom, a.prev = null, b.bottom.prev = a, b.bottom = a) }, c._insertafter = function (a, b, c) { Lb(a, c), b == c.top && (c.top = a), b.next && (b.next.prev = a), a.next = b.next, a.prev = b, b.next = a }, c._insertbefore = function (a, b, c) { Lb(a, c), b == c.bottom && (c.bottom = a), b.prev && (b.prev.next = a), a.prev = b.prev, b.prev = a, a.next = b }, c.toMatrix = function (a, b) { var c = Bb(a), d = { _: { transform: G }, getBBox: function () { return c } }; return Nb(d, b), d.matrix }), Nb = (c.transformPath = function (a, b) { return rb(a, Mb(a, b)) }, c._extractTransform = function (a, b) { if (null == b) return a._.transform; b = I(b).replace(/\.{3}|\u2026/g, a._.transform || G); var d = c.parseTransformString(b), e = 0, f = 0, g = 0, h = 1, i = 1, j = a._, k = new o; if (j.transform = d || [], d) for (var l = 0, m = d.length; m > l; l++) { var n, p, q, r, s, t = d[l], u = t.length, v = I(t[0]).toLowerCase(), w = t[0] != v, x = w ? k.invert() : 0; "t" == v && 3 == u ? w ? (n = x.x(0, 0), p = x.y(0, 0), q = x.x(t[1], t[2]), r = x.y(t[1], t[2]), k.translate(q - n, r - p)) : k.translate(t[1], t[2]) : "r" == v ? 2 == u ? (s = s || a.getBBox(1), k.rotate(t[1], s.x + s.width / 2, s.y + s.height / 2), e += t[1]) : 4 == u && (w ? (q = x.x(t[2], t[3]), r = x.y(t[2], t[3]), k.rotate(t[1], q, r)) : k.rotate(t[1], t[2], t[3]), e += t[1]) : "s" == v ? 2 == u || 3 == u ? (s = s || a.getBBox(1), k.scale(t[1], t[u - 1], s.x + s.width / 2, s.y + s.height / 2), h *= t[1], i *= t[u - 1]) : 5 == u && (w ? (q = x.x(t[3], t[4]), r = x.y(t[3], t[4]), k.scale(t[1], t[2], q, r)) : k.scale(t[1], t[2], t[3], t[4]), h *= t[1], i *= t[2]) : "m" == v && 7 == u && k.add(t[1], t[2], t[3], t[4], t[5], t[6]), j.dirtyT = 1, a.matrix = k } a.matrix = k, j.sx = h, j.sy = i, j.deg = e, j.dx = f = k.e, j.dy = g = k.f, 1 == h && 1 == i && !e && j.bbox ? (j.bbox.x += +f, j.bbox.y += +g) : j.dirtyT = 1 }), Ob = function (a) { var b = a[0]; switch (b.toLowerCase()) { case "t": return [b, 0, 0]; case "m": return [b, 1, 0, 0, 1, 0, 0]; case "r": return 4 == a.length ? [b, 0, a[2], a[3]] : [b, 0]; case "s": return 5 == a.length ? [b, 1, 1, a[3], a[4]] : 3 == a.length ? [b, 1, 1] : [b, 1] } }, Pb = c._equaliseTransform = function (a, b) {
+        b = I(b).replace(/\.{3}|\u2026/g, a), a = c.parseTransformString(a) || [], b = c.parseTransformString(b) || [];
+        for (var d, e, f, g, h = O(a.length, b.length), i = [], j = [], k = 0; h > k; k++) { if (f = a[k] || Ob(b[k]), g = b[k] || Ob(f), f[0] != g[0] || "r" == f[0].toLowerCase() && (f[2] != g[2] || f[3] != g[3]) || "s" == f[0].toLowerCase() && (f[3] != g[3] || f[4] != g[4])) return; for (i[k] = [], j[k] = [], d = 0, e = O(f.length, g.length); e > d; d++)d in f && (i[k][d] = f[d]), d in g && (j[k][d] = g[d]) } return { from: i, to: j }
+    }; c._getContainer = function (a, b, d, e) { var f; return f = null != e || c.is(a, "object") ? a : A.doc.getElementById(a), null != f ? f.tagName ? null == b ? { container: f, width: f.style.pixelWidth || f.offsetWidth, height: f.style.pixelHeight || f.offsetHeight } : { container: f, width: b, height: d } : { container: 1, x: a, y: b, width: d, height: e } : void 0 }, c.pathToRelative = Db, c._engine = {}, c.path2curve = Kb, c.matrix = function (a, b, c, d, e, f) { return new o(a, b, c, d, e, f) }, function (a) { function b(a) { return a[0] * a[0] + a[1] * a[1] } function d(a) { var c = N.sqrt(b(a)); a[0] && (a[0] /= c), a[1] && (a[1] /= c) } a.add = function (a, b, c, d, e, f) { var g, h, i, j, k = [[], [], []], l = [[this.a, this.c, this.e], [this.b, this.d, this.f], [0, 0, 1]], m = [[a, c, e], [b, d, f], [0, 0, 1]]; for (a && a instanceof o && (m = [[a.a, a.c, a.e], [a.b, a.d, a.f], [0, 0, 1]]), g = 0; 3 > g; g++)for (h = 0; 3 > h; h++) { for (j = 0, i = 0; 3 > i; i++)j += l[g][i] * m[i][h]; k[g][h] = j } this.a = k[0][0], this.b = k[1][0], this.c = k[0][1], this.d = k[1][1], this.e = k[0][2], this.f = k[1][2] }, a.invert = function () { var a = this, b = a.a * a.d - a.b * a.c; return new o(a.d / b, -a.b / b, -a.c / b, a.a / b, (a.c * a.f - a.d * a.e) / b, (a.b * a.e - a.a * a.f) / b) }, a.clone = function () { return new o(this.a, this.b, this.c, this.d, this.e, this.f) }, a.translate = function (a, b) { this.add(1, 0, 0, 1, a, b) }, a.scale = function (a, b, c, d) { null == b && (b = a), (c || d) && this.add(1, 0, 0, 1, c, d), this.add(a, 0, 0, b, 0, 0), (c || d) && this.add(1, 0, 0, 1, -c, -d) }, a.rotate = function (a, b, d) { a = c.rad(a), b = b || 0, d = d || 0; var e = +N.cos(a).toFixed(9), f = +N.sin(a).toFixed(9); this.add(e, f, -f, e, b, d), this.add(1, 0, 0, 1, -b, -d) }, a.x = function (a, b) { return a * this.a + b * this.c + this.e }, a.y = function (a, b) { return a * this.b + b * this.d + this.f }, a.get = function (a) { return +this[I.fromCharCode(97 + a)].toFixed(4) }, a.toString = function () { return c.svg ? "matrix(" + [this.get(0), this.get(1), this.get(2), this.get(3), this.get(4), this.get(5)].join() + ")" : [this.get(0), this.get(2), this.get(1), this.get(3), 0, 0].join() }, a.toFilter = function () { return "progid:DXImageTransform.Microsoft.Matrix(M11=" + this.get(0) + ", M12=" + this.get(2) + ", M21=" + this.get(1) + ", M22=" + this.get(3) + ", Dx=" + this.get(4) + ", Dy=" + this.get(5) + ", sizingmethod='auto expand')" }, a.offset = function () { return [this.e.toFixed(4), this.f.toFixed(4)] }, a.split = function () { var a = {}; a.dx = this.e, a.dy = this.f; var e = [[this.a, this.c], [this.b, this.d]]; a.scalex = N.sqrt(b(e[0])), d(e[0]), a.shear = e[0][0] * e[1][0] + e[0][1] * e[1][1], e[1] = [e[1][0] - e[0][0] * a.shear, e[1][1] - e[0][1] * a.shear], a.scaley = N.sqrt(b(e[1])), d(e[1]), a.shear /= a.scaley; var f = -e[0][1], g = e[1][1]; return 0 > g ? (a.rotate = c.deg(N.acos(g)), 0 > f && (a.rotate = 360 - a.rotate)) : a.rotate = c.deg(N.asin(f)), a.isSimple = !(+a.shear.toFixed(9) || a.scalex.toFixed(9) != a.scaley.toFixed(9) && a.rotate), a.isSuperSimple = !+a.shear.toFixed(9) && a.scalex.toFixed(9) == a.scaley.toFixed(9) && !a.rotate, a.noRotation = !+a.shear.toFixed(9) && !a.rotate, a }, a.toTransformString = function (a) { var b = a || this[J](); return b.isSimple ? (b.scalex = +b.scalex.toFixed(4), b.scaley = +b.scaley.toFixed(4), b.rotate = +b.rotate.toFixed(4), (b.dx || b.dy ? "t" + [b.dx, b.dy] : G) + (1 != b.scalex || 1 != b.scaley ? "s" + [b.scalex, b.scaley, 0, 0] : G) + (b.rotate ? "r" + [b.rotate, 0, 0] : G)) : "m" + [this.get(0), this.get(1), this.get(2), this.get(3), this.get(4), this.get(5)] } }(o.prototype); var Qb = navigator.userAgent.match(/Version\/(.*?)\s/) || navigator.userAgent.match(/Chrome\/(\d+)/); v.safari = "Apple Computer, Inc." == navigator.vendor && (Qb && Qb[1] < 4 || "iP" == navigator.platform.slice(0, 2)) || "Google Inc." == navigator.vendor && Qb && Qb[1] < 8 ? function () { var a = this.rect(-99, -99, this.width + 99, this.height + 99).attr({ stroke: "none" }); setTimeout(function () { a.remove() }) } : mb; for (var Rb = function () { this.returnValue = !1 }, Sb = function () { return this.originalEvent.preventDefault() }, Tb = function () { this.cancelBubble = !0 }, Ub = function () { return this.originalEvent.stopPropagation() }, Vb = function (a) { var b = A.doc.documentElement.scrollTop || A.doc.body.scrollTop, c = A.doc.documentElement.scrollLeft || A.doc.body.scrollLeft; return { x: a.clientX + c, y: a.clientY + b } }, Wb = function () { return A.doc.addEventListener ? function (a, b, c, d) { var e = function (a) { var b = Vb(a); return c.call(d, a, b.x, b.y) }; if (a.addEventListener(b, e, !1), F && L[b]) { var f = function (b) { for (var e = Vb(b), f = b, g = 0, h = b.targetTouches && b.targetTouches.length; h > g; g++)if (b.targetTouches[g].target == a) { b = b.targetTouches[g], b.originalEvent = f, b.preventDefault = Sb, b.stopPropagation = Ub; break } return c.call(d, b, e.x, e.y) }; a.addEventListener(L[b], f, !1) } return function () { return a.removeEventListener(b, e, !1), F && L[b] && a.removeEventListener(L[b], f, !1), !0 } } : A.doc.attachEvent ? function (a, b, c, d) { var e = function (a) { a = a || A.win.event; var b = A.doc.documentElement.scrollTop || A.doc.body.scrollTop, e = A.doc.documentElement.scrollLeft || A.doc.body.scrollLeft, f = a.clientX + e, g = a.clientY + b; return a.preventDefault = a.preventDefault || Rb, a.stopPropagation = a.stopPropagation || Tb, c.call(d, a, f, g) }; a.attachEvent("on" + b, e); var f = function () { return a.detachEvent("on" + b, e), !0 }; return f } : void 0 }(), Xb = [], Yb = function (a) { for (var c, d = a.clientX, e = a.clientY, f = A.doc.documentElement.scrollTop || A.doc.body.scrollTop, g = A.doc.documentElement.scrollLeft || A.doc.body.scrollLeft, h = Xb.length; h--;) { if (c = Xb[h], F && a.touches) { for (var i, j = a.touches.length; j--;)if (i = a.touches[j], i.identifier == c.el._drag.id) { d = i.clientX, e = i.clientY, (a.originalEvent ? a.originalEvent : a).preventDefault(); break } } else a.preventDefault(); var k, l = c.el.node, m = l.nextSibling, n = l.parentNode, o = l.style.display; A.win.opera && n.removeChild(l), l.style.display = "none", k = c.el.paper.getElementByPoint(d, e), l.style.display = o, A.win.opera && (m ? n.insertBefore(l, m) : n.appendChild(l)), k && b("raphael.drag.over." + c.el.id, c.el, k), d += g, e += f, b("raphael.drag.move." + c.el.id, c.move_scope || c.el, d - c.el._drag.x, e - c.el._drag.y, d, e, a) } }, Zb = function (a) { c.unmousemove(Yb).unmouseup(Zb); for (var d, e = Xb.length; e--;)d = Xb[e], d.el._drag = {}, b("raphael.drag.end." + d.el.id, d.end_scope || d.start_scope || d.move_scope || d.el, a); Xb = [] }, $b = c.el = {}, _b = K.length; _b--;)!function (a) { c[a] = $b[a] = function (b, d) { return c.is(b, "function") && (this.events = this.events || [], this.events.push({ name: a, f: b, unbind: Wb(this.shape || this.node || A.doc, a, b, d || this) })), this }, c["un" + a] = $b["un" + a] = function (b) { for (var d = this.events || [], e = d.length; e--;)d[e].name != a || !c.is(b, "undefined") && d[e].f != b || (d[e].unbind(), d.splice(e, 1), !d.length && delete this.events); return this } }(K[_b]); $b.data = function (a, d) { var e = kb[this.id] = kb[this.id] || {}; if (0 == arguments.length) return e; if (1 == arguments.length) { if (c.is(a, "object")) { for (var f in a) a[z](f) && this.data(f, a[f]); return this } return b("raphael.data.get." + this.id, this, e[a], a), e[a] } return e[a] = d, b("raphael.data.set." + this.id, this, d, a), this }, $b.removeData = function (a) { return null == a ? kb[this.id] = {} : kb[this.id] && delete kb[this.id][a], this }, $b.getData = function () { return d(kb[this.id] || {}) }, $b.hover = function (a, b, c, d) { return this.mouseover(a, c).mouseout(b, d || c) }, $b.unhover = function (a, b) { return this.unmouseover(a).unmouseout(b) }; var ac = []; $b.drag = function (a, d, e, f, g, h) { function i(i) { (i.originalEvent || i).preventDefault(); var j = i.clientX, k = i.clientY, l = A.doc.documentElement.scrollTop || A.doc.body.scrollTop, m = A.doc.documentElement.scrollLeft || A.doc.body.scrollLeft; if (this._drag.id = i.identifier, F && i.touches) for (var n, o = i.touches.length; o--;)if (n = i.touches[o], this._drag.id = n.identifier, n.identifier == this._drag.id) { j = n.clientX, k = n.clientY; break } this._drag.x = j + m, this._drag.y = k + l, !Xb.length && c.mousemove(Yb).mouseup(Zb), Xb.push({ el: this, move_scope: f, start_scope: g, end_scope: h }), d && b.on("raphael.drag.start." + this.id, d), a && b.on("raphael.drag.move." + this.id, a), e && b.on("raphael.drag.end." + this.id, e), b("raphael.drag.start." + this.id, g || f || this, i.clientX + m, i.clientY + l, i) } return this._drag = {}, ac.push({ el: this, start: i }), this.mousedown(i), this }, $b.onDragOver = function (a) { a ? b.on("raphael.drag.over." + this.id, a) : b.unbind("raphael.drag.over." + this.id) }, $b.undrag = function () { for (var a = ac.length; a--;)ac[a].el == this && (this.unmousedown(ac[a].start), ac.splice(a, 1), b.unbind("raphael.drag.*." + this.id)); !ac.length && c.unmousemove(Yb).unmouseup(Zb), Xb = [] }, v.circle = function (a, b, d) { var e = c._engine.circle(this, a || 0, b || 0, d || 0); return this.__set__ && this.__set__.push(e), e }, v.rect = function (a, b, d, e, f) { var g = c._engine.rect(this, a || 0, b || 0, d || 0, e || 0, f || 0); return this.__set__ && this.__set__.push(g), g }, v.ellipse = function (a, b, d, e) { var f = c._engine.ellipse(this, a || 0, b || 0, d || 0, e || 0); return this.__set__ && this.__set__.push(f), f }, v.path = function (a) { a && !c.is(a, U) && !c.is(a[0], V) && (a += G); var b = c._engine.path(c.format[D](c, arguments), this); return this.__set__ && this.__set__.push(b), b }, v.image = function (a, b, d, e, f) { var g = c._engine.image(this, a || "about:blank", b || 0, d || 0, e || 0, f || 0); return this.__set__ && this.__set__.push(g), g }, v.text = function (a, b, d) { var e = c._engine.text(this, a || 0, b || 0, I(d)); return this.__set__ && this.__set__.push(e), e }, v.set = function (a) { !c.is(a, "array") && (a = Array.prototype.splice.call(arguments, 0, arguments.length)); var b = new mc(a); return this.__set__ && this.__set__.push(b), b.paper = this, b.type = "set", b }, v.setStart = function (a) { this.__set__ = a || this.set() }, v.setFinish = function () { var a = this.__set__; return delete this.__set__, a }, v.getSize = function () { var a = this.canvas.parentNode; return { width: a.offsetWidth, height: a.offsetHeight } }, v.setSize = function (a, b) { return c._engine.setSize.call(this, a, b) }, v.setViewBox = function (a, b, d, e, f) { return c._engine.setViewBox.call(this, a, b, d, e, f) }, v.top = v.bottom = null, v.raphael = c; var bc = function (a) { var b = a.getBoundingClientRect(), c = a.ownerDocument, d = c.body, e = c.documentElement, f = e.clientTop || d.clientTop || 0, g = e.clientLeft || d.clientLeft || 0, h = b.top + (A.win.pageYOffset || e.scrollTop || d.scrollTop) - f, i = b.left + (A.win.pageXOffset || e.scrollLeft || d.scrollLeft) - g; return { y: h, x: i } }; v.getElementByPoint = function (a, b) { var c = this, d = c.canvas, e = A.doc.elementFromPoint(a, b); if (A.win.opera && "svg" == e.tagName) { var f = bc(d), g = d.createSVGRect(); g.x = a - f.x, g.y = b - f.y, g.width = g.height = 1; var h = d.getIntersectionList(g, null); h.length && (e = h[h.length - 1]) } if (!e) return null; for (; e.parentNode && e != d.parentNode && !e.raphael;)e = e.parentNode; return e == c.canvas.parentNode && (e = d), e = e && e.raphael ? c.getById(e.raphaelid) : null }, v.getElementsByBBox = function (a) { var b = this.set(); return this.forEach(function (d) { c.isBBoxIntersect(d.getBBox(), a) && b.push(d) }), b }, v.getById = function (a) { for (var b = this.bottom; b;) { if (b.id == a) return b; b = b.next } return null }, v.forEach = function (a, b) { for (var c = this.bottom; c;) { if (a.call(b, c) === !1) return this; c = c.next } return this }, v.getElementsByPoint = function (a, b) { var c = this.set(); return this.forEach(function (d) { d.isPointInside(a, b) && c.push(d) }), c }, $b.isPointInside = function (a, b) { var d = this.realPath = qb[this.type](this); return this.attr("transform") && this.attr("transform").length && (d = c.transformPath(d, this.attr("transform"))), c.isPointInsidePath(d, a, b) }, $b.getBBox = function (a) { if (this.removed) return {}; var b = this._; return a ? ((b.dirty || !b.bboxwt) && (this.realPath = qb[this.type](this), b.bboxwt = Bb(this.realPath), b.bboxwt.toString = p, b.dirty = 0), b.bboxwt) : ((b.dirty || b.dirtyT || !b.bbox) && ((b.dirty || !this.realPath) && (b.bboxwt = 0, this.realPath = qb[this.type](this)), b.bbox = Bb(rb(this.realPath, this.matrix)), b.bbox.toString = p, b.dirty = b.dirtyT = 0), b.bbox) }, $b.clone = function () { if (this.removed) return null; var a = this.paper[this.type]().attr(this.attr()); return this.__set__ && this.__set__.push(a), a }, $b.glow = function (a) { if ("text" == this.type) return null; a = a || {}; var b = { width: (a.width || 10) + (+this.attr("stroke-width") || 1), fill: a.fill || !1, opacity: a.opacity || .5, offsetx: a.offsetx || 0, offsety: a.offsety || 0, color: a.color || "#000" }, c = b.width / 2, d = this.paper, e = d.set(), f = this.realPath || qb[this.type](this); f = this.matrix ? rb(f, this.matrix) : f; for (var g = 1; c + 1 > g; g++)e.push(d.path(f).attr({ stroke: b.color, fill: b.fill ? b.color : "none", "stroke-linejoin": "round", "stroke-linecap": "round", "stroke-width": +(b.width / c * g).toFixed(3), opacity: +(b.opacity / c).toFixed(3) })); return e.insertBefore(this).translate(b.offsetx, b.offsety) }; var cc = function (a, b, d, e, f, g, h, i, l) { return null == l ? j(a, b, d, e, f, g, h, i) : c.findDotsAtSegment(a, b, d, e, f, g, h, i, k(a, b, d, e, f, g, h, i, l)) }, dc = function (a, b) { return function (d, e, f) { d = Kb(d); for (var g, h, i, j, k, l = "", m = {}, n = 0, o = 0, p = d.length; p > o; o++) { if (i = d[o], "M" == i[0]) g = +i[1], h = +i[2]; else { if (j = cc(g, h, i[1], i[2], i[3], i[4], i[5], i[6]), n + j > e) { if (b && !m.start) { if (k = cc(g, h, i[1], i[2], i[3], i[4], i[5], i[6], e - n), l += ["C" + k.start.x, k.start.y, k.m.x, k.m.y, k.x, k.y], f) return l; m.start = l, l = ["M" + k.x, k.y + "C" + k.n.x, k.n.y, k.end.x, k.end.y, i[5], i[6]].join(), n += j, g = +i[5], h = +i[6]; continue } if (!a && !b) return k = cc(g, h, i[1], i[2], i[3], i[4], i[5], i[6], e - n), { x: k.x, y: k.y, alpha: k.alpha } } n += j, g = +i[5], h = +i[6] } l += i.shift() + i } return m.end = l, k = a ? n : b ? m : c.findDotsAtSegment(g, h, i[0], i[1], i[2], i[3], i[4], i[5], 1), k.alpha && (k = { x: k.x, y: k.y, alpha: k.alpha }), k } }, ec = dc(1), fc = dc(), gc = dc(0, 1); c.getTotalLength = ec, c.getPointAtLength = fc, c.getSubpath = function (a, b, c) { if (this.getTotalLength(a) - c < 1e-6) return gc(a, b).end; var d = gc(a, c, 1); return b ? gc(d, b).end : d }, $b.getTotalLength = function () { var a = this.getPath(); if (a) return this.node.getTotalLength ? this.node.getTotalLength() : ec(a) }, $b.getPointAtLength = function (a) { var b = this.getPath(); if (b) return fc(b, a) }, $b.getPath = function () { var a, b = c._getPath[this.type]; if ("text" != this.type && "set" != this.type) return b && (a = b(this)), a }, $b.getSubpath = function (a, b) { var d = this.getPath(); if (d) return c.getSubpath(d, a, b) }; var hc = c.easing_formulas = { linear: function (a) { return a }, "<": function (a) { return R(a, 1.7) }, ">": function (a) { return R(a, .48) }, "<>": function (a) { var b = .48 - a / 1.04, c = N.sqrt(.1734 + b * b), d = c - b, e = R(Q(d), 1 / 3) * (0 > d ? -1 : 1), f = -c - b, g = R(Q(f), 1 / 3) * (0 > f ? -1 : 1), h = e + g + .5; return 3 * (1 - h) * h * h + h * h * h }, backIn: function (a) { var b = 1.70158; return a * a * ((b + 1) * a - b) }, backOut: function (a) { a -= 1; var b = 1.70158; return a * a * ((b + 1) * a + b) + 1 }, elastic: function (a) { return a == !!a ? a : R(2, -10 * a) * N.sin(2 * (a - .075) * S / .3) + 1 }, bounce: function (a) { var b, c = 7.5625, d = 2.75; return 1 / d > a ? b = c * a * a : 2 / d > a ? (a -= 1.5 / d, b = c * a * a + .75) : 2.5 / d > a ? (a -= 2.25 / d, b = c * a * a + .9375) : (a -= 2.625 / d, b = c * a * a + .984375), b } }; hc.easeIn = hc["ease-in"] = hc["<"], hc.easeOut = hc["ease-out"] = hc[">"], hc.easeInOut = hc["ease-in-out"] = hc["<>"], hc["back-in"] = hc.backIn, hc["back-out"] = hc.backOut; var ic = [], jc = a.requestAnimationFrame || a.webkitRequestAnimationFrame || a.mozRequestAnimationFrame || a.oRequestAnimationFrame || a.msRequestAnimationFrame || function (a) { setTimeout(a, 16) }, kc = function () { for (var a = +new Date, d = 0; d < ic.length; d++) { var e = ic[d]; if (!e.el.removed && !e.paused) { var f, g, h = a - e.start, i = e.ms, j = e.easing, k = e.from, l = e.diff, m = e.to, n = (e.t, e.el), o = {}, p = {}; if (e.initstatus ? (h = (e.initstatus * e.anim.top - e.prev) / (e.percent - e.prev) * i, e.status = e.initstatus, delete e.initstatus, e.stop && ic.splice(d--, 1)) : e.status = (e.prev + (e.percent - e.prev) * (h / i)) / e.anim.top, !(0 > h)) if (i > h) { var q = j(h / i); for (var r in k) if (k[z](r)) { switch (db[r]) { case T: f = +k[r] + q * i * l[r]; break; case "colour": f = "rgb(" + [lc($(k[r].r + q * i * l[r].r)), lc($(k[r].g + q * i * l[r].g)), lc($(k[r].b + q * i * l[r].b))].join(",") + ")"; break; case "path": f = []; for (var t = 0, u = k[r].length; u > t; t++) { f[t] = [k[r][t][0]]; for (var v = 1, w = k[r][t].length; w > v; v++)f[t][v] = +k[r][t][v] + q * i * l[r][t][v]; f[t] = f[t].join(H) } f = f.join(H); break; case "transform": if (l[r].real) for (f = [], t = 0, u = k[r].length; u > t; t++)for (f[t] = [k[r][t][0]], v = 1, w = k[r][t].length; w > v; v++)f[t][v] = k[r][t][v] + q * i * l[r][t][v]; else { var x = function (a) { return +k[r][a] + q * i * l[r][a] }; f = [["m", x(0), x(1), x(2), x(3), x(4), x(5)]] } break; case "csv": if ("clip-rect" == r) for (f = [], t = 4; t--;)f[t] = +k[r][t] + q * i * l[r][t]; break; default: var y = [][E](k[r]); for (f = [], t = n.paper.customAttributes[r].length; t--;)f[t] = +y[t] + q * i * l[r][t] }o[r] = f } n.attr(o), function (a, c, d) { setTimeout(function () { b("raphael.anim.frame." + a, c, d) }) }(n.id, n, e.anim) } else { if (function (a, d, e) { setTimeout(function () { b("raphael.anim.frame." + d.id, d, e), b("raphael.anim.finish." + d.id, d, e), c.is(a, "function") && a.call(d) }) }(e.callback, n, e.anim), n.attr(m), ic.splice(d--, 1), e.repeat > 1 && !e.next) { for (g in m) m[z](g) && (p[g] = e.totalOrigin[g]); e.el.attr(p), s(e.anim, e.el, e.anim.percents[0], null, e.totalOrigin, e.repeat - 1) } e.next && !e.stop && s(e.anim, e.el, e.next, null, e.totalOrigin, e.repeat) } } } c.svg && n && n.paper && n.paper.safari(), ic.length && jc(kc) }, lc = function (a) { return a > 255 ? 255 : 0 > a ? 0 : a }; $b.animateWith = function (a, b, d, e, f, g) { var h = this; if (h.removed) return g && g.call(h), h; var i = d instanceof r ? d : c.animation(d, e, f, g); s(i, h, i.percents[0], null, h.attr()); for (var j = 0, k = ic.length; k > j; j++)if (ic[j].anim == b && ic[j].el == a) { ic[k - 1].start = ic[j].start; break } return h }, $b.onAnimation = function (a) { return a ? b.on("raphael.anim.frame." + this.id, a) : b.unbind("raphael.anim.frame." + this.id), this }, r.prototype.delay = function (a) { var b = new r(this.anim, this.ms); return b.times = this.times, b.del = +a || 0, b }, r.prototype.repeat = function (a) { var b = new r(this.anim, this.ms); return b.del = this.del, b.times = N.floor(O(a, 0)) || 1, b }, c.animation = function (a, b, d, e) { if (a instanceof r) return a; (c.is(d, "function") || !d) && (e = e || d || null, d = null), a = Object(a), b = +b || 0; var f, g, h = {}; for (g in a) a[z](g) && _(g) != g && _(g) + "%" != g && (f = !0, h[g] = a[g]); if (f) return d && (h.easing = d), e && (h.callback = e), new r({ 100: h }, b); if (e) { var i = 0; for (var j in a) { var k = ab(j); a[z](j) && k > i && (i = k) } i += "%", !a[i].callback && (a[i].callback = e) } return new r(a, b) }, $b.animate = function (a, b, d, e) { var f = this; if (f.removed) return e && e.call(f), f; var g = a instanceof r ? a : c.animation(a, b, d, e); return s(g, f, g.percents[0], null, f.attr()), f }, $b.setTime = function (a, b) { return a && null != b && this.status(a, P(b, a.ms) / a.ms), this }, $b.status = function (a, b) { var c, d, e = [], f = 0; if (null != b) return s(a, this, -1, P(b, 1)), this; for (c = ic.length; c > f; f++)if (d = ic[f], d.el.id == this.id && (!a || d.anim == a)) { if (a) return d.status; e.push({ anim: d.anim, status: d.status }) } return a ? 0 : e }, $b.pause = function (a) { for (var c = 0; c < ic.length; c++)ic[c].el.id != this.id || a && ic[c].anim != a || b("raphael.anim.pause." + this.id, this, ic[c].anim) !== !1 && (ic[c].paused = !0); return this }, $b.resume = function (a) { for (var c = 0; c < ic.length; c++)if (ic[c].el.id == this.id && (!a || ic[c].anim == a)) { var d = ic[c]; b("raphael.anim.resume." + this.id, this, d.anim) !== !1 && (delete d.paused, this.status(d.anim, d.status)) } return this }, $b.stop = function (a) { for (var c = 0; c < ic.length; c++)ic[c].el.id != this.id || a && ic[c].anim != a || b("raphael.anim.stop." + this.id, this, ic[c].anim) !== !1 && ic.splice(c--, 1); return this }, b.on("raphael.remove", t), b.on("raphael.clear", t), $b.toString = function () { return "Raphaël’s object" }; var mc = function (a) { if (this.items = [], this.length = 0, this.type = "set", a) for (var b = 0, c = a.length; c > b; b++)!a[b] || a[b].constructor != $b.constructor && a[b].constructor != mc || (this[this.items.length] = this.items[this.items.length] = a[b], this.length++) }, nc = mc.prototype; nc.push = function () { for (var a, b, c = 0, d = arguments.length; d > c; c++)a = arguments[c], !a || a.constructor != $b.constructor && a.constructor != mc || (b = this.items.length, this[b] = this.items[b] = a, this.length++); return this }, nc.pop = function () { return this.length && delete this[this.length--], this.items.pop() }, nc.forEach = function (a, b) { for (var c = 0, d = this.items.length; d > c; c++)if (a.call(b, this.items[c], c) === !1) return this; return this }; for (var oc in $b) $b[z](oc) && (nc[oc] = function (a) { return function () { var b = arguments; return this.forEach(function (c) { c[a][D](c, b) }) } }(oc)); return nc.attr = function (a, b) { if (a && c.is(a, V) && c.is(a[0], "object")) for (var d = 0, e = a.length; e > d; d++)this.items[d].attr(a[d]); else for (var f = 0, g = this.items.length; g > f; f++)this.items[f].attr(a, b); return this }, nc.clear = function () { for (; this.length;)this.pop() }, nc.splice = function (a, b) { a = 0 > a ? O(this.length + a, 0) : a, b = O(0, P(this.length - a, b)); var c, d = [], e = [], f = []; for (c = 2; c < arguments.length; c++)f.push(arguments[c]); for (c = 0; b > c; c++)e.push(this[a + c]); for (; c < this.length - a; c++)d.push(this[a + c]); var g = f.length; for (c = 0; c < g + d.length; c++)this.items[a + c] = this[a + c] = g > c ? f[c] : d[c - g]; for (c = this.items.length = this.length -= b - g; this[c];)delete this[c++]; return new mc(e) }, nc.exclude = function (a) { for (var b = 0, c = this.length; c > b; b++)if (this[b] == a) return this.splice(b, 1), !0 }, nc.animate = function (a, b, d, e) { (c.is(d, "function") || !d) && (e = d || null); var f, g, h = this.items.length, i = h, j = this; if (!h) return this; e && (g = function () { !--h && e.call(j) }), d = c.is(d, U) ? d : g; var k = c.animation(a, b, d, g); for (f = this.items[--i].animate(k); i--;)this.items[i] && !this.items[i].removed && this.items[i].animateWith(f, k, k), this.items[i] && !this.items[i].removed || h--; return this }, nc.insertAfter = function (a) { for (var b = this.items.length; b--;)this.items[b].insertAfter(a); return this }, nc.getBBox = function () { for (var a = [], b = [], c = [], d = [], e = this.items.length; e--;)if (!this.items[e].removed) { var f = this.items[e].getBBox(); a.push(f.x), b.push(f.y), c.push(f.x + f.width), d.push(f.y + f.height) } return a = P[D](0, a), b = P[D](0, b), c = O[D](0, c), d = O[D](0, d), { x: a, y: b, x2: c, y2: d, width: c - a, height: d - b } }, nc.clone = function (a) { a = this.paper.set(); for (var b = 0, c = this.items.length; c > b; b++)a.push(this.items[b].clone()); return a }, nc.toString = function () { return "Raphaël‘s set" }, nc.glow = function (a) { var b = this.paper.set(); return this.forEach(function (c) { var d = c.glow(a); null != d && d.forEach(function (a) { b.push(a) }) }), b }, nc.isPointInside = function (a, b) { var c = !1; return this.forEach(function (d) { return d.isPointInside(a, b) ? (c = !0, !1) : void 0 }), c }, c.registerFont = function (a) { if (!a.face) return a; this.fonts = this.fonts || {}; var b = { w: a.w, face: {}, glyphs: {} }, c = a.face["font-family"]; for (var d in a.face) a.face[z](d) && (b.face[d] = a.face[d]); if (this.fonts[c] ? this.fonts[c].push(b) : this.fonts[c] = [b], !a.svg) { b.face["units-per-em"] = ab(a.face["units-per-em"], 10); for (var e in a.glyphs) if (a.glyphs[z](e)) { var f = a.glyphs[e]; if (b.glyphs[e] = { w: f.w, k: {}, d: f.d && "M" + f.d.replace(/[mlcxtrv]/g, function (a) { return { l: "L", c: "C", x: "z", t: "m", r: "l", v: "c" }[a] || "M" }) + "z" }, f.k) for (var g in f.k) f[z](g) && (b.glyphs[e].k[g] = f.k[g]) } } return a }, v.getFont = function (a, b, d, e) { if (e = e || "normal", d = d || "normal", b = +b || { normal: 400, bold: 700, lighter: 300, bolder: 800 }[b] || 400, c.fonts) { var f = c.fonts[a]; if (!f) { var g = new RegExp("(^|\\s)" + a.replace(/[^\w\d\s+!~.:_-]/g, G) + "(\\s|$)", "i"); for (var h in c.fonts) if (c.fonts[z](h) && g.test(h)) { f = c.fonts[h]; break } } var i; if (f) for (var j = 0, k = f.length; k > j && (i = f[j], i.face["font-weight"] != b || i.face["font-style"] != d && i.face["font-style"] || i.face["font-stretch"] != e); j++); return i } }, v.print = function (a, b, d, e, f, g, h, i) { g = g || "middle", h = O(P(h || 0, 1), -1), i = O(P(i || 1, 3), 1); var j, k = I(d)[J](G), l = 0, m = 0, n = G; if (c.is(e, "string") && (e = this.getFont(e)), e) { j = (f || 16) / e.face["units-per-em"]; for (var o = e.face.bbox[J](w), p = +o[0], q = o[3] - o[1], r = 0, s = +o[1] + ("baseline" == g ? q + +e.face.descent : q / 2), t = 0, u = k.length; u > t; t++) { if ("\n" == k[t]) l = 0, x = 0, m = 0, r += q * i; else { var v = m && e.glyphs[k[t - 1]] || {}, x = e.glyphs[k[t]]; l += m ? (v.w || e.w) + (v.k && v.k[k[t]] || 0) + e.w * h : 0, m = 1 } x && x.d && (n += c.transformPath(x.d, ["t", l * j, r * j, "s", j, j, p, s, "t", (a - p) / j, (b - s) / j])) } } return this.path(n).attr({ fill: "#000", stroke: "none" }) }, v.add = function (a) { if (c.is(a, "array")) for (var b, d = this.set(), e = 0, f = a.length; f > e; e++)b = a[e] || {}, x[z](b.type) && d.push(this[b.type]().attr(b)); return d }, c.format = function (a, b) { var d = c.is(b, V) ? [0][E](b) : arguments; return a && c.is(a, U) && d.length - 1 && (a = a.replace(y, function (a, b) { return null == d[++b] ? G : d[b] })), a || G }, c.fullfill = function () { var a = /\{([^\}]+)\}/g, b = /(?:(?:^|\.)(.+?)(?=\[|\.|$|\()|\[('|")(.+?)\2\])(\(\))?/g, c = function (a, c, d) { var e = d; return c.replace(b, function (a, b, c, d, f) { b = b || d, e && (b in e && (e = e[b]), "function" == typeof e && f && (e = e())) }), e = (null == e || e == d ? a : e) + "" }; return function (b, d) { return String(b).replace(a, function (a, b) { return c(a, b, d) }) } }(), c.ninja = function () { return B.was ? A.win.Raphael = B.is : delete Raphael, c }, c.st = nc, b.on("raphael.DOMload", function () { u = !0 }), function (a, b, d) { function e() { /in/.test(a.readyState) ? setTimeout(e, 9) : c.eve("raphael.DOMload") } null == a.readyState && a.addEventListener && (a.addEventListener(b, d = function () { a.removeEventListener(b, d, !1), a.readyState = "complete" }, !1), a.readyState = "loading"), e() }(document, "DOMContentLoaded"), function () {
+        if (c.svg) {
+            var a = "hasOwnProperty", b = String, d = parseFloat, e = parseInt, f = Math, g = f.max, h = f.abs, i = f.pow, j = /[, ]+/, k = c.eve, l = "", m = " ", n = "http://www.w3.org/1999/xlink", o = { block: "M5,0 0,2.5 5,5z", classic: "M5,0 0,2.5 5,5 3.5,3 3.5,2z", diamond: "M2.5,0 5,2.5 2.5,5 0,2.5z", open: "M6,1 1,3.5 6,6", oval: "M2.5,0A2.5,2.5,0,0,1,2.5,5 2.5,2.5,0,0,1,2.5,0z" }, p = {}; c.toString = function () { return "Your browser supports SVG.\nYou are running Raphaël " + this.version }; var q = function (d, e) { if (e) { "string" == typeof d && (d = q(d)); for (var f in e) e[a](f) && ("xlink:" == f.substring(0, 6) ? d.setAttributeNS(n, f.substring(6), b(e[f])) : d.setAttribute(f, b(e[f]))) } else d = c._g.doc.createElementNS("http://www.w3.org/2000/svg", d), d.style && (d.style.webkitTapHighlightColor = "rgba(0,0,0,0)"); return d }, r = function (a, e) { var j = "linear", k = a.id + e, m = .5, n = .5, o = a.node, p = a.paper, r = o.style, s = c._g.doc.getElementById(k); if (!s) { if (e = b(e).replace(c._radial_gradient, function (a, b, c) { if (j = "radial", b && c) { m = d(b), n = d(c); var e = 2 * (n > .5) - 1; i(m - .5, 2) + i(n - .5, 2) > .25 && (n = f.sqrt(.25 - i(m - .5, 2)) * e + .5) && .5 != n && (n = n.toFixed(5) - 1e-5 * e) } return l }), e = e.split(/\s*\-\s*/), "linear" == j) { var t = e.shift(); if (t = -d(t), isNaN(t)) return null; var u = [0, 0, f.cos(c.rad(t)), f.sin(c.rad(t))], v = 1 / (g(h(u[2]), h(u[3])) || 1); u[2] *= v, u[3] *= v, u[2] < 0 && (u[0] = -u[2], u[2] = 0), u[3] < 0 && (u[1] = -u[3], u[3] = 0) } var w = c._parseDots(e); if (!w) return null; if (k = k.replace(/[\(\)\s,\xb0#]/g, "_"), a.gradient && k != a.gradient.id && (p.defs.removeChild(a.gradient), delete a.gradient), !a.gradient) { s = q(j + "Gradient", { id: k }), a.gradient = s, q(s, "radial" == j ? { fx: m, fy: n } : { x1: u[0], y1: u[1], x2: u[2], y2: u[3], gradientTransform: a.matrix.invert() }), p.defs.appendChild(s); for (var x = 0, y = w.length; y > x; x++)s.appendChild(q("stop", { offset: w[x].offset ? w[x].offset : x ? "100%" : "0%", "stop-color": w[x].color || "#fff" })) } } return q(o, { fill: "url(" + document.location + "#" + k + ")", opacity: 1, "fill-opacity": 1 }), r.fill = l, r.opacity = 1, r.fillOpacity = 1, 1 }, s = function (a) { var b = a.getBBox(1); q(a.pattern, { patternTransform: a.matrix.invert() + " translate(" + b.x + "," + b.y + ")" }) }, t = function (d, e, f) { if ("path" == d.type) { for (var g, h, i, j, k, m = b(e).toLowerCase().split("-"), n = d.paper, r = f ? "end" : "start", s = d.node, t = d.attrs, u = t["stroke-width"], v = m.length, w = "classic", x = 3, y = 3, z = 5; v--;)switch (m[v]) { case "block": case "classic": case "oval": case "diamond": case "open": case "none": w = m[v]; break; case "wide": y = 5; break; case "narrow": y = 2; break; case "long": x = 5; break; case "short": x = 2 }if ("open" == w ? (x += 2, y += 2, z += 2, i = 1, j = f ? 4 : 1, k = { fill: "none", stroke: t.stroke }) : (j = i = x / 2, k = { fill: t.stroke, stroke: "none" }), d._.arrows ? f ? (d._.arrows.endPath && p[d._.arrows.endPath]--, d._.arrows.endMarker && p[d._.arrows.endMarker]--) : (d._.arrows.startPath && p[d._.arrows.startPath]--, d._.arrows.startMarker && p[d._.arrows.startMarker]--) : d._.arrows = {}, "none" != w) { var A = "raphael-marker-" + w, B = "raphael-marker-" + r + w + x + y + "-obj" + d.id; c._g.doc.getElementById(A) ? p[A]++ : (n.defs.appendChild(q(q("path"), { "stroke-linecap": "round", d: o[w], id: A })), p[A] = 1); var C, D = c._g.doc.getElementById(B); D ? (p[B]++, C = D.getElementsByTagName("use")[0]) : (D = q(q("marker"), { id: B, markerHeight: y, markerWidth: x, orient: "auto", refX: j, refY: y / 2 }), C = q(q("use"), { "xlink:href": "#" + A, transform: (f ? "rotate(180 " + x / 2 + " " + y / 2 + ") " : l) + "scale(" + x / z + "," + y / z + ")", "stroke-width": (1 / ((x / z + y / z) / 2)).toFixed(4) }), D.appendChild(C), n.defs.appendChild(D), p[B] = 1), q(C, k); var E = i * ("diamond" != w && "oval" != w); f ? (g = d._.arrows.startdx * u || 0, h = c.getTotalLength(t.path) - E * u) : (g = E * u, h = c.getTotalLength(t.path) - (d._.arrows.enddx * u || 0)), k = {}, k["marker-" + r] = "url(#" + B + ")", (h || g) && (k.d = c.getSubpath(t.path, g, h)), q(s, k), d._.arrows[r + "Path"] = A, d._.arrows[r + "Marker"] = B, d._.arrows[r + "dx"] = E, d._.arrows[r + "Type"] = w, d._.arrows[r + "String"] = e } else f ? (g = d._.arrows.startdx * u || 0, h = c.getTotalLength(t.path) - g) : (g = 0, h = c.getTotalLength(t.path) - (d._.arrows.enddx * u || 0)), d._.arrows[r + "Path"] && q(s, { d: c.getSubpath(t.path, g, h) }), delete d._.arrows[r + "Path"], delete d._.arrows[r + "Marker"], delete d._.arrows[r + "dx"], delete d._.arrows[r + "Type"], delete d._.arrows[r + "String"]; for (k in p) if (p[a](k) && !p[k]) { var F = c._g.doc.getElementById(k); F && F.parentNode.removeChild(F) } } }, u = { "": [0], none: [0], "-": [3, 1], ".": [1, 1], "-.": [3, 1, 1, 1], "-..": [3, 1, 1, 1, 1, 1], ". ": [1, 3], "- ": [4, 3], "--": [8, 3], "- .": [4, 3, 1, 3], "--.": [8, 3, 1, 3], "--..": [8, 3, 1, 3, 1, 3] }, v = function (a, c, d) { if (c = u[b(c).toLowerCase()]) { for (var e = a.attrs["stroke-width"] || "1", f = { round: e, square: e, butt: 0 }[a.attrs["stroke-linecap"] || d["stroke-linecap"]] || 0, g = [], h = c.length; h--;)g[h] = c[h] * e + (h % 2 ? 1 : -1) * f; q(a.node, { "stroke-dasharray": g.join(",") }) } }, w = function (d, f) {
+                var i = d.node, k = d.attrs, m = i.style.visibility; i.style.visibility = "hidden"; for (var o in f) if (f[a](o)) {
+                    if (!c._availableAttrs[a](o)) continue; var p = f[o]; switch (k[o] = p, o) {
+                        case "blur": d.blur(p); break; case "title": var u = i.getElementsByTagName("title"); if (u.length && (u = u[0])) u.firstChild.nodeValue = p; else { u = q("title"); var w = c._g.doc.createTextNode(p); u.appendChild(w), i.appendChild(u) } break; case "href": case "target": var x = i.parentNode; if ("a" != x.tagName.toLowerCase()) { var z = q("a"); x.insertBefore(z, i), z.appendChild(i), x = z } "target" == o ? x.setAttributeNS(n, "show", "blank" == p ? "new" : p) : x.setAttributeNS(n, o, p); break; case "cursor": i.style.cursor = p; break; case "transform": d.transform(p); break; case "arrow-start": t(d, p); break; case "arrow-end": t(d, p, 1); break; case "clip-rect": var A = b(p).split(j); if (4 == A.length) { d.clip && d.clip.parentNode.parentNode.removeChild(d.clip.parentNode); var B = q("clipPath"), C = q("rect"); B.id = c.createUUID(), q(C, { x: A[0], y: A[1], width: A[2], height: A[3] }), B.appendChild(C), d.paper.defs.appendChild(B), q(i, { "clip-path": "url(#" + B.id + ")" }), d.clip = C } if (!p) { var D = i.getAttribute("clip-path"); if (D) { var E = c._g.doc.getElementById(D.replace(/(^url\(#|\)$)/g, l)); E && E.parentNode.removeChild(E), q(i, { "clip-path": l }), delete d.clip } } break; case "path": "path" == d.type && (q(i, { d: p ? k.path = c._pathToAbsolute(p) : "M0,0" }), d._.dirty = 1, d._.arrows && ("startString" in d._.arrows && t(d, d._.arrows.startString), "endString" in d._.arrows && t(d, d._.arrows.endString, 1))); break; case "width": if (i.setAttribute(o, p), d._.dirty = 1, !k.fx) break; o = "x", p = k.x; case "x": k.fx && (p = -k.x - (k.width || 0)); case "rx": if ("rx" == o && "rect" == d.type) break; case "cx": i.setAttribute(o, p), d.pattern && s(d), d._.dirty = 1; break; case "height": if (i.setAttribute(o, p), d._.dirty = 1, !k.fy) break; o = "y", p = k.y; case "y": k.fy && (p = -k.y - (k.height || 0)); case "ry": if ("ry" == o && "rect" == d.type) break; case "cy": i.setAttribute(o, p), d.pattern && s(d), d._.dirty = 1; break; case "r": "rect" == d.type ? q(i, { rx: p, ry: p }) : i.setAttribute(o, p), d._.dirty = 1; break; case "src": "image" == d.type && i.setAttributeNS(n, "href", p); break; case "stroke-width": (1 != d._.sx || 1 != d._.sy) && (p /= g(h(d._.sx), h(d._.sy)) || 1), i.setAttribute(o, p), k["stroke-dasharray"] && v(d, k["stroke-dasharray"], f), d._.arrows && ("startString" in d._.arrows && t(d, d._.arrows.startString), "endString" in d._.arrows && t(d, d._.arrows.endString, 1)); break; case "stroke-dasharray": v(d, p, f); break; case "fill": var F = b(p).match(c._ISURL); if (F) { B = q("pattern"); var G = q("image"); B.id = c.createUUID(), q(B, { x: 0, y: 0, patternUnits: "userSpaceOnUse", height: 1, width: 1 }), q(G, { x: 0, y: 0, "xlink:href": F[1] }), B.appendChild(G), function (a) { c._preload(F[1], function () { var b = this.offsetWidth, c = this.offsetHeight; q(a, { width: b, height: c }), q(G, { width: b, height: c }), d.paper.safari() }) }(B), d.paper.defs.appendChild(B), q(i, { fill: "url(#" + B.id + ")" }), d.pattern = B, d.pattern && s(d); break } var H = c.getRGB(p); if (H.error) { if (("circle" == d.type || "ellipse" == d.type || "r" != b(p).charAt()) && r(d, p)) { if ("opacity" in k || "fill-opacity" in k) { var I = c._g.doc.getElementById(i.getAttribute("fill").replace(/^url\(#|\)$/g, l)); if (I) { var J = I.getElementsByTagName("stop"); q(J[J.length - 1], { "stop-opacity": ("opacity" in k ? k.opacity : 1) * ("fill-opacity" in k ? k["fill-opacity"] : 1) }) } } k.gradient = p, k.fill = "none"; break } } else delete f.gradient, delete k.gradient, !c.is(k.opacity, "undefined") && c.is(f.opacity, "undefined") && q(i, { opacity: k.opacity }), !c.is(k["fill-opacity"], "undefined") && c.is(f["fill-opacity"], "undefined") && q(i, { "fill-opacity": k["fill-opacity"] }); H[a]("opacity") && q(i, { "fill-opacity": H.opacity > 1 ? H.opacity / 100 : H.opacity }); case "stroke": H = c.getRGB(p), i.setAttribute(o, H.hex), "stroke" == o && H[a]("opacity") && q(i, { "stroke-opacity": H.opacity > 1 ? H.opacity / 100 : H.opacity }), "stroke" == o && d._.arrows && ("startString" in d._.arrows && t(d, d._.arrows.startString), "endString" in d._.arrows && t(d, d._.arrows.endString, 1)); break; case "gradient": ("circle" == d.type || "ellipse" == d.type || "r" != b(p).charAt()) && r(d, p); break;
+                        case "opacity": k.gradient && !k[a]("stroke-opacity") && q(i, { "stroke-opacity": p > 1 ? p / 100 : p }); case "fill-opacity": if (k.gradient) { I = c._g.doc.getElementById(i.getAttribute("fill").replace(/^url\(#|\)$/g, l)), I && (J = I.getElementsByTagName("stop"), q(J[J.length - 1], { "stop-opacity": p })); break } default: "font-size" == o && (p = e(p, 10) + "px"); var K = o.replace(/(\-.)/g, function (a) { return a.substring(1).toUpperCase() }); i.style[K] = p, d._.dirty = 1, i.setAttribute(o, p)
+                    }
+                } y(d, f), i.style.visibility = m
+            }, x = 1.2, y = function (d, f) { if ("text" == d.type && (f[a]("text") || f[a]("font") || f[a]("font-size") || f[a]("x") || f[a]("y"))) { var g = d.attrs, h = d.node, i = h.firstChild ? e(c._g.doc.defaultView.getComputedStyle(h.firstChild, l).getPropertyValue("font-size"), 10) : 10; if (f[a]("text")) { for (g.text = f.text; h.firstChild;)h.removeChild(h.firstChild); for (var j, k = b(f.text).split("\n"), m = [], n = 0, o = k.length; o > n; n++)j = q("tspan"), n && q(j, { dy: i * x, x: g.x }), j.appendChild(c._g.doc.createTextNode(k[n])), h.appendChild(j), m[n] = j } else for (m = h.getElementsByTagName("tspan"), n = 0, o = m.length; o > n; n++)n ? q(m[n], { dy: i * x, x: g.x }) : q(m[0], { dy: 0 }); q(h, { x: g.x, y: g.y }), d._.dirty = 1; var p = d._getBBox(), r = g.y - (p.y + p.height / 2); r && c.is(r, "finite") && q(m[0], { dy: r }) } }, z = function (a) { return a.parentNode && "a" === a.parentNode.tagName.toLowerCase() ? a.parentNode : a }; __Element = function (a, b) { this[0] = this.node = a, a.raphael = !0, this.id = c._oid++, a.raphaelid = this.id, this.matrix = c.matrix(), this.realPath = null, this.paper = b, this.attrs = this.attrs || {}, this._ = { transform: [], sx: 1, sy: 1, deg: 0, dx: 0, dy: 0, dirty: 1 }, !b.bottom && (b.bottom = this), this.prev = b.top, b.top && (b.top.next = this), b.top = this, this.next = null }, $b = c.el, Element.prototype = $b, $b.constructor = Element, c._engine.path = function (a, b) { var c = q("path"); b.canvas && b.canvas.appendChild(c); var d = new __Element(c, b); return d.type = "path", w(d, { fill: "none", stroke: "#000", path: a }), d }, $b.rotate = function (a, c, e) { if (this.removed) return this; if (a = b(a).split(j), a.length - 1 && (c = d(a[1]), e = d(a[2])), a = d(a[0]), null == e && (c = e), null == c || null == e) { var f = this.getBBox(1); c = f.x + f.width / 2, e = f.y + f.height / 2 } return this.transform(this._.transform.concat([["r", a, c, e]])), this }, $b.scale = function (a, c, e, f) { if (this.removed) return this; if (a = b(a).split(j), a.length - 1 && (c = d(a[1]), e = d(a[2]), f = d(a[3])), a = d(a[0]), null == c && (c = a), null == f && (e = f), null == e || null == f) var g = this.getBBox(1); return e = null == e ? g.x + g.width / 2 : e, f = null == f ? g.y + g.height / 2 : f, this.transform(this._.transform.concat([["s", a, c, e, f]])), this }, $b.translate = function (a, c) { return this.removed ? this : (a = b(a).split(j), a.length - 1 && (c = d(a[1])), a = d(a[0]) || 0, c = +c || 0, this.transform(this._.transform.concat([["t", a, c]])), this) }, $b.transform = function (b) { var d = this._; if (null == b) return d.transform; if (c._extractTransform(this, b), this.clip && q(this.clip, { transform: this.matrix.invert() }), this.pattern && s(this), this.node && q(this.node, { transform: this.matrix }), 1 != d.sx || 1 != d.sy) { var e = this.attrs[a]("stroke-width") ? this.attrs["stroke-width"] : 1; this.attr({ "stroke-width": e }) } return this }, $b.hide = function () { return !this.removed && this.paper.safari(this.node.style.display = "none"), this }, $b.show = function () { return !this.removed && this.paper.safari(this.node.style.display = ""), this }, $b.remove = function () { var a = z(this.node); if (!this.removed && a.parentNode) { var b = this.paper; b.__set__ && b.__set__.exclude(this), k.unbind("raphael.*.*." + this.id), this.gradient && b.defs.removeChild(this.gradient), c._tear(this, b), a.parentNode.removeChild(a), this.removeData(); for (var d in this) this[d] = "function" == typeof this[d] ? c._removedFactory(d) : null; this.removed = !0 } }, $b._getBBox = function () { if ("none" == this.node.style.display) { this.show(); var a = !0 } var b, c = !1; this.paper.canvas.parentElement ? b = this.paper.canvas.parentElement.style : this.paper.canvas.parentNode && (b = this.paper.canvas.parentNode.style), b && "none" == b.display && (c = !0, b.display = ""); var d = {}; try { d = this.node.getBBox() } catch (e) { d = { x: this.node.clientLeft, y: this.node.clientTop, width: this.node.clientWidth, height: this.node.clientHeight } } finally { d = d || {}, c && (b.display = "none") } return a && this.hide(), d }, $b.attr = function (b, d) { if (this.removed) return this; if (null == b) { var e = {}; for (var f in this.attrs) this.attrs[a](f) && (e[f] = this.attrs[f]); return e.gradient && "none" == e.fill && (e.fill = e.gradient) && delete e.gradient, e.transform = this._.transform, e } if (null == d && c.is(b, "string")) { if ("fill" == b && "none" == this.attrs.fill && this.attrs.gradient) return this.attrs.gradient; if ("transform" == b) return this._.transform; for (var g = b.split(j), h = {}, i = 0, l = g.length; l > i; i++)b = g[i], h[b] = b in this.attrs ? this.attrs[b] : c.is(this.paper.customAttributes[b], "function") ? this.paper.customAttributes[b].def : c._availableAttrs[b]; return l - 1 ? h : h[g[0]] } if (null == d && c.is(b, "array")) { for (h = {}, i = 0, l = b.length; l > i; i++)h[b[i]] = this.attr(b[i]); return h } if (null != d) { var m = {}; m[b] = d } else null != b && c.is(b, "object") && (m = b); for (var n in m) k("raphael.attr." + n + "." + this.id, this, m[n]); for (n in this.paper.customAttributes) if (this.paper.customAttributes[a](n) && m[a](n) && c.is(this.paper.customAttributes[n], "function")) { var o = this.paper.customAttributes[n].apply(this, [].concat(m[n])); this.attrs[n] = m[n]; for (var p in o) o[a](p) && (m[p] = o[p]) } return w(this, m), this }, $b.toFront = function () { if (this.removed) return this; var a = z(this.node); a.parentNode.appendChild(a); var b = this.paper; return b.top != this && c._tofront(this, b), this }, $b.toBack = function () { if (this.removed) return this; var a = z(this.node), b = a.parentNode; b.insertBefore(a, b.firstChild), c._toback(this, this.paper); this.paper; return this }, $b.insertAfter = function (a) { if (this.removed || !a) return this; var b = z(this.node), d = z(a.node || a[a.length - 1].node); return d.nextSibling ? d.parentNode.insertBefore(b, d.nextSibling) : d.parentNode.appendChild(b), c._insertafter(this, a, this.paper), this }, $b.insertBefore = function (a) { if (this.removed || !a) return this; var b = z(this.node), d = z(a.node || a[0].node); return d.parentNode.insertBefore(b, d), c._insertbefore(this, a, this.paper), this }, $b.blur = function (a) { var b = this; if (0 !== +a) { var d = q("filter"), e = q("feGaussianBlur"); b.attrs.blur = a, d.id = c.createUUID(), q(e, { stdDeviation: +a || 1.5 }), d.appendChild(e), b.paper.defs.appendChild(d), b._blur = d, q(b.node, { filter: "url(#" + d.id + ")" }) } else b._blur && (b._blur.parentNode.removeChild(b._blur), delete b._blur, delete b.attrs.blur), b.node.removeAttribute("filter"); return b }, c._engine.circle = function (a, b, c, d) { var e = q("circle"); a.canvas && a.canvas.appendChild(e); var f = new __Element(e, a); return f.attrs = { cx: b, cy: c, r: d, fill: "none", stroke: "#000" }, f.type = "circle", q(e, f.attrs), f }, c._engine.rect = function (a, b, c, d, e, f) { var g = q("rect"); a.canvas && a.canvas.appendChild(g); var h = new __Element(g, a); return h.attrs = { x: b, y: c, width: d, height: e, rx: f || 0, ry: f || 0, fill: "none", stroke: "#000" }, h.type = "rect", q(g, h.attrs), h }, c._engine.ellipse = function (a, b, c, d, e) { var f = q("ellipse"); a.canvas && a.canvas.appendChild(f); var g = new __Element(f, a); return g.attrs = { cx: b, cy: c, rx: d, ry: e, fill: "none", stroke: "#000" }, g.type = "ellipse", q(f, g.attrs), g }, c._engine.image = function (a, b, c, d, e, f) { var g = q("image"); q(g, { x: c, y: d, width: e, height: f, preserveAspectRatio: "none" }), g.setAttributeNS(n, "href", b), a.canvas && a.canvas.appendChild(g); var h = new __Element(g, a); return h.attrs = { x: c, y: d, width: e, height: f, src: b }, h.type = "image", h }, c._engine.text = function (a, b, d, e) { var f = q("text"); a.canvas && a.canvas.appendChild(f); var g = new __Element(f, a); return g.attrs = { x: b, y: d, "text-anchor": "middle", text: e, "font-family": c._availableAttrs["font-family"], "font-size": c._availableAttrs["font-size"], stroke: "none", fill: "#000" }, g.type = "text", w(g, g.attrs), g }, c._engine.setSize = function (a, b) { return this.width = a || this.width, this.height = b || this.height, this.canvas.setAttribute("width", this.width), this.canvas.setAttribute("height", this.height), this._viewBox && this.setViewBox.apply(this, this._viewBox), this }, c._engine.create = function () { var a = c._getContainer.apply(0, arguments), b = a && a.container, d = a.x, e = a.y, f = a.width, g = a.height; if (!b) throw new Error("SVG container not found."); var h, i = q("svg"), j = "overflow:hidden;"; return d = d || 0, e = e || 0, f = f || 512, g = g || 342, q(i, { height: g, version: 1.1, width: f, xmlns: "http://www.w3.org/2000/svg", "xmlns:xlink": "http://www.w3.org/1999/xlink" }), 1 == b ? (i.style.cssText = j + "position:absolute;left:" + d + "px;top:" + e + "px", c._g.doc.body.appendChild(i), h = 1) : (i.style.cssText = j + "position:relative", b.firstChild ? b.insertBefore(i, b.firstChild) : b.appendChild(i)), b = new c._Paper, b.width = f, b.height = g, b.canvas = i, b.clear(), b._left = b._top = 0, h && (b.renderfix = function () { }), b.renderfix(), b }, c._engine.setViewBox = function (a, b, c, d, e) { k("raphael.setViewBox", this, this._viewBox, [a, b, c, d, e]); var f, h, i = this.getSize(), j = g(c / i.width, d / i.height), l = this.top, n = e ? "xMidYMid meet" : "xMinYMin"; for (null == a ? (this._vbSize && (j = 1), delete this._vbSize, f = "0 0 " + this.width + m + this.height) : (this._vbSize = j, f = a + m + b + m + c + m + d), q(this.canvas, { viewBox: f, preserveAspectRatio: n }); j && l;)h = "stroke-width" in l.attrs ? l.attrs["stroke-width"] : 1, l.attr({ "stroke-width": h }), l._.dirty = 1, l._.dirtyT = 1, l = l.prev; return this._viewBox = [a, b, c, d, !!e], this }, c.prototype.renderfix = function () { var a, b = this.canvas, c = b.style; try { a = b.getScreenCTM() || b.createSVGMatrix() } catch (d) { a = b.createSVGMatrix() } var e = -a.e % 1, f = -a.f % 1; (e || f) && (e && (this._left = (this._left + e) % 1, c.left = this._left + "px"), f && (this._top = (this._top + f) % 1, c.top = this._top + "px")) }, c.prototype.clear = function () { c.eve("raphael.clear", this); for (var a = this.canvas; a.firstChild;)a.removeChild(a.firstChild); this.bottom = this.top = null, (this.desc = q("desc")).appendChild(c._g.doc.createTextNode("Created with Raphaël " + c.version)), a.appendChild(this.desc), a.appendChild(this.defs = q("defs")) }, c.prototype.remove = function () { k("raphael.remove", this), this.canvas.parentNode && this.canvas.parentNode.removeChild(this.canvas); for (var a in this) this[a] = "function" == typeof this[a] ? c._removedFactory(a) : null }; var A = c.st; for (var B in $b) $b[a](B) && !A[a](B) && (A[B] = function (a) { return function () { var b = arguments; return this.forEach(function (c) { c[a].apply(c, b) }) } }(B))
+        }
+    }(), function () { if (c.vml) { var a = "hasOwnProperty", b = String, d = parseFloat, e = Math, f = e.round, g = e.max, h = e.min, i = e.abs, j = "fill", k = /[, ]+/, l = c.eve, m = " progid:DXImageTransform.Microsoft", n = " ", o = "", p = { M: "m", L: "l", C: "c", Z: "x", m: "t", l: "r", c: "v", z: "x" }, q = /([clmz]),?([^clmz]*)/gi, r = / progid:\S+Blur\([^\)]+\)/g, s = /-?[^,\s-]+/g, t = "position:absolute;left:0;top:0;width:1px;height:1px;behavior:url(#default#VML)", u = 21600, v = { path: 1, rect: 1, image: 1 }, w = { circle: 1, ellipse: 1 }, x = function (a) { var d = /[ahqstv]/gi, e = c._pathToAbsolute; if (b(a).match(d) && (e = c._path2curve), d = /[clmz]/g, e == c._pathToAbsolute && !b(a).match(d)) { var g = b(a).replace(q, function (a, b, c) { var d = [], e = "m" == b.toLowerCase(), g = p[b]; return c.replace(s, function (a) { e && 2 == d.length && (g += d + p["m" == b ? "l" : "L"], d = []), d.push(f(a * u)) }), g + d }); return g } var h, i, j = e(a); g = []; for (var k = 0, l = j.length; l > k; k++) { h = j[k], i = j[k][0].toLowerCase(), "z" == i && (i = "x"); for (var m = 1, r = h.length; r > m; m++)i += f(h[m] * u) + (m != r - 1 ? "," : o); g.push(i) } return g.join(n) }, y = function (a, b, d) { var e = c.matrix(); return e.rotate(-a, .5, .5), { dx: e.x(b, d), dy: e.y(b, d) } }, z = function (a, b, c, d, e, f) { var g = a._, h = a.matrix, k = g.fillpos, l = a.node, m = l.style, o = 1, p = "", q = u / b, r = u / c; if (m.visibility = "hidden", b && c) { if (l.coordsize = i(q) + n + i(r), m.rotation = f * (0 > b * c ? -1 : 1), f) { var s = y(f, d, e); d = s.dx, e = s.dy } if (0 > b && (p += "x"), 0 > c && (p += " y") && (o = -1), m.flip = p, l.coordorigin = d * -q + n + e * -r, k || g.fillsize) { var t = l.getElementsByTagName(j); t = t && t[0], l.removeChild(t), k && (s = y(f, h.x(k[0], k[1]), h.y(k[0], k[1])), t.position = s.dx * o + n + s.dy * o), g.fillsize && (t.size = g.fillsize[0] * i(b) + n + g.fillsize[1] * i(c)), l.appendChild(t) } m.visibility = "visible" } }; c.toString = function () { return "Your browser doesn’t support SVG. Falling down to VML.\nYou are running Raphaël " + this.version }; var A = function (a, c, d) { for (var e = b(c).toLowerCase().split("-"), f = d ? "end" : "start", g = e.length, h = "classic", i = "medium", j = "medium"; g--;)switch (e[g]) { case "block": case "classic": case "oval": case "diamond": case "open": case "none": h = e[g]; break; case "wide": case "narrow": j = e[g]; break; case "long": case "short": i = e[g] }var k = a.node.getElementsByTagName("stroke")[0]; k[f + "arrow"] = h, k[f + "arrowlength"] = i, k[f + "arrowwidth"] = j }, B = function (e, i) { e.attrs = e.attrs || {}; var l = e.node, m = e.attrs, p = l.style, q = v[e.type] && (i.x != m.x || i.y != m.y || i.width != m.width || i.height != m.height || i.cx != m.cx || i.cy != m.cy || i.rx != m.rx || i.ry != m.ry || i.r != m.r), r = w[e.type] && (m.cx != i.cx || m.cy != i.cy || m.r != i.r || m.rx != i.rx || m.ry != i.ry), s = e; for (var t in i) i[a](t) && (m[t] = i[t]); if (q && (m.path = c._getPath[e.type](e), e._.dirty = 1), i.href && (l.href = i.href), i.title && (l.title = i.title), i.target && (l.target = i.target), i.cursor && (p.cursor = i.cursor), "blur" in i && e.blur(i.blur), (i.path && "path" == e.type || q) && (l.path = x(~b(m.path).toLowerCase().indexOf("r") ? c._pathToAbsolute(m.path) : m.path), e._.dirty = 1, "image" == e.type && (e._.fillpos = [m.x, m.y], e._.fillsize = [m.width, m.height], z(e, 1, 1, 0, 0, 0))), "transform" in i && e.transform(i.transform), r) { var y = +m.cx, B = +m.cy, D = +m.rx || +m.r || 0, E = +m.ry || +m.r || 0; l.path = c.format("ar{0},{1},{2},{3},{4},{1},{4},{1}x", f((y - D) * u), f((B - E) * u), f((y + D) * u), f((B + E) * u), f(y * u)), e._.dirty = 1 } if ("clip-rect" in i) { var G = b(i["clip-rect"]).split(k); if (4 == G.length) { G[2] = +G[2] + +G[0], G[3] = +G[3] + +G[1]; var H = l.clipRect || c._g.doc.createElement("div"), I = H.style; I.clip = c.format("rect({1}px {2}px {3}px {0}px)", G), l.clipRect || (I.position = "absolute", I.top = 0, I.left = 0, I.width = e.paper.width + "px", I.height = e.paper.height + "px", l.parentNode.insertBefore(H, l), H.appendChild(l), l.clipRect = H) } i["clip-rect"] || l.clipRect && (l.clipRect.style.clip = "auto") } if (e.textpath) { var J = e.textpath.style; i.font && (J.font = i.font), i["font-family"] && (J.fontFamily = '"' + i["font-family"].split(",")[0].replace(/^['"]+|['"]+$/g, o) + '"'), i["font-size"] && (J.fontSize = i["font-size"]), i["font-weight"] && (J.fontWeight = i["font-weight"]), i["font-style"] && (J.fontStyle = i["font-style"]) } if ("arrow-start" in i && A(s, i["arrow-start"]), "arrow-end" in i && A(s, i["arrow-end"], 1), null != i.opacity || null != i["stroke-width"] || null != i.fill || null != i.src || null != i.stroke || null != i["stroke-width"] || null != i["stroke-opacity"] || null != i["fill-opacity"] || null != i["stroke-dasharray"] || null != i["stroke-miterlimit"] || null != i["stroke-linejoin"] || null != i["stroke-linecap"]) { var K = l.getElementsByTagName(j), L = !1; if (K = K && K[0], !K && (L = K = F(j)), "image" == e.type && i.src && (K.src = i.src), i.fill && (K.on = !0), (null == K.on || "none" == i.fill || null === i.fill) && (K.on = !1), K.on && i.fill) { var M = b(i.fill).match(c._ISURL); if (M) { K.parentNode == l && l.removeChild(K), K.rotate = !0, K.src = M[1], K.type = "tile"; var N = e.getBBox(1); K.position = N.x + n + N.y, e._.fillpos = [N.x, N.y], c._preload(M[1], function () { e._.fillsize = [this.offsetWidth, this.offsetHeight] }) } else K.color = c.getRGB(i.fill).hex, K.src = o, K.type = "solid", c.getRGB(i.fill).error && (s.type in { circle: 1, ellipse: 1 } || "r" != b(i.fill).charAt()) && C(s, i.fill, K) && (m.fill = "none", m.gradient = i.fill, K.rotate = !1) } if ("fill-opacity" in i || "opacity" in i) { var O = ((+m["fill-opacity"] + 1 || 2) - 1) * ((+m.opacity + 1 || 2) - 1) * ((+c.getRGB(i.fill).o + 1 || 2) - 1); O = h(g(O, 0), 1), K.opacity = O, K.src && (K.color = "none") } l.appendChild(K); var P = l.getElementsByTagName("stroke") && l.getElementsByTagName("stroke")[0], Q = !1; !P && (Q = P = F("stroke")), (i.stroke && "none" != i.stroke || i["stroke-width"] || null != i["stroke-opacity"] || i["stroke-dasharray"] || i["stroke-miterlimit"] || i["stroke-linejoin"] || i["stroke-linecap"]) && (P.on = !0), ("none" == i.stroke || null === i.stroke || null == P.on || 0 == i.stroke || 0 == i["stroke-width"]) && (P.on = !1); var R = c.getRGB(i.stroke); P.on && i.stroke && (P.color = R.hex), O = ((+m["stroke-opacity"] + 1 || 2) - 1) * ((+m.opacity + 1 || 2) - 1) * ((+R.o + 1 || 2) - 1); var S = .75 * (d(i["stroke-width"]) || 1); if (O = h(g(O, 0), 1), null == i["stroke-width"] && (S = m["stroke-width"]), i["stroke-width"] && (P.weight = S), S && 1 > S && (O *= S) && (P.weight = 1), P.opacity = O, i["stroke-linejoin"] && (P.joinstyle = i["stroke-linejoin"] || "miter"), P.miterlimit = i["stroke-miterlimit"] || 8, i["stroke-linecap"] && (P.endcap = "butt" == i["stroke-linecap"] ? "flat" : "square" == i["stroke-linecap"] ? "square" : "round"), "stroke-dasharray" in i) { var T = { "-": "shortdash", ".": "shortdot", "-.": "shortdashdot", "-..": "shortdashdotdot", ". ": "dot", "- ": "dash", "--": "longdash", "- .": "dashdot", "--.": "longdashdot", "--..": "longdashdotdot" }; P.dashstyle = T[a](i["stroke-dasharray"]) ? T[i["stroke-dasharray"]] : o } Q && l.appendChild(P) } if ("text" == s.type) { s.paper.canvas.style.display = o; var U = s.paper.span, V = 100, W = m.font && m.font.match(/\d+(?:\.\d*)?(?=px)/); p = U.style, m.font && (p.font = m.font), m["font-family"] && (p.fontFamily = m["font-family"]), m["font-weight"] && (p.fontWeight = m["font-weight"]), m["font-style"] && (p.fontStyle = m["font-style"]), W = d(m["font-size"] || W && W[0]) || 10, p.fontSize = W * V + "px", s.textpath.string && (U.innerHTML = b(s.textpath.string).replace(/</g, "&#60;").replace(/&/g, "&#38;").replace(/\n/g, "<br>")); var X = U.getBoundingClientRect(); s.W = m.w = (X.right - X.left) / V, s.H = m.h = (X.bottom - X.top) / V, s.X = m.x, s.Y = m.y + s.H / 2, ("x" in i || "y" in i) && (s.path.v = c.format("m{0},{1}l{2},{1}", f(m.x * u), f(m.y * u), f(m.x * u) + 1)); for (var Y = ["x", "y", "text", "font", "font-family", "font-weight", "font-style", "font-size"], Z = 0, $ = Y.length; $ > Z; Z++)if (Y[Z] in i) { s._.dirty = 1; break } switch (m["text-anchor"]) { case "start": s.textpath.style["v-text-align"] = "left", s.bbx = s.W / 2; break; case "end": s.textpath.style["v-text-align"] = "right", s.bbx = -s.W / 2; break; default: s.textpath.style["v-text-align"] = "center", s.bbx = 0 }s.textpath.style["v-text-kern"] = !0 } }, C = function (a, f, g) { a.attrs = a.attrs || {}; var h = (a.attrs, Math.pow), i = "linear", j = ".5 .5"; if (a.attrs.gradient = f, f = b(f).replace(c._radial_gradient, function (a, b, c) { return i = "radial", b && c && (b = d(b), c = d(c), h(b - .5, 2) + h(c - .5, 2) > .25 && (c = e.sqrt(.25 - h(b - .5, 2)) * (2 * (c > .5) - 1) + .5), j = b + n + c), o }), f = f.split(/\s*\-\s*/), "linear" == i) { var k = f.shift(); if (k = -d(k), isNaN(k)) return null } var l = c._parseDots(f); if (!l) return null; if (a = a.shape || a.node, l.length) { a.removeChild(g), g.on = !0, g.method = "none", g.color = l[0].color, g.color2 = l[l.length - 1].color; for (var m = [], p = 0, q = l.length; q > p; p++)l[p].offset && m.push(l[p].offset + n + l[p].color); g.colors = m.length ? m.join() : "0% " + g.color, "radial" == i ? (g.type = "gradientTitle", g.focus = "100%", g.focussize = "0 0", g.focusposition = j, g.angle = 0) : (g.type = "gradient", g.angle = (270 - k) % 360), a.appendChild(g) } return 1 }, D = function (a, b) { this[0] = this.node = a, a.raphael = !0, this.id = c._oid++, a.raphaelid = this.id, this.X = 0, this.Y = 0, this.attrs = {}, this.paper = b, this.matrix = c.matrix(), this._ = { transform: [], sx: 1, sy: 1, dx: 0, dy: 0, deg: 0, dirty: 1, dirtyT: 1 }, !b.bottom && (b.bottom = this), this.prev = b.top, b.top && (b.top.next = this), b.top = this, this.next = null }, E = c.el; D.prototype = E, E.constructor = D, E.transform = function (a) { if (null == a) return this._.transform; var d, e = this.paper._viewBoxShift, f = e ? "s" + [e.scale, e.scale] + "-1-1t" + [e.dx, e.dy] : o; e && (d = a = b(a).replace(/\.{3}|\u2026/g, this._.transform || o)), c._extractTransform(this, f + a); var g, h = this.matrix.clone(), i = this.skew, j = this.node, k = ~b(this.attrs.fill).indexOf("-"), l = !b(this.attrs.fill).indexOf("url("); if (h.translate(1, 1), l || k || "image" == this.type) if (i.matrix = "1 0 0 1", i.offset = "0 0", g = h.split(), k && g.noRotation || !g.isSimple) { j.style.filter = h.toFilter(); var m = this.getBBox(), p = this.getBBox(1), q = m.x - p.x, r = m.y - p.y; j.coordorigin = q * -u + n + r * -u, z(this, 1, 1, q, r, 0) } else j.style.filter = o, z(this, g.scalex, g.scaley, g.dx, g.dy, g.rotate); else j.style.filter = o, i.matrix = b(h), i.offset = h.offset(); return null !== d && (this._.transform = d, c._extractTransform(this, d)), this }, E.rotate = function (a, c, e) { if (this.removed) return this; if (null != a) { if (a = b(a).split(k), a.length - 1 && (c = d(a[1]), e = d(a[2])), a = d(a[0]), null == e && (c = e), null == c || null == e) { var f = this.getBBox(1); c = f.x + f.width / 2, e = f.y + f.height / 2 } return this._.dirtyT = 1, this.transform(this._.transform.concat([["r", a, c, e]])), this } }, E.translate = function (a, c) { return this.removed ? this : (a = b(a).split(k), a.length - 1 && (c = d(a[1])), a = d(a[0]) || 0, c = +c || 0, this._.bbox && (this._.bbox.x += a, this._.bbox.y += c), this.transform(this._.transform.concat([["t", a, c]])), this) }, E.scale = function (a, c, e, f) { if (this.removed) return this; if (a = b(a).split(k), a.length - 1 && (c = d(a[1]), e = d(a[2]), f = d(a[3]), isNaN(e) && (e = null), isNaN(f) && (f = null)), a = d(a[0]), null == c && (c = a), null == f && (e = f), null == e || null == f) var g = this.getBBox(1); return e = null == e ? g.x + g.width / 2 : e, f = null == f ? g.y + g.height / 2 : f, this.transform(this._.transform.concat([["s", a, c, e, f]])), this._.dirtyT = 1, this }, E.hide = function () { return !this.removed && (this.node.style.display = "none"), this }, E.show = function () { return !this.removed && (this.node.style.display = o), this }, E.auxGetBBox = c.el.getBBox, E.getBBox = function () { var a = this.auxGetBBox(); if (this.paper && this.paper._viewBoxShift) { var b = {}, c = 1 / this.paper._viewBoxShift.scale; return b.x = a.x - this.paper._viewBoxShift.dx, b.x *= c, b.y = a.y - this.paper._viewBoxShift.dy, b.y *= c, b.width = a.width * c, b.height = a.height * c, b.x2 = b.x + b.width, b.y2 = b.y + b.height, b } return a }, E._getBBox = function () { return this.removed ? {} : { x: this.X + (this.bbx || 0) - this.W / 2, y: this.Y - this.H, width: this.W, height: this.H } }, E.remove = function () { if (!this.removed && this.node.parentNode) { this.paper.__set__ && this.paper.__set__.exclude(this), c.eve.unbind("raphael.*.*." + this.id), c._tear(this, this.paper), this.node.parentNode.removeChild(this.node), this.shape && this.shape.parentNode.removeChild(this.shape); for (var a in this) this[a] = "function" == typeof this[a] ? c._removedFactory(a) : null; this.removed = !0 } }, E.attr = function (b, d) { if (this.removed) return this; if (null == b) { var e = {}; for (var f in this.attrs) this.attrs[a](f) && (e[f] = this.attrs[f]); return e.gradient && "none" == e.fill && (e.fill = e.gradient) && delete e.gradient, e.transform = this._.transform, e } if (null == d && c.is(b, "string")) { if (b == j && "none" == this.attrs.fill && this.attrs.gradient) return this.attrs.gradient; for (var g = b.split(k), h = {}, i = 0, m = g.length; m > i; i++)b = g[i], h[b] = b in this.attrs ? this.attrs[b] : c.is(this.paper.customAttributes[b], "function") ? this.paper.customAttributes[b].def : c._availableAttrs[b]; return m - 1 ? h : h[g[0]] } if (this.attrs && null == d && c.is(b, "array")) { for (h = {}, i = 0, m = b.length; m > i; i++)h[b[i]] = this.attr(b[i]); return h } var n; null != d && (n = {}, n[b] = d), null == d && c.is(b, "object") && (n = b); for (var o in n) l("raphael.attr." + o + "." + this.id, this, n[o]); if (n) { for (o in this.paper.customAttributes) if (this.paper.customAttributes[a](o) && n[a](o) && c.is(this.paper.customAttributes[o], "function")) { var p = this.paper.customAttributes[o].apply(this, [].concat(n[o])); this.attrs[o] = n[o]; for (var q in p) p[a](q) && (n[q] = p[q]) } n.text && "text" == this.type && (this.textpath.string = n.text), B(this, n) } return this }, E.toFront = function () { return !this.removed && this.node.parentNode.appendChild(this.node), this.paper && this.paper.top != this && c._tofront(this, this.paper), this }, E.toBack = function () { return this.removed ? this : (this.node.parentNode.firstChild != this.node && (this.node.parentNode.insertBefore(this.node, this.node.parentNode.firstChild), c._toback(this, this.paper)), this) }, E.insertAfter = function (a) { return this.removed ? this : (a.constructor == c.st.constructor && (a = a[a.length - 1]), a.node.nextSibling ? a.node.parentNode.insertBefore(this.node, a.node.nextSibling) : a.node.parentNode.appendChild(this.node), c._insertafter(this, a, this.paper), this) }, E.insertBefore = function (a) { return this.removed ? this : (a.constructor == c.st.constructor && (a = a[0]), a.node.parentNode.insertBefore(this.node, a.node), c._insertbefore(this, a, this.paper), this) }, E.blur = function (a) { var b = this.node.runtimeStyle, d = b.filter; return d = d.replace(r, o), 0 !== +a ? (this.attrs.blur = a, b.filter = d + n + m + ".Blur(pixelradius=" + (+a || 1.5) + ")", b.margin = c.format("-{0}px 0 0 -{0}px", f(+a || 1.5))) : (b.filter = d, b.margin = 0, delete this.attrs.blur), this }, c._engine.path = function (a, b) { var c = F("shape"); c.style.cssText = t, c.coordsize = u + n + u, c.coordorigin = b.coordorigin; var d = new D(c, b), e = { fill: "none", stroke: "#000" }; a && (e.path = a), d.type = "path", d.path = [], d.Path = o, B(d, e), b.canvas.appendChild(c); var f = F("skew"); return f.on = !0, c.appendChild(f), d.skew = f, d.transform(o), d }, c._engine.rect = function (a, b, d, e, f, g) { var h = c._rectPath(b, d, e, f, g), i = a.path(h), j = i.attrs; return i.X = j.x = b, i.Y = j.y = d, i.W = j.width = e, i.H = j.height = f, j.r = g, j.path = h, i.type = "rect", i }, c._engine.ellipse = function (a, b, c, d, e) { { var f = a.path(); f.attrs } return f.X = b - d, f.Y = c - e, f.W = 2 * d, f.H = 2 * e, f.type = "ellipse", B(f, { cx: b, cy: c, rx: d, ry: e }), f }, c._engine.circle = function (a, b, c, d) { { var e = a.path(); e.attrs } return e.X = b - d, e.Y = c - d, e.W = e.H = 2 * d, e.type = "circle", B(e, { cx: b, cy: c, r: d }), e }, c._engine.image = function (a, b, d, e, f, g) { var h = c._rectPath(d, e, f, g), i = a.path(h).attr({ stroke: "none" }), k = i.attrs, l = i.node, m = l.getElementsByTagName(j)[0]; return k.src = b, i.X = k.x = d, i.Y = k.y = e, i.W = k.width = f, i.H = k.height = g, k.path = h, i.type = "image", m.parentNode == l && l.removeChild(m), m.rotate = !0, m.src = b, m.type = "tile", i._.fillpos = [d, e], i._.fillsize = [f, g], l.appendChild(m), z(i, 1, 1, 0, 0, 0), i }, c._engine.text = function (a, d, e, g) { var h = F("shape"), i = F("path"), j = F("textpath"); d = d || 0, e = e || 0, g = g || "", i.v = c.format("m{0},{1}l{2},{1}", f(d * u), f(e * u), f(d * u) + 1), i.textpathok = !0, j.string = b(g), j.on = !0, h.style.cssText = t, h.coordsize = u + n + u, h.coordorigin = "0 0"; var k = new D(h, a), l = { fill: "#000", stroke: "none", font: c._availableAttrs.font, text: g }; k.shape = h, k.path = i, k.textpath = j, k.type = "text", k.attrs.text = b(g), k.attrs.x = d, k.attrs.y = e, k.attrs.w = 1, k.attrs.h = 1, B(k, l), h.appendChild(j), h.appendChild(i), a.canvas.appendChild(h); var m = F("skew"); return m.on = !0, h.appendChild(m), k.skew = m, k.transform(o), k }, c._engine.setSize = function (a, b) { var d = this.canvas.style; return this.width = a, this.height = b, a == +a && (a += "px"), b == +b && (b += "px"), d.width = a, d.height = b, d.clip = "rect(0 " + a + " " + b + " 0)", this._viewBox && c._engine.setViewBox.apply(this, this._viewBox), this }, c._engine.setViewBox = function (a, b, d, e, f) { c.eve("raphael.setViewBox", this, this._viewBox, [a, b, d, e, f]); var g, h, i = this.getSize(), j = i.width, k = i.height; return f && (g = k / e, h = j / d, j > d * g && (a -= (j - d * g) / 2 / g), k > e * h && (b -= (k - e * h) / 2 / h)), this._viewBox = [a, b, d, e, !!f], this._viewBoxShift = { dx: -a, dy: -b, scale: size }, this.forEach(function (a) { a.transform("...") }), this }; var F; c._engine.initWin = function (a) { var b = a.document; b.styleSheets.length < 31 ? b.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)") : b.styleSheets[0].addRule(".rvml", "behavior:url(#default#VML)"); try { !b.namespaces.rvml && b.namespaces.add("rvml", "urn:schemas-microsoft-com:vml"), F = function (a) { return b.createElement("<rvml:" + a + ' class="rvml">') } } catch (c) { F = function (a) { return b.createElement("<" + a + ' xmlns="urn:schemas-microsoft.com:vml" class="rvml">') } } }, c._engine.initWin(c._g.win), c._engine.create = function () { var a = c._getContainer.apply(0, arguments), b = a.container, d = a.height, e = a.width, f = a.x, g = a.y; if (!b) throw new Error("VML container not found."); var h = new c._Paper, i = h.canvas = c._g.doc.createElement("div"), j = i.style; return f = f || 0, g = g || 0, e = e || 512, d = d || 342, h.width = e, h.height = d, e == +e && (e += "px"), d == +d && (d += "px"), h.coordsize = 1e3 * u + n + 1e3 * u, h.coordorigin = "0 0", h.span = c._g.doc.createElement("span"), h.span.style.cssText = "position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;", i.appendChild(h.span), j.cssText = c.format("top:0;left:0;width:{0};height:{1};display:inline-block;position:relative;clip:rect(0 {0} {1} 0);overflow:hidden", e, d), 1 == b ? (c._g.doc.body.appendChild(i), j.left = f + "px", j.top = g + "px", j.position = "absolute") : b.firstChild ? b.insertBefore(i, b.firstChild) : b.appendChild(i), h.renderfix = function () { }, h }, c.prototype.clear = function () { c.eve("raphael.clear", this), this.canvas.innerHTML = o, this.span = c._g.doc.createElement("span"), this.span.style.cssText = "position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;", this.canvas.appendChild(this.span), this.bottom = this.top = null }, c.prototype.remove = function () { c.eve("raphael.remove", this), this.canvas.parentNode.removeChild(this.canvas); for (var a in this) this[a] = "function" == typeof this[a] ? c._removedFactory(a) : null; return !0 }; var G = c.st; for (var H in E) E[a](H) && !G[a](H) && (G[H] = function (a) { return function () { var b = arguments; return this.forEach(function (c) { c[a].apply(c, b) }) } }(H)) } }(), B.was ? A.win.Raphael = c : Raphael = c, "object" == typeof exports && (module.exports = c), c
+});
 
 /** js sequence diagrams 1.0.4
  *  http://bramp.github.io/js-sequence-diagrams/
  *  (c) 2012-2013 Andrew Brampton (bramp.net)
  *  @license Simplified BSD license.
  */
-!function(){"use strict";function Diagram(){this.title=void 0,this.actors=[],this.signals=[]}function ParseError(message,hash){_.extend(this,hash),this.name="ParseError",this.message=message||""}Diagram.prototype.getActor=function(alias){var s=/^(.+) as (\S+)$/i.exec(alias.trim());s?(name=s[1].trim(),alias=s[2].trim()):name=alias.trim(),name=name.replace(/\\n/gm,"\n");var i,actors=this.actors;for(i in actors)if(actors[i].alias==alias)return actors[i];return i=actors.push(new Diagram.Actor(alias,name,actors.length)),actors[i-1]},Diagram.prototype.setTitle=function(title){this.title=title},Diagram.prototype.addSignal=function(signal){this.signals.push(signal)},Diagram.Actor=function(alias,name,index){this.alias=alias,this.name=name,this.index=index},Diagram.Signal=function(actorA,signaltype,actorB,message){this.type="Signal",this.actorA=actorA,this.actorB=actorB,this.linetype=3&signaltype,this.arrowtype=3&signaltype>>2,this.message=message},Diagram.Signal.prototype.isSelf=function(){return this.actorA.index==this.actorB.index},Diagram.Note=function(actor,placement,message){if(this.type="Note",this.actor=actor,this.placement=placement,this.message=message,this.hasManyActors()&&actor[0]==actor[1])throw new Error("Note should be over two different actors")},Diagram.Note.prototype.hasManyActors=function(){return _.isArray(this.actor)},Diagram.LINETYPE={SOLID:0,DOTTED:1},Diagram.ARROWTYPE={FILLED:0,OPEN:1},Diagram.PLACEMENT={LEFTOF:0,RIGHTOF:1,OVER:2};var grammar=function(){function Parser(){this.yy={}}var parser={trace:function(){},yy:{},symbols_:{error:2,start:3,document:4,EOF:5,line:6,statement:7,NL:8,participant:9,actor:10,signal:11,note_statement:12,title:13,message:14,note:15,placement:16,over:17,actor_pair:18,",":19,left_of:20,right_of:21,signaltype:22,ACTOR:23,linetype:24,arrowtype:25,LINE:26,DOTLINE:27,ARROW:28,OPENARROW:29,MESSAGE:30,$accept:0,$end:1},terminals_:{2:"error",5:"EOF",8:"NL",9:"participant",13:"title",15:"note",17:"over",19:",",20:"left_of",21:"right_of",23:"ACTOR",26:"LINE",27:"DOTLINE",28:"ARROW",29:"OPENARROW",30:"MESSAGE"},productions_:[0,[3,2],[4,0],[4,2],[6,1],[6,1],[7,2],[7,1],[7,1],[7,2],[12,4],[12,4],[18,1],[18,3],[16,1],[16,1],[11,4],[10,1],[22,2],[22,1],[24,1],[24,1],[25,1],[25,1],[14,1]],performAction:function(yytext,yyleng,yylineno,yy,yystate,$$){var $0=$$.length-1;switch(yystate){case 1:return yy;case 4:break;case 6:$$[$0];break;case 7:yy.addSignal($$[$0]);break;case 8:yy.addSignal($$[$0]);break;case 9:yy.setTitle($$[$0]);break;case 10:this.$=new Diagram.Note($$[$0-1],$$[$0-2],$$[$0]);break;case 11:this.$=new Diagram.Note($$[$0-1],Diagram.PLACEMENT.OVER,$$[$0]);break;case 12:this.$=$$[$0];break;case 13:this.$=[$$[$0-2],$$[$0]];break;case 14:this.$=Diagram.PLACEMENT.LEFTOF;break;case 15:this.$=Diagram.PLACEMENT.RIGHTOF;break;case 16:this.$=new Diagram.Signal($$[$0-3],$$[$0-2],$$[$0-1],$$[$0]);break;case 17:this.$=yy.getActor($$[$0]);break;case 18:this.$=$$[$0-1]|$$[$0]<<2;break;case 19:this.$=$$[$0];break;case 20:this.$=Diagram.LINETYPE.SOLID;break;case 21:this.$=Diagram.LINETYPE.DOTTED;break;case 22:this.$=Diagram.ARROWTYPE.FILLED;break;case 23:this.$=Diagram.ARROWTYPE.OPEN;break;case 24:this.$=$$[$0].substring(1).trim().replace(/\\n/gm,"\n")}},table:[{3:1,4:2,5:[2,2],8:[2,2],9:[2,2],13:[2,2],15:[2,2],23:[2,2]},{1:[3]},{5:[1,3],6:4,7:5,8:[1,6],9:[1,7],10:11,11:8,12:9,13:[1,10],15:[1,12],23:[1,13]},{1:[2,1]},{5:[2,3],8:[2,3],9:[2,3],13:[2,3],15:[2,3],23:[2,3]},{5:[2,4],8:[2,4],9:[2,4],13:[2,4],15:[2,4],23:[2,4]},{5:[2,5],8:[2,5],9:[2,5],13:[2,5],15:[2,5],23:[2,5]},{10:14,23:[1,13]},{5:[2,7],8:[2,7],9:[2,7],13:[2,7],15:[2,7],23:[2,7]},{5:[2,8],8:[2,8],9:[2,8],13:[2,8],15:[2,8],23:[2,8]},{14:15,30:[1,16]},{22:17,24:18,26:[1,19],27:[1,20]},{16:21,17:[1,22],20:[1,23],21:[1,24]},{5:[2,17],8:[2,17],9:[2,17],13:[2,17],15:[2,17],19:[2,17],23:[2,17],26:[2,17],27:[2,17],30:[2,17]},{5:[2,6],8:[2,6],9:[2,6],13:[2,6],15:[2,6],23:[2,6]},{5:[2,9],8:[2,9],9:[2,9],13:[2,9],15:[2,9],23:[2,9]},{5:[2,24],8:[2,24],9:[2,24],13:[2,24],15:[2,24],23:[2,24]},{10:25,23:[1,13]},{23:[2,19],25:26,28:[1,27],29:[1,28]},{23:[2,20],28:[2,20],29:[2,20]},{23:[2,21],28:[2,21],29:[2,21]},{10:29,23:[1,13]},{10:31,18:30,23:[1,13]},{23:[2,14]},{23:[2,15]},{14:32,30:[1,16]},{23:[2,18]},{23:[2,22]},{23:[2,23]},{14:33,30:[1,16]},{14:34,30:[1,16]},{19:[1,35],30:[2,12]},{5:[2,16],8:[2,16],9:[2,16],13:[2,16],15:[2,16],23:[2,16]},{5:[2,10],8:[2,10],9:[2,10],13:[2,10],15:[2,10],23:[2,10]},{5:[2,11],8:[2,11],9:[2,11],13:[2,11],15:[2,11],23:[2,11]},{10:36,23:[1,13]},{30:[2,13]}],defaultActions:{3:[2,1],23:[2,14],24:[2,15],26:[2,18],27:[2,22],28:[2,23],36:[2,13]},parseError:function(str,hash){if(!hash.recoverable)throw new Error(str);this.trace(str)},parse:function(input){function lex(){var token;return token=self.lexer.lex()||EOF,"number"!=typeof token&&(token=self.symbols_[token]||token),token}var self=this,stack=[0],vstack=[null],lstack=[],table=this.table,yytext="",yylineno=0,yyleng=0,recovering=0,TERROR=2,EOF=1;this.lexer.setInput(input),this.lexer.yy=this.yy,this.yy.lexer=this.lexer,this.yy.parser=this,"undefined"==typeof this.lexer.yylloc&&(this.lexer.yylloc={});var yyloc=this.lexer.yylloc;lstack.push(yyloc);var ranges=this.lexer.options&&this.lexer.options.ranges;this.parseError="function"==typeof this.yy.parseError?this.yy.parseError:Object.getPrototypeOf(this).parseError;for(var symbol,preErrorSymbol,state,action,r,p,len,newState,expected,yyval={};;){if(state=stack[stack.length-1],this.defaultActions[state]?action=this.defaultActions[state]:((null===symbol||"undefined"==typeof symbol)&&(symbol=lex()),action=table[state]&&table[state][symbol]),"undefined"==typeof action||!action.length||!action[0]){var errStr="";expected=[];for(p in table[state])this.terminals_[p]&&p>TERROR&&expected.push("'"+this.terminals_[p]+"'");errStr=this.lexer.showPosition?"Parse error on line "+(yylineno+1)+":\n"+this.lexer.showPosition()+"\nExpecting "+expected.join(", ")+", got '"+(this.terminals_[symbol]||symbol)+"'":"Parse error on line "+(yylineno+1)+": Unexpected "+(symbol==EOF?"end of input":"'"+(this.terminals_[symbol]||symbol)+"'"),this.parseError(errStr,{text:this.lexer.match,token:this.terminals_[symbol]||symbol,line:this.lexer.yylineno,loc:yyloc,expected:expected})}if(action[0]instanceof Array&&action.length>1)throw new Error("Parse Error: multiple actions possible at state: "+state+", token: "+symbol);switch(action[0]){case 1:stack.push(symbol),vstack.push(this.lexer.yytext),lstack.push(this.lexer.yylloc),stack.push(action[1]),symbol=null,preErrorSymbol?(symbol=preErrorSymbol,preErrorSymbol=null):(yyleng=this.lexer.yyleng,yytext=this.lexer.yytext,yylineno=this.lexer.yylineno,yyloc=this.lexer.yylloc,recovering>0&&recovering--);break;case 2:if(len=this.productions_[action[1]][1],yyval.$=vstack[vstack.length-len],yyval._$={first_line:lstack[lstack.length-(len||1)].first_line,last_line:lstack[lstack.length-1].last_line,first_column:lstack[lstack.length-(len||1)].first_column,last_column:lstack[lstack.length-1].last_column},ranges&&(yyval._$.range=[lstack[lstack.length-(len||1)].range[0],lstack[lstack.length-1].range[1]]),r=this.performAction.call(yyval,yytext,yyleng,yylineno,this.yy,action[1],vstack,lstack),"undefined"!=typeof r)return r;len&&(stack=stack.slice(0,2*-1*len),vstack=vstack.slice(0,-1*len),lstack=lstack.slice(0,-1*len)),stack.push(this.productions_[action[1]][0]),vstack.push(yyval.$),lstack.push(yyval._$),newState=table[stack[stack.length-2]][stack[stack.length-1]],stack.push(newState);break;case 3:return!0}}return!0}},lexer=function(){var lexer={EOF:1,parseError:function(str,hash){if(!this.yy.parser)throw new Error(str);this.yy.parser.parseError(str,hash)},setInput:function(input){return this._input=input,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},input:function(){var ch=this._input[0];this.yytext+=ch,this.yyleng++,this.offset++,this.match+=ch,this.matched+=ch;var lines=ch.match(/(?:\r\n?|\n).*/g);return lines?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),ch},unput:function(ch){var len=ch.length,lines=ch.split(/(?:\r\n?|\n)/g);this._input=ch+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-len-1),this.offset-=len;var oldLines=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),lines.length-1&&(this.yylineno-=lines.length-1);var r=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:lines?(lines.length===oldLines.length?this.yylloc.first_column:0)+oldLines[oldLines.length-lines.length].length-lines[0].length:this.yylloc.first_column-len},this.options.ranges&&(this.yylloc.range=[r[0],r[0]+this.yyleng-len]),this.yyleng=this.yytext.length,this},more:function(){return this._more=!0,this},reject:function(){return this.options.backtrack_lexer?(this._backtrack=!0,this):this.parseError("Lexical error on line "+(this.yylineno+1)+". You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true).\n"+this.showPosition(),{text:"",token:null,line:this.yylineno})},less:function(n){this.unput(this.match.slice(n))},pastInput:function(){var past=this.matched.substr(0,this.matched.length-this.match.length);return(past.length>20?"...":"")+past.substr(-20).replace(/\n/g,"")},upcomingInput:function(){var next=this.match;return next.length<20&&(next+=this._input.substr(0,20-next.length)),(next.substr(0,20)+(next.length>20?"...":"")).replace(/\n/g,"")},showPosition:function(){var pre=this.pastInput(),c=new Array(pre.length+1).join("-");return pre+this.upcomingInput()+"\n"+c+"^"},test_match:function(match,indexed_rule){var token,lines,backup;if(this.options.backtrack_lexer&&(backup={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(backup.yylloc.range=this.yylloc.range.slice(0))),lines=match[0].match(/(?:\r\n?|\n).*/g),lines&&(this.yylineno+=lines.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:lines?lines[lines.length-1].length-lines[lines.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+match[0].length},this.yytext+=match[0],this.match+=match[0],this.matches=match,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(match[0].length),this.matched+=match[0],token=this.performAction.call(this,this.yy,this,indexed_rule,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),token)return token;if(this._backtrack){for(var k in backup)this[k]=backup[k];return!1}return!1},next:function(){if(this.done)return this.EOF;this._input||(this.done=!0);var token,match,tempMatch,index;this._more||(this.yytext="",this.match="");for(var rules=this._currentRules(),i=0;i<rules.length;i++)if(tempMatch=this._input.match(this.rules[rules[i]]),tempMatch&&(!match||tempMatch[0].length>match[0].length)){if(match=tempMatch,index=i,this.options.backtrack_lexer){if(token=this.test_match(tempMatch,rules[i]),token!==!1)return token;if(this._backtrack){match=!1;continue}return!1}if(!this.options.flex)break}return match?(token=this.test_match(match,rules[index]),token!==!1?token:!1):""===this._input?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+". Unrecognized text.\n"+this.showPosition(),{text:"",token:null,line:this.yylineno})},lex:function(){var r=this.next();return r?r:this.lex()},begin:function(condition){this.conditionStack.push(condition)},popState:function(){var n=this.conditionStack.length-1;return n>0?this.conditionStack.pop():this.conditionStack[0]},_currentRules:function(){return this.conditionStack.length&&this.conditionStack[this.conditionStack.length-1]?this.conditions[this.conditionStack[this.conditionStack.length-1]].rules:this.conditions.INITIAL.rules},topState:function(n){return n=this.conditionStack.length-1-Math.abs(n||0),n>=0?this.conditionStack[n]:"INITIAL"},pushState:function(condition){this.begin(condition)},stateStackSize:function(){return this.conditionStack.length},options:{"case-insensitive":!0},performAction:function(yy,yy_,$avoiding_name_collisions,YY_START){switch($avoiding_name_collisions){case 0:return 8;case 1:break;case 2:break;case 3:return 9;case 4:return 20;case 5:return 21;case 6:return 17;case 7:return 15;case 8:return 13;case 9:return 19;case 10:return 23;case 11:return 27;case 12:return 26;case 13:return 29;case 14:return 28;case 15:return 30;case 16:return 5;case 17:return"INVALID"}},rules:[/^(?:[\n]+)/i,/^(?:\s+)/i,/^(?:#[^\n]*)/i,/^(?:participant\b)/i,/^(?:left of\b)/i,/^(?:right of\b)/i,/^(?:over\b)/i,/^(?:note\b)/i,/^(?:title\b)/i,/^(?:,)/i,/^(?:[^\->:\n,]+)/i,/^(?:--)/i,/^(?:-)/i,/^(?:>>)/i,/^(?:>)/i,/^(?:[^#\n]+)/i,/^(?:$)/i,/^(?:.)/i],conditions:{INITIAL:{rules:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17],inclusive:!0}}};return lexer}();return parser.lexer=lexer,Parser.prototype=parser,parser.Parser=Parser,new Parser}();"undefined"!=typeof require&&"undefined"!=typeof exports&&(exports.parser=grammar,exports.Parser=grammar.Parser,exports.parse=function(){return grammar.parse.apply(grammar,arguments)},exports.main=function(args){args[1]||(console.log("Usage: "+args[0]+" FILE"),process.exit(1));var source=require("fs").readFileSync(require("path").normalize(args[1]),"utf8");return exports.parser.parse(source)},"undefined"!=typeof module&&require.main===module&&exports.main(process.argv.slice(1))),ParseError.prototype=new Error,Diagram.ParseError=ParseError,grammar.parseError=function(message,hash){throw new ParseError(message,hash)},Diagram.parse=function(input){return grammar.yy=new Diagram,grammar.parse(input)},this.Diagram=Diagram}.call(this),"undefined"!=typeof jQuery&&function($){$.fn.sequenceDiagram=function(options){return this.each(function(){var $this=$(this),diagram=Diagram.parse($this.text());$this.html(""),diagram.drawSVG(this,options)})}}(jQuery),Raphael.registerFont({w:209,face:{"font-family":"daniel","font-weight":700,"font-stretch":"normal","units-per-em":"360","panose-1":"2 11 8 0 0 0 0 0 0 0",ascent:"288",descent:"-72","x-height":"7",bbox:"-92.0373 -310.134 632 184.967","underline-thickness":"3.51562","underline-position":"-21.6211","unicode-range":"U+0009-U+F002"},glyphs:{" ":{w:179},"	":{w:179},"!":{d:"66,-306v9,3,18,11,19,24v-18,73,-20,111,-37,194v0,10,2,34,-12,34v-12,0,-18,-9,-18,-28v0,-85,23,-136,38,-214v1,-7,4,-10,10,-10xm25,-30v15,-1,28,34,5,35v-11,-1,-38,-36,-5,-35",w:115},'"':{d:"91,-214v-32,3,-25,-40,-20,-68v3,-16,7,-25,12,-27v35,13,14,56,8,95xm8,-231v4,-31,1,-40,18,-75v37,7,11,51,11,79v-3,3,-4,8,-5,13v-17,4,-16,-10,-24,-17",w:117},"#":{d:"271,-64v-30,26,-96,-7,-102,51v-6,2,-13,2,-24,-2v-2,-11,10,-21,2,-28v-14,5,-48,0,-48,22v0,23,-11,14,-29,10v-7,-6,6,-19,-1,-24r-32,4v-19,-8,-15,-24,5,-28r33,-6v4,0,24,-23,11,-27v-26,0,-63,14,-74,-10v3,-1,9,-17,16,-10v15,-8,81,4,89,-30v8,-14,16,-34,24,-38v23,9,24,38,5,49v37,24,55,-38,72,-43v19,10,20,23,-1,45v2,8,23,1,29,4v3,3,6,6,10,11v-14,13,-20,12,-45,12v-17,0,-16,17,-19,29v18,-7,49,3,67,-2v4,0,8,4,12,11xm161,-104v-30,-1,-44,10,-44,37v14,1,24,0,40,-5v0,-1,3,-10,8,-26v0,-4,-1,-6,-4,-6",w:285},$:{d:"164,-257v29,4,1,42,-3,50v5,5,38,13,41,24v8,4,6,15,-2,21v-18,3,-36,-17,-49,-17v-17,1,-31,40,-28,48v5,4,8,8,9,10v13,1,35,37,28,44v-10,21,-36,20,-65,28v-10,10,-12,40,-17,51v-9,-3,-28,1,-18,-17v0,-13,5,-24,-1,-35v-18,1,-59,-10,-42,-29v21,0,56,16,55,-16v5,-4,9,-18,9,-26v-14,-15,-55,-41,-53,-65v2,-33,56,-19,98,-26v10,-14,31,-43,38,-45xm93,-152v11,-10,15,-15,14,-29v-17,-3,-37,1,-43,6v10,12,20,19,29,23xm111,-103v-8,1,-11,12,-10,22v10,0,28,2,27,-8v0,-4,-13,-15,-17,-14",w:225},"%":{d:"181,-96v24,-7,67,-13,104,1v14,18,21,19,22,44v-13,43,-99,61,-146,36v-9,-9,-22,-11,-32,-29v0,-27,24,-53,52,-52xm139,-185v-9,68,-138,73,-131,-5v0,-3,3,-9,9,-17v13,1,27,1,17,-16v5,-39,63,0,93,-6v36,1,80,-9,102,11v15,32,12,32,-8,56v-16,21,-103,78,-152,125r-14,28v-23,11,-25,-7,-29,-20v34,-71,133,-98,171,-162v-13,-12,-52,-5,-61,1v0,1,1,3,3,5xm38,-190v0,34,55,29,70,8v0,-14,-20,-11,-32,-14v-14,-3,-24,-9,-40,-10v1,0,5,11,2,16xm172,-53v12,27,90,18,102,-5v-18,-7,-32,-10,-40,-10v-29,3,-57,-4,-62,15",w:308},"&":{d:"145,-82v17,-8,47,-15,71,-26v13,2,25,12,9,23v-23,7,-40,16,-53,27r0,6v13,8,30,21,36,38v0,8,-4,12,-11,12v-19,0,-43,-39,-59,-44v-30,12,-65,29,-97,32v-32,3,-45,-41,-23,-63v21,-20,52,-26,70,-48v-4,-31,-12,-47,9,-73v13,-16,20,-29,23,-39v15,-15,32,-22,51,-22v30,9,62,64,32,96v-2,3,-47,42,-69,48v-15,8,-11,9,0,22v6,7,10,11,11,11xm114,-138v25,-13,62,-38,74,-62v0,-9,-10,-31,-20,-29v-28,7,-60,42,-60,75v0,10,2,15,6,16xm99,-91v-18,10,-54,18,-59,45v26,5,61,-12,77,-22v-1,-5,-13,-23,-18,-23",w:253},"'":{d:"36,-182v-36,7,-34,-61,-17,-80v15,1,21,19,21,20r-1,-1v0,0,-1,12,-5,35v1,5,3,17,2,26",w:63},"(":{d:"130,-306v13,2,23,43,-1,43v-49,43,-77,77,-90,148v5,49,27,67,64,101v4,14,5,6,2,19r-15,0v-35,-17,-79,-58,-79,-120v0,-58,66,-176,119,-191",w:120},")":{d:"108,-138v-2,73,-48,120,-98,153v-17,-5,-16,-20,-6,-31v52,-64,73,-62,74,-135v1,-42,-40,-98,-58,-128v0,-5,-1,-12,-2,-22v18,-18,25,0,42,27v25,39,50,66,48,136",w:120},"*":{d:"121,-271v15,-5,36,-8,40,9v-5,10,-31,19,-47,31v0,11,34,43,14,53v-18,8,-24,-24,-34,-20v-4,10,-4,19,-12,41v-25,7,-15,-30,-17,-47v-13,-1,-17,9,-46,30r-10,0v-20,-32,37,-43,54,-64v-10,-11,-36,-33,-16,-51v3,0,14,8,33,24v8,-10,26,-39,32,-42v14,7,15,23,9,36",w:177},"+":{d:"163,-64v-7,22,-65,2,-77,21v-2,10,-6,21,-11,35v-20,4,-21,-12,-19,-29v3,-23,-44,6,-39,-27v-8,-22,36,-8,49,-18v8,-13,6,-36,24,-40v19,-4,14,32,11,39v18,3,19,2,54,8v2,1,5,5,8,11",w:170},",":{d:"25,63v-26,21,-48,-2,-22,-24v14,-12,35,-40,35,-69v3,-2,3,-11,12,-9v35,17,5,88,-25,102",w:97},"-":{d:"57,-94v19,4,55,-5,54,17v-15,23,-54,20,-91,15v-4,2,-13,-10,-11,-16v-1,-22,28,-15,48,-16",w:124},".":{d:"40,-48v21,20,21,44,-4,44v-33,0,-26,-24,-10,-44r14,0",w:67},"/":{d:"21,20v-22,-45,21,-95,41,-126v38,-57,115,-158,193,-201v2,0,4,3,7,11v11,29,-15,34,-25,55v-81,56,-189,208,-197,261r-19,0",w:275},0:{d:"78,-237v70,-47,269,-41,270,59v0,34,-11,53,-29,76v-13,35,-30,32,-85,64v-6,2,-10,6,-7,8v-73,14,-98,38,-173,1v-7,-13,-52,-48,-46,-88v9,-57,27,-75,70,-120xm123,-38v100,0,202,-46,195,-153v-32,-55,-144,-73,-211,-35v-16,34,-68,54,-53,108v6,25,1,22,-3,39v6,24,41,41,72,41",w:353},1:{d:"39,-208v0,-14,6,-59,29,-39v3,4,6,13,10,24r-22,128r8,87v-4,6,-9,3,-16,2v-44,-38,-9,-137,-9,-202",w:93},2:{d:"88,-35v47,-10,119,-24,168,-9v0,12,-23,13,-35,16v1,1,3,1,5,1v-74,8,-118,23,-194,23v-14,0,-20,-13,-21,-28v55,-40,83,-61,123,-104v26,-13,65,-67,71,-102v-1,-9,-11,-16,-22,-16v-20,-1,-120,29,-156,49v-10,-2,-30,-20,-10,-28v50,-21,111,-51,178,-48v25,10,44,22,36,39v12,30,-19,64,-34,83v-39,48,-37,39,-115,109v0,5,-3,8,-8,11v4,3,8,4,14,4",w:265},3:{d:"188,-282v34,-10,74,25,47,51v-19,32,-55,50,-92,70v28,14,116,25,108,70v8,14,-49,40,-63,48v-29,9,-130,22,-168,42v-6,-5,-19,-7,-12,-22v56,-36,175,-21,210,-76v-9,-20,-88,-42,-97,-33v-20,-1,-41,2,-56,-7r5,-21v56,-25,103,-36,137,-78v1,-1,2,-5,4,-11v-15,-14,-56,7,-79,0v-10,9,-73,22,-92,31v-11,-4,-28,-23,-13,-30v50,-22,96,-26,154,-37v0,-1,8,3,7,3",w:260},4:{d:"79,-249v-7,17,-29,75,-33,96v0,6,3,8,8,8v43,-2,111,6,141,-6v17,-47,20,-100,63,-148v9,4,16,7,21,10v-17,31,-44,95,-51,141v7,4,24,-4,23,10v-1,16,-29,12,-31,23v-10,22,-9,69,-7,103v-3,2,-7,5,-10,9v-47,-11,-23,-74,-16,-114v0,-4,-2,-6,-7,-6v-65,2,-89,13,-162,4v-22,-22,-2,-53,5,-76v16,-15,17,-57,35,-70v6,-1,21,11,21,16",w:267},5:{d:"185,-272v30,7,45,-8,53,18v1,16,-17,18,-34,14v0,0,-95,-11,-129,1v-6,9,-24,33,-29,54v76,10,171,5,214,47v11,11,22,30,5,52v-14,12,-30,14,-34,27v-26,11,-141,63,-157,60v-16,-2,-25,-19,-4,-27v48,-18,128,-39,170,-86v4,-14,-65,-41,-85,-41r-92,0v-10,-4,-66,-1,-57,-23v0,-23,23,-51,35,-83v11,-28,133,-10,144,-13",w:284},6:{d:"70,-64v9,-51,63,-74,123,-71v43,2,109,3,111,41r-25,47v0,1,1,2,2,3v-5,0,-39,10,-41,20v-15,3,-22,4,-22,11v-39,1,-77,20,-119,13v-42,-7,-35,-9,-77,-46v-56,-118,94,-201,176,-229v7,0,21,8,20,15v-2,17,-23,15,-43,24v-69,31,-119,72,-134,145v-5,25,36,68,78,64v59,-6,128,-18,153,-61v-7,-14,-13,-9,-32,-21v-67,-15,-118,-5,-150,43r0,12v-13,4,-17,-3,-20,-10",w:310},7:{d:"37,-228v33,-14,173,-17,181,-19v28,-1,24,31,9,45v-17,15,-45,49,-59,69v-17,26,-55,67,-61,113v-10,13,-9,14,-14,20v-33,-13,-20,-25,-11,-53v16,-48,73,-115,109,-156v2,-7,5,-14,-10,-12v-26,4,-54,6,-76,13v-23,-5,-83,31,-94,-9v2,-8,18,-19,26,-11",w:245},8:{d:"57,-236v40,-50,166,-51,213,-10v22,28,10,63,-22,78r-35,17v8,5,54,24,53,44v-5,14,-4,33,-18,42v-13,13,-35,18,-44,34v-60,27,-190,49,-194,-42v7,-41,17,-54,59,-70r0,-4v-32,-9,-73,-62,-26,-85v4,0,8,-2,14,-4xm142,-160v24,-2,160,-31,99,-72v-28,-18,-108,-33,-146,-5v-16,12,-28,30,-33,59v24,12,37,20,80,18xm41,-62v30,65,189,6,199,-37v3,-14,-60,-30,-74,-30v-70,0,-118,10,-125,67",w:290},9:{d:"11,-192v15,-49,119,-61,161,-23v16,15,27,55,11,79v-20,62,-51,79,-96,118v-10,4,-45,27,-50,6v9,-15,66,-52,98,-99v-7,-7,-8,-3,-25,0v-49,-11,-96,-25,-99,-81xm145,-131v7,-5,13,-34,13,-41v-2,-51,-104,-38,-114,-6v-2,10,37,35,46,35v23,1,43,-1,55,12",w:198},":":{d:"39,-125v15,-8,40,-1,40,15v0,15,-6,22,-19,22v-13,0,-29,-21,-21,-37xm66,-17v-8,27,-51,19,-46,-8v-1,-6,8,-22,14,-20v29,0,30,6,32,28",w:95},";":{d:"56,-93v2,-30,37,-22,40,2v0,2,-1,7,-3,15v-13,8,-15,6,-27,4xm64,-44v11,-11,30,-4,32,14v-21,39,-63,71,-92,85v-5,0,-11,-2,-18,-8v11,-23,36,-36,50,-61v11,-7,19,-20,28,-30",w:107},"<":{d:"166,-202v12,0,29,15,24,29v0,4,-119,64,-120,73v15,21,89,64,91,86v2,29,-18,12,-30,15v-27,-29,-59,-54,-95,-75v-18,-10,-25,-13,-24,-41",w:176},"=":{d:"125,-121v18,7,55,-9,69,14v0,17,-45,26,-135,26v-18,0,-27,-7,-27,-21v-1,-37,60,-5,93,-19xm138,-71v20,0,48,-1,50,16v-13,24,-86,32,-131,29v-29,-2,-43,-10,-43,-24v-7,-23,36,-14,39,-17v27,6,57,-4,85,-4",w:196},">":{d:"4,-14v20,-48,77,-59,118,-94v-16,-19,-58,-52,-81,-75v-11,-7,-15,-38,-1,-40v33,16,83,71,121,105v26,23,-6,35,-41,53v-29,16,-56,28,-73,54v-21,15,-16,20,-34,15v-3,0,-9,-16,-9,-18",w:174},"?":{d:"105,-291v57,-13,107,-4,107,39v0,67,-136,85,-155,137v-1,6,10,23,-4,23v-23,1,-33,-35,-23,-57v31,-41,124,-60,149,-103v-8,-21,-72,-5,-88,-1v-23,6,-59,39,-71,8v0,0,-1,0,1,-17v10,-4,45,-20,84,-29xm80,-25v-6,4,-8,39,-24,22v-24,3,-22,-21,-13,-35v17,-7,29,5,37,13",w:216},"@":{d:"218,-207v23,8,42,14,47,37v44,68,-27,137,-87,85r1,0v0,2,-59,19,-61,17v-35,0,-42,-47,-17,-68r0,-4v-19,-1,-45,37,-49,40v-37,76,58,72,121,62v11,-2,34,-13,36,3v-14,31,-69,31,-114,33v-51,2,-99,-41,-80,-92v2,-30,22,-40,42,-63v35,-20,91,-53,161,-50xm217,-101v23,0,35,-19,35,-41v0,-43,-75,-41,-102,-19v36,3,55,16,62,41v-6,5,-6,19,5,19xm127,-110v8,5,51,-15,28,-16v-4,0,-25,4,-28,16",w:291},A:{d:"97,-81v-23,-10,-39,38,-52,60v-8,6,-8,6,-22,18v-22,-7,-23,-37,-4,-49v7,-8,11,-15,15,-23r-1,1v-14,-26,23,-29,31,-40v1,-1,15,-29,26,-36v17,-31,39,-58,54,-92v16,-20,20,-51,41,-66v29,5,34,62,45,92v9,64,21,103,49,155v-3,25,-44,11,-54,0v-34,-12,-97,-29,-128,-20xm107,-118v20,6,80,10,111,17v6,-7,-4,-15,-7,-24v-11,-28,-9,-92,-30,-117v-9,9,-19,44,-34,55v-9,23,-27,40,-40,69",w:294},B:{d:"256,-179v41,10,115,34,91,91v-6,3,-14,12,-19,20v-37,19,-50,34,-63,25v-9,10,-12,11,-34,13r3,-3v-4,-4,-12,-4,-18,0v0,0,2,2,5,4v-21,14,-26,6,-44,15v-4,0,-7,-2,-8,-5v-6,11,-20,-5,-18,11v-36,4,-91,35,-114,4v-7,-62,-10,-138,4,-199v-1,-19,-37,2,-37,-27v0,-8,2,-13,6,-15v68,-31,231,-92,311,-39v8,12,12,20,12,25v-8,42,-32,49,-77,80xm79,-160v72,-17,135,-39,184,-70v20,-13,31,-23,31,-27v1,-6,-30,-13,-38,-12v-54,0,-116,13,-186,41v11,21,1,48,9,68xm262,-43v0,-4,3,-6,-4,-5v0,1,1,2,4,5xm211,-140v-34,7,-94,24,-139,15v-6,20,-4,56,-4,82v0,29,43,1,56,2v48,-11,108,-25,154,-48v20,-10,32,-17,32,-25v0,-18,-33,-26,-99,-26xm195,-20v6,1,6,-2,5,-7v-3,2,-7,2,-5,7",w:364},C:{d:"51,-114v-12,75,96,76,166,71r145,-10v9,2,9,5,9,18v-37,18,-85,28,-109,22v-18,10,-47,10,-71,10v-29,0,-68,1,-105,-11v-6,-1,-10,-3,-10,-8v-33,-13,-48,-33,-66,-59v-19,-114,146,-150,224,-177v35,0,88,-31,99,7v-1,29,-49,14,-76,28v-55,8,-115,35,-175,71v-13,8,-23,21,-31,38",w:376},D:{d:"312,-78v-2,1,-3,7,-10,5v6,-3,10,-4,10,-5xm4,-252v2,-27,83,-38,106,-39v130,-7,267,1,291,109v0,0,-2,8,-3,25v-5,9,-4,28,-23,34v-4,4,-2,5,-7,0v-3,3,-15,7,-5,10v0,0,-10,14,-13,2v-11,1,-8,5,-20,14v1,2,7,3,9,1v-4,13,-22,13,-11,4v0,-3,1,-6,-3,-5v-40,29,-103,38,-141,65v10,6,22,-7,34,-3v-41,20,-127,44,-171,46v-21,1,-47,-33,-11,-39v15,-2,43,-6,56,-11v-16,-101,-5,-130,9,-207v2,0,4,-1,6,-3v-16,-17,-91,38,-103,-3xm297,-69v-7,3,-17,8,-25,7v1,1,3,2,5,2v-4,2,-11,5,-23,9v4,-11,30,-21,43,-18xm240,-51v10,0,12,2,0,6r0,-6xm220,-36v-1,-3,4,-6,6,-3v0,1,-2,1,-6,3xm125,-48v16,6,137,-46,155,-53v29,-18,101,-44,82,-93v-21,-53,-84,-61,-168,-67v-20,7,-50,3,-77,8v33,54,-12,132,8,205xm159,-22v-4,-1,-15,-5,-15,2v7,-1,12,-2,15,-2",w:381},E:{d:"45,-219v-19,-36,34,-41,63,-36v44,-10,133,-8,194,-15v3,2,38,11,52,15v-73,19,-171,21,-246,38v-9,11,-16,32,-20,61v35,11,133,-6,183,3v1,6,2,7,3,14v-46,24,-118,16,-193,27v-15,13,-22,52,-22,66v60,1,121,-20,188,-20v22,10,53,-7,74,5v16,29,-23,26,-43,32v-73,4,-139,13,-216,27r-52,-10v-4,-22,23,-69,26,-98v-3,0,-10,-15,-12,-24v20,-12,34,-23,35,-67v2,-1,5,-5,5,-7v0,-4,-14,-11,-19,-11",w:353},F:{d:"270,-258v13,2,59,6,48,34v-78,-3,-143,1,-212,22v-10,16,-21,43,-24,69r145,-9v8,3,29,-3,16,21v-14,-1,-59,13,-60,7v-12,13,-67,18,-108,21v-2,1,-4,3,-7,6v-2,23,-8,43,-7,69v1,28,-30,11,-40,5r10,-80r-26,-14v5,-10,10,-33,28,-25v21,-3,15,-46,26,-59v-1,-3,-32,-13,-28,-24v2,-22,45,-16,59,-30v47,4,99,-14,151,-9v5,-3,25,-3,29,-4",w:236},G:{d:"311,-168v53,0,94,57,74,110v-31,37,-71,34,-136,52v-13,-7,-41,10,-57,7v-73,-1,-122,-17,-162,-59v-49,-51,-24,-80,5,-130v35,-61,138,-93,214,-106v16,4,42,-1,40,21v-5,40,-39,2,-73,21v-76,19,-162,65,-177,142v28,103,237,76,312,29v2,-3,3,-7,3,-13v-10,-35,-37,-43,-87,-45v-16,-13,-53,-9,-78,1v-4,-3,-5,-7,-5,-11v17,-29,73,-17,108,-24v12,4,18,5,19,5",w:391},H:{d:"300,-268v18,12,19,32,4,51v-35,44,-34,140,-46,217v-1,5,-5,13,-11,12v-6,1,-19,-14,-18,-27r7,-106v-28,7,-76,22,-116,14v-18,2,-36,6,-55,3v-43,-8,-14,53,-33,75v-29,1,-26,-67,-21,-97v5,-31,28,-73,43,-98v2,2,7,3,14,3v13,33,-11,48,-13,78v61,4,118,2,176,2v8,0,13,-6,15,-20v4,-47,21,-87,54,-107",w:288},I:{d:"63,-266v34,10,-4,105,-8,128r-24,126v-2,2,-3,1,-9,6v-12,-10,-12,-15,-12,-47v0,-93,9,-156,28,-188v10,-17,19,-25,25,-25",w:79},J:{d:"235,-291v26,11,31,104,31,142v0,37,-2,95,-32,126v-33,34,-121,26,-167,1v-18,-11,-54,-29,-59,-59v0,-3,5,-15,16,-14v31,36,90,57,162,51v63,-30,56,-148,32,-226v-1,-16,11,-13,17,-21",w:282},K:{d:"212,-219v17,-5,80,-60,80,-19v0,9,-2,14,-5,16r-132,78v-34,23,-54,32,-21,50v39,21,74,23,124,41v5,2,7,5,7,9v-4,24,-55,15,-79,8v-67,-19,-98,-36,-116,-83v9,-24,38,-35,66,-61v7,-4,49,-30,76,-39xm47,-194v11,-20,11,-45,31,-55v2,2,4,3,6,0v29,39,-21,96,-18,128v-17,24,-15,62,-29,113v-4,3,-10,7,-19,11v-12,-13,-10,-28,-8,-53v3,-31,17,-79,37,-144",w:270},L:{d:"84,-43v58,0,179,-27,242,-4v3,17,-29,24,-40,26v-85,-4,-202,46,-268,3v-24,-16,-2,-33,-4,-57v26,-76,38,-108,86,-191v14,-7,26,-50,45,-32v6,22,5,31,-12,46v-20,39,-50,82,-67,142v-7,6,-19,46,-19,54v0,9,12,13,37,13",w:331},M:{d:"174,-236v-1,52,-11,92,-7,143v10,5,15,-12,22,-18v42,-55,90,-130,136,-174r15,-18v42,2,32,53,11,80v-12,58,-54,143,-34,210v0,3,-3,12,-9,10v-31,-5,-32,-57,-27,-92v4,-27,12,-58,25,-93v-5,-10,5,-19,6,-30v-46,44,-66,110,-129,172v-11,10,-18,15,-22,15v-34,6,-28,-103,-28,-152v-28,22,-65,119,-96,170v-9,15,-34,3,-31,-19v30,-64,91,-177,139,-229v12,-1,29,13,29,25",w:343},N:{d:"248,-20v-3,17,-37,18,-43,3v-24,-35,-53,-145,-80,-203v-32,40,-55,120,-92,174v-13,3,-26,-13,-27,-22r87,-171v4,-13,20,-57,42,-32v42,48,46,139,82,198v29,-45,46,-88,65,-153v12,-19,23,-42,38,-60v27,-1,14,18,4,44v-6,46,-32,68,-37,121v-15,29,-33,69,-39,101",w:307},O:{d:"240,-268v85,1,163,29,150,125v13,7,-12,18,-5,26v-23,63,-133,112,-228,124v-80,-16,-171,-56,-148,-153v11,-47,20,-43,53,-83v17,-9,39,-22,73,-29v45,-10,81,-10,105,-10xm363,-156v16,-51,-62,-85,-111,-79v-25,-11,-50,8,-81,0v-15,10,-70,16,-85,31v6,20,-27,24,-39,45v-42,75,40,128,115,128v56,0,209,-71,201,-125",w:383},P:{d:"70,-225v-7,-12,-36,16,-49,19v-4,0,-9,-5,-14,-17v21,-47,114,-55,172,-59v41,-3,132,33,99,87v-21,34,-72,59,-144,80v-2,16,-79,3,-74,46v3,25,-5,47,-10,68v-22,-1,-23,-29,-22,-56v2,-25,-20,-32,-8,-50v21,-5,10,-35,25,-57v6,-28,14,-48,25,-61xm71,-229v47,14,-2,50,-1,99v41,-3,113,-37,173,-76v5,-9,8,-14,8,-15v-28,-47,-125,-29,-180,-8",w:252},Q:{d:"374,-217v20,59,-11,127,-48,156r30,38v-1,6,-8,16,-14,9v-3,0,-19,-9,-47,-26v-72,35,-173,75,-236,12v-70,-40,-67,-213,26,-217r8,5v24,-20,72,-48,112,-38v21,-4,22,-1,50,-2v66,-2,94,20,119,63xm296,-88v13,5,61,-49,63,-84v4,-62,-54,-78,-119,-76v-14,-6,-49,5,-71,3v-42,16,-89,41,-93,94v-9,11,1,25,-7,38v-12,-19,-7,-67,-1,-88v-56,30,-37,137,19,155v27,17,92,19,119,0v12,-2,29,-9,52,-20v2,-2,3,-3,3,-6v-11,-12,-46,-27,-54,-56v0,-13,3,-19,9,-19v18,1,60,52,80,59",w:379},R:{d:"100,-275v96,-23,196,-10,208,78v-3,18,-17,52,-49,62v-14,20,-54,23,-79,40v-2,0,-14,2,-36,6v-40,8,-30,14,-3,33v37,27,52,30,118,55v16,6,31,23,12,27v-58,-2,-104,-29,-143,-61v-14,-3,-16,-15,-39,-27v-23,-19,-28,-12,-15,-38v63,-19,111,-15,163,-53v27,-20,43,-36,43,-49v0,-64,-120,-62,-173,-38v-9,4,-38,9,-40,18v-10,32,-16,70,-13,116v-10,21,-8,47,-6,75v2,31,-9,29,-27,22v-9,-55,5,-140,15,-190v-8,-6,-24,10,-24,-11v0,-34,16,-34,42,-55v2,-1,17,-4,46,-10",w:297},S:{d:"13,-3v-7,-3,-22,-18,-5,-22v68,-15,119,-32,154,-45v51,-19,39,-34,3,-53v-46,-25,-82,-30,-121,-64v-33,-29,-50,-35,-25,-58v37,-20,119,-29,181,-29v29,0,44,6,44,18v-9,26,-62,6,-104,14v-17,2,-72,6,-92,16v37,53,132,58,180,111v8,9,11,20,11,30v-4,17,-23,35,-42,34v-21,16,-17,1,-49,17v-14,7,-41,9,-56,20v-25,-3,-49,10,-79,11",w:234},T:{d:"141,-3v-36,-6,1,-49,-3,-79v10,-19,6,-35,15,-64r26,-85v-51,-9,-100,10,-141,14v-16,2,-30,-26,-11,-32v26,-8,143,-8,179,-19r12,6v67,-2,142,-1,200,-1v8,0,14,3,19,10v-18,16,-74,3,-103,14v-48,-4,-60,4,-113,7v-42,22,-36,130,-58,187v1,12,-9,44,-22,42",w:277},U:{d:"365,-262v13,56,-22,104,-36,141v-19,22,-30,38,-57,56v-4,18,-60,35,-78,50v-53,28,-142,0,-161,-34v-31,-56,-37,-108,-11,-164v17,-33,29,-50,48,-29v-2,2,-3,7,-4,13v-44,36,-38,149,7,174v30,26,55,19,102,4v56,-17,66,-34,120,-76v12,-24,56,-68,46,-122r0,-16v0,1,-1,3,-1,6v4,-13,11,-10,25,-3",w:368},V:{d:"246,-258v21,-22,31,-26,44,-8v1,1,-12,22,-28,35v-15,25,-41,38,-56,69v-13,15,-20,31,-28,57v-15,13,-11,29,-27,72v3,21,-5,24,-27,27v-33,-45,-54,-118,-84,-167v-5,-26,-18,-50,-25,-76v-3,-12,24,-8,29,-5v8,13,18,52,26,70r52,115v9,-2,4,-9,10,-21r25,-47v25,-44,46,-76,89,-121",w:234},W:{d:"31,-213v16,46,17,106,41,151v31,-35,49,-89,76,-127v30,-15,39,27,52,56v10,22,21,48,35,67v2,0,4,-1,5,-3v16,-28,50,-76,79,-121v14,-21,40,-63,64,-83r5,8v-30,58,-76,110,-97,173v-18,28,-25,37,-33,63v-11,1,-16,25,-30,15v-21,-31,-44,-89,-62,-131v0,-2,-1,-3,-5,-5v-17,11,-16,36,-31,50v-20,33,-20,84,-68,94v-24,-19,-23,-81,-39,-111v-1,-15,-29,-94,-10,-108v9,2,12,5,18,12",w:331},X:{d:"143,-183v43,-25,69,-36,126,-62v22,-10,86,-10,56,21v-51,3,-158,61,-154,64v10,15,41,30,50,52v27,17,46,60,70,82v9,14,-6,30,-24,20v-35,-43,-75,-100,-116,-132v-48,13,-100,47,-118,94v-1,49,-26,34,-27,4v-1,-26,13,-27,17,-48v22,-27,68,-55,90,-77v-9,-12,-60,-39,-79,-57v-6,-10,-6,-25,12,-25",w:312},Y:{d:"216,-240v19,-14,42,10,22,26v-54,66,-121,109,-156,197v-8,21,-11,15,-30,4v3,-37,27,-61,33,-76v12,-12,15,-19,32,-42v-8,-6,-40,5,-45,5v-48,-6,-69,-65,-56,-113v14,0,13,-1,24,7v2,33,12,75,42,73v36,-2,102,-57,134,-81",w:189},Z:{d:"60,-255v66,12,200,-34,240,21v-13,42,-63,62,-98,89v-19,15,-47,33,-82,55v-25,16,-47,32,-66,47v58,24,129,-6,208,-6v23,0,36,12,13,19v-33,2,-53,5,-86,10v-32,18,-88,15,-135,15v-9,-1,-55,-1,-48,-29v1,-24,30,-24,40,-41v64,-50,151,-86,208,-147v-38,-17,-155,12,-198,-4v0,0,-11,-33,4,-29",w:310},"[":{d:"72,-258r-15,250v30,4,55,-3,80,-6v7,-1,8,17,9,23v-28,15,-73,23,-121,21v-7,0,-10,-6,-10,-17v0,-60,25,-193,22,-288v0,-16,13,-20,33,-19v9,-3,34,-12,51,-12v16,0,15,16,19,29v-16,7,-48,10,-68,19",w:151},"\\":{d:"21,38v-20,-21,9,-72,13,-90v44,-78,113,-189,200,-253v2,0,5,4,7,12v11,31,-13,36,-24,58v-74,61,-174,219,-180,273r-16,0",w:257},"]":{d:"133,-258v-23,-13,-84,6,-85,-32v0,-10,5,-15,14,-15v0,0,30,2,90,7v10,1,15,13,15,36v2,7,-8,59,-13,112r-11,125v-9,48,9,90,-59,71v-20,-4,-39,-1,-59,-4v-5,-10,-25,-12,-14,-30v8,-3,61,-13,78,-8v14,1,8,-7,10,-17v15,-69,21,-166,34,-245",w:171},"^":{d:"68,-306v20,15,47,36,58,60v-1,4,0,7,-9,7v-26,0,-47,-38,-49,-32v-15,9,-41,50,-54,30v-2,-31,17,-23,33,-51v8,-9,15,-14,21,-14",w:135},_:{d:"11,15v-8,33,18,45,50,34r205,2r197,-5v11,-5,14,-9,7,-28v-95,-21,-258,-10,-376,-10v-25,0,-72,-3,-83,7",w:485},"`":{d:"75,-264v16,8,56,14,39,43v-30,-8,-65,-23,-105,-44v-1,-3,-3,-28,5,-25v16,5,44,17,61,26",w:129},a:{d:"124,-56v10,4,59,41,65,50v1,7,-6,17,-12,17r-60,-30v-22,2,-42,21,-65,19v-33,4,-68,-67,-15,-81v41,-27,96,-39,110,9v0,6,-4,12,-11,16v-33,-25,-67,-5,-88,12v10,16,61,-18,76,-12",w:196},b:{d:"80,-140v69,1,123,0,134,52v5,26,-71,71,-97,70v-11,11,-88,22,-94,22v-11,-3,-26,-18,-6,-24v19,-5,-2,-19,-1,-35v1,-18,11,-36,-5,-47v-6,-17,-6,-21,14,-32v6,-45,18,-89,28,-124v2,-7,8,-12,17,-15v5,3,10,11,16,28v-12,27,-13,63,-23,96v0,6,6,9,17,9xm87,-107v-40,-9,-31,31,-39,54v8,15,0,25,12,22v30,-8,60,-18,88,-32v39,-18,49,-33,-1,-42v-20,-4,-45,-7,-60,-2",w:217},c:{d:"128,-123v29,-7,37,29,12,33v-27,-4,-40,6,-79,25v-8,4,-13,11,-16,22v30,32,91,3,134,11v5,13,-8,26,-22,19v-51,25,-139,28,-150,-30v6,-50,69,-82,121,-80",w:194},d:{d:"224,-201v0,-35,-17,-111,24,-94v7,86,-2,119,0,197v-4,2,-8,21,-18,16v-62,-7,-154,-8,-185,29v6,17,28,26,51,26v16,0,100,-15,132,-18v7,5,-6,20,-10,22v-24,8,-122,42,-163,25v-32,-5,-62,-53,-36,-80v35,-37,118,-46,198,-43v1,-22,7,-49,7,-80",w:265},e:{d:"4,-57v0,-58,51,-71,110,-74v33,-1,45,16,59,35v1,14,2,39,-7,42v-24,-2,-73,13,-99,11v-2,2,-2,3,-2,3v0,3,12,8,37,15v21,0,69,9,31,22v-9,14,-34,6,-56,6v-27,-5,-73,-28,-73,-60xm123,-102v-22,2,-68,5,-65,26v24,-2,66,5,79,-6v-5,-13,-1,-13,-14,-20",w:182},f:{d:"6,-59v6,-29,53,-4,53,-43v0,-64,29,-118,84,-150v45,-25,167,-24,155,51v-1,2,-7,6,0,6r-10,2v-45,-58,-165,-39,-186,39v-7,26,-11,42,-9,62v44,8,95,-21,135,-7v-12,25,-39,21,-76,30v-19,5,-18,7,-54,19v-2,8,15,32,17,35v-6,25,-26,26,-40,-5r-15,-24v-41,10,-44,12,-54,-15",w:234},g:{d:"132,-97v30,27,21,75,30,117v-12,31,-11,66,-36,103v-32,46,-105,83,-167,39v-31,-21,-49,-29,-51,-75v-2,-37,77,-50,121,-57v37,-6,68,-10,95,-11v7,-6,3,-32,4,-46v0,0,-1,1,-1,2v0,-18,-5,-31,-14,-45v-44,5,-79,20,-94,-18v3,-54,73,-54,125,-50v12,7,12,13,4,25v-30,-11,-76,8,-90,20v23,3,50,-16,74,-4xm-34,121v60,53,168,1,159,-86v-47,-7,-93,24,-142,30v-12,7,-45,19,-42,29v0,10,8,19,25,27",w:188},h:{d:"100,-310v11,-2,10,19,11,20v-11,52,-40,133,-53,189v-6,30,-9,37,-9,47v27,0,113,-34,143,-34v42,0,31,47,39,79v0,4,-5,17,-16,16v4,2,11,3,4,6v-24,-1,-28,-34,-25,-64v-1,-1,-2,-3,-5,-5v-51,0,-110,38,-162,51v-9,1,-15,-15,-16,-23v17,-89,39,-141,71,-264v0,-9,6,-19,18,-18",w:251},i:{d:"62,-209v7,18,9,23,-5,38v-23,-6,-21,-18,-11,-36v2,0,8,-1,16,-2xm34,-7v-18,-21,-8,-73,-1,-106v7,-10,20,-8,23,6v-1,36,7,72,-2,104v-8,2,-8,0,-20,-4",w:80},j:{d:"88,-191v5,28,-18,40,-28,21v0,-20,12,-29,28,-21xm82,-99v28,-1,16,35,16,61v0,60,-19,150,-35,202v-12,8,-19,31,-35,16v-32,-7,-43,-19,-56,-44r2,-17v11,4,49,45,61,18v10,-55,27,-107,30,-171v0,-16,0,-59,17,-65",w:120},k:{d:"59,-66v33,26,114,37,155,62v8,-4,22,-2,19,-17v0,-4,-12,-11,-30,-24v-36,-25,-54,-22,-99,-33v14,-21,119,-13,103,-63r-16,-7r-123,47r25,-93v-3,-15,16,-49,18,-81v1,-15,-21,-14,-25,-3v-31,82,-49,168,-75,257v2,2,22,30,27,10v2,-5,4,-9,9,-11v4,-16,4,-15,12,-44",w:236},l:{d:"66,-300v21,-6,37,23,30,55v-10,51,-28,135,-28,208v0,11,6,36,-13,37v-29,-5,-30,-48,-25,-83r28,-177v-6,-17,1,-29,8,-40",w:102},m:{d:"348,-59v-2,21,0,57,3,73v-17,3,-30,-1,-32,-16v-8,-7,-5,-44,-13,-70v-35,3,-82,49,-111,70v-12,8,-40,4,-39,-15r2,-56v-1,-13,4,-28,-8,-29v-35,8,-79,72,-115,87v-6,2,-20,-18,-21,-22v1,-20,14,-105,39,-64r8,15v17,-14,72,-56,93,-54v27,3,49,40,43,80v24,-2,66,-55,124,-53v11,14,28,23,27,54",w:368},n:{d:"121,-136v37,6,62,54,62,111v0,32,-16,25,-31,17v-18,-30,-5,-45,-22,-85v-37,-13,-71,55,-92,65v-20,-3,-39,-39,-21,-62v2,-12,3,-15,11,-30v12,-8,20,11,29,12",w:194},o:{d:"108,-139v52,-24,104,18,104,63v0,59,-66,67,-114,83v-52,-2,-115,-50,-80,-105v23,-18,52,-35,90,-41xm45,-60v16,54,125,16,131,-23v-12,-59,-129,-8,-131,23",w:217},p:{d:"82,14v-10,12,-8,117,-24,142v-15,2,-19,0,-29,-13v0,-76,9,-113,22,-192v14,-27,35,-6,37,13v0,8,-3,21,-7,38v2,2,3,2,4,2v26,-9,116,-33,126,-72v-7,-17,-24,-33,-49,-31v-40,3,-116,13,-116,47v-5,7,-2,17,-16,20v-17,-12,-18,-20,-12,-38v8,-25,74,-61,110,-59v55,-15,113,15,118,70v-15,52,-84,79,-146,83v-5,0,-11,-4,-18,-10",w:251},q:{d:"144,-147v27,-8,89,-3,97,31v-9,29,-42,-4,-73,1v-32,6,-118,20,-111,49v0,7,13,13,21,13v21,0,78,-24,104,-34v2,0,9,8,22,21v1,1,1,2,1,5v-27,90,-22,70,-43,203v11,15,-15,54,-33,33v-6,-8,-10,-20,-3,-28v1,-72,5,-114,15,-172v-35,3,-35,10,-59,8v-41,-4,-98,-41,-56,-85v33,-34,59,-27,118,-45",w:248},r:{d:"242,-117v2,22,5,10,-14,23v-73,-7,-166,-23,-174,56v-8,6,-3,20,-8,36v-29,10,-40,-9,-33,-46v6,-31,7,-69,32,-55v58,-37,66,-42,175,-19v3,5,15,4,22,5",w:229},s:{d:"154,-151v19,1,27,24,13,32v-4,1,-22,4,-53,7v-16,8,-22,-2,-39,9v23,21,89,16,96,62v-13,24,-85,35,-124,42v-9,-3,-18,-3,-27,0v-6,-4,-21,-16,-8,-25v30,-6,83,-13,102,-24v-17,-16,-80,-33,-97,-48v-3,-2,-4,-7,-4,-15v-6,-6,3,-13,15,-18v22,-9,94,-23,126,-22",w:188},t:{d:"85,-150v10,-41,35,-126,65,-134v4,1,24,19,11,36v-17,22,-29,57,-36,104v26,8,50,-7,73,5v14,0,22,3,22,9v-1,19,-44,18,-57,23v-10,1,-46,0,-54,10v-10,24,-4,67,-20,98v-21,-3,-26,1,-26,-20v0,-9,2,-36,8,-81v-15,-13,-81,9,-77,-27v4,-38,71,6,91,-23",w:194},u:{d:"207,-136v-1,-2,11,-14,14,-13v6,0,10,7,10,22v-3,40,-23,56,-40,82v-13,19,-62,43,-93,43v-67,-2,-111,-75,-71,-133v26,-3,21,29,19,49v-1,27,26,44,57,42v41,-2,93,-55,104,-92",w:242},v:{d:"24,-127r52,71v42,-16,70,-54,124,-65v5,4,8,7,8,11v-8,19,-4,8,-33,32v0,1,-1,3,-1,5v-61,45,-93,68,-97,68v-40,-15,-50,-72,-68,-100v6,-14,10,-22,15,-22",w:214},w:{d:"15,-139v38,-2,27,57,45,86v30,2,67,-66,101,-78v26,6,36,69,60,78v47,-35,51,-54,119,-104v3,0,7,-2,15,-4v19,23,-9,28,-21,49v-33,28,-68,90,-107,109v-10,6,-52,-47,-72,-71v-20,17,-85,74,-97,73v-38,7,-41,-98,-52,-122v0,-1,3,-7,9,-16",w:325},x:{d:"95,-124v22,-13,78,-32,99,-31v16,0,23,6,23,18v0,22,-17,11,-49,21v-3,0,-45,20,-42,24v0,1,2,4,8,10v20,24,49,41,44,80v-35,3,-27,-9,-60,-44v-40,-43,-37,-26,-79,9v-1,1,-2,3,-3,8v-12,8,-28,10,-27,-11v-6,-8,45,-65,48,-65v-17,-21,-61,-52,-24,-68v9,0,48,37,62,49",w:223},y:{d:"44,-65v22,33,70,4,99,-8v5,-4,28,-15,41,-31r17,0v25,47,-26,70,-40,114v-5,4,-9,8,-10,21v-16,12,-11,33,-27,51v-5,18,-12,43,-23,71v-1,-1,-2,34,-18,29v-12,1,-22,-12,-22,-23v20,-70,24,-65,68,-177v-47,16,-111,8,-116,-39v-11,-13,-7,-62,8,-62v18,0,22,26,23,54",w:216},z:{d:"189,-43v9,-1,46,-6,41,12v0,7,-5,13,-15,14v-45,6,-148,24,-181,13v0,-3,-5,-8,-14,-15v5,-44,66,-46,90,-85v-15,-18,-84,21,-84,-14v0,-10,5,-17,14,-18v33,-3,79,-13,109,-3v4,-2,14,11,12,15v0,23,-26,51,-78,84v28,10,73,-3,106,-3",w:244},"{":{d:"94,-303v27,-9,90,-14,79,26v-20,17,-55,-5,-87,13v-4,1,-6,4,-6,8v33,42,31,44,7,85v-6,10,-13,16,-13,13v5,6,17,17,15,31r-33,78v7,35,28,49,57,63r49,0v7,42,-51,41,-86,20v-43,-13,-51,-51,-56,-89v-2,-25,25,-54,27,-71v-3,-4,-46,-5,-41,-21v2,-10,-3,-29,11,-25v2,0,51,-17,52,-38v4,-3,-25,-23,-25,-49v0,-41,8,-30,50,-44",w:179},"|":{d:"30,-308v26,5,14,50,15,80v5,78,-8,153,-3,225v-2,15,-1,31,-11,36v-8,-3,-25,-22,-25,-32r9,-183v0,-40,0,-78,1,-112v0,-4,9,-15,14,-14",w:63},"}":{d:"47,-298v34,-17,118,-18,112,36v6,25,-76,98,-69,103v4,16,39,7,44,28v7,34,-34,17,-37,39v8,29,49,83,23,123v-15,23,-43,26,-73,46v-34,8,-43,11,-49,-17v1,-15,30,-15,33,-20v24,-12,70,-27,55,-61v-14,-33,-37,-68,-19,-103v-46,-50,46,-100,60,-141v-10,-16,-68,6,-77,-12",w:143},"~":{d:"7,-254v2,-6,59,-50,67,-46v11,-1,35,19,46,26v5,0,27,-10,66,-31v21,8,-1,25,-7,38v-27,21,-48,31,-65,31v-24,-11,-37,-39,-65,-9v-7,7,-26,36,-42,11v3,-5,-3,-17,0,-20",w:199},"Ä":{d:"161,-217v20,53,23,124,54,170v-2,20,-34,9,-42,0v-27,-12,-78,-18,-101,-18v-26,6,-29,51,-54,63v-18,-4,-19,-30,-3,-38v5,-9,15,-16,8,-29v1,-12,23,-9,26,-19v6,-10,11,-20,20,-27r70,-121v12,-4,16,4,22,19xm82,-91v17,3,62,7,86,13v-13,-33,-13,-80,-29,-109v-15,30,-38,63,-57,96xm187,-259v0,8,-4,13,-12,13v-18,0,-21,-20,-16,-34v18,-1,28,2,28,21xm90,-284v7,3,28,11,28,18v0,9,-9,18,-18,17v-17,0,-25,-24,-10,-35"},"Å":{d:"161,-217v20,53,23,124,54,170v-2,20,-34,9,-42,0v-27,-12,-78,-18,-101,-18v-26,6,-29,51,-54,63v-18,-4,-19,-30,-3,-38v5,-9,15,-16,8,-29v1,-12,23,-9,26,-19v6,-10,11,-20,20,-27r70,-121v12,-4,16,4,22,19xm82,-91v17,3,62,7,86,13v-13,-33,-13,-80,-29,-109v-15,30,-38,63,-57,96xm112,-239v-31,-17,-9,-61,29,-56v12,2,22,3,33,12v24,39,-30,62,-62,44xm119,-262v2,14,41,8,41,-4v0,-4,-8,-6,-24,-9v-10,-2,-17,10,-17,13"},"Ç":{d:"48,-108v-12,70,90,71,159,67r138,-9v9,-1,7,9,7,17v-37,16,-80,27,-103,21v-14,9,-40,3,-67,9v-30,0,-64,1,-100,-10v-6,-1,-10,-4,-10,-8v-32,-12,-46,-31,-63,-56v-16,-61,47,-103,83,-121v82,-42,118,-45,200,-60v21,-4,36,34,11,37v-90,11,-148,31,-225,77v-12,8,-23,20,-30,36xm172,18v29,4,47,14,53,35v-2,7,-14,31,-27,31v-28,7,-55,9,-84,14v-18,-5,-13,-32,7,-32v21,0,55,-5,69,-13v-16,-14,-63,10,-50,-35v9,-10,1,-27,23,-29v7,8,11,16,9,29",w:331},"É":{d:"49,-160v1,-4,-10,-9,-15,-8v-15,-35,32,-30,57,-31r142,-8v2,1,30,7,40,10v-52,16,-133,17,-190,30v-7,9,-12,24,-15,47v26,10,102,-6,141,3v1,3,1,6,2,10v-36,18,-92,12,-149,21v-11,9,-16,41,-16,51v55,-1,111,-21,168,-13v15,-8,48,1,31,18v-53,16,-130,13,-198,29r-39,-8v-4,-19,17,-53,20,-76v-1,0,-7,-11,-9,-18v18,-7,22,-28,30,-57xm133,-248v27,-11,48,-32,59,-14v3,11,-79,52,-88,53v-14,1,-16,-11,-12,-21v10,-4,23,-11,41,-18",w:252},"Ñ":{d:"224,-182v1,-17,15,-24,22,-38v20,0,13,10,3,33v-3,36,-25,52,-28,94v-10,24,-30,55,-29,82r-19,7v-32,-8,-36,-70,-58,-111v-2,-23,-7,-27,-19,-54v-28,36,-41,93,-71,133v-9,5,-20,-9,-20,-17r73,-149v9,-24,31,-5,36,7v19,41,31,98,53,139v22,-35,34,-69,50,-118v2,-3,3,-3,7,-8xm203,-257v22,-8,41,-24,65,-26v3,11,-8,9,-7,21v-26,20,-46,31,-59,31v-2,3,-49,-27,-49,-29v-11,0,-32,31,-46,32v-11,-2,-12,-21,-4,-23v4,-6,28,-30,48,-34v17,-4,43,28,52,28",w:219},"Ö":{d:"62,-184v78,-31,249,-50,238,74v-6,65,-102,105,-179,115v-77,-7,-152,-71,-101,-149v2,-5,24,-33,42,-40xm279,-120v14,-38,-47,-64,-85,-61v-20,-9,-41,7,-62,0v-11,7,-54,12,-66,24v0,20,-51,35,-38,66v-1,43,50,67,96,67v44,0,162,-55,155,-96xm197,-229v0,8,-4,13,-12,13v-17,0,-19,-19,-16,-34v18,-1,29,1,28,21xm101,-254v7,3,28,9,27,18v1,8,-8,17,-17,17v-18,0,-26,-24,-10,-35",w:273},"Ü":{d:"281,-202v6,67,-30,121,-71,152v-3,14,-47,26,-60,39v-41,20,-110,1,-125,-26v-24,-44,-28,-84,-8,-127v12,-26,23,-38,37,-22v-2,2,-3,5,-3,10v-34,26,-29,116,5,134v22,32,86,-1,109,-8v38,-28,104,-64,97,-149v2,-10,7,-8,19,-3xm197,-227v0,8,-4,13,-12,13v-18,0,-21,-20,-16,-34v18,-1,28,2,28,21xm101,-252v7,3,27,10,27,18v0,8,-9,18,-18,17v-18,-1,-24,-25,-9,-35",w:262},"á":{d:"118,-53v10,4,55,41,62,47v0,7,-5,16,-12,16r-57,-28v-20,3,-40,19,-61,18v-10,2,-43,-17,-42,-36v0,-14,7,-40,27,-41v39,-26,92,-36,104,9v0,6,-2,11,-9,15v-32,-24,-64,-6,-84,11v8,15,58,-17,72,-11xm32,-117v24,-3,85,-55,101,-32v3,11,-80,53,-89,53v-13,2,-14,-10,-12,-21",w:173},"à":{d:"118,-53v10,4,55,41,62,47v0,7,-5,16,-12,16r-57,-28v-20,3,-40,19,-61,18v-10,2,-43,-17,-42,-36v0,-14,7,-40,27,-41v39,-26,92,-36,104,9v0,6,-2,11,-9,15v-32,-24,-64,-6,-84,11v8,15,58,-17,72,-11xm99,-137v7,6,56,14,37,40v-28,-7,-62,-21,-100,-41v-2,-3,-2,-26,5,-23v16,4,42,17,58,24",w:173},"â":{d:"118,-53v10,4,55,41,62,47v0,7,-5,16,-12,16r-57,-28v-20,3,-40,19,-61,18v-10,2,-43,-17,-42,-36v0,-14,7,-40,27,-41v39,-26,92,-36,104,9v0,6,-2,11,-9,15v-32,-24,-64,-6,-84,11v8,15,58,-17,72,-11xm147,-97v-27,-6,-39,-26,-60,-37v-21,7,-38,46,-65,23v-2,-5,-3,-10,-4,-14v18,-4,43,-31,61,-42v28,5,40,21,62,36v12,8,18,17,18,25v0,6,-4,9,-12,9",w:173},"ä":{d:"118,-53v10,4,55,41,62,47v0,7,-5,16,-12,16r-57,-28v-20,3,-40,19,-61,18v-32,5,-66,-64,-15,-77v39,-26,92,-36,104,9v0,6,-3,11,-9,15v-32,-24,-64,-6,-84,11v8,15,58,-17,72,-11xm142,-119v0,8,-4,13,-12,13v-18,0,-21,-20,-16,-34v18,-1,28,2,28,21xm46,-144v7,3,28,9,27,18v1,8,-9,18,-18,17v-18,-1,-25,-25,-9,-35",w:173},"ã":{d:"118,-53v10,4,55,41,62,47v0,7,-5,16,-12,16r-57,-28v-20,3,-40,19,-61,18v-10,2,-43,-17,-42,-36v0,-14,7,-40,27,-41v39,-26,92,-36,104,9v0,6,-2,11,-9,15v-32,-24,-64,-6,-84,11v8,15,58,-17,72,-11xm114,-136v22,-8,41,-24,64,-26v3,11,-7,10,-7,21v-26,20,-45,30,-58,30v-3,3,-49,-26,-49,-28v-10,-1,-32,35,-51,31v-12,-32,8,-29,32,-51v24,-21,54,20,69,23",w:173},"å":{d:"118,-53v10,4,55,41,62,47v0,7,-5,16,-12,16r-57,-28v-20,3,-40,19,-61,18v-10,2,-43,-17,-42,-36v0,-14,7,-40,27,-41v39,-26,92,-36,104,9v0,6,-2,11,-9,15v-32,-24,-64,-6,-84,11v8,15,58,-17,72,-11xm54,-101v-37,-20,-9,-71,34,-65v13,1,25,3,38,13v27,45,-34,73,-72,52xm61,-128v4,20,48,7,49,-5v0,-5,-9,-7,-28,-10v-12,-2,-21,11,-21,15",w:173},"ç":{d:"108,-118v30,-6,56,21,25,33v-24,-6,-39,5,-75,23v-7,4,-12,12,-15,22v31,28,86,3,128,9v3,28,-29,16,-44,28v-53,15,-106,10,-120,-37v0,-48,62,-70,101,-78xm92,18v23,4,45,12,48,32v-2,6,-12,28,-25,28v-24,6,-50,10,-77,13v-16,-4,-11,-28,7,-29v17,-1,51,-4,63,-12v-14,-15,-57,10,-46,-32v9,-8,0,-25,21,-26v6,6,12,14,9,26",w:171},"é":{d:"108,-124v42,-3,70,39,50,73v-22,-1,-70,12,-94,10v-1,1,-2,3,-2,3v0,3,12,7,35,14v18,0,64,7,30,21v-10,14,-31,6,-53,6v-26,-7,-70,-26,-70,-58v0,-54,48,-65,104,-69xm130,-78v-2,-35,-66,-13,-77,3v16,6,62,6,77,-3xm76,-169v26,-11,48,-32,59,-14v3,10,-80,53,-89,53v-14,1,-14,-10,-12,-21v15,-7,16,-7,42,-18",w:161},"è":{d:"108,-124v42,-3,70,39,50,73v-22,-1,-70,12,-94,10v-1,1,-2,3,-2,3v0,3,12,7,35,14v18,0,64,7,30,21v-10,14,-31,6,-53,6v-26,-7,-70,-26,-70,-58v0,-54,48,-65,104,-69xm130,-78v-2,-35,-66,-13,-77,3v16,6,62,6,77,-3xm95,-166v7,6,54,14,37,40v-28,-7,-62,-21,-100,-41v-3,-3,-3,-26,5,-24v16,5,42,18,58,25",w:161},"ê":{d:"108,-124v42,-3,70,39,50,73v-22,-1,-70,12,-94,10v-1,1,-2,3,-2,3v0,3,12,7,35,14v18,0,64,7,30,21v-10,14,-31,6,-53,6v-26,-7,-70,-26,-70,-58v0,-54,48,-65,104,-69xm130,-78v-2,-35,-66,-13,-77,3v16,6,62,6,77,-3xm145,-129v-27,-6,-39,-26,-60,-37v-8,0,-10,4,-14,10v-11,15,-51,34,-56,0v17,-4,44,-32,61,-43v28,5,41,21,63,36v12,8,17,17,17,25v0,6,-3,9,-11,9",w:161},"ë":{d:"108,-124v42,-3,70,39,50,73v-22,-1,-70,12,-94,10r-3,3v0,3,12,7,36,14v18,0,64,7,30,21v-10,14,-31,6,-53,6v-26,-7,-67,-27,-71,-58v7,-52,48,-65,105,-69xm130,-78v-2,-35,-66,-13,-77,3v16,6,62,6,77,-3xm140,-144v0,8,-4,12,-12,12v-18,0,-19,-19,-16,-33v18,-1,29,1,28,21xm44,-169v7,3,28,9,28,17v0,9,-9,18,-18,18v-18,0,-25,-24,-10,-35",w:161},"í":{d:"59,-98v20,4,15,53,10,95v-6,1,-11,2,-19,-4v1,-7,-12,-18,-10,-24v4,-22,-4,-65,19,-67xm50,-139v27,-11,49,-32,59,-14v3,11,-80,53,-89,53v-14,1,-14,-12,-11,-22v15,-7,14,-6,41,-17",w:105},"ì":{d:"57,-98v22,5,13,50,11,95v-7,1,-11,2,-20,-4v1,-7,-12,-18,-10,-24v4,-22,-2,-64,19,-67xm70,-139v14,10,54,14,37,41v-28,-7,-61,-22,-99,-42v-3,-2,-3,-25,5,-23v15,5,41,17,57,24",w:109},"î":{d:"72,-98v20,5,12,51,10,95v-6,2,-13,1,-20,-4v1,-8,-12,-18,-10,-24v4,-22,-3,-65,20,-67xm134,-94v-26,-7,-39,-25,-60,-37v-7,0,-9,4,-13,10v-14,15,-51,34,-56,-1v18,-4,45,-33,61,-43v27,6,40,22,62,37v12,8,18,17,18,25v0,6,-4,9,-12,9",w:143},"ï":{d:"55,-97v19,5,15,53,10,95v-17,5,-26,-14,-30,-28v6,-20,-3,-65,20,-67xm110,-118v0,8,-4,13,-12,13v-17,0,-19,-19,-16,-34v18,-1,29,1,28,21xm14,-143v6,3,28,8,28,17v0,9,-9,18,-18,18v-18,0,-25,-24,-10,-35",w:107},"ñ":{d:"115,-129v34,6,59,50,59,105v0,31,-15,24,-30,17v-15,-29,-5,-42,-20,-81v-35,-13,-68,52,-88,61v-20,-4,-38,-36,-19,-59v0,-12,3,-14,10,-28v11,-8,18,11,27,12xm117,-166v22,-7,41,-23,64,-26v3,11,-7,10,-7,21v-26,20,-45,30,-58,30v-3,3,-49,-26,-49,-28v-10,-1,-32,35,-51,31v-5,-12,-8,-16,0,-23v4,-6,28,-29,48,-33v17,-3,43,28,53,28",w:171},"ó":{d:"102,-132v50,-20,99,16,99,60v0,54,-60,64,-108,79v-50,-2,-110,-48,-76,-100v22,-17,49,-33,85,-39xm136,-104v-34,0,-91,27,-94,47v16,51,125,16,125,-22v0,-17,-10,-25,-31,-25xm49,-154v24,-3,85,-55,101,-32v3,11,-80,53,-89,53v-14,0,-13,-8,-12,-21",w:191},"ò":{d:"102,-132v50,-20,99,16,99,60v0,54,-60,64,-108,79v-50,-2,-110,-48,-76,-100v22,-17,49,-33,85,-39xm136,-104v-34,0,-91,27,-94,47v16,51,125,16,125,-22v0,-17,-10,-25,-31,-25xm115,-181v14,10,51,13,37,40v-28,-7,-62,-21,-100,-41v-3,-2,-3,-26,5,-23v16,5,42,17,58,24",w:191},"ô":{d:"102,-132v50,-20,99,16,99,60v0,54,-60,64,-108,79v-50,-2,-110,-48,-76,-100v22,-17,49,-33,85,-39xm136,-104v-34,0,-91,27,-94,47v16,51,125,16,125,-22v0,-17,-10,-25,-31,-25xm110,-177v-22,6,-38,45,-65,22v-2,-4,-3,-9,-4,-13v18,-4,43,-32,61,-43v27,6,40,21,62,36v12,9,18,17,18,25v1,11,-15,10,-23,7",w:191},"ö":{d:"102,-132v50,-20,99,16,99,60v0,54,-60,64,-108,79v-50,-2,-110,-48,-76,-100v22,-17,49,-33,85,-39xm136,-104v-34,0,-91,27,-94,47v16,51,125,16,125,-22v0,-17,-10,-25,-31,-25xm161,-160v0,8,-4,13,-12,13v-17,0,-19,-19,-16,-34v18,-1,29,1,28,21xm65,-185v7,3,28,9,28,18v0,7,-9,18,-18,17v-18,1,-25,-24,-10,-35",w:191},"õ":{d:"102,-132v50,-20,99,16,99,60v0,54,-60,64,-108,79v-50,-2,-110,-48,-76,-100v22,-17,49,-33,85,-39xm136,-104v-34,0,-91,27,-94,47v16,51,125,16,125,-22v0,-17,-10,-25,-31,-25xm58,-199v26,-21,54,18,69,22v4,0,15,-5,34,-13v22,-9,21,-16,31,-13v3,11,-9,9,-7,22v-26,20,-46,30,-59,30v-2,4,-49,-28,-49,-29v-11,0,-32,31,-46,32v-12,-3,-13,-21,-4,-23v4,-6,14,-15,31,-28",w:191},"ú":{d:"196,-129v-1,-4,12,-13,15,-13v6,0,8,7,8,21v0,24,-7,25,-13,45v-7,7,-14,21,-24,29v-9,24,-61,45,-89,45v-63,0,-105,-72,-67,-126v24,-3,19,27,18,46v-1,26,23,42,54,40v38,-3,88,-51,98,-87xm106,-174v26,-11,48,-32,59,-14v3,11,-81,53,-89,54v-13,1,-15,-12,-11,-22v15,-7,14,-7,41,-18",w:213},"ù":{d:"196,-129v-1,-4,12,-13,15,-13v6,0,8,7,8,21v0,24,-7,25,-13,45v-7,7,-14,21,-24,29v-9,24,-61,45,-89,45v-63,0,-105,-72,-67,-126v24,-3,19,27,18,46v-1,26,23,42,54,40v38,-3,88,-51,98,-87xm126,-166v7,6,56,14,37,40v-28,-7,-62,-22,-100,-42v-2,-3,-2,-26,5,-23v16,4,42,18,58,25",w:213},"û":{d:"196,-129v-1,-4,12,-13,15,-13v6,0,8,7,8,21v0,24,-7,25,-13,45v-7,7,-14,21,-24,29v-9,24,-61,45,-89,45v-63,0,-105,-72,-67,-126v24,-3,19,27,18,46v-1,26,23,42,54,40v38,-3,88,-51,98,-87xm172,-143v-27,-6,-39,-26,-60,-37v-8,0,-10,4,-14,10v-11,15,-49,35,-56,0v17,-4,44,-32,61,-43v27,6,41,21,63,36v12,9,17,17,17,25v0,6,-3,9,-11,9",w:213},"ü":{d:"196,-129v-1,-4,12,-13,15,-13v6,0,8,7,8,21v0,24,-7,25,-13,45v-7,7,-14,21,-24,29v-9,24,-61,45,-89,45v-63,0,-105,-72,-67,-126v24,-3,19,27,18,46v-1,26,23,42,54,40v38,-3,88,-51,98,-87xm168,-161v0,8,-3,13,-11,13v-17,0,-20,-19,-17,-34v18,-1,29,1,28,21xm72,-186v7,3,29,9,28,18v0,7,-9,18,-18,17v-18,1,-25,-24,-10,-35",w:213},"†":{d:"22,-286v15,6,5,-20,19,-19v9,-3,15,21,17,22v6,1,12,3,20,6v3,10,5,16,-9,16v-34,-10,-6,51,-34,52v-20,-7,11,-47,-15,-49v-14,3,-25,-5,-17,-24v7,-2,14,-4,19,-4",w:77},"°":{d:"106,-268v0,36,-35,38,-51,46v-48,5,-60,-58,-25,-78v33,-11,76,-9,76,32xm38,-257v16,7,39,2,38,-17v-13,-9,-28,-1,-32,11v-5,3,-7,0,-6,6",w:114},"¢":{d:"105,-188v13,-12,14,-18,26,-15v7,23,7,15,-3,49v6,0,18,14,17,20v-3,5,-12,19,-26,13v-14,1,-14,5,-16,21v10,10,46,-13,38,18v-9,17,-23,16,-54,20v-17,16,-4,55,-29,60v-37,-10,19,-64,-24,-71v-20,-10,-37,-47,-6,-62v23,-20,73,-4,77,-53xm65,-101v4,-9,7,-8,3,-13v-14,4,-22,10,-3,13",w:154},"£":{d:"153,-170v3,22,62,0,49,39v-18,6,-31,12,-58,9v-12,-1,-17,30,-23,39v19,26,50,56,91,35v9,-2,27,-13,27,4v0,27,-27,39,-58,42v-32,-5,-59,-19,-78,-39v-6,1,-35,44,-57,39v-25,0,-37,-15,-37,-46v0,-41,43,-53,73,-50v4,1,12,-18,12,-21v-7,-15,-49,0,-44,-30v-2,-31,31,-16,60,-19v16,-30,25,-119,93,-113v16,2,75,16,50,44v-4,5,-7,7,-12,8v-18,-12,-32,-18,-41,-18v-35,-1,-38,52,-47,77xm43,-45v4,5,12,-2,11,-9v-1,2,-12,1,-11,9",w:242},"§":{d:"141,-115v12,10,29,36,28,56v-4,68,-129,69,-152,16v-1,-12,-10,-22,8,-23v17,3,47,21,67,23v16,1,40,-8,38,-21v-8,-49,-119,-30,-117,-85v1,-28,15,-45,-3,-64v-1,-53,55,-61,103,-62v15,-5,6,-5,20,-2v16,17,23,27,23,30v-1,26,-29,7,-45,7v-21,0,-51,2,-62,17v19,14,87,8,97,43v18,14,16,57,-5,65xm64,-147r57,17v10,-28,-22,-43,-47,-44v-25,-1,-35,19,-10,27",w:174},"•":{d:"130,-114v0,47,-124,54,-120,-8r6,-31v44,-28,64,-34,104,0v8,6,10,20,10,39",w:139},"¶":{d:"121,-237v21,-9,44,-13,63,-1v-1,7,5,6,7,11r-4,190v-2,33,4,39,-15,40v-16,1,-10,-20,-10,-33r4,-161v0,-17,-1,-34,-16,-25v2,10,1,23,1,35v-9,46,-6,75,-15,156v-3,4,-7,5,-12,5v-17,-10,-3,-89,-10,-115v-43,14,-98,10,-101,-29v-4,-53,59,-63,104,-75v3,1,4,2,4,2xm95,-204v2,9,-30,50,1,50v35,0,23,-13,29,-43v0,-1,-2,-7,-4,-15v-12,-1,-14,2,-26,8",w:206},"ß":{d:"33,10v-29,4,-28,-32,-16,-70v18,-58,17,-137,56,-176v12,-24,46,-58,82,-43v20,8,47,24,47,54v0,30,-62,59,-67,90v33,23,56,33,63,63v-18,21,-22,36,-48,54v-24,17,-27,41,-53,16v-2,-19,7,-35,24,-42v15,-13,26,-22,34,-40v-13,-17,-78,-29,-56,-70v-3,-27,64,-54,66,-86v-8,-25,-41,-4,-52,8v-29,30,-47,83,-51,141v-17,25,-8,71,-29,101"},"®":{d:"75,-194v78,-29,116,9,130,84v-2,42,-22,47,-57,67v-74,20,-161,-19,-129,-110v6,-18,29,-34,57,-40xm46,-86v51,36,84,21,129,-15v7,-15,0,-39,-10,-49v-13,-37,-49,-26,-86,-18v-28,7,-49,46,-33,82xm72,-123v-5,-43,68,-57,75,-14v-17,26,-18,17,3,32v2,25,-25,18,-45,7r-4,-4v-1,8,-3,20,-12,24v-10,-3,-21,-34,-17,-45xm112,-135v-10,-1,-20,13,-9,14v6,-6,9,-11,9,-14",w:217},"©":{d:"102,-29v-74,5,-124,-84,-70,-140v22,-22,53,-35,97,-38v46,-4,88,49,74,100v0,44,-51,75,-101,78xm96,-66v42,-3,75,-23,75,-69v0,-23,-4,-38,-44,-38v-16,0,-33,6,-49,20v36,-4,55,-12,62,20v-5,16,-49,1,-50,21v10,15,53,-14,54,11v0,18,-14,27,-42,27v-22,1,-46,-11,-46,-31v0,-25,7,-39,20,-44v-1,-1,-2,-2,-3,-2v-51,22,-32,89,23,85",w:217},"™":{d:"213,-307v28,9,11,49,7,75v-1,4,-4,6,-11,6v-7,1,-11,-14,-11,-34v-14,-6,-34,34,-46,28v-2,0,-10,-9,-24,-27v-10,7,-3,36,-27,31v-15,-24,-3,-27,1,-48v-6,-7,-27,-1,-31,3v-3,14,-7,30,-11,51v-5,10,-29,9,-24,-12v-5,-8,1,-18,3,-35v-13,6,-33,2,-29,-18v20,-17,64,-17,100,-19v28,-1,29,30,45,39v11,-6,35,-32,58,-40",w:239},"´":{d:"52,-284v29,-11,50,-34,62,-14v3,12,-86,54,-94,56v-14,0,-16,-12,-12,-23v11,-5,25,-11,44,-19",w:120},"¨":{d:"124,-259v0,9,-4,13,-12,13v-18,0,-22,-21,-17,-35v19,-1,30,1,29,22xm23,-285v7,2,30,9,29,18v1,10,-9,19,-18,19v-19,0,-28,-26,-11,-37",w:136},"≠":{d:"48,-130v29,11,49,-57,60,-50v25,6,7,27,-1,46v22,5,29,7,21,22v-18,2,-48,-1,-50,15v9,8,53,-7,54,10v-4,22,-46,20,-72,24v-7,13,-18,32,-34,57v-8,6,-15,-3,-13,-14v-1,-9,15,-39,14,-45v-30,5,-24,-17,-13,-25v12,-1,36,4,29,-13v-14,0,-47,6,-36,-12v0,-18,27,-13,41,-15",w:140},"Æ":{d:"335,-259v0,30,-102,12,-122,34v10,21,2,79,16,100v24,-6,59,-13,86,-16v23,-2,32,21,13,26r-103,29v-3,22,-4,38,8,43v28,-5,60,-6,86,-14v5,-1,14,7,14,11v6,16,-90,40,-107,40v-29,0,-39,-19,-32,-46v-2,-4,0,-26,-9,-28v-29,2,-58,6,-88,6v-31,0,-40,74,-82,73v-18,-23,4,-37,12,-50v40,-65,112,-126,165,-207v20,-17,69,-11,112,-13v21,0,31,4,31,12xm123,-111v28,1,44,-2,67,-10v-4,-22,5,-49,-7,-65v-3,6,-65,61,-60,75",w:348},"Ø":{d:"76,-211v41,-13,100,-22,140,-3v26,-19,40,-29,44,-29v10,0,15,7,15,20v0,15,-23,23,-30,35v23,39,29,114,-21,139v-36,19,-102,35,-147,18v-14,-5,-29,29,-46,35v-25,-13,-19,-24,3,-56v-9,-17,-28,-27,-28,-60v0,-38,23,-72,70,-99xm107,-66v55,15,125,-12,123,-70v0,-16,-5,-25,-13,-29r-110,95r0,4xm39,-108v-1,3,17,31,22,27v8,-6,109,-90,123,-106v-15,-11,-43,1,-63,2v-33,10,-80,35,-82,77",w:270},"∞":{d:"322,-72v-4,22,-54,41,-76,41v-43,0,-83,-17,-114,-35v-46,19,-125,53,-128,-18v-1,-14,10,-22,13,-35v29,-10,62,-31,97,-4v37,28,47,5,75,-8v40,-19,73,-10,114,1v13,1,18,55,19,58xm228,-69v15,0,62,-12,61,-25v-19,-23,-89,-10,-105,11v0,2,1,4,2,4v28,6,42,10,42,10xm75,-102v-13,2,-41,4,-44,19v0,4,3,7,10,7v21,0,40,-6,54,-17v-9,-6,-16,-9,-20,-9",w:330},"±":{d:"93,-163v-7,46,76,-4,46,47v-14,6,-27,13,-38,8v-24,2,-14,28,-28,44r-14,0v-7,-12,-5,-15,-7,-33v-12,-7,-41,-1,-37,-24v2,-11,23,-17,36,-14r28,-38v4,0,9,4,14,10xm113,-27v-12,18,-58,27,-85,24v-16,2,-22,-23,-13,-36v28,-7,85,-11,98,12",w:151},"≤":{d:"73,-109v10,15,87,16,87,42v0,11,-5,16,-13,16v-36,-11,-69,-24,-109,-31v-18,-8,-18,-13,-9,-36v59,-56,93,-83,101,-83v16,0,18,17,14,28v-27,24,-42,35,-71,64xm10,-29v35,-12,117,-26,148,-3v1,2,-5,19,-8,18r-124,15v-16,2,-26,-18,-16,-30",w:168},"≥":{d:"115,-174v20,7,53,36,20,57v-19,11,-91,68,-82,59v-18,3,-25,-22,-13,-31v15,-10,14,-10,70,-51r-50,-37v-5,-4,-5,-27,4,-28v16,7,40,17,51,31xm14,-32v33,-10,86,-14,127,-10v12,12,5,23,-11,27v-49,9,-82,13,-99,13v-22,0,-24,-16,-17,-30",w:163},"¥":{d:"31,-248v30,-3,64,64,74,59v37,-22,77,-65,107,-82v20,-11,34,18,21,32v-28,19,-52,38,-70,57v-18,8,-40,21,-35,60v2,19,39,7,64,7v25,0,16,21,2,27v-36,16,-46,8,-68,18v6,11,101,-20,66,24v-21,11,-42,12,-75,20v-2,1,-5,6,-10,18v-8,3,-11,10,-24,8v-7,-17,-2,-18,-9,-26v-13,5,-39,3,-53,-2v-10,-17,-7,-27,0,-34v23,-1,45,1,64,-5v-11,-7,-28,-4,-64,-6v-13,-8,-15,-24,-6,-35v33,-2,102,9,76,-37v-14,-14,-33,-38,-60,-66v-10,-10,-8,-28,0,-37",w:219},"µ":{d:"123,-114v41,0,54,-9,127,-17v12,-2,20,-6,25,-12v5,-78,43,-127,119,-138v38,-5,46,23,55,48v-5,5,2,4,2,12v-2,47,-72,81,-129,95v-17,4,-12,32,-2,39v30,-5,24,0,99,4v14,9,14,20,-1,23v-17,3,-71,-1,-85,13v1,19,18,35,-3,47v-1,-6,-10,-7,-16,-5v-3,-3,-20,-37,-29,-41v-15,8,-50,22,-49,-9v1,-19,2,-27,28,-26v24,1,13,-12,8,-30v-22,1,-64,16,-111,23v-50,7,-17,47,-17,57v0,10,-5,15,-13,15v-20,-9,-27,-30,-33,-55v-20,-17,-52,8,-85,-6v-2,-10,-13,-26,4,-29v32,-6,41,-1,65,-7v-17,-74,-4,-173,69,-180v55,-20,130,8,131,65v-11,9,-10,2,-29,-11v-33,-23,-37,-26,-76,-25v-41,13,-69,38,-67,100v0,34,4,50,13,50xm317,-152v29,-6,106,-43,106,-71v0,-23,-24,-25,-42,-17v-31,1,-74,48,-64,88",w:462},"∂":{d:"456,-113v55,-37,119,-8,176,5v-19,37,-104,-5,-144,18v-5,64,-45,87,-130,87v-43,0,-70,-8,-96,-21v-54,15,-146,29,-209,10v-18,-11,-43,-26,-46,-53v-1,-9,28,-48,51,-46v55,-10,55,-8,101,-8v29,0,17,-26,23,-56v4,-19,4,-74,34,-49v4,42,-7,83,-10,124v0,4,-11,10,-34,17v-29,-1,-45,-4,-74,1v-10,2,-57,3,-52,18v30,43,132,30,190,18v2,-10,-7,-19,-5,-28v5,-36,31,-59,74,-56v27,2,71,4,70,35v-1,30,-37,41,-58,57v35,13,131,15,135,-23v2,-19,-5,-36,4,-50xm262,-85v0,3,13,28,19,25v7,0,48,-13,61,-29v-10,-17,-71,-17,-80,4",w:640},"∑":{d:"235,-95v-3,-59,120,-41,160,-28v3,-2,15,-3,14,4v1,3,-16,19,-21,18r-97,4v-25,5,-18,18,-23,56v-16,14,-25,24,-36,18v-83,32,-154,29,-212,-17v-45,-68,41,-114,107,-119v50,-4,59,66,22,85v-16,8,-61,10,-79,15v36,27,185,24,165,-36xm128,-119v-23,-3,-43,4,-53,15v13,5,46,-4,53,-15",w:414},"∏":{d:"243,-190v7,-18,27,-19,38,6v0,2,-5,8,-14,16v-8,-9,-27,-4,-24,-22xm221,-111v55,-7,60,22,45,64v5,23,17,47,-22,47v-35,0,-18,-40,-15,-70v-2,-19,-35,-13,-52,-18v-2,0,-13,1,-34,3v-4,0,-10,11,-13,31v-3,20,1,43,-11,54v-12,-4,-13,-5,-21,-3v-13,-13,-3,-25,-12,-41v7,-6,12,-22,10,-39v-23,-8,-79,15,-87,-21v12,-28,78,-4,101,-20r36,-96v8,-19,17,-28,27,-28v10,0,15,6,15,18v-6,32,-31,62,-38,109v25,10,47,-1,71,10",w:282},"π":{d:"247,-240v-3,5,-14,12,-21,6v-41,5,-71,-4,-85,37v-6,7,-21,42,-25,61v28,12,104,-16,129,24v8,11,12,24,12,38v-7,17,-2,99,-40,68v-9,-23,-5,-47,-1,-73v3,-24,-40,-24,-50,-19v-4,0,-18,2,-44,6v-30,-6,-16,49,-33,58v-19,-11,-14,2,-29,-10v8,-71,20,-114,43,-170v-24,-2,-49,4,-73,7v-30,3,-32,-33,-7,-36r184,-22v17,-1,40,13,40,25",w:265},"∫":{d:"62,-151v-7,-70,20,-130,63,-150v28,1,39,10,70,23v20,8,6,33,-6,35v-29,-13,-45,-20,-49,-20v-20,-4,-45,51,-43,70v8,60,5,129,5,189v0,62,-27,93,-79,93v-37,-1,-71,-14,-63,-57v21,0,79,34,91,-2v16,-3,14,-64,21,-85v-2,-31,-1,-74,-10,-96",w:156},"ª":{d:"6,-265v1,-31,58,-53,80,-22v-11,14,25,28,25,36v-2,8,-15,12,-27,10v-22,-29,-68,19,-78,-24xm52,-281v-8,1,-24,10,-9,13v11,1,24,-10,9,-13",w:117},"º":{d:"13,-273v1,-31,56,-41,83,-18v36,8,14,48,-9,52v-35,6,-64,-5,-74,-34xm81,-269v-7,-7,-20,-11,-29,-6v5,13,13,11,29,6",w:128},"Ω":{d:"121,-111v9,16,43,-5,54,5v28,-4,62,8,81,-5v48,-33,166,-28,160,44v15,34,-51,53,-88,53v-34,0,-53,-21,-71,-37v-15,7,-32,-4,-28,-22v-26,-4,-93,-6,-108,8v8,17,5,37,12,54v-1,15,-18,15,-31,10v-9,-15,-20,-39,-19,-63v-20,-9,-73,15,-79,-18v4,-28,50,-11,77,-24v12,-99,36,-168,137,-178v35,5,64,20,67,57v0,13,-14,18,-20,5v-15,-35,-83,-31,-104,4v-26,20,-39,82,-40,107xm334,-45v15,2,51,-14,53,-22v-7,-20,-36,-31,-69,-29v-8,-1,-39,6,-37,14v-3,10,44,38,53,37",w:424},"æ":{d:"145,-44r33,7v2,42,-59,29,-85,16v-6,7,-35,24,-48,15v-19,2,-35,-21,-33,-37v2,-24,5,-19,28,-36v-6,-8,-45,3,-33,-21v21,-22,58,-12,85,-1v6,-5,35,-28,45,-15v20,-4,36,17,36,35v0,23,-4,21,-28,37xm111,-72v12,3,49,-16,19,-17v-5,0,-20,12,-19,17xm74,-50v-14,-4,-48,16,-19,17v4,1,19,-14,19,-17",w:184},"ø":{d:"76,-136v17,7,33,-8,51,0v9,-6,21,-13,36,-21v23,22,-13,31,3,50v11,13,4,21,14,35v-4,5,-1,14,-4,23v-14,23,-45,41,-84,39v-12,2,-29,28,-41,38v-2,-11,-34,-10,-15,-30v3,-7,5,-11,5,-11v-15,-24,-60,-54,-22,-89v23,-21,25,-32,57,-34xm102,-54v18,1,50,-19,30,-32v-12,7,-22,18,-30,32xm85,-92v-14,3,-26,8,-38,17v2,20,17,13,26,0v6,-8,12,-13,12,-17",w:188},"¿":{d:"181,-247v3,1,31,2,29,15v-4,22,-37,27,-41,4v1,-5,7,-20,12,-19xm161,-34v-45,-1,-105,19,-124,51v0,11,18,17,54,17v39,0,82,-13,112,4v-10,35,-58,31,-100,31v-47,0,-80,-10,-99,-31v-10,-56,22,-73,64,-90v8,-3,32,-9,74,-18v21,-15,7,-62,22,-92v-1,-5,-1,-11,4,-12v16,0,24,7,24,22v-8,30,-8,73,-17,111v-3,5,-7,7,-14,7",w:213},"¡":{d:"86,-197v8,16,-7,41,-24,25v-11,-11,-4,-16,-3,-29v13,0,15,-2,27,4xm46,-107v4,-8,11,-16,23,-7v19,26,-5,57,-6,87v-7,0,-5,18,-9,28v0,14,-17,52,-11,70v-2,7,-15,28,-25,12v-4,-6,-15,-7,-6,-16v2,-39,14,-96,34,-174",w:95},"¬":{d:"141,-99v47,7,103,-3,149,6v14,24,18,15,10,39v-10,34,-7,31,-26,76v-4,6,-15,8,-16,21v-4,2,-4,1,-13,5v-22,-33,-4,-33,16,-104v-5,-9,-28,-4,-38,-6r-183,4v-14,0,-41,-29,-17,-36v31,-9,82,5,118,-5",w:315},"√":{d:"364,-218v43,-21,80,-51,104,-32v-3,19,-24,21,-44,40v-41,15,-78,53,-136,78r-137,98v-20,16,-79,66,-91,68v-3,1,-25,-11,-24,-13v-4,-28,-43,-61,-30,-85v26,-15,42,19,58,32r295,-188v0,1,2,2,5,2",w:474},"ƒ":{d:"115,-262v-23,6,-39,63,-38,96v1,3,57,2,54,16v1,22,-45,15,-51,30v3,34,12,68,10,103v14,17,-18,53,-28,63v-48,8,-89,5,-95,-37v20,-5,77,21,83,-18v17,-29,-4,-61,0,-98v0,-5,-3,-10,-7,-17v-33,4,-43,-17,-25,-37v10,-4,27,5,27,-10v0,-43,15,-77,32,-109v12,-7,16,-22,38,-20v11,1,51,35,25,55v-9,1,-16,-17,-25,-17",w:145},"≈":{d:"133,-112v21,15,48,-30,78,-17v3,3,5,7,5,9v-8,30,-47,45,-76,45v-19,0,-64,-48,-90,-21r-29,20v-6,-1,-17,-16,-15,-32v24,-17,70,-42,107,-21v4,4,10,9,20,17xm138,-57v28,2,48,-25,76,-26v13,30,-21,42,-40,53v-41,24,-77,-15,-114,-23v-15,14,-46,32,-49,-1v-3,-9,27,-28,54,-30",w:223},"∆":{d:"18,-1v-24,-30,8,-48,25,-71v14,-19,34,-28,40,-56v20,-35,29,-14,57,4v9,39,43,62,57,102v0,16,-34,17,-50,14v-28,2,-72,4,-129,7xm139,-47r-22,-52v-12,-5,-12,15,-24,27v-7,6,-14,16,-23,28v23,1,36,-1,69,-3",w:199},"«":{d:"191,-64v16,6,87,37,53,63v-39,-9,-71,-28,-107,-40v-14,-13,-13,-34,10,-47v27,-15,48,-55,84,-62v9,-2,21,10,21,18r-13,21v-16,5,-44,22,-51,41v0,4,1,6,3,6xm71,-65v17,6,87,35,55,62v-39,-8,-66,-27,-108,-40v-14,-13,-13,-36,10,-46v23,-18,50,-56,84,-63v9,-2,21,10,21,18r-13,22v-20,6,-32,17,-51,37v0,3,-1,11,2,10",w:265},"»":{d:"120,-129v9,-33,48,-10,64,5v9,20,86,52,50,86v-36,11,-66,31,-107,40v-6,-7,-9,-13,-9,-17v-2,-13,50,-46,63,-46v11,-18,-33,-42,-48,-47xm1,-128v10,-33,46,-8,64,6v8,19,86,50,51,85v-40,13,-69,30,-108,40v-6,-7,-8,-12,-8,-16v-2,-14,50,-46,63,-47v7,-13,-9,-20,-19,-30v-10,-9,-20,-15,-30,-17",w:252},"…":{d:"244,-24v-1,21,-38,32,-41,3v-2,-19,23,-22,34,-17v0,7,0,15,7,14xm113,-24v0,-22,28,-21,38,-8v5,34,-39,40,-38,8xm35,-2v-10,-2,-36,-17,-18,-29v-1,-15,17,-17,31,-6v7,17,6,33,-13,35",w:258}," ":{w:179},"À":{d:"161,-217v20,53,23,124,54,170v-2,20,-34,9,-42,0v-27,-12,-78,-18,-101,-18v-26,6,-29,51,-54,63v-18,-4,-19,-30,-3,-38v5,-9,15,-16,8,-29v1,-12,23,-9,26,-19v6,-10,11,-20,20,-27r70,-121v12,-4,16,4,22,19xm82,-91v17,3,62,7,86,13v-13,-33,-13,-80,-29,-109v-15,30,-38,63,-57,96xm150,-268v14,10,54,14,37,41v-28,-7,-62,-22,-100,-42v-2,-3,-2,-26,5,-23v16,4,42,17,58,24"},"Ã":{d:"161,-217v20,53,23,124,54,170v-2,20,-34,9,-42,0v-27,-12,-78,-18,-101,-18v-26,6,-29,51,-54,63v-18,-4,-19,-30,-3,-38v5,-9,15,-16,8,-29v1,-12,23,-9,26,-19v6,-10,11,-20,20,-27r70,-121v12,-4,16,4,22,19xm82,-91v17,3,62,7,86,13v-13,-33,-13,-80,-29,-109v-15,30,-38,63,-57,96xm100,-285v26,-19,54,19,69,22v4,0,15,-5,34,-13v23,-9,22,-17,31,-12v3,11,-9,9,-7,21v-26,20,-46,30,-59,30v-3,3,-50,-26,-49,-29v-12,1,-31,35,-51,32v-3,-8,-5,-14,-5,-18v10,-9,16,-17,37,-33"},"Õ":{d:"62,-184v78,-31,249,-50,238,74v-6,65,-102,105,-179,115v-77,-7,-152,-71,-101,-149v2,-5,24,-33,42,-40xm279,-120v14,-38,-47,-64,-85,-61v-20,-9,-41,7,-62,0v-11,7,-54,12,-66,24v0,20,-51,35,-38,66v-1,43,50,67,96,67v44,0,162,-55,155,-96xm116,-270v26,-19,54,19,69,22v4,0,15,-5,34,-13v23,-10,22,-16,31,-12v3,11,-8,9,-7,21v-45,28,-47,42,-88,16v-29,-19,-12,-20,-43,2v-8,5,-12,18,-23,15v-13,-3,-12,-20,-4,-23v4,-6,14,-15,31,-28",w:273},"Œ":{d:"247,-243v71,4,161,-7,245,-8v17,0,27,6,27,17v-8,27,-70,14,-104,23v-3,1,-52,0,-65,7r0,4v16,16,17,29,17,65v32,10,74,-14,99,16v-14,25,-76,17,-127,24v-17,18,-55,32,-75,51v85,0,128,-3,204,-11v15,-2,21,11,20,29v-78,24,-177,12,-270,24v-24,3,-24,-29,-48,-15v-46,7,-70,4,-105,-4v-19,-18,-42,-22,-52,-55v-10,-34,0,-47,12,-78v-18,-59,48,-78,105,-84v17,-18,103,-13,117,-5xm125,-45v76,-9,186,-43,209,-105v-26,-67,-137,-83,-217,-54v3,34,-45,25,-60,58v-41,48,5,108,68,101",w:492},"œ":{d:"185,-54v25,28,107,-17,104,33v-12,12,-60,14,-87,14v0,0,1,1,2,1v-11,1,-39,-9,-50,-17v-28,17,-75,32,-114,7v-22,-14,-34,-11,-34,-41v0,-36,33,-49,48,-75v29,-16,72,-3,95,11v12,-9,48,-27,59,-26v30,0,64,15,65,40v0,7,-6,20,-20,37v-29,1,-44,11,-68,16xm226,-106v-21,-7,-41,-2,-48,13v14,1,42,-7,48,-13xm132,-87v-21,-35,-94,11,-92,24v-2,14,43,21,61,21v25,0,36,-20,31,-45",w:295},"–":{d:"6,-66v-8,-72,79,-21,146,-39v37,-10,79,7,111,0v9,8,14,13,14,17v2,26,-72,13,-99,21v-83,4,-124,21,-172,1",w:282},"—":{d:"175,-106v86,-9,201,1,286,-1v11,6,13,11,6,30v-118,15,-246,10,-377,10v-25,0,-73,3,-82,-8r-2,-26v11,-13,32,-9,52,-7v38,3,84,-5,117,2",w:485},"“":{d:"66,-261v-21,5,-37,51,-22,77v0,4,-2,6,-7,6v-31,-9,-38,-62,-12,-94v12,-15,21,-28,31,-34v16,-1,19,24,22,34v10,-11,22,-32,43,-23v-2,8,4,16,5,19v-6,11,-51,53,-29,74v-12,21,-30,5,-33,-17v-6,-13,9,-28,2,-42",w:118},"”":{d:"120,-294v12,3,30,26,19,34v2,15,-40,70,-55,66v-40,-10,10,-51,14,-64v3,-3,8,-31,22,-36xm70,-306v14,3,26,34,16,49v-19,30,-31,45,-58,59v-12,-11,-33,-17,-7,-36v13,-19,36,-27,36,-59v0,-5,9,-13,13,-13",w:148},"‘":{d:"73,-262v-10,7,-41,39,-38,69v-15,13,-27,-16,-28,-28v-2,-20,51,-83,66,-83v20,0,25,41,0,42",w:95},"’":{d:"74,-300v13,31,-1,99,-44,101v-13,0,-19,-5,-19,-15v6,-10,31,-34,35,-59v2,-11,1,-32,11,-32v6,0,11,2,17,5",w:90},"÷":{d:"167,-158v-4,3,-7,9,-10,20v-23,4,-34,-8,-29,-31v14,-6,18,1,39,11xm78,-72v-53,11,-53,12,-69,-15v-1,-12,11,-17,22,-14v71,-13,151,-18,230,-24v11,1,21,16,23,28v-28,20,-90,11,-126,16v-36,5,-62,5,-80,9xm123,-40v19,-17,41,-1,41,17v0,13,-6,19,-17,19v-15,0,-29,-14,-24,-36",w:293},"◊":{d:"76,-158v48,-8,64,11,100,36v28,19,-5,39,-22,54v-15,13,-40,32,-48,49v-17,5,-12,0,-27,-16v-6,-6,-86,-31,-68,-53r2,-9v27,-23,48,-44,63,-61xm93,-65v12,-2,35,-31,41,-38v-5,-10,-16,-14,-34,-24v-12,12,-36,29,-40,44v19,11,30,18,33,18",w:199},"ÿ":{d:"118,85v-11,11,-11,38,-22,61v-2,-1,-2,31,-17,27v-11,0,-21,-10,-21,-22v20,-66,23,-61,64,-168v-22,1,-38,16,-58,4v-22,4,-51,-16,-51,-42v-11,-13,-7,-59,7,-58v16,1,21,24,22,51v21,33,66,5,94,-7v4,-3,26,-14,38,-29r17,0v23,44,-23,59,-34,102v-6,9,-13,9,-13,26v-15,6,-12,33,-27,48v0,2,1,4,1,7xm158,-136v0,8,-4,13,-12,13v-18,0,-21,-20,-16,-34v18,-1,29,1,28,21xm62,-161v7,3,28,9,27,18v1,8,-8,17,-17,17v-18,0,-26,-24,-10,-35",w:190},"Ÿ":{d:"176,-189v35,20,-25,54,-39,72v-26,34,-57,57,-74,104v-10,15,-4,14,-23,3r0,-10v19,-44,27,-46,50,-81v-9,-5,-24,4,-34,4v-38,0,-54,-50,-44,-87v21,-5,18,19,22,35v4,18,15,27,29,27v41,0,60,-39,113,-67xm153,-222v0,8,-3,12,-11,12v-18,0,-21,-19,-16,-33v18,-1,28,2,27,21xm57,-247v8,2,29,9,28,17v0,21,-37,24,-36,1v0,-7,2,-13,8,-18",w:135},"⁄":{d:"193,-305v7,6,17,31,3,41v-10,7,-12,13,-21,25v-79,56,-190,209,-197,260r-18,0v-23,-19,9,-70,15,-85v52,-83,121,-179,218,-241",w:120},"¤":{d:"308,-133r-200,16v-2,1,-6,4,-10,10v70,-2,144,-14,211,-8v3,0,8,4,13,8v-1,4,-3,9,-9,17v-57,11,-164,6,-219,25v26,32,112,25,173,25v9,0,35,2,35,19v0,9,-4,13,-12,14v-115,12,-146,23,-211,-19v-12,-4,-22,-9,-25,-27v-6,-29,-61,3,-43,-49v17,-1,36,7,42,-12v-32,7,-36,-39,-11,-40v29,14,63,-25,73,-30v52,-25,72,-44,142,-44v23,0,21,41,-1,39v-35,-3,-61,9,-102,31v2,2,5,4,8,4v18,-6,101,-9,115,-9v7,0,55,13,31,30",w:312},"€":{d:"308,-133r-200,16v-2,1,-6,4,-10,10v70,-2,144,-14,211,-8v3,0,8,4,13,8v-1,4,-3,9,-9,17v-57,11,-164,6,-219,25v26,32,112,25,173,25v9,0,35,2,35,19v0,9,-4,13,-12,14v-115,12,-146,23,-211,-19v-12,-4,-22,-9,-25,-27v-6,-29,-61,3,-43,-49v17,-1,36,7,42,-12v-32,7,-36,-39,-11,-40v29,14,63,-25,73,-30v52,-25,72,-44,142,-44v23,0,21,41,-1,39v-35,-3,-61,9,-102,31v2,2,5,4,8,4v18,-6,101,-9,115,-9v7,0,55,13,31,30",w:312},"‹":{d:"64,-107v9,17,86,17,87,43v0,11,-4,16,-13,16v-36,-11,-70,-22,-109,-31v-19,-4,-18,-14,-9,-36v59,-56,93,-84,101,-84v17,0,19,20,13,29",w:159},"›":{d:"41,-181v26,27,112,44,70,91r-82,60v-20,3,-25,-23,-13,-32r70,-51r-66,-46v-5,-6,-4,-28,5,-29v4,2,9,4,16,7",w:137},"":{d:"74,-74v-6,-24,-70,8,-68,-27v0,-6,6,-20,20,-18v44,6,45,-9,42,-49v7,-40,26,-114,90,-104v48,-2,63,-1,90,30v11,25,4,14,2,44v-7,17,-54,9,-49,-7r8,-21v-5,-13,-22,-9,-43,-11v-56,-6,-63,45,-67,92v-2,21,5,23,22,22v37,-1,80,-9,113,-1v13,31,-9,82,-22,106v-13,10,-26,-6,-22,-25r11,-46v0,-3,-2,-6,-6,-6v-19,0,-47,3,-83,9v-6,1,-9,4,-8,11r12,59v-1,9,-11,30,-23,18v-18,-18,-15,-59,-19,-76",w:272},"":{d:"43,-61v-21,4,-36,2,-39,-15v-4,-35,41,-8,34,-47v4,-59,12,-99,46,-124v11,-42,157,-47,149,13v1,7,-7,15,-13,15v-18,-7,-19,-26,-47,-23v-34,3,-65,6,-79,37v-12,27,-22,52,-21,91v13,9,31,-11,45,-4v32,-15,50,-6,94,-13v12,-30,19,-79,36,-133v1,-5,5,-8,12,-8v44,18,-18,106,-12,144v-9,22,-1,73,-16,104v2,28,-23,28,-37,16v1,-26,9,-48,11,-75v0,-6,-3,-9,-9,-9v-43,0,-83,8,-119,24v8,40,17,33,-7,56v-20,-9,-21,-19,-28,-49",w:283},"‡":{d:"102,-284v16,2,42,-2,33,18v-7,15,-42,1,-38,30v3,3,31,1,30,11v4,15,-29,19,-36,24v-2,18,-4,24,-16,29r-25,-26v-25,7,-53,3,-42,-25v4,-10,70,0,51,-22v-17,4,-41,12,-39,-15v-5,-16,39,-18,44,-20v4,-2,7,-10,10,-24v19,-3,23,6,28,20",w:145},"∙":{d:"57,-77v6,18,-7,21,-19,23v-34,6,-25,-40,-9,-43v18,-3,29,8,28,20",w:67},"‚":{d:"25,63v-26,21,-48,-2,-22,-24v14,-12,35,-40,35,-69v3,-2,3,-11,12,-9v35,17,5,88,-25,102",w:97},"„":{d:"25,63v-26,21,-48,-2,-22,-24v11,-9,36,-41,35,-69v3,-2,4,-12,12,-9v36,14,5,89,-25,102xm84,64v-24,20,-45,-1,-21,-24v21,-20,32,-35,35,-69v3,-2,3,-11,12,-9v36,17,9,86,-26,102",w:135},"‰":{d:"398,-131v58,-1,87,13,72,65v-1,30,-66,63,-99,65v-56,3,-99,-58,-62,-102v2,2,5,2,8,2v20,-16,51,-17,81,-30xm202,-279v33,0,94,-24,95,18v-7,31,-33,27,-54,55v-36,32,-71,74,-112,99v-18,18,-40,34,-51,58v-19,14,-25,37,-56,40v-17,2,-25,-29,-10,-40v15,-11,40,-37,52,-52r87,-72v-51,13,-100,6,-116,-27v1,-5,-6,-30,-9,-36v-3,-5,22,-41,27,-39v29,2,16,34,5,49v0,15,14,23,42,23v42,0,59,-31,28,-38v-17,-4,-53,3,-50,-23v0,-7,1,-12,4,-16v16,-9,36,4,49,5v0,0,23,-4,69,-4xm222,-118v33,-2,55,18,50,57v-29,36,-48,45,-96,50v-27,-5,-56,-17,-58,-51v13,-37,64,-43,104,-56xm335,-61v13,44,101,7,108,-31v-11,-3,-20,-4,-30,-4v-18,-1,-82,18,-78,35xm225,-244v-18,0,-29,-1,-46,3v7,15,6,28,0,43v15,-14,34,-30,46,-46xm164,-53v26,5,59,-10,76,-26v-17,-16,-49,2,-67,14v1,8,-8,6,-9,12",w:485},"Â":{d:"161,-217v20,53,23,124,54,170v-2,20,-34,9,-42,0v-27,-12,-78,-18,-101,-18v-26,6,-29,51,-54,63v-18,-4,-19,-30,-3,-38v5,-9,15,-16,8,-29v1,-12,23,-9,26,-19v6,-10,11,-20,20,-27r70,-121v12,-4,16,4,22,19xm82,-91v17,3,62,7,86,13v-13,-33,-13,-80,-29,-109v-15,30,-38,63,-57,96xm202,-219v-27,-6,-40,-26,-61,-37v-21,7,-39,46,-65,23v-2,-4,-3,-10,-4,-14v19,-4,43,-32,61,-43v27,6,40,22,62,37v12,8,18,17,18,25v0,6,-3,9,-11,9"},"Ê":{d:"49,-160v1,-4,-10,-9,-15,-8v-15,-35,32,-30,57,-31r142,-8v2,1,30,7,40,10v-52,16,-133,17,-190,30v-7,9,-12,24,-15,47v26,10,102,-6,141,3v1,3,1,6,2,10v-36,18,-92,12,-149,21v-11,9,-16,41,-16,51v55,-1,111,-21,168,-13v15,-8,48,1,31,18v-53,16,-130,13,-198,29r-39,-8v-4,-19,17,-53,20,-76v-1,0,-7,-11,-9,-18v18,-7,22,-28,30,-57xm199,-211v-27,-6,-39,-26,-60,-37v-21,7,-40,47,-65,22v-2,-7,-2,-7,-4,-13v18,-5,44,-31,61,-43v27,6,41,22,62,37v12,9,18,17,18,25v0,6,-4,9,-12,9",w:252},"Á":{d:"161,-217v20,53,23,124,54,170v-2,20,-34,9,-42,0v-27,-12,-78,-18,-101,-18v-26,6,-29,51,-54,63v-18,-4,-19,-30,-3,-38v5,-9,15,-16,8,-29v1,-12,23,-9,26,-19v6,-10,11,-20,20,-27r70,-121v12,-4,16,4,22,19xm82,-91v17,3,62,7,86,13v-13,-33,-13,-80,-29,-109v-15,30,-38,63,-57,96xm84,-250v31,-5,83,-53,100,-31v0,5,-11,15,-35,28v-16,5,-51,28,-53,25v-14,1,-16,-11,-12,-22"},"Ë":{d:"49,-160v1,-4,-10,-9,-15,-8v-15,-35,32,-30,57,-31r142,-8v2,1,30,7,40,10v-52,16,-133,17,-190,30v-7,9,-12,24,-15,47v26,10,102,-6,141,3v1,3,1,6,2,10v-36,18,-92,12,-149,21v-11,9,-17,41,-17,51v55,0,112,-21,169,-13v15,-8,48,1,31,18v-53,16,-130,13,-198,29r-39,-8v-3,-21,17,-53,20,-76v-1,0,-7,-11,-9,-18v18,-7,22,-28,30,-57xm191,-236v0,8,-4,13,-12,13v-17,0,-19,-19,-16,-34v18,-1,29,1,28,21xm95,-261v7,3,29,9,28,18v0,7,-9,17,-18,17v-18,0,-26,-25,-10,-35",w:252},"È":{d:"49,-160v1,-4,-10,-9,-15,-8v-15,-35,32,-30,57,-31r142,-8v2,1,30,7,40,10v-52,16,-133,17,-190,30v-7,9,-12,24,-15,47v26,10,102,-6,141,3v1,3,1,6,2,10v-36,18,-92,12,-149,21v-11,9,-16,41,-16,51v55,-1,111,-21,168,-13v15,-8,48,1,31,18v-53,16,-130,13,-198,29r-39,-8v-4,-19,17,-53,20,-76v-1,0,-7,-11,-9,-18v18,-7,22,-28,30,-57xm184,-236v6,9,5,13,0,23v-28,-7,-62,-21,-100,-41v-3,-2,-3,-27,5,-23v34,11,60,25,95,41",w:252},"Í":{d:"26,-5v-9,-6,-9,-12,-9,-36v0,-71,7,-119,21,-144v8,-13,14,-20,19,-20v28,19,-7,89,-10,120v-2,21,-8,47,-14,76v-2,1,-2,0,-7,4xm6,-233v31,-6,83,-53,101,-31v2,11,-80,53,-89,53v-14,1,-14,-11,-12,-22",w:104},"Î":{d:"53,-9v-15,7,-16,-3,-16,-32v0,-71,7,-119,21,-144v8,-13,14,-20,19,-20v28,19,-7,89,-10,120v-2,21,-8,47,-14,76xm137,-209v-27,-6,-40,-26,-61,-37v-8,0,-9,4,-13,10v-11,13,-50,37,-56,0v18,-5,43,-32,61,-43v28,5,40,21,62,36v12,9,18,17,18,25v0,6,-4,9,-11,9",w:144},"Ï":{d:"33,-5v-9,-6,-9,-12,-9,-36v0,-71,8,-119,22,-144v8,-13,14,-20,19,-20v27,20,-11,87,-10,120r-15,76v-1,1,-4,2,-7,4xm111,-222v0,8,-4,12,-12,12v-18,0,-19,-19,-16,-33v18,-1,29,1,28,21xm15,-247v8,2,29,9,28,17v0,21,-37,24,-36,1v0,-7,2,-13,8,-18",w:110},"Ì":{d:"33,-5v-9,-6,-9,-12,-9,-36v0,-71,8,-119,22,-144v8,-13,14,-20,19,-20v27,20,-11,87,-10,120r-15,76v-1,1,-4,2,-7,4xm72,-247v7,6,55,15,36,40v-28,-7,-61,-21,-99,-41v-3,-2,-3,-27,5,-23v18,3,41,17,58,24",w:111},"Ó":{d:"62,-184v78,-31,249,-50,238,74v-6,65,-102,105,-179,115v-77,-7,-152,-71,-101,-149v2,-5,24,-33,42,-40xm279,-120v14,-38,-47,-64,-85,-61v-20,-9,-41,7,-62,0v-11,7,-54,12,-66,24v0,20,-51,35,-38,66v-1,43,50,67,96,67v44,0,162,-55,155,-96xm142,-250v27,-11,47,-32,59,-14v2,11,-80,53,-89,53v-13,1,-15,-11,-12,-21v10,-5,24,-11,42,-18",w:273},"Ô":{d:"62,-184v78,-31,249,-50,238,74v-6,65,-102,105,-179,115v-77,-7,-152,-71,-101,-149v2,-5,24,-33,42,-40xm279,-120v14,-38,-47,-64,-85,-61v-20,-9,-41,7,-62,0v-11,7,-54,12,-66,24v0,20,-51,35,-38,66v-1,43,50,67,96,67v44,0,162,-55,155,-96xm157,-282v17,18,52,34,54,63v-24,12,-52,-36,-53,-29r-42,34v-23,-4,-6,-31,5,-34v1,1,27,-37,36,-34",w:273},"":{d:"231,-188v31,-74,91,-99,188,-116v28,1,6,39,1,51v-20,52,-100,91,-148,126v2,4,6,7,12,10v42,-42,181,-41,166,46v-1,8,-19,8,-28,5v-43,1,-168,42,-106,86v15,16,33,28,61,39v0,10,0,17,-6,22v-8,8,-35,26,-78,51v-52,7,-128,22,-154,-17v-23,-35,-99,-35,-117,-77v-29,-68,25,-149,75,-175v44,-23,89,5,135,13v14,-26,2,-39,-1,-64",w:461},"Ò":{d:"62,-184v78,-31,249,-50,238,74v-6,65,-102,105,-179,115v-77,-7,-152,-71,-101,-149v2,-5,24,-33,42,-40xm279,-120v14,-38,-47,-64,-85,-61v-20,-9,-41,7,-62,0v-11,7,-54,12,-66,24v0,20,-51,35,-38,66v-1,43,50,67,96,67v44,0,162,-55,155,-96xm161,-262v14,10,52,13,37,41v-28,-7,-62,-21,-100,-41v-3,-3,-3,-26,5,-24v16,5,42,17,58,24",w:273},"Ú":{d:"281,-202v6,67,-30,121,-71,152v-3,14,-47,26,-60,39v-41,20,-110,1,-125,-26v-24,-44,-28,-84,-8,-127v12,-26,23,-38,37,-22v-2,2,-3,5,-3,10v-34,26,-30,116,5,134v22,32,86,-1,109,-8v38,-28,104,-64,97,-149v2,-10,7,-8,19,-3xm194,-265v3,-1,11,4,11,6v3,12,-81,52,-89,54v-14,0,-13,-9,-12,-22",w:262},"Û":{d:"281,-202v6,67,-30,121,-71,152v-3,14,-47,26,-60,39v-41,20,-110,1,-125,-26v-24,-44,-28,-84,-8,-127v12,-26,23,-38,37,-22v-2,2,-3,5,-3,10v-34,26,-30,116,5,134v22,32,86,-1,109,-8v38,-28,104,-64,97,-149v2,-10,7,-8,19,-3xm150,-266v24,11,58,27,73,46v0,5,-3,6,-10,6v-28,2,-61,-30,-63,-25v-10,0,-57,40,-69,23v3,-10,-8,-15,8,-19v17,-1,34,-29,61,-31",w:262},"Ù":{d:"281,-202v6,67,-30,121,-71,152v-3,14,-47,26,-60,39v-41,20,-110,1,-125,-26v-24,-44,-28,-84,-8,-127v12,-26,23,-38,37,-22v-2,2,-3,5,-3,10v-34,26,-30,116,5,134v22,32,86,-1,109,-8v38,-28,104,-64,97,-149v2,-10,7,-8,19,-3xm151,-243v14,10,54,14,37,41v-28,-7,-61,-22,-99,-42v-3,-2,-4,-25,4,-23v16,5,42,17,58,24",w:262},"ı":{d:"43,-103v21,4,16,56,11,100v-7,2,-11,1,-20,-5v0,-7,-13,-18,-11,-25v4,-23,-3,-68,20,-70",w:80},"ˆ":{d:"144,-220v-29,0,-41,-27,-63,-39v-8,0,-11,5,-15,11v-17,12,-32,31,-54,13v-2,-5,-3,-9,-4,-14v20,-5,45,-33,64,-45v28,6,43,23,65,38v12,9,19,19,19,27v0,6,-4,9,-12,9",w:165},"˜":{d:"47,-300v26,-21,57,19,72,23v4,0,16,-5,36,-14v24,-10,22,-16,32,-13v3,12,-7,11,-7,23v-27,21,-48,32,-62,32v-3,2,-52,-27,-51,-31v-12,-2,-34,40,-54,33v-4,-13,-8,-18,1,-24v5,-7,16,-15,33,-29",w:186},"¯":{d:"63,-295v28,-7,73,10,105,7v11,1,6,8,5,19v-37,21,-72,11,-136,11v-23,0,-31,-14,-27,-36v12,-15,40,0,53,-1",w:183},"˘":{d:"65,-269v20,-11,45,-31,74,-36v20,30,-42,40,-59,66v-5,6,-11,8,-18,8v-8,-3,-45,-32,-51,-54v5,-24,14,-13,34,1",w:158},"˙":{d:"23,-302v15,-13,32,1,32,18v1,22,-36,29,-39,4v0,0,3,-7,7,-22",w:70},"˚":{d:"23,-225v-43,-24,-11,-85,41,-78v16,2,31,4,46,17v32,54,-41,86,-87,61xm33,-257v2,20,57,11,57,-6v0,-6,-11,-9,-33,-12v-14,-2,-24,13,-24,18",w:123},"¸":{d:"74,16v32,2,49,14,55,36v-3,7,-14,31,-29,33v-28,4,-57,11,-88,14v-19,-6,-13,-31,8,-33v20,-1,59,-5,73,-14v-17,-14,-68,8,-53,-37v9,-10,2,-28,24,-30v8,8,13,17,10,31",w:129},"˝":{d:"91,-249v15,-11,38,-53,57,-29v0,9,0,14,-3,23v-2,3,-20,22,-54,55v-5,5,-10,8,-16,8v-17,2,-6,-22,-7,-31v-1,0,-2,0,-4,1v-17,21,-29,31,-50,27v-5,-18,-3,-15,3,-27v23,-27,40,-46,48,-59v7,-12,31,3,29,9v-1,14,-3,24,-13,31v4,4,9,-1,10,-8",w:151},"˛":{d:"82,-5v-8,12,-16,55,-21,75v0,4,2,7,7,7v6,0,22,-7,50,-20v8,0,12,7,12,20v-2,22,-6,14,-27,30v-15,12,-26,16,-30,16v-47,-8,-59,-14,-56,-75v8,-27,12,-54,25,-77v19,-21,35,15,40,24",w:138},"ˇ":{d:"39,-286v33,46,63,-4,96,-16v6,0,9,6,9,19v0,24,-49,46,-77,46v-32,0,-52,-28,-59,-48v0,-25,23,-17,31,-1",w:153},"\r":{w:179}}}),function(){"use strict";
-function AssertException(message){this.message=message}function assert(exp,message){if(!exp)throw new AssertException(message)}function getCenterX(box){return box.x+box.width/2}function getCenterY(box){return box.y+box.height/2}var DIAGRAM_MARGIN=10,ACTOR_MARGIN=10,ACTOR_PADDING=10,SIGNAL_MARGIN=5,SIGNAL_PADDING=5,NOTE_MARGIN=10,NOTE_PADDING=5,NOTE_OVERLAP=15,TITLE_MARGIN=0,TITLE_PADDING=5,SELF_SIGNAL_WIDTH=20,PLACEMENT=Diagram.PLACEMENT,LINETYPE=Diagram.LINETYPE,ARROWTYPE=Diagram.ARROWTYPE,LINE={stroke:"#000","stroke-width":2},RECT={fill:"#fff"};AssertException.prototype.toString=function(){return"AssertException: "+this.message},String.prototype.trim||(String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g,"")}),Raphael.fn.line=function(x1,y1,x2,y2){return assert(_.all([x1,x2,y1,y2],_.isFinite),"x1,x2,y1,y2 must be numeric"),this.path("M{0},{1} L{2},{3}",x1,y1,x2,y2)},Raphael.fn.wobble=function(x1,y1,x2,y2){assert(_.all([x1,x2,y1,y2],_.isFinite),"x1,x2,y1,y2 must be numeric");var wobble=Math.sqrt((x2-x1)*(x2-x1)+(y2-y1)*(y2-y1))/25,r1=Math.random(),r2=Math.random(),xfactor=Math.random()>.5?wobble:-wobble,yfactor=Math.random()>.5?wobble:-wobble,p1={x:(x2-x1)*r1+x1+xfactor,y:(y2-y1)*r1+y1+yfactor},p2={x:(x2-x1)*r2+x1-xfactor,y:(y2-y1)*r2+y1-yfactor};return"C"+p1.x+","+p1.y+" "+p2.x+","+p2.y+" "+x2+","+y2},Raphael.fn.text_bbox=function(text,font){var p;font._obj?p=this.print_center(0,0,text,font._obj,font["font-size"]):(p=this.text(0,0,text),p.attr(font));var bb=p.getBBox();return p.remove(),bb},Raphael.fn.handRect=function(x,y,w,h){return assert(_.all([x,y,w,h],_.isFinite),"x, y, w, h must be numeric"),this.path("M"+x+","+y+this.wobble(x,y,x+w,y)+this.wobble(x+w,y,x+w,y+h)+this.wobble(x+w,y+h,x,y+h)+this.wobble(x,y+h,x,y)).attr(RECT)},Raphael.fn.handLine=function(x1,y1,x2,y2){return assert(_.all([x1,x2,y1,y2],_.isFinite),"x1,x2,y1,y2 must be numeric"),this.path("M"+x1+","+y1+this.wobble(x1,y1,x2,y2))},Raphael.fn.print_center=function(x,y,string,font,size,letter_spacing){var path=this.print(x,y,string,font,size,"baseline",letter_spacing),bb=path.getBBox(),dx=x-bb.x-bb.width/2,dy=y-bb.y-bb.height/2,m=new Raphael.matrix;return m.translate(dx,dy),path.attr("path",Raphael.mapPath(path.attr("path"),m))};var BaseTheme=function(diagram){this.init(diagram)};_.extend(BaseTheme.prototype,{init:function(diagram){this.diagram=diagram,this._paper=void 0,this._font=void 0,this._title=void 0,this._actors_height=0,this._signals_height=0;var a=this.arrow_types={};a[ARROWTYPE.FILLED]="block",a[ARROWTYPE.OPEN]="open";var l=this.line_types={};l[LINETYPE.SOLID]="",l[LINETYPE.DOTTED]="-"},init_paper:function(container){this._paper=new Raphael(container,320,200)},init_font:function(){},draw_line:function(x1,y1,x2,y2){return this._paper.line(x1,y1,x2,y2)},draw_rect:function(x,y,w,h){return this._paper.rect(x,y,w,h)},draw:function(container){var diagram=this.diagram;this.init_paper(container),this.init_font(),this.layout();var title_height=this._title?this._title.height:0;this._paper.setStart(),this._paper.setSize(diagram.width,diagram.height);var y=DIAGRAM_MARGIN+title_height;this.draw_title(),this.draw_actors(y),this.draw_signals(y+this._actors_height),this._paper.setFinish()},layout:function(){function actor_ensure_distance(a,b,d){assert(b>a,"a must be less than or equal to b"),0>a?(b=actors[b],b.x=Math.max(d-b.width/2,b.x)):b>=actors.length?(a=actors[a],a.padding_right=Math.max(d,a.padding_right)):(a=actors[a],a.distances[b]=Math.max(d,a.distances[b]?a.distances[b]:0))}var diagram=this.diagram,paper=this._paper,font=this._font,actors=diagram.actors,signals=diagram.signals;if(diagram.width=0,diagram.height=0,diagram.title){var title=this._title={},bb=paper.text_bbox(diagram.title,font);title.text_bb=bb,title.message=diagram.title,title.width=bb.width+2*(TITLE_PADDING+TITLE_MARGIN),title.height=bb.height+2*(TITLE_PADDING+TITLE_MARGIN),title.x=DIAGRAM_MARGIN,title.y=DIAGRAM_MARGIN,diagram.width+=title.width,diagram.height+=title.height}_.each(actors,function(a){var bb=paper.text_bbox(a.name,font);a.text_bb=bb,a.x=0,a.y=0,a.width=bb.width+2*(ACTOR_PADDING+ACTOR_MARGIN),a.height=bb.height+2*(ACTOR_PADDING+ACTOR_MARGIN),a.distances=[],a.padding_right=0,this._actors_height=Math.max(a.height,this._actors_height)},this),_.each(signals,function(s){var a,b,bb=paper.text_bbox(s.message,font);s.text_bb=bb,s.width=bb.width,s.height=bb.height;var extra_width=0;if("Signal"==s.type)s.width+=2*(SIGNAL_MARGIN+SIGNAL_PADDING),s.height+=2*(SIGNAL_MARGIN+SIGNAL_PADDING),s.isSelf()?(a=s.actorA.index,b=a+1,s.width+=SELF_SIGNAL_WIDTH):(a=Math.min(s.actorA.index,s.actorB.index),b=Math.max(s.actorA.index,s.actorB.index));else{if("Note"!=s.type)throw new Error("Unhandled signal type:"+s.type);if(s.width+=2*(NOTE_MARGIN+NOTE_PADDING),s.height+=2*(NOTE_MARGIN+NOTE_PADDING),extra_width=2*ACTOR_MARGIN,s.placement==PLACEMENT.LEFTOF)b=s.actor.index,a=b-1;else if(s.placement==PLACEMENT.RIGHTOF)a=s.actor.index,b=a+1;else if(s.placement==PLACEMENT.OVER&&s.hasManyActors())a=Math.min(s.actor[0].index,s.actor[1].index),b=Math.max(s.actor[0].index,s.actor[1].index),extra_width=-(2*NOTE_PADDING+2*NOTE_OVERLAP);else if(s.placement==PLACEMENT.OVER)return a=s.actor.index,actor_ensure_distance(a-1,a,s.width/2),actor_ensure_distance(a,a+1,s.width/2),this._signals_height+=s.height,void 0}actor_ensure_distance(a,b,s.width+extra_width),this._signals_height+=s.height},this);var actors_x=0;return _.each(actors,function(a){a.x=Math.max(actors_x,a.x),_.each(a.distances,function(distance,b){"undefined"!=typeof distance&&(b=actors[b],distance=Math.max(distance,a.width/2,b.width/2),b.x=Math.max(b.x,a.x+a.width/2+distance-b.width/2))}),actors_x=a.x+a.width+a.padding_right},this),diagram.width=Math.max(actors_x,diagram.width),diagram.width+=2*DIAGRAM_MARGIN,diagram.height+=2*DIAGRAM_MARGIN+2*this._actors_height+this._signals_height,this},draw_title:function(){var title=this._title;title&&this.draw_text_box(title,title.message,TITLE_MARGIN,TITLE_PADDING,this._font)},draw_actors:function(offsetY){var y=offsetY;_.each(this.diagram.actors,function(a){this.draw_actor(a,y,this._actors_height),this.draw_actor(a,y+this._actors_height+this._signals_height,this._actors_height);var aX=getCenterX(a),line=this.draw_line(aX,y+this._actors_height-ACTOR_MARGIN,aX,y+this._actors_height+ACTOR_MARGIN+this._signals_height);line.attr(LINE)},this)},draw_actor:function(actor,offsetY,height){actor.y=offsetY,actor.height=height,this.draw_text_box(actor,actor.name,ACTOR_MARGIN,ACTOR_PADDING,this._font)},draw_signals:function(offsetY){var y=offsetY;_.each(this.diagram.signals,function(s){"Signal"==s.type?s.isSelf()?this.draw_self_signal(s,y):this.draw_signal(s,y):"Note"==s.type&&this.draw_note(s,y),y+=s.height},this)},draw_self_signal:function(signal,offsetY){assert(signal.isSelf(),"signal must be a self signal");var text_bb=signal.text_bb,aX=getCenterX(signal.actorA),x=aX+SELF_SIGNAL_WIDTH+SIGNAL_PADDING-text_bb.x,y=offsetY+signal.height/2;this.draw_text(x,y,signal.message,this._font);var line,attr=_.extend({},LINE,{"stroke-dasharray":this.line_types[signal.linetype]}),y1=offsetY+SIGNAL_MARGIN,y2=y1+signal.height-SIGNAL_MARGIN;line=this.draw_line(aX,y1,aX+SELF_SIGNAL_WIDTH,y1),line.attr(attr),line=this.draw_line(aX+SELF_SIGNAL_WIDTH,y1,aX+SELF_SIGNAL_WIDTH,y2),line.attr(attr),line=this.draw_line(aX+SELF_SIGNAL_WIDTH,y2,aX,y2),attr["arrow-end"]=this.arrow_types[signal.arrowtype]+"-wide-long",line.attr(attr)},draw_signal:function(signal,offsetY){var aX=getCenterX(signal.actorA),bX=getCenterX(signal.actorB),x=(bX-aX)/2+aX,y=offsetY+SIGNAL_MARGIN+2*SIGNAL_PADDING;this.draw_text(x,y,signal.message,this._font),y=offsetY+signal.height-SIGNAL_MARGIN-SIGNAL_PADDING;var line=this.draw_line(aX,y,bX,y);line.attr(LINE),line.attr({"arrow-end":this.arrow_types[signal.arrowtype]+"-wide-long","stroke-dasharray":this.line_types[signal.linetype]})},draw_note:function(note,offsetY){note.y=offsetY;var actorA=note.hasManyActors()?note.actor[0]:note.actor,aX=getCenterX(actorA);switch(note.placement){case PLACEMENT.RIGHTOF:note.x=aX+ACTOR_MARGIN;break;case PLACEMENT.LEFTOF:note.x=aX-ACTOR_MARGIN-note.width;break;case PLACEMENT.OVER:if(note.hasManyActors()){var bX=getCenterX(note.actor[1]),overlap=NOTE_OVERLAP+NOTE_PADDING;note.x=aX-overlap,note.width=bX+overlap-note.x}else note.x=aX-note.width/2;break;default:throw new Error("Unhandled note placement:"+note.placement)}this.draw_text_box(note,note.message,NOTE_MARGIN,NOTE_PADDING,this._font)},draw_text:function(x,y,text,font){var t,paper=this._paper,f=font||{};f._obj?t=paper.print_center(x,y,text,f._obj,f["font-size"]):(t=paper.text(x,y,text),t.attr(f));var bb=t.getBBox(),r=paper.rect(bb.x,bb.y,bb.width,bb.height);r.attr({fill:"#fff",stroke:"none"}),t.toFront()},draw_text_box:function(box,text,margin,padding,font){var x=box.x+margin,y=box.y+margin,w=box.width-2*margin,h=box.height-2*margin,rect=this.draw_rect(x,y,w,h);rect.attr(LINE),x=getCenterX(box),y=getCenterY(box),this.draw_text(x,y,text,font)}});var RaphaëlTheme=function(diagram){this.init(diagram)};_.extend(RaphaëlTheme.prototype,BaseTheme.prototype,{init_font:function(){this._font={"font-size":16,"font-family":"Andale Mono, monospace"}}});var HandRaphaëlTheme=function(diagram){this.init(diagram)};_.extend(HandRaphaëlTheme.prototype,BaseTheme.prototype,{init_font:function(){this._font={"font-size":16,"font-family":"daniel"},this._font._obj=this._paper.getFont("daniel")},draw_line:function(x1,y1,x2,y2){return this._paper.handLine(x1,y1,x2,y2)},draw_rect:function(x,y,w,h){return this._paper.handRect(x,y,w,h)}});var themes={simple:RaphaëlTheme,hand:HandRaphaëlTheme};Diagram.prototype.drawSVG=function(container,options){var default_options={theme:"hand"};if(options=_.defaults(options||{},default_options),!(options.theme in themes))throw new Error("Unsupported theme: "+options.theme);var drawing=new themes[options.theme](this);drawing.draw(container)}}();
+!function () { "use strict"; function Diagram() { this.title = void 0, this.actors = [], this.signals = [] } function ParseError(message, hash) { _.extend(this, hash), this.name = "ParseError", this.message = message || "" } Diagram.prototype.getActor = function (alias) { var s = /^(.+) as (\S+)$/i.exec(alias.trim()); s ? (name = s[1].trim(), alias = s[2].trim()) : name = alias.trim(), name = name.replace(/\\n/gm, "\n"); var i, actors = this.actors; for (i in actors) if (actors[i].alias == alias) return actors[i]; return i = actors.push(new Diagram.Actor(alias, name, actors.length)), actors[i - 1] }, Diagram.prototype.setTitle = function (title) { this.title = title }, Diagram.prototype.addSignal = function (signal) { this.signals.push(signal) }, Diagram.Actor = function (alias, name, index) { this.alias = alias, this.name = name, this.index = index }, Diagram.Signal = function (actorA, signaltype, actorB, message) { this.type = "Signal", this.actorA = actorA, this.actorB = actorB, this.linetype = 3 & signaltype, this.arrowtype = 3 & signaltype >> 2, this.message = message }, Diagram.Signal.prototype.isSelf = function () { return this.actorA.index == this.actorB.index }, Diagram.Note = function (actor, placement, message) { if (this.type = "Note", this.actor = actor, this.placement = placement, this.message = message, this.hasManyActors() && actor[0] == actor[1]) throw new Error("Note should be over two different actors") }, Diagram.Note.prototype.hasManyActors = function () { return _.isArray(this.actor) }, Diagram.LINETYPE = { SOLID: 0, DOTTED: 1 }, Diagram.ARROWTYPE = { FILLED: 0, OPEN: 1 }, Diagram.PLACEMENT = { LEFTOF: 0, RIGHTOF: 1, OVER: 2 }; var grammar = function () { function Parser() { this.yy = {} } var parser = { trace: function () { }, yy: {}, symbols_: { error: 2, start: 3, document: 4, EOF: 5, line: 6, statement: 7, NL: 8, participant: 9, actor: 10, signal: 11, note_statement: 12, title: 13, message: 14, note: 15, placement: 16, over: 17, actor_pair: 18, ",": 19, left_of: 20, right_of: 21, signaltype: 22, ACTOR: 23, linetype: 24, arrowtype: 25, LINE: 26, DOTLINE: 27, ARROW: 28, OPENARROW: 29, MESSAGE: 30, $accept: 0, $end: 1 }, terminals_: { 2: "error", 5: "EOF", 8: "NL", 9: "participant", 13: "title", 15: "note", 17: "over", 19: ",", 20: "left_of", 21: "right_of", 23: "ACTOR", 26: "LINE", 27: "DOTLINE", 28: "ARROW", 29: "OPENARROW", 30: "MESSAGE" }, productions_: [0, [3, 2], [4, 0], [4, 2], [6, 1], [6, 1], [7, 2], [7, 1], [7, 1], [7, 2], [12, 4], [12, 4], [18, 1], [18, 3], [16, 1], [16, 1], [11, 4], [10, 1], [22, 2], [22, 1], [24, 1], [24, 1], [25, 1], [25, 1], [14, 1]], performAction: function (yytext, yyleng, yylineno, yy, yystate, $$) { var $0 = $$.length - 1; switch (yystate) { case 1: return yy; case 4: break; case 6: $$[$0]; break; case 7: yy.addSignal($$[$0]); break; case 8: yy.addSignal($$[$0]); break; case 9: yy.setTitle($$[$0]); break; case 10: this.$ = new Diagram.Note($$[$0 - 1], $$[$0 - 2], $$[$0]); break; case 11: this.$ = new Diagram.Note($$[$0 - 1], Diagram.PLACEMENT.OVER, $$[$0]); break; case 12: this.$ = $$[$0]; break; case 13: this.$ = [$$[$0 - 2], $$[$0]]; break; case 14: this.$ = Diagram.PLACEMENT.LEFTOF; break; case 15: this.$ = Diagram.PLACEMENT.RIGHTOF; break; case 16: this.$ = new Diagram.Signal($$[$0 - 3], $$[$0 - 2], $$[$0 - 1], $$[$0]); break; case 17: this.$ = yy.getActor($$[$0]); break; case 18: this.$ = $$[$0 - 1] | $$[$0] << 2; break; case 19: this.$ = $$[$0]; break; case 20: this.$ = Diagram.LINETYPE.SOLID; break; case 21: this.$ = Diagram.LINETYPE.DOTTED; break; case 22: this.$ = Diagram.ARROWTYPE.FILLED; break; case 23: this.$ = Diagram.ARROWTYPE.OPEN; break; case 24: this.$ = $$[$0].substring(1).trim().replace(/\\n/gm, "\n") } }, table: [{ 3: 1, 4: 2, 5: [2, 2], 8: [2, 2], 9: [2, 2], 13: [2, 2], 15: [2, 2], 23: [2, 2] }, { 1: [3] }, { 5: [1, 3], 6: 4, 7: 5, 8: [1, 6], 9: [1, 7], 10: 11, 11: 8, 12: 9, 13: [1, 10], 15: [1, 12], 23: [1, 13] }, { 1: [2, 1] }, { 5: [2, 3], 8: [2, 3], 9: [2, 3], 13: [2, 3], 15: [2, 3], 23: [2, 3] }, { 5: [2, 4], 8: [2, 4], 9: [2, 4], 13: [2, 4], 15: [2, 4], 23: [2, 4] }, { 5: [2, 5], 8: [2, 5], 9: [2, 5], 13: [2, 5], 15: [2, 5], 23: [2, 5] }, { 10: 14, 23: [1, 13] }, { 5: [2, 7], 8: [2, 7], 9: [2, 7], 13: [2, 7], 15: [2, 7], 23: [2, 7] }, { 5: [2, 8], 8: [2, 8], 9: [2, 8], 13: [2, 8], 15: [2, 8], 23: [2, 8] }, { 14: 15, 30: [1, 16] }, { 22: 17, 24: 18, 26: [1, 19], 27: [1, 20] }, { 16: 21, 17: [1, 22], 20: [1, 23], 21: [1, 24] }, { 5: [2, 17], 8: [2, 17], 9: [2, 17], 13: [2, 17], 15: [2, 17], 19: [2, 17], 23: [2, 17], 26: [2, 17], 27: [2, 17], 30: [2, 17] }, { 5: [2, 6], 8: [2, 6], 9: [2, 6], 13: [2, 6], 15: [2, 6], 23: [2, 6] }, { 5: [2, 9], 8: [2, 9], 9: [2, 9], 13: [2, 9], 15: [2, 9], 23: [2, 9] }, { 5: [2, 24], 8: [2, 24], 9: [2, 24], 13: [2, 24], 15: [2, 24], 23: [2, 24] }, { 10: 25, 23: [1, 13] }, { 23: [2, 19], 25: 26, 28: [1, 27], 29: [1, 28] }, { 23: [2, 20], 28: [2, 20], 29: [2, 20] }, { 23: [2, 21], 28: [2, 21], 29: [2, 21] }, { 10: 29, 23: [1, 13] }, { 10: 31, 18: 30, 23: [1, 13] }, { 23: [2, 14] }, { 23: [2, 15] }, { 14: 32, 30: [1, 16] }, { 23: [2, 18] }, { 23: [2, 22] }, { 23: [2, 23] }, { 14: 33, 30: [1, 16] }, { 14: 34, 30: [1, 16] }, { 19: [1, 35], 30: [2, 12] }, { 5: [2, 16], 8: [2, 16], 9: [2, 16], 13: [2, 16], 15: [2, 16], 23: [2, 16] }, { 5: [2, 10], 8: [2, 10], 9: [2, 10], 13: [2, 10], 15: [2, 10], 23: [2, 10] }, { 5: [2, 11], 8: [2, 11], 9: [2, 11], 13: [2, 11], 15: [2, 11], 23: [2, 11] }, { 10: 36, 23: [1, 13] }, { 30: [2, 13] }], defaultActions: { 3: [2, 1], 23: [2, 14], 24: [2, 15], 26: [2, 18], 27: [2, 22], 28: [2, 23], 36: [2, 13] }, parseError: function (str, hash) { if (!hash.recoverable) throw new Error(str); this.trace(str) }, parse: function (input) { function lex() { var token; return token = self.lexer.lex() || EOF, "number" != typeof token && (token = self.symbols_[token] || token), token } var self = this, stack = [0], vstack = [null], lstack = [], table = this.table, yytext = "", yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1; this.lexer.setInput(input), this.lexer.yy = this.yy, this.yy.lexer = this.lexer, this.yy.parser = this, "undefined" == typeof this.lexer.yylloc && (this.lexer.yylloc = {}); var yyloc = this.lexer.yylloc; lstack.push(yyloc); var ranges = this.lexer.options && this.lexer.options.ranges; this.parseError = "function" == typeof this.yy.parseError ? this.yy.parseError : Object.getPrototypeOf(this).parseError; for (var symbol, preErrorSymbol, state, action, r, p, len, newState, expected, yyval = {}; ;) { if (state = stack[stack.length - 1], this.defaultActions[state] ? action = this.defaultActions[state] : ((null === symbol || "undefined" == typeof symbol) && (symbol = lex()), action = table[state] && table[state][symbol]), "undefined" == typeof action || !action.length || !action[0]) { var errStr = ""; expected = []; for (p in table[state]) this.terminals_[p] && p > TERROR && expected.push("'" + this.terminals_[p] + "'"); errStr = this.lexer.showPosition ? "Parse error on line " + (yylineno + 1) + ":\n" + this.lexer.showPosition() + "\nExpecting " + expected.join(", ") + ", got '" + (this.terminals_[symbol] || symbol) + "'" : "Parse error on line " + (yylineno + 1) + ": Unexpected " + (symbol == EOF ? "end of input" : "'" + (this.terminals_[symbol] || symbol) + "'"), this.parseError(errStr, { text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected }) } if (action[0] instanceof Array && action.length > 1) throw new Error("Parse Error: multiple actions possible at state: " + state + ", token: " + symbol); switch (action[0]) { case 1: stack.push(symbol), vstack.push(this.lexer.yytext), lstack.push(this.lexer.yylloc), stack.push(action[1]), symbol = null, preErrorSymbol ? (symbol = preErrorSymbol, preErrorSymbol = null) : (yyleng = this.lexer.yyleng, yytext = this.lexer.yytext, yylineno = this.lexer.yylineno, yyloc = this.lexer.yylloc, recovering > 0 && recovering--); break; case 2: if (len = this.productions_[action[1]][1], yyval.$ = vstack[vstack.length - len], yyval._$ = { first_line: lstack[lstack.length - (len || 1)].first_line, last_line: lstack[lstack.length - 1].last_line, first_column: lstack[lstack.length - (len || 1)].first_column, last_column: lstack[lstack.length - 1].last_column }, ranges && (yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]]), r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack), "undefined" != typeof r) return r; len && (stack = stack.slice(0, 2 * -1 * len), vstack = vstack.slice(0, -1 * len), lstack = lstack.slice(0, -1 * len)), stack.push(this.productions_[action[1]][0]), vstack.push(yyval.$), lstack.push(yyval._$), newState = table[stack[stack.length - 2]][stack[stack.length - 1]], stack.push(newState); break; case 3: return !0 } } return !0 } }, lexer = function () { var lexer = { EOF: 1, parseError: function (str, hash) { if (!this.yy.parser) throw new Error(str); this.yy.parser.parseError(str, hash) }, setInput: function (input) { return this._input = input, this._more = this._backtrack = this.done = !1, this.yylineno = this.yyleng = 0, this.yytext = this.matched = this.match = "", this.conditionStack = ["INITIAL"], this.yylloc = { first_line: 1, first_column: 0, last_line: 1, last_column: 0 }, this.options.ranges && (this.yylloc.range = [0, 0]), this.offset = 0, this }, input: function () { var ch = this._input[0]; this.yytext += ch, this.yyleng++, this.offset++, this.match += ch, this.matched += ch; var lines = ch.match(/(?:\r\n?|\n).*/g); return lines ? (this.yylineno++, this.yylloc.last_line++) : this.yylloc.last_column++, this.options.ranges && this.yylloc.range[1]++, this._input = this._input.slice(1), ch }, unput: function (ch) { var len = ch.length, lines = ch.split(/(?:\r\n?|\n)/g); this._input = ch + this._input, this.yytext = this.yytext.substr(0, this.yytext.length - len - 1), this.offset -= len; var oldLines = this.match.split(/(?:\r\n?|\n)/g); this.match = this.match.substr(0, this.match.length - 1), this.matched = this.matched.substr(0, this.matched.length - 1), lines.length - 1 && (this.yylineno -= lines.length - 1); var r = this.yylloc.range; return this.yylloc = { first_line: this.yylloc.first_line, last_line: this.yylineno + 1, first_column: this.yylloc.first_column, last_column: lines ? (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length : this.yylloc.first_column - len }, this.options.ranges && (this.yylloc.range = [r[0], r[0] + this.yyleng - len]), this.yyleng = this.yytext.length, this }, more: function () { return this._more = !0, this }, reject: function () { return this.options.backtrack_lexer ? (this._backtrack = !0, this) : this.parseError("Lexical error on line " + (this.yylineno + 1) + ". You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true).\n" + this.showPosition(), { text: "", token: null, line: this.yylineno }) }, less: function (n) { this.unput(this.match.slice(n)) }, pastInput: function () { var past = this.matched.substr(0, this.matched.length - this.match.length); return (past.length > 20 ? "..." : "") + past.substr(-20).replace(/\n/g, "") }, upcomingInput: function () { var next = this.match; return next.length < 20 && (next += this._input.substr(0, 20 - next.length)), (next.substr(0, 20) + (next.length > 20 ? "..." : "")).replace(/\n/g, "") }, showPosition: function () { var pre = this.pastInput(), c = new Array(pre.length + 1).join("-"); return pre + this.upcomingInput() + "\n" + c + "^" }, test_match: function (match, indexed_rule) { var token, lines, backup; if (this.options.backtrack_lexer && (backup = { yylineno: this.yylineno, yylloc: { first_line: this.yylloc.first_line, last_line: this.last_line, first_column: this.yylloc.first_column, last_column: this.yylloc.last_column }, yytext: this.yytext, match: this.match, matches: this.matches, matched: this.matched, yyleng: this.yyleng, offset: this.offset, _more: this._more, _input: this._input, yy: this.yy, conditionStack: this.conditionStack.slice(0), done: this.done }, this.options.ranges && (backup.yylloc.range = this.yylloc.range.slice(0))), lines = match[0].match(/(?:\r\n?|\n).*/g), lines && (this.yylineno += lines.length), this.yylloc = { first_line: this.yylloc.last_line, last_line: this.yylineno + 1, first_column: this.yylloc.last_column, last_column: lines ? lines[lines.length - 1].length - lines[lines.length - 1].match(/\r?\n?/)[0].length : this.yylloc.last_column + match[0].length }, this.yytext += match[0], this.match += match[0], this.matches = match, this.yyleng = this.yytext.length, this.options.ranges && (this.yylloc.range = [this.offset, this.offset += this.yyleng]), this._more = !1, this._backtrack = !1, this._input = this._input.slice(match[0].length), this.matched += match[0], token = this.performAction.call(this, this.yy, this, indexed_rule, this.conditionStack[this.conditionStack.length - 1]), this.done && this._input && (this.done = !1), token) return token; if (this._backtrack) { for (var k in backup) this[k] = backup[k]; return !1 } return !1 }, next: function () { if (this.done) return this.EOF; this._input || (this.done = !0); var token, match, tempMatch, index; this._more || (this.yytext = "", this.match = ""); for (var rules = this._currentRules(), i = 0; i < rules.length; i++)if (tempMatch = this._input.match(this.rules[rules[i]]), tempMatch && (!match || tempMatch[0].length > match[0].length)) { if (match = tempMatch, index = i, this.options.backtrack_lexer) { if (token = this.test_match(tempMatch, rules[i]), token !== !1) return token; if (this._backtrack) { match = !1; continue } return !1 } if (!this.options.flex) break } return match ? (token = this.test_match(match, rules[index]), token !== !1 ? token : !1) : "" === this._input ? this.EOF : this.parseError("Lexical error on line " + (this.yylineno + 1) + ". Unrecognized text.\n" + this.showPosition(), { text: "", token: null, line: this.yylineno }) }, lex: function () { var r = this.next(); return r ? r : this.lex() }, begin: function (condition) { this.conditionStack.push(condition) }, popState: function () { var n = this.conditionStack.length - 1; return n > 0 ? this.conditionStack.pop() : this.conditionStack[0] }, _currentRules: function () { return this.conditionStack.length && this.conditionStack[this.conditionStack.length - 1] ? this.conditions[this.conditionStack[this.conditionStack.length - 1]].rules : this.conditions.INITIAL.rules }, topState: function (n) { return n = this.conditionStack.length - 1 - Math.abs(n || 0), n >= 0 ? this.conditionStack[n] : "INITIAL" }, pushState: function (condition) { this.begin(condition) }, stateStackSize: function () { return this.conditionStack.length }, options: { "case-insensitive": !0 }, performAction: function (yy, yy_, $avoiding_name_collisions, YY_START) { switch ($avoiding_name_collisions) { case 0: return 8; case 1: break; case 2: break; case 3: return 9; case 4: return 20; case 5: return 21; case 6: return 17; case 7: return 15; case 8: return 13; case 9: return 19; case 10: return 23; case 11: return 27; case 12: return 26; case 13: return 29; case 14: return 28; case 15: return 30; case 16: return 5; case 17: return "INVALID" } }, rules: [/^(?:[\n]+)/i, /^(?:\s+)/i, /^(?:#[^\n]*)/i, /^(?:participant\b)/i, /^(?:left of\b)/i, /^(?:right of\b)/i, /^(?:over\b)/i, /^(?:note\b)/i, /^(?:title\b)/i, /^(?:,)/i, /^(?:[^\->:\n,]+)/i, /^(?:--)/i, /^(?:-)/i, /^(?:>>)/i, /^(?:>)/i, /^(?:[^#\n]+)/i, /^(?:$)/i, /^(?:.)/i], conditions: { INITIAL: { rules: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17], inclusive: !0 } } }; return lexer }(); return parser.lexer = lexer, Parser.prototype = parser, parser.Parser = Parser, new Parser }(); "undefined" != typeof require && "undefined" != typeof exports && (exports.parser = grammar, exports.Parser = grammar.Parser, exports.parse = function () { return grammar.parse.apply(grammar, arguments) }, exports.main = function (args) { args[1] || (console.log("Usage: " + args[0] + " FILE"), process.exit(1)); var source = require("fs").readFileSync(require("path").normalize(args[1]), "utf8"); return exports.parser.parse(source) }, "undefined" != typeof module && require.main === module && exports.main(process.argv.slice(1))), ParseError.prototype = new Error, Diagram.ParseError = ParseError, grammar.parseError = function (message, hash) { throw new ParseError(message, hash) }, Diagram.parse = function (input) { return grammar.yy = new Diagram, grammar.parse(input) }, this.Diagram = Diagram }.call(this), "undefined" != typeof jQuery && function ($) { $.fn.sequenceDiagram = function (options) { return this.each(function () { var $this = $(this), diagram = Diagram.parse($this.text()); $this.html(""), diagram.drawSVG(this, options) }) } }(jQuery), Raphael.registerFont({ w: 209, face: { "font-family": "daniel", "font-weight": 700, "font-stretch": "normal", "units-per-em": "360", "panose-1": "2 11 8 0 0 0 0 0 0 0", ascent: "288", descent: "-72", "x-height": "7", bbox: "-92.0373 -310.134 632 184.967", "underline-thickness": "3.51562", "underline-position": "-21.6211", "unicode-range": "U+0009-U+F002" }, glyphs: { " ": { w: 179 }, "	": { w: 179 }, "!": { d: "66,-306v9,3,18,11,19,24v-18,73,-20,111,-37,194v0,10,2,34,-12,34v-12,0,-18,-9,-18,-28v0,-85,23,-136,38,-214v1,-7,4,-10,10,-10xm25,-30v15,-1,28,34,5,35v-11,-1,-38,-36,-5,-35", w: 115 }, '"': { d: "91,-214v-32,3,-25,-40,-20,-68v3,-16,7,-25,12,-27v35,13,14,56,8,95xm8,-231v4,-31,1,-40,18,-75v37,7,11,51,11,79v-3,3,-4,8,-5,13v-17,4,-16,-10,-24,-17", w: 117 }, "#": { d: "271,-64v-30,26,-96,-7,-102,51v-6,2,-13,2,-24,-2v-2,-11,10,-21,2,-28v-14,5,-48,0,-48,22v0,23,-11,14,-29,10v-7,-6,6,-19,-1,-24r-32,4v-19,-8,-15,-24,5,-28r33,-6v4,0,24,-23,11,-27v-26,0,-63,14,-74,-10v3,-1,9,-17,16,-10v15,-8,81,4,89,-30v8,-14,16,-34,24,-38v23,9,24,38,5,49v37,24,55,-38,72,-43v19,10,20,23,-1,45v2,8,23,1,29,4v3,3,6,6,10,11v-14,13,-20,12,-45,12v-17,0,-16,17,-19,29v18,-7,49,3,67,-2v4,0,8,4,12,11xm161,-104v-30,-1,-44,10,-44,37v14,1,24,0,40,-5v0,-1,3,-10,8,-26v0,-4,-1,-6,-4,-6", w: 285 }, $: { d: "164,-257v29,4,1,42,-3,50v5,5,38,13,41,24v8,4,6,15,-2,21v-18,3,-36,-17,-49,-17v-17,1,-31,40,-28,48v5,4,8,8,9,10v13,1,35,37,28,44v-10,21,-36,20,-65,28v-10,10,-12,40,-17,51v-9,-3,-28,1,-18,-17v0,-13,5,-24,-1,-35v-18,1,-59,-10,-42,-29v21,0,56,16,55,-16v5,-4,9,-18,9,-26v-14,-15,-55,-41,-53,-65v2,-33,56,-19,98,-26v10,-14,31,-43,38,-45xm93,-152v11,-10,15,-15,14,-29v-17,-3,-37,1,-43,6v10,12,20,19,29,23xm111,-103v-8,1,-11,12,-10,22v10,0,28,2,27,-8v0,-4,-13,-15,-17,-14", w: 225 }, "%": { d: "181,-96v24,-7,67,-13,104,1v14,18,21,19,22,44v-13,43,-99,61,-146,36v-9,-9,-22,-11,-32,-29v0,-27,24,-53,52,-52xm139,-185v-9,68,-138,73,-131,-5v0,-3,3,-9,9,-17v13,1,27,1,17,-16v5,-39,63,0,93,-6v36,1,80,-9,102,11v15,32,12,32,-8,56v-16,21,-103,78,-152,125r-14,28v-23,11,-25,-7,-29,-20v34,-71,133,-98,171,-162v-13,-12,-52,-5,-61,1v0,1,1,3,3,5xm38,-190v0,34,55,29,70,8v0,-14,-20,-11,-32,-14v-14,-3,-24,-9,-40,-10v1,0,5,11,2,16xm172,-53v12,27,90,18,102,-5v-18,-7,-32,-10,-40,-10v-29,3,-57,-4,-62,15", w: 308 }, "&": { d: "145,-82v17,-8,47,-15,71,-26v13,2,25,12,9,23v-23,7,-40,16,-53,27r0,6v13,8,30,21,36,38v0,8,-4,12,-11,12v-19,0,-43,-39,-59,-44v-30,12,-65,29,-97,32v-32,3,-45,-41,-23,-63v21,-20,52,-26,70,-48v-4,-31,-12,-47,9,-73v13,-16,20,-29,23,-39v15,-15,32,-22,51,-22v30,9,62,64,32,96v-2,3,-47,42,-69,48v-15,8,-11,9,0,22v6,7,10,11,11,11xm114,-138v25,-13,62,-38,74,-62v0,-9,-10,-31,-20,-29v-28,7,-60,42,-60,75v0,10,2,15,6,16xm99,-91v-18,10,-54,18,-59,45v26,5,61,-12,77,-22v-1,-5,-13,-23,-18,-23", w: 253 }, "'": { d: "36,-182v-36,7,-34,-61,-17,-80v15,1,21,19,21,20r-1,-1v0,0,-1,12,-5,35v1,5,3,17,2,26", w: 63 }, "(": { d: "130,-306v13,2,23,43,-1,43v-49,43,-77,77,-90,148v5,49,27,67,64,101v4,14,5,6,2,19r-15,0v-35,-17,-79,-58,-79,-120v0,-58,66,-176,119,-191", w: 120 }, ")": { d: "108,-138v-2,73,-48,120,-98,153v-17,-5,-16,-20,-6,-31v52,-64,73,-62,74,-135v1,-42,-40,-98,-58,-128v0,-5,-1,-12,-2,-22v18,-18,25,0,42,27v25,39,50,66,48,136", w: 120 }, "*": { d: "121,-271v15,-5,36,-8,40,9v-5,10,-31,19,-47,31v0,11,34,43,14,53v-18,8,-24,-24,-34,-20v-4,10,-4,19,-12,41v-25,7,-15,-30,-17,-47v-13,-1,-17,9,-46,30r-10,0v-20,-32,37,-43,54,-64v-10,-11,-36,-33,-16,-51v3,0,14,8,33,24v8,-10,26,-39,32,-42v14,7,15,23,9,36", w: 177 }, "+": { d: "163,-64v-7,22,-65,2,-77,21v-2,10,-6,21,-11,35v-20,4,-21,-12,-19,-29v3,-23,-44,6,-39,-27v-8,-22,36,-8,49,-18v8,-13,6,-36,24,-40v19,-4,14,32,11,39v18,3,19,2,54,8v2,1,5,5,8,11", w: 170 }, ",": { d: "25,63v-26,21,-48,-2,-22,-24v14,-12,35,-40,35,-69v3,-2,3,-11,12,-9v35,17,5,88,-25,102", w: 97 }, "-": { d: "57,-94v19,4,55,-5,54,17v-15,23,-54,20,-91,15v-4,2,-13,-10,-11,-16v-1,-22,28,-15,48,-16", w: 124 }, ".": { d: "40,-48v21,20,21,44,-4,44v-33,0,-26,-24,-10,-44r14,0", w: 67 }, "/": { d: "21,20v-22,-45,21,-95,41,-126v38,-57,115,-158,193,-201v2,0,4,3,7,11v11,29,-15,34,-25,55v-81,56,-189,208,-197,261r-19,0", w: 275 }, 0: { d: "78,-237v70,-47,269,-41,270,59v0,34,-11,53,-29,76v-13,35,-30,32,-85,64v-6,2,-10,6,-7,8v-73,14,-98,38,-173,1v-7,-13,-52,-48,-46,-88v9,-57,27,-75,70,-120xm123,-38v100,0,202,-46,195,-153v-32,-55,-144,-73,-211,-35v-16,34,-68,54,-53,108v6,25,1,22,-3,39v6,24,41,41,72,41", w: 353 }, 1: { d: "39,-208v0,-14,6,-59,29,-39v3,4,6,13,10,24r-22,128r8,87v-4,6,-9,3,-16,2v-44,-38,-9,-137,-9,-202", w: 93 }, 2: { d: "88,-35v47,-10,119,-24,168,-9v0,12,-23,13,-35,16v1,1,3,1,5,1v-74,8,-118,23,-194,23v-14,0,-20,-13,-21,-28v55,-40,83,-61,123,-104v26,-13,65,-67,71,-102v-1,-9,-11,-16,-22,-16v-20,-1,-120,29,-156,49v-10,-2,-30,-20,-10,-28v50,-21,111,-51,178,-48v25,10,44,22,36,39v12,30,-19,64,-34,83v-39,48,-37,39,-115,109v0,5,-3,8,-8,11v4,3,8,4,14,4", w: 265 }, 3: { d: "188,-282v34,-10,74,25,47,51v-19,32,-55,50,-92,70v28,14,116,25,108,70v8,14,-49,40,-63,48v-29,9,-130,22,-168,42v-6,-5,-19,-7,-12,-22v56,-36,175,-21,210,-76v-9,-20,-88,-42,-97,-33v-20,-1,-41,2,-56,-7r5,-21v56,-25,103,-36,137,-78v1,-1,2,-5,4,-11v-15,-14,-56,7,-79,0v-10,9,-73,22,-92,31v-11,-4,-28,-23,-13,-30v50,-22,96,-26,154,-37v0,-1,8,3,7,3", w: 260 }, 4: { d: "79,-249v-7,17,-29,75,-33,96v0,6,3,8,8,8v43,-2,111,6,141,-6v17,-47,20,-100,63,-148v9,4,16,7,21,10v-17,31,-44,95,-51,141v7,4,24,-4,23,10v-1,16,-29,12,-31,23v-10,22,-9,69,-7,103v-3,2,-7,5,-10,9v-47,-11,-23,-74,-16,-114v0,-4,-2,-6,-7,-6v-65,2,-89,13,-162,4v-22,-22,-2,-53,5,-76v16,-15,17,-57,35,-70v6,-1,21,11,21,16", w: 267 }, 5: { d: "185,-272v30,7,45,-8,53,18v1,16,-17,18,-34,14v0,0,-95,-11,-129,1v-6,9,-24,33,-29,54v76,10,171,5,214,47v11,11,22,30,5,52v-14,12,-30,14,-34,27v-26,11,-141,63,-157,60v-16,-2,-25,-19,-4,-27v48,-18,128,-39,170,-86v4,-14,-65,-41,-85,-41r-92,0v-10,-4,-66,-1,-57,-23v0,-23,23,-51,35,-83v11,-28,133,-10,144,-13", w: 284 }, 6: { d: "70,-64v9,-51,63,-74,123,-71v43,2,109,3,111,41r-25,47v0,1,1,2,2,3v-5,0,-39,10,-41,20v-15,3,-22,4,-22,11v-39,1,-77,20,-119,13v-42,-7,-35,-9,-77,-46v-56,-118,94,-201,176,-229v7,0,21,8,20,15v-2,17,-23,15,-43,24v-69,31,-119,72,-134,145v-5,25,36,68,78,64v59,-6,128,-18,153,-61v-7,-14,-13,-9,-32,-21v-67,-15,-118,-5,-150,43r0,12v-13,4,-17,-3,-20,-10", w: 310 }, 7: { d: "37,-228v33,-14,173,-17,181,-19v28,-1,24,31,9,45v-17,15,-45,49,-59,69v-17,26,-55,67,-61,113v-10,13,-9,14,-14,20v-33,-13,-20,-25,-11,-53v16,-48,73,-115,109,-156v2,-7,5,-14,-10,-12v-26,4,-54,6,-76,13v-23,-5,-83,31,-94,-9v2,-8,18,-19,26,-11", w: 245 }, 8: { d: "57,-236v40,-50,166,-51,213,-10v22,28,10,63,-22,78r-35,17v8,5,54,24,53,44v-5,14,-4,33,-18,42v-13,13,-35,18,-44,34v-60,27,-190,49,-194,-42v7,-41,17,-54,59,-70r0,-4v-32,-9,-73,-62,-26,-85v4,0,8,-2,14,-4xm142,-160v24,-2,160,-31,99,-72v-28,-18,-108,-33,-146,-5v-16,12,-28,30,-33,59v24,12,37,20,80,18xm41,-62v30,65,189,6,199,-37v3,-14,-60,-30,-74,-30v-70,0,-118,10,-125,67", w: 290 }, 9: { d: "11,-192v15,-49,119,-61,161,-23v16,15,27,55,11,79v-20,62,-51,79,-96,118v-10,4,-45,27,-50,6v9,-15,66,-52,98,-99v-7,-7,-8,-3,-25,0v-49,-11,-96,-25,-99,-81xm145,-131v7,-5,13,-34,13,-41v-2,-51,-104,-38,-114,-6v-2,10,37,35,46,35v23,1,43,-1,55,12", w: 198 }, ":": { d: "39,-125v15,-8,40,-1,40,15v0,15,-6,22,-19,22v-13,0,-29,-21,-21,-37xm66,-17v-8,27,-51,19,-46,-8v-1,-6,8,-22,14,-20v29,0,30,6,32,28", w: 95 }, ";": { d: "56,-93v2,-30,37,-22,40,2v0,2,-1,7,-3,15v-13,8,-15,6,-27,4xm64,-44v11,-11,30,-4,32,14v-21,39,-63,71,-92,85v-5,0,-11,-2,-18,-8v11,-23,36,-36,50,-61v11,-7,19,-20,28,-30", w: 107 }, "<": { d: "166,-202v12,0,29,15,24,29v0,4,-119,64,-120,73v15,21,89,64,91,86v2,29,-18,12,-30,15v-27,-29,-59,-54,-95,-75v-18,-10,-25,-13,-24,-41", w: 176 }, "=": { d: "125,-121v18,7,55,-9,69,14v0,17,-45,26,-135,26v-18,0,-27,-7,-27,-21v-1,-37,60,-5,93,-19xm138,-71v20,0,48,-1,50,16v-13,24,-86,32,-131,29v-29,-2,-43,-10,-43,-24v-7,-23,36,-14,39,-17v27,6,57,-4,85,-4", w: 196 }, ">": { d: "4,-14v20,-48,77,-59,118,-94v-16,-19,-58,-52,-81,-75v-11,-7,-15,-38,-1,-40v33,16,83,71,121,105v26,23,-6,35,-41,53v-29,16,-56,28,-73,54v-21,15,-16,20,-34,15v-3,0,-9,-16,-9,-18", w: 174 }, "?": { d: "105,-291v57,-13,107,-4,107,39v0,67,-136,85,-155,137v-1,6,10,23,-4,23v-23,1,-33,-35,-23,-57v31,-41,124,-60,149,-103v-8,-21,-72,-5,-88,-1v-23,6,-59,39,-71,8v0,0,-1,0,1,-17v10,-4,45,-20,84,-29xm80,-25v-6,4,-8,39,-24,22v-24,3,-22,-21,-13,-35v17,-7,29,5,37,13", w: 216 }, "@": { d: "218,-207v23,8,42,14,47,37v44,68,-27,137,-87,85r1,0v0,2,-59,19,-61,17v-35,0,-42,-47,-17,-68r0,-4v-19,-1,-45,37,-49,40v-37,76,58,72,121,62v11,-2,34,-13,36,3v-14,31,-69,31,-114,33v-51,2,-99,-41,-80,-92v2,-30,22,-40,42,-63v35,-20,91,-53,161,-50xm217,-101v23,0,35,-19,35,-41v0,-43,-75,-41,-102,-19v36,3,55,16,62,41v-6,5,-6,19,5,19xm127,-110v8,5,51,-15,28,-16v-4,0,-25,4,-28,16", w: 291 }, A: { d: "97,-81v-23,-10,-39,38,-52,60v-8,6,-8,6,-22,18v-22,-7,-23,-37,-4,-49v7,-8,11,-15,15,-23r-1,1v-14,-26,23,-29,31,-40v1,-1,15,-29,26,-36v17,-31,39,-58,54,-92v16,-20,20,-51,41,-66v29,5,34,62,45,92v9,64,21,103,49,155v-3,25,-44,11,-54,0v-34,-12,-97,-29,-128,-20xm107,-118v20,6,80,10,111,17v6,-7,-4,-15,-7,-24v-11,-28,-9,-92,-30,-117v-9,9,-19,44,-34,55v-9,23,-27,40,-40,69", w: 294 }, B: { d: "256,-179v41,10,115,34,91,91v-6,3,-14,12,-19,20v-37,19,-50,34,-63,25v-9,10,-12,11,-34,13r3,-3v-4,-4,-12,-4,-18,0v0,0,2,2,5,4v-21,14,-26,6,-44,15v-4,0,-7,-2,-8,-5v-6,11,-20,-5,-18,11v-36,4,-91,35,-114,4v-7,-62,-10,-138,4,-199v-1,-19,-37,2,-37,-27v0,-8,2,-13,6,-15v68,-31,231,-92,311,-39v8,12,12,20,12,25v-8,42,-32,49,-77,80xm79,-160v72,-17,135,-39,184,-70v20,-13,31,-23,31,-27v1,-6,-30,-13,-38,-12v-54,0,-116,13,-186,41v11,21,1,48,9,68xm262,-43v0,-4,3,-6,-4,-5v0,1,1,2,4,5xm211,-140v-34,7,-94,24,-139,15v-6,20,-4,56,-4,82v0,29,43,1,56,2v48,-11,108,-25,154,-48v20,-10,32,-17,32,-25v0,-18,-33,-26,-99,-26xm195,-20v6,1,6,-2,5,-7v-3,2,-7,2,-5,7", w: 364 }, C: { d: "51,-114v-12,75,96,76,166,71r145,-10v9,2,9,5,9,18v-37,18,-85,28,-109,22v-18,10,-47,10,-71,10v-29,0,-68,1,-105,-11v-6,-1,-10,-3,-10,-8v-33,-13,-48,-33,-66,-59v-19,-114,146,-150,224,-177v35,0,88,-31,99,7v-1,29,-49,14,-76,28v-55,8,-115,35,-175,71v-13,8,-23,21,-31,38", w: 376 }, D: { d: "312,-78v-2,1,-3,7,-10,5v6,-3,10,-4,10,-5xm4,-252v2,-27,83,-38,106,-39v130,-7,267,1,291,109v0,0,-2,8,-3,25v-5,9,-4,28,-23,34v-4,4,-2,5,-7,0v-3,3,-15,7,-5,10v0,0,-10,14,-13,2v-11,1,-8,5,-20,14v1,2,7,3,9,1v-4,13,-22,13,-11,4v0,-3,1,-6,-3,-5v-40,29,-103,38,-141,65v10,6,22,-7,34,-3v-41,20,-127,44,-171,46v-21,1,-47,-33,-11,-39v15,-2,43,-6,56,-11v-16,-101,-5,-130,9,-207v2,0,4,-1,6,-3v-16,-17,-91,38,-103,-3xm297,-69v-7,3,-17,8,-25,7v1,1,3,2,5,2v-4,2,-11,5,-23,9v4,-11,30,-21,43,-18xm240,-51v10,0,12,2,0,6r0,-6xm220,-36v-1,-3,4,-6,6,-3v0,1,-2,1,-6,3xm125,-48v16,6,137,-46,155,-53v29,-18,101,-44,82,-93v-21,-53,-84,-61,-168,-67v-20,7,-50,3,-77,8v33,54,-12,132,8,205xm159,-22v-4,-1,-15,-5,-15,2v7,-1,12,-2,15,-2", w: 381 }, E: { d: "45,-219v-19,-36,34,-41,63,-36v44,-10,133,-8,194,-15v3,2,38,11,52,15v-73,19,-171,21,-246,38v-9,11,-16,32,-20,61v35,11,133,-6,183,3v1,6,2,7,3,14v-46,24,-118,16,-193,27v-15,13,-22,52,-22,66v60,1,121,-20,188,-20v22,10,53,-7,74,5v16,29,-23,26,-43,32v-73,4,-139,13,-216,27r-52,-10v-4,-22,23,-69,26,-98v-3,0,-10,-15,-12,-24v20,-12,34,-23,35,-67v2,-1,5,-5,5,-7v0,-4,-14,-11,-19,-11", w: 353 }, F: { d: "270,-258v13,2,59,6,48,34v-78,-3,-143,1,-212,22v-10,16,-21,43,-24,69r145,-9v8,3,29,-3,16,21v-14,-1,-59,13,-60,7v-12,13,-67,18,-108,21v-2,1,-4,3,-7,6v-2,23,-8,43,-7,69v1,28,-30,11,-40,5r10,-80r-26,-14v5,-10,10,-33,28,-25v21,-3,15,-46,26,-59v-1,-3,-32,-13,-28,-24v2,-22,45,-16,59,-30v47,4,99,-14,151,-9v5,-3,25,-3,29,-4", w: 236 }, G: { d: "311,-168v53,0,94,57,74,110v-31,37,-71,34,-136,52v-13,-7,-41,10,-57,7v-73,-1,-122,-17,-162,-59v-49,-51,-24,-80,5,-130v35,-61,138,-93,214,-106v16,4,42,-1,40,21v-5,40,-39,2,-73,21v-76,19,-162,65,-177,142v28,103,237,76,312,29v2,-3,3,-7,3,-13v-10,-35,-37,-43,-87,-45v-16,-13,-53,-9,-78,1v-4,-3,-5,-7,-5,-11v17,-29,73,-17,108,-24v12,4,18,5,19,5", w: 391 }, H: { d: "300,-268v18,12,19,32,4,51v-35,44,-34,140,-46,217v-1,5,-5,13,-11,12v-6,1,-19,-14,-18,-27r7,-106v-28,7,-76,22,-116,14v-18,2,-36,6,-55,3v-43,-8,-14,53,-33,75v-29,1,-26,-67,-21,-97v5,-31,28,-73,43,-98v2,2,7,3,14,3v13,33,-11,48,-13,78v61,4,118,2,176,2v8,0,13,-6,15,-20v4,-47,21,-87,54,-107", w: 288 }, I: { d: "63,-266v34,10,-4,105,-8,128r-24,126v-2,2,-3,1,-9,6v-12,-10,-12,-15,-12,-47v0,-93,9,-156,28,-188v10,-17,19,-25,25,-25", w: 79 }, J: { d: "235,-291v26,11,31,104,31,142v0,37,-2,95,-32,126v-33,34,-121,26,-167,1v-18,-11,-54,-29,-59,-59v0,-3,5,-15,16,-14v31,36,90,57,162,51v63,-30,56,-148,32,-226v-1,-16,11,-13,17,-21", w: 282 }, K: { d: "212,-219v17,-5,80,-60,80,-19v0,9,-2,14,-5,16r-132,78v-34,23,-54,32,-21,50v39,21,74,23,124,41v5,2,7,5,7,9v-4,24,-55,15,-79,8v-67,-19,-98,-36,-116,-83v9,-24,38,-35,66,-61v7,-4,49,-30,76,-39xm47,-194v11,-20,11,-45,31,-55v2,2,4,3,6,0v29,39,-21,96,-18,128v-17,24,-15,62,-29,113v-4,3,-10,7,-19,11v-12,-13,-10,-28,-8,-53v3,-31,17,-79,37,-144", w: 270 }, L: { d: "84,-43v58,0,179,-27,242,-4v3,17,-29,24,-40,26v-85,-4,-202,46,-268,3v-24,-16,-2,-33,-4,-57v26,-76,38,-108,86,-191v14,-7,26,-50,45,-32v6,22,5,31,-12,46v-20,39,-50,82,-67,142v-7,6,-19,46,-19,54v0,9,12,13,37,13", w: 331 }, M: { d: "174,-236v-1,52,-11,92,-7,143v10,5,15,-12,22,-18v42,-55,90,-130,136,-174r15,-18v42,2,32,53,11,80v-12,58,-54,143,-34,210v0,3,-3,12,-9,10v-31,-5,-32,-57,-27,-92v4,-27,12,-58,25,-93v-5,-10,5,-19,6,-30v-46,44,-66,110,-129,172v-11,10,-18,15,-22,15v-34,6,-28,-103,-28,-152v-28,22,-65,119,-96,170v-9,15,-34,3,-31,-19v30,-64,91,-177,139,-229v12,-1,29,13,29,25", w: 343 }, N: { d: "248,-20v-3,17,-37,18,-43,3v-24,-35,-53,-145,-80,-203v-32,40,-55,120,-92,174v-13,3,-26,-13,-27,-22r87,-171v4,-13,20,-57,42,-32v42,48,46,139,82,198v29,-45,46,-88,65,-153v12,-19,23,-42,38,-60v27,-1,14,18,4,44v-6,46,-32,68,-37,121v-15,29,-33,69,-39,101", w: 307 }, O: { d: "240,-268v85,1,163,29,150,125v13,7,-12,18,-5,26v-23,63,-133,112,-228,124v-80,-16,-171,-56,-148,-153v11,-47,20,-43,53,-83v17,-9,39,-22,73,-29v45,-10,81,-10,105,-10xm363,-156v16,-51,-62,-85,-111,-79v-25,-11,-50,8,-81,0v-15,10,-70,16,-85,31v6,20,-27,24,-39,45v-42,75,40,128,115,128v56,0,209,-71,201,-125", w: 383 }, P: { d: "70,-225v-7,-12,-36,16,-49,19v-4,0,-9,-5,-14,-17v21,-47,114,-55,172,-59v41,-3,132,33,99,87v-21,34,-72,59,-144,80v-2,16,-79,3,-74,46v3,25,-5,47,-10,68v-22,-1,-23,-29,-22,-56v2,-25,-20,-32,-8,-50v21,-5,10,-35,25,-57v6,-28,14,-48,25,-61xm71,-229v47,14,-2,50,-1,99v41,-3,113,-37,173,-76v5,-9,8,-14,8,-15v-28,-47,-125,-29,-180,-8", w: 252 }, Q: { d: "374,-217v20,59,-11,127,-48,156r30,38v-1,6,-8,16,-14,9v-3,0,-19,-9,-47,-26v-72,35,-173,75,-236,12v-70,-40,-67,-213,26,-217r8,5v24,-20,72,-48,112,-38v21,-4,22,-1,50,-2v66,-2,94,20,119,63xm296,-88v13,5,61,-49,63,-84v4,-62,-54,-78,-119,-76v-14,-6,-49,5,-71,3v-42,16,-89,41,-93,94v-9,11,1,25,-7,38v-12,-19,-7,-67,-1,-88v-56,30,-37,137,19,155v27,17,92,19,119,0v12,-2,29,-9,52,-20v2,-2,3,-3,3,-6v-11,-12,-46,-27,-54,-56v0,-13,3,-19,9,-19v18,1,60,52,80,59", w: 379 }, R: { d: "100,-275v96,-23,196,-10,208,78v-3,18,-17,52,-49,62v-14,20,-54,23,-79,40v-2,0,-14,2,-36,6v-40,8,-30,14,-3,33v37,27,52,30,118,55v16,6,31,23,12,27v-58,-2,-104,-29,-143,-61v-14,-3,-16,-15,-39,-27v-23,-19,-28,-12,-15,-38v63,-19,111,-15,163,-53v27,-20,43,-36,43,-49v0,-64,-120,-62,-173,-38v-9,4,-38,9,-40,18v-10,32,-16,70,-13,116v-10,21,-8,47,-6,75v2,31,-9,29,-27,22v-9,-55,5,-140,15,-190v-8,-6,-24,10,-24,-11v0,-34,16,-34,42,-55v2,-1,17,-4,46,-10", w: 297 }, S: { d: "13,-3v-7,-3,-22,-18,-5,-22v68,-15,119,-32,154,-45v51,-19,39,-34,3,-53v-46,-25,-82,-30,-121,-64v-33,-29,-50,-35,-25,-58v37,-20,119,-29,181,-29v29,0,44,6,44,18v-9,26,-62,6,-104,14v-17,2,-72,6,-92,16v37,53,132,58,180,111v8,9,11,20,11,30v-4,17,-23,35,-42,34v-21,16,-17,1,-49,17v-14,7,-41,9,-56,20v-25,-3,-49,10,-79,11", w: 234 }, T: { d: "141,-3v-36,-6,1,-49,-3,-79v10,-19,6,-35,15,-64r26,-85v-51,-9,-100,10,-141,14v-16,2,-30,-26,-11,-32v26,-8,143,-8,179,-19r12,6v67,-2,142,-1,200,-1v8,0,14,3,19,10v-18,16,-74,3,-103,14v-48,-4,-60,4,-113,7v-42,22,-36,130,-58,187v1,12,-9,44,-22,42", w: 277 }, U: { d: "365,-262v13,56,-22,104,-36,141v-19,22,-30,38,-57,56v-4,18,-60,35,-78,50v-53,28,-142,0,-161,-34v-31,-56,-37,-108,-11,-164v17,-33,29,-50,48,-29v-2,2,-3,7,-4,13v-44,36,-38,149,7,174v30,26,55,19,102,4v56,-17,66,-34,120,-76v12,-24,56,-68,46,-122r0,-16v0,1,-1,3,-1,6v4,-13,11,-10,25,-3", w: 368 }, V: { d: "246,-258v21,-22,31,-26,44,-8v1,1,-12,22,-28,35v-15,25,-41,38,-56,69v-13,15,-20,31,-28,57v-15,13,-11,29,-27,72v3,21,-5,24,-27,27v-33,-45,-54,-118,-84,-167v-5,-26,-18,-50,-25,-76v-3,-12,24,-8,29,-5v8,13,18,52,26,70r52,115v9,-2,4,-9,10,-21r25,-47v25,-44,46,-76,89,-121", w: 234 }, W: { d: "31,-213v16,46,17,106,41,151v31,-35,49,-89,76,-127v30,-15,39,27,52,56v10,22,21,48,35,67v2,0,4,-1,5,-3v16,-28,50,-76,79,-121v14,-21,40,-63,64,-83r5,8v-30,58,-76,110,-97,173v-18,28,-25,37,-33,63v-11,1,-16,25,-30,15v-21,-31,-44,-89,-62,-131v0,-2,-1,-3,-5,-5v-17,11,-16,36,-31,50v-20,33,-20,84,-68,94v-24,-19,-23,-81,-39,-111v-1,-15,-29,-94,-10,-108v9,2,12,5,18,12", w: 331 }, X: { d: "143,-183v43,-25,69,-36,126,-62v22,-10,86,-10,56,21v-51,3,-158,61,-154,64v10,15,41,30,50,52v27,17,46,60,70,82v9,14,-6,30,-24,20v-35,-43,-75,-100,-116,-132v-48,13,-100,47,-118,94v-1,49,-26,34,-27,4v-1,-26,13,-27,17,-48v22,-27,68,-55,90,-77v-9,-12,-60,-39,-79,-57v-6,-10,-6,-25,12,-25", w: 312 }, Y: { d: "216,-240v19,-14,42,10,22,26v-54,66,-121,109,-156,197v-8,21,-11,15,-30,4v3,-37,27,-61,33,-76v12,-12,15,-19,32,-42v-8,-6,-40,5,-45,5v-48,-6,-69,-65,-56,-113v14,0,13,-1,24,7v2,33,12,75,42,73v36,-2,102,-57,134,-81", w: 189 }, Z: { d: "60,-255v66,12,200,-34,240,21v-13,42,-63,62,-98,89v-19,15,-47,33,-82,55v-25,16,-47,32,-66,47v58,24,129,-6,208,-6v23,0,36,12,13,19v-33,2,-53,5,-86,10v-32,18,-88,15,-135,15v-9,-1,-55,-1,-48,-29v1,-24,30,-24,40,-41v64,-50,151,-86,208,-147v-38,-17,-155,12,-198,-4v0,0,-11,-33,4,-29", w: 310 }, "[": { d: "72,-258r-15,250v30,4,55,-3,80,-6v7,-1,8,17,9,23v-28,15,-73,23,-121,21v-7,0,-10,-6,-10,-17v0,-60,25,-193,22,-288v0,-16,13,-20,33,-19v9,-3,34,-12,51,-12v16,0,15,16,19,29v-16,7,-48,10,-68,19", w: 151 }, "\\": { d: "21,38v-20,-21,9,-72,13,-90v44,-78,113,-189,200,-253v2,0,5,4,7,12v11,31,-13,36,-24,58v-74,61,-174,219,-180,273r-16,0", w: 257 }, "]": { d: "133,-258v-23,-13,-84,6,-85,-32v0,-10,5,-15,14,-15v0,0,30,2,90,7v10,1,15,13,15,36v2,7,-8,59,-13,112r-11,125v-9,48,9,90,-59,71v-20,-4,-39,-1,-59,-4v-5,-10,-25,-12,-14,-30v8,-3,61,-13,78,-8v14,1,8,-7,10,-17v15,-69,21,-166,34,-245", w: 171 }, "^": { d: "68,-306v20,15,47,36,58,60v-1,4,0,7,-9,7v-26,0,-47,-38,-49,-32v-15,9,-41,50,-54,30v-2,-31,17,-23,33,-51v8,-9,15,-14,21,-14", w: 135 }, _: { d: "11,15v-8,33,18,45,50,34r205,2r197,-5v11,-5,14,-9,7,-28v-95,-21,-258,-10,-376,-10v-25,0,-72,-3,-83,7", w: 485 }, "`": { d: "75,-264v16,8,56,14,39,43v-30,-8,-65,-23,-105,-44v-1,-3,-3,-28,5,-25v16,5,44,17,61,26", w: 129 }, a: { d: "124,-56v10,4,59,41,65,50v1,7,-6,17,-12,17r-60,-30v-22,2,-42,21,-65,19v-33,4,-68,-67,-15,-81v41,-27,96,-39,110,9v0,6,-4,12,-11,16v-33,-25,-67,-5,-88,12v10,16,61,-18,76,-12", w: 196 }, b: { d: "80,-140v69,1,123,0,134,52v5,26,-71,71,-97,70v-11,11,-88,22,-94,22v-11,-3,-26,-18,-6,-24v19,-5,-2,-19,-1,-35v1,-18,11,-36,-5,-47v-6,-17,-6,-21,14,-32v6,-45,18,-89,28,-124v2,-7,8,-12,17,-15v5,3,10,11,16,28v-12,27,-13,63,-23,96v0,6,6,9,17,9xm87,-107v-40,-9,-31,31,-39,54v8,15,0,25,12,22v30,-8,60,-18,88,-32v39,-18,49,-33,-1,-42v-20,-4,-45,-7,-60,-2", w: 217 }, c: { d: "128,-123v29,-7,37,29,12,33v-27,-4,-40,6,-79,25v-8,4,-13,11,-16,22v30,32,91,3,134,11v5,13,-8,26,-22,19v-51,25,-139,28,-150,-30v6,-50,69,-82,121,-80", w: 194 }, d: { d: "224,-201v0,-35,-17,-111,24,-94v7,86,-2,119,0,197v-4,2,-8,21,-18,16v-62,-7,-154,-8,-185,29v6,17,28,26,51,26v16,0,100,-15,132,-18v7,5,-6,20,-10,22v-24,8,-122,42,-163,25v-32,-5,-62,-53,-36,-80v35,-37,118,-46,198,-43v1,-22,7,-49,7,-80", w: 265 }, e: { d: "4,-57v0,-58,51,-71,110,-74v33,-1,45,16,59,35v1,14,2,39,-7,42v-24,-2,-73,13,-99,11v-2,2,-2,3,-2,3v0,3,12,8,37,15v21,0,69,9,31,22v-9,14,-34,6,-56,6v-27,-5,-73,-28,-73,-60xm123,-102v-22,2,-68,5,-65,26v24,-2,66,5,79,-6v-5,-13,-1,-13,-14,-20", w: 182 }, f: { d: "6,-59v6,-29,53,-4,53,-43v0,-64,29,-118,84,-150v45,-25,167,-24,155,51v-1,2,-7,6,0,6r-10,2v-45,-58,-165,-39,-186,39v-7,26,-11,42,-9,62v44,8,95,-21,135,-7v-12,25,-39,21,-76,30v-19,5,-18,7,-54,19v-2,8,15,32,17,35v-6,25,-26,26,-40,-5r-15,-24v-41,10,-44,12,-54,-15", w: 234 }, g: { d: "132,-97v30,27,21,75,30,117v-12,31,-11,66,-36,103v-32,46,-105,83,-167,39v-31,-21,-49,-29,-51,-75v-2,-37,77,-50,121,-57v37,-6,68,-10,95,-11v7,-6,3,-32,4,-46v0,0,-1,1,-1,2v0,-18,-5,-31,-14,-45v-44,5,-79,20,-94,-18v3,-54,73,-54,125,-50v12,7,12,13,4,25v-30,-11,-76,8,-90,20v23,3,50,-16,74,-4xm-34,121v60,53,168,1,159,-86v-47,-7,-93,24,-142,30v-12,7,-45,19,-42,29v0,10,8,19,25,27", w: 188 }, h: { d: "100,-310v11,-2,10,19,11,20v-11,52,-40,133,-53,189v-6,30,-9,37,-9,47v27,0,113,-34,143,-34v42,0,31,47,39,79v0,4,-5,17,-16,16v4,2,11,3,4,6v-24,-1,-28,-34,-25,-64v-1,-1,-2,-3,-5,-5v-51,0,-110,38,-162,51v-9,1,-15,-15,-16,-23v17,-89,39,-141,71,-264v0,-9,6,-19,18,-18", w: 251 }, i: { d: "62,-209v7,18,9,23,-5,38v-23,-6,-21,-18,-11,-36v2,0,8,-1,16,-2xm34,-7v-18,-21,-8,-73,-1,-106v7,-10,20,-8,23,6v-1,36,7,72,-2,104v-8,2,-8,0,-20,-4", w: 80 }, j: { d: "88,-191v5,28,-18,40,-28,21v0,-20,12,-29,28,-21xm82,-99v28,-1,16,35,16,61v0,60,-19,150,-35,202v-12,8,-19,31,-35,16v-32,-7,-43,-19,-56,-44r2,-17v11,4,49,45,61,18v10,-55,27,-107,30,-171v0,-16,0,-59,17,-65", w: 120 }, k: { d: "59,-66v33,26,114,37,155,62v8,-4,22,-2,19,-17v0,-4,-12,-11,-30,-24v-36,-25,-54,-22,-99,-33v14,-21,119,-13,103,-63r-16,-7r-123,47r25,-93v-3,-15,16,-49,18,-81v1,-15,-21,-14,-25,-3v-31,82,-49,168,-75,257v2,2,22,30,27,10v2,-5,4,-9,9,-11v4,-16,4,-15,12,-44", w: 236 }, l: { d: "66,-300v21,-6,37,23,30,55v-10,51,-28,135,-28,208v0,11,6,36,-13,37v-29,-5,-30,-48,-25,-83r28,-177v-6,-17,1,-29,8,-40", w: 102 }, m: { d: "348,-59v-2,21,0,57,3,73v-17,3,-30,-1,-32,-16v-8,-7,-5,-44,-13,-70v-35,3,-82,49,-111,70v-12,8,-40,4,-39,-15r2,-56v-1,-13,4,-28,-8,-29v-35,8,-79,72,-115,87v-6,2,-20,-18,-21,-22v1,-20,14,-105,39,-64r8,15v17,-14,72,-56,93,-54v27,3,49,40,43,80v24,-2,66,-55,124,-53v11,14,28,23,27,54", w: 368 }, n: { d: "121,-136v37,6,62,54,62,111v0,32,-16,25,-31,17v-18,-30,-5,-45,-22,-85v-37,-13,-71,55,-92,65v-20,-3,-39,-39,-21,-62v2,-12,3,-15,11,-30v12,-8,20,11,29,12", w: 194 }, o: { d: "108,-139v52,-24,104,18,104,63v0,59,-66,67,-114,83v-52,-2,-115,-50,-80,-105v23,-18,52,-35,90,-41xm45,-60v16,54,125,16,131,-23v-12,-59,-129,-8,-131,23", w: 217 }, p: { d: "82,14v-10,12,-8,117,-24,142v-15,2,-19,0,-29,-13v0,-76,9,-113,22,-192v14,-27,35,-6,37,13v0,8,-3,21,-7,38v2,2,3,2,4,2v26,-9,116,-33,126,-72v-7,-17,-24,-33,-49,-31v-40,3,-116,13,-116,47v-5,7,-2,17,-16,20v-17,-12,-18,-20,-12,-38v8,-25,74,-61,110,-59v55,-15,113,15,118,70v-15,52,-84,79,-146,83v-5,0,-11,-4,-18,-10", w: 251 }, q: { d: "144,-147v27,-8,89,-3,97,31v-9,29,-42,-4,-73,1v-32,6,-118,20,-111,49v0,7,13,13,21,13v21,0,78,-24,104,-34v2,0,9,8,22,21v1,1,1,2,1,5v-27,90,-22,70,-43,203v11,15,-15,54,-33,33v-6,-8,-10,-20,-3,-28v1,-72,5,-114,15,-172v-35,3,-35,10,-59,8v-41,-4,-98,-41,-56,-85v33,-34,59,-27,118,-45", w: 248 }, r: { d: "242,-117v2,22,5,10,-14,23v-73,-7,-166,-23,-174,56v-8,6,-3,20,-8,36v-29,10,-40,-9,-33,-46v6,-31,7,-69,32,-55v58,-37,66,-42,175,-19v3,5,15,4,22,5", w: 229 }, s: { d: "154,-151v19,1,27,24,13,32v-4,1,-22,4,-53,7v-16,8,-22,-2,-39,9v23,21,89,16,96,62v-13,24,-85,35,-124,42v-9,-3,-18,-3,-27,0v-6,-4,-21,-16,-8,-25v30,-6,83,-13,102,-24v-17,-16,-80,-33,-97,-48v-3,-2,-4,-7,-4,-15v-6,-6,3,-13,15,-18v22,-9,94,-23,126,-22", w: 188 }, t: { d: "85,-150v10,-41,35,-126,65,-134v4,1,24,19,11,36v-17,22,-29,57,-36,104v26,8,50,-7,73,5v14,0,22,3,22,9v-1,19,-44,18,-57,23v-10,1,-46,0,-54,10v-10,24,-4,67,-20,98v-21,-3,-26,1,-26,-20v0,-9,2,-36,8,-81v-15,-13,-81,9,-77,-27v4,-38,71,6,91,-23", w: 194 }, u: { d: "207,-136v-1,-2,11,-14,14,-13v6,0,10,7,10,22v-3,40,-23,56,-40,82v-13,19,-62,43,-93,43v-67,-2,-111,-75,-71,-133v26,-3,21,29,19,49v-1,27,26,44,57,42v41,-2,93,-55,104,-92", w: 242 }, v: { d: "24,-127r52,71v42,-16,70,-54,124,-65v5,4,8,7,8,11v-8,19,-4,8,-33,32v0,1,-1,3,-1,5v-61,45,-93,68,-97,68v-40,-15,-50,-72,-68,-100v6,-14,10,-22,15,-22", w: 214 }, w: { d: "15,-139v38,-2,27,57,45,86v30,2,67,-66,101,-78v26,6,36,69,60,78v47,-35,51,-54,119,-104v3,0,7,-2,15,-4v19,23,-9,28,-21,49v-33,28,-68,90,-107,109v-10,6,-52,-47,-72,-71v-20,17,-85,74,-97,73v-38,7,-41,-98,-52,-122v0,-1,3,-7,9,-16", w: 325 }, x: { d: "95,-124v22,-13,78,-32,99,-31v16,0,23,6,23,18v0,22,-17,11,-49,21v-3,0,-45,20,-42,24v0,1,2,4,8,10v20,24,49,41,44,80v-35,3,-27,-9,-60,-44v-40,-43,-37,-26,-79,9v-1,1,-2,3,-3,8v-12,8,-28,10,-27,-11v-6,-8,45,-65,48,-65v-17,-21,-61,-52,-24,-68v9,0,48,37,62,49", w: 223 }, y: { d: "44,-65v22,33,70,4,99,-8v5,-4,28,-15,41,-31r17,0v25,47,-26,70,-40,114v-5,4,-9,8,-10,21v-16,12,-11,33,-27,51v-5,18,-12,43,-23,71v-1,-1,-2,34,-18,29v-12,1,-22,-12,-22,-23v20,-70,24,-65,68,-177v-47,16,-111,8,-116,-39v-11,-13,-7,-62,8,-62v18,0,22,26,23,54", w: 216 }, z: { d: "189,-43v9,-1,46,-6,41,12v0,7,-5,13,-15,14v-45,6,-148,24,-181,13v0,-3,-5,-8,-14,-15v5,-44,66,-46,90,-85v-15,-18,-84,21,-84,-14v0,-10,5,-17,14,-18v33,-3,79,-13,109,-3v4,-2,14,11,12,15v0,23,-26,51,-78,84v28,10,73,-3,106,-3", w: 244 }, "{": { d: "94,-303v27,-9,90,-14,79,26v-20,17,-55,-5,-87,13v-4,1,-6,4,-6,8v33,42,31,44,7,85v-6,10,-13,16,-13,13v5,6,17,17,15,31r-33,78v7,35,28,49,57,63r49,0v7,42,-51,41,-86,20v-43,-13,-51,-51,-56,-89v-2,-25,25,-54,27,-71v-3,-4,-46,-5,-41,-21v2,-10,-3,-29,11,-25v2,0,51,-17,52,-38v4,-3,-25,-23,-25,-49v0,-41,8,-30,50,-44", w: 179 }, "|": { d: "30,-308v26,5,14,50,15,80v5,78,-8,153,-3,225v-2,15,-1,31,-11,36v-8,-3,-25,-22,-25,-32r9,-183v0,-40,0,-78,1,-112v0,-4,9,-15,14,-14", w: 63 }, "}": { d: "47,-298v34,-17,118,-18,112,36v6,25,-76,98,-69,103v4,16,39,7,44,28v7,34,-34,17,-37,39v8,29,49,83,23,123v-15,23,-43,26,-73,46v-34,8,-43,11,-49,-17v1,-15,30,-15,33,-20v24,-12,70,-27,55,-61v-14,-33,-37,-68,-19,-103v-46,-50,46,-100,60,-141v-10,-16,-68,6,-77,-12", w: 143 }, "~": { d: "7,-254v2,-6,59,-50,67,-46v11,-1,35,19,46,26v5,0,27,-10,66,-31v21,8,-1,25,-7,38v-27,21,-48,31,-65,31v-24,-11,-37,-39,-65,-9v-7,7,-26,36,-42,11v3,-5,-3,-17,0,-20", w: 199 }, "Ä": { d: "161,-217v20,53,23,124,54,170v-2,20,-34,9,-42,0v-27,-12,-78,-18,-101,-18v-26,6,-29,51,-54,63v-18,-4,-19,-30,-3,-38v5,-9,15,-16,8,-29v1,-12,23,-9,26,-19v6,-10,11,-20,20,-27r70,-121v12,-4,16,4,22,19xm82,-91v17,3,62,7,86,13v-13,-33,-13,-80,-29,-109v-15,30,-38,63,-57,96xm187,-259v0,8,-4,13,-12,13v-18,0,-21,-20,-16,-34v18,-1,28,2,28,21xm90,-284v7,3,28,11,28,18v0,9,-9,18,-18,17v-17,0,-25,-24,-10,-35" }, "Å": { d: "161,-217v20,53,23,124,54,170v-2,20,-34,9,-42,0v-27,-12,-78,-18,-101,-18v-26,6,-29,51,-54,63v-18,-4,-19,-30,-3,-38v5,-9,15,-16,8,-29v1,-12,23,-9,26,-19v6,-10,11,-20,20,-27r70,-121v12,-4,16,4,22,19xm82,-91v17,3,62,7,86,13v-13,-33,-13,-80,-29,-109v-15,30,-38,63,-57,96xm112,-239v-31,-17,-9,-61,29,-56v12,2,22,3,33,12v24,39,-30,62,-62,44xm119,-262v2,14,41,8,41,-4v0,-4,-8,-6,-24,-9v-10,-2,-17,10,-17,13" }, "Ç": { d: "48,-108v-12,70,90,71,159,67r138,-9v9,-1,7,9,7,17v-37,16,-80,27,-103,21v-14,9,-40,3,-67,9v-30,0,-64,1,-100,-10v-6,-1,-10,-4,-10,-8v-32,-12,-46,-31,-63,-56v-16,-61,47,-103,83,-121v82,-42,118,-45,200,-60v21,-4,36,34,11,37v-90,11,-148,31,-225,77v-12,8,-23,20,-30,36xm172,18v29,4,47,14,53,35v-2,7,-14,31,-27,31v-28,7,-55,9,-84,14v-18,-5,-13,-32,7,-32v21,0,55,-5,69,-13v-16,-14,-63,10,-50,-35v9,-10,1,-27,23,-29v7,8,11,16,9,29", w: 331 }, "É": { d: "49,-160v1,-4,-10,-9,-15,-8v-15,-35,32,-30,57,-31r142,-8v2,1,30,7,40,10v-52,16,-133,17,-190,30v-7,9,-12,24,-15,47v26,10,102,-6,141,3v1,3,1,6,2,10v-36,18,-92,12,-149,21v-11,9,-16,41,-16,51v55,-1,111,-21,168,-13v15,-8,48,1,31,18v-53,16,-130,13,-198,29r-39,-8v-4,-19,17,-53,20,-76v-1,0,-7,-11,-9,-18v18,-7,22,-28,30,-57xm133,-248v27,-11,48,-32,59,-14v3,11,-79,52,-88,53v-14,1,-16,-11,-12,-21v10,-4,23,-11,41,-18", w: 252 }, "Ñ": { d: "224,-182v1,-17,15,-24,22,-38v20,0,13,10,3,33v-3,36,-25,52,-28,94v-10,24,-30,55,-29,82r-19,7v-32,-8,-36,-70,-58,-111v-2,-23,-7,-27,-19,-54v-28,36,-41,93,-71,133v-9,5,-20,-9,-20,-17r73,-149v9,-24,31,-5,36,7v19,41,31,98,53,139v22,-35,34,-69,50,-118v2,-3,3,-3,7,-8xm203,-257v22,-8,41,-24,65,-26v3,11,-8,9,-7,21v-26,20,-46,31,-59,31v-2,3,-49,-27,-49,-29v-11,0,-32,31,-46,32v-11,-2,-12,-21,-4,-23v4,-6,28,-30,48,-34v17,-4,43,28,52,28", w: 219 }, "Ö": { d: "62,-184v78,-31,249,-50,238,74v-6,65,-102,105,-179,115v-77,-7,-152,-71,-101,-149v2,-5,24,-33,42,-40xm279,-120v14,-38,-47,-64,-85,-61v-20,-9,-41,7,-62,0v-11,7,-54,12,-66,24v0,20,-51,35,-38,66v-1,43,50,67,96,67v44,0,162,-55,155,-96xm197,-229v0,8,-4,13,-12,13v-17,0,-19,-19,-16,-34v18,-1,29,1,28,21xm101,-254v7,3,28,9,27,18v1,8,-8,17,-17,17v-18,0,-26,-24,-10,-35", w: 273 }, "Ü": { d: "281,-202v6,67,-30,121,-71,152v-3,14,-47,26,-60,39v-41,20,-110,1,-125,-26v-24,-44,-28,-84,-8,-127v12,-26,23,-38,37,-22v-2,2,-3,5,-3,10v-34,26,-29,116,5,134v22,32,86,-1,109,-8v38,-28,104,-64,97,-149v2,-10,7,-8,19,-3xm197,-227v0,8,-4,13,-12,13v-18,0,-21,-20,-16,-34v18,-1,28,2,28,21xm101,-252v7,3,27,10,27,18v0,8,-9,18,-18,17v-18,-1,-24,-25,-9,-35", w: 262 }, "á": { d: "118,-53v10,4,55,41,62,47v0,7,-5,16,-12,16r-57,-28v-20,3,-40,19,-61,18v-10,2,-43,-17,-42,-36v0,-14,7,-40,27,-41v39,-26,92,-36,104,9v0,6,-2,11,-9,15v-32,-24,-64,-6,-84,11v8,15,58,-17,72,-11xm32,-117v24,-3,85,-55,101,-32v3,11,-80,53,-89,53v-13,2,-14,-10,-12,-21", w: 173 }, "à": { d: "118,-53v10,4,55,41,62,47v0,7,-5,16,-12,16r-57,-28v-20,3,-40,19,-61,18v-10,2,-43,-17,-42,-36v0,-14,7,-40,27,-41v39,-26,92,-36,104,9v0,6,-2,11,-9,15v-32,-24,-64,-6,-84,11v8,15,58,-17,72,-11xm99,-137v7,6,56,14,37,40v-28,-7,-62,-21,-100,-41v-2,-3,-2,-26,5,-23v16,4,42,17,58,24", w: 173 }, "â": { d: "118,-53v10,4,55,41,62,47v0,7,-5,16,-12,16r-57,-28v-20,3,-40,19,-61,18v-10,2,-43,-17,-42,-36v0,-14,7,-40,27,-41v39,-26,92,-36,104,9v0,6,-2,11,-9,15v-32,-24,-64,-6,-84,11v8,15,58,-17,72,-11xm147,-97v-27,-6,-39,-26,-60,-37v-21,7,-38,46,-65,23v-2,-5,-3,-10,-4,-14v18,-4,43,-31,61,-42v28,5,40,21,62,36v12,8,18,17,18,25v0,6,-4,9,-12,9", w: 173 }, "ä": { d: "118,-53v10,4,55,41,62,47v0,7,-5,16,-12,16r-57,-28v-20,3,-40,19,-61,18v-32,5,-66,-64,-15,-77v39,-26,92,-36,104,9v0,6,-3,11,-9,15v-32,-24,-64,-6,-84,11v8,15,58,-17,72,-11xm142,-119v0,8,-4,13,-12,13v-18,0,-21,-20,-16,-34v18,-1,28,2,28,21xm46,-144v7,3,28,9,27,18v1,8,-9,18,-18,17v-18,-1,-25,-25,-9,-35", w: 173 }, "ã": { d: "118,-53v10,4,55,41,62,47v0,7,-5,16,-12,16r-57,-28v-20,3,-40,19,-61,18v-10,2,-43,-17,-42,-36v0,-14,7,-40,27,-41v39,-26,92,-36,104,9v0,6,-2,11,-9,15v-32,-24,-64,-6,-84,11v8,15,58,-17,72,-11xm114,-136v22,-8,41,-24,64,-26v3,11,-7,10,-7,21v-26,20,-45,30,-58,30v-3,3,-49,-26,-49,-28v-10,-1,-32,35,-51,31v-12,-32,8,-29,32,-51v24,-21,54,20,69,23", w: 173 }, "å": { d: "118,-53v10,4,55,41,62,47v0,7,-5,16,-12,16r-57,-28v-20,3,-40,19,-61,18v-10,2,-43,-17,-42,-36v0,-14,7,-40,27,-41v39,-26,92,-36,104,9v0,6,-2,11,-9,15v-32,-24,-64,-6,-84,11v8,15,58,-17,72,-11xm54,-101v-37,-20,-9,-71,34,-65v13,1,25,3,38,13v27,45,-34,73,-72,52xm61,-128v4,20,48,7,49,-5v0,-5,-9,-7,-28,-10v-12,-2,-21,11,-21,15", w: 173 }, "ç": { d: "108,-118v30,-6,56,21,25,33v-24,-6,-39,5,-75,23v-7,4,-12,12,-15,22v31,28,86,3,128,9v3,28,-29,16,-44,28v-53,15,-106,10,-120,-37v0,-48,62,-70,101,-78xm92,18v23,4,45,12,48,32v-2,6,-12,28,-25,28v-24,6,-50,10,-77,13v-16,-4,-11,-28,7,-29v17,-1,51,-4,63,-12v-14,-15,-57,10,-46,-32v9,-8,0,-25,21,-26v6,6,12,14,9,26", w: 171 }, "é": { d: "108,-124v42,-3,70,39,50,73v-22,-1,-70,12,-94,10v-1,1,-2,3,-2,3v0,3,12,7,35,14v18,0,64,7,30,21v-10,14,-31,6,-53,6v-26,-7,-70,-26,-70,-58v0,-54,48,-65,104,-69xm130,-78v-2,-35,-66,-13,-77,3v16,6,62,6,77,-3xm76,-169v26,-11,48,-32,59,-14v3,10,-80,53,-89,53v-14,1,-14,-10,-12,-21v15,-7,16,-7,42,-18", w: 161 }, "è": { d: "108,-124v42,-3,70,39,50,73v-22,-1,-70,12,-94,10v-1,1,-2,3,-2,3v0,3,12,7,35,14v18,0,64,7,30,21v-10,14,-31,6,-53,6v-26,-7,-70,-26,-70,-58v0,-54,48,-65,104,-69xm130,-78v-2,-35,-66,-13,-77,3v16,6,62,6,77,-3xm95,-166v7,6,54,14,37,40v-28,-7,-62,-21,-100,-41v-3,-3,-3,-26,5,-24v16,5,42,18,58,25", w: 161 }, "ê": { d: "108,-124v42,-3,70,39,50,73v-22,-1,-70,12,-94,10v-1,1,-2,3,-2,3v0,3,12,7,35,14v18,0,64,7,30,21v-10,14,-31,6,-53,6v-26,-7,-70,-26,-70,-58v0,-54,48,-65,104,-69xm130,-78v-2,-35,-66,-13,-77,3v16,6,62,6,77,-3xm145,-129v-27,-6,-39,-26,-60,-37v-8,0,-10,4,-14,10v-11,15,-51,34,-56,0v17,-4,44,-32,61,-43v28,5,41,21,63,36v12,8,17,17,17,25v0,6,-3,9,-11,9", w: 161 }, "ë": { d: "108,-124v42,-3,70,39,50,73v-22,-1,-70,12,-94,10r-3,3v0,3,12,7,36,14v18,0,64,7,30,21v-10,14,-31,6,-53,6v-26,-7,-67,-27,-71,-58v7,-52,48,-65,105,-69xm130,-78v-2,-35,-66,-13,-77,3v16,6,62,6,77,-3xm140,-144v0,8,-4,12,-12,12v-18,0,-19,-19,-16,-33v18,-1,29,1,28,21xm44,-169v7,3,28,9,28,17v0,9,-9,18,-18,18v-18,0,-25,-24,-10,-35", w: 161 }, "í": { d: "59,-98v20,4,15,53,10,95v-6,1,-11,2,-19,-4v1,-7,-12,-18,-10,-24v4,-22,-4,-65,19,-67xm50,-139v27,-11,49,-32,59,-14v3,11,-80,53,-89,53v-14,1,-14,-12,-11,-22v15,-7,14,-6,41,-17", w: 105 }, "ì": { d: "57,-98v22,5,13,50,11,95v-7,1,-11,2,-20,-4v1,-7,-12,-18,-10,-24v4,-22,-2,-64,19,-67xm70,-139v14,10,54,14,37,41v-28,-7,-61,-22,-99,-42v-3,-2,-3,-25,5,-23v15,5,41,17,57,24", w: 109 }, "î": { d: "72,-98v20,5,12,51,10,95v-6,2,-13,1,-20,-4v1,-8,-12,-18,-10,-24v4,-22,-3,-65,20,-67xm134,-94v-26,-7,-39,-25,-60,-37v-7,0,-9,4,-13,10v-14,15,-51,34,-56,-1v18,-4,45,-33,61,-43v27,6,40,22,62,37v12,8,18,17,18,25v0,6,-4,9,-12,9", w: 143 }, "ï": { d: "55,-97v19,5,15,53,10,95v-17,5,-26,-14,-30,-28v6,-20,-3,-65,20,-67xm110,-118v0,8,-4,13,-12,13v-17,0,-19,-19,-16,-34v18,-1,29,1,28,21xm14,-143v6,3,28,8,28,17v0,9,-9,18,-18,18v-18,0,-25,-24,-10,-35", w: 107 }, "ñ": { d: "115,-129v34,6,59,50,59,105v0,31,-15,24,-30,17v-15,-29,-5,-42,-20,-81v-35,-13,-68,52,-88,61v-20,-4,-38,-36,-19,-59v0,-12,3,-14,10,-28v11,-8,18,11,27,12xm117,-166v22,-7,41,-23,64,-26v3,11,-7,10,-7,21v-26,20,-45,30,-58,30v-3,3,-49,-26,-49,-28v-10,-1,-32,35,-51,31v-5,-12,-8,-16,0,-23v4,-6,28,-29,48,-33v17,-3,43,28,53,28", w: 171 }, "ó": { d: "102,-132v50,-20,99,16,99,60v0,54,-60,64,-108,79v-50,-2,-110,-48,-76,-100v22,-17,49,-33,85,-39xm136,-104v-34,0,-91,27,-94,47v16,51,125,16,125,-22v0,-17,-10,-25,-31,-25xm49,-154v24,-3,85,-55,101,-32v3,11,-80,53,-89,53v-14,0,-13,-8,-12,-21", w: 191 }, "ò": { d: "102,-132v50,-20,99,16,99,60v0,54,-60,64,-108,79v-50,-2,-110,-48,-76,-100v22,-17,49,-33,85,-39xm136,-104v-34,0,-91,27,-94,47v16,51,125,16,125,-22v0,-17,-10,-25,-31,-25xm115,-181v14,10,51,13,37,40v-28,-7,-62,-21,-100,-41v-3,-2,-3,-26,5,-23v16,5,42,17,58,24", w: 191 }, "ô": { d: "102,-132v50,-20,99,16,99,60v0,54,-60,64,-108,79v-50,-2,-110,-48,-76,-100v22,-17,49,-33,85,-39xm136,-104v-34,0,-91,27,-94,47v16,51,125,16,125,-22v0,-17,-10,-25,-31,-25xm110,-177v-22,6,-38,45,-65,22v-2,-4,-3,-9,-4,-13v18,-4,43,-32,61,-43v27,6,40,21,62,36v12,9,18,17,18,25v1,11,-15,10,-23,7", w: 191 }, "ö": { d: "102,-132v50,-20,99,16,99,60v0,54,-60,64,-108,79v-50,-2,-110,-48,-76,-100v22,-17,49,-33,85,-39xm136,-104v-34,0,-91,27,-94,47v16,51,125,16,125,-22v0,-17,-10,-25,-31,-25xm161,-160v0,8,-4,13,-12,13v-17,0,-19,-19,-16,-34v18,-1,29,1,28,21xm65,-185v7,3,28,9,28,18v0,7,-9,18,-18,17v-18,1,-25,-24,-10,-35", w: 191 }, "õ": { d: "102,-132v50,-20,99,16,99,60v0,54,-60,64,-108,79v-50,-2,-110,-48,-76,-100v22,-17,49,-33,85,-39xm136,-104v-34,0,-91,27,-94,47v16,51,125,16,125,-22v0,-17,-10,-25,-31,-25xm58,-199v26,-21,54,18,69,22v4,0,15,-5,34,-13v22,-9,21,-16,31,-13v3,11,-9,9,-7,22v-26,20,-46,30,-59,30v-2,4,-49,-28,-49,-29v-11,0,-32,31,-46,32v-12,-3,-13,-21,-4,-23v4,-6,14,-15,31,-28", w: 191 }, "ú": { d: "196,-129v-1,-4,12,-13,15,-13v6,0,8,7,8,21v0,24,-7,25,-13,45v-7,7,-14,21,-24,29v-9,24,-61,45,-89,45v-63,0,-105,-72,-67,-126v24,-3,19,27,18,46v-1,26,23,42,54,40v38,-3,88,-51,98,-87xm106,-174v26,-11,48,-32,59,-14v3,11,-81,53,-89,54v-13,1,-15,-12,-11,-22v15,-7,14,-7,41,-18", w: 213 }, "ù": { d: "196,-129v-1,-4,12,-13,15,-13v6,0,8,7,8,21v0,24,-7,25,-13,45v-7,7,-14,21,-24,29v-9,24,-61,45,-89,45v-63,0,-105,-72,-67,-126v24,-3,19,27,18,46v-1,26,23,42,54,40v38,-3,88,-51,98,-87xm126,-166v7,6,56,14,37,40v-28,-7,-62,-22,-100,-42v-2,-3,-2,-26,5,-23v16,4,42,18,58,25", w: 213 }, "û": { d: "196,-129v-1,-4,12,-13,15,-13v6,0,8,7,8,21v0,24,-7,25,-13,45v-7,7,-14,21,-24,29v-9,24,-61,45,-89,45v-63,0,-105,-72,-67,-126v24,-3,19,27,18,46v-1,26,23,42,54,40v38,-3,88,-51,98,-87xm172,-143v-27,-6,-39,-26,-60,-37v-8,0,-10,4,-14,10v-11,15,-49,35,-56,0v17,-4,44,-32,61,-43v27,6,41,21,63,36v12,9,17,17,17,25v0,6,-3,9,-11,9", w: 213 }, "ü": { d: "196,-129v-1,-4,12,-13,15,-13v6,0,8,7,8,21v0,24,-7,25,-13,45v-7,7,-14,21,-24,29v-9,24,-61,45,-89,45v-63,0,-105,-72,-67,-126v24,-3,19,27,18,46v-1,26,23,42,54,40v38,-3,88,-51,98,-87xm168,-161v0,8,-3,13,-11,13v-17,0,-20,-19,-17,-34v18,-1,29,1,28,21xm72,-186v7,3,29,9,28,18v0,7,-9,18,-18,17v-18,1,-25,-24,-10,-35", w: 213 }, "†": { d: "22,-286v15,6,5,-20,19,-19v9,-3,15,21,17,22v6,1,12,3,20,6v3,10,5,16,-9,16v-34,-10,-6,51,-34,52v-20,-7,11,-47,-15,-49v-14,3,-25,-5,-17,-24v7,-2,14,-4,19,-4", w: 77 }, "°": { d: "106,-268v0,36,-35,38,-51,46v-48,5,-60,-58,-25,-78v33,-11,76,-9,76,32xm38,-257v16,7,39,2,38,-17v-13,-9,-28,-1,-32,11v-5,3,-7,0,-6,6", w: 114 }, "¢": { d: "105,-188v13,-12,14,-18,26,-15v7,23,7,15,-3,49v6,0,18,14,17,20v-3,5,-12,19,-26,13v-14,1,-14,5,-16,21v10,10,46,-13,38,18v-9,17,-23,16,-54,20v-17,16,-4,55,-29,60v-37,-10,19,-64,-24,-71v-20,-10,-37,-47,-6,-62v23,-20,73,-4,77,-53xm65,-101v4,-9,7,-8,3,-13v-14,4,-22,10,-3,13", w: 154 }, "£": { d: "153,-170v3,22,62,0,49,39v-18,6,-31,12,-58,9v-12,-1,-17,30,-23,39v19,26,50,56,91,35v9,-2,27,-13,27,4v0,27,-27,39,-58,42v-32,-5,-59,-19,-78,-39v-6,1,-35,44,-57,39v-25,0,-37,-15,-37,-46v0,-41,43,-53,73,-50v4,1,12,-18,12,-21v-7,-15,-49,0,-44,-30v-2,-31,31,-16,60,-19v16,-30,25,-119,93,-113v16,2,75,16,50,44v-4,5,-7,7,-12,8v-18,-12,-32,-18,-41,-18v-35,-1,-38,52,-47,77xm43,-45v4,5,12,-2,11,-9v-1,2,-12,1,-11,9", w: 242 }, "§": { d: "141,-115v12,10,29,36,28,56v-4,68,-129,69,-152,16v-1,-12,-10,-22,8,-23v17,3,47,21,67,23v16,1,40,-8,38,-21v-8,-49,-119,-30,-117,-85v1,-28,15,-45,-3,-64v-1,-53,55,-61,103,-62v15,-5,6,-5,20,-2v16,17,23,27,23,30v-1,26,-29,7,-45,7v-21,0,-51,2,-62,17v19,14,87,8,97,43v18,14,16,57,-5,65xm64,-147r57,17v10,-28,-22,-43,-47,-44v-25,-1,-35,19,-10,27", w: 174 }, "•": { d: "130,-114v0,47,-124,54,-120,-8r6,-31v44,-28,64,-34,104,0v8,6,10,20,10,39", w: 139 }, "¶": { d: "121,-237v21,-9,44,-13,63,-1v-1,7,5,6,7,11r-4,190v-2,33,4,39,-15,40v-16,1,-10,-20,-10,-33r4,-161v0,-17,-1,-34,-16,-25v2,10,1,23,1,35v-9,46,-6,75,-15,156v-3,4,-7,5,-12,5v-17,-10,-3,-89,-10,-115v-43,14,-98,10,-101,-29v-4,-53,59,-63,104,-75v3,1,4,2,4,2xm95,-204v2,9,-30,50,1,50v35,0,23,-13,29,-43v0,-1,-2,-7,-4,-15v-12,-1,-14,2,-26,8", w: 206 }, "ß": { d: "33,10v-29,4,-28,-32,-16,-70v18,-58,17,-137,56,-176v12,-24,46,-58,82,-43v20,8,47,24,47,54v0,30,-62,59,-67,90v33,23,56,33,63,63v-18,21,-22,36,-48,54v-24,17,-27,41,-53,16v-2,-19,7,-35,24,-42v15,-13,26,-22,34,-40v-13,-17,-78,-29,-56,-70v-3,-27,64,-54,66,-86v-8,-25,-41,-4,-52,8v-29,30,-47,83,-51,141v-17,25,-8,71,-29,101" }, "®": { d: "75,-194v78,-29,116,9,130,84v-2,42,-22,47,-57,67v-74,20,-161,-19,-129,-110v6,-18,29,-34,57,-40xm46,-86v51,36,84,21,129,-15v7,-15,0,-39,-10,-49v-13,-37,-49,-26,-86,-18v-28,7,-49,46,-33,82xm72,-123v-5,-43,68,-57,75,-14v-17,26,-18,17,3,32v2,25,-25,18,-45,7r-4,-4v-1,8,-3,20,-12,24v-10,-3,-21,-34,-17,-45xm112,-135v-10,-1,-20,13,-9,14v6,-6,9,-11,9,-14", w: 217 }, "©": { d: "102,-29v-74,5,-124,-84,-70,-140v22,-22,53,-35,97,-38v46,-4,88,49,74,100v0,44,-51,75,-101,78xm96,-66v42,-3,75,-23,75,-69v0,-23,-4,-38,-44,-38v-16,0,-33,6,-49,20v36,-4,55,-12,62,20v-5,16,-49,1,-50,21v10,15,53,-14,54,11v0,18,-14,27,-42,27v-22,1,-46,-11,-46,-31v0,-25,7,-39,20,-44v-1,-1,-2,-2,-3,-2v-51,22,-32,89,23,85", w: 217 }, "™": { d: "213,-307v28,9,11,49,7,75v-1,4,-4,6,-11,6v-7,1,-11,-14,-11,-34v-14,-6,-34,34,-46,28v-2,0,-10,-9,-24,-27v-10,7,-3,36,-27,31v-15,-24,-3,-27,1,-48v-6,-7,-27,-1,-31,3v-3,14,-7,30,-11,51v-5,10,-29,9,-24,-12v-5,-8,1,-18,3,-35v-13,6,-33,2,-29,-18v20,-17,64,-17,100,-19v28,-1,29,30,45,39v11,-6,35,-32,58,-40", w: 239 }, "´": { d: "52,-284v29,-11,50,-34,62,-14v3,12,-86,54,-94,56v-14,0,-16,-12,-12,-23v11,-5,25,-11,44,-19", w: 120 }, "¨": { d: "124,-259v0,9,-4,13,-12,13v-18,0,-22,-21,-17,-35v19,-1,30,1,29,22xm23,-285v7,2,30,9,29,18v1,10,-9,19,-18,19v-19,0,-28,-26,-11,-37", w: 136 }, "≠": { d: "48,-130v29,11,49,-57,60,-50v25,6,7,27,-1,46v22,5,29,7,21,22v-18,2,-48,-1,-50,15v9,8,53,-7,54,10v-4,22,-46,20,-72,24v-7,13,-18,32,-34,57v-8,6,-15,-3,-13,-14v-1,-9,15,-39,14,-45v-30,5,-24,-17,-13,-25v12,-1,36,4,29,-13v-14,0,-47,6,-36,-12v0,-18,27,-13,41,-15", w: 140 }, "Æ": { d: "335,-259v0,30,-102,12,-122,34v10,21,2,79,16,100v24,-6,59,-13,86,-16v23,-2,32,21,13,26r-103,29v-3,22,-4,38,8,43v28,-5,60,-6,86,-14v5,-1,14,7,14,11v6,16,-90,40,-107,40v-29,0,-39,-19,-32,-46v-2,-4,0,-26,-9,-28v-29,2,-58,6,-88,6v-31,0,-40,74,-82,73v-18,-23,4,-37,12,-50v40,-65,112,-126,165,-207v20,-17,69,-11,112,-13v21,0,31,4,31,12xm123,-111v28,1,44,-2,67,-10v-4,-22,5,-49,-7,-65v-3,6,-65,61,-60,75", w: 348 }, "Ø": { d: "76,-211v41,-13,100,-22,140,-3v26,-19,40,-29,44,-29v10,0,15,7,15,20v0,15,-23,23,-30,35v23,39,29,114,-21,139v-36,19,-102,35,-147,18v-14,-5,-29,29,-46,35v-25,-13,-19,-24,3,-56v-9,-17,-28,-27,-28,-60v0,-38,23,-72,70,-99xm107,-66v55,15,125,-12,123,-70v0,-16,-5,-25,-13,-29r-110,95r0,4xm39,-108v-1,3,17,31,22,27v8,-6,109,-90,123,-106v-15,-11,-43,1,-63,2v-33,10,-80,35,-82,77", w: 270 }, "∞": { d: "322,-72v-4,22,-54,41,-76,41v-43,0,-83,-17,-114,-35v-46,19,-125,53,-128,-18v-1,-14,10,-22,13,-35v29,-10,62,-31,97,-4v37,28,47,5,75,-8v40,-19,73,-10,114,1v13,1,18,55,19,58xm228,-69v15,0,62,-12,61,-25v-19,-23,-89,-10,-105,11v0,2,1,4,2,4v28,6,42,10,42,10xm75,-102v-13,2,-41,4,-44,19v0,4,3,7,10,7v21,0,40,-6,54,-17v-9,-6,-16,-9,-20,-9", w: 330 }, "±": { d: "93,-163v-7,46,76,-4,46,47v-14,6,-27,13,-38,8v-24,2,-14,28,-28,44r-14,0v-7,-12,-5,-15,-7,-33v-12,-7,-41,-1,-37,-24v2,-11,23,-17,36,-14r28,-38v4,0,9,4,14,10xm113,-27v-12,18,-58,27,-85,24v-16,2,-22,-23,-13,-36v28,-7,85,-11,98,12", w: 151 }, "≤": { d: "73,-109v10,15,87,16,87,42v0,11,-5,16,-13,16v-36,-11,-69,-24,-109,-31v-18,-8,-18,-13,-9,-36v59,-56,93,-83,101,-83v16,0,18,17,14,28v-27,24,-42,35,-71,64xm10,-29v35,-12,117,-26,148,-3v1,2,-5,19,-8,18r-124,15v-16,2,-26,-18,-16,-30", w: 168 }, "≥": { d: "115,-174v20,7,53,36,20,57v-19,11,-91,68,-82,59v-18,3,-25,-22,-13,-31v15,-10,14,-10,70,-51r-50,-37v-5,-4,-5,-27,4,-28v16,7,40,17,51,31xm14,-32v33,-10,86,-14,127,-10v12,12,5,23,-11,27v-49,9,-82,13,-99,13v-22,0,-24,-16,-17,-30", w: 163 }, "¥": { d: "31,-248v30,-3,64,64,74,59v37,-22,77,-65,107,-82v20,-11,34,18,21,32v-28,19,-52,38,-70,57v-18,8,-40,21,-35,60v2,19,39,7,64,7v25,0,16,21,2,27v-36,16,-46,8,-68,18v6,11,101,-20,66,24v-21,11,-42,12,-75,20v-2,1,-5,6,-10,18v-8,3,-11,10,-24,8v-7,-17,-2,-18,-9,-26v-13,5,-39,3,-53,-2v-10,-17,-7,-27,0,-34v23,-1,45,1,64,-5v-11,-7,-28,-4,-64,-6v-13,-8,-15,-24,-6,-35v33,-2,102,9,76,-37v-14,-14,-33,-38,-60,-66v-10,-10,-8,-28,0,-37", w: 219 }, "µ": { d: "123,-114v41,0,54,-9,127,-17v12,-2,20,-6,25,-12v5,-78,43,-127,119,-138v38,-5,46,23,55,48v-5,5,2,4,2,12v-2,47,-72,81,-129,95v-17,4,-12,32,-2,39v30,-5,24,0,99,4v14,9,14,20,-1,23v-17,3,-71,-1,-85,13v1,19,18,35,-3,47v-1,-6,-10,-7,-16,-5v-3,-3,-20,-37,-29,-41v-15,8,-50,22,-49,-9v1,-19,2,-27,28,-26v24,1,13,-12,8,-30v-22,1,-64,16,-111,23v-50,7,-17,47,-17,57v0,10,-5,15,-13,15v-20,-9,-27,-30,-33,-55v-20,-17,-52,8,-85,-6v-2,-10,-13,-26,4,-29v32,-6,41,-1,65,-7v-17,-74,-4,-173,69,-180v55,-20,130,8,131,65v-11,9,-10,2,-29,-11v-33,-23,-37,-26,-76,-25v-41,13,-69,38,-67,100v0,34,4,50,13,50xm317,-152v29,-6,106,-43,106,-71v0,-23,-24,-25,-42,-17v-31,1,-74,48,-64,88", w: 462 }, "∂": { d: "456,-113v55,-37,119,-8,176,5v-19,37,-104,-5,-144,18v-5,64,-45,87,-130,87v-43,0,-70,-8,-96,-21v-54,15,-146,29,-209,10v-18,-11,-43,-26,-46,-53v-1,-9,28,-48,51,-46v55,-10,55,-8,101,-8v29,0,17,-26,23,-56v4,-19,4,-74,34,-49v4,42,-7,83,-10,124v0,4,-11,10,-34,17v-29,-1,-45,-4,-74,1v-10,2,-57,3,-52,18v30,43,132,30,190,18v2,-10,-7,-19,-5,-28v5,-36,31,-59,74,-56v27,2,71,4,70,35v-1,30,-37,41,-58,57v35,13,131,15,135,-23v2,-19,-5,-36,4,-50xm262,-85v0,3,13,28,19,25v7,0,48,-13,61,-29v-10,-17,-71,-17,-80,4", w: 640 }, "∑": { d: "235,-95v-3,-59,120,-41,160,-28v3,-2,15,-3,14,4v1,3,-16,19,-21,18r-97,4v-25,5,-18,18,-23,56v-16,14,-25,24,-36,18v-83,32,-154,29,-212,-17v-45,-68,41,-114,107,-119v50,-4,59,66,22,85v-16,8,-61,10,-79,15v36,27,185,24,165,-36xm128,-119v-23,-3,-43,4,-53,15v13,5,46,-4,53,-15", w: 414 }, "∏": { d: "243,-190v7,-18,27,-19,38,6v0,2,-5,8,-14,16v-8,-9,-27,-4,-24,-22xm221,-111v55,-7,60,22,45,64v5,23,17,47,-22,47v-35,0,-18,-40,-15,-70v-2,-19,-35,-13,-52,-18v-2,0,-13,1,-34,3v-4,0,-10,11,-13,31v-3,20,1,43,-11,54v-12,-4,-13,-5,-21,-3v-13,-13,-3,-25,-12,-41v7,-6,12,-22,10,-39v-23,-8,-79,15,-87,-21v12,-28,78,-4,101,-20r36,-96v8,-19,17,-28,27,-28v10,0,15,6,15,18v-6,32,-31,62,-38,109v25,10,47,-1,71,10", w: 282 }, "π": { d: "247,-240v-3,5,-14,12,-21,6v-41,5,-71,-4,-85,37v-6,7,-21,42,-25,61v28,12,104,-16,129,24v8,11,12,24,12,38v-7,17,-2,99,-40,68v-9,-23,-5,-47,-1,-73v3,-24,-40,-24,-50,-19v-4,0,-18,2,-44,6v-30,-6,-16,49,-33,58v-19,-11,-14,2,-29,-10v8,-71,20,-114,43,-170v-24,-2,-49,4,-73,7v-30,3,-32,-33,-7,-36r184,-22v17,-1,40,13,40,25", w: 265 }, "∫": { d: "62,-151v-7,-70,20,-130,63,-150v28,1,39,10,70,23v20,8,6,33,-6,35v-29,-13,-45,-20,-49,-20v-20,-4,-45,51,-43,70v8,60,5,129,5,189v0,62,-27,93,-79,93v-37,-1,-71,-14,-63,-57v21,0,79,34,91,-2v16,-3,14,-64,21,-85v-2,-31,-1,-74,-10,-96", w: 156 }, "ª": { d: "6,-265v1,-31,58,-53,80,-22v-11,14,25,28,25,36v-2,8,-15,12,-27,10v-22,-29,-68,19,-78,-24xm52,-281v-8,1,-24,10,-9,13v11,1,24,-10,9,-13", w: 117 }, "º": { d: "13,-273v1,-31,56,-41,83,-18v36,8,14,48,-9,52v-35,6,-64,-5,-74,-34xm81,-269v-7,-7,-20,-11,-29,-6v5,13,13,11,29,6", w: 128 }, "Ω": { d: "121,-111v9,16,43,-5,54,5v28,-4,62,8,81,-5v48,-33,166,-28,160,44v15,34,-51,53,-88,53v-34,0,-53,-21,-71,-37v-15,7,-32,-4,-28,-22v-26,-4,-93,-6,-108,8v8,17,5,37,12,54v-1,15,-18,15,-31,10v-9,-15,-20,-39,-19,-63v-20,-9,-73,15,-79,-18v4,-28,50,-11,77,-24v12,-99,36,-168,137,-178v35,5,64,20,67,57v0,13,-14,18,-20,5v-15,-35,-83,-31,-104,4v-26,20,-39,82,-40,107xm334,-45v15,2,51,-14,53,-22v-7,-20,-36,-31,-69,-29v-8,-1,-39,6,-37,14v-3,10,44,38,53,37", w: 424 }, "æ": { d: "145,-44r33,7v2,42,-59,29,-85,16v-6,7,-35,24,-48,15v-19,2,-35,-21,-33,-37v2,-24,5,-19,28,-36v-6,-8,-45,3,-33,-21v21,-22,58,-12,85,-1v6,-5,35,-28,45,-15v20,-4,36,17,36,35v0,23,-4,21,-28,37xm111,-72v12,3,49,-16,19,-17v-5,0,-20,12,-19,17xm74,-50v-14,-4,-48,16,-19,17v4,1,19,-14,19,-17", w: 184 }, "ø": { d: "76,-136v17,7,33,-8,51,0v9,-6,21,-13,36,-21v23,22,-13,31,3,50v11,13,4,21,14,35v-4,5,-1,14,-4,23v-14,23,-45,41,-84,39v-12,2,-29,28,-41,38v-2,-11,-34,-10,-15,-30v3,-7,5,-11,5,-11v-15,-24,-60,-54,-22,-89v23,-21,25,-32,57,-34xm102,-54v18,1,50,-19,30,-32v-12,7,-22,18,-30,32xm85,-92v-14,3,-26,8,-38,17v2,20,17,13,26,0v6,-8,12,-13,12,-17", w: 188 }, "¿": { d: "181,-247v3,1,31,2,29,15v-4,22,-37,27,-41,4v1,-5,7,-20,12,-19xm161,-34v-45,-1,-105,19,-124,51v0,11,18,17,54,17v39,0,82,-13,112,4v-10,35,-58,31,-100,31v-47,0,-80,-10,-99,-31v-10,-56,22,-73,64,-90v8,-3,32,-9,74,-18v21,-15,7,-62,22,-92v-1,-5,-1,-11,4,-12v16,0,24,7,24,22v-8,30,-8,73,-17,111v-3,5,-7,7,-14,7", w: 213 }, "¡": { d: "86,-197v8,16,-7,41,-24,25v-11,-11,-4,-16,-3,-29v13,0,15,-2,27,4xm46,-107v4,-8,11,-16,23,-7v19,26,-5,57,-6,87v-7,0,-5,18,-9,28v0,14,-17,52,-11,70v-2,7,-15,28,-25,12v-4,-6,-15,-7,-6,-16v2,-39,14,-96,34,-174", w: 95 }, "¬": { d: "141,-99v47,7,103,-3,149,6v14,24,18,15,10,39v-10,34,-7,31,-26,76v-4,6,-15,8,-16,21v-4,2,-4,1,-13,5v-22,-33,-4,-33,16,-104v-5,-9,-28,-4,-38,-6r-183,4v-14,0,-41,-29,-17,-36v31,-9,82,5,118,-5", w: 315 }, "√": { d: "364,-218v43,-21,80,-51,104,-32v-3,19,-24,21,-44,40v-41,15,-78,53,-136,78r-137,98v-20,16,-79,66,-91,68v-3,1,-25,-11,-24,-13v-4,-28,-43,-61,-30,-85v26,-15,42,19,58,32r295,-188v0,1,2,2,5,2", w: 474 }, "ƒ": { d: "115,-262v-23,6,-39,63,-38,96v1,3,57,2,54,16v1,22,-45,15,-51,30v3,34,12,68,10,103v14,17,-18,53,-28,63v-48,8,-89,5,-95,-37v20,-5,77,21,83,-18v17,-29,-4,-61,0,-98v0,-5,-3,-10,-7,-17v-33,4,-43,-17,-25,-37v10,-4,27,5,27,-10v0,-43,15,-77,32,-109v12,-7,16,-22,38,-20v11,1,51,35,25,55v-9,1,-16,-17,-25,-17", w: 145 }, "≈": { d: "133,-112v21,15,48,-30,78,-17v3,3,5,7,5,9v-8,30,-47,45,-76,45v-19,0,-64,-48,-90,-21r-29,20v-6,-1,-17,-16,-15,-32v24,-17,70,-42,107,-21v4,4,10,9,20,17xm138,-57v28,2,48,-25,76,-26v13,30,-21,42,-40,53v-41,24,-77,-15,-114,-23v-15,14,-46,32,-49,-1v-3,-9,27,-28,54,-30", w: 223 }, "∆": { d: "18,-1v-24,-30,8,-48,25,-71v14,-19,34,-28,40,-56v20,-35,29,-14,57,4v9,39,43,62,57,102v0,16,-34,17,-50,14v-28,2,-72,4,-129,7xm139,-47r-22,-52v-12,-5,-12,15,-24,27v-7,6,-14,16,-23,28v23,1,36,-1,69,-3", w: 199 }, "«": { d: "191,-64v16,6,87,37,53,63v-39,-9,-71,-28,-107,-40v-14,-13,-13,-34,10,-47v27,-15,48,-55,84,-62v9,-2,21,10,21,18r-13,21v-16,5,-44,22,-51,41v0,4,1,6,3,6xm71,-65v17,6,87,35,55,62v-39,-8,-66,-27,-108,-40v-14,-13,-13,-36,10,-46v23,-18,50,-56,84,-63v9,-2,21,10,21,18r-13,22v-20,6,-32,17,-51,37v0,3,-1,11,2,10", w: 265 }, "»": { d: "120,-129v9,-33,48,-10,64,5v9,20,86,52,50,86v-36,11,-66,31,-107,40v-6,-7,-9,-13,-9,-17v-2,-13,50,-46,63,-46v11,-18,-33,-42,-48,-47xm1,-128v10,-33,46,-8,64,6v8,19,86,50,51,85v-40,13,-69,30,-108,40v-6,-7,-8,-12,-8,-16v-2,-14,50,-46,63,-47v7,-13,-9,-20,-19,-30v-10,-9,-20,-15,-30,-17", w: 252 }, "…": { d: "244,-24v-1,21,-38,32,-41,3v-2,-19,23,-22,34,-17v0,7,0,15,7,14xm113,-24v0,-22,28,-21,38,-8v5,34,-39,40,-38,8xm35,-2v-10,-2,-36,-17,-18,-29v-1,-15,17,-17,31,-6v7,17,6,33,-13,35", w: 258 }, " ": { w: 179 }, "À": { d: "161,-217v20,53,23,124,54,170v-2,20,-34,9,-42,0v-27,-12,-78,-18,-101,-18v-26,6,-29,51,-54,63v-18,-4,-19,-30,-3,-38v5,-9,15,-16,8,-29v1,-12,23,-9,26,-19v6,-10,11,-20,20,-27r70,-121v12,-4,16,4,22,19xm82,-91v17,3,62,7,86,13v-13,-33,-13,-80,-29,-109v-15,30,-38,63,-57,96xm150,-268v14,10,54,14,37,41v-28,-7,-62,-22,-100,-42v-2,-3,-2,-26,5,-23v16,4,42,17,58,24" }, "Ã": { d: "161,-217v20,53,23,124,54,170v-2,20,-34,9,-42,0v-27,-12,-78,-18,-101,-18v-26,6,-29,51,-54,63v-18,-4,-19,-30,-3,-38v5,-9,15,-16,8,-29v1,-12,23,-9,26,-19v6,-10,11,-20,20,-27r70,-121v12,-4,16,4,22,19xm82,-91v17,3,62,7,86,13v-13,-33,-13,-80,-29,-109v-15,30,-38,63,-57,96xm100,-285v26,-19,54,19,69,22v4,0,15,-5,34,-13v23,-9,22,-17,31,-12v3,11,-9,9,-7,21v-26,20,-46,30,-59,30v-3,3,-50,-26,-49,-29v-12,1,-31,35,-51,32v-3,-8,-5,-14,-5,-18v10,-9,16,-17,37,-33" }, "Õ": { d: "62,-184v78,-31,249,-50,238,74v-6,65,-102,105,-179,115v-77,-7,-152,-71,-101,-149v2,-5,24,-33,42,-40xm279,-120v14,-38,-47,-64,-85,-61v-20,-9,-41,7,-62,0v-11,7,-54,12,-66,24v0,20,-51,35,-38,66v-1,43,50,67,96,67v44,0,162,-55,155,-96xm116,-270v26,-19,54,19,69,22v4,0,15,-5,34,-13v23,-10,22,-16,31,-12v3,11,-8,9,-7,21v-45,28,-47,42,-88,16v-29,-19,-12,-20,-43,2v-8,5,-12,18,-23,15v-13,-3,-12,-20,-4,-23v4,-6,14,-15,31,-28", w: 273 }, "Œ": { d: "247,-243v71,4,161,-7,245,-8v17,0,27,6,27,17v-8,27,-70,14,-104,23v-3,1,-52,0,-65,7r0,4v16,16,17,29,17,65v32,10,74,-14,99,16v-14,25,-76,17,-127,24v-17,18,-55,32,-75,51v85,0,128,-3,204,-11v15,-2,21,11,20,29v-78,24,-177,12,-270,24v-24,3,-24,-29,-48,-15v-46,7,-70,4,-105,-4v-19,-18,-42,-22,-52,-55v-10,-34,0,-47,12,-78v-18,-59,48,-78,105,-84v17,-18,103,-13,117,-5xm125,-45v76,-9,186,-43,209,-105v-26,-67,-137,-83,-217,-54v3,34,-45,25,-60,58v-41,48,5,108,68,101", w: 492 }, "œ": { d: "185,-54v25,28,107,-17,104,33v-12,12,-60,14,-87,14v0,0,1,1,2,1v-11,1,-39,-9,-50,-17v-28,17,-75,32,-114,7v-22,-14,-34,-11,-34,-41v0,-36,33,-49,48,-75v29,-16,72,-3,95,11v12,-9,48,-27,59,-26v30,0,64,15,65,40v0,7,-6,20,-20,37v-29,1,-44,11,-68,16xm226,-106v-21,-7,-41,-2,-48,13v14,1,42,-7,48,-13xm132,-87v-21,-35,-94,11,-92,24v-2,14,43,21,61,21v25,0,36,-20,31,-45", w: 295 }, "–": { d: "6,-66v-8,-72,79,-21,146,-39v37,-10,79,7,111,0v9,8,14,13,14,17v2,26,-72,13,-99,21v-83,4,-124,21,-172,1", w: 282 }, "—": { d: "175,-106v86,-9,201,1,286,-1v11,6,13,11,6,30v-118,15,-246,10,-377,10v-25,0,-73,3,-82,-8r-2,-26v11,-13,32,-9,52,-7v38,3,84,-5,117,2", w: 485 }, "“": { d: "66,-261v-21,5,-37,51,-22,77v0,4,-2,6,-7,6v-31,-9,-38,-62,-12,-94v12,-15,21,-28,31,-34v16,-1,19,24,22,34v10,-11,22,-32,43,-23v-2,8,4,16,5,19v-6,11,-51,53,-29,74v-12,21,-30,5,-33,-17v-6,-13,9,-28,2,-42", w: 118 }, "”": { d: "120,-294v12,3,30,26,19,34v2,15,-40,70,-55,66v-40,-10,10,-51,14,-64v3,-3,8,-31,22,-36xm70,-306v14,3,26,34,16,49v-19,30,-31,45,-58,59v-12,-11,-33,-17,-7,-36v13,-19,36,-27,36,-59v0,-5,9,-13,13,-13", w: 148 }, "‘": { d: "73,-262v-10,7,-41,39,-38,69v-15,13,-27,-16,-28,-28v-2,-20,51,-83,66,-83v20,0,25,41,0,42", w: 95 }, "’": { d: "74,-300v13,31,-1,99,-44,101v-13,0,-19,-5,-19,-15v6,-10,31,-34,35,-59v2,-11,1,-32,11,-32v6,0,11,2,17,5", w: 90 }, "÷": { d: "167,-158v-4,3,-7,9,-10,20v-23,4,-34,-8,-29,-31v14,-6,18,1,39,11xm78,-72v-53,11,-53,12,-69,-15v-1,-12,11,-17,22,-14v71,-13,151,-18,230,-24v11,1,21,16,23,28v-28,20,-90,11,-126,16v-36,5,-62,5,-80,9xm123,-40v19,-17,41,-1,41,17v0,13,-6,19,-17,19v-15,0,-29,-14,-24,-36", w: 293 }, "◊": { d: "76,-158v48,-8,64,11,100,36v28,19,-5,39,-22,54v-15,13,-40,32,-48,49v-17,5,-12,0,-27,-16v-6,-6,-86,-31,-68,-53r2,-9v27,-23,48,-44,63,-61xm93,-65v12,-2,35,-31,41,-38v-5,-10,-16,-14,-34,-24v-12,12,-36,29,-40,44v19,11,30,18,33,18", w: 199 }, "ÿ": { d: "118,85v-11,11,-11,38,-22,61v-2,-1,-2,31,-17,27v-11,0,-21,-10,-21,-22v20,-66,23,-61,64,-168v-22,1,-38,16,-58,4v-22,4,-51,-16,-51,-42v-11,-13,-7,-59,7,-58v16,1,21,24,22,51v21,33,66,5,94,-7v4,-3,26,-14,38,-29r17,0v23,44,-23,59,-34,102v-6,9,-13,9,-13,26v-15,6,-12,33,-27,48v0,2,1,4,1,7xm158,-136v0,8,-4,13,-12,13v-18,0,-21,-20,-16,-34v18,-1,29,1,28,21xm62,-161v7,3,28,9,27,18v1,8,-8,17,-17,17v-18,0,-26,-24,-10,-35", w: 190 }, "Ÿ": { d: "176,-189v35,20,-25,54,-39,72v-26,34,-57,57,-74,104v-10,15,-4,14,-23,3r0,-10v19,-44,27,-46,50,-81v-9,-5,-24,4,-34,4v-38,0,-54,-50,-44,-87v21,-5,18,19,22,35v4,18,15,27,29,27v41,0,60,-39,113,-67xm153,-222v0,8,-3,12,-11,12v-18,0,-21,-19,-16,-33v18,-1,28,2,27,21xm57,-247v8,2,29,9,28,17v0,21,-37,24,-36,1v0,-7,2,-13,8,-18", w: 135 }, "⁄": { d: "193,-305v7,6,17,31,3,41v-10,7,-12,13,-21,25v-79,56,-190,209,-197,260r-18,0v-23,-19,9,-70,15,-85v52,-83,121,-179,218,-241", w: 120 }, "¤": { d: "308,-133r-200,16v-2,1,-6,4,-10,10v70,-2,144,-14,211,-8v3,0,8,4,13,8v-1,4,-3,9,-9,17v-57,11,-164,6,-219,25v26,32,112,25,173,25v9,0,35,2,35,19v0,9,-4,13,-12,14v-115,12,-146,23,-211,-19v-12,-4,-22,-9,-25,-27v-6,-29,-61,3,-43,-49v17,-1,36,7,42,-12v-32,7,-36,-39,-11,-40v29,14,63,-25,73,-30v52,-25,72,-44,142,-44v23,0,21,41,-1,39v-35,-3,-61,9,-102,31v2,2,5,4,8,4v18,-6,101,-9,115,-9v7,0,55,13,31,30", w: 312 }, "€": { d: "308,-133r-200,16v-2,1,-6,4,-10,10v70,-2,144,-14,211,-8v3,0,8,4,13,8v-1,4,-3,9,-9,17v-57,11,-164,6,-219,25v26,32,112,25,173,25v9,0,35,2,35,19v0,9,-4,13,-12,14v-115,12,-146,23,-211,-19v-12,-4,-22,-9,-25,-27v-6,-29,-61,3,-43,-49v17,-1,36,7,42,-12v-32,7,-36,-39,-11,-40v29,14,63,-25,73,-30v52,-25,72,-44,142,-44v23,0,21,41,-1,39v-35,-3,-61,9,-102,31v2,2,5,4,8,4v18,-6,101,-9,115,-9v7,0,55,13,31,30", w: 312 }, "‹": { d: "64,-107v9,17,86,17,87,43v0,11,-4,16,-13,16v-36,-11,-70,-22,-109,-31v-19,-4,-18,-14,-9,-36v59,-56,93,-84,101,-84v17,0,19,20,13,29", w: 159 }, "›": { d: "41,-181v26,27,112,44,70,91r-82,60v-20,3,-25,-23,-13,-32r70,-51r-66,-46v-5,-6,-4,-28,5,-29v4,2,9,4,16,7", w: 137 }, "": { d: "74,-74v-6,-24,-70,8,-68,-27v0,-6,6,-20,20,-18v44,6,45,-9,42,-49v7,-40,26,-114,90,-104v48,-2,63,-1,90,30v11,25,4,14,2,44v-7,17,-54,9,-49,-7r8,-21v-5,-13,-22,-9,-43,-11v-56,-6,-63,45,-67,92v-2,21,5,23,22,22v37,-1,80,-9,113,-1v13,31,-9,82,-22,106v-13,10,-26,-6,-22,-25r11,-46v0,-3,-2,-6,-6,-6v-19,0,-47,3,-83,9v-6,1,-9,4,-8,11r12,59v-1,9,-11,30,-23,18v-18,-18,-15,-59,-19,-76", w: 272 }, "": { d: "43,-61v-21,4,-36,2,-39,-15v-4,-35,41,-8,34,-47v4,-59,12,-99,46,-124v11,-42,157,-47,149,13v1,7,-7,15,-13,15v-18,-7,-19,-26,-47,-23v-34,3,-65,6,-79,37v-12,27,-22,52,-21,91v13,9,31,-11,45,-4v32,-15,50,-6,94,-13v12,-30,19,-79,36,-133v1,-5,5,-8,12,-8v44,18,-18,106,-12,144v-9,22,-1,73,-16,104v2,28,-23,28,-37,16v1,-26,9,-48,11,-75v0,-6,-3,-9,-9,-9v-43,0,-83,8,-119,24v8,40,17,33,-7,56v-20,-9,-21,-19,-28,-49", w: 283 }, "‡": { d: "102,-284v16,2,42,-2,33,18v-7,15,-42,1,-38,30v3,3,31,1,30,11v4,15,-29,19,-36,24v-2,18,-4,24,-16,29r-25,-26v-25,7,-53,3,-42,-25v4,-10,70,0,51,-22v-17,4,-41,12,-39,-15v-5,-16,39,-18,44,-20v4,-2,7,-10,10,-24v19,-3,23,6,28,20", w: 145 }, "∙": { d: "57,-77v6,18,-7,21,-19,23v-34,6,-25,-40,-9,-43v18,-3,29,8,28,20", w: 67 }, "‚": { d: "25,63v-26,21,-48,-2,-22,-24v14,-12,35,-40,35,-69v3,-2,3,-11,12,-9v35,17,5,88,-25,102", w: 97 }, "„": { d: "25,63v-26,21,-48,-2,-22,-24v11,-9,36,-41,35,-69v3,-2,4,-12,12,-9v36,14,5,89,-25,102xm84,64v-24,20,-45,-1,-21,-24v21,-20,32,-35,35,-69v3,-2,3,-11,12,-9v36,17,9,86,-26,102", w: 135 }, "‰": { d: "398,-131v58,-1,87,13,72,65v-1,30,-66,63,-99,65v-56,3,-99,-58,-62,-102v2,2,5,2,8,2v20,-16,51,-17,81,-30xm202,-279v33,0,94,-24,95,18v-7,31,-33,27,-54,55v-36,32,-71,74,-112,99v-18,18,-40,34,-51,58v-19,14,-25,37,-56,40v-17,2,-25,-29,-10,-40v15,-11,40,-37,52,-52r87,-72v-51,13,-100,6,-116,-27v1,-5,-6,-30,-9,-36v-3,-5,22,-41,27,-39v29,2,16,34,5,49v0,15,14,23,42,23v42,0,59,-31,28,-38v-17,-4,-53,3,-50,-23v0,-7,1,-12,4,-16v16,-9,36,4,49,5v0,0,23,-4,69,-4xm222,-118v33,-2,55,18,50,57v-29,36,-48,45,-96,50v-27,-5,-56,-17,-58,-51v13,-37,64,-43,104,-56xm335,-61v13,44,101,7,108,-31v-11,-3,-20,-4,-30,-4v-18,-1,-82,18,-78,35xm225,-244v-18,0,-29,-1,-46,3v7,15,6,28,0,43v15,-14,34,-30,46,-46xm164,-53v26,5,59,-10,76,-26v-17,-16,-49,2,-67,14v1,8,-8,6,-9,12", w: 485 }, "Â": { d: "161,-217v20,53,23,124,54,170v-2,20,-34,9,-42,0v-27,-12,-78,-18,-101,-18v-26,6,-29,51,-54,63v-18,-4,-19,-30,-3,-38v5,-9,15,-16,8,-29v1,-12,23,-9,26,-19v6,-10,11,-20,20,-27r70,-121v12,-4,16,4,22,19xm82,-91v17,3,62,7,86,13v-13,-33,-13,-80,-29,-109v-15,30,-38,63,-57,96xm202,-219v-27,-6,-40,-26,-61,-37v-21,7,-39,46,-65,23v-2,-4,-3,-10,-4,-14v19,-4,43,-32,61,-43v27,6,40,22,62,37v12,8,18,17,18,25v0,6,-3,9,-11,9" }, "Ê": { d: "49,-160v1,-4,-10,-9,-15,-8v-15,-35,32,-30,57,-31r142,-8v2,1,30,7,40,10v-52,16,-133,17,-190,30v-7,9,-12,24,-15,47v26,10,102,-6,141,3v1,3,1,6,2,10v-36,18,-92,12,-149,21v-11,9,-16,41,-16,51v55,-1,111,-21,168,-13v15,-8,48,1,31,18v-53,16,-130,13,-198,29r-39,-8v-4,-19,17,-53,20,-76v-1,0,-7,-11,-9,-18v18,-7,22,-28,30,-57xm199,-211v-27,-6,-39,-26,-60,-37v-21,7,-40,47,-65,22v-2,-7,-2,-7,-4,-13v18,-5,44,-31,61,-43v27,6,41,22,62,37v12,9,18,17,18,25v0,6,-4,9,-12,9", w: 252 }, "Á": { d: "161,-217v20,53,23,124,54,170v-2,20,-34,9,-42,0v-27,-12,-78,-18,-101,-18v-26,6,-29,51,-54,63v-18,-4,-19,-30,-3,-38v5,-9,15,-16,8,-29v1,-12,23,-9,26,-19v6,-10,11,-20,20,-27r70,-121v12,-4,16,4,22,19xm82,-91v17,3,62,7,86,13v-13,-33,-13,-80,-29,-109v-15,30,-38,63,-57,96xm84,-250v31,-5,83,-53,100,-31v0,5,-11,15,-35,28v-16,5,-51,28,-53,25v-14,1,-16,-11,-12,-22" }, "Ë": { d: "49,-160v1,-4,-10,-9,-15,-8v-15,-35,32,-30,57,-31r142,-8v2,1,30,7,40,10v-52,16,-133,17,-190,30v-7,9,-12,24,-15,47v26,10,102,-6,141,3v1,3,1,6,2,10v-36,18,-92,12,-149,21v-11,9,-17,41,-17,51v55,0,112,-21,169,-13v15,-8,48,1,31,18v-53,16,-130,13,-198,29r-39,-8v-3,-21,17,-53,20,-76v-1,0,-7,-11,-9,-18v18,-7,22,-28,30,-57xm191,-236v0,8,-4,13,-12,13v-17,0,-19,-19,-16,-34v18,-1,29,1,28,21xm95,-261v7,3,29,9,28,18v0,7,-9,17,-18,17v-18,0,-26,-25,-10,-35", w: 252 }, "È": { d: "49,-160v1,-4,-10,-9,-15,-8v-15,-35,32,-30,57,-31r142,-8v2,1,30,7,40,10v-52,16,-133,17,-190,30v-7,9,-12,24,-15,47v26,10,102,-6,141,3v1,3,1,6,2,10v-36,18,-92,12,-149,21v-11,9,-16,41,-16,51v55,-1,111,-21,168,-13v15,-8,48,1,31,18v-53,16,-130,13,-198,29r-39,-8v-4,-19,17,-53,20,-76v-1,0,-7,-11,-9,-18v18,-7,22,-28,30,-57xm184,-236v6,9,5,13,0,23v-28,-7,-62,-21,-100,-41v-3,-2,-3,-27,5,-23v34,11,60,25,95,41", w: 252 }, "Í": { d: "26,-5v-9,-6,-9,-12,-9,-36v0,-71,7,-119,21,-144v8,-13,14,-20,19,-20v28,19,-7,89,-10,120v-2,21,-8,47,-14,76v-2,1,-2,0,-7,4xm6,-233v31,-6,83,-53,101,-31v2,11,-80,53,-89,53v-14,1,-14,-11,-12,-22", w: 104 }, "Î": { d: "53,-9v-15,7,-16,-3,-16,-32v0,-71,7,-119,21,-144v8,-13,14,-20,19,-20v28,19,-7,89,-10,120v-2,21,-8,47,-14,76xm137,-209v-27,-6,-40,-26,-61,-37v-8,0,-9,4,-13,10v-11,13,-50,37,-56,0v18,-5,43,-32,61,-43v28,5,40,21,62,36v12,9,18,17,18,25v0,6,-4,9,-11,9", w: 144 }, "Ï": { d: "33,-5v-9,-6,-9,-12,-9,-36v0,-71,8,-119,22,-144v8,-13,14,-20,19,-20v27,20,-11,87,-10,120r-15,76v-1,1,-4,2,-7,4xm111,-222v0,8,-4,12,-12,12v-18,0,-19,-19,-16,-33v18,-1,29,1,28,21xm15,-247v8,2,29,9,28,17v0,21,-37,24,-36,1v0,-7,2,-13,8,-18", w: 110 }, "Ì": { d: "33,-5v-9,-6,-9,-12,-9,-36v0,-71,8,-119,22,-144v8,-13,14,-20,19,-20v27,20,-11,87,-10,120r-15,76v-1,1,-4,2,-7,4xm72,-247v7,6,55,15,36,40v-28,-7,-61,-21,-99,-41v-3,-2,-3,-27,5,-23v18,3,41,17,58,24", w: 111 }, "Ó": { d: "62,-184v78,-31,249,-50,238,74v-6,65,-102,105,-179,115v-77,-7,-152,-71,-101,-149v2,-5,24,-33,42,-40xm279,-120v14,-38,-47,-64,-85,-61v-20,-9,-41,7,-62,0v-11,7,-54,12,-66,24v0,20,-51,35,-38,66v-1,43,50,67,96,67v44,0,162,-55,155,-96xm142,-250v27,-11,47,-32,59,-14v2,11,-80,53,-89,53v-13,1,-15,-11,-12,-21v10,-5,24,-11,42,-18", w: 273 }, "Ô": { d: "62,-184v78,-31,249,-50,238,74v-6,65,-102,105,-179,115v-77,-7,-152,-71,-101,-149v2,-5,24,-33,42,-40xm279,-120v14,-38,-47,-64,-85,-61v-20,-9,-41,7,-62,0v-11,7,-54,12,-66,24v0,20,-51,35,-38,66v-1,43,50,67,96,67v44,0,162,-55,155,-96xm157,-282v17,18,52,34,54,63v-24,12,-52,-36,-53,-29r-42,34v-23,-4,-6,-31,5,-34v1,1,27,-37,36,-34", w: 273 }, "": { d: "231,-188v31,-74,91,-99,188,-116v28,1,6,39,1,51v-20,52,-100,91,-148,126v2,4,6,7,12,10v42,-42,181,-41,166,46v-1,8,-19,8,-28,5v-43,1,-168,42,-106,86v15,16,33,28,61,39v0,10,0,17,-6,22v-8,8,-35,26,-78,51v-52,7,-128,22,-154,-17v-23,-35,-99,-35,-117,-77v-29,-68,25,-149,75,-175v44,-23,89,5,135,13v14,-26,2,-39,-1,-64", w: 461 }, "Ò": { d: "62,-184v78,-31,249,-50,238,74v-6,65,-102,105,-179,115v-77,-7,-152,-71,-101,-149v2,-5,24,-33,42,-40xm279,-120v14,-38,-47,-64,-85,-61v-20,-9,-41,7,-62,0v-11,7,-54,12,-66,24v0,20,-51,35,-38,66v-1,43,50,67,96,67v44,0,162,-55,155,-96xm161,-262v14,10,52,13,37,41v-28,-7,-62,-21,-100,-41v-3,-3,-3,-26,5,-24v16,5,42,17,58,24", w: 273 }, "Ú": { d: "281,-202v6,67,-30,121,-71,152v-3,14,-47,26,-60,39v-41,20,-110,1,-125,-26v-24,-44,-28,-84,-8,-127v12,-26,23,-38,37,-22v-2,2,-3,5,-3,10v-34,26,-30,116,5,134v22,32,86,-1,109,-8v38,-28,104,-64,97,-149v2,-10,7,-8,19,-3xm194,-265v3,-1,11,4,11,6v3,12,-81,52,-89,54v-14,0,-13,-9,-12,-22", w: 262 }, "Û": { d: "281,-202v6,67,-30,121,-71,152v-3,14,-47,26,-60,39v-41,20,-110,1,-125,-26v-24,-44,-28,-84,-8,-127v12,-26,23,-38,37,-22v-2,2,-3,5,-3,10v-34,26,-30,116,5,134v22,32,86,-1,109,-8v38,-28,104,-64,97,-149v2,-10,7,-8,19,-3xm150,-266v24,11,58,27,73,46v0,5,-3,6,-10,6v-28,2,-61,-30,-63,-25v-10,0,-57,40,-69,23v3,-10,-8,-15,8,-19v17,-1,34,-29,61,-31", w: 262 }, "Ù": { d: "281,-202v6,67,-30,121,-71,152v-3,14,-47,26,-60,39v-41,20,-110,1,-125,-26v-24,-44,-28,-84,-8,-127v12,-26,23,-38,37,-22v-2,2,-3,5,-3,10v-34,26,-30,116,5,134v22,32,86,-1,109,-8v38,-28,104,-64,97,-149v2,-10,7,-8,19,-3xm151,-243v14,10,54,14,37,41v-28,-7,-61,-22,-99,-42v-3,-2,-4,-25,4,-23v16,5,42,17,58,24", w: 262 }, "ı": { d: "43,-103v21,4,16,56,11,100v-7,2,-11,1,-20,-5v0,-7,-13,-18,-11,-25v4,-23,-3,-68,20,-70", w: 80 }, "ˆ": { d: "144,-220v-29,0,-41,-27,-63,-39v-8,0,-11,5,-15,11v-17,12,-32,31,-54,13v-2,-5,-3,-9,-4,-14v20,-5,45,-33,64,-45v28,6,43,23,65,38v12,9,19,19,19,27v0,6,-4,9,-12,9", w: 165 }, "˜": { d: "47,-300v26,-21,57,19,72,23v4,0,16,-5,36,-14v24,-10,22,-16,32,-13v3,12,-7,11,-7,23v-27,21,-48,32,-62,32v-3,2,-52,-27,-51,-31v-12,-2,-34,40,-54,33v-4,-13,-8,-18,1,-24v5,-7,16,-15,33,-29", w: 186 }, "¯": { d: "63,-295v28,-7,73,10,105,7v11,1,6,8,5,19v-37,21,-72,11,-136,11v-23,0,-31,-14,-27,-36v12,-15,40,0,53,-1", w: 183 }, "˘": { d: "65,-269v20,-11,45,-31,74,-36v20,30,-42,40,-59,66v-5,6,-11,8,-18,8v-8,-3,-45,-32,-51,-54v5,-24,14,-13,34,1", w: 158 }, "˙": { d: "23,-302v15,-13,32,1,32,18v1,22,-36,29,-39,4v0,0,3,-7,7,-22", w: 70 }, "˚": { d: "23,-225v-43,-24,-11,-85,41,-78v16,2,31,4,46,17v32,54,-41,86,-87,61xm33,-257v2,20,57,11,57,-6v0,-6,-11,-9,-33,-12v-14,-2,-24,13,-24,18", w: 123 }, "¸": { d: "74,16v32,2,49,14,55,36v-3,7,-14,31,-29,33v-28,4,-57,11,-88,14v-19,-6,-13,-31,8,-33v20,-1,59,-5,73,-14v-17,-14,-68,8,-53,-37v9,-10,2,-28,24,-30v8,8,13,17,10,31", w: 129 }, "˝": { d: "91,-249v15,-11,38,-53,57,-29v0,9,0,14,-3,23v-2,3,-20,22,-54,55v-5,5,-10,8,-16,8v-17,2,-6,-22,-7,-31v-1,0,-2,0,-4,1v-17,21,-29,31,-50,27v-5,-18,-3,-15,3,-27v23,-27,40,-46,48,-59v7,-12,31,3,29,9v-1,14,-3,24,-13,31v4,4,9,-1,10,-8", w: 151 }, "˛": { d: "82,-5v-8,12,-16,55,-21,75v0,4,2,7,7,7v6,0,22,-7,50,-20v8,0,12,7,12,20v-2,22,-6,14,-27,30v-15,12,-26,16,-30,16v-47,-8,-59,-14,-56,-75v8,-27,12,-54,25,-77v19,-21,35,15,40,24", w: 138 }, "ˇ": { d: "39,-286v33,46,63,-4,96,-16v6,0,9,6,9,19v0,24,-49,46,-77,46v-32,0,-52,-28,-59,-48v0,-25,23,-17,31,-1", w: 153 }, "\r": { w: 179 } } }), function () {
+    "use strict";
+    function AssertException(message) { this.message = message } function assert(exp, message) { if (!exp) throw new AssertException(message) } function getCenterX(box) { return box.x + box.width / 2 } function getCenterY(box) { return box.y + box.height / 2 } var DIAGRAM_MARGIN = 10, ACTOR_MARGIN = 10, ACTOR_PADDING = 10, SIGNAL_MARGIN = 5, SIGNAL_PADDING = 5, NOTE_MARGIN = 10, NOTE_PADDING = 5, NOTE_OVERLAP = 15, TITLE_MARGIN = 0, TITLE_PADDING = 5, SELF_SIGNAL_WIDTH = 20, PLACEMENT = Diagram.PLACEMENT, LINETYPE = Diagram.LINETYPE, ARROWTYPE = Diagram.ARROWTYPE, LINE = { stroke: "#000", "stroke-width": 2 }, RECT = { fill: "#fff" }; AssertException.prototype.toString = function () { return "AssertException: " + this.message }, String.prototype.trim || (String.prototype.trim = function () { return this.replace(/^\s+|\s+$/g, "") }), Raphael.fn.line = function (x1, y1, x2, y2) { return assert(_.all([x1, x2, y1, y2], _.isFinite), "x1,x2,y1,y2 must be numeric"), this.path("M{0},{1} L{2},{3}", x1, y1, x2, y2) }, Raphael.fn.wobble = function (x1, y1, x2, y2) { assert(_.all([x1, x2, y1, y2], _.isFinite), "x1,x2,y1,y2 must be numeric"); var wobble = Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1)) / 25, r1 = Math.random(), r2 = Math.random(), xfactor = Math.random() > .5 ? wobble : -wobble, yfactor = Math.random() > .5 ? wobble : -wobble, p1 = { x: (x2 - x1) * r1 + x1 + xfactor, y: (y2 - y1) * r1 + y1 + yfactor }, p2 = { x: (x2 - x1) * r2 + x1 - xfactor, y: (y2 - y1) * r2 + y1 - yfactor }; return "C" + p1.x + "," + p1.y + " " + p2.x + "," + p2.y + " " + x2 + "," + y2 }, Raphael.fn.text_bbox = function (text, font) { var p; font._obj ? p = this.print_center(0, 0, text, font._obj, font["font-size"]) : (p = this.text(0, 0, text), p.attr(font)); var bb = p.getBBox(); return p.remove(), bb }, Raphael.fn.handRect = function (x, y, w, h) { return assert(_.all([x, y, w, h], _.isFinite), "x, y, w, h must be numeric"), this.path("M" + x + "," + y + this.wobble(x, y, x + w, y) + this.wobble(x + w, y, x + w, y + h) + this.wobble(x + w, y + h, x, y + h) + this.wobble(x, y + h, x, y)).attr(RECT) }, Raphael.fn.handLine = function (x1, y1, x2, y2) { return assert(_.all([x1, x2, y1, y2], _.isFinite), "x1,x2,y1,y2 must be numeric"), this.path("M" + x1 + "," + y1 + this.wobble(x1, y1, x2, y2)) }, Raphael.fn.print_center = function (x, y, string, font, size, letter_spacing) { var path = this.print(x, y, string, font, size, "baseline", letter_spacing), bb = path.getBBox(), dx = x - bb.x - bb.width / 2, dy = y - bb.y - bb.height / 2, m = new Raphael.matrix; return m.translate(dx, dy), path.attr("path", Raphael.mapPath(path.attr("path"), m)) }; var BaseTheme = function (diagram) { this.init(diagram) }; _.extend(BaseTheme.prototype, { init: function (diagram) { this.diagram = diagram, this._paper = void 0, this._font = void 0, this._title = void 0, this._actors_height = 0, this._signals_height = 0; var a = this.arrow_types = {}; a[ARROWTYPE.FILLED] = "block", a[ARROWTYPE.OPEN] = "open"; var l = this.line_types = {}; l[LINETYPE.SOLID] = "", l[LINETYPE.DOTTED] = "-" }, init_paper: function (container) { this._paper = new Raphael(container, 320, 200) }, init_font: function () { }, draw_line: function (x1, y1, x2, y2) { return this._paper.line(x1, y1, x2, y2) }, draw_rect: function (x, y, w, h) { return this._paper.rect(x, y, w, h) }, draw: function (container) { var diagram = this.diagram; this.init_paper(container), this.init_font(), this.layout(); var title_height = this._title ? this._title.height : 0; this._paper.setStart(), this._paper.setSize(diagram.width, diagram.height); var y = DIAGRAM_MARGIN + title_height; this.draw_title(), this.draw_actors(y), this.draw_signals(y + this._actors_height), this._paper.setFinish() }, layout: function () { function actor_ensure_distance(a, b, d) { assert(b > a, "a must be less than or equal to b"), 0 > a ? (b = actors[b], b.x = Math.max(d - b.width / 2, b.x)) : b >= actors.length ? (a = actors[a], a.padding_right = Math.max(d, a.padding_right)) : (a = actors[a], a.distances[b] = Math.max(d, a.distances[b] ? a.distances[b] : 0)) } var diagram = this.diagram, paper = this._paper, font = this._font, actors = diagram.actors, signals = diagram.signals; if (diagram.width = 0, diagram.height = 0, diagram.title) { var title = this._title = {}, bb = paper.text_bbox(diagram.title, font); title.text_bb = bb, title.message = diagram.title, title.width = bb.width + 2 * (TITLE_PADDING + TITLE_MARGIN), title.height = bb.height + 2 * (TITLE_PADDING + TITLE_MARGIN), title.x = DIAGRAM_MARGIN, title.y = DIAGRAM_MARGIN, diagram.width += title.width, diagram.height += title.height } _.each(actors, function (a) { var bb = paper.text_bbox(a.name, font); a.text_bb = bb, a.x = 0, a.y = 0, a.width = bb.width + 2 * (ACTOR_PADDING + ACTOR_MARGIN), a.height = bb.height + 2 * (ACTOR_PADDING + ACTOR_MARGIN), a.distances = [], a.padding_right = 0, this._actors_height = Math.max(a.height, this._actors_height) }, this), _.each(signals, function (s) { var a, b, bb = paper.text_bbox(s.message, font); s.text_bb = bb, s.width = bb.width, s.height = bb.height; var extra_width = 0; if ("Signal" == s.type) s.width += 2 * (SIGNAL_MARGIN + SIGNAL_PADDING), s.height += 2 * (SIGNAL_MARGIN + SIGNAL_PADDING), s.isSelf() ? (a = s.actorA.index, b = a + 1, s.width += SELF_SIGNAL_WIDTH) : (a = Math.min(s.actorA.index, s.actorB.index), b = Math.max(s.actorA.index, s.actorB.index)); else { if ("Note" != s.type) throw new Error("Unhandled signal type:" + s.type); if (s.width += 2 * (NOTE_MARGIN + NOTE_PADDING), s.height += 2 * (NOTE_MARGIN + NOTE_PADDING), extra_width = 2 * ACTOR_MARGIN, s.placement == PLACEMENT.LEFTOF) b = s.actor.index, a = b - 1; else if (s.placement == PLACEMENT.RIGHTOF) a = s.actor.index, b = a + 1; else if (s.placement == PLACEMENT.OVER && s.hasManyActors()) a = Math.min(s.actor[0].index, s.actor[1].index), b = Math.max(s.actor[0].index, s.actor[1].index), extra_width = -(2 * NOTE_PADDING + 2 * NOTE_OVERLAP); else if (s.placement == PLACEMENT.OVER) return a = s.actor.index, actor_ensure_distance(a - 1, a, s.width / 2), actor_ensure_distance(a, a + 1, s.width / 2), this._signals_height += s.height, void 0 } actor_ensure_distance(a, b, s.width + extra_width), this._signals_height += s.height }, this); var actors_x = 0; return _.each(actors, function (a) { a.x = Math.max(actors_x, a.x), _.each(a.distances, function (distance, b) { "undefined" != typeof distance && (b = actors[b], distance = Math.max(distance, a.width / 2, b.width / 2), b.x = Math.max(b.x, a.x + a.width / 2 + distance - b.width / 2)) }), actors_x = a.x + a.width + a.padding_right }, this), diagram.width = Math.max(actors_x, diagram.width), diagram.width += 2 * DIAGRAM_MARGIN, diagram.height += 2 * DIAGRAM_MARGIN + 2 * this._actors_height + this._signals_height, this }, draw_title: function () { var title = this._title; title && this.draw_text_box(title, title.message, TITLE_MARGIN, TITLE_PADDING, this._font) }, draw_actors: function (offsetY) { var y = offsetY; _.each(this.diagram.actors, function (a) { this.draw_actor(a, y, this._actors_height), this.draw_actor(a, y + this._actors_height + this._signals_height, this._actors_height); var aX = getCenterX(a), line = this.draw_line(aX, y + this._actors_height - ACTOR_MARGIN, aX, y + this._actors_height + ACTOR_MARGIN + this._signals_height); line.attr(LINE) }, this) }, draw_actor: function (actor, offsetY, height) { actor.y = offsetY, actor.height = height, this.draw_text_box(actor, actor.name, ACTOR_MARGIN, ACTOR_PADDING, this._font) }, draw_signals: function (offsetY) { var y = offsetY; _.each(this.diagram.signals, function (s) { "Signal" == s.type ? s.isSelf() ? this.draw_self_signal(s, y) : this.draw_signal(s, y) : "Note" == s.type && this.draw_note(s, y), y += s.height }, this) }, draw_self_signal: function (signal, offsetY) { assert(signal.isSelf(), "signal must be a self signal"); var text_bb = signal.text_bb, aX = getCenterX(signal.actorA), x = aX + SELF_SIGNAL_WIDTH + SIGNAL_PADDING - text_bb.x, y = offsetY + signal.height / 2; this.draw_text(x, y, signal.message, this._font); var line, attr = _.extend({}, LINE, { "stroke-dasharray": this.line_types[signal.linetype] }), y1 = offsetY + SIGNAL_MARGIN, y2 = y1 + signal.height - SIGNAL_MARGIN; line = this.draw_line(aX, y1, aX + SELF_SIGNAL_WIDTH, y1), line.attr(attr), line = this.draw_line(aX + SELF_SIGNAL_WIDTH, y1, aX + SELF_SIGNAL_WIDTH, y2), line.attr(attr), line = this.draw_line(aX + SELF_SIGNAL_WIDTH, y2, aX, y2), attr["arrow-end"] = this.arrow_types[signal.arrowtype] + "-wide-long", line.attr(attr) }, draw_signal: function (signal, offsetY) { var aX = getCenterX(signal.actorA), bX = getCenterX(signal.actorB), x = (bX - aX) / 2 + aX, y = offsetY + SIGNAL_MARGIN + 2 * SIGNAL_PADDING; this.draw_text(x, y, signal.message, this._font), y = offsetY + signal.height - SIGNAL_MARGIN - SIGNAL_PADDING; var line = this.draw_line(aX, y, bX, y); line.attr(LINE), line.attr({ "arrow-end": this.arrow_types[signal.arrowtype] + "-wide-long", "stroke-dasharray": this.line_types[signal.linetype] }) }, draw_note: function (note, offsetY) { note.y = offsetY; var actorA = note.hasManyActors() ? note.actor[0] : note.actor, aX = getCenterX(actorA); switch (note.placement) { case PLACEMENT.RIGHTOF: note.x = aX + ACTOR_MARGIN; break; case PLACEMENT.LEFTOF: note.x = aX - ACTOR_MARGIN - note.width; break; case PLACEMENT.OVER: if (note.hasManyActors()) { var bX = getCenterX(note.actor[1]), overlap = NOTE_OVERLAP + NOTE_PADDING; note.x = aX - overlap, note.width = bX + overlap - note.x } else note.x = aX - note.width / 2; break; default: throw new Error("Unhandled note placement:" + note.placement) }this.draw_text_box(note, note.message, NOTE_MARGIN, NOTE_PADDING, this._font) }, draw_text: function (x, y, text, font) { var t, paper = this._paper, f = font || {}; f._obj ? t = paper.print_center(x, y, text, f._obj, f["font-size"]) : (t = paper.text(x, y, text), t.attr(f)); var bb = t.getBBox(), r = paper.rect(bb.x, bb.y, bb.width, bb.height); r.attr({ fill: "#fff", stroke: "none" }), t.toFront() }, draw_text_box: function (box, text, margin, padding, font) { var x = box.x + margin, y = box.y + margin, w = box.width - 2 * margin, h = box.height - 2 * margin, rect = this.draw_rect(x, y, w, h); rect.attr(LINE), x = getCenterX(box), y = getCenterY(box), this.draw_text(x, y, text, font) } }); var RaphaëlTheme = function (diagram) { this.init(diagram) }; _.extend(RaphaëlTheme.prototype, BaseTheme.prototype, { init_font: function () { this._font = { "font-size": 16, "font-family": "Andale Mono, monospace" } } }); var HandRaphaëlTheme = function (diagram) { this.init(diagram) }; _.extend(HandRaphaëlTheme.prototype, BaseTheme.prototype, { init_font: function () { this._font = { "font-size": 16, "font-family": "daniel" }, this._font._obj = this._paper.getFont("daniel") }, draw_line: function (x1, y1, x2, y2) { return this._paper.handLine(x1, y1, x2, y2) }, draw_rect: function (x, y, w, h) { return this._paper.handRect(x, y, w, h) } }); var themes = { simple: RaphaëlTheme, hand: HandRaphaëlTheme }; Diagram.prototype.drawSVG = function (container, options) { var default_options = { theme: "hand" }; if (options = _.defaults(options || {}, default_options), !(options.theme in themes)) throw new Error("Unsupported theme: " + options.theme); var drawing = new themes[options.theme](this); drawing.draw(container) }
+}();
 // flowchart, v1.3.4
 // Copyright (c)2014 Adriano Raiano (adrai).
 // Distributed under MIT license
 // http://adrai.github.io/flowchart.js
-!function(){function a(b,c){if(!b||"function"==typeof b)return c;var d={};for(var e in c)d[e]=c[e];for(e in b)b[e]&&(d[e]="object"==typeof d[e]?a(d[e],b[e]):b[e]);return d}function b(a,b){if("function"==typeof Object.create)a.super_=b,a.prototype=Object.create(b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}});else{a.super_=b;var c=function(){};c.prototype=b.prototype,a.prototype=new c,a.prototype.constructor=a}}function c(a,b,c){var d,e,f="M{0},{1}";for(d=2,e=2*c.length+2;e>d;d+=2)f+=" L{"+d+"},{"+(d+1)+"}";var g=[b.x,b.y];for(d=0,e=c.length;e>d;d++)g.push(c[d].x),g.push(c[d].y);var h=a.paper.path(f,g);h.attr("stroke",a.options["element-color"]),h.attr("stroke-width",a.options["line-width"]);var i=a.options.font,j=a.options["font-family"],k=a.options["font-weight"];return i&&h.attr({font:i}),j&&h.attr({"font-family":j}),k&&h.attr({"font-weight":k}),h}function d(a,b,c,d){var e,f;"[object Array]"!==Object.prototype.toString.call(c)&&(c=[c]);var g="M{0},{1}";for(e=2,f=2*c.length+2;f>e;e+=2)g+=" L{"+e+"},{"+(e+1)+"}";var h=[b.x,b.y];for(e=0,f=c.length;f>e;e++)h.push(c[e].x),h.push(c[e].y);var i=a.paper.path(g,h);i.attr({stroke:a.options["line-color"],"stroke-width":a.options["line-width"],"arrow-end":a.options["arrow-end"]});var j=a.options.font,k=a.options["font-family"],l=a.options["font-weight"];if(j&&i.attr({font:j}),k&&i.attr({"font-family":k}),l&&i.attr({"font-weight":l}),d){var m=!1,n=a.paper.text(0,0,d),o=!1,p=c[0];b.y===p.y&&(o=!0);var q=0,r=0;m?(q=b.x>p.x?b.x-(b.x-p.x)/2:p.x-(p.x-b.x)/2,r=b.y>p.y?b.y-(b.y-p.y)/2:p.y-(p.y-b.y)/2,o?(q-=n.getBBox().width/2,r-=a.options["text-margin"]):(q+=a.options["text-margin"],r-=n.getBBox().height/2)):(q=b.x,r=b.y,o?(q+=a.options["text-margin"]/2,r-=a.options["text-margin"]):(q+=a.options["text-margin"]/2,r+=a.options["text-margin"])),n.attr({"text-anchor":"start","font-size":a.options["font-size"],fill:a.options["font-color"],x:q,y:r}),j&&n.attr({font:j}),k&&n.attr({"font-family":k}),l&&n.attr({"font-weight":l})}return i}function e(a,b,c,d,e,f,g,h){var i,j,k,l,m,n={x:null,y:null,onLine1:!1,onLine2:!1};return i=(h-f)*(c-a)-(g-e)*(d-b),0===i?n:(j=b-f,k=a-e,l=(g-e)*j-(h-f)*k,m=(c-a)*j-(d-b)*k,j=l/i,k=m/i,n.x=a+j*(c-a),n.y=b+j*(d-b),j>0&&1>j&&(n.onLine1=!0),k>0&&1>k&&(n.onLine2=!0),n)}function f(a,b){b=b||{},this.paper=new Raphael(a),this.options=r.defaults(b,q),this.symbols=[],this.lines=[],this.start=null}function g(a,b,c){this.chart=a,this.group=this.chart.paper.set(),this.symbol=c,this.connectedTo=[],this.symbolType=b.symbolType,this.flowstate=b.flowstate||"future",this.next_direction=b.next&&b.direction_next?b.direction_next:void 0,this.text=this.chart.paper.text(0,0,b.text),b.key&&(this.text.node.id=b.key+"t"),this.text.node.setAttribute("class",this.getAttr("class")+"t"),this.text.attr({"text-anchor":"start",x:this.getAttr("text-margin"),fill:this.getAttr("font-color"),"font-size":this.getAttr("font-size")});var d=this.getAttr("font"),e=this.getAttr("font-family"),f=this.getAttr("font-weight");d&&this.text.attr({font:d}),e&&this.text.attr({"font-family":e}),f&&this.text.attr({"font-weight":f}),b.link&&this.text.attr("href",b.link),b.target&&this.text.attr("target",b.target);var g=this.getAttr("maxWidth");if(g){for(var h=b.text.split(" "),i="",j=0,k=h.length;k>j;j++){var l=h[j];this.text.attr("text",i+" "+l),i+=this.text.getBBox().width>g?"\n"+l:" "+l}this.text.attr("text",i.substring(1))}if(this.group.push(this.text),c){var m=this.getAttr("text-margin");c.attr({fill:this.getAttr("fill"),stroke:this.getAttr("element-color"),"stroke-width":this.getAttr("line-width"),width:this.text.getBBox().width+2*m,height:this.text.getBBox().height+2*m}),c.node.setAttribute("class",this.getAttr("class")),b.link&&c.attr("href",b.link),b.target&&c.attr("target",b.target),b.key&&(c.node.id=b.key),this.group.push(c),c.insertBefore(this.text),this.text.attr({y:c.getBBox().height/2}),this.initialize()}}function h(a,b){var c=a.paper.rect(0,0,0,0,20);b=b||{},b.text=b.text||"Start",g.call(this,a,b,c)}function i(a,b){var c=a.paper.rect(0,0,0,0,20);b=b||{},b.text=b.text||"End",g.call(this,a,b,c)}function j(a,b){var c=a.paper.rect(0,0,0,0);b=b||{},g.call(this,a,b,c)}function k(a,b){var c=a.paper.rect(0,0,0,0);b=b||{},g.call(this,a,b,c),c.attr({width:this.text.getBBox().width+4*this.getAttr("text-margin")}),this.text.attr({x:2*this.getAttr("text-margin")});var d=a.paper.rect(0,0,0,0);d.attr({x:this.getAttr("text-margin"),stroke:this.getAttr("element-color"),"stroke-width":this.getAttr("line-width"),width:this.text.getBBox().width+2*this.getAttr("text-margin"),height:this.text.getBBox().height+2*this.getAttr("text-margin"),fill:this.getAttr("fill")}),b.key&&(d.node.id=b.key+"i");var e=this.getAttr("font"),f=this.getAttr("font-family"),h=this.getAttr("font-weight");e&&d.attr({font:e}),f&&d.attr({"font-family":f}),h&&d.attr({"font-weight":h}),b.link&&d.attr("href",b.link),b.target&&d.attr("target",b.target),this.group.push(d),d.insertBefore(this.text),this.initialize()}function l(a,b){b=b||{},g.call(this,a,b),this.textMargin=this.getAttr("text-margin"),this.text.attr({x:3*this.textMargin});var d=this.text.getBBox().width+4*this.textMargin,e=this.text.getBBox().height+2*this.textMargin,f=this.textMargin,h=e/2,i={x:f,y:h},j=[{x:f-this.textMargin,y:e},{x:f-this.textMargin+d,y:e},{x:f-this.textMargin+d+2*this.textMargin,y:0},{x:f-this.textMargin+2*this.textMargin,y:0},{x:f,y:h}],k=c(a,i,j);k.attr({stroke:this.getAttr("element-color"),"stroke-width":this.getAttr("line-width"),fill:this.getAttr("fill")}),b.link&&k.attr("href",b.link),b.target&&k.attr("target",b.target),b.key&&(k.node.id=b.key),k.node.setAttribute("class",this.getAttr("class")),this.text.attr({y:k.getBBox().height/2}),this.group.push(k),k.insertBefore(this.text),this.initialize()}function m(a,b){b=b||{},g.call(this,a,b),this.textMargin=this.getAttr("text-margin"),this.yes_direction="bottom",this.no_direction="right",b.yes&&b.direction_yes&&b.no&&!b.direction_no?"right"===b.direction_yes?(this.no_direction="bottom",this.yes_direction="right"):(this.no_direction="right",this.yes_direction="bottom"):b.yes&&!b.direction_yes&&b.no&&b.direction_no?"right"===b.direction_no?(this.yes_direction="bottom",this.no_direction="right"):(this.yes_direction="right",this.no_direction="bottom"):(this.yes_direction="bottom",this.no_direction="right"),this.yes_direction=this.yes_direction||"bottom",this.no_direction=this.no_direction||"right",this.text.attr({x:2*this.textMargin});var d=this.text.getBBox().width+3*this.textMargin;d+=d/2;var e=this.text.getBBox().height+2*this.textMargin;e+=e/2,e=Math.max(.5*d,e);var f=d/4,h=e/4;this.text.attr({x:f+this.textMargin/2});var i={x:f,y:h},j=[{x:f-d/4,y:h+e/4},{x:f-d/4+d/2,y:h+e/4+e/2},{x:f-d/4+d,y:h+e/4},{x:f-d/4+d/2,y:h+e/4-e/2},{x:f-d/4,y:h+e/4}],k=c(a,i,j);k.attr({stroke:this.getAttr("element-color"),"stroke-width":this.getAttr("line-width"),fill:this.getAttr("fill")}),b.link&&k.attr("href",b.link),b.target&&k.attr("target",b.target),b.key&&(k.node.id=b.key),k.node.setAttribute("class",this.getAttr("class")),this.text.attr({y:k.getBBox().height/2}),this.group.push(k),k.insertBefore(this.text),this.initialize()}function n(a){function b(a){var b=a.indexOf("(")+1,c=a.indexOf(")");return b>=0&&c>=0?d.symbols[a.substring(0,b-1)]:d.symbols[a]}function c(a){var b="next",c=a.indexOf("(")+1,d=a.indexOf(")");return c>=0&&d>=0&&(b=D.substring(c,d),b.indexOf(",")<0&&"yes"!==b&&"no"!==b&&(b="next, "+b)),b}a=a||"",a=a.trim();for(var d={symbols:{},start:null,drawSVG:function(a,b){function c(a){if(g[a.key])return g[a.key];switch(a.symbolType){case"start":g[a.key]=new h(e,a);break;case"end":g[a.key]=new i(e,a);break;case"operation":g[a.key]=new j(e,a);break;case"inputoutput":g[a.key]=new l(e,a);break;case"subroutine":g[a.key]=new k(e,a);break;case"condition":g[a.key]=new m(e,a);break;default:return new Error("Wrong symbol type!")}return g[a.key]}var d=this;this.diagram&&this.diagram.clean();var e=new f(a,b);this.diagram=e;var g={};!function n(a,b,f){var g=c(a);return d.start===a?e.startWith(g):b&&f&&!b.pathOk&&(b instanceof m?(f.yes===a&&b.yes(g),f.no===a&&b.no(g)):b.then(g)),g.pathOk?g:(g instanceof m?(a.yes&&n(a.yes,g,a),a.no&&n(a.no,g,a)):a.next&&n(a.next,g,a),g)}(this.start),e.render()},clean:function(){this.diagram.clean()}},e=[],g=0,n=1,o=a.length;o>n;n++)if("\n"===a[n]&&"\\"!==a[n-1]){var p=a.substring(g,n);g=n+1,e.push(p.replace(/\\\n/g,"\n"))}g<a.length&&e.push(a.substr(g));for(var q=1,r=e.length;r>q;){var s=e[q];s.indexOf(": ")<0&&s.indexOf("(")<0&&s.indexOf(")")<0&&s.indexOf("->")<0&&s.indexOf("=>")<0?(e[q-1]+="\n"+s,e.splice(q,1),r--):q++}for(;e.length>0;){var t=e.splice(0,1)[0];if(t.indexOf("=>")>=0){var u,v=t.split("=>"),w={key:v[0],symbolType:v[1],text:null,link:null,target:null,flowstate:null};if(w.symbolType.indexOf(": ")>=0&&(u=w.symbolType.split(": "),w.symbolType=u[0],w.text=u[1]),w.text&&w.text.indexOf(":>")>=0?(u=w.text.split(":>"),w.text=u[0],w.link=u[1]):w.symbolType.indexOf(":>")>=0&&(u=w.symbolType.split(":>"),w.symbolType=u[0],w.link=u[1]),w.symbolType.indexOf("\n")>=0&&(w.symbolType=w.symbolType.split("\n")[0]),w.link){var x=w.link.indexOf("[")+1,y=w.link.indexOf("]");x>=0&&y>=0&&(w.target=w.link.substring(x,y),w.link=w.link.substring(0,x-1))}if(w.text&&w.text.indexOf("|")>=0){var z=w.text.split("|");w.text=z[0],w.flowstate=z[1].trim()}d.symbols[w.key]=w}else if(t.indexOf("->")>=0)for(var A=t.split("->"),B=0,C=A.length;C>B;B++){var D=A[B],E=b(D),F=c(D),G=null;if(F.indexOf(",")>=0){var H=F.split(",");F=H[0],G=H[1].trim()}if(d.start||(d.start=E),C>B+1){var I=A[B+1];E[F]=b(I),E["direction_"+F]=G,G=null}}}return d}Array.prototype.indexOf||(Array.prototype.indexOf=function(a){"use strict";if(null===this)throw new TypeError;var b=Object(this),c=b.length>>>0;if(0===c)return-1;var d=0;if(arguments.length>0&&(d=Number(arguments[1]),d!=d?d=0:0!==d&&1/0!=d&&d!=-1/0&&(d=(d>0||-1)*Math.floor(Math.abs(d)))),d>=c)return-1;for(var e=d>=0?d:Math.max(c-Math.abs(d),0);c>e;e++)if(e in b&&b[e]===a)return e;return-1}),Array.prototype.lastIndexOf||(Array.prototype.lastIndexOf=function(a){"use strict";if(null===this)throw new TypeError;var b=Object(this),c=b.length>>>0;if(0===c)return-1;var d=c;arguments.length>1&&(d=Number(arguments[1]),d!=d?d=0:0!==d&&d!=1/0&&d!=-(1/0)&&(d=(d>0||-1)*Math.floor(Math.abs(d))));for(var e=d>=0?Math.min(d,c-1):c-Math.abs(d);e>=0;e--)if(e in b&&b[e]===a)return e;return-1}),String.prototype.trim||(String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g,"")});var o=this,p={};"undefined"!=typeof module&&module.exports?module.exports=p:o.flowchart=o.flowchart||p;var q={x:0,y:0,"line-width":3,"line-length":50,"text-margin":10,"font-size":14,"font-color":"black","line-color":"black","element-color":"black",fill:"white","yes-text":"yes","no-text":"no","arrow-end":"block","class":"flowchart",symbols:{start:{},end:{},condition:{},inputoutput:{},operation:{},subroutine:{}}},r={defaults:a,inherits:b};f.prototype.handle=function(a){this.symbols.indexOf(a)<=-1&&this.symbols.push(a);var b=this;return a instanceof m?(a.yes=function(c){return a.yes_symbol=c,a.no_symbol&&(a.pathOk=!0),b.handle(c)},a.no=function(c){return a.no_symbol=c,a.yes_symbol&&(a.pathOk=!0),b.handle(c)}):a.then=function(c){return a.next=c,a.pathOk=!0,b.handle(c)},a},f.prototype.startWith=function(a){return this.start=a,this.handle(a)},f.prototype.render=function(){var a,b=0,c=0,d=0,e=0,f=0,g=0;for(d=0,e=this.symbols.length;e>d;d++)a=this.symbols[d],a.width>b&&(b=a.width),a.height>c&&(c=a.height);for(d=0,e=this.symbols.length;e>d;d++)a=this.symbols[d],a.shiftX(this.options.x+(b-a.width)/2+this.options["line-width"]),a.shiftY(this.options.y+(c-a.height)/2+this.options["line-width"]);for(this.start.render(),d=0,e=this.symbols.length;e>d;d++)a=this.symbols[d],a.renderLines();for(f=this.maxXFromLine,d=0,e=this.symbols.length;e>d;d++){a=this.symbols[d];var h=a.getX()+a.width,i=a.getY()+a.height;h>f&&(f=h),i>g&&(g=i)}this.paper.setSize(f+this.options["line-width"],g+this.options["line-width"])},f.prototype.clean=function(){if(this.paper){var a=this.paper.canvas;a.parentNode.removeChild(a)}},g.prototype.getAttr=function(a){if(!this.chart)return void 0;var b,c=this.chart.options?this.chart.options[a]:void 0,d=this.chart.options.symbols?this.chart.options.symbols[this.symbolType][a]:void 0;return this.chart.options.flowstate&&this.chart.options.flowstate[this.flowstate]&&(b=this.chart.options.flowstate[this.flowstate][a]),b||d||c},g.prototype.initialize=function(){this.group.transform("t"+this.getAttr("line-width")+","+this.getAttr("line-width")),this.width=this.group.getBBox().width,this.height=this.group.getBBox().height},g.prototype.getCenter=function(){return{x:this.getX()+this.width/2,y:this.getY()+this.height/2}},g.prototype.getX=function(){return this.group.getBBox().x},g.prototype.getY=function(){return this.group.getBBox().y},g.prototype.shiftX=function(a){this.group.transform("t"+(this.getX()+a)+","+this.getY())},g.prototype.setX=function(a){this.group.transform("t"+a+","+this.getY())},g.prototype.shiftY=function(a){this.group.transform("t"+this.getX()+","+(this.getY()+a))},g.prototype.setY=function(a){this.group.transform("t"+this.getX()+","+a)},g.prototype.getTop=function(){var a=this.getY(),b=this.getX()+this.width/2;return{x:b,y:a}},g.prototype.getBottom=function(){var a=this.getY()+this.height,b=this.getX()+this.width/2;return{x:b,y:a}},g.prototype.getLeft=function(){var a=this.getY()+this.group.getBBox().height/2,b=this.getX();return{x:b,y:a}},g.prototype.getRight=function(){var a=this.getY()+this.group.getBBox().height/2,b=this.getX()+this.group.getBBox().width;return{x:b,y:a}},g.prototype.render=function(){if(this.next){var a=this.getAttr("line-length");if("right"===this.next_direction){var b=this.getRight();if(this.next.getLeft(),!this.next.isPositioned){this.next.setY(b.y-this.next.height/2),this.next.shiftX(this.group.getBBox().x+this.width+a);var c=this;!function e(){for(var b,d=!1,f=0,g=c.chart.symbols.length;g>f;f++){b=c.chart.symbols[f];var h=Math.abs(b.getCenter().x-c.next.getCenter().x);if(b.getCenter().y>c.next.getCenter().y&&h<=c.next.width/2){d=!0;break}}d&&(c.next.setX(b.getX()+b.width+a),e())}(),this.next.isPositioned=!0,this.next.render()}}else{var d=this.getBottom();this.next.getTop(),this.next.isPositioned||(this.next.shiftY(this.getY()+this.height+a),this.next.setX(d.x-this.next.width/2),this.next.isPositioned=!0,this.next.render())}}},g.prototype.renderLines=function(){this.next&&(this.next_direction?this.drawLineTo(this.next,"",this.next_direction):this.drawLineTo(this.next))},g.prototype.drawLineTo=function(a,b,c){this.connectedTo.indexOf(a)<0&&this.connectedTo.push(a);var f,g=this.getCenter().x,h=this.getCenter().y,i=(this.getTop(),this.getRight()),j=this.getBottom(),k=this.getLeft(),l=a.getCenter().x,m=a.getCenter().y,n=a.getTop(),o=a.getRight(),p=(a.getBottom(),a.getLeft()),q=g===l,r=h===m,s=m>h,t=h>m,u=g>l,v=l>g,w=0,x=this.getAttr("line-length"),y=this.getAttr("line-width");if(c&&"bottom"!==c||!q||!s)if(c&&"right"!==c||!r||!v)if(c&&"left"!==c||!r||!u)if(c&&"right"!==c||!q||!t)if(c&&"right"!==c||!q||!s)if(c&&"bottom"!==c||!u)if(c&&"bottom"!==c||!v)if(c&&"right"===c&&u)f=d(this.chart,i,[{x:i.x+x/2,y:i.y},{x:i.x+x/2,y:n.y-x/2},{x:n.x,y:n.y-x/2},{x:n.x,y:n.y}],b),this.rightStart=!0,a.topEnd=!0,w=i.x+x/2;else if(c&&"right"===c&&v)f=d(this.chart,i,[{x:n.x,y:i.y},{x:n.x,y:n.y}],b),this.rightStart=!0,a.topEnd=!0,w=i.x+x/2;else if(c&&"bottom"===c&&q&&t)f=d(this.chart,j,[{x:j.x,y:j.y+x/2},{x:i.x+x/2,y:j.y+x/2},{x:i.x+x/2,y:n.y-x/2},{x:n.x,y:n.y-x/2},{x:n.x,y:n.y}],b),this.bottomStart=!0,a.topEnd=!0,w=j.x+x/2;else if("left"===c&&q&&t){var z=k.x-x/2;p.x<k.x&&(z=p.x-x/2),f=d(this.chart,k,[{x:z,y:k.y},{x:z,y:n.y-x/2},{x:n.x,y:n.y-x/2},{x:n.x,y:n.y}],b),this.leftStart=!0,a.topEnd=!0,w=k.x}else"left"===c&&(f=d(this.chart,k,[{x:n.x+(k.x-n.x)/2,y:k.y},{x:n.x+(k.x-n.x)/2,y:n.y-x/2},{x:n.x,y:n.y-x/2},{x:n.x,y:n.y}],b),this.leftStart=!0,a.topEnd=!0,w=k.x);else f=d(this.chart,j,[{x:j.x,y:j.y+x/2},{x:j.x+(j.x-n.x)/2,y:j.y+x/2},{x:j.x+(j.x-n.x)/2,y:n.y-x/2},{x:n.x,y:n.y-x/2},{x:n.x,y:n.y}],b),this.bottomStart=!0,a.topEnd=!0,w=j.x+(j.x-n.x)/2;else f=this.leftEnd&&t?d(this.chart,j,[{x:j.x,y:j.y+x/2},{x:j.x+(j.x-n.x)/2,y:j.y+x/2},{x:j.x+(j.x-n.x)/2,y:n.y-x/2},{x:n.x,y:n.y-x/2},{x:n.x,y:n.y}],b):d(this.chart,j,[{x:j.x,y:n.y-x/2},{x:n.x,y:n.y-x/2},{x:n.x,y:n.y}],b),this.bottomStart=!0,a.topEnd=!0,w=j.x+(j.x-n.x)/2;else f=d(this.chart,i,[{x:i.x+x/2,y:i.y},{x:i.x+x/2,y:n.y-x/2},{x:n.x,y:n.y-x/2},{x:n.x,y:n.y}],b),this.rightStart=!0,a.topEnd=!0,w=i.x+x/2;else f=d(this.chart,i,[{x:i.x+x/2,y:i.y},{x:i.x+x/2,y:n.y-x/2},{x:n.x,y:n.y-x/2},{x:n.x,y:n.y}],b),this.rightStart=!0,a.topEnd=!0,w=i.x+x/2;else f=d(this.chart,k,o,b),this.leftStart=!0,a.rightEnd=!0,w=o.x;else f=d(this.chart,i,p,b),this.rightStart=!0,a.leftEnd=!0,w=p.x;else f=d(this.chart,j,n,b),this.bottomStart=!0,a.topEnd=!0,w=j.x;if(f){for(var A=0,B=this.chart.lines.length;B>A;A++)for(var C,D=this.chart.lines[A],E=D.attr("path"),F=f.attr("path"),G=0,H=E.length-1;H>G;G++){var I=[];I.push(["M",E[G][1],E[G][2]]),I.push(["L",E[G+1][1],E[G+1][2]]);for(var J=I[0][1],K=I[0][2],L=I[1][1],M=I[1][2],N=0,O=F.length-1;O>N;N++){var P=[];P.push(["M",F[N][1],F[N][2]]),P.push(["L",F[N+1][1],F[N+1][2]]);var Q=P[0][1],R=P[0][2],S=P[1][1],T=P[1][2],U=e(J,K,L,M,Q,R,S,T);if(U.onLine1&&U.onLine2){var V;R===T?Q>S?(V=["L",U.x+2*y,R],F.splice(N+1,0,V),V=["C",U.x+2*y,R,U.x,R-4*y,U.x-2*y,R],F.splice(N+2,0,V),f.attr("path",F)):(V=["L",U.x-2*y,R],F.splice(N+1,0,V),V=["C",U.x-2*y,R,U.x,R-4*y,U.x+2*y,R],F.splice(N+2,0,V),f.attr("path",F)):R>T?(V=["L",Q,U.y+2*y],F.splice(N+1,0,V),V=["C",Q,U.y+2*y,Q+4*y,U.y,Q,U.y-2*y],F.splice(N+2,0,V),f.attr("path",F)):(V=["L",Q,U.y-2*y],F.splice(N+1,0,V),V=["C",Q,U.y-2*y,Q+4*y,U.y,Q,U.y+2*y],F.splice(N+2,0,V),f.attr("path",F)),N+=2,C+=2}}}this.chart.lines.push(f)}(!this.chart.maxXFromLine||this.chart.maxXFromLine&&w>this.chart.maxXFromLine)&&(this.chart.maxXFromLine=w)},r.inherits(h,g),r.inherits(i,g),r.inherits(j,g),r.inherits(k,g),r.inherits(l,g),l.prototype.getLeft=function(){var a=this.getY()+this.group.getBBox().height/2,b=this.getX()+this.textMargin;return{x:b,y:a}},l.prototype.getRight=function(){var a=this.getY()+this.group.getBBox().height/2,b=this.getX()+this.group.getBBox().width-this.textMargin;return{x:b,y:a}},r.inherits(m,g),m.prototype.render=function(){this.yes_direction&&(this[this.yes_direction+"_symbol"]=this.yes_symbol),this.no_direction&&(this[this.no_direction+"_symbol"]=this.no_symbol);var a=this.getAttr("line-length");if(this.bottom_symbol){var b=this.getBottom();this.bottom_symbol.getTop(),this.bottom_symbol.isPositioned||(this.bottom_symbol.shiftY(this.getY()+this.height+a),this.bottom_symbol.setX(b.x-this.bottom_symbol.width/2),this.bottom_symbol.isPositioned=!0,this.bottom_symbol.render())}if(this.right_symbol){var c=this.getRight();if(this.right_symbol.getLeft(),!this.right_symbol.isPositioned){this.right_symbol.setY(c.y-this.right_symbol.height/2),this.right_symbol.shiftX(this.group.getBBox().x+this.width+a);var d=this;!function e(){for(var b,c=!1,f=0,g=d.chart.symbols.length;g>f;f++){b=d.chart.symbols[f];var h=Math.abs(b.getCenter().x-d.right_symbol.getCenter().x);if(b.getCenter().y>d.right_symbol.getCenter().y&&h<=d.right_symbol.width/2){c=!0;break}}c&&(d.right_symbol.setX(b.getX()+b.width+a),e())}(),this.right_symbol.isPositioned=!0,this.right_symbol.render()}}},m.prototype.renderLines=function(){this.yes_symbol&&this.drawLineTo(this.yes_symbol,this.getAttr("yes-text"),this.yes_direction),this.no_symbol&&this.drawLineTo(this.no_symbol,this.getAttr("no-text"),this.no_direction)},p.parse=n}();
+!function () { function a(b, c) { if (!b || "function" == typeof b) return c; var d = {}; for (var e in c) d[e] = c[e]; for (e in b) b[e] && (d[e] = "object" == typeof d[e] ? a(d[e], b[e]) : b[e]); return d } function b(a, b) { if ("function" == typeof Object.create) a.super_ = b, a.prototype = Object.create(b.prototype, { constructor: { value: a, enumerable: !1, writable: !0, configurable: !0 } }); else { a.super_ = b; var c = function () { }; c.prototype = b.prototype, a.prototype = new c, a.prototype.constructor = a } } function c(a, b, c) { var d, e, f = "M{0},{1}"; for (d = 2, e = 2 * c.length + 2; e > d; d += 2)f += " L{" + d + "},{" + (d + 1) + "}"; var g = [b.x, b.y]; for (d = 0, e = c.length; e > d; d++)g.push(c[d].x), g.push(c[d].y); var h = a.paper.path(f, g); h.attr("stroke", a.options["element-color"]), h.attr("stroke-width", a.options["line-width"]); var i = a.options.font, j = a.options["font-family"], k = a.options["font-weight"]; return i && h.attr({ font: i }), j && h.attr({ "font-family": j }), k && h.attr({ "font-weight": k }), h } function d(a, b, c, d) { var e, f; "[object Array]" !== Object.prototype.toString.call(c) && (c = [c]); var g = "M{0},{1}"; for (e = 2, f = 2 * c.length + 2; f > e; e += 2)g += " L{" + e + "},{" + (e + 1) + "}"; var h = [b.x, b.y]; for (e = 0, f = c.length; f > e; e++)h.push(c[e].x), h.push(c[e].y); var i = a.paper.path(g, h); i.attr({ stroke: a.options["line-color"], "stroke-width": a.options["line-width"], "arrow-end": a.options["arrow-end"] }); var j = a.options.font, k = a.options["font-family"], l = a.options["font-weight"]; if (j && i.attr({ font: j }), k && i.attr({ "font-family": k }), l && i.attr({ "font-weight": l }), d) { var m = !1, n = a.paper.text(0, 0, d), o = !1, p = c[0]; b.y === p.y && (o = !0); var q = 0, r = 0; m ? (q = b.x > p.x ? b.x - (b.x - p.x) / 2 : p.x - (p.x - b.x) / 2, r = b.y > p.y ? b.y - (b.y - p.y) / 2 : p.y - (p.y - b.y) / 2, o ? (q -= n.getBBox().width / 2, r -= a.options["text-margin"]) : (q += a.options["text-margin"], r -= n.getBBox().height / 2)) : (q = b.x, r = b.y, o ? (q += a.options["text-margin"] / 2, r -= a.options["text-margin"]) : (q += a.options["text-margin"] / 2, r += a.options["text-margin"])), n.attr({ "text-anchor": "start", "font-size": a.options["font-size"], fill: a.options["font-color"], x: q, y: r }), j && n.attr({ font: j }), k && n.attr({ "font-family": k }), l && n.attr({ "font-weight": l }) } return i } function e(a, b, c, d, e, f, g, h) { var i, j, k, l, m, n = { x: null, y: null, onLine1: !1, onLine2: !1 }; return i = (h - f) * (c - a) - (g - e) * (d - b), 0 === i ? n : (j = b - f, k = a - e, l = (g - e) * j - (h - f) * k, m = (c - a) * j - (d - b) * k, j = l / i, k = m / i, n.x = a + j * (c - a), n.y = b + j * (d - b), j > 0 && 1 > j && (n.onLine1 = !0), k > 0 && 1 > k && (n.onLine2 = !0), n) } function f(a, b) { b = b || {}, this.paper = new Raphael(a), this.options = r.defaults(b, q), this.symbols = [], this.lines = [], this.start = null } function g(a, b, c) { this.chart = a, this.group = this.chart.paper.set(), this.symbol = c, this.connectedTo = [], this.symbolType = b.symbolType, this.flowstate = b.flowstate || "future", this.next_direction = b.next && b.direction_next ? b.direction_next : void 0, this.text = this.chart.paper.text(0, 0, b.text), b.key && (this.text.node.id = b.key + "t"), this.text.node.setAttribute("class", this.getAttr("class") + "t"), this.text.attr({ "text-anchor": "start", x: this.getAttr("text-margin"), fill: this.getAttr("font-color"), "font-size": this.getAttr("font-size") }); var d = this.getAttr("font"), e = this.getAttr("font-family"), f = this.getAttr("font-weight"); d && this.text.attr({ font: d }), e && this.text.attr({ "font-family": e }), f && this.text.attr({ "font-weight": f }), b.link && this.text.attr("href", b.link), b.target && this.text.attr("target", b.target); var g = this.getAttr("maxWidth"); if (g) { for (var h = b.text.split(" "), i = "", j = 0, k = h.length; k > j; j++) { var l = h[j]; this.text.attr("text", i + " " + l), i += this.text.getBBox().width > g ? "\n" + l : " " + l } this.text.attr("text", i.substring(1)) } if (this.group.push(this.text), c) { var m = this.getAttr("text-margin"); c.attr({ fill: this.getAttr("fill"), stroke: this.getAttr("element-color"), "stroke-width": this.getAttr("line-width"), width: this.text.getBBox().width + 2 * m, height: this.text.getBBox().height + 2 * m }), c.node.setAttribute("class", this.getAttr("class")), b.link && c.attr("href", b.link), b.target && c.attr("target", b.target), b.key && (c.node.id = b.key), this.group.push(c), c.insertBefore(this.text), this.text.attr({ y: c.getBBox().height / 2 }), this.initialize() } } function h(a, b) { var c = a.paper.rect(0, 0, 0, 0, 20); b = b || {}, b.text = b.text || "Start", g.call(this, a, b, c) } function i(a, b) { var c = a.paper.rect(0, 0, 0, 0, 20); b = b || {}, b.text = b.text || "End", g.call(this, a, b, c) } function j(a, b) { var c = a.paper.rect(0, 0, 0, 0); b = b || {}, g.call(this, a, b, c) } function k(a, b) { var c = a.paper.rect(0, 0, 0, 0); b = b || {}, g.call(this, a, b, c), c.attr({ width: this.text.getBBox().width + 4 * this.getAttr("text-margin") }), this.text.attr({ x: 2 * this.getAttr("text-margin") }); var d = a.paper.rect(0, 0, 0, 0); d.attr({ x: this.getAttr("text-margin"), stroke: this.getAttr("element-color"), "stroke-width": this.getAttr("line-width"), width: this.text.getBBox().width + 2 * this.getAttr("text-margin"), height: this.text.getBBox().height + 2 * this.getAttr("text-margin"), fill: this.getAttr("fill") }), b.key && (d.node.id = b.key + "i"); var e = this.getAttr("font"), f = this.getAttr("font-family"), h = this.getAttr("font-weight"); e && d.attr({ font: e }), f && d.attr({ "font-family": f }), h && d.attr({ "font-weight": h }), b.link && d.attr("href", b.link), b.target && d.attr("target", b.target), this.group.push(d), d.insertBefore(this.text), this.initialize() } function l(a, b) { b = b || {}, g.call(this, a, b), this.textMargin = this.getAttr("text-margin"), this.text.attr({ x: 3 * this.textMargin }); var d = this.text.getBBox().width + 4 * this.textMargin, e = this.text.getBBox().height + 2 * this.textMargin, f = this.textMargin, h = e / 2, i = { x: f, y: h }, j = [{ x: f - this.textMargin, y: e }, { x: f - this.textMargin + d, y: e }, { x: f - this.textMargin + d + 2 * this.textMargin, y: 0 }, { x: f - this.textMargin + 2 * this.textMargin, y: 0 }, { x: f, y: h }], k = c(a, i, j); k.attr({ stroke: this.getAttr("element-color"), "stroke-width": this.getAttr("line-width"), fill: this.getAttr("fill") }), b.link && k.attr("href", b.link), b.target && k.attr("target", b.target), b.key && (k.node.id = b.key), k.node.setAttribute("class", this.getAttr("class")), this.text.attr({ y: k.getBBox().height / 2 }), this.group.push(k), k.insertBefore(this.text), this.initialize() } function m(a, b) { b = b || {}, g.call(this, a, b), this.textMargin = this.getAttr("text-margin"), this.yes_direction = "bottom", this.no_direction = "right", b.yes && b.direction_yes && b.no && !b.direction_no ? "right" === b.direction_yes ? (this.no_direction = "bottom", this.yes_direction = "right") : (this.no_direction = "right", this.yes_direction = "bottom") : b.yes && !b.direction_yes && b.no && b.direction_no ? "right" === b.direction_no ? (this.yes_direction = "bottom", this.no_direction = "right") : (this.yes_direction = "right", this.no_direction = "bottom") : (this.yes_direction = "bottom", this.no_direction = "right"), this.yes_direction = this.yes_direction || "bottom", this.no_direction = this.no_direction || "right", this.text.attr({ x: 2 * this.textMargin }); var d = this.text.getBBox().width + 3 * this.textMargin; d += d / 2; var e = this.text.getBBox().height + 2 * this.textMargin; e += e / 2, e = Math.max(.5 * d, e); var f = d / 4, h = e / 4; this.text.attr({ x: f + this.textMargin / 2 }); var i = { x: f, y: h }, j = [{ x: f - d / 4, y: h + e / 4 }, { x: f - d / 4 + d / 2, y: h + e / 4 + e / 2 }, { x: f - d / 4 + d, y: h + e / 4 }, { x: f - d / 4 + d / 2, y: h + e / 4 - e / 2 }, { x: f - d / 4, y: h + e / 4 }], k = c(a, i, j); k.attr({ stroke: this.getAttr("element-color"), "stroke-width": this.getAttr("line-width"), fill: this.getAttr("fill") }), b.link && k.attr("href", b.link), b.target && k.attr("target", b.target), b.key && (k.node.id = b.key), k.node.setAttribute("class", this.getAttr("class")), this.text.attr({ y: k.getBBox().height / 2 }), this.group.push(k), k.insertBefore(this.text), this.initialize() } function n(a) { function b(a) { var b = a.indexOf("(") + 1, c = a.indexOf(")"); return b >= 0 && c >= 0 ? d.symbols[a.substring(0, b - 1)] : d.symbols[a] } function c(a) { var b = "next", c = a.indexOf("(") + 1, d = a.indexOf(")"); return c >= 0 && d >= 0 && (b = D.substring(c, d), b.indexOf(",") < 0 && "yes" !== b && "no" !== b && (b = "next, " + b)), b } a = a || "", a = a.trim(); for (var d = { symbols: {}, start: null, drawSVG: function (a, b) { function c(a) { if (g[a.key]) return g[a.key]; switch (a.symbolType) { case "start": g[a.key] = new h(e, a); break; case "end": g[a.key] = new i(e, a); break; case "operation": g[a.key] = new j(e, a); break; case "inputoutput": g[a.key] = new l(e, a); break; case "subroutine": g[a.key] = new k(e, a); break; case "condition": g[a.key] = new m(e, a); break; default: return new Error("Wrong symbol type!") }return g[a.key] } var d = this; this.diagram && this.diagram.clean(); var e = new f(a, b); this.diagram = e; var g = {}; !function n(a, b, f) { var g = c(a); return d.start === a ? e.startWith(g) : b && f && !b.pathOk && (b instanceof m ? (f.yes === a && b.yes(g), f.no === a && b.no(g)) : b.then(g)), g.pathOk ? g : (g instanceof m ? (a.yes && n(a.yes, g, a), a.no && n(a.no, g, a)) : a.next && n(a.next, g, a), g) }(this.start), e.render() }, clean: function () { this.diagram.clean() } }, e = [], g = 0, n = 1, o = a.length; o > n; n++)if ("\n" === a[n] && "\\" !== a[n - 1]) { var p = a.substring(g, n); g = n + 1, e.push(p.replace(/\\\n/g, "\n")) } g < a.length && e.push(a.substr(g)); for (var q = 1, r = e.length; r > q;) { var s = e[q]; s.indexOf(": ") < 0 && s.indexOf("(") < 0 && s.indexOf(")") < 0 && s.indexOf("->") < 0 && s.indexOf("=>") < 0 ? (e[q - 1] += "\n" + s, e.splice(q, 1), r--) : q++ } for (; e.length > 0;) { var t = e.splice(0, 1)[0]; if (t.indexOf("=>") >= 0) { var u, v = t.split("=>"), w = { key: v[0], symbolType: v[1], text: null, link: null, target: null, flowstate: null }; if (w.symbolType.indexOf(": ") >= 0 && (u = w.symbolType.split(": "), w.symbolType = u[0], w.text = u[1]), w.text && w.text.indexOf(":>") >= 0 ? (u = w.text.split(":>"), w.text = u[0], w.link = u[1]) : w.symbolType.indexOf(":>") >= 0 && (u = w.symbolType.split(":>"), w.symbolType = u[0], w.link = u[1]), w.symbolType.indexOf("\n") >= 0 && (w.symbolType = w.symbolType.split("\n")[0]), w.link) { var x = w.link.indexOf("[") + 1, y = w.link.indexOf("]"); x >= 0 && y >= 0 && (w.target = w.link.substring(x, y), w.link = w.link.substring(0, x - 1)) } if (w.text && w.text.indexOf("|") >= 0) { var z = w.text.split("|"); w.text = z[0], w.flowstate = z[1].trim() } d.symbols[w.key] = w } else if (t.indexOf("->") >= 0) for (var A = t.split("->"), B = 0, C = A.length; C > B; B++) { var D = A[B], E = b(D), F = c(D), G = null; if (F.indexOf(",") >= 0) { var H = F.split(","); F = H[0], G = H[1].trim() } if (d.start || (d.start = E), C > B + 1) { var I = A[B + 1]; E[F] = b(I), E["direction_" + F] = G, G = null } } } return d } Array.prototype.indexOf || (Array.prototype.indexOf = function (a) { "use strict"; if (null === this) throw new TypeError; var b = Object(this), c = b.length >>> 0; if (0 === c) return -1; var d = 0; if (arguments.length > 0 && (d = Number(arguments[1]), d != d ? d = 0 : 0 !== d && 1 / 0 != d && d != -1 / 0 && (d = (d > 0 || -1) * Math.floor(Math.abs(d)))), d >= c) return -1; for (var e = d >= 0 ? d : Math.max(c - Math.abs(d), 0); c > e; e++)if (e in b && b[e] === a) return e; return -1 }), Array.prototype.lastIndexOf || (Array.prototype.lastIndexOf = function (a) { "use strict"; if (null === this) throw new TypeError; var b = Object(this), c = b.length >>> 0; if (0 === c) return -1; var d = c; arguments.length > 1 && (d = Number(arguments[1]), d != d ? d = 0 : 0 !== d && d != 1 / 0 && d != -(1 / 0) && (d = (d > 0 || -1) * Math.floor(Math.abs(d)))); for (var e = d >= 0 ? Math.min(d, c - 1) : c - Math.abs(d); e >= 0; e--)if (e in b && b[e] === a) return e; return -1 }), String.prototype.trim || (String.prototype.trim = function () { return this.replace(/^\s+|\s+$/g, "") }); var o = this, p = {}; "undefined" != typeof module && module.exports ? module.exports = p : o.flowchart = o.flowchart || p; var q = { x: 0, y: 0, "line-width": 3, "line-length": 50, "text-margin": 10, "font-size": 14, "font-color": "black", "line-color": "black", "element-color": "black", fill: "white", "yes-text": "yes", "no-text": "no", "arrow-end": "block", "class": "flowchart", symbols: { start: {}, end: {}, condition: {}, inputoutput: {}, operation: {}, subroutine: {} } }, r = { defaults: a, inherits: b }; f.prototype.handle = function (a) { this.symbols.indexOf(a) <= -1 && this.symbols.push(a); var b = this; return a instanceof m ? (a.yes = function (c) { return a.yes_symbol = c, a.no_symbol && (a.pathOk = !0), b.handle(c) }, a.no = function (c) { return a.no_symbol = c, a.yes_symbol && (a.pathOk = !0), b.handle(c) }) : a.then = function (c) { return a.next = c, a.pathOk = !0, b.handle(c) }, a }, f.prototype.startWith = function (a) { return this.start = a, this.handle(a) }, f.prototype.render = function () { var a, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0; for (d = 0, e = this.symbols.length; e > d; d++)a = this.symbols[d], a.width > b && (b = a.width), a.height > c && (c = a.height); for (d = 0, e = this.symbols.length; e > d; d++)a = this.symbols[d], a.shiftX(this.options.x + (b - a.width) / 2 + this.options["line-width"]), a.shiftY(this.options.y + (c - a.height) / 2 + this.options["line-width"]); for (this.start.render(), d = 0, e = this.symbols.length; e > d; d++)a = this.symbols[d], a.renderLines(); for (f = this.maxXFromLine, d = 0, e = this.symbols.length; e > d; d++) { a = this.symbols[d]; var h = a.getX() + a.width, i = a.getY() + a.height; h > f && (f = h), i > g && (g = i) } this.paper.setSize(f + this.options["line-width"], g + this.options["line-width"]) }, f.prototype.clean = function () { if (this.paper) { var a = this.paper.canvas; a.parentNode.removeChild(a) } }, g.prototype.getAttr = function (a) { if (!this.chart) return void 0; var b, c = this.chart.options ? this.chart.options[a] : void 0, d = this.chart.options.symbols ? this.chart.options.symbols[this.symbolType][a] : void 0; return this.chart.options.flowstate && this.chart.options.flowstate[this.flowstate] && (b = this.chart.options.flowstate[this.flowstate][a]), b || d || c }, g.prototype.initialize = function () { this.group.transform("t" + this.getAttr("line-width") + "," + this.getAttr("line-width")), this.width = this.group.getBBox().width, this.height = this.group.getBBox().height }, g.prototype.getCenter = function () { return { x: this.getX() + this.width / 2, y: this.getY() + this.height / 2 } }, g.prototype.getX = function () { return this.group.getBBox().x }, g.prototype.getY = function () { return this.group.getBBox().y }, g.prototype.shiftX = function (a) { this.group.transform("t" + (this.getX() + a) + "," + this.getY()) }, g.prototype.setX = function (a) { this.group.transform("t" + a + "," + this.getY()) }, g.prototype.shiftY = function (a) { this.group.transform("t" + this.getX() + "," + (this.getY() + a)) }, g.prototype.setY = function (a) { this.group.transform("t" + this.getX() + "," + a) }, g.prototype.getTop = function () { var a = this.getY(), b = this.getX() + this.width / 2; return { x: b, y: a } }, g.prototype.getBottom = function () { var a = this.getY() + this.height, b = this.getX() + this.width / 2; return { x: b, y: a } }, g.prototype.getLeft = function () { var a = this.getY() + this.group.getBBox().height / 2, b = this.getX(); return { x: b, y: a } }, g.prototype.getRight = function () { var a = this.getY() + this.group.getBBox().height / 2, b = this.getX() + this.group.getBBox().width; return { x: b, y: a } }, g.prototype.render = function () { if (this.next) { var a = this.getAttr("line-length"); if ("right" === this.next_direction) { var b = this.getRight(); if (this.next.getLeft(), !this.next.isPositioned) { this.next.setY(b.y - this.next.height / 2), this.next.shiftX(this.group.getBBox().x + this.width + a); var c = this; !function e() { for (var b, d = !1, f = 0, g = c.chart.symbols.length; g > f; f++) { b = c.chart.symbols[f]; var h = Math.abs(b.getCenter().x - c.next.getCenter().x); if (b.getCenter().y > c.next.getCenter().y && h <= c.next.width / 2) { d = !0; break } } d && (c.next.setX(b.getX() + b.width + a), e()) }(), this.next.isPositioned = !0, this.next.render() } } else { var d = this.getBottom(); this.next.getTop(), this.next.isPositioned || (this.next.shiftY(this.getY() + this.height + a), this.next.setX(d.x - this.next.width / 2), this.next.isPositioned = !0, this.next.render()) } } }, g.prototype.renderLines = function () { this.next && (this.next_direction ? this.drawLineTo(this.next, "", this.next_direction) : this.drawLineTo(this.next)) }, g.prototype.drawLineTo = function (a, b, c) { this.connectedTo.indexOf(a) < 0 && this.connectedTo.push(a); var f, g = this.getCenter().x, h = this.getCenter().y, i = (this.getTop(), this.getRight()), j = this.getBottom(), k = this.getLeft(), l = a.getCenter().x, m = a.getCenter().y, n = a.getTop(), o = a.getRight(), p = (a.getBottom(), a.getLeft()), q = g === l, r = h === m, s = m > h, t = h > m, u = g > l, v = l > g, w = 0, x = this.getAttr("line-length"), y = this.getAttr("line-width"); if (c && "bottom" !== c || !q || !s) if (c && "right" !== c || !r || !v) if (c && "left" !== c || !r || !u) if (c && "right" !== c || !q || !t) if (c && "right" !== c || !q || !s) if (c && "bottom" !== c || !u) if (c && "bottom" !== c || !v) if (c && "right" === c && u) f = d(this.chart, i, [{ x: i.x + x / 2, y: i.y }, { x: i.x + x / 2, y: n.y - x / 2 }, { x: n.x, y: n.y - x / 2 }, { x: n.x, y: n.y }], b), this.rightStart = !0, a.topEnd = !0, w = i.x + x / 2; else if (c && "right" === c && v) f = d(this.chart, i, [{ x: n.x, y: i.y }, { x: n.x, y: n.y }], b), this.rightStart = !0, a.topEnd = !0, w = i.x + x / 2; else if (c && "bottom" === c && q && t) f = d(this.chart, j, [{ x: j.x, y: j.y + x / 2 }, { x: i.x + x / 2, y: j.y + x / 2 }, { x: i.x + x / 2, y: n.y - x / 2 }, { x: n.x, y: n.y - x / 2 }, { x: n.x, y: n.y }], b), this.bottomStart = !0, a.topEnd = !0, w = j.x + x / 2; else if ("left" === c && q && t) { var z = k.x - x / 2; p.x < k.x && (z = p.x - x / 2), f = d(this.chart, k, [{ x: z, y: k.y }, { x: z, y: n.y - x / 2 }, { x: n.x, y: n.y - x / 2 }, { x: n.x, y: n.y }], b), this.leftStart = !0, a.topEnd = !0, w = k.x } else "left" === c && (f = d(this.chart, k, [{ x: n.x + (k.x - n.x) / 2, y: k.y }, { x: n.x + (k.x - n.x) / 2, y: n.y - x / 2 }, { x: n.x, y: n.y - x / 2 }, { x: n.x, y: n.y }], b), this.leftStart = !0, a.topEnd = !0, w = k.x); else f = d(this.chart, j, [{ x: j.x, y: j.y + x / 2 }, { x: j.x + (j.x - n.x) / 2, y: j.y + x / 2 }, { x: j.x + (j.x - n.x) / 2, y: n.y - x / 2 }, { x: n.x, y: n.y - x / 2 }, { x: n.x, y: n.y }], b), this.bottomStart = !0, a.topEnd = !0, w = j.x + (j.x - n.x) / 2; else f = this.leftEnd && t ? d(this.chart, j, [{ x: j.x, y: j.y + x / 2 }, { x: j.x + (j.x - n.x) / 2, y: j.y + x / 2 }, { x: j.x + (j.x - n.x) / 2, y: n.y - x / 2 }, { x: n.x, y: n.y - x / 2 }, { x: n.x, y: n.y }], b) : d(this.chart, j, [{ x: j.x, y: n.y - x / 2 }, { x: n.x, y: n.y - x / 2 }, { x: n.x, y: n.y }], b), this.bottomStart = !0, a.topEnd = !0, w = j.x + (j.x - n.x) / 2; else f = d(this.chart, i, [{ x: i.x + x / 2, y: i.y }, { x: i.x + x / 2, y: n.y - x / 2 }, { x: n.x, y: n.y - x / 2 }, { x: n.x, y: n.y }], b), this.rightStart = !0, a.topEnd = !0, w = i.x + x / 2; else f = d(this.chart, i, [{ x: i.x + x / 2, y: i.y }, { x: i.x + x / 2, y: n.y - x / 2 }, { x: n.x, y: n.y - x / 2 }, { x: n.x, y: n.y }], b), this.rightStart = !0, a.topEnd = !0, w = i.x + x / 2; else f = d(this.chart, k, o, b), this.leftStart = !0, a.rightEnd = !0, w = o.x; else f = d(this.chart, i, p, b), this.rightStart = !0, a.leftEnd = !0, w = p.x; else f = d(this.chart, j, n, b), this.bottomStart = !0, a.topEnd = !0, w = j.x; if (f) { for (var A = 0, B = this.chart.lines.length; B > A; A++)for (var C, D = this.chart.lines[A], E = D.attr("path"), F = f.attr("path"), G = 0, H = E.length - 1; H > G; G++) { var I = []; I.push(["M", E[G][1], E[G][2]]), I.push(["L", E[G + 1][1], E[G + 1][2]]); for (var J = I[0][1], K = I[0][2], L = I[1][1], M = I[1][2], N = 0, O = F.length - 1; O > N; N++) { var P = []; P.push(["M", F[N][1], F[N][2]]), P.push(["L", F[N + 1][1], F[N + 1][2]]); var Q = P[0][1], R = P[0][2], S = P[1][1], T = P[1][2], U = e(J, K, L, M, Q, R, S, T); if (U.onLine1 && U.onLine2) { var V; R === T ? Q > S ? (V = ["L", U.x + 2 * y, R], F.splice(N + 1, 0, V), V = ["C", U.x + 2 * y, R, U.x, R - 4 * y, U.x - 2 * y, R], F.splice(N + 2, 0, V), f.attr("path", F)) : (V = ["L", U.x - 2 * y, R], F.splice(N + 1, 0, V), V = ["C", U.x - 2 * y, R, U.x, R - 4 * y, U.x + 2 * y, R], F.splice(N + 2, 0, V), f.attr("path", F)) : R > T ? (V = ["L", Q, U.y + 2 * y], F.splice(N + 1, 0, V), V = ["C", Q, U.y + 2 * y, Q + 4 * y, U.y, Q, U.y - 2 * y], F.splice(N + 2, 0, V), f.attr("path", F)) : (V = ["L", Q, U.y - 2 * y], F.splice(N + 1, 0, V), V = ["C", Q, U.y - 2 * y, Q + 4 * y, U.y, Q, U.y + 2 * y], F.splice(N + 2, 0, V), f.attr("path", F)), N += 2, C += 2 } } } this.chart.lines.push(f) } (!this.chart.maxXFromLine || this.chart.maxXFromLine && w > this.chart.maxXFromLine) && (this.chart.maxXFromLine = w) }, r.inherits(h, g), r.inherits(i, g), r.inherits(j, g), r.inherits(k, g), r.inherits(l, g), l.prototype.getLeft = function () { var a = this.getY() + this.group.getBBox().height / 2, b = this.getX() + this.textMargin; return { x: b, y: a } }, l.prototype.getRight = function () { var a = this.getY() + this.group.getBBox().height / 2, b = this.getX() + this.group.getBBox().width - this.textMargin; return { x: b, y: a } }, r.inherits(m, g), m.prototype.render = function () { this.yes_direction && (this[this.yes_direction + "_symbol"] = this.yes_symbol), this.no_direction && (this[this.no_direction + "_symbol"] = this.no_symbol); var a = this.getAttr("line-length"); if (this.bottom_symbol) { var b = this.getBottom(); this.bottom_symbol.getTop(), this.bottom_symbol.isPositioned || (this.bottom_symbol.shiftY(this.getY() + this.height + a), this.bottom_symbol.setX(b.x - this.bottom_symbol.width / 2), this.bottom_symbol.isPositioned = !0, this.bottom_symbol.render()) } if (this.right_symbol) { var c = this.getRight(); if (this.right_symbol.getLeft(), !this.right_symbol.isPositioned) { this.right_symbol.setY(c.y - this.right_symbol.height / 2), this.right_symbol.shiftX(this.group.getBBox().x + this.width + a); var d = this; !function e() { for (var b, c = !1, f = 0, g = d.chart.symbols.length; g > f; f++) { b = d.chart.symbols[f]; var h = Math.abs(b.getCenter().x - d.right_symbol.getCenter().x); if (b.getCenter().y > d.right_symbol.getCenter().y && h <= d.right_symbol.width / 2) { c = !0; break } } c && (d.right_symbol.setX(b.getX() + b.width + a), e()) }(), this.right_symbol.isPositioned = !0, this.right_symbol.render() } } }, m.prototype.renderLines = function () { this.yes_symbol && this.drawLineTo(this.yes_symbol, this.getAttr("yes-text"), this.yes_direction), this.no_symbol && this.drawLineTo(this.no_symbol, this.getAttr("no-text"), this.no_direction) }, p.parse = n }();
 /*! jQuery.flowchart.js v1.1.0 | jquery.flowchart.min.js | jQuery plugin for flowchart.js. | MIT License | By: Pandao | https://github.com/pandao/jquery.flowchart.js | 2015-03-09 */
-(function(factory){if(typeof require==="function"&&typeof exports==="object"&&typeof module==="object"){module.exports=factory}else{if(typeof define==="function"){factory(jQuery,flowchart)}else{factory($,flowchart)}}}(function(jQuery,flowchart){(function($){$.fn.flowChart=function(options){options=options||{};var defaults={"x":0,"y":0,"line-width":2,"line-length":50,"text-margin":10,"font-size":14,"font-color":"black","line-color":"black","element-color":"black","fill":"white","yes-text":"yes","no-text":"no","arrow-end":"block","symbols":{"start":{"font-color":"black","element-color":"black","fill":"white"},"end":{"class":"end-element"}},"flowstate":{"past":{"fill":"#CCCCCC","font-size":12},"current":{"fill":"black","font-color":"white","font-weight":"bold"},"future":{"fill":"white"},"request":{"fill":"blue"},"invalid":{"fill":"#444444"},"approved":{"fill":"#58C4A3","font-size":12,"yes-text":"APPROVED","no-text":"n/a"},"rejected":{"fill":"#C45879","font-size":12,"yes-text":"n/a","no-text":"REJECTED"}}};return this.each(function(){var $this=$(this);var diagram=flowchart.parse($this.text());var settings=$.extend(true,defaults,options);$this.html("");diagram.drawSVG(this,settings)})}})(jQuery)}));
+(function (factory) { if (typeof require === "function" && typeof exports === "object" && typeof module === "object") { module.exports = factory } else { if (typeof define === "function") { factory(jQuery, flowchart) } else { factory($, flowchart) } } }(function (jQuery, flowchart) { (function ($) { $.fn.flowChart = function (options) { options = options || {}; var defaults = { "x": 0, "y": 0, "line-width": 2, "line-length": 50, "text-margin": 10, "font-size": 14, "font-color": "black", "line-color": "black", "element-color": "black", "fill": "white", "yes-text": "yes", "no-text": "no", "arrow-end": "block", "symbols": { "start": { "font-color": "black", "element-color": "black", "fill": "white" }, "end": { "class": "end-element" } }, "flowstate": { "past": { "fill": "#CCCCCC", "font-size": 12 }, "current": { "fill": "black", "font-color": "white", "font-weight": "bold" }, "future": { "fill": "white" }, "request": { "fill": "blue" }, "invalid": { "fill": "#444444" }, "approved": { "fill": "#58C4A3", "font-size": 12, "yes-text": "APPROVED", "no-text": "n/a" }, "rejected": { "fill": "#C45879", "font-size": 12, "yes-text": "n/a", "no-text": "REJECTED" } } }; return this.each(function () { var $this = $(this); var diagram = flowchart.parse($this.text()); var settings = $.extend(true, defaults, options); $this.html(""); diagram.drawSVG(this, settings) }) } })(jQuery) }));
 
-
-/*
- * Editor.md
- *
- * @file        editormd.js 
- * @version     v1.5.0 
- * @description Open source online markdown editor.
- * @license     MIT License
- * @author      Pandao
- * {@link       https://github.com/pandao/editor.md}
- * @updateTime  2015-06-09
- */
-function initEditormdPasteUpload(e,t,i){e.cm.getInputField().addEventListener("paste",function(i){_whenPasterDoUpload(i,t,function(t){t.id&&e.cm.replaceSelection("![](/api/attachments/"+t.id+")")})})}!function(e){"use strict";"function"==typeof require&&"object"==typeof exports&&"object"==typeof module?module.exports=e:"function"==typeof define?define.amd||define(["../../../../editormd/examples/js/jquery.min"],e):window.editormd=e()}(function(){"use strict";var e="undefined"!=typeof jQuery?jQuery:Zepto;if(void 0!==e){var t,i,o,r=function(e,t){return new r.fn.init(e,t)};r.title=r.$name="Editor.md",r.version="1.5.0",r.homePage="https://pandao.github.io/editor.md/",r.classPrefix="editormd-",r.toolbarModes={full:["undo","redo","|","bold","del","italic","quote","ucwords","uppercase","lowercase","|","h1","h2","h3","h4","h5","h6","|","list-ul","list-ol","hr","|","link","reference-link","image","code","preformatted-text","code-block","table","datetime","emoji","html-entities","pagebreak","|","goto-line","watch","preview","fullscreen","clear","search","|","help","info"],simple:["undo","redo","|","bold","del","italic","quote","uppercase","lowercase","|","h1","h2","h3","h4","h5","h6","|","list-ul","list-ol","hr","|","watch","preview","fullscreen","|","help","info"],mini:["undo","redo","|","watch","preview","|","help","info"]},r.defaults={mode:"gfm",name:"",value:"",theme:"",editorTheme:"default",previewTheme:"",markdown:"",appendMarkdown:"",width:"100%",height:"100%",path:"./lib/",pluginPath:"",delay:500,autoLoadModules:!0,watch:!0,placeholder:"Enjoy Markdown! coding now...",gotoLine:!0,codeFold:!1,autoHeight:!1,autoFocus:!0,autoCloseTags:!0,searchReplace:!0,syncScrolling:!0,readOnly:!1,tabSize:4,indentUnit:4,lineNumbers:!0,lineWrapping:!0,autoCloseBrackets:!0,showTrailingSpace:!0,matchBrackets:!0,indentWithTabs:!0,styleSelectedText:!0,matchWordHighlight:!0,styleActiveLine:!0,dialogLockScreen:!0,dialogShowMask:!0,dialogDraggable:!0,dialogMaskBgColor:"#fff",dialogMaskOpacity:.1,fontSize:"13px",saveHTMLToTextarea:!1,disabledKeyMaps:[],onload:function(){},onresize:function(){},onchange:function(){},onwatch:null,onunwatch:null,onpreviewing:function(){},onpreviewed:function(){},onfullscreen:function(){},onfullscreenExit:function(){},onscroll:function(){},onpreviewscroll:function(){},imageUpload:!1,imageFormats:["jpg","jpeg","gif","png","bmp","webp"],imageUploadURL:"",crossDomainUpload:!1,uploadCallbackURL:"",toc:!0,tocm:!1,tocTitle:"",tocDropdown:!1,tocContainer:"",tocStartLevel:1,htmlDecode:"style,iframe|on*",pageBreak:!0,atLink:!0,emailLink:!0,taskList:!1,emoji:!1,tex:!1,flowChart:!1,sequenceDiagram:!1,previewCodeHighlight:!0,toolbar:!0,toolbarAutoFixed:!0,toolbarIcons:"full",toolbarTitles:{},toolbarHandlers:{ucwords:function(){return r.toolbarHandlers.ucwords},lowercase:function(){return r.toolbarHandlers.lowercase}},toolbarCustomIcons:{lowercase:'<a href="javascript:;" title="Lowercase" unselectable="on"><i class="fa" name="lowercase" style="font-size:24px;margin-top: -10px;">a</i></a>',ucwords:'<a href="javascript:;" title="ucwords" unselectable="on"><i class="fa" name="ucwords" style="font-size:20px;margin-top: -3px;">Aa</i></a>'},toolbarIconsClass:{undo:"fa-undo",redo:"fa-repeat",bold:"fa-bold",del:"fa-strikethrough",italic:"fa-italic",quote:"fa-quote-left",uppercase:"fa-font",h1:r.classPrefix+"bold",h2:r.classPrefix+"bold",h3:r.classPrefix+"bold",h4:r.classPrefix+"bold",h5:r.classPrefix+"bold",h6:r.classPrefix+"bold","list-ul":"fa-list-ul","list-ol":"fa-list-ol",hr:"fa-minus",link:"fa-link","reference-link":"fa-anchor",image:"fa-picture-o",code:"fa-code","preformatted-text":"fa-file-code-o","code-block":"fa-file-code-o",table:"fa-table",datetime:"fa-clock-o",emoji:"fa-smile-o","html-entities":"fa-copyright",pagebreak:"fa-newspaper-o","goto-line":"fa-terminal",watch:"fa-eye-slash",unwatch:"fa-eye",preview:"fa-desktop",search:"fa-search",fullscreen:"fa-arrows-alt",clear:"fa-eraser",help:"fa-question-circle",info:"fa-info-circle"},toolbarIconTexts:{},lang:{name:"zh-cn",description:"开源在线Markdown编辑器<br/>Open source online Markdown editor.",tocTitle:"目录",toolbar:{undo:"撤销（Ctrl+Z）",redo:"重做（Ctrl+Y）",bold:"粗体",del:"删除线",italic:"斜体",quote:"引用",ucwords:"将每个单词首字母转成大写",uppercase:"将所选转换成大写",lowercase:"将所选转换成小写",h1:"标题1",h2:"标题2",h3:"标题3",h4:"标题4",h5:"标题5",h6:"标题6","list-ul":"无序列表","list-ol":"有序列表",hr:"横线",link:"链接","reference-link":"引用链接",image:"添加图片",code:"行内代码","preformatted-text":"预格式文本 / 代码块（缩进风格）","code-block":"代码块（多语言风格）",table:"添加表格",datetime:"日期时间",emoji:"Emoji表情","html-entities":"HTML实体字符",pagebreak:"插入分页符","goto-line":"跳转到行",watch:"关闭实时预览",unwatch:"开启实时预览",preview:"全窗口预览HTML（按 Shift + ESC还原）",fullscreen:"全屏（按ESC还原）",clear:"清空",search:"搜索",help:"使用帮助",info:"关于"+r.title},buttons:{enter:"确定",cancel:"取消",close:"关闭"},dialog:{link:{title:"添加链接",url:"链接地址",urlTitle:"链接标题",urlEmpty:"错误：请填写链接地址。"},referenceLink:{title:"添加引用链接",name:"引用名称",url:"链接地址",urlId:"链接ID",urlTitle:"链接标题",nameEmpty:"错误：引用链接的名称不能为空。",idEmpty:"错误：请填写引用链接的ID。",urlEmpty:"错误：请填写引用链接的URL地址。"},image:{title:"添加图片",url:"图片地址",link:"图片链接",alt:"图片描述",uploadButton:"本地上传",imageURLEmpty:"错误：图片地址不能为空。",uploadFileEmpty:"错误：上传的图片不能为空。",formatNotAllowed:"错误：只允许上传图片文件，允许上传的图片文件格式有："},preformattedText:{title:"添加预格式文本或代码块",emptyAlert:"错误：请填写预格式文本或代码的内容。"},codeBlock:{title:"添加代码块",selectLabel:"代码语言：",selectDefaultText:"请选择代码语言",otherLanguage:"其他语言",unselectedLanguageAlert:"错误：请选择代码所属的语言类型。",codeEmptyAlert:"错误：请填写代码内容。"},htmlEntities:{title:"HTML 实体字符"},help:{title:"使用帮助"}}}},r.classNames={tex:r.classPrefix+"tex"},r.dialogZindex=99999,r.$katex=null,r.$marked=null,r.$CodeMirror=null,r.$prettyPrint=null,r.prototype=r.fn={state:{watching:!1,loaded:!1,preview:!1,fullscreen:!1},init:function(t,i){i=i||{},"object"==typeof t&&(i=t);var a=this.classPrefix=r.classPrefix,n=o=e.extend(!0,r.defaults,i);this.settings=n,t="object"==typeof t?n.id:t;var s=this.editor=e("#"+t);this.id=t,this.lang=n.lang;var l=this.classNames={textarea:{html:a+"html-textarea",markdown:a+"markdown-textarea"}};n.pluginPath=""===n.pluginPath?n.path+"../plugins/":n.pluginPath,this.state.watching=!!n.watch,s.hasClass("editormd")||s.addClass("editormd"),s.css({width:"number"==typeof n.width?n.width+"px":n.width,height:"number"==typeof n.height?n.height+"px":n.height}),n.autoHeight&&s.css("height","auto");var c=this.markdownTextarea=s.children("textarea");c.length<1&&(s.append("<textarea></textarea>"),c=this.markdownTextarea=s.children("textarea")),c.addClass(l.textarea.markdown).attr("placeholder",n.placeholder),void 0!==c.attr("name")&&""!==c.attr("name")||c.attr("name",""!==n.name?n.name:t+"-markdown-doc");var h=[n.readOnly?"":'<a href="javascript:;" class="fa fa-close '+a+'preview-close-btn"></a>',n.saveHTMLToTextarea?'<textarea class="'+l.textarea.html+'" name="'+t+'-html-code"></textarea>':"",'<div class="'+a+'preview"><div class="markdown-body '+a+'preview-container"></div></div>','<div class="'+a+'container-mask" style="display:block;"></div>','<div class="'+a+'mask"></div>'].join("\n");return s.append(h).addClass(a+"vertical"),""!==n.theme&&s.addClass(a+"theme-"+n.theme),this.mask=s.children("."+a+"mask"),this.containerMask=s.children("."+a+"container-mask"),""!==n.markdown&&c.val(n.markdown),""!==n.appendMarkdown&&c.val(c.val()+n.appendMarkdown),this.htmlTextarea=s.children("."+l.textarea.html),this.preview=s.children("."+a+"preview"),this.previewContainer=this.preview.children("."+a+"preview-container"),""!==n.previewTheme&&this.preview.addClass(a+"preview-theme-"+n.previewTheme),"function"==typeof define&&define.amd&&("undefined"!=typeof katex&&(r.$katex=katex),n.searchReplace&&!n.readOnly&&(r.loadCSS(n.path+"codemirror/addon/dialog/dialog"),r.loadCSS(n.path+"codemirror/addon/search/matchesonscrollbar"))),"function"==typeof define&&define.amd||!n.autoLoadModules?("undefined"!=typeof CodeMirror&&(r.$CodeMirror=CodeMirror),"undefined"!=typeof marked&&(r.$marked=marked),this.setCodeMirror().setToolbar().loadedDisplay()):this.loadQueues(),this},loadQueues:function(){var e=this,t=o,i=t.path,a=function(){r.isIE8?e.loadedDisplay():t.flowChart||t.sequenceDiagram?r.loadScript(i+"raphael.min",function(){r.loadScript(i+"underscore.min",function(){!t.flowChart&&t.sequenceDiagram?r.loadScript(i+"sequence-diagram.min",function(){e.loadedDisplay()}):t.flowChart&&!t.sequenceDiagram?r.loadScript(i+"flowchart.min",function(){r.loadScript(i+"jquery.flowchart.min",function(){e.loadedDisplay()})}):t.flowChart&&t.sequenceDiagram&&r.loadScript(i+"flowchart.min",function(){r.loadScript(i+"jquery.flowchart.min",function(){r.loadScript(i+"sequence-diagram.min",function(){e.loadedDisplay()})})})})}):e.loadedDisplay()};return t.searchReplace&&!t.readOnly&&(r.loadCSS(i+"codemirror/addon/dialog/dialog"),r.loadCSS(i+"codemirror/addon/search/matchesonscrollbar")),t.codeFold&&r.loadCSS(i+"codemirror/addon/fold/foldgutter"),r.$CodeMirror=CodeMirror,r.loadScript(i+"codemirror/modes.min",function(){r.loadScript(i+"codemirror/addons.min",function(){if(e.setCodeMirror(),"gfm"!==t.mode&&"markdown"!==t.mode)return e.loadedDisplay(),!1;e.setToolbar(),r.loadScript(i+"marked.min",function(){r.$marked=marked,t.previewCodeHighlight?r.loadScript(i+"prettify.min",function(){a()}):a()})})}),this},setTheme:function(e){var t=this.editor,i=o.theme,r=this.classPrefix+"theme-";return t.removeClass(r+i).addClass(r+e),o.theme=e,this},setEditorTheme:function(e){var t=o;return t.editorTheme=e,"default"!==e&&r.loadCSS(t.path+"codemirror/theme/"+t.editorTheme),this.cm.setOption("theme",e),this},setCodeMirrorTheme:function(e){return this.setEditorTheme(e),this},setPreviewTheme:function(e){var t=this.preview,i=o.previewTheme,r=this.classPrefix+"preview-theme-";return t.removeClass(r+i).addClass(r+e),o.previewTheme=e,this},setCodeMirror:function(){var e=o,t=this.editor;"default"!==e.editorTheme&&r.loadCSS(e.path+"codemirror/theme/"+e.editorTheme);var i={mode:e.mode,theme:e.editorTheme,tabSize:e.tabSize,dragDrop:!1,autofocus:e.autoFocus,autoCloseTags:e.autoCloseTags,readOnly:!!e.readOnly&&"nocursor",indentUnit:e.indentUnit,lineNumbers:e.lineNumbers,lineWrapping:e.lineWrapping,extraKeys:{"Ctrl-Q":function(e){e.foldCode(e.getCursor())}},foldGutter:e.codeFold,gutters:["CodeMirror-linenumbers","CodeMirror-foldgutter"],matchBrackets:e.matchBrackets,indentWithTabs:e.indentWithTabs,styleActiveLine:e.styleActiveLine,styleSelectedText:e.styleSelectedText,autoCloseBrackets:e.autoCloseBrackets,showTrailingSpace:e.showTrailingSpace,highlightSelectionMatches:!!e.matchWordHighlight&&{showToken:"onselected"!==e.matchWordHighlight&&/\w/}};return this.codeEditor=this.cm=r.$CodeMirror.fromTextArea(this.markdownTextarea[0],i),this.codeMirror=this.cmElement=t.children(".CodeMirror"),""!==e.value&&this.cm.setValue(e.value),this.codeMirror.css({fontSize:e.fontSize,width:e.watch?"50%":"100%"}),e.autoHeight&&(this.codeMirror.css("height","auto"),this.cm.setOption("viewportMargin",1/0)),e.lineNumbers||this.codeMirror.find(".CodeMirror-gutters").css("border-right","none"),this},getCodeMirrorOption:function(e){return this.cm.getOption(e)},setCodeMirrorOption:function(e,t){return this.cm.setOption(e,t),this},addKeyMap:function(e,t){return this.cm.addKeyMap(e,t),this},removeKeyMap:function(e){return this.cm.removeKeyMap(e),this},gotoLine:function(t){var i=o;if(!i.gotoLine)return this;var r=this.cm,a=(this.editor,r.lineCount()),n=this.preview;if("string"==typeof t&&("last"===t&&(t=a),"first"===t&&(t=1)),"number"!=typeof t)return alert("Error: The line number must be an integer."),this;if((t=parseInt(t)-1)>a)return alert("Error: The line number range 1-"+a),this;r.setCursor({line:t,ch:0});var s=r.getScrollInfo().clientHeight,l=r.charCoords({line:t,ch:0},"local");if(r.scrollTo(null,(l.top+l.bottom-s)/2),i.watch){var c=this.codeMirror.find(".CodeMirror-scroll")[0],h=e(c).height(),d=c.scrollTop,u=d/c.scrollHeight;0===d?n.scrollTop(0):d+h>=c.scrollHeight-16?n.scrollTop(n[0].scrollHeight):n.scrollTop(n[0].scrollHeight*u)}return r.focus(),this},extend:function(){return void 0!==arguments[1]&&("function"==typeof arguments[1]&&(arguments[1]=e.proxy(arguments[1],this)),this[arguments[0]]=arguments[1]),"object"==typeof arguments[0]&&void 0===arguments[0].length&&e.extend(!0,this,arguments[0]),this},set:function(t,i){return void 0!==i&&"function"==typeof i&&(i=e.proxy(i,this)),this[t]=i,this},config:function(t,i){var r=o;return"object"==typeof t&&(r=e.extend(!0,r,t)),"string"==typeof t&&(r[t]=i),o=r,this.recreate(),this},on:function(t,i){var r=o;return void 0!==r["on"+t]&&(r["on"+t]=e.proxy(i,this)),this},off:function(e){var t=o;return void 0!==t["on"+e]&&(t["on"+e]=function(){}),this},showToolbar:function(t){var i=o;return i.readOnly?this:(i.toolbar&&(this.toolbar.length<1||""===this.toolbar.find("."+this.classPrefix+"menu").html())&&this.setToolbar(),i.toolbar=!0,this.toolbar.show(),this.resize(),e.proxy(t||function(){},this)(),this)},hideToolbar:function(t){return o.toolbar=!1,this.toolbar.hide(),this.resize(),e.proxy(t||function(){},this)(),this},setToolbarAutoFixed:function(t){var i=this.state,r=this.editor,a=this.toolbar,n=o;void 0!==t&&(n.toolbarAutoFixed=t);return!i.fullscreen&&!i.preview&&n.toolbar&&n.toolbarAutoFixed&&e(window).bind("scroll",function(){var t=e(window),i=t.scrollTop();if(!n.toolbarAutoFixed)return!1;i-r.offset().top>10&&i<r.height()?a.css({position:"fixed",width:r.width()+"px",left:(t.width()-r.width())/2+"px"}):a.css({position:"absolute",width:"100%",left:0})}),this},setToolbar:function(){var e=o;if(e.readOnly)return this;var t=this.editor,i=(this.preview,this.classPrefix),a=this.toolbar=t.children("."+i+"toolbar");if(e.toolbar&&a.length<1){var n='<div class="'+i+'toolbar"><div class="'+i+'toolbar-container"><ul class="'+i+'menu"></ul></div></div>';t.append(n),a=this.toolbar=t.children("."+i+"toolbar")}if(!e.toolbar)return a.hide(),this;a.show();for(var s="function"==typeof e.toolbarIcons?e.toolbarIcons(this):"string"==typeof e.toolbarIcons?r.toolbarModes[e.toolbarIcons]:e.toolbarIcons,l=a.find("."+this.classPrefix+"menu"),c="",h=!1,d=0,u=s.length;d<u;d++){var f=s[d];if("||"===f)h=!0;else if("|"===f)c+='<li class="divider" unselectable="on">|</li>';else{var p=/h(\d)/.test(f),m=f;"watch"!==f||e.watch||(m="unwatch");var g=e.lang.toolbar[m],w=e.toolbarIconTexts[m],v=e.toolbarIconsClass[m];g=void 0===g?"":g,w=void 0===w?"":w,v=void 0===v?"":v;var k=h?'<li class="pull-right">':"<li>";void 0!==e.toolbarCustomIcons[f]&&"function"!=typeof e.toolbarCustomIcons[f]?k+=e.toolbarCustomIcons[f]:(k+='<a href="javascript:;" title="'+g+'" unselectable="on">',k+='<i class="fa '+v+'" name="'+f+'" unselectable="on">'+(p?f.toUpperCase():""===v?w:"")+"</i>",k+="</a>"),k+="</li>",c=h?k+c:c+k}}return l.html(c),l.find('[title="Lowercase"]').attr("title",e.lang.toolbar.lowercase),l.find('[title="ucwords"]').attr("title",e.lang.toolbar.ucwords),this.setToolbarHandler(),this.setToolbarAutoFixed(),this},dialogLockScreen:function(){return e.proxy(r.dialogLockScreen,this)(),this},dialogShowMask:function(t){return e.proxy(r.dialogShowMask,this)(t),this},getToolbarHandles:function(e){var t=this.toolbarHandlers=r.toolbarHandlers;return e&&void 0!==toolbarIconHandlers[e]?t[e]:t},setToolbarHandler:function(){var t=this,i=o;if(!i.toolbar||i.readOnly)return this;var a=this.toolbar,n=this.cm,s=this.classPrefix,l=this.toolbarIcons=a.find("."+s+"menu > li > a"),c=this.getToolbarHandles();return l.bind(r.mouseOrTouch("click","touchend"),function(o){var r=e(this).children(".fa"),a=r.attr("name"),s=n.getCursor(),l=n.getSelection();if(""!==a)return t.activeIcon=r,void 0!==c[a]?e.proxy(c[a],t)(n):void 0!==i.toolbarHandlers[a]&&e.proxy(i.toolbarHandlers[a],t)(n,r,s,l),"link"!==a&&"reference-link"!==a&&"image"!==a&&"code-block"!==a&&"preformatted-text"!==a&&"watch"!==a&&"preview"!==a&&"search"!==a&&"fullscreen"!==a&&"info"!==a&&n.focus(),!1}),this},createDialog:function(t){return e.proxy(r.createDialog,this)(t)},createInfoDialog:function(){var e=this,t=this.editor,i=this.classPrefix,o=['<div class="'+i+"dialog "+i+'dialog-info" style="">','<div class="'+i+'dialog-container">','<h1><i class="editormd-logo editormd-logo-lg editormd-logo-color"></i> '+r.title+"<small>v"+r.version+"</small></h1>","<p>"+this.lang.description+"</p>",'<p style="margin: 10px 0 20px 0;"><a href="'+r.homePage+'" target="_blank">'+r.homePage+' <i class="fa fa-external-link"></i></a></p>','<p style="font-size: 0.85em;">Copyright &copy; 2015 <a href="https://github.com/pandao" target="_blank" class="hover-link">Pandao</a>, The <a href="https://github.com/pandao/editor.md/blob/master/LICENSE" target="_blank" class="hover-link">MIT</a> License.</p>',"</div>",'<a href="javascript:;" class="fa fa-close '+i+'dialog-close"></a>',"</div>"].join("\n");t.append(o);var a=this.infoDialog=t.children("."+i+"dialog-info");return a.find("."+i+"dialog-close").bind(r.mouseOrTouch("click","touchend"),function(){e.hideInfoDialog()}),a.css("border",r.isIE8?"1px solid #ddd":"").css("z-index",r.dialogZindex).show(),this.infoDialogPosition(),this},infoDialogPosition:function(){var t=this.infoDialog,i=function(){t.css({top:(e(window).height()-t.height())/2+"px",left:(e(window).width()-t.width())/2+"px"})};return i(),e(window).resize(i),this},showInfoDialog:function(){e("html,body").css("overflow-x","hidden");var t=this.editor,i=o,a=this.infoDialog=t.children("."+this.classPrefix+"dialog-info");return a.length<1&&this.createInfoDialog(),this.lockScreen(!0),this.mask.css({opacity:i.dialogMaskOpacity,backgroundColor:i.dialogMaskBgColor}).show(),a.css("z-index",r.dialogZindex).show(),this.infoDialogPosition(),this},hideInfoDialog:function(){return e("html,body").css("overflow-x",""),this.infoDialog.hide(),this.mask.hide(),this.lockScreen(!1),this},lockScreen:function(e){return r.lockScreen(e),this.resize(),this},recreate:function(){var e=this.editor,t=o;return this.codeMirror.remove(),this.setCodeMirror(),t.readOnly||(e.find(".editormd-dialog").length>0&&e.find(".editormd-dialog").remove(),t.toolbar&&(this.getToolbarHandles(),this.setToolbar())),this.loadedDisplay(!0),this},previewCodeHighlight:function(){var e=o,t=this.previewContainer;return e.previewCodeHighlight&&(t.find("pre").addClass("prettyprint linenums"),"undefined"!=typeof prettyPrint&&prettyPrint()),this},katexRender:function(){return null===t?this:(this.previewContainer.find("."+r.classNames.tex).each(function(){var t=e(this);r.$katex.render(t.text(),t[0]),t.find(".katex").css("font-size","1.0em")}),this)},flowChartAndSequenceDiagramRender:function(){var t=o,a=this.previewContainer;if(r.isIE8)return this;if(t.flowChart){if(null===i)return this;a.find(".flowchart").flowChart()}t.sequenceDiagram&&a.find(".sequence-diagram").sequenceDiagram({theme:"simple"});var n=this.preview,s=this.codeMirror.find(".CodeMirror-scroll"),l=s.height(),c=s.scrollTop(),h=c/s[0].scrollHeight,d=0;n.find(".markdown-toc-list").each(function(){d+=e(this).height()});var u=n.find(".editormd-toc-menu").height();return u=u||0,0===c?n.scrollTop(0):c+l>=s[0].scrollHeight-16?n.scrollTop(n[0].scrollHeight):n.scrollTop((n[0].scrollHeight+d+u)*h),this},registerKeyMaps:function(t){var i=this,a=this.cm,n=o,s=r.toolbarHandlers,l=n.disabledKeyMaps;if(t=t||null){for(var c in t)if(e.inArray(c,l)<0){t[c],a.addKeyMap(t)}}else{for(var h in r.keyMaps){var d=r.keyMaps[h],u="string"==typeof d?e.proxy(s[d],i):e.proxy(d,i);if(e.inArray(h,["F9","F10","F11"])<0&&e.inArray(h,l)<0){var f={};f[h]=u,a.addKeyMap(f)}}e(window).keydown(function(t){if(e.inArray({120:"F9",121:"F10",122:"F11"}[t.keyCode],l)<0)switch(t.keyCode){case 120:return e.proxy(s.watch,i)(),!1;case 121:return e.proxy(s.preview,i)(),!1;case 122:return e.proxy(s.fullscreen,i)(),!1}})}return this},bindScrollEvent:function(){var t=this,i=this.preview,a=o,n=this.codeMirror,s=r.mouseOrTouch;if(!a.syncScrolling)return this;var l=function(){n.find(".CodeMirror-scroll").bind(s("scroll","touchmove"),function(o){var r=e(this).height(),n=e(this).scrollTop(),s=n/e(this)[0].scrollHeight,l=0;i.find(".markdown-toc-list").each(function(){l+=e(this).height()});var c=i.find(".editormd-toc-menu").height();c=c||0,0===n?i.scrollTop(0):n+r>=e(this)[0].scrollHeight-16?i.scrollTop(i[0].scrollHeight):i.scrollTop((i[0].scrollHeight+l+c)*s),e.proxy(a.onscroll,t)(o)})},c=function(){n.find(".CodeMirror-scroll").unbind(s("scroll","touchmove"))},h=function(){i.bind(s("scroll","touchmove"),function(i){var o=e(this).height(),r=e(this).scrollTop(),s=r/e(this)[0].scrollHeight,l=n.find(".CodeMirror-scroll");0===r?l.scrollTop(0):r+o>=e(this)[0].scrollHeight?l.scrollTop(l[0].scrollHeight):l.scrollTop(l[0].scrollHeight*s),e.proxy(a.onpreviewscroll,t)(i)})},d=function(){i.unbind(s("scroll","touchmove"))};return n.bind({mouseover:l,mouseout:c,touchstart:l,touchend:c}),"single"===a.syncScrolling?this:(i.bind({mouseover:h,mouseout:d,touchstart:h,touchend:d}),this)},bindChangeEvent:function(){var e=this,i=this.cm,r=o;return r.syncScrolling?(i.on("change",function(i,o){r.watch&&e.previewContainer.css("padding",r.autoHeight?"20px 20px 50px 40px":"20px"),t=setTimeout(function(){clearTimeout(t),e.save(),t=null},r.delay)}),this):this},loadedDisplay:function(t){t=t||!1;var i=this,r=this.editor,a=this.preview,n=o;return this.containerMask.hide(),this.save(),n.watch&&a.show(),r.data("oldWidth",r.width()).data("oldHeight",r.height()),this.resize(),this.registerKeyMaps(),e(window).resize(function(){i.resize()}),this.bindScrollEvent().bindChangeEvent(),t||(n.imageUploadURL&&initEditormdPasteUpload(this,n.imageUploadURL),e.proxy(n.onload,this)()),this.state.loaded=!0,this},width:function(e){return this.editor.css("width","number"==typeof e?e+"px":e),this.resize(),this},height:function(e){return this.editor.css("height","number"==typeof e?e+"px":e),this.resize(),this},resize:function(t,i){t=t||null,i=i||null;var r=this.state,a=this.editor,n=this.preview,s=this.toolbar,l=o,c=this.codeMirror;if(t&&a.css("width","number"==typeof t?t+"px":t),!l.autoHeight||r.fullscreen||r.preview?(i&&a.css("height","number"==typeof i?i+"px":i),r.fullscreen&&a.height(e(window).height()),l.toolbar&&!l.readOnly?c.css("margin-top",s.height()+1).height(a.height()-s.height()):c.css("margin-top",0).height(a.height())):(a.css("height","auto"),c.css("height","auto")),l.watch)if(c.width(a.width()/2),n.width(r.preview?a.width():a.width()/2),this.previewContainer.css("padding",l.autoHeight?"20px 20px 50px 40px":"20px"),l.toolbar&&!l.readOnly?n.css("top",s.height()+1):n.css("top",0),!l.autoHeight||r.fullscreen||r.preview){var h=l.toolbar&&!l.readOnly?a.height()-s.height():a.height();n.height(h)}else n.height("");else c.width(a.width()),n.hide();return r.loaded&&e.proxy(l.onresize,this)(),this},save:function(){if(null===t)return this;var a=this,n=this.state,s=o,l=this.cm,c=l.getValue(),h=this.previewContainer;if("gfm"!==s.mode&&"markdown"!==s.mode)return this.markdownTextarea.val(c),this;var d=r.$marked,u=this.markdownToC=[],f=this.markedRendererOptions={toc:s.toc,tocm:s.tocm,tocStartLevel:s.tocStartLevel,pageBreak:s.pageBreak,taskList:s.taskList,emoji:s.emoji,tex:s.tex,atLink:s.atLink,emailLink:s.emailLink,flowChart:s.flowChart,sequenceDiagram:s.sequenceDiagram,previewCodeHighlight:s.previewCodeHighlight},p=this.markedOptions={renderer:r.markedRenderer(u,f),gfm:!0,tables:!0,breaks:!0,pedantic:!1,sanitize:!s.htmlDecode,smartLists:!0,smartypants:!0};d.setOptions(p);var m=r.$marked(c,p);if(m=r.filterHTMLTags(m,s.htmlDecode),this.markdownTextarea.text(c),l.save(),s.saveHTMLToTextarea&&this.htmlTextarea.text(m),s.watch||!s.watch&&n.preview){if(h.html(m),this.previewCodeHighlight(),s.toc){var g=""===s.tocContainer?h:e(s.tocContainer),w=g.find("."+this.classPrefix+"toc-menu");g.attr("previewContainer",""===s.tocContainer?"true":"false"),""!==s.tocContainer&&w.length>0&&w.remove(),r.markdownToCRenderer(u,g,s.tocDropdown,s.tocStartLevel),(s.tocDropdown||g.find("."+this.classPrefix+"toc-menu").length>0)&&r.tocDropdownMenu(g,""!==s.tocTitle?s.tocTitle:this.lang.tocTitle),""!==s.tocContainer&&h.find(".markdown-toc").css("border","none")}s.tex&&(!r.kaTeXLoaded&&s.autoLoadModules?r.loadKaTeX(function(){r.$katex=katex,r.kaTeXLoaded=!0,a.katexRender()}):(r.$katex=katex,this.katexRender())),(s.flowChart||s.sequenceDiagram)&&(i=setTimeout(function(){clearTimeout(i),a.flowChartAndSequenceDiagramRender(),i=null},10)),n.loaded&&e.proxy(s.onchange,this)()}return this},focus:function(){return this.cm.focus(),this},setCursor:function(e){return this.cm.setCursor(e),this},getCursor:function(){return this.cm.getCursor()},setSelection:function(e,t){return this.cm.setSelection(e,t),this},getSelection:function(){return this.cm.getSelection()},setSelections:function(e){return this.cm.setSelections(e),this},getSelections:function(){return this.cm.getSelections()},replaceSelection:function(e){return this.cm.replaceSelection(e),this},insertValue:function(e){return this.replaceSelection(e),this},appendMarkdown:function(e){var t=this.cm;return t.setValue(t.getValue()+e),this},setMarkdown:function(e){return this.cm.setValue(e||o.markdown),this},getMarkdown:function(){return this.cm.getValue()},getValue:function(){return this.cm.getValue()},setValue:function(e){return this.cm.setValue(e),this},clear:function(){return this.cm.setValue(""),this},getHTML:function(){return o.saveHTMLToTextarea?this.htmlTextarea.val():(alert("Error: settings.saveHTMLToTextarea == false"),!1)},getTextareaSavedHTML:function(){return this.getHTML()},getPreviewedHTML:function(){return o.watch?this.previewContainer.html():(alert("Error: settings.watch == false"),!1)},watch:function(i){var r=o;if(e.inArray(r.mode,["gfm","markdown"])<0)return this;if(this.state.watching=r.watch=!0,this.preview.show(),this.toolbar){var a=r.toolbarIconsClass.watch,n=r.toolbarIconsClass.unwatch,s=this.toolbar.find(".fa[name=watch]");s.parent().attr("title",r.lang.toolbar.watch),s.removeClass(n).addClass(a)}return this.codeMirror.css("border-right","1px solid #ddd").width(this.editor.width()/2),t=0,this.save().resize(),r.onwatch||(r.onwatch=i||function(){}),e.proxy(r.onwatch,this)(),this},unwatch:function(t){var i=o;if(this.state.watching=i.watch=!1,this.preview.hide(),this.toolbar){var r=i.toolbarIconsClass.watch,a=i.toolbarIconsClass.unwatch,n=this.toolbar.find(".fa[name=watch]");n.parent().attr("title",i.lang.toolbar.unwatch),n.removeClass(r).addClass(a)}return this.codeMirror.css("border-right","none").width(this.editor.width()),this.resize(),i.onunwatch||(i.onunwatch=t||function(){}),e.proxy(i.onunwatch,this)(),this},show:function(t){t=t||function(){};var i=this;return this.editor.show(0,function(){e.proxy(t,i)()}),this},hide:function(t){t=t||function(){};var i=this;return this.editor.hide(0,function(){e.proxy(t,i)()}),this},previewing:function(){var t=this,i=this.editor,a=this.preview,n=this.toolbar,s=o,l=this.codeMirror,c=this.previewContainer;if(e.inArray(s.mode,["gfm","markdown"])<0)return this;s.toolbar&&n&&(n.toggle(),n.find(".fa[name=preview]").toggleClass("active")),l.toggle();var h=function(e){e.shiftKey&&27===e.keyCode&&t.previewed()};"none"===l.css("display")?(this.state.preview=!0,this.state.fullscreen&&a.css("background","#fff"),i.find("."+this.classPrefix+"preview-close-btn").show().bind(r.mouseOrTouch("click","touchend"),function(){t.previewed()}),s.watch?c.css("padding",""):this.save(),c.addClass(this.classPrefix+"preview-active"),a.show().css({position:"",top:0,width:i.width(),height:s.autoHeight&&!this.state.fullscreen?"auto":i.height()}),this.state.loaded&&e.proxy(s.onpreviewing,this)(),e(window).bind("keyup",h)):(e(window).unbind("keyup",h),this.previewed())},previewed:function(){var t=this.editor,i=this.preview,a=this.toolbar,n=o,s=this.previewContainer,l=t.find("."+this.classPrefix+"preview-close-btn");return this.state.preview=!1,this.codeMirror.show(),n.toolbar&&a.show(),i[n.watch?"show":"hide"](),l.hide().unbind(r.mouseOrTouch("click","touchend")),s.removeClass(this.classPrefix+"preview-active"),n.watch&&s.css("padding","20px"),i.css({background:null,position:"absolute",width:t.width()/2,height:n.autoHeight&&!this.state.fullscreen?"auto":t.height()-a.height(),top:n.toolbar?a.height():0}),this.state.loaded&&e.proxy(n.onpreviewed,this)(),this},fullscreen:function(){var t=this,i=this.state,r=this.editor,a=(this.preview,this.toolbar),n=o,s=this.classPrefix+"fullscreen";a&&a.find(".fa[name=fullscreen]").parent().toggleClass("active");var l=function(e){e.shiftKey||27!==e.keyCode||i.fullscreen&&t.fullscreenExit()};return r.hasClass(s)?(e(window).unbind("keyup",l),this.fullscreenExit()):(i.fullscreen=!0,e("html,body").css("overflow","hidden"),r.css({width:e(window).width(),height:e(window).height()}).addClass(s),this.resize(),e.proxy(n.onfullscreen,this)(),e(window).bind("keyup",l)),this},fullscreenExit:function(){var t=this.editor,i=o,r=this.toolbar,a=this.classPrefix+"fullscreen";return this.state.fullscreen=!1,r&&r.find(".fa[name=fullscreen]").parent().removeClass("active"),e("html,body").css("overflow",""),t.css({width:t.data("oldWidth"),height:t.data("oldHeight")}).removeClass(a),this.resize(),e.proxy(i.onfullscreenExit,this)(),this},executePlugin:function(t,i){var a=this,n=this.cm;return i=o.pluginPath+i,"function"==typeof define?void 0===this[t]?(alert("Error: "+t+" plugin is not found, you are not load this plugin."),this):(this[t](n),this):(e.inArray(i,r.loadFiles.plugin)<0?r.loadPlugin(i,function(){r.loadPlugins[t]=a[t],a[t](n)}):e.proxy(r.loadPlugins[t],this)(n),this)},search:function(e){var t=o;return t.searchReplace?(t.readOnly||this.cm.execCommand(e||"find"),this):(alert("Error: settings.searchReplace == false"),this)},searchReplace:function(){return this.search("replace"),this},searchReplaceAll:function(){return this.search("replaceAll"),this}},r.fn.init.prototype=r.fn,r.dialogLockScreen=function(){(o||{dialogLockScreen:!0}).dialogLockScreen&&(e("html,body").css("overflow","hidden"),this.resize())},r.dialogShowMask=function(t){var i=this.editor,r=o||{dialogShowMask:!0};t.css({top:(e(window).height()-t.height())/2+"px",left:(e(window).width()-t.width())/2+"px"}),r.dialogShowMask&&i.children("."+this.classPrefix+"mask").css("z-index",parseInt(t.css("z-index"))-1).show()},r.toolbarHandlers={undo:function(){this.cm.undo()},redo:function(){this.cm.redo()},bold:function(){var e=this.cm,t=e.getCursor(),i=e.getSelection();e.replaceSelection("**"+i+"**"),""===i&&e.setCursor(t.line,t.ch+2)},del:function(){var e=this.cm,t=e.getCursor(),i=e.getSelection();e.replaceSelection("~~"+i+"~~"),""===i&&e.setCursor(t.line,t.ch+2)},italic:function(){var e=this.cm,t=e.getCursor(),i=e.getSelection();e.replaceSelection("*"+i+"*"),""===i&&e.setCursor(t.line,t.ch+1)},quote:function(){var e=this.cm,t=e.getCursor(),i=e.getSelection();0!==t.ch?(e.setCursor(t.line,0),e.replaceSelection("> "+i),e.setCursor(t.line,t.ch+2)):e.replaceSelection("> "+i)},ucfirst:function(){var e=this.cm,t=e.getSelection(),i=e.listSelections();e.replaceSelection(r.firstUpperCase(t)),e.setSelections(i)},ucwords:function(){var e=this.cm,t=e.getSelection(),i=e.listSelections();e.replaceSelection(r.wordsFirstUpperCase(t)),e.setSelections(i)},uppercase:function(){var e=this.cm,t=e.getSelection(),i=e.listSelections();e.replaceSelection(t.toUpperCase()),e.setSelections(i)},lowercase:function(){var e=this.cm,t=(e.getCursor(),e.getSelection()),i=e.listSelections();e.replaceSelection(t.toLowerCase()),e.setSelections(i)},h1:function(){var e=this.cm,t=e.getCursor(),i=e.getSelection();0!==t.ch?(e.setCursor(t.line,0),e.replaceSelection("# "+i),e.setCursor(t.line,t.ch+2)):e.replaceSelection("# "+i)},h2:function(){var e=this.cm,t=e.getCursor(),i=e.getSelection();0!==t.ch?(e.setCursor(t.line,0),e.replaceSelection("## "+i),e.setCursor(t.line,t.ch+3)):e.replaceSelection("## "+i)},h3:function(){var e=this.cm,t=e.getCursor(),i=e.getSelection();0!==t.ch?(e.setCursor(t.line,0),e.replaceSelection("### "+i),e.setCursor(t.line,t.ch+4)):e.replaceSelection("### "+i)},h4:function(){var e=this.cm,t=e.getCursor(),i=e.getSelection();0!==t.ch?(e.setCursor(t.line,0),e.replaceSelection("#### "+i),e.setCursor(t.line,t.ch+5)):e.replaceSelection("#### "+i)},h5:function(){var e=this.cm,t=e.getCursor(),i=e.getSelection();0!==t.ch?(e.setCursor(t.line,0),e.replaceSelection("##### "+i),e.setCursor(t.line,t.ch+6)):e.replaceSelection("##### "+i)},h6:function(){var e=this.cm,t=e.getCursor(),i=e.getSelection();0!==t.ch?(e.setCursor(t.line,0),e.replaceSelection("###### "+i),e.setCursor(t.line,t.ch+7)):e.replaceSelection("###### "+i)},"list-ul":function(){var e=this.cm,t=(e.getCursor(),e.getSelection());if(""===t)e.replaceSelection("- "+t);else{for(var i=t.split("\n"),o=0,r=i.length;o<r;o++)i[o]=""===i[o]?"":"- "+i[o];e.replaceSelection(i.join("\n"))}},"list-ol":function(){var e=this.cm,t=(e.getCursor(),e.getSelection());if(""===t)e.replaceSelection("1. "+t);else{for(var i=t.split("\n"),o=0,r=i.length;o<r;o++)i[o]=""===i[o]?"":o+1+". "+i[o];e.replaceSelection(i.join("\n"))}},hr:function(){var e=this.cm,t=e.getCursor();e.getSelection();e.replaceSelection((0!==t.ch?"\n\n":"\n")+"------------\n\n")},tex:function(){if(!o.tex)return alert("settings.tex === false"),this;var e=this.cm,t=e.getCursor(),i=e.getSelection();e.replaceSelection("$$"+i+"$$"),""===i&&e.setCursor(t.line,t.ch+2)},link:function(){this.executePlugin("linkDialog","link-dialog/link-dialog")},"reference-link":function(){this.executePlugin("referenceLinkDialog","reference-link-dialog/reference-link-dialog")},pagebreak:function(){if(!o.pageBreak)return alert("settings.pageBreak === false"),this;var e=this.cm;e.getSelection();e.replaceSelection("\r\n[========]\r\n")},image:function(){this.executePlugin("imageDialog","image-dialog/image-dialog")},code:function(){var e=this.cm,t=e.getCursor(),i=e.getSelection();e.replaceSelection("`"+i+"`"),""===i&&e.setCursor(t.line,t.ch+1)},"code-block":function(){this.executePlugin("codeBlockDialog","code-block-dialog/code-block-dialog")},"preformatted-text":function(){this.executePlugin("preformattedTextDialog","preformatted-text-dialog/preformatted-text-dialog")},table:function(){this.executePlugin("tableDialog","table-dialog/table-dialog")},datetime:function(){var e=this.cm,t=(e.getSelection(),new Date,o.lang.name),i=r.dateFormat()+" "+r.dateFormat("zh-cn"===t||"zh-tw"===t?"cn-week-day":"week-day");e.replaceSelection(i)},emoji:function(){this.executePlugin("emojiDialog","emoji-dialog/emoji-dialog")},"html-entities":function(){this.executePlugin("htmlEntitiesDialog","html-entities-dialog/html-entities-dialog")},"goto-line":function(){this.executePlugin("gotoLineDialog","goto-line-dialog/goto-line-dialog")},watch:function(){this[o.watch?"unwatch":"watch"]()},preview:function(){this.previewing()},fullscreen:function(){this.fullscreen()},clear:function(){this.clear()},search:function(){this.search()},help:function(){this.executePlugin("helpDialog","help-dialog/help-dialog")},info:function(){this.showInfoDialog()}},r.keyMaps={"Ctrl-1":"h1","Ctrl-2":"h2","Ctrl-3":"h3","Ctrl-4":"h4","Ctrl-5":"h5","Ctrl-6":"h6","Ctrl-B":"bold","Ctrl-D":"datetime","Ctrl-E":function(){var e=this.cm,t=e.getCursor(),i=e.getSelection();o.emoji?(e.replaceSelection(":"+i+":"),""===i&&e.setCursor(t.line,t.ch+1)):alert("Error: settings.emoji == false")},"Ctrl-Alt-G":"goto-line","Ctrl-H":"hr","Ctrl-I":"italic","Ctrl-K":"code","Ctrl-L":function(){var e=this.cm,t=e.getCursor(),i=e.getSelection(),o=""===i?"":' "'+i+'"';e.replaceSelection("["+i+"]("+o+")"),""===i&&e.setCursor(t.line,t.ch+1)},"Ctrl-U":"list-ul","Shift-Ctrl-A":function(){var e=this.cm,t=e.getCursor(),i=e.getSelection();o.atLink?(e.replaceSelection("@"+i),""===i&&e.setCursor(t.line,t.ch+1)):alert("Error: settings.atLink == false")},"Shift-Ctrl-C":"code","Shift-Ctrl-Q":"quote","Shift-Ctrl-S":"del","Shift-Ctrl-K":"tex","Shift-Alt-C":function(){var e=this.cm,t=e.getCursor(),i=e.getSelection();e.replaceSelection(["```",i,"```"].join("\n")),""===i&&e.setCursor(t.line,t.ch+3)},"Shift-Ctrl-Alt-C":"code-block","Shift-Ctrl-H":"html-entities","Shift-Alt-H":"help","Shift-Ctrl-E":"emoji","Shift-Ctrl-U":"uppercase","Shift-Alt-U":"ucwords","Shift-Ctrl-Alt-U":"ucfirst","Shift-Alt-L":"lowercase","Shift-Ctrl-I":function(){var e=this.cm,t=e.getCursor(),i=e.getSelection(),o=""===i?"":' "'+i+'"';e.replaceSelection("!["+i+"]("+o+")"),""===i&&e.setCursor(t.line,t.ch+4)},"Shift-Ctrl-Alt-I":"image","Shift-Ctrl-L":"link","Shift-Ctrl-O":"list-ol","Shift-Ctrl-P":"preformatted-text","Shift-Ctrl-T":"table","Shift-Alt-P":"pagebreak",F9:"watch",F10:"preview",F11:"fullscreen"};var a=function(e){return String.prototype.trim?e.trim():e.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")};r.trim=a;r.ucwords=r.wordsFirstUpperCase=function(e){return e.toLowerCase().replace(/\b(\w)|\s(\w)/g,function(e){return e.toUpperCase()})};var n=function(e){return e.toLowerCase().replace(/\b(\w)/,function(e){return e.toUpperCase()})};return r.firstUpperCase=r.ucfirst=n,r.urls={atLinkBase:"https://github.com/"},r.regexs={atLink:/@(\w+)/g,email:/(\w+)@(\w+)\.(\w+)\.?(\w+)?/g,emailLink:/(mailto:)?([\w\.\_]+)@(\w+)\.(\w+)\.?(\w+)?/g,emoji:/:([\w\+-]+):/g,emojiDatetime:/(\d{2}:\d{2}:\d{2})/g,twemoji:/:(tw-([\w]+)-?(\w+)?):/g,fontAwesome:/:(fa-([\w]+)(-(\w+)){0,}):/g,editormdLogo:/:(editormd-logo-?(\w+)?):/g,pageBreak:/^\[[=]{8,}\]$/},r.emoji={path:"/editormd/emoji/",ext:".png"},r.twemoji={path:"http://twemoji.maxcdn.com/36x36/",ext:".png"},r.markedRenderer=function(t,i){var o=e.extend({toc:!0,tocm:!1,tocStartLevel:1,pageBreak:!0,atLink:!0,emailLink:!0,taskList:!1,emoji:!1,tex:!1,flowChart:!1,sequenceDiagram:!1},i||{}),n=r.$marked,s=new n.Renderer;t=t||[];var l=r.regexs,c=l.atLink,h=l.emoji,d=l.email,u=l.emailLink,f=l.twemoji,p=l.fontAwesome,m=l.editormdLogo,g=l.pageBreak;return s.emoji=function(e){var t=(e=e.replace(r.regexs.emojiDatetime,function(e){return e.replace(/:/g,"&#58;")})).match(h);if(!t||!o.emoji)return e;for(var i=0,a=t.length;i<a;i++)":+1:"===t[i]&&(t[i]=":\\+1:"),e=e.replace(new RegExp(t[i]),function(e,t){var i=e.match(p),o=e.replace(/:/g,"");if(i)for(var a=0,n=i.length;a<n;a++){var s=i[a].replace(/:/g,"");return'<i class="fa '+s+' fa-emoji" title="'+s.replace("fa-","")+'"></i>'}else{var l=e.match(m),c=e.match(f);if(l)for(var h=0,d=l.length;h<d;h++){var u=l[h].replace(/:/g,"");return'<i class="'+u+'" title="Editor.md logo ('+u+')"></i>'}else{if(!c){var g="+1"===o?"plus1":o;return g="moon"===(g="black_large_square"===g?"black_square":g)?"waxing_gibbous_moon":g,'<img src="'+r.emoji.path+g+r.emoji.ext+'" class="emoji" title="&#58;'+o+'&#58;" alt="&#58;'+o+'&#58;" />'}for(var w=0,v=c.length;w<v;w++){var k=c[w].replace(/:/g,"").replace("tw-","");return'<img src="'+r.twemoji.path+k+r.twemoji.ext+'" title="twemoji-'+k+'" alt="twemoji-'+k+'" class="emoji twemoji" />'}}}});return e},s.atLink=function(t){return c.test(t)?(o.atLink&&(t=(t=t.replace(d,function(e,t,i,o){return e.replace(/@/g,"_#_&#64;_#_")})).replace(c,function(e,t){return'<a href="'+r.urls.atLinkBase+t+'" title="&#64;'+t+'" class="at-link">'+e+"</a>"}).replace(/_#_&#64;_#_/g,"@")),o.emailLink&&(t=t.replace(u,function(t,i,o,r,a){return!i&&e.inArray(a,"jpg|jpeg|png|gif|webp|ico|icon|pdf".split("|"))<0?'<a href="mailto:'+t+'">'+t+"</a>":t})),t):t},s.link=function(e,t,i){if(this.options.sanitize){try{var o=decodeURIComponent(unescape(e)).replace(/[^\w:]/g,"").toLowerCase()}catch(e){return""}if(0===o.indexOf("javascript:"))return""}var r='<a href="'+e+'"';return c.test(t)||c.test(i)?(t&&(r+=' title="'+t.replace(/@/g,"&#64;")),r+'">'+i.replace(/@/g,"&#64;")+"</a>"):(t&&(r+=' title="'+t+'"'),r+=">"+i+"</a>")},s.heading=function(e,i,o){var r=e,n=/\s*\<a\s*href\=\"(.*)\"\s*([^\>]*)\>(.*)\<\/a\>\s*/;if(n.test(e)){for(var s=[],l=0,c=(e=e.split(/\<a\s*([^\>]+)\>([^\>]*)\<\/a\>/)).length;l<c;l++)s.push(e[l].replace(/\s*href\=\"(.*)\"\s*/g,""));e=s.join(" ")}var h={text:e=a(e),level:i,slug:e.toLowerCase().replace(/[^\w]+/g,"-")},d=/^[\u4e00-\u9fa5]+$/.test(e)?escape(e).replace(/\%/g,""):e.toLowerCase().replace(/[^\w]+/g,"-");t.push(h);var u="<h"+i+' id="h'+i+"-"+this.options.headerPrefix+d+'">';return u+='<a name="'+e+'" class="reference-link"></a>',u+='<span class="header-link octicon octicon-link"></span>',u+=n?this.atLink(this.emoji(r)):this.atLink(this.emoji(e)),u+="</h"+i+">"},s.pageBreak=function(e){return g.test(e)&&o.pageBreak&&(e='<hr style="page-break-after:always;" class="page-break editormd-page-break" />'),e},s.em=function(e, capInput){return e&&-1!=e.indexOf("$$") || (capInput && capInput.indexOf('$$') != -1) ?"_"+e+"_":"<em>"+e+"</em>"},s.paragraph=function(e){var t=/\$\$(.*)\$\$/g.test(e),i=/^\$\$(.*)\$\$$/.test(e),a=i?' class="'+r.classNames.tex+'"':"",n=o.tocm?/^(\[TOC\]|\[TOCM\])$/.test(e):/^\[TOC\]$/.test(e),s=/^\[TOCM\]$/.test(e),l='<div class="markdown-toc editormd-markdown-toc">'+(e=!i&&t?e.replace(/(\$\$([^\$]*)\$\$)+/g,function(e,t){return'<span class="'+r.classNames.tex+'">'+t.replace(/\$/g,"")+"</span>"}):i?e.replace(/\$/g,""):e)+"</div>";return n?s?'<div class="editormd-toc-menu">'+l+"</div><br/>":l:g.test(e)?this.pageBreak(e):"<p"+a+">"+this.atLink(this.emoji(e))+"</p>\n"},s.code=function(e,t,i){return"seq"===t||"sequence"===t?'<div class="sequence-diagram">'+e+"</div>":"flow"===t?'<div class="flowchart">'+e+"</div>":"math"===t||"latex"===t||"katex"===t?'<p class="'+r.classNames.tex+'">'+e+"</p>":n.Renderer.prototype.code.apply(this,arguments)},s.tablecell=function(e,t){var i=t.header?"th":"td";return(t.align?"<"+i+' style="text-align:'+t.align+'">':"<"+i+">")+this.atLink(this.emoji(e))+"</"+i+">\n"},s.listitem=function(e){return o.taskList&&/^\s*\[[x\s]\]\s*/.test(e)?(e=e.replace(/^\s*\[\s\]\s*/,'<input type="checkbox" class="task-list-item-checkbox" /> ').replace(/^\s*\[x\]\s*/,'<input type="checkbox" class="task-list-item-checkbox" checked disabled /> '),'<li style="list-style: none;">'+this.atLink(this.emoji(e))+"</li>"):"<li>"+this.atLink(this.emoji(e))+"</li>"},s},r.markdownToCRenderer=function(e,t,i,o){var r="",a=0,n=this.classPrefix;o=o||1;for(var s=0,l=e.length;s<l;s++){var c=e[s].text,h=e[s].level;h<o||(r+=h>a?"":h<a?new Array(a-h+2).join("</ul></li>"):"</ul></li>",r+='<li><a class="toc-level-'+h+'" href="#'+c+'" level="'+h+'">'+c+"</a><ul>",a=h)}var d=t.find(".markdown-toc");if(d.length<1&&"false"===t.attr("previewContainer")){var u='<div class="markdown-toc '+n+'markdown-toc"></div>';u=i?'<div class="'+n+'toc-menu">'+u+"</div>":u,t.html(u),d=t.find(".markdown-toc")}return i&&d.wrap('<div class="'+n+'toc-menu"></div><br/>'),d.html('<ul class="markdown-toc-list"></ul>').children(".markdown-toc-list").html(r.replace(/\r?\n?\<ul\>\<\/ul\>/g,"")),d},r.tocDropdownMenu=function(t,i){i=i||"Table of Contents";var o=400,r=t.find("."+this.classPrefix+"toc-menu");return r.each(function(){var t=e(this),r=t.children(".markdown-toc"),a='<i class="fa fa-angle-down"></i>',n='<a href="javascript:;" class="toc-menu-btn">'+a+i+"</a>",s=r.children("ul"),l=s.find("li");r.append(n),l.first().before("<li><h1>"+i+" "+a+"</h1></li>"),t.mouseover(function(){s.show(),l.each(function(){var t=e(this),i=t.children("ul");if(""===i.html()&&i.remove(),i.length>0&&""!==i.html()){var r=t.children("a").first();r.children(".fa").length<1&&r.append(e(a).css({float:"right",paddingTop:"4px"}))}t.mouseover(function(){i.css("z-index",o).show(),o+=1}).mouseleave(function(){i.hide()})})}).mouseleave(function(){s.hide()})}),r},r.filterHTMLTags=function(t,i){if("string"!=typeof t&&(t=new String(t)),"string"!=typeof i)return t;for(var o=i.split("|"),r=o[0].split(","),a=o[1],n=0,s=r.length;n<s;n++){var l=r[n];t=t.replace(new RegExp("<s*"+l+"s*([^>]*)>([^>]*)<s*/"+l+"s*>","igm"),"")}if(void 0!==a){var c=/\<(\w+)\s*([^\>]*)\>([^\>]*)\<\/(\w+)\>/gi;t="*"===a?t.replace(c,function(e,t,i,o,r){return"<"+t+">"+o+"</"+r+">"}):"on*"===a?t.replace(c,function(t,i,o,r,a){var n=e("<"+i+">"+r+"</"+a+">"),s=e(t)[0].attributes,l={};e.each(s,function(e,t){'"'!==t.nodeName&&(l[t.nodeName]=t.nodeValue)}),e.each(l,function(e){0===e.indexOf("on")&&delete l[e]}),n.attr(l);var c=void 0!==n[1]?e(n[1]).text():"";return n[0].outerHTML+c}):t.replace(c,function(t,i,o,r){var n=a.split(","),s=e(t);return s.html(r),e.each(n,function(e){s.attr(n[e],null)}),s[0].outerHTML})}return t},r.markdownToHTML=function(t,i){r.$marked=marked;var o=e("#"+t),a=o.settings=e.extend(!0,{gfm:!0,toc:!0,tocm:!1,tocStartLevel:1,tocTitle:"目录",tocDropdown:!1,tocContainer:"",markdown:"",markdownSourceCode:!1,htmlDecode:!1,autoLoadKaTeX:!0,pageBreak:!0,atLink:!0,emailLink:!0,tex:!1,taskList:!1,emoji:!1,flowChart:!1,sequenceDiagram:!1,previewCodeHighlight:!0},i||{}),n=o.find("textarea");n.length<1&&(o.append("<textarea></textarea>"),n=o.find("textarea"));var s=""===a.markdown?n.val():a.markdown,l=[],c={toc:a.toc,tocm:a.tocm,tocStartLevel:a.tocStartLevel,taskList:a.taskList,emoji:a.emoji,tex:a.tex,pageBreak:a.pageBreak,atLink:a.atLink,emailLink:a.emailLink,flowChart:a.flowChart,sequenceDiagram:a.sequenceDiagram,previewCodeHighlight:a.previewCodeHighlight},h={renderer:r.markedRenderer(l,c),gfm:a.gfm,tables:!0,breaks:!0,pedantic:!1,sanitize:!a.htmlDecode,smartLists:!0,smartypants:!0};s=new String(s);var d=marked(s,h);d=r.filterHTMLTags(d,a.htmlDecode),a.markdownSourceCode?n.text(s):n.remove(),o.addClass("markdown-body "+this.classPrefix+"html-preview").append(d);var u=""!==a.tocContainer?e(a.tocContainer):o;if(""!==a.tocContainer&&u.attr("previewContainer",!1),a.toc&&(o.tocContainer=this.markdownToCRenderer(l,u,a.tocDropdown,a.tocStartLevel),(a.tocDropdown||o.find("."+this.classPrefix+"toc-menu").length>0)&&this.tocDropdownMenu(o,a.tocTitle),""!==a.tocContainer&&o.find(".editormd-toc-menu, .editormd-markdown-toc").remove()),a.previewCodeHighlight&&(o.find("pre").addClass("prettyprint linenums"),prettyPrint()),r.isIE8||(a.flowChart&&o.find(".flowchart").flowChart(),a.sequenceDiagram&&o.find(".sequence-diagram").sequenceDiagram({theme:"simple"})),a.tex){var f=function(){o.find("."+r.classNames.tex).each(function(){var t=e(this);katex.render(t.text(),t[0]),t.find(".katex").css("font-size","1.0em")})};!a.autoLoadKaTeX||r.$katex||r.kaTeXLoaded?f():this.loadKaTeX(function(){r.$katex=katex,r.kaTeXLoaded=!0,f()})}return o.getMarkdown=function(){return n.val()},o},r.themes=["default","dark"],r.previewThemes=["default","dark"],r.editorThemes=["default","3024-day","3024-night","ambiance","ambiance-mobile","base16-dark","base16-light","blackboard","cobalt","eclipse","elegant","erlang-dark","lesser-dark","mbo","mdn-like","midnight","monokai","neat","neo","night","paraiso-dark","paraiso-light","pastel-on-dark","rubyblue","solarized","the-matrix","tomorrow-night-eighties","twilight","vibrant-ink","xq-dark","xq-light"],r.loadPlugins={},r.loadFiles={js:[],css:[],plugin:[]},r.loadPlugin=function(e,t,i){t=t||function(){},this.loadScript(e,function(){r.loadFiles.plugin.push(e),t()},i)},r.loadCSS=function(e,t,i){i=i||"head",t=t||function(){};var o=document.createElement("link");o.type="text/css",o.rel="stylesheet",o.onload=o.onreadystatechange=function(){r.loadFiles.css.push(e),t()},o.href=e+".css","head"===i?document.getElementsByTagName("head")[0].appendChild(o):document.body.appendChild(o)},r.isIE="Microsoft Internet Explorer"==navigator.appName,r.isIE8=r.isIE&&"8."==navigator.appVersion.match(/8./i),r.loadScript=function(e,t,i){i=i||"head",t=t||function(){};var o=null;(o=document.createElement("script")).id=e.replace(/[\./]+/g,"-"),o.type="text/javascript",o.src=e+".js",r.isIE8?o.onreadystatechange=function(){o.readyState&&("loaded"!==o.readyState&&"complete"!==o.readyState||(o.onreadystatechange=null,r.loadFiles.js.push(e),t()))}:o.onload=function(){r.loadFiles.js.push(e),t()},"head"===i?document.getElementsByTagName("head")[0].appendChild(o):document.body.appendChild(o)},r.katexURL={css:"/katex/katex.min",js:"/katex/katex.min"},r.kaTeXLoaded=!1,r.loadKaTeX=function(e){r.loadCSS(r.katexURL.css,function(){r.loadScript(r.katexURL.js,e||function(){})})},r.lockScreen=function(t){e("html,body").css("overflow",t?"hidden":"")},r.createDialog=function(t){t=e.extend(!0,{name:"",width:420,height:240,title:"",drag:!0,closed:!0,content:"",mask:!0,maskStyle:{backgroundColor:"#fff",opacity:.1},lockScreen:!0,footer:!0,buttons:!1},t);var i=this,o=this.editor,a=r.classPrefix,n=(new Date).getTime(),s=""===t.name?a+"dialog-"+n:t.name,l=r.mouseOrTouch,c='<div class="'+a+"dialog "+s+'">';""!==t.title&&(c+='<div class="'+a+'dialog-header"'+(t.drag?' style="cursor: move;"':"")+">",c+='<strong class="'+a+'dialog-title">'+t.title+"</strong>",c+="</div>"),t.closed&&(c+='<a href="javascript:;" class="fa fa-close '+a+'dialog-close"></a>'),c+='<div class="'+a+'dialog-container">'+t.content,(t.footer||"string"==typeof t.footer)&&(c+='<div class="'+a+'dialog-footer">'+("boolean"==typeof t.footer?"":t.footer)+"</div>"),c+="</div>",c+='<div class="'+a+"dialog-mask "+a+'dialog-mask-bg"></div>',c+='<div class="'+a+"dialog-mask "+a+'dialog-mask-con"></div>',c+="</div>",o.append(c);var h=o.find("."+s);h.lockScreen=function(o){return t.lockScreen&&(e("html,body").css("overflow",o?"hidden":""),i.resize()),h},h.showMask=function(){return t.mask&&o.find("."+a+"mask").css(t.maskStyle).css("z-index",r.dialogZindex-1).show(),h},h.hideMask=function(){return t.mask&&o.find("."+a+"mask").hide(),h},h.loading=function(e){return h.find("."+a+"dialog-mask")[e?"show":"hide"](),h},h.lockScreen(!0).showMask(),h.show().css({zIndex:r.dialogZindex,border:r.isIE8?"1px solid #ddd":"",width:"number"==typeof t.width?t.width+"px":t.width,height:"number"==typeof t.height?t.height+"px":t.height});var d=function(){h.css({top:(e(window).height()-h.height())/2+"px",left:(e(window).width()-h.width())/2+"px"})};if(d(),e(window).resize(d),h.children("."+a+"dialog-close").bind(l("click","touchend"),function(){h.hide().lockScreen(!1).hideMask()}),"object"==typeof t.buttons){var u=h.footer=h.find("."+a+"dialog-footer");for(var f in t.buttons){var p=t.buttons[f],m=a+f+"-btn";u.append('<button class="'+a+"btn "+m+'">'+p[0]+"</button>"),p[1]=e.proxy(p[1],h),u.children("."+m).bind(l("click","touchend"),p[1])}}if(""!==t.title&&t.drag){var g,w,v=h.children("."+a+"dialog-header");t.mask||v.bind(l("click","touchend"),function(){r.dialogZindex+=2,h.css("z-index",r.dialogZindex)}),v.mousedown(function(e){e=e||window.event,g=e.clientX-parseInt(h[0].style.left),w=e.clientY-parseInt(h[0].style.top),document.onmousemove=x});var k=function(e){e.removeClass(a+"user-unselect").off("selectstart")},b=function(e){e.addClass(a+"user-unselect").on("selectstart",function(e){return!1})},x=function(t){t=t||window.event;var i,o,r=parseInt(h[0].style.left),a=parseInt(h[0].style.top);r>=0?r+h.width()<=e(window).width()?i=t.clientX-g:(i=e(window).width()-h.width(),document.onmousemove=null):(i=0,document.onmousemove=null),a>=0?o=t.clientY-w:(o=0,document.onmousemove=null),document.onselectstart=function(){return!1},b(e("body")),b(h),h[0].style.left=i+"px",h[0].style.top=o+"px"};document.onmouseup=function(){k(e("body")),k(h),document.onselectstart=null,document.onmousemove=null},v.touchDraggable=function(){var t=null;this.bind("touchstart",function(i){var o=i.originalEvent,r=e(this).parent().position();t={x:o.changedTouches[0].pageX-r.left,y:o.changedTouches[0].pageY-r.top}}).bind("touchmove",function(i){i.preventDefault();var o=i.originalEvent;e(this).parent().css({top:o.changedTouches[0].pageY-t.y,left:o.changedTouches[0].pageX-t.x})})},v.touchDraggable()}return r.dialogZindex+=2,e("body").removeAttr("style"),h},r.mouseOrTouch=function(e,t){t=t||"touchend";var i=e=e||"click";try{document.createEvent("TouchEvent"),i=t}catch(e){}return i},r.dateFormat=function(e){e=e||"";var t=function(e){return e<10?"0"+e:e},i=new Date,o=i.getFullYear(),r=o.toString().slice(2,4),a=t(i.getMonth()+1),n=t(i.getDate()),s=i.getDay(),l=t(i.getHours()),c=t(i.getMinutes()),h=t(i.getSeconds()),d=t(i.getMilliseconds()),u="",f=r+"-"+a+"-"+n,p=o+"-"+a+"-"+n,m=l+":"+c+":"+h;switch(e){case"UNIX Time":u=i.getTime();break;case"UTC":u=i.toUTCString();break;case"yy":u=r;break;case"year":case"yyyy":u=o;break;case"month":case"mm":u=a;break;case"cn-week-day":case"cn-wd":u="星期"+["日","一","二","三","四","五","六"][s];break;case"week-day":case"wd":u=["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"][s];break;case"day":case"dd":u=n;break;case"hour":case"hh":u=l;break;case"min":case"ii":u=c;break;case"second":case"ss":u=h;break;case"ms":u=d;break;case"yy-mm-dd":u=f;break;case"yyyy-mm-dd":u=p;break;case"yyyy-mm-dd h:i:s ms":case"full + ms":u=p+" "+m+" "+d;break;case"full":case"yyyy-mm-dd h:i:s":default:u=p+" "+m}return u},r}}),window._whenPasterDoUpload=function(e,t,i){var o,r,a,n=e.clipboardData,s=0;if(n){if(!(o=n.items))return;for(r=o[0],a=n.types||[];s<a.length;s++)if("Files"===a[s]){r=o[s];break}if(r&&"file"===r.kind&&r.type.match(/^image\//i)){var l=r.getAsFile(),c=new FormData;c.append("editormd-image-file",l),c.append("file_param_name","editormd-image-file"),c.append("byxhr","true");var h=new window.XMLHttpRequest;h.addEventListener("load",function(e){var t=e.target,o=JSON.parse(t.responseText);1===o.success?i&&i(o):(i&&i(o),console.log(o.message))},!1),h.addEventListener("error",function(){console.error("error")},!1),h.open("POST",t),h.send(c)}}};
-
-
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// This is CodeMirror (http://codemirror.net), a code editor
-// implemented in JavaScript on top of the browser's DOM.
-//
-// You can find some technical background for some of the code below
-// at http://marijnhaverbeke.nl/blog/#cm-internals .
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.CodeMirror=t()}(this,function(){"use strict";var e=navigator.userAgent,t=navigator.platform,r=/gecko\/\d/i.test(e),n=/MSIE \d/.test(e),i=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(e),o=/Edge\/(\d+)/.exec(e),l=n||i||o,s=l&&(n?document.documentMode||6:+(o||i)[1]),a=!o&&/WebKit\//.test(e),u=a&&/Qt\/\d+\.\d+/.test(e),c=!o&&/Chrome\//.test(e),h=/Opera\//.test(e),f=/Apple Computer/.test(navigator.vendor),d=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(e),p=/PhantomJS/.test(e),g=!o&&/AppleWebKit/.test(e)&&/Mobile\/\w+/.test(e),v=/Android/.test(e),m=g||v||/webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(e),y=g||/Mac/.test(t),b=/\bCrOS\b/.test(e),w=/win/i.test(t),x=h&&e.match(/Version\/(\d*\.\d*)/);x&&(x=Number(x[1])),x&&x>=15&&(h=!1,a=!0);var C=y&&(u||h&&(null==x||x<12.11)),S=r||l&&s>=9;function L(e){return new RegExp("(^|\\s)"+e+"(?:$|\\s)\\s*")}var T,k=function(e,t){var r=e.className,n=L(t).exec(r);if(n){var i=r.slice(n.index+n[0].length);e.className=r.slice(0,n.index)+(i?n[1]+i:"")}};function M(e){for(var t=e.childNodes.length;t>0;--t)e.removeChild(e.firstChild);return e}function N(e,t){return M(e).appendChild(t)}function O(e,t,r,n){var i=document.createElement(e);if(r&&(i.className=r),n&&(i.style.cssText=n),"string"==typeof t)i.appendChild(document.createTextNode(t));else if(t)for(var o=0;o<t.length;++o)i.appendChild(t[o]);return i}function W(e,t,r,n){var i=O(e,t,r,n);return i.setAttribute("role","presentation"),i}function A(e,t){if(3==t.nodeType&&(t=t.parentNode),e.contains)return e.contains(t);do{if(11==t.nodeType&&(t=t.host),t==e)return!0}while(t=t.parentNode)}function D(){var e;try{e=document.activeElement}catch(t){e=document.body||null}for(;e&&e.shadowRoot&&e.shadowRoot.activeElement;)e=e.shadowRoot.activeElement;return e}function H(e,t){var r=e.className;L(t).test(r)||(e.className+=(r?" ":"")+t)}function P(e,t){for(var r=e.split(" "),n=0;n<r.length;n++)r[n]&&!L(r[n]).test(t)&&(t+=" "+r[n]);return t}T=document.createRange?function(e,t,r,n){var i=document.createRange();return i.setEnd(n||e,r),i.setStart(e,t),i}:function(e,t,r){var n=document.body.createTextRange();try{n.moveToElementText(e.parentNode)}catch(e){return n}return n.collapse(!0),n.moveEnd("character",r),n.moveStart("character",t),n};var E=function(e){e.select()};function F(e){var t=Array.prototype.slice.call(arguments,1);return function(){return e.apply(null,t)}}function I(e,t,r){for(var n in t||(t={}),e)!e.hasOwnProperty(n)||!1===r&&t.hasOwnProperty(n)||(t[n]=e[n]);return t}function z(e,t,r,n,i){null==t&&-1==(t=e.search(/[^\s\u00a0]/))&&(t=e.length);for(var o=n||0,l=i||0;;){var s=e.indexOf("\t",o);if(s<0||s>=t)return l+(t-o);l+=s-o,l+=r-l%r,o=s+1}}g?E=function(e){e.selectionStart=0,e.selectionEnd=e.value.length}:l&&(E=function(e){try{e.select()}catch(e){}});var R=function(){this.id=null};function B(e,t){for(var r=0;r<e.length;++r)if(e[r]==t)return r;return-1}R.prototype.set=function(e,t){clearTimeout(this.id),this.id=setTimeout(t,e)};var G=30,U={toString:function(){return"CodeMirror.Pass"}},V={scroll:!1},K={origin:"*mouse"},j={origin:"+move"};function X(e,t,r){for(var n=0,i=0;;){var o=e.indexOf("\t",n);-1==o&&(o=e.length);var l=o-n;if(o==e.length||i+l>=t)return n+Math.min(l,t-i);if(i+=o-n,n=o+1,(i+=r-i%r)>=t)return n}}var Y=[""];function _(e){for(;Y.length<=e;)Y.push($(Y)+" ");return Y[e]}function $(e){return e[e.length-1]}function q(e,t){for(var r=[],n=0;n<e.length;n++)r[n]=t(e[n],n);return r}function Z(){}function Q(e,t){var r;return Object.create?r=Object.create(e):(Z.prototype=e,r=new Z),t&&I(t,r),r}var J=/[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;function ee(e){return/\w/.test(e)||e>"€"&&(e.toUpperCase()!=e.toLowerCase()||J.test(e))}function te(e,t){return t?!!(t.source.indexOf("\\w")>-1&&ee(e))||t.test(e):ee(e)}function re(e){for(var t in e)if(e.hasOwnProperty(t)&&e[t])return!1;return!0}var ne=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;function ie(e){return e.charCodeAt(0)>=768&&ne.test(e)}function oe(e,t,r){for(;(r<0?t>0:t<e.length)&&ie(e.charAt(t));)t+=r;return t}function le(e,t,r){for(;;){if(Math.abs(t-r)<=1)return e(t)?t:r;var n=Math.floor((t+r)/2);e(n)?r=n:t=n}}function se(e,t){if((t-=e.first)<0||t>=e.size)throw new Error("There is no line "+(t+e.first)+" in the document.");for(var r=e;!r.lines;)for(var n=0;;++n){var i=r.children[n],o=i.chunkSize();if(t<o){r=i;break}t-=o}return r.lines[t]}function ae(e,t,r){var n=[],i=t.line;return e.iter(t.line,r.line+1,function(e){var o=e.text;i==r.line&&(o=o.slice(0,r.ch)),i==t.line&&(o=o.slice(t.ch)),n.push(o),++i}),n}function ue(e,t,r){var n=[];return e.iter(t,r,function(e){n.push(e.text)}),n}function ce(e,t){var r=t-e.height;if(r)for(var n=e;n;n=n.parent)n.height+=r}function he(e){if(null==e.parent)return null;for(var t=e.parent,r=B(t.lines,e),n=t.parent;n;t=n,n=n.parent)for(var i=0;n.children[i]!=t;++i)r+=n.children[i].chunkSize();return r+t.first}function fe(e,t){var r=e.first;e:do{for(var n=0;n<e.children.length;++n){var i=e.children[n],o=i.height;if(t<o){e=i;continue e}t-=o,r+=i.chunkSize()}return r}while(!e.lines);for(var l=0;l<e.lines.length;++l){var s=e.lines[l].height;if(t<s)break;t-=s}return r+l}function de(e,t){return t>=e.first&&t<e.first+e.size}function pe(e,t){return String(e.lineNumberFormatter(t+e.firstLineNumber))}function ge(e,t,r){if(void 0===r&&(r=null),!(this instanceof ge))return new ge(e,t,r);this.line=e,this.ch=t,this.sticky=r}function ve(e,t){return e.line-t.line||e.ch-t.ch}function me(e,t){return e.sticky==t.sticky&&0==ve(e,t)}function ye(e){return ge(e.line,e.ch)}function be(e,t){return ve(e,t)<0?t:e}function we(e,t){return ve(e,t)<0?e:t}function xe(e,t){return Math.max(e.first,Math.min(t,e.first+e.size-1))}function Ce(e,t){if(t.line<e.first)return ge(e.first,0);var r=e.first+e.size-1;return t.line>r?ge(r,se(e,r).text.length):function(e,t){var r=e.ch;return null==r||r>t?ge(e.line,t):r<0?ge(e.line,0):e}(t,se(e,t.line).text.length)}function Se(e,t){for(var r=[],n=0;n<t.length;n++)r[n]=Ce(e,t[n]);return r}var Le=!1,Te=!1;function ke(e,t,r){this.marker=e,this.from=t,this.to=r}function Me(e,t){if(e)for(var r=0;r<e.length;++r){var n=e[r];if(n.marker==t)return n}}function Ne(e,t){for(var r,n=0;n<e.length;++n)e[n]!=t&&(r||(r=[])).push(e[n]);return r}function Oe(e,t){if(t.full)return null;var r=de(e,t.from.line)&&se(e,t.from.line).markedSpans,n=de(e,t.to.line)&&se(e,t.to.line).markedSpans;if(!r&&!n)return null;var i=t.from.ch,o=t.to.ch,l=0==ve(t.from,t.to),s=function(e,t,r){var n;if(e)for(var i=0;i<e.length;++i){var o=e[i],l=o.marker;if(null==o.from||(l.inclusiveLeft?o.from<=t:o.from<t)||o.from==t&&"bookmark"==l.type&&(!r||!o.marker.insertLeft)){var s=null==o.to||(l.inclusiveRight?o.to>=t:o.to>t);(n||(n=[])).push(new ke(l,o.from,s?null:o.to))}}return n}(r,i,l),a=function(e,t,r){var n;if(e)for(var i=0;i<e.length;++i){var o=e[i],l=o.marker;if(null==o.to||(l.inclusiveRight?o.to>=t:o.to>t)||o.from==t&&"bookmark"==l.type&&(!r||o.marker.insertLeft)){var s=null==o.from||(l.inclusiveLeft?o.from<=t:o.from<t);(n||(n=[])).push(new ke(l,s?null:o.from-t,null==o.to?null:o.to-t))}}return n}(n,o,l),u=1==t.text.length,c=$(t.text).length+(u?i:0);if(s)for(var h=0;h<s.length;++h){var f=s[h];if(null==f.to){var d=Me(a,f.marker);d?u&&(f.to=null==d.to?null:d.to+c):f.to=i}}if(a)for(var p=0;p<a.length;++p){var g=a[p];if(null!=g.to&&(g.to+=c),null==g.from)Me(s,g.marker)||(g.from=c,u&&(s||(s=[])).push(g));else g.from+=c,u&&(s||(s=[])).push(g)}s&&(s=We(s)),a&&a!=s&&(a=We(a));var v=[s];if(!u){var m,y=t.text.length-2;if(y>0&&s)for(var b=0;b<s.length;++b)null==s[b].to&&(m||(m=[])).push(new ke(s[b].marker,null,null));for(var w=0;w<y;++w)v.push(m);v.push(a)}return v}function We(e){for(var t=0;t<e.length;++t){var r=e[t];null!=r.from&&r.from==r.to&&!1!==r.marker.clearWhenEmpty&&e.splice(t--,1)}return e.length?e:null}function Ae(e){var t=e.markedSpans;if(t){for(var r=0;r<t.length;++r)t[r].marker.detachLine(e);e.markedSpans=null}}function De(e,t){if(t){for(var r=0;r<t.length;++r)t[r].marker.attachLine(e);e.markedSpans=t}}function He(e){return e.inclusiveLeft?-1:0}function Pe(e){return e.inclusiveRight?1:0}function Ee(e,t){var r=e.lines.length-t.lines.length;if(0!=r)return r;var n=e.find(),i=t.find(),o=ve(n.from,i.from)||He(e)-He(t);if(o)return-o;var l=ve(n.to,i.to)||Pe(e)-Pe(t);return l||t.id-e.id}function Fe(e,t){var r,n=Te&&e.markedSpans;if(n)for(var i=void 0,o=0;o<n.length;++o)(i=n[o]).marker.collapsed&&null==(t?i.from:i.to)&&(!r||Ee(r,i.marker)<0)&&(r=i.marker);return r}function Ie(e){return Fe(e,!0)}function ze(e){return Fe(e,!1)}function Re(e,t,r,n,i){var o=se(e,t),l=Te&&o.markedSpans;if(l)for(var s=0;s<l.length;++s){var a=l[s];if(a.marker.collapsed){var u=a.marker.find(0),c=ve(u.from,r)||He(a.marker)-He(i),h=ve(u.to,n)||Pe(a.marker)-Pe(i);if(!(c>=0&&h<=0||c<=0&&h>=0)&&(c<=0&&(a.marker.inclusiveRight&&i.inclusiveLeft?ve(u.to,r)>=0:ve(u.to,r)>0)||c>=0&&(a.marker.inclusiveRight&&i.inclusiveLeft?ve(u.from,n)<=0:ve(u.from,n)<0)))return!0}}}function Be(e){for(var t;t=Ie(e);)e=t.find(-1,!0).line;return e}function Ge(e,t){var r=se(e,t),n=Be(r);return r==n?t:he(n)}function Ue(e,t){if(t>e.lastLine())return t;var r,n=se(e,t);if(!Ve(e,n))return t;for(;r=ze(n);)n=r.find(1,!0).line;return he(n)+1}function Ve(e,t){var r=Te&&t.markedSpans;if(r)for(var n=void 0,i=0;i<r.length;++i)if((n=r[i]).marker.collapsed){if(null==n.from)return!0;if(!n.marker.widgetNode&&0==n.from&&n.marker.inclusiveLeft&&Ke(e,t,n))return!0}}function Ke(e,t,r){if(null==r.to){var n=r.marker.find(1,!0);return Ke(e,n.line,Me(n.line.markedSpans,r.marker))}if(r.marker.inclusiveRight&&r.to==t.text.length)return!0;for(var i=void 0,o=0;o<t.markedSpans.length;++o)if((i=t.markedSpans[o]).marker.collapsed&&!i.marker.widgetNode&&i.from==r.to&&(null==i.to||i.to!=r.from)&&(i.marker.inclusiveLeft||r.marker.inclusiveRight)&&Ke(e,t,i))return!0}function je(e){for(var t=0,r=(e=Be(e)).parent,n=0;n<r.lines.length;++n){var i=r.lines[n];if(i==e)break;t+=i.height}for(var o=r.parent;o;o=(r=o).parent)for(var l=0;l<o.children.length;++l){var s=o.children[l];if(s==r)break;t+=s.height}return t}function Xe(e){if(0==e.height)return 0;for(var t,r=e.text.length,n=e;t=Ie(n);){var i=t.find(0,!0);n=i.from.line,r+=i.from.ch-i.to.ch}for(n=e;t=ze(n);){var o=t.find(0,!0);r-=n.text.length-o.from.ch,r+=(n=o.to.line).text.length-o.to.ch}return r}function Ye(e){var t=e.display,r=e.doc;t.maxLine=se(r,r.first),t.maxLineLength=Xe(t.maxLine),t.maxLineChanged=!0,r.iter(function(e){var r=Xe(e);r>t.maxLineLength&&(t.maxLineLength=r,t.maxLine=e)})}var _e=null;function $e(e,t,r){var n;_e=null;for(var i=0;i<e.length;++i){var o=e[i];if(o.from<t&&o.to>t)return i;o.to==t&&(o.from!=o.to&&"before"==r?n=i:_e=i),o.from==t&&(o.from!=o.to&&"before"!=r?n=i:_e=i)}return null!=n?n:_e}var qe=function(){var e="bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN",t="nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111";var r=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,n=/[stwN]/,i=/[LRr]/,o=/[Lb1n]/,l=/[1n]/;function s(e,t,r){this.level=e,this.from=t,this.to=r}return function(a,u){var c="ltr"==u?"L":"R";if(0==a.length||"ltr"==u&&!r.test(a))return!1;for(var h,f=a.length,d=[],p=0;p<f;++p)d.push((h=a.charCodeAt(p))<=247?e.charAt(h):1424<=h&&h<=1524?"R":1536<=h&&h<=1785?t.charAt(h-1536):1774<=h&&h<=2220?"r":8192<=h&&h<=8203?"w":8204==h?"b":"L");for(var g=0,v=c;g<f;++g){var m=d[g];"m"==m?d[g]=v:v=m}for(var y=0,b=c;y<f;++y){var w=d[y];"1"==w&&"r"==b?d[y]="n":i.test(w)&&(b=w,"r"==w&&(d[y]="R"))}for(var x=1,C=d[0];x<f-1;++x){var S=d[x];"+"==S&&"1"==C&&"1"==d[x+1]?d[x]="1":","!=S||C!=d[x+1]||"1"!=C&&"n"!=C||(d[x]=C),C=S}for(var L=0;L<f;++L){var T=d[L];if(","==T)d[L]="N";else if("%"==T){var k=void 0;for(k=L+1;k<f&&"%"==d[k];++k);for(var M=L&&"!"==d[L-1]||k<f&&"1"==d[k]?"1":"N",N=L;N<k;++N)d[N]=M;L=k-1}}for(var O=0,W=c;O<f;++O){var A=d[O];"L"==W&&"1"==A?d[O]="L":i.test(A)&&(W=A)}for(var D=0;D<f;++D)if(n.test(d[D])){var H=void 0;for(H=D+1;H<f&&n.test(d[H]);++H);for(var P="L"==(D?d[D-1]:c),E=P==("L"==(H<f?d[H]:c))?P?"L":"R":c,F=D;F<H;++F)d[F]=E;D=H-1}for(var I,z=[],R=0;R<f;)if(o.test(d[R])){var B=R;for(++R;R<f&&o.test(d[R]);++R);z.push(new s(0,B,R))}else{var G=R,U=z.length;for(++R;R<f&&"L"!=d[R];++R);for(var V=G;V<R;)if(l.test(d[V])){G<V&&z.splice(U,0,new s(1,G,V));var K=V;for(++V;V<R&&l.test(d[V]);++V);z.splice(U,0,new s(2,K,V)),G=V}else++V;G<R&&z.splice(U,0,new s(1,G,R))}return 1==z[0].level&&(I=a.match(/^\s+/))&&(z[0].from=I[0].length,z.unshift(new s(0,0,I[0].length))),1==$(z).level&&(I=a.match(/\s+$/))&&($(z).to-=I[0].length,z.push(new s(0,f-I[0].length,f))),"rtl"==u?z.reverse():z}}();function Ze(e,t){var r=e.order;return null==r&&(r=e.order=qe(e.text,t)),r}function Qe(e,t,r){var n=oe(e.text,t+r,r);return n<0||n>e.text.length?null:n}function Je(e,t,r){var n=Qe(e,t.ch,r);return null==n?null:new ge(t.line,n,r<0?"after":"before")}function et(e,t,r,n,i){if(e){var o=Ze(r,t.doc.direction);if(o){var l,s=i<0?$(o):o[0],a=i<0==(1==s.level)?"after":"before";if(s.level>0){var u=Ar(t,r);l=i<0?r.text.length-1:0;var c=Dr(t,u,l).top;l=le(function(e){return Dr(t,u,e).top==c},i<0==(1==s.level)?s.from:s.to-1,l),"before"==a&&(l=Qe(r,l,1))}else l=i<0?s.to:s.from;return new ge(n,l,a)}}return new ge(n,i<0?r.text.length:0,i<0?"before":"after")}function tt(e,t,r,n){var i=Ze(t,e.doc.direction);if(!i)return Je(t,r,n);r.ch>=t.text.length?(r.ch=t.text.length,r.sticky="before"):r.ch<=0&&(r.ch=0,r.sticky="after");var o=$e(i,r.ch,r.sticky),l=i[o];if("ltr"==e.doc.direction&&l.level%2==0&&(n>0?l.to>r.ch:l.from<r.ch))return Je(t,r,n);var s,a=function(e,r){return Qe(t,e instanceof ge?e.ch:e,r)},u=function(r){return e.options.lineWrapping?(s=s||Ar(e,t),qr(e,t,s,r)):{begin:0,end:t.text.length}},c=u("before"==r.sticky?a(r,-1):r.ch);if("rtl"==e.doc.direction||1==l.level){var h=1==l.level==n<0,f=a(r,h?1:-1);if(null!=f&&(h?f<=l.to&&f<=c.end:f>=l.from&&f>=c.begin)){var d=h?"before":"after";return new ge(r.line,f,d)}}var p=function(e,t,n){for(var o=function(e,t){return t?new ge(r.line,a(e,1),"before"):new ge(r.line,e,"after")};e>=0&&e<i.length;e+=t){var l=i[e],s=t>0==(1!=l.level),u=s?n.begin:a(n.end,-1);if(l.from<=u&&u<l.to)return o(u,s);if(u=s?l.from:a(l.to,-1),n.begin<=u&&u<n.end)return o(u,s)}},g=p(o+n,n,c);if(g)return g;var v=n>0?c.end:a(c.begin,-1);return null==v||n>0&&v==t.text.length||!(g=p(n>0?0:i.length-1,n,u(v)))?null:g}var rt=[],nt=function(e,t,r){if(e.addEventListener)e.addEventListener(t,r,!1);else if(e.attachEvent)e.attachEvent("on"+t,r);else{var n=e._handlers||(e._handlers={});n[t]=(n[t]||rt).concat(r)}};function it(e,t){return e._handlers&&e._handlers[t]||rt}function ot(e,t,r){if(e.removeEventListener)e.removeEventListener(t,r,!1);else if(e.detachEvent)e.detachEvent("on"+t,r);else{var n=e._handlers,i=n&&n[t];if(i){var o=B(i,r);o>-1&&(n[t]=i.slice(0,o).concat(i.slice(o+1)))}}}function lt(e,t){var r=it(e,t);if(r.length)for(var n=Array.prototype.slice.call(arguments,2),i=0;i<r.length;++i)r[i].apply(null,n)}function st(e,t,r){return"string"==typeof t&&(t={type:t,preventDefault:function(){this.defaultPrevented=!0}}),lt(e,r||t.type,e,t),dt(t)||t.codemirrorIgnore}function at(e){var t=e._handlers&&e._handlers.cursorActivity;if(t)for(var r=e.curOp.cursorActivityHandlers||(e.curOp.cursorActivityHandlers=[]),n=0;n<t.length;++n)-1==B(r,t[n])&&r.push(t[n])}function ut(e,t){return it(e,t).length>0}function ct(e){e.prototype.on=function(e,t){nt(this,e,t)},e.prototype.off=function(e,t){ot(this,e,t)}}function ht(e){e.preventDefault?e.preventDefault():e.returnValue=!1}function ft(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0}function dt(e){return null!=e.defaultPrevented?e.defaultPrevented:0==e.returnValue}function pt(e){ht(e),ft(e)}function gt(e){return e.target||e.srcElement}function vt(e){var t=e.which;return null==t&&(1&e.button?t=1:2&e.button?t=3:4&e.button&&(t=2)),y&&e.ctrlKey&&1==t&&(t=3),t}var mt,yt,bt=function(){if(l&&s<9)return!1;var e=O("div");return"draggable"in e||"dragDrop"in e}();function wt(e){if(null==mt){var t=O("span","​");N(e,O("span",[t,document.createTextNode("x")])),0!=e.firstChild.offsetHeight&&(mt=t.offsetWidth<=1&&t.offsetHeight>2&&!(l&&s<8))}var r=mt?O("span","​"):O("span"," ",null,"display: inline-block; width: 1px; margin-right: -1px");return r.setAttribute("cm-text",""),r}function xt(e){if(null!=yt)return yt;var t=N(e,document.createTextNode("AخA")),r=T(t,0,1).getBoundingClientRect(),n=T(t,1,2).getBoundingClientRect();return M(e),!(!r||r.left==r.right)&&(yt=n.right-r.right<3)}var Ct,St=3!="\n\nb".split(/\n/).length?function(e){for(var t=0,r=[],n=e.length;t<=n;){var i=e.indexOf("\n",t);-1==i&&(i=e.length);var o=e.slice(t,"\r"==e.charAt(i-1)?i-1:i),l=o.indexOf("\r");-1!=l?(r.push(o.slice(0,l)),t+=l+1):(r.push(o),t=i+1)}return r}:function(e){return e.split(/\r\n?|\n/)},Lt=window.getSelection?function(e){try{return e.selectionStart!=e.selectionEnd}catch(e){return!1}}:function(e){var t;try{t=e.ownerDocument.selection.createRange()}catch(e){}return!(!t||t.parentElement()!=e)&&0!=t.compareEndPoints("StartToEnd",t)},Tt="oncopy"in(Ct=O("div"))||(Ct.setAttribute("oncopy","return;"),"function"==typeof Ct.oncopy),kt=null;var Mt={},Nt={};function Ot(e){if("string"==typeof e&&Nt.hasOwnProperty(e))e=Nt[e];else if(e&&"string"==typeof e.name&&Nt.hasOwnProperty(e.name)){var t=Nt[e.name];"string"==typeof t&&(t={name:t}),(e=Q(t,e)).name=t.name}else{if("string"==typeof e&&/^[\w\-]+\/[\w\-]+\+xml$/.test(e))return Ot("application/xml");if("string"==typeof e&&/^[\w\-]+\/[\w\-]+\+json$/.test(e))return Ot("application/json")}return"string"==typeof e?{name:e}:e||{name:"null"}}function Wt(e,t){t=Ot(t);var r=Mt[t.name];if(!r)return Wt(e,"text/plain");var n=r(e,t);if(At.hasOwnProperty(t.name)){var i=At[t.name];for(var o in i)i.hasOwnProperty(o)&&(n.hasOwnProperty(o)&&(n["_"+o]=n[o]),n[o]=i[o])}if(n.name=t.name,t.helperType&&(n.helperType=t.helperType),t.modeProps)for(var l in t.modeProps)n[l]=t.modeProps[l];return n}var At={};function Dt(e,t){I(t,At.hasOwnProperty(e)?At[e]:At[e]={})}function Ht(e,t){if(!0===t)return t;if(e.copyState)return e.copyState(t);var r={};for(var n in t){var i=t[n];i instanceof Array&&(i=i.concat([])),r[n]=i}return r}function Pt(e,t){for(var r;e.innerMode&&(r=e.innerMode(t))&&r.mode!=e;)t=r.state,e=r.mode;return r||{mode:e,state:t}}function Et(e,t,r){return!e.startState||e.startState(t,r)}var Ft=function(e,t){this.pos=this.start=0,this.string=e,this.tabSize=t||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0};function It(e,t,r,n){var i=[e.state.modeGen],o={};jt(e,t.text,e.doc.mode,r,function(e,t){return i.push(e,t)},o,n);for(var l=function(r){var n=e.state.overlays[r],l=1,s=0;jt(e,t.text,n.mode,!0,function(e,t){for(var r=l;s<e;){var o=i[l];o>e&&i.splice(l,1,e,i[l+1],o),l+=2,s=Math.min(e,o)}if(t)if(n.opaque)i.splice(r,l-r,e,"overlay "+t),l=r+2;else for(;r<l;r+=2){var a=i[r+1];i[r+1]=(a?a+" ":"")+"overlay "+t}},o)},s=0;s<e.state.overlays.length;++s)l(s);return{styles:i,classes:o.bgClass||o.textClass?o:null}}function zt(e,t,r){if(!t.styles||t.styles[0]!=e.state.modeGen){var n=Rt(e,he(t)),i=It(e,t,t.text.length>e.options.maxHighlightLength?Ht(e.doc.mode,n):n);t.stateAfter=n,t.styles=i.styles,i.classes?t.styleClasses=i.classes:t.styleClasses&&(t.styleClasses=null),r===e.doc.frontier&&e.doc.frontier++}return t.styles}function Rt(e,t,r){var n=e.doc,i=e.display;if(!n.mode.startState)return!0;var o=function(e,t,r){for(var n,i,o=e.doc,l=r?-1:t-(e.doc.mode.innerMode?1e3:100),s=t;s>l;--s){if(s<=o.first)return o.first;var a=se(o,s-1);if(a.stateAfter&&(!r||s<=o.frontier))return s;var u=z(a.text,null,e.options.tabSize);(null==i||n>u)&&(i=s-1,n=u)}return i}(e,t,r),l=o>n.first&&se(n,o-1).stateAfter;return l=l?Ht(n.mode,l):Et(n.mode),n.iter(o,t,function(r){Bt(e,r.text,l);var s=o==t-1||o%5==0||o>=i.viewFrom&&o<i.viewTo;r.stateAfter=s?Ht(n.mode,l):null,++o}),r&&(n.frontier=o),l}function Bt(e,t,r,n){var i=e.doc.mode,o=new Ft(t,e.options.tabSize);for(o.start=o.pos=n||0,""==t&&Gt(i,r);!o.eol();)Ut(i,o,r),o.start=o.pos}function Gt(e,t){if(e.blankLine)return e.blankLine(t);if(e.innerMode){var r=Pt(e,t);return r.mode.blankLine?r.mode.blankLine(r.state):void 0}}function Ut(e,t,r,n){for(var i=0;i<10;i++){n&&(n[0]=Pt(e,r).mode);var o=e.token(t,r);if(t.pos>t.start)return o}throw new Error("Mode "+e.name+" failed to advance stream.")}function Vt(e,t,r,n){var i,o=function(e){return{start:h.start,end:h.pos,string:h.current(),type:i||null,state:e?Ht(l.mode,c):c}},l=e.doc,s=l.mode;t=Ce(l,t);var a,u=se(l,t.line),c=Rt(e,t.line,r),h=new Ft(u.text,e.options.tabSize);for(n&&(a=[]);(n||h.pos<t.ch)&&!h.eol();)h.start=h.pos,i=Ut(s,h,c),n&&a.push(o(!0));return n?a:o()}function Kt(e,t){if(e)for(;;){var r=e.match(/(?:^|\s+)line-(background-)?(\S+)/);if(!r)break;e=e.slice(0,r.index)+e.slice(r.index+r[0].length);var n=r[1]?"bgClass":"textClass";null==t[n]?t[n]=r[2]:new RegExp("(?:^|s)"+r[2]+"(?:$|s)").test(t[n])||(t[n]+=" "+r[2])}return e}function jt(e,t,r,n,i,o,l){var s=r.flattenSpans;null==s&&(s=e.options.flattenSpans);var a,u=0,c=null,h=new Ft(t,e.options.tabSize),f=e.options.addModeClass&&[null];for(""==t&&Kt(Gt(r,n),o);!h.eol();){if(h.pos>e.options.maxHighlightLength?(s=!1,l&&Bt(e,t,n,h.pos),h.pos=t.length,a=null):a=Kt(Ut(r,h,n,f),o),f){var d=f[0].name;d&&(a="m-"+(a?d+" "+a:d))}if(!s||c!=a){for(;u<h.start;)i(u=Math.min(h.start,u+5e3),c);c=a}h.start=h.pos}for(;u<h.pos;){var p=Math.min(h.pos,u+5e3);i(p,c),u=p}}Ft.prototype.eol=function(){return this.pos>=this.string.length},Ft.prototype.sol=function(){return this.pos==this.lineStart},Ft.prototype.peek=function(){return this.string.charAt(this.pos)||void 0},Ft.prototype.next=function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},Ft.prototype.eat=function(e){var t=this.string.charAt(this.pos);if("string"==typeof e?t==e:t&&(e.test?e.test(t):e(t)))return++this.pos,t},Ft.prototype.eatWhile=function(e){for(var t=this.pos;this.eat(e););return this.pos>t},Ft.prototype.eatSpace=function(){for(var e=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>e},Ft.prototype.skipToEnd=function(){this.pos=this.string.length},Ft.prototype.skipTo=function(e){var t=this.string.indexOf(e,this.pos);if(t>-1)return this.pos=t,!0},Ft.prototype.backUp=function(e){this.pos-=e},Ft.prototype.column=function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=z(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-(this.lineStart?z(this.string,this.lineStart,this.tabSize):0)},Ft.prototype.indentation=function(){return z(this.string,null,this.tabSize)-(this.lineStart?z(this.string,this.lineStart,this.tabSize):0)},Ft.prototype.match=function(e,t,r){if("string"!=typeof e){var n=this.string.slice(this.pos).match(e);return n&&n.index>0?null:(n&&!1!==t&&(this.pos+=n[0].length),n)}var i=function(e){return r?e.toLowerCase():e};if(i(this.string.substr(this.pos,e.length))==i(e))return!1!==t&&(this.pos+=e.length),!0},Ft.prototype.current=function(){return this.string.slice(this.start,this.pos)},Ft.prototype.hideFirstChars=function(e,t){this.lineStart+=e;try{return t()}finally{this.lineStart-=e}};var Xt=function(e,t,r){this.text=e,De(this,t),this.height=r?r(this):1};function Yt(e){e.parent=null,Ae(e)}Xt.prototype.lineNo=function(){return he(this)},ct(Xt);var _t={},$t={};function qt(e,t){if(!e||/^\s*$/.test(e))return null;var r=t.addModeClass?$t:_t;return r[e]||(r[e]=e.replace(/\S+/g,"cm-$&"))}function Zt(e,t){var r=W("span",null,null,a?"padding-right: .1px":null),n={pre:W("pre",[r],"CodeMirror-line"),content:r,col:0,pos:0,cm:e,trailingSpace:!1,splitSpaces:(l||a)&&e.getOption("lineWrapping")};t.measure={};for(var i=0;i<=(t.rest?t.rest.length:0);i++){var o=i?t.rest[i-1]:t.line,s=void 0;n.pos=0,n.addToken=Jt,xt(e.display.measure)&&(s=Ze(o,e.doc.direction))&&(n.addToken=er(n.addToken,s)),n.map=[],rr(o,n,zt(e,o,t!=e.display.externalMeasured&&he(o))),o.styleClasses&&(o.styleClasses.bgClass&&(n.bgClass=P(o.styleClasses.bgClass,n.bgClass||"")),o.styleClasses.textClass&&(n.textClass=P(o.styleClasses.textClass,n.textClass||""))),0==n.map.length&&n.map.push(0,0,n.content.appendChild(wt(e.display.measure))),0==i?(t.measure.map=n.map,t.measure.cache={}):((t.measure.maps||(t.measure.maps=[])).push(n.map),(t.measure.caches||(t.measure.caches=[])).push({}))}if(a){var u=n.content.lastChild;(/\bcm-tab\b/.test(u.className)||u.querySelector&&u.querySelector(".cm-tab"))&&(n.content.className="cm-tab-wrap-hack")}return lt(e,"renderLine",e,t.line,n.pre),n.pre.className&&(n.textClass=P(n.pre.className,n.textClass||"")),n}function Qt(e){var t=O("span","•","cm-invalidchar");return t.title="\\u"+e.charCodeAt(0).toString(16),t.setAttribute("aria-label",t.title),t}function Jt(e,t,r,n,i,o,a){if(t){var u,c=e.splitSpaces?function(e,t){if(e.length>1&&!/  /.test(e))return e;for(var r=t,n="",i=0;i<e.length;i++){var o=e.charAt(i);" "!=o||!r||i!=e.length-1&&32!=e.charCodeAt(i+1)||(o=" "),n+=o,r=" "==o}return n}(t,e.trailingSpace):t,h=e.cm.state.specialChars,f=!1;if(h.test(t)){u=document.createDocumentFragment();for(var d=0;;){h.lastIndex=d;var p=h.exec(t),g=p?p.index-d:t.length-d;if(g){var v=document.createTextNode(c.slice(d,d+g));l&&s<9?u.appendChild(O("span",[v])):u.appendChild(v),e.map.push(e.pos,e.pos+g,v),e.col+=g,e.pos+=g}if(!p)break;d+=g+1;var m=void 0;if("\t"==p[0]){var y=e.cm.options.tabSize,b=y-e.col%y;(m=u.appendChild(O("span",_(b),"cm-tab"))).setAttribute("role","presentation"),m.setAttribute("cm-text","\t"),e.col+=b}else"\r"==p[0]||"\n"==p[0]?((m=u.appendChild(O("span","\r"==p[0]?"␍":"␤","cm-invalidchar"))).setAttribute("cm-text",p[0]),e.col+=1):((m=e.cm.options.specialCharPlaceholder(p[0])).setAttribute("cm-text",p[0]),l&&s<9?u.appendChild(O("span",[m])):u.appendChild(m),e.col+=1);e.map.push(e.pos,e.pos+1,m),e.pos++}}else e.col+=t.length,u=document.createTextNode(c),e.map.push(e.pos,e.pos+t.length,u),l&&s<9&&(f=!0),e.pos+=t.length;if(e.trailingSpace=32==c.charCodeAt(t.length-1),r||n||i||f||a){var w=r||"";n&&(w+=n),i&&(w+=i);var x=O("span",[u],w,a);return o&&(x.title=o),e.content.appendChild(x)}e.content.appendChild(u)}}function er(e,t){return function(r,n,i,o,l,s,a){i=i?i+" cm-force-border":"cm-force-border";for(var u=r.pos,c=u+n.length;;){for(var h=void 0,f=0;f<t.length&&!((h=t[f]).to>u&&h.from<=u);f++);if(h.to>=c)return e(r,n,i,o,l,s,a);e(r,n.slice(0,h.to-u),i,o,null,s,a),o=null,n=n.slice(h.to-u),u=h.to}}}function tr(e,t,r,n){var i=!n&&r.widgetNode;i&&e.map.push(e.pos,e.pos+t,i),!n&&e.cm.display.input.needsContentAttribute&&(i||(i=e.content.appendChild(document.createElement("span"))),i.setAttribute("cm-marker",r.id)),i&&(e.cm.display.input.setUneditable(i),e.content.appendChild(i)),e.pos+=t,e.trailingSpace=!1}function rr(e,t,r){var n=e.markedSpans,i=e.text,o=0;if(n)for(var l,s,a,u,c,h,f,d=i.length,p=0,g=1,v="",m=0;;){if(m==p){a=u=c=h=s="",f=null,m=1/0;for(var y=[],b=void 0,w=0;w<n.length;++w){var x=n[w],C=x.marker;"bookmark"==C.type&&x.from==p&&C.widgetNode?y.push(C):x.from<=p&&(null==x.to||x.to>p||C.collapsed&&x.to==p&&x.from==p)?(null!=x.to&&x.to!=p&&m>x.to&&(m=x.to,u=""),C.className&&(a+=" "+C.className),C.css&&(s=(s?s+";":"")+C.css),C.startStyle&&x.from==p&&(c+=" "+C.startStyle),C.endStyle&&x.to==m&&(b||(b=[])).push(C.endStyle,x.to),C.title&&!h&&(h=C.title),C.collapsed&&(!f||Ee(f.marker,C)<0)&&(f=x)):x.from>p&&m>x.from&&(m=x.from)}if(b)for(var S=0;S<b.length;S+=2)b[S+1]==m&&(u+=" "+b[S]);if(!f||f.from==p)for(var L=0;L<y.length;++L)tr(t,0,y[L]);if(f&&(f.from||0)==p){if(tr(t,(null==f.to?d+1:f.to)-p,f.marker,null==f.from),null==f.to)return;f.to==p&&(f=!1)}}if(p>=d)break;for(var T=Math.min(d,m);;){if(v){var k=p+v.length;if(!f){var M=k>T?v.slice(0,T-p):v;t.addToken(t,M,l?l+a:a,c,p+M.length==m?u:"",h,s)}if(k>=T){v=v.slice(T-p),p=T;break}p=k,c=""}v=i.slice(o,o=r[g++]),l=qt(r[g++],t.cm.options)}}else for(var N=1;N<r.length;N+=2)t.addToken(t,i.slice(o,o=r[N]),qt(r[N+1],t.cm.options))}function nr(e,t,r){this.line=t,this.rest=function(e){for(var t,r;t=ze(e);)e=t.find(1,!0).line,(r||(r=[])).push(e);return r}(t),this.size=this.rest?he($(this.rest))-r+1:1,this.node=this.text=null,this.hidden=Ve(e,t)}function ir(e,t,r){for(var n,i=[],o=t;o<r;o=n){var l=new nr(e.doc,se(e.doc,o),o);n=o+l.size,i.push(l)}return i}var or=null;var lr=null;function sr(e,t){var r=it(e,t);if(r.length){var n,i=Array.prototype.slice.call(arguments,2);or?n=or.delayedCallbacks:lr?n=lr:(n=lr=[],setTimeout(ar,0));for(var o=function(e){n.push(function(){return r[e].apply(null,i)})},l=0;l<r.length;++l)o(l)}}function ar(){var e=lr;lr=null;for(var t=0;t<e.length;++t)e[t]()}function ur(e,t,r,n){for(var i=0;i<t.changes.length;i++){var o=t.changes[i];"text"==o?fr(e,t):"gutter"==o?pr(e,t,r,n):"class"==o?dr(e,t):"widget"==o&&gr(e,t,n)}t.changes=null}function cr(e){return e.node==e.text&&(e.node=O("div",null,null,"position: relative"),e.text.parentNode&&e.text.parentNode.replaceChild(e.node,e.text),e.node.appendChild(e.text),l&&s<8&&(e.node.style.zIndex=2)),e.node}function hr(e,t){var r=e.display.externalMeasured;return r&&r.line==t.line?(e.display.externalMeasured=null,t.measure=r.measure,r.built):Zt(e,t)}function fr(e,t){var r=t.text.className,n=hr(e,t);t.text==t.node&&(t.node=n.pre),t.text.parentNode.replaceChild(n.pre,t.text),t.text=n.pre,n.bgClass!=t.bgClass||n.textClass!=t.textClass?(t.bgClass=n.bgClass,t.textClass=n.textClass,dr(e,t)):r&&(t.text.className=r)}function dr(e,t){!function(e,t){var r=t.bgClass?t.bgClass+" "+(t.line.bgClass||""):t.line.bgClass;if(r&&(r+=" CodeMirror-linebackground"),t.background)r?t.background.className=r:(t.background.parentNode.removeChild(t.background),t.background=null);else if(r){var n=cr(t);t.background=n.insertBefore(O("div",null,r),n.firstChild),e.display.input.setUneditable(t.background)}}(e,t),t.line.wrapClass?cr(t).className=t.line.wrapClass:t.node!=t.text&&(t.node.className="");var r=t.textClass?t.textClass+" "+(t.line.textClass||""):t.line.textClass;t.text.className=r||""}function pr(e,t,r,n){if(t.gutter&&(t.node.removeChild(t.gutter),t.gutter=null),t.gutterBackground&&(t.node.removeChild(t.gutterBackground),t.gutterBackground=null),t.line.gutterClass){var i=cr(t);t.gutterBackground=O("div",null,"CodeMirror-gutter-background "+t.line.gutterClass,"left: "+(e.options.fixedGutter?n.fixedPos:-n.gutterTotalWidth)+"px; width: "+n.gutterTotalWidth+"px"),e.display.input.setUneditable(t.gutterBackground),i.insertBefore(t.gutterBackground,t.text)}var o=t.line.gutterMarkers;if(e.options.lineNumbers||o){var l=cr(t),s=t.gutter=O("div",null,"CodeMirror-gutter-wrapper","left: "+(e.options.fixedGutter?n.fixedPos:-n.gutterTotalWidth)+"px");if(e.display.input.setUneditable(s),l.insertBefore(s,t.text),t.line.gutterClass&&(s.className+=" "+t.line.gutterClass),!e.options.lineNumbers||o&&o["CodeMirror-linenumbers"]||(t.lineNumber=s.appendChild(O("div",pe(e.options,r),"CodeMirror-linenumber CodeMirror-gutter-elt","left: "+n.gutterLeft["CodeMirror-linenumbers"]+"px; width: "+e.display.lineNumInnerWidth+"px"))),o)for(var a=0;a<e.options.gutters.length;++a){var u=e.options.gutters[a],c=o.hasOwnProperty(u)&&o[u];c&&s.appendChild(O("div",[c],"CodeMirror-gutter-elt","left: "+n.gutterLeft[u]+"px; width: "+n.gutterWidth[u]+"px"))}}}function gr(e,t,r){t.alignable&&(t.alignable=null);for(var n=t.node.firstChild,i=void 0;n;n=i)i=n.nextSibling,"CodeMirror-linewidget"==n.className&&t.node.removeChild(n);mr(e,t,r)}function vr(e,t,r,n){var i=hr(e,t);return t.text=t.node=i.pre,i.bgClass&&(t.bgClass=i.bgClass),i.textClass&&(t.textClass=i.textClass),dr(e,t),pr(e,t,r,n),mr(e,t,n),t.node}function mr(e,t,r){if(yr(e,t.line,t,r,!0),t.rest)for(var n=0;n<t.rest.length;n++)yr(e,t.rest[n],t,r,!1)}function yr(e,t,r,n,i){if(t.widgets)for(var o=cr(r),l=0,s=t.widgets;l<s.length;++l){var a=s[l],u=O("div",[a.node],"CodeMirror-linewidget");a.handleMouseEvents||u.setAttribute("cm-ignore-events","true"),br(a,u,r,n),e.display.input.setUneditable(u),i&&a.above?o.insertBefore(u,r.gutter||r.text):o.appendChild(u),sr(a,"redraw")}}function br(e,t,r,n){if(e.noHScroll){(r.alignable||(r.alignable=[])).push(t);var i=n.wrapperWidth;t.style.left=n.fixedPos+"px",e.coverGutter||(i-=n.gutterTotalWidth,t.style.paddingLeft=n.gutterTotalWidth+"px"),t.style.width=i+"px"}e.coverGutter&&(t.style.zIndex=5,t.style.position="relative",e.noHScroll||(t.style.marginLeft=-n.gutterTotalWidth+"px"))}function wr(e){if(null!=e.height)return e.height;var t=e.doc.cm;if(!t)return 0;if(!A(document.body,e.node)){var r="position: relative;";e.coverGutter&&(r+="margin-left: -"+t.display.gutters.offsetWidth+"px;"),e.noHScroll&&(r+="width: "+t.display.wrapper.clientWidth+"px;"),N(t.display.measure,O("div",[e.node],null,r))}return e.height=e.node.parentNode.offsetHeight}function xr(e,t){for(var r=gt(t);r!=e.wrapper;r=r.parentNode)if(!r||1==r.nodeType&&"true"==r.getAttribute("cm-ignore-events")||r.parentNode==e.sizer&&r!=e.mover)return!0}function Cr(e){return e.lineSpace.offsetTop}function Sr(e){return e.mover.offsetHeight-e.lineSpace.offsetHeight}function Lr(e){if(e.cachedPaddingH)return e.cachedPaddingH;var t=N(e.measure,O("pre","x")),r=window.getComputedStyle?window.getComputedStyle(t):t.currentStyle,n={left:parseInt(r.paddingLeft),right:parseInt(r.paddingRight)};return isNaN(n.left)||isNaN(n.right)||(e.cachedPaddingH=n),n}function Tr(e){return G-e.display.nativeBarWidth}function kr(e){return e.display.scroller.clientWidth-Tr(e)-e.display.barWidth}function Mr(e){return e.display.scroller.clientHeight-Tr(e)-e.display.barHeight}function Nr(e,t,r){if(e.line==t)return{map:e.measure.map,cache:e.measure.cache};for(var n=0;n<e.rest.length;n++)if(e.rest[n]==t)return{map:e.measure.maps[n],cache:e.measure.caches[n]};for(var i=0;i<e.rest.length;i++)if(he(e.rest[i])>r)return{map:e.measure.maps[i],cache:e.measure.caches[i],before:!0}}function Or(e,t,r,n){return Dr(e,Ar(e,t),r,n)}function Wr(e,t){if(t>=e.display.viewFrom&&t<e.display.viewTo)return e.display.view[ln(e,t)];var r=e.display.externalMeasured;return r&&t>=r.lineN&&t<r.lineN+r.size?r:void 0}function Ar(e,t){var r=he(t),n=Wr(e,r);n&&!n.text?n=null:n&&n.changes&&(ur(e,n,r,en(e)),e.curOp.forceUpdate=!0),n||(n=function(e,t){var r=he(t=Be(t)),n=e.display.externalMeasured=new nr(e.doc,t,r);n.lineN=r;var i=n.built=Zt(e,n);return n.text=i.pre,N(e.display.lineMeasure,i.pre),n}(e,t));var i=Nr(n,t,r);return{line:t,view:n,rect:null,map:i.map,cache:i.cache,before:i.before,hasHeights:!1}}function Dr(e,t,r,n,i){t.before&&(r=-1);var o,a=r+(n||"");return t.cache.hasOwnProperty(a)?o=t.cache[a]:(t.rect||(t.rect=t.view.text.getBoundingClientRect()),t.hasHeights||(!function(e,t,r){var n=e.options.lineWrapping,i=n&&kr(e);if(!t.measure.heights||n&&t.measure.width!=i){var o=t.measure.heights=[];if(n){t.measure.width=i;for(var l=t.text.firstChild.getClientRects(),s=0;s<l.length-1;s++){var a=l[s],u=l[s+1];Math.abs(a.bottom-u.bottom)>2&&o.push((a.bottom+u.top)/2-r.top)}}o.push(r.bottom-r.top)}}(e,t.view,t.rect),t.hasHeights=!0),(o=function(e,t,r,n){var i,o=Er(t.map,r,n),a=o.node,u=o.start,c=o.end,h=o.collapse;if(3==a.nodeType){for(var f=0;f<4;f++){for(;u&&ie(t.line.text.charAt(o.coverStart+u));)--u;for(;o.coverStart+c<o.coverEnd&&ie(t.line.text.charAt(o.coverStart+c));)++c;if((i=l&&s<9&&0==u&&c==o.coverEnd-o.coverStart?a.parentNode.getBoundingClientRect():Fr(T(a,u,c).getClientRects(),n)).left||i.right||0==u)break;c=u,u-=1,h="right"}l&&s<11&&(i=function(e,t){if(!window.screen||null==screen.logicalXDPI||screen.logicalXDPI==screen.deviceXDPI||!function(e){if(null!=kt)return kt;var t=N(e,O("span","x")),r=t.getBoundingClientRect(),n=T(t,0,1).getBoundingClientRect();return kt=Math.abs(r.left-n.left)>1}(e))return t;var r=screen.logicalXDPI/screen.deviceXDPI,n=screen.logicalYDPI/screen.deviceYDPI;return{left:t.left*r,right:t.right*r,top:t.top*n,bottom:t.bottom*n}}(e.display.measure,i))}else{var d;u>0&&(h=n="right"),i=e.options.lineWrapping&&(d=a.getClientRects()).length>1?d["right"==n?d.length-1:0]:a.getBoundingClientRect()}if(l&&s<9&&!u&&(!i||!i.left&&!i.right)){var p=a.parentNode.getClientRects()[0];i=p?{left:p.left,right:p.left+Jr(e.display),top:p.top,bottom:p.bottom}:Pr}for(var g=i.top-t.rect.top,v=i.bottom-t.rect.top,m=(g+v)/2,y=t.view.measure.heights,b=0;b<y.length-1&&!(m<y[b]);b++);var w=b?y[b-1]:0,x=y[b],C={left:("right"==h?i.right:i.left)-t.rect.left,right:("left"==h?i.left:i.right)-t.rect.left,top:w,bottom:x};i.left||i.right||(C.bogus=!0);e.options.singleCursorHeightPerLine||(C.rtop=g,C.rbottom=v);return C}(e,t,r,n)).bogus||(t.cache[a]=o)),{left:o.left,right:o.right,top:i?o.rtop:o.top,bottom:i?o.rbottom:o.bottom}}var Hr,Pr={left:0,right:0,top:0,bottom:0};function Er(e,t,r){for(var n,i,o,l,s,a,u=0;u<e.length;u+=3)if(s=e[u],a=e[u+1],t<s?(i=0,o=1,l="left"):t<a?o=(i=t-s)+1:(u==e.length-3||t==a&&e[u+3]>t)&&(i=(o=a-s)-1,t>=a&&(l="right")),null!=i){if(n=e[u+2],s==a&&r==(n.insertLeft?"left":"right")&&(l=r),"left"==r&&0==i)for(;u&&e[u-2]==e[u-3]&&e[u-1].insertLeft;)n=e[2+(u-=3)],l="left";if("right"==r&&i==a-s)for(;u<e.length-3&&e[u+3]==e[u+4]&&!e[u+5].insertLeft;)n=e[(u+=3)+2],l="right";break}return{node:n,start:i,end:o,collapse:l,coverStart:s,coverEnd:a}}function Fr(e,t){var r=Pr;if("left"==t)for(var n=0;n<e.length&&(r=e[n]).left==r.right;n++);else for(var i=e.length-1;i>=0&&(r=e[i]).left==r.right;i--);return r}function Ir(e){if(e.measure&&(e.measure.cache={},e.measure.heights=null,e.rest))for(var t=0;t<e.rest.length;t++)e.measure.caches[t]={}}function zr(e){e.display.externalMeasure=null,M(e.display.lineMeasure);for(var t=0;t<e.display.view.length;t++)Ir(e.display.view[t])}function Rr(e){zr(e),e.display.cachedCharWidth=e.display.cachedTextHeight=e.display.cachedPaddingH=null,e.options.lineWrapping||(e.display.maxLineChanged=!0),e.display.lineNumChars=null}function Br(){return window.pageXOffset||(document.documentElement||document.body).scrollLeft}function Gr(){return window.pageYOffset||(document.documentElement||document.body).scrollTop}function Ur(e,t,r,n,i){if(!i&&t.widgets)for(var o=0;o<t.widgets.length;++o)if(t.widgets[o].above){var l=wr(t.widgets[o]);r.top+=l,r.bottom+=l}if("line"==n)return r;n||(n="local");var s=je(t);if("local"==n?s+=Cr(e.display):s-=e.display.viewOffset,"page"==n||"window"==n){var a=e.display.lineSpace.getBoundingClientRect();s+=a.top+("window"==n?0:Gr());var u=a.left+("window"==n?0:Br());r.left+=u,r.right+=u}return r.top+=s,r.bottom+=s,r}function Vr(e,t,r){if("div"==r)return t;var n=t.left,i=t.top;if("page"==r)n-=Br(),i-=Gr();else if("local"==r||!r){var o=e.display.sizer.getBoundingClientRect();n+=o.left,i+=o.top}var l=e.display.lineSpace.getBoundingClientRect();return{left:n-l.left,top:i-l.top}}function Kr(e,t,r,n,i){return n||(n=se(e.doc,t.line)),Ur(e,n,Or(e,n,t.ch,i),r)}function jr(e,t,r,n,i,o){function l(t,l){var s=Dr(e,i,t,l?"right":"left",o);return l?s.left=s.right:s.right=s.left,Ur(e,n,s,r)}n=n||se(e.doc,t.line),i||(i=Ar(e,n));var s=Ze(n,e.doc.direction),a=t.ch,u=t.sticky;if(a>=n.text.length?(a=n.text.length,u="before"):a<=0&&(a=0,u="after"),!s)return l("before"==u?a-1:a,"before"==u);function c(e,t,r){return l(r?e-1:e,s[t].level%2!=0!=r)}var h=$e(s,a,u),f=_e,d=c(a,h,"before"==u);return null!=f&&(d.other=c(a,f,"before"!=u)),d}function Xr(e,t){var r=0;t=Ce(e.doc,t),e.options.lineWrapping||(r=Jr(e.display)*t.ch);var n=se(e.doc,t.line),i=je(n)+Cr(e.display);return{left:r,right:r,top:i,bottom:i+n.height}}function Yr(e,t,r,n,i){var o=ge(e,t,r);return o.xRel=i,n&&(o.outside=!0),o}function _r(e,t,r){var n=e.doc;if((r+=e.display.viewOffset)<0)return Yr(n.first,0,null,!0,-1);var i=fe(n,r),o=n.first+n.size-1;if(i>o)return Yr(n.first+n.size-1,se(n,o).text.length,null,!0,1);t<0&&(t=0);for(var l=se(n,i);;){var s=Zr(e,l,i,t,r),a=ze(l),u=a&&a.find(0,!0);if(!a||!(s.ch>u.from.ch||s.ch==u.from.ch&&s.xRel>0))return s;i=he(l=u.to.line)}}function $r(e,t,r,n){var i=function(n){return Ur(e,t,Dr(e,r,n),"line")},o=t.text.length,l=le(function(e){return i(e-1).bottom<=n},o,0);return{begin:l,end:o=le(function(e){return i(e).top>n},l,o)}}function qr(e,t,r,n){return $r(e,t,r,Ur(e,t,Dr(e,r,n),"line").top)}function Zr(e,t,r,n,i){i-=je(t);var o,l=0,s=t.text.length,a=Ar(e,t);if(Ze(t,e.doc.direction)){var u;if(e.options.lineWrapping)l=(u=$r(e,t,a,i)).begin,s=u.end;o=new ge(r,l);var c,h,f=jr(e,o,"line",t,a).left,d=f<n?1:-1,p=f-n;do{if(c=p,h=o,null==(o=tt(e,t,o,d))||o.ch<l||s<=("before"==o.sticky?o.ch-1:o.ch)){o=h;break}p=jr(e,o,"line",t,a).left-n}while(d<0!=p<0&&Math.abs(p)<=Math.abs(c));if(Math.abs(p)>Math.abs(c)){if(p<0==c<0)throw new Error("Broke out of infinite loop in coordsCharInner");o=h}}else{var g=le(function(r){var o=Ur(e,t,Dr(e,a,r),"line");return o.top>i?(s=Math.min(r,s),!0):!(o.bottom<=i)&&(o.left>n||!(o.right<n)&&n-o.left<o.right-n)},l,s);o=new ge(r,g=oe(t.text,g,1),g==s?"before":"after")}var v=jr(e,o,"line",t,a);return(i<v.top||v.bottom<i)&&(o.outside=!0),o.xRel=n<v.left?-1:n>v.right?1:0,o}function Qr(e){if(null!=e.cachedTextHeight)return e.cachedTextHeight;if(null==Hr){Hr=O("pre");for(var t=0;t<49;++t)Hr.appendChild(document.createTextNode("x")),Hr.appendChild(O("br"));Hr.appendChild(document.createTextNode("x"))}N(e.measure,Hr);var r=Hr.offsetHeight/50;return r>3&&(e.cachedTextHeight=r),M(e.measure),r||1}function Jr(e){if(null!=e.cachedCharWidth)return e.cachedCharWidth;var t=O("span","xxxxxxxxxx"),r=O("pre",[t]);N(e.measure,r);var n=t.getBoundingClientRect(),i=(n.right-n.left)/10;return i>2&&(e.cachedCharWidth=i),i||10}function en(e){for(var t=e.display,r={},n={},i=t.gutters.clientLeft,o=t.gutters.firstChild,l=0;o;o=o.nextSibling,++l)r[e.options.gutters[l]]=o.offsetLeft+o.clientLeft+i,n[e.options.gutters[l]]=o.clientWidth;return{fixedPos:tn(t),gutterTotalWidth:t.gutters.offsetWidth,gutterLeft:r,gutterWidth:n,wrapperWidth:t.wrapper.clientWidth}}function tn(e){return e.scroller.getBoundingClientRect().left-e.sizer.getBoundingClientRect().left}function rn(e){var t=Qr(e.display),r=e.options.lineWrapping,n=r&&Math.max(5,e.display.scroller.clientWidth/Jr(e.display)-3);return function(i){if(Ve(e.doc,i))return 0;var o=0;if(i.widgets)for(var l=0;l<i.widgets.length;l++)i.widgets[l].height&&(o+=i.widgets[l].height);return r?o+(Math.ceil(i.text.length/n)||1)*t:o+t}}function nn(e){var t=e.doc,r=rn(e);t.iter(function(e){var t=r(e);t!=e.height&&ce(e,t)})}function on(e,t,r,n){var i=e.display;if(!r&&"true"==gt(t).getAttribute("cm-not-content"))return null;var o,l,s=i.lineSpace.getBoundingClientRect();try{o=t.clientX-s.left,l=t.clientY-s.top}catch(t){return null}var a,u=_r(e,o,l);if(n&&1==u.xRel&&(a=se(e.doc,u.line).text).length==u.ch){var c=z(a,a.length,e.options.tabSize)-a.length;u=ge(u.line,Math.max(0,Math.round((o-Lr(e.display).left)/Jr(e.display))-c))}return u}function ln(e,t){if(t>=e.display.viewTo)return null;if((t-=e.display.viewFrom)<0)return null;for(var r=e.display.view,n=0;n<r.length;n++)if((t-=r[n].size)<0)return n}function sn(e){e.display.input.showSelection(e.display.input.prepareSelection())}function an(e,t){for(var r=e.doc,n={},i=n.cursors=document.createDocumentFragment(),o=n.selection=document.createDocumentFragment(),l=0;l<r.sel.ranges.length;l++)if(!1!==t||l!=r.sel.primIndex){var s=r.sel.ranges[l];if(!(s.from().line>=e.display.viewTo||s.to().line<e.display.viewFrom)){var a=s.empty();(a||e.options.showCursorWhenSelecting)&&un(e,s.head,i),a||cn(e,s,o)}}return n}function un(e,t,r){var n=jr(e,t,"div",null,null,!e.options.singleCursorHeightPerLine),i=r.appendChild(O("div"," ","CodeMirror-cursor"));if(i.style.left=n.left+"px",i.style.top=n.top+"px",i.style.height=Math.max(0,n.bottom-n.top)*e.options.cursorHeight+"px",n.other){var o=r.appendChild(O("div"," ","CodeMirror-cursor CodeMirror-secondarycursor"));o.style.display="",o.style.left=n.other.left+"px",o.style.top=n.other.top+"px",o.style.height=.85*(n.other.bottom-n.other.top)+"px"}}function cn(e,t,r){var n=e.display,i=e.doc,o=document.createDocumentFragment(),l=Lr(e.display),s=l.left,a=Math.max(n.sizerWidth,kr(e)-n.sizer.offsetLeft)-l.right;function u(e,t,r,n){t<0&&(t=0),t=Math.round(t),n=Math.round(n),o.appendChild(O("div",null,"CodeMirror-selected","position: absolute; left: "+e+"px;\n                             top: "+t+"px; width: "+(null==r?a-e:r)+"px;\n                             height: "+(n-t)+"px"))}function c(t,r,n){var o,l,c=se(i,t),h=c.text.length;function f(r,n){return Kr(e,ge(t,r),"div",c,n)}return function(e,t,r,n){if(!e)return n(t,r,"ltr");for(var i=!1,o=0;o<e.length;++o){var l=e[o];(l.from<r&&l.to>t||t==r&&l.to==t)&&(n(Math.max(l.from,t),Math.min(l.to,r),1==l.level?"rtl":"ltr"),i=!0)}i||n(t,r,"ltr")}(Ze(c,i.direction),r||0,null==n?h:n,function(e,t,i){var c,d,p,g=f(e,"left");if(e==t)c=g,d=p=g.left;else{if(c=f(t-1,"right"),"rtl"==i){var v=g;g=c,c=v}d=g.left,p=c.right}null==r&&0==e&&(d=s),c.top-g.top>3&&(u(d,g.top,null,g.bottom),d=s,g.bottom<c.top&&u(d,g.bottom,null,c.top)),null==n&&t==h&&(p=a),(!o||g.top<o.top||g.top==o.top&&g.left<o.left)&&(o=g),(!l||c.bottom>l.bottom||c.bottom==l.bottom&&c.right>l.right)&&(l=c),d<s+1&&(d=s),u(d,c.top,p-d,c.bottom)}),{start:o,end:l}}var h=t.from(),f=t.to();if(h.line==f.line)c(h.line,h.ch,f.ch);else{var d=se(i,h.line),p=se(i,f.line),g=Be(d)==Be(p),v=c(h.line,h.ch,g?d.text.length+1:null).end,m=c(f.line,g?0:null,f.ch).start;g&&(v.top<m.top-2?(u(v.right,v.top,null,v.bottom),u(s,m.top,m.left,m.bottom)):u(v.right,v.top,m.left-v.right,v.bottom)),v.bottom<m.top&&u(s,v.bottom,null,m.top)}r.appendChild(o)}function hn(e){if(e.state.focused){var t=e.display;clearInterval(t.blinker);var r=!0;t.cursorDiv.style.visibility="",e.options.cursorBlinkRate>0?t.blinker=setInterval(function(){return t.cursorDiv.style.visibility=(r=!r)?"":"hidden"},e.options.cursorBlinkRate):e.options.cursorBlinkRate<0&&(t.cursorDiv.style.visibility="hidden")}}function fn(e){e.state.focused||(e.display.input.focus(),dn(e))}function dn(e,t){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1),"nocursor"!=e.options.readOnly&&(e.state.focused||(lt(e,"focus",e,t),e.state.focused=!0,H(e.display.wrapper,"CodeMirror-focused"),e.curOp||e.display.selForContextMenu==e.doc.sel||(e.display.input.reset(),a&&setTimeout(function(){return e.display.input.reset(!0)},20)),e.display.input.receivedFocus()),hn(e))}function pn(e,t){e.state.delayingBlurEvent||(e.state.focused&&(lt(e,"blur",e,t),e.state.focused=!1,k(e.display.wrapper,"CodeMirror-focused")),clearInterval(e.display.blinker),setTimeout(function(){e.state.focused||(e.display.shift=!1)},150))}function gn(e){var t=e.display,r=t.view;if(t.alignWidgets||t.gutters.firstChild&&e.options.fixedGutter){for(var n=tn(t)-t.scroller.scrollLeft+e.doc.scrollLeft,i=t.gutters.offsetWidth,o=n+"px",l=0;l<r.length;l++)if(!r[l].hidden){e.options.fixedGutter&&(r[l].gutter&&(r[l].gutter.style.left=o),r[l].gutterBackground&&(r[l].gutterBackground.style.left=o));var s=r[l].alignable;if(s)for(var a=0;a<s.length;a++)s[a].style.left=o}e.options.fixedGutter&&(t.gutters.style.left=n+i+"px")}}function vn(e){if(!e.options.lineNumbers)return!1;var t=e.doc,r=pe(e.options,t.first+t.size-1),n=e.display;if(r.length!=n.lineNumChars){var i=n.measure.appendChild(O("div",[O("div",r)],"CodeMirror-linenumber CodeMirror-gutter-elt")),o=i.firstChild.offsetWidth,l=i.offsetWidth-o;return n.lineGutter.style.width="",n.lineNumInnerWidth=Math.max(o,n.lineGutter.offsetWidth-l)+1,n.lineNumWidth=n.lineNumInnerWidth+l,n.lineNumChars=n.lineNumInnerWidth?r.length:-1,n.lineGutter.style.width=n.lineNumWidth+"px",li(e),!0}return!1}function mn(e){for(var t=e.display,r=t.lineDiv.offsetTop,n=0;n<t.view.length;n++){var i=t.view[n],o=void 0;if(!i.hidden){if(l&&s<8){var a=i.node.offsetTop+i.node.offsetHeight;o=a-r,r=a}else{var u=i.node.getBoundingClientRect();o=u.bottom-u.top}var c=i.line.height-o;if(o<2&&(o=Qr(t)),(c>.001||c<-.001)&&(ce(i.line,o),yn(i.line),i.rest))for(var h=0;h<i.rest.length;h++)yn(i.rest[h])}}}function yn(e){if(e.widgets)for(var t=0;t<e.widgets.length;++t)e.widgets[t].height=e.widgets[t].node.parentNode.offsetHeight}function bn(e,t,r){var n=r&&null!=r.top?Math.max(0,r.top):e.scroller.scrollTop;n=Math.floor(n-Cr(e));var i=r&&null!=r.bottom?r.bottom:n+e.wrapper.clientHeight,o=fe(t,n),l=fe(t,i);if(r&&r.ensure){var s=r.ensure.from.line,a=r.ensure.to.line;s<o?(o=s,l=fe(t,je(se(t,s))+e.wrapper.clientHeight)):Math.min(a,t.lastLine())>=l&&(o=fe(t,je(se(t,a))-e.wrapper.clientHeight),l=a)}return{from:o,to:Math.max(l,o+1)}}function wn(e,t){Math.abs(e.doc.scrollTop-t)<2||(e.doc.scrollTop=t,r||oi(e,{top:t}),e.display.scroller.scrollTop!=t&&(e.display.scroller.scrollTop=t),e.display.scrollbars.setScrollTop(t),r&&oi(e),ei(e,100))}function xn(e,t,r){(r?t==e.doc.scrollLeft:Math.abs(e.doc.scrollLeft-t)<2)||(t=Math.min(t,e.display.scroller.scrollWidth-e.display.scroller.clientWidth),e.doc.scrollLeft=t,gn(e),e.display.scroller.scrollLeft!=t&&(e.display.scroller.scrollLeft=t),e.display.scrollbars.setScrollLeft(t))}var Cn=0,Sn=null;function Ln(e){var t=e.wheelDeltaX,r=e.wheelDeltaY;return null==t&&e.detail&&e.axis==e.HORIZONTAL_AXIS&&(t=e.detail),null==r&&e.detail&&e.axis==e.VERTICAL_AXIS?r=e.detail:null==r&&(r=e.wheelDelta),{x:t,y:r}}function Tn(e){var t=Ln(e);return t.x*=Sn,t.y*=Sn,t}function kn(e,t){var n=Ln(t),i=n.x,o=n.y,l=e.display,s=l.scroller,u=s.scrollWidth>s.clientWidth,c=s.scrollHeight>s.clientHeight;if(i&&u||o&&c){if(o&&y&&a)e:for(var f=t.target,d=l.view;f!=s;f=f.parentNode)for(var p=0;p<d.length;p++)if(d[p].node==f){e.display.currentWheelTarget=f;break e}if(i&&!r&&!h&&null!=Sn)return o&&c&&wn(e,Math.max(0,Math.min(s.scrollTop+o*Sn,s.scrollHeight-s.clientHeight))),xn(e,Math.max(0,Math.min(s.scrollLeft+i*Sn,s.scrollWidth-s.clientWidth))),(!o||o&&c)&&ht(t),void(l.wheelStartX=null);if(o&&null!=Sn){var g=o*Sn,v=e.doc.scrollTop,m=v+l.wrapper.clientHeight;g<0?v=Math.max(0,v+g-50):m=Math.min(e.doc.height,m+g+50),oi(e,{top:v,bottom:m})}Cn<20&&(null==l.wheelStartX?(l.wheelStartX=s.scrollLeft,l.wheelStartY=s.scrollTop,l.wheelDX=i,l.wheelDY=o,setTimeout(function(){if(null!=l.wheelStartX){var e=s.scrollLeft-l.wheelStartX,t=s.scrollTop-l.wheelStartY,r=t&&l.wheelDY&&t/l.wheelDY||e&&l.wheelDX&&e/l.wheelDX;l.wheelStartX=l.wheelStartY=null,r&&(Sn=(Sn*Cn+r)/(Cn+1),++Cn)}},200)):(l.wheelDX+=i,l.wheelDY+=o))}}function Mn(e){var t=e.display,r=t.gutters.offsetWidth,n=Math.round(e.doc.height+Sr(e.display));return{clientHeight:t.scroller.clientHeight,viewHeight:t.wrapper.clientHeight,scrollWidth:t.scroller.scrollWidth,clientWidth:t.scroller.clientWidth,viewWidth:t.wrapper.clientWidth,barLeft:e.options.fixedGutter?r:0,docHeight:n,scrollHeight:n+Tr(e)+t.barHeight,nativeBarWidth:t.nativeBarWidth,gutterWidth:r}}l?Sn=-.53:r?Sn=15:c?Sn=-.7:f&&(Sn=-1/3);var Nn=function(e,t,r){this.cm=r;var n=this.vert=O("div",[O("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar"),i=this.horiz=O("div",[O("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar");e(n),e(i),nt(n,"scroll",function(){n.clientHeight&&t(n.scrollTop,"vertical")}),nt(i,"scroll",function(){i.clientWidth&&t(i.scrollLeft,"horizontal")}),this.checkedZeroWidth=!1,l&&s<8&&(this.horiz.style.minHeight=this.vert.style.minWidth="18px")};Nn.prototype.update=function(e){var t=e.scrollWidth>e.clientWidth+1,r=e.scrollHeight>e.clientHeight+1,n=e.nativeBarWidth;if(r){this.vert.style.display="block",this.vert.style.bottom=t?n+"px":"0";var i=e.viewHeight-(t?n:0);this.vert.firstChild.style.height=Math.max(0,e.scrollHeight-e.clientHeight+i)+"px"}else this.vert.style.display="",this.vert.firstChild.style.height="0";if(t){this.horiz.style.display="block",this.horiz.style.right=r?n+"px":"0",this.horiz.style.left=e.barLeft+"px";var o=e.viewWidth-e.barLeft-(r?n:0);this.horiz.firstChild.style.width=Math.max(0,e.scrollWidth-e.clientWidth+o)+"px"}else this.horiz.style.display="",this.horiz.firstChild.style.width="0";return!this.checkedZeroWidth&&e.clientHeight>0&&(0==n&&this.zeroWidthHack(),this.checkedZeroWidth=!0),{right:r?n:0,bottom:t?n:0}},Nn.prototype.setScrollLeft=function(e){this.horiz.scrollLeft!=e&&(this.horiz.scrollLeft=e),this.disableHoriz&&this.enableZeroWidthBar(this.horiz,this.disableHoriz)},Nn.prototype.setScrollTop=function(e){this.vert.scrollTop!=e&&(this.vert.scrollTop=e),this.disableVert&&this.enableZeroWidthBar(this.vert,this.disableVert)},Nn.prototype.zeroWidthHack=function(){var e=y&&!d?"12px":"18px";this.horiz.style.height=this.vert.style.width=e,this.horiz.style.pointerEvents=this.vert.style.pointerEvents="none",this.disableHoriz=new R,this.disableVert=new R},Nn.prototype.enableZeroWidthBar=function(e,t){e.style.pointerEvents="auto",t.set(1e3,function r(){var n=e.getBoundingClientRect();document.elementFromPoint(n.left+1,n.bottom-1)!=e?e.style.pointerEvents="none":t.set(1e3,r)})},Nn.prototype.clear=function(){var e=this.horiz.parentNode;e.removeChild(this.horiz),e.removeChild(this.vert)};var On=function(){};function Wn(e,t){t||(t=Mn(e));var r=e.display.barWidth,n=e.display.barHeight;An(e,t);for(var i=0;i<4&&r!=e.display.barWidth||n!=e.display.barHeight;i++)r!=e.display.barWidth&&e.options.lineWrapping&&mn(e),An(e,Mn(e)),r=e.display.barWidth,n=e.display.barHeight}function An(e,t){var r=e.display,n=r.scrollbars.update(t);r.sizer.style.paddingRight=(r.barWidth=n.right)+"px",r.sizer.style.paddingBottom=(r.barHeight=n.bottom)+"px",r.heightForcer.style.borderBottom=n.bottom+"px solid transparent",n.right&&n.bottom?(r.scrollbarFiller.style.display="block",r.scrollbarFiller.style.height=n.bottom+"px",r.scrollbarFiller.style.width=n.right+"px"):r.scrollbarFiller.style.display="",n.bottom&&e.options.coverGutterNextToScrollbar&&e.options.fixedGutter?(r.gutterFiller.style.display="block",r.gutterFiller.style.height=n.bottom+"px",r.gutterFiller.style.width=t.gutterWidth+"px"):r.gutterFiller.style.display=""}On.prototype.update=function(){return{bottom:0,right:0}},On.prototype.setScrollLeft=function(){},On.prototype.setScrollTop=function(){},On.prototype.clear=function(){};var Dn={native:Nn,null:On};function Hn(e){e.display.scrollbars&&(e.display.scrollbars.clear(),e.display.scrollbars.addClass&&k(e.display.wrapper,e.display.scrollbars.addClass)),e.display.scrollbars=new Dn[e.options.scrollbarStyle](function(t){e.display.wrapper.insertBefore(t,e.display.scrollbarFiller),nt(t,"mousedown",function(){e.state.focused&&setTimeout(function(){return e.display.input.focus()},0)}),t.setAttribute("cm-not-content","true")},function(t,r){"horizontal"==r?xn(e,t):wn(e,t)},e),e.display.scrollbars.addClass&&H(e.display.wrapper,e.display.scrollbars.addClass)}function Pn(e,t){var r=e.display,n=Qr(e.display);t.top<0&&(t.top=0);var i=e.curOp&&null!=e.curOp.scrollTop?e.curOp.scrollTop:r.scroller.scrollTop,o=Mr(e),l={};t.bottom-t.top>o&&(t.bottom=t.top+o);var s=e.doc.height+Sr(r),a=t.top<n,u=t.bottom>s-n;if(t.top<i)l.scrollTop=a?0:t.top;else if(t.bottom>i+o){var c=Math.min(t.top,(u?s:t.bottom)-o);c!=i&&(l.scrollTop=c)}var h=e.curOp&&null!=e.curOp.scrollLeft?e.curOp.scrollLeft:r.scroller.scrollLeft,f=kr(e)-(e.options.fixedGutter?r.gutters.offsetWidth:0),d=t.right-t.left>f;return d&&(t.right=t.left+f),t.left<10?l.scrollLeft=0:t.left<h?l.scrollLeft=Math.max(0,t.left-(d?0:10)):t.right>f+h-3&&(l.scrollLeft=t.right+(d?0:10)-f),l}function En(e,t,r){null==t&&null==r||In(e),null!=t&&(e.curOp.scrollLeft=(null==e.curOp.scrollLeft?e.doc.scrollLeft:e.curOp.scrollLeft)+t),null!=r&&(e.curOp.scrollTop=(null==e.curOp.scrollTop?e.doc.scrollTop:e.curOp.scrollTop)+r)}function Fn(e){In(e);var t=e.getCursor(),r=t,n=t;e.options.lineWrapping||(r=t.ch?ge(t.line,t.ch-1):t,n=ge(t.line,t.ch+1)),e.curOp.scrollToPos={from:r,to:n,margin:e.options.cursorScrollMargin}}function In(e){var t=e.curOp.scrollToPos;if(t){e.curOp.scrollToPos=null;var r=Xr(e,t.from),n=Xr(e,t.to),i=Pn(e,{left:Math.min(r.left,n.left),top:Math.min(r.top,n.top)-t.margin,right:Math.max(r.right,n.right),bottom:Math.max(r.bottom,n.bottom)+t.margin});e.scrollTo(i.scrollLeft,i.scrollTop)}}var zn=0;function Rn(e){var t;e.curOp={cm:e,viewChanged:!1,startHeight:e.doc.height,forceUpdate:!1,updateInput:null,typing:!1,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:!1,updateMaxLine:!1,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:!1,id:++zn},t=e.curOp,or?or.ops.push(t):t.ownsGroup=or={ops:[t],delayedCallbacks:[]}}function Bn(e){!function(e,t){var r=e.ownsGroup;if(r)try{!function(e){var t=e.delayedCallbacks,r=0;do{for(;r<t.length;r++)t[r].call(null);for(var n=0;n<e.ops.length;n++){var i=e.ops[n];if(i.cursorActivityHandlers)for(;i.cursorActivityCalled<i.cursorActivityHandlers.length;)i.cursorActivityHandlers[i.cursorActivityCalled++].call(null,i.cm)}}while(r<t.length)}(r)}finally{or=null,t(r)}}(e.curOp,function(e){for(var t=0;t<e.ops.length;t++)e.ops[t].cm.curOp=null;!function(e){for(var t=e.ops,r=0;r<t.length;r++)Gn(t[r]);for(var n=0;n<t.length;n++)(i=t[n]).updatedDisplay=i.mustUpdate&&ni(i.cm,i.update);var i;for(var o=0;o<t.length;o++)Un(t[o]);for(var l=0;l<t.length;l++)Vn(t[l]);for(var s=0;s<t.length;s++)Kn(t[s])}(e)})}function Gn(e){var t=e.cm,r=t.display;!function(e){var t=e.display;!t.scrollbarsClipped&&t.scroller.offsetWidth&&(t.nativeBarWidth=t.scroller.offsetWidth-t.scroller.clientWidth,t.heightForcer.style.height=Tr(e)+"px",t.sizer.style.marginBottom=-t.nativeBarWidth+"px",t.sizer.style.borderRightWidth=Tr(e)+"px",t.scrollbarsClipped=!0)}(t),e.updateMaxLine&&Ye(t),e.mustUpdate=e.viewChanged||e.forceUpdate||null!=e.scrollTop||e.scrollToPos&&(e.scrollToPos.from.line<r.viewFrom||e.scrollToPos.to.line>=r.viewTo)||r.maxLineChanged&&t.options.lineWrapping,e.update=e.mustUpdate&&new ri(t,e.mustUpdate&&{top:e.scrollTop,ensure:e.scrollToPos},e.forceUpdate)}function Un(e){var t=e.cm,r=t.display;e.updatedDisplay&&mn(t),e.barMeasure=Mn(t),r.maxLineChanged&&!t.options.lineWrapping&&(e.adjustWidthTo=Or(t,r.maxLine,r.maxLine.text.length).left+3,t.display.sizerWidth=e.adjustWidthTo,e.barMeasure.scrollWidth=Math.max(r.scroller.clientWidth,r.sizer.offsetLeft+e.adjustWidthTo+Tr(t)+t.display.barWidth),e.maxScrollLeft=Math.max(0,r.sizer.offsetLeft+e.adjustWidthTo-kr(t))),(e.updatedDisplay||e.selectionChanged)&&(e.preparedSelection=r.input.prepareSelection(e.focus))}function Vn(e){var t=e.cm;null!=e.adjustWidthTo&&(t.display.sizer.style.minWidth=e.adjustWidthTo+"px",e.maxScrollLeft<t.doc.scrollLeft&&xn(t,Math.min(t.display.scroller.scrollLeft,e.maxScrollLeft),!0),t.display.maxLineChanged=!1);var r=e.focus&&e.focus==D()&&(!document.hasFocus||document.hasFocus());e.preparedSelection&&t.display.input.showSelection(e.preparedSelection,r),(e.updatedDisplay||e.startHeight!=t.doc.height)&&Wn(t,e.barMeasure),e.updatedDisplay&&si(t,e.barMeasure),e.selectionChanged&&hn(t),t.state.focused&&e.updateInput&&t.display.input.reset(e.typing),r&&fn(e.cm)}function Kn(e){var t=e.cm,r=t.display,n=t.doc;(e.updatedDisplay&&ii(t,e.update),null==r.wheelStartX||null==e.scrollTop&&null==e.scrollLeft&&!e.scrollToPos||(r.wheelStartX=r.wheelStartY=null),null==e.scrollTop||r.scroller.scrollTop==e.scrollTop&&!e.forceScroll||(n.scrollTop=Math.max(0,Math.min(r.scroller.scrollHeight-r.scroller.clientHeight,e.scrollTop)),r.scrollbars.setScrollTop(n.scrollTop),r.scroller.scrollTop=n.scrollTop),null==e.scrollLeft||r.scroller.scrollLeft==e.scrollLeft&&!e.forceScroll||(n.scrollLeft=Math.max(0,Math.min(r.scroller.scrollWidth-r.scroller.clientWidth,e.scrollLeft)),r.scrollbars.setScrollLeft(n.scrollLeft),r.scroller.scrollLeft=n.scrollLeft,gn(t)),e.scrollToPos)&&function(e,t){if(!st(e,"scrollCursorIntoView")){var r=e.display,n=r.sizer.getBoundingClientRect(),i=null;if(t.top+n.top<0?i=!0:t.bottom+n.top>(window.innerHeight||document.documentElement.clientHeight)&&(i=!1),null!=i&&!p){var o=O("div","​",null,"position: absolute;\n                         top: "+(t.top-r.viewOffset-Cr(e.display))+"px;\n                         height: "+(t.bottom-t.top+Tr(e)+r.barHeight)+"px;\n                         left: "+t.left+"px; width: "+Math.max(2,t.right-t.left)+"px;");e.display.lineSpace.appendChild(o),o.scrollIntoView(i),e.display.lineSpace.removeChild(o)}}}(t,function(e,t,r,n){var i;null==n&&(n=0);for(var o=0;o<5;o++){var l=!1,s=jr(e,t),a=r&&r!=t?jr(e,r):s,u=Pn(e,i={left:Math.min(s.left,a.left),top:Math.min(s.top,a.top)-n,right:Math.max(s.left,a.left),bottom:Math.max(s.bottom,a.bottom)+n}),c=e.doc.scrollTop,h=e.doc.scrollLeft;if(null!=u.scrollTop&&(wn(e,u.scrollTop),Math.abs(e.doc.scrollTop-c)>1&&(l=!0)),null!=u.scrollLeft&&(xn(e,u.scrollLeft),Math.abs(e.doc.scrollLeft-h)>1&&(l=!0)),!l)break}return i}(t,Ce(n,e.scrollToPos.from),Ce(n,e.scrollToPos.to),e.scrollToPos.margin));var i=e.maybeHiddenMarkers,o=e.maybeUnhiddenMarkers;if(i)for(var l=0;l<i.length;++l)i[l].lines.length||lt(i[l],"hide");if(o)for(var s=0;s<o.length;++s)o[s].lines.length&&lt(o[s],"unhide");r.wrapper.offsetHeight&&(n.scrollTop=t.display.scroller.scrollTop),e.changeObjs&&lt(t,"changes",t,e.changeObjs),e.update&&e.update.finish()}function jn(e,t){if(e.curOp)return t();Rn(e);try{return t()}finally{Bn(e)}}function Xn(e,t){return function(){if(e.curOp)return t.apply(e,arguments);Rn(e);try{return t.apply(e,arguments)}finally{Bn(e)}}}function Yn(e){return function(){if(this.curOp)return e.apply(this,arguments);Rn(this);try{return e.apply(this,arguments)}finally{Bn(this)}}}function _n(e){return function(){var t=this.cm;if(!t||t.curOp)return e.apply(this,arguments);Rn(t);try{return e.apply(this,arguments)}finally{Bn(t)}}}function $n(e,t,r,n){null==t&&(t=e.doc.first),null==r&&(r=e.doc.first+e.doc.size),n||(n=0);var i=e.display;if(n&&r<i.viewTo&&(null==i.updateLineNumbers||i.updateLineNumbers>t)&&(i.updateLineNumbers=t),e.curOp.viewChanged=!0,t>=i.viewTo)Te&&Ge(e.doc,t)<i.viewTo&&Zn(e);else if(r<=i.viewFrom)Te&&Ue(e.doc,r+n)>i.viewFrom?Zn(e):(i.viewFrom+=n,i.viewTo+=n);else if(t<=i.viewFrom&&r>=i.viewTo)Zn(e);else if(t<=i.viewFrom){var o=Qn(e,r,r+n,1);o?(i.view=i.view.slice(o.index),i.viewFrom=o.lineN,i.viewTo+=n):Zn(e)}else if(r>=i.viewTo){var l=Qn(e,t,t,-1);l?(i.view=i.view.slice(0,l.index),i.viewTo=l.lineN):Zn(e)}else{var s=Qn(e,t,t,-1),a=Qn(e,r,r+n,1);s&&a?(i.view=i.view.slice(0,s.index).concat(ir(e,s.lineN,a.lineN)).concat(i.view.slice(a.index)),i.viewTo+=n):Zn(e)}var u=i.externalMeasured;u&&(r<u.lineN?u.lineN+=n:t<u.lineN+u.size&&(i.externalMeasured=null))}function qn(e,t,r){e.curOp.viewChanged=!0;var n=e.display,i=e.display.externalMeasured;if(i&&t>=i.lineN&&t<i.lineN+i.size&&(n.externalMeasured=null),!(t<n.viewFrom||t>=n.viewTo)){var o=n.view[ln(e,t)];if(null!=o.node){var l=o.changes||(o.changes=[]);-1==B(l,r)&&l.push(r)}}}function Zn(e){e.display.viewFrom=e.display.viewTo=e.doc.first,e.display.view=[],e.display.viewOffset=0}function Qn(e,t,r,n){var i,o=ln(e,t),l=e.display.view;if(!Te||r==e.doc.first+e.doc.size)return{index:o,lineN:r};for(var s=e.display.viewFrom,a=0;a<o;a++)s+=l[a].size;if(s!=t){if(n>0){if(o==l.length-1)return null;i=s+l[o].size-t,o++}else i=s-t;t+=i,r+=i}for(;Ge(e.doc,r)!=r;){if(o==(n<0?0:l.length-1))return null;r+=n*l[o-(n<0?1:0)].size,o+=n}return{index:o,lineN:r}}function Jn(e){for(var t=e.display.view,r=0,n=0;n<t.length;n++){var i=t[n];i.hidden||i.node&&!i.changes||++r}return r}function ei(e,t){e.doc.mode.startState&&e.doc.frontier<e.display.viewTo&&e.state.highlight.set(t,F(ti,e))}function ti(e){var t=e.doc;if(t.frontier<t.first&&(t.frontier=t.first),!(t.frontier>=e.display.viewTo)){var r=+new Date+e.options.workTime,n=Ht(t.mode,Rt(e,t.frontier)),i=[];t.iter(t.frontier,Math.min(t.first+t.size,e.display.viewTo+500),function(o){if(t.frontier>=e.display.viewFrom){var l=o.styles,s=o.text.length>e.options.maxHighlightLength,a=It(e,o,s?Ht(t.mode,n):n,!0);o.styles=a.styles;var u=o.styleClasses,c=a.classes;c?o.styleClasses=c:u&&(o.styleClasses=null);for(var h=!l||l.length!=o.styles.length||u!=c&&(!u||!c||u.bgClass!=c.bgClass||u.textClass!=c.textClass),f=0;!h&&f<l.length;++f)h=l[f]!=o.styles[f];h&&i.push(t.frontier),o.stateAfter=s?n:Ht(t.mode,n)}else o.text.length<=e.options.maxHighlightLength&&Bt(e,o.text,n),o.stateAfter=t.frontier%5==0?Ht(t.mode,n):null;if(++t.frontier,+new Date>r)return ei(e,e.options.workDelay),!0}),i.length&&jn(e,function(){for(var t=0;t<i.length;t++)qn(e,i[t],"text")})}}var ri=function(e,t,r){var n=e.display;this.viewport=t,this.visible=bn(n,e.doc,t),this.editorIsHidden=!n.wrapper.offsetWidth,this.wrapperHeight=n.wrapper.clientHeight,this.wrapperWidth=n.wrapper.clientWidth,this.oldDisplayWidth=kr(e),this.force=r,this.dims=en(e),this.events=[]};function ni(e,t){var r=e.display,n=e.doc;if(t.editorIsHidden)return Zn(e),!1;if(!t.force&&t.visible.from>=r.viewFrom&&t.visible.to<=r.viewTo&&(null==r.updateLineNumbers||r.updateLineNumbers>=r.viewTo)&&r.renderedView==r.view&&0==Jn(e))return!1;vn(e)&&(Zn(e),t.dims=en(e));var i=n.first+n.size,o=Math.max(t.visible.from-e.options.viewportMargin,n.first),l=Math.min(i,t.visible.to+e.options.viewportMargin);r.viewFrom<o&&o-r.viewFrom<20&&(o=Math.max(n.first,r.viewFrom)),r.viewTo>l&&r.viewTo-l<20&&(l=Math.min(i,r.viewTo)),Te&&(o=Ge(e.doc,o),l=Ue(e.doc,l));var s=o!=r.viewFrom||l!=r.viewTo||r.lastWrapHeight!=t.wrapperHeight||r.lastWrapWidth!=t.wrapperWidth;!function(e,t,r){var n=e.display;0==n.view.length||t>=n.viewTo||r<=n.viewFrom?(n.view=ir(e,t,r),n.viewFrom=t):(n.viewFrom>t?n.view=ir(e,t,n.viewFrom).concat(n.view):n.viewFrom<t&&(n.view=n.view.slice(ln(e,t))),n.viewFrom=t,n.viewTo<r?n.view=n.view.concat(ir(e,n.viewTo,r)):n.viewTo>r&&(n.view=n.view.slice(0,ln(e,r)))),n.viewTo=r}(e,o,l),r.viewOffset=je(se(e.doc,r.viewFrom)),e.display.mover.style.top=r.viewOffset+"px";var u=Jn(e);if(!s&&0==u&&!t.force&&r.renderedView==r.view&&(null==r.updateLineNumbers||r.updateLineNumbers>=r.viewTo))return!1;var c=D();return u>4&&(r.lineDiv.style.display="none"),function(e,t,r){var n=e.display,i=e.options.lineNumbers,o=n.lineDiv,l=o.firstChild;function s(t){var r=t.nextSibling;return a&&y&&e.display.currentWheelTarget==t?t.style.display="none":t.parentNode.removeChild(t),r}for(var u=n.view,c=n.viewFrom,h=0;h<u.length;h++){var f=u[h];if(f.hidden);else if(f.node&&f.node.parentNode==o){for(;l!=f.node;)l=s(l);var d=i&&null!=t&&t<=c&&f.lineNumber;f.changes&&(B(f.changes,"gutter")>-1&&(d=!1),ur(e,f,c,r)),d&&(M(f.lineNumber),f.lineNumber.appendChild(document.createTextNode(pe(e.options,c)))),l=f.node.nextSibling}else{var p=vr(e,f,c,r);o.insertBefore(p,l)}c+=f.size}for(;l;)l=s(l)}(e,r.updateLineNumbers,t.dims),u>4&&(r.lineDiv.style.display=""),r.renderedView=r.view,c&&D()!=c&&c.offsetHeight&&c.focus(),M(r.cursorDiv),M(r.selectionDiv),r.gutters.style.height=r.sizer.style.minHeight=0,s&&(r.lastWrapHeight=t.wrapperHeight,r.lastWrapWidth=t.wrapperWidth,ei(e,400)),r.updateLineNumbers=null,!0}function ii(e,t){for(var r=t.viewport,n=!0;(n&&e.options.lineWrapping&&t.oldDisplayWidth!=kr(e)||(r&&null!=r.top&&(r={top:Math.min(e.doc.height+Sr(e.display)-Mr(e),r.top)}),t.visible=bn(e.display,e.doc,r),!(t.visible.from>=e.display.viewFrom&&t.visible.to<=e.display.viewTo)))&&ni(e,t);n=!1){mn(e);var i=Mn(e);sn(e),Wn(e,i),si(e,i)}t.signal(e,"update",e),e.display.viewFrom==e.display.reportedViewFrom&&e.display.viewTo==e.display.reportedViewTo||(t.signal(e,"viewportChange",e,e.display.viewFrom,e.display.viewTo),e.display.reportedViewFrom=e.display.viewFrom,e.display.reportedViewTo=e.display.viewTo)}function oi(e,t){var r=new ri(e,t);if(ni(e,r)){mn(e),ii(e,r);var n=Mn(e);sn(e),Wn(e,n),si(e,n),r.finish()}}function li(e){var t=e.display.gutters.offsetWidth;e.display.sizer.style.marginLeft=t+"px"}function si(e,t){e.display.sizer.style.minHeight=t.docHeight+"px",e.display.heightForcer.style.top=t.docHeight+"px",e.display.gutters.style.height=t.docHeight+e.display.barHeight+Tr(e)+"px"}function ai(e){var t=e.display.gutters,r=e.options.gutters;M(t);for(var n=0;n<r.length;++n){var i=r[n],o=t.appendChild(O("div",null,"CodeMirror-gutter "+i));"CodeMirror-linenumbers"==i&&(e.display.lineGutter=o,o.style.width=(e.display.lineNumWidth||1)+"px")}t.style.display=n?"":"none",li(e)}function ui(e){var t=B(e.gutters,"CodeMirror-linenumbers");-1==t&&e.lineNumbers?e.gutters=e.gutters.concat(["CodeMirror-linenumbers"]):t>-1&&!e.lineNumbers&&(e.gutters=e.gutters.slice(0),e.gutters.splice(t,1))}ri.prototype.signal=function(e,t){ut(e,t)&&this.events.push(arguments)},ri.prototype.finish=function(){for(var e=0;e<this.events.length;e++)lt.apply(null,this.events[e])};var ci=function(e,t){this.ranges=e,this.primIndex=t};ci.prototype.primary=function(){return this.ranges[this.primIndex]},ci.prototype.equals=function(e){if(e==this)return!0;if(e.primIndex!=this.primIndex||e.ranges.length!=this.ranges.length)return!1;for(var t=0;t<this.ranges.length;t++){var r=this.ranges[t],n=e.ranges[t];if(!me(r.anchor,n.anchor)||!me(r.head,n.head))return!1}return!0},ci.prototype.deepCopy=function(){for(var e=[],t=0;t<this.ranges.length;t++)e[t]=new hi(ye(this.ranges[t].anchor),ye(this.ranges[t].head));return new ci(e,this.primIndex)},ci.prototype.somethingSelected=function(){for(var e=0;e<this.ranges.length;e++)if(!this.ranges[e].empty())return!0;return!1},ci.prototype.contains=function(e,t){t||(t=e);for(var r=0;r<this.ranges.length;r++){var n=this.ranges[r];if(ve(t,n.from())>=0&&ve(e,n.to())<=0)return r}return-1};var hi=function(e,t){this.anchor=e,this.head=t};function fi(e,t){var r=e[t];e.sort(function(e,t){return ve(e.from(),t.from())}),t=B(e,r);for(var n=1;n<e.length;n++){var i=e[n],o=e[n-1];if(ve(o.to(),i.from())>=0){var l=we(o.from(),i.from()),s=be(o.to(),i.to()),a=o.empty()?i.from()==i.head:o.from()==o.head;n<=t&&--t,e.splice(--n,2,new hi(a?s:l,a?l:s))}}return new ci(e,t)}function di(e,t){return new ci([new hi(e,t||e)],0)}function pi(e){return e.text?ge(e.from.line+e.text.length-1,$(e.text).length+(1==e.text.length?e.from.ch:0)):e.to}function gi(e,t){if(ve(e,t.from)<0)return e;if(ve(e,t.to)<=0)return pi(t);var r=e.line+t.text.length-(t.to.line-t.from.line)-1,n=e.ch;return e.line==t.to.line&&(n+=pi(t).ch-t.to.ch),ge(r,n)}function vi(e,t){for(var r=[],n=0;n<e.sel.ranges.length;n++){var i=e.sel.ranges[n];r.push(new hi(gi(i.anchor,t),gi(i.head,t)))}return fi(r,e.sel.primIndex)}function mi(e,t,r){return e.line==t.line?ge(r.line,e.ch-t.ch+r.ch):ge(r.line+(e.line-t.line),e.ch)}function yi(e){e.doc.mode=Wt(e.options,e.doc.modeOption),bi(e)}function bi(e){e.doc.iter(function(e){e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null)}),e.doc.frontier=e.doc.first,ei(e,100),e.state.modeGen++,e.curOp&&$n(e)}function wi(e,t){return 0==t.from.ch&&0==t.to.ch&&""==$(t.text)&&(!e.cm||e.cm.options.wholeLineUpdateBefore)}function xi(e,t,r,n){function i(e){return r?r[e]:null}function o(e,r,i){!function(e,t,r,n){e.text=t,e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null),null!=e.order&&(e.order=null),Ae(e),De(e,r);var i=n?n(e):1;i!=e.height&&ce(e,i)}(e,r,i,n),sr(e,"change",e,t)}function l(e,t){for(var r=[],o=e;o<t;++o)r.push(new Xt(u[o],i(o),n));return r}var s=t.from,a=t.to,u=t.text,c=se(e,s.line),h=se(e,a.line),f=$(u),d=i(u.length-1),p=a.line-s.line;if(t.full)e.insert(0,l(0,u.length)),e.remove(u.length,e.size-u.length);else if(wi(e,t)){var g=l(0,u.length-1);o(h,h.text,d),p&&e.remove(s.line,p),g.length&&e.insert(s.line,g)}else if(c==h)if(1==u.length)o(c,c.text.slice(0,s.ch)+f+c.text.slice(a.ch),d);else{var v=l(1,u.length-1);v.push(new Xt(f+c.text.slice(a.ch),d,n)),o(c,c.text.slice(0,s.ch)+u[0],i(0)),e.insert(s.line+1,v)}else if(1==u.length)o(c,c.text.slice(0,s.ch)+u[0]+h.text.slice(a.ch),i(0)),e.remove(s.line+1,p);else{o(c,c.text.slice(0,s.ch)+u[0],i(0)),o(h,f+h.text.slice(a.ch),d);var m=l(1,u.length-1);p>1&&e.remove(s.line+1,p-1),e.insert(s.line+1,m)}sr(e,"change",e,t)}function Ci(e,t,r){!function e(n,i,o){if(n.linked)for(var l=0;l<n.linked.length;++l){var s=n.linked[l];if(s.doc!=i){var a=o&&s.sharedHist;r&&!a||(t(s.doc,a),e(s.doc,n,a))}}}(e,null,!0)}function Si(e,t){if(t.cm)throw new Error("This document is already in use.");e.doc=t,t.cm=e,nn(e),yi(e),Li(e),e.options.lineWrapping||Ye(e),e.options.mode=t.modeOption,$n(e)}function Li(e){("rtl"==e.doc.direction?H:k)(e.display.lineDiv,"CodeMirror-rtl")}function Ti(e){this.done=[],this.undone=[],this.undoDepth=1/0,this.lastModTime=this.lastSelTime=0,this.lastOp=this.lastSelOp=null,this.lastOrigin=this.lastSelOrigin=null,this.generation=this.maxGeneration=e||1}function ki(e,t){var r={from:ye(t.from),to:pi(t),text:ae(e,t.from,t.to)};return Ai(e,r,t.from.line,t.to.line+1),Ci(e,function(e){return Ai(e,r,t.from.line,t.to.line+1)},!0),r}function Mi(e){for(;e.length;){if(!$(e).ranges)break;e.pop()}}function Ni(e,t,r,n){var i=e.history;i.undone.length=0;var o,l,s=+new Date;if((i.lastOp==n||i.lastOrigin==t.origin&&t.origin&&("+"==t.origin.charAt(0)&&e.cm&&i.lastModTime>s-e.cm.options.historyEventDelay||"*"==t.origin.charAt(0)))&&(o=function(e,t){return t?(Mi(e.done),$(e.done)):e.done.length&&!$(e.done).ranges?$(e.done):e.done.length>1&&!e.done[e.done.length-2].ranges?(e.done.pop(),$(e.done)):void 0}(i,i.lastOp==n)))l=$(o.changes),0==ve(t.from,t.to)&&0==ve(t.from,l.to)?l.to=pi(t):o.changes.push(ki(e,t));else{var a=$(i.done);for(a&&a.ranges||Wi(e.sel,i.done),o={changes:[ki(e,t)],generation:i.generation},i.done.push(o);i.done.length>i.undoDepth;)i.done.shift(),i.done[0].ranges||i.done.shift()}i.done.push(r),i.generation=++i.maxGeneration,i.lastModTime=i.lastSelTime=s,i.lastOp=i.lastSelOp=n,i.lastOrigin=i.lastSelOrigin=t.origin,l||lt(e,"historyAdded")}function Oi(e,t,r,n){var i=e.history,o=n&&n.origin;r==i.lastSelOp||o&&i.lastSelOrigin==o&&(i.lastModTime==i.lastSelTime&&i.lastOrigin==o||function(e,t,r,n){var i=t.charAt(0);return"*"==i||"+"==i&&r.ranges.length==n.ranges.length&&r.somethingSelected()==n.somethingSelected()&&new Date-e.history.lastSelTime<=(e.cm?e.cm.options.historyEventDelay:500)}(e,o,$(i.done),t))?i.done[i.done.length-1]=t:Wi(t,i.done),i.lastSelTime=+new Date,i.lastSelOrigin=o,i.lastSelOp=r,n&&!1!==n.clearRedo&&Mi(i.undone)}function Wi(e,t){var r=$(t);r&&r.ranges&&r.equals(e)||t.push(e)}function Ai(e,t,r,n){var i=t["spans_"+e.id],o=0;e.iter(Math.max(e.first,r),Math.min(e.first+e.size,n),function(r){r.markedSpans&&((i||(i=t["spans_"+e.id]={}))[o]=r.markedSpans),++o})}function Di(e){if(!e)return null;for(var t,r=0;r<e.length;++r)e[r].marker.explicitlyCleared?t||(t=e.slice(0,r)):t&&t.push(e[r]);return t?t.length?t:null:e}function Hi(e,t){var r=function(e,t){var r=t["spans_"+e.id];if(!r)return null;for(var n=[],i=0;i<t.text.length;++i)n.push(Di(r[i]));return n}(e,t),n=Oe(e,t);if(!r)return n;if(!n)return r;for(var i=0;i<r.length;++i){var o=r[i],l=n[i];if(o&&l)e:for(var s=0;s<l.length;++s){for(var a=l[s],u=0;u<o.length;++u)if(o[u].marker==a.marker)continue e;o.push(a)}else l&&(r[i]=l)}return r}function Pi(e,t,r){for(var n=[],i=0;i<e.length;++i){var o=e[i];if(o.ranges)n.push(r?ci.prototype.deepCopy.call(o):o);else{var l=o.changes,s=[];n.push({changes:s});for(var a=0;a<l.length;++a){var u=l[a],c=void 0;if(s.push({from:u.from,to:u.to,text:u.text}),t)for(var h in u)(c=h.match(/^spans_(\d+)$/))&&B(t,Number(c[1]))>-1&&($(s)[h]=u[h],delete u[h])}}}return n}function Ei(e,t,r,n){if(e.cm&&e.cm.display.shift||e.extend){var i=t.anchor;if(n){var o=ve(r,i)<0;o!=ve(n,i)<0?(i=r,r=n):o!=ve(r,n)<0&&(r=n)}return new hi(i,r)}return new hi(n||r,r)}function Fi(e,t,r,n){Gi(e,new ci([Ei(e,e.sel.primary(),t,r)],0),n)}function Ii(e,t,r){for(var n=[],i=0;i<e.sel.ranges.length;i++)n[i]=Ei(e,e.sel.ranges[i],t[i],null);Gi(e,fi(n,e.sel.primIndex),r)}function zi(e,t,r,n){var i=e.sel.ranges.slice(0);i[t]=r,Gi(e,fi(i,e.sel.primIndex),n)}function Ri(e,t,r,n){Gi(e,di(t,r),n)}function Bi(e,t,r){var n=e.history.done,i=$(n);i&&i.ranges?(n[n.length-1]=t,Ui(e,t,r)):Gi(e,t,r)}function Gi(e,t,r){Ui(e,t,r),Oi(e,e.sel,e.cm?e.cm.curOp.id:NaN,r)}function Ui(e,t,r){(ut(e,"beforeSelectionChange")||e.cm&&ut(e.cm,"beforeSelectionChange"))&&(t=function(e,t,r){var n={ranges:t.ranges,update:function(t){this.ranges=[];for(var r=0;r<t.length;r++)this.ranges[r]=new hi(Ce(e,t[r].anchor),Ce(e,t[r].head))},origin:r&&r.origin};return lt(e,"beforeSelectionChange",e,n),e.cm&&lt(e.cm,"beforeSelectionChange",e.cm,n),n.ranges!=t.ranges?fi(n.ranges,n.ranges.length-1):t}(e,t,r)),Vi(e,ji(e,t,r&&r.bias||(ve(t.primary().head,e.sel.primary().head)<0?-1:1),!0)),r&&!1===r.scroll||!e.cm||Fn(e.cm)}function Vi(e,t){t.equals(e.sel)||(e.sel=t,e.cm&&(e.cm.curOp.updateInput=e.cm.curOp.selectionChanged=!0,at(e.cm)),sr(e,"cursorActivity",e))}function Ki(e){Vi(e,ji(e,e.sel,null,!1))}function ji(e,t,r,n){for(var i,o=0;o<t.ranges.length;o++){var l=t.ranges[o],s=t.ranges.length==e.sel.ranges.length&&e.sel.ranges[o],a=Yi(e,l.anchor,s&&s.anchor,r,n),u=Yi(e,l.head,s&&s.head,r,n);(i||a!=l.anchor||u!=l.head)&&(i||(i=t.ranges.slice(0,o)),i[o]=new hi(a,u))}return i?fi(i,t.primIndex):t}function Xi(e,t,r,n,i){var o=se(e,t.line);if(o.markedSpans)for(var l=0;l<o.markedSpans.length;++l){var s=o.markedSpans[l],a=s.marker;if((null==s.from||(a.inclusiveLeft?s.from<=t.ch:s.from<t.ch))&&(null==s.to||(a.inclusiveRight?s.to>=t.ch:s.to>t.ch))){if(i&&(lt(a,"beforeCursorEnter"),a.explicitlyCleared)){if(o.markedSpans){--l;continue}break}if(!a.atomic)continue;if(r){var u=a.find(n<0?1:-1),c=void 0;if((n<0?a.inclusiveRight:a.inclusiveLeft)&&(u=_i(e,u,-n,u&&u.line==t.line?o:null)),u&&u.line==t.line&&(c=ve(u,r))&&(n<0?c<0:c>0))return Xi(e,u,t,n,i)}var h=a.find(n<0?-1:1);return(n<0?a.inclusiveLeft:a.inclusiveRight)&&(h=_i(e,h,n,h.line==t.line?o:null)),h?Xi(e,h,t,n,i):null}}return t}function Yi(e,t,r,n,i){var o=n||1,l=Xi(e,t,r,o,i)||!i&&Xi(e,t,r,o,!0)||Xi(e,t,r,-o,i)||!i&&Xi(e,t,r,-o,!0);return l||(e.cantEdit=!0,ge(e.first,0))}function _i(e,t,r,n){return r<0&&0==t.ch?t.line>e.first?Ce(e,ge(t.line-1)):null:r>0&&t.ch==(n||se(e,t.line)).text.length?t.line<e.first+e.size-1?ge(t.line+1,0):null:new ge(t.line,t.ch+r)}function $i(e){e.setSelection(ge(e.firstLine(),0),ge(e.lastLine()),V)}function qi(e,t,r){var n={canceled:!1,from:t.from,to:t.to,text:t.text,origin:t.origin,cancel:function(){return n.canceled=!0}};return r&&(n.update=function(t,r,i,o){t&&(n.from=Ce(e,t)),r&&(n.to=Ce(e,r)),i&&(n.text=i),void 0!==o&&(n.origin=o)}),lt(e,"beforeChange",e,n),e.cm&&lt(e.cm,"beforeChange",e.cm,n),n.canceled?null:{from:n.from,to:n.to,text:n.text,origin:n.origin}}function Zi(e,t,r){if(e.cm){if(!e.cm.curOp)return Xn(e.cm,Zi)(e,t,r);if(e.cm.state.suppressEdits)return}if(!(ut(e,"beforeChange")||e.cm&&ut(e.cm,"beforeChange"))||(t=qi(e,t,!0))){var n=Le&&!r&&function(e,t,r){var n=null;if(e.iter(t.line,r.line+1,function(e){if(e.markedSpans)for(var t=0;t<e.markedSpans.length;++t){var r=e.markedSpans[t].marker;!r.readOnly||n&&-1!=B(n,r)||(n||(n=[])).push(r)}}),!n)return null;for(var i=[{from:t,to:r}],o=0;o<n.length;++o)for(var l=n[o],s=l.find(0),a=0;a<i.length;++a){var u=i[a];if(!(ve(u.to,s.from)<0||ve(u.from,s.to)>0)){var c=[a,1],h=ve(u.from,s.from),f=ve(u.to,s.to);(h<0||!l.inclusiveLeft&&!h)&&c.push({from:u.from,to:s.from}),(f>0||!l.inclusiveRight&&!f)&&c.push({from:s.to,to:u.to}),i.splice.apply(i,c),a+=c.length-3}}return i}(e,t.from,t.to);if(n)for(var i=n.length-1;i>=0;--i)Qi(e,{from:n[i].from,to:n[i].to,text:i?[""]:t.text});else Qi(e,t)}}function Qi(e,t){if(1!=t.text.length||""!=t.text[0]||0!=ve(t.from,t.to)){var r=vi(e,t);Ni(e,t,r,e.cm?e.cm.curOp.id:NaN),to(e,t,r,Oe(e,t));var n=[];Ci(e,function(e,r){r||-1!=B(n,e.history)||(oo(e.history,t),n.push(e.history)),to(e,t,null,Oe(e,t))})}}function Ji(e,t,r){if(!e.cm||!e.cm.state.suppressEdits||r){for(var n,i=e.history,o=e.sel,l="undo"==t?i.done:i.undone,s="undo"==t?i.undone:i.done,a=0;a<l.length&&(n=l[a],r?!n.ranges||n.equals(e.sel):n.ranges);a++);if(a!=l.length){for(i.lastOrigin=i.lastSelOrigin=null;(n=l.pop()).ranges;){if(Wi(n,s),r&&!n.equals(e.sel))return void Gi(e,n,{clearRedo:!1});o=n}var u=[];Wi(o,s),s.push({changes:u,generation:i.generation}),i.generation=n.generation||++i.maxGeneration;for(var c=ut(e,"beforeChange")||e.cm&&ut(e.cm,"beforeChange"),h=function(r){var i=n.changes[r];if(i.origin=t,c&&!qi(e,i,!1))return l.length=0,{};u.push(ki(e,i));var o=r?vi(e,i):$(l);to(e,i,o,Hi(e,i)),!r&&e.cm&&e.cm.scrollIntoView({from:i.from,to:pi(i)});var s=[];Ci(e,function(e,t){t||-1!=B(s,e.history)||(oo(e.history,i),s.push(e.history)),to(e,i,null,Hi(e,i))})},f=n.changes.length-1;f>=0;--f){var d=h(f);if(d)return d.v}}}}function eo(e,t){if(0!=t&&(e.first+=t,e.sel=new ci(q(e.sel.ranges,function(e){return new hi(ge(e.anchor.line+t,e.anchor.ch),ge(e.head.line+t,e.head.ch))}),e.sel.primIndex),e.cm)){$n(e.cm,e.first,e.first-t,t);for(var r=e.cm.display,n=r.viewFrom;n<r.viewTo;n++)qn(e.cm,n,"gutter")}}function to(e,t,r,n){if(e.cm&&!e.cm.curOp)return Xn(e.cm,to)(e,t,r,n);if(t.to.line<e.first)eo(e,t.text.length-1-(t.to.line-t.from.line));else if(!(t.from.line>e.lastLine())){if(t.from.line<e.first){var i=t.text.length-1-(e.first-t.from.line);eo(e,i),t={from:ge(e.first,0),to:ge(t.to.line+i,t.to.ch),text:[$(t.text)],origin:t.origin}}var o=e.lastLine();t.to.line>o&&(t={from:t.from,to:ge(o,se(e,o).text.length),text:[t.text[0]],origin:t.origin}),t.removed=ae(e,t.from,t.to),r||(r=vi(e,t)),e.cm?function(e,t,r){var n=e.doc,i=e.display,o=t.from,l=t.to,s=!1,a=o.line;e.options.lineWrapping||(a=he(Be(se(n,o.line))),n.iter(a,l.line+1,function(e){if(e==i.maxLine)return s=!0,!0}));n.sel.contains(t.from,t.to)>-1&&at(e);xi(n,t,r,rn(e)),e.options.lineWrapping||(n.iter(a,o.line+t.text.length,function(e){var t=Xe(e);t>i.maxLineLength&&(i.maxLine=e,i.maxLineLength=t,i.maxLineChanged=!0,s=!1)}),s&&(e.curOp.updateMaxLine=!0));n.frontier=Math.min(n.frontier,o.line),ei(e,400);var u=t.text.length-(l.line-o.line)-1;t.full?$n(e):o.line!=l.line||1!=t.text.length||wi(e.doc,t)?$n(e,o.line,l.line+1,u):qn(e,o.line,"text");var c=ut(e,"changes"),h=ut(e,"change");if(h||c){var f={from:o,to:l,text:t.text,removed:t.removed,origin:t.origin};h&&sr(e,"change",e,f),c&&(e.curOp.changeObjs||(e.curOp.changeObjs=[])).push(f)}e.display.selForContextMenu=null}(e.cm,t,n):xi(e,t,n),Ui(e,r,V)}}function ro(e,t,r,n,i){if(n||(n=r),ve(n,r)<0){var o=n;n=r,r=o}"string"==typeof t&&(t=e.splitLines(t)),Zi(e,{from:r,to:n,text:t,origin:i})}function no(e,t,r,n){r<e.line?e.line+=n:t<e.line&&(e.line=t,e.ch=0)}function io(e,t,r,n){for(var i=0;i<e.length;++i){var o=e[i],l=!0;if(o.ranges){o.copied||((o=e[i]=o.deepCopy()).copied=!0);for(var s=0;s<o.ranges.length;s++)no(o.ranges[s].anchor,t,r,n),no(o.ranges[s].head,t,r,n)}else{for(var a=0;a<o.changes.length;++a){var u=o.changes[a];if(r<u.from.line)u.from=ge(u.from.line+n,u.from.ch),u.to=ge(u.to.line+n,u.to.ch);else if(t<=u.to.line){l=!1;break}}l||(e.splice(0,i+1),i=0)}}}function oo(e,t){var r=t.from.line,n=t.to.line,i=t.text.length-(n-r)-1;io(e.done,r,n,i),io(e.undone,r,n,i)}function lo(e,t,r,n){var i=t,o=t;return"number"==typeof t?o=se(e,xe(e,t)):i=he(t),null==i?null:(n(o,i)&&e.cm&&qn(e.cm,i,r),o)}hi.prototype.from=function(){return we(this.anchor,this.head)},hi.prototype.to=function(){return be(this.anchor,this.head)},hi.prototype.empty=function(){return this.head.line==this.anchor.line&&this.head.ch==this.anchor.ch};var so=function(e){this.lines=e,this.parent=null;for(var t=0,r=0;r<e.length;++r)e[r].parent=this,t+=e[r].height;this.height=t};so.prototype.chunkSize=function(){return this.lines.length},so.prototype.removeInner=function(e,t){for(var r=e,n=e+t;r<n;++r){var i=this.lines[r];this.height-=i.height,Yt(i),sr(i,"delete")}this.lines.splice(e,t)},so.prototype.collapse=function(e){e.push.apply(e,this.lines)},so.prototype.insertInner=function(e,t,r){this.height+=r,this.lines=this.lines.slice(0,e).concat(t).concat(this.lines.slice(e));for(var n=0;n<t.length;++n)t[n].parent=this},so.prototype.iterN=function(e,t,r){for(var n=e+t;e<n;++e)if(r(this.lines[e]))return!0};var ao=function(e){this.children=e;for(var t=0,r=0,n=0;n<e.length;++n){var i=e[n];t+=i.chunkSize(),r+=i.height,i.parent=this}this.size=t,this.height=r,this.parent=null};ao.prototype.chunkSize=function(){return this.size},ao.prototype.removeInner=function(e,t){this.size-=t;for(var r=0;r<this.children.length;++r){var n=this.children[r],i=n.chunkSize();if(e<i){var o=Math.min(t,i-e),l=n.height;if(n.removeInner(e,o),this.height-=l-n.height,i==o&&(this.children.splice(r--,1),n.parent=null),0==(t-=o))break;e=0}else e-=i}if(this.size-t<25&&(this.children.length>1||!(this.children[0]instanceof so))){var s=[];this.collapse(s),this.children=[new so(s)],this.children[0].parent=this}},ao.prototype.collapse=function(e){for(var t=0;t<this.children.length;++t)this.children[t].collapse(e)},ao.prototype.insertInner=function(e,t,r){this.size+=t.length,this.height+=r;for(var n=0;n<this.children.length;++n){var i=this.children[n],o=i.chunkSize();if(e<=o){if(i.insertInner(e,t,r),i.lines&&i.lines.length>50){for(var l=i.lines.length%25+25,s=l;s<i.lines.length;){var a=new so(i.lines.slice(s,s+=25));i.height-=a.height,this.children.splice(++n,0,a),a.parent=this}i.lines=i.lines.slice(0,l),this.maybeSpill()}break}e-=o}},ao.prototype.maybeSpill=function(){if(!(this.children.length<=10)){var e=this;do{var t=e.children.splice(e.children.length-5,5),r=new ao(t);if(e.parent){e.size-=r.size,e.height-=r.height;var n=B(e.parent.children,e);e.parent.children.splice(n+1,0,r)}else{var i=new ao(e.children);i.parent=e,e.children=[i,r],e=i}r.parent=e.parent}while(e.children.length>10);e.parent.maybeSpill()}},ao.prototype.iterN=function(e,t,r){for(var n=0;n<this.children.length;++n){var i=this.children[n],o=i.chunkSize();if(e<o){var l=Math.min(t,o-e);if(i.iterN(e,l,r))return!0;if(0==(t-=l))break;e=0}else e-=o}};var uo=function(e,t,r){if(r)for(var n in r)r.hasOwnProperty(n)&&(this[n]=r[n]);this.doc=e,this.node=t};function co(e,t,r){je(t)<(e.curOp&&e.curOp.scrollTop||e.doc.scrollTop)&&En(e,null,r)}uo.prototype.clear=function(){var e=this.doc.cm,t=this.line.widgets,r=this.line,n=he(r);if(null!=n&&t){for(var i=0;i<t.length;++i)t[i]==this&&t.splice(i--,1);t.length||(r.widgets=null);var o=wr(this);ce(r,Math.max(0,r.height-o)),e&&(jn(e,function(){co(e,r,-o),qn(e,n,"widget")}),sr(e,"lineWidgetCleared",e,this,n))}},uo.prototype.changed=function(){var e=this,t=this.height,r=this.doc.cm,n=this.line;this.height=null;var i=wr(this)-t;i&&(ce(n,n.height+i),r&&jn(r,function(){r.curOp.forceUpdate=!0,co(r,n,i),sr(r,"lineWidgetChanged",r,e,he(n))}))},ct(uo);var ho=0,fo=function(e,t){this.lines=[],this.type=t,this.doc=e,this.id=++ho};function po(e,t,r,n,i){if(n&&n.shared)return function(e,t,r,n,i){(n=I(n)).shared=!1;var o=[po(e,t,r,n,i)],l=o[0],s=n.widgetNode;return Ci(e,function(e){s&&(n.widgetNode=s.cloneNode(!0)),o.push(po(e,Ce(e,t),Ce(e,r),n,i));for(var a=0;a<e.linked.length;++a)if(e.linked[a].isParent)return;l=$(o)}),new go(o,l)}(e,t,r,n,i);if(e.cm&&!e.cm.curOp)return Xn(e.cm,po)(e,t,r,n,i);var o=new fo(e,i),l=ve(t,r);if(n&&I(n,o,!1),l>0||0==l&&!1!==o.clearWhenEmpty)return o;if(o.replacedWith&&(o.collapsed=!0,o.widgetNode=W("span",[o.replacedWith],"CodeMirror-widget"),n.handleMouseEvents||o.widgetNode.setAttribute("cm-ignore-events","true"),n.insertLeft&&(o.widgetNode.insertLeft=!0)),o.collapsed){if(Re(e,t.line,t,r,o)||t.line!=r.line&&Re(e,r.line,t,r,o))throw new Error("Inserting collapsed marker partially overlapping an existing one");Te=!0}o.addToHistory&&Ni(e,{from:t,to:r,origin:"markText"},e.sel,NaN);var s,a=t.line,u=e.cm;if(e.iter(a,r.line+1,function(e){u&&o.collapsed&&!u.options.lineWrapping&&Be(e)==u.display.maxLine&&(s=!0),o.collapsed&&a!=t.line&&ce(e,0),function(e,t){e.markedSpans=e.markedSpans?e.markedSpans.concat([t]):[t],t.marker.attachLine(e)}(e,new ke(o,a==t.line?t.ch:null,a==r.line?r.ch:null)),++a}),o.collapsed&&e.iter(t.line,r.line+1,function(t){Ve(e,t)&&ce(t,0)}),o.clearOnEnter&&nt(o,"beforeCursorEnter",function(){return o.clear()}),o.readOnly&&(Le=!0,(e.history.done.length||e.history.undone.length)&&e.clearHistory()),o.collapsed&&(o.id=++ho,o.atomic=!0),u){if(s&&(u.curOp.updateMaxLine=!0),o.collapsed)$n(u,t.line,r.line+1);else if(o.className||o.title||o.startStyle||o.endStyle||o.css)for(var c=t.line;c<=r.line;c++)qn(u,c,"text");o.atomic&&Ki(u.doc),sr(u,"markerAdded",u,o)}return o}fo.prototype.clear=function(){if(!this.explicitlyCleared){var e=this.doc.cm,t=e&&!e.curOp;if(t&&Rn(e),ut(this,"clear")){var r=this.find();r&&sr(this,"clear",r.from,r.to)}for(var n=null,i=null,o=0;o<this.lines.length;++o){var l=this.lines[o],s=Me(l.markedSpans,this);e&&!this.collapsed?qn(e,he(l),"text"):e&&(null!=s.to&&(i=he(l)),null!=s.from&&(n=he(l))),l.markedSpans=Ne(l.markedSpans,s),null==s.from&&this.collapsed&&!Ve(this.doc,l)&&e&&ce(l,Qr(e.display))}if(e&&this.collapsed&&!e.options.lineWrapping)for(var a=0;a<this.lines.length;++a){var u=Be(this.lines[a]),c=Xe(u);c>e.display.maxLineLength&&(e.display.maxLine=u,e.display.maxLineLength=c,e.display.maxLineChanged=!0)}null!=n&&e&&this.collapsed&&$n(e,n,i+1),this.lines.length=0,this.explicitlyCleared=!0,this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,e&&Ki(e.doc)),e&&sr(e,"markerCleared",e,this,n,i),t&&Bn(e),this.parent&&this.parent.clear()}},fo.prototype.find=function(e,t){var r,n;null==e&&"bookmark"==this.type&&(e=1);for(var i=0;i<this.lines.length;++i){var o=this.lines[i],l=Me(o.markedSpans,this);if(null!=l.from&&(r=ge(t?o:he(o),l.from),-1==e))return r;if(null!=l.to&&(n=ge(t?o:he(o),l.to),1==e))return n}return r&&{from:r,to:n}},fo.prototype.changed=function(){var e=this,t=this.find(-1,!0),r=this,n=this.doc.cm;t&&n&&jn(n,function(){var i=t.line,o=he(t.line),l=Wr(n,o);if(l&&(Ir(l),n.curOp.selectionChanged=n.curOp.forceUpdate=!0),n.curOp.updateMaxLine=!0,!Ve(r.doc,i)&&null!=r.height){var s=r.height;r.height=null;var a=wr(r)-s;a&&ce(i,i.height+a)}sr(n,"markerChanged",n,e)})},fo.prototype.attachLine=function(e){if(!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp;t.maybeHiddenMarkers&&-1!=B(t.maybeHiddenMarkers,this)||(t.maybeUnhiddenMarkers||(t.maybeUnhiddenMarkers=[])).push(this)}this.lines.push(e)},fo.prototype.detachLine=function(e){if(this.lines.splice(B(this.lines,e),1),!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp;(t.maybeHiddenMarkers||(t.maybeHiddenMarkers=[])).push(this)}},ct(fo);var go=function(e,t){this.markers=e,this.primary=t;for(var r=0;r<e.length;++r)e[r].parent=this};function vo(e){return e.findMarks(ge(e.first,0),e.clipPos(ge(e.lastLine())),function(e){return e.parent})}function mo(e){for(var t=function(t){var r=e[t],n=[r.primary.doc];Ci(r.primary.doc,function(e){return n.push(e)});for(var i=0;i<r.markers.length;i++){var o=r.markers[i];-1==B(n,o.doc)&&(o.parent=null,r.markers.splice(i--,1))}},r=0;r<e.length;r++)t(r)}go.prototype.clear=function(){if(!this.explicitlyCleared){this.explicitlyCleared=!0;for(var e=0;e<this.markers.length;++e)this.markers[e].clear();sr(this,"clear")}},go.prototype.find=function(e,t){return this.primary.find(e,t)},ct(go);var yo=0,bo=function(e,t,r,n,i){if(!(this instanceof bo))return new bo(e,t,r,n,i);null==r&&(r=0),ao.call(this,[new so([new Xt("",null)])]),this.first=r,this.scrollTop=this.scrollLeft=0,this.cantEdit=!1,this.cleanGeneration=1,this.frontier=r;var o=ge(r,0);this.sel=di(o),this.history=new Ti(null),this.id=++yo,this.modeOption=t,this.lineSep=n,this.direction="rtl"==i?"rtl":"ltr",this.extend=!1,"string"==typeof e&&(e=this.splitLines(e)),xi(this,{from:o,to:o,text:e}),Gi(this,di(o),V)};bo.prototype=Q(ao.prototype,{constructor:bo,iter:function(e,t,r){r?this.iterN(e-this.first,t-e,r):this.iterN(this.first,this.first+this.size,e)},insert:function(e,t){for(var r=0,n=0;n<t.length;++n)r+=t[n].height;this.insertInner(e-this.first,t,r)},remove:function(e,t){this.removeInner(e-this.first,t)},getValue:function(e){var t=ue(this,this.first,this.first+this.size);return!1===e?t:t.join(e||this.lineSeparator())},setValue:_n(function(e){var t=ge(this.first,0),r=this.first+this.size-1;Zi(this,{from:t,to:ge(r,se(this,r).text.length),text:this.splitLines(e),origin:"setValue",full:!0},!0),Gi(this,di(t))}),replaceRange:function(e,t,r,n){ro(this,e,t=Ce(this,t),r=r?Ce(this,r):t,n)},getRange:function(e,t,r){var n=ae(this,Ce(this,e),Ce(this,t));return!1===r?n:n.join(r||this.lineSeparator())},getLine:function(e){var t=this.getLineHandle(e);return t&&t.text},getLineHandle:function(e){if(de(this,e))return se(this,e)},getLineNumber:function(e){return he(e)},getLineHandleVisualStart:function(e){return"number"==typeof e&&(e=se(this,e)),Be(e)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(e){return Ce(this,e)},getCursor:function(e){var t=this.sel.primary();return null==e||"head"==e?t.head:"anchor"==e?t.anchor:"end"==e||"to"==e||!1===e?t.to():t.from()},listSelections:function(){return this.sel.ranges},somethingSelected:function(){return this.sel.somethingSelected()},setCursor:_n(function(e,t,r){Ri(this,Ce(this,"number"==typeof e?ge(e,t||0):e),null,r)}),setSelection:_n(function(e,t,r){Ri(this,Ce(this,e),Ce(this,t||e),r)}),extendSelection:_n(function(e,t,r){Fi(this,Ce(this,e),t&&Ce(this,t),r)}),extendSelections:_n(function(e,t){Ii(this,Se(this,e),t)}),extendSelectionsBy:_n(function(e,t){Ii(this,Se(this,q(this.sel.ranges,e)),t)}),setSelections:_n(function(e,t,r){if(e.length){for(var n=[],i=0;i<e.length;i++)n[i]=new hi(Ce(this,e[i].anchor),Ce(this,e[i].head));null==t&&(t=Math.min(e.length-1,this.sel.primIndex)),Gi(this,fi(n,t),r)}}),addSelection:_n(function(e,t,r){var n=this.sel.ranges.slice(0);n.push(new hi(Ce(this,e),Ce(this,t||e))),Gi(this,fi(n,n.length-1),r)}),getSelection:function(e){for(var t,r=this.sel.ranges,n=0;n<r.length;n++){var i=ae(this,r[n].from(),r[n].to());t=t?t.concat(i):i}return!1===e?t:t.join(e||this.lineSeparator())},getSelections:function(e){for(var t=[],r=this.sel.ranges,n=0;n<r.length;n++){var i=ae(this,r[n].from(),r[n].to());!1!==e&&(i=i.join(e||this.lineSeparator())),t[n]=i}return t},replaceSelection:function(e,t,r){for(var n=[],i=0;i<this.sel.ranges.length;i++)n[i]=e;this.replaceSelections(n,t,r||"+input")},replaceSelections:_n(function(e,t,r){for(var n=[],i=this.sel,o=0;o<i.ranges.length;o++){var l=i.ranges[o];n[o]={from:l.from(),to:l.to(),text:this.splitLines(e[o]),origin:r}}for(var s=t&&"end"!=t&&function(e,t,r){for(var n=[],i=ge(e.first,0),o=i,l=0;l<t.length;l++){var s=t[l],a=mi(s.from,i,o),u=mi(pi(s),i,o);if(i=s.to,o=u,"around"==r){var c=e.sel.ranges[l],h=ve(c.head,c.anchor)<0;n[l]=new hi(h?u:a,h?a:u)}else n[l]=new hi(a,a)}return new ci(n,e.sel.primIndex)}(this,n,t),a=n.length-1;a>=0;a--)Zi(this,n[a]);s?Bi(this,s):this.cm&&Fn(this.cm)}),undo:_n(function(){Ji(this,"undo")}),redo:_n(function(){Ji(this,"redo")}),undoSelection:_n(function(){Ji(this,"undo",!0)}),redoSelection:_n(function(){Ji(this,"redo",!0)}),setExtending:function(e){this.extend=e},getExtending:function(){return this.extend},historySize:function(){for(var e=this.history,t=0,r=0,n=0;n<e.done.length;n++)e.done[n].ranges||++t;for(var i=0;i<e.undone.length;i++)e.undone[i].ranges||++r;return{undo:t,redo:r}},clearHistory:function(){this.history=new Ti(this.history.maxGeneration)},markClean:function(){this.cleanGeneration=this.changeGeneration(!0)},changeGeneration:function(e){return e&&(this.history.lastOp=this.history.lastSelOp=this.history.lastOrigin=null),this.history.generation},isClean:function(e){return this.history.generation==(e||this.cleanGeneration)},getHistory:function(){return{done:Pi(this.history.done),undone:Pi(this.history.undone)}},setHistory:function(e){var t=this.history=new Ti(this.history.maxGeneration);t.done=Pi(e.done.slice(0),null,!0),t.undone=Pi(e.undone.slice(0),null,!0)},setGutterMarker:_n(function(e,t,r){return lo(this,e,"gutter",function(e){var n=e.gutterMarkers||(e.gutterMarkers={});return n[t]=r,!r&&re(n)&&(e.gutterMarkers=null),!0})}),clearGutter:_n(function(e){var t=this;this.iter(function(r){r.gutterMarkers&&r.gutterMarkers[e]&&lo(t,r,"gutter",function(){return r.gutterMarkers[e]=null,re(r.gutterMarkers)&&(r.gutterMarkers=null),!0})})}),lineInfo:function(e){var t;if("number"==typeof e){if(!de(this,e))return null;if(t=e,!(e=se(this,e)))return null}else if(null==(t=he(e)))return null;return{line:t,handle:e,text:e.text,gutterMarkers:e.gutterMarkers,textClass:e.textClass,bgClass:e.bgClass,wrapClass:e.wrapClass,widgets:e.widgets}},addLineClass:_n(function(e,t,r){return lo(this,e,"gutter"==t?"gutter":"class",function(e){var n="text"==t?"textClass":"background"==t?"bgClass":"gutter"==t?"gutterClass":"wrapClass";if(e[n]){if(L(r).test(e[n]))return!1;e[n]+=" "+r}else e[n]=r;return!0})}),removeLineClass:_n(function(e,t,r){return lo(this,e,"gutter"==t?"gutter":"class",function(e){var n="text"==t?"textClass":"background"==t?"bgClass":"gutter"==t?"gutterClass":"wrapClass",i=e[n];if(!i)return!1;if(null==r)e[n]=null;else{var o=i.match(L(r));if(!o)return!1;var l=o.index+o[0].length;e[n]=i.slice(0,o.index)+(o.index&&l!=i.length?" ":"")+i.slice(l)||null}return!0})}),addLineWidget:_n(function(e,t,r){return function(e,t,r,n){var i=new uo(e,r,n),o=e.cm;return o&&i.noHScroll&&(o.display.alignWidgets=!0),lo(e,t,"widget",function(t){var r=t.widgets||(t.widgets=[]);if(null==i.insertAt?r.push(i):r.splice(Math.min(r.length-1,Math.max(0,i.insertAt)),0,i),i.line=t,o&&!Ve(e,t)){var n=je(t)<e.scrollTop;ce(t,t.height+wr(i)),n&&En(o,null,i.height),o.curOp.forceUpdate=!0}return!0}),sr(o,"lineWidgetAdded",o,i,"number"==typeof t?t:he(t)),i}(this,e,t,r)}),removeLineWidget:function(e){e.clear()},markText:function(e,t,r){return po(this,Ce(this,e),Ce(this,t),r,r&&r.type||"range")},setBookmark:function(e,t){var r={replacedWith:t&&(null==t.nodeType?t.widget:t),insertLeft:t&&t.insertLeft,clearWhenEmpty:!1,shared:t&&t.shared,handleMouseEvents:t&&t.handleMouseEvents};return po(this,e=Ce(this,e),e,r,"bookmark")},findMarksAt:function(e){var t=[],r=se(this,(e=Ce(this,e)).line).markedSpans;if(r)for(var n=0;n<r.length;++n){var i=r[n];(null==i.from||i.from<=e.ch)&&(null==i.to||i.to>=e.ch)&&t.push(i.marker.parent||i.marker)}return t},findMarks:function(e,t,r){e=Ce(this,e),t=Ce(this,t);var n=[],i=e.line;return this.iter(e.line,t.line+1,function(o){var l=o.markedSpans;if(l)for(var s=0;s<l.length;s++){var a=l[s];null!=a.to&&i==e.line&&e.ch>=a.to||null==a.from&&i!=e.line||null!=a.from&&i==t.line&&a.from>=t.ch||r&&!r(a.marker)||n.push(a.marker.parent||a.marker)}++i}),n},getAllMarks:function(){var e=[];return this.iter(function(t){var r=t.markedSpans;if(r)for(var n=0;n<r.length;++n)null!=r[n].from&&e.push(r[n].marker)}),e},posFromIndex:function(e){var t,r=this.first,n=this.lineSeparator().length;return this.iter(function(i){var o=i.text.length+n;if(o>e)return t=e,!0;e-=o,++r}),Ce(this,ge(r,t))},indexFromPos:function(e){var t=(e=Ce(this,e)).ch;if(e.line<this.first||e.ch<0)return 0;var r=this.lineSeparator().length;return this.iter(this.first,e.line,function(e){t+=e.text.length+r}),t},copy:function(e){var t=new bo(ue(this,this.first,this.first+this.size),this.modeOption,this.first,this.lineSep,this.direction);return t.scrollTop=this.scrollTop,t.scrollLeft=this.scrollLeft,t.sel=this.sel,t.extend=!1,e&&(t.history.undoDepth=this.history.undoDepth,t.setHistory(this.getHistory())),t},linkedDoc:function(e){e||(e={});var t=this.first,r=this.first+this.size;null!=e.from&&e.from>t&&(t=e.from),null!=e.to&&e.to<r&&(r=e.to);var n=new bo(ue(this,t,r),e.mode||this.modeOption,t,this.lineSep,this.direction);return e.sharedHist&&(n.history=this.history),(this.linked||(this.linked=[])).push({doc:n,sharedHist:e.sharedHist}),n.linked=[{doc:this,isParent:!0,sharedHist:e.sharedHist}],function(e,t){for(var r=0;r<t.length;r++){var n=t[r],i=n.find(),o=e.clipPos(i.from),l=e.clipPos(i.to);if(ve(o,l)){var s=po(e,o,l,n.primary,n.primary.type);n.markers.push(s),s.parent=n}}}(n,vo(this)),n},unlinkDoc:function(e){if(e instanceof ul&&(e=e.doc),this.linked)for(var t=0;t<this.linked.length;++t){if(this.linked[t].doc==e){this.linked.splice(t,1),e.unlinkDoc(this),mo(vo(this));break}}if(e.history==this.history){var r=[e.id];Ci(e,function(e){return r.push(e.id)},!0),e.history=new Ti(null),e.history.done=Pi(this.history.done,r),e.history.undone=Pi(this.history.undone,r)}},iterLinkedDocs:function(e){Ci(this,e)},getMode:function(){return this.mode},getEditor:function(){return this.cm},splitLines:function(e){return this.lineSep?e.split(this.lineSep):St(e)},lineSeparator:function(){return this.lineSep||"\n"},setDirection:_n(function(e){var t;("rtl"!=e&&(e="ltr"),e!=this.direction)&&(this.direction=e,this.iter(function(e){return e.order=null}),this.cm&&jn(t=this.cm,function(){Li(t),$n(t)}))})}),bo.prototype.eachLine=bo.prototype.iter;var wo=0;function xo(e){var t=this;if(Co(t),!st(t,e)&&!xr(t.display,e)){ht(e),l&&(wo=+new Date);var r=on(t,e,!0),n=e.dataTransfer.files;if(r&&!t.isReadOnly())if(n&&n.length&&window.FileReader&&window.File)for(var i=n.length,o=Array(i),s=0,a=function(e,n){if(!t.options.allowDropFileTypes||-1!=B(t.options.allowDropFileTypes,e.type)){var l=new FileReader;l.onload=Xn(t,function(){var e=l.result;if(/[\x00-\x08\x0e-\x1f]{2}/.test(e)&&(e=""),o[n]=e,++s==i){var a={from:r=Ce(t.doc,r),to:r,text:t.doc.splitLines(o.join(t.doc.lineSeparator())),origin:"paste"};Zi(t.doc,a),Bi(t.doc,di(r,pi(a)))}}),l.readAsText(e)}},u=0;u<i;++u)a(n[u],u);else{if(t.state.draggingText&&t.doc.sel.contains(r)>-1)return t.state.draggingText(e),void setTimeout(function(){return t.display.input.focus()},20);try{var c=e.dataTransfer.getData("Text");if(c){var h;if(t.state.draggingText&&!t.state.draggingText.copy&&(h=t.listSelections()),Ui(t.doc,di(r,r)),h)for(var f=0;f<h.length;++f)ro(t.doc,"",h[f].anchor,h[f].head,"drag");t.replaceSelection(c,"around","paste"),t.display.input.focus()}}catch(e){}}}}function Co(e){e.display.dragCursor&&(e.display.lineSpace.removeChild(e.display.dragCursor),e.display.dragCursor=null)}function So(e){if(document.body.getElementsByClassName)for(var t=document.body.getElementsByClassName("CodeMirror"),r=0;r<t.length;r++){var n=t[r].CodeMirror;n&&e(n)}}var Lo=!1;function To(){var e;Lo||(nt(window,"resize",function(){null==e&&(e=setTimeout(function(){e=null,So(ko)},100))}),nt(window,"blur",function(){return So(pn)}),Lo=!0)}function ko(e){var t=e.display;t.lastWrapHeight==t.wrapper.clientHeight&&t.lastWrapWidth==t.wrapper.clientWidth||(t.cachedCharWidth=t.cachedTextHeight=t.cachedPaddingH=null,t.scrollbarsClipped=!1,e.setSize())}for(var Mo={3:"Enter",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",61:"=",91:"Mod",92:"Mod",93:"Mod",106:"*",107:"=",109:"-",110:".",111:"/",127:"Delete",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"},No=0;No<10;No++)Mo[No+48]=Mo[No+96]=String(No);for(var Oo=65;Oo<=90;Oo++)Mo[Oo]=String.fromCharCode(Oo);for(var Wo=1;Wo<=12;Wo++)Mo[Wo+111]=Mo[Wo+63235]="F"+Wo;var Ao={};function Do(e){var t,r,n,i,o=e.split(/-(?!$)/);e=o[o.length-1];for(var l=0;l<o.length-1;l++){var s=o[l];if(/^(cmd|meta|m)$/i.test(s))i=!0;else if(/^a(lt)?$/i.test(s))t=!0;else if(/^(c|ctrl|control)$/i.test(s))r=!0;else{if(!/^s(hift)?$/i.test(s))throw new Error("Unrecognized modifier name: "+s);n=!0}}return t&&(e="Alt-"+e),r&&(e="Ctrl-"+e),i&&(e="Cmd-"+e),n&&(e="Shift-"+e),e}function Ho(e){var t={};for(var r in e)if(e.hasOwnProperty(r)){var n=e[r];if(/^(name|fallthrough|(de|at)tach)$/.test(r))continue;if("..."==n){delete e[r];continue}for(var i=q(r.split(" "),Do),o=0;o<i.length;o++){var l=void 0,s=void 0;o==i.length-1?(s=i.join(" "),l=n):(s=i.slice(0,o+1).join(" "),l="...");var a=t[s];if(a){if(a!=l)throw new Error("Inconsistent bindings for "+s)}else t[s]=l}delete e[r]}for(var u in t)e[u]=t[u];return e}function Po(e,t,r,n){var i=(t=Io(t)).call?t.call(e,n):t[e];if(!1===i)return"nothing";if("..."===i)return"multi";if(null!=i&&r(i))return"handled";if(t.fallthrough){if("[object Array]"!=Object.prototype.toString.call(t.fallthrough))return Po(e,t.fallthrough,r,n);for(var o=0;o<t.fallthrough.length;o++){var l=Po(e,t.fallthrough[o],r,n);if(l)return l}}}function Eo(e){var t="string"==typeof e?e:Mo[e.keyCode];return"Ctrl"==t||"Alt"==t||"Shift"==t||"Mod"==t}function Fo(e,t){if(h&&34==e.keyCode&&e.char)return!1;var r=Mo[e.keyCode],n=r;return null!=n&&!e.altGraphKey&&(e.altKey&&"Alt"!=r&&(n="Alt-"+n),(C?e.metaKey:e.ctrlKey)&&"Ctrl"!=r&&(n="Ctrl-"+n),(C?e.ctrlKey:e.metaKey)&&"Cmd"!=r&&(n="Cmd-"+n),!t&&e.shiftKey&&"Shift"!=r&&(n="Shift-"+n),n)}function Io(e){return"string"==typeof e?Ao[e]:e}function zo(e,t){for(var r=e.doc.sel.ranges,n=[],i=0;i<r.length;i++){for(var o=t(r[i]);n.length&&ve(o.from,$(n).to)<=0;){var l=n.pop();if(ve(l.from,o.from)<0){o.from=l.from;break}}n.push(o)}jn(e,function(){for(var t=n.length-1;t>=0;t--)ro(e.doc,"",n[t].from,n[t].to,"+delete");Fn(e)})}Ao.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"},Ao.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"},Ao.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars","Ctrl-O":"openLine"},Ao.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight","Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]},Ao.default=y?Ao.macDefault:Ao.pcDefault;var Ro={selectAll:$i,singleSelection:function(e){return e.setSelection(e.getCursor("anchor"),e.getCursor("head"),V)},killLine:function(e){return zo(e,function(t){if(t.empty()){var r=se(e.doc,t.head.line).text.length;return t.head.ch==r&&t.head.line<e.lastLine()?{from:t.head,to:ge(t.head.line+1,0)}:{from:t.head,to:ge(t.head.line,r)}}return{from:t.from(),to:t.to()}})},deleteLine:function(e){return zo(e,function(t){return{from:ge(t.from().line,0),to:Ce(e.doc,ge(t.to().line+1,0))}})},delLineLeft:function(e){return zo(e,function(e){return{from:ge(e.from().line,0),to:e.from()}})},delWrappedLineLeft:function(e){return zo(e,function(t){var r=e.charCoords(t.head,"div").top+5;return{from:e.coordsChar({left:0,top:r},"div"),to:t.from()}})},delWrappedLineRight:function(e){return zo(e,function(t){var r=e.charCoords(t.head,"div").top+5,n=e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:r},"div");return{from:t.from(),to:n}})},undo:function(e){return e.undo()},redo:function(e){return e.redo()},undoSelection:function(e){return e.undoSelection()},redoSelection:function(e){return e.redoSelection()},goDocStart:function(e){return e.extendSelection(ge(e.firstLine(),0))},goDocEnd:function(e){return e.extendSelection(ge(e.lastLine()))},goLineStart:function(e){return e.extendSelectionsBy(function(t){return Bo(e,t.head.line)},{origin:"+move",bias:1})},goLineStartSmart:function(e){return e.extendSelectionsBy(function(t){return Go(e,t.head)},{origin:"+move",bias:1})},goLineEnd:function(e){return e.extendSelectionsBy(function(t){return function(e,t){var r=se(e.doc,t),n=function(e){for(var t;t=ze(e);)e=t.find(1,!0).line;return e}(r);n!=r&&(t=he(n));return et(!0,e,r,t,-1)}(e,t.head.line)},{origin:"+move",bias:-1})},goLineRight:function(e){return e.extendSelectionsBy(function(t){var r=e.charCoords(t.head,"div").top+5;return e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:r},"div")},j)},goLineLeft:function(e){return e.extendSelectionsBy(function(t){var r=e.charCoords(t.head,"div").top+5;return e.coordsChar({left:0,top:r},"div")},j)},goLineLeftSmart:function(e){return e.extendSelectionsBy(function(t){var r=e.charCoords(t.head,"div").top+5,n=e.coordsChar({left:0,top:r},"div");return n.ch<e.getLine(n.line).search(/\S/)?Go(e,t.head):n},j)},goLineUp:function(e){return e.moveV(-1,"line")},goLineDown:function(e){return e.moveV(1,"line")},goPageUp:function(e){return e.moveV(-1,"page")},goPageDown:function(e){return e.moveV(1,"page")},goCharLeft:function(e){return e.moveH(-1,"char")},goCharRight:function(e){return e.moveH(1,"char")},goColumnLeft:function(e){return e.moveH(-1,"column")},goColumnRight:function(e){return e.moveH(1,"column")},goWordLeft:function(e){return e.moveH(-1,"word")},goGroupRight:function(e){return e.moveH(1,"group")},goGroupLeft:function(e){return e.moveH(-1,"group")},goWordRight:function(e){return e.moveH(1,"word")},delCharBefore:function(e){return e.deleteH(-1,"char")},delCharAfter:function(e){return e.deleteH(1,"char")},delWordBefore:function(e){return e.deleteH(-1,"word")},delWordAfter:function(e){return e.deleteH(1,"word")},delGroupBefore:function(e){return e.deleteH(-1,"group")},delGroupAfter:function(e){return e.deleteH(1,"group")},indentAuto:function(e){return e.indentSelection("smart")},indentMore:function(e){return e.indentSelection("add")},indentLess:function(e){return e.indentSelection("subtract")},insertTab:function(e){return e.replaceSelection("\t")},insertSoftTab:function(e){for(var t=[],r=e.listSelections(),n=e.options.tabSize,i=0;i<r.length;i++){var o=r[i].from(),l=z(e.getLine(o.line),o.ch,n);t.push(_(n-l%n))}e.replaceSelections(t)},defaultTab:function(e){e.somethingSelected()?e.indentSelection("add"):e.execCommand("insertTab")},transposeChars:function(e){return jn(e,function(){for(var t=e.listSelections(),r=[],n=0;n<t.length;n++)if(t[n].empty()){var i=t[n].head,o=se(e.doc,i.line).text;if(o)if(i.ch==o.length&&(i=new ge(i.line,i.ch-1)),i.ch>0)i=new ge(i.line,i.ch+1),e.replaceRange(o.charAt(i.ch-1)+o.charAt(i.ch-2),ge(i.line,i.ch-2),i,"+transpose");else if(i.line>e.doc.first){var l=se(e.doc,i.line-1).text;l&&(i=new ge(i.line,1),e.replaceRange(o.charAt(0)+e.doc.lineSeparator()+l.charAt(l.length-1),ge(i.line-1,l.length-1),i,"+transpose"))}r.push(new hi(i,i))}e.setSelections(r)})},newlineAndIndent:function(e){return jn(e,function(){for(var t=e.listSelections(),r=t.length-1;r>=0;r--)e.replaceRange(e.doc.lineSeparator(),t[r].anchor,t[r].head,"+input");t=e.listSelections();for(var n=0;n<t.length;n++)e.indentLine(t[n].from().line,null,!0);Fn(e)})},openLine:function(e){return e.replaceSelection("\n","start")},toggleOverwrite:function(e){return e.toggleOverwrite()}};function Bo(e,t){var r=se(e.doc,t),n=Be(r);return n!=r&&(t=he(n)),et(!0,e,n,t,1)}function Go(e,t){var r=Bo(e,t.line),n=se(e.doc,r.line),i=Ze(n,e.doc.direction);if(!i||0==i[0].level){var o=Math.max(0,n.text.search(/\S/)),l=t.line==r.line&&t.ch<=o&&t.ch;return ge(r.line,l?0:o,r.sticky)}return r}function Uo(e,t,r){if("string"==typeof t&&!(t=Ro[t]))return!1;e.display.input.ensurePolled();var n=e.display.shift,i=!1;try{e.isReadOnly()&&(e.state.suppressEdits=!0),r&&(e.display.shift=!1),i=t(e)!=U}finally{e.display.shift=n,e.state.suppressEdits=!1}return i}var Vo=new R;function Ko(e,t,r,n){var i=e.state.keySeq;if(i){if(Eo(t))return"handled";Vo.set(50,function(){e.state.keySeq==i&&(e.state.keySeq=null,e.display.input.reset())}),t=i+" "+t}var o=function(e,t,r){for(var n=0;n<e.state.keyMaps.length;n++){var i=Po(t,e.state.keyMaps[n],r,e);if(i)return i}return e.options.extraKeys&&Po(t,e.options.extraKeys,r,e)||Po(t,e.options.keyMap,r,e)}(e,t,n);return"multi"==o&&(e.state.keySeq=t),"handled"==o&&sr(e,"keyHandled",e,t,r),"handled"!=o&&"multi"!=o||(ht(r),hn(e)),i&&!o&&/\'$/.test(t)?(ht(r),!0):!!o}function jo(e,t){var r=Fo(t,!0);return!!r&&(t.shiftKey&&!e.state.keySeq?Ko(e,"Shift-"+r,t,function(t){return Uo(e,t,!0)})||Ko(e,r,t,function(t){if("string"==typeof t?/^go[A-Z]/.test(t):t.motion)return Uo(e,t)}):Ko(e,r,t,function(t){return Uo(e,t)}))}var Xo,Yo,_o=null;function $o(e){var t=this;if(t.curOp.focus=D(),!st(t,e)){l&&s<11&&27==e.keyCode&&(e.returnValue=!1);var r=e.keyCode;t.display.shift=16==r||e.shiftKey;var n=jo(t,e);h&&(_o=n?r:null,!n&&88==r&&!Tt&&(y?e.metaKey:e.ctrlKey)&&t.replaceSelection("",null,"cut")),18!=r||/\bCodeMirror-crosshair\b/.test(t.display.lineDiv.className)||function(e){var t=e.display.lineDiv;function r(e){18!=e.keyCode&&e.altKey||(k(t,"CodeMirror-crosshair"),ot(document,"keyup",r),ot(document,"mouseover",r))}H(t,"CodeMirror-crosshair"),nt(document,"keyup",r),nt(document,"mouseover",r)}(t)}}function qo(e){16==e.keyCode&&(this.doc.sel.shift=!1),st(this,e)}function Zo(e){var t=this;if(!(xr(t.display,e)||st(t,e)||e.ctrlKey&&!e.altKey||y&&e.metaKey)){var r=e.keyCode,n=e.charCode;if(h&&r==_o)return _o=null,void ht(e);if(!h||e.which&&!(e.which<10)||!jo(t,e)){var i=String.fromCharCode(null==n?r:n);"\b"!=i&&(function(e,t,r){return Ko(e,"'"+r+"'",t,function(t){return Uo(e,t,!0)})}(t,e,i)||t.display.input.onKeyPress(e))}}}function Qo(e){var t=this,r=t.display;if(!(st(t,e)||r.activeTouch&&r.input.supportsTouch()))if(r.input.ensurePolled(),r.shift=e.shiftKey,xr(r,e))a||(r.scroller.draggable=!1,setTimeout(function(){return r.scroller.draggable=!0},100));else if(!el(t,e)){var n=on(t,e);switch(window.focus(),vt(e)){case 1:t.state.selectingText?t.state.selectingText(e):n?function(e,t,r){l?setTimeout(F(fn,e),0):e.curOp.focus=D();var n,i=+new Date;Yo&&Yo.time>i-400&&0==ve(Yo.pos,r)?n="triple":Xo&&Xo.time>i-400&&0==ve(Xo.pos,r)?(n="double",Yo={time:i,pos:r}):(n="single",Xo={time:i,pos:r});var o,u=e.doc.sel,c=y?t.metaKey:t.ctrlKey;e.options.dragDrop&&bt&&!e.isReadOnly()&&"single"==n&&(o=u.contains(r))>-1&&(ve((o=u.ranges[o]).from(),r)<0||r.xRel>0)&&(ve(o.to(),r)>0||r.xRel<0)?function(e,t,r,n){var i=e.display,o=+new Date,u=Xn(e,function(c){a&&(i.scroller.draggable=!1),e.state.draggingText=!1,ot(document,"mouseup",u),ot(i.scroller,"drop",u),Math.abs(t.clientX-c.clientX)+Math.abs(t.clientY-c.clientY)<10&&(ht(c),!n&&+new Date-200<o&&Fi(e.doc,r),a||l&&9==s?setTimeout(function(){document.body.focus(),i.input.focus()},20):i.input.focus())});a&&(i.scroller.draggable=!0);e.state.draggingText=u,u.copy=y?t.altKey:t.ctrlKey,i.scroller.dragDrop&&i.scroller.dragDrop();nt(document,"mouseup",u),nt(i.scroller,"drop",u)}(e,t,r,c):function(e,t,r,n,i){var o=e.display,l=e.doc;ht(t);var s,a,u=l.sel,c=u.ranges;i&&!t.shiftKey?(a=l.sel.contains(r),s=a>-1?c[a]:new hi(r,r)):(s=l.sel.primary(),a=l.sel.primIndex);if(b?t.shiftKey&&t.metaKey:t.altKey)n="rect",i||(s=new hi(r,r)),r=on(e,t,!0,!0),a=-1;else if("double"==n){var h=e.findWordAt(r);s=e.display.shift||l.extend?Ei(l,s,h.anchor,h.head):h}else if("triple"==n){var f=new hi(ge(r.line,0),Ce(l,ge(r.line+1,0)));s=e.display.shift||l.extend?Ei(l,s,f.anchor,f.head):f}else s=Ei(l,s,r);i?-1==a?(a=c.length,Gi(l,fi(c.concat([s]),a),{scroll:!1,origin:"*mouse"})):c.length>1&&c[a].empty()&&"single"==n&&!t.shiftKey?(Gi(l,fi(c.slice(0,a).concat(c.slice(a+1)),0),{scroll:!1,origin:"*mouse"}),u=l.sel):zi(l,a,s,K):(a=0,Gi(l,new ci([s],0),K),u=l.sel);var d=r;var p=o.wrapper.getBoundingClientRect(),g=0;function v(t){var i=++g,c=on(e,t,!0,"rect"==n);if(c)if(0!=ve(c,d)){e.curOp.focus=D(),function(t){if(0==ve(d,t))return;if(d=t,"rect"==n){for(var i=[],o=e.options.tabSize,c=z(se(l,r.line).text,r.ch,o),h=z(se(l,t.line).text,t.ch,o),f=Math.min(c,h),p=Math.max(c,h),g=Math.min(r.line,t.line),v=Math.min(e.lastLine(),Math.max(r.line,t.line));g<=v;g++){var m=se(l,g).text,y=X(m,f,o);f==p?i.push(new hi(ge(g,y),ge(g,y))):m.length>y&&i.push(new hi(ge(g,y),ge(g,X(m,p,o))))}i.length||i.push(new hi(r,r)),Gi(l,fi(u.ranges.slice(0,a).concat(i),a),{origin:"*mouse",scroll:!1}),e.scrollIntoView(t)}else{var b,w=s,x=w.anchor,C=t;if("single"!=n)ve((b="double"==n?e.findWordAt(t):new hi(ge(t.line,0),Ce(l,ge(t.line+1,0)))).anchor,x)>0?(C=b.head,x=we(w.from(),b.anchor)):(C=b.anchor,x=be(w.to(),b.head));var S=u.ranges.slice(0);S[a]=new hi(Ce(l,x),C),Gi(l,fi(S,a),K)}}(c);var h=bn(o,l);(c.line>=h.to||c.line<h.from)&&setTimeout(Xn(e,function(){g==i&&v(t)}),150)}else{var f=t.clientY<p.top?-20:t.clientY>p.bottom?20:0;f&&setTimeout(Xn(e,function(){g==i&&(o.scroller.scrollTop+=f,v(t))}),50)}}function m(t){e.state.selectingText=!1,g=1/0,ht(t),o.input.focus(),ot(document,"mousemove",y),ot(document,"mouseup",w),l.history.lastSelOrigin=null}var y=Xn(e,function(e){vt(e)?v(e):m(e)}),w=Xn(e,m);e.state.selectingText=w,nt(document,"mousemove",y),nt(document,"mouseup",w)}(e,t,r,n,c)}(t,e,n):gt(e)==r.scroller&&ht(e);break;case 2:a&&(t.state.lastMiddleDown=+new Date),n&&Fi(t.doc,n),setTimeout(function(){return r.input.focus()},20),ht(e);break;case 3:S?tl(t,e):function(e){e.state.delayingBlurEvent=!0,setTimeout(function(){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1,pn(e))},100)}(t)}}}function Jo(e,t,r,n){var i,o;try{i=t.clientX,o=t.clientY}catch(t){return!1}if(i>=Math.floor(e.display.gutters.getBoundingClientRect().right))return!1;n&&ht(t);var l=e.display,s=l.lineDiv.getBoundingClientRect();if(o>s.bottom||!ut(e,r))return dt(t);o-=s.top-l.viewOffset;for(var a=0;a<e.options.gutters.length;++a){var u=l.gutters.childNodes[a];if(u&&u.getBoundingClientRect().right>=i)return lt(e,r,e,fe(e.doc,o),e.options.gutters[a],t),dt(t)}}function el(e,t){return Jo(e,t,"gutterClick",!0)}function tl(e,t){xr(e.display,t)||function(e,t){if(!ut(e,"gutterContextMenu"))return!1;return Jo(e,t,"gutterContextMenu",!1)}(e,t)||st(e,t,"contextmenu")||e.display.input.onContextMenu(t)}function rl(e){e.display.wrapper.className=e.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+e.options.theme.replace(/(^|\s)\s*/g," cm-s-"),Rr(e)}var nl={toString:function(){return"CodeMirror.Init"}},il={},ol={};function ll(e){ai(e),$n(e),gn(e)}function sl(e,t,r){if(!t!=!(r&&r!=nl)){var n=e.display.dragFunctions,i=t?nt:ot;i(e.display.scroller,"dragstart",n.start),i(e.display.scroller,"dragenter",n.enter),i(e.display.scroller,"dragover",n.over),i(e.display.scroller,"dragleave",n.leave),i(e.display.scroller,"drop",n.drop)}}function al(e){e.options.lineWrapping?(H(e.display.wrapper,"CodeMirror-wrap"),e.display.sizer.style.minWidth="",e.display.sizerWidth=null):(k(e.display.wrapper,"CodeMirror-wrap"),Ye(e)),nn(e),$n(e),Rr(e),setTimeout(function(){return Wn(e)},100)}function ul(e,t){var n=this;if(!(this instanceof ul))return new ul(e,t);this.options=t=t?I(t):{},I(il,t,!1),ui(t);var i=t.value;"string"==typeof i&&(i=new bo(i,t.mode,null,t.lineSeparator,t.direction)),this.doc=i;var o=new ul.inputStyles[t.inputStyle](this),u=this.display=new function(e,t,n){var i=this;this.input=n,i.scrollbarFiller=O("div",null,"CodeMirror-scrollbar-filler"),i.scrollbarFiller.setAttribute("cm-not-content","true"),i.gutterFiller=O("div",null,"CodeMirror-gutter-filler"),i.gutterFiller.setAttribute("cm-not-content","true"),i.lineDiv=W("div",null,"CodeMirror-code"),i.selectionDiv=O("div",null,null,"position: relative; z-index: 1"),i.cursorDiv=O("div",null,"CodeMirror-cursors"),i.measure=O("div",null,"CodeMirror-measure"),i.lineMeasure=O("div",null,"CodeMirror-measure"),i.lineSpace=W("div",[i.measure,i.lineMeasure,i.selectionDiv,i.cursorDiv,i.lineDiv],null,"position: relative; outline: none");var o=W("div",[i.lineSpace],"CodeMirror-lines");i.mover=O("div",[o],null,"position: relative"),i.sizer=O("div",[i.mover],"CodeMirror-sizer"),i.sizerWidth=null,i.heightForcer=O("div",null,null,"position: absolute; height: "+G+"px; width: 1px;"),i.gutters=O("div",null,"CodeMirror-gutters"),i.lineGutter=null,i.scroller=O("div",[i.sizer,i.heightForcer,i.gutters],"CodeMirror-scroll"),i.scroller.setAttribute("tabIndex","-1"),i.wrapper=O("div",[i.scrollbarFiller,i.gutterFiller,i.scroller],"CodeMirror"),l&&s<8&&(i.gutters.style.zIndex=-1,i.scroller.style.paddingRight=0),a||r&&m||(i.scroller.draggable=!0),e&&(e.appendChild?e.appendChild(i.wrapper):e(i.wrapper)),i.viewFrom=i.viewTo=t.first,i.reportedViewFrom=i.reportedViewTo=t.first,i.view=[],i.renderedView=null,i.externalMeasured=null,i.viewOffset=0,i.lastWrapHeight=i.lastWrapWidth=0,i.updateLineNumbers=null,i.nativeBarWidth=i.barHeight=i.barWidth=0,i.scrollbarsClipped=!1,i.lineNumWidth=i.lineNumInnerWidth=i.lineNumChars=null,i.alignWidgets=!1,i.cachedCharWidth=i.cachedTextHeight=i.cachedPaddingH=null,i.maxLine=null,i.maxLineLength=0,i.maxLineChanged=!1,i.wheelDX=i.wheelDY=i.wheelStartX=i.wheelStartY=null,i.shift=!1,i.selForContextMenu=null,i.activeTouch=null,n.init(i)}(e,i,o);for(var c in u.wrapper.CodeMirror=this,ai(this),rl(this),t.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap"),Hn(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,delayingBlurEvent:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,selectingText:!1,draggingText:!1,highlight:new R,keySeq:null,specialChars:null},t.autofocus&&!m&&u.input.focus(),l&&s<11&&setTimeout(function(){return n.display.input.reset(!0)},20),function(e){var t=e.display;nt(t.scroller,"mousedown",Xn(e,Qo)),nt(t.scroller,"dblclick",l&&s<11?Xn(e,function(t){if(!st(e,t)){var r=on(e,t);if(r&&!el(e,t)&&!xr(e.display,t)){ht(t);var n=e.findWordAt(r);Fi(e.doc,n.anchor,n.head)}}}):function(t){return st(e,t)||ht(t)});S||nt(t.scroller,"contextmenu",function(t){return tl(e,t)});var r,n={end:0};function i(){t.activeTouch&&(r=setTimeout(function(){return t.activeTouch=null},1e3),(n=t.activeTouch).end=+new Date)}function o(e,t){if(null==t.left)return!0;var r=t.left-e.left,n=t.top-e.top;return r*r+n*n>400}nt(t.scroller,"touchstart",function(i){if(!st(e,i)&&!function(e){if(1!=e.touches.length)return!1;var t=e.touches[0];return t.radiusX<=1&&t.radiusY<=1}(i)){t.input.ensurePolled(),clearTimeout(r);var o=+new Date;t.activeTouch={start:o,moved:!1,prev:o-n.end<=300?n:null},1==i.touches.length&&(t.activeTouch.left=i.touches[0].pageX,t.activeTouch.top=i.touches[0].pageY)}}),nt(t.scroller,"touchmove",function(){t.activeTouch&&(t.activeTouch.moved=!0)}),nt(t.scroller,"touchend",function(r){var n=t.activeTouch;if(n&&!xr(t,r)&&null!=n.left&&!n.moved&&new Date-n.start<300){var l,s=e.coordsChar(t.activeTouch,"page");l=!n.prev||o(n,n.prev)?new hi(s,s):!n.prev.prev||o(n,n.prev.prev)?e.findWordAt(s):new hi(ge(s.line,0),Ce(e.doc,ge(s.line+1,0))),e.setSelection(l.anchor,l.head),e.focus(),ht(r)}i()}),nt(t.scroller,"touchcancel",i),nt(t.scroller,"scroll",function(){t.scroller.clientHeight&&(wn(e,t.scroller.scrollTop),xn(e,t.scroller.scrollLeft,!0),lt(e,"scroll",e))}),nt(t.scroller,"mousewheel",function(t){return kn(e,t)}),nt(t.scroller,"DOMMouseScroll",function(t){return kn(e,t)}),nt(t.wrapper,"scroll",function(){return t.wrapper.scrollTop=t.wrapper.scrollLeft=0}),t.dragFunctions={enter:function(t){st(e,t)||pt(t)},over:function(t){st(e,t)||(!function(e,t){var r=on(e,t);if(r){var n=document.createDocumentFragment();un(e,r,n),e.display.dragCursor||(e.display.dragCursor=O("div",null,"CodeMirror-cursors CodeMirror-dragcursors"),e.display.lineSpace.insertBefore(e.display.dragCursor,e.display.cursorDiv)),N(e.display.dragCursor,n)}}(e,t),pt(t))},start:function(t){return function(e,t){if(l&&(!e.state.draggingText||+new Date-wo<100))pt(t);else if(!st(e,t)&&!xr(e.display,t)&&(t.dataTransfer.setData("Text",e.getSelection()),t.dataTransfer.effectAllowed="copyMove",t.dataTransfer.setDragImage&&!f)){var r=O("img",null,null,"position: fixed; left: 0; top: 0;");r.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",h&&(r.width=r.height=1,e.display.wrapper.appendChild(r),r._top=r.offsetTop),t.dataTransfer.setDragImage(r,0,0),h&&r.parentNode.removeChild(r)}}(e,t)},drop:Xn(e,xo),leave:function(t){st(e,t)||Co(e)}};var a=t.input.getField();nt(a,"keyup",function(t){return qo.call(e,t)}),nt(a,"keydown",Xn(e,$o)),nt(a,"keypress",Xn(e,Zo)),nt(a,"focus",function(t){return dn(e,t)}),nt(a,"blur",function(t){return pn(e,t)})}(this),To(),Rn(this),this.curOp.forceUpdate=!0,Si(this,i),t.autofocus&&!m||this.hasFocus()?setTimeout(F(dn,this),20):pn(this),ol)ol.hasOwnProperty(c)&&ol[c](n,t[c],nl);vn(this),t.finishInit&&t.finishInit(this);for(var d=0;d<cl.length;++d)cl[d](n);Bn(this),a&&t.lineWrapping&&"optimizelegibility"==getComputedStyle(u.lineDiv).textRendering&&(u.lineDiv.style.textRendering="auto")}ul.defaults=il,ul.optionHandlers=ol;var cl=[];function hl(e,t,r,n){var i,o=e.doc;null==r&&(r="add"),"smart"==r&&(o.mode.indent?i=Rt(e,t):r="prev");var l=e.options.tabSize,s=se(o,t),a=z(s.text,null,l);s.stateAfter&&(s.stateAfter=null);var u,c=s.text.match(/^\s*/)[0];if(n||/\S/.test(s.text)){if("smart"==r&&((u=o.mode.indent(i,s.text.slice(c.length),s.text))==U||u>150)){if(!n)return;r="prev"}}else u=0,r="not";"prev"==r?u=t>o.first?z(se(o,t-1).text,null,l):0:"add"==r?u=a+e.options.indentUnit:"subtract"==r?u=a-e.options.indentUnit:"number"==typeof r&&(u=a+r),u=Math.max(0,u);var h="",f=0;if(e.options.indentWithTabs)for(var d=Math.floor(u/l);d;--d)f+=l,h+="\t";if(f<u&&(h+=_(u-f)),h!=c)return ro(o,h,ge(t,0),ge(t,c.length),"+input"),s.stateAfter=null,!0;for(var p=0;p<o.sel.ranges.length;p++){var g=o.sel.ranges[p];if(g.head.line==t&&g.head.ch<c.length){var v=ge(t,c.length);zi(o,p,new hi(v,v));break}}}ul.defineInitHook=function(e){return cl.push(e)};var fl=null;function dl(e){fl=e}function pl(e,t,r,n,i){var o=e.doc;e.display.shift=!1,n||(n=o.sel);var l,s=e.state.pasteIncoming||"paste"==i,a=St(t),u=null;if(s&&n.ranges.length>1)if(fl&&fl.text.join("\n")==t){if(n.ranges.length%fl.text.length==0){u=[];for(var c=0;c<fl.text.length;c++)u.push(o.splitLines(fl.text[c]))}}else a.length==n.ranges.length&&(u=q(a,function(e){return[e]}));for(var h=n.ranges.length-1;h>=0;h--){var f=n.ranges[h],d=f.from(),p=f.to();f.empty()&&(r&&r>0?d=ge(d.line,d.ch-r):e.state.overwrite&&!s?p=ge(p.line,Math.min(se(o,p.line).text.length,p.ch+$(a).length)):fl&&fl.lineWise&&fl.text.join("\n")==t&&(d=p=ge(d.line,0))),l=e.curOp.updateInput;var g={from:d,to:p,text:u?u[h%u.length]:a,origin:i||(s?"paste":e.state.cutIncoming?"cut":"+input")};Zi(e.doc,g),sr(e,"inputRead",e,g)}t&&!s&&vl(e,t),Fn(e),e.curOp.updateInput=l,e.curOp.typing=!0,e.state.pasteIncoming=e.state.cutIncoming=!1}function gl(e,t){var r=e.clipboardData&&e.clipboardData.getData("Text");if(r)return e.preventDefault(),t.isReadOnly()||t.options.disableInput||jn(t,function(){return pl(t,r,0,null,"paste")}),!0}function vl(e,t){if(e.options.electricChars&&e.options.smartIndent)for(var r=e.doc.sel,n=r.ranges.length-1;n>=0;n--){var i=r.ranges[n];if(!(i.head.ch>100||n&&r.ranges[n-1].head.line==i.head.line)){var o=e.getModeAt(i.head),l=!1;if(o.electricChars){for(var s=0;s<o.electricChars.length;s++)if(t.indexOf(o.electricChars.charAt(s))>-1){l=hl(e,i.head.line,"smart");break}}else o.electricInput&&o.electricInput.test(se(e.doc,i.head.line).text.slice(0,i.head.ch))&&(l=hl(e,i.head.line,"smart"));l&&sr(e,"electricInput",e,i.head.line)}}}function ml(e){for(var t=[],r=[],n=0;n<e.doc.sel.ranges.length;n++){var i=e.doc.sel.ranges[n].head.line,o={anchor:ge(i,0),head:ge(i+1,0)};r.push(o),t.push(e.getRange(o.anchor,o.head))}return{text:t,ranges:r}}function yl(e,t){e.setAttribute("autocorrect","off"),e.setAttribute("autocapitalize","off"),e.setAttribute("spellcheck",!!t)}function bl(){var e=O("textarea",null,null,"position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none"),t=O("div",[e],null,"overflow: hidden; position: relative; width: 3px; height: 0px;");return a?e.style.width="1000px":e.setAttribute("wrap","off"),g&&(e.style.border="1px solid black"),yl(e),t}function wl(e,t,r,n,i){var o=t,l=r,s=se(e,t.line);function a(n){var o,l;if(null==(o=i?tt(e.cm,s,t,r):Je(s,t,r))){if(n||(l=t.line+r)<e.first||l>=e.first+e.size||(t=new ge(l,t.ch,t.sticky),!(s=se(e,l))))return!1;t=et(i,e.cm,s,t.line,r)}else t=o;return!0}if("char"==n)a();else if("column"==n)a(!0);else if("word"==n||"group"==n)for(var u=null,c="group"==n,h=e.cm&&e.cm.getHelper(t,"wordChars"),f=!0;!(r<0)||a(!f);f=!1){var d=s.text.charAt(t.ch)||"\n",p=te(d,h)?"w":c&&"\n"==d?"n":!c||/\s/.test(d)?null:"p";if(!c||f||p||(p="s"),u&&u!=p){r<0&&(r=1,a(),t.sticky="after");break}if(p&&(u=p),r>0&&!a(!f))break}var g=Yi(e,t,o,l,!0);return me(o,g)&&(g.hitSide=!0),g}function xl(e,t,r,n){var i,o,l=e.doc,s=t.left;if("page"==n){var a=Math.min(e.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight),u=Math.max(a-.5*Qr(e.display),3);i=(r>0?t.bottom:t.top)+r*u}else"line"==n&&(i=r>0?t.bottom+3:t.top-3);for(;(o=_r(e,s,i)).outside;){if(r<0?i<=0:i>=l.height){o.hitSide=!0;break}i+=5*r}return o}var Cl=function(e){this.cm=e,this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null,this.polling=new R,this.composing=null,this.gracePeriod=!1,this.readDOMTimeout=null};function Sl(e,t){var r=Wr(e,t.line);if(!r||r.hidden)return null;var n=se(e.doc,t.line),i=Nr(r,n,t.line),o=Ze(n,e.doc.direction),l="left";o&&(l=$e(o,t.ch)%2?"right":"left");var s=Er(i.map,t.ch,l);return s.offset="right"==s.collapse?s.end:s.start,s}function Ll(e,t){return t&&(e.bad=!0),e}function Tl(e,t,r){var n;if(t==e.display.lineDiv){if(!(n=e.display.lineDiv.childNodes[r]))return Ll(e.clipPos(ge(e.display.viewTo-1)),!0);t=null,r=0}else for(n=t;;n=n.parentNode){if(!n||n==e.display.lineDiv)return null;if(n.parentNode&&n.parentNode==e.display.lineDiv)break}for(var i=0;i<e.display.view.length;i++){var o=e.display.view[i];if(o.node==n)return kl(o,t,r)}}function kl(e,t,r){var n=e.text.firstChild,i=!1;if(!t||!A(n,t))return Ll(ge(he(e.line),0),!0);if(t==n&&(i=!0,t=n.childNodes[r],r=0,!t)){var o=e.rest?$(e.rest):e.line;return Ll(ge(he(o),o.text.length),i)}var l=3==t.nodeType?t:null,s=t;for(l||1!=t.childNodes.length||3!=t.firstChild.nodeType||(l=t.firstChild,r&&(r=l.nodeValue.length));s.parentNode!=n;)s=s.parentNode;var a=e.measure,u=a.maps;function c(t,r,n){for(var i=-1;i<(u?u.length:0);i++)for(var o=i<0?a.map:u[i],l=0;l<o.length;l+=3){var s=o[l+2];if(s==t||s==r){var c=he(i<0?e.line:e.rest[i]),h=o[l]+n;return(n<0||s!=t)&&(h=o[l+(n?1:0)]),ge(c,h)}}}var h=c(l,s,r);if(h)return Ll(h,i);for(var f=s.nextSibling,d=l?l.nodeValue.length-r:0;f;f=f.nextSibling){if(h=c(f,f.firstChild,0))return Ll(ge(h.line,h.ch-d),i);d+=f.textContent.length}for(var p=s.previousSibling,g=r;p;p=p.previousSibling){if(h=c(p,p.firstChild,-1))return Ll(ge(h.line,h.ch+g),i);g+=p.textContent.length}}Cl.prototype.init=function(e){var t=this,r=this,n=r.cm,i=r.div=e.lineDiv;function o(e){if(!st(n,e)){if(n.somethingSelected())dl({lineWise:!1,text:n.getSelections()}),"cut"==e.type&&n.replaceSelection("",null,"cut");else{if(!n.options.lineWiseCopyCut)return;var t=ml(n);dl({lineWise:!0,text:t.text}),"cut"==e.type&&n.operation(function(){n.setSelections(t.ranges,0,V),n.replaceSelection("",null,"cut")})}if(e.clipboardData){e.clipboardData.clearData();var o=fl.text.join("\n");if(e.clipboardData.setData("Text",o),e.clipboardData.getData("Text")==o)return void e.preventDefault()}var l=bl(),s=l.firstChild;n.display.lineSpace.insertBefore(l,n.display.lineSpace.firstChild),s.value=fl.text.join("\n");var a=document.activeElement;E(s),setTimeout(function(){n.display.lineSpace.removeChild(l),a.focus(),a==i&&r.showPrimarySelection()},50)}}yl(i,n.options.spellcheck),nt(i,"paste",function(e){st(n,e)||gl(e,n)||s<=11&&setTimeout(Xn(n,function(){return t.updateFromDOM()}),20)}),nt(i,"compositionstart",function(e){t.composing={data:e.data,done:!1}}),nt(i,"compositionupdate",function(e){t.composing||(t.composing={data:e.data,done:!1})}),nt(i,"compositionend",function(e){t.composing&&(e.data!=t.composing.data&&t.readFromDOMSoon(),t.composing.done=!0)}),nt(i,"touchstart",function(){return r.forceCompositionEnd()}),nt(i,"input",function(){t.composing||t.readFromDOMSoon()}),nt(i,"copy",o),nt(i,"cut",o)},Cl.prototype.prepareSelection=function(){var e=an(this.cm,!1);return e.focus=this.cm.state.focused,e},Cl.prototype.showSelection=function(e,t){e&&this.cm.display.view.length&&((e.focus||t)&&this.showPrimarySelection(),this.showMultipleSelections(e))},Cl.prototype.showPrimarySelection=function(){var e=window.getSelection(),t=this.cm.doc.sel.primary(),n=Tl(this.cm,e.anchorNode,e.anchorOffset),i=Tl(this.cm,e.focusNode,e.focusOffset);if(!n||n.bad||!i||i.bad||0!=ve(we(n,i),t.from())||0!=ve(be(n,i),t.to())){var o=Sl(this.cm,t.from()),l=Sl(this.cm,t.to());if(o||l){var s,a=this.cm.display.view,u=e.rangeCount&&e.getRangeAt(0);if(o){if(!l){var c=a[a.length-1].measure,h=c.maps?c.maps[c.maps.length-1]:c.map;l={node:h[h.length-1],offset:h[h.length-2]-h[h.length-3]}}}else o={node:a[0].measure.map[2],offset:0};try{s=T(o.node,o.offset,l.offset,l.node)}catch(e){}s&&(!r&&this.cm.state.focused?(e.collapse(o.node,o.offset),s.collapsed||(e.removeAllRanges(),e.addRange(s))):(e.removeAllRanges(),e.addRange(s)),u&&null==e.anchorNode?e.addRange(u):r&&this.startGracePeriod()),this.rememberSelection()}else e.removeAllRanges()}},Cl.prototype.startGracePeriod=function(){var e=this;clearTimeout(this.gracePeriod),this.gracePeriod=setTimeout(function(){e.gracePeriod=!1,e.selectionChanged()&&e.cm.operation(function(){return e.cm.curOp.selectionChanged=!0})},20)},Cl.prototype.showMultipleSelections=function(e){N(this.cm.display.cursorDiv,e.cursors),N(this.cm.display.selectionDiv,e.selection)},Cl.prototype.rememberSelection=function(){var e=window.getSelection();this.lastAnchorNode=e.anchorNode,this.lastAnchorOffset=e.anchorOffset,this.lastFocusNode=e.focusNode,this.lastFocusOffset=e.focusOffset},Cl.prototype.selectionInEditor=function(){var e=window.getSelection();if(!e.rangeCount)return!1;var t=e.getRangeAt(0).commonAncestorContainer;return A(this.div,t)},Cl.prototype.focus=function(){"nocursor"!=this.cm.options.readOnly&&(this.selectionInEditor()||this.showSelection(this.prepareSelection(),!0),this.div.focus())},Cl.prototype.blur=function(){this.div.blur()},Cl.prototype.getField=function(){return this.div},Cl.prototype.supportsTouch=function(){return!0},Cl.prototype.receivedFocus=function(){var e=this;this.selectionInEditor()?this.pollSelection():jn(this.cm,function(){return e.cm.curOp.selectionChanged=!0}),this.polling.set(this.cm.options.pollInterval,function t(){e.cm.state.focused&&(e.pollSelection(),e.polling.set(e.cm.options.pollInterval,t))})},Cl.prototype.selectionChanged=function(){var e=window.getSelection();return e.anchorNode!=this.lastAnchorNode||e.anchorOffset!=this.lastAnchorOffset||e.focusNode!=this.lastFocusNode||e.focusOffset!=this.lastFocusOffset},Cl.prototype.pollSelection=function(){if(null==this.readDOMTimeout&&!this.gracePeriod&&this.selectionChanged()){var e=window.getSelection(),t=this.cm;if(v&&c&&this.cm.options.gutters.length&&function(e){for(var t=e;t;t=t.parentNode)if(/CodeMirror-gutter-wrapper/.test(t.className))return!0;return!1}(e.anchorNode))return this.cm.triggerOnKeyDown({type:"keydown",keyCode:8,preventDefault:Math.abs}),this.blur(),void this.focus();if(!this.composing){this.rememberSelection();var r=Tl(t,e.anchorNode,e.anchorOffset),n=Tl(t,e.focusNode,e.focusOffset);r&&n&&jn(t,function(){Gi(t.doc,di(r,n),V),(r.bad||n.bad)&&(t.curOp.selectionChanged=!0)})}}},Cl.prototype.pollContent=function(){null!=this.readDOMTimeout&&(clearTimeout(this.readDOMTimeout),this.readDOMTimeout=null);var e,t,r,n=this.cm,i=n.display,o=n.doc.sel.primary(),l=o.from(),s=o.to();if(0==l.ch&&l.line>n.firstLine()&&(l=ge(l.line-1,se(n.doc,l.line-1).length)),s.ch==se(n.doc,s.line).text.length&&s.line<n.lastLine()&&(s=ge(s.line+1,0)),l.line<i.viewFrom||s.line>i.viewTo-1)return!1;l.line==i.viewFrom||0==(e=ln(n,l.line))?(t=he(i.view[0].line),r=i.view[0].node):(t=he(i.view[e].line),r=i.view[e-1].node.nextSibling);var a,u,c=ln(n,s.line);if(c==i.view.length-1?(a=i.viewTo-1,u=i.lineDiv.lastChild):(a=he(i.view[c+1].line)-1,u=i.view[c+1].node.previousSibling),!r)return!1;for(var h=n.doc.splitLines(function(e,t,r,n,i){var o="",l=!1,s=e.doc.lineSeparator();function a(){l&&(o+=s,l=!1)}function u(e){e&&(a(),o+=e)}function c(t){if(1==t.nodeType){var r=t.getAttribute("cm-text");if(null!=r)return void u(r||t.textContent.replace(/\u200b/g,""));var o,h=t.getAttribute("cm-marker");if(h){var f=e.findMarks(ge(n,0),ge(i+1,0),(g=+h,function(e){return e.id==g}));return void(f.length&&(o=f[0].find())&&u(ae(e.doc,o.from,o.to).join(s)))}if("false"==t.getAttribute("contenteditable"))return;var d=/^(pre|div|p)$/i.test(t.nodeName);d&&a();for(var p=0;p<t.childNodes.length;p++)c(t.childNodes[p]);d&&(l=!0)}else 3==t.nodeType&&u(t.nodeValue);var g}for(;c(t),t!=r;)t=t.nextSibling;return o}(n,r,u,t,a)),f=ae(n.doc,ge(t,0),ge(a,se(n.doc,a).text.length));h.length>1&&f.length>1;)if($(h)==$(f))h.pop(),f.pop(),a--;else{if(h[0]!=f[0])break;h.shift(),f.shift(),t++}for(var d=0,p=0,g=h[0],v=f[0],m=Math.min(g.length,v.length);d<m&&g.charCodeAt(d)==v.charCodeAt(d);)++d;for(var y=$(h),b=$(f),w=Math.min(y.length-(1==h.length?d:0),b.length-(1==f.length?d:0));p<w&&y.charCodeAt(y.length-p-1)==b.charCodeAt(b.length-p-1);)++p;if(1==h.length&&1==f.length&&t==l.line)for(;d&&d>l.ch&&y.charCodeAt(y.length-p-1)==b.charCodeAt(b.length-p-1);)d--,p++;h[h.length-1]=y.slice(0,y.length-p).replace(/^\u200b+/,""),h[0]=h[0].slice(d).replace(/\u200b+$/,"");var x=ge(t,d),C=ge(a,f.length?$(f).length-p:0);return h.length>1||h[0]||ve(x,C)?(ro(n.doc,h,x,C,"+input"),!0):void 0},Cl.prototype.ensurePolled=function(){this.forceCompositionEnd()},Cl.prototype.reset=function(){this.forceCompositionEnd()},Cl.prototype.forceCompositionEnd=function(){this.composing&&(clearTimeout(this.readDOMTimeout),this.composing=null,this.updateFromDOM(),this.div.blur(),this.div.focus())},Cl.prototype.readFromDOMSoon=function(){var e=this;null==this.readDOMTimeout&&(this.readDOMTimeout=setTimeout(function(){if(e.readDOMTimeout=null,e.composing){if(!e.composing.done)return;e.composing=null}e.updateFromDOM()},80))},Cl.prototype.updateFromDOM=function(){var e=this;!this.cm.isReadOnly()&&this.pollContent()||jn(this.cm,function(){return $n(e.cm)})},Cl.prototype.setUneditable=function(e){e.contentEditable="false"},Cl.prototype.onKeyPress=function(e){0!=e.charCode&&(e.preventDefault(),this.cm.isReadOnly()||Xn(this.cm,pl)(this.cm,String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),0))},Cl.prototype.readOnlyChanged=function(e){this.div.contentEditable=String("nocursor"!=e)},Cl.prototype.onContextMenu=function(){},Cl.prototype.resetPosition=function(){},Cl.prototype.needsContentAttribute=!0;var Ml=function(e){this.cm=e,this.prevInput="",this.pollingFast=!1,this.polling=new R,this.inaccurateSelection=!1,this.hasSelection=!1,this.composing=null};Ml.prototype.init=function(e){var t=this,r=this,n=this.cm,i=this.wrapper=bl(),o=this.textarea=i.firstChild;function a(e){if(!st(n,e)){if(n.somethingSelected())dl({lineWise:!1,text:n.getSelections()}),r.inaccurateSelection&&(r.prevInput="",r.inaccurateSelection=!1,o.value=fl.text.join("\n"),E(o));else{if(!n.options.lineWiseCopyCut)return;var t=ml(n);dl({lineWise:!0,text:t.text}),"cut"==e.type?n.setSelections(t.ranges,null,V):(r.prevInput="",o.value=t.text.join("\n"),E(o))}"cut"==e.type&&(n.state.cutIncoming=!0)}}e.wrapper.insertBefore(i,e.wrapper.firstChild),g&&(o.style.width="0px"),nt(o,"input",function(){l&&s>=9&&t.hasSelection&&(t.hasSelection=null),r.poll()}),nt(o,"paste",function(e){st(n,e)||gl(e,n)||(n.state.pasteIncoming=!0,r.fastPoll())}),nt(o,"cut",a),nt(o,"copy",a),nt(e.scroller,"paste",function(t){xr(e,t)||st(n,t)||(n.state.pasteIncoming=!0,r.focus())}),nt(e.lineSpace,"selectstart",function(t){xr(e,t)||ht(t)}),nt(o,"compositionstart",function(){var e=n.getCursor("from");r.composing&&r.composing.range.clear(),r.composing={start:e,range:n.markText(e,n.getCursor("to"),{className:"CodeMirror-composing"})}}),nt(o,"compositionend",function(){r.composing&&(r.poll(),r.composing.range.clear(),r.composing=null)})},Ml.prototype.prepareSelection=function(){var e=this.cm,t=e.display,r=e.doc,n=an(e);if(e.options.moveInputWithCursor){var i=jr(e,r.sel.primary().head,"div"),o=t.wrapper.getBoundingClientRect(),l=t.lineDiv.getBoundingClientRect();n.teTop=Math.max(0,Math.min(t.wrapper.clientHeight-10,i.top+l.top-o.top)),n.teLeft=Math.max(0,Math.min(t.wrapper.clientWidth-10,i.left+l.left-o.left))}return n},Ml.prototype.showSelection=function(e){var t=this.cm.display;N(t.cursorDiv,e.cursors),N(t.selectionDiv,e.selection),null!=e.teTop&&(this.wrapper.style.top=e.teTop+"px",this.wrapper.style.left=e.teLeft+"px")},Ml.prototype.reset=function(e){if(!this.contextMenuPending){var t,r,n=this.cm,i=n.doc;if(n.somethingSelected()){this.prevInput="";var o=i.sel.primary(),a=(t=Tt&&(o.to().line-o.from().line>100||(r=n.getSelection()).length>1e3))?"-":r||n.getSelection();this.textarea.value=a,n.state.focused&&E(this.textarea),l&&s>=9&&(this.hasSelection=a)}else e||(this.prevInput=this.textarea.value="",l&&s>=9&&(this.hasSelection=null));this.inaccurateSelection=t}},Ml.prototype.getField=function(){return this.textarea},Ml.prototype.supportsTouch=function(){return!1},Ml.prototype.focus=function(){if("nocursor"!=this.cm.options.readOnly&&(!m||D()!=this.textarea))try{this.textarea.focus()}catch(e){}},Ml.prototype.blur=function(){this.textarea.blur()},Ml.prototype.resetPosition=function(){this.wrapper.style.top=this.wrapper.style.left=0},Ml.prototype.receivedFocus=function(){this.slowPoll()},Ml.prototype.slowPoll=function(){var e=this;this.pollingFast||this.polling.set(this.cm.options.pollInterval,function(){e.poll(),e.cm.state.focused&&e.slowPoll()})},Ml.prototype.fastPoll=function(){var e=!1,t=this;t.pollingFast=!0,t.polling.set(20,function r(){t.poll()||e?(t.pollingFast=!1,t.slowPoll()):(e=!0,t.polling.set(60,r))})},Ml.prototype.poll=function(){var e=this,t=this.cm,r=this.textarea,n=this.prevInput;if(this.contextMenuPending||!t.state.focused||Lt(r)&&!n&&!this.composing||t.isReadOnly()||t.options.disableInput||t.state.keySeq)return!1;var i=r.value;if(i==n&&!t.somethingSelected())return!1;if(l&&s>=9&&this.hasSelection===i||y&&/[\uf700-\uf7ff]/.test(i))return t.display.input.reset(),!1;if(t.doc.sel==t.display.selForContextMenu){var o=i.charCodeAt(0);if(8203!=o||n||(n="​"),8666==o)return this.reset(),this.cm.execCommand("undo")}for(var a=0,u=Math.min(n.length,i.length);a<u&&n.charCodeAt(a)==i.charCodeAt(a);)++a;return jn(t,function(){pl(t,i.slice(a),n.length-a,null,e.composing?"*compose":null),i.length>1e3||i.indexOf("\n")>-1?r.value=e.prevInput="":e.prevInput=i,e.composing&&(e.composing.range.clear(),e.composing.range=t.markText(e.composing.start,t.getCursor("to"),{className:"CodeMirror-composing"}))}),!0},Ml.prototype.ensurePolled=function(){this.pollingFast&&this.poll()&&(this.pollingFast=!1)},Ml.prototype.onKeyPress=function(){l&&s>=9&&(this.hasSelection=null),this.fastPoll()},Ml.prototype.onContextMenu=function(e){var t=this,r=t.cm,n=r.display,i=t.textarea,o=on(r,e),u=n.scroller.scrollTop;if(o&&!h){r.options.resetSelectionOnContextMenu&&-1==r.doc.sel.contains(o)&&Xn(r,Gi)(r.doc,di(o),V);var c=i.style.cssText,f=t.wrapper.style.cssText;t.wrapper.style.cssText="position: absolute";var d,p=t.wrapper.getBoundingClientRect();if(i.style.cssText="position: absolute; width: 30px; height: 30px;\n      top: "+(e.clientY-p.top-5)+"px; left: "+(e.clientX-p.left-5)+"px;\n      z-index: 1000; background: "+(l?"rgba(255, 255, 255, .05)":"transparent")+";\n      outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);",a&&(d=window.scrollY),n.input.focus(),a&&window.scrollTo(null,d),n.input.reset(),r.somethingSelected()||(i.value=t.prevInput=" "),t.contextMenuPending=!0,n.selForContextMenu=r.doc.sel,clearTimeout(n.detectingSelectAll),l&&s>=9&&v(),S){pt(e);var g=function(){ot(window,"mouseup",g),setTimeout(m,20)};nt(window,"mouseup",g)}else setTimeout(m,50)}function v(){if(null!=i.selectionStart){var e=r.somethingSelected(),o="​"+(e?i.value:"");i.value="⇚",i.value=o,t.prevInput=e?"":"​",i.selectionStart=1,i.selectionEnd=o.length,n.selForContextMenu=r.doc.sel}}function m(){if(t.contextMenuPending=!1,t.wrapper.style.cssText=f,i.style.cssText=c,l&&s<9&&n.scrollbars.setScrollTop(n.scroller.scrollTop=u),null!=i.selectionStart){(!l||l&&s<9)&&v();var e=0,o=function(){n.selForContextMenu==r.doc.sel&&0==i.selectionStart&&i.selectionEnd>0&&"​"==t.prevInput?Xn(r,$i)(r):e++<10?n.detectingSelectAll=setTimeout(o,500):(n.selForContextMenu=null,n.input.reset())};n.detectingSelectAll=setTimeout(o,200)}}},Ml.prototype.readOnlyChanged=function(e){e||this.reset()},Ml.prototype.setUneditable=function(){},Ml.prototype.needsContentAttribute=!1,function(e){var t=e.optionHandlers;function r(r,n,i,o){e.defaults[r]=n,i&&(t[r]=o?function(e,t,r){r!=nl&&i(e,t,r)}:i)}e.defineOption=r,e.Init=nl,r("value","",function(e,t){return e.setValue(t)},!0),r("mode",null,function(e,t){e.doc.modeOption=t,yi(e)},!0),r("indentUnit",2,yi,!0),r("indentWithTabs",!1),r("smartIndent",!0),r("tabSize",4,function(e){bi(e),Rr(e),$n(e)},!0),r("lineSeparator",null,function(e,t){if(e.doc.lineSep=t,t){var r=[],n=e.doc.first;e.doc.iter(function(e){for(var i=0;;){var o=e.text.indexOf(t,i);if(-1==o)break;i=o+t.length,r.push(ge(n,o))}n++});for(var i=r.length-1;i>=0;i--)ro(e.doc,t,r[i],ge(r[i].line,r[i].ch+t.length))}}),r("specialChars",/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g,function(e,t,r){e.state.specialChars=new RegExp(t.source+(t.test("\t")?"":"|\t"),"g"),r!=nl&&e.refresh()}),r("specialCharPlaceholder",Qt,function(e){return e.refresh()},!0),r("electricChars",!0),r("inputStyle",m?"contenteditable":"textarea",function(){throw new Error("inputStyle can not (yet) be changed in a running editor")},!0),r("spellcheck",!1,function(e,t){return e.getInputField().spellcheck=t},!0),r("rtlMoveVisually",!w),r("wholeLineUpdateBefore",!0),r("theme","default",function(e){rl(e),ll(e)},!0),r("keyMap","default",function(e,t,r){var n=Io(t),i=r!=nl&&Io(r);i&&i.detach&&i.detach(e,n),n.attach&&n.attach(e,i||null)}),r("extraKeys",null),r("lineWrapping",!1,al,!0),r("gutters",[],function(e){ui(e.options),ll(e)},!0),r("fixedGutter",!0,function(e,t){e.display.gutters.style.left=t?tn(e.display)+"px":"0",e.refresh()},!0),r("coverGutterNextToScrollbar",!1,function(e){return Wn(e)},!0),r("scrollbarStyle","native",function(e){Hn(e),Wn(e),e.display.scrollbars.setScrollTop(e.doc.scrollTop),e.display.scrollbars.setScrollLeft(e.doc.scrollLeft)},!0),r("lineNumbers",!1,function(e){ui(e.options),ll(e)},!0),r("firstLineNumber",1,ll,!0),r("lineNumberFormatter",function(e){return e},ll,!0),r("showCursorWhenSelecting",!1,sn,!0),r("resetSelectionOnContextMenu",!0),r("lineWiseCopyCut",!0),r("readOnly",!1,function(e,t){"nocursor"==t?(pn(e),e.display.input.blur(),e.display.disabled=!0):e.display.disabled=!1,e.display.input.readOnlyChanged(t)}),r("disableInput",!1,function(e,t){t||e.display.input.reset()},!0),r("dragDrop",!0,sl),r("allowDropFileTypes",null),r("cursorBlinkRate",530),r("cursorScrollMargin",0),r("cursorHeight",1,sn,!0),r("singleCursorHeightPerLine",!0,sn,!0),r("workTime",100),r("workDelay",100),r("flattenSpans",!0,bi,!0),r("addModeClass",!1,bi,!0),r("pollInterval",100),r("undoDepth",200,function(e,t){return e.doc.history.undoDepth=t}),r("historyEventDelay",1250),r("viewportMargin",10,function(e){return e.refresh()},!0),r("maxHighlightLength",1e4,bi,!0),r("moveInputWithCursor",!0,function(e,t){t||e.display.input.resetPosition()}),r("tabindex",null,function(e,t){return e.display.input.getField().tabIndex=t||""}),r("autofocus",null),r("direction","ltr",function(e,t){return e.doc.setDirection(t)},!0)}(ul),function(e){var t=e.optionHandlers,r=e.helpers={};e.prototype={constructor:e,focus:function(){window.focus(),this.display.input.focus()},setOption:function(e,r){var n=this.options,i=n[e];n[e]==r&&"mode"!=e||(n[e]=r,t.hasOwnProperty(e)&&Xn(this,t[e])(this,r,i),lt(this,"optionChange",this,e))},getOption:function(e){return this.options[e]},getDoc:function(){return this.doc},addKeyMap:function(e,t){this.state.keyMaps[t?"push":"unshift"](Io(e))},removeKeyMap:function(e){for(var t=this.state.keyMaps,r=0;r<t.length;++r)if(t[r]==e||t[r].name==e)return t.splice(r,1),!0},addOverlay:Yn(function(t,r){var n=t.token?t:e.getMode(this.options,t);if(n.startState)throw new Error("Overlays may not be stateful.");!function(e,t,r){for(var n=0,i=r(t);n<e.length&&r(e[n])<=i;)n++;e.splice(n,0,t)}(this.state.overlays,{mode:n,modeSpec:t,opaque:r&&r.opaque,priority:r&&r.priority||0},function(e){return e.priority}),this.state.modeGen++,$n(this)}),removeOverlay:Yn(function(e){for(var t=this.state.overlays,r=0;r<t.length;++r){var n=t[r].modeSpec;if(n==e||"string"==typeof e&&n.name==e)return t.splice(r,1),this.state.modeGen++,void $n(this)}}),indentLine:Yn(function(e,t,r){"string"!=typeof t&&"number"!=typeof t&&(t=null==t?this.options.smartIndent?"smart":"prev":t?"add":"subtract"),de(this.doc,e)&&hl(this,e,t,r)}),indentSelection:Yn(function(e){for(var t=this.doc.sel.ranges,r=-1,n=0;n<t.length;n++){var i=t[n];if(i.empty())i.head.line>r&&(hl(this,i.head.line,e,!0),r=i.head.line,n==this.doc.sel.primIndex&&Fn(this));else{var o=i.from(),l=i.to(),s=Math.max(r,o.line);r=Math.min(this.lastLine(),l.line-(l.ch?0:1))+1;for(var a=s;a<r;++a)hl(this,a,e);var u=this.doc.sel.ranges;0==o.ch&&t.length==u.length&&u[n].from().ch>0&&zi(this.doc,n,new hi(o,u[n].to()),V)}}}),getTokenAt:function(e,t){return Vt(this,e,t)},getLineTokens:function(e,t){return Vt(this,ge(e),t,!0)},getTokenTypeAt:function(e){e=Ce(this.doc,e);var t,r=zt(this,se(this.doc,e.line)),n=0,i=(r.length-1)/2,o=e.ch;if(0==o)t=r[2];else for(;;){var l=n+i>>1;if((l?r[2*l-1]:0)>=o)i=l;else{if(!(r[2*l+1]<o)){t=r[2*l+2];break}n=l+1}}var s=t?t.indexOf("overlay "):-1;return s<0?t:0==s?null:t.slice(0,s-1)},getModeAt:function(t){var r=this.doc.mode;return r.innerMode?e.innerMode(r,this.getTokenAt(t).state).mode:r},getHelper:function(e,t){return this.getHelpers(e,t)[0]},getHelpers:function(e,t){var n=[];if(!r.hasOwnProperty(t))return n;var i=r[t],o=this.getModeAt(e);if("string"==typeof o[t])i[o[t]]&&n.push(i[o[t]]);else if(o[t])for(var l=0;l<o[t].length;l++){var s=i[o[t][l]];s&&n.push(s)}else o.helperType&&i[o.helperType]?n.push(i[o.helperType]):i[o.name]&&n.push(i[o.name]);for(var a=0;a<i._global.length;a++){var u=i._global[a];u.pred(o,this)&&-1==B(n,u.val)&&n.push(u.val)}return n},getStateAfter:function(e,t){var r=this.doc;return Rt(this,(e=xe(r,null==e?r.first+r.size-1:e))+1,t)},cursorCoords:function(e,t){var r=this.doc.sel.primary();return jr(this,null==e?r.head:"object"==typeof e?Ce(this.doc,e):e?r.from():r.to(),t||"page")},charCoords:function(e,t){return Kr(this,Ce(this.doc,e),t||"page")},coordsChar:function(e,t){return _r(this,(e=Vr(this,e,t||"page")).left,e.top)},lineAtHeight:function(e,t){return e=Vr(this,{top:e,left:0},t||"page").top,fe(this.doc,e+this.display.viewOffset)},heightAtLine:function(e,t,r){var n,i=!1;if("number"==typeof e){var o=this.doc.first+this.doc.size-1;e<this.doc.first?e=this.doc.first:e>o&&(e=o,i=!0),n=se(this.doc,e)}else n=e;return Ur(this,n,{top:0,left:0},t||"page",r||i).top+(i?this.doc.height-je(n):0)},defaultTextHeight:function(){return Qr(this.display)},defaultCharWidth:function(){return Jr(this.display)},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(e,t,r,n,i){var o,l,s,a=this.display,u=(e=jr(this,Ce(this.doc,e))).bottom,c=e.left;if(t.style.position="absolute",t.setAttribute("cm-ignore-events","true"),this.display.input.setUneditable(t),a.sizer.appendChild(t),"over"==n)u=e.top;else if("above"==n||"near"==n){var h=Math.max(a.wrapper.clientHeight,this.doc.height),f=Math.max(a.sizer.clientWidth,a.lineSpace.clientWidth);("above"==n||e.bottom+t.offsetHeight>h)&&e.top>t.offsetHeight?u=e.top-t.offsetHeight:e.bottom+t.offsetHeight<=h&&(u=e.bottom),c+t.offsetWidth>f&&(c=f-t.offsetWidth)}t.style.top=u+"px",t.style.left=t.style.right="","right"==i?(c=a.sizer.clientWidth-t.offsetWidth,t.style.right="0px"):("left"==i?c=0:"middle"==i&&(c=(a.sizer.clientWidth-t.offsetWidth)/2),t.style.left=c+"px"),r&&(o=this,l={left:c,top:u,right:c+t.offsetWidth,bottom:u+t.offsetHeight},null!=(s=Pn(o,l)).scrollTop&&wn(o,s.scrollTop),null!=s.scrollLeft&&xn(o,s.scrollLeft))},triggerOnKeyDown:Yn($o),triggerOnKeyPress:Yn(Zo),triggerOnKeyUp:qo,execCommand:function(e){if(Ro.hasOwnProperty(e))return Ro[e].call(null,this)},triggerElectric:Yn(function(e){vl(this,e)}),findPosH:function(e,t,r,n){var i=1;t<0&&(i=-1,t=-t);for(var o=Ce(this.doc,e),l=0;l<t&&!(o=wl(this.doc,o,i,r,n)).hitSide;++l);return o},moveH:Yn(function(e,t){var r=this;this.extendSelectionsBy(function(n){return r.display.shift||r.doc.extend||n.empty()?wl(r.doc,n.head,e,t,r.options.rtlMoveVisually):e<0?n.from():n.to()},j)}),deleteH:Yn(function(e,t){var r=this.doc.sel,n=this.doc;r.somethingSelected()?n.replaceSelection("",null,"+delete"):zo(this,function(r){var i=wl(n,r.head,e,t,!1);return e<0?{from:i,to:r.head}:{from:r.head,to:i}})}),findPosV:function(e,t,r,n){var i=1,o=n;t<0&&(i=-1,t=-t);for(var l=Ce(this.doc,e),s=0;s<t;++s){var a=jr(this,l,"div");if(null==o?o=a.left:a.left=o,(l=xl(this,a,i,r)).hitSide)break}return l},moveV:Yn(function(e,t){var r=this,n=this.doc,i=[],o=!this.display.shift&&!n.extend&&n.sel.somethingSelected();if(n.extendSelectionsBy(function(l){if(o)return e<0?l.from():l.to();var s=jr(r,l.head,"div");null!=l.goalColumn&&(s.left=l.goalColumn),i.push(s.left);var a=xl(r,s,e,t);return"page"==t&&l==n.sel.primary()&&En(r,null,Kr(r,a,"div").top-s.top),a},j),i.length)for(var l=0;l<n.sel.ranges.length;l++)n.sel.ranges[l].goalColumn=i[l]}),findWordAt:function(e){var t=se(this.doc,e.line).text,r=e.ch,n=e.ch;if(t){var i=this.getHelper(e,"wordChars");"before"!=e.sticky&&n!=t.length||!r?++n:--r;for(var o=t.charAt(r),l=te(o,i)?function(e){return te(e,i)}:/\s/.test(o)?function(e){return/\s/.test(e)}:function(e){return!/\s/.test(e)&&!te(e)};r>0&&l(t.charAt(r-1));)--r;for(;n<t.length&&l(t.charAt(n));)++n}return new hi(ge(e.line,r),ge(e.line,n))},toggleOverwrite:function(e){null!=e&&e==this.state.overwrite||((this.state.overwrite=!this.state.overwrite)?H(this.display.cursorDiv,"CodeMirror-overwrite"):k(this.display.cursorDiv,"CodeMirror-overwrite"),lt(this,"overwriteToggle",this,this.state.overwrite))},hasFocus:function(){return this.display.input.getField()==D()},isReadOnly:function(){return!(!this.options.readOnly&&!this.doc.cantEdit)},scrollTo:Yn(function(e,t){null==e&&null==t||In(this),null!=e&&(this.curOp.scrollLeft=e),null!=t&&(this.curOp.scrollTop=t)}),getScrollInfo:function(){var e=this.display.scroller;return{left:e.scrollLeft,top:e.scrollTop,height:e.scrollHeight-Tr(this)-this.display.barHeight,width:e.scrollWidth-Tr(this)-this.display.barWidth,clientHeight:Mr(this),clientWidth:kr(this)}},scrollIntoView:Yn(function(e,t){if(null==e?(e={from:this.doc.sel.primary().head,to:null},null==t&&(t=this.options.cursorScrollMargin)):"number"==typeof e?e={from:ge(e,0),to:null}:null==e.from&&(e={from:e,to:null}),e.to||(e.to=e.from),e.margin=t||0,null!=e.from.line)In(this),this.curOp.scrollToPos=e;else{var r=Pn(this,{left:Math.min(e.from.left,e.to.left),top:Math.min(e.from.top,e.to.top)-e.margin,right:Math.max(e.from.right,e.to.right),bottom:Math.max(e.from.bottom,e.to.bottom)+e.margin});this.scrollTo(r.scrollLeft,r.scrollTop)}}),setSize:Yn(function(e,t){var r=this,n=function(e){return"number"==typeof e||/^\d+$/.test(String(e))?e+"px":e};null!=e&&(this.display.wrapper.style.width=n(e)),null!=t&&(this.display.wrapper.style.height=n(t)),this.options.lineWrapping&&zr(this);var i=this.display.viewFrom;this.doc.iter(i,this.display.viewTo,function(e){if(e.widgets)for(var t=0;t<e.widgets.length;t++)if(e.widgets[t].noHScroll){qn(r,i,"widget");break}++i}),this.curOp.forceUpdate=!0,lt(this,"refresh",this)}),operation:function(e){return jn(this,e)},refresh:Yn(function(){var e=this.display.cachedTextHeight;$n(this),this.curOp.forceUpdate=!0,Rr(this),this.scrollTo(this.doc.scrollLeft,this.doc.scrollTop),li(this),(null==e||Math.abs(e-Qr(this.display))>.5)&&nn(this),lt(this,"refresh",this)}),swapDoc:Yn(function(e){var t=this.doc;return t.cm=null,Si(this,e),Rr(this),this.display.input.reset(),this.scrollTo(e.scrollLeft,e.scrollTop),this.curOp.forceScroll=!0,sr(this,"swapDoc",this,t),t}),getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},ct(e),e.registerHelper=function(t,n,i){r.hasOwnProperty(t)||(r[t]=e[t]={_global:[]}),r[t][n]=i},e.registerGlobalHelper=function(t,n,i,o){e.registerHelper(t,n,o),r[t]._global.push({pred:i,val:o})}}(ul);var Nl="iter insert remove copy getEditor constructor".split(" ");for(var Ol in bo.prototype)bo.prototype.hasOwnProperty(Ol)&&B(Nl,Ol)<0&&(ul.prototype[Ol]=function(e){return function(){return e.apply(this.doc,arguments)}}(bo.prototype[Ol]));return ct(bo),ul.inputStyles={textarea:Ml,contenteditable:Cl},ul.defineMode=function(e){ul.defaults.mode||"null"==e||(ul.defaults.mode=e),function(e,t){arguments.length>2&&(t.dependencies=Array.prototype.slice.call(arguments,2)),Mt[e]=t}.apply(this,arguments)},ul.defineMIME=function(e,t){Nt[e]=t},ul.defineMode("null",function(){return{token:function(e){return e.skipToEnd()}}}),ul.defineMIME("text/plain","null"),ul.defineExtension=function(e,t){ul.prototype[e]=t},ul.defineDocExtension=function(e,t){bo.prototype[e]=t},ul.fromTextArea=function(e,t){if((t=t?I(t):{}).value=e.value,!t.tabindex&&e.tabIndex&&(t.tabindex=e.tabIndex),!t.placeholder&&e.placeholder&&(t.placeholder=e.placeholder),null==t.autofocus){var r=D();t.autofocus=r==e||null!=e.getAttribute("autofocus")&&r==document.body}function n(){e.value=s.getValue()}var i;if(e.form&&(nt(e.form,"submit",n),!t.leaveSubmitMethodAlone)){var o=e.form;i=o.submit;try{var l=o.submit=function(){n(),o.submit=i,o.submit(),o.submit=l}}catch(e){}}t.finishInit=function(t){t.save=n,t.getTextArea=function(){return e},t.toTextArea=function(){t.toTextArea=isNaN,n(),e.parentNode.removeChild(t.getWrapperElement()),e.style.display="",e.form&&(ot(e.form,"submit",n),"function"==typeof e.form.submit&&(e.form.submit=i))}},e.style.display="none";var s=ul(function(t){return e.parentNode.insertBefore(t,e.nextSibling)},t);return s},function(e){e.off=ot,e.on=nt,e.wheelEventPixels=Tn,e.Doc=bo,e.splitLines=St,e.countColumn=z,e.findColumn=X,e.isWordChar=ee,e.Pass=U,e.signal=lt,e.Line=Xt,e.changeEnd=pi,e.scrollbarModel=Dn,e.Pos=ge,e.cmpPos=ve,e.modes=Mt,e.mimeModes=Nt,e.resolveMode=Ot,e.getMode=Wt,e.modeExtensions=At,e.extendMode=Dt,e.copyState=Ht,e.startState=Et,e.innerMode=Pt,e.commands=Ro,e.keyMap=Ao,e.keyName=Fo,e.isModifierKey=Eo,e.lookupKey=Po,e.normalizeKeyMap=Ho,e.StringStream=Ft,e.SharedTextMarker=go,e.TextMarker=fo,e.LineWidget=uo,e.e_preventDefault=ht,e.e_stopPropagation=ft,e.e_stop=pt,e.addClass=H,e.contains=A,e.rmClass=k,e.keyNames=Mo}(ul),ul.version="5.25.0",ul});
-
-
-
-(function(){function diff_match_patch(){this.Diff_Timeout=1;this.Diff_EditCost=4;this.Match_Threshold=0.5;this.Match_Distance=1E3;this.Patch_DeleteThreshold=0.5;this.Patch_Margin=4;this.Match_MaxBits=32}
-diff_match_patch.prototype.diff_main=function(a,b,c,d){"undefined"==typeof d&&(d=0>=this.Diff_Timeout?Number.MAX_VALUE:(new Date).getTime()+1E3*this.Diff_Timeout);if(null==a||null==b)throw Error("Null input. (diff_main)");if(a==b)return a?[[0,a]]:[];"undefined"==typeof c&&(c=!0);var e=c,f=this.diff_commonPrefix(a,b);c=a.substring(0,f);a=a.substring(f);b=b.substring(f);var f=this.diff_commonSuffix(a,b),g=a.substring(a.length-f);a=a.substring(0,a.length-f);b=b.substring(0,b.length-f);a=this.diff_compute_(a,
-b,e,d);c&&a.unshift([0,c]);g&&a.push([0,g]);this.diff_cleanupMerge(a);return a};
-diff_match_patch.prototype.diff_compute_=function(a,b,c,d){if(!a)return[[1,b]];if(!b)return[[-1,a]];var e=a.length>b.length?a:b,f=a.length>b.length?b:a,g=e.indexOf(f);return-1!=g?(c=[[1,e.substring(0,g)],[0,f],[1,e.substring(g+f.length)]],a.length>b.length&&(c[0][0]=c[2][0]=-1),c):1==f.length?[[-1,a],[1,b]]:(e=this.diff_halfMatch_(a,b))?(f=e[0],a=e[1],g=e[2],b=e[3],e=e[4],f=this.diff_main(f,g,c,d),c=this.diff_main(a,b,c,d),f.concat([[0,e]],c)):c&&100<a.length&&100<b.length?this.diff_lineMode_(a,b,
-d):this.diff_bisect_(a,b,d)};
-diff_match_patch.prototype.diff_lineMode_=function(a,b,c){var d=this.diff_linesToChars_(a,b);a=d.chars1;b=d.chars2;d=d.lineArray;a=this.diff_main(a,b,!1,c);this.diff_charsToLines_(a,d);this.diff_cleanupSemantic(a);a.push([0,""]);for(var e=d=b=0,f="",g="";b<a.length;){switch(a[b][0]){case 1:e++;g+=a[b][1];break;case -1:d++;f+=a[b][1];break;case 0:if(1<=d&&1<=e){a.splice(b-d-e,d+e);b=b-d-e;d=this.diff_main(f,g,!1,c);for(e=d.length-1;0<=e;e--)a.splice(b,0,d[e]);b+=d.length}d=e=0;g=f=""}b++}a.pop();return a};
-diff_match_patch.prototype.diff_bisect_=function(a,b,c){for(var d=a.length,e=b.length,f=Math.ceil((d+e)/2),g=f,h=2*f,j=Array(h),i=Array(h),k=0;k<h;k++)j[k]=-1,i[k]=-1;j[g+1]=0;i[g+1]=0;for(var k=d-e,q=0!=k%2,r=0,t=0,p=0,w=0,v=0;v<f&&!((new Date).getTime()>c);v++){for(var n=-v+r;n<=v-t;n+=2){var l=g+n,m;m=n==-v||n!=v&&j[l-1]<j[l+1]?j[l+1]:j[l-1]+1;for(var s=m-n;m<d&&s<e&&a.charAt(m)==b.charAt(s);)m++,s++;j[l]=m;if(m>d)t+=2;else if(s>e)r+=2;else if(q&&(l=g+k-n,0<=l&&l<h&&-1!=i[l])){var u=d-i[l];if(m>=
-u)return this.diff_bisectSplit_(a,b,m,s,c)}}for(n=-v+p;n<=v-w;n+=2){l=g+n;u=n==-v||n!=v&&i[l-1]<i[l+1]?i[l+1]:i[l-1]+1;for(m=u-n;u<d&&m<e&&a.charAt(d-u-1)==b.charAt(e-m-1);)u++,m++;i[l]=u;if(u>d)w+=2;else if(m>e)p+=2;else if(!q&&(l=g+k-n,0<=l&&(l<h&&-1!=j[l])&&(m=j[l],s=g+m-l,u=d-u,m>=u)))return this.diff_bisectSplit_(a,b,m,s,c)}}return[[-1,a],[1,b]]};
-diff_match_patch.prototype.diff_bisectSplit_=function(a,b,c,d,e){var f=a.substring(0,c),g=b.substring(0,d);a=a.substring(c);b=b.substring(d);f=this.diff_main(f,g,!1,e);e=this.diff_main(a,b,!1,e);return f.concat(e)};
-diff_match_patch.prototype.diff_linesToChars_=function(a,b){function c(a){for(var b="",c=0,f=-1,g=d.length;f<a.length-1;){f=a.indexOf("\n",c);-1==f&&(f=a.length-1);var r=a.substring(c,f+1),c=f+1;(e.hasOwnProperty?e.hasOwnProperty(r):void 0!==e[r])?b+=String.fromCharCode(e[r]):(b+=String.fromCharCode(g),e[r]=g,d[g++]=r)}return b}var d=[],e={};d[0]="";var f=c(a),g=c(b);return{chars1:f,chars2:g,lineArray:d}};
-diff_match_patch.prototype.diff_charsToLines_=function(a,b){for(var c=0;c<a.length;c++){for(var d=a[c][1],e=[],f=0;f<d.length;f++)e[f]=b[d.charCodeAt(f)];a[c][1]=e.join("")}};diff_match_patch.prototype.diff_commonPrefix=function(a,b){if(!a||!b||a.charAt(0)!=b.charAt(0))return 0;for(var c=0,d=Math.min(a.length,b.length),e=d,f=0;c<e;)a.substring(f,e)==b.substring(f,e)?f=c=e:d=e,e=Math.floor((d-c)/2+c);return e};
-diff_match_patch.prototype.diff_commonSuffix=function(a,b){if(!a||!b||a.charAt(a.length-1)!=b.charAt(b.length-1))return 0;for(var c=0,d=Math.min(a.length,b.length),e=d,f=0;c<e;)a.substring(a.length-e,a.length-f)==b.substring(b.length-e,b.length-f)?f=c=e:d=e,e=Math.floor((d-c)/2+c);return e};
-diff_match_patch.prototype.diff_commonOverlap_=function(a,b){var c=a.length,d=b.length;if(0==c||0==d)return 0;c>d?a=a.substring(c-d):c<d&&(b=b.substring(0,c));c=Math.min(c,d);if(a==b)return c;for(var d=0,e=1;;){var f=a.substring(c-e),f=b.indexOf(f);if(-1==f)return d;e+=f;if(0==f||a.substring(c-e)==b.substring(0,e))d=e,e++}};
-diff_match_patch.prototype.diff_halfMatch_=function(a,b){function c(a,b,c){for(var d=a.substring(c,c+Math.floor(a.length/4)),e=-1,g="",h,j,n,l;-1!=(e=b.indexOf(d,e+1));){var m=f.diff_commonPrefix(a.substring(c),b.substring(e)),s=f.diff_commonSuffix(a.substring(0,c),b.substring(0,e));g.length<s+m&&(g=b.substring(e-s,e)+b.substring(e,e+m),h=a.substring(0,c-s),j=a.substring(c+m),n=b.substring(0,e-s),l=b.substring(e+m))}return 2*g.length>=a.length?[h,j,n,l,g]:null}if(0>=this.Diff_Timeout)return null;
-var d=a.length>b.length?a:b,e=a.length>b.length?b:a;if(4>d.length||2*e.length<d.length)return null;var f=this,g=c(d,e,Math.ceil(d.length/4)),d=c(d,e,Math.ceil(d.length/2)),h;if(!g&&!d)return null;h=d?g?g[4].length>d[4].length?g:d:d:g;var j;a.length>b.length?(g=h[0],d=h[1],e=h[2],j=h[3]):(e=h[0],j=h[1],g=h[2],d=h[3]);h=h[4];return[g,d,e,j,h]};
-diff_match_patch.prototype.diff_cleanupSemantic=function(a){for(var b=!1,c=[],d=0,e=null,f=0,g=0,h=0,j=0,i=0;f<a.length;)0==a[f][0]?(c[d++]=f,g=j,h=i,i=j=0,e=a[f][1]):(1==a[f][0]?j+=a[f][1].length:i+=a[f][1].length,e&&(e.length<=Math.max(g,h)&&e.length<=Math.max(j,i))&&(a.splice(c[d-1],0,[-1,e]),a[c[d-1]+1][0]=1,d--,d--,f=0<d?c[d-1]:-1,i=j=h=g=0,e=null,b=!0)),f++;b&&this.diff_cleanupMerge(a);this.diff_cleanupSemanticLossless(a);for(f=1;f<a.length;){if(-1==a[f-1][0]&&1==a[f][0]){b=a[f-1][1];c=a[f][1];
-d=this.diff_commonOverlap_(b,c);e=this.diff_commonOverlap_(c,b);if(d>=e){if(d>=b.length/2||d>=c.length/2)a.splice(f,0,[0,c.substring(0,d)]),a[f-1][1]=b.substring(0,b.length-d),a[f+1][1]=c.substring(d),f++}else if(e>=b.length/2||e>=c.length/2)a.splice(f,0,[0,b.substring(0,e)]),a[f-1][0]=1,a[f-1][1]=c.substring(0,c.length-e),a[f+1][0]=-1,a[f+1][1]=b.substring(e),f++;f++}f++}};
-diff_match_patch.prototype.diff_cleanupSemanticLossless=function(a){function b(a,b){if(!a||!b)return 6;var c=a.charAt(a.length-1),d=b.charAt(0),e=c.match(diff_match_patch.nonAlphaNumericRegex_),f=d.match(diff_match_patch.nonAlphaNumericRegex_),g=e&&c.match(diff_match_patch.whitespaceRegex_),h=f&&d.match(diff_match_patch.whitespaceRegex_),c=g&&c.match(diff_match_patch.linebreakRegex_),d=h&&d.match(diff_match_patch.linebreakRegex_),i=c&&a.match(diff_match_patch.blanklineEndRegex_),j=d&&b.match(diff_match_patch.blanklineStartRegex_);
-return i||j?5:c||d?4:e&&!g&&h?3:g||h?2:e||f?1:0}for(var c=1;c<a.length-1;){if(0==a[c-1][0]&&0==a[c+1][0]){var d=a[c-1][1],e=a[c][1],f=a[c+1][1],g=this.diff_commonSuffix(d,e);if(g)var h=e.substring(e.length-g),d=d.substring(0,d.length-g),e=h+e.substring(0,e.length-g),f=h+f;for(var g=d,h=e,j=f,i=b(d,e)+b(e,f);e.charAt(0)===f.charAt(0);){var d=d+e.charAt(0),e=e.substring(1)+f.charAt(0),f=f.substring(1),k=b(d,e)+b(e,f);k>=i&&(i=k,g=d,h=e,j=f)}a[c-1][1]!=g&&(g?a[c-1][1]=g:(a.splice(c-1,1),c--),a[c][1]=
-h,j?a[c+1][1]=j:(a.splice(c+1,1),c--))}c++}};diff_match_patch.nonAlphaNumericRegex_=/[^a-zA-Z0-9]/;diff_match_patch.whitespaceRegex_=/\s/;diff_match_patch.linebreakRegex_=/[\r\n]/;diff_match_patch.blanklineEndRegex_=/\n\r?\n$/;diff_match_patch.blanklineStartRegex_=/^\r?\n\r?\n/;
-diff_match_patch.prototype.diff_cleanupEfficiency=function(a){for(var b=!1,c=[],d=0,e=null,f=0,g=!1,h=!1,j=!1,i=!1;f<a.length;){if(0==a[f][0])a[f][1].length<this.Diff_EditCost&&(j||i)?(c[d++]=f,g=j,h=i,e=a[f][1]):(d=0,e=null),j=i=!1;else if(-1==a[f][0]?i=!0:j=!0,e&&(g&&h&&j&&i||e.length<this.Diff_EditCost/2&&3==g+h+j+i))a.splice(c[d-1],0,[-1,e]),a[c[d-1]+1][0]=1,d--,e=null,g&&h?(j=i=!0,d=0):(d--,f=0<d?c[d-1]:-1,j=i=!1),b=!0;f++}b&&this.diff_cleanupMerge(a)};
-diff_match_patch.prototype.diff_cleanupMerge=function(a){a.push([0,""]);for(var b=0,c=0,d=0,e="",f="",g;b<a.length;)switch(a[b][0]){case 1:d++;f+=a[b][1];b++;break;case -1:c++;e+=a[b][1];b++;break;case 0:1<c+d?(0!==c&&0!==d&&(g=this.diff_commonPrefix(f,e),0!==g&&(0<b-c-d&&0==a[b-c-d-1][0]?a[b-c-d-1][1]+=f.substring(0,g):(a.splice(0,0,[0,f.substring(0,g)]),b++),f=f.substring(g),e=e.substring(g)),g=this.diff_commonSuffix(f,e),0!==g&&(a[b][1]=f.substring(f.length-g)+a[b][1],f=f.substring(0,f.length-
-g),e=e.substring(0,e.length-g))),0===c?a.splice(b-d,c+d,[1,f]):0===d?a.splice(b-c,c+d,[-1,e]):a.splice(b-c-d,c+d,[-1,e],[1,f]),b=b-c-d+(c?1:0)+(d?1:0)+1):0!==b&&0==a[b-1][0]?(a[b-1][1]+=a[b][1],a.splice(b,1)):b++,c=d=0,f=e=""}""===a[a.length-1][1]&&a.pop();c=!1;for(b=1;b<a.length-1;)0==a[b-1][0]&&0==a[b+1][0]&&(a[b][1].substring(a[b][1].length-a[b-1][1].length)==a[b-1][1]?(a[b][1]=a[b-1][1]+a[b][1].substring(0,a[b][1].length-a[b-1][1].length),a[b+1][1]=a[b-1][1]+a[b+1][1],a.splice(b-1,1),c=!0):a[b][1].substring(0,
-a[b+1][1].length)==a[b+1][1]&&(a[b-1][1]+=a[b+1][1],a[b][1]=a[b][1].substring(a[b+1][1].length)+a[b+1][1],a.splice(b+1,1),c=!0)),b++;c&&this.diff_cleanupMerge(a)};diff_match_patch.prototype.diff_xIndex=function(a,b){var c=0,d=0,e=0,f=0,g;for(g=0;g<a.length;g++){1!==a[g][0]&&(c+=a[g][1].length);-1!==a[g][0]&&(d+=a[g][1].length);if(c>b)break;e=c;f=d}return a.length!=g&&-1===a[g][0]?f:f+(b-e)};
-diff_match_patch.prototype.diff_prettyHtml=function(a){for(var b=[],c=/&/g,d=/</g,e=/>/g,f=/\n/g,g=0;g<a.length;g++){var h=a[g][0],j=a[g][1],j=j.replace(c,"&amp;").replace(d,"&lt;").replace(e,"&gt;").replace(f,"&para;<br>");switch(h){case 1:b[g]='<ins style="background:#e6ffe6;">'+j+"</ins>";break;case -1:b[g]='<del style="background:#ffe6e6;">'+j+"</del>";break;case 0:b[g]="<span>"+j+"</span>"}}return b.join("")};
-diff_match_patch.prototype.diff_text1=function(a){for(var b=[],c=0;c<a.length;c++)1!==a[c][0]&&(b[c]=a[c][1]);return b.join("")};diff_match_patch.prototype.diff_text2=function(a){for(var b=[],c=0;c<a.length;c++)-1!==a[c][0]&&(b[c]=a[c][1]);return b.join("")};diff_match_patch.prototype.diff_levenshtein=function(a){for(var b=0,c=0,d=0,e=0;e<a.length;e++){var f=a[e][0],g=a[e][1];switch(f){case 1:c+=g.length;break;case -1:d+=g.length;break;case 0:b+=Math.max(c,d),d=c=0}}return b+=Math.max(c,d)};
-diff_match_patch.prototype.diff_toDelta=function(a){for(var b=[],c=0;c<a.length;c++)switch(a[c][0]){case 1:b[c]="+"+encodeURI(a[c][1]);break;case -1:b[c]="-"+a[c][1].length;break;case 0:b[c]="="+a[c][1].length}return b.join("\t").replace(/%20/g," ")};
-diff_match_patch.prototype.diff_fromDelta=function(a,b){for(var c=[],d=0,e=0,f=b.split(/\t/g),g=0;g<f.length;g++){var h=f[g].substring(1);switch(f[g].charAt(0)){case "+":try{c[d++]=[1,decodeURI(h)]}catch(j){throw Error("Illegal escape in diff_fromDelta: "+h);}break;case "-":case "=":var i=parseInt(h,10);if(isNaN(i)||0>i)throw Error("Invalid number in diff_fromDelta: "+h);h=a.substring(e,e+=i);"="==f[g].charAt(0)?c[d++]=[0,h]:c[d++]=[-1,h];break;default:if(f[g])throw Error("Invalid diff operation in diff_fromDelta: "+
-f[g]);}}if(e!=a.length)throw Error("Delta length ("+e+") does not equal source text length ("+a.length+").");return c};diff_match_patch.prototype.match_main=function(a,b,c){if(null==a||null==b||null==c)throw Error("Null input. (match_main)");c=Math.max(0,Math.min(c,a.length));return a==b?0:a.length?a.substring(c,c+b.length)==b?c:this.match_bitap_(a,b,c):-1};
-diff_match_patch.prototype.match_bitap_=function(a,b,c){function d(a,d){var e=a/b.length,g=Math.abs(c-d);return!f.Match_Distance?g?1:e:e+g/f.Match_Distance}if(b.length>this.Match_MaxBits)throw Error("Pattern too long for this browser.");var e=this.match_alphabet_(b),f=this,g=this.Match_Threshold,h=a.indexOf(b,c);-1!=h&&(g=Math.min(d(0,h),g),h=a.lastIndexOf(b,c+b.length),-1!=h&&(g=Math.min(d(0,h),g)));for(var j=1<<b.length-1,h=-1,i,k,q=b.length+a.length,r,t=0;t<b.length;t++){i=0;for(k=q;i<k;)d(t,c+
-k)<=g?i=k:q=k,k=Math.floor((q-i)/2+i);q=k;i=Math.max(1,c-k+1);var p=Math.min(c+k,a.length)+b.length;k=Array(p+2);for(k[p+1]=(1<<t)-1;p>=i;p--){var w=e[a.charAt(p-1)];k[p]=0===t?(k[p+1]<<1|1)&w:(k[p+1]<<1|1)&w|((r[p+1]|r[p])<<1|1)|r[p+1];if(k[p]&j&&(w=d(t,p-1),w<=g))if(g=w,h=p-1,h>c)i=Math.max(1,2*c-h);else break}if(d(t+1,c)>g)break;r=k}return h};
-diff_match_patch.prototype.match_alphabet_=function(a){for(var b={},c=0;c<a.length;c++)b[a.charAt(c)]=0;for(c=0;c<a.length;c++)b[a.charAt(c)]|=1<<a.length-c-1;return b};
-diff_match_patch.prototype.patch_addContext_=function(a,b){if(0!=b.length){for(var c=b.substring(a.start2,a.start2+a.length1),d=0;b.indexOf(c)!=b.lastIndexOf(c)&&c.length<this.Match_MaxBits-this.Patch_Margin-this.Patch_Margin;)d+=this.Patch_Margin,c=b.substring(a.start2-d,a.start2+a.length1+d);d+=this.Patch_Margin;(c=b.substring(a.start2-d,a.start2))&&a.diffs.unshift([0,c]);(d=b.substring(a.start2+a.length1,a.start2+a.length1+d))&&a.diffs.push([0,d]);a.start1-=c.length;a.start2-=c.length;a.length1+=
-c.length+d.length;a.length2+=c.length+d.length}};
-diff_match_patch.prototype.patch_make=function(a,b,c){var d;if("string"==typeof a&&"string"==typeof b&&"undefined"==typeof c)d=a,b=this.diff_main(d,b,!0),2<b.length&&(this.diff_cleanupSemantic(b),this.diff_cleanupEfficiency(b));else if(a&&"object"==typeof a&&"undefined"==typeof b&&"undefined"==typeof c)b=a,d=this.diff_text1(b);else if("string"==typeof a&&b&&"object"==typeof b&&"undefined"==typeof c)d=a;else if("string"==typeof a&&"string"==typeof b&&c&&"object"==typeof c)d=a,b=c;else throw Error("Unknown call format to patch_make.");
-if(0===b.length)return[];c=[];a=new diff_match_patch.patch_obj;for(var e=0,f=0,g=0,h=d,j=0;j<b.length;j++){var i=b[j][0],k=b[j][1];!e&&0!==i&&(a.start1=f,a.start2=g);switch(i){case 1:a.diffs[e++]=b[j];a.length2+=k.length;d=d.substring(0,g)+k+d.substring(g);break;case -1:a.length1+=k.length;a.diffs[e++]=b[j];d=d.substring(0,g)+d.substring(g+k.length);break;case 0:k.length<=2*this.Patch_Margin&&e&&b.length!=j+1?(a.diffs[e++]=b[j],a.length1+=k.length,a.length2+=k.length):k.length>=2*this.Patch_Margin&&
-e&&(this.patch_addContext_(a,h),c.push(a),a=new diff_match_patch.patch_obj,e=0,h=d,f=g)}1!==i&&(f+=k.length);-1!==i&&(g+=k.length)}e&&(this.patch_addContext_(a,h),c.push(a));return c};diff_match_patch.prototype.patch_deepCopy=function(a){for(var b=[],c=0;c<a.length;c++){var d=a[c],e=new diff_match_patch.patch_obj;e.diffs=[];for(var f=0;f<d.diffs.length;f++)e.diffs[f]=d.diffs[f].slice();e.start1=d.start1;e.start2=d.start2;e.length1=d.length1;e.length2=d.length2;b[c]=e}return b};
-diff_match_patch.prototype.patch_apply=function(a,b){if(0==a.length)return[b,[]];a=this.patch_deepCopy(a);var c=this.patch_addPadding(a);b=c+b+c;this.patch_splitMax(a);for(var d=0,e=[],f=0;f<a.length;f++){var g=a[f].start2+d,h=this.diff_text1(a[f].diffs),j,i=-1;if(h.length>this.Match_MaxBits){if(j=this.match_main(b,h.substring(0,this.Match_MaxBits),g),-1!=j&&(i=this.match_main(b,h.substring(h.length-this.Match_MaxBits),g+h.length-this.Match_MaxBits),-1==i||j>=i))j=-1}else j=this.match_main(b,h,g);
-if(-1==j)e[f]=!1,d-=a[f].length2-a[f].length1;else if(e[f]=!0,d=j-g,g=-1==i?b.substring(j,j+h.length):b.substring(j,i+this.Match_MaxBits),h==g)b=b.substring(0,j)+this.diff_text2(a[f].diffs)+b.substring(j+h.length);else if(g=this.diff_main(h,g,!1),h.length>this.Match_MaxBits&&this.diff_levenshtein(g)/h.length>this.Patch_DeleteThreshold)e[f]=!1;else{this.diff_cleanupSemanticLossless(g);for(var h=0,k,i=0;i<a[f].diffs.length;i++){var q=a[f].diffs[i];0!==q[0]&&(k=this.diff_xIndex(g,h));1===q[0]?b=b.substring(0,
-j+k)+q[1]+b.substring(j+k):-1===q[0]&&(b=b.substring(0,j+k)+b.substring(j+this.diff_xIndex(g,h+q[1].length)));-1!==q[0]&&(h+=q[1].length)}}}b=b.substring(c.length,b.length-c.length);return[b,e]};
-diff_match_patch.prototype.patch_addPadding=function(a){for(var b=this.Patch_Margin,c="",d=1;d<=b;d++)c+=String.fromCharCode(d);for(d=0;d<a.length;d++)a[d].start1+=b,a[d].start2+=b;var d=a[0],e=d.diffs;if(0==e.length||0!=e[0][0])e.unshift([0,c]),d.start1-=b,d.start2-=b,d.length1+=b,d.length2+=b;else if(b>e[0][1].length){var f=b-e[0][1].length;e[0][1]=c.substring(e[0][1].length)+e[0][1];d.start1-=f;d.start2-=f;d.length1+=f;d.length2+=f}d=a[a.length-1];e=d.diffs;0==e.length||0!=e[e.length-1][0]?(e.push([0,
-c]),d.length1+=b,d.length2+=b):b>e[e.length-1][1].length&&(f=b-e[e.length-1][1].length,e[e.length-1][1]+=c.substring(0,f),d.length1+=f,d.length2+=f);return c};
-diff_match_patch.prototype.patch_splitMax=function(a){for(var b=this.Match_MaxBits,c=0;c<a.length;c++)if(!(a[c].length1<=b)){var d=a[c];a.splice(c--,1);for(var e=d.start1,f=d.start2,g="";0!==d.diffs.length;){var h=new diff_match_patch.patch_obj,j=!0;h.start1=e-g.length;h.start2=f-g.length;""!==g&&(h.length1=h.length2=g.length,h.diffs.push([0,g]));for(;0!==d.diffs.length&&h.length1<b-this.Patch_Margin;){var g=d.diffs[0][0],i=d.diffs[0][1];1===g?(h.length2+=i.length,f+=i.length,h.diffs.push(d.diffs.shift()),
-j=!1):-1===g&&1==h.diffs.length&&0==h.diffs[0][0]&&i.length>2*b?(h.length1+=i.length,e+=i.length,j=!1,h.diffs.push([g,i]),d.diffs.shift()):(i=i.substring(0,b-h.length1-this.Patch_Margin),h.length1+=i.length,e+=i.length,0===g?(h.length2+=i.length,f+=i.length):j=!1,h.diffs.push([g,i]),i==d.diffs[0][1]?d.diffs.shift():d.diffs[0][1]=d.diffs[0][1].substring(i.length))}g=this.diff_text2(h.diffs);g=g.substring(g.length-this.Patch_Margin);i=this.diff_text1(d.diffs).substring(0,this.Patch_Margin);""!==i&&
-(h.length1+=i.length,h.length2+=i.length,0!==h.diffs.length&&0===h.diffs[h.diffs.length-1][0]?h.diffs[h.diffs.length-1][1]+=i:h.diffs.push([0,i]));j||a.splice(++c,0,h)}}};diff_match_patch.prototype.patch_toText=function(a){for(var b=[],c=0;c<a.length;c++)b[c]=a[c];return b.join("")};
-diff_match_patch.prototype.patch_fromText=function(a){var b=[];if(!a)return b;a=a.split("\n");for(var c=0,d=/^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@$/;c<a.length;){var e=a[c].match(d);if(!e)throw Error("Invalid patch string: "+a[c]);var f=new diff_match_patch.patch_obj;b.push(f);f.start1=parseInt(e[1],10);""===e[2]?(f.start1--,f.length1=1):"0"==e[2]?f.length1=0:(f.start1--,f.length1=parseInt(e[2],10));f.start2=parseInt(e[3],10);""===e[4]?(f.start2--,f.length2=1):"0"==e[4]?f.length2=0:(f.start2--,f.length2=
-parseInt(e[4],10));for(c++;c<a.length;){e=a[c].charAt(0);try{var g=decodeURI(a[c].substring(1))}catch(h){throw Error("Illegal escape in patch_fromText: "+g);}if("-"==e)f.diffs.push([-1,g]);else if("+"==e)f.diffs.push([1,g]);else if(" "==e)f.diffs.push([0,g]);else if("@"==e)break;else if(""!==e)throw Error('Invalid patch mode "'+e+'" in: '+g);c++}}return b};diff_match_patch.patch_obj=function(){this.diffs=[];this.start2=this.start1=null;this.length2=this.length1=0};
-diff_match_patch.patch_obj.prototype.toString=function(){var a,b;a=0===this.length1?this.start1+",0":1==this.length1?this.start1+1:this.start1+1+","+this.length1;b=0===this.length2?this.start2+",0":1==this.length2?this.start2+1:this.start2+1+","+this.length2;a=["@@ -"+a+" +"+b+" @@\n"];var c;for(b=0;b<this.diffs.length;b++){switch(this.diffs[b][0]){case 1:c="+";break;case -1:c="-";break;case 0:c=" "}a[b+1]=c+encodeURI(this.diffs[b][1])+"\n"}return a.join("").replace(/%20/g," ")};
-this.diff_match_patch=diff_match_patch;this.DIFF_DELETE=-1;this.DIFF_INSERT=1;this.DIFF_EQUAL=0;})();
-
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-// merge.js
-// declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
-!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","diff_match_patch"],e):e(CodeMirror)}(function(e){"use strict";var t,i,r,n=e.Pos,o="http://www.w3.org/2000/svg",l=2,a=!0,s=null,c=!1;function h(e,t){this.mv=e,this.type=t,this.classes="left"==t?{chunk:"CodeMirror-merge-l-chunk",start:"CodeMirror-merge-l-chunk-start",end:"CodeMirror-merge-l-chunk-end",insert:"CodeMirror-merge-l-inserted",del:"CodeMirror-merge-l-deleted",connect:"CodeMirror-merge-l-connect"}:{chunk:"CodeMirror-merge-r-chunk",start:"CodeMirror-merge-r-chunk-start",end:"CodeMirror-merge-r-chunk-end",insert:"CodeMirror-merge-r-inserted",del:"CodeMirror-merge-r-deleted",connect:"CodeMirror-merge-r-connect"}}function f(t){t.diffOutOfDate&&(t.diff=I(t.orig.getValue(),t.edit.getValue(),t.mv.options.ignoreWhitespace),t.chunks=N(t.diff),t.diffOutOfDate=!1,e.signal(t.edit,"updateDiff",t.diff))}e.k_init=function(n,o,h){t=h,i="",r=o;var f=function(){if(null==t)return;var o=document.getElementById(n);return o.innerHTML="",f=e.MergeView(o,{value:t,origLeft:3!=l||c||s?null:i,orig:r,lineNumbers:!0,mode:"text/html",theme:"blackboard",matchBrackets:!0,highlightDifferences:a,connect:s,collapseIdentical:c,readOnly:"nocursor",revertButtons:!0}),console.log(f.edit),f}();return f},h.prototype={constructor:h,init:function(t,i,r){this.edit=this.mv.edit,(this.edit.state.diffViews||(this.edit.state.diffViews=[])).push(this),this.orig=e(t,Q({value:i,readOnly:!this.mv.options.allowEditingOriginals},Q(r))),"align"==this.mv.options.connect&&(this.edit.state.trackAlignable||(this.edit.state.trackAlignable=new X(this.edit)),this.orig.state.trackAlignable=new X(this.orig)),this.orig.state.diffViews=[this];var n=r.chunkClassLocation||"background";"[object Array]"!=Object.prototype.toString.call(n)&&(n=[n]),this.classes.classLocation=n,this.diff=I(x(i),x(r.value),this.mv.options.ignoreWhitespace),this.chunks=N(this.diff),this.diffOutOfDate=this.dealigned=!1,this.needsScrollSync=null,this.showDifferences=!1!==r.showDifferences},registerEvents:function(t){this.forceUpdate=function(t){var i,r={from:0,to:0,marked:[]},n={from:0,to:0,marked:[]},o=!1;function l(e){g=!0,o=!1,"full"==e&&(t.svg&&U(t.svg),t.copyButtons&&U(t.copyButtons),p(t.edit,r.marked,t.classes),p(t.orig,n.marked,t.classes),r.from=r.to=n.from=n.to=0),f(t),t.showDifferences&&(k(t.edit,t.diff,r,DIFF_INSERT,t.classes),k(t.orig,t.diff,n,DIFF_DELETE,t.classes)),"align"==t.mv.options.connect&&S(t),w(t),null!=t.needsScrollSync&&d(t,t.needsScrollSync),g=!1}function a(e){g||(t.dealigned=!0,s(e))}function s(e){g||o||(clearTimeout(i),!0===e&&(o=!0),i=setTimeout(l,!0===e?20:250))}function c(e,i){t.diffOutOfDate||(t.diffOutOfDate=!0,r.from=r.to=n.from=n.to=0),a(i.text.length-1!=i.to.line-i.from.line)}function h(){t.diffOutOfDate=!0,t.dealigned=!0,l("full")}t.edit.on("change",c),t.orig.on("change",c),t.edit.on("swapDoc",h),t.orig.on("swapDoc",h),"align"==t.mv.options.connect&&(e.on(t.edit.state.trackAlignable,"realign",a),e.on(t.orig.state.trackAlignable,"realign",a));return t.edit.on("viewportChange",function(){s(!1)}),t.orig.on("viewportChange",function(){s(!1)}),l(),l}(this),m(this,!0,!1),function(e,t){e.edit.on("scroll",function(){d(e,!0)&&w(e)}),e.orig.on("scroll",function(){d(e,!1)&&w(e),t&&d(t,!0)&&w(t)})}(this,t)},setShowDifferences:function(e){(e=!1!==e)!=this.showDifferences&&(this.showDifferences=e,this.forceUpdate("full"))}};var g=!1;function d(e,t){if(e.diffOutOfDate)return e.lockScroll&&null==e.needsScrollSync&&(e.needsScrollSync=t),!1;if(e.needsScrollSync=null,!e.lockScroll)return!0;var i,r,n=+new Date;if(t?(i=e.edit,r=e.orig):(i=e.orig,r=e.edit),i.state.scrollSetBy==e&&(i.state.scrollSetAt||0)+250>n)return!1;var o=i.getScrollInfo();if("align"==e.mv.options.connect)v=o.top;else{var l,a,s=.5*o.clientHeight,c=o.top+s,h=i.lineAtHeight(c,"local"),f=function(e,t,i){for(var r,n,o,l,a=0;a<e.length;a++){var s=e[a],c=i?s.editFrom:s.origFrom,h=i?s.editTo:s.origTo;null==n&&(c>t?(n=s.editFrom,l=s.origFrom):h>t&&(n=s.editTo,l=s.origTo)),h<=t?(r=s.editTo,o=s.origTo):c<=t&&(r=s.editFrom,o=s.origFrom)}return{edit:{before:r,after:n},orig:{before:o,after:l}}}(e.chunks,h,t),g=u(i,t?f.edit:f.orig),d=u(r,t?f.orig:f.edit),m=(c-g.top)/(g.bot-g.top),v=d.top-s+m*(d.bot-d.top);if(v>o.top&&(a=o.top/s)<1)v=v*a+o.top*(1-a);else if((l=o.height-o.clientHeight-o.top)<s){var p=r.getScrollInfo();p.height-p.clientHeight-v>l&&(a=l/s)<1&&(v=v*a+(p.height-p.clientHeight-l)*(1-a))}}return r.scrollTo(o.left,v),r.state.scrollSetAt=n,r.state.scrollSetBy=e,!0}function u(e,t){var i=t.after;return null==i&&(i=e.lastLine()+1),{top:e.heightAtLine(t.before||0,"local"),bot:e.heightAtLine(i,"local")}}function m(e,t,i){e.lockScroll=t,t&&0!=i&&d(e,DIFF_INSERT)&&w(e)}function v(e,t,i){for(var r=i.classLocation,n=0;n<r.length;n++)e.removeLineClass(t,r[n],i.chunk),e.removeLineClass(t,r[n],i.start),e.removeLineClass(t,r[n],i.end)}function p(t,i,r){for(var n=0;n<i.length;++n){var o=i[n];o instanceof e.TextMarker?o.clear():o.parent&&v(t,o,r)}i.length=0}function k(e,t,i,r,n){var o=e.getViewport();e.operation(function(){i.from==i.to||o.from-i.to>20||i.from-o.to>20?(p(e,i.marked,n),b(e,t,r,i.marked,o.from,o.to,n),i.from=o.from,i.to=o.to):(o.from<i.from&&(b(e,t,r,i.marked,o.from,i.from,n),i.from=o.from),o.to>i.to&&(b(e,t,r,i.marked,i.to,o.to,n),i.to=o.to))})}function C(e,t,i,r,n,o){for(var l=i.classLocation,a=e.getLineHandle(t),s=0;s<l.length;s++)r&&e.addLineClass(a,l[s],i.chunk),n&&e.addLineClass(a,l[s],i.start),o&&e.addLineClass(a,l[s],i.end);return a}function b(e,t,i,r,o,l,a){var s=n(0,0),c=n(o,0),h=e.clipPos(n(l-1)),f=i==DIFF_DELETE?a.del:a.insert;function g(t,i){for(var n=Math.max(o,t),s=Math.min(l,i),c=n;c<s;++c)r.push(C(e,c,a,!0,c==t,c==i-1));t==i&&n==i&&s==i&&(n?r.push(C(e,n-1,a,!1,!1,!0)):r.push(C(e,n,a,!1,!0,!1)))}for(var d=0,u=!1,m=0;m<t.length;++m){var v=t[m],p=v[0],k=v[1];if(p==DIFF_EQUAL){var b=s.line+(V(t,m)?0:1);q(s,k);var w=s.line+(R(t,m)?1:0);w>b&&(u&&(g(d,b),u=!1),d=w)}else if(u=!0,p==i){var T=q(s,k,!0),y=Z(c,s),F=Y(h,T);$(y,F)||r.push(e.markText(y,F,{className:f})),s=T}}u&&g(d,s.line+1)}function w(e){if(e.showDifferences){if(e.svg){U(e.svg);var t=e.gap.offsetWidth;z(e.svg,"width",t,"height",e.gap.offsetHeight)}e.copyButtons&&U(e.copyButtons);for(var i=e.edit.getViewport(),r=e.orig.getViewport(),n=e.mv.wrap.getBoundingClientRect().top,o=n-e.edit.getScrollerElement().getBoundingClientRect().top+e.edit.getScrollInfo().top,l=n-e.orig.getScrollerElement().getBoundingClientRect().top+e.orig.getScrollInfo().top,a=0;a<e.chunks.length;a++){var s=e.chunks[a];s.editFrom<=i.to&&s.editTo>=i.from&&s.origFrom<=r.to&&s.origTo>=r.from&&D(e,s,l,o,t)}}}function T(e,t){for(var i=0,r=0,n=0;n<t.length;n++){var o=t[n];if(o.editTo>e&&o.editFrom<=e)return null;if(o.editFrom>e)break;i=o.editTo,r=o.origTo}return r+(e-i)}function y(e,t,i){for(var r=e.state.trackAlignable,n=e.firstLine(),o=0,l=[],a=0;;a++){for(var s=t[a],c=s?i?s.origFrom:s.editFrom:1e9;o<r.alignable.length;o+=2){var h=r.alignable[o]+1;if(!(h<=n)){if(!(h<=c))break;l.push(h)}}if(!s)break;l.push(n=i?s.origTo:s.editTo)}return l}function F(e,t,i,r){var n=0,o=0,l=0,a=0;e:for(;;n++){var s=e[n],c=t[o];if(!s&&null==c)break;for(var h=s?s[0]:1e9,f=null==c?1e9:c;l<i.length;){var g=i[l];if(g.origFrom<=f&&g.origTo>f){o++,n--;continue e}if(g.editTo>h){if(g.editFrom<=h)continue e;break}a+=g.origTo-g.origFrom-(g.editTo-g.editFrom),l++}if(h==f-a)s[r]=f,o++;else if(h<f-a)s[r]=h+a;else{var d=[f-a,null,null];d[r]=f,e.splice(n,0,d),o++}}}function S(e,t){if(e.dealigned||t){if(!e.orig.curOp)return e.orig.operation(function(){S(e,t)});e.dealigned=!1;var i=e.mv.left==e?e.mv.right:e.mv.left;i&&(f(i),i.dealigned=!1);for(var r=function(e,t){var i=y(e.edit,e.chunks,!1),r=[];if(t)for(var n=0,o=0;n<t.chunks.length;n++){for(var l=t.chunks[n].editTo;o<i.length&&i[o]<l;)o++;o!=i.length&&i[o]==l||i.splice(o++,0,l)}for(n=0;n<i.length;n++)r.push([i[n],null,null]);return F(r,y(e.orig,e.chunks,!0),e.chunks,1),t&&F(r,y(t.orig,t.chunks,!0),t.chunks,2),r}(e,i),n=e.mv.aligners,o=0;o<n.length;o++)n[o].clear();n.length=0;var l=[e.edit,e.orig],a=[];i&&l.push(i.orig);for(o=0;o<l.length;o++)a.push(l[o].getScrollInfo().top);for(var s=0;s<r.length;s++)M(l,r[s],n);for(o=0;o<l.length;o++)l[o].scrollTo(null,a[o])}}function M(e,t,i){for(var r=0,n=[],o=0;o<e.length;o++)if(null!=t[o]){var l=e[o].heightAtLine(t[o],"local");n[o]=l,r=Math.max(r,l)}for(o=0;o<e.length;o++)if(null!=t[o]){var a=r-n[o];a>1&&i.push(L(e[o],t[o],a))}}function L(e,t,i){var r=!0;t>e.lastLine()&&(t--,r=!1);var n=document.createElement("div");return n.className="CodeMirror-merge-spacer",n.style.height=i+"px",n.style.minWidth="1px",e.addLineWidget(t,n,{height:i,above:r,mergeSpacer:!0,handleMouseEvents:!0})}function D(e,t,i,r,n){var l="left"==e.type,a=e.orig.heightAtLine(t.origFrom,"local",!0)-i;if(e.svg){var s=a,c=e.edit.heightAtLine(t.editFrom,"local",!0)-r;if(l){var h=s;s=c,c=h}var f=e.orig.heightAtLine(t.origTo,"local",!0)-i,g=e.edit.heightAtLine(t.editTo,"local",!0)-r;if(l){h=f;f=g,g=h}var d=" C "+n/2+" "+c+" "+n/2+" "+s+" "+(n+2)+" "+s,u=" C "+n/2+" "+f+" "+n/2+" "+g+" -1 "+g;z(e.svg.appendChild(document.createElementNS(o,"path")),"d","M -1 "+c+d+" L "+(n+2)+" "+f+u+" z","class",e.classes.connect)}if(e.copyButtons){var m=e.copyButtons.appendChild(j("div","left"==e.type?"⇝":"⇜","CodeMirror-merge-copy")),v=e.mv.options.allowEditingOriginals;if(m.title=v?"Push to left":"Revert chunk",m.chunk=t,m.style.top=(t.origTo>t.origFrom?a:e.edit.heightAtLine(t.editFrom,"local")-r)+"px",v){var p=e.edit.heightAtLine(t.editFrom,"local")-r,k=e.copyButtons.appendChild(j("div","right"==e.type?"⇝":"⇜","CodeMirror-merge-copy-reverse"));k.title="Push to right",k.chunk={editFrom:t.origFrom,editTo:t.origTo,origFrom:t.editFrom,origTo:t.editTo},k.style.top=p+"px","right"==e.type?k.style.left="2px":k.style.right="2px"}}}function E(e,t,i,r){if(!e.diffOutOfDate){var o=r.origTo>i.lastLine()?n(r.origFrom-1):n(r.origFrom,0),l=n(r.origTo,0),a=r.editTo>t.lastLine()?n(r.editFrom-1):n(r.editFrom,0),s=n(r.editTo,0),c=e.mv.options.revertChunk;c?c(e.mv,i,o,l,t,a,s):t.replaceRange(i.getRange(o,l),a,s)}}var A=e.MergeView=function(t,i){if(!(this instanceof A))return new A(t,i);this.options=i;var r=i.origLeft,n=null==i.origRight?i.orig:i.origRight,o=null!=r,l=null!=n,a=1+(o?1:0)+(l?1:0),s=[],c=this.left=null,f=this.right=null,g=this;if(o){c=this.left=new h(this,"left");var d=P("div",null,"CodeMirror-merge-pane CodeMirror-merge-left");s.push(d),s.push(O(c))}var u=P("div",null,"CodeMirror-merge-pane CodeMirror-merge-editor");if(s.push(u),l){f=this.right=new h(this,"right"),s.push(O(f));var m=P("div",null,"CodeMirror-merge-pane CodeMirror-merge-right");s.push(m)}(l?m:u).className+=" CodeMirror-merge-pane-rightmost",s.push(P("div",null,null,"height: 0; clear: both;"));var v=this.wrap=t.appendChild(P("div",s,"CodeMirror-merge CodeMirror-merge-"+a+"pane"));this.edit=e(u,Q(i)),c&&c.init(d,r,i),f&&f.init(m,n,i),i.collapseIdentical&&this.editor().operation(function(){!function(e,t){"number"!=typeof t&&(t=2);for(var i=[],r=e.editor(),n=r.firstLine(),o=n,l=r.lastLine();o<=l;o++)i.push(!0);e.left&&H(e.left,t,n,i);e.right&&H(e.right,t,n,i);for(var a=0;a<i.length;a++)if(i[a]){for(var s=a+n,c=1;a<i.length-1&&i[a+1];a++,c++);if(c>t){var h=[{line:s,cm:r}];e.left&&h.push({line:T(s,e.left.chunks),cm:e.left.orig}),e.right&&h.push({line:T(s,e.right.chunks),cm:e.right.orig});var f=_(c,h);e.options.onCollapse&&e.options.onCollapse(e,s,c,f)}}}(g,i.collapseIdentical)}),"align"==i.connect&&(this.aligners=[],S(this.left||this.right,!0)),c&&c.registerEvents(f),f&&f.registerEvents(c);var p=function(){c&&w(c),f&&w(f)};e.on(window,"resize",p);var k=setInterval(function(){for(var t=v.parentNode;t&&t!=document.body;t=t.parentNode);t||(clearInterval(k),e.off(window,"resize",p))},5e3)};function O(t){var i=t.lockButton=P("div",null,"CodeMirror-merge-scrolllock");i.title="Toggle locked scrolling";var r=P("div",[i],"CodeMirror-merge-scrolllock-wrap");e.on(i,"click",function(){m(t,!t.lockScroll)});var n=[r];if(!1!==t.mv.options.revertButtons&&(t.copyButtons=P("div",null,"CodeMirror-merge-copybuttons-"+t.type),e.on(t.copyButtons,"click",function(e){var i=e.target||e.srcElement;i.chunk&&("CodeMirror-merge-copy-reverse"!=i.className?E(t,t.edit,t.orig,i.chunk):E(t,t.orig,t.edit,i.chunk))}),n.unshift(t.copyButtons)),"align"!=t.mv.options.connect){var l=document.createElementNS&&document.createElementNS(o,"svg");l&&!l.createSVGRect&&(l=null),t.svg=l,l&&n.push(l)}return t.gap=P("div",n,"CodeMirror-merge-gap")}function x(e){return"string"==typeof e?e:e.getValue()}A.prototype={constructor:A,editor:function(){return this.edit},rightOriginal:function(){return this.right&&this.right.orig},leftOriginal:function(){return this.left&&this.left.orig},setShowDifferences:function(e){this.right&&this.right.setShowDifferences(e),this.left&&this.left.setShowDifferences(e)},rightChunks:function(){if(this.right)return f(this.right),this.right.chunks},leftChunks:function(){if(this.left)return f(this.left),this.left.chunks}};var B=new diff_match_patch;function I(e,t,i){for(var r=B.diff_main(e,t),n=0;n<r.length;++n){var o=r[n];(i?/[^ \t]/.test(o[1]):o[1])?n&&r[n-1][0]==o[0]&&(r.splice(n--,1),r[n][1]+=o[1]):r.splice(n--,1)}return r}function N(e){for(var t=[],i=0,r=0,o=n(0,0),l=n(0,0),a=0;a<e.length;++a){var s=e[a],c=s[0];if(c==DIFF_EQUAL){var h=!V(e,a)||o.line<i||l.line<r?1:0,f=o.line+h,g=l.line+h;q(o,s[1],null,l);var d=R(e,a)?1:0,u=o.line+d,m=l.line+d;u>f&&(a&&t.push({origFrom:r,origTo:g,editFrom:i,editTo:f}),i=u,r=m)}else q(c==DIFF_INSERT?o:l,s[1])}return(i<=o.line||r<=l.line)&&t.push({origFrom:r,origTo:l.line+1,editFrom:i,editTo:o.line+1}),t}function R(e,t){if(t==e.length-1)return!0;var i=e[t+1][1];return!(1==i.length&&t<e.length-2||10!=i.charCodeAt(0))&&(t==e.length-2||((i=e[t+2][1]).length>1||t==e.length-3)&&10==i.charCodeAt(0))}function V(e,t){if(0==t)return!0;var i=e[t-1][1];return 10==i.charCodeAt(i.length-1)&&(1==t||10==(i=e[t-2][1]).charCodeAt(i.length-1))}function W(t,i,r){t.addLineClass(i,"wrap","CodeMirror-merge-collapsed-line");var o=document.createElement("span");o.className="CodeMirror-merge-collapsed-widget",o.title="Identical text collapsed. Click to expand.";var l=t.markText(n(i,0),n(r-1),{inclusiveLeft:!0,inclusiveRight:!0,replacedWith:o,clearOnEnter:!0});function a(){l.clear(),t.removeLineClass(i,"wrap","CodeMirror-merge-collapsed-line")}return e.on(o,"click",a),{mark:l,clear:a}}function _(e,t){var i=[];function r(){for(var e=0;e<i.length;e++)i[e].clear()}for(var n=0;n<t.length;n++){var o=t[n],l=W(o.cm,o.line,o.line+e);i.push(l),l.mark.on("clear",r)}return i[0].mark}function H(e,t,i,r){for(var n=0;n<e.chunks.length;n++)for(var o=e.chunks[n],l=o.editFrom-t;l<o.editTo+t;l++){var a=l+i;a>=0&&a<r.length&&(r[a]=!1)}}function P(e,t,i,r){var n=document.createElement(e);if(i&&(n.className=i),r&&(n.style.cssText=r),"string"==typeof t)n.appendChild(document.createTextNode(t));else if(t)for(var o=0;o<t.length;++o)n.appendChild(t[o]);return n}function j(e,t,i,r){var n=document.createElement(e);if(i&&(n.className=i),r&&(n.style.cssText=r),"string"==typeof t)n.appendChild(document.createTextNode(t));else if(t)for(var o=0;o<t.length;++o)n.appendChild(t[o]);return n}function U(e){for(var t=e.childNodes.length;t>0;--t)e.removeChild(e.firstChild)}function z(e){for(var t=1;t<arguments.length;t+=2)e.setAttribute(arguments[t],arguments[t+1])}function Q(e,t){for(var i in t||(t={}),e)e.hasOwnProperty(i)&&(t[i]=e[i]);return t}function q(e,t,i,r){for(var o=i?n(e.line,e.ch):e,l=0;;){var a=t.indexOf("\n",l);if(-1==a)break;++o.line,r&&++r.line,l=a+1}return o.ch=(l?0:o.ch)+(t.length-l),r&&(r.ch=(l?0:r.ch)+(t.length-l)),o}var G=1,J=2,K=4;function X(e){this.cm=e,this.alignable=[],this.height=e.doc.height;var t=this;e.on("markerAdded",function(e,i){if(i.collapsed){var r=i.find(1);null!=r&&t.set(r.line,K)}}),e.on("markerCleared",function(e,i,r,n){null!=n&&i.collapsed&&t.check(n,K,t.hasMarker)}),e.on("markerChanged",this.signal.bind(this)),e.on("lineWidgetAdded",function(e,i,r){i.mergeSpacer||(i.above?t.set(r-1,J):t.set(r,G))}),e.on("lineWidgetCleared",function(e,i,r){i.mergeSpacer||(i.above?t.check(r-1,J,t.hasWidgetBelow):t.check(r,G,t.hasWidget))}),e.on("lineWidgetChanged",this.signal.bind(this)),e.on("change",function(e,i){var r=i.from.line,n=i.to.line-i.from.line,o=i.text.length-1,l=r+o;(n||o)&&t.map(r,n,o),t.check(l,K,t.hasMarker),(n||o)&&t.check(i.from.line,K,t.hasMarker)}),e.on("viewportChange",function(){t.cm.doc.height!=t.height&&t.signal()})}function Y(e,t){return(e.line-t.line||e.ch-t.ch)<0?e:t}function Z(e,t){return(e.line-t.line||e.ch-t.ch)>0?e:t}function $(e,t){return e.line==t.line&&e.ch==t.ch}function ee(e,t,i){for(var r=e.length-1;r>=0;r--){var n=e[r],o=(i?n.origTo:n.editTo)-1;if(o<t)return o}}function te(e,t,i){for(var r=0;r<e.length;r++){var n=e[r],o=i?n.origFrom:n.editFrom;if(o>t)return o}}function ie(t,i){var r=null,n=t.state.diffViews,o=t.getCursor().line;if(n)for(var l=0;l<n.length;l++){var a=n[l],s=t==a.orig;f(a);var c=i<0?ee(a.chunks,o,s):te(a.chunks,o,s);null==c||null!=r&&!(i<0?c>r:c<r)||(r=c)}if(null==r)return e.Pass;t.setCursor(r,0)}X.prototype={signal:function(){e.signal(this,"realign"),this.height=this.cm.doc.height},set:function(e,t){for(var i=-1;i<this.alignable.length;i+=2){var r=this.alignable[i]-e;if(0==r){if((this.alignable[i+1]&t)==t)return;return this.alignable[i+1]|=t,void this.signal()}if(r>0)break}this.signal(),this.alignable.splice(i,0,e,t)},find:function(e){for(var t=0;t<this.alignable.length;t+=2)if(this.alignable[t]==e)return t;return-1},check:function(e,t,i){var r=this.find(e);if(-1!=r&&this.alignable[r+1]&t&&!i.call(this,e)){this.signal();var n=this.alignable[r+1]&~t;n?this.alignable[r+1]=n:this.alignable.splice(r,2)}},hasMarker:function(e){var t=this.cm.getLineHandle(e);if(t.markedSpans)for(var i=0;i<t.markedSpans.length;i++)if(t.markedSpans[i].mark.collapsed&&null!=t.markedSpans[i].to)return!0;return!1},hasWidget:function(e){var t=this.cm.getLineHandle(e);if(t.widgets)for(var i=0;i<t.widgets.length;i++)if(!t.widgets[i].above&&!t.widgets[i].mergeSpacer)return!0;return!1},hasWidgetBelow:function(e){if(e==this.cm.lastLine())return!1;var t=this.cm.getLineHandle(e+1);if(t.widgets)for(var i=0;i<t.widgets.length;i++)if(t.widgets[i].above&&!t.widgets[i].mergeSpacer)return!0;return!1},map:function(e,t,i){for(var r=i-t,n=e+t,o=-1,l=-1,a=0;a<this.alignable.length;a+=2){var s=this.alignable[a];s==e&&this.alignable[a+1]&J&&(o=a),s==n&&this.alignable[a+1]&J&&(l=a),s<=e||(s<n?this.alignable.splice(a--,2):this.alignable[a]+=r)}if(o>-1){var c=this.alignable[o+1];c==J?this.alignable.splice(o,2):this.alignable[o+1]=c&~J}l>-1&&i&&this.set(e+i,J)}},e.commands.goNextDiff=function(e){return ie(e,1)},e.commands.goPrevDiff=function(e){return ie(e,-1)}});
+(function () {
+    function diff_match_patch() { this.Diff_Timeout = 1; this.Diff_EditCost = 4; this.Match_Threshold = 0.5; this.Match_Distance = 1E3; this.Patch_DeleteThreshold = 0.5; this.Patch_Margin = 4; this.Match_MaxBits = 32 }
+    diff_match_patch.prototype.diff_main = function (a, b, c, d) {
+        "undefined" == typeof d && (d = 0 >= this.Diff_Timeout ? Number.MAX_VALUE : (new Date).getTime() + 1E3 * this.Diff_Timeout); if (null == a || null == b) throw Error("Null input. (diff_main)"); if (a == b) return a ? [[0, a]] : []; "undefined" == typeof c && (c = !0); var e = c, f = this.diff_commonPrefix(a, b); c = a.substring(0, f); a = a.substring(f); b = b.substring(f); var f = this.diff_commonSuffix(a, b), g = a.substring(a.length - f); a = a.substring(0, a.length - f); b = b.substring(0, b.length - f); a = this.diff_compute_(a,
+            b, e, d); c && a.unshift([0, c]); g && a.push([0, g]); this.diff_cleanupMerge(a); return a
+    };
+    diff_match_patch.prototype.diff_compute_ = function (a, b, c, d) {
+        if (!a) return [[1, b]]; if (!b) return [[-1, a]]; var e = a.length > b.length ? a : b, f = a.length > b.length ? b : a, g = e.indexOf(f); return -1 != g ? (c = [[1, e.substring(0, g)], [0, f], [1, e.substring(g + f.length)]], a.length > b.length && (c[0][0] = c[2][0] = -1), c) : 1 == f.length ? [[-1, a], [1, b]] : (e = this.diff_halfMatch_(a, b)) ? (f = e[0], a = e[1], g = e[2], b = e[3], e = e[4], f = this.diff_main(f, g, c, d), c = this.diff_main(a, b, c, d), f.concat([[0, e]], c)) : c && 100 < a.length && 100 < b.length ? this.diff_lineMode_(a, b,
+            d) : this.diff_bisect_(a, b, d)
+    };
+    diff_match_patch.prototype.diff_lineMode_ = function (a, b, c) { var d = this.diff_linesToChars_(a, b); a = d.chars1; b = d.chars2; d = d.lineArray; a = this.diff_main(a, b, !1, c); this.diff_charsToLines_(a, d); this.diff_cleanupSemantic(a); a.push([0, ""]); for (var e = d = b = 0, f = "", g = ""; b < a.length;) { switch (a[b][0]) { case 1: e++; g += a[b][1]; break; case -1: d++; f += a[b][1]; break; case 0: if (1 <= d && 1 <= e) { a.splice(b - d - e, d + e); b = b - d - e; d = this.diff_main(f, g, !1, c); for (e = d.length - 1; 0 <= e; e--)a.splice(b, 0, d[e]); b += d.length } d = e = 0; g = f = "" }b++ } a.pop(); return a };
+    diff_match_patch.prototype.diff_bisect_ = function (a, b, c) {
+        for (var d = a.length, e = b.length, f = Math.ceil((d + e) / 2), g = f, h = 2 * f, j = Array(h), i = Array(h), k = 0; k < h; k++)j[k] = -1, i[k] = -1; j[g + 1] = 0; i[g + 1] = 0; for (var k = d - e, q = 0 != k % 2, r = 0, t = 0, p = 0, w = 0, v = 0; v < f && !((new Date).getTime() > c); v++) {
+            for (var n = -v + r; n <= v - t; n += 2) {
+                var l = g + n, m; m = n == -v || n != v && j[l - 1] < j[l + 1] ? j[l + 1] : j[l - 1] + 1; for (var s = m - n; m < d && s < e && a.charAt(m) == b.charAt(s);)m++, s++; j[l] = m; if (m > d) t += 2; else if (s > e) r += 2; else if (q && (l = g + k - n, 0 <= l && l < h && -1 != i[l])) {
+                    var u = d - i[l]; if (m >=
+                        u) return this.diff_bisectSplit_(a, b, m, s, c)
+                }
+            } for (n = -v + p; n <= v - w; n += 2) { l = g + n; u = n == -v || n != v && i[l - 1] < i[l + 1] ? i[l + 1] : i[l - 1] + 1; for (m = u - n; u < d && m < e && a.charAt(d - u - 1) == b.charAt(e - m - 1);)u++, m++; i[l] = u; if (u > d) w += 2; else if (m > e) p += 2; else if (!q && (l = g + k - n, 0 <= l && (l < h && -1 != j[l]) && (m = j[l], s = g + m - l, u = d - u, m >= u))) return this.diff_bisectSplit_(a, b, m, s, c) }
+        } return [[-1, a], [1, b]]
+    };
+    diff_match_patch.prototype.diff_bisectSplit_ = function (a, b, c, d, e) { var f = a.substring(0, c), g = b.substring(0, d); a = a.substring(c); b = b.substring(d); f = this.diff_main(f, g, !1, e); e = this.diff_main(a, b, !1, e); return f.concat(e) };
+    diff_match_patch.prototype.diff_linesToChars_ = function (a, b) { function c(a) { for (var b = "", c = 0, f = -1, g = d.length; f < a.length - 1;) { f = a.indexOf("\n", c); -1 == f && (f = a.length - 1); var r = a.substring(c, f + 1), c = f + 1; (e.hasOwnProperty ? e.hasOwnProperty(r) : void 0 !== e[r]) ? b += String.fromCharCode(e[r]) : (b += String.fromCharCode(g), e[r] = g, d[g++] = r) } return b } var d = [], e = {}; d[0] = ""; var f = c(a), g = c(b); return { chars1: f, chars2: g, lineArray: d } };
+    diff_match_patch.prototype.diff_charsToLines_ = function (a, b) { for (var c = 0; c < a.length; c++) { for (var d = a[c][1], e = [], f = 0; f < d.length; f++)e[f] = b[d.charCodeAt(f)]; a[c][1] = e.join("") } }; diff_match_patch.prototype.diff_commonPrefix = function (a, b) { if (!a || !b || a.charAt(0) != b.charAt(0)) return 0; for (var c = 0, d = Math.min(a.length, b.length), e = d, f = 0; c < e;)a.substring(f, e) == b.substring(f, e) ? f = c = e : d = e, e = Math.floor((d - c) / 2 + c); return e };
+    diff_match_patch.prototype.diff_commonSuffix = function (a, b) { if (!a || !b || a.charAt(a.length - 1) != b.charAt(b.length - 1)) return 0; for (var c = 0, d = Math.min(a.length, b.length), e = d, f = 0; c < e;)a.substring(a.length - e, a.length - f) == b.substring(b.length - e, b.length - f) ? f = c = e : d = e, e = Math.floor((d - c) / 2 + c); return e };
+    diff_match_patch.prototype.diff_commonOverlap_ = function (a, b) { var c = a.length, d = b.length; if (0 == c || 0 == d) return 0; c > d ? a = a.substring(c - d) : c < d && (b = b.substring(0, c)); c = Math.min(c, d); if (a == b) return c; for (var d = 0, e = 1; ;) { var f = a.substring(c - e), f = b.indexOf(f); if (-1 == f) return d; e += f; if (0 == f || a.substring(c - e) == b.substring(0, e)) d = e, e++ } };
+    diff_match_patch.prototype.diff_halfMatch_ = function (a, b) {
+        function c(a, b, c) { for (var d = a.substring(c, c + Math.floor(a.length / 4)), e = -1, g = "", h, j, n, l; -1 != (e = b.indexOf(d, e + 1));) { var m = f.diff_commonPrefix(a.substring(c), b.substring(e)), s = f.diff_commonSuffix(a.substring(0, c), b.substring(0, e)); g.length < s + m && (g = b.substring(e - s, e) + b.substring(e, e + m), h = a.substring(0, c - s), j = a.substring(c + m), n = b.substring(0, e - s), l = b.substring(e + m)) } return 2 * g.length >= a.length ? [h, j, n, l, g] : null } if (0 >= this.Diff_Timeout) return null;
+        var d = a.length > b.length ? a : b, e = a.length > b.length ? b : a; if (4 > d.length || 2 * e.length < d.length) return null; var f = this, g = c(d, e, Math.ceil(d.length / 4)), d = c(d, e, Math.ceil(d.length / 2)), h; if (!g && !d) return null; h = d ? g ? g[4].length > d[4].length ? g : d : d : g; var j; a.length > b.length ? (g = h[0], d = h[1], e = h[2], j = h[3]) : (e = h[0], j = h[1], g = h[2], d = h[3]); h = h[4]; return [g, d, e, j, h]
+    };
+    diff_match_patch.prototype.diff_cleanupSemantic = function (a) {
+        for (var b = !1, c = [], d = 0, e = null, f = 0, g = 0, h = 0, j = 0, i = 0; f < a.length;)0 == a[f][0] ? (c[d++] = f, g = j, h = i, i = j = 0, e = a[f][1]) : (1 == a[f][0] ? j += a[f][1].length : i += a[f][1].length, e && (e.length <= Math.max(g, h) && e.length <= Math.max(j, i)) && (a.splice(c[d - 1], 0, [-1, e]), a[c[d - 1] + 1][0] = 1, d--, d--, f = 0 < d ? c[d - 1] : -1, i = j = h = g = 0, e = null, b = !0)), f++; b && this.diff_cleanupMerge(a); this.diff_cleanupSemanticLossless(a); for (f = 1; f < a.length;) {
+            if (-1 == a[f - 1][0] && 1 == a[f][0]) {
+                b = a[f - 1][1]; c = a[f][1];
+                d = this.diff_commonOverlap_(b, c); e = this.diff_commonOverlap_(c, b); if (d >= e) { if (d >= b.length / 2 || d >= c.length / 2) a.splice(f, 0, [0, c.substring(0, d)]), a[f - 1][1] = b.substring(0, b.length - d), a[f + 1][1] = c.substring(d), f++ } else if (e >= b.length / 2 || e >= c.length / 2) a.splice(f, 0, [0, b.substring(0, e)]), a[f - 1][0] = 1, a[f - 1][1] = c.substring(0, c.length - e), a[f + 1][0] = -1, a[f + 1][1] = b.substring(e), f++; f++
+            } f++
+        }
+    };
+    diff_match_patch.prototype.diff_cleanupSemanticLossless = function (a) {
+        function b(a, b) {
+            if (!a || !b) return 6; var c = a.charAt(a.length - 1), d = b.charAt(0), e = c.match(diff_match_patch.nonAlphaNumericRegex_), f = d.match(diff_match_patch.nonAlphaNumericRegex_), g = e && c.match(diff_match_patch.whitespaceRegex_), h = f && d.match(diff_match_patch.whitespaceRegex_), c = g && c.match(diff_match_patch.linebreakRegex_), d = h && d.match(diff_match_patch.linebreakRegex_), i = c && a.match(diff_match_patch.blanklineEndRegex_), j = d && b.match(diff_match_patch.blanklineStartRegex_);
+            return i || j ? 5 : c || d ? 4 : e && !g && h ? 3 : g || h ? 2 : e || f ? 1 : 0
+        } for (var c = 1; c < a.length - 1;) {
+            if (0 == a[c - 1][0] && 0 == a[c + 1][0]) {
+                var d = a[c - 1][1], e = a[c][1], f = a[c + 1][1], g = this.diff_commonSuffix(d, e); if (g) var h = e.substring(e.length - g), d = d.substring(0, d.length - g), e = h + e.substring(0, e.length - g), f = h + f; for (var g = d, h = e, j = f, i = b(d, e) + b(e, f); e.charAt(0) === f.charAt(0);) { var d = d + e.charAt(0), e = e.substring(1) + f.charAt(0), f = f.substring(1), k = b(d, e) + b(e, f); k >= i && (i = k, g = d, h = e, j = f) } a[c - 1][1] != g && (g ? a[c - 1][1] = g : (a.splice(c - 1, 1), c--), a[c][1] =
+                    h, j ? a[c + 1][1] = j : (a.splice(c + 1, 1), c--))
+            } c++
+        }
+    }; diff_match_patch.nonAlphaNumericRegex_ = /[^a-zA-Z0-9]/; diff_match_patch.whitespaceRegex_ = /\s/; diff_match_patch.linebreakRegex_ = /[\r\n]/; diff_match_patch.blanklineEndRegex_ = /\n\r?\n$/; diff_match_patch.blanklineStartRegex_ = /^\r?\n\r?\n/;
+    diff_match_patch.prototype.diff_cleanupEfficiency = function (a) { for (var b = !1, c = [], d = 0, e = null, f = 0, g = !1, h = !1, j = !1, i = !1; f < a.length;) { if (0 == a[f][0]) a[f][1].length < this.Diff_EditCost && (j || i) ? (c[d++] = f, g = j, h = i, e = a[f][1]) : (d = 0, e = null), j = i = !1; else if (-1 == a[f][0] ? i = !0 : j = !0, e && (g && h && j && i || e.length < this.Diff_EditCost / 2 && 3 == g + h + j + i)) a.splice(c[d - 1], 0, [-1, e]), a[c[d - 1] + 1][0] = 1, d--, e = null, g && h ? (j = i = !0, d = 0) : (d--, f = 0 < d ? c[d - 1] : -1, j = i = !1), b = !0; f++ } b && this.diff_cleanupMerge(a) };
+    diff_match_patch.prototype.diff_cleanupMerge = function (a) {
+        a.push([0, ""]); for (var b = 0, c = 0, d = 0, e = "", f = "", g; b < a.length;)switch (a[b][0]) {
+            case 1: d++; f += a[b][1]; b++; break; case -1: c++; e += a[b][1]; b++; break; case 0: 1 < c + d ? (0 !== c && 0 !== d && (g = this.diff_commonPrefix(f, e), 0 !== g && (0 < b - c - d && 0 == a[b - c - d - 1][0] ? a[b - c - d - 1][1] += f.substring(0, g) : (a.splice(0, 0, [0, f.substring(0, g)]), b++), f = f.substring(g), e = e.substring(g)), g = this.diff_commonSuffix(f, e), 0 !== g && (a[b][1] = f.substring(f.length - g) + a[b][1], f = f.substring(0, f.length -
+                g), e = e.substring(0, e.length - g))), 0 === c ? a.splice(b - d, c + d, [1, f]) : 0 === d ? a.splice(b - c, c + d, [-1, e]) : a.splice(b - c - d, c + d, [-1, e], [1, f]), b = b - c - d + (c ? 1 : 0) + (d ? 1 : 0) + 1) : 0 !== b && 0 == a[b - 1][0] ? (a[b - 1][1] += a[b][1], a.splice(b, 1)) : b++, c = d = 0, f = e = ""
+        }"" === a[a.length - 1][1] && a.pop(); c = !1; for (b = 1; b < a.length - 1;)0 == a[b - 1][0] && 0 == a[b + 1][0] && (a[b][1].substring(a[b][1].length - a[b - 1][1].length) == a[b - 1][1] ? (a[b][1] = a[b - 1][1] + a[b][1].substring(0, a[b][1].length - a[b - 1][1].length), a[b + 1][1] = a[b - 1][1] + a[b + 1][1], a.splice(b - 1, 1), c = !0) : a[b][1].substring(0,
+            a[b + 1][1].length) == a[b + 1][1] && (a[b - 1][1] += a[b + 1][1], a[b][1] = a[b][1].substring(a[b + 1][1].length) + a[b + 1][1], a.splice(b + 1, 1), c = !0)), b++; c && this.diff_cleanupMerge(a)
+    }; diff_match_patch.prototype.diff_xIndex = function (a, b) { var c = 0, d = 0, e = 0, f = 0, g; for (g = 0; g < a.length; g++) { 1 !== a[g][0] && (c += a[g][1].length); -1 !== a[g][0] && (d += a[g][1].length); if (c > b) break; e = c; f = d } return a.length != g && -1 === a[g][0] ? f : f + (b - e) };
+    diff_match_patch.prototype.diff_prettyHtml = function (a) { for (var b = [], c = /&/g, d = /</g, e = />/g, f = /\n/g, g = 0; g < a.length; g++) { var h = a[g][0], j = a[g][1], j = j.replace(c, "&amp;").replace(d, "&lt;").replace(e, "&gt;").replace(f, "&para;<br>"); switch (h) { case 1: b[g] = '<ins style="background:#e6ffe6;">' + j + "</ins>"; break; case -1: b[g] = '<del style="background:#ffe6e6;">' + j + "</del>"; break; case 0: b[g] = "<span>" + j + "</span>" } } return b.join("") };
+    diff_match_patch.prototype.diff_text1 = function (a) { for (var b = [], c = 0; c < a.length; c++)1 !== a[c][0] && (b[c] = a[c][1]); return b.join("") }; diff_match_patch.prototype.diff_text2 = function (a) { for (var b = [], c = 0; c < a.length; c++)-1 !== a[c][0] && (b[c] = a[c][1]); return b.join("") }; diff_match_patch.prototype.diff_levenshtein = function (a) { for (var b = 0, c = 0, d = 0, e = 0; e < a.length; e++) { var f = a[e][0], g = a[e][1]; switch (f) { case 1: c += g.length; break; case -1: d += g.length; break; case 0: b += Math.max(c, d), d = c = 0 } } return b += Math.max(c, d) };
+    diff_match_patch.prototype.diff_toDelta = function (a) { for (var b = [], c = 0; c < a.length; c++)switch (a[c][0]) { case 1: b[c] = "+" + encodeURI(a[c][1]); break; case -1: b[c] = "-" + a[c][1].length; break; case 0: b[c] = "=" + a[c][1].length }return b.join("\t").replace(/%20/g, " ") };
+    diff_match_patch.prototype.diff_fromDelta = function (a, b) {
+        for (var c = [], d = 0, e = 0, f = b.split(/\t/g), g = 0; g < f.length; g++) {
+            var h = f[g].substring(1); switch (f[g].charAt(0)) {
+                case "+": try { c[d++] = [1, decodeURI(h)] } catch (j) { throw Error("Illegal escape in diff_fromDelta: " + h); } break; case "-": case "=": var i = parseInt(h, 10); if (isNaN(i) || 0 > i) throw Error("Invalid number in diff_fromDelta: " + h); h = a.substring(e, e += i); "=" == f[g].charAt(0) ? c[d++] = [0, h] : c[d++] = [-1, h]; break; default: if (f[g]) throw Error("Invalid diff operation in diff_fromDelta: " +
+                    f[g]);
+            }
+        } if (e != a.length) throw Error("Delta length (" + e + ") does not equal source text length (" + a.length + ")."); return c
+    }; diff_match_patch.prototype.match_main = function (a, b, c) { if (null == a || null == b || null == c) throw Error("Null input. (match_main)"); c = Math.max(0, Math.min(c, a.length)); return a == b ? 0 : a.length ? a.substring(c, c + b.length) == b ? c : this.match_bitap_(a, b, c) : -1 };
+    diff_match_patch.prototype.match_bitap_ = function (a, b, c) {
+        function d(a, d) { var e = a / b.length, g = Math.abs(c - d); return !f.Match_Distance ? g ? 1 : e : e + g / f.Match_Distance } if (b.length > this.Match_MaxBits) throw Error("Pattern too long for this browser."); var e = this.match_alphabet_(b), f = this, g = this.Match_Threshold, h = a.indexOf(b, c); -1 != h && (g = Math.min(d(0, h), g), h = a.lastIndexOf(b, c + b.length), -1 != h && (g = Math.min(d(0, h), g))); for (var j = 1 << b.length - 1, h = -1, i, k, q = b.length + a.length, r, t = 0; t < b.length; t++) {
+            i = 0; for (k = q; i < k;)d(t, c +
+                k) <= g ? i = k : q = k, k = Math.floor((q - i) / 2 + i); q = k; i = Math.max(1, c - k + 1); var p = Math.min(c + k, a.length) + b.length; k = Array(p + 2); for (k[p + 1] = (1 << t) - 1; p >= i; p--) { var w = e[a.charAt(p - 1)]; k[p] = 0 === t ? (k[p + 1] << 1 | 1) & w : (k[p + 1] << 1 | 1) & w | ((r[p + 1] | r[p]) << 1 | 1) | r[p + 1]; if (k[p] & j && (w = d(t, p - 1), w <= g)) if (g = w, h = p - 1, h > c) i = Math.max(1, 2 * c - h); else break } if (d(t + 1, c) > g) break; r = k
+        } return h
+    };
+    diff_match_patch.prototype.match_alphabet_ = function (a) { for (var b = {}, c = 0; c < a.length; c++)b[a.charAt(c)] = 0; for (c = 0; c < a.length; c++)b[a.charAt(c)] |= 1 << a.length - c - 1; return b };
+    diff_match_patch.prototype.patch_addContext_ = function (a, b) {
+        if (0 != b.length) {
+            for (var c = b.substring(a.start2, a.start2 + a.length1), d = 0; b.indexOf(c) != b.lastIndexOf(c) && c.length < this.Match_MaxBits - this.Patch_Margin - this.Patch_Margin;)d += this.Patch_Margin, c = b.substring(a.start2 - d, a.start2 + a.length1 + d); d += this.Patch_Margin; (c = b.substring(a.start2 - d, a.start2)) && a.diffs.unshift([0, c]); (d = b.substring(a.start2 + a.length1, a.start2 + a.length1 + d)) && a.diffs.push([0, d]); a.start1 -= c.length; a.start2 -= c.length; a.length1 +=
+                c.length + d.length; a.length2 += c.length + d.length
+        }
+    };
+    diff_match_patch.prototype.patch_make = function (a, b, c) {
+        var d; if ("string" == typeof a && "string" == typeof b && "undefined" == typeof c) d = a, b = this.diff_main(d, b, !0), 2 < b.length && (this.diff_cleanupSemantic(b), this.diff_cleanupEfficiency(b)); else if (a && "object" == typeof a && "undefined" == typeof b && "undefined" == typeof c) b = a, d = this.diff_text1(b); else if ("string" == typeof a && b && "object" == typeof b && "undefined" == typeof c) d = a; else if ("string" == typeof a && "string" == typeof b && c && "object" == typeof c) d = a, b = c; else throw Error("Unknown call format to patch_make.");
+        if (0 === b.length) return []; c = []; a = new diff_match_patch.patch_obj; for (var e = 0, f = 0, g = 0, h = d, j = 0; j < b.length; j++) {
+            var i = b[j][0], k = b[j][1]; !e && 0 !== i && (a.start1 = f, a.start2 = g); switch (i) {
+                case 1: a.diffs[e++] = b[j]; a.length2 += k.length; d = d.substring(0, g) + k + d.substring(g); break; case -1: a.length1 += k.length; a.diffs[e++] = b[j]; d = d.substring(0, g) + d.substring(g + k.length); break; case 0: k.length <= 2 * this.Patch_Margin && e && b.length != j + 1 ? (a.diffs[e++] = b[j], a.length1 += k.length, a.length2 += k.length) : k.length >= 2 * this.Patch_Margin &&
+                    e && (this.patch_addContext_(a, h), c.push(a), a = new diff_match_patch.patch_obj, e = 0, h = d, f = g)
+            }1 !== i && (f += k.length); -1 !== i && (g += k.length)
+        } e && (this.patch_addContext_(a, h), c.push(a)); return c
+    }; diff_match_patch.prototype.patch_deepCopy = function (a) { for (var b = [], c = 0; c < a.length; c++) { var d = a[c], e = new diff_match_patch.patch_obj; e.diffs = []; for (var f = 0; f < d.diffs.length; f++)e.diffs[f] = d.diffs[f].slice(); e.start1 = d.start1; e.start2 = d.start2; e.length1 = d.length1; e.length2 = d.length2; b[c] = e } return b };
+    diff_match_patch.prototype.patch_apply = function (a, b) {
+        if (0 == a.length) return [b, []]; a = this.patch_deepCopy(a); var c = this.patch_addPadding(a); b = c + b + c; this.patch_splitMax(a); for (var d = 0, e = [], f = 0; f < a.length; f++) {
+            var g = a[f].start2 + d, h = this.diff_text1(a[f].diffs), j, i = -1; if (h.length > this.Match_MaxBits) { if (j = this.match_main(b, h.substring(0, this.Match_MaxBits), g), -1 != j && (i = this.match_main(b, h.substring(h.length - this.Match_MaxBits), g + h.length - this.Match_MaxBits), -1 == i || j >= i)) j = -1 } else j = this.match_main(b, h, g);
+            if (-1 == j) e[f] = !1, d -= a[f].length2 - a[f].length1; else if (e[f] = !0, d = j - g, g = -1 == i ? b.substring(j, j + h.length) : b.substring(j, i + this.Match_MaxBits), h == g) b = b.substring(0, j) + this.diff_text2(a[f].diffs) + b.substring(j + h.length); else if (g = this.diff_main(h, g, !1), h.length > this.Match_MaxBits && this.diff_levenshtein(g) / h.length > this.Patch_DeleteThreshold) e[f] = !1; else {
+                this.diff_cleanupSemanticLossless(g); for (var h = 0, k, i = 0; i < a[f].diffs.length; i++) {
+                    var q = a[f].diffs[i]; 0 !== q[0] && (k = this.diff_xIndex(g, h)); 1 === q[0] ? b = b.substring(0,
+                        j + k) + q[1] + b.substring(j + k) : -1 === q[0] && (b = b.substring(0, j + k) + b.substring(j + this.diff_xIndex(g, h + q[1].length))); -1 !== q[0] && (h += q[1].length)
+                }
+            }
+        } b = b.substring(c.length, b.length - c.length); return [b, e]
+    };
+    diff_match_patch.prototype.patch_addPadding = function (a) {
+        for (var b = this.Patch_Margin, c = "", d = 1; d <= b; d++)c += String.fromCharCode(d); for (d = 0; d < a.length; d++)a[d].start1 += b, a[d].start2 += b; var d = a[0], e = d.diffs; if (0 == e.length || 0 != e[0][0]) e.unshift([0, c]), d.start1 -= b, d.start2 -= b, d.length1 += b, d.length2 += b; else if (b > e[0][1].length) { var f = b - e[0][1].length; e[0][1] = c.substring(e[0][1].length) + e[0][1]; d.start1 -= f; d.start2 -= f; d.length1 += f; d.length2 += f } d = a[a.length - 1]; e = d.diffs; 0 == e.length || 0 != e[e.length - 1][0] ? (e.push([0,
+            c]), d.length1 += b, d.length2 += b) : b > e[e.length - 1][1].length && (f = b - e[e.length - 1][1].length, e[e.length - 1][1] += c.substring(0, f), d.length1 += f, d.length2 += f); return c
+    };
+    diff_match_patch.prototype.patch_splitMax = function (a) {
+        for (var b = this.Match_MaxBits, c = 0; c < a.length; c++)if (!(a[c].length1 <= b)) {
+            var d = a[c]; a.splice(c--, 1); for (var e = d.start1, f = d.start2, g = ""; 0 !== d.diffs.length;) {
+                var h = new diff_match_patch.patch_obj, j = !0; h.start1 = e - g.length; h.start2 = f - g.length; "" !== g && (h.length1 = h.length2 = g.length, h.diffs.push([0, g])); for (; 0 !== d.diffs.length && h.length1 < b - this.Patch_Margin;) {
+                    var g = d.diffs[0][0], i = d.diffs[0][1]; 1 === g ? (h.length2 += i.length, f += i.length, h.diffs.push(d.diffs.shift()),
+                        j = !1) : -1 === g && 1 == h.diffs.length && 0 == h.diffs[0][0] && i.length > 2 * b ? (h.length1 += i.length, e += i.length, j = !1, h.diffs.push([g, i]), d.diffs.shift()) : (i = i.substring(0, b - h.length1 - this.Patch_Margin), h.length1 += i.length, e += i.length, 0 === g ? (h.length2 += i.length, f += i.length) : j = !1, h.diffs.push([g, i]), i == d.diffs[0][1] ? d.diffs.shift() : d.diffs[0][1] = d.diffs[0][1].substring(i.length))
+                } g = this.diff_text2(h.diffs); g = g.substring(g.length - this.Patch_Margin); i = this.diff_text1(d.diffs).substring(0, this.Patch_Margin); "" !== i &&
+                    (h.length1 += i.length, h.length2 += i.length, 0 !== h.diffs.length && 0 === h.diffs[h.diffs.length - 1][0] ? h.diffs[h.diffs.length - 1][1] += i : h.diffs.push([0, i])); j || a.splice(++c, 0, h)
+            }
+        }
+    }; diff_match_patch.prototype.patch_toText = function (a) { for (var b = [], c = 0; c < a.length; c++)b[c] = a[c]; return b.join("") };
+    diff_match_patch.prototype.patch_fromText = function (a) {
+        var b = []; if (!a) return b; a = a.split("\n"); for (var c = 0, d = /^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@$/; c < a.length;) {
+            var e = a[c].match(d); if (!e) throw Error("Invalid patch string: " + a[c]); var f = new diff_match_patch.patch_obj; b.push(f); f.start1 = parseInt(e[1], 10); "" === e[2] ? (f.start1--, f.length1 = 1) : "0" == e[2] ? f.length1 = 0 : (f.start1--, f.length1 = parseInt(e[2], 10)); f.start2 = parseInt(e[3], 10); "" === e[4] ? (f.start2--, f.length2 = 1) : "0" == e[4] ? f.length2 = 0 : (f.start2--, f.length2 =
+                parseInt(e[4], 10)); for (c++; c < a.length;) { e = a[c].charAt(0); try { var g = decodeURI(a[c].substring(1)) } catch (h) { throw Error("Illegal escape in patch_fromText: " + g); } if ("-" == e) f.diffs.push([-1, g]); else if ("+" == e) f.diffs.push([1, g]); else if (" " == e) f.diffs.push([0, g]); else if ("@" == e) break; else if ("" !== e) throw Error('Invalid patch mode "' + e + '" in: ' + g); c++ }
+        } return b
+    }; diff_match_patch.patch_obj = function () { this.diffs = []; this.start2 = this.start1 = null; this.length2 = this.length1 = 0 };
+    diff_match_patch.patch_obj.prototype.toString = function () { var a, b; a = 0 === this.length1 ? this.start1 + ",0" : 1 == this.length1 ? this.start1 + 1 : this.start1 + 1 + "," + this.length1; b = 0 === this.length2 ? this.start2 + ",0" : 1 == this.length2 ? this.start2 + 1 : this.start2 + 1 + "," + this.length2; a = ["@@ -" + a + " +" + b + " @@\n"]; var c; for (b = 0; b < this.diffs.length; b++) { switch (this.diffs[b][0]) { case 1: c = "+"; break; case -1: c = "-"; break; case 0: c = " " }a[b + 1] = c + encodeURI(this.diffs[b][1]) + "\n" } return a.join("").replace(/%20/g, " ") };
+    this.diff_match_patch = diff_match_patch; this.DIFF_DELETE = -1; this.DIFF_INSERT = 1; this.DIFF_EQUAL = 0;
+})();
 
 // ---------------------------------------------------------------------------------edu_tpi.js START
 // 实训游戏需要的js功能
@@ -159,17 +221,9 @@ var SHRINK = 1; // 缩小
 
 var repositoryTabHeight = 40
 
-$(function(){
+$(function () {
     function update_rows_and_cols(rows) {
-        // 非iframe模式使用：
-        window.postMessage({tp: 'resize', rows: rows, cols: 0}, "*");
-
-        // iframe模式使用：
-        // var _iframe = document.getElementById("game_webssh");
-        // if(_iframe == null || _iframe == undefined || _iframe == ""){
-        //     return;
-        // }
-        // _iframe.contentWindow.postMessage({tp: 'resize', rows: rows, cols: 0}, "https://webssh.educoder.net");
+        window.postMessage({ tp: 'resize', rows: rows, cols: 0 }, "*");
     }
     window.top.__updateWebsshRows = update_rows_and_cols
 
@@ -177,95 +231,64 @@ $(function(){
     var doc = $(document);
     var lab = $(".b-label");
     var cen = $(".h-center");
-    var nextW2,nextW1;
-    var dragging  = false;
+    var nextW2, nextW1;
+    var dragging = false;
     var flag = false;
     var wrapWidth;
     var wrapHeight;
     var nRow = 0;
     //var nCol = 0;
-    lab.live('mousedown touchstart',function(){
-    		$('#game_webssh').css('pointer-events', 'none')
-            dragging   = true;
-            leftOffset = $(".labelN").offset().left;
-            wrapWidth = $(".labelN").width();
-            return false;
-        }
+    lab.live('mousedown touchstart', function () {
+        $('#game_webssh').css('pointer-events', 'none')
+        dragging = true;
+        leftOffset = $(".labelN").offset().left;
+        wrapWidth = $(".labelN").width();
+        return false;
+    }
     );
-    cen.live('mousedown ',function(){
-    		// 使得iframe不捕获事件
-    		$('#game_webssh').css('pointer-events', 'none')
-            flag   = true;
-            topOffset = $(".centerH").offset().top;
-            wrapHeight = $(".centerH").height();
-            return false;
-        }
-    );
-    
-    // react add TODO react加载完dom再执行
-    setTimeout(function(){
-        $('#games_repository_contents .CodeMirror.cm-s-railscasts').css("height", $("#games_repository_contents").height() - repositoryTabHeight);
-    }, 800)
-    
-    // window resize
-    $(window).on('resize', function() {
-        window._tpiWidthResize && window._tpiWidthResize()
-    	$('#games_repository_contents .CodeMirror.cm-s-railscasts').css("height", $("#games_repository_contents").height() - repositoryTabHeight);
-    })
+    cen.live('mousedown ', function () {
+        // 使得iframe不捕获事件
+        $('#game_webssh').css('pointer-events', 'none')
+        flag = true;
+        topOffset = $(".centerH").offset().top;
+        wrapHeight = $(".centerH").height();
+        return false;
+    });
 
     var FF = !(window.mozInnerScreenX == null);
     var websshLineHeight = FF ? 19 : 18
-    function throttle(method, delay, duration){
-        var timer = null, begin = new Date();
-        return function(){
-            var context = this, args = arguments, current = new Date();
-            clearTimeout(timer);
-            if(current-begin >= duration){
-                method.apply(context, args);
-                begin = current;
-            } else {
-                timer = setTimeout(function(){
-                    method.apply(context, args);
-                }, delay);
-            }
-        }
-    }
-    doc.live('mousemove touchmove',function(e){
+
+    doc.live('mousemove touchmove', function (e) {
 
         $(".-brother").show();// 代码行的遮罩显示
-        if(dragging) {
+        if (dragging) {
             clickX = e.pageX || e.originalEvent.touches[0].pageX;;
-            if(clickX > leftOffset+0&&clickX<leftOffset+1600) {
+            if (clickX > leftOffset + 0 && clickX < leftOffset + 1600) {
                 // console.log('resize')
                 lab.css('left', clickX - 7 - leftOffset + 'px');
-                $("#game_left_contents").width( clickX-leftOffset + 'px');
-                nextW2 = clickX-leftOffset;
-                $("#game_right_contents").width( wrapWidth - nextW2  + 'px');
-                //console.log(lab.next().width());
-                throttle(refresh_editor_monaco, 100, 200)()
+                $("#game_left_contents").width(clickX - leftOffset + 'px');
+                nextW2 = clickX - leftOffset;
+                $("#game_right_contents").width(wrapWidth - nextW2 + 'px');
             } else {
                 lab.css('left', '0px');
             }
         }
-        if(flag){
+        if (flag) {
             clickY = e.pageY;
-            if(clickY > topOffset +100) {
+            if (clickY > topOffset + 100) {
                 cen.css('top', clickY - 7 - topOffset + 'px');
-                $("#games_repository_contents").height( clickY-topOffset + 'px');
+                $("#games_repository_contents").height(clickY - topOffset + 'px');
 
                 // react add
                 $('.CodeMirror.cm-s-railscasts')
-                	.css("height", clickY- topOffset - repositoryTabHeight - $('#games_repository_contents .codePath').height() - 12);
+                    .css("height", clickY - topOffset - repositoryTabHeight - $('#games_repository_contents .codePath').height() - 12);
 
-                nextW1 = clickY-topOffset;
-                $("#games_valuation_contents").height( wrapHeight - nextW1  + 'px');
+                nextW1 = clickY - topOffset;
+                $("#games_valuation_contents").height(wrapHeight - nextW1 + 'px');
                 var h = $("#games_repository_contents").height() - $("#top_repository").height() - repositoryTabHeight;
                 var m = $("#games_repository_contents").height() - repositoryTabHeight;
-                var w = $("#games_repository_contents").width();
                 $(".game_webssh").css("min-height", m);
                 $(".game_webssh").css("max-height", m);
-                throttle(refresh_editor_monaco, 100, 200)(m)
-                // refresh_editor_monaco(m)
                 // 火狐下行高为19
                 // CodeRepositoryView.js有同样的计算逻辑，用来初始化ssh
                 var rows = Math.round(m / websshLineHeight);
@@ -276,74 +299,63 @@ $(function(){
                 cen.css('top', '0px');
             }
             // 行高发生变化，则调整webssh的term的高度
-            if(nRow != rows){
+            if (nRow != rows) {
                 //window.frames['game_webssh'].contentWindow.resizeTerminal({rows:rows});
                 update_rows_and_cols(rows);
                 nRow = rows;
-            }else{
+            } else {
                 nRow = rows;
             }
         }
     });
 
-    doc.live("mouseup touchend", function(e) {
-    	// 使得iframe可以继续捕获事件
-    	$('#game_webssh').css('pointer-events', 'inherit')
+    doc.live("mouseup touchend", function (e) {
+        // 使得iframe可以继续捕获事件
+        $('#game_webssh').css('pointer-events', 'inherit')
         flag = false;
         dragging = false;
         e.cancelBubble = true;
         $(".-brother").hide(); // 代码行的遮罩隐藏
     });
 
-    window.__tpiOnResize = function() {
-    	var m = $("#games_repository_contents").height() - repositoryTabHeight;
+    window.__tpiOnResize = function () {
+        var m = $("#games_repository_contents").height() - repositoryTabHeight;
         $(".game_webssh").css("min-height", m);
         $(".game_webssh").css("max-height", m);
-		
-        refresh_editor_monaco(m)
 
-		// var _iframe = document.getElementById("game_webssh");
+
+        // var _iframe = document.getElementById("game_webssh");
         // if(!_iframe){
         //     return;
         // }
-		var FF = !(window.mozInnerScreenX == null);
-		var websshLineHeight = FF ? 19 : 18
-		
-		var rows = Math.floor(m / websshLineHeight);
-		window.top.__updateWebsshRows && window.top.__updateWebsshRows(rows)
+        var FF = !(window.mozInnerScreenX == null);
+        var websshLineHeight = FF ? 19 : 18
+
+        var rows = Math.floor(m / websshLineHeight);
+        window.top.__updateWebsshRows && window.top.__updateWebsshRows(rows)
     }
-    window.refresh_editor_monaco = function(height) {
-        console.log('refresh_editor_monaco')
-        if (window.editor_monaco) {
-            height && $('#codetab_con_1').height(height)
-            window.editor_monaco.layout();
-        } 
-        // if ($('#game_operate_action').width() < 720) {
-        //     $('#game_operate_action .time_limit').hide()
-        // } else {
-        //     $('#game_operate_action .time_limit').show()
-        // }
+    window.refresh_editor_monaco = function (height) {
     }
     // end;
-   //解決IE瀏覽器大小改變時webssh佈局變亂。
-    window.onresize = function(){
-    	__tpiOnResize()
+    //解決IE瀏覽器大小改變時webssh佈局變亂。
+    window.onresize = function () {
+        __tpiOnResize()
     }
     // 评论区域的回复按钮
-    function reply_to_dis(id, name){
-        $("#comment_news").attr("placeholder", "回复"+name+":");
+    function reply_to_dis(id, name) {
+        $("#comment_news").attr("placeholder", "回复" + name + ":");
         $("#dis_reply_id").val(id);
         $("#comment_news").focus();
     }
     // end
     // 点击全部任务向右侧展开
-    $("#all_task_show").on("click", function(e){
+    $("#all_task_show").on("click", function (e) {
         c = 0;
         $("#all_task_tab").removeClass('leftnav-active');
-        $("#all_task_show").css("background","rgba(0,0,0,0)");
+        $("#all_task_show").css("background", "rgba(0,0,0,0)");
         $("#all_task_index").css("left", 0).stop().animate({
             left: "-505px"
-        }, 400, function(){
+        }, 400, function () {
             $("#all_task_show").hide();
             fadein = 0;
         });
@@ -351,13 +363,13 @@ $(function(){
     // end
 
     // 列表区域阻止事件冒泡
-    $("#all_task_index").on("click", function(e){
+    $("#all_task_index").on("click", function (e) {
         e.stopPropagation();
     });
     // end
 
     // 下一关增加loading效果
-    $("#next_step").live("click", function(){
+    $("#next_step").live("click", function () {
         nNext = $("#next_step_area");
         html = "<a href='javascript:void(0);' class='task-btn mr15 mt8'>下一关<img src='/images/bigdata/loading2.svg' style='width:25px;float:left;margin-top: 3px' /></a>";
         nNext.html(html);
@@ -365,7 +377,7 @@ $(function(){
     // end
 
     // 上一关增加loading效果
-    $("#prev_step").live("click", function(){
+    $("#prev_step").live("click", function () {
         nNext = $("#prev_step_area");
         html = "<a href='javascript:void(0);' class='task-btn mr15 mt8'>上一关<img src='/images/bigdata/loading2.svg' style='width:25px;float:left;margin-top: 3px' /></a>";
         nNext.html(html);
@@ -374,144 +386,16 @@ $(function(){
 
 });
 
-// 查看参考答案
-function open_answer(game, myshixun, choose){
-    $.ajax({
-        url: "/myshixuns/" + myshixun + "/stages/" + game + "/answer",
-        data:{choose: choose},
-        dataType: "script"
-    })
-}
 
-// 选择题选择答案
-function choice_answer(st, nThis){
-    if(st == "2"){
-        //$(nThis).hasClass("card-check") ? $(nThis).removeClass("card-check") : $(nThis).addClass("card-check");
-        $(nThis).toggleClass("card-check");
-        $(nThis).toggleClass("color_white");
-    } else if (st == "1"){
-        var choice = $(".color_white");
-        choice.removeClass("card-check");
-        choice.removeClass("color_white");
-        $(nThis).addClass("card-check");
-        $(nThis).toggleClass("color_white");
-    }
-}
-// end
-
-// 评测区域点击TAB切换样式
-function check_tab(allClassName,addClassName,item){
-    //点击tab添加样式
-    $("."+allClassName).removeClass(addClassName);
-    $(item).addClass(addClassName);
-    //获取当前点击的tab的索引位置
-    var index=$(item).index()+1;
-    //显示或隐藏对应的内容块
-    $("#"+allClassName+"_"+index).siblings().addClass("undis");
-    $("#"+allClassName+"_"+index).removeClass("undis");
-}
-// end
-
-// 选择题公开的测试集允许展开与隐藏
-function toggle_test_case_choose(t_case, id){
-    if(true){
-        var nTest = $("#test_case_"+id).parent().prev(".-task-ces-top").children("i:first-child"); //图标节点
-        if (nTest.hasClass("fa-caret-down")){
-            nTest.addClass("fa-caret-right");
-            nTest.removeClass("fa-caret-down");
-        }else if( nTest.hasClass("fa-caret-right") ){
-            nTest.addClass("fa-caret-down");
-            nTest.removeClass("fa-caret-right");
-        }
-        $("#test_case_"+id).toggle();
-    }
-}
-
-// 公开的测试集允许展开与隐藏
-var dv;
-function toggle_test_case(open, output, actual_output, id, power){
-    var base64 = new Base64();
-    output = base64.decode(output);
-    actual_output = base64.decode(actual_output);
-    actual_output = actual_output.replace(/\\r\\n/g, "\r\n").replace(/\\r/g, "\r").replace(/\\n/g, "\n").replace(/\\t/g,"\t").replace(/<\/\/script>/g, "</script>");
-    output = output.replace(/\\r\\n/g, "\r\n").replace(/\\r/g, "\r").replace(/\\n/g, "\n").replace(/\\t/g,"\t");
-    if(true){
-        var nTest = $("#test_case_"+id).parent().prev(".-task-ces-top").children("i:first-child"); //图标节点
-        if (nTest.hasClass("fa-caret-down")){
-            nTest.addClass("fa-caret-right");
-            nTest.removeClass("fa-caret-down");
-            $("#result_different_show_"+ id).siblings(".-task-ces-info").attr("style","display:none");
-            $("#result_different_show_"+ id).hide();
-            $("#test_case_"+id).hide();
-        }else if( nTest.hasClass("fa-caret-right") ){
-            nTest.addClass("fa-caret-down");
-            nTest.removeClass("fa-caret-right");
-            $("#result_different_show_"+ id).show();
-            $("#test_case_"+id).show();
-            $("#result_different_show_"+ id).siblings(".-task-ces-info").attr("style","display:block");
-            if(open == 1 || power){
-                var id    = "result_different_show_" + id;
-                //var oldData = "摄氏温度\t\t华氏温度\n********************\n\n-40 \t\t -40.0\n-35 \t\t -31.0\n-30 \t\t -22.0\n-25 \t\t -13.0\n-20 \t\t -4.0\n-15 \t\t 5.0\n-10 \t\t 14.0\n-5 \t\t 23.0\n0 \t\t 32.0\n5 \t\t 41.0\n10 \t\t 50.0\n15 \t\t 59.0\n20 \t\t 68.0\n25 \t\t 77.0\n30 \t\t 86.0\n35 \t\t 95.0\n40 \t\t 104.0\n45 \t\t 113.0\n50 \t\t 122.0\n\n***********************\n\n[0, 30, 60, 90, 120, 150, 180, 210, 240, 270, 300]\n\n***********************\n5050 \t\t 5050\n\n***********************\n\n265252859812191058636308480000000\n\n***********************\n\nFalse\nFalse\nFalse\nFalse\nTrue\nTrue\nFalse\nFalse\nFalse\nTrue\n\n***********************\n\n3339 \t\t 333.9\n";
-                var oldData = output;
-                var orig1 = '';
-                var newData = actual_output == "null" ? "" : actual_output;
-                //var newData = "摄氏温度\t\t华氏温度\n********************\n-40 \t\t -40.0\n-35 \t\t -31.0\n-30 \t\t -22.0\n-25 \t\t -13.0\n-20 \t\t -4.0\n-15 \t\t 5.0\n-10 \t\t 14.0\n-5 \t\t 23.0\n0 \t\t 32.0\n5 \t\t 41.0\n10 \t\t 50.0\n15 \t\t 59.0\n20 \t\t 68.0\n25 \t\t 77.0\n30 \t\t 86.0\n35 \t\t 95.0\n40 \t\t 104.0\n45 \t\t 113.0\n50 \t\t 122.0\n\n***********************\n\n[0, 30, 60, 90, 120, 150, 180, 210, 240, 270, 300]\n\n***********************\n\n5050 \t\t 5050\n\n***********************\n\n265252859812191058636308480000000\n\n***********************\n\nFalse\nFalse\nFalse\nFalse\nTrue\nTrue\nFalse\nFalse\nFalse\nTrue\n\n***********************\n\n3339333.9\n";
-                var mv = CodeMirror.k_init(id, newData, oldData);
-                if (newData == ""){
-                    $(".CodeMirror-merge-r-chunk").css("background", "none");
-                    $(".CodeMirror-merge-r-inserted").css("background-image", "none");
-                    //$(".CodeMirror-merge-copy").find('i').remove();
-                }
-                var height=0;
-                if($("#"+id).find(".CodeMirror-merge-pane").eq(0).height()>$("#"+id).find(".CodeMirror-merge-pane").eq(1).height()){
-                    height = parseInt($("#"+id).find(".CodeMirror-merge-pane").eq(0).height());
-                }else{
-                    height = parseInt($("#"+id).find(".CodeMirror-merge-pane").eq(1).height());
-                }
-
-                $("#"+id).find(".CodeMirror").height(height);
-                $(".CodeMirror-merge-gap").css("height", height);
-                $(".CodeMirror-merge-gap").find("svg").css("height", height);
-            }
-
-        }
-    }
-}
-// end
-
-// codemirror渲染textarea
-function CodeMirror_fromTextArea(id){
-    var Code = CodeMirror.fromTextArea(document.getElementById(id), {
-        /*        mode: {name: "text/x-c++src",
-         // version: 2,
-         singleLineStringErrors: false},*/   // 目前补全js是引入的javascript-hint,因此目前不能指定语言
-        lineNumbers: true,
-        theme: "railscasts",
-        // extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键
-        indentUnit: 4, //代码缩进为一个tab的距离
-        matchBrackets: true,
-        autoRefresh: true,
-        smartIndent: true,//智能换行
-        extraKeys: {"Ctrl-Q": "autocomplete"},
-        autofocus: true,
-        styleActiveLine: true,
-        lint: true,
-        gutters: ["CodeMirror-linenumbers", "breakpoints"]
-    });
-    return Code;
-}
-// end
-
-var control   = 0;                                                   // 版本库控制 0表示点击放大 1表示点击缩小
+var control = 0;                                                   // 版本库控制 0表示点击放大 1表示点击缩小
 var control_1 = 0;                                                   // 测评控制 0表示点击放大 1表示点击缩小
 // 版本库的放大与缩小
-function repository_extend_and_zoom(){
-    var nGameRes  = $("#games_repository_contents");                     // 版本库区域
-    var nGameEva  = $("#games_valuation_contents");                      // 评测区域
-    var nRIcon    = $("#extend_and_zoom").children("i");                 // 版本库放大缩小按钮
-    var nCode     = $("#file_entry_content").find(".CodeMirror-scroll"); // 版本库代码区域
-    var nMove     = $(".h-center");
-    if(control == 0){
+function repository_extend_and_zoom() {
+    var nGameRes = $("#games_repository_contents");                     // 版本库区域
+    var nGameEva = $("#games_valuation_contents");                      // 评测区域
+    var nRIcon = $("#extend_and_zoom").children("i");                 // 版本库放大缩小按钮
+    var nMove = $(".h-center");
+    if (control == 0) {
         nGameRes.addClass("-flex-basic100");
         nGameEva.addClass("-flex-basic0");
         nRIcon.addClass("fa-compress");
@@ -519,7 +403,7 @@ function repository_extend_and_zoom(){
         // $("#extend_and_zoom").attr("data-tip-left","收起");
         nMove.hide();
         control = 1;
-    }else if(control == 1){
+    } else if (control == 1) {
         nGameRes.removeClass("-flex-basic100");
         nGameEva.removeClass("-flex-basic0");
         nRIcon.removeClass("fa-compress");
@@ -528,43 +412,27 @@ function repository_extend_and_zoom(){
         nMove.show();
         control = 0;
     }
-    // react环境下没有window['editor_CodeMirror']
-    
-    var newHeight = $("#games_repository_contents").height() - repositoryTabHeight;
-    // react add
-    $('.CodeMirror.cm-s-railscasts').css("height", newHeight);
-
-    window['editor_CodeMirror'] && editor_CodeMirror.setSize("auto", "auto");
-    
-    window.refresh_editor_monaco(newHeight)
-
-    var h = nGameRes.height() - $("#top_repository").height() - repositoryTabHeight;
-    nCode.css("min-height", h);
-
 }
-// end
 
 
 // 测评的扩大与缩小
-function valuation_extend_and_zoom(){
-    var nGameRes  = $("#games_repository_contents");                     // 版本库区域
-    var nGameEva  = $("#games_valuation_contents");                      // 评测区域
-    var nVIcon    = $("#valuation_extend_and_zoom").children("i");       // 评测放大缩小
-    var nMove     = $(".h-center");
-    if(control_1 == 0){
+function valuation_extend_and_zoom() {
+    var nGameRes = $("#games_repository_contents");                     // 版本库区域
+    var nGameEva = $("#games_valuation_contents");                      // 评测区域
+    var nVIcon = $("#valuation_extend_and_zoom").children("i");       // 评测放大缩小
+    var nMove = $(".h-center");
+    if (control_1 == 0) {
         nGameRes.addClass("-flex-basic0");
         nGameEva.addClass("-flex-basic100");
         nVIcon.removeClass("fa-expand");
         nVIcon.addClass("fa-compress");
-        // $("#valuation_extend_and_zoom").attr("data-tip-left","收起");
         nMove.hide();
         control_1 = 1;
-    }else if(control_1 == 1){
+    } else if (control_1 == 1) {
         nGameRes.removeClass("-flex-basic0");
         nGameEva.removeClass("-flex-basic100");
         nVIcon.addClass("fa-expand");
         nVIcon.removeClass("fa-compress");
-        // $("#valuation_extend_and_zoom").attr("data-tip-left","展开");
         nMove.show();
         control_1 = 0;
     }
@@ -573,22 +441,22 @@ function valuation_extend_and_zoom(){
 
 // 点赞与取消点赞
 var h = true;
-function game_praise(obj_id, obj_type){
-    if(treadStatus){
+function game_praise(obj_id, obj_type) {
+    if (treadStatus) {
         return;
     }
     $.ajax({
-        url:  "/praise_tread/praise_plus?obj_id=" + obj_id + "&obj_type=" + obj_type,
-        data: {horizontal: h, game_praise: true},
-        success:function(data){
+        url: "/praise_tread/praise_plus?obj_id=" + obj_id + "&obj_type=" + obj_type,
+        data: { horizontal: h, game_praise: true },
+        success: function (data) {
             h = !h;
             var praise_count = $("#game_praise_count");
-            if(data.praise){
+            if (data.praise) {
                 praiseStatus = true; //已赞
                 praise_count.html(data.praise_tread_count);
                 $("#game_praise_tread").children("i").addClass("color-orange03");
                 $("#game_praise_tread").attr("data-tip-top", "取消点赞")
-            }else{
+            } else {
                 praiseStatus = false; //取消赞
                 praise_count.html(data.praise_tread_count);
                 $("#game_praise_tread").children("i").removeClass("color-orange03");
@@ -599,22 +467,22 @@ function game_praise(obj_id, obj_type){
 }
 // 踩/取消踩功能
 var d = true;
-function game_tread(obj_id){
-    if(praiseStatus){
+function game_tread(obj_id) {
+    if (praiseStatus) {
         return;
     }
     $.ajax({
         url: "/praise_tread/praise_plus?obj_id=" + obj_id + "&obj_type=ChallengeTread",
-        data: {horizontal: d, game_praise: true},
-        success:function(data){
+        data: { horizontal: d, game_praise: true },
+        success: function (data) {
             d = !d;
             var tread_count = $("#game_tread_count");
-            if(data.praise){
+            if (data.praise) {
                 treadStatus = true; // 取消踩
                 tread_count.html(data.praise_tread_count);
                 $("#game_tread").children("i").addClass("color-orange");
                 $("#game_tread").attr("data-tip-top", "取消踩")
-            }else{
+            } else {
                 treadStatus = false; // 已踩
                 tread_count.html(data.praise_tread_count);
                 $("#game_tread").children("i").removeClass("color-orange");
@@ -623,631 +491,111 @@ function game_tread(obj_id){
         }
     });
 }
-// end
-
-function setupAjaxIndicatorBase() {
-    $('#ajax-indicator-base').bind('ajaxSend', function(event, xhr, settings) {
-        if(settings && settings.url
-            && (settings.url.match(/account\/heartbeat$/)
-                || settings.url.match(/file_update/)
-                || settings.url.match(/game_build/)
-                || settings.url.match(/game_status/)
-                || settings.url.match(/refresh_game_list/)
-                || settings.url.match(/next_step/)
-                || settings.url.match(/prev_step/)
-                || settings.url.match(/open_webssh/)
-                || settings.url.match(/repository/)
-                || settings.url.match(/get_waiting_time/)
-                )){
-            return;
-        }
-        if ($('.ajax-loading').length === 0 && settings.contentType != 'application/octet-stream') {
-            $('#ajax-indicator-base').css("display","flex").html("<embed src='/images/bigdata/loading2.svg' />").show();
-        }
-    });
-
-    $('#ajax-indicator-base').bind('ajaxStop', function() {
-        $('#ajax-indicator-base').html("").hide();
-        if(MathJax && MathJax.Hub)
-            MathJax.Hub.Queue(['Typeset', MathJax.Hub]); //如果是ajax刷新页面的话，手动执行MathJax的公式显示
-        try{
-            prettyPrint(); //如果刷新出来的页面如果存在代码行的话，也需要美化
-        }catch (e){
-
-        }
-    });
-}
-
-function match_specific_symbol(str){
-    str = str.replace(/ /g, "<span class=\"empty\"></span>").replace(/\r\n$/, "<i class=\"fa fa-level-down color-grey font-16\" aria-hidden=\"true\"></i>").replace(/\n$/, "<i class=\"fa fa-level-down color-grey font-16\" aria-hidden=\"true\"></i>").replace(/\r$/, "<i class=\"fa fa-level-down color-grey font-16\" aria-hidden=\"true\"></i>").replace(/\r\n/g, "<br>").replace(/\n/g, "<br>").replace(/\r/g, "<br>").replace(/\t/g, "<span class=\"tab-key\"><i class=\"fa fa-long-arrow-right color-grey3\" aria-hidden=\"true\"></i></span>")
-    return str
-};
-/*
-
-var panes = 2, highlight = true, connect = null, collapse = false;
-function initUI(id, value, orig1, orig2, dv, panes, highlight, connect, collapse) {
-    if (value == null) return;
-    var target = document.getElementById(id);
-    target.innerHTML = "";
-    dv = CodeMirror.MergeView(target, {
-        value: value,
-        origLeft: panes == 3 && !collapse && !connect ? orig1 : null,
-        orig: orig2,
-        lineNumbers: true,
-        mode: "text/html",
-        highlightDifferences: highlight,
-        connect: connect,
-        collapseIdentical: collapse
-    });
-}
-function toggleDifferences() {
-    dv.setShowDifferences(highlight = !highlight);
-}
-
-function mergeViewHeight(mergeView) {
-    function editorHeight(editor) {
-        if (!editor) return 0;
-        return editor.getScrollInfo().height;
-    }
-    return Math.max(editorHeight(mergeView.leftOriginal()),
-        editorHeight(mergeView.editor()),
-        editorHeight(mergeView.rightOriginal()));
-}
-
-function resize(mergeView) {
-    var height = mergeViewHeight(mergeView);
-    for(;;) {
-        if (mergeView.leftOriginal())
-            mergeView.leftOriginal().setSize(null, height);
-        mergeView.editor().setSize(null, height);
-        if (mergeView.rightOriginal())
-            mergeView.rightOriginal().setSize(null, height);
-
-        var newHeight = mergeViewHeight(mergeView);
-        if (newHeight >= height) break;
-        else height = newHeight;
-    }
-    mergeView.wrap.style.height = height + "px";
-}
-
-*/
-
-$(document).ready(setupAjaxIndicatorBase);
-// test_sets：测试集；had_test_count：输出集的个数；test_sets_count：测试集的个数；had_passed_testsests_error_count：测试集报错数；test_sets_hidden_count：隐藏测试集的个数
-// test_sets_public_count：公开测试集的个人；had_passed_testsests_hidden_count：通过的隐藏集个数；had_passed_testsests_public_count：通过的公开测试集个数
-// final_score：最终得经验数；gold：最终得的金币数；latest_output：最新的输出；language：实训的语言, power：是否有权限看隐藏测试集, record：最新的一次的评测时间信息, mirror_name镜像名
-function code_evaluation(test_sets,
-                         had_test_count,
-                         test_sets_count,
-                         had_passed_testsests_error_count,
-                         test_sets_hidden_count,
-                         test_sets_public_count,
-                         had_passed_testsests_hidden_count,
-                         had_passed_testsests_public_count,
-                         final_score,
-                         gold,
-                         latest_output,
-                         mirror_name,
-                         power,
-                         record
-                         ) {
-//动态加载评测区域
-    /**
-     * Created by wang on 2017/8/9.
-     */
-    //test_sets = [HtmlUtil.htmlDecode(test_sets)];
-    var $EffectDisplay  , $b, $TestResult, $d, $e, $f, $g, $h, $EvaluationInformation , $n, $i;
-    // 第一块  效果显示
-    $EffectDisplay = "<div id=\"blacktab_con_1\" class=\"\" ></div>";
-    $b = "<div class=\"fit -scroll\">" +
-        "<div class=\"-layout-v -fit\">" +
-        "<div class=\"-flex -scroll task-padding16 loading-center undis\" id=\"html_ajax_loading\"></div>" +
-        "<form id=\"html_form\" method=\"post\" target=\"myFrame\">" +
-        "<input type=\"hidden\" name=\"contents\" id=\"data_param\" />" +
-        "</form>" +
-        "<iframe frameborder=\"0\" name=\"myFrame\" style='background: #fff;height: 100%;'>" +
-        "</iframe>" +
-        "</div>" +
-        "</div>";
-
-    if (mirror_name.indexOf("Html") != -1) {
-        $EffectDisplay = "<div id=\"blacktab_con_1\" class=\"\" >"+$b+"</div>";
-    }
-
-//第二块  测试结果
-    if (had_test_count != "0") {
-        var $t = "";
-        if(record != "" && record != null && record != undefined){
-            $t = " <span class=\"fr mr5 tab_color\">" + "本次评测耗时：" + record + "秒" + "</span>"
-        }
-        if (had_passed_testsests_error_count == test_sets_count) {
-            $d = $t + "<p class=\"color-light-green mb10\">" +
-                "<i class=\"fa fa-check-circle font-16\" ></i>" +
-                "<span class=\"ml5 mr5\">" + test_sets_count + "/" +  test_sets_count + "</span> 全部通过</p>";
-        } else {
-            $d = $t + "<p class=\"-text-danger mb10\">" +
-                "<i class=\"fa fa-exclamation-circle font-16\" ></i>" +
-                " <span class=\"ml5 mr5 -text-danger\">" + had_passed_testsests_error_count + '/' + test_sets_count + "</span>" + latest_output + "</p>";
-        }
-    }
-    var $forHtml = "";
-    var $Bear = "";
-    for (var i = 0; i < test_sets.length; i++) {
-        if (test_sets[i].result == 0) {
-            $g = "<i class=\"fa fa-exclamation-circle -text-danger fr mt8 ml5\" ></i>"
-        }else if(test_sets[i].result == 1) {
-            $g = "<i class=\"fa fa-check-circle color-light-green fr mt8 ml5 font-16\" ></i>"
-        }else{
-            $g = ""
-        }
-        if (test_sets[i].is_public == 0) {
-            if(power && power != 'false'){
-                $g = "<i class=\"fa fa-unlock fr mt8 ml5\" ></i>" + $g
-            }else if(test_sets[i].result == 0 || test_sets[i].result == 1){
-                $g = "<i class=\"fa fa-lock fr mt8 ml5\" ></i>" + $g
-            }else{
-                $g = "<i class=\"fa fa-lock fr mt8\" ></i>"
-            }
-        }else{
-            if(test_sets[i].result != 0 && test_sets[i].result != 1){
-                $g = undefined;
-            }
-        }
-        if(test_sets[i].input == null || test_sets[i].input == ""){
-            $i = "";
-        }else{
-            $i = "<div class=\"clearfix df mt5\">" +
-                 "<span class=\"color-blue fl fb\">测试输入：</span>" +
-                 "<p class=\"fl\" style='flex:1'>" + ( (test_sets[i].input == null || test_sets[i].input == "")  ? "空" : test_sets[i].input.replace(/\r\n/g, "<br>") ) + " </p>" +
-                 "</div>"
-        }
-        if ((test_sets[i].is_public == 1 || power == 'true') || (power && power != 'false')) {
-            $h = "<div class=\"-task-ces-info\" style=\"display:none\" id=\"test_case_" + i + "\">" +
-                $i +
-                "<div class='clearfix'><p class='fl with52 color-blue'>预期输出：</p><p class='fl with48 pl5 color-blue' style='box-sizing:border-box'>实际输出：</p></div>"+
-                "</div>" +
-                "<div id=\"result_different_show_"+ i + "\"></div>";
-        }else if(test_sets[i].is_public == 0) {
-            $h = "<div class=\"-task-ces-info undis\" id=\"test_case_" + i + "\">" +
-                " <ul class=\"font-14\">" +
-                " <li class=\"clearfix\">" +
-                "<div class=\"clearfix\">" +
-                "<p class=\"fl color-orange\" style=\"margin-left: 34px;\">此为隐藏测试项，<a href=\"javascript:void()\", class=\"color_white test_set_data\" style=\"text-decoration: underline;\">解锁</a></p>" +
-                " </div>" +
-                "</li>" +
-                " </ul>" +
-                "</div>";
-        }
-        $e = "<div class=\"-task-ces-box mb15 clearfix\">"+$h+"</div>";
-        // actual_output 正则匹配的目的： 因为字符串拼接\r\n时，会转义导致js截成2断报错.因此需要编码
-        var base64 = new Base64();
-        var actual_output = test_sets[i].actual_output == null ? "" : base64.encode(test_sets[i].actual_output);
-        var output = test_sets[i].output == null ? "" : base64.encode(test_sets[i].output);
-        $f = "<div class=\"-task-ces-top clearfix\" onclick='toggle_test_case(" + test_sets[i].is_public + "," + '"' + output+ '"' + "," + '"' + actual_output + '"' + "," + i + "," + power + ")' style=\"cursor:pointer\">" +
-            "<i class=\"fa fa-caret-right mr5 font-16\" ></i>" +
-            "<span class=\"font-14\">测试集 " + (i + 1) + "</span>" + ($g == undefined ? "" : $g)+"</div>";
-
-        $forHtml = $f + $e;
-        $Bear += $forHtml;
-    }
-    $TestResult = "<div id=\"blacktab_con_2\" class=\" " + (mirror_name.indexOf("Html") != -1 ? 'undis' : '') + "\">" +
-        "<div class=\"fit -scroll\">" +
-        "<div class=\"-layout-v -fit\">" +
-        "<div class=\"-flex -scroll task-padding16 loading-center undis\" id=\"evaluating_ajax_loading\"></div>" +
-        "<div class=\"-flex -scroll task-padding16\" id=\"evaluating_contents\">" + ($d == undefined ? "" : $d) + $Bear + "</div>" +
-        "</div>" +
-        "</div>" +
-        "</div>";
-
-//第三块 评测信息
-    if (had_test_count != "0") {
-        if (had_passed_testsests_error_count == test_sets_count) {
-            $n = "<p class=\"color-light-green mb10\">" +
-                "<i class=\"fa fa-check-circle font-16 \" ></i>" +
-                "<span class=\"ml5 mr5\">" + test_sets_count + "/" + test_sets_count + "</span> 全部通过</p>";
-        } else {
-            $n = "<p class=\"-text-danger mb10\">" +
-                "<i class=\"fa fa-exclamation-circle font-16\" ></i>" +
-                "<span class=\"ml5 mr5 -text-danger\">" + had_passed_testsests_error_count + "/" +  test_sets_count + "</span> " + latest_output + "</p>";
-        }
-       // $("#evaluating_info").html($n);
-    }
-    $EvaluationInformation = "<div id=\"blacktab_con_3\" class=\"undis\" >" +
-        "<div class=\"fit -scroll\">" +
-        "<div class=\"-layout-v -fit\">" +
-        "<div class=\"-flex -scroll task-padding16 loading-center undis\" id=\"info_ajax_loading\"></div>" +
-        "<div class=\"-flex -scroll task-padding16\" id=\"evaluating_info\">" + ($n == undefined ? "" : $n)+"<div class=\"-task-ces-box mb10 clearfix\">" +
-        "<div class=\"-task-ces-info\">" +
-        "<ul>" +
-        "<li>" +
-        "<span class=\"-task-ces-info-left \">公开测试：</span>" +
-        "<span class=\"color-light-green\">" + had_passed_testsests_public_count + "/" + test_sets_public_count + "</span>" +
-        "</li>" +
-        "<li>" +
-        "<span class=\"-task-ces-info-left\"> 隐藏测试：</span>" +
-        "<span class=\"color-light-green\">" + had_passed_testsests_hidden_count + "/" + test_sets_hidden_count + "</span>" +
-        "</li>" +
-        "<li>" +
-        "<span class=\"-task-ces-info-left\"> 经验值：</span>" +
-        "<span class=\"color-light-green\" id=\"experience_value\">+ " + final_score + " </span>" +
-        "</li>" +
-        "<li>" +
-        "<span class=\"-task-ces-info-left\">金币：</span>" +
-        "<span class=\""+ (gold >= 0 ? "color-light-green" : "-text-danger") + "\"" +"id=\"grade_value\">" + (gold >= 0 ? ("+ " + gold) : gold) + "</span>" +
-        "</li>" +
-        "</ul>" +
-        "</div>" +
-        "</div>" +
-        "</div>" +
-        "</div>" +
-        "</div>" +
-        "</div>";
-
-    var $html =  $EffectDisplay + $TestResult +  $EvaluationInformation;
-    $("#game_test_set_results").html($html);
-}
-// end
-
-
-// $.ajax({
-//     url: "http://localhost:3000/api/v1/games/zl6kx8f7vfpo",
- 
-//     // The name of the callback parameter, as specified by the YQL service
-//     jsonp: "callback",
- 
-//     // Tell jQuery we're expecting JSONP
-//     // dataType: "jsonp",
- 
-//     // Tell YQL what we want and that we want JSON
-//     data: {
-//         // q: "select title,abstract,url from search.news where query=\"cat\"",
-//         format: "json"
-//     },
- 
-//     // Work with the response
-//     success: function( response ) {
-//         console.log( response ); // server response
-//     }
-// });
-// ---------------------------------------------------------------------------------edu_tpi.js START
-
-
-// ------------------------------------------- application.js
-//自动保存草稿
-var editor2;
-function elocalStorage(editor,mdu,id){
-    if (window.sessionStorage){
-        editor2 = editor;
-        var oc = window.sessionStorage.getItem('content'+mdu);
-        if(oc !== null ){
-            var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" class="color-orange05" onclick="rec_data(\'content\',\''+ mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="color-orange05" onclick="clear_data(\'content\',\''+ mdu + '\',\'' + id + '\')">不恢复</a>';
-            $("#e_tips_"+id).html(h);
-        }
-        setInterval(function() {
-            d = new Date();
-            var h = d.getHours();
-            var m = d.getMinutes();
-            var s = d.getSeconds();
-            h = h < 10 ? '0' + h : h;
-            m = m < 10 ? '0' + m : m;
-            s = s < 10 ? '0' + s : s;
-            editor.sync();
-            if(!editor.isEmpty()){
-                add_data("content",mdu,editor.html());
-                var id1 = "#e_tip_"+id;
-                var id2 = "#e_tips_"+id;
-                $(id1).html(" 数据已于 " + h + ':' + m + ':' + s +" 保存   ");
-                $(id2).html("");
-            }
-        },10000);
-
-    }else{
-        $('.ke-edit').after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
-    }
-}
-
-function add_data(k,mdu,d){
-    window.sessionStorage.setItem(k+mdu,d);
-}
-
-// 公共弹框样式
-// 建议左右栏的：Width：460，Height：190
-// 建议宽屏对应值：Width：760，Height：500
-function pop_box_new(value, Width, Height){
-    if($("#popupAll").length > 0){
-        $("#popupAll").remove();
-    }
-    w = ($(window).width() - Width)/2;
-    h = ($(window).height() - Height)/2;
-    var html="<div class=\"popupAll none\" id='popupAll'><div class=\"pr\"><div id=\"popupWrap\"></div></div></div>";
-    $(document.body).append(html);
-    $("#popupWrap").html(value);
-    $('#popupWrap').css({"top": h+"px","left": w+"px","padding":"0","border":"none","position":"fixed","z-index":"99999","background-color":"#fff","border-radius":"10px"});
-    $("#popupWrap").parent().parent().show();
-    $('#popupWrap').find("a[class*='pop_close']").click(function(){
-        $("#popupAll").hide();
-    });
-//    w = ($(window).width() - Width)/2;
-//    h = ($(window).height() - Height)/2;
-//    $("#ajax-modal").html(value);
-//    showModal('ajax-modal', Width + 'px');
-//    $('#ajax-modal').siblings().remove();
-//    $('#ajax-modal').parent().css({"top": h+"px","left": w+"px","padding":"0","border":"none","position":"fixed"});
-//    $('#ajax-modal').parent().removeClass("resourceUploadPopup popbox_polls popbox");
-//    $('#ajax-modal').css({"padding":"0","overflow":"hidden"});
-//    $('#ajax-modal').parent().attr("id","popupWrap");
-
-    //拖拽
-    function Drag(id) {
-        this.div = document.getElementById(id);
-        if (this.div) {
-            this.div.style.cursor = "move";
-            this.div.style.position = "fixed";
-        }
-        this.disX = 0;
-        this.disY = 0;
-        var _this = this;
-        this.div.onmousedown = function (evt) {
-            _this.getDistance(evt);
-            document.onmousemove = function (evt) {
-                _this.setPosition(evt);
-            };
-            _this.div.onmouseup = function () {
-                _this.clearEvent();
-            }
-        }
-    }
-    Drag.prototype.getDistance = function (evt) {
-        var oEvent = evt || event;
-        this.disX = oEvent.clientX - this.div.offsetLeft;
-        this.disY = oEvent.clientY - this.div.offsetTop;
-    };
-    Drag.prototype.setPosition = function (evt) {
-        var oEvent = evt || event;
-        var l = oEvent.clientX - this.disX;
-        var t = oEvent.clientY - this.disY;
-        if (l <= 0) {
-            l = 0;
-        }
-        else if (l >= document.documentElement.clientWidth - this.div.offsetWidth) {
-            l = document.documentElement.clientWidth - this.div.offsetWidth;
-        }
-        if (t <= 0) {
-            t = 0;
-        }
-        else if (t >= document.documentElement.clientHeight - this.div.offsetHeight) {
-            t = document.documentElement.clientHeight - this.div.offsetHeight;
-        }
-        this.div.style.left = l + "px";
-        this.div.style.top = t + "px";
-    };
-    Drag.prototype.clearEvent = function () {
-        this.div.onmouseup = null;
-        document.onmousemove = null;
-    };
-
-    new Drag("popupWrap");
-
-    $("#popupWrap input, #popupWrap textarea, #popupWrap ul, #popupWrap a").mousedown(function(event){
-        event.stopPropagation();
-        new Drag("popupWrap");
-    });
-}
-function sure_box_redirect_btn(url, str,btnstr){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
-        '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
-        '<a href="'+ url +'" class="task-btn task-btn-orange" onclick="hideModal();" target="_blank">'+btnstr+'</a></div></div>';
-    pop_box_new(htmlvalue, 480, 160);
-}
-function sure_box_redirect_btn2(url, str, btnstr){
-    var htmlvalue = '<div class="task-popup" style="width:500px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3> <a href="javascript:void(0)" id="closeIcon" style="top: -48px;right: -20px;z-index: 100000;"><i class="iconfont icon-shanchudiao"></i></a></div>'+
-        '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix" style="width: 150px"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
-        '<a href="'+ url +'" class="task-btn task-btn-orange fr" target="_blank" onclick="hideModal();">'+btnstr+'</a></div></div>';
-    pop_box_new(htmlvalue, 578, 205);
-}
-
-function op_confirm_box_loading(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:578px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3> <a href="javascript:void(0)" id="closeIcon" style="top: -48px;right: -20px;z-index: 100000;"><i class="iconfont icon-shanchudiao"></i></a></div>'+
-        '<div class="task-popup-content"><p class="task-popup-text-center font-16 pt15">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
-        '<a href="'+ url +'" class="task-btn task-btn-orange fr" onclick="hideModal();$(\'.loading_all\').show();">确定</a></div></div>';
-    pop_box_new(htmlvalue, 578, 205);
-}
-
-//点击删除时的确认弹框: 走destroy方法,remote为true
-function delete_confirm_box_2(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3> <a href="javascript:void(0)" id="closeIcon" style="top: -48px;right: -20px;z-index: 100000;"><i class="iconfont icon-shanchudiao"></i></a></div>'+
-        '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
-        '<a href="'+ url +'" class="task-btn task-btn-orange fr pop_close" data-method="delete" data-remote="true">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 160);
-}
-
-
-//提示框：只有一个确定按钮，点击关闭弹框
-//<a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
-function notice_box(str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
-        '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
-        '<a href="javascript:void(0);" class="task-btn task-btn-orange" onclick="hideModal();">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 160);
-}
-
-// 长提示框：只有一个确定按钮，点击关闭弹框
-function long_notice_box(str){
-    var htmlvalue = '<div id="muban_popup_box" style="width:380px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
-        '<div class="clear mt15"><p class="text_c f14">' + str + '</p><div class="cl"></div>'+
-        '<a href="javascript:void(0);" class="fr sy_btn_blue mt10 mr10" onclick="hideModal();" style="margin-right: 164px;">确定</a></div></div>';
-    pop_box_new(htmlvalue, 380, 140);
-}
-
-
-function hideModal(el) {
-    if($("#popupAll").length > 0){
-        $("#popupAll").remove();
-    }
-    else{
-        var modal;
-        if (el) {
-            modal = $(el).parents('.ui-dialog-content');
-        } else {
-            modal = $('#ajax-modal');
-        }
-        modal.dialog("close");
-    }
-
-
-}
-
-
-// --------------------------------------------
-function is_cdn_link(contents){
-        if(contents.indexOf("http") != -1
-                || contents.indexOf("com") != -1
-                || contents.indexOf("net") != -1
-                || contents.indexOf("org") != -1
-                || contents.indexOf("cdn") != -1){
-            return true;
-        }else{
-            return false;
-        }
-    }
- // 渲染用户的HTML的CODE。
-function tpi_html_show(newCode){
-    //$($(".blacktab_con")[0]).trigger("click");
-    var contents = newCode;
-    var $htmlForm = $("#html_form");
-    var src = contents;
-    var arrCSS =[];
-    var arrSript = [];
-    var patternLink = /<link(?:.*?)href=[\"\‘](.+?)[\"\‘](?!<)(?:.*)\>(?:[\n\r\s]*?)(?:<\/link>)*/im;
-    var patternScript = /<script(?:.*?)src=[\"\‘](.+?)[\"\‘](?!<)(?:.*)\>(?:[\n\r\s]*?)(?:<\/script>)*/im;
-    var arrayMatchesLink = patternLink.exec(src);
-    var arrayMatchesScript = patternScript.exec(src);
-
-    // css部分
-    while(arrayMatchesLink != null){
-        if(is_cdn_link(arrayMatchesLink[1])){
-            src = src.replace(arrayMatchesLink[0], arrayMatchesLink[0].replace(/link/, "edulink"));
-        }else{
-            src = src.replace(patternLink, "EDUCODERCSS");
-            arrCSS.push(arrayMatchesLink[1]);
-        }
-        arrayMatchesLink = patternLink.exec(src);
-    }
-    // js部分
-    while(arrayMatchesScript != null){
-        if(is_cdn_link(arrayMatchesScript[1])){
-            src = src.replace(arrayMatchesScript[0], arrayMatchesScript[0].replace(/script/g,"w3scrw3ipttag"));
-        }else{
-            src = src.replace(patternScript, "EDUCODERJS");
-            arrSript.push(arrayMatchesScript[1]);
-        }
-        arrayMatchesScript = patternScript.exec(src);
-    }
-    // html部分 为了防止xss攻击，先将敏感字符转换
-    src = src.replace(/=/gi,"w3equalsign").replace(/script/gi,"w3scrw3ipttag");
-
-    $("#data_param").val(src);
-    $("#data_css_param").val(arrCSS);
-    $("#data_js_param").val(arrSript);
-    // $htmlForm.attr("action", "/iframes/html_content?gpid="+ __myshixun.gpid );
-    $htmlForm.submit();
-}
-// 渲染用户的HTML的CODE。--------------------------------------------END
-
-//提示框：只有一个知道啦按钮，点击打开新窗口
-//<a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
-function sure_box_redirect(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
-        '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
-        '<a href="'+ url +'" class="task-btn task-btn-orange" onclick="hideModal();" target="_blank">知道啦</a></div></div>';
-    pop_box_new(htmlvalue, 480, 160);
-}
-// 长提示框：只有一个“知道啦”按钮，点击关闭弹框
-//<a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
-function yes_notice_box(str){
-    var htmlvalue = '<div class="task-popup" style="width:575px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
-        '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
-        '<a href="javascript:void(0);" class="task-btn task-btn-orange" onclick="hideModal();">知道啦</a></div></div>';
-    pop_box_new(htmlvalue, 575, 200);
-}
-
-// --------------------- --------------------- --------------------- --------------------- START
-function notice_sure_box(str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
-        '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
-        '<a href="javascript:void(0);" class="task-btn task-btn-orange" onclick="hideModal();">知道啦</a></div></div>';
-    pop_box_new(htmlvalue, 480, 160);
-}
-//点击删除时的确认弹框: 走destroy方法,remote为true
-function delete_confirm_box_2_react(url, str, data){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>'+
-        '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="clearfix edu-txt-center mb20 mt10"><div class="inline"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
-        '<a href="javascript:void(0)" onclick="window._triggerEvent(\'' + url +'\', \'' + encodeURIComponent(JSON.stringify(data)) + '\', $(\'body>#root\')[0])" class="task-btn task-btn-orange pop_close ml20" >确定</a></div></div></div>';
-    pop_box_new(htmlvalue, 480, 160);
-    // encodeURIComponent(JSON.stringify(data))
-    // "$(window.top).trigger(\'' + url +'\', \'' + url + '\')"
-}
-// https://github.com/facebook/react/issues/3249#issuecomment-177750141
-function _triggerEvent(eventName, data, target) {
-	var event = document.createEvent("HTMLEvents");
-	event.initEvent(eventName, true, true);
-	var target = target || document;
-	// $('body>#root').data(eventName, data)
-	window[eventName] = data;
-	target.dispatchEvent(event);
-
-	hideModal();
-}
-// --------------------- --------------------- --------------------- --------------------- END
-
 
 // ---------------------------------------------------------------------------------------------
-$(function(){ 		// 这里重新加一次事件监听，不在原有事件的基础上增加代码了
-	var doc = $(document);
-	var lab = $(".b-label");
-	var cen = $(".h-center");
-	var dragDom;
-	var dragging = false;
-	lab.live('mousedown',function(){
-			dragging = true;
-			dragDom = lab;
-			$('#htmlIframe').css('pointer-events', 'none')
-            $('#can-drag').show()
-            lab.hide()
-	        return false;
-	    }
-	);
-	cen.live('mousedown',function(){
-			dragging = true;
-			dragDom = cen;
-			// 使得iframe不捕获事件
-			$('#htmlIframe').css('pointer-events', 'none')
-	        return false;
-	    }
-	);
-	doc.live("mousemove", function(e) {
-		if (dragging === true && lab == dragDom) {
+$(function () { 		// 这里重新加一次事件监听，不在原有事件的基础上增加代码了
+    var doc = $(document);
+    var lab = $(".b-label");
+    var cen = $(".h-center");
+    var dragDom;
+    var dragging = false;
+    lab.live('mousedown', function () {
+        dragging = true;
+        dragDom = lab;
+        $('#htmlIframe').css('pointer-events', 'none')
+        $('#can-drag').show()
+        lab.hide()
+        return false;
+    }
+    );
+    cen.live('mousedown', function () {
+        dragging = true;
+        dragDom = cen;
+        // 使得iframe不捕获事件
+        $('#htmlIframe').css('pointer-events', 'none')
+        return false;
+    }
+    );
+    doc.live("mousemove", function (e) {
+        if (dragging === true && lab == dragDom) {
             window._tpiWidthResize && window._tpiWidthResize()
-			// React 组件中需要resize，搜索该引用可以找到初始化的位置
-			window._currentChildcommentMDEditor && window._currentChildcommentMDEditor.resize()
-		}
-	})
+            // React 组件中需要resize，搜索该引用可以找到初始化的位置
+            window._currentChildcommentMDEditor && window._currentChildcommentMDEditor.resize()
+        }
+    })
 
-	doc.live("mouseup", function(e) {
+    doc.live("mouseup", function (e) {
         lab.show()
-		// 在大窗口将下边测试集滚动条拖上去后，将窗口缩小，再拖下来就有这种情况  https://www.trustie.net/issues/16326
-		if (dragging === true) {	
+        // 在大窗口将下边测试集滚动条拖上去后，将窗口缩小，再拖下来就有这种情况  https://www.trustie.net/issues/16326
+        if (dragging === true) {
             $('#can-drag').hide()
 
-			window.editor_CodeMirror && window.editor_CodeMirror.refresh()
-            
-			// 使得iframe可以继续捕获事件
-    		$('#htmlIframe').css('pointer-events', 'inherit')
-		}
-		dragging = false;
+            window.editor_CodeMirror && window.editor_CodeMirror.refresh()
+
+            // 使得iframe可以继续捕获事件
+            $('#htmlIframe').css('pointer-events', 'inherit')
+        }
+        dragging = false;
     });
 })
 
+// ---------------------------------------------------------------------------------------------
+// md编辑器拖拽改变高度，TODO其他初始化参数，高度改变阈值...
+// 写这里，供非react版本时copy一份用
+function initMDEditorDragResize(resizeBarSelector, mdEditor, options) {
+    if (!options) {
+        options = {}
+    }
+    if ($('#' + mdEditor.id).length === 0) {
+        console.error('未找到editor')
+        return;
+    }
+    var doc = $(document);
+    var editor__resize = $('#' + mdEditor.id).parent().find(resizeBarSelector);
+    if (editor__resize.length === 0) {
+        console.error('未找到resizeBar')
+        return;
+    }
+    var dragging = false;
+    var topOffset, clickY, initDelta;
+    var initHeight = options.initHeight || 240;
+
+    editor__resize.on('mousedown', function () {
+        dragging = true;
+        topOffset = editor__resize.offset().top;
+        initDelta = $('#' + mdEditor.id).height() - initHeight;
+    });
+    doc.live('mousemove', function (e) {
+        if (dragging) {
+            clickY = e.pageY;
+
+            var delta = clickY - topOffset + initDelta;
+            if (delta > 300) {
+                delta = 300;
+            }
+            if (delta < 0) {
+                delta = 0;
+            }
+
+            mdEditor.resize('', (initHeight + delta) + 'px')
+
+            // $('#memo_comment_editorMd').height(initHeight + delta)
+        }
+        return false
+    });
+
+    doc.live("mouseup", function (e) {
+        dragging = false;
+    });
+}
+
+// 计算文本宽度 https://stackoverflow.com/questions/1582534/calculating-text-width
+function _textWidth(text, font) {
+    if (!window._fakeEl) window._fakeEl = $('<span>').hide().appendTo(document.body);
+    window._fakeEl.text(typeof text == 'object' ? text.val() || text.text() : text).css('font', font || text.css('font'));
+    return window._fakeEl.width();
+}
+
 // ---------------------------------------------------------------------------------------------
 /**
  * 评论使用的mdeditor初始化
@@ -1261,58 +609,58 @@ $(function(){ 		// 这里重新加一次事件监听，不在原有事件的基
 var _path = "/editormd/lib/"
 var _isDev = window.location.port === "3007";
 if (_isDev) {
-  _path =  'http://localhost:3000/editormd/lib/'
+    _path = 'http://localhost:3000/editormd/lib/'
 }
-function create_editorMD_4comment(id, width, high, placeholder, imageUrl, callback, otherOptions){
+function create_editorMD_4comment(id, width, high, placeholder, imageUrl, callback, otherOptions) {
     var editorName = window.editormd(id, Object.assign({
-        width   : width,
-        height  : high,
-        syncScrolling : "single",
+        width: width,
+        height: high,
+        syncScrolling: "single",
         //你的lib目录的路径，我这边用JSP做测试的
-        path    : _path ,   // "/editormd/lib/"
+        path: _path,   // "/editormd/lib/"
         markdown: '',
-        tex              : true,
-        tocm             : true,
-        emoji            : true,
-        taskList         : true,
-        codeFold         : true,
-        searchReplace    : true,
-        htmlDecode       : "style,script,iframe",
-        sequenceDiagram  : true,
+        tex: true,
+        tocm: true,
+        emoji: true,
+        taskList: true,
+        codeFold: true,
+        searchReplace: true,
+        htmlDecode: "style,script,iframe",
+        sequenceDiagram: true,
         autoFocus: false,
-        toolbarIcons : function() {
+        toolbarIcons: function () {
             // Or return editormd.toolbarModes[name]; // full, simple, mini
             // Using "||" set icons align right.
             return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|"
-            , "testIcon", "testIcon1", '|', "emoji", "image", "table", '|', "watch", "clear" ]
+                , "testIcon", "testIcon1", '|', "emoji", "image", "table", '|', "watch", "clear"]
         },
-        toolbarCustomIcons : {
-            testIcon  : "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-            testIcon1 : "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
+        toolbarCustomIcons: {
+            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
+            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
         },
         //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
-        saveHTMLToTextarea : true,
+        saveHTMLToTextarea: true,
         // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-        dialogMaskOpacity : 0.6,
+        dialogMaskOpacity: 0.6,
         placeholder: placeholder,
-        imageUpload : true,
-        imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-        imageUploadURL : imageUrl,//url
-        onload: function(){
-          // this.previewing();
-            $("#"+ id +" [type=\"latex\"]").bind("click", function(){
+        imageUpload: true,
+        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
+        imageUploadURL: imageUrl,//url
+        onload: function () {
+            // this.previewing();
+            $("#" + id + " [type=\"latex\"]").bind("click", function () {
                 editorName.cm.replaceSelection("```latex");
                 editorName.cm.replaceSelection("\n");
                 editorName.cm.replaceSelection("\n");
                 editorName.cm.replaceSelection("```");
                 var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line-1, 0);
+                editorName.cm.setCursor(__Cursor.line - 1, 0);
             });
 
-            $("#"+ id +" [type=\"inline\"]").bind("click", function(){
+            $("#" + id + " [type=\"inline\"]").bind("click", function () {
                 editorName.cm.replaceSelection("$$$$");
                 var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line, __Cursor.ch-2);
+                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
                 editorName.cm.focus();
             });
             $("[type=\"inline\"]").attr("title", "行内公式");
@@ -1323,61 +671,3 @@ function create_editorMD_4comment(id, width, high, placeholder, imageUrl, callba
     }, otherOptions));
     return editorName;
 }
-
-// ---------------------------------------------------------------------------------------------
-// md编辑器拖拽改变高度，TODO其他初始化参数，高度改变阈值...
-// 写这里，供非react版本时copy一份用
-function initMDEditorDragResize(resizeBarSelector, mdEditor, options) {
-	if (!options) {
-		options = {}
-	}
-	if($('#'+ mdEditor.id).length === 0) {
-		console.error('未找到editor')
-		return;
-	}
-  	var doc = $(document);
-  	var editor__resize = $('#'+ mdEditor.id).parent().find(resizeBarSelector);
-  	if (editor__resize.length === 0) {
-	    console.error('未找到resizeBar')
-	    return;
-  	}
-  	var dragging = false;
-  	var topOffset, clickY, initDelta; 
-  	var initHeight = options.initHeight || 240;
-
-  	editor__resize.on('mousedown',function(){
-	    dragging = true;
-	    topOffset = editor__resize.offset().top;
-	    initDelta = $('#' + mdEditor.id).height() - initHeight;
-  	});
-  	doc.live('mousemove', function(e){
-	    if(dragging){
-	      clickY = e.pageY;
-	      
-	      var delta = clickY - topOffset + initDelta;
-	      if (delta > 300 ) {
-	        delta = 300;
-	      }
-	      if (delta < 0) {
-	        delta = 0;
-	      }
-	      
-	      mdEditor.resize('', (initHeight + delta) + 'px')
-
-	      // $('#memo_comment_editorMd').height(initHeight + delta)
-	    }
-    	return false
-  	});
- 
-  doc.live("mouseup", function(e) {
-    dragging = false;
-  });
-}
-
-// 计算文本宽度 https://stackoverflow.com/questions/1582534/calculating-text-width
-function _textWidth(text, font) {
-	if (!window._fakeEl) window._fakeEl = $('<span>').hide().appendTo(document.body);
-    window._fakeEl.text(typeof text == 'object' ? text.val() || text.text() : text ).css('font', font || text.css('font'));
-    return window._fakeEl.width();
-}
-
diff --git a/scripts/build.js b/scripts/build.js
index 91b76133..84be8e6d 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -2,7 +2,6 @@
 
 // Do this as the first thing so that any code reading it knows the right env.
 process.env.BABEL_ENV = 'production';
-process.env.NODE_ENV = 'production';
 
 // Makes the script crash on unhandled rejections instead of silently
 // ignoring them. In the future, promise rejections that are not handled will
@@ -46,10 +45,10 @@ if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
 function removeExceptGitDir(dir) {
   // readdirSync
   const list = fs2.readdirSync(dir)
-    // if (err) return done(err);
+  // if (err) return done(err);
   var pending = list.length;
   // if (!pending) return done(null, results);
-  list.forEach(function(file) {
+  list.forEach(function (file) {
     if (file.indexOf('.git') == -1) {
       file = path.resolve(dir, file);
       fs.removeSync(file)
@@ -80,13 +79,13 @@ measureFileSizesBeforeBuild(paths.appBuild)
         console.log(warnings.join('\n\n'));
         console.log(
           '\nSearch for the ' +
-            chalk.underline(chalk.yellow('keywords')) +
-            ' to learn more about each warning.'
+          chalk.underline(chalk.yellow('keywords')) +
+          ' to learn more about each warning.'
         );
         console.log(
           'To ignore, add ' +
-            chalk.cyan('// eslint-disable-next-line') +
-            ' to the line before.\n'
+          chalk.cyan('// eslint-disable-next-line') +
+          ' to the line before.\n'
         );
       } else {
         console.log(chalk.green('Compiled successfully.\n'));
@@ -149,14 +148,12 @@ function build(previousFileSizes) {
         console.log(
           chalk.yellow(
             '\nTreating warnings as errors because process.env.CI = true.\n' +
-              'Most CI servers set it automatically.\n'
+            'Most CI servers set it automatically.\n'
           )
         );
         return reject(new Error(messages.warnings.join('\n\n')));
       }
 
-      generateNewIndexJsp();
-
       return resolve({
         stats,
         previousFileSizes,
@@ -170,82 +167,5 @@ function copyPublicFolder() {
   fs.copySync(paths.appPublic, paths.appBuild, {
     dereference: true,
     filter: file => file !== paths.appHtml,
-  });
-}
-
-// 给build脚本增加的方法，对其生成的index.html做一些文本替换，以及cdn处理
-function generateNewIndexJsp() {
-  // var combinedStream = CombinedStream.create();
-  var filePath = paths.appBuild + '/index.html';
-  // var htmlContent = fs2.createReadStream( filePath )
-
-  // stream没有replace方法
-  // htmlContent = htmlContent.replace('/js/js_min_all.js', '/react/build/js/js_min_all.js')
-  // htmlContent = htmlContent.replace('/css/css_min_all.css', '/react/build/css/css_min_all.css')
-
-  // combinedStream.append(htmlContent);
-  // combinedStream.pipe(fs2.createWriteStream( filePath ));
-
-  var outputPath = paths.appBuild  + '/index.html'
-  fs2.readFile(filePath, 'utf8', function (err,data) {
-    if (err) {
-      return console.log(err);
-    }
-    const newVersion = '1.1.1'
-    let cdnHost = 'https://shixun.educoder.net'
-    cdnHost = 'https://ali-cdn.educoder.net'
-    cdnHost = ''
-
-
-    var mainRegex = /<script type="text\/javascript" src="\/react\/build\/.\/static\/js\/main.([a-zA-Z0-9]{8,}).js"><\/script>/
-    var matchResult = data.match(mainRegex)
-    var code = `
-      <script>
-         (function() {
-            var _host = '/react/build/'
-            /**/
-            if (window.location.host == 'pre-newweb.educoder.net') {
-                _host = 'https://testali-cdn.educoder.net/react/build/'
-            } else if (window.location.host == 'www.educoder.net') {
-                _host = 'https://ali-cdn.educoder.net/react/build/'
-            }
-            document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\\/script>');
-            document.write('<script type="text/javascript" src="' + _host + 'static/js/main.${matchResult[1]}.js"><\\/script>');
-         })()
-      </script>
-    `
-    var jsMinAllRegex = /<script type="text\/javascript" src="\/js\/js_min_all.js"><\/script>/
-    // <script type="text/javascript" src="/js/js_min_all.js"></script>
-    var result = data
-        .replace(jsMinAllRegex, code)
-        // .replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`)
-        // .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)
-
-        // ${cdnHost}  加了cdn后，这个文件里的字体文件加载会有跨域的报错   ../fonts/fontawesome-webfont.eot
-        // TODO tpi 评测结果关闭也使用了fontawesome
-        .replace('/css/css_min_all.css', `${cdnHost}/react/build/css/css_min_all.css?v=${newVersion}`)
-			  .replace('/css/iconfont.css', `${cdnHost}/react/build/css/iconfont.css?v=${newVersion}`)
-        .replace(/\/js\/create_kindeditor.js/g, `${cdnHost}/react/build/js/create_kindeditor.js?v=${newVersion}`)
-
-        .replace(mainRegex, '')
-        // .replace('/react/build/./static/css/main', `${cdnHost}/react/build/./static/css/main`)
-        // .replace('/react/build/./static/js/main', `${cdnHost}/react/build/./static/js/main`)
-
-        // .replace(/https:\/\/testeduplus2.educoder.net/g, '');
-        // .replace(/http:\/\/testbdweb.educoder.net/g, '');
-
-        // .replace('/css/css_min_all.css', '/react/build/css/css_min_all.css');
-
-    fs2.writeFile(outputPath, result, 'utf8', function (err) {
-       if (err) return console.log(err);
-      //  commitAndPush();
-    });
-  });
-}
-
-function commitAndPush() {
-  var exec = require('child_process').exec;
-  function puts(error, stdout, stderr) { console.log(stdout) }
-  var options = {cwd:"./build"};
-  exec("git status && git commit -am 'b' && git push", options, puts);
+  })
 }
diff --git a/scripts/concat.js b/scripts/concat.js
index bfb1d854..faf88154 100644
--- a/scripts/concat.js
+++ b/scripts/concat.js
@@ -1,31 +1,31 @@
 var fs = require('fs');
 var uglify = require("uglify-js");
 var path = require('path');
-var concat = require('concat')    
+var concat = require('concat')
 
 var results = [];
-var walk = function(dir, done) {
-  
-  fs.readdir(dir, function(err, list) {
-  	console.log(list)
-    if (err) return done(err);
-    var pending = list.length;
-    if (!pending) return done(null, results);
-    list.forEach(function(file) {
-      file = path.resolve(dir, file);
-      fs.stat(file, function(err, stat) {
-        if (stat && stat.isDirectory()) {
-          walk(file, function(err, res) {
-            // results = results.concat(res);
-            if (!--pending) done(null, results);
-          });
-        } else {
-          results.push(file);
-          if (!--pending) done(null, results);
-        }
-      });
-    });
-  });
+var walk = function (dir, done) {
+
+	fs.readdir(dir, function (err, list) {
+		console.log(list)
+		if (err) return done(err);
+		var pending = list.length;
+		if (!pending) return done(null, results);
+		list.forEach(function (file) {
+			file = path.resolve(dir, file);
+			fs.stat(file, function (err, stat) {
+				if (stat && stat.isDirectory()) {
+					walk(file, function (err, res) {
+						// results = results.concat(res);
+						if (!--pending) done(null, results);
+					});
+				} else {
+					results.push(file);
+					if (!--pending) done(null, results);
+				}
+			});
+		});
+	});
 };
 
 // 需要输出文件名数组时改为true
@@ -34,65 +34,51 @@ var cssDir = './public/css'
 
 // true && 
 false &&
-walk(cssDir, function() {
-	console.log('results', results.length, results)
-})
+	walk(cssDir, function () {
+		console.log('results', results.length, results)
+	})
 // return;
 
 // ----------------------------------------------------------------------------- CSS 
-	var cssResults = [ 
-	
-  'D:\\Code\\trustieplus\\public\\react\\public\\css\\edu-common.css',
-  'D:\\Code\\trustieplus\\public\\react\\public\\css\\edu-public.css',
-  'D:\\Code\\trustieplus\\public\\react\\public\\css\\taskstyle.css' ,
+var cssResults = [
 
-  'D:\\Code\\trustieplus\\public\\react\\public\\css\\font-awesome.css',
-  
-  'D:\\Code\\trustieplus\\public\\react\\public\\css\\editormd.min.css',
-  'D:\\Code\\trustieplus\\public\\react\\public\\css\\merge.css',
-  
-  ]
-   concat(cssResults, './public/css/css_min_all.css')
+	'D:\\Code\\trustieplus\\public\\react\\public\\css\\edu-common.css',
+	'D:\\Code\\trustieplus\\public\\react\\public\\css\\edu-public.css',
+	'D:\\Code\\trustieplus\\public\\react\\public\\css\\taskstyle.css',
+
+	'D:\\Code\\trustieplus\\public\\react\\public\\css\\font-awesome.css',
+
+	'D:\\Code\\trustieplus\\public\\react\\public\\css\\editormd.min.css',
+	'D:\\Code\\trustieplus\\public\\react\\public\\css\\merge.css',
+
+]
+concat(cssResults, './public/css/css_min_all.css')
 
 return;
 
 // ----------------------------------------------------------------------------- JS
-	var _results = [ 
+var _results = [
 
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\jquery-1.8.3.min.js',
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\underscore.min.js',
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\marked.min.js',
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\prettify.min.js',
-	  'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\raphael.min.js',
-	  'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\sequence-diagram.min.js',
+	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\raphael.min.js',
+	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\sequence-diagram.min.js',
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\flowchart.min.js',
-	  'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\jquery.flowchart.min.js',
-	  'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\editormd.min.js',
+	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\jquery.flowchart.min.js',
+	'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\editormd.min.js',
 
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\codemirror\\codemirror.js',
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\codemirror\\mode\\javascript.js',
 
 	'D:\\Code\\trustieplus\\public\\react\\public\\js\\diff_match_patch.js',
-	  
-	  
-	  'D:\\Code\\trustieplus\\public\\react\\public\\js\\merge.js',
-	  
-	  'D:\\Code\\trustieplus\\public\\react\\public\\js\\edu_tpi.js',
-
-	  ]
-	
-	concat(_results, './public/js/js_min_all.js')
-
-	// var uglified = uglify.minify(['./public/js/merge.js']);
-	// console.log('uglified', uglified)
-	// fs.writeFile('concat.min.js', uglified.code, function (err){
-	//   if(err) {
-	//     console.log(err);
-	//   } else {
-	//     console.log("Script generated and saved:", 'concat.min.js');
-	//   }      
-	// });
 
 
-// var uglified = uglify.minify(['file1.js', 'file2.js', 'file3.js']);
+	'D:\\Code\\trustieplus\\public\\react\\public\\js\\merge.js',
 
+	'D:\\Code\\trustieplus\\public\\react\\public\\js\\edu_tpi.js',
+
+]
+
+concat(_results, './public/js/js_min_all.js')
diff --git a/scripts/purge-css.js b/scripts/purge-css.js
new file mode 100644
index 00000000..7108b9a7
--- /dev/null
+++ b/scripts/purge-css.js
@@ -0,0 +1,21 @@
+const { PurgeCSS } = require('purgecss')
+var fs = require('fs');
+
+async function purgeBuild() {
+  const purgeCSSResult = await new PurgeCSS().purge({
+    content: ['../src/**/*.js', '../src/**/*.jsx',],
+    css: ['../public/css/edu-public.css', '../public/css/taskstyle.css', '../public/css/edu-main.css', '../public/css/edu-all.css']
+  })
+
+  let result = []
+  for (let i = 0; i < purgeCSSResult.length; i++) {
+    let item = purgeCSSResult[i]
+    result.push(item.css)
+  }
+
+  fs.writeFile('../public/css/edu-purge.css', result.join(''), 'utf8', function (err) {
+    if (err) return console.log(err)
+  })
+}
+
+purgeBuild()
\ No newline at end of file
diff --git a/scripts/start.js b/scripts/start.js
index 321148cd..8f816e96 100644
--- a/scripts/start.js
+++ b/scripts/start.js
@@ -36,7 +36,7 @@ const useYarn = fs.existsSync(paths.yarnLockFile);
 const isInteractive = process.stdout.isTTY;
 
 const portSetting = require(paths.appPackageJson).port
-if ( portSetting ) {
+if (portSetting) {
   process.env.port = portSetting
 }
 
@@ -76,10 +76,9 @@ choosePort(HOST, DEFAULT_PORT)
     const appName = require(paths.appPackageJson).name;
     const urls = prepareUrls(protocol, HOST, port);
     // Create a webpack compiler that is configured with custom messages.
-    const compiler = createCompiler(webpack, config, appName, urls, useYarn);
+    const compiler = createCompiler({ webpack, config, appName, urls, useYarn });
     // Load proxy config
     const proxySetting = require(paths.appPackageJson).proxy;
-    console.log('-------------------------proxySetting:', proxySetting)
     const proxyConfig = prepareProxy(proxySetting, paths.appPublic);
     // Serve webpack assets generated by the compiler over a web sever.
     const serverConfig = createDevServerConfig(
@@ -99,8 +98,8 @@ choosePort(HOST, DEFAULT_PORT)
       openBrowser(urls.localUrlForBrowser);
     });
 
-    ['SIGINT', 'SIGTERM'].forEach(function(sig) {
-      process.on(sig, function() {
+    ['SIGINT', 'SIGTERM'].forEach(function (sig) {
+      process.on(sig, function () {
         devServer.close();
         process.exit();
       });
diff --git a/src/App.css b/src/App.css
index 07d3d718..7f891ce2 100644
--- a/src/App.css
+++ b/src/App.css
@@ -23,8 +23,13 @@
 }
 
 @keyframes App-logo-spin {
-  from { transform: rotate(0deg); }
-  to { transform: rotate(360deg); }
+  from {
+    transform: rotate(0deg);
+  }
+
+  to {
+    transform: rotate(360deg);
+  }
 }
 
 
@@ -35,63 +40,78 @@
 .editormd .CodeMirror-linenumbers {
   padding: 0;
 }
-.editormd-html-preview hr, .editormd-preview-container hr {
+
+.editormd-html-preview hr,
+.editormd-preview-container hr {
   /* 颜色加深 */
   border-top: 1px solid #ccc;
 }
 
 /* 重置掉antd的一些样式 */
-html, body {
+html,
+body {
   -webkit-font-smoothing: auto !important;
 }
 
 .ant-progress-textyes {
   color: #52c41a;
 }
-.ant-progress-textno{
+
+.ant-progress-textno {
   color: #f5222d;
 }
+
 /* md多空格 */
 .markdown-body p {
   white-space: pre-wrap;
-  font-size: 16px!important
+  font-size: 16px !important
 }
-.markdown-body > p {
+
+.markdown-body>p {
   line-height: 25px;
 }
+
 /* https://www.educoder.net/courses/2346/group_homeworks/34405/question */
 .renderAsHtml.markdown-body p {
   white-space: inherit;
 }
+
 /* resize */
 .editormd .CodeMirror {
   border-right: none !important;
 }
+
 .editormd-preview {
   border-left: 1px solid rgb(221, 221, 221);
   /* 某些情况下，被cm盖住了 */
   z-index: 99;
 }
+
 /* 图片点击放大的场景，隐藏图片链接 */
 .editormd-image-click-expand .editormd-image-dialog {
   height: 234px !important;
 }
-  .editormd-image-click-expand .editormd-image-dialog .image-link {
-    display: none;
-  }
+
+.editormd-image-click-expand .editormd-image-dialog .image-link {
+  display: none;
+}
+
 /* 解决鼠标框选时，左边第一列没高亮的问题 */
-.CodeMirror .CodeMirror-lines pre.CodeMirror-line, .CodeMirror .CodeMirror-lines pre.CodeMirror-line-like {
-  padding: 0 12px ;
+.CodeMirror .CodeMirror-lines pre.CodeMirror-line,
+.CodeMirror .CodeMirror-lines pre.CodeMirror-line-like {
+  padding: 0 12px;
 }
 
 
 /* antd扩展 */
-.formItemInline.ant-form-item {    
+.formItemInline.ant-form-item {
   display: flex;
 }
+
 .formItemInline .ant-form-item-control-wrapper {
   flex: 1;
 }
+
 /* AutoComplete  placeholder 不显示的问题 */
 .ant-select-auto-complete.ant-select .ant-select-selection__placeholder {
   z-index: 2;
diff --git a/src/App.js b/src/App.js
index 7a92a34d..4ee19f56 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,8 +1,6 @@
-import React, {Component} from 'react';
-import './public-path';
-// import logo from './logo.svg';
+import React, { Component } from 'react';
 import './App.css';
-import {ConfigProvider} from 'antd'
+import { ConfigProvider } from 'antd'
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import {
 	BrowserRouter as Router,
@@ -10,9 +8,6 @@ import {
 	Switch
 } from 'react-router-dom';
 import axios from 'axios';
-import '@icedesign/base/dist/ICEDesignBase.css';
-
-import '@icedesign/base/index.scss';
 
 import LoginDialog from './modules/login/LoginDialog';
 import Notcompletedysl from './modules/user/Notcompletedysl';
@@ -21,9 +16,7 @@ import Trialapplicationreview from './modules/user/Trialapplicationreview';
 import Addcourses from "./modules/courses/coursesPublic/Addcourses";
 import AccountProfile from "./modules/user/AccountProfile";
 import Accountnewprofile from './modules/user/Accountnewprofile';
-// import Trialapplication from './modules/login/Trialapplication';
 import Certifiedprofessional from './modules/modals/Certifiedprofessional';
-// import NotFoundPage from './NotFoundPage'
 
 import Loading from './Loading'
 
@@ -32,18 +25,14 @@ import Loadable from 'react-loadable';
 
 import moment from 'moment'
 
-import {MuiThemeProvider, createMuiTheme} from 'material-ui/styles';
-
-// import './AppConfig'
+import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
 
 import history from './history';
 
-import {SnackbarHOC} from 'educoder'
-import {initAxiosInterceptors} from './AppConfig'
+import { SnackbarHOC } from 'educoder'
+import { initAxiosInterceptors } from './AppConfig'
 import { Provider } from 'react-redux';
 import configureStore from './redux/stores/configureStore';
-// ！！！tpi需要这个来加载css
-import {TPMIndexHOC} from './modules/tpm/TPMIndexHOC';
 const store = configureStore();
 
 const theme = createMuiTheme({
@@ -52,14 +41,9 @@ const theme = createMuiTheme({
 			main: '#4CACFF',
 			contrastText: 'rgba(255, 255, 255, 0.87)'
 		},
-		secondary: {main: '#4CACFF'}, // #11cb5f This is just green.A700 as hex.
+		secondary: { main: '#4CACFF' }, // #11cb5f This is just green.A700 as hex.
 	},
 });
-//
-// const Trialapplication= Loadable({
-//     loader: () =>import('./modules/login/Trialapplication'),
-//     loading:Loading,
-// })
 //登入
 const EducoderLogin = Loadable({
 	loader: () => import('./modules/login/EducoderLogin'),
@@ -68,30 +52,26 @@ const EducoderLogin = Loadable({
 
 
 //微信登录
-const Otherlogin=Loadable({
+const Otherlogin = Loadable({
 	loader: () => import('./modules/login/Otherlogin'),
 	loading: Loading,
 })
 
 //微信登录
-const  Loginqq=Loadable({
+const Loginqq = Loadable({
 	loader: () => import('./modules/login/Loginqq'),
 	loading: Loading,
 })
 
 
-const Otherloginstart=Loadable({
+const Otherloginstart = Loadable({
 	loader: () => import('./modules/login/Otherloginstart'),
 	loading: Loading,
 })
-const Otherloginsqq=Loadable({
+const Otherloginsqq = Loadable({
 	loader: () => import('./modules/login/Otherloginqq'),
 	loading: Loading,
 })
-// const TestIndex = Loadable({
-// 	loader: () => import('./modules/test'),
-// 	loading: Loading,
-// })
 
 const IndexWrapperComponent = Loadable({
 	loader: () => import('./modules/page/IndexWrapper'),
@@ -103,24 +83,6 @@ 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 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'),
 	loading: Loading,
@@ -135,6 +97,11 @@ const ShixunPaths = Loadable({
 	loader: () => import('./modules/paths/Index'),
 	loading: Loading,
 })
+//forge项目
+const Projects = Loadable({
+	loader: () => import('./forge/Index'),
+	loading: Loading,
+})
 
 //在线课堂
 const CoursesIndex = Loadable({
@@ -146,53 +113,12 @@ const SearchPage = Loadable({
 	loading: Loading,
 })
 
-// 课堂讨论
-// const BoardIndex = Loadable({
-//   loader: () => import('./modules/courses/boards/BoardIndex'),
-//   loading:Loading,
-// })
-
-// //课堂普通作业&分组作业
-// const CoursesWorkIndex = Loadable({
-//   loader: () => import('./modules/courses/busyWork/Index'),
-//   loading:Loading,
-// })
-//
-
-// const TPMShixunchildIndexComponent = Loadable({
-//     loader: () => import('./modules/tpm/shixunchild/ShixunChildIndex'),
-//     loading: Loading,
-//   })
-
-
-// const TPMshixunfork_listIndexComponent = Loadable({
-//     loader: () => import('./modules/tpm/shixunchild/Shixunfork_list'),
-//     loading: Loading,
-//   })
-
 
 const ForumsIndexComponent = Loadable({
 	loader: () => import('./modules/forums/ForumsIndex'),
 	loading: Loading,
 })
 
-const ProjectIndex = Loadable({
-	loader: () => import('./forge/Index'),
-	loading: Loading,
-})
-
-// trustie plus forum
-// const TPForumsIndexComponent = Loadable({
-//   loader: () => import('./modules/tp-forums/TPForumsIndex'),
-//   loading: Loading,
-// })
-
-
-// const TestPageComponent = Loadable({
-//   loader: () => import('./modules/page/Index'),
-//   loading: Loading,
-// })
-
 
 //新建实训
 const Newshixuns = Loadable({
@@ -200,14 +126,11 @@ const Newshixuns = Loadable({
 	loading: Loading,
 })
 
-
-//实训首页
 const ShixunsHome = Loadable({
-	loader: () => import('./modules/home/shixunsHome'),
+	loader: () => import('./modules/home'),
 	loading: Loading,
 })
 
-
 const CompatibilityPageLoadable = Loadable({
 	loader: () => import('./modules/common/CompatibilityPage'),
 	loading: Loading,
@@ -259,7 +182,7 @@ const BanksIndex = Loadable({
 
 
 // 教学案例
-const MoopCases =  Loadable({
+const MoopCases = Loadable({
 	loader: () => import('./modules/moop_cases/index'),
 	loading: Loading,
 })
@@ -277,23 +200,23 @@ const Interestpage = Loadable({
 // })
 
 //竞赛
-const NewCompetitions=Loadable({
+const NewCompetitions = Loadable({
 	loader: () => import('./modules/competitions/Competitions'),
 	loading: Loading,
 })
 
 //黑客松定制竞赛
-const Osshackathon=Loadable({
+const Osshackathon = Loadable({
 	loader: () => import('./modules/osshackathon/Osshackathon'),
 	loading: Loading,
 })
 
-const Messagerouting= Loadable({
+const Messagerouting = Loadable({
 	loader: () => import('./modules/message/js/Messagerouting'),
 	loading: Loading,
 })
 
-const Topicbank= Loadable({
+const Topicbank = Loadable({
 	loader: () => import('./modules/topic_bank/Topic_bank'),
 	loading: Loading,
 })
@@ -326,28 +249,28 @@ const Questionitem_banks = Loadable({
 })
 
 //试卷库
-const Testpaperlibrary= Loadable({
+const Testpaperlibrary = Loadable({
 	loader: () => import('./modules/testpaper/Testpaperlibrary'),
 	loading: Loading
 })
 //试卷编辑
-const Paperlibraryeditid= Loadable({
+const Paperlibraryeditid = Loadable({
 	loader: () => import('./modules/testpaper/Paperlibraryeditid'),
 	loading: Loading
 })
 //试卷查看
-const Paperlibraryseeid= Loadable({
+const Paperlibraryseeid = Loadable({
 	loader: () => import('./modules/testpaper/Paperlibraryseeid'),
 	loading: Loading
 })
 //人工组卷
-const Paperreview= Loadable({
+const Paperreview = Loadable({
 	loader: () => import('./modules/question/Paperreview'),
 	loading: Loading
 })
 
 //智能组卷
-const Integeneration= Loadable({
+const Integeneration = Loadable({
 	loader: () => import('./modules/testpaper/Intecomponents'),
 	loading: Loading
 })
@@ -378,6 +301,17 @@ const JupyterTPI = Loadable({
 	loader: () => import('./modules/tpm/jupyter'),
 	loading: Loading
 });
+//我的简历
+const Tecruitment= Loadable({
+	loader: () => import('./modules/recruitment/Tecruitment'),
+	loading: Loading
+});
+//编辑简历
+const EditResume= Loadable({
+	loader: () => import('./modules/recruitment/EditResume'),
+	loading: Loading
+});
+
 // 微信代码编辑器
 // const WXCode = Loadable({
 // 	loader: () => import('./modules/wxcode'),
@@ -392,44 +326,44 @@ class App extends Component {
 	constructor(props) {
 		super(props)
 		this.state = {
-			Addcoursestype:false,
-			Addcoursestypes:false,
-			mydisplay:false,
-			occupation:0,
+			Addcoursestype: false,
+			Addcoursestypes: false,
+			mydisplay: false,
+			occupation: 0,
 			mygetHelmetapi: null,
 		}
 
 	}
-	HideAddcoursestypess=(i)=>{
+	HideAddcoursestypess = (i) => {
 		console.log("调用了");
 		this.setState({
-			Addcoursestype:false,
-			Addcoursestypes:false,
-			mydisplay:true,
-			occupation:i,
+			Addcoursestype: false,
+			Addcoursestypes: false,
+			mydisplay: true,
+			occupation: i,
 		})
 	};
-	hideAddcoursestypes=()=>{
+	hideAddcoursestypes = () => {
 		this.setState({
-			Addcoursestypes:false
+			Addcoursestypes: false
 		})
 	};
-	ModalCancelsy=()=>{
+	ModalCancelsy = () => {
 		this.setState({
-			mydisplay:false,
+			mydisplay: false,
 		})
 		window.location.href = "/";
 	};
-	ModalshowCancelsy=()=>{
+	ModalshowCancelsy = () => {
 		this.setState({
-			mydisplay:true,
+			mydisplay: true,
 		})
 	};
 
 	disableVideoContextMenu = () => {
-		window.$( "body" ).on( "mousedown", "video",  function(event) {
-			if(event.which === 3) {
-				window.$('video').bind('contextmenu',function () { return false; });
+		window.$("body").on("mousedown", "video", function (event) {
+			if (event.which === 3) {
+				window.$('video').bind('contextmenu', function () { return false; });
 			} else {
 				window.$('video').unbind('contextmenu');
 			}
@@ -447,8 +381,7 @@ class App extends Component {
 		});
 
 		initAxiosInterceptors(this.props);
-		// 顶部和底部的动态设置
-		//  this.getAppdata();
+		this.getAppdata();
 		//
 		// axios.interceptors.response.use((response) => {
 		// 	// console.log("response"+response);
@@ -466,13 +399,13 @@ class App extends Component {
 
 		window.addEventListener('error', (event) => {
 			const msg = `${event.type}: ${event.message}`;
-			console.log(msg)
+			// console.log(msg)
 		});
 	}
 	//修改登录方法
-	Modifyloginvalue=()=>{
+	Modifyloginvalue = () => {
 		this.setState({
-			isRender:false,
+			isRender: false,
 		})
 	};
 
@@ -481,7 +414,7 @@ class App extends Component {
 		this.setState({
 			mygetHelmetapi: undefined
 		});
-		// document.title = "Forge";
+		document.title = "EduCoder";
 		var link = document.createElement('link'),
 			oldLink = document.getElementById('dynamic-favicon');
 		link.id = 'dynamic-favicon';
@@ -506,20 +439,20 @@ class App extends Component {
 		}
 		document.head.appendChild(link);
 	}
-  //获取当前定制信息
-	getAppdata=()=>{
+	//获取当前定制信息
+	getAppdata = () => {
 		let url = "/setting.json";
 		axios.get(url).then((response) => {
 			// console.log("app.js开始请求/setting.json");
 			// console.log("获取当前定制信息");
-			if(response){
-				if(response.data){
+			if (response) {
+				if (response.data) {
 					this.setState({
-						mygetHelmetapi:response.data.setting
+						mygetHelmetapi: response.data.setting
 					});
 					//存储配置到游览器
-					localStorage.setItem('chromesetting',JSON.stringify(response.data.setting));
-					localStorage.setItem('chromesettingresponse',JSON.stringify(response));
+					localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
+					localStorage.setItem('chromesettingresponse', JSON.stringify(response));
 					try {
 						if (response.data.setting.tab_logo_url) {
 							this.gettablogourldata(response);
@@ -549,81 +482,112 @@ class App extends Component {
 	};
 
 	render() {
+		let { mygetHelmetapi } = this.state;
+		// console.log("appappapp");
+		// console.log(mygetHelmetapi);
 		return (
 			<Provider store={store}>
 				<ConfigProvider locale={zhCN}>
 					<MuiThemeProvider theme={theme}>
-						<Accountnewprofile {...this.props}{...this.state}/>
-						<LoginDialog {...this.props} {...this.state}  Modifyloginvalue={()=>this.Modifyloginvalue()}></LoginDialog>
+						<Accountnewprofile {...this.props}{...this.state} />
+						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
 						<Notcompletedysl {...this.props} {...this.state}></Notcompletedysl>
 						<Trialapplicationysl  {...this.props} {...this.state}></Trialapplicationysl>
 						<Trialapplicationreview  {...this.props} {...this.state}></Trialapplicationreview>
-						<Addcourses {...this.props} {...this.state}  HideAddcoursestypess={(i)=>this.HideAddcoursestypess(i)}/>
-						<AccountProfile {...this.props} {...this.state}   />
-						<Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.ModalCancelsy} ModalshowCancelsy={this.ModalshowCancelsy}/>
+						<Addcourses {...this.props} {...this.state} HideAddcoursestypess={(i) => this.HideAddcoursestypess(i)} />
+						<AccountProfile {...this.props} {...this.state} />
+						<Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.ModalCancelsy} ModalshowCancelsy={this.ModalshowCancelsy} />
 						<Router>
 							<Switch>
-
-								{/* 项目 */}
-								<Route path="/projects"
-									render={
-										(props) => {
-
-											return (<ProjectIndex {...this.props} {...props} {...this.state} />)
-										}
-									}></Route>
+ 								{/*项目*/}
+ 								<Route
+								 path={"/projects"}
+								 render={
+									 (props) => {
+										 return (<Projects {...this.props} {...props} {...this.state} />)
+									 }
+								 }>
+								 </Route>
+ 								{/*求职招聘*/}
+ 								<Route
+								 path={"/recruitment"}
+								 render={
+									 (props) => {
+										 return (<Tecruitment {...this.props} {...props} {...this.state} />)
+									 }
+								 }
+							
+								></Route>
+								 {/*编辑简历*/}
+								 <Route
+								 path={"/editresume"}
+								 render={
+									 (props) => {
+										 return (<EditResume {...this.props} {...props} {...this.state} />)
+									 }
+								 }
+								></Route>
+								
 
 								{/*题库*/}
 								<Route path="/topicbank/:username/:topicstype"
-											render={
-												(props) => {
+									render={
+										(props) => {
 
-													return (<Topicbank {...this.props} {...props} {...this.state} />)
-												}
-											}></Route>
+											return (<Topicbank {...this.props} {...props} {...this.state} />)
+										}
+									}></Route>
 								{/*题库*/}
 								<Route path="/topicbank/:topicstype"
-											render={
-												(props) => {
+									render={
+										(props) => {
 
-													return (<Topicbank {...this.props} {...props} {...this.state} />)
-												}
-											}></Route>
+											return (<Topicbank {...this.props} {...props} {...this.state} />)
+										}
+									}></Route>
 								{/*/!*众包创新*!/*/}
 								{/*<Route path={"/crowdsourcing"} component={ProjectPackages}/>*/}
 								{/*竞赛*/}
 								<Route path={"/competitions"}
-											render={
-												(props) => {
+									render={
+										(props) => {
 
-													return (<NewCompetitions {...this.props} {...props} {...this.state} />)
-												}
-											}></Route>
+											return (<NewCompetitions {...this.props} {...props} {...this.state} />)
+										}
+									}></Route>
 
 								{/*黑客松定制竞赛*/}
 								<Route
 									path={"/osshackathon"}
 									render={
-										(props)=>{
-											return(
+										(props) => {
+											return (
 												<Osshackathon {...this.props} {...props} {...this.state} />
 											)
 										}
 									}
 								/>
-
+								{/*求职招聘*/}
+								<Route
+									path={"/recruitment"}
+									render={
+										(props) => {
+											return (<Tecruitment {...this.props} {...props} {...this.state} />)
+										}
+									}
+								></Route>
 								{/*认证*/}
-								<Route path="/account" component={AccountPage}/>
+								<Route path="/account" component={AccountPage} />
 
 								{/*403*/}
-								<Route path="/403" component={Shixunauthority}/>
+								<Route path="/403" component={Shixunauthority} />
 
-								<Route path="/500" component={http500}/>
+								<Route path="/500" component={http500} />
 
 								{/*404*/}
-								<Route path="/nopage" component={Shixunnopage}/>
+								<Route path="/nopage" component={Shixunnopage} />
 
-								<Route path="/compatibility" component={CompatibilityPageLoadable}/>
+								<Route path="/compatibility" component={CompatibilityPageLoadable} />
 								<Route
 									path="/login"
 									render={
@@ -661,20 +625,14 @@ class App extends Component {
 
 											return (<InfosIndex {...this.props} {...props} {...this.state} />)
 										}
-								}></Route>
+									}></Route>
 
 								<Route path="/banks"
 									render={
 										(props) => {
 											return (<BanksIndex {...this.props} {...props} {...this.state} />)
 										}
-								}></Route>
-								{/*<Route*/}
-									{/*path="/personalcompetit"*/}
-									{/*render={*/}
-										{/*(props) => (<PersonalCompetit {...this.props} {...props} {...this.state}></PersonalCompetit>)*/}
-									{/*}*/}
-								{/*/>*/}
+									}></Route>
 								<Route
 									path="/changepassword"
 									render={
@@ -684,29 +642,84 @@ class App extends Component {
 										}
 									}
 								/>
-								{/*<Route*/}
-								{/*	path="/interesse" component={Interestpage}*/}
-
-								{/*/>*/}
 								<Route path="/shixuns/new" component={Newshixuns}>
 								</Route>
 								<Route path="/colleges/:id/statistics"
-											 render={
-												 (props) => (<College  {...this.props} {...props} {...this.state} />)
-											 }/>
+									render={
+										(props) => (<College  {...this.props} {...props} {...this.state} />)
+									} />
 								{/* jupyter */}
 								<Route path="/tasks/:identifier/jupyter/"
 									render={
 										(props) => {
-										return (<JupyterTPI {...this.props} {...props} {...this.state}/>)
+											return (<JupyterTPI {...this.props} {...props} {...this.state} />)
+										}
+									}
+								/>
+
+								<Route path="/tasks/:stageId" component={IndexWrapperComponent} />
+
+								<Route path="/shixuns/:shixunId"
+									render={
+										(props) => (<TPMIndexComponent {...this.props} {...props} {...this.state}></TPMIndexComponent>)
+									}
+								></Route>
+								<Route path="/shixuns"
+									render={
+										(props) => (<TPMShixunsIndexComponent {...this.props} {...props} {...this.state}></TPMShixunsIndexComponent>)
+									}
+								></Route>
+								{/*实训课程（原实训路径）*/}
+								<Route path="/paths" component={ShixunPaths}></Route>
+								<Route path="/search"
+									render={
+										(props) => (<SearchPage {...this.props} {...props} {...this.state}></SearchPage>)
+									}
+								></Route>
+								{/*课堂*/}
+								<Route path="/classrooms" component={CoursesIndex} {...this.props}  {...this.state}></Route>
+
+								{/* <Route path="/forums" component={ForumsIndexComponent}>
+								</Route> */}
+								{/* 教学案例 */}
+								<Route path="/moop_cases" render={
+									(props) => (<MoopCases {...this.props} {...props} {...this.state} />)
+								} />
+
+								<Route path="/forums"
+									render={
+										(props) => (<ForumsIndexComponent {...this.props} {...props} {...this.state}></ForumsIndexComponent>)
+									}
+								>
+								</Route>
+								<Route path="/comment" component={CommentComponent} />
+
+								<Route path="/messages"
+									render={
+										(props) => (<Messagerouting {...this.props} {...props} {...this.state}></Messagerouting>)
+									}
+								></Route>
+								<Route path="/help/:type"
+									render={
+										(props) => (<Help {...this.props} {...props} {...this.state}></Help>)
+									} />
+								<Route path="/ecs"
+									render={
+										(props) => (<Ecs {...this.props} {...props} {...this.state}></Ecs>)
+									} />
+
+								<Route path="/problems/new/:id?"
+									render={
+										(props) => {
+											return (<NewOrEditTask {...this.props} {...props} {...this.state} />)
+										}
 									}
-								}
 								/>
 
 								<Route path="/myproblems/record_detail/:id"
-											 render={
-												 (props) => (<RecordDetail  {...this.props} {...props} {...this.state} />)
-											 }
+									render={
+										(props) => (<RecordDetail  {...this.props} {...props} {...this.state} />)
+									}
 								/>
 								<Route
 									path="/problems/:id/edit"
@@ -714,78 +727,65 @@ class App extends Component {
 										(props) => (<NewOrEditTask {...this.props} {...props} {...this.state} />)
 									} />
 								<Route path="/Integeneration/:type/:id"
-											 render={
-												 (props) => (<Paperreview  {...this.props} {...props} {...this.state} />)
-											 }/>
+									render={
+										(props) => (<Paperreview  {...this.props} {...props} {...this.state} />)
+									} />
 								<Route path="/paperreview/:type"
-											 render={
-												 (props) => (<Paperreview  {...this.props} {...props} {...this.state} />)
-											 }/>
+									render={
+										(props) => (<Paperreview  {...this.props} {...props} {...this.state} />)
+									} />
 								<Route path="/paperlibrary/edit/:id"
-											 render={
-												 (props) => (<Paperlibraryeditid  {...this.props} {...props} {...this.state} />)
-											 }/>
+									render={
+										(props) => (<Paperlibraryeditid  {...this.props} {...props} {...this.state} />)
+									} />
 
 								<Route path="/paperlibrary/see/:id"
-											 render={
-												 (props) => (<Paperlibraryseeid  {...this.props} {...props} {...this.state} />)
-											 }/>
+									render={
+										(props) => (<Paperlibraryseeid  {...this.props} {...props} {...this.state} />)
+									} />
 
 								<Route path="/myproblems/:id/:tab?"
-											 render={
-												 (props) => (<StudentStudy  {...this.props} {...props} {...this.state} />)
-											 } />
-								<Route path="/question/edit/:id"
-											 render={
-												 (props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)
-											 } />
+									render={
+										(props) => (<StudentStudy  {...this.props} {...props} {...this.state} />)
+									} />
+								<Route path="/problemset/:type/:id"
+									render={
+										(props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)
+									} />
 
-								<Route path="/question/newitem"
-											 render={
-												 (props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)
-											 } />
-								<Route path="/question/:type"
-											 render={
-												 (props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
-											 } />
+								<Route path="/problemset/newitem"
+									render={
+										(props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)
+									} />
+								<Route path="/problemset/:type"
+									render={
+										(props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
+									} />
 								<Route path="/paperlibrary"
-											 render={
-												 (props) => (<Testpaperlibrary  {...this.props} {...props} {...this.state} />)
-											 }/>
+									render={
+										(props) => (<Testpaperlibrary  {...this.props} {...props} {...this.state} />)
+									} />
 
 								<Route path="/Integeneration"
-											 render={
-												 (props) => (<Integeneration  {...this.props} {...props} {...this.state} />)
-											 }/>
+									render={
+										(props) => (<Integeneration  {...this.props} {...props} {...this.state} />)
+									} />
 
 								<Route path="/problems"
-											 render={
-												 (props) => (<Developer  {...this.props} {...props} {...this.state} />)
-											 }/>
-
-								<Route path="/question"
-											 render={
-												 (props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
-											 }/>
-								{/*<Route path="/wxcode/:identifier?" component={WXCode}*/}
-								{/*	render={*/}
-								{/*		(props)=>(<WXCode {...this.props} {...props} {...this.state}></WXCode>)*/}
-								{/*	}*/}
-								{/*/>*/}
-								{/*<Route exact path="/"*/}
-											{/*// component={ShixunsHome}*/}
-											{/*render={*/}
-												{/*(props)=>(<ShixunsHome {...this.props} {...props} {...this.state}></ShixunsHome>)*/}
-											{/*}*/}
-								{/*/>*/}
+									render={
+										(props) => (<Developer  {...this.props} {...props} {...this.state} />)
+									} />
 
+								<Route path="/problemset"
+									render={
+										(props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
+									} />
 								<Route exact path="/"
-									// component={ShixunsHome}
-											 render={
-												 (props)=>(<ProjectIndex {...this.props} {...props} {...this.state}></ProjectIndex>)
-											 }
+									render={
+										(props) => (<ShixunsHome {...this.props} {...props} {...this.state}></ShixunsHome>)
+									}
 								/>
-								<Route component={Shixunnopage}/>
+								<Route component={Shixunnopage} />
 
 							</Switch>
 						</Router>
@@ -907,4 +907,4 @@ moment.defineLocale('zh-cn', {
 		doy: 4  // The week that contains Jan 4th is the first week of the year.
 	}
 });
-export default SnackbarHOC()(App) ;
+export default SnackbarHOC()(App);
diff --git a/src/AppConfig.js b/src/AppConfig.js
index 27222e31..ede4ddf0 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -1,36 +1,29 @@
-import React from "react";
-
 import axios from 'axios';
 import md5 from 'md5';
 import { requestProxy } from "./indexEduplus2RequestProxy";
-import { broadcastChannelOnmessage , isDev, queryString } from 'educoder';
-import {  notification } from 'antd';
+import { broadcastChannelOnmessage, SetAppModel, isDev, queryString } from 'educoder';
+import { notification } from 'antd';
 import cookie from 'react-cookies';
 import './index.css';
 const $ = window.$;
-const opens ="79e33abd4b6588941ab7622aed1e67e8";
+const opens = "79e33abd4b6588941ab7622aed1e67e8";
 let timestamp;
 let checkSubmitFlg = false;
-let message501=false;
+let message501 = false;
 
 broadcastChannelOnmessage('refreshPage', () => {
-    window.location.reload()
+  window.location.reload()
 })
 
-function locationurl(list){
+function locationurl(list) {
   if (window.location.port === "3007") {
 
   } else {
-      window.location.href=list
+    window.location.href = list
   }
 }
-
-
-
-
-
 // TODO 开发期多个身份切换
-let debugType =""
+let debugType = ""
 if (isDev) {
   const _search = window.location.search;
   let parsed = {};
@@ -42,38 +35,33 @@ if (isDev) {
       window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
 }
 // 超管
-// debugType="admin";
+//debugType = "admin";
 // 老师
-//debugType="teacher";
+// debugType="teacher";
 // 学生
-//debugType="student";
-
+// debugType = "student";
 
 function clearAllCookie() {
-  cookie.remove('_educoder_session', {path: '/'});
-  cookie.remove('autologin_trustie', {path: '/'});
+  cookie.remove('_educoder_session', { path: '/' });
+  cookie.remove('autologin_trustie', { path: '/' });
   setpostcookie()
 }
 clearAllCookie();
 function setpostcookie() {
 
-  const  str =window.location.pathname;
-  // console.log(str.indexOf("/wxcode"))
-  let newdomain=".educoder.net"
-  if(str.indexOf("/wxcode") !== -1){
+  const str = window.location.pathname;
+  let newdomain = ".educoder.net"
+  if (str.indexOf("/wxcode") !== -1) {
     console.log("123")
-    cookie.remove('_educoder_session', {path: '/'});
-    cookie.remove('autologin_trustie', {path: '/'});
-    // console.log("开始重写cookis");
+    cookie.remove('_educoder_session', { path: '/' });
+    cookie.remove('autologin_trustie', { path: '/' });
     const _params = window.location.search;
-    // console.log("1111");
     if (_params) {
-      // console.log("22222");
       let _search = _params.split('?')[1];
-      let _educoder_sessions= _search.split('&')[0].split('=');
-       cookie.save('_educoder_session',_educoder_sessions[1], { domain:'.educoder.net', path: '/'});
-      let autologin_trusties=_search.split('&')[1].split('=');
-        cookie.save('autologin_trustie',autologin_trusties[1], { domain:'.educoder.net', path: '/'});
+      let _educoder_sessions = _search.split('&')[0].split('=');
+      cookie.save('_educoder_session', _educoder_sessions[1], { domain: '.educoder.net', path: '/' });
+      let autologin_trusties = _search.split('&')[1].split('=');
+      cookie.save('autologin_trustie', autologin_trusties[1], { domain: '.educoder.net', path: '/' });
 
     }
   }
@@ -81,180 +69,283 @@ function setpostcookie() {
 setpostcookie();
 
 
- function railsgettimes(proxy) {
+function railsgettimes(proxy) {
 
-   clearAllCookie()
+  clearAllCookie()
 
-     if(timestamp&&checkSubmitFlg===false){
-       $.ajax({url:proxy,async:false,success:function(data){
-           if(data.status===0){
-             timestamp=data.message;
-             setpostcookie();
-           }
-         }})
-       checkSubmitFlg=true
-       window.setTimeout(()=>{
-         checkSubmitFlg=false;
-       }, 2000);
-     }else if(checkSubmitFlg===false){
-       $.ajax({url:proxy,async:false,success:function(data){
-           if(data.status===0){
-             timestamp=data.message;
-             setpostcookie();
-           }
-         }})
-       checkSubmitFlg=true
-       window.setTimeout( ()=>{
-         checkSubmitFlg=false;
-       }, 2000);
-     }
+  if (timestamp && checkSubmitFlg === false) {
+    $.ajax({
+      url: proxy, async: true, success: function (data) {
+        if (data.status === 0) {
+          timestamp = data.message;
+          setpostcookie();
+        }
+      }
+    })
+    checkSubmitFlg = true
+    window.setTimeout(() => {
+      checkSubmitFlg = false;
+    }, 2000);
+  } else if (checkSubmitFlg === false) {
+    $.ajax({
+      url: proxy, async: true, success: function (data) {
+        if (data.status === 0) {
+          timestamp = data.message;
+          setpostcookie();
+        }
+      }
+    })
+    checkSubmitFlg = true
+    window.setTimeout(() => {
+      checkSubmitFlg = false;
+    }, 2000);
+  }
 
 }
 
+
+
+
+
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
-    initOnlineOfflineListener()
+  initOnlineOfflineListener()
 
-    var //proxy = "http://localhost:3000"
-      proxy="https://testforgeplus.trustie.net/"
-    const requestMap = {};
+  // TODO 避免重复的请求 https://github.com/axios/axios#cancellation
+  //      https://github.com/axios/axios/issues/1497
 
-    window.setfalseInRequestMap = function(keyName) {
-        requestMap[keyName] = false;
-    }
+  // TODO 读取到package.json中的配置？
+  var proxy = "http://localhost:3000"
+  // proxy = "http://testbdweb.trustie.net"
+  // proxy = "http://testbdweb.educoder.net"
+  // proxy = "https://testeduplus2.educoder.net"
+  //proxy="http://47.96.87.25:48080"
+  proxy = "https://pre-newweb.educoder.net"
+  proxy = "https://testforgeplus.trustie.net/"
+  // proxy="https://test-jupyterweb.educoder.net"
+  // proxy="https://test-newweb.educoder.net"
+  // proxy="https://test-jupyterweb.educoder.net"
 
-     //响应前的设置
-    axios.interceptors.request.use(
-        config => {
-          setpostcookie()
-          clearAllCookie()
-          if (config.url.indexOf(proxy) !== -1 || config.url.indexOf(':') !== -1) {
-              return config
-          }
-          requestProxy(config)
 
-          let url = `/api${config.url}`;
 
-          //qq登录去掉api
-          if(config.params&&config.params.redirect_uri!=undefined){
-            if(config.params.redirect_uri.indexOf('otherloginqq')!=-1){
-              url = `${config.url}`;
-            }
-          }
-          if(`${config[0]}`!=`true`){
-              let timestamp = Date.parse(new Date())/1000;
-              if (window.location.port === "3007") {
-                config.url = `${proxy}${url}`;
-                if (config.url.indexOf('?') == -1) {
-                    config.url = `${config.url}?debug=${debugType}`;
-                } else {
-                    config.url = `${config.url}&debug=${debugType}`;
-                }
-              } else {
-                // 加api前缀
-                config.url = url;
-              }
-            setpostcookie();
-          }
-					if (config.method === "post") {
-						if (requestMap[config.url] === true) { // 避免重复的请求  导致页面f5刷新 也会被阻止  显示这个方法会影响到定制信息
-							return false;
-						}
-					}
-          // 非file_update请求
-          if (config.url.indexOf('update_file') === -1) {
-              requestMap[config.url] = true;
+  // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
+  // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
+  const requestMap = {};
 
-              window.setTimeout("setfalseInRequestMap('"+config.url+"')", 900)
-          }
-          // setTimeout("setfalseInRequestMap(" + config.url + ")", 1200)
-          return config;
-        },
-        err => {
-            return Promise.reject(err);
-        });
+  window.setfalseInRequestMap = function (keyName) {
+    requestMap[keyName] = false;
+  }
 
-    axios.interceptors.response.use(function (response) {
-        if(response===undefined){
-           return
-       }
-       const config = response.config
-        if (response.data.status === -1) {
-        if (window.location.pathname.startsWith('/tasks/')) {
-            props.showSnackbar( response.data.message || '服务器异常，请联系管理员。' )
-        } else {
-            notification.open({
-                message:"提示",
-                description: response.data.message || '服务器异常，请联系管理员。',
-                style: {
-                zIndex: 99999999
-              },
-            });
-            // notification['error']({
-            //   message:"提示",
-            //   description: response.data.message || '服务器异常，请联系管理员。',
-            // });
+  //响应前的设置
+  axios.interceptors.request.use(
+    config => {
+      setpostcookie()
+      clearAllCookie()
+      // config.headers['Content-Type']= 'no-cache'
+      // if (token) {  // 每次发送请求之前判断是否存在token，如果存在，则统一在http请求的header都加上token，不用每次请求都手动添加了
+      //     config.headers.Authorization = token;
+      // }
+
+      // ---------------------------------------------    測試3007连测试服的代码
+      // if (url.indexOf('file_update') != -1 || url.indexOf('game_build') != -1 || url.indexOf('game_status') != -1) {
+      //     proxy = 'https://testbdweb.trustie.net'
+      // } else {
+      //     proxy = 'http://localhost:3000'
+      // }
+      // ---------------------------------------------
+      // console.log("开始请求了");
+      // console.log(config.url);
+      // console.log(window.location.pathname);
+      //
+
+      // try {
+      // 	const  str =window.location.pathname;
+      // 	if(str.indexOf("/wxcode") !== -1){
+      // 		// console.log("开始重写cookis");
+      // 		const _params = window.location.search;
+      // 		// console.log("1111");
+      // 		if (_params) {
+      // 			// console.log("22222");
+      // 			let _search = _params.split('?')[1];
+      // 			var  _educoder_sessionmys="";
+      // 			var  autologin_trusties="";
+      // 			_search.split('&').forEach(item => {
+      // 				const _arr = item.split('=');
+      // 				if(_arr[0]==='_educoder_session'){
+      // 					cookie.save('_educoder_session',_arr[1], { domain: '.educoder.net', path: '/'});
+      // 					_educoder_sessionmys=_arr[1];
+      // 				}else{
+      // 					cookie.save('autologin_trustie',_arr[1], { domain: '.educoder.net', path: '/'});
+      // 					autologin_trusties=_arr[1];
+      // 				}
+      // 			});
+      // 			try {
+      // 				const autlogins= `_educoder_session=${_educoder_sessionmys}; autologin_trustie=${autologin_trusties} `;
+      // 				config.params = {'Cookie': autlogins}
+      // 				config.headers['Cookie'] =autlogins;
+      //          // console.log("设置了cookis");
+      // 			}	catch (e) {
+      //
+      // 			}
+      // 			try {
+      // 				const autloginysls= `_educoder_session=${_educoder_sessionmys}; autologin_trustie=${autologin_trusties} `;
+      // 				config.params = {'autloginysls': autloginysls}
+      // 				config.headers['Cookie'] =autloginysls;
+      // 				// console.log("设置了cookis");
+      // 			}catch (e) {
+      //
+      // 			}
+      // 		}
+      // 	}
+      // }catch (e) {
+      //
+      // }
+
+
+
+      if (config.url.indexOf(proxy) != -1 || config.url.indexOf(':') != -1) {
+        return config
+      }
+      requestProxy(config)
+
+      let url = `/api${config.url}`;
+
+      //qq登录去掉api
+      if (config.params && config.params.redirect_uri != undefined) {
+        if (config.params.redirect_uri.indexOf('otherloginqq') != -1) {
+          url = `${config.url}`;
         }
+      }
+      if (`${config[0]}` != `true`) {
+        if (window.location.port === "3007") {
+          config.url = `${proxy}${url}`;
+          if (config.url.indexOf('?') == -1) {
+            config.url = `${config.url}?debug=${debugType}`;
+          } else {
+            config.url = `${config.url}&debug=${debugType}`;
+          }
+        }
+        setpostcookie();
+      }
+      if (config.url.indexOf('update_file') === -1) {
+        requestMap[config.url] = true;
 
-        throw new axios.Cancel('Operation canceled by the user.');
+        window.setTimeout("setfalseInRequestMap('" + config.url + "')", 900)
+      }
+      return config;
+    },
+    err => {
+      return Promise.reject(err);
+    });
+
+  axios.interceptors.response.use(function (response) {
+
+    // console.log(".............")
+    if (response === undefined) {
+      return
     }
-    if (response.data.status === 403||response.data.status === "403") {
+    const config = response.config
+    if (response.data.status === -1) {
+      //     console.error('error:', response.data.message)
+      //     throw new Error()
+
+      // https://github.com/axios/axios/issues?utf8=%E2%9C%93&q=cancel+request+in+response+interceptors+
+      // https://github.com/axios/axios/issues/583
+      // message.info(response.data.message || '服务端返回status -1，请联系管理员。');
+      // props.showSnackbar( response.data.message || '服务器异常，请联系管理员。' )
+      if (window.location.pathname.startsWith('/tasks/')) {
+        props.showSnackbar(response.data.message || '服务器异常，请联系管理员。')
+      } else {
+        notification.open({
+          message: "提示",
+          description: response.data.message || '服务器异常，请联系管理员。',
+          style: {
+            zIndex: 99999999
+          },
+        });
+        // notification['error']({
+        //   message:"提示",
+        //   description: response.data.message || '服务器异常，请联系管理员。',
+        // });
+      }
+
+      throw new axios.Cancel('Operation canceled by the user.');
+    } else {
+      // hash跳转
+      // var hash = window.location.hash;
+      // if (hash) {
+      // 	hashTimeout && window.clearTimeout(hashTimeout)
+      // 	hashTimeout = setTimeout(() => {
+      // 		var element = document.querySelector(hash);
+      // 		if (element) {
+      // 			element.scrollIntoView();
+      // 		}
+      // 	}, 400)
+      // }
+    }
+    // if(response.data.status === 401){
+    //   console.log("401401401")
+    // }
+    if (response.data.status === 403 || response.data.status === "403") {
+
       locationurl('/403');
     }
 
     if (response.data.status === 404) {
-        locationurl('/nopage');
+      locationurl('/nopage');
     }
 
     if (response.data.status === 500) {
-        locationurl('/500');
+      locationurl('/500');
     }
 
     if (response.data.status === 501) {
-      if(message501===false){
-        message501=true
+      if (message501 === false) {
+        message501 = true
         notification.open({
-          message:"提示",
-          description:response.data.message || '访问异常，请求不合理',
+          message: "提示",
+          description: response.data.message || '访问异常，请求不合理',
           style: {
             zIndex: 99999999
           }
         })
       }
       window.setTimeout(function () {
-          message501=false
+        message501 = false
       }, 2000);
     }
+
+
     requestMap[response.config.url] = false;
     setpostcookie();
     return response;
-    }, function (error) {
-      return Promise.reject(error);
-    });
-// -----------------------------------------------------------------------------------
+  }, function (error) {
+    return Promise.reject(error);
+  });
+  // -----------------------------------------------------------------------------------
 
 }
 
 
 function initOnlineOfflineListener() {
-    const $ = window.$
-    $(window).bind("online", () => {
-        notification.destroy()
-        notification.success({
-            duration: 2,
-            message: '网络恢复正常',
-            description:
-            '网络恢复正常，感谢使用。',
-        })
-    });
-    $(window).bind("offline", () => {
-        notification.destroy()
+  const $ = window.$
+  $(window).bind("online", () => {
+    notification.destroy()
+    notification.success({
+      duration: 2,
+      message: '网络恢复正常',
+      description:
+        '网络恢复正常，感谢使用。',
+    })
+  });
+  $(window).bind("offline", () => {
+    notification.destroy()
 
-        notification.warning({
-            duration: null,
-            message: '网络异常',
-            description:
-            '网络异常，请检测网络后重试。',
-        })
-    });
+    notification.warning({
+      duration: null,
+      message: '网络异常',
+      description:
+        '网络异常，请检测网络后重试。',
+    })
+  });
 }
diff --git a/src/Loading.js b/src/Loading.js
index e05a36a5..f5ada702 100644
--- a/src/Loading.js
+++ b/src/Loading.js
@@ -5,17 +5,16 @@ import { BrowserRouter as Router, Route, Link } from "react-router-dom";
 import { Spin } from 'antd';
 
 class Loading extends Component {
-  componentDidUpdate(prevProps, prevState) {
-	if (!prevProps.error && this.props.error) {
-		console.log(this.props.error)
-		window.location.reload()
+	componentDidUpdate(prevProps, prevState) {
+		if (!prevProps.error && this.props.error) {
+			console.log(this.props.error)
+		}
 	}
-  }
-  
-  render() {
-  	// Loading
-    return (
-      <div className="App" style={{minHeight: '800px',width:"100%"}}>
+
+	render() {
+		// Loading
+		return (
+			<div className="App" style={{ minHeight: '800px', width: "100%" }}>
 				<style>
 					{
 						`
@@ -25,10 +24,10 @@ class Loading extends Component {
 						`
 					}
 				</style>
-				<Spin size="large" className={"margintop"}/>
-      </div>
-    );
-  }
+				<Spin size="large" className={"margintop"} />
+			</div>
+		);
+	}
 }
 
 export default Loading;
diff --git a/src/app-test.jsx b/src/app-test.jsx
new file mode 100644
index 00000000..1bdba5f3
--- /dev/null
+++ b/src/app-test.jsx
@@ -0,0 +1,9 @@
+import React from 'react'
+import MiniPagination from './components/mini-pagination'
+
+export default () => {
+  function onPageChange(page) {
+    console.log(page, '-----------')
+  }
+  return <MiniPagination onChange={onPageChange} current={1} total={100} pageSize={16} />
+}
\ No newline at end of file
diff --git a/src/college/College.js b/src/college/College.js
index fb116429..85d43fb7 100644
--- a/src/college/College.js
+++ b/src/college/College.js
@@ -29,7 +29,7 @@ class College extends Component {
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth247",
 					render: (text, record) => (
-						<a href={`/courses/${record.id}/students`} title={record.name} target="_blank" className="d-inline-block text-truncate maxnamewidth247"
+						<a href={`/classrooms/${record.id}/students`} title={record.name} target="_blank" className="d-inline-block text-truncate maxnamewidth247"
 							 style={{
 								 maxWidth:'220px',
 								 color:'#007bff',
@@ -895,7 +895,7 @@ class College extends Component {
 								共建实训
 							</p>
 							<p className="yslstatistic-base-item-label">
-								实习报告
+								实训报告
 							</p>
 							<p className="yslstatistic-base-item-label">
 								学员实战时间
@@ -907,7 +907,7 @@ class College extends Component {
 						<div className="jibenshiyong100 sortinxdirection yinyin">
 							<div className="yslstatistic-base-item-labels">
 								{
-									teachers_count?
+									teachers_count || teachers_count===0?
 										<div className="yslstatistic-base-item-labelsp"> {teachers_count}<span className="yslstatistic-base-item-labelsspan">人</span></div>
 										:
 										<Spin/>
@@ -915,7 +915,7 @@ class College extends Component {
 							</div>
 							<div className="yslstatistic-base-item-labels">
 								{
-									students_count?
+									students_count || students_count===0?
 										<div className="yslstatistic-base-item-labelsp">{students_count}<span  className="yslstatistic-base-item-labelsspan">人</span></div>
 										:
 										<Spin/>
@@ -923,7 +923,7 @@ class College extends Component {
 							</div>
 							<div className="yslstatistic-base-item-labels">
 								{
-									courses_count?
+									courses_count || courses_count === 0?
 										<div className="yslstatistic-base-item-labelsp">{courses_count}<span  className="yslstatistic-base-item-labelsspan">个</span></div>
 										:
 										<Spin/>
@@ -931,7 +931,7 @@ class College extends Component {
 							</div>
 							<div className="yslstatistic-base-item-labels">
 								{
-									shixuns_count?
+									shixuns_count || shixuns_count === 0?
 										<div className="yslstatistic-base-item-labelsp">{shixuns_count}<span  className="yslstatistic-base-item-labelsspan">个</span></div>
 										:
 										<Spin/>
@@ -939,7 +939,7 @@ class College extends Component {
 							</div>
 							<div className="yslstatistic-base-item-labels">
 								{
-									shixun_report_count?
+									shixun_report_count || shixun_report_count===0?
 										<div className="yslstatistic-base-item-labelsp">{shixun_report_count}<span  className="yslstatistic-base-item-labelsspan">个</span></div>
 										:
 										<Spin/>
@@ -947,8 +947,8 @@ class College extends Component {
 							</div>
 							<div className="yslstatistic-base-item-labels">
 								{
-									shixun_time?
-										<div className="yslstatistic-base-item-labelsp">{shixun_time}<span  className="yslstatistic-base-item-labelsspan">天</span></div>
+									shixun_time || shixun_time === 0 ?
+										<div className="yslstatistic-base-item-labelsp">{shixun_time}<span  className="yslstatistic-base-item-labelsspan">分钟</span></div>
 										:
 										<Spin/>
 								}
diff --git a/src/college/colleagecss/colleage.css b/src/college/colleagecss/colleage.css
index 801b8660..9220b8ac 100644
--- a/src/college/colleagecss/colleage.css
+++ b/src/college/colleagecss/colleage.css
@@ -1,112 +1,129 @@
 .yslstatistic-header {
-    width: 100%;
-    height: 240px;
-    background-image: url('/images/educoder/statistics.jpg');
-    background-size: 100% 100%;
-}
-.yslborder{
-    border: 1px solid;
-}
-.yslstatistic-header-title{
-    flex: 1;
-    display: flex;
-    align-items: center;
-    color: #4CACFF;
-    font-size: 32px;
-}
-.yslstatistic-header-content{
-    width: 100%;
-    display: flex;
-    justify-content: space-around;
-}
-.yslstatistic-header-item{
-    margin-bottom: 22px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    color: #fff;
-}
-.yslstatistic-header-item-label{
-    color: #989898;
+  width: 100%;
+  height: 240px;
+  background-image: url('/images/educoder/statistics.jpg');
+  background-size: 100% 100%;
 }
 
-.yslstatistic-base-item-label{
-    width: 217px;
-    text-align: center;
-    font-size: 16px;
-    height: 48px;
-    line-height: 48px;
-    color: #686868;
-    background: #F5F5F5;
-    border-top: 1px solid #EBEBEB;
-}
-.yslstatistic-base-item-labels{
-    width: 217px;
-    text-align: center;
-    height: 100px;
-    line-height: 100px;
-    background: #ffffff;
-    border-top: 1px solid #EBEBEB;
-    border-bottom: 1px solid #EBEBEB;
-}
-.yslstatistic-base-item-labelsp{
-    color: #000000;
-    font-size: 24px;
-}
-.yslstatistic-base-item-labelsspan{
-    color: #000000;
-    margin-left: 5px;
-    font-size: 16px;
-}
-.jibenshiyong100{
-    width: 100%;
+.yslborder {
+  border: 1px solid;
 }
 
-.yslstatistic-header-item-content{
-    font-size: 24px;
+.yslstatistic-header-title {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  color: #4CACFF;
+  font-size: 32px;
 }
+
+.yslstatistic-header-content {
+  width: 100%;
+  display: flex;
+  justify-content: space-around;
+}
+
+.yslstatistic-header-item {
+  margin-bottom: 22px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  color: #fff;
+}
+
+.yslstatistic-header-item-label {
+  color: #989898;
+}
+
+.yslstatistic-base-item-label {
+  width: 217px;
+  text-align: center;
+  font-size: 16px;
+  height: 48px;
+  line-height: 48px;
+  color: #686868;
+  background: #F5F5F5;
+  border-top: 1px solid #EBEBEB;
+}
+
+.yslstatistic-base-item-labels {
+  width: 217px;
+  text-align: center;
+  height: 100px;
+  line-height: 100px;
+  background: #ffffff;
+  border-top: 1px solid #EBEBEB;
+  border-bottom: 1px solid #EBEBEB;
+}
+
+.yslstatistic-base-item-labelsp {
+  color: #000000;
+  font-size: 24px;
+}
+
+.yslstatistic-base-item-labelsspan {
+  color: #000000;
+  margin-left: 5px;
+  font-size: 16px;
+}
+
+.jibenshiyong100 {
+  width: 100%;
+}
+
+.yslstatistic-header-item-content {
+  font-size: 24px;
+}
+
 /* 中间居中 */
-.intermediatecenter{
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
+.intermediatecenter {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
 }
+
 /* 简单居中 */
-.intermediatecenterysls{
-    display: flex;
-    align-items: center;
+.intermediatecenterysls {
+  display: flex;
+  align-items: center;
 }
-.spacearound{
-    display: flex;
-    justify-content: space-around;
+
+.spacearound {
+  display: flex;
+  justify-content: space-around;
 
 }
-.spacebetween{
-    display: flex;
-    justify-content: space-between;
+
+.spacebetween {
+  display: flex;
+  justify-content: space-between;
 }
+
 /* 头顶部居中 */
-.topcenter{
-    display: -webkit-flex;
-    flex-direction: column;
-    align-items: center;
+.topcenter {
+  display: -webkit-flex;
+  flex-direction: column;
+  align-items: center;
 
 }
 
 
 /* x轴正方向排序 */
 /* 一 二 三 四 五 六 七 八 */
-.sortinxdirection{
-    display: flex;
-    flex-direction:row;
+.sortinxdirection {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
 }
+
 /* x轴反方向排序 */
 /* 八    七   六  五   四  三  二 一 */
-.xaxisreverseorder{
-    display: flex;
-    flex-direction:row-reverse;
+.xaxisreverseorder {
+  display: flex;
+  flex-direction: row-reverse;
 }
+
 /* 垂直布局 正方向*/
 /* 一
  二
@@ -116,98 +133,118 @@
  六
  七
  八 */
-.verticallayout{
-    display: flex;
-    flex-direction:column;
+.verticallayout {
+  display: flex;
+  flex-direction: column;
 }
+
 /* 垂直布局 反方向*/
-.reversedirection{
-    display: flex;
-    flex-direction:column-reverse;
+.reversedirection {
+  display: flex;
+  flex-direction: column-reverse;
 }
 
-.h4{
-    font-size: 1.5rem;
-    font-weight: 500 !important;
-}
-.ysllinjibenshiyong{
-    font-weight: 500;
-    line-height: 1.2;
-    padding: 2rem 1.25rem;
-    border-bottom: unset;
-    background:#fff;
-}
-.linjibenshiyong{
-    font-weight: 500;
-    line-height: 1.2;
-    padding: 2rem 1.25rem;
-    border-bottom: unset;
-    background:#fff;
-    box-shadow:0px 6px 12px 0px rgba(0,0,0,0.1);
-    border-radius:2px;
-}
-.yslslinjibenshiyong{
-    font-weight: 500;
-    line-height: 1.2;
-    border-bottom: unset;
-    box-shadow:0px 6px 12px 0px rgba(0,0,0,0.1);
-    border-radius:2px;
-}
-.yinyin{
-    background: #fff;
-    box-shadow:0px 6px 12px 0px rgba(0,0,0,0.1);
-    border-radius:2px;
-}
-.edu-back-eeee{
-    background:#EEEEEE !important;
-}
-.mt-4{
-    margin-top: 1.5rem !important;
+.h4 {
+  font-size: 1.5rem;
+  font-weight: 500 !important;
 }
 
-.statistic-label{
-    padding: 2rem 1.25rem;
-    font-size: 1.5rem;
-    font-weight: 400 !important;
-}
-.mb50{
-    padding-bottom: 50px !important;
-}
-.mt40{
-    margin-top: 40px;
-}
-.mb80{
-    margin-bottom: 80px;
-}
-.task-hide{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-a:hover{
-    color:#0056b3;
-}
-.color-blue{
-    color: #4CACFF;
+.ysllinjibenshiyong {
+  font-weight: 500;
+  line-height: 1.2;
+  padding: 2rem 1.25rem;
+  border-bottom: unset;
+  background: #fff;
 }
 
-.color-huang{
-    color:#ffc107 !important
+.linjibenshiyong {
+  font-weight: 500;
+  line-height: 1.2;
+  padding: 2rem 1.25rem;
+  border-bottom: unset;
+  background: #fff;
+  box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 2px;
 }
-.maxnamewidth105{
-    max-width: 105px;
-    overflow:hidden;
-    text-overflow:ellipsis;
-    white-space:nowrap;
-    cursor: default;
+
+.yslslinjibenshiyong {
+  font-weight: 500;
+  line-height: 1.2;
+  border-bottom: unset;
+  box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 2px;
 }
-.maxnamewidth247{
-    max-width: 247px;
-    overflow:hidden;
-    text-overflow:ellipsis;
-    white-space:nowrap;
-    cursor: default;
+
+.yinyin {
+  background: #fff;
+  box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 2px;
 }
-.maxnamewidth340{
-    max-width: 340px;
-    overflow:hidden;
-    text-overflow:ellipsis;
-    white-space:nowrap;
-    cursor: default;
+
+.edu-back-eeee {
+  background: #EEEEEE !important;
 }
+
+.mt-4 {
+  margin-top: 1.5rem !important;
+}
+
+.statistic-label {
+  padding: 2rem 1.25rem;
+  font-size: 1.5rem;
+  font-weight: 400 !important;
+}
+
+.mb50 {
+  padding-bottom: 50px !important;
+}
+
+.mt40 {
+  margin-top: 40px;
+}
+
+.mb80 {
+  margin-bottom: 80px;
+}
+
+.task-hide {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+a:hover {
+  color: #0056b3;
+}
+
+.color-blue {
+  color: #4CACFF;
+}
+
+.color-huang {
+  color: #ffc107 !important
+}
+
+.maxnamewidth105 {
+  max-width: 105px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.maxnamewidth247 {
+  max-width: 247px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.maxnamewidth340 {
+  max-width: 340px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
\ No newline at end of file
diff --git a/src/common/DateUtil.js b/src/common/DateUtil.js
index dc2288ff..859182e1 100644
--- a/src/common/DateUtil.js
+++ b/src/common/DateUtil.js
@@ -38,6 +38,36 @@ export function getNextHalfHourOfMoment(moment) {
   return moment
 }
 
+ export function formatSeconds(value) {
+
+          var theTime = parseInt(value);// 秒
+          var middle= 0;// 分
+          var hour= 0;// 小时
+      
+          if(theTime > 60) {
+              middle= parseInt(theTime/60);
+              theTime = parseInt(theTime%60);
+              if(middle> 60) {
+                  hour= parseInt(middle/60);
+                  middle= parseInt(middle%60);
+              }
+          }
+          var result = ""+parseInt(theTime)+"秒";
+          if(middle > 0) {
+            if(hour>0){
+              result = ""+parseInt(middle)+"分";
+            }else{
+              result = ""+parseInt(middle)+"分"+result;
+            }
+              
+          }
+          if(hour> 0) {
+              result = ""+parseInt(hour)+"小时"+result;
+          }
+          return result;
+      }
+  
+
 export function formatDuring(mss){
   var days = parseInt(mss / (1000 * 60 * 60 * 24));
   var hours = parseInt((mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
@@ -66,4 +96,4 @@ export function formatDuring(mss){
 
 	}
   return days + "天" + hours + "小时" + minutes + "分";
-}
\ No newline at end of file
+}
diff --git a/src/common/LoadingSpin.js b/src/common/LoadingSpin.js
index 80a79890..879edb1d 100644
--- a/src/common/LoadingSpin.js
+++ b/src/common/LoadingSpin.js
@@ -21,9 +21,9 @@ class LoadingSpin extends Component{
             }
           `}
 				</style>
-				<Spin tip="正在获取相关数据..."/>
+				<Spin/>
 			</div>
 		)
 	}
 }
-export default LoadingSpin;
\ No newline at end of file
+export default LoadingSpin;
diff --git a/src/common/LogUtil.js b/src/common/LogUtil.js
index da5cbc75..222206e2 100644
--- a/src/common/LogUtil.js
+++ b/src/common/LogUtil.js
@@ -17,14 +17,14 @@ const timeStamp = () => {
 /*
     带trace的、默认折叠起来的控制台输出
     第一个参数最好传入string类型的标识，接着可以跟任意类型任意个数的参数，各个参数都会打印到控制台
-*/ 
+*/
 export function trace_collapse(content) {
     if (console.groupCollapsed) {
-        console.groupCollapsed(typeof content == 'string' ? content : 'trace_collapse');
-        log.trace(arguments);
-        console.groupEnd();
+        // console.groupCollapsed(typeof content == 'string' ? content : 'trace_collapse');
+        // log.trace(arguments);
+        // console.groupEnd();
     } else {
-        trace(content)
+        // trace(content)
     }
 }
 
diff --git a/src/common/SnackbarHOC.js b/src/common/SnackbarHOC.js
index f69041c6..f92972b2 100644
--- a/src/common/SnackbarHOC.js
+++ b/src/common/SnackbarHOC.js
@@ -2,19 +2,23 @@ import React, { Component } from 'react';
 import Snackbar from 'material-ui/Snackbar';
 import Fade from 'material-ui/transitions/Fade';
 import { notification } from 'antd'
+
+const snackbarProp = { 'aria-describedby': 'message-id' }
+
 export function SnackbarHOC(options = {}) {
 	return function wrap(WrappedComponent) {
-	    return class Wrapper extends Component {
-	      	constructor(props) {
-		        super(props);
-		       	this.showSnackbar = this.showSnackbar.bind(this)
-		        this.state = {
-		        	 snackbarText: '',
-		        	 snackbarOpen: false,
-		        }
-	      	}
+		return class Wrapper extends Component {
+			constructor(props) {
+				super(props);
+				this.showSnackbar = this.showSnackbar.bind(this)
+				this.handleSnackbarClose = this.handleSnackbarClose.bind(this)
+				this.state = {
+					snackbarText: '',
+					snackbarOpen: false,
+				}
+			}
 
-	      	handleSnackbarClose() {
+			handleSnackbarClose() {
 				this.setState({
 					snackbarOpen: false,
 					snackbarVertical: '',
@@ -22,70 +26,50 @@ export function SnackbarHOC(options = {}) {
 				})
 			}
 
-	      	// 全局的snackbar this.props.showSnackbar调用即可
-			// showSnackbar(description, message = "提示",icon) {
-			// 	// this.setState({
-			// 	// 	snackbarOpen: true,
-			// 	// 	snackbarText: text,
-			// 	// 	snackbarVertical: vertical,
-			// 	// 	snackbarHorizontal: horizontal,
-			// 	// })
-			// 	const data = {
-			// 		message,
-			// 		description
-			// 	}
-			// 	if (icon) {
-			// 		data.icon = icon;
-			// 	}
-			// 	notification.open(data);
-			// }
-
-				showSnackbar(text, vertical, horizontal) {
-					this.setState({
-						snackbarOpen: true,
-						snackbarText: text,
-						snackbarVertical: vertical,
-						snackbarHorizontal: horizontal,
-					})
+			showSnackbar(text, vertical, horizontal) {
+				this.setState({
+					snackbarOpen: true,
+					snackbarText: text,
+					snackbarVertical: vertical,
+					snackbarHorizontal: horizontal,
+				})
+			}
+			//个别情况需要走
+			showNotification = (description, message = "提示", icon) => {
+				const data = {
+					message,
+					description
 				}
-				//个别情况需要走
-				showNotification = (description, message = "提示", icon) => {
-					const data = {
-						message,
-						description
-					}
-					if (icon) {
-						data.icon = icon;
-					}
-					notification.open(data);
+				if (icon) {
+					data.icon = icon;
 				}
-	      	render() {
-		        const { snackbarOpen, snackbarText, snackbarHorizontal, snackbarVertical } = this.state;
+				notification.open(data);
+			}
+			render() {
 
-		        
-		        return (
-		        	<React.Fragment>
-		        		<Snackbar
-                    className={"rootSnackbar"}
-                    style={{zIndex:30000}}
-				          	open={this.state.snackbarOpen}
-				          	autoHideDuration={3000}
-				          	anchorOrigin={{ vertical: this.state.snackbarVertical || 'top'
-				          			, horizontal: this.state.snackbarHorizontal || 'center' }}
-				          	onClose={() => {this.handleSnackbarClose()}}
-				          	transition={Fade}
-				          	SnackbarContentProps={{
-				            	'aria-describedby': 'message-id',
-				          	}}
-				          	resumeHideDuration={2000}
-				        	message={<span id="message-id">{this.state.snackbarText}</span>}
-				        />
-			            <WrappedComponent {...this.props} showSnackbar={ this.showSnackbar }	showNotification= { this.showNotification } >
-			       	
-			            </WrappedComponent>
-		          	</React.Fragment>
-		        )
-	      	}
-	    }
+				return (
+					<React.Fragment>
+						<Snackbar
+							className={"rootSnackbar"}
+							style={{ zIndex: 30000 }}
+							open={this.state.snackbarOpen}
+							autoHideDuration={3000}
+							anchorOrigin={{
+								vertical: this.state.snackbarVertical || 'top'
+								, horizontal: this.state.snackbarHorizontal || 'center'
+							}}
+							onClose={this.handleSnackbarClose}
+							transition={Fade}
+							SnackbarContentProps={snackbarProp}
+							resumeHideDuration={2000}
+							message={<span id="message-id">{this.state.snackbarText}</span>}
+						/>
+						<WrappedComponent {...this.props} showSnackbar={this.showSnackbar} showNotification={this.showNotification} >
+
+						</WrappedComponent>
+					</React.Fragment>
+				)
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/common/TextUtil.js b/src/common/TextUtil.js
index 4c445dcb..94e73631 100644
--- a/src/common/TextUtil.js
+++ b/src/common/TextUtil.js
@@ -1,79 +1,167 @@
-import { bytesToSize, getUrl, getUrl2 } from 'educoder';
-const $ = window.$
-
-export function isImageExtension(fileName) {
-    return fileName ? !!(fileName.match(/.(jpg|jpeg|png|gif)$/i)) : false
-}
-
-export function markdownToHTML(oldContent, selector) {
-    window.$('#md_div').html('')
-    // markdown to html
-    if (selector && oldContent && oldContent.startsWith('<p')) {  // 普通html处理
-        window.$('#' + selector).addClass('renderAsHtml')
-        window.$('#' + selector).html(oldContent)
-    } else {
-        try {    
-        $("#"+selector).html('')
-            // selector || 
-        var markdwonParser = window.editormd.markdownToHTML(selector || "md_div", {
-            markdown: oldContent, // .replace(/▁/g,"▁▁▁"),
-            emoji: true,
-            htmlDecode: "style,script,iframe",  // you can filter tags decode
-            taskList: true,
-            tex: true,  // 默认不解析
-            flowChart: true,  // 默认不解析
-            sequenceDiagram: true // 默认不解析
-        });
-
-        } catch(e) {
-            console.error(e)
-        }
-        // selector = '.' + selector
-        if (selector) {
-            return;
-        }
-        
-        const content = window.$('#md_div').html()
-        if (selector) {
-            window.$(selector).html(content)
-        }
-        return content
-    }
-}
-function _doDownload(options) {
-    $.fileDownload(getUrl() + "/api" + options.url, {
-        successCallback: options.successCallback,
-        failCallback: options.failCallback
-    });
-}
-export function downloadFile(options) {
-    if ($.fileDownload) {
-        _doDownload(options)
-    } else {
-        const _url_origin = getUrl2()
-        $.getScript(
-            `${_url_origin}/javascripts/download/jquery.fileDownload.min.js`,
-            (data, textStatus, jqxhr) => {
-            _doDownload(options)
-        });
-    }
-        
-}
-
-export function appendFileSizeToUploadFile(item) {
-    return `${item.title}${uploadNameSizeSeperator}${item.filesize}`
-}
-export function appendFileSizeToUploadFileAll(fileList) {
-    return fileList.map(item => {
-        if (item.name.indexOf(uploadNameSizeSeperator) == -1) {
-          return Object.assign({}, item, {name: `${item.name}${uploadNameSizeSeperator}${bytesToSize(item.size)}`})
-        } 
-        return item
-    }) 
-}
-export const uploadNameSizeSeperator = '　　'
-
-export const sortDirections = ["ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", 
-      "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", 
-      "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", 
-      "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", ]
\ No newline at end of file
+import { bytesToSize, getUrl, getUrl2 } from 'educoder'
+import showdown from 'showdown'
+const $ = window.$
+
+export function isImageExtension(fileName) {
+    return fileName ? !!(fileName.match(/.(jpg|jpeg|png|gif)$/i)) : false
+}
+
+export function markdownToHTML(oldContent, selector) {
+    try {
+        window.$('#md_div').html('')
+        if (selector && oldContent && oldContent.startsWith('<p')) {  // 普通html处理
+            window.$('#' + selector).addClass('renderAsHtml')
+            window.$('#' + selector).html(oldContent)
+        } else {
+            try {
+                $("#" + selector).html('')
+                // selector ||
+                var markdwonParser = window.editormd.markdownToHTML(selector || "md_div", {
+                    markdown: oldContent, // .replace(/▁/g,"▁▁▁"),
+                    emoji: true,
+                    htmlDecode: "style,script,iframe",  // you can filter tags decode
+                    taskList: true,
+                    tex: true,  // 默认不解析
+                    flowChart: true,  // 默认不解析
+                    sequenceDiagram: true // 默认不解析
+                });
+
+            } catch (e) {
+                console.error(e)
+            }
+            // selector = '.' + selector
+            if (selector) {
+                return;
+            }
+
+            const content = window.$('#md_div').html()
+            if (selector) {
+                window.$(selector).html(content)
+            }
+            return content
+        }
+    } catch (e) {
+
+    }
+}
+function _doDownload(options) {
+    $.fileDownload(getUrl() + "/api" + options.url, {
+        successCallback: options.successCallback,
+        failCallback: options.failCallback
+    });
+}
+export function downloadFile(options) {
+    if ($.fileDownload) {
+        _doDownload(options)
+    } else {
+        const _url_origin = getUrl2()
+        $.getScript(
+            `${_url_origin}/javascripts/download/jquery.fileDownload.min.js`,
+            (data, textStatus, jqxhr) => {
+                _doDownload(options)
+            });
+    }
+
+}
+
+export function appendFileSizeToUploadFile(item) {
+    return `${item.title}${uploadNameSizeSeperator}${item.filesize}`
+}
+export function appendFileSizeToUploadFileAll(fileList) {
+    return fileList.map(item => {
+        if (item.name.indexOf(uploadNameSizeSeperator) == -1) {
+            return Object.assign({}, item, { name: `${item.name}${uploadNameSizeSeperator}${bytesToSize(item.size)}` })
+        }
+        return item
+    })
+}
+export const uploadNameSizeSeperator = '　　'
+
+export const sortDirections = ["ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend",
+    "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend",
+    "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend",
+    "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend",]
+
+export function validateLength(str = '', length = 100) {
+    let len = 0
+    if (str) {
+        len = str.length
+        for (let i = 0; i < len; i++) {
+            let charCode = str.charCodeAt(i)
+            if (charCode >= 0xD800 && charCode <= 0xDBFF) {
+                len--
+                i++
+            }
+        }
+    }
+    return len <= length
+}
+
+export function mdJSONParse(str) {
+    let val = "";
+    try {
+        return val = JSON.parse(str)
+    } catch (error) {
+        if (str) {
+            return val = str;
+        } else {
+            return "";
+        }
+
+    }
+}
+
+showdown.extension('prettify', function () {
+    return [{
+        type: 'output',
+        filter: function (source) {
+            return source.replace(/(<pre[^>]*>)?[\n\s]?<code([^>]*)>/gi, function (match, pre, codeClass) {
+                if (pre) {
+                    return '<pre class="prettyprint linenums"><code' + codeClass + '>'
+                } else {
+                    return ' <code class="prettyprint">'
+                }
+            })
+        }
+    }]
+})
+
+const showdownKatex = require('showdown-katex')
+const CONVERTER = new showdown.Converter({
+    tables: true,
+    simpleLineBreaks: false,
+    underline: true,
+    extensions: [
+        'prettify',
+        showdownKatex({
+            throwOnError: false,
+            displayMode: false,
+            errorColor: '#1500ff',
+        }),
+    ]
+})
+
+const oldKatexMode = /(?:`?\$\$)([^`\$]+)(?:\$\$`?)/g
+
+export function exportMdtoHtml(md = '') {
+    if (typeof md === 'string') {
+        let rs = md.replace(oldKatexMode, (_, p1) => {
+            return "$$" + p1 + "$$"
+        })
+        return CONVERTER.makeHtml(rs)
+    }
+    return md + ''
+}
+
+function escapeText(text) {
+    return text.replace(/[&<>"']/g, s => {
+        const entityMap = {
+            '&': '&amp;',
+            '<': '&lt;',
+            '>': '&gt;',
+            '"': '',
+            "'": '',
+        };
+        return entityMap[s]
+    })
+}
diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js
index 2c42b7bd..9a5abae3 100644
--- a/src/common/UrlTool.js
+++ b/src/common/UrlTool.js
@@ -5,26 +5,75 @@ const { Search } = Input;
 
 const $ = window.$;
 const isDev = window.location.port == 3007;
-export const TEST_HOST = "https://testforgeplus.trustie.net"
+const isdev2= window.location.hostname ==='www.educoder.net'
+export const TEST_HOST = "https://testforgeplus.trustie.net/"
 export function getImageUrl(path) {
 	// https://www.educoder.net
 	// https://testbdweb.trustie.net
   // const local = 'http://localhost:3000'
-  const local = 'https://testforgeplus.trustie.net'
+  const local = 'https://testforgeplus.trustie.net/'
 	if (isDev) {
 		return `${local}/${path}`
 	}
 	return `/${path}`;
 }
 
-export function setImagesUrl(path){
-	const local = 'https://testforgeplus.trustie.net'
+export function getcdnImageUrl(path) {
+	// https://www.educoder.net
+	// https://testbdweb.trustie.net
+  // const local = 'http://localhost:3000'
+  const testlocal = 'https://testali-cdn.educoder.net'
+  const  local='https://ali-cdn.educoder.net'
 	let firstStr=path.substr(0,1);
-	// console.log(firstStr);
-	if(firstStr=="/"){
-		return isDev?`${local}${path}`:`${path}`;
+	if (isdev2) {
+		return `${local}/${path}`;
 	}else{
-		return isDev?`${local}/${path}`:`/${path}`;
+		if(firstStr=="/"){
+			return `${path}`
+		}else{
+			return `/${path}`
+		}
+	}
+	// return `${local}/${path}`;
+}
+
+export function setcndImagesUrl(path){
+	const testlocal = 'https://testali-cdn.educoder.net'
+	const  local='https://ali-cdn.educoder.net'
+	let firstStr=path.substr(0,1);
+	if(firstStr=="/"){
+		if (!isdev2) {
+			return `${path}`
+		}
+		return `${local}${path}`;
+		 //return isDev?`${testlocal}${path}`:`${local}${path}`;
+	}else{
+		if (!isdev2) {
+			return `/${path}`
+		}
+		return `${local}/${path}`;
+		// return isDev?`${testlocal}/${path}`:`${local}/${path}`;
+	}
+}
+
+
+
+export function setImagesUrl(path){
+	const testlocal = 'https://testali-cdn.educoder.net'
+	 const  local='https://ali-cdn.educoder.net'
+	let firstStr=path.substr(0,1);
+	if(firstStr=="/"){
+		if (!isdev2) {
+			return `${path}`
+		}
+		return `${local}${path}`;
+		// return isDev?`${testlocal}${path}`:`${path}`;
+	}else{
+		if (!isdev2) {
+			return `/${path}`
+		}
+		return `${local}/${path}`;
+		 //return isDev?`${testlocal}/${path}`:`/${path}`;
 	}
 }
 
@@ -37,7 +86,7 @@ export function getUrl(path, goTest) {
 	// testbdweb.educoder.net testbdweb.trustie.net
   // const local = goTest ? 'https://testeduplus2.educoder.net' : 'http://localhost:3000'
   // const local = 'https://testeduplus2.educoder.net'
-	const local = 'http://localhost:3007'
+	const local = 'https://testforgeplus.trustie.net/'
 	if (isDev) {
 		return `${local}${path?path:''}`
 	}
@@ -97,7 +146,7 @@ function railsgettimess(proxy) {
 
 
 export function Railsgettimes() {
-	railsgettimess(`${getUrl()}/api/main/first_stamp.json`);
+	// railsgettimess(`${getUrl()}/api/main/first_stamp.json`);
 	// railsgettimess(`https://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp`);
 }
 export function getmyUrl(geturl) {
@@ -111,26 +160,33 @@ export function getUploadActionUrl(path, goTest) {
 	return `${getUrl()}/api/attachments.json${isDev ? `?debug=${window._debugType || 'admin'}&randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`}`;
 }
 
+export function getUploadLogoActionUrl() {
+	let anewopens=md5(newopens+newtimestamp);
+	return `${getUrl()}/api/resumes/logo.json${isDev ? `?debug=${window._debugType || 'admin'}&randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`}`;
+}
+
 export function getUploadActionUrltwo(id) {
-	// Railsgettimes()
 	let anewopens=md5(newopens+newtimestamp);
 	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json${isDev ? `?debug=${window._debugType || 'admin'}&randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`}`
 }
 
 export function getUploadActionUrlthree() {
-	// Railsgettimes()
 	let anewopens=md5(newopens+newtimestamp);
 	return `${getUrlmys()}/api/jupyters/import_with_tpm.json${isDev ? `?debug=${window._debugType || 'admin'}&randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`}`
 }
 
+export function getupload_git_file(id) {
+	let anewopens=md5(newopens+newtimestamp);
+	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json${isDev ? `?debug=${window._debugType || 'admin'}&randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`}`
+}
+
+
 export function getUploadActionUrlOfAuth(id) {
-	// Railsgettimes()
 	let anewopens=md5(newopens+newtimestamp);
 	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json${isDev ? `?debug=${window._debugType || 'admin'}&randomcode=${newtimestamp}&client_key=${anewopens}` : `?randomcode=${newtimestamp}&client_key=${anewopens}`}`
 }
 
 export function getRandomNumber(type) {
-	//  Railsgettimes()
 	let anewopens=md5(newopens+newtimestamp);
 	return type===true?`randomcode=${newtimestamp}&client_key=${anewopens}`:`?randomcode=${newtimestamp}&client_key=${anewopens}`
 }
@@ -149,7 +205,7 @@ export function getTaskUrlById(id) {
 }
 
 export function getRandomcode(url) {
-	// Railsgettimes()
+	Railsgettimes()
 	let anewopens=md5(newopens+newtimestamp);
 
 	if (url.indexOf('?') == -1) {
diff --git a/src/common/components/Cropper.js b/src/common/components/Cropper.js
index 3ce30a8b..1abc83b2 100644
--- a/src/common/components/Cropper.js
+++ b/src/common/components/Cropper.js
@@ -1,52 +1,11 @@
 import React, { Component } from 'react';
-
 import { getUrl2, isDev } from 'educoder'
 const $ = window.$
 
 let _url_origin = getUrl2()
-// let _url_origin = `http://47.96.87.25:48080`;
 
 
 
-function save_avatar(){        
-        
-    // if($(img_lg).html().trim() == ""){            
-        // $("#avatar-name").html("请先选择图片上传").css("color", 'red');        
-    // } else {            
-        // $("#avatar-name").html("").css("color", '#333');    
-        const previewId = this.props.previewId
-        var img_lg = document.getElementById(previewId || 'img-preview');           
-        // 截图小的显示框内的内容          
-        window.html2canvas(img_lg).then(function(canvas) {
-            // for test
-            // document.getElementById('canvasWrap').appendChild(canvas);
-
-            var dataUrl = canvas.toDataURL("image/jpeg");    
-            console.log(dataUrl)   
-            // TODO upload base64 image data to server
-        });  
-        return
-
-        // 老版接口：
-        // html2canvas(img_lg, {               
-        //     allowTaint: true,                
-        //     taintTest: false,                
-        //     onrendered: function(canvas) {                    
-        //         canvas.id = "mycanvas";                    
-        //         //生成base64图片数据                    
-        //         var dataUrl = canvas.toDataURL("image/jpeg");    
-        //         console.log(dataUrl)   
-
-        //         var newImg = document.getElementById("showImg");                    
-        //         newImg.src = dataUrl;    
-        //         return;   
-
-        //         imagesAjax(dataUrl);                    
-        //         $(".avatar-save").attr("disabled","true");                
-        //     }            
-        // });       
-    // }    
-}   
 /** 
     props 说明：
     imageId 源图片标签的id
@@ -54,64 +13,50 @@ function save_avatar(){
     imageSrc 源图片src
     width  数字格式
     height 数字格式 
-*/ 
+*/
 class Cropper extends Component {
-  state = {
-  };
-
-  handleChange = (info) => {
-  }
 
   componentDidMount() {
-      this.options = {
-        aspectRatio: 1,
-        crop(event) {
-            // console.log(event.detail.x);
-            // console.log(event.detail.y);
-            // console.log(event.detail.width);
-            // console.log(event.detail.height);
-            // console.log(event.detail.rotate);
-            // console.log(event.detail.scaleX);
-            // console.log(event.detail.scaleY);
-        },
-        preview: this.props.previewId ? `#${this.props.previewId}` : '.img-preview',
-      }
+    this.options = {
+      aspectRatio: 1,
+      preview: this.props.previewId ? `#${this.props.previewId}` : '.img-preview',
+    }
+
+    if (!window.Cropper) {
+      $.ajaxSetup({
+        cache: true
+      });
+      const _isDev = isDev()
+      let _path = _isDev ? 'public' : 'build'
+
+      $('head').append($('<link rel="stylesheet" type="text/css" />')
+        .attr('href', `${_url_origin}/react/${_path}/js/cropper/cropper.min.css`));
+
+      $.getScript(
+        `${_url_origin}/react/${_path}/js/cropper/cropper.js`,
+        (data, textStatus, jqxhr) => {
 
-      if (!window.Cropper) {
-        $.ajaxSetup({
-            cache: true
         });
-        const _isDev = isDev()
-        let _path = _isDev ? 'public' : 'build'
+      $.getScript(
+        `${_url_origin}/react/${_path}/js/cropper/html2canvas.min.js`,
+        (data, textStatus, jqxhr) => {
 
-        $('head').append($('<link rel="stylesheet" type="text/css" />')
-            .attr('href', `${_url_origin}/react/${_path}/js/cropper/cropper.min.css`));
-
-        $.getScript(
-          `${_url_origin}/react/${_path}/js/cropper/cropper.js`,
-          (data, textStatus, jqxhr) => {
-          
         });
-        $.getScript(
-          `${_url_origin}/react/${_path}/js/cropper/html2canvas.min.js`,
-          (data, textStatus, jqxhr) => {
-          
-        });
-      }
+    }
 
-      setTimeout(() => {
-        const image = document.getElementById(this.props.imageId || '__image');
-        this.cropper = new window.Cropper(image, this.options);
-      }, 1200)
+    setTimeout(() => {
+      const image = document.getElementById(this.props.imageId || '__image');
+      this.cropper = new window.Cropper(image, this.options);
+    }, 1200)
   }
-  
+
   renew = (image) => {
     this.cropper && this.cropper.destroy();
     this.cropper = new window.Cropper(image, this.options);
 
   }
   render() {
-    
+
     const { width, height, previewId, imageSrc } = this.props;
 
     return (
@@ -119,8 +64,8 @@ class Cropper extends Component {
         {/* This rule is very important, please do not ignore this! */}
         <style>{`
             .wrapper {
-                width: ${ width ? (width+'px') : '500px'};
-                height: ${ height ? (height+'px') : '500px'};
+                width: ${ width ? (width + 'px') : '500px'};
+                height: ${ height ? (height + 'px') : '500px'};
                 border: 1px solid #eee;
             }
             img {
@@ -134,155 +79,13 @@ class Cropper extends Component {
             }
         `}</style>
         <div className="wrapper">
-            {/* http://localhost:3007/images/footNavLogo.png  图片转了后不对 
-                || "/images/testPicture.jpg"
-                || "/images/shixun0.jpg"
-            */}
-            <img id={this.props.imageId || "__image"} src={`${imageSrc }`}></img>
+          <img id={this.props.imageId || "__image"} src={`${imageSrc}`}></img>
         </div>
-        {/* background: 'aquamarine', 
-            'border-radius': '128px'
-        */}
-        {!previewId && <div id="img-preview" className="img-preview preview-lg" style={{width: '128px', height: '128px',  }}>
+        {!previewId && <div id="img-preview" className="img-preview preview-lg" style={{ width: '128px', height: '128px', }}>
         </div>}
-
-        {/* <img id="showImg" src="http://localhost:3007/images/testPicture.jpg"></img> */}
-
-        {/* <div id="canvasWrap"></div> */}
-        {/* <button onClick={save_avatar.bind(this)}>save </button> */}
       </div>
     );
   }
 }
 
-export default  Cropper;
-
-
-// function aaa () {
-//     function showedit_headphoto() {
-//         var html = `
-//         <script src=\"../head/jquery.min.js\"><\/script>\n
-//         <link href=\"../head/cropper.min.css\" rel=\"stylesheet\">\n
-//         <link href=\"../head/sitelogo.css\" rel=\"stylesheet\">\n
-//         <script src=\"../head/bootstrap.min.js\"><\/script>\n
-//         <script src=\"../head/cropper.js\"><\/script>\n
-//         <script src=\"../head/sitelogo.js\"><\/script>\n
-//         <script src=\"../head/html2canvas.min.js\" type=\"text/javascript\" charset=\"utf-8\"><\/script>\n\n
-
-//         <div class=\"task-popup\" style=\"width: 550px;\">\n  <div class=\"task-popup-title clearfix task-popup-bggrey\">上传头像<\/div>\n  <div class=\"clearfix\">\n    
-//         <div class=\"modal fade\" style=\"outline: none;\" id=\"avatar-modal\" aria-hidden=\"true\" aria-labelledby=\"avatar-modal-label\" role=\"dialog\" tabindex=\"-1\">\n      
-//         <div class=\"modal-dialog modal-lg\">\n        <div class=\"modal-content\">\n          <form class=\"avatar-form\">\n            <div class=\"modal-body\">\n              
-//         <div class=\"padding20\">\n                <div class=\"avatar-upload\">\n                  <input class=\"avatar-src\" name=\"avatar_src\" type=\"hidden\">\n                  
-//         <input class=\"avatar-data\" name=\"avatar_data\" type=\"hidden\">\n\n                  <span id=\"avatar-name\"><\/span>\n                  
-//         <input class=\"avatar-input\" style=\"display:none;\" id=\"avatarInput\" value=\"avatars/User/116\" name=\"avatar_file\" type=\"file\">\n                  
-//         <input type=\"hidden\" id=\"source_id\" value=\"116\"/>\n                  <input type=\"hidden\" id=\"source_type\" value=\"User\"/>\n                <\/div>\n                
-//         <div class=\"row clearfix mt20 pl20\">\n                  <div class=\"task-form-45 fl panel-box-sizing uplaodImg\">\n                    
-//         <div class=\"avatar-wrapper\" id=\"wrapper_image_show\">\n                      <!--<span style=\"display: block;\">\n                                             选择你要上传的图片<br/>
-//         \n                                             仅支持JPG、GIF、PNG，且文件小于2M\n                                           <\/span>-->\n                    <\/div>\n                    
-//         <div class=\"row avatar-btns clearfix\">\n                      <a href=\"javascript:void(0);\" class=\"fl\" type=\"button\" onClick=\"$(\'input[id=avatarInput]\').click();\">重新上传<\/a>\n
-//                               <!--<div class=\"btn-group\">\n                        <a href=\"javascript:void(0);\" class=\"fa fa-repeat fr mt5 color-grey-9\" data-method=\"rotate\" data-option=\"90\" 
-//                               type=\"button\" title=\"Rotate 90 degrees\">\n                          <\/a>\n                      <\/div>-->\n                    <\/div>\n                  <\/div>\n   
-//                                              <div class=\"task-form-50 panel-box-sizing fr color-grey pr20\" style=\"width: 128px;\">\n                    <div class=\"edu-txt-center\">\n                     
-//                                               <div class=\"avatar-preview preview-lg radius\" id=\"imageHead\">\n                        
-//                                               <img alt=\"头像\" height=\"128\" nhname=\"avatar_image\" src=\"/images/avatars/User/116?1556802838\" width=\"128\" />\n                      <\/div>\n  
-//                                                                   <span>头像预览<\/span>\n                    <\/div>\n                    
-//                                                                   <p class=\"color-grey-9 font-12 mt110 justify\">仅支持JPG、GIF、PNG，且文件小于2M<\/p>\n                  <\/div>\n                <\/div>\n
-//                                                                                 <\/div>\n              <div class=\"clearfix edu-txt-center mb20 mt10\">\n                
-//                                                                                 <a href=\"javascript:void(0);\" class=\"task-btn mr20\" onclick=\"hideModal()\">取消<\/a>\n               
-//                                                                                 <a href=\"javascript:void(0);\" class=\"avatar-save task-btn task-btn-orange\" data-dismiss=\"modal\">确定<\/a>\n              
-//                                                                                 <\/div>\n            <\/div>\n          <\/form>\n        <\/div>\n      <\/div>\n    <\/div>\n  <\/div>\n<\/div>\n\n<script>\n 
-//                                                                                    $(function () {\n        new CropAvatar($(\'#crop-avatar\'), 1/1);\n\n        //---------------------------头像上传-----------------------------//\n        //做个下简易的验证  大小 格式\n        $(\'#avatarInput\').on(\'change\', function(e) {\n            var filemaxsize = 1024 * 5;//5M\n            var target = $(e.target);\n            var Size = target[0].files[0].size / 1024;\n            if(Size > filemaxsize) {\n                alert(\'图片过大，请重新选择!\');\n                $(\".avatar-wrapper\").children().remove;\n                return false;\n            }\n            if(!this.files[0].type.match(/image.*/)) {\n                alert(\'请选择正确的图片!\')\n            } else {\n                /*var filename = document.querySelector(\"#avatar-name\");*/\n                var texts = document.querySelector(\"#avatarInput\").value;\n                var teststr = texts; //你这里的路径写错了\n                testend = teststr.match(/[^\\\\]+\\.[^\\(]+/i); //直接完整文件名的\n                /*filename.innerHTML = testend;\n                $(filename).css(\"color\", \'#333\');*/\n                $(\".avatar-save\").removeClass(\"task-btn-grey\").addClass(\"task-btn-orange\");\n                $(\".avatar-save\").on(\"click\", save_avatar);\n            }\n\n        });\n    });\n\n    function save_avatar(){\n        var img_lg = document.getElementById(\'imageHead\');\n        if($(img_lg).html().trim() == \"\"){\n            $(\"#avatar-name\").html(\"请先选择图片上传\").css(\"color\", \'red\');\n        } else {\n            $(\"#avatar-name\").html(\"\").css(\"color\", \'#333\');\n            // 截图小的显示框内的内容\n            html2canvas(img_lg, {\n                allowTaint: true,\n                taintTest: false,\n                onrendered: function(canvas) {\n                    canvas.id = \"mycanvas\";\n                    //生成base64图片数据\n                    var dataUrl = canvas.toDataURL(\"image/jpeg\");\n                    var newImg = document.createElement(\"img\");\n                    newImg.src = dataUrl;\n                    imagesAjax(dataUrl);\n                    $(\".avatar-save\").attr(\"disabled\",\"true\");\n                }\n            });\n        }\n    }\n\n    function imagesAjax(src) {\n        var data = {};\n        data.img = src;\n        data.source_id = $(\'#source_id\').val();\n        data.source_type = $(\'#source_type\').val();\n        data.is_direct = 0;\n        $.ajax({\n            url: \"/upload_avatar\",\n            beforeSend: function(xhr) {xhr.setRequestHeader(\'X-CSRF-Token\', $(\'meta[name=\"csrf-token\"]\').attr(\'content\'))},\n            data: data,\n            type: \"POST\",\n            success: function (re) {\n                console.log(re);\n                console.log(1562050370);\n                if(re){\n                    var o = JSON.parse(re);\n                    if (o.status !=0 ){\n                        console.log(o.message);\n                    } else {\n                        var imgSpan = $(\"img[nhname=\'avatar_image\']\");\n                        imgSpan.attr({\"src\": o.url + \'?1562050370\'});\n                        $(\"#user_code\").html(o.grade);\n                        notice_box_redirect(\"/users/shitou\", \"上传成功\");\n                    }\n                } else {\n                    notice_box(\"上传出错\");\n                }\n\n            },\n            error: function (e) {\n                alert(e);\n            }\n        });\n    }\n
-//                                                                                    <\/script>`;
-//         pop_box_new(html, 550, 510);
-//         $("#imageHead img").attr({"src": $("#user_avatar_show").attr("src")});
-//         $("#wrapper_image_show img").attr({"src": $("#user_avatar_show").attr("src")});
-
-        
-//     }
-
-//     $(function () {        
-//         new CropAvatar($('#crop-avatar'), 1/1);        
-//         //---------------------------头像上传-----------------------------//        
-//         //做个下简易的验证  大小 格式        
-//         $('#avatarInput').on('change', function(e) {            
-//             var filemaxsize = 1024 * 5;//5M            
-//             var target = $(e.target);            
-//             var Size = target[0].files[0].size / 1024;            
-//             if(Size > filemaxsize) {                
-//                 alert('图片过大，请重新选择!');                
-//                 $(".avatar-wrapper").children().remove;                
-//                 return false;            
-//             }            
-//             if(!this.files[0].type.match(/image.*/)) {                
-//                 alert('请选择正确的图片!')            
-//             } else {                
-//                 /*var filename = document.querySelector("#avatar-name");*/                
-//                 var texts = document.querySelector("#avatarInput").value;                
-//                 var teststr = texts; //你这里的路径写错了                
-//                 testend = teststr.match(/[^\\\\]+\\.[^\\(]+/i); //直接完整文件名的                
-//                 /*filename.innerHTML = testend;                $(filename).css("color", '#333');*/                
-//                 $(".avatar-save").removeClass("task-btn-grey").addClass("task-btn-orange");                
-//                 $(".avatar-save").on("click", save_avatar);            
-//             }        
-//         });    
-//     });    
-//     function save_avatar(){        
-//         var img_lg = document.getElementById('imageHead');        
-//         if($(img_lg).html().trim() == ""){            
-//             $("#avatar-name").html("请先选择图片上传").css("color", 'red');        
-//         } else {            
-//             $("#avatar-name").html("").css("color", '#333');           
-//             // 截图小的显示框内的内容            
-//             html2canvas(img_lg, {               
-//                 allowTaint: true,                
-//                 taintTest: false,                
-//                 onrendered: function(canvas) {                    
-//                     canvas.id = "mycanvas";                    
-//                     //生成base64图片数据                    
-//                     var dataUrl = canvas.toDataURL("image/jpeg");                    
-//                     var newImg = document.createElement("img");                    
-//                     newImg.src = dataUrl;                    
-//                     imagesAjax(dataUrl);                    
-//                     $(".avatar-save").attr("disabled","true");                
-//                 }            
-//             });       
-//         }    
-//     }    
-//     function imagesAjax(src) {        
-//         var data = {};        
-//         data.img = src;        
-//         data.source_id = $('#source_id').val();        
-//         data.source_type = $('#source_type').val();        
-//         data.is_direct = 0;        
-//         $.ajax({            
-//             url: "/upload_avatar",            
-//             beforeSend: function(xhr) {
-//                 xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))
-//             },            
-//             data: data,            
-//             type: "POST",            
-//             success: function (re) {                
-//                 console.log(re);                
-//                 // console.log(1562050370);                
-//                 if(re){                    
-//                     var o = JSON.parse(re);                    
-//                     if (o.status !=0 ){                        
-//                         console.log(o.message);                    
-//                     } else {                        
-//                         var imgSpan = $("img[nhname='avatar_image']");                        
-//                         imgSpan.attr({"src": o.url + '?1562050370'});                        
-//                         $("#user_code").html(o.grade);                        
-//                         notice_box_redirect("/users/shitou", "上传成功");                    
-//                     }                
-//                 } else {                    
-//                     notice_box("上传出错");                
-//                 }            
-//             },            
-//             error: function (e) {                
-//                 alert(e);            
-//             }        
-//         });    
-//     }
-
-
-// }
\ No newline at end of file
+export default Cropper;
diff --git a/src/common/components/DragValidator.js b/src/common/components/DragValidator.js
deleted file mode 100644
index 33daa5ca..00000000
--- a/src/common/components/DragValidator.js
+++ /dev/null
@@ -1,116 +0,0 @@
-import React, { Component } from 'react';
-
-const $ = window.jQuery
-const jQuery = $;
-// if () {
-// !$.drag
-  // (function($){
-  //   $.fn.dragValidator = function(options){
-  //       var x, drag = this, isMove = false, defaults = {
-  //       };
-  //       var options = $.extend(defaults, options);
-  //       //添加背景，文字，滑块
-  //       var html = '<div class="drag_bg"></div>'+
-  //           '<div class="drag_text" onselectstart="return false;" unselectable="on">拖动滑块验证</div>'+
-  //           '<div class="handler handler_bg"></div>';
-  //       this.append(html);
-	//
-  //       var handler = drag.find('.handler');
-  //       var drag_bg = drag.find('.drag_bg');
-  //       var text = drag.find('.drag_text');
-  //       var maxWidth = text.width() - handler.width();  //能滑动的最大间距
-  //       //鼠标按下时候的x轴的位置
-  //       handler.mousedown(function(e){
-  //           isMove = true;
-  //           x = e.pageX - parseInt(handler.css('left'), 10);
-  //       });
-	//
-  //       //鼠标指针在上下文移动时，移动距离大于0小于最大间距，滑块x轴位置等于鼠标移动距离
-  //       $(document).mousemove(function(e){
-  //           var _x = e.pageX - x;
-  //           var handler_offset = handler.offset();
-  //           var lastX = e.clientX -x;
-  //           lastX = Math.max(0,Math.min(maxWidth,lastX));
-  //           if(isMove){
-  //               if(_x > 0 && _x <= maxWidth){
-  //                   handler.css({'left': lastX});
-  //                   drag_bg.css({'width': lastX});
-  //               }
-  //               else if(lastX > maxWidth - 5 && lastX < maxWidth + 5 ){  //鼠标指针移动距离达到最大时清空事件
-  //                   dragOk();
-	//
-  //               }
-  //           }
-  //       });
-  //       handler.mouseup(function(e){
-  //           isMove = false;
-  //           var _x = e.pageX - x;
-  //           if(text.text() != '验证通过' && _x < maxWidth){ //鼠标松开时，如果没有达到最大距离位置，滑块就返回初始位置
-  //               handler.animate({'left': 0});
-  //               drag_bg.animate({'width': 0});
-  //           }
-  //       });
-	//
-  //       //清空事件
-  //       function dragOk(){
-  //           options.dragOkCallback && options.dragOkCallback()
-  //           var kuaiwidth=drag.width() - handler.width() - 2;
-  //           handler.removeClass('handler_bg').addClass('handler_ok_bg');
-  //           handler.css({'left':kuaiwidth+'px'})
-  //           text.css({'width':kuaiwidth+'px'});
-  //           text.text('验证通过');
-  //           drag.css({'color': '#fff'});
-  //           drag_bg.css({'width':kuaiwidth+'px'})
-  //           handler.unbind('mousedown');
-  //           $(document).unbind('mousemove');
-  //           $(document).unbind('mouseup');
-  //           $("#user_verification_notice").html("");
-  //           $('#user_verification_notice').parent().hide();
-  //       }
-  //   };
-  // })(jQuery);
-// }
-
-class DragValidator extends Component {
-  componentDidMount () {
-    // if($("#reg-drag").length>0 && IsPC()){
-    // $("#reg-drag").dragValidator({
-    //   height: this.props.height,
-    //   dragOkCallback: () => {
-    //     this.props.dragOkCallback && this.props.dragOkCallback()
-    //   }
-    // });
-    // }else{
-    //     $("#reg-drag").empty();
-    // }
-  }
-  empty() {
-    // $("#reg-drag").empty();
-  }
-  render() {
-    const height =  this.props.height || 45;
-    const className =  this.props.className
-    const successGreenColor = this.props.successGreenColor || '#29bd8b'
-    // newMain clearfix
-    return (
-      <div id="reg-drag" style={{	width:"287px",}} className={`drag_slider ${className}`}>
-        <style>{`
-          .drag_slider .handler {
-            height: 100%;
-          }
-          .drag_slider {
-            height: ${height}px;
-            line-height: ${height}px;
-          }
-          .drag_slider .drag_bg {
-            height: ${height}px;
-            background-color: ${successGreenColor};
-          }
-        `}</style>
-      
-      </div>
-    );
-  }
-}
-
-export default  ( DragValidator );
\ No newline at end of file
diff --git a/src/common/components/LinkAfterLogin.js b/src/common/components/LinkAfterLogin.js
index e7365abb..d7c923c6 100644
--- a/src/common/components/LinkAfterLogin.js
+++ b/src/common/components/LinkAfterLogin.js
@@ -6,23 +6,23 @@ class LinkAfterLogin extends Component {
 	constructor(props) {
 		super(props);
 	}
-    checkAuth = () => {
-        if (this.props.checkIfLogin()) {
-					if(this.props.checkProfileComplete){
-						if(this.props.checkIfProfileCompleted()){
-							this.props.history.push(this.props.to)
-						}else{
-							this.props.showProfileCompleteDialog();
-						}
-					}else{
-						this.props.history.push(this.props.to)
-					}
-        } else {
-            this.props.showLoginDialog()
-        }
-    }
+	checkAuth = () => {
+		if (this.props.checkIfLogin()) {
+			if (this.props.checkProfileComplete) {
+				if (this.props.checkIfProfileCompleted()) {
+					this.props.history.push(this.props.to)
+				} else {
+					this.props.showProfileCompleteDialog();
+				}
+			} else {
+				this.props.history.push(this.props.to)
+			}
+		} else {
+			this.props.showLoginDialog()
+		}
+	}
 	render() {
-		return(
+		return (
 			<a {...this.props} onClick={this.checkAuth}>{this.props.children}</a>
 		)
 	}
diff --git a/src/common/components/comment/CommentForm.js b/src/common/components/comment/CommentForm.js
index 3f1e1617..4f0692e7 100644
--- a/src/common/components/comment/CommentForm.js
+++ b/src/common/components/comment/CommentForm.js
@@ -1,7 +1,7 @@
 /*
  * @Description: 评论表单
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-12-17 17:32:55
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-01-06 18:42:09
@@ -10,15 +10,13 @@ import './index.scss';
 import React, { useState } from 'react';
 import { Form, Button, Input } from 'antd';
 import QuillForEditor from '../../quillForEditor';
-// import { QuillDeltaToHtmlConverter } from 'quill-delta-to-html'
-// import {formatDelta} from './util';
 const FormItem = Form.Item;
 
-function CommentForm (props) {
+function CommentForm(props) {
 
   const {
     onCancel,
-    onSubmit, 
+    onSubmit,
     form,
     type
   } = props;
@@ -28,9 +26,6 @@ function CommentForm (props) {
   const [focus, setFocus] = useState(false);
 
   const options = [
-    // ['bold', 'italic', 'underline'],
-    // [{header: [1,2,3,false]}],
-    'code-block',
     'link',
     'image',
     'formula'
@@ -47,20 +42,30 @@ function CommentForm (props) {
     setShowQuill(false);
     setCtx('');
     props.form.resetFields();
-    onCancel && onCancel(); 
+    onCancel && onCancel();
   }
 
   // 编辑器内容变化时
-  const handleContentChange = (content) => {
-    console.log('编辑器内容', content);
-    setCtx(content);
-    try {
-      // const _html = new QuillDeltaToHtmlConverter(content.ops, {}).convert();
-      // props.form.setFieldsValue({'comment': _html.replace(/<\/?[^>]*>/g, '')});
-      props.form.setFieldsValue({'comment': content});
-    } catch (error) {
-      console.log(error);
+  const handleContentChange=(quill,html,mydata)=>{
+    const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
+    if (!reg.test(html)) {
+      setCtx(html);
+      try {
+        // const _html = new QuillDeltaToHtmlConverter(content.ops, {}).convert();
+        props.form.setFieldsValue({ 'comment': html });
+      } catch (error) {
+        console.log(error);
+      }
+    }else{
+      setCtx(html);
+      try {
+        // const _html = new QuillDeltaToHtmlConverter(content.ops, {}).convert();
+        props.form.setFieldsValue({ 'comment': html });
+      } catch (error) {
+        console.log(error);
+      }
     }
+
   }
   // 发送
   const handleSubmit = (e) => {
@@ -69,7 +74,7 @@ function CommentForm (props) {
       if (!err) {
         setShowQuill(false);
         const content = ctx;
-        props.form.setFieldsValue({'comment': ''});
+        props.form.setFieldsValue({ 'comment': '' });
         setCtx('');
         // const _html = formatDelta(content.ops);
         // console.log('保存的内容=====》》》》', content);
@@ -95,10 +100,10 @@ function CommentForm (props) {
         {
           getFieldDecorator('comment', {
             rules: [
-              { required: true, message: '评论内容不能为空'}
+              { required: true, message: '评论内容不能为空' }
             ],
           })(
-            <Input 
+            <Input
               onClick={() => handleInputClick(type)}
               placeholder="说点儿什么~"
               className={showQuill ? '' : 'show_input'}
@@ -110,13 +115,13 @@ function CommentForm (props) {
             />
           )
         }
-        
+
         <QuillForEditor
-          imgAttrs={{width: '60px', height: '30px'}}
+          imgAttrs={{ width: '60px', height: '30px' }}
           wrapStyle={{
             height: showQuill ? 'auto' : '0px',
             opacity: showQuill ? 1 : 0,
-            overflow: showQuill ? 'none' : 'hidden',
+            overflow: showQuill ? 'none' : 'none',
             transition: 'all 0.3s'
           }}
           autoFocus={focus}
@@ -130,7 +135,7 @@ function CommentForm (props) {
       </FormItem>
       <FormItem style={{ textAlign: 'right', display: showQuill ? 'block' : 'none' }}>
         <Button onClick={handleCancle}>取消</Button>
-        <Button onClick={handleSubmit} type="primary" style={{ marginLeft: '10px'}}>发送</Button>
+        <Button onClick={handleSubmit} type="primary" style={{ marginLeft: '10px' }}>发送</Button>
       </FormItem>
     </Form>
   );
diff --git a/src/common/components/comment/CommentItem.js b/src/common/components/comment/CommentItem.js
index c0a911da..2d9f72c7 100644
--- a/src/common/components/comment/CommentItem.js
+++ b/src/common/components/comment/CommentItem.js
@@ -1,24 +1,21 @@
 /*
  * @Description: 评论单列
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-12-17 17:35:17
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-27 11:05:17
  */
 import './index.scss';
-import 'quill/dist/quill.core.css'; // 核心样式
-import 'quill/dist/quill.snow.css'; // 有工具栏
-import 'quill/dist/quill.bubble.css'; // 无工具栏
-import 'katex/dist/katex.min.css'; // katex 表达式样式
 import React, { useState } from 'react';
 import CommentIcon from './CommentIcon';
 import { getImageUrl, CNotificationHOC } from 'educoder'
 import { Icon } from 'antd';
 import CommentForm from './CommentForm';
-import QuillForEditor from '../../quillForEditor';
+import {markdownToHTML} from 'educoder'
+// import QuillForEditor from '../../quillForEditor';
 
-function CommentItem ({
+function CommentItem({
   isAdmin,
   options,
   confirm,
@@ -39,7 +36,7 @@ function CommentItem ({
   // 上传图片的ulr
   const [url, setUrl] = useState('');
 
-  const { 
+  const {
     author = {}, // 作者
     id, // 评论id
     content, // 回复内容
@@ -57,22 +54,21 @@ function CommentItem ({
     confirm({
       title: '提示',
       content: ('确定要删除该条回复吗?'),
-      onOk () {
-        console.log('点击了删除', id);
+      onOk() {
         submitDeleteComment && submitDeleteComment(id);
       }
     });
   }
 
   // 评论头像
-  const commentAvatar = (author) => ( 
-    <img 
-      className="item-flex flex-image" 
+  const commentAvatar = (author) => (
+    <img
+      className="item-flex flex-image"
       src={author.image_url ? getImageUrl(`images/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
       alt=""
     />
   );
-  
+
   // 评论信息
   const commentInfo = (id, author, time, can_delete) => {
     const _classNames = can_delete ? 'item-close' : 'item-close hide';
@@ -84,11 +80,10 @@ function CommentItem ({
           <span className="iconfont icon-shanchu icon_font_size_14" onClick={() => deleteComment(id)}></span>
         </span>
       </div>
-    );  
+    );
   };
 
   const handleShowUploadImage = (url) => {
-    // console.log('==============>>>>>>>>>>>>',url);
     setUrl(url);
   }
   // 评论内容
@@ -99,13 +94,15 @@ function CommentItem ({
     } catch (e) {
       _ctx = ctx;
     }
+    //      <QuillForEditor
+    //         readOnly={true}
+    //         value={_ctx}
+    //         showUploadImage={handleShowUploadImage}
+    //       />
     return (
-      <QuillForEditor
-        readOnly={true}
-        value={_ctx}
-        showUploadImage={handleShowUploadImage}
-      />
-  )};
+      <div className={"mt15 ml15"} style={{wordBreak: "break-word",fontWeight:"bold"}} dangerouslySetInnerHTML={{__html: markdownToHTML(_ctx).replace(/▁/g, "▁▁▁")}}></div>
+    )
+  };
 
   // 加载更多
   const handleOnLoadMore = (len) => {
@@ -154,7 +151,7 @@ function CommentItem ({
         <li className={_moreClass} onClick={() => handleOnLoadMore(len)}>
           <p className="loadmore-txt">展开其余{lastTxt}条评论</p>
           <p className="loadmore-icon">
-            <Icon type={!arrow ? 'down' : 'up'}/>
+            <Icon type={!arrow ? 'down' : 'up'} />
           </p>
         </li>
       </ul>
@@ -169,7 +166,7 @@ function CommentItem ({
   const handleClickLick = (id) => {
     likeComment && likeComment(id);
   }
-  
+
   // 点击评论icon
   const handleClickMessage = () => {
     setShowQuill(true);
@@ -198,33 +195,33 @@ function CommentItem ({
       <div className="item-flex item-desc">
         {commentInfo(id, author, time, can_delete)}
         {commentCtx(content)}
-        
+
         {commentAppend(children)}
 
         <div className="comment_icon_area">
           <CommentIcon
-            style={{ display: isAdmin ? 'inline-block' : 'none'}}
-            className='comment-icon-margin' 
-            type={!hidden ? "xianshi" : 'yincang1'} 
+            style={{ display: isAdmin ? 'inline-block' : 'none' }}
+            className='comment-icon-margin'
+            type={!hidden ? "xianshi" : 'yincang1'}
             iconClick={() => handleShowOrHide(id, !hidden ? 1 : 0)}
           />
 
           <CommentIcon
-            style={{ display: can_delete ? 'inline-block' : 'none'}}
-            className='comment-icon-margin' 
-            type={'shanchu'} 
+            style={{ display: can_delete ? 'inline-block' : 'none' }}
+            className='comment-icon-margin'
+            type={'shanchu'}
             iconClick={() => deleteComment(id)}
           />
           {/* 回复 */}
-          <CommentIcon 
-            className='comment-icon-margin' 
+          <CommentIcon
+            className='comment-icon-margin'
             type="huifu1"
-            count={children.length} 
+            count={children.length}
             iconClick={handleClickMessage}
           />
           {/* 点赞 */}
-          <CommentIcon 
-            iconColor={ user_praise ? '#5091FF' : '' }
+          <CommentIcon
+            iconColor={user_praise ? '#5091FF' : ''}
             className='comment-icon-margin'
             theme={user_praise ? 'filled' : ''}
             type="dianzan"
@@ -234,7 +231,7 @@ function CommentItem ({
         </div>
 
         <div
-          style={{ display: showQuill ? 'block' : 'none'}}
+          style={{ display: showQuill ? 'block' : 'none' }}
           className="comment_item_quill">
           <CommentForm
             onCancel={handleClickCancel}
@@ -242,11 +239,10 @@ function CommentItem ({
           />
         </div>
 
-        {/* 显示上传的图片信息 */}
-        <div className="show_upload_image" style={{ display: url ? 'block' : 'none'}}>
-          <Icon type="close" className="image_close" onClick={handleClose}/>
+        <div className="show_upload_image" style={{ display: url ? 'block' : 'none' }}>
+          <Icon type="close" className="image_close" onClick={handleClose} />
           <div className="image_info">
-            <img className="image" src={url} alt=""/>
+            <img className="image" src={url} alt="" />
           </div>
         </div>
       </div>
@@ -254,4 +250,4 @@ function CommentItem ({
   );
 }
 
-export default CNotificationHOC() (CommentItem);
+export default CNotificationHOC()(CommentItem);
diff --git a/src/common/components/comment/index.js b/src/common/components/comment/index.js
index 5efa8c5a..1ff16406 100644
--- a/src/common/components/comment/index.js
+++ b/src/common/components/comment/index.js
@@ -7,39 +7,28 @@
  * @LastEditTime : 2019-12-24 18:03:21
  */
 import React from 'react';
-// import CommentForm from './CommentForm';
 import CommentList from './CommentList';
-function Comment (props) {
+function Comment(props) {
 
-  const { 
+  const {
     commentLists,
-    // addComment,
-    // cancelComment,
     isAdmin,
     addChildComment,
     likeComment,
     showOrHideComment,
     submitDeleteComment
   } = props;
-  
-  // const handleCancelComment = () => {
-  //   cancelComment && cancelComment();
-  // };
+
   return (
-    <React.Fragment>
-      {/* <CommentForm 
-        onCancel={handleCancelComment}
-        onSubmit={addComment}
-      /> */}
-      <CommentList 
-        isAdmin={isAdmin}
-        likeComment={likeComment}
-        showOrHideComment={showOrHideComment}
-        commentLists={commentLists}
-        submitChildComment={addChildComment}
-        submitDeleteComment={submitDeleteComment}
-      />
-    </React.Fragment>
+    <CommentList
+      isAdmin={isAdmin}
+      likeComment={likeComment}
+      showOrHideComment={showOrHideComment}
+      commentLists={commentLists}
+      submitChildComment={addChildComment}
+      submitDeleteComment={submitDeleteComment}
+    />
+
   );
 }
 
diff --git a/src/common/components/comment/util.js b/src/common/components/comment/util.js
index 2b4f36a8..8694161a 100644
--- a/src/common/components/comment/util.js
+++ b/src/common/components/comment/util.js
@@ -1,7 +1,7 @@
 /*
  * @Description: quill delta -> html
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-12-24 08:51:25
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-26 09:30:11
@@ -55,7 +55,7 @@ export const formatDelta = (deltas) => {
  */
 export const operate = (text, key, value) => {
   let operatedText = null;
-  debugger;
+
   switch (key) {
     case 'bold':
       operatedText = `<strong>${text}</strong>`;
@@ -72,7 +72,7 @@ export const operate = (text, key, value) => {
     case 'link':
       operatedText = `<a href="${value}" style="color: #5091ff; text-decoration: underline;" target="bland">${text}</a>`;
       break;
-    default: 
+    default:
       operatedText = text;
   }
 
diff --git a/src/common/components/custom-editor/index.jsx b/src/common/components/custom-editor/index.jsx
new file mode 100644
index 00000000..32d4a0ed
--- /dev/null
+++ b/src/common/components/custom-editor/index.jsx
@@ -0,0 +1,64 @@
+import React, { useMemo, useState, useEffect } from 'react'
+
+import TPMMDEditor from '../../../modules/tpm/challengesnew/tpm-md-editor'
+import { markdownToHTML } from 'educoder'
+import './index.scss'
+
+function noop() { }
+
+export const defaultQuillOpt = [
+  'bold', 'italic', 'underline',
+  { list: 'ordered' }, { list: 'bullet' },
+  { script: 'sub' }, { script: 'super' },
+  { 'color': [] },
+  { 'background': [] },
+  'image', 'code-block', 'formula', 'clean'
+]
+export default ({ is_md, value, onChange, placeholder, autoFocus = true, isError, isShowEditor, height = 160, options = defaultQuillOpt, index, onActiveOption = noop, md_id, showResizeBar = false }) => {
+  let html = useMemo(() => {
+    if (value) {
+      return is_md ? markdownToHTML(value) : value
+    }
+    return placeholder
+  }, [is_md, placeholder, value])
+
+  const [isFocus, setIsFocus] = useState(false)
+  useEffect(() => {
+    if (isShowEditor) {
+      setIsFocus(autoFocus)
+    } else {
+      setIsFocus(false)
+    }
+  }, [autoFocus, isShowEditor])
+
+
+  function onMdContentChangeHandler(v) {
+    onChange(v, index)
+  }
+
+  function onActiveHandler(e) {
+    e.preventDefault()
+    e.stopPropagation()
+    onActiveOption(index)
+  }
+  return (
+    <div className='editor-content-panel-wrapper'>
+      <div className={`editor-content-panel markdown-body ${isShowEditor ? 'hide' : null} ${isError ? 'error' : null} ${value ? 'hasValue' : null} `}
+        dangerouslySetInnerHTML={{ __html: html }} onClick={onActiveHandler} />
+
+      {is_md ?
+        <TPMMDEditor
+          initValue={value}
+          height={height}
+          mdID={md_id}
+          noStorage={true}
+          className={`${isShowEditor ? null : 'hideMd'} ${isError ? 'md-error' : null} `}
+          onChange={onMdContentChangeHandler}
+          showResizeBar={showResizeBar}
+          placeholder={placeholder}
+        /> : null
+      }
+
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/src/common/components/custom-editor/index.scss b/src/common/components/custom-editor/index.scss
new file mode 100644
index 00000000..387d2dbd
--- /dev/null
+++ b/src/common/components/custom-editor/index.scss
@@ -0,0 +1,46 @@
+.editor-content-panel-wrapper {
+  margin-bottom: 12px;
+
+  .editor-content-panel {
+    display: flex;
+    align-items: center;
+    word-break: break-all;
+
+    border-radius: 2px;
+    max-width: 1056px;
+    text-align: justify;
+
+    height: auto;
+    min-height: 38px;
+    border: 1px solid rgba(234, 234, 234, 1);
+    padding: 4px;
+    width: 100%;
+
+    p {
+      width: 100%;
+    }
+  }
+
+  .hide {
+    display: none;
+  }
+
+  .hasValue {
+    color: rgb(153, 153, 153);
+  }
+
+}
+
+.md-error {
+  .edu-back-greyf5 {
+    border: 1px solid red;
+  }
+}
+
+.hideMd {
+  display: none;
+}
+
+.error {
+  border: 1px solid red;
+}
\ No newline at end of file
diff --git a/src/common/components/form/City.js b/src/common/components/form/City.js
index 5ee0c080..0a577b4c 100644
--- a/src/common/components/form/City.js
+++ b/src/common/components/form/City.js
@@ -524,8 +524,8 @@ const options = [{
     value: '天水',
     label: '天水'
   },{
-    value: '武都',
-    label: '武都'
+    value: '陇南',
+    label: '陇南'
   },{
     value: '武威',
     label: '武威'
@@ -1746,7 +1746,6 @@ class City extends Component{
     }
   }
   onChange = (r1, r2) => {
-    // debugger
     this.props.onChange(r1, r2)
     this.setState({ value: r1 })
   }
diff --git a/src/common/components/markdown/DMDEditor.css b/src/common/components/markdown/DMDEditor.css
deleted file mode 100644
index 38a84202..00000000
--- a/src/common/components/markdown/DMDEditor.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.hideMd {
-    display: none !important;
-}
-.content_editorMd_show {
-    height: auto;
-    min-height: 38px;
-    width: 800px;
-    border: 1px solid rgba(234,234,234,1);
-    margin-top: 2px;
-    padding: 4px;
-    width: 100%;
-}
\ No newline at end of file
diff --git a/src/common/components/markdown/DMDEditor.js b/src/common/components/markdown/DMDEditor.js
deleted file mode 100644
index 7091adf0..00000000
--- a/src/common/components/markdown/DMDEditor.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import React,{ Component } from "react";
-import TPMMDEditor from '../../../modules/tpm/challengesnew/TPMMDEditor'
-import {markdownToHTML} from 'educoder'
-import './DMDEditor.css'
-// 需要父组件通过toShowMode、toMDMode 来控制，一次只能打开一个DMDEditor
-class DMDEditor extends Component{
-  constructor(props){
-    super(props);
-    this.mdRef = React.createRef()
-    this.state={
-        mdMode: false,
-        // value: this.props.initValue
-    }
-  }
-  componentDidUpdate(prevProps, prevState) {
-    
-  }
-  componentDidMount() {
-    // if(this.props.initValue != this.mdRef.current.getValue()) {
-    //   this.mdRef.current.setValue(this.props.initValue)
-    // }
-  }
-  
-  
-  toMDMode = () => {
-    this.setState({mdMode: true}, () => {
-        this.mdRef.current.resize()
-        this.mdRef.current.setValue(this.props.initValue)
-    })
-    this.props.toMDMode(this)    
-  }
-  toShowMode = () => {
-    this.setState({mdMode: false})
-    this.props.toShowMode && this.props.toShowMode(this)
-  }
-  onCMBlur = () => {
-      this.toShowMode()
-  }
-  onChange = (val) => {
-    //   this.setState({ value: val })
-    this.props.onChange(val)
-    if (this.state.showError == true) {
-      this.setState({showError: false})
-    }
-  }
-  showError = () => {
-    this.mdRef.current.showError()
-    this.setState({showError: true})
-  }
-  render(){
-    const { mdMode, showError } = this.state;
-    const { initValue } = this.props;
-    let _style = {}
-    if (showError) {
-        _style.border = '1px solid red'
-    }
-    _style = Object.assign(_style, {display: mdMode == true ? 'none' : '', color: initValue? '': '#999', alignItems: 'center',  wordBreak: 'break-all'})
-    return(
-      <React.Fragment>
-        <style>{`
-            
-        `}</style>
-        <div id="content_editorMd_show" className="new_li content_editorMd_show markdown-body"
-                style={_style}
-                dangerouslySetInnerHTML={{__html: initValue ? markdownToHTML(initValue):this.props.placeholder}}
-                onClick={this.toMDMode}
-        >
-
-        </div>
-        {/* 
-          onCMBlur={this.onCMBlur} */}
-        <TPMMDEditor
-          ref={this.mdRef}
-          {...this.props}
-          initValue={initValue}
-          className={`${this.props.className} ${mdMode == true ? '' : 'hideMd'}`}
-          onChange={this.onChange}
-        ></TPMMDEditor>
-      </React.Fragment>
-    )
-  }
-}
-export default DMDEditor;
\ No newline at end of file
diff --git a/src/common/components/media/AliyunUploader.js b/src/common/components/media/AliyunUploader.js
index db5d5f7f..d391c7be 100644
--- a/src/common/components/media/AliyunUploader.js
+++ b/src/common/components/media/AliyunUploader.js
@@ -8,12 +8,12 @@ let _path = isDev() ? 'public' : 'build'
 
 let uploader
 
-let _testHost = '' ; '192.168.2.63:3001/api'
+let _testHost = ''; '192.168.2.63:3001/api'
 
 
 const login = 'innov'
 
-function createUploader () {
+function createUploader() {
     uploader = new window.AliyunUpload.Vod({
         timeout: $('#timeout').val() || 60000,
         partSize: $('#partSize').val() || 1048576,
@@ -35,12 +35,12 @@ function createUploader () {
         },
         // 开始上传
         onUploadstarted: function (uploadInfo) {
-        // 如果是 UploadAuth 上传方式, 需要调用 uploader.setUploadAuthAndAddress 方法
-        // 如果是 UploadAuth 上传方式, 需要根据 uploadInfo.videoId是否有值，调用点播的不同接口获取uploadauth和uploadAddress
-        // 如果 uploadInfo.videoId 有值，调用刷新视频上传凭证接口，否则调用创建视频上传凭证接口
-        // 注意: 这里是测试 demo 所以直接调用了获取 UploadAuth 的测试接口, 用户在使用时需要判断 uploadInfo.videoId 存在与否从而调用 openApi
-        // 如果 uploadInfo.videoId 存在, 调用 刷新视频上传凭证接口(https://help.aliyun.com/document_detail/55408.html)
-        // 如果 uploadInfo.videoId 不存在,调用 获取视频上传地址和凭证接口(https://help.aliyun.com/document_detail/55407.html)
+            // 如果是 UploadAuth 上传方式, 需要调用 uploader.setUploadAuthAndAddress 方法
+            // 如果是 UploadAuth 上传方式, 需要根据 uploadInfo.videoId是否有值，调用点播的不同接口获取uploadauth和uploadAddress
+            // 如果 uploadInfo.videoId 有值，调用刷新视频上传凭证接口，否则调用创建视频上传凭证接口
+            // 注意: 这里是测试 demo 所以直接调用了获取 UploadAuth 的测试接口, 用户在使用时需要判断 uploadInfo.videoId 存在与否从而调用 openApi
+            // 如果 uploadInfo.videoId 存在, 调用 刷新视频上传凭证接口(https://help.aliyun.com/document_detail/55408.html)
+            // 如果 uploadInfo.videoId 不存在,调用 获取视频上传地址和凭证接口(https://help.aliyun.com/document_detail/55407.html)
             if (!uploadInfo.videoId) {
                 // var createUrl = 'https://demo-vod.cn-shanghai.aliyuncs.com/voddemo/CreateUploadVideo?Title=testvod1&FileName=aa.mp4&BusinessType=vodai&TerminalType=pc&DeviceModel=iPhone9,2&UUID=59ECA-4193-4695-94DD-7E1247288&AppVersion=1.0.0&VideoId=5bfcc7864fc14b96972842172207c9e6'
                 // $.get(createUrl, function (data) {
@@ -49,9 +49,9 @@ function createUploader () {
                 //     var videoId = data.VideoId
                 //     uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress,videoId)
                 // }, 'json')
-                
+
                 var createUrl = `${_testHost}/users/${login}/video_auths.json?debug=true`
-                
+
                 axios.post(createUrl, {
                     title: 'testvod1',
                     file_name: 'aa.mp4'
@@ -65,7 +65,7 @@ function createUploader () {
                 }).catch((error) => {
                     console.log(error)
                 })
-                
+
 
                 $('#status').text('文件开始上传...')
                 console.log("onUploadStarted:" + uploadInfo.file.name + ", endpoint:" + uploadInfo.endpoint + ", bucket:" + uploadInfo.bucket + ", object:" + uploadInfo.object)
@@ -81,7 +81,7 @@ function createUploader () {
                 // }, 'json')
 
                 var refreshUrl = `${_testHost}/users/${login}/video_auths.json?debug=true`
-                
+
                 axios.put(refreshUrl, {
                     video_id: uploadInfo.videoId,
                 }).then((response) => {
@@ -132,7 +132,7 @@ function createUploader () {
             // }, 'json')
 
             var refreshUrl = `${_testHost}/users/${login}/video_auths.json?debug=true`
-                
+
             axios.put(refreshUrl, {
                 video_id: uploadInfo.videoId,
             }).then((response) => {
@@ -152,24 +152,24 @@ function createUploader () {
     return uploader
 }
 function AliyunUploader(props) {
-    
+
     useEffect(() => {
         if (window.AliyunUpload && window.AliyunUpload.Vod) {
 
         } else {
             $.getScript(
-            `${_url_origin}/react/${_path}/js/aliyun-upload/lib/es6-promise.min.js`,
-            (data, textStatus, jqxhr) => {
-                $.getScript(
-                    `${_url_origin}/react/${_path}/js/aliyun-upload/lib/aliyun-oss-sdk-5.3.1.min.js`,
+                `${_url_origin}/react/${_path}/js/aliyun-upload/lib/es6-promise.min.js`,
                 (data, textStatus, jqxhr) => {
                     $.getScript(
-                        `${_url_origin}/react/${_path}/js/aliyun-upload/aliyun-upload-sdk-1.5.0.min.js`,
-                    (data, textStatus, jqxhr) => {
-                    
-                    });
+                        `${_url_origin}/react/${_path}/js/aliyun-upload/lib/aliyun-oss-sdk-5.3.1.min.js`,
+                        (data, textStatus, jqxhr) => {
+                            $.getScript(
+                                `${_url_origin}/react/${_path}/js/aliyun-upload/aliyun-upload-sdk-1.5.0.min.js`,
+                                (data, textStatus, jqxhr) => {
+
+                                });
+                        });
                 });
-            });
         }
 
         $('#fileUpload').on('change', function (e) {
@@ -201,7 +201,7 @@ function AliyunUploader(props) {
     }, [])
 
     let { source, id, className, type } = props;
-    
+
     function onStop() {
         $('#resumeUpload').attr('disabled', false)
         // $('#pauseUpload').attr('disabled', true)
@@ -212,26 +212,26 @@ function AliyunUploader(props) {
         // $('#pauseUpload').attr('disabled', false)
         uploader.startUpload()
     }
-    return(
+    return (
         <React.Fragment>
             <div>
                 <input type="file" id="fileUpload"></input>
-                <label class="status">上传状态: <span id="status"></span></label>
+                <label className="status">上传状态: <span id="status"></span></label>
             </div>
-            <div class="upload-type">
+            <div className="upload-type">
                 上传方式一, 使用 UploadAuth 上传:
                 {/* <button id="authUpload" disabled="true">开始上传</button>
                 <button id="pauseUpload" disabled="true" onClick={onStop}>暂停</button>
                 <button id="resumeUpload" disabled="true" onClick={onResume}>恢复上传</button> */}
                 <button id="authUpload" >开始上传</button>
-                <button id="pauseUpload"  onClick={onStop}>暂停</button>
-                <button id="resumeUpload"  onClick={onResume}>恢复上传</button>
-                <span class="progress">上传进度: <i id="auth-progress">0</i> %</span>
+                <button id="pauseUpload" onClick={onStop}>暂停</button>
+                <button id="resumeUpload" onClick={onResume}>恢复上传</button>
+                <span className="progress">上传进度: <i id="auth-progress">0</i> %</span>
                 <span></span>
             </div>
 
         </React.Fragment>
     )
-  
+
 }
 export default AliyunUploader
\ No newline at end of file
diff --git a/src/common/components/media/AliyunUploaderDemo.js b/src/common/components/media/AliyunUploaderDemo.js
index f8528496..82aa78ec 100644
--- a/src/common/components/media/AliyunUploaderDemo.js
+++ b/src/common/components/media/AliyunUploaderDemo.js
@@ -8,7 +8,7 @@ let _path = _isDev ? 'public' : 'build'
 
 let uploader
 
-function createUploader () {
+function createUploader() {
     uploader = new AliyunUpload.Vod({
         timeout: $('#timeout').val() || 60000,
         partSize: $('#partSize').val() || 1048576,
@@ -30,19 +30,19 @@ function createUploader () {
         },
         // 开始上传
         onUploadstarted: function (uploadInfo) {
-        // 如果是 UploadAuth 上传方式, 需要调用 uploader.setUploadAuthAndAddress 方法
-        // 如果是 UploadAuth 上传方式, 需要根据 uploadInfo.videoId是否有值，调用点播的不同接口获取uploadauth和uploadAddress
-        // 如果 uploadInfo.videoId 有值，调用刷新视频上传凭证接口，否则调用创建视频上传凭证接口
-        // 注意: 这里是测试 demo 所以直接调用了获取 UploadAuth 的测试接口, 用户在使用时需要判断 uploadInfo.videoId 存在与否从而调用 openApi
-        // 如果 uploadInfo.videoId 存在, 调用 刷新视频上传凭证接口(https://help.aliyun.com/document_detail/55408.html)
-        // 如果 uploadInfo.videoId 不存在,调用 获取视频上传地址和凭证接口(https://help.aliyun.com/document_detail/55407.html)
+            // 如果是 UploadAuth 上传方式, 需要调用 uploader.setUploadAuthAndAddress 方法
+            // 如果是 UploadAuth 上传方式, 需要根据 uploadInfo.videoId是否有值，调用点播的不同接口获取uploadauth和uploadAddress
+            // 如果 uploadInfo.videoId 有值，调用刷新视频上传凭证接口，否则调用创建视频上传凭证接口
+            // 注意: 这里是测试 demo 所以直接调用了获取 UploadAuth 的测试接口, 用户在使用时需要判断 uploadInfo.videoId 存在与否从而调用 openApi
+            // 如果 uploadInfo.videoId 存在, 调用 刷新视频上传凭证接口(https://help.aliyun.com/document_detail/55408.html)
+            // 如果 uploadInfo.videoId 不存在,调用 获取视频上传地址和凭证接口(https://help.aliyun.com/document_detail/55407.html)
             if (!uploadInfo.videoId) {
                 var createUrl = 'https://demo-vod.cn-shanghai.aliyuncs.com/voddemo/CreateUploadVideo?Title=testvod1&FileName=aa.mp4&BusinessType=vodai&TerminalType=pc&DeviceModel=iPhone9,2&UUID=59ECA-4193-4695-94DD-7E1247288&AppVersion=1.0.0&VideoId=5bfcc7864fc14b96972842172207c9e6'
                 $.get(createUrl, function (data) {
-                var uploadAuth = data.UploadAuth
-                var uploadAddress = data.UploadAddress
-                var videoId = data.VideoId
-                uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress,videoId)
+                    var uploadAuth = data.UploadAuth
+                    var uploadAddress = data.UploadAddress
+                    var videoId = data.VideoId
+                    uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId)
                 }, 'json')
                 $('#status').text('文件开始上传...')
                 console.log("onUploadStarted:" + uploadInfo.file.name + ", endpoint:" + uploadInfo.endpoint + ", bucket:" + uploadInfo.bucket + ", object:" + uploadInfo.object)
@@ -51,10 +51,10 @@ function createUploader () {
                 // https://help.aliyun.com/document_detail/55408.html?spm=a2c4g.11186623.6.630.BoYYcY
                 var refreshUrl = 'https://demo-vod.cn-shanghai.aliyuncs.com/voddemo/RefreshUploadVideo?BusinessType=vodai&TerminalType=pc&DeviceModel=iPhone9,2&UUID=59ECA-4193-4695-94DD-7E1247288&AppVersion=1.0.0&Title=haha1&FileName=xxx.mp4&VideoId=' + uploadInfo.videoId
                 $.get(refreshUrl, function (data) {
-                var uploadAuth = data.UploadAuth
-                var uploadAddress = data.UploadAddress
-                var videoId = data.VideoId
-                uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress,videoId)
+                    var uploadAuth = data.UploadAuth
+                    var uploadAddress = data.UploadAddress
+                    var videoId = data.VideoId
+                    uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId)
                 }, 'json')
             }
         },
@@ -103,24 +103,24 @@ function createUploader () {
     return uploader
 }
 function AliyunUploaderDemo(props) {
-    
+
     useEffect(() => {
         if (window.AliyunUpload && window.AliyunUpload.Vod) {
 
         } else {
             $.getScript(
-            `${_url_origin}/react/${_path}/js/aliyun-upload/lib/es6-promise.min.js`,
-            (data, textStatus, jqxhr) => {
-                $.getScript(
-                    `${_url_origin}/react/${_path}/js/aliyun-upload/lib/aliyun-oss-sdk-5.3.1.min.js`,
+                `${_url_origin}/react/${_path}/js/aliyun-upload/lib/es6-promise.min.js`,
                 (data, textStatus, jqxhr) => {
                     $.getScript(
-                        `${_url_origin}/react/${_path}/js/aliyun-upload/aliyun-upload-sdk-1.5.0.min.js`,
-                    (data, textStatus, jqxhr) => {
-                    
-                    });
+                        `${_url_origin}/react/${_path}/js/aliyun-upload/lib/aliyun-oss-sdk-5.3.1.min.js`,
+                        (data, textStatus, jqxhr) => {
+                            $.getScript(
+                                `${_url_origin}/react/${_path}/js/aliyun-upload/aliyun-upload-sdk-1.5.0.min.js`,
+                                (data, textStatus, jqxhr) => {
+
+                                });
+                        });
                 });
-            });
         }
 
         $('#fileUpload').on('change', function (e) {
@@ -152,7 +152,7 @@ function AliyunUploaderDemo(props) {
     }, [])
 
     let { source, id, className, type } = props;
-    
+
     function onStop() {
         $('#resumeUpload').attr('disabled', false)
         // $('#pauseUpload').attr('disabled', true)
@@ -163,26 +163,26 @@ function AliyunUploaderDemo(props) {
         // $('#pauseUpload').attr('disabled', false)
         uploader.startUpload()
     }
-    return(
+    return (
         <React.Fragment>
             <div>
                 <input type="file" id="fileUpload"></input>
-                <label class="status">上传状态: <span id="status"></span></label>
+                <label className="status">上传状态: <span id="status"></span></label>
             </div>
-            <div class="upload-type">
+            <div className="upload-type">
                 上传方式一, 使用 UploadAuth 上传:
                 {/* <button id="authUpload" disabled="true">开始上传</button>
                 <button id="pauseUpload" disabled="true" onClick={onStop}>暂停</button>
                 <button id="resumeUpload" disabled="true" onClick={onResume}>恢复上传</button> */}
                 <button id="authUpload" >开始上传</button>
-                <button id="pauseUpload"  onClick={onStop}>暂停</button>
-                <button id="resumeUpload"  onClick={onResume}>恢复上传</button>
-                <span class="progress">上传进度: <i id="auth-progress">0</i> %</span>
+                <button id="pauseUpload" onClick={onStop}>暂停</button>
+                <button id="resumeUpload" onClick={onResume}>恢复上传</button>
+                <span className="progress">上传进度: <i id="auth-progress">0</i> %</span>
                 <span></span>
             </div>
 
         </React.Fragment>
     )
-  
+
 }
 export default AliyunUploaderDemo
\ No newline at end of file
diff --git a/src/common/course/ActionBtn.js b/src/common/course/ActionBtn.js
index 484c85eb..c2e0ea01 100644
--- a/src/common/course/ActionBtn.js
+++ b/src/common/course/ActionBtn.js
@@ -1,7 +1,8 @@
 import React, { Component } from 'react';
-import {Link} from 'react-router-dom'
+import { Link } from 'react-router-dom'
 
-const map={"blue":"blueFull","greyBack":"greyBack","grey":"greyWidthFixed","green":"greenBack",'greyLine':"greyLine",'orangeLine':"orangeLine",
+const map = {
+  "blue": "blueFull", "greyBack": "greyBack", "grey": "greyWidthFixed", "green": "greenBack", 'greyLine': "greyLine", 'orangeLine': "orangeLine",
   'colorBlue': 'colorBlue',   // 蓝字白底
 }
 class ActionBtn extends Component {
@@ -10,17 +11,17 @@ class ActionBtn extends Component {
   }
 
   render() {
-    let{to, children, style, className, ...others}=this.props
-    return(
+    let { to, children, style, className, ...others } = this.props
+    return (
       <React.Fragment>
         {
-          to==undefined ? 
-          <a href="javascript:void(0)" onClick={this.props.onClick} 
-            {...others}
-            className={"Actionbtn "+`${map[style || 'blue']} ${this.props.className}`}
-          >{children}</a>
-          :
-          <Link to={to} className={"btn "+`${map[this.props.style]} ${this.props.className}`} {...others}>{this.props.children}</Link>
+          to == undefined ?
+            <a onClick={this.props.onClick}
+              {...others}
+              className={"Actionbtn " + `${map[style || 'blue']} ${this.props.className}`}
+            >{children}</a>
+            :
+            <Link to={to} className={"btn " + `${map[this.props.style]} ${this.props.className}`} {...others}>{this.props.children}</Link>
         }
       </React.Fragment>
     )
diff --git a/src/common/course/WordsBtn.js b/src/common/course/WordsBtn.js
index 6828cca9..613cc998 100644
--- a/src/common/course/WordsBtn.js
+++ b/src/common/course/WordsBtn.js
@@ -1,28 +1,28 @@
 import React, { Component } from 'react';
-import {Link} from 'react-router-dom'
+import { Link } from 'react-router-dom'
 
-const map={"blue":"colorblue","white":"colorwhite","grey":"colorgrey", 'orange': "color-orange",'colorgrey9':'color-grey-9'}
+const map = { "blue": "colorblue", "white": "colorwhite", "grey": "colorgrey", 'orange': "color-orange", 'colorgrey9': 'color-grey-9' }
 class WordsBtn extends Component {
   constructor(props) {
     super(props);
   }
 
   render() {
-    let{to, href,targets, style2, style, className, ...others }=this.props
-    return(
+    let { to, href, targets, style2, style, className, ...others } = this.props
+    return (
       <React.Fragment>
         {
-          to==undefined&&targets==undefined ?
-          <a href={href || "javascript:void(0)"} onClick={this.props.onClick} className={"btn "+`${map[this.props.style]} ${this.props.className}`}
+          to == undefined && targets == undefined ?
+            <a onClick={this.props.onClick} className={"btn " + `${map[this.props.style]} ${this.props.className || ""}`}
               style={style2} {...others}
-          >{this.props.children}</a>:
-						targets!=undefined? <a href={to} target="_blank" className={"btn "+`${map[this.props.style]} ${this.props.className}`}
+            >{this.props.children}</a> :
+            targets != undefined ? <a href={to} target="_blank" className={"btn " + `${map[this.props.style]} ${this.props.className}`}
               style={style2} {...others}
             >{this.props.children}</a>
-          :
-          <Link to={to} className={"btn "+`${map[this.props.style]} ${this.props.className}`}
-            style={style2} {...others}
-          >{this.props.children}</Link>
+              :
+              <Link to={to} className={"btn " + `${map[this.props.style]} ${this.props.className || ""}`}
+                style={style2} {...others}
+              >{this.props.children}</Link>
         }
       </React.Fragment>
     )
diff --git a/src/common/educoder.js b/src/common/educoder.js
index 2cb074a6..83d2a40c 100644
--- a/src/common/educoder.js
+++ b/src/common/educoder.js
@@ -2,64 +2,72 @@
 
 // export { default as OrderStateUtil } from          '../routes/Order/components/OrderStateUtil';
 
-export { getImageUrl as getImageUrl,getmyUrl as getmyUrl, getRandomNumber as getRandomNumber,getUrl as getUrl, publicSearchs as publicSearchs,getRandomcode as getRandomcode,getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
-	, getUploadActionUrl as getUploadActionUrl,getUploadActionUrltwo as getUploadActionUrltwo ,getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
-	, getTaskUrlById as getTaskUrlById, TEST_HOST ,htmlEncode as htmlEncode ,getupload_git_file as getupload_git_file} from                './UrlTool';
+export {
+	getUploadLogoActionUrl as getUploadLogoActionUrl,
+	getImageUrl as getImageUrl, getmyUrl as getmyUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
+	, getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
+	, getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode, getupload_git_file as getupload_git_file, getcdnImageUrl as getcdnImageUrl
+} from './UrlTool';
 
-export {setmiyah as setmiyah} from './Component';
-export { default as queryString } from                './UrlTool2';
+export { setmiyah as setmiyah } from './Component';
+export { default as queryString } from './UrlTool2';
 
-export { SnackbarHOC as SnackbarHOC } from                './SnackbarHOC';
+export { SnackbarHOC as SnackbarHOC } from './SnackbarHOC';
 
-export { trigger as trigger, on as on, off as off
-	, broadcastChannelPostMessage, broadcastChannelOnmessage } from                './EventUtil';
+export {
+	trigger as trigger, on as on, off as off
+	, broadcastChannelPostMessage, broadcastChannelOnmessage
+} from './EventUtil';
 
-export { updatePageParams as updatePageParams } from                './RouterUtil';
+export { updatePageParams as updatePageParams } from './RouterUtil';
 
-export { bytesToSize as bytesToSize } from                './UnitUtil';
+export { bytesToSize as bytesToSize } from './UnitUtil';
 
-export { markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
-	downloadFile, sortDirections } from 	'./TextUtil'
-export { handleDateString, getNextHalfHourOfMoment,formatDuring } from 	'./DateUtil'
+export {
+	markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
+	downloadFile, sortDirections, validateLength, mdJSONParse, exportMdtoHtml
+} from './TextUtil'
+export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds } from './DateUtil'
 
-export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from 	'./util/ShareUtil'
+export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from './util/ShareUtil'
 
-export { isDev as isDev, isMobile } from 					'./Env'
+export { isDev as isDev, isMobile } from './Env'
 
-export { toStore as toStore, fromStore as fromStore } from 	'./Store'
+export { toStore as toStore, fromStore as fromStore } from './Store'
 
-export { trace_collapse, trace, debug, info, warn, error, trace_c, debug_c, info_c, warn_c, error_c } from 	'./LogUtil'
+export { trace_collapse, trace, debug, info, warn, error, trace_c, debug_c, info_c, warn_c, error_c } from './LogUtil'
 
-export { EDU_ADMIN, EDU_BUSINESS, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER
-	, EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL} from 	'./Const'
+export {
+	EDU_ADMIN, EDU_BUSINESS, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER
+	, EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL
+} from './Const'
 
 
 export { default as AttachmentList } from './components/attachment/AttachmentList'
 
-export { themes, ThemeContext } from 	'./context/ThemeContext'
+export { themes, ThemeContext } from './context/ThemeContext'
 
-export { ModalHOC } from 	'./components/ModalHOC'
+export { ModalHOC } from './components/ModalHOC'
 
-export { SetAppModel } from 	'./components/SetAppModel'
+export { SetAppModel } from './components/SetAppModel'
 
-export { default as LinkAfterLogin } from 	'./components/LinkAfterLogin'
-export { default as Cropper } from 	'./components/Cropper'
-export { default as ConditionToolTip } from 	'./components/ConditionToolTip'
-// export { default as DragValidator } from 	'./components/DragValidator'
+export { default as LinkAfterLogin } from './components/LinkAfterLogin'
+export { default as Cropper } from './components/Cropper'
+export { default as ConditionToolTip } from './components/ConditionToolTip'
 
-export { default as PopInstruction } from 	'./components/instruction/PopInstruction'
+export { default as PopInstruction } from './components/instruction/PopInstruction'
 
-export { default as City } from 	'./components/form/City'
+export { default as City } from './components/form/City'
 
 
 // course
-export { default as WordsBtn } from 	'./course/WordsBtn'
+export { default as WordsBtn } from './course/WordsBtn'
 
 export { default as ActionBtn } from './course/ActionBtn'
 
 export { default as MarkdownToHtml } from './components/markdown/MarkdownToHtml'
 
-export { default as DMDEditor } from './components/markdown/DMDEditor'
+export { default as QuillForEditor } from './quillForEditor'
 
 export { default as Clappr } from './components/media/Clappr'
 export { default as AliyunUploader } from './components/media/AliyunUploader'
@@ -73,5 +81,5 @@ export { CNotificationHOC as CNotificationHOC } from '../modules/courses/common/
 export { default as ModalWrapper } from '../modules/courses/common/ModalWrapper'
 export { default as NoneData } from '../modules/courses/coursesPublic/NoneData'
 
-export {default as WordNumberTextarea} from '../modules/modals/WordNumberTextarea'
+export { default as WordNumberTextarea } from '../modules/modals/WordNumberTextarea'
 
diff --git a/src/common/hooks/ImageLayer2.js b/src/common/hooks/ImageLayer2.js
index 2b1979c7..504e491c 100644
--- a/src/common/hooks/ImageLayer2.js
+++ b/src/common/hooks/ImageLayer2.js
@@ -16,10 +16,10 @@ function ImageLayer2(props) {
         const imageSrc = event.target.src || event.target.getAttribute('src') || event.target.getAttribute('href')
         // 判断imageSrc是否是图片
         const fileName = event.target.innerHTML.trim()
-        if (isImageExtension(imageSrc.trim()) || isImageExtension(fileName) || event.target.tagName == 'IMG' || imageSrc.indexOf('base64,') != -1) {
+        if (isImageExtension((imageSrc && imageSrc.trim())) || isImageExtension(fileName) || event.target.tagName == 'IMG' || (imageSrc && imageSrc.indexOf('base64,')) != -1) {
             // 非回复里的头像图片; 非emoticons
-            if (imageSrc.indexOf('/images/avatars/User') === -1 && 
-                imageSrc.indexOf('kindeditor/plugins/emoticons') === -1 ) {  
+            if (imageSrc.indexOf('/images/avatars/User') === -1 &&
+                imageSrc.indexOf('kindeditor/plugins/emoticons') === -1 ) {
                 setShowImage(true)
                 setImageSrc(imageSrc)
             }
@@ -41,7 +41,7 @@ function ImageLayer2(props) {
     })
 
     return (
-        <ImageLayer showImage={showImage} imageSrc={imageSrc} onImageLayerClose={onImageLayerClose}></ImageLayer>
+      showImage?<ImageLayer showImage={showImage} imageSrc={imageSrc} onImageLayerClose={onImageLayerClose}></ImageLayer>:""
     )
 }
 
diff --git a/src/common/mediator.js b/src/common/mediator.js
new file mode 100644
index 00000000..464a5cbf
--- /dev/null
+++ b/src/common/mediator.js
@@ -0,0 +1,46 @@
+function Mediator(obj) {
+  const channels = {}
+
+  const mediator = {
+    subscribe: function (channel, cb) {
+      if (!channels[channel]) {
+        channels[channel] = []
+      }
+      channels[channel].push(cb)
+      return this.unsubscribe.bind(null, channel, cb)
+    },
+
+    unsubscribe: function (channel, cb) {
+      let rs = channels[channel]
+      let index = -1
+      if (rs) {
+        for (let i = 0; i < rs.length; i++) {
+          if (rs[i].name === cb.name) {
+            index = i
+            break
+          }
+        }
+        if (index >= 0) {
+          channels[channel].splice(index, 1)
+          return true
+        }
+      }
+      return false
+    },
+
+    publish: function (channel) {
+      if (!channels[channel]) {
+        return false
+      }
+      const args = Array.prototype.slice.call(arguments, 1)
+      channels[channel].forEach(subscription => {
+        subscription.apply(null, args)
+      })
+      return this
+    },
+  }
+
+  return obj ? Object.assign(obj, mediator) : mediator
+}
+const mediator = new Mediator()
+export default mediator  
diff --git a/src/common/quillForEditor/FillBlot.js b/src/common/quillForEditor/FillBlot.js
index 5e5e2aa7..d760a452 100644
--- a/src/common/quillForEditor/FillBlot.js
+++ b/src/common/quillForEditor/FillBlot.js
@@ -6,28 +6,27 @@
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-02-05 10:44:01
  */
-import Quill from 'quill';
-let Inline = Quill.import('blots/inline');
-// const BlockEmbed = Quill.import('blots/embed');
-class FillBlot extends Inline {
-  static create (value) {
-    const node = super.cerate(value);
-    // node.classList.add('icon icon-bianji2');
-    // node.setAttribute('data-fill', 'fill');
-    console.log('编辑器值===》》》》》', value);
-    node.setAttribute('data_index', value.data_index);
-    node.nodeValue = value.text; 
+
+import Quill from "quill"
+
+const InlineBlot = Quill.import('blots/inline')
+const Prop = 'data-index'
+class FillBlot extends InlineBlot {
+
+  static create(value) {
+    const node = super.create()
+    node.setAttribute(Prop, value.data_index);
+    node.innerText = value.text;
     return node;
   }
-  
-  static value (node) {
+
+  static value(node) {
     return {
-      // dataSet: node.getAttribute('data-fill'),
-      data_index: node.getAttribute('data_index')
+      fill_index: node.getAttribute(Prop)
     }
   }
-}
 
+}
 
 FillBlot.blotName = "fill";
 FillBlot.tagName = "span";
diff --git a/src/common/quillForEditor/ImageBlot.js b/src/common/quillForEditor/ImageBlot.js
index 5ff84b24..d0fd9fd0 100644
--- a/src/common/quillForEditor/ImageBlot.js
+++ b/src/common/quillForEditor/ImageBlot.js
@@ -1,70 +1,54 @@
 /*
  * @Description: 重写图片
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-12-16 15:50:45
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-31 13:59:02
  */
 import Quill from "quill";
+import mediator from "../mediator";
 
 const BlockEmbed = Quill.import('blots/block/embed');
-
+//stringify 序列化，其中的onclick函数会丢失。
 export default class ImageBlot extends BlockEmbed {
 
   static create(value) {
 
-    const node = super.create();
-    node.setAttribute('alt', value.alt);
-    node.setAttribute('src', value.url);
-    // console.log('~~~~~~~~~~~', node, value);
-    node.addEventListener('click', function () {
-      value.onclick(value.url);
-    }, false);
-    if (value.width) {
-      node.setAttribute('width', value.width);
-    }
-    if (value.height) {
-      node.setAttribute('height', value.height);
-    }
+    const node = super.create()
+    const { alt, url, width, height, id } = value
+
+    node.setAttribute('alt', alt)
+    node.setAttribute('src', url)
 
     if (value.id) {
       node.setAttribute('id', value.id);
     }
-    // 宽度和高度都不存在时，
-    if (!value.width && !value.height) {
-      // node.setAttribute('display', 'block');
-      node.setAttribute('width', '100%');
+
+    node.setAttribute('style', 'max-width: 100%, cursor:pointer');
+    node.onload = function () {
+      node.setAttribute('width', width ? width : this.width)
+      node.setAttribute('height', height ? height : this.height)
     }
 
-    // node.setAttribute('style', { cursor: 'pointer' });
-
-    // if (node.onclick) {
-    //   console.log('image 有图片点击事件======》》》》》》');
-    //   // node.setAttribute('onclick', node.onCLick);
-    // }
-    // 给图片添加点击事件
-    // node.onclick = () => {
-    //   value.onClick && value.onClick(value.url);
-    // }
+    node.addEventListener('click', () => {
+      mediator.publish('on-preview-image', value.url)
+    })
     return node;
   }
 
   // 获取节点值
-  static value (node) {
+  static value(node) {
 
     return {
       alt: node.getAttribute('alt'),
       url: node.getAttribute('src'),
-      onclick: node.onclick,
       width: node.width,
       height: node.height,
-      display: node.getAttribute('display'),
       id: node.id,
-      // style: node.style
     };
   }
 }
 
 ImageBlot.blotName = 'image';
-ImageBlot.tagName = 'img';
\ No newline at end of file
+ImageBlot.tagName = 'img';
diff --git a/src/common/quillForEditor/font.css b/src/common/quillForEditor/font.css
new file mode 100644
index 00000000..08e78a5a
--- /dev/null
+++ b/src/common/quillForEditor/font.css
@@ -0,0 +1,66 @@
+@charset "utf-8";
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimSun]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimSun]::before {
+    content: "宋体";
+    font-family:SimSun !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimHei]::before {
+    content: "黑体";
+    font-family:SimHei !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Microsoft-YaHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Microsoft-YaHei]::before {
+    content: "微软雅黑";
+    font-family:Microsoft YaHei !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=KaiTi]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=KaiTi]::before {
+    content: "楷体";
+    font-family:KaiTi !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=FangSong]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=FangSong]::before {
+    content: "仿宋";
+    font-family:FangSong !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Arial]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Arial]::before {
+    content: "Arial";
+    font-family:Arial !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Times-New-Roman]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Times-New-Roman]::before {
+    content: "Times New Roman";
+    font-family:Times New Roman !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=sans-serif]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=sans-serif]::before {
+    content: "sans-serif";
+    font-family:sans-serif !important;
+}
+
+.ql-font-SimSun {
+    font-family:SimSun !important;
+}
+.ql-font-SimHei {
+    font-family:SimHei !important;
+}
+.ql-font-Microsoft-YaHei {
+    font-family:Microsoft YaHei !important;
+}
+.ql-font-KaiTi {
+    font-family:KaiTi !important;
+}
+.ql-font-FangSong {
+    font-family:FangSong !important;
+}
+.ql-font-Arial {
+    font-family:Arial !important;
+}
+.ql-font-Times-New-Roman {
+    font-family:Times New Roman   !important;
+}
+.ql-font-sans-serif {
+    font-family:sans-serif  !important;
+}
diff --git a/src/common/quillForEditor/index.js b/src/common/quillForEditor/index.js
index 01274314..a34a826c 100644
--- a/src/common/quillForEditor/index.js
+++ b/src/common/quillForEditor/index.js
@@ -1,43 +1,100 @@
-/*
- * @Description: quill 编辑器
- * @Author: tangjiang
- * @Github:
- * @Date: 2019-12-18 08:49:30
- * @LastEditors  : tangjiang
- * @LastEditTime : 2020-02-05 11:23:03
- */
-import './index.scss';
-import 'quill/dist/quill.core.css'; // 核心样式
-import 'quill/dist/quill.snow.css'; // 有工具栏
-import 'quill/dist/quill.bubble.css'; // 无工具栏
-import 'katex/dist/katex.min.css'; // katex 表达式样式
-import React, { useState, useRef, useEffect } from 'react';
-import Quill from 'quill';
-import katex from 'katex';
-import deepEqual from './deepEqual.js'
-import { fetchUploadImage } from '../../services/ojService.js';
-import { getImageUrl } from 'educoder'
-import ImageBlot from './ImageBlot';
-import FillBlot from './FillBlot';
-const Size = Quill.import('attributors/style/size');
-const Font = Quill.import('formats/font');
-// const Color = Quill.import('attributes/style/color');
-Size.whitelist = ['12px', '14px', '16px', '18px', '20px', false];
-Font.whitelist = ['SimSun', 'SimHei','Microsoft-YaHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif'];
+import './index.scss'
+import 'quill/dist/quill.core.css' // 核心样式
+import 'quill/dist/quill.snow.css' // 有工具栏
+import 'quill/dist/quill.bubble.css' // 无工具栏
+import './font.css'
+import React, { useState, useRef, useEffect } from 'react'
+import Quill from 'quill'
+import katex from 'katex'
 
+import { fetchUploadImage } from '../../services/ojService.js'
+import { getImageUrl } from 'educoder'
+import ImageBlot from './ImageBlot'
+import FillBlot from './FillBlot'
+import LinkBlot from './link-blot'
+import mediator from '../mediator'
+import { defaultQuillOpt } from '../components/custom-editor'
+
+let Size = Quill.import('attributors/style/size')
+Size.whitelist = ['14px', '16px', '18px', '20px', false]
+let fonts = ['Microsoft-YaHei', 'SimSun', 'SimHei', 'KaiTi', 'FangSong']
+let Font = Quill.import('formats/font')
+
+Font.whitelist = fonts; //将字体加入到白名单
 window.Quill = Quill;
 window.katex = katex;
 Quill.register(ImageBlot);
 Quill.register(Size);
+Quill.register(LinkBlot);
 Quill.register(Font, true);
-// Quill.register({'modules/toolbar': Toolbar});
-Quill.register({
-  'formats/fill': FillBlot
-});
-// Quill.register(Color);
 
+Quill.register(FillBlot)
 
-function QuillForEditor ({
+const FillStr = '▁'
+const FillReg = new RegExp(FillStr, 'g')
+const BRSTR = '<p><br></p>'
+
+//hack 
+function quillSetValue(el, value) {
+  if (value && value.hasOwnProperty('ops')) {
+    el.setContents(value)
+  } else {
+    if (value) {
+      let rs = value
+      if (rs.endsWith(BRSTR)) {
+        rs += BRSTR
+      }
+      el.clipboard.dangerouslyPasteHTML(rs);
+    }
+  }
+}
+
+const BUTTONTIP = {
+  'bold': '加粗',
+  'strike': '删除线',
+  'italic': '斜体',
+  'underline': '下划线',
+  'ordered': '有序列表',
+  'bullet': '无序列表',
+  'color': '字体颜色',
+  'background': '背景色',
+  'sub': '下标',
+  'super': '上标',
+  'image': '上传图片',
+  'code-block': '代码块',
+  'formula': '公式',
+  'clean': '清除格式',
+  'fill': '插入填空项',
+  'align': '对齐',
+  'header1': '标题一',
+  'header2': '标题二',
+  'header3': '标题三',
+  'header4': '标题四',
+  'header5': '标题五',
+  'header6': '标题六'
+}
+function insertAfter(newNode, referenceNode) {
+  referenceNode.parentNode.insertBefore(newNode, referenceNode.nextSibling);
+}
+
+function initButtonTip(el) {
+  const container = el.getModule('toolbar').container
+  const btns = container.querySelectorAll('.ql-formats > button,.ql-formats>span')
+  Array.from(btns).forEach(btn => {
+    let value = btn.getAttribute('value')
+    let cls = btn.classList[0].replace('ql-', '')
+    btn.setAttribute('title', BUTTONTIP[value || cls] || BUTTONTIP[`${cls}${value}`])
+    if (cls === 'fill') {
+      let span = document.createElement('span')
+      span.setAttribute('class', 'fill-tip')
+      span.innerText = '点击插入填空项'
+      span.addEventListener('click', () => { btn.click() })
+      insertAfter(span, btn)
+    }
+  })
+}
+export default ({
+  defaultValue,
   placeholder,
   readOnly,
   autoFocus = false,
@@ -48,46 +105,16 @@ function QuillForEditor ({
   wrapStyle = {},
   showUploadImage,
   onContentChange,
-  addFill, // 点击填空成功的回调
-  deleteFill // 删除填空，返回删除的下标
-  // getQuillContent
-}) {
-  // toolbar 默认值
-  const defaultConfig = [
-    'bold', 'italic', 'underline',
-    {size: ['12px', '14px', '16px', '18px', '20px']},
-    {align: []}, {list: 'ordered'}, {list: 'bullet'}, // 列表
-    {script: 'sub'}, {script: 'super'},
-    { 'color': [] }, { 'background': [] },
-    {header: [1,2,3,4,5,false]},
-    'blockquote', 'code-block',
-    'link', 'image', 'video',
-    'formula',
-    'clean'
-  ];
+  className,
+  onAddFill,
+  onDeleteFill
+}) => {
 
-  const editorRef = useRef(null);
+  const editorRef = useRef(null)
   // quill 实例
-  const [quill, setQuill] = useState(null);
-  const [selection, setSelection] = useState(null);
-  const [fillCount, setFillCount] = useState(0);
-  const [quillCtx, setQuillCtx] = useState({});
-
-  // 文本内容变化时
-  const handleOnChange = content => {
-    // getQuillContent && getQuillContent(quill);
-    onContentChange && onContentChange(content, quill);
-  };
-
-  const renderOptions = options || defaultConfig;
+  const [quill, setQuill] = useState(null)
 
   const bindings = {
-    tab: {
-      key: 9,
-      handler: function () {
-        console.log('调用了tab=====>>>>');
-      }
-    },
     backspace: {
       key: 'Backspace',
       /**
@@ -98,183 +125,150 @@ function QuillForEditor ({
        * @param {*} context 上下文
        */
       handler: function (range, context) {
-        /**
-         * index: 删除元素的位置 
-         * length: 删除元素的个数
-         */
-        const {index, length} = range;
-        const _start = length === 0 ? index - 1 : index;
-        const _length = length || 1;
-        let delCtx = this.quill.getText(_start, _length); // 删除的元素
-        // aa
-        const reg = /▁/g;
-        const delArrs = delCtx.match(reg);
+        const [index, delArrs] = getFillInfo(range, this.quill)
         if (delArrs) {
-          const r = window.confirm('确定要删除吗?');
-          if (r) {
-            let leaveCtx; // 获取删除元素之前的内容
-            if (length === 0) {
-              leaveCtx = this.quill.getText(0, index - 1);
-            } else {
-              leaveCtx = this.quill.getText(0, index);
-            }
-            const leaveArrs = leaveCtx.match(reg);
-            const leaveLen = (leaveArrs || []).length;
-            let delIndexs = [];
-            // 获取删除元素的下标
-            delArrs.forEach((item, i) => {
-              leaveLen === 0 ? delIndexs.push(i) : delIndexs.push(leaveLen + i); 
-            });
-            deleteFill && deleteFill(delIndexs); // 调用删除回调, 返回删除的元素下标[]
+          if (window.confirm('确定要删除这个填空吗?')) {
+            onDeleteFill && onDeleteFill(index, delArrs.length) // 调用删除回调, 返回删除的元素下标[]
             return true
           } else {
-            return false;
+            return false
           }
         }
-        return true;
+        return true
       }
     }
-  };
-  // quill 配置信息
+  }
   const quillOption = {
     modules: {
-      toolbar: renderOptions,
+      toolbar: options || defaultQuillOpt,
+      'syntax': false,
       keyboard: {
         bindings: bindings
       }
-      // toolbar: {
-      //   container: renderOptions
-      // }
     },
     readOnly,
     placeholder,
     theme: readOnly ? 'bubble' : 'snow',
-  };
+  }
 
+  //返回当前选中文件之前填空的索引，和选中的文本内有多少个填空
+  function getFillInfo(range, quill) {
+    const { index, length } = range
+    const start = length === 0 ? index - 1 : index
+    const selectionText = quill.getText(start, Math.max(1, length))
+    const beforeSelectionText = quill.getText(0, start)
+    return [(beforeSelectionText.match(FillReg) || []).length, selectionText.match(FillReg)]
+  }
 
   useEffect(() => {
-
-    const quillNode = document.createElement('div');
-    editorRef.current.appendChild(quillNode);
-    const _quill = new Quill(editorRef.current, quillOption);
-
-    setQuill(_quill);
+    const quillInstance = new Quill(editorRef.current, quillOption)
+    setQuill(quillInstance)
     // 处理图片上传功能
-    _quill.getModule('toolbar').addHandler('image', (e) => {
-      const input = document.createElement('input');
-      input.setAttribute('type', 'file');
-      input.setAttribute('accept', 'image/*');
-      input.click();
-
+    quillInstance.getModule('toolbar').addHandler('image', (e) => {
+      const input = document.createElement('input')
+      input.setAttribute('type', 'file')
+      input.setAttribute('accept', 'image/*')
+      input.click()
       input.onchange = async (e) => {
-        const file = input.files[0]; // 获取文件信息
-        const formData = new FormData();
-        formData.append('file', file);
+        const file = input.files[0] // 获取文件信息
+        const formData = new FormData()
+        formData.append('file', file)
 
-        const range = _quill.getSelection(true);
-        let fileUrl = ''; // 保存上传成功后图片的url
-        // 上传文件
-        const result = await fetchUploadImage(formData);
+        const range = quillInstance.getSelection(true)
+        let fileUrl = '' // 保存上传成功后图片的url
+
+        const result = await fetchUploadImage(formData)
         // 获取上传图片的url
         if (result.data && result.data.id) {
-          fileUrl = getImageUrl(`api/attachments/${result.data.id}`);
+          fileUrl = getImageUrl(`api/attachments/${result.data.id}`)
         }
-        // 根据id获取文件路径
-        const { width, height } = imgAttrs;
-        // console.log('上传图片的url:', fileUrl);
+        const { width, height } = imgAttrs
         if (fileUrl) {
-          _quill.insertEmbed(range.index, 'image', {
+          let imgOption = {
             url: fileUrl,
             alt: '图片信息',
-            onClick: showUploadImage,
             width,
             height
-          });
+          }
+          quillInstance.insertEmbed(range.index, 'image', imgOption)
         }
       }
-    });
-    // 处理填空
-    _quill.getModule('toolbar').addHandler('fill', (e) => {
-      // alert(1111);
-      setFillCount(fillCount + 1);
-      const range = _quill.getSelection(true);
-      _quill.insertText(range.index, '▁');
-      addFill && addFill(); // 调用添加回调
-    });
-  }, []);
+    })
+    quillInstance.getModule('toolbar').addHandler('fill', (e) => {
+      const range = quillInstance.getSelection(true)
+      const [fillIndex, _] = getFillInfo(range, quillInstance)
+      quillInstance.insertEmbed(range.index, 'fill', { "data-index": fillIndex, text: FillStr })
+      quillInstance.setSelection(quillInstance.getLength(), 0, 'api')
+      onAddFill && onAddFill(fillIndex) // 调用添加回调
+    })
 
-  // 设置值
-  useEffect(() => {
-    if (!quill) return
+    initButtonTip(quillInstance)
 
-    const previous = quill.getContents()
+    quillSetValue(quillInstance, value)
 
-    if (value && value.hasOwnProperty('ops')) {
-      // console.log(value.ops);
-      const ops = value.ops || [];
-      ops.forEach((item, i) => {
-        if (item.insert['image']) {
-          item.insert['image'] = Object.assign({}, item.insert['image'], {style: { cursor: 'pointer' }, onclick: (url) => showUploadImage(url)});
-        }
-      });
+    if (autoFocus) {
+      quillInstance.focus()
     }
 
-    const current = value
-    if (!deepEqual(previous, current)) {
-      setSelection(quill.getSelection())
-      if (typeof value === 'string' && value) {
-      	// debugger
-        quill.clipboard.dangerouslyPasteHTML(value, 'api');
-        if (autoFocus) {
-          quill.focus();
-        } else {
-          quill.blur();
-        }
-      } else {
-        quill.setContents(value)
-        if (autoFocus) quill.focus();
+    function onPreview(url) {
+      if (showUploadImage) {
+        showUploadImage(url)
       }
     }
-  }, [quill, value, setQuill, autoFocus]);
 
-  // 清除选择区域
-  useEffect(() => {
-    if (quill && selection) {
-      quill.setSelection(selection)
-      setSelection(null)
-    }
-  }, [quill, selection, setSelection]);
-
-  // 设置placeholder值
-  useEffect(() => {
-    if (!quill || !quill.root) return;
-    quill.root.dataset.placeholder = placeholder;
-  }, [quill, placeholder]);
-
-  // 处理内容变化
-  useEffect(() => {
-    if (!quill) return;
-    if (typeof handleOnChange !== 'function') return;
-    let handler;
-    quill.on(
-      'text-change',
-      (handler = (delta, oldDelta, source) => {
-        const _ctx = quill.getContents();
-        setQuillCtx(_ctx);
-        handleOnChange(quill.getContents()); // getContents: 检索编辑器内容
-      })
-    );
+    let unsub = mediator.subscribe('on-preview-image', onPreview)
     return () => {
-      quill.off('text-change', handler);
+      unsub()
     }
-  }, [quill, handleOnChange]);
+  }, [])
+
+  useEffect(() => {
+    if (quill) {
+      if (readOnly === true) {
+        quill.enable(false)
+      } else {
+        quill.enable(true)
+      }
+    }
+  }, [quill, readOnly])
+
+  useEffect(() => {
+    quillSetValue(quill, defaultValue)
+  }, [quill, defaultValue])
+
+  useEffect(() => {
+    if (quill) {
+      quill.root.dataset.placeholder = placeholder;
+    }
+  }, [quill, placeholder])
+
+  useEffect(() => {
+    if (quill) {
+      autoFocus ? quill.focus() : quill.blur()
+    }
+  }, [quill, autoFocus])
+
+  useEffect(() => {
+    if (quill && onContentChange) {
+      function onChangeHandler(delta, oldDelta, source) {
+        let html = editorRef.current.children[0].innerHTML
+        let text = quill.getText()
+        if (html === '<p><br></p>') html = ''
+        if (onContentChange) {
+          onContentChange(quill.getContents(), html, { quill, text, delta, oldDelta, source })
+        }
+      }
+      quill.on('text-change', onChangeHandler)
+      return () => {
+        quill.off('text-change', onChangeHandler)
+      }
+    }
+  }, [quill, onContentChange])
 
   // 返回结果
   return (
-      <div className='quill_editor_for_react_area' style={wrapStyle}>
-        <div ref={editorRef} style={style}></div>
-      </div>
-  );
-}
-
-export default QuillForEditor;
+    <div className={`quill_editor_for_react_area ${className} `} style={wrapStyle}>
+      <div ref={editorRef} style={style}></div>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/src/common/quillForEditor/index.scss b/src/common/quillForEditor/index.scss
index dd4eb034..bb14e7ed 100644
--- a/src/common/quillForEditor/index.scss
+++ b/src/common/quillForEditor/index.scss
@@ -1,132 +1,200 @@
-.quill_editor_for_react_area{
+.quill_editor_for_react_area {
+
   // background: #fff;
   // margin: 0 15px;
-  .ql-editing{
+  .ql-editing {
     left: 0 !important;
   }
-  .ql-editor{
-    img{
+
+  .ql-editor {
+    img {
       cursor: pointer;
     }
   }
+
   .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="12px"]::before,
   .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="12px"]::before {
-      content: '12px';
-      font-size: 12px;
+    content: '12px';
+    font-size: 12px;
   }
+
   .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="14px"]::before,
   .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="14px"]::before {
-      content: '14px';
-      font-size: 14px;
+    content: '14px';
+    font-size: 14px;
   }
+
   .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="16px"]::before,
   .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="16px"]::before {
-      content: '16px';
-      font-size: 16px;
+    content: '16px';
+    font-size: 16px;
   }
+
   .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="18px"]::before,
   .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="18px"]::before {
-      content: '18px';
-      font-size: 18px;
+    content: '18px';
+    font-size: 18px;
   }
+
   .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="20px"]::before,
   .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="20px"]::before {
-      content: '20px';
-      font-size: 20px;
+    content: '20px';
+    font-size: 20px;
   }
+
   //默认的样式
   .ql-snow .ql-picker.ql-size .ql-picker-label::before,
   .ql-snow .ql-picker.ql-size .ql-picker-item::before {
-      content: '14px';
-      font-size: 14px;
-  }  
+    content: '14px';
+    font-size: 14px;
+  }
 
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimSun]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimSun]::before {
-      content: "宋体";
-      font-family: "SimSun";
+    content: "宋体";
+    font-family: "SimSun";
   }
+
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimHei]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimHei]::before {
     content: "黑体";
     font-family: "SimHei";
   }
+
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Microsoft-YaHei]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Microsoft-YaHei]::before {
     content: "微软雅黑";
     font-family: "Microsoft YaHei";
   }
+
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=KaiTi]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=KaiTi]::before {
     content: "楷体";
     font-family: "KaiTi";
   }
+
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=FangSong]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=FangSong]::before {
     content: "仿宋";
     font-family: "FangSong";
   }
+
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Arial]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Arial]::before {
     content: "Arial";
     font-family: "Arial";
   }
+
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Times-New-Roman]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Times-New-Roman]::before {
     content: "Times New Roman";
     font-family: "Times New Roman";
   }
+
   .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=sans-serif]::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=sans-serif]::before {
     content: "sans-serif";
     font-family: "sans-serif";
   }
-  
+
   .ql-font-SimSun {
-      font-family: "SimSun";
+    font-family: "SimSun";
   }
+
   .ql-font-SimHei {
-      font-family: "SimHei";
+    font-family: "SimHei";
   }
+
   .ql-font-Microsoft-YaHei {
-      font-family: "Microsoft YaHei";
+    font-family: "Microsoft YaHei";
   }
+
   .ql-font-KaiTi {
-      font-family: "KaiTi";
+    font-family: "KaiTi";
   }
+
   .ql-font-FangSong {
-      font-family: "FangSong";
+    font-family: "FangSong";
   }
+
   .ql-font-Arial {
-      font-family: "Arial";
+    font-family: "Arial";
   }
+
   .ql-font-Times-New-Roman {
-      font-family: "Times New Roman";
+    font-family: "Times New Roman";
   }
+
   .ql-font-sans-serif {
-      font-family: "sans-serif";
+    font-family: "sans-serif";
   }
 
   .ql-snow .ql-picker.ql-font .ql-picker-label::before,
   .ql-snow .ql-picker.ql-font .ql-picker-item::before {
     content: "微软雅黑";
     font-family: "Microsoft YaHei";
-  } 
+  }
 
   // 填空图标
-  .ql-snow .ql-fill{
+  .ql-snow .ql-fill {
     display: inline-block;
     position: relative;
     color: #05101A;
     // font-size: 18px;
     vertical-align: top;
-    &::before{
+
+    &::before {
       position: absolute;
       left: 50%;
       top: -1px;
-      content: '\e709';
+      content: '\e691';
       font-family: 'iconfont';
       margin-left: -7px;
     }
   }
+
+  //块点不动
+  .ql-toolbar .ql-formats .ql-code-block svg {
+    pointer-events: none;
+  }
+}
+
+.fill-tip {
+  cursor: pointer;
+  font-size: 12px;
+  display: inline-block;
+  padding: 5px;
+  border: 1px solid #eaeaea;
+  border-radius: 5px;
+  box-sizing: border-box;
+  line-height: 16px;
+  color: #666;
+  position: relative;
+  justify-content: center;
+  margin-left: 10px;
+
+  &::before {
+    content: ' ';
+    width: 0;
+    height: 0;
+    border-top: 6px solid transparent;
+    border-bottom: 6px solid transparent;
+    border-right: 6px solid #fff;
+    position: absolute;
+    left: -6px;
+    top: 6px;
+    z-index: 10;
+  }
+
+  &::after {
+    content: ' ';
+    width: 0;
+    height: 0;
+    border-top: 6px solid transparent;
+    border-bottom: 6px solid transparent;
+    border-right: 6px solid #cccbcb;
+    position: absolute;
+    left: -7px;
+    top: 6px;
+  }
 }
\ No newline at end of file
diff --git a/src/common/quillForEditor/link-blot.js b/src/common/quillForEditor/link-blot.js
new file mode 100644
index 00000000..8f508dd3
--- /dev/null
+++ b/src/common/quillForEditor/link-blot.js
@@ -0,0 +1,21 @@
+import Quill from "quill";
+const Inline = Quill.import('blots/inline');
+
+export default class LinkBlot extends Inline {
+  static create(value) {
+    let node = super.create()
+    let rs = value
+    if (rs.indexOf('http://') < 0) {
+      rs = 'http://' + rs
+    }
+    node.setAttribute('href', rs)
+    node.setAttribute('target', '_blank')
+    return node;
+  }
+
+  static formats(node) {
+    return node.getAttribute('href');
+  }
+}
+LinkBlot.blotName = 'link'
+LinkBlot.tagName = 'a'
\ No newline at end of file
diff --git a/src/common/quillForEditor/quill.core.css b/src/common/quillForEditor/quill.core.css
new file mode 100644
index 00000000..516e388b
--- /dev/null
+++ b/src/common/quillForEditor/quill.core.css
@@ -0,0 +1,18 @@
+.ql-editor .ql-font-Microsoft-YaHei {
+    font-family: "Microsoft YaHei";
+}
+.ql-editor .ql-font-SimSun {
+    font-family: "SimSun";
+}
+.ql-editor .ql-font-SimHei {
+    font-family: "SimHei";
+}
+.ql-editor .ql-font-KaiTi {
+    font-family: "KaiTi";
+}
+.ql-editor .ql-font-Arial {
+    font-family: "Arial";
+}
+.ql-editor .Times-New-Roman {
+    font-family: "Times New Roman";
+}
diff --git a/src/common/quillForEditor/quill.snow.css b/src/common/quillForEditor/quill.snow.css
new file mode 100644
index 00000000..962b40f9
--- /dev/null
+++ b/src/common/quillForEditor/quill.snow.css
@@ -0,0 +1,28 @@
+.ql-snow .ql-picker.ql-font .ql-picker-label::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item::before {
+    content: '微软雅黑';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Microsoft-YaHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Microsoft-YaHei]::before {
+    content: "微软雅黑";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimSun]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimSun]::before {
+    content: "宋体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimHei]::before {
+    content: "黑体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=KaiTi]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=KaiTi]::before {
+    content: "楷体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Arial]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Arial]::before {
+    content: "Arial";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Times-New-Roman]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Times-New-Roman]::before {
+    content: "Times New Roman";
+}
diff --git a/src/common/reactQuill/ImageBlot.js b/src/common/reactQuill/ImageBlot.js
deleted file mode 100644
index 091bd2c1..00000000
--- a/src/common/reactQuill/ImageBlot.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * @Description: 重写图片
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-16 15:50:45
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-17 16:44:48
- */
-import Quill from "quill";
-
-const BlockEmbed = Quill.import('blots/block/embed');
-
-export default class ImageBlot extends BlockEmbed {
-
-  static create(value) {
-
-    const node = super.create();
-
-    node.setAttribute('alt', value.alt);
-    node.setAttribute('src', value.url);
-    
-    if (value.width) {
-      node.setAttribute('width', value.width);
-    }
-    if (value.height) {
-      node.setAttribute('height', value.height);
-    }
-    // 宽度和高度都不存在时，
-    if (!value.width && !value.height) {
-      node.setAttribute('display', 'block');
-      node.setAttribute('width', '100%');
-    }
-    // 给图片添加点击事件
-    node.onclick = () => {
-      value.onClick && value.onClick(value.url);
-    }
-    return node;
-  }
-
-  static value (node) {
-
-    return {
-      alt: node.getAttribute('alt'),
-      url: node.getAttribute('src'),
-      onclick: node.onclick,
-      // width: node.width,
-      // height: node.height,
-      display: node.getAttribute('display')
-    };
-  }
-}
-
-ImageBlot.blotName = 'image';
-ImageBlot.tagName = 'img';
\ No newline at end of file
diff --git a/src/common/reactQuill/ReactQuill.js b/src/common/reactQuill/ReactQuill.js
deleted file mode 100644
index 1b420940..00000000
--- a/src/common/reactQuill/ReactQuill.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * @Description: 
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-09 09:09:42
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-18 08:46:20
- */
-import 'quill/dist/quill.core.css'; // 核心样式
-import 'quill/dist/quill.snow.css'; // 有工具栏
-import 'quill/dist/quill.bubble.css'; // 无工具栏
-import 'katex/dist/katex.min.css'; // katex 表达式样式
-import React, { useState, useReducer, useEffect } from 'react';
-import useQuill from './useQuill';
-
-function ReactQuill ({
-  disallowColors,  // 不可见时颜色
-  placeholder, // 提示信息
-  uploadImage, // 图片上传
-  onChange, // 内容变化时
-  options, // 配置信息 
-  value, // 显示的内容
-  style,
-  showUploadImage // 显示上传图片
-}) {
-
-  const [element, setElement] = useState(); // quill 渲染节点
-
-  useQuill({
-    disallowColors,
-    placeholder,
-    uploadImage,
-    onChange,
-    options,
-    value,
-    showUploadImage,
-    element
-  });
-
-  return (
-    <div className='react_quill_area' ref={setElement} style={style}/>
-  );
-}
-
-export default ReactQuill;
diff --git a/src/common/reactQuill/deepEqual.js b/src/common/reactQuill/deepEqual.js
deleted file mode 100644
index 6f2b276b..00000000
--- a/src/common/reactQuill/deepEqual.js
+++ /dev/null
@@ -1,47 +0,0 @@
-function deepEqual (prev, current) {
-  if (prev === current) { // 基本类型比较，值，类型都相同 或者同为 null or undefined
-    return true;
-  }
-
-  if ((!prev && current) 
-    || (prev && !current)
-    || (!prev && !current)
-  ) {
-    return false;
-  }
-
-  if (Array.isArray(prev)) {
-    if (!Array.isArray(current)) return false;
-    if (prev.length !== current.length) return false;
-    
-    for (let i = 0; i < prev.length; i++) {
-      if (!deepEqual(current[i], prev[i])) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  if (typeof current === 'object') {
-    if (typeof prev !== 'object') return false;
-    const prevKeys = Object.keys(prev);
-    const curKeys = Object.keys(current);
-
-    if (prevKeys.length !== curKeys.length) return false;
-
-    prevKeys.sort();
-    curKeys.sort();
-
-    for (let i = 0; i < prevKeys.length; i++) {
-      if (prevKeys[i] !== curKeys[i]) return false;
-      const key = prevKeys[i];
-      if (!deepEqual(prev[key], current[key])) return false;
-    }
-
-    return true;
-  }
-
-  return false;
-}
-
-export default deepEqual;
diff --git a/src/common/reactQuill/flatten.js b/src/common/reactQuill/flatten.js
deleted file mode 100644
index 237cb543..00000000
--- a/src/common/reactQuill/flatten.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * @Description: 将多维数组转变成一维数组
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-09 09:35:01
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-16 11:36:22
- */
-function flatten (array) {
-  return flatten.rec(array, []);
-}
-
-flatten.rec = function flatten (array, result) {
-
-  for (let item of array) {
-    if (Array.isArray(item)) {
-      flatten(item, result);
-    } else {
-      result.push(item);
-    }
-  }
-
-  return result;
-}
-
-export default flatten;
diff --git a/src/common/reactQuill/index.js b/src/common/reactQuill/index.js
deleted file mode 100644
index 56a1a8d1..00000000
--- a/src/common/reactQuill/index.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * @Description: 入口文件
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-17 10:41:48
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-17 20:34:40
- */
-import React, { useState, useCallback, useEffect } from 'react';
-import ReactQuill from './lib';
-
-function Wrapper (props) {
-  // 默认工具栏配置项
-  const toolbarConfig = [
-    ['bold', 'italic', 'underline'],
-    [{align: []}, {list: 'ordered'}, {list: 'bullet'}], // 列表
-    [{script: 'sub'}, {script: 'super'}],
-    [{header: [1,2,3,4,5,false]}],
-    ['blockquote', 'code-block'],
-    ['link', 'image', 'video'],
-    ['formula'],
-    ['clean']
-  ];
-  
-  const [placeholder] = useState(props.placeholder || 'placeholder');
-  const [disableBold] = useState(false);
-  const [value, setValue] = useState(props.value || '');
-  const [toolbar, setToolbar] = useState(toolbarConfig);
-  const [theme, setTheme] = useState(props.theme || 'snow');
-  const [readOnly] = useState(props.readOnly || false);
-
-  const {
-    onContentChagne, // 当编辑器内容变化时调用该函数
-    showUploadImage, // 显示上传图片, 返回url，主要用于点击图片放大
-  } = props;
-
-  // 配置信息
-  const options = {
-    modules: {
-      toolbar: toolbar,
-      clipboard: {
-        matchVisual: false
-      }
-    },
-    readOnly: readOnly,
-    theme: theme
-  }
-  // 配置信息  
-  useEffect (() => {
-    if (props.options) {
-      setToolbar(props.options);
-    }
-    setTheme(props.theme || 'snow');
-    setValue(props.value);
-  }, [props]);
-
-  // 当内容变化时
-  const handleOnChange = useCallback(
-    contents => {
-      if (disableBold) {
-        setValue({
-          ops: contents.ops.map(x => {
-            x = {...x};
-            if (x && x.attributes && x.attributes.bold) {
-              x.attributes = { ...x.attributes };
-              delete x.attributes.bold;
-              if (!Object.keys(x.attributes).length) {
-                delete x.attributes;
-              }
-            }
-            return x;
-          })
-        });
-      } else {
-        setValue(contents);
-      }
-      onContentChagne && onContentChagne(contents);
-    }, [disableBold]
-  );
-
-  // 图片上传
-  const handleUploadImage = (files) => {
-    console.log('选择的图片信息', files);
-  }
-
-  // 显示图片
-  const handleShowUploadImage = (url) => {
-    // console.log('上传的图片url:', url);
-    showUploadImage && showUploadImage(url);
-  }
-
-  return (
-    <React.Fragment>
-      <ReactQuill 
-        value={value}
-        style={props.style}
-        onChange={handleOnChange}
-        placeholder={`${placeholder}`}
-        options={options}
-        uploadImage={handleUploadImage}
-        showUploadImage={(url) => handleShowUploadImage(url)}
-      />
-    </React.Fragment>
-  );
-}
-
-export default Wrapper;
-// ReactDOM.render(<Wrapper />, document.querySelector('#root'));
diff --git a/src/common/reactQuill/index.scss b/src/common/reactQuill/index.scss
deleted file mode 100644
index b6da52bf..00000000
--- a/src/common/reactQuill/index.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-#quill-toolbar{
-  .quill-btn{
-    vertical-align: middle;
-  }
-  .quill_image{
-    display: inline-block;
-    position: relative;
-    vertical-align: middle;
-    width: 28px;
-    height: 24px;
-    overflow: hidden;
-    .image_input{
-      position: absolute;
-      left: 0;
-      right: 0;
-      top: 0;
-      bottom: 0;
-      opacity: 0;
-    }
-    .ql-image{
-      position: relative;
-      left: 0;
-      top: 0;
-    }
-  }
-}
-
-.react_quill_area{
-  .ql-toolbar:not(:last-child) {
-    display: none;
-  }
-}
\ No newline at end of file
diff --git a/src/common/reactQuill/lib.js b/src/common/reactQuill/lib.js
deleted file mode 100644
index 430a95bb..00000000
--- a/src/common/reactQuill/lib.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * @Description: 导出 ReactQuill
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-09 09:08:24
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-16 11:37:13
- */
-import ReactQuill from './ReactQuill';
-import useQuill from './useQuill';
-
-export default ReactQuill;
-export { useQuill };
diff --git a/src/common/reactQuill/useDeepEqualMemo.js b/src/common/reactQuill/useDeepEqualMemo.js
deleted file mode 100644
index 948e2178..00000000
--- a/src/common/reactQuill/useDeepEqualMemo.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * @Description: 
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-12 19:48:55
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-16 11:38:16
- */
-import { useState, useEffect } from 'react';
-import deepEqual from './deepEqual';
-
-function useDeepEqual (input) {
-
-  const [value, setValue] = useState(input);
-
-  useEffect(() => {
-
-    if (!deepEqual(input, value)) {
-      setValue(input)
-    }
-    
-  }, [input, value]);
-
-  return value;
-}
-
-export default useDeepEqual;
diff --git a/src/common/reactQuill/useMountQuill.js b/src/common/reactQuill/useMountQuill.js
deleted file mode 100644
index c2313c48..00000000
--- a/src/common/reactQuill/useMountQuill.js
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * @Description: 创建 reactQuill实例
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-09 09:31:42
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-17 20:42:05
- */
-import Quill from 'quill'; // 导入quill
-import { useState, useEffect, useMemo } from 'react';
-import flatten from './flatten.js';
-import useDeepEqualMemo from './useDeepEqualMemo';
-import Katex from 'katex';
-import ImageBlot from './ImageBlot';
-import { fetchUploadImage } from '../../services/ojService.js';
-import { getImageUrl } from 'educoder'
-window.katex = Katex;
-
-Quill.register(ImageBlot);
-
-function useMountQuill ({
-  element,
-  options: passedOptions,
-  uploadImage,
-  showUploadImage,
-  imgAttrs = {} // 指定图片的宽高属性
-}) {
-
-  // 是否引入 katex
-  const [katexLoaded, setKatexLoaded] = useState(Boolean(window.katex))
-  const [quill, setQuill] = useState(null);
-
-  const options = useDeepEqualMemo(passedOptions);
-  console.log('use mount quill: ', passedOptions);
-
-  // 判断options中是否包含公式
-  const requireKatex = useMemo(() => {
-    return flatten(options.modules.toolbar).includes('formula');
-  }, [options]);
-
-  // 加载katex
-  useEffect(() => {
-    if (!requireKatex) return;
-    if (katexLoaded) return;
-
-    const interval = setInterval(() => {
-      if (window.katex) {
-        setKatexLoaded(true);
-        clearInterval(interval); 
-      }
-    });
-
-    return () => { // 定义回调清除定时器
-      clearInterval(interval);
-    }
-
-  }, [
-    setKatexLoaded,
-    katexLoaded,
-    requireKatex
-  ]);
-
-  // 加载 quill
-  useEffect(() => {
-    if (!element) return;
-    if (requireKatex && !katexLoaded) {
-      element.innerHTML = `
-        <div style="color: #ddd">
-          Loading Katex...
-        </div>
-      `
-    }
-    // 清空内容
-    element.innerHTML = '';
-    console.log(element);
-    // 创建 quill 节点
-    const quillNode = document.createElement('div');
-    element.appendChild(quillNode);  // 将quill节点追回到 element 元素中
-
-    const quill = new Quill(element, options);
-    setQuill(quill);
-    // 加载上传图片功能
-    if (typeof uploadImage === 'function') {
-      quill.getModule('toolbar').addHandler('image', (e) => {
-        // 创建type类型输入框加载本地图片
-        const input = document.createElement('input');
-        input.setAttribute('type', 'file');
-        input.setAttribute('accept', 'image/*');
-        input.click();
-
-        input.onchange = async (e) => {
-          const file = input.files[0]; // 获取文件信息
-          const formData = new FormData();
-          formData.append('file', file);
-
-          // const reader = new FileReader();
-          // reader.readAsDataURL(file);
-          // console.log('文件信息===>>', reader);
-          // reader.onload = function (e) {
-          //   debugger;
-          //   console.log('文件信息===>>', e.target.result);
-          //   const image = new Image();
-          //   image.src = e.target.result;
-
-          //   image.onload = function () {
-          //     // file.width = 
-          //     console.log(image.width, image.height);
-          //   }
-          // }
-
-          const range = quill.getSelection(true);
-          let fileUrl = ''; // 保存上传成功后图片的url
-          // 上传文件
-          const result = await fetchUploadImage(formData);
-          // 获取上传图片的url
-          if (result.data && result.data.id) {
-            fileUrl = getImageUrl(`api/attachments/${result.data.id}`);
-          }
-          // 根据id获取文件路径
-          const { width, height } = imgAttrs;
-          // console.log('上传图片的url:', fileUrl);
-          if (fileUrl) {
-            quill.insertEmbed(range.index, 'image', {
-              url: fileUrl,
-              alt: '',
-              onClick: showUploadImage,
-              width,
-              height
-            }); 
-          }
-        }
-      });
-    }
-
-    return () => {
-      element.innerHTML = '';
-    }
-  }, [
-    element,
-    options,
-    requireKatex,
-    katexLoaded,
-  ]);
-
-  return quill;
-}
-
-export default useMountQuill;
diff --git a/src/common/reactQuill/useQuill.js b/src/common/reactQuill/useQuill.js
deleted file mode 100644
index b959dbc5..00000000
--- a/src/common/reactQuill/useQuill.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * @Description: 
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-09 09:09:50
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-17 15:46:50
- */
-import useQuillPlaceholder from './useQuillPlaceholder';
-import useQuillValueSync from './useQuillValueSync';
-import useQuillOnChange from './useQuillOnChange';
-import useMountQuill from './useMountQuill';
-import { useEffect } from 'react';
-
-function useQuill ({
-  disallowColors,
-  placeholder,
-  uploadImage,
-  onChange,
-  options,
-  value,
-  element,
-  showUploadImage
-}) {
-
-  // 获取 quill 实例
-  const quill = useMountQuill({
-    element,
-    options,
-    uploadImage,
-    showUploadImage
-  });
-
-  useEffect(() => {
-    if (disallowColors && quill) {
-      quill.clipboard.addMatcher(Node.ELEMENT_NODE, (node, delta) => {
-        delta.ops = delta.ops.map(op => {
-          if (op.attributes && op.attributes.color) {
-            const { color, ...attributes } = op.attributes;
-            return {
-              ...op,
-              attributes
-            }
-          }
-          return op;
-        });
-        return delta;
-      });
-    }
-  }, [
-    disallowColors,
-    quill
-  ]);
-  
-  useQuillPlaceholder(quill, placeholder);
-  useQuillValueSync(quill, value);
-  useQuillOnChange(quill, onChange);
-}
-
-export default useQuill;
diff --git a/src/common/reactQuill/useQuillOnChange.js b/src/common/reactQuill/useQuillOnChange.js
deleted file mode 100644
index 45333a4e..00000000
--- a/src/common/reactQuill/useQuillOnChange.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * @Description: 
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-12 19:49:11
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-16 11:39:27
- */
-import { useEffect } from 'react';
-
-function useQuillOnChange (quill, onChange) {
-  
-  useEffect(() => {
-
-    if (!quill) return;
-    if (typeof onChange !== 'function') return;
-
-    let handler;
-
-    quill.on(
-      'text-change', 
-      (handler = () => {
-        onChange(quill.getContents()); // getContents: 检索编辑器内容
-      })
-    );
-
-    return () => {
-      quill.off('text-change', handler);
-    }
-  }, [quill, onChange]);
-}
-
-export default useQuillOnChange;
diff --git a/src/common/reactQuill/useQuillPlaceholder.js b/src/common/reactQuill/useQuillPlaceholder.js
deleted file mode 100644
index ccc34156..00000000
--- a/src/common/reactQuill/useQuillPlaceholder.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * @Description: 
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-09 09:28:34
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-16 11:39:48
- */
-import { useEffect } from 'react'
-
-function useQuillPlaceholder (
-  quill,
-  placeholder
-) {
-
-  useEffect(() => {
-    if (!quill || !quill.root) return;
-    quill.root.dataset.placeholder = placeholder;
-  }, [quill, placeholder]);
-}
-
-export default useQuillPlaceholder;
diff --git a/src/common/reactQuill/useQuillValueSync.js b/src/common/reactQuill/useQuillValueSync.js
deleted file mode 100644
index 696d8894..00000000
--- a/src/common/reactQuill/useQuillValueSync.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { useEffect, useState } from 'react'
-import deepEqual from './deepEqual.js'
-
-function useQuillValueSync(quill, value) {
-  const [selection, setSelection] = useState(null)
-
-  useEffect(() => {
-    if (!quill) return
-
-    const previous = quill.getContents()
-    const current = value
-
-    if (!deepEqual(previous, current)) {
-      setSelection(quill.getSelection())
-      if (typeof value === 'string') {
-        quill.clipboard.dangerouslyPasteHTML(value, 'api')
-      } else {
-        quill.setContents(value)
-      }
-    }
-  }, [quill, value, setSelection])
-
-  useEffect(() => {
-    if (quill && selection) {
-      quill.setSelection(selection)
-      setSelection(null)
-    }
-  }, [quill, selection, setSelection])
-}
-
-export default useQuillValueSync
diff --git a/src/common/util/ShareUtil.js b/src/common/util/ShareUtil.js
index bd34e2ed..f0ce1399 100644
--- a/src/common/util/ShareUtil.js
+++ b/src/common/util/ShareUtil.js
@@ -60,17 +60,17 @@ function requestForSignatrue (callback) {
 /**
     实践课程	平台提供涵盖基础入门、案例实践和创新应用的完整实训项目体系，通过由浅入深的实训路径，帮助学生快速提升实战能力。
     实训项目	覆盖不同专业的IT实验和实训，每周更新，无需配置本机实验环境，随时随地开启企业级真实实训。
-    翻转课堂	自动评测实训任务，支持技能统计，提供教学活动分析报告，减轻教师和助教的辅导压力，免去作业发布和批改的困扰，实时了解学生学习情况，全面提升教师施教效率和水平。
+ 教学课堂	自动评测实训任务，支持技能统计，提供教学活动分析报告，减轻教师和助教的辅导压力，免去作业发布和批改的困扰，实时了解学生学习情况，全面提升教师施教效率和水平。
     单个课程和实训	获取课程/实训的简介	该课程或者实训展示的缩略图
 
  */
-export function configShareForIndex (path) {  
+export function configShareForIndex (path) {
     requestForSignatrue(() => {
         var shareData = {
             title: 'EduCoder - 首页',
             desc: 'Educoder是一个面向计算机类的互联网IT教育和实战平台，提供企业级工程实训，以实现工程化专业教学的自动化和智能化。高校和企业人员可以在此开展计算机实践性教学活动，将传统的知识传授和时兴的工程实战一体化。',
             link: host + (path || ''),
-            imgUrl: window.__testImageUrl 
+            imgUrl: window.__testImageUrl
                 || host + '/react/build/images/share_logo_icon.jpg'
         };
         share(shareData)
@@ -83,7 +83,7 @@ export function configShareForPaths () {
             title: 'EduCoder - 实践课程',
             desc: '平台提供涵盖基础入门、案例实践和创新应用的完整实训项目体系，通过由浅入深的实训路径，帮助学生快速提升实战能力。',
             link: `${host}/paths`,
-            imgUrl: window.__testImageUrl 
+            imgUrl: window.__testImageUrl
                 || host + '/react/build/images/share_logo_icon.jpg'
         };
         share(shareData)
@@ -97,7 +97,7 @@ export function configShareForShixuns () {
             title: 'EduCoder - 实训项目',
             desc: '覆盖不同专业的IT实验和实训，每周更新，无需配置本机实验环境，随时随地开启企业级真实实训。',
             link: `${host}/shixuns`,
-            imgUrl: window.__testImageUrl 
+            imgUrl: window.__testImageUrl
                 || host + '/react/build/images/share_logo_icon.jpg'
         };
         share(shareData)
@@ -108,10 +108,10 @@ export function configShareForCourses () {
         console.log('configShareForCourses', host)
 
         var shareData = {
-            title: 'EduCoder - 翻转课堂',
+            title: 'EduCoder - 教学课堂',
             desc: '自动评测实训任务，支持技能统计，提供教学活动分析报告，减轻教师和助教的辅导压力，免去作业发布和批改的困扰，实时了解学生学习情况，全面提升教师施教效率和水平。',
-            link: `${host}/courses`,
-            imgUrl: window.__testImageUrl 
+            link: `${host}/classrooms`,
+            imgUrl: window.__testImageUrl
                 || host + '/react/build/images/share_logo_icon.jpg'
         };
         share(shareData)
@@ -127,7 +127,7 @@ export function configShareForCustom (title, desc, imgUrl, path) {
             title: title,
             desc: desc,
             link: path ? `${host}/${path}` : _url,
-            imgUrl: imgUrl || window.__testImageUrl 
+            imgUrl: imgUrl || window.__testImageUrl
                 || host + '/react/build/images/share_logo_icon.jpg'
         };
         share(shareData)
diff --git a/src/components/mini-pagination/index.jsx b/src/components/mini-pagination/index.jsx
new file mode 100644
index 00000000..4dee180d
--- /dev/null
+++ b/src/components/mini-pagination/index.jsx
@@ -0,0 +1,32 @@
+import React, { useState } from 'react'
+import './index.scss'
+function noop() { }
+
+export default ({ current, defaultCurrent, total, pageSize, onChange = noop }) => {
+  const maxPage = Math.ceil(total / pageSize)
+  const [page, setPage] = useState(current || defaultCurrent)
+
+  function next() {
+    if (page < maxPage) {
+      let value = page + 1
+      setPage(value)
+      onChange(value)
+    }
+  }
+
+  function prev() {
+    if (page > 1) {
+      let value = page - 1
+      setPage(value)
+      onChange(value)
+    }
+  }
+
+  return (
+    <div className="mini-pagination">
+      <a className={page === 1 ? 'disabled' : 'normal'} onClick={prev}>上一页</a>
+      <a className={page === maxPage ? 'disabled' : 'normal'} onClick={next} >下一页</a>
+    </div>
+  )
+
+}
\ No newline at end of file
diff --git a/src/components/mini-pagination/index.scss b/src/components/mini-pagination/index.scss
new file mode 100644
index 00000000..b6ce51ff
--- /dev/null
+++ b/src/components/mini-pagination/index.scss
@@ -0,0 +1,65 @@
+.mini-pagination {
+  display: flex;
+  flex-flow: row nowrap;
+  justify-content: center;
+  align-items: center;
+
+  a {
+    display: block;
+    padding: 0 10px 0 22px;
+    border-width: 1px;
+    border-radius: 3px;
+    margin-right: 4px;
+    font-size: 12px;
+    line-height: 30px;
+    cursor: pointer;
+    border-style: solid;
+    outline: none;
+    border-color: #c4c6cf;
+    background: #fff;
+    color: #333;
+
+    position: relative;
+
+    &:hover {
+      background-color: #f2f3f7;
+      border-color: #a0a2ad;
+      text-decoration: none;
+    }
+
+    &:before {
+      position: absolute;
+      content: ' ';
+      width: 8px;
+      top: 10px;
+      left: 10px;
+      height: 8px;
+      transform: rotate(-45deg);
+      border-top: 1px solid #333;
+      border-left: 1px solid #333;
+    }
+
+    &:last-child {
+      padding: 0 22px 0 10px;
+      margin: 0 0 0 4px;
+
+      &:before {
+        left: auto;
+        right: 10px;
+        transform: rotate(135deg);
+      }
+    }
+
+    &.disabled {
+      cursor: not-allowed;
+      background-color: #f7f8fa;
+      border-color: #e6e7eb;
+      color: #e0e0e0;
+
+      &:before {
+        border-top: 1px solid #e0e0e0;
+        border-left: 1px solid #e0e0e0;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/components/modal.jsx b/src/components/modal.jsx
new file mode 100644
index 00000000..04ede7ab
--- /dev/null
+++ b/src/components/modal.jsx
@@ -0,0 +1,21 @@
+import React from 'react'
+import { createPortal } from 'react-dom'
+
+export default class Dialog extends React.Component {
+  constructor(props) {
+    super(props)
+
+    const doc = window.document
+    this.node = doc.createElement('div')
+    doc.body.appendChild(this.node)
+  }
+
+  render() {
+    const { children } = this.props
+    return createPortal(children, this.node)
+  }
+
+  componentWillUnmount() {
+    window.document.body.removeChild(this.node);
+  }
+}
diff --git a/src/components/monaco-editor/TPIMonacoConfig.js b/src/components/monaco-editor/TPIMonacoConfig.js
new file mode 100644
index 00000000..e351aa03
--- /dev/null
+++ b/src/components/monaco-editor/TPIMonacoConfig.js
@@ -0,0 +1,117 @@
+import * as monaco from 'monaco-editor'
+import { union } from 'lodash'
+const ifelse = {
+    label: 'ifelse',
+    kind: monaco.languages.CompletionItemKind.Snippet,
+    insertText: [
+        'if (${1:condition}) {',
+        '\t$0',
+        '} else {',
+        '\t',
+        '}'
+    ].join('\n'),
+    insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+    documentation: 'If-Else Statement'
+}
+
+
+function getWordsInString(string) {
+    return string.match(/[A-z]+/g)
+}
+
+const cArray = ['auto', 'break', 'case', 'char', 'const', 'continue', 'default', 'do', 'double', 'else', 'enum', 'extern',
+    'float', 'for', 'goto', 'if', 'int', 'long', 'register', 'return', 'short', 'signed', 'sizeof', 'static', 'struct',
+    'switch', 'typedef', 'union', 'unsigned', 'void', 'volatile', 'while', 'inline', 'restrict', '_Bool', '_Complex',
+    '_Imaginary', '_Alignas', '_Alignof', '_Atomic', '_Static_assert', '_Noreturn', '_Thread_local', '_Generic']
+
+monaco.languages.registerCompletionItemProvider('cpp', {
+    provideCompletionItems: (model) => {
+        const currentFileWords = getWordsInString(model.getValue());
+        const all = union(cArray, currentFileWords)
+        var suggestions = all.map((item) => {
+            return {
+                label: item,
+                kind: monaco.languages.CompletionItemKind.Keyword,
+                insertText: item,
+                insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet
+            }
+        });
+        suggestions.push(ifelse)
+
+        return { suggestions: suggestions };
+    }
+});
+
+// https://www.programiz.com/python-programming/keyword-list
+const pythonArray = ['False', 'None', 'True', 'and', 'as', 'assert', 'break', 'class', 'continue', 'def', 'del', 'elif',
+    'else', 'except', 'finally', 'for', 'from', 'global', 'if', 'import', 'in', 'is', 'lambda', 'nonlocal', 'not', 'or',
+    'pass', 'raise', 'return', 'try', 'while', 'with', 'yield']
+
+monaco.languages.registerCompletionItemProvider('python', {
+    provideCompletionItems: (model) => {
+        const currentFileWords = getWordsInString(model.getValue());
+        const all = union(pythonArray, currentFileWords)
+        var suggestions = all.map((item) => {
+            return {
+                label: item,
+                kind: monaco.languages.CompletionItemKind.Keyword,
+                insertText: item,
+                insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet
+            }
+        });
+        suggestions.push({
+            label: 'print',
+            kind: monaco.languages.CompletionItemKind.Snippet,
+            insertText: [
+                'print($0)',
+            ].join('\n'),
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            documentation: 'print'
+        })
+        return { suggestions: suggestions };
+    }
+});
+
+const javaArray = ['abstract', 'assert', 'boolean', 'break', 'byte', 'case', 'catch', 'char', 'class', 'const',
+    'continue', 'default', 'do', 'double', 'else', 'enum', 'extends', 'final', 'finally', 'float', 'for', 'goto', 'if',
+    'implements', 'import', 'instance of', 'int', 'interface', 'long', 'native',
+    'new', 'package', 'private', 'protected', 'public', 'return', 'strictfp', 'short', 'static', 'super', 'switch',
+    'synchronized', 'this', 'throw', 'throws', 'transient', 'try', 'void', 'volatile', 'while']
+
+monaco.languages.registerCompletionItemProvider('java', {
+    provideCompletionItems: (model) => {
+        const currentFileWords = getWordsInString(model.getValue());
+        const all = union(javaArray, currentFileWords)
+
+        var suggestions = all.map((item) => {
+            return {
+                label: item,
+                kind: monaco.languages.CompletionItemKind.Keyword,
+                insertText: item,
+                insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet
+            }
+        });
+        suggestions.push(ifelse)
+        suggestions.push({
+            label: 'main',
+            kind: monaco.languages.CompletionItemKind.Snippet,
+            insertText: [
+                'public static void main(String[] args) {',
+                '\t$0',
+                '}',
+            ].join('\n'),
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            documentation: 'main function'
+        })
+        suggestions.push({
+            label: 'System.out.print',
+            kind: monaco.languages.CompletionItemKind.Snippet,
+            insertText: [
+                'System.out.print($0)',
+            ].join('\n'),
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            documentation: 'system print'
+        })
+        return { suggestions: suggestions };
+    }
+});
\ No newline at end of file
diff --git a/src/components/monaco-editor/index.css b/src/components/monaco-editor/index.css
new file mode 100644
index 00000000..51522c42
--- /dev/null
+++ b/src/components/monaco-editor/index.css
@@ -0,0 +1,438 @@
+.monaco-editor .minimap-slider,
+.monaco-editor .minimap-slider .minimap-slider-horizontal {
+  background: rgba(121, 121, 121, 0.2);
+}
+
+.monaco-editor .minimap-slider:hover,
+.monaco-editor .minimap-slider:hover .minimap-slider-horizontal {
+  background: rgba(100, 100, 100, 0.35);
+}
+
+.monaco-editor .minimap-slider.active,
+.monaco-editor .minimap-slider.active .minimap-slider-horizontal {
+  background: rgba(191, 191, 191, 0.2);
+}
+
+.monaco-editor .minimap-shadow-visible {
+  box-shadow: #000000 -6px 0 6px -6px inset;
+}
+
+.monaco-editor .scroll-decoration {
+  box-shadow: #000000 0 6px 6px -6px inset;
+}
+
+.monaco-editor .focused .selected-text {
+  background-color: #264f78;
+}
+
+.monaco-editor .selected-text {
+  background-color: #3a3d41;
+}
+
+.monaco-editor,
+.monaco-editor-background,
+.monaco-editor .inputarea.ime-input {
+  background-color: #1e1e1e;
+}
+
+.monaco-editor,
+.monaco-editor .inputarea.ime-input {
+  color: #d4d4d4;
+}
+
+.monaco-editor .margin {
+  background-color: #1e1e1e;
+}
+
+.monaco-editor .rangeHighlight {
+  background-color: rgba(255, 255, 255, 0.04);
+}
+
+.vs-whitespace {
+  color: rgba(227, 228, 226, 0.16) !important;
+}
+
+.monaco-editor .view-overlays .current-line {
+  border: 2px solid #282828;
+}
+
+.monaco-editor .margin-view-overlays .current-line-margin {
+  border: 2px solid #282828;
+}
+
+.monaco-editor .lines-content .cigr {
+  box-shadow: 1px 0 0 0 #404040 inset;
+}
+
+.monaco-editor .lines-content .cigra {
+  box-shadow: 1px 0 0 0 #707070 inset;
+}
+
+.monaco-editor .line-numbers {
+  color: #858585;
+}
+
+.monaco-editor .current-line~.line-numbers {
+  color: #c6c6c6;
+}
+
+.monaco-editor .view-ruler {
+  box-shadow: 1px 0 0 0 #5a5a5a inset;
+}
+
+.monaco-editor .cursor {
+  background-color: #aeafad;
+  border-color: #aeafad;
+  color: #515052;
+}
+
+.monaco-editor .squiggly-error {
+  background: url("data:image/svg+xml,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%206%203'%20enable-background%3D'new%200%200%206%203'%20height%3D'3'%20width%3D'6'%3E%3Cg%20fill%3D'%23ea4646'%3E%3Cpolygon%20points%3D'5.5%2C0%202.5%2C3%201.1%2C3%204.1%2C0'%2F%3E%3Cpolygon%20points%3D'4%2C0%206%2C2%206%2C0.6%205.4%2C0'%2F%3E%3Cpolygon%20points%3D'0%2C2%201%2C3%202.4%2C3%200%2C0.6'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E") repeat-x bottom left;
+}
+
+.monaco-editor .squiggly-warning {
+  background: url("data:image/svg+xml,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%206%203'%20enable-background%3D'new%200%200%206%203'%20height%3D'3'%20width%3D'6'%3E%3Cg%20fill%3D'%234d9e4d'%3E%3Cpolygon%20points%3D'5.5%2C0%202.5%2C3%201.1%2C3%204.1%2C0'%2F%3E%3Cpolygon%20points%3D'4%2C0%206%2C2%206%2C0.6%205.4%2C0'%2F%3E%3Cpolygon%20points%3D'0%2C2%201%2C3%202.4%2C3%200%2C0.6'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E") repeat-x bottom left;
+}
+
+.monaco-editor .squiggly-info {
+  background: url("data:image/svg+xml,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%206%203'%20enable-background%3D'new%200%200%206%203'%20height%3D'3'%20width%3D'6'%3E%3Cg%20fill%3D'%23008000'%3E%3Cpolygon%20points%3D'5.5%2C0%202.5%2C3%201.1%2C3%204.1%2C0'%2F%3E%3Cpolygon%20points%3D'4%2C0%206%2C2%206%2C0.6%205.4%2C0'%2F%3E%3Cpolygon%20points%3D'0%2C2%201%2C3%202.4%2C3%200%2C0.6'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E") repeat-x bottom left;
+}
+
+.monaco-editor .squiggly-hint {
+  background: url("data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20height%3D%223%22%20width%3D%2212%22%3E%3Cg%20fill%3D%22rgba(238%2C%20238%2C%20238%2C%200.7)%22%3E%3Ccircle%20cx%3D%221%22%20cy%3D%221%22%20r%3D%221%22%2F%3E%3Ccircle%20cx%3D%225%22%20cy%3D%221%22%20r%3D%221%22%2F%3E%3Ccircle%20cx%3D%229%22%20cy%3D%221%22%20r%3D%221%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E") no-repeat bottom left;
+}
+
+.showUnused .monaco-editor .squiggly-inline-unnecessary {
+  opacity: 0.667;
+}
+
+.monaco-diff-editor .diff-review-line-number {
+  color: #858585;
+}
+
+.monaco-diff-editor .diff-review-shadow {
+  box-shadow: #000000 0 -6px 6px -6px inset;
+}
+
+.monaco-editor .line-insert,
+.monaco-editor .char-insert {
+  background-color: rgba(155, 185, 85, 0.2);
+}
+
+.monaco-diff-editor .line-insert,
+.monaco-diff-editor .char-insert {
+  background-color: rgba(155, 185, 85, 0.2);
+}
+
+.monaco-editor .inline-added-margin-view-zone {
+  background-color: rgba(155, 185, 85, 0.2);
+}
+
+.monaco-editor .line-delete,
+.monaco-editor .char-delete {
+  background-color: rgba(255, 0, 0, 0.2);
+}
+
+.monaco-diff-editor .line-delete,
+.monaco-diff-editor .char-delete {
+  background-color: rgba(255, 0, 0, 0.2);
+}
+
+.monaco-editor .inline-deleted-margin-view-zone {
+  background-color: rgba(255, 0, 0, 0.2);
+}
+
+.monaco-diff-editor.side-by-side .editor.modified {
+  box-shadow: -6px 0 5px -5px #000000;
+}
+
+.monaco-editor .bracket-match {
+  background-color: rgba(0, 100, 0, 0.1);
+}
+
+.monaco-editor .bracket-match {
+  border: 1px solid #888888;
+}
+
+.monaco-editor .codelens-decoration {
+  color: #999999;
+}
+
+.monaco-editor .codelens-decoration>a:hover {
+  color: #4e94ce !important;
+}
+
+.monaco-editor .findOptionsWidget {
+  background-color: #252526;
+}
+
+.monaco-editor .findOptionsWidget {
+  box-shadow: 0 2px 8px #000000;
+}
+
+.monaco-editor .findMatch {
+  background-color: rgba(234, 92, 0, 0.33);
+}
+
+.monaco-editor .currentFindMatch {
+  background-color: #515c6a;
+}
+
+.monaco-editor .findScope {
+  background-color: rgba(58, 61, 65, 0.4);
+}
+
+.monaco-editor .find-widget {
+  background-color: #252526;
+}
+
+.monaco-editor .find-widget {
+  box-shadow: 0 2px 8px #000000;
+}
+
+.monaco-editor .find-widget.no-results .matchesCount {
+  color: #f48771;
+}
+
+.monaco-editor .find-widget .monaco-sash {
+  background-color: #454545;
+  width: 3px !important;
+  margin-left: -4px;
+}
+
+.monaco-editor .find-widget .monaco-checkbox .checkbox:checked+.label {
+  border: 1px solid #007acc;
+}
+
+.monaco-editor.vs .valueSetReplacement {
+  outline: solid 2px #888888;
+}
+
+.monaco-editor .detected-link-active {
+  color: #4e94ce !important;
+}
+
+.monaco-editor .monaco-editor-overlaymessage .anchor {
+  border-top-color: #007acc;
+}
+
+.monaco-editor .monaco-editor-overlaymessage .message {
+  border: 1px solid #007acc;
+}
+
+.monaco-editor .monaco-editor-overlaymessage .message {
+  background-color: #063b49;
+}
+
+.monaco-editor .parameter-hints-widget {
+  border: 1px solid #454545;
+}
+
+.monaco-editor .parameter-hints-widget.multiple .body {
+  border-left: 1px solid rgba(69, 69, 69, 0.5);
+}
+
+.monaco-editor .parameter-hints-widget .signature.has-docs {
+  border-bottom: 1px solid rgba(69, 69, 69, 0.5);
+}
+
+.monaco-editor .parameter-hints-widget {
+  background-color: #252526;
+}
+
+.monaco-editor .parameter-hints-widget a {
+  color: #3794ff;
+}
+
+.monaco-editor .parameter-hints-widget code {
+  background-color: rgba(10, 10, 10, 0.4);
+}
+
+.monaco-editor .snippet-placeholder {
+  background-color: rgba(124, 124, 124, 0.3);
+  outline-color: transparent;
+}
+
+.monaco-editor .finish-snippet-placeholder {
+  background-color: transparent;
+  outline-color: #525252;
+}
+
+.monaco-editor .suggest-widget .monaco-list .monaco-list-row .monaco-highlighted-label .highlight {
+  color: #0097fb;
+}
+
+.monaco-editor .suggest-widget {
+  color: #d4d4d4;
+}
+
+.monaco-editor .suggest-widget a {
+  color: #3794ff;
+}
+
+.monaco-editor .suggest-widget code {
+  background-color: rgba(10, 10, 10, 0.4);
+}
+
+.monaco-editor .focused .selectionHighlight {
+  background-color: rgba(173, 214, 255, 0.15);
+}
+
+.monaco-editor .selectionHighlight {
+  background-color: rgba(173, 214, 255, 0.07);
+}
+
+.monaco-editor .wordHighlight {
+  background-color: rgba(87, 87, 87, 0.72);
+}
+
+.monaco-editor .wordHighlightStrong {
+  background-color: rgba(0, 73, 114, 0.72);
+}
+
+.monaco-editor .accessibilityHelpWidget {
+  background-color: #252526;
+}
+
+.monaco-editor .accessibilityHelpWidget {
+  box-shadow: 0 2px 8px #000000;
+}
+
+.monaco-editor .tokens-inspect-widget {
+  border: 1px solid #454545;
+}
+
+.monaco-editor .tokens-inspect-widget .tokens-inspect-separator {
+  background-color: #454545;
+}
+
+.monaco-editor .tokens-inspect-widget {
+  background-color: #252526;
+}
+
+.monaco-editor .reference-zone-widget .ref-tree .referenceMatch {
+  background-color: rgba(234, 92, 0, 0.3);
+}
+
+.monaco-editor .reference-zone-widget .preview .reference-decoration {
+  background-color: rgba(255, 143, 0, 0.6);
+}
+
+.monaco-editor .reference-zone-widget .ref-tree {
+  background-color: #252526;
+}
+
+.monaco-editor .reference-zone-widget .ref-tree {
+  color: #bbbbbb;
+}
+
+.monaco-editor .reference-zone-widget .ref-tree .reference-file {
+  color: #ffffff;
+}
+
+.monaco-editor .reference-zone-widget .ref-tree .monaco-list:focus .monaco-list-rows>.monaco-list-row.selected:not(.highlighted) {
+  background-color: rgba(51, 153, 255, 0.2);
+}
+
+.monaco-editor .reference-zone-widget .ref-tree .monaco-list:focus .monaco-list-rows>.monaco-list-row.selected:not(.highlighted) {
+  color: #ffffff !important;
+}
+
+.monaco-editor .reference-zone-widget .preview .monaco-editor .monaco-editor-background,
+.monaco-editor .reference-zone-widget .preview .monaco-editor .inputarea.ime-input {
+  background-color: #001f33;
+}
+
+.monaco-editor .reference-zone-widget .preview .monaco-editor .margin {
+  background-color: #001f33;
+}
+
+.monaco-editor .marker-widget a {
+  color: #3794ff;
+}
+
+.monaco-editor .hoverHighlight {
+  background-color: rgba(38, 79, 120, 0.25);
+}
+
+.monaco-editor .monaco-editor-hover {
+  background-color: #252526;
+}
+
+.monaco-editor .monaco-editor-hover {
+  border: 1px solid #454545;
+}
+
+.monaco-editor .monaco-editor-hover .hover-row:not(:first-child):not(:empty) {
+  border-top: 1px solid rgba(69, 69, 69, 0.5);
+}
+
+.monaco-editor .monaco-editor-hover hr {
+  border-top: 1px solid rgba(69, 69, 69, 0.5);
+}
+
+.monaco-editor .monaco-editor-hover hr {
+  border-bottom: 0px solid rgba(69, 69, 69, 0.5);
+}
+
+.monaco-editor .monaco-editor-hover a {
+  color: #3794ff;
+}
+
+.monaco-editor .monaco-editor-hover .hover-row .actions {
+  background-color: #2c2c2d;
+}
+
+.monaco-editor .monaco-editor-hover code {
+  background-color: rgba(10, 10, 10, 0.4);
+}
+
+.monaco-editor .goto-definition-link {
+  color: #4e94ce !important;
+}
+
+.mtki {
+  font-style: italic;
+}
+
+.mtkb {
+  font-weight: bold;
+}
+
+.mtku {
+  text-decoration: underline;
+  text-underline-position: under;
+}
+
+
+
+
+#extend-challenge-file-edit {
+  height: 100%;
+}
+
+/* context menu会有样式问题，先给隐藏掉 */
+.context-view {
+  display: none !important;
+}
+
+/* 去掉灰色边框 */
+#extend-challenge-file-edit {
+  border: none !important;
+}
+
+/* 覆盖tpi样式 */
+.monaco-tree .monaco-tree-rows>.monaco-tree-row>.content {
+  min-width: auto;
+}
+
+/* 选中行边框 */
+.monaco-editor .view-overlays .current-line {
+  border-width: 1px !important;
+}
+
+#extend-challenge-file-edit {
+  width: '100%';
+  height: '100%';
+  border: '1px solid grey';
+}
\ No newline at end of file
diff --git a/src/components/monaco-editor/index.jsx b/src/components/monaco-editor/index.jsx
new file mode 100644
index 00000000..9f944461
--- /dev/null
+++ b/src/components/monaco-editor/index.jsx
@@ -0,0 +1,238 @@
+import React, { useEffect, useRef, useState } from 'react'
+import * as monaco from 'monaco-editor'
+import ResizeObserver from 'resize-observer-polyfill';
+import './TPIMonacoConfig'
+import './index.css'
+
+function processSize(size) {
+  return !/^\d+$/.test(size) ? size : `${size}px`
+}
+function noop() { }
+let __prevent_trigger_change_event = false
+
+function debounce(func, wait, immediate) {
+  var timeout
+  return function () {
+    var context = this, args = arguments
+    var later = function () {
+      timeout = null
+      if (!immediate) func.apply(context, args)
+    };
+    var callNow = immediate && !timeout
+    clearTimeout(timeout)
+    timeout = setTimeout(later, wait)
+    if (callNow) func.apply(context, args)
+  }
+}
+
+//monaco-language
+// 'abap' | 'apex' | 'azcli' | 'bat' | 'cameligo' | 'clojure' | 'coffee' | 'cpp' | 'csharp' | 'csp' | 'css' | 'dockerfile' | 'fsharp' | 'go' | 'graphql' | 'handlebars' | 'html' | 'ini' | 'java' | 'javascript' | 'json' | 'kotlin' | 'less' | 'lua' | 'markdown' | 'mips' | 'msdax' | 'mysql' | 'objective-c' | 'pascal' | 'pascaligo' | 'perl' | 'pgsql' | 'php' | 'postiats' | 'powerquery' | 'powershell' | 'pug' | 'python' | 'r' | 'razor' | 'redis' | 'redshift' | 'restructuredtext' | 'ruby' | 'rust' | 'sb' | 'scheme' | 'scss' | 'shell' | 'solidity' | 'sophia' | 'sql' | 'st' | 'swift' | 'tcl' | 'twig' | 'typescript' | 'vb' | 'xml' | 'yaml';
+
+const DICT = {
+  "Python3.6": 'python',
+  "Python2.7": 'python',
+  "Dynamips": 'cpp',
+  "Java": 'java',
+  "Web": 'php',
+  "Html": 'html',
+  "Hive": 'sql',
+  "Hadoop": 'java',
+  "SDL": 'cpp',
+  "PHP": 'php',
+  "Matlab": 'python',
+  "Git": 'python',
+  "Python": 'python',
+  "C/C++": 'cpp',
+  "C++": 'cpp',
+  "C": 'cpp',
+  "Ruby": 'ruby',
+  "Shell": 'shell',
+  "JavaScript": 'javascript',
+  "Perl6": 'perl',
+  "Kotlin": 'kotlin',
+  "Elixir": 'elixir',
+  "Android": 'java',
+  "JavaWeb": 'java',
+  "Go": 'go',
+  "Spark": 'sql',
+  "MachineLearning": 'python',
+  "Verilog": 'xml',
+  "Verilog/VNC": 'xml',
+  "Docker": 'dockerfile',
+  "C#": 'csharp',
+  "SQLite3": 'sql',
+  "Oracle": 'sql',
+  "Vhdl": 'vhdl',
+  "R": 'r',
+  "Swift": 'swift',
+  "SQLServer": 'mysql',
+  "MySQL": 'mysql',
+  "Mongo": 'sql',
+  "PostgreSql": 'pgsql',
+  "Hbase": 'powershell',
+  "Sqoop": "sql", "Nasm": 'cpp', "Kafka": 'java', "Flink": 'java', "Sml": 'javascript', "OpenGL": 'cpp', "Perl5": 'perl', "Orange": 'python'
+}
+export function getLanguageByMirrorName(mirror_name = []) {
+  let lang = mirror_name
+  if (Array.isArray(mirror_name)) {
+    for (let i = 0; i < mirror_name.length; i++) {
+      let languageVal = DICT[mirror_name[i]]
+      if (languageVal) {
+        return languageVal
+      }
+    }
+    return lang[0]
+  }
+  return DICT[lang] || lang
+}
+
+export default ({
+  width = '100%',
+  height = '100%',
+  value,
+  language = 'javascript',
+  options = {},
+  overrideServices = {},
+  theme = 'vs-dark',
+  onEditBlur,
+  forbidCopy = false,
+  onChange = noop,
+  editorDidMount = noop,
+  onFocus = noop
+}) => {
+  const editorEl = useRef()
+  const editor = useRef({})
+  const [init, setInit] = useState(false)
+
+  function onLayout() {
+    let ro
+    if (editorEl.current) {
+      ro = new ResizeObserver(entries => {
+        for (let entry of entries) {
+          if (entry.target.offsetHeight > 0 || entry.target.offsetWidth > 0) {
+            editor.current.instance.layout()
+          }
+        }
+      })
+      ro.observe(editorEl.current)
+    }
+    return ro
+  }
+
+  useEffect(() => {
+    let instance = editor.current.instance
+    if (value != null && instance && init) {
+      const model = instance.getModel()
+      if (model && value !== model.getValue()) {
+        __prevent_trigger_change_event = true
+        model.setValue(value)
+        instance.layout()
+        __prevent_trigger_change_event = false;
+      }
+    }
+  }, [value, init, editor.current])
+
+  function onPaste() {
+    let instance = editor.current.instance
+    if (instance) {
+      const selection = instance.getSelection()
+      const pastePos = editor.current.pastePos || {}
+      const range = new monaco.Range(pastePos.startLineNumber || selection.endLineNumber, pastePos.startColumn || selection.endColumn, pastePos.endLineNumber || selection.endLineNumber, pastePos.endColumn || selection.endColumn)
+      instance.executeEdits('', [{ range, text: '' }])
+    }
+  }
+
+  useEffect(() => {
+    editor.current.instance = monaco.editor.create(
+      editorEl.current, {
+      value,
+      language: getLanguageByMirrorName(language),
+      theme,
+      ...options
+    },
+      overrideServices
+    )
+    const instance = editor.current.instance
+    window.editor_monaco = instance //兼容之前的业务代码
+    editorDidMount(instance, monaco)
+
+    editor.current.subscription = instance.onDidChangeModelContent(event => {
+      if (!__prevent_trigger_change_event) {
+        onChange(instance.getValue(), event);
+      }
+    })
+
+    if (onEditBlur) {
+      instance.onDidBlurEditorWidget(() => { onEditBlur(instance.getValue()) })
+    }
+    if (onFocus) {
+      instance.onDidFocusEditorText(() => { onFocus(instance.getValue()) })
+    }
+    if (forbidCopy) {
+      instance.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_C, () => null)
+      instance.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_V, () => null)
+      instance.onDidPaste((pos) => { editor.current.pastePos = pos })
+      window.addEventListener('paste', onPaste)
+    }
+
+    let ro = onLayout()
+    setInit(true)
+
+    return () => {
+      const el = editor.current.instance
+      el.dispose()
+      const model = el.getModel()
+      if (model) {
+        model.dispose()
+      }
+      if (editor.current.subscription) {
+        editor.current.subscription.dispose()
+      }
+      if (forbidCopy) {
+        window.removeEventListener('paste', onPaste)
+      }
+      ro.unobserve(editorEl.current)
+    }
+  }, [])
+
+  useEffect(() => {
+    let instance = editor.current.instance
+    if (instance && init) {
+      let lang = getLanguageByMirrorName(language)
+      monaco.editor.setModelLanguage(instance.getModel(), lang)
+      console.log(`model language was changed to ${instance.getModel().getLanguageIdentifier().language}`)
+    }
+  }, [language, init])
+
+  useEffect(() => {
+    let instance = editor.current.instance
+    if (instance && init) {
+      monaco.editor.setTheme(theme)
+    }
+  }, [theme, init])
+
+  useEffect(() => {
+    let instance = editor.current.instance
+    if (instance && init) {
+      instance.updateOptions(options)
+    }
+  }, [options, init])
+
+  useEffect(() => {
+    let instance = editor.current.instance
+    if (instance && init) {
+      instance.layout()
+    }
+  }, [width, height, init])
+
+  const fixedWidth = processSize(width)
+  const fixedHeight = processSize(height)
+  const style = {
+    width: fixedWidth,
+    height: fixedHeight
+  }
+
+  return (
+    <div id='extend-challenge-file-edit' ref={editorEl} style={style}  ></div>
+  )
+} 
\ No newline at end of file
diff --git a/src/components/nodata-panel/index.jsx b/src/components/nodata-panel/index.jsx
new file mode 100644
index 00000000..fb56ae51
--- /dev/null
+++ b/src/components/nodata-panel/index.jsx
@@ -0,0 +1,14 @@
+import React from 'react'
+import { getUrl } from 'educoder'
+import './index.scss'
+
+export default ({ height = 400 }) => {
+  return (
+    <div className="nodata-panel-wrapper" style={{ height }}>
+      <div className="nodata-panel">
+        <img width='128' src={getUrl("/images/educoder/nodata.png")} alt='no-data' />
+        <p>暂时还没有相关数据哦！</p>
+      </div>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/src/components/nodata-panel/index.scss b/src/components/nodata-panel/index.scss
new file mode 100644
index 00000000..3da37181
--- /dev/null
+++ b/src/components/nodata-panel/index.scss
@@ -0,0 +1,22 @@
+.nodata-panel-wrapper {
+  display: flex;
+  flex-flow: column nowrap;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+
+  .nodata-panel {
+    width: 100%;
+  }
+
+  img {
+    display: block;
+    margin: 0 auto 20px auto;
+  }
+
+  p {
+    font-size: 20px;
+    text-align: center;
+    color: #999;
+  }
+}
\ No newline at end of file
diff --git a/src/components/render-html.jsx b/src/components/render-html.jsx
new file mode 100644
index 00000000..5f3594ab
--- /dev/null
+++ b/src/components/render-html.jsx
@@ -0,0 +1,20 @@
+import React, { useEffect, useRef } from 'react'
+import 'katex/dist/katex.min.css';
+import { exportMdtoHtml } from 'educoder'
+
+let preRegex = /<pre[^>]*>/g
+export default ({ value = '', is_md = true, className, style = {} }) => {
+  let html = is_md ? exportMdtoHtml(value) : value
+  html = html.replace(/▁/g, "▁▁▁").replace('<p>[TOC]</p>', '')
+  const el = useRef()
+
+  useEffect(() => {
+    if (el.current && html) {
+      if (preRegex.test(html)) {
+        window.PR.prettyPrint()
+      }
+    }
+  }, [html, el.current])
+
+  return (<div ref={el} style={style} className={`${className} markdown-body`} dangerouslySetInnerHTML={{ __html: html }}></div>)
+}
\ No newline at end of file
diff --git a/src/components/shixun-card-list/index.jsx b/src/components/shixun-card-list/index.jsx
new file mode 100644
index 00000000..c97d3cad
--- /dev/null
+++ b/src/components/shixun-card-list/index.jsx
@@ -0,0 +1,75 @@
+import React, { Fragment } from 'react'
+import { getImageUrl, setImagesUrl } from 'educoder';
+import { Link } from 'react-router-dom'
+import { Tooltip, Rate } from 'antd';
+import './index.scss'
+
+export default ({ list = [] }) => {
+  return (
+    <Fragment>
+      {list.map((item, key) => {
+        const { id, tag_name, is_jupyter, power, identifier, pic, name, score_info, stu_num, level, challenges_count } = item
+        return (
+          <div className="square-Item" key={id} id={id}>
+            {
+              tag_name === null ? null :
+                <div className="tag-green">
+                  <span className="tag-name"> {tag_name}</span>
+                </div>
+            }
+            {
+              is_jupyter === true ?
+                <div className="tag-org">
+                  <p className="tag-org-name intermediatecenter"> <span className="tag-org-name-test">Jupyter</span></p>
+                </div>
+                : null
+            }
+            {power ? null
+              : <div className="closeSquare">
+                <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
+                  className="mt80 mb25" />
+                <p className="font-14 color-white">非试用内容，需要授权</p>
+              </div>
+            }
+            <Link to={"/shixuns/" + identifier + "/challenges"} className="square-img" target="_blank">
+              <img src={setImagesUrl(`${pic}`)} />
+            </Link>
+
+            <div className="square-main">
+              <p className="task-hide">
+                <Link to={"/shixuns/" + identifier + "/challenges"} className="justify color-grey-name" title={name} target="_blank">
+                  {name}
+                </Link>
+              </p>
+
+              <p className="clearfix mt8 ml-3">
+                <span className="rateYoStar fl" style={{ padding: '0px', height: '20px', lineHeight: '19px', cursor: 'default' }} title="">
+                  <Rate key={key} allowHalf defaultValue={score_info === null ? 5 : score_info} disabled />
+                </span>
+                <span className="fl ml25 font-12 color-grey-9 lineh-12 mt5">{score_info === null ? "5分" : score_info + "分"}</span>
+              </p>
+
+              <p className="clearfix mt8 font-12 color-grey-B4">
+                {is_jupyter === false ? <Tooltip placement="bottom" title={"关卡"}>
+                  <span className="mr10 fl squareIconSpan">
+                    <i className="iconfont icon-shixunguanqia fl mr3"></i>{challenges_count}
+                  </span>
+                </Tooltip> : ""}
+
+                {stu_num === 0 ? null :
+                  <Tooltip placement="bottom" title={"学习人数"}>
+                    <span className="mr10 fl squareIconSpan">
+                      <i className="iconfont icon-chengyuan fl mr3"></i>{stu_num}
+                    </span>
+                  </Tooltip>
+                }
+                <span className="fr color-grey-B3 squareIconSpan">{level}</span>
+              </p>
+
+            </div>
+          </div>
+        )
+      })}
+    </Fragment>
+  )
+}
\ No newline at end of file
diff --git a/src/components/shixun-card-list/index.scss b/src/components/shixun-card-list/index.scss
new file mode 100644
index 00000000..b2ed4aeb
--- /dev/null
+++ b/src/components/shixun-card-list/index.scss
@@ -0,0 +1,36 @@
+  .tag-green {
+    position: absolute;
+    left: 10px;
+    bottom: 125px;
+  }
+
+  .tag-org {
+    position: absolute;
+    left: 0px;
+    top: 20px;
+  }
+
+  .tag-org-name {
+    width: 66px;
+    height: 28px;
+    background: #FF6802;
+    width: 66px;
+    height: 28px;
+    border-radius: 0px 20px 20px 0px;
+  }
+
+  .tag-org-name-test {
+    width: 45px;
+    height: 23px;
+    font-size: 14px;
+    color: #FFFFFF;
+    line-height: 19px;
+    margin-right: 6px;
+  }
+
+  .intermediatecenter {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
\ No newline at end of file
diff --git a/src/components/tabs/A.jsx b/src/components/tabs/A.jsx
new file mode 100644
index 00000000..d2c094a6
--- /dev/null
+++ b/src/components/tabs/A.jsx
@@ -0,0 +1,10 @@
+import React from 'react'
+
+export default ({ value, onActive, text, className }) => {
+  function onClickHandler() {
+    onActive(value)
+  }
+  return (
+    <a className={className} onClick={onClickHandler} >{text}</a>
+  )
+}
\ No newline at end of file
diff --git a/src/components/tabs/index.jsx b/src/components/tabs/index.jsx
new file mode 100644
index 00000000..f448d0b4
--- /dev/null
+++ b/src/components/tabs/index.jsx
@@ -0,0 +1,18 @@
+import React from 'react'
+import A from './A'
+import './index.scss'
+
+export default ({ className, tabs, activeKey, onChange, children }) => {
+  return (
+    <div className={`${className} default-tab-container`}>
+      <div className="tabs-nav">
+        {tabs.map((item, index) => {
+          return <A key={index} value={item.value} text={item.title} className={activeKey == item.value ? 'active' : ''} onActive={onChange} />
+        })}
+      </div>
+      <div className="tab-panel">
+        {children}
+      </div>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/src/components/tabs/index.scss b/src/components/tabs/index.scss
new file mode 100644
index 00000000..33d19e7c
--- /dev/null
+++ b/src/components/tabs/index.scss
@@ -0,0 +1,31 @@
+.default-tab-container {
+  width: 100%;
+
+  .tabs-nav {
+    height: 54px;
+    background: rgba(15, 30, 49, 1);
+    font-size: 14px;
+    font-family: MicrosoftYaHei;
+    color: rgba(221, 221, 221, 1);
+    line-height: 14px;
+    padding: 0 17px;
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
+
+    a {
+      display: block;
+      margin-right: 30px;
+      color: rgba(221, 221, 221, 1);
+      height: 54px;
+      line-height: 54px;
+      border-bottom: 2px solid transparent;
+
+      &.active {
+        font-family: MicrosoftYaHeiSemibold;
+        color: rgba(80, 145, 255, 1);
+        border-bottom: 2px solid #5091ff;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/constants/index.js b/src/constants/index.js
index e9401e76..9fb55526 100644
--- a/src/constants/index.js
+++ b/src/constants/index.js
@@ -1,7 +1,7 @@
 /*
- * @Description: 
+ * @Description:
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-20 23:10:48
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-01-02 14:57:02
@@ -27,18 +27,18 @@ const CONST = {
         type: 'style',
         value: [
           {
-            key: 'dark',
+            key: 'vs-dark',
             text: '黑色背景',
-            value: 'dark'
+            value: 'vs-dark'
           },
           {
-            key: 'light',
+            key: 'vs-light',
             text: '白色背景',
-            value: 'light'
+            value: 'vs-light'
           }
         ]
       },
-      { 
+      {
         text: '字体大小',
         type: 'font',
         value: [
@@ -77,11 +77,11 @@ const CONST = {
     ]
   },
   opacitySetting: {
-    title: '代码格式',
+    title: '快捷键',
     type: 'label',
     content: [
       {
-        text: '字体大小',
+        text: '代码保存',
         value: 'CTRL + S'
       },
       {
@@ -128,6 +128,15 @@ const CONST = {
     '3': '评测pod失败',
     '4': '编译失败',
     '5': '执行失败'
+  },
+  newreviewResult: {
+    '-1': '测试用例结果不匹配',
+    '0': '调试通过',
+    '1': '',
+    '2': '调试超时',
+    '3': '调试pod失败',
+    '4': '编译失败',
+    '5': '执行失败'
   }
 }
 
diff --git a/src/context/TPIContextProvider.js b/src/context/TPIContextProvider.js
index bb1e0bef..22b24727 100644
--- a/src/context/TPIContextProvider.js
+++ b/src/context/TPIContextProvider.js
@@ -8,10 +8,10 @@ import Fade from 'material-ui/transitions/Fade';
 import update from 'immutability-helper'
 
 import Dialog, {
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
+	DialogActions,
+	DialogContent,
+	DialogContentText,
+	DialogTitle,
 } from 'material-ui/Dialog';
 
 import Button from 'material-ui/Button';
@@ -31,8 +31,10 @@ import _ from 'lodash'
 */
 
 import TPIContext from './TPIContext'
-import { EDU_ADMIN, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER
-    , EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL, EDU_BUSINESS, CNotificationHOC ,getRandomNumber} from 'educoder'
+import {
+	EDU_ADMIN, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER
+	, EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL, EDU_BUSINESS, CNotificationHOC, getRandomNumber
+} from 'educoder'
 import { MuiThemeProvider, createMuiTheme, withStyles } from 'material-ui/styles';
 import MUIDialogStyleUtil from '../modules/page/component/MUIDialogStyleUtil'
 
@@ -40,19 +42,19 @@ const styles = MUIDialogStyleUtil.getTwoButtonStyle()
 
 // 主题自定义
 const theme = createMuiTheme({
-  palette: {
-    primary: {
-    	main: '#4CACFF',
-    	contrastText: 'rgba(255, 255, 255, 0.87)'
+	palette: {
+		primary: {
+			main: '#4CACFF',
+			contrastText: 'rgba(255, 255, 255, 0.87)'
+		},
+		secondary: { main: '#4CACFF' }, // This is just green.A700 as hex.
 	},
-    secondary: { main: '#4CACFF' }, // This is just green.A700 as hex.
-  },
 });
 
 const testSetsExpandedArrayInitVal = [false, false, false, false, false,
-									 false, false, false, false, false,
-									 false, false, false, false, false,
-									 false, false, false, false, false]
+	false, false, false, false, false,
+	false, false, false, false, false,
+	false, false, false, false, false]
 window.__fetchAllFlag = false;	//  是否调用过fetchAll   TODO 如何多次使用provider？
 
 const $ = window.$
@@ -105,11 +107,11 @@ class TPIContextProvider extends Component {
 		const dom = document.getElementById('picture_display');
 		window.$(dom).show();
 		ReactDOM.unmountComponentAtNode(dom)
-  		ReactDOM.render(<EvaluateSuccessEffectDisplay type={"qrcode"} {...data} />, dom);
+		ReactDOM.render(<EvaluateSuccessEffectDisplay type={"qrcode"} {...data} />, dom);
 	}
 
 	onShowUpdateDialog() {
-		this.setState({showUpdateDialog: true})
+		this.setState({ showUpdateDialog: true })
 	}
 	// updateNowSuccess true 立即更新成功
 	// TODO updateDialogClose方法名不对， 改为updateDialogCallback
@@ -133,19 +135,22 @@ class TPIContextProvider extends Component {
 		})
 	}
 
+
 	componentWillUnmount() {
+
 		this.costTimeInterval && window.clearInterval(this.costTimeInterval)
 	}
 	componentDidMount() {
 
+
 		// TODO 登录状态的判断？
 		// request
-        // var shixunId = this.props.match.params.shixunId;
-        var stageId = this.props.match.params.stageId;
+		// var shixunId = this.props.match.params.shixunId;
+		var stageId = this.props.match.params.stageId;
 
 		window.__fetchAllFlag = false;
 		this.fetchAll(stageId);
-		this.costTimeInterval = window.setInterval(()=> {
+		this.costTimeInterval = window.setInterval(() => {
 			const { game } = this.state;
 			if (!game || game.status === 2) { // 已完成的任务不需要计时
 				return;
@@ -153,40 +158,57 @@ class TPIContextProvider extends Component {
 			if (game.cost_time || game.cost_time === 0) {
 				// game.cost_time += 1;
 				this.setState({
-					game: update(game, {cost_time: { $set: (game.cost_time+1) }})
+					game: update(game, { cost_time: { $set: (game.cost_time + 1) } })
 				})
 			}
 		}, 1000)
 
-		// 页面离开时存下用户的任务耗时
+		// 	// 页面离开时存下用户的任务耗时
+		window.$(window).bind('beforeunload', () => {
+			this._updateCostTime();
+		})
+		// window.$(window).unload( ()=>{
+
+		// 	this._updateCostTime();
+
+		// });
+		// // 页面离开时存下用户的任务耗时
+		// window.$(window).unload( ()=>{
+		// 	this._updateCostTime();
+
+		// });
 
-		window.$(window).unload( ()=>{
-            this._updateCostTime();
-		});
 	}
+
+
+
+
+
 	// force 评测通过后，异步执行该方法，强制同步costTime到服务端
 	_updateCostTime(async = false, force) {
 		const { game, loading } = this.state;
 		// TODO 还有一种情况，通关后cost_time计时停止，没法通过这个判断
-        if (!force && (loading || !game || game.status === 2)) {
-        	return; // 已完成的任务不需要处理
-        }
+		if (!force && (loading || !game || game.status === 2)) {
+			return; // 已完成的任务不需要处理
+		}
 		let testPath = ''
 		if (window.location.port == 3007) {
 			testPath = 'http://test-newweb.educoder.net'
 		}
+
+
 		// var url = `${testPath}/api/v1/games/${ game.identifier }/cost_time`
-		var url = `${testPath}/api/tasks/${ game.identifier }/cost_time${getRandomNumber()}`
-	    window.$.ajax({
-	        type: 'get',
-	        url: url,
-	        async: async, //IMPORTANT, the call will be synchronous
-	        data: {
-            time: game.cost_time
-	        }
-	    }).done((data) => {
-	        console.log('complete');
-	    });
+		var url = `${testPath}/api/tasks/${game.identifier}/cost_time${getRandomNumber()}`
+		window.$.ajax({
+			type: 'get',
+			url: url,
+			async: async, //IMPORTANT, the call will be synchronous
+			data: {
+				time: game.cost_time
+			}
+		}).done((data) => {
+			console.log('complete');
+		});
 	}
 
 	onGamePassed(passed) {
@@ -194,7 +216,7 @@ class TPIContextProvider extends Component {
 		// 随便给个分，以免重新评测时又出现评星组件（注意：目前game.star没有显示在界面上，如果有则不能这么做）
 		// game.star = 6;
 		this.setState({
-			game: update(game, {star: { $set: 6 }}),
+			game: update(game, { star: { $set: 6 } }),
 			currentGamePassed: !!passed
 		})
 	}
@@ -231,40 +253,31 @@ class TPIContextProvider extends Component {
 	}
 
 
-	// praise_tread/praise_plus?obj_id=569&obj_type=Challenge&horizontal=true&game_praise=true
-	/*
-		TODO 旧的接口在未登录时的返回值
-		//获取登录页面地址
-var signinPath = '/';
-var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
-        '<div class="task-popup-content"><p class="task-popup-text-center font-16 mt10 mb10">您还没有登录，请登录后再执行此操作，谢谢！</p></div><div class="task-popup-right-sure clearfix">'+
-        '<a href="javascript:void(0);" onclick="hideModal();" class="task-btn">取消</a><a href="' + signinPath + '" class="task-btn task-btn-orange ml15">登录</a></div></div>';
-pop_box_new(htmlvalue, 480, 182);
-	*/
 	praisePlus() {
 		const { challenge, game } = this.state;
 		let praise = true;
 		const url = `/tasks/${game.identifier}/plus_or_cancel_praise.json`
 		// const url = `/praise_tread/praise_plus?obj_id=${challenge.id}&obj_type=Challenge&horizontal=${praise}&game_praise=true`
 		axios.post(url)
-		  .then((response) => {
+			.then((response) => {
 
-			    if (response.data) {
-			    	const { praise_count, praise } = response.data;
-			    	// challenge.praise_count = praise_tread_count;
-			    	// challenge.user_praise = praise;
-			    	this.setState({ challenge: update(challenge,
-			    		{
-			    			praise_count: { $set: praise_count },
-			    			user_praise:  { $set: praise },
-			    		})
-			    	})
-			    }
+				if (response.data) {
+					const { praise_count, praise } = response.data;
+					// challenge.praise_count = praise_tread_count;
+					// challenge.user_praise = praise;
+					this.setState({
+						challenge: update(challenge,
+							{
+								praise_count: { $set: praise_count },
+								user_praise: { $set: praise },
+							})
+					})
+				}
 
-		  	})
-		  	.catch(function (error) {
-		    	console.log(error);
-		  	});
+			})
+			.catch(function (error) {
+				console.log(error);
+			});
 	}
 
 	onPathChange(index, callback) {
@@ -272,7 +285,7 @@ pop_box_new(htmlvalue, 480, 182);
 		// challenge = Object.assign({}, challenge)
 		// challenge.pathIndex = index;
 		this.setState({
-			challenge: update(challenge, {pathIndex: { $set: index }}),
+			challenge: update(challenge, { pathIndex: { $set: index } }),
 		}, () => {
 			callback && callback()
 		})
@@ -290,25 +303,26 @@ pop_box_new(htmlvalue, 480, 182);
 
 		challenge.path = path;
 		const newChallenge = this.handleChallengePath(challenge);
-		this.setState({ challenge: newChallenge,
-			myshixun: update(myshixun, {system_tip: { $set: false }}),
+		this.setState({
+			challenge: newChallenge,
+			myshixun: update(myshixun, { system_tip: { $set: false } }),
 		})
 	}
 
 	handleChallengePath(challenge) {
 		if (challenge.path && typeof challenge.path === "string") {		// 多path的处理
-  			let path = challenge.path.split('；');
-  			_.remove(path, (item)=> !item)
-  			if (path.length > 1) {
-	  			challenge.path = path;
-	  			challenge.multiPath = true;
-  			} else {
-  				challenge.path = challenge.path.replace('；', '').trim()	// 多path 改为单path 出现了  aaa.java；的情况
-  				challenge.multiPath = false;
-  			}
-  		}
-  		challenge.pathIndex = 0;
-  		return challenge;
+			let path = challenge.path.split('；');
+			_.remove(path, (item) => !item)
+			if (path.length > 1) {
+				challenge.path = path;
+				challenge.multiPath = true;
+			} else {
+				challenge.path = challenge.path.replace('；', '').trim()	// 多path 改为单path 出现了  aaa.java；的情况
+				challenge.multiPath = false;
+			}
+		}
+		challenge.pathIndex = 0;
+		return challenge;
 	}
 
 	newResData2OldResData(newResData) {
@@ -330,7 +344,7 @@ pop_box_new(htmlvalue, 480, 182);
 		newResData.output_sets.test_sets_count = newResData.test_sets_count
 		// newResData.output_sets.had_passed_testsests_error_count = newResData.sets_error_count
 		newResData.output_sets.had_passed_testsests_error_count = newResData.test_sets_count
-				- newResData.sets_error_count
+			- newResData.sets_error_count
 		//			allowed_hidden_testset
 		//			sets_error_count
 		//			test_sets_count
@@ -344,75 +358,75 @@ pop_box_new(htmlvalue, 480, 182);
 	// 将若干数据重新组织一下
 	_handleResponseData(resData_arg) {
 		const resData = this.newResData2OldResData(Object.assign({}, resData_arg))
-	    let challenge = resData.challenge;
-	    challenge.isHtml = false;
-  		challenge.isWeb = false;
-  		challenge.isAndroid = false;
-  		challenge.showLanguagePictrue = false;
-  		challenge.hasAnswer = resData.has_answer;
+		let challenge = resData.challenge;
+		challenge.isHtml = false;
+		challenge.isWeb = false;
+		challenge.isAndroid = false;
+		challenge.showLanguagePictrue = false;
+		challenge.hasAnswer = resData.has_answer;
 
-	    let output_sets = resData.output_sets;
+		let output_sets = resData.output_sets;
 		if (resData.st === 0) {		// 代码题
-	    	challenge = this.handleChallengePath(challenge)
+			challenge = this.handleChallengePath(challenge)
 
-	  		const mirror_name = (resData.mirror_name && resData.mirror_name.join)
-	  				? resData.mirror_name.join(';') : (resData.mirror_name || '');
-	  		if (mirror_name.indexOf('Html') !== -1) {
-	  			challenge.isHtml = true;
-	  			challenge.showLanguagePictrue = true;
-	  		} else if (mirror_name.indexOf('Web') !== -1 || mirror_name.indexOf('JFinal') !== -1) {
-	  			challenge.isWeb = true;
-	  		} else if (mirror_name.indexOf('Android') !== -1) {
-	  			challenge.isAndroid = true;
-	  		}
+			const mirror_name = (resData.mirror_name && resData.mirror_name.join)
+				? resData.mirror_name.join(';') : (resData.mirror_name || '');
+			if (mirror_name.indexOf('Html') !== -1) {
+				challenge.isHtml = true;
+				challenge.showLanguagePictrue = true;
+			} else if (mirror_name.indexOf('Web') !== -1 || mirror_name.indexOf('JFinal') !== -1) {
+				challenge.isWeb = true;
+			} else if (mirror_name.indexOf('Android') !== -1) {
+				challenge.isAndroid = true;
+			}
 
-	  		if (output_sets && output_sets.test_sets && typeof output_sets.test_sets == 'string') {
-	  			const test_sets_array = JSON.parse("[" + output_sets.test_sets + "]");
-	  			output_sets.test_sets_array = test_sets_array;
-	  		} else {
-	  			output_sets.test_sets_array = output_sets.test_sets
-	  		}
+			if (output_sets && output_sets.test_sets && typeof output_sets.test_sets == 'string') {
+				const test_sets_array = JSON.parse("[" + output_sets.test_sets + "]");
+				output_sets.test_sets_array = test_sets_array;
+			} else {
+				output_sets.test_sets_array = output_sets.test_sets
+			}
 
-	    } else {		// 选择题
-	    	// 选择题题干markdown初始化
-	    	const $ = window.$
-			window.setTimeout(()=>{
+		} else {		// 选择题
+			// 选择题题干markdown初始化
+			const $ = window.$
+			window.setTimeout(() => {
 				var lens = $("#choiceRepositoryView textarea").length;
 
-		        for(var i = 1; i <= lens; i++){
-		            window.editormd.markdownToHTML("choose_subject_" + i, {
-		                htmlDecode: "style,script,iframe",  // you can filter tags decode
-		                taskList: true,
-		                tex: true,  // 数学公式
-		                // flowChart: true,  // 默认不解析
-		                // sequenceDiagram: true // 默认不解析
-		            });
-		        }
-	        }, 400)
-	    }
-	    challenge.user_praise = resData.user_praise;
-	    challenge.praise_count = resData.praise_count;
-	    challenge.showWebDisplayButton = false;
-    	resData.challenge = challenge;
+				for (var i = 1; i <= lens; i++) {
+					window.editormd.markdownToHTML("choose_subject_" + i, {
+						htmlDecode: "style,script,iframe",  // you can filter tags decode
+						taskList: true,
+						tex: true,  // 数学公式
+						// flowChart: true,  // 默认不解析
+						// sequenceDiagram: true // 默认不解析
+					});
+				}
+			}, 400)
+		}
+		challenge.user_praise = resData.user_praise;
+		challenge.praise_count = resData.praise_count;
+		challenge.showWebDisplayButton = false;
+		resData.challenge = challenge;
 
-	    // 将一些属性写到game上
-  		let game = resData.game;
-  		game.prev_game = resData.prev_game;
-  		game.next_game = resData.next_game;
+		// 将一些属性写到game上
+		let game = resData.game;
+		game.prev_game = resData.prev_game;
+		game.next_game = resData.next_game;
 		if (game.status == 2) {
 			// 已通关
 			game.isPassThrough = true
 		}
-  		resData.game = game;
+		resData.game = game;
 
-  		const { tpm_cases_modified, tpm_modified, tpm_script_modified, myshixun } = resData;
-  		if (myshixun.system_tip) {
+		const { tpm_cases_modified, tpm_modified, tpm_script_modified, myshixun } = resData;
+		if (myshixun.system_tip) {
 			// system_tip为true的时候 不弹框提示用户更新
-  			resData.showUpdateDialog = false
-  		} else {
-  			let needUpdateScript = (tpm_modified || tpm_script_modified) && challenge.st === 0;
-  			resData.showUpdateDialog = needUpdateScript || tpm_cases_modified
-  		}
+			resData.showUpdateDialog = false
+		} else {
+			let needUpdateScript = (tpm_modified || tpm_script_modified) && challenge.st === 0;
+			resData.showUpdateDialog = needUpdateScript || tpm_cases_modified
+		}
 
 		/**
 		email: "721773699@qq.com"
@@ -423,29 +437,29 @@ pop_box_new(htmlvalue, 480, 182);
 		name: "Coder"
 		user_url: "/users/innov"
 		 */
-	    let user = resData.user;
-  		user.username = resData.user.name;
-  		user.user_url = `/users/${resData.user.login}`;
-  		// user.image_url = resData.image_url;
-  		user.is_teacher = resData.is_teacher;
-  		resData.user = user;
-  		this._handleUserAuthor(resData)
-  		// TODO  测试
-  		// resData.power = 0;
+		let user = resData.user;
+		user.username = resData.user.name;
+		user.user_url = `/users/${resData.user.login}`;
+		// user.image_url = resData.image_url;
+		user.is_teacher = resData.is_teacher;
+		resData.user = user;
+		this._handleUserAuthor(resData)
+		// TODO  测试
+		// resData.power = 0;
 
 		resData.shixun.vnc = !!resData.vnc_url
 		resData.shixun.vnc_evaluate = resData.vnc_evaluate
 
-	    this.setState({
-    		...resData,
-    		currentGamePassed: false,
-    		loading: false,
-    		testSetsExpandedArray: testSetsExpandedArrayInitVal.slice(0),
-    	})
+		this.setState({
+			...resData,
+			currentGamePassed: false,
+			loading: false,
+			testSetsExpandedArray: testSetsExpandedArrayInitVal.slice(0),
+		})
 
-	    window.document.title = resData.shixun.name
+		window.document.title = resData.shixun.name
 
-	    window.__myshixun = resData.myshixun;		// tpi_html_show需要用到
+		window.__myshixun = resData.myshixun;		// tpi_html_show需要用到
 	}
 	_handleUserAuthor(resData) {
 		// tpi tpm权限控制
@@ -502,54 +516,29 @@ pop_box_new(htmlvalue, 480, 182);
 
 	fetchAll(stageId, noTimeout) {
 
-		if (window.__fetchAllFlag == true ) {
+		if (window.__fetchAllFlag == true) {
 			console.log('TPIContextProvider call fetchAll repeatly!')
 			return;
 		}
 		// 切换关卡的时候，同步costTime
 		this._updateCostTime(true);
 
-		if (!stageId) {
-			// stageId = 'zl6kx8f7vfpo';
-			// http://localhost:3000/myshixuns/so5w6iap97/stages/zl6kx8f7vfpo
-		}
-
-		// var url = `/api/v1/games/${stageId}`
 		var url = `/tasks/${stageId}.json`
-		// {"status":1,"message":"undefined method `authenticate!' for #<Grape::Endpoint:0xc8c91c0>"}
 		window.__fetchAllFlag = true;
-
-
 		this.setState({
-	    	loading: true,
-	    	currentGamePassed: false,  // 切换game时重置passed字段
-	    })
-
-		// test
-		// var data = {"st":0,"discusses_count":0,"game_count":3,"record_onsume_time":0.36,"prev_game":null,"next_game":"7p9xwo2hklqv","praise_count":0,"user_praise":false,"time_limit":20,"tomcat_url":"http://47.96.157.89","is_teacher":false,"myshixun_manager":true,"game":{"id":2192828,"myshixun_id":580911,"user_id":57844,"created_at":"2019-09-03T15:50:49.000+08:00","updated_at":"2019-09-03T15:51:05.000+08:00","status":2,"final_score":0,"challenge_id":10010,"open_time":"2019-09-03T15:50:49.000+08:00","identifier":"hknvz4oaw825","answer_open":0,"end_time":"2019-09-03T15:51:04.000+08:00","retry_status":0,"resubmit_identifier":null,"test_sets_view":false,"picture_path":null,"accuracy":1.0,"modify_time":"2019-09-03T15:23:33.000+08:00","star":0,"cost_time":14,"evaluate_count":1,"answer_deduction":0},"challenge":{"id":10010,"shixun_id":3516,"subject":"1.1 列表操作","position":1,"task_pass":"[TOC]\n\n---\n\n####任务描述\n\n\n数据集a包含1-10共10个整数，请以a为输入数据，编写python程序，实现如下功能：\n①\t用2种方法输出a中所有奇数\n②\t输出大于3，小于7的偶数\n③\t用2种方法输出[1,2,3,…10,11,…20]\n④\t输出a的最大值、最小值。\n⑤\t用2种方法输出[10,9,…2,1]\n⑥\t输出[1,2,3,1,2,3,1,2,3,1,2,3]\n\n\n####相关知识\n\n\n请自行学习相关知识\n\n\n---\n开始你的任务吧，祝你成功！","score":100,"path":"1-1-stu.py","st":0,"web_route":null,"modify_time":"2019-09-03T15:23:33.000+08:00","exec_time":20,"praises_count":0},"shixun":{"id":3516,"name":"作业1——Python程序设计","user_id":77620,"gpid":null,"visits":23,"created_at":"2019-09-03T14:18:17.000+08:00","updated_at":"2019-09-03T15:58:16.000+08:00","status":0,"language":null,"authentication":false,"identifier":"6lzjig58","trainee":1,"major_id":null,"webssh":2,"homepage_show":false,"hidden":false,"fork_from":null,"can_copy":true,"modify_time":"2019-09-03T14:18:17.000+08:00","reset_time":"2019-09-03T14:18:17.000+08:00","publish_time":null,"closer_id":null,"end_time":null,"git_url":null,"vnc":null,"myshixuns_count":3,"challenges_count":3,"use_scope":0,"mirror_script_id":20,"image_text":null,"code_hidden":false,"task_pass":true,"exec_time":20,"test_set_permission":true,"sigle_training":false,"hide_code":false,"multi_webssh":false,"excute_time":null,"repo_name":"p09218567/6lzjig58","averge_star":5.0,"opening_time":null,"users_count":1,"forbid_copy":false,"pod_life":0},"myshixun":{"id":580911,"shixun_id":3516,"is_public":true,"user_id":57844,"gpid":null,"created_at":"2019-09-03T15:50:49.000+08:00","updated_at":"2019-09-03T15:59:04.000+08:00","status":0,"identifier":"k36hm4rwav","commit_id":"f25e1713882156480fc45ce0af57eff395a5037f","modify_time":"2019-09-03T14:18:17.000+08:00","reset_time":"2019-09-03T14:18:17.000+08:00","system_tip":false,"git_url":null,"onclick_time":"2019-09-03T15:50:49.000+08:00","repo_name":"p53276410/k36hm4rwav20190903155049"},"user":{"user_id":57844,"login":"p53276410","name":"文振乾","grade":24624,"identity":1,"image_url":"avatars/User/57844","school":"EduCoder团队"},"tpm_modified":true,"tpm_cases_modified":false,"mirror_name":["Python3.6"],"has_answer":false,"test_sets":[{"is_public":true,"result":true,"input":"","output":"result of a:\n[1, 3, 5, 7, 9]\n[1, 3, 5, 7, 9]\nresult of b:\n[2, 4, 6, 8, 10]\nresult of c:\n[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]\n[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]\nresult of d:\nThe minimum is:1\nThe maxium is:10\nresult of e:\n[10, 9, 8, 7, 6, 5, 4, 3, 2, 1]\n[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]\nresult of f:\n[10, 9, 8, 10, 9, 8, 10, 9, 8, 10, 9, 8]\n","actual_output":"result of a:\r\n[1, 3, 5, 7, 9]\r\n[1, 3, 5, 7, 9]\r\nresult of b:\r\n[2, 4, 6, 8, 10]\r\nresult of c:\r\n[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]\r\n[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]\r\nresult of d:\r\nThe minimum is:1\r\nThe maxium is:10\r\nresult of e:\r\n[10, 9, 8, 7, 6, 5, 4, 3, 2, 1]\r\n[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]\r\nresult of f:\r\n[10, 9, 8, 10, 9, 8, 10, 9, 8, 10, 9, 8]\r\n","compile_success":1,"ts_time":0.05,"ts_mem":8.77}],"allowed_unlock":true,"last_compile_output":"compile successfully","test_sets_count":1,"sets_error_count":0}
-		// data.test_sets[0].actual_output = data.test_sets[0].actual_output.replace(/\r\n/g, '\n')
-		// data.test_sets[0].output = data.test_sets[0].output.replace(/\r\n/g, '\n')
-		// console.log(JSON.stringify(data))
-		// data.shixun.vnc = true
-		// data.vnc_url= "http://47.96.157.89:41158/vnc_lite.html?password=headless"
-
-		// this._handleResponseData(data)
-		// return
-
-		axios.get(url, {
-				// https://stackoverflow.com/questions/48861290/the-value-of-the-access-control-allow-origin-header-in-the-response-must-not-b
-    			// withCredentials: true,
-    		})
-		  .then((response) => {
-			    // {"status":1,"message":"Unauthorized. \u7528\u6237\u8ba4\u8bc1\u5931\u8d25."}
+			loading: true,
+			currentGamePassed: false,  // 切换game时重置passed字段
+		})
 
+		axios.get(url)
+			.then((response) => {
 				window.__fetchAllFlag = false;
 
-			    if (response.data.status == 403) {
+				if (response.data.status == 403) {
 					window.location.href = "/403";
-			    	return;
-			    }
-			    if (response.data.status == 404) {
+					return;
+				}
+				if (response.data.status == 404) {
 					// 如果第一次发生404，则隔1s后再调用一次本接口；（因为ucloud主从同步可能有延迟）
 					if (!noTimeout) {
 						setTimeout(() => {
@@ -557,16 +546,16 @@ pop_box_new(htmlvalue, 480, 182);
 						}, 1000)
 						return;
 					}
-			    	window.location.href = '/myshixuns/not_found'
-			    	return;
-			    }
+					window.location.href = '/myshixuns/not_found'
+					return;
+				}
 
-			    this._handleResponseData(response.data)
+				this._handleResponseData(response.data)
 
-		  	})
-		  	.catch(function (error) {
-		    	console.log(error);
-		  	});
+			})
+			.catch(function (error) {
+				console.log(error);
+			});
 
 	}
 
@@ -575,7 +564,7 @@ pop_box_new(htmlvalue, 480, 182);
 		if (resData.final_score) {
 			var game = this.state.game;
 			this.setState({
-				game: update(game, {final_score: { $set: resData.final_score }}),
+				game: update(game, { final_score: { $set: resData.final_score } }),
 				grade: resData.grade
 			})
 		} else {
@@ -589,7 +578,7 @@ pop_box_new(htmlvalue, 480, 182);
 		this.setState({
 			game: (this.state.game.status == 2 ? update(this.state.game, {
 				isPassThrough: { $set: true },
-			}) : this.state.game) ,
+			}) : this.state.game),
 			currentGamePassed: false
 		})
 	}
@@ -625,10 +614,11 @@ pop_box_new(htmlvalue, 480, 182);
 			window.clearTimeout(this.showWebDisplayButtonTimeout)
 		}
 		this.showWebDisplayButtonTimeout = window.setTimeout(() => {
-			this.setState({ challenge: update(challenge,
-				{
-					showWebDisplayButton: { $set: false },
-				})
+			this.setState({
+				challenge: update(challenge,
+					{
+						showWebDisplayButton: { $set: false },
+					})
 			})
 			this.showWebDisplayButtonTimeout = null
 		}, 61 * 1000)
@@ -657,32 +647,16 @@ pop_box_new(htmlvalue, 480, 182);
 	language_display(data) {
 		const { game, tomcat_url } = this.state;
 		const challenge = Object.assign({}, this.state.challenge)
-		if(challenge.isWeb && data.port != -1) {
-            // var $result = $("#php_display");
-            challenge.showWebDisplayButton = true;	// ActionView处是否出现查看效果按钮
+		if (challenge.isWeb && data.port != -1) {
+			challenge.showWebDisplayButton = true;	// ActionView处是否出现查看效果按钮
 			this.initDisplayInterval()
 
-            const path = challenge.web_route || challenge.path
-            const webDisplayUrl = `${tomcat_url}:${data.port}/${path}`
-            challenge.webDisplayUrl = webDisplayUrl
-            challenge.showLanguagePictrue = true;	// 评测通过弹出层是否出现查看效果按钮
-        }
-		// else if(challenge.isAndroid && data.picture != 0){
-        // 	// https://www.educoder.net/shixuns/qrcode?game_id=218589&_=1525571882782
-        //     $.ajax({
-        //         url: `/shixuns/qrcode?game_id=${game.id}`,
-        //         dataType: 'script'
-        //     });
-        //     challenge.showLanguagePictrue = true;
-        // }
-		else if(data.picture != 0){
-        	// 对应服务端erb文件为  _picture_display.html.erb
-            // $.ajax({
-            //     url: "/users/picture_show?game_id="+data.picture,
-            //     cache: false,
-            //     dataType: 'script'
-            // });
-
+			const path = challenge.web_route || challenge.path
+			const webDisplayUrl = `${tomcat_url}:${data.port}/${path}`
+			challenge.webDisplayUrl = webDisplayUrl
+			challenge.showLanguagePictrue = true;	// 评测通过弹出层是否出现查看效果按钮
+		}
+		else if (data.picture != 0) {
 			/**
 				{
 					"type": "image",
@@ -693,16 +667,15 @@ pop_box_new(htmlvalue, 480, 182);
 			 */
 			const url = `/tasks/${game.identifier}/picture_display.json`
 			axios.get(url)
-		  		.then((response) => {
-					// response.data.type qrcode_str
+				.then((response) => {
 					this.showEffectDisplay(response.data)
 				})
 
-            challenge.showLanguagePictrue = true;
-        }
-        this.setState({
-        	challenge
-        })
+			challenge.showLanguagePictrue = true;
+		}
+		this.setState({
+			challenge
+		})
 	}
 	onRunCodeTestFinish(response) {
 		console.log('onRunCodeTestFinish', response)
@@ -710,35 +683,24 @@ pop_box_new(htmlvalue, 480, 182);
 			, had_test_count, had_passed_testsests_error_count, had_passed_testsests_hidden_count
 			, had_passed_testsests_public_count, final_score, gold, experience, latest_output, status
 			, had_done, score, tag_count, power, record, next_game, grade, picture,
-			sets_error_count, last_compile_output, record_consume_time} = response;
+			sets_error_count, last_compile_output, record_consume_time } = response;
 
 		const { game } = this.state;
-
 		const currentGamePassed = this.props.game !== 2 && status === 2
-
-
-
 		// 评测通过了，立即同步costTime
 		currentGamePassed && this._updateCostTime(true, true);
-
-
 		const output_sets = {
 			"test_sets": test_sets,
 			"test_sets_array": test_sets,
-	        "had_test_count": had_test_count || test_sets_count,
-	        "test_sets_count": test_sets_count,
-	        // "had_passed_testsests_error_count": had_passed_testsests_error_count,
-	        "had_passed_testsests_error_count": test_sets_count - sets_error_count,
-	        "test_sets_hidden_count": test_sets_hidden_count,
-	        "test_sets_public_count": test_sets_public_count,
-	        "had_passed_testsests_hidden_count": had_passed_testsests_hidden_count,
-	        "had_passed_testsests_public_count": had_passed_testsests_public_count
+			"had_test_count": had_test_count || test_sets_count,
+			"test_sets_count": test_sets_count,
+			// "had_passed_testsests_error_count": had_passed_testsests_error_count,
+			"had_passed_testsests_error_count": test_sets_count - sets_error_count,
+			"test_sets_hidden_count": test_sets_hidden_count,
+			"test_sets_public_count": test_sets_public_count,
+			"had_passed_testsests_hidden_count": had_passed_testsests_hidden_count,
+			"had_passed_testsests_public_count": had_passed_testsests_public_count
 		};
-		// if (output_sets && output_sets.test_sets) {
-  		// 	const test_sets_array = JSON.parse("[" + output_sets.test_sets + "]");
-  		// 	output_sets.test_sets_array = test_sets_array;
-  		// }
-
 		//   检查是否编译通过
 		let compileSuccess = false;
 		if (test_sets && test_sets.length) {
@@ -792,36 +754,32 @@ pop_box_new(htmlvalue, 480, 182);
 	testSetUnlock() {
 		const { game, challenge } = this.state;
 		const url = `/tasks/${game.identifier}/check_test_sets.json`
-		axios.get(url, {
-    			// withCredentials: true,
-    		})
-		  .then((response) => {
+		axios.get(url)
+			.then((response) => {
 				// TODO status -2 重复操作，直接解锁
-			    if (response.data.test_sets == -1) {
-			    	console.error('testSetUnlock失败！')
-			    	this.showSnackbar(response.data.message)
-			    	return;
-			    } else {
-			    	// 被扣除的金币，是负数
-			    	const deltaScore = -challenge.score * 5;
-					// output_sets
+				if (response.data.test_sets == -1) {
+					console.error('testSetUnlock失败！')
+					this.showSnackbar(response.data.message)
+					return;
+				} else {
+					// 被扣除的金币，是负数
+					const deltaScore = -challenge.score * 5;
 					let { output_sets } = this.state;
 					output_sets = Object.assign({}, output_sets);
-					// const test_sets_array = JSON.parse("[" + response.data.test_sets + "]");
-	  				output_sets.test_sets_array = response.data.test_sets;
-			    	this.setState({
+					output_sets.test_sets_array = response.data.test_sets;
+					this.setState({
 						output_sets: output_sets,
-			    		grade: this.state.grade + deltaScore,
-			    		game : update(game, {test_sets_view: { $set: true }}),
-			    		testSetsExpandedArray: testSetsExpandedArrayInitVal.slice(0)
-			    	})
-			    	this.handleGdialogClose();
-			    }
+						grade: this.state.grade + deltaScore,
+						game: update(game, { test_sets_view: { $set: true } }),
+						testSetsExpandedArray: testSetsExpandedArrayInitVal.slice(0)
+					})
+					this.handleGdialogClose();
+				}
 
-		  	})
-		  	.catch(function (error) {
-		    	console.log(error);
-		  	});
+			})
+			.catch(function (error) {
+				console.log(error);
+			});
 	}
 
 	handleSnackbarClose() {
@@ -841,14 +799,6 @@ pop_box_new(htmlvalue, 480, 182);
 		})
 	}
 
-	/*
-        TODO 写成HOC组件，更好复用
-		全局的Dialog this.props.showDialog调用即可
-		@param contentText  dialog显示的提示文本
-		@param callback 	确定按钮回调方法
-		@param moreButtonsRender  除了“确定”、“取消”按钮外的其他按钮
-		@param okButtonText  “确定”按钮显示文本，如 继续查看
-	*/
 	showDialog(params) {
 		const { contentText, callback, moreButtonsRender, okButtonText, isSingleButton } = params;
 
@@ -864,9 +814,6 @@ pop_box_new(htmlvalue, 480, 182);
 	onGdialogOkBtnClick() {
 
 		this.dialogOkCallback && this.dialogOkCallback();
-		// this.setState({
-		// 	gDialogOpen: true
-		// })
 	}
 	handleGdialogClose = () => {
 		this.setState({
@@ -876,94 +823,96 @@ pop_box_new(htmlvalue, 480, 182);
 	render() {
 		const { classes } = this.props;
 		return (
-				<TPIContext.Provider
-					value={{
-						...this.props,
-						...this.state,
-						resetTestSetsExpandedArray: this.resetTestSetsExpandedArray,
-						onRunCodeTestFinish: this.onRunCodeTestFinish,
-						onRunChooseTestFinish: this.onRunChooseTestFinish,
-						testSetUnlock: this.testSetUnlock,
+			<TPIContext.Provider
+				value={{
+					...this.props,
+					...this.state,
+					resetTestSetsExpandedArray: this.resetTestSetsExpandedArray,
+					onRunCodeTestFinish: this.onRunCodeTestFinish,
+					onRunChooseTestFinish: this.onRunChooseTestFinish,
+					testSetUnlock: this.testSetUnlock,
 
-						onTestSetHeaderClick: this.onTestSetHeaderClick,
+					onTestSetHeaderClick: this.onTestSetHeaderClick,
 
-						readGameAnswer: this.readGameAnswer,
+					readGameAnswer: this.readGameAnswer,
 
-						onShowPrevStage: this.onShowPrevStage,
-						onShowNextStage: this.onShowNextStage,
+					onShowPrevStage: this.onShowPrevStage,
+					onShowNextStage: this.onShowNextStage,
 
-						praisePlus: this.praisePlus,
-						onGamePassed: this.onGamePassed,
-						closeTaskResultLayer: () => this.closeTaskResultLayer(),
+					praisePlus: this.praisePlus,
+					onGamePassed: this.onGamePassed,
+					closeTaskResultLayer: () => this.closeTaskResultLayer(),
 
-						onPathChange: this.onPathChange,
-						updateChallengePath: this.updateChallengePath,
+					onPathChange: this.onPathChange,
+					updateChallengePath: this.updateChallengePath,
 
-						showSnackbar: this.showSnackbar,
-						showDialog: this.showDialog,
-						handleGdialogClose: () => this.handleGdialogClose(),
+					showSnackbar: this.showSnackbar,
+					showDialog: this.showDialog,
+					handleGdialogClose: () => this.handleGdialogClose(),
 
-						onShowUpdateDialog: this.onShowUpdateDialog,
-						updateDialogClose: this.updateDialogClose,
+					onShowUpdateDialog: this.onShowUpdateDialog,
+					updateDialogClose: this.updateDialogClose,
 
-						match: this.props.match
-					}}
+					match: this.props.match
+				}}
+			>
+				<Dialog
+					id="tpi-dialog"
+					open={this.state.gDialogOpen}
+					disableEscapeKeyDown={true}
+					onClose={() => this.handleGdialogClose()}
 				>
-					<Dialog
-						id="tpi-dialog"
-			          	open={this.state.gDialogOpen}
-						disableEscapeKeyDown={true}
-			          	onClose={() => this.handleGdialogClose()}
-			        >
-				       	<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
-			          	<DialogContent id="dialog-content">
-				            <DialogContentText id="alert-dialog-description" style={{textAlign: 'center'}}>
-					        	{this.state.gDialogContentText}
-				            </DialogContentText>
-			          	</DialogContent>
-						  {/* mb20 加了有样式问题 */}
-			          	<DialogActions className={""} id="dialog-actions">
-										{ this.isSingleButton ? <div className="task-popup-submit clearfix"
-														style={{ textAlign: 'center', 'margin-bottom': '14px'}}>
-													<a  className="task-btn task-btn-orange"
-														onClick={this.handleGdialogClose}
-													>知道啦</a>
-												</div> :
-										<React.Fragment>
-											<Button onClick={() => this.handleGdialogClose()} color="primary"
-													className={`${classes.button} ${classes.buttonGray} ${classes.borderRadiusNone}`}>
-												关闭
+					<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
+					<DialogContent id="dialog-content">
+						<DialogContentText id="alert-dialog-description" style={{ textAlign: 'center' }}>
+							{this.state.gDialogContentText}
+						</DialogContentText>
+					</DialogContent>
+					{/* mb20 加了有样式问题 */}
+					<DialogActions className={""} id="dialog-actions">
+						{this.isSingleButton ? <div className="task-popup-submit clearfix"
+							style={{ textAlign: 'center', 'margin-bottom': '14px' }}>
+							<a className="task-btn task-btn-orange"
+								onClick={this.handleGdialogClose}
+							>知道啦</a>
+						</div> :
+							<React.Fragment>
+								<Button onClick={() => this.handleGdialogClose()} color="primary"
+									className={`${classes.button} ${classes.buttonGray} ${classes.borderRadiusNone}`}>
+									关闭
 											</Button>
-											<Button variant="raised" className={`${classes.button} ${classes.borderRadiusNone}`}
-													onClick={() => this.onGdialogOkBtnClick() } color="primary" autoFocus>
-														{ this.okButtonText ? this.okButtonText : '确定' }
-											</Button>
-										</React.Fragment>	}
-										{this.moreButtonsRender && this.moreButtonsRender()}
-			          	</DialogActions>
-			        </Dialog>
+								<Button variant="raised" className={`${classes.button} ${classes.borderRadiusNone}`}
+									onClick={() => this.onGdialogOkBtnClick()} color="primary" autoFocus>
+									{this.okButtonText ? this.okButtonText : '确定'}
+								</Button>
+							</React.Fragment>}
+						{this.moreButtonsRender && this.moreButtonsRender()}
+					</DialogActions>
+				</Dialog>
 
-					<Snackbar
-						className={"rootSnackbar"}
-			          	open={this.state.snackbarOpen}
-			          	autoHideDuration={3000}
-			          	anchorOrigin={{ vertical: this.state.snackbarVertical || 'top'
-			          			, horizontal: this.state.snackbarHorizontal || 'center' }}
-			          	onClose={() => this.handleSnackbarClose()}
-			          	transition={Fade}
-			          	SnackbarContentProps={{
-			            	'aria-describedby': 'message-id',
-			          	}}
-			          	resumeHideDuration={2000}
-			        	message={<span id="message-id">{this.state.snackbarText}</span>}
-			        />
-					{this.props.children}
-				</TPIContext.Provider>
+				<Snackbar
+					className={"rootSnackbar"}
+					open={this.state.snackbarOpen}
+					autoHideDuration={3000}
+					anchorOrigin={{
+						vertical: this.state.snackbarVertical || 'top'
+						, horizontal: this.state.snackbarHorizontal || 'center'
+					}}
+					onClose={() => this.handleSnackbarClose()}
+					transition={Fade}
+					SnackbarContentProps={{
+						'aria-describedby': 'message-id',
+					}}
+					resumeHideDuration={2000}
+					message={<span id="message-id">{this.state.snackbarText}</span>}
+				/>
+				{this.props.children}
+			</TPIContext.Provider>
 		)
 	}
 }
 
-export default  CNotificationHOC() (withStyles(styles) (TPIContextProvider));
+export default CNotificationHOC()(withStyles(styles)(TPIContextProvider));
 
 
 
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 4da0f835..341c7154 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -2,15 +2,15 @@ import React , {Component} from 'react';
 import {Link} from 'react-router-dom';
 
 import axios from 'axios';
-import Nav from '../Order/Nav';
 import UploadComponent from '../Upload/Index';
 import { getImageUrl } from 'educoder';
 import {Modal, Form, Input, Tooltip, Popconfirm, Pagination, Spin, Dropdown, Icon, Menu, Select} from 'antd'
 import Attachments from '../Upload/attachment'
 import './merge.css';
-import QuillForEditor from '../quillForEditor';
 import MergeSubmit from './MergeSubmit';
 import AmplifyImg from '../Order/AmplifyImg';
+import MDEditor from '../../modules/tpm/challengesnew/tpm-md-editor';
+import RenderHtml from '../../components/render-html';
 
 const Option = Select.Option;
 const TextArea = Input.TextArea;
@@ -115,7 +115,7 @@ class MessageCount extends Component{
           const url = `/issues/${data.issue.id}/journals.json`;
           axios.post(url,{
             ...values,
-            content:JSON.stringify(commentsContent),
+            content:commentsContent,
             issue_id:data.id,
             attachment_ids:fileList
           }).then(result=>{
@@ -212,7 +212,7 @@ class MessageCount extends Component{
       axios.put(url,{
         issue_id:orderId,
         id:id,
-        content:JSON.stringify(this.state.countvalue)
+        content:this.state.countvalue
       }).then(result=>{
         if(result){
           this.setState({
@@ -441,31 +441,10 @@ class MessageCount extends Component{
     })
   }
 
-  stringJson=(value) =>{
-    let _value = null;
-
-    try {
-      _value = JSON.parse(value);
-    } catch (e) {
-      _value = value;
-    }
-    return _value
-  }
-  commentCtx = (ctx) => {
-    let _ctx = null;
-
-    try {
-      _ctx = JSON.parse(ctx);
-    } catch (e) {
-      _ctx = ctx;
-    }
-
+  
+  commentCtx = (v) => {
     return (
-      <QuillForEditor
-        readOnly={true}
-        value={_ctx}
-        showUploadImage={this.handleShowImage}
-      />
+      <RenderHtml className="break_word_comments" value={v} />
     )
   };
   handleShowImage=(value)=>{
@@ -605,20 +584,9 @@ class MessageCount extends Component{
                         }
                       </div>
                       <div style={{display: (isedit && isedit === item.id) ? "block" : "none"}}>
-                        <QuillForEditor 
-                          value = {this.stringJson(this.state.countvalue)}
-                          wrapStyle={{
-                            height: '220px',
-                            opacity:1,
-                            marginTop:"20px"
-                          }}
-                          // autoFocus={true}
-                          style={{ height: '170px' }}
-                          placeholder="评论内容"
-                          options={options}
-                          onContentChange={this.changmodelname}
-                        />
-                        {/* <TextArea style={{height:"200px"}} value={this.state.countvalue} onChange={this.changmodelname}/> */}
+                        
+                        <MDEditor placeholder={'添加评论...'} height={200}
+                              mdID={`merge-comments-description${item.id}`} startInit={isedit && isedit === item.id} initValue={this.state.countvalue} onChange={this.changmodelname} ></MDEditor>
                         <p className="clearfix mt15">
                           <a className="topWrapper_btn fr" type="submit" onClick={()=>this.updatedetail(item.id)}>保存</a>
                           <a className="a_btn cancel_btn fr" type="submit" onClick={()=>this.editdetail(item.content,undefined)}>取消</a>
@@ -663,11 +631,6 @@ class MessageCount extends Component{
                请求从<strong> {data && data.pull_request.head} </strong>分支合并到<strong> {data && data.pull_request.base} </strong>分支
              </span>
             <span className="pull-right lineH32">
-               {/*{*/}
-                 {/*data && data.issue.user_permission ?*/}
-                   {/*<Link to={`/projects/${projectsId}/merge/${mergeId}/UpdateMerge`} className="color-blue fr">编辑</Link>*/}
-                   {/*: ''*/}
-               {/*}*/}
               {
                 data && data.issue.user_permission ?
                   <a onClick={this.change_to_edit} className="color-blue fr">编辑</a>
@@ -754,30 +717,10 @@ class MessageCount extends Component{
                   <Link to={`/users/${current_user && current_user.login}/projects`} className="show-user-link">
                     <img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/>
                   </Link>
-                  {/*<img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/>*/}
                   <div className="new_context">
-                    {/* <Form.Item>
-                      {getFieldDecorator('content', {
-                        rules: [{
-                          required: true, message: '请输入内容'
-                        }],
-                      })(
-                        <TextArea placeholder="添加评论..." style={{height: "200px"}}/>
-                      )}
-                    </Form.Item> */}
                     <div className="quillContent">
-                      <QuillForEditor 
-                        value = {commentsContent}
-                        wrapStyle={{
-                          height: '240px',
-                          opacity:1,
-                        }}
-                        // autoFocus={true}
-                        style={{ height: '170px' }}
-                        placeholder="请输入评论内容..."
-                        options={options}
-                        onContentChange={this.changeComments}
-                      />
+                      <MDEditor placeholder={'请输入评论内容...'} height={200}
+                        mdID={`orderdetail-add-description`} initValue={commentsContent} onChange={this.changeComments} ></MDEditor>
                       <p className="quillFlag">
                         { quillFlag && <span className="">请输入评论内容</span>}
                       </p>
@@ -785,8 +728,6 @@ class MessageCount extends Component{
                     <UploadComponent load={this.UploadFunc} isComplete={showFiles}></UploadComponent>
                     <p className="clearfix mt15">
                       <a className="topWrapper_btn fr" type="submit" onClick={this.addjournals}>评论</a>
-                      {/*<a className="Closeor_btn fr" type="submit" style={{display:data&&data.pull_request.status===0?'block':'none'}}*/}
-                        {/*onClick={() => this.closedetail(data && data.issue.issue_status === "关闭" ? 2 : 5)}>{data && data.issue.issue_status === "关闭" ? "开启" : "关闭"}</a>*/}
                     </p>
                   </div>
                 </div>
diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index fefa5423..9d209337 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -5,7 +5,7 @@ import axios from 'axios';
 import UploadComponent from '../Upload/Index';
 import { getImageUrl } from 'educoder';
 import '../Order/order.css';
-import QuillForEditor from '../quillForEditor';
+import MDEditor from '../../modules/tpm/challengesnew/tpm-md-editor';
 
 
 const { Button } = Radio;
@@ -350,25 +350,9 @@ class NewMerge extends Component{
                     <Input placeholder="标题"/>
                   )}
                 </Form.Item>
-                <QuillForEditor 
-                  value = {desc}
-                  wrapStyle={{
-                    height: '240px',
-                    opacity:1,
-                  }}
-                  // autoFocus={true}
-                  style={{ height: '170px' }}
-                  placeholder="请输入合并请求的描述..."
-                  options={options}
-                  onContentChange={this.onContentChange}
-                />
-                {/* <Form.Item>
-                  {getFieldDecorator('body', {
-                    rules: [],
-                  })(
-                      <TextArea placeholder="合并请求的描述。。。" style={{height:"300px"}}/>
-                  )}
-                </Form.Item> */}
+                <MDEditor placeholder={'请输入合并请求的描述...'} height={200}
+                  mdID={'merge-new-description'} initValue={desc} onChange={this.onContentChange} ></MDEditor>
+                
                 <UploadComponent load={this.UploadFunc} isComplete={true} ></UploadComponent>
                 <p className="clearfix mt15">
                   <a className="topWrapper_btn fr" type="submit" onClick={this.submit}>创建合并请求</a>
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 222770a5..93c11075 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -6,16 +6,10 @@ import UploadComponent from '../Upload/Index';
 import { getImageUrl } from 'educoder';
 import {Modal , Form , Tooltip, Popconfirm, Pagination  , Spin} from 'antd'
 import Attachments from '../Upload/attachment';
-import QuillForEditor from '../quillForEditor';
+import MDEditor from '../../modules/tpm/challengesnew/tpm-md-editor';
+import RenderHtml from '../../components/render-html';
 import AmplifyImg from './AmplifyImg';
 
-const options = [
-  ['bold', 'italic', 'underline'],
-  [{header: [1,2,3,false]}],
-  ['blockquote', 'code-block'],
-  ['link', 'image'],
-  ['formula']
-];
 
 class Detail extends Component{
   constructor(props){
@@ -97,7 +91,7 @@ class Detail extends Component{
           const url = `/issues/${data.id}/journals.json`;
           axios.post(url,{
             ...values,
-            content:JSON.stringify(quillValue),
+            content:quillValue,
             issue_id:data.id,
             attachment_ids:fileList
           }).then(result=>{
@@ -184,7 +178,7 @@ class Detail extends Component{
       axios.put(url,{
         issue_id:orderId,
         id:id,
-        content:JSON.stringify(countvalue) 
+        content:countvalue
       }).then(result=>{
         if(result){
           this.setState({
@@ -335,21 +329,9 @@ class Detail extends Component{
     return _value
   }
 
-  commentCtx = (ctx) => {
-    let _ctx = null;
-  
-    try {
-      _ctx = JSON.parse(ctx);
-    } catch (e) {
-      _ctx = ctx;
-    }
-
+  commentCtx = (v) => {
     return (
-      <QuillForEditor
-        readOnly={true}
-        value={_ctx}
-        showUploadImage={this.handleShowImage}
-      />
+      <RenderHtml className="break_word_comments" value={v} />
     )
   };
 
@@ -418,18 +400,8 @@ class Detail extends Component{
                         </div>
                         <div style={{display: (isedit && isedit === item.id) ? "block" : "none"}}>
                           <div className="quillContent mt20">
-                            <QuillForEditor
-                              wrapStyle={{
-                                height: '220px',
-                                opacity:1,
-                              }}
-                              autoFocus={true}
-                              style={{ height: '170px' }}
-                              placeholder="添加评论..."
-                              options={options}
-                              value={countvalue}
-                              onContentChange={this.onEditContentChange}
-                            />
+                            <MDEditor placeholder={'添加评论...'} height={200}
+                              mdID={`orderdetail-add-description${item.id}`} startInit={isedit && isedit === item.id} initValue={countvalue} onChange={this.onEditContentChange} ></MDEditor>
                             <p className="quillFlag">
                               { quillFlag && <span className="">请输入评论内容</span>}
                             </p>
@@ -534,20 +506,8 @@ class Detail extends Component{
                   <img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/>
                   <div className="new_context">
                     <div className="quillContent">
-                      <QuillForEditor
-
-                        wrapStyle={{
-                          height: '220px',
-                          opacity:1,
-                        }}
-                        autoFocus={true}
-                        style={{ height: '150px' }}
-                        placeholder="添加评论..."
-                        options={options}
-                        value={quillValue}
-                        onContentChange={this.onContentChange}
-                        // showUploadImage={this.handleShowImage}
-                      />
+                      <MDEditor placeholder={'添加评论...'} height={200}
+                              mdID={'orderdetail-add-descriptions'} initValue={quillValue} onChange={this.onContentChange} ></MDEditor>
                       <p className="quillFlag">
                         { quillFlag && <span className="">请输入评论内容</span>}
                       </p>
diff --git a/src/forge/Order/New.js b/src/forge/Order/New.js
index be83b0f8..2ae70eeb 100644
--- a/src/forge/Order/New.js
+++ b/src/forge/Order/New.js
@@ -1,11 +1,8 @@
 import React , { Component } from "react";
 import { Form , Input , Select } from 'antd';
-
 import { getImageUrl } from 'educoder';
-
-import Nav from './Nav';
 import UploadComponent from '../Upload/Index';
-import QuillForEditor from '../quillForEditor';
+import MDEditor from '../../modules/tpm/challengesnew/tpm-md-editor';
 
 import './order.css';
 
@@ -13,13 +10,6 @@ import axios from 'axios';
 import {Link} from "react-router-dom";
 
 const Option = Select.Option;
-const options = [
-  ['bold', 'italic', 'underline'],
-  [{header: [1,2,3,false]}],
-  ['blockquote', 'code-block'],
-  ['link', 'image'],
-  ['formula']
-];
 class New extends Component{
   constructor(props){
     super(props);
@@ -123,7 +113,7 @@ class New extends Component{
         
         axios.post(url,{
           ...values,
-          description:JSON.stringify(description),
+          description:description,
           attachment_ids:fileList
         }).then(result=>{
           if(result){
@@ -180,18 +170,8 @@ class New extends Component{
                   )}
                 </Form.Item>
                 <div className="quillContent" style={{marginBottom:"20px"}}>
-                  <QuillForEditor 
-                    value = {description}
-                    wrapStyle={{
-                      height: '240px',
-                      opacity:1,
-                    }}
-                    // autoFocus={true}
-                    style={{ height: '180px' }}
-                    placeholder="请输入任务的描述..."
-                    options={options}
-                    onContentChange={this.onContentChange}
-                  />
+                <MDEditor placeholder={'请输入描述信息'} height={200}
+                  mdID={'order-new-description'} initValue={description} onChange={this.onContentChange} ></MDEditor>
                 </div>
                 <UploadComponent load={this.UploadFunc} showNotification={this.props.showNotification} isComplete={true}></UploadComponent>
                 <p className="clearfix mt15">
@@ -205,7 +185,7 @@ class New extends Component{
                   {getFieldDecorator('branch_name', {
                     rules: [],
                   })(
-                    <Select value={branch_name}>
+                    <Select>
                       <Option value={''}>分支未指定</Option>
                       {
                         branches && branches.length >0 && branches.map((item,key)=>{
@@ -223,7 +203,7 @@ class New extends Component{
                   {getFieldDecorator('issue_tag_ids', {
                     rules: [],
                   })(
-                    <Select value={issue_tag_ids}>
+                    <Select>
                       <Option value={""}>{issue_chosen && issue_chosen.issue_tag.length > 0 ? '未选择标签':'请在仓库设置里添加标签'}</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.issue_tag) }
                     </Select>
@@ -255,19 +235,6 @@ class New extends Component{
                     </Select>
                   )}
                 </Form.Item>
-                {/* <Form.Item
-                  label="类型"
-                >
-                  {getFieldDecorator('issue_type', {
-                    rules: [{
-                      required: true, message: '请选择类型'
-                    }],
-                  })(
-                    <Select  value={issue_type}>
-                      { this.renderSelect(issue_chosen && issue_chosen.issue_type) }
-                    </Select>
-                  )}
-                </Form.Item> */}
                 <Form.Item
                   label="分类"
                 >
@@ -276,7 +243,7 @@ class New extends Component{
                       required: true, message: '请选择分类'
                     }],
                   })(
-                    <Select value={tracker_id}>
+                    <Select>
                       { this.renderSelect(issue_chosen && issue_chosen.tracker) }
                     </Select>
                   )}
@@ -288,7 +255,7 @@ class New extends Component{
                     rules: [{
                     }],
                   })(
-                    <Select value={assigned_to_id}>
+                    <Select>
                       <Option value={""}>未指派成员</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.assign_user) }
                     </Select>
@@ -302,7 +269,7 @@ class New extends Component{
                       required: true, message: '请选择优先度'
                     }],
                   })(
-                    <Select value={priority_id}>
+                    <Select>
                       { this.renderSelect(issue_chosen && issue_chosen.priority) }
                     </Select>
                   )}
@@ -315,7 +282,7 @@ class New extends Component{
                       required: true, message: '请选择完成度'
                     }],
                   })(
-                    <Select value={done_ratio}>
+                    <Select>
                       { this.renderSelect(issue_chosen && issue_chosen.done_ratio) }
                     </Select>
                   )}
diff --git a/src/forge/Order/Tags.js b/src/forge/Order/Tags.js
index d30cbf52..ec70a0b7 100644
--- a/src/forge/Order/Tags.js
+++ b/src/forge/Order/Tags.js
@@ -1,6 +1,5 @@
 import React , {Component} from 'react';
 import { Dropdown , Icon , Menu , Pagination, Modal,Input,Popconfirm,Form } from 'antd';
-import { Link } from 'react-router-dom';
 import Nav from './Nav';
 import NoneData from '../Nodata';
 import { SketchPicker } from 'react-color'
@@ -19,7 +18,7 @@ class Tags extends Component{
       display:'none',
       //调色盘颜色
       displayColorPicker: false,
-      color: {
+      color: {     
         r: '241',
         g: '112',
         b: '19',
diff --git a/src/forge/Order/UpdateDetail.js b/src/forge/Order/UpdateDetail.js
index 6b0848c4..6595e376 100644
--- a/src/forge/Order/UpdateDetail.js
+++ b/src/forge/Order/UpdateDetail.js
@@ -8,7 +8,8 @@ import { getImageUrl } from 'educoder';
 import{ Modal , Form , Input , Select } from 'antd'
 
 import Attachments from '../Upload/attachment';
-import QuillForEditor from '../quillForEditor';
+import MDEditor from '../../modules/tpm/challengesnew/tpm-md-editor';
+
 
 const Option = Select.Option;
 
@@ -107,7 +108,7 @@ class UpdateDetail extends Component{
 
     onContentChange=(value)=>{
       this.setState({
-        textcount:JSON.stringify(value)
+        textcount:value
       })
     }
 
@@ -179,16 +180,6 @@ class UpdateDetail extends Component{
           })
         }
       }
-  stringJson=(value) =>{
-    let _value = null;
-
-    try {
-      _value = JSON.parse(value);
-    } catch (e) {
-      _value = value;
-    }
-    return _value
-  }
     // 获取上传后的文件id数组
       UploadFunc=(fileList)=>{
         this.setState({
@@ -262,20 +253,9 @@ class UpdateDetail extends Component{
                   <Input placeholder="标题" onChange={this.changmodelname}/>
                 )}
               </Form.Item>
-              <div className="quillContent" style={{marginBottom:"20px"}}>
-                <QuillForEditor
-                  value = {this.stringJson(textcount)}
-                  wrapStyle={{
-                    height: '220px',
-                    opacity:1,
-                  }}
-                  // autoFocus={true}
-                  style={{ height: '170px' }}
-                  placeholder="请输入任务的描述..."
-                  options={options}
-                  onContentChange={this.onContentChange}
-                />
-              </div>
+              
+              <MDEditor placeholder={'请输入任务的描述...'} height={200}
+                  mdID={'order-update-description'} initValue={textcount} onChange={this.onContentChange} ></MDEditor>
               <UploadComponent load={this.UploadFunc} showNotification={this.props.showNotification} isComplete={true}></UploadComponent>
               {
                 get_attachments ?
diff --git a/src/images/forge/project.jpg b/src/images/forge/project.jpg
deleted file mode 100644
index 67b62ede..00000000
Binary files a/src/images/forge/project.jpg and /dev/null differ
diff --git a/src/index.css b/src/index.css
index efd553bf..8c66d715 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,40 +1,187 @@
-body {
-  margin: 0;
-  padding: 0;
-  font-family: sans-serif;
+.tpi_content p,
+.tpi_content dl,
+.tpi_content ol,
+.tpi_content ul,
+.tpi_content h1,
+.tpi_content h2,
+.tpi_content h3,
+.tpi_content h4,
+.tpi_content h5 {
+  margin-bottom: 0px;
 }
 
-.page--header {
-  z-index: 101 !important;
-}
 .ant-popover-buttons {
   text-align: center !important;
 }
 
-
 /* ie11兼容性问题 评测通过图片被遮挡*/
 .page--body {
   z-index: 1;
 }
 
 /* 隐藏newMessage提示按钮 */
-#shixun_comment_block .buttons > p:last-child {
-	display: none !important;
+#shixun_comment_block .buttons>p:last-child {
+  display: none !important;
 }
 
-.ant-message{
+.ant-message {
   z-index: 20000;
 }
-/*.ant-modal-header{*/
-    /*border-radius: 10px;*/
-/*}*/
-.ant-upload-list-item-info .anticon-loading, .ant-upload-list-item-info .anticon-paper-clip{
-  color: #29bd8b !important;
-}
-.anticon anticon-paper-clip{
+
+.ant-upload-list-item-info .anticon-loading,
+.ant-upload-list-item-info .anticon-paper-clip {
   color: #29bd8b !important;
 }
 
-.MuiModal-root-15{
-    z-index: 1000  !important;
+.anticon anticon-paper-clip {
+  color: #29bd8b !important;
 }
+
+.MuiModal-root-15 {
+  z-index: 1000 !important;
+}
+
+.markdown-body p {
+  margin: 0 !important
+}
+
+ol,
+ul,
+li {
+  list-style-type: none
+}
+
+.yslflexhome {
+  display: flex;
+  flex-direction: row;
+}
+
+.bor-red {
+  border: 1px solid #db0505 !important;
+}
+
+.font-25 {
+  font-size: 25px !important;
+}
+
+.newFooter {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background: #323232;
+  clear: both;
+  min-width: 1200px;
+  z-index: 8;
+  left: 0px;
+  max-height: 110px;
+}
+
+.markdown-body {
+  text-align: justify;
+  word-break: break-all;
+}
+
+/* ！！覆盖之前的样式*/
+.-header-right {
+  background: #1F2F3B;
+}
+
+#myshixun_top {
+  display: flex;
+  height: 54px;
+}
+
+.yslflexhomes {
+  display: flex;
+  flex-direction: row;
+
+}
+
+.yslflexhomesysl1 {
+  display: flex;
+  flex-direction: column;
+}
+
+pre.prettyprint {
+  border: 0px solid transparent;
+  padding: 10px;
+}
+
+.-flex-basic0 {
+  flex-basis: 0% !important;
+  -webkit-flex-basis: 0% !important;
+  display: none
+}
+
+.-flex-basic100 {
+  flex-basis: 100% !important;
+  -webkit-flex-basis: 100% !important;
+}
+
+::-webkit-scrollbar-track {
+  box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar-thumb {
+  box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+  background-color: #dadada;
+}
+
+.color-grey {
+  color: #888;
+}
+
+.-text-danger {
+  color: #FF6545
+}
+
+.color-orange {
+  color: #ee4a1f !important;
+}
+
+.color-orange02 {
+  color: #f79f88 !important;
+}
+
+.color-orange03 {
+  color: #ff7500 !important;
+}
+
+.color-orange04 {
+  color: #ee4a20 !important;
+}
+
+/*温馨提示公用颜色*/
+.color-orange05 {
+  color: #FF9e6a !important;
+}
+
+.color-orange06 {
+  color: #ff6530 !important;
+}
+
+a.color-orange05:hover,
+i.color-orange05:hover {
+  color: #ff7500 !important;
+}
+
+.color-orange06 {
+  color: #FF6610 !important;
+}
+
+.color-yellow {
+  color: #f0ad4e !important;
+}
+
+.color-yellow2 {
+  color: #ff9933 !important;
+}
+
+.color-yellow3 {
+  color: #FFC828;
+}
+
+.color-light-green {
+  color: #29bd8b !important;
+}
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index cb8cb4f9..eb757a2a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,46 +1,28 @@
+import './public-path'
+import { AppContainer } from 'react-hot-loader';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
 import './index.css';
-import './indexPlus.css';
 import App from './App';
-
-// 加之前main.js 18.1MB
-// import { message } from 'antd';
-import message from 'antd/lib/message';
-import 'antd/lib/message/style/css';
-
-import { AppContainer } from 'react-hot-loader';
-
-import registerServiceWorker from './registerServiceWorker';
-
 import { configureUrlQuery } from 'react-url-query';
-
 import history from './history';
 
-// link the history used in our app to url-query so it can update the URL with it.
 configureUrlQuery({ history });
-// -----------------------------------------------------------------------------------	请求配置
 
 window.__useKindEditor = false;
 
 
 const render = (Component) => {
   ReactDOM.render(
-    <AppContainer {...this.props}  {...this.state}>
-      <Component {...this.props} {...this.state}/>
+    <AppContainer >
+      <Component />
     </AppContainer>,
     document.getElementById('root')
-  );
+  )
 }
 
-
-// ReactDOM.render(
-// 	,
-// 	document.getElementById('root'));
-// registerServiceWorker();
-
 render(App);
 if (module.hot) {
   module.hot.accept('./App', () => { render(App) });
-}
+}
\ No newline at end of file
diff --git a/src/indexPlus.css b/src/indexPlus.css
deleted file mode 100644
index 1f1bd1f5..00000000
--- a/src/indexPlus.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/* material ui 给body加了个6px padding */
-body {
-    padding-right: 0px !important;
-}
\ No newline at end of file
diff --git a/src/logo.svg b/src/logo.svg
deleted file mode 100644
index 57f45c09..00000000
--- a/src/logo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
-    <g fill="#61DAFB">
-        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
-        <circle cx="420.9" cy="296.5" r="45.7"/>
-        <path d="M520.5 78.1z"/>
-    </g>
-</svg>
diff --git a/src/modal/GotoQQgroup.js b/src/modal/GotoQQgroup.js
index 0ac34da6..bab39b08 100644
--- a/src/modal/GotoQQgroup.js
+++ b/src/modal/GotoQQgroup.js
@@ -1,31 +1,25 @@
 import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
-import { Modal} from 'antd';
-import axios from 'axios';
+import { getImageUrl } from 'educoder';
+import { Modal } from 'antd';
 import '../modules/user/account/common.css';
 import './gotoqqgroup.css'
 class GotoQQgroup extends Component {
 
 	constructor(props) {
 		super(props);
-		this.state={
+	}
 
+	modalCancel = () => {
+		try {
+			this.props.setgoshowqqgtounp(false);
+		} catch (e) {
 		}
 	}
 
-	modalCancel=()=>{
+	setDownload = () => {
 		try {
 			this.props.setgoshowqqgtounp(false);
-		}catch (e) {
-
-		}
-	}
-
-	setDownload=()=>{
-		//立即联系
-		try {
-			this.props.setgoshowqqgtounp(false);
-		}catch (e) {
+		} catch (e) {
 
 		}
 	}
@@ -33,7 +27,7 @@ class GotoQQgroup extends Component {
 
 	render() {
 
-		return(
+		return (
 			<Modal
 				keyboard={false}
 				closable={false}
@@ -41,16 +35,16 @@ class GotoQQgroup extends Component {
 				destroyOnClose={true}
 				title="提示"
 				centered={true}
-				visible={this.props.goshowqqgtounp===undefined?false:this.props.goshowqqgtounp}
+				visible={this.props.goshowqqgtounp === undefined ? false : this.props.goshowqqgtounp}
 				width="530px"
 			>
 				<div className="educouddiv intermediatecenter verticallayout">
 					<div className="tabeltext-alignleft mt10"><p>您可以在QQ服务群向管理员申请，获得继续操作的权限</p></div>
-					<img  width={"200px"} className="mt10" src={getImageUrl("images/educoder/qqqun20191230.png")}/>
+					<img width={"200px"} className="mt10" src={getImageUrl("images/educoder/qqqun20191230.png")} />
 
 					<div className="tabeltext-alignleft mt10"><p>群号：612934990</p></div>
 					<div className="clearfix mt30 edu-txt-center">
-						<a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a>
+						<a className="task-btn mr30" onClick={() => this.modalCancel()}>取消</a>
 						<a className="task-btn task-btn-orange" target="_blank" href="//shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd">立即联系</a>
 					</div>
 				</div>
diff --git a/src/modules/comment/Comment.css b/src/modules/comment/Comment.css
index f21a9c8c..2b6a67bc 100644
--- a/src/modules/comment/Comment.css
+++ b/src/modules/comment/Comment.css
@@ -1,214 +1,229 @@
-
-.greytab-inner {
-	/*overflow-y: scroll;*/
-}
 /*评论列表*/
 .panel-comment_item .t_area {
-	font-size: 12px;
-    color: #CCCCCC;
-}
-.panel-comment_item .orig_reply i {
-    font-size: 14px !important;
-    margin-left: 12px;
-}   
-    /* ke style 代码块*/
-    .panel-comment_item ol.linenums {
-        overflow: auto;
-    }
-    .panel-comment_item .rewarded {
-        color: #FF7500!important
-    }
-    .panel-comment_item .rewarded.normalUser {
-        cursor: inherit;
-    }
-#tab_con_4 .-layout-v {
-	overflow-y: auto;
-}
-#tab_con_4 .rc-pagination {
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 12px;
-    margin-bottom: 20px;
-}
-.rc-pagination {
-    width: fit-content;
+  font-size: 12px;
+  color: #CCCCCC;
 }
 
-.comment_content img {
-    max-width: 23% !important;
+.pagination-contaner {
+  margin: 12px auto 20px auto;
+}
+
+.panel-comment_item .orig_reply i {
+  font-size: 14px !important;
+  margin-left: 12px;
+}
+
+/* ke style 代码块*/
+.panel-comment_item ol.linenums {
+  overflow: auto;
+}
+
+.panel-comment_item .rewarded {
+  color: #FF7500 !important
+}
+
+.panel-comment_item .rewarded.normalUser {
+  cursor: inherit;
+}
+
+#tab_con_4 .-layout-v {
+  overflow-y: auto;
 }
 
 /*  ----------------------------------------------------- CommentInput START */
 
 /*收起的时候radius变化*/
 #mini_comment_section .df .ke-container {
-    border-radius: 15px;
+  border-radius: 15px;
 
 }
+
 #mini_comment_section .df .buttons {
-    width: 70px;
-     margin-bottom: 5px;
+  width: 70px;
+  margin-bottom: 5px;
 }
-    #mini_comment_section .buttons i {
-        font-size: 18px;
-        color: #656565;
-        vertical-align: baseline;
-    }
-    #mini_comment_section i.newReplyIcon {
-        color: #4DACFF;
-        cursor: pointer;
-    }
-    #mini_comment_section .buttons {
-        margin-bottom: 10px;
-    }
-    #mini_comment_section .buttons>p {
-        margin-top: 4px;
-        display: none;
-    }
-    #mini_comment_section .df .buttons>p {
-        margin-top: 14px;
-        display: block;
-    }
-    #mini_comment_section {
-        height: auto;
-        background-color: #FFF;
-        /*border-top: 1px solid #f0f1fe;*/
-        display: flex;
-        box-shadow: 0px -3px 5px 0px rgba(76, 172, 255, 0.2);
-        z-index: 99;
-    }   
-        #mini_comment_section #editor_panel {
-            margin-bottom: 9px
-        }
-        /* commentInput 上传图片的图标挪动到左下*/
-        #mini_comment_section #editor_panel>div:nth-child(1) {
-            position: absolute;
-            bottom: 8px;
-            right: 88px; 
-        }
-            #mini_comment_section .ke-toolbar-icon-url {
-                background-image: url('../../images/tpi/upload-image.png');
-                background-position: 0px 0px;
-                background-size: 30px 30px;
-                width: 30px;
-                height: 30px;
-            }
-            
-    #mini_comment_section .ke-outline {
-        height: 30px;
-        margin-bottom: -11px;
-        width: 30px;
-        margin-right: -5px;
-        border: none;
-        margin: 0px;
-        padding: 0px;
-        /* ie上传图片看不见的问题 */
-        position: absolute;
-        top: -30px;
-        left: -30px;
-        left: -24px;
-        z-index: 999;
-    }
 
-    #mini_comment_section i.replyIcon {
-        font-size: 20px;
-    }
-    #shixun_comment_block .dot {
-        width: 4px;
-        height: 4px;
-        border-radius: 2px;
-        background-color: #4CACFF;
-        width: 4px;
-        position: relative;
-        bottom: 30px;
-        left: 18px;
-        display: block;
-    }
+#mini_comment_section .buttons i {
+  font-size: 18px;
+  color: #656565;
+  vertical-align: baseline;
+}
+
+#mini_comment_section i.newReplyIcon {
+  color: #4DACFF;
+  cursor: pointer;
+}
+
+#mini_comment_section .buttons {
+  margin-bottom: 10px;
+}
+
+#mini_comment_section .buttons>p {
+  margin-top: 4px;
+  display: none;
+}
+
+#mini_comment_section .df .buttons>p {
+  margin-top: 14px;
+  display: block;
+}
+
+#mini_comment_section {
+  height: auto;
+  background-color: #FFF;
+  /*border-top: 1px solid #f0f1fe;*/
+  display: flex;
+  box-shadow: 0px -3px 5px 0px rgba(76, 172, 255, 0.2);
+  z-index: 99;
+}
+
+#mini_comment_section #editor_panel {
+  margin-bottom: 9px
+}
+
+/* commentInput 上传图片的图标挪动到左下*/
+#mini_comment_section #editor_panel>div:nth-child(1) {
+  position: absolute;
+  bottom: 8px;
+  right: 88px;
+}
+
+#mini_comment_section .ke-toolbar-icon-url {
+  background-image: url('../../images/tpi/upload-image.png');
+  background-position: 0px 0px;
+  background-size: 30px 30px;
+  width: 30px;
+  height: 30px;
+}
+
+#mini_comment_section .ke-outline {
+  height: 30px;
+  margin-bottom: -11px;
+  width: 30px;
+  margin-right: -5px;
+  border: none;
+  margin: 0px;
+  padding: 0px;
+  /* ie上传图片看不见的问题 */
+  position: absolute;
+  top: -30px;
+  left: -30px;
+  left: -24px;
+  z-index: 999;
+}
+
+#mini_comment_section i.replyIcon {
+  font-size: 20px;
+}
+
+#shixun_comment_block .dot {
+  width: 4px;
+  height: 4px;
+  border-radius: 2px;
+  background-color: #4CACFF;
+  width: 4px;
+  position: relative;
+  bottom: 30px;
+  left: 18px;
+  display: block;
+}
 
 #mini_comment_section .ke-container {
-    border-radius: 6px;
-    border-color: #EAEAEA;
-    /*max-height: 400px;  */
-    /*解决上传图片后看不到评论按钮的问题*/
+  border-radius: 6px;
+  border-color: #EAEAEA;
+  /*max-height: 400px;  */
+  /*解决上传图片后看不到评论按钮的问题*/
 }
-.commentTxt{
-    width: 100%;
-    height: 95px;
-    border:1px solid #EAEAEA;
-    border-radius: 10px;
-    padding-left: 5px;
+
+.commentTxt {
+  width: 100%;
+  height: 95px;
+  border: 1px solid #EAEAEA;
+  border-radius: 10px;
+  padding-left: 5px;
 }
+
 #game_praise_tread {
-    cursor: pointer;
+  cursor: pointer;
 }
+
 .commentsbtn {
-    margin-top: 2px;
+  margin-top: 2px;
 }
 
 #shixun_comment_block {
-    margin: 0px 10px;
-    margin-bottom: -2px;
+  margin: 0px 10px;
+  margin-bottom: -2px;
 }
 
 .panel-comment_item a.task-btn-orange {
-    background: #4CACFF;
+  background: #4CACFF;
 }
 
 /*  ----------------------------------------------------- CommentInput END */
 .childrenCommentsView {
-    background: #F4F4F4;
-    border-radius: 4px;
-    margin-bottom: 6px;
-    position: relative;
-    margin-top: 6px;
+  background: #F4F4F4;
+  border-radius: 4px;
+  margin-bottom: 6px;
+  position: relative;
+  margin-top: 6px;
 }
-    .childrenCommentsView .trangle{
-        position: absolute;
-        border-color: black;
-        width: 0;
-        height: 0;
-        border-left: 5px solid transparent;
-        border-right: 5px solid transparent;
-        border-bottom: 5px solid #F4F4F4;
-        left: 13px;
-        top: -9px;
-        border-bottom: 10px solid #F4F4F4;
-    }
+
+.childrenCommentsView .trangle {
+  position: absolute;
+  border-color: black;
+  width: 0;
+  height: 0;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid #F4F4F4;
+  left: 13px;
+  top: -9px;
+  border-bottom: 10px solid #F4F4F4;
+}
+
 .childComment {
-    padding: 2px 8px;
+  padding: 2px 8px;
+}
+
+.childComment .iconfont.icon-jiangli {
+  margin-top: 2px;
 }
-    .childComment .iconfont.icon-jiangli {
-        margin-top: 2px;
-    }
 
 
 .childComment:hover {
-    background: #EBEBEB;
+  background: #EBEBEB;
 }
-    .childComment .iconfont {
-        display: none;
-    }
-    .childComment p.orig_reply {
-        margin-bottom: 0px;
-    }
-    .childComment:hover .iconfont{
-        display: inline;
-    }
+
+.childComment .iconfont {
+  display: none;
+}
+
+.childComment p.orig_reply {
+  margin-bottom: 0px;
+}
+
+.childComment:hover .iconfont {
+  display: inline;
+}
+
 .noCommentTitle {
-    text-align: center;
-    margin-top: 20px;
-    font-size: 16px;
+  text-align: center;
+  margin-top: 20px;
+  font-size: 16px;
 }
 
 .blink {
   animation: blink-animation 3s steps(5, start) infinite;
   -webkit-animation: blink-animation 3s steps(5, start) infinite;
 }
+
 @keyframes blink-animation {
   to {
     visibility: hidden;
   }
 }
+
 @-webkit-keyframes blink-animation {
   to {
     visibility: hidden;
@@ -218,44 +233,46 @@
 
 /*md 编辑器   emoji */
 .J_Comment_Reply img.emoji {
-    width: 24px;
+  width: 24px;
 }
 
 .noCommentTitle {
-    text-align: center;
-    margin-top: 20px;
-    font-size: 16px;
-    height: 100px;
-    line-height: 100px;
+  text-align: center;
+  margin-top: 20px;
+  font-size: 16px;
+  height: 100px;
+  line-height: 100px;
 }
 
-.break_word_comments{
-    /* 这个样式影响到了行高 */
-    /* white-space: pre-wrap!important; */
-    word-break: break-word;
-    /* 影响了 ul li的样式： https://testeduplus2.educoder.net/courses/1748/common_homeworks/12131/740898/appraise */
-    /* line-height: 14px; */
-    width: 100%;
-    word-wrap: break-word;
-    margin-bottom: 4px;
-    margin-top: 4px;
+.break_word_comments {
+  /* 这个样式影响到了行高 */
+  /* white-space: pre-wrap!important; */
+  word-break: break-word;
+  /* 影响了 ul li的样式： https://testeduplus2.educoder.net/courses/1748/common_homeworks/12131/740898/appraise */
+  /* line-height: 14px; */
+  width: 100%;
+  word-wrap: break-word;
+  margin-bottom: 4px;
+  margin-top: 4px;
 }
-.childComment .break_word_comments{
-    line-height: 22px;
+
+.childComment .break_word_comments {
+  line-height: 22px;
 }
 
 form.df .tips {
-    display: none;
+  display: none;
 }
 
 .loadMoreChildComments {
-    text-align: center;
-    height: 24px;
-    background: #F1F1F1;
-    cursor: pointer;
+  text-align: center;
+  height: 24px;
+  background: #F1F1F1;
+  cursor: pointer;
 
 }
-    .loadMoreChildComments i.icon-xiajiantou {
-        position: relative;
-        bottom: 5px;
-    }
\ No newline at end of file
+
+.loadMoreChildComments i.icon-xiajiantou {
+  position: relative;
+  bottom: 5px;
+}
\ No newline at end of file
diff --git a/src/modules/comment/CommentContainer.js b/src/modules/comment/CommentContainer.js
index b02f4094..477c15c3 100644
--- a/src/modules/comment/CommentContainer.js
+++ b/src/modules/comment/CommentContainer.js
@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 
 import Comments from './Comments'
-import CommentInput from './CommentInput'
 
 class CommentContainer extends Component {
 
@@ -13,14 +12,14 @@ class CommentContainer extends Component {
 
 		return (
 
-				<Comments 
-					{...this.props}
-					showHiddenButton={true}
-					>
+			<Comments
+				{...this.props}
+				showHiddenButton={true}
+			>
+
+			</Comments>
 
-				</Comments>
 
-			
 		)
 	}
 }
diff --git a/src/modules/comment/CommentInput.js b/src/modules/comment/CommentInput.js
index e627caa1..e2c358ec 100644
--- a/src/modules/comment/CommentInput.js
+++ b/src/modules/comment/CommentInput.js
@@ -1,131 +1,88 @@
 import React, { Component } from 'react';
-
 import Tooltip from 'material-ui/Tooltip';
-
 import './Comment.css'
 
-import messageImg from '../../images/tpi/message.svg'
-
-import messagegreyImg from '../../images/tpi/messagegrey.svg'
-
 const $ = window.$;
 function pasteListener(event) {
-    if (event.clipboardData.types[0] === 'Files' ) {
-        event.preventDefault();
-        // event.stopPropagation(); 
-    }
+  if (event.clipboardData.types[0] === 'Files') {
+    event.preventDefault();
+  }
 }
-/*
 
-*/
 class CommentInput extends Component {
 
-    componentDidMount() {
-        const {  challenge } = this.props;
-        
-    }
-
-    componentWillReceiveProps(newProps, newContext) {
-        // TODO 暂没有切实训的场景
-        if (newProps.challenge && newProps.challenge.shixun_id 
-                && (!this.props.challenge.shixun_id || newProps.challenge.shixun_id != this.props.challenge.shixun_id)) {
-            setTimeout(()=>{
-                window.sd_create_editor_from_shixun_data(newProps.challenge.shixun_id, null, "100%", "Shixun"); 
-                if ( $.browser.mozilla ) {
-                    setTimeout(() => {
-                        const _body = $('.ke-edit-iframe')[0].contentWindow.document.body;
-                        _body.removeEventListener('paste', pasteListener)
-                        _body.addEventListener('paste', pasteListener)
-                    }, 4200)
-                }
-            }, 100)
-            
+  componentWillReceiveProps(newProps, newContext) {
+    // TODO 暂没有切实训的场景
+    if (newProps.challenge && newProps.challenge.shixun_id
+      && (!this.props.challenge.shixun_id || newProps.challenge.shixun_id != this.props.challenge.shixun_id)) {
+      setTimeout(() => {
+        window.sd_create_editor_from_shixun_data(newProps.challenge.shixun_id, null, "100%", "Shixun");
+        if ($.browser.mozilla) {
+          setTimeout(() => {
+            const _body = $('.ke-edit-iframe')[0].contentWindow.document.body;
+            _body.removeEventListener('paste', pasteListener)
+            _body.addEventListener('paste', pasteListener)
+          }, 4200)
         }
-        
+      }, 100)
+
     }
 
-    render() {
-        const { createNewComment, editedComment, commentOnChange, challenge, shixun, loading, praisePlus, gotNewReply, showNewReply} = this.props;
+  }
 
-        /*
-            onclick="game_praise('<%= @game_challenge.id %>', '<%= @game_challenge.class %>')"
+  render() {
+    const { createNewComment, editedComment, commentOnChange, challenge, praisePlus, gotNewReply, showNewReply } = this.props;
 
-             onclick="game_tread('<%=  @game_challenge.id %>')"
-
-             style={{display: 'none'}}
-        */
-        return (
-            <li className="comment-input fl" id="shixun_comment_block">
-                { !challenge.shixun_id ? '' :
-                <div nhname={`new_message_${challenge.shixun_id}`} className="fr" style={{ width: '99%'}}>
-                    <form acceptCharset="UTF-8" action="/discusses?challenge_id=118&dis_id=61&dis_type=Shixun" className="df" data-remote="true" id="new_comment_form" method="post">
-                        <div className="fl" style={{flex: 1,marginTop:'7px'}} id="editor_panel">
-                            <div nhname={`toolbar_container_${challenge.shixun_id}`}></div>
-                        {/*有问题或有建议，请直接给我留言吧！*/}
-                            <textarea id={`comment_news_${challenge.shixun_id}`}
-                                nhname={`new_message_textarea_${challenge.shixun_id}`} name="content" 
-                                value={ editedComment } onChange={ commentOnChange } className="none"> 
-                            </textarea>
+    return (
+      <li className="comment-input fl" id="shixun_comment_block">
+        {!challenge.shixun_id ? '' :
+          <div nhname={`new_message_${challenge.shixun_id}`} className="fr" style={{ width: '99%' }}>
+            <form acceptCharset="UTF-8" action="/discusses?challenge_id=118&dis_id=61&dis_type=Shixun" className="df" data-remote="true" id="new_comment_form" method="post">
+              <div className="fl" style={{ flex: 1, marginTop: '7px' }} id="editor_panel">
+                <div nhname={`toolbar_container_${challenge.shixun_id}`}></div>
+                {/*有问题或有建议，请直接给我留言吧！*/}
+                <textarea id={`comment_news_${challenge.shixun_id}`}
+                  nhname={`new_message_textarea_${challenge.shixun_id}`} name="content"
+                  value={editedComment} onChange={commentOnChange} className="none">
+                </textarea>
+              </div>
+              <div className="tips"
+                style={{ 'float': 'left', 'marginTop': '6px', 'fontSize': '12px', 'color': '#ff6800' }}>
+                请勿粘贴答案，否则将造成账号禁用等后果！
                         </div>
-                        <div className="tips"
-                            style={{ 'float': 'left', 'marginTop': '6px', 'fontSize': '12px', 'color': '#ff6800'}}>
-                            请勿粘贴答案，否则将造成账号禁用等后果！
-                        </div>
-                        <div className="fr buttons" style={{ minWidth:'25px', height: '32px' }}>
-                            <a id={`new_message_submit_btn_${challenge.shixun_id}`} href="javascript:void(0)" 
-                            style={{display: 'none'}} onClick={ createNewComment } className="commentsbtn task-btn task-btn-blue  fr">
-                            发送
+              <div className="fr buttons" style={{ minWidth: '25px', height: '32px' }}>
+                <a id={`new_message_submit_btn_${challenge.shixun_id}`}
+                  style={{ display: 'none' }} onClick={createNewComment} className="commentsbtn task-btn task-btn-blue  fr">
+                  发送
                             </a>
-                            <p className="fr ml10" style={{minWidth:'25px'}} >
-                                <Tooltip title={ challenge.user_praise ? "取消点赞" : "点赞"}>
-                                    <span id="game_praise_tread" className="color-grey mr20" onClick={praisePlus}>
-                                        <i className={`mr3  ${ challenge.user_praise ? "iconfont icon-dianzan color-orange03" : "iconfont icon-dianzan-xian" } `} alt="赞" ></i>
-                                        { challenge.praise_count ? 
-                                                <span className="font-16" id="game_praise_count">{challenge.praise_count}</span> : ''}
-                                    </span>
-                                </Tooltip>
-                            </p>
-                            <p className="fr ml10" style={{minWidth:'25px'}} >
-                                { gotNewReply ? 
-                                <React.Fragment>
-                                    <i className={`replyIcon newReplyIcon iconfont icon-tpixiaoxitixing`} onClick={showNewReply}></i>
-                                    <span className="dot blink"></span>
-                                </React.Fragment>
-                                : 
-                                <Tooltip title={ "暂无新消息" }>
-                                    <i className={`replyIcon iconfont icon-tpixiaoxitixing`}></i>
-                                </Tooltip>
-                                }
-                            </p>
-                        </div>
-                    </form>
-                </div>
-                }
-            </li>
-        )
-    }
+                <p className="fr ml10" style={{ minWidth: '25px' }} >
+                  <Tooltip title={challenge.user_praise ? "取消点赞" : "点赞"}>
+                    <span id="game_praise_tread" className="color-grey mr20" onClick={praisePlus}>
+                      <i className={`mr3  ${challenge.user_praise ? "iconfont icon-dianzan color-orange03" : "iconfont icon-dianzan-xian"} `} alt="赞" ></i>
+                      {challenge.praise_count ?
+                        <span className="font-16" id="game_praise_count">{challenge.praise_count}</span> : ''}
+                    </span>
+                  </Tooltip>
+                </p>
+                <p className="fr ml10" style={{ minWidth: '25px' }} >
+                  {gotNewReply ?
+                    <React.Fragment>
+                      <i className={`replyIcon newReplyIcon iconfont icon-tpixiaoxitixing`} onClick={showNewReply}></i>
+                      <span className="dot blink"></span>
+                    </React.Fragment>
+                    :
+                    <Tooltip title={"暂无新消息"}>
+                      <i className={`replyIcon iconfont icon-tpixiaoxitixing`}></i>
+                    </Tooltip>
+                  }
+                </p>
+              </div>
+            </form>
+          </div>
+        }
+      </li>
+    )
+  }
 }
 
-/*
-    
-                                    <img src={messagegreyImg}/>
-
-    <span data-tip-top={ tread ? "踩" : "取消踩" }  id="game_tread" className="color-grey" style={{paddingTop:'7px'}}>
-                              <i className={`fa fa-thumbs-down font-20 mr3 ${ tread ? "" : "color-orange03" } `} ></i>
-                              <span className="font-12 font-bd" id="game_tread_count">{tread_count}</span>
-                            </span>
-
-    <div className="clearfix with100">
-        <textarea className="commentTxt"></textarea>
-        <p className="clearfix">
-            <a href="javascript:void(0)" className="fl uploadImg mt2">
-                <img src="/images/sendimg.svg" className="fl mr3 mt6"/><span className="up">上传图片</span>
-            </a>
-            <a href="javascript:void(0)" className="commentsbtn task-btn task-btn-blue fr">评论</a>
-            <span className="fr mr15 mt3"><i className="fa fa-thumbs-up color-dark-grey mr3 font-18"></i>20</span>
-           
-            <img src="/images/message.svg" className="fr mr15 mt8"/>
-        </p>
-    </div>
-*/
 export default CommentInput;
\ No newline at end of file
diff --git a/src/modules/comment/CommentItemKEEditor.js b/src/modules/comment/CommentItemKEEditor.js
deleted file mode 100644
index 2425357a..00000000
--- a/src/modules/comment/CommentItemKEEditor.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames'
-
-const $ = window.$;
-const _origin = window.location.origin;
-
-class CommentItemKEEditor extends Component {
-
-	componentDidUpdate(prevProps) {
-		const { item, currentReplyComment } = this.props;
-		if ( prevProps.showReplyEditorFlag != this.props.showReplyEditorFlag && 
-			currentReplyComment && currentReplyComment.id == item.id ) {
-			this.showOrHideEditor(currentReplyComment)
-		}
-	}
-	// 如果未初始化，会先初始化
-	showOrHideEditor = (comment) => {
-		const { user } = this.props;
-		console.log('initReply ', comment)
-
-		const $ = window.$;
-		var id = comment.id
-		var reply_message_el = `#reply_message_${id}`
-		var reply_iconup_el = `#reply_iconup_${id}`
-		if($(reply_message_el).html() == "") {
-		    $(".reply_to_message").html("");
-		    $(reply_message_el).html(`<div className=\"orig_reply_box borderBottomNone reply_to_message\" id=\"reply_to_message_${id}\">\n      <div class=\"homepagePostReplyPortrait mr15 imageFuzzy fl\" id=\"reply_image_${id}\"><a href=\"${user.user_url}\" target=\"_blank\" alt=\"用户头像\"><img alt=\"0?1442652658\" height=\"33\" src=\"${_origin}/images/${user.image_url}\" width=\"33\" /><\/a><\/div>\n      <div class=\"orig_textarea fl\" style=\"margin-bottom: 0px\">\n        <div nhname=\'new_message_${id}\'>\n              <form accept-charset=\"UTF-8\" action=\"/discusses?challenge_id=118&amp;dis_id=61&amp;dis_type=Shixun\" data-remote=\"true\" id=\"new_comment_form\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input name=\"authenticity_token\" type=\"hidden\" value=\"HJTbMpfI8LKUpwghfkvgB2SaMmcIVyVdAezyKmzJ7FU=\" /><\/div>\n                  <input type=\"hidden\" id=\"dis_reply_id\" name=\"reply_id\" value=\"${id}\">\n                  <div nhname=\'toolbar_container_${id}\'><\/div>\n                  <textarea placeholder=\"有问题或有建议，请直接给我留言吧！\" id=\"comment_news_${id}\" style=\"display: none\" nhname=\'new_message_textarea_${id}\' name=\"content\"><\/textarea>\n                  <a id=\"new_message_submit_btn_${id}\" href=\"javascript:void(0)\" onclick=\"this.style.display=\'none\'\" class=\"mt10 task-btn task-btn-orange fr\">发送<\/a>\n                  <div class=\"cl\"><\/div>\n                  <p nhname=\'contentmsg_${id}\'><\/p>\n<\/form>        <\/div>\n        <div class=\"cl\"><\/div>\n      <\/div>\n  <div class=\"cl\"><\/div>\n<\/div>\n`);	//" ide语法识别
-		    $(reply_iconup_el).show();
-		    $(function(){
-		        window.sd_create_editor_from_data(id ,null,"100%", "Discuss");
-		    });
-			
-		}else {
-			if ($(reply_message_el).is(':visible')) {
-				$(reply_message_el).hide();
-			} else {
-				$(reply_message_el).show();
-			}
-		    // $(reply_message_el).html("");
-		    
-		    // $(reply_iconup_el).hide();
-		}
-		// 自动focus
-		setTimeout(()=>{
-			var iframe =$(`#reply_to_message_${id}`).find('iframe')[0]
-			iframe && iframe.contentDocument.body.focus()
-		}, 200)
-		
-	}
-
-  	render() {
-  		const { match, history, item, user } = this.props
-  		if (!item) {
-  			return <div></div>
-  		}
-
-      	return (
-      		<div>
-              	<div className="cl"></div>
-              	<div id={`reply_message_${item.id}`} className="reply_to_message"></div>
-            </div>
-      	);
-  	}
-}
-
-export default ( CommentItemKEEditor );
diff --git a/src/modules/comment/CommentItemMDEditor.css b/src/modules/comment/CommentItemMDEditor.css
index 0f9c3123..d5d719ba 100644
--- a/src/modules/comment/CommentItemMDEditor.css
+++ b/src/modules/comment/CommentItemMDEditor.css
@@ -1,58 +1,21 @@
-/*md编辑器 将toolbar高度变小变袖珍*/
-.reply_to_message .editorMD .editormd-toolbar li {
-	padding: 0;
-}
-.reply_to_message .editorMD .editormd-toolbar {
-	min-height: 28px;
-
-}
-.reply_to_message .editorMD .editormd-toolbar .editormd-toolbar-container {
-	min-height: 28px;
-}
-.reply_to_message .editorMD .editormd-toolbar i {
-	margin-left: 0px;
-}
-
-
-.reply_to_message .editorMD .editormd-preview {
-	top: 30px;
-}
-.reply_to_message .editorMD .CodeMirror {
-	margin-top: 30px;
-	height: 90px;
-}
-
-.panel-comment_item .editor__resize {
-	transform: translateX(-2%);
-
-	position: absolute;
-	width: 120px;
-	height: 4px;
-	left: 54%;
-	transform: translateX(-50%);
-	margin-top: 2px;
-	border-top: 1px solid #ccc;
-	border-bottom: 1px solid #ccc;
-	cursor: row-resize;
-	text-indent: 110%;
-	white-space: nowrap;
-	overflow: hidden;
-	text-transform: capitalize;
-	
-	box-sizing: border-box;
-}
-
 /*帖子回復按鈕*/
 a.commentsbtn.task-btn-blue {
-	background: #4CACFF !important;
+  background: #4CACFF !important;
 }
 
 .commentTab a.commentsbtn.task-btn-blue {
-	margin-right: 22px;
-    margin-top: 6px;
+  margin-right: 22px;
+  margin-top: 6px;
 }
 
 
 .editormd-grid-table-row a.editormd-emoji-btn.selected {
-	border-bottom: 2px solid #4CACFF!important;
+  border-bottom: 2px solid #4CACFF !important;
+}
+
+.comment-item-editor {
+  clear: both;
+  width: 100%;
+  margin-top: 40px;
+  overflow: hidden;
 }
\ No newline at end of file
diff --git a/src/modules/comment/CommentItemMDEditor.js b/src/modules/comment/CommentItemMDEditor.js
deleted file mode 100644
index 0bde1c6a..00000000
--- a/src/modules/comment/CommentItemMDEditor.js
+++ /dev/null
@@ -1,138 +0,0 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames'
-import { getImageUrl, toPath, getUrl,getUploadActionUrl } from 'educoder';
-import './CommentItemMDEditor.css'
-
-const $ = window.$;
-const _origin = window.location.origin;
-
-class CommentItemMDEditor extends Component {
-
-	componentDidUpdate(prevProps) {
-		const { item, currentReplyComment } = this.props;
-		if ( prevProps.showReplyEditorFlag != this.props.showReplyEditorFlag && 
-			currentReplyComment && currentReplyComment.id == item.id ) {
-			this.showOrHideEditor(currentReplyComment)
-		}
-	}
-	// 如果未初始化，会先初始化
-	showOrHideEditor = (comment) => {
-		const { user } = this.props;
-		console.log('initReply ', comment)
-
-		const $ = window.$;
-		var commentId = comment.id
-		var reply_message_el = `#reply_message_${commentId}`
-
-		const initMD_ID = `reply_message_editorMd_${commentId}`
-		const view_selector = `.commentItemMDEditorView_${commentId}`
-		const commitBtnSelector = `#commitBtn_${commentId}`
-		if( $(`#${initMD_ID} textarea`).length === 1 ) { // 没有初始化
-		    const placeholder = '我要回复...'
-    		// const imageUrl = `/upload_with_markdown?container_id=${commentId}&container_type=Memo`;
-      		const imageUrl = `${getUploadActionUrl()}`;
-
-    		const otherOptions = {
-    			watch: false,
-    			htmlDecode: "style,script,iframe",  // you can filter tags decode
-	            // taskList: true,
-
-	            mode: 'markdown',
-	            toolbar: true,
-	            markdown: '',
-	            readOnly: false,
-				// preview: false,
-
-	            tex: true,  // 数学公式
-	            flowChart: false,  // 默认不解析
-	            sequenceDiagram: false, // 默认不解析
-	            dialogLockScreen: false,
-    		}
-			const commentMDEditor = window.create_editorMD_4comment(`${initMD_ID}`, '', 120, placeholder, imageUrl, () => {
-				// onload callback
-				commentMDEditor.cm.focus()
-				
-				window.initMDEditorDragResize(".editor__resize", commentMDEditor, {
-					initHeight: 120 
-				})
-
-	      	}, otherOptions);
-			commentMDEditor.state.preview = false;
-			this.commentMDEditor = commentMDEditor;
-			
-			$('.commentItemMDEditorView').hide();
-			$(view_selector).show();
-			
-		}else { // 初始化了，显示隐藏切换
-			if ($(reply_message_el).is(':visible')) {
-				$( view_selector ).hide()
-
-			} else {
-				$('.commentItemMDEditorView').hide();
-
-				$(view_selector).show();
-
-				window._currentChildcommentMDEditor && window._currentChildcommentMDEditor.resize()
-				// 自动focus
-				setTimeout(()=>{
-					this.commentMDEditor && this.commentMDEditor.cm && this.commentMDEditor.cm.focus()
-					this.commentMDEditor.resize()	// 解决切换显示、隐藏多次后出现的样式错乱的问题
-				}, 200)
-			}
-		}
-		window._currentChildcommentMDEditor = this.commentMDEditor;	// tpi resize 的时候需要做调用editor.resize
-
-	}
-
-	onCommit = () => {
- 		window.$(document).trigger("onReply", { commentContent: this.commentMDEditor.getValue()
-         	, id: this.props.item.id, editor: this.commentMDEditor } );
-	}
-
-  	render() {
-  		const { match, history, item, user, buttonText } = this.props
-  		if (!item) {
-  			return <div></div>
-  		}
-
-      	return (
-      		<div className={`commentItemMDEditorView commentItemMDEditorView_${item.id}`} style={{display:'none'}}>
-              	<div className="homepagePostReplyPortrait mr15 fl imageFuzzy" id="reply_image_3097" 
-              		style={{ marginTop: '2px',    marginRight: '-20px' }} >
-	              	<a href={`${user.user_url}`} target="_blank" alt="用户头像">
-					  	{/* 'https://testeduplus2.educoder.net/images/avatars/User/50571'|| */}
-	              		<img alt="0?1442652658" height="33" src={`/images/${user.image_url}`} width="33"></img>
-	              	</a>
-              	</div>
-		    	<div id={`reply_message_${item.id}`} className="reply_to_message commentItemMDEditor editormd-image-click-expand"
-		    		style={{ paddingTop: '0px', paddingBottom: '0px', marginTop: '36px' }} 
-		        >
-	                <div id={`reply_message_editorMd_${item.id}`} className="editorMD" style={{ marginBottom: '0px'}}>
-	                    <textarea style={{'display': 'none'}}>
-	                    </textarea>
-	              	</div>
-	              	<div className="editor__resize" href="javascript:void(0);" style={{display: ''}}>调整高度</div>
-
-					<div class="clearfix">
-						<a id={`commitBtn_${item.id}`} href="javascript:void(0)" 
-								onClick={this.onCommit} style={{ marginRight: '44px' }}
-								className="commentsbtn task-btn task-btn-blue  fr " style={{display: ''}}>
-							{ buttonText || '发送'}
-						</a>
-					</div>
-		          	
-		        </div>
-	        </div>
-      	);
-  	}
-}
-
-export default ( CommentItemMDEditor );
-
-// style={{ margin: '10px 44px', marginBottom: '0px'}}
\ No newline at end of file
diff --git a/src/modules/comment/Comments.js b/src/modules/comment/Comments.js
index 5ff5fa8a..7f555c4c 100644
--- a/src/modules/comment/Comments.js
+++ b/src/modules/comment/Comments.js
@@ -1,52 +1,11 @@
 import React, { Component } from 'react';
-
-import Dialog, {
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
-} from 'material-ui/Dialog';
-import Button from 'material-ui/Button';
-import Tooltip from 'material-ui/Tooltip';
-
-import Pagination from 'rc-pagination';
-import 'rc-pagination/assets/index.css';
-
-import { getImageUrl, toPath } from 'educoder';
-
-import Input, { InputLabel } from 'material-ui/Input';
-
-import { FormControl, FormHelperText } from 'material-ui/Form';
-
-import CommentItemKEEditor from './CommentItemKEEditor';
-import CommentItemMDEditor from './CommentItemMDEditor';
+import { getImageUrl } from 'educoder';
+import CommentItemMDEditor from './comment-item-editor';
 
 import './Comment.css'
 import Modals from '../modals/Modals'
-import {  InputNumber } from 'antd'
-
-/*
-	-------------------------- 样式相关
-	class 改成 className
-	style 需要传入json对象				style="margin:0px">  ->   style={{ margin:"0px" }}>
-	margin-top -> marginTop
-	onclick -> onClick         驼峰
-	
-	-------------------------- 模板语法相关
-	页面都在前端组装、渲染
-		rails模板的 if等逻辑改成js实现
-		客户端需要能判断 User.current.manager_of_shixun?(comment.dis_id)
-	
-	-------------------------- 现有ui控件的使用方式
-	方案1: 换成对应的react组件，然后再调用(控件简单时推荐)
-	方案2: 在react环境中使用若干jquery插件(控件复杂，又无react环境下的替代方案时考虑使用)
-	
-	-------------------------- 
-	需要服务端提供对应的rest api
-	
-
-*/
-
+import { InputNumber, Pagination, Tooltip, Modal } from 'antd'
+import RenderHtml from '../../components/render-html';
 const _origin = window.location.origin;
 
 
@@ -86,7 +45,6 @@ const _origin = window.location.origin;
 class Comments extends Component {
 	constructor(props) {
 		super(props)
-
 		this.handleDialogClose = this.handleDialogClose.bind(this)
 		this.handleGoldRewardDialogClose = this.handleGoldRewardDialogClose.bind(this)
 
@@ -95,366 +53,223 @@ class Comments extends Component {
 			goldRewardDialogOpen: false,
 			goldRewardInput: '',
 
-			showReplyEditorFlag: false,	// false->true or true->false时切换editor显示或隐藏
+			showReplyEditorFlag: false,
 			currentReplyComment: null
 		}
 	}
-	componentWillUnmount() {
-		const $ = window.$;
-		$(document).off("onReply");
-	}
-	componentDidMount() {
-		setTimeout(()=>{
-			const $ = window.$;
-			// 绑定后会自动off？ 加timeout试试
-			$(document).on("onReply", (e, args)=>{
-				const { commentContent, id, editor } = args;
-
-				this.props.replyComment(commentContent, id, editor)
-			});
-		}, 1000)
-		
-	}
 	initReply(comment) {
 		this.props.initReply && this.props.initReply(comment)
-		// 如果配置的使用kindEditor
-		if (window.__useKindEditor === true) {
-			const { user } = this.props;
-			console.log('initReply ', comment)
-
-			const $ = window.$;
-			var id = comment.id
-			var reply_message_el = `#reply_message_${id}`
-			var reply_iconup_el = `#reply_iconup_${id}`
-			if($(reply_message_el).html() == "") {
-			    $(".reply_to_message").html("");
-			    $(reply_message_el).html(`<div className=\"orig_reply_box borderBottomNone reply_to_message\" id=\"reply_to_message_${id}\">\n      <div class=\"homepagePostReplyPortrait mr15 imageFuzzy fl\" id=\"reply_image_${id}\"><a href=\"${user.user_url}\" target=\"_blank\" alt=\"用户头像\"><img alt=\"0?1442652658\" height=\"33\" src=\"${_origin}/images/${user.image_url}\" width=\"33\" /><\/a><\/div>\n      <div class=\"orig_textarea fl\" style=\"margin-bottom: 0px\">\n        <div nhname=\'new_message_${id}\'>\n              <form accept-charset=\"UTF-8\" action=\"/discusses?challenge_id=118&amp;dis_id=61&amp;dis_type=Shixun\" data-remote=\"true\" id=\"new_comment_form\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input name=\"authenticity_token\" type=\"hidden\" value=\"HJTbMpfI8LKUpwghfkvgB2SaMmcIVyVdAezyKmzJ7FU=\" /><\/div>\n                  <input type=\"hidden\" id=\"dis_reply_id\" name=\"reply_id\" value=\"${id}\">\n                  <div nhname=\'toolbar_container_${id}\'><\/div>\n                  <textarea placeholder=\"有问题或有建议，请直接给我留言吧！\" id=\"comment_news_${id}\" style=\"display: none\" nhname=\'new_message_textarea_${id}\' name=\"content\"><\/textarea>\n                  <a id=\"new_message_submit_btn_${id}\" href=\"javascript:void(0)\" onclick=\"this.style.display=\'none\'\" class=\"mt10 task-btn task-btn-orange fr\">${this.props.buttonText || '发送'}<\/a>\n                  <div class=\"cl\"><\/div>\n                  <p nhname=\'contentmsg_${id}\'><\/p>\n<\/form>        <\/div>\n        <div class=\"cl\"><\/div>\n      <\/div>\n  <div class=\"cl\"><\/div>\n<\/div>\n`);	//" ide语法识别
-			    $(reply_iconup_el).show();
-			    $(function(){
-			        window.sd_create_editor_from_data(id ,null,"100%", "Discuss");
-			    });
-				
-			}else {
-				if ($(reply_message_el).is(':visible')) {
-					$(reply_message_el).hide();
-				} else {
-					$(reply_message_el).show();
-				}
-			    // $(reply_message_el).html("");
-			    
-			    // $(reply_iconup_el).hide();
-			}
-		} else {			// MD
-			this.setState({
-				currentReplyComment: comment,
-				showReplyEditorFlag: !this.state.showReplyEditorFlag
-			})		
-		}
-	}
-	// enableReplyTo
-	// onClick={() => this.replyTo(item.user_id)}
-	replyTo = (toUserId) => {
-
+		this.setState({
+			currentReplyComment: comment,
+			showReplyEditorFlag: !this.state.showReplyEditorFlag
+		})
 	}
 	renderChildenComments(comment) {
 		if (!comment.children || comment.children.length === 0) {
 			return ''
 		}
 		const { user } = this.props;
-		let childCommentsElement = comment.children.map((item, index) =>{
-			let _content = this.parseCommentContent(item.content);
-
+		let childCommentsElement = comment.children.map((item, index) => {
 			return (
 				<div key={index} className="childComment" >
-				<div className="J_Comment_Info clearfix mt3">
-					<div className="t_info fl">
-						<a href={`${_origin}/users/${item.user_login}`} className="content-username hide fl">
-							{item.username}
-						</a>
-						<span className="t_area fl">{item.time}</span>
-						{/* { item.position ? <span className="fl color-light-green font-14 ml15">[第{item.position}关]</span> : ""} */}
-						{	
-							item.reward ?
-							<Tooltip title={ `已奖励金币${item.reward}` } disableFocusListener={true}>
-								<a href="javascript:void(0);" style={{ marginLeft: '20px', cursor: 'default'}}
-									className={`rewarded color-grey-8 font-12 fl ${ item.admin === true ? '': 'normalUser'}`}
-								>
-									<i className="iconfont icon-gift mr5 color-orange fl" style={{display: 'inline'}}></i><span className="fl">{item.reward}</span>
-								</a>
-							</Tooltip> : ''
-						}
-					</div>
+					<div className="J_Comment_Info clearfix mt3">
+						<div className="t_info fl">
+							<a href={`${_origin}/users/${item.user_login}`} className="content-username hide fl">
+								{item.username}
+							</a>
+							<span className="t_area fl">{item.time}</span>
+							{
+								item.reward ?
+									<Tooltip title={`已奖励金币${item.reward}`} disableFocusListener={true}>
+										<a style={{ marginLeft: '20px', cursor: 'default' }}
+											className={`rewarded color-grey-8 font-12 fl ${item.admin === true ? '' : 'normalUser'}`}
+										>
+											<i className="iconfont icon-gift mr5 color-orange fl" style={{ display: 'inline' }}></i><span className="fl">{item.reward}</span>
+										</a>
+									</Tooltip> : ''
+							}
+						</div>
 
-					<p className="fr  orig_reply lineh-20">
+						<p className="fr  orig_reply lineh-20">
 							<span id="hidden_discuss_btn_952">
 							</span>
-
-							{this.props.showRewardButton != false && comment.admin === true ? 
-								<a href="javascript:void(0);" className="color-grey-8" onClick={() => this.showGoldRewardDialog(comment, item) }>
-									<Tooltip title={ "给TA奖励金币" } disableFocusListener={true}>
+							{this.props.showRewardButton != false && comment.admin === true ?
+								<a className="color-grey-8" onClick={() => this.showGoldRewardDialog(comment, item)}>
+									<Tooltip title={"给TA奖励金币"} disableFocusListener={true}>
 										<i className="iconfont icon-jiangli fl"></i>
 									</Tooltip>
 								</a>
-							:""}
+								: ""}
 
 							{/*子回复还没hidden字段*/}
-							{false && comment.admin === true ? 
-									<Tooltip title={ item.hidden ? "取消隐藏" : "隐藏评论" }>
-									<a href="javascript:void(0);" className="color-grey-8" onClick={() => this.onCommentBtnClick(comment, item, item.hidden ? 'hiddenCancel' : 'hidden') }>
+							{false && comment.admin === true ?
+								<Tooltip title={item.hidden ? "取消隐藏" : "隐藏评论"}>
+									<a className="color-grey-8" onClick={() => this.onCommentBtnClick(comment, item, item.hidden ? 'hiddenCancel' : 'hidden')}>
 										<i className={`fa ${item.hidden ? 'fa-eye' : 'fa-eye-slash'} mr5`}></i>
 									</a>
-									</Tooltip>
-							:""}
+								</Tooltip>
+								: ""}
 
 							{/* 新版user_id不准，获取方式不对 */}
-							{ comment.admin === true || item.can_delete || item.user_id === user.user_id || item.user_login == user.login ? 
-								<a href="javascript:void(0);" className="color-grey-8" id="delete_reply_118_952" onClick={() => this.onCommentBtnClick(comment, item, 'delete') }>
-									<Tooltip title={ "删除" } disableFocusListener={true}>
+							{comment.admin === true || item.can_delete || item.user_id === user.user_id || item.user_login == user.login ?
+								<a className="color-grey-8" id="delete_reply_118_952" onClick={() => this.onCommentBtnClick(comment, item, 'delete')}>
+									<Tooltip title={"删除"} disableFocusListener={true}>
 										<i className="iconfont icon-shanchu mr5"></i>
 									</Tooltip>
 								</a>
-              : ''}
+								: null}
 
-                    {/*
-                        <span className="ml5 mr5 color-grey-8">|</span>
-
-                    	<span className="reply_praise_count_952">
-                            <a href="/praise_tread/praise_plus?obj_id=952&amp;obj_type=Discuss&amp;type=reply&amp;user_activity_id=952" data-remote="true" className="fr mr5 color-grey-8" data-tip-down="点赞">
-      							<i className="fa fa-thumbs-up mr5"></i>赞
-    							
-      							<span className="ml5 fr"></span>
-								</a>
-
-                    	</span>*/}
-                  	</p>
-
-					{/* currentUser.id == item.creator_user.id && (
-						<p className="fr mr10 orig_repll">
-							<span id={`hidden_discuss_btn_${item.id}`}>
-								<a href="javascript:void(0);" className="color-grey-8" onClick={ this.onCommentBtnClick(comment, item, 'delete') } >
-									<i className="far fa-trash-alt mr5"></i>删除
-								</a>
-                    			<span className="ml5 mr5 color-grey-8">|</span>
-							</span>
 						</p>
-					)*/}
-				</div>
+					</div>
 
 					<div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
 						<div className="color-grey-3" id={`reply_content_${item.id}`}>
-							<div className={"break_word_comments markdown-body"} dangerouslySetInnerHTML={{__html: _content}}></div>
-							<div className="cl"></div>
+							<RenderHtml className="break_word_comments" value={item.content} />
 						</div>
 					</div>
 				</div>
 
-				)
+			)
 		})
 		return childCommentsElement
 	}
-	parseCommentContent = (oldContent) => {
-		if (oldContent && oldContent.startsWith('<') && oldContent.endsWith('>')) {
-		} else if (window.$('#md_div').length) {	// 有这个临时处理md内容的dom
-			window.$('#md_div').html('')
-			// markdown to html
-			try {	
-				var markdwonParser = window.editormd.markdownToHTML("md_div", {
-						markdown: oldContent,
-						emoji: true,
-										htmlDecode: "style,script,iframe",  // you can filter tags decode
-										taskList: true,
-										tex: true,  // 默认不解析
-										flowChart: true,  // 默认不解析
-										sequenceDiagram: true // 默认不解析
-						});
-				oldContent = window.$('#md_div').html()
-			} catch (e) {
-				// TODO 可能公式parse时报错了
-				console.error(e)
-			}
-		}
-		return oldContent;
-	}
 	renderComments() {
-		let { comments, currentUser, deleteComment, commentPraise, hiddenComment, user } = this.props;
+		let { comments, commentPraise, tabIndexChange, user, replyComment } = this.props;
 		const { showReplyEditorFlag, currentReplyComment } = this.state;
 		if (!comments || comments.length === 0) {
 			return;
 		}
 		// "https://www.educoder.net/users/m02945638"
 		let commentsElement = comments.map((item, index) => {
-			let _content
-		
-			_content = this.parseCommentContent(item.content);
-			
+
 			return (
 				<div className="comment_item_cont df clearfix" key={index}>
 					<div className="J_Comment_Face fl">
 						<a href={`${_origin}/users/${item.user_login}`} target="_blank">
-							<img alt="用户头像" height="50" src={getImageUrl(`images/${item.image_url}`)} width="50"/>
+							<img alt="用户头像" height="50" src={getImageUrl(`images/${item.image_url}`)} width="50" />
 						</a>
 					</div>
 
 					<div className="t_content fl">
 						<div className="J_Comment_Reply">
-							<div className="comment_orig_content" style={{ margin:"0px" }}>
-								
-
+							<div className="comment_orig_content" style={{ margin: "0px" }}>
 								<div className="J_Comment_Info clearfix mt3">
 									<div className="t_info fl">
 										<a href={`${_origin}/users/${item.user_login}`} className="content-username hide fl">
 											{item.username}
 										</a>
 										<span className="t_area fl">{item.time}</span>
-										{ item.position && <span className="fl color-light-green font-14 ml15">[第{item.position}关]</span> }
-										{ item.game_url ? 
-											<Tooltip title={ `点击查看TA的代码页面` } disableFocusListener={true}>
+										{item.position && <span className="fl color-light-green font-14 ml15">[第{item.position}关]</span>}
+										{item.game_url ?
+											<Tooltip title={`点击查看TA的代码页面`} disableFocusListener={true}>
 												<a href={item.game_url} target="_blank" className="fl font-14 ml15"
-														style={{ color: "#4CACFF", cursor: "pointer" }}
+													style={{ color: "#4CACFF", cursor: "pointer" }}
 												>查看</a>
 											</Tooltip> : ""}
 
-										{	
+										{
 											item.reward ?
-											<Tooltip title={ `已奖励金币${item.reward}` } disableFocusListener={true}>
-												<a href="javascript:void(0);" style={{ marginLeft: '20px', cursor: 'default'}}
-														className={`rewarded color-grey-8 font-12 fl ${ item.admin === true ? '': 'normalUser'}`}
-												>
-													<i className="iconfont icon-gift mr5 color-orange fl"></i><span className="fl">{item.reward}</span>
-												</a>
-											</Tooltip> : ''
+												<Tooltip title={`已奖励金币${item.reward}`} disableFocusListener={true}>
+													<a style={{ marginLeft: '20px', cursor: 'default' }}
+														className={`rewarded color-grey-8 font-12 fl ${item.admin === true ? '' : 'normalUser'}`}
+													>
+														<i className="iconfont icon-gift mr5 color-orange fl"></i><span className="fl">{item.reward}</span>
+													</a>
+												</Tooltip> : ''
 										}
 									</div>
 
-									{/* currentUser.id == item.creator_user.id && (
-										<p className="fr mr10 orig_repll">
-											<span id={`hidden_discuss_btn_${item.id}`}>
-												<a href="javascript:void(0);" className="color-grey-8" onClick={ deleteComment.bind(this, item, index) } >
-													<i className="far fa-trash-alt mr5"></i>删除
-												</a>
-	                                			<span className="ml5 mr5 color-grey-8">|</span>
-											</span>
-										</p>
-									)*/}
 								</div>
 
 								<div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
 									<div className="color-grey-3" id={`reply_content_${item.id}`}>
-										{/* 改成后端返回了的，都是要显示的，不管hidden的值是true还是false */}
-
-										{/* { item.hidden && ((this.props.onlySuperAdminCouldHide && !item.isSuperAdmin) 
-												|| !this.props.onlySuperAdminCouldHide && item.admin === false && (item.manager === false || item.manager == undefined))
-											? <p className="color-orange font-16">违规评论已被屏蔽！</p>
-											:  */}
-											<div  className={"break_word_comments  markdown-body"} dangerouslySetInnerHTML={{__html: _content}}></div>
-										{/* } */}
-										<div className="cl"></div>
+										<RenderHtml className="break_word_comments" value={item.content} />
 									</div>
 								</div>
 								<div className="childrenCommentsView">
-									{(item && item.children && item.children.length) ? <div className="trangle"></div>: ''}
+									{(item && item.children && item.children.length) ? <div className="trangle"></div> : ''}
 									{this.renderChildenComments(item)}
-									{ item.isAllChildrenLoaded != true && item.children && this.props.isChildCommentPagination == true && item.child_message_count > 5? 
-										<Tooltip title={ "点击查看更多回复" } disableFocusListener={true}>
-											<div className="loadMoreChildComments" onClick={() => {this.props.loadMoreChildComments && this.props.loadMoreChildComments(item)}}>
+									{item.isAllChildrenLoaded != true && item.children && this.props.isChildCommentPagination == true && item.child_message_count > 5 ?
+										<Tooltip title={"点击查看更多回复"} disableFocusListener={true}>
+											<div className="loadMoreChildComments" onClick={() => { this.props.loadMoreChildComments && this.props.loadMoreChildComments(item) }}>
 												<i className="iconfont icon-xiajiantou"></i>
 											</div>
 										</Tooltip>
-									: ''}
+										: ''}
 								</div>
 								{/*mr10 */}
 								<p className="fr orig_reply">
-										<span id="hidden_discuss_btn_952">
-										</span>
-
-										{/* && !item.reward  */}
-										{this.props.showRewardButton != false && item.admin === true ? 
-											<a href="javascript:void(0);" className="color-grey-8 fl mt2" onClick={() => this.showGoldRewardDialog(item) }>
-												<Tooltip title={ "给TA奖励金币" } disableFocusListener={true}>
-													<i className="iconfont icon-jiangli mr5 fl"></i>
-												</Tooltip>
-											</a>
-										:""}
-
-										{ this.props.showHiddenButton == true 
-											&& (this.props.onlySuperAdminCouldHide && item.isSuperAdmin || !this.props.onlySuperAdminCouldHide && item.admin === true) ? 
-										<Tooltip title={ item.hidden ? "取消隐藏" : "隐藏评论" } disableFocusListener={true}>
-										<a href="javascript:void(0);" className="color-grey-8 fl mt1" onClick={() => this.onCommentBtnClick(item, '', item.hidden ? 'hiddenCancel' : 'hidden') }>
-											<i className={` ${item.hidden ? 'iconfont icon-yincangbiyan' : 'fa fa-eye'} mr5`}></i>
-										</a>
-										</Tooltip>
-										:""}
-
-	                                
-	                                
-										{ item.admin && ( !item.children || item.children.length === 0 )? 
-	                    	<a href="javascript:void(0);" className="color-grey-8" onClick={() => this.onCommentBtnClick(item, '', 'delete') }>
-													<Tooltip title={ "删除" } disableFocusListener={true}>
-														<i className="iconfont icon-shanchu mr5"></i>
-													</Tooltip>
-												</a>	: '' }
-
-	                                {/* <span className="ml5 mr5 color-grey-8">|</span>*/}
-	                                
-										{(this.props.showReply == undefined || this.props.showReply == true) && <a href={`javascript:void(0)`} className="color-grey-8"
-												onClick={() => this.initReply(item) } >
-											<Tooltip title={ "回复" }>
-												<i className="iconfont icon-huifu1 mr5"></i>
+									<span id="hidden_discuss_btn_952">
+									</span>
+									{(this.props.power) ?
+										<a href="javascript:void(0);" className="color-grey-8" onClick={() => { this.putTop(item.id, !item.sticky) }}>
+											<Tooltip title={item.sticky ? "取消置顶" : "置顶"} disableFocusListener={true}>
+												<i className="iconfont icon-zhiding mr5" style={item.sticky ? { transform: "rotate(180deg)", display: "inline-block" } : undefined}></i>
 											</Tooltip>
-										</a>}
-	                              	
+										</a> : null}
+									{/* && !item.reward  */}
+									{this.props.showRewardButton != false && item.admin === true ?
+										<a className="color-grey-8 fl mt2" onClick={() => this.showGoldRewardDialog(item)}>
+											<Tooltip title={"给TA奖励金币"} disableFocusListener={true}>
+												<i className="iconfont icon-jiangli mr5 fl"></i>
+											</Tooltip>
+										</a>
+										: ""}
+
+									{this.props.showHiddenButton == true
+										&& (this.props.onlySuperAdminCouldHide && item.isSuperAdmin || !this.props.onlySuperAdminCouldHide && item.admin === true) ?
+										<Tooltip title={item.hidden ? "取消隐藏" : "隐藏评论"} disableFocusListener={true}>
+											<a className="color-grey-8 fl mt1" onClick={() => this.onCommentBtnClick(item, '', item.hidden ? 'hiddenCancel' : 'hidden')}>
+												<i className={` ${item.hidden ? 'iconfont icon-yincangbiyan' : 'fa fa-eye'} mr5`}></i>
+											</a>
+										</Tooltip>
+										: ""}
+									{item.admin && (!item.children || item.children.length === 0) ?
+										<a className="color-grey-8" onClick={() => this.onCommentBtnClick(item, '', 'delete')}>
+											<Tooltip title={"删除"} disableFocusListener={true}>
+												<i className="iconfont icon-shanchu mr5"></i>
+											</Tooltip>
+										</a> : ''}
+
+									{(this.props.showReply == undefined || this.props.showReply == true) && <a className="color-grey-8"
+										onClick={() => this.initReply(item)} >
+										<Tooltip title={"回复"}>
+											<i className="iconfont icon-huifu1 mr5"></i>
+										</Tooltip>
+									</a>}
+
+									<span className="reply_praise_count_952">
+										<Tooltip title={item.user_praise ? "取消点赞" : "点赞"}>
+											<a className={`fr mr5  ${item.user_praise ? 'color-orange03' : 'color-grey-8'}`} onClick={() => commentPraise(item.id)}>
+												<i className={item.user_praise ? "iconfont icon-dianzan mr3" : "iconfont icon-dianzan-xian mr3"}></i>
+
+												<span className="fr font-14" style={{ marginTop: '1px' }}>{item.praise_count ? item.praise_count : ''}</span>
+											</a>
+										</Tooltip>
+									</span>
+								</p>
+								<CommentItemMDEditor showReplyEditorFlag={showReplyEditorFlag}
+									currentReplyComment={currentReplyComment}
+									item={item}
+									user={user}
+									replyComment={replyComment}
+									tabIndexChange={tabIndexChange}
 
-										{/* <span className="ml5 mr5 color-grey-8">|</span>*/}
-										<span className="reply_praise_count_952">
-											<Tooltip title={ item.user_praise ? "取消点赞" : "点赞" }>
-												<a href={`javascript:void(0)`} className={`fr mr5  ${item.user_praise ? 'color-orange03' : 'color-grey-8'}`} onClick={()=>commentPraise(item.id)}>
-														<i className={ item.user_praise ? "iconfont icon-dianzan mr3" : "iconfont icon-dianzan-xian mr3" }></i>
-													
-														<span className="fr font-14" style={{ marginTop: '1px'}}>{item.praise_count?item.praise_count:''}</span>
-												</a>
-												</Tooltip>
-										</span>
-	              </p>
-				  {/* __useKindEditor暂时没用到了，TODO 可以去掉 */}
-								{ window.__useKindEditor ? <CommentItemKEEditor showReplyEditorFlag={showReplyEditorFlag} 
-		                          	currentReplyComment={currentReplyComment}
-		                          	item={item}
-		                          	user={user}
-		                          >
-		                          </CommentItemKEEditor>
-		                          :
-		                          <CommentItemMDEditor showReplyEditorFlag={showReplyEditorFlag} 
-		                          	currentReplyComment={currentReplyComment}
-		                          	item={item}
-		                          	user={user}
 									buttonText={this.props.buttonText}
-		                          >
-		                          </CommentItemMDEditor>
-		                      }
-		                          {/* <div id={`reply_message_${item.id}`} className="reply_to_message"></div> */}
-		                        
+								/>
 							</div>
 						</div>
 					</div>
 				</div>
 			)
 		})
-		/*
-			/users/reply_to?reply_id=${item.id}&amp;type=Challenge&amp;user_activity_id=118
-		*/
-		/*	
-			onclick="delete_confirm_box_2('<%= discuss_path(comment, :challenge_id => @game_challenge) %>', '确定要删除该条回复吗？')"
-			delete按钮
-			id=`delete_reply_<%=@game_challenge.id %>_<%=comment.id %>`
-
-		*/
 		return commentsElement;
 	}
 
 	onCommentBtnClick(comment, childComment, dialogType) {
 		this.comment = comment;
 		this.childComment = childComment;
-		this.setState({dialogOpen: true, dialogType: dialogType})
+		this.setState({ dialogOpen: true, dialogType: dialogType })
 	}
 	handleDialogClose() {
 		this.setState({
@@ -467,18 +282,18 @@ class Comments extends Component {
 		const { dialogType } = this.state;
 		if (dialogType === 'delete') {
 			deleteComment(this.comment, this.childComment ? this.childComment.id : '')
-		} else if (dialogType === 'hidden' || dialogType === 'hiddenCancel' ) {
+		} else if (dialogType === 'hidden' || dialogType === 'hiddenCancel') {
 			hiddenComment(this.comment, this.childComment ? this.childComment.id : '')
 		}
 
-		this.setState({dialogOpen: false})
+		this.setState({ dialogOpen: false })
 	}
 
 	showGoldRewardDialog(comment, childComment) {
 		if (comment.admin === true) {
 			this.comment = comment;
 			this.childComment = childComment;
-			this.setState({goldRewardDialogOpen: true})
+			this.setState({ goldRewardDialogOpen: true })
 		}
 	}
 	handleGoldRewardDialogClose() {
@@ -487,14 +302,12 @@ class Comments extends Component {
 		})
 	}
 	onGoldRewardDialogOkBtnClick() {
-		console.log('onGoldRewardDialogOkBtnClick')
 		const { goldRewardInput } = this.state;
-		// || goldRewardInput.indexOf('-') !== -1
-		if (!goldRewardInput || goldRewardInput === '0' ) {
-			this.setState({ goldRewardInputError: true})
+		if (!goldRewardInput || goldRewardInput === '0') {
+			this.setState({ goldRewardInputError: true })
 			return;
 		} else {
-			this.setState({goldRewardDialogOpen: false})
+			this.setState({ goldRewardDialogOpen: false })
 			this.props.rewardCode(this.comment, this.childComment, goldRewardInput)
 		}
 	}
@@ -510,104 +323,54 @@ class Comments extends Component {
 		const { deleteComment, onPaginationChange, comment_count_without_reply, currentPage, comments, usingAntdModal } = this.props;
 		const { dialogOpen, goldRewardDialogOpen, dialogType, goldRewardInputError } = this.state;
 
-		const goldRewardInputErrorObj = goldRewardInputError ? {'error': 'error'} : {}
-
 		return (
-			<div className="fit -scroll" style={{ 'overflow-x': 'hidden'}}>
-				
-						
-						{ usingAntdModal ? <Modals
-                modalsType={dialogOpen}
-                modalsTopval={
-									dialogType === 'delete' ? '确定要删除该条回复吗？'
-										: dialogType === 'hidden' ? '确定要隐藏该条回复吗？' 
-										: dialogType === 'hiddenCancel' ? '确定要取消隐藏该条回复吗？' : ''
-								}
-                modalsBottomval={""}
-                modalCancel={this.handleDialogClose}
-                modalSave={this.onDialogOkBtnClick}
-						>
-						</Modals> : 
-						<Dialog
-		          	open={dialogOpen}
-								disableEscapeKeyDown={true}
-		          	onClose={this.handleDialogClose}
-		        >	
-			       	<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
-		          	<DialogContent>
-			            <DialogContentText id="alert-dialog-description" style={{textAlign: 'center'}}>
-			            	{
-			            		dialogType === 'delete' ? '确定要删除该条回复吗？'
-			            			: dialogType === 'hidden' ? '确定要隐藏该条回复吗？' 
-			            				: dialogType === 'hiddenCancel' ? '确定要取消隐藏该条回复吗？' : ''
-			            	}
-			            </DialogContentText>
-		          	</DialogContent>
-		          	<DialogActions>
-			            <Button onClick={this.handleDialogClose} color="primary">
-			              取消
-			            </Button>
-			            <Button variant="raised" 	
-			            	onClick={() => this.onDialogOkBtnClick() } color="primary" autoFocus>
-			              确定
-			            </Button>
-		          	</DialogActions>
-							</Dialog> 
-						}
-
-		        <Dialog
-		          	open={goldRewardDialogOpen}
-								disableEscapeKeyDown={true}
-		          	onClose={this.handleGoldRewardDialogClose}
-		        >	
-			       	<DialogTitle id="alert-dialog-title">{"奖励设置"}</DialogTitle>
-		          	<DialogContent>
-			            
-						<InputNumber placeholder="请输入奖励的金币数量" id="goldReward"  type="number" value={this.state.goldRewardInput} 
-								onChange={(e) => this.onGoldRewardInputChange(e)} width={228} style={{ width: '228px'}} />
-
-			            	{/* <FormControl { ...goldRewardInputErrorObj } aria-describedby="name-error-text">
-					          	<InputLabel htmlFor="goldReward">请输入奖励的金币数量</InputLabel>
-					          	<Input id="goldReward"  type="number" value={this.state.goldRewardInput} onChange={(e) => this.onGoldRewardInputChange(e)} />
-					          	{ goldRewardInputError ? <FormHelperText id="name-error-text">奖励金币不能为空或负数</FormHelperText> : ''}
-					        </FormControl> */}
-
-				        {/*<DialogContentText id="alert-dialog-description" style={{textAlign: 'center'}}>    </DialogContentText>*/}
-		          	</DialogContent>
-		          	<DialogActions>
-			            <Button onClick={this.handleGoldRewardDialogClose} color="primary">
-			              取消
-			            </Button>
-			            <Button variant="raised" 	
-			            	onClick={() => this.onGoldRewardDialogOkBtnClick() } color="primary" autoFocus>
-			              确定
-			            </Button>
-		          	</DialogActions>
-		        </Dialog>
-
+			<div className="fit -scroll" style={{ 'overflowX': 'hidden' }}>
+				<Modals
+					modalsType={dialogOpen}
+					modalsTopval={
+						dialogType === 'delete' ? '确定要删除该条回复吗？'
+							: dialogType === 'hidden' ? '确定要隐藏该条回复吗？'
+								: dialogType === 'hiddenCancel' ? '确定要取消隐藏该条回复吗？' : ''
+					}
+					modalsBottomval={""}
+					modalCancel={this.handleDialogClose}
+					modalSave={this.onDialogOkBtnClick}
+				>
+				</Modals>
+				<Modal
+					width={400}
+					title="奖励设置"
+					bodyStyle={{ textAlign: 'center' }}
+					visible={goldRewardDialogOpen}
+					onCancel={this.handleGoldRewardDialogClose}
+					onOk={() => this.onGoldRewardDialogOkBtnClick()}
+				>
+					<InputNumber placeholder="请输入奖励的金币数量" id="goldReward" type="number" value={this.state.goldRewardInput}
+						onChange={(e) => this.onGoldRewardInputChange(e)} width={228} style={{ width: '228px' }} />
+				</Modal>
 
 				<div className="-layout-v -fit">
 					<div className="panel-comment_item" >
 
-						{this.renderComments()}	
+						{this.renderComments()}
 
 					</div>
-					{ (comment_count_without_reply > 10 ) ? 
-						<div className="paginationSection">
+					{(comment_count_without_reply > 10) ?
+						<div className="pagination-contaner">
 							<Pagination showQuickJumper onChange={onPaginationChange} current={currentPage} total={comment_count_without_reply} />
 						</div>
-						: '' }
-					{ (comment_count_without_reply == 0) ? <div>
+						: ''}
+					{(comment_count_without_reply == 0) ? <div>
 
-							<div className="edu-tab-con-box clearfix edu-txt-center">
-								<img className="edu-nodata-img mb20"
-										 src={getImageUrl("images/educoder/nodata.png")} />
-								<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
-							</div>
+						<div className="edu-tab-con-box clearfix edu-txt-center">
+							<img className="edu-nodata-img mb20"
+								src={getImageUrl("images/educoder/nodata.png")} />
+							<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
+						</div>
 					</div>
-						: '' }
+						: ''}
 				</div>
-				
+
 			</div>
 		)
 	}
diff --git a/src/modules/comment/CommentsHOC.js b/src/modules/comment/CommentsHOC.js
index cc5be165..3b3a442e 100644
--- a/src/modules/comment/CommentsHOC.js
+++ b/src/modules/comment/CommentsHOC.js
@@ -1,5 +1,4 @@
 import React from 'react'
-import ReactDOM from 'react-dom'
 import axios from 'axios'
 import { notification } from 'antd'
 import update from 'immutability-helper'
@@ -26,412 +25,326 @@ const $ = window.$
 */
 export function commentHOC(WrappedComponent) {
 	// 这里如果extends WrappedComponent 会出现 WrappedComponent mount twice的问题
-  return class II extends React.Component {
-  	constructor(props) {
-		super(props)
-		
-		// ------------------------------------
-		this.createNewComment = this.createNewComment.bind(this)
-		this.fetchCommentIfNotFetched = this.fetchCommentIfNotFetched.bind(this)
-		this.replyComment = this.replyComment.bind(this)
-		this.deleteComment = this.deleteComment.bind(this)
-		this.commentPraise = this.commentPraise.bind(this)
-		this.hiddenComment = this.hiddenComment.bind(this)
-		this.rewardCode = this.rewardCode.bind(this)
-		this.showNewReply = this.showNewReply.bind(this)
-		this.newMessage = this.newMessage.bind(this)
-		// ------------------------------------
+	return class II extends React.Component {
+		constructor(props) {
+			super(props)
 
-		this.onPaginationChange = this.onPaginationChange.bind(this)
+			// ------------------------------------
+			this.createNewComment = this.createNewComment.bind(this)
+			this.fetchCommentIfNotFetched = this.fetchCommentIfNotFetched.bind(this)
+			this.replyComment = this.replyComment.bind(this)
+			this.deleteComment = this.deleteComment.bind(this)
+			this.commentPraise = this.commentPraise.bind(this)
+			this.hiddenComment = this.hiddenComment.bind(this)
+			this.rewardCode = this.rewardCode.bind(this)
+			this.showNewReply = this.showNewReply.bind(this)
+			// ------------------------------------
 
-		this.state = {
-			// 评论
-			comments: [],
-			comment_count_without_reply: 0,
-			// 默认pageSize为10
-			currentPage: 1,
-			loadingComments: true,
+			this.onPaginationChange = this.onPaginationChange.bind(this)
 
-			// 图片最大化
-			showImage: false,
-		  	imageSrc: '',
-		}
-	}
+			this.state = {
+				// 评论
+				comments: [],
+				comment_count_without_reply: 0,
+				// 默认pageSize为10
+				currentPage: 1,
+				loadingComments: true,
 
-	// ----------------------------------------------------------------------------------------------评论 Start
-
-	// ----------------------------------------------------------------------------------------------评论 Start
-	onPaginationChange(page) {
-		this.fetchComment(page)
-		this.setState({
-	        currentPage: page,
-	    });
-	}
-	/*
-	email: "1843820944@qq.com"
-	grade: 2138
-	image_url: "avatar/User/36497"
-	login: "p24891375"
-	name: "杨俊男"
-	user_url: "/users/p24891375"
-*/ 
-	handleComments(comments, responseData) {
-		comments.forEach(element => {
-			if (element.children) {
-				this.handleComments(element.children, responseData)
+				// 图片最大化
+				showImage: false,
+				imageSrc: '',
 			}
-			element.admin = responseData.all
-			element.manager = element.manage
+		}
 
-			element.username = element.author.name
-			element.user_login = element.author.login
-			element.image_url = element.author.image_url
-			element.user_id = element.author.user_id
-			
-		});
-	}
-	responseDataParse(response) {
-		const comments = response.data.comments
-		this.handleComments(comments, response.data)
-	}
-	fetchComment(page = 1) {
-		const { challenge, shixun, match } = this.props;
-		// const url = `/api/v1/shixuns/${shixun.id}/shixun_discusses?page=${page-1}&container_type=Shixun`
-		const url = 
-			`/discusses.json?page=${page-1}&container_identifier=${shixun && shixun.identifier ?
-				shixun.identifier : match.params.shixunId}&container_type=Shixun`
-		
-		this.setState({
-			loadingComments: true,
-		});
+		// ----------------------------------------------------------------------------------------------评论 Start
 
-		// test
-		// if (true) {
-		if (false) {
-	    	var data = {"children_list":[{"id":1165,"content":"\u7535\u8111\u6ca1\u6709pi\u554a","time":"4\u5929\u524d","position":2,"user_id":31542,"reward":null,"image_url":"avatars/User/b","username":"\u8d75\u94f6\u7fd4","user_login":"p81572036","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":null},{"id":1142,"content":"\u6700\u540e\u4e00\u9898\u4e09\u5929\u6253\u9c7c\uff0c\u4e24\u5929\u6652\u7f51\uff0c\u4e0d\u5e94\u8be5\u662f1.01*1.01*1.01*0.99*0.99\uff0c\u800c\u4e0d\u662f\u52a0\u5417\uff1f","time":"4\u5929\u524d","position":1,"user_id":33714,"reward":null,"image_url":"avatars/User/b","username":"\u843d\u5c18","user_login":"p52769048","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":[{"content":"\u672c\u5173\u5e76\u6ca1\u6709\u5199\u5230\u201c<span style=\"color:#333333;font-family:&quot;background-color:#FFFFFF;\">1.01*1.01*1.01*0.99*0.99</span>\u201d\uff0c\u4e0d\u77e5\u9053\u4f55\u6765\u6b64\u95ee\uff1f","time":"4\u5929\u524d","position":1,"reward":null,"image_url":"avatars/User/1","username":"Coder","user_id":1,"user_login":"innov","can_delete":false,"id":1144}]},{"id":1112,"content":"\u8fd9\u4e2a\u5b9e\u8bad\u5f88\u8d5e\uff01","time":"10\u5929\u524d","position":2,"user_id":12,"reward":null,"image_url":"avatars/User/12","username":"\u9ec4\u4e95\u6cc9","user_login":"Hjqreturn","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":null},{"id":1057,"content":"\u4e0d\u9519","time":"20\u5929\u524d","position":2,"user_id":30403,"reward":null,"image_url":"avatars/User/b","username":"Jimmy","user_login":"p69243850","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":null},{"id":975,"content":"q","time":"1\u4e2a\u6708\u524d","position":2,"user_id":30403,"reward":null,"image_url":"avatars/User/b","username":"Jimmy","user_login":"p69243850","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":[{"content":"\u4e0b\u6b21\u518d\u53d1\u65e0\u610f\u4e49\u7684\u5185\u5bb9\uff0c\u5c06\u88ab\u6263\u91d1\u5e01\u54e6","time":"1\u4e2a\u6708\u524d","position":2,"reward":null,"image_url":"avatars/User/1","username":"Coder","user_id":1,"user_login":"innov","can_delete":false,"id":980}]},{"id":974,"content":"k","time":"1\u4e2a\u6708\u524d","position":2,"user_id":30403,"reward":null,"image_url":"avatars/User/b","username":"Jimmy","user_login":"p69243850","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":[{"content":"\u4e0b\u6b21\u518d\u53d1\u65e0\u610f\u4e49\u7684\u5185\u5bb9\uff0c\u5c06\u88ab\u6263\u91d1\u5e01\u54e6","time":"1\u4e2a\u6708\u524d","position":2,"reward":null,"image_url":"avatars/User/1","username":"Coder","user_id":1,"user_login":"innov","can_delete":false,"id":981}]},{"id":859,"content":"\u5f88\u68d2\uff01\uff01\uff01","time":"1\u4e2a\u6708\u524d","position":4,"user_id":1,"reward":null,"image_url":"avatars/User/1","username":"Coder","user_login":"innov","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":null},{"id":802,"content":"\u4e0d\u9519\uff01","time":"2\u4e2a\u6708\u524d","position":1,"user_id":30403,"reward":null,"image_url":"avatars/User/b","username":"Jimmy","user_login":"p69243850","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":null},{"id":619,"content":"\u770b\u6765\u8001\u5e08\u5bf9\u9f50\u7528\u7684\u90fd\u662f\u7a7a\u683c","time":"5\u4e2a\u6708\u524d","position":3,"user_id":29145,"reward":null,"image_url":"avatars/User/b","username":"yang","user_login":"m02945638","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":null},{"id":553,"content":"<p>\r\n\t666\r\n</p>\r\n<p>\r\n\t<br />\r\n</p>","time":"6\u4e2a\u6708\u524d","position":4,"user_id":26838,"reward":null,"image_url":"avatars/User/b","username":"\u5189\u529b","user_login":"m54013296","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":null}],"disscuss_count":183}
+		// ----------------------------------------------------------------------------------------------评论 Start
+		onPaginationChange(page) {
+			this.fetchComment(page)
+			this.setState({
+				currentPage: page,
+			});
+		}
+		/*
+		email: "1843820944@qq.com"
+		grade: 2138
+		image_url: "avatar/User/36497"
+		login: "p24891375"
+		name: "杨俊男"
+		user_url: "/users/p24891375"
+	*/
+		handleComments(comments, responseData) {
+			comments.forEach(element => {
+				if (element.children) {
+					this.handleComments(element.children, responseData)
+				}
+				element.admin = responseData.all
+				element.manager = element.manage
+
+				element.username = element.author.name
+				element.user_login = element.author.login
+				element.image_url = element.author.image_url
+				element.user_id = element.author.user_id
+
+			});
+		}
+		responseDataParse(response) {
+			const comments = response.data.comments
+			this.handleComments(comments, response.data)
+		}
+		fetchComment(page = 1) {
+			const { challenge, shixun, match } = this.props;
+			// const url = `/api/v1/shixuns/${shixun.id}/shixun_discusses?page=${page-1}&container_type=Shixun`
+			const url =
+				`/discusses.json?page=${page - 1}&container_identifier=${shixun && shixun.identifier ?
+					shixun.identifier : match.params.shixunId}&container_type=Shixun`
 
 			this.setState({
-				comments: data.children_list,
-				comment_count_without_reply: data.disscuss_count,
+				loadingComments: true,
+			});
 
-				currentPage: page,
-				loadingComments: false,
-			})
-			return;
-		}
 
-		axios.get(url,
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	// test
+			axios.get(url,
+				{}
+			).then((response) => {
+				// test
 
-		    	if (response.data) { 
-		    		this.responseDataParse(response)
-		    		this.setState({
+				if (response.data) {
+					this.responseDataParse(response)
+					this.setState({
 						comments: response.data.comments,
 						comment_count_without_reply: response.data.disscuss_count,
 
 						currentPage: page,
 						loadingComments: false,
-					}, ()=>{
+					}, () => {
 						// keditor代码美化
-		    			window.prettyPrint()
+						window.prettyPrint()
 					})
-		    	}
-		    	// console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-	}
-	// 切换关卡时，清空state
-	clearCommentsInState = () => {
-		this.setState({ comments: [] })
-	}
-	fetchCommentIfNotFetched() {
-		if (this.state.comments && this.state.comments.length) {
-			return;
+				}
+				// console.log(response)
+			}).catch((error) => {
+				console.log(error)
+			})
 		}
-		
-		// http://localhost:3000/api/v1/shixuns/cz7yw3en/shixun_discusses?page=0	
-		
-		this.fetchComment();
-	}
-	// 新增父级评论
-	createNewComment() {
-		console.log('createNewComment...')
-
-		const { challenge, shixun, showSnackbar } = this.props;
-		let content = window._commentInput.html();
-		if (!content || content.length === 0) {
-			showSnackbar('必须填写内容！')
-			return;
+		// 切换关卡时，清空state
+		clearCommentsInState = () => {
+			this.setState({ comments: [] })
 		}
-
-		// const url = `/api/v1/discusses`
-		const url = `/discusses.json`
-
-		if(content != undefined){
-            var beforeImage = content.split("<img");
-            var afterImage = content.split("/>");
-            if(beforeImage[0] == "" && afterImage[1] == ""){
-                window.notice_box('不支持纯图片评论<br/>请在评论中增加文字信息');
-                return;
-            }
-        }
-
-		$("#new_message_submit_btn_" + this.props.challenge.shixun_id).hide();
-
-        if (content) {	// 去掉尾部的回车换行
-	        content = content.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
-	    }
-
-		axios.post(url, {
-					container_type: "Shixun",
-				    container_id: shixun.id,
-				    challenge_id: challenge.id,
-				    content,
-				    position: challenge.position
-			    },
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	if (response.data.discuss) { 
-		    		
-					window._commentInput.html('');
-					window._commentInput.afterBlur()
-		   //  		this.setState({
-					// 	runTesting: false,
-					// })
-		    		this.fetchComment()
-		    	}
-		    	console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-		return true;
-	}
-	_findCommentById(id, arg_comments) {
-		let comments;
-		if (!arg_comments) {
-			comments = this.state.comments;
-		} else {
-			comments = arg_comments;
+		fetchCommentIfNotFetched() {
+			if (this.state.comments && this.state.comments.length) {
+				return;
+			}
+			// http://localhost:3000/api/v1/shixuns/cz7yw3en/shixun_discusses?page=0	
+			this.fetchComment();
 		}
-		for(let i = 0; i < comments.length; i++) {
-			if (id === comments[i].id) {
-				return i;
+		// 新增父级评论
+		createNewComment(content) {
+
+			const { challenge, shixun, showSnackbar } = this.props;
+			if (!content || content.length === 0) {
+				showSnackbar('必须填写内容！')
+				return;
+			}
+			const url = `/discusses.json`
+
+			if (content != undefined) {
+				var beforeImage = content.split("<img");
+				var afterImage = content.split("/>");
+				if (beforeImage[0] == "" && afterImage[1] == "") {
+					window.notice_box('不支持纯图片评论<br/>请在评论中增加文字信息');
+					return;
+				}
+			}
+
+			let res = axios.post(url, {
+				container_type: "Shixun",
+				container_id: shixun.id,
+				challenge_id: challenge.id,
+				content,
+				position: challenge.position
+			}
+			).then((response) => {
+				if (response.data.discuss) {
+					this.fetchComment()
+				}
+			}).catch((error) => {
+				console.log(error)
+			})
+			return res;
+		}
+		_findCommentById(id, arg_comments) {
+			let comments;
+			if (!arg_comments) {
+				comments = this.state.comments;
+			} else {
+				comments = arg_comments;
+			}
+			for (let i = 0; i < comments.length; i++) {
+				if (id === comments[i].id) {
+					return i;
+				}
 			}
 		}
-	}
-	replyComment(commentContent, id, editor) {
-		// http://localhost:3000/api/v1/discusses/812/reply
-		const { challenge, shixun, user, showSnackbar, match } = this.props;
+		replyComment(commentContent, id) {
+			const { challenge, shixun, user, showSnackbar, match } = this.props;
 
-		if (!commentContent || commentContent.length === 0) {
-			showSnackbar('必须填写内容！')
-			return;
-		}
-		// const url = `/api/v1/discusses/${id}/reply`
-		const url = `/discusses/${id}/reply.json`
-		if (commentContent) {
-	        commentContent = commentContent.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
-	    }
-	    if (!user.login && user.user_url) {
-		    const loginAr = user.user_url.split('/')
-		    user.login = loginAr[loginAr.length - 1]
-	    }
-		axios.post(url, {
-				    content: commentContent,
-					// TODO
-					"container_id": match.params.shixunId,
-					"container_type": "Shixun",
-			    },
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	if (response.data.discuss) { 
-		    		let newDiscuss = response.data.discuss;
-		    		let { comments } = this.state;
-		    		var commentIndex = this._findCommentById(id);
-		    		let comment = comments[commentIndex]
-						comment = Object.assign({}, comment)
-		    		if (!comment.children ) {
-		    			comment.children = []
-		    		} else {
+			if (!commentContent || commentContent.length === 0) {
+				showSnackbar('必须填写内容！')
+				return;
+			}
+			const url = `/discusses/${id}/reply.json`
+			if (commentContent) {
+				commentContent = commentContent.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g, '');
+			}
+			if (!user.login && user.user_url) {
+				const loginAr = user.user_url.split('/')
+				user.login = loginAr[loginAr.length - 1]
+			}
+			let res = axios.post(url, { content: commentContent, "container_id": match.params.shixunId, "container_type": "Shixun", }).then((response) => {
+				if (response.data.discuss) {
+					let newDiscuss = response.data.discuss;
+					let { comments } = this.state;
+					var commentIndex = this._findCommentById(id);
+					let comment = comments[commentIndex]
+					comment = Object.assign({}, comment)
+					if (!comment.children) {
+						comment.children = []
+					} else {
 						comment.children = comment.children.slice(0);
 					}
-		    		// TODO userName iamge_url
-		    		comment.children.push( {
-		    			"can_delete": true,
-	                    "content": commentContent,
+					comment.children.push({
+						"can_delete": true,
+						"content": commentContent,
 
-	                    "image_url": user.image_url,
-	                    "username": user.username,
-	                    "user_login": user.login,
-	                    "id": newDiscuss.id,
-	                    "position": newDiscuss.position,
-	                    "time": "1分钟前",
-	                    "praise_count": newDiscuss.praise_count,
-	                    
-	                    "user_id": newDiscuss.user_id,
-	                    
-	                })
+						"image_url": user.image_url,
+						"username": user.username,
+						"user_login": user.login,
+						"id": newDiscuss.id,
+						"position": newDiscuss.position,
+						"time": "1分钟前",
+						"praise_count": newDiscuss.praise_count,
+
+						"user_id": newDiscuss.user_id,
+
+					})
 
 					comments = comments.slice(0)
-	                comments[commentIndex] = comment
+					comments[commentIndex] = comment
 
-	                // ke
-		            editor.html && editor.html('')
-		            // md
-		            if (editor.setValue) {
-		              	editor.setValue('')
-		              	const $ = window.$
-		              	var view_selector = `.commentItemMDEditorView_${id}`
-		              	$(view_selector).hide();
-		            }  
-
-
-		    		this.setState({
-						// runTesting: false,
+					this.setState({
 						comments: comments
-					}, ()=>{
-						// keditor代码美化
-		    			editor.html && window.prettyPrint()
 					})
-		    	}
-		    	console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-	}	
-	hiddenComment(item, childCommentId) {
-		const id = item.id
-		const { challenge, shixun, user, showSnackbar, match } = this.props;
-		// const url = `/api/v1/discusses/${id}/hidden`
-		const url = `/discusses/${id}/hidden.json`
-
-		const commentIndex = this._findCommentById(id);
-		const { comments } = this.state;
-		const comment = Object.assign({}, comments[commentIndex]);
-		axios.post(url, {
-				    hidden: !comment.hidden ? "1" : "0",
-					container_identifier: match.params.shixunId || shixun.identifier
-			    },
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	if (response.data.status === -1) { 
-		    		showSnackbar(response.data.message)
-		    		return;
-		    	}
-		    	if (response.data.status === 1) { 
-		    		
-		    		if (!childCommentId) {
-							comment.hidden = !comment.hidden;
-							const commentsCopy = this.state.comments.slice(0)
-							commentsCopy[commentIndex] = comment
-			    		this.setState({
-			    			comments: commentsCopy
-			    		})
-		    		} else {	// TODO 目前子回复没hidden字段
-		    			let childCommentIndex = this._findCommentById(childCommentId, comments[commentIndex].children);
-		    			const childComment = comments[commentIndex].children[childCommentIndex]
-		    			childComment.hidden = !childComment.hidden;
-		    			this.setState({ comments })
-		    		}
-		    		
-		    	}
-		    	// {"message":"Couldn't find Discuss with id=911","status":-1}
-		    	console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-	}
-	deleteComment(parrentComment, childCommentId) {
-		const { challenge, shixun } = this.props;
-		let deleteCommentId = parrentComment.id
-		if (childCommentId) {
-			deleteCommentId = childCommentId;
+				}
+			}).catch((error) => {
+				console.log(error)
+			})
+			return res
 		}
-		// const url = `/api/v1/discusses/${deleteCommentId}`
-		const url = `/discusses/${deleteCommentId}.json`
+		hiddenComment(item, childCommentId) {
+			const id = item.id
+			const { challenge, shixun, user, showSnackbar, match } = this.props;
+			const url = `/discusses/${id}/hidden.json`
 
-		axios.delete(url,
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	// TODO 删除成功或失败
-		    	if (response.data && response.data.status === 1) { 
-		    		const commentIndex = this._findCommentById(parrentComment.id);
+			const commentIndex = this._findCommentById(id);
+			const { comments } = this.state;
+			const comment = Object.assign({}, comments[commentIndex]);
+			axios.post(url, {
+				hidden: !comment.hidden ? "1" : "0",
+				container_identifier: match.params.shixunId || shixun.identifier
+			}).then((response) => {
+				if (response.data.status === -1) {
+					showSnackbar(response.data.message)
+					return;
+				}
+				if (response.data.status === 1) {
 
-		    		// https://stackoverflow.com/questions/29527385/removing-element-from-array-in-component-state
-		    		if (!childCommentId) {
-			    		this.setState((prevState) => ({
-						    comments: update(prevState.comments, {$splice: [[commentIndex, 1]]})
+					if (!childCommentId) {
+						comment.hidden = !comment.hidden;
+						const commentsCopy = this.state.comments.slice(0)
+						commentsCopy[commentIndex] = comment
+						this.setState({
+							comments: commentsCopy
+						})
+					} else {	// TODO 目前子回复没hidden字段
+						let childCommentIndex = this._findCommentById(childCommentId, comments[commentIndex].children);
+						const childComment = comments[commentIndex].children[childCommentIndex]
+						childComment.hidden = !childComment.hidden;
+						this.setState({ comments })
+					}
+
+				}
+			}).catch((error) => {
+				console.log(error)
+			})
+		}
+		deleteComment(parrentComment, childCommentId) {
+			const { challenge, shixun } = this.props;
+			let deleteCommentId = parrentComment.id
+			if (childCommentId) {
+				deleteCommentId = childCommentId;
+			}
+			const url = `/discusses/${deleteCommentId}.json`
+
+			axios.delete(url).then((response) => {
+				if (response.data && response.data.status === 1) {
+					const commentIndex = this._findCommentById(parrentComment.id);
+
+					// https://stackoverflow.com/questions/29527385/removing-element-from-array-in-component-state
+					if (!childCommentId) {
+						this.setState((prevState) => ({
+							comments: update(prevState.comments, { $splice: [[commentIndex, 1]] })
 						}))
 
-			    		if (this.state.comments.length <= 5) {
-			    			this.fetchComment()
-			    		}
-		    		} else {
-		    			let comments = this.state.comments; 
+						if (this.state.comments.length <= 5) {
+							this.fetchComment()
+						}
+					} else {
+						let comments = this.state.comments;
 						let newComments = Object.assign({}, comments)
-		    			let childCommentIndex = this._findCommentById(childCommentId, newComments[commentIndex].children);
-		    			newComments[commentIndex].children = update(newComments[commentIndex].children, {$splice: [[childCommentIndex, 1]]})
-		    			this.setState({ newComments })
-		    		}
-		    	}
-		    	console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-	}
-
-	rewardCode(parrentComment, childComment, amount) {
-		const { challenge, shixun, showSnackbar } = this.props;
-		let handleComment = parrentComment
-		if (childComment) {
-			handleComment = childComment;
+						let childCommentIndex = this._findCommentById(childCommentId, newComments[commentIndex].children);
+						newComments[commentIndex].children = update(newComments[commentIndex].children, { $splice: [[childCommentIndex, 1]] })
+						this.setState({ newComments })
+					}
+				}
+				console.log(response)
+			}).catch((error) => {
+				console.log(error)
+			})
 		}
-		let handleCommentId = handleComment.id;
-		// const url = `/api/v1/discusses/${handleCommentId}/reward_code`
-		const url = `/discusses/${handleCommentId}/reward_code.json`
 
-		axios.post(url, {
-					// id: handleCommentId,
+		rewardCode(parrentComment, childComment, amount) {
+			const { challenge, shixun, showSnackbar } = this.props;
+			let handleComment = parrentComment
+			if (childComment) {
+				handleComment = childComment;
+			}
+			let handleCommentId = handleComment.id;
+			// const url = `/api/v1/discusses/${handleCommentId}/reward_code`
+			const url = `/discusses/${handleCommentId}/reward_code.json`
 
-					// container_id: shixun.id,
-					container_type: 'Discusses',
-					score: amount,
-					user_id: handleComment.user_id
-				},
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	if (response.data && response.data.code) { 
-		    		const commentIndex = this._findCommentById(parrentComment.id);
-		    		let { comments } = this.state;
+			axios.post(url, {
+				container_type: 'Discusses',
+				score: amount,
+				user_id: handleComment.user_id
+			}).then((response) => {
+				if (response.data && response.data.code) {
+					const commentIndex = this._findCommentById(parrentComment.id);
+					let { comments } = this.state;
 					const newComments = comments.slice(0)
 
-		    		if (childComment) {
-		    			const childCommentIndex = this._findCommentById(handleComment.id, parrentComment.children);
-		    			const newChildComment = Object.assign({}, childComment);
-		    			newChildComment.reward = response.data.code
+					if (childComment) {
+						const childCommentIndex = this._findCommentById(handleComment.id, parrentComment.children);
+						const newChildComment = Object.assign({}, childComment);
+						newChildComment.reward = response.data.code
 						parrentComment = Object.assign({}, parrentComment)
 						parrentComment.children = parrentComment.children.slice(0)
-		    			parrentComment.children[childCommentIndex] = newChildComment
+						parrentComment.children[childCommentIndex] = newChildComment
 
 						newComments[commentIndex] = parrentComment;
-						
-			    		
-		    		} else {
+
+
+					} else {
 						const newComment = Object.assign({}, newComments[commentIndex]);
 						newComment.reward = response.data.code;
 						newComments[commentIndex] = newComment;
@@ -439,90 +352,60 @@ export function commentHOC(WrappedComponent) {
 					this.setState({
 						comments: newComments
 					})
-		    	}
-		    }).catch((error) => {
-		    	console.log(error)
-		    	showSnackbar('奖励失败，请联系系统管理员！')
-		    })
-	}
+				}
+			}).catch((error) => {
+				console.log(error)
+				showSnackbar('奖励失败，请联系系统管理员！')
+			})
+		}
 
-	// 评论点赞
-	commentPraise(discussId) {
-		const commentIndex = this._findCommentById(discussId);
-		const { comments } = this.state;
+		// 评论点赞
+		commentPraise(discussId) {
+			const commentIndex = this._findCommentById(discussId);
+			const { comments } = this.state;
 
-		const { challenge } = this.props;
-		// const url = `/api/v1/discusses/${discussId}/plus`
-		const url = `/discusses/${discussId}/plus.json`
-		axios.post(url, {
-				    // id: discussId,
-				    // container_id: challenge.id,
-				    container_type: 'Discuss',	//Discuss
-				    type: comments[commentIndex].user_praise === true ? 0 : 1,   //  "踩0；赞1"
-			    },
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	if (response.data.praise_count === 0 || response.data.praise_count) { 
-		    		const newComments = comments.slice(0)
+			const { challenge } = this.props;
+			const url = `/discusses/${discussId}/plus.json`
+			axios.post(url, {
+				container_type: 'Discuss',	//Discuss
+				type: comments[commentIndex].user_praise === true ? 0 : 1,   //  "踩0；赞1"
+			}).then((response) => {
+				if (response.data.praise_count === 0 || response.data.praise_count) {
+					const newComments = comments.slice(0)
 					const comment = Object.assign({}, newComments[commentIndex])
 					comment.user_praise = !comment.user_praise;
 					comment.praise_count = response.data.praise_count;
 					newComments[commentIndex] = comment;
-		    		this.setState({
+					this.setState({
 						comments: newComments
 					})
-		    	}
-		    	console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-	}
+				}
+				console.log(response)
+			}).catch((error) => {
+				console.log(error)
+			})
+		}
 
-	newMessage() {
-		return; // newMessage 暂时不用了
-		const { shixun, myshixun } = this.props;
-		const url = `/api/v1/shixuns/${shixun.id}/new_message?container_type=Shixun&myshixun_id=${myshixun.id}`
-		// this.setState({
-		//     			gotNewReply: true
-		//     		})
-		axios.get(url,
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	const new_message = response.data.new_message;
-		    	if (response.data.new_message) { 
-		    		this.setState({
-		    			gotNewReply: new_message
-		    		})
-		    	}
-		    	// console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-	}
 
-	showNewReply() {
-		const { shixun, myshixun } = this.props;
-		const commentId = 929 // TODO
-		const url = `/api/v1/shixuns/${shixun.id}/anchor?container_type=Shixun&myshixun_id=${myshixun.id}&discuss_id=${commentId}`
+		showNewReply() {
+			const { shixun, myshixun } = this.props;
+			const commentId = 929 // TODO
+			const url = `/api/v1/shixuns/${shixun.id}/anchor?container_type=Shixun&myshixun_id=${myshixun.id}&discuss_id=${commentId}`
 
-		this.setState({
-			loadingComments: true,
-			gotNewReply: false,
+			this.setState({
+				loadingComments: true,
+				gotNewReply: false,
 
-		});
-		axios.get(url,
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	const data = response.data;
-		    	const new_message = data.new_message;
+			});
+			axios.get(url,
+				{
+					// withCredentials: true
+				}
+			).then((response) => {
+				const data = response.data;
+				const new_message = data.new_message;
 
-		    	this.setState({
+				this.setState({
 					comments: data.children_list,
 					comment_count_without_reply: data.disscuss_count,
 
@@ -536,40 +419,39 @@ export function commentHOC(WrappedComponent) {
 							comment_J[0].scrollIntoView()
 							comment_J.parents('.comment_item_cont').css('border', '1px solid #4CACFF')
 						}
-			    	}
-				})		    	
-		    	console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-	}
+					}
+				})
+				console.log(response)
+			}).catch((error) => {
+				console.log(error)
+			})
+		}
 
-	// ----------------------------------------------------------------------------------------------评论 End
+		// ----------------------------------------------------------------------------------------------评论 End
 
-	// ----------------------------------------------------------------------------------------------评论 End
+		// ----------------------------------------------------------------------------------------------评论 End
 
-	componentDidMount() {	
-		// commentsDelegateParent #game_left_contents #tab_con_4
-		$(".commentsDelegateParent")
-			.delegate(".J_Comment_Reply .comment_content img, .J_Comment_Reply .childrenCommentsView img","click", (event) => {
-			
-		  	const imageSrc = event.target.src
-		  	// 非回复里的头像图片; 非emoticons
-          	if (imageSrc.indexOf('/images/avatars/User') === -1 && 
-              imageSrc.indexOf('kindeditor/plugins/emoticons') === -1 ) {  
-		  		this.setState({
-			  		showImage: true,
-			  		imageSrc,
-			  	})
-		  	}
-		});
-	}
-	onImageLayerClose = () => {
-		this.setState({
-			showImage: false,
-		  	imageSrc: '',
-		})
-	}
+		componentDidMount() {
+			$(".commentsDelegateParent")
+				.delegate(".J_Comment_Reply .comment_content img, .J_Comment_Reply .childrenCommentsView img", "click", (event) => {
+
+					const imageSrc = event.target.src
+					// 非回复里的头像图片; 非emoticons
+					if (imageSrc.indexOf('/images/avatars/User') === -1 &&
+						imageSrc.indexOf('kindeditor/plugins/emoticons') === -1) {
+						this.setState({
+							showImage: true,
+							imageSrc,
+						})
+					}
+				});
+		}
+		onImageLayerClose = () => {
+			this.setState({
+				showImage: false,
+				imageSrc: '',
+			})
+		}
 
 		showNotification = (description, message = "提示", icon) => {
 			const data = {
@@ -581,45 +463,28 @@ export function commentHOC(WrappedComponent) {
 			}
 			notification.open(data);
 		}
-    render() {
-      return (
-        <React.Fragment>
-			<ImageLayer {...this.state} onImageLayerClose={this.onImageLayerClose}></ImageLayer>
+		render() {
+			return (
+				<React.Fragment>
+					<ImageLayer {...this.state} onImageLayerClose={this.onImageLayerClose}></ImageLayer>
 
-	        <WrappedComponent {...this.props} {...this.state}
-	        	createNewComment={this.createNewComment}
-	      		fetchCommentIfNotFetched={this.fetchCommentIfNotFetched}
+					<WrappedComponent {...this.props} {...this.state}
+						createNewComment={this.createNewComment}
+						fetchCommentIfNotFetched={this.fetchCommentIfNotFetched}
 						clearCommentsInState={this.clearCommentsInState}
-	      		replyComment={this.replyComment}
-	      		deleteComment={this.deleteComment}
-	      		commentPraise={this.commentPraise}
-	      		hiddenComment={this.hiddenComment}
-	      		rewardCode={this.rewardCode}
-	      		onPaginationChange={this.onPaginationChange}
-				    showNotification= { this.showNotification }
-	      		newMessage={this.newMessage}
-	      		showNewReply={this.showNewReply}
-	        ></WrappedComponent>
-        </React.Fragment>
+						replyComment={this.replyComment}
+						deleteComment={this.deleteComment}
+						commentPraise={this.commentPraise}
+						hiddenComment={this.hiddenComment}
+						rewardCode={this.rewardCode}
+						onPaginationChange={this.onPaginationChange}
+						showNotification={this.showNotification}
+						newMessage={this.newMessage}
+						showNewReply={this.showNewReply}
+					></WrappedComponent>
+				</React.Fragment>
 
-      )
-    }
-  }
-}
-/*
-	<div>
-          <h2>
-            HOC Debugger Component
-          </h2>
-          <p>
-            Props
-          </p>
-          <pre>{stringify(this.props)}</pre>
-          <p>
-            State
-          </p>
-          <pre>{stringify(this.state)}</pre>
-          {super.render()}
-        </div>
-
-*/
\ No newline at end of file
+			)
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/modules/comment/comment-input.jsx b/src/modules/comment/comment-input.jsx
new file mode 100644
index 00000000..aa024111
--- /dev/null
+++ b/src/modules/comment/comment-input.jsx
@@ -0,0 +1,61 @@
+import React, { useState, useEffect } from 'react'
+import './comment-input.scss'
+import TpmMdEditor from '../tpm/challengesnew/tpm-md-editor'
+import mediator from '../../common/mediator'
+
+export default ({
+  challenge,
+  praisePlus,
+  tabIndexChange,
+  createNewComment
+}) => {
+  const [showMd, setShowMd] = useState(false)
+  const [value, setValue] = useState('')
+
+  function onChangeHandler(v) {
+    setValue(v)
+  }
+
+  useEffect(() => {
+    const unSub = mediator.subscribe('cancel-editor', () => {
+      if (showMd) {
+        setShowMd(false)
+      }
+    })
+    return unSub
+  }, [challenge, showMd])
+
+  function onShowMd() {
+    setShowMd(true)
+  }
+
+  function onCancel() {
+    setShowMd(false)
+  }
+
+  async function onCommit() {
+    await createNewComment(value)
+    setValue('')
+    setShowMd(false)
+    tabIndexChange(3)
+  }
+
+  return (
+    <div className="comment-input-editor-container">
+      <div className={showMd ? 'text-area hide' : 'text-area'}>
+        <input placeholder='说点什么' onClick={onShowMd}></input>
+        <a className="color-grey" onClick={praisePlus} title={challenge.user_praise ? "取消点赞" : "点赞"}>
+          <i className={`mr3  ${challenge.user_praise ? "iconfont icon-dianzan color-orange03" : "iconfont icon-dianzan-xian"} `} alt="赞" ></i>
+          {challenge.praise_count ? <span>{challenge.praise_count}</span> : ''}
+        </a>
+      </div>
+      <div className={showMd ? "md-container" : 'md-container hide'}>
+        <TpmMdEditor mdID={challenge.shixun_id} className='mini' startInit={showMd} watch={false} noStorage={true} initValue={value} height={240} onChange={onChangeHandler} />
+        <div className="tip-container" onClick={onCancel}>
+          <p>请勿粘贴答案，否则将造成账号禁用后果！</p>
+          <a className='btn-send' onClick={onCommit}>发送</a>
+        </div>
+      </div>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/src/modules/comment/comment-input.scss b/src/modules/comment/comment-input.scss
new file mode 100644
index 00000000..b49a1640
--- /dev/null
+++ b/src/modules/comment/comment-input.scss
@@ -0,0 +1,74 @@
+.comment-input-editor-container {
+  padding: 10px 20px;
+  background-color: #FFF;
+  width: 100%;
+  box-shadow: 0px -3px 5px 0px rgba(76, 172, 255, 0.2);
+
+  .text-area {
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
+
+    input {
+      border-radius: 15px;
+      border: 1px solid #eaeaea;
+      background-color: #fff;
+      overflow: hidden;
+      height: 32px;
+      padding: 0 16px;
+      line-height: 32px;
+      outline: none;
+      flex: 1 0 0;
+      margin-right: 10px;
+    }
+
+    a {
+      color: #888;
+      display: block;
+      height: 32px;
+      line-height: 32px;
+      margin-right: 20px;
+      display: flex;
+      flex-flow: row nowrap;
+
+      span {
+        line-height: 32px;
+        font-size: 16px;
+      }
+    }
+  }
+
+  .tip-container {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    align-items: center;
+
+    p {
+      font-size: 12px;
+      color: rgb(255, 104, 0);
+    }
+  }
+
+  .hide {
+    display: none;
+  }
+
+
+}
+
+.btn-send {
+  cursor: pointer;
+  display: inline-block;
+  border: none;
+  padding: 0 12px;
+  color: #fff;
+  background: #4CACFF;
+  letter-spacing: 1px;
+  text-align: center;
+  font-size: 14px;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 2px;
+  font-weight: 400;
+}
\ No newline at end of file
diff --git a/src/modules/comment/comment-item-editor.jsx b/src/modules/comment/comment-item-editor.jsx
new file mode 100644
index 00000000..e9caf26f
--- /dev/null
+++ b/src/modules/comment/comment-item-editor.jsx
@@ -0,0 +1,53 @@
+import React, { useMemo, useEffect, useState } from 'react'
+import TpmMdEditor from '../tpm/challengesnew/tpm-md-editor'
+import './CommentItemMDEditor.css';
+import mediator from '../../common/mediator';
+
+export default ({ item, replyComment, showReplyEditorFlag, currentReplyComment, buttonText = '发送' }) => {
+	const [active, setActive] = useState(showReplyEditorFlag)
+	const [value, setValue] = useState('')
+
+	function onHandleChange(v) {
+		setValue(v)
+	}
+
+	async function onCommit() {
+		await replyComment(value, item.id)
+		setValue('')
+		setActive(false)
+	}
+
+	useEffect(() => {
+		const unSub = mediator.subscribe('cancel-editor', () => {
+			if (active) {
+				setActive(false)
+			}
+		})
+		return unSub
+	}, [item, active])
+
+	const isShow = useMemo(() => {
+		let rs = false
+		if (currentReplyComment && item && item.id === currentReplyComment.id) {
+			rs = true
+		}
+		return rs
+	}, [currentReplyComment, item])
+
+	useEffect(() => {
+		if (active && active !== showReplyEditorFlag) {
+			setActive(false)
+		} else {
+			setActive(isShow)
+		}
+	}, [isShow, showReplyEditorFlag])
+
+
+
+	return (
+		<div className='comment-item-editor' style={{ display: active ? 'block' : 'none', width: '100%' }}>
+			<TpmMdEditor className='mini' startInit={isShow} initValue={value} mdID={item.id} noStorage={true} watch={false} height={155} placeholder='我要回复' showResizeBar={true} onChange={onHandleChange} />
+			<a onClick={onCommit} className="commentsbtn task-btn task-btn-blue fr" > {buttonText} </a>
+		</div>
+	)
+}
\ No newline at end of file
diff --git a/src/modules/competition/competmodal/PersonModal.js b/src/modules/competition/competmodal/PersonModal.js
index 724abebd..1c83ec22 100644
--- a/src/modules/competition/competmodal/PersonModal.js
+++ b/src/modules/competition/competmodal/PersonModal.js
@@ -1,13 +1,13 @@
-import React, {Component} from 'react';
-import {getImageUrl} from 'educoder';
-import {Modal, Input, Spin, Tooltip, Icon, Dropdown, Button, Empty} from 'antd';
+import React, { Component } from 'react';
+import { getImageUrl } from 'educoder';
+import { Modal, Input, Spin, Tooltip, Icon, Dropdown, Button, Empty } from 'antd';
 import axios from 'axios';
 import competition from '../comcss/competition.css';
 import Registrationitem from "../Registrationitem";
 import InfiniteScroll from 'react-infinite-scroller';
 // import PersonModaltion from "./PersonModaltion";
 import NoneData from '../../../modules/courses/coursesPublic/NoneData'
-const {Search} = Input;
+const { Search } = Input;
 
 //创建战队
 var myabool = true;
@@ -167,7 +167,7 @@ class PersonModal extends Component {
 
 
 
-		const {polls_nametest, mydatas, GetenrollmentAPI} = this.state;
+		const { polls_nametest, mydatas, GetenrollmentAPI } = this.state;
 		var myteaherdata = [];
 		var myshtudentdata = [];
 		var i = 0;
@@ -343,7 +343,7 @@ class PersonModal extends Component {
 			teacher_ids: null,
 		};
 		let url = `/competitions/${this.props.match.params.identifier}/teachers.json`;
-		axios.get((url), {params: datas}).then((result) => {
+		axios.get((url), { params: datas }).then((result) => {
 			if (result) {
 				if (result.data) {
 					// ////console.log(result);
@@ -371,7 +371,7 @@ class PersonModal extends Component {
 			student_ids: null,
 		};
 		let url = `/competitions/${this.props.match.params.identifier}/students.json`;
-		axios.get((url), {params: datas}).then((result) => {
+		axios.get((url), { params: datas }).then((result) => {
 			if (result) {
 				if (result.data) {
 					// ////console.log(result);
@@ -675,7 +675,7 @@ class PersonModal extends Component {
 			person1: true,
 			person2: false,
 		})
-		const {keywordteachers, team_idteachers, teacher_ids} = this.state;
+		const { keywordteachers, team_idteachers, teacher_ids } = this.state;
 		this.Getteacherdata(keywordteachers, team_idteachers, teacher_ids);
 	}
 
@@ -686,7 +686,7 @@ class PersonModal extends Component {
 			person1: false,
 			person2: true,
 		})
-		const {keywordstudents, team_idstudents, student_ids} = this.state;
+		const { keywordstudents, team_idstudents, student_ids } = this.state;
 		this.Getstudentsdata(keywordstudents, team_idstudents, student_ids);
 	}
 
@@ -750,7 +750,7 @@ class PersonModal extends Component {
 		})
 	}
 	deletedata = (item) => {
-		var {mydatas, GetenrollmentAPI} = this.state;
+		var { mydatas, GetenrollmentAPI } = this.state;
 		if (item) {
 			var pos = mydatas.indexOf(item);
 			//  ////console.log("deletedata");
@@ -830,7 +830,6 @@ class PersonModal extends Component {
 		}
 
 
-		// debugger
 		//删除学生的时候判断是否符合人数
 		try {
 			if (GetenrollmentAPI) {
@@ -907,48 +906,48 @@ class PersonModal extends Component {
 					}
 				</style>
 				<a title={item.name} className="    reglistviewdivss4p maxnamewidth90"
-					 style={{
-						 textAlign: "center",
-					 }}
+					style={{
+						textAlign: "center",
+					}}
 				>{item.name === undefined || item.name === null || item.name === "" ? "--" : item.name}</a>
 				{
 					index === 0 ?
 						<p className="    reglistviewdivss4p"
-							 style={{
-								 textAlign: "center",
-							 }}
+							style={{
+								textAlign: "center",
+							}}
 						>创建者</p>
 						:
 						<a title={item.type} className="    reglistviewdivss4p maxnamewidth90"
-							 style={{
-								 textAlign: "center",
-							 }}
+							style={{
+								textAlign: "center",
+							}}
 						>{item.type === undefined || item.type === null || item.type === "" ? "--" : item.type}</a>
 				}
 
 				<a title={item.school_name} className="    reglistviewdivss5p maxnamewidth110"
-					 style={{
-						 textAlign: "center",
-					 }}
+					style={{
+						textAlign: "center",
+					}}
 				>{item.school_name === undefined || item.school_name === null || item.school_name === "" ? "--" : item.school_name}</a>
 				<a title={item.identity} className="    reglistviewdivss2p maxnamewidth90"
-					 style={{
-						 textAlign: "center",
-					 }}
+					style={{
+						textAlign: "center",
+					}}
 				>{item.identity === undefined || item.identity === null || item.identity === "" ? "--" : item.identity}</a>
 				{
 					index === 0 ?
 						<p className="    reglistviewdivss333p"
-							 style={{
-								 textAlign: "center",
-							 }}
+							style={{
+								textAlign: "center",
+							}}
 						></p>
 						:
 						<p className="    reglistviewdivss333p"
-							 style={{
-								 textAlign: "center",
-							 }}
-						><i className="iconfont icon-guanbi font-12" onClick={() => this.deletedata(item)}/></p>
+							style={{
+								textAlign: "center",
+							}}
+						><i className="iconfont icon-guanbi font-12" onClick={() => this.deletedata(item)} /></p>
 				}
 			</div>
 		);
@@ -959,101 +958,101 @@ class PersonModal extends Component {
 			cpersondiv1Items = teacher_ids.map((item, index) =>
 				<div className={"yslanswerList"}>
 					<li
-					className={this.props.teamutiple_limited === undefined || this.props.teamutiple_limited === null ? "reglistviewdivss2 " : (this.props.teamutiple_limited === true && item.enrollable === false ? "reglistviewdivss2c" : "reglistviewdivss2 ")}
-					key={index} style={{
-					width: "100%",
-					display: "flex",
-					justifyContent: " space-around",
-					alignItems: "center",
-					height: "40px",
-				}}
-					onMouseDown={() => this.getdatacpersondiv1Items(item)}
+						className={this.props.teamutiple_limited === undefined || this.props.teamutiple_limited === null ? "reglistviewdivss2 " : (this.props.teamutiple_limited === true && item.enrollable === false ? "reglistviewdivss2c" : "reglistviewdivss2 ")}
+						key={index} style={{
+							width: "100%",
+							display: "flex",
+							justifyContent: " space-around",
+							alignItems: "center",
+							height: "40px",
+						}}
+						onMouseDown={() => this.getdatacpersondiv1Items(item)}
 
-				>
-					<style>
-						{
-							`
+					>
+						<style>
+							{
+								`
 			 a:hover
 			{
          color: #05101A;
 			}
 			`
-						}
-					</style>
-					{item.name === undefined || item.name === null || item.name === "" ?
-						<a className="    cpersondiv1Items"
-							 style={{
-								 textAlign: "center",
-								 width: "90px"
-							 }}
-						>--</a>
-						:
-						<a title={item.name} className="    cpersondiv1Items maxnamewidth90"
-							 style={{
-								 textAlign: "center",
-								 width: "90px"
-							 }}
-						>{item.name}</a>
-					}
-					{item.identity === undefined || item.identity === null || item.identity === "" ?
-						<p className="    cpersondiv1Items maxnamewidth85"
-							 style={{
-								 textAlign: "center",
-								 width: "85px"
-							 }}
-						>--</p>
-						:
-						<a title={item.identity} className="    cpersondiv1Items maxnamewidth85"
-							 style={{
-								 textAlign: "center",
-								 width: "85px"
-							 }}
-						>{item.identity}</a>}
-					{item.school_name === undefined || item.school_name === null || item.school_name === "" ?
-
-						<p className="    cpersondiv1Items"
-							 style={{
-								 textAlign: "center",
-								 width: "110px"
-							 }}
-						>--</p>
-						:
-						<a title={item.school_name} className="    cpersondiv1Items maxnamewidth110"
-							 style={{
-								 textAlign: "center",
-								 width: "110px"
-							 }}
-						>{item.school_name}</a>
-					}
-
-					{
-						this.props.teamutiple_limited === undefined || this.props.teamutiple_limited === null ?
-							<p className="    cpersondiv1Items"
-								 style={{
-									 textAlign: "center",
-									 width: "87px"
-								 }}
-							>{""}</p>
+							}
+						</style>
+						{item.name === undefined || item.name === null || item.name === "" ?
+							<a className="    cpersondiv1Items"
+								style={{
+									textAlign: "center",
+									width: "90px"
+								}}
+							>--</a>
 							:
-							(
-								this.props.teamutiple_limited === true ?
-									<p className="    cpersondiv1Items"
-										 style={{
-											 textAlign: "center",
-											 color: "#FF6800",
-											 width: "87px"
-										 }}
-									>{item.enrollable === false ? "已加入其他战队" : ""}</p>
-									:
-									<p className="    cpersondiv1Items"
-										 style={{
-											 textAlign: "center",
-											 width: "87px"
-										 }}
-									>{""}</p>
-							)
+							<a title={item.name} className="    cpersondiv1Items maxnamewidth90"
+								style={{
+									textAlign: "center",
+									width: "90px"
+								}}
+							>{item.name}</a>
+						}
+						{item.identity === undefined || item.identity === null || item.identity === "" ?
+							<p className="    cpersondiv1Items maxnamewidth85"
+								style={{
+									textAlign: "center",
+									width: "85px"
+								}}
+							>--</p>
+							:
+							<a title={item.identity} className="    cpersondiv1Items maxnamewidth85"
+								style={{
+									textAlign: "center",
+									width: "85px"
+								}}
+							>{item.identity}</a>}
+						{item.school_name === undefined || item.school_name === null || item.school_name === "" ?
 
-					}
+							<p className="    cpersondiv1Items"
+								style={{
+									textAlign: "center",
+									width: "110px"
+								}}
+							>--</p>
+							:
+							<a title={item.school_name} className="    cpersondiv1Items maxnamewidth110"
+								style={{
+									textAlign: "center",
+									width: "110px"
+								}}
+							>{item.school_name}</a>
+						}
+
+						{
+							this.props.teamutiple_limited === undefined || this.props.teamutiple_limited === null ?
+								<p className="    cpersondiv1Items"
+									style={{
+										textAlign: "center",
+										width: "87px"
+									}}
+								>{""}</p>
+								:
+								(
+									this.props.teamutiple_limited === true ?
+										<p className="    cpersondiv1Items"
+											style={{
+												textAlign: "center",
+												color: "#FF6800",
+												width: "87px"
+											}}
+										>{item.enrollable === false ? "已加入其他战队" : ""}</p>
+										:
+										<p className="    cpersondiv1Items"
+											style={{
+												textAlign: "center",
+												width: "87px"
+											}}
+										>{""}</p>
+								)
+
+						}
 
 
 					</li>
@@ -1068,7 +1067,7 @@ class PersonModal extends Component {
 						className={cpersondiv1Items.length === 0 ? "demo-infinite-container33 yslanswerList" : "demo-infinite-container2 yslanswerList"}>
 						{
 							cpersondiv1Items.length === 0 ?
-								<Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/>
+								<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
 								:
 								<InfiniteScroll
 									initialLoad={false}
@@ -1085,8 +1084,8 @@ class PersonModal extends Component {
 								</InfiniteScroll>
 						}
 
-							</div>
-						</Spin>
+					</div>
+				</Spin>
 			</div>
 		)
 		var persondiv2Items = [];
@@ -1096,105 +1095,105 @@ class PersonModal extends Component {
 
 
 					<li
-					className={this.props.mutiple_limited === undefined || this.props.mutiple_limited === null ? "reglistviewdivss2 " : (this.props.mutiple_limited === true && item.enrollable === false ? "reglistviewdivss2c" : "reglistviewdivss2 ")}
-					key={index} style={{
-				width: "100%",
-				display: "flex",
-				justifyContent: " space-around",
-				alignItems: "center",
-				height: "40px",
-			}}
-					onMouseDown={() => this.getdatacpersondiv1Items2(item)}
-			>
-					<style>
-						{
-							`
+						className={this.props.mutiple_limited === undefined || this.props.mutiple_limited === null ? "reglistviewdivss2 " : (this.props.mutiple_limited === true && item.enrollable === false ? "reglistviewdivss2c" : "reglistviewdivss2 ")}
+						key={index} style={{
+							width: "100%",
+							display: "flex",
+							justifyContent: " space-around",
+							alignItems: "center",
+							height: "40px",
+						}}
+						onMouseDown={() => this.getdatacpersondiv1Items2(item)}
+					>
+						<style>
+							{
+								`
 						 a:hover
 						{
             color: #05101A;
 						}
 						`
-						}
-					</style>
-					{item.name === undefined || item.name === null || item.name === "" ?
-						<a className="    cpersondiv1Items"
-							 style={{
-								 textAlign: "center",
-								 width: "90px"
-							 }}
-						>--</a>
-						:
-						<a title={item.name} className="    cpersondiv1Items maxnamewidth90"
-							 style={{
-								 textAlign: "center",
-								 width: "90px"
-							 }}
-						>{item.name}</a>
-					}
-					{item.student_id === undefined || item.student_id === null || item.student_id === "" ?
-						<p className="    cpersondiv1Items maxnamewidth85"
-							 style={{
-								 textAlign: "center",
-								 width: "85px"
-							 }}
-						>--</p>
-						:
-						<a title={"学号:" + item.student_id} className="    cpersondiv1Items maxnamewidth85"
-							 style={{
-								 textAlign: "center",
-								 width: "85px"
-							 }}
-						>{"学号:" + item.student_id}</a>}
-					{item.school_name === undefined || item.school_name === null || item.school_name === "" ?
-
-						<p className="    cpersondiv1Items"
-							 style={{
-								 textAlign: "center",
-								 width: "110px"
-							 }}
-						>--</p>
-						:
-						<a title={item.school_name} className="    cpersondiv1Items maxnamewidth110"
-							 style={{
-								 textAlign: "center",
-								 width: "110px"
-							 }}
-						>{item.school_name}</a>
-					}
-
-					{
-						this.props.mutiple_limited === undefined || this.props.mutiple_limited === null ?
-							<p className="    cpersondiv1Items"
-								 style={{
-									 textAlign: "center",
-									 width: "87px"
-								 }}
-							>{""}</p>
+							}
+						</style>
+						{item.name === undefined || item.name === null || item.name === "" ?
+							<a className="    cpersondiv1Items"
+								style={{
+									textAlign: "center",
+									width: "90px"
+								}}
+							>--</a>
 							:
-							(
-								this.props.mutiple_limited === true ?
-									<p className="    cpersondiv1Items"
-										 style={{
-											 textAlign: "center",
-											 color: "#FF6800",
-											 width: "87px"
-										 }}
-									>{item.enrollable === false ? "已加入其他战队" : ""}</p>
-									:
-									<p className="    cpersondiv1Items"
-										 style={{
-											 textAlign: "center",
-											 width: "87px"
-										 }}
-									>{""}</p>
-							)
+							<a title={item.name} className="    cpersondiv1Items maxnamewidth90"
+								style={{
+									textAlign: "center",
+									width: "90px"
+								}}
+							>{item.name}</a>
+						}
+						{item.student_id === undefined || item.student_id === null || item.student_id === "" ?
+							<p className="    cpersondiv1Items maxnamewidth85"
+								style={{
+									textAlign: "center",
+									width: "85px"
+								}}
+							>--</p>
+							:
+							<a title={"学号:" + item.student_id} className="    cpersondiv1Items maxnamewidth85"
+								style={{
+									textAlign: "center",
+									width: "85px"
+								}}
+							>{"学号:" + item.student_id}</a>}
+						{item.school_name === undefined || item.school_name === null || item.school_name === "" ?
 
-					}
+							<p className="    cpersondiv1Items"
+								style={{
+									textAlign: "center",
+									width: "110px"
+								}}
+							>--</p>
+							:
+							<a title={item.school_name} className="    cpersondiv1Items maxnamewidth110"
+								style={{
+									textAlign: "center",
+									width: "110px"
+								}}
+							>{item.school_name}</a>
+						}
+
+						{
+							this.props.mutiple_limited === undefined || this.props.mutiple_limited === null ?
+								<p className="    cpersondiv1Items"
+									style={{
+										textAlign: "center",
+										width: "87px"
+									}}
+								>{""}</p>
+								:
+								(
+									this.props.mutiple_limited === true ?
+										<p className="    cpersondiv1Items"
+											style={{
+												textAlign: "center",
+												color: "#FF6800",
+												width: "87px"
+											}}
+										>{item.enrollable === false ? "已加入其他战队" : ""}</p>
+										:
+										<p className="    cpersondiv1Items"
+											style={{
+												textAlign: "center",
+												width: "87px"
+											}}
+										>{""}</p>
+								)
+
+						}
 
 
 					</li>
 				</div>
-		);
+			);
 		}
 		const persondiv2 = (
 			<div className={"   backgroundspersondiv cpersondiv1 borders2"}>
@@ -1203,7 +1202,7 @@ class PersonModal extends Component {
 					<div className={persondiv2Items.length === 0 ? "demo-infinite-container33 " : "demo-infinite-container2 "}>
 						{
 							persondiv2Items.length === 0 ?
-								<Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/>
+								<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
 								:
 								<InfiniteScroll
 									initialLoad={false}
@@ -1219,8 +1218,8 @@ class PersonModal extends Component {
 
 								</InfiniteScroll>
 						}
-							</div>
-						</Spin>
+					</div>
+				</Spin>
 			</div>
 		);
 		//console.log("PersonModal");
@@ -1294,17 +1293,17 @@ class PersonModal extends Component {
 							marginTop: "9px",
 							fontSize: "16px",
 						}}>
-								<span style={{
-									color: "#f5222d",
-									fontSize: "16px",
-								}}>*</span>
+							<span style={{
+								color: "#f5222d",
+								fontSize: "16px",
+							}}>*</span>
 							队名:
 						</p>
 
 						<Input className="yslzxueshiskmc" onInput={this.changeTopicName} onFocus={this.inputOnFocus3}
-									 value={this.state.polls_nametest}
-									 placeholder="请输入您的战队名称，最多不超过60个字符"
-									 addonAfter={String(addonAfter) + "/60"} maxLength={60}/>
+							value={this.state.polls_nametest}
+							placeholder="请输入您的战队名称，最多不超过60个字符"
+							addonAfter={String(addonAfter) + "/60"} maxLength={60} />
 
 					</div>
 
@@ -1312,7 +1311,7 @@ class PersonModal extends Component {
 					{/*导师*/}
 					{
 						teacher_staff === undefined || teacher_staff === null ?
-							<div style={{marginLeft: "53px", minHeight: "14px", height: "14px"}}></div> :
+							<div style={{ marginLeft: "53px", minHeight: "14px", height: "14px" }}></div> :
 
 							<div>
 								<div style={{
@@ -1325,10 +1324,10 @@ class PersonModal extends Component {
 										marginTop: "9px",
 										fontSize: "16px",
 									}}>
-								<span style={{
-									color: "#f5222d",
-									fontSize: "16px",
-								}}>*</span>
+										<span style={{
+											color: "#f5222d",
+											fontSize: "16px",
+										}}>*</span>
 										导师:
 									</p>
 									<style>
@@ -1344,7 +1343,7 @@ class PersonModal extends Component {
 									{/*<div className={"yslzxueshiskmcd2"}>*/}
 
 									<Dropdown overlay={cpersondiv1} getPopupContainer={trigger => trigger.parentNode}
-														visible={this.state.person1}>
+										visible={this.state.person1}>
 										<Input
 											className="yslzxueshiskmcd"
 											placeholder="请输入老师姓名的任意关键字进行搜索，可以后续在添加"
@@ -1354,8 +1353,8 @@ class PersonModal extends Component {
 											onChange={(e) => this.teacheronChange(e)}
 											value={this.state.keywordteachers}
 											suffix={
-												<i class="iconfont icon-sousuo"
-													 onClick={() => this.Getteacherdata(keywordteachers, team_idteachers, teacher_ids)}/>
+												<i className="iconfont icon-sousuo"
+													onClick={() => this.Getteacherdata(keywordteachers, team_idteachers, teacher_ids)} />
 											}
 										/>
 									</Dropdown>
@@ -1363,9 +1362,9 @@ class PersonModal extends Component {
 								</div>
 								{
 									booltech === true ?
-										<p style={{marginLeft: "53px", color: "#FF954C", minHeight: "14px"}}>该老师已添加</p>
+										<p style={{ marginLeft: "53px", color: "#FF954C", minHeight: "14px" }}>该老师已添加</p>
 										:
-										<div style={{marginLeft: "53px", minHeight: "14px", height: "14px"}}></div>
+										<div style={{ marginLeft: "53px", minHeight: "14px", height: "14px" }}></div>
 								}
 							</div>
 
@@ -1376,7 +1375,7 @@ class PersonModal extends Component {
 					{/*队员*/}
 					{
 						member_staff === undefined || member_staff === null ?
-							<div style={{marginLeft: "53px", minHeight: "18px", height: "18px"}}></div> :
+							<div style={{ marginLeft: "53px", minHeight: "18px", height: "18px" }}></div> :
 							<div>
 								<div style={{
 									display: "flex",
@@ -1388,10 +1387,10 @@ class PersonModal extends Component {
 										marginTop: "9px",
 										fontSize: "16px",
 									}}>
-								<span style={{
-									color: "#f5222d",
-									fontSize: "16px",
-								}}>*</span>
+										<span style={{
+											color: "#f5222d",
+											fontSize: "16px",
+										}}>*</span>
 										队员:
 									</p>
 									<style>
@@ -1406,7 +1405,7 @@ class PersonModal extends Component {
 									</style>
 
 									<Dropdown overlay={persondiv2} getPopupContainer={trigger => trigger.parentNode}
-														visible={this.state.person2}>
+										visible={this.state.person2}>
 										<Input
 											className="yslzxueshiskmcd"
 											placeholder="请输入想要队员姓名的任意关键字进行搜索"
@@ -1416,8 +1415,8 @@ class PersonModal extends Component {
 											onChange={(e) => this.studentsonChange(e)}
 											value={this.state.keywordstudents}
 											suffix={
-												<i class="iconfont icon-sousuo "
-													 onClick={() => this.Getstudentsdata(keywordstudents, team_idstudents, student_ids)}/>
+												<i className="iconfont icon-sousuo "
+													onClick={() => this.Getstudentsdata(keywordstudents, team_idstudents, student_ids)} />
 											}
 										/>
 									</Dropdown>
@@ -1426,15 +1425,15 @@ class PersonModal extends Component {
 
 								{
 									boolstud === true ?
-										<p style={{marginLeft: "53px", color: "#FF954C", minHeight: "18px"}}>该队员已添加</p>
+										<p style={{ marginLeft: "53px", color: "#FF954C", minHeight: "18px" }}>该队员已添加</p>
 										:
-										<div style={{marginLeft: "53px", minHeight: "18px", height: "18px"}}></div>
+										<div style={{ marginLeft: "53px", minHeight: "18px", height: "18px" }}></div>
 								}
 							</div>
 					}
 
 					{/*表格*/}
-					<div style={{marginLeft: "53px", border: "1px solid #E0E0E0"}}>
+					<div style={{ marginLeft: "53px", border: "1px solid #E0E0E0" }}>
 						{/*<PersonModaltion ></PersonModaltion>*/}
 						<div>
 							<div className="reglistviewdivss2 " style={{
@@ -1449,29 +1448,29 @@ class PersonModal extends Component {
 
 							}}>
 								<p className="    reglistviewdivss4p"
-									 style={{
-										 textAlign: "center",
-									 }}
+									style={{
+										textAlign: "center",
+									}}
 								>姓名</p>
 								<p className="    reglistviewdivss4p"
-									 style={{
-										 textAlign: "center",
-									 }}
+									style={{
+										textAlign: "center",
+									}}
 								>角色</p>
 								<p className="    reglistviewdivss5p"
-									 style={{
-										 textAlign: "center",
-									 }}
+									style={{
+										textAlign: "center",
+									}}
 								>单位</p>
 								<p className="    reglistviewdivss2p"
-									 style={{
-										 textAlign: "center",
-									 }}
+									style={{
+										textAlign: "center",
+									}}
 								>其他</p>
 								<p className="    reglistviewdivss3p"
-									 style={{
-										 textAlign: "center",
-									 }}
+									style={{
+										textAlign: "center",
+									}}
 								>操作</p>
 							</div>
 						</div>
diff --git a/src/modules/competition/personal/PersonalCompetititem.js b/src/modules/competition/personal/PersonalCompetititem.js
index 2d32b423..b052ea6b 100644
--- a/src/modules/competition/personal/PersonalCompetititem.js
+++ b/src/modules/competition/personal/PersonalCompetititem.js
@@ -1,29 +1,12 @@
-import React, {Component} from 'react';
-import {
-	BrowserRouter as Router,
-	Route,
-	Switch
-} from 'react-router-dom';
-import axios from 'axios';
-import moment from 'moment';
-import {SnackbarHOC, WordsBtn, getImageUrl} from 'educoder';
-import {TPMIndexHOC} from '../../tpm/TPMIndexHOC';
-import competition from '../comcss/competition.css';
-import {Button, message, Tooltip} from 'antd';
+import React from 'react';
+import { getImageUrl } from 'educoder';
+import { message, Tooltip } from 'antd';
 // 点击按钮复制功能
 function jsCopy(s) {
 	var e = document.getElementById(s);
 	e.select();
 	document.execCommand("Copy");
 	codesuccess()
-	// const  range=document.createRange();
-	// window.getSelection().removeAllRanges();
-	// range.selectNode(e.target);
-	// window.getSelection().addRange(range);
-	// const successful =document.execCommand('copy');
-	// if(successful){
-	// 	codesuccess()
-	// }
 }
 
 function codesuccess() {
@@ -37,54 +20,28 @@ class PersonalCompetititem extends React.Component {
 
 	}
 
-	componentDidMount() {
-		//  // ////console.log(this.props.data)
-
-
-	}
-
-	componentDidUpdate = (prevProps) => {
-		//
-		// if (prevProps.data != this.props.data) {
-		//
-		// }
-	}
-
 	render() {
-		const {key, item, type, mode} = this.props;
-		// ////console.log("PersonalCompetititem");
-		// ////console.log(data);
-		// ////console.log(data[0]);
-		// ////console.log(data&&data[0].creator.image_url);
-		// const listItems = mydatas.map((item, index) =>
-		//
-		// );
-		// console.log("PersonalCompetititem");
-		// console.log(data);
-		// console.log("PersonalCompetititem");
-		// console.log(type);
-		// console.log("sdasjdhahsdas");
-		// console.log(this.props);
+		const { key, item, type, mode } = this.props;
 		return (
 			<div>
 				{
 					item !== undefined || item !== null ? <div className={"yslborderbottom"}>
-							<div
-								className={this.props.index === undefined || this.props.index === null ? "myregitem11" : this.props.index === 0 ? "regitem" : "myregitem11"}
-								style={{
+						<div
+							className={this.props.index === undefined || this.props.index === null ? "myregitem11" : this.props.index === 0 ? "regitem" : "myregitem11"}
+							style={{
 								marginBottom: "19px",
 							}}>
-								<div className="regitemimg1  ">
-									<img className="regitemimg2" src={getImageUrl("images/" + item.creator.image_url)}>
+							<div className="regitemimg1  ">
+								<img className="regitemimg2" src={getImageUrl("images/" + item.creator.image_url)}>
 
 								</img>
-									<a className="maxnamewidth78" title={item.creator.name} style={{
+								<a className="maxnamewidth78" title={item.creator.name} style={{
 									color: "#999999",
 									fontSize: "14px",
 									width: "78px",
 									textAlign: "center"
 
-									}}>{item.creator.name}</a>
+								}}>{item.creator.name}</a>
 							</div>
 							<div className=" maxnamewidth160" style={{
 								marginTop: "29px",
@@ -100,97 +57,48 @@ class PersonalCompetititem extends React.Component {
 									textAlign: "center"
 								}}>{item.name}</a>
 							</div>
-								{this.props.type === 5 || this.props.type === 2 ?
-									(this.props.mode === 3 ?
-											<div style={{
-												marginLeft: "37px",
-												display: "flex",
-												flexDirection: "initial",
-												width: "340px"
-											}}>
-												{
-													item && item.team_members.map((item, index) => {
-														return (
+							{this.props.type === 5 || this.props.type === 2 ?
+								(this.props.mode === 3 ?
+									<div style={{
+										marginLeft: "37px",
+										display: "flex",
+										flexDirection: "initial",
+										width: "340px"
+									}}>
+										{
+											item && item.team_members.map((item, index) => {
+												return (
 
-															index === 0 ?
-																<img className="regitemimgs" src={getImageUrl("images/" + item.image_url)}>
+													index === 0 ?
+														<img className="regitemimgs" src={getImageUrl("images/" + item.image_url)}>
 
-																</img>
-																: index === 1 ?
+														</img>
+														: index === 1 ?
+															<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
+
+															</img>
+															: index === 2 ?
 																<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
 
 																</img>
-																: index === 2 ?
-																	<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
-
-																	</img>
-																	: index === 3 ?
-																		<div>
-																			<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
-
-																			</img>
-
-																			<img className="regitemimgs222"
-																					 src={getImageUrl(`images/educoder/competitions/pexjiazai.png`)}>
-
-																			</img>
-																		</div>
-																		: ""
-														)
-													})
-												}
-
-											</div>
-
-											:
-											<div className=" " style={{
-												marginLeft: "37px",
-												display: "flex",
-												flexDirection: "initial",
-												width: "487px"
-											}}>
-												{
-													item && item.team_members.map((item, index) => {
-														return (
-
-															index === 0 ?
-																<img className="regitemimgs" src={getImageUrl("images/" + item.image_url)}>
-
-																</img>
-																: index === 1 ?
-																<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
-
-																</img>
-																: index === 2 ?
-																	<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
-
-																	</img>
-																	: index === 3 ?
+																: index === 3 ?
+																	<div>
 																		<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
 
 																		</img>
-																		: index === 4 ?
-																			<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
 
-																			</img>
-																			: index === 5 ?
-																				<div>
-																					<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
+																		<img className="regitemimgs222"
+																			src={getImageUrl(`images/educoder/competitions/pexjiazai.png`)}>
 
-																					</img>
+																		</img>
+																	</div>
+																	: ""
+												)
+											})
+										}
 
-																					<img className="regitemimgs222"
-																							 src={getImageUrl(`images/educoder/competitions/pexjiazai.png`)}>
+									</div>
 
-																					</img>
-																				</div>
-																				: ""
-														)
-													})
-												}
-
-											</div>
-									)
 									:
 									<div className=" " style={{
 										marginLeft: "37px",
@@ -207,6 +115,55 @@ class PersonalCompetititem extends React.Component {
 
 														</img>
 														: index === 1 ?
+															<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
+
+															</img>
+															: index === 2 ?
+																<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
+
+																</img>
+																: index === 3 ?
+																	<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
+
+																	</img>
+																	: index === 4 ?
+																		<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
+
+																		</img>
+																		: index === 5 ?
+																			<div>
+																				<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
+
+																				</img>
+
+																				<img className="regitemimgs222"
+																					src={getImageUrl(`images/educoder/competitions/pexjiazai.png`)}>
+
+																				</img>
+																			</div>
+																			: ""
+												)
+											})
+										}
+
+									</div>
+								)
+								:
+								<div className=" " style={{
+									marginLeft: "37px",
+									display: "flex",
+									flexDirection: "initial",
+									width: "487px"
+								}}>
+									{
+										item && item.team_members.map((item, index) => {
+											return (
+
+												index === 0 ?
+													<img className="regitemimgs" src={getImageUrl("images/" + item.image_url)}>
+
+													</img>
+													: index === 1 ?
 														<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
 
 														</img>
@@ -229,42 +186,42 @@ class PersonalCompetititem extends React.Component {
 																			</img>
 
 																			<img className="regitemimgs222"
-																					 src={getImageUrl(`images/educoder/competitions/pexjiazai.png`)}>
+																				src={getImageUrl(`images/educoder/competitions/pexjiazai.png`)}>
 
 																			</img>
 																		</div>
 																		: ""
-												)
-											})
-										}
+											)
+										})
+									}
 
-									</div>
-								}
-								<div style={this.props.type === 5 || this.props.type === 2 ?
-									(this.props.mode === 3 ?
+								</div>
+							}
+							<div style={this.props.type === 5 || this.props.type === 2 ?
+								(this.props.mode === 3 ?
 
-											{
-												marginLeft: "37px",
-											}
-											:
-											{
-												marginLeft: "18px",
-											}
-									)
-									: {
-										marginLeft: "16px",
-							}}>
-									<div style={{marginTop: "23px", width: '140px'}}>
-								<span style={{
-									color: "#05101A",
-									fontSize: "16px",
-								}}>邀请码：</span>
+									{
+										marginLeft: "37px",
+									}
+									:
+									{
+										marginLeft: "18px",
+									}
+								)
+								: {
+									marginLeft: "16px",
+								}}>
+								<div style={{ marginTop: "23px", width: '140px' }}>
+									<span style={{
+										color: "#05101A",
+										fontSize: "16px",
+									}}>邀请码：</span>
 									<span
-												style={{
+										style={{
 
-													color: "#05101A",
-									fontSize: "16px",
-												}}>{item.invite_code === null || item.invite_code === undefined ? "" : item.invite_code}</span>
+											color: "#05101A",
+											fontSize: "16px",
+										}}>{item.invite_code === null || item.invite_code === undefined ? "" : item.invite_code}</span>
 								</div>
 								<div style={{
 									overflow: 'hidden',
@@ -272,166 +229,166 @@ class PersonalCompetititem extends React.Component {
 									width: "1px"
 								}}>
 									<input id={"copy_invite_code" + this.props.index}
-												 value={item.invite_code === null || item.invite_code === undefined ? "" : item.invite_code}/>
+										value={item.invite_code === null || item.invite_code === undefined ? "" : item.invite_code} />
 								</div>
 							</div>
-								{item.invite_code === null || item.invite_code === undefined ?
+							{item.invite_code === null || item.invite_code === undefined ?
+								<i className="regitemimgs3 iconfont icon-fuzhi1 font-14 font-n"
+									style={{
+										marginLeft: "18px",
+									}}
+								>
+								</i>
+								:
+								<Tooltip placement="bottom" title={"复制邀请码"}>
 									<i className="regitemimgs3 iconfont icon-fuzhi1 font-14 font-n"
-										 style={{
-											 marginLeft: "18px",
-										 }}
+										style={{
+											marginLeft: "18px",
+										}}
+										onClick={() => {
+											jsCopy("copy_invite_code" + this.props.index)
+										}}
 									>
 									</i>
-									:
-									<Tooltip placement="bottom" title={"复制邀请码"}>
-										<i className="regitemimgs3 iconfont icon-fuzhi1 font-14 font-n"
-											 style={{
-												 marginLeft: "18px",
-											 }}
-											 onClick={() => {
-												 jsCopy("copy_invite_code" + this.props.index)
-											 }}
-										>
-										</i>
-									</Tooltip>
-								}
+								</Tooltip>
+							}
 
 							{
 								this.props.type === 5 ?
 									(this.props.mode === 3 ?
-											<div className="regitemimgs444"
-													 style={{
-														 marginLeft: "32px",
-													 }}
-											>
-												<div className="regitemimgs555">
-													<a
-														href={`/competitions/${this.props.match.params.identifier}/competition_teams/${item.id}`}
-														style={{
-														color: "#459be5",
-														width: "100%",
-														height: "100%",
-														lineHeight: "39px",
-													}}>战队详情</a>
-												</div>
-												<div className="regitemimgs555"
-														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
-														 onClick={() => this.props.Exittheteamshow(item.id, true)}>
-													<p onClick={() => this.props.Exittheteamshow(item.id, true)}>删除战队</p>
-												</div>
-												<div className="regitemimgs6"
-														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
-														 onClick={() => this.props.Createateamedit(item)}>
-													<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
-												</div>
-												<div className="regitemimgs6"
-														 style={item.manage_permission === true ? {display: "none"} : {display: "block"}}
-														 onClick={() => this.props.Exittheteamshow(item.id, false)}>
-													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>退出战队</p>
-												</div>
-
-											</div>
-											:
-											<div className="regitemimgs444"
-													 style={{
-														 marginLeft: "32px",
-													 }}
-											>
-
-												<div className="regitemimgs5"
-														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
-														 onClick={() => this.props.Exittheteamshow(item.id, true)}>
-													<p onClick={() => this.props.Exittheteamshow(item.id, true)}>删除战队</p>
-												</div>
-												<div className="regitemimgs6"
-														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
-														 onClick={() => this.props.Createateamedit(item)}>
-													<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
-												</div>
-												<div className="regitemimgs6"
-														 style={item.manage_permission === true ? {display: "none"} : {display: "block"}}
-														 onClick={() => this.props.Exittheteamshow(item.id, false)}>
-													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>退出战队</p>
-												</div>
-
-											</div>
-
-									)
-									: this.props.type === 2 ?
-									(this.props.mode === 3 ?
-											<div className="regitemimgs444 "
-													 style={{
-														 marginLeft: "32px",
-													 }}
-											>
-												<div className="regitemimgs555">
-													<a
-														href={`/competitions/${this.props.match.params.identifier}/competition_teams/${item.id}`}
-														style={{
-														color: "#459be5",
-														width: "100%",
-														height: "100%",
-														lineHeight: "39px",
-													}}>战队详情</a>
-												</div>
-												<div className="regitemimgs555"
-														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
-														 onClick={() => this.props.Exittheteamshow(item.id, true)}>
-													<p onClick={() => this.props.Exittheteamshow(item.id, true)}>删除战队</p>
-												</div>
-												<div className="regitemimgs6"
-														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
-														 onClick={() => this.props.Createateamedit(item)}>
-													<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
-												</div>
-												<div className="regitemimgs6"
-														 style={item.manage_permission === true ? {display: "none"} : {display: "block"}}
-														 onClick={() => this.props.Exittheteamshow(item.id, false)}>
-													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>退出战队</p>
-												</div>
-											</div>
-											:
-											<div className="regitemimgs444 "
-													 style={{
-														 marginLeft: "32px",
-													 }}
-											>
-												<div className="regitemimgs5"
-														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
-														 onClick={() => this.props.Exittheteamshow(item.id, true)}>
-													<p onClick={() => this.props.Exittheteamshow(item.id, true)}>删除战队</p>
-												</div>
-												<div className="regitemimgs6"
-														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
-														 onClick={() => this.props.Createateamedit(item)}>
-													<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
-												</div>
-												<div className="regitemimgs6"
-														 style={item.manage_permission === true ? {display: "none"} : {display: "block"}}
-														 onClick={() => this.props.Exittheteamshow(item.id, false)}>
-													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>退出战队</p>
-												</div>
-											</div>
-									)
-									:
-									this.props.type === 3 ?
-										<div className="regitemimgs4"
-												 style={{
-													 marginLeft: "32px",
-												 }}
+										<div className="regitemimgs444"
+											style={{
+												marginLeft: "32px",
+											}}
 										>
-
-											<div className="regitemimgs6" onClick={() => this.props.Exittheteamshow(item.id, false)}>
+											<div className="regitemimgs555">
+												<a
+													href={`/competitions/${this.props.match.params.identifier}/competition_teams/${item.id}`}
+													style={{
+														color: "#459be5",
+														width: "100%",
+														height: "100%",
+														lineHeight: "39px",
+													}}>战队详情</a>
+											</div>
+											<div className="regitemimgs555"
+												style={item.manage_permission === true ? { display: "block" } : { display: "none" }}
+												onClick={() => this.props.Exittheteamshow(item.id, true)}>
+												<p onClick={() => this.props.Exittheteamshow(item.id, true)}>删除战队</p>
+											</div>
+											<div className="regitemimgs6"
+												style={item.manage_permission === true ? { display: "block" } : { display: "none" }}
+												onClick={() => this.props.Createateamedit(item)}>
+												<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
+											</div>
+											<div className="regitemimgs6"
+												style={item.manage_permission === true ? { display: "none" } : { display: "block" }}
+												onClick={() => this.props.Exittheteamshow(item.id, false)}>
 												<p onClick={() => this.props.Exittheteamshow(item.id, false)}>退出战队</p>
 											</div>
 
 										</div>
 										:
-										""
+										<div className="regitemimgs444"
+											style={{
+												marginLeft: "32px",
+											}}
+										>
+
+											<div className="regitemimgs5"
+												style={item.manage_permission === true ? { display: "block" } : { display: "none" }}
+												onClick={() => this.props.Exittheteamshow(item.id, true)}>
+												<p onClick={() => this.props.Exittheteamshow(item.id, true)}>删除战队</p>
+											</div>
+											<div className="regitemimgs6"
+												style={item.manage_permission === true ? { display: "block" } : { display: "none" }}
+												onClick={() => this.props.Createateamedit(item)}>
+												<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
+											</div>
+											<div className="regitemimgs6"
+												style={item.manage_permission === true ? { display: "none" } : { display: "block" }}
+												onClick={() => this.props.Exittheteamshow(item.id, false)}>
+												<p onClick={() => this.props.Exittheteamshow(item.id, false)}>退出战队</p>
+											</div>
+
+										</div>
+
+									)
+									: this.props.type === 2 ?
+										(this.props.mode === 3 ?
+											<div className="regitemimgs444 "
+												style={{
+													marginLeft: "32px",
+												}}
+											>
+												<div className="regitemimgs555">
+													<a
+														href={`/competitions/${this.props.match.params.identifier}/competition_teams/${item.id}`}
+														style={{
+															color: "#459be5",
+															width: "100%",
+															height: "100%",
+															lineHeight: "39px",
+														}}>战队详情</a>
+												</div>
+												<div className="regitemimgs555"
+													style={item.manage_permission === true ? { display: "block" } : { display: "none" }}
+													onClick={() => this.props.Exittheteamshow(item.id, true)}>
+													<p onClick={() => this.props.Exittheteamshow(item.id, true)}>删除战队</p>
+												</div>
+												<div className="regitemimgs6"
+													style={item.manage_permission === true ? { display: "block" } : { display: "none" }}
+													onClick={() => this.props.Createateamedit(item)}>
+													<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
+												</div>
+												<div className="regitemimgs6"
+													style={item.manage_permission === true ? { display: "none" } : { display: "block" }}
+													onClick={() => this.props.Exittheteamshow(item.id, false)}>
+													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>退出战队</p>
+												</div>
+											</div>
+											:
+											<div className="regitemimgs444 "
+												style={{
+													marginLeft: "32px",
+												}}
+											>
+												<div className="regitemimgs5"
+													style={item.manage_permission === true ? { display: "block" } : { display: "none" }}
+													onClick={() => this.props.Exittheteamshow(item.id, true)}>
+													<p onClick={() => this.props.Exittheteamshow(item.id, true)}>删除战队</p>
+												</div>
+												<div className="regitemimgs6"
+													style={item.manage_permission === true ? { display: "block" } : { display: "none" }}
+													onClick={() => this.props.Createateamedit(item)}>
+													<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
+												</div>
+												<div className="regitemimgs6"
+													style={item.manage_permission === true ? { display: "none" } : { display: "block" }}
+													onClick={() => this.props.Exittheteamshow(item.id, false)}>
+													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>退出战队</p>
+												</div>
+											</div>
+										)
+										:
+										this.props.type === 3 ?
+											<div className="regitemimgs4"
+												style={{
+													marginLeft: "32px",
+												}}
+											>
+
+												<div className="regitemimgs6" onClick={() => this.props.Exittheteamshow(item.id, false)}>
+													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>退出战队</p>
+												</div>
+
+											</div>
+											:
+											""
 
 							}
 						</div>
-						</div>
+					</div>
 						: ""
 				}
 			</div>
diff --git a/src/modules/competitions/Competition_teams/Competitionteams.js b/src/modules/competitions/Competition_teams/Competitionteams.js
index be6c2e68..ef9cf58c 100644
--- a/src/modules/competitions/Competition_teams/Competitionteams.js
+++ b/src/modules/competitions/Competition_teams/Competitionteams.js
@@ -250,7 +250,7 @@ class Competitionteams extends Component{
 						<Content className={"teamsLayoutContent"}>
 							<Table className="teamsLayoutTable" columns={shixuncolumns} dataSource={this.state.shixundata} bordered pagination={false}/>
 						</Content>
-						<Content className={"teamsLayoutitle mt40"}>翻转课堂</Content>
+						<Content className={"teamsLayoutitle mt40"}>教学课堂</Content>
 						<Content className={"teamsLayoutContents"}>
 							<Table className="teamsLayoutTable" columns={coursecolumns} dataSource={this.state.coursedata} bordered pagination={false}/>
 						</Content>
diff --git a/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/src/modules/competitions/Competitioncommon/CompetitionCommon.js
index b2ac34fe..17d45233 100755
--- a/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -254,15 +254,15 @@ class CompetitionCommon extends Component{
 		if(url===undefined){
 			let {data,signupdata}=this.state;
 			// if(signupdata.enrolled===true){
-			// 	this.props.history.replace(`/courses/${data.course_id}`);
+			// 	this.props.history.replace(`/classrooms/${data.course_id}`);
 			// }else{	}
 
 				if (data.member_of_course === true) {
-					// this.props.history.replace(`/courses/${data.course_id}`);
-					window.open(`/courses/${data.course_id}`)
+					// this.props.history.replace(`/classrooms/${data.course_id}`);
+					window.open(`/classrooms/${data.course_id}`)
 				} else {
 					// 以学生身份调用加入课堂 进入课堂首页
-					let url = "/courses/apply_to_join_course.json"
+					let url = "/classrooms/apply_to_join_course.json"
 					axios.post(url, {
 							invite_code: data.invite_code,
 							student: 1
@@ -271,7 +271,7 @@ class CompetitionCommon extends Component{
 						if (response.data.status === 0) {
 							// this.props.history.replace();
 							this.getbannerdata()
-							window.open(`/courses/${data.course_id}`);
+							window.open(`/classrooms/${data.course_id}`);
 
 						}
 					})
@@ -409,7 +409,7 @@ class CompetitionCommon extends Component{
 										{data.competition_status === "ended" ?
 												<div className={data.mode === 2 ?data.member_of_course==true?"gutter-box CompetitionsIndexbottomvalue Competitioncolor516 cursorpointer":"gutter-box CompetitionsIndexbottomvalue Competitioncolor516":"gutter-box CompetitionsIndexbottomvalue Competitioncolor516 cursorpointer"}
 													// 已结束onClick={data.competition_status === "nearly_published" ? "" : () => this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}
-													onClick={	data.mode === 2 ?data.member_of_course==true?() => this.newgotocourse(`/courses/${data.course_id}`):"":() => this.newgotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}
+													onClick={	data.mode === 2 ?data.member_of_course==true?() => this.newgotocourse(`/classrooms/${data.course_id}`):"":() => this.newgotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}
 												>{data && data.member_count}</div>
 										 :data.competition_status === "nearly_published" ?
 												<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516"
diff --git a/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsMd.js b/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsMd.js
index 9ea97217..0cae1e2a 100644
--- a/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsMd.js
+++ b/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsMd.js
@@ -34,7 +34,7 @@ class CompetitionContentsMd extends Component{
 
 			}else{
 				chart_rules.rule_contents.map((items,keys)=>{
-					debugger
+
 					if(parseInt(this.props.tabkey)===items.competition_stage_id){
 						console.log(items)
 						this.contentMdRef.current.setValue(items.content);
diff --git a/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js b/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js
index d48ea8fe..6c4cf72a 100644
--- a/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js
+++ b/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js
@@ -1,12 +1,12 @@
-import React, {Component} from 'react';
-import {Button, Layout, Input, Form} from 'antd';
+import React, { Component } from 'react';
+import { Button, Layout, Input, Form } from 'antd';
 import axios from 'axios';
-import {getImageUrl} from 'educoder';
+import { getImageUrl } from 'educoder';
 import mycompetotionchild from './mycompetotionchild.css';
-import {getHiddenName} from "../../../../user/account/AccountBasicEdit";
+import { getHiddenName } from "../../../../user/account/AccountBasicEdit";
 import '../../../../courses/css/Courses.css'
 
-export const identityMap = {"teacher": "教师", "student": "学生", "professional": "专业人士"}
+export const identityMap = { "teacher": "教师", "student": "学生", "professional": "专业人士" }
 
 class Bankcardnumberverification extends Component {
 	constructor(props) {
@@ -32,7 +32,7 @@ class Bankcardnumberverification extends Component {
 		// console.log(this.props)
 		try {
 			this.props.triggerRef(this);
-		}catch (e) {
+		} catch (e) {
 
 		}
 		console.log(this.props.bank_account);
@@ -46,30 +46,28 @@ class Bankcardnumberverification extends Component {
 			})
 			this.setState({
 				openingbank: this.props.bank_account.bank,
-				subbranch:   this.props.bank_account.second_bank,
+				subbranch: this.props.bank_account.second_bank,
 				subbranchs: this.props.bank_account.card_no,
 			})
 		}
 
 	}
 
-	 setdata(bank,second_bank,card_no){
-		 this.props.form.setFieldsValue({
-			 openingbank: bank,
-			 subbranch: second_bank,
-			 subbranchs:card_no,
-		 })
-	 }
+	setdata(bank, second_bank, card_no) {
+		this.props.form.setFieldsValue({
+			openingbank: bank,
+			subbranch: second_bank,
+			subbranchs: card_no,
+		})
+	}
 	componentDidUpdate = (prevProps) => {
 		if (prevProps.bank_account != this.props.bank_account) {
-			console.log("componentDidUpdate");
-			console.log(this.props);//是新数据
-			console.log(prevProps);//是老数据
+
 			////console.log("Registration");
 			////console.log("componentDidUpdate");
 			////console.log(this.props.user.admin);
 			try {
-				if(this.props.bank_account){
+				if (this.props.bank_account) {
 					this.props.form.setFieldsValue({
 						openingbank: this.props.bank_account.bank,
 						subbranch: this.props.bank_account.second_bank,
@@ -78,10 +76,10 @@ class Bankcardnumberverification extends Component {
 				}
 				this.setState({
 					openingbank: this.props.bank_account.bank,
-					subbranch:   this.props.bank_account.second_bank,
+					subbranch: this.props.bank_account.second_bank,
 					subbranchs: this.props.bank_account.card_no,
 				})
-			}catch (e) {
+			} catch (e) {
 
 			}
 		}
@@ -92,46 +90,46 @@ class Bankcardnumberverification extends Component {
 			if (!err) {
 				let url = `/competitions/${this.props.match.params.identifier}/prize_leader_account.json`;
 				axios.patch(url, {
-					  user_id:this.props.userdata.id,
-						bank: values.openingbank,
-						second_bank: values.subbranch ,
-						card_no: values.subbranchs
-					})
+					user_id: this.props.userdata.id,
+					bank: values.openingbank,
+					second_bank: values.subbranch,
+					card_no: values.subbranchs
+				})
 					.then((result) => {
 						try {
 							if (result.data.status === 0) {
-							  try {
+								try {
 									// console.log(values.openingbank);
 									// console.log(values.subbranch);
 									// console.log(values.subbranchs);
 									this.props.form.setFieldsValue({
 										openingbank: values.openingbank,
-										subbranch:   values.subbranch,
+										subbranch: values.subbranch,
 										subbranchs: values.subbranchs,
 									});
 									this.setState({
 										openingbank: values.openingbank,
-										subbranch:   values.subbranch,
+										subbranch: values.subbranch,
 										subbranchs: values.subbranchs,
 									})
-								}catch (e) {
+								} catch (e) {
 
 								}
 
 								try {
 									this.props.showNotification(`提交成功,等待审核!`);
 
-								}catch (e) {
+								} catch (e) {
 
 								}
-			          try {
+								try {
 									this.props.getdata(this.props.userdata.id);
-								}catch (e) {
+								} catch (e) {
 
 								}
-						    try {
+								try {
 									this.props.GetawardinformationAPI();
-								}catch (e) {
+								} catch (e) {
 
 								}
 							}
@@ -140,16 +138,16 @@ class Bankcardnumberverification extends Component {
 						}
 
 					}).catch((error) => {
-					console.log(error);
-				})
+						console.log(error);
+					})
 			}
 		})
 
 	}
 
 	render() {
-		const {getFieldDecorator} = this.props.form;
-		const {updating, seconds, secondsFlag, basicInfo, phonebool, emailbool, certification, formationdata, bank_account_editable, leader, bank_account} = this.state
+		const { getFieldDecorator } = this.props.form;
+		const { updating, seconds, secondsFlag, basicInfo, phonebool, emailbool, certification, formationdata, bank_account_editable, leader, bank_account } = this.state
 		return (
 			<div>
 				<div className="flexdirections mt36">
@@ -218,7 +216,7 @@ class Bankcardnumberverification extends Component {
 											width: 276px !important
 											}
 											
-											// class="ant-col ant-form-item-label"
+											// className="ant-col ant-form-item-label"
           `}</style>
 					<div className="settingFormsy">
 						<React.Fragment>
@@ -229,7 +227,7 @@ class Bankcardnumberverification extends Component {
 								>
 									{getFieldDecorator('openingbank', {
 										rules: [{
-										  initialValue:this.state.openingbank,
+											initialValue: this.state.openingbank,
 											required: true,
 											message: '请输入开户行',
 										}],
@@ -244,7 +242,7 @@ class Bankcardnumberverification extends Component {
 								>
 									{getFieldDecorator('subbranch', {
 										rules: [{
-											 initialValue: this.state.subbranch,
+											initialValue: this.state.subbranch,
 											required: true,
 											message: '请输入支行',
 										}],
@@ -259,7 +257,7 @@ class Bankcardnumberverification extends Component {
 								>
 									{getFieldDecorator('subbranchs', {
 										rules: [{
-										  initialValue: this.state.subbranchs,
+											initialValue: this.state.subbranchs,
 											required: true,
 											message: '请输入账号',
 										}],
@@ -286,7 +284,7 @@ class Bankcardnumberverification extends Component {
 	}
 }
 
-const Bankcardnumberverifications = Form.create({name: 'Bankcardnumberverification'})(Bankcardnumberverification);
+const Bankcardnumberverifications = Form.create({ name: 'Bankcardnumberverification' })(Bankcardnumberverification);
 
 export default Bankcardnumberverifications;
 
diff --git a/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
index befecc81..485d7cdf 100644
--- a/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
+++ b/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
@@ -32,8 +32,7 @@ class CompetitionContentspdfpeopledata extends Component {
 
 	componentDidMount() {
 		window.document.title = '竞赛';
-		console.log("获取用户信息");
-		console.log(this.props);
+
 
 		this.GetawardinformationAPI();
 		let query=this.props.location&&this.props.location.search;
diff --git a/src/modules/courses/BoardIndex.js b/src/modules/courses/BoardIndex.js
index 4e53509b..8bbb5b97 100644
--- a/src/modules/courses/BoardIndex.js
+++ b/src/modules/courses/BoardIndex.js
@@ -1,100 +1,61 @@
-import React, { Component } from 'react';
-import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-import Loadable from 'react-loadable';
-import Loading from '../../Loading';
-import axios from 'axios';
-// import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
-import { CNotificationHOC } from './common/CNotificationHOC'
-import "./css/Courses.css"
-//引入对应跳转的组件
-const ListPageIndex = Loadable({
-    loader: () => import('./ListPageIndex'),
-    loading:Loading,
-})
-// 讨论
-const BoardsNew= Loadable({
-  loader: () => import('./boards/BoardsNew'),
-  loading: Loading,
-})
-const TopicDetail= Loadable({
-  loader: () => import('./boards/TopicDetail'),
-  loading: Loading,
-})
-
-// 讨论
-const Boards= Loadable({
-  loader: () => import('./boards'),
-  loading: Loading,
-})
-
-
-class CoursesIndex extends Component{
-  constructor(props) {
-    super(props)
-    this.state={
-      // coursedata:undefined
-    }
-  }
-
-  componentDidMount(){
-    
-  }
-    render() {
-      const common = {
-        
-      }
-      
-        return (
-                <Switch {...this.props}>
-
-                    {/*课堂讨论*/}
-                    {/* /board/5464/messages/new */}
-                    {/* <Route exact path="/courses/:coursesId/board/:boardId/messages/:topicId/edit"
-                           render={
-                             (props) => (<BoardsNew {...this.props} {...props} {...this.state} {...common} />)
-                           }
-                    ></Route>
-
-                    <Route exact path="/courses/:coursesId/board/:boardId/messages/new" component={BoardsNew}
-                           render={
-                             (props) => (<BoardsNew {...this.props} {...props} {...this.state} {...common} />)
-                           }
-                    ></Route> */}
-
-                    
-
-
-                    {/*课堂讨论*/}
-                    <Route exact path="/courses/:coursesId/boards/:boardId/messages/:topicId/edit"
-                           render={
-                             (props) => (<BoardsNew {...this.props} {...props} {...this.state} {...common} />)
-                           }
-                    ></Route>
-                    <Route exact path="/courses/:coursesId/boards/:boardId/messages/new"
-                           render={
-                             (props) => (<BoardsNew {...this.props} {...props} {...this.state} {...common} />)
-                           }
-                    ></Route>
-                    <Route exact path="/courses/:coursesId/boards/:boardId/messages/:topicId" 
-                      render={
-                        (props) => (<TopicDetail {...this.props} {...this.state} {...props} {...common} />)
-                      }
-                    ></Route>
-                    <Route exact path="/courses/:coursesId/boards/:boardId/messages/:topicId"
-                      render={
-                        (props) => (<TopicDetail {...this.props} {...this.state} {...props} {...common} />)
-                      }
-                    ></Route>
-                    <Route exact path="/courses/:coursesId/boards/:boardId"
-                           render={
-                             (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
-                           }
-                    ></Route>
-                    
-                </Switch>
-        )
-    }
-}
-
-export default CNotificationHOC() ( SnackbarHOC() ( (CoursesIndex) ));
\ No newline at end of file
+import React, { Component } from 'react';
+import { SnackbarHOC } from 'educoder';
+import { Route, Switch } from 'react-router-dom';
+import Loadable from 'react-loadable';
+import Loading from '../../Loading';
+import { CNotificationHOC } from './common/CNotificationHOC'
+import "./css/Courses.css"
+//引入对应跳转的组件
+const ListPageIndex = Loadable({
+  loader: () => import('./ListPageIndex'),
+  loading: Loading,
+})
+// 讨论
+const BoardsNew = Loadable({
+  loader: () => import('./boards/BoardsNew'),
+  loading: Loading,
+})
+const TopicDetail = Loadable({
+  loader: () => import('./boards/TopicDetail'),
+  loading: Loading,
+})
+
+class CoursesIndex extends Component {
+
+  render() {
+
+    return (
+      <Switch {...this.props}>
+        {/*课堂讨论*/}
+        <Route exact path="/classrooms/:coursesId/boards/:boardId/messages/:topicId/edit"
+          render={
+            (props) => (<BoardsNew {...this.props} {...props} {...this.state} {...common} />)
+          }
+        ></Route>
+        <Route exact path="/classrooms/:coursesId/boards/:boardId/messages/new"
+          render={
+            (props) => (<BoardsNew {...this.props} {...props} {...this.state} {...common} />)
+          }
+        ></Route>
+        <Route exact path="/classrooms/:coursesId/boards/:boardId/messages/:topicId"
+          render={
+            (props) => (<TopicDetail {...this.props} {...this.state} {...props} {...common} />)
+          }
+        ></Route>
+        <Route exact path="/classrooms/:coursesId/boards/:boardId/messages/:topicId"
+          render={
+            (props) => (<TopicDetail {...this.props} {...this.state} {...props} {...common} />)
+          }
+        ></Route>
+        <Route exact path="/classrooms/:coursesId/boards/:boardId"
+          render={
+            (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
+          }
+        ></Route>
+
+      </Switch>
+    )
+  }
+}
+
+export default CNotificationHOC()(SnackbarHOC()((CoursesIndex)));
diff --git a/src/modules/courses/Index.js b/src/modules/courses/Index.js
index dc935ab1..7117f55f 100644
--- a/src/modules/courses/Index.js
+++ b/src/modules/courses/Index.js
@@ -10,7 +10,7 @@ import { CNotificationHOC } from './common/CNotificationHOC'
 import {ImageLayerOfCommentHOC} from '../page/layers/ImageLayerOfCommentHOC'
 import "./css/Courses.css"
 //引入对应跳转的组件
-
+//里面有资源
 const ListPageIndex = Loadable({
     loader: () => import('./ListPageIndex'),
     loading:Loading,
@@ -502,36 +502,40 @@ class CoursesIndex extends Component{
         return (
             <Switch {...this.props}>
 								{/*排序*/}
-								<Route path="/courses/:coursesId/ordering/:ordering_type/:main_id"
+								<Route path="/classrooms/:coursesId/ordering/:ordering_type/:main_id"
 											 render={
 												 (props) => (<Ordering {...this.props} {...props} {...this.state} />)
 											 }
 								></Route>
               {/*视频列表*/}
-
-              <Route path="/courses/:coursesId/course_videos"
+              <Route path="/classrooms/:coursesId/course_video/:videoId"
+                     render={
+                       (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                     }
+              ></Route>
+              <Route path="/classrooms/:coursesId/course_videos"
                      render={
                        (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
                      }
               ></Route>
                 {/* 资源列表页  */}
-                <Route path="/courses/:coursesId/file/:Id" exact
+                <Route path="/classrooms/:coursesId/file/:Id" exact
                        render={
                            (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
-                <Route path="/courses/:coursesId/files/:main_id"
+                <Route path="/classrooms/:coursesId/files/:main_id"
                        render={
                          (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
-                <Route exact path="/courses/:coursesId/boards/:boardId"
+                <Route exact path="/classrooms/:coursesId/boards/:boardId"
                     render={
                         (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                     }
                 ></Route>
                 {/*课堂讨论*/}
-                <Route path="/courses/:coursesId/boards/:boardId"
+                <Route path="/classrooms/:coursesId/boards/:boardId"
                        render={
                            (props) => (<BoardIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
@@ -539,32 +543,32 @@ class CoursesIndex extends Component{
 
                 {/* 毕业设计 */}
                 {/* 毕设问答 */}
-                <Route path="/courses/:coursesId/graduation_topics/postwork/new"
+                <Route path="/classrooms/:coursesId/graduation_topics/postwork/new"
                        render={
                            (props) => (<GraduateTopicPostWorksNew {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 毕设选题新建页 */}
-                <Route path="/courses/:coursesId/graduation_topics/new"
+                <Route path="/classrooms/:coursesId/graduation_topics/new"
                        render={
                            (props) => (<GraduateTopicNew {...this.props} {...props} {...this.state} {...common}/>)
                        }></Route>
                 {/* 毕设选题编辑页*/}
-                <Route path="/courses/:coursesId/graduation_topics/:topicId/edit"
+                <Route path="/classrooms/:coursesId/graduation_topics/:topicId/edit"
                        render={
                            (props) => (<GraduateTopicNew {...this.props} {...props} {...this.state} {...common}/>)
                        }></Route>
 
                 {/* 毕设选题详情页 */}
-                <Route path="/courses/:course_id/graduation_topics/:graduation_topic_id/detail"
+                <Route path="/classrooms/:course_id/graduation_topics/:graduation_topic_id/detail"
                        render={
                            (props)=>(<GraduationTopicsDetail {...this.props} {...props} {...this.state}></GraduationTopicsDetail>)
                        }
                 ></Route>
 
                 {/* 毕设选题列表 */}
-                <Route path="/courses/:coursesId/graduation_topics/:Id" exact
+                <Route path="/classrooms/:coursesId/graduation_topics/:Id" exact
                        render={
                            (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }></Route>
@@ -572,21 +576,21 @@ class CoursesIndex extends Component{
 
                 {/*————————————————————————————————————————————————————————————————————————————————————*/}
                 {/* 作品评阅 https://www.trustie.net/issues/19981 */}
-                <Route path="/courses/:coursesId/graduation_tasks/:category_id/appraise"
+                <Route path="/classrooms/:coursesId/graduation_tasks/:category_id/appraise"
                        render={
                            (props) => (<GraduationTasksappraise {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 新建作品 */}
-                <Route path="/courses/:coursesId/graduation_tasks/:category_id/works/:task_Id/new"
+                <Route path="/classrooms/:coursesId/graduation_tasks/:category_id/works/:task_Id/new"
                        render={
                            (props) => (<GraduationTasksSubmitnewApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 修改作品  */}
-                <Route path="/courses/:coursesId/graduation_tasks/:category_id/works/:work_Id/edit"
+                <Route path="/classrooms/:coursesId/graduation_tasks/:category_id/works/:work_Id/edit"
                        render={
                            (props) => (<GraduationTasksSubmiteditApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
@@ -594,20 +598,20 @@ class CoursesIndex extends Component{
 
                 {/* 设置毕设任务 https://www.trustie.net/issues/19981 */}
 
-                {/* <Route path="/courses/:coursesId/graduation_tasks/:category_id/:task_Id/setting"
+                {/* <Route path="/classrooms/:coursesId/graduation_tasks/:category_id/:task_Id/setting"
                        render={
                            (props) => (<GraduationTaskssetting {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
 
-                <Route path="/courses/:coursesId/graduation_tasks/:category_id/:task_Id/questions"
+                <Route path="/classrooms/:coursesId/graduation_tasks/:category_id/:task_Id/questions"
                     render={
                     (props) => (<GraduationTasksquestions {...this.props} {...props} {...this.state} />)
                 }></Route> */}
 
 
-                <Route path="/courses/:coursesId/graduation_tasks/:category_id/detail/:task_Id"
+                <Route path="/classrooms/:coursesId/graduation_tasks/:category_id/detail/:task_Id"
                        render={
                            (props) => (<GraduationTaskssettinglist {...this.props} {...props} {...this.state} {...common}/>)
                        }
@@ -615,7 +619,7 @@ class CoursesIndex extends Component{
 
 
                 {/* 修改毕设任务 https://www.trustie.net/issues/19981 */}
-                <Route path="/courses/:coursesId/graduation_tasks/:category_id/edit"
+                <Route path="/classrooms/:coursesId/graduation_tasks/:category_id/edit"
                        render={
                            (props) => (<GraduationTaskseditApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
@@ -623,7 +627,7 @@ class CoursesIndex extends Component{
 
 
                 {/* 新建毕设任务 https://www.trustie.net/issues/19981 */}
-                <Route path="/courses/:coursesId/graduation_tasks/:category_id/new"
+                <Route path="/classrooms/:coursesId/graduation_tasks/:category_id/new"
                        render={
                            (props) => (<GraduationTasksnewApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
@@ -631,104 +635,124 @@ class CoursesIndex extends Component{
 
 
                 {/* 毕设任务列表 https://www.trustie.net/issues/19981 */}
-                <Route path="/courses/:coursesId/graduation_tasks/:Id" exact
+                <Route path="/classrooms/:coursesId/graduation_tasks/:Id" exact
                        render={
                            (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/*/!* 毕业设计主 https://www.trustie.net/issues/19981 *!/*/}
-                {/*<Route path="/courses/:coursesId/graduation"*/}
+                {/*<Route path="/classrooms/:coursesId/graduation"*/}
                        {/*render={*/}
                            {/*(props) => (<GraduationTopics {...this.props} {...props} {...this.state} {...common}/>)*/}
                        {/*}*/}
                 {/*></Route>*/}
 
                 {/*/!* 资源子目录 https://www.trustie.net/issues/19917 *!/*/}
-                {/*<Route path="/courses/:coursesId/attachment/attachment/:attachmentId"*/}
+                {/*<Route path="/classrooms/:coursesId/attachment/attachment/:attachmentId"*/}
                 {/*render={*/}
                 {/*(props) => (<Files {...this.props} {...props} {...this.state} {...common}/>)*/}
                 {/*}*/}
                 {/*></Route>*/}
                 {/* 教师列表*/}
-                <Route path="/courses/:coursesId/teachers"
+                <Route path="/classrooms/:coursesId/teachers"
                        render={
                            (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 {/* 学生列表*/}
-                <Route path="/courses/:coursesId/students"
+                <Route path="/classrooms/:coursesId/students"
                        render={
                            (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 {/* 分班列表 */}
-                <Route path="/courses/:coursesId/course_groups/:course_group_id"
+                <Route path="/classrooms/:coursesId/course_groups/:course_group_id"
                        render={
                            (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
-                <Route path="/courses/:coursesId/course_groups"
+                <Route path="/classrooms/:coursesId/course_groups"
                        render={
                            (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 普通作业 */}
-                <Route path="/courses/:coursesId/common_homeworks/:category_id" exact
+                <Route path="/classrooms/:coursesId/common_homeworks/:category_id" exact
                 render={
                     (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                 }
                 ></Route>
+              {/* 子目录普通作业 */}
+              <Route path="/classrooms/:coursesId/common_homework/:category_id" exact
+                     render={
+                       (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
+                     }
+              ></Route>
                 {/* 分组作业 */}
-                <Route path="/courses/:coursesId/group_homeworks/:category_id" exact
+                <Route path="/classrooms/:coursesId/group_homeworks/:category_id" exact
                        render={
                            (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
+              {/* 分组作业 */}
+              <Route path="/classrooms/:coursesId/group_homework/:category_id" exact
+                     render={
+                       (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
+                     }
+              ></Route>
 
                 {/* 普通作业 */}
-                <Route path="/courses/:coursesId/common_homeworks/" strict
+                <Route path="/classrooms/:coursesId/common_homeworks/" strict
                        render={
                            (props) => (<CommonWork {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
+              {/* 子普通作业 */}
+              <Route path="/classrooms/:coursesId/common_homework/" strict
+                     render={
+                       (props) => (<CommonWork {...this.props} {...props} {...this.state} {...common}/>)
+                     }
+              ></Route>
 
                 {/* 分组作业 */}
-                <Route path="/courses/:coursesId/group_homeworks/" strict
+                <Route path="/classrooms/:coursesId/group_homeworks/" strict
                        render={
                            (props) => (<GroupWork {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
-                {/* 问卷答题 */}
-                <Route path="/courses/:coursesId/polls/:pollId/users/:login"
+              {/* 分组作业 */}
+              <Route path="/classrooms/:coursesId/group_homework/" strict
+                     render={
+                       (props) => (<GroupWork {...this.props} {...props} {...this.state} {...common}/>)
+                     }
+              ></Route>
+
+
+              {/* 问卷答题 */}
+                <Route path="/classrooms/:coursesId/polls/:pollId/users/:login"
                        render={
                            (props) => (<PollInfo {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 问卷详情  */}
-                <Route path="/courses/:coursesId/polls/:pollId/detail"
+                <Route path="/classrooms/:coursesId/polls/:pollId/detail"
                        render={
                            (props) => (<PollDetail {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 问卷新建 */}
-                <Route path="/courses/:coursesId/polls/:pollid/:news"
+                <Route path="/classrooms/:coursesId/polls/:pollid/:news"
                        render={
                            (props) => (<PollNew {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
-                {/*/!* 问卷编辑 *!/*/}
-                {/*<Route path="/courses/:coursesId/polls/:pollid/:news"*/}
-                       {/*render={*/}
-                           {/*(props) => (<PollNew {...this.props} {...props} {...this.state} {...common} />)*/}
-                       {/*}*/}
-                {/*></Route>*/}
                 {/* 问卷  */}
-                <Route path="/courses/:coursesId/polls/:Id"
+                <Route path="/classrooms/:coursesId/polls/:Id"
                        render={
                            (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
@@ -736,20 +760,20 @@ class CoursesIndex extends Component{
 
 
                 {/* 试卷查看/评阅 */}
-                <Route exact path="/courses/:coursesId/exercises/:Id/users/:userId"
+                <Route exact path="/classrooms/:coursesId/exercises/:Id/users/:userId"
                     render={
                     (props)=>(<ExerciseReviewAndAnswer {...this.props} {...props} {...this.state} {...common}/>)
                     }
                 ></Route>
 
                 {/*试卷新建  */}
-                <Route exact path="/courses/:coursesId/exercises/new"
+                <Route exact path="/classrooms/:coursesId/exercises/new"
                     render={
                     (props) => (<ExerciseNew {...this.props} {...props} {...this.state} {...common}/>)
                     }
                 ></Route>
                 {/*试卷新建  */}
-                <Route exact path="/courses/:coursesId/exercises/:Id/edit"
+                <Route exact path="/classrooms/:coursesId/exercises/:Id/edit"
                     render={
                     (props) => (<ExerciseNew {...this.props} {...props} {...this.state} {...common}/>)
                     }
@@ -757,7 +781,7 @@ class CoursesIndex extends Component{
 
                 {/*试卷设置主页*/}
 
-                <Route path="/courses/:coursesId/exercises/:Id/student_exercise_list"
+                <Route path="/classrooms/:coursesId/exercises/:Id/student_exercise_list"
                        render={
                            (props) => (<Testpapersettinghomepage {...this.props} {...props} {...this.state} {...common}/>)
                        }
@@ -766,14 +790,14 @@ class CoursesIndex extends Component{
 
                 {/*学生完成列表*/}
                 <Route
-                    path="/courses/:coursesId/exercises/:Id/Studentshavecompletedthelist"
+                    path="/classrooms/:coursesId/exercises/:Id/Studentshavecompletedthelist"
                     render={
                         (props) => (<Studentshavecompletedthelist {...this.props} {...props} {...this.state} {...common}/>)
                     }
                 >
                 </Route>
                 {/* 试卷  */}
-                <Route path="/courses/:coursesId/exercises/:Id"
+                <Route path="/classrooms/:coursesId/exercises/:Id"
                        render={
                            (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
@@ -781,95 +805,95 @@ class CoursesIndex extends Component{
 
 
                 {/*实训查重详情*/}
-                <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/review_detail/:userid"
+                <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/review_detail/:userid"
                        render={
                            (props) => (<ShixunWorkDetails {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
-              <Route path="/courses/:coursesId/shixun_homework/:homeworkid/review_detail/:userid"
+              <Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/review_detail/:userid"
                      render={
                        (props) => (<ShixunWorkDetails {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
 
                 {/*实训查重列表*/}
-                <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/student_work"
+                <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/student_work"
                        render={
                            (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
-              <Route path="/courses/:coursesId/shixun_homework/:homeworkid/student_work"
+              <Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/student_work"
                      render={
                        (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
 
                 {/*实训报告*/}
-                <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/shixun_work_report"
+                <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/shixun_work_report"
                        render={
                            (props) => (<ShixunWorkReport {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
-              <Route path="/courses/:coursesId/shixun_homework/:homeworkid/shixun_work_report"
+              <Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/shixun_work_report"
                      render={
                        (props) => (<ShixunWorkReport {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
 
                 {/*教师列表*/}
-                <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/list"
+                <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/list"
                        render={
                            (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
-              <Route path="/courses/:coursesId/shixun_homework/:homeworkid/list"
+              <Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/list"
                      render={
                        (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
                {/*实训作业page*/}
-              <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/Page"
+              <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/Page"
                      render={
                        (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
                 {/*实训作业设置*/}
-                <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/settings"
+                <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/settings"
                        render={
                            (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
-              <Route path="/courses/:coursesId/shixun_homework/:homeworkid/settings"
+                <Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/settings"
                      render={
                        (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
                 {/*/!*实训作品列表教师*!/*/}
                 {/*提交总结*/}
-                <Route path="/courses/:coursesId/shixun_homeworks/:id/commitsummary/:homeworkid"
+                <Route path="/classrooms/:coursesId/shixun_homeworks/:id/commitsummary/:homeworkid"
                        render={
                            (props) => (<CommitSummary {...this.props} {...props}  {...this.state}  />)
                        }
                 ></Route>
-              <Route path="/courses/:coursesId/shixun_homework/:id/commitsummary/:homeworkid"
+              <Route path="/classrooms/:coursesId/shixun_homework/:id/commitsummary/:homeworkid"
                      render={
                        (props) => (<CommitSummary {...this.props} {...props}  {...this.state}  />)
                      }
               ></Route>
                 {/*实训作品列表学生未公布*/}
-                {/*<Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/noopenlist"*/}
+                {/*<Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/noopenlist"*/}
                 {/*       render={*/}
                 {/*           (props) => (<Studentnotcompleted {...this.props} {...props}  {...this.state}  />)*/}
                 {/*       }*/}
                 {/*></Route>*/}
                 {/*实训学生作品列表已公布*/}
-              {/*  <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/list"*/}
+              {/*  <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/list"*/}
               {/*         render={*/}
               {/*             (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state}  />)*/}
               {/*         }*/}
               {/*  ></Route>*/}
               {/*/!*实训学生作品列表已公布*!/*/}
-              {/*<Route   path="/courses/:coursesId/shixun_homework/:homeworkid/list"*/}
+              {/*<Route   path="/classrooms/:coursesId/shixun_homework/:homeworkid/list"*/}
               {/*       render={*/}
               {/*         (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state}  />)*/}
               {/*       }*/}
@@ -878,21 +902,21 @@ class CoursesIndex extends Component{
 
 
               {/*实训作业问答主目录*/}
-                <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/questions"
+                <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/questions"
                        render={
                            (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
 
               {/*实训作业问答子目录*/}
-              <Route path="/courses/:coursesId/shixun_homework/:homeworkid/questions"
+              <Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/questions"
                      render={
                        (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
 
                 {/*新建课堂*/}
-                <Route path="/courses/new"
+                <Route path="/classrooms/new"
                        render={
                            (props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
@@ -900,33 +924,33 @@ class CoursesIndex extends Component{
               {/*新建精品课堂*/}
               {/*coursesId 课堂id */}
               {/*id 是否是私有或者公有*/}
-              <Route path="/courses/news/:subjectid/newgold/:id"
+              <Route path="/classrooms/news/:subjectid/newgold/:id"
                      render={
                        (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} {...common}/>)
                      }
               ></Route>
               {/*修改精品课堂*/}
-              <Route path="/courses/:coursesId/newgolds/settings"
+              <Route path="/classrooms/:coursesId/newgolds/settings"
                      render={
                        (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} {...common}/>)
                      }
               ></Route>
                 {/*修改课堂*/}
-                <Route path="/courses/:coursesId/settings"
+                <Route path="/classrooms/:coursesId/settings"
                        render={
                            (props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 实训作业子页面*/}
-                <Route path="/courses/:coursesId/shixun_homework/:category_id"
+                <Route path="/classrooms/:coursesId/shixun_homework/:category_id"
                        render={
                            (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 实训作业页面*/}
-                <Route path="/courses/:coursesId/shixun_homeworks/:main_id"
+                <Route path="/classrooms/:coursesId/shixun_homeworks/:main_id"
                        render={
                          (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
@@ -934,30 +958,37 @@ class CoursesIndex extends Component{
 
 								{/*课堂统计列表2019.10.29 */}
 
-								<Route path="/courses/:coursesId/statistics"
+								<Route path="/classrooms/:coursesId/statistics"
 											 render={
 												 (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
 											 }
 								></Route>
 
+                {/* 主签到 */}
+                <Route path="/classrooms/:coursesId/attendances"
+                       render={
+                         (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                       }
+                ></Route>
+
                 {/*/!*实训作业and课堂详情页*!/*/}
-                <Route path="/courses/:coursesId"
+                <Route path="/classrooms/:coursesId"
                         render={
                            (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                         }
                 ></Route>
 
                 {/*课堂首页*/}
-                <Route path="/courses"
+                <Route path="/classrooms"
                        render={
                            (props) => (<CoursesHome {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
-                {/*<Route exact path="/courses" component={CoursesHome}  {...this.props}  {...props}  {...this.state} ></Route>*/}
+                {/*<Route exact path="/classrooms" component={CoursesHome}  {...this.props}  {...props}  {...this.state} ></Route>*/}
 
             </Switch>
         )
     }
 }
 
-export default withRouter(ImageLayerOfCommentHOC({imgSelector: '.imageLayerParent img, .imageLayerParent .imageTarget', parentSelector: '.newMain'}) (CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC(CoursesIndex) ))));
\ No newline at end of file
+export default withRouter(ImageLayerOfCommentHOC({imgSelector: '.imageLayerParent img, .imageLayerParent .imageTarget', parentSelector: '.newMain'}) (CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC(CoursesIndex) ))));
diff --git a/src/modules/courses/ListPageIndex.js b/src/modules/courses/ListPageIndex.js
index 6198484d..96b3bbda 100644
--- a/src/modules/courses/ListPageIndex.js
+++ b/src/modules/courses/ListPageIndex.js
@@ -1,10 +1,8 @@
 import React, { Component } from 'react';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
+import { Route, Switch } from 'react-router-dom';
 
-import {Input,Pagination,Tooltip} from 'antd';
 import Loadable from 'react-loadable';
 import Loading from '../../Loading';
-import Guide from "../../modules/courses/shixunHomework/Guide";
 //业务组件
 import CoursesBanner from "./coursesDetail/CoursesBanner";
 import Coursesleftnav from "./coursesDetail/CoursesLeftNav";
@@ -12,63 +10,64 @@ import Coursesleftnav from "./coursesDetail/CoursesLeftNav";
 //普通作业
 const CommonWork = Loadable({
   loader: () => import('./busyWork/commonWork'),
-  loading:Loading,
-})
-const GroupWork= Loadable({
-    loader: () => import('./busyWork/commonWork'),
-    loading: Loading,
+  loading: Loading,
 })
 // 讨论
-const Boards= Loadable({
+const Boards = Loadable({
   loader: () => import('./boards'),
   loading: Loading,
 })
 //教师列表
-const TeacherList= Loadable({
-    loader: () => import('./members/teacherList'),
-    loading: Loading,
+const TeacherList = Loadable({
+  loader: () => import('./members/teacherList'),
+  loading: Loading,
 })
+//主签到目录
+const Signinmain = Loadable({
+  loader: () => import('./signin/mymain/Signinmain'),
+  loading: Loading,
+});
 //学生列表
-const StudentsList= Loadable({
-    loader: () => import('./members/studentsList'),
-    loading: Loading,
+const StudentsList = Loadable({
+  loader: () => import('./members/studentsList'),
+  loading: Loading,
 });
 //分班列表
-const CourseGroupList= Loadable({
-    loader: () => import('./members/CourseGroupList'),
-    loading: Loading,
+const CourseGroupList = Loadable({
+  loader: () => import('./members/CourseGroupList'),
+  loading: Loading,
 });
 
-const Eduinforms= Loadable({
+const Eduinforms = Loadable({
   loader: () => import('./gradinforms/Eduinforms'),
   loading: Loading,
 });
 
 //2019.10.29 统计
-const Statistics=Loadable({
-	loader: () => import('./statistics/Statistics'),
-	loading: Loading,
+const Statistics = Loadable({
+  loader: () => import('./statistics/Statistics'),
+  loading: Loading,
 });
 
-const Elearning= Loadable({
+const Elearning = Loadable({
   loader: () => import('./elearning/Elearning'),
   loading: Loading,
 });
 //
-const Exercise= Loadable({
-    loader: () => import('./exercise/Exercise'),
-    loading: Loading,
+const Exercise = Loadable({
+  loader: () => import('./exercise/Exercise'),
+  loading: Loading,
 })
 //
-const Poll= Loadable({
-    loader: () => import('./poll/Poll'),
-    loading: Loading,
+const Poll = Loadable({
+  loader: () => import('./poll/Poll'),
+  loading: Loading,
 })
 
 // 资源
-const  Resourcelist= Loadable({
-    loader: () => import('./Resource/index'),
-    loading: Loading,
+const Resourcelist = Loadable({
+  loader: () => import('./Resource/index'),
+  loading: Loading,
 })
 
 // 视频
@@ -78,294 +77,293 @@ const CourseVideo = Loadable({
 })
 
 //实训作业
-const ShixunHomework= Loadable({
-    loader: () => import('./shixunHomework/shixunHomework'),
-    loading: Loading,
+const ShixunHomework = Loadable({
+  loader: () => import('./shixunHomework/shixunHomework'),
+  loading: Loading,
 })
 
-const GraduationTopics= Loadable({
-    loader: () => import('./graduation/topics'),
-    loading: Loading,
+const GraduationTopics = Loadable({
+  loader: () => import('./graduation/topics'),
+  loading: Loading,
 })
-const GraduationTasks= Loadable({
-    loader: () => import('./graduation/tasks'),
-    loading: Loading,
+const GraduationTasks = Loadable({
+  loader: () => import('./graduation/tasks'),
+  loading: Loading,
 })
-class ListPageIndex extends Component{
+class ListPageIndex extends Component {
   constructor(props) {
     super(props);
-    this.state={
-      yslGuideone:undefined,
-      yslElearning:false,
-			isexcellent:false
+    this.state = {
+      yslGuideone: undefined,
+      yslElearning: false,
+      isexcellent: false,
+      homedirectory: false,
     }
   }
-  comyslElearning(bool){
-    if(bool===true){
+  comyslElearning(bool) {
+    if (bool === true) {
       this.setState({
-        yslElearning:true,
+        yslElearning: true,
       })
-    }else {
+    } else {
       this.setState({
-        yslElearning:false,
+        yslElearning: false,
       })
     }
 
   }
-  componentDidMount(){
-    // console.log("77");
+  componentDidMount() {
     var yslGuideone = window.localStorage.getItem('yslGuideone');
-    // console.log("78");
-    // console.log(yslGuideone);
     try {
       if (yslGuideone === "true") {
-        // console.log("true 字符串");
         this.setState({
-          yslGuideone:true,
+          yslGuideone: true,
         })
       } else {
         this.setState({
-          yslGuideone:false,
+          yslGuideone: false,
         });
-        // console.log("false 字符串");
       }
-    }catch (e) {
+    } catch (e) {
       console.log(e);
       this.setState({
-        yslGuideone:false,
+        yslGuideone: false,
       });
     }
 
 
   }
-  //
-  // getleftNavid=(navid,newselectnavid)=>{
-  //   console.log(navid,newselectnavid)
-  //   this.setState({
-  //     navkey:navid,
-  //     navttype:newselectnavid
-  //   })
-  // }
-  componentWillUnmount(){
-    // window.localStorage.setItem('yslGuideone', "false");
-  }
-  setwindowlocal=(bool)=>{
-     window.localStorage.setItem('yslGuideone', bool);
+  setwindowlocal = (bool) => {
+    window.localStorage.setItem('yslGuideone', bool);
     try {
       if (bool === "true") {
 
         this.setState({
-          yslGuideone:true,
+          yslGuideone: true,
         })
       } else {
         this.setState({
-          yslGuideone:false,
+          yslGuideone: false,
         });
 
       }
-    }catch (e) {
-      // console.log(e);
+    } catch (e) {
       this.setState({
-        yslGuideone:false,
+        yslGuideone: false,
       });
     }
-   }
-	ispostexcellenttype=(excellent)=>{
-  	this.setState({
-			isexcellent:excellent
-		})
-	}
+  }
+  ispostexcellenttype = (excellent) => {
+    this.setState({
+      isexcellent: excellent
+    })
+  }
+  updatabanners = () => {
+    this.refs.CoursesBanner.updatabanner()
+  }
+
+  //是否点击了目录
+  Callhomedirectoryornot = (bool) => {
+    this.setState({
+      homedirectory: bool
+    })
+    if (bool === true) {
+      setTimeout(() => {
+        this.setState({
+          homedirectory: false,
+        })
+      }, 1000);
+    }
+
+  }
   render() {
-    let {yslGuideone} =this.state;
-    // console.log("98");
-    // console.log(yslGuideone);
-    // console.log(this.props.isAdmin());
-    // // var yslGuideones = window.sessionStorage.getItem('yslGuideone');
-    // console.log(this.props);
-    // console.log(this.props.location.search);
-      return (
+    let { yslGuideone } = this.state;
+    return (
       <div>
-          <div className="newMain clearfix">
-              {/*头部banner*/}
-              <CoursesBanner {...this.props} ispostexcellenttype={(excellent)=>this.ispostexcellenttype(excellent)}></CoursesBanner>
-            {/*下面是指引哦*/}
-            {/*{yslGuideone!==undefined?*/}
-            {/*(*/}
-            {/*  yslGuideone===true?*/}
-            {/*    <Guide*/}
-            {/*      setwindowlocal={(b)=>this.setwindowlocal(b)}*/}
-            {/*    >*/}
-            {/*    </Guide>*/}
-            {/*    :""*/}
-            {/* )*/}
-            {/* :""*/}
-            {/*}*/}
-              <div className="educontent clearfix" style={{flex: "1 0 auto"}}>
+        <div className="newMain clearfix">
+          <CoursesBanner ref={"CoursesBanner"} {...this.props} ispostexcellenttype={(excellent) => this.ispostexcellenttype(excellent)}></CoursesBanner>
+          <div className="educontent clearfix" style={{ flex: "1 0 auto" }}>
 
-                  <div className="stud-class-set">
-                      <div className="news">
-                          <div className="edu-class-inner container clearfix">
-                              <div className="member for-content-0 for-content">
-                                  <div className="people clearfix mb60">
+            <div className="stud-class-set">
+              <div className="news">
+                <div className="edu-class-inner container clearfix">
+                  <div className="member for-content-0 for-content">
+                    <div className="people clearfix mb60">
 
-                                      {/*left_nav*/}
-                                      <div className={"with22 fl setleft"} style={{width:'264px',minHeight:'500px'}}>
-                                         <Coursesleftnav {...this.props} {...this.state}  comyslElearning={(i)=>this.comyslElearning(i)}/>
-                                      </div>
-
-                                      {/*right_concent*/}
-                                      <div className="with78 fl">
-                                          <div className={"ml20 clearfix"}>
-                                              <Switch {...this.props}>
-                                                {/* --------------------------------------------------------------------- */}
-
-                                                {/* 作业设置 */}
-                                                {/* http://localhost:3007/courses/1309/homework/9300/setting */}
-                                                {/* 普通作业 */}
-                                                <Route path="/courses/:coursesId/common_homeworks/:category_id"
-                                                    render={
-                                                        (props) => (<CommonWork {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-
-                                                {/* 作品列表 */}
-                                                <Route path="/courses/:coursesId/group_homeworks/:category_id"
-                                                    render={
-                                                        (props) => (<CommonWork {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-
-                                                <Route exact path="/courses/:coursesId/boards/:boardId"
-                                                    render={
-                                                        (props) => (<Boards {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-                                                {/*视频列表*/}
-
-                                                <Route path="/courses/:coursesId/course_videos"
-                                                       render={
-                                                         (props) => (<CourseVideo {...this.props} {...props} {...this.state} />)
-                                                       }
-                                                ></Route>
-                                                <Route path="/courses/:coursesId/teachers"
-                                                    render={
-                                                        (props) => (<TeacherList {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-                                                {/* 学生列表*/}
-                                                <Route path="/courses/:coursesId/students"
-                                                    render={
-                                                        (props) => (<StudentsList {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-                                                <Route path="/courses/:coursesId/course_groups/:course_group_id"
-                                                    render={
-                                                        (props) => (<StudentsList {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-                                                <Route path="/courses/:coursesId/course_groups"
-                                                    render={
-                                                        (props) => (<CourseGroupList {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-
-                                                <Route path="/courses/:coursesId/exercises/:Id"
-                                                    render={
-                                                        (props) => (<Exercise {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-
-                                                <Route path="/courses/:coursesId/polls/:Id"
-                                                    render={
-                                                        (props) => (<Poll {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-                                                {/* <Route path="/courses/:coursesId/file/:Id"
-                                                    render={
-                                                        (props) => (<Resourcelist {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route> */}
-
-                                                {/* 实训作业子页面*/}
-                                                <Route path="/courses/:coursesId/shixun_homework/:category_id"
-                                                    render={
-                                                        (props) => (<ShixunHomework {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-
-																								{/*课堂统计列表2019.10.29 */}
-
-																								<Route path="/courses/:coursesId/statistics"
-																											 render={
-																												 (props) => (<Statistics {...this.props} {...props} {...this.state} />)
-																											 }
-																								></Route>
-                                                
-
-                                                {/*公告栏列表*/}
-
-                                                <Route path="/courses/:coursesId/informs"
-                                                       render={
-                                                         (props) => (<Eduinforms {...this.props} {...props} {...this.state} />)
-                                                       }
-                                                ></Route>
-                                                {/*在线学习*/}
-                                                <Route
-                                                  path="/courses/:coursesId/online_learning"
-                                                  render={
-                                                    (props) => (<Elearning {...this.props} {...props} {...this.state} comyslElearning={(i)=>this.comyslElearning(i)} />)
-                                                  }
-                                                >
-                                                </Route>
-                                                {/* 实训作业页面*/}
-                                                <Route path="/courses/:coursesId/shixun_homeworks/:main_id"
-                                                    render={
-                                                        (props) => (<ShixunHomework {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-
-                                                
-                                                <Route path="/courses/:coursesId/files/:main_id"
-                                                    render={
-                                                        (props) => (<Resourcelist {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-                                                <Route path="/courses/:coursesId/file/:Id"
-                                                    render={
-                                                        (props) => (<Resourcelist {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-                                                
-                                                <Route path="/courses/:coursesId/graduation_topics/:Id"
-                                                    render={
-                                                        (props) => (<GraduationTopics {...this.props} {...props} {...this.state} />)
-                                                }></Route>
-                                                <Route path="/courses/:coursesId/graduation_tasks/:Id"
-                                                    render={
-                                                        (props) => (<GraduationTasks {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-                                                {/* 默认 */}
-                                                <Route path="/courses/:coursesId"
-                                                    render={
-                                                        (props) => (<StudentsList {...this.props} {...props} {...this.state} />)
-                                                    }
-                                                ></Route>
-
-                                              </Switch>
-                                          </div>
-                                      </div>
-
-                                  </div>
-                               </div>
-                          </div>
+                      {/*left_nav*/}
+                      <div className={"with22 fl setleft"} style={{ width: '264px', minHeight: '500px' }}>
+                        <Coursesleftnav {...this.props} {...this.state} comyslElearning={(i) => this.comyslElearning(i)} myinex={true} Callhomedirectoryornot={(b) => this.Callhomedirectoryornot(b)} />
                       </div>
-                  </div>
 
+                      {/*right_concent*/}
+                      <div className="with78 fl">
+                        <div className={"ml20 clearfix"}>
+                          <Switch {...this.props}>
+                            {/* 作业设置 */}
+                            {/* http://localhost:3007/classrooms/1309/homework/9300/setting */}
+                            {/* 普通作业 */}
+                            <Route path="/classrooms/:coursesId/common_homeworks/:category_id"
+                              render={
+                                (props) => (<CommonWork {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+                            {/* 普通作业 */}
+                            <Route path="/classrooms/:coursesId/common_homework/:category_id"
+                              render={
+                                (props) => (<CommonWork {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+
+                            {/* 作品列表 */}
+                            <Route path="/classrooms/:coursesId/group_homeworks/:category_id"
+                              render={
+                                (props) => (<CommonWork {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+                            {/* 作品列表 */}
+                            <Route path="/classrooms/:coursesId/group_homework/:category_id"
+                              render={
+                                (props) => (<CommonWork {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+
+                            <Route exact path="/classrooms/:coursesId/boards/:boardId"
+                              render={
+                                (props) => (<Boards {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+                            {/*视频列表*/}
+                            <Route path="/classrooms/:coursesId/course_video/:videoId"
+                              render={
+                                (props) => (<CourseVideo {...this.props} {...props} {...this.state} homedirectory={this.state.homedirectory} />)
+                              }
+                            ></Route>
+                            <Route path="/classrooms/:coursesId/course_videos"
+                              render={
+                                (props) => (<CourseVideo {...this.props} {...props} {...this.state} homedirectory={this.state.homedirectory} />)
+                              }
+                            ></Route>
+                            {/* 教师列表*/}
+                            <Route path="/classrooms/:coursesId/teachers"
+                              render={
+                                (props) => (<TeacherList updatabanners={() => this.updatabanners()} {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+                            {/* 学生列表*/}
+                            <Route path="/classrooms/:coursesId/students"
+                              render={
+                                (props) => (<StudentsList {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+                            {/* 主签到 */}
+                            <Route path="/classrooms/:coursesId/attendances"
+                              render={
+                                (props) => (<Signinmain {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+
+                            <Route path="/classrooms/:coursesId/course_groups/:course_group_id"
+                              render={
+                                (props) => (<StudentsList {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+                            <Route path="/classrooms/:coursesId/course_groups"
+                              render={
+                                (props) => (<CourseGroupList {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+
+                            <Route path="/classrooms/:coursesId/exercises/:Id"
+                              render={
+                                (props) => (<Exercise {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+
+                            <Route path="/classrooms/:coursesId/polls/:Id"
+                              render={
+                                (props) => (<Poll {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+                            {/* 实训作业子页面*/}
+                            <Route path="/classrooms/:coursesId/shixun_homework/:category_id"
+                              render={
+                                (props) => (<ShixunHomework {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+
+                            {/*课堂统计列表2019.10.29 */}
+
+                            <Route path="/classrooms/:coursesId/statistics"
+                              render={
+                                (props) => (<Statistics {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+
+
+                            {/*公告栏列表*/}
+
+                            <Route path="/classrooms/:coursesId/informs"
+                              render={
+                                (props) => (<Eduinforms {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+                            {/*在线学习*/}
+                            <Route
+                              path="/classrooms/:coursesId/online_learning"
+                              render={
+                                (props) => (<Elearning {...this.props} {...props} {...this.state} comyslElearning={(i) => this.comyslElearning(i)} />)
+                              }
+                            >
+                            </Route>
+                            {/* 实训作业页面*/}
+                            <Route path="/classrooms/:coursesId/shixun_homeworks/:main_id"
+                              render={
+                                (props) => (<ShixunHomework {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+
+
+                            <Route path="/classrooms/:coursesId/files/:main_id"
+                              render={
+                                (props) => (<Resourcelist {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+                            <Route path="/classrooms/:coursesId/file/:Id"
+                              render={
+                                (props) => (<Resourcelist {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+
+                            <Route path="/classrooms/:coursesId/graduation_topics/:Id"
+                              render={
+                                (props) => (<GraduationTopics {...this.props} {...props} {...this.state} />)
+                              }></Route>
+                            <Route path="/classrooms/:coursesId/graduation_tasks/:Id"
+                              render={
+                                (props) => (<GraduationTasks {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+                            {/* 默认 */}
+                            <Route path="/classrooms/:coursesId"
+                              render={
+                                (props) => (<StudentsList {...this.props} {...props} {...this.state} />)
+                              }
+                            ></Route>
+
+                          </Switch>
+                        </div>
+                      </div>
+
+                    </div>
+                  </div>
+                </div>
               </div>
+            </div>
+
           </div>
+        </div>
       </div>
     )
   }
 }
-export default ListPageIndex;
\ No newline at end of file
+export default ListPageIndex;
diff --git a/src/modules/courses/Resource/Fileslistitem.js b/src/modules/courses/Resource/Fileslistitem.js
index 53f607b2..29067d20 100644
--- a/src/modules/courses/Resource/Fileslistitem.js
+++ b/src/modules/courses/Resource/Fileslistitem.js
@@ -1,6 +1,6 @@
-import React,{ Component } from "react";
-import { WordsBtn } from 'educoder';
-import {Tooltip,message} from 'antd';
+import React, {Component} from "react";
+import {WordsBtn} from 'educoder';
+import {Tooltip, message} from 'antd';
 import {Link} from 'react-router-dom';
 import {getImageUrl} from 'educoder';
 import axios from 'axios'
@@ -10,25 +10,40 @@ import CoursesListType from '../coursesPublic/CoursesListType';
 import Showoldfiles from "../coursesPublic/Showoldfiles";
 import Modals from '../../modals/Modals';
 
-class Fileslistitem extends Component{
-	constructor(props){
+class Fileslistitem extends Component {
+	constructor(props) {
 		super(props);
-		this.state = {
-
-		}
+		this.state = {}
 	}
 
-	settingList=()=>{
-		let {discussMessage}=this.props
-
+	settingList = (bools) => {
+		let {discussMessage} = this.props
+		console.log(discussMessage);
 		this.setState({
-			discussMessageid:discussMessage.id
+			discussMessageid: discussMessage.id
 		})
-		this.props.Settingtypes(discussMessage.id)
-	}
+		if (bools === true) {
+			this.props.Settingtypes(discussMessage.id)
+		} else {
+			this.props.Settingtypess(discussMessage.id,discussMessage.title,discussMessage.link)
+		}
 
-	showfiles=(list)=>{
-		if(this.props.checkIfLogin()===false){
+	}
+	//外链
+	showfiless = (url,id) => {
+		window.open(url)
+		let urls=`/files/${id}/update_visits.json`;
+		axios.post(urls,{
+		}).then((result)=>{
+			if(result.data.status===0){
+       this.props.Updateresourcepage()
+			}else{
+				this.props.showNotification(result.data.message);
+			}
+		})
+	}
+	showfiles = (list) => {
+		if (this.props.checkIfLogin() === false) {
 			this.props.showLoginDialog()
 			return
 		}
@@ -43,21 +58,21 @@ class Fileslistitem extends Component{
 		// 	return
 		// }
 
-		if(list.is_history_file===false){
+		if (list.is_history_file === false) {
 			// this.props.DownloadFileA(list.title,list.url)
 			//window.location.href=list.url;
 			window.open(list.url, '_blank');
-		}else{
-			let {discussMessage,coursesId}=this.props
-			let file_id=discussMessage.id
-			let url="/files/"+file_id+"/histories.json"
-			axios.get(url,{
-				params:{
-					course_id:coursesId
+		} else {
+			let {discussMessage, coursesId} = this.props
+			let file_id = discussMessage.id
+			let url = "/files/" + file_id + "/histories.json"
+			axios.get(url, {
+				params: {
+					course_id: coursesId
 				},
-			}).then((result)=>{
+			}).then((result) => {
 
-				if(result.data.attachment_histories.length===0){
+				if (result.data.attachment_histories.length === 0) {
 					// if(result.data.is_pdf===true){
 					// 	this.props.ShowOnlinePdf(result.data.url)
 					// 	//预览pdf
@@ -66,64 +81,66 @@ class Fileslistitem extends Component{
 					// }
 					// this.props.DownloadFileA(result.data.title,result.data.url)
 					window.open(list.url, '_blank');
-				}else{
+				} else {
 					this.setState({
-						Showoldfiles:true,
-						allfiles:result.data
+						Showoldfiles: true,
+						allfiles: result.data
 					})
 				}
 
 
-			}).catch((error)=>{
+			}).catch((error) => {
 				console.log(error)
 			})
 		}
 
 	}
 
-	closaoldfilesprops=()=>{
+	closaoldfilesprops = () => {
 		this.setState({
-			Showoldfiles:false,
+			Showoldfiles: false,
 		})
 	}
 
 	onDelete = (id) => {
 
 		this.setState({
-			Modalstype:true,
-			Modalstopval:"是否确认删除?",
-			ModalCancel:this.cancelmodel,
-			ModalSave:()=>this.savedelete(id),
+			Modalstype: true,
+			Modalstopval: "是否确认删除?",
+			ModalCancel: this.cancelmodel,
+			ModalSave: () => this.savedelete(id),
 		})
 
 	}
 
-	cancelmodel=()=>{
+	cancelmodel = () => {
 
 		this.setState({
-			Modalstype:false,
-			Loadtype:false,
-			Modalstopval:"",
-			ModalCancel:"",
-			ModalSave:"",
-			checkBoxValues:[],
+			Modalstype: false,
+			Loadtype: false,
+			Modalstopval: "",
+			ModalCancel: "",
+			ModalSave: "",
+			checkBoxValues: [],
 		})
 
 	}
 
-	savedelete=(id)=>{
+	savedelete = (id) => {
 
 		this.setState({
-			Modalstype:false,
+			Modalstype: false,
 		})
 
 
 		const cid = this.props.match.params.coursesId
 		const url = `/files/bulk_delete.json`;
-		axios.delete(url, { data: {
-					course_id:cid,
+		axios.delete(url, {
+				data: {
+					course_id: cid,
 					ids: [id],
-				}})
+				}
+			})
 			.then((response) => {
 				if (response.data.status == 0) {
 					//Modalstopval:response.data.message,
@@ -132,11 +149,11 @@ class Fileslistitem extends Component{
 					this.setState({
 						// Modalstype:true,
 						// Modalstopval:"删除成功",
-						ModalsBottomval:"",
+						ModalsBottomval: "",
 						// ModalSave:this.cancelmodel,
 						// Loadtype:true,
-						checkBoxValues:[],
-						checkAllValue:false
+						checkBoxValues: [],
+						checkAllValue: false
 					})
 
 					this.props.showNotification("删除成功");
@@ -147,28 +164,30 @@ class Fileslistitem extends Component{
 			});
 	}
 
-	eventStop = (event) =>{
+	eventStop = (event) => {
 		event.stopPropagation()
 	}
 
-	render(){
+	render() {
 
-		const { checkBox,
-			discussMessage,index
+		const {
+			checkBox,
+			discussMessage, index
 		} = this.props;
 
-		return(
+		let bools = discussMessage.link && discussMessage.link ? false : true;
+		return (
 			<div className="graduateTopicList boardsList">
 
 				{/*提示*/}
-				{this.state.Modalstype&&this.state.Modalstype===true?<Modals
+				{this.state.Modalstype && this.state.Modalstype === true ? <Modals
 					modalsType={this.state.Modalstype}
 					modalsTopval={this.state.Modalstopval}
 					modalCancel={this.state.ModalCancel}
 					modalSave={this.state.ModalSave}
 					modalsBottomval={this.state.ModalsBottomval}
 					loadtype={this.state.Loadtype}
-				/>:""}
+				/> : ""}
 				<Showoldfiles
 					{...this.props}
 					visible={this.state.Showoldfiles}
@@ -213,67 +232,132 @@ class Fileslistitem extends Component{
              margin-top:2px;
             }
           `}</style>
-				<div className="clearfix ds pr contentSection" style={{cursor : this.props.isAdmin ? "pointer" : "default"}} onClick={() => window.$(`.sourceitem${index} input`).click() }>
-					<h6 onClick={(event)=>this.eventStop(event)}>
+				<div className="clearfix ds pr contentSection" style={{cursor: this.props.isAdmin ? "pointer" : "default"}}
+						 onClick={() => window.$(`.sourceitem${index} input`).click()}>
+					<h6 onClick={(event) => this.eventStop(event)}>
 		        	<span className={`sourceitem${index} fl mr12 mt3`}>
 								{checkBox}
 							</span>
 						{
-							this.props.isAdmin ? <a
-								// href={"/courses/" + coursesId + "/graduation/graduation_tasks/" + categoryid + "/" + taskid + "/list"}
-								onClick={()=>this.showfiles(discussMessage)}
-								title={discussMessage.title}
-								className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> : ""
+							this.props.isAdmin ?
+								(bools === true ?
+										<a
+											// href={"/classrooms/" + coursesId + "/graduation/graduation_tasks/" + categoryid + "/" + taskid + "/list"}
+											onClick={() => this.showfiles(discussMessage)}
+											title={discussMessage.title}
+											className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>
+										:
+										<a
+											// href={"/classrooms/" + coursesId + "/graduation/graduation_tasks/" + categoryid + "/" + taskid + "/list"}
+											onClick={() => this.showfiless(discussMessage.link,discussMessage.id)}
+											title={discussMessage.title}
+											className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>
+								)
+
+								: ""
 						}
 						{
-							this.props.isStudent?  <a
-								onClick={()=>this.showfiles(discussMessage)}
-								title={discussMessage.title}
-								className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> :""
+							this.props.isStudent ?
+								(bools === true ?
+										<a
+											onClick={() => this.showfiles(discussMessage)}
+											title={discussMessage.title}
+											className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>
+
+										:
+										<a
+											onClick={() => this.showfiless(discussMessage.link,discussMessage.id)}
+											title={discussMessage.title}
+											className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>
+
+								)
+
+
+								: ""
 						}
 
 						{
-							this.props.isNotMember===true?
+							this.props.isNotMember === true ?
 								discussMessage.is_lock === true ?
-									<span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer"  title={"私有属性，非课堂成员不能访问"}>{discussMessage.title}</span>
-									:<a
-										onClick={()=>this.showfiles(discussMessage)}
-										title={discussMessage.title}
-										className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>:""
+									<span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer"
+												title={"私有属性，非课堂成员不能访问"}>{discussMessage.title}</span>
+									:
+									(bools === true ?
+
+											<a
+												onClick={() => this.showfiles(discussMessage)}
+												title={discussMessage.title}
+												className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> :
+
+											<a
+												onClick={() =>this.showfiless(discussMessage.link,discussMessage.id)}
+												title={discussMessage.title}
+												className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>
+
+									)
+
+
+								: ""
 						}
 
 
 						{
 							discussMessage.is_lock === true ?
-								<Tooltip  title={"私有属性，非课堂成员不能访问"}  placement="bottom">
+								<Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom">
 									<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
 								</Tooltip>
-								:""
+								: ""
+						}
+						<style>
+							{
+								`
+								.fwlz{
+								width:40px;
+								height:20px;
+								border-radius:2px;
+								border:1px solid rgba(250,100,0,1);
+								font-size:12px;
+								font-family:MicrosoftYaHei;
+								color:rgba(250,100,0,1);
+								text-align: center;
+                margin-left: 15px;
+								}
+								`
+							}
+						</style>
+						{
+							discussMessage.link && discussMessage.link ?
+								<p className="fl mt3 fwlz " style={{
+									cursor:"auto"
+								}}>外链</p>
+								:
+								""
 						}
-						{discussMessage.is_publish===false?<CoursesListType typelist={["未发布"]} typesylename={""}/>:""}
 
-						{this.props.isAdmin?
-							<span className={"fr mt2"} onClick={(event)=>this.eventStop(event)}>
+						{discussMessage.is_publish === false ? <CoursesListType typelist={["未发布"]} typesylename={""}/> : ""}
+
+						{this.props.isAdmin ?
+							<span className={"fr mt2"} onClick={(event) => this.eventStop(event)}>
                       <WordsBtn style="blue" className="colorblue font-16 ml20 fr">
                           <a className="btn colorblue fontweight400"
-														 onClick={()=>this.settingList()}>设置</a>
+														 onClick={() => this.settingList(bools)}>设置</a>
                         </WordsBtn>
-                      </span>:""}
+                      </span> : ""}
 
-						{this.props.isStudent===true&&this.props.current_user.login===discussMessage.author.login?
-							<span className={"fr mt2"} onClick={(event)=>this.eventStop(event)}>
+						{this.props.isStudent === true && this.props.current_user.login === discussMessage.author.login ?
+							<span className={"fr mt2"} onClick={(event) => this.eventStop(event)}>
 
                       <WordsBtn style="blue" className="colorblue font-16 ml20  fr">
                         <a className="btn colorblue fontweight400"
-													 onClick={()=>this.settingList()}>设置</a>
+													 onClick={() => this.settingList(bools)}>设置</a>
                       </WordsBtn>
 
 										  <WordsBtn style="blue" className="colorblue font-16 ml20 fr">
                         <a className="btn colorblue fontweight400"
-													 onClick={()=>this.onDelete(discussMessage.id)}>删除</a>
+													 onClick={() => this.onDelete(discussMessage.id)}>删除</a>
                       </WordsBtn>
 
-                      </span>:""}
+                      </span> : ""}
 					</h6>
 					<style>
 						{
@@ -288,7 +372,6 @@ class Fileslistitem extends Component{
 					</style>
 
 
-
 					<style>
 						{
 							`
@@ -315,28 +398,45 @@ class Fileslistitem extends Component{
 
 					{/*</p>}*/}
 
-					<p className={this.props.isAdmin===true?"color-grey panel-lightgrey mt8 fl ml30":"color-grey panel-lightgrey mt8 fl ml13"} style={{width:'100%'}}>
+					<p
+						className={this.props.isAdmin === true ? "color-grey panel-lightgrey mt8 fl ml30" : "color-grey panel-lightgrey mt8 fl ml13"}
+						style={{width: '100%'}}>
                       <span className="mr50">
                         <span className="mr15 color-dark">{discussMessage.author.name}</span>
-                        <span className="mr15 color-grey9">大小 {discussMessage.filesize}</span>
-                        <span className="mr15 color-grey9">下载 {discussMessage.downloads_count}</span>
+												{
+													bools ?
+														<span className="mr15 color-grey9">大小 {discussMessage.filesize}</span>
+
+														:
+														""
+												}
+
+												{
+													bools ?
+														<span className="mr15 color-grey9">下载 {discussMessage.downloads_count}</span>
+														:
+														<span className="mr15 color-grey9">点击次数：{discussMessage.downloads_count}</span>
+
+												}
 												{/*<span className="mr15 color-grey9">引用 {discussMessage.quotes}</span>*/}
 												<span className="mr15 color-grey-c">
                             {/*{moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm:ss')}*/}
 													{/*{moment(discussMessage.publish_time).fromNow()}*/}
-													{ discussMessage.publish_time===null?"":
-														discussMessage.is_publish===true?"":"发布于"}
-													{ discussMessage.publish_time===null?"":discussMessage.is_publish===true?moment(discussMessage.publish_time).fromNow():moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm')}
+													{discussMessage.publish_time === null ? "" :
+														discussMessage.is_publish === true ? "" : "发布于"}
+													{discussMessage.publish_time === null ? "" : discussMessage.is_publish === true ? moment(discussMessage.publish_time).fromNow() : moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm')}
                         </span>
                       </span>
-						{discussMessage&&discussMessage.category_name===null?"":this.props.child===false?<div className="color-grey9 task-hide fr mr30" title={discussMessage&&discussMessage.category_name}
-																																																	style={{"max-width":"268px"}}>所属目录：{discussMessage&&discussMessage.category_name}
-						</div>:""}
+						{discussMessage && discussMessage.category_name === undefined||discussMessage && discussMessage.category_name === null ? "" : 
+							<div className="color-grey9 task-hide fr mr30" title={discussMessage && discussMessage.category_name}
+									 style={{display:'flex',"max-width": "300px"}}>所属目录：<div style={{display:discussMessage && discussMessage.parent_category_name === null ? "none":'block',"max-width": "150px",overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{discussMessage && discussMessage. parent_category_name}</div><div style={{display:discussMessage && discussMessage.parent_category_name === null ? "none":'block'}}>/</div><div style={{"max-width": "150px",overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{discussMessage && discussMessage.category_name}</div>
+							</div>}
 					</p>
 
 
-
-					<p className={this.props.isAdmin===true?"color-grey panel-lightgrey mt8 fl ml30":"color-grey panel-lightgrey mt8 fl ml13"} style={{width:'94%'}}>
+					<p
+						className={this.props.isAdmin === true ? "color-grey panel-lightgrey mt8 fl ml30" : "color-grey panel-lightgrey mt8 fl ml13"}
+						style={{width: '94%'}}>
 						<style>
 							{
 								`
@@ -349,7 +449,8 @@ class Fileslistitem extends Component{
 													`
 							}
 						</style>
-						<span className="color-dark isspans">资源描述 :{discussMessage.description===null?"暂无描述":discussMessage.description}</span>
+						<span
+							className="color-dark isspans">资源描述 :{discussMessage.description === null ? "暂无描述" : discussMessage.description}</span>
 						{/*<span className="mr50">*/}
 						{/*/!*<span className="mr15 color-dark"></span>*!/*/}
 						{/*<span  className="mr15 color-dark">*/}
@@ -365,4 +466,5 @@ class Fileslistitem extends Component{
 		)
 	}
 }
+
 export default Fileslistitem;
diff --git a/src/modules/courses/Resource/index.js b/src/modules/courses/Resource/index.js
index 8187cd5a..440f93d1 100644
--- a/src/modules/courses/Resource/index.js
+++ b/src/modules/courses/Resource/index.js
@@ -1,11 +1,13 @@
-import React,{ Component } from "react";
-import { Input, Checkbox, Table, Tooltip, Pagination,Spin } from "antd";
-import { WordsBtn,on, off, trigger ,getUrl} from 'educoder';
+import React, { Component } from "react";
+import { Input, Checkbox, Table, Tooltip, Pagination, Spin, Divider } from "antd";
+import { WordsBtn, on, off, trigger, getUrl } from 'educoder';
 import axios from 'axios';
 import Modals from '../../modals/Modals';
 import Sendtofilesmodal from "../coursesPublic/SendToFilesModal";
 import Selectresource from "../coursesPublic/SelectResource";
 import Sendresource from "../coursesPublic/sendResource";
+import SendResources from "../coursesPublic/sendResources";
+
 import Selectsetting from "../coursesPublic/SelectSetting";
 import HomeworkModal from "../coursesPublic/HomeworkModal";
 import Fileslistitem from './Fileslistitem';
@@ -15,8 +17,9 @@ import _ from 'lodash'
 import './style.css';
 import '../css/members.css';
 import moment from 'moment';
-class Fileslists extends Component{
-  constructor(props){
+import { tuple } from "antd/lib/_util/type";
+class Fileslists extends Component {
+  constructor(props) {
     super(props);
     this.state = {
       searchValue: '',
@@ -25,254 +28,277 @@ class Fileslists extends Component{
       total_count: 0,
       page: 1,
       pagesize: 15,
-      tagname:undefined,
-      search:undefined,
-      sort:"desc",
-      sorttype:"created_on",
-      coursesecondcategoryid:undefined,
-      filesId:undefined,
-      name:"",
-      sendTotype:false,
-      Accessoryvisible:false,
-      discussMessageid:undefined,
-      course_modules:undefined,
-      has_course_groups:false,
-      course_is_public:undefined,
-      isSpin:false,
-			course_second_categories:[]
+      tagname: undefined,
+      search: undefined,
+      sort: "desc",
+      sorttype: "created_on",
+      coursesecondcategoryid: undefined,
+      filesId: undefined,
+      name: "",
+      sendTotype: false,
+      Accessoryvisible: false,
+      Addanexternallink: false,
+      Exterchainname: "添加外链",
+      discussMessageid: undefined,
+      course_modules: undefined,
+      has_course_groups: false,
+      course_is_public: undefined,
+      isSpin: false,
+      course_second_categories: [],
+      title: "",
+      link: "",
+      //是否展开
+      istowshowid: '',
+      //新增参数判断几级目录
+      parent_category_id: '',
+      isToggleOn: false,
     }
   }
 
 
-  getcourse_groupslists=()=>{
-		let coursesId=this.props.match.params.coursesId;
-		let url="/courses/"+coursesId+"/all_course_groups.json";
-		axios.get(url).then((response) => {
-			if(response.status===200){
-				this.setState({
-					course_groups:response.data.course_groups
-				})
-			}
-		}).catch((error) => {
-			console.log(error)
-		});
-	}
-  componentDidMount=()=>{
-  	this.getcourse_groupslists()
+  getcourse_groupslists = () => {
+    let coursesId = this.props.match.params.coursesId;
+    let url = "/courses/" + coursesId + "/all_course_groups.json";
+    axios.get(url).then((response) => {
+      if (response.status === 200) {
+        this.setState({
+          course_groups: response.data.course_groups
+        })
+      }
+    }).catch((error) => {
+      console.log(error)
+    });
+  }
+  componentDidMount = () => {
+
+    this.getcourse_groupslists()
     this.setState({
-      isSpin:true,
-			checkBoxValues:[],
-			checkAllValue:false
+      isSpin: true,
+      checkBoxValues: [],
+      checkAllValue: false
     })
 
-    if(this.props.match.params.main_id){
+    if (this.props.match.params.main_id) {
       this.setState({
-         child:false,
-				 sort:"desc"
-			})
-			this.seactall(undefined,"desc");
-    }else if(this.props.match.params.Id){
-			this.setState({
-				child:true,
-				sort:"desc"
-			})
-			this.seactall(parseInt(this.props.match.params.Id),"desc")
+        child: false,
+        sort: "desc"
+      })
+      this.seactall(undefined, "desc");
+    } else if (this.props.match.params.Id) {
+      this.setState({
+        child: true,
+        sort: "desc"
+      })
+      this.seactall(parseInt(this.props.match.params.Id), "desc")
     }
     this.updadatalist();
-		on('updateNavSuccess', this.updateNavSuccess)
-		on('updateNavSuccess',this.updadatalist)
+    on('files', this.updateNavSuccess)
+    on('files', this.updadatalist)
   }
 
-	updateNavSuccess=()=>{
-  	let{sort}=this.state;
-		this.setState({
-			isSpin:true
-		})
-		if(this.props.match.params.main_id){
-			this.seactall(undefined,sort);
-		}else if(this.props.match.params.Id){
-			this.seactall(parseInt(this.props.match.params.Id),sort)
-		}
-	}
+  updateNavSuccess = () => {
+
+    let { sort } = this.state;
+    this.setState({
+      isSpin: true
+    })
+    if (this.props.match.params.main_id) {
+
+      this.seactall(undefined, sort);
+    } else if (this.props.match.params.Id) {
+
+      this.seactall(parseInt(this.props.match.params.Id), sort)
+    }
+  }
   componentDidUpdate = (prevProps) => {
-    if(prevProps.match.params.main_id != this.props.match.params.main_id){
-			this.getcourse_groupslists()
-			this.setState({
-				isSpin:true,
-				checkBoxValues:[],
-				checkAllValue:false,
-			})
-      if(this.props.match.params.main_id!=undefined){
-				this.setState({
-					child:false,
-					sort:"desc"
-				})
-        this.seactall(undefined,"desc");
-      }
-    }
-    if(prevProps.match.params.Id != this.props.match.params.Id){
-			this.getcourse_groupslists()
-			this.setState({
-				isSpin:true,
-				checkBoxValues:[],
-				checkAllValue:false,
-			})
-      if(this.props.match.params.Id!=undefined){
-				this.setState({
-					child:true,
-					sort:"desc"
-				})
-        this.seactall(parseInt(this.props.match.params.Id),"desc")
+
+    if (prevProps.coursesidtype != this.props.coursesidtype || prevProps.match.params.Id != this.props.match.params.Id && this.props.coursesidtype != "node") {
+
+      if (this.props.coursesidtype === "node") {
+
+        this.getcourse_groupslists()
+        this.setState({
+          isSpin: true,
+          checkBoxValues: [],
+          checkAllValue: false,
+        })
+        if (this.props.match.params.main_id != undefined) {
+          this.setState({
+            child: false,
+            sort: "desc"
+          })
+          this.seactall(undefined, "desc");
+        }
+      } else {
+
+        this.getcourse_groupslists()
+        this.setState({
+          isSpin: true,
+          checkBoxValues: [],
+          checkAllValue: false,
+        })
+        if (this.props.match.params.Id != undefined) {
+          this.setState({
+            child: true,
+            sort: "desc"
+          })
+          this.seactall(parseInt(this.props.match.params.Id), "desc")
+        }
       }
+
     }
   }
 
-  updadatalist=(id)=>{
+  updadatalist = (id) => {
     // this.seactall(id)
-		if(this.props.user&&this.props.user.login=== ""||this.props.user&&this.props.user.login=== null||this.props.user&&this.props.user.login=== undefined){
+    if (this.props.user && this.props.user.login === "" || this.props.user && this.props.user.login === null || this.props.user && this.props.user.login === undefined) {
 
-		}else{
-			let coursesId=this.props.match.params.coursesId;
-			let url="/courses/"+coursesId+"/attahcment_category_list.json";
-			axios.get(url, {
-			}).then((response) => {
-				if(response!=undefined){
+    } else {
+      let coursesId = this.props.match.params.coursesId;
+      let url = "/courses/" + coursesId + "/attahcment_category_list.json";
+      axios.get(url, {
+      }).then((response) => {
+        if (response != undefined) {
 
-					if(response.data&&response.data) {
-						if (response.data.status != 401) {
-							let list = response.data.course_modules;
-							let course_second_categoriess;
-							list.map((item, key) => {
-								course_second_categoriess = item.course_second_categories
-							})
+          if (response.data && response.data) {
+            if (response.data.status != 401) {
+              let list = response.data.course_modules;
+              let course_second_categoriess;
+              list.map((item, key) => {
+                course_second_categoriess = item.children ? item.children : []
+              })
 
-							this.setState({
-								course_modules: response.data,
-								has_course_groups: response.data.has_course_groups,
-								course_second_categories: course_second_categoriess
-							})
-						}
-					}
+              this.setState({
+                course_modules: response.data,
+                has_course_groups: response.data.has_course_groups,
+                course_second_categories: course_second_categoriess
+              })
+            }
+          }
 
-				}
+        }
 
-			})
-		}
+      })
+    }
 
   }
-  updatafiled=()=>{
-		let{sort}=this.state;
-		if(this.props.match.params.main_id){
-			this.seactall(undefined,sort);
-		}else if(this.props.match.params.Id){
-			this.seactall(parseInt(this.props.match.params.Id),sort)
-		}
-	}
-  seactall=(coursesecondcategoryid,sort)=>{
+  updatafiled = () => {
+    console.log(5)
+    let { sort } = this.state;
+    if (this.props.match.params.main_id) {
+      this.seactall(undefined, sort);
+    } else if (this.props.match.params.Id) {
+      this.seactall(parseInt(this.props.match.params.Id), sort)
+    }
+  }
+  seactall = (coursesecondcategoryid, sort) => {
 
     this.setState({
-      coursesecondcategoryid:coursesecondcategoryid,
-      isSpin:true
+      coursesecondcategoryid: coursesecondcategoryid,
+      isSpin: true
     })
 
-    let{pagesize,page,tagname,searchValue,sorttype}=this.state;
-    this.getfileslist(pagesize,page,tagname,searchValue,sort,sorttype,coursesecondcategoryid);
+    let { pagesize, page, tagname, searchValue, sorttype } = this.state;
+    this.getfileslist(pagesize, page, tagname, searchValue, sort, sorttype, coursesecondcategoryid);
   }
 
-  onSortTypeChange=(sorttype)=>{
-    let{pagesize,page,tagname,searchValue,sort,coursesecondcategoryid,}=this.state;
-    let newsort="desc";
-    if(sort==="desc"){
-			this.setState({
-				sorttype:sorttype,
-				sort:"asc"
-			})
-			newsort="asc"
-		}else{
-			this.setState({
-				sorttype:sorttype,
-				sort:"desc"
-			})
-			newsort="desc"
-		}
-
-    this.getfileslist(pagesize,page,tagname,searchValue,newsort,sorttype,coursesecondcategoryid);
+  onSortTypeChange = (sorttype) => {
+    let { pagesize, page, tagname, searchValue, sort, coursesecondcategoryid, } = this.state;
+    let newsort = "desc";
+    if (sort === "desc") {
+      this.setState({
+        sorttype: sorttype,
+        sort: "asc"
+      })
+      newsort = "asc"
+    } else {
+      this.setState({
+        sorttype: sorttype,
+        sort: "desc"
+      })
+      newsort = "desc"
+    }
+    console.log(1)
+    this.getfileslist(pagesize, page, tagname, searchValue, newsort, sorttype, coursesecondcategoryid);
   }
 
-  getfileslist=(pagesize,page,tagname,searchValue,sort,sorttype,coursesecondcategoryid)=>{
+  getfileslist = (pagesize, page, tagname, searchValue, sort, sorttype, coursesecondcategoryid) => {
+
+
+    this.updadatalist(0);
 
     let url = "/files.json";
     const courseid = this.props.match.params.coursesId;
-    let id=coursesecondcategoryid;
+    let id = coursesecondcategoryid;
 
-    axios.get(url,{
-      params:{
-        course_id:courseid,
-        page_size:pagesize,
-        page:page,
-        tag_name:tagname,
-        search:searchValue,
-        sort:sort==="desc"?0:1,
-        sort_type:sorttype,
-        course_second_category_id:id
+    axios.get(url, {
+      params: {
+        course_id: courseid,
+        page_size: pagesize,
+        page: page,
+        tag_name: tagname,
+        search: searchValue,
+        sort: sort === "desc" ? 0 : 1,
+        sort_type: sorttype,
+        course_second_category_id: id
       }
-    }).then((result)=>{
-     if(result!=undefined){
-			 if(result.status===200){
-				 if(result.data.status===0){
-					 let list=result.data.data;
-					 this.setState({
-						 total_count:list.total_count,
-						 publish_count:list.publish_count,
-						 unpublish_count:list.unpublish_count,
-						 files:list.files,
-						 filesId:list.id,
-						 name:list.name,
-						 course_is_public:result.data.data.course_is_public,
-						 isSpin:false,
-             page:page
-					 })
-				 }
-			 }
-		 }else{
-     	this.setState({
-				isSpin:false
-			})
-		 }
-    }).catch((error)=>{
+    }).then((result) => {
+      if (result != undefined) {
+        if (result.status === 200) {
+          if (result.data.status === 0) {
+            let list = result.data.data;
+            this.setState({
+              total_count: list.attachments_count,
+              publish_count: list.publish_count,
+              unpublish_count: list.unpublish_count,
+              files: list.files,
+              filesId: list.id,
+              name: list.name,
+              parent_category_id: list.parent_category_id,
+              course_is_public: result.data.data.course_is_public,
+
+              page: page
+            })
+          }
+        }
+      }
+      this.setState({
+        isSpin: false
+      })
+    }).catch((error) => {
       console.log(error)
       this.setState({
-        isSpin:false
+        isSpin: false
       })
     })
   }
 
-  cancelmodel=()=>{
+  cancelmodel = () => {
 
     this.setState({
-      Modalstype:false,
-      Loadtype:false,
-      Modalstopval:"",
-      ModalCancel:"",
-      ModalSave:"",
-      checkBoxValues:[],
+      Modalstype: false,
+      Loadtype: false,
+      Modalstopval: "",
+      ModalCancel: "",
+      ModalSave: "",
+      checkBoxValues: [],
     })
 
   }
 
-  testonSelect=()=>{
+  testonSelect = () => {
 
-    let {checkBoxValues,checkAllValue}=this.state;
+    let { checkBoxValues, checkAllValue } = this.state;
 
-    if(checkAllValue===false){
-      if(checkBoxValues.length===0){
+    if (checkAllValue === false) {
+      if (checkBoxValues.length === 0) {
         return true
       }
     }
 
   }
 
-  noSelect=(value)=>{
+  noSelect = (value) => {
 
     // this.setState({
     //   Modalstype:true,
@@ -280,212 +306,223 @@ class Fileslists extends Component{
     //   Modalstopval:"请选择你要操作的任务",
     //   ModalSave:this.cancelmodel,
     // })
-   if(value===1){
-     this.props.showNotification("请先在列表中选择要删除的资源");
-   }else if(value===2){
-     this.props.showNotification("请先在列表中选择要发送的资源");
-   }else if(value===3){
-     this.props.showNotification("请先在列表中选择要公开的资源");
-   }else if(value===4){
-		 this.props.showNotification("请先在列表中选择要发布的资源");
-	 }
+    if (value === 1) {
+      this.props.showNotification("请先在列表中选择要删除的资源");
+    } else if (value === 2) {
+      this.props.showNotification("请先在列表中选择要发送的资源");
+    } else if (value === 3) {
+      this.props.showNotification("请先在列表中选择要公开的资源");
+    } else if (value === 4) {
+      this.props.showNotification("请先在列表中选择要发布的资源");
+    }
   }
 
   onDelete = () => {
 
-    let selectnum= this.testonSelect();
-    if(selectnum===true){
+    let selectnum = this.testonSelect();
+    if (selectnum === true) {
       this.noSelect(1);
       return
     }
 
     this.setState({
-      Modalstype:true,
-      Modalstopval:"是否确认删除?",
-      ModalCancel:this.cancelmodel,
-      ModalSave:this.savedelete,
+      Modalstype: true,
+      Modalstopval: "是否确认删除?",
+      ModalCancel: this.cancelmodel,
+      ModalSave: this.savedelete,
     })
 
   }
 
-  savedelete=()=>{
+  savedelete = () => {
 
     this.setState({
-      Modalstype:false,
+      Modalstype: false,
     })
-    let {checkBoxValues} = this.state;
+    let { checkBoxValues } = this.state;
 
     const cid = this.props.match.params.coursesId
     const url = `/files/bulk_delete.json`;
-    axios.delete(url, { data: {
-        course_id:cid,
+    axios.delete(url, {
+      data: {
+        course_id: cid,
         ids: checkBoxValues,
-      }})
-        .then((response) => {
-          if (response.data.status == 0) {
-            //Modalstopval:response.data.message,
-						this.updatafiled()
-            this.setState({
-              // Modalstype:true,
-              // Modalstopval:"删除成功",
-              ModalsBottomval:"",
-              // ModalSave:this.cancelmodel,
-              // Loadtype:true,
-              checkBoxValues:[],
-              checkAllValue:false
-            })
-            this.props.showNotification("删除成功");
-						this.props.updataleftNavfun()
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
+      }
+    })
+      .then((response) => {
+        if (response.data.status == 0) {
+          //Modalstopval:response.data.message,
+          this.updatafiled()
+          this.setState({
+            // Modalstype:true,
+            // Modalstopval:"删除成功",
+            ModalsBottomval: "",
+            // ModalSave:this.cancelmodel,
+            // Loadtype:true,
+            checkBoxValues: [],
+            checkAllValue: false
+          })
+          this.props.showNotification("删除成功");
+          this.props.updataleftNavfun()
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
   }
 
-  onSend= () => {
-    let selectnum= this.testonSelect();
-    if(selectnum===true){
+  onSend = () => {
+    let selectnum = this.testonSelect();
+    if (selectnum === true) {
       this.noSelect(2);
       return
     }
     this.setState({
-      sendTotype:true
+      sendTotype: true
     })
     this.refs.sendToCourseModal.setVisible(true)
 
   }
 
-  gobackonSend=(message)=>{
+  gobackonSend = (message) => {
     this.setState({
-      Modalstype:true,
-      Modalstopval:message,
-      ModalsBottomval:"",
-      ModalSave:this.cancelmodel,
-      Loadtype:true,
-      checkBoxValues:[],
-      checkAllValue:false
+      Modalstype: true,
+      Modalstopval: message,
+      ModalsBottomval: "",
+      ModalSave: this.cancelmodel,
+      Loadtype: true,
+      checkBoxValues: [],
+      checkAllValue: false
     })
   }
 
 
-  onOpen= () => {
-    let selectnum= this.testonSelect();
-    if(selectnum===true){
+  onOpen = () => {
+    let selectnum = this.testonSelect();
+    if (selectnum === true) {
       this.noSelect(3);
       return
     }
 
     this.setState({
-      Modalstype:true,
-      Modalstopval:"设为公开后，非课堂成员也可以访问查看",
-      ModalsBottomval:"是否确认设为公开？",
-      ModalCancel:this.cancelmodel,
-      ModalSave:this.saveonOpen,
+      Modalstype: true,
+      Modalstopval: "设为公开后，非课堂成员也可以访问查看",
+      ModalsBottomval: "是否确认设为公开？",
+      ModalCancel: this.cancelmodel,
+      ModalSave: this.saveonOpen,
     })
   }
 
-	saveonOpen=()=>{
+  saveonOpen = () => {
     this.setState({
-      Modalstype:false,
+      Modalstype: false,
     })
 
-    let {checkBoxValues,sort} = this.state;
+    let { checkBoxValues, sort } = this.state;
 
     const cid = this.props.match.params.coursesId;
-    let url="/files/bulk_public.json";
+    let url = "/files/bulk_public.json";
     axios.put(url, {
-      course_id:cid,
+      course_id: cid,
       ids: checkBoxValues,
     })
-        .then((response) => {
-          if (response.data.status == 0) {
-   				  this.updatafiled()
-            //:response.data.message
-            this.props.showNotification("更新成功");
-            this.setState({
-              // Modalstype:true,
-              // Modalstopval:"更新成功",
-              ModalsBottomval:"",
-              ModalSave:this.cancelmodel,
-              // Loadtype:true,
-              checkBoxValues:[],
-              checkAllValue:false
-            })
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
+      .then((response) => {
+        if (response.data.status == 0) {
+          this.updatafiled()
+          //:response.data.message
+          this.props.showNotification("更新成功");
+          this.setState({
+            // Modalstype:true,
+            // Modalstopval:"更新成功",
+            ModalsBottomval: "",
+            ModalSave: this.cancelmodel,
+            // Loadtype:true,
+            checkBoxValues: [],
+            checkAllValue: false
+          })
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
 
   }
 
-  onPressEnter = () => {
-    let {searchValue}=this.state;
-    let{pagesize,page,tagname,sort,sorttype,coursesecondcategoryid}=this.state;
-    this.getfileslist(pagesize,1,tagname,searchValue,sort,sorttype,coursesecondcategoryid);
+  onPressEnter = (value) => {
+    this.setState({
+      searchValue: value,
+      page: 1
+    })
+    let { pagesize, tagname, sort, sorttype, coursesecondcategoryid } = this.state;
+    this.getfileslist(pagesize, 1, tagname, value, sort, sorttype, coursesecondcategoryid);
   }
 
   onInputSearchChange = (e) => {
     this.setState({
-      searchValue:e.target.value
+      searchValue: e.target.value
     })
   }
 
   addDir = () => {
-    let {filesId,course_modules}=this.state;
+    let { filesId, course_modules, coursesecondcategoryid } = this.state;
+
+    //调用获取资源接口 刷新数据
     this.setState({
-			checkBoxValues:[]
-		})
-		if(parseInt(this.props.match.params.main_id)!=parseInt(this.props.coursesids)){
-			trigger('attachmentAddlog', parseInt(		course_modules&&course_modules.course_modules[0].id))
-		}else{
-			trigger('attachmentAddlog', parseInt(filesId))
-		}
+      checkBoxValues: []
+    })
+
+    if (parseInt(this.props.match.params.main_id) != parseInt(this.props.coursesids)) {
+
+      trigger('attachmentAddlog', { id: parseInt(course_modules && course_modules.course_modules[0].value), name: '资源', coursesecondcategoryid: coursesecondcategoryid })
+    } else {
+      console.log(parseInt(filesId))
+
+      trigger('attachmentAddlog', { id: parseInt(filesId), name: '资源', coursesecondcategoryid: coursesecondcategoryid })
+    }
 
   }
 
   editDir = (name) => {
-    let {filesId}=this.state;
-		this.setState({
-			checkBoxValues:[]
-		})
-    let data={id:parseInt(filesId),name:name}
+    let { filesId } = this.state;
+    this.setState({
+      checkBoxValues: []
+    })
+    let data = { id: parseInt(filesId), name: name }
     trigger('flieseditDir', data)
   }
 
   onCheckAll = (e) => {
 
-    let {files,checkBoxValues,page} =this.state;
+    let { files, checkBoxValues, page } = this.state;
 
     this.setState({
-      checkAllValue:e.target.checked,
-      selectpage:page
+      checkAllValue: e.target.checked,
+      selectpage: page
     })
     this.setState({
-      checkAllValue:e.target.checked,
-      selectpage:page
+      checkAllValue: e.target.checked,
+      selectpage: page
     })
-    let checkBoxValuess=[];
-    if(e.target.checked===true){
-      for (var list of checkBoxValues){
+    let checkBoxValuess = [];
+    if (e.target.checked === true) {
+      for (var list of checkBoxValues) {
         checkBoxValuess.push(list)
       }
-      for(var value of files){
+      for (var value of files) {
         checkBoxValuess.push(value.id)
       }
-      checkBoxValuess=[...new Set(checkBoxValuess)]
-      if(checkBoxValuess.length>15){
+      checkBoxValuess = [...new Set(checkBoxValuess)]
+      if (checkBoxValuess.length > 15) {
         this.onselectfifteen()
         return
       }
 
       this.setState({
-        checkBoxValues:checkBoxValuess
+        checkBoxValues: checkBoxValuess
       })
-    }else if(e.target.checked===false){
+    } else if (e.target.checked === false) {
       this.setState({
-        checkBoxValues:checkBoxValuess
+        checkBoxValues: checkBoxValuess
       })
     }
 
@@ -494,70 +531,72 @@ class Fileslists extends Component{
 
   onselectfifteen = () => {
     this.setState({
-      Modalstype:true,
-      Modalstopval:"选择条数不能大于15条",
-      ModalSave:this.cancelmodel,
-      Loadtype:true
+      Modalstype: true,
+      Modalstopval: "选择条数不能大于15条",
+      ModalSave: this.cancelmodel,
+      Loadtype: true
     })
   }
 
   onCheckBoxChange = (checkedValues) => {
-    let {checkBoxValues,checkAllValue,files} =this.state;
-    let type=checkAllValue
-    if(checkedValues.length<files.length){
-      type=false
-    }else if(checkedValues.length===files.length){
-      type=true
+    let { checkBoxValues, checkAllValue, files } = this.state;
+    let type = checkAllValue
+    if (checkedValues.length < files.length) {
+      type = false
+    } else if (checkedValues.length === files.length) {
+      type = true
     }
-    if(checkBoxValues.length>15||checkedValues.length>15){
+    if (checkBoxValues.length > 15 || checkedValues.length > 15) {
       this.onselectfifteen()
       return
     }
 
     this.setState({
       checkBoxValues: checkedValues,
-      checkAllValue:type
+      checkAllValue: type
     })
 
   }
 
-	onItemClick = (item) => {
-		const checkBoxValues = this.state.checkBoxValues.slice(0);
-		const index = checkBoxValues.indexOf(item.id);
-		if (index != -1) {
-			_.remove(checkBoxValues, (listItem)=> listItem === item.id)
-		} else {
-			checkBoxValues.push(item.id);
-		}
-		this.onCheckBoxChange(checkBoxValues)
-	}
-  PaginationTask=(page)=>{
+  onItemClick = (item) => {
+    const checkBoxValues = this.state.checkBoxValues.slice(0);
+    const index = checkBoxValues.indexOf(item.id);
+    if (index != -1) {
+      _.remove(checkBoxValues, (listItem) => listItem === item.id)
+    } else {
+      checkBoxValues.push(item.id);
+    }
+    this.onCheckBoxChange(checkBoxValues)
+  }
+  PaginationTask = (page) => {
+
+    let { search, order, selectpage, checkAllValue, checkBoxValues } = this.state;
+    let selectpagetype = selectpage === page && checkBoxValues.length === 15 ? true : false
+
 
-    let {search,order,selectpage,checkAllValue,checkBoxValues}=this.state;
-    let selectpagetype=selectpage===page?true:false
     this.setState({
-      page:page,
-      checkAllValue:selectpagetype,
-			checkBoxValues:[]
+      page: page,
+      checkAllValue: selectpagetype,
+      checkBoxValues: []
     })
 
-    let{pagesize,tagname,searchValue,sort,sorttype,coursesecondcategoryid}=this.state;
-    this.getfileslist(pagesize,page,tagname,searchValue,sort,sorttype,coursesecondcategoryid);
+    let { pagesize, tagname, searchValue, sort, sorttype, coursesecondcategoryid } = this.state;
+    this.getfileslist(pagesize, page, tagname, searchValue, sort, sorttype, coursesecondcategoryid);
 
   }
 
 
   //选用资源
-  addResource=()=>{
+  addResource = () => {
     this.setState({
-      shixunmodal:true,
-			checkBoxValues:[]
+      shixunmodal: true,
+      checkBoxValues: []
     })
   }
 
-  hidecouseShixunModal=()=>{
+  hidecouseShixunModal = () => {
     this.setState({
-      shixunmodal:false
+      shixunmodal: false
     })
   }
 
@@ -565,32 +604,92 @@ class Fileslists extends Component{
   sendResources = () => {
 
     this.setState({
-      Accessoryvisible:true,
-			checkBoxValues:[]
+      Accessoryvisible: true,
+      checkBoxValues: []
     })
 
   }
+  //添加外链资源设置
+  sendResourcessls = (ints, bool) => {
+    if (bool === true) {
 
-  Cancelvisible=()=>{
+      if (ints === 1) {
+        this.setState({
+          Addanexternallink: true,
+          Exterchainname: "添加外链"
+        })
+
+      } else {
+        this.setState({
+          Addanexternallink: true,
+          Exterchainname: "资源设置"
+        })
+
+      }
+
+
+    } else {
+      this.setState({
+        Addanexternallink: false,
+        title: "",
+        link: "",
+        discussMessageid: null,
+      })
+      if (ints === 1) {
+        this.Updateresourcepage();
+      }
+
+    }
+
+  }
+
+
+  Updateresourcepage = () => {
+    let { pagesize, tagname, searchValue, page, sort, sorttype, coursesecondcategoryid } = this.state;
+    this.getfileslist(pagesize, page, tagname, searchValue, sort, sorttype, coursesecondcategoryid);
+  }
+
+
+  Cancelvisible = () => {
 
     this.setState({
-      Accessoryvisible:false,
-      Settingtype:false
+      Accessoryvisible: false,
+      Settingtype: false
     })
 
   }
 
-  Settingtypes=(id)=>{
+  Settingtypes = (id) => {
     this.setState({
-      Settingtype:true,
-      discussMessageid:id
+      Settingtype: true,
+      discussMessageid: id
     })
   }
 
-  moveTos=(id)=>{
+  Settingtypess = (id, title, link) => {
 
-    let {checkBoxValues} = this.state;
-    if(checkBoxValues.length===0){
+    this.setState({
+      Addanexternallink: true,
+      Exterchainname: "资源设置",
+      discussMessageid: id,
+      title: title,
+      link: link
+    })
+  }
+
+  //判断二级链接是否显示
+  istowshow(item) {
+    let toggleon = this.state.isToggleOn;
+    this.setState({
+      istowshowid: item.value,
+      isToggleOn: !toggleon
+    })
+  }
+
+  moveTos = (id) => {
+
+    let { checkBoxValues } = this.state;
+    if (checkBoxValues.length === 0) {
       this.props.showNotification('请先在列表中选择要移动的资源')
       return
     }
@@ -598,118 +697,120 @@ class Fileslists extends Component{
     const url = `/files/bulk_move.json`
     axios.put(url, {
       course_id: cid,
-      ids:checkBoxValues,
-      to_category_id:id
+      ids: checkBoxValues,
+      to_category_id: id
     })
-        .then((response) => {
-          if (response.data.status == 0) {
-            this.setState({
-              // Modalstype:true,
-              // Modalstopval:response.data.message,
-              // ModalsBottomval:"",
-              // ModalSave:this.cancelmodel,
-              // Loadtype:true,
-              checkBoxValues:[],
-							checkAllValue:false
-            })
+      .then((response) => {
+        if (response.data.status == 0) {
+          this.setState({
+            // Modalstype:true,
+            // Modalstopval:response.data.message,
+            // ModalsBottomval:"",
+            // ModalSave:this.cancelmodel,
+            // Loadtype:true,
+            checkBoxValues: [],
+            checkAllValue: false
+          })
 
-            this.props.showNotification('资源移动成功')
-						this.props.updataleftNavfun()
-						this.updatafiled()
-          }
-        })
+          this.props.showNotification('资源移动成功')
+          this.props.updataleftNavfun()
+          this.updatafiled()
+        }
+      })
   }
 
-	homeworkstart=()=>{
-		let selectnum= this.testonSelect();
-		if(selectnum===true){
-			this.noSelect(4);
-			return
-		}
-		let starttime= this.props.getNowFormatDates(1);
-		let endtime=this.props.getNowFormatDates(2);
+  homeworkstart = () => {
+    let selectnum = this.testonSelect();
+    if (selectnum === true) {
+      this.noSelect(4);
+      return
+    }
+    let starttime = this.props.getNowFormatDates(1);
+    let endtime = this.props.getNowFormatDates(2);
 
-		this.setState({
-			modalname:"立即发布",
-			modaltype:this.state.course_groups===null||this.state.course_groups.length===0?2:1,
-			visible:true,
-			typs:"end",
-			Topval:"学生将能立即收到资源",
-			// Botvalleft:"暂不发布",
-			// Botval:`本操作只对"未发布"的分班有效`,
-			// starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
-			// starttimes:starttime,
-			// endtime:"截止时间："+endtime,
-			Cancelname:"暂不发布",
-			Savesname:"立即发布",
-			Cancel:this.homeworkhide,
-			Saves:this.homeworkstartend,
-			course_groups:this.state.course_groups,
-		})
+    this.setState({
+      modalname: "立即发布",
+      modaltype: this.state.course_groups === null || this.state.course_groups.length === 0 ? 2 : 1,
+      visible: true,
+      typs: "end",
+      Topval: "学生将能立即收到资源",
+      // Botvalleft:"暂不发布",
+      // Botval:`本操作只对"未发布"的分班有效`,
+      // starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
+      // starttimes:starttime,
+      // endtime:"截止时间："+endtime,
+      Cancelname: "暂不发布",
+      Savesname: "立即发布",
+      Cancel: this.homeworkhide,
+      Saves: this.homeworkstartend,
+      course_groups: this.state.course_groups,
+    })
 
-	}
-	// 立即发布
-	homeworkstartend=(ds,endtime)=>{
-		let {checkBoxValues}=this.state;
-		let coursesId=this.props.match.params.coursesId;
-		let url ="/files/bulk_publish.json";
-		axios.put(url, {
-			course_id:coursesId,
-			group_ids:ds,
-			ids	:checkBoxValues,
-		}).then((result)=>{
-			if(result.status===200){
-				this.props.showNotification("发布成功")
-				this.setState({
-					checkBoxValues:[],
-					checkAllValue:false
-				})
-				this.homeworkhide()
-				this.props.updataleftNavfun()
-				this.updatafiled()
-			}
-		}).catch((error)=>{
-			console.log(error);
-		})
-	}
+  }
+  // 立即发布
+  homeworkstartend = (ds, endtime) => {
+    let { checkBoxValues } = this.state;
+    let coursesId = this.props.match.params.coursesId;
+    let url = "/files/bulk_publish.json";
+    axios.put(url, {
+      course_id: coursesId,
+      group_ids: ds,
+      ids: checkBoxValues,
+    }).then((result) => {
+      if (result.status === 200) {
+        this.props.showNotification("发布成功")
+        this.setState({
+          checkBoxValues: [],
+          checkAllValue: false
+        })
+        this.homeworkhide()
+        this.props.updataleftNavfun()
+        this.updatafiled()
+      }
+    }).catch((error) => {
+      console.log(error);
+    })
+  }
 
 
-	homeworkhide=()=>{
-		this.setState({
-			modalname:undefined,
-			modaltype:undefined,
-			visible:false,
-			Topval:undefined,
-			Topvalright:undefined,
-			Botvalleft:undefined,
-			Botval:undefined,
-			starttime:undefined,
-			endtime:undefined,
-			Cancelname:undefined,
-			Savesname:undefined,
-			Cancel:undefined,
-			Saves:undefined,
-			StudentList_value:undefined,
-			addname:undefined,
-			addnametype:false,
-			addnametab:undefined,
-			typs:undefined,
-			starttimes:undefined,
-		})
-	}
+  homeworkhide = () => {
+    this.setState({
+      modalname: undefined,
+      modaltype: undefined,
+      visible: false,
+      Topval: undefined,
+      Topvalright: undefined,
+      Botvalleft: undefined,
+      Botval: undefined,
+      starttime: undefined,
+      endtime: undefined,
+      Cancelname: undefined,
+      Savesname: undefined,
+      Cancel: undefined,
+      Saves: undefined,
+      StudentList_value: undefined,
+      addname: undefined,
+      addnametype: false,
+      addnametab: undefined,
+      typs: undefined,
+      starttimes: undefined,
+    })
+  }
 
-	getcourse_groupslist=(id)=>{
-		this.setState({
-			course_groupslist:id
-		})
-	}
-  render(){
+  getcourse_groupslist = (id) => {
+    this.setState({
+      course_groupslist: id
+    })
+  }
+
+
+  render() {
     let { searchValue,
       checkBoxValues,
       checkAllValue,
       total_count,
-			publish_count,
-			unpublish_count,
+      publish_count,
+      unpublish_count,
       files,
       sorttype,
       Modalstype,
@@ -727,171 +828,198 @@ class Fileslists extends Component{
       course_modules,
       shixunmodal,
       course_is_public,
-			filesId,
-			child,
-			sort
+      filesId,
+      child,
+      sort,
+      Addanexternallink,
+      Exterchainname,
+      title,
+      link,
     } = this.state;
-    let category_id= this.props.match.params.category_id;
+    let category_id = this.props.match.params.category_id;
 
 
-		// console.log(this.state.course_groups)
-    return(
-        <React.Fragment >
+    // console.log(this.state.course_groups)
+    return (
+      <React.Fragment >
 
-					{/*立即发布*/}
-					{this.state.visible===true?<HomeworkModal
-						category_id={this.props.match.params.category_id}
-						modaltype={this.state.modaltype}
-						modalname={this.state.modalname}
-						visible={this.state.visible}
-						Topval={this.state.Topval}
-						Topvalright={this.state.Topvalright}
-						Botvalleft={this.state.Botvalleft}
-						Botval={this.state.Botval}
-						starttime={this.state.starttime}
-						starttimes={this.state.starttimes}
-						typs={this.state.typs}
-						endtime={this.state.endtime}
-						Cancelname={this.state.Cancelname}
-						Savesname={this.state.Savesname}
-						Cancel={this.state.Cancel}
-						Saves={this.state.Saves}
-						// course_groups={this.state.course_groups}
-					/>:""}
+        {/*立即发布*/}
+        {this.state.visible === true ? <HomeworkModal
+          category_id={this.props.match.params.category_id}
+          modaltype={this.state.modaltype}
+          modalname={this.state.modalname}
+          visible={this.state.visible}
+          Topval={this.state.Topval}
+          Topvalright={this.state.Topvalright}
+          Botvalleft={this.state.Botvalleft}
+          Botval={this.state.Botval}
+          starttime={this.state.starttime}
+          starttimes={this.state.starttimes}
+          typs={this.state.typs}
+          endtime={this.state.endtime}
+          Cancelname={this.state.Cancelname}
+          Savesname={this.state.Savesname}
+          Cancel={this.state.Cancel}
+          Saves={this.state.Saves}
+        // course_groups={this.state.course_groups}
+        /> : ""}
 
-          {/*发送*/}
-          <Sendtofilesmodal
-              ref="sendToCourseModal"
-              {...this.props}
-              moduleName="资源"
-              url={"/files/bulk_send.json"}
-              gobackonSend={(value)=>this.gobackonSend(value)}
-              sendTotype={sendTotype}
-              selectedMessageIds={checkBoxValues}
-              cancelmodel={()=>this.cancelmodel()}
-          ></Sendtofilesmodal>
+        {/*发送*/}
+        <Sendtofilesmodal
+          ref="sendToCourseModal"
+          {...this.props}
+          moduleName="资源"
+          url={"/files/bulk_send.json"}
+          gobackonSend={(value) => this.gobackonSend(value)}
+          sendTotype={sendTotype}
+          selectedMessageIds={checkBoxValues}
+          cancelmodel={() => this.cancelmodel()}
+        ></Sendtofilesmodal>
 
-          {/*提示*/}
-          {Modalstype&&Modalstype===true?<Modals
-              modalsType={Modalstype}
-              modalsTopval={Modalstopval}
-              modalCancel={ModalCancel}
-              modalSave={ModalSave}
-              modalsBottomval={ModalsBottomval}
-              loadtype={Loadtype}
-          />:""}
-          {
-            shixunmodal===true||Accessoryvisible===true||Settingtype===true?<style>
-              {
-                `
+        {/*提示*/}
+        {Modalstype && Modalstype === true ? <Modals
+          modalsType={Modalstype}
+          modalsTopval={Modalstopval}
+          modalCancel={ModalCancel}
+          modalSave={ModalSave}
+          modalsBottomval={ModalsBottomval}
+          loadtype={Loadtype}
+        /> : ""}
+        {
+          shixunmodal === true || Accessoryvisible === true || Settingtype === true || Addanexternallink === true ? <style>
+            {
+              `
               body {
 							  overflow: hidden !important;
 							}
               `
-              }
-            </style>:""
-          }
-          {/*选择资源*/}
-          {shixunmodal&&shixunmodal===true?<Selectresource
-              {...this.props}
-							{...this.state}
-              visible={this.state.shixunmodal}
-              shixunmodallist={this.state.shixunmodallist}
-              newshixunmodallist={this.state.newshixunmodallist}
-              coursesId={this.props.match.params.coursesId}
-              patheditarry={this.state.patheditarry}
-              coursesecondcategoryid={this.state.coursesecondcategoryid}
-              hidecouseShixunModal={this.hidecouseShixunModal}
-              setupdate={(id)=>this.seactall(id,sort)}
-              attachmentId={this.state.coursesecondcategoryid}
-          />:""}
+            }
+          </style> : ""
+        }
+        {/*选择资源*/}
+        {shixunmodal && shixunmodal === true ? <Selectresource
+          {...this.props}
+          {...this.state}
+          visible={this.state.shixunmodal}
+          shixunmodallist={this.state.shixunmodallist}
+          newshixunmodallist={this.state.newshixunmodallist}
+          coursesId={this.props.match.params.coursesId}
+          patheditarry={this.state.patheditarry}
+          coursesecondcategoryid={this.state.coursesecondcategoryid}
+          hidecouseShixunModal={this.hidecouseShixunModal}
+          setupdate={(id) => this.seactall(id, sort)}
+          attachmentId={this.state.coursesecondcategoryid}
+        /> : ""}
 
 
-          {/*上传资源*/}
-          {Accessoryvisible&&Accessoryvisible===true?<Sendresource
-              {...this.props}
-							{...this.state}
-              modalname={"上传资源"}
-              visible={Accessoryvisible}
-              Cancelname={"取消"}
-              Savesname={"确认"}
-              Cancel={this.Cancelvisible}
-              categoryid={category_id}
-              setupdate={(id)=>this.seactall(id,sort)}
-              has_course_groups={this.state.has_course_groups}
-              attachmentId={this.state.coursesecondcategoryid}
-          />:""}
- 					{/*设置资源*/}
-          {Settingtype&&Settingtype===true?<Selectsetting
-              {...this.props}
-							{...this.state}
-              Settingtype={Settingtype}
-              discussMessageid={discussMessageid}
-              course_id={this.props.match.params.coursesId}
-              setupdate={(id)=>this.seactall(id,sort)}
-              Cancel={this.Cancelvisible}
-              has_course_groups={this.state.has_course_groups}
-							attachmentId={this.state.coursesecondcategoryid}
-          />:""}
-						{child===false?"":<style>
-							{
-								`
+        {/*上传资源*/}
+        {Accessoryvisible && Accessoryvisible === true ? <Sendresource
+          {...this.props}
+          {...this.state}
+          modalname={"上传资源"}
+          visible={Accessoryvisible}
+          Cancelname={"取消"}
+          Savesname={"确认"}
+          Cancel={this.Cancelvisible}
+          categoryid={category_id}
+          setupdate={(id) => this.seactall(id, sort)}
+          has_course_groups={this.state.has_course_groups}
+          attachmentId={this.state.coursesecondcategoryid}
+        /> : ""}
+
+        {/*添加外链*/}
+        {Addanexternallink && Addanexternallink === true ? <SendResources
+          {...this.props}
+          {...this.state}
+          title={title}
+          link={link}
+          modalname={Exterchainname}
+          visible={Addanexternallink}
+          discussMessageid={discussMessageid}
+          Cancelname={"取消"}
+          Savesname={"确认"}
+          Cancel={() => this.sendResourcessls(2, false)}
+          categoryid={category_id}
+          setupdate={(ints, bool) => this.sendResourcessls(ints, bool)}
+          has_course_groups={this.state.has_course_groups}
+          course_id={this.props.match.params.coursesId}
+          attachmentId={this.state.coursesecondcategoryid}
+        /> : ""}
+        {/*设置资源*/}
+        {Settingtype && Settingtype === true ? <Selectsetting
+          {...this.props}
+          {...this.state}
+          Settingtype={Settingtype}
+          discussMessageid={discussMessageid}
+          course_id={this.props.match.params.coursesId}
+          setupdate={(id) => this.seactall(id, sort)}
+          Cancel={this.Cancelvisible}
+          has_course_groups={this.state.has_course_groups}
+          attachmentId={this.state.coursesecondcategoryid}
+        /> : ""}
+        {child === false ? "" : <style>
+          {
+            `
 								 .filesnameslist{
-										max-width: 486px;
+										max-width: 370px;
 										overflow: hidden;
 										text-overflow: ellipsis;
 										white-space: nowrap;
 								 }
 								`
-							}
-						</style>}
-            <Titlesearchsection
-                title={child===false?"全部资源":name}
-                searchValue={ searchValue }
-                // searchtype={this.props.isAdmin||this.props.isStudent ?true:false}
-                onInputSearchChange={this.onInputSearchChange}
-                allowClearonChange={this.onInputSearchChange}
-                firstRowRight={
-                  <React.Fragment>
-                    {/*{this.props.isAdmin()?parseInt(this.props.match.params.main_id)===parseInt(this.props.coursesids)?<WordsBtn style="blue" onClick={()=>this.addDir()} className={"mr30 font-16"}>新建目录</WordsBtn>:"":""}*/}
-										{this.props.isAdmin()?<WordsBtn style="blue" onClick={()=>this.addDir()} className={"mr30 font-16"}>新建目录</WordsBtn>:""}
-                    {this.props.isAdmin()?parseInt(this.props.match.params.main_id)!=parseInt(this.props.coursesids)?<WordsBtn style="blue" onClick={()=>this.editDir(name)} className={"mr30 font-16"}>目录重命名</WordsBtn>:"":""}
+          }
+        </style>}
+        <Titlesearchsection
+          title={name}
+          searchValue={searchValue}
+          // searchtype={this.props.isAdmin||this.props.isStudent ?true:false}
+          onInputSearchChange={this.onInputSearchChange}
+          allowClearonChange={this.onInputSearchChange}
+          firstRowRight={
+            <React.Fragment>
+              {/*{this.props.isAdmin()?parseInt(this.props.match.params.main_id)===parseInt(this.props.coursesids)?<WordsBtn style="blue" onClick={()=>this.addDir()} className={"mr30 font-16"}>新建目录</WordsBtn>:"":""}*/}
+              {this.props.isAdmin() ? this.state.parent_category_id === null || this.state.parent_category_id === undefined || this.state.parent_category_id === 0 ? <WordsBtn style="blue" onClick={() => this.addDir()} className={"mr30 font-16"}>新建目录</WordsBtn> : "" : ''}
+              {this.props.isAdmin() ? parseInt(this.props.match.params.main_id) != parseInt(this.props.coursesids) ? <WordsBtn style="blue" onClick={() => this.editDir(name)} className={"mr30 font-16"}>目录重命名</WordsBtn> : "" : ""}
 
-                    {this.props.isAdmin()||this.props.isStudent() ? this.props.user&&this.props.user.main_site===true? <WordsBtn style="blue" className="mr30 font-16" onClick={()=>this.addResource()}>选用资源</WordsBtn>:"":""}
-                    {this.props.isAdmin()||this.props.isStudent() ? <WordsBtn style="blue" className=" font-16" onClick={()=>this.sendResources()}>上传资源</WordsBtn>:""}
-                  </React.Fragment>
-                }
+              {this.props.isAdmin() || this.props.isStudent() ? this.props.user && this.props.user.main_site === true ? <WordsBtn style="blue" className="mr30 font-16" onClick={() => this.addResource()}>选用资源</WordsBtn> : "" : ""}
+              {this.props.isAdmin() || this.props.isStudent() ? <WordsBtn style="blue" className="mr30 font-16" onClick={() => this.sendResources()}>上传资源</WordsBtn> : ""}
+              {this.props.isAdmin() || this.props.isStudent() ? <WordsBtn style="blue" className=" font-16" onClick={() => this.sendResourcessls(1, true)}>添加外链</WordsBtn> : ""}
 
-                secondRowLeft={
-                  <div style={{"display":"inline-block", "marginTop": "22px"}}>
-                    <span>共 {total_count} 个资源</span>
-                    <span style={{"marginLeft":"16px"}}>已发布：{publish_count}个</span>
-                    <span style={{"marginLeft":"16px"}}>未发布：{unpublish_count}个</span>
-                  </div>
-                }
-                onPressEnter={this.onPressEnter}
-                searchPlaceholder={"请输入名称进行搜索"}
-                showSearchInput={true}
-            ></Titlesearchsection>
+            </React.Fragment>
+          }
 
-						{this.props.isAdmin()? files===undefined?'' :files.length===0? "":<div className="mt20 edu-back-white padding20-30" style={{display:this.props.isAdmin()||this.props.isStudent()?"":"none"}}>
-              <div className="clearfix">
-                {this.props.isAdmin()? <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个   （不支持跨页勾选）</Checkbox>:""}
-                <div className="studentList_operation_ul">
-                  {this.props.isAdmin()?<li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onDelete}>删除</a></li>:""}
-                  {this.props.isAdmin()?<li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onSend}>发送</a></li>:""}
-									{this.props.isAdmin()?
-										<li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.homeworkstart}>立即发布</a></li>
-										:""}
-                  {this.props.isAdmin()?course_is_public===true?
-                    <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onOpen}>设为公开</a></li>
-                    :"":""}
+          secondRowLeft={
+            this.props.isAdmin() ? <div style={{ "display": "inline-block", "marginTop": "22px" }}>
+              <span>共 {total_count} 个资源</span>
+              <span style={{ "marginLeft": "16px" }}>已发布：{publish_count}个</span>
+              <span style={{ "marginLeft": "16px" }}>未发布：{unpublish_count}个</span>
+            </div> : <div style={{ "display": "inline-block", "marginTop": "22px" }}>
+                <span>共 {publish_count} 个资源</span>
+              </div>
+          }
+          onPressEnter={this.onPressEnter}
+          searchPlaceholder={"请输入名称进行搜索"}
+          showSearchInput={true}
+        ></Titlesearchsection>
 
-                  {this.props.isAdmin()?<li className="li_line drop_down">
-                    移动到...<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+        {this.props.isAdmin() ? files === undefined ? '' : files.length === 0 ? "" : <div className="mt20 edu-back-white padding20-30" style={{ display: this.props.isAdmin() || this.props.isStudent() ? "" : "none" }}>
+          <div className="clearfix">
+            {this.props.isAdmin() ? <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个   （不支持跨页勾选）</Checkbox> : ""}
+            <div className="studentList_operation_ul">
+              {this.props.isAdmin() ? <li className="li_line"><a className="color-grey-9" onClick={this.onDelete}>删除</a></li> : ""}
+              {this.props.isAdmin() ? <li className="li_line"><a className="color-grey-9" onClick={this.onSend}>发送</a></li> : ""}
+              {this.props.isAdmin() ?
+                <li className="li_line"><a className="color-grey-9" onClick={this.homeworkstart}>立即发布</a></li>
+                : ""}
+              {this.props.isAdmin() ? course_is_public === true ?
+                <li className="li_line"><a className="color-grey-9" onClick={this.onOpen}>设为公开</a></li>
+                : "" : ""}
 
-                    <style>
-                      { `
+              {this.props.isAdmin() ? <li className="li_line drop_down">
+                移动到目录<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+
+                <style>
+                  {`
                   .drop_down_menu{
                     max-height:350px;
                     overflow-y: auto;
@@ -900,76 +1028,102 @@ class Fileslists extends Component{
 									 .courseSecond{
 								    margin-left: 10px;
     								padding: 10px;
-									 }
+                   }
+                  
                   `}
-                    </style>
-                    <ul className="drop_down_menu" style={{"right":"0px","left":"unset","min-width":'150px'}}>
-											{this.state.course_second_categories.length>10? <p className="drop_down_search">
-                        <Input placeholder="搜索" value={this.state.dirSearchValue} onChange={(e) => {this.setState({dirSearchValue: e.target.value})}}/>
-                      </p>:""}
+                </style>
+                <ul className="drop_down_menu" style={{ "right": "0px", "left": "unset", "min-width": '200px' }}>
+                  {/* <p style={{marginLeft:15,color:"#000000",fontSize:20}}>资源</p>  */}
+                  {this.state.course_second_categories && this.state.course_second_categories.length > 10 ? <p className="drop_down_search">
+                    <Input placeholder="搜索" value={this.state.dirSearchValue} onChange={(e) => { this.setState({ dirSearchValue: e.target.value }) }} />
+                  </p> : ""}
 
-                      {course_modules&&course_modules.course_modules.map((item,key)=>{
-                        return(
-													filesId&&filesId===item.id?"":<li key={key} id={item.id} onClick={() => this.moveTos(0)} title={item.module_name}>{item.module_name}</li>
-                        )
-                      })}
+                  {course_modules && course_modules.course_modules.map((item, key) => {
+                    return (
+                      <div style={{ display: 'inline-block', marginTop: 10, height: 20 }}>
+                        <li key={key} style={{ paddingTop: 5 }} id={item.value} onClick={() => this.moveTos(0)} title={item.title}>{item.title}</li>
+                      </div>
+                    )
+                  })}
 
-                      { course_modules&&course_modules.course_modules.map( (item,key) => {
+                  {course_modules && course_modules.course_modules.map((item, key) => {
 
-                        return   item.course_second_categories.filter((item)=> {
-                          return (!this.state.dirSearchValue || item.name.indexOf(this.state.dirSearchValue) != -1)
-                        }).map((itm,k)=>{
-                          return(
-														filesId&&filesId===itm.id?"":<li key={k} id={itm.id} onClick={() => this.moveTos(itm.id )} title={itm.name}>{itm.name}</li>
-                          )
-                        })
-                      })}
-											{this.state.course_second_categories.length===0?
-												<div className={"courseSecond"}>暂无数据</div>:""}
+                    return item.children && item.children.filter((item) => {
+                      return (!this.state.dirSearchValue || item.title.indexOf(this.state.dirSearchValue) != -1)
+                    }).map((itm, k) => {
+                      return (
+                        <div >
+                          <div style={{ display: 'inline-block', marginTop: 10, height: 20 }}>
+                            <li style={{ width: 200, paddingTop: 5 }} key={key} id={itm.value} onClick={() => this.moveTos(itm.value)} title={itm.title}>{itm.title}</li>
 
-                      {/*{course_modules&&course_modules.course_modules.map((item,key)=>{*/}
-                        {/*return(*/}
-                            {/*item.course_second_categories.map((itm,k)=>{*/}
-                              {/*return(*/}
-                                  {/*<li key={k} id={itm.id} onClick={() => this.moveTos(itm.id )}>{itm.name}</li>*/}
-                              {/*)*/}
-                            {/*})*/}
-                        {/*)*/}
-                      {/*})}*/}
-                      {this.props.isAdmin()?parseInt(this.props.match.params.main_id)===filesId&&filesId?
-                        <p className="drop_down_btn">
+                            {/* <div onClick={() => this.moveTos(itm.value )} style={{marginLeft:15,width:itm.title.length>13?200:undefined,color:'#000000',overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{itm.title}</div> */}
+                            {itm.children.length === 0 ? '' : <i style={{ marginLeft: 15, marginRight: 15 }} onClick={() => this.istowshow(itm, filesId)} className="iconfont icon-xiajiantou font-12 ml2"></i>}
+                          </div>
+
+                          {this.state.istowshowid === itm.value ?
+                            itm.children.map((tt, ti) => {
+                              return (
+                                filesId && filesId === itm.id ? "" :
+                                  <div style={{ marginTop: 10, height: 20, display: this.state.isToggleOn ? 'block' : 'none' }}>
+                                    <div style={{ display: ti === 0 ? 'block' : 'none', marginLeft: 15, width: 235, marginRight: 15, height: 1, background: '#EEEEEE' }}></div>
+
+                                    <li style={{ marginTop: 5, paddingTop: 5, marginBottom: 5, paddingLeft: 30, width: tt.title.length > 13 ? 200 : undefined, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }} key={ti} id={tt.value} onClick={() => this.moveTos(tt.value)} title={tt.title}>{tt.title}</li>
+
+                                  </div>
+
+                              )
+                            })
+                            : ''}
+                        </div>
+                      )
+                    })
+                  })}
+                  {this.state.course_second_categories.length === 0 ?
+                    <div className={"courseSecond"}>暂无数据</div> : ""}
+
+                  {/*{course_modules&&course_modules.course_modules.map((item,key)=>{*/}
+                  {/*return(*/}
+                  {/*item.course_second_categories.map((itm,k)=>{*/}
+                  {/*return(*/}
+                  {/*<li key={k} id={itm.id} onClick={() => this.moveTos(itm.id )}>{itm.name}</li>*/}
+                  {/*)*/}
+                  {/*})*/}
+                  {/*)*/}
+                  {/*})}*/}
+                  {/* {this.props.isAdmin()?parseInt(this.props.match.params.main_id)===filesId&&filesId?
+                        <p  style={{marginLeft:15}}>
                           <a className="color-grey-6" onClick={()=>this.addDir()}>新建目录</a>
                         </p>
-                        :"":""}
-                    </ul>
+                        :"":""} */}
+                </ul>
 
 
 
-                  </li>:""}
-									<style>
-										{
-											`
+              </li> : ""}
+              <style>
+                {
+                  `
 											 .fiilssort{
 											     position: absolute;
     											 top: -10px;
 											 }
 											`
-										}
-									</style>
-                  {this.props.isAdmin()||this.props.isStudent()? <li className="drop_down" onClick={() => this.onSortTypeChange('created_on')}>
-										更新时间
-										<sapn className="relativef ml5"style={{"top":"2px"}} >
-											<i className={sort==="asc"?
-												"iconfont icon-sanjiaoxing-up font-12  color-blue fiilssort" :"iconfont icon-sanjiaoxing-up font-12 fiilssort"}></i>
-											<i className={sort==="desc"?
-												"iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue":"iconfont icon-sanjiaoxing-down font-12 yslbottomsj"}></i>
-										</sapn>
-                  </li>:""}
-                </div>
-              </div>
-            </div> :""}
+                }
+              </style>
+              {this.props.isAdmin() || this.props.isStudent() ? <li className="drop_down" onClick={() => this.onSortTypeChange('created_on')}>
+                更新时间
+										<sapn className="relativef ml5" style={{ "top": "2px" }} >
+                  <i className={sort === "asc" ?
+                    "iconfont icon-sanjiaoxing-up font-12  color-blue fiilssort" : "iconfont icon-sanjiaoxing-up font-12 fiilssort"}></i>
+                  <i className={sort === "desc" ?
+                    "iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue" : "iconfont icon-sanjiaoxing-down font-12 yslbottomsj"}></i>
+                </sapn>
+              </li> : ""}
+            </div>
+          </div>
+        </div> : ""}
 
-            <style>{`
+        <style>{`
           .padding02010{
               padding: 10px 30px 0px 30px;
               cursor: pointer;
@@ -984,81 +1138,81 @@ class Fileslists extends Component{
               border-radius: 2px;
           }
         `}</style>
-            <Spin size="large" spinning={this.state.isSpin}>
-            <div className="clearfix stu_table">
-              <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
-                { files&&files.map((item, index) => {
+        <Spin size="large" spinning={this.state.isSpin}>
+          <div className="clearfix stu_table">
+            <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
+              {files && files.map((item, index) => {
 
-                  return (
-                      <div className="mt20 edu-back-white padding02010" key={index} onClick={()=>this.onItemClick(item)}>
-                        <div className="clearfix">
-                          <div key={index}>
-                            <Fileslistitem
-                                {...this.props}
-																{...this.state}
-                                discussMessage={item}
-                                isAdmin={this.props.isAdmin()}
-                                isStudent={this.props.isStudent()}
-                                isNotMember={this.props.isNotMember()}
-                                checkBox={this.props.isAdmin()?<Checkbox value={item.id} key={item.id}></Checkbox>:""}
-                                Settingtypes={(id)=>this.Settingtypes(id)}
-                                coursesId={this.props.match.params.coursesId}
-                                updatafiledfun={()=>this.updatafiled()}
-                                index={index}
-                            ></Fileslistitem>
-                          </div>
-                        </div>
+                return (
+                  <div className="mt20 edu-back-white padding02010" key={index} onClick={() => this.onItemClick(item)}>
+                    <div className="clearfix">
+                      <div key={index}>
+                        <Fileslistitem
+                          {...this.props}
+                          {...this.state}
+                          discussMessage={item}
+                          Updateresourcepage={() => this.Updateresourcepage()}
+                          isAdmin={this.props.isAdmin()}
+                          isStudent={this.props.isStudent()}
+                          isNotMember={this.props.isNotMember()}
+                          checkBox={this.props.isAdmin() ? <Checkbox value={item.id} key={item.id}></Checkbox> : ""}
+                          Settingtypes={(id) => this.Settingtypes(id)}
+                          Settingtypess={(id, t, l) => this.Settingtypess(id, t, l)}
+                          coursesId={this.props.match.params.coursesId}
+                          updatafiledfun={() => this.updatafiled()}
+                          index={index}
+                        ></Fileslistitem>
                       </div>
-                  )
-                })
-                }
-              </Checkbox.Group>
-            </div>
-            </Spin>
-            <style>
-              {
-                `
+                    </div>
+                  </div>
+                )
+              })
+              }
+            </Checkbox.Group>
+          </div>
+        </Spin>
+        <style>
+          {
+            `
                 .padding20-20{
                    padding:20px;
                 }
                 `
-              }
-            </style>
-            <div className="edu-txt-center padding20-20"
-                 style={
-                   {
-                     display: total_count===undefined?'none':total_count< 15 ? 'none' : 'block'
-                   }
-                 }
-            >
-
-              {this.props.isAdmin()||this.props.isStudent() ? files&&files.length>0?<Pagination
-                  showQuickJumper
-                  defaultCurrent={1}
-                  pageSize={15}
-                  total={total_count}
-                  current={page}
-                  onChange={this.PaginationTask}
-              />:"":""}
+          }
+        </style>
+        {
+          total_count && total_count > 15 ?
+            <div className="edu-txt-center padding20-20">
+              <Pagination
+                showQuickJumper
+                defaultCurrent={1}
+                pageSize={15}
+                total={total_count}
+                current={page}
+                onChange={this.PaginationTask}
+              />
             </div>
+            : ""
+        }
 
-					{
-						files===undefined?'' :files.length===0?<NoneData></NoneData>:""
-					}
-          </React.Fragment>
+
+        {
+          files === undefined ? '' : files.length === 0 ? <NoneData></NoneData> : ""
+        }
+      </React.Fragment>
     )
   }
 }
 export default Fileslists;
 
-{/*<div className="alltask"*/}
-		 {/*style={*/}
-			 {/*{*/}
-				 {/*display: files===undefined?'none' :files.length===0? 'block' : 'none'*/}
-			 {/*}*/}
-		 {/*}*/}
-{/*>*/}
-	{/*<div className="edu-tab-con-box clearfix edu-txt-center">*/}
-		{/*<img className="edu-nodata-img mb20"  src="/images/educoder/nodata.png" />*/}
-		{/*<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>*/}
-{/*</div>*/}
+{/*<div className="alltask"*/ }
+{/*style={*/ }
+{/*{*/ }
+{/*display: files===undefined?'none' :files.length===0? 'block' : 'none'*/ }
+{/*}*/ }
+{/*}*/ }
+{/*>*/ }
+{/*<div className="edu-tab-con-box clearfix edu-txt-center">*/ }
+{/*<img className="edu-nodata-img mb20"  src="/images/educoder/nodata.png" />*/ }
+{/*<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>*/ }
+{/*</div>*/ }
diff --git a/src/modules/courses/Resource/style.css b/src/modules/courses/Resource/style.css
index e69de29b..eb1c2fc5 100644
--- a/src/modules/courses/Resource/style.css
+++ b/src/modules/courses/Resource/style.css
@@ -0,0 +1,7 @@
+
+  .indexdiv {
+    background:#ffffff;
+  }
+  .indexdiv:hover {
+    background:#ccc;
+  }
\ No newline at end of file
diff --git a/src/modules/courses/Video/Live.js b/src/modules/courses/Video/Live.js
index d869922f..a7b7f689 100644
--- a/src/modules/courses/Video/Live.js
+++ b/src/modules/courses/Video/Live.js
@@ -9,6 +9,7 @@ import bilibili from './images/bilibili.png';
 import tencent from './images/tencent.png';
 import WeiBaiTong from './images/WeiBaiTong.png';
 import douyu from './images/douyu.jpg';
+import zoom from './images/zoom.png';
 class Live extends Component{
 
    render(){
@@ -16,32 +17,65 @@ class Live extends Component{
 
       return(
        <div className="livePanel">
+				 <style>
+					 {
+					 	`
+					 	.verticallayout{
+						display: flex;
+						 flex-direction:column;
+						}
+						
+						.myspacearound{
+						display: flex;
+						justify-content: space-around;
+						}
+						.mr0{
+						margin-right: 0px !important;
+						}
+						.mr5{
+						margin-right: 5px !important;
+						}
+						.ml0{
+						margin-left: 0px !important;
+						}
+					 	`
+					 }
+				 </style>
           <p className="mt30 mb10 color-grey-9 pl10">EduCoder支持所有第三方直播平台，特别推荐：</p>
-          <ul className="platform">
-            <li>
+          <ul className="platform myspacearound">
+            <li className="verticallayout mr0">
               <a href="https://ke.qq.com/act/speed_pc/index.html?from=800021837" target="_blank"><img alt="" src={tencent} className="mr8" width="28px"/>
               <label className="color-grey-3 pointer">腾讯课堂</label>
               </a>
-              <a href="https://pub.idqqimg.com/pc/misc/files/20200204/2e4cb765bef54f0c919c0ab8ab79d969.pdf" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://pub.idqqimg.com/pc/misc/files/20200204/2e4cb765bef54f0c919c0ab8ab79d969.pdf" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
-            <li>
+            <li className="verticallayout mr0">
               <a href="https://live.bilibili.com/liveHime?visit_id=a81rbm7v2kk0" target="_blank"><img alt="" src={bilibili} className="mr8" width="52px"/>
               <label className="color-grey-3 pointer">哔哩哔哩</label>
               </a>
-              <a href="https://www.bilibili.com/blackboard/live/broadcast-intro.html#/" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://www.bilibili.com/blackboard/live/broadcast-intro.html#/" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
-            <li>
+            <li className="verticallayout mr0">
               <a href="https://www.douyu.com/" target="_blank"><img alt="" src={douyu} className="mr8" width="28px"/>
               <label className="color-grey-3 pointer">斗鱼</label>
               </a>
-              <a href="https://www.douyu.com/special/guide/anchor" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://www.douyu.com/special/guide/anchor" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
-            <li>
-              <div><img alt="" src={WeiBaiTong} className="mr8" width="28px"/>
+            <li className="verticallayout mr0">
+              <div>
+								<img alt="" src={WeiBaiTong} className="mr8" width="28px"/>
                 <label className="color-grey-3">威佰通</label>
               </div>
-              <a href="https://www.educoder.net/forums/3734" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://www.educoder.net/forums/3734" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
+						<li className="verticallayout mr0">
+							<a href="https://zoom.com.cn/download" target="_blank"><img alt="" src={zoom} className="mr8" width="63px"/>
+								<label className="color-grey-3" style={{
+									cursor:"pointer"
+								}}>zoom</label>
+							</a>
+							<a href="https://support.zoom.us/hc/zh-cn/articles/201362033-Windows%E5%92%8CMAC%E5%85%A5%E9%97%A8%E6%8C%87%E5%8D%97" target="_blank" className="color-blue ml0">(简明手册)</a>
+						</li>
           </ul>
           {
             lives && lives.length > 0 ?
@@ -79,4 +113,4 @@ class Live extends Component{
      )
    }
 }
-export default Live;
\ No newline at end of file
+export default Live;
diff --git a/src/modules/courses/Video/LiveItem.js b/src/modules/courses/Video/LiveItem.js
index 913235ef..892028e0 100644
--- a/src/modules/courses/Video/LiveItem.js
+++ b/src/modules/courses/Video/LiveItem.js
@@ -24,7 +24,7 @@ class LiveItem extends Component{
       visible:false
     }
   }
-  
+
   deleteLive=(id)=>{
     this.props.confirm({
       content: '是否确认删除?',
@@ -62,8 +62,9 @@ class LiveItem extends Component{
     const { key, item , setLiveId } = this.props;
     const {   visible } = this.state;
 
-    const wei_flag = item.platform && (item.platform === "威佰通");
-    console.log(wei_flag && item.url);
+    const wei_flag = item.platform && (item.platform === "威佰通"||item.platform === "zoom");
+    let platform=item&&item.platform?item.platform:"威佰通";
+		console.log(wei_flag && item.url);
     return(
       <div className="liveItem" key={key}>
         <Modal
@@ -78,7 +79,7 @@ class LiveItem extends Component{
             wei_flag && item.url ?
             <React.Fragment>
               <div className="task-popup-content edu-txt-center">
-                <p className="font-16">打开威佰通客户端，输入会议号即可进入直播</p>
+                <p className="font-16">打开{platform}客户端，输入会议号即可进入直播</p>
                 <div className="wei_meet">
                   <p className="wei_meet_info">
                     <span>会议号：</span>
@@ -136,7 +137,7 @@ class LiveItem extends Component{
                 item.url ?
                 <React.Fragment>
                   {
-                    wei_flag ? 
+                    wei_flag ?
                       <a className="btns going" onClick={this.alertInfo}>进入</a>
                     :
                       <a className="btns going" target="_blank" href={`${item.url}`}>进入</a>
@@ -154,24 +155,24 @@ class LiveItem extends Component{
           <span className="lineMiddle color-grey-9">
             <img alt={`${item.author_name}`} className="liveAuthor" src={getImageUrl(`images/${item.author_img}`)}/>
             <label className="mr50">{item.author_name}</label>
-            { item.platform && <span className="mr50">直播平台：{item.platform}</span>   }      
-            { item.live_time && <span className="mr50">开播时间：{item.live_time}</span>}   
+            { item.platform && <span className="mr50">直播平台：{item.platform}</span>   }
+            { item.live_time && <span className="mr50">开播时间：{item.live_time}</span>}
             { item.duration && <span className="mr50">直播预计时长：{item.duration}分钟</span> }
           </span>
-              <span>
-                {
-                  item.op_auth ?
-                  <WordsBtn style="grey" onClick={()=>setLiveId(item.id)}>编辑</WordsBtn>:""
-                }
-                {
-                  item.delete_auth ? 
-                  <WordsBtn style="grey" className="ml30" onClick={()=>this.deleteLive(item.id)}>删除</WordsBtn>
-                  :""
-                }
-              </span>
-          </p>
+          <span className="edu-txt-right" style={{width:"120px"}}>
+            {
+              item.op_auth ?
+              <WordsBtn style="grey" onClick={()=>setLiveId(item.id)}>编辑</WordsBtn>:""
+            }
+            {
+              item.delete_auth ?
+              <WordsBtn style="grey" className="ml30" onClick={()=>this.deleteLive(item.id)}>删除</WordsBtn>
+              :""
+            }
+          </span>
+        </p>
       </div>
     )
   }
 }
-export default LiveItem;
\ No newline at end of file
+export default LiveItem;
diff --git a/src/modules/courses/Video/LiveNew.js b/src/modules/courses/Video/LiveNew.js
index dc113b80..1fba31f9 100644
--- a/src/modules/courses/Video/LiveNew.js
+++ b/src/modules/courses/Video/LiveNew.js
@@ -9,7 +9,7 @@ import axios from 'axios';
 
 const { TextArea } = Input;
 const { Option  } = Select;
-const array=['腾讯课堂','B站','斗鱼','威佰通'];
+const array=['腾讯课堂','斗鱼直播','Bilibili','威佰通','zoom'];
 
 function range(start, end) {
   const result = [];
@@ -68,7 +68,7 @@ class LiveNew extends Component{
           })
           this.setState({
             beginTime:result.data.live_time && moment(result.data.live_time,"YYYY-MM-DD HH:mm"),
-            wei_flag:result.data.platform && result.data.platform === "威佰通"
+            wei_flag:result.data.platform && (result.data.platform === "威佰通"||result.data.platform === "zoom")
           })
         }
       })
@@ -181,7 +181,7 @@ class LiveNew extends Component{
   }
 
   ChangePlatform=(e)=>{
-    if(e === "威佰通"){
+    if(e === "威佰通"||e==="zoom"){
       this.setState({
         wei_flag:true
       })
@@ -212,6 +212,19 @@ class LiveNew extends Component{
         className="liveModal"
       >
         <Spin spinning={isSpining}>
+          <style>
+            {`
+              .ant-select-dropdown-menu-item{
+                text-align:center;
+                padding: 10px 0px;
+                border-bottom: 1px solid #eee;
+              }
+              .ant-select-dropdown-menu-item:last-child{
+                border-bottom:none;
+              }
+              `
+            }
+          </style>
           <div className="task-popup-content">
             <Form onSubmit={this.handleSubmit}>
               <Form.Item label={`直播课程`}>
@@ -229,6 +242,7 @@ class LiveNew extends Component{
                     placeholder="请选择或输入直播平台名称"
                     onChange={this.ChangePlatform}
                     dataSource={dataSource}
+                    className="plateAutoComplete"
                     >
                     </AutoComplete>
                 )}
@@ -276,7 +290,7 @@ class LiveNew extends Component{
                   <TextArea rows={4} placeholder="可在此介绍开播具体事项，如开播时间安排等。" />
                 )}
               </Form.Item>
-              
+
             </Form>
             <div className="clearfix mt30 edu-txt-center">
               <a onClick={this.cancelNew} className="task-btn mr30">取消</a>
@@ -289,4 +303,4 @@ class LiveNew extends Component{
   }
 }
 const WrappedLiveNew = Form.create({name: 'LiveNew'})(LiveNew);
-export default WrappedLiveNew;
\ No newline at end of file
+export default WrappedLiveNew;
diff --git a/src/modules/courses/Video/MoveBox.js b/src/modules/courses/Video/MoveBox.js
new file mode 100644
index 00000000..bb68eff7
--- /dev/null
+++ b/src/modules/courses/Video/MoveBox.js
@@ -0,0 +1,137 @@
+import React,{ Component } from "react";
+import { Radio , Modal } from 'antd';
+import './video.css';
+import axios from 'axios';
+class MoveBox extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      data:undefined,
+      selectSubId:undefined
+    }
+  }
+
+  componentDidUpdate=(prevProps)=>{
+    if(this.props.id && this.props.visible && this.props.id !== prevProps.id){
+      this.getSubList(this.props.mainId);
+    }
+  }
+
+  getSubList=(id)=>{
+    const url = `/course_modules/${id}.json`;
+    axios.get(url).then(result=>{
+      if(result){
+        let list = result.data.course_module && result.data.course_module.course_second_categories;
+        let defaultId = list.length>0 ? list[0].id : undefined;
+        this.setState({
+          data:result.data.course_module,
+          selectSubId:defaultId
+        })
+      }
+    }).catch(error=>{
+      console.log(error);
+    })
+  }
+  cancelMove=()=>{
+    const { setMoveVisible } = this.props;
+    setMoveVisible && setMoveVisible(false);
+  }
+
+  // 选择子目录
+  selectSub=(e)=>{
+    this.setState({
+      selectSubId:e.target.value
+    })
+  }
+
+  handleSubmit=()=>{
+    const CourseId = this.props.match.params.coursesId;
+    const { id } = this.props;
+    const { selectSubId } = this.state;
+    const url =  `/courses/${CourseId}/move_to_category.json`;
+    axios.post(url,{
+      video_ids:[id],
+      new_category_id:selectSubId
+    }).then(result=>{
+
+      if(result){
+
+        const { setMoveVisible , successFunc , updataleftNavfun} = this.props;
+        updataleftNavfun && updataleftNavfun();
+        setMoveVisible && setMoveVisible(false);
+        successFunc && successFunc();
+
+	      try {
+					this.props.showNotification(result.data.message);
+				}catch (e) {
+
+				}
+
+			}
+    }).catch(error=>{
+      console.log(error);
+    })
+  }
+
+  render(){
+    const { visible , id } = this.props;
+    const { data , selectSubId } = this.state;
+
+    let list = data && data.course_second_categories && data.course_second_categories.length>0?data.course_second_categories:undefined;
+
+    return(
+      <Modal
+        visible={visible}
+        width="560px"
+        title={'移动到'}
+        footer={null}
+        closable={false}
+      >
+        <div>
+          <style>
+            {
+              `
+                .ant-radio-group.ant-radio-group-outline{
+                  display: flex;
+                  flex-direction: column;
+                }
+                .ant-radio-wrapper{
+                  margin-bottom:5px;
+                  display:flex;
+                }
+                .ant-radio{
+                  margin-top:2px;
+                }
+                .ant-radio-group.ant-radio-group-outline span:last-child{
+                  max-height: 450px;
+                  display: block;
+                  flex: 1;
+                  overflow: hidden;
+                  white-space: nowrap;
+                  text-overflow: ellipsis;
+
+                }
+              `
+            }
+          </style>
+          <Radio.Group onChange={this.selectSub} value={selectSubId}>
+            {
+              list && list.map((item,key)=>{
+                return(
+                  <Radio value={item.id} key={item.id}>
+                    {item.name}
+                  </Radio>
+                )
+              })
+            }
+          </Radio.Group>
+          <div className="clearfix mt30 edu-txt-center">
+            <a onClick={this.cancelMove} className="task-btn mr30">取消</a>
+            <a type="submit" onClick={this.handleSubmit} className="task-btn task-btn-orange">确定</a>
+          </div>
+        </div>
+      </Modal>
+    )
+  }
+}
+export default MoveBox;
diff --git a/src/modules/courses/Video/Video.js b/src/modules/courses/Video/Video.js
index 188a0cfe..76b31699 100644
--- a/src/modules/courses/Video/Video.js
+++ b/src/modules/courses/Video/Video.js
@@ -1,95 +1,103 @@
-import React,{ Component } from "react";
-import { Input , Pagination } from 'antd';
-import { NoneData ,ActionBtn } from 'educoder';
+import React, { Component } from "react";
+import { Input, Pagination } from 'antd';
+import { NoneData, ActionBtn } from 'educoder';
 
 import VideoUploadList from '../../user/usersInfo/video/VideoUploadList';
 import VideoInReviewItem from '../../user/usersInfo/video/VideoInReviewItem';
 import HeadlessModal from '../../user/usersInfo/common/HeadlessModal';
-import EditVideoModal from '../../user/usersInfo/video/EditVideoModal'
+import EditVideoModal from '../../user/usersInfo/video/EditVideoModal';
+import MoveBox from './MoveBox';
 import ClipboardJS from 'clipboard'
+import VideoPanel from './video-play'
 
 import './video.css';
 import '../../user/usersInfo/video/InfosVideo.css'
 import axios from 'axios';
+import { logWatchHistory } from "../../../services/video-service";
+import { Base64 } from 'js-base64';
 
 const DEFAULT_VIDEO_WIDTH_IN_MD = "90%" // 400
 const DEFAULT_VIDEO_HEIGHT_IN_MD = "55%" // 400
 
-const videoEl = null;
 let _clipboard = null;
 
-class Video extends Component{
-  constructor(props){
+class Video extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      videos:undefined,
-      count:0,
-      page:1,
+    this.state = {
+      videos: undefined,
+      count: 0,
+      page: 1,
 
-      videoId:undefined,
-      videoVisible:false,
-      visible:false
+      videoId: undefined,
+      videoVisible: false,
+      visible: false,
+
+      moveVisible: false,
+      moveVideoId: undefined,
+      videourl:null
     }
   }
 
   // 编辑的弹框visible
-  setVisible=(flag)=>{
+  setVisible = (flag) => {
     this.setState({
-      visible:flag
+      visible: flag
     })
   }
 
-  setVideoVisible=(flag)=>{
+  setVideoVisible = (flag) => {
 
     this.setState({
-      videoVisible:flag
+      videoVisible: flag
     })
     if (flag === false) {
       if (_clipboard) {
         this.setState({
-          videoId:undefined
+          videoId: undefined
         })
         _clipboard.listener.destroy();
         _clipboard = null;
       }
     } else {
-        // videoEl.current && videoEl.current.play()
+      // videoEl.current && videoEl.current.play()
 
-        setTimeout(() => {
-            if (!_clipboard) {
-                _clipboard = new ClipboardJS('.copybtn');
-                _clipboard.on('success', (e) => {
-                    this.props.showNotification('复制成功');
-                });
-            }
-        }, 200)
+      setTimeout(() => {
+        if (!_clipboard) {
+          _clipboard = new ClipboardJS('.copybtn');
+          _clipboard.on('success', (e) => {
+            
+            this.props.showNotification('复制成功');
+          });
+        }
+      }, 200)
     }
   }
-  
 
   // 编辑成功后回调的方法
-  editSuccess=()=>{
-    this.props.showNotification("视频名称修改成功!");
-    const { listFunc , page } = this.props;
+  editSuccess = () => {
+    this.props.showNotification("视频信息修改成功!");
+    const { listFunc, page } = this.props;
     listFunc && listFunc(page);
   }
 
-  onEditVideo=(item)=>{
-    let videoId = {
-          videoId: item.id,
-          title: item.title
-      }
-      this.setState({
-        videoId,
-      })
-      this.setVisible(true);
-  }
-
-  onMaskClick=(item)=> {
+  onEditVideo = (item) => {
     let videoId = {
       videoId: item.id,
       title: item.title,
-      file_url: item.file_url,
+      link: item.link
+    }
+    this.setState({
+      videoId,
+    })
+    this.setVisible(true);
+  }
+
+  onMaskClick = (item) => {
+    let videoId = {
+      videoId: item.id,
+      title: item.title,
+      file_url: (item.play_url || item.file_url),
       cover_url: item.cover_url
     }
     this.setState({
@@ -99,59 +107,62 @@ class Video extends Component{
   }
 
 
-  setVideoVisible=(flag)=>{
-
+  setVideoVisible = (flag) => {
     this.setState({
-      videoVisible:flag
+      videoVisible: flag
     })
     if (flag === false) {
+      
       if (_clipboard) {
         this.setState({
-          videoId:undefined
+          videoId: undefined
         })
         _clipboard.listener.destroy();
         _clipboard = null;
       }
     } else {
-        // videoEl.current && videoEl.current.play()
+      setTimeout(() => {
+          this.setState({
+            videourl:'12321'
+          })
+        if (!_clipboard) {
+          _clipboard = new ClipboardJS('.copybtn');
 
-        setTimeout(() => {
-            if (!_clipboard) {
-                _clipboard = new ClipboardJS('.copybtn');
-                _clipboard.on('success', (e) => {
-                    this.props.showNotification('复制成功');
-                });
-            }
-        }, 200)
+          _clipboard.on('success', (e) => {
+            this.props.showNotification('复制成功');
+          });
+        }
+      }, 200)
     }
 
   }
 
-  getCopyText = (file_url, cover_url)=>{
-    return `<video src="${file_url}" controls="true" controlslist="nodownload" width="${DEFAULT_VIDEO_WIDTH_IN_MD}" height="${DEFAULT_VIDEO_HEIGHT_IN_MD}" poster="${cover_url}">您的浏览器不支持 video 标签。</video>`
+  getCopyText = (file_url, cover_url) => {
+    return `<video src="${file_url && Base64.decode(file_url)}" controls="true" controlslist="nodownload" width="${DEFAULT_VIDEO_WIDTH_IN_MD}" height="${DEFAULT_VIDEO_HEIGHT_IN_MD}" poster="${cover_url}">您的浏览器不支持 video 标签。</video>`
   }
 
   // 删除事件
-  deleteVideo=(item)=>{
+  deleteVideo = (item) => {
     this.props.confirm({
       content: '该视频将被删除，不可恢复',
-      subContent:'是否确认删除?',
+      subContent: '是否确认删除?',
 
       onOk: () => {
-        const CourseId=this.props.match.params.coursesId;
+        const CourseId = this.props.match.params.coursesId;
         const url = `/courses/${CourseId}/delete_course_video.json`;
-        axios.delete(url,{
-          params:{
-            video_id:item.id
+        axios.delete(url, {
+          params: {
+            video_id: item.id,
+            is_link: item.link ? true : undefined
           }
-        }).then(result=>{
-          if(result){
+        }).then(result => {
+          if (result) {
             this.props.showNotification(`删除成功!`);
             this.props.updataleftNavfun();
-            const { listFunc , page } = this.props;
+            const { listFunc, page } = this.props;
             listFunc && listFunc(page);
           }
-        }).catch(error=>{
+        }).catch(error => {
           console.log(error);
         })
       },
@@ -161,94 +172,138 @@ class Video extends Component{
     });
   }
 
-  render(){
-    const { visible , videoVisible , videoId } = this.state;
-    const CourseId=this.props.match.params.coursesId;
-    const login=this.props.user&&this.props.user.login;
+  // 移动到
+  moveVideo = (id, flag) => {
+    if (!flag) {
+      this.setState({
+        moveVisible: true,
+        moveVideoId: id
+      })
+    } else {
+      this.props.define({
+        title: '提示',
+        content: "您不是课堂管理员或者视频发布者，暂不能移动视频。",
+      })
+    }
+  }
+  setMoveVisible = (flag) => {
+    this.setState({
+      moveVisible: flag,
+      moveVideoId: undefined
+    })
+  }
+
+  render() {
+    const { visible, videoVisible, videoId, moveVisible, moveVideoId } = this.state;
+    const CourseId = this.props.match.params.coursesId;
+    const VID = this.props.match.params.videoId;
+
+    let login = this.props && this.props.user&&this.props.user.login;;
+
     const _inputValue = videoId && this.getCopyText(videoId.file_url, videoId.cover_url);
 
-    const { admin , is_teacher ,business , user_id} = this.props.user;
+    // const { admin, is_teacher, business, user_id } = this.props && this.props.user;
+    let admin = this.props && this.props.user&&this.props.user.admin;;
+    let business = this.props && this.props.user&&this.props.user.business;;
+    let user_id = this.props && this.props.user&&this.props.user.user_id;;
 
-    const { videos , upload , uploadVideo , videoData , changePage ,pageSize ,page } = this.props;
 
-    const operation = admin || business || (is_teacher && this.props.checkIfProfessionalCertification())
-    return(
+
+    const { videos, upload, uploadVideo, videoData, changePage, pageSize, page } = this.props;
+
+    const operation = admin || business;
+    const { course_identity } = this.props && this.props.coursedata;
+    const flagMove = parseInt(course_identity) < 5;
+
+    return (
       <div>
         <EditVideoModal {...this.props} visible={visible} setVisible={this.setVisible}
-            editSuccess={this.editSuccess}
-            {...videoId} CourseUser={login}
+          editSuccess={this.editSuccess}
+          {...videoId} CourseUser={login}
         ></EditVideoModal>
+        <MoveBox
+          {...this.props}
+          visible={moveVisible}
+          mainId={videoData && videoData.course_module_id}
+          setMoveVisible={(flag) => this.setMoveVisible(flag)}
+          successFunc={() => uploadVideo()}
+          id={moveVideoId}
+        ></MoveBox>
         <HeadlessModal
-            visible={videoVisible}
-            setVisible={this.setVideoVisible}
-            className="showVideoModal"
-            width={800 - 1}
-          >
-            {
-              videoId &&
-              <video
-                autoplay="true"
-                ref={videoEl}
-                src={videoId.file_url} controls="true" controlslist="nodownload">
-                您的浏览器不支持 video 标签。
-              </video>
-            }
+          visible={videoVisible}
+          setVisible={this.setVideoVisible}
+          className="showVideoModal"
+          width={800 - 1}
+        >
+          {this.state.videourl===null?'':videoId &&<VideoPanel src={Base64.decode(videoId.file_url)} videoId={videoId.videoId} courseId={CourseId} logWatchHistory={logWatchHistory} />}
+          {/* {videoId && <VideoPanel src={Base64.decode(videoId.file_url)} videoId={videoId.videoId} courseId={CourseId} logWatchHistory={logWatchHistory} />} */}
 
-            <div className="df copyLine">
-              <Input value={_inputValue}
-                  className="dark"
-              ></Input>
-              <ActionBtn className="copybtn" data-clipboard-text={_inputValue}>复制视频地址</ActionBtn>
-            </div>
-          </HeadlessModal>
+          {this.props.isAdmin()===false?'':<div className="df copyLine" style={{}}>
+            <Input value={_inputValue}
+              className="dark"
+            ></Input>
+            <ActionBtn className="copybtn" data-clipboard-text={_inputValue}>复制视频地址</ActionBtn>
+          </div>}
+        </HeadlessModal>
         <div className="videoPanel">
           {
             upload ?
-            <VideoUploadList {...this.props} flag={true} CourseId={CourseId} CourseUser={login} successFunc={()=>uploadVideo()}></VideoUploadList>
-            :
-            <React.Fragment>
-              {
-                videos && videos.length > 0 ?
-                <React.Fragment>
-                  <p className="font-grey-9 mt20 mb20 pl5">共 <span className="color-orange">{videoData && videoData.count}</span> 个视频</p>
-                  <div className="videoContent">
-                  {
-                    videos.map((item,key)=>{
-                      return(
-                        <VideoInReviewItem
-                          {...this.props}
+              <VideoUploadList {...this.props} flag={true} CourseId={CourseId} videoId={VID} CourseUser={login} successFunc={() => uploadVideo()}></VideoUploadList>
+              :
+              <React.Fragment>
+                {
+                  videos && videos.length > 0 ?
+                    <React.Fragment>
+                      <div style={{display:'flex'}}>
+                      <p className="font-grey-9 mt20 mb20 pl5">共 <span className="color-orange">{videoData && videoData.count}</span> 个视频</p>
 
-                          {...item}
-                          key={item.id}
-                          onEditVideo={this.onEditVideo}
-                          onMaskClick={this.onMaskClick}
-                          getCopyText={this.getCopyText}
-                          operation={operation}
-                          deleteVideo={(admin || item.user_id === user_id) ? this.deleteVideo : undefined}
-                      >
-                      </VideoInReviewItem>
-                      )
-                    })
-                  }
+                      <p className="mt20 mb20 pl5" style={{marginLeft:'auto',color:'#C0C4CC'}}>播放数据从2020-03-13 24:00开始统计</p>
+                      </div>
+
+                      <div className="videoContent">
+                        {
+                          videos.map((item, key) => {
+                            //console.log(course_identity > 2 && item.user_id === user_id)
+                            return (
+                              <VideoInReviewItem
+																Setmyktid={(id,title)=>this.props.Setmyktid(id,title)}
+																mykt={this.props.mykt}
+                                {...this.props}
+																{...this.state}
+                                {...item}
+                                key={item.id}
+                                onEditVideo={this.onEditVideo}
+                                onMaskClick={this.onMaskClick}
+                                getCopyText={this.getCopyText}
+                                operation={operation || item.user_id === user_id}
+                                deleteVideo={(admin || item.user_id === user_id) ? this.deleteVideo : undefined}
+                                moveVideo={videoData && videoData.has_category && flagMove ? () => this.moveVideo(item.id, (course_identity > 2 && item.user_id !== user_id)) : undefined}
+                                newtitle={item.title}
+                                newcourse_video_id={item.course_video_id}
+                              >
+                              </VideoInReviewItem>
+                            )
+                          })
+                        }
+                      </div>
+                    </React.Fragment>
+                    :
+                    <div className="edu-back-white">
+                      <NoneData style={{ width: '100%' }}></NoneData>
+                    </div>
+                }
+
+                {
+                  videoData && videoData.count > pageSize &&
+                  <div className="mt30 mb50 edu-txt-center">
+                    <Pagination showQuickJumper total={videoData.count} current={page} pageSize={pageSize} onChange={(page) => changePage(page, 'video')}></Pagination>
                   </div>
-                </React.Fragment>
-                :
-                <div className="edu-back-white">
-                  <NoneData style={{width: '100%'}}></NoneData>
-                </div>
-              }
-              
-              {
-                videoData && videoData.count > pageSize &&
-                <div className="mt30 mb50 edu-txt-center">
-                  <Pagination showQuickJumper total={videoData.count} current={page} pageSize={pageSize} onChange={(page)=>changePage(page,'video')}></Pagination>
-                </div>
-              }
-            </React.Fragment>
+                }
+              </React.Fragment>
           }
         </div>
       </div>
     )
   }
 }
-export default Video;
\ No newline at end of file
+export default Video;
diff --git a/src/modules/courses/Video/VideoIndex.js b/src/modules/courses/Video/VideoIndex.js
index d490887b..c6d73682 100644
--- a/src/modules/courses/Video/VideoIndex.js
+++ b/src/modules/courses/Video/VideoIndex.js
@@ -1,297 +1,467 @@
-import React,{ Component } from "react";
+import React, {Component} from "react";
+import {WordsBtn, on, trigger, publicSearchs} from 'educoder';
 
-import { Menu, Spin } from 'antd';
+import {Menu, Spin} from 'antd';
 
-import { WordsBtn } from 'educoder';
 import axios from 'axios';
 import Videos from './Video';
 import Lives from './Live';
 import LivesNew from './LiveNew';
-
-
+import VideoLink from './VideoLink';
+import Videostatistics from '../videostatistics/Videostatistics';
 import './video.css';
 import '../css/Courses.css';
 import '../publicNav/nav.css';
+import Videostatisticscomtwo from '../videostatistics/component/Videostatisticscomtwo';
 const PAGE_SIZE = 15;
 const LIVE_PAGE_SIZE = 10;
 const $ = window.$;
 
-function getRight(){
-  var right = parseInt($(".-task-sidebar").css("right"));
-  return right===0?0:right;
+function getRight() {
+	var right = parseInt($(".-task-sidebar").css("right"));
+	return right === 0 ? 0 : right;
 }
-class VideoIndex extends Component{
-  constructor(props){
-    super(props);
-    this.state={
-      page:1,
-      upload:false,
-      videos:undefined,
-      videoData:undefined,
-      type:"video",
-      isSpining:false,
 
-      lives:undefined,
-      liveData:undefined,
+class VideoIndex extends Component {
+	constructor(props) {
+		super(props);
+		this.state = {
+			page: 1,
+			upload: false,
+			videos: undefined,
+			videoData: undefined,
+			otherLinkVisible: false,
+			type: "video",
+			isSpining: false,
 
-      liveId:undefined,
+			lives: undefined,
+			liveData: undefined,
 
-      liveVisible:false
-    }
-  }
+			liveId: undefined,
 
-  checkType=(type,page)=>{
-    this.setState({
-      type,
-      isSpining:true
-    })
-    if(type === "video"){
-      this.getList(page);
-    }else{
-      this.getLiveList(page);
-    }
-  }
+			liveVisible: false,
+			statistics: false,
+			myktid:null,
+			mytitle:''
+		}
+	}
 
-  componentDidMount=()=>{
-    const { search } = this.props.location;
-    const { page } = this.state;
-    if(search && search === "?open=live"){
-      this.setState({
-        type:"live"
-      })
-      this.checkType("live",page);
-    }else{
-      if(search === "?open=new"){
-        this.setState({
-          upload:true
-        })
-      }
-      this.checkType("video",page);
-    }
-  }
-  // 获取直播列表
-  getLiveList=(page)=>{
-    const CourseId=this.props.match.params.coursesId;
-    const url = `/courses/${CourseId}/live_links.json`;
-    axios.get(url,{
-      params:{
-        page,
-        limit:LIVE_PAGE_SIZE
-      }
-    }).then(result=>{
-      if(result){
-        this.setState({
-          liveData:result.data,
-          lives:result.data.lives,
-          isSpining:false,
-        })
-      }
-    }).catch(error=>{
-      console.log(error);
-    })
-  }
-  
-  // 获取视频列表
-  getList=(page)=>{
-    const CourseId=this.props.match.params.coursesId;
-    const fetchUrl = `/courses/${CourseId}/course_videos.json`;
-    axios.get(fetchUrl, {
-      params: {
-        page,
-        limit: PAGE_SIZE,
-      }
-    })
-    .then((response) => {
-      if(response){
-        this.setState({
-          videos:response.data.videos,
-          videoData:response.data,
-          isSpining:false
-        })
-      }
-    }).catch((error) => {
-      console.log(error);
-    })
-  }
+	checkType = (type, page) => {
+		this.setState({
+			type,
+			isSpining: true
+		})
+		if (type === "video") {
+			this.getList(page);
+		} else {
+			this.getLiveList(page);
+		}
+	}
+  Setmyktid=(id,title)=>{
+		const isAdmin = this.props&& this.props.isAdmin();
+    if(isAdmin===true){
+			this.setState({
+				myktid:id,
+				statistics:true,
+				mytitle:title,
+			})
+		}else{
+			this.setState({
+				statistics:true,
+				myktid:null,
+				mytitle:"",
 
-  changeType=(e)=>{
-    this.setState({
-      type:e.key,
-      upload:false,
-      page:1
-    })
-    this.checkType(e.key,1);
-  } 
+			})
+		}
 
-  changePage=(page,type)=>{
-    this.setState({
-      page
-    })
-    this.checkType(type,page);
-  }
+	}
+	componentDidMount = () => {
+		const {search} = this.props.location;
+		const {page} = this.state;
+		if (search && search === "?open=live") {
+			this.setState({
+				type: "live"
+			})
+			this.checkType("live", page);
+		} else {
+			if (search === "?open=new") {
+				this.setState({
+					upload: true
+				})
+			}
+			this.checkType("video", page);
+		}
+	}
+	componentDidUpdate = (prevProps) => {
+		try {
+			if (this.props.homedirectory !== prevProps.homedirectory) {
+				if(this.props.homedirectory ===true){
+					this.setState({
+						statistics:false,
+						myktid:null,
+						mytitle:"",
+					})
+				}
+			}
+		}catch (e) {
 
-  onEditVideo=(item)=>{
-    let videoId = {
-      videoId: item.id,
-      title: item.title
-    }
-    this.setState({
-      videoId,
-    })
-    this.setVisible(true);
-  }
-  uploadVideo=(upload)=>{
-    this.setState({
-      upload,
-      isSpining:true
-    })
-    const { page } = this.state;
-    setTimeout(()=>{
-      this.getList(page);
-    },500)
-  }
+		}
 
-  toUpload =()=> {
-    const { admin , is_teacher,business} = this.props.user;
-    if (admin || business || (is_teacher && this.props.checkIfProfessionalCertification())) {
-      this.setState({
-        type:"video",
-        upload:true,
-        page:1
-      })
-    } else {
-      this.props.showProfessionalCertificationDialog();
-    }
-  }
+		if (this.props.match.params.videoId !== prevProps.match.params.videoId) {
+			this.setState({
+				upload: false,
+			})
+			const {page} = this.state;
+			this.checkType("video", page);
+		}
 
-  // 直播设置后回调的方法
-  // successFunc=()=>{
-  //   this.setState({
-  //     type:"live",
-  //     page:1
-  //   })
-  //   this.checkType("live",1);
-  // }
-  // 直播设置
-  liveSetting=()=>{
-    this.setState({
-      liveId:undefined
-    })
-    this.setliveVisibel(true);
-  }
-  //直播设置弹框
-  setliveVisibel=(flag,changetypeFlag)=>{
-    this.setState({
-      liveVisible:flag
-    })
-    if(flag === false){
-      this.setState({
-        liveId:undefined
-      })
-    }
-    if(changetypeFlag){
-      this.checkType("live",1);
-    }
-  }
-  // 列表-编辑（修改传到编辑的id）
-  setLiveId=(id)=>{
-    this.setState({
-      liveId:id
-    })
-    this.setliveVisibel(true);
-  }
-  render(){
-    const { videos , upload , videoData , type , liveData , lives , page , liveVisible , isSpining , liveId } = this.state;
-    const { admin , is_teacher , business } = this.props.user;
-    // console.log("p",this.props);
-    return(
-      <React.Fragment>
-        <LivesNew 
-          visible={liveVisible} 
-          liveId={liveId}
-          setliveVisibel={this.setliveVisibel} 
-          {...this.props} 
-          {...this.state}
-        ></LivesNew>
-        {
-          liveVisible ?
-          <style>{
-          `
+
+	}
+	// 获取直播列表
+	getLiveList = (page) => {
+		const CourseId = this.props.match.params.coursesId;
+		const url = `/courses/${CourseId}/live_links.json`;
+		axios.get(url, {
+			params: {
+				page,
+				limit: LIVE_PAGE_SIZE
+			}
+		}).then(result => {
+			if (result) {
+				this.setState({
+					liveData: result.data,
+					lives: result.data.lives,
+					isSpining: false,
+				})
+			}
+		}).catch(error => {
+			console.log(error);
+		})
+	}
+
+	// 获取视频列表
+	getList = (page) => {
+		const {coursesId, videoId} = this.props.match.params;
+		const fetchUrl = `/courses/${coursesId}/course_videos.json`;
+		axios.get(fetchUrl, {
+				params: {
+					page,
+					limit: PAGE_SIZE,
+					category_id: videoId
+				}
+			})
+			.then((response) => {
+				if (response) {
+					this.setState({
+						videos: response.data.videos,
+						videoData: response.data,
+						isSpining: false
+					})
+				}
+			}).catch((error) => {
+			console.log(error);
+		})
+	}
+
+	changeType = (e) => {
+		this.setState({
+			type: e.key,
+			upload: false,
+			page: 1
+		})
+		this.checkType(e.key, 1);
+	}
+
+	changePage = (page, type) => {
+		this.setState({
+			page
+		})
+		this.checkType(type, page);
+	}
+
+	onEditVideo = (item) => {
+		let videoId = {
+			videoId: item.id,
+			title: item.title
+		}
+		this.setState({
+			videoId,
+		})
+		this.setVisible(true);
+	}
+	uploadVideo = (upload) => {
+
+		this.setState({
+			upload,
+			isSpining: true
+		})
+		const {page} = this.state;
+		setTimeout(() => {
+			this.getList(page);
+		}, 500)
+	}
+
+	toUpload = () => {
+		const {admin, is_teacher, business} = this.props.user;
+		if (admin || business || (is_teacher && this.props.checkIfProfessionalCertification())) {
+			this.setState({
+				type: "video",
+				upload: true,
+				page: 1
+			})
+		} else {
+			this.props.showProfessionalCertificationDialog();
+		}
+	}
+
+	// 直播设置后回调的方法
+	// successFunc=()=>{
+	//   this.setState({
+	//     type:"live",
+	//     page:1
+	//   })
+	//   this.checkType("live",1);
+	// }
+	// 直播设置
+	liveSetting = () => {
+		this.setState({
+			liveId: undefined
+		})
+		this.setliveVisibel(true);
+	}
+	//直播设置弹框
+	setliveVisibel = (flag, changetypeFlag) => {
+		this.setState({
+			liveVisible: flag
+		})
+		if (flag === false) {
+			this.setState({
+				liveId: undefined
+			})
+		}
+		if (changetypeFlag) {
+			this.checkType("live", 1);
+		}
+	}
+	// 列表-编辑（修改传到编辑的id）
+	setLiveId = (id) => {
+		this.setState({
+			liveId: id
+		})
+		this.setliveVisibel(true);
+	}
+
+	// 新增目录
+	addDir = () => {
+		let {videoData} = this.state;
+		trigger('videoAdd', parseInt(videoData.course_module_id));
+	}
+	// 目录重命名
+	editDir = (name, id) => {
+		let data = {id, name, update: this.getList}
+		trigger('editVideo', data);
+	}
+	// 增加外链
+	setLinkeVisible = (flag, refresh) => {
+		this.setState({
+			otherLinkVisible: flag
+		})
+		if (refresh) {
+			const {page} = this.state;
+			this.getList(page);
+		}
+	}
+	//统计
+	statisticsy = (bool) => {
+
+		this.setState({
+			statistics: bool,
+			myktid:null,
+			mytitle:"",
+		})
+
+	}
+	mystatisticsys = (bool,n) => {
+
+		this.setState({
+			statistics: bool,
+			myktid:null,
+			mytitle:"",
+		})
+
+	}
+
+	render() {
+		const {videos, upload, videoData, type, liveData, lives, page, liveVisible, isSpining, liveId, otherLinkVisible, statistics,myktid,mytitle} = this.state;
+		const {coursesId, videoId} = this.props.match.params;
+		let {course_identity} = this.props && this.props.coursedata;
+		let is_teacher = this.props && this.props.user && this.props.user.is_teacher;
+		const flag = parseInt(course_identity) < 5;
+		const newOperation = flag;
+		const new_upload = flag && (is_teacher && this.props.checkIfProfessionalCertification());
+		let isAdmin = this.props&&this.props.isAdmin();
+
+		return (
+			<React.Fragment>
+				<VideoLink
+					coursesId={coursesId}
+					videoId={videoId}
+					visible={otherLinkVisible}
+					notification={this.props.showNotification}
+					setVisible={this.setLinkeVisible}
+				></VideoLink>
+				<LivesNew
+					visible={liveVisible}
+					liveId={liveId}
+					setliveVisibel={this.setliveVisibel}
+					{...this.props}
+					{...this.state}
+				></LivesNew>
+				{
+					liveVisible ?
+						<style>{
+							`
           body{
             width: calc(100% - 7px)!important;
             overflow: hidden!important;
           }
           .-task-sidebar{
-            right:${getRight()+7}px!important;
+            right:${getRight() + 7}px!important;
           }
-          `}</style>:
-          <style>{
-            `
+          `}</style> :
+						<style>{
+							`
             body{
               width: 100%!important;
             }
             `}</style>
-        }
-        <div className="edu-back-white" style={{marginBottom:"1px"}}>
+				}
+				{
+					statistics === false ?
+						<div className="edu-back-white" style={{marginBottom: "1px"}}>
 
-          <div className="clearfix pl30 pr30 menuDiv">
-            <div className="task_menu_ul fl">
-              <Menu mode="horizontal" selectedKeys={[type]} onClick={this.changeType}>
-                <Menu.Item key="video">视频</Menu.Item>
-                <Menu.Item key="live">直播</Menu.Item>
-              </Menu>
-            </div>
-            {
-              (admin || is_teacher || business) &&
-              <li className="fr mt18">
-                {
-                  type === "video" ?
-                    <React.Fragment>
-                      {
-                        upload ?
-                        <WordsBtn style="grey" className="font-16" onClick={()=>this.uploadVideo(false)}>取消</WordsBtn>
-                        :
-                        <WordsBtn style="blue" className="font-16" onClick={this.toUpload}>上传视频</WordsBtn>
-                      }
-                    </React.Fragment>
-                  :
-                  <WordsBtn style="blue" className="font-16 ml30" onClick={this.liveSetting}>添加直播</WordsBtn>
-                }
-              </li>
-            }
-          </div>
-        </div>
-        <Spin spinning={isSpining}>
-        {
-          type === "video" ? 
-            <Videos 
-              upload={upload} 
-              videos={videos} 
-              page={page}
-              data={videoData}
-              pageSize={PAGE_SIZE}
-              uploadVideo={this.uploadVideo}
-              listFunc={this.getList}
-              changePage={this.changePage}
-              {...this.props} 
-              {...this.state}
-            ></Videos>
-            :
-            <Lives
-              lives={lives}
-              liveData={liveData}
-              page={page}
-              pageSize={LIVE_PAGE_SIZE}
-              successFunc={this.getLiveList}
-              changePage={this.changePage}
-              setLiveId={this.setLiveId}
-              {...this.props}
-              {...this.state}
-            ></Lives>
-        }
-        </Spin>
-      </React.Fragment>
-    )
-  }
+							<div className="clearfix pl30 pr30 menuDiv">
+								{
+									videoData && videoData.category_name && type === "video" ?
+										<span className="font-18 fl color-dark-21 mt20 mb20">{videoData.category_name}</span>
+										:
+										<div className="task_menu_ul fl mt2" style={{width: "240px"}}>
+											<Menu mode="horizontal" selectedKeys={[type]} onClick={this.changeType}>
+												<Menu.Item key="video">视频</Menu.Item>
+												<Menu.Item key="live">直播</Menu.Item>
+											</Menu>
+										</div>
+								}
+								<li className="fr mt20 mb20">
+									{
+										type === "video" ?
+											<React.Fragment>
+		                <span>
+											{
+												videoId ?
+												  ""
+													:videos&&videos.length>0?
+													<WordsBtn style="blue" className="ml30 font-16 tongjis"
+																		onClick={() => this.statisticsy(true)}
+													><i className="iconfont icon-tongji1 mr5 font-14"></i>统计</WordsBtn>
+													:""
+											}
+
+										</span>
+												{
+													newOperation ?
+														<span>
+															{
+																videoId ?
+																	<WordsBtn style="blue"
+																						onClick={() => this.editDir(videoData && videoData.category_name, videoId)}
+																						className={"ml30 font-16"}>目录重命名</WordsBtn>
+																	:
+																  <WordsBtn style="blue" className="ml30 font-16" onClick={this.addDir}>新建目录</WordsBtn>
+
+															}
+															<WordsBtn style="blue" className="ml30 font-16"
+																				onClick={() => this.setLinkeVisible(true)}>增加外链</WordsBtn>
+                      </span> : ""
+												}
+												{
+													new_upload ?
+														<span>
+                        {
+													upload ?
+														<WordsBtn style="grey" className="font-16 ml30"
+																			onClick={() => this.uploadVideo(false)}>取消</WordsBtn>
+														:
+														<WordsBtn style="blue" className="font-16 ml30" onClick={this.toUpload}>上传视频</WordsBtn>
+												}
+                      </span>
+														: ""
+												}
+
+
+
+
+											</React.Fragment>
+											:
+											isAdmin===true?
+												<WordsBtn style="blue" className="font-16 ml30" onClick={this.liveSetting}>添加直播</WordsBtn>
+												:
+												""
+									}
+								</li>
+							</div>
+						</div>
+						:
+						(
+							myktid===null||myktid===undefined?
+								<Videostatistics {...this.props} {...this.state} statisticsy={(b) => this.statisticsy(b)}></Videostatistics>
+					    :
+								<Videostatisticscomtwo  {...this.state} {...this.props} tisid={myktid} mytitle={mytitle} tisticsbools={(b,id)=>this.mystatisticsys(b,id)}></Videostatisticscomtwo>
+						)
+
+
+
+
+				}
+				{
+					statistics === false ?
+						<Spin spinning={isSpining}>
+							{
+								type === "video" ?
+									<Videos
+										mykt={"mykt"}
+										Setmyktid={(id,title)=>this.Setmyktid(id,title)}
+										upload={upload}
+										videos={videos}
+										page={page}
+										data={videoData}
+										pageSize={PAGE_SIZE}
+										uploadVideo={this.uploadVideo}
+										listFunc={this.getList}
+										changePage={this.changePage}
+										{...this.props}
+										{...this.state}
+									></Videos>
+									:
+									<Lives
+										lives={lives}
+										liveData={liveData}
+										page={page}
+										pageSize={LIVE_PAGE_SIZE}
+										successFunc={this.getLiveList}
+										changePage={this.changePage}
+										setLiveId={this.setLiveId}
+										{...this.props}
+										{...this.state}
+									></Lives>
+							}
+						</Spin>
+						:
+						""
+				}
+			</React.Fragment>
+		)
+	}
 }
-export default VideoIndex;
\ No newline at end of file
+
+export default VideoIndex;
diff --git a/src/modules/courses/Video/VideoLink.js b/src/modules/courses/Video/VideoLink.js
new file mode 100644
index 00000000..3aa8b672
--- /dev/null
+++ b/src/modules/courses/Video/VideoLink.js
@@ -0,0 +1,96 @@
+import React,{ Component } from "react";
+import { Modal , Form , Input , Spin , Select , AutoComplete , DatePicker , InputNumber } from 'antd';
+import axios from 'axios';
+
+class VideoLink extends Component{
+
+  componentDidUpdate=(prevProps)=>{
+    if(prevProps.visible !== this.props.visible){
+      this.props.form.setFieldsValue({
+        name:undefined,
+        link:undefined
+      })
+    }
+  }
+  cancelNew=()=>{
+    const { setVisible } = this.props;
+    setVisible && setVisible(false);
+  }
+  validateDesc= (rule, value, callback) => {
+    if(!value){
+      callback();
+    }
+    if (value.length > 60) {
+      callback("视频名称不能超过60个字！");
+    }else{
+      callback();
+    }
+  }
+  // 提交
+  handleSubmit=()=>{
+    this.props.form.validateFields((err, values) => {
+      if(!err){
+        const { coursesId , videoId } = this.props;
+        const url = `/courses/${coursesId}/course_videos.json`;
+        axios.post(url,{
+          ...values,
+          category_id:videoId
+        }).then(result=>{
+          if(result){
+            const { notification , setVisible } = this.props;
+            notification && notification('视频外链新增成功！');
+            setVisible && setVisible(false,true);
+          }
+        }).catch(error=>{
+          console.log(error);
+        })
+      }
+    })
+  }
+  render(){
+    const {getFieldDecorator} = this.props.form;
+
+    const { visible } = this.props;
+    const layout = {
+      labelCol: { span: 5 },
+      wrapperCol: { span: 19 },
+    }
+    return(
+      <Modal
+        visible={visible}
+        width="560px"
+        title={'添加外链'}
+        footer={null}
+        closable={false}
+        centered={true}
+      >
+        <div className="task-popup-content">
+          <Form onSubmit={this.handleSubmit} {...layout}>
+            <Form.Item label={`视频名称：`}>
+              {getFieldDecorator('name', {
+                    rules: [{required: true, message: "请输入名称"},{
+                      validator: this.validateDesc,
+                    }],
+                })(
+                  <Input placeholder="请输入名称，最大限制60个字符" />
+                )}
+            </Form.Item>
+            <Form.Item label={`链接地址：`}>
+              {getFieldDecorator('link', {
+                    rules: [{required: true, message: "请输入链接地址"}],
+                })(
+                  <Input placeholder="请输入链接地址" />
+                )}
+            </Form.Item>
+            <div className="clearfix mt30 edu-txt-center">
+              <a onClick={this.cancelNew} className="task-btn mr30">取消</a>
+              <a type="submit" onClick={this.handleSubmit} className="task-btn task-btn-orange">确定</a>
+            </div>
+          </Form>
+        </div>
+      </Modal>
+    )
+  }
+}
+const WrappedVideoLink = Form.create({name: 'VideoLink'})(VideoLink);
+export default WrappedVideoLink;
\ No newline at end of file
diff --git a/src/modules/courses/Video/images/zoom.png b/src/modules/courses/Video/images/zoom.png
new file mode 100755
index 00000000..67880716
Binary files /dev/null and b/src/modules/courses/Video/images/zoom.png differ
diff --git a/src/modules/courses/Video/video-play/index.jsx b/src/modules/courses/Video/video-play/index.jsx
new file mode 100644
index 00000000..5012bc4e
--- /dev/null
+++ b/src/modules/courses/Video/video-play/index.jsx
@@ -0,0 +1,197 @@
+import React, { useRef, useEffect, useCallback } from 'react'
+import flvjs from 'flv.js'
+
+Object.defineProperty(HTMLMediaElement.prototype, 'playing', {
+  get: function () {
+    return !!(this.currentTime > 0 && !this.paused && !this.ended && this.readyState > 2)
+  }
+})
+
+function compareNumbers(a, b) {
+  return a - b;
+}
+
+function getTotalEffectTime(pos) {
+  pos.sort(compareNumbers)
+  let sum = 0
+  for (let i = 0; i < pos.length - 1; i++) {
+    let v = Math.abs(pos[i + 1] - pos[i])
+    if (v < 21) {
+      sum += v
+    }
+  }
+  return sum
+}
+const regex = /(android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini)/i
+//接口文档 https://www.showdoc.cc/educoder?page_id=4029884447803706
+export default ({ src, videoId, logWatchHistory, courseId = null }) => {
+
+  const suf = src.split('.').pop()
+  const isFlv = suf === 'flv'
+  const el = useRef()
+  const deviceMatch = navigator.userAgent.toLowerCase().match(regex)
+  const device = deviceMatch ? deviceMatch[0] : 'pc'
+
+  let totalDuration = 0
+  let sumTimePlayed = 0
+  let lastUpdatedTime = 0
+  let logId = null
+  let initLog = false
+  let timeTick = 20 //记录频率 默认20s
+  let logCount = 1
+  let isLoging = false
+  let isSeeking = false
+  let pos = []//播放时间点集
+
+  const log = useCallback((callback, isEnd = false) => {
+    let params = {
+      point: el.current.currentTime
+    }
+    if (logId) {
+      params['log_id'] = logId
+      params['watch_duration'] = getTotalEffectTime(pos) //当前观看视频时长，拖放进度条，重复的视频片段观看时，不会把重复的时长累积进来，最大时长是视频的总时长
+      params['total_duration'] = sumTimePlayed //累计观看视频时长，拖放进度条，重复的视频片段观看时，重复观看时长要累积进来
+    } else {
+      if (courseId) {
+        params['video_id'] = parseInt(videoId, 10)
+        params['course_id'] = parseInt(courseId, 10)
+      } else {
+        params['video_id'] = videoId
+      }
+      params['duration'] = totalDuration
+      params['device'] = device
+    }
+    if (isEnd) {
+      params['ed'] = "1"
+    }
+    async function getLogId() {
+      isLoging = true
+      let id = await logWatchHistory(params)
+      logId = id
+      isLoging = false
+      if (callback) {
+        callback()
+      }
+    }
+    getLogId()
+  }, [videoId, courseId])
+
+  useEffect(() => {
+    let player = null
+    if (flvjs.isSupported && isFlv) {
+      player = flvjs.createPlayer({
+        type: 'flv',
+        volume: 0.8,
+        cors: true,
+        url: src,
+        muted: false
+      })
+
+      if (el.current) {
+        player.attachMediaElement(el.current)
+        player.load()
+      }
+    } else {
+      el.current.setAttribute('src', src)
+    }
+    return () => {
+      if (player) {
+        player.unload()
+        player.pause()
+        player.destroy()
+        player = null
+      }
+    }
+  }, [el, isFlv, src])
+
+  useEffect(() => {
+
+    function onPlay() {
+      pos.push(el.current.currentTime)
+      if (!initLog) {
+        initLog = true
+        log()
+      }
+    }
+    //循环播放， 累计时长不能清空
+    async function onEnded() {
+      pos.push(el.current.currentTime)
+      log(() => {
+        logId = null
+        lastUpdatedTime = 0
+        initLog = false
+        isLoging = false
+        isSeeking = false
+        pos = []  //有效时长重新累计，算新的一遍
+        sumTimePlayed = 0
+        logCount = 1
+      }, true)
+    }
+
+    function onTimeupdate() {
+      if (!isSeeking) {
+        let newTime = el.current.currentTime
+        let timeDiff = newTime - lastUpdatedTime
+        //currenttime update before Seeking & Seeked fired
+        if (Math.abs(timeDiff) < 10) {
+          sumTimePlayed += Math.abs(timeDiff)
+          lastUpdatedTime = newTime
+          if (!isLoging) {
+            if (sumTimePlayed - logCount * timeTick >= 0) {
+              logCount++
+              pos.push(lastUpdatedTime)
+              log()
+            }
+          }
+        } else {
+          lastUpdatedTime = newTime
+        }
+      }
+
+    }
+
+    function onSeeking() {
+      isSeeking = true
+    }
+
+    function onSeeked() {
+      if (el.current.playing) {
+        pos.push(el.current.currentTime, lastUpdatedTime)
+      }
+      lastUpdatedTime = el.current.currentTime
+      isSeeking = false
+    }
+
+    function onCanPlay() {
+      totalDuration = el.current.duration
+      if (totalDuration <= 20) {
+        timeTick = totalDuration / 3
+      }
+      el.current.addEventListener('play', onPlay)
+    }
+
+    el.current.addEventListener('canplay', onCanPlay)
+    el.current.addEventListener('ended', onEnded)
+    el.current.addEventListener('seeking', onSeeking)
+    el.current.addEventListener('seeked', onSeeked)
+
+    el.current.addEventListener('timeupdate', onTimeupdate)
+    return () => {
+      el.current.removeEventListener('canplay', onCanPlay)
+      el.current.removeEventListener('play', onPlay)
+      el.current.removeEventListener('ended', onEnded)
+      el.current.removeEventListener('seeking', onSeeking)
+      el.current.removeEventListener('seeked', onSeeked)
+      el.current.removeEventListener('timeupdate', onTimeupdate)
+      if (el.current.playing) {
+        pos.push(lastUpdatedTime, el.current.currentTime)
+        log()
+      }
+    }
+  }, [el, src])
+
+
+  return (
+    <video ref={el} controls autoPlay={false} controlsList="nodownload" muted={false} />
+  )
+}
\ No newline at end of file
diff --git a/src/modules/courses/Video/video.css b/src/modules/courses/Video/video.css
index 7f1528be..c9003547 100644
--- a/src/modules/courses/Video/video.css
+++ b/src/modules/courses/Video/video.css
@@ -176,4 +176,16 @@
 }
 .wei_meet_info{
   margin:0px auto;
-}
\ No newline at end of file
+}
+.tongjis{
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    border-radius: 5px;
+    line-height: 1px;
+
+}
+.font-14{
+    font-size: 14px !important;
+}
diff --git a/src/modules/courses/boards/BoardsListItem.js b/src/modules/courses/boards/BoardsListItem.js
index 78f3aec3..47b9182e 100644
--- a/src/modules/courses/boards/BoardsListItem.js
+++ b/src/modules/courses/boards/BoardsListItem.js
@@ -1,42 +1,30 @@
-import React,{ Component } from "react";
-import {Tooltip} from 'antd'
+import React, { Component } from "react";
+import { Tooltip } from 'antd'
 import moment from 'moment'
 import { getUrl, WordsBtn, ConditionToolTip } from 'educoder'
 import './boardsListItem.css';
-class BoardsListItem extends Component{
-  constructor(props){
+class BoardsListItem extends Component {
+  constructor(props) {
     super(props);
     this.state = {
 
     }
   }
   onTitleClick = (discussMessage) => {
-		if(this.props.checkIfLogin()===false){
-			this.props.showLoginDialog()
-			return
-		}
-		// if(this.props.checkIfProfileCompleted()===false){
-		// 	this.setState({
-		// 		AccountProfiletype:true
-		// 	})
-		// 	return
-		// }
-		// if(this.props.checkIfProfessionalCertification()===false){
-		// 	this.props.showProfileCompleteDialog()
-		// 	return
-		// }
-
+    if (this.props.checkIfLogin() === false) {
+      this.props.showLoginDialog()
+      return
+    }
     const isAdminOrStudent = this.props.isAdminOrStudent();
     if (!isAdminOrStudent && discussMessage.is_public == false) {
       // 没有权限访问
       return;
     }
-    const cid = this.props.match.params.coursesId    
+    const cid = this.props.match.params.coursesId
     const board_id = this.props.match.params.boardId
     this.props.toDetailPage(cid, board_id, discussMessage.id)
   }
-  render(){
-    let { addGroup } = this.state;
+  render() {
     const isAdmin = this.props.isAdmin()
     const isAdminOrStudent = this.props.isAdminOrStudent()
     const { checkBox, discussMessage, onSticky, onItemClick, current_user } = this.props;
@@ -45,102 +33,80 @@ class BoardsListItem extends Component{
     }
     let canNotLink = !isAdminOrStudent && discussMessage.is_public == false
 
-    return(
-        <div className="panel-inner-fourm boardsList">
-          <style>{`
+    return (
+      <div className="panel-inner-fourm boardsList">
+        <style>{`
             .boardsList .panel-list-img {
               width: 50px;
               height: 50px;
             }
           `}</style>
-          { checkBox }
-          <a href={`/users/${discussMessage.author.login}`} alt="用户" style={{"width":"50px","height":"50px","display":"block", margin: "0 10px"}}>
-            {/* /images/avatars/User/1?1529221779 */}
-            <img 
-              alt="1?1529221779" className="panel-list-img mr15" height="50"
-              src={`${getUrl()}/images/${discussMessage.author.image_url}`} width="50"
-            ></img>
-          </a>
-          <div className="clearfix ds pr pt5 contentSection" onClick={() => onItemClick(discussMessage)}>
-            <h6>
-								{canNotLink?<span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer"  title={canNotLink?"私有属性，非课堂成员不能访问":`${discussMessage.subject}`}>{discussMessage.subject}</span>:<a  className="panel-list-title hide fl mt5 color-dark font-bd pointer"
-									style={{ fontWeight: 'bold', maxWidth: '700px' }}
-							    title={discussMessage.subject}
-									onClick={canNotLink ? () => {} : () => this.onTitleClick(discussMessage)}
-								>{discussMessage.subject}</a>}
-              { !!discussMessage.sticky && <span className="btn-cir btn-cir-red fl mt5 ml5">置顶</span> }
-              {
-                
-                 discussMessage.is_public == false ? (<Tooltip title={'私有属性，非课堂成员不能访问'} placement="bottom">
-                  <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
-                 </Tooltip>) : ""
-              }
-
-            </h6>
-
-            <div className="fr">
-
-              {(isAdmin || discussMessage.author.login == current_user.login) &&
-              <WordsBtn style="blue" className="fr font-16 ml28"
-                        onClick={(e) => { this.props.toEditPage(this.props.match.params.coursesId, this.props.match.params.boardId, discussMessage.id )} }>编辑</WordsBtn> }
-
-              { isAdmin && <WordsBtn style="blue" className="fr font-16 ml28"
-                                     onClick={(e) => { debugger; onSticky(discussMessage); e.cancelBubble = true; e.stopPropagation();}}>
-                { discussMessage.sticky ? '取消置顶' : '置顶' }</WordsBtn> }
-
-              {canNotLink?"":<WordsBtn style="blue"  className="font-16 fr " 	onClick={canNotLink ? () => {} : () => this.onTitleClick(discussMessage)}>查看详情</WordsBtn>}
-
-            </div>
-              
-            <div className="cl"></div>
-            <p className="color-grey panel-lightgrey mt18 fl">
-              <span className="mr50">
-                <a href={`/users/${discussMessage.author.login}`} className="panel-name-small hide fl mr15 mr30 color-grey3 font-14">{discussMessage.author.name}</a>
-
-                { discussMessage.total_replies_count != 0 && <span className="mr15 color-grey9 font-14">{discussMessage.total_replies_count} 回复</span> }
-                { discussMessage.praises_count != 0 && <span className="mr15 color-grey9 font-14">{discussMessage.praises_count} 点赞</span> }
-                { discussMessage.visits != 0 && <span className="mr15 color-grey9 font-14">{discussMessage.visits} 浏览</span> }
-
-                <span className="mr15 color-light-grey-C font-14">{moment(discussMessage.created_on).fromNow()} </span>
-              </span>
-            </p>
+        {checkBox}
+        <a href={`/users/${discussMessage.author.login}`} alt="用户" style={{ "width": "50px", "height": "50px", "display": "block", margin: "0 10px" }}>
+          <img
+            alt="1?1529221779" className="panel-list-img mr15" height="50"
+            src={`${getUrl()}/images/${discussMessage.author.image_url}`} width="50"
+          ></img>
+        </a>
+        <div className="clearfix ds pr pt5 contentSection" onClick={() => onItemClick(discussMessage)}>
+          <h6>
+            {canNotLink ? <span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer" title={canNotLink ? "私有属性，非课堂成员不能访问" : `${discussMessage.subject}`}>{discussMessage.subject}</span> : <a className="panel-list-title hide fl mt5 color-dark font-bd pointer"
+              style={{ fontWeight: 'bold', maxWidth: '700px' }}
+              title={discussMessage.subject}
+              onClick={canNotLink ? () => { } : () => this.onTitleClick(discussMessage)}
+            >{discussMessage.subject.length>=30?discussMessage.subject.slice(0,30)+"...":discussMessage.subject}</a>}
+            {!!discussMessage.sticky && <span className="btn-cir btn-cir-red fl mt5 ml5">置顶</span>}
             {
-              discussMessage.category_name && 
-              <div className={'directory_style'}>
-                <ConditionToolTip title={discussMessage.category_name} condition={discussMessage.category_name}>
-                  { <div className=" color-grey9 task-hide fr"
-                      style={{"maxWidth":"216px"}} 
-                      title={discussMessage.category_name}>
-                        所属目录：{discussMessage.category_name}
-                    </div>
-                  }
-                </ConditionToolTip>
-              </div>
+
+              discussMessage.is_public == false ? (<Tooltip title={'私有属性，非课堂成员不能访问'} placement="bottom">
+                <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
+              </Tooltip>) : ""
             }
 
-            {/* { (isAdmin || discussMessage.author.login == current_user.login) &&
-            <div className="homepagePostSetting" style={{"right":"4px","top":"5px","display":"block"}}>
-              <ul>
-                <li className="edu-position edu-position-hidebox">
-                  <i className="fa fa-bars color-grey-b"></i>
-                  <ul className="edu-position-hide undis">
-                    {(isAdmin || discussMessage.author.login == current_user.login) && <li><a href="javascript:void(0)" onClick={(e) => {
-                        this.props.toEditPage(this.props.match.params.coursesId, this.props.match.params.boardId, discussMessage.id )} } >编辑</a></li>
-                    }
-                    {isAdmin && <li><a href="javascript:void(0)" onClick={(e) => { debugger; onSticky(discussMessage); e.cancelBubble = true; e.stopPropagation();} }>
-                      { discussMessage.sticky ? '取消置顶' : '置顶' }
-                    </a></li>
-                    }
-                  </ul>
-                </li>
-              </ul>
-            </div>
-            } */}
+          </h6>
 
+          <div className="fr">
+
+            {(isAdmin || discussMessage.author.login == current_user.login) &&
+              <WordsBtn style="blue" className="fr font-16 ml28"
+                onClick={(e) => { this.props.toEditPage(this.props.match.params.coursesId, this.props.match.params.boardId, discussMessage.id) }}>编辑</WordsBtn>}
+
+            {isAdmin && <WordsBtn style="blue" className="fr font-16 ml28"
+              onClick={(e) => { onSticky(discussMessage); e.cancelBubble = true; e.stopPropagation(); }}>
+              {discussMessage.sticky ? '取消置顶' : '置顶'}</WordsBtn>}
+
+            {canNotLink ? "" : <WordsBtn style="blue" className="font-16 fr " onClick={canNotLink ? () => { } : () => this.onTitleClick(discussMessage)}>查看详情</WordsBtn>}
 
           </div>
+
+          <div className="cl"></div>
+          <p className="color-grey panel-lightgrey mt18 fl">
+            <span className="mr50">
+              <a href={`/users/${discussMessage.author.login}`} className="panel-name-small hide fl mr15 mr30 color-grey3 font-14">{discussMessage.author.name}</a>
+
+              {discussMessage.total_replies_count != 0 && <span className="mr15 color-grey9 font-14">{discussMessage.total_replies_count} 回复</span>}
+              {discussMessage.praises_count != 0 && <span className="mr15 color-grey9 font-14">{discussMessage.praises_count} 点赞</span>}
+              {discussMessage.visits != 0 && <span className="mr15 color-grey9 font-14">{discussMessage.visits} 浏览</span>}
+
+              <span className="mr15 color-light-grey-C font-14">{moment(discussMessage.created_on).fromNow()} </span>
+            </span>
+          </p>
+          {
+            discussMessage.category_name &&
+            <div className={'directory_style'}>
+              <ConditionToolTip title={discussMessage.category_name} condition={discussMessage.category_name}>
+                {<div className=" color-grey9 task-hide fr"
+                  style={{ "maxWidth": "216px" }}
+                  title={discussMessage.category_name}>
+                  所属目录：{discussMessage.category_name}
+                </div>
+                }
+              </ConditionToolTip>
+            </div>
+          }
         </div>
-      )
-    }
+      </div>
+    )
+  }
 }
 export default BoardsListItem;
\ No newline at end of file
diff --git a/src/modules/courses/boards/BoardsNew.js b/src/modules/courses/boards/BoardsNew.js
index 018d1685..8b63653d 100644
--- a/src/modules/courses/boards/BoardsNew.js
+++ b/src/modules/courses/boards/BoardsNew.js
@@ -1,9 +1,9 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 
 import {
   Form, Input, InputNumber, Switch, Radio,
   Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Divider,Tooltip
+  Row, Col, Select, Modal, Divider, Tooltip
 } from 'antd';
 import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
 import axios from 'axios'
@@ -12,15 +12,35 @@ import "../common/formCommon.css"
 import AddDirModal from './AddDirModal'
 import { RouteHOC } from './common.js'
 import CBreadcrumb from '../common/CBreadcrumb'
-import {getUploadActionUrl, bytesToSize, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll} from 'educoder';
+import { getUploadActionUrl, bytesToSize, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll } from 'educoder';
+import styled from "styled-components";
+
+const SubBtn = styled(Button)`
+  display: block;
+  border: 1px solid #4CACFF;
+  background-color: #4CACFF;
+  color: #fff !important;
+  width: 120px;
+  text-align: center;
+  line-height: 40px;
+  border-radius: 2px;
+  width: 130px;
+  height: 40px;
+  background: rgba(76, 172, 255, 1);
+  border-radius: 4px;
+  font-size: 16px;
+  font-family: MicrosoftYaHei;
+  font-weight: 400;
+  color: rgba(255, 255, 255, 1);
+`;
 
 const confirm = Modal.confirm;
 const $ = window.$
 const { Option } = Select;
 const MAX_TITLE_LENGTH = 60
 // https://lanhuapp.com/web/#/item/project/board/detail?pid=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&project_id=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&image_id=71072679-b925-4824-aceb-4649535e3652
-class BoardsNew extends Component{
-  constructor(props){
+class BoardsNew extends Component {
+  constructor(props) {
     super(props);
 
     this.mdRef = React.createRef();
@@ -29,9 +49,9 @@ class BoardsNew extends Component{
       fileList: [],
       boards: [],
       title_num: 0,
-			email_notify:false,
-			isemail_notify:false,
-			isemail_notifys:false
+      email_notify: false,
+      isemail_notify: false,
+      isemail_notifys: false
     }
   }
   addSuccess = () => {
@@ -42,36 +62,36 @@ class BoardsNew extends Component{
     const boardId = this.props.match.params.boardId
 
     const boardsUrl = `/courses/board_list.json?board_id=${boardId}`
-    axios.get(boardsUrl, { })
-    .then((response) => {
-      if (response.data.status == 0) {
-        this.setState({
-          boards: response.data.data.boards || [],
-					boardsdata:response.data.data,
-          course_id: response.data.data.course_id
-        })
-        if (!isEdit) {
-          response.data.data.boards.forEach( board => {
-            if (board.id == boardId) {
-              this.setState({ board_name: board.name })
-            }
+    axios.get(boardsUrl, {})
+      .then((response) => {
+        if (response.data.status == 0) {
+          this.setState({
+            boards: response.data.data.boards || [],
+            boardsdata: response.data.data,
+            course_id: response.data.data.course_id
           })
-          // board_name
+          if (!isEdit) {
+            response.data.data.boards.forEach(board => {
+              if (board.id == boardId) {
+                this.setState({ board_name: board.name })
+              }
+            })
+            // board_name
+          }
         }
-      }
-    })
-    .catch(function (error) {
-      console.log(error);
-    });
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
   }
   componentDidMount = () => {
-    
+
     const topicId = this.props.match.params.topicId
     const isEdit = !!topicId
     this.isEdit = isEdit
 
     const boardId = this.props.match.params.boardId
-    
+
     this.fetchBoards()
 
     if (isEdit) {
@@ -99,8 +119,8 @@ class BoardsNew extends Component{
                   status: 'done'
                 }
               })
-          
-              this.setState({ fileList: _fileList, board_name: data.board_name, title_num: parseInt(data.subject.length) ,isemail_notifys:response.data.data.email_notify})
+
+              this.setState({ fileList: _fileList, board_name: data.board_name, title_num: parseInt(data.subject.length), isemail_notifys: response.data.data.email_notify })
             }
           }
         })
@@ -123,7 +143,7 @@ class BoardsNew extends Component{
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         console.log('Received values of form: ', values);
-        if (this.isEdit == true)  {
+        if (this.isEdit == true) {
           const editTopic = this.editTopic
           const editUrl = `/messages/${editTopic.id}.json`
 
@@ -138,7 +158,7 @@ class BoardsNew extends Component{
             select_board_id: values.select_board_id,
             content: values.content,
             sticky: values.sticky,
-						email_notify:this.state.isemail_notify,
+            email_notify: this.state.isemail_notify,
             attachment_ids,
           })
             .then((response) => {
@@ -160,10 +180,10 @@ class BoardsNew extends Component{
               return item.response.id
             })
           }
-          
+
           axios.post(url, {
             ...values,
-						email_notify:this.state.isemail_notify,
+            email_notify: this.state.isemail_notify,
             course_id: cid,
             attachment_ids,
           })
@@ -193,25 +213,25 @@ class BoardsNew extends Component{
     }
   }
   onAttachmentRemove = (file) => {
-		if(!file.percent || file.percent == 100){
-			this.props.confirm({
-				// title: '确定要删除这个附件吗?',
-				content: '是否确认删除?',
+    if (!file.percent || file.percent == 100) {
+      this.props.confirm({
+        // title: '确定要删除这个附件吗?',
+        content: '是否确认删除?',
 
-				okText: '确定',
-				cancelText: '取消',
-				// content: 'Some descriptions',
-				onOk: () => {
-					this.deleteAttachment(file)
-				},
-				onCancel() {
-					console.log('Cancel');
-				},
-			});
+        okText: '确定',
+        cancelText: '取消',
+        // content: 'Some descriptions',
+        onOk: () => {
+          this.deleteAttachment(file)
+        },
+        onCancel() {
+          console.log('Cancel');
+        },
+      });
 
 
-			return false;
-		}
+      return false;
+    }
 
   }
   deleteAttachment = (file) => {
@@ -224,7 +244,7 @@ class BoardsNew extends Component{
           const { status } = response.data;
           if (status == 0) {
             console.log('--- success')
-            
+
             this.setState((state) => {
               const index = state.fileList.indexOf(file);
               const newFileList = state.fileList.slice();
@@ -241,7 +261,7 @@ class BoardsNew extends Component{
       });
   }
   // 附件相关 ------------ END
-  changeTitle=(e)=>{
+  changeTitle = (e) => {
     console.log(e.target.value.length);
     this.setState({
       title_num: parseInt(e.target.value.length)
@@ -249,16 +269,16 @@ class BoardsNew extends Component{
   }
   goBack = () => {
     // this.props.history.goBack()
-    const courseId=this.props.match.params.coursesId;
+    const courseId = this.props.match.params.coursesId;
     const boardId = this.props.match.params.boardId
     this.props.toListPage(courseId, boardId)
   }
 
-	setemailchange=(e)=>{
-  	this.setState({
-			isemail_notify:e.target.checked
-		})
-	}
+  setemailchange = (e) => {
+    this.setState({
+      isemail_notify: e.target.checked
+    })
+  }
   render() {
     let { addGroup, fileList, course_id, title_num } = this.state;
     const { getFieldDecorator } = this.props.form;
@@ -297,21 +317,21 @@ class BoardsNew extends Component{
       },
     };
     const isAdmin = this.props.isAdmin()
-    const courseId=this.props.match.params.coursesId;
+    const courseId = this.props.match.params.coursesId;
     const boardId = this.props.match.params.boardId
     const isCourseEnd = this.props.isCourseEnd();
-		document.title=this.props.coursedata&&this.props.coursedata.name;
+    document.title = this.props.coursedata && this.props.coursedata.name;
 
-		// console.log(this.state)
-    return(
-        <div className="newMain ">
-          <AddDirModal {...this.props}
-            title="新建目录"
-            label="目录名称"
-            ref="addDirModal"
-            addSuccess={this.addSuccess}
-          ></AddDirModal>
-          <style>{`
+    // console.log(this.state)
+    return (
+      <div className="newMain ">
+        <AddDirModal {...this.props}
+          title="新建目录"
+          label="目录名称"
+          ref="addDirModal"
+          addSuccess={this.addSuccess}
+        ></AddDirModal>
+        <style>{`
             .courseForm .ant-form {
             }
             .courseForm .formBlock {
@@ -325,104 +345,105 @@ class BoardsNew extends Component{
             }
             
           `}</style>
-          <div className="edu-class-container edu-position courseForm">
-            <CBreadcrumb items={[
-              { to: current_user&&current_user.first_category_url, name: this.props.coursedata ? this.props.coursedata.name : ''},
-              { to: `/courses/${courseId}/boards/${boardId}`, name: this.state.board_name },
-              { name: this.isEdit ? '帖子编辑' : '帖子新建'}
-            ]}></CBreadcrumb>
+        <div className="edu-class-container edu-position courseForm">
+          <CBreadcrumb items={[
+            { to: current_user && current_user.first_category_url, name: this.props.coursedata ? this.props.coursedata.name : '' },
+            { to: `/classrooms/${courseId}/boards/${boardId}`, name: this.state.board_name },
+            { name: this.isEdit ? '帖子编辑' : '帖子新建' }
+          ]}></CBreadcrumb>
 
-            <p className="clearfix mt20 mb20">
-              <span className="fl font-24 color-grey-3">{this.isEdit ? "编辑" : "新建"}帖子</span>
-              <a href="javascript:void(0)" className="color-grey-6 fr font-16 mr2" 
-                  onClick={this.goBack}>
-                返回
+          <p className="clearfix mt20 mb20">
+            <span className="fl font-24 color-grey-3">{this.isEdit ? "编辑" : "新建"}帖子</span>
+            <a className="color-grey-6 fr font-16 mr2"
+              onClick={this.goBack}>
+              返回
               </a>
-            </p>
-            {/* notRequired */}
-            <Form {...formItemLayout} onSubmit={this.handleSubmit}>
-              <div className="formBlock" style={{paddingBottom: '0px', position: 'relative'}}>
-								{this.state.boardsdata&&this.state.boardsdata.email_notify===true?this.props.isAdminOrTeacher()===true?<Tooltip placement="bottom" title={this.state.isemail_notifys===true?"邮件只能发送一次":""}><span className={"setemail fr mr70 setemailposition"}>
-										<Checkbox onChange={this.setemailchange} checked={this.state.isemail_notifys===true?this.state.isemail_notifys:this.state.isemail_notify} disabled={this.state.isemail_notifys}>发送邮件提醒</Checkbox>
-								</span></Tooltip>:"":""}
+          </p>
+          {/* notRequired */}
+          <Form {...formItemLayout} onSubmit={this.handleSubmit}>
+            <div className="formBlock" style={{ paddingBottom: '0px', position: 'relative' }}>
+              {this.state.boardsdata && this.state.boardsdata.email_notify === true ? this.props.isAdminOrTeacher() === true ? <Tooltip placement="bottom" title={this.state.isemail_notifys === true ? "邮件只能发送一次" : ""}><span className={"setemail fr mr70 setemailposition"}>
+                <Checkbox onChange={this.setemailchange} checked={this.state.isemail_notifys === true ? this.state.isemail_notifys : this.state.isemail_notify} disabled={this.state.isemail_notifys}>发送邮件提醒</Checkbox>
+              </span></Tooltip> : "" : ""}
 
-                {  isAdmin && 
-                    <React.Fragment>
-                      {getFieldDecorator('sticky', {
-                        valuePropName: 'checked',
-                      })(
-                        isAdmin && <Checkbox style={{ right: '22px',
-                          top: '17px',
-                          position: 'absolute'
-                        }}>置顶</Checkbox>
-                      )}
-                      {/* checkbox 有个边距样式 .ant-checkbox-wrapper + span, */}
-                      <span style={{ "padding-left": 0, "padding-right": 0 }}></span>
-                    </React.Fragment>
-                  }
-                <style>
-                  {
-                    `
+              {isAdmin &&
+                <React.Fragment>
+                  {getFieldDecorator('sticky', {
+                    valuePropName: 'checked',
+                  })(
+                    isAdmin && <Checkbox style={{
+                      right: '22px',
+                      top: '17px',
+                      position: 'absolute'
+                    }}>置顶</Checkbox>
+                  )}
+                  {/* checkbox 有个边距样式 .ant-checkbox-wrapper + span, */}
+                  <span style={{ "padding-left": 0, "padding-right": 0 }}></span>
+                </React.Fragment>
+              }
+              <style>
+                {
+                  `
                 .yslboardsnewinputaddonAfter .ant-input{
 																		border-right: none !important;
 																		height: 40px !important;
 																		}
                 
                 `
-                  }
-                </style>
-                <Form.Item
-                  label="标题"
-                  className="topicTitle "
-                >
-                  
-                  {getFieldDecorator('subject', {
-                    rules: [{
-                      required: true, message: '请输入标题',
-                    }, {
-                      max: MAX_TITLE_LENGTH, message: `最大限制为${MAX_TITLE_LENGTH}个字符`,
-                    }],
-                  })(
-                    <Input placeholder={`请输入帖子标题，最大限制${MAX_TITLE_LENGTH}个字符 `}className="searchViewAfter yslboardsnewinputaddonAfter" maxLength={MAX_TITLE_LENGTH}
-                      onInput={this.changeTitle} addonAfter={`${title_num}/${MAX_TITLE_LENGTH}`} />
-                  )}
-                </Form.Item>
+                }
+              </style>
+              <Form.Item
+                label="标题"
+                className="topicTitle "
+              >
 
-                <Form.Item
-                  label=""
-                  style={{ display: 'inline-block' }}
-                >
-                  {getFieldDecorator('select_board_id', {
-                    // initialValue: '3779',
-                  })(
-                    <Select style={{ width: 230 }}
-                      dropdownRender={menu => (
-                        <div>
-                          {menu}
-                          {
-                            isAdmin && !isCourseEnd && 
-                            <React.Fragment>
-                              <Divider style={{ margin: '4px 0' }} />
-                              <div style={{ padding: '8px', cursor: 'pointer' }} onMouseDown={() => this.refs['addDirModal'].open()}>
-                                <Icon type="plus" /> 新建目录
+                {getFieldDecorator('subject', {
+                  rules: [{
+                    required: true, message: '请输入标题',
+                  }, {
+                    max: MAX_TITLE_LENGTH, message: `最大限制为${MAX_TITLE_LENGTH}个字符`,
+                  }],
+                })(
+                  <Input placeholder={`请输入帖子标题，最大限制${MAX_TITLE_LENGTH}个字符 `} className="searchViewAfter yslboardsnewinputaddonAfter" maxLength={MAX_TITLE_LENGTH}
+                    onInput={this.changeTitle} addonAfter={`${title_num}/${MAX_TITLE_LENGTH}`} />
+                )}
+              </Form.Item>
+
+              <Form.Item
+                label=""
+                style={{ display: 'inline-block' }}
+              >
+                {getFieldDecorator('select_board_id', {
+                  // initialValue: '3779',
+                })(
+                  <Select style={{ width: 230 }}
+                    dropdownRender={menu => (
+                      <div>
+                        {menu}
+                        {
+                          isAdmin && !isCourseEnd &&
+                          <React.Fragment>
+                            <Divider style={{ margin: '4px 0' }} />
+                            <div style={{ padding: '8px', cursor: 'pointer' }} onMouseDown={() => this.refs['addDirModal'].open()}>
+                              <Icon type="plus" /> 新建目录
                               </div>
-                            </React.Fragment>
-                          }
-                        </div>
-                      )}
-                    >
-                      {this.state.boards.map(item => {
-                        return (
-                          <Option value={item.id}>{item.name}</Option>
-                        )
-                      })}
-                    </Select>
-                  )}
-                </Form.Item>
+                          </React.Fragment>
+                        }
+                      </div>
+                    )}
+                  >
+                    {this.state.boards.map(item => {
+                      return (
+                        <Option value={item.id}>{item.name}</Option>
+                      )
+                    })}
+                  </Select>
+                )}
+              </Form.Item>
 
 
 
-                {/* { isAdmin && <Form.Item
+              {/* { isAdmin && <Form.Item
                   label=""
                   style={{ display: 'inline-block', marginLeft: "14px" }}
                 >
@@ -431,9 +452,9 @@ class BoardsNew extends Component{
                     <Checkbox>置顶</Checkbox>
                   )}
                 </Form.Item> } */}
-              </div>
+            </div>
 
-              <style>{`
+            <style>{`
                 .courseMessageMD {
                   width: 1140px;
                 }
@@ -451,22 +472,22 @@ class BoardsNew extends Component{
                 
               `}</style>
 
-              <div className="formBlock noBorder">
+            <div className="formBlock noBorder">
 
               <Form.Item
                 label="内容"
                 className="mdInForm"
               >
-              {getFieldDecorator('content', {
-                rules: [{
-                  required: true, message: '请输入帖子内容',
-                }, {
-                  max: 10000, message: '最大限制为10000个字符',
-                }],
-              })(
-                <TPMMDEditor ref={this.mdRef} placeholder={'请在此输入帖子详情，最大限制为10000个字符'} 
+                {getFieldDecorator('content', {
+                  rules: [{
+                    required: true, message: '请输入帖子内容',
+                  }, {
+                    max: 10000, message: '最大限制为10000个字符',
+                  }],
+                })(
+                  <TPMMDEditor ref={this.mdRef} placeholder={'请在此输入帖子详情，最大限制为10000个字符'}
                     mdID={'courseMessageMD'} initValue={this.editTopic ? this.editTopic.content : ''} className="courseMessageMD"></TPMMDEditor>
-              )}
+                )}
               </Form.Item>
 
               <Upload {...uploadProps} className="upload_1">
@@ -475,23 +496,23 @@ class BoardsNew extends Component{
                 </Button>
                 (单个文件150M以内)
               </Upload>
+            </div>
+
+            <Form.Item>
+              <div className="clearfix mt30 mb30">
+                <SubBtn type="primary" htmlType="submit" className="fl mr20">提交</SubBtn>
+                <a className="defalutCancelbtn fl"
+                  onClick={() => this.isEdit ?
+                    this.props.toDetailPage(Object.assign({}, this.props.match.params, { 'coursesId': course_id })) :
+                    this.props.toListPage(Object.assign({}, this.props.match.params, { 'coursesId': course_id }))}>取消</ a>
               </div>
-              
-              <Form.Item>
-                <div className="clearfix mt30 mb30">
-                  <Button type="primary" htmlType="submit"  className="defalutSubmitbtn fl mr20">提交</Button>
-                  <a className="defalutCancelbtn fl" 
-                    onClick={() => this.isEdit ? 
-                      this.props.toDetailPage(Object.assign({}, this.props.match.params, {'coursesId': course_id})) : 
-                      this.props.toListPage(Object.assign({}, this.props.match.params, {'coursesId': course_id})) }>取消</ a>
-                </div>
-              </Form.Item>
-            </Form>
-          </div>
+            </Form.Item>
+          </Form>
         </div>
-      )
-    }
+      </div>
+    )
+  }
 }
 
 const WrappedBoardsNew = Form.create({ name: 'boardsNew' })(BoardsNew);
-export default RouteHOC()(WrappedBoardsNew);
\ No newline at end of file
+export default RouteHOC()(WrappedBoardsNew);
diff --git a/src/modules/courses/boards/TopicDetail.js b/src/modules/courses/boards/TopicDetail.js
index 483dafe1..3e24cd50 100644
--- a/src/modules/courses/boards/TopicDetail.js
+++ b/src/modules/courses/boards/TopicDetail.js
@@ -2,20 +2,22 @@ import React, { Component } from 'react';
 import axios from 'axios'
 import moment from 'moment'
 import Comments from '../../comment/Comments'
-import {ImageLayerOfCommentHOC} from '../../page/layers/ImageLayerOfCommentHOC'
+import { ImageLayerOfCommentHOC } from '../../page/layers/ImageLayerOfCommentHOC'
 import MemoDetailMDEditor from '../../forums/MemoDetailMDEditor'
 import { RouteHOC } from './common.js'
 import '../../forums/Post.css'
 import '../../forums/RightSection.css'
 import './TopicDetail.css'
 import '../common/courseMessage.css'
-import { Pagination, Tooltip,Button } from 'antd'
-import { bytesToSize, ConditionToolTip, markdownToHTML, MarkdownToHtml , setImagesUrl } from 'educoder'
+import { Pagination, Tooltip, Button } from 'antd'
+import { bytesToSize, ConditionToolTip, markdownToHTML, MarkdownToHtml, setImagesUrl } from 'educoder'
 import SendToCourseModal from '../coursesPublic/modal/SendToCourseModal'
 import CBreadcrumb from '../common/CBreadcrumb'
-import { generateComments, generateChildComments, _findById, handleContentBeforeCreateNew, addNewComment
+import {
+  generateComments, generateChildComments, _findById, handleContentBeforeCreateNew, addNewComment
   , addSecondLevelComment, NEED_TO_WRITE_CONTENT, handleContentBeforeCreateSecondLevelComment
-  , handleDeleteComment, handleCommentPraise, handleHiddenComment } from '../common/CommentsHelper'
+  , handleDeleteComment, handleCommentPraise, handleHiddenComment
+} from '../common/CommentsHelper'
 
 const $ = window.$
 const REPLY_PAGE_COUNT = 10;
@@ -23,258 +25,259 @@ let setTime;
 function urlStringify(params) {
   let noParams = true;
   let paramsUrl = '';
-    for (let key in params) {
-      noParams = false;
-      paramsUrl += `${key}=${params[key]}&`
-    }
-    if (noParams) {
-      return '';
-    }
-    paramsUrl = paramsUrl.substring(0, paramsUrl.length - 1);
-    return paramsUrl;
+  for (let key in params) {
+    noParams = false;
+    paramsUrl += `${key}=${params[key]}&`
+  }
+  if (noParams) {
+    return '';
+  }
+  paramsUrl = paramsUrl.substring(0, paramsUrl.length - 1);
+  return paramsUrl;
 }
 class TopicDetail extends Component {
-    constructor(props) {
-      super(props)
+  constructor(props) {
+    super(props)
 
-      this.state = {
-        memo: {},
-        memoLoading: true,
-        hasMoreComments: false,
-        pageCount: 1,
-        comments: [],
-        goldRewardDialogOpen: false,
-        author:undefined,
-        commentstype:false
-      }
+    this.state = {
+      memo: {},
+      memoLoading: true,
+      hasMoreComments: false,
+      pageCount: 1,
+      comments: [],
+      goldRewardDialogOpen: false,
+      author: undefined,
+      commentstype: false
     }
-    componentDidMount() {
-      window.$("html,body").animate({"scrollTop":0})
+  }
+  componentDidMount() {
+    window.$("html,body").animate({ "scrollTop": 0 })
 
-      const topicId = this.props.match.params.topicId
-      const bid = this.props.match.params.boardId
+    const topicId = this.props.match.params.topicId
+    const bid = this.props.match.params.boardId
 
-      const memoUrl = `/messages/${topicId}.json`;
-      this.setState({
-        memoLoading: true
+    const memoUrl = `/messages/${topicId}.json`;
+    this.setState({
+      memoLoading: true
+    })
+    axios.get(memoUrl, {
+    })
+      .then((response) => {
+
+        if (response.data.status === -1) {
+          setTimeout(() => {
+            this.props.showNotification('帖子不存在！')
+          }, 300)
+          // this.props.toListPage(response.data.data.course_id, bid)
+          return;
+        } else {
+
+          this.setState({
+            memo: Object.assign({}, {
+              ...response.data.data,
+              replies_count: response.data.data.total_replies_count
+            }, { ...this.state.memo }),
+            author: response.data.data.author
+          }, () => {
+          })
+
+          // const { memo_replies, memo } = response.data;
+          // let hasMoreComments = false;
+          // if (memo_replies && memo_replies.length === 10 && memo.total_replies_count > 10) {
+          //   // 遍历一遍，计算下是否还有评论未加载
+          //   let totalCount = 10;
+          //   memo_replies.forEach(item=>{
+          //     totalCount += item.children.length
+          //   })
+          //   if (totalCount < memo.total_replies_count) {
+          //     hasMoreComments = true;
+          //   }
+          // }
+          // this.setState({
+          //   hasMoreComments,
+          //   pageCount: 1,
+          //   comments: memo_replies
+          // })
+          // delete response.data.memo_replies;
+          // this.setState(response.data)
+          // const user = response.data.current_user;
+          // user.tidding_count = response.data.tidding_count;
+          // this.props.initCommonState(user)
+        }
+        this.setState({
+          memoLoading: false
+        })
+
+      }).catch((error) => {
+        console.log(error)
       })
-      axios.get(memoUrl,{
-          })
-          .then((response) => {
 
-            if (response.data.status === -1) {
-              setTimeout(() => {
-                this.props.showNotification('帖子不存在！')
-              }, 300)
-              // this.props.toListPage(response.data.data.course_id, bid)
-              return;
-            } else  {
+    this.fetchReplies()
 
-              this.setState({
-                memo: Object.assign({}, {
-                  ...response.data.data,
-                  replies_count: response.data.data.total_replies_count
-                }, {...this.state.memo}),
-                author:response.data.data.author
-              }, () => {
-              })
+    $('body>#root').on('onMemoDelete', (event) => {
+      // const val = $('body>#root').data('onMemoDelete')
+      const val = window.onMemoDelete;
+      this.onMemoDelete(JSON.parse(decodeURIComponent(val)))
+    })
 
-              // const { memo_replies, memo } = response.data;
-              // let hasMoreComments = false;
-              // if (memo_replies && memo_replies.length === 10 && memo.total_replies_count > 10) {
-              //   // 遍历一遍，计算下是否还有评论未加载
-              //   let totalCount = 10;
-              //   memo_replies.forEach(item=>{
-              //     totalCount += item.children.length
-              //   })
-              //   if (totalCount < memo.total_replies_count) {
-              //     hasMoreComments = true;
-              //   }
-              // }
-              // this.setState({
-              //   hasMoreComments,
-              //   pageCount: 1,
-              //   comments: memo_replies
-              // })
-              // delete response.data.memo_replies;
-              // this.setState(response.data)
-              // const user = response.data.current_user;
-              // user.tidding_count = response.data.tidding_count;
-              // this.props.initCommonState(user)
-            }
-            this.setState({
-              memoLoading: false
-            })
 
-          }).catch((error) => {
-            console.log(error)
-          })
+  }
 
+  onPaginationChange = (pageCount) => {
+    this.setState({ pageCount }, () => {
       this.fetchReplies()
+    })
+  }
 
-      $('body>#root').on('onMemoDelete', (event) => {
-        // const val = $('body>#root').data('onMemoDelete')
-        const val = window.onMemoDelete ;
-        this.onMemoDelete( JSON.parse(decodeURIComponent(val)) )
-      })
-
-
-    }
-
-    onPaginationChange = (pageCount) => {
-      this.setState({ pageCount }, () => {
-        this.fetchReplies()
-      })
-    }
-
-    componentWillUnmount() {
-      $('body>#root').off('onMemoDelete')
-    }
-    onMemoDelete(memo) {
-      const deleteUrl = `/commons/delete.json`;
-      // 获取memo list
-        axios.delete(deleteUrl, { data: {
-            object_id: memo.id,
-            object_type: 'message'
-          }
-        })
-        .then((response) => {
-          const status = response.data.status
-          if (status === 0) {
-
-            this.props.showNotification('删除成功');
-            const props = Object.assign({}, this.props, {})
-            this.props.toListPage( Object.assign({}, this.props.match.params, {'coursesId': this.state.memo.course_id} ) )
-
-          } else if (status === -1) {
-            this.props.showNotification('帖子已被删除');
-            this.props.history.push(`/forums`)
-          }
-        }).catch((error) => {
-          console.log(error)
-        })
-    }
-
-    componentDidUpdate(prevProps, prevState, snapshot) {
-      // if (this.state.memo && this.state.memo.content
-      //     && (!prevProps.memo || prevProps.memo.content != this.state.memo.content) ) {
-      if (this.state.memo && this.state.memo.content && prevState.memoLoading === true && this.state.memoLoading === false) {
-        // md渲染content，等xhr执行完（即memoLoading变化），memo.content更新后初始化md
-
-          setTimeout(()=>{
-            // var shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", {
-            //     htmlDecode: "style,script,iframe",  // you can filter tags decode
-            //     taskList: true,
-            //     tex: true,  // 默认不解析
-            //     flowChart: true,  // 默认不解析
-            //     sequenceDiagram: true // 默认不解析
-            // });
-          }, 200)
+  componentWillUnmount() {
+    $('body>#root').off('onMemoDelete')
+  }
+  onMemoDelete(memo) {
+    const deleteUrl = `/commons/delete.json`;
+    // 获取memo list
+    axios.delete(deleteUrl, {
+      data: {
+        object_id: memo.id,
+        object_type: 'message'
       }
+    })
+      .then((response) => {
+        const status = response.data.status
+        if (status === 0) {
 
-    }
+          this.props.showNotification('删除成功');
+          const props = Object.assign({}, this.props, {})
+          this.props.toListPage(Object.assign({}, this.props.match.params, { 'coursesId': this.state.memo.course_id }))
 
-    clickPraise(){
-        const { memo } = this.state;
-        // const url = `/api/v1/discusses/${memo.id}/plus`;
-        const url = memo.user_praise ? '/praise_tread/unlike.json' : `/praise_tread/like.json`;
-        const _method = memo.user_praise ? axios.delete : axios.post
-        let _data = {
-          object_id: memo.id,
-          object_type: 'message',  //Discuss
+        } else if (status === -1) {
+          this.props.showNotification('帖子已被删除');
+          this.props.history.push(`/forums`)
         }
-        if (memo.user_praise) {
-          _data = {
-            data: _data
-          }
-        }
-        _method(url, {
-              ..._data
-            },
-            {
-
-            }
-        ).then((response) => {
-
-            const newMemo = Object.assign({}, this.state.memo)
-            newMemo.praises_count = newMemo.user_praise ? newMemo.praises_count - 1 : newMemo.praises_count + 1
-            newMemo.total_praises_count = newMemo.user_praise ? newMemo.total_praises_count - 1 : newMemo.total_praises_count + 1
-            newMemo.user_praise = !newMemo.user_praise
-            this.setState({memo : newMemo })
-        }).catch((error) => {
-                console.log(error)
-        })
-    }
-    renderAttachment() {
-      const { memo } = this.state;
-      const attachments = []
-      memo.attachments.forEach((item, index) => {
-        const ar = item.url.split('/')
-        const fileName = item.title || ar[ar.length - 1]
-        let filesize = 0
-        if (item.filesize) {
-          filesize = item.filesize
-          // filesize = bytesToSize(item.filesize)
-        }
-        attachments.push(
-          // <p className="clearfix" key={index} >
-          //   <a href={item.url} className="color-green clearfix notefileDownload">
-          //     <i className="iconfont icon-fujian color-green ml5 fl"></i>
-          //     {fileName && <ConditionToolTip title={fileName} condition={fileName.length > 30 }>
-          //       <span className="fl task-hide upload_item" style={{ color: '#333'}}>{fileName}</span>
-          //     </ConditionToolTip>}
-          //     <span className="fl" style={{ color: '#999', marginLeft: '6px'}}>{filesize? ` ${filesize.replace(' ', '')}` : ''}</span>
-          //   </a>
-          // </p>
-
-          <div className="color-grey df" key={index}>
-            <a className="color-grey ">
-              <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
-            </a>
-            {/* {fileName && <ConditionToolTip title={fileName} condition={fileName.length > 30 }> </ConditionToolTip>} */}
-              <a href={item.url} title={fileName.length > 30 ? fileName : ''}
-                  className="mr12 color9B9B overflowHidden1" length="58" style={{maxWidth: '480px'}}>
-                {fileName}
-              </a>
-
-
-            <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
-
-          </div>
-          )
+      }).catch((error) => {
+        console.log(error)
       })
-      return attachments;
+  }
+
+  componentDidUpdate(prevProps, prevState, snapshot) {
+    // if (this.state.memo && this.state.memo.content
+    //     && (!prevProps.memo || prevProps.memo.content != this.state.memo.content) ) {
+    if (this.state.memo && this.state.memo.content && prevState.memoLoading === true && this.state.memoLoading === false) {
+      // md渲染content，等xhr执行完（即memoLoading变化），memo.content更新后初始化md
+
+      setTimeout(() => {
+        // var shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", {
+        //     htmlDecode: "style,script,iframe",  // you can filter tags decode
+        //     taskList: true,
+        //     tex: true,  // 默认不解析
+        //     flowChart: true,  // 默认不解析
+        //     sequenceDiagram: true // 默认不解析
+        // });
+      }, 200)
     }
-    // ------------------------------------------------------------------------------------------- comments  START
-    // ------------------------------------------------------------------------------------------- comments  START
-    transformReply = (reply, children = []) => {
-      const isAdmin = this.props.isAdmin()
-      const isSuperAdmin = this.props.isSuperAdmin()
-      return {
-        isSuperAdmin: isSuperAdmin,
-        admin: isAdmin, //
-        permission: true, //
-        children: children,
-        child_message_count: reply.total_count,
-        hidden: reply.is_hidden,
-        id: reply.id,
-        image_url: reply.author.image_url,
-        reward: null, //
-        time: moment(reply.created_on).fromNow(),
-        user_id: reply.author.id,
-        user_login: reply.author.login,
-        user_praise: reply.liked,
-        username: reply.author.name,
-        content: reply.content,
-        praise_count: reply.praises_count
+
+  }
+
+  clickPraise() {
+    const { memo } = this.state;
+    // const url = `/api/v1/discusses/${memo.id}/plus`;
+    const url = memo.user_praise ? '/praise_tread/unlike.json' : `/praise_tread/like.json`;
+    const _method = memo.user_praise ? axios.delete : axios.post
+    let _data = {
+      object_id: memo.id,
+      object_type: 'message',  //Discuss
+    }
+    if (memo.user_praise) {
+      _data = {
+        data: _data
       }
     }
+    _method(url, {
+      ..._data
+    },
+      {
 
-    fetchReplies = () => {
-      const topicId = this.props.match.params.topicId
-      const url = `/messages/${topicId}/reply_list.json?page=${this.state.pageCount}&page_size=${REPLY_PAGE_COUNT}`
-      axios.get(url,{
-      })
+      }
+    ).then((response) => {
+
+      const newMemo = Object.assign({}, this.state.memo)
+      newMemo.praises_count = newMemo.user_praise ? newMemo.praises_count - 1 : newMemo.praises_count + 1
+      newMemo.total_praises_count = newMemo.user_praise ? newMemo.total_praises_count - 1 : newMemo.total_praises_count + 1
+      newMemo.user_praise = !newMemo.user_praise
+      this.setState({ memo: newMemo })
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+  renderAttachment() {
+    const { memo } = this.state;
+    const attachments = []
+    memo.attachments.forEach((item, index) => {
+      const ar = item.url.split('/')
+      const fileName = item.title || ar[ar.length - 1]
+      let filesize = 0
+      if (item.filesize) {
+        filesize = item.filesize
+        // filesize = bytesToSize(item.filesize)
+      }
+      attachments.push(
+        // <p className="clearfix" key={index} >
+        //   <a href={item.url} className="color-green clearfix notefileDownload">
+        //     <i className="iconfont icon-fujian color-green ml5 fl"></i>
+        //     {fileName && <ConditionToolTip title={fileName} condition={fileName.length > 30 }>
+        //       <span className="fl task-hide upload_item" style={{ color: '#333'}}>{fileName}</span>
+        //     </ConditionToolTip>}
+        //     <span className="fl" style={{ color: '#999', marginLeft: '6px'}}>{filesize? ` ${filesize.replace(' ', '')}` : ''}</span>
+        //   </a>
+        // </p>
+
+        <div className="color-grey df" key={index}>
+          <a className="color-grey ">
+            <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
+          </a>
+          {/* {fileName && <ConditionToolTip title={fileName} condition={fileName.length > 30 }> </ConditionToolTip>} */}
+          <a href={item.url} title={fileName.length > 30 ? fileName : ''}
+            className="mr12 color9B9B overflowHidden1" length="58" style={{ maxWidth: '480px' }}>
+            {fileName}
+          </a>
+
+
+          <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
+
+        </div>
+      )
+    })
+    return attachments;
+  }
+  // ------------------------------------------------------------------------------------------- comments  START
+  // ------------------------------------------------------------------------------------------- comments  START
+  transformReply = (reply, children = []) => {
+    const isAdmin = this.props.isAdmin()
+    const isSuperAdmin = this.props.isSuperAdmin()
+    return {
+      isSuperAdmin: isSuperAdmin,
+      admin: isAdmin, //
+      permission: true, //
+      children: children,
+      child_message_count: reply.total_count,
+      hidden: reply.is_hidden,
+      id: reply.id,
+      image_url: reply.author.image_url,
+      reward: null, //
+      time: moment(reply.created_on).fromNow(),
+      user_id: reply.author.id,
+      user_login: reply.author.login,
+      user_praise: reply.liked,
+      username: reply.author.name,
+      content: reply.content,
+      praise_count: reply.praises_count
+    }
+  }
+
+  fetchReplies = () => {
+    const topicId = this.props.match.params.topicId
+    const url = `/messages/${topicId}/reply_list.json?page=${this.state.pageCount}&page_size=${REPLY_PAGE_COUNT}`
+    axios.get(url, {
+    })
       .then((response) => {
         const { replies, liked, total_replies_count, total_count } = response.data.data
 
@@ -290,146 +293,146 @@ class TopicDetail extends Component {
       }).catch((error) => {
         console.log(error)
       })
+  }
+
+  _getUser() {
+    const { current_user } = this.props;
+    current_user.user_url = `/users/${current_user.login}`;
+    return current_user;
+  }
+  _findById = _findById
+  replyComment = (commentContent, id, editor) => {
+    const { showNotification } = this.props;
+    // if (!commentContent || commentContent.length === 0) {
+    //   showNotification(NEED_TO_WRITE_CONTENT)
+    //   return;
+    // }
+
+    if (this.state.memo.id === id) { // 回复帖子
+      this.createNewComment(commentContent, id, editor);
+      return;
     }
+    const url = `/messages/${id}/reply.json`;
 
-    _getUser() {
-      const { current_user } = this.props;
-      current_user.user_url = `/users/${current_user.login}`;
-      return current_user;
+    const { comments } = this.state;
+    const user = this._getUser();
+    /*
+    移除末尾的空行
+    .replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
+
+    */
+
+    commentContent = handleContentBeforeCreateSecondLevelComment(commentContent)
+    if (!commentContent) {
+      this.props.showNotification('不能为空')
+      return;
     }
-    _findById = _findById
-    replyComment = (commentContent, id, editor) => {
-      const { showNotification } = this.props;
-      // if (!commentContent || commentContent.length === 0) {
-      //   showNotification(NEED_TO_WRITE_CONTENT)
-      //   return;
-      // }
-
-      if (this.state.memo.id === id ) { // 回复帖子
-        this.createNewComment(commentContent, id, editor);
-        return;
+    axios.post(url, {
+      content: commentContent
+    },
+      {
       }
-      const url = `/messages/${id}/reply.json`;
+    ).then((response) => {
+      if (response.data.data.id) {
+        let newId = response.data.data.id;
+        const commentIndex = this._findById(id, comments);
+        const parentComment = comments[commentIndex]
 
-      const { comments } = this.state;
-      const user = this._getUser();
-      /*
-      移除末尾的空行
-      .replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
-
-      */
-
-      commentContent = handleContentBeforeCreateSecondLevelComment(commentContent)
-      if (!commentContent) {
-        this.props.showNotification('不能为空')
-        return;
-      }
-      axios.post(url, {
-            content: commentContent
-          },
-          {
-          }
-        ).then((response) => {
-          if (response.data.data.id) {
-            let newId = response.data.data.id;
-            const commentIndex = this._findById(id, comments);
-            const parentComment = comments[commentIndex]
-
-            this.setState({
-              // runTesting: false,
-              comments: addSecondLevelComment(comments, parentComment, commentIndex, newId, commentContent, user, editor)
-            }, ()=>{
-              // keditor代码美化
-              editor.html && window.prettyPrint()
-            })
-
-            const newMemo2 = Object.assign({}, this.state.memo);
-            newMemo2.total_replies_count = newMemo2.total_replies_count + 1;
-            this.setState({
-              memo: newMemo2
-            })
-          }
-
-        }).catch((error) => {
-          console.log(error)
+        this.setState({
+          // runTesting: false,
+          comments: addSecondLevelComment(comments, parentComment, commentIndex, newId, commentContent, user, editor)
+        }, () => {
+          // keditor代码美化
+          editor.html && window.prettyPrint()
         })
-    }
-    // 公共接口 --- 删除回复
-    deleteComment = (parrentComment, childCommentId) => {
-      handleDeleteComment(this, parrentComment, childCommentId, 'message')
 
-    }
-    // 公共接口 --- 回复点赞
-    commentPraise = (discussId) => {
-      handleCommentPraise(this, discussId, 'message', (old_user_praise) => {
         const newMemo2 = Object.assign({}, this.state.memo);
-
-        newMemo2.total_praises_count = old_user_praise
-              ? newMemo2.total_praises_count - 1 : newMemo2.total_praises_count + 1;
+        newMemo2.total_replies_count = newMemo2.total_replies_count + 1;
         this.setState({
           memo: newMemo2
         })
+      }
+
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+  // 公共接口 --- 删除回复
+  deleteComment = (parrentComment, childCommentId) => {
+    handleDeleteComment(this, parrentComment, childCommentId, 'message')
+
+  }
+  // 公共接口 --- 回复点赞
+  commentPraise = (discussId) => {
+    handleCommentPraise(this, discussId, 'message', (old_user_praise) => {
+      const newMemo2 = Object.assign({}, this.state.memo);
+
+      newMemo2.total_praises_count = old_user_praise
+        ? newMemo2.total_praises_count - 1 : newMemo2.total_praises_count + 1;
+      this.setState({
+        memo: newMemo2
       })
-    }
-    // 公共接口 --- 隐藏回复
-    hiddenComment = (item, childCommentId) => {
-      handleHiddenComment(this, item, childCommentId, 'message')
-    }
-    createNewComment = (commentContent, id, editor) => {
-      let content = handleContentBeforeCreateNew(commentContent);
-      const { memo } = this.props;
+    })
+  }
+  // 公共接口 --- 隐藏回复
+  hiddenComment = (item, childCommentId) => {
+    handleHiddenComment(this, item, childCommentId, 'message')
+  }
+  createNewComment = (commentContent, id, editor) => {
+    let content = handleContentBeforeCreateNew(commentContent);
+    const { memo } = this.props;
 
-      const url = `/messages/${id}/reply.json`;
+    const url = `/messages/${id}/reply.json`;
 
-      // const url = `/api/v1/memos/${memo.id}/reply`;
-      let { comments } = this.state;
-      axios.post(url, {
-          content: content
-        },
-        {
-        }
-      ).then((response) => {
-        if (response.data.status === -1) {
-          console.error('服务端异常')
-          return;
-        }
-        // this.props.showNotification('帖子发表成功')
+    // const url = `/api/v1/memos/${memo.id}/reply`;
+    let { comments } = this.state;
+    axios.post(url, {
+      content: content
+    },
+      {
+      }
+    ).then((response) => {
+      if (response.data.status === -1) {
+        console.error('服务端异常')
+        return;
+      }
+      // this.props.showNotification('帖子发表成功')
 
-        if (response.data) {
-          const _id = response.data.data.id;
-          // ke
-          editor.html && editor.html('');
-          editor.afterBlur && editor.afterBlur()
-          // md
-          editor.setValue && editor.setValue('')
+      if (response.data) {
+        const _id = response.data.data.id;
+        // ke
+        editor.html && editor.html('');
+        editor.afterBlur && editor.afterBlur()
+        // md
+        editor.setValue && editor.setValue('')
 
 
-          const user = this._getUser();
-          this.setState({
-            comments: addNewComment(comments, _id, content, user, this.props.isSuperAdmin(), this)
-          })
-          const newMemo2 = Object.assign({}, this.state.memo);
-          newMemo2.total_replies_count = newMemo2.total_replies_count + 1;
-          this.setState({
-            memo: newMemo2
-          })
-          this.refs.editor.showEditor();
-          this.refs.editor.close();
+        const user = this._getUser();
+        this.setState({
+          comments: addNewComment(comments, _id, content, user, this.props.isSuperAdmin(), this)
+        })
+        const newMemo2 = Object.assign({}, this.state.memo);
+        newMemo2.total_replies_count = newMemo2.total_replies_count + 1;
+        this.setState({
+          memo: newMemo2
+        })
+        this.refs.editor.showEditor();
+        this.refs.editor.close();
 
 
-        }
-      }).catch((error) => {
-        console.log(error)
-      })
-    }
+      }
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
 
-    /**
-     * parent.isAllChildrenLoaded 为 true的时候，表示已经没有更多子回复了
-     */
-    loadMoreChildComments = (parent) => {
-      const url = `/messages/${parent.id}/reply_list.json?page=1&page_size=500`
-      axios.get(url,{
-      })
+  /**
+   * parent.isAllChildrenLoaded 为 true的时候，表示已经没有更多子回复了
+   */
+  loadMoreChildComments = (parent) => {
+    const url = `/messages/${parent.id}/reply_list.json?page=1&page_size=500`
+    axios.get(url, {
+    })
       .then((response) => {
         const { replies, liked, total_replies_count } = response.data.data
 
@@ -442,100 +445,96 @@ class TopicDetail extends Component {
       }).catch((error) => {
         console.log(error)
       })
-    }
-    // ------------------------------------------------------------------------------------------- comments  END
-    // ------------------------------------------------------------------------------------------- comments  END
-    // 置顶
-    setTop(memo) {
-      // const params = {
-      //   sticky: memo.sticky ? 0 : 1,
-      // }
-      // if (this.state.p_s_order) {
-      //   params.order = this.state.p_s_order;
-      // }
-      // if (this.state.p_forum_id) {
-      //   params.forum_id = this.state.p_forum_id;
-      // }
-        // let paramsUrl = urlStringify(params)
-      const set_top_or_down_Url = `/messages/${memo.id}/sticky_top.json`;
-      // 获取memo list
-        axios.put(set_top_or_down_Url, {
+  }
+  // ------------------------------------------------------------------------------------------- comments  END
+  // ------------------------------------------------------------------------------------------- comments  END
+  // 置顶
+  setTop(memo) {
+    // const params = {
+    //   sticky: memo.sticky ? 0 : 1,
+    // }
+    // if (this.state.p_s_order) {
+    //   params.order = this.state.p_s_order;
+    // }
+    // if (this.state.p_forum_id) {
+    //   params.forum_id = this.state.p_forum_id;
+    // }
+    // let paramsUrl = urlStringify(params)
+    const set_top_or_down_Url = `/messages/${memo.id}/sticky_top.json`;
+    // 获取memo list
+    axios.put(set_top_or_down_Url, {
 
-        })
-        .then((response) => {
-          const status = response.data.status
-          if (status === 0) {
-            this.props.showNotification( memo.sticky ? '取消置顶成功' : '置顶成功');
-            memo.sticky = memo.sticky ? false : true
-            this.setState({
-              memo: Object.assign({}, memo)
-            })
-          }
-        }).catch((error) => {
-          console.log(error)
-        })
-    }
-
-    setRewardDialogVisible = (visible) => {
-      this.setState({
-        goldRewardDialogOpen: visible
+    })
+      .then((response) => {
+        const status = response.data.status
+        if (status === 0) {
+          this.props.showNotification(memo.sticky ? '取消置顶成功' : '置顶成功');
+          memo.sticky = memo.sticky ? false : true
+          this.setState({
+            memo: Object.assign({}, memo)
+          })
+        }
+      }).catch((error) => {
+        console.log(error)
       })
-    }
-    showRewardDialog = () => {
-      this.setState({
-        goldRewardDialogOpen: true
-      })
-    }
-    // --------------------------------------------------------------------------------------------帖子獎勵 END
-    showCommentInput = () => {
-      if (window.__useKindEditor === true) {
-        this.refs.editor.showEditor();
-      } else {
-        this.refs.editor.showEditor();
-      }
-    }
-    initReply = (parent) => {
-      if (!parent.isAllChildrenLoaded) {
-        this.loadMoreChildComments(parent)
-      }
-    }
+  }
 
-  startcomments=()=>{
-    setTime = setInterval( ()=> {
-        this.fetchReplies()
-      }, 5000);
-      this.setState({
-        commentstype:true
-      })
-    }
-
-  clearcomments=()=>{
-    clearInterval(setTime);
+  setRewardDialogVisible = (visible) => {
     this.setState({
-      commentstype:false
+      goldRewardDialogOpen: visible
+    })
+  }
+  showRewardDialog = () => {
+    this.setState({
+      goldRewardDialogOpen: true
+    })
+  }
+  // --------------------------------------------------------------------------------------------帖子獎勵 END
+  showCommentInput = () => {
+    this.refs.editor.showEditor();
+  }
+  initReply = (parent) => {
+    if (!parent.isAllChildrenLoaded) {
+      this.loadMoreChildComments(parent)
+    }
+  }
+
+  startcomments = () => {
+    setTime = setInterval(() => {
+      this.fetchReplies()
+    }, 5000);
+    this.setState({
+      commentstype: true
     })
   }
 
-  	render() {
-  		const { match, history } = this.props
-      const { recommend_shixun, current_user,author_info } = this.props;
-      const { memo, comments, hasMoreComments, commentstype, pageCount, total_count , author } = this.state;
-      const messageId = match.params.topicId
-      if (this.state.memoLoading || !current_user) {
-        return <div className="edu-back-white" id="forum_index_list"></div>
-      }
-      current_user.user_url = `/users/${current_user.login}`;
-      const isCurrentUserTheAuthor = current_user.login == memo.author.login
-      const isAdmin = this.props.isAdmin()
-      // TODO 图片上传地址
-      const courseId=this.props.match.params.coursesId;
-      const boardId = this.props.match.params.boardId;
-      const isCourseEnd = this.props.isCourseEnd();
+  clearcomments = () => {
+    clearInterval(setTime);
+    this.setState({
+      commentstype: false
+    })
+  }
 
-			document.title=this.props.coursedata&&this.props.coursedata.name;
-	    return (
-        <div className="edu-back-white edu-class-container edu-position course-message topicDetail" id="yslforum_index_list"> {/* fl with100 */}
-          <style>{`
+  render() {
+    const { match, history } = this.props
+    const { recommend_shixun, current_user, author_info } = this.props;
+    const { memo, comments, hasMoreComments, commentstype, pageCount, total_count, author } = this.state;
+    const messageId = match.params.topicId
+    if (this.state.memoLoading || !current_user) {
+      return <div className="edu-back-white" id="forum_index_list"></div>
+    }
+    current_user.user_url = `/users/${current_user.login}`;
+    const isCurrentUserTheAuthor = current_user.login == memo.author.login
+    const isAdmin = this.props.isAdmin()
+    // TODO 图片上传地址
+    const courseId = this.props.match.params.coursesId;
+    const boardId = this.props.match.params.boardId;
+    const isCourseEnd = this.props.isCourseEnd();
+
+    document.title = this.props.coursedata && this.props.coursedata.name;
+    return (
+      <div className="edu-back-white edu-class-container edu-position course-message topicDetail" id="yslforum_index_list"> {/* fl with100 */}
+        <style>{`
             .topicDetail #forum_list .return_btn.no_mr {
               margin-right: 1px;
             }
@@ -553,196 +552,196 @@ class TopicDetail extends Component {
                 width: 1072px;
             }
           `}</style>
-          <CBreadcrumb className={'independent'} items={[
-            { to: current_user&&current_user.first_category_url, name: this.props.coursedata.name},
-            { to: `/courses/${courseId}/boards/${boardId}`, name: memo.board_name },
-            { name: '帖子详情'}
-          ]}></CBreadcrumb>
+        <CBreadcrumb className={'independent'} items={[
+          { to: current_user && current_user.first_category_url, name: this.props.coursedata.name },
+          { to: `/classrooms/${courseId}/boards/${boardId}`, name: memo.board_name },
+          { name: '帖子详情' }
+        ]}></CBreadcrumb>
 
-          <SendToCourseModal
-            ref="sendToCourseModal"
-            {...this.props}
-            moduleName="帖子"
-            seletedMessageIds={[messageId]}
-          ></SendToCourseModal>
-          <div className="clearfix">
-        		<div id="forum_list" className="forum_table mh650">
-    	        	<div className="padding30 bor-bottom-greyE" style={{paddingBottom: '20px'}}>
-                        <div className="font-16 cdefault clearfix pr pr35">
-                            <span className="noteDetailTitle">{memo.subject}</span>
-                            { !!memo.sticky && <span className="btn-cir btn-cir-red ml10"
-                                style={{position: 'relative', bottom: '4px'}}>置顶</span>}
-                            { !!memo.reward && <span className="color-orange font-14 ml15"
-                              data-tip-down={`获得平台奖励金币：${memo.reward}`} >
-                              <i className="iconfont icon-gift mr5"></i>{memo.reward}
-                            </span> }
-                            {/* || current_user.user_id === author_info.user_id */}
-                            { current_user && (isAdmin || isCurrentUserTheAuthor)  &&
-                                <div className="edu-position-hidebox" style={{position: 'absolute', right: '2px',top:'4px'}}>
-                                    <a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>
-                                    <ul className="edu-position-hide undis">
+        <SendToCourseModal
+          ref="sendToCourseModal"
+          {...this.props}
+          moduleName="帖子"
+          seletedMessageIds={[messageId]}
+        ></SendToCourseModal>
+        <div className="clearfix">
+          <div id="forum_list" className="forum_table mh650">
+            <div className="padding30 bor-bottom-greyE" style={{ paddingBottom: '20px' }}>
+              <div className="font-16 cdefault clearfix pr pr35">
+                <span className="noteDetailTitle">{memo.subject}</span>
+                {!!memo.sticky && <span className="btn-cir btn-cir-red ml10"
+                  style={{ position: 'relative', bottom: '4px' }}>置顶</span>}
+                {!!memo.reward && <span className="color-orange font-14 ml15"
+                  data-tip-down={`获得平台奖励金币：${memo.reward}`} >
+                  <i className="iconfont icon-gift mr5"></i>{memo.reward}
+                </span>}
+                {/* || current_user.user_id === author_info.user_id */}
+                {current_user && (isAdmin || isCurrentUserTheAuthor) &&
+                  <div className="edu-position-hidebox" style={{ position: 'absolute', right: '2px', top: '4px' }}>
+                    <a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>
+                    <ul className="edu-position-hide undis">
 
-                                        { ( isCurrentUserTheAuthor || isAdmin ) &&
-                                            <li><a
-                                              onClick={() => this.props.toEditPage( Object.assign({}, this.props.match.params, {'coursesId': this.state.memo.course_id}) ) }
-                                            >编&nbsp;&nbsp;辑</a></li>}
-                                        { isAdmin &&
-                                          ( memo.sticky == true ?
-                                            <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>取消置顶</a></li>
-                                            :
-                                            <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>置&nbsp;&nbsp;顶</a></li> )
-                                        }
-                                        { isAdmin &&
-                                            <li><a href="javascript:void(0);" onClick={() => this.refs.sendToCourseModal.setVisible(true)}>发&nbsp;&nbsp;送</a></li>
-                                        }
-                                        { ( isCurrentUserTheAuthor || isAdmin ) && <li>
-                                            <a href="javascript:void(0)" onClick={() =>
-                                                window.delete_confirm_box_2_react(`onMemoDelete`, '您确定要删除吗？' , memo)}>
+                      {(isCurrentUserTheAuthor || isAdmin) &&
+                        <li><a
+                          onClick={() => this.props.toEditPage(Object.assign({}, this.props.match.params, { 'coursesId': this.state.memo.course_id }))}
+                        >编&nbsp;&nbsp;辑</a></li>}
+                      {isAdmin &&
+                        (memo.sticky == true ?
+                          <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>取消置顶</a></li>
+                          :
+                          <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>置&nbsp;&nbsp;顶</a></li>)
+                      }
+                      {isAdmin &&
+                        <li><a href="javascript:void(0);" onClick={() => this.refs.sendToCourseModal.setVisible(true)}>发&nbsp;&nbsp;送</a></li>
+                      }
+                      {(isCurrentUserTheAuthor || isAdmin) && <li>
+                        <a onClick={() =>
+                          window.delete_confirm_box_2_react(`onMemoDelete`, '您确定要删除吗？', memo)}>
 
-                                            删&nbsp;&nbsp;除</a>
-                                        </li>
-                                        }
-                                    </ul>
-                                </div>
-                            }
+                          删&nbsp;&nbsp;除</a>
+                      </li>
+                      }
+                    </ul>
+                  </div>
+                }
 
-                        </div>
-                        <div className="df mt20">
-                        <img src={setImagesUrl(`/images/${author && author.image_url}`)} className="radius mr10 mt2" width="40px" height="40px"/>
-                        <div className="flex1">
-                          <div className="color-grey-9 lineh-20">
-                            <span class="color-grey-3 mr20 fl" style={{"fontWeight":"400"}}>{author && author.name}</span>
-                            <span className="fl">{moment(memo.created_on).fromNow()} 发布</span>
-                          </div>
+              </div>
+              <div className="df mt20">
+                <img src={setImagesUrl(`/images/${author && author.image_url}`)} className="radius mr10 mt2" width="40px" height="40px" />
+                <div className="flex1">
+                  <div className="color-grey-9 lineh-20">
+                    <span className="color-grey-3 mr20 fl" style={{ "fontWeight": "400" }}>{author && author.name}</span>
+                    <span className="fl">{moment(memo.created_on).fromNow()} 发布</span>
+                  </div>
 
-                          <div className="color-grey-9 clearfix">
-                              <span className="fl" style={{marginTop: '4px'}}>
-                                {/* { current_user.admin && <Tooltip title={ "帖子奖励" }>
+                  <div className="color-grey-9 clearfix">
+                    <span className="fl" style={{ marginTop: '4px' }}>
+                      {/* { current_user.admin && <Tooltip title={ "帖子奖励" }>
                                   <span className="noteDetailNum rightline cdefault" style={{padding: '0 4px', cursor: 'pointer'}}>
                                     <i className="iconfont icon-jiangli mr5" onClick={this.showRewardDialog}></i>
                                   </span>
                                   </Tooltip> } */}
-                                  <Tooltip title={"浏览数"}>
-                                    <span className={`noteDetailNum `} style={{paddingLeft: '0px'}}>
-                                      <i className="iconfont icon-liulanyan mr5"></i>
-                                      <span style={{ top: "1px", position: "relative" }}>{memo.visits || '1'}</span>
-                                    </span>
-                                  </Tooltip>
-                                  { !!memo.total_replies_count &&
-                                  <Tooltip title={"回复数"}>
-                                  <a href="javascript:void(0)" className="noteDetailNum">
-                                    <i className="iconfont icon-huifu1 mr5" onClick={this.showCommentInput}></i>
-                                    <span style={{ top: "2px", position: "relative" }}>{ memo.total_replies_count }</span>
-                                  </a>
-                                  </Tooltip>
-                                  }
-                                  {!!memo.total_praises_count &&
-                                  <Tooltip title={"点赞数"}>
-                                    <span className={`noteDetailNum `} style={{}}>
-                                      <i className="iconfont icon-dianzan-xian mr5"></i>
-                                      <span style={{ top: "2px", position: "relative" }}>{ memo.total_praises_count }</span>
-                                    </span>
-                                  </Tooltip>
-                                    }
-                              </span>
-                              <div className="fr">
-                              {/* || current_user.user_id === author_info.user_id */}
-                                <a className={`task-hide fr return_btn color-grey-6 ${ current_user && (isAdmin 
-                                    ) ? '': 'no_mr'} `} onClick={() => this.props.toListPage(Object.assign({}, this.props.match.params, {'coursesId': this.state.memo.course_id})) } >
-                                  返回
-                                </a>
-                              </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-
-
-                    <div className="padding30 memoContent new_li" style={{ paddingBottom: '10px'}}>
-                      {/* <MarkdownToHtml content={memo.content}></MarkdownToHtml>  */}
-                      {memo.is_md == true ?
-                        <MarkdownToHtml content={memo.content}></MarkdownToHtml>
-                        :
-                        <div dangerouslySetInnerHTML={{ __html: memo.content }}></div>
+                      <Tooltip title={"浏览数"}>
+                        <span className={`noteDetailNum `} style={{ paddingLeft: '0px' }}>
+                          <i className="iconfont icon-liulanyan mr5"></i>
+                          <span style={{ top: "1px", position: "relative" }}>{memo.visits || '1'}</span>
+                        </span>
+                      </Tooltip>
+                      {!!memo.total_replies_count &&
+                        <Tooltip title={"回复数"}>
+                          <a className="noteDetailNum">
+                            <i className="iconfont icon-huifu1 mr5" onClick={this.showCommentInput}></i>
+                            <span style={{ top: "2px", position: "relative" }}>{memo.total_replies_count}</span>
+                          </a>
+                        </Tooltip>
                       }
+                      {!!memo.total_praises_count &&
+                        <Tooltip title={"点赞数"}>
+                          <span className={`noteDetailNum `} style={{}}>
+                            <i className="iconfont icon-dianzan-xian mr5"></i>
+                            <span style={{ top: "2px", position: "relative" }}>{memo.total_praises_count}</span>
+                          </span>
+                        </Tooltip>
+                      }
+                    </span>
+                    <div className="fr">
+                      {/* || current_user.user_id === author_info.user_id */}
+                      <a className={`task-hide fr return_btn color-grey-6 ${current_user && (isAdmin
+                      ) ? '' : 'no_mr'} `} onClick={() => this.props.toListPage(Object.assign({}, this.props.match.params, { 'coursesId': this.state.memo.course_id }))} >
+                        返回
+                                </a>
                     </div>
-                    <div className="padding30 bor-bottom-greyE" style={{paddingTop: '2px'}}>
-                        <div className="mt10 mb20">
-                          {/* ${memo.user_praise ? '' : ''}  */}
-                          <Tooltip title={`${memo.liked ? '取消点赞' : '点赞'}`}>
-                            <p className={`noteDetailPoint  ${memo.user_praise ? 'Pointed' : ''}`} onClick={()=>{this.clickPraise()}} >
-                              <i className="iconfont icon-dianzan"></i><br/>
-                              <span>{memo.praises_count}</span>
-                            </p>
-                          </Tooltip>
-                        </div>
+                  </div>
+                </div>
+              </div>
+            </div>
 
-                        { memo.attachments && !!memo.attachments.length &&
-                        <div>
-                            {this.renderAttachment()}
-                        </div>
-                        }
-                    </div>
 
-                      {!isCourseEnd && <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么"
-                                                           {...this.props}
-                          height={160} showError={true} buttonText={'发表'} className={comments && comments.length && 'borderBottom'}></MemoDetailMDEditor>}
+            <div className="padding30 memoContent new_li" style={{ paddingBottom: '10px' }}>
+              {/* <MarkdownToHtml content={memo.content}></MarkdownToHtml>  */}
+              {memo.is_md == true ?
+                <MarkdownToHtml content={memo.content}></MarkdownToHtml>
+                :
+                <div dangerouslySetInnerHTML={{ __html: memo.content }}></div>
+              }
+            </div>
+            <div className="padding30 bor-bottom-greyE" style={{ paddingTop: '2px' }}>
+              <div className="mt10 mb20">
+                {/* ${memo.user_praise ? '' : ''}  */}
+                <Tooltip title={`${memo.liked ? '取消点赞' : '点赞'}`}>
+                  <p className={`noteDetailPoint  ${memo.user_praise ? 'Pointed' : ''}`} onClick={() => { this.clickPraise() }} >
+                    <i className="iconfont icon-dianzan"></i><br />
+                    <span>{memo.praises_count}</span>
+                  </p>
+                </Tooltip>
+              </div>
 
-                  {/*  onClick={ this.createNewComment }
+              {memo.attachments && !!memo.attachments.length &&
+                <div>
+                  {this.renderAttachment()}
+                </div>
+              }
+            </div>
+
+            {!isCourseEnd && <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么"
+              {...this.props}
+              height={160} showError={true} buttonText={'发表'} className={comments && comments.length && 'borderBottom'}></MemoDetailMDEditor>}
+
+            {/*  onClick={ this.createNewComment }
                         enableReplyTo={true}
                   */}
-                    <div className="padding20  memoReplies commentsDelegateParent comments_hideSecondReplyUserHeader"
-                        style={{ display: (comments && !!comments.length) ? 'block' : 'none', paddingBottom: '0px' }}>
-                      <div className="replies_count commentstypetop">
-                        {this.props.isAdmin()===true? <span className="commentstypebutton font-16 ">
-                          {this.state.commentstype===false?<Button type="primary" onClick={()=>this.startcomments()}>开启刷新评论</Button>
-                            :<Button type="danger" onClick={()=>this.clearcomments()}>停止刷新</Button>}
-                        </span>:""}
+            <div className="padding20  memoReplies commentsDelegateParent comments_hideSecondReplyUserHeader"
+              style={{ display: (comments && !!comments.length) ? 'block' : 'none', paddingBottom: '0px' }}>
+              <div className="replies_count commentstypetop">
+                {this.props.isAdmin() === true ? <span className="commentstypebutton font-16 ">
+                  {this.state.commentstype === false ? <Button type="primary" onClick={() => this.startcomments()}>开启刷新评论</Button>
+                    : <Button type="danger" onClick={() => this.clearcomments()}>停止刷新</Button>}
+                </span> : ""}
 
-                        <span className="labal font-16">全部回复</span>
-                        <span className="count font-16">({memo.total_replies_count})</span>
+                <span className="labal font-16">全部回复</span>
+                <span className="count font-16">({memo.total_replies_count})</span>
 
-                      </div>
+              </div>
 
-                      <Comments comments={comments} user={current_user}
-                        replyComment={this.replyComment}
-                        deleteComment={this.deleteComment}
-                        commentPraise={this.commentPraise}
-                        rewardCode={this.rewardCode}
-                        hiddenComment={this.hiddenComment}
-                        buttonText={'发表'}
+              <Comments comments={comments} user={current_user}
+                replyComment={this.replyComment}
+                deleteComment={this.deleteComment}
+                commentPraise={this.commentPraise}
+                rewardCode={this.rewardCode}
+                hiddenComment={this.hiddenComment}
+                buttonText={'发表'}
 
-                        usingAntdModal={true}
-                        isChildCommentPagination={true}
-                        loadMoreChildComments={this.loadMoreChildComments}
-                        initReply={this.initReply}
-                        showRewardButton={false}
-                        showReply={!isCourseEnd}
+                usingAntdModal={true}
+                isChildCommentPagination={true}
+                loadMoreChildComments={this.loadMoreChildComments}
+                initReply={this.initReply}
+                showRewardButton={false}
+                showReply={!isCourseEnd}
 
-                        onlySuperAdminCouldHide={true}
-                      ></Comments>
+                onlySuperAdminCouldHide={true}
+              ></Comments>
 
 
-                        {/* { true ?  :
+              {/* { true ?  :
                         <div className="memoMore">
                           <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
                         </div>} */}
-                    </div>
-
-
-                    <div className="memoMore" style={{'margin-top': '20px'}}>
-                      { total_count > REPLY_PAGE_COUNT &&
-                        <Pagination showQuickJumper onChange={this.onPaginationChange} current={pageCount} total={total_count} pageSize={10}/>
-                      }
-                      {!isCourseEnd && <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>}
-                    </div>
-
-    	        </div>
             </div>
-          </div>
 
-	    );
-  	}
+
+            <div className="memoMore" style={{ 'margin-top': '20px' }}>
+              {total_count > REPLY_PAGE_COUNT &&
+                <Pagination showQuickJumper onChange={this.onPaginationChange} current={pageCount} total={total_count} pageSize={10} />
+              }
+              {!isCourseEnd && <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>}
+            </div>
+
+          </div>
+        </div>
+      </div>
+
+    );
+  }
 }
 
-export default ImageLayerOfCommentHOC() ( RouteHOC()(TopicDetail) );
+export default ImageLayerOfCommentHOC()(RouteHOC()(TopicDetail));
diff --git a/src/modules/courses/boards/common.js b/src/modules/courses/boards/common.js
index 75a755bd..b8be4ebd 100644
--- a/src/modules/courses/boards/common.js
+++ b/src/modules/courses/boards/common.js
@@ -1,66 +1,66 @@
-import React, { Component } from 'react';
-
-export function RouteHOC(options = {}) {
-	return function wrap(WrappedComponent) {
-    return class Wrapper extends Component {
-      constructor(props) {
-        super(props);
-        
-        this.state = {
-          
-        }
-      }
-      toDetailPage = (_courseId, boardId, topicId) => {
-        if (typeof _courseId == "object") {
-          const topicId = _courseId.topicId
-          const boardId = _courseId.boardId
-          const courseId = _courseId.coursesId
-          this.props.history.push(`/courses/${courseId}/boards/${boardId}/messages/${topicId}`)
-        } else {
-          this.props.history.push(`/courses/${_courseId}/boards/${boardId}/messages/${topicId}`)
-        }
-        
-      }
-      toEditPage = (_courseId, boardId, topicId) => {
-        if (typeof _courseId == "object") {
-          const topicId = _courseId.topicId
-          const boardId = _courseId.boardId
-          const courseId = _courseId.coursesId
-          this.props.history.push(`/courses/${courseId}/boards/${boardId}/messages/${topicId}/edit`)
-        } else {
-          this.props.history.push(`/courses/${_courseId}/boards/${boardId}/messages/${topicId}/edit`)
-        }
-      }
-      toNewPage = (courseId, boardId) => {
-        this.props.history.push(`/courses/${courseId}/boards/${boardId}/messages/new`)
-      }
-      toListPage = (_courseId, boardId) => {
-        if (typeof _courseId == "object") {
-          const boardId = _courseId.boardId
-          const courseId = _courseId.coursesId
-          this.props.history.push(`/courses/${courseId}/boards/${boardId}`)
-        } else {
-          this.props.history.push(`/courses/${_courseId}/boards${boardId ? '/' + boardId : ''}`)
-        }
-      }
-
-      render() {
-        const { snackbarOpen} = this.state;
-
-        
-        return (
-          <React.Fragment>
-            <WrappedComponent {...this.props} 
-                toDetailPage={this.toDetailPage}
-                toEditPage={this.toEditPage}
-                toNewPage={this.toNewPage}
-                toListPage={this.toListPage}
-            >
-        
-            </WrappedComponent>
-          </React.Fragment>
-        )
-      }
-    }
-	}
-}
\ No newline at end of file
+import React, { Component } from 'react';
+
+export function RouteHOC(options = {}) {
+	return function wrap(WrappedComponent) {
+    return class Wrapper extends Component {
+      constructor(props) {
+        super(props);
+
+        this.state = {
+
+        }
+      }
+      toDetailPage = (_courseId, boardId, topicId) => {
+        if (typeof _courseId == "object") {
+          const topicId = _courseId.topicId
+          const boardId = _courseId.boardId
+          const courseId = _courseId.coursesId
+          this.props.history.push(`/classrooms/${courseId}/boards/${boardId}/messages/${topicId}`)
+        } else {
+          this.props.history.push(`/classrooms/${_courseId}/boards/${boardId}/messages/${topicId}`)
+        }
+
+      }
+      toEditPage = (_courseId, boardId, topicId) => {
+        if (typeof _courseId == "object") {
+          const topicId = _courseId.topicId
+          const boardId = _courseId.boardId
+          const courseId = _courseId.coursesId
+          this.props.history.push(`/classrooms/${courseId}/boards/${boardId}/messages/${topicId}/edit`)
+        } else {
+          this.props.history.push(`/classrooms/${_courseId}/boards/${boardId}/messages/${topicId}/edit`)
+        }
+      }
+      toNewPage = (courseId, boardId) => {
+        this.props.history.push(`/classrooms/${courseId}/boards/${boardId}/messages/new`)
+      }
+      toListPage = (_courseId, boardId) => {
+        if (typeof _courseId == "object") {
+          const boardId = _courseId.boardId
+          const courseId = _courseId.coursesId
+          this.props.history.push(`/classrooms/${courseId}/boards/${boardId}`)
+        } else {
+          this.props.history.push(`/classrooms/${_courseId}/boards${boardId ? '/' + boardId : ''}`)
+        }
+      }
+
+      render() {
+        const { snackbarOpen} = this.state;
+
+
+        return (
+          <React.Fragment>
+            <WrappedComponent {...this.props}
+                toDetailPage={this.toDetailPage}
+                toEditPage={this.toEditPage}
+                toNewPage={this.toNewPage}
+                toListPage={this.toListPage}
+            >
+
+            </WrappedComponent>
+          </React.Fragment>
+        )
+      }
+    }
+	}
+}
diff --git a/src/modules/courses/boards/index.js b/src/modules/courses/boards/index.js
index ea49e862..0f133b19 100644
--- a/src/modules/courses/boards/index.js
+++ b/src/modules/courses/boards/index.js
@@ -1,7 +1,6 @@
-import React,{ Component } from "react";
-import { Input, Checkbox, Table, Tooltip, Pagination,Spin  } from "antd";
+import React, { Component } from "react";
+import { Input, Checkbox, Pagination, Spin } from "antd";
 
-import CourseLayoutcomponent from '../common/CourseLayoutComponent'
 import BoardsListItem from './BoardsListItem'
 
 import Titlesearchsection from '../common/titleSearch/TitleSearchSection'
@@ -15,10 +14,10 @@ import _ from 'lodash'
 import './board.css'
 import '../css/members.css'
 import { RouteHOC } from './common.js'
-import { on, off, trigger, WordsBtn } from 'educoder'
+import { trigger, WordsBtn } from 'educoder'
 
-class Boards extends Component{
-  constructor(props){
+class Boards extends Component {
+  constructor(props) {
     super(props);
     this.state = {
       searchValue: '',
@@ -32,78 +31,67 @@ class Boards extends Component{
       messages: [
       ],
       sort_type: 'time',
-      boardid:undefined,
-      isSpin:false
+      boardid: undefined,
+      isSpin: false
     }
   }
   fetchAll = (searchText, page) => {
     this.setState({
-      isSpin:true
+      isSpin: true
     })
     const _serachText = searchText || this.state.searchValue
     const _page = page || this.state.pagination.page
-    
-
-    const cid = this.props.match.params.coursesId
     const bid = this.props.match.params.boardId
-    // 
+    //
     // hot
     const sort_type = this.state.sort_type
     // page_size
     const url = `/boards/${bid}/messages.json?page_size=15&search=${_serachText || ''}&page=${_page}&sort=0&sort_type=${sort_type}`
     axios.get(encodeURI(url)).then((response) => {
-        if (response.data.status == 0 && response.data.data) {
-          let _newBoards = response.data.data.messages
-          // if (_page > 1) {
-          //   _newBoards = this.state.boards.slice().concat(_newBoards)
-          // }
-          this.setState({
-            messages: _newBoards,
-            boardName: response.data.data.name,
-            boardid:response.data.data.id,
-            parent_id: response.data.data.parent_id,
-            pagination: response.data.pagination || Object.assign({}, this.state.pagination
-              , { page: _page, total_count: response.data.data.total_count }),
-            isSpin:false
-          })
-        }
-      })
+      if (response.data.status == 0 && response.data.data) {
+        let _newBoards = response.data.data.messages
+        this.setState({
+          messages: _newBoards,
+          boardName: response.data.data.name,
+          boardid: response.data.data.id,
+          parent_id: response.data.data.parent_id,
+          pagination: response.data.pagination || Object.assign({}, this.state.pagination
+            , { page: _page, total_count: response.data.data.total_count }),
+          isSpin: false
+        })
+      }
+    })
       .catch(function (error) {
         console.log(error);
         this.setState({
-          isSpin:false
+          isSpin: false
         })
       });
   }
   fetchBoards = () => {
     const boardId = this.props.match.params.boardId
     const boardsUrl = `/courses/board_list.json?board_id=${boardId}`
-    axios.get(boardsUrl, { })
-    .then((response) => {
-      if (response.data.status == 0) {
-        this.setState({
-          boards: response.data.data.boards,
-          course_id: response.data.data.course_id
-        })
-      }
-    })
-    .catch(function (error) {
-      console.log(error);
-    });
+    axios.get(boardsUrl, {})
+      .then((response) => {
+        if (response.data.status == 0) {
+          this.setState({
+            boards: response.data.data.boards,
+            course_id: response.data.data.course_id
+          })
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
   }
   componentDidMount = () => {
     this.setState({
-      isSpin:true
+      isSpin: true
     })
     this.fetchBoards()
     this.fetchAll()
-
-    on('updateNavSuccess', this.updateNavSuccess)
   }
 
-  componentWillUnmount() {
-    off('updateNavSuccess', this.updateNavSuccess)
-  }
   updateNavSuccess = () => {
     this.fetchBoards()
     if (this.props.match.params.boardId == this.state.boardid) {
@@ -112,13 +100,13 @@ class Boards extends Component{
   }
 
   componentDidUpdate = (prevProps) => {
-		if ( prevProps.match.params.boardId != this.props.match.params.boardId ) {
+    if (prevProps.match.params.boardId !== this.props.match.params.boardId) {
       this.setState({
-        isSpin:true
+        isSpin: true
       })
       this.clearAllCheck()
-			this.fetchAll(null, 1)
-		}
+      this.fetchAll(null, 1)
+    }
   }
   moveTo = (board) => {
     const len = this.state.checkBoxValues.length
@@ -131,23 +119,21 @@ class Boards extends Component{
 
     const checkBoxValues = this.state.checkBoxValues
     const url = `/boards/${bid}/messages/bulk_move.json`
-    axios.put(url, { 
+    axios.put(url, {
       ids: checkBoxValues,
       to_board_id: board.id
     })
-    .then((response) => {
-      if (response.data.status == 0) {
-        console.log('--- 成功')
-        this.props.showNotification('帖子移动成功')
-        this.props.updataleftNavfun()
-        // TODO 停留在当前board 或 目标board
-        this.clearAllCheck()
-        this.fetchAll()
-      }
-    })
-    .catch(function (error) {
-      console.log(error);
-    });    
+      .then((response) => {
+        if (response.data.status == 0) {
+          this.props.showNotification('帖子移动成功')
+          this.props.updataleftNavfun()
+          this.clearAllCheck()
+          this.fetchAll()
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
   }
   onDelete = () => {
     const len = this.state.checkBoxValues.length
@@ -156,60 +142,51 @@ class Boards extends Component{
       return;
     }
     this.props.confirm({
-      // content: `确认要删除所选的${len}个帖子吗？`,
       content: `是否确认删除?`,
       onOk: () => {
-        // const cid = this.props.match.params.coursesId
         const bid = this.props.match.params.boardId
 
         const url = `/boards/${bid}/messages/bulk_delete.json`
-        const board_id = 5897
-        axios.delete(url, { data: {
-            // course_id: cid,
+        axios.delete(url, {
+          data: {
             ids: this.state.checkBoxValues
-          }})
-        .then((response) => {
-          if (response.data.status == 0) {
-            // {"status":1,"message":"删除成功"}
-            console.log('--- 删除成功')
-            this.clearAllCheck()
-            this.fetchAll(null, 1)
-						this.props.updataleftNavfun()
           }
         })
-        .catch(function (error) {
-          console.log(error);
-        });    
+          .then((response) => {
+            if (response.data.status == 0) {
+              this.clearAllCheck()
+              this.fetchAll(null, 1)
+              this.props.updataleftNavfun()
+            }
+          })
+          .catch(function (error) {
+            console.log(error);
+          });
       }
     })
-    
+
   }
 
   onSticky = (message) => {
-    const cid = this.props.match.params.coursesId    
+    const cid = this.props.match.params.coursesId
     const url = `/messages/${message.id}/sticky_top.json`
-    axios.put(url, { 
+    axios.put(url, {
       course_id: cid,
     })
-    .then((response) => {
-      if (response.data.status == 0) {
-        console.log('--- 置顶/取消置顶成功')
-        // const boards = this.state.boards;
-        // for (let _i = 0; _i < boards.length; _i++) {
-          // boards[]
-        // }
-        this.fetchAll()
-      }
-    })
-    .catch(function (error) {
-      console.log(error);
-    });  
+      .then((response) => {
+        if (response.data.status == 0) {
+          this.fetchAll()
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
   }
   onItemClick = (item) => {
     const checkBoxValues = this.state.checkBoxValues.slice(0);
     const index = checkBoxValues.indexOf(item.id);
     if (index != -1) {
-      _.remove(checkBoxValues, (listItem)=> listItem === item.id)
+      _.remove(checkBoxValues, (listItem) => listItem === item.id)
     } else {
       checkBoxValues.push(item.id)
     }
@@ -219,12 +196,12 @@ class Boards extends Component{
   onPressEnter = (e) => {
     clearTimeout(this.timeoutHandler)
     this.timeoutHandler = null;
-    
+
     this.fetchAll(this.state.searchValue, 1)
   }
   onInputSearchChange = (e) => {
     this.setState({
-      searchValue:e.target.value
+      searchValue: e.target.value
     })
 
     if (this.timeoutHandler) {
@@ -236,16 +213,16 @@ class Boards extends Component{
     }, 1200)
   }
   addDir = () => {
-  let {boardid}=this.state;
+    let { boardid } = this.state;
     trigger('boardAdd', parseInt(boardid))
   }
   renameDir = () => {
-    const boardId = this.props.match.params.boardId    
-    trigger('boardRename', { category_id: parseInt(boardId), category_name: this.state.boardName})
+    const boardId = this.props.match.params.boardId
+    trigger('boardRename', { category_id: parseInt(boardId), category_name: this.state.boardName })
   }
   onToBoardsNew = () => {
-    const courseId = this.state.course_id 
-    const boardId = this.props.match.params.boardId    
+    const courseId = this.state.course_id
+    const boardId = this.props.match.params.boardId
 
     this.props.toNewPage(courseId, boardId)
   }
@@ -282,9 +259,18 @@ class Boards extends Component{
     console.log('checked = ', checkedValues);
   }
   onPageChange = (pageNumber) => {
-  	this.setState({
-			checkBoxValues:[]
-		})
+    let { checkAllValue } = this.state;
+    if (checkAllValue === true) {
+      this.setState({
+        checkBoxValues: [],
+        checkAllValue: false
+      })
+    } else {
+      this.setState({
+        checkBoxValues: []
+      })
+    }
+
     this.fetchAll(null, pageNumber)
   }
 
@@ -304,37 +290,36 @@ class Boards extends Component{
     }
     const boardId = this.props.match.params.boardId
     const url = `/boards/${boardId}/messages/bulk_public.json`
-    axios.put(url, { 
+    axios.put(url, {
       ids: checkBoxValues
     })
-    .then((response) => {
+      .then((response) => {
         if (response.data.status == 0) {
-          this.props.showNotification('操作成功')  
+          this.props.showNotification('操作成功')
           this.fetchAll()
         }
       })
       .catch(function (error) {
         console.log(error);
       });
-    
+
   }
   onSortTypeChange = (sort_type) => {
     this.setState({ sort_type }, () => {
       this.fetchAll()
     })
-    
+
   }
-  render(){
+  render() {
     const isAdmin = this.props.isAdmin()
     const isCourseEnd = this.props.isCourseEnd()
     const isAdminOrStudent = this.props.isAdminOrStudent()
     let { boardName, searchValue, boards, messages, checkBoxValues,
-       checkAllValue, pagination, sort_type, parent_id } = this.state;
+      checkAllValue, pagination, sort_type, parent_id } = this.state;
     const { coursedata } = this.props;
 
     const bid = this.props.match.params.boardId
-    const haveMore = pagination.total_count - pagination.page_size * pagination.page > 0
-    return(
+    return (
       <React.Fragment >
         <SendToCourseModal
           ref="sendToCourseModal"
@@ -344,16 +329,16 @@ class Boards extends Component{
         ></SendToCourseModal>
         <Titlesearchsection
           title={boardName || "帖子列表"}
-          searchValue={ searchValue }
+          searchValue={searchValue}
           onInputSearchChange={this.onInputSearchChange}
           allowClearonChange={this.onInputSearchChange}
           showSearchInput={messages.length >= 10}
-          searchPlaceholder={ '请输入帖子名称进行搜索' }
+          searchPlaceholder={'请输入帖子名称进行搜索'}
           firstRowRight={
             <React.Fragment>
-              { !isCourseEnd && isAdmin && !parent_id && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>新建目录</WordsBtn> }
-              { isAdmin && !!parent_id && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>目录重命名</WordsBtn> }
-              { !isCourseEnd && isAdminOrStudent && <WordsBtn style="blue" className="" onClick={()=>this.onToBoardsNew()}>我要发贴</WordsBtn> }
+              {!isCourseEnd && isAdmin && !parent_id && <WordsBtn style="blue" className="mr30" onClick={() => this.addDir()}>新建目录</WordsBtn>}
+              {isAdmin && !!parent_id && <WordsBtn style="blue" className="mr30" onClick={() => this.renameDir()}>目录重命名</WordsBtn>}
+              {!isCourseEnd && isAdminOrStudent && <WordsBtn style="blue" className="" onClick={() => this.onToBoardsNew()}>我要发贴</WordsBtn>}
             </React.Fragment>
           }
           secondRowLeft={
@@ -362,46 +347,40 @@ class Boards extends Component{
           onPressEnter={this.onPressEnter}
         ></Titlesearchsection>
 
-        
-          {/* <BoardsListItem></BoardsListItem>
-
-          <FilesListItem></FilesListItem> */}
-
-				{messages&&messages.length == 0?"": isAdmin && <div className="mt20 edu-back-white padding20-30">
-				<div className="clearfix">
-            {isAdmin&&<Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个   （不支持跨页勾选）</Checkbox>}
+        {messages && messages.length == 0 ? "" : isAdmin && <div className="mt20 edu-back-white padding20-30">
+          <div className="clearfix">
+            {isAdmin && <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个   （不支持跨页勾选）</Checkbox>}
             <div className="studentList_operation_ul">
-              { !!isAdmin && 
-              <React.Fragment>
-                <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onDelete}>删除</a></li>
-                <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onSendToOtherCourse}>发送</a></li>
-                { coursedata && !!coursedata.course_public && <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onSetToOpen}>设为公开</a></li> }
+              {!!isAdmin &&
+                <React.Fragment>
+                  <li className="li_line"><a className="color-grey-9" onClick={this.onDelete}>删除</a></li>
+                  <li className="li_line"><a className="color-grey-9" onClick={this.onSendToOtherCourse}>发送</a></li>
+                  {coursedata && !!coursedata.course_public && <li className="li_line"><a className="color-grey-9" onClick={this.onSetToOpen}>设为公开</a></li>}
 
-                <li className="li_line drop_down">
-                  移动到...<i className="iconfont icon-xiajiantou font-12 ml2"></i>
-                  <ul className="drop_down_menu" 
-                      style={{"right":"0px","left":"unset", maxHeight: '318px', overflowY: 'auto',  minWidth: '200px'}}>
-                    { boards && boards.length > 10 && <p className="drop_down_search">
-                      <Input placeholder="搜索" value={this.state.dirSearchValue} onChange={(e) => {this.setState({dirSearchValue: e.target.value})}}/>
-                    </p> }
-                    {
-                      boards && boards.filter((item)=> {
-                        return item.id != bid && (!this.state.dirSearchValue || item.name.indexOf(this.state.dirSearchValue) != -1)
-                      }).map( (item, index) => {
-                        return <li key={`i_${index}`} onClick={() => this.moveTo(item)} title={item.name}>{item.name}</li>
-                      })
-                    }
-                    { isAdmin && !isCourseEnd &&
-                     <p className="drop_down_btn">
-                      <a href="javascript:void(0)" className="color-grey-6"
-                          onClick={()=>this.addDir()}
-                      >新建目录...</a>
-                     </p>
-                    }
-                    {/* <p className="drop_down_btn"><a href="javascript:void(0)" className="color-grey-6">添加分班...</a></p> */}
-                  </ul>
-                </li>
-              </React.Fragment>
+                  <li className="li_line drop_down">
+                    移动到目录<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                    <ul className="drop_down_menu"
+                      style={{ "right": "0px", "left": "unset", maxHeight: '318px', overflowY: 'auto', minWidth: '200px' }}>
+                      {boards && boards.length > 10 && <p className="drop_down_search">
+                        <Input placeholder="搜索" value={this.state.dirSearchValue} onChange={(e) => { this.setState({ dirSearchValue: e.target.value }) }} />
+                      </p>}
+                      {
+                        boards && boards.filter((item) => {
+                          return item.id != bid && (!this.state.dirSearchValue || item.name.indexOf(this.state.dirSearchValue) != -1)
+                        }).map((item, index) => {
+                          return <li key={`i_${index}`} onClick={() => this.moveTo(item)} title={item.name}>{item.name}</li>
+                        })
+                      }
+                      {isAdmin && !isCourseEnd &&
+                        <p className="drop_down_btn">
+                          <a className="color-grey-6"
+                            onClick={() => this.addDir()}
+                          >新建目录...</a>
+                        </p>
+                      }
+                    </ul>
+                  </li>
+                </React.Fragment>
               }
 
               <li className="drop_down">
@@ -426,41 +405,33 @@ class Boards extends Component{
         <Spin size="large" spinning={this.state.isSpin}>
           <div className="clearfix stu_table">
             <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
-              { messages.map((item, index) => {
-                  return (
-                    <div className="mt20 edu-back-white padding02010" key={`d_${index}`}>
-                      <BoardsListItem 
-                        {...this.props}
-                        discussMessage={item}
-                        checkBox={ isAdmin ? <Checkbox value={item.id} key={item.id}></Checkbox> : ''}
-                        onItemClick={this.onItemClick}
-                        onSticky={this.onSticky}
-                      ></BoardsListItem>
-                    </div>
-                  )
-                })
+              {messages.map((item, index) => {
+                return (
+                  <div className="mt20 edu-back-white padding02010" key={`d_${index}`}>
+                    <BoardsListItem
+                      {...this.props}
+                      discussMessage={item}
+                      checkBox={isAdmin ? <Checkbox value={item.id} key={item.id}></Checkbox> : ''}
+                      onItemClick={this.onItemClick}
+                      onSticky={this.onSticky}
+                    ></BoardsListItem>
+                  </div>
+                )
+              })
               }
             </Checkbox.Group>
           </div>
         </Spin>
         {
-          ( !this.state.isSpin && (!messages || messages.length == 0) ) && <NoneData></NoneData>
+          (!this.state.isSpin && (!messages || messages.length == 0)) && <NoneData></NoneData>
         }
 
-          {/* { haveMore && <p className="edu-txt-center pt30 pb10 clearfix">
-            <a className={"clickmorebox"} onClick={() => this.fetchAll(null, parseInt(pagination.page) + 1)}>
-              <Tooltip title="点击查看更多" placement="bottom" arrowPointAtCenter={true}
-              >
-                <i className="iconfont icon-xiajiantou color-grey-9 font-16"></i>
-              </Tooltip>
-            </a>
-            </p> } */}
-          {pagination.total_count > 15 && <Pagination className="coursePagination" 
-              current={pagination.page}
-              showQuickJumper pageSize={15} total={pagination.total_count} onChange={this.onPageChange} />}
-               
+        {pagination.total_count > 15 && <Pagination className="coursePagination"
+          current={pagination.page}
+          showQuickJumper pageSize={15} total={pagination.total_count} onChange={this.onPageChange} />}
+
       </React.Fragment>
-      )
-    }
+    )
+  }
 }
 export default RouteHOC()(Boards);
\ No newline at end of file
diff --git a/src/modules/courses/busyWork/CommonWorkAppraise.js b/src/modules/courses/busyWork/CommonWorkAppraise.js
index 60194c74..ce85ceb9 100644
--- a/src/modules/courses/busyWork/CommonWorkAppraise.js
+++ b/src/modules/courses/busyWork/CommonWorkAppraise.js
@@ -1,7 +1,8 @@
 import '../katex.css';
 import '../css/Courses.css';
-import React,{Component} from "react";
-import {markdownToHTML, ImageLayer2 } from 'educoder';
+import React, { Component } from "react";
+import { ImageLayer2 } from 'educoder';
+import { Button, Row, Col } from "antd";
 import axios from 'axios';
 import Modals from '../../modals/Modals';
 import moment from 'moment';
@@ -9,60 +10,43 @@ import WorkDetailPageHeader from './common/WorkDetailPageHeader'
 import CommonWorkAppraiseReply from './reply/CommonWorkAppraiseReply'
 import CommonWorkAppraiseReviseAttachments from './CommonWorkAppraiseReviseAttachments'
 import LeaderIcon from './common/LeaderIcon';
-import showdown from 'showdown'
-import showdownKatex from 'showdown-katex'
-class CommonWorkAppraise extends Component{
+import RenderHtml from '../../../components/render-html';
+class CommonWorkAppraise extends Component {
 
-  constructor(props){
+  constructor(props) {
     super(props)
-    this.state={
-      course_name:"",
-      homework_name:"",
+    this.state = {
+      course_name: "",
+      homework_name: "",
       search: '',
-
-
+      get_next_work: undefined,
       attachments: [],
       revise_attachments: [],
+      get_next_worktype: false
     }
   }
   getWork = () => {
-    let workId =this.props.match.params.workId;
-    let studentWorkId =this.props.match.params.studentWorkId;
+    let workId = this.props.match.params.workId;
+    let studentWorkId = this.props.match.params.studentWorkId;
 
     // https://www.showdoc.cc/127895880302646?page_id=1957586480118445
     const url = `/student_works/${studentWorkId}.json`
 
-    axios.get(url).then((result)=> {
+    axios.get(url).then((result) => {
       if (result.data.course_id) {
 
         this.setState({
           ...result.data
         })
       }
-     }).catch((error)=>{
-       console.log(error)
-     })
-  }
-  exportMdtoHtml=(md)=> {
-    let newmd=md;
-    const converter = new showdown.Converter({
-      extensions: [
-        showdownKatex({
-          // maybe you want katex to throwOnError
-          throwOnError: true,
-          // disable displayMode
-          displayMode: false,
-          // change errorColor to blue
-          errorColor: '#1500ff',
-        }),
-      ],
-    });
-    return converter.makeHtml(newmd);
+    }).catch((error) => {
+      console.log(error)
+    })
   }
   getReviseAttachments = () => {
-    let studentWorkId =this.props.match.params.studentWorkId;
+    let studentWorkId = this.props.match.params.studentWorkId;
     const url = `/student_works/${studentWorkId}/supply_attachments.json`;
-    axios.get(url).then((result)=> {
+    axios.get(url).then((result) => {
       if (result.data.revise_attachments) {
 
         this.setState({
@@ -70,9 +54,9 @@ class CommonWorkAppraise extends Component{
         })
       }
 
-     }).catch((error)=>{
-       console.log(error)
-     })
+    }).catch((error) => {
+      console.log(error)
+    })
   }
   componentDidUpdate(prevProps, prevState) {
     if (this.props.match.params.studentWorkId != prevProps.match.params.studentWorkId) {
@@ -87,20 +71,61 @@ class CommonWorkAppraise extends Component{
     this.getReviseAttachments()
   }
 
+  get_next_works = (id) => {
+    let workId = this.props.match.params.workId;
+    let url
+    if (id) {
+      url = `/homework_commons/${workId}/get_next_work.json?work_id=${id}`;
+    } else {
+      url = `/homework_commons/${workId}/get_next_work.json?work_id=${this.props.match.params.studentWorkId}`;
+    }
+    axios.get(url).then((result) => {
+      this.setState({
+        get_next_work: result.data,
+        get_next_worktype: true
+      })
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+
+  gotoget_next_work = (id) => {
+
+    if (this.props.match.path === `/classrooms/:coursesId/common_homework/:workId/:studentWorkId/appraise`) {
+      this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/common_homeworks/${this.props.match.params.workId}/${id}/appraise`);
+    }
+
+    if (this.props.match.path === `/classrooms/:coursesId/group_homework/:workId/:studentWorkId/appraise`) {
+      this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/group_homework/${this.props.match.params.workId}/${id}/appraise`);
+    }
+
+    if (this.props.match.path === `/classrooms/:coursesId/common_homeworks/:workId/:studentWorkId/appraise`) {
+      this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/common_homeworks/${this.props.match.params.workId}/${id}/appraise`);
+    }
+
+    if (this.props.match.path === `/classrooms/:coursesId/group_homeworks/:workId/:studentWorkId/appraise`) {
+      this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/group_homeworks/${this.props.match.params.workId}/${id}/appraise`);
+    }
+
+    this.setState({
+      get_next_worktype: false
+    })
+  }
+
   onAttachmentRemove = (id) => {
     this.setState({
-      Modalstype:true,
+      Modalstype: true,
       // Modalstopval:'确定要删除这个附件吗?',
       Modalstopval: '是否确认删除?',
 
-      ModalSave: ()=>this.deleteAttachment(id),
-      ModalCancel:this.cancelAttachment
+      ModalSave: () => this.deleteAttachment(id),
+      ModalCancel: this.cancelAttachment
     })
   }
   deleteAttachment = (id) => {
     const url = `/attachments/${id}.json`
     axios.delete(url, {
-      })
+    })
       .then((response) => {
         if (response.data) {
           const { status } = response.data;
@@ -115,168 +140,214 @@ class CommonWorkAppraise extends Component{
         console.log(error);
       });
   }
-  cancelAttachment=()=>{
+  cancelAttachment = () => {
     this.setState({
-      Modalstype:false,
-      Modalstopval:'',
-      ModalSave:"",
-      ModalCancel:""
+      Modalstype: false,
+      Modalstopval: '',
+      ModalSave: "",
+      ModalCancel: ""
     })
   }
   onReplySuccess = () => {
     this.getReviseAttachments();
   }
 
-  render(){
-    const dateFormat = 'YYYY-MM-DD HH:mm';
-
-    let {course_name, homework_name, search, page, loadingstate, homework_status, reference_answer,
-      attachments, homework_id, project_info, work_members, is_evaluation,
+  render() {
+    let { course_name, get_next_work, get_next_worktype,
+      attachments, project_info, work_members, is_evaluation,
       description, update_user_name, commit_user_name, update_time, commit_time, author_name,
-      revise_attachments, revise_reason, atta_update_user, atta_update_time, atta_update_user_login,
-      Modalstype,Modalstopval,ModalCancel,ModalSave,loadtype, is_leader_work
-    } =this.state;
+      Modalstype, Modalstopval, ModalCancel, ModalSave, loadtype, is_leader_work
+    } = this.state;
 
-    let courseId=this.props.match.params.coursesId;
-    let category_id=this.props.match.params.category_id;
-    let studentWorkId=this.props.match.params.studentWorkId;
+    // let courseId=this.props.match.params.coursesId;
+    // let category_id=this.props.match.params.category_id;
+    let studentWorkId = this.props.match.params.studentWorkId;
     const isAdmin = this.props.isAdmin()
 
-		document.title=course_name&&course_name;
-    return(
-      <WorkDetailPageHeader
-        {...this.props} {...this.state}
-        noTab={true}
-        moduleName={'作业详情'}
-        getReviseAttachments={this.getReviseAttachments}
-      >
-        {/*提示*/}
-        <Modals
-          modalsType={Modalstype}
-          modalsTopval={Modalstopval}
-          modalCancel={ModalCancel}
-          modalSave={ModalSave}
-          loadtype={loadtype}
-        />
-        {/* 内容区 */}
-        {/* <div className="padding40 memoContent new_li">
+    document.title = course_name && course_name;
+    return (
+      <div>
+
+        <WorkDetailPageHeader
+          {...this.props} {...this.state}
+          noTab={true}
+          moduleName={'作业详情'}
+          getReviseAttachments={this.getReviseAttachments}
+        >
+          {/*提示*/}
+          <Modals
+            modalsType={Modalstype}
+            modalsTopval={Modalstopval}
+            modalCancel={ModalCancel}
+            modalSave={ModalSave}
+            loadtype={loadtype}
+          />
+          {/* 内容区 */}
+          {/* <div className="padding40 memoContent new_li">
         </div>  */}
 
-        <div className={"appraise imageLayerParent "} style={{}}>
+          <div className={"appraise imageLayerParent "} style={{}}>
 
-          <style>{`
+            <style>{`
             .workAppraise>div:last-child {
               border-bottom: none !important;
             }
           `}</style>
-          <ImageLayer2 parentSel=".workAppraise" childSel="a.imageTarget"></ImageLayer2>
-          <div className={"workAppraise"}>
-          {(description || (attachments && attachments.length != 0)) && <div className={"stud-class-set edu-back-white padding20-30"}>
-            <div className={"color-grey-6 mb15 font-16"}>
-              内容
-            </div>
-            <div className="markdown-body ml20" dangerouslySetInnerHTML={{__html: markdownToHTML(description)}}>
+            <ImageLayer2 parentSel=".workAppraise" childSel="a.imageTarget"></ImageLayer2>
+            <div className={"workAppraise"}>
+              {(description || (attachments && attachments.length != 0)) && <div className={"stud-class-set edu-back-white padding20-30"}>
+                <div className={"color-grey-6 mb15 font-16"}>
+                  内容
             </div>
+                <RenderHtml className="markdown-body ml20" value={description} />
 
-            {attachments.map((item,key)=>{
-              return(
-                <div className="color-grey" key={key}>
-                  <a className="color-grey ml20">
-                    <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
-                  </a>
+                {attachments.map((item, key) => {
+                  return (
+                    <div className="color-grey" key={key}>
+                      <a className="color-grey ml20">
+                        <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
+                      </a>
 
-                  <a href={item.url}
-                      className="mr12 color9B9B imageTarget" length="58" title={`${item.title && item.title.length > 40 ? item.title : ''}`}>
-                    {item.title}
-                  </a>
-                  <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
-                  {/*{item.delete===true?<i className="font-14 iconfont  icon-guanbi " id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}*/}
-                  {item.delete===true?<i className="font-14 iconfont  icon-guanbi " id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}
-                  {/* style={{display: 'none'}}  */}
+                      <a href={item.url}
+                        className="mr12 color9B9B imageTarget" length="58" title={`${item.title && item.title.length > 40 ? item.title : ''}`}>
+                        {item.title}
+                      </a>
+                      <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
+                      {/*{item.delete===true?<i className="font-14 iconfont  icon-guanbi " id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}*/}
+                      {item.delete === true ? <i className="font-14 iconfont  icon-guanbi " id={item.id} aria-hidden="true" onClick={() => this.onAttachmentRemove(item.id)}></i> : ""}
+                      {/* style={{display: 'none'}}  */}
+                    </div>
+                  )
+                })}
+
+
+                <div className={"color-grey-6 h20 ml20"}>
+                  {update_time &&
+                    <React.Fragment>
+                      <span className={"color9B9B fr"}>更新</span>
+                      <span className={"fr font-14 mr10 ml10"}>{update_user_name}</span>
+                      <span className={"color9B9B fr"}>
+                        {moment(update_time).format('YYYY-MM-DD HH:mm') === "Invalid date" ? "" : moment(update_time).format('YYYY-MM-DD HH:mm')}
+                      </span>
+                    </React.Fragment>}
+
+                  {commit_time &&
+                    <React.Fragment>
+                      <span className={"color9B9B fr mr30"}>提交</span>
+                      <span className={"fr font-14 mr10 ml10"}>{commit_user_name}</span>
+                      <span className={" color9B9B fr"}>
+                        {moment(commit_time).format('YYYY-MM-DD HH:mm') === "Invalid date" ? "" : moment(commit_time).format('YYYY-MM-DD HH:mm')}
+                      </span>
+                    </React.Fragment>}
                 </div>
-              )
-            })}
 
+              </div>}
 
-            <div className={"color-grey-6 h20 ml20"}>
-              { update_time &&
-              <React.Fragment>
-                <span className={"color9B9B fr"}>更新</span>
-                <span className={"fr font-14 mr10 ml10"}>{update_user_name}</span>
-                <span className={"color9B9B fr"}>
-                  {moment(update_time).format('YYYY-MM-DD HH:mm')==="Invalid date"?"":moment(update_time).format('YYYY-MM-DD HH:mm')}
-                </span>
-              </React.Fragment> }
+              <CommonWorkAppraiseReviseAttachments {...this.state}
+                onAttachmentRemove={this.onAttachmentRemove}
+              ></CommonWorkAppraiseReviseAttachments>
 
-              { commit_time &&
-              <React.Fragment>
-                <span className={"color9B9B fr mr30"}>提交</span>
-                <span className={"fr font-14 mr10 ml10"}>{commit_user_name}</span>
-                <span className={" color9B9B fr"}>
-                  {moment(commit_time).format('YYYY-MM-DD HH:mm')==="Invalid date"?"":moment(commit_time).format('YYYY-MM-DD HH:mm')}
-                </span>
-              </React.Fragment> }
-            </div>
-
-          </div> }
-
-          <CommonWorkAppraiseReviseAttachments {...this.state}
-            onAttachmentRemove={this.onAttachmentRemove}
-          ></CommonWorkAppraiseReviseAttachments>
-
-            {is_evaluation != true && project_info && project_info.name && <div className={"stud-class-set bor-top-greyE edu-back-white padding20-30"}>
-              <div className={"color-grey-6 mb10"}>
-                关联项目
+              {is_evaluation != true && project_info && project_info.name && <div className={"stud-class-set bor-top-greyE edu-back-white padding20-30"}>
+                <div className={"color-grey-6 mb10"}>
+                  关联项目
               </div>
-              <div className={"ml20"}>
-                <a className="color-blue" href={`/projects/${project_info.id}`}>{project_info.name}</a>
-              </div>
-            </div>
-            }
-
-            {is_evaluation != true && work_members && !!work_members.length && <div className={"stud-class-set bor-top-greyE edu-back-white padding20-30"}>
-              <div className={"color-grey-6 mb10"}>
-                全部组员
-              </div>
-              <div className={"ml20 color-grey-6"}>
-                <div className="">
-                  当前组员：{author_name} {is_leader_work && <LeaderIcon small={true} ></LeaderIcon>}
+                <div className={"ml20"}>
+                  <a className="color-blue" href={`/projects/${project_info.id}`}>{project_info.name}</a>
                 </div>
-                <div>
-                  其他组员：
+              </div>
+              }
+
+              {is_evaluation != true && work_members && !!work_members.length && <div className={"stud-class-set bor-top-greyE edu-back-white padding20-30"}>
+                <div className={"color-grey-6 mb10"}>
+                  全部组员
+              </div>
+                <div className={"ml20 color-grey-6"}>
+                  <div className="">
+                    当前组员：{author_name} {is_leader_work && <LeaderIcon small={true} ></LeaderIcon>}
+                  </div>
+                  <div>
+                    其他组员：
                   {work_members.map((item, index) => {
                     return <React.Fragment>
                       {isAdmin ?
-                      <a className={`color-blue ${index == 0 ? '' : 'ml12'}`} href="javascript:void(0)"
+                        <a className={`color-blue ${index == 0 ? '' : 'ml12'}`}
                           onClick={() => this.props.toWorkDetailPage(this.props.match.params, null, item.work_id)}
-                      >
-                        {item.user_name}
-                      </a> : <span className={`${index == 0 ? '' : 'ml12'}`} >{item.user_name}</span>}
+                        >
+                          {item.user_name}
+                        </a> : <span className={`${index == 0 ? '' : 'ml12'}`} >{item.user_name}</span>}
                       {item.is_leader && <LeaderIcon small={true} ></LeaderIcon>}
                     </React.Fragment>
                   })}
-                </div>
-                {isAdmin && <div className="font-12 color-grey-9">
-                  <span >温馨提示：</span>
+                  </div>
+                  {isAdmin && <div className="font-12 color-grey-9">
+                    <span >温馨提示：</span>
                   点击其他组员的姓名，可以快速评阅TA的作品
                 </div>}
 
+                </div>
               </div>
-            </div>
-            }
+              }
             </div>
 
 
             {/* task_type={datalist&&datalist.task_type} */}
             <CommonWorkAppraiseReply {...this.props} task_id={studentWorkId}
-                onReplySuccess={this.onReplySuccess} {...this.state}
-                wrappedComponentRef={(ref) => {this.commonWorkAppraiseReply = ref}}
+              onReplySuccess={this.onReplySuccess} {...this.state}
+              wrappedComponentRef={(ref) => { this.commonWorkAppraiseReply = ref }}
+              get_next_works={() => this.get_next_works()}
             ></CommonWorkAppraiseReply>
 
-        </div>
+          </div>
 
-      </WorkDetailPageHeader>
+        </WorkDetailPageHeader>
+        {isAdmin === true && get_next_worktype === true ? <style>
+          {
+            `
+            .newFooter{
+              display:none !important;
+            }
+            .-task-sidebar{
+              display:none !important;
+            }
+            .educontent{
+              margin-bottom: 0px !important;
+            }
+            `
+          }
+        </style> : ""}
 
+        {isAdmin === true && get_next_worktype === true ? <div className="clearfix bor-bottom-greyE edu-back-white orderingbox newshixunbottombtn">
+
+          <div className={"educontent mt5"}>
+            <div>
+
+              <Row>
+                <Col span={12} className={"mt13"}>
+                  {get_next_work && get_next_work.work_id === null ?
+                    <Row type="flex" justify="start">
+                      <Col span={8}><div style={{ color: "#333333" }}>已全部评阅完</div></Col>
+                    </Row> : <Row type="flex" justify="start">
+                      <Col><div style={{ color: "#333333" }}>{get_next_work && get_next_work ? `下一位待评阅人员：${get_next_work && get_next_work.user_name}` : ""}</div></Col>
+                      <Col span={4}><a className={"ml10 color-blue font-15"} onClick={() => this.get_next_works(get_next_work && get_next_work.work_id)}>跳过</a></Col>
+                    </Row>}
+                </Col>
+                {get_next_work && get_next_work.work_id === null ? "" : <Col span={12} className={"mt8"}>
+                  <Row type="flex" justify="end">
+                    <Col span={4}>
+                      <Button className={"newshixunmode"} type="primary"
+                        onClick={() => this.gotoget_next_work(get_next_work && get_next_work.work_id)}
+                      // loading={this.state.hometypepvisible}
+                      >评阅</Button>
+                    </Col>
+                  </Row>
+                </Col>}
+              </Row>
+
+            </div>
+          </div>
+
+        </div> : ""}
+      </div>
     )
   }
 }
diff --git a/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js b/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js
index 31fd4b9e..7305591d 100644
--- a/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js
+++ b/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js
@@ -14,9 +14,9 @@ function CommonWorkAppraiseReviseAttachments(props) {
             }
             `}</style>
             <div className={"color-grey-6 mb10 font-16"}>
-            补交附件
+              补交内容
             </div>
-            
+
             {/* {age} */}
 
             <div className={"ml20"}>
@@ -47,6 +47,6 @@ function CommonWorkAppraiseReviseAttachments(props) {
         </div>}
         </React.Fragment>
     )
-    
+
 }
 export default CommonWorkAppraiseReviseAttachments;
\ No newline at end of file
diff --git a/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index ab3718b1..dcffdeff 100644
--- a/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -1,10 +1,9 @@
 import React, { Component } from 'react';
-import { getRandomNumber } from 'educoder';
-import {Link} from 'react-router-dom';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
+import { Link } from 'react-router-dom';
+import { Route, Switch } from 'react-router-dom';
 import Loadable from 'react-loadable';
 import Loading from '../../../Loading';
-import { WordsBtn, MarkdownToHtml, trigger, queryString, getRandomcode } from 'educoder';
+import { WordsBtn, trigger, queryString, getRandomcode } from 'educoder';
 import axios from 'axios';
 import CoursesListType from '../coursesPublic/CoursesListType';
 import AccessoryModal from "../coursesPublic/AccessoryModal";
@@ -19,79 +18,90 @@ import { Spin } from 'antd'
 
 //新建分组/普通作业
 const NewWork = Loadable({
-    loader: () => import('./NewWork'),
-    loading:Loading,
+  loader: () => import('./NewWork'),
+  loading: Loading,
 })
 
 const CommonWorkSetting = Loadable({
   loader: () => import('./CommonWorkSetting'),
-  loading:Loading,
+  loading: Loading,
 })
 //普通作业列表
 const CommonWorkList = Loadable({
   loader: () => import('./CommonWorkList'),
-  loading:Loading,
+  loading: Loading,
 })
 const CommonWorkQuestion = Loadable({
   loader: () => import('./CommonWorkQuestion'),
-  loading:Loading,
+  loading: Loading,
 })
 const CommonWorkAnswer = Loadable({
   loader: () => import('./CommonWorkAnswer'),
-  loading:Loading,
+  loading: Loading,
 })
 const CommonWorkAppraise = Loadable({
   loader: () => import('./CommonWorkAppraise'),
-  loading:Loading,
+  loading: Loading,
 })
 
 const CommonWorkPost = Loadable({
   loader: () => import('./CommonWorkPost'),
-  loading:Loading,
+  loading: Loading,
 })
 
 const CommonWork = Loadable({
   loader: () => import('./commonWork'),
-  loading:Loading,
+  loading: Loading,
 })
-class CommonWorkDetailIndex extends Component{
+class CommonWorkDetailIndex extends Component {
   constructor(props) {
     super(props)
     this.publishModal = React.createRef();
     this.endModal = React.createRef();
     this.state = {
-      DownloadType:false,
-      DownloadMessageval:undefined,
-      donwloading:false,
+      DownloadType: false,
+      DownloadMessageval: undefined,
+      donwloading: false,
     }
   }
   initWorkDetailCommonState = (data) => {
     this.setState({
-        ...data
+      ...data
     })
   }
   goback = () => {
-    let workId=this.props.match.params.workId;
-		//
-    if ( window.location.pathname.indexOf('appraise') == -1) {
-      let category_id= this.state.category.category_id;
-      this.props.toListPage(this.props.match.params, category_id)
+    let workId = this.props.match.params.workId;
+    if (window.location.pathname.indexOf('appraise') == -1) {
+      let category_id = this.state.category.category_id;
+      let category = this.state.category;
+
+      let secondName = "";
+      if (window.location.pathname.indexOf('group_homework') > -1) {
+        secondName = category.main === 1 ? 'group_homeworks' : "group_homework";
+        this.props.toListPage(this.props.match.params, category_id, secondName);
+      }
+
+      if (window.location.pathname.indexOf('common_homework') > -1) {
+        secondName = category.main === 1 ? 'common_homeworks' : "common_homework";
+        this.props.toListPage(this.props.match.params, category_id, secondName);
+      }
+
     } else {
-      this.props.toWorkListPage(this.props.match.params, workId)
+      this.props.toWorkListPage(this.props.match.params, workId);
     }
-		// this.props.history.goBack()
+    // this.props.history.goBack()
   }
 
-   // 补交附件
-  Cancelvisible=()=>{
+  // 补交附件
+  Cancelvisible = () => {
     this.setState({
-      accessoryVisible:false
+      accessoryVisible: false
     })
   }
 
-  addAccessory=()=>{
+  addAccessory = () => {
     this.setState({
-      accessoryVisible:true
+      accessoryVisible: true
     })
   }
   setupdate = () => {
@@ -102,29 +112,29 @@ class CommonWorkDetailIndex extends Component{
   }
 
   /// 确认是否下载
-  confirmysl(url){
-    axios.get(url+ '&export=true').then((response) => {
-      if(response===undefined){
+  confirmysl(url) {
+    axios.get(url + '&export=true').then((response) => {
+      if (response === undefined) {
         return
       }
-      if(response.data.status&&response.data.status===-1){
+      if (response.data.status && response.data.status === -1) {
 
-      }else if(response.data.status&&response.data.status===-2){
-        if(response.data.message === "100"){
+      } else if (response.data.status && response.data.status === -2) {
+        if (response.data.message === "100") {
           // 已超出文件导出的上限数量（100 ），建议：
 
           this.setState({
-            DownloadType:true,
-            DownloadMessageval:100
+            DownloadType: true,
+            DownloadMessageval: 100
           })
-        }else {
+        } else {
           //因附件资料超过500M
           this.setState({
-            DownloadType:true,
-            DownloadMessageval:500
+            DownloadType: true,
+            DownloadMessageval: 500
           })
         }
-      }else {
+      } else {
         this.props.slowDownload(getRandomcode(url))
 
         // this.props.showNotification(`正在下载中`);
@@ -147,10 +157,10 @@ class CommonWorkDetailIndex extends Component{
     });
   }
 
-  Downloadcal=()=>{
+  Downloadcal = () => {
     this.setState({
-      DownloadType:false,
-      DownloadMessageval:undefined
+      DownloadType: false,
+      DownloadMessageval: undefined
     })
   }
   bindRef = ref => { this.child = ref };
@@ -164,45 +174,45 @@ class CommonWorkDetailIndex extends Component{
   }
 
   cancelConnectionProject = (work) => {
-    let workId=this.props.match.params.workId;
-    let courseId=this.props.match.params.coursesId;
+    let workId = this.props.match.params.workId;
+    let courseId = this.props.match.params.coursesId;
 
     const url = `/homework_commons/${work.homework_id}/student_works/cancel_relate_project.json`
-    axios.get(url).then((response)=> {
+    axios.get(url).then((response) => {
       if (response.data.status == 0) {
         this.child.fetchData && this.child.fetchData()
 
         this.props.showNotification('取消关联成功')
       }
-     }).catch((error)=>{
-       console.log(error)
-     })
+    }).catch((error) => {
+      console.log(error)
+    })
   }
   // 关联项目 END
 
   render() {
-    let {course_name, homework_name, homework_status, noTab
-        , view_answer, author_name, category, work_id
+    let { course_name, homework_name, homework_status, noTab
+      , view_answer, author_name, category, work_id
 
-        , end_immediately, publish_immediately, work_statuses, accessoryVisible
-    } =this.state;
+      , end_immediately, publish_immediately, work_statuses, accessoryVisible
+    } = this.state;
     const { current_user } = this.props
 
-    let courseId=this.props.match.params.coursesId;
-    let category_id= category && category.category_id;
-    let category_name= category && category.category_name;
+    let courseId = this.props.match.params.coursesId;
+    let category_id = category && category.category_id;
+    let category_name = category && category.category_name;
 
-    let workId=this.props.match.params.workId;
+    let workId = this.props.match.params.workId;
     const studentWorkId = this.props.match.params.studentWorkId
 
     const isGroup = this.props.isGroup()
-    const moduleName = !isGroup? "普通作业":"分组作业";
+    const moduleName = !isGroup ? "普通作业" : "分组作业";
     const moduleEngName = this.props.getModuleName()
 
     const childModuleName = this.state.moduleName
     const commonHandler = {
-        initWorkDetailCommonState: this.initWorkDetailCommonState,
-        triggerRef: this.bindRef
+      initWorkDetailCommonState: this.initWorkDetailCommonState,
+      triggerRef: this.bindRef
     }
     const isAdmin = this.props.isAdmin()
 
@@ -213,7 +223,7 @@ class CommonWorkDetailIndex extends Component{
     let params = {}
     if (isListModule) {
       // TODO
-      if(this.child && this.child._getRequestParams) {
+      if (this.child && this.child._getRequestParams) {
         params = this.child._getRequestParams() !== undefined ? this.child._getRequestParams() : {};
       }
     }
@@ -221,58 +231,60 @@ class CommonWorkDetailIndex extends Component{
     // console.log(params);
     let exportUrl = `/homework_commons/${workId}/works_list.zip?${queryString.stringify(params)}`
     let exportResultUrl = `/homework_commons/${workId}/works_list.xlsx?${queryString.stringify(params)}`
-    document.title=course_name === undefined ? "" : course_name;
+    document.title = course_name === undefined ? "" : course_name;
+
+    console.log(category_id)
     return (
-        <div>
-          <PublishRightnow ref={this.publishModal} showActionButton={false} {...this.props} checkBoxValues={[workId]}
-                isPublish={true} doWhenSuccess={this.doWhenSuccess} checkBeforePost={this.saveWorkSetting}
-                onToPublishClick={this.onToPublishClick}
-          ></PublishRightnow>
-          <DownloadMessageysl
-            {...this.props}
-            value={this.state.DownloadMessageval}
-            modalCancel={this.Downloadcal}
-            modalsType={this.state.DownloadType}
-          />
-          <PublishRightnow ref={this.endModal} showActionButton={false} {...this.props} checkBoxValues={[workId]}
-                isPublish={false} doWhenSuccess={this.doWhenSuccess}></PublishRightnow>
+      <div>
+        <PublishRightnow ref={this.publishModal} showActionButton={false} {...this.props} checkBoxValues={[workId]}
+          isPublish={true} doWhenSuccess={this.doWhenSuccess} checkBeforePost={this.saveWorkSetting}
+          onToPublishClick={this.onToPublishClick}
+        ></PublishRightnow>
+        <DownloadMessageysl
+          {...this.props}
+          value={this.state.DownloadMessageval}
+          modalCancel={this.Downloadcal}
+          modalsType={this.state.DownloadType}
+        />
+        <PublishRightnow ref={this.endModal} showActionButton={false} {...this.props} checkBoxValues={[workId]}
+          isPublish={false} doWhenSuccess={this.doWhenSuccess}></PublishRightnow>
 
 
-          <div className="newMain clearfix worklist1">
-            <div className={"educontent mt20"}>
-              <style>{`
+        <div className="newMain clearfix worklist1">
+          <div className={"educontent mt20"}>
+            <style>{`
                 .memoContent {
                   background: #fff;
                 }
               `}</style>
-              {current_user && <CBreadcrumb items={[
-                { to: current_user&&current_user.first_category_url , name: course_name},
-                { to: `/courses/${courseId}/${moduleEngName}/${category_id}`, name: category_name },
-                window.location.pathname.indexOf('appraise') == -1 ? { } : { to: `/courses/${courseId}/${moduleEngName}/${workId}/list`, name: '作业详情' },
-                // 1.	与上一条联动，当匿评他人作品时，TA人作品的作者真实姓名切换为“匿名”
-                window.location.pathname.indexOf('appraise') == -1 ? { name: '作业详情' } : { name: author_name },
-                // window.location.pathname.indexOf('appraise') == -1 ? { } : { to: `/courses/${courseId}/${moduleEngName}/${workId}/list`, name: '作品列表' },
-                // { name: childModuleName }
-              ]}></CBreadcrumb>}
+            {current_user && <CBreadcrumb items={[
+              { to: current_user && current_user.first_category_url, name: course_name },
+              { to: `/classrooms/${courseId}/${moduleEngName}/${category_id}`, name: category_name },
+              window.location.pathname.indexOf('appraise') == -1 ? {} : { to: `/classrooms/${courseId}/${moduleEngName}/${workId}/list`, name: '作业详情' },
+              // 1.	与上一条联动，当匿评他人作品时，TA人作品的作者真实姓名切换为“匿名”
+              window.location.pathname.indexOf('appraise') == -1 ? { name: '作业详情' } : { name: author_name },
+              // window.location.pathname.indexOf('appraise') == -1 ? { } : { to: `/courses/${courseId}/${moduleEngName}/${workId}/list`, name: '作品列表' },
+              // { name: childModuleName }
+            ]}></CBreadcrumb>}
 
-              <div style={{ width:'100%',height:'52px'}} >
-                <span className=" fl color-black summaryname" title={`${homework_name && homework_name.length > 36 ? homework_name : ''}`}
-                    style={{height: 'auto'}}
-                >
-                   {homework_name}
-                  {/* <Link to={"/courses/"+courseId+"/graduation"+"/graduation_tasks/"}>{homework_name}</Link> */}
-                </span>
-                <CoursesListType
-                  typelist={homework_status}
-                  typesylename={"mt12"}
-                />
+            <div style={{ width: '100%', height: '52px' }} >
+              <span className=" fl color-black summaryname" title={`${homework_name && homework_name.length > 36 ? homework_name : ''}`}
+                style={{ height: 'auto' }}
+              >
+                {homework_name}
+                {/* <Link to={"/courses/"+courseId+"/graduation"+"/graduation_tasks/"}>{homework_name}</Link> */}
+              </span>
+              <CoursesListType
+                typelist={homework_status}
+                typesylename={"mt12"}
+              />
 
 
-                {category && <a className="color-grey-6 fr font-16 ml30 mt5 mr20" onClick={this.goback} style={{ marginRight: '26px'}}>返回</a>}
+              {category && <a className="color-grey-6 fr font-16 ml30 mt5 mr20" onClick={this.goback} style={{ marginRight: '26px' }}>返回</a>}
 
-                {this.state.update_atta &&
+              {this.state.update_atta &&
                 <React.Fragment>
-                    {this.state.accessoryVisible===true? <AccessoryModal
+                  {this.state.accessoryVisible === true ? <AccessoryModal
                     {...this.props}
                     modalname={"补交附件"}
                     visible={this.state.accessoryVisible}
@@ -282,39 +294,39 @@ class CommonWorkDetailIndex extends Component{
                     setupdate={this.setupdate}
                     seeworks={undefined}
                     reviseAttachmentUrl={`/student_works/${work_id || studentWorkId}/revise_attachment.json`}
-                  />:""}
+                  /> : ""}
                   <a className={"fr color-blue font-16 "} href={"javascript:void(0)"}
                     onClick={this.addAccessory} style={{ 'marginTop': '-4px' }}
                   >补交附件</a>
                 </React.Fragment>
 
-                }
-              </div>
+              }
+            </div>
 
-              { noTab !== true && <div className="stud-class-set bor-bottom-greyE floatSpinParent">
-                <div className="mt10 clearfix edu-back-white poll_list pl5">
-                  <Link
-                        onClick={() => this.setState({moduleName: '作品列表'})}
-                        className={`${isListModule ? 'active' : '' } `}
-                        to={`/courses/${courseId}/${moduleEngName}/${workId}/list`}>作品列表</Link>
-                  <Link
-                        onClick={() => this.setState({moduleName: '作业描述'})}
-                        className={`${childModuleName == '作业描述' ? 'active' : '' } `}
-                        to={`/courses/${courseId}/${moduleEngName}/${workId}/question`}>作业描述</Link>
-                  {view_answer == true && <Link
-                        onClick={() => this.setState({moduleName: '参考答案'})}
-                        className={`${childModuleName == '参考答案' ? 'active' : '' } `}
-                        to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>}
-                  <Link
-                        onClick={() => this.setState({moduleName: '设置'})}
-                        className={`${childModuleName == '设置' ? 'active' : '' } `}
-                        style={{paddingLeft:this.props.isAdmin()?'38px':'20px'}}
-                        to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link>
+            {noTab !== true && <div className="stud-class-set bor-bottom-greyE floatSpinParent">
+              <div className="mt10 clearfix edu-back-white poll_list pl5">
+                <Link
+                  onClick={() => this.setState({ moduleName: '作品列表' })}
+                  className={`${isListModule ? 'active' : ''} `}
+                  to={`/classrooms/${courseId}/${moduleEngName}/${workId}/list`}>作品列表</Link>
+                <Link
+                  onClick={() => this.setState({ moduleName: '作业描述' })}
+                  className={`${childModuleName == '作业描述' ? 'active' : ''} `}
+                  to={`/classrooms/${courseId}/${moduleEngName}/${workId}/question`}>作业描述</Link>
+                {view_answer == true && <Link
+                  onClick={() => this.setState({ moduleName: '参考答案' })}
+                  className={`${childModuleName == '参考答案' ? 'active' : ''} `}
+                  to={`/classrooms/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>}
+                <Link
+                  onClick={() => this.setState({ moduleName: '设置' })}
+                  className={`${childModuleName == '设置' ? 'active' : ''} `}
+                  style={{ paddingLeft: this.props.isAdmin() ? '38px' : '20px' }}
+                  to={`/classrooms/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin() ? "设置" : "得分规则"}</Link>
 
 
-                  {/* { this.props.tabRightComponents }  */}
-                  <React.Fragment>
-                    <style>{`
+                {/* { this.props.tabRightComponents }  */}
+                <React.Fragment>
+                  <style>{`
                         .drop_down_menu li a {
                             padding: 0px;
                             font-size: 14px;
@@ -335,148 +347,190 @@ class CommonWorkDetailIndex extends Component{
                           float: right;
                         }
                         `}</style>
-                        {this.props.isAdmin()? <Spin spinning={this.state.donwloading} style={{  }}>
-                        <li className="li_line drop_down fr color-blue font-16 mt20" style={{"padding":"0 20px"}}>
-                        导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
-                        <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                            <li>
+                  {this.props.isAdmin() ? <Spin spinning={this.state.donwloading} style={{}}>
+                    <li className="li_line drop_down fr color-blue font-16 mt20" style={{ "padding": "0 20px" }}>
+                      导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                      <ul className="drop_down_menu" style={{ "right": "-34px", "left": "unset", "height": "auto" }}>
+                        <li>
 
-                              <a href={"javascript:void(0)"} className="color-dark"
-                              	  onClick={() => this.confirmysl(exportResultUrl)}
-                              >导出成绩</a>
+                          <a href={"javascript:void(0)"} className="color-dark"
+                            onClick={() => this.confirmysl(exportResultUrl)}
+                          >导出成绩</a>
 
-                            </li>
-                            <li>
-                              <a href={"javascript:void(0)"} className="color-dark"
-                              	  onClick={() => this.confirmysl(exportUrl)}
-                              >导出作品附件</a>
-                            </li>
-                        </ul>
                         </li>
-                        </Spin>:""}
+                        <li>
+                          <a href={"javascript:void(0)"} className="color-dark"
+                            onClick={() => this.confirmysl(exportUrl)}
+                          >导出作品附件</a>
+                        </li>
+                      </ul>
+                    </li>
+                  </Spin> : ""}
 
-                        {/* {isAdmin && <a className={"fr color-blue font-16"} href={exportUrl}>导出作品附件</a>}
+                  {/* {isAdmin && <a className={"fr color-blue font-16"} href={exportUrl}>导出作品附件</a>}
                         {isAdmin && <a className={"fr color-blue font-16"} href={exportResultUrl}>导出成绩</a>} */}
-                        {/*<a className={"fr color-blue font-16"}>导出</a>*/}
-                        {end_immediately &&  <a className={"fr color-blue font-16"} onClick={() => { this.endModal.current.open() } }>立即截止</a>}
-                        {publish_immediately && <a className={"fr color-blue font-16"} onClick={() => { this.publishModal.current.open() } } >立即发布</a>}
+                  {/*<a className={"fr color-blue font-16"}>导出</a>*/}
+                  {end_immediately && <a className={"fr color-blue font-16"} onClick={() => { this.endModal.current.open() }}>立即截止</a>}
+                  {publish_immediately && <a className={"fr color-blue font-16"} onClick={() => { this.publishModal.current.open() }} >立即发布</a>}
 
-                        {/*<a className={"fr color-blue font-16"}>项目在线质量检测</a>*/}
-                        {isAdmin && <a className={"fr color-blue font-16"} onClick={() => this.props.toEditPage(this.props.match.params, workId)}>编辑作业</a>}
+                  {/*<a className={"fr color-blue font-16"}>项目在线质量检测</a>*/}
+                  {isAdmin && <a className={"fr color-blue font-16"} onClick={() => this.props.toEditPage(this.props.match.params, workId)}>编辑作业</a>}
 
-                        { //
-                        work_statuses && work_statuses.indexOf('关联项目') != -1 &&
-                        <React.Fragment>
-                          <ConnectProject ref="connectProject" {...this.props} connectSuccess={this.connectSuccess}></ConnectProject>
-                          <WordsBtn style="blue" className={` font-16 fr`} onClick={() => this.openConnectionProject({ homework_id: workId })}>关联项目</WordsBtn>
-                          <WordsBtn style="blue" className={` font-16 fr`} onClick={() => this.props.toCreateProject()}>创建项目</WordsBtn>
-                        </React.Fragment>
-                        }
+                  { //
+                    work_statuses && work_statuses.indexOf('关联项目') != -1 &&
+                    <React.Fragment>
+                      <ConnectProject ref="connectProject" {...this.props} connectSuccess={this.connectSuccess}></ConnectProject>
+                      <WordsBtn style="blue" className={` font-16 fr`} onClick={() => this.openConnectionProject({ homework_id: workId })}>关联项目</WordsBtn>
+                      <WordsBtn style="blue" className={` font-16 fr`} onClick={() => this.props.toCreateProject()}>创建项目</WordsBtn>
+                    </React.Fragment>
+                  }
 
-                        { //
-                        work_statuses && work_statuses.indexOf('取消关联') != -1 &&
-                        <WordsBtn style="blue" className={` font-16 fr`} onClick={() => this.cancelConnectionProject( {homework_id: workId} )}>取消关联</WordsBtn>
-                        }
+                  { //
+                    work_statuses && work_statuses.indexOf('取消关联') != -1 &&
+                    <WordsBtn style="blue" className={` font-16 fr`} onClick={() => this.cancelConnectionProject({ homework_id: workId })}>取消关联</WordsBtn>
+                  }
 
-                        {work_statuses && work_statuses.indexOf('提交作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
-                            onClick={() => { this.props.toWorkPostPage(this.props.match.params)}}
-                        >提交作品</a>}
+                  {work_statuses && work_statuses.indexOf('提交作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
+                    onClick={() => { this.props.toWorkPostPage(this.props.match.params) }}
+                  >提交作品</a>}
 
-                        { work_statuses && work_statuses.indexOf('补交作品') != -1 &&
-                        <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
-                            onClick={() => { this.props.toWorkPostPage(this.props.match.params)}}>
-                        补交作品</a> }
+                  {work_statuses && work_statuses.indexOf('补交作品') != -1 &&
+                    <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
+                      onClick={() => { this.props.toWorkPostPage(this.props.match.params) }}>
+                      补交作品</a>}
 
-                        {work_statuses && work_statuses.indexOf('修改作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
-                            onClick={() => { this.props.toWorkPostPage(this.props.match.params, null, true, work_id)}}
-                        >修改作品</a>}
-                        {work_statuses && work_statuses.indexOf('补交附件') != -1 &&
-                        <React.Fragment>
-                        <AccessoryModal
-                            {...this.props}
-                            modalname={"补交附件"}
-                            visible={accessoryVisible}
-                            Cancelname={"取消"}
-                            Savesname={"确认"}
-                            Cancel={this.Cancelvisible}
-                            setupdate={this.setupdate}
-                            reviseAttachmentUrl={`/student_works/${work_id}/revise_attachment.json`}
-                        />
-                        <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
-                            onClick={this.addAccessory}
-                        >补交附件</a>
-                        </React.Fragment>
-
-                        }
+                  {work_statuses && work_statuses.indexOf('修改作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
+                    onClick={() => { this.props.toWorkPostPage(this.props.match.params, null, true, work_id) }}
+                  >修改作品</a>}
+                  {work_statuses && work_statuses.indexOf('补交附件') != -1 &&
+                    <React.Fragment>
+                      <AccessoryModal
+                        {...this.props}
+                        modalname={"补交附件"}
+                        visible={accessoryVisible}
+                        Cancelname={"取消"}
+                        Savesname={"确认"}
+                        Cancel={this.Cancelvisible}
+                        setupdate={this.setupdate}
+                        reviseAttachmentUrl={`/student_works/${work_id}/revise_attachment.json`}
+                      />
+                      <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
+                        onClick={this.addAccessory}
+                      >补交附件</a>
                     </React.Fragment>
 
-                </div>
-            </div> }
+                  }
+                </React.Fragment>
 
-                {/* 内容区 */}
-                <Switch {...this.props}>
+              </div>
+            </div>}
 
-                    {/* --------------------------------------------------------------------- */}
+            {/* 内容区 */}
+            <Switch {...this.props}>
 
-                    {/* 作业设置 */}
-                    {/* http://localhost:3007/courses/1309/homework/9300/setting */}
-                    <Route exact path="/courses/:coursesId/common_homeworks/:workId/setting"
-                        render={
-                        (props) => (<CommonWorkSetting {...this.props} {...props} {...this.state} {...commonHandler}/>)
-                        }
-                    ></Route>
+              {/* --------------------------------------------------------------------- */}
 
-                    {/* 作品列表 */}
-                    <Route exact path="/courses/:coursesId/common_homeworks/:workId/list"
-                        render={
-                        (props) => (<CommonWorkList ref="commonWorkList"  triggerRef={this.bindRef} {...this.props} {...props} {...this.state} {...commonHandler}/>)
-                        }
-                    ></Route>
+              {/* 作业设置 */}
+              {/* http://localhost:3007/classrooms/1309/homework/9300/setting */}
+              <Route exact path="/classrooms/:coursesId/common_homeworks/:workId/setting"
+                render={
+                  (props) => (<CommonWorkSetting {...this.props} {...props} {...this.state} {...commonHandler} />)
+                }
+              ></Route>
 
-                    {/* 作业问答 */}
-                    <Route exact path="/courses/:coursesId/common_homeworks/:workId/question"
-                        render={
-                        (props) => (<CommonWorkQuestion {...this.props} {...props} {...this.state} {...commonHandler}/>)
-                        }
-                    ></Route>
-                    <Route exact path="/courses/:coursesId/common_homeworks/:workId/answer"
-                        render={
-                        (props) => (<CommonWorkAnswer {...this.props} {...props} {...this.state} {...commonHandler}/>)
-                        }
-                    ></Route>
+              <Route exact path="/classrooms/:coursesId/common_homework/:workId/setting"
+                render={
+                  (props) => (<CommonWorkSetting {...this.props} {...props} {...this.state} {...commonHandler} />)
+                }
+              ></Route>
+
+              {/* 作品列表 */}
+              <Route exact path="/classrooms/:coursesId/common_homeworks/:workId/list"
+                render={
+                  (props) => (<CommonWorkList ref="commonWorkList" triggerRef={this.bindRef} {...this.props} {...props} {...this.state} {...commonHandler} />)
+                }
+              ></Route>
+
+              {/* 作品列表 */}
+              <Route exact path="/classrooms/:coursesId/common_homework/:workId/list"
+                render={
+                  (props) => (<CommonWorkList ref="commonWorkList" triggerRef={this.bindRef} {...this.props} {...props} {...this.state} {...commonHandler} />)
+                }
+              ></Route>
+
+              {/* 作业问答 */}
+              <Route exact path="/classrooms/:coursesId/common_homeworks/:workId/question"
+                render={
+                  (props) => (<CommonWorkQuestion {...this.props} {...props} {...this.state} {...commonHandler} />)
+                }
+              ></Route>
+              <Route exact path="/classrooms/:coursesId/common_homework/:workId/question"
+                render={
+                  (props) => (<CommonWorkQuestion {...this.props} {...props} {...this.state} {...commonHandler} />)
+                }
+              ></Route>
+
+              <Route exact path="/classrooms/:coursesId/common_homeworks/:workId/answer"
+                render={
+                  (props) => (<CommonWorkAnswer {...this.props} {...props} {...this.state} {...commonHandler} />)
+                }
+              ></Route>
+              <Route exact path="/classrooms/:coursesId/common_homework/:workId/answer"
+                render={
+                  (props) => (<CommonWorkAnswer {...this.props} {...props} {...this.state} {...commonHandler} />)
+                }
+              ></Route>
 
 
-                    <Route exact path="/courses/:coursesId/group_homeworks/:workId/setting"
-                        render={
-                        (props) => (<CommonWorkSetting {...this.props} {...props} {...this.state} {...commonHandler}/>)
-                        }
-                    ></Route>
-
-                    {/* 作品列表 */}
-                    <Route exact path="/courses/:coursesId/group_homeworks/:workId/list"
-                        render={
-                        (props) => (<CommonWorkList triggerRef={this.bindRef} {...this.props} {...props} {...this.state}  {...commonHandler}/>)
-                        }
-                    ></Route>
-
-                    {/* 作业问答 */}
-                    <Route exact path="/courses/:coursesId/group_homeworks/:workId/question"
-                        render={
-                        (props) => (<CommonWorkQuestion {...this.props} {...props} {...this.state} {...commonHandler}/>)
-                        }
-                    ></Route>
-                    <Route exact path="/courses/:coursesId/group_homeworks/:workId/answer"
-                        render={
-                        (props) => (<CommonWorkAnswer {...this.props} {...props} {...this.state} {...commonHandler}/>)
-                        }
-                    ></Route>
-                </Switch>
-            </div>
+              <Route exact path="/classrooms/:coursesId/group_homeworks/:workId/setting"
+                render={
+                  (props) => (<CommonWorkSetting {...this.props} {...props} {...this.state} {...commonHandler} />)
+                }
+              ></Route>
+              <Route exact path="/classrooms/:coursesId/group_homework/:workId/setting"
+                render={
+                  (props) => (<CommonWorkSetting {...this.props} {...props} {...this.state} {...commonHandler} />)
+                }
+              ></Route>
+              {/* 作品列表 */}
+              <Route exact path="/classrooms/:coursesId/group_homeworks/:workId/list"
+                render={
+                  (props) => (<CommonWorkList triggerRef={this.bindRef} {...this.props} {...props} {...this.state}  {...commonHandler} />)
+                }
+              ></Route>
+              <Route exact path="/classrooms/:coursesId/group_homework/:workId/list"
+                render={
+                  (props) => (<CommonWorkList triggerRef={this.bindRef} {...this.props} {...props} {...this.state}  {...commonHandler} />)
+                }
+              ></Route>
+              {/* 作业问答 */}
+              <Route exact path="/classrooms/:coursesId/group_homeworks/:workId/question"
+                render={
+                  (props) => (<CommonWorkQuestion {...this.props} {...props} {...this.state} {...commonHandler} />)
+                }
+              ></Route>
+              <Route exact path="/classrooms/:coursesId/group_homework/:workId/question"
+                render={
+                  (props) => (<CommonWorkQuestion {...this.props} {...props} {...this.state} {...commonHandler} />)
+                }
+              ></Route>
+              <Route exact path="/classrooms/:coursesId/group_homeworks/:workId/answer"
+                render={
+                  (props) => (<CommonWorkAnswer {...this.props} {...props} {...this.state} {...commonHandler} />)
+                }
+              ></Route>
+              <Route exact path="/classrooms/:coursesId/group_homework/:workId/answer"
+                render={
+                  (props) => (<CommonWorkAnswer {...this.props} {...props} {...this.state} {...commonHandler} />)
+                }
+              ></Route>
+            </Switch>
           </div>
         </div>
+      </div>
 
     )
   }
 }
 
-export default  ( CommonWorkDetailIndex) ;
\ No newline at end of file
+export default (CommonWorkDetailIndex);
diff --git a/src/modules/courses/busyWork/CommonWorkItem.js b/src/modules/courses/busyWork/CommonWorkItem.js
index 244a03e1..e6470ab6 100644
--- a/src/modules/courses/busyWork/CommonWorkItem.js
+++ b/src/modules/courses/busyWork/CommonWorkItem.js
@@ -55,9 +55,9 @@ class CommonWorkItem extends Component{
         //       "url": "/attachments/:id/download",
         //       "delete": true
         //    }
-        // ] 
+        // ]
         // response.data.revise_reason = 'qweqweqweqe';
-        
+
         // revise_reason revise_attachments 传给modal
         // attach to fileList
         const fileList = response.data.revise_attachments.map(item => {
@@ -163,7 +163,7 @@ class CommonWorkItem extends Component{
               }
 
               <div className="flex1" onClick={() => this.props.onItemClick(Object.assign({}, item, {id: item.homework_id})) }>
-                <p className="clearfix mb20">
+                <p className="clearfix">
 										{canNotLink?<span className={"fl font-16 font-bd mt2 comnonwidth580 pointer color-grey-name"}
 												title={ canNotLink ? "私有属性，非课堂成员不能访问" : item.name}
 										>
@@ -174,12 +174,12 @@ class CommonWorkItem extends Component{
 										>{item.name}</a>}
               {/* 只有非课堂成员且作业是私有的情况下才会为true */}
                   {
-                    item.private_icon===true ? 
+                    item.private_icon===true ?
                     (<Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom" >
                       <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i>
                      </Tooltip>) : ""
                   }
-                  
+
                   <span className="fl">
                     <CoursesListType typelist={item.status} />
                   </span>
@@ -199,12 +199,20 @@ class CommonWorkItem extends Component{
                     </li>
                     } */}
                 </p>
-                <p className="color-grey-9 clearfix">
+                {
+                  item && item.upper_category_name &&
+                  // <ConditionToolTip title={discussMessage.upper_category_name} condition={ discussMessage.upper_category_name.length > 22 }>
+                  <div className="color-grey9 task-hide mt5" title={item.upper_category_name}>所属目录：{item.upper_category_name}</div>
+                  // </ConditionToolTip>
+                }
+                <p className="color-grey-9 clearfix mt10">
 									{ item.author && <span className="mr20 fl">{item.author}</span> }
 									{item.commit_count===undefined?"":<span className="mr20 fl">{item.commit_count} 已交</span>}
 									{item.uncommit_count===undefined?"":<span className="mr20 fl">{item.uncommit_count} 未交</span>}
+                  {item.uncomment_count===undefined?"":<span className="mr20 fl">{item.uncomment_count} 未评数</span>}
+
                   {
-                    item.status_time!="" && 
+                    item.status_time!="" &&
 
                       <span className="mr20 fl">{item.status_time}</span>
 
@@ -219,12 +227,12 @@ class CommonWorkItem extends Component{
                       <WordsBtn style="blue"  className={"fl font-16 ml28"}
                                 onClick={ canNotLink ? () => {} : () => this.onItemClick(item)}
                       >查看详情</WordsBtn>
-                      <WordsBtn style="blue" className="fl font-16 ml28" onClick={ () => { this.props.toEditPage(this.props.match.params, item.homework_id) }}>编辑</WordsBtn> 
-                      <WordsBtn style="blue" className="fl font-16 ml28" onClick={ () => { this.props.toWorkSettingPage(this.props.match.params, item.homework_id) }}>设置</WordsBtn> 
+                      <WordsBtn style="blue" className="fl font-16 ml28" onClick={ () => { this.props.toEditPage(this.props.match.params, item.homework_id) }}>编辑</WordsBtn>
+                      <WordsBtn style="blue" className="fl font-16 ml28" onClick={ () => { this.props.toWorkSettingPage(this.props.match.params, item.homework_id) }}>设置</WordsBtn>
                     </div>}
 
                   {
-                    //  
+                    //
                     isStudent &&
                     <li className="fr">
                       <WordsBtn style="blue"  className={"fl font-16"}
@@ -232,34 +240,34 @@ class CommonWorkItem extends Component{
                       >查看详情</WordsBtn>
 
                       { //
-                      item.work_status && item.work_status.indexOf('关联项目') != -1 && 
+                      item.work_status && item.work_status.indexOf('关联项目') != -1 &&
                       <React.Fragment>
                         <WordsBtn style="blue" className={` font-16 fl ml28`} onClick={() => this.props.toCreateProject(item)}>创建项目</WordsBtn>
                         <WordsBtn style="blue" className={` font-16 fl ml28`} onClick={() => this.props.openConnectionProject(item)}>关联项目</WordsBtn>
                       </React.Fragment>
                       }
-                      
+
                       { //
-                      item.work_status && item.work_status.indexOf('取消关联') != -1 && 
+                      item.work_status && item.work_status.indexOf('取消关联') != -1 &&
                       <WordsBtn style="blue" className={` font-16 fl ml28`} onClick={() => this.props.cancelConnectionProject(item)}>取消关联</WordsBtn>
                       }
                       { //
-                      item.work_status && item.work_status.indexOf('提交作品') != -1 && 
-                      <WordsBtn style="blue" className="fl font-16 ml28" onClick={() => this.props.toWorkPostPage(this.props.match.params, item.homework_id)}>提交作品</WordsBtn> 
+                      item.work_status && item.work_status.indexOf('提交作品') != -1 &&
+                      <WordsBtn style="blue" className="fl font-16 ml28" onClick={() => this.props.toWorkPostPage(this.props.match.params, item.homework_id)}>提交作品</WordsBtn>
                       }
-                      
-                      
-                      { 
-                        // 
+
+
+                      {
+                        //
                         item.work_status && item.work_status.indexOf('补交作品') != -1 &&
                        <WordsBtn style="blue" className="fl font-16 ml28" onClick={() => this.props.toWorkPostPage(this.props.match.params, item.homework_id)}>补交作品</WordsBtn> }
 
                       { //
-                      item.work_status && item.work_status.indexOf('修改作品') != -1 && 
-                      <WordsBtn style="blue" className="fl font-16 ml28" onClick={() => this.props.toWorkPostPage(this.props.match.params, item.homework_id, true, item.work_id)}>修改作品</WordsBtn> 
+                      item.work_status && item.work_status.indexOf('修改作品') != -1 &&
+                      <WordsBtn style="blue" className="fl font-16 ml28" onClick={() => this.props.toWorkPostPage(this.props.match.params, item.homework_id, true, item.work_id)}>修改作品</WordsBtn>
                       }
                       { //
-                      item.work_status && item.work_status.indexOf('补交附件') != -1 && 
+                      item.work_status && item.work_status.indexOf('补交附件') != -1 &&
                       <React.Fragment>
                         <AccessoryModal
                           {...this.props}
@@ -270,14 +278,14 @@ class CommonWorkItem extends Component{
                           Cancel={this.Cancelvisible}
                           setupdate={this.setupdate}
                           reviseAttachmentUrl={`/student_works/${item.work_id}/revise_attachment.json`}
-													seeworks={`/courses/${this.props.match.params.coursesId}/common_homeworks/${item.homework_id}/${item.work_id}/appraise`}
+													seeworks={`/classrooms/${this.props.match.params.coursesId}/common_homeworks/${item.homework_id}/${item.work_id}/appraise`}
                         />
-                        <WordsBtn style="blue" className="fl font-16 ml28" onClick={() => this.addAccessory(item)}>补交附件</WordsBtn> 
+                        <WordsBtn style="blue" className="fl font-16 ml28" onClick={() => this.addAccessory(item)}>补交附件</WordsBtn>
                       </React.Fragment>
 
                         }
-                      { 
-                        // 
+                      {
+                        //
                         item.work_status && item.work_status.indexOf('查看作品') != -1 &&
                        <WordsBtn style="blue" className="fl font-16 ml28" onClick={() => this.props.toWorkDetailPage(this.props.match.params, item.homework_id, item.work_id)}>查看作品</WordsBtn> }
 
@@ -287,7 +295,7 @@ class CommonWorkItem extends Component{
                 </p>
               </div>
             </div>
-          </div> 
+          </div>
         </div>
             )
           })
@@ -296,4 +304,4 @@ class CommonWorkItem extends Component{
     )
   }
 }
-export default CommonWorkItem;
\ No newline at end of file
+export default CommonWorkItem;
diff --git a/src/modules/courses/busyWork/CommonWorkList.js b/src/modules/courses/busyWork/CommonWorkList.js
index 35b2a1ee..1ce1fbb9 100644
--- a/src/modules/courses/busyWork/CommonWorkList.js
+++ b/src/modules/courses/busyWork/CommonWorkList.js
@@ -1,6 +1,6 @@
 import React,{Component} from "react";
-import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip,Spin, Pagination} from "antd";
-import {WordsBtn, ConditionToolTip, queryString, publicSearchs, on, off, NoneData, sortDirections} from 'educoder';
+import { Form, Table,Tooltip,Spin, Pagination} from "antd";
+import { queryString, publicSearchs, on, off, NoneData, sortDirections} from 'educoder';
 import axios from 'axios';
 import CheckAllGroup from '../common/button/CheckAllGroup'
 import moment from 'moment';
@@ -11,7 +11,6 @@ import ModulationModal from "../coursesPublic/ModulationModal";
 import AccessoryModal from "../coursesPublic/AccessoryModal";
 import LeaderIcon from './common/LeaderIcon'
 const $ = window.$;
-const Search = Input.Search;
 
 function renderScore(score, content) {
   let color = '#747A7F'
@@ -285,7 +284,25 @@ function buildColumns(that, student_works, studentData) {
       ),
     })
 	}
+  if (that.state.anonymous_comment) {
+    /**
+     开启了匿评的才显示此列
+     */
+    columns.push({
+      width: 84,
+      title: <div style={{color: 'rgba(0,0,0,.85)'}}>已评数</div>,
+      key: 'user_comment_count',
+      dataIndex: 'user_comment_count',
 
+      render: (user_comment_count, record) => (
+        <span  style={{color:'#989898', cursor: 'default'}}>
+           <Tooltip title={"在匿评期间评阅的作品数量"}>
+             {record.user_comment_count}
+            </Tooltip>
+      </span>
+      ),
+    })
+  }
   if (that.state.anonymous_appeal) {
     columns.push({
       width: 70,
@@ -351,17 +368,24 @@ function buildColumns(that, student_works, studentData) {
           {/* 0 未提交 */}
           {/*<React.Fragment>*/}
           {/*</React.Fragment>*/}
+          <div>
+            <a style={{color: '#4CACFF'}} id={"asdasdasdasd"}
+               className="font-14"
+               onMouseDown={(e) => that.props.toWorkDetailPage2(e, courseId, workId, record.id)}
+              // onClick={() => that.props.toWorkDetailPage(courseId, workId, record.id)}
+            >{isAdmin ? record.has_comment===true?"已评阅":'评阅':"查看"}</a>
+          </div>
+
+          <div>
           { isAdmin && <Tooltip placement="bottom" title={<pre>调整学生当前成绩<br/>其它历史评分将全部失效</pre>}>
-						<a style={{color: "#4CACFF"}}
+						<a style={{color: "#32C090"}}
+               className="font-14"
 							 onClick={() => that.showModulationModal(record)}
               >调分</a>
             </Tooltip> }
+          </div>
             {/* toWorkDetailPage */}
-            {/* /courses/"+courseId+"/common_homeworks/"+workId+ '/' + record.id +"/appraise */}
-					<a style={{color: '#4CACFF', marginLeft: '4px'}} id={"asdasdasdasd"}
-						 onMouseDown={(e) => that.props.toWorkDetailPage2(e, courseId, workId, record.id)}
-						 onClick={() => that.props.toWorkDetailPage(courseId, workId, record.id)}>{isAdmin ? '评阅' : '查看'}</a>
-
+            {/* /classrooms/"+courseId+"/common_homeworks/"+workId+ '/' + record.id +"/appraise */}
         </div>
 
       ),
@@ -378,7 +402,7 @@ const orderMap = {
   student_id: 'asc',
 }
 const PAGE_SIZE = 20
-// 类似页面 http://localhost:3007/courses/1309/graduation/graduation_tasks/48/76/setting
+// 类似页面 http://localhost:3007/classrooms/1309/graduation/graduation_tasks/48/76/setting
 class CommonWorkList extends Component{
 
   constructor(props){
@@ -404,43 +428,36 @@ class CommonWorkList extends Component{
       category: {},
 			b_order: 'desc',
       searchtypes:false,
-      loadingstate:false
+      loadingstate:false,
+			comwbool:false
     }
   }
   onTablePagination = (page) => {
+    const { search } = this.state;
+
     this.setState({ page: page }, () => {
-      this.fetchList()
+      this.fetchList(page,search);
     })
 
   }
   onSearchValue = (val) => {
-    if (val === ""||val===undefined) {
-      this.setState({
-        search: undefined,
-        searchtypes:false
-      })
-    }else{
-      this.setState({
-        searchtypes:true,
-        loadingstate:true
-      })
-    }
-
-    this.fetchList()
+    this.setState({
+      search:val,
+      searchtypes:true,
+      loadingstate:true,
+      page:1
+    })
+    this.fetchList(1,val);
   }
   onSearchValueInput = (e) => {
-    if (e.target.value === ""||e.target.value===undefined) {
-      this.setState({
-        search: undefined,
-      })
-    } else {
-      this.setState({search: e.target.value})
-    }
+    this.setState({search: e.target.value})
   }
 
   componentDidMount() {
-		console.log("CommonWorkList 分班list 开始加载");
-    this.fetchList()
+    console.log("CommonWorkList 分班list 开始加载");
+    const { page , search } = this.state;
+    
+    this.fetchList(page,search);
     on('commonwork_fetch_all', this.fetchAllListener)
     $("html").animate({ scrollTop: $('html').scrollTop() - 100 });
     try {
@@ -454,17 +471,20 @@ class CommonWorkList extends Component{
 		off('commonwork_fetch_all', this.fetchAllListener)
   }
   fetchAllListener = () => {
-    this.fetchList()
+    const { page,search } = this.state;
+    this.fetchList(page,search);
   }
+// arg_teacher_comment
+	_getRequestParams(pages,search) {
+		let { arg_work_status, arg_teacher_comment, arg_course_group, order, page, arg_member_work, b_order} = this.state
+    page=pages?pages:page;
 
-	_getRequestParams() {
-		const {search, arg_work_status, arg_teacher_comment, arg_course_group, order, page, arg_member_work, b_order} = this.state
     return {
       page,
       search,
       work_status: arg_work_status, // [0]
       course_group: arg_course_group,
-      teacher_comment: arg_teacher_comment.length == 0 ? '' : arg_teacher_comment[0],
+      teacher_comment: arg_teacher_comment.length === 0 || arg_teacher_comment.length > 1  ? '' : arg_teacher_comment[0],
       order,
       limit: PAGE_SIZE,
 			b_order: b_order,
@@ -473,14 +493,24 @@ class CommonWorkList extends Component{
     }
   }
   fetchData = () => {
-    this.fetchList()
+    const { page , search } = this.state;
+    this.fetchList(page , search );
   }
-  fetchList = () => {
+  fetchList = (page,search) => {
+			if(this.state.comwbool===true){
+				console.log('arg_course_group2');
+				console.log(this.state.arg_course_group);
+				return
+			}
+	  this.setState({
+			comwbool:true,
+		})
+  	//分班
     let workId=this.props.match.params.workId;
     let courseId=this.props.match.params.coursesId;
 
     const url = `/homework_commons/${workId}/works_list.json`
-    let params = this._getRequestParams()
+    let params = this._getRequestParams(page,search);
     axios.post(url, params).then((response)=> {
       if (response.data) {
         this.setState({
@@ -493,47 +523,70 @@ class CommonWorkList extends Component{
           moduleName: '作品列表'
         }))
       }
-     }).catch((error)=>{
+			setTimeout(() => {
+				this.setState({
+					comwbool:false,
+				})
+			}, 1000)
+    }).catch((error)=>{
        console.log(error)
 			this.setState({
 				isSpin:false,
         loadingstate:false
 			})
+			setTimeout(() => {
+				this.setState({
+					comwbool:false,
+				})
+			}, 1000)
+
      })
 
 
   }
   teacherCommentOptionChange = (values, isAllChecked) => {
+    const { search } = this.state;
+
     this.setState({arg_teacher_comment: isAllChecked ? [] : values, page: 1}, () => {
-      this.fetchList()
+      this.fetchList(1,search)
     })
   }
   statusOptionChange = (values, isAllChecked) => {
+    const { search } = this.state;
+
     this.setState({arg_work_status: isAllChecked ? [] : values, page: 1}, () => {
-      this.fetchList()
+      this.fetchList(1,search)
     })
   }
   courseGroupOptionChange = (values, isAllChecked) => {
+    const { search } = this.state;
+
     this.setState({arg_course_group: isAllChecked ? [] : values, page: 1}, () => {
-      this.fetchList()
+      this.fetchList(1,search);
     })
   }
   memberWorkChange = (values, isAllChecked) => {
+    const { search } = this.state;
+
     this.setState({arg_member_work: isAllChecked ? '' : values[0], page: 1}, () => {
-      this.fetchList()
+      this.fetchList(1,search);
     })
   }
 	funorder = (order, b_order) => {
+    const { page , search } = this.state;
+
 		this.setState({
 			order: order
 			,
 			b_order: b_order
 		}, () => {
-      this.fetchList()
+      this.fetchList(page,search);
     })
   }
   doWhenSuccess = () => {
-    this.fetchList()
+    const { page , search } = this.state;
+
+    this.fetchList(page,search);
   }
 
   // --------------调分
@@ -546,6 +599,8 @@ class CommonWorkList extends Component{
   }
   saveModulationModal = (value, num) => {
     const item = this.modulationItem
+    const { page , search } = this.state;
+
     const url = `/student_works/${item.id}/adjust_score.json`
     axios.post(url, {
       score: num,
@@ -555,7 +610,7 @@ class CommonWorkList extends Component{
 			    if (response.data.status == '0') {
             this.setState({ modulationModalVisible: false })
             this.props.showNotification('调分成功')
-            this.fetchList()
+            this.fetchList(page,search);
 			    }
 		  	})
 		  	.catch(function (error) {
@@ -650,8 +705,8 @@ class CommonWorkList extends Component{
       modulationModalVisible, work_statuses,
 
       id, user_name, user_login, student_id, group_name, work_status, update_time, teacher_score, teaching_asistant_score, student_score,
-			ultimate_score, work_score, student_comment_count, appeal_all_count, appeal_deal_count,
-      late_penalty, absence_penalty, appeal_penalty
+			ultimate_score, work_score, student_comment_count, appeal_all_count, appeal_deal_count,has_comment,
+      late_penalty, absence_penalty, appeal_penalty,user_comment_count
 
 			, end_immediately, publish_immediately
       , homework_id, visible, work_group, project_info, is_leader
@@ -701,7 +756,7 @@ class CommonWorkList extends Component{
     }else{
       StudentData=isStudent ? [{ id, user_name, user_login, student_id, group_name, work_status, update_time, teacher_score, teaching_asistant_score, student_score,
       ultimate_score, work_score, student_comment_count, appeal_all_count, appeal_deal_count,
-      late_penalty, absence_penalty, appeal_penalty, project_info, is_leader,
+      late_penalty, absence_penalty, appeal_penalty, project_info, is_leader,user_comment_count,
       work_group, isMine: true }] : []
     }
     const columns = buildColumns(this, student_works, StudentData)
@@ -734,7 +789,7 @@ class CommonWorkList extends Component{
 
     const hasData = this.state.homework_status && this.state.homework_status.indexOf("未发布") == -1 // student_works && !!student_works.length && page == 1 &&
 
-		// console.log(StudentData)
+	   //console.log(StudentData)
 		// console.log(student_works)
     return(
       <React.Fragment>
@@ -792,10 +847,10 @@ class CommonWorkList extends Component{
           <div style={{ background: '#fff'}} className="workListContent">
              { isAdmin && hasData && <ul className="clearfix" style={{padding: "20px 40px 10px", position: 'relative', paddingLeft: '24px'}}>
 
-              <CheckAllGroup options={options_teacher_comment} label={'你的评阅：'} onChange={this.teacherCommentOptionChange}></CheckAllGroup>
-              <CheckAllGroup options={options_status} label={'作品状态：'} onChange={this.statusOptionChange}></CheckAllGroup>
-              {isGroup && <CheckAllGroup options={options_member_work} label={'组内角色：'} onChange={this.memberWorkChange}></CheckAllGroup>}
-              {options_course_group.length > 1 && <CheckAllGroup options={options_course_group} label={'分班情况：'} onChange={this.courseGroupOptionChange} checkboxGroupStyle={{width: '980px'}}></CheckAllGroup>}
+              <CheckAllGroup comwbool={this.state.comwbool} options={options_teacher_comment} label={'你的评阅：'} onChange={this.teacherCommentOptionChange}></CheckAllGroup>
+              <CheckAllGroup comwbool={this.state.comwbool} options={options_status} label={'作品状态：'} onChange={this.statusOptionChange}></CheckAllGroup>
+              {isGroup && <CheckAllGroup comwbool={this.state.comwbool} options={options_member_work} label={'组内角色：'} onChange={this.memberWorkChange}></CheckAllGroup>}
+              {options_course_group.length > 1 && <CheckAllGroup comwbool={this.state.comwbool} options={options_course_group} label={'分班情况：'} onChange={this.courseGroupOptionChange} checkboxGroupStyle={{width: '980px'}}></CheckAllGroup>}
 
 
               {/*   value={search} */}
diff --git a/src/modules/courses/busyWork/CommonWorkListTemplate.js b/src/modules/courses/busyWork/CommonWorkListTemplate.js
index 863093b5..3699673b 100644
--- a/src/modules/courses/busyWork/CommonWorkListTemplate.js
+++ b/src/modules/courses/busyWork/CommonWorkListTemplate.js
@@ -44,7 +44,7 @@ function handleDateString (dateString) {
   }
   return dateString
 }
-// 类似页面 http://localhost:3007/courses/1309/graduation/graduation_tasks/48/76/setting
+// 类似页面 http://localhost:3007/classrooms/1309/graduation/graduation_tasks/48/76/setting
 class CommonWorkSetting extends Component{
 
   constructor(props){
@@ -82,16 +82,16 @@ class CommonWorkSetting extends Component{
             <div className={"educontent mb20"}>
 
               <p className="clearfix mt10">
-                <WordsBtn style="grey" className="fl">  <Link to={"/courses/"+courseId} className="color-grey-6">{course_name}</Link></WordsBtn>
+                <WordsBtn style="grey" className="fl">  <Link to={"/classrooms/"+courseId} className="color-grey-6">{course_name}</Link></WordsBtn>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-                <WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation"} className="color-grey-6">毕设任务</Link></WordsBtn>
+                <WordsBtn style="grey" className="fl"> <Link to={"/classrooms/"+courseId+"/graduation"} className="color-grey-6">毕设任务</Link></WordsBtn>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                 <span>任务详情</span>
               </p>
 
               <div style={{ width:'100%',height:'75px'}} >
                 <p className=" fl color-black mt25 summaryname">
-                  <Link to={"/courses/"+courseId+"/graduation"+"/graduation_tasks/"}>{homework_name}</Link>
+                  <Link to={"/classrooms/"+courseId+"/graduation"+"/graduation_tasks/"}>{homework_name}</Link>
                 </p>
                 <CoursesListType
                   typelist={["已开启补交"]}
@@ -104,17 +104,17 @@ class CommonWorkSetting extends Component{
                 <div className="mt10 clearfix edu-back-white poll_list pl20">
                   <Link
                         className="active"
-                        to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id+"/"+task_Id+"/list"}>作品列表</Link>
-                  <Link to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>作业描述</Link>
-                  <Link to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>参考答案</Link>
+                        to={"/classrooms/"+courseId+"/graduation/graduation_tasks/"+category_id+"/"+task_Id+"/list"}>作品列表</Link>
+                  <Link to={"/classrooms/"+courseId+"/graduation/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>作业描述</Link>
+                  <Link to={"/classrooms/"+courseId+"/graduation/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>参考答案</Link>
                   <Link
                         style={{paddingLeft:'38px'}}
-                        to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id+"/"+task_Id+"/setting"}>设置</Link>
+                        to={"/classrooms/"+courseId+"/graduation/graduation_tasks/"+category_id+"/"+task_Id+"/setting"}>设置</Link>
 
                   <a className={"fr color-blue font-16"} onClick={() => { this.end()} }>立即截止</a>
                   <a className={"fr color-blue font-16"} onClick={() => { this.publish()} }>立即发布</a>
 
-                  <a className={"fr color-blue font-16"} href={"/courses/"+courseId+"/graduation/graduation_tasks/"+task_Id+"/edit"}>编辑作业</a>
+                  <a className={"fr color-blue font-16"} href={"/classrooms/"+courseId+"/graduation/graduation_tasks/"+task_Id+"/edit"}>编辑作业</a>
 
                 </div>
               </div>
diff --git a/src/modules/courses/busyWork/CommonWorkPost.js b/src/modules/courses/busyWork/CommonWorkPost.js
index f92aa9a9..cf6ed60a 100644
--- a/src/modules/courses/busyWork/CommonWorkPost.js
+++ b/src/modules/courses/busyWork/CommonWorkPost.js
@@ -1,6 +1,6 @@
-import React,{Component} from "react";
-import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Tooltip} from "antd";
-import {Link} from 'react-router-dom';
+import React, { Component } from "react";
+import { Form, Input, Button, Checkbox, Upload, Icon, Tooltip } from "antd";
+import { Link } from 'react-router-dom';
 import axios from 'axios';
 import _ from 'lodash'
 
@@ -12,213 +12,208 @@ import LeaderIcon from './common/LeaderIcon'
 const Search = Input.Search;
 const CheckboxGroup = Checkbox.Group;
 
-class CommonWorkPost extends Component{
+class CommonWorkPost extends Component {
 
-    constructor(props){
-       super(props)
-       this.mdRef = React.createRef();
-       this.state={
-         coursename:"",
-         coursesearch:"",
-         title_num:20,
-         title_value:"",
-         fileList: [],
-         contents: [{val:"",id:1}],
-         type:true,
-         workslist:undefined,
-         search:"",
-         task_status:[],
-         members: [],
-         selectmemberslist:[],
-         minvalue:"",
-         setvalue:"",
-         minmaxtype:false,
-         selectobjct:undefined,
-         Loadtype:false,
+  constructor(props) {
+    super(props)
+    this.mdRef = React.createRef();
+    this.state = {
+      coursename: "",
+      coursesearch: "",
+      title_num: 20,
+      title_value: "",
+      fileList: [],
+      contents: [{ val: "", id: 1 }],
+      type: true,
+      workslist: undefined,
+      search: "",
+      task_status: [],
+      members: [],
+      selectmemberslist: [],
+      minvalue: "",
+      setvalue: "",
+      minmaxtype: false,
+      selectobjct: undefined,
+      Loadtype: false,
 
 
-         limit:20,
-         memberNumMin: 2,
-         memberNumMax: 5,
-       }
+      limit: 20,
+      memberNumMin: 2,
+      memberNumMax: 5,
+    }
+  }
+
+  componentDidMount() {
+    const studentWorkId = this.props.match.params.studentWorkId
+    this.isEdit = !!studentWorkId
+    window.location.pathname.indexOf('post_edit') != -1
+    let coursesId = this.props.match.params.coursesId;
+    let workId = this.props.match.params.workId;
+    let url = `/homework_commons/${workId}/student_works/new.json`
+    const isGroup = this.props.isGroup()
+    if (isGroup) {
+      this.searchList('', 1, this.state.limit)
     }
 
-    componentDidMount(){
-      const studentWorkId = this.props.match.params.studentWorkId
-      this.isEdit = !!studentWorkId
-      window.location.pathname.indexOf('post_edit') != -1
-      let coursesId=this.props.match.params.coursesId;
-      let workId=this.props.match.params.workId;
-      let url = `/homework_commons/${workId}/student_works/new.json`
-      const isGroup = this.props.isGroup()
-      if (isGroup) {
-        this.searchList('',1, this.state.limit)
-      }
+    if (this.isEdit) {
+      url = `/student_works/${studentWorkId}/edit.json`
+      axios.get(url).then((response) => {
+        if (response.data.course_id) {
 
-      if (this.isEdit) {
-        url = `/student_works/${studentWorkId}/edit.json`
-        axios.get(url).then((response)=>{
-          if(response.data.course_id){
+          // TODO
+          // response.data.attachments
+          const _fileList = response.data.attachments.map(item => {
+            return {
+              id: item.id,
+              uid: item.id,
+              name: appendFileSizeToUploadFile(item),
+              url: item.url,
+              delete: item.delete,
+              status: 'done'
+            }
+          })
+          const _memebers = response.data.members ? response.data.members.slice(0) : [];
+          this._edit_init_memebers = _memebers
+          delete response.data.members;
+          this.setState({
+            ...response.data,
+            selectmemberslist: _memebers || [],
+            // members: [],
+            task_status: [], //_memebers ? _memebers.map(item => item.user_id) : [],
+            fileList: _fileList,
+            memberNumMin: response.data.min_num,
+            memberNumMax: response.data.max_num,
+          })
+          this.mine = _memebers.length ? _memebers[0] : null
+          // 分组
+          // this.setState({
+          //   task_status:checkedValues,
+          //   selectmemberslist:selects
+          // })
+          this.props.form.setFieldsValue({
+            description: response.data.description,
+          }, () => { });
+          this.mdRef.current.setValue(response.data.description)
+        }
+      }).catch((error) => {
+        console.log(error)
+      })
+    } else {
+      axios.get(url).then((response) => {
+        if (response.data.course_id) {
+          const mine = {
+            user_id: response.data.user_id,
+            user_name: response.data.user_name,
+            student_id: response.data.user_student_id,
+            group_name: response.data.group_name,
 
-            // TODO
-            // response.data.attachments
-            const _fileList = response.data.attachments.map(item => {
-              return {
-                id: item.id,
-                uid: item.id,
-                name: appendFileSizeToUploadFile(item),
-                url: item.url,
-                delete: item.delete,
-                status: 'done'
-              }
-            })
-            const _memebers = response.data.members ? response.data.members.slice(0) : [];
-            this._edit_init_memebers = _memebers
+          }
+          this.mine = mine
+          // const _memebers = response.data.members.slice(0);
+          if (response.data.members) {
             delete response.data.members;
-            this.setState({
-              ...response.data,
-              selectmemberslist: _memebers || [],
-              // members: [],
-              task_status: [], //_memebers ? _memebers.map(item => item.user_id) : [],
-              fileList: _fileList,
-              memberNumMin: response.data.min_num,
-              memberNumMax: response.data.max_num,
-            })
-            this.mine = _memebers.length ? _memebers[0] : null
-            // 分组
-              // this.setState({
-              //   task_status:checkedValues,
-              //   selectmemberslist:selects
-              // })
-            this.props.form.setFieldsValue({
-              description: response.data.description,
-            }, () => {});
-            this.mdRef.current.setValue(response.data.description)
           }
-        }).catch((error)=>{
-          console.log(error)
-        })
-      } else {
-        axios.get(url).then((response)=>{
-          if(response.data.course_id){
-            const mine = {
-              user_id: response.data.user_id,
-              user_name: response.data.user_name,
-              student_id: response.data.user_student_id,
-              group_name: response.data.group_name,
-
-            }
-            this.mine = mine
-            // const _memebers = response.data.members.slice(0);
-            if (response.data.members) {
-              delete response.data.members;
-            }
-            this.setState({
-              ...response.data,
-              selectmemberslist: [mine],
-              memberNumMin: response.data.min_num,
-              memberNumMax: response.data.max_num,
-            })
-          }
-        }).catch((error)=>{
-          console.log(error)
-        })
-      }
-
+          this.setState({
+            ...response.data,
+            selectmemberslist: [mine],
+            memberNumMin: response.data.min_num,
+            memberNumMax: response.data.max_num,
+          })
+        }
+      }).catch((error) => {
+        console.log(error)
+      })
     }
 
-    setedit=(workId)=>{
+  }
 
-      let coursesId=this.props.match.params.coursesId;
-      window.location.href="courses/"+coursesId+"/graduation_tasks/"+workId+"/appraise";
+  setedit = (workId) => {
 
+    let coursesId = this.props.match.params.coursesId;
+    window.location.href = "classrooms/" + coursesId + "/graduation_tasks/" + workId + "/appraise";
+
+  }
+
+  handleSubmit = (e) => {
+
+    let { fileList, selectmemberslist, workslist, memberNumMin, memberNumMax } = this.state;
+
+    let userids = [];
+    if (selectmemberslist != undefined && selectmemberslist.length > 0) {
+      for (var list of selectmemberslist) {
+
+        if (list.user_id != undefined && list.user_id != null) {
+          userids.push(list.user_id)
+        }
+
+      }
+    }
+    const isGroup = this.props.isGroup()
+    if (!isGroup) {
+      userids = undefined
     }
 
-    handleSubmit=(e) => {
+    let listid = [];
+    if (fileList != undefined && fileList.length > 0) {
+      for (var list of fileList) {
+        listid.push(list.id || list.response.id)
+      }
+    }
+    e.preventDefault();
+    if (true) {
+      this.props.form.validateFieldsAndScroll((err, values) => {
+        if (!err) {
+          console.log(values.description);
+          // console.log(fileList);
+          if (values.description === undefined || values.description === "") {
 
-      let {fileList,selectmemberslist,workslist, memberNumMin, memberNumMax}=this.state;
-
-      let  userids=[];
-      if(selectmemberslist!=undefined&&selectmemberslist.length>0) {
-        for (var list of selectmemberslist) {
-
-          if (list.user_id != undefined && list.user_id != null) {
-            userids.push(list.user_id)
+            return
           }
+          if (isGroup) {
+            if (userids != undefined) {
+              if (userids.length < memberNumMin) {
+                this.setState({
+                  minvalue: memberNumMin,
+                  setvalue: "小于",
+                  minmaxtype: true
+                })
 
-        }
-      }
-      const isGroup = this.props.isGroup()
-      if(!isGroup){
-        userids=undefined
-      }
-
-      let listid=[];
-      if(fileList!=undefined&&fileList.length>0) {
-        for (var list of fileList) {
-          listid.push(list.id || list.response.id)
-        }
-      }
-      e.preventDefault();
-      if( true ){
-        this.props.form.validateFieldsAndScroll((err, values) => {
-          if (!err) {
-            console.log(values.description);
-            // console.log(fileList);
-            if(values.description===undefined||values.description===""){
-
-              return
-            }
-            if(isGroup){
-              if(userids!=undefined){
-                if(userids.length < memberNumMin){
-                  this.setState({
-                    minvalue: memberNumMin,
-                    setvalue:"小于",
-                    minmaxtype:true
-                  })
-
-                  return
-                }else if(userids.length > memberNumMax){
-                  this.setState({
-                    minvalue: memberNumMax,
-                    setvalue:"大于",
-                    minmaxtype:true
-                  })
-                  return
-                } else {
-                  this.setState({
-                    minmaxtype: false
-                  })
-                }
+                return
+              } else if (userids.length > memberNumMax) {
+                this.setState({
+                  minvalue: memberNumMax,
+                  setvalue: "大于",
+                  minmaxtype: true
+                })
+                return
+              } else {
+                this.setState({
+                  minmaxtype: false
+                })
               }
             }
-            if (!listid || listid.length == 0) {
-              this.props.confirm({
-                content: <div>
-                  <div>还未上传附件</div>
-                  <div>是否确认提交作品？</div>
-                </div>,
-                onOk: () => {
-                   this.doCommit(values, listid, userids)
-                }
-              })
-            } else {
-              this.doCommit(values, listid, userids)
-            }
-
-
-
-
-
           }
-        });
-      }
+          if (!listid || listid.length == 0) {
+            this.props.confirm({
+              content: <div>
+                <div>还未上传附件</div>
+                <div>是否确认提交作品？</div>
+              </div>,
+              onOk: () => {
+                this.doCommit(values, listid, userids)
+              }
+            })
+          } else {
+            this.doCommit(values, listid, userids)
+          }
+        }
+      });
     }
+  }
   doCommit = (values, listid, userids) => {
-    let workId=this.props.match.params.workId;
-    let studentWorkId=this.props.match.params.studentWorkId;
-    let coursesId=this.props.match.params.coursesId;
+    let workId = this.props.match.params.workId;
+    let studentWorkId = this.props.match.params.studentWorkId;
+    let coursesId = this.props.match.params.coursesId;
 
     // let url="/graduation_tasks/"+id+"/graduation_works.json";
     let url = `/homework_commons/${workId}/student_works.json`
@@ -226,17 +221,17 @@ class CommonWorkPost extends Component{
     if (this.isEdit) {
       url = `/student_works/${studentWorkId}.json`
       axios.put(url, {
-          description:values.description,
-          attachment_ids:listid,
-          user_ids:userids
-        }
+        description: values.description,
+        attachment_ids: listid,
+        user_ids: userids
+      }
       ).then((response) => {
-        if(response.status===200) {
-          if(response.data.status===0){
+        if (response.status === 200) {
+          if (response.data.status === 0) {
             // this.props.showNotification('保存成功')
-          }else{
+          } else {
           }
-          this.props.history.push(`/courses/${coursesId}/${moduleName}/${workId}/${studentWorkId}/appraise`)
+          this.props.history.push(`/classrooms/${coursesId}/${moduleName}/${workId}/${studentWorkId}/appraise`)
 
         }
       }).catch((error) => {
@@ -244,22 +239,14 @@ class CommonWorkPost extends Component{
       })
     } else {
       axios.post(url, {
-          description:values.description,
-          attachment_ids:listid,
-          user_ids:userids
-        }
+        description: values.description,
+        attachment_ids: listid,
+        user_ids: userids
+      }
       ).then((response) => {
-        if(response.status===200) {
-          if(response.data.status===0){
-            this.props.history.push(`/courses/${coursesId}/${moduleName}/${workId}/${response.data.work_id}/appraise`)
-            // this.props.showNotification('保存成功')
-            // this.setState({
-            //   Modalstype:true,
-            //   Modalstopval:response.data.message,
-            //   ModalSave:()=>this.setedit(response.data.work_id),
-            //   Loadtype:true
-            // })
-          }else{
+        if (response.status === 200) {
+          if (response.data.status === 0) {
+            this.props.history.push(`/classrooms/${coursesId}/${moduleName}/${workId}/${response.data.work_id}/appraise`)
           }
         }
       }).catch((error) => {
@@ -268,25 +255,24 @@ class CommonWorkPost extends Component{
     }
   }
 
-    handleSelectChange = (value) => {
-      console.log(value);
-      this.props.form.setFieldsValue({
-        note: `Hi, ${value === 'male' ? 'man' : 'lady'}!`,
-      });
-    }
+  handleSelectChange = (value) => {
+    console.log(value);
+    this.props.form.setFieldsValue({
+      note: `Hi, ${value === 'male' ? 'man' : 'lady'}!`,
+    });
+  }
 
-  goback=()=>{
-    // this.props.toListPage(this.props.match.params, this.state.category ? this.state.category.category_id : '')
-	  this.props.history.goBack()
-	}
+  goback = () => {
+    this.props.history.goBack()
+  }
 
 
   // 输入title
-  changeTitle=(e)=>{
+  changeTitle = (e) => {
 
     this.setState({
-      title_num:20-parseInt(e.target.value.length),
-      title_value:e.target.value
+      title_num: 20 - parseInt(e.target.value.length),
+      title_value: e.target.value
     })
 
   }
@@ -300,27 +286,6 @@ class CommonWorkPost extends Component{
   }
 
   onAttachmentRemove = (file) => {
-    // confirm({
-    //   title: '确定要删除这个附件吗?',
-    //   okText: '确定',
-    //   cancelText: '取消',
-    //   // content: 'Some descriptions',
-    //   onOk: () => {
-    //     this.deleteAttachment(file)
-    //   },
-    //   onCancel() {
-    //     console.log('Cancel');
-    //   },
-    // });
-    // return false;
-
-    // this.setState({
-    //   Modalstype:true,
-    //   // Modalstopval:'确定要删除这个附件吗?',
-    //   Modalstopval:'是否确认删除?',
-    //   ModalSave: ()=>this.deleteAttachment(file),
-    //   ModalCancel:this.cancelAttachment
-    // })
     if (file.delete === false) {
       this.props.showNotification(`该作品已被评阅，不能删除该附件`);
       return false
@@ -340,13 +305,12 @@ class CommonWorkPost extends Component{
     }
   }
 
-  cancelAttachment=()=>{
+  cancelAttachment = () => {
     this.setState({
-      Modalstype:false,
-      // Modalstopval:'确定要删除这个附件吗?',
-      Modalstopval:'是否确认删除?',
-      ModalSave:"",
-      ModalCancel:""
+      Modalstype: false,
+      Modalstopval: '是否确认删除?',
+      ModalSave: "",
+      ModalCancel: ""
     })
   }
 
@@ -356,17 +320,7 @@ class CommonWorkPost extends Component{
     })
       .then((response) => {
         if (response.data) {
-          // const { status } = response.data;
           if (response.data.status === 0) {
-
-            console.log('--- success')
-            // this.setState({
-            //   Modalstype:true,
-            //   Modalstopval:response.data.message,
-            //   ModalSave:this.cancelAttachment,
-            //   Loadtype:true,
-            // })
-
             this.setState((state) => {
               const index = state.fileList.indexOf(file);
               const newFileList = state.fileList.slice();
@@ -376,7 +330,7 @@ class CommonWorkPost extends Component{
               };
             });
 
-						this.cancelAttachment()
+            this.cancelAttachment()
           }
         }
       })
@@ -385,44 +339,42 @@ class CommonWorkPost extends Component{
       });
   }
 
-  inputSearchValue=(e)=>{
+  inputSearchValue = (e) => {
 
-    if(e.target.value===""){
+    if (e.target.value === "") {
       this.setState({
-        search:null
+        search: null
       })
-    }else{
+    } else {
       this.setState({
-        search:e.target.value
+        search: e.target.value
       })
     }
 
   }
 
 
-  searchValue=()=>{
+  searchValue = () => {
 
-    let {search, limit} = this.state;
+    let { search, limit } = this.state;
 
-    this.searchList(search,1, limit)
+    this.searchList(search, 1, limit)
 
   }
 
-  searchList=(search,page,limit)=>{
+  searchList = (search, page, limit) => {
 
-    let id=this.props.match.params.workId;
-    let workId=this.props.match.params.workId;
-    // let url="/graduation_tasks/"+id+"/graduation_works/search_member_list.json";
+    let workId = this.props.match.params.workId;
     let url = `/homework_commons/${workId}/student_works/search_member_list.json`
-    axios.get(url,{
+    axios.get(url, {
       params: {
         search: search,
         page: page,
         limit: limit
       }
-    }).then((result)=>{
+    }).then((result) => {
 
-      if(result){
+      if (result) {
         this.setState({
           page: result.data.members.length == 0 ? page - 1 : page,
           members: page != 1 && search == this.state.lastSearch ? this.state.members.concat(result.data.members) : result.data.members,
@@ -431,31 +383,31 @@ class CommonWorkPost extends Component{
         })
       }
 
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error)
     })
   }
 
 
-  contentViewScroll=(e)=>{
+  contentViewScroll = (e) => {
     //滑动到底判断
-		let newscrollTop=parseInt(e.currentTarget.scrollTop);
-		let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
+    let newscrollTop = parseInt(e.currentTarget.scrollTop);
+    let allclientHeight = e.currentTarget.clientHeight + newscrollTop;
 
-		if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
+    if (e.currentTarget.scrollHeight - allclientHeight === 0 || e.currentTarget.scrollHeight - allclientHeight === 1 || e.currentTarget.scrollHeight - allclientHeight === -1) {
       // console.log("到达底部");
 
-     let{ search,page,limit }=this.state;
+      let { search, page, limit } = this.state;
 
-       let newpage=page+1
+      let newpage = page + 1
 
-      this.searchList(search,newpage,limit)
+      this.searchList(search, newpage, limit)
 
     }
 
   }
 
-  funtaskstatus=(checkedValues)=>{
+  funtaskstatus = (checkedValues) => {
     /**
       比较 checkedValues  和 this.state.selectmemberslist
       checkedValues length > this.state.task_status.length 是新增； 反之是删除
@@ -468,62 +420,45 @@ class CommonWorkPost extends Component{
     checkedValues.forEach(item => {
       this.state.task_status.forEach(_item => {
         if (item == _item) {
-          _.remove(_checkedValues, (item)=> item == _item)
-          _.remove(_task_status, (item)=> item == _item)
+          _.remove(_checkedValues, (item) => item == _item)
+          _.remove(_task_status, (item) => item == _item)
         }
       })
     })
     let _selectmemberslist = this.state.selectmemberslist.slice(0)
     if (_checkedValues.length) { // 新增
-      _selectmemberslist.push( this.state.members.filter(item => item.user_id == _checkedValues[0])[0])
+      _selectmemberslist.push(this.state.members.filter(item => item.user_id == _checkedValues[0])[0])
     } else if (_task_status.length) {  // 删除
-      _.remove(_selectmemberslist, (item)=> item.user_id == _task_status[0])
+      _.remove(_selectmemberslist, (item) => item.user_id == _task_status[0])
     }
-
-
-    // let{members}=this.state;
-    // let newlist =members.concat(this.state.selectmemberslist);
-    // let newcheckedValues=checkedValues;
-    // let selects= this.mine ? [this.mine] : [];
-    // // const selectobjct = this._findByUserId(check)
-    // // selects.push(selectobjct)
-    // for(var z=0; z<newcheckedValues.length; z++){
-    //   for(var i=0; i<newlist.length; i++){
-    //     if(newlist[i].user_id===newcheckedValues[z]){
-    //       selects.push(newlist[i])
-    //       break;
-    //     }
-    //   }
-    // }
     this.setState({
-      task_status:checkedValues,
+      task_status: checkedValues,
       selectmemberslist: _selectmemberslist
-      // selectmemberslist:checkedValues
     })
 
   }
   doDelete = (id) => {
-    let{selectmemberslist,task_status}=this.state;
-    let newlist=task_status.slice(0);
-    let selects=selectmemberslist;
+    let { selectmemberslist, task_status } = this.state;
+    let newlist = task_status.slice(0);
+    let selects = selectmemberslist;
 
-    for(var i=0; i<newlist.length; i++){
-      if(newlist[i]===id){
-        newlist.splice(i,1)
+    for (var i = 0; i < newlist.length; i++) {
+      if (newlist[i] === id) {
+        newlist.splice(i, 1)
       }
     }
 
-    for(var z=0; z<selects.length; z++){
-      if(selects[z].user_id===id){
-        selects.splice(z,1)
+    for (var z = 0; z < selects.length; z++) {
+      if (selects[z].user_id === id) {
+        selects.splice(z, 1)
       }
     }
     this.setState({
-      task_status:newlist,
-      selectmemberslist:selects
+      task_status: newlist,
+      selectmemberslist: selects
     })
   }
-  delecttask_status=(id)=>{
+  delecttask_status = (id) => {
     if (this.isEdit) {
       let deleteOldMemberIndex = -1;
 
@@ -548,21 +483,23 @@ class CommonWorkPost extends Component{
           <div>是否确认删除？</div>
         </div>,
         onOk: () => {
-          let workId=this.props.match.params.workId;
+          let workId = this.props.match.params.workId;
           const url = `/homework_commons/${workId}/student_works/delete_work.json`;
-          axios.delete(url, { data: {
+          axios.delete(url, {
+            data: {
               user_id: id
-            }})
-          .then((response) => {
-            if (response.data.status == 0) {
-              this.searchValue()
-              this.doDelete(id)
-              deleteOldMemberIndex != -1 && this._edit_init_memebers.splice(deleteOldMemberIndex, 1)
             }
           })
-          .catch(function (error) {
-            console.log(error);
-          });
+            .then((response) => {
+              if (response.data.status == 0) {
+                this.searchValue()
+                this.doDelete(id)
+                deleteOldMemberIndex != -1 && this._edit_init_memebers.splice(deleteOldMemberIndex, 1)
+              }
+            })
+            .catch(function (error) {
+              console.log(error);
+            });
         }
       })
     } else {
@@ -570,99 +507,89 @@ class CommonWorkPost extends Component{
     }
   }
 
-  gocannel=()=>{
-		this.props.history.goBack()
+  gocannel = () => {
+    this.props.history.goBack()
   }
 
-render(){
-  const { getFieldDecorator } = this.props.form;
-  const isEdit = this.isEdit
-  let {search,fileList, workslist,setvalue,minvalue,minmaxtype,Loadtype,
-    Modalstype,Modalstopval,ModalCancel,ModalSave,task_status,selectmemberslist,members,
-    category,
-    course_name, homework_name,
-    memberNumMax, memberNumMin
-  } =this.state;
-  const { current_user  } = this.props
+  render() {
+    const { getFieldDecorator } = this.props.form;
+    const isEdit = this.isEdit
+    let { search, fileList, workslist, setvalue, minvalue, minmaxtype, Loadtype,
+      Modalstype, Modalstopval, ModalCancel, ModalSave, task_status, selectmemberslist, members,
+      category,
+      course_name, homework_name,
+      memberNumMax, memberNumMin
+    } = this.state;
+    const { current_user } = this.props
 
-  let courseId=this.props.match.params.coursesId;
-  let workId=this.props.match.params.workId;
-  const uploadProps = {
-    width: 600,
-    fileList,
-    multiple: true,
-    // https://github.com/ant-design/ant-design/issues/15505
-    // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
-    // showUploadList: false,
-    action: `${getUploadActionUrl()}`,
-    onChange: this.handleChange,
-    onRemove: this.onAttachmentRemove,
-    beforeUpload: (file) => {
-      // TODO 文件存在则提示并退出
-      let gotSameFile = false;
-      this.state.fileList && this.state.fileList.some((item) => {
-        if (item.name && item.name.startsWith(file.name)) {
-          gotSameFile = true;
-          return true
+    let courseId = this.props.match.params.coursesId;
+    let workId = this.props.match.params.workId;
+    const uploadProps = {
+      width: 600,
+      fileList,
+      multiple: true,
+      // https://github.com/ant-design/ant-design/issues/15505
+      action: `${getUploadActionUrl()}`,
+      onChange: this.handleChange,
+      onRemove: this.onAttachmentRemove,
+      beforeUpload: (file) => {
+        let gotSameFile = false;
+        this.state.fileList && this.state.fileList.some((item) => {
+          if (item.name && item.name.startsWith(file.name)) {
+            gotSameFile = true;
+            return true
+          }
+        })
+        if (gotSameFile) {
+          this.props.showNotification("该附件已被上传！")
+          return false
         }
-      })
-      if (gotSameFile) {
-        this.props.showNotification("该附件已被上传！")
-        return false
-      }
-      console.log('beforeUpload', file.name);
-      const isLt150M = file.size / 1024 / 1024 < 150;
-      if (!isLt150M) {
-        this.props.showNotification('文件大小必须小于150MB!');
-      }
-      return isLt150M;
-    },
-  };
+        console.log('beforeUpload', file.name);
+        const isLt150M = file.size / 1024 / 1024 < 150;
+        if (!isLt150M) {
+          this.props.showNotification('文件大小必须小于150MB!');
+        }
+        return isLt150M;
+      },
+    };
 
-  // console.log(workslist&&workslist)
+    const moduleName = this.props.getModuleName()
+    const moduleCHName = this.props.getModuleName(true)
+    const isGroup = this.props.isGroup()
 
-   //  console.log(selectmemberslist&&selectmemberslist)
-  const moduleName = this.props.getModuleName()
-  const moduleCHName = this.props.getModuleName(true)
-  const isGroup = this.props.isGroup()
+    return (
+      <React.Fragment>
 
-  return(
-<React.Fragment>
+        <div>
+          {/*提示*/}
+          <Modals
+            modalsType={Modalstype}
+            modalsTopval={Modalstopval}
+            modalCancel={ModalCancel}
+            modalSave={ModalSave}
+            loadtype={Loadtype}
+          />
+          <div className="newMain clearfix">
+            <div className={"educontent mb20"}>
 
-  <div>
-    {/*提示*/}
-    <Modals
-      modalsType={Modalstype}
-      modalsTopval={Modalstopval}
-      modalCancel={ModalCancel}
-      modalSave={ModalSave}
-      loadtype={Loadtype}
-    />
-    <div className="newMain clearfix">
-      <div className={"educontent mb20"}>
+              <p className="clearfix mt10">
+                <WordsBtn style="grey" className="fl">
+                  <Link to={current_user && current_user.first_category_url} className="color-grey-6">{course_name}</Link></WordsBtn>
+                <span className="color-grey-9 fl ml3 mr3">&gt;</span>
+                <WordsBtn style="grey" className="fl"> <Link to={`/classrooms/${courseId}/${moduleName}/${workId}`} className="color-grey-6">{moduleCHName}</Link></WordsBtn>
+                <span className="color-grey-9 fl ml3 mr3">&gt;</span>
+                <span>{`${current_user ? current_user.real_name : ''} ${this.isEdit ? '编辑' : '提交'}作品`}</span>
+              </p>
 
-      <p className="clearfix mt10">
-        <WordsBtn style="grey" className="fl">  <Link to={ current_user && current_user.first_category_url} className="color-grey-6">{course_name}</Link></WordsBtn>
-        <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-        <WordsBtn style="grey" className="fl"> <Link to={`/courses/${courseId}/${moduleName}/${workId}`} className="color-grey-6">{moduleCHName}</Link></WordsBtn>
-        <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-        {/*<WordsBtn style="grey" className="fl">*/}
-          {/*<Link to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id} className="color-grey-6">{workslist&&workslist.task_name}</Link>*/}
-          {/*<span className="color-grey-9 ml3 mr3">&gt;</span>*/}
-        {/*</WordsBtn>*/}
+              <div style={{ width: '100%', height: '75px' }} >
+                <p className=" fl color-black mt25 summaryname" title={homework_name}>{homework_name}</p>
+                <a className="color-grey-6 fr font-16 ml30 mt10 mr20" onClick={this.goback}>返回</a>
+              </div>
 
-        <span>{`${current_user ? current_user.real_name : ''} ${ this.isEdit ? '编辑' : '提交'}作品` }</span>
-      </p>
-
-      <div style={{ width:'100%',height:'75px'}} >
-        <p className=" fl color-black mt25 summaryname" title={homework_name}>{homework_name}</p>
-        <a className="color-grey-6 fr font-16 ml30 mt10 mr20" onClick={this.goback}>返回</a>
-      </div>
-
-      {/*  */}
-      <Form   >
-        <div className="stud-class-set pd20 coursenavbox edu-back-white">
-          <style>{`
+              {/*  */}
+              <Form   >
+                <div className="stud-class-set pd20 coursenavbox edu-back-white">
+                  <style>{`
                 .uploadBtn.ant-btn {
                   border: none;
                   color: #4CACFF;
@@ -679,57 +606,57 @@ render(){
                 }
 
               `}</style>
-          <Form.Item
-            label="内容"
-            style={{marginBottom: '4px'}}
-            className="mdInForm"
+                  <Form.Item
+                    label="内容"
+                    style={{ marginBottom: '4px' }}
+                    className="mdInForm"
 
-          >
-            {getFieldDecorator('description', {
-              rules: [{
-                required: true, message: '请输入作品内容',
-              }, {
-                max: 5000, message: '最大限制为5000个字符',
-              }],
-            })(
-              <TPMMDEditor ref={this.mdRef} placeholder={'请在此输入作业内容或作业附件的简要描述，最大限制为5000个字符'} maxLent={"5000"}
-                           mdID={'courseMessageMD'} initValue={this.editTopic ? this.editTopic.content : ''} className="courseMessageMD"></TPMMDEditor>
-            )}
-          </Form.Item>
-          <Upload {...uploadProps} className="upload_1 upload_under_markdown_editor">
-            <Button className="uploadBtn">
-              <Icon type="upload" /> 上传附件
+                  >
+                    {getFieldDecorator('description', {
+                      rules: [{
+                        required: true, message: '请输入作品内容',
+                      }, {
+                        max: 5000, message: '最大限制为5000个字符',
+                      }],
+                    })(
+                      <TPMMDEditor ref={this.mdRef} placeholder={'请在此输入作业内容或作业附件的简要描述，最大限制为5000个字符'} maxLent={"5000"}
+                        mdID={'courseMessageMD'} initValue={this.editTopic ? this.editTopic.content : ''} className="courseMessageMD"></TPMMDEditor>
+                    )}
+                  </Form.Item>
+                  <Upload {...uploadProps} className="upload_1 upload_under_markdown_editor">
+                    <Button className="uploadBtn">
+                      <Icon type="upload" /> 上传附件
             </Button>
-            <span className={"color-grey-9"}>(单个文件150M以内)</span>
-          </Upload>
-        </div>
+                    <span className={"color-grey-9"}>(单个文件150M以内)</span>
+                  </Upload>
+                </div>
 
 
 
-        {!isGroup?"":
-        <div className="stud-class-set pd20 coursenavbox edu-back-white" style={{borderTop: '1px solid #EAEAEA'}}>
-          <Form.Item
-            label="小组成员"
+                {!isGroup ? "" :
+                  <div className="stud-class-set pd20 coursenavbox edu-back-white" style={{ borderTop: '1px solid #EAEAEA' }}>
+                    <Form.Item
+                      label="小组成员"
 
-          >
-            <div>
-              <div className={"fl ml20"}>成员要求：{memberNumMin}～{memberNumMax}人</div>
-              <Search
-                className={"fl mt5 ml20"}
-                style={{width:"20%"}}
-                placeholder="请输入姓名或学号搜索"
-                id="subject_search_input"
-                value={search}
-                onInput={this.inputSearchValue}
-                onSearch={this.searchValue}
-                autoComplete="off"
-              ></Search>
-            </div>
+                    >
+                      <div>
+                        <div className={"fl ml20"}>成员要求：{memberNumMin}～{memberNumMax}人</div>
+                        <Search
+                          className={"fl mt5 ml20"}
+                          style={{ width: "20%" }}
+                          placeholder="请输入姓名或学号搜索"
+                          id="subject_search_input"
+                          value={search}
+                          onInput={this.inputSearchValue}
+                          onSearch={this.searchValue}
+                          autoComplete="off"
+                        ></Search>
+                      </div>
 
 
-          </Form.Item>
+                    </Form.Item>
 
-          <style>{`
+                    <style>{`
                 .fonthidden{
                     overflow:hidden;
                     text-overflow:ellipsis;
@@ -741,38 +668,35 @@ render(){
                 }
               `}</style>
 
-          <div className={"ml20"} style={{width:"100%"}}>
+                    <div className={"ml20"} style={{ width: "100%" }}>
 
-            <div className={"members workPost fl"}
-                 onScroll={this.contentViewScroll}>
-              <CheckboxGroup value={task_status} onChange={this.funtaskstatus} style={{ paddingTop: '4px'}}>
-                {members.map((item,key)=>{
-                  return(
-                    <div key={key} style={{
-                      // width: '375px',
-                      height: '30px'
-                    }}>
-                      <Checkbox value={item.user_id} key={item.user_id} checked={parseInt(task_status[key])===item.user_id?true:false}
-                          disabled={item.commit_status || item.user_id == this.props.current_user.user_id ===true?true:false}  className="fl "
-                      ></Checkbox>
-                      <Tooltip placement="bottom" title={item.user_nam}><div className={"fl ml5 fonthidden"} style={{width: '70px'}}>{item.user_name}</div></Tooltip>
-                      <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{  maxWidth: '147px' }}
-                        title={item.group_name && item.group_name.length > 9 ? item.group_name : ''}
-                      >{item.group_name}</div>
-                      <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{  maxWidth: '99px' }}
-                        title={item.student_id && item.student_id.length > 12 ? item.student_id : ''}
-                      >{item.student_id}</div>
-                      <div className={"fl ml20"}>{item.commit_status===true?<span className={"color-orange"}>已提交</span> :""}</div>
-                    </div>
-                  )
-                })}
-              </CheckboxGroup>
-            </div>
+                      <div className={"members workPost fl"}
+                        onScroll={this.contentViewScroll}>
+                        <CheckboxGroup value={task_status} onChange={this.funtaskstatus} style={{ paddingTop: '4px' }}>
+                          {members.map((item, key) => {
+                            return (
+                              <div key={key} style={{ height: '30px' }}>
+                                <Checkbox value={item.user_id} key={item.user_id} checked={parseInt(task_status[key]) === item.user_id ? true : false}
+                                  disabled={item.commit_status || item.user_id == this.props.current_user.user_id === true ? true : false} className="fl "
+                                ></Checkbox>
+                                <Tooltip placement="bottom" title={item.user_nam}><div className={"fl ml5 fonthidden"} style={{ width: '70px' }}>{item.user_name}</div></Tooltip>
+                                <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{ maxWidth: '147px' }}
+                                  title={item.group_name && item.group_name.length > 9 ? item.group_name : ''}
+                                >{item.group_name}</div>
+                                <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{ maxWidth: '99px' }}
+                                  title={item.student_id && item.student_id.length > 12 ? item.student_id : ''}
+                                >{item.student_id}</div>
+                                <div className={"fl ml20"}>{item.commit_status === true ? <span className={"color-orange"}>已提交</span> : ""}</div>
+                              </div>
+                            )
+                          })}
+                        </CheckboxGroup>
+                      </div>
 
-            <div className={"youjiangboxs"}>
-              <i className={"iconfont icon-youjiang fl ml20 mr20"}></i>
-            </div>
-            <style>{`
+                      <div className={"youjiangboxs"}>
+                        <i className={"iconfont icon-youjiang fl ml20 mr20"}></i>
+                      </div>
+                      <style>{`
                .fonthidden{
                     overflow:hidden;
                     text-overflow:ellipsis;
@@ -784,68 +708,68 @@ render(){
                 width: 452px;
               }
               `}</style>
-            <div className={"members workPost fl"}>
+                      <div className={"members workPost fl"}>
 
-              {selectmemberslist&&selectmemberslist.map((item,key)=>{
-                const _is_leader = (item.is_leader || !this.isEdit && key==0)
-                return(
-                  <div key={key} style={{
-                    // width: '375px',
-                    height: '30px',
-                    display:item.user_name===undefined?"none":""
-                  }}>
-                    <ConditionToolTip placement="bottom" title={'组长'} condition={_is_leader && item.user_name.length > 5}>
-                      <div className={"fl ml5 fonthidden"} style={{width: '98px', color: `${item.user_name.length > 5 && _is_leader ? '#4CACFF' : 'inherit'}`}}>
-                        {item.user_name}{ item.user_name.length <= 5 && _is_leader && <LeaderIcon className="leaderIcon" small={true}></LeaderIcon>}
+                        {selectmemberslist && selectmemberslist.map((item, key) => {
+                          const _is_leader = (item.is_leader || !this.isEdit && key == 0)
+                          return (
+                            <div key={key} style={{
+                              // width: '375px',
+                              height: '30px',
+                              display: item.user_name === undefined ? "none" : ""
+                            }}>
+                              <ConditionToolTip placement="bottom" title={'组长'} condition={_is_leader && item.user_name.length > 5}>
+                                <div className={"fl ml5 fonthidden"} style={{ width: '98px', color: `${item.user_name.length > 5 && _is_leader ? '#4CACFF' : 'inherit'}` }}>
+                                  {item.user_name}{item.user_name.length <= 5 && _is_leader && <LeaderIcon className="leaderIcon" small={true}></LeaderIcon>}
+                                </div>
+                              </ConditionToolTip>
+
+                              <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{ maxWidth: '147px' }}
+                                title={item.group_name && item.group_name.length > 9 ? item.group_name : ''}
+                              >{item.group_name}</div>
+                              <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{ maxWidth: '99px' }}
+                                title={item.student_id && item.student_id.length > 12 ? item.student_id : ''}
+                              >{item.student_id}</div>
+                              {item.user_id != this.props.current_user.user_id ?
+                                <div className={"fr"}><i className={"iconfont icon-shanchudiao fl "}
+                                  style={{ marginTop: '-4px' }} onClick={() => this.delecttask_status(item.user_id)}></i></div> : ""}
+
+                            </div>
+                          )
+                        })}
                       </div>
-                    </ConditionToolTip>
 
-                    <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{  maxWidth: '147px' }}
-                      title={item.group_name && item.group_name.length > 9 ? item.group_name : ''}
-                    >{item.group_name}</div>
-                    <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{  maxWidth: '99px' }}
-                      title={item.student_id && item.student_id.length > 12 ? item.student_id : ''}
-                    >{item.student_id}</div>
-                    {item.user_id != this.props.current_user.user_id ?
-                      <div className={"fr"}><i className={"iconfont icon-shanchudiao fl "}
-                        style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""}
 
+                      <div className={"both"}>
+
+                      </div>
+
+                      {minmaxtype === true ? <span className={"color-red mt20"}>
+                        人数不能{setvalue + minvalue}个人
+              </span> : ""}
+
+                    </div>
+                  </div>}
+
+
+
+
+                <Form.Item>
+                  <div className="clearfix mt30 mb30">
+                    <Button type="primary" onClick={this.handleSubmit} className="defalutSubmitbtn fl mr20">提交</Button>
+                    <a onClick={this.gocannel} className="defalutCancelbtn fl">取消</a>
                   </div>
-                )
-              })}
-            </div>
-
-
-            <div className={"both"}>
+                </Form.Item>
+              </Form>
 
             </div>
-
-            {minmaxtype===true?<span className={"color-red mt20"}>
-                人数不能{setvalue+minvalue}个人
-              </span>:""}
-
           </div>
-        </div>}
+        </div>
 
+      </React.Fragment>
 
-
-
-        <Form.Item>
-          <div className="clearfix mt30 mb30">
-            <Button type="primary" onClick={this.handleSubmit}  className="defalutSubmitbtn fl mr20">提交</Button>
-            <a onClick={this.gocannel} className="defalutCancelbtn fl">取消</a>
-          </div>
-        </Form.Item>
-      </Form>
-
-      </div>
-    </div>
-  </div>
-
-</React.Fragment>
-
-      )
-    }
+    )
+  }
 }
 const CommonWorkPostApp = Form.create({ name: 'coursesNew' })(CommonWorkPost);
 export default CommonWorkPostApp;
diff --git a/src/modules/courses/busyWork/CommonWorkQuestion.js b/src/modules/courses/busyWork/CommonWorkQuestion.js
index 9318d3c1..9de4e248 100644
--- a/src/modules/courses/busyWork/CommonWorkQuestion.js
+++ b/src/modules/courses/busyWork/CommonWorkQuestion.js
@@ -1,63 +1,46 @@
-import React,{Component} from "react";
-import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
-import {Link} from 'react-router-dom';
-import locale from 'antd/lib/date-picker/locale/zh_CN';
-import { WordsBtn, MarkdownToHtml, on, off } from 'educoder';
+import React, { Component } from "react";
+import { on, off } from 'educoder';
 import axios from 'axios';
-import Modals from '../../modals/Modals';
-import CoursesListType from '../coursesPublic/CoursesListType';
-import HomeworkModal from "../coursesPublic/HomeworkModal";
-import CheckAllGroup from '../common/button/CheckAllGroup'
-import moment from 'moment';
-import CheckCodeModal from '../coursesPublic/modal/CheckCodeModal'
 import '../css/Courses.css'
-import WorkDetailPageHeader from './common/WorkDetailPageHeader'
 import CommonReply from '../common/comments/CommonReply.js'
-import TabRightComponents from './common/TabRightComponents'
-const { Option} = Select;
-const CheckboxGroup = Checkbox.Group;
-const confirm = Modal.confirm;
-let GraduationTasksnewtype=true;
-const $ = window.$;
-const Search = Input.Search;
-const RadioGroup = Radio.Group;
+import RenderHtml from "../../../components/render-html";
 
-class CommonWorkQuestion extends Component{
+class CommonWorkQuestion extends Component {
 
-  constructor(props){
+  constructor(props) {
     super(props)
 
-    this.state={
-      course_name:"",
-      homework_name:"",
+    this.state = {
+      course_name: "",
+      homework_name: "",
       search: ''
     }
   }
   fetchData = () => {
-    let workId=this.props.match.params.workId;
+    let workId = this.props.match.params.workId;
     const url = `/homework_commons/${workId}.json`
 
-    axios.get(url).then((result)=> {
+    axios.get(url).then((result) => {
       if (result.data.course_id) {
 
         this.setState({
           ...result.data
         }, () => {
         })
-        this.props.initWorkDetailCommonState && this.props.initWorkDetailCommonState( Object.assign({...result.data}, {
+        this.props.initWorkDetailCommonState && this.props.initWorkDetailCommonState(Object.assign({ ...result.data }, {
           moduleName: '作业描述'
         }))
       }
 
-     }).catch((error)=>{
-       console.log(error)
-     })
+    }).catch((error) => {
+      console.log(error)
+    })
   }
   componentDidMount() {
     this.fetchData()
     try {
       this.props.triggerRef(this);
-    }catch (e) {
+    } catch (e) {
 
     }
     on('commonwork_fetch_all', this.fetchAllListener)
@@ -70,41 +53,38 @@ class CommonWorkQuestion extends Component{
   }
 
 
-  render(){
-    const dateFormat = 'YYYY-MM-DD HH:mm';
+  render() {
 
-    let {course_name, homework_name, search, page, loadingstate, homework_status, description
-      , homework_id, homework_user_id, attachments, group_info = {}
-    } =this.state;
+    let { description
+      , homework_id, attachments, group_info = {}
+    } = this.state;
 
-    let courseId=this.props.match.params.coursesId;
-    let category_id=this.props.match.params.category_id;
-    let task_Id=this.props.match.params.task_Id;
+    let courseId = this.props.match.params.coursesId;
     const isGroup = this.props.isGroup()
 
-    return(
+    return (
       <React.Fragment>
 
         {/* 内容区 */}
         <div className="padding40 memoContent new_li">
-          <MarkdownToHtml content={description} selector="work_content" className="mb10"></MarkdownToHtml>
+          <RenderHtml value={description} className="mb10" />
 
-          { attachments && attachments.map((item) => {
-            return ( <div className="color-grey">
+          {attachments && attachments.map((item) => {
+            return (<div className="color-grey">
               <a className="color-grey">
                 <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
               </a>
               <a href={item.url} className="mr12" length="58">{item.title}</a>
               <span className="color-grey mt2 color-grey-6 font-12">{item.filesize}</span>
-            </div> )
-          }) }
+            </div>)
+          })}
 
           {isGroup && <div className="df mt10">
-            <div style={{flex: '0 0 160px'}}>
+            <div style={{ flex: '0 0 160px' }}>
               <div>分组要求： {group_info.min_num} ~ {group_info.max_num}人</div>
               <div>{group_info.base_on_project ? '基于项目实施' : '不基于项目'}：</div>
             </div>
-            <div style={{color: '#9B9B9B'}}>
+            <div style={{ color: '#9B9B9B' }}>
               <div>（学生提交作品时需要关联同组成员，组内成员作品共享）</div>
               <div>（{group_info.base_on_project ? '学生必须在本平台创建项目，项目管理员可以提交作品' : '无需在平台创建项目，任意小组成员均可以提交作品'}）</div>
               {/* <div>（各小组必须在educoder平台创建项目）</div> */}
@@ -113,14 +93,14 @@ class CommonWorkQuestion extends Component{
 
         </div>
 
-        { homework_id && <CommonReply
+        {homework_id && <CommonReply
           memo={{
             id: homework_id,
           }}
           course_id={courseId} {...this.props}
           apiRouteName={'homework_commons'}
           jour_type={'HomeworkCommon'}
-        ></CommonReply> }
+        ></CommonReply>}
       </React.Fragment>
 
     )
diff --git a/src/modules/courses/busyWork/CommonWorkSetting.js b/src/modules/courses/busyWork/CommonWorkSetting.js
index 8a8ee0ac..6119a956 100644
--- a/src/modules/courses/busyWork/CommonWorkSetting.js
+++ b/src/modules/courses/busyWork/CommonWorkSetting.js
@@ -307,6 +307,7 @@ class CommonWorkSetting extends Component{
       evaluation_num,
       absence_penalty,
       anonymous_comment: checked,
+      student_comment:checked,
       te_proportion: checked ? 50 : 70,
       ta_proportion: checked ? 30 : 30,
       st_proportion: checked ? 20 : 0,
@@ -335,6 +336,13 @@ class CommonWorkSetting extends Component{
       absence_penalty:value
     })
   }
+  //匿评不计入已评阅 issue#29448
+  student_comment_change=(e) => {
+    let value= e.target.checked;
+    this.setState({
+      student_comment:value
+    })
+  }
   // 启用匿评申诉
   anonymous_appeal_change = (e) => {
     const { evaluation_end } = this.state;
@@ -475,7 +483,7 @@ class CommonWorkSetting extends Component{
   homepublish=()=>{
     // let task_Id=this.props.match.params.task_Id;
     // const cid = this.props.match.params.coursesId
-    // let url = `/courses/${cid}/graduation_tasks/publish_task.json`;
+    // let url = `/classrooms/${cid}/graduation_tasks/publish_task.json`;
     // axios.post(url,{
     //   task_ids:[task_Id],
 
@@ -528,7 +536,7 @@ class CommonWorkSetting extends Component{
       ,
       publish_time, end_time,
       allow_late, late_penalty, late_time, work_public, score_open, answer_public, group_settings,
-      anonymous_comment, anonymous_appeal, evaluation_start, evaluation_end, evaluation_num, absence_penalty, appeal_time,
+      anonymous_comment,student_comment, anonymous_appeal, evaluation_start, evaluation_end, evaluation_num, absence_penalty, appeal_time,
       appeal_penalty, ta_mode, final_mode, te_proportion, ta_proportion, st_proportion,
       unified_setting,
       publish_time_type, end_time_type
@@ -747,6 +755,7 @@ class CommonWorkSetting extends Component{
       evaluation_num: evaluation_num,     //	匿评数
       absence_penalty: absence_penalty,   // 匿评扣分
       anonymous_appeal: anonymous_appeal, // true: 启用匿评申诉, false:未启用
+      student_comment:student_comment,// true:匿评计入已评阅，false不计入Issue#29448
       appeal_time: appeal_time ? !isNaN(appeal_time_date.getTime()) ? appeal_time_date : new Date(appeal_time.replace(/-/g, '/')) : appeal_time,   // 申诉结束时间
       appeal_penalty: appeal_penalty, //	违规匿评扣分
       ta_mode: ta_mode,  // 1:普通模式 0:复审模式
@@ -843,7 +852,7 @@ class CommonWorkSetting extends Component{
     // const coursesId = this.props.match.params.coursesId;
     // const task_Id = this.props.match.params.task_Id;
 
-    // let url = `/courses/${coursesId}/graduation_tasks/end_task.json`;
+    // let url = `/classrooms/${coursesId}/graduation_tasks/end_task.json`;
     // axios.post(url,{
     //   task_ids:[task_Id],
     //   all_check:0
@@ -929,7 +938,7 @@ class CommonWorkSetting extends Component{
 
       homework_status, homework_id, homework_name, homework_type, publish_immediately, end_immediately, unified_setting, publish_time,
       end_time, allow_late, late_penalty, late_time, work_public, score_open, answer_public, group_settings,
-      anonymous_comment, anonymous_appeal, evaluation_start, evaluation_end, evaluation_num, absence_penalty, appeal_time,
+      anonymous_comment, student_comment,anonymous_appeal, evaluation_start, evaluation_end, evaluation_num, absence_penalty, appeal_time,
       appeal_penalty, ta_mode, final_mode, te_proportion, ta_proportion, st_proportion, anonymous_comment_time_tip, appeal_time_tip,
       final_mode_false_tip,
       startEditFlag,
@@ -1298,10 +1307,12 @@ class CommonWorkSetting extends Component{
             {/* 匿评数量 */}
             <div className={"h20 mb30 ml60"}>
               <span>匿评数量：</span>
-              <Tooltip placement="bottom" title={starttimetype===true?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
+              <Tooltip placement="bottom" title={this.props.isAdmin()?moment(init_evaluation_start) < this.fetchMoment?"匿评已开启无法修改匿评数量":"":""}>
               <span>
                 <Input type="number" className="mr10" style={{width:"100px" }} value={evaluation_num}  onInput={this.evaluation_num_change}
-                  disabled={anonymous_comment && !noAuth? false : true} min={0} max={100}
+                  disabled={anonymous_comment && !noAuth?
+										moment(init_evaluation_start) < this.fetchMoment?true:false
+										: true} min={0} max={100}
                 />
               </span>
               </Tooltip>
@@ -1325,6 +1336,12 @@ class CommonWorkSetting extends Component{
 
             { anonymous_comment &&
             <React.Fragment>
+              <div  className={"mb20"}>
+                <Checkbox className="ml30" checked={student_comment} onChange={this.student_comment_change}
+                  disabled={noAuth || moment(init_appeal_time) < moment()}
+                >匿评计入已评阅</Checkbox>
+                <span className={"font-14 color-grey-9 "}>（学生相互匿评的数据，在作品列表中计入已评阅）</span>
+              </div>
             <div  className={"mb20"}>
               <Checkbox className="ml30" checked={anonymous_appeal} onChange={this.anonymous_appeal_change}
                   disabled={noAuth || moment(init_appeal_time) < moment()}
@@ -1396,7 +1413,7 @@ class CommonWorkSetting extends Component{
               <span className={"font-14 color-grey-9 ml10"}>（学生违规匿评TA人作品时，其成绩将被扣减的分值）</span>
             </div>
             {this.state.appeal_penalty_tip && <div className={" appeal_penalty_tip color-red ml60"} style={{marginTop: '-6px'}}>{this.state.appeal_penalty_tip}</div>}
-
+            
             </React.Fragment> }
           </div>
 
@@ -1526,10 +1543,10 @@ class CommonWorkSetting extends Component{
 
         </Form>
         {this.props.isAdmin() && startEditFlag ?<div className="clearfix mt30 mb30">
-          <Button type="primary" htmlType="submit"  className="defalutSubmitbtn fl mr20"
+          <a type="primary" htmlType="submit"  className="defalutSubmitbtn fl mr20"
               onClick={this.onSubmit}
-          >提交</Button>
-          {/*<Link to={"/courses/"+courseId+"/graduation_tasks/"+position+"/"+category_id+coursesearch} className="defalutCancelbtn fl">取消</Link>*/}
+          >提交</a>
+          {/*<Link to={"/classrooms/"+courseId+"/graduation_tasks/"+position+"/"+category_id+coursesearch} className="defalutCancelbtn fl">取消</Link>*/}
           <a onClick={this.goback} className="defalutCancelbtn fl"
           >取消</a>
         </div>:""}
diff --git a/src/modules/courses/busyWork/ConnectProject.js b/src/modules/courses/busyWork/ConnectProject.js
index c1fd4185..b72a86a2 100644
--- a/src/modules/courses/busyWork/ConnectProject.js
+++ b/src/modules/courses/busyWork/ConnectProject.js
@@ -1,5 +1,5 @@
-import React,{ Component } from "react";
-import {Radio,Input ,Modal} from "antd";
+import React, { Component } from "react";
+import { Radio, Input, Modal } from "antd";
 
 import '../css/members.css'
 import { WordsBtn } from 'educoder'
@@ -7,13 +7,13 @@ import axios from 'axios'
 import InfiniteScroll from 'react-infinite-scroller';
 import NoneData from "../coursesPublic/NoneData"
 
-const Search =Input.Search;
+const Search = Input.Search;
 const LIMIT = 15
-class ConnectProject extends Component{
-  constructor(props){
+class ConnectProject extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      project_flag:false,
+    this.state = {
+      project_flag: false,
       page: 1,
       loading: false,
       hasMore: true,
@@ -21,7 +21,7 @@ class ConnectProject extends Component{
     }
   }
   componentDidMount() {
-    
+
   }
   onSubmit = () => {
     const { radioValue, projects } = this.state;
@@ -37,17 +37,17 @@ class ConnectProject extends Component{
     this.connectProject(radioValue)
   }
   connectProject = (project_id) => {
-    let workId=this.work.homework_id;
+    let workId = this.work.homework_id;
     const url = `/homework_commons/${workId}/student_works/relate_project.json`
     axios.post(url, {
       project_id: project_id
-    }).then((result)=>{
-      if(result.data.status==0){
+    }).then((result) => {
+      if (result.data.status == 0) {
         this.closeConnectionProject()
         this.props.connectSuccess()
         this.props.showNotification('关联成功')
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
@@ -68,8 +68,8 @@ class ConnectProject extends Component{
         per_page: LIMIT,
         keyword: keyword
       }
-    }).then((result)=>{
-      if(result.status==200){
+    }).then((result) => {
+      if (result.status == 200) {
         this.setState({
           count: result.data.count,
           projects: page == 1 ? result.data.projects : this.state.projects.concat(result.data.projects),
@@ -81,42 +81,42 @@ class ConnectProject extends Component{
           this.setState({ haveProjects: result.data.projects.length > 0 })
         }
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
   //关联项目
-  openConnectionProject=(work)=>{
+  openConnectionProject = (work) => {
     this.work = work;
     this.fetchData()
     this.setState({
-      project_flag:true
+      project_flag: true
     })
   }
-  closeConnectionProject=()=>{
+  closeConnectionProject = () => {
     this.setState({
-      project_flag:false
+      project_flag: false
     })
   }
   onChange = (e) => {
     this.setState({ radioValue: e.target.value })
   }
 
-  render(){
-    let {project_flag, projects, loading, hasMore, haveProjects }=this.state;
-    return(
+  render() {
+    let { project_flag, projects, loading, hasMore, haveProjects } = this.state;
+    return (
       <React.Fragment>
         <Modal
-            visible={project_flag}
-            title="关联项目"
-            centered={true}
-            closable={false}
-            keyboard={false}
-            width="600px"
-            footer={null}
-            destroyOnClose={true}
-          >
-            <style>{`
+          visible={project_flag}
+          title="关联项目"
+          centered={true}
+          closable={false}
+          keyboard={false}
+          width="600px"
+          footer={null}
+          destroyOnClose={true}
+        >
+          <style>{`
             .connectProject .ant-radio {
               float: left;
               line-height: 18px;
@@ -133,52 +133,52 @@ class ConnectProject extends Component{
             }
 
             `}</style>
-            <div className="newupload_conbox clearfix connectProject">
-              {
-                (projects && !!projects.length || this.state.keyword) &&
-                <div>
-                  <Search placeholder="请输入项目名称进行搜索" className="with100"
-                    value={this.state.keyword} onInput={(e) => {this.setState({keyword: e.target.value})}}
-                    onSearch={this.onSearchValue}                  
-                  ></Search>
-                  <Radio.Group onChange={this.onChange} value={this.state.radioValue} className={"with100"}>
-                    <div className="mt15" style={{"maxHeight":"228px","overflow-y":"auto", "overflow-x": 'hidden'}}>
-                      <InfiniteScroll
-                        threshold={20}
-                        initialLoad={false}
-                        pageStart={0}
-                        loadMore={() => this.fetchData(this.state.page + 1)}
-                        hasMore={!loading && hasMore}
-                        useWindow={false}
-                      >
-                        { projects.map(item => {
-                          return <p className="mb7" key={item.id}><Radio value={item.id}>
-                            <span title={item.name.length > 12 ? item.name : ''} className="name">{item.name}</span>
-                            </Radio></p>
-                        })}
-                      </InfiniteScroll>
-                    </div>
-                  </Radio.Group>
-                </div>
-              }
-              {
-                haveProjects && projects.length == 0 && 
-                <NoneData></NoneData>
-              }
-              {
-                (!haveProjects) &&
-                <div className="edu-txt-center">
-                  您当前尚未管理任何项目，请先<WordsBtn style="blue" className="" onClick={this.props.toCreateProject}>创建项目</WordsBtn>再关联
-                </div>
-              }
-              
-
-              <div className="mt30 marginauto clearfix edu-txt-center">
-                <a onClick={this.closeConnectionProject} className="pop_close task-btn mr30">取消</a>
-                <a className="task-btn task-btn-orange" onClick={this.onSubmit}>确定</a>
+          <div className="newupload_conbox clearfix connectProject">
+            {
+              (projects && !!projects.length || this.state.keyword) &&
+              <div>
+                <Search placeholder="请输入项目名称进行搜索" className="with100"
+                  value={this.state.keyword} onInput={(e) => { this.setState({ keyword: e.target.value }) }}
+                  onSearch={this.onSearchValue}
+                ></Search>
+                <Radio.Group onChange={this.onChange} value={this.state.radioValue} className={"with100"}>
+                  <div className="mt15" style={{ "maxHeight": "228px", "overflowY": "auto", "overflowX": 'hidden' }}>
+                    <InfiniteScroll
+                      threshold={20}
+                      initialLoad={false}
+                      pageStart={0}
+                      loadMore={() => this.fetchData(this.state.page + 1)}
+                      hasMore={!loading && hasMore}
+                      useWindow={false}
+                    >
+                      {projects.map(item => {
+                        return <p className="mb7" key={item.id}><Radio value={item.id}>
+                          <span title={item.name.length > 12 ? item.name : ''} className="name">{item.name}</span>
+                        </Radio></p>
+                      })}
+                    </InfiniteScroll>
+                  </div>
+                </Radio.Group>
               </div>
+            }
+            {
+              haveProjects && projects.length == 0 &&
+              <NoneData></NoneData>
+            }
+            {
+              (!haveProjects) &&
+              <div className="edu-txt-center">
+                您当前尚未管理任何项目，请先<WordsBtn style="blue" className="" onClick={this.props.toCreateProject}>创建项目</WordsBtn>再关联
+                </div>
+            }
+
+
+            <div className="mt30 marginauto clearfix edu-txt-center">
+              <a onClick={this.closeConnectionProject} className="pop_close task-btn mr30">取消</a>
+              <a className="task-btn task-btn-orange" onClick={this.onSubmit}>确定</a>
             </div>
-          </Modal>
+          </div>
+        </Modal>
       </React.Fragment>
     )
   }
diff --git a/src/modules/courses/busyWork/Index.js b/src/modules/courses/busyWork/Index.js
index e109c36f..4d8135e4 100644
--- a/src/modules/courses/busyWork/Index.js
+++ b/src/modules/courses/busyWork/Index.js
@@ -1,142 +1,199 @@
-import React, { Component } from 'react';
-import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-import Loadable from 'react-loadable';
-import Loading from '../../../Loading';
-import { CNotificationHOC } from '../common/CNotificationHOC'
-import { RouteHOC } from './common'
-import "../css/busyWork.css"
-//引入对应跳转的组件
-const ListPageIndex = Loadable({
-    loader: () => import('../ListPageIndex'),
-    loading:Loading,
-})
-//新建分组/普通作业
-const NewWork = Loadable({
-    loader: () => import('./NewWork'),
-    loading:Loading,
-})
-const CommonWorkDetailIndex = Loadable({
-  loader: () => import('./CommonWorkDetailIndex'),
-  loading:Loading,
-})
-const CommonWorkSetting = Loadable({
-  loader: () => import('./CommonWorkSetting'),
-  loading:Loading,
-})
-const CommonWorkList = Loadable({
-  loader: () => import('./CommonWorkList'),
-  loading:Loading,
-})
-const CommonWorkQuestion = Loadable({
-  loader: () => import('./CommonWorkQuestion'),
-  loading:Loading,
-})
-const CommonWorkAnswer = Loadable({
-  loader: () => import('./CommonWorkAnswer'),
-  loading:Loading,
-})
-const CommonWorkAppraise = Loadable({
-  loader: () => import('./CommonWorkAppraise'),
-  loading:Loading,
-})
-
-const CommonWorkPost = Loadable({
-  loader: () => import('./CommonWorkPost'),
-  loading:Loading,
-})
-
-const CommonWork = Loadable({
-  loader: () => import('./commonWork'),
-  loading:Loading,
-})
-class CoursesWorkIndex extends Component{
-  constructor(props) {
-    super(props)
-  }
-  render() {
-    return (
-      <div>
-          <Switch {...this.props}>
-            
-            {/* --------------------------------------------------------------------- */}
-
-            {/* 作业设置 */}
-            {/* http://localhost:3007/courses/1309/homework/9300/setting */}
-            <Route exact path="/courses/:coursesId/common_homeworks/:workId/setting"
-              render={
-                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-
-            {/* 作品列表 */}
-            <Route exact path="/courses/:coursesId/common_homeworks/:workId/list"
-              render={
-                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-            {/* 作业问答 */}
-            <Route exact path="/courses/:coursesId/common_homeworks/:workId/question"
-              render={
-                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-            <Route exact path="/courses/:coursesId/common_homeworks/:workId/answer"
-              render={
-                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-            
-            {/* 评阅 */}
-            <Route exact path="/courses/:coursesId/common_homeworks/:workId/:studentWorkId/appraise"
-              render={
-                (props) => (<CommonWorkAppraise {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-
-            {/* 提交作品 */}
-            <Route exact path="/courses/:coursesId/common_homeworks/:workId/post"
-              render={
-                (props) => (<CommonWorkPost {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-            <Route exact path="/courses/:coursesId/common_homeworks/:workId/:studentWorkId/post_edit"
-              render={
-                (props) => (<CommonWorkPost {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-            
-
-            {/* 新建 */}
-            {/* http://localhost:3007/courses/1309/common_homeworks/9299/edit/1 */}
-            <Route exact path="/courses/:coursesId/common_homeworks/:workId/:pageType"
-              render={
-                (props) => (<NewWork {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-            <Route exact path="/courses/:coursesId/common_homeworks/:categroy_id/new"
-              render={
-                (props) => (<NewWork {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-
-            
-
-            {/* 作业列表 */}
-            <Route path="/courses/:coursesId/common_homeworks"
-              render={
-                (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-
-            {/* --------------------------------------------------------------------- */}
-
-
-            
-          </Switch>
-      </div>
-    )
-  }
-}
-
-export default RouteHOC() (CNotificationHOC() (SnackbarHOC() ( CoursesWorkIndex) ));
\ No newline at end of file
+import React, { Component } from 'react';
+import { SnackbarHOC } from 'educoder';
+import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
+import Loadable from 'react-loadable';
+import Loading from '../../../Loading';
+import { CNotificationHOC } from '../common/CNotificationHOC'
+import { RouteHOC } from './common'
+import "../css/busyWork.css"
+//引入对应跳转的组件
+const ListPageIndex = Loadable({
+    loader: () => import('../ListPageIndex'),
+    loading:Loading,
+})
+//新建分组/普通作业
+const NewWork = Loadable({
+    loader: () => import('./NewWork'),
+    loading:Loading,
+})
+const CommonWorkDetailIndex = Loadable({
+  loader: () => import('./CommonWorkDetailIndex'),
+  loading:Loading,
+})
+const CommonWorkSetting = Loadable({
+  loader: () => import('./CommonWorkSetting'),
+  loading:Loading,
+})
+const CommonWorkList = Loadable({
+  loader: () => import('./CommonWorkList'),
+  loading:Loading,
+})
+const CommonWorkQuestion = Loadable({
+  loader: () => import('./CommonWorkQuestion'),
+  loading:Loading,
+})
+const CommonWorkAnswer = Loadable({
+  loader: () => import('./CommonWorkAnswer'),
+  loading:Loading,
+})
+const CommonWorkAppraise = Loadable({
+  loader: () => import('./CommonWorkAppraise'),
+  loading:Loading,
+})
+
+const CommonWorkPost = Loadable({
+  loader: () => import('./CommonWorkPost'),
+  loading:Loading,
+})
+
+const CommonWork = Loadable({
+  loader: () => import('./commonWork'),
+  loading:Loading,
+})
+class CoursesWorkIndex extends Component{
+  constructor(props) {
+    super(props)
+  }
+  render() {
+    return (
+      <div>
+          <Switch {...this.props}>
+
+            {/* --------------------------------------------------------------------- */}
+
+            {/* 作业设置 */}
+            {/* http://localhost:3007/classrooms/1309/homework/9300/setting */}
+            <Route exact path="/classrooms/:coursesId/common_homeworks/:workId/setting"
+              render={
+                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/common_homework/:workId/setting"
+                   render={
+                     (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+
+            {/* 作品列表 */}
+            <Route exact path="/classrooms/:coursesId/common_homeworks/:workId/list"
+              render={
+                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            {/* 作品列表 */}
+            <Route exact path="/classrooms/:coursesId/common_homework/:workId/list"
+                   render={
+                     (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+            {/* 作业问答 */}
+            <Route exact path="/classrooms/:coursesId/common_homeworks/:workId/question"
+              render={
+                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/common_homework/:workId/question"
+                   render={
+                     (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+            <Route exact path="/classrooms/:coursesId/common_homeworks/:workId/answer"
+              render={
+                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/common_homework/:workId/answer"
+                   render={
+                     (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+
+            {/* 评阅 */} 
+            <Route exact path="/classrooms/:coursesId/common_homeworks/:workId/:studentWorkId/appraise"
+              render={
+                (props) => (<CommonWorkAppraise {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/common_homework/:workId/:studentWorkId/appraise"
+              render={
+                (props) => (<CommonWorkAppraise {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+
+            {/* 提交作品 */}
+            <Route exact path="/classrooms/:coursesId/common_homeworks/:workId/post"
+              render={
+                (props) => (<CommonWorkPost {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/common_homework/:workId/post"
+                   render={
+                     (props) => (<CommonWorkPost {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+            <Route exact path="/classrooms/:coursesId/common_homeworks/:workId/:studentWorkId/post_edit"
+              render={
+                (props) => (<CommonWorkPost {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/common_homework/:workId/:studentWorkId/post_edit"
+                   render={
+                     (props) => (<CommonWorkPost {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+
+            {/* 新建 */}
+            {/* http://localhost:3007/classrooms/1309/common_homeworks/9299/edit/1 */}
+            <Route exact path="/classrooms/:coursesId/common_homeworks/:workId/:pageType"
+              render={
+                (props) => (<NewWork {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/common_homework/:workId/:pageType"
+                   render={
+                     (props) => (<NewWork {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+            <Route exact path="/classrooms/:coursesId/common_homeworks/:categroy_id/new"
+              render={
+                (props) => (<NewWork {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+
+            <Route exact path="/classrooms/:coursesId/common_homework/:categroy_id/new"
+                   render={
+                     (props) => (<NewWork {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+
+            {/* 作业列表 */}
+            <Route path="/classrooms/:coursesId/common_homeworks"
+              render={
+                (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route path="/classrooms/:coursesId/common_homework"
+                   render={
+                     (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+            {/* --------------------------------------------------------------------- */}
+
+
+
+          </Switch>
+      </div>
+    )
+  }
+}
+
+export default RouteHOC() (CNotificationHOC() (SnackbarHOC() ( CoursesWorkIndex) ));
diff --git a/src/modules/courses/busyWork/IndexGroup.js b/src/modules/courses/busyWork/IndexGroup.js
index cfe38766..7479366d 100644
--- a/src/modules/courses/busyWork/IndexGroup.js
+++ b/src/modules/courses/busyWork/IndexGroup.js
@@ -1,140 +1,191 @@
-import React, { Component } from 'react';
-import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-import Loadable from 'react-loadable';
-import Loading from '../../../Loading';
-import { CNotificationHOC } from '../common/CNotificationHOC'
-import { RouteHOC } from './common'
-import "../css/busyWork.css"
-//引入对应跳转的组件
-const ListPageIndex = Loadable({
-    loader: () => import('../ListPageIndex'),
-    loading:Loading,
-})
-//新建分组/普通作业
-const NewWork = Loadable({
-    loader: () => import('./NewWork'),
-    loading:Loading,
-})
-const CommonWorkPost = Loadable({
-  loader: () => import('./CommonWorkPost'),
-  loading:Loading,
-})
-const CommonWorkSetting = Loadable({
-  loader: () => import('./CommonWorkSetting'),
-  loading:Loading,
-})
-const CommonWorkList = Loadable({
-  loader: () => import('./CommonWorkList'),
-  loading:Loading,
-})
-const CommonWorkQuestion = Loadable({
-  loader: () => import('./CommonWorkQuestion'),
-  loading:Loading,
-})
-const CommonWorkAnswer = Loadable({
-  loader: () => import('./CommonWorkAnswer'),
-  loading:Loading,
-})
-const CommonWorkAppraise = Loadable({
-  loader: () => import('./CommonWorkAppraise'),
-  loading:Loading,
-})
-
-
-const CommonWork = Loadable({
-  loader: () => import('./commonWork'),
-  loading:Loading,
-})
-
-const CommonWorkDetailIndex = Loadable({
-  loader: () => import('./CommonWorkDetailIndex'),
-  loading:Loading,
-})
-class CoursesWorkIndex extends Component{
-  constructor(props) {
-    super(props)
-  }
-  render() {
-    return (
-      <div>
-          <Switch {...this.props}>
-           
-            
-            {/* --------------------------------------------------------------------- */}
-
-            {/* --------------------------------------------------------------------- */}
-
-            {/* 作业设置 */}
-            <Route exact path="/courses/:coursesId/group_homeworks/:workId/setting"
-              render={
-                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-
-            {/* 作品列表 */}
-            <Route exact path="/courses/:coursesId/group_homeworks/:workId/list"
-              render={
-                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-
-            {/* 作业问答 */}
-            <Route exact path="/courses/:coursesId/group_homeworks/:workId/question"
-              render={
-                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-            {/* 参考答案 */}
-            <Route exact path="/courses/:coursesId/group_homeworks/:workId/answer"
-              render={
-                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-            {/* 评阅 */}
-            <Route exact path="/courses/:coursesId/group_homeworks/:workId/:studentWorkId/appraise"
-              render={
-                (props) => (<CommonWorkAppraise {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-
-
-            <Route exact path="/courses/:coursesId/group_homeworks/:workId/post"
-              render={
-                (props) => (<CommonWorkPost {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-            <Route exact path="/courses/:coursesId/group_homeworks/:workId/:studentWorkId/post_edit"
-              render={
-                (props) => (<CommonWorkPost {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-
-            {/* 新建 */}
-            {/* http://localhost:3007/courses/1309/group_homeworks/9299/edit/1 */}
-            <Route exact path="/courses/:coursesId/group_homeworks/:workId/:pageType"
-              render={
-                (props) => (<NewWork {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-            <Route exact path="/courses/:coursesId/group_homeworks/:categroy_id/new"
-              render={
-                (props) => (<NewWork {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-
-            {/* 作业列表 */}
-            <Route path="/courses/:coursesId/group_homeworks"
-              render={
-                (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-
-            
-          </Switch>
-      </div>
-    )
-  }
-}
-
-export default RouteHOC() (CNotificationHOC() (SnackbarHOC() ( CoursesWorkIndex) ));
\ No newline at end of file
+import React, { Component } from 'react';
+import { SnackbarHOC } from 'educoder';
+import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
+import Loadable from 'react-loadable';
+import Loading from '../../../Loading';
+import { CNotificationHOC } from '../common/CNotificationHOC'
+import { RouteHOC } from './common'
+import "../css/busyWork.css"
+//引入对应跳转的组件
+const ListPageIndex = Loadable({
+    loader: () => import('../ListPageIndex'),
+    loading:Loading,
+})
+//新建分组/普通作业
+const NewWork = Loadable({
+    loader: () => import('./NewWork'),
+    loading:Loading,
+})
+const CommonWorkPost = Loadable({
+  loader: () => import('./CommonWorkPost'),
+  loading:Loading,
+})
+const CommonWorkSetting = Loadable({
+  loader: () => import('./CommonWorkSetting'),
+  loading:Loading,
+})
+const CommonWorkList = Loadable({
+  loader: () => import('./CommonWorkList'),
+  loading:Loading,
+})
+const CommonWorkQuestion = Loadable({
+  loader: () => import('./CommonWorkQuestion'),
+  loading:Loading,
+})
+const CommonWorkAnswer = Loadable({
+  loader: () => import('./CommonWorkAnswer'),
+  loading:Loading,
+})
+const CommonWorkAppraise = Loadable({
+  loader: () => import('./CommonWorkAppraise'),
+  loading:Loading,
+})
+
+
+const CommonWork = Loadable({
+  loader: () => import('./commonWork'),
+  loading:Loading,
+})
+
+const CommonWorkDetailIndex = Loadable({
+  loader: () => import('./CommonWorkDetailIndex'),
+  loading:Loading,
+})
+class CoursesWorkIndex extends Component{
+  constructor(props) {
+    super(props)
+  }
+  render() {
+    return (
+      <div>
+          <Switch {...this.props}>
+
+
+            {/* --------------------------------------------------------------------- */}
+
+            {/* --------------------------------------------------------------------- */}
+
+            {/* 作业设置 */}
+            <Route exact path="/classrooms/:coursesId/group_homeworks/:workId/setting"
+              render={
+                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/group_homework/:workId/setting"
+                   render={
+                     (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+            {/* 作品列表 */}
+            <Route exact path="/classrooms/:coursesId/group_homeworks/:workId/list"
+              render={
+                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/group_homework/:workId/list"
+                   render={
+                     (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+            {/* 作业问答 */}
+            <Route exact path="/classrooms/:coursesId/group_homeworks/:workId/question"
+              render={
+                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/group_homework/:workId/question"
+                   render={
+                     (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+            {/* 参考答案 */}
+            <Route exact path="/classrooms/:coursesId/group_homeworks/:workId/answer"
+              render={
+                (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/group_homework/:workId/answer"
+                   render={
+                     (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+            {/* 评阅 */}
+            <Route exact path="/classrooms/:coursesId/group_homeworks/:workId/:studentWorkId/appraise"
+              render={
+                (props) => (<CommonWorkAppraise {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/group_homework/:workId/:studentWorkId/appraise"
+                   render={
+                     (props) => (<CommonWorkAppraise {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+            <Route exact path="/classrooms/:coursesId/group_homeworks/:workId/post"
+              render={
+                (props) => (<CommonWorkPost {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+
+            <Route exact path="/classrooms/:coursesId/group_homework/:workId/post"
+                   render={
+                     (props) => (<CommonWorkPost {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+            <Route exact path="/classrooms/:coursesId/group_homeworks/:workId/:studentWorkId/post_edit"
+              render={
+                (props) => (<CommonWorkPost {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/group_homework/:workId/:studentWorkId/post_edit"
+                   render={
+                     (props) => (<CommonWorkPost {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+            {/* 新建 */}
+            {/* http://localhost:3007/classrooms/1309/group_homeworks/9299/edit/1 */}
+            <Route exact path="/classrooms/:coursesId/group_homeworks/:workId/:pageType"
+              render={
+                (props) => (<NewWork {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/group_homework/:workId/:pageType"
+                   render={
+                     (props) => (<NewWork {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/group_homeworks/:categroy_id/new"
+              render={
+                (props) => (<NewWork {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            <Route exact path="/classrooms/:coursesId/group_homework/:categroy_id/new"
+                   render={
+                     (props) => (<NewWork {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+            {/* 作业列表 */}
+            <Route path="/classrooms/:coursesId/group_homeworks"
+              render={
+                (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
+            {/* 作业列表 */}
+            <Route path="/classrooms/:coursesId/group_homework"
+                   render={
+                     (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                   }
+            ></Route>
+
+
+          </Switch>
+      </div>
+    )
+  }
+}
+
+export default RouteHOC() (CNotificationHOC() (SnackbarHOC() ( CoursesWorkIndex) ));
diff --git a/src/modules/courses/busyWork/NewWork.js b/src/modules/courses/busyWork/NewWork.js
index 37e71d16..8776ded4 100644
--- a/src/modules/courses/busyWork/NewWork.js
+++ b/src/modules/courses/busyWork/NewWork.js
@@ -1,10 +1,12 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 import { Input, InputNumber, Form, Button, Checkbox, Upload, Icon, message, Modal } from "antd";
 import axios from 'axios'
 import '../css/busyWork.css'
 import '../css/Courses.css'
-import { WordsBtn, getUrl, ConditionToolTip, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll
-	, getUploadActionUrl } from 'educoder'
+import {
+	WordsBtn, getUrl, ConditionToolTip, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll
+	, getUploadActionUrl
+} from 'educoder'
 import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
 import CBreadcrumb from '../common/CBreadcrumb'
 import NewWorkForm from './NewWorkForm'
@@ -12,19 +14,19 @@ import NewWorkForm from './NewWorkForm'
 const confirm = Modal.confirm;
 const $ = window.$
 const MAX_TITLE_LENGTH = 60;
-class NewWork extends Component{
-	constructor(props){
+class NewWork extends Component {
+	constructor(props) {
 		super(props);
 		this.contentMdRef = React.createRef();
 		this.answerMdRef = React.createRef();
 
-		this.state={
+		this.state = {
 			category: {},
 			course_name: ''
 		}
 	}
-	componentDidMount () {
-		let {typeId, coursesId, pageType, workId}=this.props.match.params;
+	componentDidMount() {
+		let { typeId, coursesId, pageType, workId } = this.props.match.params;
 		const isEdit = pageType === "edit"
 		this.isEdit = isEdit;
 		if (isEdit) {
@@ -34,10 +36,19 @@ class NewWork extends Component{
 		}
 	}
 	fetchCourseData = (courseId) => {
+		let newcategory = undefined;
+		if (this.props.match.path === "/classrooms/:coursesId/common_homework/:workId/:pageType" || this.props.match.path === "/classrooms/:coursesId/group_homework/:workId/:pageType") {
+			newcategory = this.props.match.params.workId
+		}
 		const isGroup = this.props.isGroup()
-		const url = `/courses/${courseId}/homework_commons/new.json?type=${isGroup ? 3 : 1}`
+		let url = ""
+		if (newcategory) {
+			url = `/courses/${courseId}/homework_commons/new.json?type=${isGroup ? 3 : 1}&category=${newcategory}`;
+		} else {
+			url = `/courses/${courseId}/homework_commons/new.json?type=${isGroup ? 3 : 1}`
+		}
 		axios.get(url, {
-			})
+		})
 			.then((response) => {
 				if (response.data.course_name) {
 					const data = response.data;
@@ -54,9 +65,19 @@ class NewWork extends Component{
 			});
 	}
 	fetchWork = (workId) => {
-		const url = `/homework_commons/${workId}/edit.json`
+		let newcategory = undefined;
+		if (this.props.match.path === "/classrooms/:coursesId/common_homework/:workId/:pageType" || this.props.match.path === "/classrooms/:coursesId/group_homework/:workId/:pageType") {
+			newcategory = this.props.match.params.workId
+		}
+		let url = ""
+		if (newcategory) {
+			url = `/homework_commons/${workId}/edit.json?category=${newcategory}`;
+		} else {
+			url = `/homework_commons/${workId}/edit.json`
+		}
+
 		axios.get(url, {
-			})
+		})
 			.then((response) => {
 				if (response.data.name) {
 					const data = response.data;
@@ -96,6 +117,9 @@ class NewWork extends Component{
 	doNew = (params) => {
 		const coursesId = this.props.match.params.coursesId
 		const newUrl = `/courses/${coursesId}/homework_commons.json`
+		if (this.props.match.path === "/classrooms/:coursesId/common_homework/:workId/:pageType" || this.props.match.path === "/classrooms/:coursesId/group_homework/:workId/:pageType") {
+			params.category = this.props.match.params.workId
+		}
 
 		axios.post(newUrl, params)
 			.then((response) => {
@@ -123,7 +147,7 @@ class NewWork extends Component{
 	}
 
 	onAttachmentRemove = (file, stateName) => {
-		if(!file.percent || file.percent == 100){
+		if (!file.percent || file.percent == 100) {
 			this.props.confirm({
 				content: '是否确认删除?',
 
@@ -141,41 +165,43 @@ class NewWork extends Component{
 
 	}
 
-	render(){
-		let {typeId,coursesId,pageType}=this.props.match.params;
+	render() {
+		let { typeId, coursesId, pageType } = this.props.match.params;
 
 		const isGroup = this.props.isGroup()
-		const moduleName = !isGroup? "普通作业":"分组作业";
+		const moduleName = !isGroup ? "普通作业" : "分组作业";
 		const moduleEngName = this.props.getModuleName()
-		let{
+		let {
 			course_name, category
-		}=this.state
+		} = this.state
 		const { current_user } = this.props
 
-		const courseId = this.state.course_id || coursesId ;
+		const courseId = this.state.course_id || coursesId;
 		const isEdit = this.isEdit;
 
 		const common = {
-			onCancel:this.onCancel,
+			onCancel: this.onCancel,
 			isGroup: this.props.isGroup,
 			doNew: this.doNew,
 			doEdit: this.doEdit,
 		}
-	  document.title=this.state.course_name && this.state.course_name
-	 	return(
+		document.title = this.state.course_name && this.state.course_name
+		return (
 			<div className="newMain">
 				<div className="educontent mt20 mb50">
 					<CBreadcrumb items={[
-						{ to: current_user && current_user.first_category_url, name: this.state.course_name},
-						{ to: `/courses/${courseId}/${moduleEngName}/${category && category.category_id ? category.category_id : ''}`
-							, name: category && category.category_name },
-						{ name: `${ this.isEdit ? '编辑' : '新建'}` }
+						{ to: current_user && current_user.first_category_url, name: this.state.course_name },
+						{
+							to: `/classrooms/${courseId}/${moduleEngName}/${category && category.category_id ? category.category_id : ''}`
+							, name: category && category.category_name
+						},
+						{ name: `${this.isEdit ? '编辑' : '新建'}` }
 					]}></CBreadcrumb>
 
 					<p className="clearfix mt20 mb20">
-						<span className="fl font-24 color-grey-3">{this.isEdit ?"编辑":"新建"}{ moduleName }</span>
-						<a href="javascript:void(0)" className="color-grey-6 fr font-16 mr2"
-							 onClick={() => this.props.history.goBack()}>
+						<span className="fl font-24 color-grey-3">{this.isEdit ? "编辑" : "新建"}{moduleName}</span>
+						<a className="color-grey-6 fr font-16 mr2"
+							onClick={() => this.props.history.goBack()}>
 							返回
 						</a>
 					</p>
@@ -195,7 +221,7 @@ class NewWork extends Component{
 							{...this.props}
 							{...this.state}
 							{...common}
-							wrappedComponentRef={(ref) => {this.newWorkFormRef = ref}}
+							wrappedComponentRef={(ref) => { this.newWorkFormRef = ref }}
 						></NewWorkForm>
 					</div>
 				</div>
@@ -204,4 +230,4 @@ class NewWork extends Component{
 	}
 }
 
-export default NewWork;
\ No newline at end of file
+export default NewWork;
diff --git a/src/modules/courses/busyWork/PublishRightnow.js b/src/modules/courses/busyWork/PublishRightnow.js
index 1b9c8b0f..0a1bb3bb 100644
--- a/src/modules/courses/busyWork/PublishRightnow.js
+++ b/src/modules/courses/busyWork/PublishRightnow.js
@@ -1,30 +1,33 @@
-import React,{ Component } from "react";
-import { Input,Checkbox,Menu,Pagination } from "antd";
+import React, { Component } from "react";
+import { Input, Checkbox, Menu, Pagination } from "antd";
 
 import HomeworkModal from '../coursesPublic/HomeworkModal';
 import OneSelfOrderModal from "../coursesPublic/OneSelfOrderModal";
 import axios from 'axios'
 import moment from 'moment'
 import { getNextHalfHourOfMoment } from 'educoder'
-class PublishRightnow extends Component{
-  constructor(props){
+class PublishRightnow extends Component {
+  constructor(props) {
     super(props);
 
-    this.state={
+    this.state = {
       course_groups: [],
-      modalname:undefined,
-      modaltype:undefined,
-      visible:false,
-      Topval:undefined,
-      Botvalleft:undefined,
-      Botval:undefined,
-      starttime:undefined,
-      endtime:undefined,
-      Cancelname:undefined,
-      Savesname:undefined,
-      Cancel:undefined,
-      Saves:undefined,
-      Topvalright:undefined
+      modalname: undefined,
+      modaltype: undefined,
+      visible: false,
+      Topval: undefined,
+      Botvalleft: undefined,
+      Botval: undefined,
+      starttime: undefined,
+      endtime: undefined,
+      Cancelname: undefined,
+      Savesname: undefined,
+      Cancel: undefined,
+      Saves: undefined,
+      Topvalright: undefined,
+      modallate_time: undefined,
+      immediatelyopen: false,
+      starttimeslate_time: undefined
     }
   }
   open = (usingCheckBeforePost) => {
@@ -32,71 +35,75 @@ class PublishRightnow extends Component{
     this.homeworkstart()
   }
 
-  homeworkstart=()=>{
-		const isPublish = this.props.isPublish;
-		const isPublishtype = this.props.isPublishtype;
-		let showdatatypes=isPublish===true||isPublishtype===1;
+  homeworkstart = () => {
+    const isPublish = this.props.isPublish;
+    const isPublishtype = this.props.isPublishtype;
+    let showdatatypes = isPublish === true || isPublishtype === 1;
 
     if (!this.props.checkBoxValues || this.props.checkBoxValues.length == 0) {
-      this.props.showNotification(`请先选择要立即${showdatatypes? "发布" : "截止"}的作业`)
+      this.props.showNotification(`请先选择要立即${showdatatypes ? "发布" : "截止"}的作业`)
       return;
     }
-    
+
     this.fetchCourseGroups();
-    
-    
+
+
   }
   showDialog = (course_groups) => {
     const isPublish = this.props.isPublish;
-		const isPublishtype = this.props.isPublishtype;
+    const isPublishtype = this.props.isPublishtype;
     const dateFormat = 'YYYY-MM-DD HH:mm';
-    let showdatatype=isPublish===true&&isPublishtype===undefined;
-		let showdatatypes=isPublish===true||isPublishtype===1;
-		// getNextHalfHourOfMoment
+    let showdatatype = isPublish === true && isPublishtype === undefined;
+    let showdatatypes = isPublish === true || isPublishtype === 1;
+    // getNextHalfHourOfMoment
     const startMoment = (moment());
     this.setState({
       modalname: showdatatypes ? "立即发布" : "立即截止",
-      modaltype:course_groups.length> 0 ? 1 : 2,
-      visible:showdatatype?false:true,
-			OneSelftype:showdatatype?true:false,
-      Topval:showdatatypes ? "学生将立即收到作业" : "学生将不能再提交作品",
+      modaltype: course_groups.length > 0 ? 1 : 2,
+      visible: showdatatype ? false : true,
+      OneSelftype: showdatatype ? true : false,
+      Topval: showdatatypes ? "学生将立即收到作业" : "学生将不能再提交作品",
       // Botvalleft: isPublish ? "暂不发布" : "暂不截止",
       Botval: this.props.fromListPage ? (showdatatypes ? "本操作只对“未发布”的作业有效" : "本操作只对“提交中”的作业有效") : '',
-      starttime: showdatatypes? `发布时间：${startMoment.format(dateFormat)}` : '',
-			starttimes:showdatatypes? `${startMoment.format(dateFormat)}` : '',
-      endtime:showdatatypes ? `截止时间：${startMoment.add(1, 'months').add(1, 'hours').minutes(0).format(dateFormat)}` : '',
-      Cancelname:showdatatypes ? "暂不发布" : "暂不截止",
-      Savesname:showdatatypes ? "立即发布" : "立即截止",
-      Cancel:this.homeworkhide,
-      Saves:this.homeworkstartend,
-			typs:showdatatypes ? "start" : "end",
+      starttime: showdatatypes ? `发布时间：${startMoment.format(dateFormat)}` : '',
+      starttimes: showdatatypes ? `${startMoment.format(dateFormat)}` : '',
+      endtime: showdatatypes ? `截止时间：${startMoment.add(1, 'months').add(1, 'hours').minutes(0).format(dateFormat)}` : '',
+      Cancelname: showdatatypes ? "暂不发布" : "暂不截止",
+      Savesname: showdatatypes ? "立即发布" : "立即截止",
+      Cancel: this.homeworkhide,
+      Saves: this.homeworkstartend,
+      typs: showdatatypes ? "start" : "end",
+      immediatelyopen: true,
+      modallate_time: showdatatypes ? this.state.starttimeslate_time : undefined,
     })
   }
-  homeworkhide=()=>{
+  homeworkhide = () => {
     this.setState({
-      modalname:undefined,
-      modaltype:undefined,
-      visible:false,
-			OneSelftype:false,
-      Topval:undefined,
-      Topvalright:undefined,
-      Botvalleft:undefined,
-      Botval:undefined,
-      starttime:undefined,
-      endtime:undefined,
-      Cancelname:undefined,
-      Savesname:undefined,
-      Cancel:undefined,
-      Saves:undefined,
-      StudentList_value:undefined,
-      addname:undefined,
-      addnametype:false,
-      addnametab:undefined
+      modalname: undefined,
+      modaltype: undefined,
+      visible: false,
+      OneSelftype: false,
+      Topval: undefined,
+      Topvalright: undefined,
+      Botvalleft: undefined,
+      Botval: undefined,
+      starttime: undefined,
+      endtime: undefined,
+      Cancelname: undefined,
+      Savesname: undefined,
+      Cancel: undefined,
+      Saves: undefined,
+      StudentList_value: undefined,
+      addname: undefined,
+      addnametype: false,
+      addnametab: undefined,
+      modallate_time: undefined,
+      immediatelyopen: false
     })
   }
 
-  homeworkstartend=(arg_group_ids,endtime)=>{
-    debugger
+  homeworkstartend = (arg_group_ids, endtime) => {
+
     if (this.usingCheckBeforePost && this.props.checkBeforePost) {
       const goOn = this.props.checkBeforePost();
       if (!goOn) {
@@ -104,7 +111,7 @@ class PublishRightnow extends Component{
         return;
       }
     }
-    debugger
+
     const isPublish = this.props.isPublish;
     let group_ids = arg_group_ids
     if (this.usingCheckBeforePost) {
@@ -112,46 +119,46 @@ class PublishRightnow extends Component{
         return item.id
       })
     }
-    debugger
-    if(this.state.course_groups.length>0){
-      if (this.state.course_groups.length && (!group_ids || group_ids&&group_ids.length == 0)) {
+
+    if (this.state.course_groups.length > 0) {
+      if (this.state.course_groups.length && (!group_ids || group_ids && group_ids.length == 0)) {
         this.props.showNotification('请至少选择一个分班');
         return;
       }
     }
 
-		let data={}
-		if(arg_group_ids&&arg_group_ids.length===0){
-			data = {
-				homework_ids: this.props.checkBoxValues,
-				end_time: endtime==="Invalid date"?undefined:endtime,
-			}
-		}else if(this.props.islist===true){
-			data={
-				homework_ids: this.props.checkBoxValues,
-				group_ids: group_ids,
-				end_time:endtime,
-			}
-		}else{
-			data={
-				homework_ids: this.props.checkBoxValues,
-				group_ids: group_ids,
-				group_end_times:endtime,
-				detail:true
-			}
-		}
-		const isPublishtype = this.props.isPublishtype;
-		let showdatatypes=isPublish===true||isPublishtype===1;
-    let coursesId=this.props.match.params.coursesId;
+    let data = {}
+    if (arg_group_ids && arg_group_ids.length === 0) {
+      data = {
+        homework_ids: this.props.checkBoxValues,
+        end_time: endtime === "Invalid date" ? undefined : endtime,
+      }
+    } else if (this.props.islist === true) {
+      data = {
+        homework_ids: this.props.checkBoxValues,
+        group_ids: group_ids,
+        end_time: endtime,
+      }
+    } else {
+      data = {
+        homework_ids: this.props.checkBoxValues,
+        group_ids: group_ids,
+        group_end_times: endtime,
+        detail: true
+      }
+    }
+    const isPublishtype = this.props.isPublishtype;
+    let showdatatypes = isPublish === true || isPublishtype === 1;
+    let coursesId = this.props.match.params.coursesId;
     const url = `/courses/${coursesId}/homework_commons/${showdatatypes ? "publish_homework" : "end_homework"}.json`
     axios.post(url, data)
       .then((response) => {
         if (response.data.status == 0) {
-        	this.homeworkhide()
-          this.props.showNotification(showdatatypes  ? "立即发布成功" : "立即截止成功")
+          this.homeworkhide()
+          this.props.showNotification(showdatatypes ? "立即发布成功" : "立即截止成功")
           this.props.doWhenSuccess && this.props.doWhenSuccess()
-          this.setState({ visible : false })
-					this.props.action && this.props.action()
+          this.setState({ visible: false })
+          this.props.action && this.props.action()
         }
       })
       .catch(function (error) {
@@ -159,47 +166,49 @@ class PublishRightnow extends Component{
       });
   }
   // componentDidUpdate = (prevProps) => {
-	// 	if ( prevProps.match.params.boardId != this.props.match.params.boardId ) {
-	// 		this.fetchAll(null, 1)
-	// 	}
+  // 	if ( prevProps.match.params.boardId != this.props.match.params.boardId ) {
+  // 		this.fetchAll(null, 1)
+  // 	}
   // }
   fetchCourseGroups = () => {
-		const isPublish = this.props.isPublish;
-		const isPublishtype = this.props.isPublishtype;
-		let showdatatypes=isPublish===true||isPublishtype===1;
-    let coursesId=this.props.match.params.coursesId;
+    const isPublish = this.props.isPublish;
+    const isPublishtype = this.props.isPublishtype;
+    let showdatatypes = isPublish === true || isPublishtype === 1;
+    let coursesId = this.props.match.params.coursesId;
     // TODO 这里要改成单选作业，接口使用这个 https://www.showdoc.cc/127895880302646?page_id=2035541497546668
     // /homework_commons/:id/publish_groups.json
     let url = `/courses/${coursesId}/all_course_groups.json`
     if (this.props.checkBoxValues.length == 1) {
       const isPublish = this.props.isPublish;
-      url = `/homework_commons/${this.props.checkBoxValues[0]}/${ showdatatypes ? 'publish_groups' : 'end_groups'}.json`
+      url = `/homework_commons/${this.props.checkBoxValues[0]}/${showdatatypes ? 'publish_groups' : 'end_groups'}.json`
     }
 
     axios.get(url, {
-      })
+    })
       .then((response) => {
         if (!response || response.data.status == -1) {
-          this.setState({ visible : false })
+          this.setState({ visible: false })
           return;
         }
-        this.showDialog(response.data.course_groups)
+
         this.setState({
           course_groups: response.data.course_groups,
-					starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time,
+          starttimesend: response.data.end_time === undefined || response.data.end_time === null || response.data.end_time === "" ? undefined : response.data.end_time,
+          starttimeslate_time: response.data.late_time === undefined || response.data.late_time === null || response.data.late_time === "" ? undefined : response.data.late_time,
         })
+        this.showDialog(response.data.course_groups)
       })
       .catch(function (error) {
         console.log(error);
       });
   }
 
-  render(){
+  render() {
     const isPublish = this.props.isPublish;
-		const isPublishtype = this.props.isPublishtype;
-		let showdatatypes=isPublish===true||isPublishtype===1;
+    const isPublishtype = this.props.isPublishtype;
+    let showdatatypes = isPublish === true || isPublishtype === 1;
 
-    let{
+    let {
       Topvalright,
       modalname,
       modaltype,
@@ -208,20 +217,20 @@ class PublishRightnow extends Component{
       Botvalleft,
       Botval,
       starttime,
-			starttimes,
+      starttimes,
       endtime,
       Cancelname,
       Savesname,
       Cancel,
       Saves,
       course_groups
-    }=this.state
+    } = this.state
 
     const { showActionButton } = this.props
-    return(
+    return (
       <div>
-				{/*立即截止*/}
-				{visible===true?<HomeworkModal
+        {/*立即截止*/}
+        {visible === true ? <HomeworkModal
           modaltype={modaltype}
           modalname={modalname}
           visible={visible}
@@ -230,38 +239,40 @@ class PublishRightnow extends Component{
           Botvalleft={Botvalleft}
           Botval={Botval}
           starttime={starttime}
-					starttimes={starttimes}
+          starttimes={starttimes}
           endtime={endtime}
           Cancelname={Cancelname}
           Savesname={Savesname}
           Cancel={Cancel}
           Saves={Saves}
           course_groups={course_groups}
-          usingCheckBeforePost= {this.usingCheckBeforePost}
+          usingCheckBeforePost={this.usingCheckBeforePost}
           onToPublishClick={this.props.onToPublishClick}
-					typs={this.state.typs}
-        />:""}
-				{/*立即发布*/}
-				{this.state.OneSelftype===true?<OneSelfOrderModal
-					modaltype={this.state.modaltype}
-					modalname={this.state.modalname}
-					OneSelftype={this.state.OneSelftype}
-					Topval={this.state.Topval}
-					Topvalright={this.state.Topvalright}
-					Botvalleft={this.state.Botvalleft}
-					Botval={this.state.Botval}
-					starttime={this.state.starttime}
-					endtime={this.state.endtime}
-					Cancelname={this.state.Cancelname}
-					Savesname={this.state.Savesname}
-					Cancel={this.state.Cancel}
-					Saves={this.state.Saves}
-					course_groups={this.state.course_groups}
-					starttimes={this.state.starttimes}
-					starttimesend={this.state.starttimesend}
-					typs={this.state.typs}
-				/>:""}
-        { showActionButton && <a href="javascript:void(0)" className="color-grey-9" onClick={this.homeworkstart}>{ showdatatypes   ? "立即发布" : "立即截止" }</a> }
+          typs={this.state.typs}
+        /> : ""}
+        {/*立即发布*/}
+        {this.state.OneSelftype === true ? <OneSelfOrderModal
+          modaltype={this.state.modaltype}
+          modalname={this.state.modalname}
+          OneSelftype={this.state.OneSelftype}
+          Topval={this.state.Topval}
+          Topvalright={this.state.Topvalright}
+          Botvalleft={this.state.Botvalleft}
+          Botval={this.state.Botval}
+          starttime={this.state.starttime}
+          endtime={this.state.endtime}
+          Cancelname={this.state.Cancelname}
+          Savesname={this.state.Savesname}
+          Cancel={this.state.Cancel}
+          Saves={this.state.Saves}
+          course_groups={this.state.course_groups}
+          starttimes={this.state.starttimes}
+          starttimesend={this.state.starttimesend}
+          typs={this.state.typs}
+          immediatelyopen={this.state.immediatelyopen}
+          modallate_time={this.state.starttimeslate_time}
+        /> : ""}
+        {showActionButton && <a className="color-grey-9" onClick={this.homeworkstart}>{showdatatypes ? "立即发布" : "立即截止"}</a>}
       </div>
     )
   }
diff --git a/src/modules/courses/busyWork/UseBank.js b/src/modules/courses/busyWork/UseBank.js
index 6c98695b..bfa9b352 100644
--- a/src/modules/courses/busyWork/UseBank.js
+++ b/src/modules/courses/busyWork/UseBank.js
@@ -130,9 +130,9 @@ class UseBank extends Component{
     })
   }
   onSave = () => {
-    debugger
+
     const { checkBoxValues } = this.state;
-    const { object_type } = this.props
+    const { object_type,category_id } = this.props
     if(checkBoxValues.length==0){
       this.setState({
         isChecked:"请先选择"+engNameMap[object_type]
@@ -149,7 +149,8 @@ class UseBank extends Component{
 			, {
         "object_type": object_type,
         "bank_id": checkBoxValues,
-        "course_id": courseId
+        "course_id": courseId,
+        "category":category_id
       }
     )
     .then((response) => {
diff --git a/src/modules/courses/busyWork/common.js b/src/modules/courses/busyWork/common.js
index f8327adc..e2df5ef4 100644
--- a/src/modules/courses/busyWork/common.js
+++ b/src/modules/courses/busyWork/common.js
@@ -31,7 +31,7 @@ export function RouteHOC(options = {}) {
       // common_homework   group_homework
       // 是否是分组作业
       isGroup = () => {
-        return window.location.pathname.indexOf('group_homeworks') != -1
+        return window.location.pathname.indexOf('group_homeworks') != -1||window.location.pathname.indexOf('group_homework') != -1
       }
       getModuleName = (isChinese) => {
         const isGroup = this.isGroup()
@@ -39,8 +39,29 @@ export function RouteHOC(options = {}) {
           let chName = isGroup ? '分组作业' : '普通作业'
           return chName;
         }
-        const secondName = isGroup ? 'group_homeworks' : 'common_homeworks'
-        return secondName;
+
+        if(window.location.pathname.indexOf('group_homeworks') != -1){
+          const secondName ='group_homeworks';
+          return secondName;
+        }
+
+
+        if(window.location.pathname.indexOf('group_homework') != -1){
+          const secondName ='group_homework';
+          return secondName;
+        }
+
+        if(window.location.pathname.indexOf('common_homeworks') != -1){
+          const secondName ='common_homeworks';
+          return secondName;
+        }
+
+        if(window.location.pathname.indexOf('common_homework') != -1){
+          const secondName ='common_homework';
+          return secondName;
+        }
+
+
       }
       getModuleType = () => {
         const isGroup = this.isGroup()
@@ -51,9 +72,9 @@ export function RouteHOC(options = {}) {
           const topicId = _courseId.topicId
           const workId = _courseId.workId
           const courseId = _courseId.coursesId
-          this.props.history.push(`/courses/${courseId}/boards/${workId}/messages/${topicId}`)
+          this.props.history.push(`/classrooms/${courseId}/boards/${workId}/messages/${topicId}`)
         } else {
-          this.props.history.push(`/courses/${_courseId}/boards/${workId}/messages/${topicId}`)
+          this.props.history.push(`/classrooms/${_courseId}/boards/${workId}/messages/${topicId}`)
         }
 
 			}
@@ -62,47 +83,66 @@ export function RouteHOC(options = {}) {
         if (typeof _courseId == "object") {
           const workId = _courseId.workId
           const courseId = _courseId.coursesId
-          this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}/edit`)
+          this.props.history.push(`/classrooms/${courseId}/${secondName}/${_workId || workId}/edit`)
         } else {
-          this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/edit`)
+          this.props.history.push(`/classrooms/${_courseId}/${secondName}/${_workId}/edit`)
         }
       }
       toWorkDetailPage = (_courseId, _workId, _studentWorkId) => {
-        const secondName = this.getModuleName()
+        let secondName;
+        //= this.getModuleName()
+        if(window.location.pathname.indexOf('group_homeworks') != -1||window.location.pathname.indexOf('group_homework') != -1){
+          secondName ='group_homeworks';
+        }
+
+        if(window.location.pathname.indexOf('common_homeworks') != -1||window.location.pathname.indexOf('common_homework') != -1){
+          secondName ='common_homeworks';
+        }
         if (typeof _courseId == "object") {
           const workId = _courseId.workId
           const courseId = _courseId.coursesId
           const studentWorkId = _courseId.studentWorkId
-					window.open(`/courses/${courseId}/${secondName}/${_workId || workId}/${_studentWorkId || studentWorkId}/appraise`);
+					window.open(`/classrooms/${courseId}/${secondName}/${_workId || workId}/${_studentWorkId || studentWorkId}/appraise`);
         } else {
-					window.open(`/courses/${_courseId}/${secondName}/${_workId}/${_studentWorkId}/appraise`);
+					window.open(`/classrooms/${_courseId}/${secondName}/${_workId}/${_studentWorkId}/appraise`);
         }
       }
 			toWorkDetailPage2 = (e, _courseId, _workId, _studentWorkId) => {
 				console.log("鼠标中键点击了")
 				console.log(_studentWorkId)
-				const secondName = this.getModuleName()
-				if (typeof _courseId == "object") {
+				let secondName;
+          //= this.getModuleName()
+        if(window.location.pathname.indexOf('group_homeworks') != -1||window.location.pathname.indexOf('group_homework') != -1){
+            secondName ='group_homeworks';
+        }
+
+        if(window.location.pathname.indexOf('common_homeworks') != -1||window.location.pathname.indexOf('common_homework') != -1){
+           secondName ='common_homeworks';
+        }
+
+        if (typeof _courseId == "object") {
 					const workId = _courseId.workId
 					const courseId = _courseId.coursesId
 					const studentWorkId = _courseId.studentWorkId
-					window.open(`/courses/${courseId}/${secondName}/${_workId || workId}/${_studentWorkId || studentWorkId}/appraise`);
+					window.open(`/classrooms/${courseId}/${secondName}/${_workId || workId}/${_studentWorkId || studentWorkId}/appraise`);
 				} else {
-					window.open(`/courses/${_courseId}/${secondName}/${_workId}/${_studentWorkId}/appraise`);
+					window.open(`/classrooms/${_courseId}/${secondName}/${_workId}/${_studentWorkId}/appraise`);
 				}
 			}
       toNewPage = (courseId) => {
         const secondName = this.getModuleName()
-        this.props.history.push(`/courses/${courseId.coursesId}/${secondName}/${courseId.category_id}/new`)
+        this.props.history.push(`/classrooms/${courseId.coursesId}/${secondName}/${courseId.category_id}/new`)
       }
-      toListPage = (_courseId, _workId) => {
-        const secondName = this.getModuleName()
+      toListPage = (_courseId, _workId,_subName) => {
+        // _subName仅分组和普通作业会传值，因为category_id是主目录还是子目录需要根据接口传的category.main判断
+        const secondName = this.getModuleName();
+
         if (typeof _courseId == "object") {
           const workId = _courseId.workId
           const courseId = _courseId.coursesId
-          this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}`)
+          this.props.history.push(`/classrooms/${courseId}/${_subName || secondName}/${_workId || workId}`)
         } else {
-          this.props.history.push(`/courses/${_courseId}/${secondName}${_workId ? '/' + _workId : ''}`)
+          this.props.history.push(`/classrooms/${_courseId}/${_subName || secondName}${_workId ? '/' + _workId : ''}`)
         }
       }
 
@@ -113,9 +153,9 @@ export function RouteHOC(options = {}) {
           const workId = _courseId.workId
           const courseId = _courseId.coursesId
           const studentWorkId = _courseId.studentWorkId
-          this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}/${isEdit? `${_studentWorkId || studentWorkId}/post_edit` : 'post'}`)
+          this.props.history.push(`/classrooms/${courseId}/${secondName}/${_workId || workId}/${isEdit? `${_studentWorkId || studentWorkId}/post_edit` : 'post'}`)
         } else {
-          this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/${isEdit? `${_studentWorkId}/post_edit` : 'post'}`)
+          this.props.history.push(`/classrooms/${_courseId}/${secondName}/${_workId}/${isEdit? `${_studentWorkId}/post_edit` : 'post'}`)
         }
       }
       toWorkListPage = (_courseId, _workId) => {
@@ -123,9 +163,9 @@ export function RouteHOC(options = {}) {
         if (typeof _courseId == "object") {
           const workId = _courseId.workId
           const courseId = _courseId.coursesId
-          this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}/list`)
+          this.props.history.push(`/classrooms/${courseId}/${secondName}/${_workId || workId}/list`)
         } else {
-          this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/list`)
+          this.props.history.push(`/classrooms/${_courseId}/${secondName}/${_workId}/list`)
         }
       }
       toWorkAnswerPage = (_courseId, _workId) => {
@@ -133,9 +173,9 @@ export function RouteHOC(options = {}) {
         if (typeof _courseId == "object") {
           const workId = _courseId.workId
           const courseId = _courseId.coursesId
-          this.props.history.push(`/courses/${courseId}/${secondName}/${workId}/answer`)
+          this.props.history.push(`/classrooms/${courseId}/${secondName}/${workId}/answer`)
         } else {
-          this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/answer`)
+          this.props.history.push(`/classrooms/${_courseId}/${secondName}/${_workId}/answer`)
         }
       }
 
@@ -144,9 +184,9 @@ export function RouteHOC(options = {}) {
         if (typeof _courseId == "object") {
           const workId = _workId || _courseId.workId
           const courseId = _courseId.coursesId
-          this.props.history.push(`/courses/${courseId}/${secondName}/${workId}/question`)
+          this.props.history.push(`/classrooms/${courseId}/${secondName}/${workId}/question`)
         } else {
-          this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/question`)
+          this.props.history.push(`/classrooms/${_courseId}/${secondName}/${_workId}/question`)
         }
       }
 
@@ -155,9 +195,9 @@ export function RouteHOC(options = {}) {
         if (typeof _courseId == "object") {
           const workId = _courseId.workId
           const courseId = _courseId.coursesId
-          this.props.history.push(`/courses/${courseId}/${secondName}/${_workId || workId}/setting`)
+          this.props.history.push(`/classrooms/${courseId}/${secondName}/${_workId || workId}/setting`)
         } else {
-          this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/setting`)
+          this.props.history.push(`/classrooms/${_courseId}/${secondName}/${_workId}/setting`)
         }
       }
 
diff --git a/src/modules/courses/busyWork/common/WorkDetailPageHeader.js b/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
index b584216f..995c09a0 100644
--- a/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
+++ b/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
@@ -91,18 +91,18 @@ class WorkDetailPageHeader extends Component{
               `}</style>
               <CBreadcrumb items={[
                 { to: current_user&&current_user.first_category_url, name: course_name},
-                { to: `/courses/${courseId}/${moduleEngName}/${category_id}`, name: category_name },
-                window.location.pathname.indexOf('appraise') == -1 ? { } : { to: `/courses/${courseId}/${moduleEngName}/${workId}/list`, name: '作业详情' },
+                { to: `/classrooms/${courseId}/${moduleEngName}/${category_id}`, name: category_name },
+                window.location.pathname.indexOf('appraise') == -1 ? { } : { to: `/classrooms/${courseId}/${moduleEngName}/${workId}/list`, name: '作业详情' },
                 // 1.	与上一条联动，当匿评他人作品时，TA人作品的作者真实姓名切换为“匿名”
                 window.location.pathname.indexOf('appraise') == -1 ? { name: '作业详情' } : { name: author_name },
-                // window.location.pathname.indexOf('appraise') == -1 ? { } : { to: `/courses/${courseId}/${moduleEngName}/${workId}/list`, name: '作品列表' },
+                // window.location.pathname.indexOf('appraise') == -1 ? { } : { to: `/classrooms/${courseId}/${moduleEngName}/${workId}/list`, name: '作品列表' },
                 // { name: childModuleName }
               ]}></CBreadcrumb>
 
               <div className="clearfix mt20 mb20" >
                 <span className=" fl color-black summaryname">
                    {homework_name}
-                  {/* <Link to={"/courses/"+courseId+"/graduation"+"/graduation_tasks/"}>{homework_name}</Link> */}
+                  {/* <Link to={"/classrooms/"+courseId+"/graduation"+"/graduation_tasks/"}>{homework_name}</Link> */}
                 </span>
                 <CoursesListType
                   typelist={homework_status}
@@ -137,18 +137,18 @@ class WorkDetailPageHeader extends Component{
                 <div className="mt10 clearfix edu-back-white poll_list pl5">
                   <Link
                         className={`${childModuleName == '作品列表' ? 'active' : '' } `}
-                        to={`/courses/${courseId}/${moduleEngName}/${workId}/list`}>作品列表</Link>
+                        to={`/classrooms/${courseId}/${moduleEngName}/${workId}/list`}>作品列表</Link>
                   <Link
                         className={`${childModuleName == '作业描述' ? 'active' : '' } `}
-                        to={`/courses/${courseId}/${moduleEngName}/${workId}/question`}>作业描述</Link>
+                        to={`/classrooms/${courseId}/${moduleEngName}/${workId}/question`}>作业描述</Link>
                   {view_answer == true && <Link
                         className={`${childModuleName == '参考答案' ? 'active' : '' } `}
-                        to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>}
+                        to={`/classrooms/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>}
 
                   <Link
                         className={`${childModuleName == '设置' ? 'active' : '' } `}
                         style={{paddingLeft:this.props.isAdmin()?'38px':'20px'}}
-                        to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link>
+                        to={`/classrooms/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link>
 
 
                   { this.props.tabRightComponents }
diff --git a/src/modules/courses/busyWork/commonWork.js b/src/modules/courses/busyWork/commonWork.js
index 8ba6303f..ccdca672 100644
--- a/src/modules/courses/busyWork/commonWork.js
+++ b/src/modules/courses/busyWork/commonWork.js
@@ -1,12 +1,12 @@
-import React,{ Component } from "react";
-import { Input,Checkbox,Menu,Pagination,Spin} from "antd";
+import React, { Component } from "react";
+import { Input, Checkbox, Menu, Pagination, Spin } from "antd";
 import UseBank from './UseBank'
 import '../css/members.css'
 import '../css/busyWork.css'
 import CommonWorkItem from './CommonWorkItem'
 import PublishRightnow from './PublishRightnow'
 import ConnectProject from './ConnectProject'
-import { WordsBtn, on, off } from 'educoder'
+import { WordsBtn, on, off, trigger } from 'educoder'
 import Modals from '../../modals/Modals'
 import NoneData from "../coursesPublic/NoneData"
 import Titlesearchsection from '../common/titleSearch/TitleSearchSection';
@@ -18,74 +18,109 @@ import _ from 'lodash'
 // const map={1:"普通作业",2:"",3:"分组作业"}
 // const COMMON_WORK = 1
 // const COMMON_WORK = 2
-class commonWork extends Component{
-  constructor(props){
+class commonWork extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      modalsType:"",
-      modalsTopval:"",
-      modalsBottomval:"",
-      modalCancel:"",
-      mainList:undefined,
+    this.state = {
+      modalsType: "",
+      modalsTopval: "",
+      modalsBottomval: "",
+      modalCancel: "",
+      mainList: undefined,
       selectedKeys: 'all',
-      order:"",
-      page:1,
-      search:"",
-      totalCount:0,
-      checkAll:false,
-      checkBoxValues:[],
-      isSpin:false
+      order: "",
+      page: 1,
+      search: "",
+      totalCount: 0,
+      checkAll: false,
+      checkBoxValues: [],
+      isSpin: false,
+      category_id: undefined,
+      course_module: []
     }
   }
   //输入搜索条件
-  inputStudent=(e)=>{
+  inputStudent = (e) => {
     this.setState({
-      search:e.target.value,
+      search: e.target.value,
     })
   }
   //搜索查询
-  searchStudent=()=>{
-    let {page,search,order}=this.state;
-    this.getList(1,search,order);
+  searchStudent = () => {
+    let { category_id, search, order } = this.state;
+    this.getList(1, search, order, category_id);
   }
   openConnectionProject = (work) => {
     this.refs['connectProject'].openConnectionProject(work)
   }
 
   // 新建
-  createCommonWork=(type)=>{
-    this.props.toNewPage(this.props.match.params) 
+  createCommonWork = (type) => {
+    this.props.toNewPage(this.props.match.params)
   }
 
-  cancelDelClasses=()=>{
+  cancelDelClasses = () => {
     this.setState({
-      modalsType:false,
-      modalsTopval:"",
-      modalsBottomval:"",
-      modalCancel:false
+      modalsType: false,
+      modalsTopval: "",
+      modalsBottomval: "",
+      modalCancel: false
     })
   }
-  sureDelClasses(){
+  sureDelClasses() {
 
   }
   componentDidUpdate(prevProps, prevState) {
-    if (prevProps.match.path != this.props.match.path) {
-      this.clearSelection()
-      this.setState({ selectedKeys: 'all', order: '' }, () => {
-        this._getList()
+
+    if (prevProps.coursesidtype != this.props.coursesidtype || prevProps.match.params.category_id != this.props.match.params.category_id) {
+      this.setState({
+        page: 1
       })
+      if (this.props.match.path === "/classrooms/:coursesId/common_homeworks/:category_id" || this.props.match.path === "/classrooms/:coursesId/common_homework/:category_id" ||
+        this.props.match.path === "/classrooms/:coursesId/group_homeworks/:category_id" || this.props.match.path === "/classrooms/:coursesId/group_homework/:category_id"
+      ) {
+
+        if (this.props.coursesidtype === "node" && this.props.match.path === "/classrooms/:coursesId/common_homeworks/:category_id" ||
+          this.props.coursesidtype === "node" && this.props.match.path === "/classrooms/:coursesId/group_homeworks/:category_id"
+        ) {
+
+          this.clearSelection()
+          this.setState({ selectedKeys: 'all', order: '' }, () => {
+            this._getList()
+          })
+        }
+
+        if (this.props.coursesidtype === "child" && this.props.match.path === "/classrooms/:coursesId/common_homework/:category_id" ||
+          this.props.coursesidtype === "child" && this.props.match.path === "/classrooms/:coursesId/group_homework/:category_id"
+        ) {
+
+          this.clearSelection()
+          this.setState({ selectedKeys: 'all', order: '' }, () => {
+            this._getList(this.props.match.params.category_id)
+          })
+        }
+      }
+
     }
+
   }
-  
-  _getList = () => {
+
+  _getList = (id) => {
     this.setState({
-      isSpin:true
+      isSpin: true,
+      category_id: id
     })
-    let {page,search,order}=this.state;
-    this.getList(page,search,order);
+    let { page, search, order } = this.state;
+    this.getList(page, search, order, id);
   }
-  componentDidMount(){
-    this._getList()
+  componentDidMount() {
+
+    if (this.props.match.path === "/classrooms/:coursesId/common_homeworks/:category_id" || this.props.match.path === "/classrooms/:coursesId/group_homeworks/:category_id") {
+      this._getList()
+    }
+    if (this.props.match.path === "/classrooms/:coursesId/common_homework/:category_id" || this.props.match.path === "/classrooms/:coursesId/group_homework/:category_id") {
+      this._getList(this.props.match.params.category_id)
+    }
 
     on('updateNavSuccess', this.updateNavSuccess)
   }
@@ -93,81 +128,126 @@ class commonWork extends Component{
     off('updateNavSuccess', this.updateNavSuccess)
   }
   updateNavSuccess = () => {
-    this._getList()
+    if (this.props.match.path === "/classrooms/:coursesId/common_homeworks/:category_id" || this.props.match.path === "/classrooms/:coursesId/group_homeworks/:category_id") {
+      this._getList()
+    }
+    if (this.props.match.path === "/classrooms/:coursesId/common_homework/:category_id" || this.props.match.path === "/classrooms/:coursesId/group_homework/:category_id") {
+      this._getList(this.props.match.params.category_id)
+    }
   }
-  
+
   useBankSuccess = (checkBoxValues, newWorkIdArray) => {
     this.setState({
-      page:1,
+      page: 1,
       checkBoxValues: newWorkIdArray
     }, () => {
       this.refs['publishModalRef'].open()
     })
-    
-    let {search, order}=this.state;
-    this.getList(1, search, order);
+
+    let { search, order, category_id } = this.state;
+    this.getList(1, search, order, category_id);
   }
 
-  getList=(page,search,order)=>{
+  getList = (page, search, order, category_id) => {
+
     this.setState({
-      isSpin:true
+      isSpin: true
     })
-    let id=this.props.match.params.coursesId;
+    let id = this.props.match.params.coursesId;
     let workType = this.props.getModuleType()
-    let url="/courses/"+id+"/homework_commons.json?type="+workType+"&page="+page;
-    if(order!=""){
-      url+="&order="+order;
+    let url = "/courses/" + id + "/homework_commons.json?type=" + workType + "&page=" + page;
+    if (order != "") {
+      url += "&order=" + order;
     }
-    if(search!=""){
-      url+="&search="+search;
+    if (search != "") {
+      url += "&search=" + search;
     }
-    axios.get(encodeURI(url)).then((result)=>{
-      if(result.status==200){
+    if (category_id) {
+      url += "&category=" + category_id;
+    }
+    axios.get(encodeURI(url)).then((result) => {
+      if (result.status == 200) {
         this.setState({
-          mainList:result.data,
-          totalCount:result.data.task_count,
-          isSpin:false,
-          page:page,
+          mainList: result.data,
+          totalCount: result.data.task_count,
+          isSpin: false,
+          page: page,
           ...result.data
         })
+        this.getdatas(result.data.main_category_id)
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       this.setState({
-        isSpin:false
+        isSpin: false
+      })
+    })
+  }
+  getdatas = (main_category_id) => {
+    let newcourse_module = []
+
+    let urls = `/course_modules/${main_category_id}.json`
+    axios.get(encodeURI(urls)).then((result) => {
+      if (result.status == 200) {
+
+        newcourse_module.push({ name: result.data.course_module.module_name, id: result.data.course_module.id })
+        if (result.data.course_module.course_second_categories.length > 0) {
+
+          result.data.course_module.course_second_categories.map((item, key) => {
+            newcourse_module.push(item)
+          })
+        }
+
+        this.setState({
+          course_module: newcourse_module
+        })
+      }
+    }).catch((error) => {
+      this.setState({
+        isSpin: false
       })
     })
   }
   //筛选条件
-  selectedStatus=(e)=>{
+  selectedStatus = (e) => {
     this.clearSelection()
     this.setState({
-      order:e.key==="all"?"":e.key,
+      order: e.key === "all" ? "" : e.key,
       selectedKeys: e.key,
-      page:1,
-      isSpin:true,
-      checkBoxValues:[],
-      checkAll:false
+      page: 1,
+      isSpin: true,
+      checkBoxValues: [],
+      checkAll: false
     })
-    let {search}=this.state;
-    this.getList(1,search,e.key==="all"?"":e.key);
+    let { search, category_id } = this.state;
+    this.getList(1, search, e.key === "all" ? "" : e.key, category_id);
   }
 
-  onPageChange=(pageNumber)=>{
-    this.setState({
-      page:pageNumber,
-			checkBoxValues:[]
-    })
-    let {search,order}=this.state;
-    this.getList(pageNumber,search,order);
+  onPageChange = (pageNumber) => {
+    let { search, order, category_id, checkAll } = this.state;
+
+    if (checkAll === true) {
+      this.setState({
+        page: pageNumber,
+        checkBoxValues: [],
+        checkAll: false
+      })
+    } else {
+      this.setState({
+        page: pageNumber,
+        checkBoxValues: []
+      })
+    }
+
+    this.getList(pageNumber, search, order, category_id);
   }
 
   // 全选和反选
-  changeAll=(e)=>{
+  changeAll = (e) => {
     this.setState({
       checkAll: e.target.checked
     })
 
-    const valueId=this.state.mainList.homeworks.map(item=>{
+    const valueId = this.state.mainList.homeworks.map(item => {
       return item.homework_id
     })
     if (e.target.checked) {
@@ -183,7 +263,7 @@ class commonWork extends Component{
     }
   }
 
-  onChangeSelect=(checkedValues)=>{
+  onChangeSelect = (checkedValues) => {
     this.setState({
       checkBoxValues: checkedValues,
       checkAll: checkedValues.length == this.state.mainList.homeworks.length
@@ -191,7 +271,7 @@ class commonWork extends Component{
   }
 
   onWorkDelete = () => {
-    const { checkBoxValues } = this.state;
+    const { checkBoxValues, category_id } = this.state;
     const len = checkBoxValues.length;
     if (len == 0) {
       this.props.showNotification('请先选择要删除的作业')
@@ -204,18 +284,19 @@ class commonWork extends Component{
         <div>是否确认删除?</div>
       </div>,
       onOk: () => {
-        let coursesId=this.props.match.params.coursesId;
+        let coursesId = this.props.match.params.coursesId;
         const url = `/courses/${coursesId}/homework_commons/multi_destroy.json`
         axios.post(url, {
           homework_ids: checkBoxValues,
           all_check: 0,
+          // category:category_id
           // group_ids
         }).then((response) => {
-          if (response.data.status == 0) { 
+          if (response.data.status == 0) {
             this.props.showNotification('删除成功')
             this.clearSelection()
-            let {search,order}=this.state;
-            this.getList(1,search,order);
+            let { search, order } = this.state;
+            this.getList(1, search, order, category_id);
             this.props.updataleftNavfun()
           }
 
@@ -224,14 +305,14 @@ class commonWork extends Component{
         })
       }
     })
-    
+
   }
   clearSelection = () => {
     this.setState({ checkBoxValues: [], checkAll: false })
   }
-  // 
+  //
   onSetPublic = () => {
-    const { checkBoxValues } = this.state;
+    const { checkBoxValues, category_id } = this.state;
     const len = checkBoxValues.length;
     if (len == 0) {
       this.props.showNotification('请先选择要公开的作业')
@@ -243,16 +324,16 @@ class commonWork extends Component{
         <div>是否确认设为公开？</div>
       </div>,
       onOk: () => {
-        let coursesId=this.props.match.params.coursesId;
+        let coursesId = this.props.match.params.coursesId;
         const url = `/courses/${coursesId}/homework_commons/set_public.json`
         axios.post(url, {
           homework_ids: checkBoxValues,
           all_check: 0
         }).then((response) => {
-          if (response.data.status == 0) { 
+          if (response.data.status == 0) {
             this.props.showNotification('设为公开操作成功')
-            let {search,order, page}=this.state;
-            this.getList(page,search,order);
+            let { search, order, page } = this.state;
+            this.getList(page, search, order, category_id);
           }
 
         }).catch((error) => {
@@ -262,24 +343,24 @@ class commonWork extends Component{
     })
   }
   doWhenSuccess = () => {
-    let {search,order, page}=this.state;
-    this.getList(page,search,order);
+    let { search, order, page, category_id } = this.state;
+    this.getList(page, search, order, category_id);
     this.setState({
-			checkBoxValues:[]
-		})
+      checkBoxValues: []
+    })
   }
   onItemClick = (item) => {
     const checkBoxValues = this.state.checkBoxValues.slice(0);
     const index = checkBoxValues.indexOf(item.id);
     if (index != -1) {
-      _.remove(checkBoxValues, (listItem)=> listItem === item.id)
+      _.remove(checkBoxValues, (listItem) => listItem === item.id)
     } else {
       checkBoxValues.push(item.id)
     }
     this.onChangeSelect(checkBoxValues)
   }
   addToBank = () => {
-    const { checkBoxValues } = this.state;
+    const { checkBoxValues, category_id } = this.state;
     const len = checkBoxValues.length;
     if (len == 0) {
       this.props.showNotification('请先选择要加入题库的作业')
@@ -291,10 +372,10 @@ class commonWork extends Component{
       homework_ids: checkBoxValues,
       all_check: 0
     }).then((response) => {
-      if (response.data.status == 0) { 
+      if (response.data.status == 0) {
         this.props.showNotification('加入成功')
-        let {search,order}=this.state;
-        this.getList(1,search,order);
+        let { search, order } = this.state;
+        this.getList(1, search, order, category_id);
       }
 
     }).catch((error) => {
@@ -302,28 +383,71 @@ class commonWork extends Component{
     })
   }
   connectSuccess = () => {
-    let {page,search,order}=this.state;
-    this.getList(page,search,order);
+    let { page, search, order, category_id } = this.state;
+    this.getList(page, search, order, category_id);
   }
 
   cancelConnectionProject = (work) => {
-    let workId=this.props.match.params.workId;
-    let courseId=this.props.match.params.coursesId;
-
+    let workId = this.props.match.params.workId;
+    let courseId = this.props.match.params.coursesId;
+    let { page, search, order, category_id } = this.state;
     const url = `/homework_commons/${work.homework_id}/student_works/cancel_relate_project.json`
-    axios.get(url).then((response)=> {
+    axios.get(url).then((response) => {
       if (response.data.status == 0) {
-        let {page,search,order}=this.state;
-        this.getList(page,search,order);
+
+        this.getList(page, search, order, category_id);
         this.props.showNotification('取消关联成功')
       }
-     }).catch((error)=>{
-       console.log(error)
-     })
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+  addDir = (id) => {
+
+    if (!id) {
+      trigger('addcommon_homeworks', parseInt(this.props.match.params.category_id))
+    } else {
+      let data = { id: parseInt(id), name: this.state.category_name }
+      trigger('editcommon_homeworks', data)
+    }
+
   }
 
-  
-  render(){
+  newaddDir = () => {
+    trigger('addcommon_homeworks', parseInt(this.state.main_category_id))
+  }
+  moveTo = (item) => {
+    const len = this.state.checkBoxValues.length
+    if (len == 0) {
+      this.props.showNotification('请先在列表中选择要移动的作业')
+      return;
+    }
+    const checkBoxValues = this.state.checkBoxValues;
+    const coursesId = this.props.match.params.coursesId;
+    const category_id = this.state.category_id;
+    const url = `/courses/${coursesId}/homework_commons/move_to_category.json`
+    axios.post(url, {
+      homework_ids: checkBoxValues,
+      new_category_id: item.id,
+      category_id: !category_id ? undefined : category_id
+    })
+      .then((response) => {
+        if (response.data.status == 0) {
+          console.log('--- 成功')
+          this.props.showNotification('作业移动成功')
+          this.props.updataleftNavfun()
+          this.setState({
+            checkBoxValues: []
+          })
+          this.updateNavSuccess()
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+  }
+
+  render() {
     let {
       search,
       page,
@@ -334,12 +458,14 @@ class commonWork extends Component{
       totalCount,
       checkAll,
       checkBoxValues,
-
+      course_module,
       task_count,
       published_count,
       unpublished_count,
       main_category_name,
-    }=this.state;
+      category_name,
+      category_id
+    } = this.state;
     const { coursedata } = this.props;
     if (!coursedata) {
       return ''
@@ -350,16 +476,15 @@ class commonWork extends Component{
 
     const isGroup = this.props.isGroup()
     const isAdmin = this.props.isAdmin()
+    const bid = this.props.match.params.category_id
+
+    return (
 
-    // <CourseLayoutcomponent {...this.props}>
-    // </CourseLayoutcomponent>
-    return(
-      
       <div>
         {/* <div className="edu-back-white">
           <p className="clearfix padding30 bor-bottom-greyE">
             <span className="font-18 fl color-dark-21">{moduleChineseName}</span>
-            
+
           </p>
           <div className="clearfix pl30 pr30">
             <div className="fl mt6 task_menu_ul">
@@ -374,7 +499,7 @@ class commonWork extends Component{
               </Menu>
             </div>
             <div className="fr mt16 mb16 searchView">
-              <Search 
+              <Search
               value={search}
               placeholder="请输入姓名进行搜索"
               onInput={this.inputStudent}
@@ -387,72 +512,99 @@ class commonWork extends Component{
 
 
         <Titlesearchsection
-            title={main_category_name}
-            searchValue={ search }
-            // searchtype={this.props.isAdmin||this.props.isStudent ?true:false}
-            onInputSearchChange={this.inputStudent}
-            onPressEnter={this.searchStudent}
-            allowClearonChange={this.inputStudent}
-            firstRowRight={
-              <React.Fragment>
-                { isAdmin && <WordsBtn style="blue" className="fr" onClick={()=>this.createCommonWork(1)}>新建</WordsBtn>}
-                { isAdmin && <li className="fr">
-                  <UseBank {...this.props} {...this.state} object_type={isGroup ? "group" : "normal"} useBankSuccess={this.useBankSuccess}></UseBank>
-                </li> }
-              </React.Fragment>
-            }
-            secondRowBotton={
-              <div className="fl mt6 task_menu_ul">
-                <Menu mode="horizontal" selectedKeys={this.state.selectedKeys} onClick={this.selectedStatus}>
-                  <Menu.Item key="all">全部</Menu.Item>
-                  {isAdmin && <Menu.Item key="0">未发布</Menu.Item>}
-                  <Menu.Item key="1">提交中</Menu.Item>
-                  <Menu.Item key="2">补交中</Menu.Item>
-                  <Menu.Item key="3">匿评中</Menu.Item>
-                  <Menu.Item key="4">申诉中</Menu.Item>
-                  <Menu.Item key="5">已截止</Menu.Item>
-                </Menu>
-              </div>
-            }
-            secondRowLeft={
-              <div style={{"display":"inline-block", "marginTop": "22px"}}>
-                <span>共 {mainList&&mainList.all_count} 个{moduleChineseName}</span>
-                <span style={{"marginLeft":"16px"}}>已发布：{published_count}个</span>
-                {/* {this.props.isAdmin()?:""} */}
-                <span style={{"marginLeft":"16px"}}>未发布：{unpublished_count}个</span>
-              </div>
-            }
-            searchPlaceholder={"请输入名称进行搜索"}
-            showSearchInput={true}
+          title={!category_id ? main_category_name : category_name}
+          searchValue={search}
+          // searchtype={this.props.isAdmin||this.props.isStudent ?true:false}
+          onInputSearchChange={this.inputStudent}
+          onPressEnter={this.searchStudent}
+          allowClearonChange={this.inputStudent}
+          firstRowRight={
+            <React.Fragment>
+              {isAdmin && <WordsBtn style="blue" className="fr" onClick={() => this.createCommonWork(1)}>新建</WordsBtn>}
+              {isAdmin && <li className="fr">
+                <UseBank {...this.props} {...this.state} object_type={isGroup ? "group" : "normal"} useBankSuccess={this.useBankSuccess}></UseBank>
+              </li>}
+              {isAdmin && <li className="fr mr30">
+                <WordsBtn style="blue" className="fr" onClick={() => this.addDir(category_id)}>{!category_id ? "新建目录" : "目录重命名"}</WordsBtn>
+              </li>}
+            </React.Fragment>
+          }
+          secondRowBotton={
+            <div className="fl mt6 task_menu_ul">
+              <Menu mode="horizontal" selectedKeys={this.state.selectedKeys} onClick={this.selectedStatus}>
+                <Menu.Item key="all">全部</Menu.Item>
+                {isAdmin && <Menu.Item key="0">未发布</Menu.Item>}
+                <Menu.Item key="1">提交中</Menu.Item>
+                <Menu.Item key="2">补交中</Menu.Item>
+                <Menu.Item key="3">匿评中</Menu.Item>
+                <Menu.Item key="4">申诉中</Menu.Item>
+                <Menu.Item key="5">已截止</Menu.Item>
+              </Menu>
+            </div>
+          }
+          secondRowLeft={
+            <div style={{ "display": "inline-block", "marginTop": "22px" }}>
+              <span>共 {mainList && mainList.all_count} 个{moduleChineseName}</span>
+              <span style={{ "marginLeft": "16px" }}>已发布：{published_count}个</span>
+              {/* {this.props.isAdmin()?:""} */}
+              <span style={{ "marginLeft": "16px" }}>未发布：{unpublished_count}个</span>
+            </div>
+          }
+          searchPlaceholder={"请输入名称进行搜索"}
+          showSearchInput={true}
         ></Titlesearchsection>
-        <PublishRightnow ref="publishModalRef" showActionButton={true} {...this.props} checkBoxValues={checkBoxValues} 
-                showActionButton={false}
-                isPublish={true}
-						    islist={true}
-						    isPublishtype={1}
-								doWhenSuccess={this.doWhenSuccess} fromListPage={true}></PublishRightnow>
-          {
-            mainList && mainList.course_identity < 5 && mainList.homeworks.length>0 &&
+        <PublishRightnow ref="publishModalRef" showActionButton={true} {...this.props} checkBoxValues={checkBoxValues}
+          showActionButton={false}
+          isPublish={true}
+          islist={true}
+          isPublishtype={1}
+          doWhenSuccess={this.doWhenSuccess} fromListPage={true}></PublishRightnow>
+        {
+          mainList && mainList.course_identity < 5 && mainList.homeworks.length > 0 &&
           <div className="mt20 edu-back-white padding20-30">
             <div className="clearfix" >
-              <Checkbox className="fl" onChange={this.changeAll}  checked={checkAll}>已选 {checkBoxValues.length} 个     （不支持跨页勾选）</Checkbox>
+              <Checkbox className="fl" onChange={this.changeAll} checked={checkAll}>已选 {checkBoxValues.length} 个     （不支持跨页勾选）</Checkbox>
               <div className="studentList_operation_ul">
                 <li className="li_line">
-                  <a href="javascript:void(0)" className="color-grey-9"
-                      onClick={this.onWorkDelete}>删除</a>
+                  <a className="color-grey-9"
+                    onClick={this.onWorkDelete}>删除</a>
                 </li>
                 <li className="li_line">
-                  <a href="javascript:void(0)" className="color-grey-9" onClick={() => this.refs['publishModalRef'].homeworkstart()}>{ "立即发布" }</a>
+                  <a className="color-grey-9" onClick={() => this.refs['publishModalRef'].homeworkstart()}>{"立即发布"}</a>
                 </li>
                 <li className="li_line">
-                  <PublishRightnow showActionButton={true} {...this.props} checkBoxValues={checkBoxValues} 
-                     isPublish={false} doWhenSuccess={this.doWhenSuccess} fromListPage={true}></PublishRightnow>
+                  <PublishRightnow showActionButton={true} {...this.props} checkBoxValues={checkBoxValues}
+                    isPublish={false} doWhenSuccess={this.doWhenSuccess} fromListPage={true}></PublishRightnow>
                 </li>
-                
-                { !!course_public && <li className="li_line"><a href="javascript:void(0)" onClick={this.onSetPublic} className="color-grey-9">设为公开</a></li>}
-								{this.props.user&&this.props.user.main_site===true?<li><a href="javascript:void(0)" className="color-grey-9"
+
+                {!!course_public && <li className="li_line"><a onClick={this.onSetPublic} className="color-grey-9">设为公开</a></li>}
+                {this.props.user && this.props.user.main_site === true ? <li className="li_line"><a className="color-grey-9"
                   onClick={this.addToBank}
-                >加入题库</a></li>:""}
+                >加入题库</a></li> : ""}
+                <li className="li_line drop_down">
+                  移动到目录<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                  <ul className="drop_down_menu"
+                    style={{ "right": "0px", "left": "unset", maxHeight: '318px', overflowY: 'auto', minWidth: '200px' }}>
+                    {course_module && course_module.length > 10 && <p className="drop_down_search">
+                      <Input placeholder="搜索" value={this.state.dirSearchValue} onChange={(e) => { this.setState({ dirSearchValue: e.target.value }) }} />
+                    </p>}
+                    {
+                      course_module && course_module.filter((item) => {
+                        return item.id != bid && (!this.state.dirSearchValue || item.name.indexOf(this.state.dirSearchValue) != -1)
+                      }).map((item, index) => {
+                        return <li key={`i_${index}`} onClick={() => this.moveTo(item)} title={item.name}>{item.name}</li>
+                      })
+                    }
+                    {isAdmin &&
+                      <p className="drop_down_btn">
+                        <a className="color-grey-6"
+                          onClick={() => this.newaddDir()}
+                        >新建目录...</a>
+                      </p>
+                    }
+                    {/* <p className="drop_down_btn"><a   className="color-grey-6">添加分班...</a></p> */}
+                  </ul>
+                </li>
               </div>
               {/* 设为公开 */}
               <Modals
@@ -465,11 +617,11 @@ class commonWork extends Component{
               </Modals>
             </div>
           </div>
-          }
+        }
 
 
         <Spin size="large" spinning={this.state.isSpin}>
-          <Checkbox.Group style={{"width":"100%"}} onChange={this.onChangeSelect} value={checkBoxValues}>
+          <Checkbox.Group style={{ "width": "100%" }} onChange={this.onChangeSelect} value={checkBoxValues}>
             <CommonWorkItem mainList={mainList} {...this.props} workType={workType} onItemClick={this.onItemClick}
               openConnectionProject={this.openConnectionProject}
               cancelConnectionProject={this.cancelConnectionProject}
@@ -478,12 +630,12 @@ class commonWork extends Component{
         </Spin>
 
         {
-          mainList && mainList.homeworks && mainList.homeworks.length==0 && <NoneData></NoneData>
+          mainList && mainList.homeworks && mainList.homeworks.length == 0 && <NoneData></NoneData>
         }
 
         {
           !!totalCount && totalCount > 15 &&
-          <div className="edu-txt-center pt30 pb10 clearfix">            
+          <div className="edu-txt-center pt30 pb10 clearfix">
             <Pagination current={page} showQuickJumper pageSize={15} total={totalCount} onChange={this.onPageChange}></Pagination>
           </div>
         }
@@ -491,4 +643,4 @@ class commonWork extends Component{
     )
   }
 }
-export default RouteHOC() (commonWork);
\ No newline at end of file
+export default RouteHOC()(commonWork);
\ No newline at end of file
diff --git a/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js b/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js
index 3d3f83bc..e6c62b22 100644
--- a/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js
+++ b/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js
@@ -20,7 +20,7 @@ import Modals from '../../../modals/Modals';
 const REPLY_PAGE_COUNT = 10
 const $ = window.$;
 
-/* 
+/*
 
 */
 class CommonWorkAppraiseReply extends Component{
@@ -79,7 +79,7 @@ class CommonWorkAppraiseReply extends Component{
       reply.journals.push(reply.appeal_info)
       reply.journals = _.orderBy(reply.journals, 'time', 'asc')
     }
-   
+
     return {
       isSuperAdmin: isSuperAdmin,
       admin: isAdmin, //
@@ -93,7 +93,7 @@ class CommonWorkAppraiseReply extends Component{
       // time: moment(reply.comment_time).fromNow(),
       time: moment(reply.comment_time).format('YYYY-MM-DD HH:mm'),
 
-      image_url: reply.user_image_url,      
+      image_url: reply.user_image_url,
       user_id: reply.user_id,
       user_login: reply.user_login,
       username: reply.user_name,
@@ -131,7 +131,7 @@ class CommonWorkAppraiseReply extends Component{
         console.log('Cancel');
       },
     });
-   
+
   }
 
   showModulationtype=(id)=>{
@@ -161,23 +161,14 @@ class CommonWorkAppraiseReply extends Component{
 
 
   saveModulationModal=(value,num)=>{
-    console.log(value,num)
     let {operationId}=this.state;
     let studentWorkId =this.props.match.params.studentWorkId;
-    // console.log(value,num)
     let url ="/student_works/"+studentWorkId+"/adjust_score.json";
     axios.post(url,{
       score:num,
       comment:value
     }).then((result)=>{
-      // console.log(result)
       if(result.data.status===0){
-        // this.setState({
-        //   Modalstype:true,
-        //   Allocationtype:false,
-        //   Modalstopval:result.data.message,
-        //   ModalSave:this.cancelmodel,
-        // })
         this.cancelmodel()
         this.props.showNotification('调分成功')
         this.props.onReplySuccess && this.props.onReplySuccess()
@@ -221,6 +212,7 @@ class CommonWorkAppraiseReply extends Component{
     if (!needNiPingEditor && comment_scores.length == 0) {
       return ''
     }
+
     return(
       <React.Fragment>
         <div className="edu-back-white padding10-10" style={{marginTop: '16px'}}>
@@ -257,13 +249,13 @@ class CommonWorkAppraiseReply extends Component{
             {/*{this.props.isStudent()?<a className={"fr color-blue font-16 mt10 mr20"} onClick={this.addAccessory}>补交附件</a>:""}*/}
           {/*</div>*/}
 
-          
+
 
           {/* {
-           (!!comment_scores.length && 
+           (!!comment_scores.length &&
           <div className={"color-grey-6 mb10"}>
             <span className="labal">全部评阅</span>
-            <span className="count">（{comment_scores.length}）</span> 
+            <span className="count">（{comment_scores.length}）</span>
            </div>)} */}
           <div className={`padding20-30 ${comment_scores.length ? 'bor-bottom-greyE' : ''}`}>
             {!!comment_scores.length && <div className={"color-grey-6 font-16"}>
@@ -283,13 +275,14 @@ class CommonWorkAppraiseReply extends Component{
               addSuccess={this.addSuccess} ref={this.editorRef} totalCount={comment_scores.length}
               onReply={this.onReply} placeholder={"请在此输入对本作品的评语，最大限制2000个字符"}
               showSameScore={isGroup && isAdmin}
+              get_next_works={()=>this.props.get_next_works()}
             ></GraduationTasksappraiseMainEditor> }
           </div>
           {/* ${!!comment_scores.length ? 'bor-bottom-greyE' : ''} */}
           <div className={`padding20  memoReplies commentsDelegateParent course-message`}
             style={{ paddingTop: '0px', paddingBottom: '0px' }}
           >
-            {/* 
+            {/*
             .course-message .panel-comment_item {
                 margin-top: ${needNiPingEditor ? 56 : 28}px;
               }
diff --git a/src/modules/courses/common/CDropdown.js b/src/modules/courses/common/CDropdown.js
index 6e0afb68..eb112ac8 100644
--- a/src/modules/courses/common/CDropdown.js
+++ b/src/modules/courses/common/CDropdown.js
@@ -1,25 +1,25 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 
-class CDropdown extends Component{
-  constructor(props){
+class CDropdown extends Component {
+  constructor(props) {
     super(props);
-    
+
   }
-  
-  render(){
-    let { dataList, children, actionButtonText, onActionButtonClick }=this.props;
-    return(
-      <ul className="drop_down_menu" style={{"lef":"tunset"}}>
+
+  render() {
+    let { dataList, children, actionButtonText, onActionButtonClick } = this.props;
+    return (
+      <ul className="drop_down_menu" style={{ "lef": "tunset" }}>
         {
-          dataList && dataList.length > 10?
-          (<p className="drop_down_search">
-            <Input placeholder="搜索"/>
-          </p>):
-          (dataList && dataList.length == 0 && <p>暂无数据</p>)
+          dataList && dataList.length > 10 ?
+            (<p className="drop_down_search">
+              <Input placeholder="搜索" />
+            </p>) :
+            (dataList && dataList.length == 0 && <p>暂无数据</p>)
         }
         {children}
         <p className="drop_down_btn">
-          <a href="javascript:void(0)" className="color-grey-6" onClick={onActionButtonClick}>{actionButtonText}</a>
+          <a className="color-grey-6" onClick={onActionButtonClick}>{actionButtonText}</a>
         </p>
       </ul>
     )
diff --git a/src/modules/courses/common/CourseLayoutComponent.js b/src/modules/courses/common/CourseLayoutComponent.js
index c88bd879..6df11ad7 100644
--- a/src/modules/courses/common/CourseLayoutComponent.js
+++ b/src/modules/courses/common/CourseLayoutComponent.js
@@ -1,78 +1,69 @@
-import React, { Component } from 'react';
-import axios from 'axios';
-import {Input,Pagination,Tooltip} from 'antd';
-
-//业务组件
-import CoursesBanner from "../coursesDetail/CoursesBanner";
-import Coursesleftnav from "../coursesDetail/CoursesLeftNav";
-
-class CourseLayoutcomponent extends Component{
-  constructor(props) {
-    super(props)
-  }
-
-  componentDidMount(){
-
-  }
-  //
-  // getleftNavid=(navid,newselectnavid)=>{
-  //   console.log(navid,newselectnavid)
-  //   this.setState({
-  //     navkey:navid,
-  //     navttype:newselectnavid
-  //   })
-  // }
-
-  render() {
-      // 加  , ...this.props  样式会出现2份children
-    const childrenWithProps = React.Children.map(this.props.children, child => {
-        // debugger;
-        if(!child) {
-            return ''
-        }
-        return React.cloneElement(child, { ...this.state })
-    }
-        
-    );
-    // console.log("CoursesBanner")
-    //   console.log(this.props)
-
-      return (
-      <div>
-          <div className="newMain clearfix">
-              {/*头部banner*/}
-              <CoursesBanner {...this.props}></CoursesBanner>
-
-              <div className="educontent clearfix" style={{flex: "1 0 auto"}}>
-
-                  <div className="stud-class-set">
-                      <div className="news">
-                          <div className="edu-class-inner container clearfix">
-                              <div className="member for-content-0 for-content">
-                                  <div className="people clearfix mb60">
-
-                                      {/*left_nav*/}
-                                      <div className={"with22 fl setleft"} style={{width:'264px',minHeight:'500px'}}>
-                                         <Coursesleftnav {...this.props} {...this.state}/>
-                                      </div>
-
-                                      {/*right_concent*/}
-                                      <div className="with78 fl">
-                                          <div className={"ml20 clearfix"}>
-                                              {childrenWithProps}
-                                          </div>
-                                      </div>
-
-                                  </div>
-                               </div>
-                          </div>
-                      </div>
-                  </div>
-
-              </div>
-          </div>
-      </div>
-    )
-  }
-}
-export default CourseLayoutcomponent;
\ No newline at end of file
+import React, { Component } from 'react';
+import axios from 'axios';
+import {Input,Pagination,Tooltip} from 'antd';
+
+//业务组件
+import CoursesBanner from "../coursesDetail/CoursesBanner";
+import Coursesleftnav from "../coursesDetail/CoursesLeftNav";
+
+class CourseLayoutcomponent extends Component{
+  constructor(props) {
+    super(props)
+  }
+
+  componentDidMount(){
+
+  }
+
+  render() {
+      // 加  , ...this.props  样式会出现2份children
+    const childrenWithProps = React.Children.map(this.props.children, child => {
+        if(!child) {
+            return ''
+        }
+        return React.cloneElement(child, { ...this.state })
+    }
+
+    );
+    // console.log("CoursesBanner")
+    //   console.log(this.props)
+
+      return (
+      <div>
+          <div className="newMain clearfix">
+              {/*头部banner*/}
+              <CoursesBanner {...this.props}></CoursesBanner>
+
+              <div className="educontent clearfix" style={{flex: "1 0 auto"}}>
+
+                  <div className="stud-class-set">
+                      <div className="news">
+                          <div className="edu-class-inner container clearfix">
+                              <div className="member for-content-0 for-content">
+                                  <div className="people clearfix mb60">
+
+                                      {/*left_nav*/}
+                                      <div className={"with22 fl setleft"} style={{width:'264px',minHeight:'500px'}}>
+                                         <Coursesleftnav myinex={false}  {...this.props} {...this.state}/>
+                                      </div>
+
+                                      {/*right_concent*/}
+                                      <div className="with78 fl">
+                                          <div className={"ml20 clearfix"}>
+                                              {childrenWithProps}
+                                          </div>
+                                      </div>
+
+                                  </div>
+                               </div>
+                          </div>
+                      </div>
+                  </div>
+
+              </div>
+          </div>
+      </div>
+    )
+  }
+}
+export default CourseLayoutcomponent;
diff --git a/src/modules/courses/common/ModalWrapper.js b/src/modules/courses/common/ModalWrapper.js
index 8b7e8769..6bdd5f18 100644
--- a/src/modules/courses/common/ModalWrapper.js
+++ b/src/modules/courses/common/ModalWrapper.js
@@ -42,7 +42,7 @@ class ModalWrapper extends Component{
                {
                  `
               body {
-							  overflow: hidden !important;
+							   width: calc(100%) !important;
 							}
               `
                }
diff --git a/src/modules/courses/common/button/CheckAllGroup.js b/src/modules/courses/common/button/CheckAllGroup.js
index 21f7e668..51840826 100644
--- a/src/modules/courses/common/button/CheckAllGroup.js
+++ b/src/modules/courses/common/button/CheckAllGroup.js
@@ -1,62 +1,69 @@
-import React,{ Component } from "react";
-import { WordsBtn } from "educoder";
-import { Checkbox  } from 'antd'
-const CheckboxGroup = Checkbox.Group;
-
-class CheckAllGroup extends Component{
-  constructor(props){
-    super(props);
-    this.state = {
-      checkAll: true,
-      checkedValues: []
-    }
-  }
-  
-  onCheckAll = () => {
-    this.setState({
-      'checkAll': true,
-      checkedValues: []
-    })
-    this.props.onChange && this.props.onChange([], true);
-  }
-  onChange = (checkedValues) => {
-    if (checkedValues.length > 0) {
-      this.setState({
-        'checkAll': false,
-        checkedValues
-      })
-      this.props.onChange && this.props.onChange(checkedValues, false)
-    } else {
-      this.setState({
-        'checkAll': true,
-        checkedValues: []
-      })
-      this.props.onChange && this.props.onChange(checkedValues, true);
-    }
-    console.log(checkedValues, arguments)
-  }
-
-  render() {
-    let { label, options, checkboxGroupStyle }=this.props;
-    const { checkAll, checkedValues } = this.state;
-    return (
-      <li className="clearfix">
-        <style>{`
-        .groupList .ant-checkbox-group-item{
-          margin-bottom:5px;
-        }
-        `}</style>
-        <span className="fl mr10 color-grey-8">{label}</span>
-        <span className="fl mr25">
-          <a href="javascript:void(0);" id="comment_no_limit" className={`pl10 pr10 ${checkAll ? 'check_on' : ''}`} onClick={this.onCheckAll}>全部</a>
-        </span>
-        <div className="fl groupList" style={{maxWidth:"990px"}}>
-          {
-            options.length > 1 && <CheckboxGroup options={options} onChange={this.onChange} value={checkedValues} style={checkboxGroupStyle}/>
-          }
-        </div>
-      </li>
-    )
-  }
-}
-export default CheckAllGroup;
\ No newline at end of file
+import React,{ Component } from "react";
+import { WordsBtn } from "educoder";
+import { Checkbox  } from 'antd'
+const CheckboxGroup = Checkbox.Group;
+
+class CheckAllGroup extends Component{
+  constructor(props){
+    super(props);
+    this.state = {
+      checkAll: true,
+      checkedValues: []
+    }
+  }
+
+  onCheckAll = () => {
+    this.setState({
+      'checkAll': true,
+      checkedValues: []
+    })
+    this.props.onChange && this.props.onChange([], true);
+  }
+  onChange = (checkedValues) => {
+  	try {
+			if(this.props.comwbool===true){
+				return
+			}
+		}catch (e) {
+
+		}
+    if (checkedValues.length > 0) {
+      this.setState({
+        'checkAll': false,
+        checkedValues
+      })
+      this.props.onChange && this.props.onChange(checkedValues, false)
+    } else {
+      this.setState({
+        'checkAll': true,
+        checkedValues: []
+      })
+      this.props.onChange && this.props.onChange(checkedValues, true);
+    }
+    console.log(checkedValues, arguments)
+  }
+
+  render() {
+    let { label, options, checkboxGroupStyle }=this.props;
+    const { checkAll, checkedValues } = this.state;
+    return (
+      <li className="clearfix">
+        <style>{`
+        .groupList .ant-checkbox-group-item{
+          margin-bottom:5px;
+        }
+        `}</style>
+        <span className="fl mr10 color-grey-8">{label}</span>
+        <span className="fl mr25">
+          <a href="javascript:void(0);" id="comment_no_limit" className={`pl10 pr10 ${checkAll ? 'check_on' : ''}`} onClick={this.onCheckAll}>全部</a>
+        </span>
+        <div className="fl groupList" style={{maxWidth:"990px"}}>
+          {
+            options.length > 1 && <CheckboxGroup options={options} onChange={this.onChange} value={checkedValues} style={checkboxGroupStyle}/>
+          }
+        </div>
+      </li>
+    )
+  }
+}
+export default CheckAllGroup;
diff --git a/src/modules/courses/common/comments/CCommentItem.js b/src/modules/courses/common/comments/CCommentItem.js
index 486a4d8f..bfda67e4 100644
--- a/src/modules/courses/common/comments/CCommentItem.js
+++ b/src/modules/courses/common/comments/CCommentItem.js
@@ -1,12 +1,11 @@
 import '../../katex.css';
-import React,{ Component } from "react";
-import { getImageUrl, markdownToHTML, WordsBtn, getUrl } from 'educoder';
-import { Tooltip } from  'antd';
+import React, { Component } from "react";
+import { getImageUrl, WordsBtn, getUrl } from 'educoder';
+import { Tooltip } from 'antd';
 import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
 import axios from 'axios';
 import moment from 'moment';
-import showdown from 'showdown';
-import showdownKatex from 'showdown-katex';
+import RenderHtml from '../../../../components/render-html';
 const _origin = ''
 /**
 	https://www.showdoc.cc/127895880302646?page_id=1962215317836957
@@ -14,169 +13,153 @@ const _origin = ''
  */
 const ACCEPT = 3
 const REFUSE = 4
-class CCommentItem extends Component{
-  constructor(props){
-    super(props);
+class CCommentItem extends Component {
+	constructor(props) {
+		super(props);
 
-	this.state = {
-      show_reply: false,
-      show_appeal: false,
+		this.state = {
+			show_reply: false,
+			show_appeal: false,
+		}
+	}
+	cancelReply = () => {
+		this.setState({ show_reply: false })
+	}
+	showReply = () => {
+		this.setState({ show_reply: true, show_appeal: false })
+	}
+	showAppeal = () => {
+		this.setState({ show_appeal: true, show_reply: false })
+	}
+	cancelAppeal = () => {
+		this.setState({ show_appeal: false })
+	}
+	onCancel = () => {
+		this.state.show_reply ? this.cancelReply() : this.cancelAppeal()
 	}
-  }
-  cancelReply = () => {
-	  this.setState({ show_reply: false })
-  }
-  showReply = () => {
-	  this.setState({ show_reply: true, show_appeal: false })
-  }
-  showAppeal = () => {
-	  this.setState({ show_appeal: true, show_reply: false })
-  }
-  cancelAppeal = () => {
-	  this.setState({ show_appeal: false })
-  }
-  onCancel = () => {
-	  this.state.show_reply ? this.cancelReply() : this.cancelAppeal()
-  }
 	cancelMyAppeal = () => {
 		this.props.confirm({
-      content: <div>
+			content: <div>
 				<div>撤销申诉后，无法再对本评阅记录进行申诉</div>
 				<div>是否确认撤销申诉</div>
 			</div>,
-      onOk: () => {
-    		let studentWorkId =this.props.match.params.studentWorkId;
-    		let { item, commentIndex }=this.props;
+			onOk: () => {
+				let studentWorkId = this.props.match.params.studentWorkId;
+				let { item, commentIndex } = this.props;
 
-        const url = `/student_works/${studentWorkId}/cancel_appeal.json`
-        axios.post(url, {
-            score_id: item.id
-          })
-        .then((response) => {
-          if (response.data.status == 0) {
-						this.props.showNotification('撤销成功')
-						this.props.replySuccess()
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
-      }
-    })
-	}
-  onSubmit = () => {
-    let workId=this.props.match.params.workId;
-    let studentWorkId =this.props.match.params.studentWorkId;
-
-    let { item, commentIndex }=this.props;
-	if (!this.state.secondReplyContent || !this.state.secondReplyContent.trim()) {
-		this.props.showNotification('内容不能为空')
-		return;
-	}
-	if (this.state.show_reply) {
-		const url = `/student_works/${studentWorkId}/add_score_reply.json`
-		axios.post(url, {
-			score_id: item.id,
-			comment: this.state.secondReplyContent
-		}).then((result)=>{
-			if(result.data.status == 0){
-				this.props.replySuccess()
-				this.cancelReply()
+				const url = `/student_works/${studentWorkId}/cancel_appeal.json`
+				axios.post(url, {
+					score_id: item.id
+				})
+					.then((response) => {
+						if (response.data.status == 0) {
+							this.props.showNotification('撤销成功')
+							this.props.replySuccess()
+						}
+					})
+					.catch(function (error) {
+						console.log(error);
+					});
 			}
-		}).catch((error)=>{
-			console.log(error)
-		})
-	} else {
-		const appealUrl = `/student_works/${studentWorkId}/appeal_anonymous_score.json`
-		axios.post(appealUrl, {
-			score_id: item.id,
-			comment: this.state.secondReplyContent
-		}).then((result)=>{
-			if(result.data.status == 0){
-				this.props.replySuccess()
-				this.cancelAppeal()
-
-			}
-		}).catch((error)=>{
-			console.log(error)
 		})
 	}
-  }
-  onDeleteSecondReply = (item) => {
-	  this.props.confirm({
-      // content: `确认要删除所选的${len}个帖子吗？`,
-      content: `是否确认删除?`,
-      onOk: () => {
+	onSubmit = () => {
+		let workId = this.props.match.params.workId;
+		let studentWorkId = this.props.match.params.studentWorkId;
 
-        const url = `/commons/delete.json`
-        axios.delete(url, { data: {
-            object_id: item.id,
-            object_type: 'journals_for_message'
-          }})
-        .then((response) => {
-          if (response.data.status == 0) {
-            this.props.replySuccess()
-						this.cancelAppeal()
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
-      }
-    })
-  }
+		let { item, commentIndex } = this.props;
+		if (!this.state.secondReplyContent || !this.state.secondReplyContent.trim()) {
+			this.props.showNotification('内容不能为空')
+			return;
+		}
+		if (this.state.show_reply) {
+			const url = `/student_works/${studentWorkId}/add_score_reply.json`
+			axios.post(url, {
+				score_id: item.id,
+				comment: this.state.secondReplyContent
+			}).then((result) => {
+				if (result.data.status == 0) {
+					this.props.replySuccess()
+					this.cancelReply()
+				}
+			}).catch((error) => {
+				console.log(error)
+			})
+		} else {
+			const appealUrl = `/student_works/${studentWorkId}/appeal_anonymous_score.json`
+			axios.post(appealUrl, {
+				score_id: item.id,
+				comment: this.state.secondReplyContent
+			}).then((result) => {
+				if (result.data.status == 0) {
+					this.props.replySuccess()
+					this.cancelAppeal()
+
+				}
+			}).catch((error) => {
+				console.log(error)
+			})
+		}
+	}
+	onDeleteSecondReply = (item) => {
+		this.props.confirm({
+			// content: `确认要删除所选的${len}个帖子吗？`,
+			content: `是否确认删除?`,
+			onOk: () => {
+
+				const url = `/commons/delete.json`
+				axios.delete(url, {
+					data: {
+						object_id: item.id,
+						object_type: 'journals_for_message'
+					}
+				})
+					.then((response) => {
+						if (response.data.status == 0) {
+							this.props.replySuccess()
+							this.cancelAppeal()
+						}
+					})
+					.catch(function (error) {
+						console.log(error);
+					});
+			}
+		})
+	}
 	on_deal_appeal_score = (mode, item) => {
-	  this.props.confirm({
-      // content: `确认要删除所选的${len}个帖子吗？`,
-      content:
-	  	<div>
-			<div>{mode == ACCEPT ? '此匿评成绩将被废弃，评阅人的作品将被违规扣分' : '此匿评成绩将被认为合理'}</div>
-			<div>是否确认{mode == ACCEPT ? '接受申诉' : '拒绝申诉'}</div>
-		</div>
-	  ,
-      onOk: () => {
-		let studentWorkId =this.props.match.params.studentWorkId;
-        const url = `/student_works/${studentWorkId}/deal_appeal_score.json`
-        axios.post(url,  {
-            score_id: item.score_id,
-            status: mode
-          })
-        .then((response) => {
-          if (response.data.status == 0) {
-            this.props.showNotification(`${mode == ACCEPT ? '接受申诉' : '拒绝申诉'}成功`)
-			this.props.replySuccess()
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
-      }
-    })
-  }
-
-  parseCommentContent = (oldContent) => {
-		return markdownToHTML(oldContent);
-  }
-
-  exportMdtoHtml=(md)=> {
-  	let newmd=md;
-		const converter = new showdown.Converter({
-			extensions: [
-				showdownKatex({
-					// maybe you want katex to throwOnError
-					throwOnError: true,
-					// disable displayMode
-					displayMode: false,
-					// change errorColor to blue
-					errorColor: '#1500ff',
-				}),
-			],
-		});
-		return converter.makeHtml(newmd);
+		this.props.confirm({
+			// content: `确认要删除所选的${len}个帖子吗？`,
+			content:
+				<div>
+					<div>{mode == ACCEPT ? '此匿评成绩将被废弃，评阅人的作品将被违规扣分' : '此匿评成绩将被认为合理'}</div>
+					<div>是否确认{mode == ACCEPT ? '接受申诉' : '拒绝申诉'}</div>
+				</div>
+			,
+			onOk: () => {
+				let studentWorkId = this.props.match.params.studentWorkId;
+				const url = `/student_works/${studentWorkId}/deal_appeal_score.json`
+				axios.post(url, {
+					score_id: item.score_id,
+					status: mode
+				})
+					.then((response) => {
+						if (response.data.status == 0) {
+							this.props.showNotification(`${mode == ACCEPT ? '接受申诉' : '拒绝申诉'}成功`)
+							this.props.replySuccess()
+						}
+					})
+					.catch(function (error) {
+						console.log(error);
+					});
+			}
+		})
+	}
+	componentDidMount() {
+		window.prettyPrint()
 	}
 
-  renderChildenComments = (parent) => {
-    if (parent.journals.length == 0) {
+	renderChildenComments = (parent) => {
+		if (parent.journals.length == 0) {
 			return '';
 		}
 		const isAdmin = this.props.isAdmin()
@@ -203,39 +186,39 @@ class CCommentItem extends Component{
 						{item.is_appeal_info == true ?
 							<a href={`javascript:void(0)`} target="_blank">
 								<img alt="用户头像" height="50"
-									src={`${getUrl()}/images/edu_user/anony.png`} width="50"/>
+									src={`${getUrl()}/images/edu_user/anony.png`} width="50" />
 							</a>
-						: <a href={`${_origin}/users/${item.user_info.user_login}`} target="_blank">
-							<img alt="用户头像" height="50"
-								src={`${getImageUrl(`images/`+imgSrc)}`}
-							width="50"/>
-						</a>}
+							: <a href={`${_origin}/users/${item.user_info.user_login}`} target="_blank">
+								<img alt="用户头像" height="50"
+									src={`${getImageUrl(`images/` + imgSrc)}`}
+									width="50" />
+							</a>}
 					</div>
 
 					<div className="t_content fl">
 						<div className="J_Comment_Reply">
-							<div className="comment_orig_content" style={{ margin:"0px" }}>
+							<div className="comment_orig_content" style={{ margin: "0px" }}>
 								<div className="J_Comment_Info clearfix mt3">
 									<div className="t_info fl">
-										{item.user_info.user_login==="--"?
+										{item.user_info.user_login === "--" ?
 											<a className="content-username hide fl">
 												{item.user_info.user_name}
 											</a>
-											:<a href={`${_origin}/users/${item.user_info.user_login}`} className="content-username hide fl">
+											: <a href={`${_origin}/users/${item.user_info.user_login}`} className="content-username hide fl">
 												{item.user_info.user_name}
 											</a>}
 
 										<span className="t_area fl">{moment(item.time).format('YYYY-MM-DD HH:mm')}</span>
 										{item.is_appeal_info && (item.appeal_status == 1 ?
-										<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >申诉中</span> :
-										  item.appeal_status == 2 ?
-										<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "} >申诉已撤销</span> :
-										  item.appeal_status == 3 ?
-										<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >申诉成功</span> :
-										  item.appeal_status == 4 ?
-										<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "} >申诉被拒绝</span> :
-										  item.appeal_status == 5 ?
-										<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "} >申诉失败</span> : '')
+											<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >申诉中</span> :
+											item.appeal_status == 2 ?
+												<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "} >申诉已撤销</span> :
+												item.appeal_status == 3 ?
+													<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >申诉成功</span> :
+													item.appeal_status == 4 ?
+														<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "} >申诉被拒绝</span> :
+														item.appeal_status == 5 ?
+															<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "} >申诉失败</span> : '')
 										}
 
 
@@ -246,14 +229,14 @@ class CCommentItem extends Component{
 											<i className="iconfont icon-shanchu mr5 fr font-14" onClick={() => this.onDeleteSecondReply(item)}
 												style={{ cursor: 'pointer' }}
 											></i>
-										</Tooltip> }
+										</Tooltip>}
 										{/* </React.Fragment>
 										} */}
-										{item.is_appeal_info && isAdmin && item.appeal_status == 1 && this.props.isAdmin()===true&&<React.Fragment>
+										{item.is_appeal_info && isAdmin && item.appeal_status == 1 && this.props.isAdmin() === true && <React.Fragment>
 											<WordsBtn style="grey" onClick={() => this.on_deal_appeal_score(REFUSE, item)} className="fr ml6">拒绝申诉</WordsBtn>
 											<WordsBtn style="orange" onClick={() => this.on_deal_appeal_score(ACCEPT, item)} className="fr">接受申诉</WordsBtn>
 										</React.Fragment>}
-										{item.appeal_status == 1 &&	this.props.is_author == true && this.props.isStudent()===true &&
+										{item.appeal_status == 1 && this.props.is_author == true && this.props.isStudent() === true &&
 											<WordsBtn style="blue" className="fr mr5" onClick={() => this.cancelMyAppeal()}>撤销申诉</WordsBtn>}
 
 									</div>
@@ -261,8 +244,7 @@ class CCommentItem extends Component{
 
 								<div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
 									<div className="color-grey-3" id={`reply_content_${item.id}`}>
-										<div  className={"markdown-body"}
-												dangerouslySetInnerHTML={{__html:markdownToHTML(item.content)}}></div>
+										<RenderHtml className={"markdown-body"} value={item.content} />
 										<div className="cl"></div>
 									</div>
 								</div>
@@ -274,71 +256,49 @@ class CCommentItem extends Component{
 				</div>
 			)
 		})
-  }
-  render(){
-    let { item, commentIndex, homework_status, is_author }=this.props;
-    let { show_reply, show_appeal }=this.state;
-    const _content = item.content ? markdownToHTML(item.content): ''
-	const isAnonymous = homework_status && homework_status.indexOf('匿评中') != -1
-	const isAppealing = homework_status && homework_status.indexOf('申诉中') != -1
-	const attachments = item.attachments;
-	const isAdmin = this.props.isAdmin()
+	}
+	render() {
+		let { item, commentIndex, homework_status, is_author } = this.props;
+		let { show_reply, show_appeal } = this.state;
+		const _content = item.content
+		const isAnonymous = homework_status && homework_status.indexOf('匿评中') != -1
+		const isAppealing = homework_status && homework_status.indexOf('申诉中') != -1
+		const attachments = item.attachments;
+		const isAdmin = this.props.isAdmin()
 
-    return(
-      <div className="ccomment comment_item_cont df clearfix" key={item.id}>
- 					<div className="J_Comment_Face fl">
+		return (
+			<div className="ccomment comment_item_cont df clearfix" key={item.id}>
+				<div className="J_Comment_Face fl">
 
-						{item.image_url == '--' ?
+					{item.image_url == '--' ?
 						<a href={`javascript:void(0)`} >
 							<img alt="用户头像" height="50"
-								src={`${getUrl()}/images/edu_user/anony.png`} width="50"/>
-							</a>
+								src={`${getUrl()}/images/edu_user/anony.png`} width="50" />
+						</a>
 						: <a href={`${_origin}/users/${item.user_login}`} target="_blank">
 							<img alt="用户头像" height="50"
 								src={`${getUrl()}/images/${item.image_url}`}
-							width="50"/>
+								width="50" />
 						</a>}
+				</div>
 
-						{/* <a href={`${_origin}/users/${item.user_login}`} target="_blank">
-							<img alt="用户头像" height="50" src={getImageUrl(`images/${item.image_url}`)} width="50"/>
-						</a> */}
-					</div>
-
-					<div className="t_content fl">
-						<div className="J_Comment_Reply">
-							<div className="comment_orig_content" style={{ margin:"0px" }}>
-
-
-								<div className="J_Comment_Info clearfix mt3">
-									<div className="t_info fl">
-										{
-											item.user_login==="--"?	<a className="content-username hide fl">
-													{item.username}（{item.comment_role}）
+				<div className="t_content fl">
+					<div className="J_Comment_Reply">
+						<div className="comment_orig_content" style={{ margin: "0px" }}>
+							<div className="J_Comment_Info clearfix mt3">
+								<div className="t_info fl">
+									{
+										item.user_login === "--" ? <a className="content-username hide fl">
+											{item.username}（{item.comment_role}）
 												</a>
-													:
-													<a href={`${_origin}/users/${item.user_login}`} className="content-username hide fl">
-														{item.username}（{item.comment_role}）
+											:
+											<a href={`${_origin}/users/${item.user_login}`} className="content-username hide fl">
+												{item.username}（{item.comment_role}）
 													</a>
-										}
-
-
-										<span className="t_area fl">{item.time}</span>
-										{/* 分数 */}
-										{item.score !== null && <span className="score_area fl">{item.score}分</span>}
-
-
-										{/* item.is_invalid && */}
-										{/* {  item.delete && isAdmin && <Tooltip title={ "删除" } >
-											<i className="iconfont icon-shanchu mr5 fr" style={{marginLeft: '6px'}}
-													onClick={() => this.props.onDelete(item)}>
-											</i>
-										</Tooltip>} */}
-
-
-
-										{/* fr */}
-										{/* <WordsBtn style="blue" className="fr">回复</WordsBtn> */}
-										{ item.is_invalid ? <span className="validate_area fr">失效</span> :
+									}
+									<span className="t_area fl">{item.time}</span>
+									{item.score !== null && <span className="score_area fl">{item.score}分</span>}
+									{item.is_invalid ? <span className="validate_area fr">失效</span> :
 										<React.Fragment>
 											<WordsBtn style="blue" className="fr" onClick={this.state.show_reply ? this.cancelReply : this.showReply}>回复</WordsBtn>
 											{(isAppealing || isAnonymous) && item.can_appeal && item.appeal_status == 0 &&
@@ -346,85 +306,72 @@ class CCommentItem extends Component{
 
 										</React.Fragment>
 
-											}
-										{item.delete && isAdmin
-											&& <WordsBtn style="blue" className="fr mr12"
-												onClick={() => this.props.onDelete(item)}>删除</WordsBtn>}
+									}
+									{item.delete && isAdmin
+										&& <WordsBtn style="blue" className="fr mr12"
+											onClick={() => this.props.onDelete(item)}>删除</WordsBtn>}
 
-									</div>
 								</div>
+							</div>
 
-								{!!_content && _content !== 'null' && <div className="comment_content  clearfix mt8" id={`reply_content_${item.id}`}>
-									<div className="color-grey-3" id={`reply_content_${item.id}`}>
-										<div  className={"markdown-body"} dangerouslySetInnerHTML={{__html: _content}}></div>
-										<div className="cl"></div>
-									</div>
-								</div>}
-								{!_content && <span className="color656565 mt2 color-grey-9 font-12 mr8" style={{ display: 'inline-block'}}>{"暂未写评语"}</span>}
-								<div className="mt6">
-									{attachments && attachments.map((attaItem, key)=>{
-										return(
-											<div className="color-grey attachItem" key={key}>
-												<a className="color-grey ">
-													<i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
-												</a>
-												<a href={attaItem.url}
-													className="mr12 color9B9B" length="58">
-													{attaItem.title}
-												</a>
-												<span className="color656565 mt2 color-grey-6 font-12 mr8">{attaItem.filesize}</span>
-												{/*{item.delete===true?<i className="font-14 iconfont  icon-guanbi " id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}*/}
-											</div>
-										)
-									})}
+							{!!_content && _content !== 'null' && <div className="comment_content  clearfix mt8" id={`reply_content_${item.id}`}>
+								<div className="color-grey-3" id={`reply_content_${item.id}`}>
+									<RenderHtml className={"markdown-body"} value={_content} />
+									<div className="cl"></div>
 								</div>
+							</div>}
+							{!_content && <span className="color656565 mt2 color-grey-9 font-12 mr8" style={{ display: 'inline-block' }}>{"暂未写评语"}</span>}
+							<div className="mt6">
+								{attachments && attachments.map((attaItem, key) => {
+									return (
+										<div className="color-grey attachItem" key={key}>
+											<a className="color-grey ">
+												<i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
+											</a>
+											<a href={attaItem.url}
+												className="mr12 color9B9B" length="58">
+												{attaItem.title}
+											</a>
+											<span className="color656565 mt2 color-grey-6 font-12 mr8">{attaItem.filesize}</span>
+											{/*{item.delete===true?<i className="font-14 iconfont  icon-guanbi " id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}*/}
+										</div>
+									)
+								})}
+							</div>
 
-								<style>{`
+							<style>{`
 									.ccomment .childrenCommentsView .comment_item_cont .break_word_comments {
 										margin-top: 4px;
 										width: 94%;
 										font-size: 14px;
 									}
 								`}</style>
-								<div className="childrenCommentsView" style={{background: '#fff'}}>
-									{/* {(item && item.journals && item.journals.length) ? <div className="trangle"></div>: ''} */}
-									{this.renderChildenComments(item)}
-									{/* { item.isAllChildrenLoaded != true && item.journals && this.props.isChildCommentPagination == true && item.journals.length >= 5?
-										<Tooltip title={ "点击查看更多回复" } disableFocusListener={true}>
-											<div className="loadMoreChildComments" onClick={() => {this.props.loadMoreChildComments && this.props.loadMoreChildComments(item)}}>
-												<i className="iconfont icon-xiajiantou"></i>
-											</div>
-										</Tooltip>
-									: ''} */}
-								</div>
-								{/* 去掉了orig_reply 影响到i标签 */}
-								<p className="" >
-                    				{/* 第二排右侧按钮区域 */}
-									{/* ${this.state.show_reply ? '回复' : '申诉'} */}
-									{(show_reply || show_appeal) &&
+							<div className="childrenCommentsView" style={{ background: '#fff' }}>
+								{this.renderChildenComments(item)}
+							</div>
+							<p className="" >
+								{(show_reply || show_appeal) &&
 									<React.Fragment>
 										<TPMMDEditor mdID={`${commentIndex}`} watch={false}
-											height={130} onChange={(val) => this.setState({ secondReplyContent: val})}
+											height={130} onChange={(val) => this.setState({ secondReplyContent: val })}
 											placeholder={`请输入内容`} noStorage={true}
 										></TPMMDEditor>
 										<div className="fr">
-											<a  className="task-btn task-btn-orange fr" style={{height: '26px', lineHeight: '26px', width: '60px'}}
+											<a className="task-btn task-btn-orange fr" style={{ height: '26px', lineHeight: '26px', width: '60px' }}
 												onClick={this.onSubmit}
 											>{this.state.show_reply ? '回复' : '申诉'}</a>
 											<a onClick={this.onCancel} className="defalutCancelbtn fr"
-												style={{height: '26px', width: '60px', fontSize: '14px', lineHeight: '26px', marginRight: '10px'}}>取消</a>
+												style={{ height: '26px', width: '60px', fontSize: '14px', lineHeight: '26px', marginRight: '10px' }}>取消</a>
 
 										</div>
 									</React.Fragment>
-									}
-								</p>
-
-
-							</div>
+								}
+							</p>
 						</div>
 					</div>
 				</div>
-    )
-  }
+			</div>
+		)
+	}
 }
 export default CCommentItem;
\ No newline at end of file
diff --git a/src/modules/courses/common/comments/CommonReply.js b/src/modules/courses/common/comments/CommonReply.js
index 50f2b60c..86143887 100644
--- a/src/modules/courses/common/comments/CommonReply.js
+++ b/src/modules/courses/common/comments/CommonReply.js
@@ -1,37 +1,36 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 import { Pagination } from "antd";
 
-import update from 'immutability-helper'
 import axios from 'axios'
 import MemoDetailMDEditor from '../../../forums/MemoDetailMDEditor'
 
 import '../../../forums/Post.css'
 import '../../../forums/RightSection.css'
-import {ImageLayerOfCommentHOC} from '../../../page/layers/ImageLayerOfCommentHOC'
+import { ImageLayerOfCommentHOC } from '../../../page/layers/ImageLayerOfCommentHOC'
 
 import Comments from '../../../comment/Comments'
-// import './GraduateTopicReply.css'
 import '../../common/courseMessage.css'
-import { generateComments, generateChildComments, _findById, handleContentBeforeCreateNew, addNewComment
+import {
+  generateComments, generateChildComments, _findById, handleContentBeforeCreateNew, addNewComment
   , addSecondLevelComment, NEED_TO_WRITE_CONTENT, handleContentBeforeCreateSecondLevelComment
-  , handleDeleteComment, handleCommentPraise, handleHiddenComment } from '../../common/CommentsHelper'
+  , handleDeleteComment, handleCommentPraise, handleHiddenComment
+} from '../../common/CommentsHelper'
 const REPLY_PAGE_COUNT = 10
-const $ = window.$;
 
 /*
   相比较GraduateTopicReply 改动的地方
   列表接口名 /graduation_tasks/${graduation_topic_id}/show_comment.json?parent_id=${parent.id}&limit=500
   回复类型名 jour_type: this.props.jour_type,
 */
-class CommonReply extends Component{
-  constructor(props){
+class CommonReply extends Component {
+  constructor(props) {
     super(props);
-    this.state={
+    this.state = {
       pageCount: 1
     }
   }
 
-  componentDidMount(){
+  componentDidMount() {
     this.fetchReplies()
 
 
@@ -49,16 +48,15 @@ class CommonReply extends Component{
     const { memo } = this.props;
     const url = `/users/reply_message.json`;
 
-    let { comments } = this.state;
     axios.post(url, {
-        journals_for_message: {
-          jour_type: this.props.jour_type,
-          jour_id: graduation_topic_id,
-          notes: content,
-          // m_parent_id
-          reply_id: memo.user_id || this.state.homework_user_id
-        }
+      journals_for_message: {
+        jour_type: this.props.jour_type,
+        jour_id: graduation_topic_id,
+        notes: content,
+        // m_parent_id
+        reply_id: memo.user_id || this.state.homework_user_id
       }
+    }
     ).then((response) => {
       if (response.data.status === -1) {
         console.error('服务端异常')
@@ -87,13 +85,7 @@ class CommonReply extends Component{
     })
   }
   replyComment = (commentContent, id, editor) => {
-    const { showNotification } = this.props;
-    // if (!commentContent || commentContent.length === 0) {
-    //   showNotification(NEED_TO_WRITE_CONTENT)
-    //   return;
-    // }
-
-    if (this.props.memo.id === id ) { // 回复帖子
+    if (this.props.memo.id === id) { // 回复帖子
       this.createNewComment(commentContent, id, editor);
       return;
     }
@@ -107,56 +99,56 @@ class CommonReply extends Component{
 
     commentContent = handleContentBeforeCreateSecondLevelComment(commentContent)
     axios.post(url, {
-          journals_for_message: {
-            // 'GraduationTask'
-            jour_type: this.props.jour_type,
-            jour_id: graduation_topic_id,
-            notes: commentContent,
-            m_parent_id: id,
-            reply_id: comment.user_id
-          }
-        },
-        {
-        }
-      ).then((response) => {
-        if (response.data.id) {
-          let newId = response.data.id;
+      journals_for_message: {
+        // 'GraduationTask'
+        jour_type: this.props.jour_type,
+        jour_id: graduation_topic_id,
+        notes: commentContent,
+        m_parent_id: id,
+        reply_id: comment.user_id
+      }
+    },
+      {
+      }
+    ).then((response) => {
+      if (response.data.id) {
+        let newId = response.data.id;
 
-          const newMemo2 = Object.assign({}, this.props.memo);
-          newMemo2.total_count = newMemo2.total_count + 1;
+        const newMemo2 = Object.assign({}, this.props.memo);
+        newMemo2.total_count = newMemo2.total_count + 1;
 
-          this.setState({
-            comments: addSecondLevelComment(comments, comment, commentIndex, newId, commentContent, user, editor),
-            memo: newMemo2,
-            total_count: this.state.total_count + 1
+        this.setState({
+          comments: addSecondLevelComment(comments, comment, commentIndex, newId, commentContent, user, editor),
+          memo: newMemo2,
+          total_count: this.state.total_count + 1
 
-          })
-        }
+        })
+      }
 
-      }).catch((error) => {
-        console.log(error)
-      })
+    }).catch((error) => {
+      console.log(error)
+    })
   }
 
   loadMoreChildComments = (parent) => {
     const graduation_topic_id = this.props.memo.id
     const course_id = this.props.course_id
     const url = `/${this.props.apiRouteName}/${graduation_topic_id}/show_comment.json?parent_id=${parent.id}&limit=500`
-    axios.get(url,{
+    axios.get(url, {
     })
-    .then((response) => {
-      const { comments } = response.data
+      .then((response) => {
+        const { comments } = response.data
 
 
-      // const memo = Object.assign({}, this.state.memo)
-      // memo.sum_replies_count = sum_replies_count;
-      this.setState({
-        // memo,
-        comments: generateChildComments(comments, this.state.comments, parent, this.transformReply)
+        // const memo = Object.assign({}, this.state.memo)
+        // memo.sum_replies_count = sum_replies_count;
+        this.setState({
+          // memo,
+          comments: generateChildComments(comments, this.state.comments, parent, this.transformReply)
+        })
+      }).catch((error) => {
+        console.log(error)
       })
-    }).catch((error) => {
-      console.log(error)
-    })
   }
 
   onPaginationChange = (pageCount) => {
@@ -170,20 +162,20 @@ class CommonReply extends Component{
     const course_id = this.props.course_id
     const url = `/${this.props.apiRouteName}/${graduation_topic_id}/show_comment.json?page=${this.state.pageCount}`
     // page limit parent_id
-    axios.get(url,{
+    axios.get(url, {
     })
-    .then((response) => {
-      const { comments, messages_count, homework_user_id, parent_messages_count } = response.data
+      .then((response) => {
+        const { comments, messages_count, homework_user_id, parent_messages_count } = response.data
 
-      this.setState({
-        comments: generateComments(comments, this.transformReply),
-        // : this.state.comments.concat(comments),
-        total_count: parent_messages_count,
-        homework_user_id
+        this.setState({
+          comments: generateComments(comments, this.transformReply),
+          // : this.state.comments.concat(comments),
+          total_count: parent_messages_count,
+          homework_user_id
+        })
+      }).catch((error) => {
+        console.log(error)
       })
-    }).catch((error) => {
-      console.log(error)
-    })
   }
 
   transformReply = (reply, children = []) => {
@@ -231,12 +223,12 @@ class CommonReply extends Component{
     }
   }
 
-  render(){
+  render() {
     let { total_count, comments, pageCount } = this.state
     const { current_user, memo } = this.props
 
-    return(
-      <div style={{background: 'rgb(255, 255, 255)', marginTop: '20px'}} className="course-message">
+    return (
+      <div style={{ background: 'rgb(255, 255, 255)', marginTop: '20px' }} className="course-message">
         <style>{`
           .course-message .commentInput {
             padding-bottom: 56px !important;
@@ -250,14 +242,14 @@ class CommonReply extends Component{
           }
         `}</style>
         <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么"
-            height={160} showError={true} imageExpand={true}
-            replyComment={this.replyComment}
-             {...this.props}
-            commentsLength={comments ? comments.length : 0}
+          height={160} showError={true} imageExpand={true}
+          replyComment={this.replyComment}
+          {...this.props}
+          commentsLength={comments ? comments.length : 0}
         ></MemoDetailMDEditor>
         {/* bor-bottom-greyE */}
         <div className="padding40  memoReplies commentsDelegateParent"
-            style={{ display: (comments && !!comments.length) ? 'block' : 'none' }}>
+          style={{ display: (comments && !!comments.length) ? 'block' : 'none' }}>
           <div className="replies_count">
             <span className="labal">全部回复</span>
             <span className="count">{total_count}</span>
@@ -277,21 +269,15 @@ class CommonReply extends Component{
             showRewardButton={false}
             onlySuperAdminCouldHide={true}
           ></Comments>
-
-
-            {/* { true ?  :
-            <div className="memoMore">
-              <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
-            </div>} */}
         </div>
 
-        { total_count > REPLY_PAGE_COUNT &&
-        <div className="memoMore">
-          <Pagination showQuickJumper onChange={this.onPaginationChange} current={pageCount} total={total_count} pageSize={10}/>
-          <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
-        </div> }
+        {total_count > REPLY_PAGE_COUNT &&
+          <div className="memoMore">
+            <Pagination showQuickJumper onChange={this.onPaginationChange} current={pageCount} total={total_count} pageSize={10} />
+            <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
+          </div>}
       </div>
     )
   }
 }
-export default ImageLayerOfCommentHOC() (CommonReply);
\ No newline at end of file
+export default ImageLayerOfCommentHOC()(CommonReply);
\ No newline at end of file
diff --git a/src/modules/courses/competitions/Competition_teams/Competitionteams.js b/src/modules/courses/competitions/Competition_teams/Competitionteams.js
index be6c2e68..ef9cf58c 100644
--- a/src/modules/courses/competitions/Competition_teams/Competitionteams.js
+++ b/src/modules/courses/competitions/Competition_teams/Competitionteams.js
@@ -250,7 +250,7 @@ class Competitionteams extends Component{
 						<Content className={"teamsLayoutContent"}>
 							<Table className="teamsLayoutTable" columns={shixuncolumns} dataSource={this.state.shixundata} bordered pagination={false}/>
 						</Content>
-						<Content className={"teamsLayoutitle mt40"}>翻转课堂</Content>
+						<Content className={"teamsLayoutitle mt40"}>教学课堂</Content>
 						<Content className={"teamsLayoutContents"}>
 							<Table className="teamsLayoutTable" columns={coursecolumns} dataSource={this.state.coursedata} bordered pagination={false}/>
 						</Content>
diff --git a/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsMd.js b/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsMd.js
index 9ea97217..0cae1e2a 100644
--- a/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsMd.js
+++ b/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsMd.js
@@ -34,7 +34,7 @@ class CompetitionContentsMd extends Component{
 
 			}else{
 				chart_rules.rule_contents.map((items,keys)=>{
-					debugger
+
 					if(parseInt(this.props.tabkey)===items.competition_stage_id){
 						console.log(items)
 						this.contentMdRef.current.setValue(items.content);
diff --git a/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js b/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js
index d48ea8fe..6c4cf72a 100644
--- a/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js
+++ b/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/Bankcardnumberverification.js
@@ -1,12 +1,12 @@
-import React, {Component} from 'react';
-import {Button, Layout, Input, Form} from 'antd';
+import React, { Component } from 'react';
+import { Button, Layout, Input, Form } from 'antd';
 import axios from 'axios';
-import {getImageUrl} from 'educoder';
+import { getImageUrl } from 'educoder';
 import mycompetotionchild from './mycompetotionchild.css';
-import {getHiddenName} from "../../../../user/account/AccountBasicEdit";
+import { getHiddenName } from "../../../../user/account/AccountBasicEdit";
 import '../../../../courses/css/Courses.css'
 
-export const identityMap = {"teacher": "教师", "student": "学生", "professional": "专业人士"}
+export const identityMap = { "teacher": "教师", "student": "学生", "professional": "专业人士" }
 
 class Bankcardnumberverification extends Component {
 	constructor(props) {
@@ -32,7 +32,7 @@ class Bankcardnumberverification extends Component {
 		// console.log(this.props)
 		try {
 			this.props.triggerRef(this);
-		}catch (e) {
+		} catch (e) {
 
 		}
 		console.log(this.props.bank_account);
@@ -46,30 +46,28 @@ class Bankcardnumberverification extends Component {
 			})
 			this.setState({
 				openingbank: this.props.bank_account.bank,
-				subbranch:   this.props.bank_account.second_bank,
+				subbranch: this.props.bank_account.second_bank,
 				subbranchs: this.props.bank_account.card_no,
 			})
 		}
 
 	}
 
-	 setdata(bank,second_bank,card_no){
-		 this.props.form.setFieldsValue({
-			 openingbank: bank,
-			 subbranch: second_bank,
-			 subbranchs:card_no,
-		 })
-	 }
+	setdata(bank, second_bank, card_no) {
+		this.props.form.setFieldsValue({
+			openingbank: bank,
+			subbranch: second_bank,
+			subbranchs: card_no,
+		})
+	}
 	componentDidUpdate = (prevProps) => {
 		if (prevProps.bank_account != this.props.bank_account) {
-			console.log("componentDidUpdate");
-			console.log(this.props);//是新数据
-			console.log(prevProps);//是老数据
+
 			////console.log("Registration");
 			////console.log("componentDidUpdate");
 			////console.log(this.props.user.admin);
 			try {
-				if(this.props.bank_account){
+				if (this.props.bank_account) {
 					this.props.form.setFieldsValue({
 						openingbank: this.props.bank_account.bank,
 						subbranch: this.props.bank_account.second_bank,
@@ -78,10 +76,10 @@ class Bankcardnumberverification extends Component {
 				}
 				this.setState({
 					openingbank: this.props.bank_account.bank,
-					subbranch:   this.props.bank_account.second_bank,
+					subbranch: this.props.bank_account.second_bank,
 					subbranchs: this.props.bank_account.card_no,
 				})
-			}catch (e) {
+			} catch (e) {
 
 			}
 		}
@@ -92,46 +90,46 @@ class Bankcardnumberverification extends Component {
 			if (!err) {
 				let url = `/competitions/${this.props.match.params.identifier}/prize_leader_account.json`;
 				axios.patch(url, {
-					  user_id:this.props.userdata.id,
-						bank: values.openingbank,
-						second_bank: values.subbranch ,
-						card_no: values.subbranchs
-					})
+					user_id: this.props.userdata.id,
+					bank: values.openingbank,
+					second_bank: values.subbranch,
+					card_no: values.subbranchs
+				})
 					.then((result) => {
 						try {
 							if (result.data.status === 0) {
-							  try {
+								try {
 									// console.log(values.openingbank);
 									// console.log(values.subbranch);
 									// console.log(values.subbranchs);
 									this.props.form.setFieldsValue({
 										openingbank: values.openingbank,
-										subbranch:   values.subbranch,
+										subbranch: values.subbranch,
 										subbranchs: values.subbranchs,
 									});
 									this.setState({
 										openingbank: values.openingbank,
-										subbranch:   values.subbranch,
+										subbranch: values.subbranch,
 										subbranchs: values.subbranchs,
 									})
-								}catch (e) {
+								} catch (e) {
 
 								}
 
 								try {
 									this.props.showNotification(`提交成功,等待审核!`);
 
-								}catch (e) {
+								} catch (e) {
 
 								}
-			          try {
+								try {
 									this.props.getdata(this.props.userdata.id);
-								}catch (e) {
+								} catch (e) {
 
 								}
-						    try {
+								try {
 									this.props.GetawardinformationAPI();
-								}catch (e) {
+								} catch (e) {
 
 								}
 							}
@@ -140,16 +138,16 @@ class Bankcardnumberverification extends Component {
 						}
 
 					}).catch((error) => {
-					console.log(error);
-				})
+						console.log(error);
+					})
 			}
 		})
 
 	}
 
 	render() {
-		const {getFieldDecorator} = this.props.form;
-		const {updating, seconds, secondsFlag, basicInfo, phonebool, emailbool, certification, formationdata, bank_account_editable, leader, bank_account} = this.state
+		const { getFieldDecorator } = this.props.form;
+		const { updating, seconds, secondsFlag, basicInfo, phonebool, emailbool, certification, formationdata, bank_account_editable, leader, bank_account } = this.state
 		return (
 			<div>
 				<div className="flexdirections mt36">
@@ -218,7 +216,7 @@ class Bankcardnumberverification extends Component {
 											width: 276px !important
 											}
 											
-											// class="ant-col ant-form-item-label"
+											// className="ant-col ant-form-item-label"
           `}</style>
 					<div className="settingFormsy">
 						<React.Fragment>
@@ -229,7 +227,7 @@ class Bankcardnumberverification extends Component {
 								>
 									{getFieldDecorator('openingbank', {
 										rules: [{
-										  initialValue:this.state.openingbank,
+											initialValue: this.state.openingbank,
 											required: true,
 											message: '请输入开户行',
 										}],
@@ -244,7 +242,7 @@ class Bankcardnumberverification extends Component {
 								>
 									{getFieldDecorator('subbranch', {
 										rules: [{
-											 initialValue: this.state.subbranch,
+											initialValue: this.state.subbranch,
 											required: true,
 											message: '请输入支行',
 										}],
@@ -259,7 +257,7 @@ class Bankcardnumberverification extends Component {
 								>
 									{getFieldDecorator('subbranchs', {
 										rules: [{
-										  initialValue: this.state.subbranchs,
+											initialValue: this.state.subbranchs,
 											required: true,
 											message: '请输入账号',
 										}],
@@ -286,7 +284,7 @@ class Bankcardnumberverification extends Component {
 	}
 }
 
-const Bankcardnumberverifications = Form.create({name: 'Bankcardnumberverification'})(Bankcardnumberverification);
+const Bankcardnumberverifications = Form.create({ name: 'Bankcardnumberverification' })(Bankcardnumberverification);
 
 export default Bankcardnumberverifications;
 
diff --git a/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
index b4826241..4f1e6d81 100644
--- a/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
+++ b/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
@@ -32,8 +32,7 @@ class CompetitionContentspdfpeopledata extends Component {
 
 	componentDidMount() {
 		window.document.title = '竞赛';
-		console.log("获取用户信息");
-		console.log(this.props);
+
 
 		this.GetawardinformationAPI();
 		let query=this.props.location&&this.props.location.search;
diff --git a/src/modules/courses/coursesDetail/CoursesBanner.js b/src/modules/courses/coursesDetail/CoursesBanner.js
index 99d5f760..fbe37a23 100644
--- a/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -1,171 +1,160 @@
-import React, {Component} from 'react';
-import {Link} from "react-router-dom";
+import React, { Component } from 'react';
+import { Link } from "react-router-dom";
 import axios from 'axios';
-import {getImageUrl, trigger, on, off} from 'educoder';
-import { Tooltip, message,Popover,Breadcrumb} from 'antd';
+import { getImageUrl, trigger, on, off } from 'educoder';
+import { Tooltip, message, Popover, Breadcrumb } from 'antd';
 import CoursesListType from '../coursesPublic/CoursesListType';
-import AccountProfile from"../../user/AccountProfile";
+import AccountProfile from "../../user/AccountProfile";
 import Addcourses from '../coursesPublic/Addcourses';
 import '../css/Courses.css';
 import Modals from "../../modals/Modals";
-import Guide from './CoursesGuide';
 import AddStudentModal from '../members/modal/AddStudentModal'
 import AddTeacherModal from '../members/modal/AddTeacherModal'
 import Jointheclass from '../../modals/Jointheclass'
 import Certifiedprofessional from "../../modals/Certifiedprofessional";
-// 点击按钮复制功能
-// function jsCopy(){
-//   var e = document.getElementById("copy_invite_code");
-//   e.select();
-//   document.execCommand("Copy");
-//   codesuccess()
-// }
+import './course-banner.css'
 
 // 点击按钮复制功能
 function jsCopy() {
-    var e = document.getElementById("copy_invite_code");
-    e.select();
-    document.execCommand("Copy");
-    codesuccess()
+  var e = document.getElementById("copy_invite_code");
+  e.select();
+  document.execCommand("Copy");
+  codesuccess()
 }
 
 function codesuccess() {
-    message.success('复制成功');
+  message.success('复制成功');
 };
 
 class CoursesBanner extends Component {
-    constructor(props) {
-        super(props)
-        this.state = {
-            show: false,
-            Addcoursestypes: false,
-            modalsType: false,
-            modalsTopval: "",
-            loadtype: false,
-            metype: 0,
-            modalsBottomval: "",
-            antIcon:false,
-            coursedata:undefined,
-            is_guide:false,
-            excellent:false,//是否是精品课堂
-            yslJointhe:false,
-            mydisplay:false,
-            yslJointhes:false,
+  constructor(props) {
+    super(props)
+    this.state = {
+      show: false,
+      Addcoursestypes: false,
+      modalsType: false,
+      modalsTopval: "",
+      loadtype: false,
+      metype: 0,
+      modalsBottomval: "",
+      antIcon: false,
+      coursedata: undefined,
+      is_guide: false,
+      excellent: false,//是否是精品课堂
+      yslJointhe: false,
+      mydisplay: false,
+      yslJointhes: false,
+
+    }
+  }
+  componentDidMount() {
+
+    this.onloadupdatabanner()
+    on('updatabanner', this.updatabanner)
+    if (this.props.match.path === "/classrooms/:coursesId") {
+      if (this.props.user != undefined) {
+        this.props.history.push(this.props.user.first_category_url)
+      }
+    }
+    axios.interceptors.response.use((response) => {
+      if (response != undefined)
+        if (response && response.data.status === 410) {
+          this.setState({
+            yslJointhe: true,
+            yslJointhes: true
+          })
 
         }
-    }
-    componentDidMount() {
-			this.onloadupdatabanner()
-      on('updatabanner', this.updatabanner)
-			if(this.props.match.path==="/courses/:coursesId"){
-				if(this.props.user!=undefined){
-					this.props.history.push(this.props.user.first_category_url)
-				}
-			}
-      axios.interceptors.response.use((response) => {
-        if (response != undefined)
-          if (response && response.data.status === 410) {
-           this.setState({
-             yslJointhe:true,
-             yslJointhes:true
-           })
-
-          }
-        return response;
-      }, (error) => {
-      });
-    }
-	componentDidUpdate(prevProps) {
-    	if(prevProps.user!=this.props.user){
-				if(this.props.match.path==="/courses/:coursesId"){
-					if(this.props.user!=undefined){
-						this.props.history.push(this.props.user.first_category_url)
-					}
-				}
-			}
-	}
-    componentWillUnmount() {
-      off('updatabanner', this.updatabanner)
-    }
-
-  HideAddcoursestypess=(i)=>{
-    console.log("调用了");
-    this.setState({
-      Addcoursestypes:false,
-      mydisplay:true,
-      occupation:i,
-    })
-  };
-  ModalCancelsy=()=>{
-    this.setState({
-      mydisplay:false,
-    })
-  };
-
-  onloadupdatabanner=()=>{
-		this.updatabanner()
-	}
-  updatabanner=()=>{
-    const query = this.props.location.search;
-    var dataqueryss={}
-    try {
-      var foqus=this.foo(query);
-      if(JSON.stringify(foqus) ==="{}"){
-        this.setState({
-          dataquerys:{},
-        });
-      }else{
-        this.setState({
-          dataquerys:foqus,
-        });
-        dataqueryss=foqus;
+      return response;
+    }, (error) => {
+    });
+  }
+  componentDidUpdate(prevProps) {
+    if (prevProps.user != this.props.user) {
+      if (this.props.match.path === "/classrooms/:coursesId") {
+        if (this.props.user != undefined) {
+          this.props.history.push(this.props.user.first_category_url)
+        }
       }
-    }catch (e) {
+    }
+  }
+  componentWillUnmount() {
+    off('updatabanner', this.updatabanner)
+  }
+
+  HideAddcoursestypess = (i) => {
+    this.setState({
+      Addcoursestypes: false,
+      mydisplay: true,
+      occupation: i,
+    })
+  };
+  ModalCancelsy = () => {
+    this.setState({
+      mydisplay: false,
+    })
+  };
+
+  onloadupdatabanner = () => {
+    this.updatabanner()
+  }
+  updatabanner = () => {
+    const query = this.props.location.search;
+    var dataqueryss = {}
+    try {
+      var foqus = this.foo(query);
+      if (JSON.stringify(foqus) === "{}") {
+        this.setState({
+          dataquerys: {},
+        });
+      } else {
+        this.setState({
+          dataquerys: foqus,
+        });
+        dataqueryss = foqus;
+      }
+    } catch (e) {
       this.setState({
-        dataquerys:{},
+        dataquerys: {},
       })
     }
-      let courseId = this.props.match.params.coursesId;
-      let url = "/courses/" + courseId + "/top_banner.json"
-      axios.get(url,{params:
+    let courseId = this.props.match.params.coursesId;
+    let url = "/courses/" + courseId + "/top_banner.json"
+    axios.get(url, {
+      params:
         dataqueryss
-      }).then((result) => {
-				if(result.data.status===-2){
-  				// this.setState({
-					// 	AccountProfiletype:true,
-					// 	content:result.data.message,
-					// 	okText:"立即认证",
-					// 	cannelText:"稍后认证",
-					// 	okHref:`/account/certification`,
-					// 	Accounturltype:true
-					// })
-				}else{
-						if( result!=undefined){
-							let data = result.data;
-							this.setState({
-								coursedata: data,
-								excellent:data.excellent,
-							})
-							this.props.ispostexcellenttype(data.excellent)
-						}else{
-							this.onloadupdatabanner()
-						}
-				}
+    }).then((result) => {
+      try {
+        if (result.data.status === -2) {
+        } else {
+          if (result != undefined) {
+            let data = result.data;
+            this.setState({
+              coursedata: data,
+              excellent: data.excellent,
+            })
+            this.props.ispostexcellenttype(data.excellent)
+          } else {
+            this.onloadupdatabanner()
+          }
+        }
+      } catch (e) {
 
-      })
+      }
+
+
+    })
   };
-  foo=(url)=> {
+  foo = (url) => {
     var json = {};
     var regExp = /[\?\&](\w+)(=?)(\w*)/g;
     var arr;
     do {
       arr = regExp.exec(url);
-      // console.log(arr); // arr = [完整的字符串, key, 等号或'', value或'']
 
       if (arr) {
         var key = arr[1];
         var value = arr[3];
-        // arr[2] === ''时, value = undefined
         if (!arr[2])
           value = undefined;
 
@@ -177,553 +166,473 @@ class CoursesBanner extends Component {
   };
 
 
-    tojoinclass = (val) => {
-			if(this.props.current_user&&this.props.current_user.profile_completed===false){
-				this.setState({
-					AccountProfiletype:true
-				})
-				return
-			}
-
-        if (val === 1) {
-            this.setState({
-                Addcoursestypes: true,
-            })
-        } else {
-            this.setState({
-                Addcoursestypes: false,
-            })
-        }
-
-
-    };
-
-    //精品课堂的弹框
-    myyslgradin=()=>{
-       this.setState({
-         yslJointhe:true
-       })
-    }
-    showActionPoll=(i,s,ss,trs)=>{
-        this.setState({
-            modalsType: true,
-            modalsTopval: s,
-            loadtype: false,
-            metype: i,
-            modalsBottomval: ss,
-					  modalstrsvalue:trs,
-        })
-    }
-    ActionPoll = (i) => {
-        let {coursedata}=this.state;
-        var s = "";
-        var ss = "";
-        if (i === 1) {
-            s = "课堂删除后数据将无法恢复，是否确定删除？";
-            this.showActionPoll(i,s)
-        }
-        if (i === 2) {
-            s = "您确定要设置为私有?";
-            this.showActionPoll(i,s)
-        }
-        if (i === 3) {
-            s = "设为公开后，非课堂成员也可以访问查看";
-					  ss =  "是否确认设为公开？";
-            this.showActionPoll(i,s,ss)
-        }
-
-			if(i===4){
-            if(coursedata.code_halt === true){
-                var url = `/courses/${this.props.match.params.coursesId}/set_invite_code_halt.json`
-                axios.post(url, {}).then((result) => {
-                    try {
-                        if (result.data.status === 0){
-                            this.updatabanner()
-                        }
-                    } catch (e) {
-
-                    }
-
-                })
-            }else{
-                s = "课堂邀请码停用后，用户不能主动加入该课堂了";
-                ss =  "您是否确认停用?";
-                this.showActionPoll(i,s,ss)
-            }
-            }
-        if (i ===5) {
-            s = `“复制”功能将会为您创建一个新的课堂`;
-            ss = "请问是否继续？";
-            let mid="旧课堂的作业、资源、试卷等都将被复制到新的课堂里面";
-            this.showActionPoll(i,s,ss,mid)
-        }
-
-    }
-    //取消
-    modalCancel = () => {
-        this.setState({
-            modalsType: false,
-            modalsTopval: "",
-            modalsBottomval:"",
-            loadtype: false,
-            antIcon:false,
-					  modalstrsvalue:undefined
-        })
-
-    }
-    // 确定
-    ModalAction = () => {
-        let {coursedata}=this.state;
-        let that=this;
-        var push = this.props.history;
-        let id = this.props.match.params.coursesId;
-        //删除
-        if (this.state.metype === 1) {
-          that.setState({
-            antIcon:true
-          })
-
-            var url = `/courses/${id}.json`
-            axios
-                .delete(url, {})
-                .then(function (response) {
-                    console.log(response.data.status)
-                    if (response.data.status === 0) {
-                        that.setState({
-                          antIcon:false
-                        })
-                        that.modalCancel();
-                        message.success("删除成功", 1)
-                        push.push(`/courses`)
-
-                    }
-                })
-        }
-        //设为私有的
-        if (this.state.metype === 2) {
-            this.modalCancel();
-            var state = this.state;
-            var url = `/courses/${id}/set_public_or_private.json`
-            axios.post(url, {}).then((result) => {
-                    if (result.data.status === 0) {
-                        message.success("设为私有的成功", 1);
-                        state.coursedata.is_public = false;
-                        this.setState({
-                            coursedata: state.coursedata,
-                        })
-                    }
-            })
-        }
-        //设为公有的
-        if (this.state.metype === 3) {
-            this.modalCancel();
-            var state = this.state;
-            var url = `/courses/${id}/set_public_or_private.json`
-            axios.post(url, {}).then((result) => {
-                    if (result.data.status === 0) {
-                        message.success("设为公有的成功", 1);
-                        state.coursedata.is_public = true;
-                        this.setState({
-                            coursedata: state.coursedata,
-                        })
-                    }
-            })
-        }
-        //停用邀请码
-        if (this.state.metype === 4) {
-            this.modalCancel();
-            var url = `/courses/${id}/set_invite_code_halt.json`
-            axios.post(url, {}).then((result) => {
-                try {
-                    if (result.data.status === 0) {
-                        message.success(coursedata.code_halt === true?"启用用邀请码成功":"停用邀请码成功", 1);
-                        this.updatabanner()
-                    }
-                } catch (e) {
-
-                }
-
-            })
-        }
-        if (this.state.metype ===5) {
-            this.setState({
-                antIcon: true,
-            })
-            var url = `/courses/${id}/duplicate_course.json`
-            axios.post(url).then((response) => {
-              if(response!==undefined){
-                window.location.href = "/courses/" + response.data.new_course_id+"/students";
-                return
-              }
-              this.modalCancel();
-                // window.location.href = "/courses/" + response.data.new_course_id;
-
-            }).catch( (error)=> {
-              this.modalCancel();
-              console.log(252);
-              console.log(error);
-            });
-        }
-
-        if(this.state.metype===6){
-          this.setState({
-            antIcon: true,
-          })
-          var url =`/courses/${id}/exit_course.json`;
-          axios.post(url).then((response) => {
-            if(response.data.status===0){
-              window.location.href = "/users/" + this.props.current_user.login;
-            }
-          })
-        }
-
-
-    }
-    addTeacher = (isTeacher) => {
-        this.setState({ isTeacher }, () => {
-            this.refs.addTeacherModal.setVisible(true)
-        })
-
-    }
-    addStudent = () => {
-        this.refs.addStudentModal.setVisible(true)
-    }
-    addTeacherSuccess = (params) => {
-        trigger('addTeacherSuccess', JSON.stringify(params))
-        this.updatabanner()
-    }
-    addStudentSuccess = (params) => {
-        trigger('addStudentSuccess', JSON.stringify(params))
-        this.updatabanner()
-    }
-    //退出课堂按钮
-    exitclass=()=>{
+  tojoinclass = (val) => {
+    if (this.props.current_user && this.props.current_user.profile_completed === false) {
       this.setState({
-        modalsType: true,
-        modalsTopval: "退出后您将不再是本课题的成员,作品将全部被删除，",
-        modalsBottomval:"确定要退出该课堂吗？",
-        metype:6
+        AccountProfiletype: true
+      })
+      return
+    }
+
+    if (val === 1) {
+      this.setState({
+        Addcoursestypes: true,
+      })
+    } else {
+      this.setState({
+        Addcoursestypes: false,
       })
     }
-  //切换身份
-  switchidentity=(sum)=>{
-    let newurl=this.props.match.url;
+
+
+  };
+
+  //精品课堂的弹框
+  myyslgradin = () => {
+    this.setState({
+      yslJointhe: true
+    })
+  }
+  showActionPoll = (i, s, ss, trs) => {
+    this.setState({
+      modalsType: true,
+      modalsTopval: s,
+      loadtype: false,
+      metype: i,
+      modalsBottomval: ss,
+      modalstrsvalue: trs,
+    })
+  }
+  ActionPoll = (i) => {
+    let { coursedata } = this.state;
+    var s = "";
+    var ss = "";
+    if (i === 1) {
+      s = "课堂删除后数据将无法恢复，是否确定删除？";
+      this.showActionPoll(i, s)
+    }
+    if (i === 2) {
+      s = "您确定要设置为私有?";
+      this.showActionPoll(i, s)
+    }
+    if (i === 3) {
+      s = "设为公开后，非课堂成员也可以访问查看";
+      ss = "是否确认设为公开？";
+      this.showActionPoll(i, s, ss)
+    }
+
+    if (i === 4) {
+      if (coursedata.code_halt === true) {
+        var url = `/courses/${this.props.match.params.coursesId}/set_invite_code_halt.json`
+        axios.post(url, {}).then((result) => {
+          try {
+            if (result.data.status === 0) {
+              this.updatabanner()
+            }
+          } catch (e) {
+
+          }
+
+        })
+      } else {
+        s = "课堂邀请码停用后，用户不能主动加入该课堂了";
+        ss = "您是否确认停用?";
+        this.showActionPoll(i, s, ss)
+      }
+    }
+    if (i === 5) {
+      s = `“复制”功能将会为您创建一个新的课堂`;
+      ss = "请问是否继续？";
+      let mid = "旧课堂的作业、资源、试卷等都将被复制到新的课堂里面";
+      this.showActionPoll(i, s, ss, mid)
+    }
+
+  }
+  //取消
+  modalCancel = () => {
+    this.setState({
+      modalsType: false,
+      modalsTopval: "",
+      modalsBottomval: "",
+      loadtype: false,
+      antIcon: false,
+      modalstrsvalue: undefined
+    })
+
+  }
+  // 确定
+  ModalAction = () => {
+    let { coursedata } = this.state;
+    let that = this;
+    var push = this.props.history;
     let id = this.props.match.params.coursesId;
-    if(sum===1){
-     let url =`/courses/${id}/switch_to_student.json`;
-      axios.post(url).then((response) => {
-      	if(response!=undefined){
-					if(response.data.status===0){
-						// window.location.href = "/users/" + this.props.current_user.login;
-						// this.props.history.replace(newurl);
-						window.location.href=newurl
-					}
-				}
+    //删除
+    if (this.state.metype === 1) {
+      that.setState({
+        antIcon: true
+      })
+
+      var url = `/courses/${id}.json`
+      axios
+        .delete(url, {})
+        .then(function (response) {
+          console.log(response.data.status)
+          if (response.data.status === 0) {
+            that.setState({
+              antIcon: false
+            })
+            that.modalCancel();
+            message.success("删除成功", 1)
+            push.push(`/classrooms`)
+
+          }
+        })
+    }
+    //设为私有的
+    if (this.state.metype === 2) {
+      this.modalCancel();
+      var state = this.state;
+      var url = `/courses/${id}/set_public_or_private.json`
+      axios.post(url, {}).then((result) => {
+        if (result.data.status === 0) {
+          message.success("设为私有的成功", 1);
+          state.coursedata.is_public = false;
+          this.setState({
+            coursedata: state.coursedata,
+          })
+        }
       })
     }
-
-
-    if(sum===2){
-      let url =`/courses/${id}/switch_to_teacher.json`;
-      axios.post(url).then((response) => {
-				if(response!=undefined){
-					if(response.data.status===0){
-						// window.location.href = "/users/" + this.props.current_user.login;
-						// this.props.history.replace(newurl);
-						window.location.href=newurl
-					}
-				}
+    //设为公有的
+    if (this.state.metype === 3) {
+      this.modalCancel();
+      var state = this.state;
+      var url = `/courses/${id}/set_public_or_private.json`
+      axios.post(url, {}).then((result) => {
+        if (result.data.status === 0) {
+          message.success("设为公有的成功", 1);
+          state.coursedata.is_public = true;
+          this.setState({
+            coursedata: state.coursedata,
+          })
+        }
       })
     }
+    //停用邀请码
+    if (this.state.metype === 4) {
+      this.modalCancel();
+      var url = `/courses/${id}/set_invite_code_halt.json`
+      axios.post(url, {}).then((result) => {
+        try {
+          if (result.data.status === 0) {
+            message.success(coursedata.code_halt === true ? "启用用邀请码成功" : "停用邀请码成功", 1);
+            this.updatabanner()
+          }
+        } catch (e) {
 
-    if(sum===3){
-      let url =`/courses/${id}/switch_to_assistant.json`;
+        }
+
+      })
+    }
+    if (this.state.metype === 5) {
+      this.setState({
+        antIcon: true,
+      })
+      var url = `/courses/${id}/duplicate_course.json`
       axios.post(url).then((response) => {
-        if(response.data.status===0){
-          // window.location.href = "/users/" + this.props.current_user.login;
-          // this.props.history.replace(newurl);
-         window.location.href=newurl
+        if (response !== undefined) {
+          window.location.href = "/classrooms/" + response.data.new_course_id + "/students";
+          return
+        }
+        this.modalCancel();
+
+      }).catch((error) => {
+        this.modalCancel();
+        console.log(252);
+        console.log(error);
+      });
+    }
+
+    if (this.state.metype === 6) {
+      this.setState({
+        antIcon: true,
+      })
+      var url = `/courses/${id}/exit_course.json`;
+      axios.post(url).then((response) => {
+        if (response.data.status === 0) {
+          window.location.href = "/users/" + this.props.current_user.login;
         }
       })
     }
 
 
   }
-  postsettings=()=>{
-    window.location.href = "/courses/" + this.props.match.params.coursesId + "/settings";
-  };
-  postsettingstwo=()=>{
-   //  var ids =1;
-   // try {
-   //   if(this.state.coursedata.is_public){
-   //     ids=1;
-   //   }else {
-   //     ids=0;
-   //   }
-   // }catch (e) {
-   //
-   // }
-    window.location.href = `/courses/${this.props.match.params.coursesId}/newgolds/settings`;
-  };
-
-
-
-  hideAccountProfile=()=>{
-		this.setState({
-			AccountProfiletype:false,
-			content:undefined,
-			okText:undefined,
-			okHref:undefined,
-			cannelText:undefined,
-			Accounturltype:undefined
-		})
-	};
-  ysljoinmodalCancel=()=>{
-    this.setState({
-      yslJointhe:false
+  addTeacher = (isTeacher) => {
+    this.setState({ isTeacher }, () => {
+      this.refs.addTeacherModal.setVisible(true)
     })
-    if(this.state.yslJointhes===true){
+
+  }
+  addStudent = () => {
+    this.refs.addStudentModal.setVisible(true)
+  }
+  addTeacherSuccess = (params) => {
+    trigger('addTeacherSuccess', JSON.stringify(params))
+    this.updatabanner()
+  }
+  addStudentSuccess = (params) => {
+    trigger('addStudentSuccess', JSON.stringify(params))
+    this.updatabanner()
+  }
+  //退出课堂按钮
+  exitclassName = () => {
+    this.setState({
+      modalsType: true,
+      modalsTopval: "退出后您将不再是本课题的成员,作品将全部被删除，",
+      modalsBottomval: "确定要退出该课堂吗？",
+      metype: 6
+    })
+  }
+  //切换身份
+  switchidentity = (sum) => {
+    let newurl = this.props.match.url;
+    let id = this.props.match.params.coursesId;
+    if (sum === 1) {
+      let url = `/courses/${id}/switch_to_student.json`;
+      axios.post(url).then((response) => {
+        if (response != undefined) {
+          if (response.data.status === 0) {
+            window.location.href = newurl
+          }
+        }
+      })
+    }
+
+
+    if (sum === 2) {
+      let url = `/courses/${id}/switch_to_teacher.json`;
+      axios.post(url).then((response) => {
+        if (response != undefined) {
+          if (response.data.status === 0) {
+            window.location.href = newurl
+          }
+        }
+      })
+    }
+
+    if (sum === 3) {
+      let url = `/courses/${id}/switch_to_assistant.json`;
+      axios.post(url).then((response) => {
+        if (response.data.status === 0) {
+          window.location.href = newurl
+        }
+      })
+    }
+
+
+  }
+  postsettings = () => {
+    window.location.href = "/classrooms/" + this.props.match.params.coursesId + "/settings";
+  };
+  postsettingstwo = () => {
+    window.location.href = `/classrooms/${this.props.match.params.coursesId}/newgolds/settings`;
+  };
+
+
+
+  hideAccountProfile = () => {
+    this.setState({
+      AccountProfiletype: false,
+      content: undefined,
+      okText: undefined,
+      okHref: undefined,
+      cannelText: undefined,
+      Accounturltype: undefined
+    })
+  };
+  ysljoinmodalCancel = () => {
+    this.setState({
+      yslJointhe: false
+    })
+    if (this.state.yslJointhes === true) {
       window.location.href = "/";
     }
   };
-  ysljoinmodalCanceltwo=()=>{
+  ysljoinmodalCanceltwo = () => {
     this.setState({
-      yslJointhe:false
+      yslJointhe: false
     })
     window.location.reload();
   };
 
 
-	setHistoryFun=(url)=>{
-		this.props.history.replace(url)
-	}
+  setHistoryFun = (url) => {
+    this.updatabanner();
+    this.props.history.replace(url);
+  }
 
 
-    render() {
-        let { Addcoursestypes, coursedata,excellent, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon,is_guide,AccountProfiletype,modalstrsvalue} = this.state;
+  render() {
+    let { Addcoursestypes, coursedata, excellent, modalsType, modalsTopval, loadtype, modalsBottomval, antIcon, is_guide, AccountProfiletype, modalstrsvalue } = this.state;
 
-        const isCourseEnd = this.props.isCourseEnd();
-			  document.title=coursedata===undefined || coursedata.status===401 || coursedata.status===407?"":coursedata.name;
-        return (
-          <div>
-						{/*{*/}
-						{/*  is_guide && <Guide></Guide>*/}
-						{/*}*/}
+    const isCourseEnd = this.props.isCourseEnd();
+    document.title = coursedata === undefined || coursedata.status === 401 || coursedata.status === 407 ? "" : coursedata.name;
+    return (
+      <div>
 
-						{AccountProfiletype===true?<AccountProfile
-							hideAccountProfile={()=>this.hideAccountProfile()}
-							{...this.props}
-							{...this.state}
-						/>:""}
+        {AccountProfiletype === true ? <AccountProfile
+          hideAccountProfile={() => this.hideAccountProfile()}
+          {...this.props}
+          {...this.state}
+        /> : ""}
 
 
-            {
-              coursedata === undefined || coursedata.status===401? <div id="course_info_1309" className="courseHead" style={{height: '206px'}}></div>:<div id="course_info_1309" className="courseHead" style={{height: '206px'}}>
+        {
+          coursedata === undefined || coursedata.status === 401 ? <div id="course_info_1309" className="courseHead" style={{ height: '206px' }}></div> : <div id="course_info_1309" className="courseHead" style={{ height: '206px' }}>
 
-                {Addcoursestypes === true ? <Addcourses
-                  Addcoursestype={Addcoursestypes}
-                  hideAddcoursestype={() => this.tojoinclass(2)}
-                  HideAddcoursestypess={(i)=>this.HideAddcoursestypess(i)}
-                /> : ""}
-                <Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.ModalCancelsy} />
-                <Modals
-                  modalsType={modalsType}
-                  modalsTopval={modalsTopval}
-                  loadtype={loadtype}
-                  modalsBottomval={modalsBottomval}
-									modalsMidval={modalstrsvalue}
-                  modalCancel={this.modalCancel}
-                  modalSave={this.ModalAction}
-                  antIcon={antIcon}
-                ></Modals>
-                <Jointheclass   {...this.props}   {...this.state} ysljoinmodalCancel={()=>this.ysljoinmodalCancel()} ysljoinmodalCanceltwo={()=>this.ysljoinmodalCanceltwo()}></Jointheclass>
-                <AddTeacherModal ref="addTeacherModal"
-                                 {...this.props}
-                                 isTeacher={this.state.isTeacher}
-                                 moduleName={this.state.isTeacher ? "教师" : "助教"}
-                                 addTeacherSuccess={this.addTeacherSuccess}
-                ></AddTeacherModal>
-                <AddStudentModal ref="addStudentModal"
-                                 {...this.props}
-                                 moduleName="学生"
-                                 addStudentSuccess={this.addStudentSuccess}
-                ></AddStudentModal>
-                <div className="educontent clearfix educontentTop">
-                  <div className="color-white clearfix mb10">
+            {Addcoursestypes === true ? <Addcourses
+              Addcoursestype={Addcoursestypes}
+              hideAddcoursestype={() => this.tojoinclass(2)}
+              HideAddcoursestypess={(i) => this.HideAddcoursestypess(i)}
+            /> : ""}
+            <Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.ModalCancelsy} />
+            <Modals
+              modalsType={modalsType}
+              modalsTopval={modalsTopval}
+              loadtype={loadtype}
+              modalsBottomval={modalsBottomval}
+              modalsMidval={modalstrsvalue}
+              modalCancel={this.modalCancel}
+              modalSave={this.ModalAction}
+              antIcon={antIcon}
+            ></Modals>
+            <Jointheclass   {...this.props}   {...this.state} ysljoinmodalCancel={() => this.ysljoinmodalCancel()} ysljoinmodalCanceltwo={() => this.ysljoinmodalCanceltwo()}></Jointheclass>
+            <AddTeacherModal ref="addTeacherModal"
+              {...this.props}
+              isTeacher={this.state.isTeacher}
+              moduleName={this.state.isTeacher ? "教师" : "助教"}
+              addTeacherSuccess={this.addTeacherSuccess}
+            ></AddTeacherModal>
+            <AddStudentModal ref="addStudentModal"
+              {...this.props}
+              moduleName="学生"
+              addStudentSuccess={this.addStudentSuccess}
+            ></AddStudentModal>
+            <div className="educontent clearfix educontentTop">
+              <div className="course-banner-title">
 
-                    {
-                      coursedata===undefined || coursedata.status===401 || coursedata.status===407?"":
-                        <Tooltip placement="bottom" title={coursedata&&coursedata.name && coursedata.name.length<38?"":coursedata.name}>
-                          <span className="font-24 fl bannername">{coursedata.name}</span>
-                        </Tooltip>
+                {
+                  coursedata === undefined || coursedata.status === 401 || coursedata.status === 407 ? "" :
+                    <Tooltip placement="bottom" title={coursedata && coursedata.name && coursedata.name.length < 38 ? "" : coursedata.name}>
+                      <span className="font-24 fl bannername">{coursedata.name}</span>
+                    </Tooltip>
 
-                    }
-                    {/*私有：私有课堂，非课堂成员不能访问
+                }
+                {excellent === true ?
 
-                      公开：公开课堂，非课堂成员可以访问*/}
-                    <style>
-                      {
-                        `
-                        .tag-orangces  .tag-names{
-                        display: block;
-                        width: auto;
-                        background-color: #FF6800;
-                        background-size: 100% 100%;
-                        padding: 0px 4px;
-                        color: #fff;
-                        float: left;
-                        height: 28px;
-                        line-height: 28px;
-                        font-size: 14px;
-                        border-radius: 4px;
-                      }
-                      `
-                      }
-                    </style>
-                    {excellent===true?
+                  <CoursesListType
+                    typelist={["开放课程"]}
+                  />
 
-											<span>
-												<CoursesListType
-												typelist={["开放课程"]}
-												typesylename={"mt10"}/>
-											</span>
-                      :""}
-                    <span className={"TabsWarp"}>
-                      <CoursesListType
-                        typelist={coursedata.course_end === true ? ["已结束"] : coursedata.is_public === true ? ["公开"] : ["私有"]}
-                        typesylename={"mt10"} tipval={coursedata.is_public === true?"":"私有课堂，非课堂成员不能访问"}/>
-                    </span>
+                  : ""}
+                <CoursesListType
+                  typelist={coursedata.course_end === true ? ["已结束"] : coursedata.is_public === true ? ["公开"] : ["私有"]}
+                  tipval={coursedata.is_public === true ? "" : "私有课堂，非课堂成员不能访问"} />
+              </div>
 
 
-                  </div>
+              <div className="clearfix ">
+                <div className="flex-container mr40 mb20" >
+                  <a href={"/users/" + coursedata.teacher_login} >
+                    <img alt="头像" className="radius  mt3 bannerimgname"
+                      src={getImageUrl(`images/` + coursedata.teacher_img)} />
+                  </a>
+                  <a href={"/users/" + coursedata.teacher_login} className="mt13 color-white bannnerusername mt13">{coursedata.teacher_name}</a>
+                  <p className="mt13 color-white bannnerusernames">{coursedata.teacher_school}</p>
+                </div>
 
-                  <div className="clearfix ">
-                    <div className="fl fl mr40 mb20">
+                <div>
+                  {this.props.isStudent() ? this.props.current_user && this.props.current_user.course_is_end === true ? "" : <a className="fr user_default_btn user_blue_btn mr20 font-18"
+                    onClick={() => this.exitclass()}
+                  > 永久退出课堂 </a> : ""}
 
-                      <a href={"/users/" + coursedata.teacher_login} className="fl">
-                        <img alt="头像" className="radius fl mt3 bannerimgname"
-                             src={getImageUrl(`images/` + coursedata.teacher_img)}/>
-                      </a>
+                  {coursedata.switch_to_student === true ?
+                    <Tooltip placement="bottom" title={
+                      <pre>由教师/助教身份切换至学生<br />可进行提交作品、答题等操作</pre>
+                    }>
+                      <a className="fr user_default_btn user_blue_btn mr20 font-18"
+                        onClick={() => this.switchidentity(1)}
+                      > 切换为学生 </a>
+                    </Tooltip>
+                    : ""}
 
-                      <div className="fl mt13">
-                        <p className="color-white">
-                          <a href={"/users/" + coursedata.teacher_login}
-                             className="color-white bannnerusername">{coursedata.teacher_name}</a>
-                        </p>
-                      </div>
-
-                      <div className="fl mt13">
-                        <p className="color-white bannnerusernames">{coursedata.teacher_school}</p>
-                      </div>
-
-                    </div>
-
-                    {/*{excellent===false?*/}
-                    {/*  :*/}
-                    {/*  <div>*/}
-                    {/*    <style>*/}
-                    {/*      {*/}
-                    {/*        `*/}
-                    {/*      .user_white_btn{border: 1px solid #ffffff;color: #ffffff!important;}*/}
-                    {/*      */}
-                    {/*      `*/}
-                    {/*      }*/}
-                    {/*    </style>*/}
-                    {/*    /!*coursedata.course_identity === 6 是非课堂成员*!/*/}
-                    {/*    {coursedata.course_identity === 6&&coursedata.educoder_teacher===false?*/}
-                    {/*      <a className="fr user_default_btn user_white_btn mr20 font-18" style={{width:"130px"}}*/}
-                    {/*         onClick={() => this.myyslgradin()}>加入课堂</a>: ""}*/}
-
-                    {/*    {coursedata.course_identity === 6&&coursedata.educoder_teacher===true?*/}
-                    {/*      <a className="fr user_default_btn user_white_btn mr20 font-18"  style={{width:"130px"}}*/}
-                    {/*         onClick={() => this.myyslgradin()}>加入课堂</a>: ""}*/}
-
-                    {/*    /!*{this.props.isStudent()?<a className="fr user_default_btn user_blue_btn mr20 font-18"*!/*/}
-                    {/*    /!*                           onClick={() => this.exitclass()}*!/*/}
-                    {/*    /!*> 退出课堂 </a>:""}*!/*/}
-                    {/*  </div>*/}
-
-                    {/*}*/}
-                    <div>
-                      {coursedata.switch_to_student === true ?
-                        <Tooltip placement="bottom" title={
-													<pre>由教师/助教身份切换至学生<br/>可进行提交作品、答题等操作</pre>
-                        }>
-                          <a className="fr user_default_btn user_blue_btn mr20 font-18"
-                             onClick={()=>this.switchidentity(1)}
-                          > 切换为学生 </a>
-                        </Tooltip>
-                        :""}
-
-                      {coursedata.switch_to_teacher === true ?
-                        <Tooltip placement="bottom" title={
-													<pre>由学生身份切换至教师<br/>拥有添加成员、发布作业等管理权限</pre>
-                        }>
-                          <a className="fr user_default_btn user_blue_btn mr20 font-18"
-                             onClick={()=>this.switchidentity(2)}
-                          > 切换为老师 </a>
-                        </Tooltip>:""}
+                  {coursedata.switch_to_teacher === true ?
+                    <Tooltip placement="bottom" title={
+                      <pre>由学生身份切换至教师<br />拥有添加成员、发布作业等管理权限</pre>
+                    }>
+                      <a className="fr user_default_btn user_blue_btn mr20 font-18"
+                        onClick={() => this.switchidentity(2)}
+                      > 切换为老师 </a>
+                    </Tooltip> : ""}
 
 
-                      {coursedata.switch_to_assistant === true ?
-                        <Tooltip placement="bottom" title={
-													<pre>由学生身份切换至助教<br/>拥有添加成员、发布作业等管理权限</pre>
-                        }>
-                          <a className="fr user_default_btn user_blue_btn mr20 font-18"
-                             onClick={()=>this.switchidentity(3)}
-                          > 切换为助教 </a>
-                        </Tooltip>:""}
+                  {coursedata.switch_to_assistant === true ?
+                    <Tooltip placement="bottom" title={
+                      <pre>由学生身份切换至助教<br />拥有添加成员、发布作业等管理权限</pre>
+                    }>
+                      <a className="fr user_default_btn user_blue_btn mr20 font-18"
+                        onClick={() => this.switchidentity(3)}
+                      > 切换为助教 </a>
+                    </Tooltip> : ""}
 
 
-                      {coursedata.course_identity === 6&&coursedata.educoder_teacher===false?
-                        (
-                          excellent===false?
-                            <a className="fr user_default_btn task-btn-orange font-18 mr20" id="shixun_operation"
-                               onClick={() => this.tojoinclass(1)}>加入课堂</a>
-                        :
-                            <a className="fr user_default_btn task-btn-orange font-18 mr20" id="shixun_operation"
-                               onClick={() => this.myyslgradin(1)}>立即加入</a>
-                        )
-                        : ""}
-
-                      {coursedata.course_identity === 6&&coursedata.educoder_teacher===true?
-                        excellent===false?
+                  {coursedata.course_identity === 6 && coursedata.educoder_teacher === false ?
+                    (
+                      excellent === false ?
                         <a className="fr user_default_btn task-btn-orange font-18 mr20" id="shixun_operation"
-                           onClick={() => this.tojoinclass(1)}>加入课堂</a>
-                          :
-                          <a className="fr user_default_btn task-btn-orange font-18 mr20" id="shixun_operation"
-                             onClick={() => this.myyslgradin(1)}>立即加入</a>
-                          : ""}
+                          onClick={() => this.tojoinclass(1)}>加入课堂</a>
+                        :
+                        <a className="fr user_default_btn task-btn-orange font-18 mr20" id="shixun_operation"
+                          onClick={() => this.myyslgradin(1)}>立即加入</a>
+                    )
+                    : ""}
 
-                      {coursedata.course_identity === 6&&coursedata.educoder_teacher===true?
-                        (
-                          excellent===false?
-                            <a className="fr user_default_btn user_blue_btn mr20 font-18" onClick={() => this.ActionPoll(5)}> 复制课堂 </a>
-                         :""
-                        )
-                        : ""}
+                  {coursedata.course_identity === 6 && coursedata.educoder_teacher === true ?
+                    excellent === false ?
+                      <a className="fr user_default_btn task-btn-orange font-18 mr20" id="shixun_operation"
+                        onClick={() => this.tojoinclass(1)}>加入课堂</a>
+                      :
+                      <a className="fr user_default_btn task-btn-orange font-18 mr20" id="shixun_operation"
+                        onClick={() => this.myyslgradin(1)}>立即加入</a>
+                    : ""}
 
-                      {this.props.isStudent()?this.props.current_user&&this.props.current_user.course_is_end===true?"":<a className="fr user_default_btn user_blue_btn mr20 font-18"
-                                                 onClick={() => this.exitclass()}
-                      > 退出课堂 </a>:""}
-
-                    </div>
+                  {coursedata.course_identity === 6 && coursedata.educoder_teacher === true ?
+                    (
+                      excellent === false ?
+                        <a className="fr user_default_btn user_blue_btn mr20 font-18" onClick={() => this.ActionPoll(5)}> 复制课堂 </a>
+                        : ""
+                    )
+                    : ""}
 
 
-										<style>
-											{
-												`
+
+                </div>
+
+
+                <style>
+                  {
+                    `
 												.teachersbox{
 												  margin-right:22px !important;
 												}
 												`
-											}
-										</style>
+                  }
+                </style>
 
-                    <div className="clearfix clearfixborder">
-                      <ul className="fl color-grey-eb pathInfo pathInfobox mt10">
-												<style>
-													{`
+                <div className="clearfix clearfixborder">
+                  <ul className="fl color-grey-eb pathInfo pathInfobox mt10">
+                    <style>
+                      {`
 														.ant-breadcrumb-separator{
 														      color: rgba(255,255,255,0.3) !important;
 														}
@@ -739,259 +648,165 @@ background:rgba(204,204,204,0.2) !important;
 														color: #fff;
 														}
 													`}
-												</style>
-                   <Breadcrumb separator="|" className={"mt5"}>
-													<Breadcrumb.Item className={excellent === true && this.props.isAdminOrStudent() === false ?"":"pointer"}>
-														<Tooltip getPopupContainer={trigger => trigger.parentNode}  visible={excellent === true && this.props.isAdminOrStudent() === false ?false:coursedata.teacher_applies_count===undefined?false:coursedata.teacher_applies_count>0?true:false}
-														placement="topLeft"
-																		 title={<pre className="antsoancss">
-																			 {coursedata.teacher_applies_count===undefined?"":coursedata.teacher_applies_count>0?
-																				 <span >您有{coursedata.teacher_applies_count}条新的加入申请
-																					 <a className={"daishenp"} onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers?tab=2")}>
-																			 <span style={{
-																			 	color:"#FFA804"
-																			 }}>
-																			 待审批
-																		 </span></a></span>:""}</pre>}>
-																<span className="color-grey-c font-16" onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers")}>
-																	<span className={"mr10"}>教师</span>
-																	<span className={"mr10"}>{coursedata.teacher_count}</span>
-																</span>
-														</Tooltip>
-													</Breadcrumb.Item>
+                    </style>
+                    <Breadcrumb separator="|" className={"mt5"}>
+                      <Breadcrumb.Item className={excellent === true && this.props.isAdminOrStudent() === false ? "" : "pointer"}>
+                        <Tooltip getPopupContainer={trigger => trigger.parentNode} visible={excellent === true && this.props.isAdminOrStudent() === false ? false : coursedata.teacher_applies_count === undefined ? false : coursedata.teacher_applies_count > 0 ? true : false}
+                          placement="topLeft"
+                          title={<pre className="antsoancss">
+                            {coursedata.teacher_applies_count === undefined ? "" : coursedata.teacher_applies_count > 0 ?
+                              <span >您有{coursedata.teacher_applies_count}条新的加入申请
+																					 <a className={"daishenp"} onClick={excellent === true && this.props.isAdminOrStudent() === false ? "" : () => this.setHistoryFun("/classrooms/" + this.props.match.params.coursesId + "/teachers?tab=2")}>
+                                  <span style={{
+                                    color: "#FFA804"
+                                  }}>
+                                    待审批
+																		 </span></a></span> : ""}</pre>}>
+                          <span className="color-grey-c font-16" onClick={excellent === true && this.props.isAdminOrStudent() === false ? "" : () => this.setHistoryFun("/classrooms/" + this.props.match.params.coursesId + "/teachers")}>
+                            <span className={"mr10"}>教师</span>
+                            <span className={"mr10"}>{coursedata.teacher_count}</span>
+                          </span>
+                        </Tooltip>
+                      </Breadcrumb.Item>
 
-													<Breadcrumb.Item
-														className={excellent === true && this.props.isAdminOrStudent() === false ?"":excellent===true&&coursedata.course_end === true?this.props.isAdminOrTeacher()===true?"pointer":"":"pointer"}
-														onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":excellent===true&&coursedata.course_end === true?this.props.isAdminOrTeacher()===true?()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students"):"":()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students")}
-													>
-														<span className="color-grey-c font-16"><span className={"mr10 ml10"}>学生</span>  <span className={"mr10"}>{coursedata.student_count}</span></span>
-													</Breadcrumb.Item>
-
-													<Breadcrumb.Item>{coursedata.credit===null?"":
-														<span className="color-grey-c font-16"><span className={"mr10 ml10"}>学分</span> <span className={"mr10"}>{coursedata.credit}</span></span>
-													}</Breadcrumb.Item>
-
-												</Breadcrumb>
-
-                        {/*<li className={"mt7 teachersbox"}  >*/}
-                          {/*<Link to={"/courses/"+this.props.match.params.coursesId+"/teachers"}>*/}
-                            {/*<span className="color-grey-c fl font-16">教师</span>*/}
-                            {/*<span*/}
-                              {/*className="color-white fl font-16 bannerurli">{coursedata.teacher_count}</span>*/}
-                          {/*</Link>*/}
-                        {/*</li>*/}
-
-                        {/*<li className={"mt7 teachersbox"}>*/}
-                          {/*<Link to={"/courses/"+this.props.match.params.coursesId+"/students"}>*/}
-                            {/*<span className="color-grey-c fl font-16">学生</span>*/}
-                            {/*<span*/}
-                              {/*className={coursedata.credit===null?"color-white fl font-16 bannerurlis":"color-white fl font-16 bannerurli"}>*/}
-															{/*{coursedata.student_count}*/}
-                            {/*</span>*/}
-                          {/*</Link>*/}
-                        {/*</li>*/}
-
-                        {/*<li className={"mt7"}>*/}
-                        {/*<a>*/}
-                        {/*<span className="color-grey-c fl font-16">分班</span>*/}
-                        {/*<span className="color-white fl font-16 bannerurli">{coursedata.course_group_count}</span>*/}
-                        {/*</a>*/}
-                        {/*</li>*/}
-
-                        {/*{coursedata.credit===null?"":<li className={"mt7"}>*/}
-                          {/*<a>*/}
-                            {/*<span className="color-grey-c fl font-16 mr10">学分</span>*/}
-                            {/*<span className="color-white fl font-16 "*/}
-                            {/*>{coursedata.credit}</span>*/}
-                          {/*</a>*/}
-                        {/*</li>}*/}
-
-                        {/*{coursedata.course_end===true? <li className={"mt7"}>*/}
-                        {/*<span className="color-grey-c fl font-16">已结束</span>*/}
-                        {/*</li>:<li className={"mt7"}>*/}
-                        {/*<span className="color-grey-c fl font-16"> 结束</span>*/}
-                        {/*<span className="color-white fl font-16"*/}
-                        {/*style={{*/}
-                        {/*marginLeft:coursedata.deadline===null?"":'8px'*/}
-                        {/*}}*/}
-                        {/*>{coursedata.deadline===null?"--":coursedata.deadline}</span>*/}
-                        {/*</li>}*/}
-                      </ul>
-
-
-                      {this.props.isAdmin()? <ul className="fr color-grey-eb pathInfo pathInfobox mt10"
-                                                 style={{
-                                                   position: "relative"
-                                                 }}
+                      <Breadcrumb.Item
+                        className={excellent === true && this.props.isAdminOrStudent() === false ? "" : excellent === true && coursedata.course_end === true ? this.props.isAdminOrTeacher() === true ? "pointer" : "" : "pointer"}
+                        onClick={excellent === true && this.props.isAdminOrStudent() === false ? "" : excellent === true && coursedata.course_end === true ? this.props.isAdminOrTeacher() === true ? () => this.setHistoryFun("/classrooms/" + this.props.match.params.coursesId + "/students") : "" : () => this.setHistoryFun("/classrooms/" + this.props.match.params.coursesId + "/students")}
                       >
-                        {!isCourseEnd && <li className={"mt7 mr10im"}>
-                          <a onClick={()=>this.addTeacher(true)}>
-                            <span className="color-white fl font-16 bannerurli width100f">添加老师</span>
-                          </a>
-                        </li>}
+                        <span className="color-grey-c font-16"><span className={"mr10 ml10"}>学生</span>  <span className={"mr10"}>{coursedata.student_count}</span></span>
+                      </Breadcrumb.Item>
 
-                        {!isCourseEnd && <li className={"mt7 mr10im"}>
-                          <a onClick={()=>this.addTeacher(false)}>
-                            <span className="color-white fl font-16 bannerurli width100f">添加助教</span>
-                          </a>
+                      <Breadcrumb.Item>{coursedata.credit === null ? "" :
+                        <span className="color-grey-c font-16"><span className={"mr10 ml10"}>学分</span> <span className={"mr10"}>{coursedata.credit}</span></span>
+                      }</Breadcrumb.Item>
 
-                        </li>}
+                    </Breadcrumb>
 
-                        {!isCourseEnd && <li className={"mt7 mr10im"}>
-                          <a onClick={()=>this.addStudent()}>
-                            <span className={"color-white fl font-16 bannerurli width100f"}>添加学生</span>
-                          </a>
-                        </li>}
-                        {excellent===false?
-                        <li className={"mt7 mr10im ml10"} style={{overflow:"hidden"}}>
-                          <a>
-                            <span className="color-grey-c fl font-16" style={{marginRight: "10px"}}>邀请码</span>
-                            <span
-                              className={coursedata.code_halt === true? "color-white fl font-16 bannerurli width75f" : "color-white fl font-16 bannerurli width107f marleftf10 color-orange-tip"}>
-                                            {coursedata.code_halt === true? "已停用" : coursedata.invite_code}
-                              {coursedata.code_halt === true  ? "" :
-                                <Tooltip placement="bottom" title={
-																	coursedata.code_halt === true? <pre>
-																			邀请码已停用<br/>
+                  </ul>
+
+
+                  {this.props.isAdmin() ? <ul className="fr color-grey-eb pathInfo pathInfobox mt10"
+                    style={{
+                      position: "relative"
+                    }}
+                  >
+                    {!isCourseEnd && <li className={"mt7 mr10im"}>
+                      <a onClick={() => this.addTeacher(true)}>
+                        <span className="color-white fl font-16 bannerurli width100f">添加老师</span>
+                      </a>
+                    </li>}
+
+                    {!isCourseEnd && <li className={"mt7 mr10im"}>
+                      <a onClick={() => this.addTeacher(false)}>
+                        <span className="color-white fl font-16 bannerurli width100f">添加助教</span>
+                      </a>
+
+                    </li>}
+
+                    {!isCourseEnd && <li className={"mt7 mr10im"}>
+                      <a onClick={() => this.addStudent()}>
+                        <span className={"color-white fl font-16 bannerurli width100f"}>添加学生</span>
+                      </a>
+                    </li>}
+                    {excellent === false ?
+                      <li className={"mt7 mr10im ml10"} style={{ overflow: "hidden" }}>
+                        <a>
+                          <span className="color-grey-c fl font-16" style={{ marginRight: "10px" }}>邀请码</span>
+                          <span
+                            className={coursedata.code_halt === true ? "color-white fl font-16 bannerurli width75f" : "color-white fl font-16 bannerurli width107f marleftf10 color-orange-tip"}>
+                            {coursedata.code_halt === true ? "已停用" : coursedata.invite_code}
+                            {coursedata.code_halt === true ? "" :
+                              <Tooltip placement="bottom" title={
+                                coursedata.code_halt === true ? <pre>
+                                  邀请码已停用<br />
 																			成员不能主动加入课堂
-																	</pre>:<pre>
-																			成员可以通过邀请码主动加入课堂<br/>
+																	</pre> : <pre>
+                                    成员可以通过邀请码主动加入课堂<br />
 																			点击立刻复制邀请码
 																	</pre>
-                                }>
-                                  <i className="iconfont icon-fuzhi color-white font-14 ml10"
-                                     onClick={() => {
-                                       jsCopy()
-                                     }}></i>
-                                </Tooltip>
-                              }
-                              <input id="copy_invite_code" value={coursedata.invite_code}/>
-                                       </span>
-                          </a>
-                        </li>:""}
-
-                        <li className={"mt7 ml10 mr0 "}>
-                          <style>
-                            {
-                              `
-                                     .defaults{cursor:default}
-                                     `
+                              }>
+                                <i className="iconfont icon-fuzhi color-white font-14 ml10"
+                                  onClick={() => {
+                                    jsCopy()
+                                  }}></i>
+                              </Tooltip>
                             }
-                          </style>
-                          <Popover placement="bottom" content={
-                            excellent===false?
-                            <ul className="sandianbox" style={{
-                              display:  'block',
-                              right: "-113px",
-                              top: "20px"
-                            }}>
-                              {coursedata.is_public === true?coursedata.course_identity  <3?
-                                <div className={"defaults"} onClick={() => this.ActionPoll(2)}>设为私有</div>: "" : ""}
+                            <input id="copy_invite_code" value={coursedata.invite_code} />
+                          </span>
+                        </a>
+                      </li> : ""}
 
-                              {coursedata.is_public === false?coursedata.course_identity <3?
-                                <div className={"defaults"}  onClick={() => this.ActionPoll(3)}>设为公开</div> : "": ""}
+                    <li className={"mt7 ml10 mr0 "}>
+                      <style>
+                        {
+                          `
+                                     .defaults{cursor:default}
 
-                              {coursedata.course_identity  <3? <div className={"defaults"}  onClick={() => this.ActionPoll(4)}>
-                                {coursedata.code_halt === true ?"启用邀请码":"停用邀请码"}
-                              </div>:""}
+                                     .defaults a{
+                                       display:block;
+                                       color:rgba(0, 0, 0, 0.65);
+                                     }
+                                     .ant-popover-inner-content{
+                                       padding:12px 16px;
+                                     }
+                                     `
+                        }
+                      </style>
+                      <Popover placement="bottom" className="settingBtns" content={
+                        excellent === false ?
+                          <ul className="sandianbox" style={{
+                            display: 'block',
+                            right: "-113px",
+                            top: "20px"
+                          }}>
+                            {coursedata.is_public === true ? coursedata.course_identity < 3 ?
+                              <div className={"defaults"} onClick={() => this.ActionPoll(2)}>设为私有</div> : "" : ""}
 
-                              <div className={"defaults"} onClick={this.postsettings}>设置</div>
+                            {coursedata.is_public === false ? coursedata.course_identity < 3 ?
+                              <div className={"defaults"} onClick={() => this.ActionPoll(3)}>设为公开</div> : "" : ""}
 
-                              <div className={"defaults"} onClick={() => this.ActionPoll(5)}>复制
-                              </div>
+                            {coursedata.course_identity < 3 ? <div className={"defaults"} onClick={() => this.ActionPoll(4)}>
+                              {coursedata.code_halt === true ? "启用邀请码" : "停用邀请码"}
+                            </div> : ""}
 
-                              {coursedata.is_admin===true?coursedata.course_identity  <3?<div className={"defaults"}  onClick={() => this.ActionPoll(1)}>删除</div>
-                                :"":""}
-                            </ul>
-                              :
-                              <ul className="sandianbox" style={{
-                                display:  'block',
-                                right: "-113px",
-                                top: "20px"
-                              }}>
-                                <div className={"defaults"} onClick={this.postsettingstwo}>设置</div>
-                                {coursedata.is_admin===true?coursedata.course_identity  <3?<div className={"defaults"}  onClick={() => this.ActionPoll(1)}>删除</div>
-                                  :"":""}
-                              </ul>
-                          }  trigger="hover">
-                            <i className="iconfont icon-weibiaoti12 color-white font-14 relative"></i>
-                          </Popover>
+                            <div className={"defaults"}><Link to={`/classrooms/${this.props.match.params.coursesId}/settings`}>设置</Link></div>
 
-                        </li>
+                            <div className={"defaults"} onClick={() => this.ActionPoll(5)}>复制 </div>
+
+                            {coursedata.is_admin === true ? coursedata.course_identity < 3 ? <div className={"defaults"} onClick={() => this.ActionPoll(1)}>删除</div>
+                              : "" : ""}
+                          </ul>
+                          :
+                          <ul className="sandianbox" style={{
+                            display: 'block',
+                            right: "-113px",
+                            top: "20px"
+                          }}>
+                            <div className={"defaults"} onClick={this.postsettingstwo}>设置</div>
+                            {coursedata.is_admin === true ? coursedata.course_identity < 3 ? <div className={"defaults"} onClick={() => this.ActionPoll(1)}>删除</div>
+                              : "" : ""}
+                          </ul>
+                      } trigger="hover">
+                        <i className="iconfont icon-weibiaoti12 color-white font-14 relative"></i>
+                      </Popover>
+
+                    </li>
 
 
 
-                      </ul>:""}
+                  </ul> : ""}
 
-                    </div>
-
-
-                  </div>
                 </div>
-              </div>
-            }
-          </div>
 
-        )
-    }
+
+              </div>
+            </div>
+          </div>
+        }
+      </div>
+
+    )
+  }
 }
 
-export default CoursesBanner;
-
-
-// let id=this.props.match.params.coursesId;
-//
-// let url="/courses/"+id+"/top_banner.json"
-// axios.get(url).then((result)=>{
-//     if(result.status===200){
-//       let data=result.data;
-//         this.setState({
-//           coursebannerlist:result.data,
-//           name: result.data.name,
-//           teacher_name:  result.data.teacher_name,
-//           teacher_login:  result.data.teacher_login,
-//           teacher_img:  result.data.teacher_img,
-//           teacher_school:  result.data.teacher_school,
-//           teacher_count:  result.data.teacher_count,
-//           student_count:  result.data.student_count,
-//           course_group_count:  result.data.course_group_count,
-//           credit:  result.data.credit,
-//           course_end:  result.data.course_end,
-//           deadline:  result.data.deadline,
-//           is_teacher:  result.data.is_teacher,
-//           is_student:  result.data.is_student,
-//           is_admin:  result.data.is_admin,
-//           is_public:  result.data.is_public,
-//           code_halt:  result.data.code_halt,
-//           invite_code: result.data.invite_code,
-//           switch_to_student:  result.data.switch_to_student,
-//           switch_to_teacher:  result.data.switch_to_teacher,
-//           join_course:  result.data.join_course,
-//           copy_course:  result.data.copy_course,
-//         })
-//     }
-// coursebannerlist:undefined,
-//   name: undefined,
-//   teacher_name: undefined,
-//   teacher_login: undefined,
-//   teacher_img: undefined,
-//   teacher_school: undefined,
-//   teacher_count: undefined,
-//   student_count: undefined,
-//   course_group_count: undefined,
-//   credit: undefined,
-//   course_end: undefined,
-//   deadline: undefined,
-//   is_teacher: undefined,
-//   is_student: undefined,
-//   is_admin: undefined,
-//   is_public: undefined,
-//   code_halt: undefined,
-//   invite_code:undefined,
-//   switch_to_student: undefined,
-//   switch_to_teacher: undefined,
-//   join_course: undefined,
-//   copy_course: undefined,
-// }).catch((error)=>{
-//   console.log(error);
-// })
+export default CoursesBanner;
\ No newline at end of file
diff --git a/src/modules/courses/coursesDetail/CoursesDetail.js b/src/modules/courses/coursesDetail/CoursesDetail.js
index 8a5519d2..0c7e49f0 100644
--- a/src/modules/courses/coursesDetail/CoursesDetail.js
+++ b/src/modules/courses/coursesDetail/CoursesDetail.js
@@ -1,105 +1,106 @@
-import React, { Component } from 'react';
-import axios from 'axios';
-import {Input,Pagination,Tooltip} from 'antd';
-
-//业务组件
-//top banner
-import CoursesBanner from "./CoursesBanner";
-//Left nav
-import Coursesleftnav from "./CoursesLeftNav";
-
-
-// 实训作业
-import ShixunHomework from '../shixunHomework/shixunHomework';
-// 问卷
-import Poll from '../poll/Poll';
-// 试卷
-import Exercise from '../exercise/Exercise';
-
-//教师列表
-import TeacherList from "../members/teacherList"
-//普通作业
-import CommonWork from "../busyWork/commonWork"
-// 毕设选题
-import graduationTopics from '../graduation/topics/index'
-
-class CoursesDetail extends Component{
-  constructor(props) {
-    super(props)
-    this.state = {
-      getleftNavid:undefined,
-      coursesId:""
-    }
-  }
-
-  componentDidMount(){
-
-  }
-  getleftNavid=(type,id)=>{
-    console.log(type+" "+id)
-    this.setState({
-      getleftNavid:type,
-      coursesId:id
-    })
-  }
-  render() {
-    let{getleftNavid,coursesId}=this.state;
-
-    // console.log(getleftNavid)
-    return (
-      <div>
-          <div className="newMain clearfix">
-              {/*头部banner*/}
-              <CoursesBanner {...this.props}></CoursesBanner>
-
-              <div className="educontent clearfix" style={{flex: "1 0 auto"}}>
-
-                  <div className="stud-class-set">
-                      <div className="news">
-                          <div className="edu-class-inner container clearfix">
-                              <div className="member for-content-0 for-content">
-                                  <div className="people clearfix mb60">
-
-                                      {/*left_nav*/}
-                                      <div className={"with22 fl setleft"} style={{width:'264px',minHeight:'500px'}}>
-                                         <Coursesleftnav
-                                           {...this.props}
-                                           getleftNavid={this.getleftNavid}
-                                         />
-                                      </div>
-
-                                      {/*right_concent*/}
-                                      <div className="with78 fl">
-                                          <div className={"ml20 clearfix"}>
-                                              {/* 毕设选题 */}
-                                              {getleftNavid==="graduation"?<graduationTopics {...this.props} coursesId={coursesId}></graduationTopics>:""}
-                                
-                                              {/*/!*普通作业*!/*/}
-                                              {/*{getleftNavid==="common_homework"?<CommonWork {...this.props} coursesId={coursesId}/>:""}*/}
-
-                                              <ShixunHomework {...this.props} child={false}/>
-                                              {/*{getleftNavid==="shixun_homeworkchild"?<ShixunHomework {...this.props} child={true} />:""}*/}
-
-
-                                              {/*/!*问卷*!/*/}
-                                              {/*{getleftNavid==="poll"?<Poll child={false}/>:""}*/}
-                                              {/*/!*试卷*!/*/}
-                                              {/*{getleftNavid==="exercise"?<Exercise child={false}/>:""}*/}
-
-
-                                          </div>
-                                      </div>
-
-                                  </div>
-                               </div>
-                          </div>
-                      </div>
-                  </div>
-
-              </div>
-          </div>
-      </div>
-    )
-  }
-}
-export default CoursesDetail;
\ No newline at end of file
+import React, { Component } from 'react';
+import axios from 'axios';
+import {Input,Pagination,Tooltip} from 'antd';
+
+//业务组件
+//top banner
+import CoursesBanner from "./CoursesBanner";
+//Left nav
+import Coursesleftnav from "./CoursesLeftNav";
+
+
+// 实训作业
+import ShixunHomework from '../shixunHomework/shixunHomework';
+// 问卷
+import Poll from '../poll/Poll';
+// 试卷
+import Exercise from '../exercise/Exercise';
+
+//教师列表
+import TeacherList from "../members/teacherList"
+//普通作业
+import CommonWork from "../busyWork/commonWork"
+// 毕设选题
+import graduationTopics from '../graduation/topics/index'
+
+class CoursesDetail extends Component{
+  constructor(props) {
+    super(props)
+    this.state = {
+      getleftNavid:undefined,
+      coursesId:""
+    }
+  }
+
+  componentDidMount(){
+
+  }
+  getleftNavid=(type,id)=>{
+    console.log(type+" "+id)
+    this.setState({
+      getleftNavid:type,
+      coursesId:id
+    })
+  }
+  render() {
+    let{getleftNavid,coursesId}=this.state;
+
+    // console.log(getleftNavid)
+    return (
+      <div>
+          <div className="newMain clearfix">
+              {/*头部banner*/}
+              <CoursesBanner {...this.props}></CoursesBanner>
+
+              <div className="educontent clearfix" style={{flex: "1 0 auto"}}>
+
+                  <div className="stud-class-set">
+                      <div className="news">
+                          <div className="edu-class-inner container clearfix">
+                              <div className="member for-content-0 for-content">
+                                  <div className="people clearfix mb60">
+
+                                      {/*left_nav*/}
+                                      <div className={"with22 fl setleft"} style={{width:'264px',minHeight:'500px'}}>
+                                         <Coursesleftnav
+                                           {...this.props}
+																					 myinex={false}
+																					 getleftNavid={this.getleftNavid}
+                                         />
+                                      </div>
+
+                                      {/*right_concent*/}
+                                      <div className="with78 fl">
+                                          <div className={"ml20 clearfix"}>
+                                              {/* 毕设选题 */}
+                                              {getleftNavid==="graduation"?<graduationTopics {...this.props} coursesId={coursesId}></graduationTopics>:""}
+
+                                              {/*/!*普通作业*!/*/}
+                                              {/*{getleftNavid==="common_homework"?<CommonWork {...this.props} coursesId={coursesId}/>:""}*/}
+
+                                              <ShixunHomework {...this.props} child={false}/>
+                                              {/*{getleftNavid==="shixun_homeworkchild"?<ShixunHomework {...this.props} child={true} />:""}*/}
+
+
+                                              {/*/!*问卷*!/*/}
+                                              {/*{getleftNavid==="poll"?<Poll child={false}/>:""}*/}
+                                              {/*/!*试卷*!/*/}
+                                              {/*{getleftNavid==="exercise"?<Exercise child={false}/>:""}*/}
+
+
+                                          </div>
+                                      </div>
+
+                                  </div>
+                               </div>
+                          </div>
+                      </div>
+                  </div>
+
+              </div>
+          </div>
+      </div>
+    )
+  }
+}
+export default CoursesDetail;
diff --git a/src/modules/courses/coursesDetail/CoursesGuide.js b/src/modules/courses/coursesDetail/CoursesGuide.js
index b47998d9..d0157f90 100644
--- a/src/modules/courses/coursesDetail/CoursesGuide.js
+++ b/src/modules/courses/coursesDetail/CoursesGuide.js
@@ -1,18 +1,18 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
 import '../css/Courses.css';
-import {setImagesUrl} from 'educoder';
+import { setImagesUrl } from 'educoder';
 
 
 class CoursesGuide extends Component {
   constructor(props) {
     super(props)
-    this.state={
-      step:1
+    this.state = {
+      step: 1
     }
   }
-  render(){
-    let {step} = this.state;
-    return(
+  render() {
+    let { step } = this.state;
+    return (
       <div className="guidePanel">
         <style>{`
           body{
@@ -21,18 +21,18 @@ class CoursesGuide extends Component {
         `}</style>
         <div className="educontent">
           {
-            step ==1 &&
+            step == 1 &&
             <div>
-              <p className="clearfix"><img className="fr" src="/images/course/guide/1-1.png" width="175px" style={{margin:"205px 38px 0px 0px"}}/></p>
-              <p className="clearfix pr"><img src="/images/course/guide/1-2.png" className="fr mt20 guideFirstRight"/></p>
-              <p className="clearfix pr" style={{marginTop:"80px"}}>
-                <img src="/images/course/guide/1-4.png" className="fl guideFirstLeft"/>
-                <img src="/images/course/guide/1-3.png" className="fl" style={{marginLeft:"410px"}}/>
+              <p className="clearfix"><img className="fr" src="/images/course/guide/1-1.png" width="175px" style={{ margin: "205px 38px 0px 0px" }} /></p>
+              <p className="clearfix pr"><img src="/images/course/guide/1-2.png" className="fr mt20 guideFirstRight" /></p>
+              <p className="clearfix pr" style={{ marginTop: "80px" }}>
+                <img src="/images/course/guide/1-4.png" className="fl guideFirstLeft" />
+                <img src="/images/course/guide/1-3.png" className="fl" style={{ marginLeft: "410px" }} />
               </p>
               <p className="clearfix">
-                <img src="/images/course/guide/1-5.png" className="fl mt50"/>
-                <img src="/images/course/guide/1-6.png" className="fl mt40"/>
-                <a href="javascript:void(0)"><img src="/images/course/guide/1-7.png" className="fl mt80 ml100"/></a>
+                <img src="/images/course/guide/1-5.png" className="fl mt50" />
+                <img src="/images/course/guide/1-6.png" className="fl mt40" />
+                <a  ><img src="/images/course/guide/1-7.png" className="fl mt80 ml100" /></a>
               </p>
             </div>
           }
diff --git a/src/modules/courses/coursesDetail/CoursesLeftNav.js b/src/modules/courses/coursesDetail/CoursesLeftNav.js
index bb5395d6..47819dbf 100644
--- a/src/modules/courses/coursesDetail/CoursesLeftNav.js
+++ b/src/modules/courses/coursesDetail/CoursesLeftNav.js
@@ -1,8 +1,8 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 import { Link } from "react-router-dom";
 import axios from 'axios';
-import {Checkbox,Modal,Input,Tooltip,notification,Popover} from 'antd';
-import { DragDropContext,Draggable, Droppable} from 'react-beautiful-dnd';
+import { Checkbox, Modal, Input, Tooltip, notification, Popover, Dropdown, Menu, TreeSelect } from 'antd';
+import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
 import Modals from '../../modals/Modals';
 import { on, off, trigger } from 'educoder';
 import './MainLeftNav.css';
@@ -10,15 +10,16 @@ import MyEduChapterupdate from './MyEduChapterupdate';
 const CheckboxGroup = Checkbox.Group;
 
 
-let navidtype=true;
-
+let navidtype = true;
+const { SubMenu } = Menu;
+const { TreeNode } = TreeSelect;
 
 //a little function to help us with reordering the result
-const reorder =  (list, startIndex, endIndex) => {
+const reorder = (list, startIndex, endIndex) => {
   // console.log(list)
   // console.log(startIndex)
   // console.log(endIndex)
-  let newlist=list;
+  let newlist = list;
   const result = Array.from(newlist);
   const [removed] = result.splice(startIndex, 1);
   result.splice(endIndex, 0, removed);
@@ -34,36 +35,56 @@ const reorder =  (list, startIndex, endIndex) => {
 // });
 
 
-class Coursesleftnav extends Component{
-  constructor(props){
+class Coursesleftnav extends Component {
+  constructor(props) {
     super(props);
     this.state = {
-      index:1,
-      addGroup:true,
-      navid:undefined,
-      sandiantype:undefined,
-      twosandiantype:undefined,
-      addCheckboxGroup:[],
-      Navmodalname:"",
-      Navmodalnametype:false,
-      Navmodaltypename:"",
-      setnavid:"",
-      NavmodalValue:"",
-      ModalsType:false,
-      Modalstopval:"",
-      loadtype:false,
-      selectnavid:false,
-      newselectnavid:undefined,
-      positiontype:undefined,
-      toopvisible:false,
-      toopvisibleindex:undefined,
-      toopvisibleindexs:undefined,
-      sandiantypes:undefined,
-			antIcon:false,
-      chapterupdate:false,
+      index: 1,
+      addGroup: true,
+      navid: undefined,
+      sandiantype: undefined,
+      twosandiantype: undefined,
+      addCheckboxGroup: [],
+      Navmodalname: "",
+      Navmodalnametype: false,
+      Navmodaltypename: "",
+      setnavid: "",
+      NavmodalValue: "",
+      ModalsType: false,
+      Modalstopval: "",
+      loadtype: false,
+      selectnavid: false,
+      newselectnavid: undefined,
+      positiontype: undefined,
+      toopvisible: false,
+      toopvisibleindex: undefined,
+      toopvisibleindexs: undefined,
+      sandiantypes: undefined,
+      antIcon: false,
+      chapterupdate: false,
+
+      successFunc: undefined,
+
+      //用来判断 是不是资源点击进入的
+      Navmodalziyname: '',
+      treeData: undefined,
+      //默认为0主目录
+      parentid: 0,
+      //判断3级目录是否显示三个点
+      sanshow: '',
+      sansandiantype: undefined,
+      //新增参数判断打开关闭 默认关闭
+      showPreson: false,
+      //获取资源id 判断是否选中的事资源来判控
+      treeDataid: '',
+      //默认值
+      treedefaultValue: '',
+      dropdownStyleshow: '',
+      treeDataname: ''
     }
   }
 
+
   // updataleftNav=()=>{
   //
   //   let id=this.props.match.params.coursesId;
@@ -133,148 +154,194 @@ class Coursesleftnav extends Component{
     off('boardRename', this.boardRenameListener)
     off('groupAdd', this.groupAddListener)
     off('groupRename', this.groupRenameListener)
-    off('attachmentAddlog',this.attachmentAddlog)
-    off('flieseditDir',this.flieseditDir)
-    off('shixun_homeworkadd',this.addshixunchild)
-    off('editshixunname',this.editshixunchild)
-    off('editshixunmainname',this.editshixunmainname)
+    off('attachmentAddlog', this.attachmentAddlog)
+    off('flieseditDir', this.flieseditDir)
+    off('shixun_homeworkadd', this.addshixunchild)
+    off('editshixunname', this.editshixunchild)
+    off('editshixunmainname', this.editshixunmainname)
+    off('videoAdd', this.addVideo)
+    off('editVideo', this.editVideo)
+    off('addcommon_homeworks', this.addcommon_homeworks)
+    off('editcommon_homeworks', this.editcommon_homeworks)
   }
-  addshixunchild=(e, data)=>{
-    this.Navmodalnames(e,1,"shixun_homework",data)
+  addshixunchild = (e, data) => {
+    this.Navmodalnames(e, 1, "shixun_homework", data);
   }
-  editshixunchild=(e, data)=>{
-    this.Navmodalnames(e,4,"editSecondname",data.id,data.name)
+  editshixunchild = (e, data) => {
+    this.Navmodalnames(e, 4, "editSecondname", data.id, data.name);
   }
-  editshixunmainname=(e, data)=>{
-    this.Navmodalnames(e,3,"editname",data.id,data.name)
+  addcommon_homeworks = (e, data) => {
+    this.Navmodalnames(e, 1, "common_homework", data);
+  }
+  editcommon_homeworks = (e, data) => {
+    this.Navmodalnames(e, 4, "editSecondname", data.id, data.name);
+  }
+  editshixunmainname = (e, data) => {
+    this.Navmodalnames(e, 3, "editname", data.id, data.name);
   }
   boardAddListener = (e, data) => {
-    this.Navmodalnames(e,6,"board", data)
+    this.Navmodalnames(e, 6, "board", data);
+  }
+  addVideo = (e, id) => {
+    this.Navmodalnames(e, 1, "video", id);
+  }
+  editVideo = (e, data) => {
+    this.setState({
+      successFunc: data.update
+    })
+    this.Navmodalnames(e, 4, "editSecondname", data.id, data.name);
   }
   boardRenameListener = (e, data) => {
-    this.Navmodalnames(e,7,"editSecondname", data.category_id, data.category_name)
+    this.Navmodalnames(e, 7, "editSecondname", data.category_id, data.category_name);
   }
   groupAddListener = (e, data) => {
-    this.Navmodalnames(e,2,"course_group", data)
+    this.Navmodalnames(e, 2, "course_group", data);
   }
   groupRenameListener = (e, data) => {
-    this.Navmodalnames(e,5,"editSecondname", data.id, data.name)
+    this.Navmodalnames(e, 5, "editSecondname", data.id, data.name);
   }
-  attachmentAddlog=(e,data)=>{
-    this.Navmodalnames(e,1,"attachment",data)
+  attachmentAddlog = (e, data) => {
+    this.Navmodalnames(e, 1, "attachment", data.id, data.name, data.coursesecondcategoryid, data.coursesecondcategoryid === undefined ? false : true);
   }
-  flieseditDir=(e, data)=>{
-    this.Navmodalnames(e,4,"editSecondname",data.id,data.name)
+  flieseditDir = (e, data) => {
+    this.Navmodalnames(e, 4, "editSecondname", data.id, data.name);
   }
 
   componentDidMount() {
 
     this.setState({
-      url:this.props.match.url
+      url: this.props.match.url
     })
-    on('boardAdd', this.boardAddListener)
-    on('boardRename', this.boardRenameListener)
-    on('groupAdd', this.groupAddListener)
-    on('groupRename', this.groupRenameListener)
-    on('attachmentAddlog', this.attachmentAddlog)
-    on('flieseditDir', this.flieseditDir)
-    on('shixun_homeworkadd',this.addshixunchild)
-    on('editshixunname',this.editshixunchild)
-    on('editshixunmainname',this.editshixunmainname)
+    on('boardAdd', this.boardAddListener);
+    on('boardRename', this.boardRenameListener);
+    on('groupAdd', this.groupAddListener);
+    on('groupRename', this.groupRenameListener);
+    on('attachmentAddlog', this.attachmentAddlog);
+    on('flieseditDir', this.flieseditDir);
+    on('shixun_homeworkadd', this.addshixunchild);
+    on('editshixunname', this.editshixunchild);
+    on('editshixunmainname', this.editshixunmainname);
+    on('videoAdd', this.addVideo);
+    on('editVideo', this.editVideo)
+    on('addcommon_homeworks', this.addcommon_homeworks)
+    on('editcommon_homeworks', this.editcommon_homeworks)
 
-    // this.props.updataleftNavfun();
-    // this.props.getleftNavid && this.props.getleftNavid("shixun_homework");
-    // const position =parseInt(this.props.match.params.position);
+    let courstype = this.props.match.url;
+    courstype = courstype.split('/');
 
-    let courstype=this.props.match.url;
+    courstype = courstype[3];
 
-        courstype = courstype.split('/');
-
-        courstype=courstype[3];
-
-        // console.log(courstype)
-
-    const query =this.props.location.search;
+    const query = this.props.location.search;
 
     // const type = query.split('?type=');
     let category_id;
-    if(courstype==="board"){
-      category_id=parseInt(this.props.match.params.boardId);
-    }else{
-      category_id=parseInt(this.props.match.params.category_id);
+    if (courstype === "board") {
+      category_id = parseInt(this.props.match.params.boardId);
+    } else {
+      category_id = parseInt(this.props.match.params.category_id);
     }
 
 
-  // console.log(category_id)
+    // console.log(category_id)
 
-    if(query===""){
+    if (query === "") {
       this.setState({
-        navid:0,
-        positiontype:courstype,
-        selectnavid:false,
-        newselectnavid:parseInt(category_id),
+        navid: 0,
+        positiontype: courstype,
+        selectnavid: false,
+        newselectnavid: parseInt(category_id),
       })
-    }else{
-
-      if(isNaN(category_id)){
+    } else {
+      if (isNaN(category_id)) {
         this.setState({
-          positiontype:courstype,
-          newselectnavid:parseInt(category_id),
-          selectnavid:false,
+          positiontype: courstype,
+          newselectnavid: parseInt(category_id),
+          selectnavid: false,
         })
-      }else{
+      } else {
         this.setState({
-          positiontype:courstype,
-          newselectnavid:parseInt(category_id),
-          selectnavid:false,
+          positiontype: courstype,
+          newselectnavid: parseInt(category_id),
+          selectnavid: false,
         })
       }
 
     }
 
-    if(navidtype===false){
-      navidtype=true
+    if (navidtype === false) {
+      navidtype = true
     }
-   this.props.updataleftNavfun()
+    this.props.updataleftNavfun()
   }
 
-	componentDidUpdate=(prevProps)=>{
-    if(prevProps!=this.props){
-			let courstype=this.props.match.url;
-			courstype = courstype.split('/');
-			courstype=courstype[3];
-			const query =this.props.location.search;
-			let category_id;
-			if(courstype==="board"){
-				category_id=parseInt(this.props.match.params.boardId);
-			}else{
-				category_id=parseInt(this.props.match.params.category_id);
-			}
-			if(query===""){
-				this.setState({
-					positiontype:courstype,
-				})
-			}else{
-				if(isNaN(category_id)){
-					this.setState({
-						positiontype:courstype,
-					})
-				}else{
-					this.setState({
-						positiontype:courstype,
-					})
-				}
+  componentDidUpdate = (prevProps) => {
+    if (prevProps != this.props) {
+      let courstype = this.props.match.url;
+      courstype = courstype.split('/');
+      courstype = courstype[3];
+      const query = this.props.location.search;
+      let category_id;
+      if (courstype === "board") {
+        category_id = parseInt(this.props.match.params.boardId);
+      } else {
+        category_id = parseInt(this.props.match.params.category_id);
+      }
+      if (query === "") {
+        this.setState({
+          positiontype: courstype,
+        })
+      } else {
+        if (isNaN(category_id)) {
+          this.setState({
+            positiontype: courstype,
+          })
+        } else {
+          this.setState({
+            positiontype: courstype,
+          })
+        }
 
-			}
-		}
-	}
+      }
+    }
+  }
 
-  setnavid=(e,key,id,type,url)=>{
+  //请求接口获取资源列表数据
+  getatahcment() {
+    let coursesId = this.props.match.params.coursesId;
+    let url = "/courses/" + coursesId + "/attahcment_category_list.json";
+    axios.get(url, {
+      params: {
+        no_child: true,
+      }
+
+    }).then((response) => {
+      if (response != undefined) {
+        if (response.data && response.data) {
+          if (response.data.status != 401) {
+
+            let tr = response.data.course_modules;
+            this.setState({
+              treeData: tr
+            })
+            tr.map((iem, index) => {
+              this.setState({
+                treeDataid: iem.value,
+                treeDataname: iem.title
+              })
+            })
+          }
+        }
+
+      }
+    })
+  }
+
+  setnavid = (e, key, id, type, url) => {
     // this.props.getleftNavid && this.props.getleftNavid(key,type);
     //   let {selectnavid,navid}=this.state;
-		//
+    //
     //   if(navidtype===true&&selectnavid===false){
-		//
+    //
     //       if(navid===key){
     //         this.setState({
     //           navid:"",
@@ -302,218 +369,302 @@ class Coursesleftnav extends Component{
     // this.props.updataleftNavfun();
     // this.props.history.replace( url );
     // e.stopPropagation();//阻止冒泡
-		this.selectnavid(e,key,id,type,url)
+    this.selectnavid(e, key, id, type, url)
   }
 
-  selectnavid=(e,key,id,type,urls,index)=>{
+  selectnavid = (e, key, id, type, urls, index) => {
 
-    let {url}=this.state;
-    if(urls!=url){
-			this.props.updataleftNavfun();
+    let { url } = this.state;
+    if (urls != url) {
+      this.props.updataleftNavfun();
       this.props.history.replace(urls);
-    }else{
+    } else {
 
       if (key === this.props.indexs) {
         this.props.unlocationNavfun(undefined)
       } else {
-				this.props.updataleftNavfun();
+        this.props.updataleftNavfun();
         this.props.unlocationNavfun(key)
-				this.props.history.replace(urls);
+        this.props.history.replace(urls);
       }
     }
     this.setState({
-      selectnavid:true,
-      newselectnavid:id,
-      url:urls,
-      indexs:index
+      selectnavid: true,
+      newselectnavid: id,
+      url: urls,
+      indexs: index
     })
     // this.props.history.replace(urls);
+    try {
+      if (this.props.myinex === true) {
+        this.props.Callhomedirectoryornot(true);
+
+      }
+    } catch (e) {
+
+    }
+
     e.stopPropagation();//阻止冒泡
 
   }
-  selectnavids=(e,key,id,type,urls,index)=>{
+  selectnavids = (e, key, id, type, urls, index, santype) => {
+
     this.setState({
-      selectnavid:true,
-      newselectnavid:id,
-      url:urls,
-      indexs:index
+      selectnavid: true,
+      newselectnavid: id,
+      url: urls,
+      indexs: index
     })
-		this.props.updataleftNavfun();
+    this.props.updataleftNavfun();
     this.props.history.replace(urls);
+    try {
+      if (this.props.myinex === true) {
+        this.props.Callhomedirectoryornot(true);
+
+      }
+    } catch (e) {
+
+    }
     e.stopPropagation();//阻止冒泡
   }
 
 
-  twosandianshow=(e,key,type)=>{
+  twosandianshow = (e, key, type) => {
 
-     // console.log("twosandianshow");
-     // console.log(key);
-     // console.log(type);
+    // console.log("twosandianshow");
+    // console.log(key);
     this.setState({
-      toopvisibleindexs:key,
-      twosandiantype:key,
-      toopvisible:false,
-      toopvisibleindex:undefined,
-      twosandiantypes:type
+      toopvisibleindexs: key,
+      twosandiantype: key,
+      toopvisible: false,
+      toopvisibleindex: undefined,
+      twosandiantypes: type
     })
     e.stopPropagation();//阻止冒泡
   }
-  twosandianshowys=(e,key,type)=>{
+
+  sansandianshow = (e, key, type, name) => {
+
+    // console.log("twosandianshow");
+    // console.log(key);
+    this.setState({
+      toopvisibleindexs: key,
+      sansandiantype: key,
+      toopvisible: false,
+      sanshow: name,
+      toopvisibleindex: undefined,
+      twosandiantypes: type
+    })
+    e.stopPropagation();//阻止冒泡
+  }
+
+
+  twosandianshowys = (e, key, type) => {
     // console.log("twosandianshow");
     // console.log(key);
     // console.log(type);
     this.setState({
-      toopvisibleindexs:key,
+      toopvisibleindexs: key,
     })
     e.stopPropagation();//阻止冒泡
   }
-  twosandianshowyss=(e,key,type)=>{
+
+  sansandianshowys = (e, key, type) => {
     // console.log("twosandianshow");
     // console.log(key);
     // console.log(type);
     this.setState({
-      toopvisibleindexs:undefined,
+      toopvisibleindexs: key,
     })
     e.stopPropagation();//阻止冒泡
   }
 
-  twosandianhide=(e,index,type)=>{
-    // console.log(index)
+  twosandianshowyss = (e, key, type) => {
+    // console.log("twosandianshow");
+    // console.log(key);
+    // console.log(type);
     this.setState({
-      toopvisibleindexs:undefined,
-      twosandiantype:undefined,
-      twosandiantypenum:undefined,
-      toopvisible:true,
-      toopvisibleindex:index,
-      twosandiantypes:type
+      toopvisibleindexs: undefined,
     })
     e.stopPropagation();//阻止冒泡
   }
 
-  twosandianhideys=(e,index,type)=>{
+  sansandianshowyss = (e, key, type) => {
+    // console.log("twosandianshow");
+    // console.log(key);
+    // console.log(type);
+    this.setState({
+      toopvisibleindexs: undefined,
+    })
+    e.stopPropagation();//阻止冒泡
+  }
+
+  twosandianhide = (e, index, type) => {
     // console.log(index)
     this.setState({
-      toopvisibleindexs:undefined,
+      toopvisibleindexs: undefined,
+      twosandiantype: undefined,
+      twosandiantypenum: undefined,
+      toopvisible: true,
+      toopvisibleindex: index,
+      twosandiantypes: type
+    })
+    e.stopPropagation();//阻止冒泡
+  }
+
+  sansandianhide = (e, index, type) => {
+    // console.log(index)
+    this.setState({
+      toopvisibleindexs: undefined,
+      sansandiantype: undefined,
+      twosandiantypenum: undefined,
+      toopvisible: true,
+      sanshow: '',
+      toopvisibleindex: index,
+      twosandiantypes: type
+    })
+    e.stopPropagation();//阻止冒泡
+  }
+
+  twosandianhideys = (e, index, type) => {
+    // console.log(index)
+    this.setState({
+      toopvisibleindexs: undefined,
     })
     e.stopPropagation();//阻止冒泡
   }
 
   //置顶
-  editSetup=(e,id)=>{
+  editSetup = (e, id) => {
     e.stopPropagation();//阻止冒泡
-    navidtype=false
+    navidtype = false
     this.setState({
-      navid:undefined,
-      sandiantype:undefined,
-      twosandiantype:undefined,
+      navid: undefined,
+      sandiantype: undefined,
+      twosandiantype: undefined,
+      sansandiantype: undefined,
+
+
     })
 
-    let url="/course_modules/"+id+"/sticky_module.json"
-    axios.get(url).then((result)=>{
-      navidtype=true
+    let url = "/course_modules/" + id + "/sticky_module.json"
+    axios.get(url).then((result) => {
+      navidtype = true
       this.props.updataleftNavfun();
-    }).catch((error)=>{
-      navidtype=true
+    }).catch((error) => {
+      navidtype = true
     })
   }
 
   //隐藏
-  edithiddens=(id)=>{
+  edithiddens = (id) => {
 
-    navidtype=false
+    navidtype = false
     this.setState({
-      navid:undefined,
-      sandiantype:undefined,
-      twosandiantype:undefined,
-			ModalsType:false
+      navid: undefined,
+      sandiantype: undefined,
+      twosandiantype: undefined,
+      sansandiantype: undefined,
+      ModalsType: false
     })
 
-    let url="/course_modules/"+id+"/hidden_module.json"
-    axios.get(url).then((result)=>{
-      navidtype=true
+    let url = "/course_modules/" + id + "/hidden_module.json"
+    axios.get(url).then((result) => {
+      navidtype = true
       this.props.updataleftNavfun();
       // console.log(this.props)
-      let list=this.props.course_modules;
-      for(var i=0; i<list.length;i++){
-        if(list[i].id!=id){
+      let list = this.props.course_modules;
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].id != id) {
           this.props.history.push(list[i].category_url)
           return
         }
       }
-    }).catch((error)=>{
-      navidtype=true
+    }).catch((error) => {
+      navidtype = true
     })
   }
 
-  edithidden=(e,id)=>{
+
+
+  edithidden = (e, id) => {
     e.stopPropagation();//阻止冒泡
-		let {course_modules}=this.props;
+    let { course_modules } = this.props;
 
-		if(course_modules.length>1){
-			this.setState({
-				ModalsType:true,
-				Modalstopval:"隐藏后将不再显示此模块，",
-				ModalsBottomval:"后续可在课堂设置中重新勾选模块恢复显示",
-				ModalSave:()=>this.edithiddens(id),
-			})
-		}else{
-			this.setState({
-				ModalsType:true,
-				Modalstopval:"您不能隐藏所有课堂模块，请至少保留",
-				ModalsBottomval:"其中一个模块。",
-				loadtype:true,
-				ModalSave:()=>this.cannerNavmoda(),
-			})
-		}
+    if (course_modules.length > 1) {
+      this.setState({
+        ModalsType: true,
+        Modalstopval: "隐藏后将不再显示此模块，",
+        ModalsBottomval: "后续可在课堂设置中重新勾选模块恢复显示",
+        ModalSave: () => this.edithiddens(id),
+        loadtype: false
+      })
+    } else {
+      this.setState({
+        ModalsType: true,
+        Modalstopval: "您不能隐藏所有课堂模块，请至少保留",
+        ModalsBottomval: "其中一个模块。",
+        loadtype: false,
+        ModalSave: () => this.cannerNavmoda(),
+      })
+    }
 
   }
 
-  Navmodalnames=(e,id,type,setnavid,name)=>{
+  Navmodalnames = (e, id, type, setnavid, name, towid, showPreson) => {
     e.stopPropagation();//阻止冒泡
-      navidtype=false
-      if(id===1||id===2||id===6){
-        this.setState({
-          Navmodalname:id===2?"新建分班":"新建目录",
-          Navtitles:id===2?"分班名称":"目录名称",
-          Navplaceholder:"请输入名称，最大限制60个字符",
-          Navmodalnametype:true,
-          Navmodaltypename:id,
-          setnavid:setnavid,
-          NavmodalValue:""
-        })
-      }else if(id===3||id===4||id===5||id===7){
+    this.getatahcment()
+    navidtype = false
+    if (id === 1 || id === 2 || id === 6) {
+      this.setState({
+        Navmodalname: id === 2 ? "新建分班" : "新建目录",
+        Navtitles: id === 2 ? "分班名称" : "目录名称",
+        Navplaceholder: "请输入名称，最大限制60个字符",
+        Navmodalnametype: true,
+        Navmodaltypename: id,
+        Navmodalziyname: name,
+        treedefaultValue: towid,
+        showPreson: showPreson,
+        setnavid: setnavid,
+        parentid: towid,
+        NavmodalValue: ""
+      })
+    } else if (id === 3 || id === 4 || id === 5 || id === 7) {
 
-        this.setState({
-          Navmodalname:id===5?"分班重命名":"目录重命名",
-          Navtitles:id===5?"分班名称":"目录名称",
-          Navplaceholder:"请输入名称，最大限制60个字符",
-          Navmodalnametype:true,
-          Navmodaltypename:id,
-          setnavid:setnavid,
-          NavmodalValue:name
-        })
+      this.setState({
+        Navmodalname: id === 5 ? "分班重命名" : "目录重命名",
+        Navtitles: id === 5 ? "分班名称" : "目录名称",
+        Navplaceholder: "请输入名称，最大限制60个字符",
+        Navmodalnametype: true,
+        Navmodaltypename: id,
+        setnavid: setnavid,
+        treedefaultValue: towid,
+        showPreson: showPreson,
+        Navmodalziyname: '',
+        parentid: towid,
+        NavmodalValue: name
+      })
 
-      }
+    }
 
 
   }
 
-  cannerNavmoda=()=>{
-
+  cannerNavmoda = () => {
     this.setState({
-      Navmodalnametype:false,
-      NavmodalValuetype:false,
-      ModalsType:false
+      Navmodalnametype: false,
+      NavmodalValuetype: false,
+      ModalsType: false
     })
-    navidtype=true
+    navidtype = true
   }
-  setNavmodalValue=(e)=>{
+  setNavmodalValue = (e) => {
     this.setState({
-      NavmodalValue:e.target.value
+      NavmodalValue: e.target.value
     })
   }
 
-  updasaveNavmoda=(message)=>{
+  updasaveNavmoda = (message) => {
     this.props.updataleftNavfun();
     // this.setState({
     //   ModalsType:true,
@@ -521,227 +672,281 @@ class Coursesleftnav extends Component{
     //   loadtype:true,
     //   NavmodalValue:""
     // })
-    navidtype=true
+    navidtype = true;
+    const { successFunc } = this.state;
+    successFunc && successFunc(1);
   }
 
-  saveNavmodapost=(url,value,positiontype,coursesId)=>{
-
+  saveNavmodapost = (url, value, positiontype, coursesId, type) => {
+    console.log(positiontype)
     axios.post(url,
-      {name:value}).then((result)=>{
-      	if(result!=undefined){
-					if(result.data.status===0){
+      {
+        name: value,
+        parent_id: this.state.parentid
+      }).then((result) => {
+        if (result != undefined) {
+          if (result.data.status === 0) {
 
-						notification.open({
-							message:"提示",
-							description:result.data.message
-						});
+            notification.open({
+              message: "提示",
+              description: result.data.message
+            });
 
+            if (positiontype === "common_homeworks" || positiontype === "common_homework" || positiontype === "group_homeworks" || positiontype === "group_homework") {
+              if (type === true) {
+                this.updasaveNavmoda()
+                trigger('updateNavSuccess')
+              } else {
+                this.updasaveNavmoda()
+                if (positiontype === "common_homeworks") {
+                  this.props.history.push(`/classrooms/${coursesId}/common_homework/${result.data.category_id}`);
+                }
+                if (positiontype === "group_homeworks") {
+                  this.props.history.push(`/classrooms/${coursesId}/group_homework/${result.data.category_id}`);
+                }
 
-						if(positiontype==="files"){
-              this.updasaveNavmoda()
-              trigger('updateNavSuccess')
-							window.location.href=`/courses/${coursesId}/file/${result.data.category_id}`;
-						}
-
-					  if(positiontype==="boards"){
-              this.updasaveNavmoda()
-              trigger('updateNavSuccess')
-							window.location.href=`/courses/${coursesId}/boards/${result.data.category_id}`;
-						}
-
-            if(positiontype!="course_groups"){
-              this.updasaveNavmoda()
+              }
+              return
             }
 
-						if(positiontype==="course_groups"){
-							window.location.href=`/courses/${coursesId}/course_groups/${result.data.group_id}`;
-						}
+            if (positiontype === "shixun_homeworks" || positiontype === "shixun_homework") {
+              if (type === true) {
+                this.updasaveNavmoda()
+                trigger('shixun')
+              } else {
+                this.updasaveNavmoda()
+                this.props.history.push(`/classrooms/${coursesId}/shixun_homework/${result.data.category_id}`);
 
-					}
-				}
-    }).catch((error)=>{
-      console.log(error)
-    })
+              }
+              return
+            }
+
+            if (positiontype === "files" || positiontype === "file") {
+              if (type === true) {
+                this.updasaveNavmoda()
+                trigger('files')
+              } else {
+                this.updasaveNavmoda()
+                this.props.history.push(`/classrooms/${coursesId}/file/${result.data.category_id}`);
+              }
+              return
+            }
+
+            if (positiontype === "boards") {
+              this.updasaveNavmoda()
+              trigger('updateNavSuccess')
+              this.props.history.push(`/classrooms/${coursesId}/boards/${result.data.category_id}`);
+              return
+            }
+
+            if (positiontype != "course_groups" && positiontype != "shixun_homeworks" && positiontype != "shixun_homework") {
+              this.updasaveNavmoda()
+              return
+            }
+
+            if (positiontype === "course_groups") {
+              this.props.updataleftNavfun();
+              this.props.history.push(`/classrooms/${coursesId}/course_groups/${result.data.group_id}`);
+              return
+            }
+
+          }
+        }
+      }).catch((error) => {
+        console.log(error)
+      })
   }
-  saveboardpost=(url,value)=>{
+  saveboardpost = (url, value) => {
     axios.put(url,
-      {name:value}).then((result)=>{
-			if(result!=undefined){
-				if(result.data.status===0){
-					// window.location.reload()
-					this.updasaveNavmoda()
-					trigger('updateNavSuccess')
+      { name: value }).then((result) => {
+        if (result != undefined) {
+          if (result.data.status === 0) {
+            this.updasaveNavmoda()
+            trigger('updateNavSuccess')
 
-					//
-					notification.open({
-						message:"提示",
-						description:result.data.message
-					});
-				}
-			}
-    }).catch((error)=>{
-      console.log(error)
-    })
+            notification.open({
+              message: "提示",
+              description: result.data.message
+            });
+          }
+        }
+      }).catch((error) => {
+        console.log(error)
+      })
   }
 
-  saveNavmoda=()=>{
-    let {Navmodaltypename,setnavid,NavmodalValue}=this.state;
-    let id =setnavid;
+  saveNavmoda = () => {
+    let { Navmodaltypename, setnavid, NavmodalValue } = this.state;
+    let id = setnavid;
 
-		if(Navmodaltypename===5&&NavmodalValue==="未分班"||Navmodaltypename===2&&NavmodalValue==="未分班"){
-			this.setState({
-				NavmodalValuetype:true,
-				NavmodalValues:"名称不能和未分班一样"
-			})
-			return
-		}
-
-    if(NavmodalValue===""){
+    if (Navmodaltypename === 5 && NavmodalValue === "未分班" || Navmodaltypename === 2 && NavmodalValue === "未分班") {
       this.setState({
-        NavmodalValuetype:true,
-        NavmodalValues:"名称不能为空"
-      })
-      return
-    }else  if(NavmodalValue.length>60){
-      this.setState({
-        NavmodalValuetype:true,
-        NavmodalValues:"名称不能超过60个字"
+        NavmodalValuetype: true,
+        NavmodalValues: "名称不能和未分班一样"
       })
       return
     }
 
-   if(Navmodaltypename===1){
-     let url="/course_modules/"+id+"/add_second_category.json"
-     this.saveNavmodapost(url,NavmodalValue,this.state.positiontype,this.props.match.params.coursesId)
+    if (NavmodalValue === "") {
+      this.setState({
+        NavmodalValuetype: true,
+        NavmodalValues: "名称不能为空"
+      })
+      return
+    } else if (NavmodalValue.length > 60) {
+      this.setState({
+        NavmodalValuetype: true,
+        NavmodalValues: "名称不能超过60个字"
+      })
+      return
+    }
 
-    } else if(Navmodaltypename===2){
+    if (Navmodaltypename === 1) {
+      let url = "/course_modules/" + id + "/add_second_category.json"
+      this.saveNavmodapost(url, NavmodalValue, this.state.positiontype, this.props.match.params.coursesId)
 
-     let newid=this.props.match.params.coursesId;
-     let url="/courses/"+newid+"/course_groups.json";
-     this.saveNavmodapost(url,NavmodalValue,this.state.positiontype,this.props.match.params.coursesId)
+    } else if (Navmodaltypename === 2) {
 
-    }else if(Navmodaltypename===3){
+      let newid = this.props.match.params.coursesId;
+      let url = "/courses/" + newid + "/course_groups.json";
+      this.saveNavmodapost(url, NavmodalValue, this.state.positiontype, this.props.match.params.coursesId)
 
-     let url="/course_modules/"+id+"/rename_module.json"
-     this.saveNavmodapost(url,NavmodalValue)
+    } else if (Navmodaltypename === 3) {
 
-   }else if(Navmodaltypename===4){
+      let url = "/course_modules/" + id + "/rename_module.json"
+      this.saveNavmodapost(url, NavmodalValue, this.state.positiontype, null, true)
 
-     let url="/course_second_categories/"+id+"/rename_category.json";
-     this.saveNavmodapost(url,NavmodalValue)
+    } else if (Navmodaltypename === 4) {
 
-    }else if(Navmodaltypename===5){
+      let url = "/course_second_categories/" + id + "/rename_category.json";
+      this.saveNavmodapost(url, NavmodalValue, this.state.positiontype, null, true)
 
-     let url="/course_groups/"+id+"/rename_group.json";
-     this.saveNavmodapost(url,NavmodalValue)
+    } else if (Navmodaltypename === 5) {
 
-    }else if(Navmodaltypename===6) {
+      let url = "/course_groups/" + id + "/rename_group.json";
+      this.saveNavmodapost(url, NavmodalValue)
 
-     let newid=this.props.match.params.coursesId;
-     let url = "/courses/"+newid+"/boards.json";
-     this.saveNavmodapost(url,NavmodalValue,this.state.positiontype,this.props.match.params.coursesId)
+    } else if (Navmodaltypename === 6) {
 
-    }else if(Navmodaltypename===7) {
+      let newid = this.props.match.params.coursesId;
+      let url = "/courses/" + newid + "/boards.json";
+      this.saveNavmodapost(url, NavmodalValue, this.state.positiontype, this.props.match.params.coursesId)
 
-     let url = "/boards/"+id+".json";
-     this.saveboardpost(url,NavmodalValue)
+    } else if (Navmodaltypename === 7) {
 
-     }
+      let url = "/boards/" + id + ".json";
+      this.saveboardpost(url, NavmodalValue)
 
-     this.setState({
-      Navmodalnametype:false
+    }
+
+    this.setState({
+      Navmodalnametype: false
     })
   }
 
 
 
 
-   updatadeleteSecondary=(url)=>{
-     this.props.updataleftNavfun();
-     // this.setState({
-     //   ModalsType:true,
-     //   Modalstopval:"删除成功",
-     //   loadtype:true,
-     // })
-     // notification.open({
-     //   message: "删除成功",
-     // });
+  updatadeleteSecondary = (url) => {
+    this.props.updataleftNavfun();
+    this.setState({
+      ModalsType: false,
+      Modalstopval: "",
+      loadtype: false,
+      antIcon: false
+    })
+    notification.open({
+      message: "删除成功",
+    });
 
-		 // this.props.history.replace(url);
-      window.location.href = url;
-   }
+    this.props.history.replace(url);
 
-  deletenavchilds=(url,mainurl)=>{
-   this.setState({
-		 antIcon:true
-	 })
-    axios.delete(url).then((result)=>{
-      if(result.data.status===0){
+    //  window.location.href = url;
+  }
 
-				if(mainurl===undefined){
-					this.updatadeleteSecondary(result.data.right_url)
-				}else{
-					this.updatadeleteSecondary(mainurl)
-				}
+  deletenavchilds = (url, mainurl) => {
 
+    this.setState({
+      antIcon: true
+    })
+    axios.delete(url).then((result) => {
+      if (result.data.status === 0) {
+        this.updatadeleteSecondary(mainurl || result.data.right_url);
+        this.setState({
+          antIcon: false
+        })
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error)
     })
   }
-  deleteSecondary=(e,type,id,mainurl)=>{
+  deleteSecondary = (e, type, id, mainurl) => {
     e.stopPropagation();//阻止冒泡
-    if(type===1){
-      let url="/course_second_categories/"+id+".json"
-
+    if (type === 1) {
+      let url = "/course_second_categories/" + id + ".json"
       this.setState({
-         ModalsType:true,
-         Modalstopval:"该目录下的内容将被移动到父目录,",
-         ModalsBottomval:"是否确认删除?",
-         ModalSave:()=>this.deletenavchilds(url),
-
+        loadtype: false,
+        ModalsType: true,
+        Modalstopval: "该目录下的内容将被移动到父目录,",
+        ModalsBottomval: "是否确认删除?",
+        ModalSave: () => this.deletenavchilds(url, mainurl)
       })
-
-    }else if(type===2){
-      let url="/course_groups/"+id+".json"
+    } else if (type === 2) {
+      let url = "/course_groups/" + id + ".json"
       this.setState({
-        ModalsType:true,
-        Modalstopval:"该分班的学生将被移动到“未分班”,",
-        ModalsBottomval:"是否确认删除?",
-        ModalSave:()=>this.deletenavchilds(url),
-
+        ModalsType: true,
+        Modalstopval: "该分班的学生将被移动到“未分班”,",
+        ModalsBottomval: "是否确认删除?",
+        ModalSave: () => this.deletenavchilds(url),
+        loadtype: false
       })
-    }else if(type===3){
-      let url="/boards/"+id+".json"
+    } else if (type === 3) {
+      let url = "/boards/" + id + ".json"
       this.setState({
-        ModalsType:true,
-        Modalstopval:"该目录下的内容将被移动到父目录,",
-        ModalsBottomval:"是否确认删除?",
-        ModalSave:()=>this.deletenavchilds(url,mainurl),
-
+        ModalsType: true,
+        Modalstopval: "该目录下的内容将被移动到父目录,",
+        ModalsBottomval: "是否确认删除?",
+        ModalSave: () => this.deletenavchilds(url, mainurl),
+        loadtype: false
       })
     }
 
   }
+  tronChange = (value) => {
 
+    console.log(this.state.dropdownStyleshow)
 
-  droppablepost=(url,list)=>{
-    axios.post(url,{position: list}).then((result)=>{
-			if(result!=undefined){
-				// this.updasaveNavmoda(result.data.message)
-				this.updasaveNavmoda()
-				//
-				notification.open({
-					message:"提示",
-					description:result.data.message
-				});
-			}
-    }).catch((error)=>{
+    this.setState({
+      parentid: this.state.treeDataid === value ? 0 : value,
+      dropdownStyleshow: 'none'
+
+    })
+
+  }
+  tronclick = () => {
+    this.setState({
+      dropdownStyleshow: 'inline-block'
+    })
+
+  }
+
+  droppablepost = (url, list) => {
+    axios.post(url, { position: list }).then((result) => {
+      if (result != undefined) {
+        // this.updasaveNavmoda(result.data.message)
+        this.updasaveNavmoda()
+        //
+        notification.open({
+          message: "提示",
+          description: result.data.message
+        });
+      }
+    }).catch((error) => {
       console.log(error)
     })
   }
 
-  onDragEnd=(result)=>{
+  onDragEnd = (result) => {
     // console.log(result)
     // let {course_modules}=this.props;
     // let newcourse_modules=course_modules;
@@ -773,80 +978,96 @@ class Coursesleftnav extends Component{
     //   course_modules:newcourse_modules
     // })
 
-		if(result.source.droppableId==="shixun_homework"||result.source.droppableId==="graduation"||result.source.droppableId==="attachment"){
+    if (result.source.droppableId === "shixun_homework" || result.source.droppableId === "graduation" || result.source.droppableId === "attachment") {
 
-			let url ="/course_second_categories/"+result.draggableId+"/move_category.json";
-			if(result.destination.index!=null){
-				this.droppablepost(url,result.destination.index+1)
-			}
-		}else if(result.source.droppableId==="board"){
+      let url = "/course_second_categories/" + result.draggableId + "/move_category.json";
+      if (result.destination.index != null) {
+        this.droppablepost(url, result.destination.index + 1)
+      }
+    } else if (result.source.droppableId === "board") {
 
-			let url ="/boards/"+result.draggableId+"/move_category.json";
-			if(result.destination.index!=null) {
-				this.droppablepost(url, result.destination.index + 1)
-			}
-		}else if(result.source.droppableId==="course_group"){
-			if(result.draggableId!=1){
-				let url ="/course_groups/"+result.draggableId+"/move_category.json";
-				if(result.destination.index!=null) {
-					this.droppablepost(url, result.destination.index + 1)
-				}
-			}
-		}
+      let url = "/boards/" + result.draggableId + "/move_category.json";
+      if (result.destination.index != null) {
+        this.droppablepost(url, result.destination.index + 1)
+      }
+    } else if (result.source.droppableId === "course_group") {
+      if (result.draggableId != 1) {
+        let url = "/course_groups/" + result.draggableId + "/move_category.json";
+        if (result.destination.index != null) {
+          this.droppablepost(url, result.destination.index + 1)
+        }
+      }
+    }
 
   }
 
-  hidesandian=(e,key)=>{
+
+  hidesandian = (e, key) => {
     this.setState({
-      sandiantypes:undefined
+      sandiantypes: undefined
     })
     e.stopPropagation();//阻止冒泡
   }
 
-  showsandian=(e,key)=>{
+  showsandian = (e, key) => {
     this.setState({
-      sandiantypes:key
+      sandiantypes: key
     })
     e.stopPropagation();//阻止冒泡
   }
 
-  showsandians=(e,key,urls,num,id,type,index)=> {
-    let {url}=this.state;
+
+  showsandians = (e, key, urls, num, id, type, index) => {
+    let { url } = this.state;
     if (key === this.props.indexs) {
+
       this.props.unlocationNavfun(undefined)
     } else {
-			this.props.updataleftNavfun();
+      this.props.updataleftNavfun();
       this.props.unlocationNavfun(key)
     }
-    if(urls!=url){
-			this.props.updataleftNavfun();
+    if (urls != url) {
+      this.props.updataleftNavfun();
     }
-		this.setState({
-			selectnavid:true,
-			newselectnavid:id,
-			url:urls,
-			indexs:index
+    this.setState({
+      selectnavid: true,
+      newselectnavid: id,
+      url: urls,
+      indexs: index
     })
+    try {
+      if (this.props.myinex === true) {
+        this.props.Callhomedirectoryornot(true);
+      }
+    } catch (e) {
+
+    }
     this.props.history.replace(urls);
     e.stopPropagation();//阻止冒泡
   }
 
-  maincontent=(item,key)=>{
-    return (  <div className={"sandianbox"}>
-       {/*公告栏*/}
+  maincontent = (item, key) => {
+    return (<div className={"sandianbox"}>
+      {/*公告栏*/}
       {/*作业*/}
-      {item.type==="shixun_homework"?<div onClick={e=>this.Navmodalnames(e,1,"shixun_homework",item.id)}>新建目录</div>:""}
+      {item.type === "shixun_homework" ? <div onClick={e => this.Navmodalnames(e, 1, "shixun_homework", item.id)}>新建目录</div> : ""}
+      {/* 普通作业 */}
+      {item.type === "common_homework" ? <div onClick={e => this.Navmodalnames(e, 1, "common_homeworks", item.id)}>新建目录</div> : ""}
+      {/*/!* 分组作业 *!/*/}
+      {item.type === "group_homework" ? <div onClick={e => this.Navmodalnames(e, 1, "group_homeworks", item.id)}>新建目录</div> : ""}
       {/*资源*/}
-      {item.type==="attachment"?<div onClick={e=>this.Navmodalnames(e,1,"attachment",item.id)}>新建目录</div>:""}
+      {item.type === "attachment" ? <div onClick={e => this.Navmodalnames(e, 1, "attachment", item.id, "资源")}>新建目录</div> : ""}
+      {/* 视频 */}
+      {item.type === "video" ? <div onClick={e => this.Navmodalnames(e, 1, "video", item.id)}>新建目录</div> : ""}
       {/*毕业设计*/}
       {/*{item.type==="graduation"?<div onClick={()=>this.Navmodalnames(1,"attachment",item.id)}>添加目录</div>:""}*/}
       {/*讨论区*/}
-      {item.type==="board"?this.props.current_user&&this.props.current_user.course_is_end===true?"":<div onClick={e=>this.Navmodalnames(e,6,"board",item.main_id)}>新建目录</div>:""}
+      {item.type === "board" ? this.props.current_user && this.props.current_user.course_is_end === true ? "" : <div onClick={e => this.Navmodalnames(e, 6, "board", item.main_id)}>新建目录</div> : ""}
       {/*分班*/}
-      {item.type==="course_group"?this.props.current_user&&this.props.current_user.course_is_end===true?"":<div onClick={e=>this.Navmodalnames(e,2,"course_group",item.id)}>新建分班</div>:""}
+      {item.type === "course_group" ? this.props.current_user && this.props.current_user.course_is_end === true ? "" : <div onClick={e => this.Navmodalnames(e, 2, "course_group", item.id)}>新建分班</div> : ""}
       {/*分班*/}
       {/*{item.type==="course_group"? :""}*/}
-      <div onClick={e=>this.Navmodalnames(e,3,"editname",item.id,item.name)}>重命名</div>
+      <div onClick={e => this.Navmodalnames(e, 3, "editname", item.id, item.name)}>重命名</div>
       {/*online_learning*/}
       {/*{*/}
       {/*  this.props.isClassManagement()===true?*/}
@@ -856,54 +1077,60 @@ class Coursesleftnav extends Component{
       {/*      :""*/}
       {/*    )*/}
       {/*    :""}*/}
-      <div onClick={e=>this.edithidden(e,item.id)}>隐藏</div>
-      <div onClick={e=>this.editSetup(e,item.id)}>置顶</div>
+      <div onClick={e => this.edithidden(e, item.id)}>隐藏</div>
+      <div onClick={e => this.editSetup(e, item.id)}>置顶</div>
     </div>)
   }
-  content=(item,iem,index)=>{
-    let {twosandiantypes,twosandiantypenum}=this.state;
-    return (item.type==="graduation"?"": <div className={item.type===twosandiantypes&&twosandiantypenum===index?"sandianboxs":"sandianboxs"} >
-          {/*作业/资源*/}
-          {item.type==="shixun_homework"||item.type==="attachment"||item.type==="graduation"?<div onClick={e=>this.Navmodalnames(e,4,"editSecondname",iem.category_id,iem.category_name)}>重命名</div>:""}
-          {item.type==="shixun_homework"||item.type==="attachment"?<div onClick={e=>this.deleteSecondary(e,1,iem.category_id)}>删除</div>:""}
-          {/*分班*/}
-          {item.type==="course_group"?<div onClick={e=>this.Navmodalnames(e,5,"editSecondname",iem.category_id,iem.category_name)}>重命名</div>:""}
-          {item.type==="course_group"?<div onClick={e=>this.deleteSecondary(e,2,iem.category_id)}>删除</div>:""}
-          {/*讨论区*/}
-          {item.type==="board"?<div onClick={e=>this.Navmodalnames(e,7,"editSecondname",iem.category_id,iem.category_name)}>重命名</div>:""}
-          {item.type==="board"?<div onClick={e=>this.deleteSecondary(e,3,iem.category_id,item.category_url)}>删除</div>:""}
-        </div>)
+  content = (item, iem, index, san) => {
+    let { twosandiantypes, twosandiantypenum } = this.state;
+    return (item.type === "graduation" ? "" : <div className={item.type === twosandiantypes && twosandiantypenum === index ? "sandianboxs" : "sandianboxs"} >
+      {/*作业/资源*/}
+      {item.type === "attachment" && san !== 'san' ? <div onClick={e => this.Navmodalnames(e, 1, "attachment", item.id, "资源", iem.category_id, true)}>新建目录</div> : ""}
+      {item.type === "shixun_homework" || item.type === "attachment" || item.type === "graduation" || item.type === "common_homework" || item.type === "group_homework" ? <div onClick={e => this.Navmodalnames(e, 4, "editSecondname", iem.category_id, iem.category_name)}>重命名</div> : ""}
+      {item.type === "shixun_homework" || item.type === "attachment" || item.type === "common_homework" || item.type === "group_homework" ? <div onClick={e => this.deleteSecondary(e, 1, iem.category_id)}>删除</div> : ""}
+      {/*分班*/}
+      {item.type === "course_group" ? <div onClick={e => this.Navmodalnames(e, 5, "editSecondname", iem.category_id, iem.category_name)}>重命名</div> : ""}
+      {item.type === "course_group" ? <div onClick={e => this.deleteSecondary(e, 2, iem.category_id)}>删除</div> : ""}
+      {/*讨论区*/}
+      {item.type === "board" ? <div onClick={e => this.Navmodalnames(e, 7, "editSecondname", iem.category_id, iem.category_name)}>重命名</div> : ""}
+      {item.type === "board" ? <div onClick={e => this.deleteSecondary(e, 3, iem.category_id, item.category_url)}>删除</div> : ""}
+      {/*视频*/}
+      {item.type === "video" ? <div onClick={e => this.Navmodalnames(e, 4, "editSecondname", iem.category_id, iem.category_name)}>重命名</div> : ""}
+      {item.type === "video" ? <div onClick={e => this.deleteSecondary(e, 1, iem.category_id, item.category_url)}>删除</div> : ""}
+    </div>)
   };
 
   //章节编辑
-  Chapterediting=(e,id,url)=> {
+  Chapterediting = (e, id, url) => {
     e.stopPropagation();//阻止冒泡
     //页面刷新
     this.setState({
-      chapterupdate:true,
+      chapterupdate: true,
     })
   };
-  setchapterupdatefalse =()=>{
+  setchapterupdatefalse = () => {
     this.setState({
-      chapterupdate:false,
+      chapterupdate: false,
     })
   }
-  render(){
-     let {
-       twosandiantype,
-       Navmodalname,
-       Navmodalnametype,
-       NavmodalValue,
-       ModalsType,
-       Modalstopval,
-       ModalsBottomval,
-       ModalSave,
-       loadtype,
-       twosandiantypes,
-       toopvisibleindexs
-       }=this.state;
+  render() {
 
-     let {course_modules,hidden_modules,is_teacher} =this.props;
+    let {
+      twosandiantype,
+      Navmodalname,
+      Navmodalnametype,
+      NavmodalValue,
+      ModalsType,
+      Modalstopval,
+      ModalsBottomval,
+      ModalSave,
+      loadtype,
+      twosandiantypes,
+      toopvisibleindexs,
+      sansandiantype
+    } = this.state;
+
+    let { course_modules, hidden_modules, is_teacher } = this.props;
     // console.log(this.props.location.pathname)
     // // console.log(item.category_url)
     // console.log(this.props.location.pathname)
@@ -912,92 +1139,114 @@ class Coursesleftnav extends Component{
     // console.log("CoursesLeftNav");
     // console.log(course_modules);
 
-    return(
 
-         <ul className="mb10 newedu-class-leftnav">
 
-           <Modals
-             modalsType={ModalsType}
-             modalsTopval={Modalstopval}
-             modalsBottomval={ModalsBottomval}
-             modalSave={ModalSave}
-             modalCancel={this.cannerNavmoda}
-             loadtype={loadtype}
-						 antIcon={this.state.antIcon}
-           >
-           </Modals>
 
-           {/*{*/}
-           {/*  this.state.chapterupdate===true?*/}
-           {/*    <div>*/}
-           {/*      <style>*/}
-           {/*        {*/}
-           {/*          `*/}
-           {/*      .ant-modal-body{*/}
-           {/*         padding-left: 33px !important;*/}
-           {/*         padding-right: 33px !important;*/}
-           {/*         padding-top: 27px !important;*/}
-           {/*         padding-bottom: 21px !important;*/}
-           {/*        }*/}
-           {/*    `*/}
-           {/*        }*/}
-           {/*      </style>*/}
-           {/*    <MyEduChapterupdate  {...this.props} {...this.state} chapterupdate={this.state.chapterupdate} setchapterupdatefalse={this.setchapterupdatefalse}>*/}
-           {/*    </MyEduChapterupdate>*/}
-           {/*    </div>*/}
-           {/*    :*/}
-           {/*    ""*/}
-           {/*}*/}
+    return (
 
-           {
-             Navmodalnametype===true?<style>
-               {
-                 `
+      <ul className="mb10 newedu-class-leftnav">
+
+        <Modals
+          modalsType={ModalsType}
+          modalsTopval={Modalstopval}
+          modalsBottomval={ModalsBottomval}
+          modalSave={ModalSave}
+          modalCancel={this.cannerNavmoda}
+          loadtype={loadtype}
+          antIcon={this.state.antIcon}
+        >
+        </Modals>
+
+        {/*{*/}
+        {/*  this.state.chapterupdate===true?*/}
+        {/*    <div>*/}
+        {/*      <style>*/}
+        {/*        {*/}
+        {/*          `*/}
+        {/*      .ant-modal-body{*/}
+        {/*         padding-left: 33px !important;*/}
+        {/*         padding-right: 33px !important;*/}
+        {/*         padding-top: 27px !important;*/}
+        {/*         padding-bottom: 21px !important;*/}
+        {/*        }*/}
+        {/*    `*/}
+        {/*        }*/}
+        {/*      </style>*/}
+        {/*    <MyEduChapterupdate  {...this.props} {...this.state} chapterupdate={this.state.chapterupdate} setchapterupdatefalse={this.setchapterupdatefalse}>*/}
+        {/*    </MyEduChapterupdate>*/}
+        {/*    </div>*/}
+        {/*    :*/}
+        {/*    ""*/}
+        {/*}*/}
+
+        <style>
+          {
+            `
               body {
-							  overflow: hidden !important;
+                  width: calc(100%) !important;
 							}
               `
-               }
-             </style>:""
-           }
-           <Modal
-             keyboard={false}
-             title={Navmodalname}
-             visible={Navmodalnametype}
-             className={"Navmodal"}
-             closable={false}
-             footer={null}
-             destroyOnClose={true}
-             centered={true}
-           >
-             <div className="df">
-                <div className={"fl mt5"}>{this.state.Navtitles}：</div>
-                <Input placeholder={this.state.Navplaceholder}
-                    className={"input-flex-35 greyInput fl"}
-                    maxLength="60"
-                    value={NavmodalValue}
-                    onInput={this.setNavmodalValue}
-                />
-             </div>
-						 <style>
-							 {
-							 	`
+          }
+        </style>
+        <Modal
+          keyboard={false}
+          title={Navmodalname}
+          visible={Navmodalnametype}
+          className={"Navmodal"}
+          closable={false}
+          footer={null}
+          destroyOnClose={true}
+          centered={true}
+        >
+          <div>
+            {this.state.Navmodalziyname === "资源" ? <div className="df" style={{ marginBottom: 50 }}>
+              <div className={"fl mt5"} id="ddd">上级目录：</div>
+
+              <TreeSelect
+                className={"input-flex-35 greyInput fl"}
+                style={{ width: 300, color: '#000000' }}
+                getPopupContainer={() => document.getElementById('ddd')}
+                dropdownClassName={{ display: this.state.dropdownStyleshow }}
+                treeData={this.state.treeData}
+                placeholder={this.state.treeDataname}
+                disabled={this.state.showPreson}
+                defaultValue={this.state.treedefaultValue}
+                treeDefaultExpandAll
+                onChange={this.tronChange}
+                onClick={this.tronclick}
+              />
+            </div> : ''}
+
+            <div className="df" >
+              <div className={"fl mt5"}  >{this.state.Navtitles}：</div>
+              <Input placeholder={this.state.Navplaceholder}
+                className={"input-flex-35 greyInput fl"}
+                maxLength="60"
+                value={NavmodalValue}
+                onInput={this.setNavmodalValue}
+              />
+            </div>
+          </div>
+          <style>
+            {
+              `
 							 	.ml70{
     							margin-left: 70px;
 							 	}
 							 	`
-							 }
-						 </style>
-             {this.state.NavmodalValuetype===true?<span className={"ml70 color-red"}>
-                 {this.state.NavmodalValues}
-             </span>:""}
-             <div className={this.state.NavmodalValuetype===true?"clearfix mt20 edu-txt-center":"clearfix mt50 edu-txt-center"}>
-               <a  className="task-btn mr30" onClick={this.cannerNavmoda}>取消</a>
-               <a className="task-btn task-btn-orange" onClick={this.saveNavmoda}>确定</a>
-             </div>
-           </Modal>
-           <style>
-             {`
+            }
+          </style>
+
+          {this.state.NavmodalValuetype === true ? <span className={"ml70 color-red"}>
+            {this.state.NavmodalValues}
+          </span> : ""}
+          <div className={this.state.NavmodalValuetype === true ? "clearfix mt20 edu-txt-center" : "clearfix mt50 edu-txt-center"}>
+            <a className="task-btn mr30" onClick={this.cannerNavmoda}>取消</a>
+            <a className="task-btn task-btn-orange" onClick={this.saveNavmoda}>确定</a>
+          </div>
+        </Modal>
+        <style>
+          {`
               // .activity-left-name{
               //    width: 100%;
               //   }
@@ -1011,236 +1260,329 @@ class Coursesleftnav extends Component{
                 margin-right:13px;
                 }
              `}
-           </style>
-           { is_teacher===true?
-                  course_modules===undefined?"":course_modules.map((item,key)=>{
-                    return(
-                        <div key={key} 	>
-                            <a>
-																<li title={item.name.length<7?"":item.name} onClick={(e)=>this.showsandians(e,key,item.category_url,1,item.id,item.type)} className={this.props.mainurl===item.category_url&&this.props.location.pathname===item.category_url?"liactive":"clearfix active"} onMouseLeave={(e)=>this.hidesandian(e,key)} onMouseEnter={(e)=>this.showsandian(e,key)}>
-																	<a onClick={(e)=>this.showsandians(e,key,item.category_url,1,item.id,item.type)} className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
-																		{
-																			item.type==="announcement"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-xiaoxi1 mr10 fl":"iconfont icon-xiaoxi1 mr10 fl"}></i>:
-																				item.type==="online_learning"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-kecheng mr10 fl font-16":"iconfont icon-kecheng mr10 fl font-16"}></i>:
-																					item.type==="shixun_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-daima mr10 fl":"iconfont icon-daima mr10 fl"}></i>:
-																						item.type==="common_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-putongzuoye mr10 fl":"iconfont icon-putongzuoye mr10 fl"}></i>:
-																							item.type==="group_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenzuzuoye mr10 fl":"iconfont icon-fenzuzuoye mr10 fl"}></i>:
-																								item.type==="graduation"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-biyezhuanhuan mr10 fl":"iconfont icon-biyezhuanhuan mr10 fl"}></i>:
-																									item.type==="exercise"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-shijuan mr10 fl":"iconfont icon-shijuan mr10 fl"}></i>:
-																										item.type==="poll"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-wenjuan mr10 fl":"iconfont icon-wenjuan mr10 fl"}></i>:
-																											item.type==="attachment"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-ziyuan mr10 fl":"iconfont icon-ziyuan mr10 fl"}  ></i>:
-																												item.type==="board"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-taolun mr10 fl":"iconfont icon-taolun mr10 fl"}  ></i>:
-																													item.type==="course_group"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenban mr10 fl":"iconfont icon-fenban mr10 fl"}  ></i>:
-																														item.type==="statistics"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-tongji mr10 fl":"iconfont icon-tongji mr10 fl"}  ></i>:
-																														item.type==="video"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-bofang2 mr10 fl":"iconfont icon-bofang2 mr10 fl"}  ></i>:""
-																		}
+        </style>
+        {is_teacher === true ?
+          course_modules === undefined ? "" : course_modules.map((item, key) => {
+            return (
+              <div key={key} 	>
+                <a>
+                  <li title={item.name.length < 7 ? "" : item.name} onClick={(e) => this.showsandians(e, key, item.category_url, 1, item.id, item.type)} className={this.props.mainurl === item.category_url && this.props.location.pathname === item.category_url ? "liactive" : "clearfix active"} onMouseLeave={(e) => this.hidesandian(e, key)} onMouseEnter={(e) => this.showsandian(e, key)}>
+                    <a onClick={(e) => this.showsandians(e, key, item.category_url, 1, item.id, item.type)} className={item.second_category === undefined ? "fl ml20 pd0" : item.second_category.length === 0 ? "fl ml20 pd0" : this.state.sandiantypes === key ? "fl ml20 pd0 ebebeb" : "fl ml20 pd0"}>
+                      {
+                        item.type === "announcement" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-xiaoxi1 mr10 fl" : "iconfont icon-xiaoxi1 mr10 fl"}></i> :
+                          item.type === "online_learning" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-kecheng mr10 fl font-16" : "iconfont icon-kecheng mr10 fl font-16"}></i> :
+                            item.type === "shixun_homework" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-daima mr10 fl" : "iconfont icon-daima mr10 fl"}></i> :
+                              item.type === "common_homework" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-putongzuoye mr10 fl" : "iconfont icon-putongzuoye mr10 fl"}></i> :
+                                item.type === "group_homework" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-fenzuzuoye mr10 fl" : "iconfont icon-fenzuzuoye mr10 fl"}></i> :
+                                  item.type === "graduation" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-biyezhuanhuan mr10 fl" : "iconfont icon-biyezhuanhuan mr10 fl"}></i> :
+                                    item.type === "exercise" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-shijuan mr10 fl" : "iconfont icon-shijuan mr10 fl"}></i> :
+                                      item.type === "poll" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-wenjuan mr10 fl" : "iconfont icon-wenjuan mr10 fl"}></i> :
+                                        item.type === "attachment" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-ziyuan mr10 fl" : "iconfont icon-ziyuan mr10 fl"}  ></i> :
+                                          item.type === "board" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-taolun mr10 fl" : "iconfont icon-taolun mr10 fl"}  ></i> :
+                                            item.type === "course_group" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-fenban mr10 fl" : "iconfont icon-fenban mr10 fl"}  ></i> :
+                                              item.type === "statistics" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-tongji mr10 fl" : "iconfont icon-tongji mr10 fl"}  ></i> :
+                                                item.type === "attendance" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-qiandao-1 mr10 fl" : "iconfont icon-qiandao-1 mr10 fl"}  ></i> :
+                                                  item.type === "video" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-bofang2 mr10 fl" : "iconfont icon-bofang2 mr10 fl"}  ></i> : ""
+                      }
 
-																		{/*||this.props.location.pathname===this.state.url&&key===this.state.indexs*/}
+                      {/*||this.props.location.pathname===this.state.url&&key===this.state.indexs*/}
 
-																		<span className={this.props.location.pathname===item.category_url?"color-blue task-hide activity-left-name":"task-hide activity-left-name"}
-																					onClick={(e)=>this.selectnavid(e,key,item.id,item.type,item.category_url)}
-																		>{item.name}</span>
+                      <span className={this.props.location.pathname === item.category_url ? "color-blue task-hide activity-left-name" : "task-hide activity-left-name"}
+                        onClick={(e) => this.selectnavid(e, key, item.id, item.type, item.category_url)}
+                      >{item.name}</span>
 
-																		{/*className={sandiantype===undefined?item.task_count===0?"fr mr10 colortransparent":"fr mr10 color999 font-14":sandiantype===key?"none":item.task_count===0?"none":"fr mr10 color999 font-14"}*/}
-																		<span className={this.state.sandiantypes===key?"none":this.props.location.pathname===item.category_url?"color-blue fr mr25 font-14":"fr mr25 color999 font-14"} >{item.task_count===0?"":item.task_count}</span>
-																		{/*<i className={this.state.sandiantypes===key?"iconfont icon-sandian mr5 fr color999":"none"} onMouseEnter={(e)=>this.sandianshow(e,key)}></i>  */}
+                      {/*className={sandiantype===undefined?item.task_count===0?"fr mr10 colortransparent":"fr mr10 color999 font-14":sandiantype===key?"none":item.task_count===0?"none":"fr mr10 color999 font-14"}*/}
+                      <span className={this.state.sandiantypes === key ? "none" : this.props.location.pathname === item.category_url ? "color-blue fr mr25 font-14" : "fr mr25 color999 font-14"} >{item.task_count === 0 ? "" : item.task_count}</span>
+                      {/*<i className={this.state.sandiantypes===key?"iconfont icon-sandian mr5 fr color999":"none"} onMouseEnter={(e)=>this.sandianshow(e,key)}></i>  */}
 
-																		{this.state.sandiantypes===key?<Popover placement="right" content={this.maincontent(item,key)} trigger="hover" key={key}>
+                      {this.state.sandiantypes === key ? <Popover placement="right" content={this.maincontent(item, key)} trigger="hover" key={key}>
 
-																			<i className={"iconfont icon-sandian mr20 fr color999"}></i>
+                        <i className={"iconfont icon-sandian mr20 fr color999"}></i>
 
-																		</Popover>:""}
-																	</a>
-																</li>
+                      </Popover> : ""}
+                    </a>
+                  </li>
 
-                            {/*下拉列表*/}
+                  {/*下拉列表*/}
 
-                              {/* 可拖拽选择实训列表*/}
-                              {/*className={this.props.location.pathname===item.category_url||this.props.location.pathname===this.state.url&&key===this.state.indexs?"TabsWarps":"TabsWarps"}*/}
-                              {
-                                  <DragDropContext onDragEnd={this.onDragEnd} >
-                                      <Droppable droppableId={item.type}>
-                                          {(provided, snapshot) => (
-                                              <ul
-                                              ref={provided.innerRef}
-                                              {...provided.droppableProps}
-                                              className={"droppableul"}
-                                              style={{display: key===this.props.indexs?"":"none"}}
-                                              >
-                                                  {item.second_category===undefined?"":item.second_category.map((iem,index)=>{
-                                                    if(item.type==="course_group"){
-                                                      if(iem.category_name==="未分班"){
-                                                        if(iem.category_count===0){
-                                                          return
-                                                        }
-                                                      }
-                                                    }
-                                                    // console.log(iem.category_name);
-                                                    // console.log(iem.category_name.length);
-                                                  return(
-                                                      <Draggable
-                                                      key={'id'+index}
-                                                      draggableId={iem.category_id===0?index+1:iem.category_id}
-                                                      index={index}
-                                                      className={"TabsWarps"}
-                                                      >
-                                                          {(provided, snapshot) => (
-                                                            <Tooltip placement="bottom" title={"拖拽二级菜单调整顺序"}
-                                                                     key={index}
-                                                                      // visible={toopvisible===true&&toopvisibleindex===iem.category_id?true:false}
-                                                                     visible={false}
-                                                            >
-                                                              {/*"/courses/"+this.props.match.params.coursesId+"/"+item.type+"/"+iem.category_type+"/"+iem.category_id*/}
-                                                              <a  className={"Draggablelichild"} key={index}>
-                                                                <li className="clearfix width93 Draggableli" key={index} onClick={(e)=>this.selectnavids(e,key,iem.category_id,item.type+"child",iem.second_category_url,key)}  onMouseLeave={(e)=>this.twosandianhide(e,index,item.type)} onMouseEnter={(e)=>this.twosandianshow(e,index,item.type)}
-                                                              key={index}
-                                                              ref={provided.innerRef}
-                                                              {...provided.draggableProps}
-                                                              {...provided.dragHandleProps}
-																														  // title={iem.category_name.length<10?"":iem.category_name}
-                                                              >
-                                                                <a className="fl pl46 pd0  Draggablelichild">
-                                                                  <span className={this.props.location.pathname===iem.second_category_url?"color-blue fl ml38 maxwidth170 task-hide  Draggablelichild":"fl ml38 maxwidth170 task-hide  Draggablelichild"} onMouseEnter={(e)=>this.twosandianshowys(e,index,item.type)}>{iem.category_name}</span>
-
-                                                                  <span className={twosandiantype===undefined?this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue Draggablelichild font-14":"fr mr20 color999  Draggablelichild font-14":item.type===twosandiantypes&&twosandiantype===index&&iem.category_id!=0?"none":this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue Draggablelichild font-14":"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span>
-                                                                  {item.type===twosandiantypes&&twosandiantype===index?
-																																		iem.category_id===0?"":
-                                                                    iem.category_type==="graduation_topics"||iem.category_type==="graduation_tasks"?
-                                                                      (
-                                                                        iem.category_name&&iem.category_name.length<13?
-                                                                          <span className={"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span>
-                                                                          :
-                                                                          <Tooltip placement="right" key={index} title={iem.category_name}  visible={toopvisibleindexs===undefined?false:toopvisibleindexs===index?true:false}>
-                                                                            <span className={"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span>
-                                                                          </Tooltip>
-                                                                      )
-                                                                      :
-                                                                      (
-                                                                        iem.category_name&&iem.category_name.length<13?
-                                                                          <Popover placement="right" content={this.content(item,iem,index)} trigger="hover" key={index} onMouseEnter={(e)=>this.twosandianshowyss(e)}>
-                                                                            <i className={"iconfont icon-sandian fr color999 mr15 Draggablelichild"}></i>
-                                                                          </Popover>
-                                                                       :
-                                                                        <Tooltip placement="right" key={index} title={iem.category_name}  visible={toopvisibleindexs===undefined?false:toopvisibleindexs===index?true:false}>
-                                                                        <Popover placement="right" content={this.content(item,iem,index)} trigger="hover" key={index} onMouseEnter={(e)=>this.twosandianshowyss(e)}>
-                                                                        <i className={"iconfont icon-sandian fr color999 mr15 Draggablelichild"}></i>
-                                                                        </Popover>
-                                                                        </Tooltip>
-                                                                      )
-                                                                    :""}
-                                                                </a>
-                                                                  {provided.placeholder}
-
-                                                              </li>
-
-                                                              </a>
-                                                            </Tooltip>
-                                                          )}
-                                                      </Draggable>
-                                                  )})}
-                                              </ul>
-                                          )}
-                                      </Droppable>
-                                  </DragDropContext>
+                  {/* 可拖拽选择实训列表*/}
+                  {/*className={this.props.location.pathname===item.category_url||this.props.location.pathname===this.state.url&&key===this.state.indexs?"TabsWarps":"TabsWarps"}*/}
+                  {
+                    <DragDropContext onDragEnd={this.onDragEnd} >
+                      <Droppable droppableId={item.type}>
+                        {(provided, snapshot) => (
+                          <ul
+                            ref={provided.innerRef}
+                            {...provided.droppableProps}
+                            className={"droppableul"}
+                            style={{ display: key === this.props.indexs ? "" : "none" }}
+                          >
+                            {item.second_category === undefined ? "" : item.second_category.map((iem, index) => {
+                              if (item.type === "course_group") {
+                                if (iem.category_name === "未分班") {
+                                  if (iem.category_count === 0) {
+                                    return
+                                  }
+                                }
                               }
-                            </a>
+                              // console.log(iem.category_name);
+                              // console.log(iem.category_name.length);
+                              return (
+                                <Draggable
+                                  key={'id' + index}
+                                  draggableId={iem.category_id === 0 ? index + 1 : iem.category_id}
+                                  index={index}
+                                  className={"TabsWarps"}
+                                >
+                                  {(provided, snapshot) => (
+                                    <Tooltip placement="bottom" title={"拖拽二级菜单调整顺序"}
+                                      key={index}
+                                      // visible={toopvisible===true&&toopvisibleindex===iem.category_id?true:false}
+                                      visible={false}
+                                    >
+                                      {/*"/classrooms/"+this.props.match.params.coursesId+"/"+item.type+"/"+iem.category_type+"/"+iem.category_id*/}
+                                      <a className={"Draggablelichild"} key={index}>
+                                        <li className="clearfix width93 Draggableli" key={index} onClick={(e) => this.selectnavids(e, key, iem.category_id, item.type + "child", iem.second_category_url, key, 'san')} onMouseLeave={(e) => this.twosandianhide(e, index, item.type)} onMouseEnter={(e) => this.twosandianshow(e, index, item.type)}
+                                          key={index}
+                                          ref={provided.innerRef}
+                                          {...provided.draggableProps}
+                                          {...provided.dragHandleProps}
+                                        // title={iem.category_name.length<10?"":iem.category_name}
+                                        >
+                                          <a className="fl pl46 pd0  Draggablelichild">
+                                            <span className={this.props.location.pathname === iem.second_category_url ? "color-blue fl ml38 maxwidth170 task-hide  Draggablelichild" : "fl ml38 maxwidth170 task-hide  Draggablelichild"} onMouseEnter={(e) => this.twosandianshowys(e, index, item.type)}>{iem.category_name}</span>
 
-                        </div>
-                     )
+                                            <span className={twosandiantype === undefined ? this.props.location.pathname === iem.second_category_url ? "fr mr20 color-blue Draggablelichild font-14" : "fr mr20 color999  Draggablelichild font-14" : item.type === twosandiantypes && twosandiantype === index && iem.category_id != 0 ? "none" : this.props.location.pathname === iem.second_category_url ? "fr mr20 color-blue Draggablelichild font-14" : "fr mr20 color999  Draggablelichild font-14"} >{iem.category_count === 0 ? "" : iem.category_count}</span>
+
+                                            {item.type === twosandiantypes && twosandiantype === index ?
+                                              iem.category_id === 0 ? "" :
+                                                iem.category_type === "graduation_topics" || iem.category_type === "graduation_tasks" ?
+                                                  (
+                                                    iem.category_name && iem.category_name.length < 13 ?
+                                                      <span className={"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count === 0 ? "" : iem.category_count}</span>
+                                                      :
+                                                      <Tooltip placement="right" key={index} title={iem.category_name} visible={toopvisibleindexs === undefined ? false : toopvisibleindexs === index ? true : false}>
+                                                        <span className={"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count === 0 ? "" : iem.category_count}</span>
+                                                      </Tooltip>
+                                                  )
+                                                  :
+                                                  (
+                                                    iem.category_name && iem.category_name.length < 13 ?
+                                                      <Popover placement="right" content={this.content(item, iem, index)} trigger="hover" key={index} onMouseEnter={(e) => this.twosandianshowyss(e)}>
+                                                        <i className={"iconfont icon-sandian fr color999 mr15 Draggablelichild"}></i>
+                                                      </Popover>
+                                                      :
+                                                      <Tooltip placement="right" key={index} title={iem.category_name} visible={toopvisibleindexs === undefined ? false : toopvisibleindexs === index ? true : false}>
+                                                        <Popover placement="right" content={this.content(item, iem, index)} trigger="hover" key={index} onMouseEnter={(e) => this.twosandianshowyss(e)}>
+                                                          <i className={"iconfont icon-sandian fr color999 mr15 Draggablelichild"}></i>
+                                                        </Popover>
+                                                      </Tooltip>
+                                                  )
+                                              : ""}
+                                          </a>
+                                          {provided.placeholder}
+
+                                        </li>
+
+                                      </a>
+                                      {
+                                        iem.third_category === undefined ? "" : iem.third_category.map((itt, index) => {
+                                          if (itt.category_type !== "attachment") {
+                                            return
+
+                                          }
+                                          return (
+                                            <div onClick={this.getatahcment} style={{ display: this.state.newselectnavid === undefined ? 'none' : itt.parent_id === this.state.newselectnavid ? 'block' : 'none' }}>
+                                              {/*"/classrooms/"+this.props.match.params.coursesId+"/"+item.type+"/"+iem.category_type+"/"+iem.category_id*/}
+                                              <a className={"Draggablelichild"} key={index}>
+                                                <li className="clearfix width93 Draggableli" key={index} onClick={(e) => this.selectnavids(e, key, itt.parent_id, item.type + "child", itt.second_category_url, key)} onMouseLeave={(e) => this.sansandianhide(e, index, item.type)} onMouseEnter={(e) => this.sansandianshow(e, index, item.type, itt.category_name)}
+                                                  key={index}
+                                                  ref={provided.innerRef}
+                                                  {...provided.draggableProps}
+                                                  {...provided.dragHandleProps}
+                                                // title={iem.category_name.length<10?"":iem.category_name}
+                                                >
+                                                  <a className="fl pl46 pd0  Draggablelichild">
+                                                    <span style={{ marginLeft: 15 }} className={this.props.location.pathname === itt.second_category_url ? "color-blue fl ml38 maxwidth155 task-hide  Draggablelichild" : "fl ml38 maxwidth155 task-hide  Draggablelichild"} onMouseEnter={(e) => this.sansandianshowys(e, index, item.type)}>{itt.category_name}</span>
+
+                                                    <span className={sansandiantype === undefined ? this.props.location.pathname === itt.second_category_url ? "fr mr20 color-blue Draggablelichild font-14" : "fr mr20 color999  Draggablelichild font-14" : item.type === twosandiantypes && sansandiantype === index && itt.category_id != 0 ? "none" : this.props.location.pathname === itt.second_category_url ? "fr mr20 color-blue Draggablelichild font-14" : "fr mr20 color999  Draggablelichild font-14"} >{itt.category_count === 0 ? "" : itt.category_count}</span>
+
+                                                    {iem.category_type === twosandiantypes && sansandiantype === index ?
+                                                      itt.category_name !== this.state.sanshow ? "" :
+                                                        (
+                                                          itt.category_name && itt.category_name.length < 13 ?
+                                                            <Popover placement="right" content={this.content(item, itt, index, 'san')} trigger="hover" key={index} onMouseEnter={(e) => this.sansandianshowyss(e)}>
+                                                              <i className={"iconfont icon-sandian fr color999 mr15 Draggablelichild"}></i>
+                                                            </Popover>
+                                                            :
+                                                            <Tooltip placement="right" key={index} title={itt.category_name} visible={toopvisibleindexs === undefined ? false : toopvisibleindexs === index ? true : false}>
+                                                              <Popover placement="right" content={this.content(item, itt, index, 'san')} trigger="hover" key={index} onMouseEnter={(e) => this.sansandianshowyss(e)}>
+                                                                <i className={"iconfont icon-sandian fr color999 mr15 Draggablelichild"}></i>
+                                                              </Popover>
+                                                            </Tooltip>
+                                                        )
+                                                      : ""}
+                                                  </a>
+                                                </li>
+
+                                              </a>
+                                            </div>
+                                          )
+                                        })
+
+
+                                      }
+                                    </Tooltip>
+                                  )}
+                                </Draggable>
+                              )
+                            })}
+                          </ul>
+                        )}
+                      </Droppable>
+                    </DragDropContext>
+                  }
+                </a>
+
+              </div>
+            )
+          })
+
+          : course_modules === undefined ? "" : course_modules.map((item, key) => {
+
+            return (
+              <div key={key}>
+                {/*<Tooltip placement="bottom" title={"点击空白处展开二级菜单，点击模块名字跳转到对应模块"}>*/}
+                <a>
+
+                  <li className={this.props.mainurl === item.category_url && this.props.location.pathname === item.category_url ? "liactive" : "clearfix active"}
+                    onClick={(e) => this.setnavid(e, key, item.id, item.type, item.category_url)} onMouseEnter={(e) => this.showsandian(e, key)}
+                    title={item.name.length < 7 ? "" : item.name}
+                  >
+                    <a className={item.second_category === undefined ? "fl ml20 pd0" : item.second_category.length === 0 ? "fl ml20 pd0" : this.state.sandiantypes === key ? "fl ml20 pd0 ebebeb" : "fl ml20 pd0"}>
+                      {
+                        item.type === "announcement" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-xiaoxi1 mr10 fl" : "iconfont icon-xiaoxi1 mr10 fl"}></i> :
+                          item.type === "online_learning" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-kecheng mr10 fl font-16" : "iconfont icon-kecheng mr10 fl font-16"}></i> :
+                            item.type === "shixun_homework" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-daima mr10 fl" : "iconfont icon-daima mr10 fl"}></i> :
+                              item.type === "common_homework" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-putongzuoye mr10 fl" : "iconfont icon-putongzuoye mr10 fl"}></i> :
+                                item.type === "group_homework" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-fenzuzuoye mr10 fl" : "iconfont icon-fenzuzuoye mr10 fl"}></i> :
+                                  item.type === "graduation" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-biyezhuanhuan mr10 fl" : "iconfont icon-biyezhuanhuan mr10 fl"}></i> :
+                                    item.type === "exercise" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-shijuan mr10 fl" : "iconfont icon-shijuan mr10 fl"}></i> :
+                                      item.type === "poll" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-wenjuan mr10 fl" : "iconfont icon-wenjuan mr10 fl"}></i> :
+                                        item.type === "attachment" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-ziyuan mr10 fl" : "iconfont icon-ziyuan mr10 fl"}  ></i> :
+                                          item.type === "board" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-taolun mr10 fl" : "iconfont icon-taolun mr10 fl"}  ></i> :
+                                            item.type === "course_group" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-fenban mr10 fl" : "iconfont icon-fenban mr10 fl"}  ></i> :
+                                              item.type === "attendance" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-qiandao-1 mr10 fl" : "iconfont icon-qiandao-1 mr10 fl"}  ></i> :
+                                                item.type === "video" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-bofang2 mr10 fl" : "iconfont icon-bofang2 mr10 fl"}  ></i> :
+                                                  item.type === "statistics" ? <i className={this.props.location.pathname === item.category_url ? "color-blue iconfont icon-tongji mr10 fl" : "iconfont icon-tongji mr10 fl"}  ></i> : ""
+                      }
+
+                      <span className={this.props.location.pathname === item.category_url ? "color-blue task-hide activity-left-name" : "task-hide activity-left-name"} onClick={(e) => this.selectnavid(e, key, item.id, item.type, item.category_url)}>{item.name}</span>
+                      <span className={this.props.location.pathname === item.category_url ? "color-blue fr mr20 font-14" : "fr mr20 color999 font-14"}>{item.task_count === 0 ? "" : item.task_count}</span>
+
+                    </a>
+                  </li>
+                </a>
+
+                <ul style={{ display: key === this.props.indexs ? "" : "none" }} className="droppableul">
+
+                  {
+                    item.second_category === undefined ? "" : item.second_category.map((iem, index) => {
+                      if (item.type === "course_group") {
+                        if (iem.category_name === "未分班") {
+                          if (iem.category_count === 0) {
+                            return
+                          }
+                        }
+                      }
+                      // console.log(iem.category_name);
+                      // console.log(iem.category_name.length);一开始是10 显示是13
+                      return (
+                        <a >
+                          {/*title={iem.category_name.length<10?"":iem.category_name}*/}
+
+                          <li className="clearfix Draggableli" key={index} style={{ width: '244px' }}  >
+                            {
+                              iem.category_name && iem.category_name.length < 13 ?
+                                <a className="fl pl46 pd0 Draggablelichild" onClick={(e) => this.selectnavids(e, key, iem.category_id, item.type + "child", iem.second_category_url, key)} >
+                                  {/*<span className="fl ml38 maxwidth170 task-hide">{iem.category_name}</span>*/}
+                                  {/*{iem.category_name.length<10?"":*/}
+                                  {/*  iem.category_name}*/}
+                                  <span className={this.props.location.pathname === iem.second_category_url ? "color-blue fl ml38 maxwidth170 task-hide  Draggablelichild" : "fl ml38 maxwidth170 task-hide  Draggablelichild"}>{iem.category_name}</span>
+                                  <span className={twosandiantype === undefined ? this.props.location.pathname === iem.second_category_url ? "fr mr20 color-blue font-14" : "fr mr20 color999 font-14" : twosandiantype === index && item.type != "graduation" ? "none" : this.props.location.pathname === iem.second_category_url ? "fr mr20 color-blue font-14" : "fr mr20 color999 font-14"}>{iem.category_count === 0 ? "" : iem.category_count}</span>
+                                </a>
+                                :
+                                <Tooltip placement="right" key={index} title={iem.category_name}>
+                                  <a className="fl pl46 pd0 Draggablelichild" onClick={(e) => this.selectnavids(e, key, iem.category_id, item.type + "child", iem.second_category_url, key)} >
+                                    {/*<span className="fl ml38 maxwidth170 task-hide">{iem.category_name}</span>*/}
+                                    {/*{iem.category_name.length<10?"":*/}
+                                    {/*  iem.category_name}*/}
+                                    <span className={this.props.location.pathname === iem.second_category_url ? "color-blue fl ml38 maxwidth170 task-hide  Draggablelichild" : "fl ml38 maxwidth170 task-hide  Draggablelichild"}>{iem.category_name}</span>
+                                    <span className={twosandiantype === undefined ? this.props.location.pathname === iem.second_category_url ? "fr mr20 color-blue font-14" : "fr mr20 color999 font-14" : twosandiantype === index && item.type != "graduation" ? "none" : this.props.location.pathname === iem.second_category_url ? "fr mr20 color-blue font-14" : "fr mr20 color999 font-14"}>{iem.category_count === 0 ? "" : iem.category_count}</span>
+                                  </a>
+                                </Tooltip>
+
+                            }
+                          </li>
+                          {
+                            iem.third_category === undefined ? "" : iem.third_category.map((itt, index) => {
+                              if (itt.category_type !== "attachment") {
+                                return
+
+                              }
+                              return (
+                                <div onClick={this.getatahcment} style={{ display: this.state.newselectnavid === undefined ? 'none' : itt.parent_id === this.state.newselectnavid ? 'block' : 'none' }}>
+                                  {/*"/classrooms/"+this.props.match.params.coursesId+"/"+item.type+"/"+iem.category_type+"/"+iem.category_id*/}
+                                  <a className={"Draggablelichild"} key={index}>
+                                    <li className="clearfix width93 Draggableli" key={index} onClick={(e) => this.selectnavids(e, key, itt.parent_id, item.type + "child", itt.second_category_url, key)} onMouseLeave={(e) => this.sansandianhide(e, index, item.type)} onMouseEnter={(e) => this.sansandianshow(e, index, item.type, itt.category_name)}
+                                      key={index}
+
+
+                                    // title={iem.category_name.length<10?"":iem.category_name}
+                                    >
+                                      <a className="fl pl46 pd0  Draggablelichild">
+                                        <span style={{ marginLeft: 15 }} className={this.props.location.pathname === itt.second_category_url ? "color-blue fl ml38 maxwidth155 task-hide  Draggablelichild" : "fl ml38 maxwidth155 task-hide  Draggablelichild"} onMouseEnter={(e) => this.sansandianshowys(e, index, item.type)}>{itt.category_name}</span>
+
+                                        <span className={sansandiantype === undefined ? this.props.location.pathname === itt.second_category_url ? "fr mr20 color-blue Draggablelichild font-14" : "fr mr20 color999  Draggablelichild font-14" : item.type === twosandiantypes && sansandiantype === index && itt.category_id != 0 ? "none" : this.props.location.pathname === itt.second_category_url ? "fr mr20 color-blue Draggablelichild font-14" : "fr mr20 color999  Draggablelichild font-14"} >{itt.category_count === 0 ? "" : itt.category_count}</span>
+
+                                        {iem.category_type === twosandiantypes && sansandiantype === index ?
+                                          itt.category_name !== this.state.sanshow ? "" :
+                                            (
+                                              itt.category_name && itt.category_name.length < 13 ?
+                                                ''
+                                                :
+                                                <Tooltip placement="right" key={index} title={itt.category_name} visible={toopvisibleindexs === undefined ? false : toopvisibleindexs === index ? true : false}>
+
+                                                </Tooltip>
+                                            )
+                                          : ""}
+                                      </a>
+                                    </li>
+
+                                  </a>
+                                </div>
+                              )
+                            })
+
+
+                          }
+                        </a>
+
+                      )
                     })
+                  }
+                </ul>
 
-                : course_modules===undefined?"":course_modules.map((item,key)=>{
+              </div>
+            )
+          })
+        }
 
-               return(
-                 <div key={key}>
-                   {/*<Tooltip placement="bottom" title={"点击空白处展开二级菜单，点击模块名字跳转到对应模块"}>*/}
-                   <a>
-
-											 <li className={this.props.mainurl===item.category_url&&this.props.location.pathname===item.category_url?"liactive":"clearfix active"}
-													 onClick={(e)=>this.setnavid(e,key,item.id,item.type,item.category_url)} onMouseEnter={(e)=>this.showsandian(e,key)}
-													 title={item.name.length<7?"":item.name}
-											 >
-												 <a className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
-													 {
-														 item.type==="announcement"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-xiaoxi1 mr10 fl":"iconfont icon-xiaoxi1 mr10 fl"}></i>:
-															 item.type==="online_learning"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-kecheng mr10 fl font-16":"iconfont icon-kecheng mr10 fl font-16"}></i>:
-																 item.type==="shixun_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-daima mr10 fl":"iconfont icon-daima mr10 fl"}></i>:
-																	 item.type==="common_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-putongzuoye mr10 fl":"iconfont icon-putongzuoye mr10 fl"}></i>:
-																		 item.type==="group_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenzuzuoye mr10 fl":"iconfont icon-fenzuzuoye mr10 fl"}></i>:
-																			 item.type==="graduation"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-biyezhuanhuan mr10 fl":"iconfont icon-biyezhuanhuan mr10 fl"}></i>:
-																				 item.type==="exercise"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-shijuan mr10 fl":"iconfont icon-shijuan mr10 fl"}></i>:
-																					 item.type==="poll"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-wenjuan mr10 fl":"iconfont icon-wenjuan mr10 fl"}></i>:
-																						 item.type==="attachment"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-ziyuan mr10 fl":"iconfont icon-ziyuan mr10 fl"}  ></i>:
-																							 item.type==="board"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-taolun mr10 fl":"iconfont icon-taolun mr10 fl"}  ></i>:
-                                                 item.type==="course_group"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenban mr10 fl":"iconfont icon-fenban mr10 fl"}  ></i>:
-
-                                                 item.type==="video"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-bofang2 mr10 fl":"iconfont icon-bofang2 mr10 fl"}  ></i>:
-														 												item.type==="statistics"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-tongji mr10 fl":"iconfont icon-tongji mr10 fl"}  ></i>:""
-													 }
-
-													 <span className={this.props.location.pathname===item.category_url?"color-blue task-hide activity-left-name":"task-hide activity-left-name"} onClick={(e)=>this.selectnavid(e,key,item.id,item.type,item.category_url)}>{item.name}</span>
-													 <span className={this.props.location.pathname===item.category_url?"color-blue fr mr20 font-14":"fr mr20 color999 font-14"}>{item.task_count===0?"":item.task_count}</span>
-
-												 </a>
-											 </li>
-                   </a>
-
-                   <ul style={{display:key===this.props.indexs?"":"none"}} class="droppableul">
-
-                     {
-                       item.second_category===undefined?"":item.second_category.map((iem,index)=>{
-                         if(item.type==="course_group"){
-                           if(iem.category_name==="未分班"){
-                             if(iem.category_count===0){
-                               return
-                             }
-                           }
-                         }
-                         // console.log(iem.category_name);
-                         // console.log(iem.category_name.length);一开始是10 显示是13
-                         return(
-                           <a >
-                             {/*title={iem.category_name.length<10?"":iem.category_name}*/}
-
-                             <li className="clearfix Draggableli" key={index} style={{ width: '244px'}}  >
-                               {
-                                   iem.category_name&&iem.category_name.length<13?
-                                       <a className="fl pl46 pd0 Draggablelichild" onClick={(e)=>this.selectnavids(e,key,iem.category_id,item.type+"child",iem.second_category_url,key)} >
-                                         {/*<span className="fl ml38 maxwidth170 task-hide">{iem.category_name}</span>*/}
-                                         {/*{iem.category_name.length<10?"":*/}
-                                         {/*  iem.category_name}*/}
-                                         <span className={this.props.location.pathname===iem.second_category_url?"color-blue fl ml38 maxwidth170 task-hide  Draggablelichild":"fl ml38 maxwidth170 task-hide  Draggablelichild"}>{iem.category_name}</span>
-                                         <span className={twosandiantype===undefined?this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue font-14":"fr mr20 color999 font-14":twosandiantype===index&&item.type!="graduation"?"none":this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue font-14":"fr mr20 color999 font-14"}>{iem.category_count===0?"":iem.category_count}</span>
-                                       </a>
-                                     :
-                                     <Tooltip placement="right" key={index} title={iem.category_name}>
-                                       <a className="fl pl46 pd0 Draggablelichild" onClick={(e)=>this.selectnavids(e,key,iem.category_id,item.type+"child",iem.second_category_url,key)} >
-                                         {/*<span className="fl ml38 maxwidth170 task-hide">{iem.category_name}</span>*/}
-                                         {/*{iem.category_name.length<10?"":*/}
-                                         {/*  iem.category_name}*/}
-                                         <span className={this.props.location.pathname===iem.second_category_url?"color-blue fl ml38 maxwidth170 task-hide  Draggablelichild":"fl ml38 maxwidth170 task-hide  Draggablelichild"}>{iem.category_name}</span>
-                                         <span className={twosandiantype===undefined?this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue font-14":"fr mr20 color999 font-14":twosandiantype===index&&item.type!="graduation"?"none":this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue font-14":"fr mr20 color999 font-14"}>{iem.category_count===0?"":iem.category_count}</span>
-                                       </a>
-                                     </Tooltip>
-                               }
-                               </li>
-
-                           </a>
-                         )
-                       })
-                     }
-                   </ul>
-
-                 </div>
-               )
-             })
-           }
-
-              </ul>
+      </ul>
 
 
-      )
-    }
+    )
+  }
 }
 export default Coursesleftnav;
 
diff --git a/src/modules/courses/coursesDetail/MainLeftNav.css b/src/modules/courses/coursesDetail/MainLeftNav.css
index 9c3bf1b2..955d1d3d 100644
--- a/src/modules/courses/coursesDetail/MainLeftNav.css
+++ b/src/modules/courses/coursesDetail/MainLeftNav.css
@@ -29,6 +29,16 @@
     -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0);
     background-color: white;
 }
+.ant-select-tree-title{
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    display:inline-block;
+    max-width:200px;
+}
+.ant-select-tree{
+    max-height:300px;
+}
 /*鼠标悬浮在滚动条上的主干部分*/
 
 /*.droppableul::-webkit-scrollbar-track:hover {*/
diff --git a/src/modules/courses/coursesDetail/course-banner.css b/src/modules/courses/coursesDetail/course-banner.css
new file mode 100644
index 00000000..991cdf03
--- /dev/null
+++ b/src/modules/courses/coursesDetail/course-banner.css
@@ -0,0 +1,7 @@
+.course-banner-title {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+  color: #fff;
+  flex-flow: row nowrap;
+}
\ No newline at end of file
diff --git a/src/modules/courses/coursesHome/CoursesHome.js b/src/modules/courses/coursesHome/CoursesHome.js
index f6b6d730..926b786a 100644
--- a/src/modules/courses/coursesHome/CoursesHome.js
+++ b/src/modules/courses/coursesHome/CoursesHome.js
@@ -1,118 +1,117 @@
-import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
+import React, { Component, Fragment } from 'react';
+import { getImageUrl } from 'educoder';
 import CoursesHomeCard from "./CoursesHomeCard.js"
 import axios from 'axios';
-import {Input,Tooltip} from 'antd';
 import LoadingSpin from '../../../common/LoadingSpin';
 import UpgradeModals from '../../modals/UpgradeModals';
 import './css/CoursesHome.css';
-import Pagination from '@icedesign/base/lib/pagination';
-import '@icedesign/base/lib/pagination/style.js';
+import '../../tpm/shixuns/shixun-keyword-list.scss';
+import btnNew from './btn-new.png'
+import btnJoin from './btn-join.png'
+import Pagination from '../../../components/mini-pagination'
 
-
-const Search = Input.Search;
-class CoursesHome extends Component{
+class CoursesHome extends Component {
   constructor(props) {
     super(props)
     this.state = {
-      limit:16,
-      page:1,
-      order:"created_at",
-      coursesHomelist:undefined,
-      search:"",
+      limit: 16,
+      page: 1,
+      order: "created_at",
+      coursesHomelist: undefined,
+      search: "",
     }
   }
   //切换列表状态
-  changeStatus=(value)=>{
+  changeStatus = (value) => {
     this.setState({
-      order:value,
-      page:1,
-			coursesHomelist:undefined
+      order: value,
+      page: 1,
+      coursesHomelist: undefined
     })
 
-    this.searchcourses(16,1,value,"")
+    this.searchcourses(16, 1, value, "")
   }
   //搜索输入
-  inputSearchValue=(e)=>{
+  inputSearchValue = (e) => {
 
     this.setState({
-      search:e.target.value,
-      page:1
+      search: e.target.value,
+      page: 1
     })
 
   }
   //搜索
-  searchValue=(e)=>{
-    let { search ,order}=this.state;
+  searchValue = (e) => {
+    let { search, order } = this.state;
 
     this.setState({
-      order:order,
-      page:1
+      order: order,
+      page: 1
     })
 
-    this.searchcourses(16,1,order,search)
+    this.searchcourses(16, 1, order, search)
 
   }
 
-  componentDidMount(){
-		document.title="翻转课堂";
-		const upsystem=`/users/system_update.json`;
-		axios.get(upsystem).then((response)=>{
-			let updata=response.data;
-			this.setState({
-				updata:updata
-			})
-		}).catch((error)=>{
-			console.log(error);
-		})
+  componentDidMount() {
+    document.title = "教学课堂";
+    const upsystem = `/users/system_update.json`;
+    axios.get(upsystem).then((response) => {
+      let updata = response.data;
+      this.setState({
+        updata: updata
+      })
+    }).catch((error) => {
+      console.log(error);
+    })
 
-		this.searchcourses(16,1,"all","")
+    this.searchcourses(16, 1, "all", "")
   }
 
-  onChange=(pageNumber)=> {
+  onChange = (pageNumber) => {
     this.setState({
-      page:pageNumber
+      page: pageNumber
     })
-    let {limit,order,search}=this.state;
+    let { limit, order, search } = this.state;
 
-    this.searchcourses(limit,pageNumber,order,search)
+    this.searchcourses(limit, pageNumber, order, search)
 
   }
 
-  searchcourses=(limit,page,order,search)=>{
-    let url="/courses.json";
-    axios.get(url,{
+  searchcourses = (limit, page, order, search) => {
+    let url = "/courses.json";
+    axios.get(url, {
       params: {
-        limit:limit,
-        page:page,
-        order:order,
-        search:search
+        limit: limit,
+        page: page,
+        order: order,
+        search: search
       }
-    }).then((result)=>{
-      if(result.data.status===401){
+    }).then((result) => {
+      if (result.data.status === 401) {
 
-      }else{
+      } else {
         this.setState({
-          coursesHomelist:result.data
+          coursesHomelist: result.data
         })
       }
 
-      }).catch((error)=>{
-        console.log(error);
-      })
+    }).catch((error) => {
+      console.log(error);
+    })
   }
 
-  getUser=(url,type)=>{
-    if(this.props.checkIfLogin()===false){
+  getUser = (url, type) => {
+    if (this.props.checkIfLogin() === false) {
       this.props.showLoginDialog()
       return
     }
-    if(this.props.checkIfProfileCompleted()===false){
+    if (this.props.checkIfProfileCompleted() === false) {
       this.props.showProfileCompleteDialog()
       return
     }
 
-    if(url !== undefined || url!==""){
+    if (url !== undefined || url !== "") {
       this.props.history.push(url);
     }
 
@@ -120,81 +119,75 @@ class CoursesHome extends Component{
   }
   render() {
 
-    let { order,search,page,coursesHomelist }=this.state;
-    //console.log(this.props)
+    const { order, page, coursesHomelist } = this.state;
+    const { user } = this.props
+
     return (
-    <div>
-			{this.state.updata===undefined?"":<UpgradeModals
-				{...this.state}
-			/>}
+      <div>
+        {this.state.updata === undefined ? "" : <UpgradeModals
+          {...this.state}
+        />}
         <div className="newMain clearfix">
-					<style>
-						{
-							`
+          <style>
+            {
+              `    ::-webkit-scrollbar {
+                      width: 0px !important;
+                    }
 										.courses-head{
 												width: 100%;
 												height: 300px;
-												background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.course_banner_url === null ?`images/educoder/courses/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.course_banner_url)});
+												background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.course_banner_url === null ? `images/educoder/courses/courses.jpg` : this.props.mygetHelmetapi && this.props.mygetHelmetapi.course_banner_url)});
 											  background-color: #081C4B;
 												background-position: center;
 												background-repeat: no-repeat;
 										}
 
 									`
-						}
-					</style>
-            <div className="courses-head pr" >
-                <div className="edu-txt-center pathNavLine">
-                    <div className="inline path-nav">
-                    </div>
-                </div>
-            </div>
-
-            <div className="mt20 educontent mb20 clearfix">
-              {/*<a className={ order == "all" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"}*/}
-                   {/*onClick={ () => this.changeStatus("all")}>全部</a>*/}
-                {/*<a className={ order == "mine" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"}*/}
-                   {/*onClick={ () => this.changeStatus("mine")}>我的</a>*/}
-                <a className={ order == "created_at" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"}
-                   onClick={ () => this.changeStatus("created_at")}>最新</a>
-                <a className={ order == "visits" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"}
-                   onClick={ () => this.changeStatus("visits")}>最热</a>
-              {this.props.user&&this.props.user.user_identity==="学生"?"":<span className={  "fr font-16 bestChoose color-blue"  }  onClick={(url)=>this.getUser("/courses/new")}>+新建翻转课堂</span>}
-
-                {/*<div className="fr mr5 search-new">*/}
-                    {/*/!* <Search*/}
-                    {/*placeholder="课堂名称/教师姓名/学校名称"*/}
-                    {/*id="subject_search_input"*/}
-                    {/*value={search}*/}
-                    {/*onInput={this.inputSearchValue}*/}
-                    {/*onSearch={this.searchValue}*/}
-                    {/*autoComplete="off"*/}
-                    {/*></Search> *!/*/}
-                {/*</div>*/}
-
-            </div>
-
-					{coursesHomelist===undefined?<LoadingSpin/>:<CoursesHomeCard {...this.props} {...this.state}
-                             coursesHomelist={coursesHomelist}></CoursesHomeCard>}
-
-					{coursesHomelist===undefined?"":coursesHomelist.courses.length===0?<div className="edu-tab-con-box clearfix edu-txt-center mb50">
-						<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-						<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
-					</div>:""}
-
-            {
-              coursesHomelist===undefined?"":coursesHomelist.courses_count > 16?
-            <div className="educontent mb80 edu-txt-center mt10">
-							<Pagination  current={page} total={ coursesHomelist.courses_count || 1299 } type="mini" pageSize={16}  onChange={this.onChange} />
-            </div>:""
             }
+          </style>
+          <div className="courses-head pr" >
+            <div className="edu-txt-center pathNavLine">
+              <div className="inline path-nav">
+              </div>
+            </div>
+          </div>
+
+          <div className="wrapper">
+            <div className="educontent  search-keyword-container" style={{ padding: '20px 0 0 0' }}>
+              <div className="btn-groups">
+                <a id='new' className={order === 'created_at' ? 'active' : ''} onClick={() => this.changeStatus("created_at")} title='最新'>最新</a>
+                <a id='hot' className={order === 'visits' ? 'active' : ''} onClick={() => this.changeStatus("visits")} title='最热'>最热</a>
+              </div>
+            </div>
+            {user && user.user_identity !== '学生' ?
+              <Fragment>
+                <a className="btn-new" style={{ top: '67px' }} onClick={() => { this.getUser("/classrooms/new") }} > <img src={btnNew} width={40} alt="创建教学课堂" /> </a>
+              </Fragment> : null
+            }
+            <a className="btn-join" style={{ top: '123px' }} onClick={() => { window._header_componentHandler.tojoinclass() }} > <img src={btnJoin} width={40} alt="加入教学课堂" /> </a>
+          </div>
+
+          {coursesHomelist === undefined ? <LoadingSpin /> : <CoursesHomeCard {...this.props} {...this.state}
+            coursesHomelist={coursesHomelist}></CoursesHomeCard>}
+
+          {coursesHomelist === undefined ? "" : coursesHomelist.courses.length === 0 ? <div className="edu-tab-con-box clearfix edu-txt-center mb50">
+            <img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")} />
+            <p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
+          </div> : ""}
+
+          {
+            coursesHomelist === undefined ? "" : coursesHomelist.courses_count > 16 ?
+              <div className="educontent mb80 edu-txt-center mt10">
+                <Pagination current={page} total={coursesHomelist.courses_count || 1299} type="mini" pageSize={16} onChange={this.onChange} />
+              </div> : ""
+          }
         </div>
 
-    </div>
+      </div>
     )
   }
 }
 export default CoursesHome;
 
 
-//                {/*<Pagination showQuickJumper current={page} pageSize={16} total={coursesHomelist.courses_count} onChange={this.onChange} />*/}
\ No newline at end of file
+//                {/*<Pagination showQuickJumper current={page} pageSize={16} total={coursesHomelist.courses_count} onChange={this.onChange} />*/}
diff --git a/src/modules/courses/coursesHome/CoursesHomeCard.js b/src/modules/courses/coursesHome/CoursesHomeCard.js
index 4d34f1ba..8eca8b7d 100644
--- a/src/modules/courses/coursesHome/CoursesHomeCard.js
+++ b/src/modules/courses/coursesHome/CoursesHomeCard.js
@@ -92,8 +92,22 @@ class CoursesHomeCard extends Component{
                               <Tooltip placement="bottom" title={item.school}>
                                  <span className="color-grey-98">{item.school}</span>
                               </Tooltip>
-
                               </p>
+
+                              <div className="task-hide" style={{height:25,marginBottom:10}}>
+                              {item.teacher_users.length===0?'':
+                               <span className="color-grey-98" >协作老师：
+                                {item.teacher_users.map((iem,idx)=>{
+                                  return(
+                                    <span className="task-hide" style={{width:50,marginLeft:5}}>{idx<3?iem:''} </span> 
+                                  )
+                                })
+                                }
+                             </span>
+                             }
+                              </div>
+                           
+                             
                           </div>
 
                           <div className="edu-txt-center course-bottom">
diff --git a/src/modules/courses/coursesHome/btn-join.png b/src/modules/courses/coursesHome/btn-join.png
new file mode 100644
index 00000000..de1fdb3d
Binary files /dev/null and b/src/modules/courses/coursesHome/btn-join.png differ
diff --git a/src/modules/courses/coursesHome/btn-new.png b/src/modules/courses/coursesHome/btn-new.png
new file mode 100644
index 00000000..af288c56
Binary files /dev/null and b/src/modules/courses/coursesHome/btn-new.png differ
diff --git a/src/modules/courses/coursesPublic/AccessoryModal2.js b/src/modules/courses/coursesPublic/AccessoryModal2.js
index 43c14f90..83a3301c 100644
--- a/src/modules/courses/coursesPublic/AccessoryModal2.js
+++ b/src/modules/courses/coursesPublic/AccessoryModal2.js
@@ -37,36 +37,12 @@ class AccessoryModal2 extends Component{
 		if(info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed'){
 			let fileList = info.fileList;
 			console.log(fileList)
-			// for(var list of fileList ){
-			//   console.log(fileList)
-			// }
 			this.setState({ fileList });
 		}
 
   }
 
   onAttachmentRemove = (file) => {
-    // confirm({
-    //   title: '确定要删除这个附件吗?',
-    //   okText: '确定',
-    //   cancelText: '取消',
-    //   // content: 'Some descriptions',
-    //   onOk: () => {
-    //     this.deleteAttachment(file)
-    //   },
-    //   onCancel() {
-    //     console.log('Cancel');
-    //   },
-    // });
-    // return false;
-
-    // this.setState({
-    //   Modalstype:true,
-    //   Modalstopval:'确定要删除这个附件吗?',
-    //   ModalSave: ()=>this.deleteAttachment(file),
-    //   ModalCancel:this.cancelAttachment
-    // })
-    // return false;
 		if(!file.percent || file.percent == 100){
 			this.deleteAttachment(file);
 		}
@@ -124,7 +100,6 @@ class AccessoryModal2 extends Component{
     }
   }
   Saves=()=>{
-  	// debugger
     let {fileList,description} =this.state;
     let newfileList=[];
     if(fileList!=undefined&&fileList.length>0) {
@@ -134,28 +109,6 @@ class AccessoryModal2 extends Component{
     }
     this.props.Saves && this.props.Saves(newfileList, description)
     return;
-      let id=this.props.categoryid;
-      
-    console.log(newfileList)
-      let url="/graduation_works/"+id+"/revise_attachment.json"
-      axios.post(url,{
-        description:description,
-        attachment_ids:newfileList
-      }).then((result)=>{
-        // console.log(result)
-        if(result.data.status===0){
-          this.props.setupdate()
-          this.setState({
-            Modalstype:true,
-            Modalstopval:result.data.message,
-            ModalSave:this.ModalCancelModalCancel,
-            loadtype:true
-          })
-
-        }
-      }).catch((error)=>{
-
-      })
   }
 
   settextarea=(e)=>{
diff --git a/src/modules/courses/coursesPublic/Addcourses.js b/src/modules/courses/coursesPublic/Addcourses.js
index f03608c8..2454fdbc 100644
--- a/src/modules/courses/coursesPublic/Addcourses.js
+++ b/src/modules/courses/coursesPublic/Addcourses.js
@@ -1,98 +1,96 @@
-import React,{ Component } from "react";
-import { Modal,Checkbox,Input, Spin, Icon,notification } from "antd";
+import React, { Component } from "react";
+import { Modal, Checkbox, Input, Spin, Icon, notification } from "antd";
 import axios from 'axios';
 import Modals from '../../modals/Modals';
 const CheckboxGroup = Checkbox.Group;
 
-class Addcourses extends Component{
-  constructor(props){
+class Addcourses extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      invite_code:undefined,
-      Addcoursestype:false,
-      Checkboxteacherchecked:false,
-      Checkboxteachingchecked:false,
-      Checkboxstudentchecked:false,
-      Checkboxteachertype:false,
-      Checkboxteachingtype:false,
-      professor:null,
-      assistant_professor:null,
-      student:null,
-      course_id:undefined,
-      loadtype:false,
-      modalsType:false,
-      modalsTopval:undefined,
-      modalSave:undefined,
-			isSpin:false
+    this.state = {
+      invite_code: undefined,
+      Addcoursestype: false,
+      Checkboxteacherchecked: false,
+      Checkboxteachingchecked: false,
+      Checkboxstudentchecked: false,
+      Checkboxteachertype: false,
+      Checkboxteachingtype: false,
+      professor: null,
+      assistant_professor: null,
+      student: null,
+      course_id: undefined,
+      loadtype: false,
+      modalsType: false,
+      modalsTopval: undefined,
+      modalSave: undefined,
+      isSpin: false
     }
   }
 
   componentDidMount() {
-		axios.interceptors.response.use((response) => {
-			if (response != undefined)
-				if (response && response.data.status === 409) {
-					this.setState({
-						Addcoursestypes: true
-					})
-				}
-			return response;
-		}, (error) => {
+    axios.interceptors.response.use((response) => {
+      if (response != undefined)
+        if (response && response.data.status === 409) {
+          this.setState({
+            Addcoursestypes: true
+          })
+        }
+      return response;
+    }, (error) => {
 
-		});
+    });
 
 
-    let {Addcoursestype}=this.props;
+    let { Addcoursestype } = this.props;
     this.setState({
-     Addcoursestype:Addcoursestype
+      Addcoursestype: Addcoursestype
     })
 
   }
-	componentDidUpdate = (prevProps) => {
-		// console.log(prevProps);
-		// console.log(this.props);
-		if(prevProps.occupation!==this.props.occupation){
-			this.setState({
-				Addcoursestype:false,
-				Addcoursestypes:false,
-			})
-		}
-	}
-	openNotification = (messge) => {
-		notification.open({
-			message: "提示",
-			description:
-			messge,
-			onClick: () => {
-				console.log('Notification Clicked!');
-			},
-		});
-	};
-
-  inputjoinclassvalue=(e)=>{
-		if(e.target.value.length>=7){
-			this.openNotification("请输入5位课堂邀请码或6位分班邀请码!");
-			return
-		}
-    this.setState({
-      invite_code:e.target.value
-    })
-
-  }
-
-  Checkboxteaching=(e)=>{
-
-    if(e.target.checked===true){
+  componentDidUpdate = (prevProps) => {
+    if (prevProps.occupation !== this.props.occupation) {
       this.setState({
-        assistant_professor:1,
-				professor:null,
-        Checkboxteachingchecked:e.target.checked,
-        Checkboxteachertype:true
+        Addcoursestype: false,
+        Addcoursestypes: false,
       })
-    }else{
+    }
+  }
+  openNotification = (messge) => {
+    notification.open({
+      message: "提示",
+      description:
+        messge,
+      onClick: () => {
+        console.log('Notification Clicked!');
+      },
+    });
+  };
+
+  inputjoinclassvalue = (e) => {
+    if (e.target.value.length >= 7) {
+      this.openNotification("请输入5位课堂邀请码或6位分班邀请码!");
+      return
+    }
+    this.setState({
+      invite_code: e.target.value
+    })
+
+  }
+
+  Checkboxteaching = (e) => {
+
+    if (e.target.checked === true) {
       this.setState({
-        professor:null,
-        Checkboxteachingchecked:e.target.checked,
-        Checkboxteachertype:false
+        assistant_professor: 1,
+        professor: null,
+        Checkboxteachingchecked: e.target.checked,
+        Checkboxteachertype: true
+      })
+    } else {
+      this.setState({
+        professor: null,
+        Checkboxteachingchecked: e.target.checked,
+        Checkboxteachertype: false
       })
     }
 
@@ -100,37 +98,37 @@ class Addcourses extends Component{
 
 
 
-  Checkboxteacher=(e)=>{
+  Checkboxteacher = (e) => {
 
-    if(e.target.checked===true){
+    if (e.target.checked === true) {
       this.setState({
-        professor:1,
-				assistant_professor:null,
-        Checkboxteacherchecked:e.target.checked,
-        Checkboxteachingtype:true
+        professor: 1,
+        assistant_professor: null,
+        Checkboxteacherchecked: e.target.checked,
+        Checkboxteachingtype: true
       })
-    }else{
+    } else {
       this.setState({
-        professor:null,
-        assistant_professor:null,
-        Checkboxteacherchecked:e.target.checked,
-        Checkboxteachingtype:false
+        professor: null,
+        assistant_professor: null,
+        Checkboxteacherchecked: e.target.checked,
+        Checkboxteachingtype: false
       })
     }
 
   }
 
-  Checkboxstudent=(e)=>{
+  Checkboxstudent = (e) => {
 
-    if(e.target.checked===true){
+    if (e.target.checked === true) {
       this.setState({
-        student:1,
-        Checkboxstudentchecked:e.target.checked
+        student: 1,
+        Checkboxstudentchecked: e.target.checked
       })
-    }else{
+    } else {
       this.setState({
-        student:null,
-        Checkboxstudentchecked:e.target.checked
+        student: null,
+        Checkboxstudentchecked: e.target.checked
       })
     }
 
@@ -138,271 +136,247 @@ class Addcourses extends Component{
 
 
 
-  hidetojoinclass=()=>{
-		let {Addcoursestype}=this.props;
-    // console.log(this.props)
+  hidetojoinclass = () => {
+    let { Addcoursestype } = this.props;
     this.setState({
-      invite_code:undefined,
-      Addcoursestype:false,
-      Checkboxteacherchecked:false,
-      Checkboxteachingchecked:false,
-      Checkboxstudentchecked:false,
-      Checkboxteachertype:false,
-      Checkboxteachingtype:false,
-      professor:null,
-      assistant_professor:null,
-      student:null,
-			Addcoursestypes:false
+      invite_code: undefined,
+      Addcoursestype: false,
+      Checkboxteacherchecked: false,
+      Checkboxteachingchecked: false,
+      Checkboxstudentchecked: false,
+      Checkboxteachertype: false,
+      Checkboxteachingtype: false,
+      professor: null,
+      assistant_professor: null,
+      student: null,
+      Addcoursestypes: false
     })
 
-		if(Addcoursestype===true){
-			this.props.hideAddcoursestype();
-		}else{
-			window.location.href = "/";
-		}
+    if (Addcoursestype === true) {
+      this.props.hideAddcoursestype();
+    } else {
+      window.location.href = "/";
+    }
 
   }
 
-  submitasyn=(course_id)=>{
-  	let{professor,Addcoursestype}=this.state;
+  submitasyn = (course_id) => {
+    let { professor, Addcoursestype } = this.state;
 
-  	if(professor===1){
-			this.setState({
-				loadtype:true,
-				modalsType:true,
-				modalsTopval:"申请已提交，请等待审核",
-				modalSave:(course_id)=>this.submitasyns(course_id),
-				Addcoursestype:false
-			})
-			if(Addcoursestype===true){
-				this.props.hideAddcoursestype();
-			}
-		}else{
-			// let{course_id}=this.state;
-			this.setState({
-				Addcoursestype:false
-			})
-			if(Addcoursestype===true){
-				this.props.hideAddcoursestype();
-			}
-			window.location.href ="/courses/"+course_id+"/students";
-		}
-
-  }
-	submitasyns=(course_id)=>{
-			window.location.href ="/courses/"+course_id+"/students";
-	}
-
-  submittojoinclass=()=>{
-  	let{Addcoursestype}=this.state;
-  	this.setState({
-			isSpin:true
-		})
-    let {invite_code,professor,assistant_professor,student}=this.state;
-    if(invite_code===undefined||invite_code===""){
+    if (professor === 1) {
       this.setState({
-        invite_codetype:true,
-        invite_codevalue:"邀请码不能为空",
-				isSpin:false
+        loadtype: true,
+        modalsType: true,
+        modalsTopval: "申请已提交，请等待审核",
+        modalSave: (course_id) => this.submitasyns(course_id),
+        Addcoursestype: false
+      })
+      if (Addcoursestype === true) {
+        this.props.hideAddcoursestype();
+      }
+    } else {
+      this.setState({
+        Addcoursestype: false
+      })
+      if (Addcoursestype === true) {
+        this.props.hideAddcoursestype();
+      }
+      window.location.href = "/classrooms/" + course_id + "/students";
+    }
+
+  }
+  submitasyns = (course_id) => {
+    window.location.href = "/classrooms/" + course_id + "/students";
+  }
+
+  submittojoinclass = () => {
+    let { Addcoursestype } = this.state;
+    this.setState({
+      isSpin: true
+    })
+    let { invite_code, professor, assistant_professor, student } = this.state;
+    if (invite_code === undefined || invite_code === "") {
+      this.setState({
+        invite_codetype: true,
+        invite_codevalue: "邀请码不能为空",
+        isSpin: false
       })
       return
-    }else{
+    } else {
       this.setState({
-        invite_codetype:false,
-        invite_codevalue:" ",
-				isSpin:false
+        invite_codetype: false,
+        invite_codevalue: " ",
+        isSpin: false
       })
     }
 
-    let url="/courses/apply_to_join_course.json"
+    let url = "/courses/apply_to_join_course.json"
     axios.post(url, {
-      invite_code:invite_code,
-      professor:professor,
-      assistant_professor:assistant_professor,
-      student:student
-      }
+      invite_code: invite_code,
+      professor: professor,
+      assistant_professor: assistant_professor,
+      student: student
+    }
     ).then((response) => {
-    	// console.log("submittojoinclass");
-    	// console.log(response);
-			if(response  === undefined){
-				this.setState({
-					// Addcoursestype:false,
-					isSpin:false
-				});
-		    // try {
-				// 	this.props.HideAddcoursestypess(3);
-				// }catch (e) {
-				//
-				// }
-				return
-			}
-			if(response.data.status===-2){
-				this.setState({
-					 Addcoursestype:false,
-					isSpin:false
-				});
-				// try {
-					if(response.data.message==="该课堂要求成员完成实名认证"){
-						 this.props.HideAddcoursestypess(1);
-						return;
-					}
-					if(response.data.message==="该课堂要求成员完成职业认证"){
-						 this.props.HideAddcoursestypess(2);
-						return;
-					}
-					if(response.data.message==="该课堂要求成员完成实名和职业认证"){
-						 this.props.HideAddcoursestypess(3);
-						return;
-					}
-				// }catch (e) {
-					notification.open({
-						message:"提示",
-						description:response.data.message
-					});
-				// 	// this.props.showNotification(response.data.message);
-				// }
-				return;
-			}
-      if(response.data.status===0){
-        // https://www.trustie.net/issues/22365
-        if (response.data.course_id == 2704) {
-          this.props.history.push('/courses/2704/boards/8367/messages/42072')
+      if (response === undefined) {
+        this.setState({
+          isSpin: false
+        });
+        return
+      }
+      if (response.data.status === -2) {
+        this.setState({
+          Addcoursestype: false,
+          isSpin: false
+        });
+        if (response.data.message === "该课堂要求成员完成实名认证") {
+          this.props.HideAddcoursestypess(1);
           return;
         }
-				if(response.data.course_id!=undefined){
-					this.submitasyn(response.data.course_id)
-				}
-				notification.open({
-					message:"提示",
-					description:response.data.message
-				});
-				if(Addcoursestype===true){
-					this.props.hideAddcoursestype();
-				}
-
-				// this.props.showNotification(response.data.message);
-
-      }else{
-
-				response.data.message && notification.open({
-					message:"提示",
-					description:response.data.message
-				});
-				this.setState({
-					Addcoursestype:false
-				})
-				if(Addcoursestype===true){
-					this.props.hideAddcoursestype();
-				}
-
+        if (response.data.message === "该课堂要求成员完成职业认证") {
+          this.props.HideAddcoursestypess(2);
+          return;
+        }
+        if (response.data.message === "该课堂要求成员完成实名和职业认证") {
+          this.props.HideAddcoursestypess(3);
+          return;
+        }
+        notification.open({
+          message: "提示",
+          description: response.data.message
+        });
+        return;
       }
+      if (response.data.status === 0) {
+        if (response.data.course_id == 2704) {
+          this.props.history.push('/classrooms/2704/boards/8367/messages/42072')
+          return;
+        }
+        notification.open({
+          message: "提示",
+          description: response.data.message
+        });
+        if (response.data.course_id != undefined) {
+          this.submitasyn(response.data.course_id)
+        }
+        if (Addcoursestype === true) {
+          this.props.hideAddcoursestype();
+        }
+      } else {
 
-			this.setState({
-				Addcoursestype:false,
-				isSpin:false
-			});
+        response.data.message && notification.open({
+          message: "提示",
+          description: response.data.message
+        });
+        this.setState({
+          Addcoursestype: false
+        })
+        if (Addcoursestype === true) {
+          this.props.hideAddcoursestype();
+        }
+      }
+      this.setState({
+        Addcoursestype: false,
+        isSpin: false
+      });
     }).catch((error) => {
       console.log(error);
-			this.setState({
-				Addcoursestype:false,
-				isSpin:false
-			});
+      this.setState({
+        Addcoursestype: false,
+        isSpin: false
+      });
     })
 
   }
 
-  render(){
-    let {invite_code,
-         Addcoursestype,
-        Checkboxteacherchecked,
-        Checkboxteachertype,
-        Checkboxteachingchecked,
-        Checkboxteachingtype,
-        Checkboxstudentchecked,
-        loadtype,
-        modalsType,
-        modalsTopval,
-        modalSave,
-			  Addcoursestypes
-    }=this.state;
-		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
-		// console.log("Addcourses");
-		// console.log(Addcoursestypes)
-    return(
+  render() {
+    let { invite_code,
+      Addcoursestype,
+      Checkboxteacherchecked,
+      Checkboxteachertype,
+      Checkboxteachingchecked,
+      Checkboxteachingtype,
+      Checkboxstudentchecked,
+      loadtype,
+      modalsType,
+      modalsTopval,
+      modalSave,
+      Addcoursestypes
+    } = this.state;
+    const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
+    return (
       <div>
-          <Modals
-            loadtype={loadtype}
-            modalsType={modalsType}
-            modalsTopval={modalsTopval}
-            modalSave={modalSave}
-          />
+        <Modals
+          loadtype={loadtype}
+          modalsType={modalsType}
+          modalsTopval={modalsTopval}
+          modalSave={modalSave}
+        />
 
-          <Modal
-            keyboard={false}
-            className={"HomeworkModal"}
-            title="加入课堂"
-            visible={Addcoursestype===undefined||Addcoursestype===false?Addcoursestypes:Addcoursestype}
-            closable={false}
-            footer={null}
-            destroyOnClose={true}
-          >
-						<Spin indicator={antIcon} spinning={this.state.isSpin}>
+        <Modal
+          keyboard={false}
+          className={"HomeworkModal"}
+          title="加入课堂"
+          visible={Addcoursestype === undefined || Addcoursestype === false ? Addcoursestypes : Addcoursestype}
+          closable={false}
+          footer={null}
+          destroyOnClose={true}
+        >
+          <Spin indicator={antIcon} spinning={this.state.isSpin}>
             <div className="task_popup_con  ml30">
               <div className="mr15">
                 <ul>
                   <li className="clearfix mb10">
                     <label className="panel-form-label fl">课堂邀请码：</label>
                     <Input type="text" className="input-60-40 fl mt5" name="invite_code"
-                           placeholder="请输入5位课堂邀请码或6位分班邀请码"
-                           style={{width:'275px'}}
-                           value={invite_code} onInput={this.inputjoinclassvalue}/>
+                      placeholder="请输入5位课堂邀请码或6位分班邀请码"
+                      style={{ width: '275px' }}
+                      value={invite_code} onInput={this.inputjoinclassvalue} />
                   </li>
 
                   <p id="none_invite_code_notice"
-                     className="color-orange none f12"
-                     // style={{marginLeft: '90px',display:code_notice===true?'block':"none"}}
+                    className="color-orange none f12"
                   >请输入5位课堂邀请码或6位分班邀请码</p>
 
                   <li className="clearfix ">
 
                     <label className="panel-form-label fl">身份：</label>
                     <span className="fl mr20 mt10">
-                        <Checkbox onChange={this.Checkboxteacher} checked={Checkboxteacherchecked} disabled={Checkboxteachertype}>教师</Checkbox>
+                      <Checkbox onChange={this.Checkboxteacher} checked={Checkboxteacherchecked} disabled={Checkboxteachertype}>教师</Checkbox>
                     </span>
 
                     <span className="fl mr20 mt10">
-                        <Checkbox onChange={this.Checkboxteaching} checked={Checkboxteachingchecked} disabled={Checkboxteachingtype} >助教</Checkbox>
-                     </span>
+                      <Checkbox onChange={this.Checkboxteaching} checked={Checkboxteachingchecked} disabled={Checkboxteachingtype} >助教</Checkbox>
+                    </span>
 
                     <span className="fl mr20 mt10">
-                        <Checkbox onChange={this.Checkboxstudent} checked={Checkboxstudentchecked}>学生/参赛者</Checkbox>
-                     </span>
+                      <Checkbox onChange={this.Checkboxstudent} checked={Checkboxstudentchecked}>学生/参赛者</Checkbox>
+                    </span>
 
                   </li>
 
                   {
-                    this.state.invite_codetype===true?
+                    this.state.invite_codetype === true ?
                       <span className={"color-red"}>
                         {this.state.invite_codevalue}
-                      </span>:""
+                      </span> : ""
                   }
                   <p id="none_checked_notice" className="color-orange none f12"
-                     // style={{marginLeft: '90px',display:checked_notice===true?'block':"none"}}
                   >请至少选择一个身份</p>
 
                   <li className="clearfix mt10 edu-txt-center">
                     <a className="task-btn mr10 color-white"
-                       onClick={()=>this.hidetojoinclass()}>取消</a>
+                      onClick={() => this.hidetojoinclass()}>取消</a>
                     <a
                       className="task-btn task-btn-orange ml20"
-                      onClick={()=>this.submittojoinclass()}>确定</a>
+                      onClick={() => this.submittojoinclass()}>确定</a>
                   </li>
 
                 </ul>
               </div>
             </div>
-						</Spin>
-          </Modal>
+          </Spin>
+        </Modal>
       </div>
     )
   }
diff --git a/src/modules/courses/coursesPublic/Associationmodel.js b/src/modules/courses/coursesPublic/Associationmodel.js
index a1f5a9e7..db2f1644 100644
--- a/src/modules/courses/coursesPublic/Associationmodel.js
+++ b/src/modules/courses/coursesPublic/Associationmodel.js
@@ -59,7 +59,6 @@ class Associationmodel extends Component{
 
 
   goback=()=>{
-  	// debugger
     this.setState({
       Modalstype:false,
     })
@@ -70,7 +69,6 @@ class Associationmodel extends Component{
 
 
    setSaves=()=>{
-  	// debugger
      let {projectvalue}=this.state;
      let taskid=this.props.taskid;
      let url="/graduation_tasks/"+taskid+"/graduation_works/relate_project.json";
@@ -80,13 +78,6 @@ class Associationmodel extends Component{
      }).then((result)=>{
 
 				 this.goback()
-           // this.setState({
-           //   Modalstype:true,
-           //   Modalstopval:result.data.message,
-           //   ModalSave:this.goback,
-           //   loadtype:true
-           // })
-
 
      }).catch((error)=>{
        console.log(error)
@@ -106,7 +97,7 @@ class Associationmodel extends Component{
       })
     }
     let taskid=this.props.taskid;
-    console.log(this.props)
+
      let url="/graduation_tasks/"+taskid+"/graduation_works/check_project.json";
      axios.get(url, {
        params: {
diff --git a/src/modules/courses/coursesPublic/CourseTag.js b/src/modules/courses/coursesPublic/CourseTag.js
index 5e8d3216..bafe348f 100644
--- a/src/modules/courses/coursesPublic/CourseTag.js
+++ b/src/modules/courses/coursesPublic/CourseTag.js
@@ -1,27 +1,27 @@
 import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
+import { getImageUrl } from 'educoder';
 import './CourseTag.css'
 
 /**
   参考antd的api： https://ant.design/components/tag-cn/
   如果传入了非特定的color，前景色默认为白色
 
- *  */ 
-class CourseTag extends Component{
+ *  */
+class CourseTag extends Component {
   constructor(props) {
     super(props)
   }
-  render(){
-    const {  closable, onClose, visible, color } = this.props
+  render() {
+    const { closable, onClose, visible, color } = this.props
     const hasColor = !!color
-    return(
-      <div className={`courseTag ${ hasColor ? 'course-tag-has-color' : ''} `} 
+    return (
+      <div className={`courseTag ${hasColor ? 'course-tag-has-color' : ''} `}
         style={{ display: visible == undefined || visible == true ? '' : 'none' }}
       >
         <span
           style={{ backgroundColor: color }}
         >{this.props.children}</span>
-        { closable && <a href="javascript:void(0)" onClick={onClose}>x</a> }
+        {closable && <a onClick={onClose}>x</a>}
       </div>
     )
   }
diff --git a/src/modules/courses/coursesPublic/CoursesListType.js b/src/modules/courses/coursesPublic/CoursesListType.js
index 039f9691..bec00d33 100644
--- a/src/modules/courses/coursesPublic/CoursesListType.js
+++ b/src/modules/courses/coursesPublic/CoursesListType.js
@@ -1,93 +1,48 @@
-import React, { Component } from 'react';
-import {Tooltip} from 'antd'
+import React, { Component, Fragment } from 'react';
 import '../css/Courses.css';
 class CoursesListType extends Component {
-  constructor(props) {
-    super(props);
-    this.state={
-      // typelist:[],
-      // typesylename:"",
-      // tipval:""
-    }
-
-  }
-
-  componentDidMount() {
-    // let{typelist,typesylename,tipval}=this.props;
-    //
-    // this.setState({
-    //   typelist:typelist,
-    //   typesylename:typesylename,
-    //   tipval:tipval
-    // })
-    // console.log("CoursesListType")
-    // console.log(typelist)
-  }
 
   render() {
-    let {typelist,typesylename,tipval}=this.props;
+    let { typelist, typesylename, tipval } = this.props;
 
-    return(
-      <span style={{display:'inline-block'}}>
+    return (
+      <Fragment >
         {
-          typelist===undefined || typelist=== 403 || typelist === 401 || typelist=== 407 || typelist=== 408|| typelist=== 409 || typelist === 500?"":typelist.map((item,key)=>{
-            return(
-              <Tooltip placement="bottom" title={tipval} getPopupContainer={()=>document.querySelector('.TabsWarp')} key={key}>
-                <span key={key}>
-                  {item==="公开"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle " + typesylename} >公开</span>:""}
-                  {item==="已开启补交"?<span className={"edu-filter-btn edu-filter-btn-028d01 ml15 fl typestyle "+ typesylename} >已开启补交</span>:""}
-                  {item==="未开启补交"?<span className={"edu-filter-btn edu-filter-btn-CC317C ml15 fl typestyle "+ typesylename} >未开启补交</span>:""}
-                  {item==="匿名作品"?<span className={"edu-filter-btn edu-filter-btn-006B75 ml15 fl typestyle "+ typesylename} >匿名作品</span>:""}
-                  {item==="已选择"?<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "+ typesylename} >已选择</span>:""}
-                  {item==="已结束"?<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "+ typesylename} >已结束</span>:""}
-                  {item==="提交中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >提交中</span>:""}
-                  {item==="匿评中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >匿评中</span>:""}
-                  {item==="申诉中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >申诉中</span>:""}
-                  {item==="补交中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >补交中</span>:""}
-                  {item==="评阅中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >评阅中</span>:""}
-                  {item==="待选中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >待选中</span>:""}
-                  {item==="交叉评阅中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >交叉评阅中</span>:""}
-                  {item==="已开启交叉评阅"?<span className={"edu-filter-btn edu-filter-btn-E99695 ml15 fl typestyle "+ typesylename} >已开启交叉评阅</span>:""}
-                  {item==="待确认"?<span className={"edu-filter-btn edu-filter-btn-5E5FB9 ml15 fl typestyle "+ typesylename} >待确认</span>:""}
-                  {item==="待处理"?<span className={"edu-filter-btn edu-filter-btn-5E5FB9 ml15 fl typestyle mr10 "+ typesylename} >待处理</span>:""}
-                  {item==="未发布"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >未发布</span>:""}
-                  {item==="私有"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >私有</span>:""}
-                  {item==="未提交"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >未提交</span>:""}
-                  {item==="已确认"?<span className={"edu-filter-btn edu-filter-btn-FC2B6A ml15 fl typestyle "+ typesylename} >已确认</span>:""}
-                  {item==="已截止"?<span className={"edu-filter-btn edu-filter-btn-FC2B6A ml15 fl typestyle "+ typesylename} >已截止</span>:""}
-									{item==="开放课程"?<span className={"edu-filter-btn edu-filter-btn-FF6800 ml15 fl typestyle "+ typesylename} >开放课程</span>:""}
+          typelist === undefined || typelist === 403 || typelist === 401 || typelist === 407 || typelist === 408 || typelist === 409 || typelist === 500 ? "" : typelist.map((item, key) => {
+            return (
+              <a title={tipval} key={key}>
 
-                </span>
-              </Tooltip>
-          )
-         })
+                {item === "公开" ? <span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >公开</span> : ""}
+                {item === "已开启补交" ? <span className={"edu-filter-btn edu-filter-btn-028d01 ml15 fl typestyle "} >已开启补交</span> : ""}
+                {item === "未开启补交" ? <span className={"edu-filter-btn edu-filter-btn-CC317C ml15 fl typestyle "} >未开启补交</span> : ""}
+                {item === "匿名作品" ? <span className={"edu-filter-btn edu-filter-btn-006B75 ml15 fl typestyle "} >匿名作品</span> : ""}
+                {item === "已选择" ? <span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "} >已选择</span> : ""}
+                {item === "已结束" ? <span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "} >已结束</span> : ""}
+                {item === "提交中" ? <span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >提交中</span> : ""}
+                {item === "匿评中" ? <span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >匿评中</span> : ""}
+                {item === "申诉中" ? <span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >申诉中</span> : ""}
+                {item === "考试中" ? <span className={"edu-filter-btn edu-filter-btn-7AD58B ml15 fl typestyle "} >考试中</span> : ""}
+                {item === "补交中" ? <span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >补交中</span> : ""}
+                {item === "评阅中" ? <span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >评阅中</span> : ""}
+                {item === "待选中" ? <span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >待选中</span> : ""}
+                {item === "交叉评阅中" ? <span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "} >交叉评阅中</span> : ""}
+                {item === "已开启交叉评阅" ? <span className={"edu-filter-btn edu-filter-btn-E99695 ml15 fl typestyle "} >已开启交叉评阅</span> : ""}
+                {item === "待确认" ? <span className={"edu-filter-btn edu-filter-btn-5E5FB9 ml15 fl typestyle "} >待确认</span> : ""}
+                {item === "待处理" ? <span className={"edu-filter-btn edu-filter-btn-5E5FB9 ml15 fl typestyle mr10 "} >待处理</span> : ""}
+                {item === "未发布" ? <span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "} >未发布</span> : ""}
+                {item === "私有" ? <span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "} >私有</span> : ""}
+                {item === "未提交" ? <span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "} >未提交</span> : ""}
+                {item === "已确认" ? <span className={"edu-filter-btn edu-filter-btn-FC2B6A ml15 fl typestyle "} >已确认</span> : ""}
+                {item === "已截止" ? <span className={"edu-filter-btn edu-filter-btn-FC2B6A ml15 fl typestyle "} >已截止</span> : ""}
+                {item === "开放课程" ? <span className={"edu-filter-btn edu-filter-btn-FF6800 ml15 fl typestyle "} >开放课程</span> : ""}
+
+
+              </a>
+            )
+          })
         }
-      </span>
+      </Fragment>
     )
   }
 }
 export default CoursesListType;
-
-
-// let typelist=["公开",
-//               "已开启补交",
-//               "未开启补交",
-//               "匿名作品",
-//               "已选择",
-//               "已结束",
-//               "提交中",
-//               "匿评中",
-//               "申诉中",
-//               "补交中",
-//               "评阅中",
-//               "待选中",
-//               "交叉评阅中",
-//               "已开启交叉评阅",
-//               "待确认",
-//               "待处理",
-//               "未发布",
-//               "私有",
-//               "未提交",
-//               "已确认",
-//               "已截止",
-//             ]
\ No newline at end of file
diff --git a/src/modules/courses/coursesPublic/CoursesMarkdown.js b/src/modules/courses/coursesPublic/CoursesMarkdown.js
deleted file mode 100644
index 7b996480..00000000
--- a/src/modules/courses/coursesPublic/CoursesMarkdown.js
+++ /dev/null
@@ -1,223 +0,0 @@
-import React, {Component} from 'react';
-
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
-
-import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
-
-// import "antd/dist/antd.css";
-
-import { getImageUrl, toPath, getUrl,getUploadActionUrl } from 'educoder';
-
-import axios from 'axios';
-
-import "./makedown.css";
-
-let origin = getUrl();
-
-let path = getUrl("/editormd/lib/")
-
-const $ = window.$;
-
-let timeout;
-
-let currentValue;
-
-const Option = Select.Option;
-
-const RadioGroup = Radio.Group;
-
-
-
-// 保存数据
-function md_add_data(k,mdu,d){
-  window.sessionStorage.setItem(k+mdu,d);
-}
-
-// 清空保存的数据
-function md_clear_data(k,mdu,id){
-  window.sessionStorage.removeItem(k+mdu);
-  var id1 = "#e_tip_"+id;
-  var id2 = "#e_tips_"+id;
-  if(k == 'content'){
-    $(id2).html("");
-  }else{
-    $(id1).html("");
-  }
-}
-// editor 存在了jquery对象上，应用不需要自己写md_rec_data方法了
-function md_rec_data(k, mdu, id) {
-  if (window.sessionStorage.getItem(k + mdu) !== null) {
-    var editor = $("#e_tips_" + id).data('editor');
-    editor.setValue(window.sessionStorage.getItem(k + mdu));
-    // debugger;
-    // /shixuns/b5hjq9zm/challenges/3977/tab=3  setValue可能导致editor样式问题
-    md_clear_data(k, mdu, id);
-  }
-}
-window.md_rec_data = md_rec_data;
-
-function md_elocalStorage(editor,mdu,id){
-  if (window.sessionStorage){
-    var oc = window.sessionStorage.getItem('content'+mdu);
-    if(oc !== null ){
-      console.log("#e_tips_"+id)
-      $("#e_tips_"+id).data('editor', editor);
-      var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" class="link-color-blue" onclick="md_rec_data(\'content\',\''+ mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="link-color-blue" onclick="md_clear_data(\'content\',\''+ mdu + '\',\'' + id + '\')">不恢复</a>';
-      $("#e_tips_"+id).html(h);
-    }
-    setInterval(function() {
-      var d = new Date();
-      var h = d.getHours();
-      var m = d.getMinutes();
-      var s = d.getSeconds();
-      h = h < 10 ? '0' + h : h;
-      m = m < 10 ? '0' + m : m;
-      s = s < 10 ? '0' + s : s;
-      if(editor.getValue().trim() != ""){
-        md_add_data("content",mdu,editor.getValue());
-        var id1 = "#e_tip_"+id;
-        var id2 = "#e_tips_"+id;
-
-        $(id1).html(" 数据已于 " + h + ':' + m + ':' + s +" 保存   ");
-        $(id2).html("");
-      }
-    },10000);
-
-  }else{
-    $("#e_tip_"+id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
-  }
-}
-
-
-function create_editorMD(id, width, high, placeholder, imageUrl, callback, initValue) {
-  var editorName = window.editormd(id, {
-    width: width,
-    height: high,
-    path: path,   // "/editormd/lib/"
-    markdown : initValue,
-
-
-    syncScrolling: "single",
-    tex: true,
-    tocm: true,
-    emoji: true,
-    taskList: true,
-    codeFold: true,
-    searchReplace: true,
-    htmlDecode: "style,script,iframe",
-    sequenceDiagram: true,
-    autoFocus: false,
-    toolbarIcons: function () {
-      // Or return editormd.toolbarModes[name]; // full, simple, mini
-      // Using "||" set icons align right.
-      return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
-    },
-    toolbarCustomIcons: {
-      testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-      testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
-    },
-    //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
-    saveHTMLToTextarea: true,
-    // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-    dialogMaskOpacity: 0.6,
-    placeholder: placeholder,
-    imageUpload: true,
-    imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-    imageUploadURL: imageUrl,//url
-    onload: function() {
-      let _id = this.id   // 如果要使用this，这里不能使用箭头函数
-      let _editorName = this;
-      // this.previewing();
-      // let _id = id;
-      $("#" + _id + " [type=\"latex\"]").bind("click", function () {
-        _editorName.cm.replaceSelection("```latex");
-        _editorName.cm.replaceSelection("\n");
-        _editorName.cm.replaceSelection("\n");
-        _editorName.cm.replaceSelection("```");
-        var __Cursor = _editorName.cm.getDoc().getCursor();
-        _editorName.cm.setCursor(__Cursor.line - 1, 0);
-      });
-
-      $("#" + _id + " [type=\"inline\"]").bind("click", function () {
-        _editorName.cm.replaceSelection("`$$$$`");
-        var __Cursor = _editorName.cm.getDoc().getCursor();
-        _editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 3);
-        _editorName.cm.focus();
-      });
-      $("[type=\"inline\"]").attr("title", "行内公式");
-      $("[type=\"latex\"]").attr("title", "多行公式");
-
-      md_elocalStorage(_editorName, `MDEditor__${_id}`, _id);
-
-      callback && callback()
-    }
-  });
-  return editorName;
-}
-
-
-export default class CoursesMarkdown extends Component {
-  constructor(props) {
-    super(props)
-    this.state = {
-
-    }
-  }
-  componentDidMount = () => {
-    const { mdID, initValue ,placeholder} = this.props;
-    // let initValue = 'initValue'
-    let _id = `mdEditor_${mdID}`
-    this.contentChanged = false;
-    // const placeholder = "";
-    // amp;
-    // 编辑时要传memoId
-    const imageUrl = `${getUploadActionUrl()}`;
-    // 创建editorMd
-
-    const answers_editormd = create_editorMD(_id, '100%', 400, placeholder, imageUrl, () => {
-      setTimeout(() => {
-        answers_editormd.resize()
-        answers_editormd.cm && answers_editormd.cm.refresh()
-      }, 500)
-
-      if (initValue != undefined) {
-          answers_editormd.setValue(initValue)
-      }
-      answers_editormd.cm.on("change", (_cm, changeObj) => {
-          console.log('....contentChanged')
-          this.contentChanged = true;
-      })
-    }, initValue);
-    this.answers_editormd = answers_editormd;
-    window.answers_editormd = answers_editormd;
-  }
-
-  getValue = () => {
-    return this.answers_editormd.getValue()
-
-  }
-
-  render() {
-
-    let {
-      choice_url,
-    } = this.state;
-    let { mdID } = this.props;
-    return (
-      <React.Fragment>
-        <div className="df">
-          {/* padding10-20  */}
-          <div className="edu-back-greyf5 radius4" id={`mdEditor_${mdID}`}>
-            <textarea style={{display: 'none'}}  id="evaluate_script_show" name="content"> </textarea>
-            <div className="CodeMirror cm-s-defualt">
-            </div>
-          </div>
-        </div>
-        <p id={`e_tip_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"></p>
-        <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"></p>
-      </React.Fragment>
-    )
-  }
-}
-
-
diff --git a/src/modules/courses/coursesPublic/HomeworkModal.js b/src/modules/courses/coursesPublic/HomeworkModal.js
index 84915930..77e697cb 100644
--- a/src/modules/courses/coursesPublic/HomeworkModal.js
+++ b/src/modules/courses/coursesPublic/HomeworkModal.js
@@ -153,7 +153,7 @@ class HomeworkModal extends Component{
             {
               `
               body {
-							  overflow: hidden !important;
+							   width: calc(100%) !important;
 							}
               `
             }
@@ -170,7 +170,7 @@ class HomeworkModal extends Component{
           destroyOnClose={true}
         >
           <div className="task-popup-content">
-            
+
 
             { this.props.usingCheckBeforePost ?
             <React.Fragment>
@@ -183,7 +183,7 @@ class HomeworkModal extends Component{
               <p className="task-popup-text-center font-16 mt10">
                 此设置将对所有分班生效
               </p>
-            </React.Fragment> : 
+            </React.Fragment> :
             <React.Fragment>
               <p className="task-popup-text-center font-16">
                 {this.props.Topval}
@@ -222,8 +222,8 @@ class HomeworkModal extends Component{
                 </span>
               </p>}
             {/* usingCheckBeforePost 为true的时候 全选所有分班 */}
-            {this.props.modaltype===undefined||this.props.modaltype===2||this.props.modaltype===4 
-              || !course_groups || course_groups.length == 0 
+            {this.props.modaltype===undefined||this.props.modaltype===2||this.props.modaltype===4
+              || !course_groups || course_groups.length == 0
               || this.props.usingCheckBeforePost ?"":<ul className="upload_select_box fl clearfix mt20 mb30"
                 style={{"overflow-y":"auto",padding:"10px 0px"}}
                 id="search_not_members_list"
diff --git a/src/modules/courses/coursesPublic/ModalsRename.js b/src/modules/courses/coursesPublic/ModalsRename.js
index 1398c50f..b5d619e8 100644
--- a/src/modules/courses/coursesPublic/ModalsRename.js
+++ b/src/modules/courses/coursesPublic/ModalsRename.js
@@ -43,6 +43,16 @@ class ModalsRename extends Component{
 					centered={true}
 					className={"Navmodal"}
 				>
+					{this.props.Navmodalnametype===undefined?false:this.props.Navmodalnametype===true?<style>
+						{
+							`
+						 	body{
+						 	     width: calc(100%) !important;
+						 	 }
+		 
+						 	`
+						}
+					</style>:""}
 					<div className={"fl mt5"}>{this.props.Navname}名称：</div>
 					<Input placeholder={"请输入名称，最大限制60个字符"}
 					       className={"inputNav greyInput fl"}
diff --git a/src/modules/courses/coursesPublic/ModulationModal_exercise.js b/src/modules/courses/coursesPublic/ModulationModal_exercise.js
index 7c6e6cf6..6f427353 100644
--- a/src/modules/courses/coursesPublic/ModulationModal_exercise.js
+++ b/src/modules/courses/coursesPublic/ModulationModal_exercise.js
@@ -42,8 +42,8 @@ class ModulationModal_exercise extends Component {
 	}
 
 	componentDidMount = () => {
-		console.log("ModulationModal_exercise");
-		console.log(this.props);
+		// console.log("ModulationModal_exercise");
+		// console.log(this.props);
 		this.setState({
 			subjective_score: this.props.subjective_score,
 			objective_score: this.props.objective_score,
@@ -61,7 +61,6 @@ class ModulationModal_exercise extends Component {
 	}
 
 	Saves = () => {
-		debugger
 		let {
 			textareaval,
 			subjective_questions,
diff --git a/src/modules/courses/coursesPublic/NewShixunModel.js b/src/modules/courses/coursesPublic/NewShixunModel.js
index b5749889..ed3de713 100644
--- a/src/modules/courses/coursesPublic/NewShixunModel.js
+++ b/src/modules/courses/coursesPublic/NewShixunModel.js
@@ -443,7 +443,7 @@ class NewShixunModel extends Component{
 			<div>
 				<style>
 					{
-						`body{  overflow: hidden !important; }
+						`body{overflow: hidden !important; }
 					   .ant-drawer-content{ overflow:auto !important; background: #f5f5f5; }
 					   .yslbottomsj{position: absolute;bottom: -8px;}
 					   .ant-drawer-close{
diff --git a/src/modules/courses/coursesPublic/NoneData.js b/src/modules/courses/coursesPublic/NoneData.js
index e899b8a4..6f0422f6 100644
--- a/src/modules/courses/coursesPublic/NoneData.js
+++ b/src/modules/courses/coursesPublic/NoneData.js
@@ -1,9 +1,10 @@
 import React, { Component } from 'react';
-import { getUrl } from 'educoder';
+import { getImageUrl , getUrl } from 'educoder';
 
 class NoneData extends Component{
-  
-  
+  constructor(props) {
+    super(props)
+  }
   render(){
     const { style,searchtypes } = this.props;
 
diff --git a/src/modules/courses/coursesPublic/OneSelfOrderModal.js b/src/modules/courses/coursesPublic/OneSelfOrderModal.js
index 1f7fec57..8cdeb3a3 100644
--- a/src/modules/courses/coursesPublic/OneSelfOrderModal.js
+++ b/src/modules/courses/coursesPublic/OneSelfOrderModal.js
@@ -35,7 +35,10 @@ class OneSelfOrderModal extends Component{
 			group_ids:[],
 			endtime:"",
 			course_groups:undefined,
-			Checkboxtype:true
+			Checkboxtype:true,
+			endtimetypevalue:undefined,
+			endtimetypeid:undefined,
+			endtimetypename:undefined
 		}
 	}
 	componentDidMount() {
@@ -46,7 +49,9 @@ class OneSelfOrderModal extends Component{
 						let arr = this.props.course_groups.map(item => item.id);
 						let newarr = [];
 						let course_groups = this.props.course_groups;
+
 						course_groups.map((item, key) => {
+
 							if (item.end_time === null) {
 								// if(this.props.starttimesend===undefined){
 								// 	item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
@@ -69,7 +74,7 @@ class OneSelfOrderModal extends Component{
 		if(this.props.starttimes===undefined||this.props.starttimes===""||this.props.starttimes===null){
 			if(this.props.starttimesend===undefined){
 				this.setState({
-					endtime:moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
+					endtime:moment(moment(handleDateString(this.props.starttimes)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
 				})
 			}else{
 				this.setState({
@@ -80,7 +85,7 @@ class OneSelfOrderModal extends Component{
 		}else{
 			if(this.props.starttimesend===undefined){
 				this.setState({
-					endtime:moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
+					endtime:moment(moment(handleDateString(this.props.starttimes)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
 				})
 			}else{
 				this.setState({
@@ -98,6 +103,7 @@ class OneSelfOrderModal extends Component{
 						let course_groups=this.props.course_groups;
 						course_groups.map((item,key)=>{
 							if(item.end_time===null){
+								// item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
 								item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
 								newarr.push(item)
 							}else{
@@ -117,7 +123,7 @@ class OneSelfOrderModal extends Component{
 			if(this.props.starttimes===undefined||this.props.starttimes===""||this.props.starttimes===null){
 				if(this.props.starttimesend===undefined){
 					this.setState({
-						endtime:moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
+						endtime:moment(moment(handleDateString(this.props.starttimes)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
 					})
 				}else{
 					this.setState({
@@ -128,7 +134,7 @@ class OneSelfOrderModal extends Component{
 			}else{
 				if(this.props.starttimesend===undefined){
 					this.setState({
-						endtime:moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
+						endtime:moment(moment(handleDateString(this.props.starttimes)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
 					})
 				}else{
 					this.setState({
@@ -202,29 +208,35 @@ class OneSelfOrderModal extends Component{
 	}
 
 	propsSaves=(ds,endtime)=>{
+
+		this.setState({
+			endtimetype:false
+		})
     let {course_groups}=this.state;
 
 		if(this.props.typs=="end"){
 			this.props.Saves()
 		}else{
-
-			if(this.props.typs!="end"){
-				if(!endtime){
-					this.setState({
-						endtimetype:true,
-						endtimetypevalue:"截止时间不能为空"
-					})
-					return
-				}
-				if(moment(endtime,"YYYY-MM-DD HH:mm") <= moment(this.props.starttime,"YYYY-MM-DD HH:mm")){
-					this.setState({
-						endtimetype:true,
-						endtimetypevalue:"必须晚于当前时间"
-					})
-					return
+ 			if(!this.props.immediatelyopen){
+				if(this.props.typs!="end"){
+					if(!endtime){
+						this.setState({
+							endtimetype:true,
+							endtimetypevalue:"截止时间不能为空"
+						})
+						return
+					}
+					if(moment(endtime,"YYYY-MM-DD HH:mm") <= moment(this.props.starttime,"YYYY-MM-DD HH:mm")){
+						this.setState({
+							endtimetype:true,
+							endtimetypevalue:"必须晚于当前时间"
+						})
+						return
+					}
 				}
 			}
 
+
 			let type=false
 			if(course_groups===undefined||course_groups.length===0){
 				this.props.Saves(ds,moment(handleDateString(endtime),"YYYY-MM-DD HH:mm").format("YYYY-MM-DD HH:mm"))
@@ -238,6 +250,7 @@ class OneSelfOrderModal extends Component{
 								this.setState({
 									endtimetype:true,
 									endtimetypeid:items.id,
+									endtimetypename:items.name,
 									endtimetypevalue:"截止时间不能为空"
 								})
 								return
@@ -245,12 +258,29 @@ class OneSelfOrderModal extends Component{
 								// arr.push(moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm"))
 							}else{
 								if(moment(items.end_time,"YYYY-MM-DD HH:mm") <= moment(this.props.starttime,"YYYY-MM-DD HH:mm")){
+									type=true
 									this.setState({
 										endtimetype:true,
-										endtimetypevalue:"必须晚于当前时间"
+										endtimetypeid:items.id,
+										endtimetypename:items.name,
+										endtimetypevalue:"截止时间必须晚于当前时间"
 									})
 									return
 								}
+
+								if(this.props.modallate_time){
+									if(moment(items.end_time,"YYYY-MM-DD HH:mm") >= moment(this.props.modallate_time,"YYYY-MM-DD HH:mm")){
+										type=true
+										this.setState({
+											endtimetype:true,
+											endtimetypeid:items.id,
+											endtimetypename:items.name,
+											endtimetypevalue:"截止时间必须晚于补交结束时间"
+										})
+										return
+									}
+								}
+
 								arr.push(handleDateString(items.end_time))
 							}
 						}
diff --git a/src/modules/courses/coursesPublic/ShixunModal.js b/src/modules/courses/coursesPublic/ShixunModal.js
index 5c1720ac..ce03994e 100644
--- a/src/modules/courses/coursesPublic/ShixunModal.js
+++ b/src/modules/courses/coursesPublic/ShixunModal.js
@@ -1,199 +1,196 @@
-import React,{ Component } from "react";
-import { Modal,Checkbox,Select,Input,Tooltip,Spin,Icon} from "antd";
-import axios from'axios';
-// import Loading from '@icedesign/base/lib/loading';
-// import '@icedesign/base/lib/loading/style.js';
-
+import React, { Component } from "react";
+import { Modal, Checkbox, Select, Input, Tooltip, Spin, Icon } from "antd";
+import axios from 'axios';
 const Option = Select.Option;
 const Search = Input.Search;
 
-class ShixunModal extends Component{
-  constructor(props){
+class ShixunModal extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      Searchvalue:undefined,
-      type:'all',
-      category_id:0,
-      page:1,
-			shixunmodallist:undefined,
-			hometypepvisible:false,
-			newshixunmodallist:undefined,
+    this.state = {
+      Searchvalue: undefined,
+      type: 'all',
+      category_id: 0,
+      page: 1,
+      shixunmodallist: undefined,
+      hometypepvisible: false,
+      newshixunmodallist: undefined,
     }
   }
   componentDidMount() {
-		this.setState({
-			hometypepvisible:true,
-		})
-		let coursesId=this.props.match.params.coursesId;
-		let url = this.props.shixunsUrl || "/courses/"+coursesId+"/homework_commons/shixuns.json";
+    this.setState({
+      hometypepvisible: true,
+    })
+    let coursesId = this.props.match.params.coursesId;
+    let url = this.props.shixunsUrl || "/courses/" + coursesId + "/homework_commons/shixuns.json";
 
-		axios.get(url).then((result)=>{
-			if(result.status===200){
-				if(result.data.message===undefined){
-					this.setState({
-						shixunmodallist:result.data,
-						hometypepvisible:false,
-						newshixunmodallist:result.data.shixun_list,
-					})
-				}
-			}
-		}).catch((error)=>{
-			console.log(error);
-		})
+    axios.get(url).then((result) => {
+      if (result.status === 200) {
+        if (result.data.message === undefined) {
+          this.setState({
+            shixunmodallist: result.data,
+            hometypepvisible: false,
+            newshixunmodallist: result.data.shixun_list,
+          })
+        }
+      }
+    }).catch((error) => {
+      console.log(error);
+    })
   }
-	setupdatalist=(search,type,loading,page)=>{
-		let{newshixunmodallist}=this.state;
-		let newshixunmodallists=[]
-		if(page>1){
-			newshixunmodallists=newshixunmodallist;
-		}
-		this.setState({
-			hometypepvisible:loading
-		})
-		let coursesId=this.props.match.params.coursesId;
-		let url = this.props.shixunsUrl || "/courses/"+coursesId+"/homework_commons/shixuns.json";
+  setupdatalist = (search, type, loading, page) => {
+    let { newshixunmodallist } = this.state;
+    let newshixunmodallists = []
+    if (page > 1) {
+      newshixunmodallists = newshixunmodallist;
+    }
+    this.setState({
+      hometypepvisible: loading
+    })
+    let coursesId = this.props.match.params.coursesId;
+    let url = this.props.shixunsUrl || "/courses/" + coursesId + "/homework_commons/shixuns.json";
 
-		axios.get(url, {
-			params: {
-				search: search,
-				type:type,
-				page:page
-			}
-		}).then((result)=>{
-			if(result.status===200){
-				if(result.data.message===undefined){
-					let shixun_list = result.data.shixun_list;
-					for (var i = 0; i < shixun_list.length; i++) {
-						newshixunmodallists.push(shixun_list[i])
-					}
-					this.setState({
-						shixunmodallist: result.data,
-						newshixunmodallist: newshixunmodallists,
-						hometypepvisible: false,
-					  page: page
-					})
+    axios.get(url, {
+      params: {
+        search: search,
+        type: type,
+        page: page
+      }
+    }).then((result) => {
+      if (result.status === 200) {
+        if (result.data.message === undefined) {
+          let shixun_list = result.data.shixun_list;
+          for (var i = 0; i < shixun_list.length; i++) {
+            newshixunmodallists.push(shixun_list[i])
+          }
+          this.setState({
+            shixunmodallist: result.data,
+            newshixunmodallist: newshixunmodallists,
+            hometypepvisible: false,
+            page: page
+          })
 
-				}
-			}
+        }
+      }
 
-		}).catch((error)=>{
-			console.log(error);
-		})
-	}
+    }).catch((error) => {
+      console.log(error);
+    })
+  }
 
   //勾选实训
-  shixunhomeworkedit=(list)=>{
-    let newpatheditarry=[];
+  shixunhomeworkedit = (list) => {
+    let newpatheditarry = [];
     if (this.props.singleChoose == true) {
       if (list.length > 0) {
         newpatheditarry.push(list[list.length - 1])
       }
     } else {
-      for(var i=0; i<list.length;i++){
+      for (var i = 0; i < list.length; i++) {
         newpatheditarry.push(list[i])
       }
     }
-    
+
     // this.setState({
     //   patheditarry:newpatheditarry
     // })
     this.props.funpatheditarry(newpatheditarry)
   }
 
-  contentViewScrolledit=(e)=>{
-  const {shixunmodallist}=this.state;
+  contentViewScrolledit = (e) => {
+    const { shixunmodallist } = this.state;
     //滑动到底判断
-		let newscrollTop=parseInt(e.currentTarget.scrollTop);
-		let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
+    let newscrollTop = parseInt(e.currentTarget.scrollTop);
+    let allclientHeight = e.currentTarget.clientHeight + newscrollTop;
 
-		if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1) {
+    if (e.currentTarget.scrollHeight - allclientHeight === 0 || e.currentTarget.scrollHeight - allclientHeight === 1 || e.currentTarget.scrollHeight - allclientHeight === -1) {
 
-			if (shixunmodallist.shixun_list.length === 0) {
-				return;
-			} else {
-				let {Searchvalue, type, page} = this.state;
-				let newpage = page + 1
-				this.setupdatalist(Searchvalue, type, true, newpage)
-			}
-		}
+      if (shixunmodallist.shixun_list.length === 0) {
+        return;
+      } else {
+        let { Searchvalue, type, page } = this.state;
+        let newpage = page + 1
+        this.setupdatalist(Searchvalue, type, true, newpage)
+      }
+    }
   }
 
   //搜索
-  SenttotheValue=(e)=>{
+  SenttotheValue = (e) => {
     this.setState({
-      Searchvalue:e.target.value
+      Searchvalue: e.target.value
     })
   }
-  SenttotheSearch=(value)=>{
-    let{type}=this.state;
+  SenttotheSearch = (value) => {
+    let { type } = this.state;
     this.setState({
-      page:1,
+      page: 1,
     })
-		this.props.funpatheditarry([])
-    this.setupdatalist(value,type,true,1)
+    this.props.funpatheditarry([])
+    this.setupdatalist(value, type, true, 1)
 
   }
 
   //tag
-  changeTag=(types)=>{
-    let {Searchvalue}=this.state;
+  changeTag = (types) => {
+    let { Searchvalue } = this.state;
     this.setState({
-      type:types,
-      page:1,
-			newshixunmodallist:undefined
+      type: types,
+      page: 1,
+      newshixunmodallist: undefined
     })
-		this.props.funpatheditarry([])
-    this.setupdatalist(Searchvalue,types,true,1)
+    this.props.funpatheditarry([])
+    this.setupdatalist(Searchvalue, types, true, 1)
 
   }
 
 
-  hidecouseShixunModal=()=>{
+  hidecouseShixunModal = () => {
     this.props.hidecouseShixunModal()
   }
 
-  savecouseShixunModal=()=>{
+  savecouseShixunModal = () => {
 
-  	this.setState({
-			hometypepvisible:true
-		})
-    let {coursesId,patheditarry,datas}=this.props;
+    this.setState({
+      hometypepvisible: true
+    })
+    let { coursesId, patheditarry, datas } = this.props;
 
-		if(patheditarry.length===0){
-			this.setState({
-				shixunmodelchke:true,
-				chekicmessage:"请先选择实训",
-				hometypepvisible:false
-			})
+    if (patheditarry.length === 0) {
+      this.setState({
+        shixunmodelchke: true,
+        chekicmessage: "请先选择实训",
+        hometypepvisible: false
+      })
 
-			return
-		}
+      return
+    }
 
     if (this.props.chooseShixun) {
       this.props.chooseShixun(patheditarry)
-			this.setState({
-				hometypepvisible:false
-			})
+      this.setState({
+        hometypepvisible: false
+      })
       return;
     }
 
-    let url="/courses/"+coursesId+"/homework_commons/create_shixun_homework.json";
+    let url = "/courses/" + coursesId + "/homework_commons/create_shixun_homework.json";
     axios.post(url, {
-      category_id:this.props.category_id===null||this.props.category_id===undefined?undefined:parseInt(this.props.category_id),
-      shixun_ids:patheditarry,
-      }
+      category_id: this.props.category_id === null || this.props.category_id === undefined ? undefined : parseInt(this.props.category_id),
+      shixun_ids: patheditarry,
+    }
     ).then((response) => {
-      if(response.data.status===-1){
+      if (response.data.status === -1) {
         // this.props.showNotification(response.data.message)
 
-      }else{
+      } else {
         // this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
-				this.props.homeworkupdatalists(this.props.Coursename,this.props.page,this.props.order);
+        this.props.homeworkupdatalists(this.props.Coursename, this.props.page, this.props.order);
         this.props.hidecouseShixunModal()
       }
       this.setState({
-				hometypepvisible:false
-			})
+        hometypepvisible: false
+      })
       // category_id: 3
       // homework_ids: (5) [9171, 9172, 9173, 9174, 9175]
     }).catch((error) => {
@@ -201,144 +198,144 @@ class ShixunModal extends Component{
     })
   }
 
-  selectCloseList=(value)=>{
+  selectCloseList = (value) => {
     this.setState({
-      category_id:value
+      category_id: value
     })
   }
-  render(){
-     let {Searchvalue,type,hometypepvisible,shixunmodallist,newshixunmodallist,}=this.state;
-     let {visible,patheditarry}=this.props;
+  render() {
+    let { Searchvalue, type, hometypepvisible, shixunmodallist, newshixunmodallist, } = this.state;
+    let { visible, patheditarry } = this.props;
     const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
-     // console.log(patheditarry)
-    return(
+    // console.log(patheditarry)
+    return (
       <div>
 
-          <Modal
-            keyboard={false}
-            title="选择实训"
-            visible={visible}
-            closable={false}
-            footer={null}
-            width="840px"
-            destroyOnClose={true}
-          >
-            <style>
-              {
-                `
+        <Modal
+          keyboard={false}
+          title="选择实训"
+          visible={visible}
+          closable={false}
+          footer={null}
+          width="840px"
+          destroyOnClose={true}
+        >
+          <style>
+            {
+              `
                 .ant-spin-lg .ant-spin-dot {
                    font-size: 32px !important;
                   }
                 `
-              }
-            </style>
-            <Spin indicator={antIcon} spinning={hometypepvisible}  className="newnext-loading" color='#4AC7FF'  size="large">
+            }
+          </style>
+          <Spin indicator={antIcon} spinning={hometypepvisible} className="newnext-loading" color='#4AC7FF' size="large">
             {/*<Spin shape="dot-circle" >*/}
-              {/*{*/}
-                {/*shixunmodallist === undefined ? "":shixunmodallist.homework_category.length>0?<div>*/}
+            {/*{*/}
+            {/*shixunmodallist === undefined ? "":shixunmodallist.homework_category.length>0?<div>*/}
 
-                {/*<div className={"fl"}>选择目录名称：</div>*/}
-                {/*<div className="fl mb20">*/}
-              {/*<Select*/}
-                    {/*placeholder="请选择您要发送的课堂"*/}
-                    {/*value={isNaN(parseInt(category_id))?"":parseInt(category_id)}*/}
-                    {/*style={{"width":"660px","marginTop": "-7px"}}*/}
-                    {/*onSelect={this.selectCloseList}*/}
-                    {/*// onMouseEnter={this.openList}*/}
-                    {/*defaultOpen={false}*/}
-                    {/*// open={openSearch}*/}
-                    {/*optionLabelProp="name"*/}
-                  {/*>*/}
-                    {/*{ shixunmodallist.main_category.map((item,key)=>{*/}
-                        {/*return(*/}
-                          {/*<Option key={key} value={item.main_category_id} name={item.main_category_name}>{item.main_category_name}</Option>*/}
-                        {/*)*/}
-                      {/*})*/}
-                    {/*}*/}
+            {/*<div className={"fl"}>选择目录名称：</div>*/}
+            {/*<div className="fl mb20">*/}
+            {/*<Select*/}
+            {/*placeholder="请选择您要发送的课堂"*/}
+            {/*value={isNaN(parseInt(category_id))?"":parseInt(category_id)}*/}
+            {/*style={{"width":"660px","marginTop": "-7px"}}*/}
+            {/*onSelect={this.selectCloseList}*/}
+            {/*// onMouseEnter={this.openList}*/}
+            {/*defaultOpen={false}*/}
+            {/*// open={openSearch}*/}
+            {/*optionLabelProp="name"*/}
+            {/*>*/}
+            {/*{ shixunmodallist.main_category.map((item,key)=>{*/}
+            {/*return(*/}
+            {/*<Option key={key} value={item.main_category_id} name={item.main_category_name}>{item.main_category_name}</Option>*/}
+            {/*)*/}
+            {/*})*/}
+            {/*}*/}
 
-                    {/*{*/}
-                        {/*shixunmodallist.homework_category.map((item,key)=>{*/}
-                        {/*return(*/}
-                          {/*<Option key={key} value={item.category_id} name={item.category_name}>{item.category_name}</Option>*/}
-                        {/*)*/}
-                      {/*})*/}
-                    {/*}*/}
+            {/*{*/}
+            {/*shixunmodallist.homework_category.map((item,key)=>{*/}
+            {/*return(*/}
+            {/*<Option key={key} value={item.category_id} name={item.category_name}>{item.category_name}</Option>*/}
+            {/*)*/}
+            {/*})*/}
+            {/*}*/}
 
-                  {/*</Select>*/}
-                {/*</div>*/}
+            {/*</Select>*/}
+            {/*</div>*/}
 
-              {/*</div>:""}*/}
+            {/*</div>:""}*/}
 
-              <div className="newupload_conbox">
-                <style>
-                  {
-                    `
+            <div className="newupload_conbox">
+              <style>
+                {
+                  `
                     #shixun_tab_div{
                        max-height: 65px;
                     }
                     `
-                  }
-                </style>
-                <div className="clearfix mb10 shixun_work_div newshixun_tab_div cdefault" id="shixun_tab_div">
+                }
+              </style>
+              <div className="clearfix mb10 shixun_work_div newshixun_tab_div cdefault" id="shixun_tab_div">
 
-                  <li className="fl mr5 mt5">
-                    <a onClick={()=>this.changeTag("all")} className={ type==="all" ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a>
-                  </li>
+                <li className="fl mr5 mt5">
+                  <a onClick={() => this.changeTag("all")} className={type === "all" ? "active edu-filter-cir-grey font-12" : "edu-filter-cir-grey font-12"}>全部</a>
+                </li>
 
-                  {
-                    shixunmodallist && shixunmodallist.tags.map((item,key)=>{
-                      return(
-                        <li className="fl mr5 mt5" key={key}>
-                          <a onClick={()=>this.changeTag(item.tag_id)} className={ parseInt(type) === parseInt(item.tag_id) ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>{item.tag_name}</a>
-                        </li>
-                      )
-                    })
-                  }
-
-                </div>
-                <div className="clearfix mb10" id="shixun_search_form_div" style={{height:"30px"}}>
-                      <span className="fl color-grey-9 font-16 mt3">
-                        <span>共</span>
-                        <span className="color-orange-tip">{shixunmodallist === undefined ? "":shixunmodallist.shixuns_count}</span>
-                        <span>个实训</span>
-                      </span>
-                  <div className="fr search-new">
-                    <Search
-                      placeholder="请输入创建者或者实训名称进行搜索"
-                      value={Searchvalue}
-                      onInput={this.SenttotheValue}
-                      onSearch={(value) => this.SenttotheSearch(value)}
-                      style={{width: '115%'}}
-                    />
-                  </div>
-                </div>
                 {
-                  <style>
-                    {
-                      `.paddingleft22{
+                  shixunmodallist && shixunmodallist.tags.map((item, key) => {
+                    return (
+                      <li className="fl mr5 mt5" key={key}>
+                        <a onClick={() => this.changeTag(item.tag_id)} className={parseInt(type) === parseInt(item.tag_id) ? "active edu-filter-cir-grey font-12" : "edu-filter-cir-grey font-12"}>{item.tag_name}</a>
+                      </li>
+                    )
+                  })
+                }
+
+              </div>
+              <div className="clearfix mb10" id="shixun_search_form_div" style={{ height: "30px" }}>
+                <span className="fl color-grey-9 font-16 mt3">
+                  <span>共</span>
+                  <span className="color-orange-tip">{shixunmodallist === undefined ? "" : shixunmodallist.shixuns_count}</span>
+                  <span>个实训</span>
+                </span>
+                <div className="fr search-new">
+                  <Search
+                    placeholder="请输入创建者或者实训名称进行搜索"
+                    value={Searchvalue}
+                    onInput={this.SenttotheValue}
+                    onSearch={(value) => this.SenttotheSearch(value)}
+                    style={{ width: '115%' }}
+                  />
+                </div>
+              </div>
+              {
+                <style>
+                  {
+                    `.paddingleft22{
                          text-align: left;
                           padding-left: 23px;
                       }
                       `
-                    }
-                  </style>
-                }
-                <ul className="clearfix greybackHead edu-txt-center">
-                  <li className="fl with40 paddingleft22" >实训名称</li>
-                  <li className="fl with25 edu-txt-left">院校</li>
-                  <li className="fl with11">学习人数</li>
-                  <li className="fl with11">难度</li>
-                  <li className="fl with11"></li>
-                </ul>
+                  }
+                </style>
+              }
+              <ul className="clearfix greybackHead edu-txt-center">
+                <li className="fl with40 paddingleft22" >实训名称</li>
+                <li className="fl with25 edu-txt-left">院校</li>
+                <li className="fl with11">学习人数</li>
+                <li className="fl with11">难度</li>
+                <li className="fl with11"></li>
+              </ul>
 
 
 
-                <div className="over210 pl20 pr20"
-                     onScroll={this.contentViewScrolledit}
-                    >
-                  <style>
-                    {
-                      `
+              <div className="over210 pl20 pr20"
+                onScroll={this.contentViewScrolledit}
+              >
+                <style>
+                  {
+                    `
                       .next-loading{
 													width: 100%;
 													height: 230px;
@@ -355,52 +352,52 @@ class ShixunModal extends Component{
                             padding-left: 12px;
                         }
                       `
-                    }
-                  </style>
-                  {/*<Loading visible={hometypepvisible} shape="dot-circle" className="newnext-loading" color='#4AC7FF'>*/}
-                    <Checkbox.Group style={{ width: '100%' }} value={patheditarry}  onChange={this.shixunhomeworkedit}>
-                      {
-                        newshixunmodallist === undefined ? "":newshixunmodallist.length===0?
-													<div className="alltask edu-back-white">
-														<div className="edu-tab-con-box clearfix edu-txt-center">
-															<img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />
-															<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
-													</div>:newshixunmodallist.map((item,key)=>{
-                          return(
-                            <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
-                              <li className="fl with40 edu-txt-left task-hide paddingl5 newtaskhide">
-                                <Checkbox
-                                  id={"shixun_input_"+item.shixun_id}
-																	value={item.shixun_id}
-																	key={item.shixun_id}
-                                  className=" task-hide edu-txt-left newtaskhide"
-                                  style={{"width":"280px"}}
-                                  name="shixun_homework[]"
-                                >
-                                  <span style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name">{item.shixun_name}</span>
-                                </Checkbox>
-                              </li>
-                              <li className="fl with25 edu-txt-left task-hide paddingl5">{item.school}</li>
-                              <li className="fl with11 paddingl10">{item.myshixuns_count}</li>
-                              <li className="fl with11 color-orange-tip paddingl10 pl12">{item.level}</li>
-                              <Tooltip title="新窗口查看详情">
-                              <li className="fl with11"><a className="color-blue" href={"/shixuns/"+item.identifier+"/challenges"} target="_blank">详情</a></li>
-                              </Tooltip>
-                            </div>
-                          )
-                        })
-                      }
-                    </Checkbox.Group>
-                  {/*</Loading>*/}
-                </div>
+                  }
+                </style>
+                {/*<Loading visible={hometypepvisible} shape="dot-circle" className="newnext-loading" color='#4AC7FF'>*/}
+                <Checkbox.Group style={{ width: '100%' }} value={patheditarry} onChange={this.shixunhomeworkedit}>
+                  {
+                    newshixunmodallist === undefined ? "" : newshixunmodallist.length === 0 ?
+                      <div className="alltask edu-back-white">
+                        <div className="edu-tab-con-box clearfix edu-txt-center">
+                          <img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />
+                          <p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
+                      </div> : newshixunmodallist.map((item, key) => {
+                        return (
+                          <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
+                            <li className="fl with40 edu-txt-left task-hide paddingl5 newtaskhide">
+                              <Checkbox
+                                id={"shixun_input_" + item.shixun_id}
+                                value={item.shixun_id}
+                                key={item.shixun_id}
+                                className=" task-hide edu-txt-left newtaskhide"
+                                style={{ "width": "280px" }}
+                                name="shixun_homework[]"
+                              >
+                                <span style={{ "textAlign": "left", "color": "#05101A" }} className="task-hide color-grey-name">{item.shixun_name}</span>
+                              </Checkbox>
+                            </li>
+                            <li className="fl with25 edu-txt-left task-hide paddingl5">{item.school}</li>
+                            <li className="fl with11 paddingl10">{item.myshixuns_count}</li>
+                            <li className="fl with11 color-orange-tip paddingl10 pl12">{item.level}</li>
+                            <Tooltip title="新窗口查看详情">
+                              <li className="fl with11"><a className="color-blue" href={"/shixuns/" + item.identifier + "/challenges"} target="_blank">详情</a></li>
+                            </Tooltip>
+                          </div>
+                        )
+                      })
+                  }
+                </Checkbox.Group>
+                {/*</Loading>*/}
               </div>
-          </Spin>
-            <span className={this.state.shixunmodelchke===true?"color-red":"none"}>{this.state.chekicmessage}</span>
-            <div className="mt20 marginauto clearfix edu-txt-center">
-              <a className="pop_close task-btn mr30 margin-tp26" onClick={this.hidecouseShixunModal}>取消</a>
-              <a className="task-btn task-btn-orange margin-tp26" id="submit_send_shixun" onClick={this.savecouseShixunModal}>确定</a>
             </div>
-          </Modal>
+          </Spin>
+          <span className={this.state.shixunmodelchke === true ? "color-red" : "none"}>{this.state.chekicmessage}</span>
+          <div className="mt20 marginauto clearfix edu-txt-center">
+            <a className="pop_close task-btn mr30 margin-tp26" onClick={this.hidecouseShixunModal}>取消</a>
+            <a className="task-btn task-btn-orange margin-tp26" id="submit_send_shixun" onClick={this.savecouseShixunModal}>确定</a>
+          </div>
+        </Modal>
       </div>
     )
   }
diff --git a/src/modules/courses/coursesPublic/Startshixuntask.js b/src/modules/courses/coursesPublic/Startshixuntask.js
index e983f332..1ba2b146 100644
--- a/src/modules/courses/coursesPublic/Startshixuntask.js
+++ b/src/modules/courses/coursesPublic/Startshixuntask.js
@@ -1,17 +1,17 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 import { WordsBtn, getTaskUrlById } from 'educoder';
-import {Tooltip,message,Modal,Spin} from 'antd';
-import {Link} from 'react-router-dom';
+import { Tooltip, message, Modal, Spin } from 'antd';
+import { Link } from 'react-router-dom';
 import axios from 'axios';
 import Modals from '../../modals/Modals';
 
 
-class Startshixuntask extends Component{
-	constructor(props){
+class Startshixuntask extends Component {
+	constructor(props) {
 		super(props);
 		this.state = {
-			startbtn:false,
-			isSpin:false,
+			startbtn: false,
+			isSpin: false,
 		}
 
 	}
@@ -20,83 +20,84 @@ class Startshixuntask extends Component{
 
 	}
 
-	taskoperationId=(list)=>{
+	taskoperationId = (list) => {
 		this.setState({
-			startbtn:true,
+			startbtn: true,
 		})
-		let url= list+".json";
+		let url = list + ".json";
 		axios.get(url).then((response) => {
 
-			if(response.status===200){
-				if(response.data.status===-2){
+			if (response.status === 200) {
+				if (response.data.status === -2) {
 
 					this.setState({
-						startbtn:false,
-						shixunsreplace:true,
-						hidestartshixunsreplacevalue:response.data.message+".json"
+						startbtn: false,
+						shixunsreplace: true,
+						hidestartshixunsreplacevalue: response.data.message + ".json"
 					})
-				}else if(response.data.status===-1){
+				} else if (response.data.status === -1) {
 					console.log(response)
-				}else if(response.data.status===-3){
+				} else if (response.data.status === -3) {
 					this.setState({
-						shixunsmessage:response.data.message,
-						startshixunCombattype:true,
-						startbtn:false
+						shixunsmessage: response.data.message,
+						startshixunCombattype: true,
+						startbtn: false
 					})
-				}else{
+				} else {
 					setTimeout(() => {
 						this.setState({
 							startbtn: false,
 						})
 					}, 1000)
 
-					if(response.data.status!=401&&response.data.status!=403){
-						window.open( `/tasks/${response.data.game_identifier}`)
+					if (response.data.status != 401 && response.data.status != 403) {
+						window.open(`/tasks/${response.data.game_identifier}`)
 					}
 
 				}
 			}
 		}).catch((error) => {
 			this.setState({
-				startbtn:false
+				startbtn: false
 			})
 		});
 
 	}
 
-	hidestartshixunsreplace=(url)=>{
+	hidestartshixunsreplace = (url) => {
 		this.setState({
-			isSpin:true
+			isSpin: true
 		})
 		axios.get(url).then((response) => {
-			if(response.status===200){
+			if (response.status === 200) {
 
 				this.setState({
-					shixunsreplace:false,
-					isSpin:false,
+					shixunsreplace: false,
+					isSpin: false,
 				})
 				message.success('重置成功，正在进入实训！');
-				let path="/shixuns/"+response.data.shixun_identifier+"/challenges";
+				let path = "/shixuns/" + response.data.shixun_identifier + "/challenges";
 				this.props.history.push(path);
 
-			}}
+			}
+		}
 		).catch((error) => {
 			this.setState({
-				startbtn:false,
-				shixunsreplace:false,
-				isSpin:false,
+				startbtn: false,
+				shixunsreplace: false,
+				isSpin: false,
 			})
 		});
 
 	}
 
-	hidestartshixunCombattype=()=>{
+	hidestartshixunCombattype = () => {
 		this.setState({
-			startshixunCombattype:false
+			startshixunCombattype: false
 		})
 	}
 
-	render(){
+	render() {
 		let {
 			Modalstype,
 			Modalstopval,
@@ -112,8 +113,8 @@ class Startshixuntask extends Component{
 			isSpin
 		} = this.state;
 
-		return(
-			  <a className="fr color-blue font-16" >
+		return (
+			<a className="fr color-blue font-16" >
 				<Modals
 					modalsType={Modalstype}
 					modalsTopval={Modalstopval}
@@ -132,14 +133,14 @@ class Startshixuntask extends Component{
 					keyboard={false}
 				>
 					<Spin size="large" spinning={isSpin}>
-					<div className="task-popup-content">
-						<p className="task-popup-text-center font-16 pb20">实训已经更新了，正在为您重置!</p>
-					</div>
-					<div className="task-popup-submit clearfix">
-						<a className="task-btn task-btn-orange fr mr51"
-						   onClick={() => this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了</a>
-					</div>
-				</Spin>
+						<div className="task-popup-content">
+							<p className="task-popup-text-center font-16 pb20">实训已经更新了，正在为您重置!</p>
+						</div>
+						<div className="task-popup-submit clearfix">
+							<a className="task-btn task-btn-orange fr mr51"
+								onClick={() => this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了</a>
+						</div>
+					</Spin>
 				</Modal>
 				<Modal
 					title="提示"
@@ -159,32 +160,32 @@ class Startshixuntask extends Component{
 					{/*<a onClick={this.hidestartshixunCombattype}>知道了</a>*/}
 					{/*</p>*/}
 				</Modal>
-					<style>{`
+				<style>{`
 						a.startShixunTask_continueShixun {
 							padding: 0;
 							color: #4CACFF !important;
 							font-size: 16px;
 						}
 					`}</style>
-					{/* 如果是继续实战和查看实战，实训作业这边，后台会直接返回identity，直接写成a标签 */}
-					{this.props.isStudent?
-						<span>
-							{this.props.data&&this.props.data.task_operation&&this.props.data.task_operation?startbtn===false
-									? 
-								((this.props.data && this.props.data.task_operation[1] && this.props.data.task_operation[1].indexOf('/') == -1) ?
+				{/* 如果是继续实战和查看实战，实训作业这边，后台会直接返回identity，直接写成a标签 */}
+				{this.props.isStudent ?
+					<span>
+						{this.props.data && this.props.data.task_operation && this.props.data.task_operation ? startbtn === false
+							?
+							((this.props.data && this.props.data.task_operation[1] && this.props.data.task_operation[1].indexOf('/') == -1) ?
 								<span>
 									<a href={getTaskUrlById(this.props.data.task_operation[1])}
-										class="startShixunTask_continueShixun"
+										className="startShixunTask_continueShixun"
 									>{this.props.data.task_operation[0]}</a>
 								</span>
 								:
-								<span onClick={()=>this.taskoperationId(	this.props.data&&this.props.data.task_operation[1])}>
-									{this.props.data&&this.props.data.task_operation[0]}
+								<span onClick={() => this.taskoperationId(this.props.data && this.props.data.task_operation[1])}>
+									{this.props.data && this.props.data.task_operation[0]}
 								</span>)
-								:"开启中":""}
-						</span>
-						:""
-					}
+							: "开启中" : ""}
+					</span>
+					: ""
+				}
 
 			</a>
 		)
diff --git a/src/modules/courses/coursesPublic/sendResource.js b/src/modules/courses/coursesPublic/sendResource.js
index d813b8e6..43fa2ce5 100644
--- a/src/modules/courses/coursesPublic/sendResource.js
+++ b/src/modules/courses/coursesPublic/sendResource.js
@@ -70,6 +70,8 @@ class Sendresource extends Component{
 	}
 	// 附件相关 START
 	handleChange = (info) => {
+		console.log(info)
+
 		if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
 			let fileList = info.fileList;
 			if (info.file.status != "removed") {
diff --git a/src/modules/courses/coursesPublic/sendResources.js b/src/modules/courses/coursesPublic/sendResources.js
new file mode 100644
index 00000000..50c08bf6
--- /dev/null
+++ b/src/modules/courses/coursesPublic/sendResources.js
@@ -0,0 +1,595 @@
+import React,{ Component } from "react";
+import { Modal,Checkbox,Upload,Button,Icon,message,DatePicker,Select,Tooltip,Radio,Input} from "antd";
+import axios from 'axios';
+import Modals from '../../modals/Modals';
+import {getUploadActionUrl,handleDateString,appendFileSizeToUploadFileAll} from 'educoder';
+import locale from 'antd/lib/date-picker/locale/zh_CN';
+import moment from 'moment';
+const CheckboxGroup = Checkbox.Group;
+const Option = Select.Option;
+function range(start, end) {
+	const result = [];
+	for (let i = start; i < end; i++) {
+		result.push(i);
+	}
+	return result;
+}
+function disabledDateTime() {
+	return {
+		// disabledHours: () => range(0, 24).splice(4, 20),
+		disabledMinutes: () => range(1, 30).concat(range(31, 60)),
+		// disabledSeconds: () => [0, 60],
+	};
+}
+
+function disabledDate(current) {
+	return current && current < moment().endOf('day').subtract(1, 'days');
+}
+
+
+const dateFormat="YYYY-MM-DD HH:mm";
+class sendResources extends Component{
+	constructor(props){
+		super(props);
+		this.state={
+			group_ids:[],
+			fileList:[],
+			Modalstype:false,
+			Modalstopval:"",
+			ModalCancel:"",
+			ModalSave:"",
+			fileListtype:false,
+			loadtype:false,
+			is_public:false,
+			datatime:undefined,
+			resourcesname:"",
+			resourceurl:"",
+			addonAfteronelens3:0,
+			// moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
+			course_group_publish_times:[
+				{
+					course_group_id : undefined,
+					publish_time :""
+				}],
+			course_groups:undefined,
+			course_groups_count:undefined,
+			Radiovalue:0,
+			Radiovaluetype:false,
+			resourceurlbool:false,
+			resourcesnamebool:false,
+		}
+	}
+
+
+	componentDidMount() {
+		let {discussMessageid} =this.props;
+		try {
+			this.setState({
+				resourcesname:this.props.title,
+				resourceurl:this.props.link,
+				addonAfteronelens3:this.props.title.length,
+			})
+		}catch (e) {
+
+		}
+		console.log(discussMessageid);
+		try {
+			if(discussMessageid){
+				this.getalldata();
+			}
+		}catch (e) {
+
+		}
+
+
+	}
+
+	getalldata=()=>{
+		let {discussMessageid} =this.props;
+		let course_id=this.props.course_id;
+		let url="/files/"+discussMessageid+".json";
+		axios.get(url, {
+				params:{
+					course_id:course_id,
+				}
+			})
+			.then((response) => {
+				if(response.status===200){
+					this.setState({
+						datalist:response.data,
+						description: response.data.description,
+						is_public:response.data.is_public,
+						datatime:response.data.publish_time,
+						Radiovalue:response.data.delay_publish==false?0:1,
+						//attachment_histories:response.data.attachment_histories
+					})
+
+				}
+			})
+			.catch(function (error) {
+				console.log(error);
+			});
+
+	}
+	//勾选实训
+	shixunhomeworkedit=(list)=>{
+
+		this.setState({
+			group_ids:list
+		})
+
+	}
+	// 附件相关 START
+	handleChange = (info) => {
+		console.log(info)
+
+		if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+			let fileList = info.fileList;
+			if (info.file.status != "removed") {
+				this.setState({
+					fileList: appendFileSizeToUploadFileAll(fileList),
+					fileListtype: true
+				});
+			} else {
+				this.setState({
+					fileList: appendFileSizeToUploadFileAll(fileList),
+				});
+			}
+		}
+	}
+
+	onAttachmentRemove = (file) => {
+		if(!file.percent || file.percent == 100){
+			const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+			axios.delete(url, {
+				})
+				.then((response) => {
+					if (response.data) {
+						const { status } = response.data;
+						if (status == 0) {
+							this.setState({
+								fileListtype:false,
+								fileList:[]
+							})
+						}
+
+					}
+				})
+				.catch(function (error) {
+					console.log(error);
+				});
+			this.setState({
+				fileListtype:false,
+			})
+		}else{
+			this.setState({
+				fileListtype:false,
+				fileList:[]
+			})
+		}
+	}
+
+	ModalCancelModalCancel=()=>{
+		this.setState({
+			Modalstype:false,
+			Modalstopval:"",
+			ModalSave:this.ModalCancelModalCancel,
+			loadtype:false
+		})
+		this.props.Cancel()
+	}
+	Saves=()=>{
+
+
+		let {resourcesname,resourceurl,description,is_public,datatime,Radiovalue} =this.state;
+		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
+
+		if (!reg.test(resourcesname)) {
+			this.setState({
+				resourcesnamebool:true
+			})
+			return;
+		}
+		if (!reg.test(resourceurl)) {
+			this.setState({
+				resourceurlbool:true
+			})
+			return;
+		}
+
+
+
+		if(this.state.Radiovalue===1){
+			if(datatime===undefined||datatime===null||datatime=== ""){
+				this.setState({
+					Radiovaluetype:true
+				})
+				return
+			}else{
+				this.setState({
+					Radiovaluetype:false
+				})
+			}
+		}
+
+
+		// console.log("description");
+		// console.log(description);
+		if(description===undefined||description===null){
+
+		}else {
+			if(description.length>100){
+
+				this.setState({
+					descriptiontype:true
+				})
+				return
+			}
+
+
+		}
+
+
+
+
+		if(this.props.Exterchainname==="资源设置"){
+			//设置
+			let coursesId=this.props.match.params.coursesId;
+			let attachmentId=this.props.attachmentId;
+			let url="/files/"+this.props.discussMessageid+".json";
+
+			axios.put(url,{
+				name:resourcesname,
+				link:resourceurl,
+				course_id:coursesId,
+				course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
+				is_public:is_public,
+				publish_time:Radiovalue===1?datatime===undefined? undefined:datatime:undefined,
+				description:description,
+				delay_publish:Radiovalue,
+			}).then((result)=>{
+				if(result){
+					if(result.data){
+						if(result.data.status===0){
+							this.ModalCancelModalCancel();
+							this.props.updataleftNavfun();
+							this.props.showNotification("设置资源成功");
+							this.props.setupdate(1,false)
+						}else{
+							this.props.showNotification(result.data.message);
+						}
+					}
+				}
+			})
+
+		}else{
+			let coursesId=this.props.match.params.coursesId;
+			let attachmentId=this.props.attachmentId;
+			let url="/files/upload.json";
+
+
+			axios.post(url,{
+				name:resourcesname,
+				link:resourceurl,
+				course_id:coursesId,
+				course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
+				is_public:is_public,
+				publish_time:Radiovalue===1?datatime===undefined? undefined:datatime:undefined,
+				description:description,
+				delay_publish:Radiovalue,
+			}).then((result)=>{
+				if(result){
+					if(result.data){
+						if(result.data.status===0){
+							this.ModalCancelModalCancel();
+							this.props.updataleftNavfun();
+							this.props.showNotification("上传资源成功");
+							this.props.setupdate(1,false)
+						}else{
+							this.props.showNotification(result.data.message);
+						}
+					}
+				}
+			})
+		}
+	}
+
+	settextarea=(e)=>{
+		this.setState({
+			description:e.target.value
+		})
+	}
+
+	onChangepublic=(e)=>{
+
+		this.setState({
+			is_public:e.target.checked
+		})
+
+	}
+
+	onChangeTimepublish= (date, dateString,key,type) => {
+		if(type===1){
+			this.setState({
+				datatime:handleDateString(dateString),
+			})
+		}else if(type===2){
+			let {course_group_publish_times}=this.state;
+			let newgroup_publish=course_group_publish_times;
+			for(var i=0; i<newgroup_publish.length; i++){
+				if(i===parseInt(key)){
+					newgroup_publish[i].publish_time=handleDateString(dateString);
+				}
+			}
+			this.setState({
+				course_group_publish_times:newgroup_publish,
+			})
+		}
+
+	}
+
+	RadioonChange=(e)=>{
+		if(e.target.value===0){
+			this.setState({
+				datatime:undefined
+			})
+		}
+		this.setState({
+			Radiovalue: e.target.value,
+		});
+	}
+
+	handleChanges=(e)=>{
+		let les=e.target.value.length;
+
+		if(e.target.value.length>=61){
+
+
+		}else{
+			this.setState({
+				resourcesname:e.target.value,
+				addonAfteronelens3:les,
+				resourcesnamebool:false,
+
+			})
+
+		}
+
+	}
+
+	handleChangess=(e)=>{
+		this.setState({
+			resourceurl:e.target.value,
+			resourceurlbool:false,
+		})
+	}
+
+
+
+	render(){
+		let { newfileListtype,descriptiontype,
+			is_public,
+			datatime,
+			resourcesname,
+			resourceurl,
+			addonAfteronelens3,
+			resourceurlbool,
+			resourcesnamebool,
+		}=this.state;
+
+		const uploadProps = {
+			width: 600,
+			// showUploadList:false,
+			action: `${getUploadActionUrl()}`,
+			onChange: this.handleChange,
+			onRemove: this.onAttachmentRemove,
+			beforeUpload: (file) => {
+				// console.log('beforeUpload', file.name);
+				const isLt150M = file.size / 1024 / 1024 < 150;
+				if (!isLt150M) {
+					this.props.showNotification('文件大小必须小于150MB!');
+				}
+				return isLt150M;
+			},
+		};
+		const radioStyle = {
+			display: 'block',
+			height: '30px',
+			lineHeight: '30px',
+		};
+
+
+
+		return(
+			<div>
+				{/*提示*/}
+				<Modals
+					modalsType={this.state.Modalstype}
+					modalsTopval={this.state.Modalstopval}
+					modalCancel={this.state.ModalCancel}
+					modalSave={this.state.ModalSave}
+					loadtype= {this.state.loadtype}
+
+				/>
+
+				<Modal
+					keyboard={false}
+					className={"HomeworkModal"}
+					title={this.props.modalname}
+					visible={this.props.visible}
+					closable={false}
+					footer={null}
+					destroyOnClose={true}
+				>
+					<div className="task-popup-content">
+						<p className="task-popup-text-center font-16">
+
+							<span className={"color-blue underline"}> </span>
+						</p>
+
+						<style>{`
+                .uploadBtn.ant-btn {
+                  border: none;
+                  color: #4CACFF;
+                  box-shadow: none;
+                  background: transparent;
+                  border:1px solid #4CACFF;
+                  padding-left: 6px;
+                  margin-right: 5px;
+                }
+                .ant-upload-list-item:hover .ant-upload-list-item-info{
+                  padding: 0 12px 0 0px;
+                  background-color:#fff;
+                }
+                .upload_1 .ant-upload-list {
+                  width: 350px;
+                }
+                .ant-upload-select{
+                  float: left;
+                }
+
+          			.winth540{
+          			    width: 540px;
+										height: 34px;
+								}
+								
+								 .winth540 .ant-input-group-wrapper{
+							    width: 86%  !important;
+
+								 }
+								 
+								 	 .flexoo  .ant-input{
+								 	 
+								 	  width: 86%  !important;
+
+								    }
+
+              `}</style>
+
+						<p className={"winth540"} style={{
+							width: '100%',
+							display: "flex",
+							flexDirection:"row",
+						}}>
+							<span className="color-ooo fl mt6">资源名称：</span>
+							<Input className="" placeholder="请输入资源名称，最大限制60字符"  value={resourcesname}  onChange={this.handleChanges} addonAfter={String(addonAfteronelens3)+"/60"}  maxLength={60} />
+
+
+						</p>
+						{
+							resourcesnamebool?
+								<p className=" color-red" style={{
+									marginLeft: "13%"
+								}}>请输入资源名称</p>
+								:
+								""
+						}
+						<p className={resourcesnamebool===true?"winth540 flexoo mt10":"winth540 flexoo mt16"} style={{
+							width: '100%',
+							display: "flex",
+							flexDirection:"row",
+
+						}}>
+							<span className="color-ooo fl mt6">链接地址：</span>
+							<Input className="" placeholder="请输入外链url"   value={resourceurl}   onChange={this.handleChangess}  />
+						</p>
+						{
+							resourceurlbool?
+								<p className=" color-red" style={{
+									marginLeft: "13%"
+								}}>请输入外链url</p>
+								:
+								""
+						}
+
+
+						<p className={this.state.fileListtype===true?"mt25":""}>
+							<style>{`
+                .ant-checkbox-wrapper{
+                  margin-left:0px !important;
+                  margin-top:10px;
+                }
+              `}</style>
+
+							{this.props.course_is_public===true?<div>
+								<span className={"color-ooo"}>公开：</span><Checkbox  checked={is_public} onChange={this.onChangepublic}>
+								<span className={"font-14 color-ooo"}>选中，所有用户可见，否则课堂成员可见</span>
+							</Checkbox>
+							</div>:""}
+
+							<style>{`
+                .Selectleft20{
+                   margin-left: 20px !important;
+                   width: 176px;
+                   height: 40px;
+                }
+               #startimes .ant-calendar-picker-icon{
+                  margin-top:-11px;
+                }
+                .resourcebox{
+                   max-height:150px;
+                    overflow: auto;
+                }
+              `}</style>
+						</p>
+
+
+						<div className={this.props.course_is_public===true?"mt10":""}>
+							<span className={"color-ooo fl mt6"}>发布设置：</span>
+							<Radio.Group onChange={this.RadioonChange} value={this.state.Radiovalue} style={{'width': '460px'}}>
+								<Radio style={radioStyle} value={0}>
+									立即发布
+								</Radio>
+								<Tooltip placement="bottom" title={this.props.isStudent()===true?"不支持学生延迟发布":""}>
+									<Radio style={radioStyle} value={1} className={"fl"} disabled={this.props.isStudent()}>
+										<span className={"mr5"}>延期发布</span>
+										<DatePicker
+
+											dropdownClassName="hideDisable"
+											showTime={{ format: 'HH:mm' }}
+											locale={locale}
+											format={dateFormat}
+											placeholder="请选择发布时间"
+											id={"startime"}
+											showToday={false}
+											width={"210px"}
+											value={this.state.Radiovalue===1?datatime===undefined||datatime===""?undefined:moment(datatime, dateFormat):undefined}
+											onChange={(e,index)=>this.onChangeTimepublish(e,index,undefined,1)}
+											disabledTime={disabledDateTime}
+											disabledDate={disabledDate}
+											disabled={this.state.Radiovalue===1?false:true}
+										/>
+									</Radio>
+								</Tooltip>
+								<span className={"fl mt5 color-grey-c"}>(按照设置的时间定时发布)</span>
+							</Radio.Group>
+						</div>
+						<div className="mt10" style={{
+							width: '100%',
+							display: "flex",
+							flexDirection:"row",
+						}}>
+							<span className="color-ooo fl mt6">资源描述：</span>
+							{/*{course_group_publish_timestype===true?<p className={"color-red mt10"}>请填写完整</p>:""}*/}
+							<textarea  placeholder="请在此输入资源描述，最大限制100个字符" className={"mt10"} value={this.state.description} onInput={this.settextarea} style={{
+								width: '86%',
+								height:'120px',
+								border:'1px solid rgba(234,234,234,1)',
+								padding: '10px'
+							}}></textarea>
+						</div>
+
+						{descriptiontype===true?<p className={"color-red"}>请输入资源描述，最大限制100个字符</p>:""}
+						{this.state.Radiovaluetype===true?<p className={"color-red"}>发布时间不能为空</p>:""}
+						<div className="clearfix mt30 edu-txt-center mb10">
+							<a  className="task-btn color-white mr70" onClick={this.props.Cancel}>{this.props.Cancelname}</a>
+							<a className="task-btn task-btn-orange" onClick={()=>this.Saves()}>{this.props.Savesname}</a>
+						</div>
+
+					</div>
+				</Modal>
+			</div>
+		)
+	}
+}
+export default sendResources;
diff --git a/src/modules/courses/coursmodel/authenmodels.css b/src/modules/courses/coursmodel/authenmodels.css
index 12aec72c..5df02d4c 100644
--- a/src/modules/courses/coursmodel/authenmodels.css
+++ b/src/modules/courses/coursmodel/authenmodels.css
@@ -1,86 +1,101 @@
-.w1200{
-    width:1062px;
-    height:177px;
-    background:rgba(255,255,255,1);
-    box-shadow:0px 6px 8px 0px rgba(0,0,0,0.03);
-    border-radius:2px;
+.w1200 {
+  width: 1062px;
+  height: 177px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 6px 8px 0px rgba(0, 0, 0, 0.03);
+  border-radius: 2px;
 }
-.w1200wuh{
-    width:1062px;
-    background:rgba(255,255,255,1);
-    box-shadow:0px 6px 8px 0px rgba(0,0,0,0.03);
-    border-radius:2px;
+
+.w1200wuh {
+  width: 1062px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 6px 8px 0px rgba(0, 0, 0, 0.03);
+  border-radius: 2px;
 }
-.w1200dbl{
-    width:1062px;
-    min-height:60px;
-    background:rgba(255,255,255,1);
-    box-shadow:0px 6px 8px 0px rgba(0,0,0,0.03);
-    border-radius:2px;
+
+.w1200dbl {
+  width: 1062px;
+  min-height: 60px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 6px 8px 0px rgba(0, 0, 0, 0.03);
+  border-radius: 2px;
 }
-.w1200fpx{
-    width:1200px;
-    background:rgba(255,255,255,1);
-    box-shadow:0px 6px 8px 0px rgba(0,0,0,0.03);
-    border-radius:2px;
+
+.w1200fpx {
+  width: 1200px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 6px 8px 0px rgba(0, 0, 0, 0.03);
+  border-radius: 2px;
 }
-.w1200mss{
-    width:1200px;
+
+.w1200mss {
+  width: 1200px;
 }
-.w1200ms{
-    width:1062px;
+
+.w1200ms {
+  width: 1062px;
 }
-.w1200s{
-    width:1062px;
-    background:rgba(255,255,255,1);
-    box-shadow:0px 6px 8px 0px rgba(0,0,0,0.03);
-    border-radius:2px;
+
+.w1200s {
+  width: 1062px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 6px 8px 0px rgba(0, 0, 0, 0.03);
+  border-radius: 2px;
 }
-.h177{
-    height: 177px;
+
+.h177 {
+  height: 177px;
 }
+
 /* 中间居中 */
-.intermediatecenter{
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
+.intermediatecenter {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
 }
+
 /* 简单居中 */
-.intermediatecenterysls{
-    display: flex;
-    align-items: center;
+.intermediatecenterysls {
+  display: flex;
+  align-items: center;
 }
-.spacearound{
-    display: flex;
-    justify-content: space-around;
+
+.spacearound {
+  display: flex;
+  justify-content: space-around;
 
 }
-.spacebetween{
-    display: flex;
-    justify-content: space-between;
+
+.spacebetween {
+  display: flex;
+  justify-content: space-between;
 }
+
 /* 头顶部居中 */
-.topcenter{
-    display: -webkit-flex;
-    flex-direction: column;
-    align-items: center;
+.topcenter {
+  display: -webkit-flex;
+  flex-direction: column;
+  align-items: center;
 
 }
 
 
 /* x轴正方向排序 */
 /* 一 二 三 四 五 六 七 八 */
-.sortinxdirection{
-    display: flex;
-    flex-direction:row;
+.sortinxdirection {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
 }
+
 /* x轴反方向排序 */
 /* 八    七   六  五   四  三  二 一 */
-.xaxisreverseorder{
-    display: flex;
-    flex-direction:row-reverse;
+.xaxisreverseorder {
+  display: flex;
+  flex-direction: row-reverse;
 }
+
 /* 垂直布局 正方向*/
 /* 一
  二
@@ -90,979 +105,1092 @@
  六
  七
  八 */
-.verticallayout{
-    display: flex;
-    flex-direction:column;
+.verticallayout {
+  display: flex;
+  flex-direction: column;
 }
+
 /* 垂直布局 反方向*/
-.reversedirection{
-    display: flex;
-    flex-direction:column-reverse;
-}
-.w100{
-    width: 100px;
-}
-.mt21{
-    margin-top: 21px;
-}
-.mt23{
-    margin-top: 23px;
-}
-.mt19{
-    margin-top: 19px;
-}
-.mt15{
-    margin-top: 10px;
-}
-.h40{
-    height: 40px;
+.reversedirection {
+  display: flex;
+  flex-direction: column-reverse;
 }
 
-.tophom{
-    padding-top: 33px;
-    padding-bottom: 40px;
-    padding-left: 26px;
-    padding-right: 26px;
-}
-.tophoms{
-    padding-top: 15px;
-    padding-left: 26px;
-    padding-right: 26px;
-}
-.tophomss{
-    padding-top: 15px;
-    padding-left: 15px;
-    padding-right: 15px;
-}
-.borderwd{
-    border: 1px solid #000000;
-}
-.borderwds{
-    width: 1020px !important;
-    background: #FFFFFF;
-    border: 1px solid #DDDDDD;
-    margin-left: 20px;
-    min-height:150px;
-}
-.borderwdswuh{
-    width: 1020px !important;
-    background: #FFFFFF;
-    border: 1px solid #DDDDDD;
-    min-height:150px;
+.w100 {
+  width: 100px;
 }
 
-.borderwdswuh:hover{
-    background: #F9F9F9;
-}
-.borderwds283{
-    width: 1020px !important;
-    min-height:283px;
-    background:#F9F9F9;
-    border:1px solid #DDDDDD;
-    margin-left: 20px;
-}
-.w64{
-    width: 64px;
-}
-.w70{
-    width: 70px !important;
+.mt21 {
+  margin-top: 21px;
 }
 
-.tophomsembold{
-    height:21px;
-    font-size:16px;
-    color:#333333;
-    line-height:21px;
+.mt23 {
+  margin-top: 23px;
 }
 
-.tophomsembolds{
-    width:42px;
-    height:19px;
-    font-size:14px;
-    font-family:MicrosoftYaHeiSemibold;
-    color:rgba(51,51,51,1);
-    line-height:31px;
+.mt19 {
+  margin-top: 19px;
 }
+
+.mt15 {
+  margin-top: 10px;
+}
+
+.h40 {
+  height: 40px;
+}
+
+.tophom {
+  padding-top: 33px;
+  padding-bottom: 40px;
+  padding-left: 26px;
+  padding-right: 26px;
+}
+
+.tophoms {
+  padding-top: 15px;
+  padding-left: 26px;
+  padding-right: 26px;
+}
+
+.tophomss {
+  padding-top: 15px;
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
+.borderwd {
+  border: 1px solid #000000;
+}
+
+.borderwds {
+  width: 1020px !important;
+  background: #FFFFFF;
+  border: 1px solid #DDDDDD;
+  margin-left: 20px;
+  min-height: 150px;
+}
+
+.borderwdswuh {
+  width: 1020px !important;
+  background: #FFFFFF;
+  border: 1px solid #DDDDDD;
+  min-height: 150px;
+}
+
+.borderwdswuh:hover {
+  background: #F9F9F9;
+}
+
+.borderwds283 {
+  width: 1020px !important;
+  min-height: 283px;
+  background: #F9F9F9;
+  border: 1px solid #DDDDDD;
+  margin-left: 20px;
+}
+
+.w64 {
+  width: 64px;
+}
+
+.w70 {
+  width: 70px !important;
+}
+
+.tophomsembold {
+  height: 21px;
+  font-size: 16px;
+  color: #333333;
+  line-height: 21px;
+}
+
+.tophomsembolds {
+  width: 42px;
+  height: 19px;
+  font-size: 14px;
+  font-family: MicrosoftYaHeiSemibold;
+  color: rgba(51, 51, 51, 1);
+  line-height: 31px;
+}
+
 /*Contentpart*/
-.contentparttit{
-    padding-top: 10px;
-    padding-left: 20px;
-    padding-right: 20px;
+.contentparttit {
+  padding-top: 10px;
+  padding-left: 20px;
+  padding-right: 20px;
 }
 
-.subjecttit{
-    width:28px;
-    height:19px;
-    font-size:14px;
-    color:rgba(51,51,51,1);
-    line-height: 42px;
-    cursor:pointer;
-
-}
-.ml55{
-    margin-right: 55px;
+.subjecttit {
+  width: 28px;
+  height: 19px;
+  font-size: 14px;
+  color: rgba(51, 51, 51, 1);
+  line-height: 42px;
+  cursor: pointer;
 
 }
 
-.lg{
-    line-height: 42px;
-}
-.ml7{
-    margin-left: 7px;
-}
-
-.icondowncolor{
-    color:#9E9E9E;
+.ml55 {
+  margin-right: 55px;
 
 }
-.icondowncolorss{
-    color: #9E9E9E;
-    position: absolute;
-    top: -20px;
-    right: -16px;
-}
-.icondowncolorssy{
-    position: absolute;
-    top: -15px;
-    right: -11px;
+
+.lg {
+  line-height: 42px;
 }
 
-.questiontype{
-    width: 100%;
-    font-size: 12px;
-    color: #333333;
-    line-height: 17px;
-    text-align: center;
-    padding: 11px;
-    cursor:pointer;
-
-}
-.questiontypes{
-    width:37px;
-    height:17px;
-    font-size:12px;
-    color:rgba(51,51,51,1);
-    line-height:17px;
-    cursor:pointer;
-
-}
-.questiontypeheng{
-    width:100%;
-    height:1px;
-    background: #EEEEEE;
-}
-.questiontype:hover{
-    color: #4CACFF;
-}
-.questiontype:active{
-    color: #4CACFF;
+.ml7 {
+  margin-left: 7px;
 }
 
-.w100s{
-    width:100%;
+.icondowncolor {
+  color: #9E9E9E;
+
 }
-.stestcen{
-    text-align: center;
+
+.icondowncolorss {
+  color: #9E9E9E;
+  position: absolute;
+  top: -20px;
+  right: -16px;
 }
-.w70s{
-    width:70%;
+
+.icondowncolorssy {
+  position: absolute;
+  top: -15px;
+  right: -11px;
 }
-.w30s{
-    width:30%;
+
+.questiontype {
+  width: 100%;
+  font-size: 12px;
+  color: #333333;
+  line-height: 17px;
+  text-align: center;
+  padding: 11px;
+  cursor: pointer;
+
+}
+
+.questiontypes {
+  width: 37px;
+  height: 17px;
+  font-size: 12px;
+  color: rgba(51, 51, 51, 1);
+  line-height: 17px;
+  cursor: pointer;
+
+}
+
+.questiontypeheng {
+  width: 100%;
+  height: 1px;
+  background: #EEEEEE;
+}
+
+.questiontype:hover {
+  color: #4CACFF;
+}
+
+.questiontype:active {
+  color: #4CACFF;
+}
+
+.w100s {
+  width: 100%;
+}
+
+.stestcen {
+  text-align: center;
+}
+
+.w70s {
+  width: 70%;
+}
+
+.w30s {
+  width: 30%;
 }
 
 
-.w50s{
-    width: 50%;
-}
-.testpaper{
-    font-size:12px;
-    color:#888888;
-    line-height:28px;
-    text-align: center;
+.w50s {
+  width: 50%;
 }
 
-.setequesbank{
-    font-size:14px;
-    color:#333333;
-    line-height:28px;
+.testpaper {
+  font-size: 12px;
+  color: #888888;
+  line-height: 28px;
+  text-align: center;
 }
 
-.Contentquestionbankstyle{
-    padding-left: 20px;
-    padding-right: 20px;
+.setequesbank {
+  font-size: 14px;
+  color: #333333;
+  line-height: 28px;
 }
 
-.pd20{
-    padding-top: 20px;
-    padding-bottom: 20px;
-    padding-left: 30px;
-    padding-right: 30px;
+.Contentquestionbankstyle {
+  padding-left: 20px;
+  padding-right: 20px;
+}
+
+.pd20 {
+  padding-top: 20px;
+  padding-bottom: 20px;
+  padding-left: 30px;
+  padding-right: 30px;
 }
 
 /*listjihe*/
-.listjihetixing{
-    height:17px;
-    font-size:12px;
-    color:#888888;
-    line-height:17px;
+.listjihetixing {
+  height: 17px;
+  font-size: 12px;
+  color: #888888;
+  line-height: 17px;
 }
 
-.listjihetixings{
-    color: #333333;
-    font-size: 12px;
-    line-height: 17px;
+.listjihetixings {
+  color: #333333;
+  font-size: 12px;
+  line-height: 17px;
 }
-.listjihetixingstit{
-    color: #333333;
-    font-size: 14px;
-    line-height: 17px;
+
+.listjihetixingstit {
+  color: #333333;
+  font-size: 14px;
+  line-height: 17px;
 
 }
 
 .listjihetixingstitsy {
-    color: #333333;
-    font-size: 14px;
-    line-height: 20px !important;
-    height: 25px !important;
+  color: #333333;
+  font-size: 14px;
+  line-height: 20px !important;
+  height: 25px !important;
 }
 
-.listjihetixingstits{
-    color: #333333;
-    font-size: 14px;
-    line-height:19px;
-    margin-top: 19px;
-}
-.listjihetixingstitsp{
-    color: #333333;
-    font-size: 14px;
-    line-height:19px;
-    margin-top: 10px;
-}
-.listjihetixingstitssy{
-    color: #333333;
-    font-size: 14px;
-    line-height:19px;
+.listjihetixingstits {
+  color: #333333;
+  font-size: 14px;
+  line-height: 19px;
+  margin-top: 19px;
 }
 
-.updatetimes{
-    color: #BBBBBB;
-    font-size: 12px;
-}
-.mt22{
-    margin-top: 22px;
-}
-.viewparsings{
-    color:#4CACFF;
-    font-size:12px;
-    line-height: 30px;
+.listjihetixingstitsp {
+  color: #333333;
+  font-size: 14px;
+  line-height: 19px;
+  margin-top: 10px;
 }
 
-.selection{
-    width:88px;
-    height:30px;
-    background:#33BD8C;
-    border-radius:4px;
-    text-align: center;
-    line-height: 30px;
-    color: #FFFFFF;
+.listjihetixingstitssy {
+  color: #333333;
+  font-size: 14px;
+  line-height: 19px;
 }
-.selectionys{
-    width:88px;
-    height:30px;
-    background:#CCCCCC;
-    border-radius:4px;
-    text-align: center;
-    line-height: 30px;
-    color: #FFFFFF;
+
+.updatetimes {
+  color: #BBBBBB;
+  font-size: 12px;
 }
-.selectionss{
-    width:88px;
-    height:30px;
-    background:#CCCCCC;
-    border-radius:4px;
-    text-align: center;
-    line-height: 30px;
-    color: #FFFFFF;
+
+.mt22 {
+  margin-top: 22px;
 }
-.lh30{
-    line-height: 30px;
+
+.viewparsings {
+  color: #4CACFF;
+  font-size: 12px;
+  line-height: 30px;
+}
+
+.selection {
+  width: 88px;
+  height: 30px;
+  background: #33BD8C;
+  border-radius: 4px;
+  text-align: center;
+  line-height: 30px;
+  color: #FFFFFF;
+}
+
+.selectionys {
+  width: 88px;
+  height: 30px;
+  background: #CCCCCC;
+  border-radius: 4px;
+  text-align: center;
+  line-height: 30px;
+  color: #FFFFFF;
+}
+
+.selectionss {
+  width: 88px;
+  height: 30px;
+  background: #CCCCCC;
+  border-radius: 4px;
+  text-align: center;
+  line-height: 30px;
+  color: #FFFFFF;
+}
+
+.lh30 {
+  line-height: 30px;
 
 
 }
 
-.analysis{
-    height:19px;
-    font-size:14px;
-    color:#333333;
-    line-height:19px;
+.analysis {
+  height: 19px;
+  font-size: 14px;
+  color: #333333;
+  line-height: 19px;
 }
 
-.testfondex{
-    color: #808080;
-    font-size: 14px;
-}
-.pb20{
-    padding-bottom: 20px;
-}
-.icontianjiadaohangcolor{
-    color: #ffffff;
+.testfondex {
+  color: #808080;
+  font-size: 14px;
 }
 
-.icontianjiadaohangcolors{
-    color: #4CACFF;
-}
-.xiaoshou{
-    cursor:pointer;
-}
-.xiaoshout{
-    cursor:default;
-}
-.mt40{
-    margin-top: 40px;
-}
-.mt42{
-    margin-top: 42px;
-}
-.drawerbutton{
-    width:88px;
-    height:30px;
-    background:#4CACFF;
-    border-radius:4px;
-    font-size:14px;
-    color:#ffffff;
-    line-height:30px;
-    text-align: center;
-}
-.icondrawercolor{
-    color: #979797;
+.pb20 {
+  padding-bottom: 20px;
 }
 
-.mt25{
-    margin-top: 25px;
-}
-.mb26{
-    margin-bottom: 26px;
-}
-.drawernonedatadiv{
-    height: 100%;
+.icontianjiadaohangcolor {
+  color: #ffffff;
 }
 
-.font-17{
-    font-size: 17px;
+.icontianjiadaohangcolors {
+  color: #4CACFF;
 }
-.ml30{
-    margin-right: 30px;
+
+.xiaoshou {
+  cursor: pointer;
 }
-.mr25{
-    margin-right: 25px;
+
+.xiaoshout {
+  cursor: default;
 }
-.newbutoon{
-    width:88px;
-    height:42px;
-    background:#33BD8C;
-    line-height: 42px;
-    border-radius:4px;
+
+.mt40 {
+  margin-top: 40px;
+}
+
+.mt42 {
+  margin-top: 42px;
+}
+
+.drawerbutton {
+  width: 88px;
+  height: 30px;
+  background: #4CACFF;
+  border-radius: 4px;
+  font-size: 14px;
+  color: #ffffff;
+  line-height: 30px;
+  text-align: center;
+}
+
+.icondrawercolor {
+  color: #979797;
+}
+
+.mt25 {
+  margin-top: 25px;
+}
+
+.mb26 {
+  margin-bottom: 26px;
+}
+
+.drawernonedatadiv {
+  height: 100%;
+}
+
+.font-17 {
+  font-size: 17px;
+}
+
+.ml30 {
+  margin-right: 30px;
+}
+
+.mr25 {
+  margin-right: 25px;
+}
+
+.newbutoon {
+  width: 88px;
+  height: 42px;
+  background: #33BD8C;
+  line-height: 42px;
+  border-radius: 4px;
 
 }
 
-.newbutoontes{
-    width:100%;
-    height:42px;
-    font-size:14px;
-    color:#ffffff;
-    line-height:42px;
-    text-align: center;
+.newbutoontes {
+  width: 100%;
+  height: 42px;
+  font-size: 14px;
+  color: #ffffff;
+  line-height: 42px;
+  text-align: center;
 }
+
 .educouddiv {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
 
-.tabeltext-alignleftysl{
-    font-size:14px;
-    color:#000000;
-    line-height:19px;
-
-}
-.tabeltext-alignleftysltwo{
-    font-size:14px;
-    color:#848282;
-    line-height:19px;
+.tabeltext-alignleftysl {
+  font-size: 14px;
+  color: #000000;
+  line-height: 19px;
 
 }
 
-.publictask-btn{
-    width:80px;
-    height:34px;
-    background:#CCCCCC;
-    border-radius:4px;
-    color: #ffffff;
-
-}
-.publictask-btns{
-    width:80px;
-    height:34px;
-    background:#4CACFF;
-    border-radius:4px;
-    color: #ffffff;
-}
-.w80{
-    width: 80px;
-}
-
-.titiles{
-    color: #333333;
-    font-size: 16px;
-}
-
-.h12{
-    height: 12px;
-    min-height: 12px;
-}
-
-.mt19{
-    margin-top: 19px;
-}
-.mytags{
-    min-width:106px !important;
-    height:32px;
-    border-radius:2px;
-    border:1px solid #DDDDDD;
-    margin-right: 20px;
-}
-.mytagss{
-    min-width:106px !important;
-    height:32px;
-    border-radius:2px;
-    border:1px solid #DDDDDD;
-    margin-right: 20px;
-}
-.lh32{
-    line-height: 32px;
-}
-
-.h20{
-    height: 20px;
-    min-height: 20px;
-    line-height: 20px;
-}
-.xingcolor{
-    color: rgba(224, 64, 64, 1);
-}
-.xingtigan{
-    font-size:14px;
-    color:rgba(51, 51, 51, 1);
-}
-.mr4{
-    margin-right: 4px;
-}
-
-.xingtigans{
-    width:100%;
-    font-size:14px;
-    color:rgba(136,136,136,1);
-}
-
-.bottomdivs{
-    width:100%;
-    height:55px;
-    background:rgba(255,255,255,1);
-    box-shadow:0px -2px 7px 0px rgba(1,6,22,0.04);
-}
-.mt50{
-    margin-top: 50px;
-}
-
-.divquxiao{
-    width:88px;
-    height:32px;
-    background:rgba(255,255,255,1);
-    border-radius:4px;
-    border:1px solid rgba(204,204,204,1);
-}
-.divquxiaotest{
-    width:100%;
-    height:32px;
-    font-size:12px;
-    color:rgba(136,136,136,1);
-    line-height:32px;
-    text-align: center;
-}
-.divbaocuntests{
-    width:100%;
-    height:32px;
-    font-size:12px;
-    color:#ffffff;
-    line-height:32px;
-    text-align: center;
-}
-.divbaocun{
-    width:88px;
-    height:32px;
-    background:rgba(76,172,255,1);
-    border-radius:4px;
-}
-.sortzhenque{
-    width:49px;
-    height:33px;
-    border-radius:2px;
-    border:1px solid rgba(221,221,221,1);
-}
-
-.sortzhenquetest{
-    width:100%;
-    height:33px;
-    font-size:14px;
-    color:rgba(51,51,51,1);
-    line-height:33px;
+.tabeltext-alignleftysltwo {
+  font-size: 14px;
+  color: #848282;
+  line-height: 19px;
 
 }
 
-.sortquxiao{
-
-    width:49px;
-    height:33px;
-    border-radius:2px;
-    border:1px solid rgba(221,221,221,1);
-}
-.sortquxiaotest{
-    width:100%;
-    height:33px;
-    font-size:14px;
-    color:rgba(51,51,51,1);
-    line-height:33px;
-}
-
-.ml45{
-    margin-left: 45px;
-}
-
-.programcss{
-    height: 251px;
-    min-height: 100%;
-}
-
-.titlesttingcss{
-    min-width: 100px;
-    height:32px;
-    line-height: 32px;
-    background:rgba(76,172,255,1);
-    border-radius:16px;
-    text-align: center;
-    color: #fff;
-}
-.titlesttingcssmy{
-    min-width: 100px;
-    height:32px;
-    line-height: 32px;
-    font-size:14px;
-    color:rgba(51,51,51,1);
-    text-align: center;
-}
-.minleng40{
-    min-height: 40px;
-}
-
-.w60{
-    width: 60px !important;
-}
-
-.h30{
-    min-height: 30px !important;
-}
-
-.minheight{
-    min-height: 500px !important;
-}
-.pd20{
-    padding: 20px;
-}
-
-.ml58{
-    margin-left: 58px;
-}
-.questionstishu{
-    color: #888888;
-    font-size: 14px;
-}
-.questionstotal{
-    color: #333333;
-    font-size: 14px;
-
-}
-.pagertdstcolor{
-    color: #888888;
-    font-size: 12px;
-}
-
-.mb19{
-    margin-bottom: 19px;
-}
-
-.yldxtit{
-    color: #333333 !important;
-    font-size: 14px;
-
-}
-.yldxtits{
-    color: #888888;
-    font-size: 14px;
-}
-.mt25{
-    margin-top: 25px;
-}
-
-.postitonrelati{
-    position: relative;
-}
-.postitonrelatis{
-    position: absolute;
-    right: 2px;
-    top: 11px;
-}
-.postitonrelatiss{
-    position: absolute;
-    right: 2px;
-    top: -41px;
-}
-.postitonrelatisss{
-    position: absolute;
-    right: 2px;
-    top: -39px;
-}
-.postitonrelatisssy{
-    position: absolute;
-    right: 1px;
-    top: 52px;
-}
-.mt50{
-    margin-top: 50px;
-}
-.szdfd{
-    width:100px;
-    height:40px;
-    background:rgba(51,189,140,1);
-    border-radius:4px 4px 0px 0px;
-    text-align: center;
-    color: #ffffff;
-    line-height: 40px;
-    margin-right: 27px;
-    font-size:12px;
-}
-.scd{
-    width:100px;
-    height:40px;
-    background:#4CACFF;
-    border-radius:4px 4px 0px 0px;
-    text-align: center;
-    color: #ffffff;
-    line-height: 40px;
-    font-size:12px;
-
-}
-.szdfds{
-    width:100px;
-    height:40px;
-    background:#FC7E30;
-    border-radius:4px 4px 0px 0px;
-    text-align: center;
-    color: #ffffff;
-    line-height: 40px;
-    margin-right: 27px;
-    font-size:12px;
-}
-
-.pd20{
-    padding: 20px;
-}
-
-.cretitlecolrlis{
-    color: #333333;
-    font-size: 14px !important;
-}
-
-.cretitlecolrlisobj{
-    color: #888888;
-    font-size: 14px !important;
+.publictask-btn {
+  width: 80px;
+  height: 34px;
+  background: #CCCCCC;
+  border-radius: 4px;
+  color: #ffffff;
 
 }
 
-.cretitlecolrlist{
-    color: #333333;
-    font-size: 14px !important;
-
-}
-.lh28{
-    line-height: 28px;
-}
-.h20{
-    height: 20px;
-    background-color: #fff;
-}
-.lh20{
-    line-height: 20px;
-    background-color: #fff;
-}
-.lh20s{
-    line-height: 20px;
+.publictask-btns {
+  width: 80px;
+  height: 34px;
+  background: #4CACFF;
+  border-radius: 4px;
+  color: #ffffff;
 }
 
-.backgroudwhites{
-    background-color: #fff;
+.w80 {
+  width: 80px;
 }
 
-.ml5{
-    margin-left: 5px;
+.titiles {
+  color: #333333;
+  font-size: 16px;
 }
 
-.lh35{
-    line-height: 35px;
+.h12 {
+  height: 12px;
+  min-height: 12px;
 }
-.mt7{
-    margin-top: 7px;
+
+.mt19 {
+  margin-top: 19px;
 }
-.ml18{
-    margin-left: 18px;
+
+.mytags {
+  min-width: 106px !important;
+  height: 32px;
+  border-radius: 2px;
+  border: 1px solid #DDDDDD;
+  margin-right: 20px;
 }
-.btques{
-    width:1021px;
-    background:rgba(249,249,249,1);
-    border:1px solid rgba(221,221,221,1);
+
+.mytagss {
+  min-width: 106px !important;
+  height: 32px;
+  border-radius: 2px;
+  border: 1px solid #DDDDDD;
+  margin-right: 20px;
+}
+
+.lh32 {
+  line-height: 32px;
+}
+
+.h20 {
+  height: 20px;
+  min-height: 20px;
+  line-height: 20px;
+}
+
+.xingcolor {
+  color: rgba(224, 64, 64, 1);
+}
+
+.xingtigan {
+  font-size: 14px;
+  color: rgba(51, 51, 51, 1);
+}
+
+.mr4 {
+  margin-right: 4px;
+}
+
+.xingtigans {
+  width: 100%;
+  font-size: 14px;
+  color: rgba(136, 136, 136, 1);
+}
+
+.bottomdivs {
+  width: 100%;
+  height: 55px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px -2px 7px 0px rgba(1, 6, 22, 0.04);
+}
+
+.mt50 {
+  margin-top: 50px;
+}
+
+.divquxiao {
+  width: 88px;
+  height: 32px;
+  background: rgba(255, 255, 255, 1);
+  border-radius: 4px;
+  border: 1px solid rgba(204, 204, 204, 1);
+}
+
+.divquxiaotest {
+  width: 100%;
+  height: 32px;
+  font-size: 12px;
+  color: rgba(136, 136, 136, 1);
+  line-height: 32px;
+  text-align: center;
+}
+
+.divbaocuntests {
+  width: 100%;
+  height: 32px;
+  font-size: 12px;
+  color: #ffffff;
+  line-height: 32px;
+  text-align: center;
+}
+
+.divbaocun {
+  width: 88px;
+  height: 32px;
+  background: rgba(76, 172, 255, 1);
+  border-radius: 4px;
+}
+
+.sortzhenque {
+  width: 49px;
+  height: 33px;
+  border-radius: 2px;
+  border: 1px solid rgba(221, 221, 221, 1);
+}
+
+.sortzhenquetest {
+  width: 100%;
+  height: 33px;
+  font-size: 14px;
+  color: rgba(51, 51, 51, 1);
+  line-height: 33px;
+
+}
+
+.sortquxiao {
+
+  width: 49px;
+  height: 33px;
+  border-radius: 2px;
+  border: 1px solid rgba(221, 221, 221, 1);
+}
+
+.sortquxiaotest {
+  width: 100%;
+  height: 33px;
+  font-size: 14px;
+  color: rgba(51, 51, 51, 1);
+  line-height: 33px;
+}
+
+.ml45 {
+  margin-left: 45px;
+}
+
+.programcss {
+  height: 251px;
+  min-height: 100%;
+}
+
+.titlesttingcss {
+  min-width: 100px;
+  height: 32px;
+  line-height: 32px;
+  background: rgba(76, 172, 255, 1);
+  border-radius: 16px;
+  text-align: center;
+  color: #fff;
+}
+
+.titlesttingcssmy {
+  min-width: 100px;
+  height: 32px;
+  line-height: 32px;
+  font-size: 14px;
+  color: rgba(51, 51, 51, 1);
+  text-align: center;
+}
+
+.minleng40 {
+  min-height: 40px;
+}
+
+.w60 {
+  width: 60px !important;
+}
+
+.h30 {
+  min-height: 30px !important;
+}
+
+.minheight {
+  min-height: 500px !important;
+}
+
+.pd20 {
+  padding: 20px;
+}
+
+.ml58 {
+  margin-left: 58px;
+}
+
+.questionstishu {
+  color: #888888;
+  font-size: 14px;
+}
+
+.questionstotal {
+  color: #333333;
+  font-size: 14px;
+
+}
+
+.pagertdstcolor {
+  color: #888888;
+  font-size: 12px;
+}
+
+.mb19 {
+  margin-bottom: 19px;
+}
+
+.yldxtit {
+  color: #333333 !important;
+  font-size: 14px;
+
+}
+
+.yldxtits {
+  color: #888888;
+  font-size: 14px;
+}
+
+.mt25 {
+  margin-top: 25px;
+}
+
+.postitonrelati {
+  position: relative;
+}
+
+.postitonrelatis {
+  position: absolute;
+  right: 2px;
+  top: 11px;
+}
+
+.postitonrelatiss {
+  position: absolute;
+  right: 2px;
+  top: -41px;
+}
+
+.postitonrelatisss {
+  position: absolute;
+  right: 2px;
+  top: -39px;
+}
+
+.postitonrelatisssy {
+  position: absolute;
+  right: 1px;
+  top: 52px;
+}
+
+.mt50 {
+  margin-top: 50px;
+}
+
+.szdfd {
+  width: 100px;
+  height: 40px;
+  background: rgba(51, 189, 140, 1);
+  border-radius: 4px 4px 0px 0px;
+  text-align: center;
+  color: #ffffff;
+  line-height: 40px;
+  margin-right: 27px;
+  font-size: 12px;
+}
+
+.scd {
+  width: 100px;
+  height: 40px;
+  background: #4CACFF;
+  border-radius: 4px 4px 0px 0px;
+  text-align: center;
+  color: #ffffff;
+  line-height: 40px;
+  font-size: 12px;
+
+}
+
+.szdfds {
+  width: 100px;
+  height: 40px;
+  background: #FC7E30;
+  border-radius: 4px 4px 0px 0px;
+  text-align: center;
+  color: #ffffff;
+  line-height: 40px;
+  margin-right: 27px;
+  font-size: 12px;
+}
+
+.pd20 {
+  padding: 20px;
+}
+
+.cretitlecolrlis {
+  color: #333333;
+  font-size: 14px !important;
+}
+
+.cretitlecolrlisobj {
+  color: #888888;
+  font-size: 14px !important;
+
+}
+
+.cretitlecolrlist {
+  color: #333333;
+  font-size: 14px !important;
+
+}
+
+.lh28 {
+  line-height: 28px;
+}
+
+.h20 {
+  height: 20px;
+  background-color: #fff;
+}
+
+.lh20 {
+  line-height: 20px;
+  background-color: #fff;
+}
+
+.lh20s {
+  line-height: 20px;
+}
+
+.backgroudwhites {
+  background-color: #fff;
+}
+
+.ml5 {
+  margin-left: 5px;
+}
+
+.lh35 {
+  line-height: 35px;
+}
+
+.mt7 {
+  margin-top: 7px;
+}
+
+.ml18 {
+  margin-left: 18px;
+}
+
+.btques {
+  width: 1021px;
+  background: rgba(249, 249, 249, 1);
+  border: 1px solid rgba(221, 221, 221, 1);
 }
 
 .borderwdswuhques {
-    width: 1020px !important;
-    background: #F9F9F9;
-    border: 1px solid #DDDDDD;
-    min-height: 42px;
+  width: 1020px !important;
+  background: #F9F9F9;
+  border: 1px solid #DDDDDD;
+  min-height: 42px;
 }
 
-.jixuxuanti{
-    width:106px;
-    height:34px;
-    background:rgba(51,189,140,1);
-    border-radius:4px;
-    color:#ffffff ;
-    line-height: 34px;
-    text-align: center;
-}
-.lh34{
-    line-height: 34px;
+.jixuxuanti {
+  width: 106px;
+  height: 34px;
+  background: rgba(51, 189, 140, 1);
+  border-radius: 4px;
+  color: #ffffff;
+  line-height: 34px;
+  text-align: center;
 }
 
-.mr2{
-    margin-right: 2px;
+.lh34 {
+  line-height: 34px;
 }
 
-.ml22{
-    margin-left: 22px;
+.mr2 {
+  margin-right: 2px;
 }
 
-.zjzsdian{
-    width: 20px;
-    height: 20px;
-    margin-top: 5px;
+.ml22 {
+  margin-left: 22px;
 }
 
-.textcen{
-    text-align: center;
-}
-.listjihecolors:hover{
-    background: #F9F9F9;
-    background-color: #F9F9F9;
-}
-.nofabu{
-
-    width:46px;
-    height: 20px;
-    line-height: 20px;
-    background:rgba(255,102,1,1);
-    border-radius:10px;
-    color: #ffffff;
-    text-align: center;
+.zjzsdian {
+  width: 20px;
+  height: 20px;
+  margin-top: 5px;
 }
 
-.jinzhixiaoshou{
-    cursor:no-drop
+.textcen {
+  text-align: center;
 }
 
-.shitilang{
-    height: 40px;
-    background: #606060;
-    color: #FFFFFF;
-    position: absolute;
-    top: -2px;
-    width: 100%;
-    left: 0px;
-    font-size:14px;
-    text-align: center;
-    line-height: 40px;
+.listjihecolors:hover {
+  background: #F9F9F9;
+  background-color: #F9F9F9;
 }
 
-.xiaoshoums:hover{
-    color:#4CACFF;
+.nofabu {
+
+  width: 46px;
+  height: 20px;
+  line-height: 20px;
+  background: rgba(255, 102, 1, 1);
+  border-radius: 10px;
+  color: #ffffff;
+  text-align: center;
 }
 
-.shitikus{
-    width: 40px !important;
-    position: absolute;
-    border-radius: 4px;
-    top: -50%;
+.jinzhixiaoshou {
+  cursor: no-drop
 }
-.shitikussmys{
-    width:29px !important;
-    height:20px!important;
-    background:#FF6601 !important;
-    border-radius:10px !important;
-    position: absolute !important;
-    font-size:11px !important;
-    color:#ffffff !important;
-    line-height:20px !important;
-    top: -14px !important;
-    right: -14px !important;
+
+.shitilang {
+  height: 40px;
+  background: #606060;
+  color: #FFFFFF;
+  position: absolute;
+  top: -2px;
+  width: 100%;
+  left: 0px;
+  font-size: 14px;
+  text-align: center;
+  line-height: 40px;
+}
+
+.xiaoshoums:hover {
+  color: #4CACFF;
+}
+
+.shitikus {
+  width: 40px !important;
+  position: absolute;
+  border-radius: 4px;
+  top: -50%;
+}
+
+.shitikussmys {
+  width: 29px !important;
+  height: 20px !important;
+  background: #FF6601 !important;
+  border-radius: 10px !important;
+  position: absolute !important;
+  font-size: 11px !important;
+  color: #ffffff !important;
+  line-height: 20px !important;
+  top: -14px !important;
+  right: -14px !important;
 }
 
 
-.maxnamewidth30{
-    max-width: 30px;
-    overflow:hidden;
-    text-overflow:ellipsis;
-    white-space:nowrap;
-    cursor: default;
+.maxnamewidth30 {
+  max-width: 30px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
 }
+
 .ball {
-    width: 8px;
-    height: 8px;
-    background: #FF6601;
-    position: absolute;
-    left: 0;
-    top: 0;
-    border-radius: 50%;
-    opacity: 0;
-    z-index: 1;
+  width: 8px;
+  height: 8px;
+  background: #FF6601;
+  position: absolute;
+  left: 0;
+  top: 0;
+  border-radius: 50%;
+  opacity: 0;
+  z-index: 1;
 }
 
-.mt25{
-    margin-top: 25px;
+.mt25 {
+  margin-top: 25px;
 }
 
-.mr15{
-    margin-right: 15px;
-}
-.fangdatwo{
-    background: #fefefe;
-    background-color: #fefefe;
-    height: 100%;
-    overflow-y: scroll !important;
-    width: 100%;
-    position: fixed;
-    top:0px;
-    bottom: 0px;
-    left: 0px;
-    z-index: 999999;
-    right: 0px;
+.mr15 {
+  margin-right: 15px;
 }
 
-.searchwidth{
-    width: 347px !important;
-}
-.lh26{
-    line-height: 26px !important;
-}
-.tites{
-    color: #888888 !important;
-}
-.ant-popover-inner-content{
-    padding: 0px !important;
+.fangdatwo {
+  background: #fefefe;
+  background-color: #fefefe;
+  height: 100%;
+  overflow-y: scroll !important;
+  width: 100%;
+  position: fixed;
+  top: 0px;
+  bottom: 0px;
+  left: 0px;
+  z-index: 999999;
+  right: 0px;
 }
 
-.huanhan{
-    flex-wrap: wrap;
-}
-.mb20{
-    margin-bottom: 20px;
+.searchwidth {
+  width: 347px !important;
 }
 
-.inpustred .ant-input{
-    border: 1px solid #f30707;
-    border-radius: 5px;
+.lh26 {
+  line-height: 26px !important;
 }
 
-.mt15{
-    margin-top: 15px;
+.tites {
+  color: #888888 !important;
 }
-.conditionsetting{
-    width:64px;
-    height:21px;
-    font-size:16px;
-    color:#333333;
-    line-height:21px;
+
+.ant-popover-inner-content {
+  padding: 0px;
 }
-.hengxians{
-    width:1021px;
-    height:1px;
-    background: #EEEEEE;
+
+.huanhan {
+  flex-wrap: wrap;
 }
-.mt13{
-    margin-top: 13px;
+
+.mb20 {
+  margin-bottom: 20px;
 }
-.inpustredss .ant-input-number{
-    border: 1px solid #f30707;
-    border-radius: 5px;
+
+.inpustred .ant-input {
+  border: 1px solid #f30707;
+  border-radius: 5px;
+}
+
+.mt15 {
+  margin-top: 15px;
+}
+
+.conditionsetting {
+  width: 64px;
+  height: 21px;
+  font-size: 16px;
+  color: #333333;
+  line-height: 21px;
+}
+
+.hengxians {
+  width: 1021px;
+  height: 1px;
+  background: #EEEEEE;
+}
+
+.mt13 {
+  margin-top: 13px;
+}
+
+.inpustredss .ant-input-number {
+  border: 1px solid #f30707;
+  border-radius: 5px;
 }
 
 .inpustredssdiv button {
-    border-radius: 50%;
-    width: 38px;
-    height: 38px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
+  border-radius: 50%;
+  width: 38px;
+  height: 38px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
 }
 
-.inpustredssdiv  .ant-input-number-input{
-    text-align: center;
+.inpustredssdiv .ant-input-number-input {
+  text-align: center;
 }
-.lh32{
-    line-height: 32px;
+
+.lh32 {
+  line-height: 32px;
 }
-.ml23{
-    margin-left: 23px;
+
+.ml23 {
+  margin-left: 23px;
 }
-.ml12{
-    margin-left: 12px;
+
+.ml12 {
+  margin-left: 12px;
 }
-.mr12{
-    margin-right: 12px;
+
+.mr12 {
+  margin-right: 12px;
 }
-.tishiyuyan{
-    color: #888888 !important;
-    font-size:14px;
+
+.tishiyuyan {
+  color: #888888 !important;
+  font-size: 14px;
 }
-.tishiyuyans{
-    color: #4CACFF !important;
-    font-size:14px;
+
+.tishiyuyans {
+  color: #4CACFF !important;
+  font-size: 14px;
 }
-.tikutask-btn{
-    width:80px;
-    height:34px;
-    background:rgba(204,204,204,1);
-    border-radius:4px;
+
+.tikutask-btn {
+  width: 80px;
+  height: 34px;
+  background: rgba(204, 204, 204, 1);
+  border-radius: 4px;
 }
-.tikutask-btns{
-    width:80px;
-    height:34px;
-    background:rgba(76,172,255,1);
-    border-radius:4px;
+
+.tikutask-btns {
+  width: 80px;
+  height: 34px;
+  background: rgba(76, 172, 255, 1);
+  border-radius: 4px;
 }
-.w100{
-    width: 100px !important;
+
+.w100 {
+  width: 100px !important;
 }
-.h34{
-    height: 34px !important;
-}
-.lh34{
-    line-height: 34px !important;
+
+.h34 {
+  height: 34px !important;
 }
+
+.lh34 {
+  line-height: 34px !important;
+}
\ No newline at end of file
diff --git a/src/modules/courses/css/Courses.css b/src/modules/courses/css/Courses.css
index fa179bc1..d3e3f2bb 100644
--- a/src/modules/courses/css/Courses.css
+++ b/src/modules/courses/css/Courses.css
@@ -1,291 +1,452 @@
 i.iconfont {
-    cursor: pointer;
+  cursor: pointer;
 }
+
 .overflowHidden1 {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    display: inline-block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: inline-block;
 }
+
 .overflowHidden2 {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 /* BASICS */
 .CodeMirror {
-    /* Set height, width, borders, and global font properties here */
-    font-family: monospace;
-    height: 300px;
-    color: black;
-    direction: ltr;
+  /* Set height, width, borders, and global font properties here */
+  font-family: monospace;
+  height: 300px;
+  color: black;
+  direction: ltr;
 }
 
 /* PADDING */
 
 .CodeMirror-lines {
-    padding: 4px 0; /* Vertical padding around content */
-}
-.CodeMirror pre {
-    padding: 0 4px; /* Horizontal padding of content */
+  padding: 4px 0;
+  /* Vertical padding around content */
 }
 
-.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-    background-color: white; /* The little square between H and V scrollbars */
+.CodeMirror pre {
+  padding: 0 4px;
+  /* Horizontal padding of content */
+}
+
+.CodeMirror-scrollbar-filler,
+.CodeMirror-gutter-filler {
+  background-color: white;
+  /* The little square between H and V scrollbars */
 }
 
 /* GUTTER */
 
 .CodeMirror-gutters {
-    border-right: 1px solid #ddd;
-    background-color: #f7f7f7;
-    white-space: nowrap;
-}
-.CodeMirror-linenumbers {}
-.CodeMirror-linenumber {
-    padding: 0 3px 0 5px;
-    min-width: 20px;
-    text-align: right;
-    color: #999;
-    white-space: nowrap;
+  border-right: 1px solid #ddd;
+  background-color: #f7f7f7;
+  white-space: nowrap;
 }
 
-.CodeMirror-guttermarker { color: black; }
-.CodeMirror-guttermarker-subtle { color: #999; }
+.CodeMirror-linenumbers {}
+
+.CodeMirror-linenumber {
+  padding: 0 3px 0 5px;
+  min-width: 20px;
+  text-align: right;
+  color: #999;
+  white-space: nowrap;
+}
+
+.CodeMirror-guttermarker {
+  color: black;
+}
+
+.CodeMirror-guttermarker-subtle {
+  color: #999;
+}
 
 /* CURSOR */
 
 .CodeMirror-cursor {
-    border-left: 1px solid black;
-    border-right: none;
-    width: 0;
+  border-left: 1px solid black;
+  border-right: none;
+  width: 0;
 }
+
 /* Shown when moving in bi-directional text */
 .CodeMirror div.CodeMirror-secondarycursor {
-    border-left: 1px solid silver;
+  border-left: 1px solid silver;
 }
+
 .cm-fat-cursor .CodeMirror-cursor {
-    width: auto;
-    border: 0 !important;
-    background: #7e7;
+  width: auto;
+  border: 0 !important;
+  background: #7e7;
 }
+
 .cm-fat-cursor div.CodeMirror-cursors {
-    z-index: 1;
+  z-index: 1;
 }
+
 .cm-fat-cursor-mark {
-    background-color: rgba(20, 255, 20, 0.5);
-    -webkit-animation: blink 1.06s steps(1) infinite;
-    animation: blink 1.06s steps(1) infinite;
+  background-color: rgba(20, 255, 20, 0.5);
+  -webkit-animation: blink 1.06s steps(1) infinite;
+  animation: blink 1.06s steps(1) infinite;
 }
+
 .cm-animate-fat-cursor {
-    width: auto;
-    border: 0;
-    -webkit-animation: blink 1.06s steps(1) infinite;
-    animation: blink 1.06s steps(1) infinite;
-    background-color: #7e7;
+  width: auto;
+  border: 0;
+  -webkit-animation: blink 1.06s steps(1) infinite;
+  animation: blink 1.06s steps(1) infinite;
+  background-color: #7e7;
 }
+
 @-webkit-keyframes blink {
-    0% {}
-    50% { background-color: transparent; }
-    100% {}
+  0% {}
+
+  50% {
+    background-color: transparent;
+  }
+
+  100% {}
 }
+
 @keyframes blink {
-    0% {}
-    50% { background-color: transparent; }
-    100% {}
+  0% {}
+
+  50% {
+    background-color: transparent;
+  }
+
+  100% {}
 }
 
 /* Can style cursor different in overwrite (non-insert) mode */
 .CodeMirror-overwrite .CodeMirror-cursor {}
 
-.cm-tab { display: inline-block; text-decoration: inherit; }
+.cm-tab {
+  display: inline-block;
+  text-decoration: inherit;
+}
 
 .CodeMirror-rulers {
-    position: absolute;
-    left: 0; right: 0; top: -50px; bottom: -20px;
-    overflow: hidden;
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: -50px;
+  bottom: -20px;
+  overflow: hidden;
 }
+
 .CodeMirror-ruler {
-    border-left: 1px solid #ccc;
-    top: 0; bottom: 0;
-    position: absolute;
+  border-left: 1px solid #ccc;
+  top: 0;
+  bottom: 0;
+  position: absolute;
 }
 
 /* DEFAULT THEME */
 
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-.cm-strikethrough {text-decoration: line-through;}
+.cm-s-default .cm-header {
+  color: blue;
+}
+
+.cm-s-default .cm-quote {
+  color: #090;
+}
+
+.cm-negative {
+  color: #d44;
+}
+
+.cm-positive {
+  color: #292;
+}
+
+.cm-header,
+.cm-strong {
+  font-weight: bold;
+}
+
+.cm-em {
+  font-style: italic;
+}
+
+.cm-link {
+  text-decoration: underline;
+}
+
+.cm-strikethrough {
+  text-decoration: line-through;
+}
+
+.cm-s-default .cm-keyword {
+  color: #708;
+}
+
+.cm-s-default .cm-atom {
+  color: #219;
+}
+
+.cm-s-default .cm-number {
+  color: #164;
+}
+
+.cm-s-default .cm-def {
+  color: #00f;
+}
 
-.cm-s-default .cm-keyword {color: #708;}
-.cm-s-default .cm-atom {color: #219;}
-.cm-s-default .cm-number {color: #164;}
-.cm-s-default .cm-def {color: #00f;}
 .cm-s-default .cm-variable,
 .cm-s-default .cm-punctuation,
 .cm-s-default .cm-property,
 .cm-s-default .cm-operator {}
-.cm-s-default .cm-variable-2 {color: #05a;}
-.cm-s-default .cm-variable-3, .cm-s-default .cm-type {color: #085;}
-.cm-s-default .cm-comment {color: #a50;}
-.cm-s-default .cm-string {color: #a11;}
-.cm-s-default .cm-string-2 {color: #f50;}
-.cm-s-default .cm-meta {color: #555;}
-.cm-s-default .cm-qualifier {color: #555;}
-.cm-s-default .cm-builtin {color: #30a;}
-.cm-s-default .cm-bracket {color: #997;}
-.cm-s-default .cm-tag {color: #170;}
-.cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-hr {color: #999;}
-.cm-s-default .cm-link {color: #00c;}
 
-.cm-s-default .cm-error {color: #f00;}
-.cm-invalidchar {color: #f00;}
+.cm-s-default .cm-variable-2 {
+  color: #05a;
+}
 
-.CodeMirror-composing { border-bottom: 2px solid; }
+.cm-s-default .cm-variable-3,
+.cm-s-default .cm-type {
+  color: #085;
+}
+
+.cm-s-default .cm-comment {
+  color: #a50;
+}
+
+.cm-s-default .cm-string {
+  color: #a11;
+}
+
+.cm-s-default .cm-string-2 {
+  color: #f50;
+}
+
+.cm-s-default .cm-meta {
+  color: #555;
+}
+
+.cm-s-default .cm-qualifier {
+  color: #555;
+}
+
+.cm-s-default .cm-builtin {
+  color: #30a;
+}
+
+.cm-s-default .cm-bracket {
+  color: #997;
+}
+
+.cm-s-default .cm-tag {
+  color: #170;
+}
+
+.cm-s-default .cm-attribute {
+  color: #00c;
+}
+
+.cm-s-default .cm-hr {
+  color: #999;
+}
+
+.cm-s-default .cm-link {
+  color: #00c;
+}
+
+.cm-s-default .cm-error {
+  color: #f00;
+}
+
+.cm-invalidchar {
+  color: #f00;
+}
+
+.CodeMirror-composing {
+  border-bottom: 2px solid;
+}
 
 /* Default styles for common addons */
 
-div.CodeMirror span.CodeMirror-matchingbracket {color: #0b0;}
-div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
-.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
-.CodeMirror-activeline-background {background: #e8f2ff;}
+div.CodeMirror span.CodeMirror-matchingbracket {
+  color: #0b0;
+}
 
-/* STOP */
+div.CodeMirror span.CodeMirror-nonmatchingbracket {
+  color: #a22;
+}
+
+.CodeMirror-matchingtag {
+  background: rgba(255, 150, 0, .3);
+}
+
+.CodeMirror-activeline-background {
+  background: #e8f2ff;
+}
 
-/* The rest of this file contains styles related to the mechanics of
-   the editor. You probably shouldn't touch them. */
 
 .CodeMirror {
-    position: relative;
-    overflow: hidden;
-    background: white;
+  position: relative;
+  overflow: hidden;
+  background: white;
 }
 
 .CodeMirror-scroll {
-    overflow: scroll !important; /* Things will break if this is overridden */
-    /* 30px is the magic margin used to hide the element's real scrollbars */
-    /* See overflow: hidden in .CodeMirror */
-    margin-bottom: -30px; margin-right: -30px;
-    padding-bottom: 30px;
-    height: 100%;
-    outline: none; /* Prevent dragging from highlighting the element */
-    position: relative;
-}
-.CodeMirror-sizer {
-    position: relative;
-    border-right: 30px solid transparent;
+  overflow: scroll !important;
+  margin-bottom: -30px;
+  margin-right: -30px;
+  padding-bottom: 30px;
+  height: 100%;
+  outline: none;
+  position: relative;
 }
 
-/* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actual scrolling happens, thus preventing shaking and
-   flickering artifacts. */
-.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-    position: absolute;
-    z-index: 6;
-    display: none;
-}
-.CodeMirror-vscrollbar {
-    right: 0; top: 0;
-    overflow-x: hidden;
-    overflow-y: scroll;
-}
-.CodeMirror-hscrollbar {
-    bottom: 0; left: 0;
-    overflow-y: hidden;
-    overflow-x: scroll;
-}
-.CodeMirror-scrollbar-filler {
-    right: 0; bottom: 0;
+.CodeMirror-sizer {
+  position: relative;
+  border-right: 30px solid transparent;
 }
+
+.CodeMirror-vscrollbar,
+.CodeMirror-hscrollbar,
+.CodeMirror-scrollbar-filler,
 .CodeMirror-gutter-filler {
-    left: 0; bottom: 0;
+  position: absolute;
+  z-index: 6;
+  display: none;
+}
+
+.CodeMirror-vscrollbar {
+  right: 0;
+  top: 0;
+  overflow-x: hidden;
+  overflow-y: scroll;
+}
+
+.CodeMirror-hscrollbar {
+  bottom: 0;
+  left: 0;
+  overflow-y: hidden;
+  overflow-x: scroll;
+}
+
+.CodeMirror-scrollbar-filler {
+  right: 0;
+  bottom: 0;
+}
+
+.CodeMirror-gutter-filler {
+  left: 0;
+  bottom: 0;
 }
 
 .CodeMirror-gutters {
-    position: absolute; left: 0; top: 0;
-    min-height: 100%;
-    z-index: 3;
+  position: absolute;
+  left: 0;
+  top: 0;
+  min-height: 100%;
+  z-index: 3;
 }
+
 .CodeMirror-gutter {
-    white-space: normal;
-    height: 100%;
-    display: inline-block;
-    vertical-align: top;
-    margin-bottom: -30px;
+  white-space: normal;
+  height: 100%;
+  display: inline-block;
+  vertical-align: top;
+  margin-bottom: -30px;
 }
+
 .CodeMirror-gutter-wrapper {
-    position: absolute;
-    z-index: 4;
-    background: none !important;
-    border: none !important;
+  position: absolute;
+  z-index: 4;
+  background: none !important;
+  border: none !important;
 }
+
 .CodeMirror-gutter-background {
-    position: absolute;
-    top: 0; bottom: 0;
-    z-index: 4;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  z-index: 4;
 }
+
 .CodeMirror-gutter-elt {
-    position: absolute;
-    cursor: default;
-    z-index: 4;
+  position: absolute;
+  cursor: default;
+  z-index: 4;
+}
+
+.CodeMirror-gutter-wrapper ::-moz-selection {
+  background-color: transparent
+}
+
+.CodeMirror-gutter-wrapper ::selection {
+  background-color: transparent
+}
+
+.CodeMirror-gutter-wrapper ::-moz-selection {
+  background-color: transparent
 }
-.CodeMirror-gutter-wrapper ::-moz-selection { background-color: transparent }
-.CodeMirror-gutter-wrapper ::selection { background-color: transparent }
-.CodeMirror-gutter-wrapper ::-moz-selection { background-color: transparent }
 
 .CodeMirror-lines {
-    cursor: text;
-    min-height: 1px; /* prevents collapsing before first draw */
+  cursor: text;
+  min-height: 1px;
+  /* prevents collapsing before first draw */
 }
+
 .CodeMirror pre {
-    /* Reset some styles that the rest of the page might have set */ border-radius: 0;
-    border-width: 0;
-    background: transparent;
-    font-family: inherit;
-    font-size: inherit;
-    margin: 0;
-    white-space: pre;
-    word-wrap: normal;
-    line-height: inherit;
-    color: inherit;
-    z-index: 2;
-    position: relative;
-    overflow: visible;
-    -webkit-tap-highlight-color: transparent;
-    -webkit-font-variant-ligatures: contextual;
-    font-variant-ligatures: contextual;
+  /* Reset some styles that the rest of the page might have set */
+  border-radius: 0;
+  border-width: 0;
+  background: transparent;
+  font-family: inherit;
+  font-size: inherit;
+  margin: 0;
+  white-space: pre;
+  word-wrap: normal;
+  line-height: inherit;
+  color: inherit;
+  z-index: 2;
+  position: relative;
+  overflow: visible;
+  -webkit-tap-highlight-color: transparent;
+  -webkit-font-variant-ligatures: contextual;
+  font-variant-ligatures: contextual;
 }
+
 .CodeMirror-wrap pre {
-    word-wrap: break-word;
-    white-space: pre-wrap;
-    word-break: normal;
+  word-wrap: break-word;
+  white-space: pre-wrap;
+  word-break: normal;
 }
 
 .CodeMirror-linebackground {
-    position: absolute;
-    left: 0; right: 0; top: 0; bottom: 0;
-    z-index: 0;
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  z-index: 0;
 }
 
 .CodeMirror-linewidget {
-    position: relative;
-    z-index: 2;
-    padding: 0.1px; /* Force widget margins to stay inside of the container */
+  position: relative;
+  z-index: 2;
+  padding: 0.1px;
+  /* Force widget margins to stay inside of the container */
 }
 
 .CodeMirror-widget {}
 
-.CodeMirror-rtl pre { direction: rtl; }
+.CodeMirror-rtl pre {
+  direction: rtl;
+}
 
 .CodeMirror-code {
-    outline: none;
+  outline: none;
 }
 
 /* Force content-box sizing for the elements where we expect it */
@@ -294,1473 +455,1833 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
 .CodeMirror-gutter,
 .CodeMirror-gutters,
 .CodeMirror-linenumber {
-    -webkit-box-sizing: content-box;
-    box-sizing: content-box;
+  -webkit-box-sizing: content-box;
+  box-sizing: content-box;
 }
 
 .CodeMirror-measure {
-    position: absolute;
-    width: 100%;
-    height: 0;
-    overflow: hidden;
-    visibility: hidden;
+  position: absolute;
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  visibility: hidden;
 }
 
 .CodeMirror-cursor {
-    position: absolute;
-    pointer-events: none;
+  position: absolute;
+  pointer-events: none;
+}
+
+.CodeMirror-measure pre {
+  position: static;
 }
-.CodeMirror-measure pre { position: static; }
 
 div.CodeMirror-cursors {
-    visibility: hidden;
-    position: relative;
-    z-index: 3;
+  visibility: hidden;
+  position: relative;
+  z-index: 3;
 }
+
 div.CodeMirror-dragcursors {
-    visibility: visible;
+  visibility: visible;
 }
 
 .CodeMirror-focused div.CodeMirror-cursors {
-    visibility: visible;
+  visibility: visible;
 }
 
-.CodeMirror-selected { background: #d9d9d9; }
-.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
-.CodeMirror-crosshair { cursor: crosshair; }
-.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
-.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
-.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
+.CodeMirror-selected {
+  background: #d9d9d9;
+}
+
+.CodeMirror-focused .CodeMirror-selected {
+  background: #d7d4f0;
+}
+
+.CodeMirror-crosshair {
+  cursor: crosshair;
+}
+
+.CodeMirror-line::-moz-selection,
+.CodeMirror-line>span::-moz-selection,
+.CodeMirror-line>span>span::-moz-selection {
+  background: #d7d4f0;
+}
+
+.CodeMirror-line::selection,
+.CodeMirror-line>span::selection,
+.CodeMirror-line>span>span::selection {
+  background: #d7d4f0;
+}
+
+.CodeMirror-line::-moz-selection,
+.CodeMirror-line>span::-moz-selection,
+.CodeMirror-line>span>span::-moz-selection {
+  background: #d7d4f0;
+}
 
 .cm-searching {
-    background-color: #ffa;
-    background-color: rgba(255, 255, 0, .4);
+  background-color: #ffa;
+  background-color: rgba(255, 255, 0, .4);
 }
 
 /* Used to force a border model for a node */
-.cm-force-border { padding-right: .1px; }
+.cm-force-border {
+  padding-right: .1px;
+}
 
 @media print {
-    /* Hide the cursor when printing */
-    .CodeMirror div.CodeMirror-cursors {
-        visibility: hidden;
-    }
+
+  /* Hide the cursor when printing */
+  .CodeMirror div.CodeMirror-cursors {
+    visibility: hidden;
+  }
 }
 
 /* See issue #2901 */
-.cm-tab-wrap-hack:after { content: ''; }
+.cm-tab-wrap-hack:after {
+  content: '';
+}
 
 /* Help users use markselection to safely style text background */
-span.CodeMirror-selectedtext { background: none; }
-
-
-
-
-.radioStyle{
-    display: block;
-    height: 30px;
+span.CodeMirror-selectedtext {
+  background: none;
 }
-a.white-btn.use_scope-btn:hover{
 
+.radioStyle {
+  display: block;
+  height: 30px;
 }
-.shixunScopeInput{
-    width:218px;
-    height:33px;
-    display:block;
-    margin-bottom:15px;
+
+.shixunScopeInput {
+  width: 218px;
+  height: 33px;
+  display: block;
+  margin-bottom: 15px;
 }
 
 #memoMD .CodeMirror {
-    /*width: 576px !important;*/
-    margin-top: 31px !important;
-    height: 364px !important;
+  /*width: 576px !important;*/
+  margin-top: 31px !important;
+  height: 364px !important;
 }
 
 #memoMD .editormd-preview {
-    width: 578px !important;
-    top: 40px !important;
-    height: 364px !important;
+  width: 578px !important;
+  top: 40px !important;
+  height: 364px !important;
 }
 
-.ml36{
-    margin-left: 26px;
+.ml36 {
+  margin-left: 26px;
 }
+
 #person-unit a.white-btn.use_scope-btn:hover {
-    border: 1px solid #F06200;
-    color:#FFF !important;
+  border: 1px solid #F06200;
+  color: #FFF !important;
 }
 
 
-#root { background: rgb(250, 250, 250); }
-.newedu-class-leftnav{ background:#fff;}
-.newedu-class-leftnav li{ height: 50px;line-height: 49px;font-size:16px;cursor: pointer;position: relative;}
-.newedu-class-leftnav li a{padding-left: 42px;width: 93%;box-sizing: border-box;color: #05101A; background:transparent;}
-.newedu-class-leftnav > div:last-child .Draggablelichild:last-child li a{border-bottom: none;}
-.newedu-class-leftnav li:hover{background-color: #F1F1F1}
-/*.newedu-class-leftnav li:hover a{color: #FFF!important;}*/
-/*.newedu-class-leftnav li:hover a,.edu-class-leftnav li:hover i{color: #fff!important;}*/
-.newedu-class-leftnav li:hover a{color: #05101A; background:transparent; }
-/*.newedu-class-leftnav li.active:before{content: '';position: absolute;left: 0px;top: 14px;bottom: 0;right: auto;height: 24px;width: 2px;background-color: #459be5;}*/
-.newedu-class-leftnav li.active{color:#05101A !important;}
-.newedu-class-leftnav li.active a{color:#05101A !important; background:transparent;}
-/*.newedu-class-leftnav-leftnav li.active:hover{color: #fff; }*/
-/*.newedu-class-leftnav li.active:hover .activity-left-name,.edu-class-leftnav li.active:hover i,.edu-class-leftnav li:hover .groupNum{color: #fff!important;}*/
-/*.newedu-class-leftnav li.active:hover .courseNewNum{color:#fff!important;}*/
+#root {
+  background: rgb(250, 250, 250);
+}
+
+.newedu-class-leftnav {
+  background: #fff;
+}
+
+.newedu-class-leftnav li {
+  height: 50px;
+  line-height: 49px;
+  font-size: 16px;
+  cursor: pointer;
+  position: relative;
+}
+
 .newedu-class-leftnav li a {
-    padding-left: 20px;
+  padding-left: 42px;
+  width: 93%;
+  box-sizing: border-box;
+  color: #05101A;
+  background: transparent;
+}
+
+.newedu-class-leftnav>div:last-child .Draggablelichild:last-child li a {
+  border-bottom: none;
+}
+
+.newedu-class-leftnav li:hover {
+  background-color: #F1F1F1
+}
+
+.newedu-class-leftnav li:hover a {
+  color: #05101A;
+  background: transparent;
+}
+
+.newedu-class-leftnav li.active {
+  color: #05101A !important;
+}
+
+.newedu-class-leftnav li.active a {
+  color: #05101A !important;
+  background: transparent;
+}
+
+.newedu-class-leftnav li a {
+  padding-left: 20px;
+}
+
+.addtaskmodle {
+  width: 69px;
+  height: 50px;
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  font-weight: 400;
+  color: #000;
+}
+
+.addtaskmodle .iconfont {
+  font-size: 15px !important;
+  color: #666666;
+}
+
+.newedu-class-leftnav li:hover a .addtaskmodle {
+  color: #666666;
+}
+
+.martop1 {
+  margin-top: 1px;
+}
+
+.ml100 {
+  margin-left: 100px;
+}
+
+.ml110 {
+  margin-left: 110px;
 }
 
-.addtaskmodle{ width: 69px;  height: 50px; font-size: 14px; font-family: MicrosoftYaHei; font-weight: 400;  color: #000;}
-.addtaskmodle .iconfont{font-size: 15px !important; color: #666666;}
-.newedu-class-leftnav li:hover a .addtaskmodle{color: #666666;}
-.martop1{margin-top: 1px;}
-.ml100{margin-left: 100px;}
-.ml110{margin-left: 110px;}
 .addjia {
-    padding: 20px;
-    height: 48px !important;
-    line-height: 10px !important;
-}
-.newedu-class-leftnav .addjia:hover{background:#fff !important;}
-.pl20{padding-left:20px;}
-.ml90{margin-left: 90px;}
-.ebebeb{border-bottom: 1px solid #EBEBEB;}
-.CheckboxGroup{background:rgba(249,249,249,1);}
-.maxwidth155{max-width: 155px; color:#666666;font-size: 14px;}
-.maxwidth170{max-width: 170px; color:#666666;font-size: 14px;}
-.pl46{ margin-left: 46px !important; border-bottom: 1px solid #eeee; width: 90% !important;}
-.hidden{overflow: hidden;}
-.pd0{padding: 0px !important;}
-.color999{color: #999999 !important;}
-.maxwidth190{max-width: 190px; color:#666666;font-size: 14px;}
-.color05101A{color:#05101A;}
-.liactive{border-left: 1px solid #4CACFF;}
-
-.bannername{
-    max-width: 907px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    height: 40px;
+  padding: 20px;
+  height: 48px !important;
+  line-height: 10px !important;
 }
 
-.bannnerusername{
-    font-size: 20px;
-    margin-left: 20px;
+.newedu-class-leftnav .addjia:hover {
+  background: #fff !important;
 }
 
-.bannnerusernames{
-    font-size: 14px;
-    margin-left: 20px;
+.pl20 {
+  padding-left: 20px;
 }
-.bannerimgname{
-    width: 40px;
-    height: 40px;
+
+.ml90 {
+  margin-left: 90px;
 }
-.clearfixborder{
-    /*border-top: 1px solid rgba(255,255,255,0.2);*/
-    padding-top: 10px;
+
+.ebebeb {
+  border-bottom: 1px solid #EBEBEB;
 }
-.ml8{
-    margin-left:8px;
+
+.CheckboxGroup {
+  background: rgba(249, 249, 249, 1);
 }
-.bannerurli{
-    border-right: 1px solid rgba(255,255,255,0.3);
-    width: 70px;
-    margin-left: -10px;
+
+.maxwidth155 {
+  max-width: 155px;
+  color: #666666;
+  font-size: 14px;
 }
-.bannerurlis{
-    width: 70px;
-    margin-left: -10px;
+
+.maxwidth170 {
+  max-width: 170px;
+  color: #666666;
+  font-size: 14px;
 }
-.pathInfobox li{
-    margin-right: 20px;
-    height: 20px;
-    /*overflow: hidden;*/
-    line-height: 20px;
+
+.pl46 {
+  margin-left: 46px !important;
+  border-bottom: 1px solid #eeee;
+  width: 90% !important;
 }
-.width70f{
-    width: 70px;
-    margin-left: -10px;
+
+.hidden {
+  overflow: hidden;
 }
-.width100f{
-    width: 100px;
+
+.pd0 {
+  padding: 0px !important;
 }
-.mr10im{
-    margin-right: 10px !important;
+
+.color999 {
+  color: #999999 !important;
 }
+
+.maxwidth190 {
+  max-width: 190px;
+  color: #666666;
+  font-size: 14px;
+}
+
+.color05101A {
+  color: #05101A;
+}
+
+.liactive {
+  border-left: 1px solid #4CACFF;
+}
+
+.xaxisreverseorder .ant-input-group-addon .ant-btn-lg {
+  height: 38px;
+}
+
+.ant-input-group-addon .ant-btn-lg {
+  height: 39px;
+  border-radius: 0px 3px 3px 0px !important;
+  border: none !important;
+}
+
+.bannername {
+  max-width: 907px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 40px;
+}
+
+.bannnerusername {
+  font-size: 20px;
+  margin-left: 20px;
+}
+
+.bannnerusernames {
+  font-size: 14px;
+  margin-left: 20px;
+}
+
+.bannerimgname {
+  width: 40px;
+  height: 40px;
+}
+
+.clearfixborder {
+  /*border-top: 1px solid rgba(255,255,255,0.2);*/
+  padding-top: 10px;
+}
+
+.ml8 {
+  margin-left: 8px;
+}
+
+.bannerurli {
+  border-right: 1px solid rgba(255, 255, 255, 0.3);
+  width: 70px;
+  margin-left: -10px;
+}
+
+.bannerurlis {
+  width: 70px;
+  margin-left: -10px;
+}
+
+.pathInfobox li {
+  margin-right: 20px;
+  height: 20px;
+  /*overflow: hidden;*/
+  line-height: 20px;
+}
+
+.width70f {
+  width: 70px;
+  margin-left: -10px;
+}
+
+.width100f {
+  width: 100px;
+}
+
+.mr10im {
+  margin-right: 10px !important;
+}
+
 /*.width83{*/
-    /*width: 83px;*/
+/*width: 83px;*/
 /*}*/
-.width75f{
-    width: 75px;
-}
-.width107f{
-    width: 107px;
-}
-.mr0{
-    margin-right: 0px !important;
+.width75f {
+  width: 75px;
 }
 
-.mlf3{
-    margin-left: -3px;
-}
-.relative{
-    position: relative;
+.width107f {
+  width: 107px;
 }
 
-.courseedu-menu-list{
-    right: 262px;
-    top: 245px;
+.mr0 {
+  margin-right: 0px !important;
 }
+
+.mlf3 {
+  margin-left: -3px;
+}
+
+.relative {
+  position: relative;
+}
+
+.courseedu-menu-list {
+  right: 262px;
+  top: 245px;
+}
+
 .edu-menu-list li {
-    width: 100%;
-    padding: 0px 15px;
-    box-sizing: border-box;
-    height: 35px !important;
-    line-height: 35px !important;
-    cursor: pointer;
-    /*!*text-align: center;*!  影响全局了*/
-}
-.marleftf20{
-    margin-left:-20px;
+  width: 100%;
+  padding: 0px 15px;
+  box-sizing: border-box;
+  height: 35px !important;
+  line-height: 35px !important;
+  cursor: pointer;
+  /*!*text-align: center;*!  影响全局了*/
 }
 
-.marleftf10{
-    margin-left:-10px;
-}
-.sandianbox{
-    width: 92px;
-    /*height: 88px;*/
-    background: rgba(255,255,255,1);
-    /*-webkit-box-shadow: 0px 0px 6px 0px rgba(0,3,30,0.29);*/
-    /*box-shadow: 0px 0px 6px 0px rgba(0,3,30,0.29);*/
-    /*border-radius: 2px;*/
-    /*position: absolute;*/
-    /*right: -88px;*/
-    /*z-index: 20000;*/
-    /*padding-top: 10px;*/
-    /*padding-bottom: 10px;*/
-    /*top: 0px;*/
-}
-.sandianbox div{
-    width: 92px;
-    height: 35px;
-    text-align: center;
-    line-height: 35px;
-    cursor: pointer;
-}
-.sandianbox div:hover{
-    background: rgba(240,240,240,1);
+.marleftf20 {
+  margin-left: -20px;
 }
 
-.sandianshow:hover .icon-sandian .sandianbox{
-    display: block;
+.marleftf10 {
+  margin-left: -10px;
 }
 
-.sandianboxs{
-    width: 92px;
-    /* height: 88px; */
-    background: rgba(255,255,255,1);
-    /*-webkit-box-shadow: 0px 0px 6px 0px rgba(0,3,30,0.29);*/
-    /*box-shadow: 0px 0px 6px 0px rgba(0,3,30,0.29);*/
-    /*border-radius: 2px;*/
-    /*!*position: absolute;*!*/
-    /*!*right: -109px;*!*/
-    /*!*z-index: 20000;*!*/
-    /*padding-top: 10px;*/
-    /*padding-bottom: 10px;*/
-    /*top: 0px;*/
-}
-.sandianboxs div{
-    width: 92px;
-    height: 35px;
-    text-align: center;
-    line-height: 35px;
-}
-.sandianboxs div:hover{
-    background: rgba(240,240,240,1);
+.sandianbox {
+  width: 92px;
+  background: rgba(255, 255, 255, 1);
 }
 
-.sandianshows:hover .icon-sandian .sandianbox{
-    display: block;
-}
-.mr6{
-    margin-right:6px;
+.sandianbox div {
+  width: 92px;
+  height: 35px;
+  text-align: center;
+  line-height: 35px;
+  cursor: pointer;
 }
 
-.mr28{
-    margin-right: 28px;
-}
-.mr23{
-    margin-right: 23px;
+.sandianbox div:hover {
+  background: rgba(240, 240, 240, 1);
 }
 
-.width93{
-    width: 240px !important;
-}
-.colortransparent{
-    color:transparent !important;
+.sandianshow:hover .icon-sandian .sandianbox {
+  display: block;
 }
 
-.inputNav{
-    width: 439px;
-    height: 30px;
-    background: rgba(244,244,244,1);
-    border: 1px solid rgba(234,234,234,1);
-    border-radius: 4px;
+.sandianboxs {
+  width: 92px;
+  background: rgba(255, 255, 255, 1);
 }
 
-.Navmodal{
-    width: 600px !important;
-    height: 237px;
-    background: rgba(255,255,255,1);
-    box-shadow: 0px 2px 10px 0px rgba(76,76,76,0.3);
-    border-radius: 10px;
-}
-.Navmodal .ant-modal-content .ant-modal-header{
-    /*border-radius: 10px 10px 0 0;*/
-}
-.ant-modal-content{
-    -webkit-box-shadow: 0 4px 12px  transparent !important;
-    box-shadow: 0 4px 12px transparent !important;
-    /*border-radius: 10px !important;*/
+.sandianboxs div {
+  width: 92px;
+  height: 35px;
+  text-align: center;
+  line-height: 35px;
 }
 
-.Navmodal  .ant-modal-body{
-    margin-top:10px;
+.sandianboxs div:hover {
+  background: rgba(240, 240, 240, 1);
 }
-.ant-input:focus{
-    border: 1px solid #d9d9d9 !important;
+
+.sandianshows:hover .icon-sandian .sandianbox {
+  display: block;
+}
+
+.mr6 {
+  margin-right: 6px;
+}
+
+.mr28 {
+  margin-right: 28px;
+}
+
+.mr23 {
+  margin-right: 23px;
+}
+
+.width93 {
+  width: 240px !important;
+}
+
+.colortransparent {
+  color: transparent !important;
+}
+
+.inputNav {
+  width: 439px;
+  height: 30px;
+  background: rgba(244, 244, 244, 1);
+  border: 1px solid rgba(234, 234, 234, 1);
+  border-radius: 4px;
+}
+
+.Navmodal {
+  width: 600px !important;
+  height: 237px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 2px 10px 0px rgba(76, 76, 76, 0.3);
+  border-radius: 10px;
+}
+
+.ant-modal-content {
+  -webkit-box-shadow: 0 4px 12px transparent !important;
+  box-shadow: 0 4px 12px transparent !important;
+}
+
+.Navmodal .ant-modal-body {
+  margin-top: 10px;
+}
+
+.ant-input:focus {
+  border: 1px solid #d9d9d9 !important;
 }
 
 /* 公用的文字按钮：蓝、白、灰 */
 .btn.colorblue {
-    color:#4CACFF !important;
+  color: #4CACFF !important;
 }
-.btn.colorblue:hover{
-    color:#459BE5 !important;
+
+.btn.colorblue:hover {
+  color: #459BE5 !important;
 }
-.btn.colorwhite{
-    color:#fff !important
+
+.btn.colorwhite {
+  color: #fff !important
 }
-.btn.colorwhite:hover{
-    color:#CCCCCC !important
+
+.btn.colorwhite:hover {
+  color: #CCCCCC !important
 }
-.btn.colorgrey{
-    color:#999999 !important;
+
+.btn.colorgrey {
+  color: #999999 !important;
 }
-.btn.colorgrey:hover{
-    color:#05101A !important;
+
+.btn.colorgrey:hover {
+  color: #05101A !important;
 }
-.btn.hovercolorblue:hover{
-    color:#459BE5 !important;
+
+.btn.hovercolorblue:hover {
+  color: #459BE5 !important;
 }
 
 /* 公用封装的按钮 */
-.Actionbtn{
-    display: inline-block;
-    height: 30px;
-    line-height: 30px;
-    border-radius: 2px;
-    text-align: center;
+.Actionbtn {
+  display: inline-block;
+  height: 30px;
+  line-height: 30px;
+  border-radius: 2px;
+  text-align: center;
 }
-.greyWidthFixed{
-    width: 120px;
-    border:1px solid #CCCCCC;
-    color: #CCCCCC!important;
+
+.greyWidthFixed {
+  width: 120px;
+  border: 1px solid #CCCCCC;
+  color: #CCCCCC !important;
 }
-.greyWidthFixed:hover{
-    border:1px solid #4CACFF;
-    color: #4CACFF!important;
+
+.greyWidthFixed:hover {
+  border: 1px solid #4CACFF;
+  color: #4CACFF !important;
 }
-.blueFull{
-    padding: 0px 7px;
-    background-color: #4CACFF;
-    color: #fff!important;
+
+.blueFull {
+  padding: 0px 7px;
+  background-color: #4CACFF;
+  color: #fff !important;
 }
 
 .colorBlue {
-    padding: 0px 7px;
-    background-color: #fff;
-    color: #4CACFF!important;
-    border: 1px solid #4CACFF;
+  padding: 0px 7px;
+  background-color: #fff;
+  color: #4CACFF !important;
+  border: 1px solid #4CACFF;
 }
-.greyBack{
-    /* 不要固定宽度 */
-    /* width: 64px; */
-    background-color: #CBCBCB;
-    color: #fff!important;
+
+.greyBack {
+  /* 不要固定宽度 */
+  /* width: 64px; */
+  background-color: #CBCBCB;
+  color: #fff !important;
 }
-.greenBack{
-    padding: 0px 7px;
-    background-color: #29BD8B;
-    color: #fff!important;
+
+.greenBack {
+  padding: 0px 7px;
+  background-color: #29BD8B;
+  color: #fff !important;
 }
+
 .Actionbtn.middle {
-    padding: 0px 18px;
-}
-.greyLine{
-    background: #fff;
-    border:1px solid #eaeaea;
-    color: #999!important;
-    padding:0px 10px;
-}
-.orangeLine{
-    background: #fff;
-    border:1px solid #FE944B;
-    color: #FE944B!important;
-    padding:0px 10px;
-    line-height: 28px;
-    border-radius: 4px;
+  padding: 0px 18px;
 }
 
-.colorFF6800{
-    color:#FF6800;
-}
-.color979797{
-    color:#979797;
-}
-.Draggableli:hover .Draggablelichild{
-    background: #f1f1f1 !important;;
+.greyLine {
+  background: #fff;
+  border: 1px solid #eaeaea;
+  color: #999 !important;
+  padding: 0px 10px;
 }
 
-.Draggableli:active .Draggablelichild{
-    background: #f1f1f1 !important;;
+.orangeLine {
+  background: #fff;
+  border: 1px solid #FE944B;
+  color: #FE944B !important;
+  padding: 0px 10px;
+  line-height: 28px;
+  border-radius: 4px;
 }
 
-.Draggableli:focus .Draggablelichild{
-    background: #f1f1f1 !important;;
+.colorFF6800 {
+  color: #FF6800;
 }
 
-.Draggableli:focus-within .Draggablelichild{
-    background: #f1f1f1 !important;;
+.color979797 {
+  color: #979797;
 }
 
-.Draggableli:visited .Draggablelichild{
-    background: #f1f1f1 !important;;
+.Draggableli:hover .Draggablelichild {
+  background: #f1f1f1 !important;
+  ;
 }
 
-.Draggableli:hover{
-    background: #f1f1f1 !important;;
+.Draggableli:active .Draggablelichild {
+  background: #f1f1f1 !important;
+  ;
 }
 
-.Draggableli:active{
-    background: #f1f1f1 !important;;
+.Draggableli:focus .Draggablelichild {
+  background: #f1f1f1 !important;
+  ;
 }
 
-.Draggableli:focus{
-    background: #f1f1f1 !important;;
+.Draggableli:focus-within .Draggablelichild {
+  background: #f1f1f1 !important;
+  ;
 }
 
-.Draggableli:focus-within{
-    background: #f1f1f1 !important;;
+.Draggableli:visited .Draggablelichild {
+  background: #f1f1f1 !important;
+  ;
+}
+
+.Draggableli:hover {
+  background: #f1f1f1 !important;
+  ;
+}
+
+.Draggableli:active {
+  background: #f1f1f1 !important;
+  ;
+}
+
+.Draggableli:focus {
+  background: #f1f1f1 !important;
+  ;
+}
+
+.Draggableli:focus-within {
+  background: #f1f1f1 !important;
+  ;
 }
 
 .Draggableli:visited {
-    background: #f1f1f1 !important;;
-}
-.transparent{
-    background: transparent;
+  background: #f1f1f1 !important;
+  ;
 }
 
-.HomeworkModal{
-    width:600px !important;
-}
-.HomeworkModal .ant-modal-content .ant-modal-body{
-    padding: 10px 20px;
+.transparent {
+  background: transparent;
 }
 
-.ant-modal-title{
-    height: 38px;
-    line-height: 38px;
+.HomeworkModal {
+  width: 600px !important;
 }
-.underline{text-decoration: underline;}
 
-.HomeworkModal .task-popup-content #search_not_members_list{
-    height: 198px;
+.HomeworkModal .ant-modal-content .ant-modal-body {
+  padding: 10px 20px;
+}
+
+.ant-modal-title {
+  height: 38px;
+  line-height: 38px;
+}
+
+.underline {
+  text-decoration: underline;
+}
+
+.HomeworkModal .task-popup-content #search_not_members_list {
+  height: 198px;
 }
 
 /* 选择实训列表 */
-.greybackHead{height: 40px;line-height: 40px;padding: 0px 20px;box-sizing: border-box;color: #676767;background-color: #eaeaea;}
-
-.mtf3{
-    margin-top:-3px;
+.greybackHead {
+  height: 40px;
+  line-height: 40px;
+  padding: 0px 20px;
+  box-sizing: border-box;
+  color: #676767;
+  background-color: #eaeaea;
 }
 
-.mtf5{
-    margin-top: -5px;
+.mtf3 {
+  margin-top: -3px;
 }
 
-.color204{
-    color:rgba(204,204,204,1);
+.mtf5 {
+  margin-top: -5px;
 }
 
-.lesson-saved-list-itemdrop{
-    height: 93px;
-    overflow: hidden;
+.color204 {
+  color: rgba(204, 204, 204, 1);
 }
 
-.lesson-saved-list{
-    position: relative;
+.lesson-saved-list-itemdrop {
+  height: 93px;
+  overflow: hidden;
 }
 
-.itempositionleft{
-    position: absolute;
+.lesson-saved-list {
+  position: relative;
 }
 
-.itempositionright{
-    position: absolute;
+.itempositionleft {
+  position: absolute;
 }
 
-.ant-input,.ant-input .ant-input-suffix{
-    background-color: #fafafa!important;
-}
-.ant-input:focus,.ant-input:focus .ant-input-suffix{
-    background-color:#ffffff!important;
+.itempositionright {
+  position: absolute;
 }
 
-.pathNavLine{bottom: -11px;}
-
-#shixun_operation:hover{
-    color:#fff !important;
+.ant-input,
+.ant-input .ant-input-suffix {
+  background-color: #fafafa !important;
 }
 
-.cursor{
-    cursor: pointer;
-}
-.paragraph_nameid:hover{
-    color:#4cacff !important;
+.ant-input:focus,
+.ant-input:focus .ant-input-suffix {
+  background-color: #ffffff !important;
 }
 
-.next-loading{
-    width:100%;
+.pathNavLine {
+  bottom: -11px;
 }
 
+#shixun_operation:hover {
+  color: #fff !important;
+}
+
+.cursor {
+  cursor: pointer;
+}
+
+.paragraph_nameid:hover {
+  color: #4cacff !important;
+}
+
+.next-loading {
+  width: 100%;
+}
 
 /*提交总结*/
-.summaryname{
-    /*height: 23px;*/
-    font-size: 22px;
-    height: 25px;
-    font-family: MicrosoftYaHei;
-    font-weight: 400;
-    color: rgba(51,51,51,1);
-    /*cursor: pointer;*/
-    max-width: 825px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+.summaryname {
+  /*height: 23px;*/
+  font-size: 22px;
+  height: 25px;
+  font-family: MicrosoftYaHei;
+  font-weight: 400;
+  color: rgba(51, 51, 51, 1);
+  /*cursor: pointer;*/
+  max-width: 825px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
-.educontentbox{
-    background: #fff;
-    padding-top: 40px;
-    padding-bottom: 40px;
+.educontentbox {
+  background: #fff;
+  padding-top: 40px;
+  padding-bottom: 40px;
 }
-.commitcontents{
-    width: 43px;
-    height: 15px;
-    font-size: 16px;
-    font-family: MicrosoftYaHei;
-    font-weight: 400;
-    margin-left: 28px;
+
+.commitcontents {
+  width: 43px;
+  height: 15px;
+  font-size: 16px;
+  font-family: MicrosoftYaHei;
+  font-weight: 400;
+  margin-left: 28px;
 }
-.commitcontentsysl{
-    width: 43px;
-    height: 15px;
-    font-size: 16px;
-    font-family: MicrosoftYaHei;
-    font-weight: 400;
-    margin-left: -4px;
+
+.commitcontentsysl {
+  width: 43px;
+  height: 15px;
+  font-size: 16px;
+  font-family: MicrosoftYaHei;
+  font-weight: 400;
+  margin-left: -4px;
 }
 
 
 /*列表状态*/
-.typestyle{
-    min-width: 68px;
-    height: 24px !important;
-    line-height: 24px !important;
-    color: #fff !important;
-}
-.edu-filter-btn-028d01{
-    /*border: 1px solid #ff6800;*/
-    /*color: #ff6800!important;*/
-    background: #028d01 !important;
-}
-.edu-filter-btn-CC317C{
-    background:#CC317C !important;
-}
-.edu-filter-btn-006B75{
-    background:#006B75 !important;
-}
-.edu-filter-btn-E99695{
-    background:#E99695 !important;
-}
-.edu-filter-btn-EDEDED{
-    background:#EDEDED !important;
-}
-.edu-filter-btn-4CACFF{
-    background:#4CACFF !important;
-}
-.edu-filter-btn-84B6EB{
-    background:#84B6EB !important;
-}
-.edu-filter-btn-5E5FB9{
-    background:#5E5FB9 !important;
-}
-.edu-filter-btn-FC2B6A{
-    background:#FC2B6A !important;
+.typestyle {
+  min-width: 68px;
+  height: 24px !important;
+  line-height: 24px !important;
+  color: #fff !important;
 }
 
-.edu-filter-btn-FF6800{
-    background:#FF6800 !important;
-}
-.color666666{
-    color:#666666 !important;
+.edu-filter-btn-028d01 {
+  background: #028d01 !important;
 }
 
-.TabsWarp{
-    width: 100px;
-    height: 31px;
-    display: inline-block;
+.edu-filter-btn-CC317C {
+  background: #CC317C !important;
 }
 
-.mt38{
-    margin-top: 38px;
+.edu-filter-btn-006B75 {
+  background: #006B75 !important;
+}
+
+.edu-filter-btn-E99695 {
+  background: #E99695 !important;
+}
+
+.edu-filter-btn-EDEDED {
+  background: #EDEDED !important;
+}
+
+.edu-filter-btn-4CACFF {
+  background: #4CACFF !important;
+}
+
+.edu-filter-btn-84B6EB {
+  background: #84B6EB !important;
+}
+
+.edu-filter-btn-5E5FB9 {
+  background: #5E5FB9 !important;
+}
+
+.edu-filter-btn-FC2B6A {
+  background: #FC2B6A !important;
+}
+
+.edu-filter-btn-FF6800 {
+  background: #FF6800 !important;
+}
+
+.edu-filter-btn-7AD58B {
+  background: #7AD58B !important;
+
+}
+
+.color666666 {
+  color: #666666 !important;
+}
+
+.TabsWarp {
+  width: 100px;
+  height: 31px;
+  display: inline-block;
+}
+
+.mt38 {
+  margin-top: 38px;
 }
 
 
-.poll_list a.active{
-    color: #4CACFF;
+.poll_list a.active {
+  color: #4CACFF;
 }
 
 .poll_list a {
-    display: inline-block;
-    padding: 20px;
-    font-size: 18px;
-    text-align: center;
-    position: relative;
-    color:#05101a;
+  display: inline-block;
+  padding: 20px;
+  font-size: 18px;
+  text-align: center;
+  position: relative;
+  color: #05101a;
 }
 
 .poll_list a.active:after {
-    content: '';
-    width: 94px;
-    left: 10px;
-    bottom: 0px;
-    height: 2px;
-    background-color: #4CACFF;
-    position: absolute;
+  content: '';
+  width: 94px;
+  left: 10px;
+  bottom: 0px;
+  height: 2px;
+  background-color: #4CACFF;
+  position: absolute;
 }
 
-.ml22{
-    margin-left:22px;
+.ml22 {
+  margin-left: 22px;
 }
+
 /* antd样式重置 */
 /* 字体 https://www.trustie.net/issues/21668/ */
 pre,
 code,
 kbd,
 samp {
-    font-family: "Monospaced Number", "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: "Monospaced Number", "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 
 /* 表格间距太大 */
-.ant-table-tbody>tr>td, .ant-table-thead>tr>th {
-    padding: 16px 0px;
+.ant-table-tbody>tr>td,
+.ant-table-thead>tr>th {
+  padding: 16px 0px;
 }
+
 /* FORM START */
-.ant-form label{
-    /* 为了覆盖antd的样式，这里使用了important，TODO */
-    font-size: 16px !important;
+.ant-form label {
+  /* 为了覆盖antd的样式，这里使用了important，TODO */
+  font-size: 16px !important;
 }
+
 .ant-form label.font-18 {
-    font-size: 18px !important;
+  font-size: 18px !important;
 }
+
 .ant-form label.font-14 {
-    font-size: 14px !important;
+  font-size: 14px !important;
 }
+
 .ant-form label.font-12 {
-    font-size: 12px !important;
+  font-size: 12px !important;
 }
+
 /* md编辑器在form中时，使用这个样式，可以把错误信息绝对定位 */
 /* 去掉form下边距 */
 .mdInForm.ant-form-item {
-    margin-bottom: 0px;
-}
-.mdInForm .has-error .ant-form-explain {
-    position: absolute;
-    margin-top: -2px;
-    margin-left: -7px;
-}
-/* ！！！课堂下统一的form样式前缀 courseForm */
-.courseForm .ant-select-selection--single, .courseForm .ant-select-selection__rendered{
-    height: 40px;
-    line-height: 40px;
+  margin-bottom: 0px;
 }
 
-.courseForm .ant-input-group > .ant-input:first-child, .ant-input-group-addon:first-child {
-    height: 40px;
+.mdInForm .has-error .ant-form-explain {
+  position: absolute;
+  margin-top: -2px;
+  margin-left: -7px;
 }
-.courseForm .ant-select-selection, .courseForm .ant-select-selection-selected-value {
-    height: 40px;
-    line-height: 40px;
+
+/* ！！！课堂下统一的form样式前缀 courseForm */
+.courseForm .ant-select-selection--single,
+.courseForm .ant-select-selection__rendered {
+  height: 40px;
+  line-height: 40px;
 }
+
+.courseForm .ant-input-group>.ant-input:first-child,
+.ant-input-group-addon:first-child {
+  height: 40px;
+}
+
+.courseForm .ant-select-selection,
+.courseForm .ant-select-selection-selected-value {
+  height: 40px;
+  line-height: 40px;
+}
+
 .courseForm .ant-input-affix-wrapper .ant-input {
-    height: 40px;
+  height: 40px;
 }
+
 .courseForm .ant-select-auto-complete.ant-select .ant-input {
-    height: 40px;
+  height: 40px;
 }
 
 .courseForm .ant-select-auto-complete.ant-select .ant-select-selection__rendered {
-    line-height: 40px;
+  line-height: 40px;
 }
+
 .courseForm .ant-select-auto-complete.ant-select .ant-input {
-    height: 40px;
+  height: 40px;
 }
 
 /*新建课堂*/
 
-.newcourses .ant-input{
-    width:280px;
-    margin-left: 11px;
-    height: 40px !important;
+.newcourses .ant-input {
+  width: 280px;
+  margin-left: 11px;
+  height: 40px !important;
 }
 
-.newcourses .ant-input{
-    width:280px;
-    margin-left: 11px;
-    height: 40px !important;
+.newcourses .ant-input {
+  width: 280px;
+  margin-left: 11px;
+  height: 40px !important;
 }
 
-.newcourses .ant-select-selection--single{
-    width: 280px;
-    /*margin-left: 11px;*/
-    height: 40px;
-    /*padding: 0px 0px 0px 0px;*/
-    color: rgba(0, 0, 0, 0.65);
-    background-color: #fafafa!important;
+.newcourses .ant-select-selection--single {
+  width: 280px;
+  /*margin-left: 11px;*/
+  height: 40px;
+  /*padding: 0px 0px 0px 0px;*/
+  color: rgba(0, 0, 0, 0.65);
+  background-color: #fafafa !important;
 }
-.newcourses .ant-select-selection__rendered{
-    line-height: 40px;
+
+.newcourses .ant-select-selection__rendered {
+  line-height: 40px;
 }
-.newcourses  .ant-select-selection-selected-value{
-    opacity: 1 !important;
+
+.newcourses .ant-select-selection-selected-value {
+  opacity: 1 !important;
 }
+
 .newcourses .ant-select-selection--single:focus {
-    -webkit-box-shadow: none!important;
-    box-shadow: none!important;
-    background-color: #fff!important;
+  -webkit-box-shadow: none !important;
+  box-shadow: none !important;
+  background-color: #fff !important;
 }
 
 .newcourses .ant-select-selection--single:hover {
-  border: 1px solid #d9d9d9!important;
+  border: 1px solid #d9d9d9 !important;
 }
 
-.pd20{
-    padding:20px;
+.pd20 {
+  padding: 20px;
 }
 
-.newcoursestitle{
-    font-size: 12px;
-    color: #989898;
-    margin-left: 40px;
+.newcoursestitle {
+  font-size: 12px;
+  color: #989898;
+  margin-left: 40px;
 }
-.newcoursestitleysl{
-    font-size: 12px;
-    color: #989898;
-    margin-left: 51px;
+
+.newcoursestitleysl {
+  font-size: 12px;
+  color: #989898;
+  margin-left: 51px;
 }
 
 
-.coursenavbox .ant-form-item-label{
-    margin-left:10px;
-}
-.coursenavbox .ant-checkbox-wrapper{
-    font-size: 14px !important;
+.coursenavbox .ant-form-item-label {
+  margin-left: 10px;
 }
 
-.coursenavbox .ant-form-item-control-wrapper{
-    padding-left:10px;
+.coursenavbox .ant-checkbox-wrapper {
+  font-size: 14px !important;
 }
 
-.coursesselect{
-    font-size: 12px;
-    color: #989898;
-    padding:0px;
-    margin-left: -8px;
+.coursenavbox .ant-form-item-control-wrapper {
+  padding-left: 10px;
 }
 
-.ant-col-offset-5{
-    margin-left: 2% !important;
-    margin-top: -43px;
+.coursesselect {
+  font-size: 12px;
+  color: #989898;
+  padding: 0px;
+  margin-left: -8px;
 }
 
-.coursenavbox  .ant-form-item-children-icon{
-    display: none;
+.ant-col-offset-5 {
+  margin-left: 2% !important;
+  margin-top: -43px;
+}
+
+.coursenavbox .ant-form-item-children-icon {
+  display: none;
 }
 
 .coursenavboxtow .ant-input {
-    margin-left:0px !important;
-}
-.ant-form-explain{
-    padding-left: 13px;
+  margin-left: 0px !important;
 }
 
-.exercise .ant-form-item-label{
-   margin-left:20px;
+.ant-form-explain {
+  padding-left: 13px;
 }
 
-#coursesNew_startTime{
-    width:210px !important;
+.exercise .ant-form-item-label {
+  margin-left: 20px;
 }
 
-#coursesNew_startTime .ant-input{
-    width:210px !important;
+#coursesNew_startTime {
+  width: 210px !important;
 }
 
-#coursesNew_endTime{
-    width:210px !important;
+#coursesNew_startTime .ant-input {
+  width: 210px !important;
 }
 
-#coursesNew_endTime .ant-input{
-    width:210px !important;
+#coursesNew_endTime {
+  width: 210px !important;
 }
 
-.exerciseselect{
-    font-size: 12px;
-    color: #989898;
-    padding:0px;
-    margin-left: 20px;
+#coursesNew_endTime .ant-input {
+  width: 210px !important;
 }
 
-.ml28{
-    margin-left: 28px;
-}
-.ant-calendar-picker-clear, .ant-calendar-picker-icon{
-    right: 12px !important;
-}
-.exercise  .ant-form-item-children-icon{
-    display: none;
+.exerciseselect {
+  font-size: 12px;
+  color: #989898;
+  padding: 0px;
+  margin-left: 20px;
 }
 
-.pd60{
-    padding-left: 60px;
+.ml28 {
+  margin-left: 28px;
 }
 
-.pd28{
-    padding-left: 28px;
+.ant-calendar-picker-clear,
+.ant-calendar-picker-icon {
+  right: 12px !important;
 }
 
-.exerciselist .ant-form-explain{
-    display:none;
+.exercise .ant-form-item-children-icon {
+  display: none;
 }
 
-.exerciselist .ant-input{
-    border: 1px solid #d9d9d9 !important;
+.pd60 {
+  padding-left: 60px;
 }
 
-.exercisetime .ant-form-explain{
-   margin-left:107px;
+.pd28 {
+  padding-left: 28px;
 }
 
-.ant-input-search-icon:hover{
-    color: #4CACFF !important;
+.exerciselist .ant-form-explain {
+  display: none;
 }
 
-.coursehomework:hover .activity-title{
-    color: #4CACFF !important;
+.exerciselist .ant-input {
+  border: 1px solid #d9d9d9 !important;
 }
 
-.martopf2{
-    margin-top:-2px;
+.exercisetime .ant-form-explain {
+  margin-left: 107px;
 }
+
+.ant-input-search-icon:hover {
+  color: #4CACFF !important;
+}
+
+.coursehomework:hover .activity-title {
+  color: #4CACFF !important;
+}
+
+.martopf2 {
+  margin-top: -2px;
+}
+
 /* AboutInputForm---设置from表单的整体样式，适用于新建编辑等页面-----begin */
-.searchViewAfter{
-    width: 100%;
-    height: 40px;
+.searchViewAfter {
+  width: 100%;
+  height: 40px;
 }
-.searchViewAfter.ant-input{
-    line-height: 40px;
-    height: 40px;
-    border-right: none!important;
-    box-shadow: none!important;
+
+.searchViewAfter.ant-input {
+  line-height: 40px;
+  height: 40px;
+  border-right: none !important;
+  box-shadow: none !important;
 }
+
 /* 这个加了干嘛的？影响到了带addonAfter的input  */
-.searchViewAfter,.searchViewAfter:focus,.searchViewAfter .ant-input:hover,.searchViewAfter .ant-input-group .ant-input:focus{
-    border-right: none!important;
-  }
-  .AboutInputForm .ant-form-item-label{
-    overflow:unset;
-    margin-bottom: 18px;
-  }
-  .AboutInputForm .ant-form-item label{
-    font-size: 16px;
-  }
-  .AboutInputForm{
-    background: #fff;
-  }
-  .AboutInputForm.ant-form-item,.AboutInputForm .ant-form-item{
-    padding:20px 30px 30px 30px!important;
-    position: relative;
-    border-bottom: 1px solid #EDEDED;
-    margin-bottom: 0px;
-  }
-  .AboutInputForm:last-child{
-    border-bottom: none!important;
-  }
-  .AboutInputForm .ant-form-item-required:before{
-    position: absolute;
-    left: -15px;
-    top: 4px;
-    color: #FE4F4C;
-  }
+.searchViewAfter,
+.searchViewAfter:focus,
+.searchViewAfter .ant-input:hover,
+.ant-input-group .ant-input:focus {
+  border-right: none !important;
+}
 
-  /* 毕设任务 */
-  .graduationTaskMenu>a{
-      display: block;
-      position: relative;
-      line-height: 72px;
-      font-size: 16px;
-      margin-right: 30px;
-      float: left;
-  }
-  .graduationTaskMenu>a.active:after{
-      position: absolute;
-      left: 0px;
-      height: 2px;
-      width: 100%;
-      content: '';
-      background: #4CACFF;
-      bottom: 0px;
-      font-weight:400;
-  }
-  .graduationTaskMenu>a.active{
-      color: #4CACFF!important;
-  }
+.AboutInputForm .ant-form-item-label {
+  overflow: unset;
+  margin-bottom: 18px;
+}
 
-  /* end */
+.AboutInputForm .ant-form-item label {
+  font-size: 16px;
+}
+
+.AboutInputForm {
+  background: #fff;
+}
+
+.AboutInputForm.ant-form-item,
+.AboutInputForm .ant-form-item {
+  padding: 20px 30px 30px 30px !important;
+  position: relative;
+  border-bottom: 1px solid #EDEDED;
+  margin-bottom: 0px;
+}
+
+.AboutInputForm:last-child {
+  border-bottom: none !important;
+}
+
+.AboutInputForm .ant-form-item-required:before {
+  position: absolute;
+  left: -15px;
+  top: 4px;
+  color: #FE4F4C;
+}
+
+/* 毕设任务 */
+.graduationTaskMenu>a {
+  display: block;
+  position: relative;
+  line-height: 72px;
+  font-size: 16px;
+  margin-right: 30px;
+  float: left;
+}
+
+.graduationTaskMenu>a.active:after {
+  position: absolute;
+  left: 0px;
+  height: 2px;
+  width: 100%;
+  content: '';
+  background: #4CACFF;
+  bottom: 0px;
+  font-weight: 400;
+}
+
+.graduationTaskMenu>a.active {
+  color: #4CACFF !important;
+}
+
+/* end */
 /* form表单，包含多个item时 */
-.createPage{
-    padding:20px 30px 30px;
-    position: relative;
-    border-bottom: 1px solid #EDEDED;
-    margin-bottom: 0px;
-  }
-  .createPage .ant-form-item{
-    margin-bottom: 0px;
-  }
-  .createPage:last-child{
-    border-bottom: none!important;
-  }
-  .createPage{
-    background: #fff;
-  }
-  .createPage .ant-form-item-label{
-    overflow:unset;
-    margin-bottom: 10px;
-  }
-  .createPage .ant-form-item label{
-    font-size: 16px;
-  }
-  .createPage .ant-form-explain{
-    padding-left: 0px;
-  }
+.createPage {
+  padding: 20px 30px 30px;
+  position: relative;
+  border-bottom: 1px solid #EDEDED;
+  margin-bottom: 0px;
+}
 
-  .has-error .ant-input-group-addon{
-    border-color:#f5222d!important;
-  }
-  .createPage .ant-form-item-required{
-      margin-left: -10px;
-  }
-  /* 新建编辑 */
-.signPoint{
-    position: absolute;
-    left: 15px;
-    top: 32px;
-    color: #FE4F4C;
-  }
+.createPage .ant-form-item {
+  margin-bottom: 0px;
+}
 
-  .searchView{
-    width: 248px;
-    height: 40px;
-  }
-  .searchView .ant-input{
-    background-color: #fafafa!important;
-  }
-  .searchView .ant-input-affix-wrapper{
-    height: 40px;
-  }
-  .ant-input-affix-wrapper:hover .ant-input:not(.ant-input-disabled){
-    border:1px solid #d9d9d9!important;
-  }
-  .ant-input-affix-wrapper .ant-input-prefix, .ant-input-affix-wrapper .ant-input-suffix {
-    background: #fafafa!important;
-  }
-  .ant-input:hover{
-    border:1px solid #d9d9d9!important;
-  }
-  .ant-input:focus{
-    box-shadow:none!important;
-    background-color: #fff!important;
-  }
-  .ant-input:focus + .ant-input-group-addon{
-    background-color: #fff!important;
-  }
-  .ant-input-group-addon{
-    color: #666!important;
-    font-size: 12px;
-    border: 1px solid #d9d9d9!important;
-    border-left: none!important;
-  }
+.createPage:last-child {
+  border-bottom: none !important;
+}
 
-  .check_on{
-      background: #4CACFF;
-      color: #ffffff!important;
-      border-radius: 12px;
-  }
+.createPage {
+  background: #fff;
+}
 
-  .ant-table-thead tr th div{
-    font-size: 14px;
-    font-family: MicrosoftYaHei;
-    font-weight: 400;
-    color: rgba(102,102,102,1);
-  }
+.createPage .ant-form-item-label {
+  overflow: unset;
+  margin-bottom: 10px;
+}
+
+.createPage .ant-form-item label {
+  font-size: 16px;
+}
+
+.createPage .ant-form-explain {
+  padding-left: 0px;
+}
+
+.has-error .ant-input-group-addon {
+  border-color: #f5222d !important;
+}
+
+.createPage .ant-form-item-required {
+  margin-left: -10px;
+}
+
+/* 新建编辑 */
+.signPoint {
+  position: absolute;
+  left: 15px;
+  top: 32px;
+  color: #FE4F4C;
+}
+
+.searchView {
+  width: 248px;
+  height: 40px;
+}
+
+.searchView .ant-input {
+  background-color: #fafafa !important;
+}
+
+.searchView .ant-input-affix-wrapper {
+  height: 40px;
+}
+
+.ant-input-affix-wrapper:hover .ant-input:not(.ant-input-disabled) {
+  border: 1px solid #d9d9d9 !important;
+}
+
+.ant-input-affix-wrapper .ant-input-prefix,
+.ant-input-affix-wrapper .ant-input-suffix {
+  background: #fafafa !important;
+}
+
+.ant-input:hover {
+  border: 1px solid #d9d9d9 !important;
+}
+
+.ant-input:focus {
+  box-shadow: none !important;
+  background-color: #fff !important;
+}
+
+.ant-input:focus+.ant-input-group-addon {
+  background-color: #fff !important;
+}
+
+.ant-input-group-addon {
+  color: #666 !important;
+  font-size: 12px;
+  border: 1px solid #d9d9d9 !important;
+  border-left: none !important;
+}
+
+.check_on {
+  background: #4CACFF;
+  color: #ffffff !important;
+  border-radius: 12px;
+}
+
+.ant-table-thead tr th div {
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  font-weight: 400;
+  color: rgba(102, 102, 102, 1);
+}
 
 /* 右侧搜索区域*/
 .searchFor .searchCon {
-    width: 215px;
+  width: 215px;
 }
 
 .search-new {
-    width:237px!important;
-    height: 30px;
-    margin-bottom: 30px;
-    /*margin-right: 35px;*/
+  width: 237px !important;
+  height: 30px;
+  margin-bottom: 30px;
+  /*margin-right: 35px;*/
 }
+
 .search-new-input {
-    padding-left: 16px;
-    height: 30px;
-    width: 210px;
+  padding-left: 16px;
+  height: 30px;
+  width: 210px;
 }
+
 .search-span {
-    border-radius: 17px;
+  border-radius: 17px;
 }
 
 
 /* 右侧 热门标签 */
-.HotLabelList a{display: block;float: left;padding: 0px 9px;height: 28px;line-height: 28px;border-radius: 14px;background-color: #f5f5f5;color: #666;margin-right: 10px;margin-bottom: 9px;}
+.HotLabelList a {
+  display: block;
+  float: left;
+  padding: 0px 9px;
+  height: 28px;
+  line-height: 28px;
+  border-radius: 14px;
+  background-color: #f5f5f5;
+  color: #666;
+  margin-right: 10px;
+  margin-bottom: 9px;
+}
+
 .HotLabelList a.selected {
-    background: #4CACFF;
-    color: #fff;
+  background: #4CACFF;
+  color: #fff;
 }
 
 
 
 /* 右侧 热门问题 */
-.hotQuestionItem{padding:20px 0px;border-bottom: 1px solid #eee;}
-.questiontName{max-width: 100%;display: block;}
+.hotQuestionItem {
+  padding: 20px 0px;
+  border-bottom: 1px solid #eee;
+}
+
+.questiontName {
+  max-width: 100%;
+  display: block;
+}
 
 
 
 /* 用户信息-UserSection*/
-.user_default_btn {width: 114px;}
-.userPrivateName{line-height: 25px;margin-bottom: 9px;}
-.userPrivatePost{line-height: 20px;}
-.noteDetailTitle{line-height: 38px;font-size: 24px;font-weight: normal;text-align:justify }
+.user_default_btn {
+  width: 114px;
+}
 
-.noteDetailNum{float: left;padding:0px 12px;position: relative;color: #999!important;height: 28px;line-height: 26px;}
-.noteDetailNum.rightline:after{position: absolute;content: '';right: 0px;width: 1px;background-color: #EAEAEA;height: 8px;top:10px;}
+.userPrivateName {
+  line-height: 25px;
+  margin-bottom: 9px;
+}
+
+.userPrivatePost {
+  line-height: 20px;
+}
+
+.noteDetailTitle {
+  line-height: 38px;
+  font-size: 24px;
+  font-weight: normal;
+  text-align: justify
+}
+
+.noteDetailNum {
+  float: left;
+  padding: 0px 12px;
+  position: relative;
+  color: #999 !important;
+  height: 28px;
+  line-height: 26px;
+}
+
+.noteDetailNum.rightline:after {
+  position: absolute;
+  content: '';
+  right: 0px;
+  width: 1px;
+  background-color: #EAEAEA;
+  height: 8px;
+  top: 10px;
+}
 
 /*帖子详情点赞*/
-.noteDetailPoint{width: 100px;height: 70px;background-color: #4cacff;border-radius: 35px;color: #FFFFff;text-align: center;margin: 0px auto;-webkit-box-sizing: border-box;box-sizing: border-box;padding: 2px 0px;cursor: pointer;    line-height: 22px;
-    padding-top: 12px;}
-.Pointed{background-color:#f0f0f0;color: #b3b3b3; cursor: default}
-.notefileDownload{height: 25px;line-height: 22px;}
+.noteDetailPoint {
+  width: 100px;
+  height: 70px;
+  background-color: #4cacff;
+  border-radius: 35px;
+  color: #FFFFff;
+  text-align: center;
+  margin: 0px auto;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 2px 0px;
+  cursor: pointer;
+  line-height: 22px;
+  padding-top: 12px;
+}
+
+.Pointed {
+  background-color: #f0f0f0;
+  color: #b3b3b3;
+  cursor: default
+}
+
+.notefileDownload {
+  height: 25px;
+  line-height: 22px;
+}
 
 /* 评论：隐藏二级回复用户头像 */
-.comments_hideSecondReplyUserHeader .imageFuzzy{
-    display: none;
+.comments_hideSecondReplyUserHeader .imageFuzzy {
+  display: none;
 }
 
 .comments_hideSecondReplyUserHeader .editormd {
-    width: 100%;
+  width: 100%;
 }
 
 .comments_hideSecondReplyUserHeader .orig_reply {
-    margin-bottom: 6px;
+  margin-bottom: 6px;
 }
 
-.color9B9B{color:#9B9B9B;}
-.color656565{color:#656565;}
+.color9B9B {
+  color: #9B9B9B;
+}
 
-.h20{height: 20px;}
+.color656565 {
+  color: #656565;
+}
 
-.xingrequired:before{  display: inline-block;
-    margin-right: 4px;
-    color: #f5222d;
-    font-size: 14px;
-    font-family: SimSun, sans-serif;
-    line-height: 1;
-    content: '*';
+.h20 {
+  height: 20px;
+}
+
+.xingrequired:before {
+  display: inline-block;
+  margin-right: 4px;
+  color: #f5222d;
+  font-size: 14px;
+  font-family: SimSun, sans-serif;
+  line-height: 1;
+  content: '*';
 }
 
 
 .pl30 {
-    padding-left: 30px !important;
+  padding-left: 30px !important;
 }
 
-.pl36{
-    padding-left: 36px !important;
+.pl36 {
+  padding-left: 36px !important;
 }
 
-.ml87{
-    margin-left: 87px;
-}
-.textcenter{
-    text-align: center;
+.ml87 {
+  margin-left: 87px;
 }
 
-.members{
-    width: 416px;
-    height: 400px;
-    background: rgba(244,250,255,1);
-    border-radius: 4px;
-    padding: 20px;
+.textcenter {
+  text-align: center;
 }
 
-.youjiangboxs{
-    height: 400px;
-    width: 56px;
-    color: #9A9A9A;
-    float: left;
-    text-align: center;
-    line-height: 400px;
+.members {
+  width: 416px;
+  height: 400px;
+  background: rgba(244, 250, 255, 1);
+  border-radius: 4px;
+  padding: 20px;
 }
 
-.Association{
-    width: 100%;
-    height: 240px;
-    margin-top: 14px;
-    overflow: auto;
+.youjiangboxs {
+  height: 400px;
+  width: 56px;
+  color: #9A9A9A;
+  float: left;
+  text-align: center;
+  line-height: 400px;
 }
 
-.click_adds{
-    text-align: center;
-    height: 90px;
-    line-height: 90px;
-    background-color: #fff;
-    cursor: pointer;
+.Association {
+  width: 100%;
+  height: 240px;
+  margin-top: 14px;
+  overflow: auto;
+}
+
+.click_adds {
+  text-align: center;
+  height: 90px;
+  line-height: 90px;
+  background-color: #fff;
+  cursor: pointer;
 }
 
 /* 问卷新建编辑 */
-.selectAnswer{
-    color: #666;
-    background-color: #ededed;
-    float: left;
-    padding:0px 15px;
-    border-radius: 12px;
-    height: 22px;
-    line-height: 22px;
-    font-size: 14px;
+.selectAnswer {
+  color: #666;
+  background-color: #ededed;
+  float: left;
+  padding: 0px 15px;
+  border-radius: 12px;
+  height: 22px;
+  line-height: 22px;
+  font-size: 14px;
 }
 
 /* antd的datepicker组件 隐藏掉disable了的item，参考CommonWorkSetting.js */
 .hideDisable .ant-calendar-time-picker-select-option-disabled {
-    display: none
+  display: none
 }
+
 /* 附件名称最长30个字符 */
 .upload_item {
-    max-width: 432px;
+  max-width: 432px;
 }
+
 /* antd上传附件按钮样式 */
 .uploadBtn.ant-btn {
-    border: none;
-    color: #4CACFF;
-    box-shadow: none;
-    background: transparent;
-    padding: 0 6px;
-    padding-left: 0px;
+  border: none;
+  color: #4CACFF;
+  box-shadow: none;
+  background: transparent;
+  padding: 0 6px;
+  padding-left: 0px;
+}
+
+.uploadBtn.ant-btn i {
+  display: none
+}
+
+.uploadBtn.ant-btn span {
+  margin-left: 0px;
+}
+
+.upload_1 .ant-upload-list {
+  width: 350px;
 }
-    .uploadBtn.ant-btn i {
-        display: none
-    }
-    .uploadBtn.ant-btn span{
-        margin-left: 0px;
-    }
-    .upload_1 .ant-upload-list {
-        width: 350px;
-    }
 
 
 /* tip英文未换行 */
-.ant-tooltip-inner{
-    word-wrap: break-word;
-    word-break: break-all;
+.ant-tooltip-inner {
+  word-wrap: break-word;
+  word-break: break-all;
 }
 
 /* List列表页的公共样式---------------------------------------------- START */
-.padding02010{
-    padding: 10px 30px 0px 30px;
-    cursor: pointer;
+.padding02010 {
+  padding: 10px 30px 0px 30px;
+  cursor: pointer;
 }
-.ant-checkbox-group > div .boardsList {
-    border-top: 1px solid transparent;
-    padding: 10px 0px 20px!important;
+
+.ant-checkbox-group>div .boardsList {
+  border-top: 1px solid transparent;
+  padding: 10px 0px 20px !important;
 }
-.padding02010:hover{
-    box-shadow: 0px 2px 6px rgba(51,51,51,0.09);
-    opacity: 1;
-    border-radius: 2px;
+
+.padding02010:hover {
+  box-shadow: 0px 2px 6px rgba(51, 51, 51, 0.09);
+  opacity: 1;
+  border-radius: 2px;
 }
 
 /* 下拉 ---------------- START */
 
 /* 公用下拉菜单 */
-.drop_down{
-    position: relative;
-  }
-  .drop_down > i{
-    cursor: pointer;
-  }
-  .drop_down_menu,.drop_down_normal{
-    display: none;
-    position: absolute;
-    left:0px;
-    top:99%;
-    background-color: #fff;
-    box-shadow:0px 0px 6px 0px rgba(76,76,76,0.2);
-    padding-top: 10px;
-    padding-bottom: 10px;
-    z-index: 1000;
-  }
-  .drop_down:hover .drop_down_menu,.drop_down:hover .drop_down_normal{
-    /* display: block; */
-    display: flex;
-    flex-direction: column;
-  }
-  /* 单选下拉列表（超出十条数据带搜索、且有添加按钮） */
-  .drop_down_menu li{
-    overflow:hidden;
-    white-space: nowrap;
-    text-overflow:ellipsis;
-    padding:0px 20px;
-    height: 34px;
-    line-height: 34px;
-    width: 262px;
-    color: #333333;
-    display: block;
-    float: none;
-    font-size: 14px;
-    cursor: pointer;
-  }
-  .drop_down_search{
-    margin:0px 18px 10px;
-  }
-  .drop_down_menu li:hover,.drop_down_normal li:hover{
-    background-color: #f0f0f0;
-  }
-  .drop_down_menu .drop_down_btn{
-    left: unset;
-    display: block;
-    margin:0px 20px;
-    border-top: 1px solid #ebebeb;
-    height: 48px;
-    line-height: 48px;
-    color: #666666;
-  }
-
-/* 下拉 ---------------- END */
-
-/* List列表页的公共样式---------------------------------------------- END */
-
-.task_menu_ul .ant-menu-horizontal{
-    border-bottom: none !important;
+.drop_down {
+  position: relative;
 }
 
-.shixunreporttitle{
-    /*overflow: hidden;*/
-    max-width: 1060px;
-    /*line-height: 76px;*/
-    padding-left: 5px;
-    text-align: justify;
+.drop_down>i {
+  cursor: pointer;
 }
-.shixunreporttitles{
-    /*max-height: 76px;*/
-    /*line-height: 76px;*/
-    padding-left: 5px;
+
+.drop_down_menu,
+.drop_down_normal {
+  display: none;
+  position: absolute;
+  left: 0px;
+  top: 99%;
+  background-color: #fff;
+  box-shadow: 0px 0px 6px 0px rgba(76, 76, 76, 0.2);
+  padding-top: 10px;
+  padding-bottom: 10px;
+  z-index: 1000;
 }
-.padding10200{
-    padding: 10px 20px;
+
+.drop_down:hover .drop_down_menu,
+.drop_down:hover .drop_down_normal {
+  /* display: block; */
+  display: flex;
+  flex-direction: column;
 }
-.padding1020{
-    padding: 10px 20px 10px;
+
+/* 单选下拉列表（超出十条数据带搜索、且有添加按钮） */
+.drop_down_menu li {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  padding: 0px 20px;
+  height: 34px;
+  line-height: 34px;
+  width: 262px;
+  color: #333333;
+  display: block;
+  float: none;
+  font-size: 14px;
+  cursor: pointer;
 }
-.height100px{
-    height:100px;
+
+.drop_down_search {
+  margin: 0px 18px 10px;
 }
-.coursesselects{
-    font-size: 12px;
-    color: #989898;
-    padding: 0px;
-    margin-left: 10px;
+
+.drop_down_menu li:hover,
+.drop_down_normal li:hover {
+  background-color: #f0f0f0;
 }
+
+.drop_down_menu .drop_down_btn {
+  left: unset;
+  display: block;
+  margin: 0px 20px;
+  border-top: 1px solid #ebebeb;
+  height: 48px;
+  line-height: 48px;
+  color: #666666;
+}
+
+.task_menu_ul .ant-menu-horizontal {
+  border-bottom: none !important;
+}
+
+.shixunreporttitle {
+  max-width: 1060px;
+  padding-left: 5px;
+  text-align: justify;
+}
+
+.shixunreporttitles {
+  padding-left: 5px;
+}
+
+.padding10200 {
+  padding: 10px 20px;
+}
+
+.padding1020 {
+  padding: 10px 20px 10px;
+}
+
+.height100px {
+  height: 100px;
+}
+
+.coursesselects {
+  font-size: 12px;
+  color: #989898;
+  padding: 0px;
+  margin-left: 10px;
+}
+
 /* 覆盖antd样式，设计得form都为灰色背景 */
 .ant-input-number-input {
-    background: #F4F4F4;
+  background: #F4F4F4;
 }
+
 input.ant-input-number-input:focus {
-    background: #fff;
+  background: #fff;
 }
-.FAFAFA{
-    background: #fafafa;
+
+.FAFAFA {
+  background: #fafafa;
 }
-.has-success.has-feedback .ant-form-item-children:after{
-    display: none;
+
+.has-success.has-feedback .ant-form-item-children:after {
+  display: none;
 }
-.noticeTip{
-    border:1px solid #FF0000;
-    border-radius: 5px;
+
+.noticeTip {
+  border: 1px solid #FF0000;
+  border-radius: 5px;
 }
 
 @media screen and (min-width: 1400px) {
-    .ant-modal-wrap{
-        overflow: hidden;
-    }
+  .ant-modal-wrap {
+    overflow: hidden;
+  }
 }
+
 /* 设置了浏览器宽度不小于1201px时 abc 显示1200px宽度 */
 
-@media screen and (max-width: 1400px) {
+@media screen and (max-width: 1400px) {}
 
-}
 /* 设置了浏览器宽度不大于1200px时 abc 显示900px宽度 */
 
-@media screen and (max-width: 900px) {
+@media screen and (max-width: 900px) {}
 
-}
 /* 设置了浏览器宽度不大于900px时 abc 显示200px宽度 */
 
-@media screen and (max-width: 500px) {
+@media screen and (max-width: 500px) {}
 
-}
 /* 设置了浏览器宽度不大于500px时 abc 显示100px宽度 */
 
 
 /* 试卷答题 */
-.stageTable .ant-table-tbody tr:last-child td,.stageTable .ant-table-thead > tr > th{
-    border-bottom: none!important;
+.stageTable .ant-table-tbody tr:last-child td,
+.stageTable .ant-table-thead>tr>th {
+  border-bottom: none !important;
 }
 
 /* md代码类样式渲染 */
-.new_li .markdown-body ul > li{ list-style-type: disc!important;margin-bottom: 0!important; }
-.new_li .markdown-body ol > li{ list-style-type: decimal!important; }
-.new_li li{ margin-bottom: 0!important; }
-
-/* 有不少问题，没有出现'数据已于 09:24:53 保存'时靠太近，和红字提示重叠 */
-.upload_under_markdown_editor {
-    /* margin-top: -32px;
-    display: block; */
+.new_li .markdown-body ul>li {
+  list-style-type: disc !important;
+  margin-bottom: 0 !important;
 }
 
-.ant-table-thead > tr > th{
-    border-bottom: 1px solid transparent !important;
+.new_li .markdown-body ol>li {
+  list-style-type: decimal !important;
+}
+
+.new_li li {
+  margin-bottom: 0 !important;
+}
+
+.ant-table-thead>tr>th {
+  border-bottom: 1px solid transparent !important;
 }
 
 
 /* 指引 */
-.guidePanel{
-    position: fixed;
-    top:0px;
-    left: 0px;
-    width: 100%;
-    height: 100%;
-    background: rgba(0,0,0,0.7);
-    z-index: 10000;
-}
-.guideFirstRight{
-    position: absolute;
-    right: -90px;
-}
-.guideFirstLeft{
-    position: absolute;
-    left: -95px;
-    top:120px;
+.guidePanel {
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.7);
+  z-index: 10000;
 }
 
-/*.yslnobinput input{*/
-/*    width: 280px;*/
-/*    height: 40px !important;*/
-/*    background-color: #fafafa!important;*/
-/*}*/
-/*.yslnobinput .ant-input-number-input-wrap{*/
-/*    width: 280px;*/
-/*    height: 40px !important;*/
-/*    background-color: #fafafa!important;*/
-/*}*/
-.yslinputcourput .ant-form-explain{
-    padding-left: 0px !important;
-}
-.wechatloginfont{
-    font-size: 14px;
-    font-family: PingFangSC-Regular,PingFangSC;
-    font-weight: 400;
-    color: #555555;
-    line-height: 20px;
-    margin-top: 10px;
+.guideFirstRight {
+  position: absolute;
+  right: -90px;
 }
 
-.wechatdiv{
-    margin-top: 40px !important;
-    /*width: 800px !important;*/
+.guideFirstLeft {
+  position: absolute;
+  left: -95px;
+  top: 120px;
 }
 
-.wechatdivs{
-    margin-top: 40px !important;
-    width: 800px !important;
+.yslinputcourput .ant-form-explain {
+  padding-left: 0px !important;
 }
 
-.wechatContent{
-    padding: 0px 50px;
-    text-align: center;
+.wechatloginfont {
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFangSC;
+  font-weight: 400;
+  color: #555555;
+  line-height: 20px;
+  margin-top: 10px;
 }
 
-.wechatContents{
-    padding: 0px 50px;
+.wechatdiv {
+  margin-top: 40px !important;
+  /*width: 800px !important;*/
 }
 
-.wechatpass{
-    width: 300px;
-    height: 46px;
+.wechatdivs {
+  margin-top: 40px !important;
+  width: 800px !important;
 }
 
-.wechatnewchat{
-    width: 62px;
-    height: 62px;
-    background: rgba(255,170,170,1);
-    border-radius: 50%;
-    text-align: center;
-    line-height: 62px;
-    color: #fff;
-    margin: 0 auto;
-}
-.wechatweoldchat{
-    width: 62px;
-    height: 62px;
-    background:rgba(164,211,255,1);
-    border-radius: 50%;
-    text-align: center;
-    line-height: 62px;
-    color: #fff;
-    margin: 0 auto;
+.wechatContent {
+  padding: 0px 50px;
+  text-align: center;
 }
 
-.daishenp{
-    color: #F79946 !important;
-    text-decoration: underline !important;
+.wechatContents {
+  padding: 0px 50px;
 }
-.pointertooltip{
+
+.wechatpass {
+  width: 300px;
+  height: 46px;
+}
+
+.wechatnewchat {
+  width: 62px;
+  height: 62px;
+  background: rgba(255, 170, 170, 1);
+  border-radius: 50%;
+  text-align: center;
+  line-height: 62px;
+  color: #fff;
+  margin: 0 auto;
+}
+
+.wechatweoldchat {
+  width: 62px;
+  height: 62px;
+  background: rgba(164, 211, 255, 1);
+  border-radius: 50%;
+  text-align: center;
+  line-height: 62px;
+  color: #fff;
+  margin: 0 auto;
+}
+
+.daishenp {
+  color: #F79946 !important;
+  text-decoration: underline !important;
+}
+
+.pointertooltip {
   background: #DDDDDD;
 
-}
+}
\ No newline at end of file
diff --git a/src/modules/courses/elearning/Elearning.js b/src/modules/courses/elearning/Elearning.js
index 35ef6fb8..e199384f 100644
--- a/src/modules/courses/elearning/Elearning.js
+++ b/src/modules/courses/elearning/Elearning.js
@@ -216,7 +216,6 @@ class Elearning extends Component{
 			isSpins:true,
 		})
 		axios.get(url).then((response) => {
-			// debugger
 			if(response.status===200){
 				// let path="/shixuns/"+response.data.shixun_identifier+"/challenges";
 				// this.props.history.push(path);
@@ -227,8 +226,6 @@ class Elearning extends Component{
 					isSpins:false,
 				})
 
-				// message.success('重置成功，正在进入实训！');
-				// this.startshixunCombat();
 			}}
 		).catch((error) => {
 			this.setState({
diff --git a/src/modules/courses/elearning/YslDetailCards.js b/src/modules/courses/elearning/YslDetailCards.js
index 436e0a98..97cd40d0 100644
--- a/src/modules/courses/elearning/YslDetailCards.js
+++ b/src/modules/courses/elearning/YslDetailCards.js
@@ -129,10 +129,7 @@ class YslDetailCards extends Component{
 			isSpin:true,
 		})
 		axios.get(url).then((response) => {
-			// debugger
 			if(response.status===200){
-				// let path="/shixuns/"+response.data.shixun_identifier+"/challenges";
-				// this.props.history.push(path);
 				message.success('重置成功，正在进入实训！');
 				this.startgameid(response.data.shixun_identifier);
 				this.setState({
@@ -141,8 +138,6 @@ class YslDetailCards extends Component{
 					startbtn:false,
 				})
 
-				// message.success('重置成功，正在进入实训！');
-				// this.startshixunCombat();
 			}}
 		).catch((error) => {
 			this.setState({
@@ -280,7 +275,6 @@ class YslDetailCards extends Component{
 		})
 	}
 	cardsModalsave=()=>{
-		debugger
 		this.setState({
 			Modalstype:false,
 			Modalstopval:'',
diff --git a/src/modules/courses/exercise/Ecerciseallbackagain.js b/src/modules/courses/exercise/Ecerciseallbackagain.js
index 35556da5..f350d82b 100644
--- a/src/modules/courses/exercise/Ecerciseallbackagain.js
+++ b/src/modules/courses/exercise/Ecerciseallbackagain.js
@@ -237,7 +237,7 @@ class Ecerciseallbackagain extends Component{
                                                             >
                                                                 <a style={{"textAlign": "left"}}
                                                                    className="task-hide color-grey-name"
-																																	 href={`/users/${item.user_id}/courses`}
+																																	 href={`/users/${item.user_id}/classrooms`}
 																																	 target={'_blank'}
 																																	 title={item.user_name}
 																																>{item.user_name}</a>
@@ -272,4 +272,4 @@ class Ecerciseallbackagain extends Component{
         )
     }
 }
-export default Ecerciseallbackagain;
\ No newline at end of file
+export default Ecerciseallbackagain;
diff --git a/src/modules/courses/exercise/Exercise.js b/src/modules/courses/exercise/Exercise.js
index faef2a53..bb161e00 100644
--- a/src/modules/courses/exercise/Exercise.js
+++ b/src/modules/courses/exercise/Exercise.js
@@ -107,13 +107,14 @@ class Exercise extends Component{
         })
     }
     // 搜索
-    searchInfo=()=>{
+    searchInfo=(value)=>{
         this.setState({
             type:undefined,
             page:1,
+            StudentList_value:value
         })
-        let{type,StudentList_value,limit}=this.state;
-        this.InitList(type,StudentList_value,1,limit)
+        let{type,limit}=this.state;
+        this.InitList(type,value,1,limit)
     }
 
 
@@ -444,8 +445,6 @@ class Exercise extends Component{
         }=this.state;
 
         let {child}=this.props;
-        //  debugger
-        // exercises_counts && exercises_counts.exercises_all_counts ===0
 
         return(
             <React.Fragment>
@@ -487,38 +486,26 @@ class Exercise extends Component{
                                 this.props.isAdmin()===true?
                                 <li className="fr">
                                     <p className="fl"><UseBank {...this.props} {...this.state} object_type={"exercise"} useBankSuccess={this.useBankSuccess}></UseBank></p>
-                                    {course_types&&course_types.course_status===0?<WordsBtn style="blue" className="font-16" to={`/courses/${this.props.match.params.coursesId}/exercises/new`}>新建</WordsBtn>:""}
+                                    {course_types&&course_types.course_status===0?<WordsBtn style="blue" className="font-16" to={`/classrooms/${this.props.match.params.coursesId}/exercises/new`}>新建</WordsBtn>:""}
                                 </li>:""
                             }
 
-                            {/*{*/}
-                                {/*this.props.isStudent()===true?*/}
-                                  {/*<li className="fr">*/}
-                                      {/*<p className="fl"><UseBank {...this.props} {...this.state} object_type={"exercise"} useBankSuccess={this.useBankSuccess}></UseBank></p>*/}
-                                  {/*</li>:""*/}
-                            {/*}*/}
                         </p>
                         <div className="clearfix pl30 pr30">
                             <p className="fl font-14" style={{"marginTop":"27px"}}>
                                 <span className="mr20">共{exercises_counts && exercises_counts.exercises_total_counts}个试卷</span>
                                 <span className="mr20">已发布：{exercises_counts && exercises_counts.exercises_published_counts}个</span>
-                                <span>未发布：{exercises_counts && exercises_counts.exercises_unpublish_counts}个</span> 
+                                <span>未发布：{exercises_counts && exercises_counts.exercises_unpublish_counts}个</span>
                             </p>
-                            <div className="fr mt16 mb16 searchView">
+                            <div className="fr mt16 mb16 searchView"> 
                                 {publicSearchs("请输入名称进行搜索",this.searchInfo,this.inputStudent,this.inputStudent)}
-                                {/*<Search*/}
-                                {/*    value={StudentList_value}*/}
-                                {/*    placeholder="请输入名称进行搜索"*/}
-                                {/*    onInput={this.inputStudent}*/}
-                                {/*    onSearch={this.searchInfo}*/}
-                                {/*></Search>*/}
                             </div>
                         </div>
                         <div className="task_menu_ul pl30 pr30">
                             <Menu mode="horizontal" defaultSelectedKeys="0" onClick={this.changeType}>
                                 <Menu.Item key="0">全部</Menu.Item>
+                                <Menu.Item key="2">考试中</Menu.Item>
                                 {this.props.isAdmin()?<Menu.Item key="1">未发布</Menu.Item>:""}
-                                <Menu.Item key="2">提交中</Menu.Item>
                                 <Menu.Item key="3">已截止</Menu.Item>
                             </Menu>
                         </div>
diff --git a/src/modules/courses/exercise/ExerciseDisplay.js b/src/modules/courses/exercise/ExerciseDisplay.js
index 42702e9c..27b9bd9c 100644
--- a/src/modules/courses/exercise/ExerciseDisplay.js
+++ b/src/modules/courses/exercise/ExerciseDisplay.js
@@ -1,30 +1,14 @@
 import React,{ Component } from "react";
-
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
 import axios from 'axios'
 
-import {getUrl, ActionBtn, markdownToHTML} from 'educoder';
-
 import SingleDisplay from './new/SingleDisplay'
 import JudgeDisplay from './new/JudgeDisplay'
 import NullDisplay from './new/NullDisplay'
 import MainDisplay from './new/MainDisplay'
 import ShixunDisplay from './new/ShixunDisplay'
+import ShixunProgramming from './new/ShixunProgramming'
 import './new/common.css'
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
 
-const tagArray = [
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 
-    'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 
-    'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
-]
 
 class ExerciseDisplay extends Component{
   constructor(props){
@@ -38,6 +22,7 @@ class ExerciseDisplay extends Component{
       limit:10,
       searchtext:"",
       order: "end_at",
+      is_md:false
     }
   }
   _getRequestParams() {
@@ -51,7 +36,7 @@ class ExerciseDisplay extends Component{
     }
   }
   componentDidMount = () => {
-    const Id = this.props.match.params.Id    
+    const Id = this.props.match.params.Id
     if (Id) {
       const url = `/${this.props.urlPath || 'exercises'}/${Id}.json`
       axios.get(url)
@@ -61,6 +46,9 @@ class ExerciseDisplay extends Component{
             response.data.exercise.exercise_name = response.data.exercise.exercise_name || response.data.exercise.name
             response.data.exercise.exercise_status = response.data.exercise.exercise_status == undefined ? 1 : response.data.exercise.exercise_status
             this.setState({...response.data})
+            this.setState({
+              is_md:response.data.exercise.is_md
+            })
             this.props.detailFetchCallback && this.props.detailFetchCallback(response);
           } else {
             this.props.detailFetchCallback && this.props.detailFetchCallback(response);
@@ -87,22 +75,8 @@ class ExerciseDisplay extends Component{
     }
   }
   render() {
-    // let { question_title, question_score, question_type, question_choices, standard_answer,
-    //     question_id, question_number, index, displayCount,
-    //     multi_count
-    //  } = this.props;
     const { exercise_questions,exercise,exercise_types} = this.state;
-
-    // // const { getFieldDecorator } = this.props.form;
-
-    // const isAdmin = this.props.isAdmin()
-    // const courseId=this.props.match.params.coursesId;
-    // const isEdit = this.isEdit
-    // const qNumber = `question_${index}`;
-    // let length = 5;
-    // const qName = qNameArray[question_type]
     const commonHandler = {}
-
     return(
         <div className="edu-back-white">
           <div className={" padding20-30"}>
@@ -125,27 +99,31 @@ class ExerciseDisplay extends Component{
 						<p className="  clearfix">
 							{
 								exercise_types && exercise_types.q_singles > 0 &&
-								<span className="color-grey-9 mr15">单选题 {exercise_types.q_singles} 题,共 {exercise_types && exercise_types.q_singles_scores} 分</span>
+								<span className="color-grey-9 mr15 fl">单选题 {exercise_types.q_singles} 题,共 {exercise_types && exercise_types.q_singles_scores} 分</span>
 							}
 							{
 								exercise_types && exercise_types.q_doubles > 0 &&
-								<span className="color-grey-9 mr15">多选题 {exercise_types.q_doubles} 题,共 {exercise_types && exercise_types.q_doubles_scores} 分</span>
+								<span className="color-grey-9 mr15 fl">多选题 {exercise_types.q_doubles} 题,共 {exercise_types && exercise_types.q_doubles_scores} 分</span>
 							}
 							{
 								exercise_types && exercise_types.q_judges > 0 &&
-								<span className="color-grey-9 mr15">判断题 {exercise_types.q_judges} 题,共 {exercise_types && exercise_types.q_judges_scores} 分</span>
+								<span className="color-grey-9 mr15 fl">判断题 {exercise_types.q_judges} 题,共 {exercise_types && exercise_types.q_judges_scores} 分</span>
 							}
 							{
 								exercise_types && exercise_types.q_nulls > 0 &&
-								<span className="color-grey-9 mr15">填空题 {exercise_types.q_nulls} 题,共 {exercise_types && exercise_types.q_nulls_scores} 分</span>
+								<span className="color-grey-9 mr15 fl">填空题 {exercise_types.q_nulls} 题,共 {exercise_types && exercise_types.q_nulls_scores} 分</span>
 							}
 							{
 								exercise_types && exercise_types.q_mains > 0 &&
-								<span className="color-grey-9 mr15">简答题 {exercise_types.q_mains} 题,共 {exercise_types && exercise_types.q_mains_scores} 分</span>
+								<span className="color-grey-9 mr15 fl">简答题 {exercise_types.q_mains} 题,共 {exercise_types && exercise_types.q_mains_scores} 分</span>
 							}
 							{
 								exercise_types && exercise_types.q_shixuns > 0 &&
-								<span className="color-grey-9 mr15">实训题 {exercise_types.q_shixuns} 题,共 {exercise_types && exercise_types.q_shixuns_scores} 分</span>
+								<span className="color-grey-9 mr15 fl">实训题 {exercise_types.q_shixuns} 题,共 {exercise_types && exercise_types.q_shixuns_scores} 分</span>
+							}
+							{
+								exercise_types && exercise_types.q_pros > 0 &&
+								<span className="color-grey-9 mr15 fl">编程题 {exercise_types.q_pros} 题,共 {exercise_types && exercise_types.q_pros_scores} 分</span>
 							}
 							<span className="color-grey-3 fr">共<span className="color-orange-tip"> {exercise_types &&exercise_types.q_scores} </span>分</span>
 							<span className="color-grey-3 fr">合计<span className="color-blue"> {exercise_types &&exercise_types.q_counts} </span>题：</span>
@@ -153,46 +131,52 @@ class ExerciseDisplay extends Component{
 					</div>
           { exercise_questions.map((item, index) => {
             if (item.question_type == 0 || item.question_type == 1) {
-              
-              
-                return <SingleDisplay {...this.props} {...item} index={index} {...commonHandler}
+
+                return <SingleDisplay {...this.props} {...item} index={index} {...commonHandler}  {...this.state}
                     displayCount={exercise_questions.length} showActionButton={false} key={index}
                 ></SingleDisplay>
-              
+
             } else if (item.question_type == 2) {
-              
-              
-                return <JudgeDisplay 
-                      showActionButton={false} key={index}
+
+
+                return <JudgeDisplay
+                      showActionButton={false} key={index}  {...this.state}
                       {...this.props} {...item} index={index} {...commonHandler} ></JudgeDisplay>
-              
+
             } else if (item.question_type == 3) {
-              
-              
-                return <NullDisplay 
-                      showActionButton={false} key={index}
+
+
+                return <NullDisplay
+                      showActionButton={false} key={index}  {...this.state}
                       {...this.props} {...item} index={index} {...commonHandler} ></NullDisplay>
-              
+
             } else if (item.question_type == 4) {
-              
-              
-                return <MainDisplay 
-                      showActionButton={false} key={index}
+
+                //
+                return <MainDisplay
+                      showActionButton={false} key={index}  {...this.state}
                       {...this.props} {...item} index={index} {...commonHandler} ></MainDisplay>
-              
+
             } else if (item.question_type == 5) {
-              
-              
+
+
                 return <ShixunDisplay Testpapersettinghomepage
-                      showActionButton={false} key={index}
+                      showActionButton={false} key={index}  {...this.state}
                       {...this.props} {...item} index={index} {...commonHandler} ></ShixunDisplay>
-              
+
+            }else if (item.question_type == 6) {
+
+              return <ShixunProgramming Testpapersettinghomepage
+                                    showActionButton={false} key={index}  {...this.state}
+                                    {...this.props} {...item} index={index} {...commonHandler} ></ShixunProgramming>
+            }else{
+              return <div></div>
             }
-            return <div></div>
+
           })}
         </div>
       )
     }
 }
 // RouteHOC()
-export default (ExerciseDisplay);
\ No newline at end of file
+export default (ExerciseDisplay);
diff --git a/src/modules/courses/exercise/ExerciseListItem.js b/src/modules/courses/exercise/ExerciseListItem.js
index 8bb42b04..9b1d6b29 100644
--- a/src/modules/courses/exercise/ExerciseListItem.js
+++ b/src/modules/courses/exercise/ExerciseListItem.js
@@ -28,7 +28,7 @@ class ExerciseListItem extends Component{
         this.setState({
 					Modalstype:true,
 					ModalSave:()=>this.props.history.push(url),
-					Modalstopval:`答题时长限制${item.time}分钟，从首次答题开始实行不间断计时方法`,
+					Modalstopval:`答题时长限制${item.time}分钟，从首次答题开始实行不间断计时`,
 					modalsBottomval:'请确认是否有充足的答题时间？',
 				});
 			}else{
@@ -75,9 +75,10 @@ class ExerciseListItem extends Component{
         let{item,checkBox,index}=this.props;
         let {coursesId,Id}=this.props.match.params
         const IsAdmin =this.props.isAdmin();
-        const IsStudent =this.props.isStudent();
+			  const isAssistant=this.props.isAssistant();
+
+			const IsStudent =this.props.isStudent();
 
-        // console.log(this.props.current_user.user_id)
         return(
             <div className="workList_Item" style={{cursor : IsAdmin ? "pointer" : "default",padding:"30px" }} onClick={() => window.$(`.exerciseitem${index} input`).click() }>
                 {
@@ -114,22 +115,22 @@ class ExerciseListItem extends Component{
                 <div className="flex1 pr">
                     <p className="clearfix mb20">
 
-                        {/*<Link to={`/courses/${coursesId}/exercises/${item.id}/exercises/student_exercise_list?tab=0`} className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px"}}>{item.exercise_name}</Link>*/}
+                        {/*<Link to={`/classrooms/${coursesId}/exercises/${item.id}/exercises/student_exercise_list?tab=0`} className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px"}}>{item.exercise_name}</Link>*/}
                         {
                             this.props.isAdmin()? <a  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580 pointer"
 																											title={item.exercise_name}
-                                                      onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}</a>:""
+                                                      onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}</a>:""
                         }
 
 												{
 													this.props.isStudent()?
-														<a  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580 pointer" title={item.exercise_name}  onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}</a>:""
+														<a  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580 pointer" title={item.exercise_name}  onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}</a>:""
 												}
 
                         {
                         this.props.isNotMember()? item.lock_status === 0 ?
                              <span className="fl mt3 font-16 font-bd color-dark comnonwidth580 pointer" title={"私有属性，非课堂成员不能访问"}>{item.exercise_name}</span>
-														:	<a className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580 pointer" title={item.exercise_name}  onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}</a>:""
+														:	<a className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580 pointer" title={item.exercise_name}  onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}</a>:""
                         }
 
                         {
@@ -154,10 +155,20 @@ class ExerciseListItem extends Component{
                         {/*</li>*/}
                     </p>
                   <p className="color-grey-9 clearfix">
-                      { item.author && <span className="mr20 fl">{item.author}</span> }
-                      {item.exercise_status===1?"":<span className="mr20 fl">{item.exercise_answer} 已答</span>}
+                    { item.author && <span className="mr20 fl">{item.author}</span> }
+					{item.exercise_status===2||item.exercise_status===3?<span className="mr20 fl">已提交人数：{item&&item.exercise_answer}/{item&&item.exercise_users}</span> :""}
+					{item.exercise_status===2?<span className="mr20 fl">考试中人数：{item&&item.exercise_answerings}</span> :""}
+					{item.exercise_status===2||item.exercise_status===3?<span className="mr20 fl">待评阅试卷：{item&&item.unreview_count}</span> :""}
+					{
+                         item.exercise_status ===2?
+                            <Tooltip title="考试剩余时间" placement="bottom">
+                              <span className="mr20 fl">{"考试剩余时间："+item.exercise_left_time}</span>
+                            </Tooltip>:""
+                    }
+
+					  {/* {item.exercise_status===1?"":<span className="mr20 fl">{item.exercise_answer} 已答</span>}
                       {item.exercise_status===1?"":<span className="mr20 fl">{item.exercise_unanswer} 未答</span>}
-                        {item.unreview_count===null||item.exercise_status===1?"":<span className="mr20 fl">{item.unreview_count} 未评数</span> }
+                        {item.unreview_count===null||item.exercise_status===1?"":<span className="mr20 fl">{item.unreview_count} 未评数</span> } */}
 
                         {
                             item.exercise_status ===1? item.publish_time ===null?
@@ -167,12 +178,7 @@ class ExerciseListItem extends Component{
                               } </span>:""
                         }
 
-                        {
-                         item.exercise_status ===2?
-                            <Tooltip title="提交剩余时间" placement="bottom">
-                              <span className="mr20 fl">{"提交剩余时间："+item.exercise_left_time}</span>
-                            </Tooltip>:""
-                        }
+                     
                         {
 														item.exercise_left_time===null?"":item.exercise_status ===3?
                               <Tooltip title="截止剩余时间" placement="bottom">
@@ -189,9 +195,32 @@ class ExerciseListItem extends Component{
 
 
 										{ IsAdmin &&<div className="homepagePostSetting" style={{"right":"-17px","top":"46px","display":"block","width":"200px"}}>
-											<a className="btn colorblue font-16 ml20" onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情</a>
-											<Link className="btn colorblue font-16 ml20" to={`/courses/${coursesId}/exercises/${item.id}/edit`}>编辑</Link>
-											<Link  className="btn colorblue ml20 font-16" to={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=3`}>设置</Link>
+											{
+												isAssistant===true?
+													(
+														item&&item.assistant_auth===true?
+															<a className="btn colorblue font-16 ml20" onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情</a>
+															:
+															<a className="btn colorblue font-16 " style={{
+																marginLeft: "73px"
+															}} onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情</a>
+													)
+													:
+													<a className="btn colorblue font-16 ml20" onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情</a>
+											}
+
+											{
+												isAssistant===true?
+													(
+														item&&item.assistant_auth===true?
+															<Link className="btn colorblue font-16 ml20" to={`/classrooms/${coursesId}/exercises/${item.id}/edit`}>编辑</Link>
+															:
+															""
+													)
+													:
+													<Link className="btn colorblue font-16 ml20" to={`/classrooms/${coursesId}/exercises/${item.id}/edit`}>编辑</Link>
+											}
+											<Link  className="btn colorblue ml20 font-16" to={`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=3`}>设置</Link>
 										</div> }
 
 									</p>
@@ -202,7 +231,7 @@ class ExerciseListItem extends Component{
                                 {/*<li className="edu-position edu-position-hidebox">*/}
                                     {/*<i className="fa fa-bars color-grey-b"></i>*/}
                                     {/*<ul className="edu-position-hide undis">*/}
-                                        {/*<li> <Link  className="" to={`/courses/${coursesId}/exercises/${item.id}/edit`}>编辑</Link></li>*/}
+                                        {/*<li> <Link  className="" to={`/classrooms/${coursesId}/exercises/${item.id}/edit`}>编辑</Link></li>*/}
                                         {/*<li> <a  className="" href={`*/}
                                         {/*/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=3`*/}
                                         {/*}>设置</a></li>*/}
@@ -216,10 +245,10 @@ class ExerciseListItem extends Component{
                     {
                         IsStudent &&
                         <div className="homepagePostSetting" style={{"right":"0px","top":"46px","position":"absolute","display":"block"}}>
-													<li className={"fl"}> <a  className="btn colorblue  font-16" onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情</a></li>
-                            {item.current_status ===0&&item.exercise_status>1? <li className={"fl ml20"}> <Link  className="btn colorblue  font-16" to={`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`}>继续答题</Link></li>:
-                            item.current_status ===1&&item.exercise_status>1? <li className={"fl ml20"}> <a className="btn colorblue  font-16" target="_blank" href={`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`}>查看答题</a></li>:
-                            item.current_status ===2&&item.exercise_status>1? <li className={"fl ml20"}s> <a className="btn colorblue font-16" onClick={()=>this.setgameexercise(`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`)}>开始答题</a></li>:""}
+													<li className={"fl"}> <a  className="btn colorblue  font-16" onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情</a></li>
+                            {item.current_status ===0&&item.exercise_status>1? <li className={"fl ml20"}> <Link  className="btn colorblue  font-16" to={`/classrooms/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`}>继续答题</Link></li>:
+                            item.current_status ===1&&item.exercise_status>1? <li className={"fl ml20"}> <a className="btn colorblue  font-16" target="_blank" href={`/classrooms/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`}>查看答题</a></li>:
+                            item.current_status ===2&&item.exercise_status>1? <li className={"fl ml20"}s> <a className="btn colorblue font-16" onClick={()=>this.setgameexercise(`/classrooms/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`)}>开始答题</a></li>:""}
                         </div>
                     }
 
@@ -227,7 +256,7 @@ class ExerciseListItem extends Component{
 										this.props.isNotMember()? item.lock_status === 0 ?
 											""
 											: <div className="homepagePostSetting" style={{"right":"0px","top":"42px","position":"absolute","display":"block"}}>
-												<li> <a  className="btn colorblue  font-16" onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情</a></li>
+												<li> <a  className="btn colorblue  font-16" onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情</a></li>
 											</div>:""
 									}
 
@@ -236,4 +265,4 @@ class ExerciseListItem extends Component{
         )
     }
 }
-export default ExerciseListItem
\ No newline at end of file
+export default ExerciseListItem
diff --git a/src/modules/courses/exercise/ExerciseNew.js b/src/modules/courses/exercise/ExerciseNew.js
index 0c254256..ab3ea814 100644
--- a/src/modules/courses/exercise/ExerciseNew.js
+++ b/src/modules/courses/exercise/ExerciseNew.js
@@ -1,94 +1,57 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import axios from 'axios'
-// import './board.css'
-// import "../common/formCommon.css"
+import { CBreadcrumb } from 'educoder';
 
-// import { RouteHOC } from './common.js'
-
-// import  { Q_TYPE_SINGLE, Q_TYPE_MULTI, Q_TYPE_JUDGE, Q_TYPE_NULL, Q_TYPE_MAIN, Q_TYPE_SHIXUN } from './new/common'
-// import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
-// import CBreadcrumb from '../common/CBreadcrumb'
-import {getUrl, ActionBtn, CBreadcrumb} from 'educoder';
-
-// import SingleEditor from './new/SingleEditor'
-// import SingleDisplay from './new/SingleDisplay'
-// import JudgeEditor from './new/JudgeEditor'
-// import JudgeDisplay from './new/JudgeDisplay'
-// import NullEditor from './new/NullEditor'
-// import NullDisplay from './new/NullDisplay'
-// import MainEditor from './new/MainEditor'
-// import MainDisplay from './new/MainDisplay'
-// import ShixunEditor from './new/ShixunEditor'
-// import ShixunDisplay from './new/ShixunDisplay'
-
-import update from 'immutability-helper'
 import './new/common.css'
 import '../css/Courses.css'
 
 import ExerciseNewCommon from './ExerciseNewCommon'
-const { TextArea } = Input;
 
-class ExerciceNew extends Component{
-  constructor(props){
+class ExerciceNew extends Component {
+  constructor(props) {
     super(props);
-
-
     this.state = {
-      
+      left_banner_id: null
     }
-  }
-  componentDidMount = () => {
-    
   }
   initData = (data) => {
-    this.setState({left_banner_id: data.left_banner_id})
+    this.setState({ left_banner_id: data.left_banner_id })
+  }
+  componentDidMount() {
+    document.title = this.props.coursedata && this.props.coursedata.name;
   }
   render() {
-    let {  left_banner_id  } = this.state;
-   
-
+    let { left_banner_id } = this.state;
     const { current_user } = this.props
-    
-    const courseId=this.props.match.params.coursesId;
+    const courseId = this.props.match.params.coursesId;
+    let pramsids = this.props.match.params.Id;
+    return (
+      <div className="newMain exerciseNew">
 
-    const isEdit = this.isEdit;
+        <div className="edu-class-container edu-position courseForm">
+          {current_user && <CBreadcrumb items={[
+            { to: current_user && current_user.first_category_url, name: this.props.coursedata ? this.props.coursedata.name : '' },
+            { to: `/classrooms/${courseId}/exercises/${left_banner_id}`, name: '试卷列表' },
+            { name: pramsids && pramsids ? '编辑试卷' : '新建试卷' }
+          ]}></CBreadcrumb>}
 
-		document.title=this.props.coursedata&&this.props.coursedata.name;
-    return(
-        <div className="newMain exerciseNew">
-        
-          <div className="edu-class-container edu-position courseForm">
-            { current_user && <CBreadcrumb items={[
-              { to: current_user&&current_user.first_category_url, name: this.props.coursedata ? this.props.coursedata.name : ''},
-              { to: `/courses/${courseId}/exercises/${left_banner_id}`, name: '试卷列表' },
-              { name: this.isEdit ? '编辑试卷' : '新建试卷'}
-            ]}></CBreadcrumb> }
-
-            <p className="clearfix mt20 mb20">
-              <span className="fl font-24 color-grey-3">{this.isEdit ? "编辑" : "新建"}试卷</span>
-              <a href="javascript:void(0)" className="color-grey-6 fr font-16 mr2" 
-                // () => this.props.history.length == 1 ?  : this.props.history.goBack()
-                  onClick={() => this.props.history.push(`/courses/${courseId}/exercises/${left_banner_id}`)}>
-                返回
+          <p className="clearfix mt20 mb20">
+            <span className="fl font-24 color-grey-3">{pramsids && pramsids ? "编辑" : "新建"}试卷</span>
+            <a className="color-grey-6 fr font-16 mr2"
+              onClick={() => this.props.history.push(`/classrooms/${courseId}/exercises/${left_banner_id}`)}>
+              返回
               </a>
-            </p>
+          </p>
 
-            <ExerciseNewCommon
-              {...this.props}
-              {...this.state}
-              isEdit={this.isEdit}
-              initData={this.initData}
-            ></ExerciseNewCommon>
-          </div>
+          <ExerciseNewCommon
+            {...this.props}
+            {...this.state}
+            isEdit={this.isEdit}
+            initData={this.initData}
+          ></ExerciseNewCommon>
         </div>
-      )
-    }
+      </div>
+    )
+  }
 }
-// RouteHOC()
-export default (ExerciceNew);
\ No newline at end of file
+export default ExerciceNew;
diff --git a/src/modules/courses/exercise/ExerciseNewCommon.js b/src/modules/courses/exercise/ExerciseNewCommon.js
index 6d7c72b1..cdc81bbe 100644
--- a/src/modules/courses/exercise/ExerciseNewCommon.js
+++ b/src/modules/courses/exercise/ExerciseNewCommon.js
@@ -1,19 +1,10 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import  { Q_TYPE_SINGLE, Q_TYPE_MULTI, Q_TYPE_JUDGE, Q_TYPE_NULL, Q_TYPE_MAIN, Q_TYPE_SHIXUN } from './new/common'
-import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
+import { Tooltip } from 'antd'
+import { Q_TYPE_SINGLE, Q_TYPE_JUDGE, Q_TYPE_NULL, Q_TYPE_MAIN, Q_TYPE_SHIXUN } from './new/common'
 import axios from 'axios'
-// import './board.css'
 import "../common/formCommon.css"
-
-// import { RouteHOC } from './common.js'
-import CBreadcrumb from '../common/CBreadcrumb'
-import {getUrl, ActionBtn} from 'educoder';
+import { ActionBtn } from 'educoder';
 
 import SingleEditor from './new/SingleEditor'
 import SingleDisplay from './new/SingleDisplay'
@@ -25,24 +16,22 @@ import MainEditor from './new/MainEditor'
 import MainDisplay from './new/MainDisplay'
 import ShixunEditor from './new/ShixunEditor'
 import ShixunDisplay from './new/ShixunDisplay'
-
+import ShixunProgramming from './new/ShixunProgramming'
 import ShixunChooseModal from '../coursesPublic/ShixunChooseModal'
+import ExerciseForm from './exercise-new-form'
+
 import update from 'immutability-helper'
 import './new/common.css'
 import '../css/Courses.css'
-const { TextArea } = Input;
-const confirm = Modal.confirm;
 const $ = window.$
-const { Option } = Select;
-const TITLE_MAX_LENGTH = 60;
-class ExerciseNewCommon extends Component{
-  constructor(props){
+class ExerciseNewCommon extends Component {
+  constructor(props) {
     super(props);
 
-
     this.state = {
       exercise_questions: [],
       exercise_name: '',
+      is_md: true,
       exercise_description: '',
       exercise_types: {},
       editMode: !this.props.match.params.Id,
@@ -50,45 +39,43 @@ class ExerciseNewCommon extends Component{
   }
 
   // 已发布试卷编辑保存的确认弹框
-  changeScore = (question_id,answerArray) =>{
+  changeScore = (question_id, answerArray) => {
     this.props.confirm({
-      content:'修改了标准答案',
-      subContent:"是否重新计算学生答题的成绩？",
-      onOk:()=>{
-        this.sureChangeScore(question_id,answerArray)
+      content: '修改了标准答案',
+      subContent: "是否重新计算学生答题的成绩？",
+      onOk: () => {
+        this.sureChangeScore(question_id, answerArray)
       },
-      onCancel:()=>{
+      onCancel: () => {
         this.addSuccess();
       }
     })
   }
 
   // 已发布试卷修改答案确认修改分数
-  sureChangeScore = (question_id,answerArray) =>{
-    let url=`/exercise_questions/${question_id}/update_scores.json`
-    axios.post((url),{
-      standard_answers:answerArray
-    }).then((result)=>{
-      if(result){
+  sureChangeScore = (question_id, answerArray) => {
+    let url = `/exercise_questions/${question_id}/update_scores.json`
+    axios.post((url), {
+      standard_answers: answerArray
+    }).then((result) => {
+      if (result) {
         this.props.showNotification(`${result.data.message}`);
         this.addSuccess();
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
 
   fetchExercise = () => {
-    const Id = this.props.match.params.Id    
+    const Id = this.props.match.params.Id
     this.isEdit = this.props.isEdit || !!Id
     if (this.isEdit) {
-      const url = this.props.exercise_url ? `/${this.props.exercise_url }/${Id}.json` : `/exercises/${Id}/edit.json`
+      const url = this.props.exercise_url ? `/${this.props.exercise_url}/${Id}.json` : `/exercises/${Id}/edit.json`
       axios.get(url)
         .then((response) => {
           if (response.data.exercise) {
             const { exercise, ...others } = response.data
-            exercise.exercise_name = exercise.exercise_name || exercise.name
-            exercise.exercise_description = exercise.exercise_description || exercise.description
             this.setState({
               ...exercise,
               ...others,
@@ -101,7 +88,7 @@ class ExerciseNewCommon extends Component{
           console.log(error);
         });
     } else {
-      const courseId=this.props.match.params.coursesId;
+      const courseId = this.props.match.params.coursesId;
 
       const newUrl = `/courses/${courseId}/exercises/new.json`
       axios.get(newUrl)
@@ -120,63 +107,54 @@ class ExerciseNewCommon extends Component{
   componentDidMount = () => {
     this.fetchExercise()
   }
-  // handleSubmit = (e) => {
-  //
-  // }
-  onSaveExercise = () => {
-    const { exercise_name, exercise_description } = this.state;
+
+  onSaveExercise = (data) => {
     const exercise_id = this.props.match.params.Id
     const courseId = this.props.match.params.coursesId
+
     if (this.isEdit) {
-      // /exercise_banks/:id.json
       const editUrl = `/${this.props.exercise_url ? this.props.exercise_url : 'exercises'}/${exercise_id}.json`
-      axios.put(editUrl, {
-        exercise_name,
-        exercise_description
-      })
+      axios.put(editUrl, { ...data })
         .then((response) => {
           if (response.data.status == 0) {
-            this.setState({editMode: false})
+            this.setState({ ...data, editMode: false })
             this.props.showNotification('试卷编辑成功')
           }
         })
         .catch(function (error) {
-            console.log(error);
+          console.log(error);
         });
     } else {
       const url = `/courses/${courseId}/exercises.json`
       axios.post(url, {
-          exercise_name,
-          exercise_description
+        ...data
       })
         .then((response) => {
           if (response.data.status == 0) {
-              this.setState({editMode: false})
-
-              this.props.showNotification('试卷新建成功')
-              const exercise_id = response.data.data.exercise_id;
-              this.isEdit = true;
-
-	            this.props.history.replace(`/courses/${courseId}/exercises/${exercise_id}/edit`);
+            this.setState({ ...data, editMode: false })
+            this.props.showNotification('试卷新建成功')
+            const exercise_id = response.data.data.exercise_id;
+            this.isEdit = true;
+            this.props.history.replace(`/classrooms/${courseId}/exercises/${exercise_id}/edit`);
 
           }
         })
         .catch(function (error) {
-            console.log(error);
+          console.log(error);
         });
     }
   }
   exercise_name_change = (e) => {
-      this.setState({exercise_name: e.target.value})
+    this.setState({ exercise_name: e.target.value })
   }
   exercise_description_change = (e) => {
-      this.setState({exercise_description: e.target.value})
+    this.setState({ exercise_description: e.target.value })
   }
   // #问题的类型，0为单选题，1为多选题，2为判断题，3为填空题，4为主观题，5为实训题
   _checkIsEditing = () => {
-    if (this.editingId && $(this.editingId).length ) {
+    if (this.editingId && $(this.editingId).length) {
       this.props.showNotification('请先保存或取消当前正在编辑的问题。')
-       $("html").animate({ scrollTop: $(this.editingId).offset().top - 100})
+      $("html").animate({ scrollTop: $(this.editingId).offset().top - 100 })
       return true
     }
     return false
@@ -186,7 +164,7 @@ class ExerciseNewCommon extends Component{
     // 找到编辑或新建的item，新建就删掉item，编辑就isNew改为false
     const { exercise_questions } = this.state
     let index = -1;
-    for(let i = 0; i < exercise_questions.length; i++) {
+    for (let i = 0; i < exercise_questions.length; i++) {
       if (exercise_questions[i].isNew == true) {
         index = i;
         break;
@@ -194,15 +172,15 @@ class ExerciseNewCommon extends Component{
     }
     if (exercise_questions[index].question_id) { // 编辑
       this.setState(
-        (prevState) => ({ 
-          exercise_questions : update(prevState.exercise_questions, {[index]: { isNew: {$set: false}}})
-          // update(prevState.exercise_questions, {$splice: [[index, 1]]}) 
+        (prevState) => ({
+          exercise_questions: update(prevState.exercise_questions, { [index]: { isNew: { $set: false } } })
+          // update(prevState.exercise_questions, {$splice: [[index, 1]]})
         })
       )
     } else { // 新建
       this.setState(
-        (prevState) => ({ 
-          exercise_questions : update(prevState.exercise_questions, {$splice: [[index, 1]]}) 
+        (prevState) => ({
+          exercise_questions: update(prevState.exercise_questions, { $splice: [[index, 1]] })
         })
       )
     }
@@ -214,7 +192,7 @@ class ExerciseNewCommon extends Component{
     }
     if (this._checkIsEditing()) {
       return;
-    } 
+    }
     if (type == Q_TYPE_SHIXUN) {
       this.addShixun(question_id_to_insert_after)
     } else {
@@ -237,43 +215,62 @@ class ExerciseNewCommon extends Component{
     // TODO 弹框选择实训
     if (this._checkIsEditing()) {
       return;
-    } 
+    }
     this.refs.shixunChooseModal.setVisible(true)
     this.question_id_to_insert_after = question_id_to_insert_after;
     return;
-    // 拉取实训items
-    this.addEditingQuestion(Q_TYPE_SHIXUN, question_id_to_insert_after, {
-      shixun_id: 50
-    })
   }
-  editQestion = (index) => {
-    if (this._checkIsEditing()) {
-      return;
-    } 
-    this.editingId = `#question_${index}`
+  editQestion = (index, nprops) => {
+    // console.log(nprops.match.params.coursesId)
+    // console.log(nprops.match.params.Id)
+    if (nprops) {
+      if (this._checkIsEditing()) {
+        return;
+      } else {
+        if (nprops.question_type === 6) {
+          this.props.history.push(`/problems/${nprops.hack_identifier}/edit?classrooms=${nprops.match.params.coursesId}&exercises=${nprops.match.params.Id}`)
+        } else {
+          this.editingId = `#question_${index}`
+
+          this.setState(
+            (prevState) => ({
+              exercise_questions: update(prevState.exercise_questions, { [index]: { isNew: { $set: true } } })
+            })
+          )
+        }
+      }
+
+    } else {
+
+      if (this._checkIsEditing()) {
+        return;
+      }
+      this.editingId = `#question_${index}`
+
+      this.setState(
+        (prevState) => ({
+          exercise_questions: update(prevState.exercise_questions, { [index]: { isNew: { $set: true } } })
+        })
+      )
+    }
 
-    this.setState(
-      (prevState) => ({ 
-        exercise_questions : update(prevState.exercise_questions, {[index]: { isNew: {$set: true}}})
-      })
-    )
   }
   onSort = (index, question_id, isUp) => {
     if (this._checkIsEditing()) {
       return;
-    } 
-    
+    }
+
     const url = `/${this.props.exercise_url_questions || 'exercise_questions'}/${question_id}/up_down.json`
-    axios.post(url, { opr: isUp ? 'up' : 'down'})
-        .then((response) => {
-          if (response.data.status == 0) {
-            // this.props.showNotification('移动成功')
-            this.fetchExercise()
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
+    axios.post(url, { opr: isUp ? 'up' : 'down' })
+      .then((response) => {
+        if (response.data.status == 0) {
+          // this.props.showNotification('移动成功')
+          this.fetchExercise()
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
   }
   onSortDown = (index, question_id) => {
     this.onSort(index, question_id, false)
@@ -304,18 +301,18 @@ class ExerciseNewCommon extends Component{
     }
     const _indexBefore = question_id_to_insert_after ? this.findIndexById(question_id_to_insert_after) : this.state.exercise_questions.length - 1
     for (let i = _indexBefore; i >= 0; i--) {
-      if(this.state.exercise_questions[i].question_type == question_type) {
-        init_question_score = this.state.exercise_questions[i].question_score 
+      if (this.state.exercise_questions[i].question_type == question_type) {
+        init_question_score = this.state.exercise_questions[i].question_score
         break;
       }
     }
     return init_question_score;
   }
   addEditingQuestion = (question_type, question_id_to_insert_after, otherAttributes) => {
-    
+
     let init_question_score = this.getInitScore(question_type, question_id_to_insert_after)
-    
-    let questionObj  = {
+
+    let questionObj = {
       question_type: question_type, // 需要这个通过类型判断
       init_question_score: init_question_score,
       isNew: true,  // 新建或编辑，用是否有id区分是新建还是编辑
@@ -325,7 +322,7 @@ class ExerciseNewCommon extends Component{
     const { exercise_questions } = this.state;
     let new_exercise_questions = exercise_questions.slice(0)
     let newIndex = new_exercise_questions.length;
-    
+
     if (question_id_to_insert_after) {
       const _indexBefore = this.findIndexById(question_id_to_insert_after)
       new_exercise_questions.splice(_indexBefore + 1, 0, questionObj)
@@ -336,42 +333,33 @@ class ExerciseNewCommon extends Component{
     this.editingId = `#question_${newIndex}`
     this.setState({ exercise_questions: new_exercise_questions }, () => {
       setTimeout(() => {
-        $(this.editingId).length && $("html").animate({ scrollTop: $(this.editingId).offset().top - 100})
+        $(this.editingId).length && $("html").animate({ scrollTop: $(this.editingId).offset().top - 100 })
       }, 500)
     })
   }
   findIndexById = (id) => {
     const { exercise_questions } = this.state
-    for(let i = 0; i < exercise_questions.length; i++) {
+    for (let i = 0; i < exercise_questions.length; i++) {
       if (exercise_questions[i].question_id == id) {
         return i;
       }
     }
-  } 
+  }
   onQestionDelete = (question_id) => {
     this.props.confirm({
       content: `确认要删除这个问题吗？`,
       onOk: () => {
         const url = `/${this.props.exercise_url_questions || 'exercise_questions'}/${question_id}.json`
         axios.delete(url)
-        .then((response) => {
-          if (response.data.status == 0) {
-            this.props.showNotification('删除成功')
-            this.fetchExercise()
-
-            // const { exercise_questions } = this.state
-            // const index = this.findIndexById(question_id)
-
-            // this.setState(
-            //   (prevState) => ({ 
-            //     exercise_questions : update(prevState.exercise_questions, {$splice: [[index, 1]]}) 
-            //   })
-            // )
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-        });    
+          .then((response) => {
+            if (response.data.status == 0) {
+              this.props.showNotification('删除成功')
+              this.fetchExercise()
+            }
+          })
+          .catch(function (error) {
+            console.log(error);
+          });
       }
     })
   }
@@ -382,51 +370,44 @@ class ExerciseNewCommon extends Component{
   goToPreview = () => {
     const exercise_id = this.props.match.params.Id
     const courseId = this.props.match.params.coursesId
-    this.props.history.push(`/courses/${courseId}/exercises/${exercise_id}/student_exercise_list?tab=2`)
+    this.props.history.push(`/classrooms/${courseId}/exercises/${exercise_id}/student_exercise_list?tab=2`)
   }
   getAddQuestionUrl = () => {
-    const Id = this.props.match.params.Id  
+    const Id = this.props.match.params.Id
     const url = this.props.exercise_url_questions ? `/${this.props.exercise_url_questions}.json` : `/exercises/${Id}/exercise_questions.json`
     return url;
   }
-  getEditQuestionUrl = (question_id) => { 
+  getEditQuestionUrl = (question_id) => {
     const editUrl = this.props.exercise_url_questions ? `/${this.props.exercise_url_questions}/${question_id}.json` : `/exercise_questions/${question_id}.json`
     return editUrl;
   }
+  onCancel = () => {
+    this.setState({
+      editMode: false
+    })
+  }
   render() {
-    let { exercise_name, exercise_description, course_id, exercise_types,
-      exercise_questions, left_banner_id  } = this.state;
-    // if (this.isEdit && !exercise_types) {
-    //   return ''
-    // }
-    // const { getFieldDecorator } = this.props.form;
-    const { q_counts, q_scores, q_doubles, q_doubles_scores, q_judges, q_judges_scores, 
-      q_mains, q_mains_scores, q_nulls, q_nulls_scores, q_shixuns, q_shixuns_scores, q_singles, q_singles_scores} = exercise_types;
-    const formItemLayout = {
-      labelCol: {
-        xs: { span: 24 },
-        // sm: { span: 8 },
-        sm: { span: 24 },
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        // sm: { span: 16 },
-        sm: { span: 24 },
-      },
-    };
+    let { exercise_name, exercise_description, exercise_types, exercise_questions, is_md, editMode } = this.state;
+    const { q_counts, q_scores, q_doubles, q_doubles_scores, q_judges, q_judges_scores,
+      q_mains, q_mains_scores, q_nulls, q_nulls_scores, q_shixuns, q_shixuns_scores, q_singles, q_singles_scores, q_pros, q_pros_scores } = exercise_types;
+
+    const exerciseFormOpt = {
+      exercise_name,
+      exercise_description,
+      is_md,
+      onCancel: this.onCancel,
+      isEdit: this.isEdit,
+      onSaveHandler: this.onSaveExercise
+    }
 
-    const { current_user } = this.props
-    const isAdmin = this.props.isAdmin()
-    const courseId=this.props.match.params.coursesId;
     const exercise_id = this.props.match.params.Id
 
-    const isEdit = this.isEdit
     const commonHandler = {
       onQestionDelete: this.onQestionDelete,
       addSuccess: this.addSuccess,
       addQuestion: this.addQuestion,
       onEditorCancel: this.onEditorCancel,
-      changeScore:this.changeScore,
+      changeScore: this.changeScore,
       editQestion: this.editQestion,
       onSortDown: this.onSortDown,
       onSortUp: this.onSortUp,
@@ -436,18 +417,18 @@ class ExerciseNewCommon extends Component{
 
       getAddQuestionUrl: this.getAddQuestionUrl,
       getEditQuestionUrl: this.getEditQuestionUrl,
-      exercise_url: this.props.exercise_url,
+      exercise_url: this.props.exercise_url
     }
-    return(
-        <React.Fragment>
-          <ShixunChooseModal
-            ref="shixunChooseModal"
-            chooseShixun={this.chooseShixun}
-            {...this.props}
-            singleChoose={true}
-            shixunsUrl={this.props.shixunsUrl}
-          ></ShixunChooseModal>
-          <style>{`
+    return (
+      <React.Fragment>
+        <ShixunChooseModal
+          ref="shixunChooseModal"
+          chooseShixun={this.chooseShixun}
+          {...this.props}
+          singleChoose={true}
+          shixunsUrl={this.props.shixunsUrl}
+        ></ShixunChooseModal>
+        <style>{`
             .courseForm .formBlock {
               padding: 20px 30px 30px 30px;
               border-bottom: 1px solid #EDEDED;
@@ -458,168 +439,115 @@ class ExerciseNewCommon extends Component{
               max-width: 1128px;
             }
           `}</style>
-           
 
-            {!this.state.editMode && <div className="padding20-30" style={{ background: '#fff'}}>
-              <div className="displayTitle font-16">
-                <span>{exercise_name}</span>
-                <a className="fr mr6" onClick={() => { this.setState({editMode: true}) }} style={{ lineHeight: '32px'}}>
-                  <Tooltip title="编辑"><i className="iconfont icon-bianjidaibeijing font-20 color-green"></i></Tooltip>
-                </a>
-              </div>
-              <div className="displayDescription color-grey-9" dangerouslySetInnerHTML={{__html: exercise_description}}
-                style={{whiteSpace: 'pre-wrap'}}
-              ></div>
-              
-            </div>}
-            {this.state.editMode && <Form {...formItemLayout}
-																					// onSubmit={this.handleSubmit}
-						>
-              <div className="formBlock" style={{paddingBottom: '2px',borderBottom:"none"}}>
-                <Form.Item
-                  label="试卷标题"
-                  required
-                  className="topicTitle "
-                >
-                  {/* {getFieldDecorator('subject', {
-                    rules: [{
-                      required: true, message: '请输入标题',
-                    }, {
-                      max: 20, message: '最大限制为20个字符',
-                    }],
-                  })( */}
-                  <style>
-                    {
-                      `
-                .exercicenewinputysl .ant-input{
-																		border-right: none !important;
-																		height: 40px !important;
-																		}
-                
-                `
-                    }
-                  </style>
-                    <Input placeholder={`请输入试卷标题，最大限制${TITLE_MAX_LENGTH}个字符`} maxLength={TITLE_MAX_LENGTH} className="mt5 exercicenewinputysl" value={exercise_name}
-                         onChange={this.exercise_name_change} addonAfter={`${exercise_name ? exercise_name.length : 0}/${TITLE_MAX_LENGTH}`}
-                    />
-                  {/* )} */}
-                </Form.Item>
 
-                <Form.Item
-                  label="&nbsp;&nbsp;试卷须知"
-                >
-                  {/* {getFieldDecorator('select_board_id', {
-                    // initialValue: '3779',
-                  })( */}
-                    <TextArea placeholder="请在此输入本次试卷答题的相关说明，最大限制100个字符" className="mt5" style={{height:"120px"}} value={exercise_description}
-                        onChange={this.exercise_description_change}
-                    />
-                  {/* )} */}
-                </Form.Item>
-                <Form.Item>
-                    {/* defalutSubmitbtn */}
-                    
-                    <a  className="task-btn task-btn-orange fr mt4" style={{height: '30px', width: '70px'}}
-                        onClick={this.onSaveExercise}
-                    >保存</a>
+        {!this.state.editMode && <div style={{ background: '#fff', padding: '20px 30px', minHeight: 100 }}>
+          <div className="displayTitle font-16">
+            <span>{exercise_name}</span>
+            <a className="fr mr6" onClick={() => { this.setState({ editMode: true }) }} style={{ lineHeight: '40px' }}>
+              <Tooltip title="编辑"><i className="iconfont icon-bianjidaibeijing font-20 color-green"></i></Tooltip>
+            </a>
+          </div>
+          <div className="displayDescription color-grey-9" dangerouslySetInnerHTML={{ __html: exercise_description }}
+            style={{ whiteSpace: 'pre-wrap' }}
+          ></div>
 
-                    { this.isEdit && <a onClick={() => this.setState({editMode: false})} className="defalutCancelbtn fr mt4" 
-                        style={{height: '30px', width: '70px', fontSize: '14px', lineHeight: '30px', marginRight: '16px'}}>取消</a>}
-                    {/* <Button type="primary" onClick={this.onSaveExercise} className="fr">保存</Button> */}
-                </Form.Item>
-                </div>
-                {/* <div className="clearfix mt30 mb30">
-                  <a className="defalutCancelbtn fl" onClick={() => {}}>取消</ a>
-                </div> */}
-            </Form>}
-          
+        </div>}
+        {this.state.editMode && <ExerciseForm {...exerciseFormOpt} />}
 
-            <p className="clearfix padding20-30 color-grey-9">
-              <span className="fl">
-                { !!q_singles && <span className="mr20">单选题{q_singles}题，共{q_singles_scores}分</span>}
-                { !!q_doubles && <span className="mr20">多选题{q_doubles}题，共{q_doubles_scores}分</span>}
-                { !!q_judges && <span className="mr20">判断题{q_judges}题，共{q_judges_scores}分</span>}
-                { !!q_nulls && <span className="mr20">填空题{q_nulls}题，共{q_nulls_scores}分</span>}
-                { !!q_mains && <span className="mr20">简答题{q_mains}题，共{q_mains_scores}分</span>}
-                { !!q_shixuns && <span className="mr20">实训题{q_shixuns}题，共{q_shixuns_scores}分</span> }
-              </span>
-              <span className="fr">
-                { !!q_counts && 
-                  <span>
-                    合计 <span className="color-blue">{q_counts}</span> 题，
+
+        <p className="clearfix padding20-30 color-grey-9">
+          <span className="fl">
+            {!!q_singles && <span className="mr20">单选题{q_singles}题，共{q_singles_scores}分</span>}
+            {!!q_doubles && <span className="mr20">多选题{q_doubles}题，共{q_doubles_scores}分</span>}
+            {!!q_judges && <span className="mr20">判断题{q_judges}题，共{q_judges_scores}分</span>}
+            {!!q_nulls && <span className="mr20">填空题{q_nulls}题，共{q_nulls_scores}分</span>}
+            {!!q_mains && <span className="mr20">简答题{q_mains}题，共{q_mains_scores}分</span>}
+            {!!q_shixuns && <span className="mr20">实训题{q_shixuns}题，共{q_shixuns_scores}分</span>}
+            {!!q_pros && <span className="mr20">编程题{q_pros}题，共{q_pros_scores}分</span>}
+          </span>
+          <span className="fr">
+            {!!q_counts &&
+              <span>
+                合计 <span className="color-blue">{q_counts}</span> 题，
                     共 <span className={`${q_scores > 100 ? 'color-red font-bd' : 'color-orange'}`}>{q_scores}</span> 分
                   </span>
-                }
-              </span>
-            </p>
-            <div className="edu-back-white">
-              { exercise_questions.map((item, index) => {
-                if (item.question_type == 0 || item.question_type == 1) {
-                  if (item.isNew) {
-                    return <SingleEditor {...this.props} {...item} index={index} {...commonHandler}></SingleEditor>
-                  } else {
-                    return <SingleDisplay {...this.props} {...item} index={index} {...commonHandler}
-                        displayCount={exercise_questions.length}
-                    ></SingleDisplay>
-                  }
-                } else if (item.question_type == 2) {
-                  if (item.isNew) {
-                    return <JudgeEditor {...this.props} {...item} index={index} {...commonHandler}></JudgeEditor>
-                  } else {
-                    return <JudgeDisplay {...this.props} {...item} index={index} {...commonHandler} ></JudgeDisplay>
-                  }
-                } else if (item.question_type == 3) {
-                  if (item.isNew) {
-                    return <NullEditor {...this.props} {...item} index={index} {...commonHandler}></NullEditor>
-                  } else {
-                    return <NullDisplay {...this.props} {...item} index={index} {...commonHandler} ></NullDisplay>
-                  }
-                } else if (item.question_type == 4) {
-                  if (item.isNew) {
-                    return <MainEditor {...this.props} {...item} index={index} {...commonHandler} ></MainEditor>
-                  } else {
-                    return <MainDisplay {...this.props} {...item} index={index} {...commonHandler} ></MainDisplay>
-                  }
-                } else if (item.question_type == 5) {
-                  if (item.isNew) {
-                    return <ShixunEditor {...this.props} {...item} index={index} {...commonHandler} 
-                        chooseShixunSuccess={this.chooseShixunSuccess}
-                    ></ShixunEditor>
-                  } else {
-                    return <ShixunDisplay {...this.props} {...item} index={index} {...commonHandler} ></ShixunDisplay>
-                  }
-                }
-                return <div></div>
-              })}
+            }
+          </span>
+        </p>
+        <div className="edu-back-white">
+          {exercise_questions.map((item, index) => {
+            if (item.question_type == 0 || item.question_type == 1) {
+              if (item.isNew) {
+                return <SingleEditor key={index} {...this.props} {...this.state} {...item} index={index} {...commonHandler}></SingleEditor>
+              } else {
+                return <SingleDisplay key={index}{...this.props} {...this.state}  {...item} index={index} {...commonHandler}
+                  displayCount={exercise_questions.length}
+                ></SingleDisplay>
+              }
+            } else if (item.question_type == 2) {
+              if (item.isNew) {
+                return <JudgeEditor key={index}{...this.props} {...this.state}  {...item} index={index} {...commonHandler}></JudgeEditor>
+              } else {
+                return <JudgeDisplay key={index}{...this.props} {...this.state}  {...item} index={index} {...commonHandler} ></JudgeDisplay>
+              }
+            } else if (item.question_type == 3) {
+              if (item.isNew) {
+                return <NullEditor key={index}{...this.props} {...this.state}  {...item} index={index} {...commonHandler}></NullEditor>
+              } else {
+                return <NullDisplay key={index}{...this.props} {...this.state}  {...item} index={index} {...commonHandler} ></NullDisplay>
+              }
+            } else if (item.question_type == 4) {
+              if (item.isNew) {
+                return <MainEditor key={index}{...this.props} {...this.state}  {...item} index={index} {...commonHandler} ></MainEditor>
+              } else {
+                return <MainDisplay key={index}{...this.props} {...this.state}  {...item} index={index} {...commonHandler} ></MainDisplay>
+              }
+            } else if (item.question_type == 5) {
+              if (item.isNew) {
+                return <ShixunEditor key={index}{...this.props} {...this.state}  {...item} index={index} {...commonHandler}
+                  chooseShixunSuccess={this.chooseShixunSuccess}
+                ></ShixunEditor>
+              } else {
+                return <ShixunDisplay key={index}{...this.props} {...this.state}  {...item} index={index} {...commonHandler} ></ShixunDisplay>
+              }
+            } else if (item.question_type == 6) {
+              if (item.isNew) {
+                return <ShixunProgramming key={index}{...this.props} {...this.state}  {...item} index={index} {...commonHandler}
+                  chooseShixunSuccess={this.chooseShixunSuccess}></ShixunProgramming>
+              } else {
+                return <ShixunProgramming key={index}{...this.props} {...this.state}  {...item} index={index} {...commonHandler} ></ShixunProgramming>
+              }
+            }
+            return <div></div>
+          })}
 
-              {!commonHandler.exerciseIsPublish && <div className="problemShow padding30">
-                <ActionBtn style="green" className="mr20" onClick={() => this.addQuestion(null, Q_TYPE_SINGLE)}>
-                  <i className="iconfont icon-tianjiafangda color-white font-14 mr5" style={{ marginTop: '-1px', display: 'inline-block'}}></i>选择题
+          {!commonHandler.exerciseIsPublish && <div className="problemShow padding30">
+            <ActionBtn style="green" className="mr20" onClick={() => this.addQuestion(null, Q_TYPE_SINGLE)}>
+              <i className="iconfont icon-tianjiafangda color-white font-14 mr5" style={{ marginTop: '-1px', display: 'inline-block' }}></i>选择题
                 </ActionBtn>
-                <ActionBtn style="green" className="mr20" onClick={() => this.addQuestion(null, Q_TYPE_JUDGE)}>
-                  <i className="iconfont icon-tianjiafangda color-white font-14 mr5" style={{ marginTop: '-1px', display: 'inline-block'}}></i>判断题
+            <ActionBtn style="green" className="mr20" onClick={() => this.addQuestion(null, Q_TYPE_JUDGE)}>
+              <i className="iconfont icon-tianjiafangda color-white font-14 mr5" style={{ marginTop: '-1px', display: 'inline-block' }}></i>判断题
                 </ActionBtn>
-                <ActionBtn style="green" className="mr20" onClick={() => this.addQuestion(null, Q_TYPE_NULL)}>
-                  <i className="iconfont icon-tianjiafangda color-white font-14 mr5" style={{ marginTop: '-1px', display: 'inline-block'}}></i>填空题
+            <ActionBtn style="green" className="mr20" onClick={() => this.addQuestion(null, Q_TYPE_NULL)}>
+              <i className="iconfont icon-tianjiafangda color-white font-14 mr5" style={{ marginTop: '-1px', display: 'inline-block' }}></i>填空题
                 </ActionBtn>
-                <ActionBtn style="green" className="mr20" onClick={() => this.addQuestion(null, Q_TYPE_MAIN)}>
-                  <i className="iconfont icon-tianjiafangda color-white font-14 mr5" style={{ marginTop: '-1px', display: 'inline-block'}}></i>简答题
+            <ActionBtn style="green" className="mr20" onClick={() => this.addQuestion(null, Q_TYPE_MAIN)}>
+              <i className="iconfont icon-tianjiafangda color-white font-14 mr5" style={{ marginTop: '-1px', display: 'inline-block' }}></i>简答题
                 </ActionBtn>
-                <ActionBtn style="green" className="mr20" onClick={() => this.addShixun(null)}>
-                  <i className="iconfont icon-tianjiafangda color-white font-14 mr5" style={{ marginTop: '-1px', display: 'inline-block'}}></i>实训题
+            <ActionBtn style="green" className="mr20" onClick={() => this.addShixun(null)}>
+              <i className="iconfont icon-tianjiafangda color-white font-14 mr5" style={{ marginTop: '-1px', display: 'inline-block' }}></i>实训题
                 </ActionBtn>
 
-                {exercise_id && !this.props.hidePreviewButton && <ActionBtn style="blue" className="fr" onClick={() => this.goToPreview()}>
-                  {/* <i className="iconfont icon-tianjiafangda color-white font-14 mr5" style={{ marginTop: '-1px', display: 'inline-block'}}></i> */}
-                  试卷预览
+            {exercise_id && !this.props.hidePreviewButton && <ActionBtn style="blue" className="fr" onClick={() => this.goToPreview()}>
+              试卷预览
                 </ActionBtn>}
 
-                {this.props.bottomSection && this.props.bottomSection}
-              </div>}
-            </div>
-        </React.Fragment>
-      )
-    }
+            {this.props.bottomSection && this.props.bottomSection}
+          </div>}
+        </div>
+      </React.Fragment>
+    )
+  }
 }
-// RouteHOC()
-export default (ExerciseNewCommon);
\ No newline at end of file
+export default ExerciseNewCommon;
diff --git a/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
index 20c40f02..91958d48 100644
--- a/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
+++ b/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
@@ -1,5 +1,5 @@
-import React,{ Component } from "react";
-import {Input,InputNumber,Spin,Statistic} from "antd";
+import React, { Component } from "react";
+import { Input, InputNumber, Spin, Statistic, Modal } from "antd";
 
 import '../css/members.css';
 import '../css/busyWork.css';
@@ -7,225 +7,200 @@ import '../poll/pollStyle.css';
 import '../css/Courses.css';
 
 import moment from 'moment';
-import { WordsBtn,markdownToHTML,ActionBtn,getImageUrl, MarkdownToHtml } from 'educoder';
+import { WordsBtn, ActionBtn, getImageUrl } from 'educoder';
 import Modals from '../../modals/Modals';
 import CoursesListType from '../coursesPublic/CoursesListType';
-
 import Multiple from './question/multiple';
 import Single from './question/single';
+import Progques from './question/Progques';
 import FillEmpty from './question/fillEmpty';
 import SimpleAnswer from './question/simpleAnswer';
 import ShixunAnswer from './question/shixunAnswer';
+import QuestionModalPicture from '../../question/component/QuestionModalPicture'
 
 import update from 'immutability-helper';
 
 import axios from 'axios';
 import './new/common.css';
-
+import RenderHtml from "../../../components/render-html";
 const { Countdown } = Statistic;
 
-// const deadline =  Date.now() + this.state.time*60*60; // Moment is also OK
-
-// console.log(deadline)
-
-const Textarea =Input.TextArea
+const Textarea = Input.TextArea
 const tagArray = [
-  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 
-  'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 
+  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+  'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
   'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
 const $ = window.$;
-const statudmap={1:"未发布",2:"已发布",3:"已截止"}
+const statudmap = { 1: "未发布", 2: "已发布", 3: "已截止" }
 
-const type=["单选题","多选题","判断题","填空题","简答题","实训题"]
+const type = ["单选题", "多选题", "判断题", "填空题", "简答题", "实训题", "编程题"]
 
-const format="YYYY-MM-DD HH:mm"
-class ExerciseReviewAndAnswer extends Component{
-  constructor(props){
-      super(props);
-      this.state={
-        data:undefined,
-        questionPanelFixed:false,
-        e_ReviewInfo:undefined,
-        e_AnswerInfo:undefined,
-        courseName:undefined,
-        exercise:undefined,
-        question_types:undefined,
-        exercise_questions:undefined,
-        time:undefined,
-        hour:0,
-        minute:0,
-        second:0,
-        Modalstype:false,
-        Modalstopval:undefined,
-        modalsBottomval:undefined,
-        ModalCancel:undefined,
-        ModalSave:undefined,
-        Loadtype:undefined,
-        // 问卷是否可以被编辑（老师/试卷已截止/问卷已提交为1）
-        user_exercise_status:undefined,
-
-        // 开始答题时间
-        exercise_start_at:undefined,
-
-        //老师身份
-        exercise_scores:undefined,
-        exercise_answer_user:undefined,
-
-        //学生身份
-        question_status:undefined,
-
-        score:undefined,
-        setScoreReason:undefined,
-        setTip:"",
-
-        Id:undefined,
-        // 试卷总分
-        exerciseTotalScore:undefined,
-
-        // 加载效果
-        isSpin:false,
-        // 调分数组
-        ajustSore:undefined
-      }
+const format = "YYYY-MM-DD HH:mm"
+class ExerciseReviewAndAnswer extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      data: undefined,
+      questionPanelFixed: false,
+      e_ReviewInfo: undefined,
+      e_AnswerInfo: undefined,
+      courseName: undefined,
+      exercise: undefined,
+      question_types: undefined,
+      exercise_questions: undefined,
+      time: undefined,
+      hour: 0,
+      minute: 0,
+      second: 0,
+      Modalstype: false,
+      Modalstopval: undefined,
+      modalsBottomval: undefined,
+      ModalCancel: undefined,
+      ModalSave: undefined,
+      Loadtype: undefined,
+      // 问卷是否可以被编辑（老师/试卷已截止/问卷已提交为1）
+      user_exercise_status: undefined,
+      // 开始答题时间
+      exercise_start_at: undefined,
+      //老师身份
+      exercise_scores: undefined,
+      exercise_answer_user: undefined,
+      //学生身份
+      question_status: undefined,
+      score: undefined,
+      setScoreReason: undefined,
+      setTip: "",
+      Id: undefined,
+      // 试卷总分
+      exerciseTotalScore: undefined,
+      // 加载效果
+      isSpin: false,
+      // 调分数组
+      ajustSore: undefined,
+      //是否是md编辑器
+      is_md: false,
+      url: "",
+    }
   }
-  componentDidUpdate (prevProps) {
+  componentDidUpdate(prevProps) {
     // 需要等get_user_info执行完才能getInfo
     if (!prevProps.coursedata.name && this.props.coursedata.name) {
       this.getInfo()
     }
   }
-  componentDidMount(){
-    if(this.props.coursedata.name){
+  componentDidMount() {
+    if (this.props.coursedata.name) {
       this.getInfo();
     }
-    
-    //window.addEventListener('scroll', this.handleScroll);	
   }
-
-  remainTime=(time)=>{
-    // let { time } = this.state;
-    // let h=moment(parseInt(time)*1000).hour()-8;
-    // let m=moment(parseInt(time)*1000).minutes();
-    // let s=moment(parseInt(time)*1000).seconds();
-    // this.timer = setInterval(() => {
-    //   if(time>0){
-    //     if(s==0){
-    //       if(m > 0){
-    //         m--;
-    //       }
-    //       s=59;
-    //     }else{
-    //       s--;
-    //     }
-    //     this.setState({
-    //       hour:h,
-    //       minute:m,
-    //       second:s
-    //     })
-    //     if(h==0 && m==0 && s==0){
-    //       clearInterval(this.timer);
-    //       this.autoCommitExercise();
-    //     }
-    //   }else{
-    //     clearInterval(this.timer);
-    //   }
-    // },1000)
+  handleShowUploadImage = (url) => {
+    this.setState({
+      url: url
+    })
+  }
+  handleClose = () => {
+    this.setState({
+      url: '',
+    })
   }
 
   //自动交卷
-  autoCommitExercise=()=>{
-		let eId=this.props.match.params.Id;
-		let url=`/exercises/${eId}/commit_exercise.json`;
-		axios.post(url,{
-			commit_method:2
-		}).then((result)=>{
-			if(result){
-				if(result.data.status===0){
-					this.setState({
-						Modalstype:true,
-						Modalstopval:'答题结束了，系统已自动提交试卷',
-						modalsBottomval:"不能再修改答题",
-						ModalCancel:undefined,
-						ModalSave:this.sureCommit,
-						Loadtype:true,
-            time:null,
-					})
-					this.props.showNotification(`${result.data.message}`);
-				}
-
-				if(result.data.status===-2){
-					 // this.remainTime(parseInt(result.data.message))
+  autoCommitExercise = () => {
+    let eId = this.props.match.params.Id;
+    let url = `/exercises/${eId}/commit_exercise.json`;
+    axios.post(url, {
+      commit_method: 2
+    }).then((result) => {
+      if (result) {
+        if (result.data.status === 0) {
           this.setState({
-            time:parseInt(result.data.mess)
+            Modalstype: true,
+            Modalstopval: '答题结束了，系统已自动提交试卷',
+            modalsBottomval: "不能再修改答题",
+            ModalCancel: undefined,
+            ModalSave: this.sureCommit,
+            Loadtype: true,
+            time: null,
+          })
+          this.props.showNotification(`${result.data.message}`);
+        }
+
+        if (result.data.status === -2) {
+          // this.remainTime(parseInt(result.data.message))
+          this.setState({
+            time: parseInt(result.data.mess)
           })
           this.deadline(parseInt(result.data.message))
-				}
-			}
-		}).catch((error)=>{
-			console.log(error);
-		})
+        }
+      }
+    }).catch((error) => {
+      console.log(error);
+    })
   }
 
-  sureCommit=()=>{
+  sureCommit = () => {
     let coursesId = this.props.match.params.coursesId;
     let eId = this.props.match.params.Id;
-    this.props.history.push(`/courses/${coursesId}/exercises/${eId}/student_exercise_list?tab=0`);
+    this.props.history.push(`/classrooms/${coursesId}/exercises/${eId}/student_exercise_list?tab=0`);
   }
 
   // 滚动定位
-  handleScroll=()=>{
-    if(parseInt(window.scrollY)>550){
+  handleScroll = () => {
+    if (parseInt(window.scrollY) > 550) {
       this.setState({
-        questionPanelFixed:true
+        questionPanelFixed: true
       })
-    }else{
+    } else {
       this.setState({
-        questionPanelFixed:false
+        questionPanelFixed: false
       })
     }
   }
 
-  getInfo=()=>{
+  getInfo = () => {
     this.setState({
-      courseName:this.props.current_user.course_name,
-      isSpin:true
+      courseName: this.props.current_user.course_name,
+      isSpin: true
     })
 
-    let eId=this.props.match.params.Id;
-    let user_id=this.props.match.params.userId;
+    let eId = this.props.match.params.Id;
+    let user_id = this.props.match.params.userId;
 
-    let isAdmin=this.props.isAdmin();
-    if(isAdmin){
-      let url=`/exercises/${eId}/review_exercise.json`
-      axios.get((url),{params:{
-        login:user_id
-      }}).then((result)=>{
-        if(result){
+    let isAdmin = this.props.isAdmin();
+    if (isAdmin) {
+      let url = `/exercises/${eId}/review_exercise.json`
+      axios.get((url), {
+        params: {
+          login: user_id
+        }
+      }).then((result) => {
+        if (result) {
           this.setState({
-            data:result.data,
-            e_ReviewInfo:result.data,
-            exercise:result.data.exercise,
-            exercise_types:result.data.exercise_scores.exercise_types,
-            exercise_scores:result.data.exercise_scores,
-            exercise_start_at:result.data.exercise_answer_user.start_at,
-            exercise_answer_user:result.data.exercise_answer_user,
-            exercise_questions:result.data.exercise_questions,
-            user_exercise_status:1,
-            Id:result.data.exercise_answer_user.user_id,
-            exerciseTotalScore:result.data.exercise_answer_user.score,
-            isSpin:false,
+            data: result.data,
+            e_ReviewInfo: result.data,
+            exercise: result.data.exercise,
+            is_md: result.data.exercise.is_md,
+            exercise_types: result.data.exercise_scores.exercise_types,
+            exercise_scores: result.data.exercise_scores,
+            exercise_start_at: result.data.exercise_answer_user.start_at,
+            exercise_answer_user: result.data.exercise_answer_user,
+            exercise_questions: result.data.exercise_questions,
+            user_exercise_status: 1,
+            Id: result.data.exercise_answer_user.user_id,
+            exerciseTotalScore: result.data.exercise_answer_user.score,
+            isSpin: false,
           })
           // 先将未批的简答题放入到调分数组中
           let ajustSore = [];
-          result.data && result.data.exercise_questions.length>0 && result.data.exercise_questions.map((item,key)=>{
-            if( item.question_type == 4 && item.answer_status == 0 ){
+          result.data && result.data.exercise_questions.length > 0 && result.data.exercise_questions.map((item, key) => {
+            if (item.question_type == 4 && item.answer_status == 0) {
               ajustSore.push({
-                 inputSore:0,
-                 desc:undefined,
-                 id:item.question_id,
-                 position:item.q_position,
-                 setTip:""
+                inputSore: 0,
+                desc: undefined,
+                id: item.question_id,
+                position: item.q_position,
+                setTip: ""
               })
             }
           })
@@ -233,76 +208,80 @@ class ExerciseReviewAndAnswer extends Component{
             ajustSore
           })
         }
-      }).catch((error)=>{
+      }).catch((error) => {
         console.log(error);
       })
-    }else{
-      let url=`/exercises/${eId}/start_answer.json`
-      axios.get((url),{params:{
-        login:user_id
-      }}).then((result)=>{
-        if(result.status==200){
+    } else {
+      let url = `/exercises/${eId}/start_answer.json`
+      axios.get((url), {
+        params: {
+          login: user_id
+        }
+      }).then((result) => {
+        if (result.status == 200) {
           this.setState({
-            data:result.data,
-            e_AnswerInfo:result.data,
-            exercise:result.data.exercise,
-            exercise_types:result.data.exercise_types,
-            question_status:result.data.question_status,
-            exercise_start_at:result.data.exercise.exercise_start_at,
-            exercise_scores:result.data.exercise_scores,
-            exercise_questions:result.data.exercise_questions,
-            user_exercise_status:result.data.exercise.user_exercise_status,
-            time:result.data.exercise.left_time,
-            exerciseTotalScore:result.data.user_score,
-            isSpin:false
+            data: result.data,
+            e_AnswerInfo: result.data,
+            exercise: result.data.exercise,
+            exercise_types: result.data.exercise_types,
+            question_status: result.data.question_status,
+            exercise_start_at: result.data.exercise.exercise_start_at,
+            exercise_scores: result.data.exercise_scores,
+            exercise_questions: result.data.exercise_questions,
+            user_exercise_status: result.data.exercise.user_exercise_status,
+            time: result.data.exercise.left_time,
+            exerciseTotalScore: result.data.user_score,
+            is_md: result.data.exercise.is_md,
+            isSpin: false
           })
-          if(result.data.exercise.left_time != null){
+          if (result.data.exercise.left_time != null) {
             // this.remainTime(result.data.exercise.left_time);
             this.deadline(result.data.exercise.left_time)
           }
         }
-      }).catch((error)=>{
+      }).catch((error) => {
         console.log(error);
       })
     }
   }
-  scrollToAnchor=(index)=>{
-    let name="Anchor_"+index;
+  scrollToAnchor = (index) => {
+    let name = "Anchor_" + index;
     // console.log($("#Anchor_"+index).scrollTop());
     if (index) {
       // let anchorElement = document.getElementById(name);
       // if(anchorElement) { anchorElement.scrollIntoView(); }
-      $("html").animate({ scrollTop: $("#Anchor_"+index).offset().top - 150 })
+      $("html").animate({ scrollTop: $("#Anchor_" + index).offset().top - 150 })
     }
   }
 
   //答题后更改题目列表得状态
-  changeQuestionStatus=(No,flag)=>{
+  changeQuestionStatus = (No, flag) => {
     this.setState(
-      (prevState) => ({ 
-        question_status : update(prevState.question_status, {[No]: { ques_status: {$set: flag} }})
+      (prevState) => ({
+        question_status: update(prevState.question_status, { [No]: { ques_status: { $set: flag } } })
       })
     )
   }
   // 调分
-  showSetScore=(key,flag,position,type,id)=>{
+  showSetScore = (key, flag, position, type, id) => {
+
     this.setState(
-      (prevState) => ({ 
-        exercise_questions : update(prevState.exercise_questions, {[key]: { setScore: {$set: flag == undefined || flag==false ? true : false}}})
-      }),()=>{
-        if (position && type && (flag == undefined || flag==false)) {
-          $("#input_"+position+"_"+type).focus();
-          $("html").animate({ scrollTop: $("#Anchor_"+position+"_"+type).offset().top - 150 });
-          if(id){
+      (prevState) => ({
+        exercise_questions: update(prevState.exercise_questions, { [key]: { setScore: { $set: flag == undefined || flag == false ? true : false } } })
+      }), () => {
+        if (position && type && (flag == undefined || flag == false)) {
+          $("#input_" + position + "_" + type).focus();
+          $("html").animate({ scrollTop: $("#Anchor_" + position + "_" + type).offset().top - 150 });
+          if (id) {
             let { ajustSore } = this.state;
             let obj = ajustSore.filter(obj => obj.id === id).length > 0;
-            if(!obj){
+            if (!obj) {
               ajustSore.push({
                 id,
-                inputSore:0,
-                desc:undefined,
-                position:position,
-                setTip:""
+                inputSore: 0,
+                desc: undefined,
+                position: position,
+                setTip: ""
               })
             }
           }
@@ -314,295 +293,311 @@ class ExerciseReviewAndAnswer extends Component{
     // })
   }
 
-  inputScore=(value,id)=>{
+  inputScore = (value, id) => {
     let { ajustSore } = this.state;
     var index = ajustSore.map(function (item) { return item.id; }).indexOf(id);
     let reg = /^[0-9]+.?[0-9]*$/;
-    if(reg.test(value)==false){
+    if (reg.test(value) == false) {
       // this.setState({
       //   setTip:"请输入数字"
       // })
       this.setState(
-        (prevState) => ({ 
-          ajustSore : update(prevState.ajustSore, {[index]: { setTip: {$set: "请输入数字"}}})
+        (prevState) => ({
+          ajustSore: update(prevState.ajustSore, { [index]: { setTip: { $set: "请输入数字" } } })
         })
       )
       return;
-    }else{
+    } else {
       // this.setState({
       //   setTip:"",
       //   score:value
       // })
       this.setState(
-        (prevState) => ({ 
-          ajustSore : update(prevState.ajustSore, {[index]: { inputSore: {$set: value},setTip:{$set: ""}}})
+        (prevState) => ({
+          ajustSore: update(prevState.ajustSore, { [index]: { inputSore: { $set: value }, setTip: { $set: "" } } })
         })
       )
     }
   }
-  changeScoreReasons=(e,id)=>{
+  changeScoreReasons = (e, id) => {
     // console.log(e.target.value);
     // this.setState({
     //   setScoreReason:e.target.value
     // })
-    let value =  e.target.value;
+    let value = e.target.value;
     let { ajustSore } = this.state;
     var index = ajustSore.map(function (item) { return item.id; }).indexOf(id);
     this.setState(
-      (prevState) => ({ 
-        ajustSore : update(prevState.ajustSore, {[index]: { desc: {$set: value}}})
+      (prevState) => ({
+        ajustSore: update(prevState.ajustSore, { [index]: { desc: { $set: value } } })
       })
     )
   }
-//确认调分
-  setAction=(key,q_id,maxScore,oldScore)=>{
-    let {ajustSore}=this.state;
+  //确认调分
+  setAction = (key, q_id, maxScore, oldScore) => {
+    let { ajustSore } = this.state;
     let list = ajustSore.filter(obj => obj.id == q_id);
     let index = ajustSore.map(function (item) { return item.id; }).indexOf(q_id);
 
     let score = list[0].inputSore;
     let setScoreReason = list[0].desc;
-    let{ setTip }=this.state;
-    if(!score && score != 0){
-      // this.setState({
-      //   setTip:"请输入分数"
-      // })
+    let { setTip } = this.state;
+    if (!score && score != 0) {
       this.setState(
-        (prevState) => ({ 
-          ajustSore : update(prevState.ajustSore, {[index]: { setTip: {$set: "请输入分数"}}})
+        (prevState) => ({
+          ajustSore: update(prevState.ajustSore, { [index]: { setTip: { $set: "请输入分数" } } })
         })
       )
       return;
     }
-    if(score < 0){
-      // this.setState({
-      //   setTip:"分数必须大于或者等于0"
-      // })
+    if (score < 0) {
       this.setState(
-        (prevState) => ({ 
-          ajustSore : update(prevState.ajustSore, {[index]: { setTip: {$set: "分数必须大于或者等于0"}}})
+        (prevState) => ({
+          ajustSore: update(prevState.ajustSore, { [index]: { setTip: { $set: "分数必须大于或者等于0" } } })
         })
       )
       return;
     }
-    if(score > maxScore){
-      // this.setState({
-      //   setTip:"分数不能大于当前题目的分数"
-      // })
+    if (score > maxScore) {
       this.setState(
-        (prevState) => ({ 
-          ajustSore : update(prevState.ajustSore, {[index]: { setTip: {$set: "分数不能大于当前题目的分数"}}})
+        (prevState) => ({
+          ajustSore: update(prevState.ajustSore, { [index]: { setTip: { $set: "分数不能大于当前题目的分数" } } })
         })
       )
       return;
     }
-    if(setTip==""){
-      let url=`/exercise_questions/${q_id}/adjust_score.json`
-      axios.post((url),{
-        score:score,
-        user_id:this.state.Id,
-        comment:setScoreReason
-      }).then((result)=>{
-        if(result.status==200){
+    if (setTip == "") {
+      let url = `/exercise_questions/${q_id}/adjust_score.json`
+      axios.post((url), {
+        score: score,
+        user_id: this.state.Id,
+        comment: setScoreReason
+      }).then((result) => {
+        if (result.status == 200) {
           this.props.showNotification('调分成功');
           this.getInfo();
-          // let statusScore = score==0 ? 0 : score > 0 && score < maxScore ? 2 : 1;
-          
-          // this.setState(
-          //   (prevState) => ({ 
-          //     exercise_questions : update(prevState.exercise_questions, {[key]: { user_score: {$set: parseFloat(score).toFixed(1)},answer_status : {$set: statusScore},question_comments:{$set:result.data.question_comments} }}),
-          //   })
-          // )
-          
-          // this.setState(
-          //   (prevState) => ({ 
-          //     ajustSore : update(prevState.ajustSore, {[index]: { desc: {$set: undefined},inputSore:{ $set:undefined }}})
-          //   })
-          // )
-          // let {exerciseTotalScore} = this.state;
-          // let newScore = parseFloat(parseFloat(exerciseTotalScore)+parseFloat(score)-parseFloat(oldScore)).toFixed(1);
-          // this.setState({
-          //   exerciseTotalScore:newScore
-          // })
-          // this.showSetScore(key,true);
         }
-      }).catch((error)=>{
+      }).catch((error) => {
         console.log(error);
       })
     }
-    
+
   }
 
   // 选择题，切换答案
-  changeOption = (index,ids) =>{
-    //console.log(index+"    "+ids);
+  changeOption = (index, ids) => {
     this.setState(
-      (prevState) => ({ 
-        exercise_questions : update(prevState.exercise_questions, {[index]: { user_answer: {$set: ids} }}),
+      (prevState) => ({
+        exercise_questions: update(prevState.exercise_questions, { [index]: { user_answer: { $set: ids } } }),
       })
     )
   }
 
   //简答题 显示和隐藏答案
-  changeA_flag=(index,status)=>{
+  changeA_flag = (index, status) => {
     this.setState(
-      (prevState) => ({ 
-        exercise_questions : update(prevState.exercise_questions, {[index]: { a_flag: {$set: status} }})
+      (prevState) => ({
+        exercise_questions: update(prevState.exercise_questions, { [index]: { a_flag: { $set: status } } })
       })
     )
   }
 
   //交卷和保存前判断是否有题未答
-  checkExerciseNumber=(index)=>{
-    let url= `/exercises/${this.props.match.params.Id}/begin_commit.json`;
-    axios.get(url).then((result)=>{
-      if(result){
-        if(result.data.question_undo !=0 || result.data.shixun_undo !=0) {
-          let tip="";
-          if(result.data.question_undo !=0 && result.data.shixun_undo !=0){
-            tip =`有 ${result.data.question_undo} 题未答，${result.data.shixun_undo} 实训未通关`;
-          }else if(result.data.question_undo !=0 && result.data.shixun_undo ==0){
-            tip =`有 ${result.data.question_undo} 题未答`;
-          }else if(result.data.question_undo ==0 && result.data.shixun_undo !=0){
-            tip =`有 ${result.data.shixun_undo} 实训未通关`;
+  checkExerciseNumber = (index) => {
+    let url = `/exercises/${this.props.match.params.Id}/begin_commit.json`;
+    axios.get(url).then((result) => {
+      if (result) {
+        if (result.data.question_undo != 0 || result.data.oj_undo != 0) {
+          let tip = "";
+          if (result.data.question_undo != 0 && result.data.oj_undo != 0) {
+            tip = `有 ${result.data.question_undo} 题未完成，包含 ${result.data.oj_undo} 个编程题`;
+          } else if (result.data.question_undo != 0 && result.data.oj_undo == 0) {
+            tip = `有 ${result.data.question_undo} 题未完成`;
+          } else if (result.data.question_undo == 0 && result.data.oj_undo != 0) {
+            tip = `有 ${result.data.oj_undo} 编程题未完成`;
           }
+
+
           this.setState({
-            Modalstype:true,
-            Modalstopval:tip,
-            modalsBottomval:index === 0 ? `在${moment(result.data.end_time).format(format)}之前，允许修改答题` : `提交后无法再修改答题，是否确认提交？`,
-            ModalCancel:this.cancelCommit,
-            ModalSave:()=>this.sureCommitOrSave(index),
-            Loadtype:index === 0 ? true :false
+            Modalstype: true,
+            Modalstopval: tip,
+            modalsBottomval: index === 0 ? `在${moment(result.data.end_time).format(format)}之前，允许修改答题` : `提交后无法再修改答题，是否确认提交？`,
+            ModalCancel: this.cancelCommit,
+            ModalSave: () => this.sureCommitOrSave(index),
+            Loadtype: index === 0 ? true : false
           })
-        }else{
+        } else {
           this.setState({
-            Modalstype:true,
-            Modalstopval:index === 0 ? `在${moment(result.data.end_time).format(format)}之前，允许修改答题` : `提交后无法再修改答题，是否确认提交？`,
-            modalsBottomval:undefined,
-            ModalCancel:this.cancelCommit,
-            ModalSave:()=>this.sureCommitOrSave(index),
-            Loadtype:index === 0 ? true :false
+            Modalstype: true,
+            Modalstopval: index === 0 ? `在${moment(result.data.end_time).format(format)}之前，允许修改答题` : `提交后无法再修改答题，是否确认提交？`,
+            modalsBottomval: undefined,
+            ModalCancel: this.cancelCommit,
+            ModalSave: () => this.sureCommitOrSave(index),
+            Loadtype: index === 0 ? true : false
           })
         }
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
   //交卷
-  commitExercise=()=>{
+  commitExercise = () => {
     this.checkExerciseNumber(1);
   }
   //保存
-  saveExercise=()=>{
+  saveExercise = () => {
     this.checkExerciseNumber(0);
   }
 
   //确认交卷或者保存
-  sureCommitOrSave=(index)=>{
-    if(index===0){
+  sureCommitOrSave = (index) => {
+    if (index === 0) {
       //确认保存
       this.cancelCommit();
       this.sureCommit();
-    }else{
+    } else {
       //交卷
-      let eId=this.props.match.params.Id;
-      let url=`/exercises/${eId}/commit_exercise.json`;
-      axios.post(url,{
-				commit_method:1
-			}).then((result)=>{
-        if(result){
+      let eId = this.props.match.params.Id;
+      let url = `/exercises/${eId}/commit_exercise.json`;
+      axios.post(url, {
+        commit_method: 1
+      }).then((result) => {
+        if (result) {
           this.setState({
-            Modalstype:false,
-            Modalstopval:undefined,
-            modalsBottomval:undefined,
-            ModalCancel:undefined,
-            ModalSave:undefined,
-            Loadtype:undefined
+            Modalstype: false,
+            Modalstopval: undefined,
+            modalsBottomval: undefined,
+            ModalCancel: undefined,
+            ModalSave: undefined,
+            Loadtype: undefined
           })
           this.props.showNotification(`${result.data.message}`);
           this.getInfo();
         }
-      }).catch((error)=>{
+      }).catch((error) => {
         console.log(error);
       })
     }
   }
-  cancelCommit=()=>{
+  cancelCommit = () => {
     this.setState({
-      Modalstype:false,
-      Modalstopval:undefined,
-      modalsBottomval:undefined,
-      ModalCancel:undefined,
-      ModalSave:undefined,
-      Loadtype:undefined
+      Modalstype: false,
+      Modalstopval: undefined,
+      modalsBottomval: undefined,
+      ModalCancel: undefined,
+      ModalSave: undefined,
+      Loadtype: undefined
     })
   }
   // 打回重做
-  RepeatExercise=()=>{
-    let status=parseInt(this.state.exercise.exercise_status);
-    if(status === 3){
+  RepeatExercise = () => {
+    let status = parseInt(this.state.exercise.exercise_status);
+    if (status === 3) {
       this.setState({
-        Modalstype:true,
-        Modalstopval:'截止时间已到，无法打回试卷',
-        modalsBottomval:'请在修改截止时间后再操作',
-        ModalCancel:this.cancelCommit,
-        ModalSave:this.cancelCommit,
-        Loadtype:true
+        Modalstype: true,
+        Modalstopval: '截止时间已到，无法打回试卷',
+        modalsBottomval: '请在修改截止时间后再操作',
+        ModalCancel: this.cancelCommit,
+        ModalSave: this.cancelCommit,
+        Loadtype: true
       })
-    }else{
+    } else {
       this.setState({
-        Modalstype:true,
-        Modalstopval:'学生将得到一次重新答题的机会，现有的答题情况将被清空',
-        modalsBottomval:'是否确认回退TA的试卷答题',
-        ModalCancel:this.cancelCommit,
-        ModalSave:this.sureRepeatExercise,
-        Loadtype:false
+        Modalstype: true,
+        Modalstopval: '学生将得到一次重新答题的机会，现有的答题情况将被清空',
+        modalsBottomval: '是否确认回退TA的试卷答题',
+        ModalCancel: this.cancelCommit,
+        ModalSave: this.sureRepeatExercise,
+        Loadtype: false
       })
     }
   }
-  sureRepeatExercise=()=>{
-    let eId=this.props.match.params.Id;
-    let user_id=this.state.Id;
-    let url=`/exercises/${eId}/redo_exercise.json`
-    axios.post((url),{
-      user_ids:[user_id]
-    }).then((result)=>{
-      if(result){
+  sureRepeatExercise = () => {
+    let eId = this.props.match.params.Id;
+    let user_id = this.state.Id;
+    let url = `/exercises/${eId}/redo_exercise.json`
+    axios.post((url), {
+      user_ids: [user_id]
+    }).then((result) => {
+      if (result) {
         this.props.showNotification(`${result.data.message}`);
         //打回重做后跳转到答题列表页
         this.sureCommit();
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
 
   // 返回
-  returnBtn = () =>{
-    let coursesId=this.props.match.params.coursesId;
-    let eId=this.props.match.params.Id;
-    this.props.history.push(`/courses/${coursesId}/exercises/${eId}/student_exercise_list?tab=0`)
+  returnBtn = () => {
+    let coursesId = this.props.match.params.coursesId;
+    let eId = this.props.match.params.Id;
+    this.props.history.push(`/classrooms/${coursesId}/exercises/${eId}/student_exercise_list?tab=0`)
   }
 
-  deadline=(time)=>{
-    if(time===null){
+  deadline = (time) => {
+    if (time === null) {
       this.setState({
-        Datetime:0
+        Datetime: 0
       })
-    }else{
+    } else {
       this.setState({
-        Datetime:Date.now() + time * 1000
+        Datetime: Date.now() + time * 1000
       })
       // return Date.now() + time * 1000 ;
     }
 
   }
-  render(){
-    let coursesId=this.props.match.params.coursesId;
-    let eId=this.props.match.params.Id;
 
-    let{
+  ProgrammingDetails = (item) => {
+    if (item.hack_identifier) {
+      let url = `/problems/${item.hack_identifier}/start.json`;
+      var newOpenWindow = window.open('about:blank');  // 在ajax外部先打开空白新窗口
+
+      axios.get(url).then((result) => {
+        if (result.data.status === 0) {
+          newOpenWindow.location = `/myproblems/${result.data.identifier}?type=exercises`;
+        }
+      }).catch((error) => {
+        console.log(error);
+      })
+    }
+
+  }
+  //issue#29409
+  goShixunDetail = (item,key)=>{
+    if(item.redo){
+      Modal.info({
+        title:'提示',
+        content:"您之前已经挑战过该实训，考试过程中需要重新挑战",
+        onOk:()=>{
+          const url = `/myshixuns/${item.myshixun_identifier}/reset_my_game.json`
+          return axios.get(url).then(response=>{
+            if(response.status===200){
+              window.open("/shixuns/" + item.shixun_identifier + "/challenges");
+              let new_exercise_questions = this.state.exercise_questions;
+              new_exercise_questions[key]={...item,redo:false};
+              this.setState({exercise_questions:new_exercise_questions});
+            }else{
+              console.log(response)
+            }
+          }).catch(e=>console.log(e));
+        },
+        okText:'确定',
+        maskClosable:false,
+        keyboard:false
+      })
+    }else{
+      window.open("/shixuns/" + item.shixun_identifier + "/challenges")
+    }
+  }
+  render() {
+    let coursesId = this.props.match.params.coursesId;
+    let eId = this.props.match.params.Id;
+
+    let {
       data,
       questionPanelFixed,
       courseName,
@@ -633,18 +628,20 @@ class ExerciseReviewAndAnswer extends Component{
       Loadtype,
       exerciseTotalScore,
       isSpin,
-      ajustSore
-    }=this.state
+      ajustSore,
+      is_md,
+      url
+    } = this.state
     let isAdmin = this.props.isAdmin();
-    let isStudent =this.props.isStudent();
+    let isStudent = this.props.isStudent();
     const { current_user } = this.props
     // console.log(data&&data.exercise.user_name)
-		document.title=courseName&&courseName;
+    document.title = courseName && courseName;
 
-    return(
-      <div className="newMain" style={{paddingTop:"0px"}}>
+    return (
+      <div className="newMain" style={{ paddingTop: "0px" }}>
         <Spin size="large" spinning={isSpin}>
-        <style>{`
+          <style>{`
           .inputNumber30{
             height:30px;
             width:115px;
@@ -671,8 +668,12 @@ class ExerciseReviewAndAnswer extends Component{
             width:100%!important
           }
         `}</style>
-        {/*<p style={{height:"60px"}}></p>*/}
-        <Modals
+          {url ?
+            <QuestionModalPicture  {...this.props} {...this.state} handleClose={() => this.handleClose()}></QuestionModalPicture>
+            :
+            ""
+          }
+          <Modals
             modalsType={Modalstype}
             modalsTopval={Modalstopval}
             modalsBottomval={modalsBottomval}
@@ -680,340 +681,368 @@ class ExerciseReviewAndAnswer extends Component{
             modalSave={ModalSave}
             loadtype={Loadtype}
           />
-        <div className="educontent mt10 mb50">
-          <p className="clearfix mb20">
-            <WordsBtn style="grey" className="fl" to={current_user && current_user.first_category_url}>{courseName}</WordsBtn>
-            <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-            <WordsBtn style="grey" className="fl" to={`/courses/${coursesId}/exercises/${data && data.left_banner_id}`}>{data && data.left_banner_name}</WordsBtn>
-            <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-            <WordsBtn style="grey" to={`/courses/${coursesId}/exercises/${eId}/student_exercise_list?tab=0`} className="fl mr3">{data && data.left_banner_name}详情</WordsBtn>&gt;
-            <span className="ml3">{exercise_answer_user&&exercise_answer_user.user_name}{data&&data.exercise.user_name}</span>
-          </p>
-          <p className="clearfix">
-            <span className="color-grey-3 font-24 fl lineh-40" >{exercise && exercise.exercise_name}</span>
+          <div className="educontent mt10 mb50">
+            <p className="clearfix mb20">
+              <WordsBtn style="grey" className="fl" to={current_user && current_user.first_category_url}>{courseName}</WordsBtn>
+              <span className="color-grey-9 fl ml3 mr3">&gt;</span>
+              <WordsBtn style="grey" className="fl" to={`/classrooms/${coursesId}/exercises/${data && data.left_banner_id}`}>{data && data.left_banner_name}</WordsBtn>
+              <span className="color-grey-9 fl ml3 mr3">&gt;</span>
+              <WordsBtn style="grey" to={`/classrooms/${coursesId}/exercises/${eId}/student_exercise_list?tab=0`} className="fl mr3">{data && data.left_banner_name}详情</WordsBtn>&gt;
+            <span className="ml3">{exercise_answer_user && exercise_answer_user.user_name}{data && data.exercise.user_name}</span>
+            </p>
+            <p className="clearfix">
+              <span className="color-grey-3 font-24 fl lineh-40" >{exercise && exercise.exercise_name}</span>
 
-            <span className="fl mt8">
-              <CoursesListType typelist={[`${statudmap[exercise && exercise.exercise_status]}`]} typesylename={""} />
-            </span>
-            {
-              (isAdmin || ( isStudent && exercise && user_exercise_status == 1)) ?
-              <WordsBtn className="fr font-16 lineh-40" style="grey" onClick={this.returnBtn}>返回</WordsBtn>
-              :
-              time && time != 0 ?
-                <div className="fr">
-                  <Countdown value={this.state.Datetime} onFinish={this.autoCommitExercise} />
-                </div>
-                :""
-            }
-            {/*<div className="fr remainingTime">*/}
-            {/*  <li>{ hour >= 10 ? hour : '0'+hour}</li>*/}
-            {/*  <span>:</span>*/}
-            {/*  <li>{ minute >= 10 ? minute : '0'+minute}</li>*/}
-            {/*  <span>:</span>*/}
-            {/*  <li>{ second >= 10 ? second : '0'+second}</li>*/}
-            {/*</div>*/}
-            {
-              isAdmin && <WordsBtn className="fr font-16 lineh-40 mr30" style="blue" onClick={this.RepeatExercise}>打回重做</WordsBtn>
-            }
-          </p>
-          {
-            exercise && exercise.exercise_description &&
-            <p className="color-grey-3 edu-back-white padding15 mt30">{exercise.exercise_description}</p>
-          }
-          <p className="padding20-30 clearfix">
-            {
-              exercise_types && exercise_types.q_singles > 0 && 
-              <span className="color-grey-9 mr15">单选题 {exercise_types.q_singles} 题,共 {exercise_types && exercise_types.q_singles_scores} 分</span>
-            }
-            {
-              exercise_types && exercise_types.q_doubles > 0 && 
-              <span className="color-grey-9 mr15">多选题 {exercise_types.q_doubles} 题,共 {exercise_types && exercise_types.q_doubles_scores} 分</span>
-            }
-            {
-              exercise_types && exercise_types.q_judges > 0 && 
-              <span className="color-grey-9 mr15">判断题 {exercise_types.q_judges} 题,共 {exercise_types && exercise_types.q_judges_scores} 分</span>
-            }
-            {
-              exercise_types && exercise_types.q_nulls > 0 && 
-              <span className="color-grey-9 mr15">填空题 {exercise_types.q_nulls} 题,共 {exercise_types && exercise_types.q_nulls_scores} 分</span>
-            }
-            {
-              exercise_types && exercise_types.q_mains > 0 && 
-              <span className="color-grey-9 mr15">简答题 {exercise_types.q_mains} 题,共 {exercise_types && exercise_types.q_mains_scores} 分</span>
-            }
-            {
-              exercise_types && exercise_types.q_shixuns > 0 &&
-              <span className="color-grey-9 mr15">实训题 {exercise_types.q_shixuns} 题,共 {exercise_types && exercise_types.q_shixuns_scores} 分</span>
-            }
-            <span className="color-grey-3 fr">共<span className="color-orange-tip"> {exercise_types &&exercise_types.q_scores} </span>分</span>
-            <span className="color-grey-3 fr">合计<span className="color-blue"> {exercise_types &&exercise_types.q_counts} </span>题：</span>
-          </p>
-          <div className="edu-back-white">
-
-            <div className={ questionPanelFixed==true ? "questionsfixed padding30":"questionsNo padding30"} style={{borderBottom:"none"}}>
-              <span className="clearfix font-16">
-                {
-                  exercise_start_at && <span className="fl color-grey-9">开始答题时间：{ exercise_start_at && moment(exercise_start_at).format(format) }</span>
-                }
-                { 
-                  (isAdmin || (isStudent && exercise && exercise.exercise_status == 3)) && exerciseTotalScore && 
-                  <span className="color-grey-9 fr">总分：<span className="color-orange-tip"> { exerciseTotalScore }</span> 分</span>
-                }
-              </span> 
+              <span className="fl mt8">
+                <CoursesListType typelist={[`${statudmap[exercise && exercise.exercise_status]}`]} typesylename={""} />
+              </span>
               {
-                // 老师身份 || 学生身份且试卷已经截止
-                (isAdmin || (isStudent && exercise && exercise.exercise_status == 3)) &&
-                <div className="mt10">
-                  {
-                    exercise_scores && exercise_scores.objective_scores && exercise_scores.objective_scores.length > 0 &&
-                    <div>
-                      <p className="clearfix">
-                        <span className="font-16 mr40">客观题</span>
-                        <span className="mr40 answerTure">正确</span>
-                        <span className="mr40 answerFalse">错误</span>
-                        <span className="mr40 answerHalf">部分得分</span>
-                      </p>
-                      <ul className="clearfix leaderMainNav mb20">
-                        {
-                          exercise_scores.objective_scores.map((item,key)=>{
-                            return(
-                              <a className={item.answer_status==1? "acted" : item.answer_status==2? "half" :""} onClick={()=>this.scrollToAnchor(`${item.ques_position}`)}>{item.ques_position}</a>
-                            )
-                          })
-                        }
-                      </ul>
+                (isAdmin || (isStudent && exercise && user_exercise_status == 1)) ?
+                  <WordsBtn className="fr font-16 lineh-40" style="grey" onClick={this.returnBtn}>返回</WordsBtn>
+                  :
+                  time && time != 0 ?
+                    <div className="fr">
+                      <Countdown value={this.state.Datetime} onFinish={this.autoCommitExercise} />
                     </div>
-                  }
-                  {
-                    exercise_scores && exercise_scores.subjective_scores.length > 0 && 
-                    <div>
-                      <p className="clearfix">
-                        <span className="font-16 mr40">主观题</span>
-                        <span className="mr40 answered">已评</span>
-                        <span className="unanswer">未评</span>
-                      </p>
-                      <ul className="clearfix leaderNav">
-                        {
-                          exercise_scores.subjective_scores.map((item,key)=>{
-                            return(
-                              <a className={item.answer_status==0 ? "" : "acted"} onClick={()=>this.scrollToAnchor(`${item.ques_position}`)}>{item.ques_position}</a>
-                            )
-                          })
-                        }
-                      </ul>
-                    </div>
-                  }
-                </div>
-              }             
-              
-              {
-                //学生身份 且试卷还未截止
-                isStudent && exercise && exercise.exercise_status == 2 ?
-                <div className="mt20">
-                  <p className="clearfix">
-                    <span className="mr40 answered ml20">已答</span>
-                    <span className="unanswer">未答</span>
-                  </p>
-                  <ul className="clearfix leaderNav">
-                    {
-                      question_status && question_status.map((item,key)=>{
-                        return(
-                          <a className={item.ques_status == 1 ? "acted" : ""} onClick={()=>this.scrollToAnchor(`${item.ques_number}`)}>{item.ques_number}</a>
-                        )
-                      })
-                    }
-                  </ul>
-                </div>:""
+                    : ""
               }
-            </div>
-            {/* 试卷题目 */}
-            <div>
               {
-                exercise_questions && exercise_questions.map((item,key)=>{
-                  let list = ajustSore && ajustSore.filter(obj => obj.id === item.question_id);
-                  return(
-                    <div className="bor-top-greyE pt30 pb30" id={"Anchor_"+parseInt(key+1)}>
-                      <p className="clearfix font-16 pl30 pr30">
-                        <span className="color-blue mr5">{item.q_position}、{type[item.question_type]}</span><span className="color-grey-9 mr5">({item.question_score}分)</span>
-                        <span className="fr">
-                          {
-                            // 填空(一直都有调分)，和简答题调分：老师身份 已经评分的才能出现调分按钮
-                            isAdmin && ((parseInt(item.answer_status) != 0 && item.question_type == 4) || item.question_type == 3 || item.question_type == 1) ? 
-                            <WordsBtn style="blue" className="ml20 font-16 fl" onClick={()=>this.showSetScore(key,item.setScore,item.q_position,item.question_type,item.question_id)}>调分</WordsBtn>:""
-                          }
-                          {
-                            // 简答题，未评分的显示未批
-                            isAdmin && parseInt(item.answer_status) == 0 && item.question_type == 4 ? 
-                            <span className="color-red fl ml20">未批</span>:""
-                          }
-                          {
-                            // 客观题：老师||学生（试卷已截止且答案公开）显示正确答案
-                            item.question_type < 3 && item.standard_answer_show ?
-                            <span className="font-16 fl ml20">
-                              正确答案：{ item.standard_answer_show }
-                            </span>:""
-                          }
-                          {
-                            //(老师身份且除实训题外) || (学生身份且试卷已经截止)就显示用户当前题目所得分数
-                          ( isAdmin || (isStudent && exercise.exercise_status == 3)) && item.question_type != 5 && item.user_score ?
-                            <span className="font-16 ml20 fl">
-                              <span><span className={parseInt(item.answer_status) == 0 ?"color-red":parseInt(item.answer_status) == 1 ?"color-green":"color-orange-tip"}>{item.user_score}</span> 分</span>
-                            </span> : ""
-                          }
-                          {
-                            //实训题 ，答题
-                            item.question_type == 5 &&
-                            <a href={"/shixuns/"+item.shixun_identifier+"/challenges"} target="_blank" class="font-16 color-blue fl" target={"_blank"}>实训详情</a>
-                          }
-                        </span>
-                      </p>
-                      <li className="break_word mt15 mb15 pl30 pr30">
-                        {/* <p className="standardAnswer markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML1(item.question_type == 5 ? item.shixun_name : item.question_title).replace(/▁/g,"▁▁▁")}}></p> */}
-                         <MarkdownToHtml content={(item.question_type == 5 ? item.shixun_name : item.question_title)} selector={'answer_' + key} 
-                             className="standardAnswer"
-                        ></MarkdownToHtml>
-                      </li>
-                      {
-                        // 选择题和判断题共用
-                        (item.question_type == 0 || item.question_type == 2) && 
-                        <Single 
-                        {...this.props} 
-                        {...this.state} 
-                        exercise={exercise}
-                        questionType={item}
-                        user_exercise_status={user_exercise_status}
-                        changeOption={(index,ids)=>this.changeOption(index,ids)}
-                        changeQuestionStatus={(No,flag)=>this.changeQuestionStatus(No,flag)}
-                        index={key}
-                        ></Single>
-                      }
-                      {
-                        // 多选题
-                        item.question_type == 1 &&
-                          <Multiple 
-                          {...this.props} 
-                          {...this.state} 
-                          exercise={exercise}
-                          questionType={item}
-                          user_exercise_status={user_exercise_status}
-                          changeOption={(index,ids)=>this.changeOption(index,ids)}
-                          changeQuestionStatus={(No,flag)=>this.changeQuestionStatus(No,flag)}
-                          index={key}
+                isAdmin && <WordsBtn className="fr font-16 lineh-40 mr30" style="blue" onClick={this.RepeatExercise}>打回重做</WordsBtn>
+              }
+            </p>
+            {
+              exercise && exercise.exercise_description &&
+              <p className="color-grey-3 edu-back-white padding15 mt30">{exercise.exercise_description}</p>
+            }
+            <p className="padding20-30 clearfix">
+              {
+                exercise_types && exercise_types.q_singles > 0 &&
+                <span className="color-grey-9 mr15 fl">单选题 {exercise_types.q_singles} 题,共 {exercise_types && exercise_types.q_singles_scores} 分</span>
+              }
+              {
+                exercise_types && exercise_types.q_doubles > 0 &&
+                <span className="color-grey-9 mr15 fl">多选题 {exercise_types.q_doubles} 题,共 {exercise_types && exercise_types.q_doubles_scores} 分</span>
+              }
+              {
+                exercise_types && exercise_types.q_judges > 0 &&
+                <span className="color-grey-9 mr15 fl">判断题 {exercise_types.q_judges} 题,共 {exercise_types && exercise_types.q_judges_scores} 分</span>
+              }
+              {
+                exercise_types && exercise_types.q_nulls > 0 &&
+                <span className="color-grey-9 mr15 fl">填空题 {exercise_types.q_nulls} 题,共 {exercise_types && exercise_types.q_nulls_scores} 分</span>
+              }
+              {
+                exercise_types && exercise_types.q_mains > 0 &&
+                <span className="color-grey-9 mr15 fl">简答题 {exercise_types.q_mains} 题,共 {exercise_types && exercise_types.q_mains_scores} 分</span>
+              }
+              {
+                exercise_types && exercise_types.q_shixuns > 0 &&
+                <span className="color-grey-9 mr15 fl">实训题 {exercise_types.q_shixuns} 题,共 {exercise_types && exercise_types.q_shixuns_scores} 分</span>
+              }
+              {
+                exercise_types && exercise_types.q_pros > 0 &&
+                <span className="color-grey-9 mr15 fl">编程题 {exercise_types.q_pros} 题,共 {exercise_types && exercise_types.q_pros_scores} 分</span>
+              }
+              <span className="color-grey-3 fr">共<span className="color-orange-tip"> {exercise_types && exercise_types.q_scores} </span>分</span>
+              <span className="color-grey-3 fr">合计<span className="color-blue"> {exercise_types && exercise_types.q_counts} </span>题：</span>
+            </p>
+            <div className="edu-back-white">
 
-                          ></Multiple>
-                      }
-                      {
-                        // 填空题
-                        item.question_type == 3 &&
-                        <FillEmpty 
-                        {...this.props} 
-                        {...this.state} 
-                        exercise={exercise}
-                        questionType={item}
-                        user_exercise_status={user_exercise_status}
-                        changeQuestionStatus={(No,flag)=>this.changeQuestionStatus(No,flag)}
-                        index={key}
-
-                        ></FillEmpty>
-                      }
-                      {
-                        // 简答题
-                        item.question_type == 4 &&
-                        <SimpleAnswer 
-                        {...this.props} 
-                        {...this.state} 
-                        exercise={exercise}
-                        questionType={item}
-                        user_exercise_status={user_exercise_status}
-                        changeQuestionStatus={(No,flag)=>this.changeQuestionStatus(No,flag)}
-                        changeA_flag={(index,status)=>this.changeA_flag(index,status)}
-                        index={key}
-                        ></SimpleAnswer>
-                      }
-                      {
-                        // 实训题
-                        item.question_type == 5 &&
-                        <ShixunAnswer 
-                        {...this.props} 
-                        {...this.state} 
-                        exercise={exercise}
-                        questionType={item}
-                        user_exercise_status={user_exercise_status}
-                        id={this.state.Id}
-                        index={key}
-
-                        ></ShixunAnswer>
-                      }
-                      
+              <div className={questionPanelFixed == true ? "questionsfixed padding30" : "questionsNo padding30"} style={{ borderBottom: "none" }}>
+                <span className="clearfix font-16">
+                  {
+                    exercise_start_at && <span className="fl color-grey-9">开始答题时间：{exercise_start_at && moment(exercise_start_at).format(format)}</span>
+                  }
+                  {
+                    (isAdmin || (isStudent && exercise && exercise.exercise_status == 3)) && exerciseTotalScore &&
+                    <span className="color-grey-9 fr">总分：<span className="color-orange-tip"> {exerciseTotalScore}</span> 分</span>
+                  }
+                </span>
+                {
+                  // 老师身份 || 学生身份且试卷已经截止
+                  (isAdmin || (isStudent && exercise && exercise.exercise_status == 3)) &&
+                  <div className="mt10">
                     {
-                      //调分理由部分
-                      item.question_comments && item.question_comments.comment && (item.question_type == 3 || item.question_type == 4 || item.question_type == 1) && 
-                      <div className="ml30 mr30 bor-top-greyE pt30 mt20 clearfix df">
-                        <img src={getImageUrl(`images/${item.question_comments.user_picture}`)} width="48" height="48" className="radius mr10"/>
-                        <div className="flex1">
-                          <li className="lineh-20 mb7">
-                            <span className="color-grey-3 mr20">{item.question_comments.user_name}</span>
-                            <span className="color-grey-9 mr20">{moment(item.question_comments.updated_at).format(format)}</span>
-                          </li>
-                          <li className="break_word lineh-20">{item.question_comments.comment}</li>
-                        </div>
+                      exercise_scores && exercise_scores.objective_scores && exercise_scores.objective_scores.length > 0 &&
+                      <div>
+                        <p className="clearfix">
+                          <span className="font-16 mr40">客观题</span>
+                          <span className="mr40 answerTure">正确</span>
+                          <span className="mr40 answerFalse">错误</span>
+                          <span className="mr40 answerHalf">部分得分</span>
+                        </p>
+                        <ul className="clearfix leaderMainNav mb20">
+                          {
+                            exercise_scores.objective_scores.map((item, key) => {
+                              return (
+                                <a key={item.ques_position} className={item.answer_status == 1 ? "acted" : item.answer_status == 2 ? "half" : ""} onClick={() => this.scrollToAnchor(`${item.ques_position}`)}>{item.ques_position}</a>
+                              )
+                            })
+                          }
+                        </ul>
                       </div>
                     }
                     {
-                      // 调分输入部分
-                      isAdmin && ((item.setScore && item.question_type == 3) || (item.setScore && item.question_type == 1) || ((item.setScore || parseInt(item.answer_status) == 0) && item.question_type == 4))?
-                        <div className="ml30 mr30 bor-top-greyE pt20 mt20" id={`${"Anchor_"+item.q_position+"_"+item.question_type}`}>
-                          <div className="edu-txt-right">
-                            <span><span className="color-red">*</span>调分：</span>
-                            <li className="fr">
-                              <p>
-                                <InputNumber 
-                                  placeholder="请填写分数" 
-                                  min={0} 
-                                  // max={item.question_score} 
-                                  value={list && list.length>0 && list[0].inputSore} 
-                                  step={0.1} 
-                                  precision={1}
-                                  className={ list && list.length>0 && list[0].setTip !="" ? "edu-txt-center winput-115-40 fl mt3 noticeTip inputNumber30" : "edu-txt-center winput-115-40 fl mt3 inputNumber30"} 
-                                  onChange={(value)=>this.inputScore(value,item.question_id)}
-                                  id={`${"input_"+item.q_position+"_"+item.question_type}`}
-                                ></InputNumber>
-                                <span className="ml5">分</span>
-                                {
-                                  parseInt(item.answer_status) == 0 && item.question_type == 4 ? <span className="color-red ml10 font-16">未评分</span> : ''
-                                }
-                                <ActionBtn style="blue" className="middle ml20" onClick={()=>this.setAction(key,item.question_id,item.question_score,item.user_score)}>确认</ActionBtn>
-                              </p>
-                              {
-                                list && list.length > 0 && list[0].setTip !="" ? <p className="color-red edu-txt-left">{ list[0].setTip }</p> :""
-                              }
-                            </li>
+                      exercise_scores && exercise_scores.subjective_scores.length > 0 &&
+                      <div>
+                        <p className="clearfix">
+                          <span className="font-16 mr40">主观题</span>
+                          <span className="mr40 answered">已评</span>
+                          <span className="unanswer">未评</span>
+                        </p>
+                        <ul className="clearfix leaderNav">
+                          {
+                            exercise_scores.subjective_scores.map((item, key) => {
+                              return (
+                                <a key={key} className={item.answer_status == 0 ? "" : "acted"} onClick={() => this.scrollToAnchor(`${item.ques_position}`)}>{item.ques_position}</a>
+                              )
+                            })
+                          }
+                        </ul>
+                      </div>
+                    }
+                  </div>
+                }
+
+                {
+                  //学生身份 且试卷还未截止
+                  isStudent && exercise && exercise.exercise_status == 2 ?
+                    <div className="mt20">
+                      <p className="clearfix">
+                        <span className="mr40 answered ml20">已答</span>
+                        <span className="unanswer">未答</span>
+                      </p>
+                      <ul className="clearfix leaderNav">
+                        {
+                          question_status && question_status.map((item, key) => {
+                            return (
+                              <a key={item.ques_number} className={item.ques_status == 1 ? "acted" : ""} onClick={() => this.scrollToAnchor(`${item.ques_number}`)}>{item.ques_number}</a>
+                            )
+                          })
+                        }
+                      </ul>
+                    </div> : ""
+                }
+              </div>
+              {/* 试卷题目 */}
+              <div>
+                {
+                  exercise_questions && exercise_questions.map((item, key) => {
+                    let list = ajustSore && ajustSore.filter(obj => obj.id === item.question_id);
+                    let titename = (item.question_type == 5 ? item.shixun_name : item.question_title);
+                    return (
+                      <div className="bor-top-greyE pt30 pb30" key={key} id={"Anchor_" + parseInt(key + 1)}>
+                        <p className="clearfix font-16 pl30 pr30">
+                          <span className="color-blue mr5">{item.q_position}、{type[item.question_type]}</span><span className="color-grey-9 mr5">({item.question_score}分)</span>
+                          <span className="fr">
+                            {
+                              // 填空(一直都有调分)，和简答题调分：老师身份 已经评分的才能出现调分按钮
+                              isAdmin && item.question_type == 6 ?
+                                <WordsBtn style="blue" className="ml20 font-16 fl" onClick={() => this.showSetScore(key, item.setScore, item.q_position, item.question_type, item.question_id)}>调分</WordsBtn> : ""
+                            }
+                            {
+                              // 填空(一直都有调分)，和简答题调分：老师身份 已经评分的才能出现调分按钮
+                              isAdmin && ((parseInt(item.answer_status) != 0 && item.question_type == 4) || item.question_type == 3 || item.question_type == 1) ?
+                                <WordsBtn style="blue" className="ml20 font-16 fl" onClick={() => this.showSetScore(key, item.setScore, item.q_position, item.question_type, item.question_id)}>调分</WordsBtn> : ""
+                            }
+                            {
+                              // 简答题，未评分的显示未批
+                              isAdmin && parseInt(item.answer_status) == 0 && item.question_type == 4 ?
+                                <span className="color-red fl ml20">未批</span> : ""
+                            }
+                            {
+                              // 客观题：老师||学生（试卷已截止且答案公开）显示正确答案
+                              item.question_type < 3 && item.standard_answer_show ?
+                                <span className="font-16 fl ml20">
+                                  正确答案：{item.standard_answer_show}
+                                </span> : ""
+                            }
+                            {
+                              //(老师身份且除实训题外) || (学生身份且试卷已经截止)就显示用户当前题目所得分数
+                              (isAdmin || (isStudent && exercise.exercise_status == 3)) && item.question_type != 5 && item.user_score ?
+                                <span className="font-16 ml20 fl">
+                                  <span><span className={parseInt(item.answer_status) == 0 ? "color-red" : parseInt(item.answer_status) == 1 ? "color-green" : "color-orange-tip"}>{item.user_score}</span> 分</span>
+                                </span> : ""
+                            }
+                            {
+                              //实训题 ，答题
+                              item.question_type == 5 &&
+                              <a onClick={()=>this.goShixunDetail(item,key)} className="font-16 color-blue fl">进入答题</a>
+                            }
+                            {
+                              //编程题 ，答题
+                              isStudent && user_exercise_status == 0 && item.question_type == 6 &&
+                              <a onClick={() => this.ProgrammingDetails(item)} className="font-16 color-blue fl">进入答题</a>
+                            }
+                          </span>
+                        </p>
+                        <li className="break_word mt15 mb15 pl30 pr30">
+                          <RenderHtml value={titename} className="standardAnswer" is_md={is_md} />
+                        </li>
+                        {
+                          // 选择题和判断题共用
+                          (item.question_type == 0 || item.question_type == 2) &&
+                          <Single
+                            {...this.props}
+                            {...this.state}
+                            is_md={is_md}
+                            exercise={exercise}
+                            questionType={item}
+                            user_exercise_status={user_exercise_status}
+                            changeOption={(index, ids) => this.changeOption(index, ids)}
+                            changeQuestionStatus={(No, flag) => this.changeQuestionStatus(No, flag)}
+                            index={key}
+                            handleShowUploadImage={(u) => this.handleShowUploadImage(u)}
+                          ></Single>
+                        }
+                        {
+                          // 多选题
+                          item.question_type == 1 &&
+                          <Multiple
+                            {...this.props}
+                            {...this.state}
+                            is_md={is_md}
+                            exercise={exercise}
+                            questionType={item}
+                            user_exercise_status={user_exercise_status}
+                            changeOption={(index, ids) => this.changeOption(index, ids)}
+                            changeQuestionStatus={(No, flag) => this.changeQuestionStatus(No, flag)}
+                            index={key}
+                            handleShowUploadImage={(u) => this.handleShowUploadImage(u)}
+                          ></Multiple>
+                        }
+                        {
+                          // 填空题
+                          item.question_type == 3 &&
+                          <FillEmpty
+                            {...this.props}
+                            {...this.state}
+                            exercise={exercise}
+                            questionType={item}
+                            is_md={is_md}
+                            user_exercise_status={user_exercise_status}
+                            changeQuestionStatus={(No, flag) => this.changeQuestionStatus(No, flag)}
+                            index={key}
+                            handleShowUploadImage={(u) => this.handleShowUploadImage(u)}
+                          ></FillEmpty>
+                        }
+                        {
+                          // 简答题
+                          item.question_type == 4 &&
+                          <SimpleAnswer
+                            {...this.props}
+                            {...this.state}
+                            is_md={is_md}
+                            exercise={exercise}
+                            questionType={item}
+                            user_exercise_status={user_exercise_status}
+                            changeQuestionStatus={(No, flag) => this.changeQuestionStatus(No, flag)}
+                            changeA_flag={(index, status) => this.changeA_flag(index, status)}
+                            index={key}
+                            handleShowUploadImage={(u) => this.handleShowUploadImage(u)}
+                          ></SimpleAnswer>
+                        }
+                        {
+                          // 实训题
+                          item.question_type == 5 &&
+                          <ShixunAnswer
+                            {...this.props}
+                            {...this.state}
+                            is_md={is_md}
+                            exercise={exercise}
+                            questionType={item}
+                            user_exercise_status={user_exercise_status}
+                            id={this.state.Id}
+                            index={key}
+                            handleShowUploadImage={(u) => this.handleShowUploadImage(u)}
+                          ></ShixunAnswer>
+                        }
+                        {
+                          //编程题
+                          item.question_type == 6 &&
+                          <Progques
+                            {...this.props}
+                            {...this.state}
+                            is_md={is_md}
+                            exercise={exercise}
+                            questionType={item}
+                            user_exercise_status={user_exercise_status}
+                            id={this.state.Id}
+                            index={key}
+                            handleShowUploadImage={(u) => this.handleShowUploadImage(u)}
+                          ></Progques>
+
+                        }
+
+                        {
+                          //调分理由部分
+                          item.question_comments && item.question_comments.comment && (item.question_type == 3 || item.question_type == 4 || item.question_type == 1) &&
+                          <div className="ml30 mr30 bor-top-greyE pt30 mt20 clearfix df">
+                            <img src={getImageUrl(`images/${item.question_comments.user_picture}`)} width="48" height="48" className="radius mr10" />
+                            <div className="flex1">
+                              <li className="lineh-20 mb7">
+                                <span className="color-grey-3 mr20">{item.question_comments.user_name}</span>
+                                <span className="color-grey-9 mr20">{moment(item.question_comments.updated_at).format(format)}</span>
+                              </li>
+                              <li className="break_word lineh-20">{item.question_comments.comment}</li>
+                            </div>
                           </div>
-                        <Textarea className="winput-100-150 mt20" value={list && list.length>0 && list[0].desc} style={{height:"180px"}} maxLength="100" onChange={(e)=>this.changeScoreReasons(e,item.question_id)} placeholder="请您输入评语，最大限制100个字符"></Textarea>
-                        </div>:""
-                      }
-                    </div>
-                  )
-                })
-              }
+                        }
+                        {
+                          // 调分输入部分
+                          isAdmin && ((item.setScore && item.question_type == 3) || (item.setScore && item.question_type == 1) || ((item.setScore || parseInt(item.answer_status) == 0) && item.question_type == 4) || (item.setScore && item.question_type == 6)) ?
+                            <div className="ml30 mr30 bor-top-greyE pt20 mt20" id={`${"Anchor_" + item.q_position + "_" + item.question_type}`}>
+                              <div className="edu-txt-right">
+                                <span><span className="color-red">*</span>调分：</span>
+                                <li className="fr">
+                                  <p>
+                                    <InputNumber
+                                      placeholder="请填写分数"
+                                      min={0}
+                                      // max={item.question_score}
+                                      value={list && list.length > 0 && list[0].inputSore}
+                                      step={0.1}
+                                      precision={1}
+                                      className={list && list.length > 0 && list[0].setTip != "" ? "edu-txt-center  fl mt3 noticeTip inputNumber30" : "edu-txt-center  fl mt3 inputNumber30"}
+                                      onChange={(value) => this.inputScore(value, item.question_id)}
+                                      id={`${"input_" + item.q_position + "_" + item.question_type}`}
+                                    ></InputNumber>
+                                    <span className="ml5">分</span>
+                                    {
+                                      parseInt(item.answer_status) == 0 && item.question_type == 4 ? <span className="color-red ml10 font-16">未评分</span> : ''
+                                    }
+                                    <ActionBtn style="blue" className="middle ml20" onClick={() => this.setAction(key, item.question_id, item.question_score, item.user_score)}>确认</ActionBtn>
+                                  </p>
+                                  {
+                                    list && list.length > 0 && list[0].setTip != "" ? <p className="color-red edu-txt-left" style={{float:'left',width:'100%' }}>{list[0].setTip}</p> : ""
+                                  }
+                                </li>
+                              </div>
+                              {item.question_type == 6 ? "" : <Textarea className="winput-100-150 mt20" value={list && list.length > 0 && list[0].desc} style={{ height: "180px" }} maxLength="100" onChange={(e) => this.changeScoreReasons(e, item.question_id)} placeholder="请您输入评语，最大限制100个字符"></Textarea>}
+                            </div> : ""
+                        }
+                      </div>
+                    )
+                  })
+                }
+              </div>
             </div>
+            {
+              isStudent && user_exercise_status == 0 ?
+                <p className="edu-txt-right mt20 clearfix">
+                  <a className="defalutSubmitbtn fr" onClick={this.commitExercise}>交卷</a>
+                  <a className="defalutCancelbtn fr mr20" onClick={this.saveExercise}>保存</a>
+                  {
+                    exercise && time != null ?
+                      <span className="color-grey-9 font-12 mr20 fr lineh-40">保存或者离开页面后，系统将持续计时，到达时长系统将自动交卷</span>
+                      : ""
+                  }
+                </p> : ""
+            }
           </div>
-          {
-            isStudent && user_exercise_status == 0 ?
-            <p className="edu-txt-right mt20 clearfix">
-              <a className="defalutSubmitbtn fr" onClick={this.commitExercise}>交卷</a>
-              <a className="defalutCancelbtn fr mr20" onClick={this.saveExercise}>保存</a>
-              {
-                exercise && time != null ?
-                <span className="color-grey-9 font-12 mr20 fr lineh-40">保存或者离开页面后，系统将持续计时，到达时长系统将自动交卷</span>
-                :""
-              }
-            </p>:""
-          }
-        </div>
         </Spin>
       </div>
     )
   }
 }
-export default ExerciseReviewAndAnswer
\ No newline at end of file
+export default ExerciseReviewAndAnswer
diff --git a/src/modules/courses/exercise/Exercisesetting.js b/src/modules/courses/exercise/Exercisesetting.js
index 0e613a55..0bd596c3 100644
--- a/src/modules/courses/exercise/Exercisesetting.js
+++ b/src/modules/courses/exercise/Exercisesetting.js
@@ -75,10 +75,11 @@ class Exercisesetting extends Component{
             limit:10,
             searchtext:"",
             order: "end_at",
+					  assistant_auth:false
         }
-        console.log("Exercisesetting");
-        console.log("69");
-        console.log(props);
+        // console.log("Exercisesetting");
+        // console.log("69");
+        // console.log(props);
     }
     _getRequestParams() {
         const { order, exercise_group_id,searchtext, page ,limit} = this.state
@@ -92,6 +93,12 @@ class Exercisesetting extends Component{
     }
     //加载
     componentDidMount=()=>{
+    	this.setState({
+				assistant_auth:this.props.assistant_auth,
+			})
+
+
+
         this.getSettingInfo();
 
         // window.addEventListener('click', this.handleClick);
@@ -108,11 +115,34 @@ class Exercisesetting extends Component{
 			if(this.props.isAdmin() === false){
 				this.cancelEdit()
 			}
+
+			try {
+				//是否为助教
+				if(this.props.isAssistant()===true){
+					//如果是助教是否有权限
+					if(this.props.assistant_auth===true){
+						this.setState({
+							flagPageEdit:true
+						})
+					}else{
+						this.setState({
+							flagPageEdit:false
+						})
+					}
+				}
+			}catch (e) {
+
+			}
     }
 	componentDidUpdate = (prevProps) => {
 		if(prevProps.Commonheadofthetestpaper!= this.props.Commonheadofthetestpaper){
 			  this.editSetting()
 		}
+		if(prevProps.assistant_auth!= this.props.assistant_auth){
+			this.setState({
+				assistant_auth:this.props.assistant_auth,
+			})
+		}
 	}
 
     _getRequestParams() {
@@ -348,10 +378,16 @@ class Exercisesetting extends Component{
 
             this.commitSetting((result)=>{
             	console.log(result)
-                if(result.status==200){
+                if(result.status===200){
                     this.props.showNotification(`${result.data.message}`);
                     this.getSettingInfo(1);
                     this.cancelEdit();
+									try {
+										this.props.assistantauthoritys(this.state.assistant_auth);
+
+									}catch (e) {
+
+									}
                 }
             })
         }
@@ -371,6 +407,12 @@ class Exercisesetting extends Component{
 					this.props.showNotification(`${result.data.message}`);
 					this.cancelEdit();
 					this.getSettingInfo(1);
+					try {
+						this.props.assistantauthoritys(this.state.assistant_auth);
+
+					}catch (e) {
+
+					}
 				}
 			});
 
@@ -386,11 +428,12 @@ class Exercisesetting extends Component{
                 publish_time:this.state.publish_time,
                 end_time:this.state.end_time,
                 show_statistic:this.state.show_statistic,
-                choice_random:this.state.choice_random,
+						  	choice_random:this.state.choice_random,
                 score_open:this.state.score_open,
                 answer_open:this.state.answer_open,
                 question_random:this.state.question_random,
                 time:this.state.time,
+							  assistant_auth:this.state.assistant_auth,
             }
         }else{
             let list=this.state.rules;
@@ -403,7 +446,6 @@ class Exercisesetting extends Component{
                 }
                 lists.push(newlist)
             })
-
             params={
                 unified_setting:this.state.unified_setting,
                 show_statistic:this.state.show_statistic,
@@ -413,6 +455,7 @@ class Exercisesetting extends Component{
                 answer_open:this.state.answer_open,
                 publish_time_groups:lists,
                 time:this.state.time,
+						  	assistant_auth:this.state.assistant_auth,
             }
         }
         axios.post((url),params).then((result)=>{
@@ -491,6 +534,12 @@ class Exercisesetting extends Component{
         })
     }
 
+	assistantauthority=(e)=>{
+    	this.setState({
+				assistant_auth:e.target.checked
+			})
+	}
+
     onChangeTimepublish=(date, dateString)=>{
         if(date===null){
             this.setState({
@@ -555,9 +604,33 @@ class Exercisesetting extends Component{
                 modalSave:this.cancelBox
             })
         }else{
-            this.setState({
-                flagPageEdit:true
-            })
+         if(this.props.isAdmin()===true){
+					 try {
+						 //是否为助教
+						 if(this.props.isAssistant()===true){
+							 //如果是助教是否有权限
+							 if(this.props.assistant_auth===true){
+								 this.setState({
+									 flagPageEdit:true
+								 })
+							 }else{
+								 this.setState({
+									 flagPageEdit:false
+								 })
+							 }
+						 }else{
+						 	//是老师
+							 this.setState({
+								 flagPageEdit:true
+							 })
+						 }
+					 }catch (e) {
+						 this.setState({
+							 flagPageEdit:true
+						 })
+					 }
+				 }
+
         }
     }
     //取消编辑
@@ -608,7 +681,9 @@ class Exercisesetting extends Component{
 			// console.log("asdasdasda");
 			//  console.log(this.props);
 			//  console.log(this.props.Commonheadofthetestpaper);
-        return(
+
+
+			return(
             <div>
                 <Modals
                     modalsType={modalsType}
@@ -623,13 +698,22 @@ class Exercisesetting extends Component{
                                 <span className="font-16 fl">发布设置<span className="color-grey-c font-14"></span></span>
                                 {
                                     !flagPageEdit&&this.props.isAdmin()===true ?
-                                        <a className="fr mr6 white-btn edu-blueline-btn lineh-24" onClick={this.editSetting}>
-																					编辑设置
-                                            {/*<Tooltip title="编辑">*/}
-                                                {/*<i className="iconfont icon-bianjidaibeijing font-20 color-green"></i>*/}
-                                            {/*</Tooltip>*/}
-                                        </a>
-                                        :""
+																			(
+																				this.props.isAssistant()===true?
+																					(
+																					this.props.assistant_auth===true?
+																						<a className="fr mr6 white-btn edu-blueline-btn lineh-24" onClick={this.editSetting}>
+																							编辑设置
+																						</a>
+																						:
+																						""
+																			     )
+																			:
+																			<a className="fr mr6 white-btn edu-blueline-btn lineh-24" onClick={this.editSetting}>
+																				编辑设置
+																			</a>
+																			)
+                                      :""
                                 }
 
                             </p>
@@ -769,7 +853,7 @@ class Exercisesetting extends Component{
 
 
                         <div className="padding20-30">
-                            <p className="mb30 clearfix font-16">公开设置</p>
+                            <p className="mb30 clearfix font-16">属性设置</p>
                             <div className="pl33">
                                 <p className="mb20">
 
@@ -790,7 +874,7 @@ class Exercisesetting extends Component{
                                     </Form.Item>
                                     <span className="color-grey-c">(选中，则在试卷截止时间之后，已提交答题的学生可以查看试卷题目的答案，否则不能查看)</span>
                                 </p>
-                                <p className="clearfix mb5">
+                                <p className="clearfix mb20">
                                     <Form.Item className="fl pollForm">
                                         {getFieldDecorator('show_statistic')
                                         (
@@ -799,6 +883,15 @@ class Exercisesetting extends Component{
                                     </Form.Item>
                                     <span className="color-grey-c">(选中，则在试卷截止时间之后，已提交答题的学生可以查看答题统计，否则不能查看)</span>
                                 </p>
+															<p className="clearfix mb5">
+																<Form.Item className="fl pollForm">
+																	{getFieldDecorator('assistantauthority')
+																	(
+																		<Checkbox disabled={this.props.isAdmin()===true?!flagPageEdit:true} className="mr15 font-16 color-grey-6" checked={this.state.assistant_auth} onChange={this.assistantauthority}>助教权限</Checkbox>
+																	)}
+																</Form.Item>
+																<span className="color-grey-c">(选中，则允许助教查看答案)</span>
+															</p>
                             </div>
                         </div>
 
@@ -808,7 +901,10 @@ class Exercisesetting extends Component{
                             <div className="clearfix mt30 ml40" style={{paddingBottom:'40px'}}>
                                 <Button type="primary" htmlType="submit"  className="defalutSubmitbtn fl mr20">提交</Button>
                                 <a className="defalutCancelbtn fl" onClick={this.cancelEdit}>取消</ a>
-                            </div>:""
+                            </div>
+
+
+													:""
                     }
 
                 </Form>
@@ -820,70 +916,3 @@ const WrappedExercisesetting = Form.create({ name: 'exercisesetting' })(Exercise
 export default WrappedExercisesetting;
 
 
-// //提交form表单
-// handleSubmit = (e) => {
-//
-//     let{unified_setting,answer_open}=this.state;
-//     e.preventDefault();
-//     let exercise_id=this.props.match.params.Id;
-//
-//     this.props.form.validateFieldsAndScroll((err, values) => {
-//         debugger
-//         if(!err){
-//             // 第一次进行问卷设置或者勾选了统一设置
-//             if(unified_setting==true){
-//                 if(this.state.p_flag == false && this.state.e_flag == true){
-//                     // 选择了发布时间但截至时间没有选择
-//                     this.setState({
-//                         modalsType:true,
-//                         modalsTopval:"请选择截止时间",
-//                         loadtype:true,
-//                         modalSave:this.cancelBox
-//                     })
-//                     return;
-//                 }else if(this.state.p_flag == true && this.state.e_flag == true){
-//                     // 如果两个时间都没有填写则弹出立即发布弹框
-//                     let{publish_time,end_time}=this.state
-//                     if(publish_time==undefined && end_time ==undefined){
-//
-//                     }else{
-//                         // 否则就是选择的时间错误
-//                         this.setState({
-//                             modalsType:true,
-//                             modalsTopval:"请选择正确的发布时间和截止时间",
-//                             loadtype:true,
-//                             modalSave:this.cancelBox
-//                         })
-//                     }
-//                     return;
-//                 }
-//             }
-//
-//             let url=`/exercises/${exercise_id}/commit_setting.json`;
-//             let params=[];
-//             if(values.unitSet){
-//                 params={
-//                     unified_setting:values.unitSet,
-//                     publish_time:this.state.publish_time,
-//                     end_time:this.state.end_time,
-//                     show_result:values.public,
-//                     un_anonymous:values.real
-//                 }
-//             }else{
-//                 params={
-//                     unified_setting:values.unitSet,
-//                     show_result:values.public,
-//                     un_anonymous:values.real,
-//                     publish_time_groups:this.state.rules
-//                 }
-//             }
-//             axios.post((url),{params}).then((result)=>{
-//                 if(result.status==200){
-//                     this.props.showNotification(`${result.data.message}`);
-//                 }
-//             }).catch((error)=>{
-//                 console.log(error);
-//             })
-//         }
-//     })
-// }
diff --git a/src/modules/courses/exercise/Exercisestatisticalresult.js b/src/modules/courses/exercise/Exercisestatisticalresult.js
index 000859e3..de922edf 100644
--- a/src/modules/courses/exercise/Exercisestatisticalresult.js
+++ b/src/modules/courses/exercise/Exercisestatisticalresult.js
@@ -1,7 +1,6 @@
 import React, {Component} from "react";
-import {WordsBtn,markdownToHTML, MarkdownToHtml} from 'educoder';
-import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider,InputNumber, Tag,DatePicker,Radio,Tooltip,Pagination} from "antd";
-import {Link,Switch,Route,Redirect} from 'react-router-dom';
+import {MarkdownToHtml,mdJSONParse} from 'educoder';
+import {Checkbox,Pagination} from "antd";
 import axios from 'axios';
 import Exercisetablesmubu from './Exercisetablesmubu';
 import Exercisestatisticalresulttabel from './Exercisestatisticalresulttabel';
@@ -114,7 +113,6 @@ class Exercisestatisticalresult extends Component {
 			page:pageNumber
 		})
 
-		// debugger
 		$('html').animate({
 			scrollTop: 10
 		}, 1000);
@@ -295,11 +293,11 @@ class Exercisestatisticalresult extends Component {
 									<div className="clearfix edu-back-white poll_list"  style={{padding: '20px'}}>
 										<div className="font-16 shixunreporttitle fl" style={{width:"1050px"}}>
 											<span
-												className="C3333">{item.ques_position + "."}{item.ques_type === 0 ? "单选" : item.ques_type === 1 ? "多选" : item.ques_type === 2 ? "判断" : item.ques_type === 3 ? "填空" : item.ques_type === 4 ? "主观" : item.ques_type === 5 ? "实训" : ""}题</span>
+												className="C3333">{item.ques_position + "."}{item.ques_type === 0 ? "单选" : item.ques_type === 1 ? "多选" : item.ques_type === 2 ? "判断" : item.ques_type === 3 ? "填空" : item.ques_type === 4 ? "主观" : item.ques_type === 5 ? "实训" :item.ques_type === 6 ? "编程" : ""}题</span>
 										<div>
 											{/*Q{item.ques_position}：*/}
 											{/* <div className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML1(item.ques_title).replace(/▁/g,"▁▁▁")}}></div> */}
-											<MarkdownToHtml content={item.ques_title} selector={'ques_title_' + key}
+									    <MarkdownToHtml content={mdJSONParse(item.ques_title)} selector={'ques_title_' + key}
 												className=""
 											></MarkdownToHtml>
 											{/*<span className="markdown-body" dangerouslySetInnerHTML={createMarkup(item.ques_title)}></span>*/}
@@ -319,8 +317,9 @@ class Exercisestatisticalresult extends Component {
 													<div className="fr shixunreporttitles">正确率<span style={{color:'#FF6800'}}> {ite.challenge_percent}%</span></div>
 												</div>
 												<Exercisetablesmubu
+													{...this.state}
 													tableNum={`${key}${k}`}
-													data={ite.challenge_details}
+													datass={ite.challenge_details}
 													type={item.ques_type}
 													effictive_counts={item.effictive_counts}
 													choicetype={choicetype}
@@ -329,8 +328,9 @@ class Exercisestatisticalresult extends Component {
 										)
 									}):
 							    <Exercisetablesmubu
+										{...this.state}
 										tableNum={key}
-								    data={item.ques_details}
+								    datass={item.ques_details}
 								    type={item.ques_type}
 								    effictive_counts={item.effictive_counts}
 										choicetype={choicetype}
diff --git a/src/modules/courses/exercise/Exercisestatisticalresulttabel.js b/src/modules/courses/exercise/Exercisestatisticalresulttabel.js
index 6ed6d2a8..c52c7c2a 100644
--- a/src/modules/courses/exercise/Exercisestatisticalresulttabel.js
+++ b/src/modules/courses/exercise/Exercisestatisticalresulttabel.js
@@ -1,8 +1,5 @@
 import React, {Component} from "react";
-import {WordsBtn} from 'educoder';
 import {Table} from "antd";
-import {Link,Switch,Route,Redirect} from 'react-router-dom';
-
 class OfficialAcademicTranscript extends Component {
 
 	constructor(props) {
diff --git a/src/modules/courses/exercise/Exercisetablesmubu.js b/src/modules/courses/exercise/Exercisetablesmubu.js
index 196625d4..ff334cac 100644
--- a/src/modules/courses/exercise/Exercisetablesmubu.js
+++ b/src/modules/courses/exercise/Exercisetablesmubu.js
@@ -1,11 +1,11 @@
 import React, {Component} from "react";
-import {WordsBtn, MarkdownToHtml} from 'educoder';
+import {MarkdownToHtml} from 'educoder';
 import {Table,Progress} from "antd";
-import {Link,Switch,Route,Redirect} from 'react-router-dom';
+
 
 const tagArray = [
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 
-    'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+    'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
     'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
 
@@ -15,7 +15,6 @@ class Exercisetablesmubus extends Component {
 		super(props);
 		this.state = {
 			loadingstate:true,
-			datas:undefined
 		}
 	}
 
@@ -23,13 +22,14 @@ class Exercisetablesmubus extends Component {
 
 	}
 
+
 	render() {
 
-		let {data,type,effictive_counts,choicetype, tableNum}=this.props;
-		let datas=[];
+		let {datass,type,effictive_counts,choicetype, tableNum}=this.props;
+		let list=[];
 
-		data&&data.forEach((item,key)=>{
-			datas.push({
+		datass&&datass.forEach((item,key)=>{
+			list.push({
 				commit_percent:{
 						num:item.choice_position,
 						value:type===4||type===5?choicetype[item.choice_text-1]:item.choice_text,
@@ -40,33 +40,33 @@ class Exercisetablesmubus extends Component {
 				max_score:item.choice_percent,
 			})
 		})
-		datas.push({
+		list.push({
 			commit_percent: {num:null,value:"有效填写量"},
 			min_score:{value:effictive_counts},
 		})
 
 		let columns=[]
-     if(datas.length!=0){
+     if(list.length!=0){
 		  columns=[{
 			 title: '选项',
 			 dataIndex: 'commit_percent',
 			 key: 'commit_percent',
 			 render: (text, record, index) => {
 				const _content = <span style={{color:text.type===true? "#29BD8B":'#333333', width: '100%'}}>
-					{text.value!="有效填写量"&&text.value!="wrong" && 
-						<MarkdownToHtml content={text.value} selector={(tableNum+1) + '' + (index+1)}></MarkdownToHtml>
+					{text.value>0&&text.value!="有效填写量"&&text.value!="wrong"||!text.value&&text.value!="有效填写量"&&text.value!="wrong"?
+						text.value===1?"满分":text.value===2?"部分得分":text.value===3?"零分":text.value:text.value!="有效填写量"&&text.value!="wrong"&&<MarkdownToHtml content={text.value} selector={(tableNum+1) + '' + (index+1)}></MarkdownToHtml>
 						}
 				  	{text.value==="wrong" && "填写了错误答案" }
-					{text.value==="有效填写量" && "有效填写量" }
+					  {text.value==="有效填写量" && "有效填写量" }
 					</span>
 				return (
-				
+
 				(text._type === 0 || text._type === 1) ? <div style={{ display: 'flex'}}>
 					{<span style={{ 'margin-right': '4px', 'margin-top': '-2px'}}>{tagArray[index]}.</span>}
 				 	{_content}
 				</div> : <React.Fragment>{_content}</React.Fragment>
 				)
-        
+
 			 },
 		 }, {
 			 title: '小计',
@@ -122,13 +122,12 @@ class Exercisetablesmubus extends Component {
 					.Exermubu .ant-table-tbody> tr > td{
          			border-bottom: transparent;
 					}
-
 			`}
 				</style>
-				
-				{datas===undefined?"":<Table
+
+				{list===undefined?"":<Table
 					className={"Exermubu"}
-					dataSource={datas}
+					dataSource={list}
 					columns={columns}
 					pagination={false}
 					// loading={loadingstate}
@@ -140,4 +139,4 @@ class Exercisetablesmubus extends Component {
 	}
 }
 
-export default Exercisetablesmubus;
\ No newline at end of file
+export default Exercisetablesmubus;
diff --git a/src/modules/courses/exercise/Studentshavecompletedthelist.js b/src/modules/courses/exercise/Studentshavecompletedthelist.js
index e76019de..095560f1 100644
--- a/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -23,13 +23,18 @@ import './yslexercisetable.css';
 import {getImageUrl, toPath, sortDirections} from 'educoder';
 import NoneData from '../../../modules/courses/coursesPublic/NoneData';
 import ModulationModal_exercise from "../coursesPublic/ModulationModal_exercise";
+
 const Search = Input.Search;
 const RadioGroup = Radio.Group;
 const CheckboxGroup = Checkbox.Group;
 const {Option} = Select;
 //学生老师页面
+let columnsystwo = [];
+let myssubjective = 0; //是否显示主观题
+let mysubjective_score = 0;//主观题得分
+let myobjective_score = 0;//客观题得分
+
 class Studentshavecompletedthelist extends Component {
-	// http://localhost:3007/courses/1309/exercises/722/exercises/student_exercise_list?debug=s
 	constructor(props) {
 		super(props);
 		this.state = {
@@ -46,7 +51,7 @@ class Studentshavecompletedthelist extends Component {
 			teacherlist: undefined,
 			searchtext: "",
 			Teacherliststudentlist: undefined,
-			mylistansum:0,
+			mylistansum: 0,
 			review: null,
 			course_groupysls: undefined,
 			nocomment: false,
@@ -63,7 +68,7 @@ class Studentshavecompletedthelist extends Component {
 			course_groupsdatas: false,
 			noclassroom: undefined,
 			current_status: props.current_status,
-			course_groupyslstwodata: [{id: 0, tu: "未提交"}, {id: 1, tu: "已提交"}],
+			course_groupyslstwodata: [{id: 0, tu: "未开始"}, {id: 1, tu: "考试中"},{id: 2, tu: "已交卷"}],
 			columns: [
 				{
 					title: '序号',
@@ -71,13 +76,13 @@ class Studentshavecompletedthelist extends Component {
 					key: 'number',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'100px',
+					width: '100px',
 					render: (text, record) => (
 						<span>
 							{record.number === "--" ?
-								<span style={{color: '#999999', textAlign: "center",width:'100px'}}>{record.number}</span>
+								<span style={{color: '#999999', textAlign: "center", width: '100px'}}>{record.number}</span>
 								:
-								<span style={{color: '#07111B', textAlign: "center",width:'100px'}}>{record.number}</span>
+								<span style={{color: '#07111B', textAlign: "center", width: '100px'}}>{record.number}</span>
 
 							}
         </span>
@@ -89,15 +94,16 @@ class Studentshavecompletedthelist extends Component {
 					key: 'name',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth110",
-					width:'100px',
+					width: '100px',
 					render: (text, record) => (
 						<span className="maxnamewidth110 font-14" style={{
-							width:'100px'
+							width: '100px'
 						}}>
 								{record.name === "--" ?
-									<span style={{color: '#999999', textAlign: "center",width:'100px'}}>{record.name}</span>
+									<span style={{color: '#999999', textAlign: "center", width: '100px'}}>{record.name}</span>
 									:
-									<a className="maxnamewidth110" style={{color: '#07111B', textAlign: "center",width:'100px'}} title={record.name}>{record.name}</a>
+									<a className="maxnamewidth110" style={{color: '#07111B', textAlign: "center", width: '100px'}}
+										 title={record.name}>{record.name}</a>
 
 								}
         </span>
@@ -109,30 +115,30 @@ class Studentshavecompletedthelist extends Component {
 					key: 'stduynumber',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth175",
-					width:'175px',
+					width: '175px',
 					sorter: true,
 					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span className="maxnamewidth175" style={{
-							width:'175px',
+							width: '175px',
 						}}>
 							{record.stduynumber === null ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'175px',
+									width: '175px',
 								}}>--</span> :
 								record.stduynumber ===
 								"" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
-										width:'175px',
+										width: '175px',
 									}}>--</span> :
 									<a className="maxnamewidth175" style={{
 										color: '#9A9A9A',
 										textAlign: "center",
-										width:'175px',
+										width: '175px',
 									}} title={record.stduynumber}>{record.stduynumber}</a>
 							}
 
@@ -145,26 +151,26 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth255",
-					width:'255px',
+					width: '255px',
 					render: (text, record) => (
-						<span className="maxnamewidth255" style={{width:'255px'}}>
+						<span className="maxnamewidth255" style={{width: '255px'}}>
 								{record.classroom === null ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
-										width:'255px',
+										width: '255px',
 									}}>--</span> :
 									record.classroom ===
 									"" ?
 										<span style={{
 											color: '#999999',
 											textAlign: "center",
-											width:'255px',
+											width: '255px',
 										}}>--</span> :
 										<a className="maxnamewidth255" style={{
 											color: '#07111B',
 											textAlign: "center",
-											width:'255px',
+											width: '255px',
 										}} title={record.classroom}>{record.classroom}</a>
 								}
 
@@ -177,19 +183,19 @@ class Studentshavecompletedthelist extends Component {
 					key: 'submitstate',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
 						<span style={{
-							width:'98px',
+							width: '98px',
 						}}>
-             <span style={record.submitstate === "未提交" ? {
-							 color: '#999999',
-							 textAlign: "center",
-							 width:'98px',
-						 } : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center",	width:'98px'} : {
+             <span style={record.submitstate === "未开始" ? {
 							 color: '#29BD8B',
 							 textAlign: "center",
-							 width:'98px',
+							 width: '98px',
+						 } : record.submitstate === "已交卷" ? {color: '#29BD8B', textAlign: "center", width: '98px'} : {
+							 color: '#29BD8B',
+							 textAlign: "center",
+							 width: '98px',
 						 }}>{record.submitstate}</span>
         </span>
 					)
@@ -201,18 +207,18 @@ class Studentshavecompletedthelist extends Component {
 					key: 'updatetime',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'175px',
+					width: '175px',
 					sorter: true,
 					defaultSortOrder: 'descend',
 					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span style={{
-							width:'175px',
+							width: '175px',
 						}}>
 							{record.updatetime === "--" ?
-								<span style={{color: '#999999', textAlign: "center",width:'175px'}}>{record.updatetime}</span>
+								<span style={{color: '#999999', textAlign: "center", width: '175px'}}>{record.updatetime}</span>
 								:
-								<span style={{color: '#9A9A9A', textAlign: "center",width:'175px'}}>{record.updatetime}</span>
+								<span style={{color: '#9A9A9A', textAlign: "center", width: '175px'}}>{record.updatetime}</span>
 							}
         </span>
 					),
@@ -223,14 +229,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'completion',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
 						<span>   {
 							record.completion === "--" ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								}}>
 									{record.completion}
 								</span>
@@ -238,20 +244,20 @@ class Studentshavecompletedthelist extends Component {
 								<span style={parseInt(record.completion) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center",
-									width:'98px',
-								} : parseInt(record.completion) <= 90 ? {
+									width: '98px',
+								} : parseInt(record.completion) <= 90 &&parseInt(record.completion)>60? {
 									color: '#FF6800',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								} : parseInt(record.completion) <= 60 ? {
 										color: '#747A7F',
 										textAlign: "center",
-										width:'98px',
+										width: '98px',
 									} :
 									{
 										color: '#747A7F',
 										textAlign: "center",
-										width:'98px',
+										width: '98px',
 									}}>{record.completion}</span>
 						}
 
@@ -264,14 +270,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'levelscore',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'99px',
+					width: '99px',
 					render: (text, record) => (
 						<span>
 							{record.levelscore === "--" ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'99px',
+									width: '99px',
 								}}>
 									{record.levelscore}
 								</span>
@@ -279,33 +285,49 @@ class Studentshavecompletedthelist extends Component {
 								<span style={parseInt(record.levelscore) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center",
-									width:'99px',
-								} : parseInt(record.levelscore) <= 90 ? {
+									width: '99px',
+								} : parseInt(record.levelscore) <= 90 &&parseInt(record.levelscore) >60? {
 									color: '#FF6800',
 									textAlign: "center",
-									width:'99px',
+									width: '99px',
 								} : parseInt(record.levelscore) <= 60 ? {
 									color: '#747A7F',
 									textAlign: "center",
-									width:'99px',
-								} : {color: '#747A7F', textAlign: "center",width:'99px'}}>{record.levelscore}</span>
+									width: '99px',
+								} : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore}
+									{
+										//主观题老师没有评分是
+										parseInt(record.levelscore) === 0 && myssubjective === 1 &&record.review_status===false?
+											<span style={{
+												color: '#DD1717',
+												textAlign: "center",
+												marginLeft: "5px",
+											}}>
+																					(待批阅)
+																					</span>
+												:""
+									}
+								</span>
 							}
         </span>
 					)
 				},
 				{
-					title: '最终成绩',
+					title: <span>最终成绩<Tooltip placement="top" title={<pre>
+						 鼠标停留具体分值上可查<br/>
+             看得分明细<br/>
+					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
 					className: "edu-txt-center font-14",
 					sorter: true,
 					sortDirections: sortDirections,
-					width:'199px',
+					width: '199px',
 					render: (text, record) => (
-						<span style={{width:"199px"}}>
+						<span style={{width: "199px"}}>
 							{record.efficiencyscore === "--" ?
-								<Tooltip  placement="bottom" title={<div>
+								<Tooltip placement="bottom" title={<div>
 									<div>未评分</div>
 								</div>}>
 									<a style={{
@@ -316,15 +338,15 @@ class Studentshavecompletedthelist extends Component {
 									</a>
 								</Tooltip>
 								:
-								record.commit_method===5?
-									<Tooltip  placement="bottom" title={
+								record.commit_method === 5 ?
+									<Tooltip placement="bottom" title={
 										<div>
 											<div>最终调整成绩：{record.efficiencyscore}分</div>
 										</div>}>
 									<span style={parseInt(record.efficiencyscore) > 90 ? {
 										color: '#DD1717',
 										textAlign: "center"
-									} : parseInt(record.efficiencyscore) <= 90 ? {
+									} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 										color: '#FF6800',
 										textAlign: "center"
 									} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -336,10 +358,34 @@ class Studentshavecompletedthelist extends Component {
 									}}>{record.efficiencyscore}</span>
 									</Tooltip>
 									:
+									<Tooltip placement="right" title={<div>
+
+										<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
+											<span>客观题得分：0分</span> :
+											<span>客观题得分：{record.objective_score}分</span>}
+										</div>
+
+										<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
+											<span>主观题得分：0分</span> :
+											<span>主观题得分：{record.subjective_score}分</span>}
+										</div>
+										{
+											(parseInt(record.efficiencyscore) === 0||record.efficiencyscore === "--") && myssubjective === 0 && mysubjective_score>0 &&record.review_status===false?
+												<div>
+													<span>待批阅</span>
+												</div>
+												:
+												<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
+													<span>最终成绩：{record.efficiencyscore}分</span>}
+												</div>
+										}
+									</div>
+
+									}>
 								<span style={parseInt(record.efficiencyscore) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center"
-								} : parseInt(record.efficiencyscore) <= 90 ? {
+								} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 									color: '#FF6800',
 									textAlign: "center"
 								} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -349,6 +395,18 @@ class Studentshavecompletedthelist extends Component {
 									color: '#747A7F',
 									textAlign: "center"
 								}}>{record.efficiencyscore}</span>
+										{//只有一个主观题的时候
+											parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&  mysubjective_score>0 &&record.review_status===false?
+													<span style={{
+													color: '#DD1717',
+													textAlign: "center",
+													marginLeft: "5px",
+												}}>
+																					(待批阅)
+																				</span> :
+													""
+										}
+									</Tooltip>
 							}
         </span>
 					)
@@ -359,9 +417,9 @@ class Studentshavecompletedthelist extends Component {
 					key: 'finalscore',
 					align: 'center',
 					className: "edu-txt-center  font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
-						<span style={{width:'98px'}}>
+						<span style={{width: '98px'}}>
 						<span style={{textAlign: "center", color: '#999999'}}>--</span>
             </span>
 					)
@@ -374,11 +432,11 @@ class Studentshavecompletedthelist extends Component {
 					key: 'number',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'100px',
+					width: '100px',
 					render: (text, record) => (
 						<span>
 							{
-								<span style={{color: '#999999', textAlign: "center",width:'100px'}}>我</span>
+								<span style={{color: '#999999', textAlign: "center", width: '100px'}}>我</span>
 							}
         </span>
 					)
@@ -389,14 +447,16 @@ class Studentshavecompletedthelist extends Component {
 					key: 'name',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14 maxnamewidth110",
-					width:'100px',
+					width: '100px',
 					render: (text, record) => (
 						<span className="maxnamewidth110 font-14">
 							{
 								record.name === "--" ?
-									<span className="maxnamewidth110" style={{color: '#999999', textAlign: "center",width:'100px'}}>{record.name}</span>
+									<span className="maxnamewidth110"
+												style={{color: '#999999', textAlign: "center", width: '100px'}}>{record.name}</span>
 									:
-									<span className="maxnamewidth110" style={{color: '#07111B', textAlign: "center",width:'100px'}}>{record.name}</span>
+									<span className="maxnamewidth110"
+												style={{color: '#07111B', textAlign: "center", width: '100px'}}>{record.name}</span>
 
 							}
         </span>
@@ -408,29 +468,29 @@ class Studentshavecompletedthelist extends Component {
 					key: 'stduynumber',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14 maxnamewidth175",
-					width:'175px',
+					width: '175px',
 					render: (text, record) => (
 						<span className="maxnamewidth175" style={{
-							width:'175px',
+							width: '175px',
 						}}>
 							{record.stduynumber === null ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'175px',
+									width: '175px',
 								}}>--</span>
 								:
 								record.stduynumber === "" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
-										width:'175px',
+										width: '175px',
 									}}>--</span>
 									:
 									<a className="maxnamewidth175 font-14" style={{
 										color: '#9A9A9A',
 										textAlign: "center",
-										width:'175px',
+										width: '175px',
 									}} title={record.stduynumber}>{record.stduynumber}</a>
 							}
 
@@ -443,26 +503,26 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14 maxnamewidth255",
-					width:'255px',
+					width: '255px',
 					render: (text, record) => (
 						<span className="font-14 maxnamewidth255" style={{
-							width:'255px',
+							width: '255px',
 						}}>
 							{record.classroom === null ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'255px',
-								}}>--</span>: record.classroom === "" ?
+									width: '255px',
+								}}>--</span> : record.classroom === "" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
-										width:'255px',
-									}}>--</span>:
+										width: '255px',
+									}}>--</span> :
 									<a className="maxnamewidth255" style={{
 										color: '#07111B',
 										textAlign: "center",
-										width:'255px',
+										width: '255px',
 									}} title={record.classroom}>{record.classroom}</a>
 							}
 
@@ -475,17 +535,17 @@ class Studentshavecompletedthelist extends Component {
 					key: 'submitstate',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
-						<span style={{width:'98px',}}>
-             <span style={record.submitstate === "未提交" ? {
-							 color: '#999999',
-							 textAlign: "center",
-							 width:'98px',
-						 } : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center",		 width:'98px',} : {
+						<span style={{width: '98px',}}>
+             <span style={record.submitstate === "未开始" ? {
 							 color: '#29BD8B',
 							 textAlign: "center",
-							 width:'98px',
+							 width: '98px',
+						 } : record.submitstate === "已交卷" ? {color: '#29BD8B', textAlign: "center", width: '98px',} : {
+							 color: '#29BD8B',
+							 textAlign: "center",
+							 width: '98px',
 						 }}>{record.submitstate}</span>
         </span>
 					)
@@ -497,15 +557,15 @@ class Studentshavecompletedthelist extends Component {
 					key: 'updatetime',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'175px',
+					width: '175px',
 					render: (text, record) => (
 						<span style={{
-							width:'175px',
+							width: '175px',
 						}}>
-							{record.updatetime === "--"?
-								<span style={{color: '#999999', textAlign: "center",width:'175px'}}>--</span>
+							{record.updatetime === "--" ?
+								<span style={{color: '#999999', textAlign: "center", width: '175px'}}>--</span>
 								:
-								<span style={{color: '#9A9A9A', textAlign: "center",width:'175px'}}>{record.updatetime}</span>
+								<span style={{color: '#9A9A9A', textAlign: "center", width: '175px'}}>{record.updatetime}</span>
 							}
         </span>
 					),
@@ -516,14 +576,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'completion',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
 						<span>
 							{record.completion === "--" ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								}}>
 									--
 								</span>
@@ -532,19 +592,19 @@ class Studentshavecompletedthelist extends Component {
 								<span style={parseInt(record.completion) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center",
-									width:'98px',
-								} : parseInt(record.completion) <= 90 ? {
+									width: '98px',
+								} : parseInt(record.completion) <= 90 && parseInt(record.completion)>60? {
 									color: '#FF6800',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								} : parseInt(record.completion) <= 60 ? {
 									color: '#747A7F',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								} : {
 									color: '#747A7F',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								}}>{record.completion}</span>
 							}
         </span>
@@ -556,14 +616,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'levelscore',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'99px',
+					width: '99px',
 					render: (text, record) => (
 						<span>
-							{record.levelscore === "--"?
+							{record.levelscore === "--" ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'99px',
+									width: '99px',
 								}}>
 									--
 								</span>
@@ -571,82 +631,133 @@ class Studentshavecompletedthelist extends Component {
 								<span style={parseInt(record.levelscore) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center",
-									width:'99px'
-								} : parseInt(record.levelscore) <= 90 ? {
+									width: '99px'
+								} : parseInt(record.levelscore) <= 90 && parseInt(record.levelscore) >60? {
 									color: '#FF6800',
 									textAlign: "center",
-									width:'99px'
+									width: '99px'
 								} : parseInt(record.levelscore) <= 60 ? {
 									color: '#747A7F',
 									textAlign: "center",
-									width:'99px'
-								} : {color: '#747A7F', textAlign: "center",	width:'99px'}}>{record.levelscore}</span>
+									width: '99px'
+								} : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore}
+									{
+										//主观题老师没有评分是
+										parseInt(record.levelscore) === 0 && myssubjective === 1 &&record.review_status===false?
+											<span style={{
+												color: '#DD1717',
+												textAlign: "center",
+												marginLeft: "5px",
+											}}>
+																					(待批阅)
+																					</span> :""
+									}
+								</span>
 							}
         </span>
 					)
 				},
 				{
-					title: '最终成绩',
+					title: <span>最终成绩<Tooltip placement="top" title={<pre>
+						 鼠标停留具体分值上可查<br/>
+             看得分明细<br/>
+					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14 columnstwoachievement",
-					width:"199px",
+					width: "199px",
 					render: (text, record) => (
-						<span style={{width:"199px"}}>
+						<span style={{width: "199px"}}>
 							{
-								record.efficiencyscore === "--"?
-									<Tooltip  placement="bottom" title={<div>
+								record.efficiencyscore === "--" ?
+									<Tooltip placement="bottom" title={<div>
 										<div>未评分</div>
 									</div>}>
 										<a style={{
 											color: '#DD1717',
 											textAlign: "center",
-											width:"199px"
+											width: "199px"
 										}}>--</a>
 									</Tooltip>
 									:
-									record.commit_method===5?
-										<Tooltip  placement="bottom" title={
+									record.commit_method === 5 ?
+										<Tooltip placement="bottom" title={
 											<div>
 												<div>最终调整成绩：{record.efficiencyscore}分</div>
 											</div>}>
 										<span style={parseInt(record.efficiencyscore) > 90 ? {
 											color: '#DD1717',
 											textAlign: "center",
-											width:"199px"
-										} : parseInt(record.efficiencyscore) <= 90 ? {
+											width: "199px"
+										} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 											color: '#FF6800',
 											textAlign: "center",
-											width:"199px"
+											width: "199px"
 										} : parseInt(record.efficiencyscore) <= 60 ? {
 											color: '#747A7F',
 											textAlign: "center",
-											width:"199px"
+											width: "199px"
 										} : {
 											color: '#747A7F',
 											textAlign: "center",
-											width:"199px"
+											width: "199px"
 										}}>{record.efficiencyscore}</span>
 										</Tooltip>
 										:
+										<Tooltip placement="right" title={<div>
+
+											<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
+												<span>客观题得分：0分</span> :
+												<span>客观题得分：{record.objective_score}分</span>}
+											</div>
+
+											<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
+												<span>主观题得分：0分</span> :
+												<span>主观题得分：{record.subjective_score}分</span>}
+											</div>
+											{
+												(parseInt(record.efficiencyscore) === 0||record.efficiencyscore === "--") && myssubjective === 0&&  mysubjective_score>0 &&record.review_status===false?
+													<div>
+														<span>待批阅</span>
+													</div>
+													:
+													<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
+														<span>最终成绩：{record.efficiencyscore}分</span>}
+													</div>
+											}
+										</div>
+
+										}>
 									<span style={parseInt(record.efficiencyscore) > 90 ? {
 										color: '#DD1717',
 										textAlign: "center",
-										width:"199px"
-									} : parseInt(record.efficiencyscore) <= 90 ? {
+										width: "199px"
+									} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 										color: '#FF6800',
 										textAlign: "center",
-										width:"199px"
+										width: "199px"
 									} : parseInt(record.efficiencyscore) <= 60 ? {
 										color: '#747A7F',
 										textAlign: "center",
-										width:"199px"
+										width: "199px"
 									} : {
 										color: '#747A7F',
 										textAlign: "center",
-										width:"199px"
+										width: "199px"
 									}}>{record.efficiencyscore}</span>
+											{//只有一个主观题的时候
+												parseInt(record.efficiencyscore) === 0 && myssubjective === 0&&  mysubjective_score>0  &&record.review_status===false?
+														<span style={{
+														color: '#DD1717',
+														textAlign: "center",
+														marginLeft: "5px",
+													}}>
+																					(待批阅)
+																				</span> :
+														""
+											}
+										</Tooltip>
 							}
 
         </span>
@@ -658,21 +769,21 @@ class Studentshavecompletedthelist extends Component {
 					key: 'finalscore',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:"98px",
+					width: "98px",
 					render: (text, record) => (
-						<span style={{width:"98px"}}>
+						<span style={{width: "98px"}}>
 							{
-								record.submitstate === "未提交"||record.commit_method===5?
-									<span style={{textAlign: "center", color: '#999999',width:"98px"}}>-aa-</span>
-									:record.submitstate === "已提交"?
-									record.score_open===null||record.score_open===undefined?"":
-										record.score_open===true?
-											<a style={{textAlign: "center",width:"98px"}} className="color-blue"
+								record.submitstate === "未开始" || record.commit_method === 5 ?
+									<span style={{textAlign: "center", color: '#29BD8B', width: "98px"}}>-aa-</span>
+									: record.submitstate === "已交卷" ?
+									record.score_open === null || record.score_open === undefined ? "" :
+										record.score_open === true ?
+											<a style={{textAlign: "center", width: "98px"}} className="color-blue"
 												 target="_blank"
-												 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>查看</a>
-											:""
+												 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>查看</a>
+											: ""
 									:
-									<span style={{textAlign: "center", color: '#999999',width:"98px"}}>--</span>
+									<span style={{textAlign: "center", color: '#999999', width: "98px"}}>--</span>
 							}
                     </span>
 					)
@@ -688,7 +799,7 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{
-								record.number=== "--"?
+								record.number === "--" ?
 									<span style={{color: '#999999', textAlign: "center"}}>--</span>
 									:
 									<span style={{color: '#07111B', textAlign: "center"}}>{record.number}</span>
@@ -748,14 +859,14 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth260",
-					width:"260px",
+					width: "260px",
 					render: (text, record) => (
 						<span>
 							{record.classroom === null ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center"
-								}}  className="maxnamewidth260">--</span>  : record.classroom === "" ?
+								}} className="maxnamewidth260">--</span> : record.classroom === "" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center"
@@ -777,10 +888,10 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-             <span style={record.submitstate === "未提交" ? {
-							 color: '#999999',
+             <span style={record.submitstate === "未开始" ? {
+							 color: '#29BD8B',
 							 textAlign: "center"
-						 } : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center"} : {
+						 } : record.submitstate === "已交卷" ? {color: '#29BD8B', textAlign: "center"} : {
 							 color: '#29BD8B',
 							 textAlign: "center"
 						 }}>{record.submitstate}</span>
@@ -816,7 +927,7 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{
-								record.completion === "--"?
+								record.completion === "--" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
@@ -825,7 +936,7 @@ class Studentshavecompletedthelist extends Component {
 									<span style={parseInt(record.completion) > 90 ? {
 										color: '#DD1717',
 										textAlign: "center",
-									} : parseInt(record.completion) <= 90 ? {
+									} : parseInt(record.completion) <= 90&& parseInt(record.completion) >60 ? {
 										color: '#FF6800',
 										textAlign: "center",
 									} : parseInt(record.completion) <= 60 ? {
@@ -857,20 +968,36 @@ class Studentshavecompletedthelist extends Component {
 											<span style={parseInt(record.levelscore) > 90 ? {
 												color: '#DD1717',
 												textAlign: "center",
-											} : parseInt(record.levelscore) <= 90 ? {
+											} : parseInt(record.levelscore) <= 90 &&parseInt(record.levelscore)>60? {
 												color: '#FF6800',
 												textAlign: "center",
 											} : parseInt(record.levelscore) <= 60 ? {
 												color: '#747A7F',
 												textAlign: "center",
-											} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}</span>
+											} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}
+												{
+													//主观题老师没有评分是
+													parseInt(record.levelscore) === 0 && myssubjective === 1 &&record.review_status===false?
+														<span style={{
+															color: '#DD1717',
+															textAlign: "center",
+															marginLeft: "5px",
+														}}>
+																					(待批阅)
+																					</span> :
+														""
+												}
+											</span>
 									}
 
         </span>
 					)
 				},
 				{
-					title: '最终成绩',
+					title: <span>最终成绩<Tooltip placement="top" title={<pre>
+						 鼠标停留具体分值上可查<br/>
+             看得分明细<br/>
+					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
@@ -879,7 +1006,7 @@ class Studentshavecompletedthelist extends Component {
 						<span>
 							              {
 															record.efficiencyscore === "--" ?
-																<Tooltip  placement="bottom" title={<div>
+																<Tooltip placement="bottom" title={<div>
 																	<div>未评分</div>
 																</div>}>
 																	<a style={{
@@ -888,15 +1015,15 @@ class Studentshavecompletedthelist extends Component {
 																	}}>--</a>
 																</Tooltip>
 																:
-																record.commit_method===5?
-																	<Tooltip  placement="bottom" title={
+																record.commit_method === 5 ?
+																	<Tooltip placement="bottom" title={
 																		<div>
-																		<div>最终调整成绩：{record.efficiencyscore}分</div>
-																	  </div>}>
+																			<div>最终调整成绩：{record.efficiencyscore}分</div>
+																		</div>}>
 																	<span style={parseInt(record.efficiencyscore) > 90 ? {
 																		color: '#DD1717',
 																		textAlign: "center",
-																	} : parseInt(record.efficiencyscore) <= 90 ? {
+																	} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 																		color: '#FF6800',
 																		textAlign: "center",
 																	} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -908,10 +1035,34 @@ class Studentshavecompletedthelist extends Component {
 																	}}>{record.efficiencyscore}</span>
 																	</Tooltip>
 																	:
+																	<Tooltip placement="right" title={<div>
+
+																		<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
+																			<span>客观题得分：0分</span> :
+																			<span>客观题得分：{record.objective_score}分</span>}
+																		</div>
+
+																		<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
+																			<span>主观题得分：0分</span> :
+																			<span>主观题得分：{record.subjective_score}分</span>}
+																		</div>
+																		{
+																			(parseInt(record.efficiencyscore) === 0||record.efficiencyscore === "--") && myssubjective === 0 &&  mysubjective_score>0  &&record.review_status===false?
+																				<div>
+																					<span>待批阅</span>
+																				</div>
+																				:
+																				<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
+																					<span>最终成绩：{record.efficiencyscore}分</span>}
+																				</div>
+																		}
+																	</div>
+
+																	}>
 																<span style={parseInt(record.efficiencyscore) > 90 ? {
 																	color: '#DD1717',
 																	textAlign: "center",
-																} : parseInt(record.efficiencyscore) <= 90 ? {
+																} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 																	color: '#FF6800',
 																	textAlign: "center",
 																} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -921,6 +1072,18 @@ class Studentshavecompletedthelist extends Component {
 																	color: '#747A7F',
 																	textAlign: "center",
 																}}>{record.efficiencyscore}</span>
+																		{//只有一个主观题的时候
+																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0&& mysubjective_score>0 &&record.review_status===false?
+																					<span style={{
+																					color: '#DD1717',
+																					textAlign: "center",
+																					marginLeft: "5px",
+																				}}>
+																					(待批阅)
+																				</span> :
+																				""
+																		}
+																	</Tooltip>
 														}
 						</span>
 					)
@@ -933,14 +1096,14 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-							       {record.operating==="--"?
-											 <span style={{textAlign: "center",color: '#999999',}}>{record.operating}</span>
-											 :record.submitstate === "未提交"?
-												 <span style={{textAlign: "center",color: '#999999',}}>--</span>
+							       {record.operating === "--" ?
+											 <span style={{textAlign: "center", color: '#999999',}}>{record.operating}</span>
+											 : record.submitstate === "未开始" ?
+												 <span style={{textAlign: "center", color: '#29BD8B',}}>--</span>
 												 :
 												 <a style={{textAlign: "center"}} className="color-blue"
 														target="_blank"
-														href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.operating}</a>
+														href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.operating}</a>
 										 }
 
                     </span>
@@ -979,7 +1142,7 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-							{record.name==="--"?
+							{record.name === "--" ?
 								<span style={{color: '#999999', textAlign: "center"}}>{record.name}</span>
 								:
 								<span style={{color: '#07111B', textAlign: "center"}}>{record.name}</span>
@@ -1011,13 +1174,15 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth260",
-					width:'260px',
+					width: '260px',
 					render: (text, record) => (
 						<span>
-							{record.classroom==="--"?
-								<span style={{color: '#999999', textAlign: "center"}} className="maxnamewidth260">{record.classroom}</span>
+							{record.classroom === "--" ?
+								<span style={{color: '#999999', textAlign: "center"}}
+											className="maxnamewidth260">{record.classroom}</span>
 								:
-								<a style={{color: '#07111B', textAlign: "center"}} className="maxnamewidth260" title={record.classroom}>{record.classroom}</a>
+								<a style={{color: '#07111B', textAlign: "center"}} className="maxnamewidth260"
+									 title={record.classroom}>{record.classroom}</a>
 							}
         </span>
 					)
@@ -1030,10 +1195,10 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-								<span style={record.submitstate === "未提交" ? {
-									color: '#999999',
+								<span style={record.submitstate === "未开始" ? {
+									color: '#29BD8B',
 									textAlign: "center"
-								} : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center"} : {
+								} : record.submitstate === "已交卷" ? {color: '#29BD8B', textAlign: "center"} : {
 									color: '#29BD8B',
 									textAlign: "center"
 								}}>{record.submitstate}</span>
@@ -1053,7 +1218,7 @@ class Studentshavecompletedthelist extends Component {
 					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span>
-							{record.updatetime==="--"?
+							{record.updatetime === "--" ?
 								<span style={{color: '#999999', textAlign: "center"}}>--</span>
 								:
 								<span style={{color: '#9A9A9A', textAlign: "center"}}>{record.updatetime}</span>
@@ -1069,12 +1234,28 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-							{record.completion=== "--"?
-								<span style={{color: '#999999', textAlign: "center"}}>--</span>
+						{
+							record.completion === "--" ?
+								<span style={{
+									color: '#999999',
+									textAlign: "center",
+								}}>--</span>
 								:
-								<span style={{color: '#07111B', textAlign: "center"}}>{record.completion}</span>
-							}
-        </span>
+								<span style={parseInt(record.completion) > 90 ? {
+									color: '#DD1717',
+									textAlign: "center",
+								} : parseInt(record.completion) <= 90 && parseInt(record.completion) > 60 ? {
+									color: '#FF6800',
+									textAlign: "center",
+								} : parseInt(record.completion) <= 60 ? {
+									color: '#747A7F',
+									textAlign: "center",
+								} : {
+									color: '#747A7F',
+									textAlign: "center",
+								}}>{record.completion}</span>
+						}
+	           </span>
 					)
 				},
 				{
@@ -1085,16 +1266,46 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-							{record.levelscore==="--"?
-								<span style={{color: '#999999', textAlign: "center"}}>--</span>
-								:
-								<span style={{color: '#FF6800', textAlign: "center"}}>{record.levelscore}</span>
-							}
+									{
+										record.levelscore === "--" ?
+											<span style={{
+												color: '#999999',
+												textAlign: "center",
+											}}>--</span> :
+											<span style={parseInt(record.levelscore) > 90 ? {
+												color: '#DD1717',
+												textAlign: "center",
+											} : parseInt(record.levelscore) <= 90 && parseInt(record.levelscore) > 60 ? {
+												color: '#FF6800',
+												textAlign: "center",
+											} : parseInt(record.levelscore) <= 60 ? {
+												color: '#747A7F',
+												textAlign: "center",
+											} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}
+												{
+													//主观题老师没有评分是
+													parseInt(record.levelscore) === 0 && myssubjective === 1&&record.review_status===false?
+															<span style={{
+															color: '#DD1717',
+															textAlign: "center",
+															marginLeft: "5px",
+														}}>
+																					(待批阅)
+																					</span> :
+														""
+												}
+
+											</span>
+									}
+
         </span>
 					)
 				},
 				{
-					title: '最终成绩',
+					title: <span>最终成绩<Tooltip placement="top" title={<pre>
+						 鼠标停留具体分值上可查<br/>
+             看得分明细<br/>
+					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
@@ -1104,22 +1315,24 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 															{record.efficiencyscore === "--" ?
-																<Tooltip  placement="bottom" title={<div>
+																<Tooltip placement="bottom" title={<div>
 																	<div>未评分</div>
 																</div>}>
-																	<a style={{color: '#999999',
-																		textAlign: "center",}}>--</a>
+																	<a style={{
+																		color: '#999999',
+																		textAlign: "center",
+																	}}>--</a>
 																</Tooltip>
 																:
-																record.commit_method===5?
-																	<Tooltip  placement="bottom" title={
+																record.commit_method === 5 ?
+																	<Tooltip placement="bottom" title={
 																		<div>
 																			<div>最终调整成绩：{record.efficiencyscore}分</div>
 																		</div>}>
 																	<span style={parseInt(record.efficiencyscore) > 90 ? {
 																		color: '#DD1717',
 																		textAlign: "center",
-																	} : parseInt(record.efficiencyscore) <= 90 ? {
+																	} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 																		color: '#FF6800',
 																		textAlign: "center",
 																	} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -1131,10 +1344,39 @@ class Studentshavecompletedthelist extends Component {
 																	}}>{record.efficiencyscore}</span>
 																	</Tooltip>
 																	:
+																	<Tooltip placement="right" title={<div>
+
+																		<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
+																			<span>客观题得分：0分</span> :
+																			<span>客观题得分：{record.objective_score}分</span>}
+																		</div>
+
+																		<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
+																			<span>主观题得分：0分</span> :
+																			<span>主观题得分：{record.subjective_score}分</span>}
+																		</div>
+																		{
+																			(parseInt(record.efficiencyscore) === 0||record.efficiencyscore === "--") && myssubjective === 0&&  mysubjective_score>0 &&	record.review_status===false?
+																					<div>
+																					<span>待批阅</span>
+																				</div>
+																				:
+																				<div>
+																					{record.efficiencyscore === "--" ?
+																						<span>最终成绩：0分</span>
+																						:
+																						<span>最终成绩：{record.efficiencyscore}分</span>
+																					}
+																				</div>
+																		}
+
+																	</div>
+
+																	}>
 																<span style={parseInt(record.efficiencyscore) > 90 ? {
 																	color: '#DD1717',
 																	textAlign: "center",
-																} : parseInt(record.efficiencyscore) <= 90 ? {
+																} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 																	color: '#FF6800',
 																	textAlign: "center",
 																} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -1143,7 +1385,20 @@ class Studentshavecompletedthelist extends Component {
 																} : {
 																	color: '#747A7F',
 																	textAlign: "center",
-																}}>{record.efficiencyscore}</span>
+																}}>{parseInt(record.efficiencyscore) === 0 ? 0 : record.efficiencyscore}</span>
+																		{//只有一个主观题的时候
+																			(parseInt(record.efficiencyscore) === 0||record.efficiencyscore === "--") && myssubjective === 0&& mysubjective_score>0 && record.review_status===false?
+																				<span style={{
+																					color: '#DD1717',
+																					textAlign: "center",
+																					marginLeft: "5px",
+																				}}>
+																					(待批阅)
+																				</span> :
+																				""
+																		}
+
+																	</Tooltip>
 															}
         </span>
 					)
@@ -1157,239 +1412,61 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{
-								record.submitstate === "未提交"||record.commit_method===5?
-									<a style={{textAlign: "center"}} className="color-blue"
-										 target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
-									:record.submitstate === "已提交"?
-									<a style={{textAlign: "center"}} className="color-blue"
-										 target="_blank"
-										 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+								record.submitstate === "未开始" || record.commit_method === 5 ?
+									(//是否助教
+										this.props.isAssistant() && this.props.isAssistant() === true ?
+											(//助教是否有权限
+												this.props.assistant_auth && this.props.assistant_auth === true ?
+													<a style={{textAlign: "center"}} className="color-blue"
+														 target="_blank"
+														 onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"}</a>
+													:
+													(//是否截止
+														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 3 ?
+															<a style={{textAlign: "center"}} className="color-blue"
+																 target="_blank"
+																 onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"}</a>
+															:
+															<span style={{textAlign: "center", color: '#999999'}}>--</span>
+													)
+											)
+											:
+											<a style={{textAlign: "center"}} className="color-blue"
+												 target="_blank"
+												 onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"}</a>
+									)
+									: record.submitstate === "已交卷" ?
+									(//是否助教
+										this.props.isAssistant() && this.props.isAssistant() === true ?
+											(//助教是否有权限
+												this.props.assistant_auth && this.props.assistant_auth === true ?
+													<a style={{textAlign: "center"}} className="color-blue"
+														 target="_blank"
+														 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+													:
+													(//是否截止
+														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 3 ?
+															<a style={{textAlign: "center"}} className="color-blue"
+																 target="_blank"
+																 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+															:
+															<span style={{textAlign: "center", color: '#999999'}}>--</span>
+													)
+											)
+											:
+											<a style={{textAlign: "center"}} className="color-blue"
+												 target="_blank"
+												 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+									)
 									:
 									<span style={{textAlign: "center", color: '#999999'}}>--</span>
 							}
-                    </span>
+              </span>
 					)
 				},
 			],
-			columnsystwo: [
-				{
-					title: '序号',
-					dataIndex: 'number',
-					key: 'number',
-					align: 'center',
-					className: "edu-txt-center font-14",
-					render: (text, record) => (
-						<span>
-							 {record.number === "--" ?
-								 <span style={{color: '#999999', textAlign: "center"}}>--</span>
-								 :
-								 <span style={{color: '#07111B', textAlign: "center"}}>{record.number}</span>
-							 }
-        </span>
-					)
-				},
-				{
-					title: '姓名',
-					dataIndex: 'name',
-					key: 'name',
-					align: 'center',
-					className: "edu-txt-center font-14",
-
-					render: (text, record) => (
-						<span>
-							{record.name==="--"?
-								<span style={{color: '#999999', textAlign: "center"}}>{record.name}</span>
-								:
-								<span style={{color: '#07111B', textAlign: "center"}}>{record.name}</span>
-							}
-        </span>
-					)
-				},
-				{
-					title: '学号',
-					dataIndex: 'stduynumber',
-					key: 'stduynumber',
-					align: 'center',
-					className: "edu-txt-center font-14",
-					sorter: true,
-					sortDirections: sortDirections,
-					render: (text, record) => (
-						<span>
-						{record.stduynumber === "--" ?
-							<span style={{color: '#999999', textAlign: "center"}}>{record.stduynumber}</span>
-							:
-							<span style={{color: '#9A9A9A', textAlign: "center"}}>{record.stduynumber}</span>
-						}
-        </span>
-					),
-				},
-				{
-					title: '分班',
-					key: 'classroom',
-					dataIndex: 'classroom',
-					align: 'center',
-					className: "edu-txt-center font-14 maxnamewidth260 ",
-					width:'260px',
-					render: (text, record) => (
-						<span>
-							{record.classroom==="--"?
-								<span style={{color: '#999999', textAlign: "center"}} className="maxnamewidth260">{record.classroom}</span>
-								:
-								<a style={{color: '#07111B', textAlign: "center"}} className="maxnamewidth260" title={record.classroom}>{record.classroom}</a>
-							}
-        </span>
-					)
-				},
-				{
-					title: '提交状态',
-					dataIndex: 'submitstate',
-					key: 'submitstate',
-					align: 'center',
-					className: "edu-txt-center font-14",
-					render: (text, record) => (
-						<span>
-								<span style={record.submitstate === "未提交" ? {
-									color: '#999999',
-									textAlign: "center"
-								} : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center"} : {
-									color: '#29BD8B',
-									textAlign: "center"
-								}}>{record.submitstate}</span>
-
-        </span>
-					)
-
-				},
-				{
-					title: '提交时间',
-					dataIndex: 'updatetime',
-					key: 'updatetime',
-					align: 'center',
-					className: "edu-txt-center font-14",
-					sorter: true,
-					defaultSortOrder: 'descend',
-					sortDirections: sortDirections,
-					render: (text, record) => (
-						<span>
-							{record.updatetime==="--"?
-								<span style={{color: '#999999', textAlign: "center"}}>--</span>
-								:
-								<span style={{color: '#9A9A9A', textAlign: "center"}}>{record.updatetime}</span>
-							}
-        </span>
-					),
-				},
-				{
-					title: '客观题得分',
-					dataIndex: 'completion',
-					key: 'completion',
-					align: 'center',
-					className: "edu-txt-center font-14",
-					render: (text, record) => (
-						<span>
-							{record.completion=== "--"?
-								<span style={{color: '#999999', textAlign: "center"}}>--</span>
-								:
-								<span style={{color: '#07111B', textAlign: "center"}}>{record.completion}</span>
-							}
-        </span>
-					)
-				},
-				{
-					title: '主观题得分',
-					dataIndex: 'levelscore',
-					key: 'levelscore',
-					align: 'center',
-					className: "edu-txt-center font-14",
-					render: (text, record) => (
-						<span>
-							{record.levelscore==="--"?
-								<span style={{color: '#999999', textAlign: "center"}}>--</span>
-								:
-								<span style={{color: '#FF6800', textAlign: "center"}}>{record.levelscore}</span>
-							}
-        </span>
-					)
-				},
-				{
-					title: '最终成绩',
-					dataIndex: 'efficiencyscore',
-					key: 'efficiencyscore',
-					align: 'center',
-					className: "edu-txt-center font-14",
-					sorter: true,
-					sortDirections: sortDirections,
-					render: (text, record) => (
-						<span>
-															{record.efficiencyscore === "--" ?
-																<Tooltip  placement="bottom" title={<div>
-																	<div>未评分</div>
-																</div>}>
-																	<a style={{color: '#999999',
-																		textAlign: "center",}}>--</a>
-																</Tooltip>
-																:
-																record.commit_method===5?
-																	<Tooltip  placement="bottom" title={
-																		<div>
-																			<div>最终调整成绩：{record.efficiencyscore}分</div>
-																		</div>}>
-																	<span style={parseInt(record.efficiencyscore) > 90 ? {
-																		color: '#DD1717',
-																		textAlign: "center",
-																	} : parseInt(record.efficiencyscore) <= 90 ? {
-																		color: '#FF6800',
-																		textAlign: "center",
-																	} : parseInt(record.efficiencyscore) <= 60 ? {
-																		color: '#747A7F',
-																		textAlign: "center",
-																	} : {
-																		color: '#747A7F',
-																		textAlign: "center",
-																	}}>{record.efficiencyscore}</span>
-																	</Tooltip>
-																	:
-																<span style={parseInt(record.efficiencyscore) > 90 ? {
-																	color: '#DD1717',
-																	textAlign: "center",
-																} : parseInt(record.efficiencyscore) <= 90 ? {
-																	color: '#FF6800',
-																	textAlign: "center",
-																} : parseInt(record.efficiencyscore) <= 60 ? {
-																	color: '#747A7F',
-																	textAlign: "center",
-																} : {
-																	color: '#747A7F',
-																	textAlign: "center",
-																}}>{record.efficiencyscore}</span>
-															}
-        </span>
-					)
-				},
-				{
-					title: '操作',
-					dataIndex: 'finalscore',
-					key: 'finalscore',
-					align: 'center',
-					className: "edu-txt-center font-14",
-					render: (text, record) => (
-						<span>
-							{
-								record.submitstate === "未提交"||record.commit_method===5?
-									<a style={{textAlign: "center"}} className="color-blue"
-										 target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
-									:record.submitstate === "已提交"?
-									<a style={{textAlign: "center"}} className="color-blue"
-										 target="_blank"
-										 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
-									:
-									<span style={{textAlign: "center", color: '#999999'}}>--</span>
-							}
-                    </span>
-					)
-				},
-			],//columnsystwo 也会被columnsys当作参数接收
-			exercise_status:0,
+			// 也会被columnsys当作参数接收
+			exercise_status: 0,
 			order_type: "desc",
 			exeuserid: 0,
 			subjective: 0,
@@ -1402,8 +1479,10 @@ class Studentshavecompletedthelist extends Component {
 		}
 		{/*	 onClick={() => this.Adjustment(record.user_id)}>评阅</a>*/
 		}
-		{/*<span style={{textAlign: "center", color: '#999999'}}*/}
-		{/*>--</span>*/}
+		{/*<span style={{textAlign: "center", color: '#999999'}}*/
+		}
+		{/*>--</span>*/
+		}
 		// //console.log("Studentshavecompletedthelist");
 		// //console.log(props.current_status);
 		// columnsys 老师列表
@@ -1413,7 +1492,6 @@ class Studentshavecompletedthelist extends Component {
 	}
 
 	paginationonChange = (pageNumber) => {
-		// //console.log('Page: ');
 		if (this.state.loadingstate === false) {
 			this.setState({
 				page: pageNumber,
@@ -1426,11 +1504,11 @@ class Studentshavecompletedthelist extends Component {
 			})
 		}
 
-		this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, pageNumber, 20, this.state.order_type);
+		this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.course_groupyslsthree, this.state.checkedValuesineinfo, this.state.searchtext, pageNumber, 20, this.state.order_type);
 
 	}
 	paginationonChanges = (pageNumber) => {
-		// //console.log('Page: ');
+		// console.log('Page: ',pageNumber);
 		if (this.state.loadingstate === false) {
 			this.setState({
 				page: pageNumber,
@@ -1449,20 +1527,23 @@ class Studentshavecompletedthelist extends Component {
 	}
 
 	componentDidMount() {
-		// if(this.props.isAdmin() === true){
-		//     this.Teacherliststudentlistsy();
-		//     //console.log("1111111111111111");
-		//     //console.log(this.props.isAdmin());
-		// }else {
-		this.Teacherliststudentlist();
-		// //console.log("2222222222222");
-		// //console.log(this.props.isAdmin());
-		// }
+		//被columnsys当作参数接收
+		// console.log("componentDidMount");
+		// console.log(columnsystwo);
 		try {
-			this.props.triggerRef(this);
-		}catch (e) {
+			columnsystwo = this.state.columnsys;
+		} catch (e) {
 
 		}
+		// console.log(columnsystwo);
+		this.Teacherliststudentlist();
+
+		try {
+			this.props.triggerRef(this);
+		} catch (e) {
+
+		}
+
 	}
 
 	componentWillReceiveProps = (nextProps) => {
@@ -1488,6 +1569,17 @@ class Studentshavecompletedthelist extends Component {
 				limit: null,
 			}
 		}).then((response) => {
+			if (response === undefined) {
+				return
+			}
+			try {
+				myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有
+				mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0;
+				myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0;
+			} catch (e) {
+
+			}
+
 			//学生
 			if (response.data.exercise_types.user_permission === 1) {
 				this.setState({
@@ -1497,7 +1589,7 @@ class Studentshavecompletedthelist extends Component {
 					exercise_users: response.data.exercise_users,
 					current_answer_user: response.data.current_answer_user,
 					course_groups: response.data.course_groups,
-					mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users
+					mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users
 				})
 				if (response.data.current_answer_user === undefined || response.data.current_answer_user === null) {
 					// 学生未截止
@@ -1506,20 +1598,15 @@ class Studentshavecompletedthelist extends Component {
 					if (response.data.exercise_types.subjective === 0) {
 
 						if (this.state.noclassroom === undefined || this.state.noclassroom === "" || this.state.noclassroom === null) {
-							console.log("4");
-							var arr =[];
-							for(var i=0;i<this.state.columnss.length;i++){
+							var arr = [];
+							for (var i = 0; i < this.state.columnss.length; i++) {
 								var item = this.state.columnss[i];
-								if(item.title==="分班"){
-								}
-								else if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "分班") {
+								} else if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr.push(item);
 								}
 							}
@@ -1528,20 +1615,15 @@ class Studentshavecompletedthelist extends Component {
 							})
 
 						} else {
-							console.log("5");
-							debugger
-							var arr =[];
-							for(var i=0;i<this.state.columnss.length;i++){
+							var arr = [];
+							for (var i = 0; i < this.state.columnss.length; i++) {
 								var item = this.state.columnss[i];
-								if(item.title==="客观题得分"){
+								if (item.title === "客观题得分") {
 
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr.push(item);
 								}
 							}
@@ -1556,32 +1638,26 @@ class Studentshavecompletedthelist extends Component {
 					// //console.log("试卷学生已截止");
 					if (response.data.exercise_types.subjective === 0) {
 						if (this.state.loadingstate === false) {
-							var arr =[];
-							for(var i=0;i<this.state.columnstwo.length;i++){
+							var arr = [];
+							for (var i = 0; i < this.state.columnstwo.length; i++) {
 								var item = this.state.columnstwo[i];
-								if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr.push(item);
 								}
 							}
 
-							var arr2 =[];
-							for(var i=0;i<this.state.columns.length;i++){
+							var arr2 = [];
+							for (var i = 0; i < this.state.columns.length; i++) {
 								var item = this.state.columns[i];
-								if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr2.push(item);
 								}
 							}
@@ -1592,43 +1668,37 @@ class Studentshavecompletedthelist extends Component {
 							})
 						} else {
 
-							var arr =[];
-							for(var i=0;i<this.state.columnstwo.length;i++){
+							var arr = [];
+							for (var i = 0; i < this.state.columnstwo.length; i++) {
 								var item = this.state.columnstwo[i];
-								if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr.push(item);
 								}
 							}
-							var arr2 =[];
-							for(var i=0;i<this.state.columns.length;i++){
+							var arr2 = [];
+							for (var i = 0; i < this.state.columns.length; i++) {
 								var item = this.state.columns[i];
-								if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr2.push(item);
 								}
 							}
 							thiss.setState({
 								columns: arr2,
-								columnstwo:arr,
+								columnstwo: arr,
 							})
 						}
 
 
 					}
-					thiss.Generatenewdata(response.data.exercise_users, response.data.current_answer_user,response.data.exercise_types);
+					thiss.Generatenewdata(response.data.exercise_users, response.data.current_answer_user, response.data.exercise_types);
 				}
 			}
 			//老师
@@ -1654,7 +1724,7 @@ class Studentshavecompletedthelist extends Component {
 
 	}
 
-	Generatenewdata(exercise_users, current_answer_user,exercise_types) {
+	Generatenewdata(exercise_users, current_answer_user, exercise_types) {
 		let {page, limit} = this.state;
 		let datalist = [];
 		let datalisttwo = [];
@@ -1671,13 +1741,17 @@ class Studentshavecompletedthelist extends Component {
 						name: exercise_users[i].user_name,
 						stduynumber: exercise_users[i].student_id === undefined ? "--" : exercise_users[i].student_id === null ? "--" : exercise_users[i].student_id === "" ? "--" : exercise_users[i].student_id,
 						classroom: exercise_users[i].user_group_name,
-						submitstate: exercise_users[i].commit_status === 1 ? "已提交" : "未提交",
+						submitstate: exercise_users[i].commit_status === 1 ? "考试中" : exercise_users[i].commit_status === 0?"未开始":"已交卷",
 						updatetime: moment(exercise_users[i].end_at).format('YYYY-MM-DD HH:mm') === "Invalid date" ? "--" : moment(exercise_users[i].end_at).format('YYYY-MM-DD HH:mm'),
 						completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
 						levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 						efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
-						operating: "评阅",
-						commit_method:exercise_users[i].commit_method,
+						objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
+						subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+						operating: exercise_users[i].has_comment === true ? "已评阅" : "评阅",
+						commit_method: exercise_users[i].commit_method,
+						has_comment: exercise_users[i].has_comment,
+						review_status: exercise_users[i].review_status,
 					})
 				} else {
 					datalist.push({
@@ -1687,13 +1761,18 @@ class Studentshavecompletedthelist extends Component {
 						name: exercise_users[i].user_name,
 						stduynumber: exercise_users[i].student_id === undefined ? "--" : exercise_users[i].student_id === null ? "--" : exercise_users[i].student_id === "" ? "--" : exercise_users[i].student_id,
 						classroom: exercise_users[i].user_group_name,
-						submitstate: exercise_users[i].commit_status === 1 ? "已提交" : "未提交",
+						submitstate: exercise_users[i].commit_status === 1 ? "考试中" : exercise_users[i].commit_status === 0?"未开始":"已交卷",
 						updatetime: moment(exercise_users[i].end_at).format('YYYY-MM-DD HH:mm') === "Invalid date" ? "--" : moment(exercise_users[i].end_at).format('YYYY-MM-DD HH:mm'),
 						completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
 						levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 						efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
-						operating: "--",
-						commit_method:exercise_users[i].commit_method
+						objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
+						subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+						operating: exercise_users[i].has_comment === true ? "已评阅" : "--",
+						commit_method: exercise_users[i].commit_method,
+						has_comment: exercise_users[i].has_comment,
+						review_status: exercise_users[i].review_status,
+
 					})
 
 				}
@@ -1714,14 +1793,16 @@ class Studentshavecompletedthelist extends Component {
 				name: current_answer_user.user_name,
 				classroom: current_answer_user.user_group_name,
 				stduynumber: current_answer_user.student_id === undefined ? "--" : current_answer_user.student_id === null ? "--" : current_answer_user.student_id === "" ? "--" : current_answer_user.student_id,
-				submitstate: current_answer_user.commit_status === 1 ? "已提交" : "未提交",
+				submitstate: exercise_users[i].commit_status === 1 ? "考试中" : exercise_users[i].commit_status === 0?"未开始":"已交卷",
 				updatetime: moment(current_answer_user.end_at).format('YYYY-MM-DD HH:mm') === "Invalid date" ? "--" : moment(current_answer_user.end_at).format('YYYY-MM-DD HH:mm'),
 				efficiencyscore: current_answer_user.score === undefined ? "--" : current_answer_user.score === null ? "--" : current_answer_user.score === "" ? "--" : current_answer_user.score,
+				objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
+				subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 				review_status: current_answer_user.review_status,
 				completion: current_answer_user.objective_score === undefined ? "--" : current_answer_user.objective_score === null ? "--" : current_answer_user.objective_score === "" ? "--" : current_answer_user.objective_score,
 				levelscore: current_answer_user.subjective_score === undefined ? "--" : current_answer_user.subjective_score === null ? "--" : current_answer_user.subjective_score === "" ? "--" : current_answer_user.subjective_score,
-				score_open:exercise_types.score_open,
-				commit_method:current_answer_user.commit_method
+				score_open: exercise_types.score_open,
+				commit_method: current_answer_user.commit_method,
 
 			})
 
@@ -1754,13 +1835,18 @@ class Studentshavecompletedthelist extends Component {
 					name: exercise_users[i].user_name,
 					stduynumber: exercise_users[i].student_id,
 					classroom: exercise_users[i].user_group_name,
-					submitstate: exercise_users[i].commit_status === 1 ? "已提交" : "未提交",
+					submitstate: exercise_users[i].commit_status === 1 ? "考试中" : exercise_users[i].commit_status === 0?"未开始":"已交卷",
 					updatetime: moment(exercise_users[i].end_at).format('YYYY-MM-DD HH:mm') === "Invalid date" ? "--" : moment(exercise_users[i].end_at).format('YYYY-MM-DD HH:mm'),
 					completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
 					levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 					efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
-					operating: "查看",
-					commit_method:exercise_users[i].commit_method,
+					objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
+					subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+					operating: exercise_users[i].has_comment === true ? "已评阅" : "查看",
+					commit_method: exercise_users[i].commit_method,
+					has_comment: exercise_users[i].has_comment,
+					review_status: exercise_users[i].review_status,
+
 				})
 				noclassroom = exercise_users[i].user_group_name;
 			}
@@ -1825,42 +1911,46 @@ class Studentshavecompletedthelist extends Component {
 			params: params
 		}).then((response) => {
 			// //console.log(JSON.stringify(response));
+			if (response === undefined) {
+				return
+			}
 			this.setState({
 				Teacherliststudentlist: response.data,
 				review: response.data.review,
 				commit_status: response.data.commit_status,
 				exercise_users: response.data.exercise_users,
 				current_answer_user: response.data.current_answer_user,
-				mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+				mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 			})
+			try {
+				myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有
+				mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0;
+				myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0;
+			} catch (e) {
+
+			}
 			if (response.data.exercise_types.subjective === 0) {
 
-				var arr =[];
-				for(var i=0;i<this.state.columnstwo.length;i++){
+				var arr = [];
+				for (var i = 0; i < this.state.columnstwo.length; i++) {
 					var item = this.state.columnstwo[i];
-					if(item.title==="客观题得分"){
-					}
-					else if(item.title==="主观题得分"){
-					}
-					else if(this.props.isNotMember()===true&&item.title==="学号") {
+					if (item.title === "客观题得分") {
+					} else if (item.title === "主观题得分") {
+					} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-					}
-					else{
+					} else {
 						arr.push(item);
 					}
 				}
 
-				var arr2 =[];
-				for(var i=0;i<this.state.columns.length;i++){
+				var arr2 = [];
+				for (var i = 0; i < this.state.columns.length; i++) {
 					var item = this.state.columns[i];
-					if(item.title==="客观题得分"){
-					}
-					else if(item.title==="主观题得分"){
-					}
-					else if(this.props.isNotMember()===true&&item.title==="学号") {
+					if (item.title === "客观题得分") {
+					} else if (item.title === "主观题得分") {
+					} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-					}
-					else{
+					} else {
 						arr2.push(item);
 					}
 				}
@@ -1870,7 +1960,7 @@ class Studentshavecompletedthelist extends Component {
 					loadingstate: false,
 				})
 			}
-			this.Generatenewdata(response.data.exercise_users, response.data.current_answer_user,response.data.exercise_types);
+			this.Generatenewdata(response.data.exercise_users, response.data.current_answer_user, response.data.exercise_types);
 		}).catch((error) => {
 			//console.log(error)
 			this.setState({
@@ -1899,14 +1989,19 @@ class Studentshavecompletedthelist extends Component {
 						name: exercise_users[i].user_name,
 						stduynumber: exercise_users[i].student_id === undefined ? "--" : exercise_users[i].student_id === null ? "--" : exercise_users[i].student_id === "" ? "--" : exercise_users[i].student_id,
 						classroom: exercise_users[i].user_group_name,
-						submitstate: exercise_users[i].commit_status === 1 ? "已提交" : "未提交",
+						submitstate: exercise_users[i].commit_status === 1 ? "考试中" : exercise_users[i].commit_status === 0?"未开始":"已交卷",
 						updatetime: moment(exercise_users[i].end_at).format('YYYY-MM-DD HH:mm') === "Invalid date" ? "--" : moment(exercise_users[i].end_at).format('YYYY-MM-DD HH:mm'),
 						completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
 						levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 						efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
-						finalscore: "评阅",
+						objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
+						subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+						finalscore: exercise_users[i].commit_status === 1 ? "--":exercise_users[i].has_comment === true ? "已评阅" : "评阅",
 						user_id: exercise_users[i].user_id,
-						commit_method:exercise_users[i].commit_method
+						commit_method: exercise_users[i].commit_method,
+						has_comment: exercise_users[i].has_comment,
+						review_status: exercise_users[i].review_status,
+
 					})
 				} else {
 					datalist.push({
@@ -1916,14 +2011,18 @@ class Studentshavecompletedthelist extends Component {
 						name: exercise_users[i].user_name,
 						stduynumber: exercise_users[i].student_id === undefined ? "--" : exercise_users[i].student_id === null ? "--" : exercise_users[i].student_id === "" ? "--" : exercise_users[i].student_id,
 						classroom: exercise_users[i].user_group_name,
-						submitstate: exercise_users[i].commit_status === 1 ? "已提交" : "未提交",
+						submitstate: exercise_users[i].commit_status === 1 ? "考试中" : exercise_users[i].commit_status === 0?"未开始":"已交卷",
 						updatetime: moment(exercise_users[i].end_at).format('YYYY-MM-DD HH:mm') === "Invalid date" ? "--" : moment(exercise_users[i].end_at).format('YYYY-MM-DD HH:mm'),
 						completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
 						levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 						efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
-						finalscore: "--",
+						objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
+						subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+						finalscore: exercise_users[i].commit_status === 1 ? "--" :exercise_users[i].has_comment === true ? "已评阅" : "评阅",
 						user_id: exercise_users[i].user_id,
-						commit_method:exercise_users[i].commit_method
+						commit_method: exercise_users[i].commit_method,
+						has_comment: exercise_users[i].has_comment,
+						review_status: exercise_users[i].review_status,
 					})
 					indexi++;
 				}
@@ -1947,17 +2046,14 @@ class Studentshavecompletedthelist extends Component {
 					// this.state.columnsys.map((item,key)=>{
 					//
 					// })
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="客观题得分"){
-						}
-						else if(item.title==="主观题得分"){
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						if (item.title === "客观题得分") {
+						} else if (item.title === "主观题得分") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}
-						else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -1970,7 +2066,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
@@ -1981,18 +2077,14 @@ class Studentshavecompletedthelist extends Component {
 					//分班小于0不显示分班
 					//6ge
 
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="分班"){
-						}
-						else if(item.title==="客观题得分"){
-						}
-						else if(item.title==="主观题得分"){
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
-						}
-						else{
+						if (item.title === "分班") {
+						} else if (item.title === "客观题得分") {
+						} else if (item.title === "主观题得分") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
+						} else {
 							arr.push(item);
 						}
 					}
@@ -2006,7 +2098,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
 						subjective_score: response.data.exercise_types.subjective_score,
@@ -2021,16 +2113,14 @@ class Studentshavecompletedthelist extends Component {
 					//显示分班
 					//8ge
 
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="客观题得分"){
-						}
-						else if(item.title==="主观题得分"){
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						if (item.title === "客观题得分") {
+						} else if (item.title === "主观题得分") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -2045,28 +2135,25 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
 						subjective_score: response.data.exercise_types.subjective_score,
-						columnsys:	arr,
+						columnsys: arr,
 					})
 				} else {
 					//不显示分班
 					//7ge
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="分班"){
-						}
-						else if(item.title==="客观题得分"){
-						}
-						else if(item.title==="主观题得分"){
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						if (item.title === "分班") {
+						} else if (item.title === "客观题得分") {
+						} else if (item.title === "主观题得分") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -2080,7 +2167,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
@@ -2097,13 +2184,12 @@ class Studentshavecompletedthelist extends Component {
 				//console.log("2548包含主观题不包含分班");
 
 				if (response.data.exercise_types.groups_count > 0) {
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(this.props.isNotMember()===true&&item.title==="学号") {
+						if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}
-						else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -2115,23 +2201,21 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						columnsys: arr,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
 						subjective_score: response.data.exercise_types.subjective_score,
 					})
 				} else {
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="分班"){
+						if (item.title === "分班") {
 
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}
-						else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -2143,8 +2227,8 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
-						columnsys:arr,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
+						columnsys: arr,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
 						subjective_score: response.data.exercise_types.subjective_score,
@@ -2161,24 +2245,22 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
-						columnsys: this.state.columnsystwo,
+						columnsys: columnsystwo,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
 						subjective_score: response.data.exercise_types.subjective_score,
 					})
 				} else {
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="分班"){
+						if (item.title === "分班") {
 
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}
-						else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -2190,7 +2272,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						columnsys: arr,
 						subjective: response.data.exercise_types.subjective,
@@ -2238,12 +2320,21 @@ class Studentshavecompletedthelist extends Component {
 		}).then((response) => {
 			// //console.log("528");
 			// //console.log(JSON.stringify(response));
-			if(response===undefined){
+			if (response === undefined) {
 				return
 			}
+
+
 			this.setState({
 				loadingstate: false,
 			})
+			try {
+				myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有
+				mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0;
+				myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0;
+			} catch (e) {
+
+			}
 			// //console.log(response);
 			// //console.log(1997);
 			this.Generatenewdatasy(response.data.exercise_users, response);
@@ -2261,13 +2352,13 @@ class Studentshavecompletedthelist extends Component {
 				unlimited: 0,
 				course_groupyslsthree: undefined,
 				loadingstate: true,
-				page:1
+				page: 1
 			})
 		} else {
 			this.setState({
 				unlimited: 0,
 				course_groupyslsthree: undefined,
-				page:1,
+				page: 1,
 			})
 		}
 		this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, null, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
@@ -2287,17 +2378,17 @@ class Studentshavecompletedthelist extends Component {
 				unlimiteds: 0,
 				course_groupyslstwo: undefined,
 				loadingstate: true,
-				page:1,
+				page: 1,
 			})
 		} else {
 			this.setState({
 				unlimiteds: 0,
 				course_groupyslstwo: undefined,
-				page:1,
+				page: 1,
 			})
 		}
 
-		this.Searchdatasys(this.state.order, undefined, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
+		this.Searchdatasys(this.state.order, undefined, this.state.course_groupyslsthree, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
 	}
 	checkeboxstwo = (checkedValues, data) => {
 		// //console.log(checkedValues)
@@ -2308,17 +2399,17 @@ class Studentshavecompletedthelist extends Component {
 					loadingstate: true,
 					course_groupyslstwo: undefined,
 					unlimiteds: 0,
-					page:1
+					page: 1
 				})
 			} else {
 				this.setState({
 					course_groupyslstwo: undefined,
 					unlimiteds: 0,
-					page:1,
+					page: 1,
 				})
 			}
 
-			this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
+			this.Searchdatasys(this.state.order, checkedValues, this.state.course_groupyslsthree, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
 		}
 		// else if (checkedValues.length === data.length) {
 		// 	if (this.state.loadingstate === false) {
@@ -2342,19 +2433,19 @@ class Studentshavecompletedthelist extends Component {
 		// }
 		else {
 			// //console.log(checkedValues);
-			this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
+			this.Searchdatasys(this.state.order, checkedValues, this.state.course_groupyslsthree, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
 			if (this.state.loadingstate === false) {
 				this.setState({
 					loadingstate: true,
 					course_groupyslstwo: checkedValues,
 					unlimiteds: 1,
-					page:1,
+					page: 1,
 				})
 			} else {
 				this.setState({
 					course_groupyslstwo: checkedValues,
 					unlimiteds: 1,
-					page:1,
+					page: 1,
 				})
 			}
 
@@ -2383,7 +2474,6 @@ class Studentshavecompletedthelist extends Component {
 		//    return
 		// }
 
-
 		if (JSON.stringify(checkedValues) === "[]") {
 			// //console.log(checkedValues);
 			if (this.state.loadingstate === false) {
@@ -2391,13 +2481,13 @@ class Studentshavecompletedthelist extends Component {
 					unlimited: 0,
 					course_groupyslsthree: undefined,
 					loadingstate: true,
-					page:1
+					page: 1
 				})
 			} else {
 				this.setState({
 					unlimited: 0,
 					course_groupyslsthree: undefined,
-					page:1
+					page: 1
 				})
 			}
 
@@ -2428,13 +2518,13 @@ class Studentshavecompletedthelist extends Component {
 					unlimited: 1,
 					loadingstate: true,
 					course_groupyslsthree: checkedValues,
-					page:1
+					page: 1
 				})
 			} else {
 				this.setState({
 					unlimited: 1,
 					course_groupyslsthree: checkedValues,
-					page:1
+					page: 1
 				})
 			}
 
@@ -2450,14 +2540,14 @@ class Studentshavecompletedthelist extends Component {
 				checkedValuesineinfo: undefined,
 				course_groupysls: undefined,
 				loadingstate: true,
-				page:1,
+				page: 1,
 			})
 		} else {
 			this.setState({
 				unlimitedtwo: 0,
 				checkedValuesineinfo: undefined,
 				course_groupysls: undefined,
-				page:1,
+				page: 1,
 			})
 		}
 
@@ -2473,17 +2563,17 @@ class Studentshavecompletedthelist extends Component {
 					course_groupysls: undefined,
 					unlimitedtwo: 0,
 					loadingstate: true,
-					page:1,
+					page: 1,
 				})
 			} else {
 				this.setState({
 					course_groupysls: undefined,
 					unlimitedtwo: 0,
-					page:1,
+					page: 1,
 				})
 			}
 
-			this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.order_type)
+			this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.course_groupyslsthree, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.order_type)
 		}
 		// else if (checkedValues.length === data.length) {
 		// 	if (this.state.loadingstate === false) {
@@ -2511,19 +2601,19 @@ class Studentshavecompletedthelist extends Component {
 					course_groupysls: checkedValues,
 					unlimitedtwo: 1,
 					loadingstate: true,
-					page:1
+					page: 1
 				})
 			} else {
 				this.setState({
 					checkedValuesineinfo: checkedValues,
 					course_groupysls: checkedValues,
 					unlimitedtwo: 1,
-					page:1
+					page: 1
 				})
 
 			}
 
-			this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.order_type)
+			this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.course_groupyslsthree, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.order_type)
 			this.props.setcourse_groupysls(checkedValues)
 		}
 
@@ -2540,11 +2630,11 @@ class Studentshavecompletedthelist extends Component {
 			if (this.state.loadingstate === false) {
 				this.setState({
 					loadingstate: true,
-					page:1
+					page: 1
 				})
 			}
 
-			this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
+			this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.course_groupyslsthree, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
 		}
 	};
 	//搜索学生按钮输入 老师
@@ -2557,24 +2647,25 @@ class Studentshavecompletedthelist extends Component {
 		if (this.state.loadingstate === false) {
 			this.setState({
 				loadingstate: true,
-				page:1,
+				page: 1,
 			})
 		}
 
-		this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, value, 1, this.state.limit, this.state.order_type);
+		this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.course_groupyslsthree, this.state.checkedValuesineinfo, value, 1, this.state.limit, this.state.order_type);
 		// this.Startsorting(this.state.order,this.state.checkedValuesine,this.state.checkedValuesineinfo,value);
 		// //console.log(value)
 
 
 	};
+
 	_getRequestParams() {
-		const { order, checkedValuesineinfo,course_groupyslstwo ,searchtext, page ,limit,course_groupyslsthree} = this.state
+		const {order, checkedValuesineinfo, course_groupyslstwo, searchtext, page, limit, course_groupyslsthree} = this.state
 		return {
 			page,
-			review:course_groupyslsthree,
-			commit_status:course_groupyslstwo,
-			search:searchtext,
-			exercise_group_id:checkedValuesineinfo,
+			review: course_groupyslsthree,
+			commit_status: course_groupyslstwo,
+			search: searchtext,
+			exercise_group_id: checkedValuesineinfo,
 			limit: limit,
 			order,
 		}
@@ -2613,7 +2704,7 @@ class Studentshavecompletedthelist extends Component {
 							loadingstate: true,
 							order_type: "asc"
 						})
-						this.Searchdatasys("end_at", this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "asc");
+						this.Searchdatasys("end_at", this.state.course_groupyslstwo, this.state.course_groupyslsthree, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "asc");
 					} else if (sorter.order === "descend") {
 						//降序
 						this.setState({
@@ -2621,7 +2712,7 @@ class Studentshavecompletedthelist extends Component {
 							loadingstate: true,
 							order_type: "desc"
 						})
-						this.Searchdatasys("end_at", this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "desc");
+						this.Searchdatasys("end_at", this.state.course_groupyslstwo, this.state.course_groupyslsthree, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "desc");
 					}
 				}
 			} catch (e) {
@@ -2638,7 +2729,7 @@ class Studentshavecompletedthelist extends Component {
 							loadingstate: true,
 							order_type: "asc"
 						})
-						this.Searchdatasys("student_id", this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "asc");
+						this.Searchdatasys("student_id", this.state.course_groupyslstwo, this.state.course_groupyslsthree, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "asc");
 
 					} else if (sorter.order === "descend") {
 						//降序
@@ -2647,7 +2738,7 @@ class Studentshavecompletedthelist extends Component {
 							loadingstate: true,
 							order_type: "desc"
 						})
-						this.Searchdatasys("student_id", this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "desc");
+						this.Searchdatasys("student_id", this.state.course_groupyslstwo, this.state.course_groupyslsthree, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "desc");
 
 					}
 				}
@@ -2665,7 +2756,7 @@ class Studentshavecompletedthelist extends Component {
 							loadingstate: true,
 							order_type: "asc"
 						})
-						this.Searchdatasys("score", this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "asc");
+						this.Searchdatasys("score", this.state.course_groupyslstwo, this.state.course_groupyslsthree, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "asc");
 
 					} else if (sorter.order === "descend") {
 						//降序
@@ -2674,7 +2765,7 @@ class Studentshavecompletedthelist extends Component {
 							loadingstate: true,
 							order_type: "desc"
 						})
-						this.Searchdatasys("score", this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "desc");
+						this.Searchdatasys("score", this.state.course_groupyslstwo, this.state.course_groupyslsthree, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "desc");
 
 					}
 				}
@@ -2772,8 +2863,15 @@ class Studentshavecompletedthelist extends Component {
 	}
 	// 调分
 	Adjustment = (e) => {
-		console.log("Adjustment");
-		console.log(e);
+		// console.log("Adjustment");
+		// console.log(e);
+		if (this.state.objective_score === 0 && this.state.subjective_score === 0) {
+			this.props.showNotification('试卷题型分被限制为0分，不能调分，请点击编辑试卷修改题型分数');
+
+			return
+		}
+
+
 		this.setState({
 			testpapergradingboll: true,
 			exeuserid: e,
@@ -2791,7 +2889,6 @@ class Studentshavecompletedthelist extends Component {
 
 	//试卷调分
 	Testpapergrading = (v, n) => {
-		// debugger
 		var exercise_id = this.props.match.params.Id;
 		let url = `/exercises/${exercise_id}/adjust_score.json`;
 		axios.post(url, {
@@ -2815,7 +2912,6 @@ class Studentshavecompletedthelist extends Component {
 	}
 
 
-
 	render() {
 		const isAdmin = this.props.isAdmin();
 
@@ -2828,8 +2924,8 @@ class Studentshavecompletedthelist extends Component {
 		// //console.log("this.props.Commonheadofthetestpaper.exercise_status");
 		// //console.log(this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status);
 		// //console.log(exercise_status);
-		console.log("Studentshavecompletedthelis123123t");
-		console.log(columnss);
+		// console.log("Studentshavecompletedthelis123123t");
+		// console.log(columnss);
 		return (
 			isAdmin === true ?
 				(
@@ -2839,7 +2935,7 @@ class Studentshavecompletedthelist extends Component {
 					}}>
 						{/*老师*/}
 						{
-							this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status===0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status===1 ?
+							this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 1 ?
 								<div className="edu-back-white">
 									<NoneData></NoneData>
 								</div>
@@ -2859,12 +2955,12 @@ class Studentshavecompletedthelist extends Component {
 											Saves={(value, num) => this.Testpapergrading(value, num)}
 										/> : ""
 									}
-									<div className="edu-back-white" >
+									<div className="edu-back-white">
 										<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>
 
 											{/*你的评阅：*/}
 											{
-												Teacherliststudentlist === undefined || Teacherliststudentlist.exercise_types.subjective === 0 ?
+												Teacherliststudentlist === undefined || parseInt(Teacherliststudentlist.exercise_types.subjective_score) <= 0 ?
 													<li className="clearfix mt10">
 														<span className="fl  mr10 color-grey-8 ">作品状态：</span>
 														<span className="fl "><a id="graduation_comment_no_limit"
@@ -2877,7 +2973,7 @@ class Studentshavecompletedthelist extends Component {
 																	return (
 																		<span key={key}><Checkbox className="fl mt5"
 																															key={item.id}
-																															value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users})</span></Checkbox></span>
+																															value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : key===1? Teacherliststudentlist.exercise_types.answering_users: Teacherliststudentlist.exercise_types.answer_users})</span></Checkbox></span>
 																	)
 																})
 															}
@@ -2897,7 +2993,7 @@ class Studentshavecompletedthelist extends Component {
 													:
 													<div>
 														<li className="clearfix  mt10">
-															<span className="fl  mr10 color-grey-8 ">你的评阅：</span>
+														<span className="fl  mr10 color-grey-8 ">你的评阅：</span>
 															<span className="fl "><a id="graduation_comment_no_limit"
 																											 className={unlimited === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
 																											 onClick={() => this.notlimited()}>全部</a></span>
@@ -2939,7 +3035,8 @@ class Studentshavecompletedthelist extends Component {
 																		return (
 																			<span key={key}><Checkbox className="fl mt5"
 																																key={item.id}
-																																value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users})</span></Checkbox></span>
+																																value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : key===1? Teacherliststudentlist.exercise_types.answering_users: Teacherliststudentlist.exercise_types.answer_users})</span></Checkbox></span>
+
 																		)
 																	})
 																}
@@ -3060,7 +3157,7 @@ class Studentshavecompletedthelist extends Component {
 							<div className=" clearfix "
 									 style={{"margin": "0 auto", "padding-bottom": "100px", minWidth: " 1200px"}}>
 								{
-									this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 1 ?
+									this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 1 ?
 										<div className="edu-back-white">
 											<NoneData></NoneData>
 										</div>
@@ -3147,7 +3244,7 @@ class Studentshavecompletedthelist extends Component {
 								minWidth: " 1200px"
 							}}>
 								{
-									this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 1 ?
+									this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 1 ?
 										<div className="edu-back-white">
 											<NoneData></NoneData>
 										</div>
diff --git a/src/modules/courses/exercise/Testpapersettinghomepage.js b/src/modules/courses/exercise/Testpapersettinghomepage.js
index ff60b553..936d9e42 100644
--- a/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -17,7 +17,7 @@ import ImmediatelyEnd from "../poll/pollPublicBtn/ImmediatelyEnd";
 import Ecerciseallbackagain from './Ecerciseallbackagain';
 
 
-const polls_status={1:"未发布",2:"提交中",3:"已截止",4:"已结束"}
+const polls_status={1:"未发布",2:"考试中",3:"已截止",4:"已结束"}
 const start_Value={0:"继续答题",1:"查看答题",2:"开始答题"}
 const qs = require('qs');
 //试卷主要设置页面
@@ -35,6 +35,7 @@ class Testpapersettinghomepage extends Component{
                 DownloadMessageval:undefined,
 							  donwloading:false,
 							  exercise_status:3,
+							  assistant_auth:false, //设置助教
             }
     }
     //切换tab
@@ -43,7 +44,7 @@ class Testpapersettinghomepage extends Component{
             tab:e.key
         })
 
-        // this.props.history.push(`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/student_exercise_list?tab=`+e.key)
+        // this.props.history.push(`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/student_exercise_list?tab=`+e.key)
 
     }
     componentDidMount(){
@@ -72,6 +73,7 @@ class Testpapersettinghomepage extends Component{
                         Commonheadofthetestpaper:response.data,
                         current_status:response.data.user_permission.current_status,
 											  exercise_status:response.data.exercise_status,
+											  assistant_auth:response.data.assistant_auth,
                     })
                     // console.log(JSON.stringify(response.data.show_statistic));
 
@@ -85,6 +87,12 @@ class Testpapersettinghomepage extends Component{
 
     }
 
+   assistantauthoritys=(bool)=>{
+		  this.setState({
+				assistant_auth:bool,
+			})
+	}
+
     Ecerciseacallagain=()=>{
         this.setState({
             visible:true
@@ -152,7 +160,7 @@ class Testpapersettinghomepage extends Component{
 			this.setState({
 				Modalstype:true,
 				ModalSave:()=>this.props.history.push(url),
-				Modalstopval:`答题时长限制${Commonheadofthetestpaper.time}分钟，从首次答题开始实行不间断计时方法`,
+				Modalstopval:`答题时长限制${Commonheadofthetestpaper.time}分钟，从首次答题开始实行不间断计时`,
 				modalsBottomval:'请确认是否有充足的答题时间？',
 			});
 		}else{
@@ -277,19 +285,21 @@ class Testpapersettinghomepage extends Component{
 		// let courseId=this.props.match.params.coursesId;
 		// let category_id=this.props.match.params.category_id;
 		//
-		// window.location.href="/courses/"+courseId+"/graduation_tasks/"+datalist.graduation_id;
+		// window.location.href="/classrooms/"+courseId+"/graduation_tasks/"+datalist.graduation_id;
 		// let courseId=this.props.match.params.coursesId;
 		// if(courseId===undefined){
-		// 	this.props.history.push("/courses");
+		// 	this.props.history.push("/classrooms");
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
 		this.props.history.goBack()
 	}
     render(){
-        let {tab,visible,Commonheadofthetestpaper,exercise_status}=this.state;
+        let {tab,visible,Commonheadofthetestpaper,exercise_status,assistant_auth}=this.state;
         const isAdmin =this.props.isAdmin();
-        const isStudent = this.props.isStudent();
+			const isAssistant=this.props.isAssistant();
+
+			const isStudent = this.props.isStudent();
             // TODO
 
 	  //console.log(Commonheadofthetestpaper.exercise_status);
@@ -322,9 +332,9 @@ class Testpapersettinghomepage extends Component{
 
                     <div className="educontent mb20" style={{width:"1200px"}}>
                         <p className="clearfix mb20 mt10">
-                            <Link className=" btn colorgrey fl hovercolorblue "  to = {`/courses/${this.props.match.params.coursesId}`} >{this.props.coursedata.name}</Link>
+                            <Link className=" btn colorgrey fl hovercolorblue "  to = {`/classrooms/${this.props.match.params.coursesId}`} >{this.props.coursedata.name}</Link>
                             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-                            <Link className=" btn colorgrey fl hovercolorblue " to={`/courses/${this.props.match.params.coursesId}/exercises/${Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.left_banner_id}`} >试卷</Link>
+                            <Link className=" btn colorgrey fl hovercolorblue " to={`/classrooms/${this.props.match.params.coursesId}/exercises/${Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.left_banner_id}`} >试卷</Link>
                             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                             <WordsBtn className="fl">试卷详情</WordsBtn>
                         </p>
@@ -345,7 +355,7 @@ class Testpapersettinghomepage extends Component{
                         <CoursesListType
                             typelist={[`${polls_status[Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status]}`]}
                         />
-                        <Link className="color-grey-6 fr font-16  summaryname  mr30" to={`/courses/${this.props.match.params.coursesId}/exercises/${Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.left_banner_id}`}>返回</Link>
+                        <Link className="color-grey-6 fr font-16  summaryname  mr30" to={`/classrooms/${this.props.match.params.coursesId}/exercises/${Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.left_banner_id}`}>返回</Link>
                         <p className="color-grey-6 fr font-16"> </p>
 
                     </div>
@@ -353,7 +363,26 @@ class Testpapersettinghomepage extends Component{
                         <div className="stud-class-set bor-bottom-greyE ">
                             <div className=" clearfix edu-back-white  pl30 pr30">
                                 <div className="fl task_menu_ul">
-                                    {this.props.isAdmin()===true?
+                                    {isAssistant===true?
+																			(
+																				assistant_auth===true?
+																					<Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}>
+																						<Menu.Item key="0" className={"exercisesafonts"}>答题列表</Menu.Item>
+																						<Menu.Item key="1" className={"exercisesafonts"}>统计结果</Menu.Item>
+																						<Menu.Item key="2" className={"exercisesafonts"}>试卷预览</Menu.Item>
+																						<Menu.Item key="3" className={"exercisesafonts"}>设置</Menu.Item>
+																					</Menu>
+																			  :
+																			<Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}>
+																			<Menu.Item key="0" className={"exercisesafonts"}>答题列表</Menu.Item>
+																			{Commonheadofthetestpaper&&Commonheadofthetestpaper.show_statistic===true?
+																				Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status===3?
+																					<Menu.Item key="1" className={"exercisesafonts"}>统计结果</Menu.Item>:"":""}
+																			<Menu.Item key="3" className={"exercisesafonts"}>设置</Menu.Item>
+																			</Menu>
+																			)
+																			:
+                                    	this.props.isAdmin()===true?
                                         <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}>
                                             <Menu.Item key="0" className={"exercisesafonts"}>答题列表</Menu.Item>
                                             <Menu.Item key="1" className={"exercisesafonts"}>统计结果</Menu.Item>
@@ -437,13 +466,29 @@ class Testpapersettinghomepage extends Component{
 																		getsetdata={this.getsetdata}
                                 ></ImmediatelyPublish>
                                :"":""}
-                                {isAdmin  === true? <Link className="fr color-blue font-16 mt20 mr20" to={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/edit`}>编辑试卷</Link>:""}
+															{/*const isAdminOrTeacher*/}
+															{/*assistant_auth===true*/}
+															{/**/}
+															{isAdmin  === true?
+																(
+																	isAssistant===true?
+																		(
+																			assistant_auth===true?
+																				<Link className="fr color-blue font-16 mt20 mr20" to={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/edit`}>编辑试卷</Link>
+																				:
+																			""
+																		)
+
+																  :
+																		<Link className="fr color-blue font-16 mt20 mr20" to={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/edit`}>编辑试卷</Link>
+																)
+																:""}
 
                                 {isAdmin  === false && this.props.current_user !== undefined?
 																	Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.current_status===2?
-																		<a  className="fr color-blue font-16 mt20" onClick={()=>this.setgameexercise(`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${this.props.current_user.login}`)}>开始答题</a>:
+																		<a  className="fr color-blue font-16 mt20" onClick={()=>this.setgameexercise(`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${this.props.current_user.login}`)}>开始答题</a>:
                                   <Link className="fr color-blue font-16 mt20"
-                                        to={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${this.props.current_user.login}`}>
+                                        to={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${this.props.current_user.login}`}>
 																		{exercise_status===2?start_Value[Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.current_status]:exercise_status===3?"":exercise_status===4?"":start_Value[Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.current_status]}
 																	</Link>
                                   :""}
@@ -461,22 +506,22 @@ class Testpapersettinghomepage extends Component{
                     />
                     {
                         // 教师列表
-                        parseInt(tab[0])==0 ? <Studentshavecompletedthelist {...this.props} {...this.state}  triggerRef={this.bindRef}  setcourse_groupysls={(value)=>this.setcourse_groupysls(value)} current_status = {this.state.current_status} Commonheadofthetestpaper={this.state.Commonheadofthetestpaper} yslstustate={[`${polls_status[Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status]}`]}></Studentshavecompletedthelist>:""
+                        parseInt(tab[0])==0 ? <Studentshavecompletedthelist {...this.props} {...this.state} assistant_auth={assistant_auth} triggerRef={this.bindRef}  setcourse_groupysls={(value)=>this.setcourse_groupysls(value)} current_status = {this.state.current_status} Commonheadofthetestpaper={this.state.Commonheadofthetestpaper} yslstustate={[`${polls_status[Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status]}`]}></Studentshavecompletedthelist>:""
                     }
 
                     {/*统计结果*/}
                     {
 
-                        parseInt(tab[0])==1 ? <Exercisestatisticalresult {...this.props} {...this.state} triggerRef={this.bindRef}></Exercisestatisticalresult>:""
+                        parseInt(tab[0])==1 ? <Exercisestatisticalresult {...this.props} {...this.state} assistant_auth={assistant_auth} triggerRef={this.bindRef}></Exercisestatisticalresult>:""
                     }
 
                     {
 
-                        parseInt(tab[0])==2 ? <ExerciseDisplay {...this.props} {...this.state} triggerRef={this.bindRef}></ExerciseDisplay>:""
+                        parseInt(tab[0])==2 ? <ExerciseDisplay {...this.props} {...this.state} assistant_auth={assistant_auth} triggerRef={this.bindRef}></ExerciseDisplay>:""
                     }
                     {
 
-                        parseInt(tab[0])==3 ? <WrappedExercisesetting  Commonheadofthetestpaper={this.state.Commonheadofthetestpaper} {...this.props} {...this.state} triggerRef={this.bindRef} Commonheadofthetestpapers={this.Commonheadofthetestpaper}></WrappedExercisesetting>:""
+                        parseInt(tab[0])==3 ? <WrappedExercisesetting  Commonheadofthetestpaper={this.state.Commonheadofthetestpaper} {...this.props} {...this.state} assistant_auth={assistant_auth} triggerRef={this.bindRef} Commonheadofthetestpapers={this.Commonheadofthetestpaper} assistantauthoritys={(bool)=>this.assistantauthoritys(bool)}></WrappedExercisesetting>:""
                     }
                 </div>
             </div>
diff --git a/src/modules/courses/exercise/exercise-new-form/index.jsx b/src/modules/courses/exercise/exercise-new-form/index.jsx
new file mode 100644
index 00000000..7c32a082
--- /dev/null
+++ b/src/modules/courses/exercise/exercise-new-form/index.jsx
@@ -0,0 +1,64 @@
+import React, { useState } from 'react'
+import { Input, Form, Button } from 'antd'
+import './index.scss'
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 24 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 24 },
+  },
+}
+const { TextArea } = Input
+const TITLE_MAX_LENGTH = 60
+
+export default ({ exercise_name = '', exercise_description, is_md, onSaveHandler, isEdit, onCancel }) => {
+
+  const [data, setData] = useState({
+    exercise_name,
+    exercise_description,
+    is_md
+  })
+
+  function onChange(prop, value) {
+    setData({ ...data, [prop]: value })
+  }
+
+  function onNameChange(e) {
+    onChange('exercise_name', e.target.value)
+  }
+
+  function onDescChange(e) {
+    onChange('exercise_description', e.target.value)
+  }
+
+  function onSave() {
+    onSaveHandler(data)
+  }
+
+  return (
+    <Form {...formItemLayout}>
+      <div className='exercise-new-form'>
+        <Form.Item label="试卷标题" required className="topicTitle " >
+          <Input placeholder={`请输入试卷标题，最大限制${TITLE_MAX_LENGTH}个字符`} maxLength={TITLE_MAX_LENGTH} className="mt5 exercicenewinputysl" value={data.exercise_name}
+            onChange={onNameChange} addonAfter={`${data.exercise_name.length}/${TITLE_MAX_LENGTH}`}
+          />
+        </Form.Item>
+        <Form.Item label="&nbsp;&nbsp;试卷须知" >
+          <TextArea placeholder="请在此输入本次试卷答题的相关说明，最大限制100个字符" maxLength={100} className="mt5" style={{ height: "120px" }} value={data.exercise_description} onChange={onDescChange} />
+        </Form.Item>
+
+        <Form.Item>
+          <div className="btn-group">
+            <Button size='default' type='primary' style={{ marginRight: 12 }} onClick={onSave}>保存</Button>
+            {isEdit ? null : <Button size='default' type='ghost' onClick={onCancel}>取消</Button>}
+          </div>
+        </Form.Item>
+      </div>
+
+    </Form >
+
+  )
+}
\ No newline at end of file
diff --git a/src/modules/courses/exercise/exercise-new-form/index.scss b/src/modules/courses/exercise/exercise-new-form/index.scss
new file mode 100644
index 00000000..987655d1
--- /dev/null
+++ b/src/modules/courses/exercise/exercise-new-form/index.scss
@@ -0,0 +1,43 @@
+.exercise-new-form {
+  padding: 20px 30px 2px 30px;
+  background: #fff;
+
+  .ant-input {
+    border-right: none;
+    height: 40px;
+  }
+
+  .task-btn-orange {
+    height: 30px;
+    width: 70px;
+  }
+
+  .btn-group {
+    text-align: right;
+  }
+
+  .editor-tip {
+    font-size: 16px;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: rgba(51, 51, 51, 1);
+    padding-left: 12px;
+    line-height: 22px;
+
+    span {
+      font-size: 14px;
+      font-weight: normal;
+      font-family: MicrosoftYaHei;
+      color: rgba(136, 136, 136, 1);
+      line-height: 19px;
+    }
+  }
+
+  .ant-form-item label {
+    overflow: hidden;
+  }
+
+  .ant-form-item-label {
+    height: 40px;
+  }
+}
\ No newline at end of file
diff --git a/src/modules/courses/exercise/new/JudgeDisplay.js b/src/modules/courses/exercise/new/JudgeDisplay.js
index d340f5fa..c5cac71b 100644
--- a/src/modules/courses/exercise/new/JudgeDisplay.js
+++ b/src/modules/courses/exercise/new/JudgeDisplay.js
@@ -1,72 +1,17 @@
-import React,{ Component } from "react";
-
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import axios from 'axios'
-import { qNameArray } from './common'
-import {getUrl, ActionBtn, markdownToHTML, MarkdownToHtml } from 'educoder';
+import React, { Component } from "react";
+import { Radio } from 'antd';
 import QestionDisplayHeader from './QestionDisplayHeader'
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
-
-const tagArray = [
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 
-    'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 
-    'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
-]
-
-class JudgeDisplay extends Component{
-  constructor(props){
-    super(props);
+import RenderHtml from "../../../../components/render-html";
 
 
-    this.state = {
-      question_choices: ['', '', '', ''],
-      standard_answers: [false, false, false, false]
-    }
-  }
-  componentDidMount = () => {
-    const Id = this.props.match.params.Id    
-    this.isEdit = !!Id
-    if (Id) {
-      const url = `/exercises/${Id}/edit.json`
-    //   axios.get(url)
-    //     .then((response) => {
-    //       if (response.data.status == 0) {
-
-    //       }
-    //     })
-    //     .catch(function (error) {
-    //       console.log(error);
-    //     });
-    }
-  }
+class JudgeDisplay extends Component {
   render() {
-    let { question_title, question_score, question_type, question_choices, standard_answer,
-        question_id, question_number, index, displayCount
-     } = this.props;
-    
-    // const { getFieldDecorator } = this.props.form;
-
-    const isAdmin = this.props.isAdmin()
-    const courseId=this.props.match.params.coursesId;
-    const isEdit = this.isEdit
+    let { question_choices, question_id, index, is_md } = this.props;
     const qNumber = `question_${index}`;
-    // TODO show模式  isNew为false isEdit为false
 
-    // [true, false, true] -> [0, 2] 
-    
-    // const answerTagArray = standard_answer.map((item, index) => { return item == true ? tagArray[index] : -1 }).filter(item => item != -1);
-    let length = 5;
-    const qName = qNameArray[question_type]
-    return(
-        <div className="bor-bottom-greyE padding20-30" id={qNumber} _id={question_id}>
-            <style>{`
+    return (
+      <div className="bor-bottom-greyE padding20-30" id={qNumber} _id={question_id}>
+        <style>{`
               .optionMdEditor {
                 flex: 0 0 800px
               }
@@ -79,28 +24,21 @@ class JudgeDisplay extends Component{
               
             `}</style>
 
-            <QestionDisplayHeader {...this.props}></QestionDisplayHeader>
-            {/* 单选 or 多选 */}
-            <div className="options clearfix">
-                { question_choices.map((item, optionIndex) => {
-                     // 单选
-                    return (
-                        <div key={optionIndex} className="fl mr30 df">
-                            <Radio disabled className="lineh-25" checked={item.standard_boolean}></Radio>
-                            {/* <span>{item.choice_text}</span> */}
-                            <MarkdownToHtml content={item.choice_text} selector={'judge_' + (index + 1) + optionIndex} 
-                                className=""
-                            ></MarkdownToHtml>
-                            {/* <span style={{ display: 'inline-block'}} className="markdown-body"
-                                    dangerouslySetInnerHTML={{__html: markdownToHTML1(item.choice_text)}}></span> */}
-                        </div>)
-                  
-                })}
-                
-            </div>
+        <QestionDisplayHeader {...this.props}></QestionDisplayHeader>
+        <div className="options clearfix">
+          {question_choices.map((item, optionIndex) => {
+            return (
+              <div key={optionIndex} className="fl mr30 df">
+                <Radio disabled className="lineh-25" checked={item.standard_boolean}></Radio>
+                <RenderHtml value={item.choice_text} is_md={is_md} />
+              </div>)
+
+          })}
+
         </div>
-      )
-    }
+      </div>
+    )
+  }
 }
 // RouteHOC()
 export default (JudgeDisplay);
\ No newline at end of file
diff --git a/src/modules/courses/exercise/new/JudgeEditor.js b/src/modules/courses/exercise/new/JudgeEditor.js
index 55c6f5e3..82edcce4 100644
--- a/src/modules/courses/exercise/new/JudgeEditor.js
+++ b/src/modules/courses/exercise/new/JudgeEditor.js
@@ -1,26 +1,15 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
+import { InputNumber, Radio } from 'antd';
+import CustomEditor from "../../../../common/components/custom-editor"
 import axios from 'axios'
-import update from 'immutability-helper'
 import { qNameArray } from './common'
-
-import {getUrl, ActionBtn, DMDEditor} from 'educoder';
-
+import { ActionBtn, validateLength } from 'educoder';
 const RadioGroup = Radio.Group;
 
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
 
-class SingleEditor extends Component{
-  constructor(props){
+class SingleEditor extends Component {
+  constructor(props) {
     super(props);
     /**
       choice_id: 32076
@@ -28,7 +17,7 @@ class SingleEditor extends Component{
       choice_text: "1"
       standard_boolean: true
      */
-    const {question_choices} = this.props;
+    const { question_choices } = this.props;
     let _standard_answers = undefined;
     let _question_choices = undefined;
     if (question_choices) {
@@ -46,34 +35,31 @@ class SingleEditor extends Component{
       question_title: this.props.question_title || '',
       question_type: this.props.question_type || 2,
       question_score: this.props.question_score || this.props.init_question_score,
+      question_title_error: false
     }
   }
-  
+
   onSave = () => {
-    const {question_title, question_score, question_type, question_choices, standard_answers } = this.state;
+    const { question_title, question_score, question_choices, standard_answers } = this.state;
     const { question_id_to_insert_after, question_id } = this.props
     // TODO check
-    const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
-    if(!question_title) {
-      this.refs['titleEditor'].showError()
-      this.props.showNotification('题目：不能为空'); return;
-
+    const answerArray = standard_answers.map((item, index) => { return item == true ? index + 1 : -1 }).filter(item => item != -1);
+    if (!question_title || !validateLength(question_title, 10000)) {
+      this.setState({
+        question_title_error: true
+      })
+      this.props.showNotification(!question_title ? '题目：不能为空' : '题目不能超10000字符！');
+      return;
     }
     const intScore = parseFloat(question_score)
     if (intScore == 0) {
       this.props.showNotification('分值：必须大于0'); return;
-    } else if(!question_score || intScore == NaN) {
+    } else if (!question_score || intScore == NaN) {
       this.props.showNotification('分值：不能为空'); return;
-    } 
-    if(!answerArray || answerArray.length == 0) {
+    }
+    if (!answerArray || answerArray.length == 0) {
       this.props.showNotification('必须设置标准答案'); return;
     }
-    if(!question_title) {
-      this.refs['titleEditor'].showError()
-      this.props.showNotification('题目：不能为空'); return;
-
-    }
-
     /**
         {
     "question_title":"现在在下雨",
@@ -83,7 +69,7 @@ class SingleEditor extends Component{
     "standard_answers":[1]    
 }
     }*/
-    const Id = this.props.match.params.Id  
+    const Id = this.props.match.params.Id
     if (question_id) {
       const editUrl = this.props.getEditQuestionUrl(question_id);
       axios.put(editUrl, {
@@ -94,19 +80,19 @@ class SingleEditor extends Component{
         standard_answers: answerArray,
         insert_id: question_id_to_insert_after || undefined
       }).then((response) => {
-          if (response.data.status == 0) {
-            this.props.addSuccess()
-          }else if(response.data.status == 3){
-            // 已发布试卷编辑保存
-            this.props.changeScore(question_id,answerArray);
-          }
-        })
+        if (response.data.status == 0) {
+          this.props.addSuccess()
+        } else if (response.data.status == 3) {
+          // 已发布试卷编辑保存
+          this.props.changeScore(question_id, answerArray);
+        }
+      })
         .catch(function (error) {
           console.log(error);
         });
     } else {
       const url = this.props.getAddQuestionUrl();
-      
+
       axios.post(url, {
         exercise_bank_id: Id,
         question_title,
@@ -124,13 +110,13 @@ class SingleEditor extends Component{
         .catch(function (error) {
           console.log(error);
         });
-    }  
+    }
   }
   onCancel = () => {
     this.props.onEditorCancel()
   }
   componentDidMount = () => {
-    
+
   }
   onOptionClick = (e) => {
     const value = e.target.value;
@@ -139,42 +125,27 @@ class SingleEditor extends Component{
     } else {
       this.setState({ standard_answers: [false, true] })
     }
-
-    // const { exerciseIsPublish } = this.props;
-    // if (exerciseIsPublish) return;
-    // let standard_answers = this.state.standard_answers.slice(0)
-    // if (standard_answers[index]) return;
-    // standard_answers[index] = !standard_answers[index]
-    // if (index == 0) {
-    //     standard_answers[1] = false
-    // } else {
-    //     standard_answers[0] = false
-    // }
-    // this.setState({ standard_answers })
   }
   on_question_score_change = (e) => {
     this.setState({ question_score: e })
   }
-  
+
+  onSetQuestionTitle = (value) => {
+    this.setState({
+      question_title: value,
+      question_title_error: false
+    })
+  }
+
   render() {
-    let { question_title, question_score, question_type, question_choices, standard_answers,  } = this.state;
-    let { question_id, index, exerciseIsPublish,
-    // question_title, 
-    // question_type, 
-    // question_score,
-        isNew } = this.props;
-    
-    // const { getFieldDecorator } = this.props.form;
-    
-    const isAdmin = this.props.isAdmin()
-    const courseId=this.props.match.params.coursesId;
-    const isEdit = !!this.props.question_id
+    let { question_title, question_score, question_type, standard_answers, question_title_error } = this.state;
+    let { index, exerciseIsPublish, is_md } = this.props;
+
     const qNumber = `question_${index}`;
-    
-    // const answerTagArray = standard_answers.map((item, index) => { return item == true ? tagArray[index] : -1 }).filter(item => item != -1);
-    return(
-        <div className="padding20-30 bor-bottom-greyE" id={qNumber}>
-            <style>{`
+
+    return (
+      <div className="padding20-30 bor-bottom-greyE" id={qNumber}>
+        <style>{`
               .optionMdEditor {
                 flex: 0 0 800px
               }
@@ -182,57 +153,45 @@ class SingleEditor extends Component{
                 margin: 2px;
               }
             `}</style>
-            <p className="mb10 clearfix">
-            {/* {!question_id ? '新建' : '编辑'} */}
-              <span className="color-blue font-16 mr20 fl">{qNameArray[question_type]}</span>
-              <span className="color-grey-9 font-12 fl">（客观题，由系统自动评分，请设置标准答案）</span>
-            </p>
+        <p className="mb10 clearfix">
+          <span className="color-blue font-16 mr20 fl">{qNameArray[question_type]}</span>
+          <span className="color-grey-9 font-12 fl">（客观题，由系统自动评分，请设置标准答案）</span>
+        </p>
 
-            <TPMMDEditor mdID={`question_${question_id}`} placeholder="请您输入题目" height={155} 
-              initValue={question_title} onChange={(val) => this.setState({ question_title: val})}
-              ref="titleEditor"
-            ></TPMMDEditor>
-            
-            <div>
-            <RadioGroup onChange={this.onOptionClick} value={standard_answers[0]}>
-              {/* disabled={exerciseIsPublish} */}
-              <Radio value={true} >正确</Radio>
-              <Radio value={false} >错误</Radio>
-            </RadioGroup>
-            {/* not work */}
-            {/* <Radio value={standard_answers[0]} onClick={() => this.onOptionClick(0)} disabled={exerciseIsPublish}>对</Radio>
-            <Radio value={standard_answers[1]} onClick={() => this.onOptionClick(1)} disabled={exerciseIsPublish}>错</Radio> */}
-            
+        <CustomEditor is_md={is_md} height={is_md ? 155 : 109}
+          placeholder="请您输入题目"
+          value={question_title}
+          isShowEditor={true}
+          isError={question_title_error}
+          autoFocus={true}
+          onChange={this.onSetQuestionTitle}
+        />
 
-              {/* <span class={`judge-item option-item  mr10 color-grey select-choice ${standard_answers[0] ? 
-                  'check-option-bg' : ''} `}
-                  name="option_span" onClick={() => this.onOptionClick(0)}>正确
-              </span>
-              <span class={`judge-item option-item  mr10 color-grey select-choice ${standard_answers[1] ? 
-                  'check-option-bg' : ''} `}
-                  name="option_span" onClick={() => this.onOptionClick(1)}>错误
-              </span> */}
-              {!exerciseIsPublish && <span style={{color: '#FF6800'}}>温馨提示：点击选项，可以直接设置标准答案</span>}
+        <div>
+          <RadioGroup onChange={this.onOptionClick} value={standard_answers[0]}>
+            <Radio value={true} >正确</Radio>
+            <Radio value={false} >错误</Radio>
+          </RadioGroup>
+          {!exerciseIsPublish && <span style={{ color: '#FF6800' }}>温馨提示：点击选项，可以直接设置标准答案</span>}
 
-            </div>
-
-            <div>
-              分值：
-              <InputNumber step={0.1} precision={1} min={0} max={100} style={{width: 100}} value={question_score} onChange={this.on_question_score_change}
-                  disabled={exerciseIsPublish}
-              ></InputNumber> 分
-              
-              <span className="fr">
-                <ActionBtn style="greyBack" className="middle mr20" onClick={this.onCancel}
-                >取消</ActionBtn>
-                <ActionBtn style="blue" className="middle" onClick={this.onSave}>保存</ActionBtn>
-              </span>
-              
-            </div>
-            
         </div>
-      )
-    }
+
+        <div>
+          分值：
+              <InputNumber step={0.1} precision={1} min={0} max={100} style={{ width: 100 }} value={question_score} onChange={this.on_question_score_change}
+            disabled={exerciseIsPublish}
+          ></InputNumber> 分
+
+              <span className="fr">
+            <ActionBtn style="greyBack" className="middle mr20" onClick={this.onCancel}
+            >取消</ActionBtn>
+            <ActionBtn style="blue" className="middle" onClick={this.onSave}>保存</ActionBtn>
+          </span>
+
+        </div>
+
+      </div>
+    )
+  }
 }
-// RouteHOC()
-export default (SingleEditor);
\ No newline at end of file
+export default SingleEditor
\ No newline at end of file
diff --git a/src/modules/courses/exercise/new/MainDisplay.js b/src/modules/courses/exercise/new/MainDisplay.js
index 44a79537..d719ce77 100644
--- a/src/modules/courses/exercise/new/MainDisplay.js
+++ b/src/modules/courses/exercise/new/MainDisplay.js
@@ -1,56 +1,18 @@
-import React,{ Component } from "react";
-
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import axios from 'axios'
-import { qNameArray } from './common'
-import {getUrl, ActionBtn, markdownToHTML, MarkdownToHtml} from 'educoder';
+import React, { Component } from "react";
 import QestionDisplayHeader from './QestionDisplayHeader'
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
-
-const tagArray = [
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 
-    'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 
-    'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
-]
-
-class MainDisplay extends Component{
-  constructor(props){
-    super(props);
+import RenderHtml from "../../../../components/render-html";
 
 
-    this.state = {
-    }
-  }
-  componentDidMount = () => {
-  }
+
+class MainDisplay extends Component {
+
   render() {
-    let { question_title, question_score, question_type, standard_answer,
-        question_id, question_number, index, displayCount
-     } = this.props;
-    
-    // const { getFieldDecorator } = this.props.form;
-
-    const isAdmin = this.props.isAdmin()
-    const courseId=this.props.match.params.coursesId;
-    const isEdit = this.isEdit
+    let { standard_answer, question_id, index, is_md } = this.props;
     const qNumber = `question_${index}`;
-    // TODO show模式  isNew为false isEdit为false
 
-    // [true, false, true] -> [0, 2] 
-    
-    // const answerTagArray = standard_answer.map((item, index) => { return item == true ? tagArray[index] : -1 }).filter(item => item != -1);
-    let length = 5;
-    const qName = qNameArray[question_type]
-    return(
-        <div className="bor-bottom-greyE padding20-30" id={qNumber} _id={question_id}>
-            <style>{`
+    return (
+      <div className="bor-bottom-greyE padding20-30" id={qNumber} _id={question_id}>
+        <style>{`
               .optionMdEditor {
                 flex: 0 0 800px
               }
@@ -63,25 +25,18 @@ class MainDisplay extends Component{
               
             `}</style>
 
-            <QestionDisplayHeader {...this.props}></QestionDisplayHeader>
-            
-            { standard_answer[0] && 
-            <React.Fragment>
-              <div style={{color: '#05101A'}} className="font-16 mb5 font-bd">参考答案：</div>
-              
-              <MarkdownToHtml content={standard_answer[0]} selector={'answer_' + qNumber} 
-                  className=""
-              ></MarkdownToHtml>
-              {/* <div className="mainQuestionDisplay markdown-body" 
-                  dangerouslySetInnerHTML={{__html: markdownToHTML1(standard_answer[0])}}
-              >
-              </div> */}
-            </React.Fragment>            
-            }
+        <QestionDisplayHeader {...this.props}></QestionDisplayHeader>
 
-        </div>
-      )
-    }
+        {standard_answer[0] &&
+          <React.Fragment>
+            <div style={{ color: '#05101A' }} className="font-16 mb5 font-bd">参考答案：</div>
+            <RenderHtml is_md={is_md} value={standard_answer[0]} />
+          </React.Fragment>
+        }
+
+      </div>
+    )
+  }
 }
-// RouteHOC()
+
 export default (MainDisplay);
\ No newline at end of file
diff --git a/src/modules/courses/exercise/new/MainEditor.js b/src/modules/courses/exercise/new/MainEditor.js
index f893166d..56b3df8c 100644
--- a/src/modules/courses/exercise/new/MainEditor.js
+++ b/src/modules/courses/exercise/new/MainEditor.js
@@ -1,23 +1,14 @@
-import React,{ Component } from "react";
+import React, { Component } from "react"
 
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
+import { InputNumber } from 'antd'
+import CustomEditor from "../../../../common/components/custom-editor"
 import axios from 'axios'
-import update from 'immutability-helper'
 import { qNameArray } from './common'
 
-import {getUrl, ActionBtn, DMDEditor} from 'educoder';
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
+import { ActionBtn, validateLength } from 'educoder'
 
-class MainEditor extends Component{
-  constructor(props){
+class MainEditor extends Component {
+  constructor(props) {
     super(props);
     /**
       choice_id: 32076
@@ -25,7 +16,7 @@ class MainEditor extends Component{
       choice_text: "1"
       standard_boolean: true
      */
-    const {standard_answer} = this.props;
+    const { standard_answer } = this.props;
     let _standard_answers = undefined;
     if (standard_answer) {
       _standard_answers = standard_answer
@@ -36,30 +27,31 @@ class MainEditor extends Component{
       question_title: this.props.question_title || '',
       question_type: this.props.question_type || 2,
       question_score: this.props.question_score || this.props.init_question_score,
+      question_title_error: false,
+      standard_answers_error: false
     }
   }
-  
+
   onSave = () => {
-    const {question_title, question_score, question_type, question_choices, standard_answers } = this.state;
+    const { question_title, question_score, standard_answers } = this.state;
     const { question_id_to_insert_after, question_id } = this.props
-    // TODO check
     const answerArray = standard_answers
-    if(!question_title) {
-      this.refs['titleEditor'].showError()
-      this.props.showNotification('题目：不能为空'); return;
-
-
+    if (!question_title || !validateLength(question_title, 10000)) {
+      this.setState({ question_title_error: true })
+      this.props.showNotification(!question_title ? '题目：不能为空' : '题目不能超过10000字符');
+      return;
+    }
+    if (!validateLength(standard_answers[0], 10000)) {
+      this.setState({ standard_answers_error: true })
+      this.props.showNotification('参考答案不能超过10000字符');
+      return;
     }
     const intScore = parseFloat(question_score)
     if (intScore == 0) {
       this.props.showNotification('分值：必须大于0'); return;
-    } else if(!question_score || intScore == NaN) {
+    } else if (!question_score || intScore == NaN) {
       this.props.showNotification('分值：不能为空'); return;
-    } 
-    // if(!answerArray || answerArray.length == 0 || !answerArray[0]) {
-    //   this.props.showNotification('请输入参考答案'); return;
-    // }
-
+    }
     /**
         {
     "question_title":"社会主义核心价值观是？.",
@@ -68,14 +60,13 @@ class MainEditor extends Component{
     "standard_answers":["富强，民主，自由。。。"]
 }
     }*/
-    const Id = this.props.match.params.Id  
+    const Id = this.props.match.params.Id
     if (question_id) {
       const editUrl = this.props.getEditQuestionUrl(question_id);
       axios.put(editUrl, {
         question_title,
         question_type: 4,
         question_score,
-        // question_choices,
         standard_answers: answerArray,
         insert_id: question_id_to_insert_after || undefined
       })
@@ -89,13 +80,12 @@ class MainEditor extends Component{
         });
     } else {
       const url = this.props.getAddQuestionUrl();
-      
+
       axios.post(url, {
         exercise_bank_id: Id,
         question_title,
         question_type: 4,
         question_score,
-        // question_choices,
         standard_answers: answerArray,
         insert_id: question_id_to_insert_after || undefined
       })
@@ -107,37 +97,37 @@ class MainEditor extends Component{
         .catch(function (error) {
           console.log(error);
         });
-    }  
+    }
   }
   onCancel = () => {
     this.props.onEditorCancel()
-  }
-  componentDidMount = () => {
-    
   }
   on_question_score_change = (e) => {
     this.setState({ question_score: e })
   }
-  
-  render() {
-    let { question_title, question_score, question_type, question_choices, standard_answers } = this.state;
-    let { question_id, index, exerciseIsPublish,
-    // question_title, 
-    // question_type, 
-    // question_score,
-        isNew } = this.props;
-    
-    // const { getFieldDecorator } = this.props.form;
 
-    const isAdmin = this.props.isAdmin()
-    const courseId=this.props.match.params.coursesId;
-    const isEdit = !!this.props.question_id
+  onSetQuestionTitle = (value) => {
+    this.setState({
+      question_title: value,
+      question_title_error: false
+    })
+  }
+
+  onSetAnswer = (value) => {
+    this.setState({
+      standard_answers: [value],
+      standard_answers_error: false
+    })
+  }
+
+  render() {
+    let { question_title, question_score, question_type, standard_answers, standard_answers_error, question_title_error } = this.state;
+    let { index, exerciseIsPublish, is_md } = this.props;
     const qNumber = `question_${index}`;
-    
-    // const answerTagArray = standard_answers.map((item, index) => { return item == true ? tagArray[index] : -1 }).filter(item => item != -1);
-    return(
-        <div className="padding20-30 bor-bottom-greyE" id={qNumber}>
-            <style>{`
+
+    return (
+      <div className="padding20-30 bor-bottom-greyE" id={qNumber}>
+        <style>{`
               .optionMdEditor {
                 flex: 0 0 800px
               }
@@ -145,43 +135,55 @@ class MainEditor extends Component{
                 margin: 2px;
               }
             `}</style>
-            <p className="mb10 clearfix">
-              {/*!question_id ? '新建' : '编辑'*/}
-                <span className="color-blue font-16 mr20 fl">{qNameArray[question_type]}</span>
-                <span className="color-grey-9 font-12 fl">（主观题，未作答的情况下自动评为零分）</span>
-            </p>
+        <p className="mb10 clearfix">
+          {/*!question_id ? '新建' : '编辑'*/}
+          <span className="color-blue font-16 mr20 fl">{qNameArray[question_type]}</span>
+          <span className="color-grey-9 font-12 fl">（主观题，未作答的情况下自动评为零分）</span>
+        </p>
 
-            <TPMMDEditor mdID={`question_${question_id}`} placeholder="请您输入题目" height={155} 
-              initValue={question_title} onChange={(val) => this.setState({ question_title: val})}
-              noStorage={true} ref="titleEditor"
-            ></TPMMDEditor>
-            
-            <div>
-                <div className="mb10 font-16">参考答案</div>
-                <TPMMDEditor mdID={`question_answer_${question_id}`} placeholder="请输入参考答案(可选)" height={155} 
-                    initValue={standard_answers[0] || ''} onChange={(val) => this.setState({ standard_answers: [val]})}
-                    noStorage={true}
-                ></TPMMDEditor>
-                {/* <div style={{color: '#999999' }}>温馨提示：[简答题]参考答案仅作为人工评分的参考</div> */}
-            </div>
 
-            <div className="mt10">
-              分值：
-              <InputNumber step={0.1} precision={1} min={0} max={100} style={{width: 100}} value={question_score} onChange={this.on_question_score_change}
-                disabled={exerciseIsPublish}
-              ></InputNumber> 分
-              
-              <span className="fr">
-                <ActionBtn style="greyBack" className="middle mr20" onClick={this.onCancel}
-                >取消</ActionBtn>
-                <ActionBtn style="blue" className="middle" onClick={this.onSave}>保存</ActionBtn>
-              </span>
-              
-            </div>
-            
+        <CustomEditor is_md={is_md} height={is_md ? 155 : 109}
+          placeholder="请您输入题目"
+          value={question_title}
+          isShowEditor={true}
+          md_id='question-editor-1'
+          isError={question_title_error}
+          autoFocus={true}
+          onChange={this.onSetQuestionTitle}
+        />
+
+
+        <div>
+          <div className="mb10 font-16">参考答案</div>
+
+          <CustomEditor is_md={is_md} height={is_md ? 155 : 109}
+            placeholder="请您输入参考答案(可选)"
+            value={standard_answers[0] || ''}
+            md_id='answer-editor'
+            isShowEditor={true}
+            isError={standard_answers_error}
+            autoFocus={true}
+            onChange={this.onSetAnswer}
+          />
         </div>
-      )
-    }
+
+        <div className="mt10">
+          分值：
+              <InputNumber step={0.1} precision={1} min={0} max={100} style={{ width: 100 }} value={question_score} onChange={this.on_question_score_change}
+            disabled={exerciseIsPublish}
+          ></InputNumber> 分
+
+              <span className="fr">
+            <ActionBtn style="greyBack" className="middle mr20" onClick={this.onCancel}
+            >取消</ActionBtn>
+            <ActionBtn style="blue" className="middle" onClick={this.onSave}>保存</ActionBtn>
+          </span>
+
+        </div>
+
+      </div>
+    )
+  }
 }
 // RouteHOC()
 export default (MainEditor);
\ No newline at end of file
diff --git a/src/modules/courses/exercise/new/NullChildEditor.js b/src/modules/courses/exercise/new/NullChildEditor.js
index 5146f05e..be5f2b14 100644
--- a/src/modules/courses/exercise/new/NullChildEditor.js
+++ b/src/modules/courses/exercise/new/NullChildEditor.js
@@ -1,90 +1,55 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
+import { Tooltip, Input } from 'antd';
 
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
-import axios from 'axios'
-import update from 'immutability-helper'
-import { qNameArray } from './common'
+const { TextArea } = Input
 
-import {getUrl, ActionBtn, DMDEditor} from 'educoder';
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
-
-class NullChildEditor extends Component{
-  constructor(props){
-    super(props);
-    
-    this.state = {
-    }
-  }
-  
-  // toMDMode = (that) => {
-  //   if (this.mdReactObject) {
-  //     let mdReactObject = this.mdReactObject;
-  //     this.mdReactObject = null
-  //     if (that != mdReactObject) {
-  //       mdReactObject.toShowMode()
-  //     }
-  //   }
-  //   this.mdReactObject = that;
-  // }
-
-  showError = (itemIndex) => {
-    this.refs[`nullChildDMDEditor${itemIndex}`].showError()
-  }
+class NullChildEditor extends Component {
 
   render() {
-    let { question_title, question_score, question_type, question_choices, standard_answers } = this.state;
-    let { question_id, index, onAnswerChange, addChildAnswer, toMDMode, exerciseIsPublish, 
-        answers } = this.props;
-    // marginTop: '18px'
-    return(
-        <div className="df" style={{ }}>
-            <div className="color-grey-6 mb5 mt6" style={{ flex: '0 0 90px'}}>答案(填空{index + 1}):</div>
-            <div className="df flex1" style={{flexDirection: 'column'}}>
-            {
-                answers.map((item, itemIndex) => {
-                    return <div className="df flex1" >
-                    <div className="flex1" style={{ flex: '0 0 1000px'}}>
-                      <DMDEditor
-                          ref={`nullChildDMDEditor${itemIndex}`}
-                          className={'nullChildEditor'}
-                          placeholder={`请输入参考答案${itemIndex == 0 ?'':'(可选)'}`}
-                          toMDMode={toMDMode} noStorage={true}
-                          mdID={`answer_${index}${itemIndex}`} height={155} 
-                          initValue={item} onChange={(val) => onAnswerChange(index, itemIndex, val)}
-                      ></DMDEditor>
-                    </div>
-                    {!exerciseIsPublish && 
-                    <React.Fragment>
-                      {itemIndex != 0 && <Tooltip title="删除">
-                        <i className="iconfont icon-htmal5icon19 font-18 color-grey-c ml10" 
-                            onClick={() => this.props.deleteChildAnswer(index, itemIndex)}
-                            style={{float: 'right'}}
-                        ></i>
-                      </Tooltip> }
-                      { <Tooltip title={`新增参考答案`}>
-                          <i className="color-green font-16 iconfont icon-roundaddfill ml6"
-                            onClick={() => addChildAnswer(index)}
-                            style={{float: 'right', visibility: itemIndex == answers.length - 1 ? '' : 'hidden', marginTop: '2px'}}
-                          ></i>
-                      </Tooltip>}
-                    </React.Fragment>
-                     }
-                    </div>
-                })
-            }
-              {/* {!exerciseIsPublish && <div className="addAnswerButton" onClick={() => addChildAnswer(index)} >+新增参考答案</div>} */}
-            </div>
+    let { index, onAnswerChange, addChildAnswer, exerciseIsPublish, answers, activeOptionErrorIndex } = this.props;
+    return (
+      <div className="df" >
+        <div className="color-grey-6 mb5 mt6" style={{ flex: '0 0 90px' }}>答案(填空{index + 1}):</div>
+        <div className="df flex1" style={{ flexDirection: 'column' }}>
+          {
+            answers.map((item, itemIndex) => {
+              let cid = `${index}-${itemIndex}`
+              return <div className="df flex1" key={itemIndex} >
+                <div className="flex1" style={{ flex: '0 0 1000px' }}>
+                  <div className={cid === activeOptionErrorIndex ? 'text-area-editor error' : 'text-area-editor'}>
+                    <TextArea rows={4} value={item || ''} defaultValue={`请输入参考答案${itemIndex == 0 ? '' : '(可选)'}`} onChange={
+                      event => onAnswerChange(index, itemIndex, event.target.value)
+                    } />
+                  </div>
+                </div>
+                {!exerciseIsPublish &&
+                  <React.Fragment>
+                    {itemIndex != 0 && <Tooltip title="删除">
+                      <i className="iconfont icon-htmal5icon19 font-18 color-grey-c ml10"
+                        onClick={() => this.props.deleteChildAnswer(index, itemIndex)}
+                        style={{ float: 'right' }}
+                      ></i>
+                    </Tooltip>}
+                    {itemIndex === 0 && <Tooltip title="删除">
+                      <i className="iconfont icon-htmal5icon19 font-18 color-grey-c ml10"
+                        onClick={() => this.props.deleteChildAnswermain(index, itemIndex)}
+                        style={{ float: 'right' }}
+                      ></i>
+                    </Tooltip>}
+                    {<Tooltip title={`新增参考答案`}>
+                      <i className="color-green font-16 iconfont icon-roundaddfill ml6"
+                        onClick={() => addChildAnswer(index)}
+                        style={{ float: 'right', visibility: itemIndex == answers.length - 1 ? '' : 'hidden', marginTop: '2px' }}
+                      ></i>
+                    </Tooltip>}
+                  </React.Fragment>
+                }
+              </div>
+            })
+          }
         </div>
-      )
-    }
+      </div>
+    )
+  }
 }
-// RouteHOC()
-export default (NullChildEditor);
\ No newline at end of file
+export default NullChildEditor;
\ No newline at end of file
diff --git a/src/modules/courses/exercise/new/NullDisplay.js b/src/modules/courses/exercise/new/NullDisplay.js
index f84daf19..67d67f3b 100644
--- a/src/modules/courses/exercise/new/NullDisplay.js
+++ b/src/modules/courses/exercise/new/NullDisplay.js
@@ -1,62 +1,12 @@
-import React,{ Component } from "react";
-
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import axios from 'axios'
-import { qNameArray } from './common'
-import {getUrl, ActionBtn, markdownToHTML, MarkdownToHtml} from 'educoder';
+import React, { Component } from "react";
 import QestionDisplayHeader from './QestionDisplayHeader'
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
-
-const tagArray = [
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 
-    'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 
-    'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
-]
-
-class NullDisplay extends Component{
-  constructor(props){
-    super(props);
 
 
-    this.state = {
-      question_choices: ['', '', '', ''],
-      standard_answers: [false, false, false, false]
-    }
-  }
-  componentDidMount = () => {
-    const Id = this.props.match.params.Id    
-    this.isEdit = !!Id
-    if (Id) {
-      const url = `/exercises/${Id}/edit.json`
-    //   axios.get(url)
-    //     .then((response) => {
-    //       if (response.data.status == 0) {
+class NullDisplay extends Component {
 
-    //       }
-    //     })
-    //     .catch(function (error) {
-    //       console.log(error);
-    //     });
-    }
-  }
   render() {
-    let { question_title, question_score, question_type, question_choices, standard_answer,
-        question_id, question_number, index, displayCount,
-        multi_count
-     } = this.props;
-    
-    // const { getFieldDecorator } = this.props.form;
+    let { standard_answer, question_id, index, } = this.props;
 
-    const isAdmin = this.props.isAdmin()
-    const courseId=this.props.match.params.coursesId;
-    const isEdit = this.isEdit
     const qNumber = `question_${index}`;
     /**
     is_ordered: true
@@ -68,65 +18,23 @@ class NullDisplay extends Component{
     question_type: 3
     standard_answer: [{choice_id: 1, answer_text: ["2", "22"]}]
      */
-    let length = 5;
-    const qName = qNameArray[question_type]
-    return(
-        <div className="bor-bottom-greyE padding20-30" id={qNumber} _id={question_id}>
-            <style>{`
-                .answers {
-                    flex: 1;
-                    display: inline-block;
-                }
-                .answers .answer {
-                    background: #EDEDED;
-                    color: #C5C5C5;
-                    
-                    display: inline-block;
-                    line-height: 16px;
-                    padding:12px 10px;
-                    margin-bottom:10px;
-                    border-radius:2px;
-                    width: 1024px;
-                    word-break: break-all;
-                }
-                .answerRow { 
-                    padding: 1px 0;
-                }
-                .answers .markdown-body > p{
-                    line-height:20px;
-                }
-            `}</style>
 
-            <QestionDisplayHeader {...this.props}></QestionDisplayHeader>
-            {/* <span>答案（填空{index+1}）：</span>
-                        <div className="answers">
-                            { answers.map((item, itemIndex) => {
-                                return <span className="answer" key={itemIndex}>{item}</span>
-                            })}
-                        </div> */}
-            <div className="options">
-                { 
-                    standard_answer.map((answers, _index) => {
-                        return <div className="df answerRow" key={_index}>
-                            <span className="lineh-40">答案（填空{_index+1}）：</span>
-                            <div className="answers">
-                                { answers.answer_text.map((item, itemIndex) => {
-                                    return <MarkdownToHtml 
-                                        className="answer" key={itemIndex}
-                                        content={item} selector={'null_' + (index + 1) + (_index + 1) + (itemIndex + 1)}     
-                                    ></MarkdownToHtml>
-                                })}
-                                {/* <span className="answer" key={itemIndex}>{item}</span> */}
-                            </div>
-                        </div>
-                    })
-                }
-                
-                
-            </div>
+    return (
+      <div className="bor-bottom-greyE padding20-30" id={qNumber} _id={question_id}>
+        <QestionDisplayHeader {...this.props}></QestionDisplayHeader>
+        <div className="options">
+          {
+            standard_answer.map((answers, _index) => {
+              return <div className="answer-row" key={_index}>
+                <span className="lineh-40">答案（填空{_index + 1}）：</span>
+                <div className="answer-pref lineh-40"> {answers.answer_text.map(item => <p className='null-answer-container'>{item}</p>)}</div>
+              </div>
+            })
+          }
         </div>
-      )
-    }
+      </div>
+    )
+  }
 }
 // RouteHOC()
 export default (NullDisplay);
\ No newline at end of file
diff --git a/src/modules/courses/exercise/new/NullEditor.js b/src/modules/courses/exercise/new/NullEditor.js
index dcb31039..b7132116 100644
--- a/src/modules/courses/exercise/new/NullEditor.js
+++ b/src/modules/courses/exercise/new/NullEditor.js
@@ -1,24 +1,15 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
+import { InputNumber, Checkbox } from 'antd';
 import axios from 'axios'
 import update from 'immutability-helper'
 import { qNameArray } from './common'
 import NullMDEditor from './NullMDEditor'
 import NullChildEditor from './NullChildEditor'
-import {getUrl, ActionBtn, DMDEditor} from 'educoder';
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
+import { ActionBtn, validateLength } from 'educoder';
 
-class NullEditor extends Component{
-  constructor(props){
+class NullEditor extends Component {
+  constructor(props) {
     super(props);
     /**
       choice_id: 32076
@@ -28,7 +19,7 @@ class NullEditor extends Component{
       standard_answer: [{choice_id: 1, answer_text: ["2", "22"]}]
 
      */
-    const {question_choices, standard_answer} = this.props;
+    const { standard_answer } = this.props;
     let _standard_answers = undefined;
     if (standard_answer) {
       _standard_answers = []
@@ -38,7 +29,7 @@ class NullEditor extends Component{
         answers.answer_text.forEach((item, itemIndex) => {
           _standard_answers[index].push(item)
         })
-        
+
       })
     }
     this.state = {
@@ -47,65 +38,63 @@ class NullEditor extends Component{
       question_type: this.props.question_type || 3,
       question_score: this.props.question_score || this.props.init_question_score,
       is_ordered: !!this.props.is_ordered,
+
+      activeOptionErrorIndex: null,
+      question_title_error: false
     }
   }
   on_is_ordered_change = (e) => {
-    this.setState({ is_ordered: e.target.checked})
+    this.setState({ is_ordered: e.target.checked })
 
   }
-  
+
   onSave = () => {
-    const {question_title, question_score, question_type, question_choices, standard_answers, is_ordered } = this.state;
-    const { question_id_to_insert_after, question_id } = this.props
+    const { question_title, question_score, question_choices, standard_answers, is_ordered } = this.state;
+    const { question_id_to_insert_after, question_id, is_md, showNotification } = this.props
 
-    let newis_ordered= is_ordered;
+    let newis_ordered = is_ordered;
 
-    if(newis_ordered===true){
-      if(standard_answers.length===1){
-        newis_ordered=false
+    if (newis_ordered === true) {
+      if (standard_answers.length === 1) {
+        newis_ordered = false
       }
     }
     // TODO check
     // const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
     let answerArray = []
-    if(!question_title) {
-      this.refs['titleEditor'].showError()
-      this.props.showNotification('题目：不能为空'); return;
+    if (!question_title || !validateLength(question_title, 10000)) {
+      is_md ? this.refs['titleEditor'].showError() : this.setState({ question_title_error: true })
+      showNotification(!question_title ? '题目：不能为空' : '题目不能超过10000字符'); return;
 
     }
     const intScore = parseFloat(question_score)
     if (intScore == 0) {
-      this.props.showNotification('分值：必须大于0'); return;
-    } else if(!question_score || intScore == NaN) {
-      this.props.showNotification('分值：不能为空'); return;
-    } 
-    
+      showNotification('分值：必须大于0'); return;
+    } else if (!question_score || intScore == NaN) {
+      showNotification('分值：不能为空'); return;
+    }
+
 
     let isEmpty = false;
     standard_answers.forEach((answers, index) => {
       answerArray.push({
         "choice_id": index + 1,
-        "answer_text":[]
+        "answer_text": []
       })
       answers.forEach((item, itemIndex) => {
         answerArray[index].answer_text.push(item)
-        if(!item) {
-          this.refs[`nullChildEditor${index}`].showError(itemIndex)
-          // this.props.showNotification(`请先输入第${index+1}个填空的第${itemIndex+1}参考答案。`); 
-          this.props.showNotification(`答案：不能为空`); 
+        if (!item || !validateLength(item, 10000)) {
+          this.setState({
+            activeOptionErrorIndex: `${index}-${itemIndex}`
+          })
+          showNotification(!item ? `答案：不能为空` : '答案不能超过10000字符');
           isEmpty = true;
         }
       })
     })
-    if (isEmpty  == true) {
+    if (isEmpty == true) {
       return;
     }
-    if(!question_title) {
-      this.refs['titleEditor'].showError()
-      this.props.showNotification('题目：不能为空'); return;
-
-    }
-
     /**
         {
     "question_title":"社会主义核心价值观(),(),()...",
@@ -122,7 +111,7 @@ class NullEditor extends Component{
     "is_ordered":true
 }
     }*/
-    const Id = this.props.match.params.Id  
+    const Id = this.props.match.params.Id
     if (question_id) {
       const editUrl = this.props.getEditQuestionUrl(question_id);
       axios.put(editUrl, {
@@ -132,21 +121,21 @@ class NullEditor extends Component{
         question_choices,
         standard_answers: answerArray,
         insert_id: question_id_to_insert_after || undefined,
-        is_ordered:newis_ordered,
+        is_ordered: newis_ordered,
       }).then((response) => {
-          if (response.data.status == 0) {
-            this.props.addSuccess()
-          }else if(response.data.status == 3){
-            // 已发布试卷编辑保存
-            this.props.changeScore(question_id,answerArray);
-          }
-        })
+        if (response.data.status == 0) {
+          this.props.addSuccess()
+        } else if (response.data.status == 3) {
+          // 已发布试卷编辑保存
+          this.props.changeScore(question_id, answerArray);
+        }
+      })
         .catch(function (error) {
           console.log(error);
         });
     } else {
       const url = this.props.getAddQuestionUrl();
-      
+
       axios.post(url, {
         exercise_bank_id: Id,
         question_title,
@@ -155,7 +144,7 @@ class NullEditor extends Component{
         question_choices,
         standard_answers: answerArray,
         insert_id: question_id_to_insert_after || undefined,
-        is_ordered:newis_ordered,
+        is_ordered: newis_ordered,
       })
         .then((response) => {
           if (response.data.status == 0) {
@@ -165,19 +154,15 @@ class NullEditor extends Component{
         .catch(function (error) {
           console.log(error);
         });
-    }  
+    }
   }
   onCancel = () => {
     this.props.onEditorCancel()
-  }
-  componentDidMount = () => {
-    
   }
   on_question_score_change = (e) => {
     this.setState({ question_score: e })
   }
 
-
   // placeholderCountInRange 被删除的个数
   onPlaceholderChange = (placeholderCountBefore, placeholderCountInRange, totalPlaceholderCount) => {
     const { standard_answers } = this.state;
@@ -186,7 +171,7 @@ class NullEditor extends Component{
       new_standard_answers.splice(placeholderCountBefore, placeholderCountInRange)
     }
     if (totalPlaceholderCount) {
-      for(let i = 0; i < totalPlaceholderCount; i++) {
+      for (let i = 0; i < totalPlaceholderCount; i++) {
         new_standard_answers.splice(placeholderCountBefore + i, 0, [""])
       }
     }
@@ -195,35 +180,56 @@ class NullEditor extends Component{
         this.mdReactObject.toShowMode()
       }
     })
-    
+
   }
-  
+
   onAnswerChange = (index, itemIndex, val) => {
-    if (this.state.standard_answers[index]) {
-    this.setState(
-        (prevState) => ({ 
-          standard_answers : update(prevState.standard_answers
-            , {[index]: {$splice: [[itemIndex, 1, val]]}}),
+    try {
+      this.setState(
+        (prevState) => ({
+          standard_answers: update(prevState.standard_answers
+            , { [index]: { $splice: [[itemIndex, 1, val]] } }),
         })
       )
+      if (this.state.activeOptionErrorIndex === `${index}-${itemIndex}`) {
+        this.setState({ activeOptionErrorIndex: null })
+      }
+    } catch (error) {
+      console.log(error, index, itemIndex, val)
     }
   }
   addChildAnswer = (index) => {
     this.setState(
-        (prevState) => ({
-          standard_answers : update(prevState.standard_answers
-            , {[index]: {$push: ['']}}),
+      (prevState) => ({
+        standard_answers: update(prevState.standard_answers
+          , { [index]: { $push: [''] } }),
+      })
+    )
+  }
+
+  deleteChildAnswermain = (index, childIndex) => {
+    let newstandard_answers = this.state.standard_answers
+
+    this.props.confirm({
+      content: `确认要删除这个参考答案吗？`,
+      onOk: () => {
+        newstandard_answers.splice(index, 1)
+        this.setState({
+          standard_answers: newstandard_answers
         })
-      )
+
+      }
+    })
   }
 
   deleteChildAnswer = (index, childIndex) => {
-    if(!this.state.standard_answers[index][childIndex]) {
+    if (!this.state.standard_answers[index][childIndex]) {
       this.setState(
         (prevState) => ({
-          standard_answers : update(prevState.standard_answers,
-            {[index]:
-                {$splice: [[childIndex, 1]]}
+          standard_answers: update(prevState.standard_answers,
+            {
+              [index]:
+                { $splice: [[childIndex, 1]] }
             }
           )
         })
@@ -235,9 +241,10 @@ class NullEditor extends Component{
       onOk: () => {
         this.setState(
           (prevState) => ({
-            standard_answers : update(prevState.standard_answers,
-              {[index]:
-                  {$splice: [[childIndex, 1]]}
+            standard_answers: update(prevState.standard_answers,
+              {
+                [index]:
+                  { $splice: [[childIndex, 1]] }
               }
             )
           })
@@ -248,38 +255,37 @@ class NullEditor extends Component{
 
   }
 
-  toMDMode = (that) => {
-    if (this.mdReactObject) {
-      let mdReactObject = this.mdReactObject;
-      this.mdReactObject = null
-      if (that != mdReactObject) {
-        mdReactObject.toShowMode()
-      }
-    }
-    this.mdReactObject = that;
+  onSetQuestionTitle = (value, html) => {
+    this.setState({
+      question_title: html,
+      question_title_error: false
+    })
+  }
+  onAddFill = (index) => {
+    const standard_answers = this.state.standard_answers.slice(0)
+    standard_answers.splice(index, 0, [""])
+    this.setState({
+      standard_answers
+    })
   }
-  
-  render() {
-    let { question_title, question_score, question_type, question_choices, standard_answers
-      , is_ordered } = this.state;
-    let { question_id, index, exerciseIsPublish,
-    // question_title, 
-    // question_type, 
-    // question_score,
-        isNew } = this.props;
-    
-    // const { getFieldDecorator } = this.props.form;
 
-    const isAdmin = this.props.isAdmin()
-    const courseId=this.props.match.params.coursesId;
-    const isEdit = !!this.props.question_id
+  onDeleteFill = (index, delCount) => {
+    const standard_answers = this.state.standard_answers.slice(0)
+    standard_answers.splice(index, delCount)
+    this.setState({
+      standard_answers
+    })
+  }
+  render() {
+    let { question_title, question_score, question_type, standard_answers
+      , is_ordered, activeOptionErrorIndex, question_title_error } = this.state;
+    let { question_id, index, exerciseIsPublish, is_md } = this.props;
+
     const qNumber = `question_${index}`;
 
-    // console.log(this.state.showtype)
-    // const answerTagArray = standard_answers.map((item, index) => { return item == true ? tagArray[index] : -1 }).filter(item => item != -1);
-    return(
-        <div className="padding20-30 bor-bottom-greyE" id={qNumber}>
-            <style>{`
+    return (
+      <div className="padding20-30 bor-bottom-greyE" id={qNumber}>
+        <style>{`
               .optionMdEditor {
                 flex: 0 0 800px
               }
@@ -297,68 +303,65 @@ class NullEditor extends Component{
                 maxWidth: 1000px;
               }
             `}</style>
-            <p className="mb10 clearfix">{/*!question_id ? '新建' : '编辑'*/}
-                <span className="color-blue font-16 mr20 fl">{qNameArray[question_type]}</span>
-                <span className="color-grey-9 font-12 fl">（客观题，由系统自动评分，允许手动调分，请设置标准答案 ；支持最多5个空，每空得分按照本题的总分平均计算）</span>
-            </p>
+        <p className="mb10 clearfix">{/*!question_id ? '新建' : '编辑'*/}
+          <span className="color-blue font-16 mr20 fl">{qNameArray[question_type]}</span>
+          <span className="color-grey-9 font-12 fl">（客观题，由系统自动评分，允许手动调分，请设置标准答案 ；支持最多5个空，每空得分按照本题的总分平均计算）</span>
+        </p>
+        {is_md ?
+          <NullMDEditor {...this.props} mdID={`question_${question_id}`} placeholder="请您输入题目" height={155}
+            initValue={question_title} onChange={(val) => this.setState({ question_title: val })}
+            onPlaceholderChange={this.onPlaceholderChange} showNullButton={exerciseIsPublish ? false : true}
+            ref="titleEditor"
+          ></NullMDEditor> : null
 
-            <NullMDEditor {...this.props} mdID={`question_${question_id}`} placeholder="请您输入题目" height={155} 
-              initValue={question_title} onChange={(val) => this.setState({ question_title: val})}
-              onPlaceholderChange={this.onPlaceholderChange} showNullButton={exerciseIsPublish ? false : true}
-              ref="titleEditor"
-            ></NullMDEditor>
-            
-            <div className="clearfix">
-              {
-                standard_answers.map((answers, index) => {
+        }
 
-                  return <NullChildEditor 
-                    ref={`nullChildEditor${index}`}
-                    {...this.props}
-                    toMDMode={this.toMDMode}
-                    answers={answers}
-                    index={index}
-                    onAnswerChange={this.onAnswerChange}
-                    addChildAnswer={this.addChildAnswer}
-                    deleteChildAnswer={this.deleteChildAnswer}
-                  ></NullChildEditor>
-                  // answer.map((item, itemIndex) => {
-                  //   return <DMDEditor
-                  //     toMDMode={this.toMDMode} noStorage={true}
-                  //     mdID={`answer_${index}${itemIndex}`} placeholder="请您输入题目" height={155} watch={false}
-                  //     initValue={item} onChange={(val) => this.onAnswerChange(index, itemIndex, val)}
-                  //   ></DMDEditor>
-                  // })
-                })
-              }
-              
-            </div>
+        <div className="clearfix">
+          {
+            standard_answers.map((answers, index) => {
+
+              return <NullChildEditor key={index}
+                ref={`nullChildEditor${index}`}
+                {...this.props}
+                answers={answers}
+                index={index}
+                is_md={is_md}
+                activeOptionErrorIndex={activeOptionErrorIndex}
+                onAnswerChange={this.onAnswerChange}
+                addChildAnswer={this.addChildAnswer}
+                deleteChildAnswer={this.deleteChildAnswer}
+                deleteChildAnswermain={this.deleteChildAnswermain}
+              ></NullChildEditor>
+            })
+          }
 
-            <div className="clearfix ">
-              {standard_answers.length>1?
-                <span>
-                  <Checkbox checked={is_ordered} onChange={this.on_is_ordered_change} className="color-grey-3">多个填空的答案有顺序要求</Checkbox>
-                  <span className="color-grey-9 font-12">（选中，每个填空的答案顺序必须与参考答案一致）</span></span>
-                :""}
-            </div>
-            <div className="clearfix mt20">
-              分值：
-              <InputNumber step={0.1} precision={1} min={0} max={100} style={{width: 100}} value={question_score} onChange={this.on_question_score_change}
-                disabled={exerciseIsPublish} placeholder="请填写分数"
-              ></InputNumber > 分
-              
-              
-              <span className="fr">
-                <ActionBtn style="greyBack" className="middle mr20" onClick={this.onCancel}
-                >取消</ActionBtn>
-                <ActionBtn style="blue" className="middle" onClick={this.onSave}>保存</ActionBtn>
-              </span>
-              
-            </div>
-            
         </div>
-      )
-    }
+
+        <div className="clearfix ">
+          {standard_answers.length > 1 ?
+            <span>
+              <Checkbox checked={is_ordered} onChange={this.on_is_ordered_change} className="color-grey-3">多个填空的答案有顺序要求</Checkbox>
+              <span className="color-grey-9 font-12">（选中，每个填空的答案顺序必须与参考答案一致）</span></span>
+            : ""}
+        </div>
+        <div className="clearfix mt20">
+          分值：
+              <InputNumber step={0.1} precision={1} min={0} max={100} style={{ width: 100 }} value={question_score} onChange={this.on_question_score_change}
+            disabled={exerciseIsPublish} placeholder="请填写分数"
+          ></InputNumber > 分
+
+
+              <span className="fr">
+            <ActionBtn style="greyBack" className="middle mr20" onClick={this.onCancel}
+            >取消</ActionBtn>
+            <ActionBtn style="blue" className="middle" onClick={this.onSave}>保存</ActionBtn>
+          </span>
+
+        </div>
+
+      </div>
+    )
+  }
 }
 // RouteHOC()
 export default (NullEditor);
\ No newline at end of file
diff --git a/src/modules/courses/exercise/new/NullMDEditor.js b/src/modules/courses/exercise/new/NullMDEditor.js
index d7d93bdd..3912df23 100644
--- a/src/modules/courses/exercise/new/NullMDEditor.js
+++ b/src/modules/courses/exercise/new/NullMDEditor.js
@@ -1,33 +1,8 @@
-import React, {Component} from 'react';
-
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
-
-import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
-
-import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
-// import "antd/dist/antd.css";
-
-import { getImageUrl, toPath, getUrl } from 'educoder';
-
-import axios from 'axios';
-
-
-const $ = window.$;
+import React, {Component} from 'react'
+import TPMMDEditor from '../../../tpm/challengesnew/tpm-md-editor'
 const NULL_CH = '▁'
-// const NULL_CH = '〇'
-// const NULL_CH = '🈳'
 
 export default class NullMDEditor extends Component {
-    constructor(props) {
-        super(props)
-        this.state = {
-            
-        }
-    }
-    componentDidMount = () => {
-        console.log('hhhhhhhhhhhere')
-        
-    }
     getChCountBeforeCursor = (cm, cursor) => {
         const currentLine = cursor.line;
         let placeholderCountBefore = 0
@@ -47,9 +22,7 @@ export default class NullMDEditor extends Component {
         })
 
         if (rangeText && rangeText.indexOf(NULL_CH) != -1) {
-            // TODO 计算range里有几个
             const placeholderCountInRange = rangeText.split(NULL_CH).length - 1;
-            // TODO 计算range之前有几个
             const placeholderCountBefore = this.getChCountBeforeCursor(cm, change.from)
             console.log(`删除${placeholderCountInRange}个， 之前有${placeholderCountBefore}个，新增${totalPlaceholderCount}个`)
 
@@ -62,17 +35,6 @@ export default class NullMDEditor extends Component {
                 change.cancel()
             }
 
-
-            // this.props.confirm({
-            //     content:`确认要删除第${placeholderCountInRange == 1 ? placeholderCountBefore + 1
-            //       : `${placeholderCountBefore + 1}-${placeholderCountBefore + placeholderCountInRange}` }个空吗？`,
-            //     onOk: () => {      this.props.onPlaceholderChange
-            //     && this.props.onPlaceholderChange(placeholderCountBefore, placeholderCountInRange, totalPlaceholderCount)
-            //     },
-            //     onCancel:()=>{
-            //         change.cancel()
-            //     }
-            // })
         } else if (totalPlaceholderCount) {
             const placeholderCountBefore = this.getChCountBeforeCursor(cm, change.from)
 
@@ -84,49 +46,13 @@ export default class NullMDEditor extends Component {
         
     }
 
-    showError = () => {
-      this.refs['nullMDEditor'].showError()
-    }
     render() {
 
-        let {
-            choice_url,
-        } = this.state;
-        let { mdID, className } = this.props;
         return (
             <TPMMDEditor {...this.props}
                 onCMBeforeChange={this.onCMBeforeChange}
-                ref='nullMDEditor'
             >    
             </TPMMDEditor>
         )
     }
-}
-
-
-
-/**
-react_mdEditor_question_0.answers_editormd.cm.on('keydown', (r1, r2, r3)=> { 
-    debugger; 
-    if (r2.keyCode == 8) { 
-        var cur = r1.curOp.cm.getCursor();
-        var curBefore = {line: cur.line, ch:cur.ch-3};
-        var range = r1.curOp.cm.getRange(curBefore, cur);
-            if (range == "〔 〕") {
-            console.log("bingo");
-            r1.curOp.cm.replaceRange("", {line: cur.line, ch:cur.ch-2}, cur);
-        }
-    }
-})
-
-react_mdEditor_question_0.answers_editormd.cm.on('beforeChange', (cm,change) => {
-    debugger;
-    change.cancel();
-
-    react_mdEditor_question_0.answers_editormd.cm.getRange(change.from, change.to)
-    // TODO 计算range里有几个
-    // TODO 计算range之前有几个
-});
-
-
- */
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/modules/courses/exercise/new/QestionDisplayHeader.js b/src/modules/courses/exercise/new/QestionDisplayHeader.js
index c90d87da..4e74ecb0 100644
--- a/src/modules/courses/exercise/new/QestionDisplayHeader.js
+++ b/src/modules/courses/exercise/new/QestionDisplayHeader.js
@@ -1,94 +1,66 @@
-import React,{ Component } from "react";
-
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import axios from 'axios'
+import React, { Component } from "react";
+import { Tooltip } from 'antd';
 import { qNameArray } from './common'
-import {getUrl, ActionBtn, markdownToHTML, MarkdownToHtml} from 'educoder';
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
+import RenderHtml from "../../../../components/render-html";
 
-class QestionDisplayHeader extends Component{
-  constructor(props){
-    super(props);
+class QestionDisplayHeader extends Component {
 
+    render() {
+        let { question_title, question_score, question_type,
+            question_id, index, displayCount, is_md,
+            topRight, showActionButton, exerciseIsPublish
+        } = this.props;
 
-    this.state = {
-        
-    }
-  }
-  componentDidMount = () => {
-      
-  }
-  render() {
-    let { question_title, question_score, question_type, question_choices, standard_answer,
-        question_id, question_number, index, displayCount,
-        topRight, showActionButton, exerciseIsPublish
-     } = this.props;
-     
-    const isAdmin = this.props.isAdmin()
-    const courseId=this.props.match.params.coursesId;
-    const isEdit = this.isEdit
-    const qNumber = `question_${index}`;
-    
-    const qName = qNameArray[question_type]
-    return(
-        <React.Fragment>
-        <div className="new_li">
-            <style>{`
+        const qName = qNameArray[question_type]
+
+        return (
+            <React.Fragment>
+                <div className="new_li">
+                    <style>{`
             .actionBtns {
                 height: 28px
             }
             `}</style>
-            <div className="font-16 fl">
-                <span className="color-blue">{index+1}、{qName}</span>
-                <span className="color-grey-9">（{question_score}分）</span>
-            </div>
-            <div className="fr actionBtns">
-                { topRight }
-                { showActionButton != false && <React.Fragment>
-                    {!exerciseIsPublish && <a className="mr30" onClick={() => this.props.onQestionDelete(question_id)}>
-                        <Tooltip title="删除">
-                            <i className="color-grey-cd font-16 iconfont icon-shanchu"></i>
-                        </Tooltip>
-                    </a>}
-                    {index === 0 ? "" :
-                        <a className="mr30" onClick={() => this.props.onSortUp(index, question_id)}>
-                            <Tooltip title="上移">
-                                <i className="color-green font-18 iconfont icon-xiangshangyi"></i>
-                            </Tooltip>
-                        </a> }
-                    {index === displayCount - 1 ? "" :
-                        <a className="mr30" onClick={() => this.props.onSortDown(index, question_id)}>
-                            <Tooltip title="下移">
-                                <i className="color-green font-18 iconfont icon-xiangxiayi"></i>
-                            </Tooltip>
-                        </a>}
-                    {!exerciseIsPublish &&<a className="mr30" onClick={() => this.props.addQuestion(question_id, question_type)}>
-                        <Tooltip title={`(向下插入${qName})`}>
-                            <i className="color-green font-18 iconfont icon-roundaddfill"></i>
-                        </Tooltip>
-                    </a>}
-                    <a onClick={() => this.props.editQestion(index)}>
-                        <Tooltip title="编辑"><i className="color-green font-18 iconfont icon-bianjidaibeijing"></i></Tooltip>
-                    </a>
-                </React.Fragment>}
-            </div>
-        </div>
-        { question_title && 
-         <MarkdownToHtml content={question_title} selector={'qtitle_' + (index + 1)} style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px' }}
-            
-         ></MarkdownToHtml>
-        //  <div className="markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML1(question_title)}} 
-        // style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px' }}></div>
-          }
-        </React.Fragment>
-      )
+                    <div className="font-16 fl">
+                        <span className="color-blue">{index + 1}、{qName}</span>
+                        <span className="color-grey-9">（{question_score}分）</span>
+                    </div>
+                    <div className="fr actionBtns">
+                        {topRight}
+                        {showActionButton != false && <React.Fragment>
+                            {!exerciseIsPublish && <a className="mr30" onClick={() => this.props.onQestionDelete(question_id)}>
+                                <Tooltip title="删除">
+                                    <i className="color-grey-cd font-16 iconfont icon-shanchu"></i>
+                                </Tooltip>
+                            </a>}
+                            {index === 0 ? "" :
+                                <a className="mr30" onClick={() => this.props.onSortUp(index, question_id)}>
+                                    <Tooltip title="上移">
+                                        <i className="color-green font-18 iconfont icon-xiangshangyi"></i>
+                                    </Tooltip>
+                                </a>}
+                            {index === displayCount - 1 ? "" :
+                                <a className="mr30" onClick={() => this.props.onSortDown(index, question_id)}>
+                                    <Tooltip title="下移">
+                                        <i className="color-green font-18 iconfont icon-xiangxiayi"></i>
+                                    </Tooltip>
+                                </a>}
+                            {!exerciseIsPublish && this.props.question_type != 6 && <a className="mr30" onClick={() => this.props.addQuestion(question_id, question_type)}>
+                                <Tooltip title={`(向下插入${qName})`}>
+                                    <i className="color-green font-18 iconfont icon-roundaddfill"></i>
+                                </Tooltip>
+                            </a>}
+                            <a onClick={() => this.props.editQestion(index, this.props)}>
+                                <Tooltip title="编辑"><i className="color-green font-18 iconfont icon-bianjidaibeijing"></i></Tooltip>
+                            </a>
+                        </React.Fragment>}
+                    </div>
+                </div>
+
+                {question_title ? <RenderHtml is_md={is_md} className='question-title-container' value={question_title} /> : null}
+
+            </React.Fragment>
+        )
     }
 }
 // RouteHOC()
diff --git a/src/modules/courses/exercise/new/ShixunDisplay.js b/src/modules/courses/exercise/new/ShixunDisplay.js
index e26a0079..c73c526d 100644
--- a/src/modules/courses/exercise/new/ShixunDisplay.js
+++ b/src/modules/courses/exercise/new/ShixunDisplay.js
@@ -1,112 +1,79 @@
-import React,{ Component } from "react";
-import {Link} from 'react-router-dom';
-
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import axios from 'axios'
-import { qNameArray } from './common'
-import {getUrl, ActionBtn, markdownToHTML} from 'educoder';
+import React, { Component } from "react";
 import QestionDisplayHeader from './QestionDisplayHeader'
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
+import RenderHtml from "../../../../components/render-html";
 
-const tagArray = [
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 
-    'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 
-    'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
-]
+class ShixunDisplay extends Component {
 
-class ShixunDisplay extends Component{
-  constructor(props){
-    super(props);
+    render() {
+        let { question_title,
+            question_id, index,
 
+            shixun_name, shixun, shixun_identifier, is_md
+        } = this.props;
 
-    this.state = {
-    }
-  }
-  componentDidMount = () => {
-  }
-  render() {
-    let { question_title, question_score, question_type, standard_answer,
-        question_id, question_number, index, displayCount,
+        const qNumber = `question_${index}`;
 
-        shixun_name, shixun, shixun_id, shixun_identifier
-     } = this.props;
-    
-    // const { getFieldDecorator } = this.props.form;
-
-    const isAdmin = this.props.isAdmin()
-    const courseId=this.props.match.params.coursesId;
-    const isEdit = this.isEdit
-    const qNumber = `question_${index}`;
-    // TODO show模式  isNew为false isEdit为false
-
-    /**
-    {                    #实训题
-            "question_id": 7294,
-            "question_number": 3,
-            "question_title": "独立完成数据库知识",
-            "question_type": 5,
-            "exercise_id": 763,
-            "question_score": 35,
-            "shixun_id": 41,
-            "shixun_name": "MySQL数据库编程开发实训（基础篇）",
-            "shixun": [
-                {
-                    "challenge_id": 69,
-                    "challenge_position": 1,
-                    "challenge_name": "数据库连接与数据库实例创建",
-                    "challenge_score": 5
-                },
-                {
-                    "challenge_id": 70,
-                    "challenge_position": 2,
-                    "challenge_name": "数据表的创建",
-                    "challenge_score": 5
-                },
-                {
-                    "challenge_id": 71,
-                    "challenge_position": 3,
-                    "challenge_name": "数据查询操作",
-                    "challenge_score": 5
-                },
-                {
-                    "challenge_id": 72,
-                    "challenge_position": 4,
-                    "challenge_name": "数据库的插入操作",
-                    "challenge_score": 5
-                },
-                {
-                    "challenge_id": 73,
-                    "challenge_position": 5,
-                    "challenge_name": "数据表的删除操作",
-                    "challenge_score": 5
-                },
-                {
-                    "challenge_id": 74,
-                    "challenge_position": 6,
-                    "challenge_name": "数据表的更新操作",
-                    "challenge_score": 5
-                },
-                {
-                    "challenge_id": 75,
-                    "challenge_position": 7,
-                    "challenge_name": "数据库的应用",
-                    "challenge_score": 5
-                }
-            ]
-        }
-     */
-    let length = 5;
-    const qName = qNameArray[question_type]
-    return(
-        <div className="bor-bottom-greyE padding20-30" id={qNumber} _id={question_id}>
-            <style>{`
+        /**
+        {                    #实训题
+                "question_id": 7294,
+                "question_number": 3,
+                "question_title": "独立完成数据库知识",
+                "question_type": 5,
+                "exercise_id": 763,
+                "question_score": 35,
+                "shixun_id": 41,
+                "shixun_name": "MySQL数据库编程开发实训（基础篇）",
+                "shixun": [
+                    {
+                        "challenge_id": 69,
+                        "challenge_position": 1,
+                        "challenge_name": "数据库连接与数据库实例创建",
+                        "challenge_score": 5
+                    },
+                    {
+                        "challenge_id": 70,
+                        "challenge_position": 2,
+                        "challenge_name": "数据表的创建",
+                        "challenge_score": 5
+                    },
+                    {
+                        "challenge_id": 71,
+                        "challenge_position": 3,
+                        "challenge_name": "数据查询操作",
+                        "challenge_score": 5
+                    },
+                    {
+                        "challenge_id": 72,
+                        "challenge_position": 4,
+                        "challenge_name": "数据库的插入操作",
+                        "challenge_score": 5
+                    },
+                    {
+                        "challenge_id": 73,
+                        "challenge_position": 5,
+                        "challenge_name": "数据表的删除操作",
+                        "challenge_score": 5
+                    },
+                    {
+                        "challenge_id": 74,
+                        "challenge_position": 6,
+                        "challenge_name": "数据表的更新操作",
+                        "challenge_score": 5
+                    },
+                    {
+                        "challenge_id": 75,
+                        "challenge_position": 7,
+                        "challenge_name": "数据库的应用",
+                        "challenge_score": 5
+                    }
+                ]
+            }
+         */
+        // let length = 5;
+        // const qName = qNameArray[question_type]
+        return (
+            <div className="bor-bottom-greyE padding20-30" id={qNumber} _id={question_id}>
+                <style>{`
 
               .mainQuestionDisplay {
                 margin-bottom:15px;
@@ -114,28 +81,25 @@ class ShixunDisplay extends Component{
               
             `}</style>
 
-            <QestionDisplayHeader {...this.props} question_title={shixun_name}
-                topRight={
-                    <a target="_blank" href={`/shixuns/${shixun_identifier}/challenges`} className="mr30"
-                        style={{color: '#4CACFF'}}
-                    >实训详情</a>
-                }
-            ></QestionDisplayHeader>
-            
-            {/* <div style={{color: '#05101A', fontWeight: 'bold'}}>参考答案：</div> */}
-            <div className="mainQuestionDisplay color-grey-9 markdown-body" 
-                dangerouslySetInnerHTML={{__html: markdownToHTML(question_title)}}
-            >
-            </div>
+                <QestionDisplayHeader {...this.props} question_title={shixun_name}
+                    topRight={
+                        <a target="_blank" href={`/shixuns/${shixun_identifier}/challenges`} className="mr30"
+                            style={{ color: '#4CACFF' }}
+                        >实训详情</a>
+                    }
+                ></QestionDisplayHeader>
 
-            {shixun.map((ch, index) => {
-                return <div>
-                    {`第${index+1}关`}　{ch.challenge_name}　{ch.challenge_score}分
+
+                <RenderHtml className="mainQuestionDisplay color-grey-9 markdown-body" is_md={is_md} value={question_title} />
+
+                {shixun.map((ch, index) => {
+                    return <div>
+                        {`第${index + 1}关`}　{ch.challenge_name}　{ch.challenge_score}分
                 </div>
-            })}
+                })}
 
-        </div>
-      )
+            </div>
+        )
     }
 }
 // RouteHOC()
diff --git a/src/modules/courses/exercise/new/ShixunEditor.js b/src/modules/courses/exercise/new/ShixunEditor.js
index 6457d256..703ef16b 100644
--- a/src/modules/courses/exercise/new/ShixunEditor.js
+++ b/src/modules/courses/exercise/new/ShixunEditor.js
@@ -1,23 +1,15 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
+import { Input, InputNumber } from 'antd';
+import CustomEditor from "../../../../common/components/custom-editor"
 import axios from 'axios'
 import update from 'immutability-helper'
 import { qNameArray } from './common'
 
-import {getUrl, ActionBtn, DMDEditor} from 'educoder';
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
+import { ActionBtn, validateLength } from 'educoder';
 
-class ShixunEditor extends Component{
-  constructor(props){
+class ShixunEditor extends Component {
+  constructor(props) {
     super(props);
     /**
        {                    #实训题
@@ -77,32 +69,29 @@ class ShixunEditor extends Component{
      */
     const { shixun } = this.props;
     const question_scores = shixun ? shixun.map(item => item.challenge_score) : []
-     
+
     this.state = {
-        
+
       question_title: this.props.question_title || '',
       question_type: this.props.question_type || 2,
       question_scores: question_scores || '0',
       challenges: [],
     }
   }
-  
+
   onSave = () => {
-    const {question_title, question_scores, question_type, shixun_name } = this.state;
+    const { question_title, question_scores, shixun_name } = this.state;
     const { question_id_to_insert_after, question_id
-            , shixun_id } = this.props
-    // TODO check
-
-    // if(!question_title) {
-    //   this.props.showNotification('请先输入实训题完成要求'); return;
-    // }
-    for(let _i = 0; _i < question_scores.length; _i++) {
-        if (!question_scores[_i] || question_scores[_i] == '0') {
-            this.props.showNotification(`第${_i+1}题的分值：必须大于0`); return;
-        }
+      , shixun_id } = this.props
+    for (let _i = 0; _i < question_scores.length; _i++) {
+      if (!question_scores[_i] || question_scores[_i] == '0') {
+        this.props.showNotification(`第${_i + 1}题的分值：必须大于0`); return;
+      }
+    }
+    if (!validateLength(question_title, 10000)) {
+      this.props.showNotification('实训题完成要求不能超过10000字符!');
+      return;
     }
-    
-
     /**
         {
     "question_title":"社会主义核心价值观是？.",
@@ -111,7 +100,7 @@ class ShixunEditor extends Component{
     "shixun_id":555
 }
     }*/
-    const Id = this.props.match.params.Id  
+    const Id = this.props.match.params.Id
     if (question_id) {
       const editUrl = this.props.getEditQuestionUrl(question_id);
       axios.put(editUrl, {
@@ -132,7 +121,7 @@ class ShixunEditor extends Component{
         });
     } else {
       const url = this.props.getAddQuestionUrl();
-      
+
       axios.post(url, {
         exercise_bank_id: Id,
         question_title,
@@ -150,7 +139,7 @@ class ShixunEditor extends Component{
         .catch(function (error) {
           console.log(error);
         });
-    }  
+    }
   }
   onCancel = () => {
     this.props.onEditorCancel()
@@ -158,76 +147,77 @@ class ShixunEditor extends Component{
   componentDidMount = () => {
     const { shixun_id, exercise_url } = this.props;
     // shixun_id
-    const Id = this.props.match.params.Id  
+    const Id = this.props.match.params.Id
     const url = `/${exercise_url || 'exercises'}/${Id}/commit_shixun.json`
     axios.get(url, {
-        params: {
-            shixun_id
-        }
+      params: {
+        shixun_id
+      }
     })
-        .then((response) => {
-          if (response.data.challenges) {
-              /**
-                challenge_counts  
-                shixun_name  shixun_id
-                challenges  [ {challenge_name: "链表节点的初始化"} ]
-               */
-              const question_scores = this.state.question_scores
-              let chLen = response.data.challenges.length;
-              if (chLen == 0) {
-                this.onCancel()
-                this.props.showNotification('这个实训没有关卡，请选择其他实训')
-                this.props.chooseShixunFail && this.props.chooseShixunFail()
-                return
-              }
-              this.props.chooseShixunSuccess && this.props.chooseShixunSuccess()
-
-              // 新建的时候初始化数组
-              // question_scores.length = chLen
-              let newArray = [];
-              if (question_scores && question_scores.length && question_scores[0]) {
-                newArray = question_scores;
-              } else {
-                while(chLen--) {
-                  newArray.push(5)
-                }
-              }
-              this.setState({ ...response.data, question_scores: newArray })
+      .then((response) => {
+        if (response.data.challenges) {
+          /**
+            challenge_counts  
+            shixun_name  shixun_id
+            challenges  [ {challenge_name: "链表节点的初始化"} ]
+           */
+          const question_scores = this.state.question_scores
+          let chLen = response.data.challenges.length;
+          if (chLen == 0) {
+            this.onCancel()
+            this.props.showNotification('这个实训没有关卡，请选择其他实训')
+            this.props.chooseShixunFail && this.props.chooseShixunFail()
+            return
           }
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
+          this.props.chooseShixunSuccess && this.props.chooseShixunSuccess()
+
+          // 新建的时候初始化数组
+          // question_scores.length = chLen
+          let newArray = [];
+          if (question_scores && question_scores.length && question_scores[0]) {
+            newArray = question_scores;
+          } else {
+            while (chLen--) {
+              newArray.push(5)
+            }
+          }
+          this.setState({ ...response.data, question_scores: newArray })
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
   }
   on_question_score_change = (e, index) => {
-    console.log('e.target.value: ', e)
     const value = e
     this.setState(
-        (prevState) => ({ 
-          question_scores : update(prevState.question_scores
-            , {[index]: {$set: value}})
-        })
-      )
+      (prevState) => ({
+        question_scores: update(prevState.question_scores
+          , { [index]: { $set: value } })
+      })
+    )
     // this.setState({ question_score: e })
   }
-  
+
+  onSetQuestionTitle = (value) => {
+    this.setState({
+      question_title: value,
+    })
+  }
   render() {
-    let { question_title, question_score, question_type,
-        shixun_name, challenges, question_scores } = this.state;
-    let { question_id, index, isNew, exerciseIsPublish,} = this.props;
-    
-    if(!challenges || challenges.length == 0) {
+    let { question_title, question_type,
+      shixun_name, challenges, question_scores } = this.state;
+    let { index, is_md, exerciseIsPublish, } = this.props;
+
+    if (!challenges || challenges.length == 0) {
       return ''
     }
-    const isAdmin = this.props.isAdmin()
-    const courseId=this.props.match.params.coursesId;
-    const isEdit = !!question_id
     const qNumber = `question_${index}`;
-    
+
     const blackColor = '#05101A'
-    return(
-        <div className="padding20-30 bor-bottom-greyE" id={qNumber}>
-            <style>{`
+    return (
+      <div className="padding20-30 bor-bottom-greyE" id={qNumber}>
+        <style>{`
               .optionMdEditor {
                 flex: 0 0 800px
               }
@@ -242,54 +232,57 @@ class ShixunEditor extends Component{
                   margin-bottom: 20px;
               }
             `}</style>
-            <p className="mb10 clearfix">
-              {/*!question_id ? '新建' : '编辑'*/}
-                <span className="color-blue font-16 mr20 fl">{qNameArray[question_type]}</span>
-                <span className="color-grey-9 font-12 fl">（客观题，由系统自动评分，允许手动调分）</span>
-            </p>
-            <Input value={shixun_name} onChange={(e) => this.setState({shixun_name: e.target.value})}
-                style={{ marginBottom: '10px'}}
-            ></Input>
-            {/* <div style={{color: blackColor}} className="font-16 mb5">{shixun_name}</div> */}
-            <TPMMDEditor mdID={`question_${question_id}`} placeholder="请输入实训题完成要求" height={155} 
-              initValue={question_title} onChange={(val) => this.setState({ question_title: val})}
-              noStorage={true}
-            ></TPMMDEditor>
-            
-            
-            <div>
-                <div className="df_left_right">
-                    <div className="color-grey-9">关卡</div>
-                    <div className="color-grey-9" style={{ flex: '0 0 76px'}}>分值</div>
-                </div>
-                { challenges.map((challenge, index) => {
-                    return <div className="df_left_right">
-                        <div style={{color: blackColor}} className="lineh-30">
-                            {index+1}.{challenge.challenge_name}
-                        </div>
-              
-                        <div>
-                            <InputNumber step={0.1} precision={1} min={0} max={100} 
-                                    style={{width: 100}} value={question_scores[index]}
-                                    placeholder="请填写分数" disabled={exerciseIsPublish}
-                                    onChange={(e) => this.on_question_score_change(e, index)}></InputNumber> 分
-                        </div>
-                    </div>
-                })}
-            </div>
+        <p className="mb10 clearfix">
+          {/*!question_id ? '新建' : '编辑'*/}
+          <span className="color-blue font-16 mr20 fl">{qNameArray[question_type]}</span>
+          <span className="color-grey-9 font-12 fl">（客观题，由系统自动评分，允许手动调分）</span>
+        </p>
+        <Input value={shixun_name} onChange={(e) => this.setState({ shixun_name: e.target.value })}
+          style={{ marginBottom: '10px' }}
+        ></Input>
 
-            <div style={{ height: '40px', marginTop: '10px' }}>
-              <span className="fr">
-                <ActionBtn style="greyBack" className="middle mr20" onClick={this.onCancel}
-                >取消</ActionBtn>
-                <ActionBtn style="blue" className="middle" onClick={this.onSave}>保存</ActionBtn>
-              </span>
-              
+        <CustomEditor is_md={is_md} height={is_md ? 155 : 109}
+          placeholder="请输入实训题完成要求"
+          value={question_title}
+          isShowEditor={true}
+          isError={false}
+          autoFocus={true}
+          onChange={this.onSetQuestionTitle}
+        />
+
+        <div>
+          <div className="df_left_right">
+            <div className="color-grey-9">关卡</div>
+            <div className="color-grey-9" style={{ flex: '0 0 76px' }}>分值</div>
+          </div>
+          {challenges.map((challenge, index) => {
+            return <div className="df_left_right" key={index}>
+              <div style={{ color: blackColor }} className="lineh-30">
+                {index + 1}.{challenge.challenge_name}
+              </div>
+
+              <div>
+                <InputNumber step={0.1} precision={1} min={0} max={100}
+                  style={{ width: 100 }} value={question_scores[index]}
+                  placeholder="请填写分数" disabled={exerciseIsPublish}
+                  onChange={(e) => this.on_question_score_change(e, index)}></InputNumber> 分
+                        </div>
             </div>
-            
+          })}
         </div>
-      )
-    }
+
+        <div style={{ height: '40px', marginTop: '10px' }}>
+          <span className="fr">
+            <ActionBtn style="greyBack" className="middle mr20" onClick={this.onCancel}
+            >取消</ActionBtn>
+            <ActionBtn style="blue" className="middle" onClick={this.onSave}>保存</ActionBtn>
+          </span>
+
+        </div>
+
+      </div>
+    )
+  }
 }
 // RouteHOC()
 export default (ShixunEditor);
\ No newline at end of file
diff --git a/src/modules/courses/exercise/new/ShixunProgramming.js b/src/modules/courses/exercise/new/ShixunProgramming.js
new file mode 100644
index 00000000..f1a13b51
--- /dev/null
+++ b/src/modules/courses/exercise/new/ShixunProgramming.js
@@ -0,0 +1,94 @@
+import React, { Component } from "react";
+import { InputNumber } from 'antd'
+import { ActionBtn } from 'educoder';
+import QestionDisplayHeader from './QestionDisplayHeader'
+import axios from 'axios'
+import RenderHtml from "../../../../components/render-html";
+
+class ShixunProgramming extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      question_scores: null,
+      edits: false
+    }
+  }
+
+  on_question_score_change = (e, index) => {
+    const value = e
+    this.setState({ question_scores: value, edits: true })
+  }
+  onSave = () => {
+    const { question_scores, edits } = this.state;
+    const { index, question_id, question_score, is_md } = this.props
+    if (edits) {
+      if (!question_scores || question_scores == '0') {
+        this.props.showNotification(`第${index + 1}道编程题调整的分值：必须大于0`);
+        return
+      }
+    } else {
+      if (!question_score || question_score == '0') {
+        this.props.showNotification(`第${index + 1}道编程题调整的分值：必须大于0`);
+        return
+      }
+    }
+
+    const url = `/exercise_questions/${question_id}/update_question_score.json`;
+
+    axios.post(url, {
+      question_score: question_scores ? question_scores : question_score
+    })
+      .then((response) => {
+        if (response.data.status == 0) {
+          this.props.showNotification(`调分成功`);
+          this.props.addSuccess()
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+
+  }
+  render() {
+    let { description, question_title, exerciseIsPublish,
+      question_id, index, is_md, question_score,exercise_status
+    } = this.props;
+    let { question_scores } = this.state;
+    const isAdmin = this.props.isAdmin()
+    const qNumber = `question_${index}`
+
+    return (
+      <div className="bor-bottom-greyE padding20-30" id={qNumber} _id={question_id}>
+        <style>{`
+
+              .mainQuestionDisplay {
+                margin-bottom:15px;
+              }
+              
+            `}</style>
+
+        <QestionDisplayHeader {...this.props} question_title={question_title}
+
+        ></QestionDisplayHeader>
+
+        {description && <RenderHtml value={description} is_md={is_md} />}
+        {exerciseIsPublish && isAdmin && <div className={"mt20"}>
+          分值：
+          <InputNumber step={0.1} precision={1} min={0} max={100} style={{ width: 100 }}
+            value={question_scores ? question_scores : question_score}
+            onChange={this.on_question_score_change}
+            disabled={exercise_status===1===false}
+          ></InputNumber>&nbsp;分
+
+          {exercise_status === 1 ? <span className="fr">
+            <ActionBtn style="blue" className="middle"
+              onClick={this.onSave}
+            >保存</ActionBtn>
+          </span> : ""}
+
+        </div>}
+      </div>
+    )
+  }
+}
+export default ShixunProgramming;
diff --git a/src/modules/courses/exercise/new/SingleDisplay.js b/src/modules/courses/exercise/new/SingleDisplay.js
index 6b84df8c..f7701160 100644
--- a/src/modules/courses/exercise/new/SingleDisplay.js
+++ b/src/modules/courses/exercise/new/SingleDisplay.js
@@ -1,81 +1,26 @@
-import React,{ Component } from "react";
-
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import axios from 'axios'
+import React, { Component } from "react";
+import { Radio, Checkbox } from 'antd';
 import QestionDisplayHeader from './QestionDisplayHeader'
-import {getUrl, ActionBtn, markdownToHTML, MarkdownToHtml} from 'educoder';
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
+import RenderHtml from "../../../../components/render-html";
 
 const tagArray = [
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
-    'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
-    'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
+  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+  'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
+  'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
-const qNameArray = [
-    '单选题',
-    '多选题',
-    '判断题',
-    '填空题',
-    '简答题',
-    '实训题',
-]
-class SingleDisplay extends Component{
-  constructor(props){
-    super(props);
+class SingleDisplay extends Component {
 
-
-    this.state = {
-      question_choices: ['', '', '', ''],
-      standard_answers: [false, false, false, false]
-    }
-  }
-  componentDidMount = () => {
-    const Id = this.props.match.params.Id
-    this.isEdit = !!Id
-    if (Id) {
-      const url = `/exercises/${Id}/edit.json`
-    //   axios.get(url)
-    //     .then((response) => {
-    //       if (response.data.status == 0) {
-
-    //       }
-    //     })
-    //     .catch(function (error) {
-    //       console.log(error);
-    //     });
-    }
-  }
   render() {
-    let { question_title, question_score, question_type, question_choices, standard_answer,
-        question_id, question_number, index, displayCount, showActionButton
-     } = this.props;
+    let { question_type, question_choices,
+      question_id, index, is_md
+    } = this.props;
 
-    // const { getFieldDecorator } = this.props.form;
 
-    const isAdmin = this.props.isAdmin()
-    const courseId=this.props.match.params.coursesId;
-    const isEdit = this.isEdit
     const qNumber = `question_${index}`;
-    // TODO show模式  isNew为false isEdit为false
 
-    // [true, false, true] -> [0, 2]
-
-    // const answerTagArray = standard_answer.map((item, index) => { return item == true ? tagArray[index] : -1 }).filter(item => item != -1);
-    let length = 5;
-    const qName = qNameArray[question_type]
-
-    const isPreviewPage = showActionButton == false
-
-    return(
-        <div className="bor-bottom-greyE padding20-30 singleDisplay" id={qNumber} _id={question_id}>
-            <style>{`
+    return (
+      <div className="bor-bottom-greyE padding20-30 singleDisplay" id={qNumber} _id={question_id}>
+        <style>{`
               .optionMdEditor {
                 flex: 0 0 800px
               }
@@ -87,49 +32,29 @@ class SingleDisplay extends Component{
               }
             `}</style>
 
-            <QestionDisplayHeader {...this.props}></QestionDisplayHeader>
+        <QestionDisplayHeader {...this.props}></QestionDisplayHeader>
 
-            {/* 单选 or 多选 */}
-            <div className="options">
-                { question_choices.map((item, optionIndex) => {
-                  let prefix = undefined
-                  // if (!isPreviewPage) {
-                    prefix = `${tagArray[optionIndex]}.`
-                  // }
-                  if (question_type == 0) { // 单选
-                    return (
-                        <div className="mb10 clearfix " style={{
-													display: "flex",
-													flexDirection:"row",
-												}} key={optionIndex}>
-                            <Radio disabled className="fl lineh-25 w50" checked={item.standard_boolean}>{prefix}</Radio>
-                            <MarkdownToHtml content={item.choice_text} selector={'single_' + (index + 1) + '' + (optionIndex + 1)} style={{ float: 'left', display: 'inline-block' }}
+        {/* 单选 or 多选 */}
+        <div className="options">
+          {question_choices.map((item, optionIndex) => {
+            let prefix = `${tagArray[optionIndex]}.`
+            return (
+              <div className="mb10 clearfix " style={{
+                display: "flex",
+                flexDirection: "row",
+              }} key={optionIndex}>
+                {question_type == 0 ? <Radio disabled className="fl lineh-25 w50" checked={item.standard_boolean}>{prefix}</Radio> : <Checkbox disabled className="fl lineh-25  w50" checked={item.standard_boolean}>{prefix}</Checkbox>}
+                <RenderHtml value={item.choice_text} is_md={is_md} />
 
-                            ></MarkdownToHtml>
-                            {/* <span style={{ display: 'inline-block'}} className="markdown-body fl"
-                                    dangerouslySetInnerHTML={{__html:  markdownToHTML1(item.choice_text)}}></span> */}
-                        </div>)
-                  } else {
+              </div>)
 
-                    return (
-                        <div className="mb10 clearfix" style={{
-													display: "flex",
-													flexDirection:"row",
-												}} key={optionIndex}>
-                            <Checkbox  disabled className="fl lineh-25  w50" checked={item.standard_boolean}>{prefix}</Checkbox>
-                            <MarkdownToHtml content={item.choice_text} selector={'single_' + (index + 1)+ '' + (optionIndex + 1)} style={{ float: 'left', display: 'inline-block' }}
 
-                            ></MarkdownToHtml>
-                            {/* <span style={{ display: 'inline-block'}} className="markdown-body fl"
-                                    dangerouslySetInnerHTML={{__html:  markdownToHTML1(item.choice_text)}}></span> */}
-                        </div>)
-                  }
-                })}
+          })}
 
-            </div>
         </div>
-      )
-    }
+      </div>
+    )
+  }
 }
-// RouteHOC()
+
 export default (SingleDisplay);
diff --git a/src/modules/courses/exercise/new/SingleEditor.js b/src/modules/courses/exercise/new/SingleEditor.js
index 8585e0a8..1f90f544 100644
--- a/src/modules/courses/exercise/new/SingleEditor.js
+++ b/src/modules/courses/exercise/new/SingleEditor.js
@@ -1,28 +1,19 @@
-import React,{ Component } from "react";
+import React, { Component } from "react"
 
-import {
-  Form, Input, InputNumber, Switch, Radio,
-  Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
+import { InputNumber, Tooltip } from 'antd'
 import axios from 'axios'
 import update from 'immutability-helper'
-import {getUrl, ActionBtn, DMDEditor, ConditionToolTip} from 'educoder';
-import QuillForEditor from "../../../../common/quillForEditor";
+import { ActionBtn, ConditionToolTip, validateLength } from 'educoder'
+import CustomEditor from "../../../../common/components/custom-editor"
 
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
 
 const tagArray = [
   'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
   'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
-    'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
+  'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
-class SingleEditor extends Component{
-  constructor(props){
+class SingleEditor extends Component {
+  constructor(props) {
     super(props);
     /**
       choice_id: 32076
@@ -30,7 +21,7 @@ class SingleEditor extends Component{
       choice_text: "1"
       standard_boolean: true
      */
-    const {question_choices} = this.props;
+    const { question_choices } = this.props;
     let _standard_answers = undefined;
     let _question_choices = undefined;
     if (question_choices) {
@@ -48,9 +39,10 @@ class SingleEditor extends Component{
       question_title: this.props.question_title || '',
       question_type: this.props.question_type || 0,
       question_score: this.props.question_score || this.props.init_question_score,
-      choice_editor: 'md',
-      quill_question_title: '',
-      quill_default_title: ''
+
+      activeOptionIndex: null,
+      question_title_error: false,
+      activeOptionErrorIndex: null
     }
   }
   addOption = () => {
@@ -60,25 +52,23 @@ class SingleEditor extends Component{
     this.setState({ question_choices, standard_answers })
   }
   deleteOption = (index) => {
-    let {question_choices}=this.state;
-    if(question_choices[index]===""){
+    let { question_choices } = this.state;
+    if (question_choices[index] === "") {
       // repeat code
-      this.toMDMode(null)
       this.setState(
         (prevState) => ({
-          question_choices : update(prevState.question_choices, {$splice: [[index, 1]]}),
-          standard_answers : update(prevState.standard_answers, {$splice: [[index, 1]]})
+          question_choices: update(prevState.question_choices, { $splice: [[index, 1]] }),
+          standard_answers: update(prevState.standard_answers, { $splice: [[index, 1]] })
         })
       )
-    }else{
+    } else {
       this.props.confirm({
         content: `确认要删除这个选项吗？`,
         onOk: () => {
-          this.toMDMode(null)
           this.setState(
             (prevState) => ({
-              question_choices : update(prevState.question_choices, {$splice: [[index, 1]]}),
-              standard_answers : update(prevState.standard_answers, {$splice: [[index, 1]]})
+              question_choices: update(prevState.question_choices, { $splice: [[index, 1]] }),
+              standard_answers: update(prevState.standard_answers, { $splice: [[index, 1]] })
             })
           )
         }
@@ -86,35 +76,43 @@ class SingleEditor extends Component{
     }
   }
   onSave = () => {
-    const {question_title, question_score, question_type, question_choices, standard_answers } = this.state;
+    const { question_title, question_score, question_choices, standard_answers } = this.state;
     const { question_id_to_insert_after, question_id } = this.props
     // TODO check
-    const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
-    if(!question_title) {
-      this.refs['titleEditor'].showError()
-      this.props.showNotification('题目：不能为空'); return;
-
+    const answerArray = standard_answers.map((item, index) => { return item == true ? index + 1 : -1 }).filter(item => item != -1);
+    if (!question_title) {
+      this.setState({
+        question_title_error: true
+      })
+      this.props.showNotification('题目：不能为空')
+      return
+    }
 
+    if (!validateLength(question_title, 10000)) {
+      this.setState({
+        question_title_error: true
+      })
+      this.props.showNotification('题干不能超过10000字符')
+      return
     }
 
     const intScore = parseFloat(question_score)
     if (intScore == 0) {
       this.props.showNotification('分值：必须大于0'); return;
-    } else if(!question_score || intScore == NaN) {
+    } else if (!question_score || intScore == NaN) {
       this.props.showNotification('分值：不能为空'); return;
     }
-    if(!answerArray || answerArray.length == 0) {
+    if (!answerArray || answerArray.length == 0) {
       this.props.showNotification('请先点击选择本选择题的正确选项'); return;
     }
-    if(!question_title) {
-      this.refs['titleEditor'].showError()
-      this.props.showNotification('题目：不能为空'); return;
-    }
 
-    for(let i = 0; i < question_choices.length; i++) {
-      if (!question_choices[i]) {
-        this.refs[`optionEditor${i}`].showError()
-        this.props.showNotification(`请先输入 ${tagArray[i]} 选项的内容`); return;
+    for (let i = 0; i < question_choices.length; i++) {
+      if (!question_choices[i] || !validateLength(question_choices[i], 5000)) {
+        this.setState({
+          activeOptionErrorIndex: i
+        })
+        this.props.showNotification(!question_choices[i] ? `请先输入 ${tagArray[i]} 选项的内容` : '选项内容不能超过5000字符');
+        return;
       }
     }
     /**
@@ -138,14 +136,14 @@ class SingleEditor extends Component{
       }).then((response) => {
         if (response.data.status == 0) {
           this.props.addSuccess()
-        }else if(response.data.status == 3){
+        } else if (response.data.status == 3) {
           // 已发布试卷编辑保存
-          this.props.changeScore(question_id,answerArray);
+          this.props.changeScore(question_id, answerArray);
         }
       })
-      .catch(function (error) {
-        console.log(error);
-      });
+        .catch(function (error) {
+          console.log(error);
+        });
     } else {
       const url = this.props.getAddQuestionUrl();
 
@@ -174,13 +172,7 @@ class SingleEditor extends Component{
 
 
 
-  componentDidMount = () => {
-
-  }
   onOptionClick = (index) => {
-    // if (this.props.exerciseIsPublish) {
-    //   return;
-    // }
     let standard_answers = this.state.standard_answers.slice(0)
     standard_answers[index] = !standard_answers[index]
     this.setState({ standard_answers })
@@ -188,84 +180,48 @@ class SingleEditor extends Component{
   onOptionContentChange = (value, index) => {
     if (index >= this.state.question_choices.length) {
       // TODO 新建，然后删除CD选项，再输入题干，会调用到这里，且index是3
-      return;
+      return
+    }
+    let question_choices = this.state.question_choices.slice(0)
+    question_choices[index] = value
+    if (this.state.activeOptionErrorIndex === index) {
+      this.setState({ question_choices, activeOptionErrorIndex: null })
+    } else {
+      this.setState({ question_choices })
     }
-    let question_choices = this.state.question_choices.slice(0);
-    question_choices[index] = value;
-    this.setState({ question_choices })
   }
+
   on_question_score_change = (e) => {
     this.setState({ question_score: e })
   }
-  toMDMode = (that) => {
-    if (this.mdReactObject) {
-      let mdReactObject = this.mdReactObject;
-      this.mdReactObject = null
-      mdReactObject.toShowMode()
-    }
-    this.mdReactObject = that;
 
-  }
-  toShowMode = () => {
-
-  }
-
-  // 切换编辑器
-  handleChangeEditor = (e) => {
-    const {quill_question_title} = this.state;
-    const value = e.target.value
-    if (value === 'quill') {
-      const _val = quill_question_title ? JSON.parse(quill_question_title) : '';
-      this.setState({
-        quill_default_title: _val
-      })
-    }
+  onSetQuestionTitle = (value) => {
     this.setState({
-      choice_editor: value
-    });
+      question_title: value,
+      question_title_error: false
+    })
   }
 
-  // quill编辑器内容变化时调用此接口
-  handleCtxChange = (ctx) => {
-    console.log('编辑器内容', ctx);
-    // 保存编辑器内容
+  onActiveOption = (index) => {
     this.setState({
-      quill_question_title: JSON.stringify(ctx)
-    });
+      activeOptionIndex: index
+    })
   }
 
   render() {
-    let { question_title, question_score, question_type, question_choices, standard_answers, choice_editor, quill_default_title } = this.state;
-    let { question_id, index, exerciseIsPublish,
-      // question_title,
-      // question_type,
-    // question_score,
-        isNew } = this.props;
-
-    // const { getFieldDecorator } = this.props.form;
-
-    const isAdmin = this.props.isAdmin()
-    const courseId=this.props.match.params.coursesId;
-    const isEdit = !!this.props.question_id
+    let { question_title, question_score, question_choices, standard_answers, activeOptionIndex, question_title_error, activeOptionErrorIndex } = this.state;
+    let { index, exerciseIsPublish, is_md } = this.props;
     const qNumber = `question_${index}`;
-    // TODO show模式  isNew为false isEdit为false
-
-    // [true, false, true] -> [0, 2]
-
     const answerTagArray = standard_answers.map((item, index) => { return item == true ? tagArray[index] : -1 }).filter(item => item != -1);
-		console.log("xuanzheshijuan");
-		console.log(answerTagArray);
-		console.log(!exerciseIsPublish);
 
-    return(
-        <div className="padding20-30 bor-bottom-greyE signleEditor" id={qNumber}>
-            <style>{`
+    return (
+      <div className="padding20-30 bor-bottom-greyE signleEditor" id={qNumber}>
+        <style>{`
               .optionMdEditor {
                 flex:1
               }
               .optionRow {
                 margin:0px!important;
-                /* margin-bottom: 20px!important; */
               }
               .signleEditor .content_editorMd_show{
                 display: flex;
@@ -277,8 +233,6 @@ class SingleEditor extends Component{
               .editor_area{
                 display: inline-block;
                 float: right;
-                // line-height: 30px;
-                // height: 30px;
               }
               .editor_txt{
                 margin-right: 10px;
@@ -290,103 +244,78 @@ class SingleEditor extends Component{
                 vertical: center;
               }
             `}</style>
-            <p className="mb10 clearfix">
-              {/* {!question_id ? '新建' : '编辑'} */}
-                <span className="color-blue font-16 mr20 fl">选择题</span>
-                <span className="color-grey-9 font-12 fl">（客观题，由系统自动评分，请设置标准答案）</span>
-                {/* <Switch checkedChildren="MD" unCheckedChildren="Quill"></Switch> */}
-                {/* <div className="editor_area">
-                  <span className="editor_txt">切换编辑器:</span>
-                  <Radio.Group style={{ float: 'right' }} value={choice_editor} onChange={this.handleChangeEditor}>
-                    <Radio className="radio_style" value={'md'}>MD</Radio>
-                    <Radio className="radio_style" value={'quill'}>Quill</Radio>
-                  </Radio.Group>
-                </div> */}
-            </p>
+        <p className="mb10 clearfix">
+          <span className="color-blue font-16 mr20 fl">选择题</span>
+          <span className="color-grey-9 font-12 fl">（客观题，由系统自动评分，请设置标准答案）</span>
+        </p>
 
-            {choice_editor === 'md'
-              ? <TPMMDEditor mdID={qNumber} placeholder="请您输入题目" height={155} className="mb20"
-                  initValue={question_title} onChange={(val) => this.setState({ question_title: val})}
-                  ref="titleEditor"
-                ></TPMMDEditor>
+        <CustomEditor is_md={is_md} height={is_md ? 155 : 109}
+          placeholder="请您输入题目"
+          value={question_title}
+          md_id='single-editor-container'
+          isShowEditor={true}
+          isError={question_title_error}
+          autoFocus={true}
+          onChange={this.onSetQuestionTitle}
+        />
 
-              : <QuillForEditor
-                  wrapStyle={{ marginBottom: '35px' }}
-                  style={{ height: '109px' }}
-                  options={['code', 'image', 'formula']}
-                  placeholder="请您输入题目"
-                  value={quill_default_title}
-                  onContentChange={this.handleCtxChange}
-                ></QuillForEditor>
-            }
-
-          {question_choices.map( (item, index) => {
-              const bg = standard_answers[index] ? 'check-option-bg' : ''
-              return <div className="df optionRow " >
-              {/* 点击设置答案 */}
-                {/* TODO 加了tooltip后，会丢失掉span的class */}
-                {/* <Tooltip title={standard_answers[index] ? '点击取消标准答案设置' : '点击设置为标准答案'}> */}
-                  <span class={`option-item fr mr10 color-grey select-choice ${bg} `}
-                      name="option_span" onClick={() => this.onOptionClick(index)} style={{flex: '0 0 38px'}}>
-                      <ConditionToolTip title={standard_answers[index] ? '点击取消标准答案设置' : '点击设置为标准答案'} placement="left" condition={true}>
-                        <div style={{width: '100%', height: '100%'}}>{tagArray[index]}</div>
-                      </ConditionToolTip>
-                  </span>
-                {/* </Tooltip> */}
-                <div style={{ flex: '0 0 1038px'}}>
-                  <DMDEditor
-                  ref={`optionEditor${index}`}
-                  toMDMode={this.toMDMode} toShowMode={this.toShowMode}
-                  height={166} className={'optionMdEditor'} noStorage={true}
-                  mdID={qNumber + index} placeholder="" onChange={(value) => this.onOptionContentChange(value, index)}
-                  initValue={item}
-                ></DMDEditor>
-                </div>
-                {exerciseIsPublish || index===0?
-									<i className=" font-18  ml15 mr20"></i>
-									:<Tooltip title="删除">
-                  <i className="iconfont icon-htmal5icon19 font-18 color-grey-c ml15" onClick={() => this.deleteOption(index)}></i>
-                </Tooltip> }
-                { !exerciseIsPublish && <Tooltip title={`新增参考答案`}>
-                      <i className="color-green font-16 iconfont icon-roundaddfill ml6"
-                        onClick={() => this.addOption()}
-                        style={{float: 'right', visibility: index == question_choices.length - 1 ? '' : 'hidden', marginTop: '2px'}}
-                      ></i>
-                  </Tooltip>}
-
-              </div>
-            }) }
-
-            <div className="mb20">
-              <span
-								style={{color: '#FF6800'}}>{'温馨提示：点击选项输入框可设置答案；选中的选项即为正确答案，选择多个答案即为多选题'}</span>
-              { answerTagArray && !!answerTagArray.length ?
-								<React.Fragment>
-									<span className="fr color-orange">{answerTagArray.join(' ')}</span>
-									<span className="fr">标准答案：</span>
-								</React.Fragment>
-                :
-								""
-              }
+        {question_choices.map((item, index) => {
+          const bg = standard_answers[index] ? 'check-option-bg' : ''
+          return <div className="df optionRow " key={index} >
+            {/* 点击设置答案 */}
+            <span className={`option-item fr mr10 color-grey select-choice ${bg} `}
+              name="option_span" onClick={() => this.onOptionClick(index)} style={{ flex: '0 0 38px' }}>
+              <ConditionToolTip title={standard_answers[index] ? '点击取消标准答案设置' : '点击设置为标准答案'} placement="left" condition={true}>
+                <div style={{ width: '100%', height: '100%' }}>{tagArray[index]}</div>
+              </ConditionToolTip>
+            </span>
+            <div style={{ flex: '0 0 1038px' }}>
+              <CustomEditor md_id={'single-editor' + index} height={is_md ? 155 : 109} is_md={is_md} value={item || ''} placeholder='' isShowEditor={activeOptionIndex === index} className={'optionMdEditor'} index={index} isError={activeOptionErrorIndex === index} onChange={this.onOptionContentChange} onActiveOption={this.onActiveOption} />
             </div>
+            {exerciseIsPublish || index === 0 ?
+              <i className=" font-18  ml15 mr20"></i>
+              : <Tooltip title="删除">
+                <i className="iconfont icon-htmal5icon19 font-18 color-grey-c ml15" onClick={() => this.deleteOption(index)}></i>
+              </Tooltip>}
+            {!exerciseIsPublish && <Tooltip title={`新增参考答案`}>
+              <i className="color-green font-16 iconfont icon-roundaddfill ml6"
+                onClick={() => this.addOption()}
+                style={{ float: 'right', visibility: index == question_choices.length - 1 ? '' : 'hidden', marginTop: '2px' }}
+              ></i>
+            </Tooltip>}
 
-            <div>
-              分值：
-              <InputNumber step={0.1} precision={1} min={0} max={100} style={{width: 100}} value={question_score} onChange={this.on_question_score_change}
-                disabled={exerciseIsPublish}
-              ></InputNumber>&nbsp;分
+          </div>
+        })}
+
+        <div className="mb20">
+          <span
+            style={{ color: '#FF6800' }}>{'温馨提示：点击选项输入框可设置答案；选中的选项即为正确答案，选择多个答案即为多选题'}</span>
+          {answerTagArray && !!answerTagArray.length ?
+            <React.Fragment>
+              <span className="fr color-orange">{answerTagArray.join(' ')}</span>
+              <span className="fr">标准答案：</span>
+            </React.Fragment>
+            :
+            ""
+          }
+        </div>
+
+        <div>
+          分值：
+              <InputNumber step={0.1} precision={1} min={0} max={100} style={{ width: 100 }} value={question_score} onChange={this.on_question_score_change}
+            disabled={exerciseIsPublish}
+          ></InputNumber>&nbsp;分
 
               <span className="fr">
-                <ActionBtn style="greyBack" className="middle mr20" onClick={this.onCancel}
-                >取消</ActionBtn>
-                <ActionBtn style="blue" className="middle" onClick={this.onSave}>保存</ActionBtn>
-              </span>
-
-            </div>
+            <ActionBtn style="greyBack" className="middle mr20" onClick={this.onCancel}
+            >取消</ActionBtn>
+            <ActionBtn style="blue" className="middle" onClick={this.onSave}>保存</ActionBtn>
+          </span>
 
         </div>
-      )
-    }
+
+      </div>
+    )
+  }
 }
-// RouteHOC()
-export default (SingleEditor);
+export default SingleEditor
diff --git a/src/modules/courses/exercise/new/common.css b/src/modules/courses/exercise/new/common.css
index 7e1e2530..db148807 100644
--- a/src/modules/courses/exercise/new/common.css
+++ b/src/modules/courses/exercise/new/common.css
@@ -1,40 +1,77 @@
 .editorWrapDiv {
-    border: 1px solid #4CACFF;
-    padding: 6px 10px;
+  border: 1px solid #4CACFF;
+  padding: 6px 10px;
 }
+
 .questionSection {
-    border-bottom: 1px solid #EAEAEA;
-    padding: 8px 0px;
+  border-bottom: 1px solid #EAEAEA;
+  padding: 8px 0px;
 }
+
 .questionSection:last-child {
-    border-bottom: none;
+  border-bottom: none;
 }
 
 /* 判断题编辑器item样式 */
 .judge-item.option-item {
-    display: inline-block;
-    margin-bottom: 8px;
-    width: 52px;
+  display: inline-block;
+  margin-bottom: 8px;
+  width: 52px;
 }
 
 /* 填空题新增按钮 */
 .addAnswerButton {
-    background: rgba(248,248,248,1);
-    text-align: center;
-    color: #4CACFF;
-    height: 40px;
-    line-height: 40px;
-    cursor: pointer;
+  background: rgba(248, 248, 248, 1);
+  text-align: center;
+  color: #4CACFF;
+  height: 40px;
+  line-height: 40px;
+  cursor: pointer;
 }
+
 .nullChildEditor {
-    width: 100%;
-    display: inline-block;
+  width: 100%;
+  display: inline-block;
 }
 
 .singleDisplay .options .markdown-body {
-    max-width: 1116px;
+  max-width: 1116px;
 }
-.singleDisplay .ant-radio-wrapper span:last-child
-    , .singleDisplay .ant-checkbox-wrapper span:last-child {
-    padding-right: 0px;
+
+.singleDisplay .ant-radio-wrapper span:last-child,
+.singleDisplay .ant-checkbox-wrapper span:last-child {
+  padding-right: 0px;
+}
+
+.text-area-editor .ant-input {
+  height: auto !important;
+}
+
+.question-title-container {
+  margin: 10px 0 15px;
+  width: 100%;
+  font-size: 16px;
+  overflow: hidden;
+}
+
+.answer-row {
+  display: flex;
+  flex-flow: row wrap;
+  align-items: center;
+}
+
+.answer-pref {
+  max-width: 100%;
+  flex: 1 0 auto;
+}
+
+.null-answer-container {
+  display: block;
+  padding: 10px;
+  line-height: 20px;
+  min-height: 40px;
+  width: 100%;
+  background-color: #f5f5f5;
+  cursor: default;
+  margin-bottom: 10px !important;
 }
\ No newline at end of file
diff --git a/src/modules/courses/exercise/new/common.js b/src/modules/courses/exercise/new/common.js
index 7c743119..6510c853 100644
--- a/src/modules/courses/exercise/new/common.js
+++ b/src/modules/courses/exercise/new/common.js
@@ -4,6 +4,7 @@ export const Q_TYPE_JUDGE = 2  // 判断
 export const Q_TYPE_NULL = 3 // 填空
 export const Q_TYPE_MAIN = 4 // 填空
 export const Q_TYPE_SHIXUN = 5  // 实训
+export const Q_TYPE_SHIXUN_BIANCHENG = 6  // 编程题
 
 export const qNameArray = [
     '单选题',
@@ -12,4 +13,5 @@ export const qNameArray = [
     '填空题',
     '简答题',
     '实训题',
+    '编程题'
 ]
\ No newline at end of file
diff --git a/src/modules/courses/exercise/question/Progques.js b/src/modules/courses/exercise/question/Progques.js
new file mode 100644
index 00000000..dee5a765
--- /dev/null
+++ b/src/modules/courses/exercise/question/Progques.js
@@ -0,0 +1,58 @@
+import React, { Component } from "react";
+import ShowProgramming from "./ShowProgramming";
+import RenderHtml from "../../../../components/render-html";
+
+class Progques extends Component {
+
+	render() {
+		let {
+			questionType,
+			exercise,
+			user_exercise_status,
+			is_md
+		} = this.props
+		let item = questionType;
+		let mydescription = item.description
+		return (
+			<div className="pl30 pr30">
+				<style>{`
+          .emptyPanel div#content_editorMd_show{
+            width: 100%;
+            border-radius: 4px;
+            // height: 35px;
+            margin-top:0px;
+            background-color:#fafafa;
+            color:#999;
+            // line-height:25px;
+          }
+          .answerStyle{
+            background:#f5f5f5;
+            border-radius:4px;
+            border: 1px solid #eaeaea;
+            padding:5px;
+            min-height:35px;
+            box-sizing:border-box;
+          }
+          
+           .emptyPanel .ql-editor{
+							overflow: unset !important;
+							 padding:0px  !important;
+					}
+          .emptyPanel .quill_editor_for_react_area{
+          width: 100% !important;
+          }
+        `}</style>
+				<li className="break_word mt15 mb15 pl30 pr30">
+					<RenderHtml style={{ wordBreak: "break-word", fontWeight: "bold" }} value={mydescription} is_md={is_md} />
+				</li>
+				{exercise && ((exercise.student_commit_status && exercise.student_commit_status != 0) || (exercise.user_exercise_status && exercise.user_exercise_status != 0)) ?
+					<ShowProgramming
+						{...this.props}
+						{...this.state}
+						questionType={item}
+					></ShowProgramming> : ""}
+			</div>
+		)
+	}
+}
+export default Progques
diff --git a/src/modules/courses/exercise/question/ShixunProgrDetail.js b/src/modules/courses/exercise/question/ShixunProgrDetail.js
new file mode 100644
index 00000000..e5769b54
--- /dev/null
+++ b/src/modules/courses/exercise/question/ShixunProgrDetail.js
@@ -0,0 +1,91 @@
+import React,{ Component } from "react";
+import {Table} from "antd";
+import { Base64 } from 'js-base64';
+
+class ShixunProgrDetail extends Component{
+  constructor(props){
+    super(props);
+  }
+  render(){
+
+    let { challenge ,questionType}=this.props;
+
+    let columns=[{
+      title: '评测次数',
+      dataIndex: 'number',
+      width:"127px",
+      key: 'number',
+      className:"edu-txt-center",
+      render: (text, record) => (
+        <span>
+          {/*{ record.status===-1?"测试用例结果不匹配":record.status===0?"评测通过":record.status===2?"评测超时":record.status===3?*/}
+          {/*  "创建pod失败":record.status===4?"编译失败":record.status===5?"执行失败":""}*/}
+          {record.key}
+        </span>
+      ),
+    }, {
+      title: '详细信息',
+      dataIndex: 'name',
+      key: 'name',
+      className:challenge && challenge.length > 0 ? "" : "edu-txt-center",
+      render: (text, record) => (
+        <span>
+          { record.error_msg==="--"?"--":Base64.decode(record.error_msg)}
+        </span>
+      ),
+    }];
+
+   let datas=[];
+    // challenge && challenge.length > 0 ? challenge.map((item,key)=>{
+    //     datas.push({
+    //       number: item.position || "--",
+    //       name: item.output_detail || "--"
+    //     })
+    //   })
+    //   :
+    //   datas.push({
+    //     number:"--",
+    //     name:"--"
+    //   })
+   if(questionType.evaluate_codes){
+     if(questionType.evaluate_codes.length>0){
+       questionType.evaluate_codes.map((item,key)=>{
+         item.key=key+1
+         datas.push(item)
+       })
+     }else{
+       datas.push({
+         key:"--",
+         error_msg:"--"
+       })
+     }
+   }else{
+     datas.push({
+       key:"--",
+       error_msg:"--"
+     })
+   }
+    return (
+      <div>
+        <style>{`
+				.ant-table-thead > tr > th{
+				    text-align: center;
+					}
+
+				`}</style>
+        {
+          datas ?
+            <Table
+              bordered
+              dataSource={datas}
+              columns={columns}
+              pagination={false}
+            />:""
+        }
+
+      </div>
+
+    )
+  }
+}
+export default ShixunProgrDetail;
\ No newline at end of file
diff --git a/src/modules/courses/exercise/question/ShowProgramming.js b/src/modules/courses/exercise/question/ShowProgramming.js
new file mode 100644
index 00000000..738483c8
--- /dev/null
+++ b/src/modules/courses/exercise/question/ShowProgramming.js
@@ -0,0 +1,146 @@
+import React,{ Component } from "react";
+import { Base64 } from 'js-base64';
+import {UnControlled as CodeMirror} from 'react-codemirror2';
+import ShixunProgrDetail from './ShixunProgrDetail'
+
+const $ = window.$;
+class ShowProgramming extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      scoreList:[],
+      data:[],
+      challenge:[],
+      dataCopy:[]
+    }
+  }
+
+  componentDidUpdate =(prevState)=>{
+    if(this.props.questionType && !prevState.questionType && prevState.questionType !=this.props.questionType ){
+      this.showInfo();
+    }
+  }
+
+  componentDidMount =()=>{
+    this.showInfo();
+  }
+
+  showInfo=()=>{
+    let data =[];
+
+    let challenge=[];
+    let details = this.props.questionType.shixun_details;
+    if(details){
+      for(var i=0;i<details.length;i++){
+        for(var j=0;j<details[i].stage_list.length;j++){
+          data.push({
+            part:details[i].stage_list[j].position,
+            shixunName:details[i].stage_list[j].name,
+            testCount:details[i].stage_list[j].evaluate_count,
+            endTime:details[i].stage_list[j].finished_time,
+            needTime:details[i].stage_list[j].time_consuming,
+            my_exp:details[i].stage_list[j].myself_experience,
+            total_exp:details[i].stage_list[j].experience,
+            my_score:details[i].stage_list[j].user_score,
+            total_score:details[i].stage_list[j].game_score,
+            input_score:details[i].stage_list[j].user_score,
+            operation:details[i].shixun_detail && details[i].shixun_detail[0].game_identifier,
+            id:details[i].shixun_challenge_id
+          })
+        }
+        if(details[i].shixun_detail){
+          challenge.push(details[i].shixun_detail);
+        }
+      }
+    }
+    this.setState({
+      data:data,
+      dataCopy:data,
+      challenge:challenge
+    })
+    // console.log(challenge);
+  }
+
+
+  scrollToAnchor=(index)=>{
+    let name="challenge_"+index;
+    if (index) {
+      // let anchorElement = document.getElementById(name);
+      // if(anchorElement) { anchorElement.scrollIntoView(); }
+      $("html").animate({ scrollTop: $("#challenge_"+index).offset().top - 150 })
+    }
+  }
+
+  render(){
+    let {
+      questionType ,
+
+    }=this.props
+
+    let isAdmin= this.props.isAdmin();
+    let isStudent = this.props.isStudent();
+
+    return(
+      <div>
+        <style>
+          {`
+            .resetTableStyle .ant-table-tbody > tr > td{
+              padding:10px 5px!important;
+            }
+            .resetCodeMirrorStyle .CodeMirror{
+              height:auto!important;
+            }
+          `}
+        </style>
+
+          <div>
+              <div>
+
+                      <div className="pl15 pr15">
+
+                        <ShixunProgrDetail
+                          {...this.props}
+                          {...this.state}
+                        ></ShixunProgrDetail>
+
+                        {questionType.user_answer.length>0? <div className="font-16 color-dark-21">
+                          <div className="bor-grey-e mt15">
+                            <p className="clearfix pt5 pb5 pl15 pr15 back-f6-grey codebox">
+                              <span className="fl">最近通过的代码</span>
+                              {/*<span className="fr codeboxright">{item[0].path}</span>*/}
+                            </p>
+
+                            <div className="test-code bor-top-greyE">
+                              <li className="clearfix resetCodeMirrorStyle">
+                                <CodeMirror
+                                  value={questionType.user_answer[0]?Base64.decode(questionType.user_answer[0]):""}
+                                  options={{
+                                    // mode: 'xml',
+                                    theme: 'default',
+                                    lineNumbers: true,
+                                    // extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键
+                                    indentUnit: 4, //代码缩进为一个tab的距离
+                                    matchBrackets: true,
+                                    autoRefresh: true,
+                                    smartIndent: true,//智能换行
+                                    styleActiveLine: true,
+                                    lint: true,
+                                    readOnly: "nocursor"
+                                  }}
+                                />
+                              </li>
+                            </div>
+                          </div>
+                        </div>:""}
+                      </div>
+
+              </div>
+
+          </div>
+
+
+      </div>
+    )
+  }
+}
+export default ShowProgramming
\ No newline at end of file
diff --git a/src/modules/courses/exercise/question/fillEmpty.js b/src/modules/courses/exercise/question/fillEmpty.js
index 737fef68..f8cf3c78 100644
--- a/src/modules/courses/exercise/question/fillEmpty.js
+++ b/src/modules/courses/exercise/question/fillEmpty.js
@@ -1,99 +1,79 @@
-import React,{ Component } from "react";
-import {Checkbox,Radio, Input} from "antd";
-import {DMDEditor,markdownToHTML, MarkdownToHtml } from 'educoder'
-
+import React, { Component } from "react";
+import { Input } from "antd";
 import axios from 'axios'
+const { TextArea } = Input
 
-const tagArray = [
-  // 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
-  // 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
-  // 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
-]
-class fillEmpty extends Component{
-  constructor(props){
-      super(props);
-      this.mdRef = React.createRef()
-      let { questionType }=this.props;
-      let array=[];
-      for(var i=0;i < questionType.multi_count; i++){
-        let item="";
-        if(questionType.user_answer.length>0){
-          if(questionType.user_answer[i]){
-            item=questionType.user_answer[i].answer_text;
-          }
+class fillEmpty extends Component {
+  constructor(props) {
+    super(props);
+    let { questionType } = this.props;
+    let array = [];
+    for (var i = 0; i < questionType.multi_count; i++) {
+      let item = "";
+      if (questionType.user_answer.length > 0) {
+        if (questionType.user_answer[i]) {
+          item = questionType.user_answer[i].answer_text;
         }
-        array.push({
-          value:item,
-          q_id:questionType.question_number
-        })
       }
-
-      this.state={
-        array
-      }
-  }
-
-
-  toMDMode = (that) => {
-    // if ( this.mdReactObject) {
-    //   let mdReactObject = this.mdReactObject;
-    //   this.mdReactObject = null
-    //   mdReactObject.toShowMode()
-    // }
-    this.mdReactObject = that;
+      array.push({
+        value: item,
+        q_id: questionType.question_number
+      })
+    }
+    this.state = {
+      array
+    }
   }
 
   onOptionContentChange = (value, index) => {
-    let array  = this.state.array.slice(0);    
+    let array = this.state.array.slice(0);
     array[index].value = value;
     this.setState({ array })
   }
 
-  onBlurEmpty=(index,number)=>{
-    let array  = this.state.array.slice(0);    
-    let v=array[index].value;
-    let question_id=this.props.questionType.question_id;
-    let  url=`/exercise_questions/${question_id}/exercise_answers.json`
-    axios.post((url),{
-      exercise_choice_id:parseInt(index)+1,
-      answer_text:v
-    }).then((result)=>{
-      if(result.status==200){
-        //this.refs[`md${number}${index}`].toShowMode();
-        let count=0;
-        for(var i=0;i<array.length;i++){
-          if(array[i].value ==""){ count++; }
+  onBlurEmpty = (index, number, event) => {
+    let { questionType, changeQuestionStatus } = this.props
+    let array = this.state.array.slice(0);
+    let v = event.target.value;
+    let question_id = questionType.question_id;
+    let url = `/exercise_questions/${question_id}/exercise_answers.json`
+    axios.post((url), {
+      exercise_choice_id: parseInt(index) + 1,
+      answer_text: v
+    }).then((result) => {
+      if (result.status == 200) {
+        let count = 0;
+        for (var i = 0; i < array.length; i++) {
+          if (array[i].value == "") { count++; }
         }
-        let k = count==array.length ? 0 : 1;
-        this.props.changeQuestionStatus && this.props.changeQuestionStatus(parseInt(this.props.questionType.q_position)-1,k);
+        let k = count == array.length ? 0 : 1;
+        changeQuestionStatus && changeQuestionStatus(parseInt(questionType.q_position) - 1, k);
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
 
-  render(){
-    let { 
-      questionType , 
-      exercise ,
+  render() {
+    let {
+      questionType,
       user_exercise_status,
-    }=this.props
+    } = this.props
     let {
       array
-    }=this.state
-    let isAdmin = this.props.isAdmin();
-    let isStudent = this.props.isStudent();
-    return(
+    } = this.state
+
+    return (
       <div className="pl30 pr30">
         <style>{`
           .emptyPanel div#content_editorMd_show{
             width: 100%;
             border-radius: 4px;
-            height: 35px;
+            // height: 35px;
             margin-top:0px;
             background-color:#fafafa;
             color:#999;
-            line-height:25px;
+            // line-height:25px;
           }
           .answerStyle{
             background:#f5f5f5;
@@ -103,58 +83,69 @@ class fillEmpty extends Component{
             min-height:35px;
             box-sizing:border-box;
           }
+          .pd10{
+           padding: 10px;
+          }
+          .min40{
+           min-height:40px;
+          }
         `}</style>
         {
-          array.map((item,key)=>{
-            return(
+          array.map((item, key) => {
+            return (
               <li className="df mb10 emptyPanel">
-                <span className="mr10 lineh-35 font-16">答案（填空{key+1}）:</span>
-                <div className="flex1" style={{width:"0"}}>
+                <span className="mr10 lineh-35 font-16">答案（填空{key + 1}）:</span>
                 {
-                  user_exercise_status == 1 ? 
-                  <input value={item.value} className="input-100-35" style={{backgroundColor: "#F5F5F5",cursor:"default"}} placeholder={ isStudent && item.value ? `请输入填空${key+1}的答案` : "" } readOnly/>
-                  :
-                  <DMDEditor 
-                    ref={`md${questionType.q_position}${key}`}
-                    toMDMode={this.toMDMode} toShowMode={this.toShowMode}
-                    height={150} className={'optionMdEditor'} watch={false} noStorage={true}
-                    mdID={questionType.question_id +"_"+ key} placeholder={`输入填空${key+1}的答案`} onChange={(value) => this.onOptionContentChange(value, key)}
-                    initValue={item.value} onCMBlur={()=>this.onBlurEmpty(key,questionType.q_position)}
-                  ></DMDEditor>
+                  user_exercise_status == 1 ? <div className="flex1  lineh-40 new_li">
+                    <p key={key}
+                      style={{ backgroundColor: "#F5F5F5" }}
+                      className="new_li  answers lineh-40 pd10 min40 newcontent_editorMd_show" >
+                      {item.value}
+                    </p>
+                  </div>
+                    :
+                    <div className="flex1">
+                      <div className='text-area-editor' >
+                        <TextArea rows={4} value={item.value} defaultValue={`输入填空${key + 1}的答案`} onBlur={(event) => this.onBlurEmpty(key, questionType.q_position, event)} onChange={
+                          event => this.onOptionContentChange(event.target.value, key)
+                        } />
+                      </div>
+                    </div>
                 }
-                </div>
+
               </li>
             )
           })
         }
         {
           // 答案公开，且试卷已经截止
-          questionType.standard_answer && 
+          questionType.standard_answer &&
           <div>
             <p className="bor-top-greyE pt20 mt20 font-16 mb10">参考答案：</p>
-            { questionType.standard_answer && questionType.standard_answer.map((item,k)=>{
-                return(
-                  <ul className="df font-16">
-                    <span className="mr10">答案（填空{k+1}）:</span>
-                    <li className="flex1">
-                      {
-                        item.answer_text && item.answer_text.map((i,index)=>{
-                          return(
-                            <MarkdownToHtml content={i} selector={'empty_' + (this.props.index + 1) +(k + 1) + (index + 1)}
-                              className="standardAnswer answerStyle mb10"                                
-                            ></MarkdownToHtml>
-                            // <div className="standardAnswer markdown-body answerStyle mb10" dangerouslySetInnerHTML={{__html: markdownToHTML1(i)}}></div>
-                          )
-                        })
-                      }
-                    </li>
-                  </ul>
-                )
-              })
+            {questionType.standard_answer && questionType.standard_answer.map((item, k) => {
+              return (
+                <ul className="df font-16">
+                  <span className="mr10">答案（填空{k + 1}）:</span>
+                  <li className="flex1 answers lineh-40 new_li">
+                    {
+                      item.answer_text && item.answer_text.map((i, index) => {
+                        return (
+                          <p key={index}
+                            style={{ backgroundColor: "#F5F5F5" }}
+                            className="new_li  answers lineh-40 pd10 min40 newcontent_editorMd_show" >
+                            {i}
+                          </p>
+                        )
+                      })
+                    }
+                  </li>
+                </ul>
+              )
+            })
             }
           </div>
         }
-        
+
       </div>
     )
   }
diff --git a/src/modules/courses/exercise/question/multiple.js b/src/modules/courses/exercise/question/multiple.js
index 2e1023fa..a1a5ac15 100644
--- a/src/modules/courses/exercise/question/multiple.js
+++ b/src/modules/courses/exercise/question/multiple.js
@@ -1,61 +1,74 @@
-import React,{ Component } from "react";
-import {Checkbox,Radio, Input} from "antd";
-import {markdownToHTML, MarkdownToHtml} from 'educoder'
+import React, { Component } from "react";
+import { Checkbox } from "antd";
 
 import axios from 'axios'
+import RenderHtml from "../../../../components/render-html";
 const tagArray = [
   'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
   'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
   'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
-class Multiple extends Component{
-  constructor(props){
-      super(props);
+class Multiple extends Component {
+  constructor(props) {
+    super(props);
   }
-  saveId=(value)=>{
-    let question_id=this.props.questionType.question_id;
-    let url=`/exercise_questions/${question_id}/exercise_answers.json`;
-    let {index}=this.props;
-    axios.post((url),{
-      exercise_choice_id:value
-    }).then((result)=>{
-      if(result.status==200){
-        let k=0;
-        if(value.length > 0 ){
-          k=1;
-        }else{
-          k=0;
+  saveId = (value) => {
+    let question_id = this.props.questionType.question_id;
+    let url = `/exercise_questions/${question_id}/exercise_answers.json`;
+    let { index } = this.props;
+    axios.post((url), {
+      exercise_choice_id: value
+    }).then((result) => {
+      if (result.status == 200) {
+        let k = 0;
+        if (value.length > 0) {
+          k = 1;
+        } else {
+          k = 0;
         }
-        this.props.changeOption && this.props.changeOption(index,value);
-        this.props.changeQuestionStatus && this.props.changeQuestionStatus(parseInt(this.props.questionType.q_position)-1,k);
+        this.props.changeOption && this.props.changeOption(index, value);
+        this.props.changeQuestionStatus && this.props.changeQuestionStatus(parseInt(this.props.questionType.q_position) - 1, k);
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
-  
-  render(){
-    let { 
-      questionType , 
-      exercise,
-      user_exercise_status
-    }=this.props
-    let isStudent =this.props.isStudent();
-    console.log(questionType);
-    return(
-      <div className="pl30 pr30 singleDisplay">
-        <Checkbox.Group className="with100" disabled={ user_exercise_status == 1 ? true : false } onChange={this.saveId} value={questionType.user_answer}>
-          {
-            questionType.question_choices && questionType.question_choices.map((item,key)=>{
-              let prefix = `${tagArray[key]}.`
 
-              return(
+  render() {
+    let {
+      questionType,
+      exercise,
+      user_exercise_status,
+      is_md
+    } = this.props
+    let isStudent = this.props.isStudent();
+
+    return (
+      <div className="pl30 pr30 singleDisplay">
+        <style>
+          {
+            `
+						.multiple .ql-editor {
+							overflow: unset !important;
+						  padding:0px  !important;
+							}
+						.multiple .ql-editor p{
+							line-height: 25px !important;
+							}
+						`
+          }
+        </style>
+        <Checkbox.Group className="with100" disabled={user_exercise_status == 1 ? true : false} onChange={this.saveId} value={questionType.user_answer}>
+          {
+            questionType.question_choices && questionType.question_choices.map((item, key) => {
+              let prefix = `${tagArray[key]}.`
+              let titename = item.choice_text;
+
+              return (
                 <p className="clearfix mb15 df">
-                  <Checkbox className="lineh-15 df mr8 setRadioStyle" value={item.choice_id}>
+                  <Checkbox className="lineh-15 df mr8 setRadioStyle multiple" value={item.choice_id}>
                     <span className="fl mr3 lineh-25">{prefix}</span>
-                    <MarkdownToHtml content={item.choice_text} selector={'multiple_' + (this.props.index + 1) + (key + 1)}
-                      className="flex1" style={{display:"inline-block"}}                              
-                    ></MarkdownToHtml>
+                    <RenderHtml className="flex1" style={{ display: "inline-block" }} value={titename} is_md={is_md} />
                   </Checkbox>
                 </p>
               )
@@ -64,13 +77,13 @@ class Multiple extends Component{
         </Checkbox.Group>
         {
           // 答案公开，且试卷已经截止
-          isStudent && exercise && exercise.answer_open==true && exercise.exercise_status == 3 && 
+          isStudent && exercise && exercise.answer_open == true && exercise.exercise_status == 3 &&
           <p className="bor-top-greyE pt20 mt10 font-16">参考答案：
-            {questionType.standard_answer.map((i,k)=>{
-                return(
-                  <span value={k}>{tagArray[parseInt(i)-1]}</span>
-                )
-              })
+            {questionType.standard_answer.map((i, k) => {
+            return (
+              <span value={k}>{tagArray[parseInt(i) - 1]}</span>
+            )
+          })
             }
           </p>
         }
@@ -78,4 +91,4 @@ class Multiple extends Component{
     )
   }
 }
-export default Multiple
\ No newline at end of file
+export default Multiple
diff --git a/src/modules/courses/exercise/question/shixunAnswer.js b/src/modules/courses/exercise/question/shixunAnswer.js
index cdffe08b..1d6d3ff0 100644
--- a/src/modules/courses/exercise/question/shixunAnswer.js
+++ b/src/modules/courses/exercise/question/shixunAnswer.js
@@ -1,290 +1,243 @@
-import React,{ Component } from "react";
-import {InputNumber,Table} from "antd";
-import TPMMDEditor from '../../../../modules/tpm/challengesnew/TPMMDEditor'
-import {Link} from 'react-router-dom';
-import {UnControlled as CodeMirror} from 'react-codemirror2';
+import React, { Component } from "react";
+import { InputNumber, Table, Tooltip } from "antd";
+import { Link } from 'react-router-dom';
+import { UnControlled as CodeMirror } from 'react-codemirror2';
 
 import axios from 'axios'
 
 import update from 'immutability-helper'
 
-import {markdownToHTML} from 'educoder'
 import ShixunAnswerDetail from './shixunAnswerDetail'
+import RenderHtml from "../../../../components/render-html";
 
 const $ = window.$;
-class shixunAnswer extends Component{
-  constructor(props){
-      super(props);
-      this.state={
-        scoreList:[],
-        data:[],
-        challenge:[],
-        dataCopy:[]
-      }
+class shixunAnswer extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      scoreList: [],
+      data: [],
+      challenge: [],
+      dataCopy: []
+    }
   }
 
-  componentDidUpdate =(prevState)=>{
-    if(this.props.questionType && !prevState.questionType && prevState.questionType !=this.props.questionType ){
+  componentDidUpdate = (prevState) => {
+    if (this.props.questionType && !prevState.questionType && prevState.questionType != this.props.questionType) {
       this.showInfo();
     }
   }
 
-  componentDidMount =()=>{
+  componentDidMount = () => {
     this.showInfo();
   }
 
-  showInfo=()=>{
-    let data =[];
-    // let details=[{
-    //   "shixun_challenge_id": 16,
-    //   "stage_list": {
-    //     "position": 1,
-    //     "name": "链表节点的初始化",
-    //     "evaluate_count": 0,
-    //     "finished_time": 0,
-    //     "time_consuming": 0,
-    //     "myself_experience": 0,
-    //     "experience": 0,
-    //     "user_score": 0,
-    //     "game_score": 15
-    //   },
-    //   "shixun_detail": [{
-    //     "position": 1,
-    //     "game_identifier": "kpb4fygmeo8h",
-    //     "path": "src/step1/charIO.cpp",
-    //     "st": 0,
-    //     "name": "重要的事情说三遍",
-    //     "outputs": [
-    //         {
-    //             "position": 1,
-    //             "output_detail": "compile successfully"
-    //         }
-    //     ],
-    //     "passed_code": "// 包含标准输入输出函数库\n#include <stdio.h>\n\n// 定义main函数\nint main()\n{\n    // 请在此添加‘重要的事情说三遍’的代码\n    /********** Begin *********/\n    char x = getchar();\n    putchar(x);\n    putchar(x);\n    putchar(x);\n    putchar('!');\n\n    /********** End **********/\n    return 0;\n}\n"
-    //   }]
-    //   },{
-    //   "shixun_challenge_id": 16,
-    //   "stage_list": {
-    //       "position": 1,
-    //       "name": "重要的事情说三遍",
-    //       "evaluate_count": 1,
-    //       "finished_time": "2017-10-25 08:54",
-    //       "time_consuming": "29天 18小时 15分钟 50秒",
-    //       "myself_experience": 100,
-    //       "experience": 100,
-    //       "user_score": 5,
-    //       "game_score": 5
-    //     },
-    //     "shixun_detail": [{
-    //       "position": 2,
-    //       "game_identifier": "kpb4fygmeo8h",
-    //       "path": "src/step1/charIO.cpp",
-    //       "st": 0,
-    //       "name": "重要的事情说三遍",
-    //       "outputs": [
-    //           {
-    //               "position": 1,
-    //               "output_detail": "compile successfully"
-    //           }
-    //       ],
-    //       "passed_code": "// 包含标准输入输出函数库\n#include <stdio.h>\n\n// 定义main函数\nint main()\n{\n    // 请在此添加‘重要的事情说三遍’的代码\n    /********** Begin *********/\n    char x = getchar();\n    putchar(x);\n    putchar(x);\n    putchar(x);\n    putchar('!');\n\n    /********** End **********/\n    return 0;\n}\n"
-    //     }]
-    //   }];
-    let challenge=[];
+  showInfo = () => {
+    let data = [];
+    let challenge = [];
     let details = this.props.questionType.shixun_details;
-    if(details){
-      for(var i=0;i<details.length;i++){
-        for(var j=0;j<details[i].stage_list.length;j++){
+    if (details) {
+      for (let i = 0; i < details.length; i++) {
+        for (let j = 0; j < details[i].stage_list.length; j++) {
+          let item = details[i].stage_list[j]
           data.push({
-            part:details[i].stage_list[j].position,
-            shixunName:details[i].stage_list[j].name,
-            testCount:details[i].stage_list[j].evaluate_count,
-            endTime:details[i].stage_list[j].finished_time,
-            needTime:details[i].stage_list[j].time_consuming,
-            my_exp:details[i].stage_list[j].myself_experience,
-            total_exp:details[i].stage_list[j].experience,
-            my_score:details[i].stage_list[j].user_score,
-            total_score:details[i].stage_list[j].game_score,
-            input_score:details[i].stage_list[j].user_score,
-            operation:details[i].shixun_detail && details[i].shixun_detail[0].game_identifier,
-            id:details[i].shixun_challenge_id
-          })  
+            part: item.position,
+            shixunName: item.name,
+            testCount: item.evaluate_count,
+            endTime: item.finished_time,
+            needTime: item.time_consuming,
+            view_answer: item.view_answer,
+            my_exp: item.myself_experience,
+            total_exp: item.experience,
+            my_score: item.user_score,
+            total_score: item.game_score,
+            input_score: item.user_score,
+            operation: details[i].shixun_detail && details[i].shixun_detail[0].game_identifier,
+            id: details[i].shixun_challenge_id
+          })
         }
-        if(details[i].shixun_detail){
+        if (details[i].shixun_detail) {
           challenge.push(details[i].shixun_detail);
         }
       }
     }
     this.setState({
-      data:data,
-      dataCopy:data,
-      challenge:challenge
+      data: data,
+      dataCopy: data,
+      challenge: challenge
     })
-    // console.log(challenge);
   }
 
-  changeThis=(value,index)=>{
+  changeThis = (value, index) => {
     this.setState(
-      (prevState) => ({ 
-        data : update(prevState.data, {[index]: { input_score: {$set: value} }})
+      (prevState) => ({
+        data: update(prevState.data, { [index]: { input_score: { $set: value } } })
       })
     )
   }
 
-  changeThisScore=(e,c_id,key)=>{
-    let url=`/exercise_questions/${this.props.questionType.question_id}/adjust_score.json`
-    
+  changeThisScore = (e, c_id, key) => {
+    let url = `/exercise_questions/${this.props.questionType.question_id}/adjust_score.json`
+    let value = e.target.value
+
     const list = Object.assign({}, this.state.dataCopy[key])
-    // console.log("111111111111111111111111");
-    // console.log(this.props);
-    // 调分值为0，且和第一次的数据相同则不修改
-    if(parseInt(e.target.value)==parseInt(list.my_score)){
+    if (parseInt(value) == parseInt(list.my_score)) {
       return;
     }
-    axios.post((url),{
-      score:e.target.value,
-      user_id:this.props.id,
-      shixun_challenge_id:c_id
-    }).then((result)=>{
-      if(result){
+    axios.post((url), {
+      score: value,
+      user_id: this.props.id,
+      shixun_challenge_id: c_id
+    }).then((result) => {
+      if (result) {
         this.props.showNotification('调分成功');
         this.setState(
-          (prevState) => ({ 
-            data : update(prevState.data, {[key]: { my_score: {$set: e.target.value} }}),
-            dataCopy : update(prevState.dataCopy, {[key]: { my_score: {$set: e.target.value} }})
+          (prevState) => ({
+            data: update(prevState.data, { [key]: { my_score: { $set: value } } }),
+            dataCopy: update(prevState.dataCopy, { [key]: { my_score: { $set: value } } })
           })
         )
-        console.log(this.state.dataCopy)
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
-  scrollToAnchor=(index)=>{
-    let name="challenge_"+index;
+  scrollToAnchor = (index) => {
     if (index) {
-      // let anchorElement = document.getElementById(name);
-      // if(anchorElement) { anchorElement.scrollIntoView(); }
-      $("html").animate({ scrollTop: $("#challenge_"+index).offset().top - 150 })
+      $("html").animate({ scrollTop: $("#challenge_" + index).offset().top - 150 })
     }
   }
 
-  render(){
-    let { 
-      questionType , 
+  render() {
+    let {
+      questionType,
       exercise,
       user_exercise_status,
-    }=this.props
+    } = this.props
     let {
       data,
       challenge,
       scoreList,
-    }=this.state
-    let isAdmin= this.props.isAdmin();
+    } = this.state
+    let isAdmin = this.props.isAdmin();
     let isStudent = this.props.isStudent();
     // 表格
     let columns = [{
       title: '关卡',
       dataIndex: 'part',
       key: 'part',
-      className:"edu-txt-center"
+      className: "edu-txt-center"
     }, {
       title: '任务名称',
       dataIndex: 'shixunName',
       key: 'shixunName',
-      className:"edu-txt-left with22 ",
-      render:(shixunName,item,index)=>{
-        return( 
-          <span className="overflowHidden1" style={{maxWidth: '400px'}} 
-              title={shixunName && shixunName.length > 25 ? shixunName : ''}
-          >{shixunName}</span> 
+      className: "edu-txt-left with22 ",
+      render: (shixunName, item, index) => {
+        return (
+          <span className="overflowHidden1" style={{ maxWidth: '400px' }}
+            title={shixunName && shixunName.length > 25 ? shixunName : ''}
+          >{shixunName}</span>
         )
       }
     }, {
       title: '评测次数',
       dataIndex: 'testCount',
       key: 'testCount',
-      className:"edu-txt-center",
-      render:(testCount,item,index)=>{
-        return( 
-          <span>{ item.testCount ? item.testCount : <span className="color-grey-9">--</span> }</span>
+      className: "edu-txt-center",
+      render: (testCount, item, index) => {
+        return (
+          <span>{item.testCount ? item.testCount : <span className="color-grey-9">--</span>}</span>
         )
       }
     }, {
       title: '完成时间',
       key: 'endTime',
       dataIndex: 'endTime',
-      className:"edu-txt-center",
-      render:(endTime,item,index)=>{
-        return( 
-          <span>{ item.endTime ? item.endTime : <span className="color-grey-9">--</span> }</span>
+      className: "edu-txt-center",
+      render: (endTime, item, index) => {
+        return (
+          <span>{item.endTime ? item.endTime : <span className="color-grey-9">--</span>}</span>
         )
       }
     }, {
       title: '耗时',
       dataIndex: 'needTime',
       key: 'needTime',
-      className:"edu-txt-center",
-      render:(needTime,item,index)=>{
-        return( 
-          <span>{ item.needTime ? item.needTime : <span className="color-grey-9">--</span> }</span>
+      className: "edu-txt-center",
+      render: (needTime, item, index) => {
+        return (
+          <span>{item.needTime ? item.needTime : <span className="color-grey-9">--</span>}</span>
+        )
+      }
+    }, {
+      title: '查看答案',
+      dataIndex: 'view_answer',
+      key: 'view_answer',
+      className: "edu-txt-center",
+      render: (exp, item, index) => {
+        return (
+          <span>{item.view_answer ? "已查看" : "未查看"}</span>
         )
       }
     }, {
       title: '经验值',
       dataIndex: 'exp',
-      key: 'exp',      
-      className:"edu-txt-center",
-      render:(exp,item,index)=>{
-        return(
+      key: 'exp',
+      className: "edu-txt-center",
+      render: (exp, item, index) => {
+        return (
           <span><span className="color-green">{item.my_exp}</span>/{item.total_exp}</span>
         )
       }
-    },{
+    }, {
       title: '得分/满分',
       dataIndex: 'score',
       key: 'score',
-      className: (isAdmin || ( isStudent && exercise && exercise.exercise_status == 3 )) ? "edu-txt-center":"edu-txt-center none",
-      render:(score,item,index)=>{
-        return(
+      className: (isAdmin || (isStudent && exercise && exercise.exercise_status == 3)) ? "edu-txt-center" : "edu-txt-center none",
+      render: (score, item, index) => {
+        //issues#29409 2
+        if(this.props.questionType.is_invalid){
+          return <Tooltip title={'在开始答题前开启的实训题计0分'}><span className="color-orange-tip">{item.my_score}</span>/{item.total_score}</Tooltip>
+        }
+        return (
           <span><span className="color-orange-tip">{item.my_score}</span>/{item.total_score}</span>
         )
       }
-    },{
-      title: isAdmin ? <span><i className="color-red mr5">*</i>调分</span>: '操作',
+    }, {
+      title: isAdmin ? <span><i className="color-red mr5">*</i>调分</span> : '操作',
       dataIndex: 'operation',
       key: 'operation',
       className: isAdmin ? "edu-txt-left" : "edu-txt-center",
-      render:(operation,item,index)=>{
-        return(
+      render: (operation, item, index) => {
+        return (
           <span>
             {
-                this.props.isAdmin() ? 
-                <InputNumber 
-                  min={0} 
-                  max={item.total_score} 
-                  step={0.1} 
+              this.props.isAdmin() ?
+                <InputNumber
+                  min={0}
+                  max={item.total_score}
+                  step={0.1}
                   precision={1}
                   value={item.input_score}
-                  style={{width:"60px",marginLeft:"5px"}} 
-                  placeholder="请输入分数" 
-                  onChange={(value)=>{this.changeThis(value,index)}}
-                  onBlur={(value)=>this.changeThisScore(value,item.id,index)}
+                  style={{ width: "60px", marginLeft: "5px" }}
+                  placeholder="请输入分数"
+                  onChange={(value) => { this.changeThis(value, index) }}
+                  onBlur={(event) => this.changeThisScore(event, item.id, index)}
                   className="greyInput"
-                ></InputNumber> 
-                :""
+                ></InputNumber>
+                : ""
             }
             {
               item.operation ?
-              <a className={isAdmin ? "color-blue mt5 fr":"color-blue"} href='javascript:void(0)' onClick={()=>this.scrollToAnchor(`${questionType.question_id}${index+1}`)}>查看</a>
-              :
-              <span className={isAdmin ? "color-grey-9 mt5 fr":"color-grey-9"} >--</span>
+                <a className={isAdmin ? "color-blue mt5 fr" : "color-blue"} href='javascript:void(0)' onClick={() => this.scrollToAnchor(`${questionType.question_id}${index + 1}`)}>查看</a>
+                :
+                <span className={isAdmin ? "color-grey-9 mt5 fr" : "color-grey-9"} >--</span>
             }
           </span>
         )
       }
     }];
-    return(
+    return (
       <div>
         <style>
           {`
@@ -296,27 +249,27 @@ class shixunAnswer extends Component{
             }
           `}
         </style>
-        { exercise && ((exercise.student_commit_status && exercise.student_commit_status != 0) || (exercise.user_exercise_status && exercise.user_exercise_status !=0) ) ?
+        {exercise && ((exercise.student_commit_status && exercise.student_commit_status != 0) || (exercise.user_exercise_status && exercise.user_exercise_status != 0)) ?
           <div>
             <p className="padding20-30 font-16 color-grey-6 pl30">阶段成绩</p>
-            <div className={challenge && challenge.length > 0 ? "pl30 pr30 resetTableStyle":"pl30 pr30 resetTableStyle stageTable"}>
-              { data && data.length>0 ? <Table columns={columns} dataSource={data} pagination={false}></Table> : "" }
+            <div className={challenge && challenge.length > 0 ? "pl30 pr30 resetTableStyle" : "pl30 pr30 resetTableStyle stageTable"}>
+              {data && data.length > 0 ? <Table columns={columns} dataSource={data} pagination={false}></Table> : ""}
             </div>
             {
               challenge && challenge.length > 0 &&
               <div>
                 <p className="mt20 pr30 font-16 color-grey-6 pl30">实训详情</p>
                 {
-                  challenge.map((item,key)=>{
-                    return(
-                      <div className="pl30 pr30 mt20" id={`challenge_${questionType.question_id}${key+1}`}>
+                  challenge.map((item, key) => {
+                    return (
+                      <div className="pl30 pr30 mt20" id={`challenge_${questionType.question_id}${key + 1}`}>
                         <p className="clearfix mb20">
                           <span className="panel-inner-icon mr15 fl mt3 backgroud4CACFF">
-                              <i className="fa fa-code font-16 color_white"></i>
+                            <i className="fa fa-code font-16 color_white"></i>
                           </span>
                           <span className="fl mt3 font-16">
                             <span className="font-bd mr15">第{item[0].position}关</span>
-                            <Link to={ "/tasks/" + item[0].game_identifier } style={{"cursor":"pointer"}}>
+                            <Link to={"/tasks/" + item[0].game_identifier} style={{ "cursor": "pointer" }}>
                               <span className={"font-16"}>{item[0].name}</span>
                             </Link>
                           </span>
@@ -324,36 +277,36 @@ class shixunAnswer extends Component{
                         <ShixunAnswerDetail
                           {...this.props} {...this.state} challenge={item[0].outputs}
                         ></ShixunAnswerDetail>
-                        
-                        { item[0].st===0 ? <div className="font-16 color-dark-21">
-                            <div className="bor-grey-e mt15">
-                              <p className="clearfix pt5 pb5 pl15 pr15 back-f6-grey codebox">
-                                <span className="fl">最近通过的代码</span>
-                                <span className="fr codeboxright">{item[0].path}</span>
-                              </p>
 
-                              <div className="test-code bor-top-greyE">
-                                <li className="clearfix resetCodeMirrorStyle">
-                                  <CodeMirror
-                                    value={item[0].passed_code}
-                                    options={{
-                                      // mode: 'xml',
-                                      theme: 'default',
-                                      lineNumbers: true,
-                                      // extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键
-                                      indentUnit: 4, //代码缩进为一个tab的距离
-                                      matchBrackets: true,
-                                      autoRefresh: true,
-                                      smartIndent: true,//智能换行
-                                      styleActiveLine: true,
-                                      lint: true,
-                                      readOnly: "nocursor"
-                                    }}
-                                  />
-                                </li>
-                              </div>
+                        {item[0].st === 0 ? <div className="font-16 color-dark-21">
+                          <div className="bor-grey-e mt15">
+                            <p className="clearfix pt5 pb5 pl15 pr15 back-f6-grey codebox">
+                              <span className="fl">最近通过的代码</span>
+                              <span className="fr codeboxright">{item[0].path}</span>
+                            </p>
+
+                            <div className="test-code bor-top-greyE">
+                              <li className="clearfix resetCodeMirrorStyle">
+                                <CodeMirror
+                                  value={item[0].passed_code}
+                                  options={{
+                                    // mode: 'xml',
+                                    theme: 'default',
+                                    lineNumbers: true,
+                                    // extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键
+                                    indentUnit: 4, //代码缩进为一个tab的距离
+                                    matchBrackets: true,
+                                    autoRefresh: true,
+                                    smartIndent: true,//智能换行
+                                    styleActiveLine: true,
+                                    lint: true,
+                                    readOnly: "nocursor"
+                                  }}
+                                />
+                              </li>
                             </div>
-                          </div>:""}
+                          </div>
+                        </div> : ""}
                       </div>
                     )
                   })
@@ -364,12 +317,12 @@ class shixunAnswer extends Component{
           :
           <div className="pl30 pr30">
             {
-              isStudent && <p className="color-grey-9 mt20 mb20 markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML(questionType.question_title)}}></p>
+              isStudent ? <RenderHtml className="color-grey-9 mt20 mb20" value={questionType.question_title} /> : null
             }
-            
+
             {
-              questionType && questionType.shixun && questionType.shixun.map((item,key)=>{
-                return(
+              questionType && questionType.shixun && questionType.shixun.map((item, key) => {
+                return (
                   <p key={key} className="font-16 color-grey-6 mb5">
                     <span className="mr20">第{item.challenge_position}关 {item.challenge_name}</span>
                     <span>{item.challenge_score}分</span>
diff --git a/src/modules/courses/exercise/question/shixunAnswerDetail.js b/src/modules/courses/exercise/question/shixunAnswerDetail.js
index df22e339..8dd336a2 100644
--- a/src/modules/courses/exercise/question/shixunAnswerDetail.js
+++ b/src/modules/courses/exercise/question/shixunAnswerDetail.js
@@ -1,51 +1,49 @@
-import React,{ Component } from "react";
-import {Table} from "antd";
-import TPMMDEditor from '../../../../modules/tpm/challengesnew/TPMMDEditor'
+import React, { Component } from "react";
+import { Table } from "antd";
 
+class shixunAnswerDetail extends Component {
+	constructor(props) {
+		super(props);
+	}
+	render() {
 
-class shixunAnswerDetail extends Component{
-  constructor(props){
-      super(props);
-  }
-  render(){
+		let { challenge } = this.props;
 
-    let { challenge }=this.props;
-    
-		let columns=[{
+		let columns = [{
 			title: '评测次数',
 			dataIndex: 'number',
-			width:"127px",
+			width: "127px",
 			key: 'number',
-			className:"edu-txt-center",
+			className: "edu-txt-center",
 			render: (text, record) => (
 				<span>
-           {record.number || "--"}
-        </span>
+					{record.number || "--"}
+				</span>
 			),
 		}, {
 			title: '详细信息',
 			dataIndex: 'name',
 			key: 'name',
-			className:challenge && challenge.length > 0 ? "" : "edu-txt-center",
+			className: challenge && challenge.length > 0 ? "" : "edu-txt-center",
 			render: (text, record) => (
 				<span>
-            {record.name || "--"}
-        </span>
+					{record.name || "--"}
+				</span>
 			),
 		}];
 
-    let datas=[];
-    challenge && challenge.length > 0 ? challenge.map((item,key)=>{
-	    datas.push({
-		     number: item.position || "--",
-		     name: item.output_detail || "--"
-	    })
+		let datas = [];
+		challenge && challenge.length > 0 ? challenge.map((item, key) => {
+			datas.push({
+				number: item.position || "--",
+				name: item.output_detail || "--"
+			})
 		})
-		:
-		datas.push({
-			number:"--",
-			name:"--"
-	  })
+			:
+			datas.push({
+				number: "--",
+				name: "--"
+			})
 		return (
 			<div>
 				<style>{`
@@ -55,18 +53,18 @@ class shixunAnswerDetail extends Component{
 
 				`}</style>
 				{
-					datas ? 
-					<Table
-						bordered
-						dataSource={datas}
-						columns={columns}
-						pagination={false}
-					/>:""
+					datas ?
+						<Table
+							bordered
+							dataSource={datas}
+							columns={columns}
+							pagination={false}
+						/> : ""
 				}
-        
+
 			</div>
 
 		)
-  }
+	}
 }
 export default shixunAnswerDetail;
\ No newline at end of file
diff --git a/src/modules/courses/exercise/question/simpleAnswer.js b/src/modules/courses/exercise/question/simpleAnswer.js
index 1dfcbdb2..85ff67a6 100644
--- a/src/modules/courses/exercise/question/simpleAnswer.js
+++ b/src/modules/courses/exercise/question/simpleAnswer.js
@@ -1,98 +1,85 @@
-import React,{ Component } from "react";
-import {Checkbox,Radio, Input} from "antd";
-import {markdownToHTML, MarkdownToHtml} from 'educoder'
+import React, { Component } from "react";
 import TPMMDEditor from '../../../../modules/tpm/challengesnew/TPMMDEditor'
 
 import axios from 'axios'
+import RenderHtml from "../../../../components/render-html";
 
-class simpleAnswer extends Component{
-  constructor(props){
-      super(props);
-      this.mdRef = React.createRef();
-      this.state={
-        simpleValue:undefined
-      }
+class simpleAnswer extends Component {
+  constructor(props) {
+    super(props);
+    this.mdRef = React.createRef();
+    this.state = {
+      simpleValue: undefined
+    }
   }
-  onChange=(value)=>{
+  onChange = (value) => {
     this.setState({
-      simpleValue:value
+      simpleValue: value
     })
   }
-  onSimpleBlur=()=>{
-    let {simpleValue}=this.state
-    let question_id =this.props.questionType.question_id;
-    let url=`/exercise_questions/${question_id}/exercise_answers.json`;
-    axios.post((url),{
-      answer_text:simpleValue
-    }).then((result)=>{
-      if(result.status==200){
-        // this.setState({
-        //   simpleValue:undefined
-        // })
-        let k= simpleAnswer == "" ? 0 :1;
-        this.props.changeQuestionStatus && this.props.changeQuestionStatus(parseInt(this.props.questionType.q_position)-1,k);
+  onSimpleBlur = () => {
+    let { simpleValue } = this.state
+    let question_id = this.props.questionType.question_id;
+    let url = `/exercise_questions/${question_id}/exercise_answers.json`;
+    axios.post((url), {
+      answer_text: simpleValue
+    }).then((result) => {
+      if (result.status == 200) {
+        let k = simpleAnswer == "" ? 0 : 1;
+        this.props.changeQuestionStatus && this.props.changeQuestionStatus(parseInt(this.props.questionType.q_position) - 1, k);
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
 
-  showAndHide=(flag)=>{
-    this.props.changeA_flag && this.props.changeA_flag(this.props.index,flag);
+  showAndHide = (flag) => {
+    this.props.changeA_flag && this.props.changeA_flag(this.props.index, flag);
   }
 
-  render(){
-    let { 
-      questionType , 
+  render() {
+    let {
+      questionType,
       exercise,
       user_exercise_status,
-    }=this.props
-    let isAdmin=this.props.isAdmin();
-    let isStudent =this.props.isStudent();
-    return(
+    } = this.props
+    let isAdmin = this.props.isAdmin();
+    let isStudent = this.props.isStudent();
+    return (
       <div className="pl30 pr30">
         <li className="with100">
           {
-            user_exercise_status == 1 ? 
-            // <div className="markdown-body answerStyle" dangerouslySetInnerHTML={{__html: markdownToHTML1(questionType.user_answer.length>0 ? questionType.user_answer[0]:"")}}></div>
-            <MarkdownToHtml content={questionType.user_answer.length>0 ? questionType.user_answer[0]:""} selector={'simgle_' + (this.props.index + 1)}
-              className="answerStyle"                       
-            ></MarkdownToHtml>
-            :
-            <div>
-              <TPMMDEditor ref={this.mdRef} initValue={questionType.user_answer.length > 0 ? questionType.user_answer[0]:''} mdID={'simpleEditor'+questionType.question_id}  placeholder="请输入你的答案"
-              height={150} onChange={this.onChange} onCMBlur={this.onSimpleBlur}></TPMMDEditor>
-            </div>
+            user_exercise_status == 1 ?
+              <RenderHtml value={questionType.user_answer.length > 0 ? questionType.user_answer[0] : ""} className="answerStyle" />
+              :
+              <div>
+                <TPMMDEditor ref={this.mdRef} initValue={questionType.user_answer.length > 0 ? questionType.user_answer[0] : ''} mdID={'simpleEditor' + questionType.question_id} placeholder="请输入你的答案"
+                  height={150} onChange={this.onChange} onCMBlur={this.onSimpleBlur}></TPMMDEditor>
+              </div>
           }
         </li>
         {
           // 答案公开，且试卷已经截止
-          isAdmin && 
-          <div className="bor-top-greyE pt20 mt20">    
+          isAdmin &&
+          <div className="bor-top-greyE pt20 mt20">
             {
-              exercise.answer_status == 1 || questionType.a_flag ? 
-              <div className="standardAnswer">
-                <p className="mb10 font-16">参考答案：</p>
-                {/* <li className="markdown-body answerStyle" dangerouslySetInnerHTML={{__html: markdownToHTML1(questionType.standard_answer && questionType.standard_answer[0])}}></li> */}
-                <MarkdownToHtml content={questionType.standard_answer && questionType.standard_answer[0]} selector={'simgle_standard_' + (this.props.index + 1)}
-                  className="answerStyle"                       
-                ></MarkdownToHtml>
-                <p className="mt15"><a className="color-blue font-16" onClick={()=>this.showAndHide(false)}>隐藏参考答案</a></p>
-              </div>
-              :
-              <a className="color-blue font-16" onClick={()=>this.showAndHide(true)}>显示参考答案</a>
+              exercise.answer_status == 1 || questionType.a_flag ?
+                <div className="standardAnswer">
+                  <p className="mb10 font-16">参考答案：</p>
+                  <RenderHtml value={questionType.standard_answer && questionType.standard_answer[0]} className="answerStyle" />
+                  <p className="mt15"><a className="color-blue font-16" onClick={() => this.showAndHide(false)}>隐藏参考答案</a></p>
+                </div>
+                :
+                <a className="color-blue font-16" onClick={() => this.showAndHide(true)}>显示参考答案</a>
             }
           </div>
         }
         {
           isStudent && questionType.standard_answer ?
-          <div className="bor-top-greyE pt20 mt20 standardAnswer">
-            <p className="mb10 font-16">参考答案：</p>
-            {/* <li className="markdown-body answerStyle" dangerouslySetInnerHTML={{__html: markdownToHTML1(questionType.standard_answer && questionType.standard_answer[0])}}></li> */}
-            <MarkdownToHtml content={questionType.standard_answer && questionType.standard_answer[0]} selector={'simgle_standard2_' + (this.props.index + 1)}
-              className="answerStyle"                       
-            ></MarkdownToHtml>
-          </div>:""
+            <div className="bor-top-greyE pt20 mt20 standardAnswer">
+              <p className="mb10 font-16">参考答案：</p>
+              <RenderHtml value={questionType.standard_answer && questionType.standard_answer[0]} className="answerStyle" />
+            </div> : ""
         }
       </div>
     )
diff --git a/src/modules/courses/exercise/question/single.js b/src/modules/courses/exercise/question/single.js
index e739b8f1..c50c3b72 100644
--- a/src/modules/courses/exercise/question/single.js
+++ b/src/modules/courses/exercise/question/single.js
@@ -1,71 +1,88 @@
-import React,{ Component } from "react";
-import {Checkbox,Radio, Input} from "antd";
-
-import {markdownToHTML, MarkdownToHtml} from 'educoder'
+import React, { Component } from "react";
+import { Radio } from "antd";
 import axios from 'axios'
+import RenderHtml from "../../../../components/render-html";
 const tagArray = [
   'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
   'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
   'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
-class single extends Component{
-  constructor(props){
-      super(props);
+class single extends Component {
+  constructor(props) {
+    super(props);
   }
 
-  changeItem=(e)=>{
-    let choiceId=e.target.value;
-    let question_id=this.props.questionType.question_id;
-    let {index}=this.props;
-    let url=`/exercise_questions/${question_id}/exercise_answers.json`;
-    axios.post((url),{
-      exercise_choice_id:choiceId
-    }).then((result)=>{
-      if(result){
-        this.props.changeOption && this.props.changeOption(index,[choiceId]);
-        this.props.changeQuestionStatus && this.props.changeQuestionStatus(parseInt(this.props.questionType.q_position)-1,1);
+  changeItem = (e) => {
+    let choiceId = e.target.value;
+    let question_id = this.props.questionType.question_id;
+    let { index } = this.props;
+    let url = `/exercise_questions/${question_id}/exercise_answers.json`;
+    axios.post((url), {
+      exercise_choice_id: choiceId
+    }).then((result) => {
+      if (result) {
+        this.props.changeOption && this.props.changeOption(index, [choiceId]);
+        this.props.changeQuestionStatus && this.props.changeQuestionStatus(parseInt(this.props.questionType.q_position) - 1, 1);
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
-  render(){
-    let { 
-      questionType , 
+  render() {
+    let {
+      questionType,
       exercise,
-      user_exercise_status
-    }=this.props
-    
-    let isStudent =this.props.isStudent();
+      user_exercise_status,
+      is_md
+    } = this.props
+
+    let isStudent = this.props.isStudent();
     let isJudge = questionType.question_type == 2
-    return(
+    return (
       <div className="pl30 pr30 singleDisplay">
-        <Radio.Group className="with100" disabled={ user_exercise_status == 1 ? true : false } value={questionType.user_answer[0]} onChange={this.changeItem}>
+        <style>
           {
-            questionType.question_choices && questionType.question_choices.map((item,key)=>{
-              let prefix = isJudge ?  undefined : `${tagArray[key]}.`
-              return(
-                <p className={parseInt(questionType.question_type) == 0 ? "clearfix mb15" : "fl mr40"}>
-                  <Radio className="df lineh-25 setRadioStyle" value={item.choice_id}>
+            `
+						.single .ql-editor{
+							overflow: unset !important;
+							padding:0px  !important;
+						}
+						.single .ql-editor p{
+							line-height: 25px !important;
+							}
+						.single {
+						white-space: inherit !important;
+						}	
+							
+						`
+          }
+        </style>
+        <Radio.Group className="with100" disabled={user_exercise_status == 1 ? true : false} value={questionType.user_answer[0]} onChange={this.changeItem}>
+          {
+            questionType.question_choices && questionType.question_choices.map((item, key) => {
+              let prefix = isJudge ? undefined : `${tagArray[key]}.`
+
+              let titename = item.choice_text;
+              return (
+                <p key={item.choice_id} className={parseInt(questionType.question_type) == 0 ? "clearfix mb15" : "fl mr40"}>
+                  <Radio className="df lineh-25 setRadioStyle single" value={item.choice_id}>
                     <span className="fl mr3 lineh-25">{prefix}</span>
-                    <MarkdownToHtml content={item.choice_text} selector={'single_' + (this.props.index + 1) + (key + 1)}
-                      className="flex1" style={{display:"inline-block"}}                      
-                    ></MarkdownToHtml>
+                    <RenderHtml value={titename} className="flex1" style={{ display: "inline-block" }} />
                   </Radio>
                 </p>
               )
             })
           }
         </Radio.Group>
-        {          
+        {
           // 答案公开，且试卷已经截止
-          isStudent && exercise && exercise.answer_open==true && (exercise.exercise_status == 3 || user_exercise_status == 1) && 
+          isStudent && exercise && exercise.answer_open == true && (exercise.exercise_status == 3 || user_exercise_status == 1) &&
           <p className="bor-top-greyE pt20 mt10 font-16">参考答案：
-            {questionType.standard_answer.map((i,k)=>{
-                return(
-                  <span value={k}>{tagArray[parseInt(i)-1]}</span>
-                )
-              })
+            {questionType.standard_answer.map((i, k) => {
+            return (
+              <span key={k} value={k}>{tagArray[parseInt(i) - 1]}</span>
+            )
+          })
             }
           </p>
         }
@@ -73,4 +90,4 @@ class single extends Component{
     )
   }
 }
-export default single
\ No newline at end of file
+export default single
diff --git a/src/modules/courses/gradinforms/Bullsubdirectory.js b/src/modules/courses/gradinforms/Bullsubdirectory.js
index 78f56a0f..f166f3aa 100644
--- a/src/modules/courses/gradinforms/Bullsubdirectory.js
+++ b/src/modules/courses/gradinforms/Bullsubdirectory.js
@@ -156,7 +156,7 @@ class Bullsubdirectory extends Component{
 	handleSubmit=(e) => {
 		e.preventDefault();
 		this.props.form.validateFields((err, values) => {
-			debugger
+
 			if (!err) {
 				console.log(values.description);
 				if(values.eduintits === undefined|| values.eduintits === "" || values.eduintits ===null){
diff --git a/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/src/modules/courses/graduation/tasks/GraduateTaskItem.js
index 6a3e4aea..6010d309 100644
--- a/src/modules/courses/graduation/tasks/GraduateTaskItem.js
+++ b/src/modules/courses/graduation/tasks/GraduateTaskItem.js
@@ -235,12 +235,12 @@ class GraduateTaskItem extends Component{
             <h6>
 
               {
-                this.props.isAdmin?<a onClick={()=>this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
+                this.props.isAdmin?<a onClick={()=>this.toDetailPage("/classrooms/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
 																			title={discussMessage.name}
                                       className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
               {
-                this.props.isStudent? <a onClick={()=>this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
+                this.props.isStudent? <a onClick={()=>this.toDetailPage("/classrooms/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
 																				 title={discussMessage.name}
                                            className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
@@ -248,7 +248,7 @@ class GraduateTaskItem extends Component{
               {
             this.props.isNotMember===true?this.props.discussMessage.private_icon===true?
                <span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer"  title={"私有属性，非课堂成员不能访问"}>{discussMessage.name}</span>
-             :<a onClick={()=>this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list")}
+             :<a onClick={()=>this.toDetailPage("/classrooms/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list")}
 								 title={discussMessage.name}
 								 className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
@@ -267,7 +267,7 @@ class GraduateTaskItem extends Component{
 
               {/* { !!discussMessage.sticky && <span className="btn-cir btn-cir-red fl mt5 ml5">置顶</span> } */}
             </h6>
-              
+
             <div className="cl"></div>
             <p className="color-grey mt16 fl">
               <span className="mr50">
@@ -301,15 +301,15 @@ class GraduateTaskItem extends Component{
 
               <div className="mt13">
 
-                  <WordsBtn  style="blue" to={"/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/setting"}   className="colorblue font-16  mrf4 fr">
+                  <WordsBtn  style="blue" to={"/classrooms/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/setting"}   className="colorblue font-16  mrf4 fr">
                      <a className="btn colorblue">设置</a>
                   </WordsBtn>
 
-                  <WordsBtn  style="blue"  to={"/courses/"+coursesId+"/graduation_tasks/"+taskid+"/edit"} className="colorblue font-16 mr20 fr">
+                  <WordsBtn  style="blue"  to={"/classrooms/"+coursesId+"/graduation_tasks/"+taskid+"/edit"} className="colorblue font-16 mr20 fr">
                   <a className="btn colorblue" >编辑</a>
                   </WordsBtn>
 
-                  <WordsBtn  style="blue" onClick={()=>this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
+                  <WordsBtn  style="blue" onClick={()=>this.toDetailPage("/classrooms/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
                              className="btn colorblue colorblue font-16 mr20 fr">
                     查看详情
                   </WordsBtn>
@@ -331,7 +331,7 @@ class GraduateTaskItem extends Component{
                       {item==="提交作品"?
 
                         <WordsBtn  style="blue" className="colorblue font-16 ml20 fr mt12">
-                          <a className="btn colorblue" href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+this.props.categoryid+"/works"+"/"+this.props.taskid+"/new"}>提交作品</a>
+                          <a className="btn colorblue" href={"/classrooms/"+this.props.coursesId+"/graduation_tasks/"+this.props.categoryid+"/works"+"/"+this.props.taskid+"/new"}>提交作品</a>
                         </WordsBtn>
 
                         :""}
@@ -339,7 +339,7 @@ class GraduateTaskItem extends Component{
                         {item==="补交作品"?
 
                           <WordsBtn  style="blue" className="colorblue font-16 ml20 fr mt12">
-                            <a className="btn colorblue" href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+this.props.categoryid+"/works"+"/"+this.props.taskid+"/new"}>补交作品</a>
+                            <a className="btn colorblue" href={"/classrooms/"+this.props.coursesId+"/graduation_tasks/"+this.props.categoryid+"/works"+"/"+this.props.taskid+"/new"}>补交作品</a>
                           </WordsBtn>
 
                           :""}
@@ -347,7 +347,7 @@ class GraduateTaskItem extends Component{
                         {item==="修改作品"?
 
                           <WordsBtn style="blue" className="font-16 colorblue ml20 fr mt12">
-                            <a className="btn colorblue" href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+this.props.categoryid+"/works"+"/"+this.props.workid+"/edit"}>修改作品</a>
+                            <a className="btn colorblue" href={"/classrooms/"+this.props.coursesId+"/graduation_tasks/"+this.props.categoryid+"/works"+"/"+this.props.workid+"/edit"}>修改作品</a>
                           </WordsBtn>
 
                           :""}
@@ -355,7 +355,7 @@ class GraduateTaskItem extends Component{
                         {item==="查看作品"?
 
                           <WordsBtn style="blue" className="font-16 colorblue ml20 fr mt12">
-                            <a className="btn colorblue" target="_blank" href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+this.props.workid+"/appraise"}>查看作品</a>
+                            <a className="btn colorblue" target="_blank" href={"/classrooms/"+this.props.coursesId+"/graduation_tasks/"+this.props.workid+"/appraise"}>查看作品</a>
                           </WordsBtn>
 
                           :""}
@@ -385,7 +385,7 @@ class GraduateTaskItem extends Component{
 
                           <WordsBtn className="colorblue font-16 ml20 fr mt12" onClick={this.addAccessory}>
 														补交附件
-                            {/*<a className="btn colorblue " href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+discussMessage.work_id+"/appraise"}></a>*/}
+                            {/*<a className="btn colorblue " href={"/classrooms/"+this.props.coursesId+"/graduation_tasks/"+discussMessage.work_id+"/appraise"}></a>*/}
                           </WordsBtn>
 
                           :""}
@@ -394,7 +394,7 @@ class GraduateTaskItem extends Component{
                   }):""}
 
                 {this.props.isStudent?
-                  <WordsBtn  style="blue" onClick={()=>this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
+                  <WordsBtn  style="blue" onClick={()=>this.toDetailPage("/classrooms/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
                              className="colorblue font-16 ml20 fr mt12">
                     查看详情
                   </WordsBtn>:""}
@@ -404,4 +404,4 @@ class GraduateTaskItem extends Component{
       )
     }
 }
-export default GraduateTaskItem;
\ No newline at end of file
+export default GraduateTaskItem;
diff --git a/src/modules/courses/graduation/tasks/GraduationAcross.js b/src/modules/courses/graduation/tasks/GraduationAcross.js
index 18dac804..a42c3fc8 100644
--- a/src/modules/courses/graduation/tasks/GraduationAcross.js
+++ b/src/modules/courses/graduation/tasks/GraduationAcross.js
@@ -121,7 +121,7 @@ class GraduationAcross extends Component{
     }
   }
 
-  
+
 
   // 根据分班筛选
   filterByGroup=(value,record)=>{
@@ -163,12 +163,12 @@ class GraduationAcross extends Component{
       this.setState({
         showflag:false
       })
-    } 
+    }
   }
 
-  componentWillUnmount() { 
+  componentWillUnmount() {
     window.removeEventListener('click', this.clickOther);
-  }  
+  }
 
   getList=(page,group_ids,comment_status)=>{
     let { limit }=this.state;
@@ -325,8 +325,8 @@ class GraduationAcross extends Component{
 		}
 	}
   render(){
-    let { 
-      comment_status, 
+    let {
+      comment_status,
       users,
       user_count,
       graduation_groups,
@@ -350,7 +350,7 @@ class GraduationAcross extends Component{
       marginRight:'0px'
     };
 
-    
+
 
     const rowSelection = {
       // 选中行的key，选中行
@@ -461,7 +461,7 @@ class GraduationAcross extends Component{
               <RadioGroup onChange={this.funcommentstatus} value={comment_status}>
                 <Radio style={radioStyle} value={2}>手动分配评阅<span className={"font-14 color-grey-c ml5"}>（逐一指定每个学生的交叉评阅老师）</span></Radio>
                 <Radio style={radioStyle} value={4}>答辩组分配评阅<span className={"font-14 color-grey-c ml5"}>（将老师加入不同答辩组，指定每个学生的交叉评阅答辩组，
-                  <a href={"/courses/"+courseId+"/teachers"} target="_blank">
+                  <a href={"/classrooms/"+courseId+"/teachers"} target="_blank">
                   <span className={"color-blue"}>立即设置答辩组</span></a>
                 </span>）</Radio>
               </RadioGroup>
@@ -472,7 +472,7 @@ class GraduationAcross extends Component{
           <span className="fr">
 						<span className={"fl mt5"}><span className={"color-orange"}>分配</span>给{ comment_status && comment_status == 2 ? "老师":"答辩组"}：</span>
             <span className={"fl"} style={{height:"32px"}} id="selectTags">
-              <Select 
+              <Select
               mode="multiple"
               placeholder={ comment_status && comment_status == 2 ? "请选择老师":"请选择答辩组"}
               // value={AcrossTeamIds}
@@ -483,10 +483,10 @@ class GraduationAcross extends Component{
               dropdownRender={menu => (
                 <div id="selectDropdown">
 									{comment_status == 2 &&teachers&&teachers.length>10?<div className="padding10-20">
-                    <Input 
-                      type='input' 
-                      value={searchValue} 
-                      onChange={this.changeSearchValue} 
+                    <Input
+                      type='input'
+                      value={searchValue}
+                      onChange={this.changeSearchValue}
                       placeholder='请输入名称搜索'
                       style={{height:"30px"}}
                       className="searchInput"
@@ -553,4 +553,4 @@ class GraduationAcross extends Component{
     )
   }
 }
-export default GraduationAcross;
\ No newline at end of file
+export default GraduationAcross;
diff --git a/src/modules/courses/graduation/tasks/GraduationTaskDetail.js b/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
index 3330f938..d36a84f1 100644
--- a/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
+++ b/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
@@ -105,16 +105,16 @@ class GraduationTaskDetail extends Component{
 	goback=()=>{
 		// let courseId=this.props.match.params.coursesId;
 		// let category_id=this.props.match.params.category_id;
-		// window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id;
+		// window.location.href="/classrooms/"+courseId+"/graduation_tasks/"+category_id;
 		// let courseId = this.props.match.params.coursesId;
 		// if(courseId===undefined){
-		// 	this.props.history.push("/courses");
+		// 	this.props.history.push("/classrooms");
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
 
 		// this.props.history.goBack()
-		this.props.history.replace(`/courses/${this.state.questionslist.course_id}/graduation_tasks/${this.state.questionslist.graduation_id}`);
+		this.props.history.replace(`/classrooms/${this.state.questionslist.course_id}/graduation_tasks/${this.state.questionslist.graduation_id}`);
 	}
 
 	setend_time=(time)=>{
@@ -295,12 +295,6 @@ class GraduationTaskDetail extends Component{
 
 	// 补交附件
 	handaccessory=()=>{
-		// let {taskslistdata}=this.state;
-		// let courseId=this.props.match.params.coursesId;
-		//
-		// let url="/courses/"+courseId+"/graduation_tasks/"+taskslistdata.work_id+"/appraise"
-		//
-		// window.location.href=url;
 		this.setState({
 			avisible:true
 		})
@@ -465,13 +459,13 @@ class GraduationTaskDetail extends Component{
 						<p className="clearfix mt10">
 							<a onClick={this.goback} className="color-grey-9 fl">{questionslist.course_name}</a>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
-							<Link to={`/courses/${courseId}/graduation_tasks/${category_id}`} className="color-grey-9 fl">{questionslist.graduation_name}</Link>
+							<Link to={`/classrooms/${courseId}/graduation_tasks/${category_id}`} className="color-grey-9 fl">{questionslist.graduation_name}</Link>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 							<span className="color-grey-6">任务详情</span>
 						</p>
 						<div className="clearfix mt20 mb20 lineh-25 linbox">
 							<p className=" fl color-black summaryname">
-								<Link to={`/courses/${courseId}/graduation_tasks/${category_id}`} className="color-grey-3">{questionslist.task_name}</Link>
+								<Link to={`/classrooms/${courseId}/graduation_tasks/${category_id}`} className="color-grey-3">{questionslist.task_name}</Link>
 							</p>
 							<CoursesListType
 								typelist={questionslist.task_status}
@@ -481,9 +475,9 @@ class GraduationTaskDetail extends Component{
 						<div className="stud-class-set bor-bottom-greyE">
 							<div className="clearfix edu-back-white pl30 pr30 graduationTaskMenu">
 
-								<Link className={tab && tab == "list" ? "active" : ""} to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/detail/"+task_Id+"/list"}>任务列表</Link>
-								<Link className={tab && tab == "questions" ? "active" : ""} to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/detail/"+task_Id+"/questions"}>毕设描述</Link>
-								<Link className={tab && tab == "setting" ? "active" : ""} to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/detail/"+task_Id+"/setting?tab=3"}>设置</Link>
+								<Link className={tab && tab == "list" ? "active" : ""} to={"/classrooms/"+courseId+"/graduation_tasks/"+category_id+"/detail/"+task_Id+"/list"}>任务列表</Link>
+								<Link className={tab && tab == "questions" ? "active" : ""} to={"/classrooms/"+courseId+"/graduation_tasks/"+category_id+"/detail/"+task_Id+"/questions"}>毕设描述</Link>
+								<Link className={tab && tab == "setting" ? "active" : ""} to={"/classrooms/"+courseId+"/graduation_tasks/"+category_id+"/detail/"+task_Id+"/setting?tab=3"}>设置</Link>
 
 								{/*<a className={"fr color-blue font-16"}>导出成绩</a>*/}
 								{/*{this.props.isAdmin()?<a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xls"} className={"fr color-blue font-16"}>导出成绩</a>:""}*/}
@@ -529,10 +523,10 @@ class GraduationTaskDetail extends Component{
 								{questionslist.work_status===undefined||questionslist.work_status===null||questionslist.work_status.length===0?"":questionslist.work_status.map((item,key)=>{
 									return(
 										<span key={key} className="fr mt20">
-                          {item==="提交作品"?<a className={"fr color-blue font-16 ml20"} href={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/works/"+task_Id+"/new"}>提交作品</a>:""}
-											{item==="补交作品"?<a className={"fr color-blue font-16 ml20"} href={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/works/"+task_Id+"/new"}>补交作品</a>:""}
-											{item==="修改作品"?<a className={"fr color-blue font-16 ml20"} href={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/works"+"/"+ questionslist.work_id + "/edit"}>修改作品</a>:""}
-											{item==="查看作品"?<a className={"fr color-blue font-16 ml20"} target="_blank" href={"/courses/"+courseId+"/graduation_tasks/"+ questionslist.work_id + "/appraise"}>查看作品</a> :""}
+                          {item==="提交作品"?<a className={"fr color-blue font-16 ml20"} href={"/classrooms/"+courseId+"/graduation_tasks/"+category_id+"/works/"+task_Id+"/new"}>提交作品</a>:""}
+											{item==="补交作品"?<a className={"fr color-blue font-16 ml20"} href={"/classrooms/"+courseId+"/graduation_tasks/"+category_id+"/works/"+task_Id+"/new"}>补交作品</a>:""}
+											{item==="修改作品"?<a className={"fr color-blue font-16 ml20"} href={"/classrooms/"+courseId+"/graduation_tasks/"+category_id+"/works"+"/"+ questionslist.work_id + "/edit"}>修改作品</a>:""}
+											{item==="查看作品"?<a className={"fr color-blue font-16 ml20"} target="_blank" href={"/classrooms/"+courseId+"/graduation_tasks/"+ questionslist.work_id + "/appraise"}>查看作品</a> :""}
 											{item==="创建项目"?<a className={"fr color-blue font-16 ml20"} href={'/projects/new'} target="_blank">创建项目</a>:""}
 											{item==="关联项目"?<a className={"fr color-blue font-16 ml20"} onClick={this.AssociationItems}>关联项目</a>:""}
 											{item==="取消关联"?<a className={"fr color-blue font-16 ml20"} onClick={this.cannelAssociation}>取消关联</a>:""}
@@ -546,26 +540,26 @@ class GraduationTaskDetail extends Component{
 								{ this.props.isAdmin() ? questionslist.status===1 ? <a className={"fr color-blue font-16 mr20"} onClick={() => { this.end()} }>立即截止</a> : "" : "" }
 								{ this.props.isAdmin() ? questionslist.status===0 ? <a className={"fr color-blue font-16 mr20"} onClick={() => { this.publish()} }>立即发布</a> : "" : "" }
 								{ this.props.isAdmin() && questionslist.cross_comment ? <a className={"fr color-blue font-16"} onClick={this.openAcross}>交叉评阅设置</a> : "" }
-								{ this.props.isAdmin() ? <a className={"fr color-blue font-16"} href={"/courses/"+courseId+"/graduation_tasks/"+task_Id+"/edit"}>编辑任务</a> : "" }
+								{ this.props.isAdmin() ? <a className={"fr color-blue font-16"} href={"/classrooms/"+courseId+"/graduation_tasks/"+task_Id+"/edit"}>编辑任务</a> : "" }
 								{ this.props.user&&this.props.user.admin===true || this.props.user&&this.props.user.business===true ? <a className={"fr color-blue font-16"} onClick={()=>this.CodeReview()}>代码评测</a> : "" }
 
 							</div>
 						</div>
 						<Switch {...this.props}>
 							{/*//毕设任务列表*/}
-							<Route exact path="/courses/:coursesId/graduation_tasks/:category_id/detail/:task_Id/list"
+							<Route exact path="/classrooms/:coursesId/graduation_tasks/:category_id/detail/:task_Id/list"
 										 render={
 											 (props) => (<GraduationTaskslist getsonar={(teacher_comment,task_status,course_group,cross_comment,search)=>this.getsonars(teacher_comment,task_status,course_group,cross_comment,search)}{...this.props} {...props} {...this.state} {...commom} triggerRef={this.bindRef} setend_time={(time)=>this.setend_time(time)} tab={`list`}/>)
 										 }
 							></Route>
 
-							<Route exact path="/courses/:coursesId/graduation_tasks/:category_id/detail/:task_Id/setting"
+							<Route exact path="/classrooms/:coursesId/graduation_tasks/:category_id/detail/:task_Id/setting"
 										 render={
 											 (props) => (<GraduationTaskssetting {...this.props} {...props} {...this.state} {...commom} triggerRef={this.bindRef} setend_time={(time)=>this.setend_time(time)}  tab={`setting`}/>)
 										 }
 							></Route>
 
-							<Route exact path="/courses/:coursesId/graduation_tasks/:category_id/detail/:task_Id/questions"
+							<Route exact path="/classrooms/:coursesId/graduation_tasks/:category_id/detail/:task_Id/questions"
 										 render={
 											 (props) => (<GraduationTasksquestions {...this.props} {...props} {...this.state} {...commom} triggerRef={this.bindRef} setend_time={(time)=>this.setend_time(time)}  tab={`questions`}/>)
 										 }></Route>
@@ -579,4 +573,4 @@ class GraduationTaskDetail extends Component{
 	}
 }
 // CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC))
-export default (GraduationTaskDetail) ;
\ No newline at end of file
+export default (GraduationTaskDetail) ;
diff --git a/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index f9e93a0d..48fad9d6 100644
--- a/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -104,7 +104,7 @@ class GraduationTasksSubmitedit extends Component{
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
-		this.props.history.replace(`/courses/${this.state.workslist.course_id}/graduation_tasks/${this.state.workslist.graduation_id}`);
+		this.props.history.replace(`/classrooms/${this.state.workslist.course_id}/graduation_tasks/${this.state.workslist.graduation_id}`);
 
   }
 
@@ -462,7 +462,7 @@ class GraduationTasksSubmitedit extends Component{
             })
             if(response!== undefined){
               // this.goback()
-							window.location.href=`/courses/${coursesIds}/graduation_tasks/${workId}/appraise`
+							window.location.href=`/classrooms/${coursesIds}/graduation_tasks/${workId}/appraise`
             }
             // if(response.status===200) {
             //   GraduationTasksnewtype=false;
@@ -589,14 +589,14 @@ class GraduationTasksSubmitedit extends Component{
             <div className={"educontent mb20"}>
 
               <p className="clearfix mt10">
-                {/*<WordsBtn style="grey" className="fl">  <Link to={"/courses/"+courseId+"/graduation"} className="color-grey-6">{workslist&&workslist.course_name}</Link></WordsBtn>*/}
+                {/*<WordsBtn style="grey" className="fl">  <Link to={"/classrooms/"+courseId+"/graduation"} className="color-grey-6">{workslist&&workslist.course_name}</Link></WordsBtn>*/}
                 {/*<span className="color-grey-9 fl ml3 mr3">&gt;</span>*/}
                 <WordsBtn style="grey" className="fl"> <a onClick={this.goback} className="color-grey-6">毕设任务</a></WordsBtn>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-                <WordsBtn style="grey" className="fl"> <Link to={`/courses/${courseId}/graduation_tasks/${workslist && workslist.graduation_id}/detail/${workslist && workslist.task_id}/list`} className="color-grey-6">任务详情</Link></WordsBtn>
+                <WordsBtn style="grey" className="fl"> <Link to={`/classrooms/${courseId}/graduation_tasks/${workslist && workslist.graduation_id}/detail/${workslist && workslist.task_id}/list`} className="color-grey-6">任务详情</Link></WordsBtn>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                 {/*<WordsBtn style="grey" className="fl">*/}
-                {/*<Link to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id} className="color-grey-6">{workslist&&workslist.task_name}</Link>*/}
+                {/*<Link to={"/classrooms/"+courseId+"/graduation/graduation_tasks/"+category_id} className="color-grey-6">{workslist&&workslist.task_name}</Link>*/}
                 {/*<span className="color-grey-9 ml3 mr3">&gt;</span>*/}
                 {/*</WordsBtn>*/}
                 <span>{this.props.current_user&&this.props.current_user.real_name} 修改作品</span>
diff --git a/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index a30b00ef..9dfd141e 100644
--- a/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -80,7 +80,7 @@ class GraduationTasksSubmitnew extends Component{
     setedit=(workId)=>{
 
       let coursesId=this.props.match.params.coursesId;
-      window.location.href="/courses/"+coursesId+"/graduation_tasks/"+workId+"/appraise";
+      window.location.href="/classrooms/"+coursesId+"/graduation_tasks/"+workId+"/appraise";
 
     }
 
@@ -105,7 +105,7 @@ class GraduationTasksSubmitnew extends Component{
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
-		this.props.history.replace(`/courses/${this.state.workslist.course_id}/graduation_tasks/${this.state.workslist.graduation_id}`);
+		this.props.history.replace(`/classrooms/${this.state.workslist.course_id}/graduation_tasks/${this.state.workslist.graduation_id}`);
 	}
 
 
@@ -380,7 +380,7 @@ class GraduationTasksSubmitnew extends Component{
 
   //公用数据
   Commoninterface = (fileList,selectmemberslist,workslist)=>{
-		// debugger
+		
     let  userids=[];
     if(selectmemberslist!=undefined&&selectmemberslist.length>0){
       for(var list of selectmemberslist){
@@ -409,7 +409,7 @@ class GraduationTasksSubmitnew extends Component{
           // console.log(fileList);
           if(values.description===undefined||values.description===""){
 						this.scrollToAnchor("valuestypes");
-						// debugger
+						
             return
           }
 
@@ -463,7 +463,7 @@ class GraduationTasksSubmitnew extends Component{
             if(response){
               if(response.data){
                 if(response.data.work_id){
-                  window.location.href=`/courses/${this.props.match.params.coursesId}/graduation_tasks/${response.data.work_id}/appraise`
+                  window.location.href=`/classrooms/${this.props.match.params.coursesId}/graduation_tasks/${response.data.work_id}/appraise`
                 }
               }
             }
@@ -504,7 +504,7 @@ class GraduationTasksSubmitnew extends Component{
 
   //确认
   hidestartshixunsreplace=()=>{
-    	// debugger
+    	
     let {fileList,selectmemberslist,workslist}=this.state;
     this.Commoninterface(fileList,selectmemberslist,workslist);
 
@@ -603,14 +603,14 @@ render(){
       <div className={"educontent mb20"}>
 
       <p className="clearfix mt10">
-        {/*<WordsBtn style="grey" className="fl">  <Link to={"/courses/"+courseId+"/graduation_tasks"} className="color-grey-6">{workslist&&workslist.course_name}</Link></WordsBtn>*/}
+        {/*<WordsBtn style="grey" className="fl">  <Link to={"/classrooms/"+courseId+"/graduation_tasks"} className="color-grey-6">{workslist&&workslist.course_name}</Link></WordsBtn>*/}
         {/*<span className="color-grey-9 fl ml3 mr3">&gt;</span>*/}
         <WordsBtn style="grey" className="fl"> <a onClick={this.goback} className="color-grey-6">毕设任务</a></WordsBtn>
         <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-        <WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/detail/"+task_Id+"/list"} className="color-grey-6">任务详情</Link></WordsBtn>
+        <WordsBtn style="grey" className="fl"> <Link to={"/classrooms/"+courseId+"/graduation_tasks/"+category_id+"/detail/"+task_Id+"/list"} className="color-grey-6">任务详情</Link></WordsBtn>
         <span className="color-grey-9 fl ml3 mr3">&gt;</span>
         {/*<WordsBtn style="grey" className="fl">*/}
-          {/*<Link to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id} className="color-grey-6">{workslist&&workslist.task_name}</Link>*/}
+          {/*<Link to={"/classrooms/"+courseId+"/graduation/graduation_tasks/"+category_id} className="color-grey-6">{workslist&&workslist.task_name}</Link>*/}
           {/*<span className="color-grey-9 ml3 mr3">&gt;</span>*/}
         {/*</WordsBtn>*/}
         <span>{this.props.current_user&&this.props.current_user.real_name} 提交作品</span>
diff --git a/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index bc99acf0..a314f962 100644
--- a/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -71,15 +71,15 @@ class GraduationTasksappraise extends Component{
     // let courseId=this.props.match.params.coursesId;
     // let category_id=this.props.match.params.category_id;
 		//
-    // window.location.href="/courses/"+courseId+"/graduation_tasks/"+datalist.graduation_id;
+    // window.location.href="/classrooms/"+courseId+"/graduation_tasks/"+datalist.graduation_id;
 		// let courseId=this.props.match.params.coursesId;
 		// if(courseId===undefined){
-		// 	this.props.history.push("/courses");
+		// 	this.props.history.push("/classrooms");
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
 
-		this.props.history.replace(`/courses/${this.state.datalist.course_id}/graduation_tasks/${this.state.datalist.graduation_id}/${this.state.datalist.task_id}/list`);
+		this.props.history.replace(`/classrooms/${this.state.datalist.course_id}/graduation_tasks/${this.state.datalist.graduation_id}/${this.state.datalist.task_id}/list`);
 
   }
 
@@ -178,9 +178,9 @@ class GraduationTasksappraise extends Component{
               <p className="clearfix mt10">
                 <a onClick={this.goback} className="color-grey-9 fl">{datalist&&datalist.course_name}</a>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-                <Link to={"/courses/"+courseId+"/graduation_tasks/"+graduation_id} className="color-grey-9 fl">{datalist&&datalist.graduation_name}</Link>
+                <Link to={"/classrooms/"+courseId+"/graduation_tasks/"+graduation_id} className="color-grey-9 fl">{datalist&&datalist.graduation_name}</Link>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-                <Link to={"/courses/"+courseId+"/graduation_tasks/"+graduation_id+"/detail/"+task_id+"/list"} className="color-grey-9 fl">任务详情</Link>
+                <Link to={"/classrooms/"+courseId+"/graduation_tasks/"+graduation_id+"/detail/"+task_id+"/list"} className="color-grey-9 fl">任务详情</Link>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                 <span className="color-grey-6 fl">{datalist&&datalist.author_name}</span>
               </p>
diff --git a/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js b/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js
index 1415414e..6b3f9ecd 100644
--- a/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js
+++ b/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js
@@ -32,12 +32,13 @@ class GraduationTasksappraiseMainEditor extends Component{
       return item.response ? item.response.id : item.id
     })
     const comment = this.mdRef.current.getValue()
-    if ((!comment || comment.trim() == "") && !score &&this.props.isAdmin()===true) {
+
+    if ((!comment || comment.trim() == "") && !score &&this.props.isAdmin()===true&&comment!=0&&comment!=0.0) {
       this.setState( {errorMessage : '分数和评语不能同时为空' })
       // this.props.showNotification('请先输入评阅说明')
       return;
     }
-    if (!score && this.props.isAdmin()===false) {
+    if (!score && this.props.isAdmin()===false &&this.props.isAdmin()===true&&comment!=0&&comment!=0.0) {
       this.setState( {
         errorMessage : '分数不能为空',
         errorMessagetype:true
@@ -66,6 +67,9 @@ class GraduationTasksappraiseMainEditor extends Component{
       same_score
     }
     if (this.props.onReply) {
+      if(this.props.get_next_works){
+        this.props.get_next_works()
+      }
       this.props.onReply(params)
     } else {
       axios.post(url, params).then((response)=>{
diff --git a/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index e5431d55..ce789848 100644
--- a/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -39,22 +39,7 @@ class GraduationTasksedit extends Component{
     let tasksid=this.props.match.params.category_id;
     let url ="/graduation_tasks/"+tasksid+"/edit.json"
     axios.get(url).then((result)=>{
-        // console.log(result)
-
-        // let newfilelist=[];
-        // if(result.data.attachments.length!=0){
-        //   for(var list of result.data.attachments){
-        //     newfilelist.push({
-        //       uid:list.id,
-        //       name:list.title,
-        //       status: 'done',
-        //       url:list.url,
-        //     })
-        //   }
-				//
-        // }
 			let namelength=result.data.task_name.length;
-      // let sixlength=title_num-namelength
 
 			const fileList = result.data.attachments.map(item => {
 				return {
@@ -95,20 +80,12 @@ class GraduationTasksedit extends Component{
 
 
   goback=()=>{
-
-		// let courseId = this.props.match.params.coursesId;
-		// if(courseId===undefined){
-		// 	this.props.history.push("/courses");
-		// }else{
-		// 	this.props.history.push(this.props.current_user.first_category_url);
-		// }
-		this.props.history.replace(`/courses/${this.state.data.course_id}/graduation_tasks/${this.state.data.graduation_id}`);
+		this.props.history.replace(`/classrooms/${this.state.data.course_id}/graduation_tasks/${this.state.data.graduation_id}`);
   }
 
 
   // 输入title
   changeTitle=(e)=>{
-		//   title_num:60-parseInt(e.target.value.length),
     this.setState({
       title_num:e.target.value.length,
       title_value:e.target.value
@@ -119,40 +96,12 @@ class GraduationTasksedit extends Component{
   handleChange = (info) => {
     if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
       let fileList = info.fileList;
-      // console.log(fileList)
-      // for(var list of fileList ){
-      //   console.log(fileList)
-      // }
       this.setState({
         fileList: appendFileSizeToUploadFileAll(fileList),
       });
     }
   }
 
-  // onAttachmentRemove = (file) => {
-  //   // confirm({
-  //   //   title: '确定要删除这个附件吗?',
-  //   //   okText: '确定',
-  //   //   cancelText: '取消',
-  //   //   // content: 'Some descriptions',
-  //   //   onOk: () => {
-  //   //     this.deleteAttachment(file)
-  //   //   },
-  //   //   onCancel() {
-  //   //     console.log('Cancel');
-  //   //   },
-  //   // });
-  //   // return false;
-	//
-  //   this.setState({
-  //     Modalstype:true,
-  //     Modalstopval:'确定要删除这个附件吗?',
-  //     ModalSave: ()=>this.deleteAttachment(file),
-  //     ModalCancel:this.cancelAttachment
-  //   })
-  //   return false;
-  // }
-
   cancelAttachment=()=>{
     this.setState({
       Modalstype:false,
@@ -165,7 +114,6 @@ class GraduationTasksedit extends Component{
 
 	onAttachmentRemove = (file) => {
 		if(!file.percent || file.percent == 100){
-			// debugger
 			this.cancelAttachment();
 			const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
 			// const url = `/attachments/${file}.json`
@@ -256,9 +204,9 @@ class GraduationTasksedit extends Component{
             if(response.status===200) {
               // console.log(response)
               // GraduationTasksedittype=false;
-              // window.location.href="/courses/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions";
+              // window.location.href="/classrooms/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions";
 							this.goback()
-              //this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting");
+              //this.props.history.push("/classrooms/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting");
             }
           }).catch((error) => {
             console.log(error)
@@ -366,14 +314,14 @@ class GraduationTasksedit extends Component{
 
               <p className="clearfix mt10">
                 <WordsBtn style="grey" className="fl">
-                  <Link to={`/courses/${graduationtask_id}`} className="color-grey-6">{this.props.current_user&&this.props.current_user.course_name}</Link>
+                  <Link to={`/classrooms/${graduationtask_id}`} className="color-grey-6">{this.props.current_user&&this.props.current_user.course_name}</Link>
                 </WordsBtn>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-                <WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+graduationtask_id} className="color-grey-6">毕设任务</Link></WordsBtn>
+                <WordsBtn style="grey" className="fl"> <Link to={"/classrooms/"+courseId+"/graduation_tasks/"+graduationtask_id} className="color-grey-6">毕设任务</Link></WordsBtn>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                 {name===""?"":
                   <WordsBtn style="grey" className="fl">
-                    <Link to={"/courses/"+courseId+"/graduation_tasks/"+graduationtask_id+"/detail/"+category_id+"/list"} className="color-grey-6">{name}</Link>
+                    <Link to={"/classrooms/"+courseId+"/graduation_tasks/"+graduationtask_id+"/detail/"+category_id+"/list"} className="color-grey-6">{name}</Link>
                     <span className="color-grey-9 ml3 mr3">&gt;</span>
                   </WordsBtn>
                 }
diff --git a/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index a5d4d701..06096913 100644
--- a/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -92,7 +92,7 @@ class GraduationTasksnew extends Component {
 							// this.goback();
 						if(response!==undefined){
 							// this.goback()
-							this.props.history.replace(`/courses/${coursesId}/graduation_tasks/${category_id}/detail/${response.data.task_id}/questions`);
+							this.props.history.replace(`/classrooms/${coursesId}/graduation_tasks/${category_id}/detail/${response.data.task_id}/questions`);
 						}
 						// }
 					}).catch((error) => {
@@ -110,12 +110,12 @@ class GraduationTasksnew extends Component {
 	goback = () => {
 		// let courseId = this.props.match.params.coursesId;
 		// if(courseId===undefined){
-		// 	this.props.history.push("/courses");
+		// 	this.props.history.push("/classrooms");
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
 		// this.props.history.goBack()
-		this.props.history.replace(`/courses/${this.props.match.params.coursesId}/graduation_tasks/${this.props.match.params.category_id}`);
+		this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/graduation_tasks/${this.props.match.params.category_id}`);
 	}
 
 
@@ -350,7 +350,7 @@ class GraduationTasksnew extends Component {
 								<WordsBtn style="grey" className="fl"> <a  onClick={this.goback} className="color-grey-6">{this.props.current_user && this.props.current_user.course_name}</a></WordsBtn>
 								<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 								<WordsBtn style="grey" className="fl"> <Link
-									to={"/courses/" + courseId + "/graduation_tasks/" + category_id} className="color-grey-6">毕设任务</Link></WordsBtn>
+									to={"/classrooms/" + courseId + "/graduation_tasks/" + category_id} className="color-grey-6">毕设任务</Link></WordsBtn>
 								<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 								<span>{"新建"}</span>
 							</p>
diff --git a/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index f87ea475..bff4e424 100644
--- a/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -344,7 +344,6 @@ class GraduationTaskssettingapp extends Component{
   }
 
   updatesfuncrosscomment=(types,newlatetime,newcommenttime)=>{
-  	debugger
 		let {endtimetype}=this.state;
 		if(types===1){
 				this.setState({
@@ -541,29 +540,29 @@ class GraduationTaskssettingapp extends Component{
         endTimetypes:false
       })
     }
-		debugger
+		
     if(moment(latetime)<=moment(publish_time)){
 
-    	debugger
+    	
       this.setState({
         latetimetype:true,
         latetimetypeval:"结束时间必须晚于发布时间"
       })
       return
     }else if(moment(latetime)<=moment(end_time)){
-			debugger
+			
       this.setState({
         latetimetype:true,
         latetimetypeval:"结束时间必须晚于截止时间"
       })
       return
     }else{
-			debugger
+			
       this.setState({
         latetimetype:false
       })
     }
-		debugger
+		
 
     if(crosscomment===true){
       if(this.state.commenttime===undefined||this.state.commenttime===null||this.state.commenttime===""){
diff --git a/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index e0ebdf24..805f93ce 100644
--- a/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -77,12 +77,12 @@ class GraduationTaskssettinglist extends Component{
 		// window.history.back(-1)
 		// let courseId=this.props.match.params.coursesId;
 		// if(courseId===undefined){
-		// 	this.props.history.push("/courses");
+		// 	this.props.history.push("/classrooms");
 		// }else{
 	  // this.props.history.push(this.props.current_user.first_category_url);
 		// }
 		// this.props.history.goBack()
-		this.props.history.replace(`/courses/${this.state.taskslistdata.course_id}/graduation_tasks/${this.state.taskslistdata.graduation_id}`);
+		this.props.history.replace(`/classrooms/${this.state.taskslistdata.course_id}/graduation_tasks/${this.state.taskslistdata.graduation_id}`);
 	}
 
 	reInit=()=>{
@@ -939,7 +939,7 @@ class GraduationTaskssettinglist extends Component{
 									{
 										tag.name &&
 										<Tooltip key={key} placement="bottom" title={tag.name==="分配"?taskslistdata&&taskslistdata.cross_comment===true?"":"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>其它历史评分将全部失效</pre>:""}>
-											{tag.name==="评阅"?<a target="_blank" style={{color:'#4CACFF',padding:"0px 5px"}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+											{tag.name==="评阅"?<a target="_blank" style={{color:'#4CACFF',padding:"0px 5px"}} href={"/classrooms/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
 													{tag.name}
 												</a>
 												:
@@ -958,7 +958,7 @@ class GraduationTaskssettinglist extends Component{
 								operation.map((tag,key) => {
 									return(
 										<div key={key}>
-											{tag.view_work===false?"--":<a style={{color:'#4CACFF'}} target="_blank" href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>}
+											{tag.view_work===false?"--":<a style={{color:'#4CACFF'}} target="_blank" href={"/classrooms/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>}
 										</div>
 									)}
 								):""
diff --git a/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
index 8d430b93..221d5137 100644
--- a/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
+++ b/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
@@ -67,16 +67,16 @@ class GraduationTasksquestions extends Component{
   goback=()=>{
     // let courseId=this.props.match.params.coursesId;
     // let category_id=this.props.match.params.category_id;
-    // window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id;
+    // window.location.href="/classrooms/"+courseId+"/graduation_tasks/"+category_id;
 		// let courseId = this.props.match.params.coursesId;
 		// if(courseId===undefined){
-		// 	this.props.history.push("/courses");
+		// 	this.props.history.push("/classrooms");
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
 
 		// this.props.history.goBack()
-		this.props.history.replace(`/courses/${this.state.questionslist.course_id}/graduation_tasks/${this.state.questionslist.graduation_id}`);
+		this.props.history.replace(`/classrooms/${this.state.questionslist.course_id}/graduation_tasks/${this.state.questionslist.graduation_id}`);
   }
 
   end=()=>{
diff --git a/src/modules/courses/graduation/tasks/index.js b/src/modules/courses/graduation/tasks/index.js
index c10fdc5f..ef1ff8e5 100644
--- a/src/modules/courses/graduation/tasks/index.js
+++ b/src/modules/courses/graduation/tasks/index.js
@@ -37,7 +37,7 @@ class GraduationTasks extends Component{
     }
   }
   fetchAll = (search,page,order,count) => {
-// debugger
+
     const cid = this.props.match.params.coursesId
 
 
@@ -568,7 +568,7 @@ class GraduationTasks extends Component{
   }
   // 题库选用成功后刷新页面
   useBankSuccess=(checkBoxValues,object_ids)=>{
-      //debugger
+      
     let {search,page,order,all_count} = this.state;
     this.fetchAll(search,page,order,all_count)
 
@@ -669,7 +669,7 @@ class GraduationTasks extends Component{
               {/*{this.props.isAdmin() ?<WordsBtn style="blue" className="mr30" onClick={() => this.addDir()}>题库选用</WordsBtn>:""}*/}
               {/*{this.props.isAdmin() ?<a href={"/api/graduation_tasks/"+category_id+"/tasks_list.xls"} className={"fr color-blue font-16"}>导出成绩</a> :""}*/}
               {this.props.isAdmin() ? <WordsBtn style="blue" className=" fr font-16">
-                <Link to={"/courses/" + coursesId + "/graduation_tasks/"+category_id+"/new"}>
+                <Link to={"/classrooms/" + coursesId + "/graduation_tasks/"+category_id+"/new"}>
                   <span className={"color-blue font-16"}>新建</span>
                 </Link>
               </WordsBtn> : ""}
@@ -708,7 +708,7 @@ class GraduationTasks extends Component{
           searchPlaceholder={"请输入名称进行搜索"}
           />
 
-        
+
           {/* <GraduateTaskItem></GraduateTaskItem>
 
           <FilesListItem></FilesListItem> */}
diff --git a/src/modules/courses/graduation/topics/GraduateTopicDetail.js b/src/modules/courses/graduation/topics/GraduateTopicDetail.js
index b4bcaf0f..50368fe9 100644
--- a/src/modules/courses/graduation/topics/GraduateTopicDetail.js
+++ b/src/modules/courses/graduation/topics/GraduateTopicDetail.js
@@ -88,7 +88,7 @@ class GraduateTopicDetail extends Component{
       }
     })
   }
-  
+
   render(){
     let {
       tableData,
@@ -107,14 +107,14 @@ class GraduateTopicDetail extends Component{
           <p className="clearfix mb15 lineh-20">
             <WordsBtn style="grey" className="fl" to={current_user&&current_user.first_category_url}>{tableData && tableData.course_name}</WordsBtn>
             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-            <WordsBtn style="grey" className="fl" to={`/courses/${tableData.course_id}/graduation_topics/${tableData.graduation_id}`}>{tableData.graduation_name}</WordsBtn>
+            <WordsBtn style="grey" className="fl" to={`/classrooms/${tableData.course_id}/graduation_topics/${tableData.graduation_id}`}>{tableData.graduation_name}</WordsBtn>
             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
             <span>选题详情</span>
           </p>
           <p className="clearfix mb20 lineh-25">
             <span className="color-grey-3 font-24 fl task-hide" style={{lineHeight:"25px",maxWidth:"900px"}}>{tableData && tableData.graduation_topic_name}</span>
             <span className="fl mt1" style={{height:"25px"}}><CoursesListType typelist={[`${tableData && tableData.status_name}`]} typesylename={""} /></span>
-            <WordsBtn className="fr font-16 mt1" style="grey" to={`/courses/${tableData.course_id}/graduation_topics/${tableData.graduation_id}`}>返回</WordsBtn>
+            <WordsBtn className="fr font-16 mt1" style="grey" to={`/classrooms/${tableData.course_id}/graduation_topics/${tableData.graduation_id}`}>返回</WordsBtn>
           </p>
           <div>
             <div className="clearfix edu-back-white bor-bottom-greyE" >
@@ -134,14 +134,14 @@ class GraduateTopicDetail extends Component{
                 <WordsBtn className="fr font-16 mt22 mr30" style="blue" onClick={this.actionTopic}>取消选题</WordsBtn>
               }
               {
-                isAdmin && <WordsBtn className="fr font-16 mt22 mr30" to={`/courses/${course_id}/graduation_topics/${graduation_topic_id}/edit`} style="blue">编辑</WordsBtn>
+                isAdmin && <WordsBtn className="fr font-16 mt22 mr30" to={`/classrooms/${course_id}/graduation_topics/${graduation_topic_id}/edit`} style="blue">编辑</WordsBtn>
               }
             </div>
             {
               tab && tab==1&&
               <div>
                 <div className="minH-560 edu-back-white">
-                  <DetailTable {...this.props} {...this.state} tableData={tableData} page={tablePage} getDetailList={this.getDetailList}></DetailTable>  
+                  <DetailTable {...this.props} {...this.state} tableData={tableData} page={tablePage} getDetailList={this.getDetailList}></DetailTable>
                 </div>
                 {
                   tableData && tableData.users_count>tablePageSize &&
@@ -161,4 +161,4 @@ class GraduateTopicDetail extends Component{
     )
   }
 }
-export default GraduateTopicDetail;
\ No newline at end of file
+export default GraduateTopicDetail;
diff --git a/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js b/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
index b0c65009..07e2b61b 100644
--- a/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
+++ b/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
@@ -33,13 +33,13 @@ class GraduateTopicDetailTable extends Component{
       modalsType:true,
       modalsTopval:'是否确认拒绝学生选题？',
       operationId:id
-    })    
-  } 
+    })
+  }
   cancelAboutTopic=()=>{
     this.setState({
       modalsType:false,
       modalsTopval:''
-    })  
+    })
   }
   sureAboutTopic=()=>{
     let{operationId}=this.state
@@ -151,7 +151,7 @@ class GraduateTopicDetailTable extends Component{
       })
       return;
     }
-    console.log(this.props)
+
     let{operationId}=this.state
     let courseId=this.props.match.params.course_id;
     this.agreeChoose(courseId,operationId,-1,un_addClass);
@@ -179,10 +179,10 @@ class GraduateTopicDetailTable extends Component{
           <span style={{"width":"15%"}}>选题时间</span>
           <span style={{"width":"12%"}} className="fr">操作</span>
           {
-            isAdmin && 
+            isAdmin &&
             <span style={{"width":"12%"}} className="fr">确认结果</span>
           }
-          
+
         </div>
         {/* 拒绝弹框 */}
         <Modals
@@ -262,7 +262,7 @@ class GraduateTopicDetailTable extends Component{
                   <span style={{"width":"15%"}}>{item.class_group_name || "--"}</span>
                   <span style={{"width":"15%"}}>{item.selected_time}</span>
                   {
-                    isAdmin && 
+                    isAdmin &&
                     <span style={{"width":"12%"}} className="fr">
                       {
                         item.result == "待确认" ?
@@ -275,7 +275,7 @@ class GraduateTopicDetailTable extends Component{
                           :
                           <a className="color-grey-B3" onClick={()=>this.aboutTopic(`${item.id}`)}>拒绝</a>
                         )
-                      }                      
+                      }
                     </span>
                   }
                   {
@@ -289,7 +289,7 @@ class GraduateTopicDetailTable extends Component{
                   {
                     isNotMember && <span style={{"width":"12%"}} className="fr color-grey-9">--</span>
                   }
-                  
+
                 </li>
               )
             })
diff --git a/src/modules/courses/graduation/topics/GraduateTopicItem.js b/src/modules/courses/graduation/topics/GraduateTopicItem.js
index 524e7d20..551f7f58 100644
--- a/src/modules/courses/graduation/topics/GraduateTopicItem.js
+++ b/src/modules/courses/graduation/topics/GraduateTopicItem.js
@@ -10,9 +10,9 @@ class GraduateTopicItem extends Component{
   constructor(props){
     super(props);
   }
-  editTopic=(topicId)=>{ 
+  editTopic=(topicId)=>{
     let courseId=this.props.match.params.coursesId;
-    this.props.history.push(`/courses/${courseId}/graduation_topics/${topicId}/edit`);
+    this.props.history.push(`/classrooms/${courseId}/graduation_topics/${topicId}/edit`);
   }
   toDetailPage=(topicId)=>{
 
@@ -32,7 +32,7 @@ class GraduateTopicItem extends Component{
 		// }
 
     let courseId=this.props.match.params.coursesId;
-    this.props.history.push(`/courses/${courseId}/graduation_topics/${topicId}/detail`);
+    this.props.history.push(`/classrooms/${courseId}/graduation_topics/${topicId}/detail`);
   }
   render(){
     const { checkBox, discussMessage, index,chooseTopic,
@@ -107,17 +107,17 @@ class GraduateTopicItem extends Component{
                     <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
                   </Tooltip>
                   :""
-              } 
+              }
               <CoursesListType typelist={[map[`${discussMessage.status}`]]} typesylename={""} />
             </h6>
-              
+
             <div className="cl"></div>
             <p className="color-grey mt20 clearfix">
               <span className="fl mr40 mt1">
                 <Tooltip title="指导老师" placement="bottom">
                   <span className="color-grey3">{discussMessage.author}</span>
                 </Tooltip>
-              </span>              
+              </span>
               <span className="fl mr20 color-grey-9 mt1">{discussMessage.selected_count} 已选</span>
               <span className="fl color-grey-9 mt1">{discussMessage.confirmation_count} 已确认</span>
               <span className="fr">
@@ -136,13 +136,13 @@ class GraduateTopicItem extends Component{
                   isStudent && data.user_selected == true && discussMessage.user_topic_status==0 &&
                   <WordsBtn onClick={()=>chooseTopic(`${discussMessage.id}`,index,true)} style="blue" className="font-16 mr20">
                     取消选题
-                  </WordsBtn>                   
+                  </WordsBtn>
                 }
                 {
                   isStudent && data.user_selected==false && (discussMessage.user_topic_status == null || discussMessage.user_topic_status == 2) &&
                   <WordsBtn onClick={()=>chooseTopic(`${discussMessage.id}`,index,false)} style="blue" className="font-16 mr20">
                     选题
-                  </WordsBtn>                   
+                  </WordsBtn>
                 }
 
 
@@ -154,4 +154,4 @@ class GraduateTopicItem extends Component{
       )
     }
 }
-export default GraduateTopicItem;
\ No newline at end of file
+export default GraduateTopicItem;
diff --git a/src/modules/courses/graduation/topics/GraduateTopicNew.js b/src/modules/courses/graduation/topics/GraduateTopicNew.js
index b086efed..433007c6 100644
--- a/src/modules/courses/graduation/topics/GraduateTopicNew.js
+++ b/src/modules/courses/graduation/topics/GraduateTopicNew.js
@@ -81,7 +81,7 @@ class GraduateTopicNew extends Component{
       this.getTeacherList();
     }else{
       this.getEditInfo();
-      
+
     }
   }
   //编辑，信息显示
@@ -162,8 +162,8 @@ class GraduateTopicNew extends Component{
             if (response.status == 200) {
               const { id } = response.data;
               if (id) {
-                this.props.showNotification('保存成功！');              
-                this.props.history.push(`/courses/${cid}/graduation_topics/${this.state.left_banner_id}`);
+                this.props.showNotification('保存成功！');
+                this.props.history.push(`/classrooms/${cid}/graduation_topics/${this.state.left_banner_id}`);
               }
             }
           }).catch(function (error) {
@@ -177,7 +177,7 @@ class GraduateTopicNew extends Component{
               return item.response.id
             })
           }
-          
+
           axios.post(url, {
             graduation_topic:{
               ...values,
@@ -189,8 +189,8 @@ class GraduateTopicNew extends Component{
             if (response.data) {
               const { id } = response.data;
               if (id) {
-                this.props.showNotification('提交成功！');              
-                this.props.history.push(`/courses/${cid}/graduation_topics/${this.state.left_banner_id}`);
+                this.props.showNotification('提交成功！');
+                this.props.history.push(`/classrooms/${cid}/graduation_topics/${this.state.left_banner_id}`);
               }
             }
           })
@@ -246,7 +246,7 @@ class GraduateTopicNew extends Component{
           const { status } = response.data;
           if (status == 0) {
             console.log('--- success')
-            
+
             this.setState((state) => {
               const index = state.fileList.indexOf(file);
               const newFileList = state.fileList.slice();
@@ -335,13 +335,13 @@ class GraduateTopicNew extends Component{
             <p className="clearfix mb20 mt10">
               <WordsBtn style="grey" className="fl" to={current_user&&current_user.first_category_url}>{course_name}</WordsBtn>
               <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-              <WordsBtn style="grey" className="fl" to={`/courses/${coursesId}/graduation_topics/${left_banner_id}`}>{left_banner_name}</WordsBtn>
+              <WordsBtn style="grey" className="fl" to={`/classrooms/${coursesId}/graduation_topics/${left_banner_id}`}>{left_banner_name}</WordsBtn>
               <span className="color-grey-9 fl ml3 mr3">&gt;</span>
               <span>{topicId==undefined?"新建":"编辑"}</span>
             </p>
             <div className="clearfix mb20 lineh-25">
               <p className="fl color-black summaryname">{topicId==undefined?"新建":"编辑"}毕设选题</p>
-              <Link to={`/courses/${coursesId}/graduation_topics/${left_banner_id}`} className="color-grey-6 fr font-16">返回</Link>
+              <Link to={`/classrooms/${coursesId}/graduation_topics/${left_banner_id}`} className="color-grey-6 fr font-16">返回</Link>
             </div>
 
             <Form {...formItemLayout} onSubmit={this.handleSubmit}>
@@ -546,7 +546,7 @@ class GraduateTopicNew extends Component{
                   </Form.Item>
                 </div>
               </div>
-              
+
 
               <style>{`
                 .courseForm .flexBlock.formBlock {
@@ -566,7 +566,7 @@ class GraduateTopicNew extends Component{
                   min-width:125px!important;
                 }
               `}</style>
-              
+
 
               <div className="createPage" style={{"borderBottom":"none"}}>
                 <Form.Item
@@ -615,7 +615,7 @@ class GraduateTopicNew extends Component{
                   <City ></City>
                 )}
                 </Form.Item>
-              </div>  
+              </div>
 
               <Form.Item>
                 <div className="clearfix mt30 mb30">
@@ -632,4 +632,4 @@ class GraduateTopicNew extends Component{
 
 const WrappedGraduateTopicNew = Form.create({ name: 'topicPostWorksNew' })(GraduateTopicNew);
 // RouteHOC()
-export default (WrappedGraduateTopicNew);
\ No newline at end of file
+export default (WrappedGraduateTopicNew);
diff --git a/src/modules/courses/graduation/topics/index.js b/src/modules/courses/graduation/topics/index.js
index fb3d6bab..2fe241a5 100644
--- a/src/modules/courses/graduation/topics/index.js
+++ b/src/modules/courses/graduation/topics/index.js
@@ -1,10 +1,10 @@
-import React,{ Component } from "react";
-import {Checkbox, Menu, Pagination,Spin} from "antd";
+import React, { Component } from "react";
+import { Checkbox, Menu, Pagination, Spin } from "antd";
 
 import Titlesearchsection from '../../common/titleSearch/TitleSearchSection'
 import DownloadMessageysl from "../../../modals/DownloadMessageysl";
 
-import { WordsBtn ,getRandomcode,getRandomNumber} from 'educoder'
+import { WordsBtn, getRandomcode, getRandomNumber } from 'educoder'
 import NoneData from '../../coursesPublic/NoneData'
 import Modals from "../../../modals/Modals"
 import axios from 'axios'
@@ -18,88 +18,88 @@ import '../../css/busyWork.css'
 import '../style.css'
 
 
-class Boards extends Component{
-  constructor(props){
+class Boards extends Component {
+  constructor(props) {
     super(props);
     this.state = {
       searchValue: '',
       checkAllValue: false,
       checkBoxValues: [],
-      data:[],
+      data: [],
       topicList: undefined,
-      course_public:1,
-      page:1,
-      totalCount:undefined,
-      status:"all",
-      pageSize:15,
-      modalsType:"",
-      modalsTopval:"",
-      modalsBottomval:"",
-      topicId:undefined,
-      index:undefined,
-      flag:true,
-      delType:false,
-      delTopval:"",
-      delLoadType:false,
-      delOrPublic:1,
-      isSpin:true,
-      DownloadType:false,
-      DownloadMessageval:undefined,
+      course_public: 1,
+      page: 1,
+      totalCount: undefined,
+      status: "all",
+      pageSize: 15,
+      modalsType: "",
+      modalsTopval: "",
+      modalsBottomval: "",
+      topicId: undefined,
+      index: undefined,
+      flag: true,
+      delType: false,
+      delTopval: "",
+      delLoadType: false,
+      delOrPublic: 1,
+      isSpin: true,
+      DownloadType: false,
+      DownloadMessageval: undefined,
     }
   }
-  fetchAll = (searchValue,page,status) => {
+  fetchAll = (searchValue, page, status) => {
     this.setState({
       checkAllValue: false,
-      isSpin:true
+      isSpin: true
     })
 
-    let {pageSize}=this.state;
+    let { pageSize } = this.state;
     const cid = this.props.match.params.coursesId
 
     let url = `/courses/${cid}/graduation_topics.json?limit=${pageSize}`
-    if(searchValue!=""){
-      url+="&search="+searchValue
+    if (searchValue != "") {
+      url += "&search=" + searchValue
     }
-    if(page!=""){
-      url+="&page="+page
+    if (page != "") {
+      url += "&page=" + page
     }
-    if(status!="" && status != "all"){
-      url+="&status="+status;
+    if (status != "" && status != "all") {
+      url += "&status=" + status;
     }
-    url=encodeURI(url);//IE11传参为乱码（search）
+    url = encodeURI(url);//IE11传参为乱码（search）
     axios.get(url
-    //   ,{
-    //   params:{
-    //     search:encodeURI(searchValue),
-    //     page:page,
-    //     status:status,
-    //     limit:pageSize
-    //   }
-    // }
+      //   ,{
+      //   params:{
+      //     search:encodeURI(searchValue),
+      //     page:page,
+      //     status:status,
+      //     limit:pageSize
+      //   }
+      // }
     ).then((response) => {
       if (response.status == 200 && response.status) {
         this.setState({
-          data:response.data,
-          topicList:response.data.graduation_topic,
-          totalCount:response.data.graduation_topic_count,
-          course_public:response.data.course_public,
-          isSpin:false,
-          page:page
+          data: response.data,
+          topicList: response.data.graduation_topic,
+          totalCount: response.data.graduation_topic_count,
+          course_public: response.data.course_public,
+          isSpin: false,
+          page: page
         })
       }
     })
-    .catch(function (error) {
-      this.setState({
-        isSpin:false
-      })
-    });
+      .catch(function (error) {
+        this.setState({
+          isSpin: false
+        })
+      });
   }
   componentDidMount = () => {
     this.setState({
-      isSpin:true
+      isSpin: true
     })
-    let{searchValue,page,status}=this.state
-    this.fetchAll(searchValue,page,status);
+    let { searchValue, page, status } = this.state
+    this.fetchAll(searchValue, page, status);
 
   }
 
@@ -108,17 +108,17 @@ class Boards extends Component{
   //搜索
   onPressEnter = (value) => {
     this.setState({
-      page:1,
-      searchValue:value,
-      checkBoxValues:[]
+      page: 1,
+      searchValue: value,
+      checkBoxValues: []
     })
-    let {status}=this.state;
-    this.fetchAll(value,1,status);
+    let { status } = this.state;
+    this.fetchAll(value, 1, status);
   }
 
   onInputSearchChange = (e) => {
     this.setState({
-      searchValue:e.target.value,
+      searchValue: e.target.value,
     })
   }
 
@@ -133,7 +133,7 @@ class Boards extends Component{
     })
     if (e.target.checked) {
       const concated = this.state.checkBoxValues.concat(values);
-      const uniq=_.uniq(concated)
+      const uniq = _.uniq(concated)
       this.setState({
         checkBoxValues: uniq
       })
@@ -148,7 +148,7 @@ class Boards extends Component{
     const checkBoxValues = this.state.checkBoxValues.slice(0);
     const index = checkBoxValues.indexOf(item.id);
     if (index != -1) {
-      _.remove(checkBoxValues, (listItem)=> listItem === item.id)
+      _.remove(checkBoxValues, (listItem) => listItem === item.id)
     } else {
       checkBoxValues.push(item.id)
     }
@@ -163,219 +163,221 @@ class Boards extends Component{
   }
 
   // 分页
-  onChangePage=(pageNum)=>{
+  onChangePage = (pageNum) => {
     this.setState({
-      page:pageNum,
-			checkBoxValues:[]
+      page: pageNum,
+      checkBoxValues: []
     })
-    let {status,searchValue}=this.state;
-    this.fetchAll(searchValue,pageNum,status);
-    console.log(this.state.checkBoxValues);
+    let { status, searchValue } = this.state;
+    this.fetchAll(searchValue, pageNum, status);
+
   }
 
   // 筛选
-  onChangeStatus =(e)=>{
+  onChangeStatus = (e) => {
     this.setState({
-      page:1,
-      status:e.key,
-      checkBoxValues:[],
-      isSpin:true
+      page: 1,
+      status: e.key,
+      checkBoxValues: [],
+      isSpin: true
     })
-    let {searchValue}=this.state;
-    this.fetchAll(searchValue,1,e.key==="all"?"":e.key);
+    let { searchValue } = this.state;
+    this.fetchAll(searchValue, 1, e.key === "all" ? "" : e.key);
   }
 
   // 选题or取消选题
-  chooseTopic=(topicId,index,flag)=>{
+  chooseTopic = (topicId, index, flag) => {
     this.setState({
-      modalsType:true,
-      modalsTopval:flag ==true ? "是否确认取消选题？":"是否确认选题？",
-      modalsBottomval:"",
-      modalCancel:true,
-      topicId:topicId,
-      index:index,
-      flag:flag
+      modalsType: true,
+      modalsTopval: flag == true ? "是否确认取消选题？" : "是否确认选题？",
+      modalsBottomval: "",
+      modalCancel: true,
+      topicId: topicId,
+      index: index,
+      flag: flag
     })
   }
-  cancelOperateTopic=()=>{
+  cancelOperateTopic = () => {
     this.setState({
-      modalsType:false,
-      modalsTopval:"",
-      modalsBottomval:"",
-      modalCancel:false
+      modalsType: false,
+      modalsTopval: "",
+      modalsBottomval: "",
+      modalCancel: false
     })
   }
-  sureOperateTopic=()=>{
-    let{topicId,index,flag}=this.state;
-    let courseid=this.props.match.params.coursesId
+  sureOperateTopic = () => {
+    let { topicId, index, flag } = this.state;
+    let courseid = this.props.match.params.coursesId
 
-    let url="/courses/"+courseid+"/graduation_topics/"+topicId+"/"
-    if(flag){
-      url+="student_cancel_topic.json"
-    }else{
-      url+="student_select_topic.json"
+    let url = "/courses/" + courseid + "/graduation_topics/" + topicId + "/"
+    if (flag) {
+      url += "student_cancel_topic.json"
+    } else {
+      url += "student_select_topic.json"
     }
-    axios.post((url)).then((result)=>{
-      if(result.data.status == 0){
+    axios.post((url)).then((result) => {
+      if (result.data.status == 0) {
         this.props.showNotification(`${result.data.message}`);
-        let {searchValue,page,status} =this.state
-        this.fetchAll(searchValue,page,status);
+        let { searchValue, page, status } = this.state
+        this.fetchAll(searchValue, page, status);
         this.cancelOperateTopic();
       }
-    }).catch(error=>{
+    }).catch(error => {
       console.log(error);
     })
   }
-// 删除
-onDelete=(index)=>{
-  let {checkBoxValues}=this.state;
-  if(checkBoxValues.length>0){
-    if(index<3){
+  // 删除
+  onDelete = (index) => {
+    let { checkBoxValues } = this.state;
+    if (checkBoxValues.length > 0) {
+      if (index < 3) {
+        this.setState({
+          delType: true,
+          delTopval: index == 1 ? "是否确认删除?" : "是否设为公开?",
+          delLoadType: false,
+          delOrPublic: index
+        })
+      } else {
+        // 加入题库
+        let courseid = this.props.match.params.coursesId
+        let url = `/courses/${courseid}/graduation_topics/add_to_bank.json`;
+        axios.post((url), {
+          topic_ids: checkBoxValues
+        }).then((result) => {
+          if (result) {
+            this.props.showNotification(`题库更新成功`);
+            let { searchValue, page, status } = this.state
+            this.fetchAll(searchValue, page, status);
+            this.setState({
+              checkBoxValues: [],
+              checkAllValue: false
+            })
+          }
+        }).catch((error) => {
+          console.log(error)
+        })
+      }
+
+    } else {
       this.setState({
-        delType:true,
-        delTopval:index==1?"是否确认删除?":"是否设为公开?",
-        delLoadType:false,
-        delOrPublic:index
-      })
-    }else{
-      // 加入题库
-      let courseid=this.props.match.params.coursesId
-      let url=`/courses/${courseid}/graduation_topics/add_to_bank.json`;
-      axios.post((url),{
-        topic_ids:checkBoxValues
-      }).then((result)=>{
-        if(result){
-          this.props.showNotification(`题库更新成功`);
-          let {searchValue,page,status} =this.state
-          this.fetchAll(searchValue,page,status);
-          this.setState({
-            checkBoxValues:[],
-            checkAllValue:false
-          })
-        }
-      }).catch((error)=>{
-        console.log(error)
+        // delType:true,
+        // delTopval:"请先在列表中选择数据",
+        // delLoadType:true,
+        delOrPublic: index
       })
+      this.props.showNotification("请先在列表中选择数据");
     }
-
-  }else{
-    this.setState({
-      // delType:true,
-      // delTopval:"请先在列表中选择数据",
-      // delLoadType:true,
-      delOrPublic:index
-    })
-    this.props.showNotification("请先在列表中选择数据");
   }
-}
-cancelDelTopic=()=>{
-  this.setState({
-    delType:false,
-    delTopval:"",
-    delLoadType:false
-  })
-}
-sureDelTopic=()=>{
-  let {checkBoxValues,delOrPublic}=this.state;
-  if(checkBoxValues.length>0){
-    let courseid=this.props.match.params.coursesId;
-    let url="";
-    // 删除
-    if(delOrPublic==1){
-      url="/courses/"+courseid+"/graduation_topics/destroys.json";
-      axios.delete((url), { data: {
-        graduation_topic_ids: this.state.checkBoxValues
-      }})
-      .then((result)=>{
-        if(result.data.status==0){
-          this.props.showNotification(`${result.data.message}`);
-          this.setState({
-            delType:false,
-            delTopval:"",
-            checkBoxValues:[]
-          })
-          let {searchValue,status} =this.state;
-          this.fetchAll(searchValue,1,status);
-        }
-      }).catch((error)=>{
-        console.log(error);
-      })
-    }else if(delOrPublic==2){
-      // 设为公开
-      url="/courses/"+courseid+"/graduation_topics/set_public.json";
-      axios.post((url), {
-        graduation_topic_ids: this.state.checkBoxValues
-      }).then((result)=>{
-        if(result.data.status==0){
-          this.props.showNotification(`${result.data.message}`);
-          this.setState({
-            delType:false,
-            delTopval:"",
-            checkBoxValues:[]
-          })
-          let {searchValue,status} =this.state;
-          this.fetchAll(searchValue,1,status);
-        }
-      }).catch((error)=>{
-        console.log(error);
-      })
-    }
-  }else{
+  cancelDelTopic = () => {
     this.setState({
-      delType:false,
-      delTopval:"",
-      delLoadType:false
+      delType: false,
+      delTopval: "",
+      delLoadType: false
     })
   }
-}
-// 新建
-onBoardsNew=()=>{
-  let courseId=this.props.match.params.coursesId
-  this.props.history.push(`/courses/${courseId}/graduation_topics/new`)
-}
+  sureDelTopic = () => {
+    let { checkBoxValues, delOrPublic } = this.state;
+    if (checkBoxValues.length > 0) {
+      let courseid = this.props.match.params.coursesId;
+      let url = "";
+      // 删除
+      if (delOrPublic == 1) {
+        url = "/courses/" + courseid + "/graduation_topics/destroys.json";
+        axios.delete((url), {
+          data: {
+            graduation_topic_ids: this.state.checkBoxValues
+          }
+        })
+          .then((result) => {
+            if (result.data.status == 0) {
+              this.props.showNotification(`${result.data.message}`);
+              this.setState({
+                delType: false,
+                delTopval: "",
+                checkBoxValues: []
+              })
+              let { searchValue, status } = this.state;
+              this.fetchAll(searchValue, 1, status);
+            }
+          }).catch((error) => {
+            console.log(error);
+          })
+      } else if (delOrPublic == 2) {
+        // 设为公开
+        url = "/courses/" + courseid + "/graduation_topics/set_public.json";
+        axios.post((url), {
+          graduation_topic_ids: this.state.checkBoxValues
+        }).then((result) => {
+          if (result.data.status == 0) {
+            this.props.showNotification(`${result.data.message}`);
+            this.setState({
+              delType: false,
+              delTopval: "",
+              checkBoxValues: []
+            })
+            let { searchValue, status } = this.state;
+            this.fetchAll(searchValue, 1, status);
+          }
+        }).catch((error) => {
+          console.log(error);
+        })
+      }
+    } else {
+      this.setState({
+        delType: false,
+        delTopval: "",
+        delLoadType: false
+      })
+    }
+  }
+  // 新建
+  onBoardsNew = () => {
+    let courseId = this.props.match.params.coursesId
+    this.props.history.push(`/classrooms/${courseId}/graduation_topics/new`)
+  }
   /// 确认是否下载
-  confirmysl(url){
+  confirmysl(url) {
     axios.get(url + '&export=true').then((response) => {
-      if(response.data.status&&response.data.status===-1){
+      if (response.data.status && response.data.status === -1) {
 
-      }else if(response.data.status&&response.data.status===-2){
-        if(response.data.message === "100"){
+      } else if (response.data.status && response.data.status === -2) {
+        if (response.data.message === "100") {
           // 已超出文件导出的上限数量（100 ），建议：
 
           this.setState({
-            DownloadType:true,
-            DownloadMessageval:100
+            DownloadType: true,
+            DownloadMessageval: 100
           })
-        }else {
+        } else {
           //因附件资料超过500M
           this.setState({
-            DownloadType:true,
-            DownloadMessageval:500
+            DownloadType: true,
+            DownloadMessageval: 500
           })
         }
-      }else {
+      } else {
         this.props.showNotification(`正在下载中`);
-        window.open(getRandomcode("/api"+url), '_blank');
+        window.open(getRandomcode("/api" + url), '_blank');
       }
     }).catch((error) => {
       console.log(error)
     });
   }
 
-  Downloadcal=()=>{
+  Downloadcal = () => {
     this.setState({
-      DownloadType:false,
-      DownloadMessageval:undefined
+      DownloadType: false,
+      DownloadMessageval: undefined
     })
   }
 
-	// 题库选用成功后刷新页面
-	useBankSuccess=(checkBoxValues,object_ids)=>{
-		//debugger
-		let {searchValue,page,status} =this.state
-		this.fetchAll(searchValue,page,status);
-	}
-  render(){
+  // 题库选用成功后刷新页面
+  useBankSuccess = (checkBoxValues, object_ids) => {
+
+    let { searchValue, page, status } = this.state
+    this.fetchAll(searchValue, page, status);
+  }
+  render() {
     let {
       searchValue,
       topicList,
@@ -396,8 +398,8 @@ onBoardsNew=()=>{
       delLoadType
     } = this.state;
     // let {course_identity}=this.props.coursedata
-    const isAdmin =this.props.isAdmin();
-    return(
+    const isAdmin = this.props.isAdmin();
+    return (
       <React.Fragment >
         <ChooseGraduateTopicModal ref="chooseGraduateTopicModal"></ChooseGraduateTopicModal>
         <DownloadMessageysl
@@ -406,69 +408,69 @@ onBoardsNew=()=>{
           modalCancel={this.Downloadcal}
           modalsType={this.state.DownloadType}
         />
-          <Titlesearchsection
-            title="毕设选题"
-            searchValue={ searchValue }
-            onInputSearchChange={this.onInputSearchChange}
-            allowClearonChange={this.onInputSearchChange}
-            firstRowRight=
-            { isAdmin ?
-              (<React.Fragment>
-                {/* 参考普通作业 - 题库选用 */}
-                {/* <WordsBtn style="blue" className="mr30" onClick={()=>this.useFromBank()}>题库选用</WordsBtn> 正式版没有，先隐藏*/}
-                < a  className={"fl color-blue mr30 font-16"} onClick={(url)=>this.confirmysl(`/courses/${this.props.match.params.coursesId}/graduation_topics/export.xlsx`)}>导出</a>
-                {/*<p className="fl"><UseBank {...this.props} {...this.state} object_type={"gtopic"} useBankSuccess={this.useBankSuccess}></UseBank></p> 题库选用*/}
-                <WordsBtn style="blue" className="font-16" onClick={()=>this.onBoardsNew()}>新建</WordsBtn>
-              </React.Fragment>):""
-            }
-            secondRowLeft={
-              <div className="fl mt6 task_menu_ul">
-                <Menu mode="horizontal" defaultSelectedKeys="all" onClick={this.onChangeStatus}>
-                  <Menu.Item key="all">全部</Menu.Item>
-                  <Menu.Item key="0">待选中</Menu.Item>
-                  <Menu.Item key="1">待确认</Menu.Item>
-                  <Menu.Item key="2">已确认</Menu.Item>
-                </Menu>
-              </div>
-            }
-            onPressEnter={this.onPressEnter}
-            searchPlaceholder={"请输入名称进行搜索"}
-            showSearchInput={topicList&&topicList.length >= pageSize}
-          ></Titlesearchsection>
+        <Titlesearchsection
+          title="毕设选题"
+          searchValue={searchValue}
+          onInputSearchChange={this.onInputSearchChange}
+          allowClearonChange={this.onInputSearchChange}
+          firstRowRight=
+          {isAdmin ?
+            (<React.Fragment>
+              {/* 参考普通作业 - 题库选用 */}
+              {/* <WordsBtn style="blue" className="mr30" onClick={()=>this.useFromBank()}>题库选用</WordsBtn> 正式版没有，先隐藏*/}
+              < a className={"fl color-blue mr30 font-16"} onClick={(url) => this.confirmysl(`/courses/${this.props.match.params.coursesId}/graduation_topics/export.xlsx`)}>导出</a>
+              {/*<p className="fl"><UseBank {...this.props} {...this.state} object_type={"gtopic"} useBankSuccess={this.useBankSuccess}></UseBank></p> 题库选用*/}
+              <WordsBtn style="blue" className="font-16" onClick={() => this.onBoardsNew()}>新建</WordsBtn>
+            </React.Fragment>) : ""
+          }
+          secondRowLeft={
+            <div className="fl mt6 task_menu_ul">
+              <Menu mode="horizontal" defaultSelectedKeys="all" onClick={this.onChangeStatus}>
+                <Menu.Item key="all">全部</Menu.Item>
+                <Menu.Item key="0">待选中</Menu.Item>
+                <Menu.Item key="1">待确认</Menu.Item>
+                <Menu.Item key="2">已确认</Menu.Item>
+              </Menu>
+            </div>
+          }
+          onPressEnter={this.onPressEnter}
+          searchPlaceholder={"请输入名称进行搜索"}
+          showSearchInput={topicList && topicList.length >= pageSize}
+        ></Titlesearchsection>
         <Spin size="large" spinning={this.state.isSpin}>
           {
             topicList && topicList.length > 0 ?
-            (
-              <div>
-                {
-                  // 超级管理员、教师、助教
-                  isAdmin ?
-                  <div className="clearfix mt20 edu-back-white padding20-30">
-                    <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个    （不支持跨页勾选）</Checkbox>
-                    <div className="studentList_operation_ul">
-                      <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={()=>this.onDelete(1)}>删除</a></li>
-                      {
-                        course_public && course_public==1 ? <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={()=>this.onDelete(2)}>设为公开</a></li>:""
-                      }
-                      {/*<li className="li_line"><a className="color-grey-9" onClick={()=>this.onDelete(3)}>加入题库</a></li>*/}
-                      {/* <li className="li_line"><a href="javascript:void(0)" className="color-grey-9">加入题库</a></li> */}
-                    </div>
-                  </div>
-                  :""
-                }
-                <Modals
-                  modalsType={delType}
-                  modalsTopval={delTopval}
-                  modalsBottomval=""
-                  modalCancel={this.cancelDelTopic}
-                  modalSave={this.sureDelTopic}
-                  loadtype={delLoadType}
-                >
-                </Modals>
+              (
+                <div>
+                  {
+                    // 超级管理员、教师、助教
+                    isAdmin ?
+                      <div className="clearfix mt20 edu-back-white padding20-30">
+                        <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个    （不支持跨页勾选）</Checkbox>
+                        <div className="studentList_operation_ul">
+                          <li className="li_line"><a className="color-grey-9" onClick={() => this.onDelete(1)}>删除</a></li>
+                          {
+                            course_public && course_public == 1 ? <li className="li_line"><a className="color-grey-9" onClick={() => this.onDelete(2)}>设为公开</a></li> : ""
+                          }
+                          {/*<li className="li_line"><a className="color-grey-9" onClick={()=>this.onDelete(3)}>加入题库</a></li>*/}
+                          {/* <li className="li_line"><a   className="color-grey-9">加入题库</a></li> */}
+                        </div>
+                      </div>
+                      : ""
+                  }
+                  <Modals
+                    modalsType={delType}
+                    modalsTopval={delTopval}
+                    modalsBottomval=""
+                    modalCancel={this.cancelDelTopic}
+                    modalSave={this.sureDelTopic}
+                    loadtype={delLoadType}
+                  >
+                  </Modals>
 
-                <div className="clearfix stu_table mt20">
-                <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
-                    { topicList.map((item, index) => {
+                  <div className="clearfix stu_table mt20">
+                    <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
+                      {topicList.map((item, index) => {
                         return (
                           <div>
                             <GraduateTopicItem
@@ -483,35 +485,35 @@ onBoardsNew=()=>{
                           </div>
                         )
                       })
-                    }
-                  </Checkbox.Group>
-                </div>
+                      }
+                    </Checkbox.Group>
+                  </div>
 
-                <Modals
-                  modalsType={modalsType}
-                  modalsTopval={modalsTopval}
-                  modalsBottomval={modalsBottomval}
-                  modalCancel={this.cancelOperateTopic}
-                  modalSave={this.sureOperateTopic}
-                >
-                </Modals>
-              </div>
-						):(topicList && topicList.length===0?<NoneData></NoneData>:<div className="clearfix stu_table mt20"></div>)
+                  <Modals
+                    modalsType={modalsType}
+                    modalsTopval={modalsTopval}
+                    modalsBottomval={modalsBottomval}
+                    modalCancel={this.cancelOperateTopic}
+                    modalSave={this.sureOperateTopic}
+                  >
+                  </Modals>
+                </div>
+              ) : (topicList && topicList.length === 0 ? <NoneData></NoneData> : <div className="clearfix stu_table mt20"></div>)
           }
         </Spin>
-          {
-            totalCount && totalCount > pageSize ?
+        {
+          totalCount && totalCount > pageSize ?
             <div className="padding30 edu-txt-center clearfix">
               <Pagination defaultCurrent={page} current={page} pageSize={pageSize} showQuickJumper onChange={this.onChangePage} total={totalCount}></Pagination>
             </div>
             :
             <div></div>
-          }
+        }
 
         <div>
         </div>
       </React.Fragment>
-      )
-    }
+    )
+  }
 }
-export default Boards;
\ No newline at end of file
+export default Boards;
diff --git a/src/modules/courses/members/CourseGroupChooser.js b/src/modules/courses/members/CourseGroupChooser.js
index 655754dc..37a8fcab 100644
--- a/src/modules/courses/members/CourseGroupChooser.js
+++ b/src/modules/courses/members/CourseGroupChooser.js
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react'
 import { trigger } from 'educoder'
 import { Input, Checkbox } from "antd";
 
-/** 
+/**
     arg_course_groups   选中的id数组
     joinCourseGroup     选中时触发   joinCourseGroup(checkedValues, item, index)  传入item：数据对象，index： 数据对象index
     checkAllValue       是否全选
@@ -11,8 +11,8 @@ import { Input, Checkbox } from "antd";
 
 */
 function CourseGroupChooser({ course_groups, isAdminOrCreator = true, item, index, arg_course_groups, checkAllValue, alwaysShow
-        , onCheckAllChange, joinCourseGroup }) {
-    const [state, setState] = useState({counter: 0})
+    , onCheckAllChange, joinCourseGroup }) {
+    const [state, setState] = useState({ counter: 0 })
     const [search, setSearch] = useState('')
     // useEffect(() => {
     //     console.log(' cdm')
@@ -33,61 +33,62 @@ function CourseGroupChooser({ course_groups, isAdminOrCreator = true, item, inde
         that.setState({groupSearchValue: e.target.value})
 
         that.onCheckAllChange(e, item, index)    -    onCheckAllChange(e, item, index)
-        that.joinCourseGroup(checkedValues, item, index)    -    joinCourseGroup(checkedValues, item, index)  
+        that.joinCourseGroup(checkedValues, item, index)    -    joinCourseGroup(checkedValues, item, index)
 
         that.state.checkAllArray[index] - checkAllValue
      */
 
-     console.log('arg_course_groups', arg_course_groups)
-     
+    //  console.log('arg_course_groups', arg_course_groups)
 
-    const urlStyle = {"left":"unset", minWidth: '262px'};
+
+    const urlStyle = { "left": "unset", minWidth: '262px' };
     if (alwaysShow == true) {
         urlStyle.display = 'block'
     }
     return (
         <ul className="drop_down_menu" style={urlStyle}>
             {
-            course_groups && course_groups.length > 10?
-            (<p className="drop_down_search">
-                <Input placeholder="搜索" value={search} onChange={(e) => {setSearch(e.target.value)}} allowClear/>
-            </p>):
-            ''
+                course_groups && course_groups.length > 10 ?
+                    (<p className="drop_down_search">
+                        <Input placeholder="搜索" value={search} onChange={(e) => { setSearch(e.target.value) }} allowClear />
+                    </p>) :
+                    ''
             }
-            
-            <Checkbox.Group onChange={(checkedValues) => joinCourseGroup(checkedValues, item, index)} 
-                value={arg_course_groups.length && arg_course_groups[0].id ? arg_course_groups.map(item => item.id): arg_course_groups}
+
+            <Checkbox.Group onChange={(checkedValues) => joinCourseGroup(checkedValues, item, index)}
+                value={arg_course_groups.length && arg_course_groups[0].id ? arg_course_groups.map(item => item.id) : arg_course_groups}
                 disabled={!isAdminOrCreator} className="mainGroup"
             >
                 {course_groups && course_groups.length > 1 && <li key={'_all' + index} >
-                {/* 防止被外面group包裹 */}
-                <Checkbox.Group onChange={(e) => onCheckAllChange(e, item, index)} value={[checkAllValue]}>
-                    <Checkbox 
-                        value={true}
-                        style={{ marginRight: '6px' }} onClick={() => {}} 
-                    >全选</Checkbox>
-                </Checkbox.Group>
+                    {/* 防止被外面group包裹 */}
+                    <Checkbox.Group onChange={(e) => onCheckAllChange(e, item, index)} value={[checkAllValue]}>
+                        <Checkbox
+                            value={true}
+                            disabled={!isAdminOrCreator}
+                            style={{ marginRight: '6px' }} onClick={() => { }}
+                        >全选</Checkbox>
+                    </Checkbox.Group>
                 </li>}
-            {
-            course_groups && course_groups.filter((item) => {
-                return (!search || item.name.indexOf(search) != -1)
-            }).map((item,key)=>{
-                return(
-                    <li key={item.id} value={item.id} >
-                    <Checkbox value={item.id}
-															key={item.id}
-                        id={`check${item.id}`}
-                        style={{ marginRight: '6px' }}
-                    ></Checkbox>
-                        <label for={`check${item.id}`}>{item.name}</label>
-                    </li>
-                )
-            })
-            }
-            
+                {
+                    course_groups && course_groups.filter((item) => {
+                        return (!search || item.name.indexOf(search) != -1)
+                    }).map((item, key) => {
+                        return (
+                            <li key={item.id} value={item.id} >
+                                <Checkbox value={item.id}
+                                    key={item.id}
+                                    id={`check${item.id}`}
+                                    style={{ marginRight: '6px' }}
+                                ></Checkbox>
+                                <label for={`check${item.id}`}>{item.name}</label>
+                            </li>
+                        )
+                    })
+                }
+
             </Checkbox.Group>
             <p className="drop_down_btn">
-                <a href="javascript:void(0)" className="color-grey-6"
+                <a className="color-grey-6"
                     onClick={() => trigger('groupAdd')}
                 >新建分班</a>
             </p>
diff --git a/src/modules/courses/members/CourseGroupList.js b/src/modules/courses/members/CourseGroupList.js
index 597357a9..d5353a04 100644
--- a/src/modules/courses/members/CourseGroupList.js
+++ b/src/modules/courses/members/CourseGroupList.js
@@ -27,7 +27,8 @@ import './studentsList.css'
     角色数组, CREATOR: 创建者, PROFESSOR: 教师, ASSISTANT_PROFESSOR: 助教, STUDENT: 学生
 */
 function CourseGroupList(props) {
-    const [searchValue, setSearchValue] = useState('')
+    const [searchValue, setSearchValue] = useState('');
+    const [valueFlag,setValueFlag] = useState(false);
     const [isSpin, setIsSpin] = useState(true)
 
     const [DownloadType, setDownloadType] = useState()
@@ -44,14 +45,14 @@ function CourseGroupList(props) {
         return () => {
             off('updateNavSuccess', onOperationSuccess)
         }
-    }, [])
+    }, [valueFlag])
     function onOperationSuccess() {
         fetchAll()
         props.updataleftNavfun()
     }
     async function fetchAll() {
-        const url = `/courses/${courseId}/course_groups.json`
-        setIsSpin(true)
+        const url = `/courses/${courseId}/course_groups.json`;
+        setIsSpin(true);
         const response = await axios.get(url, { params: {
             search: searchValue
         }});
@@ -73,8 +74,10 @@ function CourseGroupList(props) {
     function deleteDir() {
 
     }
-    function onPressEnter() {
-        fetchAll()
+    function onPressEnter(value) {
+        setSearchValue(value);
+        setValueFlag(!valueFlag);
+        // fetchAll();
     }
     function onInputSearchChange(e) {
         setSearchValue(e.target.value)
@@ -136,7 +139,7 @@ function CourseGroupList(props) {
                 title={
                     <ul className="course_publicNav">
                         <li className="active">分班列表</li>
-                        <li onClick={() => {props.history.push(`/courses/${courseId}/course_groups/0`)}}>未分班</li>
+                        <li onClick={() => {props.history.push(`/classrooms/${courseId}/course_groups/0`)}}>未分班</li>
                     </ul>
                 }
                 searchValue={ searchValue }
@@ -216,7 +219,7 @@ function CourseGroupList(props) {
                 onPressEnter={onPressEnter}
             ></Titlesearchsection>
 
-            {/* {!!none_group_member_count && <div className="mt20 E9F8FF padding20-30 pointer" onClick={() => {props.history.push(`/courses/${courseId}/course_groups/0`)}}>
+            {/* {!!none_group_member_count && <div className="mt20 E9F8FF padding20-30 pointer" onClick={() => {props.history.push(`/classrooms/${courseId}/course_groups/0`)}}>
                 <span>未分班：</span>
                 <span style={{color: '#999999'}}>{none_group_member_count}个学生</span>
 
@@ -240,4 +243,4 @@ function CourseGroupList(props) {
         </React.Fragment>
     )
 }
-export default CourseGroupList
\ No newline at end of file
+export default CourseGroupList
diff --git a/src/modules/courses/members/CourseGroupListTable.js b/src/modules/courses/members/CourseGroupListTable.js
index d0ccbd73..32eed2ec 100644
--- a/src/modules/courses/members/CourseGroupListTable.js
+++ b/src/modules/courses/members/CourseGroupListTable.js
@@ -6,7 +6,7 @@ import axios from 'axios'
 import { WordsBtn, trigger, on, off, getUrl, downloadFile , sortDirections } from 'educoder'
 import ClipboardJS from 'clipboard'
 import './studentsList.css';
-/** 
+/**
     角色数组, CREATOR: 创建者, PROFESSOR: 教师, ASSISTANT_PROFESSOR: 助教, STUDENT: 学生
     course_members_count: 0
     id: 2441
@@ -19,7 +19,7 @@ const clipboardMap = {}
 function CourseGroupListTable(props) {
     const [serachValue, setSerachValue] = useState('')
 
-    const courseId = props.match.params.coursesId    
+    const courseId = props.match.params.coursesId
 
     useEffect(() => {
         const course_groups = props.course_groups
@@ -31,7 +31,7 @@ function CourseGroupListTable(props) {
             let _clipboard = new ClipboardJS(`.copyBtn_${id}`);
             _clipboard.on('success', (e) => {
                 props.showNotification('复制成功')
-            });    
+            });
             clipboardMap[id] = _clipboard
         })
         return () => {
@@ -66,11 +66,11 @@ function CourseGroupListTable(props) {
             className:"color-grey-6",
             render: (name, record, index) => {
                 return <WordsBtn title={name.length > 11 ? name : ''} onClick={() => onGoDetail(record)} style={''}
-                    className="overflowHidden1" style2={{maxWidth: '180px', verticalAlign: 'bottom'}}>
+                    className="overflowHidden1 color-dark" style2={{maxWidth: '180px', verticalAlign: 'bottom'}}>
                 {name}</WordsBtn>
             }
         },
-        
+
         {
             title: '学生成员',
             dataIndex: 'course_members_count',
@@ -122,8 +122,8 @@ function CourseGroupListTable(props) {
                                     <div>点击复制邀请码</div>
                                 </div>
                             }>
-                                <WordsBtn data-clipboard-text={record.invite_code} 
-                                    className={`copyBtn_${record.id} codeBtnStyle codeBtn_yellow ml10`} style={''}>复制</WordsBtn>    
+                                <WordsBtn data-clipboard-text={record.invite_code}
+                                    className={`copyBtn_${record.id} codeBtnStyle codeBtn_yellow ml10`} style={''}>复制</WordsBtn>
                             </Tooltip>
                             }
                     </React.Fragment>
@@ -152,17 +152,17 @@ function CourseGroupListTable(props) {
             render: (none, record, index) => {
                 return <React.Fragment>
                     {!isCourseEnd && isAdmin && <WordsBtn style2={{ marginRight: '12px' }} onClick={() => onDelete(record)} style={'grey'}>删除分班</WordsBtn>}
-                      
-                    {isStudent && <WordsBtn style2={{ marginRight: '12px' }} onClick={() => addToDir(record)} style={''}>加入分班</WordsBtn>}        
-                    <WordsBtn  onClick={() => onGoDetail(record)} style={''}>查看</WordsBtn>              
+
+                    {isStudent && <WordsBtn style2={{ marginRight: '12px' }} onClick={() => addToDir(record)} style={''}>加入分班</WordsBtn>}
+                    <WordsBtn  onClick={() => onGoDetail(record)} style={''} className="color-dark">查看</WordsBtn>
                 </React.Fragment>
             }
         })
-        
-        return columns 
+
+        return columns
     }
     const doAddToDir = async (record) => {
-        const courseId = props.match.params.coursesId    
+        const courseId = props.match.params.coursesId
         const url = `/courses/${courseId}/join_course_group.json`
         const course_group_id = record.id
 
@@ -177,12 +177,12 @@ function CourseGroupListTable(props) {
     }
     const addToDir = (record) => {
         props.confirm({
-        
+
             content: `是否确认加入分班: ${record.name}?`,
 
             okText: '确认',
             cancelText: '取消',
-            
+
             onOk: () => {
                 doAddToDir(record)
             },
@@ -191,7 +191,7 @@ function CourseGroupListTable(props) {
             },
         });
     }
-    
+
     function onDelete(record) {
         props.confirm({
             content: <div>
@@ -212,12 +212,12 @@ function CourseGroupListTable(props) {
                     })
                     .catch(function (error) {
                         console.log(error);
-                    });    
+                    });
             }
         })
-    }    
+    }
     function onGoDetail(record) {
-        props.history.push(`/courses/${courseId}/course_groups/${record.id}`)
+        props.history.push(`/classrooms/${courseId}/course_groups/${record.id}`)
     }
     // 停用和启用邀请码
     function changeInviteCode(id,flag){
@@ -249,7 +249,7 @@ function CourseGroupListTable(props) {
     const isSuperAdmin = props.isSuperAdmin();
     const isStudent = props.isStudent()
     const isNotMember = props.isNotMember()
-    
+
 
     const isParent = true;
     const isCourseEnd= props.isCourseEnd();
@@ -273,8 +273,8 @@ function CourseGroupListTable(props) {
             `}</style>
             {/* onChange={onTableChange}  */}
             <Table columns={columns} dataSource={dataSource} pagination={false} className="groupListTable"></Table>
-           
+
         </React.Fragment>
     )
 }
-export default CourseGroupListTable
\ No newline at end of file
+export default CourseGroupListTable
diff --git a/src/modules/courses/members/modal/AddStudentModal.js b/src/modules/courses/members/modal/AddStudentModal.js
index efa80118..5ab20751 100644
--- a/src/modules/courses/members/modal/AddStudentModal.js
+++ b/src/modules/courses/members/modal/AddStudentModal.js
@@ -1,173 +1,195 @@
 import React, { Component } from "react";
-import { Modal, Checkbox, Input, Spin, Select, Divider  } from "antd";
-import axios from 'axios'
-import ModalWrapper from "../../common/ModalWrapper"
-import InfiniteScroll from 'react-infinite-scroller';
-import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from '../common'
-import NoneData from '../../coursesPublic/NoneData'
-import { ConditionToolTip, ThemeContext } from 'educoder'
-import SchoolSelect from '../../coursesPublic/form/SchoolSelect'
+import { Modal, Checkbox, Input, Spin, Select, Divider } from "antd";
+import axios from "axios";
+import ModalWrapper from "../../common/ModalWrapper";
+import InfiniteScroll from "react-infinite-scroller";
+import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from "../common";
+import NoneData from "../../coursesPublic/NoneData";
+import { ConditionToolTip, ThemeContext } from "educoder";
+import SchoolSelect from "../../coursesPublic/form/SchoolSelect";
+import moment from "moment";
 
+const formatTime = (time) => {
+  if (time) {
+    return moment(time).format("YYYY-MM-DD HH:mm");
+  } else {
+    return "-";
+  }
+};
 const Option = Select.Option;
 const pageCount = 15;
-class AddStudentModal extends Component{
-  constructor(props){
+class AddStudentModal extends Component {
+  constructor(props) {
     super(props);
-    this.state={
+    this.state = {
       checkBoxValues: [],
       users: [],
       hasMore: true,
       loading: false,
-      courseGroup: '',
+      courseGroup: "",
       page: 1,
-      isSpin:false
-    }
+      isSpin: false,
+    };
   }
   fetchMemberList = (arg_page) => {
-    const courseId = this.props.match.params.coursesId    
+    const courseId = this.props.match.params.coursesId;
     const page = arg_page || this.state.page;
-    const { name, school_name } = this.state
-    let url = `/courses/${courseId}/search_users.json?page=${page}&limit=${pageCount}&school_name=${school_name || ''}&name=${name || ''}`
-    this.setState({ loading: true })
-    axios.get(encodeURI(url))
-    .then((response) => {
-      if (!response.data.users || response.data.users.length == 0) {
-        this.setState({
-          users: page == 1 ? response.data.users : this.state.users,
-          page,
-          loading: false,
-          hasMore: false,
-        })
-      } else {
-        this.setState({
-          users: page == 1 ? response.data.users : this.state.users.concat(response.data.users),
-          page,
-          loading: false,
-          hasMore: response.data.users.length == pageCount
-        })
-      }
-
-    })
-    .catch(function (error) {
-      console.log(error);
-    }); 
-  }
-  componentDidMount() {
-    
-    
-  }
+    const { name, school_name } = this.state;
+    let url = `/courses/${courseId}/search_users.json?page=${page}&limit=${pageCount}&school_name=${
+      school_name || ""
+    }&name=${name || ""}`;
+    this.setState({ loading: true });
+    axios
+      .get(encodeURI(url))
+      .then((response) => {
+        if (!response.data.users || response.data.users.length == 0) {
+          this.setState({
+            users: page == 1 ? response.data.users : this.state.users,
+            page,
+            loading: false,
+            hasMore: false,
+          });
+        } else {
+          this.setState({
+            users:
+              page == 1
+                ? response.data.users
+                : this.state.users.concat(response.data.users),
+            page,
+            loading: false,
+            hasMore: response.data.users.length == pageCount,
+          });
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+  };
+  componentDidMount() {}
   fetchOptions = () => {
     // add_teacher_popup
-    const courseId = this.props.match.params.coursesId    
-    
-    let url = `/courses/${courseId}/all_course_groups.json`
-    
-    axios.get(url, {
-    })
-    .then((response) => {
-      if (response.data.course_groups && response.data.course_groups.length) {
-        this.setState({
-          course_groups: response.data.course_groups,
-          courseGroup: '0' // response.data.course_groups[0].id
-        })
-      } else {
-        // showNotification('')
-      }
-    })
-    .catch(function (error) {
-      console.log(error);
-    });
-  }
+    const courseId = this.props.match.params.coursesId;
+
+    let url = `/courses/${courseId}/all_course_groups.json`;
+
+    axios
+      .get(url, {})
+      .then((response) => {
+        if (response.data.course_groups && response.data.course_groups.length) {
+          this.setState({
+            course_groups: response.data.course_groups,
+            courseGroup: "0", // response.data.course_groups[0].id
+          });
+        } else {
+          // showNotification('')
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+  };
   setVisible = (visible) => {
     if (visible) {
-      this.setState({
-        school_name: this.props.user.user_school,
-        name: undefined
-      },()=>{
-        this.fetchMemberList();
-      })
-      this.fetchOptions()
+      this.setState(
+        {
+          school_name: this.props.user.user_school,
+          name: undefined,
+        },
+        () => {
+          this.fetchMemberList();
+        }
+      );
+      this.fetchOptions();
     }
-    this.refs.modalWrapper.setVisible(visible)
+    this.refs.modalWrapper.setVisible(visible);
     if (visible == false) {
       this.setState({
         checkBoxValues: [],
-      })
+      });
     }
-  }
+  };
 
   onSendOk = () => {
-    
-    if(!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) {
-      this.props.showNotification('请从列表中先选择用户。')
+    if (!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) {
+      this.props.showNotification("请从列表中先选择用户。");
       return;
     }
     this.setState({
-      isSpin:true
-    })
-    const courseId = this.props.match.params.coursesId   
-    const url = `/courses/${courseId}/add_students_by_search.json`
-    const params = { 
-      "user_ids": this.state.checkBoxValues
-    }
-    const { courseGroup } = this.state
+      isSpin: true,
+    });
+    const courseId = this.props.match.params.coursesId;
+    const url = `/courses/${courseId}/add_students_by_search.json`;
+    const params = {
+      user_ids: this.state.checkBoxValues,
+    };
+    const { courseGroup } = this.state;
     if (courseGroup) {
-      params.course_group_id = courseGroup
+      params.course_group_id = courseGroup;
     }
-    axios.post(url, params)
-    .then((response) => {
-      if (response.data.status == 0) {
-        this.setVisible(false)
-        this.props.showNotification('添加成功')
-        this.props.addStudentSuccess && this.props.addStudentSuccess(params)
-        this.setState({
-          isSpin:false
-        })
-      }
-    })
-    .catch(function (error) {
-      console.log(error);
-    }); 
-  }
+    axios
+      .post(url, params)
+      .then((response) => {
+        if (response.data.status == 0) {
+          this.setVisible(false);
+          this.props.showNotification("添加成功");
+          this.props.addStudentSuccess && this.props.addStudentSuccess(params);
+          this.setState({
+            isSpin: false,
+          });
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+  };
 
   onOk = () => {
-    this.onSendOk()
-  }
+    this.onSendOk();
+  };
 
   onCheckBoxChange = (checkBoxValues) => {
     this.setState({
-      checkBoxValues: checkBoxValues
-    })
-  }
+      checkBoxValues: checkBoxValues,
+    });
+  };
 
   handleInfiniteOnLoad = () => {
-    this.fetchMemberList(this.state.page + 1)
-  }
+    this.fetchMemberList(this.state.page + 1);
+  };
 
   onSearch = () => {
-    this.fetchMemberList(1)
-  }
+    this.fetchMemberList(1);
+  };
   handleCourseGroupChange = (value) => {
     this.setState({
-      courseGroup: value
-    })
-  }
-  render(){
-    const { users, checkBoxValues, loading, hasMore, name, school_name
-        , courseGroup, course_groups,isSpin  } = this.state
-    const { moduleName } = this.props
+      courseGroup: value,
+    });
+  };
+  render() {
+    const {
+      users,
+      checkBoxValues,
+      loading,
+      hasMore,
+      name,
+      school_name,
+      courseGroup,
+      course_groups,
+      isSpin,
+    } = this.state;
+    const { moduleName } = this.props;
     let theme = this.context;
-    return(
+    return (
       <ModalWrapper
         ref="modalWrapper"
         width="700px"
         title={`添加${moduleName}`}
-        {...this.props }
+        {...this.props}
         onOk={this.onOk}
         className="addStudentModal courseForm"
       >
         <style>
-        {`
+          {`
         .demo-loading-container {
           position: absolute;
           bottom: 93px;
@@ -198,86 +220,173 @@ class AddStudentModal extends Component{
         </style>
         <div className="df">
           <span className="mr10">姓名:</span>
-          <Input allowClear placeholder="请输入真实姓名" value={name} onChange={(e) => {this.setState({name: e.target.value})}}
-            style={{ width: '221px'}}
+          <Input
+            allowClear
+            placeholder="请输入真实姓名"
+            value={name}
+            onChange={(e) => {
+              this.setState({ name: e.target.value });
+            }}
+            style={{ width: "221px" }}
           ></Input>
-          <span className="label" style={{ minWidth: '36px' }}>单位:</span>
+          <span className="label" style={{ minWidth: "36px" }}>
+            单位:
+          </span>
           {/* <Input allowClear placeholder="请输入单位名称" value={school_name} onChange={(e) => {this.setState({school_name: e.target.value})}}
             style={{ width: '200px'}}>
           </Input> */}
-          <SchoolSelect 
+          <SchoolSelect
             value={school_name}
-            onChange={(value) => {this.setState({school_name: value})}}
+            onChange={(value) => {
+              this.setState({ school_name: value });
+            }}
           ></SchoolSelect>
-          <a className="task-btn task-btn-orange" onClick={() => this.fetchMemberList(1)}
-              style={{ height: '30px', lineHeight: '30px', marginLeft: '10px', width: '70px'}}
-          >搜索</a>
+          <a
+            className="task-btn task-btn-orange"
+            onClick={() => this.fetchMemberList(1)}
+            style={{
+              height: "30px",
+              lineHeight: "30px",
+              marginLeft: "10px",
+              width: "70px",
+            }}
+          >
+            搜索
+          </a>
         </div>
         {/* <Divider /> */}
-        
-        
-        <p className="clearfix mb2" style={{ margin: '0px 20px 6px' }}>
-          <Checkbox className="fl" style={{ visibility: 'hidden' }}  ></Checkbox>
-          <span className="fl task-hide with25" style={{"maxWidth":"208px;"}}>{'姓名'}</span>
-          <span className="fl task-hide with25" style={{"maxWidth":"208px;"}}>{'学号'}</span>
-          <span className="fl task-hide with35" style={{"maxWidth":"208px;"}}>{'单位'}</span>
-          <span className="fl task-hide with10" style={{"maxWidth":"48px;"}}>{''}</span>
-          
+
+        <p className="clearfix mb2" style={{ margin: "0px 20px 6px" }}>
+          <Checkbox className="fl" style={{ visibility: "hidden" }}></Checkbox>
+          <span className="fl task-hide with20" style={{ maxWidth: "208px;" }}>
+            {"姓名"}
+          </span>
+          <span className="fl task-hide with23" style={{ maxWidth: "208px;" }}>
+            {"学号"}
+          </span>
+          <span className="fl task-hide with23" style={{ maxWidth: "208px;" }}>
+            {"最后登录时间"}
+          </span>
+          <span className="fl task-hide with20" style={{ maxWidth: "208px;" }}>
+            {"单位"}
+          </span>
+          <span
+            className="fl task-hide with5"
+            style={{ maxWidth: "48px;" }}
+          ></span>
         </p>
         <Spin size="large" spinning={isSpin}>
-        { loading || users.length ? <div>
-          {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
-          <div className="edu-back-skyblue padding10-15" style={{height:"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
-            <InfiniteScroll
-              threshold={10}
-              initialLoad={false}
-              pageStart={0}
-              loadMore={this.handleInfiniteOnLoad}
-              hasMore={!loading && hasMore}
-              useWindow={false}
-            >
-              <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
-
-                { users.map( candidate => {
-                  return (
-                    <p className="clearfix mb7" key={candidate.id}>
-                      <Checkbox className="fl" value={candidate.id} key={candidate.id} disabled={candidate.added}></Checkbox>
-                      <span className="fl task-hide with25 ml5">
-                          { candidate.name ? 
-                            <a href={`/users/${candidate.login}`} title={candidate.name} target="_blank"> 
-                              { candidate.name }
-                            </a> : <span> </span> }
-                      </span>
-                      <span className="fl task-hide with25" title={candidate.student_id} style={{ width: '145px' , height : "20px" }}>
-                        {candidate.student_id || ' '}
-                      </span>
-                      <span className="fl task-hide with35" title={candidate.school_name} style={{ width: '204px' , height : "20px" }}>{candidate.school_name}</span>
-                      <span className="fl task-hide with10" style={{"maxWidth":"48px", color: theme.foreground_select }}>{candidate.added ? '已加入' : ''}</span>
-                    </p>
-                  )
-                }) }
-              </Checkbox.Group>
-              {loading && hasMore && (
-                <div className="demo-loading-container">
-                  <Spin />
+          {loading || users.length ? (
+            <div>
+              {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
+              <div
+                className="edu-back-skyblue padding10-15"
+                style={{
+                  height: "300px",
+                  overflowY: "scroll",
+                  overflowAnchor: "none",
+                }}
+              >
+                <InfiniteScroll
+                  threshold={10}
+                  initialLoad={false}
+                  pageStart={0}
+                  loadMore={this.handleInfiniteOnLoad}
+                  hasMore={!loading && hasMore}
+                  useWindow={false}
+                >
+                  <Checkbox.Group
+                    style={{ width: "100%" }}
+                    onChange={this.onCheckBoxChange}
+                    value={checkBoxValues}
+                  >
+                    {users.map((candidate) => {
+                      return (
+                        <p className="clearfix mb7" key={candidate.id}>
+                          <Checkbox
+                            className="fl"
+                            value={candidate.id}
+                            key={candidate.id}
+                            disabled={candidate.added}
+                          ></Checkbox>
+                          <span className="fl task-hide with20 ml5">
+                            {candidate.name ? (
+                              <a
+                                href={`/users/${candidate.login}`}
+                                title={candidate.name}
+                                target="_blank"
+                              >
+                                {candidate.name}
+                              </a>
+                            ) : (
+                              <span> </span>
+                            )}
+                          </span>
+                          <span
+                            className="fl task-hide with23"
+                            title={candidate.student_id}
+                            style={{ height: "20px" }}
+                          >
+                            {candidate.student_id || "-"}
+                          </span>
+                          <span
+                            className="fl task-hide with23"
+                            title={formatTime(candidate.last_login_on)}
+                            style={{ height: "20px" }}
+                          >
+                            {formatTime(candidate.last_login_on)}
+                          </span>
+                          <span
+                            className="fl task-hide with20"
+                            title={candidate.school_name}
+                            style={{ height: "20px" }}
+                          >
+                            {candidate.school_name||'-'}
+                          </span>
+                          <span
+                            className="fl task-hide with5"
+                            style={{
+                              maxWidth: "48px",
+                              color: theme.foreground_select,
+                            }}
+                          >
+                            {candidate.added ? "已加入" : ""}
+                          </span>
+                        </p>
+                      );
+                    })}
+                  </Checkbox.Group>
+                  {loading && hasMore && (
+                    <div className="demo-loading-container">
+                      <Spin />
+                    </div>
+                  )}
+                </InfiniteScroll>
+              </div>
+              {course_groups && course_groups.length && (
+                <div className="df" style={{ marginTop: "12px",width:'100%' }}>
+                  <span className="mr10" style={{ width: "180PX" }}>
+                    所选学生分班至(选填):
+                  </span>
+                  <Select
+                    style={{ width: "100%" }}
+                    onChange={this.handleCourseGroupChange}
+                    value={courseGroup}
+                  >
+                    <Option value={"0"}>{"未分班"}</Option>
+                    {course_groups.map((item) => {
+                      return <Option value={item.id}>{item.name}</Option>;
+                    })}
+                  </Select>
                 </div>
               )}
-              
-            </InfiniteScroll>
-          </div>
-          {course_groups && course_groups.length && <div className="df" style={{ marginTop: '12px' }}  >
-            <span className="mr10" style={{ width: '148px' }}>所选学生分班至(选填):</span>
-            <Select style={{ width: 236 }} onChange={this.handleCourseGroupChange} value={courseGroup}>
-              <Option value={'0'}>{'未分班'}</Option>
-              { course_groups.map((item) => {
-                return <Option value={item.id}>{item.name}</Option>
-              })}
-            </Select>
-          </div>}
-        </div> : <NoneData></NoneData> }
+            </div>
+          ) : (
+            <NoneData></NoneData>
+          )}
         </Spin>
       </ModalWrapper>
-    )
+    );
   }
 }
 
diff --git a/src/modules/courses/members/modal/AddTeacherModal.js b/src/modules/courses/members/modal/AddTeacherModal.js
index 7aa7d111..a9bfad3d 100644
--- a/src/modules/courses/members/modal/AddTeacherModal.js
+++ b/src/modules/courses/members/modal/AddTeacherModal.js
@@ -1,213 +1,247 @@
 import React, { Component } from "react";
-import { Modal, Checkbox, Input, Spin, Select, Divider, Icon  } from "antd";
-import axios from 'axios'
-import ModalWrapper from "../../common/ModalWrapper"
-import InfiniteScroll from 'react-infinite-scroller';
-import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from '../common'
-import { ConditionToolTip, ActionBtn } from 'educoder'
-import NoneData from '../../coursesPublic/NoneData'
-import AddGraduationGroupModal from './AddGraduationGroupModal'
-import SchoolSelect from '../../coursesPublic/form/SchoolSelect'
+import { Modal, Checkbox, Input, Spin, Select, Divider, Icon } from "antd";
+import axios from "axios";
+import ModalWrapper from "../../common/ModalWrapper";
+import InfiniteScroll from "react-infinite-scroller";
+import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from "../common";
+import { ConditionToolTip, ActionBtn } from "educoder";
+import NoneData from "../../coursesPublic/NoneData";
+import AddGraduationGroupModal from "./AddGraduationGroupModal";
+import SchoolSelect from "../../coursesPublic/form/SchoolSelect";
+import moment from "moment";
 
+const formatTime = (time) => {
+  if (time) {
+    return moment(time).format("YYYY-MM-DD HH:mm");
+  } else {
+    return "-";
+  }
+};
+const formatePhone = (phone) => {
+  if (phone && typeof phone === "string") {
+    return phone.substring(0, 3) + "****" + phone.substring(7);
+  } else {
+    return "-";
+  }
+};
 const Option = Select.Option;
 const pageCount = 15;
-let timeout, currentValue
-class AddTeacherModal extends Component{
-  constructor(props){
+let timeout, currentValue;
+class AddTeacherModal extends Component {
+  constructor(props) {
     super(props);
-    this.state={
+    this.state = {
       school_names: [],
       checkBoxValues: [],
       candidates: [],
       hasMore: true,
       loading: false,
-      page: 1
-    }
+      page: 1,
+    };
   }
   fetchMemberList = (arg_page) => {
-    const courseId = this.props.match.params.coursesId    
+    const courseId = this.props.match.params.coursesId;
     const page = arg_page || this.state.page;
-    const { name, school_name } = this.state
-    let url = `/courses/${courseId}/search_teacher_candidate.json`
-    this.setState({ loading: true })
-    axios.post(url, {
-      page: page,
-      limit: pageCount,
-      school_name: school_name || '',
-      name: name || ''
-    })
-    .then((response) => {
-      if (!response.data.candidates || response.data.candidates.length == 0) {
-        this.setState({
-          candidates: page == 1 ? response.data.candidates : this.state.candidates,
-          page,
-          loading: false,
-          hasMore: false,
-        })
-      } else {
-        this.setState({
-          candidates: page == 1 ? response.data.candidates : this.state.candidates.concat(response.data.candidates),
-          page,
-          loading: false,
-          hasMore: response.data.candidates.length == pageCount
-        })
-      }
-
-    })
-    .catch(function (error) {
-      console.log(error);
-    }); 
-  }
-  componentDidMount() {
-    
-    
-  }
+    const { name, school_name } = this.state;
+    let url = `/courses/${courseId}/search_teacher_candidate.json`;
+    this.setState({ loading: true });
+    axios
+      .post(url, {
+        page: page,
+        limit: pageCount,
+        school_name: school_name || "",
+        name: name || "",
+      })
+      .then((response) => {
+        if (!response.data.candidates || response.data.candidates.length == 0) {
+          this.setState({
+            candidates:
+              page == 1 ? response.data.candidates : this.state.candidates,
+            page,
+            loading: false,
+            hasMore: false,
+          });
+        } else {
+          this.setState({
+            candidates:
+              page == 1
+                ? response.data.candidates
+                : this.state.candidates.concat(response.data.candidates),
+            page,
+            loading: false,
+            hasMore: response.data.candidates.length == pageCount,
+          });
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+  };
+  componentDidMount() {}
   onAddGraduationGroupOk = () => {
-    this.fetchOptions()
-  }
+    this.fetchOptions();
+  };
   fetchOptions = () => {
     // add_teacher_popup
-    const courseId = this.props.match.params.coursesId    
-    
-    let url = `/courses/${courseId}/add_teacher_popup.json`
-    
-    axios.get(url, {
-    })
-    .then((response) => {
+    const courseId = this.props.match.params.coursesId;
 
-      if (response.data.school_name) {
-        this.setState({
-          school_name: response.data.school_name
-        }, () => this.fetchMemberList())
-      } else {
-        this.fetchMemberList()
+    let url = `/courses/${courseId}/add_teacher_popup.json`;
 
-      }
-      if (response.data.graduation_groups) {
-        this.setState({
-          graduation_groups: response.data.graduation_groups
-        })
-      } 
-      if (response.data.course_groups) {
-        this.setState({
-          course_groups: response.data.course_groups
-        })
-      }
-
-    })
-    .catch(function (error) {
-      console.log(error);
-    });
-  }
+    axios
+      .get(url, {})
+      .then((response) => {
+        if (response.data.school_name) {
+          this.setState(
+            {
+              school_name: response.data.school_name,
+            },
+            () => this.fetchMemberList()
+          );
+        } else {
+          this.fetchMemberList();
+        }
+        if (response.data.graduation_groups) {
+          this.setState({
+            graduation_groups: response.data.graduation_groups,
+          });
+        }
+        if (response.data.course_groups) {
+          this.setState({
+            course_groups: response.data.course_groups,
+          });
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+  };
   setVisible = (visible) => {
     if (visible) {
-      this.fetchOptions()
+      this.fetchOptions();
     }
-    this.refs.modalWrapper.setVisible(visible)
+    this.refs.modalWrapper.setVisible(visible);
     if (visible == false) {
       this.setState({
-        checkBoxValues: []
-      })
+        checkBoxValues: [],
+      });
     }
     this.setState({
-      name:undefined,
-      graduationGroup:undefined,
-      courseGroup:undefined
-    })
-  }
+      name: undefined,
+      graduationGroup: undefined,
+      courseGroup: undefined,
+    });
+  };
 
   onSendOk = () => {
-    const courseId = this.props.match.params.coursesId   
-    const url = `/courses/${courseId}/add_teacher.json`
+    const courseId = this.props.match.params.coursesId;
+    const url = `/courses/${courseId}/add_teacher.json`;
     if (this.state.checkBoxValues.length == 0) {
-      this.props.showNotification('请先在下面列表中选择要添加教师的成员')
-      return
+      this.props.showNotification("请先在下面列表中选择要添加教师的成员");
+      return;
     }
-    const params = { 
-      "user_list": this.state.checkBoxValues.map (item => { return { 'user_id': item }}) ,
+    const params = {
+      user_list: this.state.checkBoxValues.map((item) => {
+        return { user_id: item };
+      }),
       // "graduation_group_id": "2",
       // "course_group_id": "820",
-      "role": this.props.isTeacher ? ROLE_TEACHER_NUM : ROLE_ASSISTANT_NUM
-    }
-    const { graduationGroup, courseGroup } = this.state
+      role: this.props.isTeacher ? ROLE_TEACHER_NUM : ROLE_ASSISTANT_NUM,
+    };
+    const { graduationGroup, courseGroup } = this.state;
     if (graduationGroup) {
-      params.graduation_group_id = graduationGroup
+      params.graduation_group_id = graduationGroup;
     }
     if (courseGroup) {
-      params.course_group_id = courseGroup
+      params.course_group_id = courseGroup;
     }
-    axios.post(url, params)
-    .then((response) => {
-      if (response.data.status == 0) {
-        this.setVisible(false)
-        this.props.showNotification('添加成功')
-        this.props.addTeacherSuccess && this.props.addTeacherSuccess(params)
-      }
-    })
-    .catch(function (error) {
-      console.log(error);
-    }); 
-  }
+    axios
+      .post(url, params)
+      .then((response) => {
+        if (response.data.status == 0) {
+          this.setVisible(false);
+          this.props.showNotification("添加成功");
+          this.props.addTeacherSuccess && this.props.addTeacherSuccess(params);
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+  };
 
   onOk = () => {
-    this.onSendOk()
-  }
+    this.onSendOk();
+  };
 
   onCheckBoxChange = (checkBoxValues) => {
     this.setState({
-      checkBoxValues: checkBoxValues
-    })
-  }
+      checkBoxValues: checkBoxValues,
+    });
+  };
 
   handleInfiniteOnLoad = () => {
-    this.fetchMemberList(this.state.page + 1)
-  }
+    this.fetchMemberList(this.state.page + 1);
+  };
 
   onSearch = () => {
-    this.fetchMemberList(1)
-  }
+    this.fetchMemberList(1);
+  };
   handleGradationGroupChange = (value) => {
     this.setState({
-      graduationGroup: value
-    })
-  }
+      graduationGroup: value,
+    });
+  };
   handleCourseGroupChange = (value) => {
     this.setState({
-      courseGroup: value
-    })
-  }
+      courseGroup: value,
+    });
+  };
   onOrgNameChange = (value) => {
     // console.log('school_name: ', value)
-    this.setState({ school_name: value })
-  }
-  
+    this.setState({ school_name: value });
+  };
+
   hasGraduationModule = () => {
     const { course_modules } = this.props;
-    const result = course_modules && course_modules.filter( item => {
-      return item.type == 'graduation'
-    })
-    return result && result.length > 0
-  }
+    const result =
+      course_modules &&
+      course_modules.filter((item) => {
+        return item.type == "graduation";
+      });
+    return result && result.length > 0;
+  };
 
-  render(){
-    const { candidates, checkBoxValues, loading, hasMore, name, school_name, school_names
-        , graduationGroup, graduation_groups, courseGroup, course_groups } = this.state
-    const { moduleName } = this.props
-    
-    return(
+  render() {
+    const {
+      candidates,
+      checkBoxValues,
+      loading,
+      hasMore,
+      name,
+      school_name,
+      school_names,
+      graduationGroup,
+      graduation_groups,
+      courseGroup,
+      course_groups,
+    } = this.state;
+    const { moduleName } = this.props;
+
+    return (
       <ModalWrapper
         ref="modalWrapper"
         width="700px"
         title={`添加${moduleName}`}
-        {...this.props }
+        {...this.props}
         onOk={this.onOk}
         className="addTeacherModal courseForm"
       >
-        <AddGraduationGroupModal ref="addGraduationGroupModal"
-          {...this.props} onOk={this.onAddGraduationGroupOk}
+        <AddGraduationGroupModal
+          ref="addGraduationGroupModal"
+          {...this.props}
+          onOk={this.onAddGraduationGroupOk}
         ></AddGraduationGroupModal>
         <style>
-        {`
+          {`
         .demo-loading-container {
           position: absolute;
           bottom: 210px;
@@ -236,11 +270,24 @@ class AddTeacherModal extends Component{
         `}
         </style>
         <div className="df">
-          <span className="firstLabel label" style={{ flex: '0 0 40px' }}>姓名:</span>
-          <Input allowClear placeholder="请输入真实姓名" value={name} onChange={(e) => {this.setState({name: e.target.value})}} 
-              style={{ width: '200px', marginRight: '18px' }}>
-          </Input>
-          <span className="label" style={{ minWidth: '36px', flex: '0 0 40px' }}>单位:</span>
+          <span className="firstLabel label" style={{ flex: "0 0 40px" }}>
+            姓名:
+          </span>
+          <Input
+            allowClear
+            placeholder="请输入真实姓名"
+            value={name}
+            onChange={(e) => {
+              this.setState({ name: e.target.value });
+            }}
+            style={{ width: "200px", marginRight: "18px" }}
+          ></Input>
+          <span
+            className="label"
+            style={{ minWidth: "36px", flex: "0 0 40px" }}
+          >
+            单位:
+          </span>
           <SchoolSelect
             value={school_name}
             onChange={this.onOrgNameChange}
@@ -255,74 +302,143 @@ class AddTeacherModal extends Component{
               return <Option value={item} key={index}>{item}</Option>
             })}
           </Select> */}
-          <a className="task-btn task-btn-orange" onClick={() => this.fetchMemberList(1)}
-              style={{ height: '30px', lineHeight: '30px', marginLeft: '10px', width: '70px'}}
-          >搜索</a>
+          <a
+            className="task-btn task-btn-orange"
+            onClick={() => this.fetchMemberList(1)}
+            style={{
+              height: "30px",
+              lineHeight: "30px",
+              marginLeft: "10px",
+              width: "70px",
+            }}
+          >
+            搜索
+          </a>
         </div>
         {/* graduation_groups && !!graduation_groups.length  */}
-        
-        
-        <p className="clearfix mb2" style={{ margin: '0px 20px 6px' }}>
-          <Checkbox className="fl" style={{ visibility: 'hidden' }}  ></Checkbox>
-          <span className="fl task-hide with25" style={{"maxWidth":"208px;"}}>{'姓名'}</span>
-          <span className="fl task-hide with25" style={{"maxWidth":"208px;"}}>{'昵称'}</span>
-          <span className="fl task-hide with35" style={{"maxWidth":"208px;"}}>{'单位'}</span>
-          <span className="fl task-hide with10" style={{"maxWidth":"48px"}}>{''}</span>
-          
-        </p>
-        { loading || candidates.length ? <div>
-          {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
-          <div className="edu-back-skyblue padding10-15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
-            <InfiniteScroll
-              threshold={10}
-              initialLoad={false}
-              pageStart={0}
-              loadMore={this.handleInfiniteOnLoad}
-              hasMore={!loading && hasMore}
-              useWindow={false}
-            >
-              <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
 
-                { candidates && candidates.map( candidate => {
-                  return (
-                    <p className="clearfix mb7" key={candidate.id}>
-                      <Checkbox className="fl" value={candidate.id} key={candidate.id} disabled={candidate.added}></Checkbox>
-                      <span className="fl task-hide with25 ml5" style={{ width: '145px' , height : "20px" }}>
-                        <a href={`/users/${candidate.login}`} target="_blank" title={candidate.name}>{candidate.name}</a>
-                      </span>
-                      <span className="fl task-hide with25" title={candidate.nickname} style={{ width: '145px' , height : "20px" }}>
-                          {candidate.nickname}
-                      </span>
-                      <span className="fl task-hide with35" title={candidate.school_name} style={{ width: '145px' , height : "20px" }}>
-                        {candidate.school_name}
-                      </span>
-                      <span className="fl task-hide with10 color-blue" style={{"maxWidth":"48px;"}}>{candidate.added ? '已加入' : ''}</span>
-                    </p>
-                  )
-                }) }
-              </Checkbox.Group>
-              {loading && hasMore && (
-                <div className="demo-loading-container">
-                  <Spin />
-                </div>
-              )}
-              
-            </InfiniteScroll>
+        <p className="clearfix mb2" style={{ margin: "0px 20px 6px" }}>
+          <Checkbox className="fl" style={{ visibility: "hidden" }}></Checkbox>
+          <span className="fl task-hide with20" style={{ maxWidth: "208px;" }}>
+            {"姓名"}
+          </span>
+          <span className="fl task-hide with23" style={{ maxWidth: "208px;" }}>
+            {"手机号/邮箱"}
+          </span>
+          <span className="fl task-hide with23" style={{ maxWidth: "208px;" }}>
+            {"最后登录时间"}
+          </span>
+          <span className="fl task-hide with20" style={{ maxWidth: "208px;" }}>
+            {"单位"}
+          </span>
+          <span className="fl task-hide with5" style={{ maxWidth: "48px" }}>
+            {""}
+          </span>
+        </p>
+        {loading || candidates.length ? (
+          <div>
+            {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
+            <div
+              className="edu-back-skyblue padding10-15"
+              style={{
+                height: "300px",
+                overflowY: "scroll",
+                overflowAnchor: "none",
+              }}
+            >
+              <InfiniteScroll
+                threshold={10}
+                initialLoad={false}
+                pageStart={0}
+                loadMore={this.handleInfiniteOnLoad}
+                hasMore={!loading && hasMore}
+                useWindow={false}
+              >
+                <Checkbox.Group
+                  style={{ width: "100%" }}
+                  onChange={this.onCheckBoxChange}
+                  value={checkBoxValues}
+                >
+                  {candidates &&
+                    candidates.map((candidate) => {
+                      return (
+                        <p className="clearfix mb7" key={candidate.id}>
+                          <Checkbox
+                            className="fl"
+                            value={candidate.id}
+                            key={candidate.id}
+                            disabled={candidate.added}
+                          ></Checkbox>
+                          <span
+                            className="fl task-hide with20 ml5"
+                            style={{ height: "20px" }}
+                          >
+                            <a
+                              href={`/users/${candidate.login}`}
+                              target="_blank"
+                              title={candidate.name}
+                            >
+                              {candidate.name}
+                            </a>
+                          </span>
+                          <span
+                            className="fl task-hide with23"
+                            title={
+                              candidate.phone
+                                ? formatePhone(candidate.phone)
+                                : formatePhone(candidate.email)
+                            }
+                            style={{ height: "20px" }}
+                          >
+                            {candidate.phone
+                              ? formatePhone(candidate.phone)
+                              : formatePhone(candidate.email)}
+                          </span>
+                          <span
+                            className="fl task-hide with23"
+                            title={formatTime(candidate.last_login_on)}
+                            style={{ height: "20px" }}
+                          >
+                            {formatTime(candidate.last_login_on)}
+                          </span>
+                          <span
+                            className="fl task-hide with20"
+                            title={candidate.school_name}
+                            style={{ height: "20px" }}
+                          >
+                            {candidate.school_name||'-'}
+                          </span>
+                          <span
+                            className="fl task-hide with5 color-blue"
+                            style={{ maxWidth: "48px;" }}
+                          >
+                            {candidate.added ? "已加入" : ""}
+                          </span>
+                        </p>
+                      );
+                    })}
+                </Checkbox.Group>
+                {loading && hasMore && (
+                  <div className="demo-loading-container">
+                    <Spin />
+                  </div>
+                )}
+              </InfiniteScroll>
+            </div>
           </div>
-        </div>  : <NoneData></NoneData> }
+        ) : (
+          <NoneData></NoneData>
+        )}
         <div className="df">
-        { this.hasGraduationModule() && <div className="df" style={{ marginTop: '24px' }}  >
+          {/* { this.hasGraduationModule() && <div className="df" style={{ marginTop: '24px' }}  >
           <span className="firstLabel label" style={{ flex: '0 0 96px' }}>添加至答辩组:</span>
           <Select style={{ width: 218, marginRight: '18px' }} onChange={this.handleGradationGroupChange} value={graduationGroup}
             dropdownRender={menu => (
               <div>
                 {menu}
                 <Divider style={{ margin: '4px 0' }} />
-                {/* <ActionBtn
-                  onMouseDown={() => { debugger; this.refs['addGraduationGroupModal'].setVisible(true) }}
-                >添加答辩组</ActionBtn> */}
                 <div style={{ padding: '8px', cursor: 'pointer' }} 
-                    onMouseDown={() => { debugger; this.refs['addGraduationGroupModal'].setVisible(true) }}
+                    onMouseDown={() => { ; this.refs['addGraduationGroupModal'].setVisible(true) }}
                 >
                   <Icon type="plus" /> 添加答辩组
                 </div>
@@ -333,19 +449,26 @@ class AddTeacherModal extends Component{
               return <Option value={item.id}>{item.name}</Option>
             })}
           </Select>
-        </div>}
+        </div>} */}
 
-        { course_groups && !!course_groups.length && <div className="df">
-          <span className="firstLabel label">管理权限:</span>
-          <Select style={{ width: 218 }} onChange={this.handleCourseGroupChange} value={courseGroup}>
-            { course_groups && course_groups.map((item) => {
-              return <Option value={item.id}>{item.name}</Option>
-            })}
-          </Select>
-        </div> }
+          {course_groups && !!course_groups.length && (
+            <div className="df" style={{ width: "100%" }}>
+              <span className="firstLabel label">管理权限:</span>
+              <Select
+                style={{ width: "100%" }}
+                onChange={this.handleCourseGroupChange}
+                value={courseGroup}
+              >
+                {course_groups &&
+                  course_groups.map((item) => {
+                    return <Option value={item.id}>{item.name}</Option>;
+                  })}
+              </Select>
+            </div>
+          )}
         </div>
       </ModalWrapper>
-    )
+    );
   }
 }
 export default AddTeacherModal;
diff --git a/src/modules/courses/members/modal/CourseGroupChooserModal.js b/src/modules/courses/members/modal/CourseGroupChooserModal.js
index 884b2eaf..b80a927f 100644
--- a/src/modules/courses/members/modal/CourseGroupChooserModal.js
+++ b/src/modules/courses/members/modal/CourseGroupChooserModal.js
@@ -41,7 +41,6 @@ function CourseGroupChooserModal({ course_groups = [], isAdminOrCreator, item, i
         setCheckAllValue(!checkAllValue)
     }
     const onOk = async () => {
-        console.log(checkAllValue, arg_course_groups)
         let approval = 1
         const courseId = props.match.params.coursesId    
         let url = `/courses/${courseId}/teacher_application_review.json`
@@ -51,13 +50,11 @@ function CourseGroupChooserModal({ course_groups = [], isAdminOrCreator, item, i
             approval: approval,
             group_id: arg_course_groups
         }).then((result) => {
-					if (result.data.status === 0) {
-						props.showNotification(`已${approval == 1? '同意' : '拒绝'}`)
-						fetchAll(1)
-						modalEl.current.setVisible(false)
-						window.location.reload();
-					}})
-
+        if (result.data.status === 0) {
+            props.showNotification(`已${approval == 1? '同意' : '拒绝'}`)
+            fetchAll(1)
+            modalEl.current.setVisible(false)
+        }})
     }
     return (
         <ModalWrapper
diff --git a/src/modules/courses/members/studentsList.js b/src/modules/courses/members/studentsList.js
index af83d0a4..4f46f32d 100644
--- a/src/modules/courses/members/studentsList.js
+++ b/src/modules/courses/members/studentsList.js
@@ -1,5 +1,5 @@
-import React,{ Component } from "react";
-import { Input,Checkbox,Table, Pagination, Modal,Menu ,Spin, Tooltip , Divider, Popconfirm } from "antd";
+import React, { Component } from "react";
+import { Input, Checkbox, Table, Pagination, Modal, Menu, Spin, Tooltip, Divider, Popconfirm } from "antd";
 import ClipboardJS from 'clipboard'
 import '../css/Courses.css'
 import '../css/members.css'
@@ -7,7 +7,7 @@ import CourseLayoutcomponent from '../common/CourseLayoutComponent'
 
 import Titlesearchsection from '../common/titleSearch/TitleSearchSection'
 import ColorCountText from '../common/titleSearch/ColorCountText'
-import { WordsBtn, trigger, on, off, getRandomcode, getRandomNumber , sortDirections } from 'educoder'
+import { WordsBtn, trigger, on, off, getRandomcode, getRandomNumber, sortDirections } from 'educoder'
 import Modals from "../../modals/Modals";
 import axios from 'axios'
 import _ from 'lodash'
@@ -17,21 +17,21 @@ import CreateGroupByImportModal from './modal/CreateGroupByImportModal'
 import ChangeRolePop from './ChangeRolePop'
 import "./studentsList.css"
 
-const Search =Input.Search;
+const Search = Input.Search;
 const TYPE_STUDENTS = 1
 const TYPE_COURSE_GOURP_PARENT = 2
 const TYPE_COURSE_GOURP_CHILD = 3
-const buildColumns = (that,isParent) => {
-  const { course_groups , sortedInfo } = that.state
-  let showSorter = isParent==true
+const buildColumns = (that, isParent) => {
+  const { course_groups, sortedInfo } = that.state
+  let showSorter = isParent == true
   const courseId = that.props.match.params.coursesId
-  const columns=[{
+  const columns = [{
     title: '序号',
     dataIndex: 'id',
     key: 'id',
-    align:'center',
-    width:"8%",
-    className:"color-grey-6",
+    align: 'center',
+    width: "8%",
+    className: "color-grey-6",
     render: (id, student, index) => {
       return (that.state.page - 1) * 20 + index + 1
     }
@@ -53,56 +53,56 @@ const buildColumns = (that,isParent) => {
     title: '姓名',
     dataIndex: 'name',
     key: 'name',
-    align:'center',
-    width:"10%",
-    className:"color-grey-6",
+    align: 'center',
+    width: "10%",
+    className: "color-grey-6",
     render: (name, record) => {
       return <a className="color-dark overflowHidden1" target="_blank"
-          style={{maxWidth: '120px'}} href={`/users/${record.login}`}>{name}</a>
+        style={{ maxWidth: '120px' }} href={`/users/${record.login}`}>{name}</a>
     }
   }, {
     title: '学号',
     dataIndex: 'student_id',
     key: 'student_id',
-    align:'center',
-    width:"10%",
-    className:"color-grey-6",
+    align: 'center',
+    width: "10%",
+    className: "color-grey-6",
     sorter: true,
     sortDirections: sortDirections,
     sortOrder: sortedInfo.columnKey === 'student_id' && sortedInfo.order,
     render: (student_id, record) => {
       return <span className="color-dark overflowHidden1 " title={student_id && student_id.length > 10 ? student_id : ''}
-          style={{maxWidth: '160px'}} >{student_id}</span>
+        style={{ maxWidth: '160px' }} >{student_id}</span>
     }
   }
-  , {
+    , {
     title: '手机号',
     dataIndex: 'user_phone',
     key: 'user_phone',
-    align:'center',
-    width:"10%",
-    className:"color-grey-6",
+    align: 'center',
+    width: "10%",
+    className: "color-grey-6",
     // sorter: true,
     // sortDirections: sortDirections,
     // sortOrder: sortedInfo.columnKey === 'user_phone' && sortedInfo.order,
     render: (user_phone, record) => {
       return <span className="color-dark overflowHidden1 " title={user_phone && user_phone.length > 10 ? user_phone : ''}
-          style={{maxWidth: '160px'}} >{user_phone}</span>
+        style={{ maxWidth: '160px' }} >{user_phone}</span>
     }
   }
-  , {
+    , {
     title: '邮箱',
     dataIndex: 'user_mail',
     key: 'user_mail',
-    align:'center',
-    width:"10%",
-    className:"color-grey-6",
+    align: 'center',
+    width: "10%",
+    className: "color-grey-6",
     // sorter: true,
     // sortDirections: sortDirections,
     // sortOrder: sortedInfo.columnKey === 'user_mail' && sortedInfo.order,
     render: (user_mail, record) => {
       return <span className="color-dark overflowHidden1 " title={user_mail && user_mail.length > 10 ? user_mail : ''}
-          style={{maxWidth: '160px'}} >{user_mail}</span>
+        style={{ maxWidth: '160px' }} >{user_mail}</span>
     }
   }
   ];
@@ -112,17 +112,17 @@ const buildColumns = (that,isParent) => {
       title: '分班',
       dataIndex: 'course_group_name',
       key: 'course_group_name',
-      align:'center',
-      width:"25%",
-      className:"color-grey-6",
-      sorter:showSorter,
+      align: 'center',
+      width: "25%",
+      className: "color-grey-6",
+      sorter: showSorter,
       sortDirections: sortDirections,
       sortOrder: sortedInfo.columnKey === 'course_group_name' && sortedInfo.order,
     })
   }
   const isAdminOrStudent = that.props.isAdminOrStudent()
   if (!isAdminOrStudent) {
-    columns.some((item,key)=> {
+    columns.some((item, key) => {
       if (item.title === "学号") {
         columns.splice(key, 1)
         return true
@@ -138,18 +138,18 @@ const buildColumns = (that,isParent) => {
       render: (text, item) => {
         return <Checkbox value={item.course_member_id} key={item.course_member_id} ></Checkbox>
       },
-      width:"5%"
+      width: "5%"
     })
 
     columns.push({
       title: '操作',
       key: 'action',
       width: '22%',
-      align:'center',
+      align: 'center',
       render: (text, record) => {
         return (
           <React.Fragment>
-            <WordsBtn  onClick={() => that.onDelete(record)} style={'grey'}>删除学生</WordsBtn>
+            <WordsBtn onClick={() => that.onDelete(record)} style={'grey'}>删除学生</WordsBtn>
             {record.member_roles && record.member_roles.length && <ChangeRolePop
               style={{ marginLeft: '12px' }}
               courseId={courseId}
@@ -174,55 +174,55 @@ const buildColumns = (that,isParent) => {
 const ORDER_BY_NUM = 1;
 const ORDER_BY_GROUP = 2;
 
-class studentsList extends Component{
-  constructor(props){
+class studentsList extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      page:1,
+    this.state = {
+      page: 1,
       order: ORDER_BY_NUM,
       searchValue: '',
       course_groups: [],
       students: [],
       checkBoxValues: [],
 
-      stu_new_flag:false,
-      StudentList_value:"",
-      modalsType:"",
-      modalsTopval:"",
-      modalsBottomval:"",
-      modalCancel:"",
-      n_And_e:1,
-      isSpin:false,
-      DownloadType:false,
-      DownloadMessageval:undefined,
-      sortedInfo: {order:'ascend',columnKey: 'student_id'}
+      stu_new_flag: false,
+      StudentList_value: "",
+      modalsType: "",
+      modalsTopval: "",
+      modalsBottomval: "",
+      modalCancel: "",
+      n_And_e: 1,
+      isSpin: false,
+      DownloadType: false,
+      DownloadMessageval: undefined,
+      sortedInfo: { order: 'ascend', columnKey: 'student_id' }
     }
   }
-/// 确认是否下载
-  confirmysl(url,urls){
+  /// 确认是否下载
+  confirmysl(url, urls) {
     // this.props.showGlobalLoading('正在生成文件，请稍后...')
     axios.get(url + 'export=true').then((response) => {
-      if(response === undefined){
+      if (response === undefined) {
         return
       }
-      if(response.data.status&&response.data.status===-1){
+      if (response.data.status && response.data.status === -1) {
 
-      }else if(response.data.status&&response.data.status===-2){
-        if(response.data.message === "100"){
+      } else if (response.data.status && response.data.status === -2) {
+        if (response.data.message === "100") {
           // 已超出文件导出的上限数量（100 ），建议：
 
           this.setState({
-            DownloadType:true,
-            DownloadMessageval:100
+            DownloadType: true,
+            DownloadMessageval: 100
           })
-        }else {
+        } else {
           //因附件资料超过500M
           this.setState({
-            DownloadType:true,
-            DownloadMessageval:500
+            DownloadType: true,
+            DownloadMessageval: 500
           })
         }
-      }else {
+      } else {
 
         // this.props.showNotification(`正在下载中`);
         // window.open("/api"+url, '_blank');
@@ -251,77 +251,79 @@ class studentsList extends Component{
   }
   hasGroupModule = () => {
     const { course_modules } = this.props;
-    const result = course_modules && course_modules.filter( item => {
+    const result = course_modules && course_modules.filter(item => {
       return item.type == 'course_group'
     })
     return result && result.length > 0
   }
 
-  Downloadcal=()=>{
+  Downloadcal = () => {
     this.setState({
-      DownloadType:false,
-      DownloadMessageval:undefined
+      DownloadType: false,
+      DownloadMessageval: undefined
     })
   }
 
-  inputStudent=(e)=>{
+  inputStudent = (e) => {
     this.setState({
-      StudentList_value:e.target.value
+      StudentList_value: e.target.value
     })
   }
   // 有关新建分班和分班重命名
-  showStuNewBox=(index)=>{
+  showStuNewBox = (index) => {
     this.setState({
-      stu_new_flag:true,
-      n_And_e:index
+      stu_new_flag: true,
+      n_And_e: index
     })
   }
-  hideStuNewBox=()=>{
+  hideStuNewBox = () => {
     this.setState({
-      stu_new_flag:false
+      stu_new_flag: false
     })
   }
   // 有关删除分班
-  delClasses=()=>{
+  delClasses = () => {
     this.setState({
-      modalsType:true,
-      modalsTopval:"该分班的学生将被移动到“XX班”",
-      modalsBottomval:"是否确认删除？",
-      modalCancel:true
+      modalsType: true,
+      modalsTopval: "该分班的学生将被移动到“XX班”",
+      modalsBottomval: "是否确认删除？",
+      modalCancel: true
     })
   }
-  cancelDelClasses=()=>{
+  cancelDelClasses = () => {
     this.setState({
-      modalsType:false,
-      modalsTopval:"",
-      modalsBottomval:"",
-      modalCancel:false
+      modalsType: false,
+      modalsTopval: "",
+      modalsBottomval: "",
+      modalCancel: false
     })
   }
   // 确认删除
-  sureDelClasses=()=>{
+  sureDelClasses = () => {
     this.setState({
-      modalsType:false,
-      modalsTopval:"",
-      modalsBottomval:"",
-      modalCancel:false
+      modalsType: false,
+      modalsTopval: "",
+      modalsBottomval: "",
+      modalCancel: false
     })
   }
 
-  onChange=()=>{
+  onChange = () => {
 
   }
   onChangeRoleSuccess = () => {
-    this.fetchAll()
+    const { page, searchValue } = this.state;
+    this.fetchAll(page, searchValue);
   }
   componentDidMount() {
     this.setState({
-      isSpin:true
+      isSpin: true
     })
-    this.fetchAll()
+    const { page, searchValue } = this.state;
+    this.fetchAll(page, searchValue);
     const isAdmin = this.props.isAdmin()
     // if (isAdmin) {
-      this.fetchCourseGroups();
+    this.fetchCourseGroups();
     // }
 
     isAdmin && on('addStudentSuccess', this.addStudentSuccessListener)
@@ -341,19 +343,22 @@ class studentsList extends Component{
     this.props.updataleftNavfun()
   }
   updateNavSuccess = () => {
-    this.fetchCourseGroups()
-    this.fetchAll()
+    this.fetchCourseGroups();
+    const { page, searchValue } = this.state;
+
+    this.fetchAll(page, searchValue);
   }
 
-  addStudentSuccessListener=(e, data)=>{
+  addStudentSuccessListener = (e, data) => {
     const params = JSON.parse(data)
     this.props.updataleftNavfun()
-    const course_group_id = this.props.match.params.course_group_id
-    const coursesId = this.props.match.params.coursesId
-    if (params.course_group_id == course_group_id) {
-      this.fetchAll(1)
+    const course_group_id = this.props.match.params.course_group_id;
+    const coursesId = this.props.match.params.coursesId;
+    const { searchValue } = this.state;
+    if (params.course_group_id === course_group_id) {
+      this.fetchAll(1, searchValue);
     } else {
-      this.props.history.push(`/courses/${coursesId}/course_groups/${params.course_group_id || '0'}`)
+      this.props.history.push(`/classrooms/${coursesId}/course_groups/${params.course_group_id || '0'}`)
     }
     // console.log('addStudentSuccessListener', data)
   }
@@ -364,33 +369,33 @@ class studentsList extends Component{
 
     axios.get(url, {
     })
-    .then((response) => {
-      if (response.data.course_groups && response.data.course_groups.length) {
-        this.setState({
-          course_groups: response.data.course_groups
-        })
-      } else {
-        // showNotification('')
-      }
-    })
-    .catch(function (error) {
-      console.log(error);
-    });
+      .then((response) => {
+        if (response.data.course_groups && response.data.course_groups.length) {
+          this.setState({
+            course_groups: response.data.course_groups
+          })
+        } else {
+          // showNotification('')
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
   }
   componentDidUpdate(prevProps) {
     if (prevProps.match.params.course_group_id != this.props.match.params.course_group_id) {
-      this.setState({checkBoxValues: [], checkAllValue: false })
+      this.setState({ checkBoxValues: [], checkAllValue: false })
 
-      this.fetchAll(1)
+      this.fetchAll(1, this.state.searchValue)
     }
     // 加载了2次
     // else if (prevProps.coursesids != this.props.coursesids) {
     //   this.fetchAll(1)
     // }
   }
-  fetchAll = (argPage) => {
+  fetchAll = (argPage, searchValue) => {
     this.setState({
-      isSpin:true
+      isSpin: true
     })
     let id = this.props.match.params.coursesId
     let course_group_id = this.props.match.params.course_group_id
@@ -406,7 +411,7 @@ class studentsList extends Component{
       this.setState({ page: argPage })
     }
     let page = argPage || this.state.page
-    let { searchValue , sortedInfo }=this.state
+    let { sortedInfo } = this.state
     let order = 1;
     if (sortedInfo.columnKey == 'student_id') {
       order = 1;
@@ -418,18 +423,18 @@ class studentsList extends Component{
       sort = 'asc'
     }
 
-    let url=`/courses/${id}/students.json?order=${order}&sort=${sort}&page=${page}&limit=20&course_group_id=${course_group_id}`;
-    if(!!searchValue){
-      url+='&search='+searchValue;
+    let url = `/courses/${id}/students.json?order=${order}&sort=${sort}&page=${page}&limit=20&course_group_id=${course_group_id}`;
+    if (!!searchValue) {
+      url += '&search=' + searchValue;
     }
-    axios.get(encodeURI(url)).then((result)=>{
+    axios.get(encodeURI(url)).then((result) => {
       if (result.data.students) {
         this.setState({
           students: result.data.students,
           total_count: result.data.students_count,
           course_group_name: result.data.course_group_name,
           invite_code: result.data.invite_code,
-           isSpin:false
+          isSpin: false
         }, () => {
           if (course_group_id) {
             if (!this.clipboard) {
@@ -442,10 +447,10 @@ class studentsList extends Component{
           }
         })
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
       this.setState({
-        isSpin:false
+        isSpin: false
       })
     })
   }
@@ -463,17 +468,23 @@ class studentsList extends Component{
     // }, 1200)
   }
   onSortTypeChange = (order) => {
+    const { page, searchValue } = this.state;
     this.setState({ order: order }, () => {
-      this.fetchAll()
+      this.fetchAll(page, searchValue)
     })
   }
   onPageChange = (page) => {
-    this.fetchAll(page)
+    const { searchValue } = this.state;
+    this.fetchAll(page, searchValue)
     this.setState({ checkAllValue: false })
   }
 
   onPressEnter = (e) => {
-    this.fetchAll(1)
+    this.setState({
+      page: 1,
+      searchValue: e
+    })
+    this.fetchAll(1, e)
   }
 
   onCheckBoxChange = (checkedValues) => {
@@ -491,20 +502,20 @@ class studentsList extends Component{
     }
 
     let id = this.props.match.params.coursesId
-    let { order, searchValue }=this.state
-    let url=`/courses/${id}/transfer_to_course_group.json`;
+    let { order, searchValue, page } = this.state
+    let url = `/courses/${id}/transfer_to_course_group.json`;
     axios.post((url), {
-      students: this.state.checkBoxValues.map(item => {return {course_member_id: item} }),
+      students: this.state.checkBoxValues.map(item => { return { course_member_id: item } }),
       course_group_id: group.id
-    }).then((result)=>{
+    }).then((result) => {
       if (result.data.status == 0) {
         this.props.showNotification('移动成功')
-        this.setState({checkBoxValues: []})
-        this.fetchAll()
+        this.setState({ checkBoxValues: [] })
+        this.fetchAll(page, searchValue);
         this.props.updataleftNavfun()
 
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
@@ -536,24 +547,25 @@ class studentsList extends Component{
         return;
       }
     }
+    const { page, searchValue } = this.state;
 
     this.props.confirm({
       // content: `确认要删除所选的${len}个学生吗？`,
       content: `是否确认删除?`,
       onOk: () => {
         let id = this.props.match.params.coursesId
-        let url=`/courses/${id}/delete_from_course.json`;
+        let url = `/courses/${id}/delete_from_course.json`;
         axios.post((url), {
-          students: [{course_member_id: record.course_member_id}] // this.state.checkBoxValues.map(item => {return {course_member_id: item} }),
-        }).then((result)=>{
+          students: [{ course_member_id: record.course_member_id }] // this.state.checkBoxValues.map(item => {return {course_member_id: item} }),
+        }).then((result) => {
           if (result.data.status == 0) {
             this.props.showNotification('删除成功')
             this.props.updataleftNavfun()
-            this.fetchAll()
-            this.setState({checkBoxValues: []})
+            this.fetchAll(page, searchValue);
+            this.setState({ checkBoxValues: [] })
             trigger('updatabanner')
           }
-        }).catch((error)=>{
+        }).catch((error) => {
           console.log(error);
         })
       }
@@ -570,73 +582,77 @@ class studentsList extends Component{
     const response = await axios.post(url, {
       course_group_id
     })
+    const { page, searchValue } = this.state;
+
     if (response && response.data.status == 0) {
       this.props.showNotification(`已加入分班：${this.state.course_group_name}`)
       this.props.updataleftNavfun()
-      this.fetchAll()
+      this.fetchAll(page, searchValue)
     }
   }
   addToDir = (record) => {
-      this.props.confirm({
+    this.props.confirm({
 
-          content: `是否确认加入分班: ${this.state.course_group_name}?`,
+      content: `是否确认加入分班: ${this.state.course_group_name}?`,
 
-          okText: '确认',
-          cancelText: '取消',
+      okText: '确认',
+      cancelText: '取消',
 
-          onOk: () => {
-              this.doAddToDir()
-          },
-          onCancel() {
-              console.log('Cancel');
-          },
-      });
+      onOk: () => {
+        this.doAddToDir()
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
   }
   renameDir = () => {
     const course_group_id = this.props.match.params.course_group_id
-    trigger('groupRename', { id: parseInt(course_group_id), name: this.state.course_group_name})
+    trigger('groupRename', { id: parseInt(course_group_id), name: this.state.course_group_name })
   }
   deleteDir = () => {
     this.props.confirm({
       content: <div>
-          <div>该分班的学生将被移动到“未分班”</div>
-          <div>是否确认删除?</div>
-        </div>,
+        <div>该分班的学生将被移动到“未分班”</div>
+        <div>是否确认删除?</div>
+      </div>,
       onOk: () => {
         const course_group_id = this.props.match.params.course_group_id
         const courseId = this.props.match.params.coursesId
 
         const url = `/course_groups/${course_group_id}.json`
         axios.delete(url)
-        .then((response) => {
-          if (response.data.status == 0) {
-            this.props.showNotification('删除成功')
-            this.props.history.push(`/courses/${courseId}/course_groups`)
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
+          .then((response) => {
+            if (response.data.status == 0) {
+              this.props.showNotification('删除成功')
+              this.props.history.push(`/classrooms/${courseId}/course_groups`)
+            }
+          })
+          .catch(function (error) {
+            console.log(error);
+          });
       }
     })
   }
   jsCopy = () => {
-      var e = document.getElementById("copy_invite_code");
-      e.select();
-      document.execCommand("Copy");
-      this.props.showNotification('复制成功')
+    var e = document.getElementById("copy_invite_code");
+    e.select();
+    document.execCommand("Copy");
+    this.props.showNotification('复制成功')
   }
 
-  onTableChange = (pagination, filters, sorter) =>{
+  onTableChange = (pagination, filters, sorter) => {
+    const { page, searchValue } = this.state;
+
     this.setState({
       sortedInfo: sorter,
     }, () => {
-      this.fetchAll();
+      this.fetchAll(page, searchValue);
     });
   }
 
 
-  render(){
+  render() {
     const isAdmin = this.props.isAdmin()
     const isStudent = this.props.isStudent()
     const isSuperAdmin = this.props.isSuperAdmin()
@@ -650,7 +666,7 @@ class studentsList extends Component{
       modalsType,
       modalsTopval,
       modalsBottomval,
-      n_And_e  ,
+      n_And_e,
 
       students,
       searchValue,
@@ -658,7 +674,7 @@ class studentsList extends Component{
       course_groups,
       checkBoxValues,
       checkAllValue
-    }=this.state;
+    } = this.state;
     let currentOrderName = '学生学号排序'
     if (order == ORDER_BY_GROUP) {
       currentOrderName = '分班名称排序'
@@ -677,7 +693,7 @@ class studentsList extends Component{
 
     const params = {}
     if (course_group_id) {
-        params.group_id = course_group_id
+      params.group_id = course_group_id
     }
     if (searchValue) {
       searchValue = searchValue.trim()
@@ -690,7 +706,7 @@ class studentsList extends Component{
       paramsString += `&${key}=${params[key]}&`
     }
     exportUrl += paramsString;
-    exportUrltwo+=paramsString;
+    exportUrltwo += paramsString;
     exportUrlthree += paramsString;
 
 
@@ -709,28 +725,28 @@ class studentsList extends Component{
     const isStudentPage = pageType == TYPE_STUDENTS
     this.isStudentPage = isStudentPage
     const isGroupChildPage = pageType == TYPE_COURSE_GOURP_CHILD
-		let studentlist=buildColumns(this,isParent);
-    if(this.props.isexcellent===true){
-			studentlist.some((item,key)=> {
-					if (item.title === "手机号") {
-						studentlist.splice(key, 1)
-						return true
-					}
-				}
-			)
-		}
+    let studentlist = buildColumns(this, isParent);
+    if (this.props.isexcellent === true) {
+      studentlist.some((item, key) => {
+        if (item.title === "手机号") {
+          studentlist.splice(key, 1)
+          return true
+        }
+      }
+      )
+    }
 
-		if(this.props.isexcellent===true){
-			studentlist.some((item,key)=> {
-					if (item.title === "邮箱") {
-						studentlist.splice(key, 1)
-						return true
-					}
-				}
-			)
-		}
+    if (this.props.isexcellent === true) {
+      studentlist.some((item, key) => {
+        if (item.title === "邮箱") {
+          studentlist.splice(key, 1)
+          return true
+        }
+      }
+      )
+    }
 
-    return(
+    return (
       <React.Fragment >
         <DownloadMessageysl
           {...this.props}
@@ -739,35 +755,35 @@ class studentsList extends Component{
           modalsType={this.state.DownloadType}
         />
         <Titlesearchsection
-          title={isParent ? (pageType == TYPE_STUDENTS ? "全部学生" : "学生列表"):
+          title={isParent ? (pageType == TYPE_STUDENTS ? "全部学生" : "学生列表") :
             <React.Fragment>
               {
-                course_group_name ? 
-                <span>
-                  <Tooltip title="返回至分班列表">
-                    <i className="icon-zuojiantou iconfont font-14" onClick={() => { this.props.history.push(`/courses/${courseId}/course_groups`)}}
-                      style={{color: '#212121', verticalAlign: 'initial', marginRight: '14px' }}
-                    ></i>
-                  </Tooltip>{course_group_name}
-                </span>
-                :
-                <ul className="course_publicNav">
-                  <li onClick={() => { this.props.history.push(`/courses/${courseId}/course_groups`)}}>分班列表</li>
-                  <li className="active">未分班</li>
-                </ul>
+                course_group_name ?
+                  <span>
+                    <Tooltip title="返回至分班列表">
+                      <i className="icon-zuojiantou iconfont font-14" onClick={() => { this.props.history.push(`/classrooms/${courseId}/course_groups`) }}
+                        style={{ color: '#212121', verticalAlign: 'initial', marginRight: '14px' }}
+                      ></i>
+                    </Tooltip>{course_group_name}
+                  </span>
+                  :
+                  <ul className="course_publicNav">
+                    <li onClick={() => { this.props.history.push(`/classrooms/${courseId}/course_groups`) }}>分班列表</li>
+                    <li className="active">未分班</li>
+                  </ul>
               }
-              
+
               {isAdmin && invite_code && <React.Fragment>
                 <span className="color-grey-9 font-16 ml10">邀请码：</span>
                 <span className="color-orange font-16">
                   {invite_code}
                 </span>
                 <Tooltip title={<div>
-                    <div>成员可以通过邀请码主动加入分班</div>
-                    <div>点击立刻复制邀请码</div>
-                  </div>}>
+                  <div>成员可以通过邀请码主动加入分班</div>
+                  <div>点击立刻复制邀请码</div>
+                </div>}>
                   <span>
-                  <i class="iconfont icon-fuzhi font-14 ml10 copybtn" style={{color: '#FF6800', cursor: 'pointer', verticalAlign: 'baseline'}} data-clipboard-text={invite_code} ></i>
+                    <i className="iconfont icon-fuzhi font-14 ml10 copybtn" style={{ color: '#FF6800', cursor: 'pointer', verticalAlign: 'baseline' }} data-clipboard-text={invite_code} ></i>
                   </span>
                 </Tooltip>
               </React.Fragment>
@@ -775,30 +791,23 @@ class studentsList extends Component{
 
             </React.Fragment>
           }
-          searchValue={ searchValue }
+          searchValue={searchValue}
           onInputSearchChange={this.onInputSearchChange}
+          allowClearonChange={this.onInputSearchChange}
           showSearchInput={total_count >= 10}
-          searchPlaceholder={ '请输入姓名、学号进行搜索' }
+          onPressEnter={this.onPressEnter}
+          searchPlaceholder={'请输入姓名、学号进行搜索'}
           firstRowRight={
             <React.Fragment>
-              {/* {
-                // pageType !== TYPE_STUDENTS &&
-                !isStudentPage && isSuperAdmin && <React.Fragment>
-                  <CreateGroupByImportModal ref="createGroupByImportModal" {...this.props}
-                    createGroupImportSuccess={this.createGroupImportSuccess}
-                  ></CreateGroupByImportModal>
-                  <WordsBtn style="blue" className="mr30" onClick={()=> this.refs['createGroupByImportModal'].setVisible(true)}>导入创建分班</WordsBtn>
-                </React.Fragment> } */}
+              {
+                !isStudentPage && isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={() => this.deleteDir()}>删除分班</WordsBtn>}
+              {
+                !isStudentPage && isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={() => this.renameDir()}>分班重命名</WordsBtn>}
+              {
+                !isStudentPage && !isCourseEnd && isAdmin && <WordsBtn style="blue" className="mr30" onClick={() => this.addDir()}>新建分班</WordsBtn>}
 
               {
-                  !isStudentPage && isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> }
-              {
-                  !isStudentPage && isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>分班重命名</WordsBtn> }
-              {
-                  !isStudentPage && !isCourseEnd && isAdmin  && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>新建分班</WordsBtn> }
-
-              {
-                  !isStudentPage && isStudent && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="" onClick={()=>this.addToDir()}>加入分班</WordsBtn> }
+                !isStudentPage && isStudent && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="" onClick={() => this.addToDir()}>加入分班</WordsBtn>}
               <style>{`
                 .drop_down_menu li a {
                     padding: 0px;
@@ -825,23 +834,23 @@ class studentsList extends Component{
                   margin: 0px;
                 }
                 `}</style>
-              { isAdmin &&
-              <li className="li_line drop_down fr color-blue font-16">
-                导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
-                <ul className="drop_down_menu" style={{"right": "-20px", "left": "unset", "height": "auto"}}>
+              {isAdmin &&
+                <li className="li_line drop_down fr color-blue font-16">
+                  导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                  <ul className="drop_down_menu" style={{ "right": "-20px", "left": "unset", "height": "auto" }}>
 
-                  <li><a
-                  	onClick={(i) => this.confirmysl(exportUrltwo)}>课堂信息</a>
-                  </li>
-                  <li><a
-                    onClick={(i) => this.confirmysl(exportUrlthree)}>活跃度</a>
-                  </li>
-                  <li><a
-                    onClick={(i) => this.confirmysl(exportUrl)}>总成绩</a>
-                  </li>
+                    <li><a
+                      onClick={(i) => this.confirmysl(exportUrltwo)}>课堂信息</a>
+                    </li>
+                    <li><a
+                      onClick={(i) => this.confirmysl(exportUrlthree)}>活跃度</a>
+                    </li>
+                    <li><a
+                      onClick={(i) => this.confirmysl(exportUrl)}>总成绩</a>
+                    </li>
 
-                </ul>
-              </li>
+                  </ul>
+                </li>
               }
               {/*<WordsBtn style="blue" className=""  onClick={(url)=>this.confirmysl(exportUrl)} >导出成绩</WordsBtn>*/}
               {/*  */}
@@ -850,50 +859,49 @@ class studentsList extends Component{
           secondRowLeft={
             total_count ? <ColorCountText count={total_count} name="个学生"></ColorCountText> : ''
           }
-          onPressEnter={this.onPressEnter}
         ></Titlesearchsection>
         {
           total_count > 0 || this.state.isSpin == true ?
-          <div className="mt20 edu-back-white padding20">
-            <div className="clearfix stu_head" style={{paddingLeft: '5px'}}>
-              {isAdmin && !isStudentPage && <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue} >已选 {checkBoxValues.length} 个</Checkbox>}
-              <div className="studentList_operation_ul">
-                {/* {isAdmin && <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onDelete}>删除</a></li>} */}
-                {isAdmin && !isStudentPage && <li className="drop_down">
-                  移动到...<i className="iconfont icon-xiajiantou font-12 ml2"></i>
-                  <ul className="drop_down_menu" style={{"right":"0px","left":"unset", width: '200px', maxHeight: '324px', overflowY: 'auto'}}>
-                    {
-                      course_groups && course_groups.length > 9 ?
-                      (<p className="drop_down_search">
-                        <Input placeholder="搜索" value={this.state.groupSearchValue} onChange={(e) => {this.setState({groupSearchValue: e.target.value})}}/>
-                      </p>):
-                      ''
-                    }
-                    {
-                      course_group_id != 0 && course_groups && course_groups.length > 0 &&
-                      <li key={0} onClick={() => this.moveToGroup({id: 0})}>未分班</li>
-                    }
-                    { course_groups.filter((item)=> {
-                      return item.id != course_group_id && (!this.state.groupSearchValue || item.name.indexOf(this.state.groupSearchValue) != -1)
-                    }).map( item => {
-                      return (
-                        <li key={item.id} onClick={() => this.moveToGroup(item)} title={item.name}>{item.name}</li>
-                      )
-                    }) }
-                    { course_groups && course_groups.length > 0 && <Divider className="dividerStyle"></Divider> }
-                    { isAdmin && !isCourseEnd &&
+            <div className="mt20 edu-back-white padding20">
+              <div className="clearfix stu_head" style={{ paddingLeft: '5px' }}>
+                {isAdmin && !isStudentPage && <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue} >已选 {checkBoxValues.length} 个</Checkbox>}
+                <div className="studentList_operation_ul">
+                  {/* {isAdmin && <li className="li_line"><a   className="color-grey-9" onClick={this.onDelete}>删除</a></li>} */}
+                  {isAdmin && !isStudentPage && <li className="drop_down">
+                    移动到<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                    <ul className="drop_down_menu" style={{ "right": "0px", "left": "unset", width: '200px', maxHeight: '324px', overflowY: 'auto' }}>
+                      {
+                        course_groups && course_groups.length > 9 ?
+                          (<p className="drop_down_search">
+                            <Input placeholder="搜索" value={this.state.groupSearchValue} onChange={(e) => { this.setState({ groupSearchValue: e.target.value }) }} />
+                          </p>) :
+                          ''
+                      }
+                      {
+                        course_group_id != 0 && course_groups && course_groups.length > 0 &&
+                        <li key={0} onClick={() => this.moveToGroup({ id: 0 })}>未分班</li>
+                      }
+                      {course_groups.filter((item) => {
+                        return item.id != course_group_id && (!this.state.groupSearchValue || item.name.indexOf(this.state.groupSearchValue) != -1)
+                      }).map(item => {
+                        return (
+                          <li key={item.id} onClick={() => this.moveToGroup(item)} title={item.name}>{item.name}</li>
+                        )
+                      })}
+                      {course_groups && course_groups.length > 0 && <Divider className="dividerStyle"></Divider>}
+                      {isAdmin && !isCourseEnd &&
 
-                      <p className="drop_down_btn">
-                        <a href="javascript:void(0)" className="color-grey-6"
-                            onClick={()=>this.addDir()}
-                        >新建分班...</a>
-                      </p>
+                        <p className="drop_down_btn">
+                          <a className="color-grey-6"
+                            onClick={() => this.addDir()}
+                          >新建分班...</a>
+                        </p>
 
-                    }
-                  </ul>
-                </li>}
+                      }
+                    </ul>
+                  </li>}
 
-                {/* <li className="drop_down">
+                  {/* <li className="drop_down">
                   {currentOrderName}
                   { course_groups && !!course_groups.length &&
                   <React.Fragment>
@@ -905,25 +913,25 @@ class studentsList extends Component{
                   </React.Fragment>
                    }
                 </li> */}
+                </div>
               </div>
+              <Spin size="large" spinning={this.state.isSpin}>
+                <div className="clearfix stu_table">
+                  {students && !!students.length && <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
+                    <Table columns={studentlist} dataSource={students} onChange={this.onTableChange} pagination={false}></Table>
+                  </Checkbox.Group>}
+                </div>
+              </Spin>
             </div>
-            <Spin size="large" spinning={this.state.isSpin}>
-            <div className="clearfix stu_table">
-              {students && !!students.length && <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
-                <Table columns={studentlist} dataSource={students} onChange={this.onTableChange} pagination={false}></Table>
-              </Checkbox.Group> }
-            </div>
-            </Spin>
-          </div>
-          :
-          <NoneData></NoneData>
+            :
+            <NoneData></NoneData>
         }
         {/* showQuickJumper */}
-        { total_count > 20 && <div className="clearfix mt30 mb50 edu-txt-center">
+        {total_count > 20 && <div className="clearfix mt30 mb50 edu-txt-center">
           <Pagination showQuickJumper defaultCurrent={page} current={page} pageSize={20} total={total_count} onChange={this.onPageChange} />
-        </div> }
+        </div>}
       </React.Fragment>
     )
   }
 }
-export default studentsList;
\ No newline at end of file
+export default studentsList;
diff --git a/src/modules/courses/members/teacherList.js b/src/modules/courses/members/teacherList.js
index 2ce893b5..536c61de 100644
--- a/src/modules/courses/members/teacherList.js
+++ b/src/modules/courses/members/teacherList.js
@@ -1,5 +1,5 @@
-import React,{ Component } from "react";
-import { Input,Checkbox,Table, Divider, Tooltip,Spin, Menu, Popconfirm } from "antd";
+import React, { Component } from "react";
+import { Input, Checkbox, Table, Divider, Tooltip, Spin, Menu, Popconfirm } from "antd";
 
 import CourseLayoutcomponent from '../common/CourseLayoutComponent'
 import NoneData from "../coursesPublic/NoneData"
@@ -8,7 +8,7 @@ import Titlesearchsection from '../common/titleSearch/TitleSearchSection'
 import ColorCountText from '../common/titleSearch/ColorCountText'
 import update from 'immutability-helper'
 
-import { WordsBtn, ConditionToolTip, on, off ,trigger, sortDirections } from 'educoder'
+import { WordsBtn, ConditionToolTip, on, off, trigger, sortDirections } from 'educoder'
 
 import axios from 'axios'
 
@@ -38,8 +38,8 @@ function buildColumns(that) {
   const isAdminOrCreator = that.props.isAdminOrCreator();
   const isAdminOrTeacher = that.props.isAdminOrTeacher()
   const { course_groups, filterKey } = that.state
-  const showSorter = filterKey == '1' 
-  const courseId = that.props.match.params.coursesId    
+  const showSorter = filterKey == '1'
+  const courseId = that.props.match.params.coursesId
 
   const columns = [{
     title: '序号',
@@ -48,20 +48,20 @@ function buildColumns(that) {
     width: 78,
     render: (content, item, index) => {
       return index + 1
-      // return item.isApply == true ? '' : <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1 
+      // return item.isApply == true ? '' : <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1
       //     - (that.state.application_list ? that.state.application_list.length : 0)}　</a>
     }
   }
-  // ,{
-  //   title: '用户ID',
-  //   width: 120,
-  //   dataIndex: 'login',
-  //   key: 'login',
-  //   render: (login, record) => {
-  //     return <span className="overflowHidden1" style={{ maxWidth: '110px'}} title={`${login.length > 8 ? login : ''}`}>{login}</span>
-  //   }
-  // }
-  , {
+    // ,{
+    //   title: '用户ID',
+    //   width: 120,
+    //   dataIndex: 'login',
+    //   key: 'login',
+    //   render: (login, record) => {
+    //     return <span className="overflowHidden1" style={{ maxWidth: '110px'}} title={`${login.length > 8 ? login : ''}`}>{login}</span>
+    //   }
+    // }
+    , {
     title: '姓名',
     dataIndex: 'name',
     width: 120,
@@ -70,8 +70,8 @@ function buildColumns(that) {
     sortDirections: sortDirections,
     sortOrder: sortedInfo.columnKey === 'name' && sortedInfo.order,
     render: (name, record) => {
-      return <a href={`/users/${record.login}`} target="_blank" className="overflowHidden1" style={{ maxWidth: '110px'}} 
-          title={`${name.length > 4 ? name : ''}`}>{name}</a>
+      return <a href={`/users/${record.login}`} target="_blank" className="overflowHidden1" style={{ maxWidth: '110px' }}
+        title={`${name.length > 4 ? name : ''}`}>{name}</a>
     }
   }, {
     title: '角色',
@@ -84,7 +84,7 @@ function buildColumns(that) {
     sortDirections: sortDirections,
     sortOrder: sortedInfo.columnKey === 'role' && sortedInfo.order,
 
-  }] 
+  }]
   that.state.course_groups && that.state.course_groups.length && showSorter && columns.push({
     title: <Tooltip title="仅能批阅指定分班的作品">管理权限</Tooltip>,
     width: 260,
@@ -98,23 +98,26 @@ function buildColumns(that) {
       }
       // ((!course_groups || course_groups.length == 0) && <p>暂未有分班信息，不能操作</p>)
       const noGroups = (!course_groups || course_groups.length == 0);
+
       return (
         <ConditionToolTip title={`暂未有分班信息，不能操作`} condition={noGroups}>
-        <span className="drop_down" style={{color: '#29BD8B', display: 'inline-block'}}>
-        { arg_course_groups.length == 0 ? '全部分班' : arg_course_groups.map(item => item.name).join(', ') }
-        { isAdmin &&
-          <React.Fragment>
-            <i className="iconfont icon-xiajiantou font-12 ml2"></i>
-            {!noGroups && <CourseGroupChooser
-              {...{course_groups, isAdminOrCreator, item, index, arg_course_groups,
-                checkAllValue: that.state.checkAllArray[index],
-                joinCourseGroup: that.joinCourseGroup,
-                onCheckAllChange: that.onCheckAllChange}}
-            ></CourseGroupChooser>}
-          </React.Fragment> }
-        </span>
-      </ConditionToolTip>)
-      }
+          <span className="drop_down" style={{ color: '#29BD8B', display: 'inline-block' }}>
+            {(arg_course_groups.length === 0 || arg_course_groups.length === course_groups.length) ? '全部分班' : arg_course_groups.map(item => item.name).join(', ')}
+            {isAdmin &&
+              <React.Fragment>
+                <i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                {!noGroups && <CourseGroupChooser
+                  {...{
+                    course_groups, isAdminOrCreator, item, index, arg_course_groups,
+                    checkAllValue: arg_course_groups.length === course_groups.length,
+                    joinCourseGroup: that.joinCourseGroup,
+                    onCheckAllChange: that.onCheckAllChange
+                  }}
+                ></CourseGroupChooser>}
+              </React.Fragment>}
+          </span>
+        </ConditionToolTip>)
+    }
     ,
   });
   const hasGraduationModule = that.hasGraduationModule()
@@ -129,8 +132,8 @@ function buildColumns(that) {
       sortOrder: sortedInfo.columnKey === 'graduation_group' && sortedInfo.order,
 
       render: text => (
-        <span className="overflowHidden1" style={{ maxWidth: '160px'}}
-            title={`${text && text.length > 10 ? text : ''}`}
+        <span className="overflowHidden1" style={{ maxWidth: '160px' }}
+          title={`${text && text.length > 10 ? text : ''}`}
         >
           {text}
         </span>
@@ -142,7 +145,7 @@ function buildColumns(that) {
       title: '操作',
       key: 'action',
       width: 150,
-      align:'center',
+      align: 'center',
       render: (text, record) => {
         const isAdmin = record.role == ROLE_ADMIN
         const isTeacher = record.role == ROLE_TEACHER
@@ -152,13 +155,13 @@ function buildColumns(that) {
             <span>
               <WordsBtn onClick={() => that.onRefuse(record)} style={'grey'}>拒绝</WordsBtn>
               <Divider type="vertical" />
-              <a onClick={() => that.onAgree(record)} style={{color: '#4CACFF'}}>同意</a> 
-            </span> )
+              <a onClick={() => that.onAgree(record)} style={{ color: '#4CACFF' }}>同意</a>
+            </span>)
         } else {
 
           return (
             <React.Fragment>
-              <WordsBtn style2={{ marginRight: '12px' }} onClick={() => that.onDelete(record)} style={'grey'}>删除</WordsBtn>              
+              <WordsBtn style2={{ marginRight: '12px' }} onClick={() => that.onDelete(record)} style={'grey'}>删除</WordsBtn>
               <ChangeRolePop
                 courseId={courseId}
                 record={record}
@@ -169,7 +172,7 @@ function buildColumns(that) {
                 fetchUser={that.props.fetchUser}
 
               ></ChangeRolePop>
-              {/* <Popconfirm 
+              {/* <Popconfirm
                 placement="bottom"
                 icon={null}
                 title={
@@ -192,24 +195,24 @@ function buildColumns(that) {
             //   { record.role == ROLE_TEACHER ? <a style={{color: '#4CACFF'}} onClick={() => that.changeToAssistant(record)}>变更为助教</a> : '' }
             //   { record.role == ROLE_TEACHER_ASSISTANT ? <a style={{color: '#4CACFF'}} onClick={() => that.changeToTeacher(record)}>变更为教师</a> : '' }
             //   { record.role == ROLE_ADMIN  && isAdminOrCreator ? <a style={{color: '#4CACFF', marginLeft: '44px'}} onClick={() => that.showChangeAdminModal(record)}>更换管理员</a> : '' }
-              
-            // </span> 
-            )
+
+            // </span>
+          )
         }
-        
+
       },
     })
   }
   // 待审批不需要
-  if(filterKey == '1' && isAdminOrTeacher && hasGraduationModule) {
+  if (filterKey == '1' && isAdminOrTeacher && hasGraduationModule) {
     columns.unshift({
       title: '',
       dataIndex: 'course_member_id',
       key: 'course_member_id',
-      render: (content, item, index) => {
-        return content ? <Checkbox value={content}></Checkbox> : ''
+      render: (content, item, key) => {
+        return content ? <Checkbox value={content} key={content}></Checkbox> : ''
       }
-    })  
+    })
   }
   return columns
 }
@@ -218,21 +221,21 @@ const ORDER_BY_NAME = 1;
 const ORDER_BY_DATE = 2;
 const ORDER_BY_GRADUATION_GROUP = 3;
 
-class studentsList extends Component{
-  constructor(props){
+class studentsList extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      headIndex:"1",
-      page:1,
-      sortedInfo: { columnKey: 'role', order: 'ascend'},
-      totalPage:undefined,
-      searchValue:"",
+    this.state = {
+      headIndex: "1",
+      page: 1,
+      sortedInfo: { columnKey: 'role', order: 'ascend' },
+      totalPage: undefined,
+      searchValue: "",
       order: ORDER_BY_DATE,
-      search:"",
-      groupList:undefined,
+      search: "",
+      groupList: undefined,
       teachers: [],
       checkBoxValues: [],
-      isSpin:false,
+      isSpin: false,
       application_list: [],
       course_groups: [],
       checkAllArray: [],
@@ -243,74 +246,74 @@ class studentsList extends Component{
     const that = this;
     const checkAllArray = that.state.checkAllArray.slice(0)
     checkAllArray[index] = !checkAllArray[index]
-    that.setState({checkAllArray})
+    that.setState({ checkAllArray })
     if (checkAllArray[index]) {
       that.joinCourseGroup(that.state.course_groups.map((item) => item.id), item, index)
     } else {
       that.joinCourseGroup([], item, index)
     }
   }
-  inputSearch=(e)=>{
+  inputSearch = (e) => {
     this.setState({
-      searchValue:e.target.value
+      searchValue: e.target.value
     })
   }
   // approval 2 - 拒绝
   onAgree = (record, approval = 1) => {
     const isAdminOrCreator = this.props.isAdminOrCreator()
-    const { course_groups ,filterKey} = this.state
+    const { course_groups, filterKey, searchValue } = this.state
     if (approval == 1 && isAdminOrCreator && course_groups && course_groups.length) {
-      this.setState({ clickRecord: record}, () => {
+      this.setState({ clickRecord: record }, () => {
         this.setGroupChooserModalVisible(true)
       })
       return;
     }
-    const courseId = this.props.match.params.coursesId    
-    
+    const courseId = this.props.match.params.coursesId
+
     let url = `/courses/${courseId}/teacher_application_review.json`
-    
+
     this.props.confirm({
-      content: `是否确认${ approval == 1 ? '同意' : '拒绝'}TA的加入？`,
+      content: `是否确认${approval == 1 ? '同意' : '拒绝'}TA的加入？`,
       onOk: () => {
         axios.post(url, {
           user_id: record.user_id,
           application_id: record.application_id,
           approval: approval
         })
-        .then((response) => {
-          if (response.data.status == 0) {
-            this.props.showNotification(`已${approval == 1? '同意' : '拒绝'}`)
-            this.fetchAll(1,filterKey)
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-        });  
+          .then((response) => {
+            if (response.data.status == 0) {
+              this.props.showNotification(`已${approval == 1 ? '同意' : '拒绝'}`)
+              this.fetchAll(1, filterKey, searchValue)
+            }
+          })
+          .catch(function (error) {
+            console.log(error);
+          });
       }
     })
 
-    
+
   }
   onRefuse = (record) => {
     this.onAgree(record, 2)
   }
 
-  componentDidMount(){
+  componentDidMount() {
     this.setState({
-      isSpin:true
+      isSpin: true
     })
-		let newmenuid=this.props.location.search.replace('?tab=', '');
-		if(newmenuid===undefined||newmenuid===""||newmenuid==="1"||newmenuid===1){
-			this.setState({
-				filterKey:'1'
-			})
-			this.fetchAll(1,'1');
-		}else{
-			this.setState({
-				filterKey:'2'
-			})
-			this.fetchAll(1,'2');
-		}
+    let newmenuid = this.props.location.search.replace('?tab=', '');
+    if (newmenuid === undefined || newmenuid === "" || newmenuid === "1" || newmenuid === 1) {
+      this.setState({
+        filterKey: '1'
+      })
+      this.fetchAll(1, '1');
+    } else {
+      this.setState({
+        filterKey: '2'
+      })
+      this.fetchAll(1, '2');
+    }
 
 
     const isAdminOrTeacher = this.props.isAdminOrTeacher()
@@ -332,83 +335,82 @@ class studentsList extends Component{
     this.getCourseGroups()
   }
   addTeacherSuccessListener = (e, data) => {
-
+    const { searchValue } = this.state;
     // const params = JSON.parse(data)
     // const coursesId = this.props.match.params.coursesId
     if (window.location.pathname.endsWith('teachers')) {
-      this.fetchAll(1,this.state.filterKey)
+      this.fetchAll(1, this.state.filterKey, searchValue)
     } else {
       // this.props.history.push(`/courses/${coursesId}/teachers`)
     }
     // console.log('addTeacherSuccessListener', data)
   }
   getCourseGroups = () => {
-    const courseId = this.props.match.params.coursesId    
-    
+    const courseId = this.props.match.params.coursesId
+
     let url = `/courses/${courseId}/all_course_groups.json`
-    
+
     axios.get(url, {
       params: { all: true }
     })
-    .then((response) => {
-      if (response.data.course_groups && response.data.course_groups.length) {
-        let course_groups_map = {}
-        response.data.course_groups.forEach(item => {
-          course_groups_map[item.id] = item.name
-        })
-        this.setState({
-          course_groups: response.data.course_groups,
-          course_groups_map
-        })
-      } else {
-      }
-    })
-    .catch(function (error) {
-      console.log(error);
-    });
+      .then((response) => {
+        if (response.data.course_groups && response.data.course_groups.length) {
+          let course_groups_map = {}
+          response.data.course_groups.forEach(item => {
+            course_groups_map[item.id] = item.name
+          })
+          this.setState({
+            course_groups: response.data.course_groups,
+            course_groups_map
+          })
+        } else {
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
   }
   joinCourseGroup = (ids, item, index) => {
     // console.log('join ', ids, item)
-    
-    const courseId = this.props.match.params.coursesId    
-    
+
+    const courseId = this.props.match.params.coursesId
+
     let url = `/courses/${courseId}/set_course_group.json`
-    
+
     axios.post(url, {
       course_group_ids: ids,
       user_id: item.user_id,
       course_member_id: item.course_member_id
     })
-    .then((response) => {
-      if (response.data.status == 0) {
-        this.props.showNotification('修改成功')
-        const newArray = ids.map((item) => {return {id: item, name: this.state.course_groups_map[item]}});
-        this.setState(
-          (prevState) => ({
-              teachers : update(prevState.teachers, {[ this.state.page == 1 ? index - this.state.application_list.length : index]: { course_groups: {$set: newArray }}})
-          }))
-        // this.fetchAll()
-      } else {
-      }
-    })
-    .catch(function (error) {
-      console.log(error);
-    });
+      .then((response) => {
+        if (response.data.status == 0) {
+          this.props.showNotification('修改成功')
+          this.props.updatabanners()
+          const newArray = ids.map((item) => { return { id: item, name: this.state.course_groups_map[item] } });
+          this.setState(
+            (prevState) => ({
+              teachers: update(prevState.teachers, { [this.state.page == 1 ? index - this.state.application_list.length : index]: { course_groups: { $set: newArray } } })
+            }))
+          // this.fetchAll()
+        } else {
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
   }
   onChangeRoleSuccess = () => {
-    this.fetchAll(undefined,this.state.filterKey)
-  } 
-  fetchAll = async (argPage,filterKey) => {
-		let { searchValue }=this.state
-
+    this.fetchAll(undefined, this.state.filterKey, this.state.searchValue)
+  }
+  fetchAll = async (argPage, filterKey, searchValue) => {
     this.setState({
-      isSpin:true
+      isSpin: true
     })
-    let id = this.props.match.params.coursesId    
+    let id = this.props.match.params.coursesId
     if (argPage) {
       this.setState({ page: argPage })
     }
-    
+
     const sortedInfo = this.state.sortedInfo;
     let page = argPage || this.state.page
 
@@ -424,52 +426,48 @@ class studentsList extends Component{
     if (sortedInfo.order == 'ascend') {
       sort = 'asc'
     }
-    let url=`/courses/${id}/teachers.json?order=${order}&page=${page}&sort=${sort}`;
+    let url = `/courses/${id}/teachers.json?order=${order}&page=${page}&sort=${sort}`;
     if (filterKey == '1') {
 
     } else if (filterKey == '2') {
-      url =  `/courses/${id}/apply_teachers.json?_a=1`
+      url = `/courses/${id}/apply_teachers.json?_a=1`
     }
-    if(searchValue!=""){
-      url+='&search='+searchValue;
+    if (searchValue) {
+      url += '&search=' + searchValue;
     }
+    const { updatabanners } = this.props;
+    updatabanners && updatabanners();
     const result = await axios.get(encodeURI(url))
-    // axios.get((url)).then((result)=>{
-      if (result.data.teacher_list) {
-        this.setState({ 
-          teachers: result.data.teacher_list,
-          total_count: result.data.teacher_list_size,
-          application_list: result.data.application_list || [],
-          is_admin: result.data.is_admin,
-          apply_size: result.data.apply_size,
-          isSpin:false
-        })
-      } else if (result.data.application_list) {
-        this.setState({ 
-          total_count: result.data.teacher_list_size,
-          application_list: result.data.application_list || [],
-          is_admin: result.data.is_admin,
-          apply_size: result.data.apply_size,
-          isSpin:false
-        })
-      }
-    // }).catch((error)=>{
-    //   console.log(error);
-    //   this.setState({
-    //     isSpin:false
-    //   })
-    // })
+    if (result.data.teacher_list) {
+      this.setState({
+        teachers: result.data.teacher_list,
+        total_count: result.data.teacher_list_size,
+        application_list: result.data.application_list || [],
+        is_admin: result.data.is_admin,
+        apply_size: result.data.apply_size,
+        isSpin: false
+      })
+
+    } else if (result.data.application_list) {
+      this.setState({
+        total_count: result.data.teacher_list_size,
+        application_list: result.data.application_list || [],
+        is_admin: result.data.is_admin,
+        apply_size: result.data.apply_size,
+        isSpin: false
+      })
+    }
   }
-  getGroupList(){
-    let id = this.props.match.params.coursesId    
-    let url='/courses/'+id+'/graduation_group_list.json';
-    axios.get((url)).then((result)=>{
-      if(result.status==200){
+  getGroupList() {
+    let id = this.props.match.params.coursesId
+    let url = '/courses/' + id + '/graduation_group_list.json';
+    axios.get((url)).then((result) => {
+      if (result.status == 200) {
         this.setState({
-          groupList:result.data
+          groupList: result.data
         })
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
@@ -480,37 +478,40 @@ class studentsList extends Component{
   // join_graduation_group
   joinGraduationGroup = (graduation_group_id) => {
     const courseId = this.props.match.params.coursesId
-		let { filterKey }=this.state
-    let url= `/courses/${courseId}/join_graduation_group.json`;
+    let { filterKey, searchValue } = this.state
+    let url = `/courses/${courseId}/join_graduation_group.json`;
     axios.post(url, {
-      course_member_list: this.state.checkBoxValues.map (item => { return { course_member_id: item } }),
+      course_member_list: this.state.checkBoxValues.map(item => { return { course_member_id: item } }),
       graduation_group_id: graduation_group_id
-    }).then((result)=>{
-      if(result.data.status==0){
+    }).then((result) => {
+      if (result.data.status == 0) {
         this.props.showNotification('操作成功。')
-        this.fetchAll(undefined,filterKey)
+        this.fetchAll(undefined, filterKey, searchValue);
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
 
   onInputSearchChange = (e) => {
-  	let {filterKey}=this.state;
+    // let {filterKey}=this.state;
     this.setState({
       searchValue: e.target.value
     })
 
-    if (this.timeoutHandler) {
-      clearTimeout(this.timeoutHandler)
-    }
-    this.timeoutHandler = setTimeout(() => {
-      this.fetchAll(1,filterKey)
-    }, 1200)
+    // if (this.timeoutHandler) {
+    //   clearTimeout(this.timeoutHandler)
+    // }
+    // this.timeoutHandler = setTimeout(() => {
+    //   this.fetchAll(1,filterKey,e.target.value)
+    // }, 1200)
   }
 
-  onPressEnter = (e) => {
-    this.fetchAll(1,this.state.filterKey)
+  onPressEnter = (value) => {
+    this.setState({
+      searchValue: value
+    })
+    this.fetchAll(1, this.state.filterKey, value);
   }
 
 
@@ -535,34 +536,35 @@ class studentsList extends Component{
       })
     } else {
       this.setState({
-        checkBoxValues: _.difference(this.state.checkBoxValues, values)
+        checkBoxValues: _.difference(this.state.checkBoxValues, values),
       })
     }
   }
   onSortTypeChange = (order) => {
+    const { page, searchValue } = this.state;
     this.setState({ order: order }, () => {
-      this.fetchAll()
+      this.fetchAll(page, undefined, searchValue);
     })
-  } 
+  }
   changeRole = (member, role) => {
-    
-    const courseId = this.props.match.params.coursesId    
-    let {filterKey}=this.state;
-    let url= `/courses/${courseId}/change_course_teacher.json`;
+
+    const courseId = this.props.match.params.coursesId
+    let { filterKey } = this.state;
+    let url = `/courses/${courseId}/change_course_teacher.json`;
     axios.post(url, {
       course_member_id: member.course_member_id
       // "user_list": [
-      //   { "user_id": member.user_id }  
+      //   { "user_id": member.user_id }
       // ],
       // "graduation_group_id": member.graduation_group_id,
       // "course_group_id": "820",
       // "role": role
-    }).then((result)=>{
-      if(result.data.status==0){
+    }).then((result) => {
+      if (result.data.status == 0) {
         this.props.showNotification('操作成功。')
-        this.fetchAll(undefined,filterKey)
+        this.fetchAll(undefined, filterKey)
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
@@ -576,11 +578,11 @@ class studentsList extends Component{
     this.refs.addAdminModal.setVisible(true)
   }
   changeAdminSuccess = () => {
-  	let {filterKey}=this.state;
-    this.fetchAll(undefined,filterKey)
+    let { filterKey } = this.state;
+    this.fetchAll(undefined, filterKey)
   }
   onDelete = (member) => {
-  	let {filterKey}=this.state;
+    let { filterKey } = this.state;
     this.props.confirm({
       content: `确认要将“${member.name}”从教师列表中移除吗？`,
       onOk: () => {
@@ -588,73 +590,72 @@ class studentsList extends Component{
         const courseId = this.props.match.params.coursesId
 
         const url = `/courses/${courseId}/delete_course_teacher.json`
-        axios.post(url, { 
-            course_member_id: member.course_member_id
-          })
-        .then((response) => {
-          if (response.data.status == 0) {
-            // {"status":1,"message":"删除成功"}
-            this.props.showNotification('删除成功')
-            trigger('updatabanner')
-            this.fetchAll(undefined,filterKey)
-          }
+        axios.post(url, {
+          course_member_id: member.course_member_id
         })
-        .catch(function (error) {
-          console.log(error);
-        });    
+          .then((response) => {
+            if (response.data.status == 0) {
+              // {"status":1,"message":"删除成功"}
+              this.props.showNotification('删除成功')
+              trigger('updatabanner')
+              this.fetchAll(undefined, filterKey)
+            }
+          })
+          .catch(function (error) {
+            console.log(error);
+          });
       }
     })
   }
   addTeacher = () => {
-    this.refs.addTeacherModal.setVisible(true)    
+    this.refs.addTeacherModal.setVisible(true)
   }
   addStudent = () => {
-    this.refs.addStudentModal.setVisible(true)    
+    this.refs.addStudentModal.setVisible(true)
   }
 
   hasGraduationModule = () => {
     const { course_modules } = this.props;
-    const result = course_modules && course_modules.filter( item => {
+    const result = course_modules && course_modules.filter(item => {
       return item.type == 'graduation'
     })
     return result && result.length > 0
   }
-  
+
   onTableChange = (pagination, filters, sorter) => {
-  	let {filterKey}=this.state;
+    let { filterKey } = this.state;
     console.log('Various parameters', pagination, filters, sorter);
     this.setState({
       page: pagination.current,
       sortedInfo: sorter,
     }, () => {
-      this.fetchAll(undefined,filterKey)
+      this.fetchAll(undefined, filterKey)
     });
   };
   clearSelection = () => {
     this.setState({ checkBoxValues: [] })
   }
-  selectedStatus=(e)=>{
+  selectedStatus = (e) => {
     this.clearSelection()
     this.setState({
       filterKey: e.key,
-      page:1,
-      isSpin:true
+      page: 1,
+      isSpin: true
     }, () => {
-      this.fetchAll(undefined,e.key);
+      this.fetchAll(undefined, e.key);
     })
   }
   setGroupChooserModalVisible = (visible) => {
     // 这里只会调用open
-    this.setState({groupChooserModalVisible: !this.state.groupChooserModalVisible})
+    this.setState({ groupChooserModalVisible: !this.state.groupChooserModalVisible })
   }
-  render(){
+  render() {
     const isAdmin = this.props.isAdmin()
     const columns = buildColumns(this)
     let {
       searchValue, checkBoxValues, checkAllValue, course_groups,
       groupList, total_count, teachers, order, page, apply_size, filterKey
-    }=this.state
-
+    } = this.state
     let currentOrderName = '加入时间排序'
     if (order == ORDER_BY_NAME) {
       currentOrderName = '姓名排序'
@@ -677,13 +678,13 @@ class studentsList extends Component{
 
 
 
-    return(
+    return (
       <React.Fragment>
-        {/* <AddTeacherModal ref="addTeacherModal" 
+        {/* <AddTeacherModal ref="addTeacherModal"
           {...this.props}
           moduleName="教师"
         ></AddTeacherModal>
-        <AddStudentModal ref="addStudentModal" 
+        <AddStudentModal ref="addStudentModal"
           {...this.props}
           moduleName="学生"
         ></AddStudentModal> */}
@@ -694,33 +695,33 @@ class studentsList extends Component{
           {...this.props} onOk={this.showChangeAdminModal}
           changeAdminSuccess={this.changeAdminSuccess}
         ></AddAdminModal>
-        
+
         <Titlesearchsection
           title={<React.Fragment>
             <span>教师列表</span>
-            {!isSuperAdmin && coursesId == '1309' && <span style={{color: '#848484', fontSize: '14px', marginLeft: '10px'}}>(示例课堂，部分成员不可见)</span>}
+            {!isSuperAdmin && coursesId == '1309' && <span style={{ color: '#848484', fontSize: '14px', marginLeft: '10px' }}>(示例课堂，部分成员不可见)</span>}
           </React.Fragment>}
-          searchValue={ searchValue }
+          searchValue={searchValue}
           onInputSearchChange={this.onInputSearchChange}
           showSearchInput={total_count >= 10}
-          searchPlaceholder={ '请输入姓名进行搜索' }
+          searchPlaceholder={'请输入姓名进行搜索'}
           firstRowRight={
             <React.Fragment>
               {/* { isAdmin && <WordsBtn style="blue" className="mr30" onClick={()=>this.addTeacher()}>添加教师</WordsBtn> }
               { isAdmin && <WordsBtn style="blue" className="mr30" onClick={()=>this.addStudent()}>添加学生</WordsBtn> } */}
-              
-              { isAdminOrCreator && <WordsBtn style="blue" className="fr" onClick={()=>this.showChangeAdminModal()}>更换管理员</WordsBtn>}
-            
+
+              {isAdminOrCreator && <WordsBtn style="blue" className="fr" onClick={() => this.showChangeAdminModal()}>更换管理员</WordsBtn>}
+
             </React.Fragment>
           }
           secondRowLeft={
             isAdminOrTeacher ? <div className="fl mt6 task_menu_ul " style={{ width: '600px' }}>
-                <Menu mode="horizontal" selectedKeys={[`${this.state.filterKey}`]} onClick={this.selectedStatus}>
-                  <Menu.Item key="1">已审批({total_count})</Menu.Item>
-                  <Menu.Item key="2">待审批({apply_size})</Menu.Item>
-                </Menu>
-                {/*  */}
-              </div> :
+              <Menu mode="horizontal" selectedKeys={[`${this.state.filterKey}`]} onClick={this.selectedStatus}>
+                <Menu.Item key="1">已审批({total_count})</Menu.Item>
+                <Menu.Item key="2">待审批({apply_size})</Menu.Item>
+              </Menu>
+              {/*  */}
+            </div> :
               (!!total_count ? <ColorCountText count={total_count} name="个教师"></ColorCountText> : '')
           }
           onPressEnter={this.onPressEnter}
@@ -761,47 +762,47 @@ class studentsList extends Component{
         `}</style>
         <div className="mt20 edu-back-white padding20 teacherList">
 
-          { course_groups && !!course_groups.length && <CourseGroupChooserModal
-						{...this.state}
-						{...this.props}
-            props={{match: this.props.match, showNotification: this.props.showNotification}}
+          {course_groups && !!course_groups.length && <CourseGroupChooserModal
+            {...this.state}
+            {...this.props}
+            props={{ match: this.props.match, showNotification: this.props.showNotification }}
             record={this.state.clickRecord}
-            fetchAll={(e)=>this.fetchAll(e,this.state.filterKey)}
+            fetchAll={(e) => this.fetchAll(e, this.state.filterKey)}
             course_groups={course_groups}
             visible={this.state.groupChooserModalVisible}
             setVisible={this.setGroupChooserModalVisible}
-          ></CourseGroupChooserModal> }
-          {filterKey == '1' && <div className="clearfix stu_head" style={{paddingLeft: '15px'}}>
-            { isAdminOrTeacher && hasGraduationModule && <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue} >已选 {checkBoxValues.length} 个</Checkbox> }
-            { filterKey == '1' && <div className="studentList_operation_ul">
-              { hasGraduationModule && isAdminOrTeacher && <li className="li_line drop_down">
+          ></CourseGroupChooserModal>}
+          {filterKey == '1' && <div className="clearfix stu_head" style={{ paddingLeft: '15px' }}>
+            {isAdminOrTeacher && hasGraduationModule && <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue} >已选 {checkBoxValues.length} 个</Checkbox>}
+            {filterKey == '1' && <div className="studentList_operation_ul">
+              {hasGraduationModule && isAdminOrTeacher && <li className="li_line drop_down">
                 加入答辩组<i className="iconfont icon-xiajiantou font-12 ml2"></i>
-                <ul className="drop_down_menu" style={{"right":"0px","left":"unset", minWidth: '222px'}}>
-                
+                <ul className="drop_down_menu" style={{ "right": "0px", "left": "unset", minWidth: '222px' }}>
+
                   {
-                    groupList && groupList.graduation_groups_count>10?
-                    (<p className="drop_down_search">
-                      <Input placeholder="搜索" value={this.state.graduationGroupSearchValue} onChange={(e) => {this.setState({graduationGroupSearchValue: e.target.value})}} allowClear/>
-                    </p>):
-                    (groupList && groupList.graduation_groups_count==0 && <p style={{textAlign: 'left', margin: '0px 20px'}}>暂无数据</p>)
+                    groupList && groupList.graduation_groups_count > 10 ?
+                      (<p className="drop_down_search">
+                        <Input placeholder="搜索" value={this.state.graduationGroupSearchValue} onChange={(e) => { this.setState({ graduationGroupSearchValue: e.target.value }) }} allowClear />
+                      </p>) :
+                      (groupList && groupList.graduation_groups_count == 0 && <p style={{ textAlign: 'left', margin: '0px 20px' }}>暂无数据</p>)
                   }
                   {
-                    groupList && groupList.graduation_group_list && groupList.graduation_group_list.filter((item)=> {
+                    groupList && groupList.graduation_group_list && groupList.graduation_group_list.filter((item) => {
                       return (!this.state.graduationGroupSearchValue || item.name.indexOf(this.state.graduationGroupSearchValue) != -1)
-                    }).map((item,key)=>{
-                      return(
-                          <li key={key} value={item.id} onClick={() => this.joinGraduationGroup(item.id)}>{item.name}</li>
+                    }).map((item, key) => {
+                      return (
+                        <li key={key} value={item.id} onClick={() => this.joinGraduationGroup(item.id)}>{item.name}</li>
                       )
                     })
                   }
-                  { groupList && groupList.graduation_groups_count > 0 && <Divider className="dividerStyle"></Divider> }
+                  {groupList && groupList.graduation_groups_count > 0 && <Divider className="dividerStyle"></Divider>}
                   <p className="drop_down_btn">
-                    <a href="javascript:void(0)" className="color-grey-6"
-                        onClick={() => this.refs['addGraduationGroupModal'].setVisible(true)}
+                    <a className="color-grey-6"
+                      onClick={() => this.refs['addGraduationGroupModal'].setVisible(true)}
                     >添加答辩组...</a>
                   </p>
                 </ul>
-                </li> }
+              </li>}
               {/* <li className="drop_down">
                 {currentOrderName} <i className="iconfont icon-xiajiantou font-12 ml2"></i>
                 <ul className="drop_down_normal">
@@ -810,26 +811,26 @@ class studentsList extends Component{
                   {this.hasGraduationModule() && <li onClick={() => this.onSortTypeChange(ORDER_BY_GRADUATION_GROUP)} >答辩组排序</li>}
                 </ul>
               </li> */}
-            </div> }
+            </div>}
           </div>}
           <Spin size="large" spinning={this.state.isSpin}>
-          <div className="clearfix stu_table teacher_table">
-            {combineArray.length ? 
-            <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>          
-            {/* pagination={{ current: page, total: total_count, pageSize:20, onChange: this.onPageChange }} */}
-              <Table columns={columns} dataSource={combineArray} 
-                onChange={this.onTableChange}
-                pagination={total_count > 20 && filterKey == '1' ? {  //分页
-                  total: page == 1 && this.state.application_list.length ? total_count + total_count / Math.floor(this.state.application_list.length + 20) : total_count , //数据总数量
-                  pageSize: page == 1 && this.state.application_list.length ? this.state.application_list.length + 20 : 20,  //显示几条一页
-                  current: page,
-                  // onChange: this.onPageChange
-                } : false}
-              ></Table>
-            </Checkbox.Group>
-            :
-            <NoneData></NoneData>}
-          </div>
+            <div className="clearfix stu_table teacher_table">
+              {combineArray.length ?
+                <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
+                  {/* pagination={{ current: page, total: total_count, pageSize:20, onChange: this.onPageChange }} */}
+                  <Table columns={columns} dataSource={combineArray}
+                    onChange={this.onTableChange}
+                    pagination={total_count > 20 && filterKey == '1' ? {  //分页
+                      total: page == 1 && this.state.application_list.length ? total_count + total_count / Math.floor(this.state.application_list.length + 20) : total_count, //数据总数量
+                      pageSize: page == 1 && this.state.application_list.length ? this.state.application_list.length + 20 : 20,  //显示几条一页
+                      current: page,
+                      // onChange: this.onPageChange
+                    } : false}
+                  ></Table>
+                </Checkbox.Group>
+                :
+                <NoneData></NoneData>}
+            </div>
           </Spin>
         </div>
       </React.Fragment>
diff --git a/src/modules/courses/new/CoursesNew.js b/src/modules/courses/new/CoursesNew.js
index 79ae7501..0019383c 100644
--- a/src/modules/courses/new/CoursesNew.js
+++ b/src/modules/courses/new/CoursesNew.js
@@ -73,8 +73,8 @@ class CoursesNew extends Component {
                         period: data.class_period===undefined?'':data.class_period===null?'':data.class_period===null?'':data.class_period==="null"?'':data.class_period+"",
                         credit: data.credit===undefined?'':data.credit===null?'':data.credit===null?'':data.credit==="null"?'':data.credit+"",
                         checkboxgroup: data.course_module_types,
-                        Realnamecertification: data.authentication,
-                        Professionalcertification:data.professional_certification,
+                        // Realnamecertification: data.authentication,
+                        // Professionalcertification:data.professional_certification,
                         endtime: data.end_date === undefined ? "" : moment(data.end_date, dateFormat),
                         school:data.school
 
@@ -84,8 +84,8 @@ class CoursesNew extends Component {
                         datatime: data.end_date,
 											  dataname:data.name,
                         is_public: data.is_public === 1 ? true : false,
-                        Realnamecertification: data.authentication,
-                        Professionalcertification:data.professional_certification,
+                        // Realnamecertification: data.authentication,
+                        // Professionalcertification:data.professional_certification,
                         addonAfteronelenone: data.class_period===undefined?'':data.class_period===null?'':data.class_period===null?'':data.class_period==="null"?'':data.class_period,
                         addonAfteronelentwo:data.credit===undefined?'':data.credit===null?'':data.credit===null?'':data.credit==="null"?'':data.credit,
 
@@ -237,16 +237,16 @@ class CoursesNew extends Component {
                             end_date: datatime===undefined?"":datatime,
                             is_public: is_public === true || is_public === 1 ? 1 : 0,
                             course_module_types: values.checkboxgroup,
-                            authentication: this.state.Realnamecertification,
-                            professional_certification: this.state.Professionalcertification,
+                            // authentication: this.state.Realnamecertification,
+                            // professional_certification: this.state.Professionalcertification,
                             school:values.school
                         }
                     ).then((response) => {
-                            // debugger
+                            
                         if (response.data.status === 0) {
 													// this.goback()
-
-												  	window.location.href=first_category_url;
+                            this.props.history.push(first_category_url)
+                            // window.location.href=first_category_url;
                             if(this.state.boolxinjian===true) {
                                 var yslGuideone = window.localStorage.getItem('yslGuideone');
                                 try {
@@ -297,7 +297,7 @@ class CoursesNew extends Component {
 
                 }
                 if (!err) {
-                    // debugger
+                    
                     //新建
                     // console.log('Received values of form: ', values);
 									this.setState({
@@ -313,15 +313,16 @@ class CoursesNew extends Component {
                             end_date: datatime===undefined?"":datatime,
                             is_public: is_public === true || is_public === 1 ? 1 : 0,
                             course_module_types: values.checkboxgroup,
-                            authentication: this.state.Realnamecertification,
-                            professional_certification: this.state.Professionalcertification,
+                            // authentication: this.state.Realnamecertification,
+                            // professional_certification: this.state.Professionalcertification,
                             school:values.school
                         }
                     ).then((response) => {
                         if (response.status === 200) {
-													// this.goback
-
-													window.location.href=response.data.first_category_url;
+                                                    // this.goback
+                            //console.log(response.data.first_category_url)
+                            //this.props.history.push(response.data.first_category_url);
+								window.location.href=response.data.first_category_url;
 													if(this.state.boolxinjian===true){
                               var yslGuideone = window.localStorage.getItem('yslGuideone');
                               try {
@@ -363,7 +364,7 @@ class CoursesNew extends Component {
     goback = (id) => {
 
        // if(this.props.match.params.coursesId===undefined){
-				//  this.props.history.push("/courses");
+				//  this.props.history.push("/classrooms");
 			 // }else{
 				//  this.props.history.push(this.props.current_user.first_category_url);
 			 // }
@@ -642,7 +643,16 @@ class CoursesNew extends Component {
 											.color-green-light {
 													color: #45E660!important;
 											}
-											.line15{line-height: 15px;}
+                                            .line15{line-height: 15px;}
+                                            
+                                            .newcoursestitleysl,.newcoursestitle{
+                                                display:flex;
+                                                flex-direction: column;
+                                                height:40px;
+                                             }
+                                             .ant-progress-text{
+                                                 margin-top:3px
+                                             }
 											`
 										}
 									</style>
@@ -681,16 +691,16 @@ class CoursesNew extends Component {
                         <div className={"educontent mb20"}>
                             {/*<Breadcrumb className="mt10" separator=">">*/}
                             {/*    <Breadcrumb.Item>*/}
-                            {/*        <a href="/courses">翻转课堂</a>*/}
+                            {/*        <a href="/classrooms">翻转课堂</a>*/}
                             {/*    </Breadcrumb.Item>*/}
                             {/*    <Breadcrumb.Item>{this.props.match.params.coursesId === undefined ?"新建课堂":"编辑课堂"}</Breadcrumb.Item>*/}
                             {/*</Breadcrumb>*/}
 
                             <p className="clearfix mb20 mt10">
                                 <a className="btn colorgrey fl hovercolorblue "
-																	 href={this.props.match.params.coursesId === undefined ?"/courses":this.props.current_user&&this.props.current_user.first_category_url}
+																	 href={this.props.match.params.coursesId === undefined ?"/classrooms":this.props.current_user&&this.props.current_user.first_category_url}
 																>
-																	{this.props.match.params.coursesId === undefined ?"翻转课堂":dataname}
+																	{this.props.match.params.coursesId === undefined ?"教学课堂":dataname}
                                 </a>
                                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                                 <span className="fl cdefault">{this.props.match.params.coursesId === undefined ?"新建课堂":"编辑课堂"}</span>
@@ -823,7 +833,7 @@ class CoursesNew extends Component {
 																		 }
 																		 .yslzxueshiskmcs .ant-input-group-wrapper{
 																		   width: 704px !important;
-																		 }
+                                                                         }
 																		`
                                     }</style>
                                     <Form.Item label="课堂名称" className="yslzxueshiskmcs">
@@ -933,7 +943,7 @@ class CoursesNew extends Component {
                                     >
                                         {getFieldDecorator("checkboxgroup", {
                                             initialValue: [
-                                                "shixun_homework", "common_homework", "group_homework", "exercise", "attachment", "course_group","video"
+                                                "shixun_homework", "common_homework", "group_homework", "exercise", "attachment", "course_group","video","attendance"
                                             ],
                                         })(
                                             <Checkbox.Group style={{ marginTop: "10px"}}>
@@ -949,11 +959,12 @@ class CoursesNew extends Component {
                                             <Checkbox value={"board"} className="fl">讨论</Checkbox>
                                             <Checkbox value={"course_group"} className="fl">分班</Checkbox>
 																						<Checkbox value={"statistics"} className="fl">统计</Checkbox>
+                                            <Checkbox value={"attendance"} className="fl">签到</Checkbox>
                                             </Checkbox.Group>
                                         )}
                                     </Form.Item>
                                 </div>
-                                <div className="stud-class-set bor-bottom-greyE padding10200 coursenavbox  height100px" >
+                                {/* <div className="stud-class-set bor-bottom-greyE padding10200 coursenavbox  height100px" >
                                     <span  className={"fl"}>
                                     <Form.Item
                                         label="加入课堂条件"
@@ -978,7 +989,7 @@ class CoursesNew extends Component {
                                         )}
                                     </Form.Item>
                                    </span>
-                                </div>
+                                </div> */}
                                 <div className="stud-class-set padding10200 coursenavbox bor-bottom-greyE">
                                     <Form.Item
                                         label="公开设置"
diff --git a/src/modules/courses/new/Goldsubject.js b/src/modules/courses/new/Goldsubject.js
index 006f3f44..e250ebb6 100644
--- a/src/modules/courses/new/Goldsubject.js
+++ b/src/modules/courses/new/Goldsubject.js
@@ -359,7 +359,7 @@ class Goldsubject extends Component {
 					axios.put(url,
 						datasysl
 					).then((response) => {
-						// debugger
+						
 						if (response.data.status === 0) {
 							// this.goback()
 
@@ -420,7 +420,7 @@ class Goldsubject extends Component {
 				//
 				// }
 				if (!err) {
-					// debugger
+					
 					//新建
 					// console.log('Received values of form: ', values);
 				  let subjectid = this.props.match.params.subjectid;
@@ -488,7 +488,7 @@ class Goldsubject extends Component {
 			window.location.href=`/paths/${subjectids}`
 		}else{
 			// this.props.history.goBack();
-			window.location.href=`/courses/${this.props.match.params.coursesId}/informs`
+			window.location.href=`/classrooms/${this.props.match.params.coursesId}/informs`
 		}
 	}
 
@@ -720,8 +720,8 @@ class Goldsubject extends Component {
 							{/*	<Breadcrumb.Item>{Whethertocreateanewclassroom===true?"新建课堂":"编辑课堂"}</Breadcrumb.Item>*/}
 							{/*</Breadcrumb>*/}
 							<p className="clearfix mb20 mt10">
-								<a className="btn colorgrey fl hovercolorblue " href={Whethertocreateanewclassroom===true?"/courses":this.props.current_user&&this.props.current_user.first_category_url}
-								>{Whethertocreateanewclassroom===true?"翻转课堂":name}</a>
+								<a className="btn colorgrey fl hovercolorblue " href={Whethertocreateanewclassroom===true?"/classrooms":this.props.current_user&&this.props.current_user.first_category_url}
+								>{Whethertocreateanewclassroom===true?"教学课堂":name}</a>
 								<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 								<span className="fl cdefault">{Whethertocreateanewclassroom===true?"新建课堂":"编辑课堂"}</span>
 							</p>
@@ -989,7 +989,7 @@ class Goldsubject extends Component {
 
 										{getFieldDecorator("checkboxgroup", {
 											initialValue: [
-												"announcement","online_learning","shixun_homework","common_homework",
+												"announcement","online_learning","shixun_homework","common_homework","attendance"
 											],
 										})(
 											<Checkbox.Group style={{ marginTop: "10px"}}>
@@ -1003,6 +1003,7 @@ class Goldsubject extends Component {
 												<Checkbox value={"board"} className="fl">讨论</Checkbox>
 												<Checkbox value={"course_group"} className="fl">分班</Checkbox>
 												<Checkbox value={"statistics"} className="fl">统计</Checkbox>
+												<Checkbox value={"attendance"} className="fl">签到</Checkbox>
 											</Checkbox.Group>
 										)}
 									</Form.Item>
diff --git a/src/modules/courses/ordering/Ordering.js b/src/modules/courses/ordering/Ordering.js
index dfcbdcb6..64b11cac 100644
--- a/src/modules/courses/ordering/Ordering.js
+++ b/src/modules/courses/ordering/Ordering.js
@@ -167,7 +167,7 @@ class Ordering extends Component{
 	}
 
 	goback=()=>{
-		 window.location.href=`/courses/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.main_id}`
+		 window.location.href=`/classrooms/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.main_id}`
 	}
 
 
@@ -181,8 +181,7 @@ class Ordering extends Component{
 		let main_id=this.props.match.params.main_id;
 		let category_id=this.props.match.params.category_id;
 
-		console.log(this.props)
-		console.log(window)
+
 
 		let positiontype=null;
 
@@ -212,7 +211,7 @@ class Ordering extends Component{
 
 								<Breadcrumb separator=">">
 									<Breadcrumb.Item href={this.props.current_user&&this.props.current_user.first_category_url}>{this.props.current_user&&this.props.current_user.course_name}</Breadcrumb.Item>
-									<Breadcrumb.Item href={`/courses/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.main_id}`}>实训作业</Breadcrumb.Item>
+									<Breadcrumb.Item href={`/classrooms/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.main_id}`}>实训作业</Breadcrumb.Item>
 									<Breadcrumb.Item>调整排序</Breadcrumb.Item>
 								</Breadcrumb>
 
@@ -260,7 +259,7 @@ class Ordering extends Component{
 																	<div className={"item-body"}>
 																		<div className={"clearfix ds pr orderSection"}>
 																			<p title={item.task_name} className="font-16  color-dark maxwidth865s orderfonttop"
-																				 href={`/courses/${this.props.match.params.coursesId}/shixun_homeworks/${item.task_id}/list?tab=0`}>{item.task_name}</p>
+																				 href={`/classrooms/${this.props.match.params.coursesId}/shixun_homeworks/${item.task_id}/list?tab=0`}>{item.task_name}</p>
 																			<p className={"color-grey panel-lightgrey mt16  "}>
 																			<span className="topicswidth400">
 																				<span className="topsics100 color-grey9 orderfontbom mr20 maxwidth795">{item.user_name}</span>
diff --git a/src/modules/courses/poll/Poll.js b/src/modules/courses/poll/Poll.js
index dd0166e2..dad328c9 100644
--- a/src/modules/courses/poll/Poll.js
+++ b/src/modules/courses/poll/Poll.js
@@ -39,8 +39,8 @@ class Poll extends Component{
       addnametab:undefined,
       addcanner:undefined,
       addsave:undefined,
-      course_groups:[],   
-      chooseId:undefined,   
+      course_groups:[],
+      chooseId:undefined,
       // 列表相关
       checkBoxValues:[],
       checkAllValue:false,
@@ -150,21 +150,31 @@ class Poll extends Component{
 	}
   //切换分页
   changePage=(pageNumber)=>{
+    let{type,StudentList_value,checkAllValue}=this.state;
+
+    if(checkAllValue===true){
+      this.setState({
+        page:pageNumber,
+        checkBoxValues:[],
+        checkAllValue:false
+      })
+    }else{
+      this.setState({
+        page:pageNumber,
+        checkBoxValues:[]
+      })
+    }
 
-    this.setState({
-      page:pageNumber,
-			checkBoxValues:[]
-    })
-    let{type,StudentList_value}=this.state
     this.InitList(type,StudentList_value,pageNumber);
   }
   // 搜索
-  searchInfo=()=>{
+  searchInfo=(value)=>{
     this.setState({
-      page:1
+      page:1,
+      StudentList_value:value
     })
-    let{type,StudentList_value}=this.state;
-    this.InitList(type,StudentList_value,1)
+    let{type}=this.state;
+    this.InitList(type,value,1)
   }
   // checkbox
   onItemClick = (item) => {
@@ -196,7 +206,7 @@ class Poll extends Component{
         checkBoxValues: _.difference(this.state.checkBoxValues, values)
       })
     }
-  } 
+  }
 
   onCheckBoxChange = (checkedValues) => {
     this.setState({
@@ -321,13 +331,13 @@ class Poll extends Component{
   }
   // 题库选用成功后,立即发布，刷新页面
   useBankSuccess=(checkValue,value)=>{
-    debugger;
+    ;
     this.setState({
       isSpin:true
     })
     let{type,StudentList_value,page}=this.state
     this.InitList(type,StudentList_value,page,value);
-    
+
     let coursesId=this.props.match.params.coursesId;
     let url=`/courses/${coursesId}/polls/publish_modal.json`;
     axios.get(url,{
@@ -509,10 +519,10 @@ class Poll extends Component{
           <p className="clearfix padding30 bor-bottom-greyE">
             <span className="font-18 fl color-dark-21">{polls_counts&&polls_counts.left_banner_name}</span>
             {
-              isAdmin && 
+              isAdmin &&
               <li className="fr">
                 <p className="fl"><UseBank {...this.props} {...this.state} object_type={"poll"} useBankSuccess={this.useBankSuccess}></UseBank></p>
-                <WordsBtn style="blue" className="font-16" to={`/courses/${coursesId}/polls/${Id}/${"new"}`}>新建</WordsBtn>
+                <WordsBtn style="blue" className="font-16" to={`/classrooms/${coursesId}/polls/${Id}/${"new"}`}>新建</WordsBtn>
               </li>
             }
           </p>
@@ -543,15 +553,15 @@ class Poll extends Component{
         </div>
         <Spin size="large" spinning={this.state.isSpin}>
         {
-          pollsList && pollsList.length > 0 && isAdmin && 
+          pollsList && pollsList.length > 0 && isAdmin &&
           <div className="mt20 edu-back-white padding20-30">
             <div className="clearfix">
               <Checkbox className="fl" onChange={this.onCheckAll}  checked={checkAllValue}>已选 {checkBoxValues.length} 个  （不支持跨页勾选）</Checkbox>
               <div className="studentList_operation_ul">
                 <li className="li_line"><a className="color-grey-9" onClick={()=>this.ActionPoll("delete")}>删除</a></li>
                 <li className="li_line">
-                  <ImmediatelyPublish 
-                    {...this.props} 
+                  <ImmediatelyPublish
+                    {...this.props}
                     {...this.state}
                     style="grey"
                     checkBoxValues={this.state.checkBoxValues}
@@ -560,7 +570,7 @@ class Poll extends Component{
                 </li>
                 <li className="li_line">
                   <ImmediatelyEnd
-                    {...this.props} 
+                    {...this.props}
                     {...this.state}
                     style="grey"
 										single={true}
@@ -585,9 +595,9 @@ class Poll extends Component{
               {
                 pollsList && pollsList.map((item,key)=>{
                   return(
-                    <PollListItem 
-                      {...this.props} 
-                      {...this.state} 
+                    <PollListItem
+                      {...this.props}
+                      {...this.state}
                       courseType={course_types}
                       item={item}
                       index={key}
@@ -605,17 +615,17 @@ class Poll extends Component{
             pollsList && pollsList.length==0 && <NoneData></NoneData>
           }
         {
-          course_types && polls_counts.polls_all_counts > pageSize ? 
+          course_types && polls_counts.polls_all_counts > pageSize ?
           <div className="mt30 edu-txt-center pb30">
             <Pagination showQuickJumper current={page} total={polls_counts && polls_counts.polls_all_counts} pageSize={pageSize} onChange={this.changePage}></Pagination>
           </div>
           :
           ""
         }
-        
+
 
       </React.Fragment>
     )
   }
 }
-export default Poll;
\ No newline at end of file
+export default Poll;
diff --git a/src/modules/courses/poll/PollDetailIndex.js b/src/modules/courses/poll/PollDetailIndex.js
index 9bacbd10..aee6ee12 100644
--- a/src/modules/courses/poll/PollDetailIndex.js
+++ b/src/modules/courses/poll/PollDetailIndex.js
@@ -19,11 +19,13 @@ import '../css/members.css'
 import '../css/busyWork.css'
 
 import axios from 'axios'
+import Itembankstop from "../../question/component/Itembankstop";
 
 const map={1:"未发布",2:"提交中",3:"已截止",4:"已结束"}
 class PollDetailIndex extends Component{
 	constructor(props){
 		super(props);
+		this.pollssubcomRef = React.createRef();
 		this.state={
 			tab:["0"],
 			pollDetail:undefined,
@@ -33,7 +35,9 @@ class PollDetailIndex extends Component{
 			polls_status:3,
 		}
 	}
-
+	getpollssubcomRef = (Ref) => {
+		this.pollssubcomRef = Ref;
+	}
 	getPollInfo=()=>{
 		// console.log(this.props);
 		let pollId=this.props.match.params.pollId;
@@ -67,7 +71,17 @@ class PollDetailIndex extends Component{
 		}catch (e) {
 
 		}
+		this.gettables();
 	}
+
+	gettables=()=>{
+		try {
+			this.pollssubcomRef.searchInfo();
+		}catch (e) {
+
+		}
+	}
+
 	newgetPollInfo=()=>{
 		// console.log(this.props);
 		let pollId=this.props.match.params.pollId;
@@ -166,7 +180,7 @@ class PollDetailIndex extends Component{
 					<p className="clearfix mb20">
 						<WordsBtn style="grey" className="fl" to={current_user && current_user.first_category_url}>{this.props.coursedata.name}</WordsBtn>
 						<span className="color-grey-9 fl ml3 mr3">&gt;</span>
-						<WordsBtn style="grey" className="fl" to={`/courses/${this.props.match.params.coursesId}/polls/${user_permission && user_permission.left_banner_id}`}>问卷</WordsBtn>
+						<WordsBtn style="grey" className="fl" to={`/classrooms/${this.props.match.params.coursesId}/polls/${user_permission && user_permission.left_banner_id}`}>问卷</WordsBtn>
 						<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 						<span>问卷详情</span>
 					</p>
@@ -175,7 +189,7 @@ class PollDetailIndex extends Component{
 						<span className="mt3 fl" style={{height:"25px"}}>
               <CoursesListType typelist={[`${map[pollDetail && pollDetail.polls_status]}`]} typesylename={""} />
             </span>
-						<WordsBtn className="fr font-16 mt2" style="grey" to={`/courses/${this.props.match.params.coursesId}/polls/${user_permission && user_permission.left_banner_id}`}>返回</WordsBtn>
+						<WordsBtn className="fr font-16 mt2" style="grey" to={`/classrooms/${this.props.match.params.coursesId}/polls/${user_permission && user_permission.left_banner_id}`}>返回</WordsBtn>
 					</p>
 					<div>
 						<div className="clearfix edu-back-white pl30 pr30 bor-bottom-greyE">
@@ -192,7 +206,7 @@ class PollDetailIndex extends Component{
 							{
 								isAdmin &&
 								<span className="fr mt22">
-                  <WordsBtn style="blue" to={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollId}/edit`} className="fl mr20 font-16">编辑问卷</WordsBtn>
+                  <WordsBtn style="blue" to={`/classrooms/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollId}/edit`} className="fl mr20 font-16">编辑问卷</WordsBtn>
 									{/* 立即发布 */}
 									{
 										user_permission && user_permission.poll_unpublish_count > 0 ?
@@ -247,7 +261,7 @@ class PollDetailIndex extends Component{
 								<span className="fr mt22 font-16">
                   {
 										user_permission && user_permission.current_status!=3 ?
-											<WordsBtn style="blue" to={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollId}/users/${this.props.current_user.login}`}>
+											<WordsBtn style="blue" to={`/classrooms/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollId}/users/${this.props.current_user.login}`}>
 												{ user_permission && user_permission.current_status ==0 ? "继续答题" :
 													user_permission.current_status == 1 ?
 													(polls_status===1?"":"查看答题")
@@ -263,7 +277,11 @@ class PollDetailIndex extends Component{
 
 						{
 							// 答题列表
-							parseInt(tab[0])==0 && <PollTabFirst {...this.props} {...this.state}></PollTabFirst>
+							parseInt(tab[0])==0 && <PollTabFirst
+								{...this.props}
+								{...this.state}
+								getpollssubcomRef={(ref) => this.getpollssubcomRef(ref)}
+							></PollTabFirst>
 						}
 						{
 							// 统计结果
diff --git a/src/modules/courses/poll/PollDetailTabFirst.js b/src/modules/courses/poll/PollDetailTabFirst.js
index 05238206..4f625b85 100644
--- a/src/modules/courses/poll/PollDetailTabFirst.js
+++ b/src/modules/courses/poll/PollDetailTabFirst.js
@@ -60,8 +60,11 @@ class PollDetailTabFirst extends Component{
     })
   }
   searchInfo=()=>{
-		let {order, search, commit_status, poll_group_id, page, order_type} = this.state
-		this.getTableList(order, search, commit_status, poll_group_id, page, order_type);
+		let {order, search, commit_status, poll_group_id, page, order_type} = this.state;
+		this.setState({
+      page:1
+    })
+		this.getTableList(order, search, commit_status, poll_group_id, 1, order_type);
   }
 
   // 获取接口数据
@@ -132,6 +135,11 @@ class PollDetailTabFirst extends Component{
   componentDidMount(){
 		let {order, search, commit_status, poll_group_id, page, order_type} = this.state;
 		this.getTableList(order, search, commit_status, poll_group_id, page, order_type);
+		try {
+			this.props.getpollssubcomRef(this);
+		} catch (e) {
+
+		}
   }
 
   // 翻页
@@ -309,7 +317,7 @@ class PollDetailTabFirst extends Component{
       width:120,
       render:(operation,item,index)=>{
         return(
-          item.status == 1 ? <WordsBtn style="blue" targets={"_blank"} to={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollId}/users/${item.login}`}>查看</WordsBtn>:<span className="color-grey-9">--</span>
+          item.status == 1 ? <WordsBtn style="blue" targets={"_blank"} to={`/classrooms/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollId}/users/${item.login}`}>查看</WordsBtn>:<span className="color-grey-9">--</span>
         )
       }
     }];
diff --git a/src/modules/courses/poll/PollDetailTabForthRules.js b/src/modules/courses/poll/PollDetailTabForthRules.js
index 707c757f..1ff18181 100644
--- a/src/modules/courses/poll/PollDetailTabForthRules.js
+++ b/src/modules/courses/poll/PollDetailTabForthRules.js
@@ -121,7 +121,7 @@ class PollDetailTabForthRules extends Component{
   }
   //修改发布规则里面的发布时间
   changeRulePublishTime=(e,date,index)=>{
-  	// debugger
+  	
     let arr=Object.assign({}, this.state.rules[parseInt(index)]);
     arr.publish_time=date=== ""?"":moment(handleDateString(date)).format("YYYY-MM-DD HH:mm");
     if(!arr.end_time){
@@ -353,7 +353,7 @@ class PollDetailTabForthRules extends Component{
   render(){
     let {rules,course_group,flagPageEdit}=this.state
 		let isAdmin=this.props.isAdmin();
-    console.log(flagPageEdit)
+    // console.log(flagPageEdit)
     return(
       <div className="bor-top-greyE pt20">
         <p className="clearfix mb10">
diff --git a/src/modules/courses/poll/PollInfo.js b/src/modules/courses/poll/PollInfo.js
index 28cb4b02..01fb449b 100644
--- a/src/modules/courses/poll/PollInfo.js
+++ b/src/modules/courses/poll/PollInfo.js
@@ -40,15 +40,15 @@ class PollInfo extends Component{
     }
   }
 
-  
+
   componentDidMount(){
     if(this.props.current_user){
       this.getInfo();
     }
 
-    //window.addEventListener('scroll', this.handleScroll);	
+    //window.addEventListener('scroll', this.handleScroll);
   }
-  
+
   // 滚动定位
   handleScroll=()=>{
     if(parseInt(window.scrollY)>230){
@@ -113,11 +113,11 @@ class PollInfo extends Component{
     let txt=Object.assign({}, this.state.inputArray[parseInt(arr[1])]);
     let ids=item.target.value;
     let list=txt.answersList.filter(element => element.answer_id == ids);
-    
+
     this.postAnswer(arr[0],ids,list[0].answer_text=="其他"?txt.text:"",arr[1]);
   }
 
-  //选中选择题(多选题)选项保存 
+  //选中选择题(多选题)选项保存
   ChangeOptionMuntil=(a_id,q_id,key)=>{
     let ind=Object.assign({}, this.state.inputArray[parseInt(key)]);
     let count=0;
@@ -193,7 +193,7 @@ class PollInfo extends Component{
   //提交主观题
   commitText=(key,q_id)=>{
     const text = Object.assign({}, this.state.inputArray[key]).text;
-    
+
     let url='/poll_questions/'+q_id+'/poll_votes.json?';
 
     const ans=Object.assign({}, this.state.question_answered[key]);
@@ -221,7 +221,7 @@ class PollInfo extends Component{
         console.log(error);
       })
     }
-    
+
   }
 
   // 提交
@@ -259,7 +259,7 @@ class PollInfo extends Component{
     }
   }
 
-  
+
   cancelSubmit=()=>{
     this.setState({
       modalsType:false,
@@ -268,7 +268,7 @@ class PollInfo extends Component{
     })
   }
 
-  
+
   sureSubmit=()=>{
     let pollId=this.props.match.params.pollId;
     let url=`/polls/${pollId}/commit_poll.json`
@@ -280,7 +280,7 @@ class PollInfo extends Component{
           modalsTopval:"",
           modalsBottomval:""
         })
-        window.location.href=`/courses/${this.props.match.params.coursesId}/polls/${pollId}/detail`
+        window.location.href=`/classrooms/${this.props.match.params.coursesId}/polls/${pollId}/detail`
       }
     }).catch((error)=>{
       console.log(error);
@@ -317,18 +317,18 @@ class PollInfo extends Component{
           <p className="clearfix mb20">
             <WordsBtn style="grey" className="fl" to={current_user && current_user.first_category_url}>{courseName}</WordsBtn>
             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-            <WordsBtn style="grey" className="fl" to={`/courses/${this.props.match.params.coursesId}/polls/${poll && poll.left_banner_id}`}>问卷</WordsBtn>
+            <WordsBtn style="grey" className="fl" to={`/classrooms/${this.props.match.params.coursesId}/polls/${poll && poll.left_banner_id}`}>问卷</WordsBtn>
             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
-            <WordsBtn style="grey" to={`/courses/${coursesId}/polls/${this.props.match.params.pollId}/detail`} className="fl mr3">问卷详情</WordsBtn>&gt; 
+            <WordsBtn style="grey" to={`/classrooms/${coursesId}/polls/${this.props.match.params.pollId}/detail`} className="fl mr3">问卷详情</WordsBtn>&gt;
             <span className="ml3">{question_types&&question_types.user_name}</span>
           </p>
           <p className="clearfix mb20">
             <span className="color-grey-3 font-24 fl task-hide break-word" style={{maxWidth:"900px",lineHeight:"30px"}}>{poll && poll.polls_name}</span>
             <CoursesListType typelist={[`${statudmap[poll && poll.poll_status]}`]} typesylename={""} />
             {
-              isAdmin || (poll && poll.user_poll_status == 1) ? <WordsBtn className="fr font-16 mt5" style="grey" to={`/courses/${coursesId}/polls/${this.props.match.params.pollId}/detail`}>返回</WordsBtn> :''
+              isAdmin || (poll && poll.user_poll_status == 1) ? <WordsBtn className="fr font-16 mt5" style="grey" to={`/classrooms/${coursesId}/polls/${this.props.match.params.pollId}/detail`}>返回</WordsBtn> :''
             }
-            
+
           </p>
           {
             poll && poll.polls_description &&
@@ -353,7 +353,7 @@ class PollInfo extends Component{
                 <span className="color-grey-9">主观题{question_types &&question_types.q_mains}题</span>
               }
             </p>
-            
+
             <div className={ questionPanelFixed==true ? "questionsfixed":"questionsNo"}>
               <p className="clearfix pl20">
                 <span className="mr40 answered">已答</span>
@@ -383,7 +383,7 @@ class PollInfo extends Component{
                       <div className="pl30 pr30 mt30 mb10 clearfix">
                         <span className="color-blue fl font-16">{item.question.question_number}、{map[item.question.question_type]}</span>
                         { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10 mt5">必答</span>:<span className="mustAnswer fl ml10 mr10 mt5">选答</span> }
-                        { item.question.question_type == 2 && item.question.min_choices && item.question.max_choices ? 
+                        { item.question.question_type == 2 && item.question.min_choices && item.question.max_choices ?
                           <span className="color-grey-9 font-14 fl mt2">
                             {
                               item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :
@@ -399,7 +399,7 @@ class PollInfo extends Component{
 											}}>{item.question.question_title}</span></p>
                       {
                         //单选
-                        item.question.question_type==1 && 
+                        item.question.question_type==1 &&
                         <Radio.Group  disabled={isAdmin || (isStudent && poll && poll.user_poll_status == 1)?true:false} className="answerList" defaultValue={item.question.poll_answer_ids[0]} name={[item.question.id,key]} onChange={this.ChangeOptionSingle}>
                           {
                             item.question.answers &&  item.question.answers.map((i,k)=>{
@@ -415,11 +415,11 @@ class PollInfo extends Component{
                                         return(
                                           <React.Fragment>
                                           {
-                                            j.id == item.question.id ? 
-                                            <Input  type="text" className="otherTxt" autoComplete="off" value={j.text && j.text} name={key} 
+                                            j.id == item.question.id ?
+                                            <Input  type="text" className="otherTxt" autoComplete="off" value={j.text && j.text} name={key}
                                             onInput={this.blurTxt}
                                             onBlur={(e)=>this.saveInputAndAnswer(e,i.answer_id,item.question.id,key,item.question.question_type)}
-                                            /> 
+                                            />
                                             : ""
                                           }
                                           </React.Fragment>
@@ -437,12 +437,12 @@ class PollInfo extends Component{
                       }
                       {
                         //多选
-                        item.question.question_type==2 && 
-                        <Checkbox.Group  
-                        onChange={(value)=>this.ChangeOptionMuntil(value,item.question.id,key)} 
-                        disabled={isAdmin || (isStudent && poll && poll.user_poll_status == 1)?true:false} 
-                        defaultValue={item.question.poll_answer_ids} 
-                        className="answerList" 
+                        item.question.question_type==2 &&
+                        <Checkbox.Group
+                        onChange={(value)=>this.ChangeOptionMuntil(value,item.question.id,key)}
+                        disabled={isAdmin || (isStudent && poll && poll.user_poll_status == 1)?true:false}
+                        defaultValue={item.question.poll_answer_ids}
+                        className="answerList"
                         name={key}>
                           {
                             item.question.answers &&  item.question.answers.map((i,k)=>{
@@ -458,11 +458,11 @@ class PollInfo extends Component{
                                           return(
                                             <React.Fragment>
                                             {
-                                              j.id == item.question.id ? 
-                                              <Input  type="text" className="otherTxt" autoComplete="off" value={j.text && j.text} name={key} 
-                                              onInput={this.blurTxt} 
+                                              j.id == item.question.id ?
+                                              <Input  type="text" className="otherTxt" autoComplete="off" value={j.text && j.text} name={key}
+                                              onInput={this.blurTxt}
                                               onBlur={(e)=>this.saveInputAndAnswer(e,i.answer_id,item.question.id,key,item.question.question_type)}
-                                              /> 
+                                              />
                                               : ""
                                             }
                                             </React.Fragment>
@@ -480,14 +480,14 @@ class PollInfo extends Component{
                       }
                       {
                         //主观题
-                        item.question.question_type==3 && 
+                        item.question.question_type==3 &&
                         <div className="mt10 pl30 pr30 pb20">
                           {
                             inputArray && inputArray.map((j,k)=>{
                               return(
                                 <React.Fragment>
                                 {
-                                  j.id == item.question.id ? 
+                                  j.id == item.question.id ?
                                   <textarea placeholder="在此填入答案" disabled={isAdmin || (isStudent && poll && poll.user_poll_status == 1) ? true:false} value={j.text && j.text} className="winput-100-130" name={key} onInput={this.blurTxt} onBlur={()=>this.commitText(key,item.question.id)}></textarea>
                                   : ""
                                 }
@@ -497,7 +497,7 @@ class PollInfo extends Component{
                           }
                         </div>
                       }
-                      
+
                     </div>
                   )
                 })
@@ -505,7 +505,7 @@ class PollInfo extends Component{
             </div>
           </div>
           {
-            isStudent && poll && poll.user_poll_status == 0 ? 
+            isStudent && poll && poll.user_poll_status == 0 ?
             <div className="mt30 mb50">
               <a type="primary" className="defalutSubmitbtn" onClick={this.submitPoll}>提交</a>
             </div>
@@ -516,4 +516,4 @@ class PollInfo extends Component{
     )
   }
 }
-export default PollInfo;
\ No newline at end of file
+export default PollInfo;
diff --git a/src/modules/courses/poll/PollListItem.js b/src/modules/courses/poll/PollListItem.js
index be5e7f88..a0977452 100644
--- a/src/modules/courses/poll/PollListItem.js
+++ b/src/modules/courses/poll/PollListItem.js
@@ -37,19 +37,19 @@ class PollListItem extends Component{
   render(){
     let{item,checkBox,courseType,index}=this.props;
     let {coursesId}=this.props.match.params;
-    
+
     const IsAdmin =this.props.isAdmin();
     const isStudent = this.props.isStudent();
     const isNotMember = this.props.isNotMember();
     const isAdminOrStudent = this.props.isAdminOrStudent();
-    
+
     let t= item.end_time ? moment(item.end_time) - moment() : 0;
     let canNotLink = !isAdminOrStudent && item.lock_status == 0
     return(
 
       <div className="workList_Item polllisthover" style={{cursor : IsAdmin ? "pointer" : "default",padding:"30px" }}  onClick={() => window.$(`.pollitem${index} input`).click() }>
         {
-          IsAdmin && 
+          IsAdmin &&
           <span className={`pollitem${index} fl mr12`}>
             {checkBox}
           </span>
@@ -59,10 +59,10 @@ class PollListItem extends Component{
             { canNotLink ?
 							<span className="fl font-16 font-bd mt2 color-grey-3 task-hide pointer" style={{"maxWidth":"600px"}} title={courseType.user_permission == 0?"私有属性，非课堂成员不能访问":item.polls_name}>{item.polls_name}</span>
 								:
-                <a onClick={()=>this.toDetailPage(`/courses/${coursesId}/polls/${item.id}/detail`)} className="fl font-16 font-bd mt2 color-grey-3 task-hide pointer" style={{"maxWidth":"600px"}} title={item.polls_name}>{item.polls_name}</a>
+                <a onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/polls/${item.id}/detail`)} className="fl font-16 font-bd mt2 color-grey-3 task-hide pointer" style={{"maxWidth":"600px"}} title={item.polls_name}>{item.polls_name}</a>
             }
             {
-              item.lock_status === 0 ? 
+              item.lock_status === 0 ?
               <Tooltip title={"私有属性,非课堂成员不能访问"}  placement="bottom">
                 <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i>
               </Tooltip>
@@ -70,7 +70,7 @@ class PollListItem extends Component{
             }
             <CoursesListType typelist={[polls_status[`${item.polls_status}`]]} typesylename={""}></CoursesListType>
             {
-              isStudent && ((item.polls_status == 1 && (item.current_status ==0 ||item.current_status ==2)) || (item.polls_status==3 && item.current_status==2)) ? 
+              isStudent && ((item.polls_status == 1 && (item.current_status ==0 ||item.current_status ==2)) || (item.polls_status==3 && item.current_status==2)) ?
               <span className="edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle">未提交</span>:""
             }
           </p>
@@ -88,11 +88,11 @@ class PollListItem extends Component{
               <span className="mr20 fl mt3">创建于{moment(item.created_at).fromNow()}</span>
             }
             {
-              item.polls_status ==1 && item.publish_time !=null && 
+              item.polls_status ==1 && item.publish_time !=null &&
               <span className="mr20 fl mt3">将发布于{moment(item.publish_time).format(dataformat)}</span>
             }
             {
-              item.polls_status ==2 && item.publish_time !=null && 
+              item.polls_status ==2 && item.publish_time !=null &&
               <Tooltip title="提交剩余时间">
                 <span className="mr20 fl mt3">{"提交剩余时间："+formatDuring(t)}</span>
               </Tooltip>
@@ -100,7 +100,7 @@ class PollListItem extends Component{
 
 
             {
-              isStudent ? <WordsBtn style="blue" targets={item.current_status == 2||item.current_status == 0?undefined:'_blank'} className="fr font-16 ml20" to={`/courses/${coursesId}/polls/${item.id}/users/${this.props.current_user.login}`}>
+              isStudent ? <WordsBtn style="blue" targets={item.current_status == 2||item.current_status == 0?undefined:'_blank'} className="fr font-16 ml20" to={`/classrooms/${coursesId}/polls/${item.id}/users/${this.props.current_user.login}`}>
 
 
                 {
@@ -114,14 +114,14 @@ class PollListItem extends Component{
                 }
               </WordsBtn>:""
             }
-            { isStudent ?canNotLink ?"": <WordsBtn style="blue"  className="font-16 fr "  onClick={()=>this.toDetailPage(`/courses/${coursesId}/polls/${item.id}/detail`)} >查看详情</WordsBtn>:""}
+            { isStudent ?canNotLink ?"": <WordsBtn style="blue"  className="font-16 fr "  onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/polls/${item.id}/detail`)} >查看详情</WordsBtn>:""}
 
             {
-              IsAdmin && 
+              IsAdmin &&
               <ul className="fr">
-                { canNotLink ?"": <WordsBtn style="blue"  className="font-16" onClick={()=>this.toDetailPage(`/courses/${coursesId}/polls/${item.id}/detail`)} >查看详情</WordsBtn>}
-                <WordsBtn style="blue"  className="font-16 ml20" to={`/courses/${coursesId}/polls/${item.id}/${"edit"}`}>编辑</WordsBtn>
-                <WordsBtn style="blue" className="ml20 font-16" to={`/courses/${coursesId}/polls/${item.id}/detail?tab=3`}>设置</WordsBtn>
+                { canNotLink ?"": <WordsBtn style="blue"  className="font-16" onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/polls/${item.id}/detail`)} >查看详情</WordsBtn>}
+                <WordsBtn style="blue"  className="font-16 ml20" to={`/classrooms/${coursesId}/polls/${item.id}/${"edit"}`}>编辑</WordsBtn>
+                <WordsBtn style="blue" className="ml20 font-16" to={`/classrooms/${coursesId}/polls/${item.id}/detail?tab=3`}>设置</WordsBtn>
               </ul>
             }
           </p>
@@ -130,4 +130,4 @@ class PollListItem extends Component{
     )
   }
 }
-export default PollListItem
\ No newline at end of file
+export default PollListItem
diff --git a/src/modules/courses/poll/PollNew.js b/src/modules/courses/poll/PollNew.js
index 3b50695e..b1ea7788 100644
--- a/src/modules/courses/poll/PollNew.js
+++ b/src/modules/courses/poll/PollNew.js
@@ -362,7 +362,7 @@ class PollNew extends Component {
 					pollid: result.data.data.id,
 					Newedit: false,
 				})
-				this.props.history.push(`/courses/${this.props.match.params.coursesId}/polls/${result.data.data.id}/detail?tab=2`)
+				this.props.history.push(`/classrooms/${this.props.match.params.coursesId}/polls/${result.data.data.id}/detail?tab=2`)
 			}
 		})
 	}
@@ -2477,7 +2477,7 @@ class PollNew extends Component {
 		// console.log(max);
 		// console.log(length);
 
-		// debugger
+		
 		var minbool = false;
 		var maxbool = false;
 		let arr = this.state.adddom;
@@ -2590,7 +2590,7 @@ class PollNew extends Component {
 					if (result.data.status === 0) {
 						// console.log("更新题目成功")
 						// this.props.showNotification("保存成功");
-						this.props.history.push(`/courses/${this.props.match.params.coursesId}/polls/${pollid}/detail?tab=2`)
+						this.props.history.push(`/classrooms/${this.props.match.params.coursesId}/polls/${pollid}/detail?tab=2`)
 					}
 				} catch (e) {
 
@@ -2766,7 +2766,7 @@ class PollNew extends Component {
 		//
 		// let courseId=this.props.match.params.coursesId;
 		// if(courseId===undefined){
-		// 	this.props.history.push("/courses");
+		// 	this.props.history.push("/classrooms");
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
@@ -2833,10 +2833,10 @@ class PollNew extends Component {
 						{
 							this.props.match.params.news === "new"?
 								<a className=" btn colorgrey fl hovercolorblue"
-									 href={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollid}`}>问卷</a>
+									 href={`/classrooms/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollid}`}>问卷</a>
 								:
 								<a className=" btn colorgrey fl hovercolorblue"
-									 href={`/courses/${this.props.match.params.coursesId}/polls/${left_banner_id}`}>问卷</a>
+									 href={`/classrooms/${this.props.match.params.coursesId}/polls/${left_banner_id}`}>问卷</a>
 						}
 
 						<span className="color-grey-9 fl ml3 mr3">&gt;</span>
@@ -2847,10 +2847,10 @@ class PollNew extends Component {
 							className="fl color-black summaryname mt5">{this.props.match.params.news === undefined ? "新建问卷" : this.props.match.params.news === "new" ? "新建问卷" : "编辑问卷"}</p>
 							{
 								this.props.match.params.news === "new" ?
-									<a  href={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollid}`}
+									<a  href={`/classrooms/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollid}`}
 										className=" fr font-16"></a>
 									:
-									<a href={`/courses/${this.props.match.params.coursesId}/polls/${left_banner_id}`}
+									<a href={`/classrooms/${this.props.match.params.coursesId}/polls/${left_banner_id}`}
 										className=" fr font-16"></a>
 							}
 					</div>
@@ -3007,9 +3007,9 @@ class PollNew extends Component {
 						{/*自动生成修改好的获取到的*/}
 						{/**************************************************************************/}
 						{this.state.poll_questions === undefined ? "" : this.state.poll_questions.map((item, index) => {
-							console.log('打印this.state.poll_questions');
-							console.log(this.state.poll_questions);
-							console.log(this.state.adddom);
+							// console.log('打印this.state.poll_questions');
+							// console.log(this.state.poll_questions);
+							// console.log(this.state.adddom);
 							let resultDom;
 							resultDom = <div >
 								<p className="clearfix font-16">
@@ -3061,7 +3061,7 @@ class PollNew extends Component {
 										{item.question.answers === undefined ? "" : item.question.answers.map((items, i) => {
 											return (
 												<div className="h20 pt20" style={{"clear": "both"}}>
-													<Radio value={i} className={"fl"} style={{textAlign: "left",marginTop:"3px"}}></Radio>
+													<Radio value={i} className={"fl"} style={{textAlign: "left"}}></Radio>
 													<span className={" flex1 "} style={{textAlign: "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1116px"}} >{items.answer_text}</span>
 
 												</div>
diff --git a/src/modules/courses/poll/PollNewQuestbank.js b/src/modules/courses/poll/PollNewQuestbank.js
index ad68530e..e9f1b700 100644
--- a/src/modules/courses/poll/PollNewQuestbank.js
+++ b/src/modules/courses/poll/PollNewQuestbank.js
@@ -385,7 +385,7 @@ class PollNewQuestbank extends Component {
 					pollid: result.data.data.id,
 					Newedit: false,
 				})
-				this.props.history.push(`/courses/${this.props.match.params.coursesId}/polls/${result.data.data.id}/detail?tab=2`)
+				this.props.history.push(`/classrooms/${this.props.match.params.coursesId}/polls/${result.data.data.id}/detail?tab=2`)
 			}
 		})
 	}
@@ -2464,7 +2464,7 @@ class PollNewQuestbank extends Component {
 		// console.log(max);
 		// console.log(length);
 
-		// debugger
+		
 		var minbool = false;
 		var maxbool = false;
 		let arr = this.state.adddom;
@@ -2763,7 +2763,7 @@ class PollNewQuestbank extends Component {
 		//
 		// let courseId=this.props.match.params.coursesId;
 		// if(courseId===undefined){
-		// 	this.props.history.push("/courses");
+		// 	this.props.history.push("/classrooms");
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
@@ -4309,4 +4309,4 @@ export default PollNewQuestbank
 {/*	*/
 }
 {/*}*/
-}
\ No newline at end of file
+}
diff --git a/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js b/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js
index f10474fd..bbc61702 100644
--- a/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js
+++ b/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js
@@ -35,7 +35,8 @@ class Immediatelypublish extends Component{
       modalsType:false,
       modalsTopval:"",
       loadtype:false,
-      chooseId:undefined
+      chooseId:undefined,
+			immediatelyopen:false
     }
   }
   //立即发布
@@ -56,11 +57,12 @@ class Immediatelypublish extends Component{
 			 if(this.props.Exercisetype==="exercise"){
 				 let url=`/exercises/${this.props.match.params.Id}/publish_groups.json`;
 				 axios.get(url).then((response) => {
-					 if(response.status===200){
+					 if (response.data) {
+						 let starttimesend=response.data.end_time === undefined || response.data.end_time === null || response.data.end_time === "" ? undefined : response.data.end_time;
+
 						 this.setState({
 							 modalname:"立即发布",
 							 modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
-							 OneSelftype:true,
 							 Topval:this.props.Exercisetype==="exercise"?"学生将立即收到试卷":"学生将立即收到问卷",
 							 // Botvalleft:"暂不发布",
 							 Botval:this.props.single ? "":this.props.Exercisetype==="exercise"?`本操作只对"未发布"的试卷有效`:`本操作只对"未发布"的问卷有效`,
@@ -72,7 +74,9 @@ class Immediatelypublish extends Component{
 							 Cancel:this.homeworkhide,
 							 Saves:this.homeworkstartend,
 							 course_groups:response.data.course_groups,
-							 starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time,
+							 starttimesend:starttimesend,
+							 immediatelyopen:response.data.course_groups===null||response.data.course_groups.length===0?false:true,
+							 OneSelftype:true,
 						 })
 
 					 }
@@ -82,12 +86,12 @@ class Immediatelypublish extends Component{
 			 }else{
 				 let url=`/polls/${this.props.match.params.pollId}/publish_groups.json`;
 				 axios.get(url).then((response) => {
-					 if(response){
+					 if (response.data) {
+						 let starttimesend=response.data.end_time === undefined || response.data.end_time === null || response.data.end_time === "" ? undefined : response.data.end_time;
 
 						 this.setState({
 							 modalname:"立即发布",
 							 modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
-							 OneSelftype:true,
 							 Topval:this.props.Exercisetype==="exercise"?"学生将立即收到试卷":"学生将立即收到问卷",
 							 // Botvalleft:"暂不发布",
 							 Botval:this.props.single ? "":this.props.Exercisetype==="exercise"?`本操作只对"未发布"的试卷有效`:`本操作只对"未发布"的问卷有效`,
@@ -99,7 +103,9 @@ class Immediatelypublish extends Component{
 							 Cancel:this.homeworkhide,
 							 Saves:this.homeworkstartend,
 							 course_groups:response.data.course_groups,
-							 starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time,
+							 starttimesend:starttimesend,
+							 immediatelyopen:response.data.course_groups===null||response.data.course_groups.length===0?false:true,
+							 OneSelftype:true,
 						 })
 					 }
 				 }).catch((error) => {
@@ -386,6 +392,7 @@ class Immediatelypublish extends Component{
 					starttimes={this.state.starttimes}
 					starttimesend={this.state.starttimesend}
 					typs={this.state.typs}
+					immediatelyopen={this.state.immediatelyopen}
 				/>:""}
 
         {/* 公用的提示弹框 */}
diff --git a/src/modules/courses/publicNav/listNav.js b/src/modules/courses/publicNav/listNav.js
index c980e693..91558a4f 100644
--- a/src/modules/courses/publicNav/listNav.js
+++ b/src/modules/courses/publicNav/listNav.js
@@ -1,45 +1,45 @@
-import React,{ Component } from "react";
-import { Input,Menu } from "antd";
+import React, { Component } from "react";
+import { Input, Menu } from "antd";
 import './nav.css';
 
 
 const Search = Input.Search;
-class ListNav extends Component{
-  constructor(props){
+class ListNav extends Component {
+  constructor(props) {
     super(props);
-    this.state = { 
-      task_value:"",
-      source_value:"",
-      stu_new_flag:false,
-      headIndex:2
+    this.state = {
+      task_value: "",
+      source_value: "",
+      stu_new_flag: false,
+      headIndex: 2
     }
   }
 
 
-  inputTask=(e)=>{
+  inputTask = (e) => {
     this.setState({
-      task_value:e.target.value
+      task_value: e.target.value
     })
   }
 
-  inputSource=(e)=>{
+  inputSource = (e) => {
     this.setState({
-      source_value:e.target.value
+      source_value: e.target.value
     })
   }
 
-  
 
-  render(){
+
+  render() {
     let {
-      task_value , 
-      source_value,headIndex
-    }=this.state;
-    return(
+      task_value,
+      source_value, headIndex
+    } = this.state;
+    return (
       <div id="course_activities_content">
 
         {
-          headIndex == 2 && 
+          headIndex == 2 &&
           <div className="edu-back-white">
             <p className="clearfix padding30 bor-bottom-greyE">
               <span className="font-18 fl">毕设任务</span>
@@ -48,35 +48,35 @@ class ListNav extends Component{
                 <a className="color-blue">新建</a>
               </li>
             </p>
-            <div className="clearfix pl30 pr30" style={{height:'72px'}}>
+            <div className="clearfix pl30 pr30" style={{ height: '72px' }}>
               <div className="fl mt6 task_menu_ul">
                 <Menu mode="horizontal" defaultSelectedKeys="1">
                   <Menu.Item key="1">全部</Menu.Item>
-                  {this.props.isAdmin?<Menu.Item key="2">未发布</Menu.Item>:""}
+                  {this.props.isAdmin ? <Menu.Item key="2">未发布</Menu.Item> : ""}
                   <Menu.Item key="3">提交中</Menu.Item>
                   <Menu.Item key="4">评阅中</Menu.Item>
                   <Menu.Item key="5">已结束</Menu.Item>
                 </Menu>
               </div>
               <div className="fr mt16 mb16 searchView">
-                <Search 
-                value={task_value}
-                placeholder="请输入名称进行搜索"
-                onInput={this.inputTask}
+                <Search
+                  value={task_value}
+                  placeholder="请输入名称进行搜索"
+                  onInput={this.inputTask}
                 ></Search>
               </div>
             </div>
           </div>
         }
         {
-          headIndex == 3 && 
+          headIndex == 3 &&
           <div className="edu-back-white">
             <p className="clearfix padding30 bor-bottom-greyE">
               <span className="font-18 fl">资源列表</span>
               <li className="fr">
-                <a href="javascript:void(0)" className="color-blue mr30">新建目录</a>
-                <a href="javascript:void(0)" className="color-blue mr30">导入资源</a>
-                <a href="javascript:void(0)" className="color-blue">上传资源</a>
+                <a className="color-blue mr30">新建目录</a>
+                <a className="color-blue mr30">导入资源</a>
+                <a className="color-blue">上传资源</a>
               </li>
             </p>
             <div className="pl30 pr30">
@@ -87,10 +87,10 @@ class ListNav extends Component{
                   <span>私有资源：3 个</span>
                 </p>
                 <div className="fr mt16 mb10 searchView">
-                  <Search 
-                  value={source_value}
-                  onInput={this.inputSource}
-                  placeholder="请输入名称进行搜索"
+                  <Search
+                    value={source_value}
+                    onInput={this.inputSource}
+                    placeholder="请输入名称进行搜索"
                   ></Search>
                 </div>
               </div>
diff --git a/src/modules/courses/shixunHomework/Challenges.css b/src/modules/courses/shixunHomework/Challenges.css
index 8ae2c002..18100fcf 100644
--- a/src/modules/courses/shixunHomework/Challenges.css
+++ b/src/modules/courses/shixunHomework/Challenges.css
@@ -26,4 +26,8 @@
     overflow:hidden;
     text-overflow:ellipsis;
     white-space:nowrap
+}
+
+.color32C090{
+    color:#32C090 !important;
 }
\ No newline at end of file
diff --git a/src/modules/courses/shixunHomework/Chongzuomodel.js b/src/modules/courses/shixunHomework/Chongzuomodel.js
new file mode 100644
index 00000000..edbd106c
--- /dev/null
+++ b/src/modules/courses/shixunHomework/Chongzuomodel.js
@@ -0,0 +1,68 @@
+import React from 'react';
+import Modals from "../../modals/Modals";
+import axios from 'axios';
+class Chongzuomodel extends React.Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      ModalsType:false,
+      antIcon:false
+    }
+  }
+
+  componentDidMount(){
+    this.setState({
+      ModalsType:this.props.Chongzuomodeltype,
+      Modalstopval:`该作业将被打回重做，学生实训记录将被清空!`,
+      ModalsBottomval:`确定打回？`,
+    })
+  }
+
+  ModalSaves=()=>{
+    this.setState({
+      antIcon:true
+    })
+    let zrl=`/myshixuns/${this.props.chongzuoId}/reset_my_game.json?course_id=${this.props.match.params.coursesId}`;
+    axios.get(zrl).then((response) => {
+      this.setState({
+        antIcon:false
+      })
+      this.props.showNotification("操作成功");
+      this.props.hideChongzuomodeltype()
+      this.props.Isupdatass();
+    }).catch((error) => {
+      this.setState({
+        antIcon:false
+      })
+    });
+  }
+
+  ModalCancels=()=>{
+    this.props.hideChongzuomodeltype()
+  }
+
+  render() {
+    //console.log(this.props)
+    // Chongzuomodeltype:undefined,
+    //   chongzuoId:undefined,
+    return (
+      <React.Fragment>
+        <Modals
+          modalsType={this.state.ModalsType}
+          modalsTopval={this.state.Modalstopval}
+          modalsBottomval={this.state.ModalsBottomval}
+          modalSave={()=>this.ModalSaves()}
+          modalCancel={()=>this.ModalCancels()}
+          loadtype={false}
+          antIcon={this.state.antIcon}
+        >
+        </Modals>
+      </React.Fragment>
+    );
+  }
+}
+
+export default Chongzuomodel;
+
+
diff --git a/src/modules/courses/shixunHomework/CommitSummary.js b/src/modules/courses/shixunHomework/CommitSummary.js
index 5d48f11d..4d071cef 100644
--- a/src/modules/courses/shixunHomework/CommitSummary.js
+++ b/src/modules/courses/shixunHomework/CommitSummary.js
@@ -1,30 +1,25 @@
 import React, { Component } from 'react';
-import { SnackbarHOC } from 'educoder';
-import { TPMIndexHOC } from '../../tpm/TPMIndexHOC';
 import "../css/Courses.css";
-import CoursesMarkdown from "../coursesPublic/CoursesMarkdown";
 import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
-import {
-  Form, Icon, Input, Button, Checkbox,message,
-} from "antd";
-import {WordsBtn} from 'educoder';
+import { Form, Button, } from "antd";
+
 //引入对应跳转的组件
 import axios from 'axios';
 //提交总结
-class CommitSummary extends Component{
+class CommitSummary extends Component {
   constructor(props) {
     super(props)
     this.state = {
-      contents: [{val:"",id:1}],
-      course_id:0,
-      course_name:"",
-      category:[],
-      homework_id:0,
-      user_name:"",
-      work_id:0,
-      description:"",
-      data:undefined,
-      cancels:false,
+      contents: [{ val: "", id: 1 }],
+      course_id: 0,
+      course_name: "",
+      category: [],
+      homework_id: 0,
+      user_name: "",
+      work_id: 0,
+      description: "",
+      data: undefined,
+      cancels: false,
     }
 
   }
@@ -34,18 +29,18 @@ class CommitSummary extends Component{
     let query = this.props.location.pathname;
     const type = query.split('/');
     this.setState({
-      shixuntypes:type[3]
+      shixuntypes: type[3]
     })
   }
 
 
   //获取提交总结接口
-  Getsubmissionsummaryinterface=()=>{
-    var  worksid=this.props.match.params.id;
+  Getsubmissionsummaryinterface = () => {
+    var worksid = this.props.match.params.id;
     // console.log("Getsubmissionsummaryinterface");
     // console.log(this.props.match.params);
     // console.log(worksid);
-    var  url = `/student_works/${worksid}/commit_des.json`;
+    var url = `/student_works/${worksid}/commit_des.json`;
     axios.get(url).then((result) => {
       // console.log(result);
       if (result.status === 200) {
@@ -53,11 +48,11 @@ class CommitSummary extends Component{
         // console.log("提交总结接口")
         // console.log(JSON.stringify(result))
         this.setState({
-          data:result.data,
+          data: result.data,
           description: result.data.description,
-          cancels:true,
+          cancels: true,
         })
-      }else {
+      } else {
         this.props.showNotification(result.data.message);
 
       }
@@ -66,11 +61,11 @@ class CommitSummary extends Component{
     })
   }
 
-  submitCommitSummary=()=> {
+  submitCommitSummary = () => {
     const mdContnet = this.refs[`md${1}`].getValue().trim();
     console.log(mdContnet)
   }
-  gotohome=()=>{
+  gotohome = () => {
     // let courseId=this.props.match.params.coursesId;
     // if(courseId===undefined){
     //   this.props.history.push("/courses");
@@ -79,27 +74,27 @@ class CommitSummary extends Component{
     // }
     this.props.history.goBack()
   }
-  asdasdsad=()=>{
+  asdasdsad = () => {
     this.setState({
-      contents:""
+      contents: ""
     })
   }
 
-  handleSubmit=(e) => {
+  handleSubmit = (e) => {
     e.preventDefault();
     this.props.form.validateFields((err, values) => {
       if (!err) {
         console.log(values.description);
-        if(values.description === undefined|| values.description === "" || values.description ===null){
+        if (values.description === undefined || values.description === "" || values.description === null) {
           this.props.showNotification(`请输入提交内容`);
           return
 
         }
-        var  worksid=this.props.match.params.id;
+        var worksid = this.props.match.params.id;
 
-        var  url = `/student_works/${worksid}/update_des.json`;
-        axios.post(url,{
-          description:values.description,
+        var url = `/student_works/${worksid}/update_des.json`;
+        axios.post(url, {
+          description: values.description,
         }).then((result) => {
           if (result.status === 200) {
             // console.log(url)
@@ -107,7 +102,7 @@ class CommitSummary extends Component{
             // console.log(JSON.stringify(result))
             // message.success(result.data.message);
             // 这里以前是学生
-            this.props.history.push(`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/list?tab=0`);
+            this.props.history.push(`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/list?tab=0`);
           }
         }).catch((error) => {
           console.log(error)
@@ -118,26 +113,26 @@ class CommitSummary extends Component{
   }
 
   render() {
-    const {getFieldDecorator} = this.props.form;
-    let {contents,data}=this.state;
+    const { getFieldDecorator } = this.props.form;
+    let { contents, data } = this.state;
     // console.log(this.props);
-		document.title=data === undefined ? "" :data.course_name===undefined?"": data.course_name;
+    document.title = data === undefined ? "" : data.course_name === undefined ? "" : data.course_name;
     return (
       <div>
         <div className="newMain clearfix">
           {/*<Form onSubmit={this.handleSubmit}>*/}
           <div className={"educontent mb20"}>
             <div style={{
-              width:'100%',
-              height:'20px'
+              width: '100%',
+              height: '20px'
             }} >
               <div className="educontent mb30">
                 <p className="clearfix mb20 mt10 ">
-                  <a className="btn colorgrey fl hovercolorblue " onClick={()=>this.gotohome()}>{data === undefined ? "" :data.course_name===undefined?"": data.course_name}</a>
+                  <a className="btn colorgrey fl hovercolorblue " onClick={() => this.gotohome()}>{data === undefined ? "" : data.course_name === undefined ? "" : data.course_name}</a>
                   <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                   {/* style="grey" */}
                   <a
-                    className="btn colorgrey fl hovercolorblue ">{data === undefined ? "" :data.category===undefined?"":data.category.category_name}</a>
+                    className="btn colorgrey fl hovercolorblue ">{data === undefined ? "" : data.category === undefined ? "" : data.category.category_name}</a>
                   <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                   <a className="fl">作业详情</a>
                 </p>
@@ -146,23 +141,23 @@ class CommitSummary extends Component{
             </div>
             <div className="mt20">
               <p className=" fl color-black mt10 summaryname" onClick={this.asdasdsad}>{this.state.description ? '修改总结' : '提交总结'}</p>
-              <a onClick={()=>this.gotohome()} className="color-grey-6 fr font-16 ml30 mt10">返回</a>
+              <a onClick={() => this.gotohome()} className="color-grey-6 fr font-16 ml30 mt10">返回</a>
             </div>
             {/*educontentbox*/}
             <div className="stud-class-set pt40 pb40">
 
               <div className={"mt10"}>
-                <div style={{ "background": "#fff", "padding": "15px"}}>
-                                     <span className="commitcontentsysl">
-                            <span className="color-red">*</span>
+                <div style={{ "background": "#fff", "padding": "15px" }}>
+                  <span className="commitcontentsysl">
+                    <span className="color-red">*</span>
                             内容</span>
                 </div>
                 <div className="new-wrap">
                   <Form layout='vertical' onSubmit={this.handleSubmit} >
                     <Form.Item
                     >
-                      <div style={{ "background": "#fff","padding-bottom":"20px","padding-left":"20px","padding-right":"20px"}}
-                           className="mdInForm">
+                      <div style={{ "background": "#fff", "padding-bottom": "20px", "padding-left": "20px", "padding-right": "20px" }}
+                        className="mdInForm">
                         {getFieldDecorator('description', {
                           rules: [{
                             required: true, message: '请在此输入总结内容,最多5000个字符',
@@ -171,7 +166,7 @@ class CommitSummary extends Component{
                           }],
                         })(
                           <TPMMDEditor ref={this.mdRef} placeholder={'请在此输入总结内容，最多5000个字符'}
-                                       mdID={'courseMessageMD'} initValue={this.state.description} className="courseMessageMD"></TPMMDEditor>
+                            mdID={'courseMessageMD'} initValue={this.state.description} className="courseMessageMD"></TPMMDEditor>
                         )}
                       </div>
                     </Form.Item>
@@ -201,7 +196,7 @@ class CommitSummary extends Component{
                         <Button type="primary" htmlType="submit" className="defalutSubmitbtn fl mr20" >
                           提交
                         </Button>
-                        <a className="defalutCancelbtn fl" href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/list?tab=0`}>取消</a>
+                        <a className="defalutCancelbtn fl" href={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/list?tab=0`}>取消</a>
                       </div>
                     </Form.Item>
                   </Form>
diff --git a/src/modules/courses/shixunHomework/Listofworksstudentone.js b/src/modules/courses/shixunHomework/Listofworksstudentone.js
index caa96287..4285bdaa 100644
--- a/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1,19 +1,10 @@
 import React, {Component} from "react";
-import CoursesListType from '../coursesPublic/CoursesListType';
 import {getRandomcode, publicSearchs, sortDirections} from 'educoder';
 import {
-	Form,
-	Select,
-	Input,
-	Button,
 	Checkbox,
-	Upload,
 	Icon,
-	message,
-	Modal,
 	Table,
 	Pagination,
-	Radio,
 	Tooltip,
 	notification,
 	Spin,
@@ -30,18 +21,16 @@ import './Challenges.css';
 import {getImageUrl} from 'educoder';
 import TraineetraininginformationModal from "./TraineetraininginformationModal";
 import DownloadMessageysl from '../../modals/DownloadMessageysl';
-import Startshixuntask from "../coursesPublic/Startshixuntask";
 import ModulationModal from "../coursesPublic/ModulationModal";
 import HomeworkModal from "../coursesPublic/HomeworkModal";
 import OneSelfOrderModal from "../coursesPublic/OneSelfOrderModal";
 import ShixunWorkModal from "./Shixunworkdetails/ShixunWorkModal";
 import NoneData from '../../../modules/courses/coursesPublic/NoneData';
+import Chongzuomodel from "./Chongzuomodel";
+import NoneDatas from "../signin/component/NoneDatas";
 
-const Search = Input.Search;
-const RadioGroup = Radio.Group;
 const CheckboxGroup = Checkbox.Group;
-const {Option} = Select;
-//GraduationTaskssetting.js
+
 
 //作品列表(学生)
 let allow_lates=false;
@@ -65,6 +54,8 @@ class Listofworksstudentone extends Component {
 		//关卡得分final_score
 
 		this.state = {
+			Chongzuomodeltype:undefined,
+			chongzuoId:undefined,
 			searchtypes:false,
 			jobsettingsdata: undefined,
 			endTime: "2018/11/10 17:10:00",
@@ -280,7 +271,11 @@ class Listofworksstudentone extends Component {
 					width: '98px',
 					render: (text, record) => (
 						<span style={{width: '98px',}}>
-				 <span style={record.submitstate === "迟交通关" ? {
+				 <span style={record.submitstate === "重做中" ?{
+					 color: '#FF8432',
+					 textAlign: "center",
+					 width: '98px',
+				 }:record.submitstate === "迟交通关" ? {
 					 color: '#DD1717',
 					 textAlign: "center",
 					 width: '98px',
@@ -461,7 +456,7 @@ class Listofworksstudentone extends Component {
 					)
 				},
 				{
-					title: '当前成绩',
+					title:'当前成绩',
 					dataIndex: 'work_score',
 					key: 'work_score',
 					align: "center",
@@ -502,14 +497,15 @@ class Listofworksstudentone extends Component {
 														<a style={{textAlign: "center"}}
 															 className="color-blue"
 															 onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
-															 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+															 // onClick={() => this.Viewstudenttraininginformation(record)}
+														>{record.operating}</a>
 												}
 
         </span>
 					),
 				},
 			],
-			orders: "update_time",
+			orders: "work_score",
 			columnsstu2: [
 				{
 					title: '序号',
@@ -674,7 +670,11 @@ class Listofworksstudentone extends Component {
 					width: '98px',
 					render: (text, record) => (
 						<span style={{width: '98px',}}>
-				 <span style={record.submitstate === "迟交通关" ? {
+				 <span style={record.submitstate === "重做中" ?{
+					 color: '#FF8432',
+					 textAlign: "center",
+					 width: '98px',
+				 }:record.submitstate === "迟交通关" ? {
 					 color: '#DD1717',
 					 textAlign: "center",
 					 width: '98px',
@@ -855,7 +855,7 @@ class Listofworksstudentone extends Component {
 					)
 				},
 				{
-					title: '当前成绩',
+					title:'当前成绩',
 					dataIndex: 'work_score',
 					key: 'work_score',
 					align: "center",
@@ -897,14 +897,15 @@ class Listofworksstudentone extends Component {
 														<a style={{textAlign: "center"}}
 															 className="color-blue"
 															 onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
-															 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+															 // onClick={() => this.Viewstudenttraininginformation(record)}
+														>{record.operating}</a>
 												}
 
         </span>
 					),
 				},
 			],
-			b_order: "desc",
+			// b_order: "desc",
 			myorders: "desc",
 			allow_late: false,
 			checkedValuesine: undefined,
@@ -1027,7 +1028,11 @@ class Listofworksstudentone extends Component {
 					align: 'center',
 					className: 'font-14',
 					render: (text, record) => (
-						<span style={record.submitstate === "迟交通关" ? {
+						<span style={record.submitstate === "重做中" ?{
+							color: '#FF8432',
+							textAlign: "center",
+							width: '98px',
+						}:record.submitstate === "迟交通关" ? {
 							color: '#DD1717',
 							textAlign: "center"
 						} : record.submitstate === "按时通关" ? {color: '#29BD8B', textAlign: "center"}
@@ -1059,14 +1064,14 @@ class Listofworksstudentone extends Component {
 						}>
 							{record.cost_time === null ? "--" : record.cost_time === undefined ? "--" : record.cost_time === "--" ? "--" :
 
-								<a style={
+								<span style={
 									{
 										color: '#747A7F',
 										textAlign: "center"
 									}
 								}
 								>{record.cost_time === null ? "--" : record.cost_time === undefined ? "--" : record.cost_time}
-								</a>
+								</span>
 							}
 						</span>
 						// 		<a style={
@@ -1202,7 +1207,10 @@ class Listofworksstudentone extends Component {
 					)
 				},
 				{
-					title: '当前成绩',
+					title: <span>当前成绩<Tooltip placement="top"title={<pre>
+						 鼠标停留具体分值上可查<br/>
+             看得分明细<br/>
+					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'work_score',
 					key: 'work_score',
 					align: 'center',
@@ -1289,18 +1297,38 @@ class Listofworksstudentone extends Component {
 					display: 'block',
 					align: 'center',
 					className: 'font-14',
-					width: '40px',
-
+					width: '80px',
 					render: (text, record) => (
 						record.submitstate === "未开启" ?
-							<a style={{textAlign: "center",width: '40px'}} className="color-blue"
-								 onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
-								 onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===true?"详情":"评阅 "}</a> :
 							<span>
-                       <a style={{textAlign: "center"}} className="color-blue maxnamewidth120"
-													onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
-													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===true?"详情":"评阅 "}</a>
-        </span>
+									<div>
+											<a style={{textAlign: "center",width: '40px'}} className="color-blue"
+												 onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
+											>{record.has_comment===true?"已评阅":"评阅 "}</a>
+									</div>
+
+								{this.props.teacherdatapage === undefined ? "": this.props.teacherdatapage.homework_status[0]==="已截止"?"":record.myshixun_id===0?"":<div>
+											<a style={{textAlign: "center",width: '40px'}} className="color32C090"
+												 onMouseDown={(e) => this.chongzuofun(record.myshixun_identifier)}
+											>重做</a>
+									</div>}
+
+								</span>:
+								<span>
+
+									<div>
+										 <a style={{textAlign: "center"}} className="color-blue"
+												onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
+										 >{record.has_comment===true?"已评阅":"评阅 "}</a>
+									</div>
+
+									{this.props.teacherdatapage === undefined ? "": this.props.teacherdatapage.homework_status[0]==="已截止"?"":record.myshixun_id===0?"":<div>
+											<a style={{textAlign: "center",width: '40px'}} className="color32C090"
+												 onMouseDown={(e) => this.chongzuofun(record.myshixun_identifier)}
+											>重做</a>
+									</div>}
+
+       					 </span>
 					)
 				},
 			],
@@ -1401,7 +1429,11 @@ class Listofworksstudentone extends Component {
 					align: 'center',
 					className: 'font-14',
 					render: (text, record) => (
-						<span style={record.submitstate === "迟交通关" ? {
+						<span style={record.submitstate === "重做中" ?{
+							color: '#FF8432',
+							textAlign: "center",
+							width: '98px',
+						}:record.submitstate === "迟交通关" ? {
 							color: '#DD1717',
 							textAlign: "center"
 						} : record.submitstate === "按时通关" ? {color: '#29BD8B', textAlign: "center"}
@@ -1442,14 +1474,14 @@ class Listofworksstudentone extends Component {
 							}
 						}>
 							{record.cost_time === null ? "--" : record.cost_time === undefined ? "--" : record.cost_time === "--" ? "--" :
-								<a style={
+								<span style={
 									{
 										color: '#747A7F',
 										textAlign: "center"
 									}
 								}
 								>{record.cost_time === null ? "--" : record.cost_time === undefined ? "--" : record.cost_time}
-								</a>
+								</span>
 							}
 						</span>
 					)
@@ -1565,7 +1597,10 @@ class Listofworksstudentone extends Component {
 					)
 				},
 				{
-					title: '当前成绩',
+					title: <span>当前成绩<Tooltip placement="top"  title={<pre>
+						 鼠标停留具体分值上可查<br/>
+             看得分明细<br/>
+					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'work_score',
 					key: 'work_score',
 					align: 'center',
@@ -1652,17 +1687,37 @@ class Listofworksstudentone extends Component {
 					display: 'block',
 					align: 'center',
 					className: 'font-14',
-					width: '40px',
+					width: '80px',
 					render: (text, record) => (
 						record.submitstate === "未开启" ?
-							<a style={{textAlign: "center",width: '40px'}} className="color-blue"
-								 onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
-								 onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===true?"详情":"评阅"}</a> :
+ 						<span>
+							<div>
+									<a style={{textAlign: "center",width: '40px'}} className="color-blue"
+										 onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
+										// onClick={() => this.Viewstudenttraininginformationt(record)}
+									>{record.has_comment===true?"已评阅":"评阅"}</a>
+							</div>
+
+							{this.props.teacherdatapage === undefined ? "": this.props.teacherdatapage.homework_status[0]==="已截止"?"":record.myshixun_id===0?"":<div>
+									<a style={{textAlign: "center",width: '40px'}} className="color32C090"
+									onMouseDown={(e) => this.chongzuofun(record.myshixun_identifier)}
+									>重做</a>
+							</div>}
+
+						</span>:
 							<span>
-                       <a style={{textAlign: "center"}} className="color-blue"
+									<div>
+											 <a style={{textAlign: "center"}} className="color-blue"
 													onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
-													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===true?"详情":"评阅"}</a>
-        </span>
+													// onClick={() => this.Viewstudenttraininginformationt(record)}
+											 >{record.has_comment===true?"已评阅":"评阅"}</a>
+							     </div>
+									{this.props.teacherdatapage === undefined ? "": this.props.teacherdatapage.homework_status[0]==="已截止"?"":record.myshixun_id===0?"":<div>
+										<a style={{textAlign: "center",width: '40px'}} className="color32C090"
+											 onMouseDown={(e) => this.chongzuofun(record.myshixun_identifier)}
+										>重做</a>
+									</div>}
+       				 </span>
 					)
 				},
 			],
@@ -1695,6 +1750,34 @@ class Listofworksstudentone extends Component {
 		this.Getalistofworks(homeworkid, false);
 	}
 
+
+	Updatetimedropdon=()=>{
+
+		let ooders=""
+		if(this.state.orders!=="update_time"){
+			ooders="desc";
+		}else {
+			//不是更新时间
+			if (this.state.myorders === "desc") {
+				//升序
+				ooders="asc";
+
+			} else if (this.state.myorders === "asc") {
+				//降序
+				ooders="desc";
+
+			}
+		}
+		this.setState({
+			myorders: ooders,
+			orders: "update_time",
+			datajs:undefined,
+			loadingstate: true,
+		})
+		this.Startsortingt("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, ooders);
+
+	}
+
 	//实训作业tbale 列表塞选数据
 	table1handleChange = (pagination, filters, sorter) => {
 		//"ascend" 升序
@@ -1772,7 +1855,7 @@ class Listofworksstudentone extends Component {
 	// }
 	student = () => {
 		// console.log("914");
-		// debugger
+		
 
 		var homeworkid = this.props.match.params.homeworkid;
 		this.Getalistofworks(homeworkid, true);
@@ -2061,7 +2144,7 @@ class Listofworksstudentone extends Component {
 						classroom: teacherdata.group_name,
 						cost_time: teacherdata.cost_time,
 						has_comment:teacherdata.has_comment,
-						submitstate: teacherdata.work_status === 0 ? "未开启" : teacherdata.work_status === 1 ? "未通关" : teacherdata.work_status === 2 ? "按时通关" : "迟交通关",
+						submitstate:teacherdata.work_status === -1 ? "重做中":teacherdata.work_status === 0 ? "未开启" : teacherdata.work_status === 1 ? "未通关" : teacherdata.work_status === 2 ? "按时通关" : "迟交通关",
 						// updatetime:this.state.teacherdata.student_works[i].update_time,
 						// updatetime:"",
 						updatetime: timedata === "Invalid date" ? "--" : timedata,
@@ -2107,7 +2190,9 @@ class Listofworksstudentone extends Component {
 					classroom: student_works[i].group_name,
 					cost_time: student_works[i].cost_time,
 					has_comment:student_works[i].has_comment,
-					submitstate: student_works[i].work_status === 0 ? "未开启" : student_works[i].work_status === 1 ? "未通关" : student_works[i].work_status === 2 ? "按时通关" : "迟交通关",
+					myshixun_id:student_works[i].myshixun_id,
+					myshixun_identifier:student_works[i].myshixun_identifier,
+					submitstate:student_works[i].work_status === -1 ? "重做中":student_works[i].work_status === 0 ? "未开启" : student_works[i].work_status === 1 ? "未通关" : student_works[i].work_status === 2 ? "按时通关" : "迟交通关",
 					// updatetime:this.state.teacherdata.student_works[i].update_time,
 					// updatetime:"",
 					updatetime: timedata === "Invalid date" ? "--" : timedata,
@@ -2269,7 +2354,7 @@ class Listofworksstudentone extends Component {
 					classroom: teacherdata.group_name,
 					cost_time: teacherdata.cost_time,
 					has_comment:teacherdata.has_comment,
-					submitstate: teacherdata.work_status === 0 ? "未开启" : teacherdata.work_status === 1 ? "未通关" : teacherdata.work_status === 2 ? "按时通关" : "迟交通关",
+					submitstate:teacherdata.work_status === -1 ? "重做中":teacherdata.work_status === 0 ? "未开启" : teacherdata.work_status === 1 ? "未通关" : teacherdata.work_status === 2 ? "按时通关" : "迟交通关",
 					// updatetime:this.state.teacherdata.student_works[i].update_time,
 					// updatetime:"",
 					updatetime: timedata === "Invalid date" ? "--" : timedata,
@@ -2326,7 +2411,7 @@ class Listofworksstudentone extends Component {
 			userids: e.myid,
 		})
 
-		window.open(`/courses/${this.state.props.match.params.coursesId}/shixun_homeworks/${e.myid}/shixun_work_report`, '_blank');
+		window.open(`/classrooms/${this.state.props.match.params.coursesId}/shixun_homeworks/${e.myid}/shixun_work_report`, '_blank');
 		// this.viewtraining(e.myid);
 	}
 	viewtraining = (userids) => {
@@ -2507,7 +2592,6 @@ class Listofworksstudentone extends Component {
 		axios.get(url).then((response) => {
 			if (response) {
 				if (response.data.status === 0) {
-					setTimeout(() => {
 						this.props.showNotification(`${response.data.message}`);
 						// var homeworkid = this.props.match.params.homeworkid;
 						this.Getalistofworks(homeworkid, false);
@@ -2517,12 +2601,14 @@ class Listofworksstudentone extends Component {
 						} catch (e) {
 
 						}
-					}, 2500);
 				}
 			}
 			// this.Getalistofworkstwo("", "", "", "", 1, 20);
 		}).catch((error) => {
 			console.log(error)
+			this.setState({
+				computeTimetype:true
+			})
 		});
 
 	}
@@ -2601,7 +2687,7 @@ class Listofworksstudentone extends Component {
 		}).catch((error) => {
 			console.log(error)
 			this.setState({
-				loadingstate: false
+				loadingstate: false,
 			})
 		})
 
@@ -2633,7 +2719,9 @@ class Listofworksstudentone extends Component {
 					classroom: student_works[i].group_name,
 					cost_time: student_works[i].cost_time,
 					has_comment:student_works[i].has_comment,
-					submitstate: student_works[i].work_status === 0 ? "未开启" : student_works[i].work_status === 1 ? "未通关" : student_works[i].work_status === 2 ? "按时通关" : "迟交通关",
+					myshixun_id:student_works[i].myshixun_id,
+					myshixun_identifier:student_works[i].myshixun_identifier,
+					submitstate:student_works[i].work_status === -1 ? "重做中":student_works[i].work_status === 0 ? "未开启" : student_works[i].work_status === 1 ? "未通关" : student_works[i].work_status === 2 ? "按时通关" : "迟交通关",
 					// updatetime:this.state.teacherdata.student_works[i].update_time,
 					// updatetime:"",
 					updatetime: timedata === "Invalid date" ? "--" : timedata,
@@ -3015,7 +3103,7 @@ class Listofworksstudentone extends Component {
 			userids: data.myid,
 		})
 		// this.viewtrainingt(e.myid);
-		window.open(`/courses/${this.state.props.match.params.coursesId}/shixun_homeworks/${data.myid}/shixun_work_report`, '_blank');
+		window.open(`/classrooms/${this.state.props.match.params.coursesId}/shixun_homeworks/${data.myid}/shixun_work_report`, '_blank');
 	}
 	// 查看学员实训信息
 	Viewstudenttraininginformationt = (e) => {
@@ -3025,7 +3113,7 @@ class Listofworksstudentone extends Component {
 			userids: e.myid,
 		})
 		// this.viewtrainingt(e.myid);
-		window.open(`/courses/${this.state.props.match.params.coursesId}/shixun_homeworks/${e.myid}/shixun_work_report`, '_blank');
+		window.open(`/classrooms/${this.state.props.match.params.coursesId}/shixun_homeworks/${e.myid}/shixun_work_report`, '_blank');
 	}
 	// 关闭调分
 	cancelModulationModels = () => {
@@ -3352,10 +3440,6 @@ class Listofworksstudentone extends Component {
 		axios.get(url).then((response) => {
 			if (response) {
 				if (response.data.status === 0) {
-					// if(response.data.message!==undefined){
-					// 	return;
-					// }
-					setTimeout(() => {
 						this.setState({
 							loadingstate: true
 						})
@@ -3370,13 +3454,13 @@ class Listofworksstudentone extends Component {
 						} catch (e) {
 
 						}
-
-					}, 2500);
 				}
-				// this.props.history.replace( matchurl );
 			}
 		}).catch((error) => {
 			console.log(error)
+			this.setState({
+				computeTimetype:true
+			})
 		});
 
 	};
@@ -3433,6 +3517,19 @@ class Listofworksstudentone extends Component {
 		})
 	}
 
+	chongzuofun=(id)=>{
+			this.setState({
+				chongzuoId:id,
+				Chongzuomodeltype:true
+			})
+		}
+
+	hideChongzuomodeltype=()=>{
+		this.setState({
+			chongzuoId:undefined,
+			Chongzuomodeltype:false
+		})
+	}
 	render() {
 		let {columns,columnss, course_groupysls, datajs, isAdmin, homework_status, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, game_list, columnsstu, columnsstu2, limit, experience, boolgalist, viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate, computeTimetype} = this.state;
 
@@ -3470,10 +3567,39 @@ class Listofworksstudentone extends Component {
 				 }
 			 }
 		 }
+
+
+		let Teachercolumns=columns;
+		if(this.state.orders&&this.state.orders==="update_time"){
+			if(Teachercolumns){
+				if(Teachercolumns.length>0){
+					Teachercolumns.map((item,key)=>{
+						if(item.key){
+							if(item.key==="work_score"){
+								//去掉成绩默认排序
+								item.defaultSortOrder="";
+							}
+
+						}
+					})
+				}
+			}
+
+
+		}
+
+
 		return (
 
 			this.props.isAdmin() === true ?
 				<div className=" clearfix " style={{margin: "auto", minWidth: "1200px"}}>
+					{this.state.Chongzuomodeltype===true?<Chongzuomodel
+						{...this.props}
+						{...this.state}
+						hideChongzuomodeltype={()=>this.hideChongzuomodeltype()}
+						Isupdatass={()=>this.Isupdatass()}
+					/>:""}
+
 					{visible === true ? <ModulationModal
 						visible={visible}
 						Cancel={() => this.cancelModulationModel()}
@@ -3660,27 +3786,9 @@ class Listofworksstudentone extends Component {
 
 											<li className="clearfix mt10">
 												<div className="fr search-newysl" style={{marginBottom: '1px'}}>
-													{/*{course_is_end===true?"":<span>*/}
-													{/*{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?*/}
-													{/*	(this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTimet}>*/}
-													{/*		查看最新成绩*/}
-													{/*	</div>:""):*/}
-													{/*	teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
-													{/*		(this.props.isNotMember()===false?<div className={"computeTimes font-16"}>*/}
-													{/*			查看最新成绩*/}
-													{/*		</div>:"")*/}
-													{/*}*/}
-													{/*</span>}*/}
+
 													<span className="search-newyslw fr ml20">
-										{/*<Search*/}
-										{/*	placeholder="请输入姓名或学号搜索"*/}
-										{/*	id="subject_search_input"*/}
-										{/*	autoComplete="off"*/}
-										{/*	value={searchtext}*/}
-										{/*	// onKeyUp={(e) => this.onSearchKeywordKeyUpt(e)}*/}
-										{/*	onInput={this.inputSearchValuest}*/}
-										{/*	onSearch={this.searchValuest}*/}
-										{/*></Search>*/}
+
 										 {publicSearchs("请输入姓名或学号搜索",this.searchValuest,this.inputSearchValuest,this.inputSearchValuest)}
 										</span>
 												</div>
@@ -3742,12 +3850,34 @@ class Listofworksstudentone extends Component {
 
 										</ul>
 
+										<style>
+											{
+												`
+											 .fiilssort{
+													 position: absolute;
+													 top: -9px;
+												 }
+												 .colorddd{
+												   color:#b7b7b7;
+												 }
+												`
+											}
+										</style>
 
 										<div id="graduation_work_list" style={{padding: '0px 20px 10px 20px'}}>
 
 											<div className="clearfix">
                                 <span className="fl color-grey-6 font-12"><span
 																	className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata.work_count && teacherdata.work_count}</span>个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count && teacherdata.all_member_count}学生） </span>
+																<div className={"fr drop_down xiaoshou"} onClick={()=>this.Updatetimedropdon()}>
+																	<span className={"color-blue"}>更新时间</span>
+																			<sapn className="relativef ml5"style={{"top":"2px"}} >
+																				<i className={this.state.orders&&this.state.orders==="update_time"&&this.state.myorders==="asc"?
+																					"iconfont icon-sanjiaoxing-up font-12  color-blue fiilssort" :"iconfont icon-sanjiaoxing-up font-12 fiilssort colorddd"}></i>
+																				<i className={this.state.orders&&this.state.orders==="update_time"&&this.state.myorders==="desc"?
+																					"iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue":"iconfont icon-sanjiaoxing-down font-12 yslbottomsj colorddd"}></i>
+																			</sapn>
+																</div>
 												<style>
 													{
 														`
@@ -3797,13 +3927,32 @@ class Listofworksstudentone extends Component {
 						              `}</style>
 													<div className="edu-table edu-back-white ant-tables ysltableo table1">
 														<Spin tip="正在加载..." spinning={loadingstate}>
-															{datajs === undefined ? "" : <Table
-																dataSource={datajs}
-																columns={columns}
-																pagination={false}
-																onChange={this.table1handleChange}
-															  loading={false}
-															/>}
+															{datajs === undefined ?
+																<div style={{
+																	minHeight: "400px",
+																	width:"100%"
+																}} >
+																</div>
+																:
+																(
+																	this.state.orders&&this.state.orders==="update_time"?
+																		<Table
+																			dataSource={datajs}
+																			columns={Teachercolumns}
+																			pagination={false}
+																			onChange={this.table1handleChange}
+																			loading={false}
+																		/>
+																   :
+																		<Table
+																			dataSource={datajs}
+																			columns={Teachercolumns}
+																			pagination={false}
+																			onChange={this.table1handleChange}
+																			loading={false}
+																		/>
+																)
+															}
 														</Spin>
 
 													</div>
@@ -3981,27 +4130,7 @@ class Listofworksstudentone extends Component {
 
 																	<div className="fr">
 
-																		{/*<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>*/}
-																		{/*							{	course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/}
-																		{/*	{computeTimetype===true?*/}
-																		{/*		(this.props.isNotMember()===false?*/}
-																		{/*			(*/}
-																		{/*				teacherdata&&teacherdata.update_score===true?*/}
-																		{/*					<div className={"computeTime font-16"} onClick={this.setComputeTime}>*/}
-																		{/*						查看最新成绩*/}
-																		{/*					</div>*/}
-																		{/*					:""*/}
-																		{/*			)*/}
-																		{/*			:"")*/}
-																		{/*		:*/}
-																		{/*		(teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
-																		{/*			this.props.isNotMember()===false?*/}
-																		{/*				<div className={"computeTimes font-16"}>*/}
-																		{/*					查看最新成绩*/}
-																		{/*				</div>*/}
-																		{/*				:"")*/}
-																		{/*	}*/}
-																		{/*</span>}*/}
+
 
 																	</div>
 
@@ -4226,24 +4355,7 @@ class Listofworksstudentone extends Component {
 																	</style>
 																	<div className="fr">
 
-																		{/*<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>*/}
-																		{/*				{	course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/}
-																		{/*	{computeTimetype===true?*/}
 
-																		{/*		(this.props.isNotMember()===false?*/}
-																		{/*			(*/}
-																		{/*				teacherdata&&teacherdata.update_score===true?*/}
-																		{/*					<div className={"computeTime font-16"} onClick={this.setComputeTime}>*/}
-																		{/*						查看最新成绩*/}
-																		{/*					</div>:""*/}
-																		{/*			)*/}
-																		{/*			:""):*/}
-																		{/*		teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
-																		{/*			(this.props.isNotMember()===false?<div className={"computeTimes font-16"}>*/}
-																		{/*				查看最新成绩*/}
-																		{/*			</div>:"")*/}
-																		{/*	}*/}
-																		{/*</span>}*/}
 																	</div>
 																</div>
 															</div>
diff --git a/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 06f0e805..1c564ede 100644
--- a/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -1,6 +1,6 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn} from 'educoder';
+import React, { Component } from "react";
+import { Link, NavLink } from 'react-router-dom';
+import { WordsBtn, ActionBtn } from 'educoder';
 import axios from 'axios';
 import {
 	notification,
@@ -21,8 +21,6 @@ import '../css/busyWork.css';
 import '../poll/pollStyle.css';
 
 
-import TPMMDEditor from "../../tpm/challengesnew/TPMMDEditor";
-import DownloadMessageysl from "../../modals/DownloadMessageysl";
 import Modals from "../../modals/Modals";
 class ShixunHomeworkPage extends Component {
 	constructor(props) {
@@ -35,15 +33,15 @@ class ShixunHomeworkPage extends Component {
 			code_review: false,
 			view_report: false,
 			visible: false,
-			showmodel:false,
-			child:undefined,
-			yslpros:false,
-			Modalstopval:"你在该实训的学习记录将被清空，无法恢复",
-			ModalsBottomval:"是否确认重做？",
-			ModalsType:false,
-			mylistisSpin:false,
-			Showupdateinstructions:false,
-			AppraiseModaltype:false
+			showmodel: false,
+			child: undefined,
+			yslpros: false,
+			Modalstopval: "你在该实训的学习记录将被清空，无法恢复",
+			ModalsBottomval: "是否确认重做？",
+			ModalsType: false,
+			mylistisSpin: false,
+			Showupdateinstructions: false,
+			AppraiseModaltype: false
 		}
 
 	}
@@ -57,8 +55,8 @@ class ShixunHomeworkPage extends Component {
 		try {
 			var currenturl = window.location.href;
 			var newUrl = (currenturl.split("?"))[0];
-			window.history.pushState('','',newUrl+'?tab='+e);
-		}catch (e) {
+			window.history.pushState('', '', newUrl + '?tab=' + e);
+		} catch (e) {
 			console.log(e);
 			console.log("44");
 		}
@@ -70,10 +68,10 @@ class ShixunHomeworkPage extends Component {
 		// console.log(teacherdata);
 
 		this.setState({
-			jobsettingsdatapage: jobsettingsdata.data.message===undefined?jobsettingsdata:undefined,
-			teacherdatapage:  teacherdata.message===undefined?teacherdata:undefined,
-			code_review: teacherdata.code_review===undefined?false :teacherdata.code_review,
-			view_report: teacherdata.view_report!==undefined? false:teacherdata.view_report,
+			jobsettingsdatapage: jobsettingsdata.data.message === undefined ? jobsettingsdata : undefined,
+			teacherdatapage: teacherdata.message === undefined ? teacherdata : undefined,
+			code_review: teacherdata.code_review === undefined ? false : teacherdata.code_review,
+			view_report: teacherdata.view_report !== undefined ? false : teacherdata.view_report,
 		})
 	}
 
@@ -97,69 +95,69 @@ class ShixunHomeworkPage extends Component {
 	}
 
 
-	confirmysl(child,i) {
-		if(i===1){
+	confirmysl(child, i) {
+		if (i === 1) {
 			child.daochushixunbaogao();
 		}
-		if(i===2){
+		if (i === 2) {
 			child.daochuzuoye();
 		}
 	}
 
-	homeworkendss(child){
+	homeworkendss(child) {
 		child.homeworkends();
 	}
 
-	homeworkstarts(child){
+	homeworkstarts(child) {
 		child.homeworkstart();
 
 	}
-	workshowmodels(child){
+	workshowmodels(child) {
 		child.workshowmodel();
 	}
 	/// 重做的确认
-	ModalSaves=()=>{
+	ModalSaves = () => {
 
 		this.setState({
-			ModalsType:false,
-			Modalstopval:""
+			ModalsType: false,
+			Modalstopval: ""
 		});
-		if(this.state.teacherdatapage){
+		if (this.state.teacherdatapage) {
 			this.resetshixunCombat(this.state.teacherdatapage.myshixun_identifier);
 		}
 		try {
 			console.log("this.child");
 			console.log(this.child);
-		}catch (e) {
+		} catch (e) {
 
 		}
 
 	};
 	//取消重做
-	ModalCancels=()=>{
+	ModalCancels = () => {
 		this.setState({
-			ModalsType:false,
-			Modalstopval:""
+			ModalsType: false,
+			Modalstopval: ""
 		})
 	};
 	//打开重做弹框
-	Modalcancelss=()=>{
+	Modalcancelss = () => {
 		this.setState({
-			Modalstopval:"你在该实训的学习记录将被清空，无法恢复",
-			ModalsBottomval:"是否确认重做？",
-			ModalsType:true,
+			Modalstopval: "你在该实训的学习记录将被清空，无法恢复",
+			ModalsBottomval: "是否确认重做？",
+			ModalsType: true,
 		})
 	}
 	//重置按钮
-	resetshixunCombat=(id)=>{
+	resetshixunCombat = (id) => {
 		this.setState({
-			mylistisSpin:true,
+			mylistisSpin: true,
 		})
-		let zrl=`/myshixuns/${id}/reset_my_game.json`;
+		let zrl = `/myshixuns/${id}/reset_my_game.json`;
 		axios.get(zrl).then((response) => {
 			// window.location.href = "/shixuns/" + response.data.shixun_identifier + "/challenges";
 			this.setState({
-				mylistisSpin:false,
+				mylistisSpin: false,
 			})
 			this.child.Isupdatass();
 			this.props.showNotification("已清空本实训的学习记录\n" +
@@ -167,50 +165,50 @@ class ShixunHomeworkPage extends Component {
 				"请点击“开启挑战”重做实训作业");
 		}).catch((error) => {
 			this.setState({
-				mylistisSpin:false,
+				mylistisSpin: false,
 			})
 			console.log(error)
 		});
 	}
 	bindRef = ref => { this.child = ref }
-///////////////教师截止
+	///////////////教师截止
 	//编辑作业
-	Showupdateinstructionsboolfalse (bool) {
+	Showupdateinstructionsboolfalse(bool) {
 		this.setState({
-			Showupdateinstructions:bool
+			Showupdateinstructions: bool
 		})
 	}
 	//开始编辑作业
-	edenwork = ()=>{
+	edenwork = () => {
 		this.setState({
-			Showupdateinstructions:true
+			Showupdateinstructions: true
 		})
 	}
-	gotohome=()=>{
+	gotohome = () => {
 		// console.log(this.props)
-		let {jobsettingsdatapage}=this.state
+		let { jobsettingsdatapage } = this.state
 
-		this.props.history.replace(`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main ===  1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`);
+		this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" : "shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`);
 	}
 
-	Akeyreviewit=()=>{
+	Akeyreviewit = () => {
 		this.setState({
-			AppraiseModaltype:true
+			AppraiseModaltype: true
 		})
 	}
 
-	hideAppraiseModaltype=()=>{
+	hideAppraiseModaltype = () => {
 		this.setState({
-			AppraiseModaltype:false
+			AppraiseModaltype: false
 		})
 	}
 
-	SaveAppraiseModal=(comment,hidden_comment)=>{
+	SaveAppraiseModal = (comment, hidden_comment) => {
 		let url = `/homework_commons/${this.props.match.params.homeworkid}/batch_comment.json`
-		axios.post(url,{
-				comment: comment,
-				hidden_comment: hidden_comment,
-			}
+		axios.post(url, {
+			comment: comment,
+			hidden_comment: hidden_comment,
+		}
 		)
 			.then((response) => {
 				if (response.data.status == 0) {
@@ -221,17 +219,15 @@ class ShixunHomeworkPage extends Component {
 
 				}
 			})
-			.catch( (error) =>{
+			.catch((error) => {
 
 			});
 	}
 	render() {
-		let {tab, teacherdatapage,  jobsettingsdatapage,AppraiseModaltype} = this.state;
+		let { tab, teacherdatapage, jobsettingsdatapage, AppraiseModaltype } = this.state;
 
 		const isAdmin = this.props.isAdmin();
-		// console.log(119)
-		//  console.log(jobsettingsdatapage);
-		document.title=jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name;
+		document.title = jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name;
 		return (
 			<div className="newMain clearfix ">
 				<Modals
@@ -244,47 +240,45 @@ class ShixunHomeworkPage extends Component {
 				>
 				</Modals>
 
-				{AppraiseModaltype===true?<ApprausePublic
+				{AppraiseModaltype === true ? <ApprausePublic
 					{...this.props}
 					{...this.state}
 					ApprausePublicName={"一键评阅"}
 					visible={AppraiseModaltype}
-					Cancel={()=>this.hideAppraiseModaltype()}
-					SaveAppraiseModal={(comment,hidden_comment)=>this.SaveAppraiseModal(comment,hidden_comment)}
-				/>:""}
+					Cancel={() => this.hideAppraiseModaltype()}
+					SaveAppraiseModal={(comment, hidden_comment) => this.SaveAppraiseModal(comment, hidden_comment)}
+				/> : ""}
 
 
-				<div className={"educontent mt10 mb20"} style={{width: "1200px"}}>
+				<div className={"educontent mt10 mb20"} style={{ width: "1200px" }}>
 					<Spin size="large" spinning={this.state.mylistisSpin}>
 						{
-							jobsettingsdatapage === undefined?"":
+							jobsettingsdatapage === undefined ? "" :
 								<div className="educontent mb20">
 									<p className="clearfix mb20 mt10">
-										<a className="btn colorgrey fl hovercolorblue " href={this.props.current_user&&this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</a>
+										<a className="btn colorgrey fl hovercolorblue " href={this.props.current_user && this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</a>
 										<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 										<a
 											className=" btn colorgrey fl hovercolorblue "
-											href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main ===  1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</a>
+											href={`/classrooms/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" : "shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</a>
 										<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 										<WordsBtn className="fl">作业详情</WordsBtn>
 									</p>
 								</div>
 						}
-
-						<div className="educontent mb20">
-							<p className=" fl color-black  summaryname" >
+						<div style={{marginBottom:"80px"}}>
+						<div className="educontent mb20" >
+							<p className=" fl color-black  summaryname" style={{display:"inline-box",height:"28px"}}>
 								{teacherdatapage === undefined ? "" : teacherdatapage.homework_name}
 							</p>
 							<CoursesListType
 								typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status}
 							/>
-							<a className="color-grey-9 fr font-16  summaryname  ml20 mr20" onClick={()=>this.gotohome()}>返回</a>
-							{teacherdatapage&&teacherdatapage.shixun_status>1?<a className="color-grey-9 fr font-16 mr20"
-																																	 href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
-																																	 target={"_blank"}>实训详情</a>:""}
-
-
-						</div>
+							<a className="color-grey-9 fr font-16  summaryname  ml20 mr20" onClick={() => this.gotohome()}>返回</a>
+							{teacherdatapage && teacherdatapage.shixun_status > 1 ? <a className="color-blue fr font-16 mr20"
+								href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
+								target={"_blank"}>实训详情</a> : ""}
+						</div></div>
 						<div className="edu-back-white ">
 							<div className="stud-class-set bor-bottom-greyE ">
 								<div className=" clearfix edu-back-white poll_list">
@@ -296,8 +290,8 @@ class ShixunHomeworkPage extends Component {
 												className={parseInt(tab) === 2 ? "active" : ""}
 												onClick={(e) => this.ChangeTab(2)}>
 												代码查重</a> : ""}
-									{parseInt(tab) === 3?
-										<style>{this.props.isAdmin()?
+									{parseInt(tab) === 3 ?
+										<style>{this.props.isAdmin() ?
 											`
                                     .poll_list a.active:after {
                                         content: '';
@@ -308,17 +302,13 @@ class ShixunHomeworkPage extends Component {
                                         background-color: #4CACFF;
                                         position: absolute;
                                         }
-                                    `:""
+                                    `: ""
 										}</style>
-										:""}
+										: ""}
 
 									<a className={parseInt(tab) === 3 ? "active" : ""}
-										 onClick={(e) => this.ChangeTab(3)}
-									>{this.props.isAdmin()?"设置":"得分规则"}</a>
-									{/*{this.props.isAdmin() ? <a*/}
-									{/*	className="fr color-blue font-16"*/}
-									{/*	href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}*/}
-									{/*>导出</a> : ""}*/}
+										onClick={(e) => this.ChangeTab(3)}
+									>{this.props.isAdmin() ? "设置" : "得分规则"}</a>
 									<style>{`
                         .drop_down_menu li a {
                             padding: 0px;
@@ -338,78 +328,75 @@ class ShixunHomeworkPage extends Component {
 
                         `}</style>
 									{this.props.isAdmin() ?
-										<li className="li_line drop_down fr color-blue font-16 mt20" style={{"padding": "0 20px"}}>
+										<li className="li_line drop_down fr color-blue font-16 mt20" style={{ "padding": "0 20px" }}>
 											导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
-											<ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}>
-												{/*<li><a*/}
-												{/*	onClick={(child,i) => this.confirmysl(this.child,1)}>实训报告</a>*/}
-												{/*</li>*/}
+											<ul className="drop_down_menu" style={{ "right": "-0px", "left": "unset", "height": "auto" }}>
 												<li><a
-													onClick={(child,i) => this.confirmysl(this.child,2)}>学生成绩</a>
+													onClick={(child, i) => this.confirmysl(this.child, 2)}>学生成绩</a>
 												</li>
 
 											</ul>
 										</li> : ""}
 									{this.props.isAdmin() ?
 										teacherdatapage && teacherdatapage.end_immediately === true ?
-											<a className="fr color-blue font-16" onClick={(child)=>this.homeworkendss(this.child)}>立即截止</a>
+											<a className="fr color-blue font-16" onClick={(child) => this.homeworkendss(this.child)}>立即截止</a>
 											: ""
 										: ""}
 									{this.props.isAdmin() ?
 										teacherdatapage && teacherdatapage.publish_immediately === true ?
-											<a className="fr color-blue font-16" onClick={(child)=>this.homeworkstarts(this.child)}>立即发布</a>
+											<a className="fr color-blue font-16" onClick={(child) => this.homeworkstarts(this.child)}>立即发布</a>
 											: ""
 										: ""}
 
 									{this.props.isAdmin() ?
 										teacherdatapage && teacherdatapage.code_review === true ?
-											<a className="fr color-blue font-16" onClick={(child)=>this.workshowmodels(this.child)}>代码查重</a>
+											<a className="fr color-blue font-16" onClick={(child) => this.workshowmodels(this.child)}>代码查重</a>
 											: "" : ""}
 
-									{parseInt(tab) === 0 ?this.props.isAdmin() ?
-									 jobsettingsdatapage === undefined ? [""] : jobsettingsdatapage.data.homework_status[0] === "未发布" ? "" :
-											<a className="fr color-blue font-16" onClick={()=>this.Akeyreviewit()}>一键评阅</a>
-											: "":""}
+									{parseInt(tab) === 0 ? this.props.isAdmin() ?
+										jobsettingsdatapage === undefined ? [""] : jobsettingsdatapage.data.homework_status[0] === "未发布" ? "" :
+											<a className="fr color-blue font-16" onClick={() => this.Akeyreviewit()}>一键评阅</a>
+										: "" : ""}
 
 									{
-										parseInt(tab)===1?
+										parseInt(tab) === 1 ?
 											this.props.isAdmin() ?
-												<a className="fr color-blue font-16" onClick={()=>this.edenwork()}>编辑作业</a>
-												:""
-											:""
+												<a className="fr color-blue font-16" onClick={() => this.edenwork()}>编辑作业</a>
+												: ""
+											: ""
 									}
 
 
 									{this.state.view_report === true ? <Link className="fr color-blue font-16" target={"_blank"}
-																													 to={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main ===  1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage&&teacherdatapage.work_id}/shixun_work_report`}>
+										to={`/classrooms/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" : "shixun_homework"}/${teacherdatapage && teacherdatapage.work_id}/shixun_work_report`}>
 										查看实训报告
 									</Link> : ""}
 									{
 										teacherdatapage === undefined ? ""
 											: teacherdatapage.commit_des === null || teacherdatapage.commit_des === undefined ? "" :
-											<a className="fr color-blue font-16"
-												 target={"_blank"}
-												 href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main ===  1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
+												<a className="fr color-blue font-16"
+													target={"_blank"}
+													href={`/classrooms/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" : "shixun_homework"}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
 									}
-									{teacherdatapage === undefined ? "" :teacherdatapage&&teacherdatapage.shixun_status>1&&teacherdatapage&&teacherdatapage.time_status<5?<Startshixuntask
+									{teacherdatapage === undefined ? "" : teacherdatapage && teacherdatapage.shixun_status > 1 && teacherdatapage && teacherdatapage.time_status < 5 ? <Startshixuntask
 										{...this.props}
 										data={teacherdatapage}
-									/>:""}
+									/> : ""}
 									{this.props.isStudent() ?
 										(
-											teacherdatapage&&teacherdatapage.redo_work===true?
-												<a className="fr color-blue font-16" onClick={()=>this.Modalcancelss()}>重做</a>
-												:""
+											teacherdatapage && teacherdatapage.redo_work === true ?
+												<a className="fr color-blue font-16" onClick={() => this.Modalcancelss()}>重做</a>
+												: ""
 										)
-										: "" }
+										: ""}
 								</div>
 							</div>
 						</div>
 
-						{parseInt(tab) === 0 ?<Listofworksstudentone    triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>:""}
-						{parseInt(tab) === 1 ?<Workquestionandanswer  triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)} Showupdateinstructionsboolfalse={(i)=>this.Showupdateinstructionsboolfalse(i)}></Workquestionandanswer>:""}
-						{parseInt(tab) === 2 ?<ShixunStudentWork   triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>:""}
-						{parseInt(tab) === 3 ?<Trainingjobsetting  teacherdatapage={this.state.teacherdatapage}  triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>:""}
+						{parseInt(tab) === 0 ? <Listofworksstudentone triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone> : ""}
+						{parseInt(tab) === 1 ? <Workquestionandanswer triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)} Showupdateinstructionsboolfalse={(i) => this.Showupdateinstructionsboolfalse(i)}></Workquestionandanswer> : ""}
+						{parseInt(tab) === 2 ? <ShixunStudentWork triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork> : ""}
+						{parseInt(tab) === 3 ? <Trainingjobsetting teacherdatapage={this.state.teacherdatapage} triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting> : ""}
 					</Spin>
 				</div>
 			</div>
diff --git a/src/modules/courses/shixunHomework/ShixunStudentWork.js b/src/modules/courses/shixunHomework/ShixunStudentWork.js
index e789e4fc..db607310 100644
--- a/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -1,41 +1,25 @@
-import React, {Component} from "react";
-import CoursesListType from '../coursesPublic/CoursesListType';
-import {getRandomNumber, getRandomcode, sortDirections} from 'educoder';
+import React, { Component } from "react";
+import { getRandomcode, sortDirections } from 'educoder';
 import ShixunWorkModal from './Shixunworkdetails/ShixunWorkModal';
 import HomeworkModal from "../coursesPublic/HomeworkModal";
 import OneSelfOrderModal from "../coursesPublic/OneSelfOrderModal";
 import DownloadMessageysl from '../../modals/DownloadMessageysl';
 import NoneData from '../coursesPublic/NoneData';
 import {
-	Form,
-	Select,
 	Input,
-	Button,
 	Checkbox,
-	Upload,
 	Icon,
-	message,
-	Modal,
 	Table,
-	Divider,
-	InputNumber,
-	Tag,
-	DatePicker,
-	Radio,
-	Tooltip,
 	notification,
 	Pagination,
 	Spin,
 } from "antd";
-import {Link, Switch, Route, Redirect} from 'react-router-dom';
 import axios from 'axios';
 import '../css/members.css'
 import "../common/formCommon.css"
 import '../css/Courses.css'
 import './style.css'
 import moment from 'moment';
-import 'moment/locale/zh-cn';
-import Startshixuntask from "../coursesPublic/Startshixuntask";
 
 const Search = Input.Search;
 const CheckboxGroup = Checkbox.Group;
@@ -51,10 +35,10 @@ class ShixunStudentWork extends Component {
 			props: props,
 			data: undefined,
 			page: 1,
-			limit:10,
+			limit: 10,
 			loadingstate: true,
 			order: "code_rate",
-			b_order:"desc",
+			b_order: "desc",
 			task_status: [],
 			course_group_info: [],
 			teacherdata: undefined,
@@ -69,13 +53,13 @@ class ShixunStudentWork extends Component {
 			viewtrainingdata: {},
 			group_infolist: [],
 			duplicatechecking: false,
-			datalist:undefined,
-			showmodel:false,
-			jobsettingsdata:undefined,
-			DownloadType:false,
-			DownloadMessageval:undefined,
-			lunxun:true,
-			starttimesend:undefined,
+			datalist: undefined,
+			showmodel: false,
+			jobsettingsdata: undefined,
+			DownloadType: false,
+			DownloadMessageval: undefined,
+			lunxun: true,
+			starttimesend: undefined,
 		}
 	}
 
@@ -86,78 +70,66 @@ class ShixunStudentWork extends Component {
 		this.props.triggerRef(this);
 
 	}
-	// componentWillReceiveProps(nextProps) {
-	// 	// console.log("+++++++++916");
-	// 	// console.log(nextProps);
-	// 	// console.log(this.props)
-	// 	// console.log(this.props.isAdmin());
-	// 	if (nextProps.code_review != this.props.code_review) {
-	// 		if (nextProps.code_review !== undefined) {
-	// 			console.log("diaoyonglwangluo1");
-	// 			this.getTrainingjobsettings();
-	// 		}
-	// 	}
-	//
-	// }
 
-
-	getTrainingjobsettings=()=>{
+	getTrainingjobsettings = () => {
 		this.getupdata();
 		this.getTrainingjobsetting();
-}
+	}
 	// 获取数据地方
 	getTrainingjobsetting = () => {
 
 		var homeworkid = this.props.match.params.homeworkid;
 		let url = `/homework_commons/${homeworkid}/settings.json`;
 		axios.get(url).then((result) => {
-			if(result !== undefined){
+			if (result !== undefined) {
 				this.setState({
 					jobsettingsdata: result,
 
 				})
-				this.props.Getdataback(result,result.data);
+				this.props.Getdataback(result, result.data);
 
 			}
-	})
+		})
 	}
 
-	getupdata=(pages)=>{
-		let {order,b_order,page,limit,group_infolist,search}=this.state;
+	getupdata = (pages) => {
+		let { order, b_order, page, limit, group_infolist, search } = this.state;
 
 		var homeworkid = this.props.match.params.homeworkid;
 		let url = "/homework_commons/" + homeworkid + "/code_review_results.json";
 
-		axios.get(url,{params:{
-				order:order,
-				sort:b_order,
-				page:pages===undefined?page:pages,
-				limit:limit,
-				group_ids:group_infolist,
-				search:search
+		axios.get(url, {
+			params: {
+				order: order,
+				sort: b_order,
+				page: pages === undefined ? page : pages,
+				limit: limit,
+				group_ids: group_infolist,
+				search: search
 			},
-			paramsSerializer: function(params) {
-				return qs.stringify(params, {arrayFormat: 'brackets'})
-			}}).then((response) => {
+			paramsSerializer: function (params) {
+				return qs.stringify(params, { arrayFormat: 'brackets' })
+			}
+		}).then((response) => {
 			if (response.data.status === undefined || response.data.status === 0) {
-				if(response.data!=undefined){
-					if(response.data.status!=-2){
-						let datas=[];
-						let list=response.data.users_reviews;
-						for(var i=0; i<list.length; i++){
+				if (response.data != undefined) {
+					if (response.data.status != -2) {
+						let datas = [];
+						let list = response.data.users_reviews;
+						for (var i = 0; i < list.length; i++) {
 							datas.push({
-								number:i+1,
-								name:list[i].username,
-								stduynumber:list[i].student_id,
-								classroom:parseInt(list[i].code_rate),
-								operating:list[i].user_id
+								number: i + 1,
+								name: list[i].username,
+								stduynumber: list[i].student_id,
+								classroom: parseInt(list[i].code_rate),
+								operating: list[i].user_id
 							})
 						}
 						this.setState({
 							data: response.data,
-							datalist:datas,
-							lunxun:false,
-							duplicatechecking:false,
+							datalist: datas,
+							lunxun: false,
+							duplicatechecking: false,
 						});
 						return;
 					}
@@ -169,23 +141,23 @@ class ShixunStudentWork extends Component {
 					duplicatechecking: true
 				})
 				notification.open({
-					message:"提示",
+					message: "提示",
 					description: response.data.message
 				});
 			}
 
 			if (response.data.status === -1) {
 				notification.open({
-					message:"提示",
+					message: "提示",
 					description: response.data.message
 				});
 			}
 			this.setState({
-				lunxun:true,
+				lunxun: true,
 			})
 			setInterval(() => {
 				console.log("开始轮询了");
-				if(this.state.lunxun===true){
+				if (this.state.lunxun === true) {
 					console.log("开始轮询了getupdata");
 					this.getupdatasysk();
 				}
@@ -199,46 +171,48 @@ class ShixunStudentWork extends Component {
 		let query = this.props.location.pathname;
 		const type = query.split('/');
 		this.setState({
-			shixuntypes:type[3]
+			shixuntypes: type[3]
 		})
 	};
-	getupdatasysk=(pages)=>{
-		let {order,b_order,page,limit,group_infolist,search}=this.state;
+	getupdatasysk = (pages) => {
+		let { order, b_order, page, limit, group_infolist, search } = this.state;
 
 		var homeworkid = this.props.match.params.homeworkid;
 		let url = "/homework_commons/" + homeworkid + "/code_review_results.json";
 
-		axios.get(url,{params:{
-				order:order,
-				sort:b_order,
-				page:pages===undefined?page:pages,
-				limit:limit,
-				group_ids:group_infolist,
-				search:search
+		axios.get(url, {
+			params: {
+				order: order,
+				sort: b_order,
+				page: pages === undefined ? page : pages,
+				limit: limit,
+				group_ids: group_infolist,
+				search: search
 			},
-			paramsSerializer: function(params) {
-				return qs.stringify(params, {arrayFormat: 'brackets'})
-			}}).then((response) => {
+			paramsSerializer: function (params) {
+				return qs.stringify(params, { arrayFormat: 'brackets' })
+			}
+		}).then((response) => {
 			if (response.data.status === undefined || response.data.status === 0) {
-				if(response.data!=undefined){
-					if(response.data.status!=-2){
+				if (response.data != undefined) {
+					if (response.data.status != -2) {
 						console.log();
-						let datas=[];
-						let list=response.data.users_reviews;
-						for(var i=0; i<list.length; i++){
+						let datas = [];
+						let list = response.data.users_reviews;
+						for (var i = 0; i < list.length; i++) {
 							datas.push({
-								number:i+1,
-								name:list[i].username,
-								stduynumber:list[i].student_id,
-								classroom:parseInt(list[i].code_rate),
-								operating:list[i].user_id
+								number: i + 1,
+								name: list[i].username,
+								stduynumber: list[i].student_id,
+								classroom: parseInt(list[i].code_rate),
+								operating: list[i].user_id
 							})
 						}
 						this.setState({
 							data: response.data,
-							datalist:datas,
-							lunxun:false,
-							duplicatechecking:false,
+							datalist: datas,
+							lunxun: false,
+							duplicatechecking: false,
 						});
 					}
 				}
@@ -252,24 +226,26 @@ class ShixunStudentWork extends Component {
 
 	}
 
-	getcode_review_results=(order,b_order,page,limit,group_infolist,search)=>{
+	getcode_review_results = (order, b_order, page, limit, group_infolist, search) => {
 		var homeworkid = this.props.match.params.homeworkid;
 		let url = "/homework_commons/" + homeworkid + "/code_review_results.json";
 
-		axios.get(url,{params:{
-			  order:order,
-				sort:b_order,
-				page:page,
-				limit:limit,
-				group_ids:group_infolist,
-				search:search
-		},
-		paramsSerializer: function(params) {
-			return qs.stringify(params, {arrayFormat: 'brackets'})
-		}}).then((response) => {
+		axios.get(url, {
+			params: {
+				order: order,
+				sort: b_order,
+				page: page,
+				limit: limit,
+				group_ids: group_infolist,
+				search: search
+			},
+			paramsSerializer: function (params) {
+				return qs.stringify(params, { arrayFormat: 'brackets' })
+			}
+		}).then((response) => {
 			if (response.data.status === undefined || response.data.status === 0) {
-				if(response.data!=undefined){
-					if(response.data.status!=-2) {
+				if (response.data != undefined) {
+					if (response.data.status != -2) {
 						let datas = [];
 						let list = response.data.users_reviews;
 						for (var i = 0; i < list.length; i++) {
@@ -295,14 +271,14 @@ class ShixunStudentWork extends Component {
 					duplicatechecking: true
 				})
 				notification.open({
-					message:"提示",
+					message: "提示",
 					description: response.data.message
 				});
 			}
 
 			if (response.data.status === -1) {
 				notification.open({
-					message:"提示",
+					message: "提示",
 					description: response.data.message,
 				});
 			}
@@ -316,94 +292,96 @@ class ShixunStudentWork extends Component {
 	TablePagination = (pages) => {
 
 		this.setState({
-			page:pages
+			page: pages
 		})
-    this.getupdata(pages)
+		this.getupdata(pages)
 	}
 
-	inputSearchValue=(e)=>{
+	inputSearchValue = (e) => {
 
-		if(e.target.value===""){
+		if (e.target.value === "") {
 			this.setState({
-				search:undefined
+				search: undefined
 			})
-		}else{
+		} else {
 			this.setState({
-				search:e.target.value
+				search: e.target.value
 			})
 		}
 
 
 	}
 
-	searchValue=()=>{
-		let {order,b_order,page,limit,group_infolist,search} = this.state;
-		this.getcode_review_results(order,b_order,page,limit,group_infolist,search)
+	searchValue = () => {
+		let { order, b_order, page, limit, group_infolist, search } = this.state;
+		this.getcode_review_results(order, b_order, page, limit, group_infolist, search)
 	}
 
 	funorder = (value, myyslorder) => {
 
-		let {order,b_order,page,limit,group_infolist,search} = this.state;
+		let { order, b_order, page, limit, group_infolist, search } = this.state;
 		this.setState({
-			loadingstate:true,
+			loadingstate: true,
 			order: value,
 			b_order: myyslorder
 		})
 		this.getcode_review_results(value, myyslorder, page, limit, group_infolist, search)
 
 	}
-	groupgroup=(checkedValues)=>{
-	  let {order,b_order,page,limit,search} = this.state;
+	groupgroup = (checkedValues) => {
+		let { order, b_order, page, limit, search } = this.state;
 		this.setState({
-			group_infolist:checkedValues
+			group_infolist: checkedValues
 		})
-   this.getcode_review_results(order,b_order,page,limit,checkedValues,search)
+		this.getcode_review_results(order, b_order, page, limit, checkedValues, search)
 	}
 
-	Viewstudenttraininginformation =(list)=>{
-		window.location.href =list
+	Viewstudenttraininginformation = (list) => {
+		window.location.href = list
 	}
 
-	workshowmodel=()=>{
+	workshowmodel = () => {
 		this.setState({
-			showmodel:true
+			showmodel: true
 		})
 	}
 
-	hideshowmodel=()=>{
+	hideshowmodel = () => {
 		this.setState({
-			showmodel:false
+			showmodel: false
 		})
 	}
 
 	//立即发布
-	homeworkstart=()=>{
-		let homeworkid=this.props.match.params.homeworkid;
-		let url="/homework_commons/"+homeworkid+"/publish_groups.json";
+	homeworkstart = () => {
+		let homeworkid = this.props.match.params.homeworkid;
+		let url = "/homework_commons/" + homeworkid + "/publish_groups.json";
 
 		axios.get(url).then((response) => {
 
-			if(response.status===200){
+			if (response.data) {
 				const dataformat = 'YYYY-MM-DD HH:mm';
-				let starttime= this.props.getNowFormatDates(1);
-				let endtime=this.props.getNowFormatDates(2);
+				let starttime = this.props.getNowFormatDates(1);
+				let endtime = this.props.getNowFormatDates(2);
+				let starttimesend = response.data.end_time === undefined || response.data.end_time === null || response.data.end_time === "" ? undefined : response.data.end_time;
+
 				this.setState({
-					modalname:"立即发布",
-					modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
-					OneSelftype:true,
-					Topval:"学生将立即收到作业",
+					modalname: "立即发布",
+					modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
+					Topval: "学生将立即收到作业",
 					// Botvalleft:"暂不发布",
-					Botval:`本操作只对"未发布"的作业有效`,
-					starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
-					endtime:"截止时间："+endtime,
-					Cancelname:"暂不发布",
-					Savesname:"立即发布",
-					Cancel:this.homeworkhide,
-					Saves:this.homeworkstartend,
-					course_groups:response.data.course_groups,
-					starttimes:starttime,
-					starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time,
-					typs:"start",
+					Botval: `本操作只对"未发布"的作业有效`,
+					starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
+					endtime: "截止时间：" + endtime,
+					Cancelname: "暂不发布",
+					Savesname: "立即发布",
+					Cancel: this.homeworkhide,
+					Saves: this.homeworkstartend,
+					course_groups: response.data.course_groups,
+					starttimes: starttime,
+					starttimesend: starttimesend,
+					typs: "start",
+					OneSelftype: true,
 				})
 			}
 		}).catch((error) => {
@@ -412,28 +390,28 @@ class ShixunStudentWork extends Component {
 
 	}
 	//立即截止
-	homeworkends=()=>{
-		let homeworkid=this.props.match.params.homeworkid;
-		let url="/homework_commons/"+homeworkid+"/end_groups.json";
+	homeworkends = () => {
+		let homeworkid = this.props.match.params.homeworkid;
+		let url = "/homework_commons/" + homeworkid + "/end_groups.json";
 
 		axios.get(url).then((response) => {
 
-			if(response.status===200){
+			if (response.status === 200) {
 				this.setState({
-					modalname:"立即截止",
-					modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
-					visible:true,
-					Topval:"学生将不能再提交作业",
+					modalname: "立即截止",
+					modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
+					visible: true,
+					Topval: "学生将不能再提交作业",
 					// Botvalleft:"暂不截止",
-					Botval:`本操作只对"提交中"的作业有效`,
-					Cancelname:"暂不截止",
-					Savesname:"立即截止",
-					Cancel:this.homeworkhide,
-					Saves:this.coursetaskend,
-					starttime:undefined,
-					endtime:undefined,
-					typs:"end",
-					course_groups:response.data.course_groups,
+					Botval: `本操作只对"提交中"的作业有效`,
+					Cancelname: "暂不截止",
+					Savesname: "立即截止",
+					Cancel: this.homeworkhide,
+					Saves: this.coursetaskend,
+					starttime: undefined,
+					endtime: undefined,
+					typs: "end",
+					course_groups: response.data.course_groups,
 				})
 			}
 		}).catch((error) => {
@@ -441,78 +419,78 @@ class ShixunStudentWork extends Component {
 		});
 
 	}
-// 立即发布
-	homeworkstartend=(ds,endtime)=>{
+	// 立即发布
+	homeworkstartend = (ds, endtime) => {
 		var homeworkid = this.props.match.params.homeworkid;
 
-		let data={}
-		if(ds.length===0){
-			if(this.props.teacherdatapage.category.main===1){
+		let data = {}
+		if (ds.length === 0) {
+			if (this.props.teacherdatapage.category.main === 1) {
 				data = {
 					homework_ids: [homeworkid],
 					end_time: endtime,
 				}
-			}else {
+			} else {
 				data = {
 					homework_ids: [homeworkid],
 					end_time: endtime,
-					category_id:this.props.teacherdatapage.category.category_id,
+					category_id: this.props.teacherdatapage.category.category_id,
 				}
 			}
-		}else{
-			if(this.props.teacherdatapage.category.main===1){
-				data={
+		} else {
+			if (this.props.teacherdatapage.category.main === 1) {
+				data = {
 					homework_ids: [homeworkid],
 					group_ids: ds,
-					group_end_times:endtime,
-					detail:true
+					group_end_times: endtime,
+					detail: true
 				}
-			}else{
-				data={
+			} else {
+				data = {
 					homework_ids: [homeworkid],
 					group_ids: ds,
-					group_end_times:endtime,
-					category_id:this.props.teacherdatapage.category.category_id,
-					detail:true
+					group_end_times: endtime,
+					category_id: this.props.teacherdatapage.category.category_id,
+					detail: true
 				}
 			}
 
 		}
 
-		let coursesId=this.props.match.params.coursesId;
-		let url ="/courses/"+coursesId+"/homework_commons/publish_homework.json";
-		axios.post(url,data).then((result)=>{
-			if(result.status===200){
-				if(result.data.status===0){
+		let coursesId = this.props.match.params.coursesId;
+		let url = "/courses/" + coursesId + "/homework_commons/publish_homework.json";
+		axios.post(url, data).then((result) => {
+			if (result.status === 200) {
+				if (result.data.status === 0) {
 					notification.open({
-						message:"提示",
+						message: "提示",
 						description: result.data.message,
 					});
 					this.homeworkhide()
 				}
 
 			}
-		}).catch((error)=>{
+		}).catch((error) => {
 			console.log(error);
 		})
 	}
 
 	//立即截止确定按钮
-	coursetaskend=()=>{
+	coursetaskend = () => {
 		var homeworkid = this.props.match.params.homeworkid;
-		let {course_groupslist} = this.state;
+		let { course_groupslist } = this.state;
 
 
 		const cid = this.props.match.params.coursesId;
-		let url="/courses/"+cid+"/homework_commons/end_homework.json";
+		let url = "/courses/" + cid + "/homework_commons/end_homework.json";
 		axios.post(url, {
-				group_ids:course_groupslist,
-				homework_ids: [homeworkid],
-			})
+			group_ids: course_groupslist,
+			homework_ids: [homeworkid],
+		})
 			.then((response) => {
 				if (response.data.status == 0) {
 					notification.open({
-						message:"提示",
+						message: "提示",
 						description: response.data.message,
 					});
 					this.homeworkhide()
@@ -523,106 +501,76 @@ class ShixunStudentWork extends Component {
 			});
 	}
 
-	getcourse_groupslist=(id)=>{
+	getcourse_groupslist = (id) => {
 		this.setState({
-			course_groupslist:id
+			course_groupslist: id
 		})
 	}
 
-	homeworkhide=()=>{
+	homeworkhide = () => {
 		this.getupdata()
 		this.setState({
-			modalname:undefined,
-			modaltype:undefined,
-			visible:false,
-			OneSelftype:false,
-			Topval:undefined,
-			Topvalright:undefined,
-			Botvalleft:undefined,
-			Botval:undefined,
-			starttime:undefined,
-			endtime:undefined,
-			Cancelname:undefined,
-			Savesname:undefined,
-			Cancel:undefined,
-			Saves:undefined,
-			StudentList_value:undefined,
-			addname:undefined,
-			addnametype:false,
-			addnametab:undefined,
-			typs:undefined,
-			starttimes:undefined,
+			modalname: undefined,
+			modaltype: undefined,
+			visible: false,
+			OneSelftype: false,
+			Topval: undefined,
+			Topvalright: undefined,
+			Botvalleft: undefined,
+			Botval: undefined,
+			starttime: undefined,
+			endtime: undefined,
+			Cancelname: undefined,
+			Savesname: undefined,
+			Cancel: undefined,
+			Saves: undefined,
+			StudentList_value: undefined,
+			addname: undefined,
+			addnametype: false,
+			addnametab: undefined,
+			typs: undefined,
+			starttimes: undefined,
 		})
 	}
-// 导出实习报告批量
-	/// 确认是否下载
-	// confirmysl(url){
-	// 	this.refs.DownloadMessage.confirmysl(url);
-		// axios.get(url).then((response) => {
-		// 	if(response.data.status&&response.data.status===-1){
-
-		// 	}else if(response.data.status&&response.data.status===-2){
-		// 		if(response.data.messages === "100"){
-		// 			// 已超出文件导出的上限数量（100 ），建议：
-
-		// 			this.setState({
-		// 				DownloadType:true,
-		// 				DownloadMessageval:100
-		// 			})
-		// 		}else {
-		// 			//因附件资料超过500M
-		// 			this.setState({
-		// 				DownloadType:true,
-		// 				DownloadMessageval:500
-		// 			})
-		// 		}
-		// 	}else {
-		// 		this.props.showNotification(`正在下载中`);
-		// 		window.open("/api"+url, '_blank');
-		// 	}
-		// }).catch((error) => {
-		// 	console.log(error)
-		// });
-	// }
-	ChangeTab=(e)=>{
+	ChangeTab = (e) => {
 		this.props.ChangeTab(e);
 	}
 
-	daochushixunbaogao=()=>{
-		let url =`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}`;
+	daochushixunbaogao = () => {
+		let url = `/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}`;
 		this.confirmysl(url);
 	}
 
-	daochuzuoye =() =>{
+	daochuzuoye = () => {
 		let url = `/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx`;
 		this.confirmysl(url);
 	}
 
-	confirmysl(url){
+	confirmysl(url) {
 		axios.get(url + '&export=true').then((response) => {
-			if(response === undefined){
+			if (response === undefined) {
 				return
 			}
-			if(response.data.status&&response.data.status===-1){
+			if (response.data.status && response.data.status === -1) {
 
-			}else if(response.data.status&&response.data.status===-2){
-				if(response.data.message === "100"){
+			} else if (response.data.status && response.data.status === -2) {
+				if (response.data.message === "100") {
 					// 已超出文件导出的上限数量（100 ），建议：
 
 					this.setState({
-						DownloadType:true,
-						DownloadMessageval:100
+						DownloadType: true,
+						DownloadMessageval: 100
 					})
-				}else {
+				} else {
 					//因附件资料超过500M
 					this.setState({
-						DownloadType:true,
-						DownloadMessageval:500
+						DownloadType: true,
+						DownloadMessageval: 500
 					})
 				}
-			}else {
+			} else {
 				this.props.showNotification(`正在下载中`);
-				window.open(getRandomcode("/api"+url), '_blank');
+				window.open(getRandomcode("/api" + url), '_blank');
 			}
 		}).catch((error) => {
 			console.log(error)
@@ -630,10 +578,10 @@ class ShixunStudentWork extends Component {
 	}
 
 
-	Downloadcal=()=>{
+	Downloadcal = () => {
 		this.setState({
-			DownloadType:false,
-			DownloadMessageval:undefined
+			DownloadType: false,
+			DownloadMessageval: undefined
 		})
 	};
 
@@ -707,8 +655,8 @@ class ShixunStudentWork extends Component {
 				width: '176px',
 				render: (text, record) => (
 					<span>
-             <a style={{"color": '#07111B', "text-align": "center","margin-left": "10px"}}>{record.number}</a>
-        </span>
+						<a style={{ "color": '#07111B', "text-align": "center", "margin-left": "10px" }}>{record.number}</a>
+					</span>
 				)
 			},
 			{
@@ -718,8 +666,8 @@ class ShixunStudentWork extends Component {
 				width: '218px',
 				render: (text, record) => (
 					<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-        </span>
+						<a style={{ "color": '#07111B', "text-align": "center" }}>{record.name}</a>
+					</span>
 				)
 			},
 			{
@@ -731,8 +679,8 @@ class ShixunStudentWork extends Component {
 				width: '351px',
 				render: (text, record) => (
 					<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
-        </span>
+						<a style={{ "color": '#9A9A9A', "text-align": "center" }}>{record.stduynumber}</a>
+					</span>
 				),
 			},
 			{
@@ -745,8 +693,8 @@ class ShixunStudentWork extends Component {
 				width: '277',
 				render: (text, record) => (
 					<span>
-             <a style={{"color": record.classroom>=90?'#FF6800':"#747A7F", "text-align": "center"}}>{isNaN(record.classroom)?"--":record.classroom}%</a>
-        </span>
+						<a style={{ "color": record.classroom >= 90 ? '#FF6800' : "#747A7F", "text-align": "center" }}>{isNaN(record.classroom) ? "--" : record.classroom}%</a>
+					</span>
 				)
 			},
 			{
@@ -756,34 +704,34 @@ class ShixunStudentWork extends Component {
 				width: '178px',
 				render: (text, record) => (
 					<span>
-             <a onClick={()=>this.Viewstudenttraininginformation("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+this.props.match.params.homeworkid+"/review_detail/"+record.operating)} >查看</a>
-          </span>
+						<a onClick={() => this.Viewstudenttraininginformation("/classrooms/" + this.props.match.params.coursesId + "/" + this.state.shixuntypes + "/" + this.props.match.params.homeworkid + "/review_detail/" + record.operating)} >查看</a>
+					</span>
 				)
 			},
 		];
 
-		if(this.props.isNotMember()===true){
+		if (this.props.isNotMember() === true) {
 
-			columns.some((item,key)=> {
-					if (item.title === "学号") {
-						columns.splice(key, 1)
-						return true
-					}
+			columns.some((item, key) => {
+				if (item.title === "学号") {
+					columns.splice(key, 1)
+					return true
 				}
+			}
 			)
 
 		}
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 		return (
-			<div className=" clearfix "  style={{margin:  "auto" , minWidth:"1200px"}}>
-				{this.state.showmodel===true?<ShixunWorkModal
+			<div className=" clearfix " style={{ margin: "auto", minWidth: "1200px" }}>
+				{this.state.showmodel === true ? <ShixunWorkModal
 					{...this.props}
-	        visible={this.state.showmodel}
-	        modalname={"代码查重"}
-					data={data&&data.group_info}
-					issCancel={()=>this.hideshowmodel()}
-					updatas={()=>this.getupdata()}
-        />:""}
+					visible={this.state.showmodel}
+					modalname={"代码查重"}
+					data={data && data.group_info}
+					issCancel={() => this.hideshowmodel()}
+					updatas={() => this.getupdata()}
+				/> : ""}
 				<DownloadMessageysl
 					{...this.props}
 					value={this.state.DownloadMessageval}
@@ -812,14 +760,14 @@ class ShixunStudentWork extends Component {
 					Cancel={this.state.Cancel}
 					Saves={this.state.Saves}
 					course_groups={this.state.course_groups}
-					getcourse_groupslist={(id)=>this.getcourse_groupslist(id)}
+					getcourse_groupslist={(id) => this.getcourse_groupslist(id)}
 					starttimes={this.state.starttimes}
 					starttimesend={this.state.starttimesend}
 					typs={this.state.typs}
 				/>
 
 				{/*立即发布*/}
-				{this.state.OneSelftype===true?<OneSelfOrderModal
+				{this.state.OneSelftype === true ? <OneSelfOrderModal
 					modaltype={this.state.modaltype}
 					modalname={this.state.modalname}
 					OneSelftype={this.state.OneSelftype}
@@ -838,9 +786,9 @@ class ShixunStudentWork extends Component {
 					starttimes={this.state.starttimes}
 					starttimesend={this.state.starttimesend}
 					typs={this.state.typs}
-				/>:""}
+				/> : ""}
 
-					<div className={"educontent "}>
+				<div className={"educontent "}>
 
 					<div className="edu-back-white">
 
@@ -866,14 +814,14 @@ class ShixunStudentWork extends Component {
 							}
 							`}
 						</style>
-						<li className="clearfix startbox mb20" style={{display:duplicatechecking===true?"":"none"}}>
-							<Spin indicator={antIcon} spinning={duplicatechecking} className={"shixunSpin"}/>
+						<li className="clearfix startbox mb20" style={{ display: duplicatechecking === true ? "" : "none" }}>
+							<Spin indicator={antIcon} spinning={duplicatechecking} className={"shixunSpin"} />
 							<span className={"startfont"}>
-									正在执行查重，完成后将为您自动刷新结果。    温馨提示：执行时间因查重作品数以及作品的代码量而异
+								正在执行查重，完成后将为您自动刷新结果。    温馨提示：执行时间因查重作品数以及作品的代码量而异
 							</span>
 
 						</li>
-						<div className="justify break_full_word new_li edu-back-white" style={{minHeight: '480px',display:duplicatechecking===true?"":"none"}}>
+						<div className="justify break_full_word new_li edu-back-white" style={{ minHeight: '480px', display: duplicatechecking === true ? "" : "none" }}>
 							<NoneData></NoneData>
 						</div>
 
@@ -887,113 +835,115 @@ class ShixunStudentWork extends Component {
 							`}
 						</style>
 
-						{data&&data?
-						<div style={{display:duplicatechecking===false?"":"none"}}>
-						<ul className="clearfix" style={{padding: '20px 16px 10px'}}>
-							<li className="clearfix ">
+						{data && data ?
+							<div style={{ display: duplicatechecking === false ? "" : "none" }}>
+								<ul className="clearfix" style={{ padding: '20px 16px 10px' }}>
+									<li className="clearfix ">
 
-								<span   className="fl  mr10 color-grey-8 ">查重时间：{data&&data.last_review_time}</span>
-								{this.props.isAdmin()?duplicatechecking===false?<span className="fl ">
-									<a  className="Actionbtn newbutton mr20 fl" onClick={this.workshowmodel}>代码查重</a>
-								</span>:"":""}
-								{/*请输入姓名或学号搜索*/}
+										<span className="fl  mr10 color-grey-8 ">查重时间：{data && data.last_review_time}</span>
+										{this.props.isAdmin() ? duplicatechecking === false ? <span className="fl ">
+											<a className="Actionbtn newbutton mr20 fl" onClick={this.workshowmodel}>代码查重</a>
+										</span> : "" : ""}
+										{/*请输入姓名或学号搜索*/}
 
-								<div className="fr search-new" style={{marginBottom: '1px'}}>
-									<Search
-										placeholder="请输入姓名或学号搜索"
-										id="subject_search_input"
-										autoComplete="off"
-										value={search}
-										onInput={this.inputSearchValue}
-										onSearch={this.searchValue}
-									></Search>
-								</div>
-							</li>
+										<div className="fr search-new" style={{ marginBottom: '1px' }}>
+											<Search
+												placeholder="请输入姓名或学号搜索"
+												id="subject_search_input"
+												autoComplete="off"
+												value={search}
+												onInput={this.inputSearchValue}
+												onSearch={this.searchValue}
+											></Search>
+										</div>
+									</li>
 
 
-							{/*分班情况*/}
+									{/*分班情况*/}
 
-							{data&&data.group_info.length===0?"":<li className="clearfix  mt10">
-								<span className="fl mr10 color-grey-8">分班情况：</span>
-								<span className="fl ">
-									<a id="graduation_comment_no_limit"
-										 onClick={()=>this.groupgroup([])}
-								     className={this.state.group_infolist.length===0?"pl10 pr10 mr20 check_on":"pl10 pr10 mr20 "}>
-										全部
+									{data && data.group_info.length === 0 ? "" : <li className="clearfix  mt10">
+										<span className="fl mr10 color-grey-8">分班情况：</span>
+										<span className="fl ">
+											<a id="graduation_comment_no_limit"
+												onClick={() => this.groupgroup([])}
+												className={this.state.group_infolist.length === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}>
+												全部
 									</a>
-								</span>
+										</span>
 
 
-								<CheckboxGroup onChange={this.groupgroup}
-								               value={this.state.group_infolist}
-								               style={{paddingTop: '4px',float: 'left',
-																 maxWidth: '1020px'}}
-								  >
-									{data&&data.group_info === undefined ? "" : data&&data.group_info.map((item, key) => {
-										return (
-											<span key={key}>
-                          <Checkbox value={item.id} key={item.id} className="fl ">
-                            <span>
-	                            {item.name}({item.members_count})
+										<CheckboxGroup onChange={this.groupgroup}
+											value={this.state.group_infolist}
+											style={{
+												paddingTop: '4px', float: 'left',
+												maxWidth: '1020px'
+											}}
+										>
+											{data && data.group_info === undefined ? "" : data && data.group_info.map((item, key) => {
+												return (
+													<span key={key}>
+														<Checkbox value={item.id} key={item.id} className="fl ">
+															<span>
+																{item.name}({item.members_count})
                             </span>
-                          </Checkbox>
-                      </span>
-										)
-									})}
-								</CheckboxGroup>
+														</Checkbox>
+													</span>
+												)
+											})}
+										</CheckboxGroup>
 
-							</li>}
+									</li>}
 
-						</ul>
+								</ul>
 
 
-						<div id="graduation_work_list" style={{padding: '0px 16px 10px'}}>
+								<div id="graduation_work_list" style={{ padding: '0px 16px 10px' }}>
 
-							<div className="clearfix">
-                  <span className="fl color-grey-6 font-12">
-	                <span className="color-orange-tip">
-		                {data&&data.copy_reviews_count}</span>
-	                  个疑似抄袭作品（{data&&data.all_reviews_count}作品） </span>
+									<div className="clearfix">
+										<span className="fl color-grey-6 font-12">
+											<span className="color-orange-tip">
+												{data && data.copy_reviews_count}</span>
+	                  个疑似抄袭作品（{data && data.all_reviews_count}作品） </span>
 
 
 
-							</div>
+									</div>
 
-						</div>
+								</div>
 
-						<div className={"justify break_full_word new_li edu-back-white"} style={{minHeight: "480px"}}>
+								<div className={"justify break_full_word new_li edu-back-white"} style={{ minHeight: "480px" }}>
 
-							<style>{`
+									<style>{`
 							.ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
 													top: 72%;}
 								}
 							`}</style>
 
-							{datalist === undefined ? "" : datalist.length===0? <div className="alltask">
-								<div className="edu-tab-con-box clearfix edu-txt-center">
-									<img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />
-									<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
-								</div>
-							</div>:<Table
-								dataSource={datalist}
-								columns={columns}
-								onChange={this.table1handleChange}
-								pagination={false}
-							/>}
+									{datalist === undefined ? "" : datalist.length === 0 ? <div className="alltask">
+										<div className="edu-tab-con-box clearfix edu-txt-center">
+											<img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />
+											<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
+										</div>
+									</div> : <Table
+											dataSource={datalist}
+											columns={columns}
+											onChange={this.table1handleChange}
+											pagination={false}
+										/>}
 
-						</div>
-					</div>:""}
-				</div>
-
-						{
-							datalist === undefined ? "":datalist.length===0?"":datalist.length<11?
-								<div className="edu-txt-center mt30 mb20">
-									<Pagination showQuickJumper current={page}
-															onChange={this.TablePagination} pageSize={10}
-															total={datalist.length===0?0:data&&data.copy_reviews_count}></Pagination>
 								</div>
-								: ""
-						}
+							</div> : ""}
+					</div>
+
+					{
+						datalist === undefined ? "" : datalist.length === 0 ? "" : datalist.length < 11 ?
+							<div className="edu-txt-center mt30 mb20">
+								<Pagination showQuickJumper current={page}
+									onChange={this.TablePagination} pageSize={10}
+									total={datalist.length === 0 ? 0 : data && data.copy_reviews_count}></Pagination>
+							</div>
+							: ""
+					}
 
 				</div>
 
@@ -1003,58 +953,4 @@ class ShixunStudentWork extends Component {
 	}
 }
 
-export default ShixunStudentWork;
-// <div className="stud-class-set bor-bottom-greyE ">
-// 	<div className=" clearfix edu-back-white poll_list">
-// 		<a  onClick={(e)=>this.ChangeTab(0)}>作品列表</a>
-// 		<a onClick={(e)=>this.ChangeTab(1)}>作业问答</a>
-// 		{this.props.isAdmin()?<a className="active" onClick={(e)=>this.ChangeTab(2)}>代码查重</a>:""}
-// 		<a onClick={(e)=>this.ChangeTab(3)}>设置</a>
-// 		<style>{`
-//                         .drop_down_menu li a {
-//                             padding: 0px;
-//                             font-size: 14px;
-//                         }
-//                         .drop_down_menu {
-//                             width: 93px;
-//                         }
-//                         .drop_down_menu li {
-//                             overflow: visible;
-//                             width: 93px;
-//                         }
-//                         .drop_down_menu, .drop_down_normal {
-//                             padding-top: 10px;
-//                             padding-bottom: 8px;
-//                         }
-//                         a:hover {
-//                         color:#1A0B00 !important;
-//                         }
-//                         `}</style>
-// 		{this.props.isAdmin() ? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding": "0 20px"}}>
-// 			导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
-// 			<ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}>
-// 				<li><a onClick={()=>this.confirmysl(`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}`)}>实训报告</a>
-// 				</li>
-// 				<li><a onClick={()=>this.confirmysl(`/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx`)}>学生成绩</a>
-// 				</li>
-// 			</ul>
-// 		</li> : ""}
-// 		{this.props.isAdmin()?
-// 			data&&data.end_immediately===true?
-// 				<a className="fr color-blue font-16" onClick={this.homeworkends}>立即截止</a>
-// 				:"": ""}
-// 		{this.props.isAdmin()?
-// 			data&&data.publish_immediately===true?
-// 				<a className="fr color-blue font-16" onClick={this.homeworkstart}>立即发布</a> : "": ""}
-// 		{
-// 			jobsettingsdata&&	jobsettingsdata.data === undefined ? ""
-// 				: 	jobsettingsdata&&	jobsettingsdata.data.commit_des === null || 	jobsettingsdata&&	jobsettingsdata.data.commit_des === undefined ? "" :
-// 				<a className="fr color-blue font-16"
-// 					 href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${	jobsettingsdata&&	jobsettingsdata.data === undefined ? "" : 	jobsettingsdata&&	jobsettingsdata.data.id}/commitsummary/${this.state.props.match.params.homeworkid}`}>{	jobsettingsdata&&	jobsettingsdata.data.commit_des}</a>
-// 		}
-// 		{    jobsettingsdata&&jobsettingsdata.data === undefined ? "" : <Startshixuntask
-// 			{...this.props}
-// 			data={	jobsettingsdata&&	jobsettingsdata.data}
-// 		/>}
-{/*	</div>*/}
-{/*</div>*/}
+export default ShixunStudentWork;
\ No newline at end of file
diff --git a/src/modules/courses/shixunHomework/ShixunWorkDetails.js b/src/modules/courses/shixunHomework/ShixunWorkDetails.js
index 7cdab81a..39e5013f 100644
--- a/src/modules/courses/shixunHomework/ShixunWorkDetails.js
+++ b/src/modules/courses/shixunHomework/ShixunWorkDetails.js
@@ -91,7 +91,7 @@ class ShixunWorkDetails extends Component {
 		// }
 		// this.props.history.goBack()
 		// "/courses/1545/shixun_homeworks/15220/list?tab=2"
-		this.props.history.replace(`/courses/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.homeworkid}/list?tab=2`);
+		this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.homeworkid}/list?tab=2`);
 	}
 	render() {
     let{data}=this.state;
@@ -105,13 +105,13 @@ class ShixunWorkDetails extends Component {
 					<div className="educontent">
 						<p className="clearfix mt20">
 							<a className="fl color-grey-9 btn colorgrey  hovercolorblue"
-								 href={`/courses/${data&&data.course_id}/shixun_homeworks/${data&&data.homework_common_id}`}
+								 href={`/classrooms/${data&&data.course_id}/shixun_homeworks/${data&&data.homework_common_id}`}
 								 >
 								<a className={"color-grey-9"} >{data&&data.course_name}</a>
 							</a>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 								<a   className="btn colorgrey fl hovercolorblue grey"
-										 href={`/courses/${data&&data.course_id}/shixun_homeworks/${data&&data.homework_common_id}/list?tab=0`}
+										 href={`/classrooms/${data&&data.course_id}/shixun_homeworks/${data&&data.homework_common_id}/list?tab=0`}
 									// to={"/courses/"+data&&data.course_id+"/"+this.state.shixuntypes+"/"+data&&data.homework_common_id}
 								>
 									<span className={"color-grey-9"}>实训作业</span>
diff --git a/src/modules/courses/shixunHomework/ShixunWorkReport.js b/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 3765b293..89315973 100644
--- a/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -22,6 +22,7 @@ import "../common/formCommon.css";
 import '../css/Courses.css';
 import './style.css';
 import 'moment/locale/zh-cn';
+import Chongzuomodel from "./Chongzuomodel";
 
 
 class ShixunWorkReport extends Component {
@@ -38,6 +39,13 @@ class ShixunWorkReport extends Component {
 			work_comment_hidden:undefined,
 			work_comment:undefined,
 			has_commit: false,
+			shixun_detail:[],
+			view_tpi:false,
+			myshixun_id:undefined,
+			myshixun_identifier:undefined,
+			homework_end:undefined,
+			chongzuoId:undefined,
+			Chongzuomodeltype:false
 		}
 
 	}
@@ -113,7 +121,12 @@ class ShixunWorkReport extends Component {
 					work_comment_hidden:result.data.work_comment_hidden,
 					work_comment:result.data.work_comment,
 					spinning: false,
-					has_commit: result.data.has_commit
+					has_commit: result.data.has_commit,
+					shixun_detail:result.data.shixun_detail,
+					view_tpi:result.data.view_tpi,
+					myshixun_id:result.data.myshixun_id,
+					myshixun_identifier:result.data.myshixun_identifier,
+					homework_end:result.data.homework_end,
 				})
 			}
 
@@ -138,14 +151,14 @@ class ShixunWorkReport extends Component {
 	gotohome=()=>{
 		let courseId=this.props.match.params.coursesId;
 		if(courseId===undefined){
-			this.props.history.push("/courses");
+			this.props.history.push("/classrooms");
 		}else{
 			this.props.history.push(this.props.current_user.first_category_url);
 		}
 	}
 
 	goback = () => {
-		this.props.history.replace(`/courses/${this.props.match.params.coursesId}/shixun_homeworks/${this.state.data.homework_common_id}/list?tab=0`);
+		this.props.history.replace(`/classrooms/${this.props.match.params.coursesId}/shixun_homeworks/${this.state.data.homework_common_id}/list?tab=0`);
 	}
 
 	setupdalist=(challenge_score,overall_appraisal,work_score)=>{
@@ -304,8 +317,22 @@ class ShixunWorkReport extends Component {
 			}
 
 	}
+
+	Backtoredo=(id)=>{
+		this.setState({
+			chongzuoId:id,
+			Chongzuomodeltype:true
+		})
+	}
+
+	hideChongzuomodeltype=()=>{
+		this.setState({
+			chongzuoId:undefined,
+			Chongzuomodeltype:false
+		})
+	}
 	render() {
-		let {data, showAppraiseModaltype, work_comment_hidden, work_comment, has_commit} = this.state;
+		let {data, showAppraiseModaltype, work_comment_hidden, work_comment, has_commit,shixun_detail,view_tpi,myshixun_id,myshixun_identifier,homework_end} = this.state;
 
 		let category_id=data===undefined?"":data.category===null?"":data.category.category_id;
 		let homework_common_id=data===undefined?"":data.homework_common_id;
@@ -313,12 +340,20 @@ class ShixunWorkReport extends Component {
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 
 		// let showAppraiseModals=this.props&&this.props.isAdminOrTeacher()===true?work_comment===null||work_comment===undefined?false:true:work_comment===null||work_comment===undefined?false:true;
-		let showAppraiseModals=work_comment===null||work_comment===undefined?false:true;
+		// let showAppraiseModals=work_comment===null||work_comment===undefined?false:true;
+		// console.log(this.props.isAdmin())
 		document.title=data&&data.course_name;
 
 		return (
 
 				data===undefined?"":<Spin indicator={antIcon} spinning={this.state.spinning}>
+					{this.state.Chongzuomodeltype===true?<Chongzuomodel
+						{...this.props}
+						{...this.state}
+						hideChongzuomodeltype={()=>this.hideChongzuomodeltype()}
+						Isupdatass={()=>this.getdatalist()}
+					/>:""}
+
 					<Modals
 						modalsType={this.state.modalsType}
 						modalsTopval={this.state.modalsTopval}
@@ -354,11 +389,11 @@ class ShixunWorkReport extends Component {
 									<span className={"color-grey-9"}>	{data&&data.course_name}</span>
 							</a>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
-							<a className="btn colorgrey fl hovercolorblue " href={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+category_id}>
+							<a className="btn colorgrey fl hovercolorblue " href={"/classrooms/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+category_id}>
 									<span className={"color-grey-9"}>{data===undefined?"":data.category===null?"":data.category.category_name}</span>
 							</a>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
-							<a href={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+homework_common_id+"/list?tab=0"} className="fl color-grey-9">作业详情</a>
+							<a href={"/classrooms/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+homework_common_id+"/list?tab=0"} className="fl color-grey-9">作业详情</a>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 							<WordsBtn className="fl">{data&&data.username}</WordsBtn>
 						</p>
@@ -380,6 +415,12 @@ class ShixunWorkReport extends Component {
 							{/*className=" color-blue font-14 fr  ml20 mt15"*/}
 							{/*onClick={()=>this.showAppraiseModal(1)}*/}
 						{/*>评阅</a> : ""}*/}
+
+						{this.props.isAdmin()?homework_end===false&&myshixun_id!=0?<a
+							className=" color-blue font-14 fr  ml20 mt15"
+							onClick={()=>this.Backtoredo(myshixun_identifier)}
+						>打回重做</a>:"":""}
+
 						{this.props.isAdmin() ?<a
 							className=" color-blue font-14 fr  ml20 mt15"
 							onClick={()=>this.showAppraiseModal("main",undefined,work_comment,work_comment_hidden)}
@@ -454,7 +495,20 @@ class ShixunWorkReport extends Component {
 					<div className="stud-class-set">
 						<div className="clearfix edu-back-white poll_list">
 
-							<div className="font-16 color-dark-21 shixunreporttitleboxtop pd20">总体评价</div>
+							<div className="font-16 color-dark-21 shixunreporttitleboxtop pd20">
+								<div className={"fl"}>总体评价</div>
+								<div className={"fr"}>
+									{
+										view_tpi&&view_tpi===true?shixun_detail&&shixun_detail.map((item,key)=>{
+											if(key===0){
+												return(
+													<a className={"color-blue  font-16"} href={/tasks/+item.game_identifier} target="_blank" >查看学员实训</a>
+												)
+											}
+										}):""
+									}
+								</div>
+							</div>
 							<div className="font-16 color-dark-21 shixunreporttitleboxbom pd20">
 								<div style={{clear:"both",height:'100px'}}>
 
diff --git a/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index f27cd9d4..45c9e896 100644
--- a/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -305,7 +305,7 @@ class ShixunhomeWorkItem extends Component{
           <div className="clearfix ds pr contentSection" >
 						<style>{`
             .maxwidth333{
-                max-width: 333px;
+                max-width: 300px;
                 overflow: hidden;
                 text-overflow: ellipsis;
                 white-space: nowrap;
@@ -313,15 +313,15 @@ class ShixunhomeWorkItem extends Component{
           `}</style>
             <h6>
 
-              {/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/}
+              {/*to={`/classrooms/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/}
               {
-                this.props.isAdmin?<a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")}
+                this.props.isAdmin?<a onClick={()=>this.hrefjumpskip("/classrooms/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")}
                                          title={discussMessage.name}
                                       className="fl mt3 font-16 font-bd color-dark maxwidth333">{discussMessage.name}</a>:""
               }
 
               {
-                this.props.isStudent? <a onClick={()=>this.hrefjumpskip(`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`)}
+                this.props.isStudent? <a onClick={()=>this.hrefjumpskip(`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`)}
                                             title={discussMessage.name}
                                             className="fl mt3 font-16 font-bd color-dark maxwidth333">{discussMessage.name}</a>:""
               }
@@ -329,7 +329,7 @@ class ShixunhomeWorkItem extends Component{
               {
                 this.props.isNotMember===true? this.props.discussMessage.private_icon===true?
 											<span className="fl mt3 font-16 font-bd color-dark maxwidth333 pointer"  title={"私有属性，非课堂成员不能访问"}>{discussMessage.name}</span>
-										: <a onClick={()=>this.hrefjumpskip(`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`)}
+										: <a onClick={()=>this.hrefjumpskip(`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`)}
                          title={discussMessage.name}
                          className="fl mt3 font-16 font-bd color-dark maxwidth333">{discussMessage.name}</a>:""
               }
@@ -367,20 +367,20 @@ class ShixunhomeWorkItem extends Component{
 							</style>
 
 
-              {/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/}
+              {/*to={`/classrooms/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/}
 
 
 
 
-							{this.props.isAdmin?<span onClick={(event)=>this.stopPro(event)} className={discussMessage&&discussMessage.shixun_status>1?this.props.isAdminOrCreator()?" newhomepagePostSettingname fr":" homepagePostSettingbox fr":" newwidthSettin fr"} style={{"right":"-2px","top":"6px","display":"block"}}>
-                {discussMessage&&discussMessage.shixun_status>1?<Link className="btn colorblue font-16 fontweight400 mr20" to={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>进入学习</Link>:
-                <a className={"btn colorfff font-16 fontweight400 "}>进入学习</a>
+							{this.props.isAdmin?<span onClick={(event)=>this.stopPro(event)} className={discussMessage&&discussMessage.shixun_status>1?this.props.isAdminOrCreator()?" newhomepagePostSettingname fr":" mr20 fr":"fr mr20"} style={{"right":"-2px","top":"6px","display":"block"}}>
+                {discussMessage&&discussMessage.shixun_status>1?<Link className="btn colorblue font-16 fontweight400" to={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>进入学习</Link>:
+                 ""
                 }
 
 
-                {this.props.isAdminOrCreator()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue font-16 fontweight400  "}>重命名</a>:""}
-								{/*<WordsBtn className="btn colorblue ml20 font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>*/}
-								<WordsBtn className="btn colorblue  font-16 ml15 fontweight400  "  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>
+                {this.props.isAdmin?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"ml20 btn colorblue font-16 fontweight400  "}>重命名</a>:""}
+								{/*<WordsBtn className="btn colorblue ml20 font-16"  to={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>*/}
+								<WordsBtn className="btn colorblue  font-16 ml15 fontweight400  "  to={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>
 							</span>:""}
 
 
@@ -391,15 +391,15 @@ class ShixunhomeWorkItem extends Component{
 								</WordsBtn>:"":"":"":""
 							}
 
-              {  this.props.isAdmin?<a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr">作品列表</a>:""}
+              {  this.props.isAdmin?<a onClick={()=>this.hrefjumpskip("/classrooms/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr">作品列表</a>:""}
 
               {
-                this.props.isStudent? <a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr mt2">作品列表</a>:""
+                this.props.isStudent? <a onClick={()=>this.hrefjumpskip("/classrooms/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr mt2">作品列表</a>:""
               }
 
               {
                 this.props.isNotMember===true? this.props.discussMessage.private_icon===true?""
-                  :<a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr">作品列表</a>:""
+                  :<a onClick={()=>this.hrefjumpskip("/classrooms/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr">作品列表</a>:""
               }
 
 
@@ -433,7 +433,7 @@ class ShixunhomeWorkItem extends Component{
                   :
                    <span className="mr15 color-grey9">{discussMessage.status_time}</span>
                 }
-                
+
 
 
 
@@ -504,7 +504,7 @@ export default ShixunhomeWorkItem;
 //
 //   let coursesId=this.props.coursesId;
 //   let taskid=this.props.taskid;
-//   let url="/courses/"+coursesId+"/graduation_tasks/relate_project.json";
+//   let url="/classrooms/"+coursesId+"/graduation_tasks/relate_project.json";
 //   axios.post(url,{
 //     project_id:taskid
 //   }).then((result)=>{
@@ -528,4 +528,4 @@ export default ShixunhomeWorkItem;
 //     this.setState({
 //       visible:true
 //     })
-// }
\ No newline at end of file
+// }
diff --git a/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index 22a97ed2..7d3ec97e 100644
--- a/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -198,7 +198,7 @@ class ShixunWorkModal extends Component{
 					// 	message:"提示",
 					// 	description: response.data.message
 					// });
-					window.location.href=`/courses/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.homeworkid}/student_work?tab=2`;
+					window.location.href=`/classrooms/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.homeworkid}/student_work?tab=2`;
 				}else if(response.data.status === -1){
 					notification.open({
 						message:"提示",
@@ -350,4 +350,4 @@ export default ShixunWorkModal;
 // 		</li>
 // 	</div>
 //
-// :
\ No newline at end of file
+// :
diff --git a/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
index 7babe1e6..1ca3d589 100644
--- a/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
+++ b/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
@@ -219,7 +219,7 @@ class TraineetraininginformationModal extends Component {
                           <span className="ml10  "  style={{"text-align": "left","color":'#29BD8B'}} >经验值：<span style={{"color":'#29BD8B'}}> {this.props.experience=== undefined?"0" :this.props.experience}/</span><span style={{"color":'#29BD8B'}}>{this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_score}</span></span>
                         </div>
                         {/*<Button type="primary" className="ml30"  >实训报告</Button>*/}
-                        <Button  type="primary" target="_blank" className="lh38 fr" style={{"text-align": "center","width": "100px",color: "#fff"}} href={`/courses/${this.props.coursesId}/shixun_homeworks/${this.props.viewtrainingdata.work_id}/shixun_work_report`}>
+                        <Button  type="primary" target="_blank" className="lh38 fr" style={{"text-align": "center","width": "100px",color: "#fff"}} href={`/classrooms/${this.props.coursesId}/shixun_homeworks/${this.props.viewtrainingdata.work_id}/shixun_work_report`}>
                             实训报告
                         </Button>
                         {/*这里到时候要做判断*/}
@@ -394,4 +394,4 @@ class TraineetraininginformationModal extends Component {
     }
 }
 
-export default TraineetraininginformationModal;
\ No newline at end of file
+export default TraineetraininginformationModal;
diff --git a/src/modules/courses/shixunHomework/Trainingjobsetting.js b/src/modules/courses/shixunHomework/Trainingjobsetting.js
index a6cefb46..534e6bf2 100644
--- a/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -102,6 +102,7 @@ class Trainingjobsetting extends Component {
 			databasetwo: undefined,
 			datasheettwo: undefined,
 			publicwork: undefined,
+			publicAnswer: undefined,
 			publish_time: undefined,
 			publish_timebool: false,
 			end_time: undefined,
@@ -135,6 +136,8 @@ class Trainingjobsetting extends Component {
 			borredszfls:'',
 			total_scoretwo:0,
 			total_score:0,
+			immediatelyopen:false,
+			modallate_time:undefined
 		}
 		// console.log("获取到的值")
 		// console.log("Trainingjobsetting")
@@ -303,6 +306,7 @@ class Trainingjobsetting extends Component {
 					latedeductiontwo: result.data.eff_score,
 					proportion: result.data.shixun_evaluation === 0 ? "均分比例" : result.data.shixun_evaluation === 1 ? "经验值比例" : result.data.shixun_evaluation === 2 ? "自定义分值" : "",
 					publicwork: result.data.score_open,
+					publicAnswer:result.data.answer_public,
 					challenge_settings: result.data.challenge_settings,
 					code_review: result.data.code_review,
 					total_scoretwo:result.data.total_score,
@@ -545,8 +549,9 @@ class Trainingjobsetting extends Component {
 				}
 
 			} else {
+				//不是统一设置
 				//分班设置
-				// console.log("分班设置");
+				console.log("分班设置");
 				// console.log(this.$pollDetailTabForthRules);
 
 				const  result=this.$pollDetailTabForthRules.notUnifiedSettingCheck(this.state.rules);
@@ -559,11 +564,79 @@ class Trainingjobsetting extends Component {
 					return false;
 				}
 				let rulesdata = this.state.rulesdata;
+
 				if (rulesdata.length === 0) {
 					this.props.showNotification(`分班发布设置不能为空`);
 					return;
 				}
+
+
+
+
 			}
+		}else{
+			// console.log("分班设置");
+			 var mylate_times=false;
+			if (this.state.unifiedsetting === false) {
+				///非统一设置
+				let rulesdata = this.state.rulesdata;
+				//开启了补交
+				if(this.state.allowreplenishment===true){
+					//补交结束时间不为空
+					if(this.state.late_time){
+						// 分班设置数组不为空
+						if(rulesdata){
+							for(var i=0;i<rulesdata.length-1;i++){
+								let item=rulesdata[i];
+								if(item.end_time!=="Invalid date"){
+									let emdtimes=null;
+									try {
+										emdtimes=	moment(item.end_time, "YYYY-MM-DD HH:mm")
+									}catch (e) {
+
+									}
+									if(emdtimes){
+										if(moment(this.state.late_time, "YYYY-MM-DD HH:mm")  <= emdtimes){
+											mylate_times=true;
+											let kus=i+1;
+											this.setState({
+												hand__e_tip: "补交时间必须晚于发布规则" +kus+ "的截止时间",
+												hand_flags: true,
+												handclass: "bor-reds",
+											});
+											this.props.showNotification(`补交结束时间必须晚于截止时间`);
+											break;
+										}else{
+											mylate_times=false;
+											this.setState({
+												hand__e_tip: "",
+												hand_flags: false,
+												handclass: undefined,
+											})
+
+										}
+									}
+
+
+								}
+							}
+						}
+					}
+				}
+
+				if(mylate_times){
+					this.scrollToAnchor("late_timeids");
+					return
+				}
+
+			}else{
+				///统一设置
+
+
+			}
+
+
+
 		}
 
 
@@ -740,6 +813,7 @@ class Trainingjobsetting extends Component {
 				shixun_evaluation: this.state.proportion === "均分比例" ? 0 : this.state.proportion === "经验值比例" ? 1 : this.state.proportion === "自定义分值" ? 2 : 0,
 				challenge_settings: array,
 				score_open: this.state.publicwork,
+				answer_public:this.state.publicAnswer,
 				total_score:this.state.CalculateMax,
 				total_scoretwo:this.state.CalculateMax,//记录总分值点击取消的时候还原总分值
 
@@ -773,6 +847,7 @@ class Trainingjobsetting extends Component {
 				shixun_evaluation: this.state.proportion === "均分比例" ? 0 : this.state.proportion === "经验值比例" ? 1 : this.state.proportion === "自定义分值" ? 2 : 0,
 				challenge_settings: array,
 				score_open: this.state.publicwork,
+				answer_public:this.state.publicAnswer,
 				total_score:this.state.CalculateMax,
 				total_scoretwo:this.state.CalculateMax
 
@@ -785,22 +860,27 @@ class Trainingjobsetting extends Component {
 		// console.log(JSON.stringify(data));
 		axios.post(url, data)
 			.then((result) => {
-				if (result.data.status == 0) {
-					// console.log(JSON.stringify(result));
-					this.getTrainingjobsetting(true);
-					this.props.showNotification(`更新成功`);
-					this.setState({
-						flagPageEditsbox: false,
-						flagPageEdit: false,
-						flagPageEditstwo: false,
-						flagPageEditsthrees: false,
-						flagPageEditsfor: false,
-						whethertopay: false,
-						completionefficiencyscore: false,
-					})
-					this.refs.targetElementTrainingjobsetting.scrollIntoView()
+				if(result){
+					if(result.data){
+						if (result.data.status == 0) {
+							// console.log(JSON.stringify(result));
+							this.getTrainingjobsetting(true);
+							this.props.showNotification(`更新成功`);
+							this.setState({
+								flagPageEditsbox: false,
+								flagPageEdit: false,
+								flagPageEditstwo: false,
+								flagPageEditsthrees: false,
+								flagPageEditsfor: false,
+								whethertopay: false,
+								completionefficiencyscore: false,
+							})
+							this.refs.targetElementTrainingjobsetting.scrollIntoView()
+						}
+					}
 
 				}
+
 			}).catch((error) => {
 			console.log(error);
 		})
@@ -822,7 +902,12 @@ class Trainingjobsetting extends Component {
 		})
 		// console.log(e.target.checked);
 	}
-
+	//公开答案
+	onChangepublicAnswer = (e) => {
+		this.setState({
+			publicAnswer: e.target.checked,
+		})
+	}
 	//是否跳关设置
 	onChangedatasheet = (e, index) => {
 
@@ -1737,27 +1822,31 @@ class Trainingjobsetting extends Component {
 
 		axios.get(url).then((response) => {
 
-			if (response.status === 200) {
+			if (response.data) {
 				const dataformat = 'YYYY-MM-DD HH:mm';
 				let starttime = this.props.getNowFormatDates(1);
 				let endtime = this.props.getNowFormatDates(2);
+				let starttimesend=response.data.end_time === undefined || response.data.end_time === null || response.data.end_time === "" ? undefined : response.data.end_time;
+
 				this.setState({
 					modalname: "立即发布",
 					modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
-					OneSelftype: true,
 					Topval: "学生将立即收到作业",
 					// Botvalleft:"暂不发布",
 					Botval: `本操作只对"未发布"的作业有效`,
 					starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
 					starttimes: starttime,
-					starttimesend: response.data.end_time === undefined || response.data.end_time === null || response.data.end_time === "" ? undefined : response.data.end_time,
+					starttimesend:starttimesend,
 					typs: "start",
 					endtime: "截止时间：" + endtime,
 					Cancelname: "暂不发布",
 					Savesname: "立即发布",
 					Cancel: this.homeworkhide,
 					Saves: this.homeworkstartend,
-					course_groups: response.data.course_groups,
+					course_groups:response.data.course_groups,
+					immediatelyopen:true,
+					modallate_time:response.data.late_time,
+					OneSelftype: true,
 				})
 			}
 		}).catch((error) => {
@@ -1799,6 +1888,7 @@ class Trainingjobsetting extends Component {
 	}
 // 立即发布
 	homeworkstartend = (ds, endtime) => {
+		
 		var homeworkid = this.props.match.params.homeworkid;
 
 		let data = {}
@@ -1914,6 +2004,8 @@ class Trainingjobsetting extends Component {
 			typs: undefined,
 			starttimes: undefined,
 			starttimesend: undefined,
+			immediatelyopen:false,
+			modallate_time:undefined,
 		})
 	}
 	cancelBox = () => {
@@ -2401,6 +2493,8 @@ class Trainingjobsetting extends Component {
 					starttimes={this.state.starttimes}
 					starttimesend={this.state.starttimesend}
 					typs={this.state.typs}
+					immediatelyopen={this.state.immediatelyopen}
+					modallate_time={this.state.modallate_time}
 				/> : ""}
 
 				<Modals
@@ -2568,7 +2662,7 @@ class Trainingjobsetting extends Component {
 
 						</div>
 						{/*补交设置*/}
-						<div className="stud-class-set bor-bottom-greyE edu-back-white">
+						<div className="stud-class-set bor-bottom-greyE edu-back-white" id={"late_timeids"}>
 							<div className=" clearfix edu-back-white poll_list mt10">
 								<div className={"font-16 color-dark fl pl20 mt10 "} style={{color: "#05101A"}}>补交设置</div>
 							</div>
@@ -2651,7 +2745,7 @@ class Trainingjobsetting extends Component {
 									<p className="color-red lineh-25 clearfix ml70" style={{height: "25px"}}>
 										{
 											this.state.hand__e_tip && this.state.hand__e_tip != "" ?
-												<span className="fl">{this.state.hand__e_tip}</span> : ""
+												<span className="fl ml10">{this.state.hand__e_tip}</span> : ""
 										}
 									</p>
 								</div>
@@ -2885,13 +2979,18 @@ class Trainingjobsetting extends Component {
 							<div className=" clearfix edu-back-white poll_list mt20">
 								<div className={"font-16 color-dark fl pl20 "} style={{color: "#05101A"}}>公开设置</div>
 							</div>
-							<div className={"mb20 mt15"}>
+							<div className={"mb20 mt15 ml40"}>
 								<Checkbox disabled={!flagPageEdit} className="ml40 font-16" onChange={this.onChangepublicwork}
 													checked={this.state.publicwork} style={{color: "#666666"}}>公开成绩</Checkbox>
 								<span className="font-14 color-grey-c font-14 "
 											style={{textAlign: "left"}}>(选中，则在作业截止/补交结束时间之后，已提交作品的学生可以查看其它学生的成绩，否则只能查看自己的成绩)</span>
 							</div>
-
+							<div className={"mb20 mt15 ml40"}>
+								<Checkbox disabled={!flagPageEdit} className="ml40 font-16" onChange={this.onChangepublicAnswer}
+													checked={this.state.publicAnswer} style={{color: "#666666"}}>公开答案</Checkbox>
+								<span className="font-14 color-grey-c font-14 "
+											style={{textAlign: "left"}}>(选中，则学生可以查看实训参考答案，否则禁止查看答案)</span>
+							</div>
 						</div>
 
 					</div>
@@ -2920,75 +3019,3 @@ class Trainingjobsetting extends Component {
 }
 
 export default Trainingjobsetting;
-// <div className="stud-class-set bor-bottom-greyE ">
-//     <div className=" clearfix edu-back-white poll_list">
-//         <a onClick={(e)=>this.ChangeTab(0)}>作品列表</a>
-//         <a onClick={(e)=>this.ChangeTab(1)}>作业问答</a>
-//         {this.props.isAdmin()?this.state.code_review===true||jobsettingsdata === undefined ? [""] : jobsettingsdata.data.homework_status[0]==="未发布"?"": <a onClick={(e)=>this.ChangeTab(2)}>代码查重</a> : ""}
-//         <style>{
-//             `
-//                                     .poll_list a.active:after {
-//                                         content: '';
-//                                         width: 57px;
-//                                         left: 10px;
-//                                         bottom: 0px;
-//                                         height: 2px;
-//                                         background-color: #4CACFF;
-//                                         position: absolute;
-//                                         }
-//                                     `
-//         }</style>
-//         <a className="active"
-//            onClick={(e)=>this.ChangeTab(3)}
-//         >设置</a>
-//         <style>{`
-//                         .drop_down_menu li a {
-//                             padding: 0px;
-//                             font-size: 14px;
-//                         }
-//                         .drop_down_menu {
-//                             width: 93px;
-//                         }
-//                         .drop_down_menu li {
-//                             overflow: visible;
-//                             width: 93px;
-//                         }
-//                         .drop_down_menu, .drop_down_normal {
-//                             padding-top: 10px;
-//                             padding-bottom: 8px;
-//                         }
-//                         a:hover {
-//                         color:#1A0B00 !important;
-//                         }
-//                         `}</style>
-//         {this.props.isAdmin() ? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding": "0 20px"}}>
-//             导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
-//             <ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}>
-//                 <li><a onClick={()=>this.confirmysl(`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}`)}>实训报告</a>
-//                 </li>
-//                 <li><a onClick={()=>this.confirmysl(`/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx`)}>学生成绩</a>
-//                 </li>
-//             </ul>
-//         </li>: ""}
-//         {this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.end_immediately===true?
-//           <a className="fr color-blue font-16" onClick={this.homeworkends}>立即截止</a>
-//           :  "": ""}
-//         {this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.publish_immediately===true?
-//           <a className="fr color-blue font-16" onClick={this.homeworkstart}>立即发布</a>: "" : ""}
-//         {this.props.isAdmin()?
-//           jobsettingsdata&&jobsettingsdata.data.code_review===true?
-//             <a className="fr color-blue font-16"  onClick={this.workshowmodel}>代码查重</a>: "":""}
-//         {
-//             jobsettingsdata&&	jobsettingsdata&&jobsettingsdata.data === undefined ? ""
-//               : 	jobsettingsdata&&	jobsettingsdata.data.commit_des === null || 	jobsettingsdata&&	jobsettingsdata.data.commit_des === undefined ? "" :
-//               <a className="fr color-blue font-16"
-//                  href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${	jobsettingsdata&&	jobsettingsdata.data === undefined ? "" :	jobsettingsdata&&	 jobsettingsdata.data.id}/commitsummary/${this.state.props.match.params.homeworkid}`}>{	jobsettingsdata&&	jobsettingsdata.data.commit_des}</a>
-//         }
-//         {    jobsettingsdata&&jobsettingsdata.data === undefined ? "" : <Startshixuntask
-//           {...this.props}
-//           data={	jobsettingsdata&&	jobsettingsdata.data}
-//         />}
-{/*    </div>*/
-}
-{/*</div>*/
-}
diff --git a/src/modules/courses/shixunHomework/Workquestionandanswer.js b/src/modules/courses/shixunHomework/Workquestionandanswer.js
index 20400081..b3ab3697 100644
--- a/src/modules/courses/shixunHomework/Workquestionandanswer.js
+++ b/src/modules/courses/shixunHomework/Workquestionandanswer.js
@@ -159,14 +159,15 @@ class Workquestionandanswer extends Component {
 
 		axios.get(url).then((response) => {
 
-			if (response.status === 200) {
+			if (response.data) {
 				const dataformat = 'YYYY-MM-DD HH:mm';
 				let starttime = this.props.getNowFormatDates(1);
 				let endtime = this.props.getNowFormatDates(2);
+				let starttimesend=response.data.end_time === undefined || response.data.end_time === null || response.data.end_time === "" ? undefined : response.data.end_time;
+
 				this.setState({
 					modalname: "立即发布",
 					modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
-					OneSelftype: true,
 					Topval: "学生将立即收到作业",
 					// Botvalleft:"暂不发布",
 					Botval: `本操作只对"未发布"的作业有效`,
@@ -178,8 +179,9 @@ class Workquestionandanswer extends Component {
 					Saves: this.homeworkstartend,
 					course_groups: response.data.course_groups,
 					starttimes: starttime,
-					starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time,
+					starttimesend:starttimesend,
 					typs: "start",
+					OneSelftype: true,
 				})
 			}
 		}).catch((error) => {
@@ -616,7 +618,7 @@ export default Workquestionandanswer;
 {/*		{this.props.isAdmin() ?*/}
 {/*			this.state.code_review === true || jobsettingsdata === undefined ? [""] : jobsettingsdata.data.homework_status[0] === "未发布" ? "" :*/}
 {/*				<a*/}
-{/*					// to={`/courses/${this.state.props.match.params.coursesId}/${this.state.props.match.params.homeworkid}/student_work`}*/}
+{/*					// to={`/classrooms/${this.state.props.match.params.coursesId}/${this.state.props.match.params.homeworkid}/student_work`}*/}
 {/*					onClick={(e)=>this.ChangeTab(2)}>*/}
 {/*					代码查重</a> : ""}*/}
 
@@ -672,11 +674,11 @@ export default Workquestionandanswer;
 {/*			jobsettingsdata&&	jobsettingsdata.data === undefined ? ""*/}
 {/*				: 	jobsettingsdata&&	jobsettingsdata.data.commit_des === null || 	jobsettingsdata&&	jobsettingsdata.data.commit_des === undefined ? "" :*/}
 {/*				<a className="fr color-blue font-16"*/}
-{/*					 href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${	jobsettingsdata&&	jobsettingsdata.data === undefined ? "" : 	jobsettingsdata&&	jobsettingsdata.data.id}/commitsummary/${this.state.props.match.params.homeworkid}`}>{	jobsettingsdata&&	jobsettingsdata.data.commit_des}</a>*/}
+{/*					 href={`/classrooms/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${	jobsettingsdata&&	jobsettingsdata.data === undefined ? "" : 	jobsettingsdata&&	jobsettingsdata.data.id}/commitsummary/${this.state.props.match.params.homeworkid}`}>{	jobsettingsdata&&	jobsettingsdata.data.commit_des}</a>*/}
 {/*		}*/}
 {/*		{    jobsettingsdata&&jobsettingsdata.data === undefined ? "" : <Startshixuntask*/}
 {/*			{...this.props}*/}
 {/*			data={	jobsettingsdata&&	jobsettingsdata.data}*/}
 {/*		/>}*/}
 {/*	</div>*/}
-{/*</div>*/}
\ No newline at end of file
+{/*</div>*/}
diff --git a/src/modules/courses/shixunHomework/shixunHomework.js b/src/modules/courses/shixunHomework/shixunHomework.js
index d4a2d7b8..55a62b71 100644
--- a/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/src/modules/courses/shixunHomework/shixunHomework.js
@@ -58,6 +58,7 @@ class ShixunHomework extends Component{
     }
   }
 	updateNavSuccess=()=>{
+    
 		this.setState({
 			isSpin:true
 		})
@@ -111,7 +112,7 @@ class ShixunHomework extends Component{
 				this.updadatalist()
 			}
 		}
-		on('updateNavSuccess', this.updateNavSuccess)
+		on('shixun', this.updateNavSuccess)
   }
   seactall=(id)=>{
    this.setState({
@@ -146,27 +147,31 @@ class ShixunHomework extends Component{
 
   componentDidUpdate = (prevProps) => {
 
-    if(prevProps.match.params.main_id != this.props.match.params.main_id){
-      if(this.props.match.params.main_id!=undefined){
-      	this.setState({
-					checkedtype:false,
-					orders:"8",
-					order:undefined,
-					page:1
-				})
-        this.seactall();
+    if(prevProps.coursesidtype!=this.props.coursesidtype||prevProps.match.params.category_id!=this.props.match.params.category_id&&this.props.coursesidtype!="node") {
+
+      if(this.props.match.params.main_id){
+        if(this.props.match.params.main_id!=undefined){
+          this.setState({
+            checkedtype:false,
+            orders:"8",
+            order:undefined,
+            page:1
+          })
+          this.seactall();
+        }
       }
-    }
-    if(prevProps.match.params.category_id != this.props.match.params.category_id){
-      if(this.props.match.params.category_id!=undefined){
-				this.setState({
-					checkedtype:false,
-					orders:"8",
-					order:undefined,
-					page:1
-				})
-        this.seactall(parseInt(this.props.match.params.category_id))
+      if(this.props.match.params.category_id){
+        if(this.props.match.params.category_id!=undefined){
+          this.setState({
+            checkedtype:false,
+            orders:"8",
+            order:undefined,
+            page:1
+          })
+          this.seactall(parseInt(this.props.match.params.category_id))
+        }
       }
+
     }
 
   }
@@ -632,18 +637,26 @@ class ShixunHomework extends Component{
   // }
 
   PaginationCourse=(pageNumber)=>{
-    let {Coursename,order}=this.state;
-
-    this.setState({
-      page:pageNumber,
-			checkBoxValues:[]
-    })
+    let {Coursename,order,checkedtype}=this.state;
+     if(checkedtype===true){
+       this.setState({
+         page:pageNumber,
+         checkBoxValues:[],
+         checkedtype:false
+       })
+     }else{
+       this.setState({
+         page:pageNumber,
+         checkBoxValues:[],
+       })
+     }
 
     this.homeworkupdatalist(Coursename,pageNumber,order);
 
   }
 
   SearchCoursenames=(e)=>{
+    console.log("iii",e);
     this.setState({
       Coursename:e.target.value,
     })
@@ -652,7 +665,7 @@ class ShixunHomework extends Component{
 
 
   SearchCoursename=(value)=>{
-
+    console.log(value);
     let {page,order}=this.state;
     this.setState({
       Coursename:value,
@@ -718,7 +731,7 @@ class ShixunHomework extends Component{
   }
 
   onCheckBoxChange=(checkedValues)=>{
-     // debugger
+     
     let {checkBoxValues,tasks} =this.state;
 
     console.log(checkBoxValues)
@@ -870,7 +883,7 @@ class ShixunHomework extends Component{
       Modalstype:false,
     })
     let category_id=this.props.match.params.category_id;
-    
+
     const cid = this.props.match.params.coursesId;
     let url="/courses/"+cid+"/homework_commons/set_public.json";
     axios.post(url, {
@@ -974,7 +987,7 @@ class ShixunHomework extends Component{
   gotohome=()=>{
     let courseId=this.props.match.params.coursesId;
     if(courseId===undefined){
-      this.props.history.push("/courses");
+      this.props.history.push("/classrooms");
     }else{
       this.props.history.push(this.props.current_user.first_category_url);
     }
@@ -1126,7 +1139,7 @@ class ShixunHomework extends Component{
             {
               `
               body {
-							  overflow: hidden !important;
+							    width: calc(100%) !important;
 							}
               `
             }
@@ -1176,10 +1189,10 @@ class ShixunHomework extends Component{
 								</span>}
 							</span>
               <li className="fr">
-								{datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdminOrCreator()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
+								{datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
 									<span>
                     <WordsBtn style="blue" className={"mr30 font-16"}>
-											<Link className="color4CACFF" to={`/courses/${this.props.match.params.coursesId}/ordering/shixun_homework/${main_id&&main_id}`}>调整排序</Link>
+											<Link className="color4CACFF" to={`/classrooms/${this.props.match.params.coursesId}/ordering/shixun_homework/${main_id&&main_id}`}>调整排序</Link>
                     </WordsBtn>
                   </span>:"":"":""}
 
@@ -1244,7 +1257,7 @@ class ShixunHomework extends Component{
                 </li>
                 <li className="li_line drop_down"  onMouseEnter={this.updadatalist}>
                   {/*onClick={()=>this.selectBlank(4)}*/}
-                  移动到...<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                  移动到目录<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                 <ul className="drop_down_menu"  style={{"right":"0px","left":"unset", maxHeight: '318px', overflowY: 'auto',  minWidth: '200px'}}>
                   { course_modules&&course_modules.homework_category.length > 10 && <p className="drop_down_search">
                     <Input placeholder="搜索" value={this.state.dirSearchValue} onChange={(e) => {this.setState({dirSearchValue: e.target.value})}}/>
diff --git a/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js b/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
index a156d8d0..0cfb3381 100644
--- a/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
+++ b/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
@@ -1,9 +1,7 @@
 import React, {Component} from "react";
-import {WordsBtn} from 'educoder';
-import {Table, InputNumber, Tooltip} from "antd";
-import {Link, Switch, Route, Redirect} from 'react-router-dom';
+import {Table, InputNumber, Tooltip,Badge} from "antd";
 import axios from 'axios';
-
+import './Shixunbage.css';
 class OfficialAcademicTranscript extends Component {
 
 	constructor(props) {
@@ -116,14 +114,15 @@ class OfficialAcademicTranscript extends Component {
 			className: "TaskForms",
 			render: (text, record) => (
 				<span>
-					<span className={"task-hide linhe15"} style={{color: "#676767"}}><a className="tasknameName font-14"
-																																							onClick={() => this.myjumptopic("id" + record.customs)}
-																																							title={record.taskname.name.length > 15 ? record.taskname.name : ""}>
-						{record.taskname.name}
-					</a>
-						{record.taskname.complete_status === 2 ?
-							<span className={"tasknamebox ml10"}>延时</span> : record.taskname.complete_status === 3 ?
-								<span className={"tasknameboxs ml10"}>延时</span> : ""}
+					<span className={"task-hide"} style={{color: "#676767"}}>
+						<a className="relative font-14"	onClick={() => this.myjumptopic("id" + record.customs)}
+								title={record.taskname.name.length > 15 ? record.taskname.name : ""}>
+					    	<span className={"tasknameName fl mr5"}>{record.taskname.name}</span>
+
+							{record.taskname.complete_status === 2 ?
+								<Badge count={"延时"} className="site-badge-red fl pdt3" /> : record.taskname.complete_status === 3 ?
+									<Badge count={"无效"} className="site-badge-white fl pdt3" />: ""}
+					  </a>
 					</span>
         </span>
 			),
@@ -305,10 +304,11 @@ class OfficialAcademicTranscript extends Component {
 					.tasknameName:link{color:#676767}
 					.tasknameName:hover{color:#4CACFF}
 					.tasknameName{
-					     overflow: hidden;
+								display: inline-block;
+					      overflow: hidden;
 								text-overflow: ellipsis;
 								white-space: nowrap;
-				        max-width: 225px;
+				        max-width: 200px;
 						    text-align: left !important;
 					}
 					.TaskForms{
@@ -331,6 +331,9 @@ class OfficialAcademicTranscript extends Component {
 					.mr22{
 					    margin-right: 22px;
 					}
+					.pdt3{
+					 padding-top:3px;
+					}
 			`}
 				</style>
 				{datas === undefined ? "" : <Table
diff --git a/src/modules/courses/shixunHomework/shixunreport/Shixunbage.css b/src/modules/courses/shixunHomework/shixunreport/Shixunbage.css
new file mode 100644
index 00000000..084dc435
--- /dev/null
+++ b/src/modules/courses/shixunHomework/shixunreport/Shixunbage.css
@@ -0,0 +1,15 @@
+.site-badge-red .ant-badge-count {
+    background-color: #FC2B6A;
+    color: #fff;
+    /*box-shadow: 0 0 0 1px #d9d9d9 inset;*/
+}
+
+.site-badge-white .ant-badge-count {
+    background-color: #EDEDED;
+    color: #666666;
+    /*box-shadow: 0 0 0 1px #d9d9d9 inset;*/
+}
+
+.relative{
+    position: relative;
+}
\ No newline at end of file
diff --git a/src/modules/courses/signin/Signinstatistics/Signinstatistics.js b/src/modules/courses/signin/Signinstatistics/Signinstatistics.js
new file mode 100644
index 00000000..e5aac499
--- /dev/null
+++ b/src/modules/courses/signin/Signinstatistics/Signinstatistics.js
@@ -0,0 +1,296 @@
+import "../css/Signinstatistics.css";
+import React,{ Component } from "react";
+import { Row, Col,Card,Select} from 'antd';
+import {getImageUrl} from 'educoder';
+import axios from 'axios';
+import NoneDatas from "../component/NoneDatas";
+import {
+  Chart,
+  Geom,
+  Axis,
+  Tooltip,
+} from "bizcharts";
+import LoadingSpin from "../../../../common/LoadingSpin";
+const { Option } = Select;
+
+class Signinstatistics extends Component {
+  constructor(props) {
+    super(props)
+    this.state={
+      datas:null,
+      newlist:undefined,
+      course_groups:[{id:"全部",name:"全部"}],
+			spal:false,
+    }
+  }
+  getdata=(group_id)=>{
+
+    const coursesId=this.props.match.params.coursesId;
+    let url=`/weapps/courses/${coursesId}/attendances.json`
+    axios.get(url,{params:{
+        group_id:group_id==="全部"?undefined:group_id
+    }
+    }).then((response) => {
+
+      if(response){
+        if(response.data){
+          let newlists=[]
+
+          if(response.data.history_attendances.length>0){
+            response.data.history_attendances.map((item,key)=>{
+              newlists.push({
+                month: item.index,
+                name: item.name+" "+item.attendance_date+" "+item.start_time+"-"+item.end_time,
+                // month:item.name,
+                city:"到课率",
+                temperature: (item.normal_rate*100).toFixed(0)
+              })
+              newlists.push({
+                month: item.index,
+                name: item.name+" "+item.attendance_date+" "+item.start_time+"-"+item.end_time,
+                // month:item.name,
+                city: "旷课率",
+                temperature: (item.absence_rate*100).toFixed(0)
+              })
+              newlists.push({
+                month: item.index,
+                name: item.name+" "+item.attendance_date+" "+item.start_time+"-"+item.end_time,
+                // month:item.name,
+                city: "请假率",
+                temperature: (item.leave_rate*100).toFixed(0)
+              })
+            })
+          }
+
+          this.setState({
+            datas:response.data,
+            newlist:newlists
+          })
+
+
+        }
+      }
+			this.setState({
+				spal:false
+			})
+    }).catch((error) => {
+			this.setState({
+				spal:false
+			})
+
+		})
+  }
+
+  componentDidMount() {
+    this.setState({
+      spal:true
+    })
+    const coursesId=this.props.match.params.coursesId;
+    let newurl=`/courses/${coursesId}/all_course_groups.json`;
+    axios.get(newurl).then((response) => {
+      let newlist=this.state.course_groups;
+      response.data.course_groups.map((item,key)=>{
+        newlist.push(item)
+      })
+      this.setState({
+        course_groups:newlist
+      })
+    })
+
+    this.getdata()
+  }
+
+  handleChange=(value)=>{
+    this.getdata(value)
+  }
+
+  render() {
+    let {datas,newlist,course_groups,spal}=this.state;
+
+    const cols = {
+      month: {
+        type: 'pow',
+        // nice: true,
+        exponent:1,
+        // minLimit:1,
+        // tickInterval:1,
+        // minTickInterval:2
+      },
+      temperature:{
+        type: 'linear',
+        nice:[0,100],
+        minTickInterval:2
+      }
+    };
+
+
+    return(
+      <React.Fragment >
+				<div>
+					{
+						spal===true?
+							<div style={{
+								minHeight:"500px",
+							}}>
+								<LoadingSpin></LoadingSpin>
+							</div>
+
+							:
+							<div>
+
+								<Row type="flex" justify="space-between" className={"mt20"}>
+									<style>
+										{
+											`
+              .lishiqiandao{
+                background-image: url(${getImageUrl(`images/qiandao/lishi.png`)});
+              }
+                  .daokeqiandao{
+                background-image: url(${getImageUrl(`images/qiandao/daoke.png`)});
+              }
+                  .kuangkeqiandao{
+                background-image: url(${getImageUrl(`images/qiandao/kuangke.png`)});
+              }
+                  .qingjiaqiandao{
+                background-image: url(${getImageUrl(`images/qiandao/qingjia.png`)});
+              }
+              `
+										}
+									</style>
+									<Col span={6}>
+										<Card style={{ width: 209 }} className={"gutterrowbox lishiqiandao"}>
+											<div className={"gutterrowboxcontent ml5"}>{datas&&datas.all_history_count}</div>
+										</Card>
+									</Col>
+									<Col span={6}>
+										<Card style={{ width: 209 }} className={"ml8 gutterrowbox daokeqiandao"}>
+											<div className={"gutterrowboxcontent ml5"}>{datas?(datas&&datas.avg_normal_rate*100).toFixed(0)+"%":""}</div>
+										</Card>
+									</Col>
+									<Col span={6}>
+										<Card style={{ width: 209 }} className={"ml14 gutterrowbox kuangkeqiandao"}>
+											<div className={"gutterrowboxcontent ml5"}>{datas?(datas&&datas.avg_absence_rate*100).toFixed(0)+"%":""}</div>
+										</Card>
+									</Col>
+									<Col span={6} >
+										<Card style={{ width: 209 }}  className={"ml20 gutterrowbox qingjiaqiandao"}>
+											<div className={"gutterrowboxcontent ml5"}>{datas?(datas&&datas.avg_leave_rate*100).toFixed(0)+"%":""}</div>
+										</Card>
+									</Col>
+								</Row>
+
+                {newlist&&newlist.length>0?<div className={"SigninstatisticsChart mt20"}>
+									<div className={"pd30"}>
+										<Row>
+											<Col span={14}>
+												<Row type="flex" justify="start">
+													<Col span={5}>
+														<Row>
+															<Col span={12} className={"mindaoke mr5"}></Col>
+															<Col>到课率</Col>
+														</Row>
+													</Col>
+													<Col span={5}>
+														<Row>
+															<Col span={12} className={"minkuangke mr5"}></Col>
+															<Col>旷课率</Col>
+														</Row>
+													</Col>
+													<Col span={5}>
+														<Row>
+															<Col span={12} className={"minqingjia mr5"}></Col>
+															<Col>请假率</Col>
+														</Row>
+													</Col>
+												</Row>
+											</Col>
+											<Col span={10}><Row type="flex" justify="end">
+												<Col span={8} className={"Signinstatisticsfont"}>显示最近十次签到</Col>
+												<Col span={10}>
+													<Select  defaultValue={"全部"} onChange={(e)=>this.handleChange(e)} style={{width:"130px"}} className={"Signinstatisticsfontselect"}>
+														{course_groups&&course_groups.map((item,key)=>{
+															return(
+																<Option value={item.id} title={item.name} >{item.name}</Option>
+															)
+														})}
+													</Select>
+												</Col>
+											</Row></Col>
+										</Row>
+									</div>
+
+									<div className={"padding03000"}>
+                   <Chart height={400} data={newlist} scale={cols} forceFit>
+											{/*<Legend />*/}
+											<Axis name="month" />
+											<Axis
+												name="temperature"
+												label={{
+													formatter: val => `${val}%`
+												}}
+											/>
+											<Tooltip
+												crosshairs={{
+													type: "y"
+												}}
+											/>
+											<Geom
+												type="line"
+												position="month*temperature"
+												size={2}
+												// color={"city"}
+												shape={"smooth"}
+												color={["city", ["#26C7C9", "#FF835C","#EDBA6F"]]}
+                        tooltip={['name*temperature*city', (name, temperature,city) => {
+                          return {
+                            //自定义 tooltip 上显示的 title 显示内容等。
+                            name: city,
+                            title: name,
+                            value: temperature+"%"
+                          };
+                        }]}
+											/>
+											<Geom
+												type="point"
+												position="month*temperature"
+												size={4}
+												shape={"circle"}
+												color={["city", ["#26C7C9", "#FF835C","#EDBA6F"]]}
+												style={{
+													stroke: "#fff",
+													lineWidth: 1
+												}}
+                        // tooltip={['month*sold', (month, temperature) => {
+                        //   return {
+                        //     //自定义 tooltip 上显示的 title 显示内容等。
+                        //     name: 'sold1',
+                        //     title: 'dddd' + month,
+                        //     value: temperature
+                        //   };
+                        // }]}
+											/>
+										</Chart>
+									</div>
+
+								</div>:<div style={{
+                  minHeight:"400px",
+                }}>
+                  <NoneDatas></NoneDatas>
+                </div>}
+							</div>
+					}
+				</div>
+
+      </React.Fragment>
+
+    )
+  }
+
+}
+
+
+
+
+
+
+export default Signinstatistics;
diff --git a/src/modules/courses/signin/component/Detailss.js b/src/modules/courses/signin/component/Detailss.js
new file mode 100644
index 00000000..b6b92b1a
--- /dev/null
+++ b/src/modules/courses/signin/component/Detailss.js
@@ -0,0 +1,203 @@
+import React, {Component} from "react";
+import '../css/signincdi.css';
+import {Progress, message} from 'antd';
+import QRCode from 'qrcode.react';
+import axios from 'axios';
+
+function clearSlct() {
+	if ("getSelection" in window) {
+		window.getSelection().removeAllRanges();
+	} else {
+		document.selection.empty();
+	}
+	;
+}
+
+function jsCopy(s) {
+	clearSlct();
+	const copyEle = document.getElementById(s);
+	copyEle.select();
+	const copyStatus = document.execCommand("Copy");
+	// 对成功与否定进行提示
+	copyStatuss(copyStatus)
+}
+
+function copyStatuss(copyStatus) {
+	if (copyStatus) {
+		message.success('复制成功');
+	} else {
+		message.error('复制失败');
+	}
+}
+
+//条目
+class Detailss extends Component {
+	//条目组件
+	constructor(props) {
+		super(props);
+
+		this.state = {}
+	}
+
+	componentDidMount() {
+
+	}
+
+	componentDidUpdate = (prevProps) => {
+
+
+	}
+
+
+	render() {
+		const isAdmin = this.props.isAdmin();
+		let item = this.props.headdata;
+		let defaultActiveKey = this.props.defaultActiveKey;
+		let jdt;
+		try {
+			jdt = item.normal_count / item.all_count * 100;
+		} catch (e) {
+			jdt = 100;
+		}
+		return (
+			<React.Fragment>
+				<div className="ws100s edu-back-white sortinxdirection" style={{
+					position: "relative"
+				}}>
+					<div className="ws100s teacherentrydiv ">
+						<div className="ws100s sortinxdirection">
+							<p className="sortinxdirection"  onClick={()=>this.props.qiandaoxiangq(false)}>
+								<i style={{color:'#BBBBBB'}} className="iconfont icon-zuojiantou1  posiivsiconmyss mr5 colorbluesigin xiaoshou font-14" onClick={()=>this.props.qiandaoxiangq(false)}></i>
+							</p>
+							<p className="ws100s teachedivp ymaxnamewidthdivp86">
+								{item && item.name}
+							</p>
+						</div>
+
+
+						<div className="ws100s sortinxdirection mt17">
+							<div className="teachedivps">
+								签到人数：
+							</div>
+							<div className="progressivps">
+								<Progress percent={jdt} showInfo={false} strokeColor="#1890ff"/>
+							</div>
+							<div className="progressivpss h28s">
+								已签到 {item && item.normal_count ? item.normal_count : 0} /
+								应签到 {item && item.all_count ? item.all_count : 0}
+							</div>
+						</div>
+
+
+						<div className="ws100s sortinxdirection  mt5">
+							<div className="ws75s sortinxdirection">
+
+
+								<div className="teachedivps  h40s">
+									签到发起人：
+								</div>
+								<div className="teachedivpsy ymaxnamewidth60 h40s">
+									{item && item.author.user_name}
+								</div>
+
+								<div className="teachedivps ml20 h40s">
+									签到方式：
+								</div>
+								<div className="teachedivpsy ymaxnamewidth80 h40s">
+									{item && item.mode ?
+										item.mode === "QRCODE" ?
+											"二维码签到"
+											: item.mode === "NUMBER" ?
+											"数字签到"
+											: item.mode === "QUICK" ?
+												"快捷签到"
+												: ""
+										: ""}
+								</div>
+
+								<div className="teachedivps ml20 h40s">
+									开始结束时间：
+								</div>
+								<div className="teachedivpsy h40s">
+									{item && item.attendance_date} {item && item.start_time}-{item && item.end_time}
+								</div>
+							</div>
+							{
+								defaultActiveKey === "1" ?
+									<div className="ws25s" style={item && item.mode === "NUMBER"?{
+										position: "relative",
+										overflow: 'hidden',
+									}:{
+										position: "relative",
+									}}>
+										{
+											item && item.mode === "NUMBER" ?
+												<div className="ws100s xaxisreverseorder ">
+													<p className="h40s font-16 xiaoshou" style={{
+														color: "#1890FF"
+													}} onClick={() => {
+														jsCopy("file_path" + 1)
+													}}>
+														复制签到码
+													</p>
+													<p className="h40s  font-16" style={{
+														color: "#333333",
+														marginRight: "10px",
+													}}>
+														{item&&item.code}
+													</p>
+													<p className="h40s  font-16" style={{
+														color: "#909399"
+													}}>签到码：</p>
+													<div style={{
+														overflow: 'hidden',
+														height: "1px",
+														width: "1px",
+														position: "absolute",
+														right: "-200px",
+													}}>
+														<input id={"file_path" + 1} className="file_path_input" value={item&&item.code}/>
+													</div>
+												</div>
+												:
+												item && item.mode === "QRCODE" ?
+													<div style={{
+														position: "absolute",
+														bottom: "-11px",
+														right: "0px",
+													}}>
+														<QRCode
+															value={item&&item.code}  //value参数为生成二维码的链接
+															size={84} //二维码的宽高尺寸
+															fgColor="#000000"  //二维码的颜色
+														/>
+														<div className="font-14" style={{
+															width: "84px",
+															textAlign: "center",
+															color: "#333333"
+														}}>
+															扫码签到
+														</div>
+													</div>
+
+													: ""
+										}
+
+
+									</div>
+
+									:
+									""
+							}
+
+						</div>
+					</div>
+
+				</div>
+
+			</React.Fragment>
+		)
+	}
+}
+
+export default Detailss;
diff --git a/src/modules/courses/signin/component/NoneDatas.js b/src/modules/courses/signin/component/NoneDatas.js
new file mode 100644
index 00000000..c36cc29d
--- /dev/null
+++ b/src/modules/courses/signin/component/NoneDatas.js
@@ -0,0 +1,36 @@
+import React, { Component } from 'react';
+import { getImageUrl , getUrl } from 'educoder';
+
+class NoneDatas extends Component{
+	constructor(props) {
+		super(props)
+	}
+	render(){
+		const { style } = this.props;
+		return(
+			<div className="edu-tab-con-box clearfix edu-txt-center intermediatecenter" style={ style || { width:"100%",height:"100%"}}>
+				<style>
+					{`
+            .edu-tab-con-box{
+              padding:100px 0px;
+            }
+            .ant-modal-body .edu-tab-con-box{
+              padding:0px!important;
+            }
+            img.edu-nodata-img{
+              margin: 40px auto 20px;
+            }
+            .zenwuxgsj{
+						font-size:17px;
+						font-family:MicrosoftYaHei;
+						color:rgba(136,136,136,1);
+            }
+          `}
+				</style>
+				<img className="edu-nodata-img mb20" src={getUrl("/images/educoder/nodata.png")}/>
+				<p className="edu-nodata-p mb10  zenwuxgsj">暂无相关数据</p>
+			</div>
+		)
+	}
+}
+export default NoneDatas;
diff --git a/src/modules/courses/signin/component/Teacherentry.js b/src/modules/courses/signin/component/Teacherentry.js
new file mode 100644
index 00000000..94401e75
--- /dev/null
+++ b/src/modules/courses/signin/component/Teacherentry.js
@@ -0,0 +1,227 @@
+import React, {Component} from "react";
+import '../css/signincdi.css';
+import {Progress} from 'antd';
+import axios from 'axios';
+import Createsignmodel from '../model/Createsignmodel';
+//条目
+class Teacherentry extends Component {
+	//条目组件
+	constructor(props) {
+		super(props);
+
+		this.state = {
+				editvisible:false,
+			  attendancesid:null
+		}
+	}
+
+	componentDidMount() {
+
+	}
+
+	componentDidUpdate = (prevProps) => {
+
+
+	}
+
+  getdatalist=(id)=>{
+		let urls = `/attendances/${id}/edit.json`;
+		axios.get(urls).then((response) => {
+			//console.log(response);
+			if(response){
+				if(response.data){
+					this.setState({
+						editvisible:true,
+						attendancesdata:response.data,
+						attendancesid:id
+					})
+				}
+			}
+
+		}).catch((error) => {
+			console.log(error);
+		})
+	}
+
+	hideCreatesign=()=>{
+		this.setState({
+			editvisible:false
+		})
+	}
+	render() {
+		let isAdmin = this.props.isAdmin();
+		let item = this.props.item;
+		let index =this.props.index;
+		let jdt;
+		try {
+			jdt = item.normal_count / item.all_count * 100;
+		} catch (e) {
+			jdt = 100;
+		}
+
+		return (
+			<React.Fragment>
+				<div className={index===0?"ws100s edu-back-white xiaoshou": "ws100s edu-back-white mt20 xiaoshou"}>
+					{/*修改实训*/}
+					{this.state.editvisible===true?<Createsignmodel
+						{...this.state}
+						{...this.props}
+						hideCreatesign={()=>this.hideCreatesign()}
+						settabsdata={()=>this.props.getsetdatas()}
+						type={"edit"}
+					/>:""}
+					<div className="ws100s teacherentrydiv" onClick={isAdmin?(e)=>{e.stopPropagation();this.props.qiandaoxiangq(true,item.id)}:""}>
+						<p className={isAdmin?"ws100s teachedivp ymaxnamewidthdivp xiaoshou color-blue":"ws100s teachedivp ymaxnamewidthdivp"} >
+							{
+								item.name
+							}
+
+						</p>
+
+						<div className="ws100s sortinxdirection mt17">
+							<div className="teachedivps">
+								签到人数：
+							</div>
+							<div className="progressivps">
+								<Progress percent={jdt} showInfo={false} strokeColor="#1890ff"/>
+							</div>
+							<div className="progressivpss">
+								已签到 {item.normal_count ? item.normal_count : 0} / 应签到 {item.all_count ? item.all_count : 0}
+							</div>
+						</div>
+
+
+						<div className="ws100s sortinxdirection  mt5">
+							<div className="ws80s sortinxdirection">
+
+
+								<div className="teachedivps  h40s">
+									签到发起人：
+								</div>
+								<div className="teachedivpsy ymaxnamewidth60 h40s">
+									{item.author.user_name}
+								</div>
+
+								<div className="teachedivps ml20 h40s">
+									签到方式：
+								</div>
+								<div className="teachedivpsy ymaxnamewidth80 h40s">
+									{item.mode ?
+										item.mode === "QRCODE" ?
+											"二维码签到"
+											: item.mode === "NUMBER" ?
+											"数字签到"
+											: item.mode === "QUICK" ?
+												"快捷签到"
+												: ""
+										: ""}
+								</div>
+
+								<div className="teachedivps ml20 h40s">
+									开始结束时间：
+								</div>
+								<div className="teachedivpsy h40s">
+									{item.attendance_date} {item.start_time}-{item.end_time}
+								</div>
+							</div>
+
+							<style>
+								{
+									`
+									.initials{
+									cursor: initial !important;
+									}
+									`
+								}
+							</style>
+							<div className="ws20s sortinxdirection">
+								{
+									isAdmin === true ?
+										this.props.defaultActiveKey === "1" ?
+											<div className="ws100s xaxisreverseorder">
+												<div className="jiezhis h40s xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.thisEnd(item.id)}}>截止</div>
+												<div className="shanchu h40s xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.thisdelete(item.id)}}>删除</div>
+												<div className="shanchu h40s color-blue" onClick={(e)=>{e.stopPropagation();this.getdatalist(item.id)}}>编辑</div>
+											</div>
+											:
+											(
+												//是否有编辑权限
+												item.edit_auth === true ?
+													<div className="ws100s xaxisreverseorder">
+														<div className="shanchu h40s xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.thisdelete(item.id)}}>删除</div>
+														<div className="shanchu h40s color-blue" onClick={(e)=>{e.stopPropagation();this.getdatalist(item.id,true,item.name)}}>编辑</div>
+													</div>
+													:
+													<div className="ws100s xaxisreverseorder">
+														<div className="jiezhis h40s color-reds xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.thisdelete(item.id)}}>删除</div>
+													</div>
+											)
+										:
+										(
+											this.props.defaultActiveKey === "1" ?
+												<div className="ws100s xaxisreverseorder">
+													{
+														item.attendance_status?
+															(
+																item.attendance_status==="ABSENCE"&&item.attendance_mode!="TEACHER"?
+																	<div className="qiandaobutton xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.Signin(item.mode,item.id,item.attendance_code)}}>
+																		签到
+																	</div>
+																	: item.attendance_status === "LEAVE" ?
+																	<div className="qjqiandao initials">
+																		请假
+																	</div>
+																	: item.attendance_status==="NORMAL"?
+																		<div className="zcqiandao initials">
+																			正常签到
+																		</div>
+																		:item.attendance_status==="ABSENCE"&&item.attendance_mode==="TEACHER"?<div className="kkqiandao initials">
+																			旷课
+																		</div>:""
+															)
+												    :
+															""
+													}
+
+												</div>
+												:
+												<div className="ws100s xaxisreverseorder">
+													{
+														item.attendance_status?
+															item.attendance_status === "NORMAL" ?
+																<div className="zcqiandao initials">
+																	正常签到
+																</div>
+																: item.attendance_status === "LEAVE" ?
+																<div className="qjqiandao initials">
+																	请假
+																</div>
+																: item.attendance_status === "ABSENCE" ?
+																	<div className="kkqiandao initials">
+																		旷课
+																	</div>
+																	:
+																	""
+															:
+															""
+													}
+
+
+
+
+												</div>
+										)
+
+								}
+							</div>
+
+						</div>
+					</div>
+				</div>
+
+			</React.Fragment>
+		)
+	}
+}
+
+export default Teacherentry;
diff --git a/src/modules/courses/signin/component/teachercomponent/Histeacomponent.js b/src/modules/courses/signin/component/teachercomponent/Histeacomponent.js
new file mode 100644
index 00000000..c5b2062f
--- /dev/null
+++ b/src/modules/courses/signin/component/teachercomponent/Histeacomponent.js
@@ -0,0 +1,33 @@
+import React,{ Component } from "react";
+import '../../css/signincdi.css';
+//在线学习
+class Histeacomponent extends Component{
+	//教师历史签到
+	constructor(props){
+		super(props);
+
+		this.state={
+
+		}
+	}
+
+	componentDidMount() {
+
+	}
+
+	componentDidUpdate = (prevProps) => {
+
+
+	}
+
+
+
+	render(){
+		return(
+			<React.Fragment>
+
+			</React.Fragment>
+		)
+	}
+}
+export default Histeacomponent;
diff --git a/src/modules/courses/signin/component/teachercomponent/Signteacomponent.js b/src/modules/courses/signin/component/teachercomponent/Signteacomponent.js
new file mode 100644
index 00000000..2507c6d1
--- /dev/null
+++ b/src/modules/courses/signin/component/teachercomponent/Signteacomponent.js
@@ -0,0 +1,33 @@
+import React,{ Component } from "react";
+import '../../css/signincdi.css';
+//在线学习
+class Signteacomponent extends Component{
+	//教师签到统计
+	constructor(props){
+		super(props);
+
+		this.state={
+
+		}
+	}
+
+	componentDidMount() {
+
+	}
+
+	componentDidUpdate = (prevProps) => {
+
+
+	}
+
+
+
+	render(){
+		return(
+			<React.Fragment>
+
+			</React.Fragment>
+		)
+	}
+}
+export default Signteacomponent;
diff --git a/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js b/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js
new file mode 100644
index 00000000..099625aa
--- /dev/null
+++ b/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js
@@ -0,0 +1,200 @@
+import React,{ Component } from "react";
+import '../../css/signincdi.css';
+import axios from 'axios';
+import Teacherentry from "../Teacherentry";
+import NoneDatas from '../NoneDatas';
+import LoadingSpin from '../../../../../common/LoadingSpin';
+import { Modal, Button } from 'antd';
+
+const { confirm } = Modal;
+
+//在线学习
+class Teaccomponent extends Component{
+	//教师正在签到
+	constructor(props){
+		super(props);
+
+		this.state={
+       mydatas:[]
+		}
+	}
+
+	componentDidMount() {
+		this.setState({
+			mydatas:this.props.datas
+		})
+
+	}
+
+
+
+
+	componentDidUpdate = (prevProps) => {
+
+
+	}
+   //截止
+	thisEnd=(attendance_id)=>{
+		let thiss=this
+
+		confirm({
+			title: '提示',
+			content: '确认截止此签到吗?',
+			onOk() {
+				const url = `/weapps/attendances/${attendance_id}/end.json`;
+				var data={
+
+				}
+				axios.post(url, data)
+					.then((result) => {
+						if (result.data.status === 0) {
+							// try {
+							// 	this.props.showNotification(`截止成功`);
+							// }catch (e) {
+							//
+							// }
+							thiss.props.getsetdatas();
+						}else{
+							thiss.props.showNotification(result.data.message);
+
+						}
+					}).catch((error) => {
+					//console.log(error);
+				})
+			},
+			onCancel() {
+
+			},
+		});
+
+	}
+   //删除
+	thisdelete=(attendance_id)=>{
+		let thiss=this
+		confirm({
+			title: '提示',
+			content: '确认删除此签到吗?',
+			onOk () {
+				const url = `/weapps/attendances/${attendance_id}.json`;
+				var data={
+
+				}
+				axios.delete(url, data)
+					.then((result) => {
+						if (result.data.status === 0) {
+							// try {
+							// 	thiss.props.showNotification(`删除成功`);
+							// }catch (e) {
+							//
+							// }
+
+							thiss.props.getsetdatas();
+						}else{
+							thiss.props.showNotification(result.data.message);
+
+						}
+					}).catch((error) => {
+					//console.log(error);
+				})
+			},
+			onCancel() {
+
+			},
+		});
+
+	}
+
+  //学生签到
+	Signin=(attendance_mode,attendance_id,code)=>{
+
+		const url = `/weapps/course_member_attendances.json`;
+		var data={
+
+		}
+		 if(attendance_mode==="QUICK"){
+		 	//快捷签到
+			 data={
+				 attendance_mode:"QUICK",
+				 attendance_id:attendance_id,
+			 }
+			 axios.post(url, data)
+				 .then((result) => {
+					 if (result.data.status === 0) {
+					 	try {
+							this.props.showNotification(`签到成功`);
+						}catch (e) {
+
+						}
+
+						 this.props.getsetdatas();
+					 }else{
+						 this.props.showNotification(result.data.message);
+
+					 }
+				 }).catch((error) => {
+			 })
+		 }else if(attendance_mode==="QRCODE"){
+			 //二维码签到
+			 data={
+				 attendance_mode:"QRCODE",
+				 attendance_id:attendance_id,
+				 code:code,
+			 }
+       this.props.GotomQrcodesodesy(data,true)
+		 }else if(attendance_mode==="NUMBER"){
+		 	//数字签到
+			 data={
+				 attendance_mode:"NUMBER",
+				 attendance_id:attendance_id,
+				 code:code,
+			 }
+			 this.props.Gotomodes(data,true)
+
+		 }
+
+
+	}
+
+
+
+	render(){
+		 let mydatas=this.props.datas?this.props.datas:[];
+		 let Spin= this.props.Spin;
+		return(
+			<React.Fragment>
+				<div className="ws100s mt20  h500">
+					{
+						Spin&&Spin===true?
+							<LoadingSpin></LoadingSpin>
+							:
+
+							(
+								mydatas&&mydatas.length>0?
+									mydatas.map((object, index) => {
+										return (
+											<Teacherentry
+												Signinnamestypes={(id,b,a)=>this.props.Signinnamestypes(id,b,a)}
+												Signin={(a,b,c)=>this.Signin(a,b,c)}
+												qiandaoxiangq={(b,id)=>this.props.qiandaoxiangq(b,id)}
+												thisdelete={(id)=>this.thisdelete(id)}
+												thisEnd={(id)=>this.thisEnd(id)}
+												item={object} key={index}
+												index={index}
+												defaultActiveKey={this.props.defaultActiveKey}
+												{...this.props}
+												{...this.state}
+											></Teacherentry>
+
+										)
+									})
+									:
+									<NoneDatas></NoneDatas>
+							)
+
+					}
+				</div>
+			</React.Fragment>
+		)
+	}
+}
+export default Teaccomponent;
diff --git a/src/modules/courses/signin/css/Signinstatistics.css b/src/modules/courses/signin/css/Signinstatistics.css
new file mode 100644
index 00000000..c7ff88c9
--- /dev/null
+++ b/src/modules/courses/signin/css/Signinstatistics.css
@@ -0,0 +1,233 @@
+.gutterrowbox{
+    height:150px;
+    border: none !important;
+}
+.gutterrowbox .ant-card-body{
+    height:150px;
+    position: relative;
+}
+.gutterrowboxcontent{
+    position: absolute;
+    bottom: 20px;
+    font-size:36px;
+    font-weight:400;
+    color:rgba(255,255,255,1);
+}
+.ml14{
+    margin-left: 14px !important;
+}
+.ml8{
+    margin-left: 8px !important;
+}
+.ml20{
+    margin-left: 20px !important;
+}
+.lishiqiandao{
+
+    height: 150px;
+
+    background-size: cover !important;
+    background-position: center !important;
+    background-repeat: no-repeat !important;
+}
+.daokeqiandao{
+
+    height: 150px;
+
+    background-size: cover !important;
+    background-position: center !important;
+    background-repeat: no-repeat !important;
+}
+.kuangkeqiandao{
+
+    height: 150px;
+
+    background-size: cover !important;
+    background-position: center !important;
+    background-repeat: no-repeat !important;
+}
+.qingjiaqiandao{
+
+    height: 150px;
+
+    background-size: cover !important;
+    background-position: center !important;
+    background-repeat: no-repeat !important;
+}
+
+.SigninstatisticsChart{
+    height:519px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 3px 7px 0px rgba(0, 0, 0, 0.05);
+}
+.pd30{
+    padding:30px;
+}
+.padding03000{
+    padding: 0px 30px 0px 0px;
+}
+
+.mindaoke{
+    width: 20px;
+    height: 20px;
+    background-image: url(./dot-green@2x.png);
+
+    background-size: cover;
+    background-position: center;
+    background-repeat: no-repeat;
+}
+
+.minkuangke{
+    width: 20px;
+    height: 20px;
+    background-image: url(./dot-orange@2x.png);
+
+    background-size: cover;
+    background-position: center;
+    background-repeat: no-repeat;
+}
+
+.minqingjia{
+    width: 20px;
+    height: 20px;
+    background-image: url(./dot-orange@2x1.png);
+
+    background-size: cover;
+    background-position: center;
+    background-repeat: no-repeat;
+}
+
+.Signinstatisticsfont{
+    font-weight: 400;
+    color: rgba(153,153,153,1);
+    text-align: right;
+    margin-right: 20px;
+    line-height: 32px  !important;
+    height: 32px  !important;
+}
+.Signinstatisticsfontselect .ant-select-selection--single .ant-select-selection__rendered{
+    line-height: 32px  !important;
+    height: 32px  !important;
+}
+
+#form_in_modal_group_ids .ant-select-selection{
+  background: #fafafa !important;
+}
+
+#form_in_modal_attendance_date .ant-calendar-picker-input {
+    height:40px;
+}
+
+#form_in_modal_start_time{
+    height:40px;
+    background: #fafafa !important;
+}
+
+#form_in_modal_end_time{
+    height:40px;
+    background: #fafafa !important;
+}
+
+.Signedinlistbox .ant-select-selection--single{
+    height:40px !important;
+    background:rgba(255,255,255,1);
+    border:1px solid rgba(234,234,234,1);
+    border-radius:4px;
+}
+
+.Signedinlistbox .ant-select-selection__rendered{
+    line-height: 40px !important;
+}
+
+.Signedintextright{
+    text-align: right;
+}
+
+.color26C7C9{
+    color:#26C7C9;
+}
+
+.colorEAAE4E{
+    color:#EAAE4E;
+}
+
+.colorFF835C{
+    color:#FF835C;
+}
+
+.color909399{
+    color:#909399;
+}
+
+.color1890FF{
+    color:#1890FF;
+}
+
+.backfff .ant-table-thead tr th{
+    background: #fff;
+    border-bottom:1px solid #EBEBEB !important;
+}
+
+.textcenter{
+    text-align: center !important;
+}
+
+.sginboxcolor26C7C9 .ant-select-selection--single{
+     border:1px solid #26C7C9 !important;
+ }
+
+.sginboxcolor26C7C9 .ant-select-arrow{
+    color: #26C7C9 !important;
+}
+
+.sginboxcolorEAAE4E .ant-select-selection--single{
+    border:1px solid #EAAE4E !important;
+}
+
+.sginboxcolorEAAE4E .ant-select-arrow{
+    color: #EAAE4E !important;
+}
+
+.sginboxcolorFF835C .ant-select-selection--single{
+    border:1px solid #FF835C !important;
+}
+
+.sginboxcolorFF835C .ant-select-arrow{
+    color: #FF835C !important;
+}
+
+
+
+.sginboxcolor909399 .ant-select-selection--single{
+    border:1px solid #909399 !important;
+}
+
+.sginboxcolor909399 .ant-select-arrow{
+    color: #909399 !important;
+}
+
+.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list li.react-datepicker__time-list-item {
+    height: auto  !important;
+    padding: 0px  !important;
+    white-space: nowrap  !important;
+}
+
+.color26C7C9 .ant-select-selection-selected-value{
+    margin: 0 30% !important;
+}
+
+.colorEAAE4E .ant-select-selection-selected-value{
+    margin: 0 40% !important;
+}
+
+.color909399 .ant-select-selection-selected-value{
+    margin: 0 37% !important;
+}
+
+.colorFF835C .ant-select-selection-selected-value{
+    margin: 0 37% !important;
+}
+
+/*.allSignedinlistbox .ant-select-selection-selected-value{*/
+/*    margin: 0 30% !important;*/
+/*}*/
\ No newline at end of file
diff --git a/src/modules/courses/signin/css/dot-green@2x.png b/src/modules/courses/signin/css/dot-green@2x.png
new file mode 100644
index 00000000..a9a2cea5
Binary files /dev/null and b/src/modules/courses/signin/css/dot-green@2x.png differ
diff --git a/src/modules/courses/signin/css/dot-orange@2x.png b/src/modules/courses/signin/css/dot-orange@2x.png
new file mode 100644
index 00000000..0489eb57
Binary files /dev/null and b/src/modules/courses/signin/css/dot-orange@2x.png differ
diff --git a/src/modules/courses/signin/css/dot-orange@2x1.png b/src/modules/courses/signin/css/dot-orange@2x1.png
new file mode 100644
index 00000000..a2faaabf
Binary files /dev/null and b/src/modules/courses/signin/css/dot-orange@2x1.png differ
diff --git a/src/modules/courses/signin/css/signincdi.css b/src/modules/courses/signin/css/signincdi.css
new file mode 100644
index 00000000..b0dac882
--- /dev/null
+++ b/src/modules/courses/signin/css/signincdi.css
@@ -0,0 +1,647 @@
+/* 中间居中 */
+.intermediatecenter {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+/* 简单居中 */
+.intermediatecenterysls {
+  display: flex;
+  align-items: center;
+}
+
+/* 头顶部居中 */
+.topcenter {
+  display: -webkit-flex;
+  flex-direction: column;
+  align-items: center;
+
+}
+
+/* 均匀分开 */
+.spacearound {
+  display: flex;
+  justify-content: space-around;
+
+}
+
+/* 两边靠墙中间均匀分开 */
+.spacebetween {
+  display: flex;
+  justify-content: space-between;
+}
+
+/* 从左分开 */
+.spacearoundflexstart {
+
+  display: flex;
+  justify-content: flex-start;
+}
+
+.spacebetween {
+  display: flex;
+  justify-content: space-between;
+}
+
+.unpsysls {
+  display: inline-block;
+  text-align: justify;
+  font-size: 28px;
+}
+
+/* x轴正方向排序 */
+/* 一 二 三 四 五 六 七 八 */
+.sortinxdirection {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+/* x轴反方向排序 */
+/* 八    七   六  五   四  三  二 一 */
+.xaxisreverseorder {
+  display: flex;
+  flex-direction: row-reverse;
+}
+
+/* 垂直布局 正方向*/
+/* 一
+ 二
+ 三
+ 四
+ 五
+ 六
+ 七
+ 八 */
+.verticallayout {
+  display: flex;
+  flex-direction: column;
+}
+
+/* 垂直布局 反方向*/
+.reversedirection {
+  display: flex;
+  flex-direction: column-reverse;
+}
+
+/* 两端对齐 */
+.alignmentatbothends {
+  display: flex;
+  justify-content: space-between;
+}
+
+.file_path_input {
+  position: absolute;
+  right: -50%;
+}
+
+.ws100s {
+  width: 100%;
+}
+
+.ws70s {
+  width: 70%;
+}
+
+.ws75s {
+  width: 75%;
+}
+
+.ws80s {
+  width: 80%;
+}
+
+.ws50s {
+  width: 50%;
+}
+
+.ws40s {
+  width: 40%;
+}
+
+.ws45s {
+  width: 45%;
+}
+
+.ws46s {
+  width: 46%;
+}
+
+.ws47s {
+  width: 47%;
+}
+
+.hs30s {
+  height: 30%;
+}
+
+.ws20s {
+  width: 20%;
+}
+
+.ws25s {
+  width: 25%;
+}
+
+.yslmaxheigthk {}
+
+.mysligtes {
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  color: rgba(144, 147, 153, 1);
+  padding-left: 34px;
+}
+
+.yslmaxheigthk .ws100s .ant-tabs .ant-tabs-bar {
+  border-bottom: 1px solid #ffffff !important;
+  background: #ffffff !important;
+  background-color: #ffffff !important;
+  margin: 0 !important;
+}
+
+.yslmaxheigthk .ws100s .ant-tabs .ant-tabs-bar .ant-tabs-nav-container {
+  padding-left: 25px;
+}
+
+.yslmaxheigthk .ws100s .ant-tabs .ant-tabs-bar .ant-tabs-nav-container .ant-tabs-ink-bar {
+  width: 68px !important;
+  left: 14px;
+
+}
+
+.yslmaxheigthk .ws100s .ant-tabs .ant-tabs-bar .ant-tabs-tab {
+  padding: 25px 16px !important;
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+
+}
+
+.positiondivs {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+
+.posiivs {
+  padding: 25px 5px !important;
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  color: #1890ff;
+  margin-right: 20px;
+}
+
+.posiivsicon {
+  padding: 22px 0px !important;
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  color: #1890ff;
+}
+
+.posiivsiconmyss {
+  font-size: 14px;
+  font-family: Microsoft YaHei;
+  color: #999999;
+}
+
+.xiaoshou {
+  cursor: pointer !important;
+}
+
+.xiaoshout {
+  cursor: default !important;
+}
+
+.teacherentrydiv {
+  padding-left: 32px;
+  padding-right: 32px;
+  padding-top: 20px;
+  padding-bottom: 20px;
+}
+
+.teacherentrydivs {
+  padding-left: 25px;
+  padding-right: 25px;
+  padding-top: 20px;
+  padding-bottom: 20px;
+}
+
+.pdinstop0 {
+  padding-top: 0px !important;
+}
+
+.teacherentrydivss {
+  padding-left: 20px;
+  padding-right: 20px;
+  padding-top: 20px;
+  padding-bottom: 20px;
+}
+
+.teachedivp {
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  color: rgba(51, 51, 51, 1);
+}
+
+.ymaxnamewidthdivp {
+  max-width: 100%;
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.ymaxnamewidthdivp86 {
+  max-width: 86%;
+  width: 86%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.teachedivps {
+  font-size: 14px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: rgba(144, 147, 153, 1);
+}
+
+.teachedivpsy {
+  font-size: 14px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #333333;
+
+}
+
+.progressivps {
+  width: 200px;
+  margin-left: 10px;
+
+}
+
+.progressivpss {
+  font-size: 12px;
+  line-height: 23px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: rgba(64, 158, 255, 1);
+  margin-left: 15px;
+}
+
+.w60ys {
+  width: 60px;
+}
+
+.ymaxnamewidth60 {
+  max-width: 70px;
+  width: 70px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.ymaxnamewidth80 {
+  max-width: 80px;
+  width: 80px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.w80ys {
+  width: 80px;
+}
+
+.jiezhis {
+  font-size: 14px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: rgba(64, 158, 255, 1);
+}
+
+.shanchu {
+  font-size: 14px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: rgba(245, 108, 108, 1);
+  margin-right: 30px;
+}
+
+.qiandaobutton {
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: rgba(255, 255, 255, 1);
+  text-align: center;
+  line-height: 40px;
+  width: 100px;
+  height: 40px;
+  background: rgba(64, 158, 255, 1);
+  border-radius: 4px;
+}
+
+.zcqiandao {
+  width: 100px;
+  height: 40px;
+  border: 1px solid rgba(38, 199, 201, 1);
+  border-radius: 4px;
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: rgba(38, 199, 201, 1);
+  text-align: center;
+  line-height: 40px;
+
+}
+
+.qjqiandao {
+  width: 100px;
+  height: 40px;
+  border: 1px solid #EAAE4E;
+  border-radius: 4px;
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #EAAE4E;
+  text-align: center;
+  line-height: 40px;
+
+
+}
+
+.kkqiandao {
+  width: 100px;
+  height: 40px;
+  border: 1px solid #FF835C;
+  border-radius: 4px;
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: #FF835C;
+  text-align: center;
+  line-height: 40px;
+
+}
+
+.h40s {
+  line-height: 40px !important;
+}
+
+.h36s {
+  line-height: 36px !important;
+}
+
+.h28s {
+  line-height: 28px !important;
+}
+
+.mt40 {
+  margin-top: 40px !important;
+}
+
+.h500 {
+  min-height: 500px;
+}
+
+.kkp {
+  font-size: 14px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+}
+
+.pr32 {
+  padding-right: 32px;
+}
+
+.mr20r {
+  margin-right: 20px;
+}
+
+.color-reds {
+  color: rgba(245, 108, 108, 1) !important;
+}
+
+.fh {
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: rgba(153, 153, 153, 1);
+
+}
+
+.colorbluesigin {
+  font-size: 16px;
+  font-weight: bold;
+  color: rgba(51, 51, 51, 1);
+}
+
+.sptits {
+  font-size: 20px;
+  font-family: MicrosoftYaHeiSemibold;
+  color: rgba(51, 51, 51, 1);
+}
+
+.sptitss {
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: rgba(136, 136, 136, 1);
+  line-height: 40px;
+}
+
+.tbrt {
+  padding-top: 22px;
+  padding-left: 17px;
+}
+
+.tbrt .ts {
+  font-size: 12px;
+  font-family: MicrosoftYaHei;
+  color: rgba(255, 255, 255, 1);
+}
+
+.tbrt .tss {
+  font-size: 30px;
+  font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
+  font-weight: bold;
+  color: rgba(255, 255, 255, 1);
+  line-height: 33px;
+}
+
+.maxnamewidth200s {
+  width: 200px;
+  max-width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.maxnamewidth200ss {
+  max-width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.maxnamewidth150s {
+  width: 150px;
+  max-width: 150px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.maxnamewidth150ss {
+  max-width: 150px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.maxnamewidth166ss {
+  max-width: 166px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+
+.maxnamewidth140s {
+  width: 140px;
+  max-width: 140px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.maxnamewidth200s {
+  text-align: center;
+  width: 200px;
+  max-width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.maxnamewidth200yss {
+  text-align: center;
+  max-width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.maxnamewidth90s {
+  width: 90px;
+  max-width: 90px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.maxnamewidth100s {
+  width: 100px;
+  max-width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.maxnamewidth100s {
+  max-width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.maxnamewidth90s {
+  width: 90px;
+  max-width: 90px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.font-14 {
+  font-size: 14px !important;
+}
+
+.mr32 {
+  margin-right: 32px;
+}
+
+.mr27 {
+  margin-right: 27px;
+}
+
+.pd15s {
+  padding-bottom: 15px !important;
+}
+
+.ml32 {
+  margin-left: 32px;
+
+}
+
+.textalignlefts {
+  text-align: left;
+}
+
+.textalignrights {
+  text-align: right;
+}
+
+.width200s {
+  width: 200px !important;
+}
+
+.width150s {
+  width: 150px !important;
+}
+
+.width100s {
+  width: 100px !important;
+}
+
+.widh150pxwp {
+  wordWrap: break-word;
+  wordBreak: break-word
+}
+
+.widh150wpos {
+  word-break: break-all;
+}
+
+a {
+  text-decoration: none !important;
+}
+
+a:hover {
+  text-decoration: none !important;
+}
+
+a:active {
+  text-decoration: none !important;
+}
\ No newline at end of file
diff --git a/src/modules/courses/signin/model/Createsignmodel.js b/src/modules/courses/signin/model/Createsignmodel.js
new file mode 100644
index 00000000..111e029c
--- /dev/null
+++ b/src/modules/courses/signin/model/Createsignmodel.js
@@ -0,0 +1,450 @@
+import "../css/Signinstatistics.css"
+import React from 'react'
+import { Modal , Form, Input, Radio,DatePicker,Select,Button} from 'antd';
+import moment from 'moment';
+import axios from 'axios';
+import TimePicker from "react-datepicker";
+import "react-datepicker/dist/react-datepicker.css";
+function range(start, end) {
+  const result = [];
+  for (let i = start; i < end; i++) {
+    result.push(i);
+  }
+  return result;
+}
+
+function disabledDateTime() {
+  return {
+    disabledMinutes: () => range(1, 30).concat(range(31, 60)),
+    // disabledSeconds: () => range(0,60)
+  }
+}
+
+function disabledDate(current) {
+  return current && current < moment().endOf('day').subtract(1, 'days');
+}
+
+const CollectionCreateForm = Form.create({ name: 'form_in_modal' })(
+
+  class extends React.Component {
+    constructor(props){
+      super(props);
+      this.state = {
+        course_groups:[],
+        type:false,
+        dateString:null,
+        start_time:"",
+        end_time:"",
+        attendance_date:"",
+        newmode:null,
+        groupstype:false
+      }
+    }
+
+
+    handleChangestart_time = (date) => {
+
+      this.setState({
+        start_time: date
+      });
+    };
+
+    handleChangeend_time=(date)=>{
+
+      this.setState({
+        end_time: date
+      });
+    }
+    getgroup_idss=(course_groups)=>{
+      let newcourse_groups=course_groups;
+      if(this.props.type==="edit"){
+        let newlist=[]
+        if(this.props.attendancesdata.groups.length>0){
+          this.props.attendancesdata.groups.map((item,key)=>{
+            newlist.push(item.id)
+          })
+        }
+
+        newlist.map((item,key)=>{
+          newcourse_groups.map((i,k)=>{
+            if(i.id===item){
+              i.disabled=true
+            }
+          })
+        })
+
+         // console.log(newlist)
+        // this.setState({
+        //
+        // })
+
+        this.setState({
+          attendance_date: this.props.attendancesdata.attendance_date,
+          start_time:new Date(this.props.attendancesdata.start_time),
+          end_time:new Date(this.props.attendancesdata.end_time),
+          newmode:this.props.attendancesdata.mode,
+          course_groups:newcourse_groups,
+          groupstype:newlist.length===0?true:false
+        })
+
+
+        this.props.form.setFieldsValue({
+          name: this.props.attendancesdata.name,
+          group_ids:newlist,
+          mode:this.props.attendancesdata.mode,
+          start_time:new Date(this.props.attendancesdata.start_time),
+          end_time:new Date(this.props.attendancesdata.end_time),
+        });
+      }else{
+        this.setState({
+          start_time: new Date("2000-01-01T09:00:00.000+08:00"),
+          course_groups:newcourse_groups,
+          groupstype:false
+        })
+
+        this.props.form.setFieldsValue({
+          start_time:new Date("2000-01-01T09:00:00.000+08:00"),
+        });
+      }
+
+     }
+    componentDidMount() {
+      const coursesId=this.props.match.params.coursesId;
+      let newurl=`/courses/${coursesId}/all_course_groups.json`;
+      axios.get(newurl).then((response) => {
+        this.getgroup_idss(response.data.course_groups)
+      })
+
+
+
+    }
+
+    hideCreatesign=(e)=>{
+      e.preventDefault();
+      const {settabsdata,hideCreatesign} = this.props;
+      const coursesId=this.props.match.params.coursesId;
+      this.setState({
+        type:true
+      })
+      this.props.form.validateFields((err, values) => {
+
+        if (!err) {
+          if(moment(values.end_time).format('HH:mm')<moment(values.start_time).format('HH:mm')){
+            this.props.showNotification(`结束时间不能小于起始时间`);
+            this.setState({
+              type:false
+            })
+            return
+          }
+          if( moment(values.start_time).format('HH:mm')===moment(values.end_time).format('HH:mm')){
+            this.props.showNotification(`结束时间不能与起始时间相同`);
+            this.setState({
+              type:false
+            })
+            return
+          }
+
+          if(this.props.type==="edit"){
+
+            const attendancesid=this.props.attendancesid;
+
+            let url=`/attendances/${attendancesid}.json`
+            axios.put(url,{
+                attendance_date:moment(values.attendance_date).format('YYYY-MM-DD'),
+                end_time: moment(values.end_time).format('HH:mm'),
+                group_ids:values.group_ids,
+                mode: values.mode,
+                name: values.name,
+                start_time:moment(values.start_time).format('HH:mm'),
+              }
+            ).then((response) => {
+              if (response.data.status == 0) {
+                this.props.showNotification(`创建签到成功`);
+                this.setState({
+                  type:false
+                })
+                hideCreatesign()
+                settabsdata()
+              }
+            }).catch((error) => {
+              console.log(error)
+            })
+
+          }else{
+            let url=`/weapps/courses/${coursesId}/attendances.json`;
+
+            axios.post(url, {
+              attendance_date:moment(values.attendance_date).format('YYYY-MM-DD'),
+              end_time: moment(values.end_time).format('HH:mm'),
+              group_ids:values.group_ids,
+              mode: values.mode,
+              name: values.name,
+              start_time:moment(values.start_time).format('HH:mm'),
+            })
+              .then((response) => {
+                if (response.data.status == 0) {
+                  this.props.showNotification(`创建签到成功`);
+                  this.setState({
+                    type:false
+                  })
+                  hideCreatesign()
+                  settabsdata()
+                }
+              })
+              .catch(function (error) {
+                console.log(error);
+              });
+          }
+
+
+
+        }else{
+          this.setState({
+            type:false
+          })
+        }
+
+
+      });
+    }
+    //  getDisabledHours=()=> {
+    //   let hours = []
+    //   if(this.state.dateString===moment().format('YYYY-MM-DD')){
+    //     let time = moment().format('HH:mm')
+    //     let timeArr = time.split(':')
+    //     for (var i = 0; i < parseInt(timeArr[0]); i++) {
+    //       hours.push(i)
+    //     }
+    //   }
+    //
+    //   return hours
+    // }
+    //
+    //  getDisabledMinutes=(selectedHour)=>{
+    //    let minutes = []
+    //    if(this.state.dateString===moment().format('YYYY-MM-DD')){
+    //      let time =  moment().format('HH:mm')
+    //      let timeArr = time.split(':')
+    //      if (selectedHour == parseInt(timeArr[0])) {
+    //        for(var i = 0; i < parseInt(timeArr[1]); i++) {
+    //          minutes.push(i)
+    //        }
+    //      }
+    //    }
+    //   return minutes
+    // }
+
+     onChange=(date, dateString)=>{
+      this.setState({
+        dateString:dateString
+      })
+    }
+    render() {
+      const { visible,form ,setRadio,Radiolist,hideCreatesign,editvisible} = this.props;
+      let {course_groups,newmode,groupstype}=this.state;
+      const { getFieldDecorator } = form;
+      const { Option } = Select;
+      const formItemLayout = {
+        labelCol: { span: 4 },
+        wrapperCol: { span: 19},
+      };
+
+      const leftbuton={
+        "width":"130px",
+        "height":"40px",
+        "border":"1px solid rgba(76,172,255,1)",
+        "borderRadius":"4px",
+      }
+
+      const rightbuton={
+        "width":"130px",
+        "height":"40px",
+        "background":"#4CACFF",
+       "borderRadius":"4px",
+      }
+
+
+      return (
+        <Modal
+          visible={editvisible?editvisible:visible}
+           title={this.props&&this.props.type==="edit"?"编辑签到":"创建签到"}
+           closable={false}
+           footer={null}
+           width={600}
+          destroyOnClose={true}
+        >
+          <Form {...formItemLayout}>
+
+            <Form.Item label="签到名称：">
+              {getFieldDecorator('name', {
+                rules: [{ required: true, message: '请输入签到名称' },{whitespace:true,message: '请勿输入空格'}],
+              })(<Input placeholder="请输入签到名称" style={{height:"40px"}} />)}
+            </Form.Item>
+
+            <Form.Item label="签到班级：">
+              {getFieldDecorator('group_ids')(
+                <Select mode="multiple" placeholder={this.props&&this.props.type==="edit"&&this.state.groupstype===true?"已选择全部分班":course_groups.length>0?"不选择分班时默认选择全部学生":'暂无分班，将默认选择课堂全部学生'} getPopupContainer={trigger => trigger.parentNode}
+                        disabled={this.props&&this.props.type==="edit"&&this.state.groupstype===true?true:false}
+                >
+
+                  {course_groups.map((item,key)=>{
+                  return(
+                    <Option value={item.id} key={key} disabled={item.disabled?item.disabled:false}>{item.name}</Option>
+                  )
+                  })}
+
+                </Select>,
+              )}
+            </Form.Item>
+
+            <Form.Item label="签到方式：" >
+              {getFieldDecorator('mode', {
+                rules: [{ required: true, message: '请选择签到方式' }],
+              })(
+                <Radio.Group onChange={setRadio} getPopupContainer={trigger => trigger.parentNode}>
+                  <Radio value="QUICK">快捷签到</Radio>
+                  <Radio value="NUMBER">签到码签到</Radio>
+                  <Radio value="QRCODE">二维码签到</Radio>
+                </Radio.Group>,
+              )}
+              {Radiolist==="QUICK"||!Radiolist&&newmode==="QUICK"?<div
+                style={{color:"#E6A23C",
+                height:"15px",
+                lineHeight: "15px"}}>学生点击签到按钮即可完成签到</div>:""}
+
+              {Radiolist==="NUMBER"||!Radiolist&&newmode==="NUMBER"?<div
+                style={{color:"#E6A23C",
+                  height:"15px",
+                  lineHeight: "15px"}}
+              >学生需要输入签到码才能完成签到</div>:""}
+
+              {Radiolist==="QRCODE"||!Radiolist&&newmode==="QRCODE"?<div
+                style={{color:"#E6A23C",
+                  height:"15px",
+                  lineHeight: "15px"}}
+              >学生需从小程序进入课堂扫码才能完成签到</div>:""}
+            </Form.Item>
+
+            <Form.Item label="签到日期：">
+              {getFieldDecorator('attendance_date',  {
+                initialValue:this.props.type==="edit"?moment(this.state.attendance_date,'YYYY-MM-DD'):"",
+                rules: [{required: true, message: '请选择签到日期',}],
+              })(<DatePicker style={{width:"413px"}} getPopupContainer={trigger => trigger.parentNode}
+                             disabledTime={disabledDateTime}
+                             disabledDate={disabledDate}
+                             onChange={this.onChange}
+                             // value={moment('2015-01-01', 'YYYY-MM-DD')}
+              />)}
+            </Form.Item>
+            <style>
+              {
+                `
+                #form_in_modal_start_time{
+                   width:413px;
+                   padding-left: 10px;
+                }
+                
+                #form_in_modal_end_time{
+                   width:413px;
+                   padding-left: 10px;
+                }
+                `
+              }
+            </style>
+            <Form.Item label="开始时间：">
+              {getFieldDecorator('start_time',  {
+                rules: [{ type: 'object', required: true, message: '请选择开始时间' }],
+              })(
+                // <TimePicker style={{width:"413px"}} format={format} getPopupContainer={trigger => trigger.parentNode}/>
+                <TimePicker
+                  style={{width:"413px"}}
+                  selected={this.state.start_time}
+                  onChange={date => this.handleChangestart_time(date)}
+                  showTimeSelect
+                  showTimeSelectOnly
+                  timeIntervals={10}
+                  timeCaption="Time"
+                  timeFormat="HH:mm"
+                  dateFormat="HH:mm"
+                  getPopupContainer={trigger => trigger.parentNode}
+                />
+                )}
+            </Form.Item>
+
+            <Form.Item label="结束时间：">
+              {getFieldDecorator('end_time',  {
+                rules: [{ type: 'object', required: true, message: '请选择结束时间' }],
+              })(
+                // <TimePicker style={{width:"413px"}} format={format} getPopupContainer={trigger => trigger.parentNode}
+                // disabledHours={this.getDisabledHours}
+                // disabledMinutes={this.getDisabledMinutes}
+                //
+                // />
+                <TimePicker
+                style={{width:"413px"}}
+                selected={this.state.end_time}
+                onChange={date => this.handleChangeend_time(date)}
+                showTimeSelect
+                showTimeSelectOnly
+                timeIntervals={10}
+                minTime={this.state.dateString===moment().format('YYYY-MM-DD')||this.state.dateString===null?new Date():false}
+                maxTime={this.state.dateString===moment().format('YYYY-MM-DD')||this.state.dateString===null?moment().endOf('day').toDate():false}
+                timeCaption="Time"
+                timeFormat="HH:mm"
+                dateFormat="HH:mm"
+                getPopupContainer={trigger => trigger.parentNode}
+                />
+                )}
+            </Form.Item>
+
+
+              <div className={"mt20 marginauto clearfix edu-txt-center"}>
+                <a>
+                  <Button type="primary" ghost style={leftbuton} onClick={hideCreatesign}>
+                    取消
+                  </Button>
+                </a>
+
+                <a>
+                  <Button type="primary" className={"ml20"} style={rightbuton}  onClick={(e)=>this.hideCreatesign(e)} loading={this.state.type}>
+                    确定
+                  </Button>
+                </a>
+
+              </div>
+
+
+          </Form>
+        </Modal>
+      );
+    }
+  },
+);
+
+class Createsignmodel extends React.Component {
+  state = {
+    Radiolist: null,
+  };
+  setRadio=(e)=>{
+
+    this.setState({
+      Radiolist:e.target.value
+    })
+  }
+  render() {
+
+    return (
+      <React.Fragment>
+        <CollectionCreateForm
+          {...this.state}
+          {...this.props}
+          setRadio={(e)=>this.setRadio(e)}
+        />
+      </React.Fragment>
+    );
+  }
+}
+
+export default Createsignmodel;
+
+
diff --git a/src/modules/courses/signin/model/Qrcodesignin.js b/src/modules/courses/signin/model/Qrcodesignin.js
new file mode 100644
index 00000000..6bc51704
--- /dev/null
+++ b/src/modules/courses/signin/model/Qrcodesignin.js
@@ -0,0 +1,77 @@
+import React,{ Component } from "react";
+import { Modal , Button} from 'antd';
+import QRCode  from 'qrcode.react';
+
+class Qrcodesignin extends Component {
+  constructor(props) {
+    super(props)
+  }
+  render() {
+
+    const leftbuton={
+      "width":"130px",
+      "height":"40px",
+      "border":"1px solid rgba(76,172,255,1)",
+      "borderRadius":"4px",
+    }
+
+    const rightbuton={
+      "width":"130px",
+      "height":"40px",
+      "background":"#4CACFF",
+      "borderRadius":"4px",
+    }
+    return(
+      <React.Fragment>
+        {this.props.Qrcodesignintype?<Modal
+          title="二维码签到"
+          visible={this.props.Qrcodesignintype}
+          closable={false}
+          footer={null}
+        >
+
+          <div>
+            <div className={" marginauto clearfix edu-txt-center"}>
+							<QRCode
+								value={this.props.Qrcodesignintypedata.code}  //value参数为生成二维码的链接
+								size={200} //二维码的宽高尺寸
+								fgColor="#000000"  //二维码的颜色
+							/>
+            </div>
+
+
+            <div className={"mt20 marginauto clearfix edu-txt-center"}>
+              <a>请打开小程序在课堂的签到模块扫码签到</a>
+            </div>
+
+            <div className={"mt20 marginauto clearfix edu-txt-center"}>
+              <a>
+                <Button type="primary" ghost style={leftbuton} onClick={()=>this.props.GotomQrcodesodesy(null,false)}>
+                  取消
+                </Button>
+              </a>
+
+              <a>
+                <Button type="primary" className={"ml20"} style={rightbuton} onClick={()=>this.props.GotomQrcodesodesy(null,false)}>
+                  确定
+                </Button>
+              </a>
+
+            </div>
+
+
+          </div>
+        </Modal>:""}
+      </React.Fragment>
+
+    )
+  }
+
+}
+
+
+
+
+
+
+export default Qrcodesignin
diff --git a/src/modules/courses/signin/model/Signinname.js b/src/modules/courses/signin/model/Signinname.js
new file mode 100644
index 00000000..0e88e328
--- /dev/null
+++ b/src/modules/courses/signin/model/Signinname.js
@@ -0,0 +1,105 @@
+import React,{ Component } from "react";
+
+import { Modal , Form, Input,Button} from 'antd';
+import axios from 'axios';
+
+class Signinname extends Component {
+	constructor(props) {
+		super(props)
+	}
+	setdatas=()=>{
+		this.props.form.validateFields((err, values) => {
+			if (!err) {
+				const url = `/weapps/attendances/${this.props.switattendance_id}.json`;
+				let data={
+					name:values.name,
+				}
+				axios.put(url, data)
+					.then((result) => {
+						if (result.data.status === 0) {
+							try {
+								this.props.showNotification(`修改成功`);
+							}catch (e) {
+
+							}
+							this.props.getsetdatas();
+							this.props.Signinnamestypes(null,false,"")
+						}else{
+							this.props.showNotification(result.data.message);
+
+						}
+					}).catch((error) => {
+				})
+			}
+		});
+
+
+
+	}
+	render() {
+		const { getFieldDecorator } =  this.props.form;
+		const formItemLayout = {
+			wrapperCol: { span: 25},
+		};
+
+		const leftbuton={
+			"width":"130px",
+			"height":"40px",
+			"border":"1px solid rgba(76,172,255,1)",
+			"borderRadius":"4px",
+		}
+
+		const rightbuton={
+			"width":"130px",
+			"height":"40px",
+			"background":"#4CACFF",
+			"borderRadius":"4px",
+		}
+		return(
+			<React.Fragment>
+				{this.props.Signinnamestype?<Modal
+					title="提示"
+					visible={this.props.Signinnamestype}
+					closable={false}
+					footer={null}
+				>
+
+					<Form {...formItemLayout}>
+
+						<Form.Item>
+							{getFieldDecorator('name', {initialValue: this.props.mybianjiname,
+								rules: [{ required: true, message: '请输入签到名称' }],
+							})(<Input placeholder="请输入签到名称"/>)}
+						</Form.Item>
+
+						<div className={"mt20 marginauto clearfix edu-txt-center"}>
+							<a>
+								<Button type="primary" ghost style={leftbuton} onClick={()=>this.props.Signinnamestypes(null,false,"")}>
+									取消
+								</Button>
+							</a>
+
+							<a>
+								<Button type="primary" className={"ml20"} style={rightbuton} onClick={()=>this.setdatas()}>
+									确定
+								</Button>
+							</a>
+
+						</div>
+
+
+					</Form>
+				</Modal>:""}
+			</React.Fragment>
+
+		)
+	}
+
+}
+
+
+
+
+const Signinnames = Form.create({ name: 'Signinnames' })(Signinname);
+
+export default Signinnames
diff --git a/src/modules/courses/signin/model/Studentssignmodel.js b/src/modules/courses/signin/model/Studentssignmodel.js
new file mode 100644
index 00000000..0bb736c3
--- /dev/null
+++ b/src/modules/courses/signin/model/Studentssignmodel.js
@@ -0,0 +1,107 @@
+import React,{ Component } from "react";
+
+import { Modal , Form, Input,Button} from 'antd';
+import axios from 'axios';
+
+class Studentssignmodel extends Component {
+  constructor(props) {
+    super(props)
+  }
+  setdatas=()=>{
+		this.props.form.validateFields((err, values) => {
+			if (!err) {
+				const url = `/weapps/course_member_attendances.json`;
+				let data={
+					code:values.name,
+					attendance_mode:"NUMBER",
+					attendance_id:this.props.Studentssigntypedata.attendance_id,
+				}
+				axios.post(url, data)
+					.then((result) => {
+						if (result.data.status === 0) {
+							try {
+								this.props.showNotification(`签到成功`);
+							}catch (e) {
+
+							}
+							this.props.getsetdatas();
+							this.props.Gotomodes(null,false)
+						}else{
+							this.props.showNotification(result.data.message);
+
+						}
+					}).catch((error) => {
+				})
+			}
+		});
+
+
+
+	}
+  render() {
+    const { getFieldDecorator } =  this.props.form;
+    const formItemLayout = {
+      wrapperCol: { span: 25},
+    };
+
+    const leftbuton={
+      "width":"130px",
+      "height":"40px",
+      "border":"1px solid rgba(76,172,255,1)",
+      "borderRadius":"4px",
+    }
+
+    const rightbuton={
+      "width":"130px",
+      "height":"40px",
+      "background":"#4CACFF",
+      "borderRadius":"4px",
+    }
+    return(
+      <React.Fragment>
+        {this.props.Studentssigntype?<Modal
+          title="签到码签到"
+          visible={this.props.Studentssigntype}
+          closable={false}
+          footer={null}
+        >
+
+          <Form {...formItemLayout}>
+
+            <Form.Item>
+              {getFieldDecorator('name', {
+                rules: [{ required: true, message: '请输入签到码' }],
+              })(<Input placeholder="请输入签到码"/>)}
+            </Form.Item>
+
+            <div className={"mt20 marginauto clearfix edu-txt-center"}>
+              <a>
+                <Button type="primary" ghost style={leftbuton} onClick={()=>this.props.Gotomodes(null,false)}>
+                  取消
+                </Button>
+              </a>
+
+              <a>
+                <Button type="primary" className={"ml20"} style={rightbuton} onClick={()=>this.setdatas()}>
+                  确定
+                </Button>
+              </a>
+
+            </div>
+
+
+          </Form>
+        </Modal>:""}
+      </React.Fragment>
+
+    )
+  }
+
+}
+
+
+
+
+const Studentssignmodels = Form.create({ name: 'Studentssignmodel' })(Studentssignmodel);
+
+export default Studentssignmodels
diff --git a/src/modules/courses/signin/model/sigininmodes.js b/src/modules/courses/signin/model/sigininmodes.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/modules/courses/signin/mymain/Signinmain.js b/src/modules/courses/signin/mymain/Signinmain.js
new file mode 100644
index 00000000..cf6e9c0d
--- /dev/null
+++ b/src/modules/courses/signin/mymain/Signinmain.js
@@ -0,0 +1,15 @@
+import React, { Component } from "react";
+import '../css/signincdi.css';
+import Teachers_signin from '../teacher/Teachers_signin';
+// 主签到目录 		主签到目录
+class Signinmain extends Component {
+	// 主签到目录
+	render() {
+		return (
+			<Teachers_signin   {...this.props}>
+			</Teachers_signin>
+
+		)
+	}
+}
+export default Signinmain;
diff --git a/src/modules/courses/signin/student/Signedinlist.js b/src/modules/courses/signin/student/Signedinlist.js
new file mode 100644
index 00000000..d75761f2
--- /dev/null
+++ b/src/modules/courses/signin/student/Signedinlist.js
@@ -0,0 +1,404 @@
+import "../css/Signinstatistics.css"
+import React,{ Component } from "react";
+import { Row, Col,Select,Table,Pagination } from 'antd';
+import axios from 'axios';
+import LoadingSpin from "../../../../common/LoadingSpin";
+import NoneDatas from "../component/NoneDatas";
+const { Option } = Select;
+
+class Signedinlist extends Component {
+
+  constructor(props) {
+    super(props)
+    this.state={
+      limit:5,
+      page:1,
+      loading:false,
+      attendanceslist:[],
+      data:null,
+      group_ids:[],
+      members_count:0,
+      attendance_status:undefined,
+      state:[
+        {id:undefined,name:"全部状态"},
+        {id:"NORMAL",name:"正常签到"},
+        {id:"LEAVE",name:"请 假"},
+        {id:"ABSENCE",name:this.props.defaultActiveKey ==="2"?"旷 课":"未签到"},
+      ],
+      newstate:[
+        {id:"NORMAL",name:"正常签到"},
+        {id:"LEAVE",name:"请 假"},
+        {id:"ABSENCE",name:this.props.defaultActiveKey ==="2"?"旷 课":"未签到"},
+      ],
+      course_members_count:'--',
+      attendance_count:'--',
+    }
+  }
+
+  componentDidMount() {
+    this.getdatas(this.props&&this.props.switattendance_id,1,[],undefined)
+    // this.getpath()
+  }
+  componentDidUpdate(prevProps, prevState) {
+    if(prevProps.headdata!=this.props.headdata){
+
+      if(this.props.headdata){
+        let listattendanceslist=[];
+        listattendanceslist.push({id:undefined,name:"全部分班"})
+        if(this.props.headdata.course_groups){
+
+          if(this.props.headdata.course_groups.length>0){
+            this.props.headdata.course_groups.map((item,key)=>{
+              listattendanceslist.push(item)
+            })
+          }
+        }
+        this.setState({
+          attendanceslist:listattendanceslist,
+          data:this.props.headdata,
+          course_members_count:this.props.headdata.normal_count,
+          attendance_count:this.props.headdata.all_count
+        })
+      }
+
+
+    }
+  }
+  getdatas=(id,page,group_ids,attendance_status)=>{
+    this.setState({
+      loading:true,
+      member_attendances:[],
+    })
+    let that=this;
+    let url=`/weapps/course_member_attendances.json`;
+    axios.get(url,{params:{
+        group_ids:group_ids,
+        attendance_id:id,
+        attendance_status:attendance_status,
+        page:page,
+        limit:5,
+      }
+    }).then((response) => {
+
+      if(response){
+        this.setState({
+          member_attendances:response.data.member_attendances,
+          members_count:response.data.members_count,
+
+        })
+
+      }
+      this.setState({
+				loading:false
+			})
+    }).catch((error) => {
+      that.setState({
+        loading:false
+      })
+
+    });
+  }
+  handleChangegroup_ids=(value)=>{
+    let neval
+    if(!value){
+      if(value===0){
+        neval=[0]
+        this.setState({
+          group_ids: [0],
+          page:1
+        })
+      }else{
+        neval=[]
+        this.setState({
+          group_ids: [],
+          page:1
+        })
+      }
+
+    }else{
+      neval=[value]
+      this.setState({
+        group_ids: [value],
+        page:1
+      })
+    }
+
+    let {page,attendance_status}=this.state;
+    this.getdatas(this.props&&this.props.switattendance_id,1,neval,attendance_status)
+    if(this.props.defaultActiveKey==="1"){
+      this.getpath(value)
+    }
+
+  }
+  getpath=(id)=>{
+    let listattendanceslist=[]
+    let url=`/weapps/attendances/${this.props&&this.props.switattendance_id}.json`;
+    axios.get(url).then((response) => {
+      if(response.data){
+        listattendanceslist.push({id:undefined,name:"全部分班"})
+        if(response.data.course_groups.length>0){
+          response.data.course_groups.map((item,key)=>{
+            listattendanceslist.push(item)
+          })
+        }
+        if(id){
+          response.data.course_groups.map((item,key)=>{
+            if(item.id===id){
+              this.setState({
+                course_members_count:item.course_members_count,
+                attendance_count: item.attendance_count
+              })
+            }
+
+          })
+        }else{
+          this.setState({
+            course_members_count:response.data.normal_count,
+            attendance_count: response.data.all_count
+          })
+        }
+        this.setState({
+          attendanceslist:listattendanceslist,
+          data:response.data
+        })
+
+      }
+
+    })
+  }
+  handleChangestate=(value)=>{
+    let neval
+    if(!value){
+      neval=undefined
+      this.setState({
+        attendance_status:undefined,
+        page:1
+      })
+    }else{
+      neval=value
+      this.setState({
+        attendance_status: value,
+        page:1
+      })
+    }
+
+    let {page,group_ids}=this.state;
+    this.getdatas(this.props&&this.props.switattendance_id,1,group_ids,neval)
+  }
+  paginationonChange = (pageNumber) => {
+    this.setState({
+      page: pageNumber,
+    })
+    let {group_ids,attendance_status}=this.state;
+    this.getdatas(this.props&&this.props.switattendance_id,pageNumber,group_ids,attendance_status)
+
+  }
+
+  handleChange=(attendance_status,value)=>{
+
+    let {member_attendances}=this.state;
+    let newmember_attendances=member_attendances;
+
+    newmember_attendances.map((item,key)=>{
+      if(item.user_id===value){
+        item.attendance_status=attendance_status
+      }
+    })
+
+
+    let url=`/weapps/course_member_attendances/update_status.json`;
+
+    axios.post(url, {
+      attendance_id:this.props.switattendance_id,
+      attendance_status:attendance_status,
+      course_id:this.props.match.params.coursesId,
+      user_id: value,
+    })
+      .then((response) => {
+        if (response.data.status == 0) {
+          this.props.showNotification(`修改状态成功`);
+          this.setState({
+            member_attendances:newmember_attendances
+          })
+          this.props.mygetdatas()
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+
+
+
+  }
+  render() {
+   let {attendanceslist,state,data,member_attendances,newstate,attendance_status}=this.state;
+
+    const columns = [
+      {
+        title: '序号',
+        dataIndex: 'index',
+        key: 'index',
+        width:'25%',
+        className: "textcenter",
+      },
+      {
+        title: '姓名',
+        dataIndex: 'user_name',
+        key: 'user_name',
+        width:'25%',
+        className: "textcenter",
+        render: (text, record) => (
+          <span>{record.user_name===null?"--":record.user_name}</span>
+        )
+      },
+      {
+        title: '学号',
+        dataIndex: 'student_id',
+        key: 'student_id',
+        width:'25%',
+        className: "textcenter",
+        render: (text, record) => (
+          <span>{record.student_id===null?"--":record.student_id}</span>
+        )
+      },
+      {
+        title: '状态',
+        key: 'attendance_status',
+        width:'25%',
+        dataIndex: 'attendance_status',
+        className: "textcenter",
+        render: (text, record) => (
+          <span>
+
+            <Select key={record.index} defaultValue={record.attendance_status}
+                    // className={"Signedinlistbox"}
+                    className={record.attendance_status==="NORMAL"?"color26C7C9 Signedinlistbox sginboxcolor26C7C9 marginleft10":record.attendance_status==="LEAVE"?"colorEAAE4E Signedinlistbox sginboxcolorEAAE4E marginleft10":record.attendance_status==="ABSENCE"?this.props.defaultActiveKey==="2"?"colorFF835C Signedinlistbox sginboxcolorFF835C marginleft10":"color909399 Signedinlistbox sginboxcolor909399 marginleft10":"Signedinlistbox"}
+
+                    style={{ width: 167 }} onChange={(e)=>this.handleChange(e,record.user_id)}>
+                  {
+                    newstate&&newstate.map((item,key)=>{
+                      return(
+                        <Option value={item.id} key={key}
+                                className={item.name==="正常签到"?"color26C7C9 sginbox":item.name==="请 假"?"colorEAAE4E sginbox":item.name==="旷 课"?"colorFF835C sginbox": item.name ==="未签到"?"color909399 sginbox":""}>{item.name}</Option>
+                      )
+                    })
+                  }
+                </Select>
+          </span>
+        ),
+      },
+    ];
+
+    return(
+      <React.Fragment>
+        <Row className={"mt20"}>
+          <Col span={12}>
+            <Row gutter={[{ xs: 8, sm: 16, md: 24, lg: 32 }, 20]}>
+
+              <Col className="gutter-row" span={9}>
+
+                <Select defaultValue="全部分班" className={"Signedinlistbox"} style={{ width: 167 }} onChange={this.handleChangegroup_ids}>
+                  {attendanceslist&&attendanceslist.map((item,key)=>{
+                    return(
+                      <Option value={item.id} key={key}>{item.name}</Option>
+                    )
+                  })}
+
+                </Select>
+
+              </Col>
+
+              <Col className="gutter-row ml20" span={6}>
+
+                <Select defaultValue="全部状态"
+                         className={"Signedinlistbox"}
+                        //className={attendance_status&&attendance_status==="NORMAL"?"color26C7C9 Signedinlistbox sginboxcolor26C7C9":attendance_status&&attendance_status==="LEAVE"?"colorEAAE4E Signedinlistbox sginboxcolorEAAE4E":attendance_status&&attendance_status==="ABSENCE"?"colorFF835C Signedinlistbox sginboxcolorFF835C":"Signedinlistbox"}
+                        style={{ width: 167 }} onChange={this.handleChangestate}>
+                  {
+                    state&&state.map((item,key)=>{
+                      return(
+                        <Option value={item.id} key={key}
+                                //className={item.name==="正常签到"?"color26C7C9":item.name==="请假"?"colorEAAE4E":item.name==="旷课"?"colorFF835C":""}
+                        >
+                          {item.name}
+                        </Option>
+                      )
+                    })
+                  }
+                </Select>
+
+              </Col>
+
+            </Row>
+
+          </Col>
+          <Col span={12}>
+
+            <Row type="flex" justify="end">
+
+              {this.props.defaultActiveKey==="2"?<Col className={"Signedintextright mr5"}>
+                <span className={"color26C7C9 mr20"}>正常签到：{data&&data.normal_count}</span>
+                <span className={"colorEAAE4E mr20"}>请假：{data&&data.leave_count}</span>
+                <span className={"colorFF835C"}>旷课：{data&&data.absence_count}</span>
+              </Col>:<Col className={"Signedintextright  mr5"}>
+                <span className={"mr20"}>已签到：<span className={"color1890FF"}>{this.state.course_members_count}</span></span>
+                <span>应签到：<span className={"color1890FF"}>{this.state.attendance_count}</span></span>
+              </Col>}
+
+            </Row>
+
+          </Col>
+        </Row>
+        <style>
+          {
+            `
+                .marginleft10{
+                    margin-left: 10px !important;
+                }
+             `
+          }
+        </style>
+        <div className={"backfff mt10"}>
+					{
+						this.state.loading===true?
+							<div style={{
+								minHeight:"400px",
+							}}>
+								<LoadingSpin></LoadingSpin>
+							</div>
+							:
+						member_attendances&&member_attendances.length===0?
+							<div style={{
+								minHeight:"400px",
+							}}>
+							{/*<LoadingSpin></LoadingSpin>*/}
+								<NoneDatas></NoneDatas>
+							</div>
+
+							:
+							// loading={this.state.loading}
+							<Table columns={columns} dataSource={member_attendances} pagination={false} />
+
+					}
+
+        </div>
+
+        <div className="mb30 clearfix educontent mt40 intermediatecenter">
+					{
+						member_attendances&&member_attendances.length>0?
+							<Pagination showQuickJumper current={this.state.page} onChange={this.paginationonChange}
+													pageSize={this.state.limit}
+													total={this.state.members_count}></Pagination>
+							:""
+				}
+
+        </div>
+      </React.Fragment>
+
+    )
+  }
+
+}
+
+
+export default Signedinlist
diff --git a/src/modules/courses/signin/student/Signindetails.js b/src/modules/courses/signin/student/Signindetails.js
new file mode 100644
index 00000000..ef0f5e52
--- /dev/null
+++ b/src/modules/courses/signin/student/Signindetails.js
@@ -0,0 +1,71 @@
+import React,{ Component } from "react";
+import '../css/signincdi.css';
+import Detailss from '../component/Detailss';
+import Signedinlist from './Signedinlist'
+import axios from 'axios';
+
+//在线学习
+class Signindetails extends Component{
+	constructor(props){
+		super(props);
+
+		this.state={
+			headdata:null
+		}
+
+	}
+
+	componentDidMount() {
+		this.mygetdatas()
+	}
+	mygetdatas=()=>{
+		const  switattendance_id=this.props.switattendance_id;
+		let urls = `/weapps/attendances/${switattendance_id}.json`;
+		axios.get(urls).then((response) => {
+			//.log(response);
+			if(response){
+				if(response.data){
+					this.setState({
+						headdata:response.data
+					})
+
+				}
+			}
+		})
+	}
+
+
+
+	render(){
+		let {headdata}= this.state;
+		return(
+			<React.Fragment>
+				<div className="ws100s" style={{
+					position: "relative",
+				}}>
+          <Detailss
+						qiandaoxiangq={(b)=>this.props.qiandaoxiangq(b)}
+						defaultActiveKey={this.props.defaultActiveKey}
+						headdata={headdata}
+						switattendance_id={this.props.switattendance_id}
+						{...this.props}
+						{...this.state}></Detailss>
+
+
+				{/*	列表+筛选 */}
+				 <div>
+					 <Signedinlist
+						 mygetdatas={()=>this.mygetdatas()}
+						 defaultActiveKey={this.props.defaultActiveKey}
+						 switattendance_id={this.props.switattendance_id}
+						 headdata={headdata}
+						 {...this.props}
+						 {...this.state}
+					 />
+				 </div>
+				</div>
+			</React.Fragment>
+		)
+	}
+}
+export default Signindetails;
diff --git a/src/modules/courses/signin/teacher/Teachers_signin.js b/src/modules/courses/signin/teacher/Teachers_signin.js
new file mode 100644
index 00000000..36175afa
--- /dev/null
+++ b/src/modules/courses/signin/teacher/Teachers_signin.js
@@ -0,0 +1,399 @@
+import React, { Component } from "react";
+import '../css/signincdi.css';
+import { Tabs, Pagination } from 'antd';
+import Teaccomponent from '../component/teachercomponent/Teaccomponent';
+import Createsignmodel from '../model/Createsignmodel';
+import Studentssignmodels from "../model/Studentssignmodel";
+import Qrcodesignin from "../model/Qrcodesignin";
+import Signinname from '../model/Signinname';
+import Signinstatistics from "../Signinstatistics/Signinstatistics";
+import Signindetails from '../student/Signindetails';
+
+import axios from 'axios';
+
+const { TabPane } = Tabs;
+//在线学习
+
+class Students_signin extends Component {
+	constructor(props) {
+		super(props);
+
+		this.state = {
+			visible: false,
+			page: 1,
+			limit: 5,
+			count: 50,
+			defaultActiveKey: "1",
+			attendances_count: 0,
+			datas: [],
+			normal_count: 0,
+			leave_count: 0,
+			absence_count: 0,
+			Studentssigntype: false,
+			Studentssigntypedata: null,
+			Qrcodesignintype: false,
+			Qrcodesignintypedata: null,
+			switchs: false,
+			switattendance_id: null,
+			Spin: false,
+			Signinnamestype: false,
+			mybianjiname: "",
+
+		}
+	}
+
+	componentDidMount() {
+		let data = {
+			key: "1",
+			page: 1,
+			limit: 5
+		}
+
+		this.gogetdatas(data);
+
+	}
+
+	componentDidUpdate = (prevProps) => {
+		try {
+			if (this.props.homedirectory !== prevProps.homedirectory) {
+				if (this.props.homedirectory === true) {
+					this.setState({
+						switchs: false,
+					})
+				}
+			}
+		} catch (e) {
+
+		}
+	}
+
+	callback = (key) => {
+		//.log(key);
+		this.setState({
+			defaultActiveKey: key,
+			page: 1,
+			limit: 5
+		})
+		let data = {
+			key: key,
+			page: 1,
+			limit: 5
+		}
+		if (key === "1" || key === "2") {
+			this.gogetdatas(data);
+		}
+	}
+
+	gogetdatas = (mydata) => {
+		this.setState({
+			Spin: true
+		})
+		const coureid = this.props.match.params.coursesId;
+		let urls = `/courses/${coureid}/attendances.json`;
+		let arry = {}
+		if (mydata.key === "1" || mydata.key === 1) {
+			arry = {
+				page: mydata.page,
+				limit: mydata.limit,
+			};
+		} else if (mydata.key === "2" || mydata.key === 2) {
+			arry = {
+				history: true,
+				page: mydata.page,
+				limit: mydata.limit,
+			}
+		}
+		axios.get(urls, {
+			params: arry
+		}).then((response) => {
+			//.log(response);
+			if (response) {
+				if (response.data) {
+					this.setState({
+						attendances_count: response.data.attendances_count,
+						datas: response.data.attendances,
+						normal_count: response.data.normal_count,
+						leave_count: response.data.leave_count,
+						absence_count: response.data.absence_count,
+					})
+					if (response.data.attendances.length === 0 && mydata.page !== 1) {
+						this.setState({
+							page: mydata.page - 1,
+							limit: 5
+						})
+						let data = {
+							key: mydata.key,
+							page: mydata.page - 1,
+							limit: 5
+						}
+						this.gogetdatas(data);
+					}
+				}
+			}
+			this.setState({
+				Spin: false
+			})
+		}).catch((error) => {
+			this.setState({
+				Spin: false
+			})
+		})
+	}
+
+	Createsign = () => {
+		this.setState({
+			visible: true
+		})
+	}
+
+
+	hideCreatesign = () => {
+		this.setState({
+			visible: false
+		})
+	}
+
+
+	paginationonChange = (pageNumber) => {
+		this.setState({
+			page: pageNumber,
+		})
+
+		let data = {
+			key: this.state.defaultActiveKey,
+			page: pageNumber,
+			limit: 5
+		}
+		this.gogetdatas(data);
+
+	}
+
+	getsetdatas = () => {
+		let data = {
+			key: this.state.defaultActiveKey,
+			page: this.state.page,
+			limit: 5
+		}
+		this.gogetdatas(data);
+	}
+
+	Gotomodes(data, bool) {
+		if (bool === true) {
+			this.setState({
+				Studentssigntypedata: data,
+				Studentssigntype: true
+			})
+		} else {
+			this.setState({
+				Studentssigntype: false,
+				Studentssigntypedata: null,
+
+			})
+		}
+
+
+	}
+	GotomQrcodesodesy(data, bool) {
+		if (bool === true) {
+			this.setState({
+				Qrcodesignintype: true,
+				Qrcodesignintypedata: data,
+			})
+		} else {
+			this.setState({
+				Qrcodesignintype: false,
+				Qrcodesignintypedata: null,
+
+			})
+		}
+
+
+	}
+
+	qiandaoxiangq = (bool, id) => {
+		this.setState({
+			switchs: bool,
+			switattendance_id: id,
+		})
+		if (bool === false) {
+			this.getsetdatas();
+		}
+	}
+
+
+	settabsdata = () => {
+		let data = {
+			defaultActiveKey: "1",
+			key: "1",
+			page: 1,
+			limit: 5
+		}
+		this.gogetdatas(data);
+	}
+
+	Signinnamestypes = (id, bool, name) => {
+		this.setState({
+			switattendance_id: id,
+			Signinnamestype: bool,
+			mybianjiname: name,
+		})
+	}
+
+
+	render() {
+
+		let { page, per_page, count, defaultActiveKey, limit, attendances_count, datas, absence_count, leave_count, normal_count,
+			Studentssigntype, Studentssigntypedata, Qrcodesignintype, Qrcodesignintypedata, switchs, switattendance_id, Spin,
+			mybianjiname
+		} = this.state;
+		const isAdmin = this.props.isAdmin();
+
+		return (
+			<React.Fragment>
+
+				<div className="">
+					{/*编辑名称*/}
+					<Signinname
+						{...this.props}
+						{...this.state}
+						switattendance_id={switattendance_id}
+						mybianjiname={mybianjiname}
+						Signinnamestypes={(id, b, a) => this.Signinnamestypes(id, b, a)}
+						getsetdatas={() => this.getsetdatas()}
+					/>
+					{/*创建实训*/}
+					{this.state.visible === true ? <Createsignmodel
+						{...this.state}
+						{...this.props}
+						hideCreatesign={() => this.hideCreatesign()}
+						settabsdata={() => this.settabsdata()}
+					/> : ""}
+					{/*签到*/}
+					<Studentssignmodels
+						{...this.state}
+						{...this.props}
+						Studentssigntype={Studentssigntype}
+						Studentssigntypedata={Studentssigntypedata}
+						Gotomodes={(d, b) => this.Gotomodes(d, b)}
+						getsetdatas={() => this.getsetdatas()}
+					/>
+					{/*二维码*/}
+					<Qrcodesignin
+						{...this.state}
+						{...this.props}
+						Qrcodesignintype={Qrcodesignintype}
+						Qrcodesignintypedata={Qrcodesignintypedata}
+						getsetdatas={() => this.getsetdatas()}
+						GotomQrcodesodesy={(d, b) => this.GotomQrcodesodesy(d, b)}
+					/>
+					{
+						switchs === false ?
+							<div className="clearfix   yslmaxheigthk" >
+								<div className="ws100s" style={{
+									position: "relative"
+								}}>
+									<Tabs activeKey={defaultActiveKey} onChange={this.callback}>
+										<TabPane tab="正在签到" key="1">
+											<p className="mt20 mysligtes">共{attendances_count}个签到正在进行</p>
+											<Teaccomponent
+												Spin={Spin}
+												Signinnamestypes={(id, b, a) => this.Signinnamestypes(id, b, a)}
+												qiandaoxiangq={(b, id) => this.qiandaoxiangq(b, id)}
+												Gotomodes={(d, b) => this.Gotomodes(d, b)}
+												GotomQrcodesodesy={(d, b) => this.GotomQrcodesodesy(d, b)}
+												getsetdatas={() => this.getsetdatas()}
+												datas={datas}
+												defaultActiveKey={defaultActiveKey}
+												{...this.state}
+												{...this.props}
+
+											></Teaccomponent>
+
+
+
+											<div className="mb30 clearfix educontent mt40 intermediatecenter">
+												{attendances_count > 0 ? <Pagination showQuickJumper current={page} onChange={this.paginationonChange}
+													pageSize={limit}
+													total={attendances_count}></Pagination> : ''}
+											</div>
+										</TabPane>
+										<TabPane tab="历史签到" key="2">
+											<div className="ws100s mt20 sortinxdirection">
+												<p className=" ws50s mysligtes sortinxdirection">已完成{attendances_count}次签到</p>
+												{
+													isAdmin === false ?
+														<div className="ws50s xaxisreverseorder">
+															<p className="kkp pr32 " style={{ color: "#FF835C" }}>旷课：{absence_count}</p>
+															<p className="kkp mr20r" style={{ color: "#EAAE4E" }}>请假：{leave_count}</p>
+															<p className="kkp mr20r" style={{ color: "#26C7C9" }}>正常签到：{normal_count}</p>
+
+														</div>
+														:
+														""
+												}
+											</div>
+
+
+
+											<Teaccomponent
+												Spin={Spin}
+												Signinnamestypes={(id, b, a) => this.Signinnamestypes(id, b, a)}
+												qiandaoxiangq={(b, id) => this.qiandaoxiangq(b, id)}
+												Gotomodes={(d, b) => this.Gotomodes(d, b)}
+												GotomQrcodesodesy={(d, b) => this.GotomQrcodesodesy(d, b)}
+												getsetdatas={() => this.getsetdatas()}
+												datas={datas}
+												defaultActiveKey={defaultActiveKey}
+												{...this.state}
+												{...this.props}
+											></Teaccomponent>
+
+
+											<div className="mb30 clearfix educontent mt40 intermediatecenter">
+												{attendances_count > 0 ? <Pagination showQuickJumper current={page} onChange={this.paginationonChange}
+													pageSize={limit}
+													total={attendances_count}></Pagination> : ''
+												}</div>
+										</TabPane>
+										{
+											isAdmin === true ?
+												<TabPane tab="签到统计" key="3">
+													{defaultActiveKey && defaultActiveKey === "3" ? <Signinstatistics
+														{...this.props}
+														{...this.state}
+													/> : ""}
+												</TabPane>
+												:
+												""
+										}
+
+									</Tabs>
+									{
+										isAdmin ?
+											<div className="positiondivs sortinxdirection xiaoshou">
+												<i className="iconfont icon-bianji5  posiivsicon"></i>
+												<p className="posiivs xiaoshou" onClick={() => this.Createsign()}>创建签到</p>
+											</div>
+											: ""
+									}
+								</div>
+
+							</div>
+							:
+							// 签到详情
+							<Signindetails
+								defaultActiveKey={defaultActiveKey}
+								switattendance_id={switattendance_id}
+								{...this.props}
+								{...this.state}
+								qiandaoxiangq={(b) => this.qiandaoxiangq(b)}
+							></Signindetails>
+
+					}
+
+				</div>
+			</React.Fragment>
+		)
+	}
+}
+export default Students_signin;
diff --git a/src/modules/courses/statistics/Statistics.js b/src/modules/courses/statistics/Statistics.js
index d0f47e21..8d0d0984 100644
--- a/src/modules/courses/statistics/Statistics.js
+++ b/src/modules/courses/statistics/Statistics.js
@@ -172,6 +172,8 @@ class Statistics extends Component{
 				}
 
 			})
+
+		// console.log(getRandomcode(`${url}?${urllist}`))
 		this.props.slowDownload(getRandomcode(`${url}?${urllist}`));
 	}
 
@@ -419,6 +421,7 @@ class Statistics extends Component{
 			}
 			{
 				this.props.isAdmin()===true?
+					// 这里是文件下载 不能替换路由
 					<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出</a>
 					:""
 			}
diff --git a/src/modules/courses/videostatistics/Videostatistics.js b/src/modules/courses/videostatistics/Videostatistics.js
new file mode 100644
index 00000000..0fc6aca0
--- /dev/null
+++ b/src/modules/courses/videostatistics/Videostatistics.js
@@ -0,0 +1,134 @@
+import React,{ Component } from "react";
+import axios from 'axios';
+import '../signin/css/signincdi.css';
+import Videostatisticscom from './component/Videostatisticscom';
+import Videostatisticslist from './component/Videostatisticslist';
+import Videostatisticscomtwo from './component/Videostatisticscomtwo';
+import Studenticscom from './component/Studenticscom';
+import Studentstatistics from './component/Studentstatistics';
+
+
+//在线学习
+class Videostatistics extends Component{
+	constructor(props){
+		super(props);
+    this.state={
+			watch_staticsdata:[],
+			tisticsbool:false,
+			tisid:null,
+			mytitle:""
+		}
+
+
+	}
+
+	componentDidMount() {
+		const myisAdmin= this.props&& this.props.isAdmin();
+		if(myisAdmin===true){
+			this.togetdatas();
+		}else{
+     this.togetdataStudent();
+		}
+
+	}
+	details=()=>{
+
+	}
+
+   togetdatas(){
+		 console.log("视频统计老师");
+		 const CourseId=this.props.match.params.coursesId;
+		 let url=`/courses/${CourseId}/watch_statics.json`;
+		 axios.get(url,{params: {all:true}}).then((response) => {
+			 if(response){
+         this.setState({
+					 watch_staticsdata:response.data,
+				 })
+
+			 }
+
+		 }).catch((error) => {
+
+
+		 });
+	 }
+
+	togetdataStudent(){
+		console.log("视频统计学生数据");
+		const CourseId=this.props.match.params.coursesId;
+		let url=`/courses/${CourseId}/watch_statics.json`;
+		axios.get(url).then((response) => {
+			if(response){
+				this.setState({
+					watch_staticsdata:response.data,
+				})
+
+			}
+
+		}).catch((error) => {
+
+
+		});
+	}
+
+	tisticsbools=(bool,id,mytitle)=>{
+		this.setState({
+			tisticsbool:bool,
+			tisid:id,
+			mytitle:mytitle
+		})
+	}
+
+
+	render(){
+		let {watch_staticsdata,tisticsbool,tisid,mytitle}= this.state;
+		const isAdmin = this.props&& this.props.isAdmin();
+
+		return(
+			<React.Fragment>
+				<div className="ws100s">
+					<script>
+						{
+							`
+							a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							
+							`
+						}
+					</script>
+					{
+						tisticsbool===false?
+							<div className="ws100s" style={{
+								position: "relative",
+							}}>
+								{
+									isAdmin?
+										<Videostatisticscom {...this.state} {...this.props} watch_staticsdata={watch_staticsdata} statisticsy={(b)=>this.props.statisticsy(b)}></Videostatisticscom>
+										:
+										<Studenticscom {...this.state} {...this.props} watch_staticsdata={watch_staticsdata} statisticsy={(b)=>this.props.statisticsy(b)}></Studenticscom>
+
+								}
+
+
+
+								<div>
+									{	isAdmin?
+										<Videostatisticslist  {...this.state} {...this.props} tisticsbools={(b,id,t)=>this.tisticsbools(b,id,t)}></Videostatisticslist>
+										:
+										<Studentstatistics  {...this.state} {...this.props} tisticsbools={(b,id,t)=>this.tisticsbools(b,id,t)}></Studentstatistics>
+									}
+
+
+								</div>
+							</div>
+							:
+            <Videostatisticscomtwo  {...this.state} {...this.props} tisid={tisid} mytitle={mytitle} tisticsbools={(b,id,t)=>this.tisticsbools(b,id,t)}></Videostatisticscomtwo>
+					}
+
+				</div>
+			</React.Fragment>
+		)
+	}
+}
+export default Videostatistics;
diff --git a/src/modules/courses/videostatistics/component/Studenticscom.js b/src/modules/courses/videostatistics/component/Studenticscom.js
new file mode 100644
index 00000000..a4a78ebd
--- /dev/null
+++ b/src/modules/courses/videostatistics/component/Studenticscom.js
@@ -0,0 +1,119 @@
+import React, {Component} from "react";
+import '../../signin/css/signincdi.css';
+import {Progress, message,Tooltip} from 'antd';
+import {getImageUrl,formatSeconds} from 'educoder';
+import axios from 'axios';
+
+
+
+//条目
+class Studenticscom extends Component {
+	//条目组件
+	constructor(props) {
+		super(props);
+
+		this.state = {}
+	}
+
+	componentDidMount() {
+
+	}
+
+	componentDidUpdate = (prevProps) => {
+
+
+	}
+
+
+
+	render() {
+
+		return (
+			<React.Fragment>
+				<div className="ws100s edu-back-white sortinxdirection" style={{
+					position: "relative"
+				}}>
+					<script>
+						{
+							`
+							a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+						}
+					</script>
+					<div className="ws100s teacherentrydivss ">
+						<div className="ws100s sortinxdirection">
+							<p className="sortinxdirection h40s" onClick={()=>this.props.statisticsy(false)} >
+								<i className="iconfont icon-zuojiantou1 font-14  posiivsiconmyss mr5 colorbluesigin xiaoshou h36s" style={{color:'#BBBBBB'}} onClick={()=>this.props.statisticsy(false)} ></i>
+							</p>
+							<div className="ws47s sptits font-18" style={{
+								color:"#333333"
+							}}><span className="ml10">视频统计总览</span></div>
+							<div className="ws50s sptitss xaxisreverseorder">播放数据从{this.props.watch_staticsdata&&this.props.watch_staticsdata.begin_at?this.props.watch_staticsdata.begin_at:0}开始统计</div>
+						</div>
+						<style>
+							{
+								`
+              .yslsprenshu{
+                background-image: url(${getImageUrl(`images/qiandao/studentbz1.png`)});
+                  background-repeat:no-repeat;
+                -moz-background-size:100% 100%; 
+                background-size:100% 100%;
+              }
+              .yslspcishu{
+                background-image: url(${getImageUrl(`images/qiandao/studentbz2.png`)});
+                  background-repeat:no-repeat;
+                -moz-background-size:100% 100%; 
+                background-size:100% 100%;
+              }
+             .yslshipingshi{
+                background-image: url(${getImageUrl(`images/qiandao/studentbz3.png`)});
+                 background-repeat:no-repeat;
+                -moz-background-size:100% 100%; 
+                background-size:100% 100%;
+              }
+                  
+              `
+							}
+						</style>
+						<div className="ws100s spacearound mt10">
+							<div className="yslsprenshu mr30" style={{width:260,height:100}}>
+								<div className="ws100s verticallayout tbrt">
+									<div className="ws100s ts">观看总次数（次）</div>
+									<div className="ws100s tss">{this.props.watch_staticsdata&&this.props.watch_staticsdata.freq?this.props.watch_staticsdata.freq:0}</div>
+
+								</div>
+
+							</div>
+
+							<div className="yslspcishu mr30" style={{width:260,height:100}}>
+								<div className="ws100s verticallayout tbrt">
+									<div className="ws100s ts">观看总个数（个）</div>
+									<div className="ws100s tss">{this.props.watch_staticsdata&&this.props.watch_staticsdata.num?this.props.watch_staticsdata.num:0}</div>
+								</div>
+							</div>
+
+							<div className="yslshipingshi" style={{width:260,height:100}}>
+								<div className="ws100s verticallayout tbrt">
+									<div className="ws100 ts">总观看时长（时）</div>
+									<Tooltip placement="bottom" title={this.props.watch_staticsdata&&this.props.watch_staticsdata.total_duration?formatSeconds(this.props.watch_staticsdata.total_duration):0}>
+										<div className="maxnamewidth166ss tss">{this.props.watch_staticsdata&&this.props.watch_staticsdata.total_duration?formatSeconds(this.props.watch_staticsdata.total_duration):0}</div>
+									</Tooltip>
+								</div>
+							</div>
+
+						</div>
+
+
+
+					</div>
+
+				</div>
+
+			</React.Fragment>
+		)
+	}
+}
+
+export default Studenticscom;
diff --git a/src/modules/courses/videostatistics/component/Studentstatistics.js b/src/modules/courses/videostatistics/component/Studentstatistics.js
new file mode 100644
index 00000000..a9fef790
--- /dev/null
+++ b/src/modules/courses/videostatistics/component/Studentstatistics.js
@@ -0,0 +1,350 @@
+import React, {Component} from "react";
+import '../../signin/css/signincdi.css';
+import {Pagination,Table,Spin} from 'antd';
+import {getImageUrl,sortDirections,formatSeconds} from 'educoder';
+import axios from 'axios';
+import LoadingSpin from "../../../../common/LoadingSpin";
+import NoneDatas from "../../signin/component/NoneDatas";
+
+
+//条目
+class Studentstatistics extends Component {
+	//条目组件
+	constructor(props) {
+		super(props);
+
+		this.state = {
+			columnsstu: [
+				{
+					title: '序号',
+					dataIndex: 'number',
+					key: 'number',
+					align: "center",
+					className: 'font-14',
+					width: '90px',
+					render: (text, record) => (
+						<span style={{width: '90px'}}>{record.number}</span>
+					),
+				},
+				{
+					title: '视频名称',
+					dataIndex: 'title',
+					key: 'title',
+					align: "left",
+					className: 'font-14 maxnamewidth150s',
+					width: '150px',
+					render: (text, record) => (
+						<div style={{width: '150px'}} className="maxnamewidth150s textalignlefts">
+							<script>
+								{
+									`
+							a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+								}
+							</script>
+							<a className="maxnamewidth150s textalignlefts xiaoshout" style={{
+								color:"#333333"
+							}} title={record.title}>{record.title}</a>
+
+						</div>
+					),
+				},
+				{
+					title: '观看次数（次）',
+					dataIndex: 'feq',
+					key: 'feq',
+					align: "center",
+					className: 'font-14',
+					width: '98px',
+					sorter: true,
+					sortDirections: sortDirections,
+					render: (text, record) => (
+						<span style={{width: '98px'}}>{record.feq}</span>
+					),
+				},
+				{
+					title: '观看时长',
+					dataIndex: 'total_duration',
+					key: 'total_duration',
+					align: "center",
+					className: 'font-14 maxnamewidth100s',
+					width: '100px',
+					sorter: true,
+					sortDirections: sortDirections,
+					render: (text, record) => (
+						<div style={{width: '100px'}} className="maxnamewidth100s ">
+							<script>
+								{
+									`
+							a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+								}
+							</script>
+							<a className="maxnamewidth100s xiaoshout" style={{
+								color:"#333333"
+							}} title={record.total_duration}>{record.total_duration}</a>
+
+						</div>
+					),
+				},
+				{
+					title: '发布人',
+					dataIndex: 'user_name',
+					key: 'user_name',
+					align: "center",
+					className: 'font-14 maxnamewidth100s',
+					width: '100px',
+					render: (text, record) => (
+						<span style={{width: '100px'}} className="maxnamewidth100s">
+								<script>
+								{
+									`
+							a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+								}
+							</script>
+							<a className="maxnamewidth100s xiaoshout" style={{
+								color:"#333333"
+							}} title={record.user_name}>{record.user_name}</a>
+
+						</span>
+					),
+				},
+				{
+					title: '是否看完',
+					dataIndex: 'is_finished',
+					key: 'is_finished',
+					align: "center",
+					className: 'font-14',
+					width: '90px',
+					render: (text, record) => (
+						<span style={{width: '90px'}}>{record.is_finished === true ?
+							<span style={{color: "#333333"}}>是</span> : <span style={{color: "#E02020"}}>否</span>}</span>
+					),
+				},
+			],
+			loading:false,
+			data:[],
+			page:1,
+			limit:20,
+			members_count:0,
+			order:undefined,
+		}
+	}
+
+	componentDidMount() {
+		let data={
+			page:1,
+			order:this.state.order
+		}
+		this.togetdatas(data);
+
+	}
+
+	componentDidUpdate = (prevProps) => {
+
+
+	}
+	paginationonChange = (pageNumber) => {
+		this.setState({
+			page: pageNumber,
+		})
+		let data={
+			page:pageNumber,
+			order:this.state.order
+		}
+		this.togetdatas(data);
+	}
+
+
+	togetdatas(data){
+		this.setState({
+			loading:true
+		})
+		const CourseId=this.props.match.params.coursesId;
+		let url=`/courses/${CourseId}/own_watch_histories.json`;
+		axios.get(url,{params:data
+		}).then((response) => {
+			if (response) {
+				if (response.data) {
+					if (response.data.data.length > 0) {
+						let datalists = [];
+						for (var i = 0; i < response.data.data.length; i++) {
+							datalists.push({
+								number: (parseInt(this.state.page) - 1) * parseInt(this.state.limit) + (i + 1),
+								title: response.data.data[i].title,
+								user_name: response.data.data[i].user_name,
+								is_finished: response.data.data[i].is_finished,
+								total_duration:response.data.data[i].total_duration?formatSeconds(response.data.data[i].total_duration):0,
+								feq:response.data.data[i].freq,
+								start_at:response.data.data[i].start_at,
+								end_at:response.data.data[i].end_at,
+							})
+						}
+
+						this.setState({
+							data: datalists,
+							members_count: response.data.count,
+						})
+					} else {
+						this.setState({
+							data: [],
+							members_count: response.data.count,
+						})
+					}
+				} else {
+					this.setState({
+						data: [],
+						members_count: response.data.count,
+					})
+				}
+
+
+			}
+
+
+
+			this.setState({
+				loading:false
+			})
+		}).catch((error) => {
+			this.setState({
+				loading:false
+			})
+		});
+	}
+
+
+	//实训作业tbale 列表塞选数据
+	table1handleChange = (pagination, filters, sorter) => {
+		if (JSON.stringify(sorter) === "{}") {
+			//没有选择
+		} else {
+			try {
+				//学生学号排序
+				if (sorter.columnKey === "feq"||sorter.columnKey === "total_duration") {
+					let mysorder="";
+					if (sorter.order === "ascend") {
+						if(sorter.columnKey === "feq"){
+							mysorder="freq-asc";
+						}else{
+							mysorder="total_duration-asc";
+
+						}
+						//升序
+						let data={
+							page:this.state.page,
+							order:mysorder
+						}
+						this.togetdatas(data);
+						this.setState({
+							order: mysorder,
+						})
+					} else if (sorter.order === "descend") {
+						if(sorter.columnKey === "feq"){
+							mysorder="freq-desc";
+						}else{
+							mysorder="total_duration-desc";
+
+						}
+						//降序
+						let data={
+							page:this.state.page,
+							order:mysorder
+						}
+						this.togetdatas(data);
+						this.setState({
+							order: mysorder,
+						})
+					}
+				}
+			} catch (e) {
+
+			}
+
+		}
+
+	}
+
+
+
+	render() {
+		let {loading,data,columnsstu,page,members_count,limit}=this.state;
+		return (
+			<React.Fragment>
+				<div className="ws100s  mt20">
+					<script>
+						{
+							`
+							a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+						}
+					</script>
+					<div className="ws100s edu-back-white">
+						<div className="ws100s teacherentrydivss pd15s">
+							<div className="ws100s sortinxdirection">
+								<div className="ws100s sptits font-18">统计列表</div>
+							</div>
+
+						</div>
+						<style>
+							{
+								`
+								 .ysltableo .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+									 padding: 10px 5px;
+									}
+								`
+							}
+						</style>
+
+						<div className="ws100s ysltableo teacherentrydivs pdinstop0" style={{	minHeight: "400px"}}>
+							{
+								data&&data.length===0?
+									<div style={{
+										minHeight: "400px",
+									}} className="ws100s">
+										<NoneDatas></NoneDatas>
+									</div>
+									:	data&&data.length>0?
+									<Spin spinning={loading}>
+										<Table
+											columns={columnsstu}
+											dataSource={data}
+											pagination={false}
+											onChange={this.table1handleChange}
+										/>
+									</Spin>:
+									""
+							}
+
+
+						</div>
+
+					</div>
+
+					<div className="mb30 clearfix educontent mt40 intermediatecenter">
+						{
+							data&&data.length>0?
+								<Pagination showQuickJumper current={this.state.page} onChange={this.paginationonChange}
+														pageSize={this.state.limit}
+														total={this.state.members_count}></Pagination>
+								:""
+						}
+
+					</div>
+				</div>
+
+			</React.Fragment>
+		)
+	}
+}
+
+export default Studentstatistics;
diff --git a/src/modules/courses/videostatistics/component/Videostatisticscom.js b/src/modules/courses/videostatistics/component/Videostatisticscom.js
new file mode 100644
index 00000000..ea4cee4d
--- /dev/null
+++ b/src/modules/courses/videostatistics/component/Videostatisticscom.js
@@ -0,0 +1,119 @@
+import React, {Component} from "react";
+import '../../signin/css/signincdi.css';
+import {Progress, message,Tooltip} from 'antd';
+import {getImageUrl,formatSeconds} from 'educoder';
+import axios from 'axios';
+
+
+
+//条目
+class Videostatisticscom extends Component {
+	//条目组件
+	constructor(props) {
+		super(props);
+
+		this.state = {}
+	}
+
+	componentDidMount() {
+
+	}
+
+	componentDidUpdate = (prevProps) => {
+
+
+	}
+
+
+
+	render() {
+
+		return (
+			<React.Fragment>
+				<div className="ws100s edu-back-white sortinxdirection" style={{
+					position: "relative"
+				}}>
+					<script>
+						{
+							`
+							a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+						}
+					</script>
+					<div className="ws100s teacherentrydivss ">
+						<div className="ws100s sortinxdirection">
+								<p className="sortinxdirection h40s" onClick={()=>this.props.statisticsy(false)} >
+									<i className="iconfont icon-zuojiantou1 font-14  posiivsiconmyss mr5 colorbluesigin xiaoshou h36s" style={{color:'#BBBBBB'}} onClick={()=>this.props.statisticsy(false)} ></i>
+								</p>
+							<div className="ws47s sptits font-18" style={{
+								color:"#333333"
+							}}><span className="ml10">视频统计总览</span></div>
+							<div className="ws50s sptitss xaxisreverseorder">播放数据从{this.props.watch_staticsdata&&this.props.watch_staticsdata.begin_at?this.props.watch_staticsdata.begin_at:0}开始统计</div>
+						</div>
+						<style>
+							{
+								`
+              .yslsprenshu{
+                background-image: url(${getImageUrl(`images/qiandao/sprenshu.png`)});
+                  background-repeat:no-repeat;
+                -moz-background-size:100% 100%; 
+                background-size:100% 100%;
+              }
+              .yslspcishu{
+                background-image: url(${getImageUrl(`images/qiandao/spcishu.png`)});
+                  background-repeat:no-repeat;
+                -moz-background-size:100% 100%; 
+                background-size:100% 100%;
+              }
+             .yslshipingshi{
+                background-image: url(${getImageUrl(`images/qiandao/shipingshi.png`)});
+                 background-repeat:no-repeat;
+                -moz-background-size:100% 100%; 
+                background-size:100% 100%;
+              }
+                  
+              `
+							}
+						</style>
+						<div className="ws100s spacearound mt10">
+							<div className="yslsprenshu mr30" style={{width:260,height:100}}>
+								<div className="ws100s verticallayout tbrt">
+                 <div className="ws100s ts">观看总人数（人）</div>
+									<div className="ws100s tss">{this.props.watch_staticsdata&&this.props.watch_staticsdata.num?this.props.watch_staticsdata.num:0}</div>
+
+								</div>
+
+							</div>
+
+							<div className="yslspcishu mr30" style={{width:260,height:100}}>
+								<div className="ws100s verticallayout tbrt">
+									<div className="ws100s ts">观看总人次（次）</div>
+									<div className="ws100s tss">{this.props.watch_staticsdata&&this.props.watch_staticsdata.freq?this.props.watch_staticsdata.freq:0}</div>
+								</div>
+							</div>
+
+							<div className="yslshipingshi" style={{width:260,height:100}}>
+								<div className="ws100s verticallayout tbrt">
+									<div className="ws100 ts">总观看时长（时）</div>
+									<Tooltip placement="bottom" title={this.props.watch_staticsdata&&this.props.watch_staticsdata.total_duration?formatSeconds(this.props.watch_staticsdata.total_duration):0}>
+									<div className="maxnamewidth166ss tss">{this.props.watch_staticsdata&&this.props.watch_staticsdata.total_duration?formatSeconds(this.props.watch_staticsdata.total_duration):0}</div>
+									</Tooltip>
+									</div>
+							</div>
+
+						</div>
+
+
+
+					</div>
+
+				</div>
+
+			</React.Fragment>
+		)
+	}
+}
+
+export default Videostatisticscom;
diff --git a/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js b/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
new file mode 100644
index 00000000..800b11b7
--- /dev/null
+++ b/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
@@ -0,0 +1,641 @@
+import React, {Component} from "react";
+import '../../signin/css/signincdi.css';
+import {Pagination, Table, Menu, Dropdown,Spin} from 'antd';
+import {getImageUrl, sortDirections,formatSeconds} from 'educoder';
+import axios from 'axios';
+import LoadingSpin from "../../../../common/LoadingSpin";
+import NoneDatas from "../../signin/component/NoneDatas";
+import moment from 'moment';
+
+
+//条目
+class Videostatisticscomtwo extends Component {
+	//条目组件
+	constructor(props) {
+		super(props);
+
+		this.state = {
+			data: [],
+			page: 1,
+			limit: 20,
+			members_count: 0,
+			columnsstu: [
+				{
+					title: '序号',
+					dataIndex: 'number',
+					key: 'number',
+					align: "center",
+					className: 'font-14',
+					width: '50px',
+					render: (text, record) => (
+						<div style={{width: '50px'}}>{record.number}</div>
+					),
+				},
+				{
+					title: '用户',
+					dataIndex: 'user_name',
+					key: 'user_name',
+					align: "center",
+					className: 'font-14 maxnamewidth100s',
+					width: '100px',
+					render: (text, record) => (
+						<div style={{width: "100px",wordWrap: 'break-word', wordBreak: 'break-word'}} className="maxnamewidth100s">
+							<script>
+								{
+									`
+							a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+								}
+							</script>
+							<a className="maxnamewidth100s xiaoshout" style={{
+								color:"#333333"
+							}} title={record.user_name}>{record.user_name}</a>
+
+							</div>
+					),
+				},
+				{
+					title: '是否看完',
+					dataIndex: 'is_finished',
+					key: 'is_finished',
+					align: "center",
+					className: 'font-14 maxnamewidth90s',
+					width: '90px',
+					render: (text, record) => (
+						<div style={{width: '90px'}} className="maxnamewidth90s">{record.is_finished === true ?
+							<span style={{color: "#333333"}}>是</span> : <span style={{color: "#E02020"}}>否</span>}</div>
+					),
+				},
+				{
+					title: '观看时长',
+					dataIndex: 'total_duration',
+					key: 'total_duration',
+					align: "center",
+					className: 'font-14 maxnamewidth100s',
+					width: '100px',
+					sorter: true,
+					sortDirections: sortDirections,
+					render: (text, record) => (
+						<div style={{width: '100px'}} className="maxnamewidth100s">
+							<script>
+								{
+									`
+							a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+								}
+							</script>
+							<a className="maxnamewidth100s xiaoshout" style={{
+							color:"#333333"
+						}} title={record.total_duration}>{record.total_duration}</a></div>
+					),
+				},
+				{
+					title: '观看次数',
+					dataIndex: 'feq',
+					key: 'feq',
+					align: "center",
+					className: 'font-14 maxnamewidth100s',
+					width: '100px',
+					sorter: true,
+					sortDirections: sortDirections,
+					render: (text, record) => (
+						<div style={{width: '100px'}} className="maxnamewidth100s">
+							<script>
+								{
+									`
+								a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+								}
+							</script>
+						<a  className="maxnamewidth100s xiaoshout" style={{
+							color:"#333333"
+						}}  title={record.feq}>{record.feq}</a>
+						</div>
+					),
+				},
+				{
+					title: '最早观看时间',
+					dataIndex: 'start_at',
+					key: 'start_at',
+					align: "center",
+					className: 'font-14 ',
+					render: (text, record) => (
+						<div>
+							<script>
+								{
+									`
+								a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+								}
+							</script>
+							{
+								record.start_at?
+									<a className="xiaoshout" style={{
+										color:"#333333"
+									}}  title={moment(record.start_at).format('YYYY-MM-DD HH:mm:ss')}>{moment(record.start_at).format('YYYY-MM-DD HH:mm:ss')}</a>
+									:
+									<span style={{color:"#333333"}}>--</span>
+							}
+						</div>
+					),
+				},
+				{
+					title: '最后观看时间',
+					dataIndex: 'end_at',
+					key: 'end_at',
+					align: "center",
+					className: 'font-14 ',
+					render: (text, record) => (
+						<div>
+							<script>
+								{
+									`
+								a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+								}
+							</script>
+							{
+								record.end_at?
+									<a className="xiaoshout" style={{
+										color:"#333333"
+									}}  title={moment(record.end_at).format('YYYY-MM-DD HH:mm:ss')}>{moment(record.end_at).format('YYYY-MM-DD HH:mm:ss')}</a>
+									:
+									<span style={{color:"#333333"}}>--</span>
+
+							}
+
+						</div>
+					),
+				}
+			],
+			loading: false,
+			order: undefined,
+			course_groups: [],
+			fbbool: false,
+			groupsid: null,
+			none_group_member_count:0,
+		}
+	}
+
+	componentDidMount() {
+		this.setState({
+			order: undefined
+		})
+		if (this.props.isAdmin()) {
+			//老师
+			const CourseId = this.props.match.params.coursesId;
+
+			var data = {
+				id: CourseId,
+				page: this.state.page,
+			}
+			this.getdatas(data);
+
+		} else {
+			//学生
+			var data = {
+				page: this.state.page,
+			}
+			this.getdatas(data);
+		}
+		this.fenbans();
+	}
+
+	componentDidUpdate = (prevProps) => {
+
+
+	}
+
+	//分班
+	fenbans = () => {
+		const CourseId = this.props.match.params.coursesId;
+		let url = `/courses/${CourseId}/course_groups.json`;
+		axios.get(url).then((response) => {
+			if (response) {
+				// console.log("分班");
+				// console.log("response");
+				// console.log(response);
+				this.setState({
+					course_groups: response.data.course_groups,
+					current_group_id: response.data.current_group_id,
+					none_group_member_count: response.data.none_group_member_count,
+					group_count: response.data.group_count,
+				})
+			}
+
+		}).catch((error) => {
+
+		});
+	}
+
+	//学生
+	getdatas = (data) => {
+		this.setState({
+			loading: true
+		})
+		const CourseId = this.props.match.params.coursesId;
+		let url = "";
+		if (this.props.isAdmin()) {
+			url = `/course_videos/${this.props.tisid}/watch_histories.json`;
+		} else {
+			url = `/courses/${CourseId}/own_watch_histories.json`;
+		}
+		axios.get(url, {params: data}).then((response) => {
+			if (response) {
+				if (response.data) {
+					if (response.data.data.length > 0) {
+						let datalists = [];
+						for (var i = 0; i < response.data.data.length; i++) {
+							datalists.push({
+								number: (parseInt(this.state.page) - 1) * parseInt(this.state.limit) + (i + 1),
+								user_name: response.data.data[i].user_name,
+								is_finished: response.data.data[i].is_finished,
+								total_duration: response.data.data[i].total_duration?formatSeconds(response.data.data[i].total_duration):0,
+								feq: response.data.data[i].feq,
+								start_at: response.data.data[i].start_at?response.data.data[i].start_at:null,
+								end_at: response.data.data[i].end_at?response.data.data[i].end_at:null,
+								title: response.data.data[i].title,
+							})
+						}
+
+						this.setState({
+							data: datalists,
+							members_count: response.data.count,
+						})
+					} else {
+						this.setState({
+							data: [],
+							members_count: response.data.count,
+						})
+					}
+				} else {
+					this.setState({
+						data: [],
+						members_count: response.data.count,
+					})
+				}
+
+
+			}
+			this.setState({
+				loading: false
+			})
+		}).catch((error) => {
+			this.setState({
+				loading: false
+			})
+		});
+	}
+
+
+	paginationonChange = (pageNumber) => {
+		this.setState({
+			page: pageNumber,
+		})
+		let data = {}
+		if (this.props.isAdmin()) {
+			//老师
+			const CourseId = this.props.match.params.coursesId;
+				data = {
+					id: CourseId,
+					page: pageNumber,
+					group_id: this.state.groupsid,
+					order: this.state.order,
+				}
+		} else {
+			//学生
+			data = {
+				page: pageNumber,
+				order: this.state.order,
+			}
+		}
+		this.getdatas(data);
+	}
+	fenbanone = () => {
+		if (this.state.fbbool === false) {
+			this.setState({
+				fbbool: true
+			})
+		} else {
+			this.setState({
+				fbbool: false
+			})
+		}
+	}
+	setcourse_groups = (id) => {
+		this.setState({
+			groupsid: id
+		})
+//老师
+		const CourseId = this.props.match.params.coursesId;
+
+		var data = {};
+		if (id) {
+			data = {
+				id: CourseId,
+				page: this.state.page,
+				group_id: id
+			}
+
+		} else {
+			try {
+				if(id!==null&&id===0){
+					data = {
+						id: CourseId,
+						page: this.state.page,
+						group_id: id
+					}
+				}else{
+					data = {
+						id: CourseId,
+						page: this.state.page
+					}
+				}
+
+			}catch (e) {
+
+			}
+
+		}
+		this.getdatas(data);
+	}
+
+	//实训作业tbale 列表塞选数据
+	table1handleChange = (pagination, filters, sorter) => {
+		if (JSON.stringify(sorter) === "{}") {
+			//没有选择
+		} else {
+			try {
+				//学生学号排序
+				if (sorter.columnKey === "total_duration" || sorter.columnKey === "feq") {
+					let mysorder = "";
+					if (sorter.order === "ascend") {
+						if (sorter.columnKey === "total_duration") {
+							mysorder = "total_duration-asc";
+						} else {
+							mysorder = "freq-asc";
+
+						}
+						//升序
+						let data = {}
+						if (this.props.isAdmin()) {
+							//老师
+							const CourseId = this.props.match.params.coursesId;
+							if (this.state.groupsid) {
+								data = {
+									id: CourseId,
+									page: this.state.page,
+									group_id: this.state.groupsid,
+									order: mysorder,
+								}
+							} else {
+								data = {
+									id: CourseId,
+									page: this.state.page,
+									order: mysorder,
+								}
+							}
+						} else {
+							//学生
+							data = {
+								page: this.state.page,
+								order: mysorder,
+							}
+						}
+
+						this.getdatas(data);
+						this.setState({
+							order: mysorder,
+						})
+					} else if (sorter.order === "descend") {
+						if (sorter.columnKey === "total_duration") {
+							mysorder = "total_duration-desc";
+
+						} else {
+							mysorder = "freq-desc";
+
+						}
+						//降序
+						let data = {}
+						if (this.props.isAdmin()) {
+							//老师
+							const CourseId = this.props.match.params.coursesId;
+							if (this.state.groupsid) {
+								data = {
+									id: CourseId,
+									page: this.state.page,
+									group_id: this.state.groupsid,
+									order: mysorder,
+								}
+							} else {
+								data = {
+									id: CourseId,
+									page: this.state.page,
+									order: mysorder,
+								}
+							}
+						} else {
+							//学生
+							data = {
+								page: this.state.page,
+								order: mysorder,
+							}
+						}
+
+						this.getdatas(data);
+						this.setState({
+							order: mysorder,
+						})
+
+
+					}
+				}
+			} catch (e) {
+
+			}
+
+		}
+
+	}
+
+
+	render() {
+		let {loading, data, page, limit, members_count, columnsstu, fbbool, course_groups} = this.state;
+		const isAdmin = this.props&& this.props.isAdmin();
+
+		const menu = (
+			<Menu>
+				<Menu.Item>
+					<a onClick={() => this.setcourse_groups(null)}>
+						<p className="maxnamewidth200yss">全部</p>
+					</a>
+				</Menu.Item>
+				{
+					course_groups && course_groups.length > 0 ?
+						(
+							course_groups.map((item, key) => {
+								return (
+									<Menu.Item>
+										<a onClick={() => this.setcourse_groups(item.id)} key={key}>
+											<p className="maxnamewidth200yss">{item.name}</p>
+										</a>
+									</Menu.Item>
+								)
+							})
+						)
+						:
+						""
+				}
+				{
+					this.state.none_group_member_count&&this.state.none_group_member_count>0?
+						<Menu.Item>
+							<a onClick={() => this.setcourse_groups(0)}>
+								<p className="maxnamewidth200yss">未分班</p>
+							</a>
+						</Menu.Item>
+						:
+						""
+				}
+			</Menu>
+		);
+
+		let mytitle="";
+		if(isAdmin){
+			mytitle=this.props&&this.props.mytitle;
+
+		}else{
+			if(this.state.data){
+				if(this.state.data.length>0){
+					try {
+						if(this.state.data[0].title){
+							mytitle=this.state.data[0].title;
+						}
+					}catch (e) {
+
+					}
+
+				}
+			}
+		}
+
+		return (
+			<React.Fragment>
+				<div className="ws100s">
+					<script>
+						{
+							`
+									a{ 
+							    text-decoration:none !important;
+							}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+						}
+					</script>
+					<div className="ws100s teacherentrydivss edu-back-white ">
+						<div className="ws100s sortinxdirection">
+							<p className="sortinxdirection h40s" onClick={() => this.props.tisticsbools(false, null)} >
+								<i className="iconfont icon-zuojiantou1 font-14  posiivsiconmyss mr5 colorbluesigin xiaoshou h36s" style={{color:'#BBBBBB'}}  ></i>
+							</p>
+							<div className="ws50s sptits font-18">
+					     <div className="ml10">{mytitle}</div>
+							</div>
+							<div className="ws50s sptitss xaxisreverseorder font-14" style={{
+								color: "#5091FF",
+								lineHeight: "42px",
+							}}>
+								{/*{*/}
+								{/*	isAdmin === true ?*/}
+								{/*		<div className="xiaoshou ml32" onClick={() => this.props.tisticsbools(false, null)}>*/}
+								{/*			<span className="mr5 xiaoshou">视频统计总览</span><i className="iconfont icon-fanhui  font-13 xiaoshou"></i>*/}
+								{/*		</div>*/}
+								{/*		:""*/}
+								{/*}*/}
+
+								{
+									isAdmin === true ?
+										<div className="xiaoshou" onClick={() => this.fenbanone()}>
+											<Dropdown getPopupContainer={trigger => trigger.parentNode} overlay={menu}
+																placement="bottomLeft">
+								   <span>
+										 	<span className="mr5 xiaoshou">分班</span>
+										 {
+											 fbbool === true ?
+												 <i className="iconfont icon-sanjiaoxing-up   font-13  xiaoshou"></i>
+												 :
+												 <i className="iconfont icon-sanjiaoxing-down  font-13  xiaoshou"></i>
+										 }
+									 </span>
+											</Dropdown>
+										</div>
+										:
+										""
+								}
+
+							</div>
+						</div>
+
+
+						<style>
+							{
+								`
+								 .ysltableo .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+									 padding: 10px 5px;
+									}
+								`
+							}
+						</style>
+
+								<div className="ws100s ysltableo mt10" style={{	minHeight: "400px"}}>
+									{
+										data.length === 0 ?
+											<div style={{
+												minHeight: "400px",
+											}} className="ws100s">
+												<NoneDatas></NoneDatas>
+											</div>
+											:
+											<Spin spinning={loading}>
+											<Table
+												columns={columnsstu}
+												dataSource={data}
+												pagination={false}
+												onChange={this.table1handleChange}
+											/>
+											</Spin>
+									}
+
+
+								</div>
+
+
+					</div>
+
+					<div className="mb30 clearfix educontent mt40 intermediatecenter">
+						{
+							data && data.length > 0 ?
+								<Pagination showQuickJumper current={this.state.page} onChange={this.paginationonChange}
+														pageSize={this.state.limit}
+														total={this.state.members_count}></Pagination>
+								: ""
+						}
+
+					</div>
+				</div>
+
+			</React.Fragment>
+		)
+	}
+}
+
+export default Videostatisticscomtwo;
diff --git a/src/modules/courses/videostatistics/component/Videostatisticslist.js b/src/modules/courses/videostatistics/component/Videostatisticslist.js
new file mode 100644
index 00000000..25c00047
--- /dev/null
+++ b/src/modules/courses/videostatistics/component/Videostatisticslist.js
@@ -0,0 +1,350 @@
+import React, {Component} from "react";
+import '../../signin/css/signincdi.css';
+import {Pagination,Table,Spin} from 'antd';
+import {getImageUrl,sortDirections,formatSeconds} from 'educoder';
+import axios from 'axios';
+import LoadingSpin from "../../../../common/LoadingSpin";
+import NoneDatas from "../../signin/component/NoneDatas";
+
+
+//条目
+class Videostatisticslist extends Component {
+	//条目组件
+	constructor(props) {
+		super(props);
+
+		this.state = {
+			columnsstu: [
+				{
+					title: '序号',
+					dataIndex: 'number',
+					key: 'number',
+					align: "center",
+					className: 'font-14',
+					width: '100px',
+					render: (text, record) => (
+						<span style={{width: '100px'}}>{record.number}</span>
+					),
+				},
+				{
+					title: '视频名称',
+					dataIndex: 'title',
+					key: 'title',
+					align: "left",
+					className: 'font-14 width200s widh150wpos',
+					width:200,
+					render: (text, record) => (
+						<div className="maxnamewidth200ss textalignlefts"  style={{ wordWrap: 'break-word', wordBreak: 'break-word' }}>
+							<script>
+								{
+									`
+									a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+								}
+							</script>
+							<a className="maxnamewidth200ss textalignlefts xiaoshout" style={{
+								color:"#333333"
+							}} title={record.title}>{record.title}</a>
+
+						</div>
+					),
+				},
+				{
+					title: '观看人数',
+					dataIndex: 'people_num',
+					key: 'people_num',
+					align: "center",
+					className: 'font-14 width150s',
+					sorter: true,
+					sortDirections: sortDirections,
+					width:150,
+					render: (text, record) => (
+						<span>{record.people_num}</span>
+					),
+				},
+				{
+					title: '观看时长',
+					dataIndex: 'total_time',
+					key: 'total_time',
+					align: "center",
+					className: 'font-14 width100s ',
+					sorter: true,
+					sortDirections: sortDirections,
+					width:100,
+					render: (text, record) => (
+						<div  className="maxnamewidth100s ">
+							<script>
+								{
+									`
+								a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+								}
+							</script>
+										<a className="maxnamewidth100s xiaoshout" style={{
+											color:"#333333"
+										}} title={record.total_time}>{record.total_time}</a>
+
+							</div>
+					),
+				},
+				{
+					title: '发布人',
+					dataIndex: 'user_name',
+					key: 'user_name',
+					align: "center",
+					className: 'font-14 width150s',
+					width:150,
+					render: (text, record) => (
+						<span  className="maxnamewidth150ss">
+							<script>
+								{
+									`
+								a{text-decoration:none !important;}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+								}
+							</script>
+							<a className="maxnamewidth150ss xiaoshout" style={{
+								color:"#333333"
+							}} title={record.user_name}>{record.user_name}</a>
+
+						</span>
+					),
+				},
+				{
+					title: '详情',
+					dataIndex: 'id',
+					key: 'id',
+					align: "center",
+					className: 'font-14',
+					render: (text, record) => (
+						<span style={{color:'#5091FF'}} className="xiaoshou" onClick={()=>this.props.tisticsbools(true,record.id,record.title)}>详情</span>
+					),
+				}
+			],
+			loading:false,
+			data:[],
+			page:1,
+			limit:20,
+			members_count:0,
+			order:undefined,
+		}
+	}
+
+	componentDidMount() {
+		let data={
+			page:1,
+			order:this.state.order
+		}
+		this.togetdatas(data);
+
+	}
+
+	componentDidUpdate = (prevProps) => {
+
+
+	}
+	paginationonChange = (pageNumber) => {
+		this.setState({
+			page: pageNumber,
+		})
+		let data={
+			page:pageNumber,
+			order:this.state.order
+		}
+   this.togetdatas(data);
+	}
+
+
+	togetdatas(data){
+		this.setState({
+			loading:true
+		})
+		const CourseId=this.props.match.params.coursesId;
+		let url=`/courses/${CourseId}/watch_video_histories.json`;
+		axios.get(url,{params:data
+		}).then((response) => {
+			if (response) {
+				if (response.data) {
+					if (response.data.videos.length > 0) {
+						let datalists = [];
+						for (var i = 0; i < response.data.videos.length; i++) {
+							datalists.push({
+								number: (parseInt(this.state.page) - 1) * parseInt(this.state.limit) + (i + 1),
+								title: response.data.videos[i].title,
+								people_num: response.data.videos[i].people_num,
+								total_time: response.data.videos[i].total_time?formatSeconds(response.data.videos[i].total_time):0,
+								user_name: response.data.videos[i].user_name,
+								id: response.data.videos[i].id,
+						})
+						}
+
+						this.setState({
+							data: datalists,
+							members_count: response.data.count,
+						})
+					} else {
+						this.setState({
+							data: [],
+							members_count: response.data.count,
+						})
+					}
+				} else {
+					this.setState({
+						data: [],
+						members_count: response.data.count,
+					})
+				}
+
+
+			}
+
+
+
+			this.setState({
+				loading:false
+			})
+		}).catch((error) => {
+			this.setState({
+				loading:false
+			})
+		});
+	}
+
+
+	//实训作业tbale 列表塞选数据
+	table1handleChange = (pagination, filters, sorter) => {
+		if (JSON.stringify(sorter) === "{}") {
+			//没有选择
+		} else {
+			try {
+				//学生学号排序
+				if (sorter.columnKey === "people_num"||sorter.columnKey === "total_time") {
+					let mysorder="";
+					if (sorter.order === "ascend") {
+						if(sorter.columnKey === "people_num"){
+							mysorder="people_num-asc";
+						}else{
+							mysorder="total_time-asc";
+
+						}
+						//升序
+						let data={
+							page:this.state.page,
+							order:mysorder
+						}
+						this.togetdatas(data);
+						this.setState({
+							order: mysorder,
+						})
+					} else if (sorter.order === "descend") {
+						if(sorter.columnKey === "people_num"){
+							mysorder="people_num-desc";
+						}else{
+							mysorder="total_time-desc";
+
+						}
+						//降序
+						let data={
+							page:this.state.page,
+							order:mysorder
+						}
+						this.togetdatas(data);
+						this.setState({
+							order: mysorder,
+						})
+					}
+				}
+			} catch (e) {
+
+			}
+
+		}
+
+	}
+
+
+
+	render() {
+    let {loading,data,columnsstu,page,members_count,limit}=this.state;
+		return (
+			<React.Fragment>
+				<div className="ws100s  mt20">
+					<script>
+						{
+							`
+							a{ 
+							    text-decoration:none !important;
+							}
+						  a:hover {text-decoration: none !important;}    
+              a:active{text-decoration:none !important;}
+							`
+						}
+					</script>
+					<div className="ws100s edu-back-white">
+						<div className="ws100s teacherentrydivss pd15s">
+							<div className="ws100s sortinxdirection">
+								<div className="ws100s sptits font-18">统计列表</div>
+							</div>
+
+						</div>
+						<style>
+							{
+								`
+								 .ysltableo .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+									 padding: 10px 10px;
+									}
+								`
+							}
+						</style>
+
+								<div className="ws100s ysltableo teacherentrydivs pdinstop0" style={{	minHeight: "400px"}}>
+									{
+										data&&data.length===0?
+											<div style={{
+												minHeight: "400px",
+											}} className="ws100s">
+												<NoneDatas></NoneDatas>
+											</div>
+											:	data&&data.length>0?
+											<Spin spinning={loading}>
+											<Table
+												columns={columnsstu}
+												dataSource={data}
+												pagination={false}
+												onChange={this.table1handleChange}
+
+											/>
+											</Spin>
+											:
+										""
+									}
+
+
+								</div>
+
+					</div>
+
+					<div className="mb30 clearfix educontent mt40 intermediatecenter">
+						{
+							data&&data.length>0?
+								<Pagination showQuickJumper current={this.state.page} onChange={this.paginationonChange}
+														pageSize={this.state.limit}
+														total={this.state.members_count}></Pagination>
+								:""
+						}
+
+					</div>
+				</div>
+
+			</React.Fragment>
+		)
+	}
+}
+
+export default Videostatisticslist;
diff --git a/src/modules/developer/components/controlSetting/index.js b/src/modules/developer/components/controlSetting/index.js
index 5960187d..dd140985 100644
--- a/src/modules/developer/components/controlSetting/index.js
+++ b/src/modules/developer/components/controlSetting/index.js
@@ -1,46 +1,44 @@
 /*
  * @Description: 右侧代码块控制台
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-27 16:02:36
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-01-20 17:42:06
  */
 import './index.scss';
 import React, { useState, useRef, useEffect } from 'react';
-import { Tabs, Button, Icon, notification  } from 'antd';
+import { Button, Icon, notification } from 'antd';
 import { connect } from 'react-redux';
 import InitTabCtx from '../initTabCtx';
 import ExecResult from '../execResult';
 import actions from '../../../../redux/actions';
+import Tabs from '../../../../components/tabs';
+
+
+const tabNavs = [{ value: '1', title: '自定义测试用例' }, { value: '2', title: '代码执行结果' }]
 
-const { TabPane } = Tabs;
 const ControlSetting = (props) => {
 
-  const { 
-    hack,
-    userCode,
+  const {
     inputValue,
     loading,
     submitLoading,
     identifier,
     excuteState,
-    // showOrHideControl,
+    editor_code,
     commitTestRecordDetail,
     changeLoadingState,
     changeSubmitLoadingStatus,
     changeShowOrHideControl,
-    // debuggerCode,
-    // startDebuggerCode, // 外部存入
     onDebuggerCode,
-    // updateCode,
     onSubmitForm
   } = props;
   const [defaultActiveKey, setDefaultActiveKey] = useState('1'); // 当前选中的tab
   const [showTextResult, setShowTextResult] = useState(false); // 是否点击控制台按钮
   const formRef = useRef(null);
 
-  const classNames = `control_tab ${showTextResult ? 'move_up move_up_final' : 'move_down_final'}`;
+  const cls = `control-tab`;
 
   // 切换tab
   const handleTabChange = (key) => {
@@ -59,26 +57,27 @@ const ControlSetting = (props) => {
 
   // 调试代码
   const handleTestCode = (e) => {
-    if (!userCode) {
+    if (!editor_code) {
       notification.warning({
         message: '提示',
         description: '代码块内容不能为空'
       });
       return;
     }
-    // console.log(formRef.current.handleTestCodeFormSubmit);
     // 调出控制台界面
     setShowTextResult(true);
     changeShowOrHideControl(true);
-    formRef.current.handleTestCodeFormSubmit(() => {
-      setDefaultActiveKey('2');
-    });
+    if (formRef.current) {
+      formRef.current.handleTestCodeFormSubmit(() => {
+        setDefaultActiveKey('2');
+      });
+    }
   }
-  
+
   // 提交
   const handleSubmit = (e) => {
     e.preventDefault();
-    if (!userCode) {
+    if (!editor_code) {
       notification.warning({
         message: '提示',
         description: '代码块内容不能为空'
@@ -91,68 +90,52 @@ const ControlSetting = (props) => {
 
   // 处理调度代码
   const handleDebuggerCode = (values) => {
-    // 改变状态值
     changeLoadingState(true);
-    // 调用代码保存接口, 成功后再调用调试接口
-    // updateCode(identifier, values, 'debug');
-    // 调用调试接口
-    // debuggerCode(identifier, values);
     onDebuggerCode(values);
   }
   // icon-shangjiantou
   return (
-    <div className="pane_control_area">
-      <div
-        className="pane_control_collapse" 
-        onClick={handleShowControl}
-        style={{ top: showTextResult ? '-267px' : 0 }}
-      >
-        {/* <i className="iconfont icon-xiajiantou icon"></i> */}
-        <Icon type={ showTextResult ? "down" : "up" } />
+    <div className={`pane_control_area ${showTextResult ? 'active' : ''}`} >
+      <div className="pane_control_collapse" onClick={handleShowControl} style={{ top: showTextResult ? '-322px' : 0 }} >
+        <Icon type={showTextResult ? "down" : "up"} />
       </div>
-      <Tabs
-        className={classNames}
-        activeKey={defaultActiveKey} 
-        tabBarStyle={{ backgroundColor: 'rgba(18,28,36,1)', color: '#fff' }}
-        onChange={handleTabChange}
-      >
-        <TabPane tab={'自定义测试用例'} key={'1'} style={{ height: '280px', overflowY: 'auto' }}>
-          <InitTabCtx 
-            inputValue={inputValue} 
+
+      <Tabs tabs={tabNavs} className={cls} onChange={handleTabChange} activeKey={defaultActiveKey} >
+        <div className={defaultActiveKey == 1 ? 'show-panel' : 'hide-panel'}>
+          <InitTabCtx
+            inputValue={inputValue}
             wrappedComponentRef={(form) => formRef.current = form}
             onDebuggerCode={handleDebuggerCode}
           />
-        </TabPane>
-        <TabPane tab={'代码执行结果'} key={'2'} style={{ height: '280px', overflowY: 'auto' }}>
-          <ExecResult 
+        </div>
+        <div className={defaultActiveKey == 2 ? 'show-panel' : 'hide-panel'}>
+          <ExecResult
             excuteState={excuteState}
             excuteDetail={commitTestRecordDetail}
           />
-        </TabPane>
+        </div>
       </Tabs>
+
       <div className="pane_control_opts">
-        <Button 
-          type="link" 
-          style={{ color: '#fff' }} 
-          // onClick={handleShowControl}
+        <Button
+          type="link"
+          style={{ color: '#fff' }}
         >
-            控制台
-             {/* <Icon type={ showTextResult ? "down" : "up" } /> */}
+          控制台
           </Button>
         <p>
-          <Button ghost 
+          <Button ghost
             loading={loading}
-            style={{ marginRight: '10px', color: '#28BD8B', borderColor: '#28BD8B' }} 
+            style={{ marginRight: '10px', color: '#28BD8B', borderColor: '#28BD8B' }}
             onClick={handleTestCode}
             disabled={!identifier}
           >调试代码</Button>
-          <Button 
+          <Button
             loading={submitLoading}
             type="primary"
             onClick={handleSubmit}
-        >
-          {/* {props.identifier ? '更新' : '提交'} */}
-          提交
+          >
+            提交
         </Button>
         </p>
       </div>
@@ -161,12 +144,12 @@ const ControlSetting = (props) => {
 }
 
 const mapStateToProps = (state) => {
-  const {commonReducer, ojForUserReducer} = state;
-  const {loading, excuteState, submitLoading, showOrHideControl } = commonReducer;
-  const { commitTestRecordDetail, hack, userCode } = ojForUserReducer; 
+  const { commonReducer, ojForUserReducer } = state;
+  const { loading, excuteState, submitLoading, showOrHideControl } = commonReducer;
+  const { commitTestRecordDetail, hack, editor_code } = ojForUserReducer;
   return {
     hack,
-    userCode,
+    editor_code,
     loading,
     submitLoading,
     excuteState,
diff --git a/src/modules/developer/components/controlSetting/index.scss b/src/modules/developer/components/controlSetting/index.scss
index e72eb625..5c295715 100644
--- a/src/modules/developer/components/controlSetting/index.scss
+++ b/src/modules/developer/components/controlSetting/index.scss
@@ -1,12 +1,27 @@
-.pane_control_area{
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  .pane_control_collapse{
+.pane_control_area {
+  position: relative;
+
+  .show-panel {
+    display: block;
+  }
+
+  .hide-panel {
+    display: none;
+  }
+
+  &.active {
+
+    .control-tab {
+      display: block;
+      opacity: 1;
+    }
+  }
+
+  .pane_control_collapse {
     position: absolute;
     width: 55px;
     height: 27px;
-    background:rgba(42,58,79,1);
+    background: rgba(42, 58, 79, 1);
     border-bottom-left-radius: 55px;
     border-bottom-right-radius: 55px;
     left: 50%;
@@ -17,67 +32,45 @@
     opacity: 0.5;
     transition: opacity .3s;
     z-index: 10;
-    .icon{
+
+    .icon {
       position: relative;
       top: 0px;
     }
 
-    &:hover{
+    &:hover {
       opacity: .8;
     }
   }
-  // background: red;
-  // background:rgba(30,30,30,1);
-  // height: 56px;
-  .control_tab{
+
+  .control-tab {
     position: absolute;
-    bottom: -325px;
+    bottom: 56px;
     width: 100%;
-    // transition: all .2s;
-    opacity: 0;
-    // animation: .3s ease-in-out move_up;
-    // &.active{
-    //   bottom: 0;
-    //   opacity: 1;
-    // }
-    &.move_up{
-      animation:  move_up .3s ease-in;
-    }
-    &.move_up_final {
-      bottom: 0;
-      opacity: 1;
-    }
-    &.move_down{
-      animation:  move_down .3s ease-in-out;
-    }
-    &.move_down_final{
-      bottom: -325px;
-      opacity: 0;
-    }
+    display: none;
   }
 
-  .ant-tabs-bar{
+  .ant-tabs-bar {
     padding: 0;
   }
 
-  .ant-tabs-nav .ant-tabs-tab{
+  .ant-tabs-nav .ant-tabs-tab {
     padding: 12px 0px;
   }
 }
 
 
-.ant-tabs-bar{
+.ant-tabs-bar {
   padding: 0 10px;
   margin: 0px;
   border-bottom: transparent;
 }
-.ant-tabs-ink-bar{
+
+.ant-tabs-ink-bar {
   bottom: 1px;
 }
-// .tab_ctx_area.pos_center{
-//   background: #222;
-// }
-.pane_control_opts{
+
+.pane_control_opts {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -85,62 +78,31 @@
   height: 56px;
   padding-right: 20px;
   padding-left: 5px;
-  background: rgba(18,28,36,1);
-  // background:rgba(48,48,48,1);
+  background: rgba(18, 28, 36, 1);
 }
 
-.setting_drawer{
-  .setting_h2{
+.setting_drawer {
+  .setting_h2 {
     line-height: 50px;
   }
-  .setting_desc{
+
+  .setting_desc {
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
-    .flex_item{
+
+    .flex_item {
       line-height: 32px;
       font-size: 12px;
     }
   }
 
-  .ant-drawer-body{
+  .ant-drawer-body {
     height: calc(100vh - 120px);
     overflow-y: auto;
   }
-  .ant-drawer-content{
+
+  .ant-drawer-content {
     top: 120px;
   }
-}
-
-
-@keyframes move_up {
-  0%{
-    opacity: 0;
-    // bottom: -325px;
-  }
-  90%{
-    opacity: 0.5;
-    // bottom: 0px;
-  }
-  100%{
-    opacity: 1;
-    bottom: 0;
-  }
-}
-
-@keyframes move_down{
-  0%{
-    opacity: 1;
-    bottom: 0
-  }
-  10%{
-    opacity: .2;
-  }
-  20%{
-    opacity: 0;
-  }
-  100%{
-    opacity: 0;
-    bottom: -325px;
-  }
 }
\ No newline at end of file
diff --git a/src/modules/developer/components/errorResult/index.js b/src/modules/developer/components/errorResult/index.js
index 25e4068b..35943e82 100644
--- a/src/modules/developer/components/errorResult/index.js
+++ b/src/modules/developer/components/errorResult/index.js
@@ -1,7 +1,7 @@
 /*
- * @Description: 
+ * @Description:
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-12-03 15:20:55
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-27 22:35:14
@@ -30,9 +30,59 @@ function ErrorResult (props) {
       case -1:
         result = (
           <div className={'error_result_wrap error_result_txt'}>
-            <p>输入: [{input}]</p>
-            <p>输出: [{output}]</p>
-            <p>预期: [{expected_output}]</p>
+            <p>实际输入:
+              {/*[{input}]*/}
+              <div className={'error_result_wrap error_result_code mt10'}>
+              <MonacoEditor
+                height="100%"
+                width="100%"
+                language={(language && language.toLowerCase()) || 'c'}
+                value={input}
+                theme="dark"
+                options={{
+                  "readOnly": true,
+                  "minimap": { "enabled": false },
+                  "lineNumbers":false
+                }}
+              />
+              </div>
+            </p>
+            <p className={"mt10"}>实际输出:
+              {/*[{output}]*/}
+              <div className={'error_result_wrap error_result_code mt10'}>
+                <MonacoEditor
+                  height="100%"
+                  width="100%"
+                  language={(language && language.toLowerCase()) || 'c'}
+                  value={output}
+                  theme="dark"
+                  options={{
+                    "readOnly": true,
+                    "minimap": { "enabled": false },
+                    "lineNumbers":false
+                  }}
+                />
+              </div>
+
+            </p>
+            <p className={"mt10"}>预期输出:
+              {/*[{expected_output}]*/}
+              <div className={'error_result_wrap error_result_code mt10'}>
+                <MonacoEditor
+                  height="100%"
+                  width="100%"
+                  language={(language && language.toLowerCase()) || 'c'}
+                  value={expected_output}
+                  theme="dark"
+                  options={{
+                    "readOnly": true,
+                    "minimap": { "enabled": false },
+                    "lineNumbers":false
+                  }}
+                />
+              </div>
+
+            </p>
           </div>
         );
         break;
@@ -60,6 +110,11 @@ function ErrorResult (props) {
               language={(language && language.toLowerCase()) || 'c'}
               value={error_msg}
               theme="dark"
+              options={{
+                "readOnly": true,
+                "minimap": { "enabled": false },
+                "lineNumbers":false
+              }}
             />
           </div>
         );
diff --git a/src/modules/developer/components/execResult/index.js b/src/modules/developer/components/execResult/index.js
index fad32216..eede4ad8 100644
--- a/src/modules/developer/components/execResult/index.js
+++ b/src/modules/developer/components/execResult/index.js
@@ -1,7 +1,7 @@
 /*
  * @Description: 执行结果
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-28 08:44:54
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-26 08:51:21
@@ -9,14 +9,13 @@
 import './index.scss';
 import React, { useState, useEffect } from 'react';
 import { Icon } from 'antd';
+import MonacoEditor from '@monaco-editor/react';
 import CONST from '../../../../constants';
 
-const {reviewResult} = CONST;
-function ExecResult (props) {
+const { newreviewResult } = CONST;
+function ExecResult(props) {
 
   const { excuteState, excuteDetail } = props;
-  // console.log('执行状态: ======', excuteState);
-  // 指定渲染初始, 加载中, 加载完成页面内容
   const renderInit = () => (
     <div className={'excute_result_area excute_flex_center'}>
       <span className={'init_ctx'}>请填写测试用例的输入值，点击“调试代码”</span>
@@ -25,7 +24,7 @@ function ExecResult (props) {
   const renderLoading = () => (
     <div className={'excute_result_area excute_flex_center'}>
       <span className={'loading_ctx'}>
-        <Icon className={'ctx_icon'} type="loading"/>
+        <Icon className={'ctx_icon'} type="loading" />
         <span>加载中...</span>
       </span>
     </div>
@@ -33,7 +32,7 @@ function ExecResult (props) {
   const readerLoaded = () => (
     <div className={'excute_result_area excute_flex_center'}>
       <span className={'loaded_ctx'}>
-        <Icon className={'ctx_icon'} type="loading"/>
+        <Icon className={'ctx_icon'} type="loading" />
         <span>加载完成</span>
       </span>
     </div>
@@ -64,26 +63,37 @@ function ExecResult (props) {
       return (
         <p className={'excute_head_area'}>
           <span className={'excute_head_txt'}>执行结果: </span>
-          <span className={review_class}>{reviewResult[`${state}`]}</span>
+          <span className={review_class}>{newreviewResult[`${state}`]}</span>
         </p>
       )
     }
 
-    // console.log('执行结果====》》》》', status);
     const excuteCtx = (state) => {
       if (state === 0) {
         return (
           <React.Fragment>
-            <p className={'result_info_style'}>输入: {input}</p>
-            <p className={'result_info_style'}>输出: {output}</p>
             <p className={'result_info_style'}>执行用时: {`${execute_time}s`}</p>
+            <p className={'result_info_style'}>输出: </p>
+            <pre>{output}</pre>
           </React.Fragment>
         );
-      } else if (state === 4){
+      } else if (state === 4) {
         return (
           <p className={'result_info_style'}>
-            {/* 系统繁忙，请稍后重试 */}
-            {error_msg}
+            <div className={'error_result_wrap error_result_code mt5'}>
+              <MonacoEditor
+                height="100%"
+                width="100%"
+                language={'c'}
+                value={error_msg}
+                theme="dark"
+                options={{
+                  "readOnly": true,
+                  "minimap": { "enabled": false },
+                  "lineNumbers": false
+                }}
+              />
+            </div>
           </p>
         )
       } else if (state === 3) {
@@ -103,8 +113,23 @@ function ExecResult (props) {
       } else if (state === 5) {
         return (
           <React.Fragment>
-            <p className={'result_info_style'}> 执行出错信息: {error_msg}</p>
-            <p className={'result_info_style'}>最后执行的输入: {input}</p>
+            <p className={'excute_head_txt'}>最后执行的输入: {input}</p>
+            <p className={'excute_head_txt mt5'}>执行出错信息: </p>
+            <div className={'error_result_wrap error_result_code mt5'}>
+              <MonacoEditor
+                height="100%"
+                width="100%"
+                language={'c'}
+                value={error_msg}
+                theme="dark"
+                options={{
+                  "readOnly": true,
+                  "minimap": { "enabled": false },
+                  "lineNumbers": false
+                }}
+              />
+            </div>
+
           </React.Fragment>
         )
       }
@@ -126,9 +151,7 @@ function ExecResult (props) {
   // 提交记录详情
   const [codeResult, setCodeResult] = useState({})
 
-  // 渲染状态变化时渲染相应的内容
   useEffect(() => {
-    // console.log('执行状态====》》》》', excuteState);
     if ('loading' === excuteState) {
       setRenderCtx(() => (renderLoading));
     } else if ('loaded' === excuteState) {
@@ -142,10 +165,9 @@ function ExecResult (props) {
 
   // 提交详情变化时
   useEffect(() => {
-    // console.log('提交记录详情=====>>>>>', excuteDetail);
     setCodeResult(excuteDetail);
   }, [excuteDetail]);
-  
+
   return (
     <React.Fragment>
       {renderCtx()}
diff --git a/src/modules/developer/components/execResult/index.scss b/src/modules/developer/components/execResult/index.scss
index 1a0c2d9f..2f65801b 100644
--- a/src/modules/developer/components/execResult/index.scss
+++ b/src/modules/developer/components/execResult/index.scss
@@ -1,46 +1,50 @@
-.excute_result_area{
+.excute_result_area {
   display: flex;
-  height: 224px;
+  height: 268px;
   width: 100%;
 
-  &.excute_flex_center{
+  &.excute_flex_center {
     align-items: center;
     justify-content: center;
   }
 
-  .init_ctx{
+  .init_ctx {
     color: #666666;
   }
+
   .loading_ctx,
-  .loaded_ctx{
+  .loaded_ctx {
     display: flex;
     flex-direction: column;
     color: #1890ff;
-    .ctx_icon{
+
+    .ctx_icon {
       font-size: 40px;
       margin-bottom: 10px;
     }
   }
 }
 
-.excute_result_info{
-  padding: 20px 30px;
+.excute_result_info {
+  padding: 10px 30px 20px;
   color: #fff;
-  height: 220px;
-  /* overflow-y: auto; */
+  height: 268px;
   overflow-y: auto;
+  background-color: #070f19;
 
-  .result_info_style{
+  .result_info_style {
     word-wrap: break-word;
     color: #ccc;
   }
 
-  .excute_head_area{
+  .excute_head_area {
     line-height: 30px;
-    .excute_suc{
+
+    .excute_suc {
       color: #28BD8B;
     }
-    .excute_err{
+
+    .excute_err {
       color: #E51C24;
     }
   }
diff --git a/src/modules/developer/components/initTabCtx/index.js b/src/modules/developer/components/initTabCtx/index.js
index 831416fa..99a68f1f 100644
--- a/src/modules/developer/components/initTabCtx/index.js
+++ b/src/modules/developer/components/initTabCtx/index.js
@@ -1,14 +1,14 @@
 /*
  * @Description: 自定义测试化用例
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-27 19:46:14
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-26 20:07:35
  */
 import './index.scss';
 import React, { useState, useEffect, useRef, useImperativeHandle, forwardRef } from 'react';
-import { Form, Input} from 'antd';
+import { Form, Input } from 'antd';
 const FormItem = Form.Item;
 const { TextArea } = Input;
 
@@ -20,29 +20,23 @@ const { TextArea } = Input;
  *    onDebuggerCode: func // 点击调试代码执行函数
  * }
  */
-function InitTabCtx (props, ref) {
-  // useImperativeHandle // 让子组件只暴露一定的api给父组件
-  const tabRef = useRef(null);
+function InitTabCtx(props, ref) {
+  const el = useRef(null);
 
   const { inputValue, onDebuggerCode } = props;
 
-  // console.log('default value', inputValue);
   useImperativeHandle(ref, () => ({
     handleTestCodeFormSubmit: (cb) => {
-      // console.log('父组件调用我啦~~~~~~~~~');
       _handleTestCodeFormSubmit(cb);
     }
   }));
 
-  // useEffect(() => {
-  //   console.log('初始值: ========', props);
-  // }, [props]);
 
   // 渲染文本提示信息
   const renderText = () => (<span className={'ctx_default'}>请在这里添加测试用例，点击“调试代码”时将从这里读取输入来测试你的代码...</span>);
   // 渲染表单信息
   const renderForm = () => {
-    const {form: { getFieldDecorator } } = props;
+    const { form: { getFieldDecorator } } = props;
     return (
       <Form className={'user_case_form'}>
         <FormItem
@@ -50,15 +44,14 @@ function InitTabCtx (props, ref) {
         >
           {
             getFieldDecorator('input', {
-              rules: [
-                { required: true, message: '输入值不能为空'}
-              ],
               initialValue: inputValue
-            })(<TextArea 
-                className="input_textarea_style"
-                rows={8}
-                placeholder="请填写测试用例的输入值，点击“调试代码”"
-              />)
+            })(<TextArea
+              ref={el}
+              className="input_textarea_style"
+              rows={8}
+              autoFocus={true}
+              placeholder="请填写测试用例的输入值，点击“调试代码”"
+            />)
           }
         </FormItem>
       </Form>
@@ -69,7 +62,15 @@ function InitTabCtx (props, ref) {
     return function () {
       return renderText();
     };
-  });
+  })
+
+  useEffect(() => {
+    if (el.current) {
+      setTimeout(() => {
+        el.current.focus()
+      }, 100);
+    }
+  }, [el.current])
 
   // 输入值变化时更新渲染内容
   useEffect(() => {
@@ -79,8 +80,8 @@ function InitTabCtx (props, ref) {
   }, [inputValue]);
 
   const _handleTestCodeFormSubmit = (cb) => {
-    const {form} = props;
-    form.validateFields((err, values) => {
+    const { form } = props;
+    form.validateFieldsAndScroll((err, values) => {
       if (!err) { // 表单验证通过时，调用测试接口
         cb && cb(); // 调用回调函数，切换 tab
         onDebuggerCode && onDebuggerCode(values);
@@ -88,8 +89,8 @@ function InitTabCtx (props, ref) {
     });
   }
 
-  return(
-    <div ref={tabRef}>
+  return (
+    <div >
       {renderCtx()}
     </div>
   )
diff --git a/src/modules/developer/components/initTabCtx/index.scss b/src/modules/developer/components/initTabCtx/index.scss
index 992d4953..94e25ee5 100644
--- a/src/modules/developer/components/initTabCtx/index.scss
+++ b/src/modules/developer/components/initTabCtx/index.scss
@@ -1,58 +1,66 @@
-.tab_ctx_area{
+.tab_ctx_area {
   display: flex;
   height: 100%;
   color: #666;
   font-size: 14px;
-  &.pos_start{
+
+  &.pos_start {
     justify-content: flex-start;
   }
-  &.pos_center{
+
+  &.pos_center {
     justify-content: center;
     align-items: center;
   }
-  &.pos_end{
+
+  &.pos_end {
     justify-content: flex-end;
   }
-  .ctx_default{
+
+  .ctx_default {
     margin: 10px 20px;
   }
+
   .ctx_loading,
-  .ctx_loaded{
+  .ctx_loaded {
     display: flex;
     position: relative;
     flex-direction: column;
     top: -20px;
     color: #1890ff;
-    .ctx_icon{
+
+    .ctx_icon {
       font-size: 40px;
       margin-bottom: 10px;
     }
   }
 }
 
-.user_case_form{
+.user_case_form {
   display: flex;
   align-items: flex-start;
-  margin-top: 20px;
-  .input_area{
+  padding-top: 20px;
+  padding: 20px 10px;
+  margin: 0;
+
+  .input_area {
     flex: 1;
-    .ant-form-item-required{
+
+    .ant-form-item-required {
       color: #fff;
     }
   }
-  .flex_l{
-    padding: 0 10px 0 10px;
+
+  .flex_l {
     color: #fff;
   }
-  .flex_r{
-    padding: 0 20px 0 10px;
-  }
 
-  .input_textarea_style{
-    // background:rgba(30,30,30,1) !important;
-    background:rgba(7,15,25,1) !important;
+
+  .input_textarea_style {
+    background: rgba(7, 15, 25, 1) !important;
     color: #fff;
-    border-color: transparent;
+    border: 0px solid transparent !important;
+    height: 200px;
     outline: none;
   }
-}
+}
\ No newline at end of file
diff --git a/src/modules/developer/components/initTabCtx/index1.js b/src/modules/developer/components/initTabCtx/index1.js
index e80bbd76..27ec7eaf 100644
--- a/src/modules/developer/components/initTabCtx/index1.js
+++ b/src/modules/developer/components/initTabCtx/index1.js
@@ -1,7 +1,7 @@
 /*
- * @Description: 显示tab中的内容 
- * @Author: tangjiang 
- * @Date: 2019-11-18 10:43:03 
+ * @Description: 显示tab中的内容
+ * @Author: tangjiang
+ * @Date: 2019-11-18 10:43:03
  * @Last Modified by: tangjiang
  * @Last Modified time: 2019-11-18 11:35:12
  */
@@ -31,7 +31,7 @@ const renderUserCase = (ctx, position, props) => {
           })(<TextArea rows={5} />)
         }
       </FormItem>
-      {/* <FormItem 
+      {/* <FormItem
         className={'input_area flex_r'}
         label="输出">
         {
@@ -76,7 +76,7 @@ class InitTabCtx extends PureComponent {
   handleTestCodeFormSubmit = (cb) => {
     const {form, debuggerCode} = this.props;
     console.log(debuggerCode);
-    form.validateFields((err, values) => {
+    form.validateFieldsAndScroll((err, values) => {
       if (!err) { // 表单验证通过时，调用测试接口
         cb && cb(); // 调用回调函数，切换 tab
         console.log('表单值:', values);
diff --git a/src/modules/developer/components/knowledge/index.js b/src/modules/developer/components/knowledge/index.js
index 9598037a..0a1e0012 100644
--- a/src/modules/developer/components/knowledge/index.js
+++ b/src/modules/developer/components/knowledge/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-30 13:51:19
  * @LastEditors  : tangjiang
- * @LastEditTime : 2020-01-07 15:46:24
+ * @LastEditTime : 2020-02-11 16:34:18
  */
 import './index.scss';
 import React, { useState, useEffect } from 'react';
@@ -22,7 +22,6 @@ function KnowLedge (props) {
     showAdd, // 显示新增图标
     addKnowledge // 调用新增知识点接口
   } = props;
-
   useEffect(() => {
     const _options = [];
     const _selects = [];
diff --git a/src/modules/developer/components/monacoSetting/index.js b/src/modules/developer/components/monacoSetting/index.js
index c66341be..7f86fa28 100644
--- a/src/modules/developer/components/monacoSetting/index.js
+++ b/src/modules/developer/components/monacoSetting/index.js
@@ -7,7 +7,7 @@
  * @LastEditTime : 2019-12-27 10:36:54
  */
 import React, { useState } from 'react';
-import { fromStore, toStore } from 'educoder'; 
+import { fromStore, toStore } from 'educoder';
 // import { Icon } from 'antd';
 // import { Select } from 'antd';
 // const { Option } = Select;
@@ -17,15 +17,15 @@ const SettingDrawer = (props) => {
    * type: '', // 类型: 目录 select 和  文本
    * content: [] // 显示的内容 { text: '' , value: string | [{ key: 1, value: '', text: '' }] }
    */
-  
+
   const [fontSize, setFontSize] = useState(() => {
     return +fromStore('oj_fontSize') || 14;
   });
   const [theme, setTheme] = useState(() => {
-    return fromStore('oj_theme') || 'dark';
+    return fromStore('oj_theme') || 'vs-dark';
   });
 
-  const {title, type = 'label', content = [] } = props;
+  const { title, type = 'label', content = [] } = props;
 
   // 字体改变时， 方法全名:  handleChangeXX, XX 为指定的类型;
   const {
@@ -39,9 +39,9 @@ const SettingDrawer = (props) => {
   }
   // 风格改变时
   const handleChangeStyle = (value) => {
-   setTheme(value);
-   toStore('oj_theme', value);
-   onChangeTheme && onChangeTheme(value);
+    setTheme(value);
+    toStore('oj_theme', value);
+    onChangeTheme && onChangeTheme(value);
   }
 
   const handleSelectChange = (e, type) => {
@@ -73,19 +73,20 @@ const SettingDrawer = (props) => {
           const child = ctx.value.map((opt, i) => {
             return (
               <option
-                key={`key_${i}` || `${opt.value}`} 
+                key={`key_${i}` || `${opt.value}`}
                 value={opt.value}
               >
                 {opt.text}
               </option>
-          )});
+            )
+          });
           renderResult = (
-            <div className={'setting_desc'}  key={`sel_${index}`}>
+            <div className={'setting_desc'} key={`sel_${index}`}>
               <span className={'flex_item'}>{ctx.text}</span>
-              <select defaultValue={defaultValue} style={{ width: '100px'}} onChange={(e) => handleSelectChange(e, ctx.type)}>
+              <select defaultValue={defaultValue} style={{ width: '100px' }} onChange={(e) => handleSelectChange(e, ctx.type)}>
                 {child}
               </select>
-            </div>            
+            </div>
           );
         }
       }
@@ -93,8 +94,8 @@ const SettingDrawer = (props) => {
     });
     return (
       <React.Fragment>
-        <h2 className={'setting_h2'}>{title}</h2>
-        { result }
+        <h3 className={'setting_h2'}>{title}</h3>
+        {result}
       </React.Fragment>
     );
   }
diff --git a/src/modules/developer/components/myMonacoEditor/index.js b/src/modules/developer/components/myMonacoEditor/index.js
index 930561e3..b84bdefe 100644
--- a/src/modules/developer/components/myMonacoEditor/index.js
+++ b/src/modules/developer/components/myMonacoEditor/index.js
@@ -7,17 +7,15 @@
  * @LastEditTime : 2020-01-02 13:59:38
  */
 import './index.scss';
-import React, { useState, useRef, useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Drawer, Tooltip, Badge } from 'antd';
-import { fromStore, CNotificationHOC } from 'educoder'; 
+import { fromStore, CNotificationHOC } from 'educoder';
 import { connect } from 'react-redux';
-import MonacoEditor from '@monaco-editor/react';
+
 import SettingDrawer from '../../components/monacoSetting';
 import CONST from '../../../../constants';
 import MyIcon from '../../../../common/components/MyIcon';
-
-// import actions from '../../../../redux/actions';
-
+import MonacoEditor from '../../../../components/monaco-editor';
 const { fontSetting, opacitySetting } = CONST;
 const maps = {
   'c': 'main.c',
@@ -26,15 +24,15 @@ const maps = {
   'python': 'main.py'
 };
 
-function MyMonacoEditor (props, ref) {
+function MyMonacoEditor(props, ref) {
 
   const {
     code,
     notice,
-    language, 
+    language,
     identifier,
     hadCodeUpdate,
-    showOrHideControl, 
+    showOrHideControl,
     // saveUserInputCode,
     onCodeChange,
     onRestoreInitialCode,
@@ -42,24 +40,12 @@ function MyMonacoEditor (props, ref) {
   } = props;
 
   const [showDrawer, setShowDrawer] = useState(false); // 控制配置滑框
-  // const [editCode, setEditCode] = useState('');
-  // const [curLang, setCurLang] = useState('C');
   const [fontSize, setFontSize] = useState(() => { // 字体
     return +fromStore('oj_fontSize') || 14;
   });
   const [theme, setTheme] = useState(() => { // 主题 theme
-    return fromStore('oj_theme') || 'dark';
+    return fromStore('oj_theme') || 'vs-dark';
   });
-  const [ height, setHeight ] = useState('calc(100% - 56px)');
-  const editorRef = useRef(null);
-
-  // useEffect(() => {
-  //   setEditCode(props.code || '');
-  // }, [props]);
-  
-  useEffect(() => {
-    setHeight(showOrHideControl ? 'calc(100% - 378px)' : 'calc(100% - 56px)');
-  }, [showOrHideControl]);
 
   // 控制侧边栏设置的显示
   const handleShowDrawer = () => {
@@ -78,19 +64,9 @@ function MyMonacoEditor (props, ref) {
     setTheme(value);
   }
 
-    // 文本框内容变化时，记录文本框内容
-  const handleEditorChange = (origin, monaco) => {
-    editorRef.current = monaco; // 获取当前monaco实例
-    // setEditCode(origin); // 保存编辑器初始值
-    editorRef.current.onDidChangeModelContent(e => { // 监听编辑器内容的变化
-      // TODO 需要优化 节流
-      const val = editorRef.current.getValue();
-      // setEditCode(val);
-      // console.log('编辑器代码====>>>>', val);
-      onCodeChange(val);
-      // 值一变化保存当前代码值
-      // saveUserInputCode(val);
-    });
+
+  function onChangeHandler(value) {
+    onCodeChange(value);
   }
 
   // 配置编辑器属性
@@ -99,24 +75,16 @@ function MyMonacoEditor (props, ref) {
     automaticLayout: true,
     fontSize: `${fontSize}px`
   }
-  
+
   // 恢复初始代码
   const handleRestoreCode = () => {
     props.confirm({
       title: '提示',
       content: '确定要恢复代码吗?',
-      onOk () {
+      onOk() {
         onRestoreInitialCode && onRestoreInitialCode();
       }
     })
-    // Modal.confirm({
-    //   content: '确定要恢复代码吗?',
-    //   okText: '确定',
-    //   cancelText: '取消',
-    //   onOk () {
-    //     onRestoreInitialCode && onRestoreInitialCode();
-    //   }
-    // })
   }
 
   const handleUpdateNotice = () => {
@@ -124,49 +92,38 @@ function MyMonacoEditor (props, ref) {
       onUpdateNotice && onUpdateNotice();
     }
   }
-  
-  // const renderRestore = identifier ? (
-  //   <MyIcon type="iconzaicizairu" />
-  // ) : '';
 
-  // lex_has_save ${hadCodeUpdate} ? : ''
   const _classnames = hadCodeUpdate ? `flex_strict flex_has_save` : 'flex_strict';
   return (
     <React.Fragment>
       <div className={"monaco_editor_area"}>
         <div className="code_title">
           {/* 未保存时 ? '学员初始代码文件' : main.x */}
-          <span className='flex_strict' style={{ color: '#ddd'}}>{identifier ? language ? maps[language.toLowerCase()] : '' : '学员初始代码文件'}</span>
+          <span className='flex_strict' style={{ color: '#ddd' }}>{identifier ? language ? maps[language.toLowerCase()] : '' : '学员初始代码文件'}</span>
           <span className={_classnames}>{hadCodeUpdate ? '已保存' : ''}</span>
-          {/* <Tooltip
-            style={{ background: 'gold' }}
-            className="tooltip_style"
-            title="通知" 
-            placement="bottom"
-          > */}
           <Tooltip
             placement="bottom"
             title="通知"
           >
-            <Badge 
-              className="flex_normal" 
-              style={{ color: '#666'}} 
+            <Badge
+              className="flex_normal"
+              style={{ color: '#666' }}
               dot={notice}
               onClick={handleUpdateNotice}
             >
               {/* <Icon type="bell" /> */}
-              <MyIcon type="iconxiaoxi1" style={{fontSize: '18px'}}/>
+              <MyIcon type="iconxiaoxi1" style={{ fontSize: '18px' }} />
             </Badge>
           </Tooltip>
           <Tooltip
             placement="bottom"
             title="恢复"
           >
-            <MyIcon 
-              className="flex_normal" 
-              onClick={handleRestoreCode} 
+            <MyIcon
+              className="flex_normal"
+              onClick={handleRestoreCode}
               type="iconzaicizairu"
-              style={{ display: identifier ? 'inline-block' : 'none', fontSize: '18px'}}
+              style={{ display: identifier ? 'inline-block' : 'none', fontSize: '18px' }}
             />
             {/* <span onClick={handleRestoreCode} className="flex_normal"  style={{ display: identifier ? 'inline-block' : 'none'}}>{renderRestore}</span> */}
           </Tooltip>
@@ -174,33 +131,33 @@ function MyMonacoEditor (props, ref) {
             placement="bottom"
             title="设置"
           >
-            <MyIcon className='code-icon' type="iconshezhi" onClick={handleShowDrawer} style={{fontSize: '18px'}}/>
+            <MyIcon className='code-icon' type="iconshezhi" onClick={handleShowDrawer} style={{ fontSize: '18px' }} />
           </Tooltip>
         </div>
-        <MonacoEditor
-            height={height}
-            width="100%"
-            language={language && language.toLowerCase()}
-            value={code || ''}
-            options={editorOptions}
-            theme={theme} // dark || light
-            editorDidMount={handleEditorChange}
-          />
-      </div>
 
+        <MonacoEditor
+          language={language}
+          value={code || ''}
+          options={editorOptions}
+          theme={theme} // dark || light
+          onChange={onChangeHandler}
+        />
+
+      </div>
       <Drawer
         className={'setting_drawer'}
         placement="right"
         onClose={handleDrawerClose}
         visible={showDrawer}
       >
-        <SettingDrawer 
-          {...fontSetting} 
+        <SettingDrawer
+          {...fontSetting}
           onChangeFontSize={handleChangeFontSize}
           onChangeTheme={handleChangeTheme}
         />
-        <SettingDrawer {...opacitySetting}/>
+        <SettingDrawer {...opacitySetting} />
       </Drawer>
+
     </React.Fragment>
   )
 };
@@ -212,12 +169,6 @@ const mapStateToProps = (state) => {
   }
 };
 
-// const mapDispatchToProps = (dispatch) => ({
-//   // saveUserInputCode: (code) => dispatch(actions.saveUserInputCode(code)),
-// });
-
-// MyMonacoEditor = React.forwardRef(MyMonacoEditor);
 export default connect(
   mapStateToProps,
-  // mapDispatchToProps
-)(CNotificationHOC() (MyMonacoEditor));
+)(CNotificationHOC()(MyMonacoEditor));
diff --git a/src/modules/developer/components/myMonacoEditor/index.scss b/src/modules/developer/components/myMonacoEditor/index.scss
index 45d0975c..c58667cc 100644
--- a/src/modules/developer/components/myMonacoEditor/index.scss
+++ b/src/modules/developer/components/myMonacoEditor/index.scss
@@ -1,28 +1,38 @@
-.monaco_editor_area{
-  height: 100%;
-  background-color: rgba(7,15,25,1);
-  .code_title{
+.user_case_form,
+.excute_result_area {
+  background-color: rgba(7, 15, 25, 1);
+}
+
+.monaco_editor_area {
+  height: calc(100% - 56px);
+  background-color: rgba(7, 15, 25, 1);
+  overflow: hidden;
+
+  .code_title {
     display: flex;
     align-items: center;
-    background-color: rgba(18,28,36,1);
+    background-color: rgba(18, 28, 36, 1);
     color: #fff;
     height: 56px;
     padding: 0 20px;
-    .flex_strict{
+
+    .flex_strict {
       flex: 1;
     }
 
-    .flex_normal{
+    .flex_normal {
       color: #E51C24;
       cursor: pointer;
       margin-right: 20px;
     }
-    .code-icon{
+
+    .code-icon {
       cursor: pointer;
     }
+
     .flex_strict,
     .flex_normal,
-    .code-icon{
+    .code-icon {
       color: #666;
     }
   }
@@ -40,36 +50,39 @@
   // }
 }
 
-.setting_drawer{
-  .ant-drawer-close{
+.setting_drawer {
+  .ant-drawer-close {
     color: #ffffff;
   }
-  .ant-drawer-content{
+
+  .ant-drawer-content {
     top: 120px;
     bottom: 56px;
     height: calc(100vh - 176px);
     // background: #333333;
-    background: rgba(7,15,25,1);
+    background: rgba(7, 15, 25, 1);
     color: #fff;
-    .setting_h2{
+
+    .setting_h2 {
       color: #fff;
     }
 
-    select{
+    select {
       color: #fff;
       background: #222222;
       height: 24px;
       // line-height: 24px;
       margin-top: 4px;
     }
-    select option{
+
+    select option {
       background: gold;
       color: #fff;
     }
   }
 }
 
-.flex_has_save{
+.flex_has_save {
   // animation: blink 3s line 3;
   animation-name: blink;
   animation-duration: .4s;
@@ -83,14 +96,8 @@
 //   background:rgba(3,19,40,1) !important;
 // }
 
-@keyframes blink{
+@keyframes blink {
   50% {
     color: #fff;
   }
-}
-
-.monaco-editor, .monaco-editor-background, .monaco-editor .inputarea.ime-input,
-.monaco-editor .margin,
-.minimap .minimap-decorations-layer{
-  background-color: transparent !important;
 }
\ No newline at end of file
diff --git a/src/modules/developer/components/myMonacoEditor/index2.js b/src/modules/developer/components/myMonacoEditor/index2.js
deleted file mode 100644
index 097fa297..00000000
--- a/src/modules/developer/components/myMonacoEditor/index2.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * @Description: 
- * @Author: tangjiang
- * @Github: 
- * @Date: 2019-12-27 19:18:09
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-27 19:19:23
- */
-import React, { useState } from 'react';
-import Editor from "@monaco-editor/react";
-
-function App() {
-  const [theme, setTheme] = useState("light");
-  const [language, setLanguage] = useState("javascript");
-  const [isEditorReady, setIsEditorReady] = useState(false);
-
-  function handleEditorDidMount() {
-    setIsEditorReady(true);
-  }
-
-  function toggleTheme() {
-    setTheme(theme === "light" ? "dark" : "light");
-  }
-
-  function toggleLanguage() {
-    setLanguage(language === "javascript" ? "python" : "javascript");
-  }
-
-  return (
-    <React.Fragment>
-      <LinkToRepo />
-      <button onClick={toggleTheme} disabled={!isEditorReady}>
-        Toggle theme
-      </button>
-      <button onClick={toggleLanguage} disabled={!isEditorReady}>
-        Toggle language
-      </button>
-
-      <Editor
-        height="calc(100% - 19px)" // By default, it fully fits with its parent
-        theme={theme}
-        language={language}
-        value={'c'}
-        editorDidMount={handleEditorDidMount}
-      />
-    </React.Fragment>
-  );
-}
\ No newline at end of file
diff --git a/src/modules/developer/components/userInfo/index.js b/src/modules/developer/components/userInfo/index.js
index 3508135b..0df27209 100644
--- a/src/modules/developer/components/userInfo/index.js
+++ b/src/modules/developer/components/userInfo/index.js
@@ -1,7 +1,7 @@
 /*
  * @Description: 用户头像及昵称
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-12-09 17:11:28
  * @LastEditors: tangjiang
  * @LastEditTime: 2019-12-09 17:36:55
@@ -11,7 +11,9 @@ import React from 'react';
 import { getImageUrl } from 'educoder'
 
 function UserInfo (props) {
-  const {image_url, name} = props.userInfo;
+  // const {image_url, name} = props&&props.userInfo;
+  const image_url= props&&props.userInfo&&props&&props.userInfo.image_url
+  const name= props&&props.userInfo&&props&&props.userInfo.name
   return (
     <div className={'avator_nicker'}>
       <img style={{ display: image_url ? 'inline-block' : 'none'}} alt="用户头像" className={'student_img'} src={getImageUrl(`images/${image_url}` || 'images/educoder/headNavLogo.png?1526520218')} />
diff --git a/src/modules/developer/newOrEditTask/index.js b/src/modules/developer/newOrEditTask/index.js
index 9be899b9..adc8f08e 100644
--- a/src/modules/developer/newOrEditTask/index.js
+++ b/src/modules/developer/newOrEditTask/index.js
@@ -1,30 +1,27 @@
 /*
  * @Description: 新建或编辑任务
- * @Author: tangjiang 
- * @Date: 2019-11-15 16:38:34 
+ * @Author: tangjiang
+ * @Date: 2019-11-15 16:38:34
  * @Last Modified by: tangjiang
  * @Last Modified time: 2019-11-19 23:23:41
  */
 import './index.scss';
 import React, { useEffect } from 'react';
+import { Link } from 'react-router-dom';
 import { connect } from 'react-redux';
-import SplitPane from 'react-split-pane';// import { Form } from 'antd';
+import SplitPane from 'react-split-pane';
 import { Button } from 'antd';
 import LeftPane from './leftpane';
 import RightPane from './rightpane';
 import { withRouter } from 'react-router';
-import { toStore, CNotificationHOC } from 'educoder';
+import { toStore, CNotificationHOC, queryString } from 'educoder';
 import UserInfo from '../components/userInfo';
-// import RightPane from './rightpane/index';
 import actions from '../../../redux/actions';
-// import {ModalConfirm} from '../../../common/components/ModalConfirm';
 
 const NewOrEditTask = (props) => {
-  const { 
+  const {
     publishLoading,
     handlePublish,
-    // testCases = [],
-    // ojTestCaseValidate = [],
     identifier,
     isPublish,
     userInfo,
@@ -35,42 +32,54 @@ const NewOrEditTask = (props) => {
     getUserInfoForNew,
     handleCancelPublish,
     validateOjForm,
-    getQuestion
-    // updateTestAndValidate,
+    getQuestion,
+    saveSearchParams,
+    setOjInitialValue,
   } = props;
-  
-  // 表单提交
+
   const handleSubmitForm = () => {
-    // 改变loading状态
     changeSubmitLoadingStatus(true);
-    // 调用输入表单验证功能
     if (props.identifier) {
       props.handleUpdateOjForm(props);
     } else {
       props.handleFormSubmit(props); // 提交表单
     }
   };
-  
+
+  const id = props.match.params.id;
   useEffect(() => {
     // 获取用户信息
     getUserInfoForNew();
+    props.saveOJFormId(id);
+    // 获取地址栏查询参数
+    const $searchs = window.location.search && window.location.search.substring(1);
+    if ($searchs) {
+      const $params = $searchs.split('&') || [];
+      let obj = Object.create(null);
+      $params.forEach(item => {
+        const keys = item.split('=');
+        obj[keys[0]] = keys[1];
+      });
+      // 保存初始值
+      if (obj['newoj']) {
+        const tags = obj['tag_discipline_id'];
+        const tag_arrs = (tags && tags.split(',').map(tag => +tag)) || [];
+        setOjInitialValue({
+          difficult: obj['difficult'],
+          sub_discipline_id: obj['sub_discipline_id'],
+          tag_discipline_id: tag_arrs
+        });
+      }
+      saveSearchParams({ searchParams: $searchs, curPage: obj['pages'] });
+    }
     // 获取课程列表
     getQuestion({
       source: 'question'
     });
-    // console.log('获取路由参数： ====', props.match.params);
-    const id = props.match.params.id;
-    // 保存OJForm的id号，指明是编辑还是新增
-    props.saveOJFormId(id);  
     if (id) { // id号即 identifier
-      // TODO id 存在时, 编辑, 获取 store 中的记录数
       props.getOJFormById(id);
-    } else {
-      // 清空store中的测试用例集合
-      // props.clearOJFormStore();
     }
-    return () => {}
-  }, []);
+  }, [id])
 
   // 模拟挑战
   const imitationChallenge = () => {
@@ -83,11 +92,29 @@ const NewOrEditTask = (props) => {
   // 开始挑战
   const startChallenge = () => {
     // 调用 start 接口, 成功后跳转到开启实战
-    // TODO
     identifier && validateOjForm(props, 'challenge', () => {
       startProgramQuestion(identifier, props);
     });
-    // identifier && startProgramQuestion(identifier, props);
+  }
+
+  // 取消
+  const newhandleClickCancel = () => {
+    // 清空当前输入值并跳转至列表页
+    props.clearOJFormStore();
+    // 清空描述信息
+    toStore('oj_description', '');
+    if (props.location.search) {
+      if (props.location.pathname === `/problems/new`) {
+        props.history.push(`/problemset`);
+      } else {
+        props.history.push(`/problemset?${props.searchParams}`);
+      }
+      // let newurl=props.location.search.split('?');
+      // props.history.push(newurl[1]);
+    } else {
+      props.history.push(`/problemset?${props.searchParams}`);
+    }
+
   }
 
   // 取消
@@ -96,34 +123,35 @@ const NewOrEditTask = (props) => {
     props.clearOJFormStore();
     // 清空描述信息
     toStore('oj_description', '');
-    props.history.push('/problems');
+    props.history.push(`/problemset?${props.searchParams}`);
   }
 
+  // 返回试卷
+  // const gotoshijuan = (classrooms,exercises) => {
+  //   // // 清空当前输入值并跳转至列表页
+  //   // props.clearOJFormStore();
+  //   // // 清空描述信息
+  //   // toStore('oj_description', '');
+  //   // props.history.push(` classrooms/${classrooms}/exercises/${exercises}/edit`);
+  // }
+
   // 发布
   const handleClickPublish = () => {
-    // ModalConfirm('提示', (<p>发布后即可应用到自己管理的课堂<br /> 是否确认发布?</p>), () => {
-    //   changePublishLoadingStatus(true);
-    //   handlePublish(props, 'publish');
-    // });
     props.confirm({
       title: '提示',
       content: (<p>发布后即可应用到自己管理的课堂<br /> 是否确认发布?</p>),
-      onOk () {
+      onOk() {
         changePublishLoadingStatus(true);
-        handlePublish(props, 'publish');
+        props.handlePublish(props, 'publish');
       }
     });
   }
   // 撤销发布
   const handleClickCancelPublish = () => {
-    // ModalConfirm('提示', (<p>是否确认撤销发布?</p>), () => {
-    //   changePublishLoadingStatus(true);
-    //   handleCancelPublish(props, identifier);
-    // });
     props.confirm({
       title: '提示',
       content: ((<p>是否确认撤销发布?</p>)),
-      onOk () {
+      onOk() {
         changePublishLoadingStatus(true);
         handleCancelPublish(props, identifier);
       }
@@ -135,11 +163,11 @@ const NewOrEditTask = (props) => {
     return (
       <React.Fragment>
         <Button
-          onClick={handleClickCancel}
+          onClick={newhandleClickCancel}
           style={{ background: '#666666', color: '#fff', border: 'none' }}
         >取消</Button>
-        <Button 
-          type="primary" 
+        <Button
+          type="primary"
           loading={submitLoading}
           onClick={handleSubmitForm}
         >保存</Button>
@@ -149,68 +177,105 @@ const NewOrEditTask = (props) => {
   // 发布/模拟挑战
   const renderPubOrFight = () => {
     const pubButton = isPublish
-     ? (<Button 
-          style={{ background: 'rgba(102,102,102,1)', border: 'none' }}
-          type="primary" 
-          loading={publishLoading}
-          onClick={handleClickCancelPublish}
-       >撤销发布</Button>)
-     : (<Button 
-          type="primary" 
-          loading={publishLoading}
-          onClick={handleClickPublish}
-       >立即发布</Button>);
+      ? (<Button
+        style={{ background: 'rgba(102,102,102,1)', border: 'none' }}
+        type="primary"
+        loading={publishLoading}
+        onClick={handleClickCancelPublish}
+      >撤销发布</Button>)
+      : (<Button
+        type="primary"
+        loading={publishLoading}
+        onClick={handleClickPublish}
+      >立即发布</Button>);
     // 未发布: 模拟挑战 已发布: 开始挑战
     const challengeBtn = isPublish ? (
       <Button type="primary" onClick={startChallenge}>开始挑战</Button>
     ) : (
-      <Button type="primary" onClick={imitationChallenge}>模拟挑战</Button>
-    );
-  
+        <Button type="primary" onClick={imitationChallenge}>模拟挑战</Button>
+      );
+
     if (isPublish) {
       return (
         <React.Fragment>
           {pubButton}
-          <Button 
-              type="primary" 
-              loading={submitLoading}
-              onClick={handleSubmitForm}
-            >保存</Button>
+          <Button
+            type="primary"
+            loading={submitLoading}
+            onClick={handleSubmitForm}
+          >保存</Button>
           {challengeBtn}
         </React.Fragment>
       );
     } else {
       return (
         <React.Fragment>
-          <Button 
-              type="primary" 
-              loading={submitLoading}
-              onClick={handleSubmitForm}
-            >保存</Button>
+          <Button
+            type="primary"
+            loading={submitLoading}
+            onClick={handleSubmitForm}
+          >保存</Button>
           {pubButton}
           {challengeBtn}
         </React.Fragment>
       );
     }
-    
+
   }
 
   // 渲染退出
   const renderQuit = () => {
-    return identifier ? (
-      <Button type="link"
-        icon='poweroff'
-        className='quite_btn'
-        onClick={handleClickCancel}
-      >退出</Button>
-    ) : ''
+
+    try {
+
+      if (queryString.parse(props.location.search) === {} || queryString.parse(props.location.search) === "{}") {
+        return identifier ? (
+          <Button type="link"
+            icon={"poweroff"}
+            className='quite_btn'
+            onClick={handleClickCancel}
+          >{"退出"}</Button>
+        ) : ''
+      } else {
+        let searchlist = queryString.parse(props.location.search)
+        if (searchlist.classrooms) {
+          return identifier ? (
+            <Link className={"xiaoshou"} to={`/classrooms/${searchlist.classrooms}/exercises/${searchlist.exercises}/edit`}>
+              <Button type="link"
+                icon={"left"}
+                className='quite_btn'
+              // onClick={()=>gotoshijuan(searchlist.classrooms,searchlist.exercises)}
+              >{"返回试卷"}</Button>
+            </Link>
+          ) : ''
+        } else {
+          return identifier ? (
+            <Button type="link"
+              icon={"poweroff"}
+              className='quite_btn'
+              onClick={handleClickCancel}
+            >{"退出"}</Button>
+          ) : ''
+        }
+      }
+    } catch (e) {
+      return identifier ? (
+        <Button type="link"
+          icon={"poweroff"}
+          className='quite_btn'
+          onClick={handleClickCancel}
+        >{"退出"}</Button>
+      ) : ''
+    }
+
   }
+  // console.log(props.location.search)
   return (
     <div className={'new_add_task_wrap'}>
       <div className={'task_header'}>
-        <UserInfo userInfo={userInfo}/>
+        <UserInfo userInfo={userInfo} />
         <p className={'header_title'}>{props.name || ''}</p>
-        { renderQuit() }
+        {renderQuit()}
       </div>
       <div className="split-pane-area">
         <SplitPane className='outer-split-pane' split="vertical" minSize={350} maxSize={-350} defaultSize="40%">
@@ -218,25 +283,23 @@ const NewOrEditTask = (props) => {
             <LeftPane />
           </div>
           <SplitPane split="vertical" defaultSize="100%" allowResize={false}>
-            <RightPane onSubmitForm={handleSubmitForm}/>
-            <div />
+            <RightPane onSubmitForm={handleSubmitForm} />
           </SplitPane>
         </SplitPane>
       </div>
-      {/* 控制台 */}
       <div className='new_add_task_ctl'>
         {
           /* 录入时: 取消 保存 */
           /* 保存未发布: 立即发布 模拟挑战  */
         }
-        { !identifier ? renderSaveOrCancel() : renderPubOrFight() }
+        {!identifier ? renderSaveOrCancel() : renderPubOrFight()}
       </div>
     </div>
   )
 }
 
 const mapStateToProps = (state) => {
-  const { ojForm, identifier, testCases, isPublish } = state.ojFormReducer;
+  const { ojForm, identifier, testCases, isPublish, searchParams, courseQuestions } = state.ojFormReducer;
   const { publishLoading, submitLoading } = state.commonReducer;
   const { userInfo } = state.userReducer;
   return {
@@ -246,7 +309,9 @@ const mapStateToProps = (state) => {
     isPublish, // 是否已发布
     publishLoading,
     submitLoading,
-    userInfo
+    userInfo,
+    searchParams,
+    courseQuestions
   }
 };
 
@@ -269,7 +334,7 @@ const mapDispatchToProps = (dispatch) => ({
   clearOJFormStore: () => dispatch(actions.clearOJFormStore()),
   // 按钮状态
   changeSubmitLoadingStatus: (flag) => dispatch(actions.changeSubmitLoadingStatus(flag)),
-  // 发布按钮状态 
+  // 发布按钮状态
   changePublishLoadingStatus: (flag) => dispatch(actions.changePublishLoadingStatus(flag)),
   // 测试用例及验证
   updateTestAndValidate: (obj) => dispatch(actions.updateTestAndValidate(obj)),
@@ -278,10 +343,12 @@ const mapDispatchToProps = (dispatch) => ({
   // 新建时获取信息
   getUserInfoForNew: () => dispatch(actions.getUserInfoForNew()),
   validateOjForm: (props, type, cb) => dispatch(actions.validateOjForm(props, type, cb)),
-  getQuestion: (params) => dispatch(actions.getQuestion(params))
+  getQuestion: (params) => dispatch(actions.getQuestion(params)),
+  saveSearchParams: (params) => dispatch(actions.saveSearchParams(params)),
+  setOjInitialValue: (params) => dispatch(actions.setOjInitialValue(params))
 });
 
 export default withRouter(connect(
   mapStateToProps,
   mapDispatchToProps
-)(CNotificationHOC() (NewOrEditTask)));
+)(CNotificationHOC()(NewOrEditTask)));
diff --git a/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js b/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js
index a16f30c1..43856d95 100644
--- a/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js
+++ b/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js
@@ -1,7 +1,7 @@
 /*
  * @Description: 添加测试用例
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-21 09:19:38
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-27 10:37:41
@@ -19,14 +19,14 @@ const AddTestDemo = (props) => {
   const {
     // key,
     // onSubmitTest,
-    onDeleteTest, 
+    onDeleteTest,
     testCase,
     testCaseValidate,
     isOpen
   } = props;
 
   // const [isEditor, setIsEditor] = useState(false); // 是否是编辑
-  
+
   // 删除操作
   const handleDeletePanel = (e) => {
     // console.log('点击的删除按钮')
@@ -63,7 +63,21 @@ const AddTestDemo = (props) => {
     const value = e.target.value;
     testCaseOutputChange(value, index);
   }
-  
+
+  const editpercentage=(e)=>{
+
+    const { index, testCaseOutputChangeScore,validateOjtest_set_average } = props;
+    const value = e.target.value;
+    testCaseOutputChangeScore(value, index);
+    validateOjtest_set_average(false);
+
+    funpreventDefault(e)
+  }
+
+  const funpreventDefault=(e)=>{
+    e.preventDefault();
+    e.stopPropagation();
+  }
   // 右侧删除图标
   const genExtra = () => (
     <Icon
@@ -127,7 +141,7 @@ const AddTestDemo = (props) => {
    * 文本输入框可编辑的情况
    *  1. 新增时
    *  2. isAdd 为 false 且 isEditor 为true 时
-   * @param {*} testCase 
+   * @param {*} testCase
    */
   // const isDisabled = (testCase) => {
   //   return !testCase.isAdd && !isEditor;
@@ -138,21 +152,34 @@ const AddTestDemo = (props) => {
   //   defaultActiveKey: [isOpen ? '1' : '']
   // };
   // console.log(activePane);
-  
+
   // 切换手风琴
   const handleChangeCollapse = () => {
     const {index, updateOpenTestCaseIndex} = props;
     updateOpenTestCaseIndex(index);
   }
-  
+
   return (
     <Collapse className={'collapse_area'} activeKey={isOpen?'1':''} onChange={() => handleChangeCollapse()}>
-      <Panel header={`测试用例${props.index + 1}`} extra={genExtra()} key="1">
+      <Panel header={
+      <span className="color-grey-6">
+        <span>测试用例{props.index + 1}</span>
+        {props.ojForm.test_set_score===true?<input
+         //className={scoretype===key?"bor-red fl martopf4":"fl martopf4"}
+          className={"ml20"}
+        //style={{width: '25%',display:scorevalue===true?'inline-block':'none'}}
+        onInput={editpercentage}
+        onClick={funpreventDefault}
+        value={props.testCase.score}
+        />:""}
+        {props.ojForm.test_set_score===true? <span className="mr15 ml10"
+        //style={{display:scorevalue===true?'inline-block':'none'}}
+        >%</span>:""}
+      </span>
+        } extra={props.index===0?false:genExtra()} key="1">
         <Form>
           <FormItem
-            label={<span className={'label_text'}>输入</span>}
-            validateStatus={testCaseValidate.input.validateStatus}
-            help={testCaseValidate.input.errMsg}
+            label={<span className={''}>输入</span>}
             colon={ false }
           >
             <TextArea
@@ -193,6 +220,8 @@ const mapStateToProps = (state) => {
 
 const mapDispatchToProps = (dispatch) => ({
   testCaseOutputChange: (value, index) => dispatch(actions.testCaseOutputChange(value, index)),
+  testCaseOutputChangeScore: (value, index) => dispatch(actions.testCaseOutputChangeScore(value, index)),
+  validateOjtest_set_average: (value) => dispatch(actions.validateOjtest_set_average(value)),// # 评分占比
   testCaseInputChange: (value, index) => dispatch(actions.testCaseInputChange(value, index)),
   updateOpenTestCaseIndex: (index) => dispatch(actions.updateOpenTestCaseIndex(index)),
 });
diff --git a/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
index cdbf14a3..c86ab267 100644
--- a/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
+++ b/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
@@ -4,43 +4,40 @@
  * @Github:
  * @Date: 2019-11-20 10:35:40
  * @LastEditors  : tangjiang
- * @LastEditTime : 2020-02-05 13:26:58
+ * @LastEditTime : 2020-02-11 16:44:57
  */
 import './index.scss';
-// import 'katex/dist/katex.css';
 import React from 'react';
-import { Form, Input, Select, InputNumber, Button, Cascader, notification } from 'antd';
+import { Form, Input, Select, InputNumber, Button, Cascader, notification, Radio } from 'antd';
 import { connect } from 'react-redux';
 import AddTestDemo from './AddTestDemo';
-// import QuillEditor from '../../../quillEditor';
 import actions from '../../../../../redux/actions';
 import CONST from '../../../../../constants';
 import { toStore } from 'educoder'; // 保存和读取store值
-// import Wrapper from '../../../../../common/reactQuill';
-import QuillForEditor from '../../../../../common/quillForEditor';
 import KnowLedge from '../../../components/knowledge';
+import TPMMDEditor from '../../../../tpm/challengesnew/tpm-md-editor';
 const scrollIntoView = require('scroll-into-view');
-const {jcLabel} = CONST;
+const { jcLabel } = CONST;
 const FormItem = Form.Item;
 const { Option } = Select;
+const RadioGroup = Radio.Group;
+
+
 const maps = {
   language: [
-    { title: (<span style={{ color: 'rgba(0, 0, 0, 0.35)' }}>请选择</span>), key: '' },
     { title: 'C', key: 'C' },
     { title: 'C++', key: 'C++' },
     { title: 'Python', key: 'Python' },
     { title: 'Java', key: 'Java' }
   ],
   difficult: [
-    { title: (<span style={{ color: 'rgba(0, 0, 0, 0.35)' }}>请选择</span>), key: '' },
     { title: '简单', key: '1' },
-    { title: '中等', key: '2'},
+    { title: '中等', key: '2' },
     { title: '困难', key: '3' }
   ],
   category: [
-    { title: (<span style={{ color: 'rgba(0, 0, 0, 0.35)' }}>请选择</span>), key: '' },
     { title: '程序设计', key: '1' },
-    { title: '算法', key: '2'}
+    { title: '算法', key: '2' }
   ],
   openOrNot: [
     { title: '公开', key: '1' },
@@ -49,7 +46,7 @@ const maps = {
 }
 class EditTab extends React.Component {
 
-  constructor (props) {
+  constructor(props) {
     super(props);
     // this.editorRef = React.createRef();
     this.scrollRef = React.createRef();
@@ -61,37 +58,65 @@ class EditTab extends React.Component {
       top: 500,
       bottom: 20,
       offsetTop: 0,
-      showAdd: false
+      showAdd: props.tag_discipline_id || false,
+      newviewtype: false,
+      newdescription: ''
       // knowledges: [],
       // coursers: [] // 选中的课程
     }
   }
 
-  componentDidMount () {
-
+  componentDidMount() {
     const oWrap = document.getElementById('textCase');
     const scrollHeight = oWrap.offsetHeight;
     const oTarget = this.headerRef.current;
     const offsetTop = oTarget.offsetTop;
+    const newdescription = this.props.ojForm.description;
     this.setState({
       scrollEl: oWrap,
       targetEl: oTarget,
       offsetTop: offsetTop, // 记录初始位置
+      newdescription: newdescription,
       scrollHeight,
     }, () => {
       this.state.scrollEl.addEventListener('scroll', this.handleScroll, false);
     });
-    // 获取题库
-    // this.props.getQuestion({
-    //   source: 'question'
-    // });
+    const obj = { // 测试用例参数
+      input: '',
+      output: '',
+      position: 1,
+      score: null,
+      isAdd: true // 新增的测试用例
+    }
+    const validateObj = { // 测试用例验证参数
+      input: {
+        validateStatus: '',
+        errMsg: ''
+      },
+      output: {
+        validateStatus: '',
+        errMsg: ''
+      }
+    }
+    this.props.addTestCase({ testCase: obj, tcValidate: validateObj });
   }
 
-  // componentDidUpdate (nextProp) {
-  //   console.log(nextProp);
-  // }
+  componentDidUpdate(nextProp, nextstate) {
 
-  componentWillUnmount (nextPro) {
+    if (nextProp.ojForm != this.props.ojForm) {
+      if (!this.state.newviewtype) {
+        this.setState({
+          newdescription: this.props.ojForm.description,
+          newviewtype: true
+        })
+
+      }
+
+    }
+
+  }
+
+  componentWillUnmount(nextPro) {
     this.state.scrollEl.removeEventListener('scroll', this.handleScroll, false);
   }
 
@@ -101,12 +126,12 @@ class EditTab extends React.Component {
     const tOffsetTop = oTarget.offsetTop;
     const tOffsetHeight = oTarget.offsetHeight;
     const scrollTop = e.target.scrollTop;
-    const { scrollHeight, offsetTop} = this.state;
+    const { scrollHeight, offsetTop } = this.state;
     // 滚动距离 + 元素的高度 大于 offsetTop值时， 添加 fix_top 样式
     // console.log(tOffsetTop, tOffsetHeight, scrollTop, scrollHeight, offsetTop);
     if ((scrollTop + tOffsetHeight > tOffsetTop) && (tOffsetTop >= offsetTop)) {
       oTarget.className = `test_demo_title fix_top`;
-    } else if ((scrollHeight + scrollTop < offsetTop) && (scrollHeight <= offsetTop)){
+    } else if ((scrollHeight + scrollTop < offsetTop) && (scrollHeight <= offsetTop)) {
       oTarget.className = `test_demo_title`;
     } else if ((tOffsetTop < offsetTop) && (tOffsetTop + tOffsetHeight + scrollTop) < offsetTop) {
       oTarget.className = `test_demo_title`;
@@ -124,7 +149,6 @@ class EditTab extends React.Component {
   }
   // 改变描述信息
   handleChangeDescription = (value) => {
-    // console.log('获取的编辑器内容为: ', value);
     // 描述信息变化时，将信息保存至store中
     toStore('oj_description', value);
     this.props.validateOjDescription(value);
@@ -168,14 +192,28 @@ class EditTab extends React.Component {
   scrollToBottom = () => {
     scrollIntoView(this.scrollRef.current);
   }
+  onChangeRadioGroups = (e) => {
+    this.props.validateOjTest_set_score(e.target.value);
+    if (e.target.value === true) {
+      this.props.validateOjtest_set_average(true);
+      this.props.validateOjequal()
+    }
 
-  render () {
+  }
+  //均匀比例
+  onChangemarkvalue = (e) => {
+    this.props.validateOjtest_set_average(e.target.value);
+    if (e.target.value === true) {
+      this.props.validateOjequal()
+    }
+  }
+  render() {
     const { showAdd } = this.state;
- 
+
     const {
       ojForm,
       ojFormValidate,
-      // testCases = [], // 测试用例集合
+      testCases = [], // 测试用例集合
       addTestCase, // 添加测试用例
       deleteTestCase, // 删除测试用例
       testCasesValidate,
@@ -185,9 +223,6 @@ class EditTab extends React.Component {
       knowledges,
       tagDisciplines,
     } = this.props;
-    // console.log('knowledge======>>>>>>', knowledges);
-    // const {knowledges} = this.state;
-    // 表单label
     const myLabel = (name, subTitle, nostar) => {
       if (subTitle) {
         return (
@@ -222,21 +257,23 @@ class EditTab extends React.Component {
       deleteTestCase(obj);
     };
     const renderTestCase = () => {
-      return this.props.testCases.map((item, i) => {
+
+      return testCases.map((item, i) => {
         return <AddTestDemo
-            key={`${i}`}
-            isOpen={openTestCodeIndex.includes(i)}
-            onSubmitTest={handleSubmitTest}
-            onDeleteTest={handleDeleteTest}
-            testCase={item}
-            testCaseValidate={testCasesValidate[i]}
-            index={i}
-          />
-        });
+          key={`${i}`}
+          isOpen={openTestCodeIndex.includes(i)}
+          onSubmitTest={handleSubmitTest}
+          onDeleteTest={handleDeleteTest}
+          testCase={item}
+          ojForm={ojForm}
+          testCaseValidate={testCasesValidate[i]}
+          index={i}
+        />
+      });
     };
     // 添加测试用例
     const handleAddTest = () => {
-      const {position, testCases = []} = this.props;
+      const { position, testCases = [] } = this.props;
       if (testCases.length >= 50) {
         notification.warning({
           message: '提示',
@@ -248,6 +285,7 @@ class EditTab extends React.Component {
         input: '',
         output: '',
         position: position,
+        score: null,
         isAdd: true // 新增的测试用例
       }
       const validateObj = { // 测试用例验证参数
@@ -262,42 +300,20 @@ class EditTab extends React.Component {
       }
 
       // this.scrollRef.current.scrollTo(1000);
-      addTestCase({testCase: obj, tcValidate: validateObj});
+      addTestCase({ testCase: obj, tcValidate: validateObj });
       // TODO 点击新增时，需要滚到到最底部
       this.scrollToBottom();
     }
 
     // 描述信息变化时
-    const handleContentChange = (content, quill) => {
-      // console.log('描述信息为: ', content);
-      const _text = quill.getText();
-      const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
-      if (!reg.test(_text)) {
-        this.handleChangeDescription('');
-      } else {
-        // 保存获取的描述信息至redux中
-        this.handleChangeDescription(content);
-      }
+    const handleContentChange = (value) => {
+      this.handleChangeDescription(value)
     }
-    // 编辑器配置信息
-    const quillConfig = [
-      { header: 1}, {header: 2},
-      // {size: ['12px', '14px', '16px', '18px', '20px', false]},
-      'bold', 'italic', 'underline', 'strike',   // 切换按钮
-      'blockquote', 'code-block', // 代码块
-      {align: []}, { 'list': 'ordered' }, { 'list': 'bullet' }, // 列表
-      { 'script': 'sub'}, { 'script': 'super' },
-      { 'color': [] }, { 'background': [] },  // 字体颜色与背景色
-      // {font: []},
-      'image', 'formula', // 数学公式、图片、视频
-      'clean', // 清除格式
-      // 'fill',
-    ];
 
     const renderCourseQuestion = (arrs) => {
       const tempArr = [];
       const sub_id = this.props.ojForm.sub_discipline_id;
-      function loop (arrs, tempArr) {
+      function loop(arrs, tempArr) {
         arrs.forEach(item => {
           const obj = {};
           obj.value = item.id;
@@ -317,7 +333,7 @@ class EditTab extends React.Component {
       let choid_ids = [];
       // let tempKnowledges = [];
       tempArr.forEach(t => {
-        // debugger;
+        ;
         if (sub_id && t.children) {
           t.children.forEach(c => {
             if (c.value === +sub_id) {
@@ -341,25 +357,21 @@ class EditTab extends React.Component {
     }
 
     // 知识点
-    const handleKnowledgeChange = (values= []) => {
+    const handleKnowledgeChange = (values = []) => {
       const _result = [];
       values.forEach(v => {
         _result.push(v.id);
       });
-      // console.log('下拉选择的值:===>>>', _result);
-      // 保存选择的知识点
       this.props.saveTagDisciplineId(_result);
     }
 
     // 新增知识点
     const handleAddKnowledge = (values) => {
-      // console.log('调用了新增知识点并返回了结果: ', values);
-      // 获取课程id
-      const {sub_discipline_id} = this.props.ojForm;
-      const obj = Object.assign({}, values, {sub_discipline_id})
+      const { sub_discipline_id } = this.props.ojForm;
+      const obj = Object.assign({}, values, { sub_discipline_id })
       tagDisciplines(obj);
     }
-    
+
     return (
       <div className={'editor_area'} id="textCase">
         <Form className={'editor_form'}>
@@ -368,7 +380,7 @@ class EditTab extends React.Component {
             label={<span>{myLabel(jcLabel['difficult'])}</span>}
             validateStatus={ojFormValidate.difficult.validateStatus}
             help={ojFormValidate.difficult.errMsg}
-            colon={ false }
+            colon={false}
           >
             <Select onChange={this.handleChangeDifficult} value={`${ojForm.difficult}`}>
               {getOptions('difficult')}
@@ -380,21 +392,13 @@ class EditTab extends React.Component {
             label={<span>{myLabel(jcLabel['sub_discipline_id'], '合理的课程分类有利于快速检索')}</span>}
             validateStatus={ojFormValidate.sub_discipline_id.validateStatus}
             help={ojFormValidate.sub_discipline_id.errMsg}
-            colon={ false }
+            colon={false}
           >
-            {/* <Select onChange={this.handleChangeCategory} value={`${ojForm.category}`}>
-              {getOptions('category')}
-            </Select> */}
-            {/* <Cascader
-              options={courseQuestions}
-              expandTrigger="hover"
-              onChange={this.handleChangeCategory}
-            /> */}
-            { renderCourseQuestion(courseQuestions)}
+            {renderCourseQuestion(courseQuestions)}
           </FormItem>
 
           <FormItem
-            colon={ false }
+            colon={false}
             className='input_area flex_100'
             label={<span>{myLabel(jcLabel['knowledge'], '', 'nostar')}</span>}
           >
@@ -412,9 +416,9 @@ class EditTab extends React.Component {
             label={<span>{myLabel(jcLabel['timeLimit'], '程序允许时间限制时长，单位：秒')}</span>}
             validateStatus={ojFormValidate.timeLimit.validateStatus}
             help={ojFormValidate.timeLimit.errMsg}
-            colon={ false }
+            colon={false}
           >
-            <InputNumber value={ojForm.timeLimit} min={0} max={5} style={{ width: '100%' }} onChange={this.handleTimeLimitChange}/>
+            <InputNumber value={ojForm.timeLimit} min={0} max={5} style={{ width: '100%' }} onChange={this.handleTimeLimitChange} />
           </FormItem>
 
           <FormItem
@@ -422,9 +426,9 @@ class EditTab extends React.Component {
             label={<span>{myLabel(jcLabel['language'])}</span>}
             validateStatus={ojFormValidate.language.validateStatus}
             help={ojFormValidate.language.errMsg}
-            colon={ false }
+            colon={false}
           >
-            <Select onChange={this.handleLanguageChange} value={`${ojForm.language}`}>
+            <Select onChange={this.handleLanguageChange} defaultValue={'C'} value={`${ojForm.language}`}>
               {getOptions('language')}
             </Select>
           </FormItem>
@@ -434,13 +438,13 @@ class EditTab extends React.Component {
             label={<span>{myLabel(jcLabel['name'])}</span>}
             validateStatus={ojFormValidate.name.validateStatus}
             help={ojFormValidate.name.errMsg}
-            colon={ false }
+            colon={false}
           >
             <Input
               maxLength={60}
               placeholder="请输入任务名称"
               value={ojForm.name}
-              suffix={<span style={{ fontSize: '12px', color: 'rgba(0, 0, 0, 0.45)' }}>{60 - ojForm.name.length}</span>}
+              suffix={<span style={{ fontSize: '12px', color: 'rgba(0, 0, 0, 0.45)' }}>{ojForm.name ? 60 - ojForm.name.length : 60}</span>}
               onChange={this.handleNameChange}
             />
           </FormItem>
@@ -450,42 +454,66 @@ class EditTab extends React.Component {
             label={<span>{myLabel(jcLabel['description'])}</span>}
             validateStatus={ojFormValidate.description.validateStatus}
             help={ojFormValidate.description.errMsg}
-            colon={ false }
+            colon={false}
           >
-            <QuillForEditor
-                autoFocus={true}
-                style={{ height: '200px' }}
-                placeholder="请输入描述信息"
-                onContentChange={handleContentChange}
-                options={quillConfig}
-                value={ojForm.description}
-              />
+            <TPMMDEditor placeholder={'请输入描述信息'} watch={false} height={200}
+              mdID={'oj-description'} initValue={ojForm.description} onChange={handleContentChange} ></TPMMDEditor>
           </FormItem>
 
-          {/* <FormItem
-            className={`input_area flex_50 flex_50_right`}
-            label={<span>{myLabel(jcLabel['openOrNot'], '社区：您的任务将向整个社会公开')}</span>}
-            validateStatus={ojFormValidate.openOrNot.validateStatus}
-            help={ojFormValidate.openOrNot.errMsg}
-            colon={ false }
-          >
-            <Select onChange={this.handleChangeOpenOrNot} value={`${ojForm.openOrNot}`}>
-              {getOptions('openOrNot')}
-            </Select>
-          </FormItem> */}
-
         </Form>
 
         {/* 添加测试用例 */}
         <div className={'test_demo_title'} ref={this.headerRef}>
-          <h2>测试用例</h2>
+          <div className={"htest_demo_title"}>测试用例和系统评分规则</div>
           <Button type="primary" ghost onClick={handleAddTest}>添加测试用例</Button>
         </div>
-        <div className="test_demo_ctx">
-          { renderTestCase() }
+        <div className={ojForm.test_set_score === true ? "test_demo_ctx mb60" : "test_demo_ctx mb20"}>
+          <p className="color-grey-9  mt20"
+            style={{ width: '100%', height: '40px' }}
+          >
+            <RadioGroup
+              className={"fl"}
+              style={{ width: '80%' }}
+              value={ojForm.test_set_score}
+              onChange={this.onChangeRadioGroups}
+            >
+              <Radio
+                //style={radioStyle}
+                value={false}>
+                通过全部测试集
+                <span className={"ncolor979797"}>（学员评测，仅当所有测试集都正确时，才获得一次性奖励）</span>
+              </Radio>
+              <Radio // style={radioStyle}
+                value={true}>
+                通过部分测试集
+                <span className={"ncolor979797"}>（学员评测，通过测试集即可获得对应奖励）</span></Radio>
+            </RadioGroup>
+
+          </p>
+
+          {ojForm.test_set_score === true ? <p className="color-grey-9"
+          //style={{width:'100%',height:'20px',display:scorevalue===true?'block':'none'}}
+          >
+            <span className={"headdfgf ncolor979797"} style={{ width: '500px' }} >
+              系统评分占比：
+										<RadioGroup
+                value={ojForm.test_set_average}
+                className={"ml2"}
+                onChange={this.onChangemarkvalue}
+              >
+                <Radio value={true}>均分比例</Radio>
+                <Radio value={false}>自定义比例</Radio>
+              </RadioGroup>
+            </span>
+
+          </p> : ""}
         </div>
 
-        <div style={ {float:"left", clear: "both", background: 'red' } } ref={this.scrollRef}></div>
+        <div className="test_demo_ctx">
+          {renderTestCase()}
+        </div>
+
+        <div style={{ float: "left", clear: "both", background: 'red' }} ref={this.scrollRef}></div>
       </div>
     )
   }
@@ -522,6 +550,9 @@ const mapDispatchToProps = (dispatch) => ({
   validateOJName: (value) => dispatch(actions.validateOJName(value)),
   validateOjLanguage: (value) => dispatch(actions.validateOjLanguage(value)),
   validateOjDescription: (value) => dispatch(actions.validateOjDescription(value)),
+  validateOjTest_set_score: (value) => dispatch(actions.validateOjTest_set_score(value)),//# 测试集得分规则,
+  validateOjtest_set_average: (value) => dispatch(actions.validateOjtest_set_average(value)),// # 评分占比
+  validateOjequal: (value) => dispatch(actions.validateOjequal(value)),// # 均分
   validateOjDifficult: (value) => dispatch(actions.validateOjDifficult(value)),
   validateOjTimeLimit: (value) => dispatch(actions.validateOjTimeLimit(value)),
   validateOjCategory: (value) => dispatch(actions.validateOjCategory(value)),
diff --git a/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss b/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss
index ff5df709..cf3fb4a0 100644
--- a/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss
+++ b/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss
@@ -1,67 +1,80 @@
-
-.editor_area{
+.editor_area {
   padding: 20px 0;
-  .editor_form{
+  overflow-x: hidden;
+
+  .editor_form {
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
   }
-  .label_text{
+
+  .label_text {
     position: relative;
     font-size: 14px;
-    &::before{
+
+    &::before {
       display: inline-block;
       margin-right: 4px;
       color: #f5222d;
       font-size: 14px;
-      font-family: SimSun,sans-serif;
+      font-family: SimSun, sans-serif;
       line-height: 1;
       content: '*';
     }
 
-    &.nostar{
+    &.nostar {
       &::before {
         content: ''
       }
     }
   }
-  .input_area{
+
+  .input_area {
     display: inline-block;
-    &.flex_60{
+
+    &.flex_60 {
       padding-right: 20px;
       width: 60%;
     }
-    &.flex_40{
+
+    &.flex_40 {
       width: 40%;
     }
-    &.flex_100{
+
+    &.flex_100 {
       width: 100%;
     }
-    &.flex_50{
+
+    &.flex_50 {
       width: 50%;
     }
-    &.flex_50_left{
+
+    &.flex_50_left {
       padding-right: 10px;
     }
-    &.flex_50_right{
+
+    &.flex_50_right {
       padding-left: 10px;
     }
   }
-  .label_sub_text{
+
+  .label_sub_text {
     font-size: 12px;
     color: #999999;
   }
+
   .test_demo_title,
   .test_demo_ctx,
-  .editor_form{
+  .editor_form {
     margin: 0 20px;
 
-    .ant-form-explain{
+    .ant-form-explain {
       margin-top: 5px;
       margin-left: -10px;
     }
   }
-  .test_demo_title{
+
+  .test_demo_title {
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -69,28 +82,41 @@
     border-bottom: 1px solid #d9d9d9;
     margin-bottom: 20px;
 
-    &.fix_top{
+    &.fix_top {
       position: absolute;
       top: 43px;
       left: -20px;
       right: -20px;
       padding: 0 26px 0 20px;
       // background: gold;
-      background: rgb(249,249,249);
+      background: rgb(249, 249, 249);
       z-index: 1000;
     }
+
+    .htest_demo_title {
+      font-size: 16px;
+      font-weight: 400;
+      color: rgba(51, 51, 51, 1);
+    }
   }
 
-  .collapse_area{
+  .test_demo_ctx {
+    .ncolor979797 {
+      font-size: 14px;
+      color: #979797 !important;
+    }
+  }
+
+  .collapse_area {
     margin-bottom: 20px;
 
-    .ant-form-item{
+    .ant-form-item {
       margin-bottom: 0px;
     }
   }
 }
 
-.collapse_close_icon{
+.collapse_close_icon {
   position: relative;
   background: rgba(235, 235, 235, 1);
   border-radius: 50%;
@@ -99,10 +125,11 @@
   color: rgb(142, 142, 142);
   transition: all .3s;
 
-  &:hover{
+  &:hover {
     color: #fff;
     background: rgb(231, 81, 79);
   }
+
   // &:hover{
   //   color: red;
   // }
diff --git a/src/modules/developer/newOrEditTask/leftpane/editorTab/index2.js b/src/modules/developer/newOrEditTask/leftpane/editorTab/index2.js
index ab9b0f34..b2f1ca4e 100644
--- a/src/modules/developer/newOrEditTask/leftpane/editorTab/index2.js
+++ b/src/modules/developer/newOrEditTask/leftpane/editorTab/index2.js
@@ -1,7 +1,7 @@
 /*
- * @Description: 
+ * @Description:
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-12-01 09:17:07
  * @LastEditors: tangjiang
  * @LastEditTime: 2019-12-02 16:33:35
@@ -46,10 +46,10 @@ const maps = {
 
 function EditTab (props, ref) {
 
-  const { 
+  const {
     form,
     ojForm,
-    position, 
+    position,
     testCases,
     addTestCase,
     deleteTestCase,
@@ -90,10 +90,10 @@ function EditTab (props, ref) {
   // 向外暴露的方法
   useImperativeHandle(ref, () => ({
     validateForm () {
-      props.form.validateFields((err, values) => {
+      props.form.validateFieldsAndScroll((err, values) => {
         if (!err) {
           getFormData(() => {
-            return values; 
+            return values;
           });
         } else {
           return;
@@ -107,6 +107,7 @@ function EditTab (props, ref) {
       input: '',
       output: '',
       position: position,
+      score: null,
       isAdd: true // 新增的测试用例
     }
     const validateObj = { // 测试用例验证参数
@@ -133,8 +134,8 @@ function EditTab (props, ref) {
       return (
         <AddTestDemo
           key={`key_${i}`}
-          onSubmitTest={handleSubmitTest} 
-          onDeleteTest={handleDeleteTest} 
+          onSubmitTest={handleSubmitTest}
+          onDeleteTest={handleDeleteTest}
           testCase={item}
           testCaseValidate={testCasesValidate[i]}
           index={i}
@@ -171,9 +172,9 @@ function EditTab (props, ref) {
 
   return (
     <div className={'editor_area'}>
-      <Form 
+      <Form
         hideRequiredMark={true}
-        className={'editor_form'} 
+        className={'editor_form'}
         ref={formRef}>
         <FormItem
           className={`input_area flex_60`}
@@ -188,7 +189,7 @@ function EditTab (props, ref) {
             })(<Input placeholder="请输入任务名称"/>)
           }
         </FormItem>
-        
+
         <FormItem
           className={`input_area flex_40`}
           label={<span>{myLabel(jcLabel['language'])}</span>}
diff --git a/src/modules/developer/newOrEditTask/leftpane/index.js b/src/modules/developer/newOrEditTask/leftpane/index.js
index 53807cfe..a970cd97 100644
--- a/src/modules/developer/newOrEditTask/leftpane/index.js
+++ b/src/modules/developer/newOrEditTask/leftpane/index.js
@@ -14,15 +14,12 @@ import PrevTab from './prevTab';
 
 // const { TabPane } = Tabs;
 
-function LeftPane (props) {
+function LeftPane(props) {
 
   const navItem = [
     {
       title: '编辑',
       key: 'editor'
-    }, {
-      title: '预览',
-      key: 'prev'
     }
   ];
 
@@ -56,10 +53,10 @@ function LeftPane (props) {
     // </Tabs>
     <React.Fragment>
       <ul className={'add_editor_list_area'}>
-        { renderNavItem }
+        {renderNavItem}
       </ul>
       <div className="comp_ctx" style={{ height: 'calc(100vh - 177px)' }}>
-        { renderComp }
+        {renderComp}
       </div>
     </React.Fragment>
   )
diff --git a/src/modules/developer/newOrEditTask/leftpane/prevTab/index.js b/src/modules/developer/newOrEditTask/leftpane/prevTab/index.js
index 6b41d348..7b334e9f 100644
--- a/src/modules/developer/newOrEditTask/leftpane/prevTab/index.js
+++ b/src/modules/developer/newOrEditTask/leftpane/prevTab/index.js
@@ -1,7 +1,7 @@
 /*
  * @Description: 代码预览页面
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-24 10:09:55
  * @LastEditors: tangjiang
  * @LastEditTime: 2019-12-18 10:02:24
@@ -9,28 +9,23 @@
 import './index.scss';
 import React, { useEffect, useState, useRef } from 'react';
 import { connect } from 'react-redux';
-import {Empty} from 'antd';
-// import Wrapper from '../../../../../common/reactQuill';
-import QuillForEditor from '../../../../../common/quillForEditor';
+import { Empty } from 'antd';
+import RenderHtml from '../../../../../components/render-html'
 
 const PrevTab = (props) => {
 
   const prevRef = useRef(null);
-  // const [desc, setDesc] = useState('');
   const [renderCtx, setRenderCtx] = useState(() => '');
-  
+
   // 渲染内容
   useEffect(() => {
     if (props.description) {
       setRenderCtx(() => (
-        <div 
+        <div
           id="quill_editor"
-          style = {{ height: '100%', width: '100%'}}
+          style={{ height: '100%', width: '100%' }}
           ref={prevRef}>
-            <QuillForEditor 
-              readOnly={true}
-              value={props.description}
-            />
+          <RenderHtml style={{ wordBreak: "break-word", fontWeight: "bold" }} value={props.description} />
         </div>
       ));
     } else {
@@ -44,7 +39,7 @@ const PrevTab = (props) => {
 
   return (
     <div className={`prev_area`}>
-      {renderCtx}      
+      {renderCtx}
     </div>
   )
 
diff --git a/src/modules/developer/newOrEditTask/rightpane/index.js b/src/modules/developer/newOrEditTask/rightpane/index.js
index d42089d7..020a67e0 100644
--- a/src/modules/developer/newOrEditTask/rightpane/index.js
+++ b/src/modules/developer/newOrEditTask/rightpane/index.js
@@ -7,55 +7,28 @@
  * @LastEditTime : 2019-12-27 19:33:50
  */
 import './index.scss';
-import React, { useState, useEffect } from 'react';
+import React from 'react';
 import { connect } from 'react-redux';
 import MyMonacoEditor from '../../components/myMonacoEditor';
-// import ControlSetting from '../../components/controlSetting';
 import actions from '../../../../redux/actions';
 
-function RightPane (props, ref) {
+function RightPane(props) {
+
+  const { code, language, saveOjFormCode } = props;
 
-  const {
-    // identifier,
-    code,
-    showCode,
-    language,
-    // onSubmitForm,
-    saveOjFormCode
-  } = props;
-  
-  // let timer = null;
-  // 代码改变时，保存
   const handleCodeChange = (updateCode) => {
-    // if (props.identifier) {
-    //   // 保存用户输入的代码
-    //   if (!timer) {
-    //     timer = setInterval(() => {
-    //       clearInterval(timer);
-    //       timer = null;
-          
-    //     }, 3000);
-    //   }
-    // }
     saveOjFormCode(updateCode);
   }
-  // 启动调试代码
-  // const handleDebuggerCode = (value) => {
-  //   console.log('调用的代码调试====', value);
-  // }
   return (
     <div className={'right_pane_code_wrap'}>
-      <MyMonacoEditor 
-        language={language} 
-        code={showCode}
-        onCodeChange={handleCodeChange}/>
-        
-      {/* <ControlSetting
-        // identifier={identifier}
-        inputValue={props.input} 
-        onSubmitForm={onSubmitForm}
-        // onDebuggerCode={handleDebuggerCode}
-      /> */}
+      {language ?
+        <MyMonacoEditor
+          language={language}
+          code={code}
+          onCodeChange={handleCodeChange} /> : null
+      }
+
+
     </div>
   )
 }
diff --git a/src/modules/developer/newOrEditTask/rightpane/index.scss b/src/modules/developer/newOrEditTask/rightpane/index.scss
index 4bec9546..48fa182a 100644
--- a/src/modules/developer/newOrEditTask/rightpane/index.scss
+++ b/src/modules/developer/newOrEditTask/rightpane/index.scss
@@ -1,36 +1,41 @@
-.right_pane_code_wrap{
+.right_pane_code_wrap {
   position: relative;
+  background: #1e1e1e;
   // justify-content: center;
   // background-color: #222;
   height: 100%;
+
   // height: calc(100vh - 178px);
   .code-title,
   .controller-pane,
-  .pane_control_opts{
+  .pane_control_opts {
     display: flex;
     align-items: center;
     justify-content: space-between;
     // padding: 0 30px;
     // background: #000;
-    background: rgba(18,28,36,1);
+    background: rgba(18, 28, 36, 1);
     color: #fff;
   }
+
   .code-title,
-  .pane_control_opts{
+  .pane_control_opts {
     padding: 0 20px;
   }
-  
-  .code-title{
+
+  .code-title {
     height: 56px;
-    .code-icon{
+
+    .code-icon {
       cursor: pointer;
     }
   }
+
   // .controller-pane{
   //   min-height: 56px;
   //   background-color: #222;
   // }
-  .code-pane-wrap{
+  .code-pane-wrap {
     height: 800px;
     // position: absolute;
     // top: 56px;
@@ -38,69 +43,79 @@
     // width: 100%;
   }
 
-  .pane_control_area{
+  .pane_control_area {
     position: absolute;
     bottom: 0;
     width: 100%;
+
     // height: 56px;
-    .control_tab{
+    .control_tab {
       position: absolute;
       bottom: -325px;
       width: 100%;
       // transition: all .2s;
       opacity: 0;
+
       // animation: .3s ease-in-out move_up;
       // &.active{
       //   bottom: 0;
       //   opacity: 1;
       // }
-      &.move_up{
-        animation:  move_up .3s ease-in;
+      &.move_up {
+        animation: move_up .3s ease-in;
       }
+
       &.move_up_final {
         bottom: 0;
         opacity: 1;
       }
-      &.move_down{
-        animation:  move_down .3s ease-in-out;
+
+      &.move_down {
+        animation: move_down .3s ease-in-out;
       }
-      &.move_down_final{
+
+      &.move_down_final {
         bottom: -325px;
         opacity: 0;
       }
     }
   }
-  .pane_control_opts{
+
+  .pane_control_opts {
     height: 56px;
   }
 
-  .ant-tabs-bar{
+  .ant-tabs-bar {
     padding: 0 10px;
     margin: 0px;
     border-bottom: transparent;
   }
-  .ant-tabs-ink-bar{
+
+  .ant-tabs-ink-bar {
     bottom: 1px;
   }
+
   // .tab_ctx_area.pos_center{
   //   background: #222;
   // }
-  .pane_control_opts{
+  .pane_control_opts {
     display: flex;
     justify-content: space-between;
     z-index: 20;
   }
 }
 
-.setting_drawer{
-  .setting_h2{
+.setting_drawer {
+  .setting_h2 {
     line-height: 50px;
   }
-  .setting_desc{
+
+  .setting_desc {
     display: flex;
     justify-content: space-between;
     margin-bottom: 10px;
-    .flex_item{
+
+    .flex_item {
       line-height: 32px;
       font-size: 12px;
     }
@@ -108,33 +123,38 @@
 }
 
 @keyframes move_up {
-  0%{
+  0% {
     opacity: 0;
     // bottom: -325px;
   }
-  90%{
+
+  90% {
     opacity: 0.5;
     // bottom: 0px;
   }
-  100%{
+
+  100% {
     opacity: 1;
     bottom: 0;
   }
 }
 
-@keyframes move_down{
-  0%{
+@keyframes move_down {
+  0% {
     opacity: 1;
     bottom: 0
   }
-  10%{
+
+  10% {
     opacity: .2;
   }
-  20%{
+
+  20% {
     opacity: 0;
   }
-  100%{
+
+  100% {
     opacity: 0;
     bottom: -325px;
   }
-}
+}
\ No newline at end of file
diff --git a/src/modules/developer/newOrEditTask/rightpane/initTabCtx/index.js b/src/modules/developer/newOrEditTask/rightpane/initTabCtx/index.js
index defb5e3c..a4546343 100644
--- a/src/modules/developer/newOrEditTask/rightpane/initTabCtx/index.js
+++ b/src/modules/developer/newOrEditTask/rightpane/initTabCtx/index.js
@@ -1,7 +1,7 @@
 /*
- * @Description: 显示tab中的内容 
- * @Author: tangjiang 
- * @Date: 2019-11-18 10:43:03 
+ * @Description: 显示tab中的内容
+ * @Author: tangjiang
+ * @Date: 2019-11-18 10:43:03
  * @Last Modified by: tangjiang
  * @Last Modified time: 2019-11-18 11:35:12
  */
@@ -31,7 +31,7 @@ const renderUserCase = (ctx, position, props) => {
           })(<TextArea rows={5} />)
         }
       </FormItem>
-      {/* <FormItem 
+      {/* <FormItem
         className={'input_area flex_r'}
         label="输出">
         {
@@ -76,7 +76,7 @@ class InitTabCtx extends PureComponent {
   handleTestCodeFormSubmit = (cb) => {
     const {form, debuggerCode} = this.props;
     // console.log(debuggerCode);
-    form.validateFields((err, values) => {
+    form.validateFieldsAndScroll((err, values) => {
       if (!err) { // 表单验证通过时，调用测试接口
         cb && cb(); // 调用回调函数，切换 tab
         // console.log('表单值:', values);
diff --git a/src/modules/developer/recordDetail/index.js b/src/modules/developer/recordDetail/index.js
index 6675f066..713bf518 100644
--- a/src/modules/developer/recordDetail/index.js
+++ b/src/modules/developer/recordDetail/index.js
@@ -1,7 +1,7 @@
 /*
  * @Description: 提交记录详情
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-12-04 08:36:21
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-01-02 13:48:02
@@ -20,17 +20,17 @@ import actions from '../../../redux/actions';
 import CONST from '../../../constants';
 import UserInfo from '../components/userInfo';
 
-const {reviewResult} = CONST;
+const { reviewResult } = CONST;
 
-function RecordDetail (props) {
+function RecordDetail(props) {
   const {
-    match: { params }, 
+    match: { params },
     recordDetail,
     // identifier,
     getUserCommitRecordDetail,
     saveEditorCodeForDetail
   } = props;
-  
+
   const id = params.id;
   const [detail, setDetail] = useState({});
   const [user, setUser] = useState({});
@@ -38,7 +38,7 @@ function RecordDetail (props) {
 
   useEffect(() => {
     // 根据id获取记录详情
-    getUserCommitRecordDetail(id, 'detail');    
+    getUserCommitRecordDetail(id, 'detail');
   }, []);
 
   useEffect(() => {
@@ -53,7 +53,7 @@ function RecordDetail (props) {
       }
     }
   }, [recordDetail]);
-  
+
   const handleReturn = (identifier) => {
     if (identifier) {
       saveEditorCodeForDetail('');
@@ -65,7 +65,6 @@ function RecordDetail (props) {
 
   const handleEditorCode = (identifier, code) => {
     if (identifier) {
-      console.log(code);
       saveEditorCodeForDetail(code);
       props.history.push(`/myproblems/${identifier}`);
     }
@@ -79,12 +78,12 @@ function RecordDetail (props) {
             {(user && user.name) || ''}
           </span>
         </div> */}
-        <UserInfo userInfo={user || {}}/>
+        <UserInfo userInfo={user || {}} />
         <div className={'study_name'}>
           <span>{detail.name || 'test'}</span>
         </div>
         <div className={'study_quit'}>
-          <Button style={{ visibility: identifier ? 'visible' : 'hidden'}} onClick={() => handleReturn(identifier)}>
+          <Button style={{ visibility: identifier ? 'visible' : 'hidden' }} onClick={() => handleReturn(identifier)}>
             返回该题
             {/* <Link to={`/myproblems/${identifier}`}>返回该题</Link> */}
           </Button>
@@ -106,38 +105,42 @@ function RecordDetail (props) {
           <span className="status_label">
             语言: <span className="status_label_sub">{detail.language}</span>
           </span>
-          <span className="status_label" style={{ visibility: detail.status === 0 ? 'visible' : 'hidden'}}>
+          <span className="status_label" style={{ visibility: detail.status === 0 ? 'visible' : 'hidden' }}>
             执行用时: <span className="status_label_sub">{`${detail.execute_time && Number(detail.execute_time * 1000).toFixed(2)}ms`}</span>
           </span>
-          <span className="status_label pass_case" style={{ display: [-1, 0, 2, 5].includes(detail.status) ? 'inline-block' : 'none'}}>
+          <span className="status_label pass_case" style={{ display: [-1, 0, 2, 5].includes(detail.status) ? 'inline-block' : 'none' }}>
             <span className="status_label_sub">{detail.pass_sets_count}</span>
             <span className="pass_case_span"> / {detail.set_count}</span>
-            个通过测试用例
+            个通过的测试用例
           </span>
         </div>
         <div className="result_error_area">
-          <ErrorResult detail={detail}/>
+          <ErrorResult detail={detail} />
         </div>
         <div className="detail_ctx_header">
           <h2 className="header_h2">提交内容</h2>
-          <Button
-            style={{ visibility: identifier ? 'visible' : 'hidden'}}
-            className={'header_btn'} 
-            type="primary"
-            onClick={() => handleEditorCode(identifier, detail.code)}
-          >
-              编辑代码
-            {/* <Link to={`/myproblems/${identifier}`}>编辑代码</Link> */}
-          </Button>
+          {/*<Button*/}
+          {/*  style={{ visibility: identifier ? 'visible' : 'hidden' }}*/}
+          {/*  className={'header_btn'}*/}
+          {/*  type="primary"*/}
+          {/*  onClick={() => handleEditorCode(identifier, detail.code)}*/}
+          {/*>*/}
+          {/*  编辑代码*/}
+          {/*  /!* <Link to={`/myproblems/${identifier}`}>编辑代码</Link> *!/*/}
+          {/*</Button>*/}
         </div>
         <div className="result_code_area">
           <MonacoEditor
             height="100%"
             width="100%"
+            className="code_area_Style"
             language={(detail.language && detail.language.toLowerCase()) || ''}
             value={detail.code || ''}
-            theme="dark"
-            readOnly={true}
+            options={{
+              "readOnly": true,
+              // "minimap": { "enabled": false },
+              // "lineNumbers":false
+            }}
           />
         </div>
       </div>
@@ -146,7 +149,7 @@ function RecordDetail (props) {
 }
 
 const mapStateToProps = (state) => {
-  const {recordDetail} = state.ojForUserReducer;
+  const { recordDetail } = state.ojForUserReducer;
   return {
     // identifier: user_program_identifier,
     recordDetail
diff --git a/src/modules/developer/recordDetail/index.scss b/src/modules/developer/recordDetail/index.scss
index b308a7cb..be5e68a0 100644
--- a/src/modules/developer/recordDetail/index.scss
+++ b/src/modules/developer/recordDetail/index.scss
@@ -1,55 +1,83 @@
 @import '../split_pane_resizer.scss';
 
-.record_detail_area{
+.result_code_area .monaco-editor .line-numbers {
+  color: #999 !important;
+}
+
+.result_code_area .monaco-editor .current-line~.line-numbers {
+  color: #0b216f !important;
+}
+
+.result_code_area .minimap-decorations-layer {
+  background: rgba(225, 225, 225, 0.2) !important;
+}
+
+.result_code_area .monaco-editor .margin {
+  background-color: #eee !important;
+}
+
+.record_detail_area {
   background: #fff;
-  .record_detail_ctx{
+
+  .record_detail_ctx {
     padding: 0 20px;
-    .detail_ctx_header{
+
+    .detail_ctx_header {
       position: relative;
       height: 56px;
     }
-    .header_h2{
+
+    .header_h2 {
       line-height: 56px;
     }
-    .header_btn{
+
+    .header_btn {
       position: absolute;
       right: 0;
       top: 14px;
     }
-    .detail_ctx_status{
+
+    .detail_ctx_status {
       height: 18px;
       line-height: 18px;
-      .status_label{
-        color: rgba(153,153,153,1);
+
+      .status_label {
+        color: rgba(153, 153, 153, 1);
         margin-right: 40px;
       }
-      .status_label_error{
+
+      .status_label_error {
         color: #E51C24;
       }
-      .status_label_success{
+
+      .status_label_success {
         color: #28BD8B;
       }
-      .status_label_sub{
+
+      .status_label_sub {
         color: #333333;
       }
-      .pass_case{
+
+      .pass_case {
         float: right;
         margin-right: 0;
       }
-      .pass_case_span{
+
+      .pass_case_span {
         margin-right: 10px;
       }
     }
 
-    .result_code_area{
+    .result_code_area {
       // height: 500px;
       height: calc(100vh - 360px);
     }
-    .result_error_area{
+
+    .result_error_area {
       margin-top: 15px;
-      background: rgba(250,250,250,1);
+      background: rgba(250, 250, 250, 1);
       color: #E51C24;
       border-radius: 3px;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/modules/developer/split_pane_resizer.scss b/src/modules/developer/split_pane_resizer.scss
index 2c110143..21a283ae 100644
--- a/src/modules/developer/split_pane_resizer.scss
+++ b/src/modules/developer/split_pane_resizer.scss
@@ -1,83 +1,79 @@
-
 .new_add_task_wrap,
 .student_study_warp,
-.record_detail_area{
+.record_detail_area {
   height: 100vh;
+
   .task_header,
   .student_study_header,
-  .record_detail_header{
+  .record_detail_header {
     height: 65px;
-    // background:rgba(34,34,34,1);
-    // background: #1E1E1E;
-    background: rgba(7,15,25,1);
-    padding:0 20px;
+    background: rgba(7, 15, 25, 1);
+    padding: 0 20px;
   }
 
-  .task_header{
+  .task_header {
     position: relative;
     line-height: 65px;
+
     .header_btn,
-    .header_title{
+    .header_title {
       color: #fff;
       line-height: 65px;
     }
 
-    .header_title{
+    .header_title {
       font-size: 16px;
       font-weight: bold;
       text-align: center;
     }
 
-    .header_btn{
+    .header_btn {
       position: absolute;
       line-height: 32px;
       top: 18px;
-      &:last-child{
+
+      &:last-child {
         right: 30px;
       }
     }
-    // .header_btn{
-    //   width: 88px;
-    // }
-    // .header_title{
-    //   flex: 1;
-    //   text-align: center;
-    // }
   }
 
   .split-pane-area,
-  .pane_right_area
-  {
+  .pane_right_area {
     position: relative;
   }
 
   .student_study_header,
-  .record_detail_header{
+  .record_detail_header {
     position: relative;
+
     .avator_nicker,
     .study_quit,
-    .study_name{
+    .study_name {
       color: #fff;
       line-height: 65px;
     }
 
     .avator_nicker,
-    .study_quit{
+    .study_quit {
       display: inline-block;
       vertical-align: top;
     }
 
-    .student_nicker{
+    .student_nicker {
       margin-left: 10px;
     }
-    .student_img{
+
+    .student_img {
       width: 30px;
       height: 30px;
     }
-    .study_quit{
+
+    .study_quit {
       float: right;
     }
-    .study_name{
+
+    .study_name {
       position: absolute;
       left: 0;
       right: 0;
@@ -87,14 +83,15 @@
       font-size: 16px;
       font-weight: bold;
     }
-  }  
+  }
 }
 
-.add_editor_list_area{
+.add_editor_list_area {
   background: #fff;
   padding: 0 20px;
   margin: 0;
-  .add_editor_item{
+
+  .add_editor_item {
     display: inline-block;
     height: 56px;
     line-height: 56px;
@@ -103,58 +100,51 @@
     border-bottom: 2px solid transparent;
     transition: all .3s;
     cursor: pointer;
-    .item-span{
+
+    .item-span {
       color: #666;
       font-size: 16px;
     }
-    // > span{
-    //   cursor: pointer;  
-    // }
-    &.active{
+
+    &.active {
       border-bottom-color: #5091FF;
-      .item-span{
+
+      .item-span {
         color: #5091FF;
       }
-      
+
     }
   }
 }
 
-.comp_ctx{
-  // height: calc(100vh - 178px);
-  overflow-y: hidden;
+.comp_ctx {
+  overflow-y: auto;
+  margin-right: 0 !important;
 }
 
 .split-pane-area,
-.split-pane-left{
-  .ant-tabs-nav-wrap{
-    // padding: 0 30px;
+.split-pane-left {
+  .ant-tabs-nav-wrap {
     padding: 0 20px;
   }
-  .ant-tabs-bar{
+
+  .ant-tabs-bar {
     margin: 0;
   }
-  // .ant-tabs-tabpane{
-  //   padding-top: 10px;
-  //   height: calc(100vh - 110px);
-  //   overflow: auto;
-  // }
 
-  .ant-form-item-control{
+  .ant-form-item-control {
     line-height: 1;
   }
 
   .editor_area,
-  .prev_area{
-    height: 100%;
-    overflow-y: auto;
+  .prev_area {
+    height: auto;
   }
 }
 
 .Resizer {
   position: relative;
-  background: #000;
-  // opacity: 0.2;
+  background: #111c24;
   z-index: 1;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
@@ -162,97 +152,79 @@
   -moz-background-clip: padding;
   -webkit-background-clip: padding;
   background-clip: padding-box;
-
-  // &::before{
-  //   position: absolute;
-  //   width: 24px;
-  //   height: 24px;
-  //   border-radius: 50%;
-  //   margin-top: -12px;
-  //   top: 50%;
-  //   right: -12px;
-  //   font-family: 'iconfont';
-  //   background: gold;
-  //   content: '\e711';
-  //   font-size: 18px;
-  //   text-align: center;
-  //   line-height: 24px;
-  // }
 }
- 
+
 .Resizer:hover {
   -webkit-transition: all 2s ease;
   transition: all 2s ease;
 }
- 
+
 .Resizer.horizontal {
-  height: 11px;
+  height: 4px;
   margin: -5px 0;
   border-top: 5px solid rgba(255, 255, 255, 0);
   border-bottom: 5px solid rgba(255, 255, 255, 0);
   cursor: row-resize;
   width: 100%;
 }
- 
+
 .Resizer.horizontal:hover {
   border-top: 5px solid rgba(0, 0, 0, 0.5);
   border-bottom: 5px solid rgba(0, 0, 0, 0.5);
 }
- 
+
 .Resizer.vertical {
-  width: 11px;
-  margin: 0 -5px;
-  border-left: 5px solid rgba(255, 255, 255, 0);
-  border-right: 5px solid rgba(255, 255, 255, 0);
+  width: 4px;
   cursor: col-resize;
 }
- 
-.Resizer.vertical:hover {
-  border-left: 5px solid rgba(0, 0, 0, 0.5);
-  border-right: 5px solid rgba(0, 0, 0, 0.5);
-}
+
 .Resizer.disabled {
   cursor: not-allowed;
 }
+
 .Resizer.disabled:hover {
   border-color: transparent;
 }
 
-.outer-split-pane{
-  & > .Resizer{
+.outer-split-pane {
+  &>.Resizer {
     position: relative;
+
     &::before,
-    &::after{
+    &::after {
       position: absolute;
-      right: -12px;
+      right: -7px;
       top: 50%;
       transition: opacity, background .3s;
     }
-    &::before{
+
+    &::before {
       content: '';
       border-radius: 50%;
-      background: rgba(235,235,235,.3);
+      background: rgba(235, 235, 235, .3);
       width: 24px;
       height: 24px;
       // font-size: 12px;
     }
-    &::after{
+
+    &::after {
       content: '\e712';
       font-family: 'iconfont';
       transform: scale(.7);
       color: #666;
       margin-top: -2px;
-      right: -14px;
+      right: -7px;
       opacity: .3;
     }
 
-    &:hover{
-      &::before{
-        background: rgba(235,235,235, 1);
+    &:hover {
+      &::before {
+        background: rgba(235, 235, 235, 1);
       }
-      &::after{
+
+      &::after {
         opacity: 1;
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/modules/developer/studentStudy/index.js b/src/modules/developer/studentStudy/index.js
index 0c8c7012..153929ef 100644
--- a/src/modules/developer/studentStudy/index.js
+++ b/src/modules/developer/studentStudy/index.js
@@ -1,10 +1,10 @@
 /*
  * @Description: 学员学习
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-23 10:53:19
  * @LastEditors  : tangjiang
- * @LastEditTime : 2020-01-06 15:27:34
+ * @LastEditTime : 2020-02-10 18:24:01
  */
 import './index.scss';
 import React, { useEffect, useState } from 'react';
@@ -12,30 +12,27 @@ import { connect } from 'react-redux';
 import SplitPane from 'react-split-pane';
 import LeftPane from './leftpane';
 import RightPane from './rightpane';
-// import { Link } from 'react-router-dom';
-// import { getImageUrl } from 'educoder'
-// import RightPane from '../newOrEditTask/rightpane';
-import { Icon } from 'antd';
+import { Icon, Modal } from 'antd';
 import UserInfo from '../components/userInfo';
 import actions from '../../../redux/actions';
-import { fromStore, CNotificationHOC} from 'educoder';
+import { CNotificationHOC, queryString } from 'educoder';
 import { withRouter } from 'react-router';
-
-function StudentStudy (props) {
+const { confirm } = Modal;
+function StudentStudy(props) {
 
   const [hasUpdate, setHasUpdate] = useState(true);
   const {
     hack,
     userInfo,
-    // hack_identifier,
-    // user_program_identifier,
     restoreInitialCode,
     changeUserCodeTab,
-    changeShowOrHideControl
+    changeShowOrHideControl,
+    searchParams,
+    saveSearchParams
   } = props;
 
   const {
-    match: { params }, 
+    match: { params },
     getUserProgramDetail,
     saveUserProgramIdentifier
   } = props;
@@ -45,25 +42,38 @@ function StudentStudy (props) {
   useEffect(() => {
     // 保存当前的id
     saveUserProgramIdentifier(id);
-    // startProgramQuestion(id);
+    try {
+      if (id.charAt(id.length - 1) === "?") {
+        id = id.substring(0, id.length - 1);
+      }
+    } catch (e) {
+
+    }
+
     getUserProgramDetail(id);
-    
+    const $searchs = window.location.search && window.location.search.substring(1);
+    if ($searchs) {
+      const $params = $searchs.split('&') || [];
+      let obj = Object.create(null);
+      $params.forEach(item => {
+        const keys = item.split('=');
+        obj[keys[0]] = keys[1];
+      });
+      saveSearchParams({ searchParams: $searchs, curPage: obj['pages'] });
+    }
     if (tab) {
       changeUserCodeTab(tab);
     }
-  }, []);
-
+  }, [id]);
   useEffect(() => {
-    const { hack = {} } = props;
-    if (hack.modify_code && hasUpdate) { // 代码更改，提示是否需要更新代码
+    if (hack && hack.modify_code && hasUpdate) { // 代码更改，提示是否需要更新代码
       setHasUpdate(false);
       handleUpdateNotice();
     }
-  }, [props, hasUpdate, setHasUpdate]);
+  }, [hack, hack.modify_code, hasUpdate]);
 
   const handleUpdateNotice = () => {
-   console.log(props);
-   props.confirm({
+    props.confirm({
       title: '提示',
       content: (
         <p>
@@ -71,26 +81,11 @@ function StudentStudy (props) {
           还未提交的代码，请自行保存
         </p>
       ),
-      onOk () {
+      onOk() {
         restoreInitialCode(id, '更新成功');
       }
-   })
-    // Modal.confirm({
-    //   title: '提示',
-    //   content: (
-    //     <p>
-    //       代码文件有更新啦 <br />
-    //       还未提交的代码，请自行保存
-    //     </p>
-    //   ),
-    //   okText: '立即更新',
-    //   cancelText: '稍后再说',
-    //   onOk () {
-    //     restoreInitialCode(id, '更新成功');
-    //   }
-    // });
+    })
   }
-  // const _hack_id = hack_identifier || fromStore('hack_identifier');
   // 处理编辑
   const handleClickEditor = (identifier) => {
     if (!identifier) return;
@@ -99,48 +94,56 @@ function StudentStudy (props) {
     props.clearOjForUserReducer();
     props.history.push(`/problems/${identifier}/edit`);
   }
-  // 处理退出 
-  const handleClickQuit = () => {
+  // 处理退出
+  const handleClickQuit = (type) => {
     // 退出时，清空内容
     props.clearOjForUserReducer();
     // 将控制台关闭
     changeShowOrHideControl(false);
     props.saveEditorCodeForDetail('');
-    props.history.push('/problems');
+    //这个是关闭窗口代码
+    if (type === 1) {
+      window.close();
+    } else {
+      props.history.push(`/problemset?${searchParams}`);
+    }
+
+
   }
 
+  const handlegoback = () => {
+    confirm({
+      title: '提示',
+      content: '请确认你的答题内容已经提交？',
+      onOk() {
+        handleClickQuit(1)
+      },
+      onCancel() { },
+    });
+  }
+
+
   return (
     <div className={'student_study_warp'}>
       <div className={'student_study_header'}>
-        {/* <div className={'avator_nicker'}>
-          <img alt="用户头像" className={'student_img'} src={getImageUrl((mygetHelmetapi && mygetHelmetapi.nav_logo_url) || 'images/educoder/headNavLogo.png?1526520218')} />
-          <span className={'student_nicker'}>
-            {(mygetHelmetapi &&mygetHelmetapi.name) || ''}
-          </span>
-        </div> */}
-        <UserInfo userInfo={userInfo}/>
+
+        <UserInfo userInfo={userInfo} />
         <div className={'study_name'}>
           <span>{hack.name}</span>
         </div>
         <div className={'study_quit'}>
-          {/* to={`/problems/${_hack_id}/edit`} */}
-          <span 
+          <span
             style={{ display: userInfo.hack_manager ? 'inline-block' : 'none' }}
-            onClick={() => handleClickEditor(hack.identifier)} 
+            onClick={() => handleClickEditor(hack.identifier)}
             className={`quit-btn`}
           >
-            <Icon type="form" className="quit-icon"/> 编辑
+            <Icon type="form" className="quit-icon" /> 编辑
           </span>
-          {/* to="/problems" */}
-          <span onClick={handleClickQuit} className="quit-btn">
-            <Icon type="poweroff" className="quit-icon"/> 退出
-          </span>
-          {/* <Button type="link" icon="form" className='quit-btn'>
-            <Link to="/problems">编辑</Link>
-          </Button>
-          <Button type="link" icon="poweroff" className='quit-btn'>
-            <Link to="/problems">退出</Link>
-          </Button> */}
+          {props.location.search === "?type=exercises" ? <span onClick={handlegoback} className="quit-btn" >
+            <Icon type="left" className="quit-icon" /> 返回试卷
+          </span> : <span onClick={handleClickQuit} className="quit-btn" >
+              <Icon type="poweroff" className="quit-icon" /> 退出
+          </span>}
         </div>
       </div>
       <div className="split-pane-area">
@@ -148,12 +151,8 @@ function StudentStudy (props) {
           <div className={'split-pane-left'}>
             <LeftPane />
           </div>
-          <SplitPane split="vertical" defaultSize="100%" allowResize={false}>
-            <RightPane 
-              updateNotice={handleUpdateNotice}
-            />
-            <div />
-          </SplitPane>
+          <RightPane updateNotice={handleUpdateNotice} />
+          <div />
         </SplitPane>
       </div>
     </div>
@@ -162,13 +161,15 @@ function StudentStudy (props) {
 
 const mapStateToProps = (state) => {
   const { userInfo } = state.userReducer;
-  const { hack_identifier, user_program_identifier,  hack } = state.ojForUserReducer;
+  const { hack_identifier, user_program_identifier, hack } = state.ojForUserReducer;
+  const { searchParams } = state.ojFormReducer;
   return {
     hack,
     userInfo,
     user_program_identifier,
-    hack_identifier
-  }; 
+    hack_identifier,
+    searchParams
+  };
 };
 
 const mapDispatchToProps = (dispatch) => ({
@@ -182,7 +183,8 @@ const mapDispatchToProps = (dispatch) => ({
   restoreInitialCode: (identifier, msg) => dispatch(actions.restoreInitialCode(identifier, msg)),
   changeShowOrHideControl: (flag) => dispatch(actions.changeShowOrHideControl(flag)),
   clearOjForUserReducer: () => dispatch(actions.clearOjForUserReducer()),
-  changeUserCodeTab: (tab) => dispatch(actions.changeUserCodeTab(tab)) 
+  changeUserCodeTab: (tab) => dispatch(actions.changeUserCodeTab(tab)),
+  saveSearchParams: (params) => dispatch(actions.saveSearchParams(params))
 });
 
 export default withRouter(connect(
diff --git a/src/modules/developer/studentStudy/index.scss b/src/modules/developer/studentStudy/index.scss
index aaebee9a..a9fa87d7 100644
--- a/src/modules/developer/studentStudy/index.scss
+++ b/src/modules/developer/studentStudy/index.scss
@@ -1,16 +1,19 @@
 @import '../split_pane_resizer.scss';
-.split-pane-area{
+
+.split-pane-area {
   height: calc(100vh - 65px);
 
-  .right_pane_code_wrap{
+  .right_pane_code_wrap {
     position: relative;
+    background: #1e1e1e;
 
     .editor_nodte_area,
-    .student_notes{
+    .student_notes {
       position: absolute;
       z-index: 100;
     }
-    .student_notes{
+
+    .student_notes {
       right: 0px;
       top: 50%;
       width: 36px;
@@ -25,12 +28,14 @@
       cursor: pointer;
       opacity: 0.5;
       transition: all .3s;
-      &:hover{
+
+      &:hover {
         opacity: 1;
         transform: translateX(-10px);
       }
     }
-    .editor_nodte_area{
+
+    .editor_nodte_area {
       right: 10px;
       top: 50%;
       width: 450px;
@@ -42,15 +47,16 @@
       // opacity: ;
       transform: translateX(500px);
       transition: all .3s;
-      &.active{
+
+      &.active {
         transform: translateX(0px);
       }
     }
   }
 }
 
-.right_pane_code_wrap{
-  position: relative;
-  // background-color: #222;
+.right_pane_code_wrap {
+  flex: 0 0 auto;
   height: 100%;
-}
+  overflow: hidden;
+}
\ No newline at end of file
diff --git a/src/modules/developer/studentStudy/leftpane/commitRecord/index.js b/src/modules/developer/studentStudy/leftpane/commitRecord/index.js
index 07ecdf7f..a458a672 100644
--- a/src/modules/developer/studentStudy/leftpane/commitRecord/index.js
+++ b/src/modules/developer/studentStudy/leftpane/commitRecord/index.js
@@ -1,7 +1,7 @@
 /*
  * @Description: 提交记录
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-27 09:49:33
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-01-09 14:06:34
@@ -19,7 +19,7 @@ import ErrorResult from '../../../components/errorResult';
 
 const numberal = require('numeral');
 
-const {reviewResult} = CONST;
+const { reviewResult } = CONST;
 // 表格列
 const columns = [
   {
@@ -35,7 +35,7 @@ const columns = [
     dataIndex: 'status',
     render: (value, record) => (
       <Link to={`/myproblems/record_detail/${record.id}`}>
-        <span style={{ color: value === 0 ? '#28BD8B' : '#E6262E'}}>{reviewResult[value]}</span>
+        <span style={{ color: value === 0 ? '#28BD8B' : '#E6262E' }}>{reviewResult[value]}</span>
       </Link>
     )
   },
@@ -72,28 +72,18 @@ const CommitRecord = (props) => {
     identifier,
     pages,
     commitRecord,
-    // excuteState,
     language,
-    operateType,
     commitRecordDetail,
     getUserCommitRecord,
     changeRecordPagination
   } = props;
 
-  const [current, setCurrent] = useState(1);
-  // const [pagination, setPagination] = useState(paginationConfig);
-  // const [tableData, setTableData] = useState([]);
+  const [current, setCurrent] = useState(pages.page);
   // 复制面板
   let clipboard;
-  // const [recordDetail, setRecordDetail] = useState({});
-  // const [renderCtx, setRenderCtx] = useState(() => {
-  //   return function () {
-  //     return '';
-  //   }
-  // });
   // 渲染提交记录详情
   const renderRecordDetail = (commitRecordDetail = {}) => {
-    const {id, status} = commitRecordDetail;
+    const { id, status } = commitRecordDetail;
     if (Object.keys(commitRecordDetail).length > 0) {
       // console.log('当前状态====》》》', status);
       const classes = status === 0 ? 'record_result_suc' : 'record_result_err';
@@ -105,22 +95,22 @@ const CommitRecord = (props) => {
             <p className={'record_result'}>
               执行结果: <span className={classes}>{reviewResult[status]}</span>
             </p>
-            <p 
+            <p
               id="copyError"
               onClick={clickCopyErrInfo}
               className={showErrorCopy} data-clipboard-target="#errcode">
               <span>
-                复制错误信息 <Icon type="copy" className={'icon_style'}/>
+                复制错误信息 <Icon type="copy" className={'icon_style'} />
               </span>
             </p>
             <p className={'show_detail'} style={{ visibility: id ? 'visible' : 'hidden' }}>
               <Link to={`/myproblems/record_detail/${id}`}>
-                显示详情 <Icon type="right" className={'icon_style'}/>
+                显示详情 <Icon type="right" className={'icon_style'} />
               </Link>
             </p>
           </div>
           <div id="errcode" className={showErrorCode}>
-            <ErrorResult detail={commitRecordDetail} language={language}/>
+            <ErrorResult detail={commitRecordDetail} language={language} />
           </div>
         </React.Fragment>
       );
@@ -131,7 +121,7 @@ const CommitRecord = (props) => {
   // 根据id获取用户提交记录
   useEffect(() => {
     getUserCommitRecord(identifier);
-  }, []);
+  }, [identifier]);
   // 提交记录变化时，同步到表单数据
   // useEffect(() => {
   //   // const len = commitRecord.length;
@@ -149,9 +139,9 @@ const CommitRecord = (props) => {
   // 复制功能
   let count = 0;
   // useEffect(() => {
-    
+
   // }, []);
- 
+
   const clickCopyErrInfo = () => {
     count = 0;
     if (!clipboard) {
@@ -174,76 +164,27 @@ const CommitRecord = (props) => {
     changeRecordPagination(page);
     // 调用查询接口
     getUserCommitRecord(identifier);
-    // setPagination(Object.assign({}, pagination, { current: page}));
-    // console.log('======>>>>>>', pagination)
   }
-  // console.log(commitRecord);
 
   const _style = {
     display: pages.total > pages.limit ? 'block' : 'none'
   };
 
-  const {status, id} = commitRecordDetail || {};
-  const classes = status === 0 ? 'record_result_suc' : 'record_result_err';
-  const showErrorCode = status !== 0 ? `ecord_error_info show_error_code` : `ecord_error_info`;
-  const showErrorCopy = status !== 0 ? `copy_error show_error_copy` : `copy_error`;
-
-  // if (!clipboard) {
-  //   console.log('==========>>>>>>>', 11111111111);
-  //   clipboard = new ClipboardJS('#copyError');
-  // }
-  // clipboard.on('success', (e) => {
-  //   e.clearSelection();
-  //   // if (count > 0) return;
-  //   // count++;
-  //   message.success('复制成功');
-  //   setTimeout(() => {
-  //     message.destroy();
-  //   }, 3000);
-  // });
-
-  // return () => {
-  //   clipboard = null;
-  // }
-  
   return (
     <div className={'commit_record_area'}>
       {renderRecordDetail(commitRecordDetail)}
-      {/* <div className={'record_header'}>
-        <p className={'record_result'}>
-          执行结果: <span className={classes}>{reviewResult[status]}</span>
-        </p>
-        <p 
-          id="copyError"
-          onClick={clickCopyErrInfo}
-          className={showErrorCopy} data-clipboard-target="#errcode">
-          <span>
-            复制错误信息 <Icon type="copy" className={'icon_style'}/>
-          </span>
-        </p>
-        <p className={'show_detail'} style={{ visibility: id ? 'visible' : 'hidden' }}>
-          <Link to={`/myproblems/record_detail/${id}`}>
-            显示详情 <Icon type="right" className={'icon_style'}/>
-          </Link>
-        </p>
-      </div>
-      <div id="errcode" className={showErrorCode}>
-        <ErrorResult detail={commitRecordDetail} language={language}/>
-      </div> */}
       <div className="commit_record_table_pagination">
-        <Table 
+        <Table
           columns={columns}
-          rowKey={function (record) { return `key_${record.id}`}}
+          rowKey={function (record) { return `key_${record.id}` }}
           dataSource={commitRecord}
-          // pagination={pagination}
-          // onChange={handleTableChange}
           pagination={false}
         />
         <div className="commit_record_pagination" style={_style}>
-          <Pagination 
+          <Pagination
             showQuickJumper
             pageSize={pages.limit}
-            current={current} 
+            current={current}
             total={pages.total}
             onChange={handlePaginationChange}
           />
diff --git a/src/modules/developer/studentStudy/leftpane/index.js b/src/modules/developer/studentStudy/leftpane/index.js
index 88c5ee9a..e2ba0a6c 100644
--- a/src/modules/developer/studentStudy/leftpane/index.js
+++ b/src/modules/developer/studentStudy/leftpane/index.js
@@ -1,7 +1,7 @@
 /*
  * @Description: 学员测评页面
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-23 11:33:41
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-01-02 13:51:22
@@ -21,7 +21,7 @@ import CommentForm from '../../../../common/components/comment/CommentForm';
 const LeftPane = (props) => {
 
   const { hack, userCodeTab } = props;
-  const { 
+  const {
     pass_count,
     submit_count,
     praises_count, /* 点赞数 */
@@ -29,12 +29,12 @@ const LeftPane = (props) => {
     user_praise // 用户是否点赞
   } = hack;
   const [defaultActiveKey, setDefaultActiveKey] = useState('task');
-  
+
   const navItem = [
     {
       title: '任务描述',
       key: 'task'
-    }, 
+    },
     {
       title: '提交记录',
       key: 'record'
@@ -50,7 +50,11 @@ const LeftPane = (props) => {
     record: (<CommitRecord />),
     comment: (<Comment />)
   };
-  
+
+  // qiehuan
+  const newsetDefaultActiveKey = (key) => {
+    props.identifier && props.changeUserCodeTab(key);
+  }
   useEffect(() => {
     setDefaultActiveKey(userCodeTab);
   }, [userCodeTab])
@@ -60,13 +64,13 @@ const LeftPane = (props) => {
   }, [defaultActiveKey, setDefaultActiveKey]);
 
   const renderNavItem = navItem.map((item) => {
-    
+
     const _classes = item.key === defaultActiveKey ? 'add_editor_item active' : 'add_editor_item';
     return (
       <li
         key={item.key}
         className={_classes}
-        onClick={() => setDefaultActiveKey(item.key)}
+        onClick={() => newsetDefaultActiveKey(item.key)}
       >
         <span className={'item-span'}>{item.title}</span>
       </li>
@@ -79,17 +83,19 @@ const LeftPane = (props) => {
     setDefaultActiveKey('comment');
   }
 
-   // 点击点赞
+
+
+  // 点击点赞
   const handleClickLike = () => {
     // 对OJ进行点赞
-    const {id, identifier } = props.hack;
+    const { id, identifier } = props.hack;
     props.likeComment(identifier, id, {
       container_type: 'Hack',
       type: 1
     });
   };
 
-   // 点击不喜欢
+  // 点击不喜欢
   // const handleClickDisLike = () => {
   //   console.log('点击的DisLike---------');
   // }
@@ -111,32 +117,32 @@ const LeftPane = (props) => {
   return (
     <React.Fragment>
       <ul className={'add_editor_list_area'}>
-        { renderNavItem }
+        {renderNavItem}
       </ul>
       <div className="comp_ctx">
-        { renderComp }
+        {renderComp}
       </div>
       <div className={'number_area'} style={_style}>
-        <div className="number_flex flex_count" style={{ display: defaultActiveKey !== 'comment' ? 'flex' : 'none'}}>
-          <TextNumber text="通过次数" number={pass_count} position="vertical"/>
-          <Divider type="vertical" style={{ height: '20px', margin: '10px 20px' }}/>
-          <TextNumber text="提交次数" number={submit_count} position="vertical"/>
+        <div className="number_flex flex_count" style={{ display: defaultActiveKey !== 'comment' ? 'flex' : 'none' }}>
+          <TextNumber text="通过次数" number={pass_count} position="vertical" />
+          <Divider type="vertical" style={{ height: '20px', margin: '10px 20px' }} />
+          <TextNumber text="提交次数" number={submit_count} position="vertical" />
         </div>
-        <div className="number_flex flex_quill" style={{ display: defaultActiveKey === 'comment' ? 'flex' : 'none'}}>
-          <CommentForm 
+        <div className="number_flex flex_quill" style={{ display: defaultActiveKey === 'comment' ? 'flex' : 'none' }}>
+          <CommentForm
             onSubmit={handleAddComment}
             type="bottom"
           />
         </div>
         <div className="number_flex flex_info">
-          <TextNumber text="huifu1" number={hack.comments_count} type="icon" onIconClick={handleClickMessage}/>
-          <TextNumber 
+          <TextNumber text="huifu1" number={hack.comments_count} type="icon" onIconClick={handleClickMessage} />
+          <TextNumber
             className={user_praise ? 'like active' : 'like'}
-            text="dianzan" 
+            text="dianzan"
             number={praises_count}
             theme={user_praise ? 'filled' : ''}
-            type="icon" 
-            onIconClick={handleClickLike}/>
+            type="icon"
+            onIconClick={handleClickLike} />
           {/* <TextNumber text="dislike" number={0} type="icon" onIconClick={handleClickDisLike}/> */}
         </div>
       </div>
@@ -145,7 +151,7 @@ const LeftPane = (props) => {
 }
 
 const mapStateToProps = (state) => {
-  const { hack, userCodeTab, comment_identifier} = state.ojForUserReducer;
+  const { hack, userCodeTab, comment_identifier } = state.ojForUserReducer;
   return {
     hack,
     userCodeTab,
diff --git a/src/modules/developer/studentStudy/leftpane/taskDescription/index.js b/src/modules/developer/studentStudy/leftpane/taskDescription/index.js
index 348f68d2..a72de95e 100644
--- a/src/modules/developer/studentStudy/leftpane/taskDescription/index.js
+++ b/src/modules/developer/studentStudy/leftpane/taskDescription/index.js
@@ -1,7 +1,7 @@
 /*
- * @Description: 
+ * @Description:
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-27 09:49:30
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-27 20:22:55
@@ -11,15 +11,14 @@ import React from 'react';
 import { Tag } from 'antd';
 import { Link } from 'react-router-dom';
 import { connect } from 'react-redux';
-import QuillForEditor from '../../../../../common/quillForEditor';
-
 import CONST from '../../../../../constants';
-const {tagBackground, diffText} = CONST;
+import RenderHtml from '../../../../../components/render-html';
+const { tagBackground, diffText } = CONST;
 
 const TaskDescription = (props) => {
 
   const { hack = {}, userInfo = {} } = props;
-  const {language, difficult, time_limit, username, description} = hack;
+  const { language, difficult, time_limit, username, description } = hack;
   return (
     <div className={'task_description_area'}>
       <div className={'desc_area_header'}>
@@ -37,16 +36,13 @@ const TaskDescription = (props) => {
         </p>
         <p className={'header_flex'}>
           <span className={'flex_label'}>出题者:</span>
-          <Link to={hack.user_path || '/'} target="_blank" style={{ color: '#5091FF'}}>{username}</Link>
+          <Link to={hack.user_path || '/'} target="_blank" style={{ color: '#5091FF' }}>{username}</Link>
         </p>
       </div>
-      <div className="task_desc_area">
-        <QuillForEditor
-          readOnly={true}
-          value={description}
-        />
+      <div className="task_desc_area pd20">
+        <RenderHtml value={description} />
       </div>
-    </div>
+    </div >
   )
 }
 
diff --git a/src/modules/developer/studentStudy/rightpane/index.js b/src/modules/developer/studentStudy/rightpane/index.js
index bebaea1e..cd0b29d7 100644
--- a/src/modules/developer/studentStudy/rightpane/index.js
+++ b/src/modules/developer/studentStudy/rightpane/index.js
@@ -1,27 +1,24 @@
 /*
- * @Description: 
+ * @Description:
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-27 14:59:51
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-01-02 14:23:43
  */
-import React, { useState, useEffect } from 'react';
-import {connect} from 'react-redux';
+import React, { useState, Fragment } from 'react';
+import { connect } from 'react-redux';
 import MyMonacoEditor from '../../components/myMonacoEditor';
 import ControlSetting from '../../components/controlSetting';
 import actions from '../../../../redux/actions';
-// import QuillForEditor from '../../../../common/quillForEditor';
-// import TextArea from 'antd/lib/input/TextArea';
 import { Input, Form, Button } from 'antd';
-// import FormItem from 'antd/lib/form/FormItem';
 const { TextArea } = Input;
 const FormItem = Form.Item;
 const RightPane = (props) => {
-  
+
   const {
-    identifier, 
-    submitInput, 
+    identifier,
+    submitInput,
     submitUserCode,
     input,
     hack,
@@ -33,47 +30,31 @@ const RightPane = (props) => {
     updateNotice,
     saveUserInputCode,
     restoreInitialCode,
-    // saveOpacityType,
     saveUserCodeForInterval,
     addNotes,
     changeLoadingState
   } = props;
 
-  // const [editorCode, setEditorCode] = useState(editor_code || hack.code);
   const [noteClazz, setNoteClazz] = useState('editor_nodte_area');
   const [noteCount] = useState(5000);
-  // const [code, setCode] = useState(editor_code || hack.code);
-  // let initFlag = true;
 
-  // useEffect(() => {
-  //   if (editor_code) {
-  //     setEditorCode(editor_code);
-  //   } else {
-  //     setEditorCode(hack.code);
-  //   }
-  // }, [hack, editor_code]);
 
-  
   const handleSubmitForm = () => {
     // 提交时， 先调用提交接口，提交成功后，循环调用测评接口
-    // saveOpacityType('submit');
     submitUserCode(identifier, submitInput, 'submit');
-    // // 提交时，先调用评测接口， 评测通过后才调用保存接口
-    // updateCode(identifier, submitInput, 'submit');
   }
 
   let timer = null; // 定时器
   // 代码块内容变化时
   const handleCodeChange = (value) => {
-    // console.log('编辑器代码 ======》》》》》》》》》++++++++++', value);
     saveUserInputCode(value);
     // setEditorCode(value);
     if (!timer) {
       timer = setInterval(function () {
         clearInterval(timer);
         timer = null;
-        saveUserCodeForInterval(identifier);
-      }, 3000);
+        saveUserCodeForInterval(identifier, value);
+      }, 5000);
     }
   }
 
@@ -101,9 +82,9 @@ const RightPane = (props) => {
     props.form.resetFields();
     setNoteClazz('editor_nodte_area');
   }
- 
+
   const handleSubmitNote = () => {
-    props.form.validateFields((err, values) => {
+    props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         changeLoadingState(true);
         addNotes(identifier, values, function () {
@@ -113,35 +94,33 @@ const RightPane = (props) => {
       }
     });
   }
-
   const { getFieldDecorator } = props.form;
+  let language = hack.language
+  if (language === 'C++') {
+    language = 'cpp'
+  }
   return (
+
     <div className={'right_pane_code_wrap'}>
+      {language ?
+        <MyMonacoEditor
+          notice={notice}
+          identifier={identifier}
+          language={language}
+          code={editor_code || hack.code}
+          hadCodeUpdate={hadCodeUpdate}
+          onCodeChange={handleCodeChange}
+          onUpdateNotice={handleUpdateNotice}
+          onRestoreInitialCode={handleRestoreInitialCode}
+        /> : null
+      }
+      <span className="iconfont icon-biji student_notes" onClick={handleClickNote} ></span>
 
-      <MyMonacoEditor
-        notice={notice}
-        identifier={identifier}
-        language={hack.language} 
-        code={editor_code || hack.code}
-        hadCodeUpdate={hadCodeUpdate}
-        onCodeChange={handleCodeChange}
-        onUpdateNotice={handleUpdateNotice}
-        onRestoreInitialCode={handleRestoreInitialCode}
-      />
-
-      <span 
-        className="iconfont icon-biji student_notes"
-        onClick={handleClickNote}
-      ></span>
-      
-      {/* <div className="student_notes">
-        <TextArea rows={5} />
-      </div> */}
       <div className={noteClazz}>
         <Form>
           <FormItem>
             {
-              getFieldDecorator('notes',{
+              getFieldDecorator('notes', {
                 rules: [
                   { required: true, message: '笔记不能为空' },
                   { max: noteCount, message: `笔记最大字数为${noteCount}` }
@@ -153,7 +132,7 @@ const RightPane = (props) => {
                 rows="5"
               />)
             }
-            
+
           </FormItem>
           <FormItem style={{ textAlign: 'right' }}>
             <Button loading={loading} style={{ marginRight: '10px' }} onClick={handleCancelNote}>取消</Button>
@@ -161,12 +140,12 @@ const RightPane = (props) => {
           </FormItem>
         </Form>
       </div>
-      
-      <ControlSetting 
+
+      <ControlSetting
         identifier={identifier}
         inputValue={input}
         onDebuggerCode={handleDebuggerCode}
-        onSubmitForm={handleSubmitForm}/>
+        onSubmitForm={handleSubmitForm} />
     </div>
   );
 }
@@ -174,10 +153,10 @@ const RightPane = (props) => {
 const mapStateToProps = (state) => {
 
   const {
-    user_program_identifier, 
-    hack, 
-    userTestInput, 
-    editor_code, 
+    user_program_identifier,
+    hack,
+    userTestInput,
+    editor_code,
     notice,
     hadCodeUpdate
   } = state.ojForUserReducer;
@@ -192,7 +171,7 @@ const mapStateToProps = (state) => {
     hadCodeUpdate,
     editor_code,
     input: userTestInput,
-    submitInput: hack.input, 
+    submitInput: hack.input,
     identifier: user_program_identifier
   };
 }
diff --git a/src/modules/ecs/EcSetting/CourseSupports/index.js b/src/modules/ecs/EcSetting/CourseSupports/index.js
index 4dbc63c9..8ff26efa 100644
--- a/src/modules/ecs/EcSetting/CourseSupports/index.js
+++ b/src/modules/ecs/EcSetting/CourseSupports/index.js
@@ -1,10 +1,10 @@
 import React, { Component } from 'react';
 
 import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-import {getRandomcode} from 'educoder';
+import { getRandomcode } from 'educoder';
 import axios from 'axios';
 
-import { Select,message,Modal,Input,Spin,Icon,Tooltip  } from 'antd';
+import { Select, message, Modal, Input, Spin, Icon, Tooltip } from 'antd';
 
 import './ecCourseSupports.css';
 
@@ -12,126 +12,129 @@ const $ = window.$;
 class CourseSupports extends Component {
     constructor(props) {
         super(props)
-        this.state={
-            data:'',
-            ec_courses_list:[],
-            editcourse:[{"weights": 0,
-                "ec_course_name":'',
+        this.state = {
+            data: '',
+            ec_courses_list: [],
+            editcourse: [{
+                "weights": 0,
+                "ec_course_name": '',
                 "top_relation": false,
-                "ec_course_id":''
+                "ec_course_id": ''
             }],
-            editnum:0,
-            index:0,
-            ec_graduation_subitem_id:0,
-            ec_year_id:0,
-            schooldata:{},
-            spinning:true,
-            ecComponentState:'ecCourseSupports',
-            supportid:null,
-            Editkey:null,
-            titlemessage:"提示",
-            Supportstype:false,
-            Supportslist:'',
-            Supportssum:false,
-            Supportsclass:false,
-					  Supportsclasskey:undefined,
-				   	neweditcourse:[{"weights": 0,
-							"ec_course_name":'',
-							"top_relation": false,
-							"ec_course_id":''
-						}],
-					max_support_count:0
+            editnum: 0,
+            index: 0,
+            ec_graduation_subitem_id: 0,
+            ec_year_id: 0,
+            schooldata: {},
+            spinning: true,
+            ecComponentState: 'ecCourseSupports',
+            supportid: null,
+            Editkey: null,
+            titlemessage: "提示",
+            Supportstype: false,
+            Supportslist: '',
+            Supportssum: false,
+            Supportsclass: false,
+            Supportsclasskey: undefined,
+            neweditcourse: [{
+                "weights": 0,
+                "ec_course_name": '',
+                "top_relation": false,
+                "ec_course_id": ''
+            }],
+            max_support_count: 0
         }
     }
 
-    componentWillMount(){
+    componentWillMount() {
         this.setState({
-            ec_year_id:this.props.match.params.ec_year_id,
-            major_school_id:this.props.match.params.major_school_id
+            ec_year_id: this.props.match.params.ec_year_id,
+            major_school_id: this.props.match.params.major_school_id
         })
         window.document.title = '课程体系 vs 毕业要求';
     }
 
-    UpdateClassData=()=>{
+    UpdateClassData = () => {
 
-        let ec_year_id=this.props.match.params.ec_year_id;
+        let ec_year_id = this.props.match.params.ec_year_id;
 
         this.setState({
-            ec_year_id:ec_year_id
+            ec_year_id: ec_year_id
         })
 
         const url = `/ec_years/${ec_year_id}/graduation_course_supports.json`;
         axios.get(url)
-				.then((response) => {
-						if(response.status===200){
-								if(response.data.graduation_subitems.length===0){
-									this.setState({
-										Supportstype:true,
-										data:response.data,
-										Supportslist:'数据为空，请去毕业要求——>毕业要求指标点分解列表配置数据'
-									})
-								}else{
-									let datas=response.data.graduation_subitems;
-									let listlength=[]
-									 datas.map((item,key)=>{
-										 listlength.push(item.course_supports.length)
-									 })
+            .then((response) => {
+                if (response.status === 200) {
+                    if (response.data.graduation_subitems.length === 0) {
+                        this.setState({
+                            Supportstype: true,
+                            data: response.data,
+                            Supportslist: '数据为空，请去毕业要求——>毕业要求指标点分解列表配置数据'
+                        })
+                    } else {
+                        let datas = response.data.graduation_subitems;
+                        let listlength = []
+                        datas.map((item, key) => {
+                            listlength.push(item.course_supports.length)
+                        })
 
-								 let max_support_count=Math.max(...listlength);
+                        let max_support_count = Math.max(...listlength);
 
-									this.setState({
-										max_support_count:max_support_count,
-										data:response.data
-									})
-								}
-						}
+                        this.setState({
+                            max_support_count: max_support_count,
+                            data: response.data
+                        })
+                    }
+                }
 
-				})
-				.catch(function (error) {
-						console.log(error);
-				});
+            })
+            .catch(function (error) {
+                console.log(error);
+            });
 
-			const zrl = `/ec_years/${ec_year_id}/ec_courses/search.json`;
-			axios.get(zrl,{params:{
-						per_page:10000,
-					}
-				})
-				.then((response) => {
+        const zrl = `/ec_years/${ec_year_id}/ec_courses/search.json`;
+        axios.get(zrl, {
+            params: {
+                per_page: 10000,
+            }
+        })
+            .then((response) => {
 
-					if(response.status===200){
-						this.setState({
-							ec_courses_list:response.data.ec_courses
-						})
-					}
+                if (response.status === 200) {
+                    this.setState({
+                        ec_courses_list: response.data.ec_courses
+                    })
+                }
 
-				})
-				.catch(function (error) {
-					console.log(error);
-				});
+            })
+            .catch(function (error) {
+                console.log(error);
+            });
 
     }
-    componentDidMount(){
+    componentDidMount() {
         this.setState({
-            ec_year_id:this.props.match.params.ec_year_id,
-            major_school_id:this.props.match.params.major_school_id
+            ec_year_id: this.props.match.params.ec_year_id,
+            major_school_id: this.props.match.params.major_school_id
         })
         this.UpdateClassData();
 
     }
-    EditSupportCourse=(keys,e)=>{
+    EditSupportCourse = (keys, e) => {
         $('#school_major_list').scrollLeft(0);
-        let id=e.target.id;
-        id=parseInt(id);
+        let id = e.target.id;
+        id = parseInt(id);
 
-        let subindex =e.target.getAttribute("subindex");
+        let subindex = e.target.getAttribute("subindex");
 
         // const url = `/ec_course_supports/edit_require_vs_course?subitem_id=`+id
         // axios.get(url)
         //     .then((response) => {
-				//
+        //
         //         if(response.status===200){
 
-				//
+        //
         //             this.setState({
         //                 ec_courses_list:response.data.ec_courses_list,
         //                 editcourse:support_data,
@@ -140,7 +143,7 @@ class CourseSupports extends Component {
         //                 Supportssum:false,
         //                 Supportsclass:false,
         //             })
-				//
+        //
         //             let {editcourse} =this.state;
         //             let neweditcourse=editcourse;
         //             let newnum=0;
@@ -152,258 +155,258 @@ class CourseSupports extends Component {
         //                 }
         //             }
         //             newnum= Math.round(newnum*100)/100;
-				//
+        //
         //             this.setState({
         //                 editnum:newnum
         //             })
         //         }
-				//
+        //
         //     })
         //     .catch(function (error) {
         //         console.log(error);
         //     });
-      let  {data}=this.state;
+        let { data } = this.state;
 
 
-			data.graduation_subitems.map((item,key)=>{
-				if(keys===key){
+        data.graduation_subitems.map((item, key) => {
+            if (keys === key) {
 
-					if(item.course_supports.length>0){
-						this.setState({
-							editcourse:item.course_supports,
-							neweditcourse:item.course_supports,
-							Editkey:key,
-							index:subindex,
-							ec_graduation_subitem_id:id,
-						})
-					}else if(item.course_supports.length===0){
-						this.setState({
-							editcourse:[{weights: 0,top_relation: false,ec_course_name:'',ec_course_id:''}],
-							neweditcourse:[{weights: 0,top_relation: false,ec_course_name:'',ec_course_id:''}],
-							Editkey:key,
-							index:subindex,
-							ec_graduation_subitem_id:id,
-						})
-					}
+                if (item.course_supports.length > 0) {
+                    this.setState({
+                        editcourse: item.course_supports,
+                        neweditcourse: item.course_supports,
+                        Editkey: key,
+                        index: subindex,
+                        ec_graduation_subitem_id: id,
+                    })
+                } else if (item.course_supports.length === 0) {
+                    this.setState({
+                        editcourse: [{ weights: 0, top_relation: false, ec_course_name: '', ec_course_id: '' }],
+                        neweditcourse: [{ weights: 0, top_relation: false, ec_course_name: '', ec_course_id: '' }],
+                        Editkey: key,
+                        index: subindex,
+                        ec_graduation_subitem_id: id,
+                    })
+                }
 
-				}
-			})
+            }
+        })
 
-			let newnum=0;
+        let newnum = 0;
 
-			data.graduation_subitems.map((item,key)=>{
-				if(keys===key){
-					item.course_supports.map((items,keys)=>{
-						if(items.weights===undefined){
-							newnum=0
-						}else{
-							newnum=newnum+items.weights;
-						}
-					})
-				}
-			})
+        data.graduation_subitems.map((item, key) => {
+            if (keys === key) {
+                item.course_supports.map((items, keys) => {
+                    if (items.weights === undefined) {
+                        newnum = 0
+                    } else {
+                        newnum = newnum + items.weights;
+                    }
+                })
+            }
+        })
 
-			newnum= Math.round(newnum*100)/100;
+        newnum = Math.round(newnum * 100) / 100;
 
-			this.setState({
-				editnum:newnum
-			})
-      console.log(newnum)
+        this.setState({
+            editnum: newnum
+        })
+        console.log(newnum)
 
         // $("#school_ListTableLine").show();
         // let offsettop=$("#school_ListTableLine").position().top||$("#school_ListTableLine").scrollTop || $("#school_ListTableLine").pageYOffset;
         // window.scrollTo(0, offsettop)
     }
 
-    Addcourse=(e)=>{
-        let {editcourse} =this.state;
-				let arr=new Array();
-				editcourse.map((item,key)=>{
-					arr.push(item)
-				})
+    Addcourse = (e) => {
+        let { editcourse } = this.state;
+        let arr = new Array();
+        editcourse.map((item, key) => {
+            arr.push(item)
+        })
 
-        let neweditcourse=arr;
-        let newadd = {weights: 0,top_relation: false,ec_course_name:'',ec_course_id:''};
+        let neweditcourse = arr;
+        let newadd = { weights: 0, top_relation: false, ec_course_name: '', ec_course_id: '' };
         neweditcourse.push(newadd);
         this.setState({
-            editcourse:neweditcourse
+            editcourse: neweditcourse
         })
     }
-    editcourse=(neweditcourse)=>{
+    editcourse = (neweditcourse) => {
         this.setState({
-            editcourse:neweditcourse
+            editcourse: neweditcourse
         })
 
     }
 
-    Deletcourse=(e)=>{
+    Deletcourse = (e) => {
         // 删除
         // let id =e.target.getAttribute("index");
-        let {editcourse} = this.state;
-        let arr=new Array();
-				editcourse.map((item,key)=>{
-					arr.push(item)
-				})
+        let { editcourse } = this.state;
+        let arr = new Array();
+        editcourse.map((item, key) => {
+            arr.push(item)
+        })
 
-        let neweditcourse=arr;
-			if(neweditcourse.length>1){
-				neweditcourse.splice(e,1);
-				let newnum=0;
-				for(var j=0;j<neweditcourse.length;j++){
-					if(neweditcourse[j].weights===undefined){
-						newnum=0
-					}else{
-						newnum=newnum+neweditcourse[j].weights;
-					}
-				}
-				newnum= Math.round(newnum*100)/100;
+        let neweditcourse = arr;
+        if (neweditcourse.length > 1) {
+            neweditcourse.splice(e, 1);
+            let newnum = 0;
+            for (var j = 0; j < neweditcourse.length; j++) {
+                if (neweditcourse[j].weights === undefined) {
+                    newnum = 0
+                } else {
+                    newnum = newnum + neweditcourse[j].weights;
+                }
+            }
+            newnum = Math.round(newnum * 100) / 100;
 
-				this.setState({
-					Supportstype:false,
-					supportid:null,
-					Supportslist:"",
-					editcourse:neweditcourse,
-					editnum:newnum
-				})
-			}else{
-				this.setState({
-					// Supportstype:true,
-					Supportslist:'删除失败,至少保留一个课程',
-				})
-			}
+            this.setState({
+                Supportstype: false,
+                supportid: null,
+                Supportslist: "",
+                editcourse: neweditcourse,
+                editnum: newnum
+            })
+        } else {
+            this.setState({
+                // Supportstype:true,
+                Supportslist: '删除失败,至少保留一个课程',
+            })
+        }
 
 
     }
 
-    enterweight=(e)=>{
-        let {editcourse} = this.state;
-				let arr=new Array();
-				editcourse.map((item,key)=>{
-					arr.push(item)
-				})
+    enterweight = (e) => {
+        let { editcourse } = this.state;
+        let arr = new Array();
+        editcourse.map((item, key) => {
+            arr.push(item)
+        })
 
-        let neweditcourse=arr;
-        var id=e.target.id;
-        var value=parseFloat(e.target.value);
-        if(isNaN(value)){
-            value=""
+        let neweditcourse = arr;
+        var id = e.target.id;
+        var value = parseFloat(e.target.value);
+        if (isNaN(value)) {
+            value = ""
         }
         var x = String(value).indexOf('.') + 1;
         var y = String(value).length - x;
-        if(y > 2){
+        if (y > 2) {
             this.setState({
                 // Supportstype:true,
-                Supportslist:'请精确到2位数',
-                Supportssum:true
+                Supportslist: '请精确到2位数',
+                Supportssum: true
             })
             return
-        }else{
-					this.setState({
-						Supportssum:false
-					})
-				}
+        } else {
+            this.setState({
+                Supportssum: false
+            })
+        }
 
 
-        const person = new Object ();
-        person.weights=value;
-        person.ec_course_id= neweditcourse[id].ec_course_id;
-        person.ec_course_name=neweditcourse[id].ec_course_name;
-        person.top_relation=neweditcourse[id].top_relation;
+        const person = new Object();
+        person.weights = value;
+        person.ec_course_id = neweditcourse[id].ec_course_id;
+        person.ec_course_name = neweditcourse[id].ec_course_name;
+        person.top_relation = neweditcourse[id].top_relation;
 
 
-        neweditcourse[id]=person;
+        neweditcourse[id] = person;
 
-        let newnum=0;
-        for(var j=0;j<neweditcourse.length;j++){
+        let newnum = 0;
+        for (var j = 0; j < neweditcourse.length; j++) {
 
-            if(neweditcourse[j].weights===undefined){
-                newnum=newnum+0;
-            }else if(neweditcourse[j].weights===""){
-                newnum=newnum+0;
-            }else{
-                newnum=newnum+neweditcourse[j].weights;
+            if (neweditcourse[j].weights === undefined) {
+                newnum = newnum + 0;
+            } else if (neweditcourse[j].weights === "") {
+                newnum = newnum + 0;
+            } else {
+                newnum = newnum + neweditcourse[j].weights;
             }
 
         }
-        newnum= Math.round(newnum*100)/100;
+        newnum = Math.round(newnum * 100) / 100;
         this.setState({
-            editnum:newnum,
-            editcourse:neweditcourse
+            editnum: newnum,
+            editcourse: neweditcourse
         })
-        if(newnum>1){
+        if (newnum > 1) {
             this.setState({
                 // Supportstype:true,
-                Supportslist:'权重之和不能大于1',
-                Supportssum:true
+                Supportslist: '权重之和不能大于1',
+                Supportssum: true
             })
-        }else{
-					this.setState({
-						Supportssum:false
-					})
-				}
+        } else {
+            this.setState({
+                Supportssum: false
+            })
+        }
 
     }
-    handleChange=(e)=> {
+    handleChange = (e) => {
 
-        let {editcourse} = this.state;
+        let { editcourse } = this.state;
 
-				let arr=new Array();
-				editcourse.map((item,key)=>{
-					arr.push(item)
-				})
-        let neweditcourse=arr;
+        let arr = new Array();
+        editcourse.map((item, key) => {
+            arr.push(item)
+        })
+        let neweditcourse = arr;
 
-				let value=`${e[0]}`;
-				value=parseInt(value)
-        let num=`${e[1]}`;
-        num=parseInt(num)
+        let value = `${e[0]}`;
+        value = parseInt(value)
+        let num = `${e[1]}`;
+        num = parseInt(num)
 
-        for(var z=0;z<editcourse.length;z++){
-            if(neweditcourse[z].ec_course_name===`${e[2]}`){
+        for (var z = 0; z < editcourse.length; z++) {
+            if (neweditcourse[z].ec_course_name === `${e[2]}`) {
                 this.setState({
-                    Supportstype:true,
-                    Supportslist:"请勿选择重复的支持课程"
+                    Supportstype: true,
+                    Supportslist: "请勿选择重复的支持课程"
                 })
                 return
             }
         }
-        for(var i=0;i<1;i++){
-            neweditcourse[num].ec_course_id=value;
-            neweditcourse[num].ec_course_name=`${e[2]}`
+        for (var i = 0; i < 1; i++) {
+            neweditcourse[num].ec_course_id = value;
+            neweditcourse[num].ec_course_name = `${e[2]}`
         }
 
         this.editcourse(neweditcourse);
     }
 
-    relevancetop=(e)=>{
+    relevancetop = (e) => {
 
-        let {editcourse} = this.state;
+        let { editcourse } = this.state;
 
-				let arr=new Array();
-				editcourse.map((item,key)=>{
-					arr.push(item)
-				})
+        let arr = new Array();
+        editcourse.map((item, key) => {
+            arr.push(item)
+        })
 
-        let neweditcourse=arr;
-        let id =e.target.getAttribute("itindex");
-        for(var i=0;i<1;i++){
-            neweditcourse[id].top_relation=false;
+        let neweditcourse = arr;
+        let id = e.target.getAttribute("itindex");
+        for (var i = 0; i < 1; i++) {
+            neweditcourse[id].top_relation = false;
         }
 
         this.editcourse(neweditcourse);
     }
 
-    relevancebottom=(e)=>{
+    relevancebottom = (e) => {
 
-        let {editcourse} = this.state;
-				let arr=new Array();
-				editcourse.map((item,key)=>{
-					arr.push(item)
-				})
-        let neweditcourse=arr;
-        let id =e.target.getAttribute("itindex");
-        for(var i=0;i<1;i++){
-            neweditcourse[id].top_relation=true;
+        let { editcourse } = this.state;
+        let arr = new Array();
+        editcourse.map((item, key) => {
+            arr.push(item)
+        })
+        let neweditcourse = arr;
+        let id = e.target.getAttribute("itindex");
+        for (var i = 0; i < 1; i++) {
+            neweditcourse[id].top_relation = true;
         }
 
         this.editcourse(neweditcourse);
@@ -415,34 +418,34 @@ class CourseSupports extends Component {
     blur() {
         this.inputNumberRef.blur();
     }
-    CancelSupports=()=>{
-    	let{editcourse,neweditcourse}=this.state;
-				//
-				// console.log(editcourse)
-				// console.log(neweditcourse)
+    CancelSupports = () => {
+        let { editcourse, neweditcourse } = this.state;
+        //
+        // console.log(editcourse)
+        // console.log(neweditcourse)
 
         this.setState({
-            Editkey:null,
-            Supportssum:false,
-            Supportsclass:false,
-					  editcourse:neweditcourse
+            Editkey: null,
+            Supportssum: false,
+            Supportsclass: false,
+            editcourse: neweditcourse
         })
     }
-    SubmitClassData=()=>{
-        let {editcourse,editnum,ec_graduation_subitem_id} = this.state;
-        if(editcourse.length===0){
+    SubmitClassData = () => {
+        let { editcourse, editnum, ec_graduation_subitem_id } = this.state;
+        if (editcourse.length === 0) {
             this.setState({
                 // Supportstype:true,
-                Supportslist:'保存失败,至少保留一个课程',
-                Supportssum:true
+                Supportslist: '保存失败,至少保留一个课程',
+                Supportssum: true
             })
             return
-        } 
-        if(editnum>1||editnum===0){
+        }
+        if (editnum > 1 || editnum === 0) {
             this.setState({
                 // Supportstype:true,
-                Supportslist:'保存失败,权重大于1或为空',
-                Supportssum:true
+                Supportslist: '保存失败,权重大于1或为空',
+                Supportssum: true
             })
             return
         }
@@ -461,123 +464,123 @@ class CourseSupports extends Component {
         //     }
         // }
 
-				editcourse.map((item,key)=>{
-					if(item.weights===""){
-						item.weights=0;
-					}
-					if(item.ec_course_id===""){
-						this.setState({
-							// Supportstype:true,
-							Supportslist:'保存失败,课程不能为空',
-							Supportsclass:true,
-							Supportsclasskey:key
-						})
-						return
-					}
-				})
+        editcourse.map((item, key) => {
+            if (item.weights === "") {
+                item.weights = 0;
+            }
+            if (item.ec_course_id === "") {
+                this.setState({
+                    // Supportstype:true,
+                    Supportslist: '保存失败,课程不能为空',
+                    Supportsclass: true,
+                    Supportsclasskey: key
+                })
+                return
+            }
+        })
 
 
 
 
         var Url = `/ec_years/${this.props.match.params.ec_year_id}/graduation_course_supports.json`;
         axios.post(Url, {
-					    	graduation_subitem_id	:ec_graduation_subitem_id,
-					    	course_supports: editcourse
-            }
+            graduation_subitem_id: ec_graduation_subitem_id,
+            course_supports: editcourse
+        }
         ).then((response) => {
-            if(response.data.id===ec_graduation_subitem_id){
+            if (response.data.id === ec_graduation_subitem_id) {
 
-              //   this.setState({
-              //       Editkey:null,
-              //       Supportslist:"保存成功",
-              //       Supportstype:true,
-              //       Supportssum:false,
-              //       Supportsclass:false,
-							// 		  Supportsclasskey:undefined,
-              //   })
-							this.UpdateClassData();
-							this.setState({
-								Editkey:null,
-								Supportssum:false,
-								Supportsclass:false,
-							})
-            }else if(response.data.status===-1){
+                //   this.setState({
+                //       Editkey:null,
+                //       Supportslist:"保存成功",
+                //       Supportstype:true,
+                //       Supportssum:false,
+                //       Supportsclass:false,
+                // 		  Supportsclasskey:undefined,
+                //   })
+                this.UpdateClassData();
+                this.setState({
+                    Editkey: null,
+                    Supportssum: false,
+                    Supportsclass: false,
+                })
+            } else if (response.data.status === -1) {
                 // this.setState({
                 //     Supportslist:"参数错误",
                 //     Supportstype:true,
                 //     Supportssum:false,
                 //     Supportsclass:false,
-								// 	  Supportsclasskey:undefined,
+                // 	  Supportsclasskey:undefined,
                 // })
             }
         }).catch((error) => {
             console.log(error)
         })
     }
-    Deletcourses=(key)=>{
+    Deletcourses = (key) => {
         this.setState({
-            supportid:key,
-            Supportslist:"您确定要删除吗?",
-            Supportstype:true
+            supportid: key,
+            Supportslist: "您确定要删除吗?",
+            Supportstype: true
         })
     }
-    hideSupports=()=>{
+    hideSupports = () => {
         this.setState({
-            Supportstype:false,
-            supportid:null,
-            Supportslist:"",
+            Supportstype: false,
+            supportid: null,
+            Supportslist: "",
         })
     }
 
-			confirmysl(url){
-				axios.get(url + '?export=true').then((response) => {
-					if(response.data.status&&response.data.status===-1){
+    confirmysl(url) {
+        axios.get(url + '?export=true').then((response) => {
+            if (response.data.status && response.data.status === -1) {
 
-					}else if(response.data.status&&response.data.status===-2){
-						if(response.data.message === "100"){
-							// 已超出文件导出的上限数量（100 ），建议：
+            } else if (response.data.status && response.data.status === -2) {
+                if (response.data.message === "100") {
+                    // 已超出文件导出的上限数量（100 ），建议：
 
-							this.setState({
-								DownloadType:true,
-								DownloadMessageval:100
-							})
-						}else {
-							//因附件资料超过500M
-							this.setState({
-								DownloadType:true,
-								DownloadMessageval:500
-							})
-						}
-					}else {
-						this.props.showNotification(`正在下载中`);
-						window.open(getRandomcode("/api"+url), '_blank');
-					}
-				}).catch((error) => {
-					console.log(error)
-				});
-			}
+                    this.setState({
+                        DownloadType: true,
+                        DownloadMessageval: 100
+                    })
+                } else {
+                    //因附件资料超过500M
+                    this.setState({
+                        DownloadType: true,
+                        DownloadMessageval: 500
+                    })
+                }
+            } else {
+                this.props.showNotification(`正在下载中`);
+                window.open(getRandomcode("/api" + url), '_blank');
+            }
+        }).catch((error) => {
+            console.log(error)
+        });
+    }
 
-			toforums=(url)=>{
-				window.open( url, '_blank');
-			}
+    toforums = (url) => {
+        window.open(url, '_blank');
+    }
     render() {
         const Option = Select.Option;
-        let {max_support_count,data,ec_courses_list,editcourse,editnum,index,ec_year_id,Supportsclasskey,ecComponentState,hidesupport,supportid,Editkey,titlemessage,Supportstype,Supportslist,Supportssum,Supportsclass,major_school_id} = this.state;
+        let { max_support_count, data, ec_courses_list, editcourse, editnum, index, ec_year_id, Supportsclasskey, ecComponentState, hidesupport, supportid, Editkey, titlemessage, Supportstype, Supportslist, Supportssum, Supportsclass, major_school_id } = this.state;
         var list = (length) => {
             var res = [];
-            for(var i = 0; i < length; i++) {
-                res.push( <span key={i} className="column-1 color-666">
-                            <div style={{lineHeight: '20px'}}>支撑课程
-                            <br/> （权值）
+            for (var i = 0; i < length; i++) {
+                res.push(<span key={i} className="column-1 color-666">
+                    <div style={{ lineHeight: '20px' }}>支撑课程
+                            <br /> （权值）
                             </div>
-                          </span>)
+                </span>)
             }
             return res
         }
 
-        let toptiebox={width: 126.6*max_support_count+"px"};
+        let toptiebox = { width: 126.6 * max_support_count + "px" };
 
-        let ismidbox={width:123.82*max_support_count+"px",margin:'0px 0px'};
+        let ismidbox = { width: 123.82 * max_support_count + "px", margin: '0px 0px' };
 
         // console.log(this.props.year&&this.props.year.can_manager)
         return (
@@ -594,13 +597,13 @@ class CourseSupports extends Component {
                         <div className="task-popup-text-center font-14">{Supportslist}</div>
                     </div>
                     <div className="task-popup-submit clearfix">
-                    <a onClick={this.hideSupports} className="task-btn fl">取消</a>
-                        { supportid===null?<a className="task-btn task-btn-orange fr"
+                        <a onClick={this.hideSupports} className="task-btn fl">取消</a>
+                        {supportid === null ? <a className="task-btn task-btn-orange fr"
                             onClick={this.hideSupports}
-                        >确定</a>:
-                       <a  className="task-btn task-btn-orange fr"
-                            onClick={()=>this.Deletcourse(supportid)}
-                        >确定</a>}
+                        >确定</a> :
+                            <a className="task-btn task-btn-orange fr"
+                                onClick={() => this.Deletcourse(supportid)}
+                            >确定</a>}
                     </div>
                 </Modal>
 
@@ -611,180 +614,180 @@ class CourseSupports extends Component {
 
                     <div className="edu-back-white eacourse">
 
-                        <div className="clearfix padding20-30 bor-bottom-greyE" style={{position:'relative'}}>
+                        <div className="clearfix padding20-30 bor-bottom-greyE" style={{ position: 'relative' }}>
                             <span className="font-18 courseSystem">课程体系对毕业要求的支撑</span>
-                            {/* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> */}
+                            {/* <a   className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> */}
 
 
-                            <span className={this.props.year&&this.props.year.can_manager===false?"none":"Importclassroomdata"} style={{top: '29px'}}>
-                                <a className="white-btn edu-blueback-btn fr mb10 mr10" onClick={()=>this.confirmysl(`/ec_years/${this.props.match.params.ec_year_id}/graduation_course_supports.xlsx`)}>导出课程体系支撑矩阵</a>
+                            <span className={this.props.year && this.props.year.can_manager === false ? "none" : "Importclassroomdata"} style={{ top: '29px' }}>
+                                <a className="white-btn edu-blueback-btn fr mb10 mr10" onClick={() => this.confirmysl(`/ec_years/${this.props.match.params.ec_year_id}/graduation_course_supports.xlsx`)}>导出课程体系支撑矩阵</a>
                             </span>
                             <div className="color-grey-9 mr10">用矩阵图的形式说明本专业课程体系对毕业要求的支撑关系  <a className={"color-blue"} onClick={() => this.toforums(`/forums/${3534}`)} >查看详情</a></div>
 
                         </div>
                         <div className="padding20-30" id="training_objective_contents">
                             <span className="fl SystemParameters" >毕业要求指标点（<a href={`/ecs/major_schools/${this.props.match.params.major_school_id}/years/${this.props.match.params.ec_year_id}/graduation_requirement`}><span className="Systemnum">{data.count}</span></a>）</span>
-                            <span className="fl ml20 SystemParameters">课程体系（<a href={`/ecs/major_schools/${this.props.match.params.major_school_id}/years/${this.props.match.params.ec_year_id}/courses/ec_course_support_setting/1`}><span className="Systemnum">{data.course_count}</span></a>）</span>
+                            <span className="fl ml20 SystemParameters">课程体系（<a href={`/ecs/major_schools/${this.props.match.params.major_school_id}/years/${this.props.match.params.ec_year_id}/classrooms/ec_course_support_setting/1`}><span className="Systemnum">{data.course_count}</span></a>）</span>
                         </div>
 
                     </div>
 
-                    <div className="ListTableLine" id="school_major_list" style={{overflow:'auto'}}>
+                    <div className="ListTableLine" id="school_major_list" style={{ overflow: 'auto' }}>
 
                         <p className="clearfix" style={toptiebox}>
                             <span className="color-666 finishtarget">毕业要求指标点</span>
-                            {data.graduation_subitems===undefined?"":list(max_support_count<5||max_support_count===undefined?5:max_support_count)}
+                            {data.graduation_subitems === undefined ? "" : list(max_support_count < 5 || max_support_count === undefined ? 5 : max_support_count)}
                             <span className="column-1 operationright color-666"
-                            style={{
-                                paddingLeft: '28px'
-                            }}
+                                style={{
+                                    paddingLeft: '28px'
+                                }}
                             >合计</span>
                         </p>
-                        <div className="paddingLF" style={{background:'#fff'}}>
+                        <div className="paddingLF" style={{ background: '#fff' }}>
                             {
-                                data.graduation_subitems===undefined? <Spin  delay={500} className="Spinlarge"  indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:data.graduation_subitems.map((item,key)=>{
+                                data.graduation_subitems === undefined ? <Spin delay={500} className="Spinlarge" indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />} /> : data.graduation_subitems.map((item, key) => {
 
                                     return (
-                                        <li className={data.graduation_subitems.length===key+1?"clearfix mb10":"clearfix"}  key={key} style={ismidbox}>
+                                        <li className={data.graduation_subitems.length === key + 1 ? "clearfix mb10" : "clearfix"} key={key} style={ismidbox}>
                                             <Tooltip placement="bottom" title={item.sequence_title}>
-                                                <span className="column-1 columnlocation" style={{display:Editkey!=key?"block":'none',width: '95px', paddingLeft: '23px'}}>{item.graduation_requirement_position+"-"+item.position}</span>
+                                                <span className="column-1 columnlocation" style={{ display: Editkey != key ? "block" : 'none', width: '95px', paddingLeft: '23px' }}>{item.graduation_requirement_position + "-" + item.position}</span>
                                             </Tooltip>
 
 
                                             {
-                                                item.course_supports.map((t,kes)=>{
+                                                item.course_supports.map((t, kes) => {
 
-                                                    return(
-                                                        <span key={kes} className="column-1" 
-                                                        style={{
-                                                            display:Editkey!=key?"block":'none',
-                                                            marginRight: '-1px'
-                                                        }}>
-                                                        <div title={t.ec_course_name} className={t.top_relation===true?"DDred columnbox":"columnbox"}
-                                                        style={{textAlign: 'center'}}
-                                                        >{t.ec_course_name.length>12?t.ec_course_name.substring(0, 10)+"...":t.ec_course_name}</div>
-                                                        <div className={t.top_relation===true?"DDred":""}
-                                                         style={{textAlign: 'center'}}
-                                                        >（{t.weights}）</div>
-                                                         </span>
+                                                    return (
+                                                        <span key={kes} className="column-1"
+                                                            style={{
+                                                                display: Editkey != key ? "block" : 'none',
+                                                                marginRight: '-1px'
+                                                            }}>
+                                                            <div title={t.ec_course_name} className={t.top_relation === true ? "DDred columnbox" : "columnbox"}
+                                                                style={{ textAlign: 'center' }}
+                                                            >{t.ec_course_name.length > 12 ? t.ec_course_name.substring(0, 10) + "..." : t.ec_course_name}</div>
+                                                            <div className={t.top_relation === true ? "DDred" : ""}
+                                                                style={{ textAlign: 'center' }}
+                                                            >（{t.weights}）</div>
+                                                        </span>
                                                     )
 
                                                 })
                                             }
 
-                                            <span className="column-1 operationright" style={{display:Editkey!=key?"block":'none',width:'75px'}}>
-                                                  <div className="operationColumn">
-                                                      <div className="left">
-                                                          <div className="width20 columnbox">{item.course_supports.length}</div>
-                                                          <div className="width20">{Math.round(item.weights_total*100)/100===0?0:(Math.round(item.weights_total*100)/100)}</div>
-                                                      </div>
-                                                      <div className="left operationalter">
-                                                         {this.props.year&&this.props.year.can_manager===false?"":<a className="editSubentry" title="编辑">
-                                                            <i className="iconfont icon-bianjidaibeijing color-green" id={item.id} subindex={item.graduation_requirement_position+"-"+item.position} onClick={this.EditSupportCourse.bind(this,key)}></i>
-                                                          </a>} 
+                                            <span className="column-1 operationright" style={{ display: Editkey != key ? "block" : 'none', width: '75px' }}>
+                                                <div className="operationColumn">
+                                                    <div className="left">
+                                                        <div className="width20 columnbox">{item.course_supports.length}</div>
+                                                        <div className="width20">{Math.round(item.weights_total * 100) / 100 === 0 ? 0 : (Math.round(item.weights_total * 100) / 100)}</div>
                                                     </div>
-                                                  </div>
+                                                    <div className="left operationalter">
+                                                        {this.props.year && this.props.year.can_manager === false ? "" : <a className="editSubentry" title="编辑">
+                                                            <i className="iconfont icon-bianjidaibeijing color-green" id={item.id} subindex={item.graduation_requirement_position + "-" + item.position} onClick={this.EditSupportCourse.bind(this, key)}></i>
+                                                        </a>}
+                                                    </div>
+                                                </div>
 
-                                              </span>
-																					<style>
-																						{
-																							`
+                                            </span>
+                                            <style>
+                                                {
+                                                    `
 																							.ListTableLine li{ background: rgb(255, 255, 255);}
 																							`
-																						}
-																					</style>
-																					{Editkey===key?
-                                            <p className="ListTableLine" id="school_ListTableLine"  style={ismidbox}  >
-																							<div style={{width: '1134px'}}>
-																								<p className="clearfix SystemModifythelist">
-																									<span className="ml6" style={{width:'77px'}}>指标点 {index}</span>
-																									<span className="column-4">支撑课程</span>
-																									<span className="column-2 ml93">
-                                                      <span> 权重(∑=1)</span>
-                                                      <span className="Systempoint">（精确到两位小数）</span>
-                                                    </span>
-																									<span className="column-1 ml50">关联度最高</span>
-																								</p>
+                                                }
+                                            </style>
+                                            {Editkey === key ?
+                                                <p className="ListTableLine" id="school_ListTableLine" style={ismidbox}  >
+                                                    <div style={{ width: '1134px' }}>
+                                                        <p className="clearfix SystemModifythelist">
+                                                            <span className="ml6" style={{ width: '77px' }}>指标点 {index}</span>
+                                                            <span className="column-4">支撑课程</span>
+                                                            <span className="column-2 ml93">
+                                                                <span> 权重(∑=1)</span>
+                                                                <span className="Systempoint">（精确到两位小数）</span>
+                                                            </span>
+                                                            <span className="column-1 ml50">关联度最高</span>
+                                                        </p>
 
-																								<div className="clearfix editorModify">
-																									{Supportsclass===true?<style>
-																										{
-																											`
+                                                        <div className="clearfix editorModify">
+                                                            {Supportsclass === true ? <style>
+                                                                {
+                                                                    `
 																											.showredfont .ant-select-selection{
 																											    border: 1px solid #db0505 !important;
 																											}
 																											`
-																										}
-																									</style>:""}
-																									{
-																										editcourse.map((it,key)=>{
+                                                                }
+                                                            </style> : ""}
+                                                            {
+                                                                editcourse.map((it, key) => {
 
-																											return(
-																												<div className="mb15" key={key}>
+                                                                    return (
+                                                                        <div className="mb15" key={key}>
 
-																													<Select className={Supportsclasskey===key?"showredfont heightimportant":"heightimportant"} showSearch value={it.ec_course_name} onChange={this.handleChange}>
-																														{
-																															ec_courses_list.map((qva,qk)=>{
-																																return(
-																																	<Option value={[qva.id,key,qva.name]} key={[qva.id,key,qva.name]}>{qva.name}</Option>
-																																)
-																															})
+                                                                            <Select className={Supportsclasskey === key ? "showredfont heightimportant" : "heightimportant"} showSearch value={it.ec_course_name} onChange={this.handleChange}>
+                                                                                {
+                                                                                    ec_courses_list.map((qva, qk) => {
+                                                                                        return (
+                                                                                            <Option value={[qva.id, key, qva.name]} key={[qva.id, key, qva.name]}>{qva.name}</Option>
+                                                                                        )
+                                                                                    })
 
-																														}
-																													</Select>
-																													<Input
-																														type="number"
-																														size="large"
-																														className={Supportssum===true?"inputWeight bor-red":"inputWeight"}
-																														id={key}
-																														value={it.weights}
-																														onInput={this.enterweight.bind(this)}
-																													/>
+                                                                                }
+                                                                            </Select>
+                                                                            <Input
+                                                                                type="number"
+                                                                                size="large"
+                                                                                className={Supportssum === true ? "inputWeight bor-red" : "inputWeight"}
+                                                                                id={key}
+                                                                                value={it.weights}
+                                                                                onInput={this.enterweight.bind(this)}
+                                                                            />
 
-																													<div className="SetTheAssociated">
+                                                                            <div className="SetTheAssociated">
 
-																														<div className="SetTheAssociatedchild">
+                                                                                <div className="SetTheAssociatedchild">
 
-																															<i className="iconfont icon-gouxuan gouxuanbule" style={{display:it.top_relation===false?'none':'block'}} itindex={key} onClick={this.relevancetop.bind(this)}></i>
-																															<i className="iconfont icon-gouxuan gouxuanwhite" style={{display:it.top_relation===false?'block':'none'}} itindex={key} onClick={this.relevancebottom.bind(this)}></i>
+                                                                                    <i className="iconfont icon-gouxuan gouxuanbule" style={{ display: it.top_relation === false ? 'none' : 'block' }} itindex={key} onClick={this.relevancetop.bind(this)}></i>
+                                                                                    <i className="iconfont icon-gouxuan gouxuanwhite" style={{ display: it.top_relation === false ? 'block' : 'none' }} itindex={key} onClick={this.relevancebottom.bind(this)}></i>
 
-																														</div>
+                                                                                </div>
 
-																														<div className="left operatebutton">
-																															{editcourse.length===1?"":<a className="mr15 delSubentry" title="删除">
-																																<i className="iconfont icon-shanchu color-grey-c font-15" onClick={()=>this.Deletcourses(key)}></i>
-																															</a>}
-																															<a className="newAddSubentry" title="添加"
-																																 style={{display:key===editcourse.length-1?"inline-block":'none'}}
-																															><i className="iconfont icon-tianjiafangda color-green" onClick={this.Addcourse}></i></a>
-																														</div>
+                                                                                <div className="left operatebutton">
+                                                                                    {editcourse.length === 1 ? "" : <a className="mr15 delSubentry" title="删除">
+                                                                                        <i className="iconfont icon-shanchu color-grey-c font-15" onClick={() => this.Deletcourses(key)}></i>
+                                                                                    </a>}
+                                                                                    <a className="newAddSubentry" title="添加"
+                                                                                        style={{ display: key === editcourse.length - 1 ? "inline-block" : 'none' }}
+                                                                                    ><i className="iconfont icon-tianjiafangda color-green" onClick={this.Addcourse}></i></a>
+                                                                                </div>
 
-																													</div>
+                                                                            </div>
 
-																												</div>
-																											)
-																										})
-																									}
+                                                                        </div>
+                                                                    )
+                                                                })
+                                                            }
 
-																								</div>
-																								<span className="c_red none ml35 color-red" id="error_tip" style={{display:Supportssum===true||Supportsclass===true?'inline':'none'}}>{Supportslist}</span>
-																								<div className="clearfix editorModify">
-                                                    <span className="column-1"
-																													style={{
-																														width: '580px',
-																														paddingLeft: '37px',
-																														display: 'inline-block'
-																													}}
-																										>合计: <span>{editcourse.length}</span></span>
-																									<span className="ml30">合计: <span>{editnum}</span></span>
-																								</div>
+                                                        </div>
+                                                        <span className="c_red none ml35 color-red" id="error_tip" style={{ display: Supportssum === true || Supportsclass === true ? 'inline' : 'none' }}>{Supportslist}</span>
+                                                        <div className="clearfix editorModify">
+                                                            <span className="column-1"
+                                                                style={{
+                                                                    width: '580px',
+                                                                    paddingLeft: '37px',
+                                                                    display: 'inline-block'
+                                                                }}
+                                                            >合计: <span>{editcourse.length}</span></span>
+                                                            <span className="ml30">合计: <span>{editnum}</span></span>
+                                                        </div>
 
-																								<div className="right editlybuttonbox">
-																									<div className="defalutSubmitbtn fr" onClick={this.SubmitClassData}>保存</div>
-																									<div className="defalutCancelbtn fr mr20" onClick={this.CancelSupports}>取消</div>
-																								</div>
-																							</div>
-                                            </p>:""}
+                                                        <div className="right editlybuttonbox">
+                                                            <div className="defalutSubmitbtn fr" onClick={this.SubmitClassData}>保存</div>
+                                                            <div className="defalutCancelbtn fr mr20" onClick={this.CancelSupports}>取消</div>
+                                                        </div>
+                                                    </div>
+                                                </p> : ""}
                                         </li>
                                     )
                                 })
@@ -798,5 +801,5 @@ class CourseSupports extends Component {
     }
 }
 
-export default  CourseSupports ;
+export default CourseSupports;
 
diff --git a/src/modules/ecs/EcSetting/index.js b/src/modules/ecs/EcSetting/index.js
index 28c176f0..2c465371 100644
--- a/src/modules/ecs/EcSetting/index.js
+++ b/src/modules/ecs/EcSetting/index.js
@@ -10,7 +10,7 @@ import Loadable from 'react-loadable';
 import Loading from "../../../Loading";
 const { Step } = Steps;
 const steps = ["培养目标", "毕业要求", "培养目标VS毕业要求", "毕业要求VS通用标准", "学生", "课程体系", "课程体系VS毕业要求", "达成度评价结果"];
-const stepTypes = ["training_objectives", "graduation_requirement", "requirement_vs_objective", "requirement_vs_standard", "students", "courses", "requirement_vs_courses", "reach_calculation_info"];
+const stepTypes = ["training_objectives", "graduation_requirement", "requirement_vs_objective", "requirement_vs_standard", "students", "classrooms", "requirement_vs_courses", "reach_calculation_info"];
 const EcStudentList=Loadable({
   loader: () => import('../subroute/ecStudentList/EcStudentList'),
   loading: Loading,
@@ -83,7 +83,7 @@ class EcSetting extends React.Component {
     let type = stepTypes[stepIndex];
 
     this.setState({ stepIndex: stepIndex });
-    // if(type==="courses"){
+    // if(type==="classrooms"){
     //   this.props.history.push(`/ecs/major_schools/${majorId}/years/${yearId}/${type}/ec_course_support_setting/1`);
     // }else {
       this.props.history.push(`/ecs/major_schools/${majorId}/years/${yearId}/${type}`);
@@ -149,15 +149,15 @@ class EcSetting extends React.Component {
                 {/* 毕业要求对通用标准的支撑 */}
                 <Route extra path='/ecs/major_schools/:majorId/years/:yearId/requirement_vs_standard'
 											 render={ (props) => (<RequirementVsStandard {...this.props} {...props} {...this.state} />) }></Route>
-               
+
                 {/*学生*/}
                 <Route extra path='/ecs/major_schools/:majorId/years/:yearId/students'
                        render={ (props) => (<EcStudentList {...this.props} {...props} {...this.state} />) }></Route>
                 {/*课程体系*/}
-                <Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/subpage'
+                <Route extra path='/ecs/major_schools/:majorId/years/:yearId/classrooms/subpage'
                        render={ (props) => (<Curriculum {...this.props} {...props} {...this.state} />) }></Route>
                 {/*课程体系资源子页面Subpage*/}
-                <Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses'
+                <Route extra path='/ecs/major_schools/:majorId/years/:yearId/classrooms'
                        render={ (props) => (<CurriculumSubpage {...this.props} {...props} {...this.state} />) }></Route>
                 {/*课程体系VS毕业要求*/}
 								<Route extra path='/ecs/major_schools/:major_school_id/years/:ec_year_id/requirement_vs_courses'
@@ -175,4 +175,4 @@ class EcSetting extends React.Component {
   }
 }
 
-export default EcSetting
\ No newline at end of file
+export default EcSetting
diff --git a/src/modules/ecs/EcSetting/reachCalculationInfo/index.js b/src/modules/ecs/EcSetting/reachCalculationInfo/index.js
index 8928be3c..4b5df0b6 100644
--- a/src/modules/ecs/EcSetting/reachCalculationInfo/index.js
+++ b/src/modules/ecs/EcSetting/reachCalculationInfo/index.js
@@ -1,25 +1,18 @@
 import React, { Component } from 'react';
 
-import classNames from 'classnames';
 
-import {getRandomNumber} from 'educoder';
+import { getRandomNumber } from 'educoder';
 
 import axios from 'axios';
 
 import { Table, Divider, Tag, Checkbox, InputNumber, Spin, Icon } from 'antd';
 
-// import EcTitleCourseEvaluations from '../ecTitle/ecTitle'
 import { ECModalHOC } from '../../common/ECModalHOC'
 
-import 'antd/lib/style/index.css';
-
 import './index.scss'
 
 
-const onCheckBoxClick = (that, rowData) =>{
-  console.log(rowData)
-}
-const testData = {"calculation_data":[{"first_level":1,"first_leval_data":[{"second_level":"1.1","course_data":[{"course_name":"\u9ad8\u7b49\u6570\u5b66","target_value":null,"real_value":null,"status":null},{"course_name":"\u7ebf\u6027\u4ee3\u6570","target_value":null,"real_value":null,"status":null},{"course_name":"\u6982\u7387\u8bba\u4e0e\u6570\u7406\u7edf\u8ba1","target_value":null,"real_value":null,"status":null},{"course_name":"\u79bb\u6563\u6570\u5b66","target_value":null,"real_value":null,"status":null}]},{"second_level":"1.2","course_data":[{"course_name":"\u81ea\u7136\u79d1\u5b66\u54f2\u5b66","target_value":null,"real_value":null,"status":null},{"course_name":"\u5927\u5b66\u7269\u7406","target_value":null,"real_value":null,"status":null},{"course_name":"\u5927\u5b66\u5316\u5b66","target_value":null,"real_value":null,"status":null},{"course_name":"\u751f\u7269\u5b66\u57fa\u7840","target_value":null,"real_value":null,"status":null}]},{"second_level":"1.3","course_data":[{"course_name":"\u5de5\u7a0b\u5236\u56fe\u57fa\u7840\u53ca\u5de5\u7a0b\u5236\u56fe\u57fa\u7840\u5b9e\u9a8c","target_value":null,"real_value":null,"status":null},{"course_name":"\u519b\u4e8b\u4fe1\u606f\u6280\u672f\u57fa\u7840","target_value":null,"real_value":null,"status":null},{"course_name":"\u5927\u5b66\u8ba1\u7b97\u673a\u57fa\u7840B","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u7a0b\u5e8f\u8bbe\u8ba1B","target_value":null,"real_value":null,"status":null}]},{"second_level":"1.4","course_data":[{"course_name":"\u64cd\u4f5c\u7cfb\u7edf","target_value":null,"real_value":null,"status":null},{"course_name":"\u6570\u636e\u5e93\u539f\u7406","target_value":0,"real_value":0,"status":false},{"course_name":"\u8ba1\u7b97\u673a\u7f51\u7edc","target_value":null,"real_value":null,"status":null},{"course_name":"\u8f6f\u4ef6\u5de5\u7a0b","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u539f\u7406","target_value":null,"real_value":null,"status":null}]},{"second_level":"1.5","course_data":[{"course_name":"\u4fe1\u53f7\u5206\u6790\u4e0e\u5904\u7406\u5bfc\u8bba","target_value":null,"real_value":null,"status":null},{"course_name":"\u6570\u5b57\u56fe\u50cf\u5904\u7406","target_value":null,"real_value":null,"status":null},{"course_name":"\u5d4c\u5165\u5f0f\u7cfb\u7edf\u8bfe\u7a0b\u8bbe\u8ba1","target_value":null,"real_value":null,"status":null},{"course_name":"\u64cd\u4f5c\u7cfb\u7edf\u7efc\u5408\u5b9e\u8df5","target_value":null,"real_value":null,"status":null}]}]},{"first_level":2,"first_leval_data":[{"second_level":"2.1","course_data":[{"course_name":"\u79bb\u6563\u6570\u5b66","target_value":null,"real_value":null,"status":null},{"course_name":"\u6570\u636e\u7ed3\u6784","target_value":null,"real_value":null,"status":null},{"course_name":"\u7b97\u6cd5\u8bbe\u8ba1\u4e0e\u5206\u6790","target_value":null,"real_value":null,"status":null},{"course_name":"\u6570\u503c\u5206\u6790","target_value":null,"real_value":null,"status":null}]},{"second_level":"2.2","course_data":[{"course_name":"\u81ea\u7136\u79d1\u5b66\u54f2\u5b66","target_value":null,"real_value":null,"status":null},{"course_name":"\u5927\u5b66\u7269\u7406","target_value":null,"real_value":null,"status":null},{"course_name":"\u5927\u5b66\u7269\u7406\u5b9e\u9a8c","target_value":null,"real_value":null,"status":null},{"course_name":"\u7535\u8def\u4e0e\u7535\u5b50\u5b66\u57fa\u7840","target_value":null,"real_value":null,"status":null}]},{"second_level":"2.3","course_data":[{"course_name":"\u8f6f\u4ef6\u5de5\u7a0b","target_value":null,"real_value":null,"status":null},{"course_name":"\u4eba\u5de5\u667a\u80fd\u5bfc\u8bba","target_value":null,"real_value":null,"status":null},{"course_name":"\u6570\u5b57\u7535\u5b50\u6280\u672f\u57fa\u7840B","target_value":null,"real_value":null,"status":null},{"course_name":"\u6570\u5b57\u7cfb\u7edf\u8bbe\u8ba1","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u56fe\u5f62\u5b66","target_value":null,"real_value":null,"status":null}]}]},{"first_level":3,"first_leval_data":[{"second_level":"3.1","course_data":[{"course_name":"\u5927\u5b66\u8ba1\u7b97\u673a\u57fa\u7840B","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u7a0b\u5e8f\u8bbe\u8ba1B","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u539f\u7406\u8bfe\u7a0b\u8bbe\u8ba1","target_value":null,"real_value":null,"status":null},{"course_name":"\u6570\u636e\u5e93\u539f\u7406","target_value":0,"real_value":0,"status":false},{"course_name":"\u7a0b\u5e8f\u8bbe\u8ba1\u8bfe\u7a0b\u8bbe\u8ba1","target_value":null,"real_value":null,"status":null}]},{"second_level":"3.2","course_data":[{"course_name":"\u8f6f\u4ef6\u5de5\u7a0b","target_value":null,"real_value":null,"status":null},{"course_name":"\u5d4c\u5165\u5f0f\u7cfb\u7edf","target_value":null,"real_value":null,"status":null},{"course_name":"\u5d4c\u5165\u5f0f\u7cfb\u7edf\u8bfe\u7a0b\u8bbe\u8ba1","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u4f53\u7cfb\u7ed3\u6784","target_value":null,"real_value":null,"status":null}]},{"second_level":"3.3","course_data":[{"course_name":"\u4fe1\u606f\u5b89\u5168\u5bfc\u8bba","target_value":null,"real_value":null,"status":null},{"course_name":"\u8f6f\u4ef6\u5de5\u7a0b","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u4f53\u7cfb\u7ed3\u6784","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u7f51\u7edc","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u4e0e\u793e\u4f1a","target_value":null,"real_value":null,"status":null}]},{"second_level":"3.4","course_data":[{"course_name":"\u7f16\u8bd1\u539f\u7406","target_value":null,"real_value":null,"status":null},{"course_name":"\u79bb\u6563\u6570\u5b66","target_value":null,"real_value":null,"status":null},{"course_name":"\u5927\u5b66\u8ba1\u7b97\u673a\u57fa\u7840B","target_value":null,"real_value":null,"status":null}]}]},{"first_level":4,"first_leval_data":[{"second_level":"4.1","course_data":[{"course_name":"\u7b97\u6cd5\u8bbe\u8ba1\u4e0e\u5206\u6790","target_value":null,"real_value":null,"status":null},{"course_name":"\u6570\u503c\u5206\u6790","target_value":null,"real_value":null,"status":null},{"course_name":"\u4fe1\u53f7\u5206\u6790\u4e0e\u5904\u7406","target_value":null,"real_value":null,"status":null},{"course_name":"\u7f16\u8bd1\u539f\u7406","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u4f53\u7cfb\u7ed3\u6784","target_value":null,"real_value":null,"status":null}]}]},{"first_level":5,"first_leval_data":[{"second_level":"5.1","course_data":[{"course_name":"\u8ba1\u7b97\u673a\u539f\u7406","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u539f\u7406\u8bfe\u7a0b\u8bbe\u8ba1","target_value":null,"real_value":null,"status":null},{"course_name":"\u64cd\u4f5c\u7cfb\u7edf","target_value":null,"real_value":null,"status":null},{"course_name":"\u64cd\u4f5c\u7cfb\u7edf\u7efc\u5408\u5b9e\u8df5","target_value":null,"real_value":null,"status":null},{"course_name":"\u6570\u636e\u5e93\u539f\u7406","target_value":0,"real_value":0,"status":false}]}]},{"first_level":6,"first_leval_data":[{"second_level":"6.1","course_data":[{"course_name":"\u4fe1\u606f\u5b89\u5168\u5bfc\u8bba","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u4e0e\u793e\u4f1a","target_value":null,"real_value":null,"status":null},{"course_name":"\u793e\u4f1a\u5b9e\u8df5","target_value":null,"real_value":null,"status":null},{"course_name":"\u8f6f\u4ef6\u5b89\u5168","target_value":null,"real_value":null,"status":null},{"course_name":"\u4eba\u5de5\u667a\u80fd\u5bfc\u8bba","target_value":null,"real_value":null,"status":null}]}]},{"first_level":7,"first_leval_data":[{"second_level":"7.1","course_data":[{"course_name":"\u4fe1\u606f\u5b89\u5168\u5bfc\u8bba","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u4e0e\u793e\u4f1a","target_value":null,"real_value":null,"status":null},{"course_name":"\u5d4c\u5165\u5f0f\u7cfb\u7edf\u8bfe\u7a0b\u8bbe\u8ba1","target_value":null,"real_value":null,"status":null}]}]},{"first_level":8,"first_leval_data":[{"second_level":"8.1","course_data":[{"course_name":"\u601d\u60f3\u9053\u5fb7\u4fee\u517b\u4e0e\u6cd5\u5f8b\u57fa\u7840","target_value":null,"real_value":null,"status":null},{"course_name":"\u5f53\u4ee3\u4e16\u754c\u7ecf\u6d4e\u4e0e\u653f\u6cbb","target_value":null,"real_value":null,"status":null},{"course_name":"\u96c6\u4e2d\u653f\u6cbb\u6559\u80b2","target_value":null,"real_value":null,"status":null},{"course_name":"\u515a\u56e2\u6d3b\u52a8","target_value":null,"real_value":null,"status":null}]},{"second_level":"8.2","course_data":[{"course_name":"\u81ea\u7136\u79d1\u5b66\u54f2\u5b66","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u4e0e\u793e\u4f1a","target_value":null,"real_value":null,"status":null},{"course_name":"\u96c6\u4e2d\u653f\u6cbb\u6559\u80b2","target_value":null,"real_value":null,"status":null},{"course_name":"\u6a21\u62df\u5c97\u4f4d\u4efb\u804c","target_value":null,"real_value":null,"status":null}]}]},{"first_level":9,"first_leval_data":[{"second_level":"9.1","course_data":[{"course_name":"\u5d4c\u5165\u5f0f\u7cfb\u7edf\u8bfe\u7a0b\u8bbe\u8ba1","target_value":null,"real_value":null,"status":null},{"course_name":"\u4eba\u673a\u4ea4\u4e92","target_value":null,"real_value":null,"status":null},{"course_name":"\u519b\u4e8b\u4fe1\u606f\u6280\u672f\u57fa\u7840","target_value":null,"real_value":null,"status":null},{"course_name":"\u6a21\u62df\u5c97\u4f4d\u4efb\u804c","target_value":null,"real_value":null,"status":null},{"course_name":"\u519b\u653f\u57fa\u7840\u8bad\u7ec3","target_value":null,"real_value":null,"status":null}]}]},{"first_level":10,"first_leval_data":[{"second_level":"10.1","course_data":[{"course_name":"\u82f1\u8bed\u5e94\u7528\u5199\u4f5cA","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u4e0e\u793e\u4f1a","target_value":null,"real_value":null,"status":null},{"course_name":"\u793e\u4f1a\u5b9e\u8df5","target_value":null,"real_value":null,"status":null},{"course_name":"\u6a21\u62df\u5c97\u4f4d\u4efb\u804c","target_value":null,"real_value":null,"status":null},{"course_name":"\u515a\u56e2\u6d3b\u52a8","target_value":null,"real_value":null,"status":null}]},{"second_level":"10.2","course_data":[{"course_name":"\u5f53\u4ee3\u4e16\u754c\u7ecf\u6d4e\u4e0e\u653f\u6cbb","target_value":null,"real_value":null,"status":null},{"course_name":"\u5927\u5b66\u82f1\u8bed","target_value":null,"real_value":null,"status":null},{"course_name":"\u82f1\u8bed\u5e94\u7528\u5199\u4f5cA","target_value":null,"real_value":null,"status":null},{"course_name":"\u7ecf\u5e38\u6027\u601d\u60f3\u653f\u6cbb\u6559\u80b2","target_value":null,"real_value":null,"status":null}]}]},{"first_level":11,"first_leval_data":[{"second_level":"11.1","course_data":[{"course_name":"\u5f53\u4ee3\u4e16\u754c\u7ecf\u6d4e\u4e0e\u653f\u6cbb","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u4e0e\u793e\u4f1a","target_value":null,"real_value":null,"status":null},{"course_name":"\u9a6c\u514b\u601d\u4e3b\u4e49\u57fa\u672c\u539f\u7406","target_value":null,"real_value":null,"status":null}]},{"second_level":"11.2","course_data":[{"course_name":"\u4fe1\u606f\u68c0\u7d22","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u6545\u969c\u8bca\u65ad\u548c\u7ef4\u62a4","target_value":null,"real_value":null,"status":null},{"course_name":"\u7f51\u7ad9\u8bbe\u8ba1\u4e0e\u7ef4\u62a4","target_value":null,"real_value":null,"status":null},{"course_name":"\u96c6\u4e2d\u653f\u6cbb\u6559\u80b2","target_value":null,"real_value":null,"status":null},{"course_name":"\u7ecf\u5e38\u6027\u601d\u60f3\u653f\u6cbb\u6559\u80b2","target_value":null,"real_value":null,"status":null}]}]},{"first_level":12,"first_leval_data":[{"second_level":"12.1","course_data":[{"course_name":"\u4fe1\u606f\u68c0\u7d22","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u4e0e\u793e\u4f1a","target_value":null,"real_value":null,"status":null},{"course_name":"\u7f51\u7ad9\u8bbe\u8ba1\u4e0e\u7ef4\u62a4","target_value":null,"real_value":null,"status":null},{"course_name":"\u8ba1\u7b97\u673a\u6545\u969c\u8bca\u65ad\u548c\u7ef4\u62a4","target_value":null,"real_value":null,"status":null},{"course_name":"\u7ecf\u5e38\u6027\u601d\u60f3\u653f\u6cbb\u6559\u80b2","target_value":null,"real_value":null,"status":null}]}]},{"first_level":13,"first_leval_data":[{"second_level":"13.1","course_data":[{"course_name":"\u9a6c\u514b\u601d\u4e3b\u4e49\u57fa\u672c\u539f\u7406","target_value":null,"real_value":null,"status":null},{"course_name":"\u6bdb\u6cfd\u4e1c\u601d\u60f3\u548c\u4e2d\u56fd\u7279\u8272\u793e\u4f1a\u4e3b\u4e49\u7406\u8bba\u4f53\u7cfb\u6982\u8bba","target_value":null,"real_value":null,"status":null},{"course_name":"\u4e2d\u56fd\u8fd1\u73b0\u4ee3\u53f2\u7eb2\u8981","target_value":null,"real_value":null,"status":null},{"course_name":"\u96c6\u4e2d\u653f\u6cbb\u6559\u80b2","target_value":null,"real_value":null,"status":null}]},{"second_level":"13.2","course_data":[{"course_name":"\u601d\u60f3\u9053\u5fb7\u4fee\u517b\u4e0e\u6cd5\u5f8b\u57fa\u7840","target_value":null,"real_value":null,"status":null},{"course_name":"\u9a6c\u514b\u601d\u4e3b\u4e49\u57fa\u672c\u539f\u7406","target_value":null,"real_value":null,"status":null},{"course_name":"\u6bdb\u6cfd\u4e1c\u601d\u60f3\u548c\u4e2d\u56fd\u7279\u8272\u793e\u4f1a\u4e3b\u4e49\u7406\u8bba\u4f53\u7cfb\u6982\u8bba","target_value":null,"real_value":null,"status":null},{"course_name":"\u96c6\u4e2d\u653f\u6cbb\u6559\u80b2","target_value":null,"real_value":null,"status":null}]},{"second_level":"13.3","course_data":[{"course_name":"\u519b\u653f\u57fa\u7840\u8bad\u7ec3","target_value":null,"real_value":null,"status":null},{"course_name":"\u519b\u4e8b\u4fe1\u606f\u6280\u672f\u57fa\u7840","target_value":null,"real_value":null,"status":null},{"course_name":"\u6a21\u62df\u5c97\u4f4d\u4efb\u804c","target_value":null,"real_value":null,"status":null}]}]}],"calculation_value":0.0};
+const testData = { "calculation_data": [{ "first_level": 1, "first_leval_data": [{ "second_level": "1.1", "course_data": [{ "course_name": "\u9ad8\u7b49\u6570\u5b66", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u7ebf\u6027\u4ee3\u6570", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6982\u7387\u8bba\u4e0e\u6570\u7406\u7edf\u8ba1", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u79bb\u6563\u6570\u5b66", "target_value": null, "real_value": null, "status": null }] }, { "second_level": "1.2", "course_data": [{ "course_name": "\u81ea\u7136\u79d1\u5b66\u54f2\u5b66", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u5927\u5b66\u7269\u7406", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u5927\u5b66\u5316\u5b66", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u751f\u7269\u5b66\u57fa\u7840", "target_value": null, "real_value": null, "status": null }] }, { "second_level": "1.3", "course_data": [{ "course_name": "\u5de5\u7a0b\u5236\u56fe\u57fa\u7840\u53ca\u5de5\u7a0b\u5236\u56fe\u57fa\u7840\u5b9e\u9a8c", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u519b\u4e8b\u4fe1\u606f\u6280\u672f\u57fa\u7840", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u5927\u5b66\u8ba1\u7b97\u673a\u57fa\u7840B", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u7a0b\u5e8f\u8bbe\u8ba1B", "target_value": null, "real_value": null, "status": null }] }, { "second_level": "1.4", "course_data": [{ "course_name": "\u64cd\u4f5c\u7cfb\u7edf", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6570\u636e\u5e93\u539f\u7406", "target_value": 0, "real_value": 0, "status": false }, { "course_name": "\u8ba1\u7b97\u673a\u7f51\u7edc", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8f6f\u4ef6\u5de5\u7a0b", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u539f\u7406", "target_value": null, "real_value": null, "status": null }] }, { "second_level": "1.5", "course_data": [{ "course_name": "\u4fe1\u53f7\u5206\u6790\u4e0e\u5904\u7406\u5bfc\u8bba", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6570\u5b57\u56fe\u50cf\u5904\u7406", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u5d4c\u5165\u5f0f\u7cfb\u7edf\u8bfe\u7a0b\u8bbe\u8ba1", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u64cd\u4f5c\u7cfb\u7edf\u7efc\u5408\u5b9e\u8df5", "target_value": null, "real_value": null, "status": null }] }] }, { "first_level": 2, "first_leval_data": [{ "second_level": "2.1", "course_data": [{ "course_name": "\u79bb\u6563\u6570\u5b66", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6570\u636e\u7ed3\u6784", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u7b97\u6cd5\u8bbe\u8ba1\u4e0e\u5206\u6790", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6570\u503c\u5206\u6790", "target_value": null, "real_value": null, "status": null }] }, { "second_level": "2.2", "course_data": [{ "course_name": "\u81ea\u7136\u79d1\u5b66\u54f2\u5b66", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u5927\u5b66\u7269\u7406", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u5927\u5b66\u7269\u7406\u5b9e\u9a8c", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u7535\u8def\u4e0e\u7535\u5b50\u5b66\u57fa\u7840", "target_value": null, "real_value": null, "status": null }] }, { "second_level": "2.3", "course_data": [{ "course_name": "\u8f6f\u4ef6\u5de5\u7a0b", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u4eba\u5de5\u667a\u80fd\u5bfc\u8bba", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6570\u5b57\u7535\u5b50\u6280\u672f\u57fa\u7840B", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6570\u5b57\u7cfb\u7edf\u8bbe\u8ba1", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u56fe\u5f62\u5b66", "target_value": null, "real_value": null, "status": null }] }] }, { "first_level": 3, "first_leval_data": [{ "second_level": "3.1", "course_data": [{ "course_name": "\u5927\u5b66\u8ba1\u7b97\u673a\u57fa\u7840B", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u7a0b\u5e8f\u8bbe\u8ba1B", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u539f\u7406\u8bfe\u7a0b\u8bbe\u8ba1", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6570\u636e\u5e93\u539f\u7406", "target_value": 0, "real_value": 0, "status": false }, { "course_name": "\u7a0b\u5e8f\u8bbe\u8ba1\u8bfe\u7a0b\u8bbe\u8ba1", "target_value": null, "real_value": null, "status": null }] }, { "second_level": "3.2", "course_data": [{ "course_name": "\u8f6f\u4ef6\u5de5\u7a0b", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u5d4c\u5165\u5f0f\u7cfb\u7edf", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u5d4c\u5165\u5f0f\u7cfb\u7edf\u8bfe\u7a0b\u8bbe\u8ba1", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u4f53\u7cfb\u7ed3\u6784", "target_value": null, "real_value": null, "status": null }] }, { "second_level": "3.3", "course_data": [{ "course_name": "\u4fe1\u606f\u5b89\u5168\u5bfc\u8bba", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8f6f\u4ef6\u5de5\u7a0b", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u4f53\u7cfb\u7ed3\u6784", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u7f51\u7edc", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u4e0e\u793e\u4f1a", "target_value": null, "real_value": null, "status": null }] }, { "second_level": "3.4", "course_data": [{ "course_name": "\u7f16\u8bd1\u539f\u7406", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u79bb\u6563\u6570\u5b66", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u5927\u5b66\u8ba1\u7b97\u673a\u57fa\u7840B", "target_value": null, "real_value": null, "status": null }] }] }, { "first_level": 4, "first_leval_data": [{ "second_level": "4.1", "course_data": [{ "course_name": "\u7b97\u6cd5\u8bbe\u8ba1\u4e0e\u5206\u6790", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6570\u503c\u5206\u6790", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u4fe1\u53f7\u5206\u6790\u4e0e\u5904\u7406", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u7f16\u8bd1\u539f\u7406", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u4f53\u7cfb\u7ed3\u6784", "target_value": null, "real_value": null, "status": null }] }] }, { "first_level": 5, "first_leval_data": [{ "second_level": "5.1", "course_data": [{ "course_name": "\u8ba1\u7b97\u673a\u539f\u7406", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u539f\u7406\u8bfe\u7a0b\u8bbe\u8ba1", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u64cd\u4f5c\u7cfb\u7edf", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u64cd\u4f5c\u7cfb\u7edf\u7efc\u5408\u5b9e\u8df5", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6570\u636e\u5e93\u539f\u7406", "target_value": 0, "real_value": 0, "status": false }] }] }, { "first_level": 6, "first_leval_data": [{ "second_level": "6.1", "course_data": [{ "course_name": "\u4fe1\u606f\u5b89\u5168\u5bfc\u8bba", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u4e0e\u793e\u4f1a", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u793e\u4f1a\u5b9e\u8df5", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8f6f\u4ef6\u5b89\u5168", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u4eba\u5de5\u667a\u80fd\u5bfc\u8bba", "target_value": null, "real_value": null, "status": null }] }] }, { "first_level": 7, "first_leval_data": [{ "second_level": "7.1", "course_data": [{ "course_name": "\u4fe1\u606f\u5b89\u5168\u5bfc\u8bba", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u4e0e\u793e\u4f1a", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u5d4c\u5165\u5f0f\u7cfb\u7edf\u8bfe\u7a0b\u8bbe\u8ba1", "target_value": null, "real_value": null, "status": null }] }] }, { "first_level": 8, "first_leval_data": [{ "second_level": "8.1", "course_data": [{ "course_name": "\u601d\u60f3\u9053\u5fb7\u4fee\u517b\u4e0e\u6cd5\u5f8b\u57fa\u7840", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u5f53\u4ee3\u4e16\u754c\u7ecf\u6d4e\u4e0e\u653f\u6cbb", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u96c6\u4e2d\u653f\u6cbb\u6559\u80b2", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u515a\u56e2\u6d3b\u52a8", "target_value": null, "real_value": null, "status": null }] }, { "second_level": "8.2", "course_data": [{ "course_name": "\u81ea\u7136\u79d1\u5b66\u54f2\u5b66", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u4e0e\u793e\u4f1a", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u96c6\u4e2d\u653f\u6cbb\u6559\u80b2", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6a21\u62df\u5c97\u4f4d\u4efb\u804c", "target_value": null, "real_value": null, "status": null }] }] }, { "first_level": 9, "first_leval_data": [{ "second_level": "9.1", "course_data": [{ "course_name": "\u5d4c\u5165\u5f0f\u7cfb\u7edf\u8bfe\u7a0b\u8bbe\u8ba1", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u4eba\u673a\u4ea4\u4e92", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u519b\u4e8b\u4fe1\u606f\u6280\u672f\u57fa\u7840", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6a21\u62df\u5c97\u4f4d\u4efb\u804c", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u519b\u653f\u57fa\u7840\u8bad\u7ec3", "target_value": null, "real_value": null, "status": null }] }] }, { "first_level": 10, "first_leval_data": [{ "second_level": "10.1", "course_data": [{ "course_name": "\u82f1\u8bed\u5e94\u7528\u5199\u4f5cA", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u4e0e\u793e\u4f1a", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u793e\u4f1a\u5b9e\u8df5", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6a21\u62df\u5c97\u4f4d\u4efb\u804c", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u515a\u56e2\u6d3b\u52a8", "target_value": null, "real_value": null, "status": null }] }, { "second_level": "10.2", "course_data": [{ "course_name": "\u5f53\u4ee3\u4e16\u754c\u7ecf\u6d4e\u4e0e\u653f\u6cbb", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u5927\u5b66\u82f1\u8bed", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u82f1\u8bed\u5e94\u7528\u5199\u4f5cA", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u7ecf\u5e38\u6027\u601d\u60f3\u653f\u6cbb\u6559\u80b2", "target_value": null, "real_value": null, "status": null }] }] }, { "first_level": 11, "first_leval_data": [{ "second_level": "11.1", "course_data": [{ "course_name": "\u5f53\u4ee3\u4e16\u754c\u7ecf\u6d4e\u4e0e\u653f\u6cbb", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u4e0e\u793e\u4f1a", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u9a6c\u514b\u601d\u4e3b\u4e49\u57fa\u672c\u539f\u7406", "target_value": null, "real_value": null, "status": null }] }, { "second_level": "11.2", "course_data": [{ "course_name": "\u4fe1\u606f\u68c0\u7d22", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u6545\u969c\u8bca\u65ad\u548c\u7ef4\u62a4", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u7f51\u7ad9\u8bbe\u8ba1\u4e0e\u7ef4\u62a4", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u96c6\u4e2d\u653f\u6cbb\u6559\u80b2", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u7ecf\u5e38\u6027\u601d\u60f3\u653f\u6cbb\u6559\u80b2", "target_value": null, "real_value": null, "status": null }] }] }, { "first_level": 12, "first_leval_data": [{ "second_level": "12.1", "course_data": [{ "course_name": "\u4fe1\u606f\u68c0\u7d22", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u4e0e\u793e\u4f1a", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u7f51\u7ad9\u8bbe\u8ba1\u4e0e\u7ef4\u62a4", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u8ba1\u7b97\u673a\u6545\u969c\u8bca\u65ad\u548c\u7ef4\u62a4", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u7ecf\u5e38\u6027\u601d\u60f3\u653f\u6cbb\u6559\u80b2", "target_value": null, "real_value": null, "status": null }] }] }, { "first_level": 13, "first_leval_data": [{ "second_level": "13.1", "course_data": [{ "course_name": "\u9a6c\u514b\u601d\u4e3b\u4e49\u57fa\u672c\u539f\u7406", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6bdb\u6cfd\u4e1c\u601d\u60f3\u548c\u4e2d\u56fd\u7279\u8272\u793e\u4f1a\u4e3b\u4e49\u7406\u8bba\u4f53\u7cfb\u6982\u8bba", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u4e2d\u56fd\u8fd1\u73b0\u4ee3\u53f2\u7eb2\u8981", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u96c6\u4e2d\u653f\u6cbb\u6559\u80b2", "target_value": null, "real_value": null, "status": null }] }, { "second_level": "13.2", "course_data": [{ "course_name": "\u601d\u60f3\u9053\u5fb7\u4fee\u517b\u4e0e\u6cd5\u5f8b\u57fa\u7840", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u9a6c\u514b\u601d\u4e3b\u4e49\u57fa\u672c\u539f\u7406", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6bdb\u6cfd\u4e1c\u601d\u60f3\u548c\u4e2d\u56fd\u7279\u8272\u793e\u4f1a\u4e3b\u4e49\u7406\u8bba\u4f53\u7cfb\u6982\u8bba", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u96c6\u4e2d\u653f\u6cbb\u6559\u80b2", "target_value": null, "real_value": null, "status": null }] }, { "second_level": "13.3", "course_data": [{ "course_name": "\u519b\u653f\u57fa\u7840\u8bad\u7ec3", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u519b\u4e8b\u4fe1\u606f\u6280\u672f\u57fa\u7840", "target_value": null, "real_value": null, "status": null }, { "course_name": "\u6a21\u62df\u5c97\u4f4d\u4efb\u804c", "target_value": null, "real_value": null, "status": null }] }] }], "calculation_value": 0.0 };
 /**
   TODO 根据data计算最大课程数量
   然后课程数量的列宽是900，然后平均分配给每个列
@@ -41,12 +34,12 @@ let current_num_index = 0;
 // 获取位于当前分组之前的总行数
 function getNum(index) {
   let sum = 0
-  for(let i = 0; i <= current_num_index - 1; i++) {
+  for (let i = 0; i <= current_num_index - 1; i++) {
     sum += num_array[i];
   }
   sum = sum * 3;
   if (index != 0 && index == sum + num_array[current_num_index] * 3
-      && current_num_index < num_array.length - 1) {
+    && current_num_index < num_array.length - 1) {
     sum = sum + num_array[current_num_index] * 3
     current_num_index++;
   }
@@ -88,7 +81,7 @@ const buildColumns = (that) => {
       width: 65,
       render: (value, row, index) => {
         const _i_remain = index % 3;
-        const _i = Math.floor( (index - rowSum) / 3) + 1
+        const _i = Math.floor((index - rowSum) / 3) + 1
         const obj = {
           children: `${current_num_index + 1}-${_i}`,
           props: {},
@@ -148,13 +141,13 @@ const buildColumns = (that) => {
       if (index % 3 === 0) {
         let _newRow = Object.assign({}, row)
         delete _newRow.status
-        return <span style={{color: '#FF6800'}}>{Object.keys(_newRow).length}</span>;
+        return <span style={{ color: '#FF6800' }}>{Object.keys(_newRow).length}</span>;
       } else {
         let total = 0;
         for (var key in row) {
-            if (row.hasOwnProperty(key) && row[key]) {
-              total += parseFloat(row[key])
-            }
+          if (row.hasOwnProperty(key) && row[key]) {
+            total += parseFloat(row[key])
+          }
         }
         return total.toFixed(3);
       }
@@ -168,8 +161,8 @@ const buildColumns = (that) => {
       const _i_remain = index % 3;
       // 未达成
       const obj = {
-        children: row.status ? <span style={{color: '#29BD88'}}>达成</span>
-            : <span style={{color: '#FF6800'}}>未达成</span>,
+        children: row.status ? <span style={{ color: '#29BD88' }}>达成</span>
+          : <span style={{ color: '#FF6800' }}>未达成</span>,
         props: {},
       };
       if (_i_remain === 0) {
@@ -190,7 +183,7 @@ const buildColumns = (that) => {
       width: courseColWidth,
     })
   }
-  if( courseColArray.length) {
+  if (courseColArray.length) {
     cols[1].children = courseColArray;
   }
   // for (let i = 1; i <= stdColumnNum; i++) {
@@ -220,49 +213,9 @@ const buildColumns = (that) => {
  */
 let maxCouseCount = 0;
 
-function getTableData(data_args) {
-  let tableData = []
-  // 最大课程数量，根据这个值动态渲染课程列数
-  maxCouseCount = 0;
-  if (data_args) {
-    data_args.forEach((item, index) => {
-      item.first_leval_data.forEach((innerItem, innerIndex) => {
-        let nameRowData = {};
-        let targetValueRowData = {};
-        let realValueRowData = {};
-        let target_value_total = 0;
-        let real_value_total = 0;
-        // 一个course数组的数据组合成三行table数据
-        innerItem.course_data.forEach((course, courseIndex) => {
-          nameRowData[`c${courseIndex + 1}`] = course.course_name;
-
-          targetValueRowData[`c${courseIndex + 1}`] = course.target_value && course.target_value.toFixed
-                ? course.target_value.toFixed(3) : course.target_value ;
-          if (course.target_value) {
-            target_value_total = target_value_total + course.target_value
-          }
-
-          realValueRowData[`c${courseIndex + 1}`] = course.real_value && course.real_value.toFixed
-                ? course.real_value.toFixed(3) : course.real_value ;
-          if (course.real_value) {
-           real_value_total = real_value_total + course.real_value
-          }
-        })
-        if (real_value_total >= target_value_total && real_value_total != 0) {
-          nameRowData.status = true
-        }
-        maxCouseCount = Math.max(maxCouseCount, innerItem.course_data.length)
-        tableData.push(nameRowData)
-        tableData.push(targetValueRowData)
-        tableData.push(realValueRowData)
-      })
-    })
-  }
-  return tableData;
-}
 // new
 function getTableData(data_args) {
-let tableData = []
+  let tableData = []
   // 最大课程数量，根据这个值动态渲染课程列数
   maxCouseCount = 0;
   if (data_args) {
@@ -292,7 +245,7 @@ let tableData = []
           // }
         })
         // if (real_value_total >= target_value_total && real_value_total != 0) {
-          nameRowData.status = innerItem.status != "not_achieved" && parseFloat(innerItem.actually_reach) != 0
+        nameRowData.status = innerItem.status != "not_achieved" && parseFloat(innerItem.actually_reach) != 0
         // }
         maxCouseCount = Math.max(maxCouseCount, innerItem.course_supports.length)
         tableData.push(nameRowData)
@@ -309,416 +262,416 @@ let tableData = []
 
 const data = [
   {
-  key: '1',
+    key: '1',
 
-  c1: '数学分析 II1',
-  c2: '数学分析 II2',
-  c3: '大学物理 V',
-  c4: '大学物理实验II',
-  c5: '线性代数 I',
-  c6: '结合论与数理逻辑',
-  c7: '复变函数与积分变换I',
-  c8: '毕业设计',
-  g_r: '8',
-  e_r: '未达成'
-}, {
-  key: '2',
-  c1: '0.140',
-  c2: '0.150',
-  c3: '0.110',
-  c4: '0.120',
-  c5: '0.163',
-  c6: '0.063',
-  c7: '0.053',
-  c8: '0.053',
-  g_r: 0.650
-}, {
-  key: '3',
-  c1: '',
-  c2: '',
-  c3: '',
-  c4: '',
-  c5: '',
-  c6: '',
-  c7: '',
-  c8: '',
-  g_r: '0.000'
-},
-{
-  key: '4',
+    c1: '数学分析 II1',
+    c2: '数学分析 II2',
+    c3: '大学物理 V',
+    c4: '大学物理实验II',
+    c5: '线性代数 I',
+    c6: '结合论与数理逻辑',
+    c7: '复变函数与积分变换I',
+    c8: '毕业设计',
+    g_r: '8',
+    e_r: '未达成'
+  }, {
+    key: '2',
+    c1: '0.140',
+    c2: '0.150',
+    c3: '0.110',
+    c4: '0.120',
+    c5: '0.163',
+    c6: '0.063',
+    c7: '0.053',
+    c8: '0.053',
+    g_r: 0.650
+  }, {
+    key: '3',
+    c1: '',
+    c2: '',
+    c3: '',
+    c4: '',
+    c5: '',
+    c6: '',
+    c7: '',
+    c8: '',
+    g_r: '0.000'
+  },
+  {
+    key: '4',
 
-  c1: '计算概论',
-  c2: '概率论与数理统计I',
-  c3: '图论与组合数学',
-  c4: '算法设计与分析',
-  c5: '毕业设计',
+    c1: '计算概论',
+    c2: '概率论与数理统计I',
+    c3: '图论与组合数学',
+    c4: '算法设计与分析',
+    c5: '毕业设计',
 
-  g_r: '5',
-  e_r: '未达成'
-}, {
-  key: '5',
-  c1: '0.070',
-  c2: '0.210',
-  c3: '0.175',
-  c4: '0.070',
-  c5: '0.175',
-  g_r: '0.700',
-}, {
-  key: '6',
-  c1: '',
-  c2: '',
-  c3: '',
-  c4: '',
-  c5: '',
-  c6: '',
-  c7: '',
-  c8: '',
-  g_r: '0.000',
-},{
-  key: '7',
+    g_r: '5',
+    e_r: '未达成'
+  }, {
+    key: '5',
+    c1: '0.070',
+    c2: '0.210',
+    c3: '0.175',
+    c4: '0.070',
+    c5: '0.175',
+    g_r: '0.700',
+  }, {
+    key: '6',
+    c1: '',
+    c2: '',
+    c3: '',
+    c4: '',
+    c5: '',
+    c6: '',
+    c7: '',
+    c8: '',
+    g_r: '0.000',
+  }, {
+    key: '7',
 
-  c1: 'C语言程序设计Ⅳ',
-  c2: '数据结构Ⅰ',
-  c3: '操作系统',
-  c4: '计算机网络原理Ⅰ',
-  c5: '人工智能',
-  c6: '编译原理',
-  c7: '数据库原理',
-  c8: '软件工程Ⅰ',
-  c9: '面向对象程序设计(C++)',
-  e_r: '未达成'
+    c1: 'C语言程序设计Ⅳ',
+    c2: '数据结构Ⅰ',
+    c3: '操作系统',
+    c4: '计算机网络原理Ⅰ',
+    c5: '人工智能',
+    c6: '编译原理',
+    c7: '数据库原理',
+    c8: '软件工程Ⅰ',
+    c9: '面向对象程序设计(C++)',
+    e_r: '未达成'
 
-}, {
-  key: '8',
-  c1: '0.070',
-  c2: '0.070',
-  c3: '0.070',
-  c4: '0.070',
-  c5: '0.070',
-  c6: '0.070',
-  c7: '0.070',
-  c8: '0.070',
-  c9: '0.070',
-  g_r: '0.630',
+  }, {
+    key: '8',
+    c1: '0.070',
+    c2: '0.070',
+    c3: '0.070',
+    c4: '0.070',
+    c5: '0.070',
+    c6: '0.070',
+    c7: '0.070',
+    c8: '0.070',
+    c9: '0.070',
+    g_r: '0.630',
 
-}, {
-  key: '9',
-  c1: '',
-  c2: '',
-  c3: '',
-  c4: '',
-  c5: '',
-  c6: '',
-  c7: '0.134',
-  c8: '',
-  g_r: '0.134',
-},{
-  key: '10',
-  c1: '计算机组成原理Ⅰ',
-  c2: '数字逻辑与数字电路',
-  c3: '计算机系统结构',
-  c4: '汇编语言程序设计Ⅰ',
-  c5: '接口技术Ⅰ',
-  c6: '模拟电路应用',
-  c7: '微机控制技术Ⅰ',
-  c8: '计算机系统装配与集成',
-  e_r: '未达成'
+  }, {
+    key: '9',
+    c1: '',
+    c2: '',
+    c3: '',
+    c4: '',
+    c5: '',
+    c6: '',
+    c7: '0.134',
+    c8: '',
+    g_r: '0.134',
+  }, {
+    key: '10',
+    c1: '计算机组成原理Ⅰ',
+    c2: '数字逻辑与数字电路',
+    c3: '计算机系统结构',
+    c4: '汇编语言程序设计Ⅰ',
+    c5: '接口技术Ⅰ',
+    c6: '模拟电路应用',
+    c7: '微机控制技术Ⅰ',
+    c8: '计算机系统装配与集成',
+    e_r: '未达成'
 
-}, {
-  key: '11',
-  c1: '0.070',
-  c2: '0.070',
-  c3: '0.070',
-  c4: '0.070',
-  c5: '0.070',
-  c6: '0.070',
-  c7: '0.070',
-  c8: '0.070',
-  g_r: '0.560',
+  }, {
+    key: '11',
+    c1: '0.070',
+    c2: '0.070',
+    c3: '0.070',
+    c4: '0.070',
+    c5: '0.070',
+    c6: '0.070',
+    c7: '0.070',
+    c8: '0.070',
+    g_r: '0.560',
 
-}, {
-  key: '12',  c1: '',  c2: '',  c3: '',  c4: '',  c5: '',  c6: '',  c7: '',  c8: '',
-  g_r: '0.000',
+  }, {
+    key: '12', c1: '', c2: '', c3: '', c4: '', c5: '', c6: '', c7: '', c8: '',
+    g_r: '0.000',
 
-},{
-  key: '13',
-  c1: '数学分析Ⅱ1',
-  c2: '数学分析Ⅱ2',
-  c3: '大学物理Ⅴ',
-  c4: '线性代数Ⅰ ',
-  c5: '概率论与数理统计Ⅰ',
-  c6: '集合论与数理逻辑',  c7: '图论与组合数学',  c8: '编译原理',  c9: '算法设计与分析',
-  e_r: '未达成'
-}, {
-  key: '14',
-  c1: '0.035',
-  c2: '0.056',
-  c3: '0.070',
-  c4: '0.084',
-  c5: '0.035',
-  c6: '0.105',
-  c7: '0.014',
-  c8: '0.084',
-  c: '0.049',
-  g_r: '0.700',
+  }, {
+    key: '13',
+    c1: '数学分析Ⅱ1',
+    c2: '数学分析Ⅱ2',
+    c3: '大学物理Ⅴ',
+    c4: '线性代数Ⅰ ',
+    c5: '概率论与数理统计Ⅰ',
+    c6: '集合论与数理逻辑', c7: '图论与组合数学', c8: '编译原理', c9: '算法设计与分析',
+    e_r: '未达成'
+  }, {
+    key: '14',
+    c1: '0.035',
+    c2: '0.056',
+    c3: '0.070',
+    c4: '0.084',
+    c5: '0.035',
+    c6: '0.105',
+    c7: '0.014',
+    c8: '0.084',
+    c: '0.049',
+    g_r: '0.700',
 
-}, {
-  key: '15',  c1: '',  c2: '',  c3: '',  c4: '',  c5: '',  c6: '',  c7: '',  c8: '',
-  g_r: '0.000',
+  }, {
+    key: '15', c1: '', c2: '', c3: '', c4: '', c5: '', c6: '', c7: '', c8: '',
+    g_r: '0.000',
 
-},{
-  key: '16',
-  c1: '前沿技术讲座',
-  c2: '毕业设计',
-  // c3: '课程1',  c4: '课程1',  c5: '课程1',  c6: '课程1',  c7: '课程1',  c8: '课程1',  e_r: '未达成'
-  e_r: '未达成'
-}, {
-  key: '17',  c1: '0.210',  c2: '0.490'
-  //,  c3: '0.3',  c4: '0.3',  c5: '0.3',  c6: '0.3',  c7: '0.3',  c8: '0.3',
-  ,g_r: '0.700',
-}, {
-  key: '18',  c1: '',  c2: '',  c3: '',  c4: '',  c5: '',  c6: '',  c7: '',  c8: '',
-  g_r: '0.000'
+  }, {
+    key: '16',
+    c1: '前沿技术讲座',
+    c2: '毕业设计',
+    // c3: '课程1',  c4: '课程1',  c5: '课程1',  c6: '课程1',  c7: '课程1',  c8: '课程1',  e_r: '未达成'
+    e_r: '未达成'
+  }, {
+    key: '17', c1: '0.210', c2: '0.490'
+    //,  c3: '0.3',  c4: '0.3',  c5: '0.3',  c6: '0.3',  c7: '0.3',  c8: '0.3',
+    , g_r: '0.700',
+  }, {
+    key: '18', c1: '', c2: '', c3: '', c4: '', c5: '', c6: '', c7: '', c8: '',
+    g_r: '0.000'
 
-}
+  }
 ];
 
 class GraduatesRequirement extends Component {
-    constructor(props) {
-      super(props)
-      this.state={
-        schooldata:{},
-        ec_year_id:0,
+  constructor(props) {
+    super(props)
+    this.state = {
+      schooldata: {},
+      ec_year_id: 0,
 
-        daChengYuZhiEditableMode: false,
-        daChengYuZhi: 0.1,
-        daChengYuZhiSaved: 0.1,
+      daChengYuZhiEditableMode: false,
+      daChengYuZhi: 0.1,
+      daChengYuZhiSaved: 0.1,
 
-        calculating: false, // 是否在计算中
+      calculating: false, // 是否在计算中
+    }
+  }
+  onDaChengYuZhiChange = (value) => {
+    if ((!window.event || window.event.type == 'blur')
+      && this.state.daChengYuZhi > 1 && value == 1) {
+      this.props.showSingleButtonModal('提示', '达成阈值必须小于等于1')
+    }
+    this.setState({ daChengYuZhi: value });
+  }
+  onDaChengYuZhiCancel = () => {
+    this.setState({ daChengYuZhi: this.state.daChengYuZhiSaved })
+    this.setDaChengYuZhiEditableMode(false)
+  }
+  setDaChengYuZhiEditableMode = (mode) => {
+    this.setState({ daChengYuZhiEditableMode: mode })
+  }
+  saveDaChengYuZhi = () => {
+    let major_school_id = this.props.match.params.major_school_id;
+    let ec_year_id = this.props.match.params.ec_year_id;
+
+    var url = `/ec_major_schools/${major_school_id}/academic_years/${ec_year_id}/set_calculation_value`;
+    url = `/ec_years/${this.state.ec_year_id}/reach_criteria.json`
+
+    if (this.state.daChengYuZhi == undefined) {
+      this.props.showSingleButtonModal('提示', '达成阈值不能为空！')
+      return;
+    } else if (this.state.daChengYuZhi == 0) {
+      this.props.showSingleButtonModal('提示', '达成阈值必须大于0，且小于等于1')
+      return;
+    }
+    axios.post(url, {
+      reach_criteria: this.state.daChengYuZhi
+    }).then((response) => {
+
+      if (response.data.status === 0) {
+        this.setState({ daChengYuZhiSaved: this.state.daChengYuZhi })
+        this.setDaChengYuZhiEditableMode(false)
+      } else {
+        // 其他message
       }
-    }
-    onDaChengYuZhiChange = (value) => {
-      if ( (!window.event || window.event.type == 'blur')
-          && this.state.daChengYuZhi > 1 && value == 1) {
-        this.props.showSingleButtonModal('提示', '达成阈值必须小于等于1')
-      }
-      this.setState({ daChengYuZhi: value });
-    }
-    onDaChengYuZhiCancel = () => {
-      this.setState({ daChengYuZhi: this.state.daChengYuZhiSaved })
-      this.setDaChengYuZhiEditableMode(false)
-    }
-    setDaChengYuZhiEditableMode = (mode) => {
-      this.setState({ daChengYuZhiEditableMode: mode })
-    }
-    saveDaChengYuZhi = () => {
-      let major_school_id =this.props.match.params.major_school_id;
-      let ec_year_id =this.props.match.params.ec_year_id;
-
-      var url = `/ec_major_schools/${major_school_id}/academic_years/${ec_year_id}/set_calculation_value`;
-      url = `/ec_years/${this.state.ec_year_id}/reach_criteria.json`
-
-      if (this.state.daChengYuZhi == undefined) {
-        this.props.showSingleButtonModal('提示', '达成阈值不能为空！')
-        return;
-      } else if (this.state.daChengYuZhi == 0) {
-        this.props.showSingleButtonModal('提示', '达成阈值必须大于0，且小于等于1')
-        return;
-      }
-			axios.post(url, {
-				reach_criteria : this.state.daChengYuZhi
-			}).then((response) => {
-
-				if( response.data.status === 0 ) {
-      		this.setState({ daChengYuZhiSaved: this.state.daChengYuZhi })
-          this.setDaChengYuZhiEditableMode(false)
-				}else {
-          // 其他message
-				}
-			}).catch((error) => {
-				console.log(error)
-			})
+    }).catch((error) => {
+      console.log(error)
+    })
 
 
-    }
-    componentDidMount(){
-      window.document.title = '达成度评价结果';
-      let ec_year_id =this.props.match.params.ec_year_id;
-      this.setState({
-        ec_year_id:ec_year_id
-      })
-      this.fetchData(ec_year_id)
+  }
+  componentDidMount() {
+    window.document.title = '达成度评价结果';
+    let ec_year_id = this.props.match.params.ec_year_id;
+    this.setState({
+      ec_year_id: ec_year_id
+    })
+    this.fetchData(ec_year_id)
 
-      // const Url =`/ec_major_schools/get_navigation_data?ec_year_id=`+ec_year_id;
-      // axios.get(Url, {
-      //       // withCredentials: true,
-      //     })
-      //   .then((response) => {
-      //       if(response.status===200){
-      //       //   if(response.data.allow_visit===false){
-      //       //     window.location.href="/403"
-      //       //  }
-      //         this.setState({
-      //           schooldata:response.data
-      //         })
-      //       }
-      //     })
-      //   .catch(function (error) {
-      //       console.log(error);
-      //     });
-    }
-    fetchData(ec_year_id) {
-      // const url = `ec_courses/7/get_calculation_data`
-      // const url = `/ec_courses/get_calculation_data?ec_year_id=${ec_year_id}`
-      const url = `/ec_years/${ec_year_id}/reach_evaluation.json`
-      // num_array = getNumArray(testData.calculation_data);
-      // tableData = getTableData(testData.calculation_data)
-      // return
+    // const Url =`/ec_major_schools/get_navigation_data?ec_year_id=`+ec_year_id;
+    // axios.get(Url, {
+    //       // withCredentials: true,
+    //     })
+    //   .then((response) => {
+    //       if(response.status===200){
+    //       //   if(response.data.allow_visit===false){
+    //       //     window.location.href="/403"
+    //       //  }
+    //         this.setState({
+    //           schooldata:response.data
+    //         })
+    //       }
+    //     })
+    //   .catch(function (error) {
+    //       console.log(error);
+    //     });
+  }
+  fetchData(ec_year_id) {
+    // const url = `ec_courses/7/get_calculation_data`
+    // const url = `/ec_courses/get_calculation_data?ec_year_id=${ec_year_id}`
+    const url = `/ec_years/${ec_year_id}/reach_evaluation.json`
+    // num_array = getNumArray(testData.calculation_data);
+    // tableData = getTableData(testData.calculation_data)
+    // return
 
-      axios.get(url, {
-            // withCredentials: true,
+    axios.get(url, {
+      // withCredentials: true,
+    })
+      .then((response) => {
+        if (response.data.graduation_requirements) {
+          num_array = getNumArray(response.data.graduation_requirements);
+          tableData = getTableData(response.data.graduation_requirements)
+          // 先计算，再触发render
+          this.setState({
+            calculationData: response.data.calculation_data,
+            daChengYuZhi: response.data.reach_threshold,
+            daChengYuZhiSaved: response.data.reach_threshold,
+            course_ids: response.data.course_ids,
+            is_manager: response.data.is_manager,
+            calculating: false,
           })
-        .then((response) => {
-          if (response.data.graduation_requirements) {
-            num_array = getNumArray(response.data.graduation_requirements);
-            tableData = getTableData(response.data.graduation_requirements)
-            // 先计算，再触发render
-            this.setState({
-              calculationData: response.data.calculation_data,
-              daChengYuZhi: response.data.reach_threshold,
-              daChengYuZhiSaved: response.data.reach_threshold,
-              course_ids: response.data.course_ids,
-              is_manager: response.data.is_manager,
-              calculating: false,
-            })
+        }
+
+
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+  }
+  onCalculate = () => {
+    if (!this.state.course_ids || this.state.course_ids.length === 0) {
+      // 没有课程数据
+      this.props.showSingleButtonModal('提示', '请先配置基础数据')
+
+      return;
+    }
+
+    this.setState({ calculating: true })
+    var Url = '/ec_courses/sync_all_course_data';
+    /**
+      # POST: /ec_courses/sync_all_course_data
+      # 参数:
+      #     course_ids: [1,2,3,4]
+     */
+    axios.post(Url, {
+      course_ids: this.state.course_ids
+    }).then((response) => {
+      // 计算需要一定的时间，让按钮转动
+
+      if (response.data.status === 1) {
+        let ec_year_id = this.props.match.params.ec_year_id;
+        this.fetchData(ec_year_id);
+        this.props.showSingleButtonModal('提示', '计算完毕')
+      } else {
+
+      }
+    }).catch((error) => {
+      this.setState({ calculating: false })
+
+      console.log(error)
+    })
+  }
+  render() {
+    const { match, history, current_user } = this.props
+    const { daChengYuZhiEditableMode, daChengYuZhi, daChengYuZhiSaved, is_manager } = this.state
+    let { schooldata } = this.state;
+    // let { example_major, template_major } = schooldata;
+    let showCalculateButton = is_manager;
+    // let showCalculateButton = false;
+    // if (example_major && current_user.admin || !example_major && template_major) {
+    //   showCalculateButton = true;
+    // }
+    return (
+
+      <div className="educontent graduatesRequirement">
+
+        <ul className="clearfix padding20-30 bor-bottom-greyE backgroundFFF"
+          style={{ 'marginBottom': '0px' }} >
+          <li className="fl">
+            <p className="font-18 courseSystem"> 毕业要求指标点达成计算 </p>
+            <p>
+              <span className="color-grey-9 mr10">系统根据课程体系与毕业要求的支持关系，以课程的考核与成绩判定方式，一键计算毕业要求的达成度情况</span>
+              <a target="_blank" href={'/forums/3535'} className="color-blue">查看详情</a>
+            </p>
+
+          </li>
+        </ul>
+
+        <p className="clearfix padding20-30 bor-bottom-greyE backgroundFFF"
+          style={{ 'paddingBottom': '12px' }}>
+          <span className="fl font-14">达成阈值：</span>
+          {daChengYuZhiEditableMode ?
+            <React.Fragment>
+              <InputNumber value={daChengYuZhi} onChange={this.onDaChengYuZhiChange}
+                size="small" min={0} max={1} step={0.01} ></InputNumber>
+              <span onClick={this.saveDaChengYuZhi}
+                style={{ color: '#4CACFF', marginLeft: '4px', cursor: 'pointer', fontSize: '13px' }}>确定
+                      </span>
+              <span onClick={this.onDaChengYuZhiCancel}
+                style={{ color: '#d1d1d1', marginLeft: '4px', cursor: 'pointer', fontSize: '13px' }} >取消
+                      </span>
+            </React.Fragment>
+            :
+            <React.Fragment>
+              <span className="color-orange fl" id="ReachStandardNum">{daChengYuZhiSaved}</span>
+              {/* data-tip-down="编辑"  */}
+              <i
+                onClick={() => { this.setDaChengYuZhiEditableMode(true) }}
+                className="iconfont icon-bianjidaibeijing color-green" idkey="0"
+                style={{ float: 'left', marginTop: '-3px', marginLeft: '3px', cursor: 'pointer' }}></i>
+            </React.Fragment>
           }
 
-
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
-    }
-    onCalculate = () => {
-      if (!this.state.course_ids || this.state.course_ids.length === 0) {
-        // 没有课程数据
-        this.props.showSingleButtonModal('提示', '请先配置基础数据')
-
-        return;
-      }
-
-      this.setState({ calculating: true })
-      var Url = '/ec_courses/sync_all_course_data';
-      /**
-        # POST: /ec_courses/sync_all_course_data
-        # 参数:
-        #     course_ids: [1,2,3,4]
-       */
-			axios.post(Url, {
-        course_ids: this.state.course_ids
-			}).then((response) => {
-        // 计算需要一定的时间，让按钮转动
-
-				if( response.data.status === 1 ) {
-          let ec_year_id = this.props.match.params.ec_year_id;
-          this.fetchData(ec_year_id);
-          this.props.showSingleButtonModal('提示', '计算完毕')
-				} else {
-
-				}
-			}).catch((error) => {
-        this.setState({ calculating: false })
-
-				console.log(error)
-			})
-    }
-  	render() {
-			const { match, history, current_user } = this.props
-      const { daChengYuZhiEditableMode, daChengYuZhi, daChengYuZhiSaved, is_manager } = this.state
-      let { schooldata } =this.state;
-      // let { example_major, template_major } = schooldata;
-      let showCalculateButton = is_manager;
-      // let showCalculateButton = false;
-      // if (example_major && current_user.admin || !example_major && template_major) {
-      //   showCalculateButton = true;
-      // }
-	    return (
-
-            <div className="educontent graduatesRequirement">
-
-              <ul className="clearfix padding20-30 bor-bottom-greyE backgroundFFF"
-                style={{ 'marginBottom': '0px' }} >
-                <li className="fl">
-                  <p className="font-18 courseSystem"> 毕业要求指标点达成计算 </p>
-                  <p>
-                    <span class="color-grey-9 mr10">系统根据课程体系与毕业要求的支持关系，以课程的考核与成绩判定方式，一键计算毕业要求的达成度情况</span>
-                    <a target="_blank" href={'/forums/3535'} class="color-blue">查看详情</a>
-                  </p>
-
-                </li>
-              </ul>
-
-              <p class="clearfix padding20-30 bor-bottom-greyE backgroundFFF"
-                style={{ 'paddingBottom': '12px' }}>
-                <span class="fl font-14">达成阈值：</span>
-                { daChengYuZhiEditableMode ?
-                    <React.Fragment>
-                      <InputNumber value={daChengYuZhi} onChange={this.onDaChengYuZhiChange}
-                        size="small" min={0} max={1} step={0.01} ></InputNumber>
-                      <span onClick={this.saveDaChengYuZhi}
-                        style={{color: '#4CACFF', marginLeft: '4px', cursor: 'pointer', fontSize: '13px'}}>确定
-                      </span>
-                      <span onClick={ this.onDaChengYuZhiCancel }
-                        style={{color: '#d1d1d1', marginLeft: '4px', cursor: 'pointer', fontSize: '13px'}} >取消
-                      </span>
-                    </React.Fragment>
-                  :
-                    <React.Fragment>
-                      <span class="color-orange fl" id="ReachStandardNum">{daChengYuZhiSaved}</span>
-                      {/* data-tip-down="编辑"  */}
-                      <i
-                        onClick={() => { this.setDaChengYuZhiEditableMode(true) }}
-                        class="iconfont icon-bianjidaibeijing color-green" idkey="0"
-                        style={{ float: 'left', marginTop: '-3px', marginLeft: '3px', cursor: 'pointer' }}></i>
-                    </React.Fragment>
-                }
-
-                {/* <a class="mr20 editSubentry"  style={{display: 'block'}}>
+          {/* <a className="mr20 editSubentry"  style={{display: 'block'}}>
 
                 </a> */}
 
-                <a href="javascript:void(0)"
-                  class="white-btn edu-orangeback-btn fr mr10"
-                  href={`/api/ec_years/${this.state.ec_year_id}/reach_evaluation.xlsx${getRandomNumber()}`}
-                >导出</a>
-                {/* /ec_major_schools/3/academic_years/5/export_reach_requirements_data.xls
+          <a
+            className="white-btn edu-orangeback-btn fr mr10"
+            href={`/api/ec_years/${this.state.ec_year_id}/reach_evaluation.xlsx${getRandomNumber()}`}
+          >导出</a>
+          {/* /ec_major_schools/3/academic_years/5/export_reach_requirements_data.xls
                   let major_school_id =this.props.match.params.major_school_id;
                   let ec_year_id =this.props.match.params.ec_year_id;
                   */}
 
-                { showCalculateButton && ( this.state.calculating === true ?
-                  <a href="javascript:void(0)" class="white-btn edu-grayback-btn mr20 fr">
-                    计算中...
+          {showCalculateButton && (this.state.calculating === true ?
+            <a className="white-btn edu-grayback-btn mr20 fr">
+              计算中...
                   </a> :
-                  <a href="javascript:void(0)" class="white-btn edu-orangeline-btn mr20 fr" onClick={this.onCalculate}>
-                    计算
-                </a> )
-                }
+            <a className="white-btn edu-orangeline-btn mr20 fr" onClick={this.onCalculate}>
+              计算
+                </a>)
+          }
 
-              </p>
+        </p>
 
-              {/* { this.state.calculating == true ?
+        {/* { this.state.calculating == true ?
               <Spin delay={500} className="Spinlarge" indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}></Spin>
               :  }       　 */}
-              <Table bordered loading={ this.state.calculating }
-                columns={buildColumns(this)} dataSource={tableData} pagination={false}
-                scroll={{ y: 530 }}
-              ></Table>
+        <Table bordered loading={this.state.calculating}
+          columns={buildColumns(this)} dataSource={tableData} pagination={false}
+          scroll={{ y: 530 }}
+        ></Table>
 
-            </div>
+      </div>
 
-	    );
-  	}
+    );
+  }
 }
 
-export default ECModalHOC() (GraduatesRequirement) ;
+export default ECModalHOC()(GraduatesRequirement);
diff --git a/src/modules/ecs/Ecs.js b/src/modules/ecs/Ecs.js
index db4fc27d..2b528853 100644
--- a/src/modules/ecs/Ecs.js
+++ b/src/modules/ecs/Ecs.js
@@ -3,7 +3,7 @@ import { Switch, Route } from 'react-router-dom';
 import { SnackbarHOC } from 'educoder';
 
 import CustomLoadable from "../../CustomLoadable";
-import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
+import { TPMIndexHOC } from "../tpm/TPMIndexHOC";
 
 const Home = CustomLoadable(() => import('./Home/index'));
 const EcYear = CustomLoadable(() => import('./EcYear/index'));
@@ -11,54 +11,54 @@ const EcSetting = CustomLoadable(() => import('./EcSetting/index'));
 
 const $ = window.$
 //工程认证各个页面的查看详情弹层
-function elasticLayer(forumId){
-    if (window.__memo) {
-        doElasticLayer(window.__memo, true)
-        return;
+function elasticLayer(forumId) {
+  if (window.__memo) {
+    doElasticLayer(window.__memo, true)
+    return;
+  }
+  if (!forumId) return;
+  var url = 'https://www.educoder.net/api/memos/' + forumId
+  $.ajax({
+    url: url,
+    type: 'get',
+    success: function (res) {
+      console.log(res)
+      doElasticLayer(res.memo)
     }
-    if (!forumId) return;
-    var url = 'https://www.educoder.net/api/memos/' + forumId
-    $.ajax({
-        url: url,
-        type: 'get',
-        success: function(res) {
-            console.log(res)
-            doElasticLayer(res.memo)
-        }
-    });
-    
-    // document.body.addEventListener('touchmove',bodyScroll,false);
-    // $('body').css({'position':'fixed',"width":"100%"});
-}
-function doElasticLayer(memo, rendered){
-    if (rendered) {
-        $(".layerContent").show();
-        $(".newMain").hide();
-        return;
-    }
-    window.__memo = memo
-    var content = memo.content
-    var subject = memo.subject
-    var html='<div class="layerContent"><div class="educontent">' +
-        '<p class="clearfix pt25 pb25 color-grey-3 bor-bottom-greyE"><span class="fl font-24">'+ subject +'</span>' +
-        '<a href="javascript:void(0)" onclick="removeElasticLayer();" class="fr font-16 mt5">返回</a></p>' +
-        '<div id="MDContent"><textarea style="display:none">'
-            + content +
-        '</textarea></div>'
-                            
-    $(".newMain").after(html).hide();
+  });
 
-    window.editormd.markdownToHTML("MDContent", {
-        htmlDecode: "style,script,iframe",  // you can filter tags decode
-        taskList: true,
-        tex: true,  // 默认不解析
-        flowChart: true,  // 默认不解析
-        sequenceDiagram: true // 默认不解析
-    });
+  // document.body.addEventListener('touchmove',bodyScroll,false);
+  // $('body').css({'position':'fixed',"width":"100%"});
 }
-function removeElasticLayer(){
-    $(".layerContent").hide();
-    $(".newMain").show();
+function doElasticLayer(memo, rendered) {
+  if (rendered) {
+    $(".layerContent").show();
+    $(".newMain").hide();
+    return;
+  }
+  window.__memo = memo
+  var content = memo.content
+  var subject = memo.subject
+  var html = '<div class="layerContent"><div class="educontent">' +
+    '<p class="clearfix pt25 pb25 color-grey-3 bor-bottom-greyE"><span class="fl font-24">' + subject + '</span>' +
+    '<a   onclick="removeElasticLayer();" class="fr font-16 mt5">返回</a></p>' +
+    '<div id="MDContent"><textarea style="display:none">'
+    + content +
+    '</textarea></div>'
+
+  $(".newMain").after(html).hide();
+
+  window.editormd.markdownToHTML("MDContent", {
+    htmlDecode: "style,script,iframe",  // you can filter tags decode
+    taskList: true,
+    tex: true,  // 默认不解析
+    flowChart: true,  // 默认不解析
+    sequenceDiagram: true // 默认不解析
+  });
+}
+function removeElasticLayer() {
+  $(".layerContent").hide();
+  $(".newMain").show();
 }
 window.elasticLayer = elasticLayer
 window.doElasticLayer = doElasticLayer
@@ -79,4 +79,4 @@ class Ecs extends React.Component {
   }
 }
 
-export default SnackbarHOC() (TPMIndexHOC  ( Ecs ));
\ No newline at end of file
+export default SnackbarHOC()(TPMIndexHOC(Ecs));
\ No newline at end of file
diff --git a/src/modules/ecs/curriculum/Curriculum.js b/src/modules/ecs/curriculum/Curriculum.js
index 7d750407..ffb2cc7e 100644
--- a/src/modules/ecs/curriculum/Curriculum.js
+++ b/src/modules/ecs/curriculum/Curriculum.js
@@ -1,11 +1,7 @@
 import React, { Component } from 'react';
 
-import {getRandomNumber} from 'educoder';
-
-import 'antd/dist/antd.css';
-
+import { getRandomNumber } from 'educoder';
 import '../css/ecCourseSupports.css';
-
 import '../css/ecCourseEvaluations.css';
 import {
 	Route,
@@ -13,20 +9,19 @@ import {
 } from 'react-router-dom';
 import Loadable from 'react-loadable';
 import Loading from "../../../Loading";
-const $ = window.$;
 const Curriculumtwo = Loadable({
 	loader: () => import('./Curriculumtwo'),
 	loading: Loading,
 })
-const EcCourseEvaluationsbottom =Loadable({
+const EcCourseEvaluationsbottom = Loadable({
 	loader: () => import('../subroute/ecCourseEvaluations/EcCourseEvaluationsbottom'),
 	loading: Loading,
 });
-const EcCompletionCalculation =Loadable({
+const EcCompletionCalculation = Loadable({
 	loader: () => import('../subroute/ecCompletion_calculation/EcCompletionCalculation'),
 	loading: Loading,
 });
-const EcCourseSupportSetting =Loadable({
+const EcCourseSupportSetting = Loadable({
 	loader: () => import('../subroute/ecCourseSupportSetting/index'),
 	loading: Loading,
 });
@@ -35,24 +30,24 @@ class Curriculum extends Component {
 	//课程体系
 	constructor(props) {
 		super(props)
-		this.state= {
-      classcalue:5,
-			newec_course_idbottom:"",
-			course_name:undefined,
-			course_url:"a",
-			ecmanager:true,
-			titine:1,
-		}
+		this.state = {
+			classcalue: 5,
+			newec_course_idbottom: "",
+			course_name: undefined,
+			course_url: "a",
+			ecmanager: true,
+			titine: 1,
 		}
+	}
 
-	componentWillMount(){
+	componentWillMount() {
 		// window.document.title = '课程达成评价结果';
 	}
-	componentDidMount(){
+	componentDidMount() {
 		console.log("Curriculum");
 		console.log(this.props);
 	}
-	sync_course_data=()=>{
+	sync_course_data = () => {
 		// this.setState({listSpin:true})
 		// let ec_course_id=this.props.match.params.ec_course_id;
 		// let Url ='/ec_course_achievement_methods/sync_course_data';
@@ -90,171 +85,173 @@ class Curriculum extends Component {
 		// console.log("调用了子对象1");
 		this.child = ref
 	};
-	newrightcalculatebuttonysl=(child)=>{
+	newrightcalculatebuttonysl = (child) => {
 		// console.log("调用了子对象2");
 		// console.log(child);
 		child.newrightcalculatebutton();
 	}
-	onAclick=(i)=>{
+	onAclick = (i) => {
 		console.log("onAclick");
 		console.log(i);
-		if(i===1){
-			this.props.history.push(this.props.match.url+"/ec_course_support_setting/1");
-		}else if(i===2){
-			this.props.history.push(this.props.match.url+"/ec_course_reach_setting/2");
-		}else if(i===3){
-			this.props.history.push(this.props.match.url+"/score_level/3");
-		}else if(i===4){
-			this.props.history.push(this.props.match.url+"/evaluation_methods/4");
-		}else{
-			this.props.history.push(this.props.match.url+"/competition_calculation_info/5");
+		if (i === 1) {
+			this.props.history.push(this.props.match.url + "/ec_course_support_setting/1");
+		} else if (i === 2) {
+			this.props.history.push(this.props.match.url + "/ec_course_reach_setting/2");
+		} else if (i === 3) {
+			this.props.history.push(this.props.match.url + "/score_level/3");
+		} else if (i === 4) {
+			this.props.history.push(this.props.match.url + "/evaluation_methods/4");
+		} else {
+			this.props.history.push(this.props.match.url + "/competition_calculation_info/5");
 		}
 		this.setState({
-			titine:i,
+			titine: i,
 		})
 
 	};
-	Ontitine=(s)=>{
+	Ontitine = (s) => {
 		console.log("CurriculumCurriculum");
 		console.log(s);
-		if(s==="ec_course_support_setting"){
+		if (s === "ec_course_support_setting") {
 			this.setState({
-				titine:1,
+				titine: 1,
 			})
-		}else if(s==="ec_course_reach_setting"){
+		} else if (s === "ec_course_reach_setting") {
 			this.setState({
-				titine:2,
+				titine: 2,
 			})
-		}else if(s==="score_level"){
+		} else if (s === "score_level") {
 			this.setState({
-				titine:3,
+				titine: 3,
 			})
-		}else if(s==="evaluation_methods"){
+		} else if (s === "evaluation_methods") {
 			this.setState({
-				titine:4,
+				titine: 4,
 			})
-		}else if(s==="competition_calculation_info"){
+		} else if (s === "competition_calculation_info") {
 			this.setState({
-				titine:5,
+				titine: 5,
 			})
 		}
 
 	};
-	associatedclass=()=>{
+	associatedclass = () => {
 
 	};
-	deleteassociatedclass=()=>{
+	deleteassociatedclass = () => {
 
 	}
 	render() {
-		let {newec_course_idbottom,titine,classcalue,course_name,course_url,ecmanager,Spintype,calculatesetype,ec_course_id,course_total_scoreaverage,ec_course_targets_count,schooldata,ecComponentState,course_total_score,total_rate_data,ec_course_targets,graduation_list,target_list,target_score,evaluate_result,morelisttype,titlemessage,completiontype,completionlist,ismanager} = this.state;
-    // console.log("Curriculum");
-    // console.log(this.props);
+		let { newec_course_idbottom, titine, classcalue, course_name, course_url, ecmanager, Spintype, calculatesetype, ec_course_id, course_total_scoreaverage, ec_course_targets_count, schooldata, ecComponentState, course_total_score, total_rate_data, ec_course_targets, graduation_list, target_list, target_score, evaluate_result, morelisttype, titlemessage, completiontype, completionlist, ismanager } = this.state;
+		// console.log("Curriculum");
+		// console.log(this.props);
 		// console.log(titine);
 		return (
 			<div className="educontent">
-			<div className="newMain clearfix">
-				<div className="edu-back-white eacourse">
+				<div className="newMain clearfix">
+					<div className="edu-back-white eacourse">
 
-					<div className="clearfix padding20-30 bor-bottom-greyE">
-						<a href={schooldata&&schooldata.course_setting_url} className="color-grey-9 TrainingLecturer">课程体系</a> >
-						<a className="TrainingTheory major_name"> {schooldata&&schooldata.ec_course_name} 达成评价详情</a>
-						{/* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> */}
-						<div className="color-grey-9 mr10">系统根据课程目标、课程考核方式与课程目标评价方法，一键计算评价课程目标的达成情况  <a className={"color-blue"} target="_blank" href={'/forums/3533'}>查看详情</a></div>
-						{
-							titine === 4 ?
-								<span className="Importclassroomdatas" style={{top: '22px'}}>
-                  <a className="white-btn edu-blueback-btn fr mb10 mr10 mt7" target="_blank"
-									href={'/ec_courses/' + newec_course_idbottom + '/export_ec_course_targets?format=xls'}>导出评价方法</a>
-                  </span>
-						  :titine === 1 ?
-								<span className="Importclassroomdatas" style={{top: '22px'}}>
-                  <a className="white-btn edu-blueback-btn fr mb10 mr10 mt7"
-									href={`/ec_courses/${this.props.match.params.ec_course_id}/export_ec_course_targets?format=xls`}
-									>导出课程目标</a>
-                  </span>
-							:titine===2?
-									<div className={"Importclassroomdatas"}>
-                                <span className="" >
-                                <a className="white-btn edu-blueback-btn fr mr10 mt7"    style={{top: '22px',display:ecmanager===false?"none":"block"}} target="_blank" href={'/ec_courses/'+ec_course_id+'/export_ec_course_targets?format=xls'}>导出考核方法</a>
-                                </span>
-										<a className="white-btn edu-blueline-btn fr mr10 mt7 mr20"
-											 onClick={this.associatedclass}
-											 style={{display: course_url === "" && ecmanager === true ? "block" : "none"}}
-										>关联课堂</a>
-										<a className="white-btn edu-blueline-btn fr mr10 mt7 mr20"
-											 onClick={this.deleteassociatedclass}
-											 style={{display:course_url!=""&&ecmanager===true?"block":"none"}}
-										>取消关联</a>
-									</div>
-							:""
-						}
-					</div>
+						<div className="clearfix padding20-30 bor-bottom-greyE">
+							<a href={schooldata && schooldata.course_setting_url} className="color-grey-9 TrainingLecturer">课程体系</a> >
+						<a className="TrainingTheory major_name"> {schooldata && schooldata.ec_course_name} 达成评价详情</a>
+							{/* <a   className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> */}
+							<div className="color-grey-9 mr10">系统根据课程目标、课程考核方式与课程目标评价方法，一键计算评价课程目标的达成情况  <a className={"color-blue"} target="_blank" href={'/forums/3533'}>查看详情</a></div>
+							{
+								titine === 4 ?
+									<span className="Importclassroomdatas" style={{ top: '22px' }}>
+										<a className="white-btn edu-blueback-btn fr mb10 mr10 mt7" target="_blank"
+											href={'/ec_courses/' + newec_course_idbottom + '/export_ec_course_targets?format=xls'}>导出评价方法</a>
+									</span>
+									: titine === 1 ?
+										<span className="Importclassroomdatas" style={{ top: '22px' }}>
+											<a className="white-btn edu-blueback-btn fr mb10 mr10 mt7"
+												href={`/ec_courses/${this.props.match.params.ec_course_id}/export_ec_course_targets?format=xls`}
+											>导出课程目标</a>
+										</span>
+										: titine === 2 ?
+											<div className={"Importclassroomdatas"}>
+												<span className="" >
+													<a className="white-btn edu-blueback-btn fr mr10 mt7" style={{ top: '22px', display: ecmanager === false ? "none" : "block" }} target="_blank" href={'/ec_courses/' + ec_course_id + '/export_ec_course_targets?format=xls'}>导出考核方法</a>
+												</span>
+												<a className="white-btn edu-blueline-btn fr mr10 mt7 mr20"
+													onClick={this.associatedclass}
+													style={{ display: course_url === "" && ecmanager === true ? "block" : "none" }}
+												>关联课堂</a>
+												<a className="white-btn edu-blueline-btn fr mr10 mt7 mr20"
+													onClick={this.deleteassociatedclass}
+													style={{ display: course_url != "" && ecmanager === true ? "block" : "none" }}
+												>取消关联</a>
+											</div>
+											: ""
+							}
+						</div>
 
-					<div className="padding20-30"style={titine===2||titine===3?{height:"100px"}:{height:"80px"}}
-					>
-						<a className="fl SystemParameters" style={titine===1?{display:schooldata&&schooldata.ec_course_support_setting_url===null?"none":"block",color:'#4CACFF'}:{display:schooldata&&schooldata.ec_course_support_setting_url===null?"none":"block",color:'#4D4D4D'}}
-							  onClick={()=>this.onAclick(1)}>1.课程目标</a>
-						<a className="fl SystemParameters ml40"
-							 style={titine===2?{display:schooldata&&schooldata.ec_course_reach_setting_url===null?"none":"block",color:'#4CACFF'}:{display:schooldata&&schooldata.ec_course_reach_setting_url===null?"none":"block",color:'#4D4D4D'}}
-							 onClick={()=>this.onAclick(2)}>2.课程考核方式与数据来源</a>
-						<a className="fl SystemParameters4CACFF ml40 "
-							 style={titine===3?{color:'#4CACFF'}:{display:"block",color:'#4D4D4D'}}
-							 onClick={()=>this.onAclick(3)}>3.成绩等级设置</a>
-						<a className="fl SystemParameters ml40"
-							 style={titine===4?{display:schooldata&&schooldata.evaluation_methods_url===null?"none":"block",color:'#4CACFF'}:{display:schooldata&&schooldata.evaluation_methods_url===null?"none":"block",color:'#4D4D4D'}}
-							 onClick={()=>this.onAclick(4)}
-						>4.课程目标评价方法</a>
-						<a className="fl SystemParameters ml40 "
-							 style={titine===5?{display:schooldata&&schooldata.competition_calculation_info_url===null?"none":"block",color:'#4CACFF'}:{display:schooldata&&schooldata.competition_calculation_info_url===null?"none":"block",color:'#4D4D4D'}}
-							 onClick={()=>this.onAclick(5)}
-						>5.课程达成评价结果</a>
-						{
-							titine===5?
-						  <span>
-						  <span className={ismanager===false?"none":""} style={{top: "26px"}}>
-							<a className="white-btn edu-blueback-btn fr mb10 mr10 mt9" target="_blank" href={`/ec_courses/${ec_course_id}/course_targets.xlsx${getRandomNumber()}`}>导出评价详情</a>
-							</span>
-						  <span className={ismanager===false?"none":"right newrightcalculatebuttons fr mb10 mr20 "}
-							onClick={()=>this.newrightcalculatebuttonysl(this.child)}>计算</span>
-							</span>
-						 :titine===4?
-								<span className="fr ml20 SystemParameters" style={{color: '#989898'}}>（各环节平均得分*占比）之和/（各环节总分*占比）之和</span>
-						 :titine===3?
-							<span className="fl SystemParametersysls" style={{display:course_name===null||course_name===undefined?"block":"none",
-							padding: '0px 0px 0px 0px',textAlign: 'left',width: '100%',color:'#989898'}}>（将学生的成绩转换成对应的等级）</span>
-							:titine===2?
-							<span>
-							<span className="fl" style={{display:course_name===null||course_name===undefined?"block":"none",padding: '0px 0px 0px 0px',textAlign: 'left',width: '100%',color: '#989898'}}>（请在完成配置后，使用各项成绩导入模板，将本学年所有参与的学生成绩数据导入系统）</span>
-							<span className="Importclassroomdatass" style={{display:course_url===""||ecmanager===false?"none":"block",}}><a onClick={this.sync_course_data} className="white-btn edu-orangeback-btn  fr mt2 mr10" style={{width:'112px'}}>导入课堂数据</a></span>
-							</span>
-							:""
-						}
+						<div className="padding20-30" style={titine === 2 || titine === 3 ? { height: "100px" } : { height: "80px" }}
+						>
+							<a className="fl SystemParameters" style={titine === 1 ? { display: schooldata && schooldata.ec_course_support_setting_url === null ? "none" : "block", color: '#4CACFF' } : { display: schooldata && schooldata.ec_course_support_setting_url === null ? "none" : "block", color: '#4D4D4D' }}
+								onClick={() => this.onAclick(1)}>1.课程目标</a>
+							<a className="fl SystemParameters ml40"
+								style={titine === 2 ? { display: schooldata && schooldata.ec_course_reach_setting_url === null ? "none" : "block", color: '#4CACFF' } : { display: schooldata && schooldata.ec_course_reach_setting_url === null ? "none" : "block", color: '#4D4D4D' }}
+								onClick={() => this.onAclick(2)}>2.课程考核方式与数据来源</a>
+							<a className="fl SystemParameters4CACFF ml40 "
+								style={titine === 3 ? { color: '#4CACFF' } : { display: "block", color: '#4D4D4D' }}
+								onClick={() => this.onAclick(3)}>3.成绩等级设置</a>
+							<a className="fl SystemParameters ml40"
+								style={titine === 4 ? { display: schooldata && schooldata.evaluation_methods_url === null ? "none" : "block", color: '#4CACFF' } : { display: schooldata && schooldata.evaluation_methods_url === null ? "none" : "block", color: '#4D4D4D' }}
+								onClick={() => this.onAclick(4)}
+							>4.课程目标评价方法</a>
+							<a className="fl SystemParameters ml40 "
+								style={titine === 5 ? { display: schooldata && schooldata.competition_calculation_info_url === null ? "none" : "block", color: '#4CACFF' } : { display: schooldata && schooldata.competition_calculation_info_url === null ? "none" : "block", color: '#4D4D4D' }}
+								onClick={() => this.onAclick(5)}
+							>5.课程达成评价结果</a>
+							{
+								titine === 5 ?
+									<span>
+										<span className={ismanager === false ? "none" : ""} style={{ top: "26px" }}>
+											<a className="white-btn edu-blueback-btn fr mb10 mr10 mt9" target="_blank" href={`/ec_courses/${ec_course_id}/course_targets.xlsx${getRandomNumber()}`}>导出评价详情</a>
+										</span>
+										<span className={ismanager === false ? "none" : "right newrightcalculatebuttons fr mb10 mr20 "}
+											onClick={() => this.newrightcalculatebuttonysl(this.child)}>计算</span>
+									</span>
+									: titine === 4 ?
+										<span className="fr ml20 SystemParameters" style={{ color: '#989898' }}>（各环节平均得分*占比）之和/（各环节总分*占比）之和</span>
+										: titine === 3 ?
+											<span className="fl SystemParametersysls" style={{
+												display: course_name === null || course_name === undefined ? "block" : "none",
+												padding: '0px 0px 0px 0px', textAlign: 'left', width: '100%', color: '#989898'
+											}}>（将学生的成绩转换成对应的等级）</span>
+											: titine === 2 ?
+												<span>
+													<span className="fl" style={{ display: course_name === null || course_name === undefined ? "block" : "none", padding: '0px 0px 0px 0px', textAlign: 'left', width: '100%', color: '#989898' }}>（请在完成配置后，使用各项成绩导入模板，将本学年所有参与的学生成绩数据导入系统）</span>
+													<span className="Importclassroomdatass" style={{ display: course_url === "" || ecmanager === false ? "none" : "block", }}><a onClick={this.sync_course_data} className="white-btn edu-orangeback-btn  fr mt2 mr10" style={{ width: '112px' }}>导入课堂数据</a></span>
+												</span>
+												: ""
+							}
+						</div>
 					</div>
+					<Switch>
+						{/*Curriculumtwo 测试用*/}
+						{/*课程目标*/}
+						<Route extra path='/ecs/major_schools/:majorId/years/:yearId/classrooms/subpage/:type/1'
+							render={(props) => (<EcCourseSupportSetting {...this.props} {...props} {...this.state} Ontitine={(i) => this.Ontitine(i)} />)}></Route>
+						{/*课程考核方式与数据来源*/}
+						<Route extra path='/ecs/major_schools/:majorId/years/:yearId/classrooms/subpage/:type/2'
+							render={(props) => (<Curriculumtwo {...this.props} {...props} {...this.state} Ontitine={(i) => this.Ontitine(i)} />)}></Route>
+						{/*成绩等级设置*/}
+						<Route extra path='/ecs/major_schools/:majorId/years/:yearId/classrooms/subpage/:type/3'
+							render={(props) => (<Curriculumtwo {...this.props} {...props} {...this.state} Ontitine={(i) => this.Ontitine(i)} />)}></Route>
+						{/*4课程目标评价方法*/}
+						<Route extra path='/ecs/major_schools/:majorId/years/:yearId/classrooms/subpage/:type/4'
+							render={(props) => (<EcCourseEvaluationsbottom {...this.props} {...props} {...this.state} Ontitine={(i) => this.Ontitine(i)} />)}></Route>
+						{/*5课程达成评价结果*/}
+						<Route extra path='/ecs/major_schools/:majorId/years/:yearId/classrooms/subpage/:type/5'
+							render={(props) => (<EcCompletionCalculation {...this.props} {...props} {...this.state} Ontitine={(i) => this.Ontitine(i)} triggerRef={this.bindRef} />)}></Route>
+					</Switch>
 				</div>
-				<Switch>
-					{/*Curriculumtwo 测试用*/}
-					{/*课程目标*/}
-					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/subpage/:type/1'
-								 render={ (props) => (<EcCourseSupportSetting {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)} />) }></Route>
-					{/*课程考核方式与数据来源*/}
-					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/subpage/:type/2'
-								 render={ (props) => (<Curriculumtwo {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route>
-					{/*成绩等级设置*/}
-					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/subpage/:type/3'
-								 render={ (props) => (<Curriculumtwo {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route>
-					{/*4课程目标评价方法*/ }
-					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/subpage/:type/4'
-								 render={ (props) => (<EcCourseEvaluationsbottom {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route>
-					{/*5课程达成评价结果*/}
-					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/subpage/:type/5'
-								 render={ (props) => (<EcCompletionCalculation {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)} triggerRef={this.bindRef}/>) }></Route>
-				</Switch>
-			</div>
 			</div>
 		)
 	}
 
 
 }
-export default Curriculum;
\ No newline at end of file
+export default Curriculum;
diff --git a/src/modules/ecs/curriculum/CurriculumSubpage.js b/src/modules/ecs/curriculum/CurriculumSubpage.js
index f7efffd8..3b430539 100644
--- a/src/modules/ecs/curriculum/CurriculumSubpage.js
+++ b/src/modules/ecs/curriculum/CurriculumSubpage.js
@@ -16,7 +16,7 @@ class CurriculumSubpage extends Component {
 		console.log(this.props.match.params);
 	}
 	Curriculumstructure=()=>{
-		this.props.history.push(`/ecs/major_schools/${this.props.match.params.majorId}/years/${this.props.match.params.yearId}/courses/subpage/ec_course_support_setting/1`);
+		this.props.history.push(`/ecs/major_schools/${this.props.match.params.majorId}/years/${this.props.match.params.yearId}/classrooms/subpage/ec_course_support_setting/1`);
 	}
 
 
@@ -32,4 +32,4 @@ class CurriculumSubpage extends Component {
 
 
 }
-export default CurriculumSubpage;
\ No newline at end of file
+export default CurriculumSubpage;
diff --git a/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js b/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
index 2b525284..bdb1b679 100644
--- a/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
+++ b/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
@@ -1,61 +1,51 @@
 import React, { Component } from 'react';
-import classNames from 'classnames'
-
 import axios from 'axios';
 
-// import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC';
-
 import { SnackbarHOC } from 'educoder'
 
-import { message,Modal,Spin,Icon} from 'antd';
-
-import 'antd/dist/antd.css';
-
-import EcTitleCourseEvaluations from '../../ecTitle/ecTitle'
-
+import { Modal, Spin, Icon } from 'antd';
 import '../../css/ecCourseSupports.css';
-
 import '../../css/ecCourseEvaluations.css';
 
 const $ = window.$;
 class EcCompletionCalculation extends Component {
     constructor(props) {
         super(props)
-        this.state={
-            schooldata:{},
-            ecComponentState:"ecCompletion",
-            course_total_score:[],
-            ec_course_targets:0,
-            graduation_list:[],
-            target_list:[],
-            target_score:[],
-            evaluate_result:"",
-            ec_course_targets_count:0,
-            new_target_ec_year_id:0,
-            total_rate_data:undefined,
-            calculatetype:false,
-            ec_course_id:0,
-            morelisttype:false,
-            titlemessage:"提示",
-            completiontype:false,
-            completionlist:"",
-            course_total_scoreaverage:0,
-            calculatesetype:false,
-            Spintype:false,
-            ismanager:false,
-				  	course_achievement:"--",
-				    course_rate:"--",
-				  	score_levels:[],
-					  score_levelsdata:[],
-            hife:"/ecs/major_schools/3/years/60/requirement_vs_courses",
+        this.state = {
+            schooldata: {},
+            ecComponentState: "ecCompletion",
+            course_total_score: [],
+            ec_course_targets: 0,
+            graduation_list: [],
+            target_list: [],
+            target_score: [],
+            evaluate_result: "",
+            ec_course_targets_count: 0,
+            new_target_ec_year_id: 0,
+            total_rate_data: undefined,
+            calculatetype: false,
+            ec_course_id: 0,
+            morelisttype: false,
+            titlemessage: "提示",
+            completiontype: false,
+            completionlist: "",
+            course_total_scoreaverage: 0,
+            calculatesetype: false,
+            Spintype: false,
+            ismanager: false,
+            course_achievement: "--",
+            course_rate: "--",
+            score_levels: [],
+            score_levelsdata: [],
+            hife: "/ecs/major_schools/3/years/60/requirement_vs_courses",
         }
     }
 
-    componentWillMount(){
+    componentWillMount() {
         window.document.title = '课程达成评价结果';
     }
 
-    componentDidMount(){
+    componentDidMount() {
         console.log("componentDidMount");
         console.log("EcCompletionCalculation");
 
@@ -64,36 +54,36 @@ class EcCompletionCalculation extends Component {
         // this.UpdateClassData(true);
 
         // const url =`/ec_major_schools/get_navigation_data?ec_course_id=`+ec_course_id;
-             const  ec_course_id=706;
-			       const url =`/ec_courses/${ec_course_id}/evaluation.json`;
-            axios.get(url)
+        const ec_course_id = 706;
+        const url = `/ec_courses/${ec_course_id}/evaluation.json`;
+        axios.get(url)
             .then((response) => {
-                if(response.status===200){
+                if (response.status === 200) {
                     // if(response.data.allow_visit===false){
                     //     window.location.href="/403"
                     //  }
 
-									this.setState({
-										schooldata:response.data,
-										ec_course_id:ec_course_id,
-										// evaluate_result:response.data.evaluate_result,
-										// course_total_score:response.data.course_total_score[response.data.course_total_score.length-1].total_rate,
-										// total_rate_data:response.data.course_total_score[response.data.course_total_score.length-1].total_rate.length,
-										graduation_list:response.data.graduation_subitem_evaluations,
-										target_list:response.data.course_targets,
-										// target_score:response.data.target_score,
-										ec_course_targets_count:response.data.course_targets.length,
-										course_achievement:response.data.course_achievement,
-										course_rate:response.data.course_rate,
-										score_levels:response.data.score_levels,
-										// score_levelsdata:response.data.course_targets.score_levels,
-										// morelisttype:newmorelisttype,
-										// course_total_scoreaverage:course_total_scoreaverage,
-										// ismanager:response.data.is_manager
-									})
-									// console.log("componentDidMount");
-									// console.log(response.data.score_levels);
-									// console.log(response.data.course_targets.score_levels);
+                    this.setState({
+                        schooldata: response.data,
+                        ec_course_id: ec_course_id,
+                        // evaluate_result:response.data.evaluate_result,
+                        // course_total_score:response.data.course_total_score[response.data.course_total_score.length-1].total_rate,
+                        // total_rate_data:response.data.course_total_score[response.data.course_total_score.length-1].total_rate.length,
+                        graduation_list: response.data.graduation_subitem_evaluations,
+                        target_list: response.data.course_targets,
+                        // target_score:response.data.target_score,
+                        ec_course_targets_count: response.data.course_targets.length,
+                        course_achievement: response.data.course_achievement,
+                        course_rate: response.data.course_rate,
+                        score_levels: response.data.score_levels,
+                        // score_levelsdata:response.data.course_targets.score_levels,
+                        // morelisttype:newmorelisttype,
+                        // course_total_scoreaverage:course_total_scoreaverage,
+                        // ismanager:response.data.is_manager
+                    })
+                    // console.log("componentDidMount");
+                    // console.log(response.data.score_levels);
+                    // console.log(response.data.course_targets.score_levels);
                 }
             })
             .catch(function (error) {
@@ -102,24 +92,24 @@ class EcCompletionCalculation extends Component {
         this.props.Ontitine("competition_calculation_info");
         try {
             this.props.triggerRef(this);
-        }catch (e) {
+        } catch (e) {
 
         }
     }
 
-    targetsget_navigation_data=(ec_year_id,ec_course_id)=>{
-        const Url =`/ec_major_schools/get_navigation_data?ec_year_id=`+ec_year_id+"&ec_course_id="+ec_course_id;
+    targetsget_navigation_data = (ec_year_id, ec_course_id) => {
+        const Url = `/ec_major_schools/get_navigation_data?ec_year_id=` + ec_year_id + "&ec_course_id=" + ec_course_id;
         axios.get(Url, {
             withCredentials: true,
         })
             .then((response) => {
-                if(response.status===200){
+                if (response.status === 200) {
                     // if(response.data.allow_visit===false){
                     //     window.location.href="/403"
                     //  }
                     this.setState({
-                        schooldata:response.data,
-                        ec_course_id:ec_course_id
+                        schooldata: response.data,
+                        ec_course_id: ec_course_id
                     })
                 }
             })
@@ -127,26 +117,26 @@ class EcCompletionCalculation extends Component {
                 console.log(error);
             });
     }
-    showmorelist=()=>{
+    showmorelist = () => {
         this.setState({
-            morelisttype:false
+            morelisttype: false
         })
         this.UpdateClassData(false)
     }
-    UpdateClassData=(key)=>{
-        let {calculatetype} =this.state;
+    UpdateClassData = (key) => {
+        let { calculatetype } = this.state;
         // let ec_course_id =this.props.match.params.ec_course_id;
         this.setState({
-            ec_course_id:ec_course_id
+            ec_course_id: ec_course_id
         })
-		  	const  ec_course_id=706;
-        const Arl =`/ec_courses/`+ec_course_id+`/calculation_info_data`;
+        const ec_course_id = 706;
+        const Arl = `/ec_courses/` + ec_course_id + `/calculation_info_data`;
         axios.get(Arl, {
             withCredentials: true,
         })
             .then((response) => {
 
-                if(response.status===200){
+                if (response.status === 200) {
                     // var list=[];
                     // if(key===true){
                     //     for(var i=0; i<response.data.course_total_score.length;i++){
@@ -158,52 +148,52 @@ class EcCompletionCalculation extends Component {
                     //     list=response.data.course_total_score
                     // }
                     // let newgraduation_list= response.data.graduation_list.reverse();
-                    let newmorelisttype=false;
-                    if(response.data.course_total_score>10){
-                        newmorelisttype=true
+                    let newmorelisttype = false;
+                    if (response.data.course_total_score > 10) {
+                        newmorelisttype = true
 
                     }
 
                     let course_total_scoreaverage;
-                    let newlist=response.data.course_total_score[response.data.course_total_score.length-1].total_rate;
-                    for(var i=0; i<newlist.length;i++){
-                            if(i===newlist.length-1){
-                                course_total_scoreaverage=newlist[i].total_score
-                            }
+                    let newlist = response.data.course_total_score[response.data.course_total_score.length - 1].total_rate;
+                    for (var i = 0; i < newlist.length; i++) {
+                        if (i === newlist.length - 1) {
+                            course_total_scoreaverage = newlist[i].total_score
+                        }
                     }
 
                     this.setState({
                         // evaluate_result:response.data.evaluate_result,
                         // course_total_score:response.data.course_total_score[response.data.course_total_score.length-1].total_rate,
                         // total_rate_data:response.data.course_total_score[response.data.course_total_score.length-1].total_rate.length,
-                         graduation_list:response.data.graduation_subitem_evaluations,
-                         target_list:response.data.course_targets,
+                        graduation_list: response.data.graduation_subitem_evaluations,
+                        target_list: response.data.course_targets,
                         // target_score:response.data.target_score,
-                        ec_course_targets_count:response.data.course_targets.length,
-										   	course_achievement:response.data.course_achievement,
-											  course_rate:response.data.course_rate,
-											  score_levels:response.data.score_levels,
-										  	// score_levelsdata:,
+                        ec_course_targets_count: response.data.course_targets.length,
+                        course_achievement: response.data.course_achievement,
+                        course_rate: response.data.course_rate,
+                        score_levels: response.data.score_levels,
+                        // score_levelsdata:,
                         // morelisttype:newmorelisttype,
                         // course_total_scoreaverage:course_total_scoreaverage,
                         // ismanager:response.data.is_manager
                     });
-										// console.log("componentDidMount");
-										// console.log(response.data.score_levels_map);
-										// Object.getOwnPropertyNames(response.data.score_levels_map).forEach(function(val) {
-										// 	console.log("正在循环");
-										// 	console.log(val);
-										// });
-									// console.log(response.data.course_targets.score_levels);
+                    // console.log("componentDidMount");
+                    // console.log(response.data.score_levels_map);
+                    // Object.getOwnPropertyNames(response.data.score_levels_map).forEach(function(val) {
+                    // 	console.log("正在循环");
+                    // 	console.log(val);
+                    // });
+                    // console.log(response.data.course_targets.score_levels);
 
                     // ec_course_targets:response.data.ec_course_targets,
-                    this.targetsget_navigation_data(response.data.ec_year_id,ec_course_id)
-                    if(calculatetype===true){
+                    this.targetsget_navigation_data(response.data.ec_year_id, ec_course_id)
+                    if (calculatetype === true) {
                         this.setState({
-                            calculatetype:false,
-                            completiontype:true,
-                            completionlist:'刷新列表数据成功',
-                            calculatesetype:true
+                            calculatetype: false,
+                            completiontype: true,
+                            completionlist: '刷新列表数据成功',
+                            calculatesetype: true
                         })
                     }
 
@@ -307,25 +297,25 @@ class EcCompletionCalculation extends Component {
 
     }
 
-    newrightcalculatebutton=()=>{
+    newrightcalculatebutton = () => {
         console.log("调用了计算");
         this.setState({
-            Spintype:true
+            Spintype: true
         })
         // let {ec_course_id}=this.state;
-        const  ec_course_id=706;
+        const ec_course_id = 706;
         // const Orl =`/ec_courses/`+ec_course_id+`/sync_data`;
-        const Orl =`/ec_courses/${ec_course_id}/evaluation.json`;
+        const Orl = `/ec_courses/${ec_course_id}/evaluation.json`;
         axios.get(Orl)
             .then((response) => {
-                if(response){
-                    if(response.data.status===1){
+                if (response) {
+                    if (response.data.status === 1) {
                         this.setState({
-                            calculatetype:true,
-                            completiontype:true,
-                            completionlist:'计算成功',
-                            calculatesetype:true,
-                            Spintype:false
+                            calculatetype: true,
+                            completiontype: true,
+                            completionlist: '计算成功',
+                            calculatesetype: true,
+                            Spintype: false
                         })
                         this.UpdateClassData(true);
                     }
@@ -333,54 +323,54 @@ class EcCompletionCalculation extends Component {
 
             })
             .catch(function (error) {
-                    console.log(error)
+                console.log(error)
             });
     }
-    hidecompletion=()=>{
+    hidecompletion = () => {
         this.setState({
-            completiontype:false,
-            completionlist:"",
-            calculatesetype:false
+            completiontype: false,
+            completionlist: "",
+            calculatesetype: false
         })
     }
     render() {
-        let {Spintype,calculatesetype,ec_course_id,course_total_scoreaverage,score_levels,ec_course_targets_count,course_achievement,schooldata,course_rate,ecComponentState,course_total_score,total_rate_data,ec_course_targets,graduation_list,target_list,target_score,evaluate_result,morelisttype,titlemessage,completiontype,completionlist,ismanager} = this.state;
+        let { Spintype, calculatesetype, ec_course_id, course_total_scoreaverage, score_levels, ec_course_targets_count, course_achievement, schooldata, course_rate, ecComponentState, course_total_score, total_rate_data, ec_course_targets, graduation_list, target_list, target_score, evaluate_result, morelisttype, titlemessage, completiontype, completionlist, ismanager } = this.state;
 
         let TargetresList = (length) => {
             let target_listres = [];
-            for(let i = 0; i < length; i++) {
+            for (let i = 0; i < length; i++) {
                 // target_listres.push(<span className="column-1 operationleft color-666"  key={i}>目标{length-i}</span>)
                 // target_listres.push(<span className="column-2 operationleft color-666"  key={i}>目标{i+1}</span>)
-                target_listres.push(<span className="column-1  color-666"  key={i}>目标{i+1}</span>)
+                target_listres.push(<span className="column-1  color-666" key={i}>目标{i + 1}</span>)
             }
             return target_listres
         }
 
         let TargetresLists = (length) => {
             let target_listress = [];
-            for(let i = 0; i < length; i++) {
+            for (let i = 0; i < length; i++) {
                 // target_listres.push(<span className="column-1 operationleft color-666"  key={i}>目标{length-i}</span>)
-                target_listress.push(<span className="column-2  operationleft color-666"  key={i}>目标{i+1}</span>)
+                target_listress.push(<span className="column-2  operationleft color-666" key={i}>目标{i + 1}</span>)
                 // target_listres.push(<span className="column-1 operationright color-666"  key={i}>目标{length-i}</span>)
             }
             return target_listress
         }
 
-        let TargetresContentList = (data,value) => {
-					let target_listres = [];
-					if(data){
-        	   	if(data.length>0){
-        	   		 for(var i=0;i<data.length;i++){
-								  console.log("TargetresContentList");
-        	   		 	   if(data[i].id===value[0]){
-											 target_listres.push(<span className={i===0?" column-1  color-green":" column-1  color-green"}  key={i}><i class="iconfont icon-gouxuan color-green font-16 mr5"></i></span>)
-										 }	else{
-											 target_listres.push(<span className={i===0?" column-1  color-666":"column-1  color-666"}  key={i}><i class="iconfont icon-guanbi font-14 mr5"></i></span>)
+        let TargetresContentList = (data, value) => {
+            let target_listres = [];
+            if (data) {
+                if (data.length > 0) {
+                    for (var i = 0; i < data.length; i++) {
+                        console.log("TargetresContentList");
+                        if (data[i].id === value[0]) {
+                            target_listres.push(<span className={i === 0 ? " column-1  color-green" : " column-1  color-green"} key={i}><i className="iconfont icon-gouxuan color-green font-16 mr5"></i></span>)
+                        } else {
+                            target_listres.push(<span className={i === 0 ? " column-1  color-666" : "column-1  color-666"} key={i}><i className="iconfont icon-guanbi font-14 mr5"></i></span>)
 
-										 }
-        	   		 }
-							}
-						 }
+                        }
+                    }
+                }
+            }
             // target_listres.reverse()
             return target_listres
         };
@@ -390,40 +380,40 @@ class EcCompletionCalculation extends Component {
         let Total_rate_dataList = (value) => {
 
             let target_listres = [];
-            if(value!=undefined){
-                for(let i = 0; i < value.length; i++) {
+            if (value != undefined) {
+                for (let i = 0; i < value.length; i++) {
 
-                    if(i===value.length-1){
+                    if (i === value.length - 1) {
                         target_listres.push(<span className="column-1 operationright" key={i}>
                             {/*<div className="color-red">{value[i].total_score}</div>*/}
                             <div className="color-red">100%</div>
                         </span>)
-                    }else{
-                            target_listres.push(<span className={i===0?"  column-2 operationleft":"column-2 operationleft"} key={i}>
-                    {/*<div>{value[i].score}</div>*/}
-                    {/*<div className="color-redFF">占比{(value[i].rate*100).toFixed(2)}%</div>*/}
-                    <div>
-                        {(value[i].rate*100).toFixed(2)}%
+                    } else {
+                        target_listres.push(<span className={i === 0 ? "  column-2 operationleft" : "column-2 operationleft"} key={i}>
+                            {/*<div>{value[i].score}</div>*/}
+                            {/*<div className="color-redFF">占比{(value[i].rate*100).toFixed(2)}%</div>*/}
+                            <div>
+                                {(value[i].rate * 100).toFixed(2)}%
                     </div>
-                    </span>)
-                        }
+                        </span>)
+                    }
 
                 }
                 return target_listres
-            }else{
+            } else {
                 target_listres.push(<span className="column-1 operationright">
-                {/*<div className="color-red">{value[i].total_score}</div>*/}
+                    {/*<div className="color-red">{value[i].total_score}</div>*/}
                     <div className="">--</div>
                 </span>)
-             return target_listres
+                return target_listres
             }
         }
 
-        let newTotal_rate_dataList = (length,value) => {
+        let newTotal_rate_dataList = (length, value) => {
 
             let target_listres = [];
-            if(value!=undefined){
-                for(let i = 0; i < value.length; i++) {
+            if (value != undefined) {
+                for (let i = 0; i < value.length; i++) {
 
                     // if(i===0){
                     //     target_listres.push(<span className="column-2  color-05101A" key={i}>
@@ -435,9 +425,9 @@ class EcCompletionCalculation extends Component {
                     // </span>)
                     // }
 
-                    if(i<value.length-1){
+                    if (i < value.length - 1) {
                         target_listres.push(<span className="column-2  color-05101A" key={i}>
-                             <div>{value[i].score.toFixed(2)}</div>
+                            <div>{value[i].score.toFixed(2)}</div>
                         </span>)
                     }
 
@@ -460,22 +450,22 @@ class EcCompletionCalculation extends Component {
                         <div className="task-popup-text-center font-14">{completionlist}</div>
                     </div>
                     {
-                        calculatesetype===true?
-                        <div className="task-popup-submit clearfix"
-                        style={{width:'69px'}}
-                        >
-                            <a  className="task-btn task-btn-orange fr"
-                                style={{fontWeight: '400'}}
-                                onClick={this.hidecompletion}
-                            >知道啦</a>
-                        </div>
-                        :
-                        <div className="task-popup-submit clearfix">
-                            <a onClick={this.hidecompletion} className="task-btn fl">取消</a>
-                            <a  className="task-btn task-btn-orange fr"
-                                onClick={this.hidecompletion}
-                            >确定</a>
-                        </div>
+                        calculatesetype === true ?
+                            <div className="task-popup-submit clearfix"
+                                style={{ width: '69px' }}
+                            >
+                                <a className="task-btn task-btn-orange fr"
+                                    style={{ fontWeight: '400' }}
+                                    onClick={this.hidecompletion}
+                                >知道啦</a>
+                            </div>
+                            :
+                            <div className="task-popup-submit clearfix">
+                                <a onClick={this.hidecompletion} className="task-btn fl">取消</a>
+                                <a className="task-btn task-btn-orange fr"
+                                    onClick={this.hidecompletion}
+                                >确定</a>
+                            </div>
                     }
 
 
@@ -495,7 +485,7 @@ class EcCompletionCalculation extends Component {
                     {/*    <div className="clearfix padding20-30 bor-bottom-greyE">*/}
                     {/*        <a href={schooldata.course_setting_url} className="color-grey-9 TrainingLecturer">课程体系</a> >*/}
                     {/*        <a className="TrainingTheory major_name"> {schooldata.ec_course_name} 达成评价详情</a>*/}
-                    {/*        /!* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> *!/*/}
+                    {/*        /!* <a   className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> *!/*/}
                     {/*        <div className="color-grey-9 mr10">系统根据课程目标、课程考核方式与课程目标评价方法，一键计算评价课程目标的达成情况  <a className={"color-blue"} onClick={() => window.elasticLayer(3533)}>查看详情</a></div>*/}
                     {/*    </div>*/}
                     {/* <div className="padding20-30" id="training_objective_contents"*/}
@@ -534,7 +524,7 @@ class EcCompletionCalculation extends Component {
                     {/*        </span>*/}
                     {/*    </div>*/}
                     {/*</div>*/}
-								  	{/*课程目标*/}
+                    {/*课程目标*/}
                     <div className="ListTableLine newSystem mb20" id="school_major_list">
 
                         <p className="clearfix padding10im" >
@@ -544,189 +534,189 @@ class EcCompletionCalculation extends Component {
                             <span className="column-1 operationright color-666">实际达成</span>
                             <span className="column-1 operationright color-666">权重</span>
                         </p>
-                        
-                        { Spintype===true?<Spin className="Spinlarge"  indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" }
 
-                            { target_list.length===0&&Spintype===false?
-                            <li className={ "clearfix newtarget_scoreclass lipadding10im"}>
+                        {Spintype === true ? <Spin className="Spinlarge" indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />} /> : ""}
+
+                        {target_list.length === 0 && Spintype === false ?
+                            <li className={"clearfix newtarget_scoreclass lipadding10im"}>
                                 <span className="column-1 color-05101A">--</span>
                                 <span className="column-575 color-05101A">--</span>
                                 <span className={"column-1 operationright Systemnum"}>--</span>
                                 <span className="column-1 operationright color-05101A">--</span>
                                 <span className="column-1 operationright">--</span>
                                 <span className="column-1 operationright">--</span>
-                            </li>:""}
-                        
-                        
-                            {Spintype===false?target_list.map((item,key)=>{
+                            </li> : ""}
 
-                                return(
-                                    <li className={key+1===target_list.length?"clearfix newtarget_target lipadding10im":"clearfix newtarget_scoreclass lipadding10im"} key={key}>
-                                        <span className="column-1 color-05101A">{key+1}</span>
-                                        <span className="column-575 color-05101A">{item.content}</span>
-                                        <span className={item.status==="not_achieved"?"column-1 operationright Systemnum":"column-1 operationright color-green"}>{item.status==="not_achieved"?"未达成":"已达成"}</span>
-                                        <span className="column-1 operationright color-05101A ">{item.standard_grade}</span>
-                                        <span className="column-1 operationright">{item.actually_grade}</span>
-                                        <span className="column-1 operationright">{item.weight}</span>
-                                    </li>
-                                )
 
-                            }):""
+                        {Spintype === false ? target_list.map((item, key) => {
+
+                            return (
+                                <li className={key + 1 === target_list.length ? "clearfix newtarget_target lipadding10im" : "clearfix newtarget_scoreclass lipadding10im"} key={key}>
+                                    <span className="column-1 color-05101A">{key + 1}</span>
+                                    <span className="column-575 color-05101A">{item.content}</span>
+                                    <span className={item.status === "not_achieved" ? "column-1 operationright Systemnum" : "column-1 operationright color-green"}>{item.status === "not_achieved" ? "未达成" : "已达成"}</span>
+                                    <span className="column-1 operationright color-05101A ">{item.standard_grade}</span>
+                                    <span className="column-1 operationright">{item.actually_grade}</span>
+                                    <span className="column-1 operationright">{item.weight}</span>
+                                </li>
+                            )
+
+                        }) : ""
                         }
 
-                   
+
                     </div>
-									  {/*毕业要求指标点达成评价结果*/}
+                    {/*毕业要求指标点达成评价结果*/}
                     <div className="edu-back-white eacourse">
 
                         <div className="padding1030" id="training_objective_contents">
-                            <span className="fl SystemParameters lineheight60" style={{height:'46px'}}>   毕业要求指标点达成评价结果</span>
-                            <span className="right ml20 SystemParameters" style={{height:'46px'}}>注：<span className="color-green"><i class="iconfont icon-gouxuan color-green font-16 mr5"></i></span> 代表支持指标点；<i class="iconfont icon-guanbi font-14 mr5"></i>代表不支持指标点</span>
+                            <span className="fl SystemParameters lineheight60" style={{ height: '46px' }}>   毕业要求指标点达成评价结果</span>
+                            <span className="right ml20 SystemParameters" style={{ height: '46px' }}>注：<span className="color-green"><i className="iconfont icon-gouxuan color-green font-16 mr5"></i></span> 代表支持指标点；<i className="iconfont icon-guanbi font-14 mr5"></i>代表不支持指标点</span>
                         </div>
 
                     </div>
 
                     <div className="ListTableLine newSystem mb20 graduateRequirement " id="school_major_list">
 
-                    {
-                        graduation_list.length===0?
-                        <p className="clearfix lipadding20im" style={{minWidth:'1200px'}}>
-                        <span className="column-1 color-666 mr16">毕业要求</span>
-                        <span className="nowrap329">{5}</span>
+                        {
+                            graduation_list.length === 0 ?
+                                <p className="clearfix lipadding20im" style={{ minWidth: '1200px' }}>
+                                    <span className="column-1 color-666 mr16">毕业要求</span>
+                                    <span className="nowrap329">{5}</span>
 
-                        <span className="column-1 operationright color-666">达成结果</span>
-                        <span className="column-1 operationright color-666">达成目标值</span>
-                        <span className="column-1 operationright color-666">达成实际值</span>
-                        <span className="column-1 operationright color-666">课程权重</span>
-                        {TargetresList(5)}
-                    </p>
-                    :""
-                    }
+                                    <span className="column-1 operationright color-666">达成结果</span>
+                                    <span className="column-1 operationright color-666">达成目标值</span>
+                                    <span className="column-1 operationright color-666">达成实际值</span>
+                                    <span className="column-1 operationright color-666">课程权重</span>
+                                    {TargetresList(5)}
+                                </p>
+                                : ""
+                        }
 
-                   { Spintype===true?<Spin className="Spinlarge"  indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" }
+                        {Spintype === true ? <Spin className="Spinlarge" indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />} /> : ""}
 
-                    {
-                        graduation_list.length===0&&Spintype===false?
-                        <li className={'clearfix newtarget_scoreclass marlr19'}  style={{minWidth:'1137px'}}>
-                        {/* <span className="column-1 color-05101A ec_graduation_name">{item.ec_graduation_name}</span> */}
-                        <span className="column-1 color-05101A ec_graduation_name">{1}</span>
-                        <span className="column-500 color-05101A">{"--"}</span>
-                        <span className={"column-1 operationright Systemnum mrj15"}>{"--"}</span>
-                        <span className="column-1 operationright color-05101A">{"--"}</span>
-                        <span className="column-1 operationright">{"--"}</span>
-                        <span className="column-1 operationright"> <a href={`/ecs/major_schools/${this.props.match.params.majorId}/years/${this.props.match.params.yearId}/requirement_vs_courses`} style={{color:'rgb(76, 172, 255)'}}>立即配置</a></span>
-                        {TargetresContentList(5,[2,2,2,2,2])}
-                    </li>
-                    :""
-                    }
-											<style>
-												{
-													`
+                        {
+                            graduation_list.length === 0 && Spintype === false ?
+                                <li className={'clearfix newtarget_scoreclass marlr19'} style={{ minWidth: '1137px' }}>
+                                    {/* <span className="column-1 color-05101A ec_graduation_name">{item.ec_graduation_name}</span> */}
+                                    <span className="column-1 color-05101A ec_graduation_name">{1}</span>
+                                    <span className="column-500 color-05101A">{"--"}</span>
+                                    <span className={"column-1 operationright Systemnum mrj15"}>{"--"}</span>
+                                    <span className="column-1 operationright color-05101A">{"--"}</span>
+                                    <span className="column-1 operationright">{"--"}</span>
+                                    <span className="column-1 operationright"> <a href={`/ecs/major_schools/${this.props.match.params.majorId}/years/${this.props.match.params.yearId}/requirement_vs_courses`} style={{ color: 'rgb(76, 172, 255)' }}>立即配置</a></span>
+                                    {TargetresContentList(5, [2, 2, 2, 2, 2])}
+                                </li>
+                                : ""
+                        }
+                        <style>
+                            {
+                                `
 													.myliysls{
 															 display: flex;
 										         flex-direction:initial;
 									        }
 
 													`
-												}
-											</style>
-                    {
-                        Spintype===false?graduation_list.map((item,key)=>{
+                            }
+                        </style>
+                        {
+                            Spintype === false ? graduation_list.map((item, key) => {
 
-                            if(key===0){
-                                return(
-                                    <li key={key} className="clearfix lipadding20im myliysls" style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380+15):1200+"px"}}>
-                                       <div  className="myliysls">
-																			  <span className="column-1 color-666 mr16">毕业要求</span>
-																		   </div>
-																			 <span className="column-500 ">{item.ec_subitem_content}</span>
-																			  <div className="myliysls" >
-                                        {TargetresList(ec_course_targets_count)}
-                                        </div>
-																			  <div className="myliysls">
-                                        <span className="column-1  color-666">课程权重</span>
-                                        <span className="column-1  color-666">达成目标值</span>
-                                        <span className="column-1  color-666">达成实际值</span>
-                                        <span className="column-1  color-666">达成结果</span>
-																				</div>
-                                    </li>
-                                )
+                                if (key === 0) {
+                                    return (
+                                        <li key={key} className="clearfix lipadding20im myliysls" style={{ minWidth: ec_course_targets_count > 5 ? (76 * (ec_course_targets_count + 4) + 380 + 15) : 1200 + "px" }}>
+                                            <div className="myliysls">
+                                                <span className="column-1 color-666 mr16">毕业要求</span>
+                                            </div>
+                                            <span className="column-500 ">{item.ec_subitem_content}</span>
+                                            <div className="myliysls" >
+                                                {TargetresList(ec_course_targets_count)}
+                                            </div>
+                                            <div className="myliysls">
+                                                <span className="column-1  color-666">课程权重</span>
+                                                <span className="column-1  color-666">达成目标值</span>
+                                                <span className="column-1  color-666">达成实际值</span>
+                                                <span className="column-1  color-666">达成结果</span>
+                                            </div>
+                                        </li>
+                                    )
+                                }
+
+                            }) : ""
+                        }
+                        {/*mynewtarget_scoreclassysls*/}
+                        <style>
+                            {
+                                `
+													.myliysls{
+															 display: flex;
+										         flex-direction:initial;
+									        }
+
+													`
+                            }
+                        </style>
+                        <div className="">
+                            {
+                                Spintype === false ? graduation_list.map((item, key) => {
+
+                                    return (
+
+                                        <li key={key} className="clearfix lipadding20im myliysls" style={{ minWidth: ec_course_targets_count > 5 ? (76 * (ec_course_targets_count + 4) + 380 + 15) : 1200 + "px" }}>
+                                            <div className="myliysls ">
+                                                <span className="column-1 color-05101A mr16" >{key + 1}</span>
+                                            </div>
+                                            <span className="column-500 color-05101A" data-tip-down={item.content}>{item.content}</span>
+                                            <div className="myliysls">
+                                                {TargetresContentList(target_list, item.support_course_target_ids)}
+                                            </div>
+                                            <div className="myliysls">
+                                                {item.weights === null || item.weights === undefined || item.weights === "0.00" || item.weights === 0.00 || item.weights === 0 ? <span className="column-1 " ><a href={`/ecs/major_schools/${this.props.match.params.majorId}/years/${this.props.match.params.yearId}/requirement_vs_courses`} style={{ color: 'rgb(76, 172, 255)' }}>立即配置</a></span> : <span className="column-1 " style={{ textAlign: "center" }}>{item.weights}</span>}
+                                                <span className="column-1 " style={{ textAlign: "center" }}>{item.actually_achievement === null ? 0 : item.actually_achievement}</span>
+                                                <span className="column-1  color-05101A" style={{ textAlign: "center" }}>{item.objective_achievement === null ? 0 : item.objective_achievement}</span>
+                                                <span className={item.status === "not_achieved" ? "column-1  Systemnum mrj15" : "column-1  color-green mrj15"} style={{ textAlign: "center" }}>{item.status === "not_achieved" ? "未完成" : "完成"}</span>
+                                            </div>
+                                        </li>
+
+
+                                        // <li className={key+1===target_list.length?"clearfix newtarget_scoreclass marlr19":"clearfix newtarget_scoreclass marlr19"} key={key} style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380):1200+"px"}}>
+                                        // 	{/* <span className="column-1 color-05101A ec_graduation_name">{item.ec_graduation_name}</span> */}
+                                        // 	<span className="column-1 color-05101A ec_graduation_name " >{key+1}</span>
+                                        // 	<span className="column-500 color-05101A" data-tip-down={item.content}>{item.content}</span>
+                                        // 	<span className={item.status==="not_achieved"?"column-1 operationright Systemnum mrj15":"column-1 operationright color-green mrj15"} style={{textAlign:"left"}}>{item.status==="not_achieved"?"未完成":"完成"}</span>
+                                        // 	<span className="column-1 operationright color-05101A" style={{textAlign:"left"}}>{item.objective_achievement===null?0:item.objective_achievement}</span>
+                                        // 	<span className="column-1 operationright" style={{textAlign:"left"}}>{item.actually_achievement===null?0:item.actually_achievement}</span>
+                                        // 	{item.weights===null||item.weights===0?<span className="column-1 operationright" ><a href={schooldata.requirement_vs_courses} style={{color:'rgb(76, 172, 255)'}}>立即配置</a></span>:<span className="column-1 operationright" style={{textAlign:"left"}}>{item.weights}</span>}
+                                        // 	{TargetresContentList(ec_course_targets_count,item.target_position)}
+                                        // </li>
+                                    )
+
+                                }) : ""
                             }
 
-                        }):""
-                    }
-											{/*mynewtarget_scoreclassysls*/}
-											<style>
-												{
-													`
-													.myliysls{
-															 display: flex;
-										         flex-direction:initial;
-									        }
 
-													`
-												}
-											</style>
-                    <div className="">
-											{
-												Spintype===false?graduation_list.map((item,key)=>{
-
-													return(
-
-														<li key={key} className="clearfix lipadding20im myliysls" style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380+15):1200+"px"}}>
-															<div className="myliysls ">
-															<span className="column-1 color-05101A mr16" >{key+1}</span>
-															</div>
-															<span className="column-500 color-05101A" data-tip-down={item.content}>{item.content}</span>
-															<div className="myliysls">
-															{TargetresContentList(target_list,item.support_course_target_ids)}
-															</div>
-															<div className="myliysls">
-															{item.weights===null||item.weights===undefined||item.weights==="0.00"||item.weights===0.00||item.weights===0?<span className="column-1 " ><a href={`/ecs/major_schools/${this.props.match.params.majorId}/years/${this.props.match.params.yearId}/requirement_vs_courses`} style={{color:'rgb(76, 172, 255)'}}>立即配置</a></span>:<span className="column-1 " style={{textAlign:"center"}}>{item.weights}</span>}
-															<span className="column-1 " style={{textAlign:"center"}}>{item.actually_achievement===null?0:item.actually_achievement}</span>
-															<span className="column-1  color-05101A" style={{textAlign:"center"}}>{item.objective_achievement===null?0:item.objective_achievement}</span>
-															<span className={item.status==="not_achieved"?"column-1  Systemnum mrj15":"column-1  color-green mrj15"} style={{textAlign:"center"}}>{item.status==="not_achieved"?"未完成":"完成"}</span>
-															</div>
-															</li>
-
-
-														// <li className={key+1===target_list.length?"clearfix newtarget_scoreclass marlr19":"clearfix newtarget_scoreclass marlr19"} key={key} style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380):1200+"px"}}>
-														// 	{/* <span className="column-1 color-05101A ec_graduation_name">{item.ec_graduation_name}</span> */}
-														// 	<span className="column-1 color-05101A ec_graduation_name " >{key+1}</span>
-														// 	<span className="column-500 color-05101A" data-tip-down={item.content}>{item.content}</span>
-														// 	<span className={item.status==="not_achieved"?"column-1 operationright Systemnum mrj15":"column-1 operationright color-green mrj15"} style={{textAlign:"left"}}>{item.status==="not_achieved"?"未完成":"完成"}</span>
-														// 	<span className="column-1 operationright color-05101A" style={{textAlign:"left"}}>{item.objective_achievement===null?0:item.objective_achievement}</span>
-														// 	<span className="column-1 operationright" style={{textAlign:"left"}}>{item.actually_achievement===null?0:item.actually_achievement}</span>
-														// 	{item.weights===null||item.weights===0?<span className="column-1 operationright" ><a href={schooldata.requirement_vs_courses} style={{color:'rgb(76, 172, 255)'}}>立即配置</a></span>:<span className="column-1 operationright" style={{textAlign:"left"}}>{item.weights}</span>}
-														// 	{TargetresContentList(ec_course_targets_count,item.target_position)}
-														// </li>
-													)
-
-												}):""
-											}
-
-
-										</div>
+                        </div>
 
                     </div>
 
-								   	{/*课程总评成绩表*/}
+                    {/*课程总评成绩表*/}
                     <div className="edu-back-white eacourse">
 
                         <div className="padding1030" id="training_objective_contents">
-                            <span className="fl SystemParameters lineheight60" style={{height:'46px'}}>课程总评成绩表</span>
+                            <span className="fl SystemParameters lineheight60" style={{ height: '46px' }}>课程总评成绩表</span>
                         </div>
 
                     </div>
 
                     <div className="ListTableLine newSystem mb20" id="school_major_list">
 
-                        <p  className="clearfix padding10im" style={{width: total_rate_data > 5 ? (180 * total_rate_data+226+16) : 1200+"px"}}>
+                        <p className="clearfix padding10im" style={{ width: total_rate_data > 5 ? (180 * total_rate_data + 226 + 16) : 1200 + "px" }}>
                             {/*<span className="column-1 color-666 mr16 width86">序号</span>*/}
                             <span className="column-1 color-666 mr16 width86">课程目标</span>
                             {/*<span className="column-1 color-666 mr16">姓名</span>*/}
                             {/*<span className="column-1 color-666 mr16">学号</span>*/}
-                            {TargetresLists(total_rate_data-1)}
+                            {TargetresLists(total_rate_data - 1)}
                             <span className="column-1 operationright color-666">总评成绩</span>
                         </p>
                         {/*style={{width: 113*(total_rate_data+4)>1136?113*(total_rate_data+4.5):1136+"px"}}*/}
@@ -738,10 +728,10 @@ class EcCompletionCalculation extends Component {
                             //         return(
                             //             <li className={"clearfix newtarget_scoreclass lipadding10im margin64px"} key={k} style={{width: 113*(total_rate_data+4)>1200?(113*(total_rate_data+4.5))+63:1200+"px"}}>
                             //                 <span className="column-1 color-05101A mr16 width86">占比</span>
-                                            // {/*colorTransparent*/}
-                                            // {/*<span className="column-1 color-05101A ec_graduation_name mr16 colorTransparent"> 平均数 </span>*/}
-                                            // {/*<span className="column-1 color-05101A ec_graduation_name mr16 colorTransparent  "> 平均数 </span>*/}
-                                            // {/* {Total_rate_dataList(total_rate_data-1,i.total_rate)}
+                            // {/*colorTransparent*/}
+                            // {/*<span className="column-1 color-05101A ec_graduation_name mr16 colorTransparent"> 平均数 </span>*/}
+                            // {/*<span className="column-1 color-05101A ec_graduation_name mr16 colorTransparent  "> 平均数 </span>*/}
+                            // {/* {Total_rate_dataList(total_rate_data-1,i.total_rate)}
                             //             </li>
                             //         )
 
@@ -749,19 +739,19 @@ class EcCompletionCalculation extends Component {
 
                             // }) */}
                         }
-                          { Spintype===true?<Spin className="Spinlarge"  indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" }
-                       {
-                            Spintype===false? <li className={"clearfix newtarget_scoreclass lipadding10im margin64px"} style={{width: total_rate_data > 5 ? (180 * total_rate_data+226+16) : 1200 + "px"}}>
-                            <span className="column-1 color-05101A mr16 width86">占比</span>
-                            {/*colorTransparent*/}
-                            {/*<span className="column-1 color-05101A ec_graduation_name mr16 colorTransparent"> 平均数 </span>*/}
-                            {/*<span className="column-1 color-05101A ec_graduation_name mr16 colorTransparent  "> 平均数 </span>*/}
-                            {Total_rate_dataList(course_total_score)}
-															{
-																course_rate===undefined||course_rate===null||course_rate===""||course_rate==="0"||course_rate===0? <span className="column-1 operationright">--</span>:<span className="column-1 color-red operationright">{course_rate}</span>
-															}
-                            </li>:""
-                       }
+                        {Spintype === true ? <Spin className="Spinlarge" indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />} /> : ""}
+                        {
+                            Spintype === false ? <li className={"clearfix newtarget_scoreclass lipadding10im margin64px"} style={{ width: total_rate_data > 5 ? (180 * total_rate_data + 226 + 16) : 1200 + "px" }}>
+                                <span className="column-1 color-05101A mr16 width86">占比</span>
+                                {/*colorTransparent*/}
+                                {/*<span className="column-1 color-05101A ec_graduation_name mr16 colorTransparent"> 平均数 </span>*/}
+                                {/*<span className="column-1 color-05101A ec_graduation_name mr16 colorTransparent  "> 平均数 </span>*/}
+                                {Total_rate_dataList(course_total_score)}
+                                {
+                                    course_rate === undefined || course_rate === null || course_rate === "" || course_rate === "0" || course_rate === 0 ? <span className="column-1 operationright">--</span> : <span className="column-1 color-red operationright">{course_rate}</span>
+                                }
+                            </li> : ""
+                        }
                         {/*style={{width: 113*(total_rate_data+4)>1136?113*(total_rate_data+4):1136+"px"}}*/}
                         {
                             // course_total_score.map((i,k)=>{
@@ -784,22 +774,22 @@ class EcCompletionCalculation extends Component {
                             // })
                         }
                         {
-                             Spintype===false?<li className={"clearfix newtarget_scoreclass lipadding10im bordereaeaea"} style={{width: 113*(total_rate_data+4)>1200?(113*(total_rate_data+4.5))+63:1200+"px"}}>
-                             {/*<span className="column-1 color-05101A mr16 width86">{k+1}</span>*/}
-                             <span className="column-1 color-05101A mr16 width86">平均分</span>
-                             {/*<span className="column-1 color-05101A ec_graduation_name mr16">{i.student_scores.name}</span>*/}
-                             {/*<span className="column-1 color999 ec_graduation_name mr16  ">{i.student_scores.student_number}</span>*/}
-                             {newTotal_rate_dataList(course_total_score-1,course_total_score)}
-                             {/* <span className="column-1 color-red operationright">{course_total_score.length===0?"":course_total_score[course_total_score-1].total_score}</span> */}
-                             {
-															 course_achievement===undefined||course_achievement===null||course_achievement===""||course_achievement==="0"||course_achievement===0? <span className="column-1 operationright">--</span>:<span className="column-1 color-red operationright">{course_achievement}</span>
-                             }
-                              </li>:""
+                            Spintype === false ? <li className={"clearfix newtarget_scoreclass lipadding10im bordereaeaea"} style={{ width: 113 * (total_rate_data + 4) > 1200 ? (113 * (total_rate_data + 4.5)) + 63 : 1200 + "px" }}>
+                                {/*<span className="column-1 color-05101A mr16 width86">{k+1}</span>*/}
+                                <span className="column-1 color-05101A mr16 width86">平均分</span>
+                                {/*<span className="column-1 color-05101A ec_graduation_name mr16">{i.student_scores.name}</span>*/}
+                                {/*<span className="column-1 color999 ec_graduation_name mr16  ">{i.student_scores.student_number}</span>*/}
+                                {newTotal_rate_dataList(course_total_score - 1, course_total_score)}
+                                {/* <span className="column-1 color-red operationright">{course_total_score.length===0?"":course_total_score[course_total_score-1].total_score}</span> */}
+                                {
+                                    course_achievement === undefined || course_achievement === null || course_achievement === "" || course_achievement === "0" || course_achievement === 0 ? <span className="column-1 operationright">--</span> : <span className="column-1 color-red operationright">{course_achievement}</span>
+                                }
+                            </li> : ""
                         }
 
 
-                        <li class="clearfix newtarget_scoreclass" style={{width: 113*(total_rate_data+4)>1136?113*(total_rate_data+4):1136+"px",display:morelisttype===true?"block":"none"}}>
-                            <a className={"ecmorelist"} onClick={()=>this.showmorelist()}>加载更多</a>
+                        <li className="clearfix newtarget_scoreclass" style={{ width: 113 * (total_rate_data + 4) > 1136 ? 113 * (total_rate_data + 4) : 1136 + "px", display: morelisttype === true ? "block" : "none" }}>
+                            <a className={"ecmorelist"} onClick={() => this.showmorelist()}>加载更多</a>
                         </li>
                     </div>
 
@@ -808,7 +798,7 @@ class EcCompletionCalculation extends Component {
                     <div className="edu-back-white eacourse">
 
                         <div className="padding1030" id="training_objective_contents">
-                            <span className="fl SystemParameters lineheight60" style={{height:'46px'}}>课程目标成绩分析</span>
+                            <span className="fl SystemParameters lineheight60" style={{ height: '46px' }}>课程目标成绩分析</span>
                         </div>
 
                     </div>
@@ -816,37 +806,37 @@ class EcCompletionCalculation extends Component {
 
                     <div className="ListTableLine newSystem mb20" id="school_major_list">
 
-                        <p  className="clearfix padding10im">
+                        <p className="clearfix padding10im">
                             <span className="column-1 color-666">课程目标</span>
                             <span className="column-1 color-666">平均分</span>
                             <span className="column-1 color-666">最高分数</span>
                             <span className="column-1 color-666">最低分数</span>
-													{
-														score_levels&&score_levels.map((i,k)=>{
-															return(
-																<span className="column-1 color-666">{i.description}</span>
-															)
-														})
-													}
+                            {
+                                score_levels && score_levels.map((i, k) => {
+                                    return (
+                                        <span className="column-1 color-666">{i.description}</span>
+                                    )
+                                })
+                            }
                         </p>
 
                         {
-                            Spintype===false?target_list.map((i,k)=>{
+                            Spintype === false ? target_list.map((i, k) => {
 
-                                return(
+                                return (
                                     <li className={"clearfix newtarget_scoreclass lipadding10im"} key={k}>
-                                        <span className="column-1 color-05101A">{k+1}</span>
+                                        <span className="column-1 color-05101A">{k + 1}</span>
                                         <span className="column-1 color-05101A">{i.standard_grade}</span>
-                                        <span className="column-1 colorFF6800">{i.maximum_score===null || i.maximum_score===undefined ||i.maximum_score===""?"--":i.maximum_score}</span>
-                                        <span className="column-1 color-green">{i.minimum_score===null || i.minimum_score===undefined || i.minimum_score===""?"--":i.minimum_score}</span>
+                                        <span className="column-1 colorFF6800">{i.maximum_score === null || i.maximum_score === undefined || i.maximum_score === "" ? "--" : i.maximum_score}</span>
+                                        <span className="column-1 color-green">{i.minimum_score === null || i.minimum_score === undefined || i.minimum_score === "" ? "--" : i.minimum_score}</span>
                                         {
-                                            i.score_levels.map((j,l)=>{
+                                            i.score_levels.map((j, l) => {
 
-                                                return(
-                                                  <span key={l} className="column-1 color-05101A">
+                                                return (
+                                                    <span key={l} className="column-1 color-05101A">
                                                         <div>{j.count}人</div>
-                                                        <div className="color999">{j.rate===null||j.rate===undefined||j.rate===""||j.rate===0?0.00:j.rate}%</div>
-                                                  </span>
+                                                        <div className="color999">{j.rate === null || j.rate === undefined || j.rate === "" || j.rate === 0 ? 0.00 : j.rate}%</div>
+                                                    </span>
                                                 )
                                             }
                                             )
@@ -881,43 +871,43 @@ class EcCompletionCalculation extends Component {
                                     </li>
                                 )
 
-                            }):""
+                            }) : ""
                         }
 
-                            { Spintype===true?<Spin className="Spinlarge"  indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" }
+                        {Spintype === true ? <Spin className="Spinlarge" indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />} /> : ""}
+
+                        {target_list.length === 0 && Spintype === false ?
+                            <li className={"clearfix newtarget_scoreclass lipadding10im"}>
+                                <span className="column-1 color-05101A">--</span>
+                                <span className="column-1 color-05101A">--</span>
+                                <span className="column-1 colorFF6800">--</span>
+                                <span className="column-1 color-green">--</span>
+                                <span className="column-1 color-05101A">
+                                    <div>--人</div>
+                                    <div className="color999">--%</div>
+                                </span>
+                                <span className="column-1 color-05101A">
+                                    <div>--人</div>
+                                    <div className="color999">--%</div>
+                                </span>
+                                <span className="column-1 color-05101A">
+                                    <div>--人</div>
+                                    <div className="color999">--%</div>
+                                </span>
+                                <span className="column-1 color-05101A">
+                                    <div>--人</div>
+                                    <div className="color999">--%</div>
+                                </span>
+                                <span className="column-1 color-05101A">
+                                    <div>--人</div>
+                                    <div className="color999">--%</div>
+                                </span>
+                                <span className="column-1 color-05101A">
+                                    <div>--人</div>
+                                    <div className="color999">--%</div>
+                                </span>
+                            </li> : ""}
 
-                            {target_list.length===0&&Spintype===false?
-                                    <li className={"clearfix newtarget_scoreclass lipadding10im"}>
-                                        <span className="column-1 color-05101A">--</span>
-                                        <span className="column-1 color-05101A">--</span>
-                                        <span className="column-1 colorFF6800">--</span>
-                                        <span className="column-1 color-green">--</span>
-                                        <span className="column-1 color-05101A">
-                                              <div>--人</div>
-                                              <div className="color999">--%</div>
-                                        </span>
-                                        <span className="column-1 color-05101A">
-                                              <div>--人</div>
-                                              <div className="color999">--%</div>
-                                        </span>
-                                        <span className="column-1 color-05101A">
-                                              <div>--人</div>
-                                              <div className="color999">--%</div>
-                                        </span>
-                                        <span className="column-1 color-05101A">
-                                              <div>--人</div>
-                                              <div className="color999">--%</div>
-                                        </span>
-                                        <span className="column-1 color-05101A">
-                                              <div>--人</div>
-                                              <div className="color999">--%</div>
-                                        </span>
-                                        <span className="column-1 color-05101A">
-                                              <div>--人</div>
-                                              <div className="color999">--%</div>
-                                        </span>
-                                    </li>:""}
-               
                     </div>
 
                 </div>
@@ -926,5 +916,5 @@ class EcCompletionCalculation extends Component {
     }
 }
 
-export default SnackbarHOC() (EcCompletionCalculation);
+export default SnackbarHOC()(EcCompletionCalculation);
 
diff --git a/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js b/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js
index 013357d4..0708051b 100644
--- a/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js
+++ b/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js
@@ -1,1049 +1,976 @@
 import React, { Component } from 'react';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import classNames from 'classnames'
-
-import axios from 'axios';
-
-// import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC';
-
 import { SnackbarHOC } from 'educoder'
-
-import { Select,InputNumber,message,Modal,Input,Radio,Spin,Icon,Tooltip } from 'antd';
-
-import 'antd/dist/antd.css';
+import axios from 'axios';
+import { Select, Modal, Input, Spin, Icon, Tooltip } from 'antd';
 
 import '../../css/ecCourseEvaluations.css';
-import EcTitleCourseEvaluations from "../../ecTitle/ecTitle";
 import './eccourseevalut.css'
 const $ = window.$;
 
 // 课程目标评价方法
 class EcCourseEvaluationsbottom extends Component {
-    constructor(props) {
-      super(props)
-      this.state={
-        totalevaluations_list:[],
-        ec_course_target_id:0,
-        achievement_list:[],
-        evaluations_listSelec:[],
-        evaluations_lists: [],
-        evaluation_subitems_lists: [],
-        evaluations_list:[],
-        evaluation_subitems_list:{},
-        achievement_methods:[],
-        ec_course_target_name:"",
-        buttomSaveCourseEvaluationsbottom:this.SaveCourseEvaluationsbottom,
-        spinningstate:true,
-        schooldata:{},
-        sequenceid:0,
-        target_id:null,
-        titlemessages:"提示",
-        Modallists:"",
-        eacoursetype:false,
-        eacoursesavetypes:false,
-        newec_course_idbottom:undefined,
-        methodologytype:false,
-        meweacoursetype:false,
-        newshowredvalue:false,
-        percentagetype:false,
-        ismanager:true
-      }
+  constructor(props) {
+    super(props)
+    this.state = {
+      totalevaluations_list: [],
+      ec_course_target_id: 0,
+      achievement_list: [],
+      evaluations_listSelec: [],
+      evaluations_lists: [],
+      evaluation_subitems_lists: [],
+      evaluations_list: [],
+      evaluation_subitems_list: {},
+      achievement_methods: [],
+      ec_course_target_name: "",
+      buttomSaveCourseEvaluationsbottom: this.SaveCourseEvaluationsbottom,
+      spinningstate: true,
+      schooldata: {},
+      sequenceid: 0,
+      target_id: null,
+      titlemessages: "提示",
+      Modallists: "",
+      eacoursetype: false,
+      eacoursesavetypes: false,
+      newec_course_idbottom: undefined,
+      methodologytype: false,
+      meweacoursetype: false,
+      newshowredvalue: false,
+      percentagetype: false,
+      ismanager: true
     }
-    getec_course_achievement_methods=()=>{
-      const {newec_course_idbottom}=this.state;
-      if(newec_course_idbottom!=undefined){
-          // const url ='ec_courses/:course_id/course_targets.json';
-          // const url = `/ec_course_achievement_methods?ec_course_id=`+newec_course_idbottom;
-				const course_id = 706
-          const  url =`/ec_courses/${course_id}/course_targets/course_achievement_methods.json`;
-          axios.get(url, {
-                withCredentials: true,
-              })
-            .then((response)=>{
-              this.setState({
-                achievement_list:response.data.course_targets,
-                spinningstate:false,
-                ismanager:true
-              })
-          }).catch(function (error) {
-                console.log(error);
-            });
-      }
-        // this.setState({
-        //     achievement_list:[
-        //         {course_achievement_methods: [
-        //                 {
-        //                     evaluate_id: 24,
-        //                     evaluate_name: "期末考试",
-        //                     course_evaluation_subitems: [
-        //                         {evaluation_relates_id: 31, evaluation_relates_name: "期末考试1目标1考题"},
-        //                         {evaluation_relates_id: 32, evaluation_relates_name: "期末考试1目标2考题"}
-        //                     ],
-        //                     percentage: 100,
-        //                     score: 15
-        //                 }
-        //             ],
-        //             target_id: 5
-        //         },
-        //     ],
-        //     spinningstate:false
-        // })
-
-
-    }
-
-    getNavigationData=(ec_course_id)=>{
-        // const jol =`/ec_major_schools/get_navigation_data?ec_year_id=`+ec_year_id+"&ec_course_id="+ec_course_id;
-        const jol =`/ec_major_schools/get_navigation_data?ec_course_id=`+ec_course_id;
-        axios.get(jol, {
-            withCredentials: true,
-        })
-            .then((response) => {
-                if(response.status===200){
-                //   if(response.data.allow_visit===false){
-                //     window.location.href="/403"
-                //  }
-                    this.setState({
-                        schooldata:response.data
-                    })
-                }
-
-            })
-            .catch(function (error) {
-                console.log(error);
-            });
-    }
-    componentDidMount(){
-         let ec_course_id=this.props.match.params.ec_course_id;
-         const course_id = 706
-         const  url =`/ec_courses/${course_id}/course_targets/with_achievement_methods.json`;
-			  // /ec_courses//course_targets/course_achievement_methods.json
-         // const url = `/ec_course_achievement_methods?ec_course_id=`+course_id;
-          axios.get(url)
-            .then((response)=>{
-              this.setState({
-                achievement_list:response.data.course_targets,
-                spinningstate:false,
-                ismanager:true
-              })
-          }).catch(function (error) {
-                console.log(error);
-            });
-    
-         // this.getNavigationData(ec_course_id);
-         this.setState({
-             newec_course_idbottom:course_id
-         })
-      this.props.Ontitine("evaluation_methods");
-    }
-    editecCourseEvaluationslist=(e)=>{
-        let id =e.target.getAttribute("target_id");
-        let newid =e.target.name;
-
-      this.setState({
-          buttomSaveCourseEvaluationsbottom:this.SaveCourseEvaluationsbottom,
-          target_id:id,
-          percentagetype:false
-       })
-      // $("#ecCourseEvaluationsbottomsubmit").show();
-      // $("#SystemParametersbottom").show();
-      // let offsettop=$("#ecCourseEvaluationsbottomsubmit").position().top||$("#ecCourseEvaluationsbottomsubmit").scrollTop || $("#ecCourseEvaluationsbottomsubmit").pageYOffset;
-      // window.scrollTo(0, offsettop)
-
-      let {evaluations_list,evaluation_subitems_list,achievement_methods} = this.state;
-      this.setState({
-        achievement_methods:undefined,
-        selectevaluation_phase:[],
-        course_select_value:'',
-        evaluations_lists:[],
-        sequenceid:newid,
-        methodologytype:false,
-        Modallists:' ',
-        meweacoursetype:false,
-        eacoursesavetypes:false,
-        newshowredvalue:false
-      })
-
-      let newevaluations_list=[];
-      let newevaluation_subitems_list=new Object ();
-      let newachievement_methods=[];
-      const url = `/ec_course_achievement_methods/edit_course_target?ec_course_target_id=`+id;
+  }
+  getec_course_achievement_methods = () => {
+    const { newec_course_idbottom } = this.state;
+    if (newec_course_idbottom != undefined) {
+      // const url ='ec_courses/:course_id/course_targets.json';
+      // const url = `/ec_course_achievement_methods?ec_course_id=`+newec_course_idbottom;
+      const course_id = 706
+      const url = `/ec_courses/${course_id}/course_targets/course_achievement_methods.json`;
       axios.get(url, {
-            withCredentials: true,
+        withCredentials: true,
+      })
+        .then((response) => {
+          this.setState({
+            achievement_list: response.data.course_targets,
+            spinningstate: false,
+            ismanager: true
           })
-        .then((response)=>{
-          if(response.status===200){
-          if(response.data.evaluation_phase_list.length===0){
+        }).catch(function (error) {
+          console.log(error);
+        });
+    }
+    // this.setState({
+    //     achievement_list:[
+    //         {course_achievement_methods: [
+    //                 {
+    //                     evaluate_id: 24,
+    //                     evaluate_name: "期末考试",
+    //                     course_evaluation_subitems: [
+    //                         {evaluation_relates_id: 31, evaluation_relates_name: "期末考试1目标1考题"},
+    //                         {evaluation_relates_id: 32, evaluation_relates_name: "期末考试1目标2考题"}
+    //                     ],
+    //                     percentage: 100,
+    //                     score: 15
+    //                 }
+    //             ],
+    //             target_id: 5
+    //         },
+    //     ],
+    //     spinningstate:false
+    // })
+
+
+  }
+
+  getNavigationData = (ec_course_id) => {
+    // const jol =`/ec_major_schools/get_navigation_data?ec_year_id=`+ec_year_id+"&ec_course_id="+ec_course_id;
+    const jol = `/ec_major_schools/get_navigation_data?ec_course_id=` + ec_course_id;
+    axios.get(jol, {
+      withCredentials: true,
+    })
+      .then((response) => {
+        if (response.status === 200) {
+          //   if(response.data.allow_visit===false){
+          //     window.location.href="/403"
+          //  }
+          this.setState({
+            schooldata: response.data
+          })
+        }
+
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+  }
+  componentDidMount() {
+    let ec_course_id = this.props.match.params.ec_course_id;
+    const course_id = 706
+    const url = `/ec_courses/${course_id}/course_targets/with_achievement_methods.json`;
+    // /ec_courses//course_targets/course_achievement_methods.json
+    // const url = `/ec_course_achievement_methods?ec_course_id=`+course_id;
+    axios.get(url)
+      .then((response) => {
+        this.setState({
+          achievement_list: response.data.course_targets,
+          spinningstate: false,
+          ismanager: true
+        })
+      }).catch(function (error) {
+        console.log(error);
+      });
+
+    // this.getNavigationData(ec_course_id);
+    this.setState({
+      newec_course_idbottom: course_id
+    })
+    this.props.Ontitine("evaluation_methods");
+  }
+  editecCourseEvaluationslist = (e) => {
+    let id = e.target.getAttribute("target_id");
+    let newid = e.target.name;
+
+    this.setState({
+      buttomSaveCourseEvaluationsbottom: this.SaveCourseEvaluationsbottom,
+      target_id: id,
+      percentagetype: false
+    })
+    // $("#ecCourseEvaluationsbottomsubmit").show();
+    // $("#SystemParametersbottom").show();
+    // let offsettop=$("#ecCourseEvaluationsbottomsubmit").position().top||$("#ecCourseEvaluationsbottomsubmit").scrollTop || $("#ecCourseEvaluationsbottomsubmit").pageYOffset;
+    // window.scrollTo(0, offsettop)
+
+    let { evaluations_list, evaluation_subitems_list, achievement_methods } = this.state;
+    this.setState({
+      achievement_methods: undefined,
+      selectevaluation_phase: [],
+      course_select_value: '',
+      evaluations_lists: [],
+      sequenceid: newid,
+      methodologytype: false,
+      Modallists: ' ',
+      meweacoursetype: false,
+      eacoursesavetypes: false,
+      newshowredvalue: false
+    })
+
+    let newevaluations_list = [];
+    let newevaluation_subitems_list = new Object();
+    let newachievement_methods = [];
+    const url = `/ec_course_achievement_methods/edit_course_target?ec_course_target_id=` + id;
+    axios.get(url, {
+      withCredentials: true,
+    })
+      .then((response) => {
+        if (response.status === 200) {
+          if (response.data.evaluation_phase_list.length === 0) {
             this.setState({
-              achievement_methods:undefined
+              achievement_methods: undefined
             })
-               let newObject=new Object ();
-               newachievement_methods.push(newObject)
+            let newObject = new Object();
+            newachievement_methods.push(newObject)
           }
 
-          if(response.data.evaluation_phase_list.length>0){
-            let evaluation_phase_list=response.data.evaluation_phase_list;
-            let evaluations_list=response.data.evaluations_list;
-            for(var i=0; i<evaluation_phase_list.length;i++){
-              let course_select_value=null;
-              let newevaluation_phase=evaluation_phase_list[i].evaluation_phase;
-              let selectevaluation_phase=[]
-              for(var j=0;j<response.data.evaluations_list.length;j++){
-                    if(evaluation_phase_list[i].evaluation_id===evaluations_list[j].id){
-                       course_select_value=evaluations_list[j].name
-                    }
+          if (response.data.evaluation_phase_list.length > 0) {
+            let evaluation_phase_list = response.data.evaluation_phase_list;
+            let evaluations_list = response.data.evaluations_list;
+            for (var i = 0; i < evaluation_phase_list.length; i++) {
+              let course_select_value = null;
+              let newevaluation_phase = evaluation_phase_list[i].evaluation_phase;
+              let selectevaluation_phase = []
+              for (var j = 0; j < response.data.evaluations_list.length; j++) {
+                if (evaluation_phase_list[i].evaluation_id === evaluations_list[j].id) {
+                  course_select_value = evaluations_list[j].name
+                }
               }
-              for(var z=0;z<newevaluation_phase.length;z++){
+              for (var z = 0; z < newevaluation_phase.length; z++) {
                 selectevaluation_phase.push(newevaluation_phase[z].name)
               }
-              let newObject={
-                course_evaluation_id:evaluation_phase_list[i].evaluation_id,
-                score:evaluation_phase_list[i].score,
+              let newObject = {
+                course_evaluation_id: evaluation_phase_list[i].evaluation_id,
+                score: evaluation_phase_list[i].score,
                 percentage: evaluation_phase_list[i].percentage,
-                evaluation_subitems:evaluation_phase_list[i].evaluation_phase,
-                course_select_value:course_select_value,
-                selectevaluation_phase:selectevaluation_phase
+                evaluation_subitems: evaluation_phase_list[i].evaluation_phase,
+                course_select_value: course_select_value,
+                selectevaluation_phase: selectevaluation_phase
               }
               newachievement_methods.push(newObject)
             }
 
           }
-          for(var i=0; i<response.data.evaluations_list.length;i++){
-                newevaluations_list.push(response.data.evaluations_list[i].name);
-                newevaluation_subitems_list[response.data.evaluations_list[i].name]=[];
-                for(var j=0; j<response.data.evaluations_list[i].evaluation_subitems_list.length;j++){
-                  newevaluation_subitems_list[response.data.evaluations_list[i].name].push(response.data.evaluations_list[i].evaluation_subitems_list[j].name)
-                }
+          for (var i = 0; i < response.data.evaluations_list.length; i++) {
+            newevaluations_list.push(response.data.evaluations_list[i].name);
+            newevaluation_subitems_list[response.data.evaluations_list[i].name] = [];
+            for (var j = 0; j < response.data.evaluations_list[i].evaluation_subitems_list.length; j++) {
+              newevaluation_subitems_list[response.data.evaluations_list[i].name].push(response.data.evaluations_list[i].evaluation_subitems_list[j].name)
             }
+          }
           // let newec_course_target_name="";
           // let newec_course_target_namelist=response.data.evaluations_list;
           //     for(var o=0; o<newec_course_target_namelist.length;o++){
           //       newec_course_target_name=newec_course_target_namelist[o].ec_course_target_name
           //     }
-            this.setState({
-              achievement_methods:newachievement_methods,
-              totalevaluations_list:response.data,
-              // ec_course_target_name:newec_course_target_name,
-              evaluations_list:newevaluations_list,
-              evaluation_subitems_list:newevaluation_subitems_list,
-              newec_course_target_id:id,
-              methodologytype:true,
-              ec_course_target_name:response.data.ec_course_target_name,
-              ismanager:true
-            })
+          this.setState({
+            achievement_methods: newachievement_methods,
+            totalevaluations_list: response.data,
+            // ec_course_target_name:newec_course_target_name,
+            evaluations_list: newevaluations_list,
+            evaluation_subitems_list: newevaluation_subitems_list,
+            newec_course_target_id: id,
+            methodologytype: true,
+            ec_course_target_name: response.data.ec_course_target_name,
+            ismanager: true
+          })
 
-            // this.setState({
-            //   // evaluations_lists: evaluation_subitems_list[evaluations_list[0]],
-            //   evaluation_subitems_lists: evaluation_subitems_list[evaluations_list[0]][0]
-            // })
-          }
-       }).catch(function (error) {
-            console.log(error);
-        });
+          // this.setState({
+          //   // evaluations_lists: evaluation_subitems_list[evaluations_list[0]],
+          //   evaluation_subitems_lists: evaluation_subitems_list[evaluations_list[0]][0]
+          // })
+        }
+      }).catch(function (error) {
+        console.log(error);
+      });
+  }
+
+  handleevaluations_list = (value, keythis) => {
+
+    let { evaluation_subitems_list, totalevaluations_list, achievement_methods } = this.state;
+    let newachievement_methods = achievement_methods;
+    let newlist = new Object();
+    let location = keythis.key;
+    let list = totalevaluations_list.evaluations_list;
+    // 点击切换清空
+    for (var z = 0; z < newachievement_methods.length; z++) {
+      if (z === location) {
+        newachievement_methods[z].evaluation_subitems = []
+      }
+    }
+    this.setState({
+      evaluations_lists: evaluation_subitems_list[value],
+      evaluation_subitems_lists: evaluation_subitems_list[value][0],
+      achievement_methods: newachievement_methods
+    });
+
+
+
+    if (newachievement_methods.length === 0) {
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].name === value) {
+          newlist.course_evaluation_id = list[i].id
+        }
+      }
+      newachievement_methods.push(newlist)
+    } else if (newachievement_methods.length > 0) {
+      if (newachievement_methods[location] === undefined) {
+        newachievement_methods.push(newlist)
+      }
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].name === value) {
+          newachievement_methods[location].course_evaluation_id = list[i].id
+          newachievement_methods[location].course_select_value = value
+          newachievement_methods[location].selectevaluation_phase = []
+        }
+      }
     }
 
-    handleevaluations_list=(value,keythis)=>{
+    this.setState({
+      achievement_methods: newachievement_methods
+    });
 
-      let {evaluation_subitems_list,totalevaluations_list,achievement_methods} = this.state;
-      let newachievement_methods=achievement_methods;
-      let newlist=new Object ();
-      let location=keythis.key;
-      let list=totalevaluations_list.evaluations_list;
-      // 点击切换清空
-        for(var z=0; z<newachievement_methods.length;z++){
-            if(z===location){
-                newachievement_methods[z].evaluation_subitems=[]
-            }
+  }
+  handevaluation_subitems_list = (value, keynum) => {
+    let { totalevaluations_list, achievement_methods } = this.state;
+    let newachievement_methods = [];
+    let id;
+    if (value.length > 0) {
+
+      newachievement_methods = achievement_methods
+      for (var j = 0; j < value.length; j++) {
+        if (!isNaN(keynum[j].key)) {
+          id = keynum[j].key
         }
-      this.setState({
-        evaluations_lists: evaluation_subitems_list[value],
-        evaluation_subitems_lists: evaluation_subitems_list[value][0],
-         achievement_methods:newachievement_methods
-      });
-
-
-
-      if(newachievement_methods.length===0){
-          for(var i=0; i<list.length;i++){
-            if(list[i].name===value){
-              newlist.course_evaluation_id=list[i].id
-            }
-          }
-          newachievement_methods.push(newlist)
-      }else if(newachievement_methods.length>0){
-          if(newachievement_methods[location]===undefined){
-              newachievement_methods.push(newlist)
-          }
-          for(var i=0; i<list.length;i++){
-            if(list[i].name===value){
-              newachievement_methods[location].course_evaluation_id=list[i].id
-              newachievement_methods[location].course_select_value=value
-              newachievement_methods[location].selectevaluation_phase=[]
-            }
-          }
       }
 
+      let list = [];
+
+      for (var k = 0; k < value.length; k++) {
+
+        for (var i = 0; i < totalevaluations_list.evaluations_list.length; i++) {
+          let newlist = totalevaluations_list.evaluations_list[i].evaluation_subitems_list;
+          for (var z = 0; z < newlist.length; z++) {
+            if (value[k] === newlist[z].name) {
+              let Objectlist = new Object();
+              Objectlist.id = newlist[z].id;
+              // Objectlist.name=newlist[z].name;
+              Objectlist.position = newlist[z].position;
+              list.push(Objectlist)
+            }
+          }
+        }
+      }
+      newachievement_methods[id].evaluation_subitems = list;
+      newachievement_methods[id].selectevaluation_phase = value;
       this.setState({
+        evaluation_subitems_lists: value,
         achievement_methods: newachievement_methods
       });
 
     }
-    handevaluation_subitems_list=(value,keynum)=>{
-      let{totalevaluations_list,achievement_methods}=this.state;
-      let newachievement_methods=[];
-      let id;
-      if(value.length>0){
+  }
 
-        newachievement_methods=achievement_methods
-        for(var j=0; j<value.length;j++){
-          if(!isNaN(keynum[j].key)){
-            id=keynum[j].key
+  handevaluation_Addlist = (value, keynum) => {
+    let id = parseInt(keynum.key);
+    let { achievement_methods } = this.state;
+    let newachievement_methods = achievement_methods;
+    for (var i = 0; i < newachievement_methods.length; i++) {
+      if (isNaN(id)) {
+        for (var j = 0; j < newachievement_methods[i].evaluation_subitems.length; j++) {
+          if (newachievement_methods[i].evaluation_subitems[j].name === value) {
+            newachievement_methods[i].evaluation_subitems.splice(j, 1);
+            newachievement_methods[i].selectevaluation_phase.splice(j, 1);
           }
         }
+      } else {
+        if (id === i) {
+          newachievement_methods[i].evaluation_subitems.splice(i, 1);
+          newachievement_methods[i].selectevaluation_phase.splice(i, 1);
+        }
+      }
+    }
+    this.setState({
+      achievement_methods: newachievement_methods
+    })
+  }
 
-        let list=[];
 
-        for(var k=0; k<value.length;k++){
+  handevaluation_CourseScore = (e) => {
+    let { achievement_methods } = this.state;
+    let newachievement_methods = achievement_methods;
+    let id = e.target.id;
+    var value = parseFloat(e.target.value);
+    for (var i = 0; i < newachievement_methods.length; i++) {
+      newachievement_methods[id].score = value
+    }
+    this.setState({
+      achievement_methods: newachievement_methods
+    })
+  }
+  handevaluation_CoursePercentag = (e) => {
+    let { achievement_methods } = this.state;
+    let newachievement_methods = achievement_methods;
+    let id = e.target.id;
+    let value = parseFloat(e.target.value);
 
-          for(var i=0; i<totalevaluations_list.evaluations_list.length;i++){
-            let newlist=totalevaluations_list.evaluations_list[i].evaluation_subitems_list;
-            for(var z=0; z<newlist.length; z++){
-                  if(value[k]===newlist[z].name){
-                    let Objectlist=new Object ();
-                    Objectlist.id=newlist[z].id;
-                    // Objectlist.name=newlist[z].name;
-                    Objectlist.position=newlist[z].position;
-                    list.push(Objectlist)
-                  }
-            }
-          }
-         }
-      newachievement_methods[id].evaluation_subitems=list;
-      newachievement_methods[id].selectevaluation_phase=value;
-       this.setState({
-        evaluation_subitems_lists: value,
-        achievement_methods:newachievement_methods
+    if (value > 100) {
+      // message.warning('占比请输入0~100的数');
+      this.setState({
+        Modallists: '占比请输入0~100的数',
+        meweacoursetype: true,
+        newshowredvalue: true
+      })
+      value = 100
+    }
+
+    if (value < 0) {
+      // message.warning('占比请输入0~100的数');
+      this.setState({
+        Modallists: '占比不能小于0',
+        meweacoursetype: true,
+        newshowredvalue: true
+      })
+      value = 0
+    }
+
+    if (value === "" || value === null || value === undefined) {
+      // message.warning('占比请输入0~100的数');
+      this.setState({
+        Modallists: '占比不能为空',
+        meweacoursetype: true,
+        newshowredvalue: true
+      })
+      value = 0
+    }
+
+    for (var i = 0; i < newachievement_methods.length; i++) {
+      newachievement_methods[id].percentage = value
+    }
+    this.setState({
+      achievement_methods: newachievement_methods
+    })
+  }
+
+  Addhandevaluation = (e) => {
+    let { achievement_methods } = this.state;
+    let newachievement_methods = achievement_methods;
+    let newlist = new Object();
+    newachievement_methods.push(newlist);
+    this.setState({
+      achievement_methods: newachievement_methods
+    });
+  }
+  Delethandevaluation = (e) => {
+    let { achievement_methods } = this.state;
+    let id = e.target.getAttribute("index");
+    let newachievement_methods = achievement_methods;
+    newachievement_methods.splice(id, 1);
+    this.setState({
+      achievement_methods: newachievement_methods
+    });
+  }
+
+
+  EvaluationsSaveonloadgetdata = (id) => {
+    const course_id = 706;
+    const url = `/ec_courses/${course_id}/course_targets/with_achievement_methods.json`;
+    axios.get(url, {
+      withCredentials: true,
+    })
+      .then((response) => {
+        this.setState({
+          achievement_list: response.data.course_targets,
+          spinningstate: false,
+          ismanager: true
+        })
+
+      }).catch(function (error) {
+        console.log(error);
+        this.setState({
+          spinningstate: false
+        })
       });
 
-      }
-    }
 
-    handevaluation_Addlist=(value,keynum)=>{
-      let id=parseInt(keynum.key);
-      let{achievement_methods}=this.state;
-      let newachievement_methods=achievement_methods;
-      for(var i=0; i<newachievement_methods.length;i++){
-          if(isNaN(id)){
-              for(var j=0; j< newachievement_methods[i].evaluation_subitems.length; j++){
-                  if(newachievement_methods[i].evaluation_subitems[j].name===value){
-                      newachievement_methods[i].evaluation_subitems.splice(j,1);
-                      newachievement_methods[i].selectevaluation_phase.splice(j,1);
-                  }
-              }
-          }else{
-              if(id===i){
-                  newachievement_methods[i].evaluation_subitems.splice(i,1);
-                  newachievement_methods[i].selectevaluation_phase.splice(i,1);
-              }
-          }
-      }
-      this.setState({
-        achievement_methods:newachievement_methods
-      })
-    }
+  }
+  ecrestoration = () => {
+    this.setState({
+      buttomSaveCourseEvaluationsbottom: this.SaveCourseEvaluationsbottom
+    })
+  }
+
+  SaveCourseEvaluationsbottom = () => {
+    let ec_course_id = this.props.match.params.ec_course_id;
+    this.setState({
+      buttomSaveCourseEvaluationsbottom: '',
+      percentagetype: true
+    })
+    let { newec_course_target_id, achievement_methods } = this.state;
 
 
-    handevaluation_CourseScore=(e)=>{
-      let {achievement_methods} = this.state;
-      let newachievement_methods=achievement_methods;
-      let id=e.target.id;
-      var value=parseFloat(e.target.value);
-      for(var i=0; i<newachievement_methods.length;i++){
-        newachievement_methods[id].score=value
-      }
-      this.setState({
-        achievement_methods:newachievement_methods
-      })
-    }
-    handevaluation_CoursePercentag=(e)=>{
-      let {achievement_methods} = this.state;
-      let newachievement_methods=achievement_methods;
-      let id=e.target.id;
-      let value=parseFloat(e.target.value);
-
-        if(value>100){
-        // message.warning('占比请输入0~100的数');
+    for (var j = 0; j < achievement_methods.length; j++) {
+      if (achievement_methods[j].course_evaluation_id === undefined) {
+        // message.error('提交失败！请选择该目标评价环节');
         this.setState({
-            Modallists:'占比请输入0~100的数',
-            meweacoursetype:true,
-            newshowredvalue:true
+          Modallists: '提交失败,评价环节不能为空',
+          meweacoursetype: true,
+          eacoursesavetypes: true
         })
-        value=100
+        this.ecrestoration();
+        return;
       }
 
-        if(value<0){
-            // message.warning('占比请输入0~100的数');
-            this.setState({
-                Modallists:'占比不能小于0',
-                meweacoursetype:true,
-                newshowredvalue:true
-            })
-            value=0
-        }
-
-        if(value===""||value===null||value===undefined){
-            // message.warning('占比请输入0~100的数');
-            this.setState({
-                Modallists:'占比不能为空',
-                meweacoursetype:true,
-                newshowredvalue:true
-            })
-            value=0
-        }
-
-      for(var i=0; i<newachievement_methods.length;i++){
-        newachievement_methods[id].percentage=value
-      }
-      this.setState({
-        achievement_methods:newachievement_methods
-      })
-    }
-
-    Addhandevaluation=(e)=>{
-      let {achievement_methods} = this.state;
-      let newachievement_methods=achievement_methods;
-      let newlist=new Object ();
-      newachievement_methods.push(newlist);
-      this.setState({
-        achievement_methods:newachievement_methods
-     });
-    }
-    Delethandevaluation=(e)=>{
-      let {achievement_methods} = this.state;
-      let id =e.target.getAttribute("index");
-      let newachievement_methods=achievement_methods;
-      newachievement_methods.splice(id,1);
-      this.setState({
-        achievement_methods:newachievement_methods
-     });
-    }
-
-
-    EvaluationsSaveonloadgetdata=(id)=>{
-			const course_id = 706;
-      const url = `/ec_courses/${course_id}/course_targets/with_achievement_methods.json`;
-      axios.get(url, {
-            withCredentials: true,
-          })
-        .then((response)=>{
-          this.setState({
-            achievement_list:response.data.course_targets,
-            spinningstate:false,
-            ismanager:true
-          })
-
-       }).catch(function (error) {
-            console.log(error);
-            this.setState({
-              spinningstate:false
-            })
-        });
-
-
-     }
-     ecrestoration=()=>{
-      this.setState({
-        buttomSaveCourseEvaluationsbottom:this.SaveCourseEvaluationsbottom
-       })
-     }
-
-    SaveCourseEvaluationsbottom=()=>{
-      let ec_course_id=this.props.match.params.ec_course_id;
+      if (achievement_methods[j].evaluation_subitems === undefined) {
+        // message.error('提交失败！请选择支撑项');
         this.setState({
-          buttomSaveCourseEvaluationsbottom:'',
-          percentagetype:true
+          Modallists: '提交失败,支撑项内容不能为空',
+          meweacoursetype: true,
+          eacoursesavetypes: true
         })
-      let {newec_course_target_id,achievement_methods} = this.state;
-
-
-      for(var j=0; j<achievement_methods.length;j++){
-        if(achievement_methods[j].course_evaluation_id===undefined){
-          // message.error('提交失败！请选择该目标评价环节');
-            this.setState({
-                Modallists:'提交失败,评价环节不能为空',
-                meweacoursetype:true,
-                eacoursesavetypes:true
-            })
-          this.ecrestoration();
-          return;
-        }
-
-        if(achievement_methods[j].evaluation_subitems===undefined){
-          // message.error('提交失败！请选择支撑项');
-            this.setState({
-                Modallists:'提交失败,支撑项内容不能为空',
-                meweacoursetype:true,
-                eacoursesavetypes:true
-            })
-          this.ecrestoration();
-          return;
-        }
-        if(achievement_methods[j].score===undefined||achievement_methods[j].score===NaN||achievement_methods[j].score===null){
-          // message.error('提交失败！请填写支撑分数！');
-            this.setState({
-                Modallists:'提交失败,支撑分数不能为空',
-                meweacoursetype:true,
-                eacoursesavetypes:true
-            })
-          this.ecrestoration();
-          return;
-        }
-
-        if(achievement_methods[j].percentage===undefined||achievement_methods[j].percentage===NaN||achievement_methods[j].percentage===null){
-          // message.error('提交失败！请填写占比！');
-            this.setState({
-                Modallists:'提交失败,占比不能为空',
-                meweacoursetype:true,
-                eacoursesavetypes:true,
-                newshowredvalue:true
-            })
-          this.ecrestoration();
-          return;
-        }
-
-
+        this.ecrestoration();
+        return;
       }
-
-      let percentagenum=0;
-      for(var o=0;o<achievement_methods.length;o++){
-        percentagenum=percentagenum+achievement_methods[o].percentage;
-      }
-      if(percentagenum>100){
-        // message.error('提交失败！支撑占比不能超过总和100%');
-          this.setState({
-              Modallists:'提交失败,支撑占比不能超过总和100%',
-              meweacoursetype:true,
-              newshowredvalue:true,
-              percentagetype:true
-          })
+      if (achievement_methods[j].score === undefined || achievement_methods[j].score === NaN || achievement_methods[j].score === null) {
+        // message.error('提交失败！请填写支撑分数！');
         this.setState({
-          buttomSaveCourseEvaluationsbottom:this.SaveCourseEvaluationsbottom
-         })
-        return
+          Modallists: '提交失败,支撑分数不能为空',
+          meweacoursetype: true,
+          eacoursesavetypes: true
+        })
+        this.ecrestoration();
+        return;
       }
-      if(percentagenum<100){
-        // message.error('提交失败！支撑占比不能超过总和100%');
-          this.setState({
-              Modallists:'提交失败,支撑占比总和要等于100%',
-              meweacoursetype:true,
-              newshowredvalue:true,
-              percentagetype:true
-          })
+
+      if (achievement_methods[j].percentage === undefined || achievement_methods[j].percentage === NaN || achievement_methods[j].percentage === null) {
+        // message.error('提交失败！请填写占比！');
         this.setState({
-          buttomSaveCourseEvaluationsbottom:this.SaveCourseEvaluationsbottom
-         })
-        return
+          Modallists: '提交失败,占比不能为空',
+          meweacoursetype: true,
+          eacoursesavetypes: true,
+          newshowredvalue: true
+        })
+        this.ecrestoration();
+        return;
       }
-      for(var i=0;i<achievement_methods.length;i++){
-        if(JSON.stringify(achievement_methods[i])==="{}"){
-          achievement_methods.splice(i,1);
-        }else{
-          delete achievement_methods[i].course_select_value;
-          delete achievement_methods[i].selectevaluation_phase;
-          for(var j=0; j< achievement_methods[i].evaluation_subitems.length;j++){
-            delete achievement_methods[i].evaluation_subitems[j].evaluation_subitem_id;
-            delete achievement_methods[i].evaluation_subitems[j].name;
-          }
+
+
+    }
+
+    let percentagenum = 0;
+    for (var o = 0; o < achievement_methods.length; o++) {
+      percentagenum = percentagenum + achievement_methods[o].percentage;
+    }
+    if (percentagenum > 100) {
+      // message.error('提交失败！支撑占比不能超过总和100%');
+      this.setState({
+        Modallists: '提交失败,支撑占比不能超过总和100%',
+        meweacoursetype: true,
+        newshowredvalue: true,
+        percentagetype: true
+      })
+      this.setState({
+        buttomSaveCourseEvaluationsbottom: this.SaveCourseEvaluationsbottom
+      })
+      return
+    }
+    if (percentagenum < 100) {
+      // message.error('提交失败！支撑占比不能超过总和100%');
+      this.setState({
+        Modallists: '提交失败,支撑占比总和要等于100%',
+        meweacoursetype: true,
+        newshowredvalue: true,
+        percentagetype: true
+      })
+      this.setState({
+        buttomSaveCourseEvaluationsbottom: this.SaveCourseEvaluationsbottom
+      })
+      return
+    }
+    for (var i = 0; i < achievement_methods.length; i++) {
+      if (JSON.stringify(achievement_methods[i]) === "{}") {
+        achievement_methods.splice(i, 1);
+      } else {
+        delete achievement_methods[i].course_select_value;
+        delete achievement_methods[i].selectevaluation_phase;
+        for (var j = 0; j < achievement_methods[i].evaluation_subitems.length; j++) {
+          delete achievement_methods[i].evaluation_subitems[j].evaluation_subitem_id;
+          delete achievement_methods[i].evaluation_subitems[j].name;
         }
       }
+    }
 
 
-      // var Url = '/ec_course_achievement_methods/create_evaluation_methods';
-      var Url = '/ec_courses/:course_id/course_targets/:target_id/course_achievement_methods.json';
+    // var Url = '/ec_course_achievement_methods/create_evaluation_methods';
+    var Url = '/ec_courses/:course_id/course_targets/:target_id/course_achievement_methods.json';
 
-      axios.post(Url, {
-        ec_course_target_id: newec_course_target_id,
-        achievement_methods:achievement_methods
-      },
+    axios.post(Url, {
+      ec_course_target_id: newec_course_target_id,
+      achievement_methods: achievement_methods
+    },
       {
         withCredentials: true
       }
-      ).then((response) => {
-        if(response.data.status===0){
-            this.setState({
-              target_id:null,
-              newec_course_idbottom:response.data.ec_course_id,
-              buttomSaveCourseEvaluationsbottom:this.SaveCourseEvaluationsbottom,
-              // Modallists:response.data.message,
-              // eacoursetype:true,
-              Modallists:' ',
-              meweacoursetype:false,
-              achievement_methods:undefined,
-              eacoursesavetypes:false,
-              newshowredvalue:false,
-              ismanager:true
-            })
-            // $("#ecCourseEvaluationsbottomsubmit").hide();
-            // $("#SystemParametersbottom").hide();
-            this.EvaluationsSaveonloadgetdata(response.data.ec_course_id);
-            this.getNavigationData(ec_course_id);
-
-        }else if(response.data.status===-1){
-           this.setState({
-            buttomSaveCourseEvaluationsbottom:this.SaveCourseEvaluationsbottom,
-            Modallists:response.data.message,
-            eacoursetype:true,
-           })
-        }
-      }).catch((error) => {
-        console.log(error)
-      })
-    }
-    CancelecCourseEvaluationsbottom=()=>{
-      this.setState({
-        achievement_methods:undefined,
-        target_id:null,
-        methodologytype:false,
-        Modallists:' ',
-        meweacoursetype:false,
-        eacoursesavetypes:false,
-        newshowredvalue:false,
-        percentagetype:false
-      })
-      // $("#ecCourseEvaluationsbottomsubmit").hide();
-      // $("#SystemParametersbottom").hide();
-      this.getec_course_achievement_methods();
-    }
-
-    selectsonFocuslist=(e,key)=>{
-       let value =e.course_select_value;
-       let {evaluation_subitems_list,totalevaluations_list,achievement_methods} = this.state;
-       let newachievement_methods=achievement_methods;
-       let newlist=new Object ();
-       let location=key;
-       let list=totalevaluations_list.evaluations_list;
-       this.setState({
-         evaluations_lists: evaluation_subitems_list[value],
-         evaluation_subitems_lists: evaluation_subitems_list[value][0]
-       });
-
-       if(newachievement_methods.length===0){
-           for(var i=0; i<list.length;i++){
-             if(list[i].name===value){
-               newlist.course_evaluation_id=list[i].id
-             }
-           }
-           newachievement_methods.push(newlist)
-       }else if(newachievement_methods.length>0){
-           if(newachievement_methods[location]===undefined){
-               newachievement_methods.push(newlist)
-           }
-           for(var i=0; i<list.length;i++){
-             if(list[i].name===value){
-               newachievement_methods[location].course_evaluation_id=list[i].id
-             }
-           }
-       }
-
-       this.setState({
-         achievement_methods: newachievement_methods
-       });
-    }
-
-    hidemodeleacourse=()=>{
+    ).then((response) => {
+      if (response.data.status === 0) {
         this.setState({
-            eacoursetype:false
+          target_id: null,
+          newec_course_idbottom: response.data.ec_course_id,
+          buttomSaveCourseEvaluationsbottom: this.SaveCourseEvaluationsbottom,
+          // Modallists:response.data.message,
+          // eacoursetype:true,
+          Modallists: ' ',
+          meweacoursetype: false,
+          achievement_methods: undefined,
+          eacoursesavetypes: false,
+          newshowredvalue: false,
+          ismanager: true
         })
+        // $("#ecCourseEvaluationsbottomsubmit").hide();
+        // $("#SystemParametersbottom").hide();
+        this.EvaluationsSaveonloadgetdata(response.data.ec_course_id);
+        this.getNavigationData(ec_course_id);
+
+      } else if (response.data.status === -1) {
+        this.setState({
+          buttomSaveCourseEvaluationsbottom: this.SaveCourseEvaluationsbottom,
+          Modallists: response.data.message,
+          eacoursetype: true,
+        })
+      }
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+  CancelecCourseEvaluationsbottom = () => {
+    this.setState({
+      achievement_methods: undefined,
+      target_id: null,
+      methodologytype: false,
+      Modallists: ' ',
+      meweacoursetype: false,
+      eacoursesavetypes: false,
+      newshowredvalue: false,
+      percentagetype: false
+    })
+    // $("#ecCourseEvaluationsbottomsubmit").hide();
+    // $("#SystemParametersbottom").hide();
+    this.getec_course_achievement_methods();
+  }
+
+  selectsonFocuslist = (e, key) => {
+    let value = e.course_select_value;
+    let { evaluation_subitems_list, totalevaluations_list, achievement_methods } = this.state;
+    let newachievement_methods = achievement_methods;
+    let newlist = new Object();
+    let location = key;
+    let list = totalevaluations_list.evaluations_list;
+    this.setState({
+      evaluations_lists: evaluation_subitems_list[value],
+      evaluation_subitems_lists: evaluation_subitems_list[value][0]
+    });
+
+    if (newachievement_methods.length === 0) {
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].name === value) {
+          newlist.course_evaluation_id = list[i].id
+        }
+      }
+      newachievement_methods.push(newlist)
+    } else if (newachievement_methods.length > 0) {
+      if (newachievement_methods[location] === undefined) {
+        newachievement_methods.push(newlist)
+      }
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].name === value) {
+          newachievement_methods[location].course_evaluation_id = list[i].id
+        }
+      }
     }
-  	render() {
-      const Option = Select.Option;
-      let {schooldata,achievement_list,spinningstate,evaluations_list,evaluations_lists,newec_course_target_id,achievement_methods,ec_course_target_name,buttomSaveCourseEvaluationsbottom,sequenceid,target_id,
-          titlemessages,
-          Modallists,
-          eacoursetype,
-          eacoursesavetypes,
-          methodologytype,
-          newec_course_idbottom,
-          meweacoursetype,
-          percentagetype,
-          ismanager
-      } = this.state;
-      // console.log("EcCourseEvaluationsbottom12345");
-      // console.log(achievement_list);
-	    return (
-        <div className="newMain clearfix">
-          <div className="educontent mb50">
-              <Modal
-                  title={titlemessages}
-                  // visible={modeldelet===true&&listid===list.id?true:false}
-                  visible={eacoursetype}
-                  className={"ecmodeldelet"}
-                  closable={false}
-                  footer={null}
+
+    this.setState({
+      achievement_methods: newachievement_methods
+    });
+  }
+
+  hidemodeleacourse = () => {
+    this.setState({
+      eacoursetype: false
+    })
+  }
+  render() {
+    const Option = Select.Option;
+    let { schooldata, achievement_list, spinningstate, evaluations_list, evaluations_lists, newec_course_target_id, achievement_methods, ec_course_target_name, buttomSaveCourseEvaluationsbottom, sequenceid, target_id,
+      titlemessages,
+      Modallists,
+      eacoursetype,
+      eacoursesavetypes,
+      methodologytype,
+      newec_course_idbottom,
+      meweacoursetype,
+      percentagetype,
+      ismanager
+    } = this.state;
+    // console.log("EcCourseEvaluationsbottom12345");
+    // console.log(achievement_list);
+    return (
+      <div className="newMain clearfix">
+        <div className="educontent mb50">
+          <Modal
+            title={titlemessages}
+            // visible={modeldelet===true&&listid===list.id?true:false}
+            visible={eacoursetype}
+            className={"ecmodeldelet"}
+            closable={false}
+            footer={null}
+          >
+            <div className="task-popup-content"  >
+              <div className="task-popup-text-center font-14">{Modallists}</div>
+            </div>
+            <div className="task-popup-submit clearfix">
+              <a onClick={this.hidemodeleacourse} className="task-btn fl">取消</a>
+              <a className="task-btn task-btn-orange fr"
+                onClick={this.hidemodeleacourse}
+              >确定</a>
+            </div>
+          </Modal>
+
+          <div className="ListTableLine newSystem" id="school_major_list">
+
+            <p className="clearfix Coursetitle" style={{ width: "1200px" }}>
+              <span className="column-1 color-666">课程目标</span>
+              <span className="column-1 color-666">评价环节</span>
+              <span className="column-1 ml15 color-666">数据内容</span>
+              <span className="column-1 operationright color-666 f5f5f5"
               >
-                  <div className="task-popup-content"  >
-                      <div className="task-popup-text-center font-14">{Modallists}</div>
-                  </div>
-                  <div className="task-popup-submit clearfix">
-                      <a onClick={this.hidemodeleacourse} className="task-btn fl">取消</a>
-                      <a  className="task-btn task-btn-orange fr"
-                          onClick={this.hidemodeleacourse}
-                      >确定</a>
-                  </div>
-              </Modal>
-
-              {/*导航*/}
-              {/*<div className="edu-back-white eacourse">*/}
-
-                  {/*<p className="clearfix padding20-30 bor-bottom-greyE" id="SystemParametersP">*/}
-                      {/*<a href={schooldata.course_setting_url} className="TrainingLecturer color-grey-9">课程列表 > </a>*/}
-                      {/*<a className="TrainingTheory major_name"> {schooldata.ec_course_name} 课程考核方式与数据来源</a>*/}
-                      {/*/!* <span className="fl font-18 courseSystem"></span> *!/*/}
-                      {/*/!* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> *!/*/}
-                      {/*<span className="Importclassroomdata" style={{top: '22px'}}><a className="white-btn edu-blueback-btn fr mb10 mr10">导出策略</a></span>*/}
-                  {/*</p>*/}
-
-                  {/*<div className="padding20-30" id="SystemParameters">*/}
-                      {/*<span className="fl SystemParameters">课程考核标准</span>*/}
-                      {/*<span className="fl ml20 SystemParameters">（请在完成配置后，使用各项成绩导入模板，将本学年所有参与的学生成绩数据导入系统）</span>*/}
-                      {/*<span className="fr ml20 SystemParameters" style={{display:course_name===null||course_name===undefined?"none":"block",height:'37px'}}><span className="ecblock">在线课堂:</span><a href={course_url} target="_blank" className="ecnowrap" data-tip-down={course_name}>{course_name}</a></span>*/}
-                      {/*<span className="Importclassroomdata" style={{display:course_name===null||course_name===undefined?"none":"block"}}><a onClick={this.sync_course_data} className="white-btn edu-orangeback-btn  fr mt2 mr10">导入课堂数据</a></span>*/}
-                  {/*</div>*/}
-
-              {/*</div>*/}
-              {/*<EcTitleCourseEvaluations*/}
-              {/*    {...this.props}*/}
-              {/*    schooldata={schooldata}*/}
-              {/*    ecpath={"show"}*/}
-              {/*/>*/}
-
-                {/*<div className="edu-back-white eacourse">*/}
-
-                {/*    <p className="clearfix padding20-30 bor-bottom-greyE" id="SystemParametersP">*/}
-                {/*        <a href={schooldata.course_setting_url} className="TrainingLecturer color-grey-9">课程体系 </a> >*/}
-                {/*        <a className="TrainingTheory major_name"> {schooldata.ec_course_name} </a>*/}
-                {/*        <div className="color-grey-9 mr10">请结合本课程的教学情况，修改说明每个课程目标的评价环节和评估方式  <a className={"color-blue"} onClick={() => window.elasticLayer(3533)}>查看详情</a></div>*/}
-
-                {/*      /!*课程考核方式与数据来源*!/*/}
-                {/*        /!* <span className="fl font-18 courseSystem"></span> *!/*/}
-                {/*        /!* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> *!/*/}
-                {/*        <span className="Importclassroomdata" style={{top: '22px'}}>*/}
-                {/*           <a className="white-btn edu-blueback-btn fr mb10 mr10" target="_blank" href={'/ec_courses/'+newec_course_idbottom+'/export_ec_course_targets?format=xls'}>导出评价方法</a>*/}
-                {/*        </span>*/}
-                {/*    </p>*/}
-
-                {/*    <div className="padding20-30" id="SystemParameters">*/}
-                {/*      /!*<span className="fl SystemParameters">课程目标达成方法</span>*!/*/}
-                {/*        <a className="fl SystemParameters color4D4D4D" style={{display:schooldata.ec_course_support_setting_url===null?"none":"block",marginLeft: '9px' }}*/}
-                {/*           href={schooldata.ec_course_support_setting_url}>1.课程目标</a>*/}
-                {/*        <a className="fl ml40 SystemParameters4CACFF color4D4D4D"*/}
-                {/*           style={{display:schooldata.ec_course_reach_setting_url===null?"none":"block"}}*/}
-                {/*           href={schooldata.ec_course_reach_setting_url}>2.课程考核方式与数据来源</a>*/}
-                {/*        <a className="fl SystemParameters4CACFF ml40 color4D4D4D"*/}
-                {/*          href={schooldata.score_level_setting_url}*/}
-                {/*        >3.成绩等级设置</a>*/}
-                {/*        <a className="fl ml40 SystemParameters4CACFF color4CACFF"*/}
-                {/*           style={{display:schooldata.evaluation_methods_url===null?"none":"block"}}*/}
-                {/*           href={schooldata.evaluation_methods_url}>4.课程目标评价方法</a>*/}
-                {/*        <a className="fl SystemParameters ml40 color4D4D4D"*/}
-                {/*           style={{display:schooldata.competition_calculation_info_url===null?"none":"block"}}*/}
-                {/*           href={schooldata.competition_calculation_info_url}>5.课程达成评价结果</a>*/}
-                {/*      <span className="fr ml20 SystemParameters" style={{color: '#989898'}}>（各环节平均得分*占比）之和/（各环节总分*占比）之和</span>*/}
-                {/*    </div>*/}
-
-                {/*</div>*/}
-
-                <div className="ListTableLine newSystem" id="school_major_list">
-
-                        <p className="clearfix Coursetitle" style={{width:"1200px"}}>
-                          <span className="column-1 color-666">课程目标</span>
-                          <span className="column-1 color-666">评价环节</span>
-                          <span className="column-1 ml15 color-666">数据内容</span>
-                          <span className="column-1 operationright color-666 f5f5f5"
-                          >
-                             操作 
+                操作
                           </span>
-                          <span className="column-1 ml30 operationright color-666">评价占比</span>
-                          <span className="column-1 ml15 operationright color-666">支撑总分值</span>
-                        </p>
+              <span className="column-1 ml30 operationright color-666">评价占比</span>
+              <span className="column-1 ml15 operationright color-666">支撑总分值</span>
+            </p>
 
-                        {
-                          achievement_list===undefined?"":achievement_list&&achievement_list.length===0?<Spin spinning={spinningstate} className="Spinlarge"  indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:achievement_list&&achievement_list.map((item,key)=>{
-                            return(
-                                    <div key={key} >
+            {
+              achievement_list === undefined ? "" : achievement_list && achievement_list.length === 0 ? <Spin spinning={spinningstate} className="Spinlarge" indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />} /> : achievement_list && achievement_list.map((item, key) => {
+                return (
+                  <div key={key} >
+                    {
+                      item.course_achievement_methods.length === 0 ?
+                        <li key={key} className="clearfix" >
+                          <div style={{ width: '99.8%' }} className={"yslpadding"} style={{ display: parseInt(target_id) === item.id ? "none" : "block" }}>
+                            <span className="column-1 mt4 textaligncenters"><span>{key + 1}</span></span>
+                            <span>
+                              <span className="column-1 textaligncenters mt4">
+                                <span></span>
+                              </span>
+                              <span className="column-1 ml15 textaligncenters color99 mt4 newtextaligncenter evaluationdataClassy">
+                                <span></span>
+                              </span>
+                              <span className="column-1 operationright mt4">
+                                <div className="operationColumn">
+                                  <div className="right operationalter nulleditSubentry" style={{ display: ismanager === false ? 'none' : 'block' }}>
+                                    <a className="mr16 editSubentry" data-tip-down="编辑" ><i target_id={item.id} name={key} onClick={this.editecCourseEvaluationslist.bind(this)} className="iconfont icon-bianjidaibeijing color-green" ></i></a>
+                                  </div>
+                                </div>
+                              </span>
+
+
+                              <span className="column-1  operationright mt4 percentages">
+                                <div></div>
+                              </span>
+
+                              <span className="column-1 mr20 operationright mt4">
+                                <div className="ColorF68"></div>
+                              </span>
+
+                            </span>
+                          </div>
+
+                          {/* 修改start*/}
+                          <div className="ListTableLine newSystem" id="EvaluationsList">
+                            <div style={{ display: parseInt(target_id) === item.id ? "block" : "none" }} >
+                              {/* <div className="edu-back-white eacourse" id="SystemParametersbottom" style={{display:parseInt(sequenceid)===key?"block":"none"}}> */}
+                              <div className="edu-back-white eacourse" id="SystemParametersbottom" style={{ display: parseInt(target_id) === item.id ? "block" : "none" }}>
+                                <div className="padding20-30" id="SystemParameters" style={{ paddingLeft: '0px' }}>
+                                  {/* <span className="fl SystemParameters">课程目标{sequenceid}：{ec_course_target_name}</span> */}
+                                  <span className="fl SystemParameters">课程目标{key + 1}：{ec_course_target_name}</span>
+                                </div>
+                              </div>
+                              {
+                                achievement_methods === undefined ? " " : achievement_methods.map((item, itemkey) => {
+                                  return (
+                                    <div key={itemkey} className="clearfix editorModify"  >
+                                      <div className="">
+                                        <span className="column-1 mr12" style={{ paddingLeft: '0px' }}>评价环节</span>
+                                        <Select
+                                          // className={item.course_select_value===undefined&&eacoursesavetypes===true? "inputWeight  bor-red": "inputWeight"}
+                                          className={item.course_select_value === undefined && eacoursesavetypes === true ? Modallists === '提交失败,评价环节不能为空' ? "inputWeight  bor-red" : "inputWeight" : "inputWeight"}
+
+                                          placeholder="请选择该目标的评价环节"
+                                          size="large"
+                                          style={{ width: '20%' }}
+                                          value={item.course_select_value}
+                                          onChange={this.handleevaluations_list.bind(this)}
+                                        >
+                                          {evaluations_list.map(province => <Option value={province} key={itemkey}>{province}</Option>)}
+
+                                        </Select>
+
+                                        <span className="column-1 mr13"></span>
+
+                                        <Select
+                                          mode="multiple"
+                                          // className={item.selectevaluation_phase===undefined&&eacoursesavetypes===true? "inputWeight  bor-red": "inputWeight"}
+                                          className={item.selectevaluation_phase === undefined && eacoursesavetypes === true ? Modallists === '提交失败,支撑项内容不能为空' ? "inputWeight bor-red" : "inputWeight" : "inputWeight"}
+
+                                          placeholder="请选择具体数据内容"
+                                          size="large"
+                                          id="Coursemultiple"
+                                          style={{ width: '37%' }}
+                                          onChange={this.handevaluation_subitems_list.bind(this)}
+                                          onDeselect={this.handevaluation_Addlist.bind(this)}
+                                          value={item.selectevaluation_phase}
+                                          onFocus={() => this.selectsonFocuslist(item, itemkey)}
+                                        >
+                                          {evaluations_lists.map(city => <Option value={city} key={itemkey}>{city}</Option>)}
+                                        </Select>
+
+                                        <span className="column-1 mr14"></span>
+                                        <Input size="large" type="number" value={item.score}
+                                          className={item.score === undefined && eacoursesavetypes === true ? Modallists === '提交失败,支撑分数不能为空' ? "bor-red" : "" : ""}
+                                          onInput={this.handevaluation_CourseScore.bind(this)} id={itemkey} style={{ width: '11%' }} placeholder="请输入支撑分数" />
+                                        <span className="column-1 ml5 mr10">分</span>
+                                        <Input size="large" type="number" value={item.percentage}
+                                          className={item.percentage === undefined && eacoursesavetypes === true || item.percentage > 100 && eacoursesavetypes === true || percentagetype === true ? "bor-red" : ""}
+                                          onInput={this.handevaluation_CoursePercentag.bind(this)} id={itemkey} style={{ width: '11%' }} placeholder="请输入占比" />
+                                        <span className="column-1 ml5 mr10">%</span>
+                                        <span className="buttoninline SetTheAssociated" style={{ marginLeft: '10px' }}>
+                                          <div className="left operatebutton" style={{ display: ismanager === false ? 'none' : 'block' }}>
+                                            <a className="mr15 delSubentry" style={{ display: itemkey === 0 ? 'none' : 'inline-block' }}>
+                                              <Tooltip placement="bottom" title="删除">
+                                                <i className="iconfont icon-shanchu color-grey-c  font-17" index={itemkey} onClick={this.Delethandevaluation.bind(this)}></i>
+                                              </Tooltip>
+                                            </a>
+                                            <a className="newAddSubentry" data-tip-down="添加"
+                                              style={{ display: itemkey === achievement_methods.length - 1 ? 'inline-block' : 'none' }}
+                                            ><i className="iconfont icon-tianjiafangda color-green" index={itemkey} onClick={this.Addhandevaluation.bind(this)}></i></a>
+                                          </div>
+                                        </span>
+                                      </div>
+                                      <br />
+                                    </div>
+                                  )
+                                })
+                              }
+                              <span className="c_red none ml30" id="error_tip" style={{ display: meweacoursetype === true ? 'inline-block' : 'none' }}>{Modallists}</span>
+                              <div className="right editglybuttonbox mb10" id="ecCourseEvaluationsbottomsubmit" style={{ display: parseInt(target_id) === item.target_id ? "block" : "none" }} >
+                                <div className="defalutSubmitbtn fr" onClick={buttomSaveCourseEvaluationsbottom}>保存</div>
+                                <div className="defalutCancelbtn fr mr20" onClick={this.CancelecCourseEvaluationsbottom}>取消</div>
+                              </div>
+                            </div>
+                          </div>
+                          {/* 修改end*/}
+
+
+
+                        </li>
+                        : item.course_achievement_methods.map((i, k) => {
+                          return (
+                            <li key={key} className={achievement_list && achievement_list.length - 1 === key ? item.course_achievement_methods.length - 1 === k ? "clearfix yslinitials " : " yslinitials bordereaeaea clearfix" : item.course_achievement_methods.length - 1 === k ? " yslinitials bordereaeaeas clearfix" : " yslinitials bordereaeaea clearfix"} style={{ display: parseInt(target_id) === item.target_id && methodologytype === true ? item.course_achievement_methods.length - 1 === k ? 'block' : "none" : "block" }}>
+                              <div style={{ width: '99.8%' }} className={"yslpadding"} style={{ display: parseInt(target_id) === item.target_id && methodologytype === true ? "none" : "block" }} >
+                                <span className="column-1 mt4 textaligncenters">{key - k === key ? key + 1 : ""}</span>
+                                <span>
+                                  <span className="column-1 textaligncenters mt4 ">
+                                    {i.course_evaluation.name}
+                                  </span>
+                                  <span className="column-1 ml15 textaligncenters color99 mt4 newtextaligncenter  evaluationdataClassy" >
                                     {
-                                      item.course_achievement_methods.length===0?
-                                      <li key={key} className="clearfix" >
-                                          <div  style={{ width:'99.8%'}} className={"yslpadding"} style={{display:parseInt(target_id)===item.id?"none":"block"}}>
-                                              <span className="column-1 mt4 textaligncenters"><span>{key+1}</span></span>
-                                          <span>
-                                          <span className="column-1 textaligncenters mt4">
-                                                <span></span>
-                                          </span>
-                                          <span className="column-1 ml15 textaligncenters color99 mt4 newtextaligncenter evaluationdataClassy">
-                                                          <span></span>
-                                          </span>
-                                          <span className="column-1 operationright mt4">
-                                              <div className="operationColumn">
-                                                  <div className="right operationalter nulleditSubentry" style={{display:ismanager===false?'none':'block'}}>
-                                                      <a className="mr16 editSubentry" data-tip-down="编辑" ><i target_id={item.id}  name={key} onClick={this.editecCourseEvaluationslist.bind(this)} className="iconfont icon-bianjidaibeijing color-green" ></i></a>
-                                                </div>
-                                              </div>
-                                          </span>
-
-
-                                          <span className="column-1  operationright mt4 percentages">
-                                              <div></div>
-                                          </span>
-
-                                          <span className="column-1 mr20 operationright mt4">
-                                              <div className="ColorF68"></div>
-                                          </span>
-
-                                          </span>
-                                          </div>
-
-                                          {/* 修改start*/}
-                                          <div className="ListTableLine newSystem" id="EvaluationsList">
-                                              <div style={{display:parseInt(target_id)===item.id?"block":"none"}} >
-                                                  {/* <div className="edu-back-white eacourse" id="SystemParametersbottom" style={{display:parseInt(sequenceid)===key?"block":"none"}}> */}
-                                                  <div className="edu-back-white eacourse" id="SystemParametersbottom" style={{display:parseInt(target_id)===item.id?"block":"none"}}>
-                                                      <div className="padding20-30" id="SystemParameters" style={{paddingLeft:'0px'}}>
-                                                          {/* <span className="fl SystemParameters">课程目标{sequenceid}：{ec_course_target_name}</span> */}
-                                                          <span className="fl SystemParameters">课程目标{key+1}：{ec_course_target_name}</span>
-                                                      </div>
-                                                  </div>
-                                                  {
-                                                      achievement_methods===undefined?" ":achievement_methods.map((item,itemkey)=>{
-                                                          return(
-                                                              <div key={itemkey} className="clearfix editorModify"  >
-                                                                  <div className="">
-                                                                      <span className="column-1 mr12" style={{paddingLeft:'0px'}}>评价环节</span>
-                                                                      <Select
-                                                                          // className={item.course_select_value===undefined&&eacoursesavetypes===true? "inputWeight  bor-red": "inputWeight"}
-                                                                          className={item.course_select_value===undefined&&eacoursesavetypes===true?Modallists==='提交失败,评价环节不能为空'?"inputWeight  bor-red":"inputWeight": "inputWeight"}
-
-                                                                          placeholder="请选择该目标的评价环节"
-                                                                          size="large"
-                                                                          style={{ width: '20%' }}
-                                                                          value={item.course_select_value}
-                                                                          onChange={this.handleevaluations_list.bind(this)}
-                                                                      >
-                                                                          {evaluations_list.map(province => <Option value={province} key={itemkey}>{province}</Option>)}
-
-                                                                      </Select>
-
-                                                                      <span className="column-1 mr13"></span>
-
-                                                                      <Select
-                                                                          mode="multiple"
-                                                                          // className={item.selectevaluation_phase===undefined&&eacoursesavetypes===true? "inputWeight  bor-red": "inputWeight"}
-                                                                          className={item.selectevaluation_phase===undefined&&eacoursesavetypes===true?Modallists==='提交失败,支撑项内容不能为空'?"inputWeight bor-red":"inputWeight": "inputWeight"}
-
-                                                                          placeholder="请选择具体数据内容"
-                                                                          size="large"
-                                                                          id="Coursemultiple"
-                                                                          style={{ width: '37%' }}
-                                                                          onChange={this.handevaluation_subitems_list.bind(this)}
-                                                                          onDeselect={this.handevaluation_Addlist.bind(this)}
-                                                                          value={item.selectevaluation_phase}
-                                                                          onFocus={()=>this.selectsonFocuslist(item,itemkey)}
-                                                                      >
-                                                                          {evaluations_lists.map(city => <Option value={city} key={itemkey}>{city}</Option>)}
-                                                                      </Select>
-
-                                                                      <span className="column-1 mr14"></span>
-                                                                      <Input size="large"  type="number" value={item.score}
-                                                                             className={item.score===undefined&&eacoursesavetypes===true?Modallists==='提交失败,支撑分数不能为空'?"bor-red": "": ""}
-                                                                             onInput={this.handevaluation_CourseScore.bind(this)} id={itemkey} style={{ width: '11%' }} placeholder="请输入支撑分数"/>
-                                                                      <span className="column-1 ml5 mr10">分</span>
-                                                                      <Input size="large" type="number"   value={item.percentage}
-                                                                             className={item.percentage===undefined&&eacoursesavetypes===true||item.percentage>100&&eacoursesavetypes===true||percentagetype===true?"bor-red": ""}
-                                                                             onInput={this.handevaluation_CoursePercentag.bind(this)}  id={itemkey} style={{ width: '11%' }}  placeholder="请输入占比"/>
-                                                                      <span className="column-1 ml5 mr10">%</span>
-                                                                      <span className="buttoninline SetTheAssociated"  style={{marginLeft:'10px'}}>
-                                                                                    <div className="left operatebutton" style={{display:ismanager===false?'none':'block'}}>
-                                                                                        <a className="mr15 delSubentry" style={{display:itemkey===0?'none':'inline-block'}}>
-                                                                                            <Tooltip placement="bottom" title="删除">
-                                                                                                <i className="iconfont icon-shanchu color-grey-c  font-17" index={itemkey} onClick={this.Delethandevaluation.bind(this)}></i>
-                                                                                            </Tooltip>
-                                                                                        </a>
-                                                                                        <a className="newAddSubentry" data-tip-down="添加"
-                                                                                          style={{ display:itemkey===achievement_methods.length-1?'inline-block':'none'}}
-                                                                                        ><i className="iconfont icon-tianjiafangda color-green" index={itemkey} onClick={this.Addhandevaluation.bind(this)}></i></a>
-                                                                                    </div>
-                                                                            </span>
-                                                                  </div>
-                                                                  <br />
-                                                              </div>
-                                                          )
-                                                      })
-                                                  }
-                                                  <span className="c_red none ml30" id="error_tip" style={{display:meweacoursetype===true?'inline-block':'none'}}>{Modallists}</span>
-                                                  <div className="right editglybuttonbox mb10" id="ecCourseEvaluationsbottomsubmit"  style={{display:parseInt(target_id)===item.target_id?"block":"none"}} >
-                                                      <div className="defalutSubmitbtn fr" onClick={buttomSaveCourseEvaluationsbottom}>保存</div>
-                                                      <div className="defalutCancelbtn fr mr20" onClick={this.CancelecCourseEvaluationsbottom}>取消</div>
-                                                  </div>
-                                              </div>
-                                          </div>
-                                          {/* 修改end*/}
-
-
-                                      
-                                      </li>
-                                      :item.course_achievement_methods.map((i,k)=>{
-                                            return(
-                                              <li key={key} className={achievement_list&&achievement_list.length-1===key?item.course_achievement_methods.length-1===k?"clearfix yslinitials ":" yslinitials bordereaeaea clearfix":item.course_achievement_methods.length-1===k?" yslinitials bordereaeaeas clearfix":" yslinitials bordereaeaea clearfix" } style={{display:parseInt(target_id)===item.target_id&&methodologytype===true?item.course_achievement_methods.length-1===k?'block':"none":"block"}}>
-                                              <div  style={{ width:'99.8%'}}  className={"yslpadding"} style={{display:parseInt(target_id)===item.target_id&&methodologytype===true?"none":"block"}} >
-                                                  <span className="column-1 mt4 textaligncenters">{key-k===key?key+1:""}</span>
-                                              <span>
-                                              <span className="column-1 textaligncenters mt4 ">
-                                                     {i.course_evaluation.name}
-                                              </span>
-                                              <span className="column-1 ml15 textaligncenters color99 mt4 newtextaligncenter  evaluationdataClassy" >
-                                                  {
-                                                    i.course_evaluation_subitems.map((y,e)=>{
-                                                      return(
-                                                              <div key={y} >{y.name+"  "} </div>
-                                                      )
-                                                    })
-                                                  }
-                                              </span>
-                                              {
-                                                key-k===key?<span className="column-1 operationright mt4">
-                                                  <div className="operationColumn">
-                                                      <div className="right operationalter neweditSubentry" style={{display:ismanager===false?'none':'block'}}>
-                                                          <a className="mr20 editSubentry" data-tip-down="编辑" ><i target_id={item.target_id} name={key} onClick={this.editecCourseEvaluationslist.bind(this)} className="iconfont icon-bianjidaibeijing color-green" ></i></a>
-                                                      </div>
-                                                  </div>
-                                              </span>:
-                                                <span className="column-1 operationright mt4">
-                                                    <div className="operationColumn">
-                                                        <div className="left operationalter neweditSubentry">
-                                                            <a className="mr20 editSubentry"></a>
-                                                      </div>
-                                                    </div>
-                                                </span>
-                                              }
-
-
-                                              <span className="column-1  operationright mt4 percentages">
-                                                  <div>{i.percentage+"%"}</div>
-                                              </span>
-
-                                              <span className="column-1 mr20 operationright mt4">
-                                                  <div className="ColorF68">{i.score}</div>
-                                              </span>
-
-                                              </span>
-                                              </div>
-                                                  {/* 修改start*/}
-                                                  <div className="ListTableLine newSystem" id="EvaluationsList">
-                                                      <div style={{display:parseInt(target_id)===item.target_id&&item.course_achievement_methods.length-1===k?"block":"none"}} >
-                                                          <div className="edu-back-white eacourse" id="SystemParametersbottom" style={{display:parseInt(target_id)===item.target_id&&item.course_achievement_methods.length-1===k?"block":"none"}}>
-                                                              <div className="padding20-30" id="SystemParameters" style={{paddingLeft:'0px'}}>
-                                                                  {/* <span className="fl SystemParameters">课程目标{sequenceid}：{ec_course_target_name}</span> */}
-                                                                  <span className="fl SystemParameters">课程目标{key+1}：{ec_course_target_name}</span>
-                                                              </div>
-                                                          </div>
-                                                          {
-                                                              achievement_methods===undefined?" ":achievement_methods.map((item,itemkey)=>{
-                                                        
-                                                                  return(
-                                                                      <div key={itemkey} className="clearfix editorModify"  >
-                                                                          <div className="">
-                                                                              <span className="column-1 mr12" style={{
-                                                                                    paddingLeft: '0px'
-                                                                              }}>评价环节</span>
-                                                                              <Select
-                                                                                  className={item.course_select_value===undefined&&eacoursesavetypes===true?Modallists==='提交失败,评价环节不能为空'?"inputWeight  bor-red":"inputWeight": "inputWeight"}
-
-                                                                                  placeholder="请选择该目标的评价环节"
-                                                                                  size="large"
-                                                                                  style={{ width: '20%' }}
-                                                                                  value={item.course_select_value}
-                                                                                  onChange={this.handleevaluations_list.bind(this)}
-                                                                              >
-                                                                                  {evaluations_list.map(province => <Option value={province} key={itemkey}>{province}</Option>)}
-
-                                                                              </Select>
-
-                                                                              <span className="column-1 mr13"></span>
-
-                                                                              <Select
-                                                                                  mode="multiple"
-                                                                                  className={item.selectevaluation_phase===undefined&&eacoursesavetypes===true?Modallists==='提交失败,支撑项内容不能为空'?"inputWeight bor-red":"inputWeight": "inputWeight"}
-
-                                                                                  placeholder="请选择具体支撑项"
-                                                                                  size="large"
-                                                                                  id="Coursemultiple"
-                                                                                  style={{ width: '37%' }}
-                                                                                  onChange={this.handevaluation_subitems_list.bind(this)}
-                                                                                  onDeselect={this.handevaluation_Addlist.bind(this)}
-                                                                                  value={item.selectevaluation_phase}
-                                                                                  onFocus={()=>this.selectsonFocuslist(item,itemkey)}
-                                                                              >
-                                                                                  {evaluations_lists.map(city => <Option value={city} key={itemkey}>{city}</Option>)}
-                                                                              </Select>
-
-                                                                              <span className="column-1 mr14"></span>
-                                                                              <Input size="large"  type="number"
-                                                                                     value={item.score}
-                                                                                     className={item.score===undefined&&eacoursesavetypes===true?Modallists==='提交失败,支撑分数不能为空'?"bor-red": "": ""}
-                                                                                     onInput={this.handevaluation_CourseScore.bind(this)} id={itemkey} style={{ width: '11%' }} placeholder="请输入支撑分数"/>
-                                                                              <span className="column-1 ml5 mr10">分</span>
-                                                                              <Input size="large" type="number"
-                                                                                     value={item.percentage}
-                                                                                     className={item.percentage===undefined&&eacoursesavetypes===true||item.percentage>100&&eacoursesavetypes===true||percentagetype===true?"bor-red": ""}
-                                                                                     onInput={this.handevaluation_CoursePercentag.bind(this)}
-                                                                                     id={itemkey} style={{ width: '11%' }}
-                                                                                     placeholder="请输入占比"/>
-                                                                              <span className="column-1 ml5 mr10">%</span>
-                                                                              <span className="buttoninline SetTheAssociated" style={{marginLeft:'10px'}}>
-                                                                                    <div className="left operatebutton" style={{display:ismanager===false?'none':'block'}}>
-                                                                                        <a className="mr15 delSubentry" style={{display:achievement_methods.length===1?'none':'inline-block'}}>
-                                                                                            <Tooltip placement="bottom" title="删除">
-                                                                                                <i className="iconfont icon-shanchu color-grey-c  font-17" index={itemkey} onClick={this.Delethandevaluation.bind(this)}></i>
-                                                                                            </Tooltip>
-                                                                                        </a>
-                                                                                        <a className="newAddSubentry" data-tip-down="添加"
-                                                                                           style={{ display:itemkey===achievement_methods.length-1?'inline-block':'none'}}
-                                                                                        ><i className="iconfont icon-tianjiafangda color-green" index={itemkey} onClick={this.Addhandevaluation.bind(this)}></i></a>
-                                                                                    </div>
-                                                                            </span>
-                                                                          </div>
-                                                                          <br />
-                                                                      </div>
-                                                                  )
-                                                              })
-                                                          }
-                                                          <span className="c_red none ml30" id="error_tip" style={{display:meweacoursetype===true?'inline-block':'none'}}>{Modallists}</span>
-                                                          <div className="right editglybuttonbox mb10" id="ecCourseEvaluationsbottomsubmit"  style={{display:parseInt(target_id)===item.target_id?"block":"none"}}>
-                                                              <div className="defalutSubmitbtn fr" onClick={buttomSaveCourseEvaluationsbottom}>保存</div>
-                                                              <div className="defalutCancelbtn fr mr20" onClick={this.CancelecCourseEvaluationsbottom}>取消</div>
-                                                          </div>
-                                                      </div>
-                                                  </div>
-                                                  {/* 修改end*/}
-
-                                              </li>
-
-                                            )
-
+                                      i.course_evaluation_subitems.map((y, e) => {
+                                        return (
+                                          <div key={y} >{y.name + "  "} </div>
+                                        )
                                       })
                                     }
-                            </div>
-                              )
-                            })
-                          }
-              </div>
+                                  </span>
+                                  {
+                                    key - k === key ? <span className="column-1 operationright mt4">
+                                      <div className="operationColumn">
+                                        <div className="right operationalter neweditSubentry" style={{ display: ismanager === false ? 'none' : 'block' }}>
+                                          <a className="mr20 editSubentry" data-tip-down="编辑" ><i target_id={item.target_id} name={key} onClick={this.editecCourseEvaluationslist.bind(this)} className="iconfont icon-bianjidaibeijing color-green" ></i></a>
+                                        </div>
+                                      </div>
+                                    </span> :
+                                      <span className="column-1 operationright mt4">
+                                        <div className="operationColumn">
+                                          <div className="left operationalter neweditSubentry">
+                                            <a className="mr20 editSubentry"></a>
+                                          </div>
+                                        </div>
+                                      </span>
+                                  }
 
-             </div>
-         </div>
-	    );
-  	}
+
+                                  <span className="column-1  operationright mt4 percentages">
+                                    <div>{i.percentage + "%"}</div>
+                                  </span>
+
+                                  <span className="column-1 mr20 operationright mt4">
+                                    <div className="ColorF68">{i.score}</div>
+                                  </span>
+
+                                </span>
+                              </div>
+                              {/* 修改start*/}
+                              <div className="ListTableLine newSystem" id="EvaluationsList">
+                                <div style={{ display: parseInt(target_id) === item.target_id && item.course_achievement_methods.length - 1 === k ? "block" : "none" }} >
+                                  <div className="edu-back-white eacourse" id="SystemParametersbottom" style={{ display: parseInt(target_id) === item.target_id && item.course_achievement_methods.length - 1 === k ? "block" : "none" }}>
+                                    <div className="padding20-30" id="SystemParameters" style={{ paddingLeft: '0px' }}>
+                                      {/* <span className="fl SystemParameters">课程目标{sequenceid}：{ec_course_target_name}</span> */}
+                                      <span className="fl SystemParameters">课程目标{key + 1}：{ec_course_target_name}</span>
+                                    </div>
+                                  </div>
+                                  {
+                                    achievement_methods === undefined ? " " : achievement_methods.map((item, itemkey) => {
+
+                                      return (
+                                        <div key={itemkey} className="clearfix editorModify"  >
+                                          <div className="">
+                                            <span className="column-1 mr12" style={{
+                                              paddingLeft: '0px'
+                                            }}>评价环节</span>
+                                            <Select
+                                              className={item.course_select_value === undefined && eacoursesavetypes === true ? Modallists === '提交失败,评价环节不能为空' ? "inputWeight  bor-red" : "inputWeight" : "inputWeight"}
+
+                                              placeholder="请选择该目标的评价环节"
+                                              size="large"
+                                              style={{ width: '20%' }}
+                                              value={item.course_select_value}
+                                              onChange={this.handleevaluations_list.bind(this)}
+                                            >
+                                              {evaluations_list.map(province => <Option value={province} key={itemkey}>{province}</Option>)}
+
+                                            </Select>
+
+                                            <span className="column-1 mr13"></span>
+
+                                            <Select
+                                              mode="multiple"
+                                              className={item.selectevaluation_phase === undefined && eacoursesavetypes === true ? Modallists === '提交失败,支撑项内容不能为空' ? "inputWeight bor-red" : "inputWeight" : "inputWeight"}
+
+                                              placeholder="请选择具体支撑项"
+                                              size="large"
+                                              id="Coursemultiple"
+                                              style={{ width: '37%' }}
+                                              onChange={this.handevaluation_subitems_list.bind(this)}
+                                              onDeselect={this.handevaluation_Addlist.bind(this)}
+                                              value={item.selectevaluation_phase}
+                                              onFocus={() => this.selectsonFocuslist(item, itemkey)}
+                                            >
+                                              {evaluations_lists.map(city => <Option value={city} key={itemkey}>{city}</Option>)}
+                                            </Select>
+
+                                            <span className="column-1 mr14"></span>
+                                            <Input size="large" type="number"
+                                              value={item.score}
+                                              className={item.score === undefined && eacoursesavetypes === true ? Modallists === '提交失败,支撑分数不能为空' ? "bor-red" : "" : ""}
+                                              onInput={this.handevaluation_CourseScore.bind(this)} id={itemkey} style={{ width: '11%' }} placeholder="请输入支撑分数" />
+                                            <span className="column-1 ml5 mr10">分</span>
+                                            <Input size="large" type="number"
+                                              value={item.percentage}
+                                              className={item.percentage === undefined && eacoursesavetypes === true || item.percentage > 100 && eacoursesavetypes === true || percentagetype === true ? "bor-red" : ""}
+                                              onInput={this.handevaluation_CoursePercentag.bind(this)}
+                                              id={itemkey} style={{ width: '11%' }}
+                                              placeholder="请输入占比" />
+                                            <span className="column-1 ml5 mr10">%</span>
+                                            <span className="buttoninline SetTheAssociated" style={{ marginLeft: '10px' }}>
+                                              <div className="left operatebutton" style={{ display: ismanager === false ? 'none' : 'block' }}>
+                                                <a className="mr15 delSubentry" style={{ display: achievement_methods.length === 1 ? 'none' : 'inline-block' }}>
+                                                  <Tooltip placement="bottom" title="删除">
+                                                    <i className="iconfont icon-shanchu color-grey-c  font-17" index={itemkey} onClick={this.Delethandevaluation.bind(this)}></i>
+                                                  </Tooltip>
+                                                </a>
+                                                <a className="newAddSubentry" data-tip-down="添加"
+                                                  style={{ display: itemkey === achievement_methods.length - 1 ? 'inline-block' : 'none' }}
+                                                ><i className="iconfont icon-tianjiafangda color-green" index={itemkey} onClick={this.Addhandevaluation.bind(this)}></i></a>
+                                              </div>
+                                            </span>
+                                          </div>
+                                          <br />
+                                        </div>
+                                      )
+                                    })
+                                  }
+                                  <span className="c_red none ml30" id="error_tip" style={{ display: meweacoursetype === true ? 'inline-block' : 'none' }}>{Modallists}</span>
+                                  <div className="right editglybuttonbox mb10" id="ecCourseEvaluationsbottomsubmit" style={{ display: parseInt(target_id) === item.target_id ? "block" : "none" }}>
+                                    <div className="defalutSubmitbtn fr" onClick={buttomSaveCourseEvaluationsbottom}>保存</div>
+                                    <div className="defalutCancelbtn fr mr20" onClick={this.CancelecCourseEvaluationsbottom}>取消</div>
+                                  </div>
+                                </div>
+                              </div>
+                              {/* 修改end*/}
+
+                            </li>
+
+                          )
+
+                        })
+                    }
+                  </div>
+                )
+              })
+            }
+          </div>
+
+        </div>
+      </div>
+    );
+  }
 }
 
-export default SnackbarHOC() (EcCourseEvaluationsbottom);
\ No newline at end of file
+export default SnackbarHOC()(EcCourseEvaluationsbottom);
\ No newline at end of file
diff --git a/src/modules/ecs/subroute/ecCourseSupportSetting/EditableCourseSupportSetting.js b/src/modules/ecs/subroute/ecCourseSupportSetting/EditableCourseSupportSetting.js
index 70b39241..58610ed1 100644
--- a/src/modules/ecs/subroute/ecCourseSupportSetting/EditableCourseSupportSetting.js
+++ b/src/modules/ecs/subroute/ecCourseSupportSetting/EditableCourseSupportSetting.js
@@ -10,8 +10,8 @@ let _url_origin = getUrl()
 const $ = window.$
 // https://www.educoder.net/stylesheets/css/common.css?1546618720
 if (!window['EcLoaded']) {
-    $('head').append( $('<link rel="stylesheet" type="text/css" />')
-        .attr('href', `${_url_origin}/stylesheets/css/common.css?1525440977`) );
+    $('head').append($('<link rel="stylesheet" type="text/css" />')
+        .attr('href', `${_url_origin}/stylesheets/css/common.css?1525440977`));
     window['EcLoaded'] = true
 }
 
@@ -20,7 +20,7 @@ let id = 0;
 
 /**
     target_id
-    position    
+    position
     target_weight
     target_contents
 
@@ -29,9 +29,9 @@ let id = 0;
     subitem_contents
 
 */
-const data = 
-[{"position":0,"target_weight":0.02,"target_contents":"12","standard_grade":2,"subitem_id":"65"},{"position":3,"target_id":"0","target_weight":0.1,"target_contents":"理解数据管理技术和数据库技术的发展，区分不同数据模型的作用和特点，描述数据库系统的类型、结构、数据独立性。","standard_grade":60,"subitem_id":"66"},{"position":4,"target_weight":1,"target_contents":"22","standard_grade":33,"subitem_id":"66"},{"position":11,"target_id":"1","target_weight":0.1,"target_contents":"理解数据管理技术和数据库技术的发展，区分不同数据模型的作用和特点，描述数据库系统的类型、结构、数据独立性。","standard_grade":61,"subitem_id":"65"}]
-;
+const data =
+    [{ "position": 0, "target_weight": 0.02, "target_contents": "12", "standard_grade": 2, "subitem_id": "65" }, { "position": 3, "target_id": "0", "target_weight": 0.1, "target_contents": "理解数据管理技术和数据库技术的发展，区分不同数据模型的作用和特点，描述数据库系统的类型、结构、数据独立性。", "standard_grade": 60, "subitem_id": "66" }, { "position": 4, "target_weight": 1, "target_contents": "22", "standard_grade": 33, "subitem_id": "66" }, { "position": 11, "target_id": "1", "target_weight": 0.1, "target_contents": "理解数据管理技术和数据库技术的发展，区分不同数据模型的作用和特点，描述数据库系统的类型、结构、数据独立性。", "standard_grade": 61, "subitem_id": "65" }]
+    ;
 let _data = [
     {
         target_id: 0,
@@ -59,399 +59,399 @@ let _data = [
 const item = {}
 
 class EditableCourseSupportSetting extends Component {
-  constructor(props) {
-    super(props)
-    this.state = {
-        addOrDeleting: false,
-        errorMsg: ''
+    constructor(props) {
+        super(props)
+        this.state = {
+            addOrDeleting: false,
+            errorMsg: ''
+        }
     }
-  }
-  onRemove = (k) => {
-    let fValues = this.props.form.getFieldsValue();
-    if (
-        // fValues.standard_grade[k] && fValues.standard_grade[k] != 75
-        // || fValues.subitem_id[k] 
-        // || 
-        fValues.target_contents[k] 
-        // || fValues.target_weight[k] 
+    onRemove = (k) => {
+        let fValues = this.props.form.getFieldsValue();
+        if (
+            // fValues.standard_grade[k] && fValues.standard_grade[k] != 75
+            // || fValues.subitem_id[k]
+            // ||
+            fValues.target_contents[k]
+            // || fValues.target_weight[k]
         ) {
-        this.props.showModal('提示', '确定要删除吗？', () => {
+            this.props.showModal('提示', '确定要删除吗？', () => {
+                this.remove(k)
+            })
+        } else {
             this.remove(k)
-        })
-    } else {
-        this.remove(k)
-    }
-  }
-  remove = (k) => {
-    const { form } = this.props;
-    // can use data-binding to get
-    const keys = form.getFieldValue('keys');
-    // We need at least one passenger
-    // if (keys.length === 1) {
-    //   return;
-    // }
-    if (keys.length === 1) {
-        this.setState({ errorMsg: '至少得保留一条数据' })
-        return;
-    }
-    // 清除悬浮tip
-    window.$('.data-tip-down').hide()
-
-    console.log('remove :' , k , this.position2Target_idMap[k])
-    delete this.position2Target_idMap[k]
-    // can use data-binding to set
-    form.setFieldsValue({
-      keys: keys.filter(key => key !== k),
-    });
-  }
-  _reverseMap = (map) => {
-    let newMap = {}
-    for (var k in map) {
-        newMap[map[k]] = k;
-    }
-    return newMap
-  }
-  addIfNewKeyExist = (newKey, index_arg) => {
-    this.setState({ addOrDeleting: true })
-    const { form } = this.props;
-    const keys = form.getFieldValue('keys');
-    /**
-        [0,1,2,3]
-        ['11', '22', '33', '44']
-        ->
-        [0,1,2,3,4]
-        ['11', '22', empty, '33', '44']
-
-    */
-    const target_weight = form.getFieldValue('target_weight');
-    const target_contents = form.getFieldValue('target_contents');
-    const standard_grade = form.getFieldValue('standard_grade');
-    const subitem_id = form.getFieldValue('subitem_id');
-    keys.splice(index_arg, 0, newKey);
-
-    // position2Target_idMap 
-    // {1:2, 2:3, 3:4, 4:6 } --> {1:2, 2:3, 3:7, 4:4, 5:6 }
-    // 更新key/position 映射到target_id的map
-    // 两次revers，用这个结构，达到给position加1的效果
-    let reverseMap = this._reverseMap(this.position2Target_idMap);
-    for (let i = index_arg ; i < keys.length; i++) {
-        if(keys[i] === keys[i+1]) { // 找到开始+1的行
-            continue;
-        }
-        let target_id = this.position2Target_idMap[keys[i]];
-        reverseMap[target_id] = parseInt(reverseMap[target_id]) + 1;
-        keys[i] = keys[i] + 1;
-    }
-    for (let i = 0 ; i < keys.length - 1; i++) { 
-        if (keys[i] == keys[i + 1]) {
-            debugger;
         }
     }
-    this.position2Target_idMap = this._reverseMap(reverseMap);
-    
-
-    target_weight.splice(newKey, 0, undefined);
-    target_contents.splice(newKey, 0, undefined);
-    standard_grade.splice(newKey, 0, undefined);
-    subitem_id.splice(newKey, 0, undefined);
-
-    setTimeout(() => {
-        form.setFieldsValue({
-            target_weight,
-            target_contents,
-            standard_grade,
-            subitem_id
-        });
-        window.$('.data-tip-down').hide()
-        this.setState({ addOrDeleting: false })
-
-    }, 300)
-    form.setFieldsValue({
-      keys: keys
-    });
-
-  }
-  add = (k, index) => {
-    this.setState({ errorMsg: '' })
-
-    const { form } = this.props;
-    // can use data-binding to get
-    const keys = form.getFieldValue('keys');
-    let nextKeys ;
-    let newKey = k + 1;
-    
-    const newKeyIndex = keys.indexOf(newKey)
-    if (newKeyIndex != -1) {
-        // 新key存在，将新key位置及以后的row后移，直到找到一个之后的空位置
-        this.addIfNewKeyExist(newKey, index)
-    } else {    // 如果这个新key不存在
-        // keys[newIndex] = newKey
-        keys.splice(index === 0 && k === -1 ? 0 : index, 0, newKey);
-    }
-    // can use data-binding to set
-    // important! notify form to detect changes
-    form.setFieldsValue({
-      keys: keys,
-    });
-  }
-
-  handleSubmit = (e) => {
-    if (!this.props.is_manager) {
-        this.props.showModal('提示', '您没权限编辑，请联系管理员。')
-        return;
-    }
-    this.setState({ errorMsg: '' })
-    e.preventDefault && e.preventDefault();
-    this.props.form.validateFieldsAndScroll((err, values) => {
-      if (!err) {
-        let keysLen = values.keys.length
-        if (keysLen < 1) {
+    remove = (k) => {
+        const { form } = this.props;
+        // can use data-binding to get
+        const keys = form.getFieldValue('keys');
+        // We need at least one passenger
+        // if (keys.length === 1) {
+        //   return;
+        // }
+        if (keys.length === 1) {
             this.setState({ errorMsg: '至少得保留一条数据' })
-        }
-        var data = []
-        while( keysLen-- ) {
-            data.push({})
-        }
-        for (var valKey in values) {
-          
-           let dataIndex = 0
-           values[valKey].forEach( (item,index) => {
-               let _val = values[valKey][index];
-               if (_val || _val == 0) {
-                 data[dataIndex][valKey === 'keys' ? 'position' : valKey] = _val
-                 if (valKey === 'keys' && (this.position2Target_idMap[_val] || this.position2Target_idMap[_val] === 0) ) {
-                     data[dataIndex].target_id = this.position2Target_idMap[_val]
-                 }
-                 dataIndex++;
-               }
-           })
-        }
-
-        console.log('Received values of form: ', values, data);
-        
-        let totalWeight = 0;
-        values.target_weight.forEach(item => {
-            if (item) {
-                totalWeight += item
-            }
-        })
-        // 精度问题  0.2 + 0.7 = 0.8999999999
-        if (parseInt((totalWeight * 100).toFixed(1)) != 100) {
-            this.setState({ errorMsg: '请先保证权重和等于1' })
             return;
         }
+        // 清除悬浮tip
+        window.$('.data-tip-down').hide()
 
-        this.props.updateCourseTargets(data)
-      } else {
-
-        const keyRowNumMap = {}
-        let rowNum = 1;
-        for (var key in values.target_contents) {
-            keyRowNumMap[key] = rowNum;
-            rowNum++;
+        console.log('remove :', k, this.position2Target_idMap[k])
+        delete this.position2Target_idMap[k]
+        // can use data-binding to set
+        form.setFieldsValue({
+            keys: keys.filter(key => key !== k),
+        });
+    }
+    _reverseMap = (map) => {
+        let newMap = {}
+        for (var k in map) {
+            newMap[map[k]] = k;
         }
+        return newMap
+    }
+    addIfNewKeyExist = (newKey, index_arg) => {
+        this.setState({ addOrDeleting: true })
+        const { form } = this.props;
+        const keys = form.getFieldValue('keys');
+        /**
+            [0,1,2,3]
+            ['11', '22', '33', '44']
+            ->
+            [0,1,2,3,4]
+            ['11', '22', empty, '33', '44']
+    
+        */
+        const target_weight = form.getFieldValue('target_weight');
+        const target_contents = form.getFieldValue('target_contents');
+        const standard_grade = form.getFieldValue('standard_grade');
+        const subitem_id = form.getFieldValue('subitem_id');
+        keys.splice(index_arg, 0, newKey);
 
-        // err.target_contents[1].errors[0]
-        // {message: "请填入目标内容", field: "target_contents[1]"}
-        for (var key in err) {
-            for (var _k in err[key]) {
-                let errorObj = err[key][_k].errors[0];
+        // position2Target_idMap
+        // {1:2, 2:3, 3:4, 4:6 } --> {1:2, 2:3, 3:7, 4:4, 5:6 }
+        // 更新key/position 映射到target_id的map
+        // 两次revers，用这个结构，达到给position加1的效果
+        let reverseMap = this._reverseMap(this.position2Target_idMap);
+        for (let i = index_arg; i < keys.length; i++) {
+            if (keys[i] === keys[i + 1]) { // 找到开始+1的行
+                continue;
+            }
+            let target_id = this.position2Target_idMap[keys[i]];
+            reverseMap[target_id] = parseInt(reverseMap[target_id]) + 1;
+            keys[i] = keys[i] + 1;
+        }
+        for (let i = 0; i < keys.length - 1; i++) {
+            if (keys[i] == keys[i + 1]) {
 
-                let _key = errorObj.field.match(`[(0-9)]`)
-                this.setState({ errorMsg: `第${keyRowNumMap[_key]}行，${errorObj.message}` })
-                return;
-                // console.log(`第${keyRowNumMap[_key]}行，${errorObj.message}`);
             }
         }
-      }
-      
-      
-    });
-  }
+        this.position2Target_idMap = this._reverseMap(reverseMap);
 
-  componentDidMount = () => {
-    this.position2Target_idMap = {}
-    const { form } = this.props;
 
-    const data = this.props.course_targets
+        target_weight.splice(newKey, 0, undefined);
+        target_contents.splice(newKey, 0, undefined);
+        standard_grade.splice(newKey, 0, undefined);
+        subitem_id.splice(newKey, 0, undefined);
 
-    let target_weight = []
-    let target_contents = []
-    let standard_grade = []
-    // let biyeYaoqiuZhibiaodian = []
-    let subitem_id = []
-    let keys = []
+        setTimeout(() => {
+            form.setFieldsValue({
+                target_weight,
+                target_contents,
+                standard_grade,
+                subitem_id
+            });
+            window.$('.data-tip-down').hide()
+            this.setState({ addOrDeleting: false })
 
-    data.forEach(item => {
-        keys.push(item.position);
-        target_weight[item.position] = (item.target_weight)
-        target_contents[item.position] = (item.target_contents);
-        standard_grade[item.position] = (item.standard_grade);
-        // biyeYaoqiuZhibiaodian[item.position] = (item.biyeYaoqiuZhibiaodian);
-
-        subitem_id[item.position] = item.subitem_id ? (item.subitem_id).toString() : item.subitem_id;
-
-        this.position2Target_idMap[item.position] = item.target_id
-    })    
-    form.setFieldsValue({
-        keys
-    });
-    setTimeout(() => {
+        }, 300)
         form.setFieldsValue({
-            // keys,
-            target_weight,
-            target_contents,
-            standard_grade,
-            // biyeYaoqiuZhibiaodian,
-            subitem_id,
+            keys: keys
         });
-        // this.forceUpdate()
-    }, 3000)
 
-       
-  }
-  
+    }
+    add = (k, index) => {
+        this.setState({ errorMsg: '' })
 
-  render() {
-    const { getFieldDecorator, getFieldValue } = this.props.form;
-    const { requirements } = this.props;
-    const { addOrDeleting } = this.state;
-    const formItemLayout = {
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 4 },
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 20 },
-      },
-    };
-    const formItemLayoutWithOutLabel = {
-      wrapperCol: {
-        xs: { span: 24, offset: 0 },
-        sm: { span: 20, offset: 4 },
-      },
-    };
-    getFieldDecorator('keys', { initialValue: [] });
-    const keys = getFieldValue('keys');
-    const formItems = keys.map((k, index) => (
-      <li className="clearfix" key={ k }>
-      <Form.Item
-        {...(index === 0 ? formItemLayout : formItemLayoutWithOutLabel)}
-        // label={index === 0 ? 'Passengers' : ''}
-        required={false}
-        key={k}
-        style={{ 'display': 'flex' }}
-      >
-        <span className="column-1">{ index + 1 }</span>
-        <span className="column-1">
-            {getFieldDecorator(`target_weight[${k}]`, {
-                    // validateTrigger: ['onChange', 'onBlur'],
-                    rules: [{
-                        required: true,
-                        whitespace: true,
-                        type: 'number',
-                        message: "请填入权重",
-                    }],
-                })(
-                <InputNumber placeholder="权重" precision={2} step={0.01} min={0.01} max={1} style={{     width: '100%', marginRight: 8 }} />
-            )}
-        </span>
-        <span className="column-3">
-            {getFieldDecorator(`target_contents[${k}]`, {
-                    // validateTrigger: ['onChange', 'onBlur'],
-                    rules: [{
-                        required: true,
-                    //     whitespace: true,
-                        message: "请填入目标内容",
-                    }],
-                })(
-                <TextArea autosize placeholder="" style={{  width: '100%', marginRight: 8 }} />
-            )}
-        </span>
+        const { form } = this.props;
+        // can use data-binding to get
+        const keys = form.getFieldValue('keys');
+        let nextKeys;
+        let newKey = k + 1;
 
-        <span className="column-2 edu-txt-center">
-         {getFieldDecorator(`standard_grade[${k}]`, {
-                    initialValue: 75,
-                    // validateTrigger: ['onChange', 'onBlur'],
-                    rules: [{
-                        required: true,
-                    //     whitespace: true,
-                    //     type: 'integer',
-                        message: "请先填写达成标准分",
-                    }],
-                })(
-                <InputNumber placeholder="" step={1} min={0} max={100} style={{     width: '80%', marginRight: 8 }} />
+        const newKeyIndex = keys.indexOf(newKey)
+        if (newKeyIndex != -1) {
+            // 新key存在，将新key位置及以后的row后移，直到找到一个之后的空位置
+            this.addIfNewKeyExist(newKey, index)
+        } else {    // 如果这个新key不存在
+            // keys[newIndex] = newKey
+            keys.splice(index === 0 && k === -1 ? 0 : index, 0, newKey);
+        }
+        // can use data-binding to set
+        // important! notify form to detect changes
+        form.setFieldsValue({
+            keys: keys,
+        });
+    }
 
-            )}
-        </span>
-         {/*  <Input placeholder="" style={{ width: '80%', marginRight: 8 }} /> */}
+    handleSubmit = (e) => {
+        if (!this.props.is_manager) {
+            this.props.showModal('提示', '您没权限编辑，请联系管理员。')
+            return;
+        }
+        this.setState({ errorMsg: '' })
+        e.preventDefault && e.preventDefault();
+        this.props.form.validateFieldsAndScroll((err, values) => {
+            if (!err) {
+                let keysLen = values.keys.length
+                if (keysLen < 1) {
+                    this.setState({ errorMsg: '至少得保留一条数据' })
+                }
+                var data = []
+                while (keysLen--) {
+                    data.push({})
+                }
+                for (var valKey in values) {
 
-        <span className="column-3">
-            { getFieldDecorator(`subitem_id[${k}]`, {
-                    // validateTrigger: ['onChange', 'onBlur'],
-                    rules: [{
-                        required: true,
-                    //     whitespace: true,
-                    //     type: 'array',
-                        message: "请先选择毕业要求指标点",
-                    }],
-                })(
-                <Select 
-                    // mode="multiple"
-                    // dropdownMatchSelectWidth={ false }
-                    style={{ width: '100%', marginRight: 8 }}
+                    let dataIndex = 0
+                    values[valKey].forEach((item, index) => {
+                        let _val = values[valKey][index];
+                        if (_val || _val == 0) {
+                            data[dataIndex][valKey === 'keys' ? 'position' : valKey] = _val
+                            if (valKey === 'keys' && (this.position2Target_idMap[_val] || this.position2Target_idMap[_val] === 0)) {
+                                data[dataIndex].target_id = this.position2Target_idMap[_val]
+                            }
+                            dataIndex++;
+                        }
+                    })
+                }
+
+                console.log('Received values of form: ', values, data);
+
+                let totalWeight = 0;
+                values.target_weight.forEach(item => {
+                    if (item) {
+                        totalWeight += item
+                    }
+                })
+                // 精度问题  0.2 + 0.7 = 0.8999999999
+                if (parseInt((totalWeight * 100).toFixed(1)) != 100) {
+                    this.setState({ errorMsg: '请先保证权重和等于1' })
+                    return;
+                }
+
+                this.props.updateCourseTargets(data)
+            } else {
+
+                const keyRowNumMap = {}
+                let rowNum = 1;
+                for (var key in values.target_contents) {
+                    keyRowNumMap[key] = rowNum;
+                    rowNum++;
+                }
+
+                // err.target_contents[1].errors[0]
+                // {message: "请填入目标内容", field: "target_contents[1]"}
+                for (var key in err) {
+                    for (var _k in err[key]) {
+                        let errorObj = err[key][_k].errors[0];
+
+                        let _key = errorObj.field.match(`[(0-9)]`)
+                        this.setState({ errorMsg: `第${keyRowNumMap[_key]}行，${errorObj.message}` })
+                        return;
+                        // console.log(`第${keyRowNumMap[_key]}行，${errorObj.message}`);
+                    }
+                }
+            }
+
+
+        });
+    }
+
+    componentDidMount = () => {
+        this.position2Target_idMap = {}
+        const { form } = this.props;
+
+        const data = this.props.course_targets
+
+        let target_weight = []
+        let target_contents = []
+        let standard_grade = []
+        // let biyeYaoqiuZhibiaodian = []
+        let subitem_id = []
+        let keys = []
+
+        data.forEach(item => {
+            keys.push(item.position);
+            target_weight[item.position] = (item.target_weight)
+            target_contents[item.position] = (item.target_contents);
+            standard_grade[item.position] = (item.standard_grade);
+            // biyeYaoqiuZhibiaodian[item.position] = (item.biyeYaoqiuZhibiaodian);
+
+            subitem_id[item.position] = item.subitem_id ? (item.subitem_id).toString() : item.subitem_id;
+
+            this.position2Target_idMap[item.position] = item.target_id
+        })
+        form.setFieldsValue({
+            keys
+        });
+        setTimeout(() => {
+            form.setFieldsValue({
+                // keys,
+                target_weight,
+                target_contents,
+                standard_grade,
+                // biyeYaoqiuZhibiaodian,
+                subitem_id,
+            });
+            // this.forceUpdate()
+        }, 3000)
+
+
+    }
+
+
+    render() {
+        const { getFieldDecorator, getFieldValue } = this.props.form;
+        const { requirements } = this.props;
+        const { addOrDeleting } = this.state;
+        const formItemLayout = {
+            labelCol: {
+                xs: { span: 24 },
+                sm: { span: 4 },
+            },
+            wrapperCol: {
+                xs: { span: 24 },
+                sm: { span: 20 },
+            },
+        };
+        const formItemLayoutWithOutLabel = {
+            wrapperCol: {
+                xs: { span: 24, offset: 0 },
+                sm: { span: 20, offset: 4 },
+            },
+        };
+        getFieldDecorator('keys', { initialValue: [] });
+        const keys = getFieldValue('keys');
+        const formItems = keys.map((k, index) => (
+            <li className="clearfix" key={k}>
+                <Form.Item
+                    {...(index === 0 ? formItemLayout : formItemLayoutWithOutLabel)}
+                    // label={index === 0 ? 'Passengers' : ''}
+                    required={false}
+                    key={k}
+                    style={{ 'display': 'flex' }}
                 >
-                    { requirements.map((item, index) => {
-                        return ( <Option value={item.subitem_id.toString()} title={item.subitem_contents}>
-                            {item.index} : {item.subitem_contents}
-                            </Option> )
-                    }) }
-                    
-                </Select>
-            )}
-        </span>
+                    <span className="column-1">{index + 1}</span>
+                    <span className="column-1">
+                        {getFieldDecorator(`target_weight[${k}]`, {
+                            // validateTrigger: ['onChange', 'onBlur'],
+                            rules: [{
+                                required: true,
+                                whitespace: true,
+                                type: 'number',
+                                message: "请填入权重",
+                            }],
+                        })(
+                            <InputNumber placeholder="权重" precision={2} step={0.01} min={0.01} max={1} style={{ width: '100%', marginRight: 8 }} />
+                        )}
+                    </span>
+                    <span className="column-3">
+                        {getFieldDecorator(`target_contents[${k}]`, {
+                            // validateTrigger: ['onChange', 'onBlur'],
+                            rules: [{
+                                required: true,
+                                //     whitespace: true,
+                                message: "请填入目标内容",
+                            }],
+                        })(
+                            <TextArea autosize placeholder="" style={{ width: '100%', marginRight: 8 }} />
+                        )}
+                    </span>
 
-        <span className="column-1 edu-txt-right">
-            { !addOrDeleting && <a href="javascript:void(0)" 
-                onClick={() => { this.onRemove(k) }}
-                className="color-grey-c mr15" data-tip-down="删除">
-                <i className="iconfont icon-shanchu font-15"></i>
-            </a> }
-            { !addOrDeleting && <a href="javascript:void(0)" 
-                onClick={() => { this.add(k, index + 1) }}
-                className="color-green show-FillTable" 
-                data-tip-down="添加">
-                <i className="iconfont icon-tianjiafangda"
-                ></i>
-            </a> }
-        </span>
-            
-        
-      </Form.Item>
-      </li>
-    ));
-    return (
-        
-        <Form onSubmit={this.handleSubmit}>
-            <div className="ListTableLine" id="show-Target-table">
-                <p className="clearfix">
-                    <span className="column-1">项</span>
-                    <span className="column-1">权重</span>
-                    <span className="column-3">课程目标内容</span>
-                    <span className="column-2 edu-txt-center">达成标准(分)</span>
-                    <span className="column-3">对应毕业要求指标点</span>
-                    { !addOrDeleting && <span className="column-1 edu-txt-right"
-                         >
-                        <a href="javascript:void(0)" className="color-green show-FillTable" 
-                            onClick={ () => { this.add(-1, 0) }} data-tip-down="添加">
-                        <i className="iconfont icon-tianjiafangda"></i></a>
-                    </span> }
-                </p>  
-                {formItems}
-            </div>
-            {/* <Form.Item {...formItemLayoutWithOutLabel}>
-            <Button type="dashed" onClick={ () => { this.add(keys.length === 0 ? -1 : keys[keys.length - 1], keys.length - 1) }} 
+                    <span className="column-2 edu-txt-center">
+                        {getFieldDecorator(`standard_grade[${k}]`, {
+                            initialValue: 75,
+                            // validateTrigger: ['onChange', 'onBlur'],
+                            rules: [{
+                                required: true,
+                                //     whitespace: true,
+                                //     type: 'integer',
+                                message: "请先填写达成标准分",
+                            }],
+                        })(
+                            <InputNumber placeholder="" step={1} min={0} max={100} style={{ width: '80%', marginRight: 8 }} />
+
+                        )}
+                    </span>
+                    {/*  <Input placeholder="" style={{ width: '80%', marginRight: 8 }} /> */}
+
+                    <span className="column-3">
+                        {getFieldDecorator(`subitem_id[${k}]`, {
+                            // validateTrigger: ['onChange', 'onBlur'],
+                            rules: [{
+                                required: true,
+                                //     whitespace: true,
+                                //     type: 'array',
+                                message: "请先选择毕业要求指标点",
+                            }],
+                        })(
+                            <Select
+                                // mode="multiple"
+                                // dropdownMatchSelectWidth={ false }
+                                style={{ width: '100%', marginRight: 8 }}
+                            >
+                                {requirements.map((item, index) => {
+                                    return (<Option value={item.subitem_id.toString()} title={item.subitem_contents}>
+                                        {item.index} : {item.subitem_contents}
+                                    </Option>)
+                                })}
+
+                            </Select>
+                        )}
+                    </span>
+
+                    <span className="column-1 edu-txt-right">
+                        {!addOrDeleting && <a
+                            onClick={() => { this.onRemove(k) }}
+                            className="color-grey-c mr15" data-tip-down="删除">
+                            <i className="iconfont icon-shanchu font-15"></i>
+                        </a>}
+                        {!addOrDeleting && <a
+                            onClick={() => { this.add(k, index + 1) }}
+                            className="color-green show-FillTable"
+                            data-tip-down="添加">
+                            <i className="iconfont icon-tianjiafangda"
+                            ></i>
+                        </a>}
+                    </span>
+
+
+                </Form.Item>
+            </li>
+        ));
+        return (
+
+            <Form onSubmit={this.handleSubmit}>
+                <div className="ListTableLine" id="show-Target-table">
+                    <p className="clearfix">
+                        <span className="column-1">项</span>
+                        <span className="column-1">权重</span>
+                        <span className="column-3">课程目标内容</span>
+                        <span className="column-2 edu-txt-center">达成标准(分)</span>
+                        <span className="column-3">对应毕业要求指标点</span>
+                        {!addOrDeleting && <span className="column-1 edu-txt-right"
+                        >
+                            <a className="color-green show-FillTable"
+                                onClick={() => { this.add(-1, 0) }} data-tip-down="添加">
+                                <i className="iconfont icon-tianjiafangda"></i></a>
+                        </span>}
+                    </p>
+                    {formItems}
+                </div>
+                {/* <Form.Item {...formItemLayoutWithOutLabel}>
+            <Button type="dashed" onClick={ () => { this.add(keys.length === 0 ? -1 : keys[keys.length - 1], keys.length - 1) }}
                     style={{ width: '60%' }}>
                 <Icon type="plus" /> Add field
             </Button>
@@ -460,17 +460,17 @@ class EditableCourseSupportSetting extends Component {
                 <Button type="primary" htmlType="submit">Submit</Button>
             </Form.Item> */}
 
-            <p class="clearfix" style={{ marginTop: '10px'}}>
-                { this.state.errorMsg && <span class="c_red none ml30" id="error_tip" style={{ display: 'inline'}}>
-                    {this.state.errorMsg}
-                </span> }
+                <p className="clearfix" style={{ marginTop: '10px' }}>
+                    {this.state.errorMsg && <span className="c_red none ml30" id="error_tip" style={{ display: 'inline' }}>
+                        {this.state.errorMsg}
+                    </span>}
 
-                <a href="javascript:void(0)" class="defalutSubmitbtn mr20 fr" onClick={this.handleSubmit}>保存</a>
-                <a href="javascript:void(0)" class="defalutCancelbtn mr20 fr" onClick={() => { this.props.setEditableMode(false) } }>取消</a>
-            </p>
-        </Form>
-    );
-  }
+                    <a className="defalutSubmitbtn mr20 fr" onClick={this.handleSubmit}>保存</a>
+                    <a className="defalutCancelbtn mr20 fr" onClick={() => { this.props.setEditableMode(false) }}>取消</a>
+                </p>
+            </Form>
+        );
+    }
 }
 const WrappedEditableCourseSupportSetting = Form.create({ name: 'dynamic_form_item' })(EditableCourseSupportSetting);
 export default WrappedEditableCourseSupportSetting;
diff --git a/src/modules/ecs/subroute/ecCourseSupportSetting/ShowTableCourseSupportSetting.js b/src/modules/ecs/subroute/ecCourseSupportSetting/ShowTableCourseSupportSetting.js
index 25551b72..c798cca7 100644
--- a/src/modules/ecs/subroute/ecCourseSupportSetting/ShowTableCourseSupportSetting.js
+++ b/src/modules/ecs/subroute/ecCourseSupportSetting/ShowTableCourseSupportSetting.js
@@ -27,52 +27,52 @@ const data = [
     }
 ]
 class ShowTableCourseSupportSetting extends Component {
-  componentDidMount = () => {
-    const course_targets = this.props.course_targets;
-  }
-  
-  render() {
-    const course_targets = this.props.course_targets;
-    const is_manager = this.props.year && this.props.year.can_manager;
-    return (
-        <div className="ListTableLine" id="show-Target-table">
-            <p className="clearfix">
-                <span className="column-1">项</span>
-                <span className="column-1">权重</span>
-                <span className="column-3">课程目标内容</span>
-                <span className="column-2 edu-txt-center">达成标准(分)</span>
-                <span className="column-3">对应毕业要求指标点</span>
-                <span className="column-1 edu-txt-right">
-                    {/* <a href="javascript:void(0)" className="color-green show-FillTable" data-tip-down="添加">
+    componentDidMount = () => {
+        const course_targets = this.props.course_targets;
+    }
+
+    render() {
+        const course_targets = this.props.course_targets;
+        const is_manager = this.props.year && this.props.year.can_manager;
+        return (
+            <div className="ListTableLine" id="show-Target-table">
+                <p className="clearfix">
+                    <span className="column-1">项</span>
+                    <span className="column-1">权重</span>
+                    <span className="column-3">课程目标内容</span>
+                    <span className="column-2 edu-txt-center">达成标准(分)</span>
+                    <span className="column-3">对应毕业要求指标点</span>
+                    <span className="column-1 edu-txt-right">
+                        {/* <a   className="color-green show-FillTable" data-tip-down="添加">
                         <i className="iconfont icon-tianjiafangda"></i>
                     </a> */}
 
-                    { is_manager && <a href="javascript:void(0)" 
-                        onClick={() => { this.props.setEditableMode(true)} }
-                        class="color-green EditCourse" data-id="5" data-tip-down="编辑">
-                        <i class="iconfont icon-bianjidaibeijing"></i>
-                    </a> }
-                </span>
-            </p>
-            <div id="course_targets_list">
-                { course_targets.map((item, index) => {
-                    return ( <li className="clearfix" key={index}>
-                        <span className="column-1">{ index + 1 }</span>
-                        <span className="column-1">{ item.target_weight}</span>
-                        <span className="column-3">{ item.target_contents}</span>
-                        <span className="column-2 edu-txt-center">{ item.standard_grade }</span>
-                        <span className="column-3">
-                            <input type="hidden" value="70"></input>
-                            {/* { item.subitem_id } */}
-                            {item.index} : {item.subitem_contents}
-                        </span>
-                        {/* <span className="column-1 edu-txt-right">
-                            <a href="javascript:void(0)" onclick="delete_confirm_box_2('/ec_course_targets/26', '确定要删除该课程目标吗')" className="color-grey-c mr15" data-tip-down="删除"><i className="iconfont icon-shanchu font-15"></i></a>
-                            <a href="javascript:void(0)" className="color-green EditCourse" data-id="26" data-tip-down="编辑"><i className="iconfont icon-bianjidaibeijing"></i></a>
+                        {is_manager && <a
+                            onClick={() => { this.props.setEditableMode(true) }}
+                            className="color-green EditCourse" data-id="5" data-tip-down="编辑">
+                            <i className="iconfont icon-bianjidaibeijing"></i>
+                        </a>}
+                    </span>
+                </p>
+                <div id="course_targets_list">
+                    {course_targets.map((item, index) => {
+                        return (<li className="clearfix" key={index}>
+                            <span className="column-1">{index + 1}</span>
+                            <span className="column-1">{item.target_weight}</span>
+                            <span className="column-3">{item.target_contents}</span>
+                            <span className="column-2 edu-txt-center">{item.standard_grade}</span>
+                            <span className="column-3">
+                                <input type="hidden" value="70"></input>
+                                {/* { item.subitem_id } */}
+                                {item.index} : {item.subitem_contents}
+                            </span>
+                            {/* <span className="column-1 edu-txt-right">
+                            <a   onclick="delete_confirm_box_2('/ec_course_targets/26', '确定要删除该课程目标吗')" className="color-grey-c mr15" data-tip-down="删除"><i className="iconfont icon-shanchu font-15"></i></a>
+                            <a   className="color-green EditCourse" data-id="26" data-tip-down="编辑"><i className="iconfont icon-bianjidaibeijing"></i></a>
                         </span> */}
-                    </li> )
-                })}
-                {/* <li className="clearfix">
+                        </li>)
+                    })}
+                    {/* <li className="clearfix">
                     <span className="column-1">1</span>
                     <span className="column-1">0.1</span>
                     <span className="column-3">理解数据管理技术和数据库技术的发展，区分不同数据模型的作用和特点，描述数据库系统的类型、结构、数据独立性。</span>
@@ -82,8 +82,8 @@ class ShowTableCourseSupportSetting extends Component {
                         <label>1-2</label>：能够运用相关的工程基础和专业知识辨别材料生产中出现的技术、工艺、质量等问题
                     </span>
                     <span className="column-1 edu-txt-right">
-                    <a href="javascript:void(0)" onclick="delete_confirm_box_2('/ec_course_targets/26', '确定要删除该课程目标吗')" className="color-grey-c mr15" data-tip-down="删除"><i className="iconfont icon-shanchu font-15"></i></a>
-                    <a href="javascript:void(0)" className="color-green EditCourse" data-id="26" data-tip-down="编辑"><i className="iconfont icon-bianjidaibeijing"></i></a>
+                    <a   onclick="delete_confirm_box_2('/ec_course_targets/26', '确定要删除该课程目标吗')" className="color-grey-c mr15" data-tip-down="删除"><i className="iconfont icon-shanchu font-15"></i></a>
+                    <a   className="color-green EditCourse" data-id="26" data-tip-down="编辑"><i className="iconfont icon-bianjidaibeijing"></i></a>
                     </span>
                 </li>
                 <li className="clearfix">
@@ -96,8 +96,8 @@ class ShowTableCourseSupportSetting extends Component {
                         <label>1-2</label>：能够运用相关的工程基础和专业知识辨别材料生产中出现的技术、工艺、质量等问题
                     </span>
                     <span className="column-1 edu-txt-right">
-                    <a href="javascript:void(0)" onclick="delete_confirm_box_2('/ec_course_targets/27', '确定要删除该课程目标吗')" className="color-grey-c mr15" data-tip-down="删除"><i className="iconfont icon-shanchu font-15"></i></a>
-                    <a href="javascript:void(0)" className="color-green EditCourse" data-id="27" data-tip-down="编辑"><i className="iconfont icon-bianjidaibeijing"></i></a>
+                    <a   onclick="delete_confirm_box_2('/ec_course_targets/27', '确定要删除该课程目标吗')" className="color-grey-c mr15" data-tip-down="删除"><i className="iconfont icon-shanchu font-15"></i></a>
+                    <a   className="color-green EditCourse" data-id="27" data-tip-down="编辑"><i className="iconfont icon-bianjidaibeijing"></i></a>
                     </span>
                 </li>
                 <li className="clearfix">
@@ -110,8 +110,8 @@ class ShowTableCourseSupportSetting extends Component {
                         <label>1-2</label>：能够运用相关的工程基础和专业知识辨别材料生产中出现的技术、工艺、质量等问题
                     </span>
                     <span className="column-1 edu-txt-right">
-                    <a href="javascript:void(0)" onclick="delete_confirm_box_2('/ec_course_targets/28', '确定要删除该课程目标吗')" className="color-grey-c mr15" data-tip-down="删除"><i className="iconfont icon-shanchu font-15"></i></a>
-                    <a href="javascript:void(0)" className="color-green EditCourse" data-id="28" data-tip-down="编辑"><i className="iconfont icon-bianjidaibeijing"></i></a>
+                    <a   onclick="delete_confirm_box_2('/ec_course_targets/28', '确定要删除该课程目标吗')" className="color-grey-c mr15" data-tip-down="删除"><i className="iconfont icon-shanchu font-15"></i></a>
+                    <a   className="color-green EditCourse" data-id="28" data-tip-down="编辑"><i className="iconfont icon-bianjidaibeijing"></i></a>
                     </span>
                 </li>
                 <li className="clearfix">
@@ -124,8 +124,8 @@ class ShowTableCourseSupportSetting extends Component {
                         <label>5-1</label>：能够选择、使用或开发恰当的技术、资源和工具
                     </span>
                     <span className="column-1 edu-txt-right">
-                    <a href="javascript:void(0)" onclick="delete_confirm_box_2('/ec_course_targets/29', '确定要删除该课程目标吗')" className="color-grey-c mr15" data-tip-down="删除"><i className="iconfont icon-shanchu font-15"></i></a>
-                    <a href="javascript:void(0)" className="color-green EditCourse" data-id="29" data-tip-down="编辑"><i className="iconfont icon-bianjidaibeijing"></i></a>
+                    <a   onclick="delete_confirm_box_2('/ec_course_targets/29', '确定要删除该课程目标吗')" className="color-grey-c mr15" data-tip-down="删除"><i className="iconfont icon-shanchu font-15"></i></a>
+                    <a   className="color-green EditCourse" data-id="29" data-tip-down="编辑"><i className="iconfont icon-bianjidaibeijing"></i></a>
                     </span>
                 </li>
                 <li className="clearfix">
@@ -138,13 +138,13 @@ class ShowTableCourseSupportSetting extends Component {
                         <label>3-1</label>：能够分析材料应用的特定需求确定具体的研发目标
                     </span>
                     <span className="column-1 edu-txt-right">
-                    <a href="javascript:void(0)" onclick="delete_confirm_box_2('/ec_course_targets/30', '确定要删除该课程目标吗')" className="color-grey-c mr15" data-tip-down="删除"><i className="iconfont icon-shanchu font-15"></i></a>
-                    <a href="javascript:void(0)" className="color-green EditCourse" data-id="30" data-tip-down="编辑"><i className="iconfont icon-bianjidaibeijing"></i></a>
+                    <a   onclick="delete_confirm_box_2('/ec_course_targets/30', '确定要删除该课程目标吗')" className="color-grey-c mr15" data-tip-down="删除"><i className="iconfont icon-shanchu font-15"></i></a>
+                    <a   className="color-green EditCourse" data-id="30" data-tip-down="编辑"><i className="iconfont icon-bianjidaibeijing"></i></a>
                     </span>
                 </li> */}
+                </div>
             </div>
-        </div>
-    );
-  }
+        );
+    }
 }
 export default ShowTableCourseSupportSetting;
diff --git a/src/modules/ecs/subroute/ecCourseSupportSetting/index.js b/src/modules/ecs/subroute/ecCourseSupportSetting/index.js
index dd6a72fe..a9d253ef 100644
--- a/src/modules/ecs/subroute/ecCourseSupportSetting/index.js
+++ b/src/modules/ecs/subroute/ecCourseSupportSetting/index.js
@@ -1,176 +1,161 @@
 import React, { Component } from 'react';
 
-import moment from 'moment'
 
 import EditableCourseSupportSetting from './EditableCourseSupportSetting'
 import ShowTableCourseSupportSetting from './ShowTableCourseSupportSetting'
 
-import { Form, Input, Icon, Button, Select } from 'antd';
-
-// import EcTitleCourseEvaluations from '../ecTitle/ecTitle'
-
 import { SnackbarHOC, getUrl } from 'educoder'
 import axios from 'axios'
-import 'antd/dist/antd.css';
-// import '../css/ecCourseEvaluations.css'
 import './style.scss'
 import { ECModalHOC } from '../../common/ECModalHOC'
-const { Option } = Select;
 
 // TODO 公共方法 或 抽取到顶层组件
 let _url_origin = getUrl()
 const $ = window.$
-// https://www.educoder.net/stylesheets/educoder/edu-all.css?1546618720
-// if (!window['EcCourseSupportSettingLoaded']) {
-//     $('head').append( $('<link rel="stylesheet" type="text/css" />')
-//         .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440977`) );
-//     window['EcCourseSupportSettingLoaded'] = true
-// }
-
 
 
 class EcCourseSupportSetting extends Component {
-  constructor(props) {
-    super(props)
-    this.state = {
-        editableMode: false,
-        requirements: []
-    }
-  }
-  updateCourseTargets = (course_targets) => {
-    const ec_course_id = this.props.match.params.ec_course_id;
-
-    const url = `/ec_courses/${ec_course_id}/crud_targets`
-
-    // 后台数据存的weigths
-    course_targets.forEach( (item,index) => {
-        course_targets[index].weigths = item.target_weight
-        delete course_targets[index].target_weight
-    })
-    axios.post(url, {
-        "targets": course_targets
+    constructor(props) {
+        super(props)
+        this.state = {
+            editableMode: false,
+            requirements: []
         }
-    ).then((response) => {
-        if (!response.data || response.data.status == -1) {
-            this.props.showModal('提示', '接口异常或无数据')
-            return ;
-        }
-        let map = this.getSubitemIdMap()
-        course_targets.forEach( (item,index) => {
-            course_targets[index].target_weight = item.weigths
-            course_targets[index].index = map[item.subitem_id].index
-            course_targets[index].subitem_contents = map[item.subitem_id].subitem_contents
-            delete course_targets[index].weigths
-        })
-        // subitem_contents
-        this.setState({ course_targets })
-        this.setEditableMode(false)
-    }).catch((error) => {
-        console.log(error)
-    })  
-
-    
-  }
-  getSubitemIdMap = () => {
-    if (!this.state.requirements) {
-        return {}
     }
-    let map = {}
-    this.state.requirements.forEach( (item,index) => {
-        map[item.subitem_id] = item
-    })
-    return map;
-  }
-  fetchRequirements = () => {
-    const url = `/ec_years/${this.props.year.id}/graduation_subitems.json`  
-    
-    axios.get(url, {
+    updateCourseTargets = (course_targets) => {
+        const ec_course_id = this.props.match.params.ec_course_id;
 
+        const url = `/ec_courses/${ec_course_id}/crud_targets`
+
+        // 后台数据存的weigths
+        course_targets.forEach((item, index) => {
+            course_targets[index].weigths = item.target_weight
+            delete course_targets[index].target_weight
         })
-        .then((response) => {
-            if (response.data && response.data.graduation_subitems) {
-                const requirements = response.data.graduation_subitems.map((item, index) => {
-                    return {
-                        index: `${item.graduation_requirement_position}-${item.position}`,
-                        subitem_contents: item.content,
-                        subitem_id: item.id,
-                    }
-                })
-                this.setState({ requirements })
-            } else {
+        axios.post(url, {
+            "targets": course_targets
+        }
+        ).then((response) => {
+            if (!response.data || response.data.status == -1) {
                 this.props.showModal('提示', '接口异常或无数据')
-                // 服务端返回的数据有误
+                return;
             }
+            let map = this.getSubitemIdMap()
+            course_targets.forEach((item, index) => {
+                course_targets[index].target_weight = item.weigths
+                course_targets[index].index = map[item.subitem_id].index
+                course_targets[index].subitem_contents = map[item.subitem_id].subitem_contents
+                delete course_targets[index].weigths
+            })
+            // subitem_contents
+            this.setState({ course_targets })
+            this.setEditableMode(false)
+        }).catch((error) => {
+            console.log(error)
+        })
+
+
+    }
+    getSubitemIdMap = () => {
+        if (!this.state.requirements) {
+            return {}
+        }
+        let map = {}
+        this.state.requirements.forEach((item, index) => {
+            map[item.subitem_id] = item
+        })
+        return map;
+    }
+    fetchRequirements = () => {
+        const url = `/ec_years/${this.props.year.id}/graduation_subitems.json`
+
+        axios.get(url, {
 
         })
-        .catch(function (error) {
-            console.log(error);
-        });
-  }
-  fetchCourseTargets = () => {
-     const ec_course_id = this.props.match.params.ec_course_id;
-     //这里给了一个默认的参数。。。。。。。。。。。。。
-    const course_id = 706
-    const url = `/ec_courses/${course_id}/course_targets.json`
-    // `/ec_courses/${ec_course_id}/ec_course_support_setting_data`
-
-    axios.get(url, {
-    
-        })
-        .then((response) => {
-            if (response.data && response.data.course_targets) {
-                if (response.data.course_targets.length === 0) {
-                    response.data.course_targets = [
-                        {"target_contents":"","target_weight":'',"position": 1,"standard_grade":75,"subitem_id":"","index":"","subitem_contents":""},
-                        {"target_contents":"","target_weight":'',"position": 2,"standard_grade":75,"subitem_id":"","index":"","subitem_contents":""},
-                        {"target_contents":"","target_weight":'',"position": 3,"standard_grade":75,"subitem_id":"","index":"","subitem_contents":""},
-                    ]
-                    this.setEditableMode(true)
-                } else {
-                    response.data.course_targets = response.data.course_targets.map((item, index) => {
-                        const graduation_subitem = item.graduation_subitem
+            .then((response) => {
+                if (response.data && response.data.graduation_subitems) {
+                    const requirements = response.data.graduation_subitems.map((item, index) => {
                         return {
-                            index: `${graduation_subitem.position}-${graduation_subitem.graduation_requirement_position}`,
-                            position: index + 1,
-                            standard_grade: item.standard_grade,
-                            subitem_contents: graduation_subitem.content,
-                            subitem_id: graduation_subitem.id,
-                            target_contents: item.content,
-                            target_id: item.id,
-                            target_weight: item.weight
+                            index: `${item.graduation_requirement_position}-${item.position}`,
+                            subitem_contents: item.content,
+                            subitem_id: item.id,
                         }
                     })
+                    this.setState({ requirements })
+                } else {
+                    this.props.showModal('提示', '接口异常或无数据')
+                    // 服务端返回的数据有误
                 }
-                this.setState({ ...response.data })
-            } else {
-                this.props.showModal('提示', '接口异常或无数据')
-                // 服务端返回的数据有误
-            }
+
+            })
+            .catch(function (error) {
+                console.log(error);
+            });
+    }
+    fetchCourseTargets = () => {
+        const ec_course_id = this.props.match.params.ec_course_id;
+        //这里给了一个默认的参数。。。。。。。。。。。。。
+        const course_id = 706
+        const url = `/ec_courses/${course_id}/course_targets.json`
+        // `/ec_courses/${ec_course_id}/ec_course_support_setting_data`
+
+        axios.get(url, {
 
         })
-        .catch(function (error) {
-            console.log(error);
-        });
-    
-    
-    // test data 
-    // this.setState({ ...fake_data })
-    
-  }
-  getNavigationData=(ec_course_id)=>{
-      return;
+            .then((response) => {
+                if (response.data && response.data.course_targets) {
+                    if (response.data.course_targets.length === 0) {
+                        response.data.course_targets = [
+                            { "target_contents": "", "target_weight": '', "position": 1, "standard_grade": 75, "subitem_id": "", "index": "", "subitem_contents": "" },
+                            { "target_contents": "", "target_weight": '', "position": 2, "standard_grade": 75, "subitem_id": "", "index": "", "subitem_contents": "" },
+                            { "target_contents": "", "target_weight": '', "position": 3, "standard_grade": 75, "subitem_id": "", "index": "", "subitem_contents": "" },
+                        ]
+                        this.setEditableMode(true)
+                    } else {
+                        response.data.course_targets = response.data.course_targets.map((item, index) => {
+                            const graduation_subitem = item.graduation_subitem
+                            return {
+                                index: `${graduation_subitem.position}-${graduation_subitem.graduation_requirement_position}`,
+                                position: index + 1,
+                                standard_grade: item.standard_grade,
+                                subitem_contents: graduation_subitem.content,
+                                subitem_id: graduation_subitem.id,
+                                target_contents: item.content,
+                                target_id: item.id,
+                                target_weight: item.weight
+                            }
+                        })
+                    }
+                    this.setState({ ...response.data })
+                } else {
+                    this.props.showModal('提示', '接口异常或无数据')
+                    // 服务端返回的数据有误
+                }
+
+            })
+            .catch(function (error) {
+                console.log(error);
+            });
+
+
+        // test data 
+        // this.setState({ ...fake_data })
+
+    }
+    getNavigationData = (ec_course_id) => {
+        return;
         // const jol =`/ec_major_schools/get_navigation_data?ec_year_id=`+ec_year_id+"&ec_course_id="+ec_course_id;
-        const jol =`/ec_major_schools/get_navigation_data?ec_course_id=`+ec_course_id;
+        const jol = `/ec_major_schools/get_navigation_data?ec_course_id=` + ec_course_id;
         axios.get(jol, {
             // withCredentials: true,
         })
             .then((response) => {
-                if(response.status===200){
+                if (response.status === 200) {
                     // if(response.data.allow_visit===false){
                     //     window.location.href="/403"
                     //  }
                     this.setState({
-                        schooldata:response.data
+                        schooldata: response.data
                     })
                 }
 
@@ -179,58 +164,58 @@ class EcCourseSupportSetting extends Component {
                 console.log(error);
             });
     }
-  componentDidMount = () => {
-    // console.log('componentDidMountEcCourseSupportSetting');
-    // console.log(this.props);
-    // console.log(this.props.match);
-    // console.log(this.props.match.params);
-    // console.log(this.props.match.params.ec_course_id);
+    componentDidMount = () => {
+        // console.log('componentDidMountEcCourseSupportSetting');
+        // console.log(this.props);
+        // console.log(this.props.match);
+        // console.log(this.props.match.params);
+        // console.log(this.props.match.params.ec_course_id);
 
-    this.fetchCourseTargets();
-    const ec_course_id = this.props.match.params.ec_course_id;
+        this.fetchCourseTargets();
+        const ec_course_id = this.props.match.params.ec_course_id;
 
-    this.getNavigationData(ec_course_id);
-    this.props.Ontitine("ec_course_support_setting");
-  }
-  
-  setEditableMode = (mode) => {
-    if (mode) {
-        this.fetchRequirements()
+        this.getNavigationData(ec_course_id);
+        this.props.Ontitine("ec_course_support_setting");
     }
-    this.setState({ editableMode: mode })
-  }
-  
-  render() {
-    let { editableMode, schooldata, is_manager } = this.state;
-    if (!schooldata) schooldata = {}
-    const course_targets = this.state.course_targets;
 
-    return (
-        <React.Fragment>
-       {/* <div className="newMain clearfix courseSupport">
+    setEditableMode = (mode) => {
+        if (mode) {
+            this.fetchRequirements()
+        }
+        this.setState({ editableMode: mode })
+    }
+
+    render() {
+        let { editableMode, schooldata, is_manager } = this.state;
+        if (!schooldata) schooldata = {}
+        const course_targets = this.state.course_targets;
+
+        return (
+            <React.Fragment>
+                {/* <div className="newMain clearfix courseSupport">
          <div className="educontent mb50 mt60">
          </div>
        </div> */}
 
-            {/* <EcTitleCourseEvaluations
+                {/* <EcTitleCourseEvaluations
                 {...this.props}
                 schooldata={schooldata}
                 ecComponentState={'ecCompletion'}
                 ecpath={"ec_course_support_setting"}
             ></EcTitleCourseEvaluations> */}
 
-            {/* <p class="clearfix padding20-30 bor-bottom-greyE">
-                <span class="fl font-18">
-                    <a href="/ec_major_schools/1/academic_years/1/ec_course_setting" class="color-grey-9">课程体系</a>
-                    <span class="color-grey-9"> &gt; </span>
+                {/* <p className="clearfix padding20-30 bor-bottom-greyE">
+                <span className="fl font-18">
+                    <a href="/ec_major_schools/1/academic_years/1/ec_course_setting" className="color-grey-9">课程体系</a>
+                    <span className="color-grey-9"> &gt; </span>
                     {schooldata && ( schooldata.ec_course_name || '')}
                 </span>
-                <a href="/ec_courses/1/export_ec_course_targets.xls" class="white-btn edu-blueback-btn fr"
+                <a href="/ec_courses/1/export_ec_course_targets.xls" className="white-btn edu-blueback-btn fr"
                     style={{ 'marginTop': '4px' }}
                 >导出课程目标</a>
             </p> */}
 
-            {/* <div className="edu-back-white eacourse">
+                {/* <div className="edu-back-white eacourse">
 
                 <p className="clearfix padding20-30 bor-bottom-greyE" id="SystemParametersP">
                     <a href={schooldata.course_setting_url} className="TrainingLecturer color-grey-9">课程体系 </a> >
@@ -263,32 +248,32 @@ class EcCourseSupportSetting extends Component {
                 </div>
             </div> */}
 
-          {/* && is_manager  */}
-          <div>
-          { course_targets&&course_targets.length>=0 ? (editableMode ? 
-              <EditableCourseSupportSetting
-                  setEditableMode={this.setEditableMode}
-                  {...this.props}
-                  {...this.state}
-                  updateCourseTargets={this.updateCourseTargets}
-                ></EditableCourseSupportSetting>
-              : <ShowTableCourseSupportSetting
-                  setEditableMode={this.setEditableMode}
-                  {...this.props}
-                  {...this.state}
-                ></ShowTableCourseSupportSetting> ) : ''
-          }
-          </div>
+                {/* && is_manager  */}
+                <div>
+                    {course_targets && course_targets.length >= 0 ? (editableMode ?
+                        <EditableCourseSupportSetting
+                            setEditableMode={this.setEditableMode}
+                            {...this.props}
+                            {...this.state}
+                            updateCourseTargets={this.updateCourseTargets}
+                        ></EditableCourseSupportSetting>
+                        : <ShowTableCourseSupportSetting
+                            setEditableMode={this.setEditableMode}
+                            {...this.props}
+                            {...this.state}
+                        ></ShowTableCourseSupportSetting>) : ''
+                    }
+                </div>
 
-          {/* <EditableCourseSupportSetting
+                {/* <EditableCourseSupportSetting
             setEditableMode={this.setEditableMode}
           ></EditableCourseSupportSetting>
           <ShowTableCourseSupportSetting
             setEditableMode={this.setEditableMode}
           ></ShowTableCourseSupportSetting> */}
-        </React.Fragment>
-    );
-  }
+            </React.Fragment>
+        );
+    }
 }
 
-export default ECModalHOC() ( SnackbarHOC() (   ( EcCourseSupportSetting ) ) );
+export default ECModalHOC()(SnackbarHOC()((EcCourseSupportSetting)));
diff --git a/src/modules/ecs/subroute/ecStudentList/EcStudentList.js b/src/modules/ecs/subroute/ecStudentList/EcStudentList.js
index e8876b7a..b36962eb 100644
--- a/src/modules/ecs/subroute/ecStudentList/EcStudentList.js
+++ b/src/modules/ecs/subroute/ecStudentList/EcStudentList.js
@@ -2,216 +2,213 @@ import React, { Component } from 'react';
 
 import axios from 'axios';
 
-import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC';
+import { SnackbarHOC, getImageUrl } from 'educoder'
 
-import { SnackbarHOC,getImageUrl } from 'educoder'
+import { Pagination, Upload, Modal, Checkbox, Spin } from 'antd';
 
-import { Pagination,Upload,Modal,Checkbox,Spin } from 'antd';
-
-import EcTitleCourseEvaluations from '../../ecTitle/ecTitle'
-
-import 'antd/dist/antd.css';
 
 import './ecStudentList.css';
 
-const $ = window.$;
-
 class EcStudentList extends Component {
     constructor(props) {
         super(props)
-        this.state={
-            majorschoollist:undefined,
-            titlemessage:"提示",
+        this.state = {
+            majorschoollist: undefined,
+            titlemessage: "提示",
             // ecComponentState:"ecStudentList",
-            visible:false,
-            Modallist:'',
-            Modallisttypes:0,
-            studentall:false,
-            student_id:undefined,
-            Modallisttypess:0,
-            ismanager:false,
-            isSpin:false,
-            pages:1,
-            per_pages:20,
-            total_student:0,
-            Myschoolstudents:[],
+            visible: false,
+            Modallist: '',
+            Modallisttypes: 0,
+            studentall: false,
+            student_id: undefined,
+            Modallisttypess: 0,
+            ismanager: false,
+            isSpin: false,
+            pages: 1,
+            per_pages: 20,
+            total_student: 0,
+            Myschoolstudents: [],
         }
     }
-    componentDidMount(){
+    componentDidMount() {
         window.document.title = '学生列表';
-        let major_id=this.props.match.params.majorId;
-        let year_id=this.props.match.params.yearId;
+        let major_id = this.props.match.params.majorId;
+        let year_id = this.props.match.params.yearId;
 
-        const url ='/ec_years/'+year_id+'/students.json';
-            axios.get(url, {params: {
-                page:this.state.pages,
-                per_page:this.state.per_pages,
-            }}).then((response) => {
-                if(response){
-                    if(response.status){
-                        if(response.status===200){
-                            this.setState({
-                                total_student:response.data.count,
-                                majorschoollist:response.data,
-                                ismanager:response.data.ismanager,
-                            });
-                            try {
-                                if(response.data.students.length>0){
-                                    var mst=response.data.students;
-                                    for(var i=0;i<mst.length;i++){
-                                        mst[i].istrue=false;
-                                    }
-                                    this.setState({
-                                        Myschoolstudents:mst
-                                    });
+        const url = '/ec_years/' + year_id + '/students.json';
+        axios.get(url, {
+            params: {
+                page: this.state.pages,
+                per_page: this.state.per_pages,
+            }
+        }).then((response) => {
+            if (response) {
+                if (response.status) {
+                    if (response.status === 200) {
+                        this.setState({
+                            total_student: response.data.count,
+                            majorschoollist: response.data,
+                            ismanager: response.data.ismanager,
+                        });
+                        try {
+                            if (response.data.students.length > 0) {
+                                var mst = response.data.students;
+                                for (var i = 0; i < mst.length; i++) {
+                                    mst[i].istrue = false;
                                 }
-                            }catch (e) {
                                 this.setState({
-                                    Myschoolstudents:[]
+                                    Myschoolstudents: mst
                                 });
                             }
-
+                        } catch (e) {
+                            this.setState({
+                                Myschoolstudents: []
+                            });
                         }
+
                     }
                 }
+            }
 
-            })
+        })
             .catch(function (error) {
                 console.log(error);
             });
 
     }
-    uploadcomponentDidMount(){
-        let major_id=this.props.match.params.majorId;
-        let year_id=this.props.match.params.yearId;
-        const url ='/ec_years/'+year_id+'/students.json';
-        axios.get(url, {params: {
+    uploadcomponentDidMount() {
+        let major_id = this.props.match.params.majorId;
+        let year_id = this.props.match.params.yearId;
+        const url = '/ec_years/' + year_id + '/students.json';
+        axios.get(url, {
+            params: {
                 page: this.state.pages,
                 per_page: this.state.per_pages,
             }
-          }
+        }
         ).then((response) => {
-              if(response){
-                  if(response.status){
-                      if(response.status===200){
-                          this.setState({
-                              total_student:response.data.count,
-                              majorschoollist:response.data,
-                              ismanager:response.data.ismanager,
-                          });
-                          try {
-                              if(response.data.students.length>0){
-                                  var mst=response.data.students;
-                                  for(var i=0;i<mst.length;i++){
-                                      mst[i].istrue=false;
-                                  }
-                                  this.setState({
-                                      Myschoolstudents:mst
-                                  });
-                              }
-                          }catch (e) {
-                              this.setState({
-                                  Myschoolstudents:[]
-                              });
-                          }
+            if (response) {
+                if (response.status) {
+                    if (response.status === 200) {
+                        this.setState({
+                            total_student: response.data.count,
+                            majorschoollist: response.data,
+                            ismanager: response.data.ismanager,
+                        });
+                        try {
+                            if (response.data.students.length > 0) {
+                                var mst = response.data.students;
+                                for (var i = 0; i < mst.length; i++) {
+                                    mst[i].istrue = false;
+                                }
+                                this.setState({
+                                    Myschoolstudents: mst
+                                });
+                            }
+                        } catch (e) {
+                            this.setState({
+                                Myschoolstudents: []
+                            });
+                        }
 
-                      }
-                  }
-              }
+                    }
+                }
+            }
         })
-        .catch(function (error) {
-            console.log(error);
-        });
+            .catch(function (error) {
+                console.log(error);
+            });
     }
-        
 
-    windowsgoblack=()=>{
+
+    windowsgoblack = () => {
         window.history.go(-1)
     }
 
 
-    uploadfile=(file)=>{
+    uploadfile = (file) => {
         console.log("导入的文件");
         console.log(file);
-        this.setState({isSpin:true})
-        let {majorschoollist}=this.state;
-        let year_id=this.props.match.params.yearId;
-        let Url ='/ec_years/'+year_id+'/students/import.json';
+        this.setState({ isSpin: true })
+        let { majorschoollist } = this.state;
+        let year_id = this.props.match.params.yearId;
+        let Url = '/ec_years/' + year_id + '/students/import.json';
         const config = {
             headers: { "Content-Type": "multipart/form-data" }
         };
         const form = new FormData();
         form.append('file', file.file);
-        axios.post(Url,form
-        ,config).then((response) => {
-            if(response.data.status===0){
-                // message.success('已成功导入'+response.data.count+"条数据！");
-                this.setState({
-                    // titlemessage: response.data.message+"(支撑关系变更)",
-                    Modallist: '已成功导入'+response.data.success_count+"条数据！",
-                    Modallisttype:true,
-                    Modallisttypes:1,
-                    Modallisttypess:0,
-                    isSpin:false
-                })
-            }else{
-                // message.warning(response.data.message);
-                this.setState({
-                    // titlemessage: response.data.message+"(支撑关系变更)",
-                    Modallist:response.data.message,
-                    Modallisttype:true,
-                    Modallisttypes:0,
-                    Modallisttypess:0,
-                    isSpin:false
-                })
-            }
-        }).catch((error) => {
-            console.log(error)
-        })
+        axios.post(Url, form
+            , config).then((response) => {
+                if (response.data.status === 0) {
+                    // message.success('已成功导入'+response.data.count+"条数据！");
+                    this.setState({
+                        // titlemessage: response.data.message+"(支撑关系变更)",
+                        Modallist: '已成功导入' + response.data.success_count + "条数据！",
+                        Modallisttype: true,
+                        Modallisttypes: 1,
+                        Modallisttypess: 0,
+                        isSpin: false
+                    })
+                } else {
+                    // message.warning(response.data.message);
+                    this.setState({
+                        // titlemessage: response.data.message+"(支撑关系变更)",
+                        Modallist: response.data.message,
+                        Modallisttype: true,
+                        Modallisttypes: 0,
+                        Modallisttypess: 0,
+                        isSpin: false
+                    })
+                }
+            }).catch((error) => {
+                console.log(error)
+            })
     }
-    hidemodeldelete=(Modallisttypes)=>{
+    hidemodeldelete = (Modallisttypes) => {
         this.setState({
-            Modallisttype:false,
-            Modallist:'',
-            Modallisttypess:0
+            Modallisttype: false,
+            Modallist: '',
+            Modallisttypess: 0
         })
-        if(Modallisttypes===1){
-            // window.location.reload();
+        if (Modallisttypes === 1) {
             this.uploadcomponentDidMount();
         }
     }
 
-    showecStudentList=(page)=>{
+    showecStudentList = (page) => {
 
-        let major_id=this.props.match.params.majorId;
-        let year_id=this.props.match.params.yearId;
-        const url ='/ec_years/'+year_id+'/students.json';
-        axios.get(url, {params: {
-            page:page,
-            per_page:this.state.per_pages,
-        }}).then((response) => {
-            if(response){
-                if(response.status){
-                    if(response.status===200){
+        let major_id = this.props.match.params.majorId;
+        let year_id = this.props.match.params.yearId;
+        const url = '/ec_years/' + year_id + '/students.json';
+        axios.get(url, {
+            params: {
+                page: page,
+                per_page: this.state.per_pages,
+            }
+        }).then((response) => {
+            if (response) {
+                if (response.status) {
+                    if (response.status === 200) {
                         this.setState({
-                            total_student:response.data.count,
-                            majorschoollist:response.data,
-                            ismanager:response.data.ismanager,
-                            pages:page,
+                            total_student: response.data.count,
+                            majorschoollist: response.data,
+                            ismanager: response.data.ismanager,
+                            pages: page,
                         });
                         try {
-                            if(response.data.students.length>0){
-                                var mst=response.data.students;
-                                for(var i=0;i<mst.length;i++){
-                                    mst[i].istrue=false;
+                            if (response.data.students.length > 0) {
+                                var mst = response.data.students;
+                                for (var i = 0; i < mst.length; i++) {
+                                    mst[i].istrue = false;
                                 }
                                 this.setState({
-                                    Myschoolstudents:mst
+                                    Myschoolstudents: mst
                                 });
                             }
-                        }catch (e) {
+                        } catch (e) {
                             this.setState({
-                                Myschoolstudents:[]
+                                Myschoolstudents: []
                             });
                         }
 
@@ -219,88 +216,90 @@ class EcStudentList extends Component {
                 }
             }
         }).catch(function (error) {
-                console.log(error);
-            });
+            console.log(error);
+        });
     };
-     //全选
-    onChangestudentall=(e)=>{
-        let {Myschoolstudents}=this.state;
-        let mewmajorschoollist=Myschoolstudents
-        for(var i=0; i<mewmajorschoollist.length; i++){
-            mewmajorschoollist[i].istrue=e.target.checked
+    //全选
+    onChangestudentall = (e) => {
+        let { Myschoolstudents } = this.state;
+        let mewmajorschoollist = Myschoolstudents
+        for (var i = 0; i < mewmajorschoollist.length; i++) {
+            mewmajorschoollist[i].istrue = e.target.checked
         }
         this.setState({
-            studentall:e.target.checked,
-            Myschoolstudents:mewmajorschoollist
-           })
+            studentall: e.target.checked,
+            Myschoolstudents: mewmajorschoollist
+        })
     };
     //单选
-    onChangestudent=(e)=>{
-        let {Myschoolstudents,studentall}=this.state;
-        let mewmajorschoollist=Myschoolstudents;
-        let newstudentall=studentall;
-        if(e.target.checked===false){
-            newstudentall=false
+    onChangestudent = (e) => {
+        let { Myschoolstudents, studentall } = this.state;
+        let mewmajorschoollist = Myschoolstudents;
+        let newstudentall = studentall;
+        if (e.target.checked === false) {
+            newstudentall = false
         }
-        for(var i=0; i<mewmajorschoollist.length; i++){
-            if(i===e.target.index&&e.target.id===mewmajorschoollist[i].student_id){
-                mewmajorschoollist[i].istrue=e.target.checked
+        for (var i = 0; i < mewmajorschoollist.length; i++) {
+            if (i === e.target.index && e.target.id === mewmajorschoollist[i].student_id) {
+                mewmajorschoollist[i].istrue = e.target.checked
             }
         }
-       this.setState({
-         student_id:e.target.id,
-         studentall:newstudentall,
-        Myschoolstudents:mewmajorschoollist
-       })
+        this.setState({
+            student_id: e.target.id,
+            studentall: newstudentall,
+            Myschoolstudents: mewmajorschoollist
+        })
     };
-     // 删除提示
-    deletelistbth=()=>{
-        let {Myschoolstudents,studentall} =this.state;
-        let studentalltype=0
-        for(var i=0; i<Myschoolstudents.length; i++){
-            if(Myschoolstudents[i].istrue===true){
-                studentalltype=1
+    // 删除提示
+    deletelistbth = () => {
+        let { Myschoolstudents, studentall } = this.state;
+        let studentalltype = 0
+        for (var i = 0; i < Myschoolstudents.length; i++) {
+            if (Myschoolstudents[i].istrue === true) {
+                studentalltype = 1
             }
         }
-        if(studentall===true||studentalltype===1){
+        if (studentall === true || studentalltype === 1) {
             this.setState({
                 Modallist: '确定删除这些学生吗？',
-                Modallisttype:true,
-                Modallisttypess:1
-            })    
-        }else{
+                Modallisttype: true,
+                Modallisttypess: 1
+            })
+        } else {
             this.setState({
                 Modallist: '请选择学生！',
-                Modallisttype:true
-            })     
+                Modallisttype: true
+            })
         }
     };
     //删除学生
-    deletelistbthenters=()=>{
-       debugger
-        let {Myschoolstudents,studentall} =this.state;
-        let major_id=this.props.match.params.majorId;
-        let year_id=this.props.match.params.yearId;
-        let newstudent_id=[];
-        if(studentall===false){
-            for(var i=0; i<Myschoolstudents.length; i++){
-                if(Myschoolstudents[i].istrue===true){
+    deletelistbthenters = () => {
+
+        let { Myschoolstudents, studentall } = this.state;
+        let major_id = this.props.match.params.majorId;
+        let year_id = this.props.match.params.yearId;
+        let newstudent_id = [];
+        if (studentall === false) {
+            for (var i = 0; i < Myschoolstudents.length; i++) {
+                if (Myschoolstudents[i].istrue === true) {
                     newstudent_id.push(Myschoolstudents[i].id)
                 }
             }
         }
-        let url ='/ec_years/'+year_id+'/students.json'
-        axios.delete(url,{data:{
-                ids:newstudent_id,
-            }}).then((response) => {
-            if(response.data.status===0){
-               this.setState({
+        let url = '/ec_years/' + year_id + '/students.json'
+        axios.delete(url, {
+            data: {
+                ids: newstudent_id,
+            }
+        }).then((response) => {
+            if (response.data.status === 0) {
+                this.setState({
                     // Modallist: "删除成功！",
                     // Modallisttype:true,
-                    Modallisttypes:1,
-                    Modallisttypess:0
-               })
-               this.hidemodeldelete(1);
+                    Modallisttypes: 1,
+                    Modallisttypess: 0
+                })
+                this.hidemodeldelete(1);
             }
         }).catch((error) => {
             console.log(error)
@@ -319,7 +318,7 @@ class EcStudentList extends Component {
             total_student,
             ismanager,
             Myschoolstudents
-        }=this.state;
+        } = this.state;
         const uploadProps = {
             name: 'file',
 
@@ -336,126 +335,126 @@ class EcStudentList extends Component {
             }
         }
         return (
-          <div className="newMain clearfix">
-             <Modal
-                 title={titlemessage}
-                 // visible={modeldelet===true&&listid===list.id?true:false}
-                 visible={Modallisttype}
-                 className={"ecmodeldelet"}
-                 closable={false}
-                 footer={null}
-             >
-                 <div className="task-popup-content">
-                     <div className="task-popup-text-center font-14">{Modallist}</div>
-                 </div>
-                 <div className="task-popup-submit clearfix">
-                     <a onClick={()=>this.hidemodeldelete(1)} className="task-btn fl">取消</a>
-                     {
-                         Modallisttypess===0?<a className="task-btn task-btn-orange fr"
-                         onClick={()=>this.hidemodeldelete(1)}
-                         >确定</a>:<a className="task-btn task-btn-orange fr"
-                             onClick={this.deletelistbthenters}
-                         >确定</a>
-                     }
+            <div className="newMain clearfix">
+                <Modal
+                    title={titlemessage}
+                    // visible={modeldelet===true&&listid===list.id?true:false}
+                    visible={Modallisttype}
+                    className={"ecmodeldelet"}
+                    closable={false}
+                    footer={null}
+                >
+                    <div className="task-popup-content">
+                        <div className="task-popup-text-center font-14">{Modallist}</div>
+                    </div>
+                    <div className="task-popup-submit clearfix">
+                        <a onClick={() => this.hidemodeldelete(1)} className="task-btn fl">取消</a>
+                        {
+                            Modallisttypess === 0 ? <a className="task-btn task-btn-orange fr"
+                                onClick={() => this.hidemodeldelete(1)}
+                            >确定</a> : <a className="task-btn task-btn-orange fr"
+                                onClick={this.deletelistbthenters}
+                            >确定</a>
+                        }
 
-                 </div>
-             </Modal>
-             <div className="educontent mb290">
-                {/*<div className="clearfix padding20-30 bor-bottom-greyE mb10 edu-back-white">*/}
-                     {/*<span className="fl font-18 courseSystem ">学生列表</span>*/}
-                     {/*<a className="fr font-15 courseSystem" onClick={this.windowsgoblack}>返回</a>*/}
-                 {/*</div>*/}
+                    </div>
+                </Modal>
+                <div className="educontent mb290">
+                    {/*<div className="clearfix padding20-30 bor-bottom-greyE mb10 edu-back-white">*/}
+                    {/*<span className="fl font-18 courseSystem ">学生列表</span>*/}
+                    {/*<a className="fr font-15 courseSystem" onClick={this.windowsgoblack}>返回</a>*/}
+                    {/*</div>*/}
 
-                 <div className="edu-back-white ">
+                    <div className="edu-back-white ">
 
-                     <div className="clearfix padding20-30 bor-bottom-greyE"><span
-                         className=" font-18 courseSystem">学生列表（
+                        <div className="clearfix padding20-30 bor-bottom-greyE"><span
+                            className=" font-18 courseSystem">学生列表（
                          {total_student}
                          ）</span>
-                         <div className="color-grey-9 mr10">提供模板支持导入学生信息(请先下载模板)
+                            <div className="color-grey-9 mr10">提供模板支持导入学生信息(请先下载模板)
                              <a className={"color-blue"} target="_blank" href={'/forums/3533'}>查看详情</a>
-                         </div>
-                     </div>
+                            </div>
+                        </div>
 
-                     <div className="padding20-30 padbottom" id="training_objective_contents">
-                     {ismanager===false?"":
-                     <span className="mr30">请使用导入模板（<a href={'/attachments/download/279190/01_学生列表导入模板2.0.xls'} className="color-green"><i className="iconfont icon-fujian mr5 color-green font-16"></i>点击下载</a>），将本学年所有参与的学生导入系统，以便录入教学活动相关数据</span>
-                     }
-                         <a className="white-btn edu-orangeback-btn fr mr10" >
-                         {ismanager===false?"":<Upload
-                             {...uploadProps}
-                             showUploadList={false}
-                             style={{color:'#fff'}}
-                         >
-                             导入
+                        <div className="padding20-30 padbottom" id="training_objective_contents">
+                            {ismanager === false ? "" :
+                                <span className="mr30">请使用导入模板（<a href={'/attachments/download/279190/01_学生列表导入模板2.0.xls'} className="color-green"><i className="iconfont icon-fujian mr5 color-green font-16"></i>点击下载</a>），将本学年所有参与的学生导入系统，以便录入教学活动相关数据</span>
+                            }
+                            <a className="white-btn edu-orangeback-btn fr mr10" >
+                                {ismanager === false ? "" : <Upload
+                                    {...uploadProps}
+                                    showUploadList={false}
+                                    style={{ color: '#fff' }}
+                                >
+                                    导入
                          </Upload>}
-                         </a>
-                     </div>
+                            </a>
+                        </div>
 
-                     <div  id="training_objective_contents" className='deletelist' >
-                         {ismanager===false?"":<div className="white-btn deletebth ml30 mr10" onClick={this.deletelistbth}>
-                             删除
+                        <div id="training_objective_contents" className='deletelist' >
+                            {ismanager === false ? "" : <div className="white-btn deletebth ml30 mr10" onClick={this.deletelistbth}>
+                                删除
                          </div>}
-                     </div>
-                     <Spin spinning={this.state.isSpin}>
-                         <div>
-                         <div className="ListTableLine minH-500 edu-back-white" id="listContent">
-                         <p className="clearfix">
-                             <span className="column-No column-2 relative">
-                             <Checkbox
-                                 className={'mr20 changestudent'}
-                                 checked={studentall===true?true:false}
-                                 onChange={this.onChangestudentall}></Checkbox>
+                        </div>
+                        <Spin spinning={this.state.isSpin}>
+                            <div>
+                                <div className="ListTableLine minH-500 edu-back-white" id="listContent">
+                                    <p className="clearfix">
+                                        <span className="column-No column-2 relative">
+                                            <Checkbox
+                                                className={'mr20 changestudent'}
+                                                checked={studentall === true ? true : false}
+                                                onChange={this.onChangestudentall}></Checkbox>
                              序号
                              </span>
-                             <span className="column-2">姓名</span>
-                             <span className="column-2">学号</span>
-                         </p>
-                             <style>{
-                                 `
+                                        <span className="column-2">姓名</span>
+                                        <span className="column-2">学号</span>
+                                    </p>
+                                    <style>{
+                                        `
                                  .myslispan{
                                   display: flex;
                                   flex-direction:initial;
                                  }
                                  `
-                             }</style>
-                         <ul>
-                             {
-                                 Myschoolstudents===undefined?
-                                 <div className="edu-txt-center color-grey-9 pt50">
-                                     <p className="mb20"><img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")} /></p>
-                                     <p>学生数据为空，请导入数据</p>
-                                 </div>
-                                 :Myschoolstudents&&Myschoolstudents.length===0?
-                                 <div className="edu-txt-center color-grey-9 pt50">
-                                     <p className="mb20"><img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/></p>
-                                     <p>学生数据为空，请导入数据</p>
-                                 </div>:Myschoolstudents&&Myschoolstudents.map((item,key)=>{
-                                     // console.log(item)
-                                         return(
-                                             <li className="clearfix myslispan" key={key}>
-                                                 <div className="column-No column-2 relative">
-                                                 <Checkbox
-                                                 className={'mr20 changestudents'}
-                                                 checked={item.istrue===true?true:false}
-                                                 key={key}
-                                                 index={key}
-                                                 onChange={this.onChangestudent} id={item.student_id}></Checkbox>
-                                                 {item.index}
-                                                 </div>
-                                                 <div className="column-2" >{item.name}</div>
-                                                 <div className="column-2">{item.student_id}</div>
-                                             </li>
-                                         )
-                                 })
-                             }
+                                    }</style>
+                                    <ul>
+                                        {
+                                            Myschoolstudents === undefined ?
+                                                <div className="edu-txt-center color-grey-9 pt50">
+                                                    <p className="mb20"><img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")} /></p>
+                                                    <p>学生数据为空，请导入数据</p>
+                                                </div>
+                                                : Myschoolstudents && Myschoolstudents.length === 0 ?
+                                                    <div className="edu-txt-center color-grey-9 pt50">
+                                                        <p className="mb20"><img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")} /></p>
+                                                        <p>学生数据为空，请导入数据</p>
+                                                    </div> : Myschoolstudents && Myschoolstudents.map((item, key) => {
+                                                        // console.log(item)
+                                                        return (
+                                                            <li className="clearfix myslispan" key={key}>
+                                                                <div className="column-No column-2 relative">
+                                                                    <Checkbox
+                                                                        className={'mr20 changestudents'}
+                                                                        checked={item.istrue === true ? true : false}
+                                                                        key={key}
+                                                                        index={key}
+                                                                        onChange={this.onChangestudent} id={item.student_id}></Checkbox>
+                                                                    {item.index}
+                                                                </div>
+                                                                <div className="column-2" >{item.name}</div>
+                                                                <div className="column-2">{item.student_id}</div>
+                                                            </li>
+                                                        )
+                                                    })
+                                        }
 
-                         </ul>
-                     </div>
-                     </div>
-                         <style>
-                             {
-                                 `
+                                    </ul>
+                                </div>
+                            </div>
+                            <style>
+                                {
+                                    `
                                      .idpagin{
                                          width: 100% !important;
                                          display: flex;
@@ -463,27 +462,27 @@ class EcStudentList extends Component {
                                      }
                                       
                                      `
-                             }
-                         </style>
-                         <div style={{width:'100%',position: 'relative'}}>
-                             {
-                                 majorschoollist&&majorschoollist.students&&majorschoollist.students.length===0?"":
-                                   <Pagination className={"pagelistStudentList mt30 idpagin"}
-                                               showQuickJumper current={this.state.pages}
-                                               onChange={this.showecStudentList} pageSize={20}
-                                               total={majorschoollist&&majorschoollist.count}></Pagination>
-                             }
-                         </div>
-                     </Spin>
+                                }
+                            </style>
+                            <div style={{ width: '100%', position: 'relative' }}>
+                                {
+                                    majorschoollist && majorschoollist.students && majorschoollist.students.length === 0 ? "" :
+                                        <Pagination className={"pagelistStudentList mt30 idpagin"}
+                                            showQuickJumper current={this.state.pages}
+                                            onChange={this.showecStudentList} pageSize={20}
+                                            total={majorschoollist && majorschoollist.count}></Pagination>
+                                }
+                            </div>
+                        </Spin>
 
-                 </div>
-             </div>
+                    </div>
+                </div>
 
-         </div>
+            </div>
         )
 
     }
 }
 
-export default SnackbarHOC() (EcStudentList);
+export default SnackbarHOC()(EcStudentList);
 
diff --git a/src/modules/forums/MemoDetail.js b/src/modules/forums/MemoDetail.js
index 792b24aa..c7f50033 100644
--- a/src/modules/forums/MemoDetail.js
+++ b/src/modules/forums/MemoDetail.js
@@ -1,12 +1,5 @@
 import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames'
-
+import { Link } from "react-router-dom";
 import axios from 'axios'
 
 import moment from 'moment'
@@ -14,632 +7,629 @@ import moment from 'moment'
 import Comments from '../comment/Comments'
 
 import update from 'immutability-helper'
-// import Tooltip from 'material-ui/Tooltip';
 import RewardDialog from '../common/RewardDialog';
 
-import {ImageLayerOfCommentHOC} from '../page/layers/ImageLayerOfCommentHOC'
+import { ImageLayerOfCommentHOC } from '../page/layers/ImageLayerOfCommentHOC'
 
-import MemoDetailKEEditor from './MemoDetailKEEditor'
 import MemoDetailMDEditor from './MemoDetailMDEditor'
 
-import { bytesToSize, CBreadcrumb ,htmlEncode} from 'educoder'
+import { CBreadcrumb, htmlEncode } from 'educoder'
 import { Tooltip } from 'antd'
 
 // import CBreadcrumb from '../courses/common/CBreadcrumb'
 import { typeNameMap2 } from './MemoNew'
-import CaseDetail from "../moop_cases/CaseDetail";
 const $ = window.$
 function urlStringify(params) {
   let noParams = true;
   let paramsUrl = '';
-    for (let key in params) {
-      noParams = false;
-      paramsUrl += `${key}=${params[key]}&`
-    }
-    if (noParams) {
-      return '';
-    }
-    paramsUrl = paramsUrl.substring(0, paramsUrl.length - 1);
-    return paramsUrl;
+  for (let key in params) {
+    noParams = false;
+    paramsUrl += `${key}=${params[key]}&`
+  }
+  if (noParams) {
+    return '';
+  }
+  paramsUrl = paramsUrl.substring(0, paramsUrl.length - 1);
+  return paramsUrl;
 }
 class MemoDetail extends Component {
-    constructor(props) {
-      super(props)
+  constructor(props) {
+    super(props)
 
-      this.state = {
-        memoLoading: true,
-        hasMoreComments: false,
-        pageCount: 2,
+    this.state = {
+      memoLoading: true,
+      hasMoreComments: false,
+      pageCount: 2,
 
-        goldRewardDialogOpen: false
-      }
+      goldRewardDialogOpen: false
     }
-    componentDidMount() {
-      // window.$("html,body").animate({"scrollTop":0})
+  }
+  componentDidMount() {
+    // window.$("html,body").animate({"scrollTop":0})
 
-      const { match } = this.props
+    const { match } = this.props
 
-      const memoUrl = `/memos/${match.params.memoId}.json`;
-      this.setState({
-        memoLoading: true
-      })
-      axios.get(memoUrl,{
-              // withCredentials: true,
-          })
-          .then((response) => {
-            const memo = response.data.memo
-            if (response.data.status === -1) {
-              setTimeout(() => {
-                this.props.showNotification('帖子不存在！')
-              }, 300)
-              this.props.history.push(`/forums`)
-              return;
-            } else if (memo) {
-              // this.setState({...response.data})
-
-              const { memo_replies, memo } = response.data;
-              let hasMoreComments = false;
-              if (memo_replies && memo_replies.length === 10 && memo.replies_count > 10) {
-                // 遍历一遍，计算下是否还有评论未加载
-                let totalCount = 10;
-                memo_replies.forEach(item=>{
-                  totalCount += item.children.length
-                })
-                if (totalCount < memo.replies_count) {
-                  hasMoreComments = true;
-                }
-              }
-              this.setState({
-                hasMoreComments,
-                pageCount: 2,
-                comments: memo_replies
-              })
-              delete response.data.memo_replies;
-              // reset
-              response.data.memo.praise_count = response.data.memo.memo_praise_count
-              this.props.initForumState(response.data)
-              // const user = response.data.current_user;
-              // user.tidding_count = response.data.tidding_count;
-              // this.props.initCommonState(user)
-            }
-            this.setState({
-              memoLoading: false
-            })
-
-          }).catch((error) => {
-            console.log(error)
-          })
-
-      $('body>#root').on('onMemoDelete', (event) => {
-        // const val = $('body>#root').data('onMemoDelete')
-        const val = window.onMemoDelete ;
-        this.onMemoDelete( JSON.parse(decodeURIComponent(val)) )
-      })
-
-
-
-    }
-    componentWillUnmount() {
-      $('body>#root').off('onMemoDelete')
-    }
-    onMemoDelete(memo) {
-      const deleteUrl = `/memos/${memo.id}.json`;
-      // 获取memo list
-        axios.delete(deleteUrl, {
-            // withCredentials: true,
-        })
-        .then((response) => {
-          const status = response.data.status
-          if (status === 0) {
-
-            this.props.showNotification('删除成功');
-            this.props.history.push(`/forums`)
-
-          } else if (status === -1) {
-            this.props.showNotification('帖子已被删除');
-            this.props.history.push(`/forums`)
-          }
-        }).catch((error) => {
-          console.log(error)
-        })
-    }
-
-    componentDidUpdate(prevProps, prevState, snapshot) {
-      // if (this.props.memo && this.props.memo.content
-      //     && (!prevProps.memo || prevProps.memo.content != this.props.memo.content) ) {
-      if (this.props.memo && this.props.memo.content && prevState.memoLoading === true && this.state.memoLoading === false) {
-        // md渲染content，等xhr执行完（即memoLoading变化），memo.content更新后初始化md
-        if (this.props.memo.is_md) {
-          setTimeout(()=>{
-          var shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", {
-              htmlDecode: "style,script,iframe",  // you can filter tags decode
-              taskList: true,
-              tex: true,  // 默认不解析
-              flowChart: true,  // 默认不解析
-              sequenceDiagram: true // 默认不解析
-          });
-          }, 200)
-        }
-      }
-    }
-
-    clickPraise(){
-        const { memo } = this.props;
-        const url = `/discusses/${memo.id}/plus.json`;
-        console.log(url)
-        axios.post(url, {
-                container_type: 'Memo',
-                type: 1   //  "踩0；赞1"
-            },
-            {
-                // withCredentials: true
-            }
-        ).then((response) => {
-
-            const newMemo = Object.assign({}, this.props.memo)
-            newMemo.praise_count = response.data.praise_count
-            newMemo.user_praise = !newMemo.user_praise
-            this.props.initForumState({memo : newMemo })
-        }).catch((error) => {
-                console.log(error)
-        })
-    }
-    renderAttachment() {
-      const { memo, attachments_list } = this.props;
-      const attachments = []
-      attachments_list.forEach((item, index) => {
-        const ar = item.url.split('/')
-        const fileName = item.title
-        let filesize = item.filesize
-
-        attachments.push(
-          <div className="color-grey df" key={index} style={{ lineHeight: '17px'}}>
-            <a className="color-grey ">
-              <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
-            </a>
-              <a href={item.url} title={fileName.length > 30 ? fileName : ''}
-                  className="mr12 color9B9B overflowHidden1" length="58" style={{maxWidth: '480px'}}>
-                {fileName}
-              </a>
-            <span className="color656565 mt2 color-grey-6 font-12 mr8">{filesize}</span>
-
-          </div>
-          )
-      })
-      return attachments;
-    }
-    // ------------------------------------------------------------------------------------------- comments  START
-    // ------------------------------------------------------------------------------------------- comments  START
-    _getUser() {
-      const { current_user } = this.props;
-      current_user.user_url = `/users/${current_user.login}`;
-      return current_user;
-    }
-    _findById(id, arg_comments) {
-      const comments = arg_comments;
-      for(let i = 0; i < comments.length; i++) {
-        if (id === comments[i].id) {
-          return i;
-        }
-      }
-    }
-    replyComment = (commentContent, id, editor) => {
-      const { showNotification } = this.props;
-      if (!commentContent || commentContent.length === 0) {
-        showNotification('必须填写内容！')
-        return;
-      }
-
-      if (this.props.memo.id === id ) { // 回复帖子
-        this.createNewComment(commentContent, id, editor);
-        return;
-      }
-      // /${id}
-      const url = `/memos/reply.json`;
-      const { comments } = this.state;
-      const user = this._getUser();
-      /*
-      移除末尾的空行
-      .replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
-
-      */
-      if (commentContent) {
-        commentContent = commentContent.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
-      }
-
-			commentContent=htmlEncode(commentContent)
-      axios.post(url, {
-            parent_id: id,
-            content: commentContent
-          },
-          {
-            // withCredentials: true
-          }
-        ).then((response) => {
-          response.data.memo = response.data
-          if (response.data.memo) {
-            let newDiscuss = response.data.memo;
-
-            var commentIndex = this._findById(id, comments);
-            let comment = comments[commentIndex];
-            if (!comment.children ) {
-              comment.children = []
-            }
-            // TODO userName iamge_url
-            comment.children.push( {
-              "can_delete": true,
-              "content": commentContent,
-
-              "image_url": user.image_url,
-              "username": user.username,
-              "user_login": user.login,
-
-              "id": newDiscuss.id,
-              // "position": newDiscuss.position,
-              "time": "1分钟前",
-              "praise_count": 0,
-
-              "user_id": newDiscuss.author_id,
-            })
-
-
-            comments[commentIndex] = comment
-            // ke
-            editor.html && editor.html('')
-            // md
-            if (editor.setValue) {
-              editor.setValue('')
-              const $ = window.$
-              var view_selector = `.commentItemMDEditorView_${id}`
-              $(view_selector).hide();
-            }
-
-
-            this.setState({
-              // runTesting: false,
-              comments: comments
-            }, ()=>{
-              // keditor代码美化
-              editor.html && window.prettyPrint()
-            })
-
-            const newMemo2 = Object.assign({}, this.props.memo);
-            newMemo2.replies_count = newMemo2.replies_count + 1;
-            this.props.initForumState({
-              memo: newMemo2
-            })
-          }
-
-        }).catch((error) => {
-          console.log(error)
-        })
-    }
-    deleteComment = (parrentComment, childCommentId) => {
-      let deleteCommentId = parrentComment.id
-      if (childCommentId) {
-        deleteCommentId = childCommentId;
-      }
-      const url = `/memos/${deleteCommentId}.json`
-      let comments = this.state.comments;
-
-      axios.delete(url,
-            {
-              // withCredentials: true
-            }
-          ).then((response) => {
-            // TODO 删除成功或失败
-            if (response.data && response.data.status === 0) {
-              const commentIndex = this._findById(parrentComment.id, comments);
-
-              // https://stackoverflow.com/questions/29527385/removing-element-from-array-in-component-state
-              if (!childCommentId) {
-                this.setState((prevState) => ({
-                  comments: update(prevState.comments, {$splice: [[commentIndex, 1]]})
-                }))
-
-                // if (this.state.comments.length <= 5) {
-                //   this.fetchComment()
-                // }
-              } else {
-                let childCommentIndex = this._findById(childCommentId, comments[commentIndex].children);
-                comments[commentIndex].children = update(comments[commentIndex].children, {$splice: [[childCommentIndex, 1]]})
-                this.setState({ comments })
-              }
-
-              const newMemo = Object.assign({}, this.props.memo);
-              newMemo.replies_count = newMemo.replies_count - 1;
-              this.props.initForumState({
-                memo: newMemo
-              })
-            }
-
-          }).catch((error) => {
-            console.log(error)
-          })
-    }
-    // 评论点赞
-    commentPraise = (discussId) => {
-      const { comments } = this.state;
-      const commentIndex = this._findById(discussId, comments);
-
-      const url = `/discusses/${discussId}/plus.json`
-      axios.post(url, {
-              // id: discussId,
-              // container_id: challenge.id,
-              container_type: 'Memo',  //Discuss
-              type: comments[commentIndex].user_praise === true ? 0 : 1,   //  "踩0；赞1"
-            },
-            {
-              // withCredentials: true
-            }
-          ).then((response) => {
-            if (response.data.praise_count === 0 || response.data.praise_count) {
-
-              comments[commentIndex].user_praise = !comments[commentIndex].user_praise;
-              comments[commentIndex].praise_count = response.data.praise_count;
-
-              this.setState({
-                comments
-              })
-            }
-
-          }).catch((error) => {
-            console.log(error)
-          })
-    }
-    rewardCode = (parrentComment, childComment, amount) => {
-      const { showNotification } = this.props;
-      const { comments } = this.state;
-      let handleComment = parrentComment
-      if (childComment) {
-        handleComment = childComment;
-      }
-      let handleCommentId = handleComment.id;
-      const url = `/discusses/${handleCommentId}/reward_code.json`
-
-      axios.post(url, {
-            id: handleCommentId,
-
-            container_type: 'Memo',
-            score: amount,
-            user_id: handleComment.user_id
-          },
-            {
-              // withCredentials: true
-            }
-          ).then((response) => {
-            if (response.data && response.data.code) {
-              const commentIndex = this._findById(parrentComment.id, comments);
-
-              if (childComment) {
-                const childCommentIndex = this._findById(handleComment.id, parrentComment.children);
-                const newChildComment = Object.assign({}, childComment);
-                newChildComment.reward = response.data.code
-                parrentComment.children[childCommentIndex] = newChildComment
-
-                comments[commentIndex] = parrentComment;
-
-                  this.setState({
-                  comments
-                })
-              } else {
-                comments[commentIndex].reward = response.data.code;
-
-                  this.setState({
-                  comments
-                })
-              }
-            }
-          }).catch((error) => {
-            console.log(error)
-            showNotification('奖励失败，请联系系统管理员！')
-          })
-    }
-    hiddenComment = (item, childCommentId) => {
-      const id = item.id
-      const { showNotification } = this.props;
-      const user = this._getUser();
-      const url = `/memos/${id}/hidden.json`
-      const { comments } = this.state;
-
-      const commentIndex = this._findById(id, comments);
-      const comment = comments[commentIndex];
-      axios.post(url, {
-              hidden: !comment.hidden ? "1" : "0"
-            },
-            {
-              // withCredentials: true
-            }
-          ).then((response) => {
-            if (response.data.status === -1) {
-              showNotification(response.data.message)
-              return;
-            }
-            if (response.data.status === 0) {
-
-              if (!childCommentId) {
-                comment.hidden = !comment.hidden;
-                this.setState({
-                  comments: comments
-                })
-              } else {  // TODO 目前子回复没hidden字段
-                let childCommentIndex = this._findById(childCommentId, comments[commentIndex].children);
-                const childComment = comments[commentIndex].children[childCommentIndex]
-                childComment.hidden = !childComment.hidden;
-                this.setState({ comments })
-              }
-
-            }
-            // {"message":"Couldn't find Discuss with id=911","status":-1}
-
-          }).catch((error) => {
-            console.log(error)
-          })
-    }
-    createNewComment = (commentContent, id, editor) => {
-      let content = commentContent;
-      const { memo } = this.props;
-      if(content != undefined){
-        content = content.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
-
-        var beforeImage = content.split("<img");
-        var afterImage = content.split("/>");
-        if(beforeImage[0] == "" && afterImage[1] == ""){
-            window.notice_box('不支持纯图片评论<br/>请在评论中增加文字信息');
-            return;
-        }
-      }
-      // /${memo.id}
-      const url = `/memos/reply.json`;
-      let { comments } = this.state;
-      const user = this._getUser();
-			content=htmlEncode(content)
-      axios.post(url, {
-          parent_id: memo.id,
-          content: content
-        },
-        {
-          // withCredentials: true
-        }
-      ).then((response) => {
+    const memoUrl = `/memos/${match.params.memoId}.json`;
+    this.setState({
+      memoLoading: true
+    })
+    axios.get(memoUrl, {
+      // withCredentials: true,
+    })
+      .then((response) => {
+        const memo = response.data.memo
         if (response.data.status === -1) {
-          console.error('服务端异常')
+          setTimeout(() => {
+            this.props.showNotification('帖子不存在！')
+          }, 300)
+          this.props.history.push(`/forums`)
           return;
-        }
-        if (response.data) {
-          response.data.memo = response.data
-          const newMemo = response.data.memo;
-          // ke
-          editor.html && editor.html('');
-          editor.afterBlur && editor.afterBlur()
-          // md
-          editor.setValue && editor.setValue('')
-          if (!comments) {
-            comments = [];
+        } else if (memo) {
+          // this.setState({...response.data})
+
+          const { memo_replies, memo } = response.data;
+          let hasMoreComments = false;
+          if (memo_replies && memo_replies.length === 10 && memo.replies_count > 10) {
+            // 遍历一遍，计算下是否还有评论未加载
+            let totalCount = 10;
+            memo_replies.forEach(item => {
+              totalCount += item.children.length
+            })
+            if (totalCount < memo.replies_count) {
+              hasMoreComments = true;
+            }
           }
-          comments.unshift( {
-            "can_delete": true,
-            "admin": user.admin,
-            "content": content,
-
-            "image_url": user.image_url,
-            "username": user.username,
-            "user_login": user.login,
-
-            "id": newMemo.id,
-            "reward": null,
-            "hidden": newMemo.hidden,
-
-            "user_praise": false,
-            "time": "1分钟前",
-            "praise_count": 0,
-
-            "user_id": user.user_id,
+          this.setState({
+            hasMoreComments,
+            pageCount: 2,
+            comments: memo_replies
           })
+          delete response.data.memo_replies;
+          // reset
+          response.data.memo.praise_count = response.data.memo.memo_praise_count
+          this.props.initForumState(response.data)
+          // const user = response.data.current_user;
+          // user.tidding_count = response.data.tidding_count;
+          // this.props.initCommonState(user)
+        }
+        this.setState({
+          memoLoading: false
+        })
 
+      }).catch((error) => {
+        console.log(error)
+      })
+
+    $('body>#root').on('onMemoDelete', (event) => {
+      // const val = $('body>#root').data('onMemoDelete')
+      const val = window.onMemoDelete;
+      this.onMemoDelete(JSON.parse(decodeURIComponent(val)))
+    })
+
+
+
+  }
+  componentWillUnmount() {
+    $('body>#root').off('onMemoDelete')
+  }
+  onMemoDelete(memo) {
+    const deleteUrl = `/memos/${memo.id}.json`;
+    // 获取memo list
+    axios.delete(deleteUrl, {
+      // withCredentials: true,
+    })
+      .then((response) => {
+        const status = response.data.status
+        if (status === 0) {
+
+          this.props.showNotification('删除成功');
+          this.props.history.push(`/forums`)
+
+        } else if (status === -1) {
+          this.props.showNotification('帖子已被删除');
+          this.props.history.push(`/forums`)
+        }
+      }).catch((error) => {
+        console.log(error)
+      })
+  }
+
+  componentDidUpdate(prevProps, prevState, snapshot) {
+    // if (this.props.memo && this.props.memo.content
+    //     && (!prevProps.memo || prevProps.memo.content != this.props.memo.content) ) {
+    if (this.props.memo && this.props.memo.content && prevState.memoLoading === true && this.state.memoLoading === false) {
+      // md渲染content，等xhr执行完（即memoLoading变化），memo.content更新后初始化md
+      if (this.props.memo.is_md) {
+        setTimeout(() => {
+          var shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", {
+            htmlDecode: "style,script,iframe",  // you can filter tags decode
+            taskList: true,
+            tex: true,  // 默认不解析
+            flowChart: true,  // 默认不解析
+            sequenceDiagram: true // 默认不解析
+          });
+        }, 200)
+      }
+    }
+  }
+
+  clickPraise() {
+    const { memo } = this.props;
+    const url = `/discusses/${memo.id}/plus.json`;
+    console.log(url)
+    axios.post(url, {
+      container_type: 'Memo',
+      type: 1   //  "踩0；赞1"
+    },
+      {
+        // withCredentials: true
+      }
+    ).then((response) => {
+
+      const newMemo = Object.assign({}, this.props.memo)
+      newMemo.praise_count = response.data.praise_count
+      newMemo.user_praise = !newMemo.user_praise
+      this.props.initForumState({ memo: newMemo })
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+  renderAttachment() {
+    const { memo, attachments_list } = this.props;
+    const attachments = []
+    attachments_list.forEach((item, index) => {
+      const ar = item.url.split('/')
+      const fileName = item.title
+      let filesize = item.filesize
+
+      attachments.push(
+        <div className="color-grey df" key={index} style={{ lineHeight: '17px' }}>
+          <a className="color-grey ">
+            <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
+          </a>
+          <a href={item.url} title={fileName.length > 30 ? fileName : ''}
+            className="mr12 color9B9B overflowHidden1" length="58" style={{ maxWidth: '480px' }}>
+            {fileName}
+          </a>
+          <span className="color656565 mt2 color-grey-6 font-12 mr8">{filesize}</span>
+
+        </div>
+      )
+    })
+    return attachments;
+  }
+  // ------------------------------------------------------------------------------------------- comments  START
+  // ------------------------------------------------------------------------------------------- comments  START
+  _getUser() {
+    const { current_user } = this.props;
+    current_user.user_url = `/users/${current_user.login}`;
+    return current_user;
+  }
+  _findById(id, arg_comments) {
+    const comments = arg_comments;
+    for (let i = 0; i < comments.length; i++) {
+      if (id === comments[i].id) {
+        return i;
+      }
+    }
+  }
+  replyComment = (commentContent, id, editor) => {
+    const { showNotification } = this.props;
+    if (!commentContent || commentContent.length === 0) {
+      showNotification('必须填写内容！')
+      return;
+    }
+
+    if (this.props.memo.id === id) { // 回复帖子
+      this.createNewComment(commentContent, id, editor);
+      return;
+    }
+    // /${id}
+    const url = `/memos/reply.json`;
+    const { comments } = this.state;
+    const user = this._getUser();
+    /*
+    移除末尾的空行
+    .replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
+
+    */
+    if (commentContent) {
+      commentContent = commentContent.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g, '');
+    }
+
+    commentContent = htmlEncode(commentContent)
+    axios.post(url, {
+      parent_id: id,
+      content: commentContent
+    },
+      {
+        // withCredentials: true
+      }
+    ).then((response) => {
+      response.data.memo = response.data
+      if (response.data.memo) {
+        let newDiscuss = response.data.memo;
+
+        var commentIndex = this._findById(id, comments);
+        let comment = comments[commentIndex];
+        if (!comment.children) {
+          comment.children = []
+        }
+        // TODO userName iamge_url
+        comment.children.push({
+          "can_delete": true,
+          "content": commentContent,
+
+          "image_url": user.image_url,
+          "username": user.username,
+          "user_login": user.login,
+
+          "id": newDiscuss.id,
+          // "position": newDiscuss.position,
+          "time": "1分钟前",
+          "praise_count": 0,
+
+          "user_id": newDiscuss.author_id,
+        })
+
+
+        comments[commentIndex] = comment
+        // ke
+        editor.html && editor.html('')
+        // md
+        if (editor.setValue) {
+          editor.setValue('')
+          const $ = window.$
+          var view_selector = `.commentItemMDEditorView_${id}`
+          $(view_selector).hide();
+        }
+
+
+        this.setState({
+          // runTesting: false,
+          comments: comments
+        }, () => {
+          // keditor代码美化
+          editor.html && window.prettyPrint()
+        })
+
+        const newMemo2 = Object.assign({}, this.props.memo);
+        newMemo2.replies_count = newMemo2.replies_count + 1;
+        this.props.initForumState({
+          memo: newMemo2
+        })
+      }
+
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+  deleteComment = (parrentComment, childCommentId) => {
+    let deleteCommentId = parrentComment.id
+    if (childCommentId) {
+      deleteCommentId = childCommentId;
+    }
+    const url = `/memos/${deleteCommentId}.json`
+    let comments = this.state.comments;
+
+    axios.delete(url,
+      {
+        // withCredentials: true
+      }
+    ).then((response) => {
+      // TODO 删除成功或失败
+      if (response.data && response.data.status === 0) {
+        const commentIndex = this._findById(parrentComment.id, comments);
+
+        // https://stackoverflow.com/questions/29527385/removing-element-from-array-in-component-state
+        if (!childCommentId) {
+          this.setState((prevState) => ({
+            comments: update(prevState.comments, { $splice: [[commentIndex, 1]] })
+          }))
+
+          // if (this.state.comments.length <= 5) {
+          //   this.fetchComment()
+          // }
+        } else {
+          let childCommentIndex = this._findById(childCommentId, comments[commentIndex].children);
+          comments[commentIndex].children = update(comments[commentIndex].children, { $splice: [[childCommentIndex, 1]] })
+          this.setState({ comments })
+        }
+
+        const newMemo = Object.assign({}, this.props.memo);
+        newMemo.replies_count = newMemo.replies_count - 1;
+        this.props.initForumState({
+          memo: newMemo
+        })
+      }
+
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+  // 评论点赞
+  commentPraise = (discussId) => {
+    const { comments } = this.state;
+    const commentIndex = this._findById(discussId, comments);
+
+    const url = `/discusses/${discussId}/plus.json`
+    axios.post(url, {
+      // id: discussId,
+      // container_id: challenge.id,
+      container_type: 'Memo',  //Discuss
+      type: comments[commentIndex].user_praise === true ? 0 : 1,   //  "踩0；赞1"
+    },
+      {
+        // withCredentials: true
+      }
+    ).then((response) => {
+      if (response.data.praise_count === 0 || response.data.praise_count) {
+
+        comments[commentIndex].user_praise = !comments[commentIndex].user_praise;
+        comments[commentIndex].praise_count = response.data.praise_count;
+
+        this.setState({
+          comments
+        })
+      }
+
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+  rewardCode = (parrentComment, childComment, amount) => {
+    const { showNotification } = this.props;
+    const { comments } = this.state;
+    let handleComment = parrentComment
+    if (childComment) {
+      handleComment = childComment;
+    }
+    let handleCommentId = handleComment.id;
+    const url = `/discusses/${handleCommentId}/reward_code.json`
+
+    axios.post(url, {
+      id: handleCommentId,
+
+      container_type: 'Memo',
+      score: amount,
+      user_id: handleComment.user_id
+    },
+      {
+        // withCredentials: true
+      }
+    ).then((response) => {
+      if (response.data && response.data.code) {
+        const commentIndex = this._findById(parrentComment.id, comments);
+
+        if (childComment) {
+          const childCommentIndex = this._findById(handleComment.id, parrentComment.children);
+          const newChildComment = Object.assign({}, childComment);
+          newChildComment.reward = response.data.code
+          parrentComment.children[childCommentIndex] = newChildComment
+
+          comments[commentIndex] = parrentComment;
 
           this.setState({
             comments
           })
-          const newMemo2 = Object.assign({}, this.props.memo);
-          newMemo2.replies_count = newMemo2.replies_count + 1;
-          this.props.initForumState({
-            memo: newMemo2
-          })
+        } else {
+          comments[commentIndex].reward = response.data.code;
 
-        }
-      }).catch((error) => {
-        console.log(error)
-      })
-    }
-    moreMemos = () => {
-      let { comments, pageCount } = this.state;
-      let { memo } = this.props;
-      const user = this._getUser();
-      const url = `/memos/${memo.id}/more_reply.json?page=${pageCount}`;
-      axios.get(url, {
-
-        },
-        {
-          // withCredentials: true
-        }
-      ).then((response) => {
-        if (response.data.status === -1) {
-          console.error('服务端异常')
-          return;
-        }
-        let { memo_replies } = response.data;
-        if (!memo_replies || memo_replies.length === 0) {
-           this.setState({
-              hasMoreComments: false
-           })
-          return;
-        }
-        if (response.data.memos_count) {
-          const newComments = comments.concat(memo_replies);
-          const hasMoreComments = memo_replies.length === 10
           this.setState({
-            comments: newComments,
-            hasMoreComments,
-            pageCount: pageCount+1
+            comments
+          })
+        }
+      }
+    }).catch((error) => {
+      console.log(error)
+      showNotification('奖励失败，请联系系统管理员！')
+    })
+  }
+  hiddenComment = (item, childCommentId) => {
+    const id = item.id
+    const { showNotification } = this.props;
+    const user = this._getUser();
+    const url = `/memos/${id}/hidden.json`
+    const { comments } = this.state;
+
+    const commentIndex = this._findById(id, comments);
+    const comment = comments[commentIndex];
+    axios.post(url, {
+      hidden: !comment.hidden ? "1" : "0"
+    },
+      {
+        // withCredentials: true
+      }
+    ).then((response) => {
+      if (response.data.status === -1) {
+        showNotification(response.data.message)
+        return;
+      }
+      if (response.data.status === 0) {
+
+        if (!childCommentId) {
+          comment.hidden = !comment.hidden;
+          this.setState({
+            comments: comments
+          })
+        } else {  // TODO 目前子回复没hidden字段
+          let childCommentIndex = this._findById(childCommentId, comments[commentIndex].children);
+          const childComment = comments[commentIndex].children[childCommentIndex]
+          childComment.hidden = !childComment.hidden;
+          this.setState({ comments })
+        }
+
+      }
+      // {"message":"Couldn't find Discuss with id=911","status":-1}
+
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+  createNewComment = (commentContent, id, editor) => {
+    let content = commentContent;
+    const { memo } = this.props;
+    if (content != undefined) {
+      content = content.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g, '');
+
+      var beforeImage = content.split("<img");
+      var afterImage = content.split("/>");
+      if (beforeImage[0] == "" && afterImage[1] == "") {
+        window.notice_box('不支持纯图片评论<br/>请在评论中增加文字信息');
+        return;
+      }
+    }
+    // /${memo.id}
+    const url = `/memos/reply.json`;
+    let { comments } = this.state;
+    const user = this._getUser();
+    content = htmlEncode(content)
+    axios.post(url, {
+      parent_id: memo.id,
+      content: content
+    },
+      {
+        // withCredentials: true
+      }
+    ).then((response) => {
+      if (response.data.status === -1) {
+        console.error('服务端异常')
+        return;
+      }
+      if (response.data) {
+        response.data.memo = response.data
+        const newMemo = response.data.memo;
+        // ke
+        editor.html && editor.html('');
+        editor.afterBlur && editor.afterBlur()
+        // md
+        editor.setValue && editor.setValue('')
+        if (!comments) {
+          comments = [];
+        }
+        comments.unshift({
+          "can_delete": true,
+          "admin": user.admin,
+          "content": content,
+
+          "image_url": user.image_url,
+          "username": user.username,
+          "user_login": user.login,
+
+          "id": newMemo.id,
+          "reward": null,
+          "hidden": newMemo.hidden,
+
+          "user_praise": false,
+          "time": "1分钟前",
+          "praise_count": 0,
+
+          "user_id": user.user_id,
+        })
+
+
+        this.setState({
+          comments
+        })
+        const newMemo2 = Object.assign({}, this.props.memo);
+        newMemo2.replies_count = newMemo2.replies_count + 1;
+        this.props.initForumState({
+          memo: newMemo2
+        })
+
+      }
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+  moreMemos = () => {
+    let { comments, pageCount } = this.state;
+    let { memo } = this.props;
+    const user = this._getUser();
+    const url = `/memos/${memo.id}/more_reply.json?page=${pageCount}`;
+    axios.get(url, {
+
+    },
+      {
+        // withCredentials: true
+      }
+    ).then((response) => {
+      if (response.data.status === -1) {
+        console.error('服务端异常')
+        return;
+      }
+      let { memo_replies } = response.data;
+      if (!memo_replies || memo_replies.length === 0) {
+        this.setState({
+          hasMoreComments: false
+        })
+        return;
+      }
+      if (response.data.memos_count) {
+        const newComments = comments.concat(memo_replies);
+        const hasMoreComments = memo_replies.length === 10
+        this.setState({
+          comments: newComments,
+          hasMoreComments,
+          pageCount: pageCount + 1
+        })
+      }
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+
+
+  // ------------------------------------------------------------------------------------------- comments  END
+  // ------------------------------------------------------------------------------------------- comments  END
+  // 置顶
+  setTop(memo) {
+    const params = {
+      sticky: memo.sticky ? 0 : 1,
+    }
+    if (this.state.p_s_order) {
+      params.order = this.state.p_s_order;
+    }
+    if (this.state.p_forum_id) {
+      params.forum_id = this.state.p_forum_id;
+    }
+    let paramsUrl = urlStringify(params)
+    const set_top_or_down_Url = `/memos/${memo.id}/sticky_or_cancel.json?${paramsUrl}`;
+    // 获取memo list
+    axios.post(set_top_or_down_Url, {
+      // withCredentials: true,
+    })
+      .then((response) => {
+        const status = response.data.status
+        if (status === 0) {
+          this.props.showNotification(memo.sticky ? '取消置顶成功' : '置顶成功');
+          memo.sticky = memo.sticky ? false : true
+          this.setState({
+            memo: Object.assign({}, memo)
           })
         }
       }).catch((error) => {
         console.log(error)
       })
-    }
+  }
+  // --------------------------------------------------------------------------------------------帖子獎勵
+  rewardCodeMemo = (inputVal) => {
+    console.log(inputVal)
+    const { memo, author_info } = this.props;
+    const newMemo = Object.assign({}, memo);
+    const _reward = parseInt(inputVal)
 
+    const url = `/discusses/${memo.id}/reward_code.json`
 
-    // ------------------------------------------------------------------------------------------- comments  END
-    // ------------------------------------------------------------------------------------------- comments  END
-    // 置顶
-    setTop(memo) {
-      const params = {
-        sticky: memo.sticky ? 0 : 1,
-      }
-      if (this.state.p_s_order) {
-        params.order = this.state.p_s_order;
-      }
-      if (this.state.p_forum_id) {
-        params.forum_id = this.state.p_forum_id;
-      }
-        let paramsUrl = urlStringify(params)
-      const set_top_or_down_Url = `/memos/${memo.id}/sticky_or_cancel.json?${paramsUrl}`;
-      // 获取memo list
-        axios.post(set_top_or_down_Url, {
-            // withCredentials: true,
-        })
-        .then((response) => {
-          const status = response.data.status
-          if (status === 0) {
-            this.props.showNotification( memo.sticky ? '取消置顶成功' : '置顶成功');
-            memo.sticky = memo.sticky ? false : true
-            this.setState({
-              memo: Object.assign({}, memo)
-            })
-          }
-        }).catch((error) => {
-          console.log(error)
-        })
-    }
-    // --------------------------------------------------------------------------------------------帖子獎勵
-    rewardCodeMemo = (inputVal) => {
-      console.log(inputVal)
-      const { memo, author_info } = this.props;
-      const newMemo = Object.assign({}, memo);
-      const _reward = parseInt(inputVal)
+    axios.post(url, {
+      id: memo.id,
 
-      const url = `/discusses/${memo.id}/reward_code.json`
-
-      axios.post(url, {
-            id: memo.id,
-
-            container_type: 'Memo',
-            score: _reward,
-            user_id: author_info.user_id
-          }, {
-        // withCredentials: true,
-      })
+      container_type: 'Memo',
+      score: _reward,
+      user_id: author_info.user_id
+    }, {
+      // withCredentials: true,
+    })
       .then((response) => {
         const { code } = response.data;
         if (code > 0) {
@@ -647,57 +637,51 @@ class MemoDetail extends Component {
           this.props.initForumState({
             memo: newMemo
           })
-          this.props.showNotification( '奖励成功' );
+          this.props.showNotification('奖励成功');
         } else {
-          this.props.showNotification( '奖励失败，请联系系统管理员！' );
+          this.props.showNotification('奖励失败，请联系系统管理员！');
         }
       }).catch((error) => {
         console.log(error)
       })
+  }
+  setRewardDialogVisible = (visible) => {
+    this.setState({
+      goldRewardDialogOpen: visible
+    })
+  }
+  showRewardDialog = () => {
+    this.setState({
+      goldRewardDialogOpen: true
+    })
+  }
+  // --------------------------------------------------------------------------------------------帖子獎勵 END
+  showCommentInput = () => {
+    this.refs.editor.showEditor();
+  }
+  render() {
+    const { match, history } = this.props
+    const { memo, recommend_shixun, current_user, author_info } = this.props;
+    const { comments, hasMoreComments, goldRewardDialogOpen } = this.state;
+    document.title = memo && memo.subject != undefined ? memo && memo.subject : "交流问答";
+    if (!memo || this.state.memoLoading) {
+      return <div className="edu-back-white" id="forum_index_list"></div>
     }
-    setRewardDialogVisible = (visible) => {
-      this.setState({
-        goldRewardDialogOpen: visible
-      })
+    let _current_user = {}
+    if (current_user) {
+      _current_user = current_user
     }
-    showRewardDialog = () => {
-      this.setState({
-        goldRewardDialogOpen: true
-      })
-    }
-    // --------------------------------------------------------------------------------------------帖子獎勵 END
-    showCommentInput = () => {
-
-      debugger
-      if (window.__useKindEditor === true) {
-        this.refs.editor.showEditor();
-      } else {
-        this.refs.editor.showEditor();
-      }
-    }
-  	render() {
-  		const { match, history } = this.props
-      const { memo, recommend_shixun, current_user,author_info } = this.props;
-      const { comments, hasMoreComments, goldRewardDialogOpen } = this.state;
-			document.title = memo&&memo.subject!=undefined?memo&&memo.subject:"交流问答";
-      if (!memo || this.state.memoLoading) {
-        return <div className="edu-back-white" id="forum_index_list"></div>
-      }
-      let _current_user = {}
-      if (current_user) {
-        _current_user = current_user
-      }
-      (_current_user.user_url = `/users/${_current_user.login}`);
-      memo.isDetailPage = true;
-      // TODO 图片上传地址
-	    return (
-        <React.Fragment>
-          <CBreadcrumb items={[
-            { to: `/forums/categories/${memo.forum_id}`, name: typeNameMap2[memo.forum_id]},
-            { name: '详情' },
-          ]}
-            separator={' / '}
-          ></CBreadcrumb>
+    (_current_user.user_url = `/users/${_current_user.login}`);
+    memo.isDetailPage = true;
+    // TODO 图片上传地址
+    return (
+      <React.Fragment>
+        <CBreadcrumb items={[
+          { to: `/forums/categories/${memo.forum_id}`, name: typeNameMap2[memo.forum_id] },
+          { name: '详情' },
+        ]}
+          separator={' / '}
+        ></CBreadcrumb>
         <div className="edu-back-white memoDetail" id="forum_index_list"> {/* fl with100 */}
           <style>{`
             .memoDetail .commentsbtn {
@@ -711,151 +695,140 @@ class MemoDetail extends Component {
             {...this.props}
           ></RewardDialog>
           <div className="clearfix">
-        		<div id="forum_list" className="forum_table mh650">
-    	        	<div className="padding40-30 bor-bottom-greyE">
-                        <div className="font-16 mb5 cdefault clearfix pr pr35" style={{display: 'flex', alignItems: 'center'}}>
-                            {/* overflowHidden1   */}
-                            <span className="noteDetailTitle " style={{maxWidth: '634px'}}>{memo.subject}</span>
-                            { memo.sticky && <span className="btn-cir btn-cir-red ml10 "
-                                style={{ height: '20px', alignSelf: 'flex-start', marginTop: '10px' }}
-                            >置顶</span>}
-                            { !!memo.reward &&
-                            <Tooltip title={`获得平台奖励金币：${memo.reward}`}>
-                              <span className="color-orange font-14 ml15"
-                                  style={{ height: '20px', alignSelf: 'flex-start', marginTop: '1px' }}
-                              >
-                                <i className="iconfont icon-gift mr5"></i>
-                                <span style={{ 'vertical-align': 'sub' }}>{memo.reward}</span>
-                              </span>
-                            </Tooltip>
-                             }
+            <div id="forum_list" className="forum_table mh650">
+              <div className="padding40-30 bor-bottom-greyE">
+                <div className="font-16 mb5 cdefault clearfix pr pr35" style={{ display: 'flex', alignItems: 'center' }}>
+                  {/* overflowHidden1   */}
+                  <span className="noteDetailTitle " style={{ maxWidth: '634px' }}>{memo.subject}</span>
+                  {memo.sticky && <span className="btn-cir btn-cir-red ml10 "
+                    style={{ height: '20px', alignSelf: 'flex-start', marginTop: '10px' }}
+                  >置顶</span>}
+                  {!!memo.reward &&
+                    <Tooltip title={`获得平台奖励金币：${memo.reward}`}>
+                      <span className="color-orange font-14 ml15"
+                        style={{ height: '20px', alignSelf: 'flex-start', marginTop: '1px' }}
+                      >
+                        <i className="iconfont icon-gift mr5"></i>
+                        <span style={{ 'vertical-align': 'sub' }}>{memo.reward}</span>
+                      </span>
+                    </Tooltip>
+                  }
 
-                            <div style={{ flex: 1, alignSelf: 'flex-start' }}>
-                              { _current_user && (_current_user.admin === true || _current_user.user_id === author_info.user_id) &&
-                                  <div className="edu-position-hidebox" style={{position: 'absolute', right: '12px',top:'4px'}}>
-                                      <a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>
-                                      <ul className="edu-position-hide undis">
-                                    { _current_user.admin === true &&
-                                        ( memo.sticky === true ?
-                                            <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>取消置顶</a></li>
-                                            :
-                                            <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>置&nbsp;&nbsp;顶</a></li> )
-                                        }
-                                          <li><Link to={`/forums/${memo.id}/edit`}>编&nbsp;&nbsp;辑</Link></li>
-                                          <li>
-                                              <a href="javascript:void(0)" onClick={() =>
-                                                  window.delete_confirm_box_2_react(`onMemoDelete`, '您确定要删除吗？' , memo)}>
+                  <div style={{ flex: 1, alignSelf: 'flex-start' }}>
+                    {_current_user && (_current_user.admin === true || _current_user.user_id === author_info.user_id) &&
+                      <div className="edu-position-hidebox" style={{ position: 'absolute', right: '12px', top: '4px' }}>
+                        <a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>
+                        <ul className="edu-position-hide undis">
+                          {_current_user.admin === true &&
+                            (memo.sticky === true ?
+                              <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>取消置顶</a></li>
+                              :
+                              <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>置&nbsp;&nbsp;顶</a></li>)
+                          }
+                          <li><Link to={`/forums/${memo.id}/edit`}>编&nbsp;&nbsp;辑</Link></li>
+                          <li>
+                            <a onClick={() =>
+                              window.delete_confirm_box_2_react(`onMemoDelete`, '您确定要删除吗？', memo)}>
 
-                                              删&nbsp;&nbsp;除</a>
-                                          </li>
-                                      </ul>
-                                  </div>
-                              }
-                              {/* <Link className={`task-hide fr return_btn color-grey-6 mt2 ${ _current_user && (_current_user.admin === true
-                                  || _current_user.user_id === author_info.user_id) ? '': 'no_mr'} `} to="/forums"
-                                  style={{ marginRight: '10px'}}
-                              >
-                                返回
-                              </Link> */}
-                            </div>
-                        </div>
-                        <div className="color-grey-9 clearfix">
-                            <span className="fl">{moment(memo.time).fromNow()} 发布</span>
-                            <div className="fr detailIcons">
-                                <style>{`
+                              删&nbsp;&nbsp;除</a>
+                          </li>
+                        </ul>
+                      </div>
+                    }
+                  </div>
+                </div>
+                <div className="color-grey-9 clearfix">
+                  <span className="fl">{moment(memo.time).fromNow()} 发布</span>
+                  <div className="fr detailIcons">
+                    <style>{`
                                   .detailIcons i{
                                     vertical-align: sub;
                                   }
                                 `}</style>
-                                { _current_user.admin && <Tooltip title={ "帖子奖励" }>
-                                <span className="noteDetailNum rightline cdefault" style={{padding: '0 4px', cursor: 'pointer'}}>
-                                  <i className="iconfont icon-jiangli mr5" onClick={this.showRewardDialog}></i>
-                                </span>
-                                </Tooltip> }
-                                <span className={`noteDetailNum ${!!memo.replies_count ? 'rightline' : ''} cdefault`}>
-                                  <i className="iconfont icon-liulanyan mr5"></i>{memo.viewed_count}
-                                </span>
-                                { !!memo.replies_count &&
-                                <Tooltip title={ "写评论" }>
-                                <a href="javascript:void(0)" className="noteDetailNum">
-                                  <i className="iconfont icon-huifu1 mr5" onClick={this.showCommentInput}></i>{memo.replies_count}
-                                </a>
-                                </Tooltip>
-                                 }
-                            </div>
-                        </div>
-                    </div>
-
-
-                    <div className="padding40 memoContent new_li">
-                      { !memo.is_md ?
-                          <div dangerouslySetInnerHTML={{__html: memo.content}}></div>  :
-
-                          <div id="memo_content_editorMd" className="new_li">
-                            <textarea style={{'display': 'none'}}>
-                              {memo.content}
-                            </textarea>
-                          </div>
-                      }
-                    </div>
-
-                    <div className="padding40 bor-bottom-greyE" style={{ paddingTop: '0px'}}>
-
-
-                        <div className="mt10 mb20">
-                          <p className={`noteDetailPoint ${memo.user_praise ? 'Pointed' : ''} `} onClick={()=>{this.clickPraise()}} >
-                            <i className="iconfont icon-dianzan"></i><br/>
-                            <span>{memo.praise_count}</span>
-                          </p>
-                        </div>
-
-                        { this.props.attachments_list &&
-                        <div>
-                            {this.renderAttachment()}
-                        </div>
-                        }
-                    </div>
-                    { window.__useKindEditor === true ?
-                      <MemoDetailKEEditor ref="editor" memo={memo}  {...this.props}></MemoDetailKEEditor>
-                      :
-                      <MemoDetailMDEditor ref="editor" memo={memo}  {...this.props}></MemoDetailMDEditor>
-
+                    {_current_user.admin && <Tooltip title={"帖子奖励"}>
+                      <span className="noteDetailNum rightline cdefault" style={{ padding: '0 4px', cursor: 'pointer' }}>
+                        <i className="iconfont icon-jiangli mr5" onClick={this.showRewardDialog}></i>
+                      </span>
+                    </Tooltip>}
+                    <span className={`noteDetailNum ${!!memo.replies_count ? 'rightline' : ''} cdefault`}>
+                      <i className="iconfont icon-liulanyan mr5"></i>{memo.viewed_count}
+                    </span>
+                    {!!memo.replies_count &&
+                      <Tooltip title={"写评论"}>
+                        <a className="noteDetailNum">
+                          <i className="iconfont icon-huifu1 mr5" onClick={this.showCommentInput}></i>{memo.replies_count}
+                        </a>
+                      </Tooltip>
                     }
-                  {/*  onClick={ this.createNewComment } */}
-                    <div className="padding40 bor-bottom-greyE memoReplies commentsDelegateParent"
-                        style={{ display: (comments && !!comments.length) ? 'block' : 'none' }}>
-                      <div className="replies_count">
-                        <span className="labal">全部回复</span>
-                        <span className="count">{memo.replies_count}</span>
-                      </div>
-
-                      <Comments comments={comments} user={_current_user}
-                        replyComment={this.replyComment}
-                        deleteComment={this.deleteComment}
-                        commentPraise={this.commentPraise}
-                        rewardCode={this.rewardCode}
-                        hiddenComment={this.hiddenComment}
+                  </div>
+                </div>
+              </div>
 
 
-                      ></Comments>
-                      { hasMoreComments ?
-                        <div className="memoMore" style={{ cursor: 'default' }}>
-                          <a onClick={this.moreMemos}>查看更多评论</a>
-                          <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
-                        </div>
-                        :
-                        <div className="memoMore">
-                          <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
-                        </div>}
-                    </div>
+              <div className="padding40 memoContent new_li">
+                {!memo.is_md ?
+                  <div dangerouslySetInnerHTML={{ __html: memo.content }}></div> :
+
+                  <div id="memo_content_editorMd" className="new_li">
+                    <textarea style={{ 'display': 'none' }}>
+                      {memo.content}
+                    </textarea>
+                  </div>
+                }
+              </div>
+
+              <div className="padding40 bor-bottom-greyE" style={{ paddingTop: '0px' }}>
+
+
+                <div className="mt10 mb20">
+                  <p className={`noteDetailPoint ${memo.user_praise ? 'Pointed' : ''} `} onClick={() => { this.clickPraise() }} >
+                    <i className="iconfont icon-dianzan"></i><br />
+                    <span>{memo.praise_count}</span>
+                  </p>
+                </div>
+
+                {this.props.attachments_list &&
+                  <div>
+                    {this.renderAttachment()}
+                  </div>
+                }
+              </div>
+              {window.__useKindEditor === true ? null : <MemoDetailMDEditor ref="editor" memo={memo}  {...this.props}></MemoDetailMDEditor>}
+              {/*  onClick={ this.createNewComment } */}
+              <div className="padding40 bor-bottom-greyE memoReplies commentsDelegateParent"
+                style={{ display: (comments && !!comments.length) ? 'block' : 'none' }}>
+                <div className="replies_count">
+                  <span className="labal">全部回复</span>
+                  <span className="count">{memo.replies_count}</span>
+                </div>
+
+                <Comments comments={comments} user={_current_user}
+                  replyComment={this.replyComment}
+                  deleteComment={this.deleteComment}
+                  commentPraise={this.commentPraise}
+                  rewardCode={this.rewardCode}
+                  hiddenComment={this.hiddenComment}
+
+
+                ></Comments>
+                {hasMoreComments ?
+                  <div className="memoMore" style={{ cursor: 'default' }}>
+                    <a onClick={this.moreMemos}>查看更多评论</a>
+                    <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
+                  </div>
+                  :
+                  <div className="memoMore">
+                    <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
+                  </div>}
+              </div>
 
-    	        </div>
             </div>
           </div>
+        </div>
 
-        </React.Fragment>
-	    );
-  	}
+      </React.Fragment>
+    );
+  }
 }
 
-export default ImageLayerOfCommentHOC() (MemoDetail);
+export default ImageLayerOfCommentHOC()(MemoDetail);
diff --git a/src/modules/forums/MemoDetailKEEditor.js b/src/modules/forums/MemoDetailKEEditor.js
deleted file mode 100644
index 33db06ae..00000000
--- a/src/modules/forums/MemoDetailKEEditor.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames'
-
-const $ = window.$;
-
-class MemoDetailKEEditor extends Component {
-
-	componentDidUpdate(prevProps, prevState, snapshot) {
-		if (this.props.memo && (!prevProps.memo || this.props.memo.id != prevProps.memo.id)) {
-			this.keEditor = window.sd_create_editor_from_data(this.props.memo.id, null, "100%", "Memo");
-            window._kk = this.keEditor
-		}
-	}
-
-	componentDidMount() {
-		this.keEditor = window.sd_create_editor_from_data(this.props.memo.id, null, "100%", "Memo");
-        window._kk = this.keEditor
-	}
-
-
-	showEditor() {
-	 	$("html, body").animate({ scrollTop: $('#commentInput').offset().top - 100 }, 1000, () => {
-        if (this.keEditor) {
-          	const FF = !(window.mozInnerScreenX == null);
-          	if (FF) {
-            	this.keEditor.focus()
-          	} else {
-            	this.keEditor.edit.win.document.body.focus()
-          	}
-        }
-      });
-	}
-
-  	render() {
-  		const { match, history, memo } = this.props
-  		if (!memo) {
-  			return <div></div>
-  		}
-
-      	return (
-	    	<div nhname={`new_message_${memo.id}`} className="" style={{ paddingTop: '20px', paddingBottom: '20px' }}
-	                id="commentInput">
-	            <form acceptCharset="UTF-8" action="/discusses?challenge_id=118&dis_id=61&dis_type=Shixun"
-	                style={{ flexDirection: 'column', width: '94%', marginLeft: '3%'}}
-	                className="df" data-remote="true" id="new_comment_form" method="post">
-	                <div nhname={`toolbar_container_${memo.id}`}></div>
-	                <textarea id={`comment_news_${memo.id}`}
-	                    nhname={`new_message_textarea_${memo.id}`} name="content" className="none">
-	                </textarea>
-	          	</form>
-	          	<a id={`new_message_submit_btn_${memo.id}`} href="javascript:void(0)"
-	                    style={{display: 'none'}}  className="commentsbtn task-btn task-btn-blue  fr">
-	                发送
-	          	</a>
-	        </div>
-      	);
-  	}
-}
-
-export default ( MemoDetailKEEditor );
diff --git a/src/modules/forums/MemoDetailMDEditor.js b/src/modules/forums/MemoDetailMDEditor.js
index 29bb0883..07f19544 100644
--- a/src/modules/forums/MemoDetailMDEditor.js
+++ b/src/modules/forums/MemoDetailMDEditor.js
@@ -1,15 +1,8 @@
 import React, { Component } from 'react';
-import { Redirect } from 'react-router';
 
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+import { getUploadActionUrl } from 'educoder';
 
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames'
-
-import { getUploadActionUrl } from 'educoder'
-
-import './MemoDetailEditor.css'
+import './MemoDetailEditor.css';
 
 require('codemirror/lib/codemirror.css');
 
@@ -27,13 +20,13 @@ class MemoDetailMDEditor extends Component {
 	componentDidUpdate(prevProps, prevState, snapshot) {
 		if (this.props.memo && (!prevProps.memo || this.props.memo.id != prevProps.memo.id)) {
 			// this.keEditor = window.sd_create_editor_from_data(this.props.memo.id, null, "100%", "Memo");
-   //          window._kk = this.keEditor
+			//          window._kk = this.keEditor
 		}
 	}
 
 	initMDEditor = () => {
 
-    // 因为props.memo不存在时，本组件不会被加载，这里直接在didMount里初始化即可
+		// 因为props.memo不存在时，本组件不会被加载，这里直接在didMount里初始化即可
 		const placeholder = '我要回复...'
 		// const imageUrl = `/upload_with_markdown?container_id=${this.props.memo.id}&container_type=Memo`;
 		const imageUrl = `${getUploadActionUrl()}`;
@@ -45,7 +38,6 @@ class MemoDetailMDEditor extends Component {
 		// 执行太快了，样式不正常
 		window.__tt = 400;
 		setTimeout(() => {
-			console.log('create_editorMD_4comment')
 			var commentMDEditor = window.create_editorMD_4comment("memo_comment_editorMd", '', this.props.height || 240, placeholder, imageUrl, () => {
 				// commentMDEditor.focus()
 
@@ -70,16 +62,16 @@ class MemoDetailMDEditor extends Component {
 	componentDidMount() {
 		!this.props.usingMockInput && this.initMDEditor()
 	}
-  initDrag = () => {
-    window.initMDEditorDragResize(".editor__resize", this.commentMDEditor)
-  }
+	initDrag = () => {
+		window.initMDEditorDragResize(".editor__resize", this.commentMDEditor)
+	}
 
 	onCommit = () => {
-		if(this.props.checkIfLogin()===false){
+		if (this.props.checkIfLogin() === false) {
 			this.props.showLoginDialog()
 			return
 		}
-		if(this.props.checkIfProfileCompleted()===false){
+		if (this.props.checkIfProfileCompleted() === false) {
 			this.props.showaccountprofileDialog()
 			return
 		}
@@ -108,27 +100,29 @@ class MemoDetailMDEditor extends Component {
 		if (this.props.replyComment) {
 			this.props.replyComment(content, this.props.memo.id, this.commentMDEditor)
 		} else {
-			window.$(document).trigger("onReply", { commentContent: content
-    			, id: this.props.memo.id, editor: this.commentMDEditor } );
+			window.$(document).trigger("onReply", {
+				commentContent: content
+				, id: this.props.memo.id, editor: this.commentMDEditor
+			});
 		}
 
 
 	}
 
 	showEditor() {
-	 	$("html, body").animate({ scrollTop: $('.commentInput:visible').offset().top - 100 }, 1000, () => {
+		$("html, body").animate({ scrollTop: $('.commentInput:visible').offset().top - 100 }, 1000, () => {
 			if (this.commentMDEditor) {
 				this.commentMDEditor.cm.focus()
 			} else {
 				this.onMockInputClick()
 			}
-   		});
+		});
 	}
 	close = () => {
-		this.setState({isInited: false})
+		this.setState({ isInited: false })
 	}
 	onMockInputClick = () => {
-		this.setState({isInited: true})
+		this.setState({ isInited: true })
 		if (!this.isMDInited) {
 			this.initMDEditor()
 		} else {
@@ -144,9 +138,9 @@ class MemoDetailMDEditor extends Component {
 			return <div></div>
 		}
 
-			return (
-				<React.Fragment>
-					<style>{`
+		return (
+			<React.Fragment>
+				<style>{`
 						.mockInputWrapper {
 							display: flex;
 							padding: 20px 30px 20px 30px;
@@ -174,16 +168,16 @@ class MemoDetailMDEditor extends Component {
 							width:100%!important;
 						}
 					`}</style>
-					<div style={{ display: isInited ? 'none' : '', borderBottom: `${this.props.commentsLength == 0 ? 'none' : '1px solid #EEEEEE'}`}}
-								className={`mockInputWrapper commentInput ${className}`} >
-						<input onClick={this.onMockInputClick} placeholder={placeholder || '我要回复'}></input>
-						<a href="javascript:void(0)"
-								onClick={this.onMockInputClick}	className="commentsbtn task-btn task-btn-blue">
-								{this.props.buttonText || '发送'}
-						</a>
-					</div>
-					<style>
-						{/*
+				<div style={{ display: isInited ? 'none' : '', borderBottom: `${this.props.commentsLength == 0 ? 'none' : '1px solid #EEEEEE'}` }}
+					className={`mockInputWrapper commentInput ${className}`} >
+					<input onClick={this.onMockInputClick} placeholder={placeholder || '我要回复'}></input>
+					<a
+						onClick={this.onMockInputClick} className="commentsbtn task-btn task-btn-blue">
+						{this.props.buttonText || '发送'}
+					</a>
+				</div>
+				<style>
+					{/*
 						先注释了，影响到了md的拖拽
 						{
 							`
@@ -192,28 +186,32 @@ class MemoDetailMDEditor extends Component {
 							}
 							`
 						} */}
-					</style>
-					<div nhname={`new_message_${memo.id}`}
-						className={`commentInput  commentInputs ${className} ${imageExpand && 'editormd-image-click-expand' }`}
-							style={{ padding: '30px',boxSizing:"border-box", display: isInited ? '' : 'none', paddingBottom: '40px' }} >
-						<div id="memo_comment_editorMd" className="editorMD" style={{ marginBottom: '0px'
-								, border: errorMsg ? '1px solid red' : '1px solid #ddd'}}>
-								<textarea style={{'display': 'none'}}>
-								</textarea>
-						</div>
-						<div className="editor__resize" href="javascript:void(0);">调整高度</div>
-						{ errorMsg && <span className="fl" style={{color: 'red', marginTop: '6px',
-    							marginLeft: '4px'}}>{errorMsg}</span> }
-						<div style={{height: "16px"}}>
-							<a id={`new_message_submit_btn_${memo.id}`} href="javascript:void(0)"
-									onClick={this.onCommit} className="commentsbtn task-btn task-btn-blue fr">
-									{this.props.buttonText || '发送'}
-							</a>
-						</div>
+				</style>
+				<div nhname={`new_message_${memo.id}`}
+					className={`commentInput  commentInputs ${className} ${imageExpand && 'editormd-image-click-expand'}`}
+					style={{ padding: '30px', boxSizing: "border-box", display: isInited ? '' : 'none', paddingBottom: '40px' }} >
+					<div id="memo_comment_editorMd" className="editorMD" style={{
+						marginBottom: '0px'
+						, border: errorMsg ? '1px solid red' : '1px solid #ddd'
+					}}>
+						<textarea style={{ 'display': 'none' }}>
+						</textarea>
 					</div>
-				</React.Fragment>
-			);
+					<div className="editor__resize" href="javascript:void(0);">调整高度</div>
+					{errorMsg && <span className="fl" style={{
+						color: 'red', marginTop: '6px',
+						marginLeft: '4px'
+					}}>{errorMsg}</span>}
+					<div style={{ height: "16px" }}>
+						<a id={`new_message_submit_btn_${memo.id}`}
+							onClick={this.onCommit} className="commentsbtn task-btn task-btn-blue fr">
+							{this.props.buttonText || '发送'}
+						</a>
+					</div>
+				</div>
+			</React.Fragment>
+		);
 	}
 }
 
-export default ( MemoDetailMDEditor );
+export default (MemoDetailMDEditor);
diff --git a/src/modules/forums/MemoDetailMDEditortwo.js b/src/modules/forums/MemoDetailMDEditortwo.js
deleted file mode 100644
index eafc1451..00000000
--- a/src/modules/forums/MemoDetailMDEditortwo.js
+++ /dev/null
@@ -1,173 +0,0 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames'
-
-import { getUploadActionUrl } from 'educoder'
-
-import './MemoDetailEditor.css'
-
-require('codemirror/lib/codemirror.css');
-
-const $ = window.$;
-///作业回答 专用
-class MemoDetailMDEditortwo extends Component {
-    constructor(props) {
-        super(props)
-        this.state = {
-            isInited: this.props.usingMockInput ? false : true,
-            isError: false,
-            errorMsg: ''
-        }
-    }
-    componentDidUpdate(prevProps, prevState, snapshot) {
-        if (this.props.memo && (!prevProps.memo || this.props.memo.id != prevProps.memo.id)) {
-            // this.keEditor = window.sd_create_editor_from_data(this.props.memo.id, null, "100%", "Memo");
-            //          window._kk = this.keEditor
-        }
-    }
-
-    initMDEditor = () => {
-        // 因为props.memo不存在时，本组件不会被加载，这里直接在didMount里初始化即可
-        const placeholder = '我要回复...'
-        // const imageUrl = `/upload_with_markdown?container_id=${this.props.memo.id}&container_type=Memo`;
-        const imageUrl = `${getUploadActionUrl()}`;
-
-        // 执行太快了，样式不正常
-        window.__tt = 400;
-        setTimeout(() => {
-            var commentMDEditor = window.create_editorMD_4comment("memo_comment_editorMd", '', this.props.height || 240, placeholder, imageUrl, () => {
-                commentMDEditor.focus();
-
-                this.initDrag();
-
-                commentMDEditor.cm.on("change", (_cm, changeObj) => {
-                    this.setState({
-                        isError: false,
-                        errorMsg: ''
-                    })
-                })
-            }, {
-                watch: false,
-                dialogLockScreen: false,
-            });
-            this.commentMDEditor = commentMDEditor;
-            window.commentMDEditor = commentMDEditor;
-
-        }, window.__tt)
-    };
-    componentDidMount() {
-        !this.props.usingMockInput && this.initMDEditor()
-    }
-    initDrag = () => {
-        window.initMDEditorDragResize(".editor__resize", this.commentMDEditor)
-    }
-
-    onCommit = () => {
-        const content = this.commentMDEditor.getValue();
-        // this.props.showError ==
-        if (this.props.showError == true) {
-            if (!content || content.trim() == "") {
-                this.setState({
-                    isError: true,
-                    errorMsg: '不能为空'
-                })
-                return;
-            } else if (content.length > 2000) {
-                this.setState({
-                    isError: true,
-                    errorMsg: '不能超过2000个字符'
-                })
-                return;
-            }
-
-            this.setState({
-                isError: false,
-                errorMsg: ''
-            })
-        }
-        window.$(document).trigger("onReply", { commentContent: content
-            , id: this.props.memo.id, editor: this.commentMDEditor } );
-
-    }
-
-    showEditor() {
-        $("html, body").animate({ scrollTop: $('#commentInput').offset().top - 100 }, 1000, () => {
-            if (this.commentMDEditor) {
-                this.commentMDEditor.cm.focus()
-            } else {
-                $('#commentInput input')[0].click()
-            }
-        });
-    }
-    onMockInputClick = () => {
-        this.setState({isInited: true})
-        this.initMDEditor()
-    }
-    render() {
-        const { match, history, memo, placeholder } = this.props
-        const { isInited, errorMsg } = this.state
-        if (!memo) {
-            return <div></div>
-        }
-
-        return (
-            <React.Fragment>
-                <style>{`
-						.mockInputWrapper {
-							display: flex;
-							padding: 30px;
-						}
-						.mockInputWrapper input {
-							flex:1;
-							padding-left: 10px;
-							height: 40px;
-							background: rgb(246,246,246);
-							margin-right: 20px;
-						}
-						.mockInputWrapper a.commentsbtn {
-							height: 40px;
-							display: inline-block;
-							margin-top: 0px !important;
-							vertical-align: text-top;
-							padding-top: 6px;
-							width: 60px;
-							margin-right: 0px !important;
-						}
-						#commentInput .editormd{
-							width:100%!important;
-						}
-					`}</style>
-                <div style={{ display: isInited ? 'none' : ''}} className="mockInputWrapper" id="commentInput">
-                    <input onClick={this.onMockInputClick} placeholder={placeholder || '我要回复'}></input>
-                    <a href="javascript:void(0)"
-                       onClick={this.onMockInputClick}	className="commentsbtn task-btn task-btn-blue">
-                        发送
-                    </a>
-                </div>
-
-                <div nhname={`new_message_${memo.id}`} className=""
-                     style={{ padding: '30px',boxSizing:"border-box", display: isInited ? '' : 'none' }} id="commentInput">
-                    <div id="memo_comment_editorMd" className="editorMD" style={{ marginBottom: '0px'
-                        , border: errorMsg ? '1px solid red' : '1px solid #ddd'}}>
-								<textarea style={{'display': 'none'}}>
-								</textarea>
-                    </div>
-                    <div className="editor__resize" href="javascript:void(0);">调整高度</div>
-                    { errorMsg && <input className="fl" style={{color: 'red', marginTop: '6px',
-                        marginLeft: '4px'}}>{errorMsg}</input> }
-                    <a id={`new_message_submit_btn_${memo.id}`} href="javascript:void(0)"
-                       onClick={this.onCommit} className="commentsbtn  task-btn-blue  task-btn fr ">
-                        发送
-                    </a>
-                </div>
-            </React.Fragment>
-        );
-    }
-}
-
-export default ( MemoDetailMDEditortwo );
diff --git a/src/modules/forums/MemoList.js b/src/modules/forums/MemoList.js
index 96af6876..b5a2f45d 100644
--- a/src/modules/forums/MemoList.js
+++ b/src/modules/forums/MemoList.js
@@ -1,28 +1,37 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
+import React, { Component } from "react";
+import { Redirect } from "react-router";
 
 import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
 
-import PropTypes from 'prop-types';
+import PropTypes from "prop-types";
 
-import classNames from 'classnames'
+import classNames from "classnames";
 
-import Pagination from 'rc-pagination';
+import Pagination from "rc-pagination";
 
-import {getImageUrl, toPath} from 'educoder';
+import { getImageUrl, toPath } from "educoder";
 
-import { postPaginationHOC } from './PostPaginationHOC'
+import { postPaginationHOC } from "./PostPaginationHOC";
 
-import PostItem from './PostItem'
+import PostItem from "./PostItem";
 
-import ForumsNavTab from './ForumsNavTab'
+import ForumsNavTab from "./ForumsNavTab";
 
-import { queryString, ThemeContext }  from 'educoder'
+import { queryString, ThemeContext } from "educoder";
+import styled from "styled-components";
+import 'rc-pagination/assets/index.css';
 
 class MemoList extends Component {
-
   render() {
-    const { match, history, currentPage, memo_count ,memo_list, renderMemoList, onPaginationChange } = this.props
+    const {
+      match,
+      history,
+      currentPage,
+      memo_count,
+      memo_list,
+      renderMemoList,
+      onPaginationChange,
+    } = this.props;
     let theme = this.context;
 
     return (
@@ -34,27 +43,37 @@ class MemoList extends Component {
             }
           `}</style>
           <div className="mh650 edu-back-white">
-            {!memo_list || memo_list.length === 0 ?
+            {!memo_list || memo_list.length === 0 ? (
               <div className="edu-tab-con-box clearfix edu-txt-center">
-                <img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
+                <img
+                  className="edu-nodata-img mb20"
+                  src={getImageUrl("images/educoder/nodata.png")}
+                />
                 <p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
               </div>
-              : renderMemoList()
-            }
+            ) : (
+              renderMemoList()
+            )}
           </div>
-
         </div>
-        { !!memo_count && memo_count > 15 &&
-        <div style={{ width: '100%', background: '#FAFAFA'}}>
-          <Pagination className={'ec-pagination'}
-                      onChange={(pageNum, pageSize) => onPaginationChange(pageNum, pageSize)}
-                      showQuickJumper current={currentPage} total={memo_count} pageSize={15}/>
-        </div> }
+        {!!memo_count && memo_count > 15 && (
+          <div style={{ width: "100%", background: "#FAFAFA"}}>
+            <Pagination
+              className={"ec-pagination"}
+              onChange={(pageNum, pageSize) =>
+                onPaginationChange(pageNum, pageSize)
+              }
+              showQuickJumper
+              current={currentPage}
+              total={memo_count}
+              pageSize={15}
+            />
+          </div>
+        )}
       </React.Fragment>
-
     );
   }
 }
 MemoList.contextType = ThemeContext;
 
-export default ( MemoList );
+export default MemoList;
diff --git a/src/modules/forums/MemoNew.js b/src/modules/forums/MemoNew.js
index a9e7d666..b6ca3512 100644
--- a/src/modules/forums/MemoNew.js
+++ b/src/modules/forums/MemoNew.js
@@ -1,274 +1,161 @@
 import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames'
-
-import { Select,Icon, Upload, Button } from 'antd';
-
-// demo http://react-component.github.io/upload/examples/simple.html
-// import Upload from 'rc-upload';
-
+import { Select, Icon, Upload, Button } from 'antd';
 import axios from 'axios'
 
 import 'antd/lib/select/style/index.css'
 import TPMMDEditor from '../tpm/challengesnew/TPMMDEditor'
 
 import { getUrl, getUploadActionUrl, appendFileSizeToUploadFileAll, appendFileSizeToUploadFile } from 'educoder'
-import CaseDetail from "../moop_cases/CaseDetail";
 const Option = Select.Option;
 const $ = window.$;
 
 let origin = getUrl();
-let path = getUrl("/editormd/lib/")
 
 //  load 
 if (!window.postUpMsg) {
-   $.getScript(
-      `${origin}/javascripts/attachments.js`,
-      (data, textStatus, jqxhr) => {
-      
+  $.getScript(
+    `${origin}/javascripts/attachments.js`,
+    (data, textStatus, jqxhr) => {
+
     });
 }
 
-// editorMD to create
-/**
- *
- * @param id  渲染DOM的id
- * @param width 宽度
- * @param high  高度
- * @param placeholder
- * @param imageUrl 上传图片的url
- * @returns {*} 返回一个editorMD实例
- */
-function create_editorMD(id, width, high, placeholder, imageUrl, callback){
-    var editorName = window.editormd(id, {
-        width   : width,
-        height  : high,
-        syncScrolling : "single",
-        //你的lib目录的路径，我这边用JSP做测试的
-        path    : path ,   // "/editormd/lib/"
-        tex              : true,
-        tocm             : true,
-        emoji            : true,
-        taskList         : true,
-        codeFold         : true,
-        searchReplace    : true,
-        htmlDecode       : "style,script,iframe",
-        sequenceDiagram  : true,
-        autoFocus: false,
-            toolbarIcons : function() {
-            // Or return editormd.toolbarModes[name]; // full, simple, mini
-            // Using "||" set icons align right.
-            return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table"
-              // , '|', "underlineIcon"
-              , "|", "watch", "clear" ]
-        },
-        toolbarCustomIcons : {
-            testIcon  : "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-            testIcon1 : "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>",
-
-            // underlineIcon例子
-            // underlineIcon : "<a type=\"underline\" class=\"underline\" ><div class='underlineIcon'></div></a>"
-        },
-        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
-        saveHTMLToTextarea : true,
-        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-        dialogMaskOpacity : 0.6,
-        placeholder: placeholder,
-        imageUpload : true,
-        imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-        imageUploadURL : imageUrl,//url
-        onload: function(){
-
-            // underlineIcon例子
-            // $('#'+ id + " .underline").bind('click', function() {
-            //   var __Cursor = editorName.cm.getDoc().getCursor();
-            //   editorName.appendMarkdown('__')
-            //   editorName.cm.setCursor(__Cursor.line, __Cursor.ch + 2);
-            // });
-        
-          // this.previewing();
-            $("#"+ id +" [type=\"latex\"]").bind("click", function(){
-                editorName.cm.replaceSelection("```latex");
-                editorName.cm.replaceSelection("\n");
-                editorName.cm.replaceSelection("\n");
-                editorName.cm.replaceSelection("```");
-                var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line-1, 0);
-            });
-
-            $("#"+ id +" [type=\"inline\"]").bind("click", function(){
-                editorName.cm.replaceSelection("`$$$$`");
-                var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line, __Cursor.ch-3);
-                editorName.cm.focus();
-            });
-            $("[type=\"inline\"]").attr("title", "行内公式");
-            $("[type=\"latex\"]").attr("title", "多行公式");
-
-            window.md_elocalStorage(editorName, `memoNew_${id}`, "memoNew");
-
-            callback && callback()
-        }
-    });
-    return editorName;
-}
 
 const typeNameMap = {
-  '技术分享': 5, 
+  '技术分享': 5,
   '操作指南': 3,
-	'通知公告':16,
+  '通知公告': 16,
 }
 export const typeNameMap2 = {
-  5: '技术分享', 
+  5: '技术分享',
   3: '操作指南',
-	16: '通知公告',
+  16: '通知公告',
 }
 const defaultType = '技术分享'
 
-const languageSeparator = '/'
 class MemoNew extends Component {
-    constructor(props) {
-      super(props)
-      this.mdRef = React.createRef();
+  constructor(props) {
+    super(props)
+    this.mdRef = React.createRef();
 
-      // https://testbdweb.trustie.net/uploads.js?attachment_id=1&filename=jqui.js
-      // https://ant.design/components/upload-cn/
-      this.uploaderProps = {
-        action: '/uploads.js',
-        data: { attachment_id: 1 }, // , filename: 2
-        headers: {
-          Authorization: 'authorization-text',
-        },
-        multiple: true,
-        beforeUpload(file) {
-          // console.log('beforeUpload', file.name);
-        },
-        onStart: (file) => {
-          console.log('onStart', file.name);
-          // this.refs.inner.abort(file);
-        },
-        onSuccess(file) {
-          console.log('onSuccess', file);
-        },
-        onProgress(step, file) {
-          console.log('onProgress', Math.round(step.percent), file.name);
-        },
-        onError(err) {
-          console.log('onError', err);
-        },
-      };
+    this.uploaderProps = {
+      action: '/uploads.js',
+      data: { attachment_id: 1 }, // , filename: 2
+      headers: {
+        Authorization: 'authorization-text',
+      },
+      multiple: true,
+      beforeUpload(file) {
+        // console.log('beforeUpload', file.name);
+      },
+      onStart: (file) => {
+        console.log('onStart', file.name);
+        // this.refs.inner.abort(file);
+      },
+      onSuccess(file) {
+        console.log('onSuccess', file);
+      },
+      onProgress(step, file) {
+        console.log('onProgress', Math.round(step.percent), file.name);
+      },
+      onError(err) {
+        console.log('onError', err);
+      },
+    };
 
-      this.state = {
-        memoSubject: '',
-        memoContent: '',
-        memoType: typeNameMap[defaultType],
-        memoRepertoire: '',
-        memoLanguage: [],
+    this.state = {
+      memoSubject: '',
+      memoContent: '',
+      memoType: typeNameMap[defaultType],
+      memoRepertoire: '',
+      memoLanguage: [],
 
-        repertoires: [],
-        currentSelectRepertoiresIndex: -1,
-        repertoiresTagMap: {},
+      repertoires: [],
+      currentSelectRepertoiresIndex: -1,
+      repertoiresTagMap: {},
 
-        fileList: [],
-				forums:[{id:5,name:"技术分享"},{id:3,name:"技术指南"},{id:16,name:"通知公告"}],
-      }
+      fileList: [],
+      forums: [{ id: 5, name: "技术分享" }, { id: 3, name: "技术指南" }, { id: 16, name: "通知公告" }],
     }
-    onCommit() {
-      const { memoSubject, memoRepertoire, memoLanguage, currentMemoId, memoType } = this.state;
-      const { showNotification } = this.props;
-      if (!memoSubject) {
-        showNotification('请先输入话题名称')
-        return
-      } 
-      let mdVal;
-      try {
-        mdVal = this.mdRef.current.getValue()
-
-      } catch (e) {
-        showNotification('编辑器还未加载完毕，请稍后')
-        return
-      }
-
-      if (!mdVal) {
-        showNotification('请先输入话题内容')
-        return
-      } 
-      // !memoRepertoire ||
-      if (memoType === 5 && ( !memoLanguage || memoLanguage.length === 0 )) {
-        showNotification('请先选择技术标签')
-        return
-      }
-      /*
-        <meta content="authenticity_token" name="csrf-param" />
-        <meta content="G7peAyb1T37RvdwxnVUKmTXuL8T7FaBze5mK0j6MCKs=" name="csrf-token" />
-
-        http://localhost:3000/attachments/download/185790/Git-2.17.1.2-32-bit.exe
-        https://www.educoder.net/attachments/205112.js?attachment_id=1
-      */
-      // collect attachments
-      const $ = window.$;
-      const attachmentsMap = {};
-      const attachmentIds = this.state.fileList.map(item => {
-        return item.response ? item.response.id : item.id
-      })
-      // $('#attachments_fields .attachment').each(( index, item ) => {
-      //   const filename = $(item).find('.upload_filename').val();
-      //   // $($('#attachments_fields .attachment')[0]).find('input:nth-child(6)').val()
-      //   const token = $(item).find('input:nth-child(7)').val()
-      //   const attachment_id = parseInt($(item).children().last().val())
-      //   attachmentsMap[index] = {
-      //     filename,
-      //     token,
-      //     attachment_id
-      //   }  
-      //   attachmentIds.push(attachment_id)
-      // })
-      
-
-      if (currentMemoId) {
-        this.updateMemo(attachmentIds)
-      } else {
-        this.newMemo(attachmentIds)  
-      }
+  }
+  onCommit() {
+    const { memoSubject, memoRepertoire, memoLanguage, currentMemoId, memoType } = this.state;
+    const { showNotification } = this.props;
+    if (!memoSubject) {
+      showNotification('请先输入话题名称')
+      return
     }
-    onCancel() {
-      const { currentMemoId, memoType } = this.state;
-      if (currentMemoId) {  // 编辑
-        this.props.history.push(`/forums/${currentMemoId}`)
-      } else {    // 新建
-        this.props.history.push(`/forums`) 
-      }
-      // debugger;this.props.history.goBack()
+    let mdVal;
+    try {
+      mdVal = this.mdRef.current.getValue()
+
+    } catch (e) {
+      showNotification('编辑器还未加载完毕，请稍后')
+      return
     }
-    updateMemo(attachmentsMap) {
-      const { memoSubject, memoRepertoire, memoLanguage, memoType, currentMemoId, content } = this.state;
-      const mdVal = this.mdRef.current.getValue()
-      console.log('isContentEdit: ', mdVal === content);
-      const newMemoUrl = `/memos/${currentMemoId}.json`
-      axios.put(newMemoUrl, {
-          content_changed: this.contentChanged,
-          tags: memoLanguage,
-          // memo:{
-            subject: memoSubject ,
-            content: mdVal,
-            forum_id: memoType,
-            repertoire_name: memoRepertoire,
-            // language: memoLanguage.join(languageSeparator),
-            // 
-          // },
-          attachment_ids: attachmentsMap
-        }, {
-        // withCredentials: true,
-      })
+
+    if (!mdVal) {
+      showNotification('请先输入话题内容')
+      return
+    }
+    // !memoRepertoire ||
+    if (memoType === 5 && (!memoLanguage || memoLanguage.length === 0)) {
+      showNotification('请先选择技术标签')
+      return
+    }
+    /*
+      <meta content="authenticity_token" name="csrf-param" />
+      <meta content="G7peAyb1T37RvdwxnVUKmTXuL8T7FaBze5mK0j6MCKs=" name="csrf-token" />
+
+      http://localhost:3000/attachments/download/185790/Git-2.17.1.2-32-bit.exe
+      https://www.educoder.net/attachments/205112.js?attachment_id=1
+    */
+    // collect attachments
+    const $ = window.$;
+    const attachmentsMap = {};
+    const attachmentIds = this.state.fileList.map(item => {
+      return item.response ? item.response.id : item.id
+    })
+
+    if (currentMemoId) {
+      this.updateMemo(attachmentIds)
+    } else {
+      this.newMemo(attachmentIds)
+    }
+  }
+  onCancel() {
+    const { currentMemoId, memoType } = this.state;
+    if (currentMemoId) {  // 编辑
+      this.props.history.push(`/forums/${currentMemoId}`)
+    } else {    // 新建
+      this.props.history.push(`/forums`)
+    }
+    ; this.props.history.goBack()
+  }
+  updateMemo(attachmentsMap) {
+    const { memoSubject, memoRepertoire, memoLanguage, memoType, currentMemoId, content } = this.state;
+    const mdVal = this.mdRef.current.getValue()
+    console.log('isContentEdit: ', mdVal === content);
+    const newMemoUrl = `/memos/${currentMemoId}.json`
+    axios.put(newMemoUrl, {
+      content_changed: this.contentChanged,
+      tags: memoLanguage,
+      // memo:{
+      subject: memoSubject,
+      content: mdVal,
+      forum_id: memoType,
+      repertoire_name: memoRepertoire,
+      // language: memoLanguage.join(languageSeparator),
+      // 
+      // },
+      attachment_ids: attachmentsMap
+    }, {
+      // withCredentials: true,
+    })
       .then((response) => {
         const { status, message, memo_id } = response.data;
         if (status === 0) {
-          window.$("html,body").animate({"scrollTop":0})
+          window.$("html,body").animate({ "scrollTop": 0 })
           this.props.history.push(`/forums/${currentMemoId}`)
         } else {
           this.props.showNotification(message)
@@ -276,29 +163,29 @@ class MemoNew extends Component {
       }).catch((error) => {
         console.log(error)
       })
-    }
-    newMemo(attachmentsMap) {
-      const { memoSubject, memoRepertoire, memoLanguage, memoType } = this.state;
-      const mdVal = this.mdRef.current.getValue()
-      
-      const newMemoUrl = `/memos.json`
-      axios.post(newMemoUrl, {
-          tags: memoLanguage,
-          // memo:{
-            subject: memoSubject ,
-            content: mdVal,
-            forum_id: memoType,
-            // repertoire_name: memoRepertoire,
-            
-          // },
-          attachment_ids: attachmentsMap
-        }, {
-        // withCredentials: true,
-      })
+  }
+  newMemo(attachmentsMap) {
+    const { memoSubject, memoRepertoire, memoLanguage, memoType } = this.state;
+    const mdVal = this.mdRef.current.getValue()
+
+    const newMemoUrl = `/memos.json`
+    axios.post(newMemoUrl, {
+      tags: memoLanguage,
+      // memo:{
+      subject: memoSubject,
+      content: mdVal,
+      forum_id: memoType,
+      // repertoire_name: memoRepertoire,
+
+      // },
+      attachment_ids: attachmentsMap
+    }, {
+      // withCredentials: true,
+    })
       .then((response) => {
         const { status, message, memo_id } = response.data;
         if (status === 0) {
-          window.$("html,body").animate({"scrollTop":0})
+          window.$("html,body").animate({ "scrollTop": 0 })
           this.props.history.push(`/forums/${memo_id}`)
         } else {
           this.props.showNotification(message)
@@ -306,425 +193,342 @@ class MemoNew extends Component {
       }).catch((error) => {
         console.log(error)
       })
-    }
-    componentDidMount() {
-      const newMemoUrl = `/memos/new.json`
-      axios.get(newMemoUrl,{
-          // withCredentials: true,
-      })
+  }
+  componentDidMount() {
+    const newMemoUrl = `/memos/new.json`
+    axios.get(newMemoUrl, {
+      // withCredentials: true,
+    })
       .then((response) => {
         const data = response.data;
-        const repertoires = [];
-        const repertoiresTagMap = {}
-        if ( data.tag_list ) {
-					document.title = "交流问答";
-          // data.tag_list.forEach((item, index)=>{
-          //   const tagArray = [];
-          //   item.tag.forEach( (tag, index) => {
-          //     tagArray.push(tag.name)
-          //   })
-          //   repertoires.push(item.rep.repertoire.name) 
-          //   repertoiresTagMap[item.rep.repertoire.name] = tagArray
-          // })
+        if (data.tag_list) {
+          document.title = "交流问答";
           this.setState({
             tag_list: data.tag_list
-            // repertoires,
-            // repertoiresTagMap
           })
 
-          // const user = response.data.current_user;
-          // user.tidding_count = response.data.tidding_count;
-          // this.props.initCommonState(user)
-
           // 初始化 csrf meta
           const $ = window.$
-          $('head').append( $('<meta content="authenticity_token" name="csrf-param" />') )
-          $('head').append( $(`<meta content="${response.data.csrf_token}" name="csrf-token" />`) )
+          $('head').append($('<meta content="authenticity_token" name="csrf-param" />'))
+          $('head').append($(`<meta content="${response.data.csrf_token}" name="csrf-token" />`))
+        }
+        if (data.forums) {
+          this.setState({
+            forums: data.forums === undefined || data.forums === null || data.forums.length === 0 ? this.state.forums : data.forums
+          })
         }
-        if(data.forums){
-					this.setState({
-						forums: data.forums===undefined||data.forums===null||data.forums.length===0? this.state.forums:data.forums
-						// repertoires,
-						// repertoiresTagMap
-					})
-				}
       }).catch((error) => {
         console.log(error)
       })
 
-      // 如果是编辑
-      const { match } = this.props
-      const memoId = match.params.memoId;
-      if (memoId) {
-        const memoUrl = `/memos/${match.params.memoId}/edit.json`;
-        axios.get(memoUrl,{
-              // withCredentials: true,
-          })
-          .then((response) => {
-            const tag_list = response.data.tag_list
-            if (tag_list) {
-              // this.setState({...response.data})
-
-							document.title = response.data.subject;
-              const { content, forum_id, id, repertoire_name, subject, 
-                current_user, tag_list, attachments_url, memo_tags, attachments } = response.data;
-              this.initMD(content);
-              // this.onRepertoiresChange(repertoire_name)
-              // tag -> memo_tags
-              const tag = memo_tags;
-              let memoLanguage = []
-              if (tag) {
-                memoLanguage = tag.map((item, index) => {
-                  return item.id + ""
-                })
-              }
-              const fileList = attachments.map(item => {
-                return {
-                  id: item.id,
-                  uid: item.id,
-                  name: appendFileSizeToUploadFile(item),
-                  url: item.url,
-                  filesize: item.filesize,
-                  status: 'done'
-                }
-              })
-              this.setState({
-                fileList,
-                currentMemoId: memoId,
-                memoSubject: subject,
-                memoType: forum_id,
-                memoRepertoire: repertoire_name,
-                memoLanguage,
-                attachments_url,
-                content
-
-                // repertoires: [],
-                // currentSelectRepertoiresIndex: -1,
-              }, ()=> {
-                // 解决有时候编辑时内容不显示的问题
-                setTimeout(() => {
-                  this.mdRef.current && this.mdRef.current.setValue(content || '')
-                }, 2000)
-
-                $('.upload_filename').each((index, item) => {
-                  var width = window._textWidth($(item), '14px');
-                  console.log(width)
-                  $(item).css('width', width + 20)
-                })
-                
-              })
-              // 加载完后滚动条滚动
-              window.$("html,body").animate({"scrollTop":0})
-
-              this.props.initForumState({
-                // current_user,
-                tag_list
-              })
-            }
-
-          }).catch((error) => {
-            console.log(error)
-          })
-      } else {
-        this.initMD();
-      }
-      
-
-
-      
-    }
-    initMD(initValue) {
-      return;
-
-      this.contentChanged = false;
-      const placeholder = "";
-      // amp;
-      // 编辑时要传memoId
-      // const imageUrl = `/upload_with_markdown?container_id=&container_type=Memo`;
-      const imageUrl = `${getUploadActionUrl()}`;
-      
-      // 创建editorMd
-      
-      const taskpass_editormd = create_editorMD("memoMD", '100%', 400, placeholder, imageUrl, () => {
-        setTimeout(()=>{
-          taskpass_editormd.resize()
-          taskpass_editormd.cm && taskpass_editormd.cm.refresh()
-        }, 500)
-
-        if (initValue) {
-          taskpass_editormd.setValue(initValue)  
-        }
-        taskpass_editormd.cm.on("change", (_cm, changeObj) =>{
-          console.log('....contentChanged')
-          this.contentChanged = true;
-        })
-      });
-      this.taskpass_editormd = taskpass_editormd;
-      window.taskpass_editormd = taskpass_editormd;
-      
-    }
-
-    renderOptions(array) {
-      const elementArray = [];
-      array.forEach(( item, index ) => {
-        elementArray.push(
-            <Option key={index} value={item}>{item}</Option>
-          )
-      })
-      return elementArray
-    }
-    onRepertoiresChange(value) {
-      
-      const index = this.state.repertoires.indexOf(value)
-
-      this.setState({
-        currentSelectRepertoiresIndex: index,
-        memoRepertoire: value,
-        memoLanguage: ''
-      });
-    };
-
-    renderTag() {
-      const { tag_list } = this.state;
-      if (!tag_list || tag_list.length === 0) {
-        return ''
-      }
-      const result = []
-
-      tag_list.forEach((item, index) => {
-        result.push(<Option value={item.id+''} key={index} >{item.name}</Option>)
-      })
-
-      return result;
-    }
-
-    onTagChange(value) {
-      if (value && value.length > 3) {
-        this.props.showNotification(`最多选择3个技术标签`)
-
-        return;
-      }
-      this.setState({
-        memoLanguage: value
-      })
-    }
-    
-    onTypeChange(value) {
-
-      this.setState({
-        memoType: typeNameMap[value]
-      })
-    }
-    onMemoNameChange(e) {
-      this.setState({
-        memoSubject: e.target.value
-      })
-    }
-    renderAttachment() {
-      const { attachments_url } = this.state;
-      const attachments = []
-      attachments_url.forEach((item, index) => {
-        const ar = item.url.split('/')
-        const fileName = ar[ar.length - 1]
-        /*
-          <p className="clearfix" key={index} >
-            <a href={item.url} className="color-green clearfix notefileDownload">
-              <span className="fl">{fileName}</span><i className="iconfont icon-xiazai color-green ml5 fl"></i>
-            </a>
-          </p>
-        */ 
-        // ?attachment_id=2
-        /*
-        <span id="attachments_fields" className="attachments_fields" xmlns="http://www.w3.org/1999/html">
-          </span>
-
-        */
-        attachments.push(
-            <React.Fragment>
-              <span id={`attachments_10${index}`} className="attachment">
-                <label className="panel-form-label fl">&nbsp;</label>
-                <i className="iconfont icon-fujian ml20mr20Color" aria-hidden="true"></i>
-                <input type="text" className="upload_filename readonly hidden" name="attachments[2][filename]" readonly="readonly"
-                   style={{border:'none',whiteSpace: 'nowrap', textOverflow:'ellipsis',fontFamily: 'Consolas'
-                    , color: '#676767', marginLeft: '20px', verticalAlign: 'middle'}}
-                   size="8" value={item.filename}></input>
-                <font className="mr20 ml20mr20Color" style={{marginLeft:'10px', verticalAlign: 'middle'}}>{window.conver_size(item.id)}</font>
-                <a href={`/attachments/${item.id}.js?attachment_id=10${index}`} className="remove-upload" 
-                  style={{verticalAlign: 'top', display: 'inlineBlock'}} data-remote="true" 
-                  data-method="delete">
-                  <i className="iconfont ml20mr20Color">&#xe61c;</i>
-                </a>
-                <div className="div_attachments" name="div_attachments_xx"></div>
-                {/**/}<input type="hidden" name="attachments[xx][token]" 
-                      value="185811.24305bb2c4912f715629aa3615cdbabc"></input>
-                <input type="hidden" name="attachments[xx][attachment_id]" value={item.id}></input>
-              </span>
-              <div className="cl"></div>
-            </React.Fragment>
-
-          )
-      })
-      return attachments;
-    }
-    handleChange = (info) => {
-      if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
-        let fileList = info.fileList;
-        this.setState({ 
-          fileList: appendFileSizeToUploadFileAll(fileList)
-        });
-      }
-    }
-    onAttachmentRemove = (file) => {
-			if(!file.percent || file.percent == 100){
-				this.props.confirm({
-					// title: '确定要删除这个附件吗?',
-					content: '是否确认删除?',
-
-					okText: '确定',
-					cancelText: '取消',
-					// content: 'Some descriptions',
-					onOk: () => {
-						this.deleteAttachment(file)
-					},
-					onCancel() {
-						console.log('Cancel');
-					},
-				});
-				return false;
-			}
-
-    }
-    deleteAttachment = (file) => {
-      // 初次上传不能直接取uid
-      const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
-      axios.delete(url, {
+    // 如果是编辑
+    const { match } = this.props
+    const memoId = match.params.memoId;
+    if (memoId) {
+      const memoUrl = `/memos/${match.params.memoId}/edit.json`;
+      axios.get(memoUrl, {
+        // withCredentials: true,
       })
         .then((response) => {
-          if (response.data) {
-            const { status } = response.data;
-            if (status == 0) {
-              console.log('--- success')
-              
-              this.setState((state) => {
-                const index = state.fileList.indexOf(file);
-                const newFileList = state.fileList.slice();
-                newFileList.splice(index, 1);
-                return {
-                  fileList: newFileList,
-                };
-              });
-            }
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
-    }
-  	render() {
-  		const { match, history,forums } = this.props
-      const { 
-        // repertoires,  repertoiresTagMap, currentSelectRepertoiresIndex, memoRepertoire,
-        tag_list,
-        memoSubject, memoType,
-        memoLanguage, attachments_url, fileList } = this.state;
-      const memoId = match.params.memoId;
+          const tag_list = response.data.tag_list
+          if (tag_list) {
+            // this.setState({...response.data})
 
-      const uploadProps = {
-        width: 600,
-        fileList,
-        multiple: true,
-        // https://github.com/ant-design/ant-design/issues/15505
-        // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
-        // showUploadList: false,
-        action: `${getUploadActionUrl()}`,
-        onChange: this.handleChange,
-        onRemove: this.onAttachmentRemove,
-        beforeUpload: (file) => {
-          console.log('beforeUpload', file.name);
-          const isLt150M = file.size / 1024 / 1024 < 150;
-          if (!isLt150M) {
-            this.props.showNotification('文件大小必须小于150MB!');
+            document.title = response.data.subject;
+            const { content, forum_id, id, repertoire_name, subject,
+              current_user, tag_list, attachments_url, memo_tags, attachments } = response.data;
+            this.initMD(content);
+            // this.onRepertoiresChange(repertoire_name)
+            // tag -> memo_tags
+            const tag = memo_tags;
+            let memoLanguage = []
+            if (tag) {
+              memoLanguage = tag.map((item, index) => {
+                return item.id + ""
+              })
+            }
+            const fileList = attachments.map(item => {
+              return {
+                id: item.id,
+                uid: item.id,
+                name: appendFileSizeToUploadFile(item),
+                url: item.url,
+                filesize: item.filesize,
+                status: 'done'
+              }
+            })
+            this.setState({
+              fileList,
+              currentMemoId: memoId,
+              memoSubject: subject,
+              memoType: forum_id,
+              memoRepertoire: repertoire_name,
+              memoLanguage,
+              attachments_url,
+              content
+
+              // repertoires: [],
+              // currentSelectRepertoiresIndex: -1,
+            }, () => {
+              // 解决有时候编辑时内容不显示的问题
+              setTimeout(() => {
+                this.mdRef.current && this.mdRef.current.setValue(content || '')
+              }, 2000)
+
+              $('.upload_filename').each((index, item) => {
+                var width = window._textWidth($(item), '14px');
+                console.log(width)
+                $(item).css('width', width + 20)
+              })
+
+            })
+            // 加载完后滚动条滚动
+            window.$("html,body").animate({ "scrollTop": 0 })
+
+            this.props.initForumState({
+              // current_user,
+              tag_list
+            })
           }
-          return isLt150M;
+
+        }).catch((error) => {
+          console.log(error)
+        })
+    } else {
+      this.initMD();
+    }
+
+
+
+
+  }
+
+  renderOptions(array) {
+    const elementArray = [];
+    array.forEach((item, index) => {
+      elementArray.push(
+        <Option key={index} value={item}>{item}</Option>
+      )
+    })
+    return elementArray
+  }
+  onRepertoiresChange(value) {
+
+    const index = this.state.repertoires.indexOf(value)
+
+    this.setState({
+      currentSelectRepertoiresIndex: index,
+      memoRepertoire: value,
+      memoLanguage: ''
+    });
+  };
+
+  renderTag() {
+    const { tag_list } = this.state;
+    if (!tag_list || tag_list.length === 0) {
+      return ''
+    }
+    const result = []
+
+    tag_list.forEach((item, index) => {
+      result.push(<Option value={item.id + ''} key={index} >{item.name}</Option>)
+    })
+
+    return result;
+  }
+
+  onTagChange(value) {
+    if (value && value.length > 3) {
+      this.props.showNotification(`最多选择3个技术标签`)
+
+      return;
+    }
+    this.setState({
+      memoLanguage: value
+    })
+  }
+
+  onTypeChange(value) {
+
+    this.setState({
+      memoType: typeNameMap[value]
+    })
+  }
+  onMemoNameChange(e) {
+    this.setState({
+      memoSubject: e.target.value
+    })
+  }
+  renderAttachment() {
+    const { attachments_url } = this.state;
+    const attachments = []
+    attachments_url.forEach((item, index) => {
+      const ar = item.url.split('/')
+      attachments.push(
+        <React.Fragment>
+          <span id={`attachments_10${index}`} className="attachment">
+            <label className="panel-form-label fl">&nbsp;</label>
+            <i className="iconfont icon-fujian ml20mr20Color" aria-hidden="true"></i>
+            <input type="text" className="upload_filename readonly hidden" name="attachments[2][filename]" readonly="readonly"
+              style={{
+                border: 'none', whiteSpace: 'nowrap', textOverflow: 'ellipsis', fontFamily: 'Consolas'
+                , color: '#676767', marginLeft: '20px', verticalAlign: 'middle'
+              }}
+              size="8" value={item.filename}></input>
+            <font className="mr20 ml20mr20Color" style={{ marginLeft: '10px', verticalAlign: 'middle' }}>{window.conver_size(item.id)}</font>
+            <a href={`/attachments/${item.id}.js?attachment_id=10${index}`} className="remove-upload"
+              style={{ verticalAlign: 'top', display: 'inlineBlock' }} data-remote="true"
+              data-method="delete">
+              <i className="iconfont ml20mr20Color">&#xe61c;</i>
+            </a>
+            <div className="div_attachments" name="div_attachments_xx"></div>
+            {/**/}<input type="hidden" name="attachments[xx][token]"
+              value="185811.24305bb2c4912f715629aa3615cdbabc"></input>
+            <input type="hidden" name="attachments[xx][attachment_id]" value={item.id}></input>
+          </span>
+          <div className="cl"></div>
+        </React.Fragment>
+
+      )
+    })
+    return attachments;
+  }
+  handleChange = (info) => {
+    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+      let fileList = info.fileList;
+      this.setState({
+        fileList: appendFileSizeToUploadFileAll(fileList)
+      });
+    }
+  }
+  onAttachmentRemove = (file) => {
+    if (!file.percent || file.percent == 100) {
+      this.props.confirm({
+        // title: '确定要删除这个附件吗?',
+        content: '是否确认删除?',
+
+        okText: '确定',
+        cancelText: '取消',
+        // content: 'Some descriptions',
+        onOk: () => {
+          this.deleteAttachment(file)
         },
-      };
-	    return (
-    		<div >
-          <p className="clearfix mb10 undefined cBreadcrumb"><a className="btn colorgrey fl hovercolorblue"
-                                                                href="/forums">交流问答</a><span
+        onCancel() {
+          console.log('Cancel');
+        },
+      });
+      return false;
+    }
+
+  }
+  deleteAttachment = (file) => {
+    // 初次上传不能直接取uid
+    const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+    axios.delete(url, {
+    })
+      .then((response) => {
+        if (response.data) {
+          const { status } = response.data;
+          if (status == 0) {
+            console.log('--- success')
+
+            this.setState((state) => {
+              const index = state.fileList.indexOf(file);
+              const newFileList = state.fileList.slice();
+              newFileList.splice(index, 1);
+              return {
+                fileList: newFileList,
+              };
+            });
+          }
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+  }
+  render() {
+    const { match, history, forums } = this.props
+    const {
+      // repertoires,  repertoiresTagMap, currentSelectRepertoiresIndex, memoRepertoire,
+      tag_list,
+      memoSubject, memoType,
+      memoLanguage, attachments_url, fileList } = this.state;
+    const memoId = match.params.memoId;
+
+    const uploadProps = {
+      width: 600,
+      fileList,
+      multiple: true,
+      // https://github.com/ant-design/ant-design/issues/15505
+      // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
+      // showUploadList: false,
+      action: `${getUploadActionUrl()}`,
+      onChange: this.handleChange,
+      onRemove: this.onAttachmentRemove,
+      beforeUpload: (file) => {
+        console.log('beforeUpload', file.name);
+        const isLt150M = file.size / 1024 / 1024 < 150;
+        if (!isLt150M) {
+          this.props.showNotification('文件大小必须小于150MB!');
+        }
+        return isLt150M;
+      },
+    };
+    return (
+      <div >
+        <p className="clearfix mb10 undefined cBreadcrumb"><a className="btn colorgrey fl hovercolorblue"
+          href="/forums">交流问答</a><span
             className="color-grey-9 fl ml3 mr3"> / </span><span>详情</span></p>
-          <div className="pt20 pl20 pr20 pb20 bor-bottom-greyE clearfix" style={{background: '#fff'}}>
-            <span className="fl font-16">{ memoId ? '编辑话题' : '发布话题'}</span>
-            {/*<a href="/shixuns/mf98sgi3/settings" className="ring-green mt7 fr" id="edit_setting" 
+        <div className="pt20 pl20 pr20 pb20 bor-bottom-greyE clearfix" style={{ background: '#fff' }}>
+          <span className="fl font-16">{memoId ? '编辑话题' : '发布话题'}</span>
+          {/*<a href="/shixuns/mf98sgi3/settings" className="ring-green mt7 fr" id="edit_setting" 
               data-remote="true" data-tip-down="编辑"><img src="/images/educoder/icon/edit.svg" className="fl ml2 mt3">
             </a>*/}
-          </div>
+        </div>
 
-	        <div className="edu-back-white mb10 clearfix" id="memoSubject">
-            <div className="padding30-20">
-              <p className="color-grey-6 font-16 mb30">话题名称</p>
-              <div className="df">
-                <span className="mr30 color-orange pt10">*</span>
-                <div className="flex1 mr20">
-                  <input type="text" className="input-100-45 greyInput" maxlength="50" 
-                      value={memoSubject} onChange={(val)=>this.onMemoNameChange(val)} placeholder="">
-                  </input>
-                </div>
-                <div style={{width: '57px'}}>
-                  <span className="color-orange mt8 fl none" >
-                    <i className="fa fa-exclamation-circle mr3"></i>必填项
+        <div className="edu-back-white mb10 clearfix" id="memoSubject">
+          <div className="padding30-20">
+            <p className="color-grey-6 font-16 mb30">话题名称</p>
+            <div className="df">
+              <span className="mr30 color-orange pt10">*</span>
+              <div className="flex1 mr20">
+                <input type="text" className="input-100-45 greyInput" maxlength="50"
+                  value={memoSubject} onChange={(val) => this.onMemoNameChange(val)} placeholder="">
+                </input>
+              </div>
+              <div style={{ width: '57px' }}>
+                <span className="color-orange mt8 fl none" >
+                  <i className="fa fa-exclamation-circle mr3"></i>必填项
                   </span>
-                </div>
               </div>
             </div>
           </div>
+        </div>
 
-          <div className="edu-back-white mb10 clearfix">
-            <div className="padding30-20">
-              <p className="color-grey-6 font-16 mb30">内容</p>
-              <div className="df">
-                <span className="mr30 color-orange pt10">*</span>
-                <div className="flex1 mr20">
-                  <TPMMDEditor ref={this.mdRef} placeholder={''} watch={false}
-                    mdID={'memoMD'} initValue={this.state.content} className="memoMD">
-                  </TPMMDEditor>
-                  {/* <div className="flex1 break_word show_content_grey new_li" id="memoMD">
+        <div className="edu-back-white mb10 clearfix">
+          <div className="padding30-20">
+            <p className="color-grey-6 font-16 mb30">内容</p>
+            <div className="df">
+              <span className="mr30 color-orange pt10">*</span>
+              <div className="flex1 mr20">
+                <TPMMDEditor ref={this.mdRef} placeholder={''} watch={false}
+                  mdID={'memoMD'} initValue={this.state.content} className="memoMD">
+                </TPMMDEditor>
+                {/* <div className="flex1 break_word show_content_grey new_li" id="memoMD">
                     <textarea style={{'display':'none'}}></textarea>
                   </div> */}
-                  <p id="e_tip_memoNew" className="edu-txt-right color-grey-cd font-12"></p>
-                  <p id="e_tips_memoNew" className="edu-txt-right color-grey-cd font-12"></p>
-                </div>
-                <div style={{width: '57px'}}>
-                  <span className="color-orange mt8 fl none" >
-                    <i className="fa fa-exclamation-circle mr3"></i>必填项
-                  </span>
-                </div>
+                <p id="e_tip_memoNew" className="edu-txt-right color-grey-cd font-12"></p>
+                <p id="e_tips_memoNew" className="edu-txt-right color-grey-cd font-12"></p>
               </div>
+              <div style={{ width: '57px' }}>
+                <span className="color-orange mt8 fl none" >
+                  <i className="fa fa-exclamation-circle mr3"></i>必填项
+                  </span>
+              </div>
+            </div>
 
-              
-                
-              {/* <form className="newForm">
-              <span id={`attachments_fields`} className="attachments_fields" 
-                xmlns="http://www.w3.org/1999/html">
-                { attachments_url && !!attachments_url.length && 
-                  this.renderAttachment()
-                }
-              </span> 
-              <span className="add_attachment">
-                <input className="file_selector" data-are-you-sure="您确定要删除吗？" 
-                  data-delete-all-files="您确定要删除所有文件吗" data-description-placeholder="可选的描述" 
-                  data-field-is-public="公开" data-file-count="个文件已上传" 
-                  data-lebel-file-uploding="个文件正在上传" data-max-concurrent-uploads="2" 
-                  data-max-file-size-message="该文件无法上传。超过文件大小限制 (50 MB)，建议上传到百度云等其他共享工具里，然后在txt文档里给出链接以及共享密码并上传" 
-                  data-max-file-size="52428800" data-upload-path="/uploads.js" id="_file" 
-                  multiple="multiple" name="attachments[dummy][file]" 
-                  onChange={()=>{debugger;window.addInputFiles( window.$('.file_selector')[0] ) }} 
-                  style={{'display':'none'}} type="file">
-                </input>
-              </span> 
-              </form>*/}
-
-              <style>{`
+            <style>{`
                 .memo_upload.upload_1  {
                   margin-left: 36px;
                 }
@@ -735,84 +539,41 @@ class MemoNew extends Component {
                   top: 4px;
                 }
               `}</style>
-              {/*<Upload {...this.uploaderProps} ref="inner"><a>开始上传</a></Upload>*/}
-              <Upload {...uploadProps} className="upload_1 memo_upload" >
-                <Button className="uploadBtn">
-                  <Icon type="upload" /> 上传附件
+            {/*<Upload {...this.uploaderProps} ref="inner"><a>开始上传</a></Upload>*/}
+            <Upload {...uploadProps} className="upload_1 memo_upload" >
+              <Button className="uploadBtn">
+                <Icon type="upload" /> 上传附件
                 </Button>
                 (单个文件150M以内)
               </Upload>
 
-            {/* 请求status 422 */}
-            
-                    {/* <Icon type="upload" ></Icon> */}
-              {/* <div className="df uploadBtn">
-                <a href="javascript:void(0);" className="fl" onClick={()=>window.$('#_file').click()} 
-                    data-tip-down="请选择文件上传">
-                  <i className="fa fa-upload mr5 color-blue"></i>
-                  <span className="color-blue">  上传附件
-                  </span><span style={{color: '#CDCDCD', fontSize: "14px"}}>(单个文件50M以内)</span>
-                </a>
-              </div> */}
-            </div>
           </div>
+        </div>
         {/* TODOTODO 这里重复的html代码太多，如果有其他页面有类似需求，需要封装*/}
 
-          <div className="edu-back-white mb10 clearfix">
-            <div className="padding30-20">
-              <p className="color-grey-6 font-16 mb30">话题类型</p>
-              <div className="df">
-                <span className="mr30 color-orange pt10">*</span>
-                <div className="flex1 mr20">
-                  <Select className="ecSelect" value={typeNameMap2[memoType]}
-                    onChange={(val)=>this.onTypeChange(val)}>
-                    <Option value="技术分享">技术分享</Option>
-                    <Option value="操作指南">操作指南</Option>
-										<Option value="通知公告">通知公告</Option>
-                  </Select>
-                </div>
-                <div style={{width: '57px'}}>
-                  <span className="color-orange mt8 fl none" >
-                    <i className="fa fa-exclamation-circle mr3"></i>必填项
+        <div className="edu-back-white mb10 clearfix">
+          <div className="padding30-20">
+            <p className="color-grey-6 font-16 mb30">话题类型</p>
+            <div className="df">
+              <span className="mr30 color-orange pt10">*</span>
+              <div className="flex1 mr20">
+                <Select className="ecSelect" value={typeNameMap2[memoType]}
+                  onChange={(val) => this.onTypeChange(val)}>
+                  <Option value="技术分享">技术分享</Option>
+                  <Option value="操作指南">操作指南</Option>
+                  <Option value="通知公告">通知公告</Option>
+                </Select>
+              </div>
+              <div style={{ width: '57px' }}>
+                <span className="color-orange mt8 fl none" >
+                  <i className="fa fa-exclamation-circle mr3"></i>必填项
                   </span>
-                </div>
               </div>
             </div>
           </div>
+        </div>
 
-          {/* memoType === typeNameMap['技术分享'] && 
-          <div className="edu-back-white mb10 clearfix">
-            <div className="padding30-20">
-              <p className="color-grey-6 font-16 mb30">技术标签</p>
-              <div className="df">
-                <span className="mr30 color-orange pt10">*</span>
-                <div className="mr20">
-                  <Select className="ecSelect" placeholder="请选择大标签" onChange={(e) => this.onRepertoiresChange(e)}
-                    value={memoRepertoire}
-                  >
-                    {this.renderOptions(repertoires)}
-                  </Select>
-                </div>
-                <div className="flex1 mr20">
-                  <Select className="ecSelect" placeholder="请选择小标签" 
-                    onChange={(e) => this.onTagChange(e)} value={memoLanguage}
-                    dropdownStyle={{'maxHeight': '300px', 'overflow': 'auto'}} >
-                    { currentSelectRepertoiresIndex >= 0 
-                        && this.renderOptions(repertoiresTagMap[repertoires[currentSelectRepertoiresIndex]])}
-                    
-                  </Select>
-                </div>
-
-                <div style={{width: '57px'}}>
-                  <span className="color-orange mt8 fl none" >
-                    <i className="fa fa-exclamation-circle mr3"></i>必填项
-                  </span>
-                </div>
-              </div>
-            </div>
-          </div> */}
-
-          { memoType === typeNameMap['技术分享'] && 
+        {memoType === typeNameMap['技术分享'] &&
           <div className="edu-back-white mb10 clearfix">
             <div className="padding30-20">
               <p className="color-grey-6 font-16 mb30">技术标签</p>
@@ -820,37 +581,37 @@ class MemoNew extends Component {
                 <span className="mr30 color-orange pt10">*</span>
 
                 <div className="flex1 mr20">
-                  <Select 
-                    className="ecSelect" 
+                  <Select
+                    className="ecSelect"
                     value={memoLanguage}
-                    placeholder="请选择技术标签" 
-                    onChange={(e) => this.onTagChange(e)} 
-                    dropdownStyle={{'maxHeight': '300px', 'overflow': 'auto'}}
+                    placeholder="请选择技术标签"
+                    onChange={(e) => this.onTagChange(e)}
+                    dropdownStyle={{ 'maxHeight': '300px', 'overflow': 'auto' }}
                     mode="multiple"
-                    filterOption={(inputValue, option) => { return option.props.children.toLocaleLowerCase().indexOf(inputValue.toLocaleLowerCase()) != -1 } }
+                    filterOption={(inputValue, option) => { return option.props.children.toLocaleLowerCase().indexOf(inputValue.toLocaleLowerCase()) != -1 }}
                     tokenSeparators={[';']} >
                     {this.renderTag()}
                   </Select>
                 </div>
 
-                <div style={{width: '57px'}}>
+                <div style={{ width: '57px' }}>
                   <span className="color-orange mt8 fl none" >
                     <i className="fa fa-exclamation-circle mr3"></i>必填项
                   </span>
                 </div>
               </div>
             </div>
-          </div> }
+          </div>}
 
-          <div className="clearfix mt30">
-            <a href="javascript:void(0)" className="defalutSubmitbtn fl mr20" 
-                onClick={()=>{this.onCommit()}}>提交</a>
-            <a onClick={()=>{ this.onCancel() }} className="defalutCancelbtn fl">取消</a>
-          </div>
+        <div className="clearfix mt30">
+          <a className="defalutSubmitbtn fl mr20"
+            onClick={() => { this.onCommit() }}>提交</a>
+          <a onClick={() => { this.onCancel() }} className="defalutCancelbtn fl">取消</a>
+        </div>
 
-	      </div>
-	    );
-  	}
+      </div>
+    );
+  }
 }
 
 export default MemoNew;
diff --git a/src/modules/forums/PostItem.js b/src/modules/forums/PostItem.js
index 99dcab46..7d793dbd 100644
--- a/src/modules/forums/PostItem.js
+++ b/src/modules/forums/PostItem.js
@@ -1,110 +1,222 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
+import React, { Component } from "react";
+import { Redirect } from "react-router";
 
 import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
 
-import PropTypes from 'prop-types';
+import PropTypes from "prop-types";
 
-import classNames from 'classnames';
+import classNames from "classnames";
 
-import { getImageUrl, toPath, ThemeContext } from 'educoder';
+import { getImageUrl, toPath, ThemeContext } from "educoder";
 
-import moment from 'moment';
+import moment from "moment";
 
-import { Tooltip } from 'antd'
+import { Tooltip } from "antd";
+import styled from "styled-components";
 
+const Container = styled.div`
+  &:last-child .forum_table_item {
+    border-bottom: none;
+  }
+  .forum_table .forum_table_item:nth-child(odd) {
+    background: #fafbfb;
+  }
+  .forum_table_item {
+    padding: 20px 15px;
+    display: flex;
+  }
+  .forum_table_item .item_name {
+    color: #333;
+  }
+  .forum_table_item .item_name:hover {
+    color: #4cacff;
+  }
+  .forum_table_item {
+    padding-left: 20px;
+  }
+  /* 置顶 */
+  .forum_table_item .btn-top {
+    border-radius: 11px;
+    padding: 0px 6px;
+    background: #ff4343;
+  }
+  .bor-radius-all {
+    border-radius: 50%;
+  }
+  .forum_table_item {
+    padding: 20px 15px;
+    display: flex;
+    border-bottom: 1px solid #ebebeb;
+  }
+`;
 
 class PostItem extends Component {
-    _toTenThousand(num) {
-      if (num > 10000) {
-        return ( (num - 500)/ 10000 ).toFixed(1) + '万'
-      }
-      return num
+  _toTenThousand(num) {
+    if (num > 10000) {
+      return ((num - 500) / 10000).toFixed(1) + "万";
     }
+    return num;
+  }
 
-  	render() {
-  		const { match, history, currentPage, memo, user, setTop, setDown } = this.props
-	    return (
-            <div className="forum_table_line pl20">
-                <div className="forum_table_item" id={`memo_detail_${memo.id}`}>
-                    <a href={`/users/${memo.login}`} className="fr mr15">
-                        <img alt="用户头像" className="bor-radius-all mt3" height="50" src={getImageUrl(`images/`+memo.image_url)} width="50" />
-                    </a>
-                    <div className="fl pr" style={{flex: 1}}>
-                        <p className="font-16 clearfix" style={{ lineHeight: 2 }}>
-                        {/* target="_blank" */}
-                            <a href={`/forums/${memo.id}`} target="_blank" title={memo.subject && memo.subject.length > 46 ? memo.subject : ''}
-                                className="clearfix task-hide item_name fl" style={{maxWidth: '600px'}} >
-                                {memo.subject}
-                            </a>
+  render() {
+    const {
+      match,
+      history,
+      currentPage,
+      memo,
+      user,
+      setTop,
+      setDown,
+    } = this.props;
+    return (
+      <Container className="pl20">
+        <div className="forum_table_item" id={`memo_detail_${memo.id}`}>
+          <a href={`/users/${memo.login}`} className="fr mr15">
+            <img
+              alt="用户头像"
+              className="bor-radius-all mt3"
+              height="50"
+              src={getImageUrl(`images/` + memo.image_url)}
+              width="50"
+            />
+          </a>
+          <div className="fl pr" style={{ flex: 1 }}>
+            <p className="font-16 clearfix" style={{ lineHeight: 2 }}>
+              {/* target="_blank" */}
+              <a
+                href={`/forums/${memo.id}`}
+                target="_blank"
+                title={
+                  memo.subject && memo.subject.length > 46 ? memo.subject : ""
+                }
+                className="clearfix task-hide item_name fl"
+                style={{ maxWidth: "600px" }}
+              >
+                {memo.subject}
+              </a>
 
-                          { memo.sticky && <span className="btn-top btn-cir-orange mt6 ml5 fl">置顶</span> }
+              {memo.sticky && (
+                <span className="btn-top btn-cir-orange mt6 ml5 fl">置顶</span>
+              )}
 
-                          { memo.reward &&
-                          <Tooltip title={`获得平台奖励金币：${memo.reward}`}>
-                            <span className=" ml10 fl color-orange03 fl" >
-                              <i className="iconfont icon-gift font-16 mr5 fl"></i><span className="fl mt3 font-14">{memo.reward}</span>
-                            </span>
-                          </Tooltip>
-                          }
-                        </p>
+              {memo.reward && (
+                <Tooltip title={`获得平台奖励金币：${memo.reward}`}>
+                  <span className=" ml10 fl color-orange03 fl">
+                    <i className="iconfont icon-gift font-16 mr5 fl"></i>
+                    <span className="fl mt3 font-14">{memo.reward}</span>
+                  </span>
+                </Tooltip>
+              )}
+            </p>
 
-                        <div className="clearfix mt5 color-grey-9">
-                          <span className="fl">{memo.user_name}</span>
-                          {/*最后回复：todo{memo.username}
+            <div className="clearfix mt5 color-grey-9">
+              <span className="fl">{memo.user_name}</span>
+              {/*最后回复：todo{memo.username}
                       memo.language && memo.language != 'other' && <span className="fl language-cir-orange mr10 mt3 ml6">{memo.language}</span>
                           */}
-                          {/* <span className="fl ml50">{moment(memo.updated_at).fromNow()}</span> */}
-                          {memo.tag && memo.tag.length ? <span className="fl ml50">来自 {memo.tag.join('/')}</span> : ''}
+              {/* <span className="fl ml50">{moment(memo.updated_at).fromNow()}</span> */}
+              {memo.tag && memo.tag.length ? (
+                <span className="fl ml50">来自 {memo.tag.join("/")}</span>
+              ) : (
+                ""
+              )}
 
-                          {/*<span className="fl language-cir-orange mr10 mt3">C++</span>*/}
+              {/*<span className="fl language-cir-orange mr10 mt3">C++</span>*/}
 
-                            <p className="font-12 fr mr8 color-grey-6" style={{ marginTop: '4px' }}>
-                              {/* data-tip-down="回复数" <i className="fa fa-comments-o mr5"></i>{memo.replies_count}
+              <p
+                className="font-12 fr mr8 color-grey-6"
+                style={{ marginTop: "4px" }}
+              >
+                {/* data-tip-down="回复数" <i className="fa fa-comments-o mr5"></i>{memo.replies_count}
                                   <i className="fa fa-thumbs-o-up mr5"></i>{memo.praise_count}*/}
-                              {memo.replies_count ?
-                                <span className="mr10 ml10 fl edu-txt-right" style={{cursor: 'default'}} >
-                                  {memo.replies_count} 回复
-                              </span> :''}
+                {memo.replies_count ? (
+                  <span
+                    className="mr10 ml10 fl edu-txt-right"
+                    style={{ cursor: "default" }}
+                  >
+                    {memo.replies_count} 回复
+                  </span>
+                ) : (
+                  ""
+                )}
 
-                              {memo.praise_count ?
-                              <span className="mr10 ml10 fl edu-txt-right" style={{cursor: 'default'}} >
-                                {memo.praise_count} 赞
-                              </span> :''}
+                {memo.praise_count ? (
+                  <span
+                    className="mr10 ml10 fl edu-txt-right"
+                    style={{ cursor: "default" }}
+                  >
+                    {memo.praise_count} 赞
+                  </span>
+                ) : (
+                  ""
+                )}
 
-                              {memo.viewed_count ?
-                              <span className="mr10 ml10 fl edu-txt-right" style={{cursor: 'default',minWidth:'55px'}}>
-                                {this._toTenThousand(memo.viewed_count)} 浏览
-                              </span> :''}
-
-                            </p>
-                        </div>
-                      { user && (user.admin === true || user.login === memo.login) &&
-                      <div className="edu-position-hidebox" style={{position: 'absolute', right: '18px',top:'0px'}}>
-                        <a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>
-                        <ul className="edu-position-hide undis">
-                          { user.admin === true &&
-                            ( memo.sticky === true ?
-                            <li><a href="javascript:void(0);" onClick={() => setDown(memo)}>取消置顶</a></li>
-                            :
-                            <li><a href="javascript:void(0);" onClick={() => setTop(memo)}>置&nbsp;&nbsp;顶</a></li> )
-                          }
-                          <li><Link to={`/forums/${memo.id}/edit`}>编&nbsp;&nbsp;辑</Link></li>
-                          <li>
-                            <a href="javascript:void(0)" onClick={() =>
-                                window.delete_confirm_box_2_react(`onMemoDelete`, '您确定要删除吗？' , memo)}>
-
-                              删&nbsp;&nbsp;除</a>
-                          </li>
-                        </ul>
-                      </div>
-                      }
-                    </div>
-                </div>
+                {memo.viewed_count ? (
+                  <span
+                    className="mr10 ml10 fl edu-txt-right"
+                    style={{ cursor: "default", minWidth: "55px" }}
+                  >
+                    {this._toTenThousand(memo.viewed_count)} 浏览
+                  </span>
+                ) : (
+                  ""
+                )}
+              </p>
             </div>
-	    );
-  	}
+            {user && (user.admin === true || user.login === memo.login) && (
+              <div
+                className="edu-position-hidebox"
+                style={{ position: "absolute", right: "18px", top: "0px" }}
+              >
+                <a href="javascript:void(0);">
+                  <i className="fa fa-bars font-16"></i>
+                </a>
+                <ul className="edu-position-hide undis">
+                  {user.admin === true &&
+                    (memo.sticky === true ? (
+                      <li>
+                        <a
+                          href="javascript:void(0);"
+                          onClick={() => setDown(memo)}
+                        >
+                          取消置顶
+                        </a>
+                      </li>
+                    ) : (
+                      <li>
+                        <a
+                          href="javascript:void(0);"
+                          onClick={() => setTop(memo)}
+                        >
+                          置&nbsp;&nbsp;顶
+                        </a>
+                      </li>
+                    ))}
+                  <li>
+                    <Link to={`/forums/${memo.id}/edit`}>编&nbsp;&nbsp;辑</Link>
+                  </li>
+                  <li>
+                    <a
+                      onClick={() =>
+                        window.delete_confirm_box_2_react(
+                          `onMemoDelete`,
+                          "您确定要删除吗？",
+                          memo
+                        )
+                      }
+                    >
+                      删&nbsp;&nbsp;除
+                    </a>
+                  </li>
+                </ul>
+              </div>
+            )}
+          </div>
+        </div>
+      </Container>
+    );
+  }
 }
 PostItem.contextType = ThemeContext;
 
-export default PostItem
+export default PostItem;
diff --git a/src/modules/forums/RightHotLabel.js b/src/modules/forums/RightHotLabel.js
index 3c22c569..c066168e 100644
--- a/src/modules/forums/RightHotLabel.js
+++ b/src/modules/forums/RightHotLabel.js
@@ -10,47 +10,47 @@ import classNames from 'classnames'
 import { trigger } from 'educoder'
 
 class RightHotLabel extends Component {
-    constructor(props) {
-      super(props)
+  constructor(props) {
+    super(props)
+
+    this.state = {
 
-      this.state = {
-     
-      }
     }
+  }
 
-    renderTags() {
-      const { hot_tags, selectedHotLabelIndex } = this.props;
-      if (!hot_tags) {
-        return ''
+  renderTags() {
+    const { hot_tags, selectedHotLabelIndex } = this.props;
+    if (!hot_tags) {
+      return ''
+    }
+    const result = hot_tags.map((item, index) => {
+      let params = {}
+      if (typeof item === 'string') {
+        params.name = item;
+      } else {
+        params = item;
       }
-      const result = hot_tags.map((item, index) => {
-        let params = {}
-        if (typeof item === 'string') {
-          params.name = item;
-        } else {
-          params = item;
-        }
-        params.selectedHotLabelIndex = index;
-        return (
-          <a href="javascript:void(0)" onClick={() => trigger('hotTagClick', params)} key={index} 
-            className={classNames({"selected": selectedHotLabelIndex === index})}>
+      params.selectedHotLabelIndex = index;
+      return (
+        <a onClick={() => trigger('hotTagClick', params)} key={index}
+          className={classNames({ "selected": selectedHotLabelIndex === index })}>
           {item.name || item}
-          </a> )
-      })
-      return result
-    }
-  	render() {
-  		const { match, history, currentPage, selectedHotLabelIndex } = this.props
+        </a>)
+    })
+    return result
+  }
+  render() {
+    const { match, history, currentPage, selectedHotLabelIndex } = this.props
 
-	    return (
-	    	<div className="clearfix padding40-20 edu-back-white mt10">
-              <p className="font-16">热门标签</p>
-              <div className="mt30 HotLabelList clearfix" id="HotLabelList">
-                  {this.renderTags()}
-              </div>
-            </div>
-	    );
-  	}
+    return (
+      <div className="clearfix padding40-20 edu-back-white mt10">
+        <p className="font-16">热门标签</p>
+        <div className="mt30 HotLabelList clearfix" id="HotLabelList">
+          {this.renderTags()}
+        </div>
+      </div>
+    );
+  }
 }
 
 export default RightHotLabel;
diff --git a/src/modules/forums/RightMemoLabel.js b/src/modules/forums/RightMemoLabel.js
index 5e73b604..30225104 100644
--- a/src/modules/forums/RightMemoLabel.js
+++ b/src/modules/forums/RightMemoLabel.js
@@ -10,38 +10,38 @@ import classNames from 'classnames'
 import { trigger } from 'educoder'
 
 class MemoLabel extends Component {
-    constructor(props) {
-      super(props)
+  constructor(props) {
+    super(props)
 
-      this.state = {
-     
-      }
+    this.state = {
+
+    }
+  }
+
+  renderTags() {
+    const { memo } = this.props;
+
+    const arrays = memo.tag.map((item, index) => {
+      return <a key={index}>{item}</a>
+    })
+    return arrays
+  }
+  render() {
+    const { match, history, currentPage, memo } = this.props
+
+    if (!memo || !memo.tag || memo.tag.length === 0) {
+      return ''
     }
 
-    renderTags() {
-      const { memo } = this.props;
-
-      const arrays = memo.tag.map((item, index) => {
-        return <a href="javascript:void(0)" key={index}>{item}</a>
-      })
-      return arrays
-    }
-  	render() {
-  		const { match, history, currentPage, memo } = this.props
-
-      if (!memo || !memo.tag || memo.tag.length === 0) {
-          return ''
-      }
-
-	    return (
-	    	<div className="clearfix padding30-20 edu-back-white mt10">
-              <p className="font-16">话题标签</p>
-              <div className="mt30 HotLabelList clearfix" id="HotLabelList">
-                  {this.renderTags()}
-              </div>
-            </div>
-	    );
-  	}
+    return (
+      <div className="clearfix padding30-20 edu-back-white mt10">
+        <p className="font-16">话题标签</p>
+        <div className="mt30 HotLabelList clearfix" id="HotLabelList">
+          {this.renderTags()}
+        </div>
+      </div>
+    );
+  }
 }
 
 export default MemoLabel;
diff --git a/src/modules/forums/UserSection.js b/src/modules/forums/UserSection.js
index 96671135..45233bfc 100644
--- a/src/modules/forums/UserSection.js
+++ b/src/modules/forums/UserSection.js
@@ -10,14 +10,14 @@ import axios from 'axios'
 
 class UserSection extends Component {
     constructor(props) {
-      super(props)
+        super(props)
 
-      this.state = {
-     
-      }
+        this.state = {
+
+        }
     }
     /*点击关注或者取消关注*/
-    AboutFocus(){
+    AboutFocus() {
         const { author_info } = this.props
         /*http://localhost:3000/api/v1/users/155/watch?object_id=156&object_type=user*/
 
@@ -37,51 +37,51 @@ class UserSection extends Component {
         //     console.log(error)
         // })
 
-        let url=`/users/${author_info.user_id}/watch.json`;
+        let url = `/users/${author_info.user_id}/watch.json`;
         // 取消关注
-        if(author_info.watched){
-            axios.delete(url).then((result)=>{
-                if(result){
+        if (author_info.watched) {
+            axios.delete(url).then((result) => {
+                if (result) {
                     const new_author_info = Object.assign({}, this.props.author_info)
                     new_author_info.watched = !new_author_info.watched
-                    this.props.initForumState({author_info: new_author_info})
+                    this.props.initForumState({ author_info: new_author_info })
                 }
-            }).catch((error)=>{
+            }).catch((error) => {
                 console.log(error)
             })
-        }else{
+        } else {
             // 关注
-            axios.post(url).then((result)=>{
-                if(result){
+            axios.post(url).then((result) => {
+                if (result) {
                     const new_author_info = Object.assign({}, this.props.author_info)
                     new_author_info.watched = !new_author_info.watched
-                    this.props.initForumState({author_info: new_author_info})
+                    this.props.initForumState({ author_info: new_author_info })
                 }
-            }).catch((error)=>{
+            }).catch((error) => {
                 console.log(error);
             })
         }
     }
 
 
-  	render() {
-  		const { match, history, author_info , current_user } = this.props
+    render() {
+        const { match, history, author_info, current_user } = this.props
         if (!author_info || !current_user) {
             return <div className="edu-back-white" id="forum_index_list"></div>
         }
-	    return (
-    		<div className="edu-back-white padding40-20 edu-txt-center">
-	        	<a href={`/users/${author_info.login}`} target="_blank"><img src={`/images/${author_info.image_url}`} width="90" height="90" className="radius mb5"/></a>
+        return (
+            <div className="edu-back-white padding40-20 edu-txt-center">
+                <a href={`/users/${author_info.login}`} target="_blank"><img src={`/images/${author_info.image_url}`} width="90" height="90" className="radius mb5" /></a>
                 <p className="font-20 userPrivateName">{author_info.username}</p>
                 <p className="color-grey-9 userPrivatePost">{author_info.identity}</p>
-                { author_info.user_id !== current_user.user_id && 
-                <p className="clearfix mt30">
-                    <a href="javascript:void(0)" className="fl font-16 mr10 user_default_btn edu-blueback-btn" onClick={()=>{this.AboutFocus()}}>{ author_info.watched == true ? "取消关注" : "关注" }</a>
-                    <a href={`/messages/${current_user.login}/message_detail?target_ids=${author_info.user_id}`} className="fr font-16 user_default_btn user_private_btn" target="_blank">私信</a>
-                </p> }
-	        </div>
-	    );
-  	}
+                {author_info.user_id !== current_user.user_id &&
+                    <p className="clearfix mt30">
+                        <a className="fl font-16 mr10 user_default_btn edu-blueback-btn" onClick={() => { this.AboutFocus() }}>{author_info.watched == true ? "取消关注" : "关注"}</a>
+                        <a href={`/messages/${current_user.login}/message_detail?target_ids=${author_info.user_id}`} className="fr font-16 user_default_btn user_private_btn" target="_blank">私信</a>
+                    </p>}
+            </div>
+        );
+    }
 }
 
 export default UserSection;
diff --git a/src/modules/forums/shixun/MemoShixun.js b/src/modules/forums/shixun/MemoShixun.js
index 34288cbf..89a8f45c 100644
--- a/src/modules/forums/shixun/MemoShixun.js
+++ b/src/modules/forums/shixun/MemoShixun.js
@@ -169,8 +169,9 @@ class MemoShixun extends Component {
         ></PostItem>
       */
       return memo_list.map( (item, index) => {
-        return (
+        return (<React.Fragment>
             <ShiXunPostItem key={item.id} user={user} index={index} {...this.props} memo={item}></ShiXunPostItem>
+        </React.Fragment>
           )
       })
     }
diff --git a/src/modules/home/home.css b/src/modules/home/home.css
deleted file mode 100644
index 1e97d5ec..00000000
--- a/src/modules/home/home.css
+++ /dev/null
@@ -1,79 +0,0 @@
-.slider-img-wrapper img {
-    width: 100%;
-    /*border-radius: 15px;*/
-    height: 350px;
-}
-.next-slick-list{
-    width: 100%;
-    position: relative;
-    overflow: hidden;
-    border-radius: 10px;
-}
-
-.user_navlist{
-    /*margin-left: 40px;*/
-}
-.next-slick-list{
-    /*margin-left: 12px;*/
-}
-
-.black_nav_span{
-    display: block;
-    margin: 0px 20px;
-    border-bottom: 1px solid #4B4B4B;
-    padding-left: 8px;
-    color: #FAFAFA;
-}
-
-.user_navlist_white{
-    z-index: 100 !important;
-}
-
-.next-slick.next-slick-horizontal.next-slick-outer{
-    height: 350px;
-}
-
-.black_nav_list li span a{
-    color:#fff;
-}
-.black_nav_list li span a:hover{
-    color:#000;
-}
-.black_nav_list li:hover  span a{
-    color:#000;
-}
-.little-titles{
-    height: 22px !important;
-}
-
-.user_navlist_white a{
-    color: #989898 !important;
-}
-.user_navlist_white .navlistpanel-line .little-titles a{
-    color: #000 !important;
-}
-
-.newnext-loading{
-    display:block;
-}
-
-.educontentSlider{
-    /*width: 1282px !important;*/
-}
-.user_navlist_white{
-    max-height:350px  !important;
-    overflow-y: auto;
-}
-
-.iconfontzhangjie{
-    font-size: 10px !important;
-    line-height: 23px;
-}
-.iconfontshixundaibeijing{
-    font-size: 18px !important;
-    line-height: 24px;
-}
-
-.next-slick.next-slick-horizontal.next-slick-outer{
-    padding:0px !important;
-}
\ No newline at end of file
diff --git a/src/modules/home/index.jsx b/src/modules/home/index.jsx
new file mode 100644
index 00000000..b9d3de38
--- /dev/null
+++ b/src/modules/home/index.jsx
@@ -0,0 +1,97 @@
+import React, { useEffect, useState, Fragment } from 'react'
+import axios from 'axios'
+import UpgradeModals from '../modals/UpgradeModals'
+import ShixunCardList from '../../components/shixun-card-list'
+import { TPMIndexHOC } from '../tpm/TPMIndexHOC'
+import ListContainer from './list-container'
+import { SnackbarHOC } from 'educoder'
+import ShixunPathCard from '../paths/ShixunPathCard'
+import { Carousel } from 'antd'
+import { getUrl } from 'educoder'
+import './index.scss'
+import NavList from './nav-list'
+
+function Home({ mygetHelmetapi, user }) {
+
+  const [resource, setResource] = useState({
+    loading: true,
+    data: {},
+    updata: null
+  })
+
+  useEffect(() => {
+    async function init() {
+      const sys = await axios.get('/users/system_update.json')
+      const home = await axios.get('/home/index.json')
+      setResource({
+        ...resource,
+        loading: false,
+        updata: sys.data,
+        data: home.data
+      })
+    }
+    try {
+      init()
+    } catch (error) {
+      console.log(error, '---in home init-----')
+    }
+
+  }, [])
+
+  let shixuntype = false
+  let pathstype = false
+  if (mygetHelmetapi) {
+    let shixun = "/shixuns";
+    let paths = "/paths";
+    mygetHelmetapi.navbar.map(item => {
+      var reg = RegExp(item.link)
+      if (shixun.match(reg)) {
+        if (item.hidden === true) {
+          shixuntype = true
+        }
+      }
+      if (paths.match(reg)) {
+        if (item.hidden === true) {
+          pathstype = true
+        }
+      }
+    })
+  }
+
+  const { loading, updata, data } = resource
+  const { shixuns, subjects, images_url, reps } = data
+
+  return (
+    <Fragment>
+      {loading ? null :
+        <div className="shixun-home newMain clearfix">
+          <div className="educontent nav-list-container">
+            <div className="carousel-container">
+              <Carousel autoplay={true}>
+                {images_url.map(item => <a key={item.path} href={item.path}>
+                  <img src={getUrl(item.image_url)} alt='banner' />
+                </a>)}
+              </Carousel>
+            </div>
+            {user && user.main_site ? <NavList list={reps} /> : null}
+          </div>
+          {updata ? <UpgradeModals updata={updata} /> : null}
+          {pathstype || subjects.length > 0 ?
+            <ListContainer to="/paths" title='实践课程' titleEn='TRAINING COURSE' >
+              <ShixunPathCard pathList={subjects} />
+            </ListContainer  >
+            : null}
+          {
+            (shixuntype || shixuns.length > 0) ?
+              <ListContainer to="/shixuns" title='实训项目' titleEn='DEVELOPMENT COMMUNITY' >
+                <ShixunCardList list={shixuns} />
+              </ListContainer  >
+              : null
+          }
+        </div>
+      }
+    </Fragment>
+  )
+}
+
+export default SnackbarHOC()(TPMIndexHOC(Home))
\ No newline at end of file
diff --git a/src/modules/home/index.scss b/src/modules/home/index.scss
new file mode 100644
index 00000000..a319bac3
--- /dev/null
+++ b/src/modules/home/index.scss
@@ -0,0 +1,57 @@
+.carousel-container {
+  margin: 30px auto 60px auto;
+
+  img {
+    display: block;
+    max-width: 100%;
+    height: 350px;
+  }
+
+  .slick-slide {
+    background: #364d79;
+    border-radius: 10px;
+  }
+
+  a {
+    display: block;
+  }
+}
+
+.nav-list-container {
+  position: relative;
+  margin: 0 auto;
+}
+
+.black_nav_list li span a {
+  color: #fff;
+}
+
+.black_nav_list li span a:hover {
+  color: #000;
+}
+
+.black_nav_list li:hover span a {
+  color: #000;
+}
+
+.black_nav_span {
+  display: block;
+  margin: 0px 20px;
+  border-bottom: 1px solid #4B4B4B;
+  padding-left: 8px;
+  color: #FAFAFA;
+}
+
+.user_navlist_white a {
+  color: #989898 !important;
+}
+
+.user_navlist_white .navlistpanel-line .little-titles a {
+  color: #000 !important;
+}
+
+
+.user_navlist_white {
+  max-height: 350px !important;
+  overflow-y: auto;
+}
\ No newline at end of file
diff --git a/src/modules/home/list-container.jsx b/src/modules/home/list-container.jsx
new file mode 100644
index 00000000..4de3adaa
--- /dev/null
+++ b/src/modules/home/list-container.jsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { Link } from "react-router-dom"
+
+export default ({ children, title, titleEn, to }) => {
+  return (
+    <div className="clearfix pt20 educontent pr pb20 ">
+      <div className="edu-txt-center">
+        <p className="color-dark edu-txt-center font-24" style={{ lineHeight: '30px' }}>{title}</p>
+        <p className="color-grey-cd font-12">{titleEn}</p>
+      </div>
+      <Link to={to} className="moreitem mr18">更多<i className="fa fa-angle-right ml5"></i></Link>
+      <div className="square-list clearfix">
+        {children}
+      </div>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/src/modules/home/nav-list.jsx b/src/modules/home/nav-list.jsx
new file mode 100644
index 00000000..93bf0daf
--- /dev/null
+++ b/src/modules/home/nav-list.jsx
@@ -0,0 +1,44 @@
+import React from 'react'
+import { Link } from 'react-router-dom'
+import { getImageUrl } from 'educoder'
+
+export default ({ list }) => {
+  return (
+    <div className="user_navlist">
+      <div className="user_navlist_black">
+        <ul className="black_nav_list">
+          {list.map(item =>
+            <li className="welcome_shixun_index" data-type="rep" key={item.id}>
+              <span className="black_nav_span clearfix font-12">
+                <Link to={"/shixuns?id=" + item.id + "&type=rep"}>
+                  {item.name}
+                </Link>
+                <img src={getImageUrl("images/educoder/icon/downarrowsmall-right.svg")} className="fr mt15 transform-90" />
+              </span>
+              <ul className="user_navlist_white" >
+                {
+                  item.sub_repertoires.map((i) => {
+                    return (
+                      <div className="clearfix mt20 mb5 pb10 navlistpanel-line" key={i.id}>
+                        <div className="little-title clearfix welcome_shixun_index little-titles" data-type="sub">
+                          <Link to={"/shixuns?id=" + i.id + "&type=sub&palce=" + item.id}> {i.name} </Link>
+                        </div>
+                        {
+                          i.tags.map((t, e) => {
+                            return (
+                              <Link className="welcome_shixun_index" to={"/shixuns?id=" + t.id + "&type=tag&palce=" + item.id} data-type="tag" key={t.id}>{t.name}</Link>
+                            )
+                          })
+                        }
+                      </div>
+                    )
+                  })
+                }
+              </ul>
+            </li>
+          )}
+        </ul>
+      </div>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/src/modules/home/shixunsHome.js b/src/modules/home/shixunsHome.js
index 8ae97450..af387039 100644
--- a/src/modules/home/shixunsHome.js
+++ b/src/modules/home/shixunsHome.js
@@ -12,7 +12,7 @@ import SiderBar from '../tpm/SiderBar';
 
 import UpgradeModals from '../modals/UpgradeModals';
 
-import { SnackbarHOC , getImageUrl, configShareForIndex} from 'educoder';
+import { SnackbarHOC , getImageUrl, getcdnImageUrl,configShareForIndex} from 'educoder';
 
 import { Slider ,Rating} from "@icedesign/base";
 
@@ -175,7 +175,7 @@ class ShixunsHome extends Component {
                                             {homedatalist.images_url.map((item, index) => (
                                                 <div key={index} className="slider-img-wrapper">
                                                     <a href={item.path}>
-                                                        <img src={item.image_url} />
+                                                        <img src={getcdnImageUrl(item.image_url)} />
                                                     </a>
                                                 </div>
                                             ))}
@@ -192,7 +192,7 @@ class ShixunsHome extends Component {
                                                                           {item.name}
                                                                     </Link>
                                                                     <img
-                                                                    src={getImageUrl("images/educoder/icon/downarrowsmall-right.svg")}
+                                                                    src={getcdnImageUrl("images/educoder/icon/downarrowsmall-right.svg")}
                                                                     className="fr mt15 transform-90"/>
                                                                 </span>
                                                                 <ul className="user_navlist_white" >
@@ -263,7 +263,7 @@ class ShixunsHome extends Component {
                                                 </div>
 
                                                 <div className={item.power === false ? "closeSquare" : "none"}>
-                                                    <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
+                                                    <img src={getcdnImageUrl("images/educoder/icon/lockclose.svg")}
                                                          className="mt80 mb25"/>
                                                     <p className="font-14 color-white">非试用内容，需要授权</p>
                                                 </div>
@@ -271,7 +271,7 @@ class ShixunsHome extends Component {
                                                 <Link to={"/paths/" + item.id}
                                                    target="_blank"
                                                    className="square-img">
-                                                    <img src={item.image_url}/>
+                                                    <img src={getcdnImageUrl(item.image_url)}/>
                                                 </Link>
 
                                                     <div className="square-main">
@@ -382,7 +382,7 @@ class ShixunsHome extends Component {
 																									</div>
 																									:""}
                                                 <div className={item.power === false ? "closeSquare" : "none"}>
-                                                    <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
+                                                    <img src={getcdnImageUrl("images/educoder/icon/lockclose.svg")}
                                                          className="mt80 mb25"/>
                                                     <p className="font-14 color-white">非试用内容，需要授权</p>
                                                 </div>
@@ -390,7 +390,7 @@ class ShixunsHome extends Component {
                                                 <Link to={"/shixuns/"+item.identifier+"/challenges"}
                                                       target="_blank"
                                                       className="square-img">
-                                                    <img  src={item.pic}/>
+                                                    <img  src={getcdnImageUrl(item.pic)}/>
                                                 </Link>
 
                                                 <div className="square-main">
diff --git a/src/modules/login/EducoderInteresse.js b/src/modules/login/EducoderInteresse.js
index 9f8eeb11..5f62153c 100644
--- a/src/modules/login/EducoderInteresse.js
+++ b/src/modules/login/EducoderInteresse.js
@@ -80,7 +80,7 @@ class EducoderInteresse extends Component {
 						justifyContent: "center",
 						width: "100%",
 					}}>
-						<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;国防科技大学<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+						<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
 					</div>
 				</div>
 			</div>
diff --git a/src/modules/login/EducoderLogin.js b/src/modules/login/EducoderLogin.js
index dd2ef7a3..5663c69c 100644
--- a/src/modules/login/EducoderLogin.js
+++ b/src/modules/login/EducoderLogin.js
@@ -181,21 +181,21 @@ class EducoderLogin extends Component {
 										justifyContent: "center",
 										width: "100%",
 									}}>
-										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;国防科技大学<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
 									</div>:
 									this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.main_site===null|| this.props.mygetHelmetapi.main_site===undefined?	<div style={{
 										display: "flex",
 										justifyContent: "center",
 										width: "100%",
 									}}>
-										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;湘ICP备17009477号<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
 									</div>:this.props.mygetHelmetapi.main_site===true?
 										<div style={{
 											display: "flex",
 											justifyContent: "center",
 											width: "100%",
 										}}>
-											<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;湘ICP备17009477号<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+											<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
 										</div>
 										:""
 									}
diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js
index d4dea494..bba3fee3 100644
--- a/src/modules/login/LoginDialog.js
+++ b/src/modules/login/LoginDialog.js
@@ -440,9 +440,17 @@ class LoginDialog extends Component {
 			this.setState({
 				isRender: false
 			})
-      this.props.Modifyloginvalue();
-      console.log(this.props);
-      // this.props.history.push("/login");
+			this.props.Modifyloginvalue();
+
+
+			// this.setState({
+			// 	isRender: false
+			// })
+      // try {
+      //   this.props.Modifyloginvalue();
+      // }catch (e) {
+			//
+      // }
     }
 
     loginEDU=()=>{
@@ -461,7 +469,7 @@ class LoginDialog extends Component {
             autologin:isGoingValue
             }
         ).then((response) => {
-          // debugger;
+
             if(response===undefined){
                 return
             }
@@ -504,11 +512,6 @@ class LoginDialog extends Component {
 
                 }
             }
-          // try {
-          //   this.props.Modifyloginvalue();
-          // }catch (e) {
-					//
-          // }
         }).catch((error) => {
           console.log("356");
             console.log(error)
@@ -630,7 +633,7 @@ class LoginDialog extends Component {
 
                   <div id="log_reg_content" >
 										{weixinlogin===true?"": <ul className="log_nav clearfix">
-                      <li className={login==0?'active':''} onClick={()=>{this.enter(0)}}>登录</li>
+                      <li  onClick={()=>{this.enter(0)}}>登录</li>
                       {/*<li className={speedy==0?'active':''}  onClick={()=>{this.register(0)}}>快捷登录</li>*/}
                     </ul>}
 
@@ -712,12 +715,9 @@ class LoginDialog extends Component {
                             </span>
 
                             <span className="fr">
-                              <a href="https://www.trustie.net/account/lost_password" className="mr3 color-grey-9" target={"_blank"}>找回密码</a>
-                              {/*<a onClick={(url) => this.getloginurl("/changepassword")}*/}
-																 {/*className="mr3 color-grey-9">找回密码</a>*/}
-                              <em className="vertical-line"></em>
-                              {/*<a onClick={(url)=>this.getloginurl("https://www.trustie.net/login?login=false")} className="color-grey-9">注册</a>*/}
-                              <a href="https://www.trustie.net/login?login=false" target={"_blank"} className="color-grey-9">注册</a>
+                              <a onClick={(url) => this.getloginurl("/changepassword")}
+																 className="mr3 color-grey-9">找回密码</a><em className="vertical-line"></em>
+                              <a onClick={(url)=>this.getloginurl("/register")} className="color-grey-9">注册</a>
                             </span>
 
                           </p>
@@ -777,3 +777,4 @@ class LoginDialog extends Component {
 }
 
 export default LoginDialog ;
+
diff --git a/src/modules/login/Otherloginqq.js b/src/modules/login/Otherloginqq.js
index 46856eec..466f3e0a 100644
--- a/src/modules/login/Otherloginqq.js
+++ b/src/modules/login/Otherloginqq.js
@@ -7,6 +7,7 @@ import axios from 'axios';
 class Otherloginqq extends Component {
 
 	componentDidMount() {
+		debugger
 		let query=this.props.location.search;
 		if(query!= ""){
 			const type = query.split('?code=');
@@ -15,10 +16,24 @@ class Otherloginqq extends Component {
 			let codeurl = `/auth/qq/callback`;
 			axios.get(codeurl,{params:{
 					code:types[0],
+					//https://test-newweb.educoder.net/
+					//https://www.educoder.net/otherloginqq
 					redirect_uri:`https://www.educoder.net/otherloginqq`
 				}}).then((result)=> {
 				if(result){
 					if(result.data.status===0){
+						// if(result.data.new_user===true){
+						// 	this.props.history.replace(`/otherlogin?type=qq`);
+						// }else{
+						// 	// this.getinfo()
+						// 	if(typeshref[0]==="account"){
+						// 		this.props.history.replace(`/account/binding`);
+						// 	}else{
+						// 		this.props.history.replace(`/`);
+						// 	}
+
+						// }
+
 						if(result.data.new_user===true){
 							window.location.href=`https://${decodeURIComponent(typeshref[1])}/loginqq?type=qq`;
 						}else{
diff --git a/src/modules/login/Otherloginstart.js b/src/modules/login/Otherloginstart.js
index 93d202ce..6f87624a 100644
--- a/src/modules/login/Otherloginstart.js
+++ b/src/modules/login/Otherloginstart.js
@@ -7,6 +7,7 @@ import axios from 'axios';
 class Otherloginstart extends Component {
 
 	componentDidMount() {
+		debugger
 		let query=this.props.location.search;
 
 		if(query!= ""){
@@ -25,6 +26,7 @@ class Otherloginstart extends Component {
 				}}).then((result)=> {
 				if(result){
 					if(result.data.status===0){
+						debugger
 						if(result.data.new_user===true){
 							this.props.history.replace(`/otherlogin?type=wechat`);
 						}else{
diff --git a/src/modules/login/Trialapplication.js b/src/modules/login/Trialapplication.js
index be0b18ed..5cb18166 100644
--- a/src/modules/login/Trialapplication.js
+++ b/src/modules/login/Trialapplication.js
@@ -386,7 +386,7 @@ class Trialapplication extends Component {
 				{
 					isRenders === false ? "" :
 
-						<div style={{"border-radius": "10px"}}>
+						<div style={{"borderRadius": "10px"}}>
 							<style>
 								{
 									`
@@ -545,14 +545,14 @@ class Trialapplication extends Component {
 
 							<Dialog open={true} id="DialogIDysl"
 											disableEscapeKeyDown={true}
-											style={{display: isRenders == false ? 'none' : '', "border-radius": "10px"}}
+											style={{display: isRenders == false ? 'none' : '', "borderRadius": "10px"}}
 							>
 								<div id="closeIcon" onClick={() => {
 									this.handleDialogClose()
 								}}>
 									<i className="iconfont icon-shanchudiao"></i>
 								</div>
-								<div className={"login_register_content"} style={{"border-radius": "10px", "width": "560px"}}>
+								<div className={"login_register_content"} style={{"borderRadius": "10px", "width": "560px"}}>
 
 									<div className={"login_register_content"} style={
 										user_phone_binded === true ?
diff --git a/src/modules/login/Trialapplicationysl.js b/src/modules/login/Trialapplicationysl.js
index d685e184..25522e86 100644
--- a/src/modules/login/Trialapplicationysl.js
+++ b/src/modules/login/Trialapplicationysl.js
@@ -404,7 +404,7 @@ class Trialapplicationysl extends Component {
 				{
 					isRenders === false ? "" :
 
-						<div style={{"border-radius": "10px"}}>
+						<div style={{"borderRadius": "10px"}}>
 							<style>
 								{
 									`
@@ -563,14 +563,14 @@ class Trialapplicationysl extends Component {
 
 							<Dialog open={true} id="DialogIDysl"
 											disableEscapeKeyDown={true}
-											style={{display: isRenders == false ? 'none' : '', "border-radius": "10px"}}
+											style={{display: isRenders == false ? 'none' : '', "borderRadius": "10px"}}
 							>
 								<div id="closeIcon" onClick={() => {
 									this.handleDialogClose()
 								}}>
 									<i className="iconfont icon-shanchudiao"></i>
 								</div>
-								<div className={"login_register_content"} style={{"border-radius": "10px", "width": "560px"}}>
+								<div className={"login_register_content"} style={{"borderRadius": "10px", "width": "560px"}}>
 
 									<div className={"login_register_content"} style={
 										user_phone_binded === true ?
diff --git a/src/modules/message/js/Leftdialogue.js b/src/modules/message/js/Leftdialogue.js
index eb9f1818..c63d5cfe 100644
--- a/src/modules/message/js/Leftdialogue.js
+++ b/src/modules/message/js/Leftdialogue.js
@@ -18,8 +18,7 @@ class Leftdialogue extends Component{
 	}
 
 	componentDidMount(){
-		console.log("Leftdialogue");
-		console.log(this.props);
+
 	};
 	componentDidUpdate(prevProps) {
 		// console.log("11111111111");
diff --git a/src/modules/message/js/MessagChat.js b/src/modules/message/js/MessagChat.js
index c88307b1..c5c5a487 100644
--- a/src/modules/message/js/MessagChat.js
+++ b/src/modules/message/js/MessagChat.js
@@ -393,7 +393,7 @@ class MessagChat extends Component{
 	}
 	// 点击了用户
 	Clickedontheuser=(user)=>{
-		// debugger
+		
 		// console.log("点击了用户");
 		// console.log(user);
 		// this.setState({
diff --git a/src/modules/message/js/MessagSub.js b/src/modules/message/js/MessagSub.js
index 45310673..e87dcac3 100644
--- a/src/modules/message/js/MessagSub.js
+++ b/src/modules/message/js/MessagSub.js
@@ -193,32 +193,32 @@ class MessagSub extends Component {
 				return;
 			case 'JoinCourse' :
 				// 课堂详情页 :id =
-				return window.open(`/courses/${item.belong_container_id}/teachers`)
+				return window.open(`/classrooms/${item.belong_container_id}/teachers`)
 			case 'StudentJoinCourse':
 				// 课堂详情页 :id = container_id
 				if (item.tiding_type === 'Apply') {
-					return window.open(`/courses/${item.belong_container_id}/teachers`);
+					return window.open(`/classrooms/${item.belong_container_id}/teachers`);
 				}
 				if (item.tiding_type === 'System') {
 					//教学案例详情 :id = container_id
-					return window.open(`/courses/${item.belong_container_id}/students`);
+					return window.open(`/classrooms/${item.belong_container_id}/students`);
 				}
 			case  'DealCourse':
 				// 课堂详情页 :id = container_id
-				return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
+				return window.open(`/classrooms/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
 			case 'TeacherJoinCourse':
 				// 课堂详情页 :id = container_id
-				return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
+				return window.open(`/classrooms/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
 			case  'Course' :
 				// 课堂详情页 :id = container_id
 				if (item.tiding_type === "Delete") {
 
 					return;
 				}
-				return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
+				return window.open(`/classrooms/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
 			case 'ArchiveCourse' :
 				// 课堂详情页 :id = container_id
-				return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
+				return window.open(`/classrooms/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
 			case "Shixun" :
 				return window.open(`/shixuns/${item.identifier}/challenges`)
 			case "Subject" :
@@ -234,33 +234,33 @@ class MessagSub extends Component {
 						//学生作业页 homework = parent_container_id
 						if (item.homework_type === "normal") {
 							//普通作业
-							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/question`)
+							return window.open(`/classrooms/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/question`)
 						}
 						if (item.homework_type === "group") {
 							//分组作业
-							return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/question`)
+							return window.open(`/classrooms/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/question`)
 						}
 						if (item.homework_type === "practice") {
 							//实训作业
-							return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=1`)
+							return window.open(`/classrooms/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=1`)
 						}
 						return "";
 					case "GraduationTopic" :
 						// 毕业目标页 parent_container_id
-						return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`)
+						return window.open(`/classrooms/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`)
 					case "StudentWorksScore" :
 						//学生作业页
 						if (item.homework_type === "normal") {
 							//普通作业
-							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/question`)
+							return window.open(`/classrooms/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/question`)
 						}
 						if (item.homework_type === "group") {
 							//分组作业
-							return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/question`)
+							return window.open(`/classrooms/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/question`)
 						}
 						if (item.homework_type === "practice") {
 							//实训作业
-							return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=1`)
+							return window.open(`/classrooms/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=1`)
 						}
 						return "";
 				}
@@ -272,13 +272,13 @@ class MessagSub extends Component {
 				return window.open(`/forums/`);
 			case "Watcher" :
 				// 用户个人中心页 :id = item.trigger_user.login
-				return window.open(`/users/${item.trigger_user.login}/courses`)
+				return window.open(`/users/${item.trigger_user.login}/classrooms`)
 			case "PraiseTread" :
 				// 这块太复杂 不好处理
 				return '';
 			case "Grade" :
 				//个人中心页 :id = item.trigger_user.login
-				// return window.open(`/users/${item.trigger_user.login}/courses`;
+				// return window.open(`/users/${item.trigger_user.login}/classrooms`;
 				return "";
 			case "JoinProject" :
 				//项目详情-申请加入项目审核页 :id = container_id
@@ -314,109 +314,109 @@ class MessagSub extends Component {
 					//记得跳评阅页面
 					default :
 						// 课堂-试卷列表详情 :id = container_id
-						return window.open(`/courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`);
+						return window.open(`/classrooms/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`);
 				}
 			case 'StudentGraduationTopic' :
 				//课堂-毕业选题详情 :id = parent_container_id
-				return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`)
+				return window.open(`/classrooms/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`)
 			case  'DealStudentTopicSelect'  :
 				//课堂-毕业选题详情 :id = parent_container_id
-				return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`)
+				return window.open(`/classrooms/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`)
 			case 'GraduationTask' :
 				//课堂-毕业任务页 :id = container_id
-				return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`)
+				return window.open(`/classrooms/${item.belong_container_id}/graduation_tasks/${item.container_id}`)
 			case "GraduationWork" :
 				//课堂-毕业xx页 :id = container_id
-				return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`)
+				return window.open(`/classrooms/${item.belong_container_id}/graduation_tasks/${item.container_id}`)
 			case "GraduationWorkScore" :
 				// 课堂-毕业xx页 :id = parent_container_id
-				return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`)
+				return window.open(`/classrooms/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`)
 			case "HomeworkCommon" :
 				switch (item.parent_container_type) {
 					case "AnonymousCommentFail" :
 						// 课堂-作业列表 homework = container_id
 						if (item.homework_type === "normal") {
 							//普通作业
-							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+							return window.open(`/classrooms/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 						}
 						if (item.homework_type === "group") {
 							//分组作业
-							return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
+							return window.open(`/classrooms/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
 						}
 						if (item.homework_type === "practice") {
 							//实训作业
-							return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
+							return window.open(`/classrooms/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
 						}
 					case "HomeworkPublish" :
 						if (item.homework_type === "normal") {
 							//普通作业
-							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+							return window.open(`/classrooms/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 						}
 						if (item.homework_type === "group") {
 							//分组作业
-							return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
+							return window.open(`/classrooms/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
 						}
 						if (item.homework_type === "practice") {
 							//实训作业
-							return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
+							return window.open(`/classrooms/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
 						}
 					case "AnonymousAppeal" :
 						if (item.homework_type === "normal") {
 							//普通作业
-							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+							return window.open(`/classrooms/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 						}
 						if (item.homework_type === "group") {
 							//分组作业
-							return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
+							return window.open(`/classrooms/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
 						}
 						if (item.homework_type === "practice") {
 							//实训作业
-							return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
+							return window.open(`/classrooms/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
 						}
 					default :
 						// 课堂-作业列表 homework = container_id
 						if (item.homework_type === "normal") {
 							//普通作业
-							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+							return window.open(`/classrooms/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 						}
 						if (item.homework_type === "group") {
 							//分组作业
-							return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
+							return window.open(`/classrooms/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
 						}
 						if (item.homework_type === "practice") {
 							//实训作业
-							return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
+							return window.open(`/classrooms/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
 						}
 				}
 			case "StudentWork" :
 				//课堂-作业 :id = container_id
 				if (item.homework_type === "normal") {
 					//普通作业
-					return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/${item.container_id}/appraise`)
+					return window.open(`/classrooms/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/${item.container_id}/appraise`)
 				}
 				if (item.homework_type === "group") {
 					//分组作业/courses/1208/group_homeworks/22373/1219130/appraise
-					return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/${item.container_id}/appraise`)
+					return window.open(`/classrooms/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/${item.container_id}/appraise`)
 				}
 				if (item.homework_type === "practice") {
 					//实训作业
-					return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
+					return window.open(`/classrooms/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
 				}
 			case "StudentWorksScore" :
 				//课堂-作业 :id = parent_container_id
 				// if(item.homework_type==="normal"){
 				// 	//普通作业
-				// 	return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+				// 	return window.open(`/classrooms/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 				// }
 				// if(item.homework_type==="group"){
 				// 	//分组作业
-				// 	return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
+				// 	return window.open(`/classrooms/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
 				// }
 				// if(item.homework_type==="practice"){
 				// 	//实训作业
-				// 	return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
+				// 	return window.open(`/classrooms/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
 				// }
-				return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.trigger_user.id}/${item.parent_container_id}/appraise`);
+				return window.open(`/classrooms/${item.belong_container_id}/common_homeworks/${item.trigger_user.id}/${item.parent_container_id}/appraise`);
 
 			case "StudentWorksScoresAppeal" :
 				// if(item.homework_type==="normal"){
@@ -425,13 +425,13 @@ class MessagSub extends Component {
 				// }
 				// if(item.homework_type==="group"){
 				// 	//分组作业
-				// 	return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
+				// 	return window.open(`/classrooms/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
 				// }
 				// if(item.homework_type==="practice"){
 				// 	//实训作业
-				// 	return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
+				// 	return window.open(`/classrooms/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
 				// }
-				return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.trigger_user.id}/${item.parent_container_id}/appraise`);
+				return window.open(`/classrooms/${item.belong_container_id}/common_homeworks/${item.trigger_user.id}/${item.parent_container_id}/appraise`);
 			case "ChallengeWorkScore" :
 				return '';
 			case "SendMessage" :
@@ -488,30 +488,30 @@ class MessagSub extends Component {
 				}
 				return '';
 			case "PublicCourseStart":
-				return window.open(`/courses/${item.container_id}/informs`);
+				return window.open(`/classrooms/${item.container_id}/informs`);
 			case "SubjectStartCourse":
 				return window.open(`/paths/${item.container_id}`);
 			case "ResubmitStudentWork":
 				if (item.homework_type === "normal") {
 					//普通作业
-					return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/${item.container_id}/appraise`);
+					return window.open(`/classrooms/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/${item.container_id}/appraise`);
 				}
 				if (item.homework_type === "group") {
 					//分组作业
-					return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/${item.container_id}/appraise`);
+					return window.open(`/classrooms/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/${item.container_id}/appraise`);
 				}
 			case "AdjustScore":
 				//belong_container_id course的id
 				if (item.homework_type === "normal") {
 					//普通作业
-					return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}`);
+					return window.open(`/classrooms/${item.belong_container_id}/common_homeworks/${item.parent_container_id}`);
 				}
 				if (item.homework_type === "group") {
 					//分组作业
-					return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}`);
+					return window.open(`/classrooms/${item.belong_container_id}/group_homeworks/${item.parent_container_id}`);
 				}
 			case 'LiveLink':
-				return window.open(`/courses/${item.belong_container_id}/course_videos?open=live`);
+				return window.open(`/classrooms/${item.belong_container_id}/course_videos?open=live`);
 			case 'Hack':
 				if (item.extra && item.parent_container_type !== 'HackDelete') {
 					return window.open(`/problems/${item.extra}/edit`);
diff --git a/src/modules/modals/Bottomsubmit.js b/src/modules/modals/Bottomsubmit.js
index 16174c48..09038aa9 100644
--- a/src/modules/modals/Bottomsubmit.js
+++ b/src/modules/modals/Bottomsubmit.js
@@ -12,9 +12,13 @@ class Bottomsubmit extends Component {
 
   cannelfun = () => {
     // window.location.href=
-		if(this.props.Cohetepaperbool===true){
-			this.props.setCohetepaperbool(false);
-		}else {
+		try {
+			if(this.props.Cohetepaperbool===true){
+				this.props.setCohetepaperbool(false);
+			}else {
+				this.props.history.replace(this.props.url);
+			}
+		}catch (e) {
 			this.props.history.replace(this.props.url);
 		}
 
@@ -31,6 +35,25 @@ class Bottomsubmit extends Component {
              .newFooter{
                display:none;
              }
+             .newshixunbottombtn {
+                  position: fixed;
+                  z-index: 1000;
+                  bottom: 0;
+                  width: 100%;
+                  height: 63px;
+                  background: #fff;
+                  box-shadow: 0 -4px 4px 0 rgba(0,0,0,.05);
+              }
+              .padding13-30 {
+                  padding: 13px 30px;
+                  -webkit-box-sizing: border-box;
+                  box-sizing: border-box;
+              }
+              .newshixunmode {
+                  width: 100px;
+                  height: 38px;
+                  border-radius: 3px;
+              }
             `
           }
         </style>
@@ -39,7 +62,7 @@ class Bottomsubmit extends Component {
             <button type="button" className="ant-btn mr20 newshixunmode backgroundFFF" onClick={() => this.cannelfun()}>
               <span>取 消</span></button>
             <Button type="button" className="ant-btn newshixunmode mr40 ant-btn-primary" type="primary"
-                    htmlType="submit" onClick={() => this.props.onSubmits()}
+                    htmlType="submit" onClick={this.props.onSubmits?() => this.props.onSubmits():() => this.cannelfun()}
                     loading={this.props.loadings}><span>{this.props.bottomvalue===undefined?"保存":this.props.bottomvalue}</span></Button>
           </div>
         </div>
diff --git a/src/modules/modals/Certifiedprofessional.js b/src/modules/modals/Certifiedprofessional.js
index ca169180..a5e9876c 100644
--- a/src/modules/modals/Certifiedprofessional.js
+++ b/src/modules/modals/Certifiedprofessional.js
@@ -1,42 +1,23 @@
 import React, { Component } from 'react';
-import { Modal} from 'antd';
-import axios from 'axios';
+import { Modal } from 'antd';
 import shimingrenzheng from '../../../src/images/cert/shimingrenzheng.png';
 import zhiyerenzheng from '../../../src/images/cert/zhiyerenzheng.png';
 import './certfed.css';
 //认证职业
 class Certifiedprofessional extends Component {
 
-	constructor(props) {
-		super(props);
-		this.state={
-			// occupation:3,
-			// mydisplay:false,
-		}
-	}
-
-	componentDidMount() {
-		// console.log("加入金品课堂");
-		// console.log(this.props);
-
-
-	}
-
-	modalCancel=()=>{
-	 this.props.ModalCancelsy();
+	modalCancel = () => {
+		this.props.ModalCancelsy();
 	};
 
-	setDownload=()=>{
-		window.location.href="/account/certification"
-
+	setDownload = () => {
+		window.location.href = "/account/certification"
 	}
 
 
 	render() {
-		// console.log("加入金品课堂2");
-		// console.log(this.props);
-		let{occupation} =this.props;
-			return(
+		let { occupation } = this.props;
+		return (
 			<Modal
 				keyboard={false}
 				closable={false}
@@ -49,48 +30,48 @@ class Certifiedprofessional extends Component {
 				heigth="307px"
 			>
 				<div className="educouddiv">
-					<div className={"tabeltext-alignleft fontsizecoirlysl"}><p style={{fontSize: "16px"}}>请在完成条件后重试</p></div>
+					<div className={"tabeltext-alignleft fontsizecoirlysl"}><p style={{ fontSize: "16px" }}>请在完成条件后重试</p></div>
 					{
-						occupation=== 3?
+						occupation === 3 ?
 							<div className="yslcentercerlfed  edu-txt-center mt30"  >
 
 								<div className="mr55 imgysldivone">
 									<img className="yslimgwidthte"
-											 src={shimingrenzheng}
+										src={shimingrenzheng}
 									/>
 									<span className="fontsizecoirlysltwo mt15">未实名认证</span>
 								</div>
 								<div className="imgysldivone">
 									<img className="yslimgwidthte"
-											 src={zhiyerenzheng}
+										src={zhiyerenzheng}
 									/>
 									<span className="fontsizecoirlysltwo mt15">未职业认证</span>
 								</div>
 							</div>
-							:occupation=== 2?
-							<div className="yslcentercerlfed  edu-txt-center mt30"  >
-								<div className="imgysldivone">
-									<img className="yslimgwidthte"
-											 src={zhiyerenzheng}
-									/>
-									<span className="fontsizecoirlysltwo mt15">未职业认证</span>
+							: occupation === 2 ?
+								<div className="yslcentercerlfed  edu-txt-center mt30"  >
+									<div className="imgysldivone">
+										<img className="yslimgwidthte"
+											src={zhiyerenzheng}
+										/>
+										<span className="fontsizecoirlysltwo mt15">未职业认证</span>
+									</div>
 								</div>
-							</div>
-							:
-							<div className="yslcentercerlfed  edu-txt-center mt30"  >
-								<div className=" imgysldivone">
-									<img className="yslimgwidthte"
-											 src={shimingrenzheng}
-									/>
-									<span className="fontsizecoirlysltwo mt15">未实名认证</span>
+								:
+								<div className="yslcentercerlfed  edu-txt-center mt30"  >
+									<div className=" imgysldivone">
+										<img className="yslimgwidthte"
+											src={shimingrenzheng}
+										/>
+										<span className="fontsizecoirlysltwo mt15">未实名认证</span>
+									</div>
 								</div>
-							</div>
 					}
 
 					<div className="clearfix  edu-txt-center mt28">
 
-						<a className="task-btn mr60 w90" onClick={()=>this.modalCancel()}>取消</a>
-						<a className="task-btn task-btn-orange w90" onClick={()=>this.setDownload()}>立即认证</a>
+						<a className="task-btn mr60 w90" onClick={() => this.modalCancel()}>取消</a>
+						<a className="task-btn task-btn-orange w90" onClick={() => this.setDownload()}>立即认证</a>
 					</div>
 				</div>
 			</Modal>
diff --git a/src/modules/modals/Jointheclass.js b/src/modules/modals/Jointheclass.js
index 0ad13c15..fe99f4f8 100644
--- a/src/modules/modals/Jointheclass.js
+++ b/src/modules/modals/Jointheclass.js
@@ -36,7 +36,7 @@ class Jointheclass extends Component {
 						this.props.showNotification(result.data.message);
 						this.props.ysljoinmodalCanceltwo();
 						if(cousestype===1){
-								window.open(`/courses/${id}/informs`)
+								window.open(`/classrooms/${id}/informs`)
 						}
 					}else {
 						this.props.showNotification(result.data.message);
diff --git a/src/modules/modals/Modals.js b/src/modules/modals/Modals.js
index 686dae46..34aad0fb 100644
--- a/src/modules/modals/Modals.js
+++ b/src/modules/modals/Modals.js
@@ -1,33 +1,32 @@
 import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
-import { Spin, Icon , Modal} from 'antd';
+import { Spin, Icon, Modal } from 'antd';
 class Modals extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      funmodalsType:false,
-      istype:false
+      funmodalsType: false,
+      istype: false
     }
   }
-render() {
+  render() {
     const antIcons = <Icon type="loading" style={{ fontSize: 24 }} spin />
-    return(
-         <Modal
-          className={this.props.className}
-         keyboard={false}
-          title="提示"
-          visible={this.props.modalsType===undefined?false:this.props.modalsType}
-          closable={false}
-          footer={null}
-          destroyOnClose={true}
-          centered={true}
-          width="530px"
-        >
-					 {this.props.modalsType===true?<style>
-						 {
-						 	`
+    return (
+      <Modal
+        className={this.props.className}
+        keyboard={false}
+        title="提示"
+        visible={this.props.modalsType === undefined ? false : this.props.modalsType}
+        closable={false}
+        footer={null}
+        destroyOnClose={true}
+        centered={true}
+        width="530px"
+      >
+        {this.props.modalsType === true ? <style>
+          {
+            `
 						 	body{
-						 	     overflow: hidden !important;
+						 	     width: calc(100%) !important;
 						 	 }
 						 	 .ant-modal-body {
                     padding: 20px 40px;
@@ -35,28 +34,31 @@ render() {
                 .color848282{
                    color:#848282;
                 }
-						 	`
-						 }
-					 </style>:""}
-            <Spin indicator={antIcons} spinning={this.props.antIcon===undefined?false:this.props.antIcon} >
-              <div className="task-popup-content">
-                <p className="task-popup-text-center font-16">{this.props.modalsTopval}</p>
-								{this.props.modalsMidval===undefined?"":<p className={this.props.modalstyles?"task-popup-text-center font-16 mt5 color848282":"task-popup-text-center font-16 mt5"}>{this.props.modalsMidval}</p>}
-                <p className={this.props.modalstyles?"task-popup-text-center font-16 mt5 color848282":"task-popup-text-center font-16 mt5"}
-                >{this.props.modalsBottomval}</p>
-                {this.props.loadtype===true?
-                  <div className="clearfix edu-txt-center mt20">
-                    <a className="task-btn task-btn-orange pop_close" onClick={this.props.modalSave}>知道啦</a>
-                  </div>
-                  :
-                  <div className="clearfix mt30 edu-txt-center">
-                    <a  className="task-btn mr30" onClick={this.props.modalCancel}>取消</a>
-                    <a className="task-btn task-btn-orange" onClick={this.props.modalSave}>{this.props.okText || '确定'}</a>
-                  </div>
+                .task-btn{
+                  color: #fff !important;
                 }
+						 	`
+          }
+        </style> : ""}
+        <Spin indicator={antIcons} spinning={this.props.antIcon === undefined ? false : this.props.antIcon} >
+          <div className="task-popup-content">
+            <p className="task-popup-text-center font-16">{this.props.modalsTopval}</p>
+            {this.props.modalsMidval === undefined ? "" : <p className={this.props.modalstyles ? "task-popup-text-center font-16 mt5 color848282" : "task-popup-text-center font-16 mt5"}>{this.props.modalsMidval}</p>}
+            <p className={this.props.modalstyles ? "task-popup-text-center font-16 mt5 color848282" : "task-popup-text-center font-16 mt5"}
+            >{this.props.modalsBottomval}</p>
+            {this.props.loadtype === true ?
+              <div className="clearfix edu-txt-center mt20">
+                <a className="task-btn task-btn-orange pop_close" onClick={this.props.modalSave}>知道啦</a>
               </div>
-            </Spin>
-        </Modal>
+              :
+              <div className="clearfix mt30 edu-txt-center">
+                <a className="task-btn mr30" onClick={this.props.modalCancel}>{this.props.cancelText || '取消'}</a>
+                <a className="task-btn task-btn-orange" onClick={this.props.modalSave}>{this.props.okText || '确定'}</a>
+              </div>
+            }
+          </div>
+        </Spin>
+      </Modal>
     )
   }
 }
diff --git a/src/modules/modals/SendTopics.js b/src/modules/modals/SendTopics.js
index 94f134f3..7a072a84 100644
--- a/src/modules/modals/SendTopics.js
+++ b/src/modules/modals/SendTopics.js
@@ -95,23 +95,23 @@ class SendTopics extends Component{
 					}catch (e) {
 
 					}
-debugger
+
 					if(this.props.mysendall===true){
 						//详情页面跳过来的
 					try {
 						var rurls="";
 						 if(this.state.yslbanksMenu.category==="normal"){
 						 	//普通作业
-							  rurls=`/courses/${this.state.Radiolist}/common_homeworks/${result.data.task_ids}/setting`;
+							  rurls=`/classrooms/${this.state.Radiolist}/common_homeworks/${result.data.task_ids}/setting`;
 						 }else if(this.state.yslbanksMenu.category==="group"){
 						 	//分组作业
-							  rurls=`/courses/${this.state.Radiolist}/group_homeworks/${result.data.task_ids}/setting`;
+							  rurls=`/classrooms/${this.state.Radiolist}/group_homeworks/${result.data.task_ids}/setting`;
 						 }else if(this.state.yslbanksMenu.category==="exercise"){
 						 	// 试卷
-						 	  rurls=`/courses/${this.state.Radiolist}/exercises/${result.data.task_ids}/student_exercise_list?tab=3`;
+						 	  rurls=`/classrooms/${this.state.Radiolist}/exercises/${result.data.task_ids}/student_exercise_list?tab=3`;
 						 }else if(this.state.yslbanksMenu.category==="poll") {
 						 	 //问卷
-							 rurls=`/courses/${this.state.Radiolist}/polls/${result.data.task_ids}/detail?tab=3`
+							 rurls=`/classrooms/${this.state.Radiolist}/polls/${result.data.task_ids}/detail?tab=3`
 						 }
 						window.open(rurls,'_blank');
 					}catch (e) {
@@ -119,21 +119,21 @@ debugger
 					}
 					}else{
 						//外部多个列表页跳过来的
-						debugger
+
 						try {
 							var rurls="";
 							if(this.props.category==="normal"){
 								//普通作业
-								rurls=`/courses/${this.state.Radiolist}/common_homeworks/${result.data.category_id}`;
+								rurls=`/classrooms/${this.state.Radiolist}/common_homeworks/${result.data.category_id}`;
 							}else if(this.props.category==="group"){
 								//分组作业
-								rurls=`/courses/${this.state.Radiolist}/group_homeworks/${result.data.category_id}`;
+								rurls=`/classrooms/${this.state.Radiolist}/group_homeworks/${result.data.category_id}`;
 							}else if(this.props.category==="exercise"){
 								// 试卷
-								rurls=`/courses/${this.state.Radiolist}/exercises/${result.data.category_id}`;
+								rurls=`/classrooms/${this.state.Radiolist}/exercises/${result.data.category_id}`;
 							}else if(this.props.category==="poll") {
 								//问卷
-								rurls=`/courses/${this.state.Radiolist}/polls/${result.data.category_id}`
+								rurls=`/classrooms/${this.state.Radiolist}/polls/${result.data.category_id}`
 							}
 							window.open(rurls,'_blank');
 						}catch (e) {
@@ -231,6 +231,6 @@ debugger
       </div>
     )
   }
-  
+
 }
-export default SendTopics;
\ No newline at end of file
+export default SendTopics;
diff --git a/src/modules/moop_cases/CaseDetail.js b/src/modules/moop_cases/CaseDetail.js
index 20e57f3e..badecad1 100644
--- a/src/modules/moop_cases/CaseDetail.js
+++ b/src/modules/moop_cases/CaseDetail.js
@@ -1,8 +1,8 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 import './css/moopCases.css'
 import '../courses/css/Courses.css'
 
-import { getImageUrl , MarkdownToHtml , ActionBtn , AttachmentList } from 'educoder';
+import { getImageUrl, MarkdownToHtml, ActionBtn, AttachmentList } from 'educoder';
 
 import Tags from './CaseTags'
 
@@ -11,62 +11,62 @@ import Modals from '../modals/Modals'
 
 // import AttachmentList from '../../common/components/attachment/AttachmentList'
 
-class CaseDetail extends Component{
-  constructor(props){
+class CaseDetail extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      modalsType:"",
-      modalsTopval:"",
-      modalsBottomval:"",
-      modalCancel:"",
+    this.state = {
+      modalsType: "",
+      modalsTopval: "",
+      modalsBottomval: "",
+      modalCancel: "",
     }
   }
 
-  componentDidMount =()=>{
+  componentDidMount = () => {
     let caseID = this.props.match.params.caseID;
     this.props.getDetail(caseID);
   }
   // 是否删除
-  delCases=()=>{
+  delCases = () => {
     this.setState({
-      modalsType:true,
-      modalsTopval:"是否确认删除?",
-      modalsBottomval:""
-    })    
+      modalsType: true,
+      modalsTopval: "是否确认删除?",
+      modalsBottomval: ""
+    })
   }
 
   // 取消删除
-  cancelDelClasses=()=>{
+  cancelDelClasses = () => {
     this.setState({
-      modalsType:false,
-      modalsTopval:"",
-      modalsBottomval:""
+      modalsType: false,
+      modalsTopval: "",
+      modalsBottomval: ""
     })
   }
   // 确定删除
-  sureDelClasses=()=>{
+  sureDelClasses = () => {
     let caseID = this.props.match.params.caseID;
-    let url =`/libraries/${caseID}.json`;
-    axios.delete(url).then((result)=>{
-      if(result){
+    let url = `/libraries/${caseID}.json`;
+    axios.delete(url).then((result) => {
+      if (result) {
         this.props.showNotification("删除成功");
         this.props.history.push("/moop_cases");
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
 
 
-  render(){
-    let { CaseDetail , praise_count , creator , operation , user_praised , tags , attachments }=this.props
+  render() {
+    let { CaseDetail, praise_count, creator, operation, user_praised, tags, attachments } = this.props
     let {
       modalsType,
       modalsTopval,
       modalsBottomval,
     } = this.state;
-    document.title = CaseDetail&&CaseDetail.title!=undefined?CaseDetail&&CaseDetail.title:"教学案例";
-    return(
+    document.title = CaseDetail && CaseDetail.title != undefined ? CaseDetail && CaseDetail.title : "教学案例";
+    return (
       <div className="educontent mt10 mb50">
         {
           CaseDetail &&
@@ -80,24 +80,24 @@ class CaseDetail extends Component{
             >
             </Modals>
             <p className="mt10 mb20 clearfix lineh-20">
-              <a href="/moop_cases" className="color-grey-9">教学案例</a> &gt; <span className="color-grey-3">{ CaseDetail.title}</span>
+              <a href="/moop_cases" className="color-grey-9">教学案例</a> &gt; <span className="color-grey-3">{CaseDetail.title}</span>
             </p>
             <p className="lineh-25 mb20 clearfix">
-              <span className="font-22 fl mr10 task-hide lineh-30" style={{maxWidth:"800px"}}>
-                { CaseDetail.title}
+              <span className="font-22 fl mr10 task-hide lineh-30" style={{ maxWidth: "800px" }}>
+                {CaseDetail.title}
               </span>
               <span className="mt10 fl">
                 <Tags tags={tags}></Tags>
                 {
-                  CaseDetail.status == "pending" && <span class="edu-filter-btn fl cdefault edu-activity-green ml10">草稿</span>
+                  CaseDetail.status == "pending" && <span className="edu-filter-btn fl cdefault edu-activity-green ml10">草稿</span>
                 }
                 {
-                  CaseDetail.status == "processing" && <span class="edu-filter-btn fl cdefault edu-activity-green ml10">审核中</span>
+                  CaseDetail.status == "processing" && <span className="edu-filter-btn fl cdefault edu-activity-green ml10">审核中</span>
                 }
                 {
-                  CaseDetail.status == "refused" && <span class="edu-filter-btn fl cdefault edu-activity-orange ml10">未通过</span>
+                  CaseDetail.status == "refused" && <span className="edu-filter-btn fl cdefault edu-activity-orange ml10">未通过</span>
                 }
-              </span> 
+              </span>
               <a href="/moop_cases" className="fr color-grey-9 mt5">返回</a>
             </p>
             <div className="edu-back-white">
@@ -108,11 +108,11 @@ class CaseDetail extends Component{
                     <li className="clearfix mb5">
                       <span className="font-16 fl">{creator && creator.name}</span>
                       {
-                        operation && operation.can_deletable ? <ActionBtn style="greyLine" onClick={this.delCases} className="fr">删除</ActionBtn>:""
+                        operation && operation.can_deletable ? <ActionBtn style="greyLine" onClick={this.delCases} className="fr">删除</ActionBtn> : ""
                       }
-                      
+
                       {
-                        operation && operation.can_editable ? <ActionBtn style="colorBlue" to={`/moop_cases/${this.props.match.params.caseID}/edit`} className="fr mr20">编辑</ActionBtn>:""
+                        operation && operation.can_editable ? <ActionBtn style="colorBlue" to={`/moop_cases/${this.props.match.params.caseID}/edit`} className="fr mr20">编辑</ActionBtn> : ""
                       }
                     </li>
                     <li className="clearfix lineh-20">
@@ -120,10 +120,10 @@ class CaseDetail extends Component{
                       <span className="fr">
                         <span className="fl color-grey-9 mr30">编码：<span className="color-grey-6">{CaseDetail.uuid}</span></span>
                         {
-                          CaseDetail && CaseDetail.status=="published" ?
-                          <span className="fl color-grey-9">发布时间：<span className="color-grey-6">{CaseDetail.published_at}</span></span>
-                          :
-                          <span className="fl color-grey-9">上传时间：<span className="color-grey-6">{CaseDetail.created_at}</span></span>
+                          CaseDetail && CaseDetail.status == "published" ?
+                            <span className="fl color-grey-9">发布时间：<span className="color-grey-6">{CaseDetail.published_at}</span></span>
+                            :
+                            <span className="fl color-grey-9">上传时间：<span className="color-grey-6">{CaseDetail.created_at}</span></span>
                         }
                       </span>
                     </li>
@@ -139,27 +139,27 @@ class CaseDetail extends Component{
                     }
                   `}
                 </style>
-                <div class="mt20 setMDStyle">
-                  { CaseDetail.content && <MarkdownToHtml content={CaseDetail.content} id="casesDetail" selector="casesDetail" style={{width:"100%!important"}}></MarkdownToHtml>}
+                <div className="mt20 setMDStyle">
+                  {CaseDetail.content && <MarkdownToHtml content={CaseDetail.content} id="casesDetail" selector="casesDetail" style={{ width: "100%!important" }}></MarkdownToHtml>}
                 </div>
-                { attachments && 
+                {attachments &&
                   <div className="mt10">
                     <AttachmentList {...this.props} {...this.state} attachments={attachments}></AttachmentList>
                   </div>
-                }     
-                <div class="mt40">
+                }
+                <div className="mt40">
                   {
                     user_praised ?
-                    <p className="pointsBtn pointedBtn">
-                      <span>已赞</span>
-                      <span>{praise_count}</span>
-                    </p>
-                    :
-                    <p onClick = {()=>this.props.praisePoint(this.props.match.params.caseID)} className="pointsBtn">
-                      <span><i class="iconfont icon-dianzan"></i></span>
-                      <span>{praise_count}</span>
-                    </p>
-                  }              
+                      <p className="pointsBtn pointedBtn">
+                        <span>已赞</span>
+                        <span>{praise_count}</span>
+                      </p>
+                      :
+                      <p onClick={() => this.props.praisePoint(this.props.match.params.caseID)} className="pointsBtn">
+                        <span><i className="iconfont icon-dianzan"></i></span>
+                        <span>{praise_count}</span>
+                      </p>
+                  }
                 </div>
               </div>
             </div>
diff --git a/src/modules/moop_cases/CaseList.js b/src/modules/moop_cases/CaseList.js
index a3d9f8c6..3d53004f 100644
--- a/src/modules/moop_cases/CaseList.js
+++ b/src/modules/moop_cases/CaseList.js
@@ -1,9 +1,9 @@
-import React,{ Component } from "react";
-import { Input , Spin , Pagination } from "antd";
+import React, { Component } from "react";
+import { Input, Spin, Pagination } from "antd";
 import './css/moopCases.css'
 import '../courses/css/Courses.css'
 
-import {  ActionBtn , LinkAfterLogin ,getImageUrl} from 'educoder';
+import { ActionBtn, LinkAfterLogin, getImageUrl } from 'educoder';
 
 import axios from 'axios'
 
@@ -16,130 +16,132 @@ import CaseItem from './CaseItem'
 
 
 const Search = Input.Search;
-class CaseList extends Component{
-  constructor(props){
+class CaseList extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      type:0,
-      search:undefined,
-      page:1,
-      pageSize:20,
-      libraries:undefined,
-      totalCount:undefined,
-      isSpin:true
+    this.state = {
+      type: 0,
+      search: undefined,
+      page: 1,
+      pageSize: 20,
+      libraries: undefined,
+      totalCount: undefined,
+      isSpin: true
     }
   }
 
-  componentDidMount = () =>{
-		window.document.title = '教学案例'
-    let { type , search , page , pageSize } = this.state;
-    this.InitList(type,search,page,pageSize);
+  componentDidMount = () => {
+    window.document.title = '教学案例'
+    let { type, search, page, pageSize } = this.state;
+    this.InitList(type, search, page, pageSize);
   }
 
   // 列表
-  InitList = (type,search,page,pageSize) =>{
+  InitList = (type, search, page, pageSize) => {
     let url = `/libraries.json`;
-    axios.get(url,{params:{
-      type:type == 0 ? undefined : "mine",
-      keyword:search,
-      page,
-      per_page:pageSize
-    }}).then((result)=>{
-      if(result){
+    axios.get(url, {
+      params: {
+        type: type == 0 ? undefined : "mine",
+        keyword: search,
+        page,
+        per_page: pageSize
+      }
+    }).then((result) => {
+      if (result) {
         this.setState({
-          libraries:result.data.libraries,
-          totalCount:result.data.count,
-          isSpin:false
+          libraries: result.data.libraries,
+          totalCount: result.data.count,
+          isSpin: false
         })
-      }else{
-				this.setState({
-					isSpin:false
-				})
-			}
-    }).catch((error)=>{
+      } else {
+        this.setState({
+          isSpin: false
+        })
+      }
+    }).catch((error) => {
       console.log(error);
-			this.setState({
-				isSpin:false
-			})
+      this.setState({
+        isSpin: false
+      })
     })
   }
 
   // tab切换
-  changeType = (type) =>{
+  changeType = (type) => {
     this.setState({
       type,
-      page:1,
-			isSpin:true
+      page: 1,
+      isSpin: true
     })
-    let { search , page , pageSize } = this.state;
-    this.InitList(type,search,page,pageSize);
+    let { search, page, pageSize } = this.state;
+    this.InitList(type, search, page, pageSize);
   }
 
   // 输入搜索内容
-  inputStudent=(e)=>{
+  inputStudent = (e) => {
     this.setState({
-      search:e.target.value
+      search: e.target.value
     })
   }
 
   // 搜索
-  searchInfo = () =>{
+  searchInfo = () => {
     this.setState({
-      isSpin:true
+      isSpin: true
     })
-    let { type , search , pageSize } = this.state;
-    this.InitList( type , search , 1 , pageSize );
+    let { type, search, pageSize } = this.state;
+    this.InitList(type, search, 1, pageSize);
   }
 
   // 切换分页
-  onChangePage =(pageNumber)=>{
+  onChangePage = (pageNumber) => {
     this.setState({
-      page:pageNumber
+      page: pageNumber
     })
-    let { type , search , pageSize } = this.state;
-    this.InitList( type , search , pageNumber , pageSize );
+    let { type, search, pageSize } = this.state;
+    this.InitList(type, search, pageNumber, pageSize);
   }
 
-  render(){
-    let { type , search ,libraries , totalCount ,pageSize ,page } = this.state;
+  render() {
+    let { type, search, libraries, totalCount, pageSize, page } = this.state;
     let { checkIfLogin } = this.props;
 
-    return(
+    return (
       <React.Fragment>
-				<style>
-					{
-						`
+        <style>
+          {
+            `
 						.imgmoop_cases{width: 100%;
 						height: 300px;
 						background-color: #000a4f;
 						background-position: 50%;
 						background-repeat: no-repeat;}
 						`
-					}
-				</style>
-        <img className={"imgmoop_cases"} src={this.props.mygetHelmetapi&&this.props.mygetHelmetapi.moop_cases_banner_url===null?mainImg:getImageUrl(this.props.mygetHelmetapi&&this.props.mygetHelmetapi.moop_cases_banner_url)}/>
-				<div className="educontent">
+          }
+        </style>
+        <img className={"imgmoop_cases"} src={this.props.mygetHelmetapi && this.props.mygetHelmetapi.moop_cases_banner_url === null ? mainImg : getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.moop_cases_banner_url)} />
+        <div className="educontent">
           <div className="edu-back-white mb30 mt30">
             <p className="padding20-30 clearfix bor-bottom-greyE">
               <span className="font-18 fl color-grey-3">教学案例</span>
-              <LinkAfterLogin {...this.props} to={'/moop_cases/new'} className="fr edu-default-btn edu-blueline-btn" checkProfileComplete = {true}
-                
+              <LinkAfterLogin {...this.props} to={'/moop_cases/new'} className="fr edu-default-btn edu-blueline-btn" checkProfileComplete={true}
+
               >发布案例</LinkAfterLogin>
               {/* <ActionBtn style="colorBlue" className="fr" to="/moop_cases/new">发布案例</ActionBtn> */}
             </p>
             <div className="clearfix pl30 pr30">
               <ul className="fl library_nav mt25">
-                <li className={type == 0 ? "active" :""} onClick={()=>this.changeType(0)}>
-                  <a href="javascript:void(0)">全部</a>
+                <li className={type == 0 ? "active" : ""} onClick={() => this.changeType(0)}>
+                  <a  >全部</a>
                 </li>
                 {
-                  checkIfLogin() && 
-                  <li className={type == 1 ? "active" :""} onClick={()=>this.changeType(1)}>
-                    <a href="javascript:void(0)">我的</a>
+                  checkIfLogin() &&
+                  <li className={type == 1 ? "active" : ""} onClick={() => this.changeType(1)}>
+                    <a  >我的</a>
                   </li>
                 }
               </ul>
-              <div className="fr mt16 mb16 searchView"style={{width:"300px"}}>
+              <div className="fr mt16 mb16 searchView" style={{ width: "300px" }}>
                 <Search
                   value={search}
                   placeholder="输入教学案例标题、作者、单位进行检索"
@@ -151,7 +153,7 @@ class CaseList extends Component{
           </div>
           <Spin size="large" spinning={this.state.isSpin} tip="正在获取相关数据...">
             {
-              libraries && libraries.length > 0 &&  <CaseItem {...this.props} {...this.state} libraries={libraries}></CaseItem>
+              libraries && libraries.length > 0 && <CaseItem {...this.props} {...this.state} libraries={libraries}></CaseItem>
             }
             {
               libraries && libraries.length == 0 && <div className="mb50"><NoneData></NoneData></div>
diff --git a/src/modules/moop_cases/CaseNew.js b/src/modules/moop_cases/CaseNew.js
index ce322252..1ed9907e 100644
--- a/src/modules/moop_cases/CaseNew.js
+++ b/src/modules/moop_cases/CaseNew.js
@@ -260,7 +260,7 @@ class CaseNew extends Component{
   // 选择标签
   changeType=(type)=>{
     // console.log(this.state.casesTags);
-    // debugger
+    
     let tags = [];
 
     if(this.state.casesTags.indexOf(type) > -1){
diff --git a/src/modules/page/Header.js b/src/modules/page/Header.js
index 283ec995..0c09b851 100644
--- a/src/modules/page/Header.js
+++ b/src/modules/page/Header.js
@@ -1,7 +1,5 @@
 import './header.scss';
 import React, { Component } from 'react';
-
-import Button from 'material-ui/Button';
 import { withStyles } from 'material-ui/styles';
 import Drawer from 'material-ui/Drawer';
 
@@ -9,130 +7,104 @@ import TaskListContainer from './taskList/TaskListContainer'
 import TaskResultLayer from './layers/TaskResultLayer'
 import Tooltip from 'material-ui/Tooltip';
 
-
-import moment from 'moment'
-
 function pad(num) {
-    return ("0"+num).slice(-2);
+	return ("0" + num).slice(-2);
 }
 function hhmmss(secs) {
-  var minutes = Math.floor(secs / 60);
-  secs = secs%60;
-  var hours = Math.floor(minutes/60)
-  minutes = minutes%60;
-  return pad(hours)+":"+pad(minutes)+":"+pad(secs);
+	var minutes = Math.floor(secs / 60);
+	secs = secs % 60;
+	var hours = Math.floor(minutes / 60)
+	minutes = minutes % 60;
+	return pad(hours) + ":" + pad(minutes) + ":" + pad(secs);
 }
 
 
 const styles = theme => ({
-  button: {
-    margin: theme.spacing.unit,
-    background: '#05101A',
-    color: '#4CACFF',
-    top: '-6px'
-  },
+	button: {
+		margin: theme.spacing.unit,
+		background: '#05101A',
+		color: '#4CACFF',
+		top: '-6px'
+	},
 });
 
 class Header extends Component {
-	constructor(props) {
-		super(props)
-
-		this.state = {
-		}
-	}
-
-	componentDidMount() {
-		
-	}
 
 
 	goBack() {
-		const { challenge, game, shixun } = this.props
-		// myshixuns/pw346iskxh/stages/rw4v6giml5no
-		// http://localhost:3000/shixuns/cz7yw3en/challenges
+		const { shixun } = this.props
 		const url = `/shixuns/${shixun.identifier}/challenges`
 		window.location.href = url;
 	}
 
 
-  	render() {
-  		const { challenge, shixun, loading, grade, classes, user, game,
-  			onDrawerButtonClick, onChallengesDrawerClose, power, myshixun_manager,
-  			onStarChange, saveChallengeStar, challengesDrawerOpen, taskListLoading, challenges, showSnackbar, closeTaskResultLayer } = this.props
-  		// 样式在 tpiPage.css中
-  		/*
-			leftNavDrawer
-  		*/
-	    return (
-	      	<div className="page--header clearfix tpi_content" id="myshixun_top">
-	      		<TaskResultLayer {...this.props} onStarChange={onStarChange} saveChallengeStar={saveChallengeStar}></TaskResultLayer>
-	      		<Drawer
-			    	className="leftNavDrawer"
-			          width={500}
-			          open={challengesDrawerOpen}
-			          onClose={() => onChallengesDrawerClose()}
-			        >
-			        
-			        <TaskListContainer challenges={challenges} taskListLoading={taskListLoading} shixun={shixun}
-			        	challenge={challenge} onStarChange={onStarChange} saveChallengeStar={saveChallengeStar}
-			        	onChallengesDrawerClose={() => onChallengesDrawerClose()}
-			        	showSnackbar={showSnackbar} closeTaskResultLayer={closeTaskResultLayer}
-			        	myshixun_manager={myshixun_manager}
-			        	 >
-			        	
-			        </TaskListContainer>
-			    	
-		        </Drawer>
+	render() {
+		const { challenge, shixun, grade, user, game,
+			onChallengesDrawerClose, myshixun_manager,
+			onStarChange, saveChallengeStar, challengesDrawerOpen, taskListLoading, challenges, showSnackbar, closeTaskResultLayer } = this.props
+		return (
+			<div className="task-page-header tpi_content" id="myshixun_top">
+				<TaskResultLayer {...this.props} onStarChange={onStarChange} saveChallengeStar={saveChallengeStar}></TaskResultLayer>
+				<Drawer
+					className="leftNavDrawer"
+					width={500}
+					open={challengesDrawerOpen}
+					onClose={() => onChallengesDrawerClose()}
+				>
 
-	      		<div className="headerLeft">
-		      		
+					<TaskListContainer challenges={challenges} taskListLoading={taskListLoading} shixun={shixun}
+						challenge={challenge} onStarChange={onStarChange} saveChallengeStar={saveChallengeStar}
+						onChallengesDrawerClose={() => onChallengesDrawerClose()}
+						showSnackbar={showSnackbar} closeTaskResultLayer={closeTaskResultLayer}
+						myshixun_manager={myshixun_manager}
+					>
 
-				    <div className="userInfo">
-				    	<a href={user.user_url} target="_blank">
-							{ user.image_url && <img alt="0?1442652658" width="35" height="35" src={`../images/${user.image_url}`} /> }
+					</TaskListContainer>
+
+				</Drawer>
+
+				<div className="headerLeft">
+
+
+					<div className="userInfo">
+						<a href={user.user_url} target="_blank">
+							{user.image_url && <img alt="0?1442652658" width="35" height="35" src={`../images/${user.image_url}`} />}
 						</a>
 						<a href={user.user_url} className="userInfoName" target="_blank">{user.username}</a>
-						   {/* "/users/p69243850" 
-							"https://www.educoder.net/images/avatars/User/0?1442652658"
-							*/}
 					</div>
 
 					{(grade || grade == 0) && <div className="-header-right clearfix">
-					    {/*<img src="/images/task/coin.png" className="fl" width="30" height="30" alt=""/>*/}
-					    <span style={{width:'20px', height:'20px', background:'#FFD633', borderRadius: '10px', marginTop: '3px' }} className="fl"></span>
-					    <span className="ml5 color-white fl" id="user_grade">
-							{/*  href={`${user.user_url}/user_grade`} target="_blank"  */}
-					    	<span>{ grade === 0 ? grade : (grade || '')}</span>
-					    </span>
+						<span style={{ width: '20px', height: '20px', background: '#FFD633', borderRadius: '10px', marginTop: '3px' }} className="fl"></span>
+						<span className="ml5 color-white fl" id="user_grade">
+							<span>{grade === 0 ? grade : (grade || '')}</span>
+						</span>
 					</div>}
 
 
-					
-			    </div>
 
-	      		
-		      	<div className="-layout-h ml10 headerCenter">
-				  	<h2 className="-header-title task-hide color-white">{shixun ? shixun.name||'' : ''}</h2>
-				  	<Tooltip title="本关通关耗时">
-				  		<div className="timeRecord">{game && hhmmss(game.cost_time)}</div>
-				  	</Tooltip>
 				</div>
-				
+
+
+				<div className="-layout-h ml10 headerCenter">
+					<h2 className="-header-title task-hide color-white">{shixun ? shixun.name || '' : ''}</h2>
+					<Tooltip title="本关通关耗时">
+						<div className="timeRecord">{game && hhmmss(game.cost_time)}</div>
+					</Tooltip>
+				</div>
+
 				<div className="headerRight">
 					<div className="fr">
-						{shixun ? 
-						// className="mr20 mt8 exitBtn"
-						<a href={`/shixuns/${shixun.identifier}/challenges`} className="mr20 mt8 exit_btn">
-				      		<i className="fa fa-power-off font-16"></i> 
-					      	{/* <span>{'退出闯关'}</span> */}
-									<span>{'退出实训'}</span>
-					    </a>
-					    : ''}
+						{shixun ?
+							<a href={`/shixuns/${shixun.identifier}/challenges`} className="mr20 mt8 exit_btn">
+								<i className="fa fa-power-off font-16"></i>
+								<span>{'退出实训'}</span>
+							</a>
+							: null}
 					</div>
 				</div>
-		    </div>
-	    );
-  	}
+			</div>
+		);
+	}
 }
 
-export default withStyles(styles)( Header );
+export default withStyles(styles)(Header);
diff --git a/src/modules/page/Index.js b/src/modules/page/Index.js
index eb383482..9359e33a 100644
--- a/src/modules/page/Index.js
+++ b/src/modules/page/Index.js
@@ -6,13 +6,7 @@ import Header from './Header'
 
 import MainContentContainer from './MainContentContainer'
 
-import TPIContext from '../../context/TPIContext'
-import TPIContextProvider from '../../context/TPIContextProvider'
-
-import update from 'immutability-helper'
-
 import axios from 'axios';
-
 class Index extends Component {
 	constructor(props) {
 		super(props)
@@ -21,20 +15,26 @@ class Index extends Component {
 		var styles = window.$('body').attr('style');
 		styles += 'overflow: hidden !important;'
 		window.$('body').attr('style', styles);
-      	window.$('#root').css('position', 'absolute')
+		window.$('#root').css('position', 'absolute')
+
 		this.onDrawerButtonClick = this.onDrawerButtonClick.bind(this)
 		this.onStarChange = this.onStarChange.bind(this)
 		this.saveChallengeStar = this.saveChallengeStar.bind(this)
 		this.onChallengesDrawerClose = this.onChallengesDrawerClose.bind(this)
+
+
 		this.starArray = [];
+
 		// 将原本放置在Header.js中的state上提到Index.js
 		this.state = {
 			challengesDrawerOpen: false,
 			taskListLoading: true,
 			challenges: [], // 任务列表
+
+
 		}
 	}
-	
+
 	onChallengesDrawerClose() {
 		this.setState({
 			challengesDrawerOpen: false
@@ -46,30 +46,33 @@ class Index extends Component {
 			return;
 		}
 		const { shixun, myshixun } = this.props;
+		// var getChallengesUrl = `/api/v1/games/${this.props.game.identifier}/challenges`;
 		var getChallengesUrl = `/myshixuns/${myshixun.identifier}/challenges.json`;
 
 		this.setState({
 			taskListLoading: true,
-			challengesDrawerOpen:true
+			challengesDrawerOpen: true
 		})
-		
-		axios.get(getChallengesUrl)
-		  .then((response) => {
 
-			    if (response.data.status == -1) {
-			    	console.error('获取任务列表失败！')
-			    	return;
-			    }
-			    this.starArray = [];
-		    	this.setState({
-		    		challenges: response.data,
+		axios.get(getChallengesUrl, {
+			// withCredentials: true,
+		})
+			.then((response) => {
+
+				if (response.data.status == -1) {
+					console.error('获取任务列表失败！')
+					return;
+				}
+				this.starArray = [];
+				this.setState({
+					challenges: response.data,
 					taskListLoading: false,
 				})
-		  	})
-		  	.catch(function (error) {
-		    	console.log(error);
-		  	});
-	
+			})
+			.catch(function (error) {
+				console.log(error);
+			});
+
 	}
 
 	onStarChange(challenge, index, value) {
@@ -85,159 +88,159 @@ class Index extends Component {
 		}
 		// var saveChallengeStarUrl = `/api/v1/games/${challenge.identifier}/star`;
 		var saveChallengeStarUrl = `/tasks/${challenge.identifier}/star.json?shixun_id=${shixun.id}&star=${value}`;
-		
+
 		axios.get(saveChallengeStarUrl
 			// , {
 			// 	star: value,
 			// 	shixun_id: shixun.id
 			// }
 			// ,{
-    		// 	withCredentials: true,
-    		// }
-			)
-		  .then((response) => {
+			// 	withCredentials: true,
+			// }
+		)
+			.then((response) => {
 
-			    // {"reward_code":86}  TODO 金币数量变化
-			    if (response.data.reward_code === -1) {
-			    	this.props.showSnackbar('该任务已评过星了！')
-			    	return;
-			    }
-			    
-			    if (challenges && challenges[index]) { // 每次展开都会重新加载任务列表
-			    	const new_challenges = challenges.slice(0);
-				    new_challenges[index].star = value;
-				    this.setState({ challenges: new_challenges })
-			    }
-		  	})
-		  	.catch(function (error) {
-		    	console.log(error);
-		  	});
+				// {"reward_code":86}  TODO 金币数量变化
+				if (response.data.reward_code === -1) {
+					this.props.showSnackbar('该任务已评过星了！')
+					return;
+				}
+
+				if (challenges && challenges[index]) { // 每次展开都会重新加载任务列表
+					const new_challenges = challenges.slice(0);
+					new_challenges[index].star = value;
+					this.setState({ challenges: new_challenges })
+				}
+			})
+			.catch(function (error) {
+				console.log(error);
+			});
 	}
 
-  	render() {
-  		const context = this.props;
+	render() {
+		const context = this.props;
 		// 不将cost_time传给MainContent
-  		let gameWithoutCostTime;
-  		if (context.game) {
-	  		gameWithoutCostTime = Object.assign({}, context.game);
-	  		gameWithoutCostTime.cost_time = undefined;
-  		}
-	    return (
-	    		
-	    	
-		    	
-						<React.Fragment>
-						<Header 
-							onChallengesDrawerClose={this.onChallengesDrawerClose}
-							onDrawerButtonClick={this.onDrawerButtonClick}
-							onStarChange={this.onStarChange}
-							saveChallengeStar={this.saveChallengeStar}
-							{...this.state}
-
-							user={context.user}
-							challenge={context.challenge}
-							shixun_name={context.shixun_name}
-							loading={context.loading}
-							onGamePassed={context.onGamePassed }
-							currentGamePassed={context.currentGamePassed}
-							currentPassedGameGainGold={context.currentPassedGameGainGold}
-							currentPassedGameGainExperience={context.currentPassedGameGainExperience}
-							closeTaskResultLayer={context.closeTaskResultLayer}
-							
-							game_count={context.game_count}
-							grade={context.grade}
-							game={context.game}
-							next_game={context.next_game}
-							shixun={context.shixun}
-
-							showSnackbar={context.showSnackbar}
-							power={context.power}
-							myshixun_manager={context.myshixun_manager}
-							>
-						</Header>
-
-						
-
-		    		{/*  区分下repo和evaluate模块的，以及子模块的 */}
-						<MainContentContainer
-							confirm={context.confirm}
-
-							onDrawerButtonClick={this.onDrawerButtonClick}
-							grade={context.grade}
-							allowed_unlock={context.allowed_unlock}
-							user={context.user}
-							power={context.power}
-							myshixun_manager={context.myshixun_manager}
-
-							praisePlus={context.praisePlus}
-
-							git_url={context.git_url}
-							mirror_name={context.mirror_name}
-	    					challenge={context.challenge}
-	    					myshixun={context.myshixun}
-	    					shixun={context.shixun}
-
-							vnc_url={context.vnc_url}
-	    					zip_path={context.zip_path}
-
-	    					loading={context.loading}
-	    					discusses_count={context.discusses_count}
-							hide_code={context.hide_code}
-
-
-	    					readGameAnswer={context.readGameAnswer}
-
-	    					record={context.record}
-	    					output_sets={context.output_sets}
-	    					latest_output={context.latest_output}
-
-	    					onPathChange={context.onPathChange}
-							updateChallengePath={context.updateChallengePath}
-
-	    					
-	    					time_limit={context.time_limit + 5}
-	    					real_time_limit={context.time_limit}
-
-								resetTestSetsExpandedArray={context.resetTestSetsExpandedArray}
-	    					onRunCodeTestFinish={context.onRunCodeTestFinish}
-	    					onRunChooseTestFinish={context.onRunChooseTestFinish}
-	    					testSetUnlock={context.testSetUnlock}
-
-	    					testSetsExpandedArray={context.testSetsExpandedArray}
-	    					onTestSetHeaderClick={context.onTestSetHeaderClick}
-	    					
-	    					st={context.st}
-	    					choose={context.chooses}
-	    					choose_test_cases={context.choose_test_cases}	
-
-	    					game={gameWithoutCostTime}
-	    					next_game={context.next_game}
-	    					match={context.match}
-
-	    					onShowPrevStage={context.onShowPrevStage}
-	    					onShowNextStage={context.onShowNextStage}
-
-							showSnackbar={context.showSnackbar}
-							showDialog={context.showDialog}
-							handleGdialogClose={context.handleGdialogClose}
-							
-							tpm_cases_modified={context.tpm_cases_modified}
-							tpm_modified={context.tpm_modified}
-							tpm_script_modified={context.tpm_script_modified}
-
-							showUpdateDialog={context.showUpdateDialog}
-							onShowUpdateDialog={context.onShowUpdateDialog}
-							updateDialogClose={context.updateDialogClose}
+		let gameWithoutCostTime;
+		if (context.game) {
+			gameWithoutCostTime = Object.assign({}, context.game);
+			gameWithoutCostTime.cost_time = undefined;
+		}
+		return (
 
 
 
-	    					
-	    					></MainContentContainer>
-						</React.Fragment>
-	    	
-	      		
-	    );
-  	}
+			<React.Fragment>
+				<Header
+					onChallengesDrawerClose={this.onChallengesDrawerClose}
+					onDrawerButtonClick={this.onDrawerButtonClick}
+					onStarChange={this.onStarChange}
+					saveChallengeStar={this.saveChallengeStar}
+					{...this.state}
+
+					user={context.user}
+					challenge={context.challenge}
+					shixun_name={context.shixun_name}
+					loading={context.loading}
+					onGamePassed={context.onGamePassed}
+					currentGamePassed={context.currentGamePassed}
+					currentPassedGameGainGold={context.currentPassedGameGainGold}
+					currentPassedGameGainExperience={context.currentPassedGameGainExperience}
+					closeTaskResultLayer={context.closeTaskResultLayer}
+
+					game_count={context.game_count}
+					grade={context.grade}
+					game={context.game}
+					next_game={context.next_game}
+					shixun={context.shixun}
+
+					showSnackbar={context.showSnackbar}
+					power={context.power}
+					myshixun_manager={context.myshixun_manager}
+				>
+				</Header>
+
+
+
+				{/*  区分下repo和evaluate模块的，以及子模块的 */}
+				<MainContentContainer
+					confirm={context.confirm}
+
+					onDrawerButtonClick={this.onDrawerButtonClick}
+					grade={context.grade}
+					allowed_unlock={context.allowed_unlock}
+					user={context.user}
+					power={context.power}
+					myshixun_manager={context.myshixun_manager}
+
+					praisePlus={context.praisePlus}
+
+					git_url={context.git_url}
+					mirror_name={context.mirror_name}
+					challenge={context.challenge}
+					myshixun={context.myshixun}
+					shixun={context.shixun}
+
+					vnc_url={context.vnc_url}
+					zip_path={context.zip_path}
+
+					loading={context.loading}
+					discusses_count={context.discusses_count}
+					hide_code={context.hide_code}
+
+
+					readGameAnswer={context.readGameAnswer}
+
+					record={context.record}
+					output_sets={context.output_sets}
+					latest_output={context.latest_output}
+
+					onPathChange={context.onPathChange}
+					updateChallengePath={context.updateChallengePath}
+
+
+					time_limit={context.time_limit + 5}
+					real_time_limit={context.time_limit}
+
+					resetTestSetsExpandedArray={context.resetTestSetsExpandedArray}
+					onRunCodeTestFinish={context.onRunCodeTestFinish}
+					onRunChooseTestFinish={context.onRunChooseTestFinish}
+					testSetUnlock={context.testSetUnlock}
+
+					testSetsExpandedArray={context.testSetsExpandedArray}
+					onTestSetHeaderClick={context.onTestSetHeaderClick}
+
+					st={context.st}
+					choose={context.chooses}
+					choose_test_cases={context.choose_test_cases}
+
+					game={gameWithoutCostTime}
+					next_game={context.next_game}
+					match={context.match}
+
+					onShowPrevStage={context.onShowPrevStage}
+					onShowNextStage={context.onShowNextStage}
+
+					showSnackbar={context.showSnackbar}
+					showDialog={context.showDialog}
+					handleGdialogClose={context.handleGdialogClose}
+
+					tpm_cases_modified={context.tpm_cases_modified}
+					tpm_modified={context.tpm_modified}
+					tpm_script_modified={context.tpm_script_modified}
+
+					showUpdateDialog={context.showUpdateDialog}
+					onShowUpdateDialog={context.onShowUpdateDialog}
+					updateDialogClose={context.updateDialogClose}
+
+
+
+
+				></MainContentContainer>
+			</React.Fragment>
+
+
+		);
+	}
 }
 
 export default Index;
diff --git a/src/modules/page/LeftNav.js b/src/modules/page/LeftNav.js
index d1a7b1a1..63628d7f 100644
--- a/src/modules/page/LeftNav.js
+++ b/src/modules/page/LeftNav.js
@@ -59,7 +59,7 @@ class LeftNav extends Component {
 
 				    <div className="leftnav" style={{position: 'fixed', bottom:0}}>
 				        <a href="/shixuns/uznmbg54?exit=true" className="leftnav-box-inner" id="exit_task_tab">
-				        	<i className="fa fa-arrow-left font-20"></i><br/><span className="font-12">退出实训</span>
+				        	<i className="fa fa-arrow-left font-20"></i><br/><span className="font-12">退出实训1</span>
 				        </a>
 				    </div>
 				    
diff --git a/src/modules/page/MainContent.js b/src/modules/page/MainContent.js
index 9c50e064..0b0d1190 100644
--- a/src/modules/page/MainContent.js
+++ b/src/modules/page/MainContent.js
@@ -1,16 +1,10 @@
 import React, { Component } from 'react';
-
 import ActionView from './main/ActionView';
-
 import LeftViewContainer from './main/LeftViewContainer';
-
-
 import CodeRepositoryViewContainer from './main/CodeRepositoryViewContainer';
 import CodeEvaluateView from './main/CodeEvaluateView';
-
 import ChooseRepositoryView from './main/ChooseRepositoryView';
 import ChooseEvaluateView from './main/ChooseEvaluateView'
-
 import { CircularProgress } from 'material-ui/Progress';
 import Button from 'material-ui/Button';
 import VNCContainer from './VNCContainer'
@@ -31,58 +25,49 @@ class MainContent extends Component {
 	componentDidMount() {
 		// ios下图标位置有问题
 		this.props.mainContentfun(this)
-		setTimeout(()=>{
+		setTimeout(() => {
 			if (window.$('.b-label>.resize-helper').position().top < 100) {
 				window.$('.b-label>.resize-helper').css('top', '200px')
 			}
-    }, 4000)
-    $("body").css("padding-right","0px!important")
+		}, 4000)
+		$("body").css("padding-right", "0px!important")
 	}
 	onResizeButtonClick = () => {
-		// console.log('onResizeButtonClick')
 	}
 	onRunCodeTest = () => {
-		const {onRunCodeTest, isCollpaseTsetCase} = this.props;
+		const { onRunCodeTest, isCollpaseTsetCase } = this.props;
 		const vncContainer = this.refs['vncContainer']
 		if (vncContainer) {
-			vncContainer.showCodeEvaluate  && vncContainer.showCodeEvaluate()
+			vncContainer.showCodeEvaluate && vncContainer.showCodeEvaluate()
 		}
-		// console.log('1111111111');
-		// this.props.onRunCodeTest();
 		isCollpaseTsetCase(true);
 		onRunCodeTest();
 	}
 	hideCodeEvaluate = () => {
 		const vncContainer = this.refs['vncContainer']
 		if (vncContainer) {
-			// console.log('点击的关闭按钮')
-			vncContainer.onBottomDrawerClose  && vncContainer.onBottomDrawerClose()
+			vncContainer.onBottomDrawerClose && vncContainer.onBottomDrawerClose()
 		}
 	}
-  	render() {
+	render() {
 		const onRunCodeTest = this.onRunCodeTest
-  		const { challenge, output_sets, latest_output, record, st, readRepoTimeout,
-  				onTestSetHeaderClick, loading, codeLoading, shixun, vnc_url} = this.props
+		const { challenge, output_sets, latest_output, record, st, readRepoTimeout,
+			onTestSetHeaderClick, loading, codeLoading, shixun, vnc_url } = this.props
 
-  		// if (output_sets && output_sets.test_sets) {
-  		// 	const test_sets_array = JSON.parse("[" + output_sets.test_sets + "]");
-  		// 	output_sets.test_sets_array = test_sets_array;
-  		// }
-
-  		var games_repository_contents_style;
-  		if (st===1) {
-  			games_repository_contents_style = {overflow: 'auto', height: '445px', backgroundColor: '#111C24'}
-  		} else {
-  			games_repository_contents_style = {overflow: 'hidden', height: '445px'}
-  		}
+		var games_repository_contents_style;
+		if (st === 1) {
+			games_repository_contents_style = { overflow: 'auto', height: '445px', backgroundColor: '#111C24' }
+		} else {
+			games_repository_contents_style = { overflow: 'hidden', height: '445px' }
+		}
 		const newProps = Object.assign({}, this.props);
 		delete newProps.testSetsExpandedArray
 
 		const showIframeContent = shixun && shixun.vnc == true
 
-	    return (
-	      	<div className="page--body -margin-t-64 -flex tpi_content">
-			  	<style>{`
+		return (
+			<div className="page--body -flex tpi_content">
+				<style>{`
 				  	body {
 						font-family: 微软雅黑,宋体 !important;
 						overflow: hidden !important;
@@ -96,117 +81,106 @@ class MainContent extends Component {
 						top: 0px;
 					}
 				`}</style>
-		      	<div className="-layout -stretch -fit labelN" id="game_show_content">
-		      		<div className="split-panel--first -layout -vertical -flex -relative -flex-basic40"
-		      			id="game_left_contents" style={{ width: '40%'}}>
-						{/*  style={{width: '694px'}} */}
-
-		      			{/* 左侧任务说明等功能的区域 */}
-		      			<LeftViewContainer {...newProps}></LeftViewContainer>
-		      		</div>
-					{showIframeContent && vnc_url && <div id="can-drag" className="can-drag" style={{display: 'none'}}></div>}
-		      		<div className="b-label -layout" style={{left: '687px'}}>
-		      			<div className="resize-helper ">
-		      				<Button variant="fab" aria-label="Swap" mini onClick={this.onResizeButtonClick}>
-		      					<svg style={{ marginTop: '1px'}} width="16" height="13" viewBox="0 0 16 13"><path d="M12.245 7.53H5.647v1.882h6.598v2.823L16 8.471l-3.755-3.765V7.53zM10.353 4.706H3.755v2.823L0 3.765 3.755 0v2.824h6.598v1.882z"></path></svg>
+				<div className="-layout -stretch -fit labelN" id="game_show_content">
+					<div className="split-panel--first -layout -vertical -flex -relative -flex-basic40"
+						id="game_left_contents" style={{ width: '50%' }}>
+						<LeftViewContainer {...newProps}></LeftViewContainer>
+					</div>
+					{showIframeContent && vnc_url && <div id="can-drag" className="can-drag" style={{ display: 'none' }}></div>}
+					<div className="b-label -layout" style={{ left: '687px' }}>
+						<div className="resize-helper ">
+							<Button variant="fab" aria-label="Swap" mini onClick={this.onResizeButtonClick}>
+								<svg style={{ marginTop: '1px' }} width="16" height="13" viewBox="0 0 16 13"><path d="M12.245 7.53H5.647v1.882h6.598v2.823L16 8.471l-3.755-3.765V7.53zM10.353 4.706H3.755v2.823L0 3.765 3.755 0v2.824h6.598v1.882z"></path></svg>
 							</Button>
-		      			</div>
-		      		</div>
+						</div>
+					</div>
 
-		      		<div className="split-panel--second -layout -vertical -flex -relative -flex-basic50"
-		      			id="game_right_contents" style={{width: '996px'}}>
-		      			{/* 旧版本、评测等待提示--更新提示块*/}
-		      			{/*<div className="tip-panel-animate clearfix user_bg_shadow bor-grey-e">
-						    <div className="fl tip-img">
-						      <img src="/images/bigdata/logo-1.png"></img>
-						    </div>
-						    <div className="fl pr tip-right-con" id="update_game_tip"></div>
-						</div>*/}
+					<div className="split-panel--second -layout -vertical -flex -relative -flex-basic50"
+						id="game_right_contents" style={{ width: '50%' }}>
 
-						{ showIframeContent && vnc_url ? 
-						<CodeRepositoryViewContainer { ...this.props } isOnlyContainer={true}>
-							<VNCContainer
-								ref="vncContainer"
-								vnc_url={vnc_url}
-								{...this.props}
-								codeEvaluate={
-									<div id="games_valuation_contents">
-										<CodeEvaluateView output_sets={output_sets} latest_output={latest_output}
-											record={record} onTestSetHeaderClick={onTestSetHeaderClick} 
-											{...this.props} inDrawer={true}
-											hideCodeEvaluate={this.hideCodeEvaluate}
+						{showIframeContent && vnc_url ?
+							<CodeRepositoryViewContainer {...this.props} isOnlyContainer={true}>
+								<VNCContainer
+									ref="vncContainer"
+									vnc_url={vnc_url}
+									{...this.props}
+									codeEvaluate={
+										<div id="games_valuation_contents">
+											<CodeEvaluateView output_sets={output_sets} latest_output={latest_output}
+												record={record} onTestSetHeaderClick={onTestSetHeaderClick}
+												{...this.props} inDrawer={true}
+												hideCodeEvaluate={this.hideCodeEvaluate}
 											></CodeEvaluateView>
+										</div>
+									}
+								></VNCContainer>
+								<div id="actionView" className="-layout-h -center -bg-grey-90 -grey-20 -bg-darkblack">
+									<ActionView  {...this.props}
+										onRunCodeTest={onRunCodeTest}
+									></ActionView>
+								</div>
+							</CodeRepositoryViewContainer>
+							:
+							<React.Fragment>
+
+								<div className="-layout-v -flex">
+									<div className="-flex -relative">
+										<div className="split-panel -fit -vertical" id="games_repository_valuation">
+											<div className="-layout -stretch -fit -vertical centerH">
+												<div className="-layout -vertical -flex -relative -flex-basic70 -bg-weightblack"
+													id="games_repository_contents" >
+													{/* 选择题或编程题 */}
+													{/* readRepoTimeout 如果读取代码超时，显示重新加载按钮，重新拉取代码 */}
+													{
+														st === 0
+															?
+															<React.Fragment>
+																<div style={{ display: (codeLoading ? 'block' : 'none'), textAlign: 'center' }}>
+																	<CircularProgress size={40} thickness={3}
+																		style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '18%' }} />
+																	<span style={{ color: '#ddd', display: 'block' }}>正在加载中，请稍后...</span>
+																</div>
+																<div style={{ display: (codeLoading ? 'none' : 'block'), height: 'calc(100% - 40px)' }}>
+																	<CodeRepositoryViewContainer {...this.props} ></CodeRepositoryViewContainer>
+																</div>
+															</React.Fragment>
+															: <ChooseRepositoryView ref="chooseQ" chooseQfun={(ref) => this.chooseQfun(ref)}{...this.props}></ChooseRepositoryView>
+													}
+
+													{/* */}
+												</div>
+												<div className="h-center" style={{ top: '438px' }}>
+													{/*<div className="-changebg -bg-weightblack" id="-bg-change-color"></div>*/}
+												</div>
+												<div className="split-panel--second -layout -vertical -flex -relative -bg-black -flex-basic60"
+													id="games_valuation_contents" style={{ height: '258px', minHeight: '85px' }}>
+													{/* 测试结果、评测信息区域 */}
+													{loading ? <CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '10%', display: 'block' }} />
+														:
+														st === 0
+															? <CodeEvaluateView output_sets={output_sets} latest_output={latest_output}
+																record={record} onTestSetHeaderClick={onTestSetHeaderClick} {...this.props}></CodeEvaluateView>
+															: <ChooseEvaluateView {...this.props}></ChooseEvaluateView>
+													}
+												</div>
+											</div>
+										</div>
 									</div>
-								}
-							></VNCContainer>
-							<div id="actionView" className="-layout-h -center -bg-grey-90 -grey-20 -bg-darkblack">
-								<ActionView  {...this.props}
-									onRunCodeTest={onRunCodeTest}
-								></ActionView>
-							</div>
-						</CodeRepositoryViewContainer>
-						:
-						<React.Fragment>
+								</div>
 
-		      			<div className="-layout-v -flex">
-    						<div className="-flex -relative">
-    							<div className="split-panel -fit -vertical" id="games_repository_valuation">
-						            <div className="-layout -stretch -fit -vertical centerH">
-						              	<div className="-layout -vertical -flex -relative -flex-basic70 -bg-weightblack"
-						              		id="games_repository_contents" style={games_repository_contents_style} >
+								<div id="actionView"
+									style={{ position: 'absolute', width: '100%', bottom: '0', height: '51px' }}
+									className="-layout-h -center -bg-grey-90 -grey-20 -bg-darkblack">
+									<ActionView  {...this.props} onRunCodeTest={onRunCodeTest}></ActionView>
+								</div>
 
-															{/* 选择题或编程题 */}
-															{/* readRepoTimeout 如果读取代码超时，显示重新加载按钮，重新拉取代码 */}
-					              		 	{
-						              		 	st === 0
-													?
-						              			<React.Fragment>
-												  	<div style={{display: (codeLoading ? 'block' : 'none'), textAlign: 'center'}}>
-														<CircularProgress size={40} thickness={3}
-															style={{  marginLeft: 'auto', marginRight: 'auto', marginTop: '18%' }}/>
-														<span style={{color: '#ddd', display: 'block'}}>正在加载中，请稍后...</span>
-													</div>
-						              				<div style={{ display: (codeLoading ? 'none' : 'block') }}>
-						              					<CodeRepositoryViewContainer { ...this.props } ></CodeRepositoryViewContainer>
-						              				</div>
-						              			</React.Fragment>
-						              			: <ChooseRepositoryView ref="chooseQ" chooseQfun={(ref)=>this.chooseQfun(ref)}{ ...this.props }></ChooseRepositoryView>
-						              		}
-
-						              		{/* */}
-						              	</div>
-						              	<div className="h-center" style={{top: '438px'}}>
-							                {/*<div className="-changebg -bg-weightblack" id="-bg-change-color"></div>*/}
-							            </div>
-							            <div className="split-panel--second -layout -vertical -flex -relative -bg-black -flex-basic60"
-							            	id="games_valuation_contents" style={{height: '258px', minHeight: '85px'}}>
-							            	{/* 测试结果、评测信息区域 */}
-							            	{ loading ? <CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '10%', display: 'block' }}/>
-							            		:
-								            		st === 0
-							              			? <CodeEvaluateView output_sets={output_sets} latest_output={latest_output}
-							              					record={record} onTestSetHeaderClick={onTestSetHeaderClick} {...this.props}></CodeEvaluateView>
-							              			: <ChooseEvaluateView {...this.props}></ChooseEvaluateView>
-						              		}
-							            </div>
-						            </div>
-						        </div>
-    						</div>
-    					</div>
-
-							<div id="actionView" 
-								style={{ position: 'absolute', width: '100%', bottom: '0', height: '51px'}}
-								className="-layout-h -center -bg-grey-90 -grey-20 -bg-darkblack">
-    						<ActionView  {...this.props} onRunCodeTest={onRunCodeTest}></ActionView>
-    					</div>
-
-						</React.Fragment>
+							</React.Fragment>
 						}
-		      		</div>
-		      	</div>
-		    </div>
-	    );
-  	}
+					</div>
+				</div>
+			</div>
+		);
+	}
 }
 
 const mapStateToProps = (state) => ({});
@@ -216,5 +190,5 @@ const mapDispatchToProps = (dispatch) => ({
 
 export default connect(
 	mapStateToProps,
-  mapDispatchToProps
+	mapDispatchToProps
 )(MainContent);
diff --git a/src/modules/page/MainContentContainer.js b/src/modules/page/MainContentContainer.js
index d74f6f7d..156e5f60 100644
--- a/src/modules/page/MainContentContainer.js
+++ b/src/modules/page/MainContentContainer.js
@@ -1,12 +1,11 @@
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
 
 // import getMuiTheme from 'material-ui/styles/getMuiTheme'
 import Dialog, {
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
+	DialogActions,
+	DialogContent,
+	DialogContentText,
+	DialogTitle,
 } from 'material-ui/Dialog';
 
 import Button from 'material-ui/Button';
@@ -24,7 +23,7 @@ let locationPath = window.location.pathname;
 
 let readingRepoTimes = 0;
 
-function updateCodeMirror () {
+function updateCodeMirror() {
 	// （TODO 这里的处理方式比较蹩脚，css没搞定）总高度减去页签头高度
 	window.$('#games_repository_contents .CodeMirror').height(window.$('#games_repository_contents').height() - 40)
 	// 为了解决这个问题：一开始进入TPI，代码框的内容显示不全，需要点击一下代码框才会显示全
@@ -38,106 +37,106 @@ function updateCodeMirror () {
 // ============================ ============================ ============================ ============================
 const $ = window.$;
 let next_game = null;
-	function getRandom(min, max){
-	    var r = Math.random() * (max - min);
-	    var re = Math.round(r + min);
-	    re = Math.max(Math.min(re, max), min);
+function getRandom(min, max) {
+	var r = Math.random() * (max - min);
+	var re = Math.round(r + min);
+	re = Math.max(Math.min(re, max), min);
 
-	    return re;
+	return re;
+}
+
+function tipContent(flag, num, mintes, second, first) {
+	console.log("第几次查询get_waiting_time:" + first);
+	var random = getRandom(15, 120);
+	var mintes = parseInt((second - random) / 60);
+	var html = tip_half(flag, num, mintes, second);
+	$("#update_game_tip").html(html);
+	if (first == 1) {
+		show_tip_content();
+	}
+}
+// 显示右侧评测等待通知
+function show_tip_content() {
+	var $tip = $(".tip-panel-animate");
+	$(".update_back_main").show();
+	$tip.addClass("animate-tip").show();
+	setTimeout(function () { $tip.removeClass("animate-tip") }, 700);
+}
+//隐藏右侧评测等待通知
+function hide_tip_content() {
+	var $tip = $(".tip-panel-animate");
+	$tip.addClass("animate-tip-hide");
+	$(".-task-title").hide();
+	setTimeout(function () {
+		$tip.hide().removeClass("animate-tip-hide animate-tip");
+		check_hide();
+	}, 700);
+}
+window.hide_tip_content = hide_tip_content;
+
+//判断是否所有的提示信息都已经隐藏
+function check_hide() {
+	var dis = true;
+	var $tipLeft = $(".tip-panel-animate-left");
+	for (var i = 0; i < $tipLeft.length; i++) {
+		if ($tipLeft.eq(i).css("display") == "block") {
+			dis = false;
+			return;
+		}
+	}
+	if ($(".tip-panel-animate").css("display") == "block") {
+		dis = false;
+	}
+	if (dis) {
+		$(".update_back_main").hide();
+		$('#info_tip_tab').removeClass('leftnav-active');//去除系统通知的选中状态
+		$('#current_task_tab').addClass('leftnav-active');//选中当前任务
+	}
+}
+
+/*评测等待通知*/
+function tip_half(flag, num, mintes, second) {
+	var htmlvalue = "";
+	htmlvalue += "<p class=\"ml15 mr15 mt3 color-grey3 font-16\">评测等待通知</p>";
+	if (flag == 0) {
+		htmlvalue += "<p class=\"color-dark-grey\" style=\"line-height: 20px;margin:10px 15px\">目前有<span class=\"color-orange03\">" + num + "</span>人正在等待评测，还需等待约<span class=\"color-orange03\">" + (mintes > 0 ? mintes + "分钟" : second + "秒") + "</span>。您可以先完成“下一关”任务。</p>";
+	} else {
+		htmlvalue += "<p class=\"color-dark-grey\" style=\"line-height: 20px;margin:0px 15px\">目前有超过<span class=\"color-orange03\">" + num * 10 + "</span>人正在等待评测，请您稍后再试。您可以先完成其他关卡</p>";
 	}
 
-	function tipContent(flag, num, mintes, second, first){
-        console.log("第几次查询get_waiting_time:" + first);
-        var random = getRandom(15, 120);
-        var mintes =  parseInt((second - random) / 60);
-        var html=tip_half(flag, num, mintes, second);
-        $("#update_game_tip").html(html);
-        if(first == 1){
-            show_tip_content();
-        }
-    }
-  // 显示右侧评测等待通知
-    function show_tip_content(){
-        var $tip = $(".tip-panel-animate");
-        $(".update_back_main").show();
-        $tip.addClass("animate-tip").show();
-        setTimeout(function(){$tip.removeClass("animate-tip")}, 700);
-    }
-    //隐藏右侧评测等待通知
-    function hide_tip_content(){
-        var $tip = $(".tip-panel-animate");
-        $tip.addClass("animate-tip-hide");
-        $(".-task-title").hide();
-        setTimeout(function(){
-            $tip.hide().removeClass("animate-tip-hide animate-tip");
-            check_hide();
-        }, 700);
-    }
-    window.hide_tip_content = hide_tip_content;
+	htmlvalue += "<div class=\"tip-operator-btn\">";
+	if (flag == 0) {
+		htmlvalue += "<a href=\"javascript:void(0)\" class=\"fl color-orange03\" data-tip-top=\"留在本页等待评测结果\"  onclick=\"hide_tip_content()\">继续等待</a>";
+		if (next_game) {
+			htmlvalue += "<a href=\"/tasks/" + next_game + "\" class=\"fl color-grey\" data-tip-top=\"稍后查看评测结果\"  onclick=\"hide_tip_content()\">下一关</a>";
+		} else {
+			htmlvalue += "<a href=\"javascript:void(0)\" class=\"fl color-grey\" >已经是最后一关啦</a>"
+		}
+	} else {
+		htmlvalue += "<a href=\"javascript:void(0)\" class=\"fl color-orange03\" data-tip-top=\"留在本页重新评测\"  onclick=\"hide_tip_content()\">知道啦</a>";
+		if (next_game) {
+			htmlvalue += "<a href=\"/tasks/" + next_game + "\" class=\"fl color-grey\" data-tip-top=\"下一关\"  onclick=\"hide_tip_content()\">下一关</a>";
+		} else {
+			htmlvalue += "<a href=\"javascript:void(0)\" class=\"fl color-grey\" >已经是最后一关啦</a>"
+		}
+	}
+	htmlvalue += "</div>";
+	return htmlvalue;
+}
 
-    //判断是否所有的提示信息都已经隐藏
-    function check_hide(){
-        var dis = true;
-        var $tipLeft = $(".tip-panel-animate-left");
-        for(var i = 0; i < $tipLeft.length; i++){
-            if($tipLeft.eq(i).css("display") == "block"){
-                dis = false;
-                return;
-            }
-        }
-        if($(".tip-panel-animate").css("display") == "block"){
-            dis = false;
-        }
-        if(dis){
-            $(".update_back_main").hide();
-            $('#info_tip_tab').removeClass('leftnav-active');//去除系统通知的选中状态
-            $('#current_task_tab').addClass('leftnav-active');//选中当前任务
-        }
-    }
+/*更新通知*/
+function tip_half_update() {
+	var htmlvalue = "";
 
-    /*评测等待通知*/
-    function tip_half(flag, num, mintes, second){
-        var htmlvalue="";
-        htmlvalue+="<p class=\"ml15 mr15 mt3 color-grey3 font-16\">评测等待通知</p>";
-        if(flag == 0){
-            htmlvalue+="<p class=\"color-dark-grey\" style=\"line-height: 20px;margin:10px 15px\">目前有<span class=\"color-orange03\">" + num + "</span>人正在等待评测，还需等待约<span class=\"color-orange03\">" + (mintes > 0 ? mintes + "分钟" : second + "秒") + "</span>。您可以先完成“下一关”任务。</p>";
-        }else{
-            htmlvalue+="<p class=\"color-dark-grey\" style=\"line-height: 20px;margin:0px 15px\">目前有超过<span class=\"color-orange03\">" + num*10 + "</span>人正在等待评测，请您稍后再试。您可以先完成其他关卡</p>";
-        }
-
-        htmlvalue+="<div class=\"tip-operator-btn\">";
-        if(flag == 0){
-            htmlvalue+="<a href=\"javascript:void(0)\" class=\"fl color-orange03\" data-tip-top=\"留在本页等待评测结果\"  onclick=\"hide_tip_content()\">继续等待</a>";
-            if (next_game) {
-            	htmlvalue+="<a href=\"/tasks/" + next_game + "\" class=\"fl color-grey\" data-tip-top=\"稍后查看评测结果\"  onclick=\"hide_tip_content()\">下一关</a>";
-            } else {
-            	htmlvalue+="<a href=\"javascript:void(0)\" class=\"fl color-grey\" >已经是最后一关啦</a>"
-            }
-        }else{
-            htmlvalue+="<a href=\"javascript:void(0)\" class=\"fl color-orange03\" data-tip-top=\"留在本页重新评测\"  onclick=\"hide_tip_content()\">知道啦</a>";
-            if (next_game) {
-	            htmlvalue+="<a href=\"/tasks/" + next_game + "\" class=\"fl color-grey\" data-tip-top=\"下一关\"  onclick=\"hide_tip_content()\">下一关</a>";
-	        } else {
-            	htmlvalue+="<a href=\"javascript:void(0)\" class=\"fl color-grey\" >已经是最后一关啦</a>"
-            }
-        }
-        htmlvalue+="</div>";
-        return htmlvalue;
-    }
-
-    /*更新通知*/
-    function tip_half_update(){
-        var htmlvalue="";
-
-        htmlvalue+="<p class=\"mb5 ml15 mt8 mr15 color-grey3 font-14 mt8\" style=\"line-height: 20px\">本次更新设计以下几个步骤，预计需要花费几分钟时间，请耐心等待~</p>";
-        htmlvalue+="<ol class=\"ml15\">";
-        htmlvalue+="<li style=\"list-style-type: disc;margin-left: 20px;line-height: 20px\">更新版本库</li>";
-        htmlvalue+="<li style=\"list-style-type: disc;margin-left: 20px;line-height: 20px\">同步评测机制</li></ol>";
-        htmlvalue+="<div class=\"tip-operator-btn\">";
-        htmlvalue+="<a href=\"javascript:void(0)\" class=\"fl color-orange03\" style=\"width:100%;text-align: center;border:none\" onclick=\"hide_tip_content()\">知道啦</a>";
-        htmlvalue+="</div>";
-        return htmlvalue;
-    }
+	htmlvalue += "<p class=\"mb5 ml15 mt8 mr15 color-grey3 font-14 mt8\" style=\"line-height: 20px\">本次更新设计以下几个步骤，预计需要花费几分钟时间，请耐心等待~</p>";
+	htmlvalue += "<ol class=\"ml15\">";
+	htmlvalue += "<li style=\"list-style-type: disc;margin-left: 20px;line-height: 20px\">更新版本库</li>";
+	htmlvalue += "<li style=\"list-style-type: disc;margin-left: 20px;line-height: 20px\">同步评测机制</li></ol>";
+	htmlvalue += "<div class=\"tip-operator-btn\">";
+	htmlvalue += "<a href=\"javascript:void(0)\" class=\"fl color-orange03\" style=\"width:100%;text-align: center;border:none\" onclick=\"hide_tip_content()\">知道啦</a>";
+	htmlvalue += "</div>";
+	return htmlvalue;
+}
 // ============================ ============================ ============================ ============================
 // ============================ ============================ ============================ ============================
 
@@ -153,7 +152,7 @@ class MainContentContainer extends Component {
 
 		this.onRepositoryCodeUpdate = this.onRepositoryCodeUpdate.bind(this)
 		this.onRunCodeTest = this.onRunCodeTest.bind(this)
-		this.codemirrorDidMount = this.codemirrorDidMount.bind(this)
+		this.onEditorFocus = this.onEditorFocus.bind(this)
 		this.fetchRepositoryCode = this.fetchRepositoryCode.bind(this)
 
 		this.showResetCodeDialog = this.showResetCodeDialog.bind(this)
@@ -163,93 +162,70 @@ class MainContentContainer extends Component {
 		this.oldRepositoryCode = '';
 
 		this.state = {
-            repositoryCode: '',
+			repositoryCode: '',
 
-            open: false,			// 繁忙等级等提示用Dialog，考虑重构封装到根组件
-            gameBuilding: false, // 评测中标志
-            codeStatus: SAVED, //  0 已修改  1 保存中  2 已保存   3 保存失败
+			open: false,			// 繁忙等级等提示用Dialog，考虑重构封装到根组件
+			gameBuilding: false, // 评测中标志
+			codeStatus: SAVED, //  0 已修改  1 保存中  2 已保存   3 保存失败
 
-						codeLoading: true,		 			// code加载中
-						readRepoTimeout: false,	// 加载代码轮训超时
-            resetCodeDialogOpen: false,			// 考虑重构封装到根组件
-						resetPassedCodeDialogOpen: false,	// 考虑重构封装到根组件
+			codeLoading: true,		 			// code加载中
+			readRepoTimeout: false,	// 加载代码轮训超时
+			resetCodeDialogOpen: false,			// 考虑重构封装到根组件
+			resetPassedCodeDialogOpen: false,	// 考虑重构封装到根组件
 
-            isEditablePath: true
-        }
+			isEditablePath: true
+		}
 	}
 	mainContentfun = (Ref) => {
 		this.mainContent = Ref;
 	}
-	// ------------------------------------------------
-	// static childContextTypes = {
- //        muiTheme: PropTypes.object
- //    }
-
- //    getChildContext() {
- //        return {
- //            muiTheme: getMuiTheme()
- //        }
- //    }
-    // ------------------------------------------------
-    handleClose = () => {
-	    this.setState({open: false});
+	handleClose = () => {
+		this.setState({ open: false });
 	};
 
 	shouldComponentUpdate(nextProps, nextState) {
-		// _.isEqual(this.props, nextProps)
 		if (JSON.stringify(nextProps) !== JSON.stringify(this.props) || !_.isEqual(this.state, nextState)) {
-		   	return true
+			return true
 		} else {
-		   	return false
+			return false
 		}
 	}
 
 	componentWillReceiveProps(newProps, nContext) {
 		// 编程题才需要拿代码
-        if (newProps.game && newProps.st === 0) {
-        	if (!this.props ||  !this.props.game
-        			|| ( newProps.game.identifier !== this.props.game.identifier ) ) {
-              setTimeout(this.fetchRepositoryCode( newProps), 1500);
-	        } 
-			// else if ( this.props.challenge.pathIndex != newProps.challenge.pathIndex
-	        // 		&& newProps.challenge.pathIndex !== -1) {	// 切换到只读文件
-	        	// pathIndex切换
-            //   setTimeout(this.fetchRepositoryCode( newProps), 1500);
-	        // }
-	    }
-        if (newProps.myshixun) {
-        	var stageId = newProps.match.params.stageId;
-        	var shixunId = newProps.myshixun.identifier;
-			// locationPath = `/myshixuns/${shixunId}/stages/${stageId}`
+		if (newProps.game && newProps.st === 0) {
+			if (!this.props || !this.props.game
+				|| (newProps.game.identifier !== this.props.game.identifier)) {
+				setTimeout(this.fetchRepositoryCode(newProps), 1500);
+			}
+		}
+		if (newProps.myshixun) {
 			locationPath = `/api/v1/games/${newProps.game.identifier}`;
 			next_game = newProps.next_game;
-        }
-    }
+		}
+	}
 
 	componentDidUpdate(prevProps, prevState, snapshot) {
-        const { game, challenge  } = this.props
-        
-		if (game && prevProps.game 
-				&& prevProps.game.identifier !== game.identifier) {   
+		const { game, challenge } = this.props
+
+		if (game && prevProps.game
+			&& prevProps.game.identifier !== game.identifier) {
 			// 切换关卡时，停止轮训
 			this.oldGameIdentifier = prevProps.game.identifier;
 			this.doFileUpdateRequestOnCodeMirrorBlur(prevProps)
-		} 
-		// else if (this.props.shixun && this.props.shixun.code_edit_permission && this.state.currentPath != prevState.currentPath) {
-		// 	this.doFileUpdateRequestOnCodeMirrorBlur(prevProps)
-		// } 
+		}
 		else if (challenge && (challenge.pathIndex || prevProps.challenge.pathIndex) && challenge.pathIndex != prevProps.challenge.pathIndex) {
 			this.doFileUpdateRequestOnCodeMirrorBlur(prevProps)
-		} 
-        
-    }
+		}
 
-    // arg_path 点击文件目录树时，传入的点击节点对应的path
-	fetchRepositoryCode( props, arg_path, type, isRetry, retryAndRefresh) {
+	}
+
+	// arg_path 点击文件目录树时，传入的点击节点对应的path
+	fetchRepositoryCode(props, arg_path, type, isRetry, retryAndRefresh) {
 		if (retryAndRefresh) {
 			this.retryAndRefresh = retryAndRefresh
 		}
-    	const { challenge, showSnackbar, game, shixun, myshixun, hide_code } = props ? props : this.props;
+		const { challenge, showSnackbar, game, shixun, myshixun, hide_code } = props ? props : this.props;
 		if (shixun.vnc == true) {
 			// vnc模式下不需要加载代码
 			return true;
@@ -287,154 +263,121 @@ class MainContentContainer extends Component {
 			})
 		}
 
-		// http://localhost:3000/api/v1/games/zl6kx8f7vfpo/rep_content
 		let status = type ? type : 0;	// type 1 目录树点击   默认 0： 正常代码加载
-		// const fetchRepoCodeUrl = `/api/v1/games/${stageId}/rep_content?path=${path}&shixun_gpid=${shixun.gpid}&status=${status}&retry=${isRetry ? 1 : 0}`
 		const fetchRepoCodeUrl = `/tasks/${game.identifier}/rep_content.json?path=${path}&status=${status}&retry=${isRetry ? 1 : 0}`
-		// ?path=${path}&shixun_gpid=${shixun.gpid}&status=${status}&retry=${isRetry ? 1 : 0}
 
-		if (this.state.codeLoading === true && this._cancel) {	// 多次请求，则cancel掉前面的请求
-			// bug cancel掉第一次请求后，第二次请求也没法发出，先注释掉了
-			// this._cancel();
-			// this._cancel = null;
-		}
-		const that = this;
 		this.setState({ gameBuilding: false, codeLoading: true });
-    	axios.get(fetchRepoCodeUrl, {
-			// path: path
-			
-    		// withCredentials: true,
-    		// cancelToken: new CancelToken(function executor(c) {
-			//     // An executor function receives a cancel function as a parameter
-			//     that._cancel = c;
-			// })
-    	}).then((fetchRepositoryCodeResponse) => {
-				// monaca 需要刷新，不然无法编辑
-				// 加了dispose，应该不会重现了，暂时注释掉reload
-				// if (this.retryAndRefresh && fetchRepositoryCodeResponse.data.content) {
-				// 	this.retryAndRefresh = false;
-				// 	window.location.reload()
-				// 	return;
-				// }
-				// 空字符串还是正常切换
-				if (fetchRepositoryCodeResponse.data.status == 0) {
-					readingRepoTimes = readingRepoTimes + 1;
-					if(readingRepoTimes > 9) {
-						this.setState({
-							readRepoTimeout: true,
-							codeLoading: false
-						})
-						readingRepoTimes = 0;
-						showSnackbar(`网络异常，请稍后重试。`);
-						return
-					}else{
-						if (status === 0) {
-							// 轮训后点击切换关卡的话，停止上一关的轮训
-							if (game.identifier == this.oldGameIdentifier) {
-								this.oldGameIdentifier = null;
-								return;
-							}
-							setTimeout(() => {
-								this.fetchRepositoryCode(props,arg_path,type)
-							}, 1500);
-						} 
-					}
-
-				}else if (fetchRepositoryCodeResponse.data && fetchRepositoryCodeResponse.data.status === -1) {
-						this.setState({	codeLoading: false })
-						console.error('`获取代码失败！')
-						showSnackbar(`获取代码失败：${fetchRepositoryCodeResponse.data.message}`)
-
-				}else if (fetchRepositoryCodeResponse.data.status === -3) {
-					readingRepoTimes = readingRepoTimes + 1;
-					if(readingRepoTimes > 9) {
-						this.setState({
-							readRepoTimeout: true
-						})
-						readingRepoTimes = 0;
-						showSnackbar(`网络异常，请稍后重试。`);
-						return
-					}else{
-						if (status === 0) {
-							// 轮训后点击切换关卡的话，停止上一关的轮训
-							if (game.identifier == this.oldGameIdentifier) {
-								this.oldGameIdentifier = null;
-								return;
-							}
-							// 重试调用的这个 this.props.fetchRepositoryCode(this.props, null, null, true)
-							setTimeout(() => {
-								this.fetchRepositoryCode(props, arg_path, type, 1)
-							}, 1500);
+		axios.get(fetchRepoCodeUrl, {
+		}).then((fetchRepositoryCodeResponse) => {
+			// 空字符串还是正常切换
+			if (fetchRepositoryCodeResponse.data.status == 0) {
+				readingRepoTimes = readingRepoTimes + 1;
+				if (readingRepoTimes > 9) {
+					this.setState({
+						readRepoTimeout: true,
+						codeLoading: false
+					})
+					readingRepoTimes = 0;
+					showSnackbar(`网络异常，请稍后重试。`);
+					return
+				} else {
+					if (status === 0) {
+						// 轮训后点击切换关卡的话，停止上一关的轮训
+						if (game.identifier == this.oldGameIdentifier) {
+							this.oldGameIdentifier = null;
+							return;
 						}
+						setTimeout(() => {
+							this.fetchRepositoryCode(props, arg_path, type)
+						}, 1500);
 					}
-				} else if (fetchRepositoryCodeResponse.data.status === -4) {
-					// 异常 直接重试
-					this.fetchRepositoryCode(props, null, null, true)
-				} else{
-					var editor_monaco = window.editor_monaco;
-
-					if (path && path.endsWith('.py')) {
-						editor_monaco.getModel().updateOptions({insertSpaces: true})
-					} else {
-						editor_monaco.getModel().updateOptions({insertSpaces: false})
-					}
-					this.setState({ isEditablePath, currentPath: path });
-					this.oldRepositoryCode = ((fetchRepositoryCodeResponse.data.content === true || !fetchRepositoryCodeResponse.data.content)
-						 ? '' : fetchRepositoryCodeResponse.data.content);
-
-					this.updateRepositoryCode(this.oldRepositoryCode, updateCodeMirror)
 				}
 
-    	}).catch(error =>{
-    		console.log(error)
+			} else if (fetchRepositoryCodeResponse.data && fetchRepositoryCodeResponse.data.status === -1) {
+				this.setState({ codeLoading: false })
+				console.error('`获取代码失败！')
+				showSnackbar(`获取代码失败：${fetchRepositoryCodeResponse.data.message}`)
+
+			} else if (fetchRepositoryCodeResponse.data.status === -3) {
+				readingRepoTimes = readingRepoTimes + 1;
+				if (readingRepoTimes > 9) {
+					this.setState({
+						readRepoTimeout: true
+					})
+					readingRepoTimes = 0;
+					showSnackbar(`网络异常，请稍后重试。`);
+					return
+				} else {
+					if (status === 0) {
+						// 轮训后点击切换关卡的话，停止上一关的轮训
+						if (game.identifier == this.oldGameIdentifier) {
+							this.oldGameIdentifier = null;
+							return;
+						}
+						// 重试调用的这个 this.props.fetchRepositoryCode(this.props, null, null, true)
+						setTimeout(() => {
+							this.fetchRepositoryCode(props, arg_path, type, 1)
+						}, 1500);
+					}
+				}
+			} else if (fetchRepositoryCodeResponse.data.status === -4) {
+				// 异常 直接重试
+				this.fetchRepositoryCode(props, null, null, true)
+			} else {
+				var editor_monaco = window.editor_monaco;
+
+				if (path && path.endsWith('.py')) {
+					editor_monaco.getModel().updateOptions({ insertSpaces: true })
+				} else {
+					editor_monaco.getModel().updateOptions({ insertSpaces: false })
+				}
+				this.setState({ isEditablePath, currentPath: path });
+				this.oldRepositoryCode = ((fetchRepositoryCodeResponse.data.content === true || !fetchRepositoryCodeResponse.data.content)
+					? '' : fetchRepositoryCodeResponse.data.content);
+
+				this.updateRepositoryCode(this.oldRepositoryCode, updateCodeMirror)
+			}
+
+		}).catch(error => {
+			console.log(error)
 			this.setState({ codeLoading: false });
 			showSnackbar(`服务端异常，请联系管理员！`);
-    	})
+		})
 	}
 
 	componentDidMount() {
-		// if (this.binded == true) {
-		// 	return;
-		// } else {
-		// 	this.binded = true
-		// 	window.$(window).unload( ()=>{
-		// 		alert(111)
-		// 		var fileUpdatePromise = this.doFileUpdateRequest(true)
-		// 	});
-		// }
 
 		window.addEventListener("beforeunload", this.beforeunload);
-           
+
 	}
 	componentWillUnmount() {
-		// window.$(window).off( "unload" )
-		 window.removeEventListener("beforeunload", this.beforeunload);
+		window.removeEventListener("beforeunload", this.beforeunload);
 	}
 	beforeunload = () => {
 		this.doFileUpdateRequestOnCodeMirrorBlur()
 	}
-	
+
 
 	doFileUpdateRequestOnCodeMirrorBlur = (props) => {
 		var fileUpdatePromise = this.doFileUpdateRequest(true, undefined, props)
-        if (fileUpdatePromise) {
-        	fileUpdatePromise.then((resData) => {
-        		if (resData.status === -1) { // 保存文件出现异常
-                    this.setState({
-                        codeStatus: SAVE_FAILED
-                    })
-                    return;
-                }
-        		this.setState({
+		if (fileUpdatePromise) {
+			fileUpdatePromise.then((resData) => {
+				if (resData.status === -1) { // 保存文件出现异常
+					this.setState({
+						codeStatus: SAVE_FAILED
+					})
+					return;
+				}
+				this.setState({
 					codeStatus: SAVED
 				})
-        	}).catch((e) => {
-        		console.log(e)
-        		this.setState({
+			}).catch((e) => {
+				console.log(e)
+				this.setState({
 					codeStatus: SAVE_FAILED
 				})
-        	})
-        }
+			})
+		}
 	}
 	componentWillUnmount() {
 		this.autoSaveInterval && clearInterval(this.autoSaveInterval);
@@ -451,9 +394,7 @@ class MainContentContainer extends Component {
 		if (this.autoSaveInterval) {
 			return;
 		}
-		this.autoSaveInterval = setInterval( () => {
-			// code变化时，，每30秒保存到数据库，没变化则不处理
-			var autoSave = true
+		this.autoSaveInterval = setInterval(() => {
 			var fileUpdatePromise = this.doFileUpdateRequest(true)
 			if (fileUpdatePromise) {
 				fileUpdatePromise.then((resData) => {
@@ -468,29 +409,10 @@ class MainContentContainer extends Component {
 		}, 30000);
 	}
 
-	codemirrorDidMount() {
-		var editor_CodeMirror = window.editor_CodeMirror;
-		var editor_monaco = window.editor_monaco;
-	    // 失去焦点终止保存事件
-	    // editor_CodeMirror && editor_CodeMirror.on('blur', this.onEditorBlur);
-		// editor_monaco && editor_monaco.onDidBlurEditorText(this.onEditorBlur)
-
-	    // 每60秒钟保存一次
-	    editor_CodeMirror && editor_CodeMirror.on('focus', this.onEditorFocus);
-		editor_monaco && editor_monaco.onDidFocusEditorText(this.onEditorFocus)
-
-
-	}
-
 	_refreshHtmlIframe(newCode) {
 		// TODO 是否是html的code
 		const isHtmlCode = this.props.challenge.isHtml;
 		if (isHtmlCode) {
-			// TODO 参考 _code_actions.html.erb   做link script标签替换
-			// var $iframe = window.$('#htmlIframe');
-			// $iframe.ready( () => {
-			//     $iframe.contents().find("body").html(newCode || this.state.repositoryCode);
-			// });
 			window.tpi_html_show(newCode)
 		}
 	}
@@ -499,7 +421,7 @@ class MainContentContainer extends Component {
 		this.setState({
 			codeLoading: false,
 			repositoryCode: newCode,
-        }, () => { callback && callback() });
+		}, () => { callback && callback() });
 		this._refreshHtmlIframe(newCode)
 	}
 
@@ -509,18 +431,13 @@ class MainContentContainer extends Component {
 		}
 		// 每2s刷新一次
 		this.setState({
-    		codeStatus: UPDATED
-        })
-        this.refreshHtmlTimeout = setTimeout(()=>{
-    //     	this.setState({
-    //     		// codeStatus: UPDATED,
-				// repositoryCode: newCode
-	   //      });
+			codeStatus: UPDATED
+		})
+		this.refreshHtmlTimeout = setTimeout(() => {
+			this._refreshHtmlIframe(newCode)
 
-        	this._refreshHtmlIframe(newCode)
-
-        	this.refreshHtmlTimeout = null;
-        }, 1500)
+			this.refreshHtmlTimeout = null;
+		}, 1500)
 
 	}
 
@@ -531,13 +448,6 @@ class MainContentContainer extends Component {
 		if (!forTest && codeStatus !== UPDATED) {	// 已修改状态才能保存
 			return;
 		}
-		// TODO 连着2次请求服务端会报500
-		// if (forTest == true) {
-		// 	if (this.state.codeStatus != UPDATED) {
-				
-		// 		return;
-		// 	}
-		// }
 		let codeContent = this.state.repositoryCode;
 		if (window['editor_CodeMirror']) {
 			codeContent = window.editor_CodeMirror.getValue();
@@ -545,14 +455,12 @@ class MainContentContainer extends Component {
 			codeContent = window.editor_monaco.getValue()
 		}
 		if (checkIfCodeChanged === true && this.oldRepositoryCode == codeContent) {
-			// console.log('code not changed');
 			this.setState({
 				codeStatus: SAVED
 			})
 			return null;
 		}
 		const { challenge, output_sets, onRunCodeTestFinish, myshixun } = _props
-		// var url = `${locationPath}/file_update?path=${encodeURIComponent(challenge.path)}`
 		var url = `/myshixuns/${myshixun.identifier}/update_file.json`
 
 		this.setState({
@@ -574,47 +482,39 @@ class MainContentContainer extends Component {
 		// 跨域请求时会多一个options请求
 		// https://github.com/axios/axios/issues/475
 		return axios.post(url, {
-				    content: codeContent,
-					// 评测的时候传1，其它情况不用传，主要是为了区分是用户自己提交还是自动提交
-				    // type: forTest === true ? 1 : 0,
-				    evaluate: forTest === true ? 1 : 0,
-					game_id : this.props.game.id,
-				    path: argPath
-			    },
-			    {
-			    	// withCredentials: true
-			    }
-
-		    )
+			content: codeContent,
+			// 评测的时候传1，其它情况不用传，主要是为了区分是用户自己提交还是自动提交
+			// type: forTest === true ? 1 : 0,
+			evaluate: forTest === true ? 1 : 0,
+			game_id: this.props.game.id,
+			path: argPath
+		})
 	}
 
 	onRunChooseTest() {
 		const { st, game, onRunChooseTestFinish, showSnackbar } = this.props;
 		// 获取form表单值
-		// console.log(this.mainContent.chooseQ.props.form.getFieldsValue())
 		var value = this.mainContent.chooseQ.props.form.getFieldsValue();
-			// this.refs.mainContent.refs.chooseQ.getForm().getFieldsValue();
 
 		var valueArray = [];	// map转array
-      	var unSelectOptionIndexArray = [] // 自己做未选提示
-		for(var key in value) {
+		var unSelectOptionIndexArray = [] // 自己做未选提示
+		for (var key in value) {
 			if (!value[key] || (_.isArray(value[key]) && !value[key].join('')[0])) {
 				unSelectOptionIndexArray.push(key)
 				break;  // 为空处理
 			}
 			// TODO array判断
-			valueArray[parseInt(key)] = _.isArray(value[key]) ? value[key].join('') : value[key] ;
+			valueArray[parseInt(key)] = _.isArray(value[key]) ? value[key].join('') : value[key];
 		}
 		if (unSelectOptionIndexArray.length) {
 			var unSelectOptionIndex = unSelectOptionIndexArray[0]
-			var _unSelectOptionDom = window.$('#games_repository_contents #choice' + unSelectOptionIndex )[0]
+			var _unSelectOptionDom = window.$('#games_repository_contents #choice' + unSelectOptionIndex)[0]
 			_unSelectOptionDom.scrollIntoView()
-			showSnackbar(`请先给第${parseInt(unSelectOptionIndex)+1}题选择一个答案。`)	//  , 'top', 'center'
+			showSnackbar(`请先给第${parseInt(unSelectOptionIndex) + 1}题选择一个答案。`)	//  , 'top', 'center'
 			// 有未选择的题
 			return;
 		}
 
-		// TODO 未选提示、props.onRunChooseTest
 		console.log(unSelectOptionIndexArray)
 
 		console.log('valueArray', valueArray)
@@ -624,35 +524,32 @@ class MainContentContainer extends Component {
 			gameBuilding: true,
 		})
 		axios.post(url, {
-				    answer: valueArray
-			    },
-			    {
-			    	withCredentials: true,
-			    	// headers: {
-				    	// 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
-				    // }
-			    }
-		    ).then((response) => {
-		    	if (response.data.test_sets) { // 评测完成
+			answer: valueArray
+		},
+			{
+				withCredentials: true
+			}
+		).then((response) => {
+			if (response.data.test_sets) { // 评测完成
 
-		    		onRunChooseTestFinish(response.data);
-		    		this.setState({
-						gameBuilding: false,
-					})
-		    	}
-		    	console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    	this.setState({
+				onRunChooseTestFinish(response.data);
+				this.setState({
 					gameBuilding: false,
 				})
-		    })
+			}
+			console.log(response)
+		}).catch((error) => {
+			console.log(error)
+			this.setState({
+				gameBuilding: false,
+			})
+		})
 	}
 
 	setGameBuildFalse() {
 		this.setState({
-    		gameBuilding: false
-    	})
+			gameBuilding: false
+		})
 	}
 	onPathChange = (index, isDropDown) => {
 		this.props.onPathChange(index, () => {
@@ -686,37 +583,30 @@ class MainContentContainer extends Component {
 
 		console.log('onRunCodeTest  onRunCodeTest')
 
-		// http://localhost:3000/myshixuns/so5w6iap97/stages/zl6kx8f7vfpo/file_update?path=src%2Fstep6%2FLinkedList.java
-
-
-		// var url = `${locationPath}/file_update?path=${encodeURIComponent(challenge.path)}`
-
-		// var timeOut = parseInt(<%= @myshixun.main_mirror.try(:time_limit) %>); // 超时参数
-
 		this.setEvaluateMiddleStatusText('')
 
 		this.setState({
-    		gameBuilding: true
-    	})
+			gameBuilding: true
+		})
 		this.doFileUpdateRequest(null, true)
-		  	.then((fileUpdateResponse) => {
-		    	console.log(fileUpdateResponse);
-		    	if (fileUpdateResponse.data.status === -1) { // 保存文件出现异常
-		    		this.setGameBuildFalse()
-		    		this.setState({
+			.then((fileUpdateResponse) => {
+				console.log(fileUpdateResponse);
+				if (fileUpdateResponse.data.status === -1) { // 保存文件出现异常
+					this.setGameBuildFalse()
+					this.setState({
 						codeStatus: SAVE_FAILED
 					})
-		    		return;
-		    	}
-		    	this.setState({
+					return;
+				}
+				this.setState({
 					codeStatus: SAVED
 				})
-		    	this.gameBuild(fileUpdateResponse, 1)
-		  	})
-		  	.catch( (fileUpdateError) => {
-		    	console.log(fileUpdateError);
-		    	this.setGameBuildFalse()
-		  	});
+				this.gameBuild(fileUpdateResponse, 1)
+			})
+			.catch((fileUpdateError) => {
+				console.log(fileUpdateError);
+				this.setGameBuildFalse()
+			});
 	}
 	setEvaluateMiddleStatusText = (msg) => {
 		window.$('#evaluateMiddleStatusText').html(msg)
@@ -726,109 +616,94 @@ class MainContentContainer extends Component {
 		const { st, challenge, output_sets, onRunCodeTestFinish, resetTestSetsExpandedArray, showSnackbar, time_limit, game } = this.props
 		const { resubmit, content_modified, sec_key } = fileUpdateResponse.data;
 		const timeOut = time_limit;
-    	// http://localhost:3000/myshixuns/so5w6iap97/stages/zl6kx8f7vfpo/game_build?first=1&resubmit=GDBEX741_1993
-    	// const game_build_url = `${locationPath}/game_build?first=${first}&resubmit=${resubmit}&content_modified=${content_modified}`
-    	const game_build_url = `/tasks/${game.identifier}/game_build.json?first=${first}&resubmit=${resubmit}&content_modified=${content_modified}&sec_key=${sec_key}`
+		// http://localhost:3000/myshixuns/so5w6iap97/stages/zl6kx8f7vfpo/game_build?first=1&resubmit=GDBEX741_1993
+		// const game_build_url = `${locationPath}/game_build?first=${first}&resubmit=${resubmit}&content_modified=${content_modified}`
+		const game_build_url = `/tasks/${game.identifier}/game_build.json?first=${first}&resubmit=${resubmit}&content_modified=${content_modified}&sec_key=${sec_key}`
 
-    	// var timeOut = parseInt(<%= @myshixun.main_mirror.try(:time_limit) %>); // 超时参数
+		// var timeOut = parseInt(<%= @myshixun.main_mirror.try(:time_limit) %>); // 超时参数
 
-			resetTestSetsExpandedArray();
-    	axios.get(game_build_url, {
-    		// withCredentials: true,
-    	}).then((gameBuildResponse) => {
-    		console.log(gameBuildResponse);
-    		// D:\Code\trustieplus\app\views\games\_code_actions.html.erb
+		resetTestSetsExpandedArray();
+		axios.get(game_build_url, {
+			// withCredentials: true,
+		}).then((gameBuildResponse) => {
+			console.log(gameBuildResponse);
+			// D:\Code\trustieplus\app\views\games\_code_actions.html.erb
 
-    		let { port, ableToCreate, waitNum, waitingTime, had_done } = gameBuildResponse.data;
-    		// http://localhost:3000/myshixuns/so5w6iap97/stages/zl6kx8f7vfpo/game_status?resubmit=GDBEX741_1993&port=50241&time_out=false
+			let { port, ableToCreate, waitNum, waitingTime, had_done } = gameBuildResponse.data;
+			// http://localhost:3000/myshixuns/so5w6iap97/stages/zl6kx8f7vfpo/game_status?resubmit=GDBEX741_1993&port=50241&time_out=false
 
 			// TODO dead code 往下走
-			
-    		// if (ableToCreate == 1) {
 
-				if (gameBuildResponse.data.status == -1) {
-					return
+			// if (ableToCreate == 1) {
+
+			if (gameBuildResponse.data.status == -1) {
+				return
+			}
+			let timeOutFlag = false;
+			const intervalDuring = 1000;
+			let requestTimes = 0;
+
+			var gameStatusIntervalId = setInterval(() => {
+				// let game_status_url = `${locationPath}/game_status?port=${port}&resubmit=${resubmit||""}&time_out=${timeOutFlag}`
+				let game_status_url = `/tasks/${game.identifier}/game_status.json?port=${port}&resubmit=${resubmit || ""}&time_out=${timeOutFlag}&sec_key=${sec_key}`
+
+				axios.get(game_status_url, {
+					// withCredentials: true,
+				}).then((gameStatusResponse) => {
+					requestTimes++;
+					const { status, running_code_message } = gameStatusResponse.data;
+
+					if (!gameStatusResponse.data || !status && status !== 0) {
+						if (requestTimes >= timeOut - 1) {	 // 最后一次参数改为true
+							timeOutFlag = true;
+						}
+						if (running_code_message) {
+							this.setEvaluateMiddleStatusText(running_code_message)
+						}
+						return;
+					}
+
+					if (timeOutFlag === false && (status === 2 || status === 0)) {
+						// 网络太慢或服务处理较慢的情况下，可能这里会执行第二次
+						console.log('clearIntervalclearIntervalclearIntervalclearInterval status2 0')
+						clearInterval(gameStatusIntervalId);
+						onRunCodeTestFinish(gameStatusResponse.data)
+						this.setGameBuildFalse()
+						timeOutFlag = true; // 用这个处理重复的获取status为2或0的状态
+					}
+					// 超时处理
+					if (timeOutFlag === true) {
+						// clearInterval(gameStatusIntervalId);
+						console.log('超时处理返回值')
+						this._refreshHtmlIframe();
+						this.setGameBuildFalse()
+						return;
+					}
+
+					if (requestTimes >= timeOut - 1) {	 // 最后一次参数改为true
+						timeOutFlag = true;
+					}
+
+
+				}).catch((gameStatusError) => {
+					console.log(gameStatusError);
+				})
+
+				if (timeOutFlag === true) {
+					clearInterval(gameStatusIntervalId);
+					this.setState({
+						open: true,
+						gameBuilding: false
+					})
 				}
-	    		let timeOutFlag = false;
-	    		const intervalDuring = 1000;
-	    		let requestTimes = 0;
+			}, intervalDuring)
 
-	    		var gameStatusIntervalId = setInterval(()=>{
-	    			// let game_status_url = `${locationPath}/game_status?port=${port}&resubmit=${resubmit||""}&time_out=${timeOutFlag}`
-	    			let game_status_url = `/tasks/${game.identifier}/game_status.json?port=${port}&resubmit=${resubmit||""}&time_out=${timeOutFlag}&sec_key=${sec_key}`
+			window.gameStatusIntervalId = gameStatusIntervalId;
 
-		    		axios.get(game_status_url, {
-		    			// withCredentials: true,
-		    		}).then((gameStatusResponse) => {
-		    			requestTimes++;
-		    			const { status, running_code_message } = gameStatusResponse.data;
-
-		    			if(!gameStatusResponse.data || !status && status !== 0) {
-		    				if(requestTimes >= timeOut - 1){	 // 最后一次参数改为true
-	                            timeOutFlag = true;
-	                        }
-							if (running_code_message) {
-								this.setEvaluateMiddleStatusText(running_code_message)
-							}
-		    				return;
-		    			}
-
-		    			if (timeOutFlag === false && (status === 2 || status === 0)) {
-		    				// 网络太慢或服务处理较慢的情况下，可能这里会执行第二次
-		    				console.log('clearIntervalclearIntervalclearIntervalclearInterval status2 0')
-		    				clearInterval(gameStatusIntervalId);
-		    				onRunCodeTestFinish(gameStatusResponse.data)
-		    				this.setGameBuildFalse()
-		    				timeOutFlag = true; // 用这个处理重复的获取status为2或0的状态
-		    			}
-		    			// 超时处理
-		    			if(timeOutFlag === true) {
-		    				// clearInterval(gameStatusIntervalId);
-		    				console.log('超时处理返回值')
-		    				this._refreshHtmlIframe();
-		    				this.setGameBuildFalse()
-		    				return;
-		    			}
-
-		    			if(requestTimes >= timeOut - 1){	 // 最后一次参数改为true
-                            timeOutFlag = true;
-                        }
-
-
-		    		}).catch((gameStatusError) => {
-	    				console.log(gameStatusError);
-		    		})
-
-		    		if (timeOutFlag === true) {
-		    			clearInterval(gameStatusIntervalId);
-		    			this.setState({
-		    				open: true,
-							gameBuilding: false
-		    			})
-		    		}
-		    	}, intervalDuring)
-
-				window.gameStatusIntervalId = gameStatusIntervalId;
-			// } else if(ableToCreate === 0) { // 排队等待，重新执行gameBuild
-			// 	const mintes = parseInt((waitNum * 120) / 60); // 等待时间 = 等待人数 * (15(秒)---3分钟的随机数);
-			// 	tipContent(ableToCreate, waitNum, mintes, waitNum * 180, first);
-			// 	setTimeout(()=>{
-			// 		this.gameBuild(fileUpdateResponse, first + 1)
-			// 	}, 10000)
-			// 	this.setGameBuildFalse()
-    		// } else if(ableToCreate == -1) { // 排队人数过多，建议先玩下一关
-    		// 	tipContent(ableToCreate, waitNum, 0, 0, first);
-    		// 	this.setGameBuildFalse()
-    		// } else {
-    		// 	showSnackbar("实训云平台繁忙（繁忙等级：94），请稍后刷新并重试")
-    		// 	this.setGameBuildFalse()
-    		// }
-
-
-    	}).catch((gameBuildError) => {
-    		console.log(gameBuildError);
-    		this.setGameBuildFalse()
-    	})
+		}).catch((gameBuildError) => {
+			console.log(gameBuildError);
+			this.setGameBuildFalse()
+		})
 	}
 	handleResetCodeDialogClose() {
 		this.setState({ resetCodeDialogOpen: false })
@@ -850,26 +725,23 @@ class MainContentContainer extends Component {
 			codeLoading: true
 		})
 		axios.get(url, {
-    		// withCredentials: true,
-    	}).then((res) => {
-    		this.handleResetCodeDialogClose();
-    		if (res.data.status === -1) {
-    			console.error('代码重置失败！');
+			// withCredentials: true,
+		}).then((res) => {
+			this.handleResetCodeDialogClose();
+			if (res.data.status === -1) {
+				console.error('代码重置失败！');
 				this.setState({
 					codeLoading: false
 				})
-    			showSnackbar(res.data.message || '加载初始的代码失败')
-    			return;
-    		}
-   //  		this.setState({
-			// 	codeLoading: false
-			// })
-    		this.updateRepositoryCode(res.data.content, updateCodeMirror)
-    	}).catch(error =>{
-    		this.setState({
+				showSnackbar(res.data.message || '加载初始的代码失败')
+				return;
+			}
+			this.updateRepositoryCode(res.data.content, updateCodeMirror)
+		}).catch(error => {
+			this.setState({
 				codeLoading: false
 			})
-    	})
+		})
 	}
 
 	handleResetPassedCodeDialogClose() {
@@ -885,120 +757,111 @@ class MainContentContainer extends Component {
 		if (challenge.multiPath) {
 			path = path[challenge.pathIndex]
 		}
-		// const url = `/api/v1/games/${game.identifier}/reset_passed_code?path=${path}`;
 		const url = `/tasks/${game.identifier}/reset_passed_code.json?path=${path}`;
 		this.setState({
 			codeLoading: true
 		})
-		axios.get(url
-		// , {
-    		// withCredentials: true,
-    	// }
-		).then((res) => {
-    		this.handleResetPassedCodeDialogClose();
-    		if (res.data.status === -1) {
-    			console.error('passed代码重置失败！')
+		axios.get(url).then((res) => {
+			this.handleResetPassedCodeDialogClose();
+			if (res.data.status === -1) {
+				console.error('passed代码重置失败！')
 				this.setState({
 					codeLoading: false
 				})
-    			showSnackbar(res.data.message || '加载上次通过的代码失败')
-    			return;
-    		}
-    		// 注意，最好是合并到一个setState, 这里分两次setState的话，触发了2次重新渲染
-   //  		this.setState({
-			// 	codeLoading: false
-			// })
-    		this.updateRepositoryCode(res.data.content, updateCodeMirror)
-    	}).catch(error =>{
-    		this.setState({
+				showSnackbar(res.data.message || '加载上次通过的代码失败')
+				return;
+			}
+			this.updateRepositoryCode(res.data.content, updateCodeMirror)
+		}).catch(error => {
+			this.setState({
 				codeLoading: false
 			})
-    	})
+		})
 	}
 
-  	render() {
-  		const { challenge,  output_sets, time_limit, real_time_limit } = this.props;
-  		// TODO 这里直接写死了，game_status在超时时也会返回这句话
-  		let msg = (
-		  	<div>
-		  	{`代码评测超时！本关限定时间为：${real_time_limit}s，`}<br></br>
+	render() {
+		const { challenge, output_sets, time_limit, real_time_limit } = this.props;
+		// TODO 这里直接写死了，game_status在超时时也会返回这句话
+		let msg = (
+			<div>
+				{`代码评测超时！本关限定时间为：${real_time_limit}s，`}<br></br>
 			  请检查代码是否存在死循环或其他耗时操作
 			</div>)
 
-	    return (
-	    	<React.Fragment>
-		        <Dialog
-		          	open={this.state.open}
-								disableEscapeKeyDown={true}
-		          	onClose={this.handleClose}
-		        >
-			       	<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
-		          	<DialogContent>
-			            <DialogContentText id="alert-dialog-description" style={{textAlign: 'center'}}>
-				        	{ msg }
-			            </DialogContentText>
-		          	</DialogContent>
-		          	<DialogActions>
-			            <Button onClick={this.handleClose} color="primary">
-			            	关闭
+		return (
+			<React.Fragment>
+				<Dialog
+					open={this.state.open}
+					disableEscapeKeyDown={true}
+					onClose={this.handleClose}
+				>
+					<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
+					<DialogContent>
+						<DialogContentText id="alert-dialog-description" style={{ textAlign: 'center' }}>
+							{msg}
+						</DialogContentText>
+					</DialogContent>
+					<DialogActions>
+						<Button onClick={this.handleClose} color="primary">
+							关闭
 			            </Button>
-		          	</DialogActions>
-		        </Dialog>
+					</DialogActions>
+				</Dialog>
 
-		        <Dialog
-		          	open={this.state.resetCodeDialogOpen}
-								disableEscapeKeyDown={true}
-		          	onClose={() => this.handleResetCodeDialogClose()}
-		        >
-			       	<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
-		          	<DialogContent>
-			            <div style={{textAlign: 'center'}}>
-			            	你在本文件中修改的内容将丢失<br></br>是否确定重新加载初始代码？
+				<Dialog
+					open={this.state.resetCodeDialogOpen}
+					disableEscapeKeyDown={true}
+					onClose={() => this.handleResetCodeDialogClose()}
+				>
+					<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
+					<DialogContent>
+						<div style={{ textAlign: 'center' }}>
+							你在本文件中修改的内容将丢失<br></br>是否确定重新加载初始代码？
 			            </div>
-		          	</DialogContent>
-		          	<DialogActions>
-			            <Button onClick={() => this.handleResetCodeDialogClose()} color="primary">
-			            	关闭
+					</DialogContent>
+					<DialogActions>
+						<Button onClick={() => this.handleResetCodeDialogClose()} color="primary">
+							关闭
 			            </Button>
-			            <Button variant="raised" onClick={() => this.doResetCode()} color="primary">
-			            	确定
+						<Button variant="raised" onClick={() => this.doResetCode()} color="primary">
+							确定
 			            </Button>
-		          	</DialogActions>
-		        </Dialog>
+					</DialogActions>
+				</Dialog>
 
-		        <Dialog
-						  	disableEscapeKeyDown={true}
-		          	open={this.state.resetPassedCodeDialogOpen}
-		          	onClose={() => this.handleResetPassedCodeDialogClose()}
-		        >
-			       	<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
-		          	<DialogContent>
-			            <div style={{textAlign: 'center'}}>
-			            	你在本关中修改的内容将丢失<br></br>是否确定重新加载上次通过的代码?
+				<Dialog
+					disableEscapeKeyDown={true}
+					open={this.state.resetPassedCodeDialogOpen}
+					onClose={() => this.handleResetPassedCodeDialogClose()}
+				>
+					<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
+					<DialogContent>
+						<div style={{ textAlign: 'center' }}>
+							你在本关中修改的内容将丢失<br></br>是否确定重新加载上次通过的代码?
 			            </div>
-		          	</DialogContent>
-		          	<DialogActions>
-			            <Button onClick={() => this.handleResetPassedCodeDialogClose()} color="primary">
-			            	关闭
+					</DialogContent>
+					<DialogActions>
+						<Button onClick={() => this.handleResetPassedCodeDialogClose()} color="primary">
+							关闭
 			            </Button>
-			            <Button variant="raised" onClick={() => this.doResetPassedCode()} color="primary">
-			            	确定
+						<Button variant="raised" onClick={() => this.doResetPassedCode()} color="primary">
+							确定
 			            </Button>
-		          	</DialogActions>
-		        </Dialog>
+					</DialogActions>
+				</Dialog>
 
-		        <UpdateDrawer {...this.props} fetchRepositoryCode={this.fetchRepositoryCode}></UpdateDrawer>
-		        <MainContent ref="mainContent" mainContentfun={(ref)=>this.mainContentfun(ref)} {...this.props} output_sets={output_sets} {...this.state}
-	      			onRepositoryCodeUpdate={this.onRepositoryCodeUpdate} onRunCodeTest={this.onRunCodeTest}
-	      			codemirrorDidMount={this.codemirrorDidMount} fetchRepositoryCode={this.fetchRepositoryCode}
-	      			showResetCodeDialog={this.showResetCodeDialog} showResetPassedCodeDialog={this.showResetPassedCodeDialog}
-	      			doFileUpdateRequestOnCodeMirrorBlur={this.doFileUpdateRequestOnCodeMirrorBlur} 
+				<UpdateDrawer {...this.props} fetchRepositoryCode={this.fetchRepositoryCode}></UpdateDrawer>
+				<MainContent ref="mainContent" mainContentfun={(ref) => this.mainContentfun(ref)} {...this.props} output_sets={output_sets} {...this.state}
+					onRepositoryCodeUpdate={this.onRepositoryCodeUpdate} onRunCodeTest={this.onRunCodeTest}
+					onEditorFocus={this.onEditorFocus} fetchRepositoryCode={this.fetchRepositoryCode}
+					showResetCodeDialog={this.showResetCodeDialog} showResetPassedCodeDialog={this.showResetPassedCodeDialog}
+					doFileUpdateRequestOnCodeMirrorBlur={this.doFileUpdateRequestOnCodeMirrorBlur}
 					onPathChange={this.onPathChange}
-					  ></MainContent>
-	    	</React.Fragment>
+				></MainContent>
+			</React.Fragment>
 
-	    );
-  	}
+		);
+	}
 }
 
 export default MainContentContainer;
diff --git a/src/modules/page/VNCContainer.js b/src/modules/page/VNCContainer.js
index 7bd39352..bb3c2979 100644
--- a/src/modules/page/VNCContainer.js
+++ b/src/modules/page/VNCContainer.js
@@ -18,7 +18,7 @@ const firstDrawerWidth = 260;
 class VNCContainer extends Component {
 	constructor(props) {
 		super(props)
-		
+
 		this.state = {
 			fileTreeSelectedKeys: [],
 			repositoryCode: '',
@@ -58,18 +58,18 @@ class VNCContainer extends Component {
 		var url = `/myshixuns/${myshixun.identifier}/update_file.json`
 		const codeContent = window.editor_monaco.getValue()
 
-		this.setState({saving: true})
+		this.setState({ saving: true })
 		axios.post(url, {
-				content: codeContent,
-				// 评测的时候传1，其它情况不用传，主要是为了区分是用户自己提交还是自动提交
-				// evaluate: 0,
-				game_id : game.id,
-				path: this.currentPath 
-			}
+			content: codeContent,
+			// 评测的时候传1，其它情况不用传，主要是为了区分是用户自己提交还是自动提交
+			// evaluate: 0,
+			game_id: game.id,
+			path: this.currentPath
+		}
 		).then(res => {
-			this.setState({saving: false})
+			this.setState({ saving: false })
 		}).catch(e => {
-			this.setState({saving: false})
+			this.setState({ saving: false })
 			console.error('update_file error')
 		})
 	}
@@ -78,50 +78,47 @@ class VNCContainer extends Component {
 		const { shixun } = this.props
 		const height = $(window).height() - 130
 
-		const isEditablePath = false;
 		return (
-		<Spin tip={saving ? "保存中..." : "加载中..."} spinning={readingCodeLoading || saving}>
-			<div style={{ height: `${height}px` }}>
-				{/* (isEditablePath ? 'none' : 'block') */}
-				<div className="codemirrorBackground" 
-                        style={{ backgroundImage: `url('${notEditablePathImg}')`, display: (shixun.code_edit_permission ? 'none' : 'block') }}></div>
-				<TPIMonaco
-					{...this.state}
-					codeLoading={readingCodeLoading}
-					repositoryCode={repositoryCode}
-					isEditablePath={shixun.code_edit_permission}
-					shixun={this.props.shixun}
-					doFileUpdateRequestOnCodeMirrorBlur={this.doFileUpdateRequestOnCodeMirrorBlur}
-					onEditBlur={this.onEditBlur}
-				></TPIMonaco>
-			
-			</div>
-		</Spin>);
+			<Spin tip={saving ? "保存中..." : "加载中..."} spinning={readingCodeLoading || saving}>
+				<div style={{ height: `${height}px` }}>
+					<div className="codemirrorBackground"
+						style={{ backgroundImage: `url('${notEditablePathImg}')`, display: (shixun.code_edit_permission ? 'none' : 'block') }}></div>
+					<TPIMonaco
+						{...this.state}
+						codeLoading={readingCodeLoading}
+						repositoryCode={repositoryCode}
+						isEditablePath={shixun.code_edit_permission}
+						shixun={this.props.shixun}
+						doFileUpdateRequestOnCodeMirrorBlur={this.doFileUpdateRequestOnCodeMirrorBlur}
+						onEditBlur={this.onEditBlur}
+					></TPIMonaco>
+
+				</div>
+			</Spin>);
 	}
 	fetchReadRepositoryCode = (path) => {
 		this.currentPath = path;
 		const status = 1
 		const fetchRepoCodeUrl = `/tasks/${this.props.game.identifier}/rep_content.json?path=${path}&status=${status}`
 		this.setState({ readingCodeLoading: true });
-    	axios.get(fetchRepoCodeUrl, {
-    	}).then((fetchReadRepositoryCodeResponse) => {
-			
-			
+		axios.get(fetchRepoCodeUrl, {
+		}).then((fetchReadRepositoryCodeResponse) => {
+
+
 			if (fetchReadRepositoryCodeResponse.data.content || fetchReadRepositoryCodeResponse.data.content == "") {
-				this.setState({ 
+				this.setState({
 					repositoryCode: fetchReadRepositoryCodeResponse.data.content,
 					readingCodeLoading: false
 				})
 			} else {
 				this.setState({ readingCodeLoading: false });
 			}
-			// this.setState({ isEditablePath, currentPath: path });
 
-    	}).catch(error =>{
-    		console.log(error)
+		}).catch(error => {
+			console.log(error)
 			this.setState({ readingCodeLoading: false });
 			this.props.showSnackbar(`服务端异常，请联系管理员！`);
-    	})
+		})
 	}
 	onTreeSelect = (selectedKeys, info) => {
 		const isLeaf = info.node.isLeaf();
@@ -136,12 +133,12 @@ class VNCContainer extends Component {
 			if (nodePath) {
 				const filetype = nodePath.split('.').pop().toLowerCase();
 				if (filetype == 'jpg' || filetype == 'png' || filetype == 'gif' || filetype == 'jpeg'
-						|| filetype == 'jar' || filetype == 'exe'
-						|| filetype == 'doc' || filetype == 'pdf' || filetype == 'xsl' || filetype == 'ppt') {
+					|| filetype == 'jar' || filetype == 'exe'
+					|| filetype == 'doc' || filetype == 'pdf' || filetype == 'xsl' || filetype == 'ppt') {
 					this.props.showSnackbar(`不支持加载${filetype}类型的文件。`)
 					return;
 				}
-				this.fetchReadRepositoryCode(nodePath);	
+				this.fetchReadRepositoryCode(nodePath);
 			} else {
 				console.error('no eventKey:', info.node)
 			}
@@ -162,7 +159,7 @@ class VNCContainer extends Component {
 		// 请确保您的数据已保存（如：版本库代码已推送到服务器）
 		// 是否确认重置？
 		this.props.confirm({
-			content: <div style={{textAlign: 'center'}}>
+			content: <div style={{ textAlign: 'center' }}>
 				<div>桌面系统将恢复到初始状态，您在系统中创建的数据可能会丢失</div>
 				<div>请确保您的数据已保存（如：版本库代码已推送到服务器）</div>
 				<div>是否确认重置？</div>
@@ -179,11 +176,9 @@ class VNCContainer extends Component {
 							vnc_url: response.data.data.vnc_url,
 							vnc_reseting: false
 						})
-					} else {
 					}
-					// this.setState({ isEditablePath, currentPath: path });
 
-				}).catch(error =>{
+				}).catch(error => {
 					console.log(error)
 					this.setState({ vnc_reseting: false });
 					this.props.showSnackbar(`服务端异常，请联系管理员！`);
@@ -196,36 +191,36 @@ class VNCContainer extends Component {
 			},
 		})
 	}
-	
+
 	/*
 	selectedKeys={fileTreeSelectedKeys}
 	onSelect={onTreeSelect}
 	*/
-  	render() {
-  		const { challenge, vnc_url, git_url, showOrHide, isCollapse } = this.props
+	render() {
+		const { challenge, vnc_url, git_url, showOrHide, isCollapse } = this.props
 
-			const _classCtx = this.state.bottomDrawer ? 'btn_test_case_active' : 'btn_test_case';
-			const _classes = this.state.bottomDrawer 
-				? `iconfont icon-xiajiantou btn-arrow` 
-				: 'iconfont icon-shangjiantou btn-arrow';
+		const _classCtx = this.state.bottomDrawer ? 'btn_test_case_active' : 'btn_test_case';
+		const _classes = this.state.bottomDrawer
+			? `iconfont icon-xiajiantou btn-arrow`
+			: 'iconfont icon-shangjiantou btn-arrow';
 		const secondDrawerChildren = this.renderSecondDrawerChildren();
 
-			const _drawClasses = showOrHide
+		const _drawClasses = showOrHide
 			? ('codeEvaluateDrawer code_evaluate_stretch')
 			: (isCollapse ? 'codeEvaluateDrawer active' : 'codeEvaluateDrawer');
-	    return (
-	      	<React.Fragment>
-                <SecondDrawer
+		return (
+			<React.Fragment>
+				<SecondDrawer
 					ref="secondDrawer"
-                    floatText={'版本库'}
+					floatText={'版本库'}
 					maskClosable={false}
-					secondDrawerChildren={secondDrawerChildren}	
+					secondDrawerChildren={secondDrawerChildren}
 					firstDrawerWidth={firstDrawerWidth}
 					getSecondDrawerWidth={this.getSecondDrawerWidth}
 
 					firstDrawerClassName="repoFilesDrawer vncDrawer"
 					secondDrawerClassName="codeInDrawer"
-                >
+				>
 					<style>{`
 						/* 评测结果 */
 						.codeEvaluateDrawer{
@@ -370,8 +365,8 @@ class VNCContainer extends Component {
 						<div style={{ color: '#888888' }}>网址克隆</div>
 						<div>
 							<input value={git_url} readonly={true} style={{ color: '#BABABA', width: '203px', background: 'transparent', border: 'none' }}></input>
-							<i class="iconfont icon-fuzhi font-14 ml10 copybtn" 
-								style={{color: '#4CACFF', cursor: 'pointer', verticalAlign: 'baseline'}} data-clipboard-text={git_url} ></i>
+							<i className="iconfont icon-fuzhi font-14 ml10 copybtn"
+								style={{ color: '#4CACFF', cursor: 'pointer', verticalAlign: 'baseline' }} data-clipboard-text={git_url} ></i>
 						</div>
 					</div>
 					<RepoTree
@@ -381,26 +376,26 @@ class VNCContainer extends Component {
 
 					></RepoTree>
 				</SecondDrawer>
-        {/* <FloatButton className="resetVNC" onClick={this.onResetVNC}>
+				{/* <FloatButton className="resetVNC" onClick={this.onResetVNC}>
 					{this.state.vnc_reseting ? <Icon type="loading" style={{verticalAlign: 'sub'}} />
 							: <i className="iconfont icon-zhongzhi2 font-16 "></i>}
 					<span>重置桌面系统</span>
 				</FloatButton> */}
 				<FloatButton className="resetVNC1" onClick={this.onResetVNC}>
-					{this.state.vnc_reseting ? <Icon type="loading" style={{verticalAlign: 'sub'}} />
-							: <i className="iconfont icon-zhongzhi2 font-24"></i>}
+					{this.state.vnc_reseting ? <Icon type="loading" style={{ verticalAlign: 'sub' }} />
+						: <i className="iconfont icon-zhongzhi2 font-24"></i>}
 					<span>重置实训</span>
 				</FloatButton>
 
-			  	{/* <Spin tip="加载中..." spinning={this.state.vnc_reseting}>
+				{/* <Spin tip="加载中..." spinning={this.state.vnc_reseting}>
 				</Spin> */}
-				
-				
-                <VNCDisplay
-                    {...this.props}
+
+
+				<VNCDisplay
+					{...this.props}
 					key={this.state.displayKey}
 					vnc_url={this.state.vnc_url || this.props.vnc_url}
-                >	
+				>
 					<Spin tip="加载中..." spinning={this.state.vnc_reseting}>
 					</Spin>
 					<Drawer
@@ -420,10 +415,10 @@ class VNCContainer extends Component {
 								const canvas = $('.vncDisply canvas')[0]
 								canvas && canvas.focus()
 							}
-							
+
 						}}
 					>
-						{ this.props.codeEvaluate }
+						{this.props.codeEvaluate}
 					</Drawer>
 					{/* <FloatButton onClick={this.swtichBottomDrawer}
 						className="codeEvaluateFloatButton"
@@ -432,15 +427,15 @@ class VNCContainer extends Component {
 						className={_classCtx}
 						onClick={this.swtichBottomDrawer}
 					> */}
-						{/* <span className="iconfont icon-shangjiantou btn-arrow"></span> */}
-						{/* <span className={_classes}></span> */}
+					{/* <span className="iconfont icon-shangjiantou btn-arrow"></span> */}
+					{/* <span className={_classes}></span> */}
 					{/* </div> */}
 				</VNCDisplay>
 
-                
-		    </React.Fragment>
-	    );
-  	}
+
+			</React.Fragment>
+		);
+	}
 }
 
 const mapStateToProps = (state) => {
diff --git a/src/modules/page/component/ChooseAnswerView.js b/src/modules/page/component/ChooseAnswerView.js
index b40c9650..c8fa8793 100644
--- a/src/modules/page/component/ChooseAnswerView.js
+++ b/src/modules/page/component/ChooseAnswerView.js
@@ -1,43 +1,22 @@
-import React, { Component } from 'react';
-
-import PropTypes from 'prop-types';
-import { withStyles } from 'material-ui/styles';
-
-import Table, { TableBody, TableCell, TableHead, TableRow } from 'material-ui/Table';
-import Paper from 'material-ui/Paper';
-
-import { markdownToHTML } from 'educoder'
-
-
-const styles = theme => ({
-  root: {
-    width: '100%',
-    marginTop: theme.spacing.unit * 3 + 'px !important',
-    overflowX: 'auto',
-  },
-  table: {
-    // minWidth: 300,
-    width: '200px !important',
-    margin: '0 auto',
-  },
-});
+import React from 'react';
+import RenderHtml from '../../../components/render-html';
 
 const ChooseAnswerView = ({ gameAnswer, classes }) => {
-	if (!gameAnswer) {
-		return ''
-	}
-	return (
-		<div>
-              {gameAnswer.map( (n, index) => {
-                return (
-                  <div key={index} className="mb20">
-                    <p>第{index+1}题</p>
-                    <p dangerouslySetInnerHTML={{__html: markdownToHTML(n.answer)}}></p>
-                  </div>
-                );
-              })}
-	    </div>
-		)
+  if (!gameAnswer) {
+    return ''
+  }
+  return (
+    <div>
+      {gameAnswer.map((n, index) => {
+        return (
+          <div key={index} className="mb20">
+            <p>第{index + 1}题</p>
+            <RenderHtml value={n.answer} />
+          </div>
+        );
+      })}
+    </div>
+  )
 }
 
-export default withStyles(styles)( ChooseAnswerView );
+export default ChooseAnswerView;
diff --git a/src/modules/page/component/FloatButton.js b/src/modules/page/component/FloatButton.js
index 7cc8288a..9d6584bd 100644
--- a/src/modules/page/component/FloatButton.js
+++ b/src/modules/page/component/FloatButton.js
@@ -3,22 +3,22 @@ import '../VNC.css'
 const $ = window.$;
 class FloatButton extends Component {
 	componentDidMount() {
-		
+
 
 	}
-	
-  	render() {
-  		const { challenge,  vnc_url, children, className } = this.props
 
-	    return (
-            <div className={`float_button ${className}` } onClick={this.props.onClick}>
-                <style>{`
+	render() {
+		const { challenge, vnc_url, children, className } = this.props
+
+		return (
+			<div className={`float_button ${className}`} onClick={this.props.onClick}>
+				<style>{`
                     
                 `}</style>
-                <span class="text">{children || '版本库'}</span>
-            </div>
-	    );
-  	}
+				<span className="text">{children || '版本库'}</span>
+			</div>
+		);
+	}
 }
 
 export default FloatButton;
diff --git a/src/modules/page/component/TPICodeMirror.css b/src/modules/page/component/TPICodeMirror.css
deleted file mode 100644
index b36d3a88..00000000
--- a/src/modules/page/component/TPICodeMirror.css
+++ /dev/null
@@ -1,80 +0,0 @@
-.CodeMirror-hints {
-  position: absolute;
-  z-index: 10;
-  overflow: hidden;
-  list-style: none;
-
-  margin: 0;
-  padding: 2px;
-
-  -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  border-radius: 3px;
-  border: 1px solid silver;
-
-  background: white;
-  font-size: 90%;
-  font-family: monospace;
-
-  max-height: 20em;
-  overflow-y: auto;
-}
-
-.CodeMirror-hint {
-  margin: 0;
-  padding: 0 4px;
-  border-radius: 2px;
-  white-space: pre;
-  color: black;
-  cursor: pointer;
-}
-
-li.CodeMirror-hint-active {
-  background: #08f;
-  color: white;
-}
-
-
-
-/*setting*/
-.-padding-24{padding:24px}
-.-space-v-24>* {
-    margin-top: 24px;
-}
-.-light {
-  font-weight: 300;
-  color: #4CACFF;
-}
-.settingDrawer .-center {
-  min-height: 36px;
-}
-
-.ide-settings--section {
-  border-bottom:1px solid #F5F6F7;
-  padding:24px;
-}
-
-/*两列key value*/
-.ant-select-dropdown {
-  z-index: 8000 !important;
-}
-.settingDrawer>div[role='document']{
-  top: 50px;
-  width:260px;
-}
-.-space-v-24>*:first-child {
-    margin-top: 0;
-}
-.-justify-m-gt, .-justify-between {
-  justify-content: space-between;
-}
-
-.ide-settings--item-key,.-grey,.-grey-40 {
-  color:#999;
-}
-  
-
-.ide-settings--item-value,.-grey-60 {
-  color:#666;
-}
diff --git a/src/modules/page/component/TPICodeMirror.js b/src/modules/page/component/TPICodeMirror.js
deleted file mode 100644
index 9bfb714d..00000000
--- a/src/modules/page/component/TPICodeMirror.js
+++ /dev/null
@@ -1,533 +0,0 @@
-import React, { Component } from 'react';
-
-import Dialog, {
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
-} from 'material-ui/Dialog';
-import _ from 'lodash'
-import Drawer from 'material-ui/Drawer';
-
-import './TPICodeMirror.css'
-import TPICodeSetting from './TPICodeSetting'
-
-
-import { fromStore, toStore } from 'educoder'
-require('codemirror/lib/codemirror.css');
-// require('codemirror/mode/javascript/javascript');
-// require('codemirror/mode/xml/xml');
-// require('codemirror/mode/markdown/markdown');
-
-function getModeByMirrorName(mirror_name) {
-    let mode = 'javascript'
-    if (mirror_name && mirror_name.length) {
-        for (let i = 0; i < mirror_name.length; i++) {
-            let modeVal = mirrorNameModeMap[mirror_name[i]];
-            if (modeVal) {
-                mode = modeVal;
-                break;
-            }
-        }
-    }
-    return mode;
-}
-const _extraKeys = {"Alt-/": "autocomplete"};
-function createCMOptions(mirror_name, theme) {
-    let mode = getModeByMirrorName(mirror_name)
-
-    let cmOptions = {
-        lineNumbers: true,
-        mode: mode,
-        // theme: "railscasts",
-        // theme: "vs-dark",
-        theme: theme,
-        indentUnit:4,
-        matchBrackets: true,
-        autoRefresh: true,
-        smartIndent: true,//智能换行
-        extraKeys: _extraKeys,
-        autofocus: true,
-        styleActiveLine: true,
-        lint: true, 
-        gutters: ["CodeMirror-linenumbers", "breakpoints", "CodeMirror-lint-markers"]
-    };
-    return cmOptions;
-}
-
-const mirrorNameModeMap = {
-    'JFinal': 'text/x-java',
-    'Java': 'text/x-java',
-    'Kotlin': 'text/x-kotlin',
-    'C/C++' : 'text/x-c++src',
-    'MachineLearning': {
-                name: "python",
-                version: 3,
-                singleLineStringErrors: false
-    },
-    'Python2.7': {
-                name: "python",
-                version: 3,
-                singleLineStringErrors: false
-    },
-    'Python3.6': {
-                name: "python",
-                version: 3,
-                singleLineStringErrors: false
-    },
-}
-
-
-let extend_editor = null;
-let notCallCodeMirrorOnChangeFlag = false;
-
-const $ = window.$;
-
-/*
-    lint的实现，目前只支持javascript\html\css\coffeescript\json的lint，支持的语言版本有待考量
-    底层gutter mark实现使用的还是setGutterMarker接口（参见lint.js的189行）
-
-    红色波浪线实现方式：
-    _cm.markText({line:4, ch:32}, {line:4, ch:40}, {
-        className: "CodeMirror-lint-mark-error",
-        __annotation: {message: "Expected an identifier and instead saw ';'.", severity: "error"}
-    })
-*/
-class TPICodeMirror extends Component {
-
-	constructor(props) {
-		super(props)
-		this.state = {
-            cmFontSize: fromStore('cmFontSize', 16),
-            cmCodeMode: fromStore('cmCodeMode', 'vs-dark'),
-            autoCompleteSwitch: fromStore('autoCompleteSwitch', true),
-		}
-	}
-    onAutoCompleteSwitchChange = () => {
-        extend_editor.setOption({
-            extraKeys: this.state.autoCompleteSwitch ? _extraKeys : {"Ctrl-Alt-/": "autocomplete"}
-        })
-        toStore('autoCompleteSwitch', !this.state.autoCompleteSwitch)
-        this.setState({ autoCompleteSwitch: !this.state.autoCompleteSwitch })
-    }
-	componentDidUpdate(prevProps, prevState, snapshot) {
-        const { game, mirror_name } = this.props
-        if (extend_editor && !_.isEqual(prevProps.mirror_name, mirror_name)) {
-            extend_editor.setOption("mode", getModeByMirrorName(mirror_name));
-        } 
-    }
-	componentDidMount() {
-        let cmOptions = createCMOptions(this.props.mirror_name, this.state.cmCodeMode)
-        extend_editor = window.CodeMirror.fromTextArea(window.$('#extend-challenge-file-edit')[0]
-        	, cmOptions);
-
-        extend_editor.on('beforeChange', (cm,change) => {
-            // if ( ~readOnlyLines.indexOf(change.from.line) ) {
-            //     change.cancel();
-            // }
-            if (change.origin === "setValue") {
-                return;
-            }
-            if (!this.props.isEditablePath) {
-                change.cancel();
-            }
-        });
-
-        extend_editor.on('change', (cMirror) => {
-            // get value right from instance
-            // $('#extend-challenge-file-edit').val(cMirror.getValue());
-            if (notCallCodeMirrorOnChangeFlag === true) {
-                // 避免死循环 onRepositoryCodeUpdate 和 componentWillReceiveProps
-                notCallCodeMirrorOnChangeFlag = false;
-                return;
-            }
-            
-            this.props.onRepositoryCodeUpdate(cMirror.getValue())
-        });
-
-        extend_editor.refresh();
-		// wtf 加了这句后，禁用快捷键唤起autocomplete就生效了。。。
-        extend_editor.setOption('extraKeys', {"Ctrl-Alt-/": "autocomplete"})
-
-        // 拖拽也需要用 ： window.editor_CodeMirror.refresh()
-        window.editor_CodeMirror = extend_editor;	// tpi_html_show需要用到
-
-        this.initHint()
-        this.props.codemirrorDidMount();
-    }
-    initHint() {
-    	window.CodeMirror.showHint && extend_editor.on('keyup', (editor_arg, event) => {
-		    if (event.key === 'ArrowDown' || event.key === 'ArrowUp' || event.key === 'ArrowLeft' 
-		      || event.key === 'ArrowRight' || event.key === 'Enter' || event.key === 'Space'
-		      // 32 空格
-		      || event.key === 'Escape' || event.keyCode === 32 ) { // 避免使用键盘选择hint的时候再次触发
-
-                // TODO 增加的键 ：ctrl+v ctrl+z
-		      return;
-		    }
-            var cursor = extend_editor.getCursor();
-            var lineText = extend_editor.getLine(cursor.line);
-            const lastCharInput = lineText.charAt(cursor.ch - 1).trim()
-            if (lineText && /^[a-zA-Z0-9_]+$/.test(lastCharInput) === true) {
-                this.state.autoCompleteSwitch && extend_editor.showHint(editor_arg);
-            }
-		});
-
-        let languageHints;
-        if (this.props.challenge.isHtml === true) {
-            languageHints = allCssPropValueArray
-        }
-		window.CodeMirror.on(extend_editor, "hinting", (words) => {
-		  // extend_editor.state.needToClearJSHint = true;  // 每次调用完成后，needToClearJSHint会被置为false
-		  var result = window.CodeMirror.hint.anyword(extend_editor)  // 获取当前editor里的单词
-		  
-
-		  extend_editor.state.myhints = languageHints || []
-		  var myhints = extend_editor.state.myhints;
-		  result.list.forEach(function(item) {
-		    if (myhints.indexOf(item) === -1) myhints.push(item)
-		  })
-		})
-
-		window.document.onkeydown = (e) => { 
-         	e=window.event||e;
-         	if(e.keyCode== 83 && e.ctrlKey){ 
-        	   /*延迟，兼容FF浏览器  */
-        	    // setTimeout(function(){
-        		  	// alert('ctrl+s'); 
-        	   	// },1); 
-				this.props.doFileUpdateRequestOnCodeMirrorBlur();
-                return false;      
-   		    }    
-       };
-		 
-		window.CodeMirror.registerHelper(	
-			"hintWords", "javascript", 
-			(
-            // string
-			"charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight " +
-	        "toUpperCase toLowerCase split concat match replace search " +
-            // array
-	        "length concat join splice push pop shift unshift slice reverse sort indexOf " +
-	        "lastIndexOf every some filter forEach map reduce reduceRight " +
-            // Math
-            "sin cos tan abs ceil floor exp max min pow PI random " +
-
-            "console log " +
-	        "prototype apply call bind " +
-			"double float int long short null true false enum super this void auto for register static const friend mutable explicit virtual template typename " +
-	        "break continue return do while if else for instanceof switch case default try catch finally throw throws assert import byte char delete " +
-	        "export operator with " +
-	        "print exec raise lambda private protected public abstract class extends final implements interface native new static " +
-	        "String vector Boolean function").split(" "));
-    }
-
-    componentWillReceiveProps(newProps) {
-
-        if (this.props.codeLoading === true && newProps.codeLoading === false 
-                && newProps.repositoryCode != extend_editor.getValue()) {
-            // newProps.repositoryCode !== this.props.repositoryCode && 
-            notCallCodeMirrorOnChangeFlag = true;
-            
-            
-            // 重要：setState(因获取代码、重置代码等接口引起的调用)调用引起的变化才需要setValue
-            extend_editor.setValue(newProps.repositoryCode)
-
-            // Clears the editor's undo history.
-            extend_editor.clearHistory()
-        }
-    }
-
-    onFontSizeChange = (value) => {
-        toStore('cmFontSize', value),
-
-        this.setState({ cmFontSize: value });
-    } 
-
-    onCodeModeChange = (value) => {
-        toStore('cmCodeMode', value);
-        this.setState({ cmCodeMode: value });
-        window.monaco.editor.setTheme(value);
-    }
-
-	render() {
-		const { repositoryCode, showSettingDrawer, settingDrawerOpen } = this.props;
-		const { cmFontSize } = this.state;
-         
-	    return (
-            <React.Fragment>
-                <Drawer
-                    anchor="right"
-
-                    className="settingDrawer"
-
-                    width={260}
-                    open={settingDrawerOpen}
-                    
-                    onClose={() => showSettingDrawer( false )}
-                >
-                    <TPICodeSetting {...this.props} {...this.state} 
-                        onFontSizeChange={this.onFontSizeChange}
-                        onCodeModeChange={this.onCodeModeChange}
-                        onAutoCompleteSwitchChange={this.onAutoCompleteSwitchChange}
-                         ></TPICodeSetting>
-                </Drawer>
-                <div className="cmWrapper" style={{fontSize: `${cmFontSize}px`}}>
-    	    	  <textarea className = "" id="extend-challenge-file-edit" name="content">{repositoryCode}</textarea>
-                </div>
-            </React.Fragment>
-	    );
-  	}
-}
-
-
-export default ( TPICodeMirror ) ;
-
-// prop     http://css-infos.net/
-const allCssPropertiesArray = 
-`alignment-adjust
-alignment-baseline
-appearance
-azimuth
-background
-background-attachment
-background-clip
-background-color
-background-image
-background-origin
-background-position
-background-repeat
-background-size
-baseline-shift
-bookmark-label
-bookmark-level
-bookmark-target
-border
-border-bottom
-border-bottom-color
-border-bottom-left-radius
-border-bottom-right-radius
-border-bottom-style
-border-bottom-width
-border-clip
-border-collapse
-border-color
-border-image
-border-left
-border-left-color
-border-left-style
-border-left-width
-border-radius
-border-right
-border-right-color
-border-right-style
-border-right-width
-border-spacing
-border-style
-border-top
-border-top-color
-border-top-left-radius
-border-top-right-radius
-border-top-style
-border-top-width
-border-width
-bottom
-box-decoration-break
-box-shadow
-caption-side
-clear
-clip
-color
-column-count
-column-fill
-column-gap
-column-rule
-column-rule-color
-column-rule-style
-column-rule-width
-column-span
-column-width
-columns
-content
-counter-increment
-counter-reset
-crop
-cue
-cue-after
-cue-before
-cursor
-direction
-display
-dominant-baseline
-drop-initial-after-adjust
-drop-initial-after-align
-drop-initial-before-adjust
-drop-initial-before-align
-drop-initial-size
-drop-initial-value
-elevation
-empty-cells
-fit
-fit-position
-float
-float-offset
-font
-font-family
-font-size
-font-size-adjust
-font-stretch
-font-style
-font-variant
-font-weight
-grid-columns
-grid-rows
-hanging-punctuation
-height
-hyphenate-after
-hyphenate-before
-hyphenate-character
-hyphenate-lines
-hyphenate-resource
-hyphens
-icon
-image-orientation
-image-resolution
-inline-box-align
-left
-letter-spacing
-line-height
-line-stacking
-line-stacking-ruby
-line-stacking-shift
-line-stacking-strategy
-list-style
-list-style-image
-list-style-position
-list-style-type
-margin
-margin-bottom
-margin-left
-margin-right
-margin-top
-mark
-mark-after
-mark-before
-marker-offset
-marks
-marquee-direction
-marquee-loop
-marquee-speed
-marquee-style
-max-height
-max-width
-min-height
-min-width
-move-to
-nav-down
-nav-index
-nav-left
-nav-right
-nav-up
-opacity
-orphans
-outline
-outline-color
-outline-offset
-outline-style
-outline-width
-overflow
-overflow-style
-overflow-x
-overflow-y
-padding
-padding-bottom
-padding-left
-padding-right
-padding-top
-page
-page-break-after
-page-break-before
-page-break-inside
-page-policy
-pause
-pause-after
-pause-before
-phonemes
-pitch
-pitch-range
-play-during
-pointer-events
-position
-presentation-level
-punctuation-trim
-quotes
-rendering-intent
-resize
-rest
-rest-after
-rest-before
-richness
-right
-rotation
-rotation-point
-ruby-align
-ruby-overhang
-ruby-position
-ruby-span
-size
-speak
-speak-header
-speak-numeral
-speak-punctuation
-speech-rate
-stress
-string-set
-tab-side
-table-layout
-target
-target-name
-target-new
-target-position
-text-align
-text-align-last
-text-decoration
-text-emphasis
-text-height
-text-indent
-text-justify
-text-outline
-text-overflow
-text-shadow
-text-transform
-text-wrap
-top
-unicode-bidi
-vertical-align
-visibility
-voice-balance
-voice-duration
-voice-family
-voice-pitch
-voice-pitch-range
-voice-rate
-voice-stress
-voice-volume
-volume
-white-space
-white-space-collapse
-widows
-width
-word-break
-word-spacing
-word-wrap
-z-index`.split('\n')
-
-// value    http://www.siliconbaytraining.com/pages/csspv.html
-/*  var array =[]; $('.test tr td:nth-child(2) font').each((index, item) => array = array.concat($(item).text().split(', ')))
-    var mySet = new Set(array)
-    array = Array.from(mySet)
-    var array2=array.filter(item=> {return item.indexOf('(') == -1 && item.length < 18 && item != 'Values'})
-    array2 = array2.map((item) => item.trim().replace('↵',''))
-*/
-const allCssValueArray = "none,inherit,normal,wider,narrower,ultra-condensed,semi-condensed,semi-expanded,expanded,extra-expanded,ultra-expanded,italic,oblique,small-caps,bold,bolder,lighter,xx-small,x-small,small,medium,large,x-large,xx-large,larger,smaller,1em,left,right,center,justify,underline,overline,line-through,blink,capitalize,uppercase,lowercase,scroll,fixed,transparent,top,bottom,repeat,repeat-x,repeat-y,no-repeat,auto,thin,thick,dotted,dashed,solid,double,groove,ridge,inset,outset,disc,circle,square,decimal,lower-roman,upper-roman,lower-alpha,upper-alpha,upper-latin,hebrew,armenian,georgian,cjk-ideographic,hiragana,katakana,hiragana-iroha,katakana-iroh,outside,inside,pre,nowrap,crosshair,default,pointer,move,e-resize,ne-resize,nw-resize,n-resize,se-resize,sw-resize,s-resize,w-resize,text,wait,help,invert,visible,hidden,open-quote,close-quote,no-open-quote,no-close-quote,inherit,none,both,ltr,rtl,inline,block,list-item,run-in,compact,marker,table,inline-table,table-row-group,table-row,table-caption,static,absolute,relative,embed,bidi-override,baseline,sub,super,text-top,middle,text-bottom,collapse,separate,show,hide,once,always,number,percentage,silent,x-soft,soft,loud,x-loud,spell-out,time,percentage,uri,mix,angle,left-side,far-left,center-left,center-right,far-right,right-side,behind,leftwards,rightwards,below,level,above,higher,lower,x-slow,slow,fast,x-fast,faster,slower,frequency,x-low,low,high,x-high,code,digits,continuous".split(',')
-const allCssPropValueArray = allCssPropertiesArray.concat(allCssValueArray)
\ No newline at end of file
diff --git a/src/modules/page/component/TPICodeSetting.js b/src/modules/page/component/TPICodeSetting.js
deleted file mode 100644
index 10ed976a..00000000
--- a/src/modules/page/component/TPICodeSetting.js
+++ /dev/null
@@ -1,215 +0,0 @@
-import React, { Component } from 'react';
-import Switch from 'material-ui/Switch';
-import Tooltip from 'material-ui/Tooltip';
-
-import { Select } from 'antd';
-import 'antd/lib/select/style/index.css'
-
-const Option = Select.Option;
-// import Menu from 'material-ui/Menu';
-// import Select from 'material-ui/Select';
-// import MenuItem from '@material-ui/core/MenuItem';
-
-// const MenuItem = Menu.MenuItem
-const $ = window.$;
-
-class TPICodeSetting extends Component {
-
-
-	render() {
-		const { autoCompleteSwitch, onAutoCompleteSwitchChange, onFontSizeChange 
-			, cmFontSize, cmCodeMode,
-			onCodeModeChange,
-			shixun } = this.props;
-		const task_pass = shixun.task_pass
-		const forbid_copy = shixun.forbid_copy
-		const test_set_permission = shixun.test_set_permission
-	    return (
-    	  	<div className="ide-settings--content">
-			  	<style>{`
-					.ide-settings--section {
-						padding: 16px;
-						padding-bottom: 10px;
-					}  
-					.-padding-24 {
-						padding: 14px;
-					}
-				`}</style>
-    	  		<h3 className="ide-settings--section -light ">
-    	  			代码格式
-    	  		</h3>
-				  {/* 去掉 -space-v-24 class */}
-    	  		<div className="-padding-24 ">
-	    	  		{/*<div className="-layout-h -center -justify-between">
-	    	  			<div className="ide-settings--item-key">Tab Size</div>
-	    	  			<div className="ide-settings--item-value">
-	    	  				<div className="select -view-flat -value">
-	    	  					<div className="-layout-v -start">
-		    	  					<div className="select--wrapper -layout-h -center -justify" >
-			    	  					<div className="select--content -layout-h -center -space-h-4">
-			    	  						1
-			    	  					</div>
-		    	  					</div>
-	    	  					</div>
-	    	  				</div>
-	    	  			</div>
-	    	  		</div>*/}
-							<div className="-layout-h -center -justify-between">
-								<div className="ide-settings--item-key">显示模式</div>
-								<div className="ide-settings--item-value">
-									<div className="select -view-flat -value">
-	    	  					<div className="-layout-v -start">
-	    	  						<div className="select--wrapper -layout-h -center -justify" >
-													<Select 
-														style={{ width: '120px' }}
-														value={cmCodeMode}
-														onChange={onCodeModeChange}
-													>
-														<Option value={'vs'}>白色背景</Option>
-														<Option value={'vs-dark'}>黑色背景</Option>
-							          	</Select>
-	    	  						</div>
-	    	  					</div>
-	    	  				</div>
-								</div>
-							</div>
-	    	  		<div className="-layout-h -center -justify-between">
-	    	  			<div className="ide-settings--item-key">字体大小</div>
-	    	  			<div className="ide-settings--item-value">
-	    	  				<div className="select -view-flat -value">
-	    	  					<div className="-layout-v -start">
-	    	  						<div className="select--wrapper -layout-h -center -justify" >
-							          	<Select
-														style={{ width: '120px' }}
-							          		value={cmFontSize}
-							          		onChange={onFontSizeChange}>
-	    	  								<Option value={12}>12px</Option>
-	    	  								<Option value={14}>14px</Option>
-								            <Option value={16}>16px</Option>
-								            <Option value={18}>18px</Option>
-								            <Option value={20}>20px</Option>
-								            <Option value={22}>22px</Option>
-							          	</Select>
-	    	  						</div>
-	    	  					</div>
-	    	  				</div>
-	    	  			</div>
-	    	  		</div>
-	    	  		{/* <div className="-layout-h -center -justify-between">
-	    	  			<div className="ide-settings--item-key">代码补全</div>
-	    	  			<div className="ide-settings--item-value">
-	    	  				<div className="select -view-flat -value">
-	    	  					<div className="-layout-v -start">
-	    	  						<div className="select--wrapper -layout-h -center -justify" >
-	    	  							<Switch
-								          checked={autoCompleteSwitch}
-								          onChange={onAutoCompleteSwitchChange}
-								          value="checkedB"
-								          color="primary"
-								        />
-	    	  						</div>
-	    	  					</div>
-	    	  				</div>
-	    	  			</div>
-	    	  		</div> */}
-	    	  		{/*<div className="-layout-h -center -justify-between">
-	    	  			<div className="ide-settings--item-key">Auto-brackets</div>
-	    	  			<div className="ide-settings--item-value">
-	    	  				<div className="select -view-flat -value">
-	    	  					<div className="-layout-v -start">
-	    	  						<div className="select--wrapper -layout-h -center -justify" >
-	    	  							4
-	    	  						</div>
-	    	  					</div>
-	    	  				</div>
-	    	  			</div>
-	    	  		</div>*/}
-	    	  	</div>
-	    	  	<h3 className="ide-settings--section -light ">快捷键</h3>
-	    	  	<div className="-padding-24 ">
-	    	  		{/*<div className="-layout-h -center -justify-between">
-	    	  			<div className="ide-settings--item-key">CTRL + Enter</div>
-	    	  			<div className="ide-settings--item-value">Submit Solution</div>
-	    	  		</div>*/}
-	    	  		{/* <div className="-layout-h -center -justify-between">
-	    	  			<div className="ide-settings--item-key">ALT + /</div>
-	    	  			<div className="ide-settings--item-value">代码补全</div>
-	    	  		</div> */}
-	    	  		<div className="-layout-h -center -justify-between">
-	    	  			<div className="ide-settings--item-key">保存代码</div>
-	    	  			<div className="ide-settings--item-value">Ctrl + S</div>
-	    	  		</div>
-					<div className="-layout-h -center -justify-between">
-	    	  			<div className="ide-settings--item-key">唤出快捷键列表</div>
-	    	  			<div className="ide-settings--item-value">F1 / Alt + F1</div>
-	    	  		</div>
-					<div className="-layout-h -center -justify-between">
-	    	  			<div className="ide-settings--item-key">左右缩进</div>
-	    	  			<div className="ide-settings--item-value">Ctrl + ]/[</div>
-	    	  		</div>
-					<div className="-layout-h -center -justify-between">
-	    	  			<div className="ide-settings--item-key">跳到匹配的括号</div>
-	    	  			<div className="ide-settings--item-value">Ctrl + Shift + \</div>
-	    	  		</div>
-					<div className="-layout-h -center -justify-between">
-	    	  			<div className="ide-settings--item-key">转到行首</div>
-	    	  			<div className="ide-settings--item-value">Home</div>
-	    	  		</div>
-					<div className="-layout-h -center -justify-between">
-	    	  			<div className="ide-settings--item-key">转到行尾</div>
-	    	  			<div className="ide-settings--item-value">End</div>
-	    	  		</div>
-	    	  	</div>
-				
-				<h3 className="ide-settings--section -light ">
-    	  			关卡配置信息
-					{/* <a href="https://github.com/Microsoft/monaco-editor/wiki/Monaco-Editor-Accessibility-Guide"></a> */}
-    	  		</h3>
-				<div className="-padding-24 " style={{    marginBottom: '40px' }}>
-					<Tooltip title={ task_pass ? "允许学员跳关挑战" : "不允许学员跳关挑战"} disableFocusListener={true}>                    
-						<div className="-layout-h -center -justify-between">
-							<div className="ide-settings--item-key">跳关</div>
-							<div className="ide-settings--item-value">{ task_pass ? '允许' : '不允许'}</div>
-
-						</div>
-					</Tooltip>
-
-
-                    <Tooltip title={ test_set_permission ? "允许学员通过金币解锁查看测试集内容" 
-							: "不允许学员通过金币解锁查看测试集内容"} disableFocusListener={true}>
-						<div className="-layout-h -center -justify-between">
-							<div className="ide-settings--item-key">测试集解锁</div>
-							<div className="ide-settings--item-value">{ test_set_permission ? '允许' : '不允许'}</div>
-						</div>
-					</Tooltip>
-					
-                    <Tooltip title={ forbid_copy ? "不允许学员复制和粘贴代码" 
-							: "允许学员复制和粘贴代码"} disableFocusListener={true}>
-
-						<div className="-layout-h -center -justify-between">
-							<div className="ide-settings--item-key">代码复制粘贴</div>
-							<div className="ide-settings--item-value">{ !forbid_copy ? '允许' : '不允许'}</div>
-						</div>
-					</Tooltip>
-				</div>
-				
-				{/* <a href="https://github.com/Microsoft/monaco-editor/wiki/Monaco-Editor-Accessibility-Guide"></a> */}
-				{/* <h3 className="ide-settings--section -light ">
-    	  			说明
-    	  		</h3>
-				<div className="-padding-24 " style={{ marginBottom: '75px' }}>
-					<div className="-layout-h -center -justify-between">
-						<div className="ide-settings--item-key">
-							本编辑器和Visual Studio Code的快捷键一致，使用F1或Alt+F1 (Internet Explorer)可以唤出快捷键列表。
-						</div>
-					</div>
-				</div> */}
-
-
-	    	</div>
-	    );
-  	}
-}
-
-
-export default ( TPICodeSetting ) ;
diff --git a/src/modules/page/component/UpdateDrawer.js b/src/modules/page/component/UpdateDrawer.js
index e3a43c88..9f9ac6e9 100644
--- a/src/modules/page/component/UpdateDrawer.js
+++ b/src/modules/page/component/UpdateDrawer.js
@@ -1,19 +1,13 @@
 import React, { Component } from 'react';
-
-import Drawer from 'material-ui/Drawer';
-import PropTypes from 'prop-types';
-
 import './UpdateDrawer.css'
 import { withStyles } from 'material-ui/styles';
 
-import { green } from 'material-ui/colors';
 import { CircularProgress } from 'material-ui/Progress';
 
 import Dialog, {
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
+	DialogActions,
+	DialogContent,
+	DialogTitle,
 } from 'material-ui/Dialog';
 
 import Button from 'material-ui/Button';
@@ -22,37 +16,6 @@ import axios from 'axios';
 import MUIDialogStyleUtil from './MUIDialogStyleUtil'
 const styles = MUIDialogStyleUtil.getTwoButtonStyle()
 
-/*
-	(@tpm_modified || @tpm_script_modified) && @game_challenge.st == 0
-		关卡任务的代码文件有更新啦~<br/>更新操作将保留已完成的评测记录和成绩。<br/>还未完成评测的任务代码，请自行保存！
-		sync_hide_tip_content(this)	立即更新		next_update(this)	稍后再说
-
-	tpm_cases_modified
-		本关<%= @game_challenge.st == 0 ? "测试集" : "答案" %>已更新，您可以重新评测。<br/>本次更新不影响已获得的经验值。
-		sync_hide($(this).parents('.tip-panel-animate-left'))
-		<%= link_to "知道啦", sync_modify_time_myshixun_game_path(@game, :myshixun_id => @myshixun.id), :remote => true,:class => "fl color-orange03",:style => "width:100%;text-align: center;border:none" %>
-	
-	myshixuns/9egrt8q5ju/stages/2pjt9wlbzov7
-	myshixun.identifier 	game.identifier
-	稍后再说
-	$.ajax({
-            url:"/myshixuns/9egrt8q5ju/stages/2pjt9wlbzov7/system_update"
-        });
-
-	
-	立即更新
-    $.ajax({
-            url: "/myshixuns/9egrt8q5ju/stages/2pjt9wlbzov7/sync_codes",
-            dataType: "script",
-            success: function(data){
-            }
-        });
-        // :status => 1, :message :path 
-		// 拿到path后重新调用rep_content即可
-		
-
-    测试集更新  sync_modify_time   提醒状态设置接口
-*/
 class UpdateDrawer extends Component {
 
 	constructor(props) {
@@ -68,24 +31,24 @@ class UpdateDrawer extends Component {
 		// const url = `/api/v1/games/${game.identifier}/sync_modify_time`
 		const url = `/tasks/${game.identifier}/sync_modify_time`
 		axios.get(url, {
-    			// withCredentials: true,
-    		})
-		  	.then((response) => {
+			// withCredentials: true,
+		})
+			.then((response) => {
+
+				if (!updateTogether) {
+					showSnackbar('更新状态已同步。')
+				}
+				updateDialogClose();
+			})
+			.catch((error) => {
+				console.log(error);
+			});
 
-			    if (!updateTogether) {
-			    	showSnackbar('更新状态已同步。')
-			    }
-			    updateDialogClose();
-		  	})
-		  	.catch((error) => {
-		    	console.log(error);
-		  	});
-		
 	}
 	// 稍后再说
 	onNextUpdate(tpmCasesModified) {
 		const { tpm_cases_modified, tpm_modified, tpm_script_modified, challenge, updateDialogClose } = this.props;
-  		let needUpdateScript = (tpm_modified || tpm_script_modified) && challenge.st === 0;
+		let needUpdateScript = (tpm_modified || tpm_script_modified) && challenge.st === 0;
 
 		const { game, myshixun, showSnackbar } = this.props;
 		// const url = `/myshixuns/${myshixun.identifier}/stages/${game.identifier}/system_update`
@@ -94,27 +57,27 @@ class UpdateDrawer extends Component {
 		const url = `/tasks/${game.identifier}/system_update.json?myshixun_id=${myshixun.id}`
 		this.setState({ loading: true })
 		axios.get(url, {
-    			// withCredentials: true,
-    		})
-		  .then((response) => {
-			this.setState({ loading: false })
+			// withCredentials: true,
+		})
+			.then((response) => {
+				this.setState({ loading: false })
 
 
-			    if (tpmCasesModified) {
-			    	this.onCasesModified(true)	
-			    }
-			    updateDialogClose(true);
-		  	})
-		  	.catch((error) => {
-		    	console.log(error);
-		  	});
+				if (tpmCasesModified) {
+					this.onCasesModified(true)
+				}
+				updateDialogClose(true);
+			})
+			.catch((error) => {
+				console.log(error);
+			});
 	}
 
 	// tpmCasesModified 如果为true，则需要调用后台接口置状态，下次就不用提醒了
 	// 立即更新
 	onUpdateNow(tpmCasesModified) {
 		const { tpm_cases_modified, tpm_modified, tpm_script_modified, challenge, updateDialogClose } = this.props;
-  		let needUpdateScript = (tpm_modified || tpm_script_modified) && challenge.st === 0;
+		let needUpdateScript = (tpm_modified || tpm_script_modified) && challenge.st === 0;
 
 		const { game, myshixun, showSnackbar, updateChallengePath, fetchRepositoryCode } = this.props;
 		if (needUpdateScript) {
@@ -122,35 +85,35 @@ class UpdateDrawer extends Component {
 
 			const url = `/tasks/${game.identifier}/sync_codes.json`
 			axios.get(url, {
-	    			// withCredentials: true,
-	    		})
-			  .then((response) => {
+				// withCredentials: true,
+			})
+				.then((response) => {
 					this.setState({ loading: false })
 
-			  		const { path, status } = response.data;
-				  	if (status === -1) {
-				  		showSnackbar(response.data.message || '更新失败，服务端错误')
-				  	} else if (response.data) {
-				  		if (path) {
-				  			updateChallengePath(path);
-				  			fetchRepositoryCode()
-				  		}
-				  		updateDialogClose(false, true);
-				  		showSnackbar('更新成功，正在为您重新加载代码...')
-				  		
-				    }
+					const { path, status } = response.data;
+					if (status === -1) {
+						showSnackbar(response.data.message || '更新失败，服务端错误')
+					} else if (response.data) {
+						if (path) {
+							updateChallengePath(path);
+							fetchRepositoryCode()
+						}
+						updateDialogClose(false, true);
+						showSnackbar('更新成功，正在为您重新加载代码...')
 
-				    if (tpmCasesModified) {
-				    	this.onCasesModified(true)
-				    }
-			  	})
-			  	.catch((error) => {
+					}
+
+					if (tpmCasesModified) {
+						this.onCasesModified(true)
+					}
+				})
+				.catch((error) => {
 					this.setState({ loading: false })
 
-			  		// showSnackbar('更新失败，请求异常')
-			    	console.log(error);
-			  	});
-		}		
+					// showSnackbar('更新失败，请求异常')
+					console.log(error);
+				});
+		}
 	}
 
 	handleDialogClose() {
@@ -162,66 +125,59 @@ class UpdateDrawer extends Component {
 	render() {
 		const { myshixun, showUpdateDialog, classes } = this.props;
 		const { loading } = this.state;
-		// system_tip 为true时，只有点击消息通知按钮时才弹框
-		// !myshixun || myshixun.system_tip === true ||
-  		// if ( showUpdateDialog === false) {
-  		// 	return ''
-  		// }
+		const { tpm_cases_modified, tpm_modified, tpm_script_modified, challenge } = this.props;
+		let needUpdateScript = (tpm_modified || tpm_script_modified) && challenge.st === 0;
 
-  		const { tpm_cases_modified, tpm_modified, tpm_script_modified, challenge } = this.props;
-  		let needUpdateScript = (tpm_modified || tpm_script_modified) && challenge.st === 0;
+		return (
 
-  		// 立即更新		稍后再说
-	    return (
-
-	        <Dialog
-	        	disableBackdropClick={true}
-	        	className="updateDialog"
-	          	open={ showUpdateDialog && (tpm_cases_modified || needUpdateScript) }
-	          	onClose={() => this.handleDialogClose()}
-	        >	
-		       	<DialogTitle id="alert-dialog-title">{"更新通知"}</DialogTitle>
-	          	<DialogContent id="dialog-content">
-		            <div style={{textAlign: 'center'}}>
-		            	{ tpm_cases_modified && needUpdateScript ? 
-		            		<div>
-		            			关卡任务的代码文件和测试集有更新啦~<br></br>更新操作将保留已完成的评测记录和成绩。<br></br>还未完成评测的任务代码，请自行保存！
+			<Dialog
+				disableBackdropClick={true}
+				className="updateDialog"
+				open={showUpdateDialog && (tpm_cases_modified || needUpdateScript)}
+				onClose={() => this.handleDialogClose()}
+			>
+				<DialogTitle id="alert-dialog-title">{"更新通知"}</DialogTitle>
+				<DialogContent id="dialog-content">
+					<div style={{ textAlign: 'center' }}>
+						{tpm_cases_modified && needUpdateScript ?
+							<div>
+								关卡任务的代码文件和测试集有更新啦~<br></br>更新操作将保留已完成的评测记录和成绩。<br></br>还未完成评测的任务代码，请自行保存！
 		            		</div>
-		            		 :
-		            		tpm_cases_modified ? 
-		            		<div>
-		            			本关{ challenge.st === 0 ? '测试集' : '答案' }已更新，您可以重新评测。<br></br>本次更新不影响已获得的经验值。
-		            		</div> : 
-		            		<div>
-		            			关卡任务的代码文件有更新啦~<br></br>更新操作将保留已完成的评测记录和成绩。<br></br>还未完成评测的任务代码，请自行保存！
+							:
+							tpm_cases_modified ?
+								<div>
+									本关{challenge.st === 0 ? '测试集' : '答案'}已更新，您可以重新评测。<br></br>本次更新不影响已获得的经验值。
+		            		</div> :
+								<div>
+									关卡任务的代码文件有更新啦~<br></br>更新操作将保留已完成的评测记录和成绩。<br></br>还未完成评测的任务代码，请自行保存！
 		            		</div>
-		            	}
-		            </div>
-	          	</DialogContent>
-	          	<DialogActions id="dialog-actions" >
-	          		{ needUpdateScript ? 
-	          		<React.Fragment>
-			            <Button 
-			            	disabled={loading}
-			            	className={ "nextUpdate " + classes.button + ' ' + classes.buttonGray} onClick={() => this.onNextUpdate(tpm_cases_modified)} color="primary" >
-			            	稍后再说
+						}
+					</div>
+				</DialogContent>
+				<DialogActions id="dialog-actions" >
+					{needUpdateScript ?
+						<React.Fragment>
+							<Button
+								disabled={loading}
+								className={"nextUpdate " + classes.button + ' ' + classes.buttonGray} onClick={() => this.onNextUpdate(tpm_cases_modified)} color="primary" >
+								稍后再说
 			            </Button>
-			            <Button 
-			            	disabled={loading}
-			            	variant="raised" onClick={() => this.onUpdateNow(tpm_cases_modified)} color="primary" className={"updateNow " + classes.button}>
-			            	立即更新
+							<Button
+								disabled={loading}
+								variant="raised" onClick={() => this.onUpdateNow(tpm_cases_modified)} color="primary" className={"updateNow " + classes.button}>
+								立即更新
 			            </Button>
-			            {loading && <CircularProgress size={24} className={classes.buttonProgress} />}
-		            </React.Fragment> : 
-		            <Button onClick={() => this.onCasesModified()} color="primary" className={ "nextUpdate " + classes.button}>
-		            	知道啦
+							{loading && <CircularProgress size={24} className={classes.buttonProgress} />}
+						</React.Fragment> :
+						<Button onClick={() => this.onCasesModified()} color="primary" className={"nextUpdate " + classes.button}>
+							知道啦
 		            </Button>
-		        	}
- 	          	</DialogActions>
-	        </Dialog>
-	    );
-  	}
+					}
+				</DialogActions>
+			</Dialog>
+		);
+	}
 }
 
 
-export default withStyles(styles)( UpdateDrawer ) ;
+export default withStyles(styles)(UpdateDrawer);
diff --git a/src/modules/page/component/WebSSHTimer.js b/src/modules/page/component/WebSSHTimer.js
index e8388734..0294b731 100644
--- a/src/modules/page/component/WebSSHTimer.js
+++ b/src/modules/page/component/WebSSHTimer.js
@@ -11,10 +11,10 @@ import { CircularProgress } from 'material-ui/Progress';
 import Tooltip from 'material-ui/Tooltip';
 
 import Dialog, {
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
+	DialogActions,
+	DialogContent,
+	DialogContentText,
+	DialogTitle,
 } from 'material-ui/Dialog';
 
 import Button from 'material-ui/Button';
@@ -53,11 +53,11 @@ class WebSSHTimer extends Component {
 		super(props)
 		this.startTimeRemain = 0;
 		// 用户点击取消时，变量设置为true
-		this.isUserChoseNotConcern= false
+		this.isUserChoseNotConcern = false
 		this.state = {
 			showTimer: true,	//  倒计时为0时，设置为false
 			loading: false,
-		  	dialogOpen: false
+			dialogOpen: false
 
 		}
 	}
@@ -84,21 +84,21 @@ class WebSSHTimer extends Component {
 					this.forceUpdate()
 				}
 				return;
-			} 
+			}
 			let _timeRemain = this.timeRemain;
 			$('.webSSHTimer').html(moment(_timeRemain).format('mm:ss'))
 			_timeRemain -= 1000
 			this.timeRemain = _timeRemain;
-			if (this.state.dialogOpen && _timeRemain % ( 60 * 1000 ) === 0) {	// 
+			if (this.state.dialogOpen && _timeRemain % (60 * 1000) === 0) {	// 
 				this.forceUpdate()
 			}
 			// 余5分钟的时候弹框通知		// 从代码文件切换回命令行时，要查看该时间
 			if (_timeRemain === five_min) {
-				
+
 				this.setState({
-		  			dialogOpen: true
-		  		})		
-				
+					dialogOpen: true
+				})
+
 			} else if (_timeRemain <= 0) {
 				// 到时间了，触发删除pod的请求
 				clearInterval(this.intervalHandler);
@@ -109,7 +109,7 @@ class WebSSHTimer extends Component {
 				this.props.setSSHClosed(true)
 				this.setState({
 					showTimer: false,
-  					dialogOpen: false	// 弹框可能未被关闭
+					dialogOpen: false	// 弹框可能未被关闭
 				})
 			}
 
@@ -117,7 +117,7 @@ class WebSSHTimer extends Component {
 	}
 	closeWebsshSocket = () => {
 		// 非iframe模式使用
-		window.postMessage({tp: 'close_ssh_cocket'}, "*");
+		window.postMessage({ tp: 'close_ssh_cocket' }, "*");
 
 		/**
 			启用iframe模式需要改的地方：
@@ -151,13 +151,13 @@ class WebSSHTimer extends Component {
 		const { game } = this.props;
 		// const url = `/api/v1/games/${game.identifier}/close_webssh`
 		const url = `/tasks/${game.identifier}/close_webssh.json`
-        axios.get(url, { },
-            {
-                // withCredentials: true
-            }
+		axios.get(url, {},
+			{
+				// withCredentials: true
+			}
 		).then((response) => {
-			if (response.data.status === 1) { 
-				
+			if (response.data.status === 1) {
+
 			}
 			callback && callback(response)
 		}).catch((error) => {
@@ -184,45 +184,20 @@ class WebSSHTimer extends Component {
 		// 发现非iframe ssh也能使用postMessage
 		// iframe时使用的消息机制
 		// if (isSSHInIframe === true) {
-			window.addEventListener('message', (e) => {
-				if (this.state.showTimer === false) { // 已经触发了close_webssh
-					return;
-				}
-				if(e.data.tp === "setSSHConnectStatus"){
-					this.props.reInitSsh(window.$, null, true)
-					
-					// let windows = this.getWebsshWindows();
-					// for (let i = 0; i < windows.length; i++) {
-					// 	let _w = windows[i].contentWindow
-					// 	_w && _w.postMessage({tp: 'reload'}, "*");
-					// }
-					
-				} else if (e.data.tp === "sshWorking") {
-					// this.startTimeRemain = 60;
-					// this.forceUpdate();
-				}
-			});
-		// } else {
-		// 	// 非iframe时使用的消息机制
-		// 	on('setSSHConnectStatus', () => {
-		// 		// 需要reload
-		// 		this.props.reInitSsh(window.$, null, true)
-		// 	})
+		window.addEventListener('message', (e) => {
+			if (this.state.showTimer === false) { // 已经触发了close_webssh
+				return;
+			}
+			if (e.data.tp === "setSSHConnectStatus") {
+				this.props.reInitSsh(window.$, null, true)
 
-		// 	on('sshWorking', () => {
-		// 		this.startTimeRemain = 60;
-		// 		this.forceUpdate()
-		// 	})
-		// }
+
+			} else if (e.data.tp === "sshWorking") {
+			}
+		});
 	}
 	getWebsshWindows = () => {
 		return $('.game_webssh')
-		// var i = $('#game_webssh')[0]
-		// var _w;
-		// if (i) {
-		// 	_w = i.contentWindow
-		// }
-		// return _w;
 	}
 	componentWillUnmount() {
 		this.intervalHandler && clearInterval(this.intervalHandler);
@@ -236,7 +211,7 @@ class WebSSHTimer extends Component {
 		// 用户不续时，移除interval，无需再显示Timer
 		// 用户不续时，隐藏dialog
 		this.setState({
-		// showTimer: false,
+			// showTimer: false,
 			dialogOpen: false
 		})
 		this.isUserChoseNotConcern = true
@@ -271,83 +246,89 @@ class WebSSHTimer extends Component {
 		const { myshixun, showUpdateDialog, classes } = this.props;
 		const { showTimer, loading, dialogOpen } = this.state;
 
-	    return (
-	    	<React.Fragment>
-	    		<Dialog
-	        	disableBackdropClick={true}
-	        	className="updateDialog"
-	          	open={ dialogOpen && this.isUserChoseNotConcern === false }
-	          	onClose={() => this.handleDialogClose()}
-	        >	
-		       	<DialogTitle id="alert-dialog-title">{"命令行连接时长提醒"}</DialogTitle>
-						<DialogContent id="dialog-content">
-							<div style={{textAlign: 'center'}}>
-								命令行将于 {moment(this.timeRemain).format('m')} 分钟后中断，需要延长使用时间吗？
+		return (
+			<React.Fragment>
+				<Dialog
+					disableBackdropClick={true}
+					className="updateDialog"
+					open={dialogOpen && this.isUserChoseNotConcern === false}
+					onClose={() => this.handleDialogClose()}
+				>
+					<DialogTitle id="alert-dialog-title">{"命令行连接时长提醒"}</DialogTitle>
+					<DialogContent id="dialog-content">
+						<div style={{ textAlign: 'center' }}>
+							命令行将于 {moment(this.timeRemain).format('m')} 分钟后中断，需要延长使用时间吗？
 							</div>
-						</DialogContent>
-						<DialogActions id="dialog-actions">
-							<React.Fragment>
-								<Button 
-									disabled={loading}
-									className={ "nextUpdate " + classes.button + ' ' + classes.buttonGray} onClick={() => this.onNope()} color="primary" >
-									不需要
+					</DialogContent>
+					<DialogActions id="dialog-actions">
+						<React.Fragment>
+							<Button
+								disabled={loading}
+								className={"nextUpdate " + classes.button + ' ' + classes.buttonGray} onClick={() => this.onNope()} color="primary" >
+								不需要
 								</Button>
-								<Button 
-									disabled={loading}
-									variant="raised" onClick={() => this.onOK()} color="primary" className={"updateNow " + classes.button}>
-									立即延长
+							<Button
+								disabled={loading}
+								variant="raised" onClick={() => this.onOK()} color="primary" className={"updateNow " + classes.button}>
+								立即延长
 								</Button>
-								{/* loading && <CircularProgress size={24} className={classes.buttonProgress} /> */}
-							</React.Fragment>
+							{/* loading && <CircularProgress size={24} className={classes.buttonProgress} /> */}
+						</React.Fragment>
 						}
 						</DialogActions>
-	        </Dialog>
-	    	
-			<Tooltip title="中断命令行连接的倒计时">
-		        {/* <span className="webSSHTimer" 
+				</Dialog>
+
+				<Tooltip title="中断命令行连接的倒计时">
+					{/* <span className="webSSHTimer" 
 		        	style={{ display: (showTimer && this.props.showTimerProp === true &&
 						this.startTimeRemain <= 0 ? 'inline-block' : 'none')}}>
 		        	
 		        </span> */}
-				<a href="javascript:void(0)" className="iconButton" 
-					style={{ display: (showTimer && this.props.showTimerProp === true &&
-						this.startTimeRemain <= 0 ? 'inline-block' : 'none'),
-						cursor: 'default'}} >
-					<i className="iconfont icon-shijian font-16 "></i>
-					<span className="webSSHTimer"></span>
-				</a>
-	        </Tooltip>
+					<a className="iconButton"
+						style={{
+							display: (showTimer && this.props.showTimerProp === true &&
+								this.startTimeRemain <= 0 ? 'inline-block' : 'none'),
+							cursor: 'default'
+						}} >
+						<i className="iconfont icon-shijian font-16 "></i>
+						<span className="webSSHTimer"></span>
+					</a>
+				</Tooltip>
 
-			{ this.props.showTimerProp === true && showTimer === true && 
-				<Popconfirm 
-					title={<React.Fragment><p>实验环境将恢复到初始状态，</p><p>是否确认重置实验环境?</p></React.Fragment>} 
-					placement="bottom"
-					onConfirm={this.resetSsh} okText="确定" cancelText="取消">
-					
-						<a href="javascript:void(0)" className="iconButton" >
+				{this.props.showTimerProp === true && showTimer === true &&
+					<Popconfirm
+						title={<React.Fragment><div>实验环境将恢复到初始状态，</div><div>是否确认重置实验环境?</div></React.Fragment>}
+						placement="bottom"
+						onConfirm={this.resetSsh} okText="确定" cancelText="取消">
+
+						<a className="iconButton" >
 							<i className="iconfont icon-zhongzhi2 font-16 "></i>
-							<span style={{ 	userSelect: 'none', verticalAlign: 'middle',
-    										fontSize: '13px', marginLeft: '2px' }}>
-								 重置命令行</span>
+							<span style={{
+								userSelect: 'none', verticalAlign: 'middle',
+								fontSize: '13px', marginLeft: '2px'
+							}}>
+								重置命令行</span>
 						</a>
-				</Popconfirm>
-			 }
-			 {/* <Tooltip title={ ""} disableFocusListener={true}>
+					</Popconfirm>
+				}
+				{/* <Tooltip title={ ""} disableFocusListener={true}>
 					</Tooltip> */}
-			
-	        { showTimer === false && this.props.showTimerProp === true && 
-                <a href="javascript:void(0)" className="iconButton" onClick={this.reInitSsh} >
-                    <i className="iconfont icon-congshulianjie font-16 "></i>
-					<span style={{ 	userSelect: 'none', verticalAlign: 'middle',
-							fontSize: '13px', marginLeft: '2px' }}>
-						重连命令行</span>
-                </a>
-            }
-			{/* <Tooltip title={ "命令行重连"} disableFocusListener={true}></Tooltip> */}
-			
-				</React.Fragment>
-	    );
-  	}
+
+				{showTimer === false && this.props.showTimerProp === true &&
+					<a className="iconButton" onClick={this.reInitSsh} >
+						<i className="iconfont icon-congshulianjie font-16 "></i>
+						<span style={{
+							userSelect: 'none', verticalAlign: 'middle',
+							fontSize: '13px', marginLeft: '2px'
+						}}>
+							重连命令行</span>
+					</a>
+				}
+				{/* <Tooltip title={ "命令行重连"} disableFocusListener={true}></Tooltip> */}
+
+			</React.Fragment>
+		);
+	}
 }
 
-export default withStyles(styles) ( WebSSHTimer ) ;
+export default withStyles(styles)(WebSSHTimer);
diff --git a/src/modules/page/component/monaco/TPIMonaco.js b/src/modules/page/component/monaco/TPIMonaco.js
index 90676505..1e7132fc 100644
--- a/src/modules/page/component/monaco/TPIMonaco.js
+++ b/src/modules/page/component/monaco/TPIMonaco.js
@@ -1,558 +1,69 @@
-import React, { Component } from 'react';
-
-import Dialog, {
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
-} from 'material-ui/Dialog';
-import _ from 'lodash'
-import Drawer from 'material-ui/Drawer';
-
-import './TPIMonaco.css'
-import TPICodeSetting from '../TPICodeSetting'
-
-import * as monaco from 'monaco-editor'
-
+import React, { Component } from 'react'
 
+import TPICodeSetting from '../tpi-code-setting'
 import { fromStore, toStore } from 'educoder'
-import './TPIMonacoConfig'
-import { isThisSecond } from 'date-fns';
-
-// https://microsoft.github.io/monaco-editor/playground.html#customizing-the-appearence-exposed-colors
-monaco.editor.defineTheme('myCoolTheme', {
-      base: 'vs', // vs、vs-dark、hc-black
-      inherit: true,
-      rules: [
-        { token: 'green', background: 'FF0000', foreground: '00FF00', fontStyle: 'italic'},
-        { token: 'red', foreground: 'FF0000' , fontStyle: 'bold underline'},
-        { background: '#121c23' },
-        // { foreground: 'FFFFFF' }
-      ],
-      // editor_monaco._themeService._knownThemes.get('myCoolTheme')
-      colors: {
-        // 'editor.foreground': '#FFFFFF',
-        'editor.background': '#121c23',
-
-        // 'editor.selectionHighlightBorder': '#ffffff',
-        // 'input.border': '#ffffff',
-        'editor.lineHighlightBorder': '#222c34',        // .current-line
-
-        // 'editor.selectionBackground': '#FFFF0030',
-        // 'editor.selectionHighlightBackground' :'#0000FFFF',
-      }
-});
-
-const $ = window.$;
-function loadMonacoResouce(callback) {
-    let _url_origin = ``;
-    let prefix = 'react/build'
-    if (window.location.port == 3007) {
-        prefix = ''
-    } else {
-        // _url_origin = `https://testeduplus2.educoder.net/`;
-		   	_url_origin  = 'http://pre-newweb.educoder.net';
-    }
-    const $ = window.$;
-
-    if (!window['monaco']) {
-        // How to import this library in a create-react-app?
-        // https://github.com/Microsoft/monaco-editor/issues/82
-        // window.require = { paths: { 'vs': '../node_modules/monaco-editor/min/vs' } };
-        // window.require = { paths: { 'vs': `${_url_origin}${prefix}/js/monaco/vs` } };
-
-        // $('head').append($('<link rel="stylesheet" type="text/css" />')
-        //     .attr('href', `${_url_origin}${prefix}/js/monaco/vs/editor/editor.main.css`));
-
-        // $.ajaxSetup({
-        //     cache: true
-        // });
-        // $.when(
-
-        //     // $.getScript( `${_url_origin}${prefix}/js/monaco/vs/language/typescript/tsMode.js` ),
-        //     // $.getScript( `${_url_origin}${prefix}/js/monaco/vs/basic-languages/javascript/javascript.js` ),
-        //     $.getScript( `${_url_origin}${prefix}/js/monaco/vs/basic-languages/python/python.js` ),
-        //     // $.getScript( `${_url_origin}${prefix}/js/monaco/vs/language/typescript/tsWorker.js` ),
-
-        //     $.getScript(  `${_url_origin}${prefix}/js/monaco/vs/loader.js` ),
-        //     $.getScript( `${_url_origin}${prefix}/js/monaco/vs/editor/editor.main.nls.js` ),
-        //     $.getScript( `${_url_origin}${prefix}/js/monaco/vs/editor/editor.main.js` ),
-        //     $.Deferred(function( deferred ){
-        //         console.log('Deferred')
-
-        //         // TODO 暂时放这里
-        //         $( deferred.resolve );
-        //         checkIfLoaded(callback);
-
-        //     })
-        // ).done(function(){
-        //     debugger;
-        //     // TODO 没执行到这里
-        //     console.log('done done done ')
-        //     //place your code here, the scripts are all loaded
-        //     // callback && callback()
-        // });
-
-        // require.config({ paths: { 'vs': `/monaco/vs` }});
-
-        // require(['/vs/editor/editor.main'], function() {
-            callback && callback()
-            var editor = monaco.editor.create(document.getElementById('container'), {
-                value: [
-                    'function x() {',
-                    '\tconsole.log("Hello world!");',
-                    '}'
-                ].join('\n'),
-                language: 'javascript'
-            });
-        // });
-
-    } else {
-        callback && callback()
-    }
-}
-function checkIfLoaded (callback) {
-    if (window.monaco && window.monaco.editor) {
-        $.ajaxSetup({
-            cache: false
-        });
-        callback && callback()
-    } else {
-        console.log('check again 2s later..')
-        setTimeout(() => {
-            checkIfLoaded(callback)
-        }, 2000);
-    }
-}
-
-/*
-    language
-    javascript css less scss html typescript
-    java ruby vb r python php perl go cpp csharp
-    sql pgsql mysql
-    swift objective-c
-    shell
-    redis
-    xml yaml
-    markdown
-
-    'JFinal': 'text/x-java',
-    'Java': 'text/x-java',
-    'Kotlin': 'text/x-kotlin',
-    'C/C++' : 'text/x-c++src',
-    'MachineLearning': {
-                name: "python",
-                version: 3,
-                singleLineStringErrors: false
-    },
-    'Python2.7': {
-                name: "python",
-                version: 3,
-                singleLineStringErrors: false
-    },
-    'Python3.6': {
-                name: "python",
-                version: 3,
-                singleLineStringErrors: false
-    },
-*/
-const mirror2LanguageMap = {
-    'JFinal': 'java',
-    'Java': 'java',
-    'JavaWeb': 'java',
-    'Kotlin': 'java',
-
-    'Html': 'html',
-    'Css': 'css',
-    'Javascript': 'javascript',
-    'JavaScript': 'javascript',
-
-    'C/C++': 'cpp',
-    'MachineLearning': 'python',
-    'Python2.7': 'python',
-    'Python3.6': 'python',
-
-    'C#': 'csharp',
-    'R': 'r'
-
-}
-function getLanguageByMirrorName(mirror_name) {
-    let lang = 'javascript'
-    if (mirror_name && mirror_name.length) {
-        // 需要倒着遍历， html、css的实训，主评测语言环境是python，小类别是html或css
-        // TODO http://localhost:3007/tasks/hmcwa3g8typ5?debug=t   ["Python3.6", "VNC", "Html"]
-        for (let i = mirror_name.length - 1; i >= 0; i--) {
-            let languageVal = mirror2LanguageMap[mirror_name[i]];
-            if (languageVal) {
-                lang = languageVal;
-                break;
-            }
-        }
-    }
-    return lang;
-}
-
-let notCallCodeMirrorOnChangeFlag = false;
+import { Drawer } from 'antd'
+import MonacoEditor from '../../../../components/monaco-editor'
 
 /**
     props :
         mirror_name  决定语言
         isEditablePath
         repositoryCode
-
         codemirrorDidMount
-
         shixun.forbid_copy
-
         showSettingDrawer, settingDrawerOpen
 */
 class TPIMonaco extends Component {
 
-	constructor(props) {
-		super(props)
-
-        loadMonacoResouce();
-		this.state = {
+    constructor(props) {
+        super(props)
+        this.state = {
             cmFontSize: fromStore('cmFontSize', 16),
-            cmCodeMode: fromStore('cmCodeMode', 'vs-dark'),
-            autoCompleteSwitch: fromStore('autoCompleteSwitch', true),
+            cmCodeMode: fromStore('cmCodeMode', 'vs-dark')
         }
-	}
-
-	componentDidUpdate(prevProps, prevState, snapshot) {
-        const { mirror_name } = this.props
-        const editor_monaco = this.editor_monaco;
-        if (editor_monaco && !_.isEqual(prevProps.mirror_name, mirror_name)) {
-            // TODO 后期考虑加入，根据文件类型的不同，使用不同的lang
-            const lang = getLanguageByMirrorName(mirror_name);
-            // https://github.com/Microsoft/monaco-editor/issues/539
-            window.monaco.editor.setModelLanguage(editor_monaco.getModel(), lang)
-        } else if (prevProps.isEditablePath != this.props.isEditablePath) {
-            // 当前文件是否可编辑
-            if (this.props.isEditablePath || this.props.shixun && this.props.shixun.code_edit_permission == true) {
-                editor_monaco.updateOptions({readOnly: false})
-            } else {
-                editor_monaco.updateOptions({readOnly: true})
-            }
-
-        } else if (editor_monaco && prevProps.codeLoading === true && this.props.codeLoading === false
-                ) {
-            if (this.props.repositoryCode != editor_monaco.getValue()) {
-                // newProps.repositoryCode !== this.props.repositoryCode &&
-                notCallCodeMirrorOnChangeFlag = true;
-
-                // 重要：setState(因获取代码、重置代码等接口引起的调用)调用引起的变化才需要setValue
-                editor_monaco.setValue(this.props.repositoryCode)
-            }
-
-            // 代码没变也需要layout，可能从命令行自动切回了代码tab
-            editor_monaco.layout();
-
-            // Clears the editor's undo history.
-            // TODO
-            // extend_editor.clearHistory()
-        }
-        editor_monaco.layout();
-    }
-    componentWillUnmount() {
-        // 注意销毁，不然会出现不能编辑的bug
-        this.editor_monaco && this.editor_monaco.dispose()
     }
 
-	componentDidMount() {
-        checkIfLoaded(() => {
-            let value = [
-                'define([], function() {',
-                '\treturn ({p1, p2}) => {',
-                '\t\treturn Promise.resolve("Hello, World");',
-                '\t};',
-                '});'
-            ].join('\n');
-            // value = [
-            //         'function x() {',
-            //         '\tconsole.log("Hello world!");',
-            //         '}'
-            //     ].join('\n'),
-            value =  "<h1>Hello</h1>↵<!-- ********* Begin ********* -->↵    ↵    ↵<!-- ********* End ********* -->"
-
-            value = this.props.repositoryCode
-
-            const height =  $('#games_repository_contents').height() - 40
-            const width =  $('#games_repository_contents').width()
-
-            $('#codetab_con_1').height(height)
-
-            const lang = getLanguageByMirrorName(this.props.mirror_name);
-            const editor = window.monaco.editor.create(document.getElementById('extend-challenge-file-edit'), {
-                value: value,
-                readOnly: !this.props.isEditablePath && this.props.shixun && this.props.shixun.code_edit_permission != true,
-                // 属性说明
-                // http://testeduplus2.educoder.net/react/build/static/node_modules/_monaco-editor@0.15.6@monaco-editor/esm/vs/editor/common/config/commonEditorConfig.js
-                // https://github.com/Microsoft/monaco-editor/issues/29
-                scrollBeyondLastLine: false,
-
-                language: lang,
-                // language: 'css',
-
-                // theme: "vs",
-                theme: this.state.cmCodeMode,
-                // theme: 'myCoolTheme',
-                insertSpaces: false,
-                fontSize: this.state.cmFontSize,
-                // theme: this.state.cdCodeMode
-            });
-
-            window.editor_monaco = editor;
-            this.editor_monaco = editor
-
-            // editor.setPosition({ lineNumber: 2, column: 30 });
-
-            // editor.model.onDidChangeContent((event) => {
-            //     if (notCallCodeMirrorOnChangeFlag === true) {
-            //         notCallCodeMirrorOnChangeFlag = false
-            //         return;
-            //     }
-            //     this.props.onRepositoryCodeUpdate(editor.getValue())
-            // });
-
-            editor.onDidChangeModelContent((event) => {
-                if (notCallCodeMirrorOnChangeFlag === true) {
-                    notCallCodeMirrorOnChangeFlag = false
-                    return;
-                }
-                this.props.onRepositoryCodeUpdate && this.props.onRepositoryCodeUpdate(editor.getValue())
-            })
-            this.props.codemirrorDidMount && this.props.codemirrorDidMount()
-
-            if(this.props.shixun && this.props.shixun.forbid_copy == true) {
-                // 禁用粘贴
-                // https://github.com/Microsoft/monaco-editor/issues/100
-                window.editor_monaco.onDidPaste( (a, b, c) => { window.__pastePosition = a })
-                window.addEventListener('paste', (a, b, c) => {
-                    const selection = window.editor_monaco.getSelection();
-                    const range = new monaco.Range(
-                        window.__pastePosition.startLineNumber || selection.endLineNumber,
-                        window.__pastePosition.startColumn || selection.endColumn,
-                        window.__pastePosition.endLineNumber || selection.endLineNumber,
-                        window.__pastePosition.endColumn || selection.endColumn,);
-                    window.editor_monaco.executeEdits('', [{range, text: ''}] )
-
-                })
-
-                // 禁用复制
-                window.editor_monaco.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_C, () => null);
-                window.editor_monaco.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_V, () => null);
-            }
-
-
-            setTimeout(() => {
-                editor.layout();
-                editor.focus();
-            }, 600)
-
-            window.editor_monaco.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_S, () => {
-                this.props.doFileUpdateRequestOnCodeMirrorBlur();
-                return false;
-            });
-            window.editor_monaco.onDidBlurEditorWidget(() => {
-                this.props.onEditBlur && this.props.onEditBlur();
-            })
-        })
-
-        // window.document.onkeydown = (e) => {
-        //     e = window.event || e;
-        //     if(e.keyCode== 83 && e.ctrlKey){
-        //     /*延迟，兼容FF浏览器  */
-        //         // setTimeout(function(){
-        //             // alert('ctrl+s');
-        //         // },1);
-        //         this.props.doFileUpdateRequestOnCodeMirrorBlur();
-        //         return false;
-        //     }
-        // };
-    }
     onFontSizeChange = (value) => {
         toStore('cmFontSize', value)
         this.setState({ cmFontSize: value });
-        this.editor_monaco.updateOptions({fontSize: value})
     }
 
     onCodeModeChange = (value) => {
         toStore('cmCodeMode', value);
         this.setState({ cmCodeMode: value });
-        window.monaco.editor.setTheme(value);
     }
 
-
-    onAutoCompleteSwitchChange = () => {
-
-    }
-	render() {
-		const { repositoryCode, showSettingDrawer, settingDrawerOpen } = this.props;
-		const { cmFontSize } = this.state;
-
-	    return (
+    render() {
+        const { repositoryCode, isEditablePath, showSettingDrawer, settingDrawerOpen, onEditorFocus, shixun, onRepositoryCodeUpdate, codemirrorDidMount, mirror_name } = this.props;
+        const { cmFontSize, cmCodeMode } = this.state;
+        const options = {
+            fontSize: cmFontSize,
+            readOnly: !isEditablePath && shixun && shixun.code_edit_permission != true
+        }
+        return (
             <React.Fragment>
                 <Drawer
-                    anchor="right"
-
-                    className="settingDrawer"
-
-                    width={260}
-                    open={settingDrawerOpen}
-
-                    onClose={() => showSettingDrawer( false )}
+                    placement="right"
+                    className="setting-drawer"
+                    width={247}
+                    closable={false}
+                    visible={settingDrawerOpen}
+                    onClose={() => showSettingDrawer(false)}
                 >
                     <TPICodeSetting {...this.props} {...this.state}
                         onFontSizeChange={this.onFontSizeChange}
                         onCodeModeChange={this.onCodeModeChange}
                         onAutoCompleteSwitchChange={this.onAutoCompleteSwitchChange}
-                         ></TPICodeSetting>
+                    ></TPICodeSetting>
                 </Drawer>
-                <div className = "" id="extend-challenge-file-edit" name="content"
-                    style={{ width: '100%', height: '100%', border:'1px solid grey' }}></div>
+                {shixun ?
+                    <MonacoEditor value={repositoryCode} language={mirror_name} theme={cmCodeMode} options={options} onFocus={onEditorFocus} forbidCopy={shixun.forbid_copy} editorDidMount={codemirrorDidMount} /> : null
+                }
             </React.Fragment>
-	    );
-  	}
+        );
+    }
 }
 
 
-export default ( TPIMonaco ) ;
-
-
-
-/**
-// http://testeduplus2.educoder.net/react/build/static/node_modules/
-    _monaco-editor@0.15.6@monaco-editor/esm/vs/editor/common/config/editorOptions.js
-export var EDITOR_DEFAULTS = {
-    inDiffEditor: false,
-    wordSeparators: USUAL_WORD_SEPARATORS,
-    lineNumbersMinChars: 5,
-    lineDecorationsWidth: 10,
-    readOnly: false,
-    mouseStyle: 'text',
-    disableLayerHinting: false,
-    automaticLayout: false,
-    wordWrap: 'off',
-    wordWrapColumn: 80,
-    wordWrapMinified: true,
-    wrappingIndent: 1
-    wordWrapBreakBeforeCharacters: '([{‘“〈《「『【〔（［｛｢£¥＄￡￥+＋',
-    wordWrapBreakAfterCharacters: ' \t})]?|&,;¢°′″‰℃、。｡､￠，．：；？！％・･ゝゞヽヾーァィゥェォッャュョヮヵヶぁぃぅぇぉっゃゅょゎゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ々〻ｧｨｩｪｫｬｭｮｯｰ”〉》」』】〕）］｝｣',
-    wordWrapBreakObtrusiveCharacters: '.',
-    autoClosingBrackets: 'languageDefined',
-    autoClosingQuotes: 'languageDefined',
-    autoSurround: 'languageDefined',
-    autoIndent: true,
-    dragAndDrop: true,
-    emptySelectionClipboard: true,
-    copyWithSyntaxHighlighting: true,
-    useTabStops: true,
-    multiCursorModifier: 'altKey',
-    multiCursorMergeOverlapping: true,
-    accessibilitySupport: 'auto',
-    showUnused: true,
-    viewInfo: {
-        extraEditorClassName: '',
-        disableMonospaceOptimizations: false,
-        rulers: [],
-        ariaLabel: nls.localize('editorViewAccessibleLabel', "Editor content"),
-        renderLineNumbers: 1 // On ,
-        renderCustomLineNumbers: null,
-        selectOnLineNumbers: true,
-        glyphMargin: true,
-        revealHorizontalRightPadding: 30,
-        roundedSelection: true,
-        overviewRulerLanes: 2,
-        overviewRulerBorder: true,
-        cursorBlinking: 1 /* Blink ,
-        mouseWheelZoom: false,
-        cursorStyle: TextEditorCursorStyle.Line,
-        cursorWidth: 0,
-        hideCursorInOverviewRuler: false,
-        scrollBeyondLastLine: true,
-        scrollBeyondLastColumn: 5,
-        smoothScrolling: false,
-        stopRenderingLineAfter: 10000,
-        renderWhitespace: 'none',
-        renderControlCharacters: false,
-        fontLigatures: false,
-        renderIndentGuides: true,
-        highlightActiveIndentGuide: true,
-        renderLineHighlight: 'line',
-        scrollbar: {
-            vertical: 1 /* Auto ,
-            horizontal: 1 /* Auto ,
-            arrowSize: 11,
-            useShadows: true,
-            verticalHasArrows: false,
-            horizontalHasArrows: false,
-            horizontalScrollbarSize: 10,
-            horizontalSliderSize: 10,
-            verticalScrollbarSize: 14,
-            verticalSliderSize: 14,
-            handleMouseWheel: true,
-            mouseWheelScrollSensitivity: 1,
-        },
-        minimap: {
-            enabled: true,
-            side: 'right',
-            showSlider: 'mouseover',
-            renderCharacters: true,
-            maxColumn: 120
-        },
-        fixedOverflowWidgets: false,
-    },
-    contribInfo: {
-        selectionClipboard: true,
-        hover: {
-            enabled: true,
-            delay: 300,
-            sticky: true
-        },
-        links: true,
-        contextmenu: true,
-        quickSuggestions: { other: true, comments: false, strings: false },
-        quickSuggestionsDelay: 10,
-        parameterHints: {
-            enabled: true,
-            cycle: false
-        },
-        iconsInSuggestions: true,
-        formatOnType: false,
-        formatOnPaste: false,
-        suggestOnTriggerCharacters: true,
-        acceptSuggestionOnEnter: 'on',
-        acceptSuggestionOnCommitCharacter: true,
-        wordBasedSuggestions: true,
-        suggestSelection: 'recentlyUsed',
-        suggestFontSize: 0,
-        suggestLineHeight: 0,
-        tabCompletion: 'off',
-        suggest: {
-            filterGraceful: true,
-            snippets: 'inline',
-            snippetsPreventQuickSuggestions: true,
-            localityBonus: false
-        },
-        selectionHighlight: true,
-        occurrencesHighlight: true,
-        codeLens: true,
-        folding: true,
-        foldingStrategy: 'auto',
-        showFoldingControls: 'mouseover',
-        matchBrackets: true,
-        find: {
-            seedSearchStringFromSelection: true,
-            autoFindInSelection: false,
-            globalFindClipboard: false
-        },
-        colorDecorators: true,
-        lightbulbEnabled: true,
-        codeActionsOnSave: {},
-        codeActionsOnSaveTimeout: 750
-    },
-};
-
-
- */
+export default (TPIMonaco);
\ No newline at end of file
diff --git a/src/modules/page/component/tpi-code-setting/index.jsx b/src/modules/page/component/tpi-code-setting/index.jsx
new file mode 100644
index 00000000..de4ccbd3
--- /dev/null
+++ b/src/modules/page/component/tpi-code-setting/index.jsx
@@ -0,0 +1,81 @@
+import React from 'react'
+import './index.scss'
+import { Select } from 'antd'
+
+const Option = Select.Option
+
+export default ({ onFontSizeChange
+  , cmFontSize, cmCodeMode,
+  onCodeModeChange,
+  shixun }) => {
+  const { task_pass, forbid_copy, test_set_permission } = shixun
+
+  return (
+    <div className="tpi-code-setting">
+      <h3>代码格式</h3>
+      <section>
+        <div className="file-item">
+          <b>显示模式</b>
+          <Select bordered={false} size='small' value={cmCodeMode} onChange={onCodeModeChange} >
+            <Option value={'vs'}>白色背景</Option>
+            <Option value={'vs-dark'}>黑色背景</Option>
+          </Select>
+        </div>
+        <div className="file-item">
+          <b>字体大小</b>
+          <Select bordered={false} size='small' value={cmFontSize} onChange={onFontSizeChange}>
+            <Option value={12}>12px</Option>
+            <Option value={14}>14px</Option>
+            <Option value={16}>16px</Option>
+            <Option value={18}>18px</Option>
+            <Option value={20}>20px</Option>
+            <Option value={22}>22px</Option>
+          </Select>
+        </div>
+      </section>
+      <h3>快捷键</h3>
+      <section>
+        <div className="file-item">
+          <b>保存代码</b>
+          <span>Ctrl + S</span>
+        </div>
+        <div className="file-item">
+          <b>唤出快捷键列表</b>
+          <span>F1 / Alt + F1</span>
+        </div>
+        <div className="file-item">
+          <b>左右缩进</b>
+          <span>Ctrl + ]/[</span>
+        </div>
+        <div className="file-item">
+          <b>跳到匹配的括号</b>
+          <span>Ctrl + Shift + \</span>
+        </div>
+        <div className="file-item">
+          <b>转到行首</b>
+          <span>Home</span>
+        </div>
+        <div className="file-item">
+          <b>转到行尾</b>
+          <span>End</span>
+        </div>
+      </section>
+      <h3>关卡配置信息</h3>
+      <section>
+        <a className="file-item" title={task_pass ? "允许学员跳关挑战" : "不允许学员跳关挑战"}>
+          <b>跳关</b>
+          <span>{task_pass ? '允许' : '不允许'}</span>
+        </a>
+        <a className="file-item" title={test_set_permission ? "允许学员通过金币解锁查看测试集内容"
+          : "不允许学员通过金币解锁查看测试集内容"}>
+          <b>测试集解锁</b>
+          <span>{test_set_permission ? '允许' : '不允许'}</span>
+        </a>
+        <a className="file-item" title={forbid_copy ? "不允许学员复制和粘贴代码" : "允许学员复制和粘贴代码"}>
+          <b>代码复制粘贴</b>
+          <span>{!forbid_copy ? '允许' : '不允许'}</span>
+        </a>
+      </section>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/src/modules/page/component/tpi-code-setting/index.scss b/src/modules/page/component/tpi-code-setting/index.scss
new file mode 100644
index 00000000..2bf1325d
--- /dev/null
+++ b/src/modules/page/component/tpi-code-setting/index.scss
@@ -0,0 +1,55 @@
+.tpi-code-setting {
+  height: 100%;
+  width: 247px;
+  background: #031b2a;
+  padding: 15px 13px 15px 26px;
+  color: #ddd;
+  font-size: 13px;
+  line-height: 17px;
+
+  h3 {
+    color: #008CFF;
+    font-size: 16px;
+    line-height: 21px;
+    padding-bottom: 12px;
+    text-align: left;
+    width: 100%;
+    display: block;
+    border-bottom: 1px solid #092436;
+  }
+
+  .file-item {
+    color: #ddd;
+    padding: 20px 0 0 0;
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    align-items: center;
+
+    &:last-child {
+      margin-bottom: 25px;
+    }
+  }
+
+  span {
+    color: #597A8F;
+  }
+}
+
+.setting-drawer .ant-drawer-content-wrapper {
+  top: 54px;
+}
+
+.setting-drawer {
+  .ant-drawer-body {
+    padding: 0;
+    height: 100%;
+  }
+
+  .ant-select-selection {
+    width: 120px;
+    background: #0A2030;
+    color: #597A8F;
+    border: 1px solid #597A8F;
+  }
+}
\ No newline at end of file
diff --git a/src/modules/page/header.scss b/src/modules/page/header.scss
index b8320638..020d5460 100644
--- a/src/modules/page/header.scss
+++ b/src/modules/page/header.scss
@@ -1,6 +1,15 @@
-.headerRight .exit_btn{
-  color: rgba(237,237,237,1);
-  &:hover{
-    // color: #fff;
-  }
+.headerRight .exit_btn {
+  color: rgba(237, 237, 237, 1);
+}
+
+.task-page-header {
+  position: fixed;
+  top: 0;
+  right: 0;
+  height: 54px;
+  color: #fff;
+  background: #05101A;
+  left: 0px;
+  padding: 5px 0;
+  z-index: 101;
 }
\ No newline at end of file
diff --git a/src/modules/page/layers/ImageLayer.js b/src/modules/page/layers/ImageLayer.js
index 921a47d8..c360e9a9 100644
--- a/src/modules/page/layers/ImageLayer.js
+++ b/src/modules/page/layers/ImageLayer.js
@@ -1,34 +1,68 @@
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom'
-import { Redirect } from 'react-router';
-
-import PropTypes from 'prop-types';
-import Rate from 'rc-rate';
-
+import { Button, Icon } from 'antd';
 import './TaskResultLayer.css'
 
 class ImageLayer extends Component {
-    
-  	render() {
-      	let { showImage, imageSrc, onImageLayerClose } = this.props;
-      	
-      	// 语法介绍 https://reactjs.org/docs/portals.html
-      	// 将html渲染都指定的element下
-	    return ReactDOM.createPortal(
-	    	<div>
-		    	{showImage ? 
-  		    	<div className="taskResultLayer" onClick={onImageLayerClose} style={{overflow: 'auto'}}>
-  		    		<div className="passContent">
-                		<div><img src={ imageSrc }  className="passImg" unselectable="on"/></div>
-	  		      	</div>
-	            </div>
-		      	:
-		      	<div></div>
-		      	}
-	      	</div>,
-	      	document.getElementById('root'),
-  		);
-    }
+
+	constructor(props) {
+		super(props);
+		this.state = {
+			visible: false,
+			previewImage: '',
+			current: 90,
+			transStyle: ''
+		}
+	}
+	translate = () => {
+		this.setState({
+			current: (this.state.current + 90) % 360,
+			transStyle: 'rotate(' + this.state.current + 'deg)'
+		});
+	}
+
+
+	render() {
+		let { showImage, imageSrc, } = this.props;
+		return ReactDOM.createPortal(
+			<div>
+				{showImage ?
+					<div className="taskResultLayer">
+						<div className={"ImageLayerbutton mt20"}>
+							<Button
+								className={"fr"}
+								onClick={() => this.props.onImageLayerClose()}
+							>
+								关闭<Icon type="close" />
+							</Button>
+
+							<Button
+								href={imageSrc}
+								className={"fr mr10"}
+							>
+								下载<Icon type="vertical-align-bottom" />
+							</Button>
+
+							<Button
+								onClick={() => this.translate()}
+								className={"fr mr10"}
+							>
+								旋转<Icon type="reload" theme="outlined" />
+							</Button>
+						</div>
+						<div className="passContent" style={{ transform: this.state.transStyle }}>
+							<img src={imageSrc} className="passImg" unselectable="on" alt="" />
+						</div>
+
+
+					</div>
+					:
+					<div></div>
+				}
+			</div>,
+			document.getElementById('root'),
+		);
+	}
 }
 
 export default ImageLayer;
diff --git a/src/modules/page/layers/ImageLayerOfCommentHOC.js b/src/modules/page/layers/ImageLayerOfCommentHOC.js
index bb55fa6c..34fc6a79 100644
--- a/src/modules/page/layers/ImageLayerOfCommentHOC.js
+++ b/src/modules/page/layers/ImageLayerOfCommentHOC.js
@@ -3,12 +3,12 @@ import ImageLayer from './ImageLayer'
 import { isImageExtension } from 'educoder'
 const $ = window.$;
 export function ImageLayerOfCommentHOC(options = {}) {
-	return function wrap(WrappedComponent) {
+  return function wrap(WrappedComponent) {
     return class Wrapper extends Component {
       constructor(props) {
         super(props);
-        
-        
+
+
         this.state = {
           showImage: false,
           imageSrc: ''
@@ -21,8 +21,8 @@ export function ImageLayerOfCommentHOC(options = {}) {
         const fileName = event.target.innerHTML.trim()
         if (isImageExtension(imageSrc.trim()) || isImageExtension(fileName) || event.target.tagName == 'IMG') {
           // 非回复里的头像图片; 非emoticons
-          if (imageSrc.indexOf('/images/avatars/User') === -1 && 
-              imageSrc.indexOf('kindeditor/plugins/emoticons') === -1 ) {  
+          if (imageSrc.indexOf('/images/avatars/User') === -1 &&
+            imageSrc.indexOf('kindeditor/plugins/emoticons') === -1) {
             this.setState({
               showImage: true,
               imageSrc,
@@ -31,27 +31,23 @@ export function ImageLayerOfCommentHOC(options = {}) {
           event.stopPropagation()
           event.preventDefault && event.preventDefault()
           event.originalEvent.preventDefault()
-          // event.originalEvent.stopPropagation()
-          // event.originalEvent.cancelBubble = true
           return false;
         }
       }
 
-      // jQuery._data( $('.newMain')[0], "events" )
-      componentDidMount() {	
+      componentDidMount() {
         this.props.wrappedComponentRef && this.props.wrappedComponentRef(this.refs['wrappedComponentRef'])
 
-        // commentsDelegateParent #game_left_contents #tab_con_4
         setTimeout(() => {
           $(options.parentSelector || ".commentsDelegateParent")
-            .delegate(options.imgSelector || ".J_Comment_Reply .comment_content img, .J_Comment_Reply .childrenCommentsView img","click",  this.onDelegateClick);
+            .delegate(options.imgSelector || ".J_Comment_Reply .comment_content img, .J_Comment_Reply .childrenCommentsView img", "click", this.onDelegateClick);
         }, 1200)
       }
 
       componentWillUnmount() {
         $(options.parentSelector || ".commentsDelegateParent", 'click', this.onDelegateClick)
       }
-      
+
       onImageLayerClose = () => {
         this.setState({
           showImage: false,
@@ -59,23 +55,23 @@ export function ImageLayerOfCommentHOC(options = {}) {
         })
       }
 
-			MdifHasAnchorJustScorll=()=>{
-				//mdhash滚动
-				let anchor = decodeURI(this.props.location.hash).replace('#', '');
-				// 对应id的话, 滚动到相应位置
-				if (!!anchor) {
-					let anchorElement = document.getElementsByName(anchor);
-					if (anchorElement) {
-						if (anchorElement.length!=0) {
-							anchorElement[anchorElement.length-1].scrollIntoView();
-						}
-					}
-				}
-			}
+      MdifHasAnchorJustScorll = () => {
+        //mdhash滚动
+        let anchor = decodeURI(this.props.location.hash).replace('#', '');
+        // 对应id的话, 滚动到相应位置
+        if (!!anchor) {
+          let anchorElement = document.getElementsByName(anchor);
+          if (anchorElement) {
+            if (anchorElement.length != 0) {
+              anchorElement[anchorElement.length - 1].scrollIntoView();
+            }
+          }
+        }
+      }
 
 
       render() {
-				this.MdifHasAnchorJustScorll();
+        this.MdifHasAnchorJustScorll();
         return (
           <React.Fragment>
             <ImageLayer {...this.state} onImageLayerClose={this.onImageLayerClose}></ImageLayer>
@@ -86,5 +82,5 @@ export function ImageLayerOfCommentHOC(options = {}) {
         )
       }
     }
-	}
+  }
 }
\ No newline at end of file
diff --git a/src/modules/page/layers/TaskResultLayer.css b/src/modules/page/layers/TaskResultLayer.css
index 25f570a5..962aed0d 100644
--- a/src/modules/page/layers/TaskResultLayer.css
+++ b/src/modules/page/layers/TaskResultLayer.css
@@ -7,7 +7,7 @@
     background:rgba(0,0,0,0.8);
     top: 0px;
     overflow: hidden;
-}   
+}
     .taskResultLayer .closeIcon{
         position: absolute;
         right: 100px;
@@ -40,7 +40,7 @@
     justify-content: center;
     align-items: center;
     display: -webkit-flex;
-    height: 100%;
+    height: 90%;
     text-align: center;
 }
 .passImg{
@@ -137,4 +137,11 @@
 
 .vertical4{
     vertical-align: -4px;
+}
+
+.ImageLayerbutton{
+    position: absolute;
+    top: 0px;
+    right: 10px;
+    z-index: 10;
 }
\ No newline at end of file
diff --git a/src/modules/page/layers/TaskResultLayer.js b/src/modules/page/layers/TaskResultLayer.js
index f4ccea8f..30b5b9cb 100644
--- a/src/modules/page/layers/TaskResultLayer.js
+++ b/src/modules/page/layers/TaskResultLayer.js
@@ -1,247 +1,203 @@
 import React, { Component } from 'react';
 import { Redirect } from 'react-router';
-
-import PropTypes from 'prop-types';
-import Rate from 'rc-rate';
-
-import Tooltip from 'material-ui/Tooltip';
-
+import { Rate } from 'antd'
 import './TaskResultLayer.css'
-import moment from 'moment';
-
 import passallImg from '../../../images/tpi/passall.png'
 import passpartImg from '../../../images/tpi/passpart.png'
 import empiricgreenImg from '../../../images/tpi/empiricgreen.png'
-
 import { trigger } from 'educoder';
-import SecondTab from "../../paths/SchoolStatistics/SecondTab";
 
 
 class TaskResultLayer extends Component {
-    constructor(props) {
-      super(props)
+  constructor(props) {
+    super(props)
 
-      this.goNext = false;
+    this.goNext = false;
 
-      this.state = {
-        stared: false,
-        timeRemain: 0,
-      }
+    this.state = {
+      stared: false,
+      timeRemain: 0,
     }
+  }
 
-    componentWillReceiveProps(newProps, newContext) {
-      if (newProps.currentGamePassed && (!this.props.currentGamePassed
-          || (newProps.currentGamePassed !== this.props.currentGamePassed ))) {
-        // this.fakeRanking = this._fakeRanking()
-        const $ = window.$;
-        let isLastGame = newProps.game_count === newProps.challenge.position;
-        setTimeout(()=>{
-          // true ||
-          if ( isLastGame) {
-            var dClass = 'zoomInDown' ;$('.passTaskContent').show().addClass(dClass + ' animated');
-            setTimeout( function(){$('.passTaskContent').removeClass(dClass + ' animated')}, 1000)
-          } else {
-            var dClass = 'zoomIn' ;$('.passTaskContent').show().addClass(dClass + ' animated');
-            setTimeout( function(){$('.passTaskContent').removeClass(dClass + ' animated')}, 1000)
-          }
-        }, 100)
-
-        if (newProps.challenge.showLanguagePictrue == true) {
-          // 开启倒计时
-          // this.initEffectDisplayServerTimer()
-        }
-      }
-    }
-
-    onStarChange(challenge, index, value) {
-      this.props.onStarChange(challenge, index, value);
-
-      this.setState({
-        stared: value ? true : false,
-      })
-    }
-
-    onFinish(goNext) {
-      const { stared } = this.state;
-      const { game, challenge, shixun, showSnackbar, next_game } = this.props;
-      if (!stared && !this.props.game.star && shixun.status >= 2 ) {     // 没点评星 && 未评星 && 实训已发布（模拟实战可以继续）
-        showSnackbar('请先给该任务评星，谢谢。')
-        return;
-      }
-
-      // 点击了查看效果，而非查看下一关
-      if (!goNext) {
-        if (challenge.showWebDisplayButton === true && challenge.webDisplayUrl) {
-          // 打开web效果查看页面
-          window.open(challenge.webDisplayUrl, '_blank');
-          return;
+  componentWillReceiveProps(newProps, newContext) {
+    if (newProps.currentGamePassed && (!this.props.currentGamePassed
+      || (newProps.currentGamePassed !== this.props.currentGamePassed))) {
+      const $ = window.$;
+      let isLastGame = newProps.game_count === newProps.challenge.position;
+      setTimeout(() => {
+        // true ||
+        if (isLastGame) {
+          var dClass = 'zoomInDown'; $('.passTaskContent').show().addClass(dClass + ' animated');
+          setTimeout(function () { $('.passTaskContent').removeClass(dClass + ' animated') }, 1000)
         } else {
-          trigger('showWebDisplayEvent')
+          var dClass = 'zoomIn'; $('.passTaskContent').show().addClass(dClass + ' animated');
+          setTimeout(function () { $('.passTaskContent').removeClass(dClass + ' animated') }, 1000)
         }
-      }
-      if (!game.star) { // 当前关卡没有评星，评星后再跳转
-        this.props.saveChallengeStar(game, challenge.position);
-      }
+      }, 100)
 
-      //  跳转到下一关
-      // https://stackoverflow.com/questions/29244731/react-router-how-to-manually-invoke-link
-      // this.context.router.push('/sample');
-      if (goNext === true) {
-        if (next_game) {  // https://www.trustie.net/issues/18573
-          this.goNext =  true;
+    }
+  }
+
+  onStarChange(challenge, index, value) {
+    this.props.onStarChange(challenge, index, value);
+
+    this.setState({
+      stared: value ? true : false,
+    })
+  }
+
+  onFinish(goNext) {
+    const { stared } = this.state;
+    const { game, challenge, shixun, showSnackbar, next_game } = this.props;
+    if (!stared && !this.props.game.star && shixun.status >= 2) {     // 没点评星 && 未评星 && 实训已发布（模拟实战可以继续）
+      showSnackbar('请先给该任务评星，谢谢。')
+      return;
+    }
+
+    // 点击了查看效果，而非查看下一关
+    if (!goNext) {
+      if (challenge.showWebDisplayButton === true && challenge.webDisplayUrl) {
+        // 打开web效果查看页面
+        window.open(challenge.webDisplayUrl, '_blank');
+        return;
+      } else {
+        trigger('showWebDisplayEvent')
+      }
+    }
+    if (!game.star) { // 当前关卡没有评星，评星后再跳转
+      this.props.saveChallengeStar(game, challenge.position);
+    }
+
+    //  跳转到下一关
+    // https://stackoverflow.com/questions/29244731/react-router-how-to-manually-invoke-link
+    // this.context.router.push('/sample');
+    if (goNext === true) {
+      if (next_game) {  // https://www.trustie.net/issues/18573
+        this.goNext = true;
+      }
+      // 隐藏掉效果查看页面
+      window.$('#picture_display').hide()
+    }
+    this.props.onGamePassed();
+    this.setState({
+      stared: false
+    })
+  }
+  _fakeRanking() {
+    const { cost_time } = this.props.game
+    if (cost_time > 60 * 10) {
+      return Math.floor(Math.random() * 11) + 20
+    }
+    return Math.floor(((600 - cost_time) / 600) * 100)
+
+  }
+  initEffectDisplayServerTimer = () => {
+
+    this.setState({ timeRemain: 5 * 60 }, () => {
+      this.intervalHandler = setInterval(() => {
+        let timeRemain = this.state.timeRemain
+        if (timeRemain > 0) {
+          timeRemain = timeRemain - 1;
+        } else {
+          clearInterval(this.intervalHandler);
         }
-        // 隐藏掉效果查看页面
-        window.$('#picture_display').hide()
-      }
-      this.props.onGamePassed();
-      this.setState({
-        stared: false
-      })
+        this.setState({ timeRemain })
+      }, 1000)
+    })
+
+  }
+  componentWillUnmount() {
+    this.intervalHandler && clearInterval(this.intervalHandler);
+  }
+  render() {
+    if (!this.props.challenge || !this.props.challenge.id) {
+      return <div></div>
     }
-    _fakeRanking() {
-      const { cost_time } = this.props.game
-      if (cost_time > 60 * 10) {
-        return Math.floor(Math.random()*11)+20
-      }
-      return Math.floor(( (600 - cost_time) / 600) * 100)
+    const { shixun } = this.props;
+    const { stared } = this.state;
+    let { currentGamePassed, currentPassedGameGainGold, currentPassedGameGainExperience,
+      game_count, challenge, next_game, game, closeTaskResultLayer } = this.props;
+    // TODO closeTaskResultLayer的时候没有调用评星接口
 
+
+    // 如果时最后一关，图片要换
+    let isLastGame = game_count === challenge.position; // false //
+
+    // TODO 这个用法有点蹩脚
+    if (this.goNext && next_game) {
+      this.goNext = false;
+      return <Redirect push to={`/tasks/${next_game}`} />;
     }
-    // componentDidUpdate(prevProps) {
-    //   if (!this.props.challenge) {
-    //     return;
-    //   }
-    //   const { showLanguagePictrue } = this.props.challenge;
-    //   if ( prevProps.challenge.showLanguagePictrue != showLanguagePictrue &&
-    //     showLanguagePictrue == true ) {
-
-    //   }
-    // }
-    initEffectDisplayServerTimer = () => {
-
-      this.setState({ timeRemain: 5 * 60 }, () => {
-        this.intervalHandler = setInterval(() => {
-          let timeRemain = this.state.timeRemain
-          if (timeRemain > 0) {
-            timeRemain = timeRemain - 1;
-          } else {
-            clearInterval(this.intervalHandler);
-          }
-          this.setState({ timeRemain })
-        }, 1000)
-      })
-
+    if (shixun.status <= 1 || game.isPassThrough == true) { // 模拟实战
+      game.star = 8;  // 跳过评星
     }
-    componentWillUnmount() {
-      this.intervalHandler && clearInterval(this.intervalHandler);
+
+    const titleObj = {
+      title: game.star ? '' : '请先给该任务评星，谢谢。'
     }
-  	render() {
-      if (!this.props.challenge || !this.props.challenge.id) {
-          return <div></div>
-      }
-      const { shixun } = this.props;
-      const { stared } = this.state;
-      let { currentGamePassed, currentPassedGameGainGold, currentPassedGameGainExperience,
-          game_count, challenge, next_game, game, closeTaskResultLayer } = this.props;
-      // TODO closeTaskResultLayer的时候没有调用评星接口
-
-
-      // 如果时最后一关，图片要换
-      let isLastGame =  game_count === challenge.position; // false //
-
-      // TODO 这个用法有点蹩脚
-      if (this.goNext && next_game) {
-        this.goNext = false;
-        return <Redirect push to={`/tasks/${next_game}`} />;
-      }
-      if (shixun.status <= 1 || game.isPassThrough == true) { // 模拟实战
-        game.star = 8;  // 跳过评星
-      }
-
-      const titleObj = {
-        title: game.star ? '' : '请先给该任务评星，谢谢。'
-      }
-      // const fakeRanking = this.fakeRanking;
-	    return (
-	    	<div>
-		    	{currentGamePassed ?
-		    	<div className="taskResultLayer">
-		    		<div className="pr passTaskContent" style={{display:'none'}} >
-                  <i className="far fa-times-circle closeIcon" onClick={closeTaskResultLayer} title="关闭"></i>
-                  <img src={isLastGame? passallImg : passpartImg} width="652px" className="passTaskImg"/>
-                  <div className="winpPerson expGold">
-                    <p className="inline inlines"><span className=" goldring"/>
-                      {currentPassedGameGainGold >= 0 ? `+${currentPassedGameGainGold}` : '+0'}
-                    </p>
-                    <p className="inline inlines exp">
-                      <img src={empiricgreenImg} className="mr8 mt5 fl"/>
-                      {currentPassedGameGainExperience >= 0 ? `+${currentPassedGameGainExperience}` : '+0'}
-                    </p>
-                  </div>
-                  <div className="winPanel">
-                      <style>
-                        {
-                          `
+    // const fakeRanking = this.fakeRanking;
+    return (
+      <div>
+        {currentGamePassed ?
+          <div className="taskResultLayer">
+            <div className="pr passTaskContent" style={{ display: 'none' }} >
+              <i className="far fa-times-circle closeIcon" onClick={closeTaskResultLayer} title="关闭"></i>
+              <img src={isLastGame ? passallImg : passpartImg} width="652px" className="passTaskImg" />
+              <div className="winpPerson expGold">
+                <p className="inline inlines"><span className=" goldring" />
+                  {currentPassedGameGainGold >= 0 ? `+${currentPassedGameGainGold}` : '+0'}
+                </p>
+                <p className="inline inlines exp">
+                  <img src={empiricgreenImg} className="mr8 mt5 fl" />
+                  {currentPassedGameGainExperience >= 0 ? `+${currentPassedGameGainExperience}` : '+0'}
+                </p>
+              </div>
+              <div className="winPanel">
+                <style>
+                  {
+                    `
                           .page--body{
                               z-index: 0 !important;
                           }
                           `
-                        }
-                      </style>
-                      <div className="cl"></div>
-                      { !game.star ?
-                        <React.Fragment>
-                        <p className="rateLabel ">您的评价决定老师的江湖地位~</p>
-                        <Rate
-                            defaultValue={0}
-                            allowClear={false}
-                            onChange={(value) => this.onStarChange(this.props.game, this.props.challenge.position, value)}
-                          />
-                        </React.Fragment>
-                      : ''}
-                      <p>
-                          {/*<a href="javascript:void(0)" className="passNext">下一关</a>*/}
-                          <a href="javascript:void(0)" className={`passed ${ stared || game.star ? 'stared' : '' }`}
-                            {...titleObj} onClick={()=>this.onFinish(true)}>{ next_game ? '下一关' : '完成'}</a>
+                  }
+                </style>
+                <div className="cl"></div>
+                {!game.star ?
+                  <React.Fragment>
+                    <p className="rateLabel ">您的评价决定老师的江湖地位~</p>
+                    <Rate
+                      defaultValue={0}
+                      allowClear={false}
+                      onChange={(value) => this.onStarChange(this.props.game, this.props.challenge.position, value)}
+                    />
+                  </React.Fragment>
+                  : ''}
+                <p>
+                  <a className={`passed ${stared || game.star ? 'stared' : ''}`}
+                    {...titleObj} onClick={() => this.onFinish(true)}>{next_game ? '下一关' : '完成'}</a>
 
-                          { challenge.showLanguagePictrue &&
+                  {challenge.showLanguagePictrue &&
 
-                            <a href="javascript:void(0)" className={`passed ${ stared || game.star ? 'stared' : '' }`}
-                            {...titleObj} onClick={()=>this.onFinish()}>
-                              { `查看效果` }
-                              {/* ${ moment(this.state.timeRemain * 1000).format('mm:ss') } */}
-                            </a>
+                    <a className={`passed ${stared || game.star ? 'stared' : ''}`}
+                      {...titleObj} onClick={() => this.onFinish()}>
+                      {`查看效果`}
+                    </a>
 
-                          }
-                          {/*
+                  }
 
-                          (this.state.timeRemain ?
-                              <Tooltip title={"注意：效果查看服务只会保留5分钟"} disableFocusListener={true}>
 
-                              </Tooltip>
-                            :
-                              <Tooltip title={"效果查看服务已被终止运行，需要重新评测后才能查看"} disableFocusListener={true}>
-                                <a href="javascript:void(0)" className={`passed ${ stared || game.star ? 'stared' : '' }`}
-                                {...titleObj} onClick={()=>{}} style={{ backgroundColor: 'gray'}}>
-                                  { `查看效果` }
-                                </a>
-                              </Tooltip>
-                            )
-
-                           */}
-                          {/*
-                            注意：效果查看服务只会保留5分钟
-                            效果查看服务已被终止运行，需要重新评测后才能查看
-                           */}
-                      </p>
-                  </div>
+                </p>
               </div>
-		      	</div>
-		      	:
-		      	<div></div>
-		      	}
-	      	</div>
-	    );
-  	}
+            </div>
+          </div>
+          :
+          <div></div>
+        }
+      </div>
+    );
+  }
 }
 
 export default TaskResultLayer;
diff --git a/src/modules/page/main/ActionView.js b/src/modules/page/main/ActionView.js
index 5504b5e7..3bbac0da 100644
--- a/src/modules/page/main/ActionView.js
+++ b/src/modules/page/main/ActionView.js
@@ -15,70 +15,59 @@ import './ActionView.css'
     border: 1px solid #1B4061 !important;
     */
 const styles = theme => ({
-  button: {
-    margin: theme.spacing.unit,
-    border: '1px solid #1B4061',
-    color: '#1B4061',
-    height: '30px',
-    padding: '0 16px',
-    '&:hover': {
-    	color: '#4CACFF',
-    	border: '1px solid #4CACFF'
-    }
-  },
-  hoverButton: {
-	margin: theme.spacing.unit,
-    height: '30px',
-    padding: '0 16px',
+	button: {
+		margin: theme.spacing.unit,
+		border: '1px solid #1B4061',
+		color: '#1B4061',
+		height: '30px',
+		padding: '0 16px',
+		'&:hover': {
+			color: '#4CACFF',
+			border: '1px solid #4CACFF'
+		}
+	},
+	hoverButton: {
+		margin: theme.spacing.unit,
+		height: '30px',
+		padding: '0 16px',
 
-	color: '#4CACFF',
-	border: '1px solid #4CACFF'
-  },
-  buttonText: {
-  	color: '#1B4061 !important',
-  	'&:hover': {
-  		color: '#1B4061',
-  	}
-  }
+		color: '#4CACFF',
+		border: '1px solid #4CACFF'
+	},
+	buttonText: {
+		color: '#1B4061 !important',
+		'&:hover': {
+			color: '#1B4061',
+		}
+	}
 });
 
 class ActionView extends Component {
 
 	constructor(props) {
 		super(props)
-		
+
 	}
 
 	componentDidMount() {
 		// request
 		window._tpiWidthResize = () => {
 			const _w = window.$('#actionView').width();
-			// if (_w < 446) {
-			// 	window.$('#time-consuming').hide()
-			// 	// window.$('#time-consuming').hide()
-			// } else if (_w < 746) {
-			// 	// 文字放出来之前是 580
-			// 	window.$('#time-consuming').show()
-			// 	window.$('.time_limit').hide()
-			// } else {
-			// 	window.$('#time-consuming').show()
-			// 	window.$('.time_limit').show()
-			// }
- 		}
+		}
 	}
 
 	showWebDisplay(challenge) {
 		window.open(challenge.webDisplayUrl, '_blank');
 	}
 	/*<span className="mt10 -flex c_grey ml15" id="time-consuming">耗时：0 天 3 小时 11 分钟 57 秒 </span>*/
-  	render() {
-  		const { onRunCodeTest, onShowPrevStage, onShowNextStage, gameBuilding
-  			, game, classes, st, shixun, record, challenge, time_limit, real_time_limit } = this.props;
+	render() {
+		const { onRunCodeTest, onShowPrevStage, onShowNextStage, gameBuilding
+			, game, classes, st, shixun, record, challenge, time_limit, real_time_limit } = this.props;
 
-  		console.log(shixun)
-	    return (
-	      	<div className="-flex -layout-h" id="game_operate_action">
-			  	<style>{`
+		console.log(shixun)
+		return (
+			<div className="-flex -layout-h" id="game_operate_action">
+				<style>{`
 				  #game_operate_action {
 					width: 100%;
 				  }
@@ -103,104 +92,84 @@ class ActionView extends Component {
 					  flex: 0 0 90px;
 				  }
 				  `}</style>
-	      		<span className="mt10 -flex c_grey ml15" id="time-consuming">
-				  	{!!time_limit && 
-					  <span className="time_limit">{`本关最大执行时间：${real_time_limit}秒`}
-					  	{!gameBuilding && record && <span className="spliter"></span>}
-					  </span>} 
-	      			{!gameBuilding && record ? 
-	      				// <Tooltip title={ "本次评测耗时(编译、运行总时间)" }></Tooltip>
-	      					<span>本次评测耗时(编译、运行总时间)：{ record } 秒</span>
-	      				
-	      			: ""}
-	      		</span>
+				<span className="mt10 -flex c_grey ml15" id="time-consuming">
+					{!!time_limit &&
+						<span className="time_limit">{`本关最大执行时间：${real_time_limit}秒`}
+							{!gameBuilding && record && <span className="spliter"></span>}
+						</span>}
+					{!gameBuilding && record ?
+						// <Tooltip title={ "本次评测耗时(编译、运行总时间)" }></Tooltip>
+						<span>本次评测耗时(编译、运行总时间)：{record} 秒</span>
 
-	      		{/*将第一个按钮改为visibility方式隐藏，不然加载时测评按钮会出现没有垂直居中的情况*/}
-				  	<Tooltip title={ "倒计时为0时，服务将被关闭" }>
-						<Button size="small" className={classes.button + ' actionViewfirstButton'} onClick={()=>this.showWebDisplay(challenge)}
-								style={{ visibility: challenge.showWebDisplayButton ? '': 'hidden',
-									minWidth: challenge.showWebDisplayButton ? '': '1px',
-									width: challenge.showWebDisplayButton ? '': '1px',
-									flex: `0 0 ${challenge.showWebDisplayButton ? '110px': '1px'}`
-								}} 
-								id="showWebDisplayButton"
-							// style={{ display: challenge.showWebDisplayButton ? 'flex': 'none'}} 
-						>
-							查看效果
+						: ""}
+				</span>
+
+				{/*将第一个按钮改为visibility方式隐藏，不然加载时测评按钮会出现没有垂直居中的情况*/}
+				<Tooltip title={"倒计时为0时，服务将被关闭"}>
+					<Button size="small" className={classes.button + ' actionViewfirstButton'} onClick={() => this.showWebDisplay(challenge)}
+						style={{
+							visibility: challenge.showWebDisplayButton ? '' : 'hidden',
+							minWidth: challenge.showWebDisplayButton ? '' : '1px',
+							width: challenge.showWebDisplayButton ? '' : '1px',
+							flex: `0 0 ${challenge.showWebDisplayButton ? '110px' : '1px'}`
+						}}
+						id="showWebDisplayButton"
+					// style={{ display: challenge.showWebDisplayButton ? 'flex': 'none'}} 
+					>
+						查看效果
 						</Button>
-					</Tooltip>
+				</Tooltip>
 
 				{
-					!gameBuilding && 
-					(game && !!game.prev_game) ? 
-				<Link to={`/tasks/${game.prev_game}`}  className={classes.buttonText + ' act_btn'}>
-					<Button size="small" className={classes.button}>
-						上一关
+					!gameBuilding &&
+						(game && !!game.prev_game) ?
+						<Link to={`/tasks/${game.prev_game}`} className={classes.buttonText + ' act_btn'}>
+							<Button size="small" className={classes.button}>
+								上一关
 					</Button>
-				</Link>
-					: ''}
+						</Link>
+						: ''}
 
 				{/*未发布的都能跳转*/}
-				{	!gameBuilding && 
-					((game && (game.status === 2 || shixun.status < 2) || shixun && shixun.task_pass ) && !!game.next_game) ? 
-				<Link to={`/tasks/${game.next_game}`} className={classes.buttonText + ' act_btn'}>
-					<Button size="small" className={classes.button}>
-						下一关
+				{!gameBuilding &&
+					((game && (game.status === 2 || shixun.status < 2) || shixun && shixun.task_pass) && !!game.next_game) ?
+					<Link to={`/tasks/${game.next_game}`} className={classes.buttonText + ' act_btn'}>
+						<Button size="small" className={classes.button}>
+							下一关
 					</Button>
-				</Link>
+					</Link>
 					: ''}
 
-				
-				
-				{(shixun&&!shixun.vnc || shixun&&shixun.vnc_evaluate) && <div id="code_test" className="act_btn">
+
+
+				{(shixun && !shixun.vnc || shixun && shixun.vnc_evaluate) && <div id="code_test" className="act_btn">
 					{
-						st === 1 && game.status === 2 ? 
-							<Tooltip title={ "已通关的选择题任务无法再次测评" }>
-							<a href="javascript:void(0)" className="shixun-task-btn mr15  gray " 
-						      		>
-				      			<i className="fa fa-play-circle font-16"></i> 
+						st === 1 && game.status === 2 ?
+							<Tooltip title={"已通关的选择题任务无法再次测评"}>
+								<a className="shixun-task-btn mr15  gray "
+								>
+									<i className="fa fa-play-circle font-16"></i>
 						      	测评
 						    </a>
-						    </Tooltip>
-						:
-						gameBuilding ?
-						
-				    	<a href="javascript:void(0)" className="shixun-task-btn mr15  gray " 
-					      		>
-			      			<i className="fa fa-play-circle font-16"></i> 
+							</Tooltip>
+							:
+							gameBuilding ?
+
+								<a className="shixun-task-btn mr15  gray "
+								>
+									<i className="fa fa-play-circle font-16"></i>
 					      	测评
 					    </a>
-				    	: 
-					    <a href="javascript:void(0)" className="shixun-task-btn mr15 " 
-					      		onClick={onRunCodeTest}>
-			      			<i className="fa fa-play-circle font-16"></i> 
+								:
+								<a className="shixun-task-btn mr15 "
+									onClick={onRunCodeTest}>
+									<i className="fa fa-play-circle font-16"></i>
 					      	测评
 					    </a>}
 				</div>}
-	      	</div>	
-	    );
-	    /*	
-	    	<a href="/shixuns/8arufxzl" id="exit_shixun" className="shixun-task-btn task-newbtn-grey mt8 mr15">离开</a>
-
-	    	<a href="javascript:void(0)" className="shixun-task-btn task-btn-blue mr15 mt8" id="prev_step"
-						onClick={onShowNextStage}>下一关 </a>
-
-			onclick="training_task_submmit();"
-
-
-			{game && !!game.prev_game ? 
-				<div id="prev_step_area">
-					<Link to={`/tasks/${game.prev_game}`} className="shixun-task-btn task-btn-blue mr15 mt8">上一关</Link>
-				</div>
-					: ''}
-
-				{game && !!game.next_game ? 
-				<div id="next_step_area">	
-					<Link to={`/tasks/${game.next_game}`} className="shixun-task-btn task-btn-blue mr15 mt8">下一关</Link>
-				</div>
-					: ''}
-	    */ 
-  	}
+			</div>
+		);
+	}
 }
 
-export default withStyles(styles)( ActionView );
+export default withStyles(styles)(ActionView);
diff --git a/src/modules/page/main/ChooseRepositoryView.js b/src/modules/page/main/ChooseRepositoryView.js
index ce91f376..698d395c 100644
--- a/src/modules/page/main/ChooseRepositoryView.js
+++ b/src/modules/page/main/ChooseRepositoryView.js
@@ -80,7 +80,7 @@ positon:0
 			return ""
 		}
 		// 初始化  initialValue + defaultSelected  defaultSelected={``}
-		// {this.renderChoiceItems(item, index)}	
+		// {this.renderChoiceItems(item, index)}
 		// String.valueOf(index)
 		var choiceQuestionComponent = choose.map( (item, index) => {
 			var choose_test = choose_test_cases.test_sets[index];
@@ -90,7 +90,7 @@ positon:0
 
 			//  <p style={{paddingLeft:'27px'}}>{item.subject}</p>
 			/*
-				<ReactMarkdown 
+				<ReactMarkdown
                     	source={item.subject} style={{paddingLeft:'27px'}}
                     	renderers={{code: CodeBlock}}
                     	/>
@@ -102,31 +102,31 @@ positon:0
 				const i = optionValueArray.indexOf(item);
 				initialValueArray[i] = item
 			})
-			
+
 			return (
 				<div id={`choice${index}`} key={index} className="mb15">
 					{/* <div style={groupStyle}>
 						{( item.category === 1 ? "单选题" : "多选题" )}
                     </div> */}
 					<div className="clearfix">
-						<span className="fl" style={{"color":"#8B9399"}}>{index+1}.</span>
+
 						<div id={`choose_subject_${index+1}`} className="fl choiceMD">
-							<textarea style={{display:'none'}}>{item.subject}</textarea>
+							<span className="fl" style={{"color":"#8B9399"}}>{index+1}.</span><textarea style={{display:'none'}}>{item.subject}</textarea>
 						</div>
 					</div>
-                    
+
 					<div>
 						{getFieldDecorator("" + (index), {
 		  					initialValue: item.category === 1 ? actual_output : (actual_output && actual_output.split(''))
 		  				})(
-		  					 item.category === 1 ? 
+		  					 item.category === 1 ?
 							    <RadioGroup name={`${index}`} defaultSelected={actual_output} className="radiogroup">
 							    	{this.renderChoiceItems(item, index)}
 							    </RadioGroup>
 							    : this.renderMultiChoiceItems(item, index, initialValueArray)
-							
+
 						    )
-		  				}	    	
+		  				}
 					</div>
 				</div>
 			)
@@ -151,7 +151,7 @@ positon:0
 			/*
 	<div style={ { display: 'inline-block'} }
 		        				dangerouslySetInnerHTML={{__html: optionItem.option_name}}>
-		        			</div> 
+		        			</div>
 		        			<textarea value={optionItem.option_name}></textarea>
 			*/
 			ar.push(
@@ -161,9 +161,9 @@ positon:0
 						classes={{root: this.props.classes.radio,
 							checked: this.props.classes.checked}}
 						checked={isSelected}
-						
+
 				        value={`${optionValueArray[optionIndex]}`}
-				    	
+
 				        style={styles.radioButton}
 				    />
 				} label={<div className="break-word" style={{lineHeight:"24px"}}>
@@ -172,20 +172,20 @@ positon:0
 		        			</div>
 		        			<div style={ { display: 'inline-block',"color":"#8B9399"} }
 		        				dangerouslySetInnerHTML={{__html: showText}}>
-		        			</div> 
-		        			
-		        			
+		        			</div>
+
+
 		    			</div>} ></FormControlLabel>
 		    )
 		})
-		// 
+		//
 		// <span style={ isSelected ? { fontSize: 16} : {}}> {optionItem.option_name}</span>
 		return ar
 	}
 
 
 	renderMultiChoiceItems(item, index, initialValueArray) {
-		return <CheckBoxGroup 
+		return <CheckBoxGroup
 			{...this.props}
 			options={item.challenge_question} initialValueArray={initialValueArray}
 			itemLabelFunction={(option, index)=> {
@@ -198,10 +198,10 @@ positon:0
 	        			</div>
 	        			<div style={ { display: 'inline-block',"color":"#8B9399"} }
 	        				dangerouslySetInnerHTML={{__html: showText}}>
-	        			</div> 
+	        			</div>
 		        	</div>
 					)
-				
+
 			}}
 			itemValueFunction={(option, index)=> {return optionValueArray[index]}}></CheckBoxGroup>
 	}
@@ -235,14 +235,14 @@ positon:0
 
 	    return (
             <React.Fragment>
-            	{ loading === true ? 
+            	{ loading === true ?
             		''
-            	: 
+            	:
             		<div id="choiceRepositoryView" style={{"color":"#8B9399!important"}}>
             			{this.renderChooseQuestions()}
             		</div>
             	}
-            	
+
 		    </React.Fragment>
 	    );
   	}
diff --git a/src/modules/page/main/CodeEvaluateView.js b/src/modules/page/main/CodeEvaluateView.js
index e68bfa43..3a8a20f8 100644
--- a/src/modules/page/main/CodeEvaluateView.js
+++ b/src/modules/page/main/CodeEvaluateView.js
@@ -2,16 +2,16 @@ import '../VNC.css';
 import React, { Component } from 'react';
 
 import Tooltip from 'material-ui/Tooltip';
- 
+
 import { connect } from 'react-redux';
 import './CodeEvaluateView.css';
 import { CircularProgress } from 'material-ui/Progress';
 import { on, off } from 'educoder'
 import actions from '../../../redux/actions';
-const testSetsExpandedArrayInitVal = [false, false, false, false, false, 
-									 false, false, false, false, false, 
-									 false, false, false, false, false, 
-									 false, false, false, false, false]
+const testSetsExpandedArrayInitVal = [false, false, false, false, false,
+	false, false, false, false, false,
+	false, false, false, false, false,
+	false, false, false, false, false]
 
 const $ = window.$;
 const TAB_INDEX_WEB_DISPLAY = 0;
@@ -21,13 +21,13 @@ class CodeEvaluateView extends Component {
 
 	constructor(props) {
 		super(props)
-		
+
 		this.onEvaluateViewExpand = this.onEvaluateViewExpand.bind(this)
 
 		this.state = {
 			// TODO 最多20个测试集？
-			testSetsInitedArray:  testSetsExpandedArrayInitVal.slice(0),
-			
+			testSetsInitedArray: testSetsExpandedArrayInitVal.slice(0),
+
 			evaluateViewExpanded: false,
 
 			tabIndex: 1,
@@ -55,17 +55,17 @@ class CodeEvaluateView extends Component {
 	}
 
 	componentWillReceiveProps(newProps, newContext) {
-		if (this.props.game && newProps.game && (newProps.game.id !== this.props.game.id 
-				|| newProps.gameBuilding !== this.props.gameBuilding )) { // 切换game时重置state
+		if (this.props.game && newProps.game && (newProps.game.id !== this.props.game.id
+			|| newProps.gameBuilding !== this.props.gameBuilding)) { // 切换game时重置state
 			if (newProps.gameBuilding === false) {
 				// 清空codemirror的内容，TODO最好调用codemirror的销毁方法
-				$('#evaluating_contents .result_different_show').html('')		
+				$('#evaluating_contents .result_different_show').html('')
 				this.setState({
 					tabIndex: TAB_INDEX_EVALUATE_RESULT_INDEX
 				})
 			}
 			this.setState({
-				testSetsInitedArray:  testSetsExpandedArrayInitVal.slice(0),
+				testSetsInitedArray: testSetsExpandedArrayInitVal.slice(0),
 			})
 			if (newProps.game.id !== this.props.game.id) {
 				if (this.props.challenge.isHtml === true) {
@@ -81,10 +81,10 @@ class CodeEvaluateView extends Component {
 			this.tabIndexChange(TAB_INDEX_WEB_DISPLAY)
 		}
 	}
-	
+
 
 	tabIndexChange(index) {
-		this.setState({tabIndex: index});
+		this.setState({ tabIndex: index });
 	}
 
 	onTestSetHeaderClick(index) {
@@ -99,34 +99,28 @@ class CodeEvaluateView extends Component {
 			current_test_set.output = ''
 		}
 		// 优化，但是会增加代码复杂度 
-		if (( game.test_sets_view === true || power == 1 || current_test_set.is_public == 1 ) && testSetsInitedArray[index] === false ) {		// 如果测试集没有初始化过（如果重新评测了，都需要重新初始化）
-			const id    = "result_different_show_" + index;
+		if ((game.test_sets_view === true || power == 1 || current_test_set.is_public == 1) && testSetsInitedArray[index] === false) {		// 如果测试集没有初始化过（如果重新评测了，都需要重新初始化）
+			const id = "result_different_show_" + index;
 
 			var mv = window.CodeMirror.k_init(id, current_test_set.actual_output || "", current_test_set.output);
 
-			
-			var height=0;
-			// 以前的代码用不了，2个pane的高度都是300
-            // if($("#"+id).find(".CodeMirror-merge-pane").eq(0).height()>$("#"+id).find(".CodeMirror-merge-pane").eq(1).height()){
-            //     height = parseInt($("#"+id).find(".CodeMirror-merge-pane").eq(0).height());
-            // }else{
-            //     height = parseInt($("#"+id).find(".CodeMirror-merge-pane").eq(1).height());
-            // }
-            var lineNumber = Math.max( current_test_set.output.split('\n').length
-            		, (current_test_set.actual_output ? current_test_set.actual_output.split('\n').length : 1 ))
+
+			var height = 0;
+			var lineNumber = Math.max(current_test_set.output.split('\n').length
+				, (current_test_set.actual_output ? current_test_set.actual_output.split('\n').length : 1))
 
 			height = lineNumber * 19 + 25;
 			console.log('height ', height)
-            $("#"+id).find(".CodeMirror").height(height);
-            $(".CodeMirror-merge-gap").find("svg").css("height", height);
-            // 取真实高度
-            $(".CodeMirror-merge-gap").css("height", $('.CodeMirror-merge-pane.CodeMirror-merge-editor').height());
-            setTimeout(()=>{	// 解决第一次打开时高度不准的问题
-            	$('#game_test_set_results .CodeMirror-merge').css('display', 'flex')
-            }, 100)
-            // refresh一下，解决CM显示不全的问题
-            mv.edit.refresh()
-			mv.right.orig.refresh()			
+			$("#" + id).find(".CodeMirror").height(height);
+			$(".CodeMirror-merge-gap").find("svg").css("height", height);
+			// 取真实高度
+			$(".CodeMirror-merge-gap").css("height", $('.CodeMirror-merge-pane.CodeMirror-merge-editor').height());
+			setTimeout(() => {	// 解决第一次打开时高度不准的问题
+				$('#game_test_set_results .CodeMirror-merge').css('display', 'flex')
+			}, 100)
+			// refresh一下，解决CM显示不全的问题
+			mv.edit.refresh()
+			mv.right.orig.refresh()
 			testSetsInitedArray[index] = true;
 		}
 
@@ -141,7 +135,7 @@ class CodeEvaluateView extends Component {
 	renderTestSets() {
 		const { output_sets, testSetsExpandedArray, power, allowed_unlock, testSetUnlock, showDialog, challenge, game, user } = this.props;
 		const { testSetsInitedArray } = this.state;
-		
+
 		const { test_sets_array, test_sets_count, had_test_count, test_sets_hidden_count, test_sets_public_count
 			, had_passed_testsests_error_count, had_passed_testsests_hidden_count, had_passed_testsests_public_count } = output_sets;
 
@@ -151,9 +145,7 @@ class CodeEvaluateView extends Component {
 			console.error('no test_sets_array error')
 			return ''
 		}
-		test_sets_array.forEach( (item, index) => {
-			// function toggle_test_case(open, output, actual_output, id, power){
-				// onclick={toggle_test_case(1, output, actual_output, 0, true)}
+		test_sets_array.forEach((item, index) => {
 
 			const isExpanded = testSetsExpandedArray[index]
 
@@ -161,7 +153,7 @@ class CodeEvaluateView extends Component {
 			let _headLockIconClass = '';
 
 			if (item.is_public == 0) {
-				if (game.test_sets_view === true || power === 1){
+				if (game.test_sets_view === true || power === 1) {
 					_headLockIconClass = 'fas fa-unlock-alt'
 				} else {
 					_headLockIconClass = 'fa-lock'
@@ -173,84 +165,80 @@ class CodeEvaluateView extends Component {
 			} else if (item.result == false) {
 				headIconClass = 'fa-exclamation-circle -text-danger'
 			}
-			
-			testSetsComponentArray.push(
-				<div className="-task-ces-top clearfix" onClick={ this.onTestSetHeaderClick.bind(this, index) }
-						style={{cursor:'pointer', 'margin-top':index == 0 ? '4px' : ''}} key={index+'-0'}>
-					<p className="clearfix">
-						<i className={`fa ${ 'fa-caret-right'} mr8 font-16`}
-						style={isExpanded ? {transform: 'rotate(90deg)'} : {}}></i>
-						<span className="font-14">测试集 {index + 1}</span>
-						
-						{ headIconClass && <i className={`fa ${ headIconClass } fr mt2 ml5 font-16`}></i> }
-						{ _headLockIconClass && <i className={`fa ${ _headLockIconClass } fr mt2 ml5 font-16`}></i> }
 
-						{ !!item.ts_mem && <span className="fr description">消耗内存{item.ts_mem}MB</span> }		
-						{ !!item.ts_mem && !!item.ts_time && <span className="split"></span> }				
-						{ !!item.ts_time && <span className="fr description">代码执行时长：{item.ts_time}秒</span> }
-						
+			testSetsComponentArray.push(
+				<div className="-task-ces-top clearfix" onClick={this.onTestSetHeaderClick.bind(this, index)}
+					style={{ cursor: 'pointer', 'margin-top': index == 0 ? '4px' : '' }} key={index + '-0'}>
+					<p className="clearfix">
+						<i className={`fa ${'fa-caret-right'} mr8 font-16`}
+							style={isExpanded ? { transform: 'rotate(90deg)' } : {}}></i>
+						<span className="font-14">测试集 {index + 1}</span>
+
+						{headIconClass && <i className={`fa ${headIconClass} fr mt2 ml5 font-16`}></i>}
+						{_headLockIconClass && <i className={`fa ${_headLockIconClass} fr mt2 ml5 font-16`}></i>}
+
+						{!!item.ts_mem && <span className="fr description">消耗内存{item.ts_mem}MB</span>}
+						{!!item.ts_mem && !!item.ts_time && <span className="split"></span>}
+						{!!item.ts_time && <span className="fr description">代码执行时长：{item.ts_time}秒</span>}
+
 					</p>
 				</div>
 			)
-			
+
 			// 
-			let contentText = (power === 0 && user.is_teacher) ? 
+			let contentText = (power === 0 && user.is_teacher) ?
 				<React.Fragment>
 					<div>{`已经过职业认证的教师可以免金币查看隐藏测试集。`}</div>
-					<div>{`解锁本关所有测试集需要扣除${challenge.score*5}金币，确定要解锁吗？`}</div>
-					<div onClick={()=>this.goToCertification()} style={{color: '#4CACFF', cursor: 'pointer', 'text-decoration': 'underline'
-							, 'margin-top': '12px'}}>立即认证</div>
+					<div>{`解锁本关所有测试集需要扣除${challenge.score * 5}金币，确定要解锁吗？`}</div>
+					<div onClick={() => this.goToCertification()} style={{
+						color: '#4CACFF', cursor: 'pointer', 'text-decoration': 'underline'
+						, 'margin-top': '12px'
+					}}>立即认证</div>
 				</React.Fragment> :
 				<React.Fragment>
-					<div>{`解锁本关所有测试集需要扣除${challenge.score*5}金币`}</div>
+					<div>{`解锁本关所有测试集需要扣除${challenge.score * 5}金币`}</div>
 					<div>{`确定要解锁吗？`}</div>
-				</React.Fragment> 
+				</React.Fragment>
 
 			const moreButtonsRender = () => {
 				return ''
-				// ${this.props.classes.button}
-				// return (power === 0 && user.is_teacher) ? (
-				// 	<Button variant="raised" style={{ marginRight: '20px'}} className={``}
-			    //         		onClick={()=>this.goToCertification()} color="primary"> 
-			    //         { '立即认证' }
-		        //     </Button> 
-				// 	) : ''
 			}
 			testSetsComponentArray.push(
-				<div className="-task-ces-box mb10 clearfix tabContent" key={index+'-1'}>
-					<div className="-task-ces-info" style={ isExpanded ? {display:'block'} : {display:'none'}} id={`test_case_${index}`}>
+				<div className="-task-ces-box mb10 clearfix tabContent" key={index + '-1'}>
+					<div className="-task-ces-info" style={isExpanded ? { display: 'block' } : { display: 'none' }} id={`test_case_${index}`}>
 						{
 							(game.test_sets_view === true || power == 1 || item.is_public == 1) ?
-							(
-                            <React.Fragment>
-                            	{ item.input ?
-                                <div className="pl20 pb5 -task-testline">
-                                    <div className="clearfix df inputTitle" style={{lineHeight: 1.5}}>
-                                        <span className="fl fb color-grey">测试输入：</span>
+								(
+									<React.Fragment>
+										{item.input ?
+											<div className="pl20 pb5 -task-testline">
+												<div className="clearfix df inputTitle" style={{ lineHeight: 1.5 }}>
+													<span className="fl fb color-grey">测试输入：</span>
 
-                                        <div className="fl color-blue input" style={{flex:1,overflow: 'hidden',textOverflow: 'ellipsis',
-    whiteSpace: 'nowrap', marginRight: '15px'}} 
-											// dangerouslySetInnerHTML={{__html: (item.input.replace(/\r\n/g,"</br>"))}}
+													<div className="fl color-blue input" style={{
+														flex: 1, overflow: 'hidden', textOverflow: 'ellipsis',
+														whiteSpace: 'nowrap', marginRight: '15px'
+													}}
 
-										>
-											{item.input}
+													>
+														{item.input}
+													</div>
+
+												</div>
+											</div>
+											: ""}
+										<div className="clearfix" className="outputTitle">
+											<p className="fl with52">- 预期输出 -</p>
+											<p className="fl with48 pl5" style={{ boxSizing: 'border-box' }}>- 实际输出 -</p>
 										</div>
-
-                                    </div>
-                                </div>
-                                : "" }
-                                <div className="clearfix" className="outputTitle">
-                                    <p className="fl with52">- 预期输出 -</p>
-                                    <p className="fl with48 pl5" style={{boxSizing:'border-box'}}>- 实际输出 -</p>
-                                </div>
-                            </React.Fragment>
-							) : 
-							<p className="color-orange -task-testline pl20 " style={{ 'padding-bottom': '8px' }}>
-								{ !allowed_unlock ? '隐藏测试集，暂不支持解锁和查看。' : '此为隐藏测试项。'}
-								{ (power === 0 && allowed_unlock == true) ? <a href="javascript:void(0)" className="color_white test_set_data" 
-									onClick={()=>showDialog({ contentText, callback: testSetUnlock , moreButtonsRender})} 
-									style={{"textDecoration": "underline"}}>解锁</a> : '' }
-							</p>
+									</React.Fragment>
+								) :
+								<p className="color-orange -task-testline pl20 " style={{ 'padding-bottom': '8px' }}>
+									{!allowed_unlock ? '隐藏测试集，暂不支持解锁和查看。' : '此为隐藏测试项。'}
+									{(power === 0 && allowed_unlock == true) ? <a className="color_white test_set_data"
+										onClick={() => showDialog({ contentText, callback: testSetUnlock, moreButtonsRender })}
+										style={{ "textDecoration": "underline" }}>解锁</a> : ''}
+								</p>
 						}
 
 					</div>
@@ -258,7 +246,7 @@ class CodeEvaluateView extends Component {
 					{/*测试集已解锁||管理员||公开的测试集||TODO应该是全通过时 已通过的测试集*/}
 					{
 						(game.test_sets_view == true || power == 1 || item.is_public == 1 || !!item.result === true) ?
-						<div className="result_different_show" id={`result_different_show_${index}`} style={ (!testSetsInitedArray[index] || isExpanded) ? {display:'block'} : {display:'none'}}></div>
+							<div className="result_different_show" id={`result_different_show_${index}`} style={(!testSetsInitedArray[index] || isExpanded) ? { display: 'block' } : { display: 'none' }}></div>
 							: ""
 					}
 
@@ -275,137 +263,114 @@ class CodeEvaluateView extends Component {
 		})
 	}
 
-	onHandleTestCase () {
+	onHandleTestCase() {
 		// console.log(this);
-		const {showOrHide, showOrHideTpiTestCase} = this.props;
+		const { showOrHide, showOrHideTpiTestCase } = this.props;
 		showOrHideTpiTestCase(!showOrHide);
 	}
 
-	handleShowTestCase () {
+	handleShowTestCase() {
 		// console.log('111111111');
-		const {isCollapse, isCollpaseTsetCase, showOrHideTpiTestCase} = this.props;
+		const { isCollapse, isCollpaseTsetCase, showOrHideTpiTestCase } = this.props;
 		isCollpaseTsetCase(!isCollapse);
 		if (isCollapse) {
 			showOrHideTpiTestCase(false);
 		}
 	}
 
-  	render() {
-  		const { evaluateViewExpanded, tabIndex } = this.state;
-  		const { output_sets, latest_output, record, challenge, gameBuilding, myshixun, showOrHide, isCollapse } = this.props;
+	render() {
+		const { evaluateViewExpanded, tabIndex } = this.state;
+		const { output_sets, latest_output, record, challenge, gameBuilding, myshixun, showOrHide, isCollapse } = this.props;
 
 		if (!output_sets) {
 			return (
 				<div>loading</div>
 			)
 		}
-		
+
 		const { test_sets, test_sets_count, had_test_count, test_sets_hidden_count, test_sets_public_count
 			, had_passed_testsests_error_count, had_passed_testsests_hidden_count, had_passed_testsests_public_count } = output_sets;
-		
-		
-		/*
-			<a href="javascript:void(0);" data-tip-left="展开" className="fr mt10 mr15" onClick={this.onEvaluateViewExpand} id="valuation_extend_and_zoom">
-				  	<i className="fa fa-expand font-16 color-grey"></i>
-				  </a>
 
 
-			<li className="blacktab_con" onclick="check_tab('blacktab_con','blacktab_hover',this);">
-				    <a href="javascript:void(0);" className="tab_type tab_color">评测信息</a>
-				  </li>
-
-				  onclick="check_tab('blacktab_con','blacktab_hover',this);"
-		*/
-
 		const _arrowClasses = isCollapse ? 'iconfont icon-xiajiantou btn-arrow' : 'iconfont icon-shangjiantou btn-arrow';
 
-	    return (
-	    	<React.Fragment>
-		    	<ul id="blacktab_nav">
-						<li className="blacktab_con undis" >
-						</li>
-						{ challenge.isHtml ? 
-						<li className={`blacktab_con ${ tabIndex === 0 ? 'tab_hover' : ''}`} onClick={() => this.tabIndexChange(0)}>
+		return (
+			<React.Fragment>
+				<ul id="blacktab_nav">
+					<li className="blacktab_con undis" >
+					</li>
+					{challenge.isHtml ?
+						<li className={`blacktab_con ${tabIndex === 0 ? 'tab_hover' : ''}`} onClick={() => this.tabIndexChange(0)}>
 							<a href="javascript:void(0);" className="tab_type tab_color">效果显示</a>
 						</li> : ''}
-						<li className={`blacktab_con ${ tabIndex === 1 ? 'tab_hover' : ''}`} onClick={() => this.tabIndexChange(1)}>
-							<a href="javascript:void(0);" className="tab_type tab_color">测试结果</a>
-						</li>
-						{this.props&&this.props.vnc_url?<li className="blacktab_con_abs">
-							<span className="code_evalute_icon" onClick={() => this.handleShowTestCase()}>
-								<span className={_arrowClasses}></span>
-							</span>
-						</li>:""}
-							
-							{this.props.inDrawer ? <Tooltip id="tooltip-icon-expand" title={ showOrHide ? "收起" : "展开"}>
-								{/*TODO 按钮大小改造，css*/}
-								{/* icon-guanbi */}
-								{/* <a className="iconButton fr mr15 mt4" onClick={this.props.hideCodeEvaluate} id="extend_and_zoom" >
-									<i className={  "font-18 iconfont icon-guanbi" }></i>
-								</a> */}
-								<a style={{ display: isCollapse ? 'inline-block' : 'none'}} className="iconButton fr mr15" id="extend_and_zoom" onClick={() => this.onHandleTestCase()}>
-									<i className={ showOrHide ? "font-18 iconfont icon-shousuo" : "iconfont icon-zhankai font-18" }></i>
-								</a>
-								
-							</Tooltip> : <Tooltip id="tooltip-icon-expand" title={ evaluateViewExpanded ? "收起" : "展开"}>
-								{/*TODO 按钮大小改造，css*/}
-								
-								<a className="iconButton fr mr15" onClick={this.onEvaluateViewExpand} id="extend_and_zoom" >
-									<i className={ evaluateViewExpanded ? "font-18 iconfont icon-shousuo" : "iconfont icon-zhankai font-18" }></i>
-								</a>
-								
-							</Tooltip>}
-						
-						<div className="cl"></div>
-					</ul>
+					<li className={`blacktab_con ${tabIndex === 1 ? 'tab_hover' : ''}`} onClick={() => this.tabIndexChange(1)}>
+						<a href="javascript:void(0);" className="tab_type tab_color">测试结果</a>
+					</li>
+					{this.props && this.props.vnc_url ? <li className="blacktab_con_abs">
+						<span className="code_evalute_icon" onClick={() => this.handleShowTestCase()}>
+							<span className={_arrowClasses}></span>
+						</span>
+					</li> : ""}
+
+					{this.props.inDrawer ? <Tooltip id="tooltip-icon-expand" title={showOrHide ? "收起" : "展开"}>
+						<a style={{ display: isCollapse ? 'inline-block' : 'none' }} className="iconButton fr mr15" id="extend_and_zoom" onClick={() => this.onHandleTestCase()}>
+							<i className={showOrHide ? "font-18 iconfont icon-shousuo" : "iconfont icon-zhankai font-18"}></i>
+						</a>
+
+					</Tooltip> : <Tooltip id="tooltip-icon-expand" title={evaluateViewExpanded ? "收起" : "展开"}>
+
+							<a className="iconButton fr mr15" onClick={this.onEvaluateViewExpand} id="extend_and_zoom" >
+								<i className={evaluateViewExpanded ? "font-18 iconfont icon-shousuo" : "iconfont icon-zhankai font-18"}></i>
+							</a>
+
+						</Tooltip>}
+
+					<div className="cl"></div>
+				</ul>
 
 
-				<CircularProgress size={40} thickness={3} 
-						style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '10%', display: gameBuilding ? 'block': 'none' }}/>
+				<CircularProgress size={40} thickness={3}
+					style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '10%', display: gameBuilding ? 'block' : 'none' }} />
 				<div id="evaluateMiddleStatusText" style={{
-						marginTop: "4px",
-						textAlign: "center",
-						color: "#4CACFF",
-						display: gameBuilding ? 'block': 'none'
-					}}
+					marginTop: "4px",
+					textAlign: "center",
+					color: "#4CACFF",
+					display: gameBuilding ? 'block' : 'none'
+				}}
 				></div>
 
 				<div id="game_test_set_results" className="-flex -relative blacktab-inner"
-					style={{ display: gameBuilding ? 'none': 'block' }}>
-						
+					style={{ display: gameBuilding ? 'none' : 'block' }}>
+
 					<React.Fragment>
-						<div id="blacktab_con_1" className="htmlContainer" style={ (challenge.isHtml && tabIndex === 0) ? {display: 'block'} : {display: 'none'}  }> 
+						<div id="blacktab_con_1" className="htmlContainer" style={(challenge.isHtml && tabIndex === 0) ? { display: 'block' } : { display: 'none' }}>
 							<form id="html_form" method="post" target="myFrame" action={`/api/myshixuns/${myshixun.identifier}/html_content.html`}>
 								<input type="hidden" name="contents" id="data_param" value=""></input>
 								<input type="hidden" name="educodercss" id="data_css_param" value=""></input>
 								<input type="hidden" name="educoderscript" id="data_js_param" value=""></input>
 							</form>
-							<iframe id="htmlIframe" frameBorder="0" name="myFrame" style={{background: '#fff', height: '100%', width: '100%'}} >
-								
-	        				</iframe> 
+							<iframe id="htmlIframe" frameBorder="0" name="myFrame" style={{ background: '#fff', height: '100%', width: '100%' }} >
+
+							</iframe>
 						</div>
-						<div id="blacktab_con_2" className=" " style={ tabIndex === 1 ? {display: 'block'} : {display: 'none'}  }>
+						<div id="blacktab_con_2" className=" " style={tabIndex === 1 ? { display: 'block' } : { display: 'none' }}>
 							<div className="fit -scroll">
 								<div className="-layout-v -fit paddingbottom60tpm">
 									<div className="-flex -scroll task-padding16 loading-center undis" id="evaluating_ajax_loading"></div>
 									<div className="-flex -scroll task-padding16" id="evaluating_contents">
-										{/*
-											record ?  <span className="fr mr5 tab_color">本次评测耗时：{ record }秒 </span> : ""
-										*/}
-										{ had_test_count === 0 || test_sets_count == null ? <div></div> :
+										{had_test_count === 0 || test_sets_count == null ? <div></div> :
 											had_passed_testsests_error_count === test_sets_count ?
-											<p className="color-light-green mb10 evaluateResult" >
-												<i className="fa fa-check-circle font-16"></i>
-												<span className="ml5 mr5">{test_sets_count}/{test_sets_count}</span> 全部通过
-											</p> : 
-											<p className="-text-danger mb10 evaluateResult">
-												<i className="fa fa-exclamation-circle font-16"></i>
-												<span className="ml5 mr5 -text-danger">{had_passed_testsests_error_count}/{test_sets_count}</span> 
-												{/*.replace(/\\u/gi, '%u') unicode转码 */}
-												{latest_output ? 
-													<span dangerouslySetInnerHTML={{__html: latest_output.replace(/\\r/g,'')}}></span> 
+												<p className="color-light-green mb10 evaluateResult" >
+													<i className="fa fa-check-circle font-16"></i>
+													<span className="ml5 mr5">{test_sets_count}/{test_sets_count}</span> 全部通过
+											</p> :
+												<p className="-text-danger mb10 evaluateResult">
+													<i className="fa fa-exclamation-circle font-16"></i>
+													<span className="ml5 mr5 -text-danger">{had_passed_testsests_error_count}/{test_sets_count}</span>
+													{latest_output ?
+														<span dangerouslySetInnerHTML={{ __html: latest_output.replace(/\\r/g, '') }}></span>
 														: ""}
-											</p>
+												</p>
 										}
 										{this.renderTestSets()}
 									</div>
@@ -415,9 +380,9 @@ class CodeEvaluateView extends Component {
 					</React.Fragment>
 				</div>
 			</React.Fragment>
-	      	
-	    );
-  	}
+
+		);
+	}
 }
 
 const mapStateToProps = (state) => {
diff --git a/src/modules/page/main/CodeRepositoryView.css b/src/modules/page/main/CodeRepositoryView.css
index b0f8eb93..04aec9f0 100644
--- a/src/modules/page/main/CodeRepositoryView.css
+++ b/src/modules/page/main/CodeRepositoryView.css
@@ -1,154 +1,180 @@
 #codetab_con_1 .codePath {
-	color: #fff;
-    margin-left: 30px;
-	display: inline-block;
-}
-	.codemirrorBackground {
-		background-repeat: no-repeat;
-		position:absolute;
-		z-index: 1100;
-		width:160px;
-		height:160px;
-		right: 80px;
-		top: 36px;
-	}
-	/*解决按位取反符号~不垂直居中的问题*/
-	#codetab_con_1 .CodeMirror pre{
-		font-family: Courier New; 
-	}
-	/* 行间距 */
-	#codetab_con_1 .CodeMirror-code>div {
-		/* 不能这样设置行间距，光标会错位（光标不受这个样式的影响） */
-		/* margin-top: 1px; */
-	}
-.cm-s-railscasts.CodeMirror {
-    background: #111c24;
-    margin-top: 3px;
-}
-/* 留30pxmargin 以免字体变大看不到最后面的代码 */
-#games_repository_contents .CodeMirror-code {
-	padding-bottom: 30px;
-}
-#games_repository_contents .CodeMirror-scroll {
-	background: #111C24;
-}
-#games_repository_contents .CodeMirror-activeline .CodeMirror-line {
-	background: #312F3F;
-}
-/*  codemirror 行号背景色、前景色 TODO 这个样式加载太慢，能看到背景颜色变化，解决办法：loading时替换掉整个区域 */
-#games_repository_contents .CodeMirror-linenumber.CodeMirror-gutter-elt, 
-	#games_repository_contents .CodeMirror-gutter.CodeMirror-linenumbers{
-	background: #111c24;
-	color: #747A7F;
+  color: #fff;
+  margin-left: 30px;
+  display: inline-block;
 }
 
-#games_repository_contents #codetab_nav_1 a{
-	width: 80px;
+.codemirrorBackground {
+  background-repeat: no-repeat;
+  position: absolute;
+  z-index: 1100;
+  width: 160px;
+  height: 160px;
+  right: 80px;
+  top: 36px;
 }
+
+/*解决按位取反符号~不垂直居中的问题*/
+#codetab_con_1 .CodeMirror pre {
+  font-family: Courier New;
+}
+
+.cm-s-railscasts.CodeMirror {
+  background: #111c24;
+  margin-top: 3px;
+}
+
+/* 留30pxmargin 以免字体变大看不到最后面的代码 */
+#games_repository_contents .CodeMirror-code {
+  padding-bottom: 30px;
+}
+
+#games_repository_contents .CodeMirror-scroll {
+  background: #111C24;
+}
+
+#games_repository_contents .CodeMirror-activeline .CodeMirror-line {
+  background: #312F3F;
+}
+
+/*  codemirror 行号背景色、前景色 TODO 这个样式加载太慢，能看到背景颜色变化，解决办法：loading时替换掉整个区域 */
+#games_repository_contents .CodeMirror-linenumber.CodeMirror-gutter-elt,
+#games_repository_contents .CodeMirror-gutter.CodeMirror-linenumbers {
+  background: #111c24;
+  color: #747A7F;
+}
+
+#games_repository_contents #codetab_nav_1 a {
+  width: 80px;
+}
+
 #games_repository_contents .dot {
-	width: 4px;
-    height: 4px;
-    border-radius: 2px;
-    background-color: #4CACFF;
-    width: 4px;
-    position: relative;
-    bottom: 15px;
-    left: -19px;
-    display: inline-block;
+  width: 4px;
+  height: 4px;
+  border-radius: 2px;
+  background-color: #4CACFF;
+  width: 4px;
+  position: relative;
+  bottom: 15px;
+  left: -19px;
+  display: inline-block;
 }
 
 #games_repository_valuation .-changebg {
-    height: 2px;
-    background: #19527B;
+  height: 2px;
+  background: #19527B;
 }
 
 /* 文件树 */
 .repoFilesDrawer>div:nth-child(1) {
-	opacity: 0 !important;
+  opacity: 0 !important;
 }
+
 .repoFilesDrawer>div:nth-child(2) {
-	box-shadow: -3px 3px 4px 0px rgba(76,172,255,0.08);
-	background: #05101A;
-    color: #CBCBCB;
+  box-shadow: -3px 3px 4px 0px rgba(76, 172, 255, 0.08);
+  background: #05101A;
+  color: #CBCBCB;
 
-    top: 94px !important;
-    height: 89% !important;
+  top: 94px !important;
+  height: 89% !important;
 
-    min-width: 400px;
+  min-width: 400px;
 }
 
 .codeRepoShow {
-	transform: rotate(90deg);
+  transform: rotate(90deg);
 }
 
 .code-flie-list {
-	background: #05101A;
-	box-shadow: rgb(31, 47, 59) 0px 3px 10px 0px;
-    left: 2px;
-    width: auto !important;
-    padding: 12px 10px;
+  background: #05101A;
+  box-shadow: rgb(31, 47, 59) 0px 3px 10px 0px;
+  left: 2px;
+  width: auto !important;
+  padding: 12px 10px;
 }
 
 .codefile-all p.blue-line {
-	color:#4CACFF;
+  color: #4CACFF;
 }
+
 .codefile-all p:hover {
-	background: none;
-	color:#FFF;
+  background: none;
+  color: #FFF;
 }
+
 .codefile-all p {
-	border-left: none !important;	
-	color: #747A7F;
-	width: auto !important;
+  border-left: none !important;
+  color: #747A7F;
+  width: auto !important;
 }
 
 
 /*  tab右侧iconbutton */
 #blacktab_nav .iconButton {
-	margin-right: 16px;
-	color: #747A7F;
+  margin-right: 16px;
+  color: #747A7F;
 }
-#blacktab_nav a.iconButton:hover {
-	color: #4CACFF;
-	cursor: pointer;
-}
-	#blacktab_nav a {
-		text-decoration: none !important;
-	}
-	#blacktab_nav li a {
-		user-select: none;
 
-	}
-	#blacktab_nav #codetab_nav_add a {
-		height: 28px;
-	}
-	#blacktab_nav .ant-tabs-close-x {
-		border-radius: 8px;
-		background: #394248;
-		padding: 2px;
-		position: absolute;
-		top: 13px;
-		right: 5px;
-		color: #8B9399;
-		font-size: 9px;
-	}
-	#blacktab_nav .ant-tabs-close-x:hover, #blacktab_nav #codetab_nav_add:hover a{
-		color: #4CACFF !important;
-		cursor: pointer;
-	}
+#blacktab_nav a.iconButton:hover {
+  color: #4CACFF;
+  cursor: pointer;
+}
+
+#blacktab_nav a {
+  text-decoration: none !important;
+}
+
+#blacktab_nav li a {
+  user-select: none;
+
+}
+
+#blacktab_nav #codetab_nav_add a {
+  height: 28px;
+}
+
+#blacktab_nav .ant-tabs-close-x {
+  border-radius: 8px;
+  background: #394248;
+  padding: 2px;
+  position: absolute;
+  top: 13px;
+  right: 5px;
+  color: #8B9399;
+  font-size: 9px;
+}
+
+#blacktab_nav .ant-tabs-close-x:hover,
+#blacktab_nav #codetab_nav_add:hover a {
+  color: #4CACFF !important;
+  cursor: pointer;
+}
 
 #extend_and_zoom.iconButton {
-	margin-right: 20px;
+  margin-right: 20px;
 }
 
 /* ssh xterm */
 .term {
-	text-align: left;
+  text-align: left;
 }
+
 .xterm .xterm-viewport {
-	overflow-y: auto !important;
+  overflow-y: auto !important;
 }
 
 .repoFilesDrawer .rc-tree {
-	user-select: none;
+  user-select: none;
+}
+
+.code-banner-button-group {
+  display: flex;
+  flex-flow: row nowrap;
+  align-items: center;
+  height: 40px;
+}
+
+.iconButton {
+  display: flex;
+  align-items: center;
 }
\ No newline at end of file
diff --git a/src/modules/page/main/CodeRepositoryView.js b/src/modules/page/main/CodeRepositoryView.js
index 05c43024..2e13d6de 100644
--- a/src/modules/page/main/CodeRepositoryView.js
+++ b/src/modules/page/main/CodeRepositoryView.js
@@ -1,28 +1,18 @@
 
-import React, { Component } from 'react';
-import ReactDOM from 'react-dom';
+import React, { Component, Fragment } from 'react';
 
 import Drawer from 'material-ui/Drawer';
 import { CircularProgress } from 'material-ui/Progress';
 import Tooltip from 'material-ui/Tooltip';
 import WebSSHTimer from '../component/WebSSHTimer'
-import Webssh from './Webssh'
 import Tree, { TreeNode } from 'rc-tree';
-import 'rc-tree/assets/index.css';
-
 import classNames from 'classnames'
-// import CodeMirror from 'react-codemirror'
-
 import axios from 'axios'
 import _ from 'lodash'
-
+import TPIMonaco from '../component/monaco/TPIMonaco'
 import notEditablePathImg from '../../../images/tpi/notEditablePath.png'
 
-import TPICodeMirror from '../component/TPICodeMirror'
-import TPIMonaco from '../component/monaco/TPIMonaco'
-
 import { loadSshScript, openTerminal } from './Webssh'
-import { Modal } from 'antd';
 
 const $ = window.$;
 
@@ -51,12 +41,12 @@ class CodeRepositoryView extends Component {
         }
     }
     componentDidUpdate(prevProps, prevState, snapshot) {
-        const { game, challenge, hide_code, tabIndex,  } = this.props
+        const { game, challenge, hide_code, tabIndex, } = this.props
 
         if (     // 初始化 或者 game切换
-                !this.treeExpanded && challenge.path && challenge.path.length && this.state.expandedKeys.length === 0 ||
-                game && (!prevProps.game
-                || prevProps.game.identifier !== this.props.game.identifier) ) {
+            !this.treeExpanded && challenge.path && challenge.path.length && this.state.expandedKeys.length === 0 ||
+            game && (!prevProps.game
+                || prevProps.game.identifier !== this.props.game.identifier)) {
 
             if (!this.treeExpanded) {
                 this.treeExpanded = true
@@ -66,8 +56,8 @@ class CodeRepositoryView extends Component {
                 if (_path) {
                     _ar = _path.split('/')
                     _ar.length = _ar.length - 1
-                    _ar.forEach( (item, index) => {
-                        expandedKeys.push( index === 0 ? item : expandedKeys[index - 1] + '/' + item)
+                    _ar.forEach((item, index) => {
+                        expandedKeys.push(index === 0 ? item : expandedKeys[index - 1] + '/' + item)
                     })
                 }
                 expandedKeys.length = 1 // 没办法做到多级初始化，而且会引起点击其他子目录，加载当前文件目录的问题
@@ -92,12 +82,12 @@ class CodeRepositoryView extends Component {
 
     componentDidMount() {
         // 隐藏code tab，则显示ssh tab（81）
-		if (this.props.hide_code === true) {
-			this.tabIndexChange(81)
+        if (this.props.hide_code === true) {
+            this.tabIndexChange(81)
         }
 
         //显示所有代码文件
-        $(".code-file-tab").hover(function(){
+        $(".code-file-tab").hover(function () {
             // var ulwidth=$("#blacktab_nav").width();
             // $(".code-flie-list").width(ulwidth);
 
@@ -105,12 +95,12 @@ class CodeRepositoryView extends Component {
 
             $(this).find("i")
                 .addClass("codeRepoShow")
-                // .removeClass("fa-caret-right").addClass("fa-caret-down");
-        },function(){
+            // .removeClass("fa-caret-right").addClass("fa-caret-down");
+        }, function () {
             $(".code-flie-list").hide();
             $(".code-file-tab").find("i")
                 .removeClass("codeRepoShow")
-                // .removeClass("fa-caret-down").addClass("fa-caret-right");
+            // .removeClass("fa-caret-down").addClass("fa-caret-right");
         })
     }
 
@@ -121,7 +111,7 @@ class CodeRepositoryView extends Component {
             if (_index == -1) {
                 expandedKeys.push(selectedKeys[0])
             } else {
-                expandedKeys.splice( _index, 1)
+                expandedKeys.splice(_index, 1)
             }
             this.setState({ expandedKeys })
         }
@@ -137,14 +127,14 @@ class CodeRepositoryView extends Component {
 
 
         const loop = (data) => {
-          return data.map((item) => {
-            if (item.children) {
-              return <TreeNode title={item.name} key={item.key}>{loop(item.children)}</TreeNode>;
-            }
-            return (
-                <TreeNode title={item.name} key={item.key} isLeaf={item.isLeaf} />
-            );
-          });
+            return data.map((item) => {
+                if (item.children) {
+                    return <TreeNode title={item.name} key={item.key}>{loop(item.children)}</TreeNode>;
+                }
+                return (
+                    <TreeNode title={item.name} key={item.key} isLeaf={item.isLeaf} />
+                );
+            });
         };
         const treeNodes = loop(fileTreeData);
 
@@ -159,17 +149,14 @@ class CodeRepositoryView extends Component {
                 autoExpandParent={this.state.autoExpandParent}
                 loadData={onLoadData}
             >
-              {treeNodes}
+                {treeNodes}
             </Tree>
         )
     }
     onExpand = (expandedKeys) => {
-        // console.log('onExpand', arguments);
-        // if not set autoExpandParent to false, if children expanded, parent can not collapse.
-        // or, you can remove all expanded children keys.
         this.setState({
-          expandedKeys,
-          autoExpandParent: false,
+            expandedKeys,
+            autoExpandParent: false,
         });
     }
 
@@ -189,57 +176,48 @@ class CodeRepositoryView extends Component {
         let { pathIndex, path } = challenge;
         var domArray = [];
         const pathArray = path.forEach ? path : [path]
-        pathArray.forEach( (item, index) => {
+        pathArray.forEach((item, index) => {
             domArray.push(
-                <p key={index} className={classNames({'blue-line': pathIndex == index})} onClick={ () => this.onPathChange(index, true) } >
+                <p key={index} className={classNames({ 'blue-line': pathIndex == index })} onClick={() => this.onPathChange(index, true)} >
                     {item}
-                </p> )
+                </p>)
         })
 
         return (
-                <div className="codefile-all pl10">
-                    {domArray}
-                </div>
-            )
+            <div className="codefile-all pl10">
+                {domArray}
+            </div>
+        )
     }
     initSsh = ($, tabIndex, isReInit) => {
         const { myshixun } = this.props;
         const url = `/myshixuns/${myshixun.identifier}/open_webssh.json`
         tabIndex && $(`#codetab_con_${tabIndex}`).html('正在连接命令行服务...')
-        axios.get(url,
-            {
-                // withCredentials: true
-            }
-        ).then((response) => {
+        axios.get(url).then((response) => {
             tabIndex && $(`#codetab_con_${tabIndex}`).html('')    // 清空 ‘正在连接命令行服务...’
 
             if (response.data.game_id) {
                 // 重置ssh状态
                 this.setSSHClosed(false);
 
-                const { game_id, host, password, port, username, webssh_url} = response.data
                 // js_min_all.js有同样的计算逻辑，用来拖拽时计算ssh高宽
-                // TODO 结合new Terminal 时的fontSize参数来定高度
                 const gameCtx = $("#games_repository_contents");
-                gameCtx.css({'padding-bottom': '30px', 'background': '#000'});
-                var h      = gameCtx.height() - 50;
-                var w      = gameCtx.width();
+                var h = gameCtx.height() - 50;
+                var w = gameCtx.width();
                 var line_h = (navigator.userAgent.indexOf('Chrome') >= 0 ? 18 : 19);
-                var rows   = Math.round(h / line_h);
-                var cols   = parseInt(w / 9.9);
+                var rows = Math.round(h / line_h);
+                var cols = parseInt(w / 9.9);
 
                 response.data.width = w;
                 response.data.height = h;
                 response.data.line_h = line_h;
                 response.data.rows = rows;
                 response.data.cols = cols;
-                 // https://stackoverflow.com/questions/5645485/detect-mousemove-when-over-an-iframe
-                // this.loadSshInIframe( response.data, tabIndex )
+                // https://stackoverflow.com/questions/5645485/detect-mousemove-when-over-an-iframe
 
                 this.loadSshNormal(response.data, tabIndex, isReInit)
 
             }
-            // console.log(response)
         }).catch((error) => {
             console.log(error)
         })
@@ -253,16 +231,7 @@ class CodeRepositoryView extends Component {
             })
             return;
         }
-        // 不用iframe直接渲染ssh
-        // $(".game_webssh").css({"min-height":h, "max-height":h});
         const container = $(`#codetab_con_${tabIndex}`);
-        // ReactDOM.unmountComponentAtNode(container)
-        // ReactDOM.render(<Webssh {...data}
-        //     ></Webssh>, container);
-        // this.setState({
-        //     sshData: data
-        // })
-
         loadSshScript(() => {
             container.html('<div id="term" class="term" align="center"></div>')
             openTerminal(data, `#codetab_con_${tabIndex}`)
@@ -270,12 +239,9 @@ class CodeRepositoryView extends Component {
     }
     loadSshInIframe(data, tabIndex) {
         const { game_id, host, password, port, username, webssh_url
-        , height, width, line_h, rows, cols, } = data
+            , height, width, line_h, rows, cols, } = data
 
         let _domain = webssh_url || 'https://webssh.educoder.net';
-        // window.location.host === "www.educoder.net" ?
-        //       'https://webssh.educoder.net'
-        //     : 'https://testwebssh.educoder.net'
         const html = `<iframe src="${_domain}/?Host=${host}&amp;Port=${port}&amp;Username=${username}&amp;Password=${password}&amp;Gameid=${game_id}&amp;Rows=${rows}&amp;Tab=81&amp;Columns=${cols}&amp;Width=${width}&amp;Height=${height}" style="width: 100%; border: 0px; min-height: 454px; max-height: 454px; " scrolling="no" id="game_webssh" class="game_webssh"></iframe>`
         $(`#codetab_con_${tabIndex}`).html(html)
     }
@@ -298,7 +264,7 @@ class CodeRepositoryView extends Component {
     }
     getAddtionalSSHNewID() {
         // addtionalSSHIdMap
-        for(let i = addtionalSSHStartId; i < addtionalSSHStartId + totalAddtionalTabCount; i++) {
+        for (let i = addtionalSSHStartId; i < addtionalSSHStartId + totalAddtionalTabCount; i++) {
             if (!addtionalSSHIdMap[i]) {
                 return i
             }
@@ -320,25 +286,17 @@ class CodeRepositoryView extends Component {
             关闭连接，清空tab content
         */
         let _w = $(`.game_webssh_${id}`)[0].contentWindow
-			_w && _w.postMessage({tp: 'close_ssh_cocket'}, "*");
+        _w && _w.postMessage({ tp: 'close_ssh_cocket' }, "*");
         $(`#codetab_con_${id}`).html('')
     }
-    close_ssh_cocket_normal = (id) => {
-        /*
-            关闭连接，清空tab content
-        */
-        // let _w = $(`.game_webssh_${id}`)[0].contentWindow
-		// 	_w && _w.postMessage({tp: 'close_ssh_cocket'}, "*");
-        // $(`#codetab_con_${id}`).html('')
-    }
+    close_ssh_cocket_normal = () => { }
     onSSHTabClose = (id, e) => {
         let addtionalSSHArray = this.state.addtionalSSHArray.slice(0)
-        _.remove(addtionalSSHArray, (item)=> item === id)
+        _.remove(addtionalSSHArray, (item) => item === id)
         addtionalSSHIdMap[id] = false;
         this.tabIndexChange(STABLE_SSH_TAB_ID)
         this.setState({ addtionalSSHArray })
         // game_webssh_${tabIndex} TODO
-
         this.close_ssh_cocket_normal(id)
         e.stopPropagation();
     }
@@ -351,28 +309,21 @@ class CodeRepositoryView extends Component {
     }
     /**  multi ssh end */
 
-  	render() {
+    render() {
 
         const { repositoryCode, onRepositoryCodeUpdate, showFilesDrawer, drawerOpen, loadingFirstRepoFiles
-                , challenge, evaluateViewExpanded, onRepositoryViewExpand, codeStatus ,
-                showResetCodeDialog, showResetPassedCodeDialog, tabIndex, tabIndexChange, game, shixun, isEditablePath, currentPath
-                , showSettingDrawer, hide_code } = this.props;
-        // onRequestChange={(drawerOpen) => showFilesDrawer(drawerOpen)}
-        /*
-
-            <p className="pl10 pr10 mt5 mb5 edu-txt-left" style={{height:'30px'}}>
-                                请点击文件名称切换代码显示，<span className="blue-line">代表当前显示的代码文件</span>
-                            </p>
-        */
+            , challenge, evaluateViewExpanded, onRepositoryViewExpand, codeStatus,
+            showResetCodeDialog, showResetPassedCodeDialog, tabIndex, tabIndexChange, game, shixun, isEditablePath, currentPath
+            , showSettingDrawer, hide_code } = this.props;
         const { tpm_cases_modified, tpm_modified, tpm_script_modified, myshixun, onShowUpdateDialog } = this.props;
         let needUpdateScript = (tpm_modified || tpm_script_modified) && challenge.st === 0;
         const showUpdateButton = (tpm_cases_modified || needUpdateScript) && myshixun.system_tip === true;
 
         const { addtionalSSHArray, sshIsClosed } = this.state;
         // shixun.multi_webssh = true;
-	    return (
+        return (
             <React.Fragment>
-		      	<Drawer
+                <Drawer
                     anchor="right"
 
                     className="repoFilesDrawer"
@@ -380,103 +331,90 @@ class CodeRepositoryView extends Component {
                     width={300}
                     open={drawerOpen}
 
-                    onClose={() => showFilesDrawer( false )}
+                    onClose={() => showFilesDrawer(false)}
                 >
-                    { loadingFirstRepoFiles ? (
-                        <div style={{width: '100%', height:'200px', textAlign: 'center', marginTop: '48px'}} >
-                            <CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '40%', display: 'block' }}/>
+                    {loadingFirstRepoFiles ? (
+                        <div style={{ width: '100%', height: '200px', textAlign: 'center', marginTop: '48px' }} >
+                            <CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '40%', display: 'block' }} />
                         </div>
-                        ) : this.buildTree()}
+                    ) : this.buildTree()}
                 </Drawer>
 
                 <ul id="blacktab_nav" className="">
 
-                    { hide_code === false && <li id="codetab_nav_1" className={classNames('code-file-tab', 'eud-pointer', 'pr', 'blacktab_nomal', {'blacktab_hover':tabIndex===0 })} onClick={() => tabIndexChange(0)}>
-                        <a href="javascript:void(0);" className={classNames('tab_type', 'tab_color', {'fl': challenge.pathIndex === -1 || challenge.multiPath === true } )}>代码文件</a>
+                    {hide_code === false && <li id="codetab_nav_1" className={classNames('code-file-tab', 'eud-pointer', 'pr', 'blacktab_nomal', { 'blacktab_hover': tabIndex === 0 })} onClick={() => tabIndexChange(0)}>
+                        <a href="javascript:void(0);" className={classNames('tab_type', 'tab_color', { 'fl': challenge.pathIndex === -1 || challenge.multiPath === true })}>代码文件</a>
 
-                        { (challenge.pathIndex === -1 || challenge.multiPath === true) ?
+                        {(challenge.pathIndex === -1 || challenge.multiPath === true) ?
                             <React.Fragment>
                                 <i className="fr fa mt13 tab_color fa-caret-right"></i>
                                 <div className="code-flie-list" style={{ display: 'none' }}>
                                     {this.renderChallengePath()}
                                 </div>
                             </React.Fragment>
-                        : "" }
+                            : ""}
 
-                    </li> }
+                    </li>}
 
                     {shixun.webssh !== 0 &&
-                    <li id="codetab_nav_2" data-tab="2" className={classNames('add-webssh', 'blacktab_nomal', {'blacktab_hover':tabIndex===STABLE_SSH_TAB_ID })}
-                        onClick={() => this.tabIndexChange(STABLE_SSH_TAB_ID)}>
-                        <a href="javascript:void(0);" className="tab_type tab_color">命令行</a>
-                    </li> }
+                        <li id="codetab_nav_2" data-tab="2" className={classNames('add-webssh', 'blacktab_nomal', { 'blacktab_hover': tabIndex === STABLE_SSH_TAB_ID })}
+                            onClick={() => this.tabIndexChange(STABLE_SSH_TAB_ID)}>
+                            <a href="javascript:void(0);" className="tab_type tab_color">命令行</a>
+                        </li>}
                     {
-                        addtionalSSHArray.map( (item, index) => {
+                        addtionalSSHArray.map((item, index) => {
                             return (<li id={`codetab_nav_${item}`} data-tab={item}
-                                    className={classNames('add-webssh', 'blacktab_nomal', {'blacktab_hover':tabIndex===item })}
-                                    onClick={() => this.tabIndexChange(item)}>
+                                className={classNames('add-webssh', 'blacktab_nomal', { 'blacktab_hover': tabIndex === item })}
+                                onClick={() => this.tabIndexChange(item)}>
                                 <a href="javascript:void(0);" className="tab_type tab_color">命令行{index + 1}</a>
-                                <Tooltip title={ "关闭该命令行窗口"} disableFocusListener={true}>
-                                <i class="anticon anticon-close ant-tabs-close-x" onClick={(e) => this.onSSHTabClose(item, e)}>
-                                    <svg viewBox="64 64 896 896" class="" data-icon="close" width="1em" height="1em"
-                                        fill="currentColor" aria-hidden="true">
-                                        <path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 0 0 203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path>
-                                    </svg>
-                                </i>
+                                <Tooltip title={"关闭该命令行窗口"} disableFocusListener={true}>
+                                    <i class="anticon anticon-close ant-tabs-close-x" onClick={(e) => this.onSSHTabClose(item, e)}>
+                                        <svg viewBox="64 64 896 896" class="" data-icon="close" width="1em" height="1em"
+                                            fill="currentColor" aria-hidden="true">
+                                            <path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 0 0 203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"></path>
+                                        </svg>
+                                    </i>
                                 </Tooltip>
                             </li>)
                         })
                     }
 
                     {/* */}
-                    { shixun.webssh !== 0 && shixun.multi_webssh == true && addtionalSSHArray.length < totalAddtionalTabCount
-                        && sshIsClosed === false && <li id="codetab_nav_add" className="c_white" style={{paddingLeft:'10px'}}>
-                        <Tooltip title={ "新开命令行窗口"} disableFocusListener={true}>
-                            <a href="javascript:void(0);" className="tab_type tab_color"
-                                onClick={this.addSSHTabs}
-                            >＋</a>
-                        </Tooltip>
-                    </li> }
+                    {shixun.webssh !== 0 && shixun.multi_webssh == true && addtionalSSHArray.length < totalAddtionalTabCount
+                        && sshIsClosed === false && <li id="codetab_nav_add" className="c_white" style={{ paddingLeft: '10px' }}>
+                            <Tooltip title={"新开命令行窗口"} disableFocusListener={true}>
+                                <a href="javascript:void(0);" className="tab_type tab_color"
+                                    onClick={this.addSSHTabs}
+                                >＋</a>
+                            </Tooltip>
+                        </li>}
 
-                    { tabIndex === 0 && <h3 id="save_status" className="ml15 mt7 fl color-grey font-14" style={{fontWeight: 'normal'}}>
-                        {codeStatus === 0 ? '已修改' : (codeStatus === 1 ? '保存中...' : '已保存' ) }
-                    </h3> }
-                    <div className="fr -horizontal">
-
-                        { /**/ }
-                        {
-                            <WebSSHTimer game={game} showTimerProp={this.isSSHTabIndex()}
-                                reInitSsh={this.initSsh} setSSHClosed={this.setSSHClosed}></WebSSHTimer>
+                    {tabIndex === 0 && <h3 id="save_status" className="ml15 fl color-grey font-14" style={{ fontWeight: 'normal', lineHeight: "40px" }}>
+                        {codeStatus === 0 ? '已修改' : (codeStatus === 1 ? '保存中...' : '已保存')}
+                    </h3>}
+                    <div className="fr code-banner-button-group">
+                        {<WebSSHTimer game={game} showTimerProp={this.isSSHTabIndex()} reInitSsh={this.initSsh} setSSHClosed={this.setSSHClosed}></WebSSHTimer>}
+                        {showUpdateButton &&
+                            <React.Fragment>
+                                <a className="iconButton" onClick={() => { onShowUpdateDialog() }}>
+                                    <Tooltip title={"更新通知"} disableFocusListener={true}>
+                                        <i className="iconfont icon-gonggao font-20 "></i>
+                                    </Tooltip>
+                                </a>
+                                <span className="dot"></span>
+                            </React.Fragment>
                         }
-
-                        { showUpdateButton &&
-                        <React.Fragment>
-
-                            <a   className="iconButton" onClick={()=>{ onShowUpdateDialog() }}>
-                                <Tooltip title={ "更新通知"} disableFocusListener={true}>
-                                    <i className="iconfont icon-gonggao font-20 "></i>
-                                </Tooltip>
-                            </a>
-
-                        <span className="dot"></span>
-                        </React.Fragment>
-                        }
-
-                        { !shixun.code_hidden && tabIndex === 0 &&
-                            <a  className="iconButton" onClick={showFilesDrawer.bind(this, true)} >
-                                <Tooltip title={ "文件目录"} disableFocusListener={true}>
+                        {!shixun.code_hidden && tabIndex === 0 &&
+                            <a className="iconButton" onClick={showFilesDrawer.bind(this, true)} >
+                                <Tooltip title={"文件目录"} disableFocusListener={true}>
                                     <i className="iconfont icon-wenjian font-18 "></i>
                                 </Tooltip>
                             </a>
-                         }
-
-                        <span id="return_last_code">
-                        </span>
-
-                        { challenge.pathIndex !== -1 && game.status === 2 && tabIndex === 0 &&
-                                this.props.readRepoTimeout !== true &&
-                            <a href="javascript:void(0);" className="iconButton" id="reset_success_game_code" onClick={showResetPassedCodeDialog}>
-                                <Tooltip title={ "加载上次通过的代码"} disableFocusListener={true}>
+                        }
+                        {challenge.pathIndex !== -1 && game.status === 2 && tabIndex === 0 &&
+                            this.props.readRepoTimeout !== true &&
+                            <a className="iconButton" id="reset_success_game_code" onClick={showResetPassedCodeDialog}>
+                                <Tooltip title={"加载上次通过的代码"} disableFocusListener={true}>
                                     <i className="iconfont icon-fanhuishangcidaima font-20 "></i>
                                 </Tooltip>
                             </a>
@@ -484,83 +422,64 @@ class CodeRepositoryView extends Component {
 
                         {
                             challenge.pathIndex !== -1 && tabIndex === 0 && this.props.readRepoTimeout !== true &&
-                            <a href="javascript:void(0);" className="iconButton" id="reset_game_code" onClick={showResetCodeDialog}>
-                                <Tooltip title={ "恢复初始代码"} disableFocusListener={true}>
+                            <a className="iconButton" id="reset_game_code" onClick={showResetCodeDialog}>
+                                <Tooltip title={"恢复初始代码"} disableFocusListener={true}>
                                     <i className="iconfont icon-zhongzhi font-20 "></i>
                                 </Tooltip>
                             </a>
-                         }
+                        }
 
                         {
                             tabIndex === 0 && this.props.readRepoTimeout !== true &&
-                            <a href="javascript:void(0);" className="iconButton" id="setting" onClick={() => showSettingDrawer(true)}>
-                                <Tooltip title={ "设置"} disableFocusListener={true}>
-                                    <i className="iconfont icon-shezhi " style={{fontSize: '19px'}}></i>
+                            <a className="iconButton" id="setting" onClick={() => showSettingDrawer(true)}>
+                                <Tooltip title={"设置"} disableFocusListener={true}>
+                                    <i className="iconfont icon-shezhi " style={{ fontSize: '19px' }}></i>
                                 </Tooltip>
                             </a>
                         }
 
                         <a href="javascript:void(0);" className="mr15 iconButton" onClick={onRepositoryViewExpand} id="extend_and_zoom">
-                            <Tooltip id="tooltip-icon-expand" title={ evaluateViewExpanded ? "收起" : "展开"}>
-                                {/*<i className="fa font-16 fa-expand"></i>*/}
-                                <i className={ evaluateViewExpanded ? "font-18 iconfont icon-shousuo" : "iconfont icon-zhankai font-18" }></i>
+                            <Tooltip id="tooltip-icon-expand" title={evaluateViewExpanded ? "收起" : "展开"}>
+                                <i className={evaluateViewExpanded ? "font-18 iconfont icon-shousuo" : "iconfont icon-zhankai font-18"}></i>
                             </Tooltip>
                         </a>
 
                     </div>
-                    <div className="cl"></div>
                 </ul>
                 <div className="cl"></div>
 
-                <div id="codetab_con_1" style={{display: 'block', flex: 'auto'}} style={ tabIndex === 0 ? {display: 'block'} : {display: 'none'}  }>
-                    {/* 没必要显示这个，注释掉了 */}
-                    {/* { !isEditablePath &&
-                        <Tooltip title={ "当前文件路径(只读)"}>
-                            <div className="codePath">
-                                {currentPath}
-                            </div>
-                        </Tooltip>
-                    } */}
+                <div id="codetab_con_1" style={tabIndex === 0 ? { display: 'block' } : { display: 'none' }}>
+
                     {this.props.readRepoTimeout === true ? <div className="readRepoFailed">
-                        代码加载失败，<a className="retry"
+                        代码加载失败，请检查学员任务文件设置是否正确，或<a className="retry"
                             onClick={() => this.props.fetchRepositoryCode(this.props, null, null, true, true)}>重试</a>
                     </div> :
-                    <React.Fragment>
-                        <div className="codemirrorBackground"
-                            style={{ backgroundImage: `url('${notEditablePathImg}')`
-                                , display: (isEditablePath || this.props.shixun && this.props.shixun.code_edit_permission ? 'none' : 'block') }}></div>
-                        {/*<textarea className = "" id="extend-challenge-file-edit" name="content">{repositoryCode}</textarea>*/}
-                        {/* cm monaco 切换 */}
-                        {/* <TPICodeMirror {...this.props} ></TPICodeMirror> */}
-                        <TPIMonaco {...this.props}></TPIMonaco>
-                    </React.Fragment>
+                        <Fragment>
+                            {(isEditablePath || shixun && shixun.code_edit_permission) ? null :
+                                <div className="codemirrorBackground" style={{ backgroundImage: `url('${notEditablePathImg}')` }}></div>
+                            }
+                            <TPIMonaco {...this.props}></TPIMonaco>
+                        </Fragment>
+
                     }
                 </div>
                 <div id="codetab_con_81" className="undis -relative"
-                    style={ { color: '#fff', display: tabIndex === STABLE_SSH_TAB_ID ? 'block' : 'none', 'marginLeft': '2px'} }>
+                    style={{ color: '#fff', display: tabIndex === STABLE_SSH_TAB_ID ? 'block' : 'none', 'marginLeft': '2px' }}>
                     {/* { tabIndex === STABLE_SSH_TAB_ID && this.state.sshData && <Webssh {...this.state.sshData} ></Webssh> } */}
                 </div>
                 <div id="codetab_con_82" className="undis -relative"
-                    style={ { color: '#fff', display: tabIndex === 82 ? 'block' : 'none', 'marginLeft': '2px', 'paddingBottom': '30px' } }>
+                    style={{ color: '#fff', display: tabIndex === 82 ? 'block' : 'none', 'marginLeft': '2px', 'paddingBottom': '30px' }}>
                 </div>
                 <div id="codetab_con_83" className="undis -relative"
-                    style={ { color: '#fff', display: tabIndex === 83 ? 'block' : 'none', 'marginLeft': '2px', 'paddingBottom': '30px'} }>
+                    style={{ color: '#fff', display: tabIndex === 83 ? 'block' : 'none', 'marginLeft': '2px', 'paddingBottom': '30px' }}>
                 </div>
                 <div id="codetab_con_84" className="undis -relative"
-                    style={ { color: '#fff', display: tabIndex === 84 ? 'block' : 'none', 'marginLeft': '2px', 'paddingBottom': '30px'} }>
+                    style={{ color: '#fff', display: tabIndex === 84 ? 'block' : 'none', 'marginLeft': '2px', 'paddingBottom': '30px' }}>
                 </div>
-                <div id="codetab_con_3" className="undis -relative" style={{display: 'none'}}></div>
-		    </React.Fragment>
-	    );
-  	}
+                <div id="codetab_con_3" className="undis -relative" style={{ display: 'none' }}></div>
+            </React.Fragment>
+        );
+    }
 }
-/*
-    <%= Redmine::CodesetUtil.replace_invalid_utf8(@content) %>
-    , overflow: 'scroll'  ref="editor"
-    <CodeMirror style={{height: '100%'}} value={repositoryCode} onChange={onRepositoryCodeUpdate} options={cmOptions} />
 
-    <iframe src="https://testwebssh.educoder.net/?Host=10.9.81.28&amp;Port=44940&amp;Username=root&amp;Password=123123&amp;Gameid=2618&amp;Rows=24&amp;Tab=2"
-                        style={{width: '100%', border: '0px', minHeight: '440px', maxHeight: '440px'}} scrolling="no" id="game_webssh" className="game_webssh"></iframe>
-*/
-
-export default CodeRepositoryView;
+export default CodeRepositoryView;
\ No newline at end of file
diff --git a/src/modules/page/main/CodeRepositoryViewContainer.js b/src/modules/page/main/CodeRepositoryViewContainer.js
index bbb3c47a..507049a1 100644
--- a/src/modules/page/main/CodeRepositoryViewContainer.js
+++ b/src/modules/page/main/CodeRepositoryViewContainer.js
@@ -17,27 +17,27 @@ function addPrePath(treeData, parentNodePath) {
 	})
 }
 function getNewTreeData(treeData, curKey, child, level) {
-  const loop = (data) => {
-    data.forEach((item) => {
-    	// 这里不能用indexOf 同一级可能出现test目录和test.py文件
-      if (item.key == curKey) {
-          if (child && child.length) {	// 可能没有子节点
-			child = addPrePath(child, curKey);
-			item.children = child;
-		  }
-		  item.isLeaf = false;
-      } else {
-      	if (item.children) {
-          loop(item.children);
-        }
-      }
-    });
-  };
-  loop(treeData);
+	const loop = (data) => {
+		data.forEach((item) => {
+			// 这里不能用indexOf 同一级可能出现test目录和test.py文件
+			if (item.key == curKey) {
+				if (child && child.length) {	// 可能没有子节点
+					child = addPrePath(child, curKey);
+					item.children = child;
+				}
+				item.isLeaf = false;
+			} else {
+				if (item.children) {
+					loop(item.children);
+				}
+			}
+		});
+	};
+	loop(treeData);
 }
 
 function fileData2TreeData(repoFilesData) {
-	if(repoFilesData!=null){
+	if (repoFilesData != null) {
 		const fileTreeData = [];
 		repoFilesData.forEach((item) => {
 			if (item.kind === 'file') {
@@ -79,17 +79,17 @@ class CodeRepositoryViewContainer extends Component {
 		}
 	}
 	showSettingDrawer = (open) => {
-		this.setState({settingDrawerOpen: open})
+		this.setState({ settingDrawerOpen: open })
 	}
 	tabIndexChange = (index) => {
-		this.setState({tabIndex: index});
+		this.setState({ tabIndex: index });
 	}
 	onRepositoryViewExpand() {
 		window.repository_extend_and_zoom();
 		this.setState({
 			evaluateViewExpanded: !this.state.evaluateViewExpanded
 		}, () => {
-			setTimeout(()=>{
+			setTimeout(() => {
 				window.__tpiOnResize()
 			}, 300)
 		})
@@ -104,8 +104,8 @@ class CodeRepositoryViewContainer extends Component {
 		}
 
 		this.setState({
-            drawerOpen: open,
-        })
+			drawerOpen: open,
+		})
 	}
 	loadRepoFiles = () => {
 		if (!this.state.fileTreeData) {
@@ -113,29 +113,23 @@ class CodeRepositoryViewContainer extends Component {
 		}
 	}
 
-	componentWillReceiveProps(newProps, oldProps) {
-		
-	}
-	componentDidMount() {
-	
-	}
 
 	componentDidUpdate(prevProps, prevState, snapshot) {
 		const { game, challenge } = this.props
-		if (this.props.game && (!prevProps.game || prevProps.game.identifier !== this.props.game.identifier) ) {
+		if (this.props.game && (!prevProps.game || prevProps.game.identifier !== this.props.game.identifier)) {
 			this.setState({
-				fileTreeSelectedKeys: [ challenge.multiPath ? challenge.path[0] : challenge.path ]
+				fileTreeSelectedKeys: [challenge.multiPath ? challenge.path[0] : challenge.path]
 			})
 			// 初始化
 		} else if (this.state.fileTreeSelectedKeys.length === 0 && challenge && challenge.path) {
 			this.setState({
-				fileTreeSelectedKeys: [ challenge.multiPath ? challenge.path[0] : challenge.path ]
+				fileTreeSelectedKeys: [challenge.multiPath ? challenge.path[0] : challenge.path]
 			})
 		} else if (challenge && prevProps && prevProps.challenge
-				&& challenge.pathIndex != prevProps.challenge.pathIndex
-				&& challenge.pathIndex !== -1) {
+			&& challenge.pathIndex != prevProps.challenge.pathIndex
+			&& challenge.pathIndex !== -1) {
 			this.setState({
-				fileTreeSelectedKeys: [ challenge.multiPath ? challenge.path[challenge.pathIndex] : challenge.path ]
+				fileTreeSelectedKeys: [challenge.multiPath ? challenge.path[challenge.pathIndex] : challenge.path]
 			})
 		}
 	}
@@ -146,20 +140,20 @@ class CodeRepositoryViewContainer extends Component {
 		})
 	}
 	onLoadData = (treeNode) => {
-	    if (treeNode.props.children && treeNode.props.children.length) {
-	      return new Promise((resolve) => {
-	        resolve();
-	      });
-	    }
-	    return new Promise((resolve, reject) => {
-    		this.fetchRepoFiles(treeNode, resolve, reject)
-   		});
-  	}
+		if (treeNode.props.children && treeNode.props.children.length) {
+			return new Promise((resolve) => {
+				resolve();
+			});
+		}
+		return new Promise((resolve, reject) => {
+			this.fetchRepoFiles(treeNode, resolve, reject)
+		});
+	}
 	map2OldData = (treeData) => {
 		if (!treeData || treeData.length == 0) {
 			return []
 		}
-		
+
 		if (!treeData || treeData.length === 0) return treeData;
 		treeData = treeData.map(item => {
 			return {
@@ -170,23 +164,19 @@ class CodeRepositoryViewContainer extends Component {
 		})
 		return treeData;
 	}
-	
+
 	fetchRepoFiles(treeNode, resolve, reject) {
 		// http://localhost:3000/api/v1/games/829al3mst4fy/entries?path=src/step1&rev=master
 		if (!this.props.challenge || !this.props.game) {
 			return;
 		}
-		// var ar = this.props.challenge.path.split('/');
-		// ar.length = ar.length - 2;
-		// var _path = ar.join('/');
-		var _path = treeNode ? treeNode.props.eventKey : '' ;
+		var _path = treeNode ? treeNode.props.eventKey : '';
 		if (_path.charAt(0) === '/') {
 			_path = _path.substring(1)
 		}
-		// var url = `/api/v1/games/${this.props.game.identifier}/entries?path=${_path}&rev=master&gpid=${this.props.myshixun.gpid}`
 		let url = `/myshixuns/${this.props.myshixun.identifier}/repository.json`
 
-		
+
 		if (!this.state.fileTreeData || this.state.fileTreeData.length === 0) {
 			this.setState({
 				loadingFirstRepoFiles: true,
@@ -194,44 +184,39 @@ class CodeRepositoryViewContainer extends Component {
 		}
 		var that = this;
 		axios.post(url, {
-				path: _path
-				// withCredentials: true,
+			path: _path
+		})
+			.then((response) => {
+				const repoFilesData = this.map2OldData(response.data.trees)
+				if (!this.state.fileTreeData || this.state.fileTreeData.length === 0) {  	// 还没树节点，没加载过
+
+					const fileTreeData = fileData2TreeData(repoFilesData)
+					this.setState({
+						fileTreeData,
+						loadingFirstRepoFiles: false,
+					});
+				} else {
+					var _treeNode = treeNode;
+					var _eventKey = _treeNode.props.eventKey;
+
+					const fileTreeData = that.state.fileTreeData;
+					// 新的数组放置到treenode下
+
+					const tempFileTreeData = fileData2TreeData(repoFilesData)
+
+					getNewTreeData(fileTreeData, _eventKey, tempFileTreeData, 2);
+					this.setState({
+						fileTreeData,
+					})
+				}
+
+				resolve && resolve();
+
 			})
-		  	.then((response) => {
-				// if (!response) {
-				// 	resolve && resolve();
-				// 	return;
-				// }
-		  		const repoFilesData = this.map2OldData(response.data.trees)
-			    if (!this.state.fileTreeData || this.state.fileTreeData.length === 0) {  	// 还没树节点，没加载过
-			 
-				    const fileTreeData = fileData2TreeData(repoFilesData)
-			        this.setState({ 
-				    	fileTreeData, 
-				    	loadingFirstRepoFiles: false,
-				    });
-			    } else {
-			    	var _treeNode = treeNode;
-			    	var _eventKey = _treeNode.props.eventKey;
-			    	
-			    	const fileTreeData = that.state.fileTreeData;
-			    	// 新的数组放置到treenode下
-			    	
-			    	const tempFileTreeData = fileData2TreeData(repoFilesData)
-
-			    	getNewTreeData(fileTreeData, _eventKey, tempFileTreeData, 2);
-			    	this.setState({
-			    		fileTreeData,
-			    	})
-			    }
-			    
-			    resolve && resolve();
-
-		  	})
-		  	.catch(function (error) {
-		    	console.log(error);
-		    	reject && reject();
-		  	});
+			.catch(function (error) {
+				console.log(error);
+				reject && reject();
+			});
 	}
 	onTreeSelect = (selectedKeys, info) => {
 		const isLeaf = info.node.isLeaf();
@@ -240,7 +225,7 @@ class CodeRepositoryViewContainer extends Component {
 				fileTreeSelectedKeys: selectedKeys
 			})
 			const { fetchRepositoryCode, onPathChange, showSnackbar, challenge } = this.props;
-			
+
 			const nodePath = info.node.props.eventKey;
 			let isCurrentFile = false;
 			// 设置pathIndex为-1，那么代码文件下拉可以切回可编辑的文件
@@ -249,7 +234,7 @@ class CodeRepositoryViewContainer extends Component {
 					if (challenge.pathIndex === 0) {
 						showSnackbar(`当前编辑文件已经是${nodePath}`)
 					} else {
-						fetchRepositoryCode(null, nodePath, 1);	
+						fetchRepositoryCode(null, nodePath, 1);
 						onPathChange(0)
 					}
 					return;
@@ -257,7 +242,7 @@ class CodeRepositoryViewContainer extends Component {
 					onPathChange(-1)
 				}
 			} else {
-				
+
 				let cur_index = -1;
 				if (challenge.path && challenge.path.forEach) {
 					challenge.path.forEach((item, index) => {
@@ -267,7 +252,7 @@ class CodeRepositoryViewContainer extends Component {
 						}
 					})
 				}
-				
+
 				if (isCurrentFile) {
 					if (challenge.pathIndex == cur_index) {
 						showSnackbar(`当前编辑文件已经是${nodePath}`)
@@ -281,75 +266,48 @@ class CodeRepositoryViewContainer extends Component {
 			if (nodePath) {
 				const filetype = nodePath.split('.').pop().toLowerCase();
 				if (filetype == 'jpg' || filetype == 'png' || filetype == 'gif' || filetype == 'jpeg'
-						|| filetype == 'jar'
-						|| filetype == 'doc' || filetype == 'pdf' || filetype == 'xsl' || filetype == 'ppt') {
+					|| filetype == 'jar'
+					|| filetype == 'doc' || filetype == 'pdf' || filetype == 'xsl' || filetype == 'ppt') {
 					showSnackbar(`不支持加载${filetype}类型的文件。`)
 					return;
 				}
-				fetchRepositoryCode(null, nodePath, 1);	
+				fetchRepositoryCode(null, nodePath, 1);
 			} else {
 				console.error('no eventKey:', info.node)
 			}
 		}
 	}
-//  /shixuns/mnf6b7z3/shixun_discuss?challenge_id=88
-  	render() {
-		  
-	    return (
-				// <React.Fragment>
-				// 	{this.props.isOnlyContainer == true ? 
-				// 		React.Children.map(this.props.children, child => {
-				// 			if(!child) {
-				// 				return ''
-				// 			}
-				// 			return React.cloneElement(child, Object.assign({...this.state}, { 
-				// 				loadRepoFiles: this.loadRepoFiles,
-				// 				onTreeSelect: this.onTreeSelect,
-				// 				onLoadData: this.onLoadData,
-				// 			}))
-				// 		})
+	render() {
 
-				// 	: 
-				
-				// 	<CodeRepositoryView {...this.props} 
-				// 		{...this.state} 
-				// 		showFilesDrawer={this.showFilesDrawer}
-				// 		loadRepoFiles={this.loadRepoFiles}
-				// 		onLoadData={this.onLoadData}
-				// 		onTreeSelect={ this.onTreeSelect }
-				// 		onRepositoryViewExpand={this.onRepositoryViewExpand}
-				// 		tabIndexChange={this.tabIndexChange}
-				// 		showSettingDrawer={this.showSettingDrawer}
-				// 	></CodeRepositoryView> }
-				// </React.Fragment>
-				<React.Fragment>
-					{this.props.isOnlyContainer == true ? 
-						React.Children.map(this.props.children, child => {
-							if(!child) {
-								return ''
-							}
-							return React.cloneElement(child, Object.assign({...this.state}, { 
-								loadRepoFiles: this.loadRepoFiles,
-								onTreeSelect: this.onTreeSelect,
-								onLoadData: this.onLoadData,
-							}))
-						})
+		return (
+			<React.Fragment>
+				{this.props.isOnlyContainer == true ?
+					React.Children.map(this.props.children, child => {
+						if (!child) {
+							return ''
+						}
+						return React.cloneElement(child, Object.assign({ ...this.state }, {
+							loadRepoFiles: this.loadRepoFiles,
+							onTreeSelect: this.onTreeSelect,
+							onLoadData: this.onLoadData,
+						}))
+					})
 
-					: 
-				
-					<CodeRepositoryView {...this.props} 
-						{...this.state} 
+					:
+
+					<CodeRepositoryView {...this.props}
+						{...this.state}
 						showFilesDrawer={this.showFilesDrawer}
 						loadRepoFiles={this.loadRepoFiles}
 						onLoadData={this.onLoadData}
-						onTreeSelect={ this.onTreeSelect }
+						onTreeSelect={this.onTreeSelect}
 						onRepositoryViewExpand={this.onRepositoryViewExpand}
 						tabIndexChange={this.tabIndexChange}
 						showSettingDrawer={this.showSettingDrawer}
-					></CodeRepositoryView> }
-				</React.Fragment>
-	    );
-  	}
+					></CodeRepositoryView>}
+			</React.Fragment>
+		);
+	}
 }
 
 export default CodeRepositoryViewContainer;
diff --git a/src/modules/page/main/LeftView.js b/src/modules/page/main/LeftView.js
index a78a1b1d..0de60872 100644
--- a/src/modules/page/main/LeftView.js
+++ b/src/modules/page/main/LeftView.js
@@ -1,268 +1,184 @@
 import React, { Component } from 'react';
 
-import ContentLoader from 'react-content-loader'
-
-import Tooltip from 'material-ui/Tooltip';
 import Dialog, {
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
+	DialogActions,
+	DialogContent,
+	DialogContentText,
+	DialogTitle,
 } from 'material-ui/Dialog';
 import { CircularProgress } from 'material-ui/Progress';
 
 import Button from 'material-ui/Button';
-import IconButton from 'material-ui/IconButton';
 
 import CommentContainer from '../../comment/CommentContainer'
-import CommentInput from '../../comment/CommentInput'
+import CommentInput from '../../comment/comment-input'
 
 import ChooseAnswerView from '../component/ChooseAnswerView'
 
-import { withStyles } from 'material-ui/styles';
-import { markdownToHTML } from 'educoder'
 import AnswerListContainer from './answer/AnswerListContainer'
 import './leftView.css'
 
 import CodeEvaluateMultiLevelAnswerUnlock from './CodeEvaluateMultiLevelAnswerUnlock'
-import MUIDialogStyleUtil from '../component/MUIDialogStyleUtil'
 import moment from 'moment';
-// http://danilowoz.com/create-react-content-loader/
-const MyLoader = () => (
-	<ContentLoader
-		height={600}
-		width={400}
-		speed={2}
-		primaryColor={"#000000"}
-		secondaryColor={"#ecebeb"}
-	>
-		<rect x="0" y="10" rx="3" ry="3" width="320" height="6.4" />
-		<rect x="0" y="35" rx="3" ry="3" width="85" height="10" />
-		<rect x="0" y="60" rx="3" ry="3" width="350" height="6.4" />
-		<rect x="0" y="80" rx="3" ry="3" width="350" height="6.4" />
-		<rect x="0" y="100" rx="3" ry="3" width="350" height="6.4" />
-		<rect x="0" y="120" rx="3" ry="3" width="101" height="6.4" />
+import RenderHtml from '../../../components/render-html';
 
-		<rect x="0" y="145" rx="3" ry="3" width="65" height="10" />
-		<rect x="0" y="170" rx="3" ry="3" width="350" height="6.4" />
-		<rect x="0" y="190" rx="3" ry="3" width="350" height="6.4" />
-		<rect x="0" y="210" rx="3" ry="3" width="201" height="6.4" />
-	</ContentLoader>
-)
-
-const styles = MUIDialogStyleUtil.getTwoButtonStyle(
-	(theme) => { return {
-			iconButton: {
-				margin: theme.spacing.unit,
-				// background: '#05101A',
-				color: '#4CACFF',
-				top: '-7px',
-				width: '36px',
-				height: '36px',
-			}
-		}
-	}
-)
-
-// const styles = theme => ();
 
 class LeftView extends Component {
 
 	goToCertification() {
 		window.open('/account/certification', '_blank');
 	}
-//  /shixuns/mnf6b7z3/shixun_discuss?challenge_id=88
-  	render() {
-  		let { challenge, shixun, tabIndex, tabIndexChange, loading, discusses_count
-  				, dialogOpen, handleDialogClose, handleDialogReadAnswer, gameAnswer, loadingComments, st, user,
-  				classes, onDrawerButtonClick, lockedAnswers, unlockedAnswers, isMultiLevelAnswer } = this.props
+	render() {
+		let { challenge, shixun, tabIndex, tabIndexChange, loading, discusses_count
+			, dialogOpen, handleDialogClose, handleDialogReadAnswer, gameAnswer, loadingComments, st, user,
+			onDrawerButtonClick, lockedAnswers, unlockedAnswers, isMultiLevelAnswer, dialogContent } = this.props
 
-  		let propaedeutics = shixun ? shixun.propaedeutics : null;
-  		let _hasAnswer =  challenge.hasAnswer // st === 1 ||
-  		// const actions = [
-	   //    <Button
-	   //      label="取消"
-	   //      primary={true}
-	   //      onClick={handleDialogClose}
-	   //      style={{marginRight: '6px'}}
-	   //    />,
-	   //    <Button
-	   //    	variant="raised"
-	   //      label="确定"
-	   //      primary={true}
-	   //      onClick={handleDialogReadAnswer}
-	   //    />,
-	   //  ];
+		let propaedeutics = shixun ? shixun.propaedeutics : null;
+		let taskPass = challenge ? challenge.task_pass : ''
+		let _hasAnswer = challenge.hasAnswer // st === 1 ||
+		const is_teacher = user.is_teacher
 
-			// TODO TEST
-			// isMultiLevelAnswer = true
-			const is_teacher = user.is_teacher
-
-		 	let contentText = is_teacher ?
-				<React.Fragment>
+		let contentText = is_teacher ?
+			<React.Fragment>
 				<p>{`已经过职业认证的教师可以免金币查看答案哟~`}</p>
 				<p>{`将扣除${challenge.score}点金币，是否确认查看答案`}</p>
-				<p><a onClick={()=>this.goToCertification()}
-						style={{textDecoration: 'underline', color: '#4CACFF'}}>立即认证</a></p>
-				</React.Fragment>
-				:
-				<React.Fragment>
+				<p><a onClick={() => this.goToCertification()}
+					style={{ textDecoration: 'underline', color: '#4CACFF' }}>立即认证</a></p>
+			</React.Fragment>
+			:
+			<React.Fragment>
 				<p>{`先查看参考答案，再通过评测的学生，实训作业有可能是零分哦~`}</p>
 				<p>{`将扣除${challenge.score}点金币，是否确认查看答案`}</p>
-				</React.Fragment>;
+			</React.Fragment>;
 
-			// 多级别解锁
-			if (isMultiLevelAnswer) {
-				// power === 0 &&
-				contentText =  ( is_teacher ) ?
-           		<React.Fragment>
-	            	<p>{`已经过职业认证的教师可以免金币查看答案哟~`}</p>
-					<p><a style={{textDecoration: 'underline'}} onClick={()=>this.goToCertification()}
-							style={{ color: '#1890ff', 'margin-top': '6px', display: 'inline-block'}}>立即认证</a></p>
+		// 多级别解锁
+		if (isMultiLevelAnswer) {
+			// power === 0 &&
+			contentText = (is_teacher) ?
+				<React.Fragment>
+					<p>{`已经过职业认证的教师可以免金币查看答案哟~`}</p>
+					<p><a style={{ textDecoration: 'underline' }} onClick={() => this.goToCertification()}
+						style={{ color: '#1890ff', 'margin-top': '6px', display: 'inline-block' }}>立即认证</a></p>
 					<CodeEvaluateMultiLevelAnswerUnlock
 						ref="answerUnlock" lockedAnswers={lockedAnswers} unlockedAnswers={unlockedAnswers}
 						challenge={challenge}
 					>
 					</CodeEvaluateMultiLevelAnswerUnlock>
-           		</React.Fragment>
-              :
-            <React.Fragment>
-				<p>{`先查看参考答案，再通过评测的学生，实训作业将被扣分`}</p>
-				{/* { MultiLevelUnlockTable } */}
-				<CodeEvaluateMultiLevelAnswerUnlock
-					ref="answerUnlock" lockedAnswers={lockedAnswers} unlockedAnswers={unlockedAnswers}
-					challenge={challenge}
+				</React.Fragment>
+				:
+				<React.Fragment>
+					<p>{`先查看参考答案，再通过评测的学生，实训作业将被扣分`}</p>
+					<CodeEvaluateMultiLevelAnswerUnlock
+						ref="answerUnlock" lockedAnswers={lockedAnswers} unlockedAnswers={unlockedAnswers}
+						challenge={challenge}
+					>
+					</CodeEvaluateMultiLevelAnswerUnlock>
+				</React.Fragment>;
+		}
+
+		return (
+			<React.Fragment>
+				<Dialog
+					open={dialogOpen}
+					disableEscapeKeyDown={true}
+					onClose={handleDialogClose}
 				>
-				</CodeEvaluateMultiLevelAnswerUnlock>
-            </React.Fragment>;
-			}
+					<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
+					<DialogContent id="dialog-content" >
+						<DialogContentText id="alert-dialog-description" style={{ textAlign: 'center' }}>
+							{/* issues  29402添加课程设置是否可以查看答案*/}
+							{dialogContent ? dialogContent : contentText}
+						</DialogContentText>
+					</DialogContent>
+					<DialogActions id="dialog-actions">
 
-			/**
-
-				{ is_teacher ? <Button size="small" variant="raised" style={{ marginRight: '20px'}}
-						onClick={()=>this.goToCertification()} color="primary">
-					{ '立即认证' }
-				</Button> : ''}
-			*/
-
-	    return (
-	    	<React.Fragment>
-	    		<Dialog
-		          	open={dialogOpen}
-								disableEscapeKeyDown={true}
-		          	onClose={handleDialogClose}
-		        >
-			       	<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
-							<DialogContent id="dialog-content" >
-								<DialogContentText id="alert-dialog-description" style={{textAlign: 'center'}}>
-									{ contentText }
-								</DialogContentText>
-							</DialogContent>
-		          {/* http://localhost:3000/account/professional_certification */}
-							<DialogActions id="dialog-actions">
-
-								<Button onClick={handleDialogClose} color="primary" className={`${classes.button} ${classes.buttonGray}`}>
-									取消
+						<Button onClick={handleDialogClose} color="primary" >
+							取消
 								</Button>
-								{/* variant={ is_teacher ? "flat" : "raised"}  */}
-								<Button size="medium" variant={"raised"}
-										className={`${classes.button} `}
-										onClick={() => handleDialogReadAnswer(this.refs.answerUnlock ? this.refs.answerUnlock.getSelectedId() : '')}
-										color="primary" autoFocus>
-									{ is_teacher ? '继续查看' : '确定'}
-								</Button>
-							</DialogActions>
+						<Button size="medium" variant={"raised"}
+							onClick={() => {
+								if (dialogContent) {
+									handleDialogClose()
+								}
+								else {
+									handleDialogReadAnswer(this.refs.answerUnlock ? this.refs.answerUnlock.getSelectedId() : '')
+								}
+							}}
+							color="primary" autoFocus>
+							{dialogContent ? '知道了' : is_teacher ? '继续查看' : '确定'}
+						</Button>
+					</DialogActions>
 
-		        </Dialog>
+				</Dialog>
 
-		      	<div className="-fit -layout-v">
+				<div className="-fit -layout-v" >
+					<div className="-layout-v -flex -bg-white ">
+						{/*新界面关卡名称显示、关卡金币显示*/}
+						<div id="task_name_section" className="task_name_section">
+							<a title={"点击查看全部任务"} onClick={onDrawerButtonClick}>
+								<i className={"fa font-18 fa-list-ul"}></i>
+							</a>
+							<h3 className="subject">第{challenge.position}关：{challenge.subject}</h3>
+							<span className="btn-cir-big ">{challenge.score}</span>
+						</div>
 
-			      	<div className="-layout-v -flex -bg-white -task-ml80">
+						<ul id="tab_nav" className="-tab-nav">
+							<li id="tab_nav_1" className={tabIndex === 0 ? `tab_hover` : ''} onClick={() => tabIndexChange(0)}>
+								<a href="javascript:void(0);" className="tab_type" style={{ fontSize: '16px' }}>过关任务</a>
+							</li>
+							{/**/}
+							{propaedeutics && <li id="tab_nav_2" className={tabIndex === 1 ? `tab_hover` : ''} onClick={() => tabIndexChange(1)}>
+								<a href="javascript:void(0);" className="tab_type">背景知识</a>
+							</li>}
+							{_hasAnswer && <li id="tab_nav_3" className={tabIndex === 2 ? `tab_hover` : ''} onClick={() => tabIndexChange(2)}>
+								<a href="javascript:void(0);" className="tab_type" style={{ fontSize: '16px' }}>参考答案</a>
+							</li>}
+							<li id="tab_nav_5" className={tabIndex === 4 ? `tab_hover` : ''} onClick={() => tabIndexChange(4)}
+								style={{ display: 'none' }}>
+								<a href="javascript:void(0);" className="tab_type" style={{ fontSize: '16px' }}>TA人解答</a>
+							</li>
+							<li id="tab_nav_4" className={tabIndex === 3 ? `tab_hover` : ''} onClick={() => tabIndexChange(3)}>
+								<a className="tab_type" style={{ fontSize: '16px' }} data-remote="true">
+									评论<span id="discusses_count" className="edu-cir-grey1" style={{ lineHeight: '18px!important' }}>{discusses_count || ""}</span>
+								</a>
+							</li>
+						</ul>
+						<div className="cl"></div>
+						<div className="-flex -relative greytab-inner">
+							{/*过关任务*/}
+							<div id="tab_con_1" className="tab-info" style={tabIndex === 0 ? { display: 'block' } : { display: 'none' }}>
+								<div className="fit -scroll">
+									<div className="-layout-v -fit">
+										{loading ?
+											<div className="-flex -scroll task-padding16 panel-box-sizing new_li break_word markdown-body editormd-html-preview"
+												unselectable="on">
+												<CircularProgress size={40} thickness={3} className="circularProgress"
+													style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '40% !important', display: 'block' }} />
+											</div> : ""
+										}
+										<RenderHtml className="-flex -scroll task-padding16 panel-box-sizing new_li break_word  editormd-html-preview"
+											style={loading ? { display: 'none' } : {}} value={taskPass} />
+									</div>
+								</div>
+							</div>
+							{/*背景知识*/}
+							<div id="tab_con_2" className="tab-info" style={tabIndex === 1 ? { display: 'block' } : { display: 'none' }}>
+								<div className="fit -scroll">
+									<div className="-layout-v -fit">
+										<RenderHtml className="-flex -scroll task-padding16 panel-box-sizing new_li  editormd-html-preview" value={propaedeutics} /> </div>
+								</div>
+							</div>
+							{/*	参考答案*/}
+							<div id="tab_con_3" className="tab-info" style={tabIndex === 2 ? { display: 'block' } : { display: 'none' }}>
+								<div className="fit -scroll">
+									<div className="-layout-v -fit" style={{ overflowY: 'scroll' }}>
 
-			      		{/*新界面关卡名称显示、关卡金币显示*/}
-			      		<div id="task_name_section" className="task_name_section">
+										{(!unlockedAnswers || unlockedAnswers.length === 0) && (!lockedAnswers || lockedAnswers.length === 0) &&
+											<RenderHtml className="-flex -scroll task-padding16 panel-box-sizing new_li" value={gameAnswer}
+												style={{ display: st === 0 ? 'block' : 'none' }} />
+										}
 
-			      			{ loading ? "" :
-			      			<React.Fragment>
-			      				<Tooltip title={ "点击查看全部任务" } disableFocusListener={true}>
-					      			<IconButton color="default" mini={''}  aria-label="edit" className={classes.iconButton}
-						      			onClick={onDrawerButtonClick}>
-								        <i className={ "fa font-18 fa-list-ul" }></i>
-								    </IconButton>
-							    </Tooltip>
-				      			<h3 className="subject">第{challenge.position}关：{challenge.subject}</h3>
-				      			<span className="btn-cir-big fr mt8 mr15">{challenge.score}</span>
-			      			</React.Fragment>
-			      			}
-			      		</div>
-
-			      		<ul id="tab_nav" className="-tab-nav">
-					        <li id="tab_nav_1" className={ tabIndex === 0 ? `tab_hover` : ''} onClick={() => tabIndexChange(0)}>
-					          <a href="javascript:void(0);" className="tab_type" style={{fontSize: '16px'}}>过关任务</a>
-					        </li>
-				            {/**/}
-				            { propaedeutics && <li id="tab_nav_2"  className={ tabIndex === 1 ? `tab_hover` : ''} onClick={() => tabIndexChange(1)}>
-				              <a href="javascript:void(0);" className="tab_type">背景知识</a>
-				            </li> }
-			                { _hasAnswer && <li id="tab_nav_3" className={ tabIndex === 2 ? `tab_hover` : ''} onClick={() => tabIndexChange(2)}>
-			                  <a href="javascript:void(0);" className="tab_type" style={{fontSize: '16px'}}>参考答案</a>
-			                </li> }
-			                <li id="tab_nav_5" className={ tabIndex === 4 ? `tab_hover` : ''} onClick={() => tabIndexChange(4)}
-			                		style={{display: 'none'}}>
-			                  	<a href="javascript:void(0);" className="tab_type" style={{fontSize: '16px'}}>TA人解答</a>
-			                </li>
-					        <li id="tab_nav_4" className={ tabIndex === 3 ? `tab_hover` : ''} onClick={() => tabIndexChange(3)}>
-					          <a href="javascript:void(0)" className="tab_type" style={{fontSize: '16px'}} data-remote="true">
-					            评论<span id="discusses_count" className="edu-cir-grey1" style={{lineHeight: '18px!important'}}>{discusses_count||""}</span>
-					          </a>
-					        </li>
-					        {/*<span className="btn-cir-big fr mt8 mr15">经验值：{challenge.score}</span>*/}
-					    </ul>
-					    <div className="cl"></div>
-					    <div className="-flex -relative greytab-inner">
-					    	{/*过关任务*/}
-					    	<div id="tab_con_1" className="tab-info" style={ tabIndex === 0 ? {display: 'block'} : {display: 'none'}  }>
-					    		<div className="fit -scroll">
-					    			<div className="-layout-v -fit">
-					    					{ loading ?
-					    						<div className="-flex -scroll task-padding16 panel-box-sizing new_li break_word markdown-body editormd-html-preview"
-					    						unselectable="on">
-					    							<CircularProgress size={40} thickness={3} className="circularProgress"
-					    								style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '40% !important', display: 'block' }}/>
-					    						</div> : ""
-					    					}
-
-				    						<div className="-flex -scroll task-padding16 panel-box-sizing new_li break_word markdown-body editormd-html-preview"
-					    						unselectable="on" id="game_task_pass" style={loading ? {display:'none'} : {}}>
-				    						</div>
-					    			</div>
-					    		</div>
-					    	</div>
-					    	{/*背景知识*/}
-					    	<div id="tab_con_2" className="tab-info" style={ tabIndex === 1 ? {display: 'block'} : {display: 'none'}  }>
-					    		<div className="fit -scroll">
-						            <div className="-layout-v -fit">
-						              	<div className="-flex -scroll task-padding16 panel-box-sizing new_li markdown-body editormd-html-preview" unselectable="on" id="game_ready_knowledge">
-
-						              	</div>
-					    			</div>
-					    		</div>
-					    	</div>
-					    	{/*	参考答案*/}
-					    	<div id="tab_con_3" className="tab-info" style={ tabIndex === 2 ? {display: 'block'} : {display: 'none'} }>
-					    		<div className="fit -scroll">
-								  	<div className="-layout-v -fit" style={{ overflowY: 'scroll' }}>
-								  		{/*  只读markdown的写法  markdownToHTML 这个接口生成的markdown没有setMarkdown接口
-								  		<textarea style={{display:'none'}} id="editorMd_contents" value={gameAnswer}></textarea>*/}
-
-
-											{ (!unlockedAnswers || unlockedAnswers.length === 0) && (!lockedAnswers || lockedAnswers.length === 0) &&
-									    <div className="-flex -scroll task-padding16 panel-box-sizing new_li" id="game_answer_show"
-									    		style={{ display: st === 0 ? 'block' : 'none' }}>
-									    </div>
-											}
-
-											<style>{`
+										<style>{`
 												.multiLevelAnswer {
 													margin: 0px 12px;
 												}
@@ -293,76 +209,73 @@ class LeftView extends Component {
 												}
 											`}</style>
 
-											<div className="multiLevelAnswer">
-												{ unlockedAnswers && unlockedAnswers.map((item, index) => {
-                          const {name, contents, view_time} = item;
-													return <div className="anwserSection">
-														<div className="df">
-															<div className="level">级别{index + 1}：</div>
-															<div className="name">{name}</div>
-                              <div className="status">
-                                <span className="lock-time">{view_time ? moment(view_time).format('YYYY-MM-DD HH:mm') : ''}</span>
+										<div className="multiLevelAnswer">
+											{unlockedAnswers && unlockedAnswers.map((item, index) => {
+												const { name, contents, view_time } = item;
+												return <div className="anwserSection" key={index}>
+													<div className="df">
+														<div className="level">级别{index + 1}：</div>
+														<div className="name">{name}</div>
+														<div className="status">
+															<span className="lock-time">{view_time ? moment(view_time).format('YYYY-MM-DD HH:mm') : ''}</span>
                                 已解锁
                               </div>
-														</div>
-														<div className="contents markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML(contents)}}>
-														</div>
 													</div>
-												})}
+													<RenderHtml value={contents} className='contents' />
+												</div>
+											})}
 
-												{ lockedAnswers && lockedAnswers.map((item, index) => {
-												return <div class="anwserSection">
-														<div className="df">
-															<div className="level">级别{index + 1 + (unlockedAnswers ? unlockedAnswers.length : 0)}：</div>
-															<div className="name">{item.name}</div>
-															<div
-																className="status" onClick={ () => { this.props.showUnlockAnswerDialog(item) } }
-																style={{ color: '#4CACFF', cursor: 'pointer' }}
-															>解锁</div>
-														</div>
+											{lockedAnswers && lockedAnswers.map((item, index) => {
+												return <div className="anwserSection" key={index}>
+													<div className="df">
+														<div className="level">级别{index + 1 + (unlockedAnswers ? unlockedAnswers.length : 0)}：</div>
+														<div className="name">{item.name}</div>
+														<div
+															className="status" onClick={() => { this.props.showUnlockAnswerDialog(item) }}
+															style={{ color: '#4CACFF', cursor: 'pointer' }}
+														>解锁</div>
 													</div>
-												})}
+												</div>
+											})}
 
+										</div>
+
+
+										{st === 1 ?
+											<div className="-flex -scroll task-padding16 panel-box-sizing new_li" id="game_answer_show_choose"
+											>
+												<ChooseAnswerView gameAnswer={gameAnswer}></ChooseAnswerView>
 											</div>
-
-
-									    { st === 1 ?
-									    <div className="-flex -scroll task-padding16 panel-box-sizing new_li" id="game_answer_show_choose"
-									    		>
-									      	<ChooseAnswerView gameAnswer={gameAnswer}></ChooseAnswerView>
-									    </div>
-									    : ''
-									    }
-								  	</div>
+											: ''
+										}
+									</div>
 								</div>
-					    	</div>
-					    	{/*	TA人解答*/}
-					    	<div id="tab_con_5" className="tab-info" style={ tabIndex === 4 ? {display: 'block'} : {display: 'none'} }>
-					    		<div className="fit -scroll">
-								  	<div className="-layout-v -fit">
-								  		<AnswerListContainer {...this.props}></AnswerListContainer>
-								  	</div>
+							</div>
+							{/*	TA人解答*/}
+							<div id="tab_con_5" className="tab-info" style={tabIndex === 4 ? { display: 'block' } : { display: 'none' }}>
+								<div className="fit -scroll">
+									<div className="-layout-v -fit">
+										<AnswerListContainer {...this.props}></AnswerListContainer>
+									</div>
 								</div>
-					    	</div>
-					    	<div id="tab_con_4" className="commentTab tab-info commentsDelegateParent" style={ tabIndex === 3 ? {display: 'block'} : {display: 'none'} }>
-					    		{ loadingComments ?
-							    	<CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '40%', display: 'block' }}/> :
-						    		<CommentContainer {...this.props}></CommentContainer>
-						    	}
-					    	</div>
-					    </div>
+							</div>
+							<div id="tab_con_4" className="commentTab tab-info commentsDelegateParent" style={tabIndex === 3 ? { display: 'block' } : { display: 'none' }}>
+								{loadingComments ?
+									<CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '40%', display: 'block' }} /> :
+									<CommentContainer {...this.props}></CommentContainer>
+								}
+							</div>
+						</div>
 
-					    <div id="mini_comment_section">
-					    	{/*说点什么	*/}
-					    	<CommentInput challenge={challenge} {...this.props}></CommentInput>
-					    </div>
-			      	</div>
+						<div id="mini_comment_section">
+							{/*说点什么	*/}
+							<CommentInput challenge={challenge} {...this.props}></CommentInput>
+						</div>
+					</div>
 
-			    </div>
+				</div>
 			</React.Fragment>
-	    );
-  	}
+		);
+	}
 }
-// <textarea style={{display:'none'}}  value={challenge.task_pass ? `${challenge.task_pass}` : ''}></textarea>
-// {/*<textarea style={{display:'none'}}  value={propaedeutics ? `${propaedeutics}` : ''}></textarea>*/}
-export default withStyles(styles)( LeftView );
+export default LeftView;
diff --git a/src/modules/page/main/LeftViewContainer.js b/src/modules/page/main/LeftViewContainer.js
index f7c2d031..730fae0d 100644
--- a/src/modules/page/main/LeftViewContainer.js
+++ b/src/modules/page/main/LeftViewContainer.js
@@ -1,66 +1,30 @@
 import React, { Component } from 'react';
-
 import LeftView from './LeftView'
-
 import axios from 'axios'
-
-import update from 'immutability-helper'
-
 import { commentHOC } from '../../comment/CommentsHOC'
-
 import ImageLayer from '../layers/ImageLayer'
 
-import { getUrl, EDU_TEACHER } from 'educoder'
-
 import _ from 'lodash'
 
-let path = getUrl("/editormd/lib/")
-
 const $ = window.$;
 
 class LeftViewContainer extends Component {
 
 	constructor(props) {
 		super(props)
-		
+
 		this.tabIndexChange = this.tabIndexChange.bind(this)
 
 		this.handleDialogClose = this.handleDialogClose.bind(this)
 		this.handleDialogReadAnswer = this.handleDialogReadAnswer.bind(this)
-		// ------------------------------------
-		// this.createNewComment = this.createNewComment.bind(this)
-		// this.fetchCommentIfNotFetched = this.fetchCommentIfNotFetched.bind(this)
-		// this.replyComment = this.replyComment.bind(this)
-		// this.deleteComment = this.deleteComment.bind(this)
-		// this.commentPraise = this.commentPraise.bind(this)
-		// this.hiddenComment = this.hiddenComment.bind(this)
-		// this.rewardCode = this.rewardCode.bind(this)
 		this.showNewReply = this.showNewReply.bind(this)
-		// ------------------------------------
-
-
-		// this.onPaginationChange = this.onPaginationChange.bind(this)
-
 		this.state = {
 			tabIndex: 0,
 			dialogOpen: false,
 			gameAnswer: '',
-			
-
-			// 评论
-			// comments: [],
-			// comment_count_without_reply: 0,
-			// // 默认pageSize为10
-			// currentPage: 1,
-			// loadingComments: true,
-			// gotNewReply: false,
-
-
+			dialogContent: '',
 		}
 	}
-	// ----------------------------------------------------------------------------------------------评论 Start
-
-	// ----------------------------------------------------------------------------------------------评论 Start
 
 	showNewReply() {
 
@@ -70,15 +34,19 @@ class LeftViewContainer extends Component {
 		this.props.showNewReply();
 	}
 
-	// ----------------------------------------------------------------------------------------------评论 End
-
-	// ----------------------------------------------------------------------------------------------评论 End
 	tabIndexChange(tabIndex, notDoFetch) {
 		if (this.props.loading === true) {
 			return;
 		}
-
-		if ( tabIndex === 2 && this.state.gameAnswer === '') {	// 参考答案
+		//issues-29402 添加是否查看作业答案的老师配置  如果设置不能查看答案就传一个dialogContent
+		if (tabIndex === 2 && this.props.game.homework_common_answer_open) {
+			this.setState({
+				dialogContent: '禁止查看答案',
+				dialogOpen: true
+			})
+			return
+		}
+		if (tabIndex === 2 && this.state.gameAnswer === '') {	// 参考答案
 			// 多级答案后换了接口
 			// 选择题(st === 1)还是走以前的接口
 			if ((this.props.st === 0)) {
@@ -88,7 +56,7 @@ class LeftViewContainer extends Component {
 			}
 			return;
 		}
-		if ( tabIndex === 3 && !notDoFetch ) {	// 评论
+		if (tabIndex === 3 && !notDoFetch) {	// 评论
 			this.props.fetchCommentIfNotFetched()
 		}
 		// TODO 2 参考答案     3 评论
@@ -99,60 +67,30 @@ class LeftViewContainer extends Component {
 
 	shouldComponentUpdate(nextProps, nextState) {
 		if (JSON.stringify(nextProps) !== JSON.stringify(this.props) || !_.isEqual(this.state, nextState)) {
-		   	return true
+			return true
 		} else {
-		   	return false
+			return false
 		}
 	}
 	componentWillReceiveProps(newProps, newContext) {
-		if ( !this.props.loading && newProps.loading ) {
+		if (!this.props.loading && newProps.loading) {
 			this.setState({ tabIndex: 0 })
-			window['__task_md'] && window['__task_md'].setMarkdown('...')
 		}
-
-		if ( newProps.challenge && newProps.challenge.id && 
-				(!this.props || !this.props.challenge.id || (newProps.challenge.id != this.props.challenge.id)) ) {
-
+		if (newProps.challenge && newProps.challenge.id &&
+			(!this.props || !this.props.challenge.id || (newProps.challenge.id != this.props.challenge.id))) {
 			// 切换关卡，清空comments
 			this.props.clearCommentsInState();
-			// TODO 尝试使用react-route解决这个问题
-			// tabIndex
-			// window.location.pathname.indexOf('comments') !== -1 &&
-			// 	setTimeout(()=>{debugger;$('#tab_nav_4')[0].click();}, 500)
-
 			var $ = window.$;
-
-			// TODO 多次load katex
-			// TODO 从前一题切换到下一题，前一题的过关任务会闪现后再出现下一题的过关任务，考虑将loading的状态置后改动？
-
 			// 任务切换重置state      
 			this.setState({
-				gameAnswer : '',
+				gameAnswer: '',
 				lockedAnswers: [],
 				unlockedAnswers: [],
 			})
-			
-			window['__answerMarkdown'] && window.__answerMarkdown.setMarkdown('...')
-
-			// 编辑器已存在
-			if (window['__task_md'] && $('#game_show_content #tab_con_1 .CodeMirror').length) {
-				// 400ms后，等loading状态消失，调用setMarkdown才有效
-				setTimeout(()=>{
-					// 注意，如果md没完全初始化，调用setMarkdown会报this.cm.setValue空指针错误
-					window['__task_md'].cm && window['__task_md'].setMarkdown(newProps.challenge.task_pass)
-				}, 400)
-				
-				
-				this._initPropaedeuticsMarkdown(newProps);
-				return;
-			} else {
-				// window.editormd.loadKaTeX( ()=> {
-					this._initMarkdown(newProps)
-		        // });
-	        }
+			this._initMarkdown()
 		}
 		// 切换了实训
-		if ( newProps.shixun && newProps.challenge.shixun && (!this.props || (newProps.shixun.id != this.props.shixun.id)) ) {
+		if (newProps.shixun && newProps.challenge.shixun && (!this.props || (newProps.shixun.id != this.props.shixun.id))) {
 			this.setState({
 				gameAnswer: '',
 				comments: [],
@@ -161,103 +99,33 @@ class LeftViewContainer extends Component {
 				tabIndex: 0,
 			})
 		}
-		
+
 	}
 
-	_initPropaedeuticsMarkdown(newProps) {
-		// challenge
-		if (!newProps.shixun) {
-			return;
-		}
+	_initMarkdown() {
+		$("#game_task_pass").delegate("img", "click", (event) => {
+			const imageSrc = event.target.src
 
-		
+			this.setState({
+				showImage: true,
+				imageSrc,
+			})
+		});
 
-		// TODO BUG 从选择题切换下一题到编程题，propaedeutics显示不出来
-		// 如果watch设置为false，改变浏览器高度，editormd内容会消失
-		if (!this.knowledge_md && newProps.shixun.propaedeutics) {
-            this.knowledge_md = window.editormd("game_ready_knowledge", {
-                htmlDecode: "style,script,iframe",  // you can filter tags decode
-                taskList: true,
-
-                mode: 'markdown',
-                path: path,
-                toolbar: false,
-                readOnly: true,
-                watch : true,
-                markdown: newProps.shixun.propaedeutics,
-
-                tex: true,  // 数学公式
-                flowChart: false,  // 默认不解析
-                sequenceDiagram: false, // 默认不解析
-
-                // onload : function(){
-		        	// this.previewing();	// 注释了这个后，另一个md的onload previewing也不触发了
-		    	// }
-            });
-            window.knowledge_md = this.knowledge_md
-        } else {
-        	newProps.shixun.propaedeutics && this.knowledge_md.setMarkdown(newProps.shixun.propaedeutics)
-        }
-	}
-	_initMarkdown(newProps) {
-        this.task_md = window.editormd("game_task_pass", {
-            htmlDecode: "style,script,iframe",  // you can filter tags decode
-            taskList: true,
-
-            mode: 'markdown',
-            path: path,
-            toolbar: false,
-            readOnly: true,
-            watch : true,
-            markdown: newProps.challenge.task_pass,
-
-            tex: true,  // 数学公式
-            flowChart: false,  // 默认不解析
-            sequenceDiagram: false, // 默认不解析
-
-            onload : function(){
-            	try {
-		        	this.previewing();
-		        } catch(e) {
-		        	this.previewing();
-		        	console.error(e)
-		        }
-		        // 改动了editormd源码，codemirror对象存在的话就不重新加载codemirror脚本，避免merge被覆盖掉
-		        // window.editormd.loadScript("js/merge.js", function() {
-
-		        // });
-		    }
-        });
-        window.__task_md = this.task_md;
-        // 过关任务 imagelayer的处理：
-        $("#game_task_pass").delegate("img", "click", (event) => {
-          	const imageSrc = event.target.src
-
-	        this.setState({
-	          showImage: true,
-	          imageSrc,
-	        })
-        });
-        // 初始化知识背景
-        this._initPropaedeuticsMarkdown(newProps);
-        
 	}
 	onImageLayerClose = () => {
-      this.setState({
-        showImage: false,
-        imageSrc: '',
-      })
-    }
+		this.setState({
+			showImage: false,
+			imageSrc: '',
+		})
+	}
 	componentDidMount() {
-
-		this.newMessageIntervalRet = setInterval(()=> {
-			const { shixun, myshixun } = this.props;
+		this.newMessageIntervalRet = setInterval(() => {
+			const { shixun, newMessage } = this.props;
 			if (shixun && shixun.id) {
-				// TODO 用了HOC后，会多执行一次interval，而且props里没有HOC里的方法
-				this.props.newMessage && this.props.newMessage()
+				newMessage && newMessage()
 			}
 		}, 1000 * 60 * 1)
-			
 	}
 
 	componentWillUnmount() {
@@ -270,7 +138,7 @@ class LeftViewContainer extends Component {
 			dialogOpen: false
 		})
 	}
-	
+
 	/**
 		 1、返回一个或多个都有contents答案，直接显示
 		 2、返回一个没content的答案，弹出老对话框
@@ -279,61 +147,50 @@ class LeftViewContainer extends Component {
 	 */
 	fetchIfCouldGetAnswerWithoutGoldForMultiLevelAnswer() {
 		var getAnswerUrl = `/tasks/${this.props.game.identifier}/get_answer_info.json`
-		axios.get(getAnswerUrl, {
-    		})
-		  	.then((response) => {
-					response.data = response.data.message || response.data;
-					if (response.data) {
-						if (response.data.length === 0) {
-							// 未设置答案
-							this.props.showSnackbar('本关卡未设置答案。')
-							return;
-						}
-						let unlockedAnswers = []
-						let lockedAnswers = []
-						if (!response.data.length) {
-							// 只有一个答案时记录singleAnswerId，解锁时用
-							this.setState({
-								dialogOpen: true,
-								isMultiLevelAnswer: false,
-								singleAnswerId: response.data.answer_id
-							})
-							return;
-						}
-						const newAnswers = response.data.map((item, index) => {
-							return {
-								id: item.answer_id,
-								name: item.answer_name,
-								score: item.answer_score,
-								contents: item.answer_contents,
-								view_time: item.view_time
-							}
-						})
-				    	newAnswers.forEach((item, index) => {
-							if (item.contents) {
-								unlockedAnswers.push(item)
-							} else {
-								lockedAnswers.push(item)
-							}
-						})
-
-						this.setState({
-							tabIndex: 2,
-							lockedAnswers,
-							unlockedAnswers,
-							dialogOpen: unlockedAnswers.length === 0,
-							isMultiLevelAnswer: newAnswers.length > 1
-						}, () => {
-							// unlockedAnswers.forEach( (item, index) => {
-							// 	if (window[`tpiMDAnswer${index}`]) {
-							// 		window[`tpiMDAnswer${index}`].setMarkdown(item.contents)
-							// 	} else {
-							// 		window[`tpiMDAnswer${index}`] = this._initAnswerMarkdown(item.contents, `tpiMDAnswer${item.id}`)
-							// 	}
-							// })
-						})
+		axios.get(getAnswerUrl, {})
+			.then((response) => {
+				response.data = response.data.message || response.data;
+				if (response.data) {
+					if (response.data.length === 0) {
+						this.props.showSnackbar('本关卡未设置答案。')
+						return;
 					}
-		 	})
+					let unlockedAnswers = []
+					let lockedAnswers = []
+					if (!response.data.length) {
+						this.setState({
+							dialogOpen: true,
+							isMultiLevelAnswer: false,
+							singleAnswerId: response.data.answer_id
+						})
+						return;
+					}
+					const newAnswers = response.data.map((item, index) => {
+						return {
+							id: item.answer_id,
+							name: item.answer_name,
+							score: item.answer_score,
+							contents: item.answer_contents,
+							view_time: item.view_time
+						}
+					})
+					newAnswers.forEach((item, index) => {
+						if (item.contents) {
+							unlockedAnswers.push(item)
+						} else {
+							lockedAnswers.push(item)
+						}
+					})
+
+					this.setState({
+						tabIndex: 2,
+						lockedAnswers,
+						unlockedAnswers,
+						dialogOpen: unlockedAnswers.length === 0,
+						isMultiLevelAnswer: newAnswers.length > 1
+					})
+				}
+			})
 			.catch(function (error) {
 				console.log(error);
 			});
@@ -341,73 +198,32 @@ class LeftViewContainer extends Component {
 	// 选择题查看答案
 	fetchIfCouldGetAnswerWithoutGoldForChoose() {
 		const url = `/tasks/${this.props.game.identifier}/get_choose_answer.json`
-		axios.get(url, {
-    			// withCredentials: true,
-    		})
-		  	.then((response) => {
+		axios.get(url)
+			.then((response) => {
 
-			  	if (response.data.status == 0) {
+				if (response.data.status == 0) {
 					this.props.showSnackbar(response.data.message)
-			  		return;
-			  	}
-			  	/*
-					将扣除XXX点金币，是否确认查看答案     
+					return;
+				}
+				/*
+				将扣除XXX点金币，是否确认查看答案     
+				已经过职业认证的教师可以免金币查看答案哟
+				继续查看 立即认证（新开页）
+				*/
 
-					已经过职业认证的教师可以免金币查看答案哟
-					继续查看 立即认证（新开页）
-			  	*/
-
-					// 答案测试 TODO
-			    // if (false && response.data.view_answer === true) {
-			    if (response.data.choose_answers) {
-			    	this.showAnswer(response.data.choose_answers)
-			    } else if (response.data.status == 1) {
-			    	// 三个角色   普通用户、未认证教师、已认证教师，这里要区分普通用户和未认证教师用户
-			    	this.setState({
-			    		dialogOpen: true,
-			    	})
-			    }
-		 	})
-		  	.catch(function (error) {
-		    	console.log(error);
-		  	});
+				if (response.data.choose_answers) {
+					this.showAnswer(response.data.choose_answers)
+				} else if (response.data.status == 1) {
+					this.setState({
+						dialogOpen: true,
+					})
+				}
+			})
+			.catch(function (error) {
+				console.log(error);
+			});
 
 		return;
-		// 查看是否有权限直接查看，true可以直接查看，false需要扣金币查看
-		// var getAnswerUrl = `/api/v1/games/${this.props.game.identifier}/answer`;
-		var getAnswerUrl = `/tasks/${this.props.game.identifier}/answer.json`
-		axios.get(getAnswerUrl, {
-    			// withCredentials: true,
-    		})
-		  	.then((response) => {
-
-			  	if (response.data.status == 0) {
-						this.props.showSnackbar(response.data.message)
-			  		return;
-			  	}
-			  	/*
-					将扣除XXX点金币，是否确认查看答案     
-
-					已经过职业认证的教师可以免金币查看答案哟
-					继续查看 立即认证（新开页）
-			  	*/
-
-
-					// 答案测试 TODO
-			    // if (false && response.data.view_answer === true) {
-			    if (response.data.view_answer === true) {
-			    	this.showAnswer(response.data.answer)
-			    } else {
-			    	// 三个角色   普通用户、未认证教师、已认证教师，这里要区分普通用户和未认证教师用户
-			    	this.setState({
-			    		dialogOpen: true,
-			    	})
-			    }
-
-		 	})
-		  	.catch(function (error) {
-		    	console.log(error);
-		  	});
 	}
 	showUnlockAnswerDialog = (anwser) => {
 		this.setState({
@@ -416,55 +232,10 @@ class LeftViewContainer extends Component {
 	}
 	showAnswer(gameAnswer) {
 		this.setState({
-	    	tabIndex: 2,
+			tabIndex: 2,
 			dialogOpen: false,
 			gameAnswer,
-	    }, () => {
-	    	if (this.props.st === 1) {
-	    		return;
-	    	}
-	    	// 编程题才需要用markdown处理
-	    	// TODO 选择题切到编程题后，编程题答案markdown没显示出来
-	    	gameAnswer = gameAnswer || '暂未提供答案'
-	    	if (!window['__answerMarkdown']) {
-	    		this._initAnswerMarkdown(gameAnswer); 
-			} else {
-				window.__answerMarkdown.setMarkdown(gameAnswer)
-			}
-		
-	    	// 不能setMarkdown的写法：初始化answer
-    		// window.answerMarkdown = window.editormd.markdownToHTML("game_answer_show", {
-		    //     htmlDecode      : "style,script,iframe",  // you can filter tags decode
-		    //     taskList        : true,
-		    //     tex             : false,  // 数学公式
-		    //     flowChart       : true,  // 默认不解析
-		    //     sequenceDiagram : true // 默认不解析
-		    // });
-			
-	    })
-	}
-	_initAnswerMarkdown(gameAnswer, domId) {
-		window.__answerMarkdown = window.editormd(domId || "game_answer_show", {
-            htmlDecode: "style,script,iframe",  // you can filter tags decode
-            taskList: true,
-
-            mode: 'markdown',
-            path: path,
-            toolbar: false,
-            readOnly: true,
-            watch : true,
-            markdown: gameAnswer,
-
-            tex: true,  // 数学公式
-            flowChart: false,  // 默认不解析
-            sequenceDiagram: false, // 默认不解析
-
-            onload : function(){
-	        	this.previewing();
-	        	// 为了解决切换一次关卡后，再点击答案，看不到答案的问题
-	        	this.setMarkdown(gameAnswer)
-	    	}
-        });
+		})
 	}
 	handleMultiLevelAnswer = (selectID) => {
 		let paramSelectID = selectID
@@ -472,77 +243,64 @@ class LeftViewContainer extends Component {
 			paramSelectID = this.state.lockedAnswers[0].id
 		}
 		const url = `/tasks/${this.props.game.identifier}/unlock_answer.json?answer_id=${paramSelectID}`
-		axios.get(url, {
-		})
-		.then((response) => {
-			if (response.data.status != -1) {
-				const lockedAnswers = this.state.lockedAnswers
-				const challenge_score = this.props.challenge.score
-				// 前端计算扣除金币数
-				let goldToMinuse = 0
-				if (this.state.isMultiLevelAnswer) {
-					for (let i = 0; i < lockedAnswers.length; i++) {
-						let answer = lockedAnswers[i];
-						goldToMinuse = goldToMinuse + answer.score * challenge_score / 100;
-						if (answer.id == paramSelectID) {
-							break;
+		axios.get(url)
+			.then((response) => {
+				if (response.data.status != -1) {
+					const lockedAnswers = this.state.lockedAnswers
+					const challenge_score = this.props.challenge.score
+					// 前端计算扣除金币数
+					let goldToMinuse = 0
+					if (this.state.isMultiLevelAnswer) {
+						for (let i = 0; i < lockedAnswers.length; i++) {
+							let answer = lockedAnswers[i];
+							goldToMinuse = goldToMinuse + answer.score * challenge_score / 100;
+							if (answer.id == paramSelectID) {
+								break;
+							}
 						}
+					} else {
+						goldToMinuse = challenge_score
 					}
-				} else {
-					goldToMinuse = challenge_score
-				}
 
-				this.props.readGameAnswer({
-					grade: this.props.grade - goldToMinuse
-				})
-				
-				this.fetchIfCouldGetAnswerWithoutGoldForMultiLevelAnswer()
-				this.setState({
-					tabIndex: 2,
-					dialogOpen: false,
-				})
-			} else {
-				this.props.showSnackbar(response.data.message)
-			}
-			// TODO 改动 
-			// lockedAnswers
-			// unlockedAnswers
-		
-		})
-		.catch(function (error) {
-			console.log(error);
-		});
+					this.props.readGameAnswer({
+						grade: this.props.grade - goldToMinuse
+					})
+
+					this.fetchIfCouldGetAnswerWithoutGoldForMultiLevelAnswer()
+					this.setState({
+						tabIndex: 2,
+						dialogOpen: false,
+					})
+				} else {
+					this.props.showSnackbar(response.data.message)
+				}
+			})
+			.catch(function (error) {
+				console.log(error);
+			});
 	}
 	getChooseAnswer = () => {
 		const url = `/tasks/${this.props.game.identifier}/unlock_choose_answer.json`
-		axios.get(url, {
-    			// withCredentials: true,
-    		})
-		  	.then((response) => {
-			  	// {message: "您没有足够的金币", status: -1}
+		axios.get(url)
+			.then((response) => {
 
-			  	if (response.data.status == 0) {
+				if (response.data.status == 0) {
 					this.props.showSnackbar(response.data.message)
-			  		return;
-			  	}
+					return;
+				}
+				const gameAnswer = response.data.choose_answers;
+				this.props.readGameAnswer({
+					grade: this.props.grade - this.props.challenge.score
+				})
 
-			    const gameAnswer = response.data.choose_answers;
-			    // const final_score = response.data.final_score;
-			    const grade = response.data.grade;
+				this.showAnswer(gameAnswer)
 
-			    this.props.readGameAnswer({
-			    	// final_score,
-			    	grade: this.props.grade - this.props.challenge.score
-			    })
-
-			    this.showAnswer(gameAnswer)
-			    
 			})
-		  	.catch(function (error) {
-		    	console.log(error);
-		  	});
+			.catch(function (error) {
+				console.log(error);
+			});
 	}
-	handleDialogReadAnswer(selectID) {	
+	handleDialogReadAnswer(selectID) {
 		if (this.props.st === 1) {
 			// 选择题
 			this.getChooseAnswer()
@@ -556,37 +314,24 @@ class LeftViewContainer extends Component {
 			this.tabIndexChange(3, true)
 		}
 	}
-//  /shixuns/mnf6b7z3/shixun_discuss?challenge_id=88
-  	render() {
-  		const { challenge } = this.props
-			const { tabIndex } = this.state;
-	    return (
-	    	<React.Fragment>
-            <ImageLayer {...this.state} onImageLayerClose={this.onImageLayerClose}></ImageLayer>
+	//  /shixuns/mnf6b7z3/shixun_discuss?challenge_id=88
+	render() {
+		const { tabIndex } = this.state;
+		return (
+			<React.Fragment>
+				<ImageLayer {...this.state} onImageLayerClose={this.onImageLayerClose}></ImageLayer>
 
-		      	<LeftView {...this.props} tabIndexChange={this.tabIndexChange} {...this.state} tabIndex={tabIndex}
-		      		handleDialogReadAnswer={this.handleDialogReadAnswer} handleDialogClose={this.handleDialogClose}
-					
-		      		showNewReply={this.showNewReply}
-							showUnlockAnswerDialog={this.showUnlockAnswerDialog}
-		      		createNewComment={this.createNewComment}
+				<LeftView {...this.props} tabIndexChange={this.tabIndexChange} {...this.state} tabIndex={tabIndex}
+					handleDialogReadAnswer={this.handleDialogReadAnswer} handleDialogClose={this.handleDialogClose}
 
-		      	></LeftView>
-	      	</React.Fragment>
-	    );
-  	}
+					showNewReply={this.showNewReply}
+					showUnlockAnswerDialog={this.showUnlockAnswerDialog}
+					createNewComment={this.createNewComment}
+					dialogContent={this.state.dialogContent}
+				></LeftView>
+			</React.Fragment>
+		);
+	}
 }
-/*
-	createNewComment={this.createNewComment}
-		      		fetchCommentIfNotFetched={this.fetchCommentIfNotFetched}
-		      		replyComment={this.replyComment}
-		      		deleteComment={this.deleteComment}
-		      		commentPraise={this.commentPraise}
-		      		hiddenComment={this.hiddenComment}
-		      		rewardCode={this.rewardCode}
-		      		showNewReply={this.showNewReply}
-		      		onPaginationChange={this.onPaginationChange}
 
-*/
-
-export default commentHOC( LeftViewContainer );
+export default commentHOC(LeftViewContainer);
diff --git a/src/modules/page/main/answer/AnswerList.js b/src/modules/page/main/answer/AnswerList.js
index 8428518c..ed8f73c6 100644
--- a/src/modules/page/main/answer/AnswerList.js
+++ b/src/modules/page/main/answer/AnswerList.js
@@ -1,34 +1,26 @@
 import React, { Component } from 'react';
-
 import { Table } from 'antd'
-import 'antd/lib/table/style/index.css'
-
-/* 
-使用这个table组件 
-https://ant.design/components/table-cn/
-
-*/
 
 const data = [{
-  key: '1',
-  name: 'John Brown',
-  age: 32,
-  address: 'New York No. 1 Lake Park',
+	key: '1',
+	name: 'John Brown',
+	age: 32,
+	address: 'New York No. 1 Lake Park',
 }, {
-  key: '2',
-  name: 'Jim Green',
-  age: 42,
-  address: 'London No. 1 Lake Park',
+	key: '2',
+	name: 'Jim Green',
+	age: 42,
+	address: 'London No. 1 Lake Park',
 }, {
-  key: '3',
-  name: 'Joe Black',
-  age: 32,
-  address: 'Sidney No. 1 Lake Park',
+	key: '3',
+	name: 'Joe Black',
+	age: 32,
+	address: 'Sidney No. 1 Lake Park',
 }, {
-  key: '4',
-  name: 'Jim Red',
-  age: 32,
-  address: 'London No. 2 Lake Park',
+	key: '4',
+	name: 'Jim Red',
+	age: 32,
+	address: 'London No. 2 Lake Park',
 }];
 
 class AnswerList extends Component {
@@ -36,34 +28,27 @@ class AnswerList extends Component {
 		super(props)
 	}
 	handleChange = (pagination, filters, sorter) => {
-	    console.log('Various parameters', pagination, filters, sorter);
-	    // TODO sorter变化后重新拉数据，服务端做排序
-	    this.setState({
-	      	sortedInfo: sorter,
-	    });
-  	}
+		this.setState({
+			sortedInfo: sorter,
+		});
+	}
 	render() {
 		const columns = [{
-	      	title: 'Name',
-	      	dataIndex: 'name',
-	      	key: 'name'
-    	}, {
-	      	title: '点赞数',
-	      	dataIndex: 'age',
-	      	key: 'age',
-	      	sorter: (a, b) => a.age - b.age,
-	      	
-	    	// sortOrder:sortedInfo .columnKey === 'age' && sortedInfo.order,
-	    }, {
-	      	title: 'Address',
-	      	dataIndex: 'address',
-	      	key: 'address',
-    	}];
-		return (
-			<div>
-				<Table columns={columns} dataSource={data} onChange={this.handleChange} />
-      		</div>
-      	)
+			title: 'Name',
+			dataIndex: 'name',
+			key: 'name'
+		}, {
+			title: '点赞数',
+			dataIndex: 'age',
+			key: 'age',
+			sorter: (a, b) => a.age - b.age,
+
+		}, {
+			title: 'Address',
+			dataIndex: 'address',
+			key: 'address',
+		}];
+		return <Table columns={columns} dataSource={data} onChange={this.handleChange} />
 	}
 }
 
diff --git a/src/modules/page/main/leftView.css b/src/modules/page/main/leftView.css
index 119eaf95..e841d91e 100644
--- a/src/modules/page/main/leftView.css
+++ b/src/modules/page/main/leftView.css
@@ -1,81 +1,95 @@
 #tab_nav {
-	border-bottom: none;
-    /*padding: 0 1%;*/
-    display: flex;
-    height: 41px;
+  border-bottom: none;
+  /*padding: 0 1%;*/
+  display: flex;
+  height: 41px;
+}
+
+#tab_nav li {
+  flex: 1;
+}
+
+#tab_nav .tab_type {
+  font-size: 16px;
 }
-    #tab_nav li {
-        flex: 1;
-    }
-    #tab_nav .tab_type {
-        font-size: 16px;
-    }
 
 .task_name_section .subject {
-    margin-bottom: 0px;
+  margin-bottom: 0px;
 }
 
 .task_name_section {
-	background-color: #FAFAFA;
-	border-bottom: 1px solid #F3F3F3;
-	padding: 4px 0;
-	height: 45px;
-    box-sizing: border-box;
+  background-color: #FAFAFA;
+  border-bottom: 1px solid #F3F3F3;
+  padding: 4px 15px;
+  height: 45px;
+  box-sizing: border-box;
+  display: flex;
+  flex-flow: row nowrap;
+  align-items: center;
+  justify-content: space-between;
+
 }
+
 .task_name_section .subject {
-	display: inline-block;
-	margin-left: 2px;
-	max-width: 80%;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    /* TODO 加了overflow hidden，会多出一条空白的行*/
-    overflow: hidden;
-    font-size: 18px;
+  margin-left: 14px;
+  text-overflow: ellipsis;
+  flex: 1 0 0;
+  white-space: nowrap;
+  overflow: hidden;
+  font-size: 18px;
 }
 
 .task_name_section .btn-cir-big {
-	margin-top: 4px;
-	background-color: #FFD633;
+  margin-top: 4px;
+  background-color: #FFD633;
 }
 
 
 #game_left_contents .editormd-html-preview {
-	margin-bottom: 0px;
+  margin-bottom: 0px;
 }
+
 #game_left_contents #tab_nav {
-    border-bottom: 1px solid #ddd;
-    margin-bottom: 0px;
+  border-bottom: 1px solid #ddd;
+  margin-bottom: 0px;
 }
 
 #game_left_contents .tab_hover a {
-    color: #05101A !important;
-}
-#game_left_contents .tab_hover {
-    border-bottom: 2px solid #4CACFF
+  color: #05101A !important;
 }
 
-#tab_con_1 .editormd, #tab_con_2 .editormd {
-    border: none;
-    width: 100% !important;
+#game_left_contents .tab_hover {
+  border-bottom: 2px solid #4CACFF
 }
-.editormd-html-preview p, .editormd-preview-container p {
-    font-size: 16px !important;
-    /* -webkit-font-smoothing: auto; */
+
+#tab_con_1 .editormd,
+#tab_con_2 .editormd {
+  border: none;
+  width: 100% !important;
 }
+
+.editormd-html-preview p,
+.editormd-preview-container p {
+  font-size: 16px !important;
+  /* -webkit-font-smoothing: auto; */
+}
+
 .editormd-preview-active {
-    padding: 20px;
+  padding: 20px;
 }
+
 .markdown-body .circularProgress {
-    margin-top: 40% !important;
+  margin-top: 40% !important;
 }
 
 #game_show_content .tab-info .-layout-v.-fit {
-    /* margin: 0 6px; */
+  /* margin: 0 6px; */
 }
 
 .edu-cir-grey1 {
-    color: #FFF !important;
+  color: #FFF !important;
 }
+
 /*
 	评论弹出框动画
 	transition: height 0.2s;
@@ -85,28 +99,30 @@
 
 /* 滚动条样式 */
 ::-webkit-scrollbar {
-    height: 6px;
-    width: 6px !important;
-    background: rgba(0,0,0,.1) !important;
+  height: 6px;
+  width: 6px !important;
+  background: rgba(0, 0, 0, .1) !important;
 }
 
 ::-webkit-scrollbar-thumb {
-    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
-    background-color: #ccc;
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+  background-color: #ccc;
 }
+
 ::-webkit-scrollbar-thumb {
-    background: #B7B7B7 !important;
-    -webkit-border-radius: 6px;
-    -moz-border-radius: 6px;
-    -ms-border-radius: 6px;
-    -o-border-radius: 6px;
-    border-radius: 6px;
+  background: #B7B7B7 !important;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  -ms-border-radius: 6px;
+  -o-border-radius: 6px;
+  border-radius: 6px;
 }
 
 ::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-    background-color: #e1ede1;
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  background-color: #e1ede1;
 }
+
 /* TODO 加载了2个 codemirror  用了HOC，WrappedComponent mount twice
     react HOC extends WrappedComponent mount twice
 */
@@ -117,7 +133,7 @@
 
 
 #game_answer_show.editormd {
-    width: auto;
-    margin: inherit;   
-    border: none;
-}
\ No newline at end of file
+  width: auto;
+  margin: inherit;
+  border: none;
+}
\ No newline at end of file
diff --git a/src/modules/page/readme.txt b/src/modules/page/readme.txt
index dc22a971..bb3fabde 100644
--- a/src/modules/page/readme.txt
+++ b/src/modules/page/readme.txt
@@ -44,7 +44,7 @@ state说明
         has_answer
         is_teacher      是否是老师      初始化被赋值到 user.is_teacher
         last_compile_output
-        mirror_name     镜像名称    TPIMonaco会用到这个属性来判断当前关卡使用的什么语言 见 mirror2LanguageMap
+        mirror_name     镜像名称    TPIMonaco会用到这个属性来判断当前关卡使用的什么语言 见 LanguageMap
         myshixun
             commit_id: "80cb6fc55a14bdd64a9c99913f416966238ed3de"
             created_at: "2019-07-26T09:00:31.000+08:00"
diff --git a/src/modules/page/taskList/TaskList.js b/src/modules/page/taskList/TaskList.js
index 82451229..2815cbf0 100644
--- a/src/modules/page/taskList/TaskList.js
+++ b/src/modules/page/taskList/TaskList.js
@@ -8,133 +8,127 @@ import Rate from 'rc-rate';
 import 'rc-rate/assets/index.css';
 import './TaskList.css'
 
-import classNames  from 'classnames'
+import classNames from 'classnames'
 class TaskList extends Component {
 
-  	onChange() {
+	onChange() {
 
-  	}
-  	renderTasks() {
-  		const { challenges, challenge, shixun, onChallengesDrawerClose, myshixun_manager } = this.props;
-      const currentChallenge = challenge;
-  		const taskArray = challenges.map( (challenge, index) => {
-  			challenge.experience = challenge.get_experience
-  			challenge.gold = challenge.get_gold
-  			challenge.subject = challenge.name
-        const {finished_time, view_answer_time} = challenge;
-  			const showExp = (challenge.experience > 0 && challenge.status === 2) ? '+' + challenge.experience : challenge.experience
-  			const showGold = (challenge.gold > 0 && challenge.status === 2) ? '+' + challenge.gold : challenge.gold
-  			return (
-  				<div className={classNames("panel-list", {'current': (currentChallenge.position-1) === index})} key={index}>
-  					<div className="currentSelected"></div>
-		          	<div className=" clearfix -task-list-inner" id="game_status_118">
+	}
+	renderTasks() {
+		const { challenges, challenge, shixun, onChallengesDrawerClose, myshixun_manager } = this.props;
+		const currentChallenge = challenge;
+		const taskArray = challenges.map((challenge, index) => {
+			challenge.experience = challenge.get_experience
+			challenge.gold = challenge.get_gold
+			challenge.subject = challenge.name
+			const { finished_time, view_answer_time } = challenge;
+			const showExp = (challenge.experience > 0 && challenge.status === 2) ? '+' + challenge.experience : challenge.experience
+			const showGold = (challenge.gold > 0 && challenge.status === 2) ? '+' + challenge.gold : challenge.gold
+			return (
+				<div className={classNames("panel-list", { 'current': (currentChallenge.position - 1) === index })} key={index}>
+					<div className="currentSelected"></div>
+					<div className=" clearfix -task-list-inner" id="game_status_118">
 
-		            	{/* 允许跳关的设置 */}
-		                <h4 className=" -task-list-title fl">
-		                	{shixun.status<2 || challenge.status === 2 || (challenges[index-1] && challenges[index-1].status === 2)
-		                		|| shixun.task_pass || myshixun_manager === true ?
-		                	<Link to={`/tasks/${challenge.identifier}`} onClick={onChallengesDrawerClose}>{index+1}. {challenge.subject}</Link>
-		                	:
-		                	<span>{index+1}. {challenge.subject}</span>}
-		                </h4>
+						{/* 允许跳关的设置 */}
+						<h4 className=" -task-list-title fl">
+							{shixun.status < 2 || challenge.status === 2 || (challenges[index - 1] && challenges[index - 1].status === 2)
+								|| shixun.task_pass || myshixun_manager === true ?
+								<Link to={`/tasks/${challenge.identifier}`} onClick={onChallengesDrawerClose}>{index + 1}. {challenge.subject}</Link>
+								:
+								<span>{index + 1}. {challenge.subject}</span>}
+						</h4>
 
-		                <a className="fr">
-		                	{challenge.status === 2 ?
-		                	<i data-tip-down="已完成" className="fa fa-check-circle color-light-green fr font-16 mt5 -text-danger w20_center"></i>
-		                	:
-		                	<i data-tip-down="待完成" className="fa fa-check-circle fr font-16 mt5 color-light-grey w20_center"></i>
-		                	}
-		                </a>
+						<a className="fr">
+							{challenge.status === 2 ?
+								<i data-tip-down="已完成" className="fa fa-check-circle color-light-green fr font-16 mt5 -text-danger w20_center"></i>
+								:
+								<i data-tip-down="待完成" className="fa fa-check-circle fr font-16 mt5 color-light-grey w20_center"></i>
+							}
+						</a>
 
 
-		            	<div className="cl"></div>
-			            <div style={{display: 'flex'}} className={`grades with80 ml20 ${challenge.status === 2 ? '' : 'notFinish'}`}>
-		                    <span className={`font-12 mr15 info-partly ${(challenge.status === 2 && challenge.experience > 0) ? 'positive ' : 'negative'}`} id="shixun_exp_118">
-		                    	经验值<span className="ml5">
-		                    		{ showExp }
-		                    	</span>
-		                    </span>
-		                    <span className={`font-12 mr15 info-partly ${(challenge.status === 2 && challenge.experience > 0) ? 'positive ' : 'negative'}`} id="shixun_grade_118">
-		                    	金币<span className="ml5">
-		                    		{/*因为关卡金币和经验值是一样的，所以这里可以直接用经验值*/}
-		                    		{ showGold }
+						<div className="cl"></div>
+						<div style={{ display: 'flex' }} className={`grades with80 ml20 ${challenge.status === 2 ? '' : 'notFinish'}`}>
+							<span className={`font-12 mr15 info-partly ${(challenge.status === 2 && challenge.experience > 0) ? 'positive ' : 'negative'}`} id="shixun_exp_118">
+								经验值<span className="ml5">
+									{showExp}
+								</span>
+							</span>
+							<span className={`font-12 mr15 info-partly ${(challenge.status === 2 && challenge.experience > 0) ? 'positive ' : 'negative'}`} id="shixun_grade_118">
+								金币<span className="ml5">
+									{/*因为关卡金币和经验值是一样的，所以这里可以直接用经验值*/}
+									{showGold}
 
-		                    	</span>
-		                    </span>
-		                    <span className=" font-12 mr15 info-partly" id="shixun_tag_118">
-		                    	{ challenge.tag_count ?
-		                    		<React.Fragment>
-		                    			技能标签<span className="ml5">{challenge.tag_count || '无'}</span>
-		                    		</React.Fragment>
-		                     		: '' }
-		                    </span>
-			            </div>
+								</span>
+							</span>
+							<span className=" font-12 mr15 info-partly" id="shixun_tag_118">
+								{challenge.tag_count ?
+									<React.Fragment>
+										技能标签<span className="ml5">{challenge.tag_count || '无'}</span>
+									</React.Fragment>
+									: ''}
+							</span>
+						</div>
 
-                  <div className="finish-wrap">
-                    <p class="finish-time font-12">
-                      <span class="time-title">完成时间</span>
-                      { finished_time ? moment(finished_time).format('YYYY-MM-DD HH:mm') : '--' }
-                    </p>
-                    <p class="finish-time font-12">
-                      <span class="time-title">查看答案时间</span>
-                      { view_answer_time ? moment(view_answer_time).format('YYYY-MM-DD HH:mm') : '--' }                    </p>
-                  </div>
-			            { shixun.status >= 2 && <div className="rateRow">
-			            	{/* 已完成、未评分 */}
-			            	{challenge.status === 2 && challenge.star === 0?
-		            		<div className="unstar">
-						    	<span className="starTip">给个评分吧：</span>
-				            	<Rate
-							      defaultValue={0}
-							      onChange={(value) => this.props.onStarChange(challenge, index, value)}
-							    />
-							    <span className="starNumber" onClick={()=>this.props.saveChallengeStar(challenge, index)}>评价</span>
-						    </div>
-						    :
-						    challenge.status === 2 && challenge.star > 0 ?
-						    <div className="stared">
-						    	<span className="starTip">已评分：</span>
-								<Rate
-							      defaultValue={challenge.star}
-							      disabled
-							    />
-							    <span className="starNumber">{challenge.star}分</span>
-						    </div>
-						    : ''}
-			            </div> }
-		          	</div>
-		        </div>
-  			)
-  		})
+						<div className="finish-wrap">
+							<p className="finish-time font-12">
+								<span className="time-title">完成时间</span>
+								{finished_time ? moment(finished_time).format('YYYY-MM-DD HH:mm') : '--'}
+							</p>
+							<p className="finish-time font-12">
+								<span className="time-title">查看答案时间</span>
+								{view_answer_time ? moment(view_answer_time).format('YYYY-MM-DD HH:mm') : '--'}                    </p>
+						</div>
+						{shixun.status >= 2 && <div className="rateRow">
+							{/* 已完成、未评分 */}
+							{challenge.status === 2 && challenge.star === 0 ?
+								<div className="unstar">
+									<span className="starTip">给个评分吧：</span>
+									<Rate
+										defaultValue={0}
+										onChange={(value) => this.props.onStarChange(challenge, index, value)}
+									/>
+									<span className="starNumber" onClick={() => this.props.saveChallengeStar(challenge, index)}>评价</span>
+								</div>
+								:
+								challenge.status === 2 && challenge.star > 0 ?
+									<div className="stared">
+										<span className="starTip">已评分：</span>
+										<Rate
+											defaultValue={challenge.star}
+											disabled
+										/>
+										<span className="starNumber">{challenge.star}分</span>
+									</div>
+									: ''}
+						</div>}
+					</div>
+				</div>
+			)
+		})
 		return taskArray;
-  	}
+	}
 
-  	render() {
-  		const { taskListLoading } = this.props;
-	    return (
-        <div className="page--over" style={{ width: '420px'}}>
-          {/** 增加提示信息 */}
-          <div className="tip-info-wrap">
-            <p className="tip-info">
-              <span><span style={{ color: '#FFBD4C'}}>温馨提示: </span> 若查看答案时间早于关卡任务完成时间，将影响课堂实训作业的成绩。</span>
-            </p>
-          </div>
+	render() {
+		const { taskListLoading } = this.props;
+		return (
+			<div className="page--over" style={{ width: '420px' }}>
+				{/** 增加提示信息 */}
+				<div className="tip-info-wrap">
+					<p className="tip-info">
+						<span><span style={{ color: '#FFBD4C' }}>温馨提示: </span> 若查看答案时间早于关卡任务完成时间，将影响课堂实训作业的成绩。</span>
+					</p>
+				</div>
 
-			    <div className="col-width-3 -scroll" style={{height: 'calc( 100% - 100px )', width: '420px'}} id="all_task_index">
-				    { taskListLoading ?
-				    	<CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '40%', display: 'block' }}/> :
-			    		this.renderTasks()
-			    	}
-			  	</div>
+				<div className="col-width-3 -scroll" style={{ height: 'calc( 100% - 100px )', width: '420px' }} id="all_task_index">
+					{taskListLoading ?
+						<CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '40%', display: 'block' }} /> :
+						this.renderTasks()
+					}
+				</div>
 			</div>
-	    );
-  	}
-  	/*
-  		<a className="fr"><i data-tip-down="待完成" className="fa fa-play-circle color-light-green fr font-18 mt5 -text-danger w20_center"></i></a>
-		<div className="-task-list-header clearfix">
-				    	<h3 className="fl">全部任务</h3>
-			    	</div>
-  	*/
+		);
+	}
 }
 
 export default TaskList;
diff --git a/src/modules/page/tpiPage.css b/src/modules/page/tpiPage.css
index 015a66b9..2968acfa 100644
--- a/src/modules/page/tpiPage.css
+++ b/src/modules/page/tpiPage.css
@@ -1,282 +1,336 @@
-
 .page--header {
-	z-index: 1399 !important;
+  z-index: 1399 !important;
 }
 
 /* 左右分隔条 */
 .b-label {
-    background: #111c24;
-}
-.b-label>.resize-helper {
-	height: 30px;
-	position: relative;
-    margin-top: -20px;
-    margin-left: -17px;
-    left: 50%;
-	top: 50%;
-	/* .editormd-preview 有个 z-index 99   某些情况下，被cm盖住了 */
-    z-index: 50;
+  background: #111c24;
 }
 
-.b-label>.resize-helper button{
-    width: 24px;
-    height: 24px;
-    min-height: 24px;
-    opacity: 0.7;
+.b-label>.resize-helper {
+  height: 30px;
+  position: relative;
+  margin-top: -20px;
+  margin-left: -17px;
+  left: 50%;
+  top: 50%;
+  /* .editormd-preview 有个 z-index 99   某些情况下，被cm盖住了 */
+  z-index: 50;
 }
+
+.b-label>.resize-helper button {
+  width: 24px;
+  height: 24px;
+  min-height: 24px;
+  opacity: 0.7;
+}
+
 .b-label>.resize-helper button:hover {
-	opacity: 1;
+  opacity: 1;
 }
 
 .b-label>.resize-helper button path {
-    color: #666666;
-    fill: currentColor;
+  color: #666666;
+  fill: currentColor;
 }
 
 /* 所有i都加上动画  */
 #game_right_contents i {
-    transition: transform .3s ease;
+  transition: transform .3s ease;
 }
 
 
 /* */
 .h-center {
-	height: 3px;
-	background: rgb(17, 28, 36);
-    border-top: 1px solid rgb(25, 82, 123);
+  height: 3px;
+  background: rgb(17, 28, 36);
+  border-top: 1px solid rgb(25, 82, 123);
 }
 
 
 /* */
 /* codemirror初始化的时候高度没100% */
 #codetab_con_1 {
-	/*display: flex;*/
+  display: 'block';
+  flex: 'auto';
+  height: 100%;
 }
-.CodeMirror{
-	/*height: -webkit-fill-available !important;*/
-	line-height: 1.2;
 
-    /*height: auto !important;
+.CodeMirror {
+  /*height: -webkit-fill-available !important;*/
+  line-height: 1.2;
+
+  /*height: auto !important;
     flex: 1 1 auto;*/
 }
 
 /* LeftView markdown */
-#game_show_content #tab_con_1 .editormd-preview, #game_show_content #tab_con_2 .editormd-preview
-		,#game_show_content #tab_con_3 .editormd-preview
-		,#game_show_content #tab_con_5 .editormd-preview  {
-	width: 100% !important;
-	height: 100% !important;
-	z-index: 20;
+#game_show_content #tab_con_1 .editormd-preview,
+#game_show_content #tab_con_2 .editormd-preview,
+#game_show_content #tab_con_3 .editormd-preview,
+#game_show_content #tab_con_5 .editormd-preview {
+  width: 100% !important;
+  height: 100% !important;
+  z-index: 20;
 }
 
 /*  tab 样式覆盖 */
 #blacktab_nav {
-	background-color: #111C24;
-	border-bottom: 1px solid #222C34;
+  background-color: #111C24;
+  border-bottom: 1px solid #222C34;
 }
-.blacktab_hover  {
 
-}
 .blacktab_hover a:after {
-    content: '';
-    position: absolute;
-    left: 50%;
-    margin-left: -10px;
-    top: auto;
-    bottom: 0;
-    right: auto;
-    height: 2px;
-    width: 20px;
-    background-color: #29BD8B;
+  content: '';
+  position: absolute;
+  left: 50%;
+  margin-left: -10px;
+  top: auto;
+  bottom: 0;
+  right: auto;
+  height: 2px;
+  width: 20px;
+  background-color: #29BD8B;
 }
 
 button.buttonHoverColor:hover a {
-	color: #FF7500!important;
+  color: #FF7500 !important;
 }
 
 /*--------------------------------------------------- Header Start */
 .leftNavDrawer {
-	z-index: 8000 !important;
+  z-index: 8000 !important;
 }
+
 .leftNavDrawer>div:nth-child(2) {
-	/*left:80px !important;*/
-	z-index: 8000 !important;
-	top: 54px;
-	overflow: hidden;
+  /*left:80px !important;*/
+  z-index: 8000 !important;
+  top: 54px;
+  overflow: hidden;
 }
+
 .leftNavDrawer .MuiDrawer-paper-2 {
-	width: 500px;
+  width: 500px;
 }
 
 .leftNavDrawer .page--over {
-	left: 0px;
-	position: static;
+  left: 0px;
+  position: static;
 }
+
 .leftNavDrawer .col-width-3 {
-	position: static;
-	width: 400px;
-	border: none;
+  position: static;
+  width: 400px;
+  border: none;
 }
 
 
 #myshixun_top {
-	display: flex;
-	position: fixed;
-	height: 54px;
-	z-index: 1 !important;
+  display: flex;
+  position: fixed;
+  height: 54px;
+  z-index: 1 !important;
 }
+
 .headerLeft {
-	flex: 0 0 400px;
+  flex: 0 0 400px;
 }
-	#user_grade a {
-	    color: white;
-	}
-	.-header-right {
-		right: inherit;
-		margin-left: 24px;
-	    display: inline-block;
-		top: 12px;
-		height: 32px;
-    	padding: 3px 15px
-	}
-	.userInfo {
-		display: inline-block;
-		top: 4px;
-    	position: relative;
-		margin-left: 10px;
-	}
-		.userInfo img {
-			border-radius: 18px;
-			vertical-align: bottom;
-		}
-		.userInfo .userInfoName {
-			margin-left: 12px;
-		    color: #fff;
-		    font-size: 16px;
-		}
-		#user_grade {
-			margin-top: -1px;
-		}
+
+#user_grade a {
+  color: white;
+}
+
+.-header-right {
+  right: inherit;
+  margin-left: 24px;
+  display: inline-block;
+  top: 12px;
+  height: 32px;
+  padding: 3px 15px
+}
+
+.userInfo {
+  display: inline-block;
+  top: 4px;
+  position: relative;
+  margin-left: 10px;
+}
+
+.userInfo img {
+  border-radius: 18px;
+  vertical-align: bottom;
+}
+
+.userInfo .userInfoName {
+  margin-left: 12px;
+  color: #fff;
+  font-size: 16px;
+}
+
+#user_grade {
+  margin-top: -1px;
+}
+
 .headerCenter {
-	flex: 1 1 auto;
-	text-align: center;
-	flex-direction: column;
+  flex: 1 1 auto;
+  text-align: center;
+  flex-direction: column;
 }
-	.headerCenter h2 {
-		max-width: none;
-		width: 100%;
-		font-size: 16px;
-    	flex: 0 0 24px;
-	}
-	.headerCenter .timeRecord {
-		font-size: 13px;
-		color: #CCCCCC;
-		width: 100px;
-    	margin: auto;
-	}
+
+.headerCenter h2 {
+  max-width: none;
+  width: 100%;
+  font-size: 16px;
+  flex: 0 0 24px;
+}
+
+.headerCenter .timeRecord {
+  font-size: 13px;
+  color: #CCCCCC;
+  width: 100px;
+  margin: auto;
+}
+
 .headerRight {
-	flex: 0 0 400px;
+  flex: 0 0 400px;
 }
-	.headerRight a {
-		color: #1A3F5F;
-		font-size: 16px;
-	}
-	.headerRight .exitBtn {
-		color: #1a3f5f !important;
-	}
-	.headerRight a:hover {
-		color: #4CACFF !important;
-	}
-	.headerRight i {
-		font-size: 24px !important;
-	    margin-right: 8px;
-	    margin-top: 12px;
-	    vertical-align: -4px;
-	}
-	
+
+.headerRight a {
+  color: #1A3F5F;
+  font-size: 16px;
+}
+
+.headerRight .exitBtn {
+  color: #1a3f5f !important;
+}
+
+.headerRight a:hover {
+  color: #4CACFF !important;
+}
+
+.headerRight i {
+  font-size: 24px !important;
+  margin-right: 8px;
+  margin-top: 12px;
+  vertical-align: -4px;
+}
+
 
 /*--------------------------------------------------- Header End */
 /* picture_display 样式，language_display处理*/
 .photo_display {
-    padding-top: 54px;
-    padding-left: 0px;
+  padding-top: 54px;
+  padding-left: 0px;
 }
-.with33{ width: 33%;}
-.with49{ width: 49%;}
-.mr1precent{margin-right: 1%;}
-.mr03precent{margin-right: 0.3%;}
+
+.with33 {
+  width: 33%;
+}
+
+.with49 {
+  width: 49%;
+}
+
+.mr1precent {
+  margin-right: 1%;
+}
+
+.mr03precent {
+  margin-right: 0.3%;
+}
+
 /*TPI输出TXT文件显示*/
-.output-txt{padding: 10px;box-shadow:1px 6px 24px rgba(17,28,36,0.2);min-height: 500px;width: 100%;box-sizing: border-box;outline: none;}
+.output-txt {
+  padding: 10px;
+  box-shadow: 1px 6px 24px rgba(17, 28, 36, 0.2);
+  min-height: 500px;
+  width: 100%;
+  box-sizing: border-box;
+  outline: none;
+}
 
 /* -------------------------------------- m design 控件样式修改*/
 .rootSnackbar {
-	top: 60px !important;
-    z-index: 99999999 !important;
+  top: 60px !important;
+  z-index: 99999999 !important;
 }
+
 .rootSnackbar>div>div {
-	margin: 0 auto;
+  margin: 0 auto;
 }
 
 
 /* Dialog */
 #alert-dialog-title>h2 {
-	text-align: center;
+  text-align: center;
 }
-	#alert-dialog-title {
-		border-bottom: 1px solid #eee;
-	    margin-bottom: 18px;
-    }
+
+#alert-dialog-title {
+  border-bottom: 1px solid #eee;
+  margin-bottom: 18px;
+}
+
 body>div[role=dialog]>div[role=document]>div:nth-child(3) {
-	justify-content: center;
+  justify-content: center;
 }
+
 body>div[role=dialog]>div {
-	/* tpi dialog按钮改成平铺的大按钮 */
-	/* padding-bottom: 10px; */
+  /* tpi dialog按钮改成平铺的大按钮 */
+  /* padding-bottom: 10px; */
 }
+
 /* tpi 窗口宽度*/
 body>div[role=dialog]>div[role=document] {
-	border-radius: 10px;
+  border-radius: 10px;
 }
+
 #tpi-dialog>div[role=document] {
-    border-radius: 10px;
+  border-radius: 10px;
 }
+
 body>div[role=dialog] div[role=document] {
-    min-width: 400px;
+  min-width: 400px;
 }
-#alert-dialog-title + div {
-    text-align: center;
+
+#alert-dialog-title+div {
+  text-align: center;
 }
 
 body>div>div[role=tooltip] {
-	font-size: 12px;
+  font-size: 12px;
 }
 
 /* -------------------------------------- m design 控件样式修改 END*/
 
 /*rc-tree样式*/
-.repoFilesDrawer .rc-tree li span.rc-tree-checkbox, .rc-tree li span.rc-tree-iconEle, .rc-tree li span.rc-tree-switcher {
-	background-image:url('../../images/component/rc-tree.png');
+.repoFilesDrawer .rc-tree li span.rc-tree-checkbox,
+.rc-tree li span.rc-tree-iconEle,
+.rc-tree li span.rc-tree-switcher {
+  background-image: url('../../images/component/rc-tree.png');
 }
+
 .rc-tree li span.rc-tree-node-selected .rc-tree-iconEle {
-	background-image:url('../../images/component/selectFile.png');
-	background-position: 0;
-    margin-bottom: 4px;
+  background-image: url('../../images/component/selectFile.png');
+  background-position: 0;
+  margin-bottom: 4px;
 }
+
 .repoFilesDrawer .rc-tree li span.rc-tree-icon_loading {
-    margin-right: 2px;
-    vertical-align: top;
-    background: url(data:image/gif;base64,R0lGODlhEAAQAKIGAMLY8YSx5HOm4Mjc88/g9Ofw+v///wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFCgAGACwAAAAAEAAQAAADMGi6RbUwGjKIXCAA016PgRBElAVlG/RdLOO0X9nK61W39qvqiwz5Ls/rRqrggsdkAgAh+QQFCgAGACwCAAAABwAFAAADD2hqELAmiFBIYY4MAutdCQAh+QQFCgAGACwGAAAABwAFAAADD1hU1kaDOKMYCGAGEeYFCQAh+QQFCgAGACwKAAIABQAHAAADEFhUZjSkKdZqBQG0IELDQAIAIfkEBQoABgAsCgAGAAUABwAAAxBoVlRKgyjmlAIBqCDCzUoCACH5BAUKAAYALAYACgAHAAUAAAMPaGpFtYYMAgJgLogA610JACH5BAUKAAYALAIACgAHAAUAAAMPCAHWFiI4o1ghZZJB5i0JACH5BAUKAAYALAAABgAFAAcAAAMQCAFmIaEp1motpDQySMNFAgA7) no-repeat scroll 0 0 transparent;
+  margin-right: 2px;
+  vertical-align: top;
+  background: url(data:image/gif;base64,R0lGODlhEAAQAKIGAMLY8YSx5HOm4Mjc88/g9Ofw+v///wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFCgAGACwAAAAAEAAQAAADMGi6RbUwGjKIXCAA016PgRBElAVlG/RdLOO0X9nK61W39qvqiwz5Ls/rRqrggsdkAgAh+QQFCgAGACwCAAAABwAFAAADD2hqELAmiFBIYY4MAutdCQAh+QQFCgAGACwGAAAABwAFAAADD1hU1kaDOKMYCGAGEeYFCQAh+QQFCgAGACwKAAIABQAHAAADEFhUZjSkKdZqBQG0IELDQAIAIfkEBQoABgAsCgAGAAUABwAAAxBoVlRKgyjmlAIBqCDCzUoCACH5BAUKAAYALAYACgAHAAUAAAMPaGpFtYYMAgJgLogA610JACH5BAUKAAYALAIACgAHAAUAAAMPCAHWFiI4o1ghZZJB5i0JACH5BAUKAAYALAAABgAFAAcAAAMQCAFmIaEp1motpDQySMNFAgA7) no-repeat scroll 0 0 transparent;
 }
 
 /*去除选中的颜色*/
 .repoFilesDrawer .rc-tree-node-selected {
-    background-color: #4CACFF;
-    border: 1px solid #4CACFF;
-    opacity: 1;
-    height: 26px !important;
+  background-color: #4CACFF;
+  border: 1px solid #4CACFF;
+  opacity: 1;
+  height: 26px !important;
 }
+
 .repoFilesDrawer .rc-tree-node-selected span.rc-tree-title {
-    color: #fff;
+  color: #fff;
 }
 
 /*
@@ -289,119 +343,328 @@ body>div>div[role=tooltip] {
 
 */
 
-.cm-s-railscasts.CodeMirror {background: #2b2b2b;color: #f4f1ed;line-height: 21px;}
-.cm-s-railscasts div.CodeMirror-selected {background: #214283 !important;}
-.cm-s-railscasts .CodeMirror-gutters {/*background: #2b2b2b; */border-right: 0px;}
-.cm-s-railscasts .CodeMirror-linenumber {color: #5a647e;}
-.cm-s-railscasts .CodeMirror-cursor {border-left: 1px solid #d4cfc9 !important;}
+.cm-s-railscasts.CodeMirror {
+  background: #2b2b2b;
+  color: #f4f1ed;
+  line-height: 21px;
+}
 
-.cm-s-railscasts span.cm-comment {color: #bc9458;}
-.cm-s-railscasts span.cm-atom {color: #b6b3eb;}
-.cm-s-railscasts span.cm-number {color: #b6b3eb;}
+.cm-s-railscasts div.CodeMirror-selected {
+  background: #214283 !important;
+}
 
-.cm-s-railscasts span.cm-property, .cm-s-railscasts span.cm-attribute {color: #a5c261;}
-.cm-s-railscasts span.cm-keyword {color: #da4939;}
-.cm-s-railscasts span.cm-string {color: #ffc66d;}
+.cm-s-railscasts .CodeMirror-gutters {
+  /*background: #2b2b2b; */
+  border-right: 0px;
+}
+
+.cm-s-railscasts .CodeMirror-linenumber {
+  color: #5a647e;
+}
+
+.cm-s-railscasts .CodeMirror-cursor {
+  border-left: 1px solid #d4cfc9 !important;
+}
+
+.cm-s-railscasts span.cm-comment {
+  color: #bc9458;
+}
+
+.cm-s-railscasts span.cm-atom {
+  color: #b6b3eb;
+}
+
+.cm-s-railscasts span.cm-number {
+  color: #b6b3eb;
+}
+
+.cm-s-railscasts span.cm-property,
+.cm-s-railscasts span.cm-attribute {
+  color: #a5c261;
+}
+
+.cm-s-railscasts span.cm-keyword {
+  color: #da4939;
+}
+
+.cm-s-railscasts span.cm-string {
+  color: #ffc66d;
+}
+
+.cm-s-railscasts span.cm-variable {
+  color: #a5c261;
+}
+
+.cm-s-railscasts span.cm-variable-2 {
+  color: #6d9cbe;
+}
+
+.cm-s-railscasts span.cm-def {
+  color: #cc7833;
+}
 
-.cm-s-railscasts span.cm-variable {color: #a5c261;}
-.cm-s-railscasts span.cm-variable-2 {color: #6d9cbe;}
-.cm-s-railscasts span.cm-def {color: #cc7833;}
 /*.cm-s-railscasts span.cm-error {background: #da4939; color: #d4cfc9;}*/
-.cm-s-railscasts span.cm-bracket {color: #f4f1ed;}
-.cm-s-railscasts span.cm-tag {color: #da4939;}
-.cm-s-railscasts span.cm-link {color: #b6b3eb;}
+.cm-s-railscasts span.cm-bracket {
+  color: #f4f1ed;
+}
 
-.cm-s-railscasts .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-railscasts .CodeMirror-activeline-background { background: #303040; }
+.cm-s-railscasts span.cm-tag {
+  color: #da4939;
+}
+
+.cm-s-railscasts span.cm-link {
+  color: #b6b3eb;
+}
+
+.cm-s-railscasts .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
+
+.cm-s-railscasts .CodeMirror-activeline-background {
+  background: #303040;
+}
 
 
 
 
 /* evaluateView*/
 
-.CodeMirror-lines{padding: 0px!important;}
-.cm-s-blackboard.CodeMirror {background: #0C1021; color: #F8F8F8; }
-.cm-s-blackboard div.CodeMirror-selected { background: #253B76; }
-.cm-s-blackboard .CodeMirror-line::selection, .cm-s-blackboard .CodeMirror-line > span::selection, .cm-s-blackboard .CodeMirror-line > span > span::selection { background: rgba(37, 59, 118, .99); }
-.cm-s-blackboard .CodeMirror-line::-moz-selection, .cm-s-blackboard .CodeMirror-line > span::-moz-selection, .cm-s-blackboard .CodeMirror-line > span > span::-moz-selection { background: rgba(37, 59, 118, .99); }
-.cm-s-blackboard .CodeMirror-gutters { background: #585858; border-right: 0; }
-.cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
-.cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
-.cm-s-blackboard .CodeMirror-linenumber { color: #888;/*background: #585858;*/ }
-.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
+.CodeMirror-lines {
+  padding: 0px !important;
+}
 
-.cm-s-blackboard .cm-keyword { color: #FBDE2D; }
-.cm-s-blackboard .cm-atom { color: #D8FA3C; }
-.cm-s-blackboard .cm-number { color: #D8FA3C; }
-.cm-s-blackboard .cm-def { color: #8DA6CE; }
-.cm-s-blackboard .cm-variable { color: #FF6400; }
-.cm-s-blackboard .cm-operator { color: #FBDE2D; }
-.cm-s-blackboard .cm-comment { color: #AEAEAE; }
-.cm-s-blackboard .cm-string { color: #61CE3C; }
-.cm-s-blackboard .cm-string-2 { color: #61CE3C; }
-.cm-s-blackboard .cm-meta { color: #D8FA3C; }
-.cm-s-blackboard .cm-builtin { color: #8DA6CE; }
-.cm-s-blackboard .cm-tag { color: #8DA6CE; }
-.cm-s-blackboard .cm-attribute { color: #8DA6CE; }
-.cm-s-blackboard .cm-header { color: #FF6400; }
-.cm-s-blackboard .cm-hr { color: #AEAEAE; }
-.cm-s-blackboard .cm-link { color: #8DA6CE; }
-.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
+.cm-s-blackboard.CodeMirror {
+  background: #0C1021;
+  color: #F8F8F8;
+}
 
-.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
-.cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
+.cm-s-blackboard div.CodeMirror-selected {
+  background: #253B76;
+}
+
+.cm-s-blackboard .CodeMirror-line::selection,
+.cm-s-blackboard .CodeMirror-line>span::selection,
+.cm-s-blackboard .CodeMirror-line>span>span::selection {
+  background: rgba(37, 59, 118, .99);
+}
+
+.cm-s-blackboard .CodeMirror-line::-moz-selection,
+.cm-s-blackboard .CodeMirror-line>span::-moz-selection,
+.cm-s-blackboard .CodeMirror-line>span>span::-moz-selection {
+  background: rgba(37, 59, 118, .99);
+}
+
+.cm-s-blackboard .CodeMirror-gutters {
+  background: #585858;
+  border-right: 0;
+}
+
+.cm-s-blackboard .CodeMirror-guttermarker {
+  color: #FBDE2D;
+}
+
+.cm-s-blackboard .CodeMirror-guttermarker-subtle {
+  color: #888;
+}
+
+.cm-s-blackboard .CodeMirror-linenumber {
+  color: #888;
+  /*background: #585858;*/
+}
+
+.cm-s-blackboard .CodeMirror-cursor {
+  border-left: 1px solid #A7A7A7;
+}
+
+.cm-s-blackboard .cm-keyword {
+  color: #FBDE2D;
+}
+
+.cm-s-blackboard .cm-atom {
+  color: #D8FA3C;
+}
+
+.cm-s-blackboard .cm-number {
+  color: #D8FA3C;
+}
+
+.cm-s-blackboard .cm-def {
+  color: #8DA6CE;
+}
+
+.cm-s-blackboard .cm-variable {
+  color: #FF6400;
+}
+
+.cm-s-blackboard .cm-operator {
+  color: #FBDE2D;
+}
+
+.cm-s-blackboard .cm-comment {
+  color: #AEAEAE;
+}
+
+.cm-s-blackboard .cm-string {
+  color: #61CE3C;
+}
+
+.cm-s-blackboard .cm-string-2 {
+  color: #61CE3C;
+}
+
+.cm-s-blackboard .cm-meta {
+  color: #D8FA3C;
+}
+
+.cm-s-blackboard .cm-builtin {
+  color: #8DA6CE;
+}
+
+.cm-s-blackboard .cm-tag {
+  color: #8DA6CE;
+}
+
+.cm-s-blackboard .cm-attribute {
+  color: #8DA6CE;
+}
+
+.cm-s-blackboard .cm-header {
+  color: #FF6400;
+}
+
+.cm-s-blackboard .cm-hr {
+  color: #AEAEAE;
+}
+
+.cm-s-blackboard .cm-link {
+  color: #8DA6CE;
+}
+
+.cm-s-blackboard .cm-error {
+  background: #9D1E15;
+  color: #F8F8F8;
+}
+
+.cm-s-blackboard .CodeMirror-activeline-background {
+  background: #3C3636;
+}
+
+.cm-s-blackboard .CodeMirror-matchingbracket {
+  outline: 1px solid grey;
+  color: white !important;
+}
 
 .cm-s-railscasts span.cm-error {
-    color: #bc9458;
+  color: #bc9458;
 }
 
 /* 弹框 */
-.popupAll{width: 100%;height: 100%;position: fixed;z-index: 99998;background-color: rgba(5,16,26,0.6);left: 0;top:0;}
-.task-popup{ width: 30%;background: #fff; border:1px solid #e8e8e8; border-radius:10px; -webkit-box-shadow:0 0 10px #ccc;  -moz-box-shadow:0 0 10px #ccc;  box-shadow:0 0 10px #ccc;}
-.task-popup-text-center{ text-align: center; color: #333;}
-.task-popup-title{ border-bottom: 1px solid #eee; padding:0px 15px;text-align: center;box-sizing: border-box;line-height: 70px;height: 70px; border-radius: 10px 10px 0px 0px;font-size: 16px; }
-.task-popup-content{ padding:15px;}
+.popupAll {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  z-index: 99998;
+  background-color: rgba(5, 16, 26, 0.6);
+  left: 0;
+  top: 0;
+}
+
+.task-popup {
+  width: 30%;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+  border-radius: 10px;
+  -webkit-box-shadow: 0 0 10px #ccc;
+  -moz-box-shadow: 0 0 10px #ccc;
+  box-shadow: 0 0 10px #ccc;
+}
+
+.task-popup-text-center {
+  text-align: center;
+  color: #333;
+}
+
+.task-popup-title {
+  border-bottom: 1px solid #eee;
+  padding: 0px 15px;
+  text-align: center;
+  box-sizing: border-box;
+  line-height: 70px;
+  height: 70px;
+  border-radius: 10px 10px 0px 0px;
+  font-size: 16px;
+}
+
+.task-popup-content {
+  padding: 15px;
+}
+
 /*注释这个地方是因为会影响到实训哪块合作者删除的样式*/
 /*.task-popup-submit{ margin:0px auto 15px; width: 120px;}*/
-.task-popup-sure{ margin:0px auto 15px; width: 54px;}
-.task-popup-right-sure{margin:0px auto 15px;text-align: center}
-.task-popup-OK{ margin:15px auto; text-align: center}
-.task-popup-bggrey{ background:#fff; color:#333;}
-a.task-btn-orange{background: #4CACFF; color:#fff!important;}
-a:hover.task-btn-orange{background: #4CACFF; color:#fff!important;}
+.task-popup-sure {
+  margin: 0px auto 15px;
+  width: 54px;
+}
+
+.task-popup-right-sure {
+  margin: 0px auto 15px;
+  text-align: center
+}
+
+.task-popup-OK {
+  margin: 15px auto;
+  text-align: center
+}
+
+.task-popup-bggrey {
+  background: #fff;
+  color: #333;
+}
+
+a.task-btn-orange {
+  background: #4CACFF;
+  color: #fff !important;
+}
+
+a:hover.task-btn-orange {
+  background: #4CACFF;
+  color: #fff !important;
+}
 
 
 /* 代码区域样式 */
 #games_repository_contents .readRepoFailed {
-	color: #fff;
-	width: 100%;
-	text-align: center;
-	margin-top: 120px;
-}
-	#games_repository_contents .readRepoFailed .retry {
-		color:#4CACFF;
-	}
-
-	/*实训详情*/
-.backgroudwhite{
-	height:60px;
-	background:rgba(255,255,255,1);
-	box-shadow:0px 1px 0px 0px rgba(244,244,244,1);
-	line-height: 60px;
+  color: #fff;
+  width: 100%;
+  text-align: center;
+  margin-top: 120px;
 }
 
-.tpmbannernavstyler{
-	font-size:16px;
-	/*color:rgba(51,51,51,1);*/
+#games_repository_contents .readRepoFailed .retry {
+  color: #4CACFF;
+}
+
+/*实训详情*/
+.backgroudwhite {
+  height: 60px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 1px 0px 0px rgba(244, 244, 244, 1);
+  line-height: 60px;
+}
+
+.tpmbannernavstyler {
+  font-size: 16px;
+  /*color:rgba(51,51,51,1);*/
 }
 
 .ant-menu-horizontal {
-	border-bottom:none !important;
-	height:60px;
-	line-height: 60px;
+  border-bottom: none !important;
+  height: 60px;
+  line-height: 60px;
 }
 
 
-.audit_situationactive{
-	color: #4CACFF !important;
+.audit_situationactive {
+  color: #4CACFF !important;
 }
\ No newline at end of file
diff --git a/src/modules/paths/Index.js b/src/modules/paths/Index.js
index 67ef9125..2f3514be 100644
--- a/src/modules/paths/Index.js
+++ b/src/modules/paths/Index.js
@@ -3,24 +3,19 @@ import React, { Component } from 'react';
 import { SnackbarHOC, CNotificationHOC } from 'educoder';
 
 
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
+import { Route, Switch } from 'react-router-dom';
 import Loadable from 'react-loadable';
 import Loading from '../../Loading';
 import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
-import NewFooter from "../tpm/NewFooter";
 
 const PathsDetail = Loadable({
     loader: () => import('./PathDetail/PathDetailIndex'),
-    loading:Loading,
+    loading: Loading,
 })
 const PathsNew = Loadable({
     loader: () => import('./PathNew'),
-    loading:Loading,
+    loading: Loading,
 })
-// const Statistics = Loadable({
-//     loader: () => import('./SchoolStatistics/Statistics'),
-//     loading:Loading
-// })
 const Statistics = Loadable({
     loader: () => import('./statics'),
     loading: Loading
@@ -28,10 +23,10 @@ const Statistics = Loadable({
 
 const ShixunPaths = Loadable({
     loader: () => import('./ShixunPaths'),
-    loading:Loading,
+    loading: Loading,
 })
 
-class Index extends Component{
+class Index extends Component {
     constructor(props) {
         super(props)
     }
@@ -39,26 +34,26 @@ class Index extends Component{
         return (
             <div>
                 <Switch {...this.props}>
-                    <Route path="/paths/:pathId/statistics" component = {Statistics}  {...this.props} {...this.state}></Route>
+                    <Route path="/paths/:pathId/statistics" component={Statistics}  {...this.props} {...this.state}></Route>
 
                     <Route path="/paths/new"
-                        render={(props)=>(<PathsNew {...this.props} {...this.state} {...props}/>)}
+                        render={(props) => (<PathsNew {...this.props} {...this.state} {...props} />)}
                     ></Route>
                     <Route path="/paths/:pathId/edit"
-                        render={(props)=>(<PathsNew {...this.props} {...this.state} {...props}/>)}
+                        render={(props) => (<PathsNew {...this.props} {...this.state} {...props} />)}
+                    ></Route>
+                    {/*编辑页面*/}
+                    <Route path="/paths/:pathId"
+                        render={(props) => (<PathsDetail {...this.props} {...this.state} {...props} />)}
                     ></Route>
-                     {/*编辑页面*/}
-										<Route path="/paths/:pathId"
-													 render={(props)=>(<PathsDetail {...this.props} {...this.state} {...props}/>)}
-										></Route>
 
                     {/*<Route path="/paths/:pathId" exact component = {PathsDetail}  {...this.props} {...this.state}></Route>*/}
-										<Route path="/paths" exact
-													 render={(props)=>(<ShixunPaths {...this.props} {...this.state} {...props}/>)}
-										></Route>
+                    <Route path="/paths" exact
+                        render={(props) => (<ShixunPaths {...this.props} {...this.state} {...props} />)}
+                    ></Route>
                 </Switch>
             </div>
         )
     }
 }
-export default CNotificationHOC() (SnackbarHOC() ( TPMIndexHOC(Index) ));
\ No newline at end of file
+export default CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index)));
\ No newline at end of file
diff --git a/src/modules/paths/PathDetail/Addshixuns.js b/src/modules/paths/PathDetail/Addshixuns.js
index 9e7766e3..0df263fd 100644
--- a/src/modules/paths/PathDetail/Addshixuns.js
+++ b/src/modules/paths/PathDetail/Addshixuns.js
@@ -69,7 +69,7 @@ class Addshixuns extends Component {
 			labelCol: { span: 4 },
 			wrapperCol: { span: 14 },
 		};
-		console.log(this.props)
+
 		return(
 			<Modal
 				className={this.props.className}
diff --git a/src/modules/paths/PathDetail/DetailCards.js b/src/modules/paths/PathDetail/DetailCards.js
index 658d0fdf..f477d87f 100644
--- a/src/modules/paths/PathDetail/DetailCards.js
+++ b/src/modules/paths/PathDetail/DetailCards.js
@@ -247,7 +247,7 @@ class DetailCards extends Component{
 			isSpin:true,
 		})
 		axios.get(url).then((response) => {
-			// debugger
+			
 			if(response.status===200){
 				// let path="/shixuns/"+response.data.shixun_identifier+"/challenges";
 				// this.props.history.push(path);
@@ -507,7 +507,7 @@ class DetailCards extends Component{
 
                         <div>
 
-													{this.props.current_user&&this.props.current_user.admin===true||this.props.current_user&&this.props.current_user.business===true?
+													{this.props.current_user&&this.props.current_user.admin===true?
 														item.shixuns_list && item.shixuns_list.map((line,index)=>{
 														return(
                               <div className="clearfix paragraph lineh-30" onMouseEnter={()=>this.showparagraph(key,index)} onMouseLeave={this.hideparagraph}>
@@ -558,6 +558,8 @@ class DetailCards extends Component{
                                   {
                                     line.allow_visit===false&&line.shixun_status==="暂未公开"?
                                       <li className="fr status_li"><span className="fr color204">暂未公开</span></li>
+                                      :line.allow_visit===false&&line.shixun_status==="已删除"?
+                                      <li className="fr status_li"><span className="fr color204">已删除</span></li>
                                       :
                                       <li className={showparagraph===false?"none":"fr status_li"}>
                                         {
diff --git a/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
index cd78ceaa..2c48fed9 100644
--- a/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
+++ b/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
@@ -319,7 +319,7 @@ class DetailCardsEditAndAdd extends Component{
   }
 
 	Addshixuns=()=>{
-		// debugger
+		
 		// console.log("点击了新建实训Addshixuns");
 		if(this.props&&this.props.current_user&&this.props.current_user.is_shixun_marker===false){
 			this.setgoshowqqgtounp(true);
diff --git a/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js b/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
index ee1eb60c..f12f2523 100644
--- a/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
+++ b/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
-import {Modal,Input,Checkbox,Tooltip,Spin,notification} from "antd";
-import { DragDropContext,Draggable, Droppable} from 'react-beautiful-dnd';
+import { getImageUrl } from 'educoder';
+import { Modal, Input, Checkbox, Tooltip, Spin, notification } from "antd";
+import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
 import Modals from '../../modals/Modals';
 import Addshixuns from './Addshixuns';
 import NewShixunModel from '../../courses/coursesPublic/NewShixunModel';
@@ -14,12 +14,12 @@ const Search = Input.Search;
 
 
 //a little function to help us with reordering the result
-const reorder =  (list, startIndex, endIndex) => {
+const reorder = (list, startIndex, endIndex) => {
   // console.log(list)
   // console.log(startIndex)
   // console.log(endIndex)
 
-  let newlist=list;
+  let newlist = list;
   const result = Array.from(newlist);
   const [removed] = result.splice(startIndex, 1);
   result.splice(endIndex, 0, removed);
@@ -31,154 +31,154 @@ const getItemStyle = (isDragging, draggableStyle) => ({
   // change background colour if dragging
   background: isDragging ? '#dceeff' : '',
   // styles we need to apply on draggables
-   ...draggableStyle,
+  ...draggableStyle,
 });
 
 
-class DetailCardsEditAndEdit extends Component{
-  constructor(props){
+class DetailCardsEditAndEdit extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      selectShixun:false,
-      editPanel:true,
-      search:"",
-      type:0,
-      page:1,
-      ChooseShixunList:undefined,
-      hometypepvisible:true,
-      shixuns_listedit:undefined,
-      patheditarry:[],
-      stage_name:undefined,
-      stage_description:undefined,
-      stageid:undefined,
-      Modalstype:false,
-      Modalstopval:'',
-      Modalsbottomval:'',
-      delectfunvalue:undefined,
-      ChooseShixunListshixun_list:undefined,
-      stage_nametype:false,
-      descriptiontype:false,
-			Addshixunstype:false,
-			goshowqqgtounp:false,
+    this.state = {
+      selectShixun: false,
+      editPanel: true,
+      search: "",
+      type: 0,
+      page: 1,
+      ChooseShixunList: undefined,
+      hometypepvisible: true,
+      shixuns_listedit: undefined,
+      patheditarry: [],
+      stage_name: undefined,
+      stage_description: undefined,
+      stageid: undefined,
+      Modalstype: false,
+      Modalstopval: '',
+      Modalsbottomval: '',
+      delectfunvalue: undefined,
+      ChooseShixunListshixun_list: undefined,
+      stage_nametype: false,
+      descriptiontype: false,
+      Addshixunstype: false,
+      goshowqqgtounp: false,
     }
     this.onDragEnd = this.onDragEnd.bind(this);
   }
   //选择实训弹框
-  AddShixunBox = () =>{
+  AddShixunBox = () => {
     this.setState({
-      selectShixun:true,
-      patheditarry:[]
+      selectShixun: true,
+      patheditarry: []
     })
     // this.changeTag(0,"");
   }
   //关闭选择实训弹框
-  cloasShixunBox =()=>{
+  cloasShixunBox = () => {
     this.setState({
-      selectShixun:false,
-      patheditarry:[]
+      selectShixun: false,
+      patheditarry: []
     })
   }
 
-	Addshixuns=()=>{
-		if(this.props&&this.props.current_user&&this.props.current_user.is_shixun_marker===false){
-			this.setgoshowqqgtounp(true);
-			return;
-		}
-		this.setState({
-			Addshixunstype:true,
-		})
-	}
+  Addshixuns = () => {
+    if (this.props && this.props.current_user && this.props.current_user.is_shixun_marker === false) {
+      this.setgoshowqqgtounp(true);
+      return;
+    }
+    this.setState({
+      Addshixunstype: true,
+    })
+  }
 
 
-  shixunhomeworkedit=(list)=>{
+  shixunhomeworkedit = (list) => {
 
-    let newpatheditarry=[];
-    for(var i=0; i<list.length;i++){
+    let newpatheditarry = [];
+    for (var i = 0; i < list.length; i++) {
       newpatheditarry.push(list[i])
     }
     this.setState({
-      patheditarry:newpatheditarry
+      patheditarry: newpatheditarry
     })
 
   }
-	componentDidMount(){
+  componentDidMount() {
 
-	}
+  }
   componentWillReceiveProps(nextProps, nextState) {
-    if(nextProps.pathlisteditlist!=undefined){
-      let list=[]
-      for(var i=0; i<nextProps.pathlisteditlist.shixuns_list.length; i++){
+    if (nextProps.pathlisteditlist != undefined) {
+      let list = []
+      for (var i = 0; i < nextProps.pathlisteditlist.shixuns_list.length; i++) {
         list.push(nextProps.pathlisteditlist.shixuns_list[i].shixun_id)
       }
       // console.log("DetailCardsEditAndEdit");
       // console.log("componentWillReceiveProps(nextProps, nextState)");
-			// console.log("nextProps.pathlisteditlist.stage_description");
+      // console.log("nextProps.pathlisteditlist.stage_description");
 
-			this.setState({
-        shixuns_listedit:nextProps.pathlisteditlist.shixuns_list,
-        shixuns_listeditlist:list,
-        stage_name:nextProps.pathlisteditlist.stage_name,
-        stage_description:nextProps.pathlisteditlist.stage_description,
-        stageid:nextProps.stageid
+      this.setState({
+        shixuns_listedit: nextProps.pathlisteditlist.shixuns_list,
+        shixuns_listeditlist: list,
+        stage_name: nextProps.pathlisteditlist.stage_name,
+        stage_description: nextProps.pathlisteditlist.stage_description,
+        stageid: nextProps.stageid
       });
-			this.props.Pathlisteditundefined();
+      this.props.Pathlisteditundefined();
     }
 
   }
 
   //双向绑定
-  updatastage_name=(e)=>{
+  updatastage_name = (e) => {
 
-      this.setState({
-        stage_name:e.target.value
-      })
-
-  }
-
-  updatastage_description=(e)=>{
-    //输入数据绑定
     this.setState({
-      stage_description:e.target.value
+      stage_name: e.target.value
     })
 
   }
 
-  clickShixunchoose=(patheditarry)=>{
+  updatastage_description = (e) => {
+    //输入数据绑定
+    this.setState({
+      stage_description: e.target.value
+    })
 
-    let{shixuns_listedit,shixuns_listeditlist}=this.state
-    let newshixuns_listedit=shixuns_listedit;
-    let list=shixuns_listeditlist
+  }
 
-    let url='/paths/append_to_stage.json'
-    axios.post(url,{
-      shixun_id:patheditarry
+  clickShixunchoose = (patheditarry) => {
+
+    let { shixuns_listedit, shixuns_listeditlist } = this.state
+    let newshixuns_listedit = shixuns_listedit;
+    let list = shixuns_listeditlist
+
+    let url = '/paths/append_to_stage.json'
+    axios.post(url, {
+      shixun_id: patheditarry
     }).then((response) => {
-      let newshixun_lists=response.data.shixun_lists;
+      let newshixun_lists = response.data.shixun_lists;
 
 
-      for(var j=0; j<newshixuns_listedit.length; j++){
-        for(var a=0; a<newshixun_lists.length; a++){
-          if(newshixuns_listedit[j].shixun_id===newshixun_lists[a].shixun_id){
+      for (var j = 0; j < newshixuns_listedit.length; j++) {
+        for (var a = 0; a < newshixun_lists.length; a++) {
+          if (newshixuns_listedit[j].shixun_id === newshixun_lists[a].shixun_id) {
             // this.setState({
             //   Modalstype:true,
             //   Modalstopval:'请勿重复选择'+newshixun_lists[a].shixun_name+'实训',
             // })
-						this.showNotification('请勿重复选择：'+newshixun_lists[a].shixun_name+'实训')
+            this.showNotification('请勿重复选择：' + newshixun_lists[a].shixun_name + '实训')
             return
           }
         }
       }
-      for(var z=0; z<newshixun_lists.length; z++){
+      for (var z = 0; z < newshixun_lists.length; z++) {
         newshixuns_listedit.push(newshixun_lists[z])
       }
-      for(var i=0; i<newshixun_lists.length; i++){
+      for (var i = 0; i < newshixun_lists.length; i++) {
         list.push(newshixun_lists[i].shixun_id)
       }
       this.setState({
-        shixuns_listedit:newshixuns_listedit,
-        shixuns_listeditlist:list,
-        patheditarry:[],
-        selectShixun:false
+        shixuns_listedit: newshixuns_listedit,
+        shixuns_listeditlist: list,
+        patheditarry: [],
+        selectShixun: false
       })
     }).catch((error) => {
       console.log(error)
@@ -187,50 +187,50 @@ class DetailCardsEditAndEdit extends Component{
   }
 
   //保存
-  clickShixunsave=()=>{
-    let{stage_name,stage_description,stageid,shixuns_listeditlist}=this.state;
-    let newstage_descriptions=stage_description;
+  clickShixunsave = () => {
+    let { stage_name, stage_description, stageid, shixuns_listeditlist } = this.state;
+    let newstage_descriptions = stage_description;
 
-    if(stage_name===""||stage_name===undefined){
+    if (stage_name === "" || stage_name === undefined) {
 
       this.setState({
-        stage_nametype:true
+        stage_nametype: true
       })
 
       return
     }
-    if(newstage_descriptions!=undefined){
+    if (newstage_descriptions != undefined) {
 
-      if(newstage_descriptions.length>300){
+      if (newstage_descriptions.length > 300) {
 
         this.setState({
-          descriptiontype:true
+          descriptiontype: true
         })
 
         return
       }
-    }else{
-      newstage_descriptions=""
+    } else {
+      newstage_descriptions = ""
     }
     let url;
-     if(this.props.ysldetailcards===undefined){
-       url='/stages/'+stageid+'.json';
-     }else{
-       url=`/course_stages/${stageid}.json`;
-     }
+    if (this.props.ysldetailcards === undefined) {
+      url = '/stages/' + stageid + '.json';
+    } else {
+      url = `/course_stages/${stageid}.json`;
+    }
     axios.put(url, {
-      name:stage_name,
-      description:newstage_descriptions,
-      shixun_id:shixuns_listeditlist
+      name: stage_name,
+      description: newstage_descriptions,
+      shixun_id: shixuns_listeditlist
     }).then((response) => {
       // window.location.href = "/paths/" + response.data.subject_id
       this.setState({
-        stage_name:undefined,
-        stage_description:undefined,
-        shixuns_listeditlist:[],
-        shixuns_listedit:undefined,
-        stage_nametype:false,
-        descriptiontype:false
+        stage_name: undefined,
+        stage_description: undefined,
+        shixuns_listeditlist: [],
+        shixuns_listedit: undefined,
+        stage_nametype: false,
+        descriptiontype: false
       })
       this.props.updatapathCardsedits()
     }).catch((error) => {
@@ -239,51 +239,51 @@ class DetailCardsEditAndEdit extends Component{
   }
 
   //删除实训
-  shixunslisteditdelect=(e)=>{
+  shixunslisteditdelect = (e) => {
 
     this.setState({
-      Modalstype:true,
-      Modalstopval:'是否删除该实训？',
-      Modalsbottomval:'',
-      delectfunvalue:e.target.id
+      Modalstype: true,
+      Modalstopval: '是否删除该实训？',
+      Modalsbottomval: '',
+      delectfunvalue: e.target.id
     })
 
   }
 
-  shixunslisteditdelectfun=()=>{
-    let{delectfunvalue}=this.state;
+  shixunslisteditdelectfun = () => {
+    let { delectfunvalue } = this.state;
     let sum = parseInt(delectfunvalue);
-    let {shixuns_listedit,shixuns_listeditlist} =this.state;
-    let newshixuns_listedit=shixuns_listedit
-    let newshixuns_listeditlist=shixuns_listeditlist
+    let { shixuns_listedit, shixuns_listeditlist } = this.state;
+    let newshixuns_listedit = shixuns_listedit
+    let newshixuns_listeditlist = shixuns_listeditlist
     newshixuns_listedit.splice(sum, 1);
     newshixuns_listeditlist.splice(sum, 1);
     this.setState({
-      shixuns_listedit:newshixuns_listedit,
-      shixuns_listeditlist:newshixuns_listeditlist,
-      Modalstype:false,
-      Modalstopval:' ',
-      Modalsbottomval:'',
-      delectfunvalue:undefined
+      shixuns_listedit: newshixuns_listedit,
+      shixuns_listeditlist: newshixuns_listeditlist,
+      Modalstype: false,
+      Modalstopval: ' ',
+      Modalsbottomval: '',
+      delectfunvalue: undefined
     })
   }
 
 
-  cardsModalcancel=()=>{
+  cardsModalcancel = () => {
     this.setState({
-      Modalstype:false,
-      Modalstopval:'',
-      Modalsbottomval:'',
-      delectfunvalue:undefined,
-			Addshixunstype:false
+      Modalstype: false,
+      Modalstopval: '',
+      Modalsbottomval: '',
+      delectfunvalue: undefined,
+      Addshixunstype: false
     })
   }
 
-  cardsModalsave=()=>{
+  cardsModalsave = () => {
     this.setState({
-      Modalstype:false,
-      Modalstopval:'',
-      Modalsbottomval:''
+      Modalstype: false,
+      Modalstopval: '',
+      Modalsbottomval: ''
     })
   }
 
@@ -297,9 +297,9 @@ class DetailCardsEditAndEdit extends Component{
   }
 
 
-  onDragEnd (result) {
+  onDragEnd(result) {
 
-    let {shixuns_listedit,shixuns_listeditlist} =this.state;
+    let { shixuns_listedit, shixuns_listeditlist } = this.state;
     const listedit = reorder(
       shixuns_listedit,
       result.source.index,
@@ -311,60 +311,60 @@ class DetailCardsEditAndEdit extends Component{
       result.destination.index
     );
     this.setState({
-      shixuns_listedit:listedit,
-      shixuns_listeditlist:listeditlist
+      shixuns_listedit: listedit,
+      shixuns_listeditlist: listeditlist
     })
   }
 
-	showNotification = (description, message = "提示", icon) => {
-		const data = {
-			message,
-			description
-		}
-		if (icon) {
-			data.icon = icon;
-		}
-		notification.open(data);
-	}
+  showNotification = (description, message = "提示", icon) => {
+    const data = {
+      message,
+      description
+    }
+    if (icon) {
+      data.icon = icon;
+    }
+    notification.open(data);
+  }
 
-	Getaddshixuns=(value,is_jupyter)=>{
-		let {
-			shixuns_listeditlist,
-			shixuns_listedit,
-		} = this.state
-		let newshixuns_listedit=shixuns_listedit;
-		let list=shixuns_listeditlist
-		let url='/paths/add_shixun_to_stage.json';
-		axios.post(url,{
-			name:value,
-      is_jupyter:is_jupyter
-		}).then((response) => {
-			if(response){
-				if(response.data){
-					newshixuns_listedit.push(response.data);
-					list.push(response.data.shixun_id);
-					this.setState({
-						shixuns_listedit:newshixuns_listedit,
-						shixuns_listeditlist:list,
-						patheditarry:[],
-						selectShixun:false,
-						page:1,
-					})
-				}
-			}
-		}).catch((error) => {
-			console.log(error)
-		});
-	}
-	// 处理弹框
-	setgoshowqqgtounp=(bool)=>{
-		this.setState({
-			goshowqqgtounp:bool
-		})
-	}
+  Getaddshixuns = (value, is_jupyter) => {
+    let {
+      shixuns_listeditlist,
+      shixuns_listedit,
+    } = this.state
+    let newshixuns_listedit = shixuns_listedit;
+    let list = shixuns_listeditlist
+    let url = '/paths/add_shixun_to_stage.json';
+    axios.post(url, {
+      name: value,
+      is_jupyter: is_jupyter
+    }).then((response) => {
+      if (response) {
+        if (response.data) {
+          newshixuns_listedit.push(response.data);
+          list.push(response.data.shixun_id);
+          this.setState({
+            shixuns_listedit: newshixuns_listedit,
+            shixuns_listeditlist: list,
+            patheditarry: [],
+            selectShixun: false,
+            page: 1,
+          })
+        }
+      }
+    }).catch((error) => {
+      console.log(error)
+    });
+  }
+  // 处理弹框
+  setgoshowqqgtounp = (bool) => {
+    this.setState({
+      goshowqqgtounp: bool
+    })
+  }
 
-	render(){
-    let {selectShixun,
+  render() {
+    let { selectShixun,
       editPanel,
       ChooseShixunList,
       type,
@@ -382,203 +382,204 @@ class DetailCardsEditAndEdit extends Component{
       ChooseShixunListshixun_list,
       stage_nametype,
       descriptiontype,
-			goshowqqgtounp
+      goshowqqgtounp
     } = this.state
 
-    return(
+    return (
       <div>
-				{
-					goshowqqgtounp===true?
-						<GotoQQgroup {...this.state} {...this.props} setgoshowqqgtounp={(bool)=>this.setgoshowqqgtounp(bool)}></GotoQQgroup>
-						:
-						""
-				}
+        {
+          goshowqqgtounp === true ?
+            <GotoQQgroup {...this.state} {...this.props} setgoshowqqgtounp={(bool) => this.setgoshowqqgtounp(bool)}></GotoQQgroup>
+            :
+            ""
+        }
         <Modals
           modalsType={Modalstype}
           modalsTopval={Modalstopval}
           modalsBottomval={Modalsbottomval}
           modalCancel={this.cardsModalcancel}
-          modalSave={delectfunvalue===undefined?()=>this.cardsModalsave():()=>this.shixunslisteditdelectfun()}
+          modalSave={delectfunvalue === undefined ? () => this.cardsModalsave() : () => this.shixunslisteditdelectfun()}
         >
         </Modals>
-				{this.state.Addshixunstype===true?<Addshixuns
-					modalCancel={this.cardsModalcancel}
-					Setaddshixuns={(value,is_jupyter)=>this.Getaddshixuns(value,is_jupyter)}
-					{...this.props}
-					{...this.state}
-				/>:""}
-				<style>
-					{
-						`
+        {this.state.Addshixunstype === true ? <Addshixuns
+          modalCancel={this.cardsModalcancel}
+          Setaddshixuns={(value, is_jupyter) => this.Getaddshixuns(value, is_jupyter)}
+          {...this.props}
+          {...this.state}
+        /> : ""}
+        <style>
+          {
+            `
 						.mb10 {
 								margin-bottom: 10px !important;
 						}
 						`
-					}
-				</style>
-        {  this.props.idsum===this.props.keys&&this.props.pathCardsedittype===true?
+          }
+        </style>
+        {this.props.idsum === this.props.keys && this.props.pathCardsedittype === true ?
 
-        <div className="lesson-edit-content mb10">
+          <div className="lesson-edit-content mb10">
 
-          <div className="clearfix edu-back-white">
-            <p className="clearfix mb30 font-18 font-bd pl25 pr25">
-              {/*<a href="javascript:void(0)" className="fl ring-blue mr10 mt2">*/}
+            <div className="clearfix edu-back-white">
+              <p className="clearfix mb30 font-18 font-bd pl25 pr25">
+                {/*<a   className="fl ring-blue mr10 mt2">*/}
                 {/*<img src={getImageUrl("/images/educoder/icon/charpter-white.svg")} className="fl ml3 mt3"/>*/}
-              {/*</a>*/}
+                {/*</a>*/}
 
-              {/*<a className="fr"><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>*/}
-            </p>
-            <div className="pl50 pr20 clearfix">
-              {/*<p className="color-grey-6 font-16 mb20">章节名称</p>*/}
-              <div className="df mb30">
-                <span className="mr30 color-orange pt10">*</span>
-                <div className="flex1 mr20">
-                  <input maxLength="60"  type="text" style={{width: '670px'}} className={stage_nametype===false?"input-100-45 greyInput":"input-100-45 greyInput bor-red"} name="stage_name" value={stage_name} onInput={this.updatastage_name} placeholder={"请输入第"+(this.props.keys+1)+"阶段名称,最大限制60个字符"}/>
-                  <div className={stage_nametype===true?"red":'none'}>名称不能为空</div>
-                </div>
-                <div style={{"width":"60px"}}><span className="color-orange fl mt8 none" id="stage_name_notice"><i className="iconfont icon-tishi font-14 mr3"></i>必填项</span></div>
-              </div>
-              <p className="color-grey-6 font-16 mb20">描述</p>
-              <div className="width89 mb30 pl35">
-                <textarea className={descriptiontype===false?"winput-100-130":"winput-100-130 bor-red"} name="stage_des"
-                    value={stage_description}
-                    style={{width: '670px'}}
-                    onInput={this.updatastage_description}
-                    placeholder={"请输入第"+(this.props.keys+1)+"阶段描述"}
-                ></textarea>
-                <div className={descriptiontype===true?"red":"none"}>描述不能超多最大限制300个字符</div>
-              </div>
-
-              <p className="clearfix mb10">
-                <a  onClick={this.Addshixuns} className="fl defalutGreyBorder color-grey-6 ml37">
-                  <i className="iconfont icon-tianjiafangda fl mr5"></i>新建实训项目
-                </a>
+                {/*<a className="fr"><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>*/}
               </p>
+              <div className="pl50 pr20 clearfix">
+                {/*<p className="color-grey-6 font-16 mb20">章节名称</p>*/}
+                <div className="df mb30">
+                  <span className="mr30 color-orange pt10">*</span>
+                  <div className="flex1 mr20">
+                    <input maxLength="60" type="text" style={{ width: '670px' }} className={stage_nametype === false ? "input-100-45 greyInput" : "input-100-45 greyInput bor-red"} name="stage_name" value={stage_name} onInput={this.updatastage_name} placeholder={"请输入第" + (this.props.keys + 1) + "阶段名称,最大限制60个字符"} />
+                    <div className={stage_nametype === true ? "red" : 'none'}>名称不能为空</div>
+                  </div>
+                  <div style={{ "width": "60px" }}><span className="color-orange fl mt8 none" id="stage_name_notice"><i className="iconfont icon-tishi font-14 mr3"></i>必填项</span></div>
+                </div>
+                <p className="color-grey-6 font-16 mb20">描述</p>
+                <div className="width89 mb30 pl35">
+                  <textarea className={descriptiontype === false ? "winput-100-130" : "winput-100-130 bor-red"} name="stage_des"
+                    value={stage_description}
+                    style={{ width: '670px' }}
+                    onInput={this.updatastage_description}
+                    placeholder={"请输入第" + (this.props.keys + 1) + "阶段描述"}
+                  ></textarea>
+                  <div className={descriptiontype === true ? "red" : "none"}>描述不能超多最大限制300个字符</div>
+                </div>
 
-							<p className="clearfix mb10">
-								<a  onClick={this.AddShixunBox} className="fl defalutGreyBorder color-grey-6 ml37">
-									<i className="iconfont icon-tianjiafangda fl mr5"></i>选用实训项目
+                <p className="clearfix mb10">
+                  <a onClick={this.Addshixuns} className="fl defalutGreyBorder color-grey-6 ml37">
+                    <i className="iconfont icon-tianjiafangda fl mr5"></i>新建实训项目
+                </a>
+                </p>
+
+                <p className="clearfix mb10">
+                  <a onClick={this.AddShixunBox} className="fl defalutGreyBorder color-grey-6 ml37">
+                    <i className="iconfont icon-tianjiafangda fl mr5"></i>选用实训项目
 								</a>
 
-							</p>
-							<p className="mb30">
-								<span id="sx_notice" className="ml37 color-grey-9 mt5 ">下面实训可以通过拖拽进行排序调整</span>
-							</p>
-              {selectShixun===true?<style>
-                {
-                  `
+                </p>
+                <p className="mb30">
+                  <span id="sx_notice" className="ml37 color-grey-9 mt5 ">下面实训可以通过拖拽进行排序调整</span>
+                </p>
+                {selectShixun === true ? <style>
+                  {
+                    `
               body {
 							  overflow: hidden !important;
 							}
               `
-                }
-              </style>:""}
+                  }
+                </style> : ""}
 
-							{selectShixun===true?<NewShixunModel
-								NewShixunModelType={selectShixun}
-								type={'shixuns'}
-								hideNewShixunModelType={this.cloasShixunBox}
-								pathShixun={this.clickShixunchoose}
-								{...this.props}
-							></NewShixunModel>:""}
+                {selectShixun === true ? <NewShixunModel
+                  NewShixunModelType={selectShixun}
+                  type={'shixuns'}
+                  hideNewShixunModelType={this.cloasShixunBox}
+                  pathShixun={this.clickShixunchoose}
+                  {...this.props}
+                ></NewShixunModel> : ""}
 
-            </div>
-
-            {/* 可拖拽选择实训列表*/}
-            {shixuns_listedit===undefined?'':
-
-            <DragDropContext onDragEnd={this.onDragEnd}>
-              <Droppable
-                droppableId={'ids1'}
-              >
-                {(provided, snapshot) => (
-                  <div
-                    ref={provided.innerRef}
-                    {...provided.droppableProps}
-                  >
-              {shixuns_listedit.map((item,key)=>{
-              return(
-                <Draggable
-                  key={'id'+key}
-                  draggableId={'id'+key}
-                  index={key}
-                >
-                  {(provided, snapshot) => (
-                  <div className="clearfix paragraph lineh-30"
-                       key={key}
-                       ref={provided.innerRef}
-                       {...provided.draggableProps}
-                       style={getItemStyle(
-                         snapshot.isDragging,
-                         provided.draggableProps.style
-                       )}
-                       {...provided.dragHandleProps}
-                  >
-
-                    <li className="fl li-width63">
-
-                  <span className="progressRing mr10">
-                      <i className="iconfont icon-bofang progressRing-part font-18 mt10"></i>
-                  </span>
-
-                      <a className={ "paragraph_name paragraph_nameid"}
-                         href={/shixuns/+item.shixun_identifier}
-                         target="_blank"
-                      >
-
-                     <span className="subject_stage_shixun_index">
-
-                       <span className="subject_stage_shixun_index">{this.props.idsum+1}</span>-{key+1}&nbsp;&nbsp;{item.shixun_name}
-
-                     </span>
-
-                      </a>
-
-                    </li>
-
-                    <li className="fr status_li">
-                      <Tooltip placement="bottom" title="删除">
-                        <i className="iconfont icon-shanchu color-grey-c font-14 font-n cursor" id={key} onClick={this.shixunslisteditdelect}></i>
-                      </Tooltip>
-                    </li>
-                    {provided.placeholder}
-                  </div>
-                  )}
-                </Draggable>
-              )})}
               </div>
-              )}
-              </Droppable>
-            </DragDropContext>
-            }
 
-            {/*<div className="adding-stage-item clearfix" id="sortable">*/}
+              {/* 可拖拽选择实训列表*/}
+              {shixuns_listedit === undefined ? '' :
+
+                <DragDropContext onDragEnd={this.onDragEnd}>
+                  <Droppable
+                    droppableId={'ids1'}
+                  >
+                    {(provided, snapshot) => (
+                      <div
+                        ref={provided.innerRef}
+                        {...provided.droppableProps}
+                      >
+                        {shixuns_listedit.map((item, key) => {
+                          return (
+                            <Draggable
+                              key={'id' + key}
+                              draggableId={'id' + key}
+                              index={key}
+                            >
+                              {(provided, snapshot) => (
+                                <div className="clearfix paragraph lineh-30"
+                                  key={key}
+                                  ref={provided.innerRef}
+                                  {...provided.draggableProps}
+                                  style={getItemStyle(
+                                    snapshot.isDragging,
+                                    provided.draggableProps.style
+                                  )}
+                                  {...provided.dragHandleProps}
+                                >
+
+                                  <li className="fl li-width63">
+
+                                    <span className="progressRing mr10">
+                                      <i className="iconfont icon-bofang progressRing-part font-18 mt10"></i>
+                                    </span>
+
+                                    <a className={"paragraph_name paragraph_nameid"}
+                                      href={/shixuns/ + item.shixun_identifier}
+                                      target="_blank"
+                                    >
+
+                                      <span className="subject_stage_shixun_index">
+
+                                        <span className="subject_stage_shixun_index">{this.props.idsum + 1}</span>-{key + 1}&nbsp;&nbsp;{item.shixun_name}
+
+                                      </span>
+
+                                    </a>
+
+                                  </li>
+
+                                  <li className="fr status_li">
+                                    <Tooltip placement="bottom" title="删除">
+                                      <i className="iconfont icon-shanchu color-grey-c font-14 font-n cursor" id={key} onClick={this.shixunslisteditdelect}></i>
+                                    </Tooltip>
+                                  </li>
+                                  {provided.placeholder}
+                                </div>
+                              )}
+                            </Draggable>
+                          )
+                        })}
+                      </div>
+                    )}
+                  </Droppable>
+                </DragDropContext>
+              }
+
+              {/*<div className="adding-stage-item clearfix" id="sortable">*/}
               {/*<div className="square-Item smallSquare">*/}
-                {/*<a href="javascript:void(0)" className="ring-grey font-16 color-white colseThispart">×</a>*/}
-                {/*<img alt="Shixun0" className="partimg" src={getImageUrl("/images/educoder/index/shixun/shixun0.jpg?1546937140")}/>*/}
-                {/*<div className="square-main">*/}
-                  {/*<p className="task-hide"><a href="/shixuns/9374npmg" className="justify color-grey-name" target="_blank">frerere</a></p>*/}
-                {/*</div>*/}
+              {/*<a   className="ring-grey font-16 color-white colseThispart">×</a>*/}
+              {/*<img alt="Shixun0" className="partimg" src={getImageUrl("/images/educoder/index/shixun/shixun0.jpg?1546937140")}/>*/}
+              {/*<div className="square-main">*/}
+              {/*<p className="task-hide"><a href="/shixuns/9374npmg" className="justify color-grey-name" target="_blank">frerere</a></p>*/}
+              {/*</div>*/}
+              {/*</div>*/}
               {/*</div>*/}
-            {/*</div>*/}
 
 
-            {/*<p className="clearfix pl50 mb40 mt20">*/}
+              {/*<p className="clearfix pl50 mb40 mt20">*/}
               {/*<a className="color-grey-c mr30 fl mt5" onClick={this.props.updatapathCardsedits}>取消</a>*/}
               {/*<a className="fl task-btn task-btn-orange" onClick={this.clickShixunsave}>保存</a>*/}
-            {/*</p>*/}
+              {/*</p>*/}
 
-            <p className="fr clearfix mt30">
-              <div className="clearfix ">
-                <a className="defalutCancelbtn fl mr30" onClick={this.props.updatapathCardsedits}>取消</a>
-                <a className="defalutSubmitbtn fl mr20"  onClick={this.clickShixunsave}>保存</a>
-              </div>
-            </p>
+              <p className="fr clearfix mt30">
+                <div className="clearfix ">
+                  <a className="defalutCancelbtn fl mr30" onClick={this.props.updatapathCardsedits}>取消</a>
+                  <a className="defalutSubmitbtn fl mr20" onClick={this.clickShixunsave}>保存</a>
+                </div>
+              </p>
 
 
+            </div>
           </div>
-        </div>
-          :''}
+          : ''}
       </div>
     )
   }
diff --git a/src/modules/paths/PathDetail/DetailTop.js b/src/modules/paths/PathDetail/DetailTop.js
index 3304105e..1a7b6c33 100644
--- a/src/modules/paths/PathDetail/DetailTop.js
+++ b/src/modules/paths/PathDetail/DetailTop.js
@@ -1,5 +1,5 @@
-import React,{ Component } from "react";
-import { Modal,Radio,Input,Tooltip, Menu, Dropdown, Icon,Breadcrumb } from "antd";
+import React, { Component } from "react";
+import { Modal, Radio, Input, Tooltip, Menu, Dropdown, Icon, Breadcrumb } from "antd";
 import { BrowserRouter as Router, Route, Link } from "react-router-dom";
 import SendPanel from "./sendPanel.js";
 import { getImageUrl } from 'educoder';
@@ -12,329 +12,317 @@ import './DetailTop.css';
 
 const Search = Input.Search;
 const RadioGroup = Radio.Group;
-class DetailTop extends Component{
-  constructor(props){
-    super(props)
-    this.state={
-      cardsModalcancel:this.cardsModalcancel,
-      cardsModalsave:this.cardsModalsave,
-      Modalstype:false,
-      Modalstopval:"",
-      Modalsbottomval:'',
-      loadtype:false,
-      deletepathtype:false,
-      cardsModalsavetype:false,
-			MenuItemskey:1,
-			courseslist:[],
-			Pathcourseid:undefined,
-			OpenCourseTypes:false,
-			putappointmenttype:false,
-			getappointmenttype:false,
-			openpathss:false,
-			cancel_publics:false,
-			cancel_has_publics:false
-    }
-  }
-	componentDidMount(){
-    this.getdatalist();
+class DetailTop extends Component {
+	constructor(props) {
+		super(props)
+		this.state = {
+			cardsModalcancel: this.cardsModalcancel,
+			cardsModalsave: this.cardsModalsave,
+			Modalstype: false,
+			Modalstopval: "",
+			Modalsbottomval: '',
+			loadtype: false,
+			deletepathtype: false,
+			cardsModalsavetype: false,
+			MenuItemskey: 1,
+			courseslist: [],
+			Pathcourseid: undefined,
+			OpenCourseTypes: false,
+			putappointmenttype: false,
+			getappointmenttype: false,
+			openpathss: false,
+			cancel_publics: false,
+			cancel_has_publics: false,
+			applyissuePaths: false,
+			cancelText: undefined,
+			okText: undefined
+		}
 	}
-  getdatalist=()=>{
-		let courseslist=[];
-    let keys=1;
-    let listtype=false;
-		if(this.props.courses!=undefined&&this.props.courses.length!=0){
-			if(this.props.detailInfoList.has_start===true){
-				this.props.courses.map((item,key)=>{
-					if(item.course_status.status===1){
-						keys=key+1
-						return(
+	componentDidMount() {
+		this.getdatalist();
+	}
+	getdatalist = () => {
+		let courseslist = [];
+		let keys = 1;
+		let listtype = false;
+		if (this.props.courses != undefined && this.props.courses.length != 0) {
+			if (this.props.detailInfoList.has_start === true) {
+				this.props.courses.map((item, key) => {
+					if (item.course_status.status === 1) {
+						keys = key + 1
+						return (
 							courseslist.push(item)
 						)
 					}
 				})
 
-			}else{
-				let type=undefined;
+			} else {
+				let type = undefined;
 
 
 
-					this.props.courses.map((item,key)=>{
-						let arr=[]
-							keys=key+1
-							if(item.course_status.status===2) {
-								type=key+1
-									arr.push(item)
-							}
-						courseslist=arr;
-					})
+				this.props.courses.map((item, key) => {
+					let arr = []
+					keys = key + 1
+					if (item.course_status.status === 2) {
+						type = key + 1
+						arr.push(item)
+					}
+					courseslist = arr;
+				})
 
-					this.props.courses.map((item,key)=>{
-						let arr=[]
-						if(listtype===false){
-							keys=key+1
-							if(item.course_status.status===0) {
-								listtype=true
-									// courseslist.push(item)
-								arr.push(item)
-								courseslist=arr
-							}
+				this.props.courses.map((item, key) => {
+					let arr = []
+					if (listtype === false) {
+						keys = key + 1
+						if (item.course_status.status === 0) {
+							listtype = true
+							// courseslist.push(item)
+							arr.push(item)
+							courseslist = arr
 						}
-					})
+					}
+				})
 			}
-			if(courseslist.length!=0){
-				this.props.getMenuItemsindex(keys,courseslist[0].course_status.status)
+			if (courseslist.length != 0) {
+				this.props.getMenuItemsindex(keys, courseslist[0].course_status.status)
 			}
 
 		}
 
 		this.setState({
-			courseslist:courseslist,
-			MenuItemskey:keys,
+			courseslist: courseslist,
+			MenuItemskey: keys,
 		})
 	}
-	componentDidUpdate=(prevProps)=> {
-			if(prevProps.courses!=this.props.courses){
-				this.getdatalist();
-			}
+	componentDidUpdate = (prevProps) => {
+		if (prevProps.courses != this.props.courses) {
+			this.getdatalist();
+		}
 
 	}
 
-  allow_deletepath=()=>{
-    this.setState({
-      Modalstype:true,
-      Modalstopval:"是否删除路径?",
-      deletepathtype:true
-    })
-  }
+	allow_deletepath = () => {
+		this.setState({
+			Modalstype: true,
+			Modalstopval: "是否删除路径?",
+			deletepathtype: true
+		})
+	}
 
 
 
-  applyissuePath=()=>{
-		let pathid=this.props.match.params.pathId;
-		let url ="/paths/"+pathid+"/publish.json";
-		axios.post(url).then((result)=>{
-			if(result.status===200){
-				if(result.data.status===0){
-					this.setState({
-						loadtype:true,
-						Modalstype: true,
-				    Modalstopval: 	` 课程需经过平台审核方可公开使用，公开的课程将对平台所`,
-						modalsMidval:"有人公开可见。若仅本人教学使用则无需申请公开, 直接发",
-						Modalsbottomval:"送到课堂即可.",
-						cardsModalsavetype: true,
-					})
+	applyissuePath = () => {
+		this.setState({
+			loadtype: true,
+			Modalstype: true,
+			Modalstopval: `课程发布后即可发送课堂使用`,
+			// modalsMidval:"有人公开可见，若仅本人教学使用则无需申请公开，直接发",
+			// Modalsbottomval:"送到课堂即可。",
+			applyissuePaths: true
+		})
+
+	}
+
+	showapplyissuePath = () => {
+		let pathid = this.props.match.params.pathId;
+		let url = "/paths/" + pathid + "/publish.json";
+		axios.post(url).then((result) => {
+			if (result.status === 200) {
+				if (result.data.status === 0) {
+
 					this.props.showNotification(result.data.message)
 					this.props.getlistdatas();
-				}else if(result.data.status===1){
-					// window.location.reload();
+					this.cardsModalcancel()
+				} else if (result.data.status === 1) {
 				}
 			}
-		}).catch((error)=>{
+		}).catch((error) => {
 			console.log(error);
 		})
+	}
+	postcancelissuePath = () => {
+		let pathId = this.props.match.params.pathId;
+		let url = "/paths/" + pathId + "/cancel_publish.json";
+		axios.post(url).then((result) => {
+			if (result.status === 200) {
+				if (result.data.status === 0) {
 
-
-  }
-  postcancelissuePath=()=>{
-		let pathId=this.props.match.params.pathId;
-		let url ="/paths/"+pathId+"/cancel_publish.json";
-		axios.post(url).then((result)=>{
-			if(result.status===200){
-				if(result.data.status===0){
-
-				}else if(result.data.status===1){
+				} else if (result.data.status === 1) {
 					this.cardsModalcancel()
 					this.props.showNotification("撤销发布成功")
 					this.props.getlistdatas()
 					// window.location.href = "/paths/" + result.data.subject_id
 				}
 			}
-		}).catch((error)=>{
+		}).catch((error) => {
 			console.log(error);
 		})
 	}
 
-  cancelissuePath=()=>{
+	cancelissuePath = () => {
 
-			this.setState({
-				Modalstype: true,
-				Modalstopval: "是否确认撤销发布？",
-				// modalsMidval:"撤销发布后，学员将无法进行练习，若您新增关",
-				// Modalsbottomval:"卡，学员需要重新体验实训",
-				cardsModalsavetype: true,
-				modalstyles:"848282"
-			})
-
-
-  }
-
-
-
-  cardsModalcancel=()=>{
-     this.setState({
-       Modalstype:false,
-       Modalsbottomval:'',
-       loadtype:false,
-       deletepathtype:false,
-			 putappointmenttype:false,
-			 modalsMidval:'',
-			 modalstyles:'',
-			 cardsModalsavetype:false,
-			 applyissuePath:false,
-			 openpathss:false,
-			 cancel_publics:false,
-			 cancel_has_publics:false,
-			 Modalstopval:``,
-     })
-  }
-
-  cardsModalsave=()=>{
-    let {loadtype,deletepathtype}=this.state;
-
-    //删除路径
-    if(deletepathtype===true){
-      let pathid=this.props.match.params.pathId;
-      const deleteUrl = `/paths/`+pathid+`.json`;
-      axios.delete(deleteUrl).then((response) => {
-        const status = response.data.status
-        if (status === 1) {
-          window.location.href = "/paths";
-        }
-      }).catch((error) => {
-        console.log(error)
-      })
-    }
-
-    // //申请发布
-    // if(loadtype===true){
-		//
-    //   let pathid=this.props.match.params.pathId;
-    //   let url ="/paths/"+pathid+"/publish.json";
-    //   axios.get(url).then((result)=>{
-    //     if(result.status===200){
-    //       if(result.data.status===0){
-    //         this.setState({
-    //           Modalstype:true,
-    //           Modalstopval: result.data.message,
-    //         })
-    //       }else if(result.data.status===1){
-    //         window.location.reload();
-    //       }
-    //     }
-    //   }).catch((error)=>{
-    //     console.log(error);
-    //   })
-		//
-    // }
-    this.setState({
-      Modalstype:false,
-      Modalsbottomval:''
-    })
-  }
-
-	onVisibleChanges=(type)=>{
 		this.setState({
-			onVisibleChangestype:type
+			Modalstype: true,
+			Modalstopval: "是否确认撤销发布？",
+			// modalsMidval:"撤销发布后，学员将无法进行练习，若您新增关",
+			// Modalsbottomval:"卡，学员需要重新体验实训",
+			cardsModalsavetype: true,
+			modalstyles: "848282"
+		})
+
+
+	}
+
+
+
+	cardsModalcancel = () => {
+		this.setState({
+			Modalstype: false,
+			Modalsbottomval: '',
+			loadtype: false,
+			deletepathtype: false,
+			putappointmenttype: false,
+			modalsMidval: '',
+			modalstyles: '',
+			cardsModalsavetype: false,
+			applyissuePaths: false,
+			openpathss: false,
+			cancel_publics: false,
+			cancel_has_publics: false,
+			Modalstopval: ``,
+			cancelText: undefined,
+			okText: undefined
+		})
+
+	}
+
+	cardsModalsave = () => {
+		let { loadtype, deletepathtype } = this.state;
+
+		//删除路径
+		if (deletepathtype === true) {
+			let pathid = this.props.match.params.pathId;
+			const deleteUrl = `/paths/` + pathid + `.json`;
+			axios.delete(deleteUrl).then((response) => {
+				const status = response.data.status
+				if (status === 1) {
+					window.location.href = "/paths";
+				}
+			}).catch((error) => {
+				console.log(error)
+			})
+		}
+
+		this.setState({
+			Modalstype: false,
+			Modalsbottomval: ''
 		})
 	}
 
-	MenuItems=(keys)=>{
-	 let courseslist=[]
-		this.props.courses.map((item,key)=>{
-			if(keys===key+1){
-				return(
+	onVisibleChanges = (type) => {
+		this.setState({
+			onVisibleChangestype: type
+		})
+	}
+
+	MenuItems = (keys) => {
+		let courseslist = []
+		this.props.courses.map((item, key) => {
+			if (keys === key + 1) {
+				return (
 					courseslist.push(item)
 				)
 			}
 		})
 
-		this.props.getMenuItemsindex(keys,courseslist[0].course_status.status)
-   this.setState({
-		 MenuItemskey:keys,
-		 courseslist:courseslist,
-		 onVisibleChangestype:!this.state.onVisibleChangestype
-	 })
+		this.props.getMenuItemsindex(keys, courseslist[0].course_status.status)
+		this.setState({
+			MenuItemskey: keys,
+			courseslist: courseslist,
+			onVisibleChangestype: !this.state.onVisibleChangestype
+		})
 	}
 
-	JoinnowCourse=(id,typeid)=>{
+	JoinnowCourse = (id, typeid) => {
 
-		if(this.props.checkIfLogin()===false){
+		if (this.props.checkIfLogin() === false) {
 			this.props.showLoginDialog()
 			return
 		}
-		if(this.props.checkIfProfileCompleted()===false){
+		if (this.props.checkIfProfileCompleted() === false) {
 			this.props.showProfileCompleteDialog()
 			return
 		}
 
 
 		this.setState({
-			yslJointhe:true,
-			Pathcourseid:id,
-			pathcousestypeid:typeid
+			yslJointhe: true,
+			Pathcourseid: id,
+			pathcousestypeid: typeid
 		})
 	}
 
-	putappointment=()=>{
-		if(this.props.checkIfLogin()===false){
+	putappointment = () => {
+		if (this.props.checkIfLogin() === false) {
 			this.props.showLoginDialog()
 			return
 		}
-		if(this.props.checkIfProfileCompleted()===false){
+		if (this.props.checkIfProfileCompleted() === false) {
 			this.props.showProfileCompleteDialog()
 			return
 		}
 
 		this.setState({
-			Modalstype:true,
-			Modalstopval:"是否确认立即预约？",
-			Modalsbottomval:"",
-			cardsModalcancel:()=>this.cardsModalcancel(),
-			putappointmenttype:true,
-			loadtype:false
+			Modalstype: true,
+			Modalstopval: "是否确认立即预约？",
+			Modalsbottomval: "",
+			cardsModalcancel: () => this.cardsModalcancel(),
+			putappointmenttype: true,
+			loadtype: false
 		})
 	}
 
 
 
-	ysljoinmodalCancel=()=>{
+	ysljoinmodalCancel = () => {
 		this.setState({
-			yslJointhe:false
+			yslJointhe: false
 		})
 	};
-	ysljoinmodalCanceltwo=(key)=>{
+	ysljoinmodalCanceltwo = (key) => {
 		this.setState({
-			yslJointhe:false
+			yslJointhe: false
 		})
-	 this.props.getdatasindex(key)
+		this.props.getdatasindex(key)
 	};
 
-	OpenCoursefun=()=>{
+	OpenCoursefun = () => {
 		this.setState({
-			OpenCourseTypes:true
+			OpenCourseTypes: true
 		})
 	}
-	OpenCourseCancel=()=>{
+	OpenCourseCancel = () => {
 		this.setState({
-			OpenCourseTypes:false
+			OpenCourseTypes: false
 		})
 	}
 
-	getappointment=()=>{
-		let pathid=this.props.match.params.pathId;
-		let url=`/paths/${pathid}/appointment.json`
+	getappointment = () => {
+		let pathid = this.props.match.params.pathId;
+		let url = `/paths/${pathid}/appointment.json`
 		axios.post(url).then((response) => {
 
 			if (response.status === 200) {
 
-				if(response.data.status===0){
+				if (response.data.status === 0) {
 					this.setState({
-						getappointmenttype:true
+						getappointmenttype: true
 					})
 					this.cardsModalcancel()
 					// this.props.getlistdatas()
 					this.props.showNotification(response.data.message)
-				}else{
+				} else {
 					this.cardsModalcancel()
 					this.props.showNotification(response.data.message)
 				}
@@ -346,138 +334,176 @@ class DetailTop extends Component{
 		})
 	}
 
-  postopenpaths=()=>{
-		let pathid=this.props.match.params.pathId;
+	postopenpaths = () => {
+		let pathid = this.props.match.params.pathId;
 
-		let url ="/paths/"+pathid+"/apply_public.json";
-		axios.post(url).then((result)=>{
-			if(result.status===200){
-				if(result.data.status===0){
+		let url = "/paths/" + pathid + "/apply_public.json";
+		axios.post(url).then((result) => {
+			if (result.status === 200) {
+				if (result.data.status === 0) {
 					this.props.showNotification(result.data.message)
 					this.props.getlistdatas();
 					this.cardsModalcancel()
-				}else if(result.data.status===1){
+				} else if (result.data.status === 1) {
 					this.props.showNotification(result.data.message)
 					this.props.getlistdatas();
 					this.cardsModalcancel()
 				}
 			}
-		}).catch((error)=>{
+		}).catch((error) => {
 			console.log(error);
 		})
 	}
 
-	openpaths=()=>{
+	openpaths = () => {
 		this.setState({
-			loadtype:true,
 			Modalstype: true,
-			openpathss:true,
-			Modalstopval: "公开申请已提交，请等待管理员的审核",
-			modalsMidval:"• 我们将在1-2个工作日内完成审核",
-			Loadtype:true,
-			modalstyles:"848282"
+			openpathss: true,
+			Modalstopval: "公开课程需经过平台标准化审核，审核周期为1-2天，公开",
+			modalsMidval: "的课程将对平台所有人可见。若仅本人教学使用则无需",
+			Modalsbottomval: "申请公开，直接发送到课堂即可",
+			cancelText: "取消申请",
+			okText: "确定申请"
 		})
 	}
 
-	postcancel_public=()=>{
-		let pathid=this.props.match.params.pathId;
-		let url ="/paths/"+pathid+"/cancel_public.json";
-		axios.post(url).then((result)=>{
-			if(result.status===200){
-				if(result.data.status===0){
+	postcancel_public = () => {
+		let pathid = this.props.match.params.pathId;
+		let url = "/paths/" + pathid + "/cancel_public.json";
+		axios.post(url).then((result) => {
+			if (result.status === 200) {
+				if (result.data.status === 0) {
 					this.cardsModalcancel()
 					this.props.showNotification("撤销申请公开成功")
 					this.props.getlistdatas();
 				}
 			}
-		}).catch((error)=>{
+		}).catch((error) => {
 			console.log(error);
 		})
 	}
 
-	cancel_public=()=>{
+	cancel_public = () => {
 		this.setState({
-			cancel_publics:true,
+			cancel_publics: true,
 			Modalstype: true,
 			Modalstopval: "是否确认撤销申请公开？",
-			modalsMidval:" ",
-			ModalsBottomval:" ",
+			modalsMidval: " ",
+			ModalsBottomval: " ",
 		})
 	}
 
-	postcancel_has_public=()=>{
-		let pathid=this.props.match.params.pathId;
-		let url ="/paths/"+pathid+"/cancel_has_public.json";
-		axios.post(url).then((result)=>{
-			if(result.status===200){
-				if(result.data.status===0){
+	postcancel_has_public = () => {
+		let pathid = this.props.match.params.pathId;
+		let url = "/paths/" + pathid + "/cancel_has_public.json";
+		axios.post(url).then((result) => {
+			if (result.status === 200) {
+				if (result.data.status === 0) {
 					this.cardsModalcancel()
 					this.props.showNotification("撤消公开成功")
 					this.props.getlistdatas();
 				}
 			}
-		}).catch((error)=>{
+		}).catch((error) => {
 			console.log(error);
 		})
 	}
 
-	cancel_has_public=()=>{
+	cancel_has_public = () => {
 		this.setState({
-			cancel_has_publics:true,
+			cancel_has_publics: true,
 			Modalstype: true,
 			Modalstopval: "是否确认撤销公开？",
-			modalsMidval:" ",
-			ModalsBottomval:" ",
+			modalsMidval: " ",
+			ModalsBottomval: " ",
 		})
 	}
 
-	render(){
-    let{detailInfoList}=this.props;
-    let{Modalstype,Modalstopval,cardsModalcancel,putappointmenttype,Modalsbottomval,cardsModalsavetype,loadtype,getappointmenttype,openpathss,cancel_publics,cancel_has_publics}=this.state;
-    const radioStyle = {
-      display: 'block',
-      height: '30px',
-      lineHeight: '30px',
-    };
+	setCollect = () => {
+		let pathid = this.props.match.params.pathId;
+		let url = "/collections.json";
+		axios.post(url, {
+			container_id: pathid,
+			container_type: "Subject"
+		}).then((result) => {
+			const status = result.data.status
+			if (status === 0) {
+				this.props.getlistdatas()
+				this.props.showNotification(result.data.message);
+			}
+		}).catch((error) => {
+			console.log(error);
+		})
+	}
+
+	cancelCollect = () => {
+		let pathid = this.props.match.params.pathId;
+		let url = `/collections/cancel.json`;
+		axios.delete(url, {
+			data: {
+				container_id: pathid,
+				container_type: "Subject"
+			}
+		}).then((response) => {
+			const status = response.data.status
+			if (status === 0) {
+				this.props.getlistdatas()
+				this.props.showNotification(response.data.message);
+			}
+		}).catch((error) => {
+			console.log(error)
+		})
+	}
+
+	render() {
+		let { detailInfoList } = this.props;
+		let { Modalstype, Modalstopval, cardsModalcancel, putappointmenttype, Modalsbottomval, cardsModalsavetype, loadtype, getappointmenttype, openpathss, cancel_publics, cancel_has_publics, applyissuePaths } = this.state;
+		const radioStyle = {
+			display: 'block',
+			height: '30px',
+			lineHeight: '30px',
+		};
 
 		let menu = (
 			<Menu>
-				{this.props.courses===undefined||this.props.courses.length===0?"":this.props.courses.map((item,key)=>{
-					return(
+				{this.props.courses === undefined || this.props.courses.length === 0 ? "" : this.props.courses.map((item, key) => {
+					return (
 						<Menu.Item>
-							<a rel="noopener noreferrer" onClick={()=>this.MenuItems(key+1)}>
-								第{key+1}次开课
+							<a rel="noopener noreferrer" onClick={() => this.MenuItems(key + 1)}>
+								第{key + 1}次开课
 							</a>
 						</Menu.Item>
-						)
+					)
 				})}
 			</Menu>
 		);
 
 
 
-		let applypath=this.props.detailInfoList&&this.props.detailInfoList.participant_count!=undefined&&this.props.detailInfoList&&this.props.detailInfoList.allow_statistics===false;
-    let coursestypes=this.props.courses!=undefined&&this.props.courses.length===0;
-    let isadminallow_statistics=this.props.courses&&this.props.courses.length===0&&this.props.detailInfoList&&this.props.detailInfoList.allow_statistics===true;
+		let applypath = this.props.detailInfoList && this.props.detailInfoList.participant_count != undefined && this.props.detailInfoList && this.props.detailInfoList.allow_statistics === false;
+		let coursestypes = this.props.courses != undefined && this.props.courses.length === 0;
+		let isadminallow_statistics = this.props.courses && this.props.courses.length === 0 && this.props.detailInfoList && this.props.detailInfoList.allow_statistics === true;
+		const isadmin = this.props.isAdmin()
+		return (
 
-		return(
-
-			<div className={this.props.courses===undefined?"subhead":this.props.courses.length===0?applypath===true?"subhead mb100":"subhead":applypath===false?detailInfoList.name.length>40?"subhead mb100":"subhead mb70":this.state.MenuItemskey===this.props.courses.length?"subhead mb120":detailInfoList.name.length>40?"subhead mb100":"subhead mb80"}>
+			<div className={this.props.courses === undefined ? "subhead" : this.props.courses.length === 0 ? applypath === true ? "subhead mb100" : "subhead" : applypath === false ? detailInfoList.name.length > 40 ? "subhead mb100" : "subhead mb70" : this.state.MenuItemskey === this.props.courses.length ? "subhead mb120" : detailInfoList.name.length > 40 ? "subhead mb100" : "subhead mb80"}>
 
 
-        <Modals
-          modalsType={Modalstype}
-          modalsTopval={Modalstopval}
-          modalsBottomval={Modalsbottomval}
-          modalCancel={cardsModalcancel}
-          modalSave={loadtype===true&&openpathss===false?()=>this.cardsModalcancel():cardsModalsavetype===true?()=>this.postcancelissuePath():openpathss===true?()=>this.postopenpaths():cancel_publics===true?()=>this.postcancel_public():cancel_has_publics===true?()=>this.postcancel_has_public():putappointmenttype===true?()=>this.getappointment():()=>this.cardsModalsave()}
-          loadtype={loadtype}
+				<Modals
+					modalsType={Modalstype}
+					modalsTopval={Modalstopval}
+					modalsBottomval={Modalsbottomval}
+					modalCancel={cardsModalcancel}
+					modalSave={applyissuePaths === true ? () => this.showapplyissuePath() : loadtype === true && openpathss === false ? () => this.cardsModalcancel() : cardsModalsavetype === true ? () => this.postcancelissuePath() : openpathss === true ? () => this.postopenpaths() : cancel_publics === true ? () => this.postcancel_public() : cancel_has_publics === true ? () => this.postcancel_has_public() : putappointmenttype === true ? () => this.getappointment() : () => this.cardsModalsave()}
+					loadtype={loadtype}
+					cancelText={this.state.cancelText}
+					okText={this.state.okText}
 					modalsMidval={this.state.modalsMidval}
 					modalstyles={this.state.modalstyles}
-        >
-        </Modals>
-			{this.state.yslJointhe===true?<Jointheclass   {...this.props} {...this.state} ysljoinmodalCancel={()=>this.ysljoinmodalCancel()} ysljoinmodalCanceltwo={()=>this.ysljoinmodalCanceltwo(this.state.MenuItemskey)}></Jointheclass>:""}
-			{this.state.OpenCourseTypes===true?<OpenCourse  {...this.props} {...this.state} OpenCourseCancel={()=>this.OpenCourseCancel()}/>:""}
+				>
+				</Modals>
+				{this.state.yslJointhe === true ? <Jointheclass   {...this.props} {...this.state} ysljoinmodalCancel={() => this.ysljoinmodalCancel()} ysljoinmodalCanceltwo={() => this.ysljoinmodalCanceltwo(this.state.MenuItemskey)}></Jointheclass> : ""}
+				{this.state.OpenCourseTypes === true ? <OpenCourse  {...this.props} {...this.state} OpenCourseCancel={() => this.OpenCourseCancel()} /> : ""}
 				<style>
 					{
 
@@ -493,10 +519,10 @@ class DetailTop extends Component{
 						`
 					}
 				</style>
-        {
-          detailInfoList &&
-					<div  className={this.props.courses===undefined?"subhead_content":this.props.courses.length===0?"subhead_content pt40":"subhead_content "}>
-            <div className="font-28 color-white clearfix">
+				{
+					detailInfoList &&
+					<div className={this.props.courses === undefined ? "subhead_content" : this.props.courses.length === 0 ? "subhead_content pt40" : "subhead_content "}>
+						<div className="font-28 color-white clearfix">
 							{/*<Tooltip placement="bottom" title={detailInfoList.name.length>27?detailInfoList.name:""}>*/}
 
 							{/*</Tooltip>*/}
@@ -548,91 +574,107 @@ class DetailTop extends Component{
 							</style>
 
 							<span className="fl lineh-40">
-                 {detailInfoList.name}
-                 {detailInfoList===undefined?"":detailInfoList.excellent === false ? "" :
-									 <span className="pathoranges">
-										 <div>开放课程</div>
-									 </span>
-                 }
-               </span>
+								{detailInfoList.name}
+								{detailInfoList === undefined ? "" : detailInfoList.excellent === false ? "" :
+									<span className="pathoranges">
+										<div>开放课程</div>
+									</span>
+								}
+							</span>
 
-            </div>
-            <div className="clearfix mt20">
-              {
-                detailInfoList &&
-                <ul className="fl color-grey-eb pathInfo">
-                  { detailInfoList.stages_count!=0 ? <li><span>章节</span><span className="ml5">{detailInfoList.stages_count}</span></li> : ""}
-                  { detailInfoList.shixuns_count!=0 ? <li><span>实训</span><span className="ml5">{ detailInfoList.shixuns_count}</span></li> : ""}
-                  { detailInfoList.challenge_choose_count!=0 ? <li><span>选择题任务</span><span>{detailInfoList.challenge_choose_count}</span></li> : ""}
-                  { detailInfoList.challenges_count!=0 ? <li><span>实践任务</span><span>{detailInfoList.challenges_count}</span></li> : ""}
-                  { detailInfoList.subject_score!=0 ? <li><span>经验值</span><span>{detailInfoList.subject_score}</span></li> : ""}
-                  { detailInfoList.member_count!=0 ? <li><span>学习人数</span><span>{detailInfoList.member_count}</span></li> : ""}
-                </ul>
-              }
-				    	<div className="fr pr maxwinth600">
-
-								{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
-									<Link to={"/paths/"+this.props.match.params.pathId+"/statistics"}  className="user_default_btn fr font-18 xxtjbtn">
-									学习统计
-									</Link>:""
-									}
-
-								{ detailInfoList.allow_send === true?
-										<SendPanel {...this.props} {...this.state} widths={"80px"}></SendPanel>
-								:""
+						</div>
+						<div className="clearfix mt20">
+							{
+								detailInfoList &&
+								<ul className="fl color-grey-eb pathInfo">
+									{detailInfoList.stages_count != 0 ? <li><span>章节</span><span className="ml5">{detailInfoList.stages_count}</span></li> : ""}
+									{detailInfoList.shixuns_count != 0 ? <li><span>实训</span><span className="ml5">{detailInfoList.shixuns_count}</span></li> : ""}
+									{detailInfoList.challenge_choose_count != 0 ? <li><span>选择题任务</span><span>{detailInfoList.challenge_choose_count}</span></li> : ""}
+									{detailInfoList.challenges_count != 0 ? <li><span>实践任务</span><span>{detailInfoList.challenges_count}</span></li> : ""}
+									{detailInfoList.subject_score != 0 ? <li><span>经验值</span><span>{detailInfoList.subject_score}</span></li> : ""}
+									{detailInfoList.member_count != 0 ? <li><span>学习人数</span><span>{detailInfoList.member_count}</span></li> : ""}
+								</ul>
+							}
+							<div className="fr pr maxwinth600">
+								{/*issue-29182 添加状态判断 已公开的才显示学习统计*/}
+								{detailInfoList === undefined ? "" : detailInfoList.allow_statistics === true && detailInfoList.public_status === 2 ?
+									<Link to={"/paths/" + this.props.match.params.pathId + "/statistics"} className="user_default_btn fr font-18 xxtjbtn">
+										学习统计
+									</Link> : ""
 								}
 
-								{this.props.courses===undefined?"":detailInfoList.is_creator===true?<a className={"fr font-18 color-white kaike mr20 kkbths"} style={{'width':'65px'}} onClick={()=>this.OpenCoursefun()}>开课</a>:""}
-
-								{ detailInfoList.allow_statistics===true&& detailInfoList.public_status===2?
-									<a className="fr font-18 color-white kaike mr20 kkbths" onClick={this.cancel_has_public}>撤销公开</a>:""
+								{detailInfoList.allow_send === true ?
+									<SendPanel {...this.props} {...this.state} widths={"80px"}></SendPanel>
+									: ""
 								}
 
-								{detailInfoList.allow_statistics===true&& detailInfoList.public_status===1?
-									<a className="fr font-18 color-white kaike mr20 kkbths" onClick={this.cancel_public} style={{width:'135px'}}>撤销申请公开</a>:""
+								{this.props.courses === undefined ? "" : detailInfoList.is_creator === true ? <a className={"fr font-18 color-white kaike mr20 kkbths"} style={{ 'width': '65px' }} onClick={() => this.OpenCoursefun()}>开课</a> : ""}
+
+								{isadmin && detailInfoList.allow_statistics === true && detailInfoList.public_status === 2 ?
+									<a className="fr font-18 color-white kaike mr20 kkbths" onClick={this.cancel_has_public}>撤销公开</a> : ""
 								}
 
-								{ detailInfoList.publish_status===2&& detailInfoList.allow_statistics===true&& detailInfoList.public_status===0?
-									<a className="fr font-18 color-white kaike mr20 kkbths" onClick={this.openpaths}>申请公开</a>:""
+								{detailInfoList.allow_statistics === true && detailInfoList.public_status === 1 ?
+									<a className="fr font-18 color-white kaike mr20 kkbths" onClick={this.cancel_public} style={{ width: '135px' }}>撤销申请公开</a> : ""
+								}
+
+								{detailInfoList.publish_status === 2 && detailInfoList.allow_statistics === true && detailInfoList.public_status === 0 ?
+									<a className="fr font-18 color-white kaike mr20 kkbths" onClick={this.openpaths}>申请公开</a> : ""
 								}
 
 								{
-									detailInfoList.publish_status===2 && detailInfoList.allow_statistics===true&&detailInfoList.public_status===0?
-										<a className="fr font-18 color-white kaike mr20 kkbths" onClick={this.cancelissuePath}>撤销发布</a>:""
+									detailInfoList.publish_status === 2 && detailInfoList.allow_statistics === true && detailInfoList.public_status === 0 ?
+										<a className="fr font-18 color-white kaike mr20 kkbths" onClick={this.cancelissuePath}>撤销发布</a> : ""
 								}
 
 
 								{
-									detailInfoList.publish_status===0&&detailInfoList.allow_add_member===true?
-											<a className="fr font-18 color-white kaike mr20 kkbths"
-												 style={{'width':'65px'}}
-												 onClick={this.applyissuePath}>发布</a>:""
+									detailInfoList.publish_status === 0 && detailInfoList.allow_add_member === true ?
+										<a className="fr font-18 color-white kaike mr20 kkbths"
+											style={{ 'width': '95px' }}
+											onClick={this.applyissuePath}>申请发布</a> : ""
 								}
 
 
-								{detailInfoList===undefined?"":detailInfoList.allow_delete===true?<a
+								{detailInfoList === undefined ? "" : detailInfoList.allow_delete === true ? <a
 									className={"fr font-18 color-white kaike mr20 kkbths"}
 									onClick={this.allow_deletepath}
-									style={{'width':'65px'}}
-								>删除</a>:""}
+									style={{ 'width': '65px' }}
+								>删除</a> : ""}
 
-								{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
-									<Link to={"/paths/"+this.props.match.params.pathId+"/edit"}
-												style={{'width':'65px'}}
-												className="fr font-18 color-white kaike mr20 kkbths" >
+
+
+								{detailInfoList === undefined ? "" : detailInfoList.allow_statistics === true ?
+									<Link to={"/paths/" + this.props.match.params.pathId + "/edit"}
+										style={{ 'width': '65px' }}
+										className="fr font-18 color-white kaike mr20 kkbths" >
 										编辑
 									</Link>
-									:""
+									: ""
 								}
+
+								{this.props && this.props.user.login === "" ? "" : detailInfoList && detailInfoList.is_collect === false ? <a onClick={() => this.setCollect()}
+									style={{ 'width': '65px' }}
+									className="fr font-18 color-white kaike mr20 kkbths" >
+									收藏
+								</a> : ""}
+
+								{
+									this.props && this.props.user.login === "" ? "" : detailInfoList && detailInfoList.is_collect === true ?
+										<a className="fr font-18 color-white kaike mr20 kkbths" onClick={() => this.cancelCollect()}> 取消收藏
+										</a> : ""
+								}
+
+
 							</div>
 
 
-            </div>
+						</div>
 
-							{this.props.courses===undefined||isadminallow_statistics===true?"":<div className="userNavs mt20" style={applypath===false?{}:this.state.MenuItemskey===this.props.courses.length?{height:'135px'}:{}}>
-								<style>
-									{
-										`
+						{this.props.courses === undefined || isadminallow_statistics === true ? "" : <div className="userNavs mt20" style={applypath === false ? {} : this.state.MenuItemskey === this.props.courses.length ? { height: '135px' } : {}}>
+							<style>
+								{
+									`
 										.anticon-down{
 											font-size:14px !important;
 											transform:none !important;
@@ -650,34 +692,36 @@ class DetailTop extends Component{
 										  color:#CDCDCD;
 										}
 										`
+								}
+							</style>
+							{this.props.courses === undefined || this.props.courses.length === 0 ? "" : <li className={"fl pd4020 mt10"}>
+
+								{this.state.courseslist.map((item, key) => {
+									if (item.course_identity < 4) {
+										return (
+											<Tooltip placement="bottom" title={"编辑课堂"} key={key}>
+												<a href={`/classrooms/${item.course_id}/newgolds/settings`} target={"_blank"}>
+													<i className="iconfont icon-bianji1 newbianji1"></i>
+												</a>
+											</Tooltip>
+										)
 									}
-								</style>
-								{this.props.courses===undefined||this.props.courses.length===0?"":<li className={"fl pd4020 mt10"}>
-
-										{this.state.courseslist.map((item,key)=>{
-											if(item.course_identity<4){
-												return(
-													<Tooltip placement="bottom" title={"编辑课堂"} key={key}>
-														<a href={`/courses/${item.course_id}/newgolds/settings`} target={"_blank"}>
-															<i className="iconfont icon-bianji1 newbianji1"></i>
-														</a>
-													</Tooltip>
-												)}})
-										}
+								})
+								}
 
 
-										<Dropdown
-											overlay={menu}
-											onVisibleChange={this.onVisibleChanges}
-										>
-											<a className={"alist"}>
-												第<span className={"color-orange"}>  {this.state.MenuItemskey}  </span>次开课 <Icon className="aIcons" type={!this.state.onVisibleChangestype?"down":"up"} />
-											</a>
-										</Dropdown>
-									</li>}
-									<style>
-										{
-											`
+								<Dropdown
+									overlay={menu}
+									onVisibleChange={this.onVisibleChanges}
+								>
+									<a className={"alist"}>
+										第<span className={"color-orange"}>  {this.state.MenuItemskey}  </span>次开课 <Icon className="aIcons" type={!this.state.onVisibleChangestype ? "down" : "up"} />
+									</a>
+								</Dropdown>
+							</li>}
+							<style>
+								{
+									`
 										.pdt28{
 										    padding-top: 28px;
 										}
@@ -693,55 +737,55 @@ class DetailTop extends Component{
 											font-size: 14px;
 										}
 										`
-										}
-									</style>
-								{this.props.courses===undefined||this.props.courses.length===0?"":<li className={"ml20"}>
-										{this.state.courseslist.map((item,key)=>{
-											return(
-												<div className={"ant-breadcrumb pdt28"} key={key}>
-															<span>
-											 <div className="ant-breadcrumb-link fl mr23">
-												 <div className={"pathtime"}>
-													 开课时间：
+								}
+							</style>
+							{this.props.courses === undefined || this.props.courses.length === 0 ? "" : <li className={"ml20"}>
+								{this.state.courseslist.map((item, key) => {
+									return (
+										<div className={"ant-breadcrumb pdt28"} key={key}>
+											<span>
+												<div className="ant-breadcrumb-link fl mr23">
+													<div className={"pathtime"}>
+														开课时间：
 												 </div>
-											   <div className={"pathtimes"}>
-											      {item.start_date}
-												 </div>
-											 </div>
-											 <div className="fl solidright"></div>
-										</span>
-
-													<span>
-												 <div className="ant-breadcrumb-link fl mr23 ml23">
-													 <div className={"pathtime"}>
-														 结课时间：
-													 </div>
-													 <div className={"pathtimes"}>
-														 {item.end_date}
-													 </div>
-												 </div>
-												 <div className="fl solidright"></div>
-											</span>
-
-													<span>
-												 <div className="ant-breadcrumb-link fl mr23 ml23">
-													 <div className={"pathtime"}>
-														 报名人数：
-													 </div>
-													 <div className={"pathtimes"}>
-													  {item.student_count}   人
-													 </div>
-												 </div>
-											</span>
+													<div className={"pathtimes"}>
+														{item.start_date}
+													</div>
 												</div>
-											)
-										})
-										}
+												<div className="fl solidright"></div>
+											</span>
 
-									</li>}
-								<style>
-									{
-										`
+											<span>
+												<div className="ant-breadcrumb-link fl mr23 ml23">
+													<div className={"pathtime"}>
+														结课时间：
+													 </div>
+													<div className={"pathtimes"}>
+														{item.end_date}
+													</div>
+												</div>
+												<div className="fl solidright"></div>
+											</span>
+
+											<span>
+												<div className="ant-breadcrumb-link fl mr23 ml23">
+													<div className={"pathtime"}>
+														报名人数：
+													 </div>
+													<div className={"pathtimes"}>
+														{item.student_count}   人
+													 </div>
+												</div>
+											</span>
+										</div>
+									)
+								})
+								}
+
+							</li>}
+							<style>
+								{
+									`
 											.user-colorgrey-9b{color:#9B9B9B}
 											.user-colorgrey-green{color:#7ED321}
 											.background191{
@@ -799,83 +843,84 @@ class DetailTop extends Component{
                         display: inline-block;
 											}
 											`
-									}
-								</style>
-								{this.props.courses===undefined||this.props.courses.length===0?"":<li className={"fr padding040"}>
+								}
+							</style>
+							{this.props.courses === undefined || this.props.courses.length === 0 ? "" : <li className={"fr padding040"}>
 
 
-										{/*
+								{/*
 										height: 158px;
 										}*/}
-										{this.state.courseslist.map((item,key)=>{
+								{this.state.courseslist.map((item, key) => {
 
-											return(
-												<div key={key}>
-													{applypath===false?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true?
-														this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?
-															getappointmenttype===true?<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox  mt5":"fr user_default_btn background191 font-18 pathbtensbox mt26"}>预约报名成功</span>:<a className={coursestypes===true?"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox  mt5":"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox mt26"}  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:
-															<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox  mt5":"fr user_default_btn background191 font-18 pathbtensbox mt26"}>预约报名成功</span>:""}
+									return (
+										<div key={key}>
+											{applypath === false ? "" : this.state.MenuItemskey === this.props.courses.length || coursestypes === true ?
+												this.props.detailInfoList && this.props.detailInfoList.has_participate === false ?
+													getappointmenttype === true ? <span className={coursestypes === true ? "fr user_default_btn background191 font-18 pathbtensbox  mt5" : "fr user_default_btn background191 font-18 pathbtensbox mt26"}>预约报名成功</span> : <a className={coursestypes === true ? "fr user_default_btn task-btn-28BE6C font-18 pathbtensbox  mt5" : "fr user_default_btn task-btn-28BE6C font-18 pathbtensbox mt26"} onClick={() => this.putappointment()}>期待开课并预约报名</a> :
+													<span className={coursestypes === true ? "fr user_default_btn background191 font-18 pathbtensbox  mt5" : "fr user_default_btn background191 font-18 pathbtensbox mt26"}>预约报名成功</span> : ""}
 
-													{/*{item.course_status.status===0?<div className="mr51 shixun_detail pointer fl user-colorgrey-green pathdefault">即将开课</div>:""}*/}
-													{item.course_status.status===1?<div className="mr51 shixun_detail pointer fl color-orange pathdefault mt10">{item.course_status.time}</div>:""}
-													{item.course_status.status===2&&item.course_identity<6?<div className="mr20 shixun_detail pointer fl user-colorgrey-9b pathdefault mt10">已结束</div>:""}
-													{/*<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault">已结束</div>*/}
-													{item.course_status.status===0?
-														item.course_identity<5?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa mr20" href={item.first_category_url} target="_blank">
-															进入课堂
-														</a>:item.course_identity<6?<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault mr20">报名成功</div>
-															:<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20"  onClick={()=>this.JoinnowCourse(item.course_id)}>立即报名</a>:""}
+											{/*{item.course_status.status===0?<div className="mr51 shixun_detail pointer fl user-colorgrey-green pathdefault">即将开课</div>:""}*/}
+											{item.course_status.status === 1 ? <div className="mr51 shixun_detail pointer fl color-orange pathdefault mt10">{item.course_status.time}</div> : ""}
+											{item.course_status.status === 2 && item.course_identity < 6 ? <div className="mr20 shixun_detail pointer fl user-colorgrey-9b pathdefault mt10">已结束</div> : ""}
+											{/*<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault">已结束</div>*/}
+											{item.course_status.status === 0 ?
+												item.course_identity < 5 ? <a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa mr20" href={item.first_category_url} target="_blank">
+													进入课堂
+														</a> : item.course_identity < 6 ? <div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault mr20">报名成功</div>
+														: <a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20" onClick={() => this.JoinnowCourse(item.course_id)}>立即报名</a> : ""}
 
-													{item.course_status.status===1?
-														item.course_identity<5?<a className="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20" href={item.first_category_url} target="_blank">
-															进入课堂
-														</a>:item.course_identity<6?<a className="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20" href={item.first_category_url} target="_blank">
-															立即学习
-														</a>:<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20"  onClick={()=>this.JoinnowCourse(item.course_id,item.course_status.status)}>立即加入</a>:""}
+											{item.course_status.status === 1 ?
+												item.course_identity < 5 ? <a className="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20" href={item.first_category_url} target="_blank">
+													进入课堂
+														</a> : item.course_identity < 6 ? <a className="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20" href={item.first_category_url} target="_blank">
+														立即学习
+														</a> : <a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20" onClick={() => this.JoinnowCourse(item.course_id, item.course_status.status)}>立即加入</a> : ""}
 
-													{item.course_status.status===2?
-														item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa mr20" href={item.first_category_url} target="_blank">
-															进入课堂
-														</a>:<div className="mr20 shixun_detail pointer fl user-colorgrey-9b pathdefault mt10">已结束</div>:""}
+											{item.course_status.status === 2 ?
+												item.course_identity < 6 ? <a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa mr20" href={item.first_category_url} target="_blank">
+													进入课堂
+														</a> : <div className="mr20 shixun_detail pointer fl user-colorgrey-9b pathdefault mt10">已结束</div> : ""}
 
-												</div>
-											)})}
+										</div>
+									)
+								})}
 
 
-									</li>}
+							</li>}
 
 
 
-								{applypath===false?"":this.state.MenuItemskey===this.props.courses.length?<div className={"clear"}></div>:""}
+							{applypath === false ? "" : this.state.MenuItemskey === this.props.courses.length ? <div className={"clear"}></div> : ""}
 
-								{applypath===false?"":this.props.courses.length===0?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true?<span className={coursestypes===true?"fr lineHeight1 relativewidth mt43":"fl lineHeight1 relativewidth"}>
-									<span className={"fr mr30"}>当前预约报名人数：<span className={"color-red mr5"}>{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}</span>人</span>
-										<span className={"font153 fr mr12"}>当预约报名人数达到   {this.props.detailInfoList&&this.props.detailInfoList.student_count}    人时即将开课</span>
-										{/*{this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?*/}
-										{/*getappointmenttype===true?<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>:<a className={coursestypes===true?"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth"}  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:*/}
-										{/*<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>}*/}
-								</span>
-									:""}
+							{applypath === false ? "" : this.props.courses.length === 0 ? "" : this.state.MenuItemskey === this.props.courses.length || coursestypes === true ? <span className={coursestypes === true ? "fr lineHeight1 relativewidth mt43" : "fl lineHeight1 relativewidth"}>
+								<span className={"fr mr30"}>当前预约报名人数：<span className={"color-red mr5"}>{getappointmenttype === true ? this.props.detailInfoList && this.props.detailInfoList.participant_count + 1 : this.props.detailInfoList && this.props.detailInfoList.participant_count}</span>人</span>
+								<span className={"font153 fr mr12"}>当预约报名人数达到   {this.props.detailInfoList && this.props.detailInfoList.student_count}    人时即将开课</span>
+								{/*{this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?*/}
+								{/*getappointmenttype===true?<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>:<a className={coursestypes===true?"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth"}  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:*/}
+								{/*<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>}*/}
+							</span>
+								: ""}
 
-								{applypath===true&&this.props.courses.length===0?this.state.MenuItemskey===this.props.courses.length||coursestypes===true?<span className={coursestypes===true?"fl ml20 lineHeight0 relativewidth":"fl ml20 lineHeight0 relativewidth"}>
-									<span className={"mt10block"}>当前预约报名人数：<span className={"color-red mr5"}>{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}</span>人</span>
-									<span className={"font153 mt10block"}>当预约报名人数达到   {this.props.detailInfoList&&this.props.detailInfoList.student_count}    人时即将开课</span>
-									{this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?
-										getappointmenttype===true?<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>:<a className={coursestypes===true?"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth"}  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:
-										<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>}
-									</span>:"":""}
+							{applypath === true && this.props.courses.length === 0 ? this.state.MenuItemskey === this.props.courses.length || coursestypes === true ? <span className={coursestypes === true ? "fl ml20 lineHeight0 relativewidth" : "fl ml20 lineHeight0 relativewidth"}>
+								<span className={"mt10block"}>当前预约报名人数：<span className={"color-red mr5"}>{getappointmenttype === true ? this.props.detailInfoList && this.props.detailInfoList.participant_count + 1 : this.props.detailInfoList && this.props.detailInfoList.participant_count}</span>人</span>
+								<span className={"font153 mt10block"}>当预约报名人数达到   {this.props.detailInfoList && this.props.detailInfoList.student_count}    人时即将开课</span>
+								{this.props.detailInfoList && this.props.detailInfoList.has_participate === false ?
+									getappointmenttype === true ? <span className={coursestypes === true ? "fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5" : "fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span> : <a className={coursestypes === true ? "fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth mt5" : "fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth"} onClick={() => this.putappointment()}>期待开课并预约报名</a> :
+									<span className={coursestypes === true ? "fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5" : "fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>}
+							</span> : "" : ""}
 
 
 						</div>}
 
-          </div>
-        }
+					</div>
+				}
 
 
 
 
-      </div>
-    )
-  }
+			</div>
+		)
+	}
 }
-export default DetailTop;
\ No newline at end of file
+export default DetailTop;
diff --git a/src/modules/paths/PathDetail/OpenCourse.js b/src/modules/paths/PathDetail/OpenCourse.js
index ccc11185..5f629584 100644
--- a/src/modules/paths/PathDetail/OpenCourse.js
+++ b/src/modules/paths/PathDetail/OpenCourse.js
@@ -26,9 +26,9 @@ class OpenCourse extends Component {
    console.log(this.props.match.params.pathId)
 
 	 if(value===0){
-    window.open(`/courses/news/${this.props.match.params.pathId}/newgold/0 `);
+    window.open(`/classrooms/news/${this.props.match.params.pathId}/newgold/0 `);
 	 }else{
-		window.open(`/courses/news/${this.props.match.params.pathId}/newgold/1`);
+		window.open(`/classrooms/news/${this.props.match.params.pathId}/newgold/1`);
 	 }
 		this.props.OpenCourseCancel();
 	}
@@ -97,4 +97,4 @@ class OpenCourse extends Component {
 	}
 }
 
-export default OpenCourse;
\ No newline at end of file
+export default OpenCourse;
diff --git a/src/modules/paths/PathDetail/PathDetailIndex.js b/src/modules/paths/PathDetail/PathDetailIndex.js
index 03f3b965..3a1ea439 100644
--- a/src/modules/paths/PathDetail/PathDetailIndex.js
+++ b/src/modules/paths/PathDetail/PathDetailIndex.js
@@ -1,24 +1,14 @@
 import React, { Component } from 'react';
-import {getImageUrl,markdownToHTML, configShareForCustom} from 'educoder';
+import { getImageUrl, markdownToHTML, configShareForCustom } from 'educoder';
 import DetailTop from './DetailTop.js';
 import DetailCards from './DetailCards.js'
 import AddCollaborators from "./addCollaborators.js";
-import {Icon, Tooltip, Popover} from 'antd';
-import { BrowserRouter as Router, Route, Link } from "react-router-dom";
-import { DragDropContext ,  Draggable, Droppable} from 'react-beautiful-dnd';
+import { Icon, Tooltip, Popover } from 'antd';
 import '../../paths/ShixunPaths.css';
-import "antd/dist/antd.css";
 import Modals from '../../modals/Modals';
 import axios from 'axios';
-import TPMRightSection from "../../tpm/component/TPMRightSection";
 import styled from "styled-components";
 import Modifytext from './Modifytext';
-const getItemStyle = (isDragging, draggableStyle) => ({
-	// change background colour if dragging
-	background: isDragging ? '#dceeff' : '',
-	// styles we need to apply on draggables
-	...draggableStyle,
-});
 const getItems = count =>
 	Array.from({ length: count }, (v, k) => k).map(k => ({
 		id: `item-${k}`,
@@ -34,10 +24,6 @@ const reorder = (list, startIndex, endIndex) => {
 	return result;
 };
 
-const List = styled.div`
-  background: lightgrey;
-  padding: 10px;
-`;
 
 const Item = styled.div`
   display: flex;
@@ -64,29 +50,29 @@ const DragHandle = styled.div`
     visibility: visible;
   }
 `;
-const $ =window.$
-class PathDetailIndex extends Component{
-	constructor(props){
+const $ = window.$
+class PathDetailIndex extends Component {
+	constructor(props) {
 		super(props)
-		this.state={
-			progress:undefined,
-			tags:undefined,
-			members:undefined,
-			detailInfoList:undefined,
-			clickdetailInfoListtype:false,
-			Modalstype:false,
-			Modalstopval:undefined,
-			Modalsbottomval:undefined,
-			cardsModalcancel:this.cardsModalcancel,
-			cardsModalsave:this.cardsModalsave,
-			user_id:undefined,
-			loadtype:false,
-			courses:undefined,
+		this.state = {
+			progress: undefined,
+			tags: undefined,
+			members: undefined,
+			detailInfoList: undefined,
+			clickdetailInfoListtype: false,
+			Modalstype: false,
+			Modalstopval: undefined,
+			Modalsbottomval: undefined,
+			cardsModalcancel: this.cardsModalcancel,
+			cardsModalsave: this.cardsModalsave,
+			user_id: undefined,
+			loadtype: false,
+			courses: undefined,
 			items: getItems(10),
-			pathtopskey:1,
-			dataquerys:{},
-			MenuItemsindex:1,
-			MenuItemsindextype:0,
+			pathtopskey: 1,
+			dataquerys: {},
+			MenuItemsindex: 1,
+			MenuItemsindextype: 0,
 			qrcode_img: null,
 			team_title: "教学团队",
 			modify: false,
@@ -102,7 +88,7 @@ class PathDetailIndex extends Component{
 
 		try {
 
-		}catch (e) {
+		} catch (e) {
 
 		}
 		const items = reorder(
@@ -112,17 +98,17 @@ class PathDetailIndex extends Component{
 		);
 
 		this.setState({
-			detailInfoList:this.state.detailInfoList,
-			members:items,
+			detailInfoList: this.state.detailInfoList,
+			members: items,
 			items
 		});
-		console.log(this.state.members)
-		console.log("items 数组数组数组数组")
-		console.log(items)
+		// console.log(this.state.members)
+		// console.log("items 数组数组数组数组")
+		// console.log(items)
 	}
-	cardsModalcancel=()=>{
+	cardsModalcancel = () => {
 		this.setState({
-			Modalstype:false,
+			Modalstype: false,
 		})
 		// TODO 这个是临时处理，还需要优化，这里要看怎么区分处理
 		if (this.state.Modalstopval == '你确定要删除该成员吗？') {
@@ -131,15 +117,15 @@ class PathDetailIndex extends Component{
 		this.props.history.goBack()
 	}
 
-	cardsModalsave=()=>{
+	cardsModalsave = () => {
 		this.setState({
-			Modalstype:false,
+			Modalstype: false,
 		})
 		this.props.history.goBack()
 	}
 	// 加载markdown
-	updatamakedown=(id)=>{
-		setTimeout(()=>{
+	updatamakedown = (id) => {
+		setTimeout(() => {
 			var shixunDescr = window.editormd.markdownToHTML(id, {
 				htmlDecode: "style,script,iframe",
 				taskList: true,
@@ -147,43 +133,43 @@ class PathDetailIndex extends Component{
 				flowChart: true,
 				sequenceDiagram: true
 			});
-			$("#"+id+" p:first").addClass("ReactMarkdown");
+			$("#" + id + " p:first").addClass("ReactMarkdown");
 		}, 200)
 	}
 
-	componentDidMount(){
+	componentDidMount() {
 		this.getlistdatas()
 	}
 
-	getlistdatas=()=>{
+	getlistdatas = () => {
 		const query = this.props.location.search;
 		// const type = query.split('?chinaoocTimestamp=');
 		// console.log("Eduinforms12345");
 		// console.log(this.foo(query));
 		// console.log(JSON.stringify(this.foo(query)));
-		var dataqueryss={}
+		var dataqueryss = {}
 		try {
-			var foqus=this.foo(query);
-			if(JSON.stringify(foqus) ==="{}"){
+			var foqus = this.foo(query);
+			if (JSON.stringify(foqus) === "{}") {
 				this.setState({
-					dataquerys:{},
+					dataquerys: {},
 				});
-			}else{
+			} else {
 				this.setState({
-					dataquerys:foqus,
+					dataquerys: foqus,
 				});
-				dataqueryss=foqus;
+				dataqueryss = foqus;
 			}
-		}catch (e) {
+		} catch (e) {
 			this.setState({
-				dataquerys:{},
+				dataquerys: {},
 			})
 		}
 
-		this.getdatasindexs(undefined,dataqueryss);
+		this.getdatasindexs(undefined, dataqueryss);
 	}
 	//截取url 数据的
-	foo=(url)=> {
+	foo = (url) => {
 		var json = {};
 		var regExp = /[\?\&](\w+)(=?)(\w*)/g;
 		var arr;
@@ -204,162 +190,162 @@ class PathDetailIndex extends Component{
 
 		return json;
 	}
-	getdatasindexs=(key,yslwebobject)=>{
+	getdatasindexs = (key, yslwebobject) => {
 		// yslwebobject 后端需要的接口
-		let pathid=this.props.match.params.pathId;
-		let url="/paths/"+pathid+".json";
+		let pathid = this.props.match.params.pathId;
+		let url = "/paths/" + pathid + ".json";
 		axios.get(url,
-			{params:yslwebobject}
-			).then((result)=>{
+			{ params: yslwebobject }
+		).then((result) => {
 			if (result.data.status === 407 || result.data.status === 401) {
-				debugger
+
 				return;
 			}
 
 			if (result.data.status === 403) {
-				debugger
+
 				// window.location.href = "/403";
 				return;
 			}
 			configShareForCustom(result.data.name, result.data.description)
 
-			if(result.data.allow_visit===true){
+			if (result.data.allow_visit === true) {
 				this.setState({
-					detailInfoList:result.data,
-					courses:result.data.courses,
-					pathtopskey:key===undefined?1:key,
+					detailInfoList: result.data,
+					courses: result.data.courses,
+					pathtopskey: key === undefined ? 1 : key,
 					// items:  getItems(result.data.members.length),
 				})
 
-				document.title=result.data.name;
+				document.title = result.data.name;
 			}
 
-		}).catch((error)=>{
+		}).catch((error) => {
 			console.log(error);
 		})
 
 
-		let righturl="/paths/"+pathid+"/right_banner.json";
-		axios.get(righturl).then((result)=>{
+		let righturl = "/paths/" + pathid + "/right_banner.json";
+		axios.get(righturl).then((result) => {
 			if (result.data.status === 407 || result.data.status === 401) {
-				debugger
+
 				return;
 			}
 
 			if (result.data.status === 403) {
-				debugger
+
 				// window.location.href = "/403";
 				return;
 			}
 
 			this.setState({
-			  qrcode_img:result.data.qrcode_img,
-				tags:result.data.tags,
-				progress:result.data.progress,
-				members:result.data.members,
-				items:  getItems(result.data.members.length),
+				qrcode_img: result.data.qrcode_img,
+				tags: result.data.tags,
+				progress: result.data.progress,
+				members: result.data.members,
+				items: getItems(result.data.members.length),
 				team_title: result.data.team_title
 			})
 
-		}).catch((error)=>{
+		}).catch((error) => {
 			console.log(error);
 		})
 	};
-	getMenuItemsindex=(key,status)=>{
+	getMenuItemsindex = (key, status) => {
 
 		this.setState({
-			MenuItemsindex:key,
-			MenuItemsindextype:status
+			MenuItemsindex: key,
+			MenuItemsindextype: status
 		})
 	}
-	getdatasindex=(key)=>{
+	getdatasindex = (key) => {
 		// yslwebobject 后端需要的接口
-		let pathid=this.props.match.params.pathId;
-		let url="/paths/"+pathid+".json";
+		let pathid = this.props.match.params.pathId;
+		let url = "/paths/" + pathid + ".json";
 		axios.get(url,
-			{params:this.state.dataquerys}
-			).then((result)=>{
+			{ params: this.state.dataquerys }
+		).then((result) => {
 			if (result.data.status === 407 || result.data.status === 401) {
-				debugger
+
 				return;
 			}
 
 			if (result.data.status === 403) {
-				debugger
+
 				// window.location.href = "/403";
 				return;
 			}
 			configShareForCustom(result.data.name, result.data.description)
 
-			if(result.data.allow_visit===true){
+			if (result.data.allow_visit === true) {
 				this.setState({
-					detailInfoList:result.data,
-					courses:result.data.courses,
-					pathtopskey:key===undefined?1:key,
+					detailInfoList: result.data,
+					courses: result.data.courses,
+					pathtopskey: key === undefined ? 1 : key,
 					// items:  getItems(result.data.members.length),
 				})
 			}
 
-		}).catch((error)=>{
+		}).catch((error) => {
 			console.log(error);
 		});
 
 
-		let righturl="/paths/"+pathid+"/right_banner.json";
-		axios.get(righturl).then((result)=>{
+		let righturl = "/paths/" + pathid + "/right_banner.json";
+		axios.get(righturl).then((result) => {
 			if (result.data.status === 407 || result.data.status === 401) {
-				debugger
+
 				return;
 			}
 
 			if (result.data.status === 403) {
-				debugger
+
 				// window.location.href = "/403";
 				return;
 			}
 
 			this.setState({
 				// detailInfoList:result.data,
-				tags:result.data.tags,
-				progress:result.data.progress,
-				members:result.data.members,
-				items:  getItems(result.data.members.length),
+				tags: result.data.tags,
+				progress: result.data.progress,
+				members: result.data.members,
+				items: getItems(result.data.members.length),
 				team_title: result.data.team_title
 			})
 
-		}).catch((error)=>{
+		}).catch((error) => {
 			console.log(error);
 		})
 	}
 
-	updatadetailInfoList=()=>{
+	updatadetailInfoList = () => {
 		this.getdatasindex();
 	}
 
-	clickNewsubscript=(val)=>{
-		if(val===0){
+	clickNewsubscript = (val) => {
+		if (val === 0) {
 			this.setState({
-				clickdetailInfoListtype:true
+				clickdetailInfoListtype: true
 			})
-		}else{
+		} else {
 			this.setState({
-				clickdetailInfoListtype:false
+				clickdetailInfoListtype: false
 			})
 		}
 
 	}
 
-	timeStamp=(value)=>{
+	timeStamp = (value) => {
 		var secondTime = parseInt(value);// 秒
 		var minuteTime = 0;// 分
 		var hourTime = 0;// 小时
-		if(secondTime > 60) {//如果秒数大于60，将秒数转换成整数
+		if (secondTime > 60) {//如果秒数大于60，将秒数转换成整数
 			//获取分钟，除以60取整数，得到整数分钟
 			minuteTime = parseInt(secondTime / 60);
 			//获取秒数，秒数取佘，得到整数秒数
 			secondTime = parseInt(secondTime % 60);
 			//如果分钟大于60，将分钟转换成小时
-			if(minuteTime > 60) {
+			if (minuteTime > 60) {
 				//获取小时，获取分钟除以60，得到整数小时
 				hourTime = parseInt(minuteTime / 60);
 				//获取小时后取佘的分，获取分钟除以60取佘的分
@@ -368,42 +354,42 @@ class PathDetailIndex extends Component{
 		}
 		var result = "" + parseInt(secondTime) + "秒";
 
-		if(minuteTime > 0) {
+		if (minuteTime > 0) {
 			result = "" + parseInt(minuteTime) + "分" + result;
 		}
-		if(hourTime > 0) {
+		if (hourTime > 0) {
 			result = "" + parseInt(hourTime) + "小时" + result;
 		}
 		return result;
 	}
 
 
-	shanchuallow=(id)=>{
+	shanchuallow = (id) => {
 		this.setState({
-			user_id:id,
-			Modalstype:true,
-			Modalstopval:"你确定要删除该成员吗？",
-			cardsModalsave:this.delectshanchuallow,
-			loadtype:false
+			user_id: id,
+			Modalstype: true,
+			Modalstopval: "你确定要删除该成员吗？",
+			cardsModalsave: this.delectshanchuallow,
+			loadtype: false
 		})
 	}
 
-	delectshanchuallow=()=>{
-		let{user_id}=this.state;
-		let pathid=this.props.match.params.pathId;
-		let url="/paths/"+pathid+"/delete_member.json";
-		let param={user_id:user_id};
-		axios.delete(url,{data:param}).then((response) => {
-			if(response.data.status===1){
+	delectshanchuallow = () => {
+		let { user_id } = this.state;
+		let pathid = this.props.match.params.pathId;
+		let url = "/paths/" + pathid + "/delete_member.json";
+		let param = { user_id: user_id };
+		axios.delete(url, { data: param }).then((response) => {
+			if (response.data.status === 1) {
 				if (this.props.current_user.user_id == user_id) {
 					this.props.history.push('/paths')
 					return;
 				}
 				this.props.showNotification(response.data.message)
 				this.setState({
-					Modalstype:false,
+					Modalstype: false,
 					// Modalstopval:response.data.message,
-					loadtype:false,
+					loadtype: false,
 					// cardsModalsave:this.cardsModalsave,
 				})
 				this.updatadetailInfoList();
@@ -414,21 +400,21 @@ class PathDetailIndex extends Component{
 	}
 
 	//上移
-	moveup=(data)=>{
+	moveup = (data) => {
 		// console.log(data);
-		let pathid=this.props.match.params.pathId;
-		let url=`/paths/${pathid}/up_member_position.json`;
-		axios.post(url,{
-			user_id:data.id
+		let pathid = this.props.match.params.pathId;
+		let url = `/paths/${pathid}/up_member_position.json`;
+		axios.post(url, {
+			user_id: data.id
 		}).then((response) => {
-			if(response.status === 200){
+			if (response.status === 200) {
 				console.log("上移");
 				// console.log(this.state.detailInfoList.members);
 				// console.log(response);
 
 				this.setState({
-					detailInfoList:this.state.detailInfoList,
-					members:response.data.members
+					detailInfoList: this.state.detailInfoList,
+					members: response.data.members
 				});
 				// console.log(this.state.detailInfoList.members);
 
@@ -440,20 +426,20 @@ class PathDetailIndex extends Component{
 	}
 
 	//下移
-	movedown =(data) => {
+	movedown = (data) => {
 		// console.log(data);
-		let pathid=this.props.match.params.pathId;
-		let url=`/paths/${pathid}/down_member_position.json`;
-		axios.post(url,{
-			user_id:data.id
+		let pathid = this.props.match.params.pathId;
+		let url = `/paths/${pathid}/down_member_position.json`;
+		axios.post(url, {
+			user_id: data.id
 		}).then((response) => {
-			if( response.status === 200){
+			if (response.status === 200) {
 				console.log("下移");
 				// console.log(this.state.detailInfoList.members);
 				// console.log(response);
 				this.setState({
-					detailInfoList:this.state.detailInfoList,
-					members:response.data.members
+					detailInfoList: this.state.detailInfoList,
+					members: response.data.members
 				});
 				// console.log(this.state.detailInfoList.members);
 			}
@@ -476,12 +462,12 @@ class PathDetailIndex extends Component{
 			let righturl = "/paths/" + this.props.match.params.pathId + "/right_banner.json";
 			axios.get(righturl).then((result) => {
 				if (result.data.status === 407 || result.data.status === 401) {
-					debugger
+
 					return;
 				}
 
 				if (result.data.status === 403) {
-					debugger
+
 					// window.location.href = "/403";
 					return;
 				}
@@ -516,11 +502,11 @@ class PathDetailIndex extends Component{
 			<div onClick={() => this.modifysy(1)}>重命名</div>
 		</div>)
 	}
-	render(){
+	render() {
 
 		this.updatamakedown("shixuns_propaedeutics");
 		this.updatamakedown("subject_learning_notes");
-		let {detailInfoList,
+		let { detailInfoList,
 			clickdetailInfoListtype,
 			Modalstype,
 			Modalstopval,
@@ -541,7 +527,7 @@ class PathDetailIndex extends Component{
 
 		// console.log(MenuItemsindex)
 		// console.log(MenuItemsindextype===2&&detailInfoList&&detailInfoList.allow_statistics===false)
-		return(
+		return (
 			<div className="newContainer">
 				<style>
 					{
@@ -571,7 +557,7 @@ class PathDetailIndex extends Component{
 				>
 				</Modals>
 				<div className="newMain clearfix pathDetailIndex">
-					<DetailTop {...this.state} {...this.props} getdatasindex={(key)=>this.getdatasindex(key)} getMenuItemsindex={(key,status)=>this.getMenuItemsindex(key,status)} getlistdatas={()=>this.getlistdatas()}></DetailTop>
+					<DetailTop {...this.state} {...this.props} getdatasindex={(key) => this.getdatasindex(key)} getMenuItemsindex={(key, status) => this.getMenuItemsindex(key, status)} getlistdatas={() => this.getlistdatas()}></DetailTop>
 					<div className="educontent clearfix mb80">
 						<div className="with65 fl">
 							<div className="produce-content mb10">
@@ -587,9 +573,9 @@ class PathDetailIndex extends Component{
 									{/*}*/}
 								</p>
 								<div className="color-grey-6 clearfix">
-									<div id="shixuns_propaedeutics" className="new_li fl" style={{"padding":" 0px","textAlign": "justify;"}}>
-										{detailInfoList === undefined ? "" :detailInfoList.description===null?"":
-											<div className={"markdown-body font-14"} dangerouslySetInnerHTML={{__html: markdownToHTML(detailInfoList.description).replace(/▁/g,"▁▁▁")}}></div>
+									<div id="shixuns_propaedeutics" className="new_li fl" style={{ "padding": " 0px", "textAlign": "justify;" }}>
+										{detailInfoList === undefined ? "" : detailInfoList.description === null ? "" :
+											<div className={"markdown-body font-14"} dangerouslySetInnerHTML={{ __html: markdownToHTML(detailInfoList.description).replace(/▁/g, "▁▁▁") }}></div>
 										}
 									</div>
 								</div>
@@ -602,9 +588,9 @@ class PathDetailIndex extends Component{
 							></DetailCards>
 						</div>
 						<div className="with35 fr pl20">
-							{qrcode_img===null?"":<div className="edu-back-white newmustlearn mb10">
-	 								<img src={`${qrcode_img}`} />
-							   	<div className="font-16 color181818">优惠报名，扫码入群</div>
+							{qrcode_img === null ? "" : <div className="edu-back-white newmustlearn mb10">
+								<img src={`${qrcode_img}`} />
+								<div className="font-16 color181818">优惠报名，扫码入群</div>
 							</div>}
 							<div className="edu-back-white mustlearn mb10">
 								<p className="clearfix mb30">
@@ -619,21 +605,21 @@ class PathDetailIndex extends Component{
 									{/*}*/}
 								</p>
 								<div id="subject_learning_notes" className="color-grey-6 new_li markdown-body editormd-html-preview justify">
-									{detailInfoList === undefined ? "" :detailInfoList.learning_notes===null?"":
-										<div className={"markdown-body font-14"} dangerouslySetInnerHTML={{__html: markdownToHTML(detailInfoList.learning_notes).replace(/▁/g,"▁▁▁")}}></div>
+									{detailInfoList === undefined ? "" : detailInfoList.learning_notes === null ? "" :
+										<div className={"markdown-body font-14"} dangerouslySetInnerHTML={{ __html: markdownToHTML(detailInfoList.learning_notes).replace(/▁/g, "▁▁▁") }}></div>
 									}
 								</div>
 							</div>
-							{tags === undefined ? "" :tags === null ? "":
+							{tags === undefined ? "" : tags === null ? "" :
 								<div className="edu-back-white padding40-20 mb10 relative">
 									<p className="font-16 mb20">技能标签 <span className="color-grey-c">{tags.length}</span></p>
 
-									<div className={clickdetailInfoListtype===false?"newedbox newedboxheight":"newedbox newminheight"}>
+									<div className={clickdetailInfoListtype === false ? "newedbox newedboxheight" : "newedbox newminheight"}>
 										<div className="clearfix" id="boxheight">
 											{
-												tags && tags.map((item,key)=>{
-													return(
-														<span value={key} className = {item.status == true ? "edu-filter-btn29BD8B fl" : "newedu-filter-btn fl"}>{item.tag_name}</span>
+												tags && tags.map((item, key) => {
+													return (
+														<span value={key} className={item.status == true ? "edu-filter-btn29BD8B fl" : "newedu-filter-btn fl"}>{item.tag_name}</span>
 													)
 												})
 											}
@@ -641,22 +627,22 @@ class PathDetailIndex extends Component{
 									</div>
 
 									<Tooltip placement="bottom" title={"显示全部"}>
-										<div className={tags.length>20&&clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 fr":"newsubscript mb9 color-grey-9 none"}
-												 onClick={()=>this.clickNewsubscript(0)}
+										<div className={tags.length > 20 && clickdetailInfoListtype === false ? "newsubscript mb9 color-grey-9 fr" : "newsubscript mb9 color-grey-9 none"}
+											onClick={() => this.clickNewsubscript(0)}
 										><span className="mr8">...</span><Icon type="caret-down" />
 										</div>
 									</Tooltip>
 
 									<Tooltip placement="bottom" title={"收起"}>
-										<div className={clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 none":"newsubscript mb9 color-grey-9 fr"}
-												 onClick={()=>this.clickNewsubscript(1)}><Icon type="caret-up" />
+										<div className={clickdetailInfoListtype === false ? "newsubscript mb9 color-grey-9 none" : "newsubscript mb9 color-grey-9 fr"}
+											onClick={() => this.clickNewsubscript(1)}><Icon type="caret-up" />
 										</div>
 									</Tooltip>
 
 								</div>
 							}
 							{
-								this.props.checkIfLogin()===false?"":progress === undefined ? "" : progress === null ? "" :
+								this.props.checkIfLogin() === false ? "" : progress === undefined ? "" : progress === null ? "" :
 									<div className="edu-back-white myProgress padding40-20-30 mb10">
 										<p className="mb20">
 											<span className="font-16 mr10">关卡数</span>
@@ -668,45 +654,45 @@ class PathDetailIndex extends Component{
 											<span className="fl color-green">已学 {progress.learned}%</span>
 											<span className="fr color-grey-9" id="time-consuming">学习耗时{this.timeStamp(progress.time)} </span>
 										</p>
-										<div className="myProgressNav mb20"><div className="myProgressGreen" style={{"width":`${progress.learned+"%"}`}}></div></div>
+										<div className="myProgressNav mb20"><div className="myProgressGreen" style={{ "width": `${progress.learned + "%"}` }}></div></div>
 										<span className="font-14 color-grey-8">注: “我的进展”以已发布的实训详情关卡数为准。</span>
 									</div>
 							}
 
 							{
-								members ===undefined ?"":members === null ?"":
+								members === undefined ? "" : members === null ? "" :
 									<div className="teacherTeam edu-back-white clearfix" id="subject_members">
 										{
 											detailInfoList === undefined ?
 												<p className="font-16 clearfix">{team_title}</p> : detailInfoList.allow_add_member === true ?
-												(
-													modify === false ?
+													(
+														modify === false ?
 
-														<div>
-															<p className="font-16 clearfix fl" onDoubleClick={() => this.modifysy(1)}>{team_title}</p>
-															<Popover placement="right" content={this.maincontent()} trigger="hover">
-																<i className={"iconfont icon-sandian  fr color999"} style={{
-																	width: "30px",
-																	height: "30px",
-																	textAlign: "right",
-																}}></i>
-															</Popover>
-														</div>
-														:
-														<Modifytext {...this.props} {...this.state} pathid={this.props.match.params.pathId}
-																				modifysy={(i) => this.modifysy(i)}
-																				setteam_title={(name) => this.setteam_title(name)}></Modifytext>
-												)
+															<div>
+																<p className="font-16 clearfix fl" onDoubleClick={() => this.modifysy(1)}>{team_title}</p>
+																<Popover placement="right" content={this.maincontent()} trigger="hover">
+																	<i className={"iconfont icon-sandian  fr color999"} style={{
+																		width: "30px",
+																		height: "30px",
+																		textAlign: "right",
+																	}}></i>
+																</Popover>
+															</div>
+															:
+															<Modifytext {...this.props} {...this.state} pathid={this.props.match.params.pathId}
+																modifysy={(i) => this.modifysy(i)}
+																setteam_title={(name) => this.setteam_title(name)}></Modifytext>
+													)
 
-												: <p className="font-16 clearfix">{team_title}</p>
+													: <p className="font-16 clearfix">{team_title}</p>
 										}
 
-										{ members===undefined?
-											members && members.map((item,key)=>{
-												return(
+										{members === undefined ?
+											members && members.map((item, key) => {
+												return (
 													<div className="teacherTeamItem clearfix df" key={key}>
 														<a href={item.user_url} target="_blank" className="fl">
-															<img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
+															<img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/" + item.image_url}`)} width="80" />
 														</a>
 
 														<div className="fl ml15 flex1">
@@ -726,12 +712,12 @@ class PathDetailIndex extends Component{
 													</div>
 												)
 											})
-											:detailInfoList===undefined?"":detailInfoList.allow_add_member===true?
-												members && members.map((item,key)=>{
-													return(
+											: detailInfoList === undefined ? "" : detailInfoList.allow_add_member === true ?
+												members && members.map((item, key) => {
+													return (
 														<div className="teacherTeamItem clearfix df" key={key}>
 															<a href={item.user_url} target="_blank" className="fl">
-																<img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
+																<img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/" + item.image_url}`)} width="80" />
 															</a>
 
 															<div className="fl ml15 flex1">
@@ -739,8 +725,8 @@ class PathDetailIndex extends Component{
 																	{/* 新增role 判断是否能删除  1 管理员   2 合作者 */}
 
 																	{
-																		detailInfoList===undefined?"":detailInfoList.allow_add_member===true && item.role == 2?
-																			<a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""
+																		detailInfoList === undefined ? "" : detailInfoList.allow_add_member === true && item.role == 2 ?
+																			<a className="fr" onClick={() => this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a> : ""
 																	}
 																</p>
 																<div className="clearfix">
@@ -749,40 +735,40 @@ class PathDetailIndex extends Component{
 																	</p>
 																</div>
 																{
-																	detailInfoList===undefined?"":detailInfoList.allow_add_member===true? <div>
-																			{key!=0?<div className="fr ml15 flex1"><a onClick={()=>this.moveup(item)}><Tooltip title="上移"><i className="color-green font-18 iconfont icon-xiangshangyi"></i></Tooltip></a></div>:""}
-																			{key+1== members.length?"":<div className="fr  ml15 flex1 "><a onClick={()=>this.movedown(item)}><Tooltip title="下移"><i className="color-green font-18 iconfont icon-xiangxiayi"></i></Tooltip></a></div>}
-																		</div>
-																		:""
+																	detailInfoList === undefined ? "" : detailInfoList.allow_add_member === true ? <div>
+																		{key != 0 ? <div className="fr ml15 flex1"><a onClick={() => this.moveup(item)}><Tooltip title="上移"><i className="color-green font-18 iconfont icon-xiangshangyi"></i></Tooltip></a></div> : ""}
+																		{key + 1 == members.length ? "" : <div className="fr  ml15 flex1 "><a onClick={() => this.movedown(item)}><Tooltip title="下移"><i className="color-green font-18 iconfont icon-xiangxiayi"></i></Tooltip></a></div>}
+																	</div>
+																		: ""
 																}
 
 															</div>
 														</div>
 													)
 												})
-												: members && members.map((item,key)=>{
-												return(
-													<div className="teacherTeamItem clearfix df" key={key}>
-														<a href={item.user_url} target="_blank" className="fl">
-															<img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
-														</a>
+												: members && members.map((item, key) => {
+													return (
+														<div className="teacherTeamItem clearfix df" key={key}>
+															<a href={item.user_url} target="_blank" className="fl">
+																<img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/" + item.image_url}`)} width="80" />
+															</a>
 
-														<div className="fl ml15 flex1">
-															<p className="mb10 mt5">{item.name}
-																{/*{*/}
-																{/* detailInfoList===undefined?"":detailInfoList.allow_add_member===true?*/}
-																{/*  <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""*/}
-																{/*}*/}
-															</p>
-															<div className="clearfix">
-																<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span>
-																	{/*<span>{item.identity}</span>*/}
+															<div className="fl ml15 flex1">
+																<p className="mb10 mt5">{item.name}
+																	{/*{*/}
+																	{/* detailInfoList===undefined?"":detailInfoList.allow_add_member===true?*/}
+																	{/*  <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""*/}
+																	{/*}*/}
 																</p>
+																<div className="clearfix">
+																	<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span>
+																		{/*<span>{item.identity}</span>*/}
+																	</p>
+																</div>
 															</div>
 														</div>
-													</div>
-												)
-											})}
+													)
+												})}
 
 									</div>
 							}
diff --git a/src/modules/paths/PathDetail/sendPanel.js b/src/modules/paths/PathDetail/sendPanel.js
index a4c14f1e..1491ea90 100644
--- a/src/modules/paths/PathDetail/sendPanel.js
+++ b/src/modules/paths/PathDetail/sendPanel.js
@@ -188,6 +188,7 @@ class sendPanel extends Component{
             </Tooltip>:''
         }
 
+
         <Modal
           keyboard={false}
           title="发送至课堂"
@@ -197,11 +198,18 @@ class sendPanel extends Component{
           destroyOnClose={true}
         >
           <div className="newupload_conbox">
-            <style>{`
+            {
+              sentShixunPath&&sentShixunPath===true?<style>
+                {
+                  `
             body{
-              overflow:hidden!important;
+                 width: calc(100%) !important;
+             }
+           
+            `
+                }
+              </style>:""
             }
-          `}</style>
             <div className="mb20"
 								 // onMouseLeave={this.closeList}
 						>
diff --git a/src/modules/paths/PathNew.js b/src/modules/paths/PathNew.js
index 8fdbf918..be83125e 100644
--- a/src/modules/paths/PathNew.js
+++ b/src/modules/paths/PathNew.js
@@ -1,126 +1,124 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 
-import {getUrl,markdownToHTML} from 'educoder';
-import {Input,Button} from 'antd';
+import { Input } from 'antd';
 import TPMMDEditor from "../tpm/challengesnew/TPMMDEditor";
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+import { Link } from "react-router-dom";
 
 import axios from 'axios';
-// import '../page/tpiPage.css';
 require('codemirror/lib/codemirror.css');
 
 
 const $ = window.$;
 
-class PathNew extends Component{
-  constructor(props){
+class PathNew extends Component {
+  constructor(props) {
     super(props);
     this.contentMdRef = React.createRef();
     this.Point_editMD = React.createRef();
-    this.state={
-      pathName:"",
-      description:"",
-      point:"",
-      flag_name:true,
-			bottonloading:false
+    this.state = {
+      pathName: "",
+      description: "",
+      point: "",
+      flag_name: true,
+      bottonloading: false
     }
   }
 
   // 提交
-  submitNewPath=()=>{
-    let {pathName} = this.state;
-    if(pathName===""){
+  submitNewPath = () => {
+    let { pathName } = this.state;
+    if (pathName === "") {
       this.props.showSnackbar("请输入实践课程名称");
-      window.location.href="#part_Name";
+      window.location.href = "#part_Name";
       this.setState({
-        flag_name:false
+        flag_name: false
       })
       return;
     }
-    let des= this.contentMdRef.current.getValue().trim();
-    if(des===""){
+    let des = this.contentMdRef.current.getValue().trim();
+    if (des === "") {
       this.props.showSnackbar("请输入实践课程的简介");
-      window.location.href="#part_Des";
+      window.location.href = "#part_Des";
       return;
     }
     if (des.length > 8000) {
       this.props.showSnackbar("实践课程的简介最大限制8000个字符");
-      window.location.href="#part_Des";
+      window.location.href = "#part_Des";
       return;
     }
     let point = this.Point_editMD.current.getValue().trim();
-    if(point===""){
+    if (point === "") {
       this.props.showSnackbar("请输入实践课程的学习须知");
-      window.location.href="#part_point";
+      window.location.href = "#part_point";
       return;
     }
-    if(point.length > 2000){
+    if (point.length > 2000) {
       this.props.showSnackbar("实践课程的学习须知最大限制2000个字符");
-      window.location.href="#part_point";
+      window.location.href = "#part_point";
       return;
     }
     if (this.isEditPage == true) {
-			this.setState({
-				bottonloading:true
-			})
+      this.setState({
+        bottonloading: true
+      })
       let pathId = this.props.match.params.pathId;
 
       const editUrl = `/paths/${pathId}.json`
-      axios.put(editUrl,{
-        name:pathName,
-        description:des,
-        learning_notes:point
-      }).then((response)=>{
+      axios.put(editUrl, {
+        name: pathName,
+        description: des,
+        learning_notes: point
+      }).then((response) => {
         // console.log(response.data.subject_id);
         if (response.data.subject_id) {
           this.props.history.push(`/paths/${response.data.subject_id}`)
-        }else{
-					this.setState({
-						bottonloading:false
-					})
-				}
-      }).catch((error)=>{
+        } else {
+          this.setState({
+            bottonloading: false
+          })
+        }
+      }).catch((error) => {
         console.log(error);
-				this.setState({
-					bottonloading:false
-				})
+        this.setState({
+          bottonloading: false
+        })
       })
     } else {
-			this.setState({
-				bottonloading:true
-			})
-      let url="/paths.json"
-      axios.post(url,{
-        name:pathName,
-        description:des,
-        learning_notes:point
-      }).then((response)=>{
+      this.setState({
+        bottonloading: true
+      })
+      let url = "/paths.json"
+      axios.post(url, {
+        name: pathName,
+        description: des,
+        learning_notes: point
+      }).then((response) => {
         // console.log(response.data.subject_id);
         if (response.data.subject_id) {
           this.props.history.push(`/paths/${response.data.subject_id}`)
-        }else{
-					this.setState({
-						bottonloading:false
-					})
-				}
-      }).catch((error)=>{
+        } else {
+          this.setState({
+            bottonloading: false
+          })
+        }
+      }).catch((error) => {
         console.log(error);
-				this.setState({
-					bottonloading:false
-				})
+        this.setState({
+          bottonloading: false
+        })
       })
     }
-    
+
   }
 
   componentDidMount() {
 
-		let url = "/paths/new.json"
-		axios.get(url).then((result) => {
-			console.log(result)
-		}).catch((error) => {
-			console.log(error);
-		})
+    let url = "/paths/new.json"
+    axios.get(url).then((result) => {
+      console.log(result)
+    }).catch((error) => {
+      console.log(error);
+    })
 
 
     let pathId = this.props.match.params.pathId;
@@ -129,22 +127,22 @@ class PathNew extends Component{
 
       // const url = `/paths/${pathId}.json`
       const url = `/paths/${pathId}/edit.json`
-      axios.get(url).then((response)=>{
+      axios.get(url).then((response) => {
         /**
           description:
           id: 13
           learning_notes:
           name: 
-         */ 
-         if (response.data.name) {
+         */
+        if (response.data.name) {
           this.setState({
             pathName: response.data.name
           })
-          this.contentMdRef.current.setValue(response.data &&  response.data.description);
-          this.Point_editMD.current.setValue(response.data &&  response.data.learning_notes);
+          this.contentMdRef.current.setValue(response.data && response.data.description);
+          this.Point_editMD.current.setValue(response.data && response.data.learning_notes);
 
-         }
-      }).catch((error)=>{
+        }
+      }).catch((error) => {
         console.log(error);
       })
     } else {
@@ -153,20 +151,20 @@ class PathNew extends Component{
       this.contentMdRef.current.setValue("");
       this.Point_editMD.current.setValue("");
     }
-    
+
   }
 
-  InputName=(e)=>{
+  InputName = (e) => {
     this.setState({
-      pathName:e.target.value,
+      pathName: e.target.value,
     })
   }
 
-  render(){
+  render() {
     let pathId = this.props.match.params.pathId;
 
-    let {pathName,description,point,flag_name}=this.state;
-    return(
+    let { pathName, description, point, flag_name } = this.state;
+    return (
       <div className="newContainer">
         <div className="newMain clearfix">
           <div className="educontent mt10 mb50">
@@ -177,7 +175,7 @@ class PathNew extends Component{
                 <div className="df">
                   <span className="mr30 color-orange pt10">*</span>
                   <div className="flex1 mr20">
-                    <Input className={flag_name===true?"input-100-45 greyInput":"input-100-45 greyInput bor-red"}
+                    <Input className={flag_name === true ? "input-100-45 greyInput" : "input-100-45 greyInput bor-red"}
                       maxLength="60"
                       placeholder="例如：从Python程序设计-入门精通"
                       value={pathName}
@@ -196,9 +194,9 @@ class PathNew extends Component{
                   <div id="shixun_introduction" className="new_li">
                     {/*<textarea className="input-100-45" name="description" placeholder="请在此输入实践课程的简介" value={description}></textarea>*/}
                     <TPMMDEditor ref={this.contentMdRef} placeholder="请在此输入实践课程的简介，最大限制8000个字符" mdID={'courseContentMD'}
-                                 refreshTimeout={1500}
-                                 className="courseMessageMD"
-                      // initValue={this.state.description === null ? "" : this.state.description}
+                      refreshTimeout={1500}
+                      className="courseMessageMD"
+                    // initValue={this.state.description === null ? "" : this.state.description}
                     ></TPMMDEditor>
 
                   </div>
@@ -216,9 +214,9 @@ class PathNew extends Component{
                   <div id="shixun_propaedeutics" className="new_li ">
                     {/*<textarea name="learning_notes" placeholder="请在此输入实践课程的学习须知" value={point}></textarea>*/}
                     <TPMMDEditor ref={this.Point_editMD} placeholder="请在此输入实践课程的学习须知，最大限制2000个字符" mdID={'Point_editMDs'}
-                                 refreshTimeout={1500}
-                                 className="courseMessageMD"
-                      // initValue={this.state.description === null ? "" : this.state.description}
+                      refreshTimeout={1500}
+                      className="courseMessageMD"
+                    // initValue={this.state.description === null ? "" : this.state.description}
                     ></TPMMDEditor>
                   </div>
                   <p id="e_tip_shixun_propaedeutics" className="edu-txt-right color-grey-cd font-12"></p>
@@ -226,19 +224,19 @@ class PathNew extends Component{
                 </div>
               </div>
             </div>
-            
+
             <div className="clearfix mb30 mt30">
               <button className="defalutSubmitbtn fl mr20" loading={this.state.bottonloading} onClick={this.submitNewPath}>提交</button>
-              {this.isEditPage ? 
-                <Link to={`/paths/${this.props.match.params.pathId}`} 
-                    className="defalutCancelbtn fl">取消</Link>
+              {this.isEditPage ?
+                <Link to={`/paths/${this.props.match.params.pathId}`}
+                  className="defalutCancelbtn fl">取消</Link>
                 : <Link to={`/paths`} className="defalutCancelbtn fl">取消</Link>
-                }
+              }
             </div>
-          
+
           </div>
         </div>
-        
+
       </div>
     )
   }
diff --git a/src/modules/paths/SchoolStatistics/Statistics.js b/src/modules/paths/SchoolStatistics/Statistics.js
index dfbc5294..0bbf9df6 100644
--- a/src/modules/paths/SchoolStatistics/Statistics.js
+++ b/src/modules/paths/SchoolStatistics/Statistics.js
@@ -1,4 +1,4 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 
 import FirstTab from "./FirstTab.js";
 import SecondTab from "./SecondTab.js";
@@ -6,27 +6,27 @@ import ThirdTab from "./ThirdTab.js";
 import '../../paths/ShixunPaths.css'
 const $ = window.$;
 
-class Statistics extends Component{
-  constructor(props){
+class Statistics extends Component {
+  constructor(props) {
     super(props);
-    this.state = { 
-      tabs:1 
+    this.state = {
+      tabs: 1
     }
   }
 
-  changeTab =(index) =>{
+  changeTab = (index) => {
     let i = parseInt(index);
     this.setState({
-      tabs:i
+      tabs: i
     })
   }
   initBannerData = (data) => {
     this.setState({ ...data })
   }
 
-  render(){
-    let {tabs, course_count, learn_count, school_total_count, subject_name, subject_id} = this.state;
-    return(
+  render() {
+    let { tabs, course_count, learn_count, school_total_count, subject_name, subject_id } = this.state;
+    return (
       <div className="newContainer">
         <div className="newMain clearfix">
           <div className="subject_statistics_top">
@@ -48,27 +48,27 @@ class Statistics extends Component{
               </ul>
             </div>
           </div>
-          
+
           <div className="mb30 clearfix pl0 edu-back-white edu-txt-center statisticsNav">
             <ul className="inline">
-              <li className={tabs === 1 ? "active" : ""} onClick={()=>this.changeTab(1)}><a href="javascript:void(0)">课堂使用</a></li>
-              <li className={tabs === 2 ? "active" : ""} onClick={()=>this.changeTab(2)}><a href="javascript:void(0)">实训使用</a></li>
-              <li className={tabs === 3 ? "active" : ""} onClick={()=>this.changeTab(3)}><a href="javascript:void(0)">院校学习</a></li>
+              <li className={tabs === 1 ? "active" : ""} onClick={() => this.changeTab(1)}><a  >课堂使用</a></li>
+              <li className={tabs === 2 ? "active" : ""} onClick={() => this.changeTab(2)}><a  >实训使用</a></li>
+              <li className={tabs === 3 ? "active" : ""} onClick={() => this.changeTab(3)}><a  >院校学习</a></li>
             </ul>
           </div>
 
           <div className="educontent">
             <div id="statistics_info" className="clearfix mb30">
               {/* 课堂使用 */}
-              {tabs === 1 && 
+              {tabs === 1 &&
                 <FirstTab {...this.props} initBannerData={this.initBannerData}></FirstTab>
               }
               {/* 实训使用 */}
-              {tabs === 2 && 
+              {tabs === 2 &&
                 <SecondTab {...this.props}></SecondTab>
               }
               {/* 院校使用 */}
-              {tabs === 3 &&               
+              {tabs === 3 &&
                 <ThirdTab {...this.props}></ThirdTab>
               }
             </div>
diff --git a/src/modules/paths/ShixunPathCard.js b/src/modules/paths/ShixunPathCard.js
index 66f23669..9694cd95 100644
--- a/src/modules/paths/ShixunPathCard.js
+++ b/src/modules/paths/ShixunPathCard.js
@@ -1,86 +1,54 @@
 import React, { Component } from 'react';
-import {getImageUrl , setImagesUrl } from 'educoder';
-import { BrowserRouter as Router, Route, Link } from "react-router-dom";
-import { Tooltip} from 'antd';
+import { setImagesUrl } from 'educoder';
+import { Link } from "react-router-dom";
 import LoadingSpin from '../../common/LoadingSpin';
+import NodataPanel from '../../components/nodata-panel';
+import './ShixunPaths.css';
 
-
-class ShixunPathCard extends Component{
+class ShixunPathCard extends Component {
   constructor(props) {
     super(props)
   }
-  render(){
-    let {pathList}=this.props;
-    return(
+  render() {
+    let { pathList } = this.props;
+    return (
       <div className="educontent" id="subjects_list_content">
 
         {
-         pathList===null?<LoadingSpin/>
-				: pathList && pathList.length > 0 ?
-          (
-            <div className="square-list clearfix">
-              {
-                pathList && pathList.map((item,key)=>{
-
-                  return(
-                    <div className="squareCard" id={"item_"+key}>
-                      {/* item.tag_name === null ? "" :
-                        <div className="tag-green">
-                          <span className="tag-name">{item.tag_name}</span>
-                          <img src={getImageUrl('images/educoder/tag2.png')}/>
-                        </div> */}
-
-											{
-												item.excellent === false ? "" :
-                        <div className="tag_open">
-                          <span className="tag_open_name">开放课程</span>
+          pathList === null ? <LoadingSpin />
+            : pathList && pathList.length > 0 ?
+              (
+                <div className="square-list clearfix">
+                  {
+                    pathList && pathList.map((item, key) => {
+                      return (
+                        <div className="squareCard" id={item.id} key={item.id}>
+                          {
+                            item.excellent === false ? "" :
+                              <div className="tag_open">
+                                <span className="tag_open_name">开放课程</span>
+                              </div>
+                          }
+                          <Link to={"/paths/" + item.id} className="squareImg"  target="_blank">
+                            <img alt="详情图片" src={setImagesUrl(item.image_url)} />
+                          </Link>
+                          <div className="mt20" style={{ marginLeft: "1px" }}>
+                            <p className="task-hide mb10">
+                              <Link to={"/paths/" + item.id} className="justify cardName">{item.name}</Link>
+                            </p>
+                            <p className="clearfix squareInfo">
+                              <span className="fl pr squareLine mr20">章节: {item.stages_count}</span>
+                              <span className="fl">学习人数: {item.members_count}</span>
+                            </p>
+                          </div>
                         </div>
-											}
-
-											{/* <div className={item.allow_visit=== false ? "closeSquare" : "none"}>
-                        <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
-                            className="mt80 mb25"/>
-                        <p className="font-14 color-white">非试用内容，需要授权</p>
-                      </div> */}
-
-                      <Link to={"/paths/"+item.id} className="squareImg" >
-												{/*target="_blank"*/}
-                        <img alt="详情图片" src={setImagesUrl(item.image_url)}/>
-                      </Link>
-                      <div className="mt20" style={{marginLeft:"1px"}}>
-                        <p className="task-hide mb10">
-                          <Link to={"/paths/"+item.id}  className="justify cardName">{item.name}</Link>
-													{/*target="_blank"*/}
-                        </p>
-                        <p className="clearfix squareInfo">
-
-                          {/* <Tooltip placement="bottom" title={"章节"}> */}
-                            {/* <i className="iconfont icon-shixun fl mr3"></i> */}
-                            <span className="fl pr squareLine mr20">章节: {item.stages_count}</span>
-                          {/* </Tooltip> */}
-
-                          {/*<Tooltip placement="bottom" title={"经验值"}>*/}
-                              {/*<span className="mr10 fl squareIconSpan"><i className="iconfont icon-jingyan fl mr3"></i>{item.shixuns_count}</span>*/}
-                          {/*</Tooltip>*/}
-                          {/* <Tooltip placement="bottom" title={"学习人数"}> */}
-                            {/* <i className="iconfont icon-chengyuan fl mr3"></i> */}
-                            <span className="fl">学习人数: {item.members_count}</span>
-                          {/* </Tooltip> */}
-                        </p>
-                      </div>
-                    </div>
-                  )
-                })
-              }
-            </div>
-          ):(
-            <div className="edu-tab-con-box clearfix edu-txt-center mb50">
-              <img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-              <p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
-            </div>
-          )
+                      )
+                    })
+                  }
+                </div>
+              ) : <NodataPanel />
         }
-        
+
       </div>
     )
   }
diff --git a/src/modules/paths/ShixunPathSearch.js b/src/modules/paths/ShixunPathSearch.js
index adadc306..db7802c0 100644
--- a/src/modules/paths/ShixunPathSearch.js
+++ b/src/modules/paths/ShixunPathSearch.js
@@ -1,231 +1,268 @@
 import React, { Component } from 'react';
 import axios from 'axios';
-import {Input} from 'antd';
-import {getImageUrl} from 'educoder';
+import { Dropdown, Menu } from 'antd';
+import { getImageUrl } from 'educoder';
 import PathCard from "./ShixunPathCard";
 import UpgradeModals from '../modals/UpgradeModals';
-import Pagination from '@icedesign/base/lib/pagination';
-import '@icedesign/base/lib/pagination/style.js';
 import './ShixunPaths.css';
+import KeywordList from '../tpm/shixuns/shixun-keyword-list';
+import btnUrl from './btn-new.png';
+import Pagination from '../../components/mini-pagination'
 
-class ShixunPathSearch extends Component{
+class ShixunPathSearch extends Component {
   constructor(props) {
-      super(props)
-      this.state = {
-        order:"updated_at",
-        select:undefined,
-        search:"",
-        page:1,
-        pathList:null,
-        sortList:'',
-        total_count:0
-      }
+    super(props)
+    this.state = {
+      order: "updated_at",
+      select: undefined,
+      search: "",
+      page: 1,
+      pathList: null,
+      sortList: '',
+      total_count: 0,
+      sort: "desc",
+      limit: 16,
+      discipline_id: undefined,
+      sub_discipline_id: undefined
+    }
   }
-  //切换列表状态
-  changeStatus=(value)=>{
-  	this.setState(
-			{
-				pathList:null
-			}
-		)
-    let {select,search}=this.state;
+
+  //适配器
+  onChangeLabel(value) {
+    let rs = value === 'new' ? 'updated_at' : 'myshixuns_count'
+    let { discipline_id, sub_discipline_id } = this.state;
     this.setState({
-      order:value,
-      page:1
+      order: rs,
+      page: 1
     })
-    this.getList(value,select,search,1);
-  }
-  //搜索输入
-  inputSearchValue=(e)=>{
-    this.setState({
-      search:e.target.value,
-      page:1
-    })
-  }
-  //搜索
-  searchValue=(e)=>{
-    let {order,select,search}=this.state;
-    this.setState({
-      page:1
-    })
-    this.getList(order,select,search,1 );
+    this.getList(rs, discipline_id, sub_discipline_id, 1)
   }
+
   //选择页数
-  onChange=(pageNumber)=> {
-    let {order,select,search}=this.state;
+  onChange = (pageNumber) => {
+
+    let { order, discipline_id, sub_discipline_id } = this.state;
     this.setState({
-      page:pageNumber
+      page: pageNumber
     })
-    this.getList(order,select,search,pageNumber);
+    this.getList(order, discipline_id, sub_discipline_id, pageNumber);
   }
 
   //顶部分类
-  changeSelect=(tag_id)=>{
-		this.setState(
-			{
-				pathList:null
-			}
-		)
-    let { order,search }=this.state;
+  changeSelect = (e, tag_id, sum) => {
+
     this.setState({
-      select:tag_id
+      order: "updated_at",
+      discipline_id: tag_id,
+      page: 1,
+      sub_discipline_id: undefined
     })
-    this.getList( order,tag_id,search,1 );
+    let { order } = this.state;
+    this.getList(order, tag_id, undefined, 1);
+    e.stopPropagation();
   }
 
 
-  componentDidMount(){
-		document.title="实践课程";
-		const upsystem=`/users/system_update.json`;
-		axios.get(upsystem).then((response)=>{
-			let updata=response.data;
-			this.setState({
-				updata:updata
-			})
-		}).catch((error)=>{
-			console.log(error);
-		})
+  componentDidMount() {
+    document.title = "实践课程";
+    const upsystem = `/users/system_update.json`;
+    axios.get(upsystem).then((response) => {
+      let updata = response.data;
+      this.setState({
+        updata: updata
+      })
+    }).catch((error) => {
+      console.log(error);
+    })
+    this.getdisciplines()
+    let { order, discipline_id, sub_discipline_id, page } = this.state;
+    this.getList(order, discipline_id, sub_discipline_id, page);
 
-		let { order,select,search,page }=this.state;
-    this.getList(order,select,search,page );
   }
 
-
-  getList=(order,select,search,page )=>{
-    
-    let url='/paths.json';
-			// '?order='+order+'&page='+page;
-    // if(select!=""){
-    //   url+='&select='+select;
-    // }
-    // if(search!=""){
-    //   url+='&search='+search;
-    // }
-    axios.get(url,{params:{
-				order:order,
-				page:page,
-				select:select,
-				// search:search
-			}}).then((result)=>{
-      if(result.status==200){
+  getdisciplines = () => {
+    let url = '/disciplines.json';
+    axios.get(url, {
+      params: {
+        source: "subject"
+      }
+    }).then((result) => {
+      if (result.status == 200) {
+        // console.log(result.data.disciplines)
         this.setState({
-          sortList:result.data.tags,
-          pathList:result.data.subjects,
-          total_count:result.data.total_count
+          sortList: result.data.disciplines
         })
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
 
+  OnSearchInput = (value, type) => {
+    this.setState({
+      search: value,
+      page: 1
+    })
+    const { order, discipline_id, sub_discipline_id } = this.state
+    this.getList(order, discipline_id, sub_discipline_id, 1, value)
+  }
 
-	setHistoryFun=(url)=>{
-		this.props.history.push(url)
-	}
+  getList = (order, discipline_id, sub_discipline_id, page, keyword = '') => {
+
+    let url = '/paths.json';
+    axios.get(url, {
+      params: {
+        sort: "desc",
+        limit: 16,
+        order: order,
+        keyword,
+        page: page,
+        discipline_id: discipline_id,
+        sub_discipline_id: sub_discipline_id
+      }
+    }).then((result) => {
+      if (result.status == 200) {
+        this.setState({
+          pathList: result.data.subjects,
+          total_count: result.data.total_count
+        })
+      }
+    }).catch((error) => {
+      console.log(error);
+    })
+  }
 
   //头部获取是否已经登录了
-  getUser=(url,type)=>{
-    if(this.props.checkIfLogin()===false){
+  getUser = (url) => {
+    if (this.props.checkIfLogin() === false) {
       this.props.showLoginDialog()
       return
     }
-    if(this.props.checkIfProfileCompleted()===false){
+    if (this.props.checkIfProfileCompleted() === false) {
       this.props.showProfileCompleteDialog()
       return
     }
 
-    if(url !== undefined || url!==""){
+    if (url !== undefined || url !== "") {
       this.props.history.push(url);
     }
 
 
   }
-	render() {
-    let { order,sortList,search,page,total_count,select }=this.state;
-    let pathstype=false;
-    if(this.props&&this.props.mygetHelmetapi!=null){
-      let paths="/paths";
-      this.props.mygetHelmetapi.navbar.map((item,key)=>{
+
+  getshixunchildValues = (e, id, item) => {
+
+    this.setState({
+      discipline_id: item.id,
+      sub_discipline_id: id,
+    })
+    let { order, page } = this.state;
+    this.getList(order, item.id, id, page);
+    e.stopPropagation();
+  }
+
+  getmenu = (list, item) => {
+    return (
+      <Menu>
+        <Menu.Item>
+          <div className="mt5 subshaicontent-part">
+            <div className="sub-Item clearfix">
+              {
+                list.map((tag, e) => {
+                  return ( 
+                    <a className={parseInt(this.state.sub_discipline_id) === tag.id ? "shixun_repertoire mr20 color-blue" : "shixun_repertoire mr20"}
+                      key={e} id={tag.id} name={tag.id} rel="subshaicontent" onClick={(e) => this.getshixunchildValues(e, tag.id, item)}>{tag.name}</a>
+                  )
+                })
+              }
+            </div>
+          </div>
+        </Menu.Item>
+      </Menu>
+    )
+  }
+  render() {
+    let { order, sortList, search, page, total_count, discipline_id } = this.state;
+    let pathstype = false;
+    if (this.props && this.props.mygetHelmetapi != null) {
+      let paths = "/paths";
+      this.props.mygetHelmetapi.navbar.map((item, key) => {
         var reg = RegExp(item.link);
-        if(paths.match(reg)){
-          if(item.hidden===true){
-            pathstype=true
+        if (paths.match(reg)) {
+          if (item.hidden === true) {
+            pathstype = true
           }
         }
 
       })
     }
-      // console.log(this.props)
-      return (
-        <div>
-					{this.state.updata===undefined?"":<UpgradeModals
-							{...this.state}
-						/>}
 
-					<style>
-						{
-							`
+    return (
+      <div className='shixun-path-search-container'>
+        {this.state.updata === undefined ? "" : <UpgradeModals
+          {...this.state}
+        />}
+
+        <style>
+          {
+            `
+					     ::-webkit-scrollbar {
+                      width: 0px !important;
+               }
 							.pathImg{
 									width: 100%;
 									height: 300px;
-									background-image: url(${getImageUrl(this.props.mygetHelmetapi&&this.props.mygetHelmetapi.subject_banner_url===null?`images/path/path.png`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.subject_banner_url)});
+									background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.subject_banner_url === null ? `images/path/path.png` : this.props.mygetHelmetapi && this.props.mygetHelmetapi.subject_banner_url)});
 									background-color: #000a4f;
 									/* background-size: cover; */
 									background-position: center;
 									background-repeat: no-repeat;
 								}
+								.ant-dropdown-menu{
+								 max-width:1000px;
+								}
+								.ant-dropdown-menu-item, .ant-dropdown-menu-submenu-title{
+								    white-space: normal !important;
+								     line-height: 28px !important;
+								}
+								.ant-dropdown-menu-item:hover, .ant-dropdown-menu-submenu-title:hover{
+								    background-color: #fff !important;
+								}
+								a{text-decoration:none !important;}
 							`
-						}
-					</style>
-          <div className="pr">
-            <div className="pathImg"></div>
-            <div className="edu-back-white padding20 pathIndexNav">
-              <ul className="educontent clearfix">
-                  <li className={select > 0 ? "" : "active"}><a onClick={()=>this.changeSelect(null)}>全部</a></li>
-                  {
-                    sortList && sortList.map((item,key)=>{
-                      return(
-                        <li className={select == `${item.tag_id}` ? "active" : ""}><a value={item.tag_id} onClick={()=>this.changeSelect(`${item.tag_id}`)}>{item.tag_name}</a></li>
-                      )
-                    })
-                  }
-              </ul>
-            </div>
-          </div>
-          <div className="mt20 educontent mb20 clearfix mainPageArray">
-            {/*<a href="javascript:void(0)" className={ order == "publish_time" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"} onClick={ () => this.changeStatus("publish_time")}>全部</a>*/}
-            {/*<a href="javascript:void(0)" className={ order == "mine" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"} onClick={ () => this.changeStatus("mine")}>我的</a>*/}
-            <span className={ order == "updated_at" ? "active" : ""} onClick={ () => this.changeStatus("updated_at")}>最新</span>
-            <span className={ order == "myshixun_count" ? "active" : ""} onClick={ () => this.changeStatus("myshixun_count")}>最热</span>
-            {this.props.user&&this.props.user.main_site===false?"":this.props.Headertop===undefined?"":<a className={  "fr font-16 bestChoose color-blue"  }  onClick={(url)=>this.getUser("/paths/new")}>+新建实践课程</a>}
-            {this.props.user&&this.props.user.main_site===true?"":this.props.Headertop===undefined?"":
-              pathstype===true?"":this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.is_teacher===true||this.props.user&&this.props.user.business===true?<a className={  "fr font-16 bestChoose color-blue"  }  onClick={(url)=>this.getUser("/paths/new")}>+新建实践课程</a>:""
-            }
-            {/*<div className="fr mr5 search-new">*/}
-              {/*/!* <Search*/}
-              {/*placeholder="请输入路径名称进行搜索"*/}
-              {/*id="subject_search_input"*/} 
-              {/*value={search}*/}
-              {/*onInput={this.inputSearchValue}*/}
-              {/*onSearch={this.searchValue}*/}
-              {/*autoComplete="off"*/}
-              {/*></Search> *!/*/}
-            {/*</div>*/}
-          </div>
-          <PathCard {...this.props} {...this.state}></PathCard>
-          {
-						this.state.pathList===null?"":total_count > 16 &&
-            <div className="educontent mb80 edu-txt-center mt10">
-							<Pagination  current={page} total={ total_count || 1299 } type="mini" pageSize={16}  onChange={this.onChange} />
-            </div>
           }
-
+        </style>
+        <div className="pr">
+          <div className="pathImg"></div>
+          <div className="edu-back-white padding20 pathIndexNav">
+            <ul className="educontent clearfix">
+              <li className={discipline_id > 0 ? "" : "active"}><a onClick={(e) => this.changeSelect(e, undefined)}>全部</a></li>
+              {
+                sortList && sortList.map((item, key) => {
+                  return (
+                    <li className={discipline_id == `${item.id}` ? "active" : ""} onClick={(e) => this.changeSelect(e, `${item.id}`, item.sub_disciplines.length)} key={key}>
+                      <Dropdown overlayStyle={{width:600}} disabled={item.sub_disciplines.length === 0} overlay={() => this.getmenu(item.sub_disciplines, item)} placement="bottomLeft">
+                        <a value={item.id}>{item.name}</a>
+                      </Dropdown>
+                    </li>
+                  )
+                })
+              }
+            </ul>
+          </div>
         </div>
-      )
+        <KeywordList btnUrl={btnUrl} onChangeLabel={this.onChangeLabel.bind(this)} OnSearchInput={this.OnSearchInput.bind(this)} onNewHandler={this.getUser.bind(this, '/paths/new')} btnStyle={{ top: '72px' }} />
+
+        <PathCard {...this.props} {...this.state}></PathCard>
+        {
+          this.state.pathList === null ? "" : total_count > 16 &&
+            <div className="educontent mb80 edu-txt-center mt10">
+              <Pagination current={page} total={total_count || 1299} type="mini" pageSize={16} onChange={this.onChange} />
+            </div>
+        }
+
+      </div>
+    )
   }
 }
 export default ShixunPathSearch;
-
-
-//         <Pagination showQuickJumper defaultCurrent={page} current={page} pageSize={16} total={total_count} onChange={this.onChange} />
diff --git a/src/modules/paths/ShixunPaths.css b/src/modules/paths/ShixunPaths.css
index 80279555..4136a835 100644
--- a/src/modules/paths/ShixunPaths.css
+++ b/src/modules/paths/ShixunPaths.css
@@ -1,39 +1,45 @@
-.pathImg{
+.pathImg {
   background: #4CACFF
 }
-.pathIndexNav{
-  box-shadow:0px 4px 8px 0px rgba(0,0,0,0.04);
+
+.pathIndexNav {
+  box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.04);
 }
-.pathIndexNav ul li{
+
+.pathIndexNav ul li {
   float: left;
   margin-right: 10px;
 }
-.pathIndexNav ul li a{
+
+.pathIndexNav ul li a {
   display: block;
   font-size: 15px;
   color: #333333;
-  padding:0px 20px;
-  border-radius:18px;
+  padding: 0px 20px;
+  border-radius: 18px;
   height: 32px;
   line-height: 32px;
-  margin:5px 0px;
+  margin: 5px 0px;
 }
-.pathIndexNav ul li.active a,.pathIndexNav ul li:hover a{
+
+.pathIndexNav ul li.active a,
+.pathIndexNav ul li:hover a {
   background: #DDECF9;
   color: #4CACFF
 }
+
 /*.pathImg{*/
-  /*width: 100%;*/
-  /*height: 300px;*/
-  /*background-image: url(../../images/path/path.png);*/
-  /*background-color: #000a4f;*/
-  /*!* background-size: cover; *!*/
-  /*background-position: center;*/
-  /*background-repeat: no-repeat;*/
+/*width: 100%;*/
+/*height: 300px;*/
+/*background-image: url(../../images/path/path.png);*/
+/*background-color: #000a4f;*/
+/*!* background-size: cover; *!*/
+/*background-position: center;*/
+/*background-repeat: no-repeat;*/
 /*}*/
 
 /* 首页-最新最热 */
-.mainPageArray span{
+.mainPageArray span {
   font-size: 14px;
   float: left;
   background: #EBEBEB;
@@ -45,13 +51,14 @@
   cursor: pointer;
   border-radius: 15px;
 }
-.mainPageArray span.active{
+
+.mainPageArray span.active {
   background: #4CACFF;
   color: #fff;
 }
 
 /* path-card */
-.squareCard{
+.squareCard {
   position: relative;
   width: 280px;
   margin-right: 26px;
@@ -59,10 +66,12 @@
   float: left;
   border-radius: 6px;
 }
-.squareCard:nth-child(4n){
+
+.squareCard:nth-child(4n) {
   margin-right: 0px;
 }
-.squareCard .squareImg{
+
+.squareCard .squareImg {
   height: 175px;
   width: 280px;
   overflow: hidden;
@@ -70,7 +79,8 @@
   border-radius: 6px;
   position: relative;
 }
-.squareCard .squareImg img{
+
+.squareCard .squareImg img {
   transition: all 1s;
   -webkit-transition: all 1s;
   -o-transition: all 1s;
@@ -78,12 +88,13 @@
   position: absolute;
   top: -17.5px;
 }
-.squareCard .squareImg img:hover{
+
+.squareCard .squareImg img:hover {
   transform: scale(1.05);
 }
 
 /* card info */
-.cardName{
+.cardName {
   font-size: 16px;
   font-weight: 600;
   height: 20px;
@@ -91,16 +102,17 @@
   margin-bottom: 10px;
 }
 
-.squareLine:after{
+.squareLine:after {
   position: absolute;
   width: 1px;
   height: 10px;
   background: #adadad;
   content: '';
   right: -10px;
-  top:4px;
+  top: 4px;
 }
-.squareInfo{
+
+.squareInfo {
   color: #777;
   font-size: 12px;
   font-weight: 400;
@@ -115,6 +127,7 @@
   top: 12px;
   z-index: 1;
 }
+
 .tag_open .tag_open_name {
   display: block;
   width: auto;
@@ -130,11 +143,11 @@
 
 
 
-.paragraph:hover .status_li a{
+.paragraph:hover .status_li a {
   display: block;
 }
 
-.newedu-filter-btn{
+.newedu-filter-btn {
   display: block;
   float: left;
   padding: 0 9px;
@@ -147,7 +160,7 @@
   margin-bottom: 9px;
 }
 
-.edu-filter-btn29BD8B{
+.edu-filter-btn29BD8B {
   display: block;
   float: left;
   padding: 0 9px;
@@ -160,115 +173,163 @@
   margin-bottom: 9px;
 }
 
-.lesson-saved-list-item{
-  border-bottom: none!important;
+.lesson-saved-list-item {
+  border-bottom: none !important;
   margin-bottom: 10px;
   background-color: #fff;
 }
 
-.click_add{
-  border-top: none!important;
+.click_add {
+  border-top: none !important;
+}
+
+.white-panel li {
+  border: 1px solid #fafafa !important;
+}
+
+.white-panel li.active {
+  border: 1px solid #4CACFF !important;
 }
-.white-panel li{border:1px solid #fafafa!important;}
-.white-panel li.active{border:1px solid #4CACFF!important;}
 
 /* 选择实训列表 */
-.greybackHead{height: 40px;line-height: 40px;padding: 0px 20px;box-sizing: border-box;color: #676767;background-color: #eaeaea;}
-
-.mtf3{
-  margin-top:-3px;
+.greybackHead {
+  height: 40px;
+  line-height: 40px;
+  padding: 0px 20px;
+  box-sizing: border-box;
+  color: #676767;
+  background-color: #eaeaea;
 }
 
-.mtf5{
+.mtf3 {
+  margin-top: -3px;
+}
+
+.mtf5 {
   margin-top: -5px;
 }
 
-.color204{
-    color:rgba(204,204,204,1);
+.color204 {
+  color: rgba(204, 204, 204, 1);
 }
 
-.lesson-saved-list-itemdrop{
-    height: 93px;
-    overflow: hidden;
+.lesson-saved-list-itemdrop {
+  height: 93px;
+  overflow: hidden;
 }
 
-.lesson-saved-list{
-    position: relative;
+.lesson-saved-list {
+  position: relative;
 }
 
-.itempositionleft{
-    position: absolute;
+.itempositionleft {
+  position: absolute;
 }
 
-.itempositionright{
-    position: absolute;
+.itempositionright {
+  position: absolute;
 }
 
-.ant-input{
-  background-color: #fafafa!important;
-}
-.ant-input:focus{
-  background-color:#ffffff!important; 
+.ant-input {
+  background-color: #fafafa !important;
 }
 
-.pathNavLine{bottom: -11px;}
-
-#shixun_operation:hover{
-    color:#fff !important;
+.ant-input:focus {
+  background-color: #ffffff !important;
 }
 
-.cursor{
-    cursor: pointer;
+.pathNavLine {
+  bottom: -11px;
 }
-.paragraph_nameid:hover{
-    color:#4cacff !important;
+
+#shixun_operation:hover {
+  color: #fff !important;
 }
+
+.cursor {
+  cursor: pointer;
+}
+
+.paragraph_nameid:hover {
+  color: #4cacff !important;
+}
+
 /* 学习统计 */
-.statisticsNav{height: 100px;}
-.statisticsNav ul{margin-top: 35px;}
-.statisticsNav ul li{float: left;font-size: 18px;color: #4D4D4D;height: 64px;line-height: 64px;margin:0px 30px;cursor: pointer;}
-.statisticsNav ul li a{color: #4D4D4D!important;}
-.statisticsNav ul li.active{color: #05101A;border-bottom: 2px solid #05101A;}
-.statisticsNav ul li.active a{color: #05101A!important; text-decoration: none !important;}
-
-
-.next-loading{
-     width:100%;
- }
-
-.paddingleft22{
-    text-align: left;
-    padding-left: 22px;
+.statisticsNav {
+  height: 100px;
 }
 
-.paddingl5{
-    padding-left: 5px;
+.statisticsNav ul {
+  margin-top: 35px;
 }
 
-.paddingl10{
-    padding-left: 10px;
+.statisticsNav ul li {
+  float: left;
+  font-size: 18px;
+  color: #4D4D4D;
+  height: 64px;
+  line-height: 64px;
+  margin: 0px 30px;
+  cursor: pointer;
 }
 
-.red{
-    color:red;
+.statisticsNav ul li a {
+  color: #4D4D4D !important;
 }
 
-.pl38{
-    padding-left: 38px;
+.statisticsNav ul li.active {
+  color: #05101A;
+  border-bottom: 2px solid #05101A;
 }
-.ml37{
-    margin-left: 37px;
+
+.statisticsNav ul li.active a {
+  color: #05101A !important;
+  text-decoration: none !important;
+}
+
+
+.next-loading {
+  width: 100%;
+}
+
+.paddingleft22 {
+  text-align: left;
+  padding-left: 22px;
+}
+
+.paddingl5 {
+  padding-left: 5px;
+}
+
+.paddingl10 {
+  padding-left: 10px;
+}
+
+.red {
+  color: red;
+}
+
+.pl38 {
+  padding-left: 38px;
+}
+
+.ml37 {
+  margin-left: 37px;
 }
 
 .newmustlearn {
-    padding: 34px 25px;
-    text-align: center;
+  padding: 34px 25px;
+  text-align: center;
 }
 
-.color181818{
-    color: #181818;
+.color181818 {
+  color: #181818;
 }
 
-.colorD5D8D6{
-  color:#D5D8D6;
+.colorD5D8D6 {
+  color: #D5D8D6;
+}
+
+.shixun-path-search-container .search-keyword-container {
+  padding: 20px 0 0 0;
 }
\ No newline at end of file
diff --git a/src/modules/paths/btn-new.png b/src/modules/paths/btn-new.png
new file mode 100644
index 00000000..b900fa1f
Binary files /dev/null and b/src/modules/paths/btn-new.png differ
diff --git a/src/modules/paths/statics/DisplayTableData.js b/src/modules/paths/statics/DisplayTableData.js
index e25e401e..17e034eb 100644
--- a/src/modules/paths/statics/DisplayTableData.js
+++ b/src/modules/paths/statics/DisplayTableData.js
@@ -6,49 +6,63 @@
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-01-14 16:30:05
  */
-import './index.scss';
-import React, { useRef, useState, useEffect } from 'react';
-import { Table } from 'antd';
-import ReactDom from 'react-dom';
+import "./index.scss";
+import React, { useRef, useState, useEffect } from "react";
+import { Table } from "antd";
+import ReactDom from "react-dom";
 
 const DisplayTableData = (props) => {
-  const {columns, datas, fetchData, total} = props;
+  const {
+    columns,
+    datas,
+    fetchData,
+    total,
+    paginationProps,
+    handleTableChange,
+  } = props;
   let tableEl = useRef(null);
   const [loading, setLoading] = useState(false);
 
   const renderFooter = (obj = {}) => {
-    const {course_count, student_count, choice_shixun_num, choice_shixun_frequency, total} = obj;
-    if (!obj) return ''
+    const {
+      course_count,
+      student_count,
+      choice_shixun_num,
+      choice_shixun_frequency,
+      total,
+    } = obj;
+    if (!obj) return "";
     else {
       return (
         <ul className="footer_list">
           <li className="footer_item footer-total">总计</li>
-          <li className="footer_name">{total || '-'}</li>
-          <li className="footer_item">{course_count || '-'}</li>
-          <li className="footer_item">{student_count || '-'}</li>
-          <li className="footer_item">{choice_shixun_num || '-'}</li>
-          <li className="footer_item">{choice_shixun_frequency || '-'}</li>
+          <li className="footer_name">{total || "-"}</li>
+          <li className="footer_item">{course_count || "-"}</li>
+          <li className="footer_item">{student_count || "-"}</li>
+          <li className="footer_item">{choice_shixun_num || "-"}</li>
+          <li className="footer_item">{choice_shixun_frequency || "-"}</li>
         </ul>
-      )
+      );
     }
-  }
+  };
 
   useEffect(() => {
     const table = ReactDom.findDOMNode(tableEl);
     // console.log(table);
-    const tableBody = table.querySelector('.ant-table-body');
-    let _scrollTop = 0;//保存上次滚动距离
-    let isRun = false;//是否执行查询
-    tableBody.addEventListener('scroll', () => {
-      if(tableBody.scrollTop === 0 ){
+    const tableBody = table.querySelector(".ant-table-body");
+    let _scrollTop = 0; //保存上次滚动距离
+    let isRun = false; //是否执行查询
+    tableBody.addEventListener("scroll", () => {
+      if (tableBody.scrollTop === 0) {
         _scrollTop = 0;
       }
       // 上一次滚动高度与当前滚动高度不同则是纵向滚动
       if (_scrollTop !== tableBody.scrollTop) {
         //是否滑动到距离底部40px的位置
-        const scorll = _scrollTop >= tableBody.scrollHeight-tableBody.clientHeight-40;
+        const scorll =
+          _scrollTop >= tableBody.scrollHeight - tableBody.clientHeight - 40;
         //isRun为true时 代表已经执行查询
-        if(isRun && scorll){
+        if (isRun && scorll) {
           return;
         }
         //_scrollTop < tableBody.scrollTop 判断是否向下滑动
@@ -59,22 +73,22 @@ const DisplayTableData = (props) => {
           fetchData && fetchData();
         }
       }
-    })
+    });
   }, []);
-
   return (
     <Table
-      className='static_table'
-      rowKey={record => record.id}
+      className="static_table"
+      rowKey={(record) => record.id}
       columns={columns}
       dataSource={datas}
-      pagination={false}
       loading={loading}
       // scroll={{y: 500}}
-      ref={(ref)=>tableEl=ref}
-      footer={total ? () => renderFooter(total) : ''}
+      ref={(ref) => (tableEl = ref)}
+      footer={total ? () => renderFooter(total) : ""}
+      pagination={paginationProps}
+      onChange={handleTableChange}
     />
   );
-}
+};
 
-export default DisplayTableData;
\ No newline at end of file
+export default DisplayTableData;
diff --git a/src/modules/paths/statics/index.js b/src/modules/paths/statics/index.js
index 6b14f118..01e7c8c7 100644
--- a/src/modules/paths/statics/index.js
+++ b/src/modules/paths/statics/index.js
@@ -6,186 +6,206 @@
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-02-14 17:51:48
  */
-import './index.scss';
-import React, { useEffect } from 'react';
-import StaticNumberAndTxt from './StaticNumberAndTxt';
-import DisplayTableData from './DisplayTableData';
-import { Tabs, Tooltip } from 'antd';
-import { connect } from 'react-redux';
-import moment from 'moment';
-import actions from '../../../redux/actions';
+import "./index.scss";
+import React, { useEffect } from "react";
+import StaticNumberAndTxt from "./StaticNumberAndTxt";
+import DisplayTableData from "./DisplayTableData";
+import { Tabs, Tooltip, Pagination } from "antd";
+import { connect } from "react-redux";
+import moment from "moment";
+import actions from "../../../redux/actions";
+
+// function PadZero(str) {
+//   //补零
+//   return new RegExp(/^\d$/g).test(str) ? `0${str}` : str;
+// }
+const formatTime = (_seconds) => {
+  _seconds = parseInt(_seconds, 10);
+  let hours, mins, seconds;
+  let result = "";
+  seconds = parseInt(_seconds % 60, 10);
+  mins = parseInt((_seconds % 3600) / 60, 10);
+  hours = parseInt(_seconds / 3600, 10);
+
+  if (hours) {
+    result = `${hours}小时${mins}分${seconds}秒`;
+  } else if (mins) {
+    result = `${mins}分${seconds}秒`;
+  } else {
+    result = `${seconds}秒`;
+  }
+  return result;
+};
 const { TabPane } = Tabs;
 const App = (props) => {
-
   const {
     subject_info,
     other_info,
     total,
     staticList,
     changeParams,
-    initTotal
+    initTotal,
+    total_count,
+    params,
   } = props;
   // const [datas, setDatas] = useState([]);
   // const [sortedInfo, setSortedInfo] = useState({});
   // console.log(props);
-  const {pathId} = props.match.params;
+  const { pathId } = props.match.params;
   const columns = [
     {
-      title: '序号',
-      dataIndex: 'id',
-      key: 'id',
+      title: "序号",
+      dataIndex: "id",
+      key: "id",
       render: (text, record, i) => i + 1,
       width: 100,
-      align: 'center'
+      align: "center",
     },
     {
-      title: '使用单位',
+      title: "使用单位",
       // key: 'school_name',
-      dataIndex: 'school_name',
+      dataIndex: "school_name",
       // width: 300,
-      className: 'overflow_hidden',
-      align: 'center'
+      className: "overflow_hidden",
+      align: "center",
     },
     {
       // title: '使用课堂/个',
-      title: () => (<Tooltip title="将该课程使用到课堂的数量">使用课堂</Tooltip>),
+      title: () => <Tooltip title="将该课程使用到课堂的数量">使用课堂</Tooltip>,
       // key: 'course_count',
       width: 150,
-      dataIndex: 'course_count',
-      align: 'center',
-      sorter: (a, b) => a.course_count - b.course_count,
-      // sortOrder: sortedInfo.columnKey === 'age' && sortedInfo.order
-      // sorter: (a, b) => true,
-      // sorter: (a, b) => a.age - b.age
+      dataIndex: "course_count",
+      align: "center",
+      sorter: true,
     },
     {
-      title: () => (<Tooltip title="课堂的学生总数（去掉重复）">课堂学生</Tooltip>),
+      title: () => (
+        <Tooltip title="课堂的学生总数（去掉重复）">课堂学生</Tooltip>
+      ),
       // key: 'student_count',
-      width:150,
-      dataIndex: 'student_count',
-      align: 'center',
-      defaultSortOrder: 'descend',
-      sorter: (a, b) => a.student_count - b.student_count,
-      // sorter: (a, b) => a.age - b.age
+      width: 150,
+      dataIndex: "student_count",
+      align: "center",
+      sorter: true,
     },
     {
-      title: () => (<Tooltip title="选用该课程实训的个数（去重）">选用实训/个</Tooltip>),
+      title: () => (
+        <Tooltip title="选用该课程实训的个数（去重）">选用实训/个</Tooltip>
+      ),
       width: 150,
       // key: 'choice_shixun_num',
-      dataIndex: 'choice_shixun_num',
-      align: 'center',
-      sorter: (a, b) => a.choice_shixun_num - b.choice_shixun_num,
-      // sorter: (a, b) => a.age - b.age
+      dataIndex: "choice_shixun_num",
+      align: "center",
+      sorter: true,
     },
     {
-      title: () => (<Tooltip title="选用该课程实训的次数">选用实训/次</Tooltip>),
+      title: () => <Tooltip title="选用该课程实训的次数">选用实训/次</Tooltip>,
       width: 150,
       // key: 'choice_shixun_frequency',
-      dataIndex: 'choice_shixun_frequency',
-      align: 'center',
-      sorter: (a, b) => a.choice_shixun_frequency - b.choice_shixun_frequency,
-      // sorter: (a, b) => a.bbb - b.bbb
-    }
+      dataIndex: "choice_shixun_frequency",
+      align: "center",
+      sorter: true,
+    },
   ];
   const sxColumns = [
     {
-      title: '序号',
-      dataIndex: 'id',
+      title: "序号",
+      dataIndex: "id",
       render: (text, record, i) => i + 1,
       width: 60,
-      align: 'center'
-    }, {
-      title: '章节',
-      dataIndex: 'stage',
-      width: 80,
-      align: 'center'
+      align: "center",
     },
     {
-      title: '实训名称',
-      dataIndex: 'shixun_name',
-      align: 'center',
+      title: "章节",
+      dataIndex: "stage",
+      width: 80,
+      align: "center",
+    },
+    {
+      title: "实训名称",
+      dataIndex: "shixun_name",
+      align: "center",
       // ellipsis: true
     },
     {
-      title: '关卡数',
-      dataIndex: 'challenge_count',
+      title: "关卡数",
+      dataIndex: "challenge_count",
       width: 100,
-      align: 'center'
+      align: "center",
     },
     {
-      title: '使用课堂',
-      dataIndex: 'course_count',
+      title: "使用课堂",
+      dataIndex: "course_count",
       width: 110,
-      align: 'center',
-      sorter: (a, b) => a.course_count - b.course_count
+      align: "center",
+      sorter: true,
     },
     {
-      title: '使用单位',
-      dataIndex: 'school_count',
+      title: "使用单位",
+      dataIndex: "school_count",
       width: 110,
-      align: 'center',
-      sorter: (a, b) => a.school_count - b.school_count
+      align: "center",
+      sorter: true,
     },
     {
-      title: '使用人数',
-      dataIndex: 'used_count',
+      title: "使用人数",
+      dataIndex: "used_count",
       width: 110,
-      align: 'center',
-      sorter: (a, b) => a.used_count - b.used_count
+      align: "center",
+      sorter: true,
     },
     {
-      title: '通关人数',
-      dataIndex: 'passed_count',
+      title: "通关人数",
+      dataIndex: "passed_count",
       width: 110,
-      align: 'center',
-      sorter: (a, b) => a.passed_count - b.passed_count
+      align: "center",
+      sorter: true,
     },
     {
-      title: '评测次数',
-      dataIndex: 'evaluate_count',
+      title: "评测次数",
+      dataIndex: "evaluate_count",
       width: 110,
-      align: 'center',
-      sorter: (a, b) => a.evaluate_count - b.evaluate_count
+      align: "center",
+      sorter: true,
     },
     {
-      title: '通关平均时间',
-      dataIndex: 'passed_ave_time',
+      title: "通关平均时间",
+      dataIndex: "passed_ave_time",
       width: 140,
-      align: 'center',
-      render: (text) => (text && moment(text).format('HH:mm:ss')) || '-',
-      sorter: (a, b) => a.passed_ave_time - b.passed_ave_time
-    }
+      align: "center",
+      render: (text) => (text && formatTime(text)) || "-",
+      sorter: true,
+    },
   ];
   const stColumns = [
     {
-      title: '序号',
-      dataIndex: 'id',
+      title: "序号",
+      dataIndex: "id",
       render: (text, record, i) => i + 1,
       width: 60,
-      align: 'center'
+      align: "center",
     },
     {
-      title: '姓名',
-      dataIndex: 'username',
-      align: 'center',
-      width: 200
+      title: "姓名",
+      dataIndex: "username",
+      align: "center",
+      width: 200,
     },
     {
-      title: '通关实训数',
-      dataIndex: 'passed_myshixun_count',
-      align: 'center',
+      title: "通关实训数",
+      dataIndex: "passed_myshixun_count",
+      align: "center",
       with: 130,
-      render: (val) => val + '',
-      sorter: (a, b) => a.passed_myshixun_count - b.passed_myshixun_count
+      render: (val) => val + "",
+      sorter: true,
     },
     {
-      title: '完成关卡',
-      dataIndex: 'passed_games_count',
-      align: 'center',
+      title: "完成关卡",
+      dataIndex: "passed_games_count",
+      align: "center",
       with: 130,
-      render: (val) => val + '',
-      defaultSortOrder: 'descend',
-      sorter: (a, b) => a.passed_games_count - b.passed_games_count
+      render: (val) => val + "",
+      sorter: true,
     },
     // {
     //   title: '代码行',
@@ -196,33 +216,34 @@ const App = (props) => {
     //   sorter: (a, b) => a.code_line_count - b.code_line_count
     // },
     {
-      title: '评测次数',
-      dataIndex: 'evaluate_count',
-      align: 'center',
+      title: "评测次数",
+      dataIndex: "evaluate_count",
+      align: "center",
       with: 130,
-      render: (val) => val + '',
-      sorter: (a, b) => a.evaluate_count - b.evaluate_count
+      render: (val) => val + "",
+      sorter: true,
     },
     {
-      title: '所用时间',
-      dataIndex: 'cost_time',
-      align: 'center',
+      title: "所用时间",
+      dataIndex: "cost_time",
+      align: "center",
       with: 200,
-      render: (text) => (text && moment(text).format('HH:mm:ss')) || '-',
-      sorter: (a, b) => a.cost_time - b.cost_time
-    }
+      render: (text) => (text && formatTime(text)) || "-",
+      sorter: true,
+    },
   ];
 
   useEffect(() => {
     changeParams({
-      page: 1
+      page: 1,
+      type: "subject_info",
     });
     pathId && staticList(pathId);
   }, []);
 
   const handleFetchData = () => {
     pathId && staticList(pathId);
-  }
+  };
 
   // const {
   //   study_count,
@@ -234,9 +255,9 @@ const App = (props) => {
   // } = subject_info;
 
   const maps = {
-    1: 'subject_info', // 实践课程使用情况
-    2: 'shixun_info', // 实训使用情况
-    3: 'user_info' // 用户使用情况
+    1: "subject_info", // 实践课程使用情况
+    2: "shixun_info", // 实训使用情况
+    3: "user_info", // 用户使用情况
   };
 
   const handleTabChange = (key) => {
@@ -244,14 +265,44 @@ const App = (props) => {
     // console.log(type);
     const params = {
       page: 1,
-      type: type
-    }
+      type: type,
+      sort_by: undefined,
+      sort_direction: undefined,
+    };
     // 恢复初始值
     changeParams(params);
     initTotal();
     pathId && staticList(pathId);
-  }
-
+  };
+  const paginationProps = {
+    hideOnSinglePage: true,
+    current: params.page,
+    pageSize: params.limit,
+    total: total_count,
+    onChange: (page, pageSize) => {
+      changeParams({
+        page,
+        limit: pageSize,
+      });
+      handleFetchData();
+    },
+  };
+  //改为后端排序 issues/29182
+  const handleTableChange = (pagination, filters, sorter) => {
+    console.log(pagination, filters, sorter);
+    const { field, order } = sorter;
+    let sort_direction;
+    if (order === "descend") {
+      sort_direction = "desc";
+    } else if (order === "ascend") {
+      sort_direction = "asc";
+    }
+    changeParams({
+      sort_by: sort_direction ? field : undefined,
+      sort_direction,
+    });
+    handleFetchData();
+  };
   return (
     <div className="static_wrap">
       <div className="ant-spin-container">
@@ -263,89 +314,116 @@ const App = (props) => {
             </div>
             <div className="header-number header-flex">
               <StaticNumberAndTxt
-                count={subject_info===null?0:subject_info.study_count} // 总数
-                txt={'学习总人数'} // 文字描述
-                desc={'学习该课程的全部人数（学习总人数=课堂学习人数+自主学习人数）'}
+                count={subject_info === null ? 0 : subject_info.study_count} // 总数
+                txt={"学习总人数"} // 文字描述
+                desc={
+                  "学习该课程的全部人数（学习总人数=课堂学习人数+自主学习人数）"
+                }
               />
               <StaticNumberAndTxt
-                count={subject_info===null?0:subject_info.course_study_count} // 总数
-                txt={'课堂学习人数'} // 文字描述
-                desc={'通过课堂学习该课程的人数'}
+                count={
+                  subject_info === null ? 0 : subject_info.course_study_count
+                } // 总数
+                txt={"课堂学习人数"} // 文字描述
+                desc={"通过课堂学习该课程的人数"}
               />
               <StaticNumberAndTxt
-                count={subject_info===null?0:subject_info.initiative_study} // 总数
-                txt={'自主学习人数'} // 文字描述
-                desc={'通过自主学习该课程的人数'}
+                count={
+                  subject_info === null ? 0 : subject_info.initiative_study
+                } // 总数
+                txt={"自主学习人数"} // 文字描述
+                desc={"通过自主学习该课程的人数"}
               />
               <StaticNumberAndTxt
-                count={subject_info===null?0:subject_info.passed_count} // 总数
-                txt={'通关总人数'} // 文字描述
-                desc={'通关该课程所有实训的人数（去重。一个人数计算1次）'}
+                count={subject_info === null ? 0 : subject_info.passed_count} // 总数
+                txt={"通关总人数"} // 文字描述
+                desc={"通关该课程所有实训的人数（去重。一个人数计算1次）"}
               />
               <StaticNumberAndTxt
-                count={subject_info===null?0:subject_info.course_used_count} // 总数
-                txt={'使用课堂数'} // 文字描述
-                desc={'使用该课程的课堂数量'}
+                count={
+                  subject_info === null ? 0 : subject_info.course_used_count
+                } // 总数
+                txt={"使用课堂数"} // 文字描述
+                desc={"使用该课程的课堂数量"}
               />
               <StaticNumberAndTxt
-                count={subject_info===null?0:subject_info.school_used_count} // 总数
-                txt={'使用单位数'} // 文字描述
-                desc={'使用该课程的单位数量（包括自主学习者所在单位）'}
+                count={
+                  subject_info === null ? 0 : subject_info.school_used_count
+                } // 总数
+                txt={"使用单位数"} // 文字描述
+                desc={"使用该课程的单位数量（包括自主学习者所在单位）"}
               />
             </div>
           </section>
           <section className="static_section_table">
-            <Tabs defaultActiveKey="1" onChange={handleTabChange} style={{ paddingBottom: '15px'}}>
+            <Tabs
+              defaultActiveKey="1"
+              onChange={handleTabChange}
+              style={{ paddingBottom: "15px" }}
+            >
               <TabPane tab="课堂使用情况" key="1">
                 <DisplayTableData
                   columns={columns}
                   datas={other_info}
                   total={total}
                   fetchData={handleFetchData}
+                  paginationProps={paginationProps}
+                  handleTableChange={handleTableChange}
                 />
+                {/* <div style={{ textAlign: "center", marginTop: 20 }}>
+                  <Pagination
+                    current={params.page}
+                    pageSize={params.limit}
+                    total={total_count}
+                  ></Pagination>
+                </div> */}
               </TabPane>
-              <TabPane tab="实际使用情况" key="2">
+              <TabPane tab="实训使用情况" key="2">
                 <DisplayTableData
                   columns={sxColumns}
                   datas={other_info}
                   total={total}
                   fetchData={handleFetchData}
+                  paginationProps={paginationProps}
+                  handleTableChange={handleTableChange}
                 />
               </TabPane>
-              <TabPane tab="学习情况" key="3">
+              <TabPane tab="学员学习情况" key="3">
                 <DisplayTableData
                   columns={stColumns}
                   datas={other_info}
                   total={total}
                   fetchData={handleFetchData}
+                  paginationProps={paginationProps}
+                  handleTableChange={handleTableChange}
                 />
               </TabPane>
             </Tabs>
-
           </section>
         </div>
       </div>
     </div>
   );
-}
+};
 
 const mapStateToProps = (state) => {
-  const { staticReducer: {subject_info, other_info, total} } = state;
+  const {
+    staticReducer: { subject_info, other_info, total, total_count, params },
+  } = state;
   return {
     subject_info,
     other_info,
-    total
-  }
+    total,
+    total_count,
+    params,
+  };
 };
 
 const mapDispatchToProps = (dispatch) => ({
   staticList: (id) => dispatch(actions.staticList(id)),
   changeParams: (params) => dispatch(actions.changeParams(params)),
-  initTotal: () => dispatch(actions.initTotal())
+  initTotal: () => dispatch(actions.initTotal()),
 });
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(App);
+export default connect(mapStateToProps, mapDispatchToProps)(App);
 // export default App;
diff --git a/src/modules/projectPackages/MDEditors.js b/src/modules/projectPackages/MDEditors.js
deleted file mode 100644
index ab69aa83..00000000
--- a/src/modules/projectPackages/MDEditors.js
+++ /dev/null
@@ -1,337 +0,0 @@
-import React, {Component} from 'react';
-
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
-
-import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
-
-import { getImageUrl, getUploadActionUrl, getUrl } from 'educoder';
-
-require('codemirror/lib/codemirror.css');
-
-let origin = getUrl();
-let path = getUrl("/editormd/lib/")
-
-
-const $ = window.$;
-
-let timeout;
-
-let currentValue;
-
-const Option = Select.Option;
-
-const RadioGroup = Radio.Group;
-
-
-
-// 保存数据
-function md_add_data(k,mdu,d){
-    window.sessionStorage.setItem(k+mdu,d);
-}
-
-// 清空保存的数据
-function md_clear_data(k,mdu,id){
-    window.sessionStorage.removeItem(k+mdu);
-    var id1 = "#e_tip_"+id;
-    var id2 = "#e_tips_"+id;
-    if(k == 'content'){
-        $(id2).html("　");
-    }else{
-        $(id1).html("　");
-    }
-}
-window.md_clear_data = md_clear_data
-// editor 存在了jquery对象上，应用不需要自己写md_rec_data方法了
-function md_rec_data(k, mdu, id) {
-    if (window.sessionStorage.getItem(k + mdu) !== null) {
-        var editor = $("#e_tips_" + id).data('editor');
-        editor.setValue(window.sessionStorage.getItem(k + mdu));
-        // debugger;
-        // /shixuns/b5hjq9zm/challenges/3977/tab=3  setValue可能导致editor样式问题
-        md_clear_data(k, mdu, id);
-    }
-}
-window.md_rec_data = md_rec_data;
-
-function md_elocalStorage(editor,mdu,id){
-    if (window.sessionStorage){
-        var oc = window.sessionStorage.getItem('content'+mdu);
-        if(oc !== null ){
-            console.log("#e_tips_"+id)
-            $("#e_tips_"+id).data('editor', editor);
-            var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" class="link-color-blue" onclick="md_rec_data(\'content\',\''+ mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="link-color-blue" onclick="md_clear_data(\'content\',\''+ mdu + '\',\'' + id + '\')">不恢复</a>';
-            $("#e_tips_"+id).html(h);
-        }
-        setInterval(function() {
-            var d = new Date();
-            var h = d.getHours();
-            var m = d.getMinutes();
-            var s = d.getSeconds();
-            h = h < 10 ? '0' + h : h;
-            m = m < 10 ? '0' + m : m;
-            s = s < 10 ? '0' + s : s;
-            if(editor.getValue().trim() != ""){
-                md_add_data("content",mdu,editor.getValue());
-                var id1 = "#e_tip_"+id;
-                var id2 = "#e_tips_"+id;
-                
-                var textStart = " 数据已于 "
-                var text = textStart + h + ':' + m + ':' + s +" 保存 ";
-                // 占位符   
-                var oldHtml = $(id2).html();
-                if (oldHtml && oldHtml != '　' && oldHtml.startsWith(textStart) == false) {
-                    $(id2).html( oldHtml.split('　(')[0] + `　(${text})`);
-                } else {
-                    $(id2).html(text);
-                }
-                // $(id2).html("");
-            }
-        },10000);
-
-    }else{
-        $("#e_tip_"+id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
-    }
-}
-
-
-function create_editorMD(id, width, high, placeholder, imageUrl, callback, initValue, 
-        onchange, watch, { noStorage, showNullButton }, that) {
-    // 还是出现了setting只有一份，被共用的问题
-    
-    var editorName = window.editormd(id, {
-        width: width,
-        height: high===undefined?400:high,
-        path: path,   // "/editormd/lib/"
-        markdown : initValue,
-
-        dialogLockScreen: false,
-        watch:watch===undefined?true:watch,
-        syncScrolling: "single",
-        tex: true,
-        tocm: true,
-        emoji: true,
-        taskList: true,
-        codeFold: true,
-        searchReplace: true,
-        htmlDecode: "style,script,iframe",
-        sequenceDiagram: true,
-        autoFocus: false,
-
-        // mine
-        
-        toolbarIcons: function (mdEditor) {
-						//
-						// let react_id = `react_${id}`;
-						// const __that = window[react_id]
-
-						// Or return editormd.toolbarModes[name]; // full, simple, mini
-						// Using "||" set icons align right.
-						const icons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"];
-						// if (__that.props.showNullButton) {
-						// 	icons.push('nullBtton')
-						// }
-						return icons
-
-
-        },
-        toolbarCustomIcons: {
-            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>",
-            nullBtton: "<a type=\"nullBtton\" class='pr' title='增加填空'><div class='border-left'><span></span></div><span class='fillTip'>点击插入填空项</span><i class=\"iconfont icon-edit font-16\"></i></a>",
-        },
-        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
-        saveHTMLToTextarea: true,
-        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-        dialogMaskOpacity: 0.6,
-        placeholder: placeholder,
-        imageUpload: true,
-        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-        imageUploadURL: imageUrl,//url
-        onchange: onchange,
-        onload: function() {
-            let _id = this.id   // 如果要使用this，这里不能使用箭头函数
-            let _editorName = this;
-            let react_id = `react_${_editorName.id}`;
-            const __that = window[react_id]
-            
-            // this.previewing();
-            // let _id = id;
-            $("#" + _id + " [type=\"latex\"]").bind("click", function () {
-                _editorName.cm.replaceSelection("```latex");
-                _editorName.cm.replaceSelection("\n");
-                _editorName.cm.replaceSelection("\n");
-                _editorName.cm.replaceSelection("```");
-                var __Cursor = _editorName.cm.getDoc().getCursor();
-                _editorName.cm.setCursor(__Cursor.line - 1, 0);
-            });
-
-            $("#" + _id + " [type=\"inline\"]").bind("click", function () {
-                _editorName.cm.replaceSelection("`$$$$`");
-                var __Cursor = _editorName.cm.getDoc().getCursor();
-                _editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 3);
-                _editorName.cm.focus();
-            });
-            $("[type=\"inline\"]").attr("title", "行内公式");
-            $("[type=\"latex\"]").attr("title", "多行公式");
-
-            if (__that.props.showNullButton) {
-                const NULL_CH = '▁'
-                // const NULL_CH = '〇'
-                // const NULL_CH = '🈳'
-                
-                $("#" + _id + " [type=\"nullBtton\"]").bind("click", function () {
-                    _editorName.cm.replaceSelection(NULL_CH);
-                    // var __Cursor = _editorName.cm.getDoc().getCursor();
-                    // _editorName.cm.setCursor(__Cursor.line - 1, 0);
-                });
-            }
-
-            if (noStorage == true) {
-
-            } else {
-                md_elocalStorage(_editorName, `MDEditor__${_id}`, _id);
-            }
-
-            callback && callback(_editorName)
-        }
-    });
-    return editorName;
-}
-
-
-export default class MDEditors extends Component {
-    constructor(props) {
-        super(props)
-        this.state = {
-            initValue: ''
-        }
-    }
-    componentDidUpdate(prevProps, prevState) {
-        // 不能加，影响了试卷填空题
-        // if (this.props.initValue != prevProps.initValue) {
-        //     this.answers_editormd.setValue(this.props.initValue)
-        // }
-    }
-    
-    // react_mdEditor_
-    componentDidMount = () => {
-        const { mdID, initValue, placeholder, showNullButton} = this.props;
-        
-        let _id = `mdEditor_${mdID}`
-        this.contentChanged = false;
-        const _placeholder = placeholder || "";
-        // amp;
-        // 编辑时要传memoId
-		  	const imageUrl = `${getUploadActionUrl()}`;
-        // 创建editorMd
-        let react_id = `react_${_id}`;
-
-        window[react_id] = this
-        const answers_editormd = create_editorMD(_id, '100%', this.props.height, _placeholder, imageUrl, (__editorName) => {
-            react_id = `react_${__editorName.id}`;
-            const that = window[react_id]
-
-            setTimeout(() => {
-                console.log('timeout', __editorName.id)
-                __editorName.resize()
-                __editorName.cm && __editorName.cm.refresh()
-            }, that.props.refreshTimeout || 500)
-            if (that.props.initValue != undefined && that.props.initValue != '') {
-                __editorName.setValue(that.props.initValue)
-            }
-            if (that.state.initValue) {
-                __editorName.setValue(that.state.initValue)
-            }
-            __editorName.cm.on("change", (_cm, changeObj) => {
-                that.contentChanged = true;
-                if (that.state.showError) {
-                    that.setState({showError: false})
-                }
-                that.onEditorChange()
-            })
-            that.props.onCMBlur && __editorName.cm.on('blur', () => {
-                that.props.onCMBlur()
-            })
-            that.props.onCMBeforeChange && __editorName.cm.on('beforeChange', (cm,change) => {
-                that.props.onCMBeforeChange(cm,change)
-            })
-            that.answers_editormd = __editorName;
-            window[_id] = __editorName;
-        }, initValue, this.onEditorChange,this.props.watch, {
-            noStorage: this.props.noStorage,
-            showNullButton: this.props.showNullButton
-        }, this);
-        
-    }
-    showError = () => {
-        this.setState({showError: true})
-    }
-    onEditorChange = () => {
-        this.props.setcheckoutcontent()
-        if (!this.answers_editormd) return;
-        const val = this.answers_editormd.getValue();
-        try {
-            this.props.onChange && this.props.onChange(val)
-        } catch(e) {
-            // http://localhost:3007/courses/1309/common_homeworks/6566/setting 
-            // 从这个页面，跳转到编辑页面，再在编辑页面点击返回的时候，这里会报错
-            console.error('出错')
-            console.error(e)
-        }
-    }
-    resize = () => {
-        if (!this.answers_editormd) { // 还未初始化
-            return;
-        }
-        this.answers_editormd.resize()
-        this.answers_editormd.cm && this.answers_editormd.cm.refresh()
-        this.answers_editormd.cm.focus()
-    }
-
-    getValue = () => {
-        try {
-            return this.answers_editormd.getValue()
-        } catch (e) {
-            return ''
-        }
-    }
-    setValue = (val) => {
-        try {
-            this.answers_editormd.setValue(val)
-        } catch (e) {
-            // TODO 这里多实例的时候，前一个实例的state会被后面这个覆盖 参考NewWork.js    http://localhost:3007/courses/1309/homework/9300/edit/1
-            // 未初始化
-            this.setState({ initValue: val })
-        }
-    }
-    
-    render() {
-
-        let {
-            showError
-        } = this.state;
-        let { mdID, className, noStorage } = this.props;
-        let _style = {}
-        if (showError) {
-            _style.border = '1px solid red'
-        }
-        return (
-            <React.Fragment>
-                <div className={`df ${className} mt20`} >
-                {/* padding10-20  */}
-                    <div className="edu-back-greyf5 radius4" id={`mdEditor_${mdID}`} style={{..._style}}>
-                        <textarea style={{display: 'none'}}  id="evaluate_script_show" name="content"  ></textarea>
-                        <div className="CodeMirror cm-s-defualt">
-                        </div>
-                    </div>
-                </div>
-                <div className={"fr rememberTip"}>
-                    {noStorage == true ? '　' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12">　</p>}
-                    {/* {noStorage == true ? '　' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12">　</p>} */}
-                </div>
-            </React.Fragment>
-        )
-    }
-}
-
-
diff --git a/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBanner.js b/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBanner.js
index ffb28d3d..283445ea 100644
--- a/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBanner.js
+++ b/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBanner.js
@@ -16,7 +16,7 @@ class PackageIndexNEIBanner extends Component {
     }
 
 	onChange=(current)=>{
-    	debugger
+
 		console.log('onChange:', current);
 		this.setState({ current });
 	};
diff --git a/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js b/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js
index 562ca08a..7ce8b99d 100644
--- a/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js
+++ b/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js
@@ -787,7 +787,7 @@ class PackageIndexNEIBannerConcent extends Component {
 													 {/*id="_file"*/}
 													 {/*multiple="multiple" name="attachments[dummy][file]"*/}
 													 {/*onChange={() => {*/}
-														  {/*debugger;*/}
+														  {/*;*/}
  													   {/*console.log(window.$('.file_selector')[0])*/}
 														 {/*window.addInputFiles(window.$('.file_selector')[0])*/}
 													 {/*}}*/}
diff --git a/src/modules/question/NewMyShixunModel.js b/src/modules/question/NewMyShixunModel.js
index 232ba9d7..2ae8625b 100644
--- a/src/modules/question/NewMyShixunModel.js
+++ b/src/modules/question/NewMyShixunModel.js
@@ -1,42 +1,32 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl} from 'educoder';
+import React, { Component } from "react";
 import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Tooltip
-} from "antd";
-import {parabola} from './animation/parabola'
+import { Pagination, } from "antd";
 import Headplugselections from "./component/Headplugselections";
 import QuestionModal from "./component/QuestionModal";
 import QuestionModals from "./component/QuestionModals";
 import Contentpart from "./component/Contentpart";
-import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
-import NoneData from './component/NoneData';
 import './questioncss/questioncom.css';
 import Bottomsubmit from "../modals/Bottomsubmit";
+import QuestionModalys from "./component/QuestionModalys";
 
 //exam_id 试卷的id
+var Undoclickable = true;
+var myGrandtotal = false;
 class NewMyShixunModel extends Component {
 	constructor(props) {
 		super(props);
 		this.state = {
 			count: 50,
-			defaultActiveKey:"1",
+			defaultActiveKey: "1",
 			Headertop: "",
 			Footerdown: "",
 			visible: false,
 			placement: 'right',
 			modalsType: false,
-			modalsTypes:false,
+			modalsTypes: false,
 			titilesm: "在平台审核后，所有成员均可使用试题",
 			titiless: "是否设置为公开？",
-			titilesms:"单选题",
+			titilesms: "单选题",
 			titbool: false,
 			Contentdata: [],
 			difficulty: null,
@@ -54,111 +44,141 @@ class NewMyShixunModel extends Component {
 			program_questions_count: 0,
 			single_questions_count: 0,
 			subjective_questions_count: 0,
-			page:1,
-			per_page:10,
-			disciplinesdata:[],
-			discipline_id:null,
-			sub_discipline_id:null,
-			tag_discipline_id:null,
-			booljupyterurls:false,
-			disciplinesdatakc:0,
-			disciplinesdatazsd:0,
-			selectallquestionsonthispages:false,
-			oj_status:null,
+			page: 1,
+			per_page: 10,
+			disciplinesdata: [],
+			discipline_id: null,
+			sub_discipline_id: null,
+			tag_discipline_id: null,
+			booljupyterurls: false,
+			disciplinesdatakc: 0,
+			disciplinesdatazsd: 0,
+			selectallquestionsonthispages: false,
+			oj_status: null,
 			isVisible: false,
-			selectionbools:false,
+			selectionbools: false,
+			chakanjiexiboolindex: "无",
+			myqyespull: true
+
 		}
 
 	}
-	setdiscipline_id=(discipline_id)=>{
+
+	chakanjiexibool = (index) => {
+		if (this.state.chakanjiexiboolindex === index) {
+			this.setState({
+				chakanjiexiboolindex: "无",
+			})
+			return
+		}
 		this.setState({
-			discipline_id:discipline_id,
-			sub_discipline_id:null,
-			tag_discipline_id:null,
-			keywords:"",
-			page:1,
-			per_page:10,
-			oj_status:null
+			chakanjiexiboolindex: index,
+		})
+	}
+	setdiscipline_id = (discipline_id) => {
+		this.setState({
+			discipline_id: discipline_id,
+			sub_discipline_id: null,
+			tag_discipline_id: null,
+			keyword: "",
+			page: 1,
+			per_page: 10,
+			oj_status: null
 		})
 		var data = {
-			discipline_id:discipline_id,
-			sub_discipline_id:null,
-			tag_discipline_id:null,
+			discipline_id: discipline_id,
+			sub_discipline_id: null,
+			tag_discipline_id: null,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords: null,
+			keyword: null,
 			page: this.state.page,
-			per_page:10,
-			oj_status:null,
-			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			per_page: 10,
+			oj_status: null,
+			exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 
 	}
 
-	setsub_discipline_id=(discipline_id,sub_discipline_id)=>{
+	setsub_discipline_id = (discipline_id, sub_discipline_id) => {
 		this.setState({
-			sub_discipline_id:sub_discipline_id,
-			tag_discipline_id:null,
-			keywords:"",
-			page:1,
-			per_page:10,
-			oj_status:null
+			sub_discipline_id: sub_discipline_id,
+			tag_discipline_id: null,
+			keyword: "",
+			page: 1,
+			per_page: 10,
+			oj_status: null
 		})
 		var data = {
-			discipline_id:discipline_id,
-			sub_discipline_id:sub_discipline_id,
-			tag_discipline_id:null,
+			discipline_id: discipline_id,
+			sub_discipline_id: sub_discipline_id,
+			tag_discipline_id: null,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords:null,
+			keyword: null,
 			page: 1,
-			per_page:10,
-			oj_status:null,
-			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			per_page: 10,
+			oj_status: null,
+			exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 	}
 
-	settag_discipline_id=(tag_discipline_id)=>{
+	settag_discipline_id = (tag_discipline_id) => {
 		this.setState({
-			tag_discipline_id:tag_discipline_id,
-			keywords:"",
-			page:1,
-			per_page:10,
-			oj_status:null
+			tag_discipline_id: tag_discipline_id,
+			keyword: "",
+			page: 1,
+			per_page: 10,
+			oj_status: null
 		})
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords: null,
+			keyword: null,
 			page: 1,
-			per_page:10,
-			oj_status:null,
-			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			per_page: 10,
+			oj_status: null,
+			exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 	}
 
 	//初始化
 	componentDidMount() {
-		const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-		const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
-		const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
-		let {defaultActiveKey} = this.props;
-		var defaultActiveKeys=defaultActiveKey;
-		if(isysladmins===true||(is_teacher===true&&professional_certification===true)){
-			defaultActiveKeys="0"
-		}else{
-			defaultActiveKeys="1"
+		let isysladmins = false;
+		let is_teacher = this.props && this.props.current_user && this.props.current_user.is_teacher ? this.props.current_user.is_teacher : false;
+		const professional_certification = this.props && this.props.current_user && this.props.current_user.professional_certification ? this.props.current_user.professional_certification : false;
+		let { defaultActiveKey } = this.props;
+		var defaultActiveKeys = defaultActiveKey;
+		try {
+			if (this.props) {
+				if (this.props.current_user) {
+					if (this.props.current_user.admin) {
+						isysladmins = true;
+					}
+					else if (this.props.current_user.business) {
+						isysladmins = true;
+					}
+				}
+			}
+			if (is_teacher === false) {
+				if (this.props.current_user.user_identity !== "学生") {
+					//专业人士
+					is_teacher = true
+				}
+			}
+		} catch (e) {
+
 		}
-		this.callback(defaultActiveKeys);
+
 		let url = `/users/get_navigation_info.json`;
 		axios.get(url, {}).then((response) => {
 			// //////console.log("开始请求/get_navigation_info.json");
@@ -177,9 +197,11 @@ class NewMyShixunModel extends Component {
 
 		//获取题库筛选资料
 		let urls = `/disciplines.json`;
-		axios.get(urls, {params: {
-				source:"question"
-			}}).then((response) => {
+		axios.get(urls, {
+			params: {
+				source: "question"
+			}
+		}).then((response) => {
 			//console.log("Questiondisciplines");
 			//console.log(response.data);
 			if (response) {
@@ -191,19 +213,32 @@ class NewMyShixunModel extends Component {
 	}
 
 	componentDidUpdate(prevProps) {
-		if(prevProps.current_user !== this.props.current_user) {
-			debugger
-			const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-			const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
-			const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
-			let {defaultActiveKey} = this.props;
-			var defaultActiveKeys=defaultActiveKey;
-			if(isysladmins===true||(is_teacher===true&&professional_certification===true)){
-				defaultActiveKeys="0"
-			}else{
-				defaultActiveKeys="1"
+		if (prevProps.current_user !== this.props.current_user) {
+			let isysladmins = false;
+			let is_teacher = this.props && this.props.current_user && this.props.current_user.is_teacher ? this.props.current_user.is_teacher : false;
+			const professional_certification = this.props && this.props.current_user && this.props.current_user.professional_certification ? this.props.current_user.professional_certification : false;
+			let { defaultActiveKey } = this.props;
+			var defaultActiveKeys = defaultActiveKey;
+			try {
+				if (this.props) {
+					if (this.props.current_user) {
+						if (this.props.current_user.admin) {
+							isysladmins = true;
+						}
+						else if (this.props.current_user.business) {
+							isysladmins = true;
+						}
+					}
+				}
+				if (is_teacher === false) {
+					if (this.props.current_user.user_identity !== "学生") {
+						//专业人士
+						is_teacher = true
+					}
+				}
+			} catch (e) {
+
 			}
-			this.callback(defaultActiveKeys);
 		}
 	}
 
@@ -211,22 +246,22 @@ class NewMyShixunModel extends Component {
 	callback = (key) => {
 		this.setState({
 			defaultActiveKey: key,
-			selectallquestionsonthispages:false,
-			difficulty:null,
-			page:1,
-			oj_status:null
+			selectallquestionsonthispages: false,
+			difficulty: null,
+			page: 1,
+			oj_status: null
 		})
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: key,
 			item_type: this.state.item_type,
 			difficulty: null,
 			page: 1,
-			per_page:10,
-			oj_status:null,
-			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			per_page: 10,
+			oj_status: null,
+			exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 
@@ -236,15 +271,15 @@ class NewMyShixunModel extends Component {
 	getdata = (data) => {
 		const url = `/item_banks.json`;
 		this.setState({
-			booljupyterurls:true,
-			selectionbools:false,
+			booljupyterurls: true,
+			selectionbools: false,
 		})
-		axios.get((url), {params: data}).then((response) => {
-			setTimeout(()=>{
+		axios.get((url), { params: data }).then((response) => {
+			setTimeout(() => {
 				this.setState({
-					booljupyterurls:false,
+					booljupyterurls: false,
 				})
-			},1000);
+			}, 1000);
 			if (response === null || response === undefined) {
 
 				return
@@ -264,7 +299,7 @@ class NewMyShixunModel extends Component {
 		}).catch((error) => {
 			//////console.log(error)
 			this.setState({
-				booljupyterurls:false,
+				booljupyterurls: false,
 			})
 		});
 	}
@@ -273,12 +308,12 @@ class NewMyShixunModel extends Component {
 	getdatasy = (data) => {
 		const url = `/item_banks.json`;
 		this.setState({
-			selectionbools:false,
+			selectionbools: false,
 		})
-		axios.get((url), {params: data}).then((response) => {
-			setTimeout(()=>{
+		axios.get((url), { params: data }).then((response) => {
+			setTimeout(() => {
 
-			},1000);
+			}, 1000);
 			if (response === null || response === undefined) {
 
 				return
@@ -303,45 +338,66 @@ class NewMyShixunModel extends Component {
 	}
 
 	//计算
-	getdataslen=(arr)=>{
-		var contes=0;
-		for(let data of arr) {
-			if(data.item_type==="PROGRAM"){
+	getdataslen = (arr) => {
+		myGrandtotal = false;
+		let contes = 0;
+		let Grandtotal = 0;
+		for (let data of arr) {
+			if (data.item_type === "PROGRAM") {
 				//编程题
-				if(data.choosed===true){
+				if (data.choosed === true) {
 
-				}else{
+				} else {
 					//未选用
-					if(data.program_attr.status===1){
-						//已发布
-						contes=contes+1;
+					if (data.program_attr.status === 1) {
+						//已发布1  未发布0
+						contes = contes + 1;
+					} else {
+						Grandtotal = Grandtotal + 1;
 					}
 
 				}
 
-			}else{
+			} else {
 				//不是编程题
-				if(data.choosed===true){
+				if (data.choosed === true) {
 
-				}else{
+				} else {
 					//未选用
-					contes=contes+1;
+					contes = contes + 1;
 				}
 			}
 
 		}
 
-		if(contes>0){
+		if (contes > 0) {
 			this.setState({
-				selectionbools:false,
-				selectallquestionsonthispages:false,
-			})
-		}else {
-			this.setState({
-				selectionbools:true,
-				selectallquestionsonthispages:true,
+				selectionbools: false,
+				selectallquestionsonthispages: false,
 			})
 		}
+		else {
+			try {
+				if (arr.length === Grandtotal) {
+					myGrandtotal = true;
+					this.setState({
+						selectionbools: false,
+						selectallquestionsonthispages: false,
+					})
+				} else {
+					this.setState({
+						selectionbools: true,
+						selectallquestionsonthispages: true,
+					})
+				}
+			} catch (e) {
+				this.setState({
+					selectionbools: true,
+					selectallquestionsonthispages: true,
+				})
+			}
+
+		}
 	}
 
 	paginationonChange = (pageNumber) => {
@@ -349,27 +405,27 @@ class NewMyShixunModel extends Component {
 			page: pageNumber,
 		})
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords: this.state.keywords,
+			keyword: this.state.keywords,
 			page: pageNumber,
-			per_page:10,
-			oj_status:this.state.oj_status,
-			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			per_page: 10,
+			oj_status: this.state.oj_status,
+			exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 
 		};
 		this.getdata(data);
 	}
 	showDrawer = () => {
-		if(this.state.visible===true){
+		if (this.state.visible === true) {
 			this.setState({
 				visible: false,
 			});
-		}else{
+		} else {
 			this.setState({
 				visible: true,
 			});
@@ -406,7 +462,18 @@ class NewMyShixunModel extends Component {
 			titilesm: "在平台审核后，所有成员均可使用试题",
 			titiless: "是否设置为公开？",
 			titbool: true,
-			timuid: id
+			timuid: id,
+			myqyespull: true
+		})
+	};
+	setasprivates = (id) => {
+		this.setState({
+			modalsType: true,
+			titilesm: "设为私有后，试题仅您自己可见",
+			titiless: "是否设置为私有？",
+			titbool: true,
+			timuid: id,
+			myqyespull: false
 		})
 	};
 	showmodelysl = (id) => {
@@ -425,19 +492,19 @@ class NewMyShixunModel extends Component {
 			modalsType: false
 		})
 	}
-	modalCancels=()=>{
+	modalCancels = () => {
 		this.setState({
 			modalsTypes: false
 		})
 	}
-	showQuestionModals =(item_type)=>{
+	showQuestionModals = (item_type) => {
 		this.setState({
 			modalsTypes: true,
-			titilesms:item_type,
+			titilesms: item_type,
 		})
 
 	}
-	setDownloads=(item_type)=>{
+	setDownloads = (item_type) => {
 		this.Deletebigquestiontype(item_type);
 		this.setState({
 			modalsTypes: false
@@ -447,7 +514,11 @@ class NewMyShixunModel extends Component {
 		//确认
 		if (this.state.titbool === true) {
 			//公开
-			this.publicopentimu(this.state.timuid);
+			if (this.state.myqyespull === true) {
+				this.publicopentimu(this.state.timuid);
+			} else {
+				this.Setasprivate(this.state.timuid);
+			}
 		} else {
 			// 删除
 			this.deletetimu(this.state.timuid);
@@ -462,23 +533,23 @@ class NewMyShixunModel extends Component {
 			difficulty: difficulty,
 			visiblemys: false,
 			page: 1,
-			per_page:10,
-			keywords:"",
-			oj_status:null
+			per_page: 10,
+			keyword: "",
+			oj_status: null
 		})
 
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: difficulty,
 			item_type: this.state.item_type,
-			keywords:null,
-			page:1,
-			per_page:10,
-			oj_status:null,
-			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			keyword: null,
+			page: 1,
+			per_page: 10,
+			oj_status: null,
+			exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 		};
 
 		this.getdata(data);
@@ -489,23 +560,23 @@ class NewMyShixunModel extends Component {
 			item_type: item_type,
 			visiblemyss: false,
 			page: 1,
-			per_page:10,
-			keywords:"",
-			oj_status:null
+			per_page: 10,
+			keyword: "",
+			oj_status: null
 		})
 
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: item_type,
 			page: 1,
-			per_page:10,
-			keywords:null,
-			oj_status:null,
-			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			per_page: 10,
+			keyword: null,
+			oj_status: null,
+			exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 		};
 
 		this.getdata(data);
@@ -524,6 +595,19 @@ class NewMyShixunModel extends Component {
 		}
 
 	}
+	showmodelsInaudit = (e) => {
+		this.setState({
+			modalsTypeInaudit: true,
+			titilesm: "公开申请已提交，请等待管理员的审核",
+			titiless: "我们将在1-2个工作日内完成审核",
+		})
+	};
+	modalsTypeInauditbool = () => {
+		this.setState({
+			modalsTypeInaudit: false,
+		})
+	}
+
 
 	handleVisibleChanges = (boll) => {
 		if (this.state.visiblemys === true) {
@@ -541,26 +625,26 @@ class NewMyShixunModel extends Component {
 
 	setdatafunsval = (e) => {
 		this.setState({
-			keywords: e.target.value
+			keyword: e.target.value
 		})
 	}
 
 	setdatafuns = (value) => {
 		this.setState({
-			keywords: value,
+			keyword: value,
 		})
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords: value,
+			keyword: value,
 			page: this.state.page,
-			per_page:10,
-			oj_status:this.state.oj_status,
-			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			per_page: 10,
+			oj_status: this.state.oj_status,
+			exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 		};
 
 		this.getdata(data);
@@ -575,16 +659,16 @@ class NewMyShixunModel extends Component {
 					// this.props.showNotification('删除试题成功')
 					// props.history.push(response.data.right_url)
 					var data = {
-						discipline_id:this.state.discipline_id,
-						sub_discipline_id:this.state.sub_discipline_id,
-						tag_discipline_id:this.state.tag_discipline_id,
+						discipline_id: this.state.discipline_id,
+						sub_discipline_id: this.state.sub_discipline_id,
+						tag_discipline_id: this.state.tag_discipline_id,
 						public: this.state.defaultActiveKey,
 						difficulty: this.state.difficulty,
 						item_type: this.state.item_type,
-						keywords: this.state.keywords,
+						keyword: this.state.keywords,
 						page: this.state.page,
-						per_page:10,
-						exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+						per_page: 10,
+						exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 					};
 					this.getdata(data);
 				}
@@ -601,214 +685,319 @@ class NewMyShixunModel extends Component {
 				if (result.data.status == 0) {
 					// this.props.showNotification(`公开题目成功`);
 					var data = {
-						discipline_id:this.state.discipline_id,
-						sub_discipline_id:this.state.sub_discipline_id,
-						tag_discipline_id:this.state.tag_discipline_id,
+						discipline_id: this.state.discipline_id,
+						sub_discipline_id: this.state.sub_discipline_id,
+						tag_discipline_id: this.state.tag_discipline_id,
 						public: this.state.defaultActiveKey,
 						difficulty: this.state.difficulty,
 						item_type: this.state.item_type,
-						keywords: this.state.keywords,
+						keyword: this.state.keywords,
 						page: this.state.page,
-						per_page:10,
-						exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+						per_page: 10,
+						exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 
 					};
 					this.getdata(data);
 				}
 			}).catch((error) => {
-			////console.log(error);
-		})
+				////console.log(error);
+			})
+	}
+
+	//设为私有
+
+	Setasprivate = (id) => {
+		const url = `/item_banks/${id}/set_private.json`;
+		axios.post(url)
+			.then((result) => {
+				if (result.data.status == 0) {
+					// this.props.showNotification(`设为私有成功`);
+					var data = {
+						discipline_id: this.state.discipline_id,
+						sub_discipline_id: this.state.sub_discipline_id,
+						tag_discipline_id: this.state.tag_discipline_id,
+						public: this.state.defaultActiveKey,
+						difficulty: this.state.difficulty,
+						item_type: this.state.item_type,
+						keyword: this.state.keywords,
+						page: this.state.page,
+						per_page: 10,
+					};
+					this.getdata(data, true);
+					// this.scrollToAnchor("questionid");
+
+				}
+			}).catch((error) => {
+				////console.log(error);
+			})
+	}
+	//跳转道描点的地方
+	scrollToAnchor = (anchorName) => {
+		if (anchorName) {
+			// 找到锚点
+			let anchorElement = document.getElementById(anchorName);
+			// 如果对应id的锚点存在，就跳转到锚点
+			if (anchorElement) {
+				anchorElement.scrollIntoView();
+			}
+		}
 	}
 
 	getbasket_listdata = () => {
 		// 获取试题篮展开的数据
-		// const url = "/item_baskets/basket_list.json";
-		// axios.get(url)
-		// 	.then((result) => {
-		// 		// ////console.log("getbasket_listdata");
-		// 		// ////console.log(result.data);
-		// 		this.setState({
-		// 			completion_questions_count: result.data.completion_questions_count,
-		// 			judgement_questions_count: result.data.judgement_questions_count,
-		// 			multiple_questions_count: result.data.multiple_questions_count,
-		// 			practical_questions_count: result.data.practical_questions_count,
-		// 			program_questions_count: result.data.program_questions_count,
-		// 			single_questions_count: result.data.single_questions_count,
-		// 			subjective_questions_count: result.data.subjective_questions_count,
-		// 		})
-		//
-		// 	}).catch((error) => {
-		// 	// ////console.log(error);
-		// 	this.setState({
-		// 		completion_questions_count: 0,
-		// 		judgement_questions_count: 0,
-		// 		multiple_questions_count: 0,
-		// 		practical_questions_count: 0,
-		// 		program_questions_count: 0,
-		// 		single_questions_count: 0,
-		// 		subjective_questions_count: 0,
-		// 	})
-		// })
+		const url = "/item_baskets/basket_list.json";
+		axios.get(url)
+			.then((result) => {
+				// ////console.log("getbasket_listdata");
+				// ////console.log(result.data);
+				this.setState({
+					completion_questions_count: result.data.completion_questions_count,
+					judgement_questions_count: result.data.judgement_questions_count,
+					multiple_questions_count: result.data.multiple_questions_count,
+					practical_questions_count: result.data.practical_questions_count,
+					program_questions_count: result.data.program_questions_count,
+					single_questions_count: result.data.single_questions_count,
+					subjective_questions_count: result.data.subjective_questions_count,
+				})
+
+			}).catch((error) => {
+				// ////console.log(error);
+				this.setState({
+					completion_questions_count: 0,
+					judgement_questions_count: 0,
+					multiple_questions_count: 0,
+					practical_questions_count: 0,
+					program_questions_count: 0,
+					single_questions_count: 0,
+					subjective_questions_count: 0,
+				})
+			})
 
 	}
 
 
-	//选用
-	getitem_baskets=(data)=>{
+
+	// 不选用  Question.js页面也有个
+	NOgetitem_baskets = (data) => {
+		let url = "/examination_banks/cancel_items.json";
+
+		axios.post(url, data)
+			.then((result) => {
+				if (result.data.status == 0) {
+					var data = {
+						discipline_id: this.state.discipline_id,
+						sub_discipline_id: this.state.sub_discipline_id,
+						tag_discipline_id: this.state.tag_discipline_id,
+						public: this.state.defaultActiveKey,
+						difficulty: this.state.difficulty,
+						item_type: this.state.item_type,
+						keyword: this.state.keywords,
+						page: this.state.page,
+						per_page: 10,
+						exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
+					};
+					this.getdatasy(data);
+					this.getbasket_listdata();
+				}
+			}).catch((error) => {
+				////console.log(error);
+			})
+	}
+
+	//选用    Question.js页面也有个
+	getitem_baskets = (data) => {
 		//选用题型可以上传单个 或者多个题型
-		let url="";
-		if(this.props.exam_id===undefined){
-			url="/item_baskets.json";
-		}else{
-			url="/examination_items.json";
+		let url = "";
+		if (this.props.exam_id === undefined) {
+			url = "/item_baskets.json";
+		} else {
+			url = "/examination_items.json";
 		}
 
 
 		axios.post(url, data)
 			.then((result) => {
 				if (result.data.status == 0) {
-					// this.props.showNotification(`选用成功`);
 					var data = {
-						discipline_id:this.state.discipline_id,
-						sub_discipline_id:this.state.sub_discipline_id,
-						tag_discipline_id:this.state.tag_discipline_id,
+						discipline_id: this.state.discipline_id,
+						sub_discipline_id: this.state.sub_discipline_id,
+						tag_discipline_id: this.state.tag_discipline_id,
 						public: this.state.defaultActiveKey,
 						difficulty: this.state.difficulty,
 						item_type: this.state.item_type,
-						keywords: this.state.keywords,
+						keyword: this.state.keywords,
 						page: this.state.page,
-						per_page:10,
-						exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+						per_page: 10,
+						exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 					};
 					this.getdatasy(data);
 					this.getbasket_listdata();
-					// this.setState({
-					// 	visible:true
-					// })
 				}
 			}).catch((error) => {
-			////console.log(error);
-		})
+				////console.log(error);
+			})
 	}
 	// 撤销
-	getitem_basketss=(id)=>{
-		let url="";
-		if(this.props.exam_id===undefined){
-			url=`/item_baskets/${id}.json`;
-			axios.delete(url)
-				.then((result) => {
-					if (result.data.status == 0) {
-						// this.props.showNotification(`撤销成功`);
-						var data = {
-							discipline_id:this.state.discipline_id,
-							sub_discipline_id:this.state.sub_discipline_id,
-							tag_discipline_id:this.state.tag_discipline_id,
-							public: this.state.defaultActiveKey,
-							difficulty: this.state.difficulty,
-							item_type: this.state.item_type,
-							keywords: this.state.keywords,
-							page: this.state.page,
-							per_page:10,
-							exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
-						};
-						this.getdatasy(data);
-						this.getbasket_listdata();
+	getitem_basketss = (id) => {
+
+		let url = "";
+		if (this.props.exam_id === undefined) {
+			if (Undoclickable === true) {
+				Undoclickable = false;
+				url = `/item_baskets/${id}.json`;
+				axios.delete(url)
+					.then((result) => {
+						if (result.data.status == 0) {
+							// this.props.showNotification(`撤销成功`);
+							var data = {
+								discipline_id: this.state.discipline_id,
+								sub_discipline_id: this.state.sub_discipline_id,
+								tag_discipline_id: this.state.tag_discipline_id,
+								public: this.state.defaultActiveKey,
+								difficulty: this.state.difficulty,
+								item_type: this.state.item_type,
+								keyword: this.state.keywords,
+								page: this.state.page,
+								per_page: 10,
+								exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
+							};
+							this.getdatasy(data);
+							this.getbasket_listdata();
+						}
+						setTimeout(() => {
+							Undoclickable = true;
+						}, 1000);
+
+					}).catch((error) => {
+						setTimeout(() => {
+							Undoclickable = true;
+						}, 1000);
+
+					})
+			}
+		} else {
+			if (Undoclickable === true) {
+				Undoclickable = false;
+				url = `/examination_banks/${this.props.exam_id}/revoke_item.json`;
+				axios.delete(url, {
+					data: {
+						item_id: id === undefined ? "" : parseInt(id),
 					}
-				}).catch((error) => {
-				////console.log(error);
-			})
-		}else{
-			url=`/examination_banks/${this.props.exam_id}/revoke_item.json`;
-			axios.delete(url,{ data: {
-						item_id:id===undefined?"":parseInt(id),
-					}})
-				.then((result) => {
-					if (result.data.status == 0) {
-						// this.props.showNotification(`撤销成功`);
-						var data = {
-							discipline_id:this.state.discipline_id,
-							sub_discipline_id:this.state.sub_discipline_id,
-							tag_discipline_id:this.state.tag_discipline_id,
-							public: this.state.defaultActiveKey,
-							difficulty: this.state.difficulty,
-							item_type: this.state.item_type,
-							keywords: this.state.keywords,
-							page: this.state.page,
-							per_page:10,
-							exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
-						};
-						this.getdatasy(data);
-						this.getbasket_listdata();
-					}
-				}).catch((error) => {
-				////console.log(error);
-			})
+				})
+					.then((result) => {
+						if (result.data.status == 0) {
+							// this.props.showNotification(`撤销成功`);
+							var data = {
+								discipline_id: this.state.discipline_id,
+								sub_discipline_id: this.state.sub_discipline_id,
+								tag_discipline_id: this.state.tag_discipline_id,
+								public: this.state.defaultActiveKey,
+								difficulty: this.state.difficulty,
+								item_type: this.state.item_type,
+								keyword: this.state.keywords,
+								page: this.state.page,
+								per_page: 10,
+								exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
+							};
+							this.getdatasy(data);
+							this.getbasket_listdata();
+						}
+						setTimeout(() => {
+							Undoclickable = true;
+						}, 1000);
+					}).catch((error) => {
+						setTimeout(() => {
+							Undoclickable = true;
+						}, 1000);
+					})
+			}
 		}
 
 
 	}
 	//全选试题库
-	selectallquestionsonthispage=()=>{
-		var item_idsdata=[];
+	selectallquestionsonthispage = (bool) => {
+		if (myGrandtotal === true) {
+			this.props.showNotification(`本页全部试题未发布,不能选择`);
+			return
+		}
+		var item_idsdata = [];
 
-		var arr= this.state.Contentdata.items;
-		for(let data of arr) {
-			if(data.item_type==="PROGRAM"){
+		var arr = this.state.Contentdata.items;
+		for (let data of arr) {
+			if (data.item_type === "PROGRAM") {
 				//编程题
-				if(data.choosed===true){
+				if (data.choosed === true) {
+					if (data.program_attr.status === 1) {
+						//已发布
+						item_idsdata.push(data.id);
+					}
 
-				}else{
+				} else {
 					//未选用
-					if(data.program_attr.status===1){
+					if (data.program_attr.status === 1) {
 						//已发布
 						item_idsdata.push(data.id);
 					}
 
 				}
 
-			}else{
+			} else {
 				//不是编程题
-				if(data.choosed===true){
-
-				}else{
+				if (data.choosed === true) {
+					item_idsdata.push(data.id);
+				} else {
 					//未选用
 					item_idsdata.push(data.id);
 				}
 			}
 
 		}
-		const data={
-			item_ids:item_idsdata,
-			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+		const data = {
+			item_ids: item_idsdata,
+			exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 		}
-		this.getitem_baskets(data);
-		this.setState({
-			selectallquestionsonthispages:true,
-		})
+
+
+		if (bool === false) {
+			this.getitem_baskets(data);
+			this.setState({
+				selectallquestionsonthispages: true,
+			})
+		} else {
+			this.NOgetitem_baskets(data);
+			this.setState({
+				selectallquestionsonthispages: false,
+			})
+		}
+
+
 	}
 
 	//全选的状态
 
 	//删除大题型
-	Deletebigquestiontype =(item_type)=>{
-		const  url=`/item_baskets/delete_item_type.json`;
-		axios.delete((url), { data: {
-					item_type:item_type
-				}})
+	Deletebigquestiontype = (item_type) => {
+		const url = `/item_baskets/delete_item_type.json`;
+		axios.delete((url), {
+			data: {
+				item_type: item_type
+			}
+		})
 			.then((response) => {
 				if (response.data.status == 0) {
 					// this.props.showNotification('删除成功');
 					var data = {
-						discipline_id:this.state.discipline_id,
-						sub_discipline_id:this.state.sub_discipline_id,
-						tag_discipline_id:this.state.tag_discipline_id,
+						discipline_id: this.state.discipline_id,
+						sub_discipline_id: this.state.sub_discipline_id,
+						tag_discipline_id: this.state.tag_discipline_id,
 						public: this.state.defaultActiveKey,
 						difficulty: this.state.difficulty,
 						item_type: this.state.item_type,
-						keywords: this.state.keywords,
+						keyword: this.state.keywords,
 						page: this.state.page,
-						per_page:10,
-						exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+						per_page: 10,
+						exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 					};
 					this.getdata(data);
 					this.getbasket_listdata();
@@ -822,31 +1011,31 @@ class NewMyShixunModel extends Component {
 
 
 	//跳转
-	gotopaperreview=()=>{
+	gotopaperreview = () => {
 
 		this.props.history.replace("/paperreview");
 
 	}
 
-	setoj_status=(oj_status)=>{
+	setoj_status = (oj_status) => {
 		//编程题发布未发布
 		this.setState({
-			selectallquestionsonthispages:false,
-			difficulty:null,
-			oj_status:oj_status
+			selectallquestionsonthispages: false,
+			difficulty: null,
+			oj_status: oj_status
 		})
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords: this.state.keywords,
+			keyword: this.state.keywords,
 			page: this.state.page,
-			per_page:10,
-			oj_status:oj_status,
-			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+			per_page: 10,
+			oj_status: oj_status,
+			exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 		};
 		this.getdata(data);
 	}
@@ -854,9 +1043,10 @@ class NewMyShixunModel extends Component {
 
 	render() {
 		let {
-			page, per_page, items_count, Headertop, visible, placement, modalsType, modalsTypes,basket_list,
+			page, per_page, items_count, Headertop, visible, placement, modalsType, modalsTypes, basket_list,
 			completion_questions_count, judgement_questions_count, multiple_questions_count, practical_questions_count,
-			program_questions_count, single_questions_count, subjective_questions_count,selectionbools
+			program_questions_count, single_questions_count, subjective_questions_count, selectionbools,
+			modalsTypeInaudit, Contentdata
 		} = this.state;
 
 		const Datacount = completion_questions_count + judgement_questions_count
@@ -865,12 +1055,16 @@ class NewMyShixunModel extends Component {
 			+ single_questions_count
 			+ subjective_questions_count;
 
+		// console.log("弹出框");
+		// console.log(Datacount)
+		// console.log(Contentdata)
+
 		return (
-			<div className="newMain clearfix "    ref={this.saveContainer}>
+			<div className="newMain clearfix " ref={this.saveContainer}>
 
 
 				{
-					visible===true?
+					visible === true ?
 						<style>
 							{
 								`
@@ -886,36 +1080,38 @@ class NewMyShixunModel extends Component {
 						position: fixed;
 						z-index: 1500 !important;
 						}
-						.newFooter{
-						 position: relative;
-							z-index: 9999999 ;
-						}
 						`
 							}
 						</style>
-						:""
+						: ""
 				}
 				{
-					visible===true?
+					visible === true ?
 						<div
 							style={{
 								marginTop: "60px"
 							}}></div>
-						:""}
+						: ""}
 				{
-					modalsTypes===true?
+					modalsTypes === true ?
 						<QuestionModals {...this.props}{...this.state} modalsTypes={modalsTypes} modalCancels={() => this.modalCancels()}
-														setDownloads={(e) => this.setDownloads(e)}></QuestionModals>
-						:""
+							setDownloads={(e) => this.setDownloads(e)}></QuestionModals>
+						: ""
 				}
 				{
-					modalsType===true?
+					modalsType === true ?
 						<QuestionModal {...this.props}{...this.state} modalsType={modalsType} modalCancel={() => this.modalCancel()}
-													 setDownload={() => this.setDownload()}></QuestionModal>
-						:""
+							setDownload={() => this.setDownload()}></QuestionModal>
+						: ""
+				}
+				{
+					modalsTypeInaudit === true ?
+						<QuestionModalys {...this.props}{...this.state} modalsType={modalsTypeInaudit} modalCancel={() => this.modalsTypeInauditbool()}
+							setDownload={() => this.modalsTypeInauditbool()}></QuestionModalys>
+						: ""
 				}
-
 				{/*顶部*/}
+				<div id={"questionid"}></div>
 
 				<Headplugselections
 					disciplinesdata={this.state.disciplinesdata}
@@ -923,43 +1119,51 @@ class NewMyShixunModel extends Component {
 					{...this.state}
 					setdifficulty={(e) => this.setdifficulty(e)}
 					setitem_types={(e) => this.setitem_types(e)}
-					setdiscipline_id={(e)=>this.setdiscipline_id(e)}
-					setsub_discipline_id={(e)=>this.setsub_discipline_id(e)}
-					settag_discipline_id={(e)=>this.settag_discipline_id(e)}
+					setdiscipline_id={(e) => this.setdiscipline_id(e)}
+					setsub_discipline_id={(e) => this.setsub_discipline_id(e)}
+					settag_discipline_id={(e) => this.settag_discipline_id(e)}
 				/>
 				{/*头部*/}
 				<Contentpart {...this.state} {...this.props}
-										 exam_id={this.props.exam_id}
-										 Isitapopup={"true"}
-										 getitem_basketss={(id)=>this.getitem_basketss(id)}
-										 selectallquestionsonthispage={()=>this.selectallquestionsonthispage()}
-										 getitem_baskets={(e)=>this.getitem_baskets(e)}
-										 setdatafuns={(e) => this.setdatafuns(e)}
-										 setdatafunsval={(e) => this.setdatafunsval(e)}
-										 handleVisibleChanges={(e) => this.handleVisibleChanges(e)}
-										 handleVisibleChange={(e) => this.handleVisibleChange(e)}
-										 showmodels={(e) => this.showmodels(e)}
-										 showmodelysl={(e) => this.showmodelysl(e)}
-										 callback={(e) => this.callback(e)}
-										 setoj_status={(e)=>this.setoj_status(e)}></Contentpart>
+					Contentdata={Contentdata}
+					exam_id={this.props.exam_id}
+					Isitapopup={"true"}
+					Datacount={Datacount}
+					Datacountbool={true}
+					chakanjiexiboolindex={this.state.chakanjiexiboolindex}
+					chakanjiexibool={(e) => this.chakanjiexibool(e)}
+					getitem_basketss={(id) => this.getitem_basketss(id)}
+					selectallquestionsonthispage={(bool) => this.selectallquestionsonthispage(bool)}
+					getitem_baskets={(e) => this.getitem_baskets(e)}
+					setdatafuns={(e) => this.setdatafuns(e)}
+					setdatafunsval={(e) => this.setdatafunsval(e)}
+					handleVisibleChanges={(e) => this.handleVisibleChanges(e)}
+					handleVisibleChange={(e) => this.handleVisibleChange(e)}
+					showmodels={(e) => this.showmodels(e)}
+					showmodelysl={(e) => this.showmodelysl(e)}
+					callback={(e) => this.callback(e)}
+					setoj_status={(e) => this.setoj_status(e)}
+					showmodelsInaudit={(e) => this.showmodelsInaudit(e)}
+					setasprivates={(e) => this.setasprivates(e)}
+				></Contentpart>
 
 				{
-					items_count&&items_count>10?
+					items_count && items_count > 10 ?
 						<div className="mb30 clearfix educontent mt40 intermediatecenter">
 							<Pagination showQuickJumper current={page} onChange={this.paginationonChange}
-													pageSize={per_page}
-													total={items_count}></Pagination>
+								pageSize={per_page}
+								total={items_count}></Pagination>
 						</div>
-						:<div className="h30 clearfix educontent mt40 intermediatecenter">
+						: <div className="h30 clearfix educontent mt40 intermediatecenter">
 
 						</div>
 				}
 
 
 				<Bottomsubmit {...this.props} {...this.state} bottomvalue={"确定"}
-											Cohetepaperbool={true}
-											setCohetepaperbool={() => this.props.setnewmyshixunmodelbool(false)}
-											onSubmits={() => this.props.setnewmyshixunmodelbool(false)} url={'/paperlibrary'}></Bottomsubmit>
+					Cohetepaperbool={true}
+					setCohetepaperbool={() => this.props.setnewmyshixunmodelbool(false)}
+					onSubmits={() => this.props.setnewmyshixunmodelbool(false)} url={'/paperlibrary'}></Bottomsubmit>
 			</div>
 		)
 
diff --git a/src/modules/question/Paperreview.js b/src/modules/question/Paperreview.js
index 2adc77c0..3c2030f8 100644
--- a/src/modules/question/Paperreview.js
+++ b/src/modules/question/Paperreview.js
@@ -1,32 +1,18 @@
 import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl} from 'educoder';
+import { SnackbarHOC} from 'educoder';
 import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb
-} from "antd";
+import { Breadcrumb } from "antd";
 import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
-import Itembankstop from "./component/Itembankstop";
-import NoneData from './component/NoneData';
 import './questioncss/questioncom.css';
 import '../tpm/newshixuns/css/Newshixuns.css';
-import Choicequestion from './component/Choicequestion';
-import SingleEditor from "./component/SingleEditor";
-import ChoquesEditor from "./component/ChoquesEditor"
-import JudquestionEditor from "./component/JudquestionEditor";
+
 import Paperreview_item from "./Paperreview_item"
 import Bottomsubmit from "../../modules/modals/Bottomsubmit";
 import Comthetestpaperst from "./comthetestpaper/Comthetestpaperst";
 import NewMyShixunModel from "../question/NewMyShixunModel";
 import IntelligentModel from "../question/component/IntelligentModel"
 //人工组卷预览
+let Changes=true;
 class Paperreview extends Component {
 	constructor(props) {
 		super(props);
@@ -56,19 +42,10 @@ class Paperreview extends Component {
 			Intelligentformation:false,
 
 		}
-		// single_questions:null, 单选题
-		// 	multiple_questions:null, 多选题
-		// 	judgement_questions:null, 判断题
-		// 	program_questions:null, 编程题
-		// 	all_score:0,  所有分数
-		// 	all_questions_count:0 所有问题数
-
 	}
 
 	//初始化
 	componentDidMount() {
-		//console.log("Paperreview.js");
-		//console.log(this.props.match.params);
 		this.setState({
 			artificialtype:this.props.match.params.type
 		})
@@ -235,7 +212,9 @@ class Paperreview extends Component {
 						.then((result) => {
 							if (result.data.status === 0) {
 								// this.props.showNotification(`组卷成功`);
-								this.props.history.replace('/paperlibrary');
+								// console.log(result.data.exam_id);
+								//本来调试卷库首页的
+								this.props.history.replace('/paperlibrary/see/'+result.data.exam_id);
 							}
 						}).catch((error) => {
 						//console.log(error);
@@ -331,20 +310,30 @@ class Paperreview extends Component {
 	}
 	//换题
 	Changingtopics=(id)=>{
-		const url=`/examination_intelligent_settings/${this.props.match.params.id}/exchange_one_item.json`;
-		let data={
-			item_id:id,
+		if(Changes===true){
+			Changes=false;
+			const url=`/examination_intelligent_settings/${this.props.match.params.id}/exchange_one_item.json`;
+			let data={
+				item_id:id,
+			}
+			axios.post(url, data)
+				.then((result) => {
+					if (result.data.status == 0) {
+						//console.log(result);
+						var data = {}
+						this.getdata(data);
+					}
+					setTimeout(()=>{
+						Changes=true;
+					},1000);
+				}).catch((error) => {
+				//console.log(error);
+				setTimeout(()=>{
+					Changes=true;
+				},1000);
+			})
 		}
-		axios.post(url, data)
-			.then((result) => {
-				if (result.data.status == 0) {
-					//console.log(result);
-					var data = {}
-					this.getdata(data);
-				}
-			}).catch((error) => {
-			//console.log(error);
-		})
+
 	}
 
 	setIntelligentformation=(bool)=>{
@@ -384,7 +373,7 @@ class Paperreview extends Component {
 					{
 						newmyshixunmodelbool===true?
 							<div className="fangdatwo">
-								<NewMyShixunModel {...this.props} {...this.state} exam_id={this.props.match.params.id} 	setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}></NewMyShixunModel>
+								<NewMyShixunModel {...this.props} {...this.state} Contentdata={this.state.Contentdata} exam_id={this.props.match.params.id} 	setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}></NewMyShixunModel>
 							</div>
 							:
 							""
@@ -406,19 +395,19 @@ class Paperreview extends Component {
 								Cohetepaperbool===false?
 									artificialtype==="artificial"?
 										<Breadcrumb separator=">">
-											<Breadcrumb.Item href="/question">试题库</Breadcrumb.Item>
-											<Breadcrumb.Item className={"xiaoshou"}>人工组卷</Breadcrumb.Item>
+											<Breadcrumb.Item >试题库</Breadcrumb.Item>
+											<Breadcrumb.Item className={"xiaoshou"} href="/problemset">人工组卷</Breadcrumb.Item>
 											<Breadcrumb.Item className={"xiaoshout"}>试卷预览</Breadcrumb.Item>
 										</Breadcrumb>
 										:
 										<Breadcrumb separator=">">
-											<Breadcrumb.Item href="/paperlibrary">试卷库</Breadcrumb.Item>
-											<Breadcrumb.Item className={"/Integeneration"}>智能组卷</Breadcrumb.Item>
+											<Breadcrumb.Item >试卷库</Breadcrumb.Item>
+											<Breadcrumb.Item className={"/Integeneration"}  href="/paperlibrary">智能组卷</Breadcrumb.Item>
 											<Breadcrumb.Item className={"xiaoshout"}>试卷预览</Breadcrumb.Item>
 										</Breadcrumb>
 									:
 									<Breadcrumb separator=">">
-										<Breadcrumb.Item href="/question">试题库</Breadcrumb.Item>
+										<Breadcrumb.Item href="/problemset">试题库</Breadcrumb.Item>
 										<Breadcrumb.Item className={"xiaoshou"}>新增试卷</Breadcrumb.Item>
 									</Breadcrumb>
 							}
@@ -427,11 +416,12 @@ class Paperreview extends Component {
 
 						{
 							Cohetepaperbool===false?
-								<Paperreview_item {...this.state} {...this.props} Changingtopics={(e)=>this.Changingtopics(e)} Replacementtype={(e)=>this.Replacementtype(e)} getdata={(data)=>this.getdata(data)} setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}>
+								<Paperreview_item {...this.state} {...this.props}  artificialtype={artificialtype} Changingtopics={(e)=>this.Changingtopics(e)} Replacementtype={(e)=>this.Replacementtype(e)} getdata={(data)=>this.getdata(data)} setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}>
 
 								</Paperreview_item>
 								:
 								<Comthetestpaperst {...this.state} {...this.props}
+
 																	 getJudquestio={(ref) => this.getcontentMdRef(ref)}
 																	setitem_type={(item) => this.setitem_type(item)}
 
@@ -446,10 +436,20 @@ class Paperreview extends Component {
 
 
 				</div>
+				<style>
+					{
+						`
+						.newshixunbottombtn {
+    z-index: 800 !important;
+    }
+						`
+					}
+				</style>
 
 				<Bottomsubmit {...this.props} {...this.state} bottomvalue={Cohetepaperbool===false?"保存组卷":"完成"}
 											setCohetepaperbool={(bool)=>this.setCohetepaperbool(bool)}
-											onSubmits={() => this.preservation()} url={'/question'}></Bottomsubmit>
+											Cohetepaperbool={this.state.Cohetepaperbool}
+											onSubmits={() => this.preservation()} url={	artificialtype==="artificial"?'/problemset':'/paperlibrary'}></Bottomsubmit>
 			</div>
 		)
 
diff --git a/src/modules/question/Paperreview_item.js b/src/modules/question/Paperreview_item.js
index 0156b321..434aef5b 100644
--- a/src/modules/question/Paperreview_item.js
+++ b/src/modules/question/Paperreview_item.js
@@ -1,22 +1,7 @@
 import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, getImageUrl} from 'educoder';
 import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb
-} from "antd";
-import Itembankstop from "./component/Itembankstop";
-import NoneData from './component/NoneData';
 import './questioncss/questioncom.css';
 import '../tpm/newshixuns/css/Newshixuns.css';
-import Paperreview_single from './Paperreview_single';
 import {DragDropContext, Draggable, Droppable} from 'react-beautiful-dnd';
 import PaperDeletModel from './component/PaperDeletModel';
 import PaperDeletModels from './component/PaperDeletModels';
@@ -24,15 +9,6 @@ import Paperreview_itemModel from './component/Paperreview_itemModel';
 import Paperreview_itemModels from './component/Paperreview_itemModels';
 import Paperreview_items from './Paperreview_items';
 
-
-const reorder = (list, startIndex, endIndex) => {
-	const result = Array.from(list);
-	const [removed] = result.splice(startIndex, 1);
-	result.splice(endIndex, 0, removed);
-
-	return result;
-};
-
 class Paperreview_item extends Component {
 	constructor(props) {
 		super(props);
@@ -58,36 +34,23 @@ class Paperreview_item extends Component {
 
 	}
 
-	//初始化
-	componentDidMount() {
-
-
-	}
-
-
-	getdata = (data) => {
-
-	}
-
-	preservation = () => {
-
-
-	}
-
-
-	setitem_type = (item_type) => {
-
-
-	}
 	onDragEnd = (result) => {
 
 		const ids = this.props.single_questions.questions[result.source.index].id;
 		const positions = this.props.single_questions.questions[result.destination.index].position;
 
 		const url = `/item_baskets/${ids}/adjust_position.json`
-		var data = {
-			position: positions
+		if(this.props.match.params.type==="Intelligence") {
+			var data = {
+				position: positions,
+				exam_setting_id:this.props.match.params.id,
+			}
+		}else {
+			var data = {
+				position: positions
+			}
 		}
+
 		axios.post(url, data)
 			.then((result) => {
 				if (result.data.status == 0) {
@@ -104,8 +67,18 @@ class Paperreview_item extends Component {
 		const ids = this.props.multiple_questions.questions[result.source.index].id;
 		const positions = this.props.multiple_questions.questions[result.destination.index].position;
 		const url = `/item_baskets/${ids}/adjust_position.json`
-		var data = {
-			position: positions
+
+		if(this.props.match.params.type==="Intelligence") {
+			var data = {
+				position: positions,
+				exam_setting_id:this.props.match.params.id,
+			}
+
+		}else {
+			var data = {
+				position: positions
+			}
+
 		}
 		axios.post(url, data)
 			.then((result) => {
@@ -125,8 +98,18 @@ class Paperreview_item extends Component {
 		const ids = this.props.judgement_questions.questions[result.source.index].id;
 		const positions = this.props.judgement_questions.questions[result.destination.index].position;
 		const url = `/item_baskets/${ids}/adjust_position.json`
-		var data = {
-			position: positions
+
+
+		if(this.props.match.params.type==="Intelligence") {
+			var data = {
+				position: positions,
+				exam_setting_id:this.props.match.params.id,
+			}
+
+		}else {
+			var data = {
+				position: positions
+			}
 		}
 		axios.post(url, data)
 			.then((result) => {
@@ -145,8 +128,18 @@ class Paperreview_item extends Component {
 		const ids = this.props.program_questions.questions[result.source.index].id;
 		const positions = this.props.program_questions.questions[result.destination.index].position;
 		const url = `/item_baskets/${ids}/adjust_position.json`
-		var data = {
-			position: positions
+
+
+
+		if(this.props.match.params.type==="Intelligence") {
+			var data = {
+				position: positions,
+				exam_setting_id:this.props.match.params.id,
+			}
+		}else {
+			var data = {
+				position: positions
+			}
 		}
 		axios.post(url, data)
 			.then((result) => {
@@ -176,22 +169,43 @@ class Paperreview_item extends Component {
 	}
 
 	setDownloady = (fenshu) => {
-		const url = "/item_baskets/batch_set_score.json";
-		var data = {
-			score: fenshu,
-			item_type: this.state.titilesm === "单选题" ? "SINGLE" : this.state.titilesm === "多选题" ? "MULTIPLE" : this.state.titilesm === "判断题" ? "JUDGMENT" : this.state.titilesm === "编程题" ? "PROGRAM" : '',
+		if(this.props.match.params.type==="Intelligence") {
+			//智能选题
+			const url = "/item_baskets/batch_set_score.json";
+			var data = {
+				score: fenshu,
+				item_type: this.state.titilesm === "单选题" ? "SINGLE" : this.state.titilesm === "多选题" ? "MULTIPLE" : this.state.titilesm === "判断题" ? "JUDGMENT" : this.state.titilesm === "编程题" ? "PROGRAM" : '',
+				exam_setting_id:this.props.match.params.id,
+			}
+			axios.post(url, data)
+				.then((result) => {
+					if (result.data.status == 0) {
+						// this.props.showNotification(`调分成功`);
+						this.props.getdata({});
+						this.Singlemagazine("", false);
+					}
+				}).catch((error) => {
+				//console.log(error);
+			})
+		}else{
+			const url = "/item_baskets/batch_set_score.json";
+			var data = {
+				score: fenshu,
+				item_type: this.state.titilesm === "单选题" ? "SINGLE" : this.state.titilesm === "多选题" ? "MULTIPLE" : this.state.titilesm === "判断题" ? "JUDGMENT" : this.state.titilesm === "编程题" ? "PROGRAM" : '',
 
+			}
+			axios.post(url, data)
+				.then((result) => {
+					if (result.data.status == 0) {
+						// this.props.showNotification(`调分成功`);
+						this.props.getdata({});
+						this.Singlemagazine("", false);
+					}
+				}).catch((error) => {
+				//console.log(error);
+			})
 		}
-		axios.post(url, data)
-			.then((result) => {
-				if (result.data.status == 0) {
-					// this.props.showNotification(`调分成功`);
-					this.props.getdata({});
-					this.Singlemagazine("", false);
-				}
-			}).catch((error) => {
-			//console.log(error);
-		})
+
 	}
 
 	setDownloadys=(value)=>{
@@ -239,27 +253,48 @@ class Paperreview_item extends Component {
 				modalsTypedel: bool,
 				titilesms: names
 			})
-			const url = `/item_baskets/delete_item_type.json`;
-			axios.delete((url), {
-					data: {
-						item_type: names
-					}
-				})
-				.then((response) => {
-					if (response.data.status == 0) {
-						// this.props.showNotification('大题删除成功');
-						this.props.getdata({});
-						this.setState({
-							titilesms: ""
-						})
-					}
-				})
-				.catch(function (error) {
-					////console.log(error);
-				});
-
-
+			if(this.props.match.params.type==="Intelligence") {
+				//智能组卷
+				const url = `/item_baskets/delete_item_type.json`;
+				axios.delete((url), {
+						data: {
+							item_type: names,
+							exam_setting_id:this.props.match.params.id,
+						}
+					})
+					.then((response) => {
+						if (response.data.status == 0) {
+							// this.props.showNotification('大题删除成功');
+							this.props.getdata({});
+							this.setState({
+								titilesms: ""
+							})
+						}
+					})
+					.catch(function (error) {
+						////console.log(error);
+					});
 
+			}else{
+				const url = `/item_baskets/delete_item_type.json`;
+				axios.delete((url), {
+						data: {
+							item_type: names
+						}
+					})
+					.then((response) => {
+						if (response.data.status == 0) {
+							// this.props.showNotification('大题删除成功');
+							this.props.getdata({});
+							this.setState({
+								titilesms: ""
+							})
+						}
+					})
+					.catch(function (error) {
+						////console.log(error);
+					});
+			}
 		}
 
 	}
@@ -271,17 +306,35 @@ class Paperreview_item extends Component {
 			})
 		}else {
 			//确定
-			const url = `/item_baskets/${this.state.item_bank_id}.json`;
-			axios.delete((url))
-				.then((response) => {
-					if (response.data.status == 0) {
-						// this.props.showNotification('试题删除成功');
-						this.props.getdata({});
-					}
-				})
-				.catch(function (error) {
+			if(this.props.match.params.type==="Intelligence"){
+				//智能组卷
+				const url = `/item_baskets/${this.state.item_bank_id}.json`;
+				axios.delete(url, { data: {
+							exam_setting_id: this.props.match.params.id,
+						}})
+					.then((response) => {
+						if (response.data.status == 0) {
+							// this.props.showNotification('试题删除成功');
+							this.props.getdata({});
+						}
+					})
+					.catch(function (error) {
+
+					});
+			}else{
+				const url = `/item_baskets/${this.state.item_bank_id}.json`;
+				axios.delete(url)
+					.then((response) => {
+						if (response.data.status == 0) {
+							// this.props.showNotification('试题删除成功');
+							this.props.getdata({});
+						}
+					})
+					.catch(function (error) {
+
+					});
+			}
 
-				});
 
 			this.setState({
 				modalsTypedels: bool,
@@ -291,7 +344,8 @@ class Paperreview_item extends Component {
 	}
 
 	showsetmodalsTypedels=(id,bool,type)=>{
-		debugger
+		console.log("Paperreview_item");
+
 		this.setState({
 			item_bank_id:id,
 		})
@@ -360,7 +414,7 @@ class Paperreview_item extends Component {
 	}
 
 	jixuxuantioncli = () => {
-		this.props.history.replace("/question");
+		this.props.history.replace("/problemset");
 	}
 
 	showparagraphs = (e,name) => {
@@ -375,14 +429,6 @@ class Paperreview_item extends Component {
 			programbool: false,
 		})
 	}
-
-	Setscore=(id)=>{
-
-
-	}
-
-
-
 	render() {
 		let {
 			questions, totalscore, total, modalsTypedel, modalsTypey, modalsTypedels,
@@ -394,6 +440,7 @@ class Paperreview_item extends Component {
 			modalsTypeys
 		} = this.state;
 		let {single_questions, multiple_questions, judgement_questions, program_questions, all_score} = this.props;
+
 		return (
 			<div className=" clearfix  educontent Contentquestionbankstyle w100s w1200wuh mt19">
 				{
diff --git a/src/modules/question/Paperreview_items.js b/src/modules/question/Paperreview_items.js
index 75ed4a24..92b6f52b 100644
--- a/src/modules/question/Paperreview_items.js
+++ b/src/modules/question/Paperreview_items.js
@@ -1,66 +1,14 @@
 import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, getImageUrl,markdownToHTML} from 'educoder';
-import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb
-} from "antd";
-import Itembankstop from "./component/Itembankstop";
-import NoneData from './component/NoneData';
 import './questioncss/questioncom.css';
 import '../tpm/newshixuns/css/Newshixuns.css';
 import Paperreview_single from "./Paperreview_single";
 
 //判断题
 class Paperreview_items extends Component {
-	constructor(props) {
-		super(props);
-
-		this.state = {
-
-		}
-
-	}
-
-	//初始化
-	componentDidMount() {
-
-
-
-
-	}
-
-
-	getdata = (data) => {
-
-	}
-
-	preservation = () => {
-
-
-
-
-	}
-
-
-	setitem_type = (item_type) => {
-
-
-	}
 
 	render() {
 		let {paperreviewsingleindex,paperreviewsinglename,typenames,indexs,object,typenamesn}=this.props;
 
-		// //console.log(object);
-		// //console.log("Paperreview_items");
-		// //console.log(object.item_id);
 		return (
 			<div>
 				{
diff --git a/src/modules/question/Paperreview_judgment.js b/src/modules/question/Paperreview_judgment.js
deleted file mode 100644
index c2736356..00000000
--- a/src/modules/question/Paperreview_judgment.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, getImageUrl,markdownToHTML} from 'educoder';
-import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb
-} from "antd";
-import Itembankstop from "./component/Itembankstop";
-import NoneData from './component/NoneData';
-import './questioncss/questioncom.css';
-import '../tpm/newshixuns/css/Newshixuns.css';
-
-//判断题
-class Paperreview_judgment extends Component {
-	constructor(props) {
-		super(props);
-
-		this.state = {
-			questions:0,
-			totalscore:0,
-			total:0,
-
-		}
-
-	}
-
-	//初始化
-	componentDidMount() {
-
-
-
-
-	}
-
-
-	getdata = (data) => {
-
-	}
-
-	preservation = () => {
-
-
-
-
-	}
-
-
-	setitem_type = (item_type) => {
-
-
-	}
-
-	render() {
-		let {questions,totalscore,total,items} = this.state;
-		// ////console.log(params);
-		return (
-			<div className="w100s borderwdswuh  mt25 mb20 " style={{
-				minHeight: "114px",
-			}}>
-
-
-				{/*顶部*/}
-				<div className="w100s sortinxdirection">
-					<div className=" listjihetixingstit markdown-body"  style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}>
-					</div>
-				</div>
-				{/*内容*/}
-				{/*<div className="w100s sortinxdirection">*/}
-
-				{/*	<p className="w100s listjihetixingstits sortinxdirection ">*/}
-				{/*		{*/}
-				{/*			items.item_type==="JUDGMENT"?*/}
-				{/*				items === undefined ||items === null? "" : items.choices.map((object, index) => {*/}
-				{/*					return (*/}
-				{/*						<p className={index===1? "sortinxdirection  ml10":"sortinxdirection  " }  >*/}
-				{/*							<Radio checked={object.is_answer}>*/}
-				{/*								{object.choice_text}*/}
-				{/*							</Radio>*/}
-				{/*						</p>*/}
-				{/*					)*/}
-				{/*				})*/}
-				{/*				:*/}
-				{/*				items === undefined ||items === null? "" : items.choices.map((object, index) => {*/}
-				{/*					return (*/}
-				{/*						<p className="sortinxdirection " >*/}
-				{/*							{tagArray[index]}*/}
-				{/*							<p style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(object.choice_text).replace(/▁/g, "▁▁▁")}}></p>*/}
-				{/*						</p>*/}
-				{/*					)*/}
-				{/*				})*/}
-				{/*		}*/}
-
-				{/*	</p>*/}
-				{/*</div>*/}
-			</div>
-		)
-
-	}
-
-
-}
-
-export default Paperreview_judgment
-
-
diff --git a/src/modules/question/Paperreview_multlple.js b/src/modules/question/Paperreview_multlple.js
deleted file mode 100644
index 8e1cdc64..00000000
--- a/src/modules/question/Paperreview_multlple.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, getImageUrl,markdownToHTML} from 'educoder';
-import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb
-} from "antd";
-import Itembankstop from "./component/Itembankstop";
-import NoneData from './component/NoneData';
-import './questioncss/questioncom.css';
-import '../tpm/newshixuns/css/Newshixuns.css';
-
-//多选题
-class Paperreview_multlple extends Component {
-	constructor(props) {
-		super(props);
-
-		this.state = {
-			questions:0,
-			totalscore:0,
-			total:0,
-
-		}
-
-	}
-
-	//初始化
-	componentDidMount() {
-
-
-
-
-	}
-
-
-	getdata = (data) => {
-
-	}
-
-	preservation = () => {
-
-
-
-
-	}
-
-
-	setitem_type = (item_type) => {
-
-
-	}
-
-	render() {
-		let {questions,totalscore,total,items} = this.state;
-		// ////console.log(params);
-		return (
-			<div className="w100s borderwdswuh  mt25 mb20 " style={{
-				minHeight: "114px",
-			}}>
-
-
-				{/*顶部*/}
-				<div className="w100s sortinxdirection">
-					<div className=" listjihetixingstit markdown-body"  style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}>
-					</div>
-				</div>
-				{/*内容*/}
-				{/*<div className="w100s sortinxdirection">*/}
-
-				{/*	<p className="w100s listjihetixingstits sortinxdirection ">*/}
-				{/*		{*/}
-				{/*			items.item_type==="JUDGMENT"?*/}
-				{/*				items === undefined ||items === null? "" : items.choices.map((object, index) => {*/}
-				{/*					return (*/}
-				{/*						<p className={index===1? "sortinxdirection  ml10":"sortinxdirection  " }  >*/}
-				{/*							<Radio checked={object.is_answer}>*/}
-				{/*								{object.choice_text}*/}
-				{/*							</Radio>*/}
-				{/*						</p>*/}
-				{/*					)*/}
-				{/*				})*/}
-				{/*				:*/}
-				{/*				items === undefined ||items === null? "" : items.choices.map((object, index) => {*/}
-				{/*					return (*/}
-				{/*						<p className="sortinxdirection " >*/}
-				{/*							{tagArray[index]}*/}
-				{/*							<p style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(object.choice_text).replace(/▁/g, "▁▁▁")}}></p>*/}
-				{/*						</p>*/}
-				{/*					)*/}
-				{/*				})*/}
-				{/*		}*/}
-
-				{/*	</p>*/}
-				{/*</div>*/}
-			</div>
-		)
-
-	}
-
-
-}
-
-export default Paperreview_multlple
-
-
diff --git a/src/modules/question/Paperreview_program.js b/src/modules/question/Paperreview_program.js
deleted file mode 100644
index a7565b52..00000000
--- a/src/modules/question/Paperreview_program.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, getImageUrl,markdownToHTML} from 'educoder';
-import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb
-} from "antd";
-import Itembankstop from "./component/Itembankstop";
-import NoneData from './component/NoneData';
-import './questioncss/questioncom.css';
-import '../tpm/newshixuns/css/Newshixuns.css';
-
-//编程题
-class Paperreview_program extends Component {
-	constructor(props) {
-		super(props);
-
-		this.state = {
-			questions:0,
-			totalscore:0,
-			total:0,
-
-		}
-
-	}
-
-	//初始化
-	componentDidMount() {
-
-
-
-
-	}
-
-
-	getdata = (data) => {
-
-	}
-
-	preservation = () => {
-
-
-
-
-	}
-
-
-	setitem_type = (item_type) => {
-
-
-	}
-
-	render() {
-		let {questions,totalscore,total,items} = this.state;
-		// ////console.log(params);
-		return (
-			<div className="w100s borderwdswuh  mt25 mb20 " style={{
-				minHeight: "114px",
-			}}>
-
-
-				{/*顶部*/}
-				<div className="w100s sortinxdirection">
-					<div className=" listjihetixingstit markdown-body"  style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}>
-					</div>
-				</div>
-				{/*内容*/}
-				{/*<div className="w100s sortinxdirection">*/}
-
-				{/*	<p className="w100s listjihetixingstits sortinxdirection ">*/}
-				{/*		{*/}
-				{/*			items.item_type==="JUDGMENT"?*/}
-				{/*				items === undefined ||items === null? "" : items.choices.map((object, index) => {*/}
-				{/*					return (*/}
-				{/*						<p className={index===1? "sortinxdirection  ml10":"sortinxdirection  " }  >*/}
-				{/*							<Radio checked={object.is_answer}>*/}
-				{/*								{object.choice_text}*/}
-				{/*							</Radio>*/}
-				{/*						</p>*/}
-				{/*					)*/}
-				{/*				})*/}
-				{/*				:*/}
-				{/*				items === undefined ||items === null? "" : items.choices.map((object, index) => {*/}
-				{/*					return (*/}
-				{/*						<p className="sortinxdirection " >*/}
-				{/*							{tagArray[index]}*/}
-				{/*							<p style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(object.choice_text).replace(/▁/g, "▁▁▁")}}></p>*/}
-				{/*						</p>*/}
-				{/*					)*/}
-				{/*				})*/}
-				{/*		}*/}
-
-				{/*	</p>*/}
-				{/*</div>*/}
-			</div>
-		)
-
-	}
-
-
-}
-
-export default Paperreview_program
-
-
diff --git a/src/modules/question/Paperreview_single.js b/src/modules/question/Paperreview_single.js
index 0875506e..7a38fa75 100644
--- a/src/modules/question/Paperreview_single.js
+++ b/src/modules/question/Paperreview_single.js
@@ -1,23 +1,9 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, getImageUrl, markdownToHTML} from 'educoder';
-import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb,
-	Radio
-} from "antd";
-import Itembankstop from "./component/Itembankstop";
-import NoneData from './component/NoneData';
+import React, { Component } from "react";
+import { Radio } from "antd";
 import './questioncss/questioncom.css';
 import '../tpm/newshixuns/css/Newshixuns.css';
-import QuillForEditor from "../../common/quillForEditor";
+import QuestionModalPicture from "./component/QuestionModalPicture";
+import RenderHtml from "../../components/render-html";
 
 const tagArray = [
 	'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．',
@@ -26,6 +12,7 @@ const tagArray = [
 ]
 
 //单选题
+//Paperlibraryseeid_items.js Listjihe.js
 class Paperreview_single extends Component {
 	constructor(props) {
 		super(props);
@@ -34,68 +21,57 @@ class Paperreview_single extends Component {
 			questions: 0,
 			totalscore: 0,
 			total: 0,
+			url: ""
+
 		}
 
 	}
 
-	//初始化
-	componentDidMount() {
-
-
+	handleShowUploadImage = (url) => {
+		this.setState({
+			url: url
+		})
 	}
-
-
-	getdata = (data) => {
-
+	handleClose = () => {
+		this.setState({
+			url: '',
+		})
 	}
-
-	preservation = () => {
-
-
-	}
-
-
-	setitem_type = (item_type) => {
-
-
-	}
-	showparagraph = (indexx) => {
-
-
-	}
-	Singlemagaziness = () => {
-
-	}
-
 	render() {
-		let {questions, totalscore, total, items} = this.state;
-		let {objectsingle, indexx, paperreviewsingleindex, indexxy,name} = this.props;
+		let { questions, totalscore, total, items, url } = this.state;
+		let { objectsingle, indexx, paperreviewsingleindex, indexxy, name } = this.props;
 
 
-		var itemssname="";
-		try {
-			itemssname= JSON.parse(objectsingle.name);
-		}catch (e) {
-			itemssname=objectsingle.name;
-		}
-		if(itemssname===undefined){
-			itemssname=objectsingle.name
+		var itemssname = objectsingle.name;
+		if (itemssname) {
+			try {
+				itemssname = JSON.parse(itemssname);
+			} catch (e) {
+				itemssname = objectsingle.name;
+			}
+
 		}
 
-		var itemsnamesy="";
-		try {
-			itemsnamesy= JSON.parse(objectsingle&&objectsingle.program_attr&&objectsingle.program_attr.description);
+		var itemsnamesy = objectsingle && objectsingle.program_attr && objectsingle.program_attr.description;
+		if (itemsnamesy) {
+			try {
+				itemsnamesy = JSON.parse(itemsnamesy);
+			} catch (e) {
+				itemsnamesy = objectsingle && objectsingle.program_attr && objectsingle.program_attr.description;
+			}
 
-		}catch (e) {
-			itemsnamesy=objectsingle&&objectsingle.program_attr&&objectsingle.program_attr.description;
 		}
-
 		return (
 			<div key={indexxy}
-					 className={ "w100s borderwdswuh   mb20  pd20 "}
-					 onMouseEnter={() => this.props.showparagraphs(indexxy,name)} style={{
-				minHeight: "114px",
-			}}>
+				className={"w100s borderwdswuh   mb20  pd20 "}
+				onMouseEnter={() => this.props.showparagraphs(indexxy, name)} style={{
+					minHeight: "114px",
+				}}>
+				{url ?
+					<QuestionModalPicture  {...this.props} {...this.state} handleClose={() => this.handleClose()}></QuestionModalPicture>
+					:
+					""
+				}
 				<style>{
 					`
 						.programquill .ql-editor{
@@ -121,7 +97,7 @@ class Paperreview_single extends Component {
 				{/*顶部*/}
 				<div className="w100s sortinxdirection ">
 					<div className=" sortinxdirection ">
-						<p className="cretitlecolrlis lh28">{indexx}</p>、
+						<p className="cretitlecolrlis lh28" style={{ fontWeight: "bold" }}>{indexx}</p>、
 					</div>
 					<style>
 						{
@@ -132,45 +108,43 @@ class Paperreview_single extends Component {
                  line-height: 28px;
 
 					}
+						
 					.markdown-body p {
 					 color: #333333;
 					 font-size: 14px !important;
 					     line-height: 28px;
+					      font-weight: bold;
 
 					}
+					.bodyysls .ql-editor p span{
+							   font-weight: bold;
+						}
+				
 					`
 						}
 					</style>
 					{
-						objectsingle.item_type==="PROGRAM"?
-						   <div className="w100s sortinxdirection">
-								 <div className=" tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word",
-									 minWidth:"32px"
-								 }}
-								 >
-									 ({objectsingle.score}分)
+						objectsingle.item_type === "PROGRAM" ?
+							<div className="w100s sortinxdirection">
+								<div className=" tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{
+									wordBreak: "break-word",
+									minWidth: "32px", fontWeight: "bold"
+								}}
+								>
+									({objectsingle.score}分)
 								 </div>
-								 <div className="ml10 lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word"}}
-											dangerouslySetInnerHTML={{__html: markdownToHTML(objectsingle.name).replace(/▁/g, "▁▁▁")}}>
-
-								 </div>
-							 </div>
+								<RenderHtml value={itemssname} className="ml10 lh28 listjihetixingstit  cretitlecolrlist " />
+							</div>
 							:
 							<div className="w100s sortinxdirection">
-								<div className="tites  lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word",
-									minWidth:"32px"
+								<div className=" tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{
+									wordBreak: "break-word",
+									minWidth: "32px", fontWeight: "bold"
 								}}
 								>
 									({objectsingle.score}分)
 								</div>
-							<div className="ml10 lh28 listjihetixingstit  cretitlecolrlist programquill" style={{wordBreak: "break-word"}}
-		          >
-								<QuillForEditor
-									readOnly={true}
-									value={itemssname}
-								/>
-
-							</div>
+								<RenderHtml value={itemssname} className="ml10 lh28 listjihetixingstit  cretitlecolrlist " />
 							</div>
 					}
 
@@ -186,7 +160,7 @@ class Paperreview_single extends Component {
 									objectsingle === undefined || objectsingle === null ? "" : objectsingle.choices.map((object, index) => {
 										return (
 											<p className={index === 1 ? "sortinxdirection  ml10" : "sortinxdirection  "}>
-												<Radio  disabled={true}>
+												<Radio disabled={true}>
 													{object.choice_text}
 												</Radio>
 											</p>
@@ -199,43 +173,48 @@ class Paperreview_single extends Component {
 								<p className="w100s listjihetixingstitssy sortinxdirection ">
 									<p className={"sortinxdirection  mt15"}>
 										{
-											objectsingle&&objectsingle.program_attr&&objectsingle.program_attr.description?
-										<p className="programquill" style={{wordBreak: "break-word"}}
-										>
-										<QuillForEditor
-											readOnly={true}
-											value={itemsnamesy}
-										/>
-									</p>
-											:
-												""}
+											objectsingle && objectsingle.program_attr && objectsingle.program_attr.description ?
+												<div className="programquill " style={{ wordBreak: "break-word" }}
+												>
+													{
+														itemsnamesy === null || itemsnamesy === undefined ?
+															null
+															:
+															<RenderHtml value={itemsnamesy} />
+
+													}
+
+												</div>
+												:
+												null}
 									</p>
 								</p>
 								:
 								<p className="w100s listjihetixingstits verticallayout ">
 									{
 										objectsingle === undefined || objectsingle === null ? "" : objectsingle.choices.map((object, index) => {
-											 var string=""
-											try {
-												string=JSON.parse(object.choice_text);
-											}catch (e) {
-												string=object.choice_text;
+											var string = object.choice_text;
+
+											if (string) {
+												try {
+													string = JSON.parse(string);
+												} catch (e) {
+													string = object.choice_text;
+												}
+
 											}
 
 											return (
 												<p key={index} className={index === 0 ? "sortinxdirection" : "sortinxdirection  mt15"}>
 													{tagArray[index]}
-													<p className="programquills" style={{wordBreak: "break-word"}}>
+													<p className="programquills" style={{ wordBreak: "break-word" }}>
 														{object ?
-															object.choice_text === undefined || object.choice_text=== null || object.choice_text === "" ?
+															object.choice_text === undefined || object.choice_text === null || object.choice_text === "" ?
 																""
 																:
-																object.choice_text.length>0?
-																	<QuillForEditor
-																		readOnly={true}
-																		value={string}
-																	/>
-																	:""
+																object.choice_text.length > 0 ?
+																	<RenderHtml value={string} />
+																	: ""
 															:
 															""
 														}
diff --git a/src/modules/question/Question.js b/src/modules/question/Question.js
index f1f13925..35b8518b 100644
--- a/src/modules/question/Question.js
+++ b/src/modules/question/Question.js
@@ -1,41 +1,37 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl} from 'educoder';
+import React, { Component } from "react";
+import { SnackbarHOC } from 'educoder';
 import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Tooltip
-} from "antd";
-import {parabola} from './animation/parabola'
+import { Pagination, Drawer, } from "antd";
 import Headplugselections from "./component/Headplugselections";
 import QuestionModal from "./component/QuestionModal";
 import QuestionModals from "./component/QuestionModals";
 import Contentpart from "./component/Contentpart";
-import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
+import { TPMIndexHOC } from "../tpm/TPMIndexHOC";
 import NoneData from './component/NoneData';
 import './questioncss/questioncom.css';
 import SiderBars from "../question/component/SiderBars";
+import QuestionModalys from "./component/QuestionModalys";
+import Certifiedprofessional from "../modals/Certifiedprofessional";
+import SiderBar from "../tpm/SiderBar";
 
+var Undoclickable = true;
+var myGrandtotal = false;
 class Question extends Component {
 	constructor(props) {
 		super(props);
 		this.state = {
 			count: 50,
-			defaultActiveKey:"1",
+			defaultActiveKey: "0",
 			Headertop: "",
 			Footerdown: "",
 			visible: false,
 			placement: 'right',
 			modalsType: false,
-			modalsTypes:false,
+			modalsTypeInaudit: false,
+			modalsTypes: false,
 			titilesm: "在平台审核后，所有成员均可使用试题",
 			titiless: "是否设置为公开？",
-			titilesms:"单选题",
+			titilesms: "单选题",
 			titbool: false,
 			Contentdata: [],
 			difficulty: null,
@@ -53,109 +49,113 @@ class Question extends Component {
 			program_questions_count: 0,
 			single_questions_count: 0,
 			subjective_questions_count: 0,
-			page:1,
-			per_page:10,
-			disciplinesdata:[],
-			discipline_id:null,
-			sub_discipline_id:null,
-			tag_discipline_id:null,
-			booljupyterurls:false,
-			disciplinesdatakc:0,
-			disciplinesdatazsd:0,
-			selectallquestionsonthispages:false,
-			oj_status:null,
+			page: 1,
+			per_page: 10,
+			disciplinesdata: [],
+			discipline_id: null,
+			sub_discipline_id: null,
+			tag_discipline_id: null,
+			booljupyterurls: false,
+			disciplinesdatakc: 0,
+			disciplinesdatazsd: 0,
+			selectallquestionsonthispages: false,
+			oj_status: null,
 			isVisible: false,
-			selectionbools:false,
-			chakanjiexiboolindex:"无",
+			selectionbools: false,
+			chakanjiexiboolindex: "无",
+			mydisplay: false,
+			occupation: 2,
+			myqyespull: true
 		}
 
 	}
 
-	chakanjiexibool=(index)=>{
-		if(this.state.chakanjiexiboolindex===index){
+	chakanjiexibool = (index) => {
+		if (this.state.chakanjiexiboolindex === index) {
 			this.setState({
-				chakanjiexiboolindex:"无",
+				chakanjiexiboolindex: "无",
 			})
 			return
 		}
 		this.setState({
-			chakanjiexiboolindex:index,
+			chakanjiexiboolindex: index,
 		})
 	}
-	setmychakanjiexibool=(str)=>{
+	setmychakanjiexibool = (str) => {
 		this.setState({
-			chakanjiexiboolindex:str,
+			chakanjiexiboolindex: str,
 		})
 	}
-	setdiscipline_id=(discipline_id)=>{
+	setdiscipline_id = (discipline_id) => {
 		this.setState({
-			discipline_id:discipline_id,
-			sub_discipline_id:null,
-			tag_discipline_id:null,
-			keywords:"",
-			page:1,
-			per_page:10,
-			oj_status:null
+			discipline_id: discipline_id,
+			sub_discipline_id: null,
+			tag_discipline_id: null,
+			keyword: "",
+			page: 1,
+			per_page: 10,
+			oj_status: null
 		})
 		var data = {
-			discipline_id:discipline_id,
-			sub_discipline_id:null,
-			tag_discipline_id:null,
+			discipline_id: discipline_id,
+			sub_discipline_id: null,
+			tag_discipline_id: null,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords: null,
+			keyword: null,
 			page: this.state.page,
-			per_page:10,
-			oj_status:null
+			per_page: 10,
+			oj_status: null
 		};
 		this.getdata(data);
 
 	}
 
-	setsub_discipline_id=(discipline_id,sub_discipline_id)=>{
+	setsub_discipline_id = (discipline_id, sub_discipline_id) => {
 		this.setState({
-			sub_discipline_id:sub_discipline_id,
-			tag_discipline_id:null,
-			keywords:"",
-			page:1,
-			per_page:10,
-			oj_status:null
+			sub_discipline_id: sub_discipline_id,
+			discipline_id: discipline_id,
+			tag_discipline_id: null,
+			keyword: "",
+			page: 1,
+			per_page: 10,
+			oj_status: null
 		})
 		var data = {
-			discipline_id:discipline_id,
-			sub_discipline_id:sub_discipline_id,
-			tag_discipline_id:null,
+			discipline_id: discipline_id,
+			sub_discipline_id: sub_discipline_id,
+			tag_discipline_id: null,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords:null,
+			keyword: null,
 			page: 1,
-			per_page:10,
-			oj_status:null
+			per_page: 10,
+			oj_status: null
 		};
 		this.getdata(data);
 	}
 
-	settag_discipline_id=(tag_discipline_id)=>{
+	settag_discipline_id = (tag_discipline_id) => {
 		this.setState({
-			tag_discipline_id:tag_discipline_id,
-			keywords:"",
-			page:1,
-			per_page:10,
-			oj_status:null
+			tag_discipline_id: tag_discipline_id,
+			keyword: "",
+			page: 1,
+			per_page: 10,
+			oj_status: null
 		})
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords: null,
+			keyword: null,
 			page: 1,
-			per_page:10,
-			oj_status:null
+			per_page: 10,
+			oj_status: null
 		};
 		this.getdata(data);
 	}
@@ -176,55 +176,60 @@ class Question extends Component {
 		this.getbasket_listdata();
 		//获取题库筛选资料
 		let urls = `/disciplines.json`;
-		axios.get(urls, {params: {
-				source:"question"
-			}}).then((response) => {
-			//console.log("Questiondisciplines");
-			//console.log(response.data);
+		axios.get(urls, {
+			params: {
+				source: "question"
+			}
+		}).then((response) => {
 			if (response) {
-					this.setState({
-						disciplinesdata: response.data.disciplines,
-					})
+				this.setState({
+					disciplinesdata: response.data.disciplines,
+				})
 			}
 		});
 	}
-  //公共和我的
+	//公共和我的
 	callback = (key) => {
 		this.setState({
 			defaultActiveKey: key,
-			selectallquestionsonthispages:false,
-			difficulty:null,
-			page:1,
-			oj_status:null
+			selectallquestionsonthispages: false,
+			difficulty: null,
+			page: 1,
+			oj_status: null
 		})
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: key,
 			item_type: this.state.item_type,
 			difficulty: null,
 			page: 1,
-			per_page:10,
-			oj_status:null
+			per_page: 10,
+			oj_status: null
 		};
 		this.getdata(data);
 
 	}
 
 	//刷新加载
-	getdata = (data) => {
+	getdata = (data, bool) => {
 		const url = `/item_banks.json`;
-		this.setState({
-			booljupyterurls:true,
-			selectionbools:false,
-		})
-		axios.get((url), {params: data}).then((response) => {
-			setTimeout(()=>{
-				this.setState({
-					booljupyterurls:false,
-				})
-			},1000);
+		if (bool) {
+			this.setState({
+				selectionbools: false,
+			})
+		} else {
+			this.setState({
+				booljupyterurls: true,
+				selectionbools: false,
+			})
+		}
+
+		axios.get((url), { params: data }).then((response) => {
+			this.setState({
+				booljupyterurls: false,
+			})
 			if (response === null || response === undefined) {
 
 				return
@@ -234,17 +239,14 @@ class Question extends Component {
 			} else {
 
 			}
-			//////console.log("item_banks");
-			//////console.log(response);
 			this.setState({
 				Contentdata: response.data,
 				items_count: response.data.items_count,
 			})
 			this.getdataslen(response.data.items);
 		}).catch((error) => {
-			//////console.log(error)
 			this.setState({
-				booljupyterurls:false,
+				booljupyterurls: false,
 			})
 		});
 	}
@@ -252,75 +254,83 @@ class Question extends Component {
 	//不刷新加载
 	getdatasy = (data) => {
 		const url = `/item_banks.json`;
-    this.setState({
-			selectionbools:false,
+		this.setState({
+			selectionbools: false,
 		})
-		axios.get((url), {params: data}).then((response) => {
-			setTimeout(()=>{
-
-			},1000);
+		axios.get((url), { params: data }).then((response) => {
 			if (response === null || response === undefined) {
-
 				return
 			}
-			if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
-
-			} else {
-
-			}
-			//////console.log("item_banks");
-			//////console.log(response);
 			this.setState({
 				Contentdata: response.data,
 				items_count: response.data.items_count,
-
 			})
 
 			this.getdataslen(response.data.items);
+
 		}).catch((error) => {
 
 		});
 	}
 
 	//计算
-	getdataslen=(arr)=>{
-    var contes=0;
-		for(let data of arr) {
-			if(data.item_type==="PROGRAM"){
+	getdataslen = (arr) => {
+		myGrandtotal = false;
+		let contes = 0;
+		let Grandtotal = 0;
+		for (let data of arr) {
+			if (data.item_type === "PROGRAM") {
 				//编程题
-				if(data.choosed===true){
+				if (data.choosed === true) {
 
-				}else{
+				} else {
 					//未选用
-					if(data.program_attr.status===1){
-						//已发布
-						contes=contes+1;
+					if (data.program_attr.status === 1) {
+						//已发布1  未发布0
+						contes = contes + 1;
+					} else {
+						Grandtotal = Grandtotal + 1;
 					}
-
 				}
 
-			}else{
+			} else {
 				//不是编程题
-				if(data.choosed===true){
+				if (data.choosed === true) {
 
-				}else{
+				} else {
 					//未选用
-					contes=contes+1;
+					contes = contes + 1;
 				}
 			}
 
 		}
 
-		if(contes>0){
+		if (contes > 0) {
 			this.setState({
-				selectionbools:false,
-				selectallquestionsonthispages:false,
-			})
-		}else {
-			this.setState({
-				selectionbools:true,
-				selectallquestionsonthispages:true,
+				selectionbools: false,
+				selectallquestionsonthispages: false,
 			})
+		} else {
+			try {
+				if (arr.length === Grandtotal) {
+					myGrandtotal = true;
+					this.setState({
+						selectionbools: false,
+						selectallquestionsonthispages: false,
+					})
+				} else {
+					this.setState({
+						selectionbools: true,
+						selectallquestionsonthispages: true,
+					})
+				}
+			} catch (e) {
+				this.setState({
+					selectionbools: true,
+					selectallquestionsonthispages: true,
+				})
+			}
+
 		}
 	}
 
@@ -329,35 +339,32 @@ class Question extends Component {
 			page: pageNumber,
 		})
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords: this.state.keywords,
+			keyword: this.state.keywords,
 			page: pageNumber,
-			per_page:10,
-			oj_status:this.state.oj_status
+			per_page: 10,
+			oj_status: this.state.oj_status
 		};
 		this.getdata(data);
 		this.setmychakanjiexibool("无")
 
 	}
 	showDrawer = () => {
-		if(this.state.visible===true){
+		if (this.state.visible === true) {
 			this.setState({
 				visible: false,
 			});
-		}else{
+		} else {
 			this.setState({
 				visible: true,
 			});
 			this.getbasket_listdata();
 		}
-
-
-
 	};
 
 	onClose = () => {
@@ -386,9 +393,30 @@ class Question extends Component {
 			titilesm: "在平台审核后，所有成员均可使用试题",
 			titiless: "是否设置为公开？",
 			titbool: true,
-			timuid: id
+			timuid: id,
+			myqyespull: true
 		})
 	};
+	setasprivates = (id) => {
+		this.setState({
+			modalsType: true,
+			titilesm: "设为私有后，试题仅您自己可见",
+			titiless: "是否设置为私有？",
+			titbool: true,
+			timuid: id,
+			myqyespull: false
+		})
+	};
+
+	showmodelsInaudit = (e) => {
+		this.setState({
+			modalsTypeInaudit: true,
+			titilesm: "公开申请已提交，请等待管理员的审核",
+			titiless: "我们将在1-2个工作日内完成审核",
+		})
+	};
+
+
 	showmodelysl = (id) => {
 		this.setState({
 			modalsType: true,
@@ -398,26 +426,30 @@ class Question extends Component {
 			timuid: id
 		})
 	};
-
+	modalsTypeInauditbool = () => {
+		this.setState({
+			modalsTypeInaudit: false,
+		})
+	}
 
 	modalCancel = () => {
 		this.setState({
 			modalsType: false
 		})
 	}
-	modalCancels=()=>{
+	modalCancels = () => {
 		this.setState({
 			modalsTypes: false
 		})
 	}
-	showQuestionModals =(item_type)=>{
+	showQuestionModals = (item_type) => {
 		this.setState({
 			modalsTypes: true,
-			titilesms:item_type,
+			titilesms: item_type,
 		})
 
 	}
-	setDownloads=(item_type)=>{
+	setDownloads = (item_type) => {
 		this.Deletebigquestiontype(item_type);
 		this.setState({
 			modalsTypes: false
@@ -427,7 +459,11 @@ class Question extends Component {
 		//确认
 		if (this.state.titbool === true) {
 			//公开
-			this.publicopentimu(this.state.timuid);
+			if (this.state.myqyespull === true) {
+				this.publicopentimu(this.state.timuid);
+			} else {
+				this.Setasprivate(this.state.timuid);
+			}
 		} else {
 			// 删除
 			this.deletetimu(this.state.timuid);
@@ -442,48 +478,46 @@ class Question extends Component {
 			difficulty: difficulty,
 			visiblemys: false,
 			page: 1,
-			per_page:10,
-			keywords:"",
-			oj_status:null
+			per_page: 10,
+			keyword: "",
+			oj_status: null
 		})
 
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: difficulty,
 			item_type: this.state.item_type,
-			keywords:null,
-			page:1,
-			per_page:10,
-			oj_status:null
+			keyword: null,
+			page: 1,
+			per_page: 10,
+			oj_status: null
 		};
-
 		this.getdata(data);
-
 	}
 	setitem_types = (item_type) => {
 		this.setState({
 			item_type: item_type,
 			visiblemyss: false,
 			page: 1,
-			per_page:10,
-			keywords:"",
-			oj_status:null
+			per_page: 10,
+			keyword: "",
+			oj_status: null
 		})
 
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: item_type,
 			page: 1,
-			per_page:10,
-			keywords:null,
-			oj_status:null
+			per_page: 10,
+			keyword: null,
+			oj_status: null
 		};
 
 		this.getdata(data);
@@ -514,84 +548,117 @@ class Question extends Component {
 				visiblemyss: boll,
 			})
 		}
-
 	}
 
 	setdatafunsval = (e) => {
 		this.setState({
-			keywords: e.target.value
+			keyword: e.target.value
 		})
 	}
 
 	setdatafuns = (value) => {
+
 		this.setState({
-			keywords: value,
+			keyword: value,
 		})
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords: value,
-			page: this.state.page,
-			per_page:10,
-			oj_status:this.state.oj_status
+			keyword: value,
+			page: 1,
+			per_page: 10,
+			oj_status: this.state.oj_status
 		};
 
 		this.getdata(data);
 	}
 
 	deletetimu = (id) => {
-
 		const url = `/item_banks/${id}.json`;
 		axios.delete(url)
 			.then((response) => {
 				if (response.data.status == 0) {
-					// this.props.showNotification('删除试题成功')
-					// props.history.push(response.data.right_url)
 					var data = {
-						discipline_id:this.state.discipline_id,
-						sub_discipline_id:this.state.sub_discipline_id,
-						tag_discipline_id:this.state.tag_discipline_id,
+						discipline_id: this.state.discipline_id,
+						sub_discipline_id: this.state.sub_discipline_id,
+						tag_discipline_id: this.state.tag_discipline_id,
 						public: this.state.defaultActiveKey,
 						difficulty: this.state.difficulty,
 						item_type: this.state.item_type,
-						keywords: this.state.keywords,
+						keyword: this.state.keywords,
 						page: this.state.page,
-						per_page:10,
+						per_page: 10,
 					};
-					this.getdata(data);
+					this.getdata(data, true);
 				}
 			})
 			.catch(function (error) {
-				////console.log(error);
 			});
 	}
+	//设为公开
 	publicopentimu = (id) => {
-
 		const url = `/item_banks/${id}/set_public.json`;
 		axios.post(url)
 			.then((result) => {
 				if (result.data.status == 0) {
-					// this.props.showNotification(`公开题目成功`);
 					var data = {
-						discipline_id:this.state.discipline_id,
-						sub_discipline_id:this.state.sub_discipline_id,
-						tag_discipline_id:this.state.tag_discipline_id,
+						discipline_id: this.state.discipline_id,
+						sub_discipline_id: this.state.sub_discipline_id,
+						tag_discipline_id: this.state.tag_discipline_id,
 						public: this.state.defaultActiveKey,
 						difficulty: this.state.difficulty,
 						item_type: this.state.item_type,
-						keywords: this.state.keywords,
+						keyword: this.state.keywords,
 						page: this.state.page,
-						per_page:10,
+						per_page: 10,
 					};
-					this.getdata(data);
+					this.getdata(data, true);
 				}
 			}).catch((error) => {
-			////console.log(error);
-		})
+				////console.log(error);
+			})
+	}
+	//设为私有
+
+	Setasprivate = (id) => {
+		const url = `/item_banks/${id}/set_private.json`;
+		axios.post(url)
+			.then((result) => {
+				if (result.data.status == 0) {
+					// this.props.showNotification(`设为私有成功`);
+					var data = {
+						discipline_id: this.state.discipline_id,
+						sub_discipline_id: this.state.sub_discipline_id,
+						tag_discipline_id: this.state.tag_discipline_id,
+						public: this.state.defaultActiveKey,
+						difficulty: this.state.difficulty,
+						item_type: this.state.item_type,
+						keyword: this.state.keywords,
+						page: this.state.page,
+						per_page: 10,
+					};
+					this.getdata(data, true);
+
+				}
+			}).catch((error) => {
+				////console.log(error);
+			})
+	}
+
+	//跳转道描点的地方
+	scrollToAnchor = (anchorName) => {
+		if (anchorName) {
+			// 找到锚点
+			let anchorElement = document.getElementById(anchorName);
+			// 如果对应id的锚点存在，就跳转到锚点
+			if (anchorElement) {
+				anchorElement.scrollIntoView();
+			}
+		}
 	}
 
 	getbasket_listdata = () => {
@@ -599,53 +666,75 @@ class Question extends Component {
 		const url = "/item_baskets/basket_list.json";
 		axios.get(url)
 			.then((result) => {
-					// ////console.log("getbasket_listdata");
-					// ////console.log(result.data);
-					this.setState({
-						completion_questions_count: result.data.completion_questions_count,
-						judgement_questions_count: result.data.judgement_questions_count,
-						multiple_questions_count: result.data.multiple_questions_count,
-						practical_questions_count: result.data.practical_questions_count,
-						program_questions_count: result.data.program_questions_count,
-						single_questions_count: result.data.single_questions_count,
-						subjective_questions_count: result.data.subjective_questions_count,
-					})
+				this.setState({
+					completion_questions_count: result.data.completion_questions_count,
+					judgement_questions_count: result.data.judgement_questions_count,
+					multiple_questions_count: result.data.multiple_questions_count,
+					practical_questions_count: result.data.practical_questions_count,
+					program_questions_count: result.data.program_questions_count,
+					single_questions_count: result.data.single_questions_count,
+					subjective_questions_count: result.data.subjective_questions_count,
+				})
 
 			}).catch((error) => {
-			// ////console.log(error);
-			this.setState({
-				completion_questions_count: 0,
-				judgement_questions_count: 0,
-				multiple_questions_count: 0,
-				practical_questions_count: 0,
-				program_questions_count: 0,
-				single_questions_count: 0,
-				subjective_questions_count: 0,
+				this.setState({
+					completion_questions_count: 0,
+					judgement_questions_count: 0,
+					multiple_questions_count: 0,
+					practical_questions_count: 0,
+					program_questions_count: 0,
+					single_questions_count: 0,
+					subjective_questions_count: 0,
+				})
 			})
-		})
 
 	}
-
-
-   //选用
-	getitem_baskets=(data)=>{
-		//选用题型可以上传单个 或者多个题型
-		let url="/item_baskets.json";
+	// 不选用   NewMyShixunModel.js 页面也有个
+	NOgetitem_baskets = (data) => {
+		let url = "/examination_banks/cancel_items.json";
 
 		axios.post(url, data)
 			.then((result) => {
 				if (result.data.status == 0) {
 					// this.props.showNotification(`选用成功`);
 					var data = {
-						discipline_id:this.state.discipline_id,
-						sub_discipline_id:this.state.sub_discipline_id,
-						tag_discipline_id:this.state.tag_discipline_id,
+						discipline_id: this.state.discipline_id,
+						sub_discipline_id: this.state.sub_discipline_id,
+						tag_discipline_id: this.state.tag_discipline_id,
 						public: this.state.defaultActiveKey,
 						difficulty: this.state.difficulty,
 						item_type: this.state.item_type,
-						keywords: this.state.keywords,
+						keyword: this.state.keywords,
 						page: this.state.page,
-						per_page:10,
+						per_page: 10,
+					};
+					this.getdatasy(data);
+					this.getbasket_listdata();
+				}
+			}).catch((error) => {
+				////console.log(error);
+			})
+	}
+
+	//选用   NewMyShixunModel.js 页面也有个
+	getitem_baskets = (data) => {
+		//选用题型可以上传单个 或者多个题型
+		let url = "/item_baskets.json";
+
+		axios.post(url, data)
+			.then((result) => {
+				if (result.data.status == 0) {
+					// this.props.showNotification(`选用成功`);
+					var data = {
+						discipline_id: this.state.discipline_id,
+						sub_discipline_id: this.state.sub_discipline_id,
+						tag_discipline_id: this.state.tag_discipline_id,
+						public: this.state.defaultActiveKey,
+						difficulty: this.state.difficulty,
+						item_type: this.state.item_type,
+						keyword: this.state.keywords,
+						page: this.state.page,
+						per_page: 10,
 					};
 					this.getdatasy(data);
 					this.getbasket_listdata();
@@ -654,96 +743,136 @@ class Question extends Component {
 					// })
 				}
 			}).catch((error) => {
-			////console.log(error);
-		})
+				////console.log(error);
+			})
 	}
-  // 撤销
-	getitem_basketss=(id)=>{
-		//选用题型可以上传单个 或者多个题型
-		let url=`/item_baskets/${id}.json`;
+	// 撤销
+	getitem_basketss = (id) => {
+		if (Undoclickable === true) {
+			Undoclickable = false;
+			//选用题型可以上传单个 或者多个题型
+			let url = `/item_baskets/${id}.json`;
 
-		axios.delete(url)
-			.then((result) => {
-				if (result.data.status == 0) {
-					// this.props.showNotification(`撤销成功`);
-					var data = {
-						discipline_id:this.state.discipline_id,
-						sub_discipline_id:this.state.sub_discipline_id,
-						tag_discipline_id:this.state.tag_discipline_id,
-						public: this.state.defaultActiveKey,
-						difficulty: this.state.difficulty,
-						item_type: this.state.item_type,
-						keywords: this.state.keywords,
-						page: this.state.page,
-						per_page:10,
-					};
-					this.getdatasy(data);
-					this.getbasket_listdata();
-				}
-			}).catch((error) => {
-			////console.log(error);
-		})
+			axios.delete(url)
+				.then((result) => {
+					if (result.data.status == 0) {
+						// this.props.showNotification(`撤销成功`);
+						var data = {
+							discipline_id: this.state.discipline_id,
+							sub_discipline_id: this.state.sub_discipline_id,
+							tag_discipline_id: this.state.tag_discipline_id,
+							public: this.state.defaultActiveKey,
+							difficulty: this.state.difficulty,
+							item_type: this.state.item_type,
+							keyword: this.state.keywords,
+							page: this.state.page,
+							per_page: 10,
+						};
+						this.getdatasy(data);
+						this.getbasket_listdata();
+					}
+					setTimeout(() => {
+						Undoclickable = true;
+					}, 1000);
+				}).catch((error) => {
+					////console.log(error);
+					setTimeout(() => {
+						Undoclickable = true;
+					}, 1000);
+				})
+		}
 	}
 	//全选试题库
-	selectallquestionsonthispage=()=>{
-		var item_idsdata=[];
+	selectallquestionsonthispage = (bool) => {
+		if (bool === true) {
+			//bool  是选中状态
+			let {
+				completion_questions_count, judgement_questions_count, multiple_questions_count, practical_questions_count,
+				program_questions_count, single_questions_count, subjective_questions_count,
+			} = this.state;
 
-		var arr= this.state.Contentdata.items;
-		for(let data of arr) {
-			if(data.item_type==="PROGRAM"){
+			const Datacount = completion_questions_count + judgement_questions_count
+				+ multiple_questions_count + practical_questions_count
+				+ program_questions_count
+				+ single_questions_count
+				+ subjective_questions_count;
+			if (Datacount === 100) {
+				this.props.showNotification(`已选100个试题（不能在选用更多试题）`);
+				return;
+			}
+		}
+		if (myGrandtotal === true) {
+			this.props.showNotification(`本页全部试题未发布,不能选择`);
+			return
+		}
+		var item_idsdata = [];
+		var arr = this.state.Contentdata.items;
+		for (let data of arr) {
+			if (data.item_type === "PROGRAM") {
 				//编程题
-				if(data.choosed===true){
-
-				}else{
+				if (data.choosed === true) {
+					if (data.program_attr.status === 1) {
+						//已发布
+						item_idsdata.push(data.id);
+					}
+				} else {
 					//未选用
-					if(data.program_attr.status===1){
+					if (data.program_attr.status === 1) {
 						//已发布
 						item_idsdata.push(data.id);
 					}
 
 				}
 
-			}else{
+			} else {
 				//不是编程题
-				if(data.choosed===true){
-
-				}else{
+				if (data.choosed === true) {
+					item_idsdata.push(data.id);
+				} else {
 					//未选用
 					item_idsdata.push(data.id);
 				}
 			}
 
 		}
-		const data={
-			item_ids:item_idsdata
+		const data = {
+			item_ids: item_idsdata
 		}
-		this.getitem_baskets(data);
-		this.setState({
-			selectallquestionsonthispages:true,
-		})
+		if (bool === false) {
+			this.getitem_baskets(data);
+			this.setState({
+				selectallquestionsonthispages: true,
+			})
+		} else {
+			this.NOgetitem_baskets(data);
+			this.setState({
+				selectallquestionsonthispages: false,
+			})
+		}
+
 	}
-
 	//全选的状态
-
-  //删除大题型
-	Deletebigquestiontype =(item_type)=>{
-		const  url=`/item_baskets/delete_item_type.json`;
-		axios.delete((url), { data: {
-				item_type:item_type
-				}})
+	//删除大题型
+	Deletebigquestiontype = (item_type) => {
+		const url = `/item_baskets/delete_item_type.json`;
+		axios.delete((url), {
+			data: {
+				item_type: item_type
+			}
+		})
 			.then((response) => {
 				if (response.data.status == 0) {
 					// this.props.showNotification('删除成功');
 					var data = {
-						discipline_id:this.state.discipline_id,
-						sub_discipline_id:this.state.sub_discipline_id,
-						tag_discipline_id:this.state.tag_discipline_id,
+						discipline_id: this.state.discipline_id,
+						sub_discipline_id: this.state.sub_discipline_id,
+						tag_discipline_id: this.state.tag_discipline_id,
 						public: this.state.defaultActiveKey,
 						difficulty: this.state.difficulty,
 						item_type: this.state.item_type,
-						keywords: this.state.keywords,
+						keyword: this.state.keywords,
 						page: this.state.page,
-						per_page:10,
+						per_page: 10,
 					};
 					this.getdata(data);
 					this.getbasket_listdata();
@@ -754,45 +883,66 @@ class Question extends Component {
 			});
 
 	}
+	HideAddcoursestypess = (i) => {
+		console.log("调用了");
+		this.setState({
+			mydisplay: true,
+			occupation: i,
+		})
+	}
 
+	mydisplayHidedel = () => {
+		this.setState({
+			mydisplay: false,
+		})
+	}
 
 	//跳转
-	gotopaperreview=()=>{
+	gotopaperreview = () => {
+		let isysladmins = false;
+		if (this.props) {
+			if (this.props.current_user) {
+				if (this.props.current_user.admin) {
+					isysladmins = true;
+				}
+				else if (this.props.current_user.business) {
+					isysladmins = true;
+				}
+			}
+		}
 
 		this.props.history.replace("/paperreview/artificial");
 
 	}
 
-	setoj_status=(oj_status)=>{
+	setoj_status = (oj_status) => {
 		//编程题发布未发布
 		this.setState({
-			selectallquestionsonthispages:false,
-			difficulty:null,
-			oj_status:oj_status
+			selectallquestionsonthispages: false,
+			difficulty: null,
+			oj_status: oj_status
 		})
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: this.state.item_type,
-			keywords: this.state.keywords,
+			keyword: this.state.keywords,
 			page: this.state.page,
-			per_page:10,
-			oj_status:oj_status
+			per_page: 10,
+			oj_status: oj_status
 		};
 		this.getdata(data);
 	}
 
-
-
-
 	render() {
 		let {
-			page, per_page, items_count, Headertop, visible, placement, modalsType, modalsTypes,basket_list,
+			page, per_page, items_count, Headertop, visible, placement, modalsType, modalsTypes, basket_list,
 			completion_questions_count, judgement_questions_count, multiple_questions_count, practical_questions_count,
-			program_questions_count, single_questions_count, subjective_questions_count,selectionbools
+			program_questions_count, single_questions_count, subjective_questions_count, selectionbools,
+			modalsTypeInaudit, mydisplay
 		} = this.state;
 
 		const Datacount = completion_questions_count + judgement_questions_count
@@ -800,23 +950,80 @@ class Question extends Component {
 			+ program_questions_count
 			+ single_questions_count
 			+ subjective_questions_count;
-		const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-		const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
-		const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
-
+		let isysladmins = false;
+		const is_teacher = this.props && this.props.current_user && this.props.current_user.is_teacher ? this.props.current_user.is_teacher : false;
+		const professional_certification = this.props && this.props.current_user && this.props.current_user.professional_certification ? this.props.current_user.professional_certification : false;
+		try {
+			if (this.props) {
+				if (this.props.current_user) {
+					if (this.props.current_user.admin) {
+						isysladmins = true;
+					}
+					else if (this.props.current_user.business) {
+						isysladmins = true;
+					}
+				}
+			}
+		} catch (e) {
 
+		}
+		let Periofters = false;
+		if (this.props) {
+			if (this.props.current_user) {
+				if (this.props.current_user.admin) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.business) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.is_shixun_marker) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.is_teacher) {
+					Periofters = true;
+				} else if (this.props.current_user.user_identity !== "学生") {
+					Periofters = true;
+				}
+			}
+		}
 		return (
-			<div className="newMain clearfix"    ref={this.saveContainer}>
-				{
-					visible===true?
-						<style>
-							{
-								`
-						.newHeaders{
+			<div className="newMain clearfix" ref={this.saveContainer}>
+				<style>{
+					`
+					.newHeaders{
 						position: fixed;
 						top: 0px;
 						z-index:  999 !important;
 						}
+					`
+				}</style>
+				{
+					mydisplay === true ?
+						<Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.mydisplayHidedel} />
+
+						: ""
+				}
+				{
+					mydisplay === true ?
+						<style>
+							{
+								`
+									  body{
+            overflow:hidden!important;
+          }
+
+									`
+							}
+						</style>
+
+						: ""
+				}
+				{
+					visible === true ?
+						<style>
+							{
+								`
+						
 						.ant-drawer {
     z-index: 800 !important;
 }
@@ -824,36 +1031,35 @@ class Question extends Component {
 						position: fixed;
 						z-index: 1500 !important;
 						}
-						.newFooter{
-						 position: relative;
-							z-index: 9999999 ;
-						}
+						
 						`
 							}
 						</style>
-						:""
+						: ""
 				}
-				{
-					visible===true?
+
 				<div
-				style={{
-					marginTop: "60px"
-				}}></div>
-				:""}
+					style={{
+						marginTop: "81px"
+					}}></div>
 				{
-					modalsTypes===true?
+					modalsTypes === true ?
 						<QuestionModals {...this.props}{...this.state} modalsTypes={modalsTypes} modalCancels={() => this.modalCancels()}
-														setDownloads={(e) => this.setDownloads(e)}></QuestionModals>
-						:""
+							setDownloads={(e) => this.setDownloads(e)}></QuestionModals>
+						: ""
 				}
 				{
-					modalsType===true?
+					modalsType === true ?
 						<QuestionModal {...this.props}{...this.state} modalsType={modalsType} modalCancel={() => this.modalCancel()}
-													 setDownload={() => this.setDownload()}></QuestionModal>
-						:""
+							setDownload={() => this.setDownload()}></QuestionModal>
+						: ""
+				}
+				{
+					modalsTypeInaudit === true ?
+						<QuestionModalys {...this.props}{...this.state} modalsType={modalsTypeInaudit} modalCancel={() => this.modalsTypeInauditbool()}
+							setDownload={() => this.modalsTypeInauditbool()}></QuestionModalys>
+						: ""
 				}
-
-
 
 				<style>
 					{
@@ -865,7 +1071,13 @@ class Question extends Component {
 					}
 				</style>
 				{
-					isysladmins===true?
+					Periofters === false ?
+						<SiderBar
+							{...this.props}
+							{...this.state}
+							showDrawer={() => this.showDrawer()}
+							Headertop={Headertop} />
+						:
 						<SiderBars
 							Datacount={Datacount}
 							myvisible={visible}
@@ -875,61 +1087,51 @@ class Question extends Component {
 							Headertop={Headertop}
 
 						/>
-						:
-						is_teacher===true&&professional_certification===true?
-							<SiderBars
-								Datacount={Datacount}
-								myvisible={visible}
-								{...this.props}
-								{...this.state}
-								showDrawer={() => this.showDrawer()}
-								Headertop={Headertop}
-
-							/>
-							:
-
-						""
 				}
-
-
 				{/*顶部*/}
+				<div id={"questionid"}></div>
 
 				<Headplugselections
 					disciplinesdata={this.state.disciplinesdata}
-
 					{...this.props}
 					{...this.state}
 					setdifficulty={(e) => this.setdifficulty(e)}
 					setitem_types={(e) => this.setitem_types(e)}
-					setdiscipline_id={(e)=>this.setdiscipline_id(e)}
-					setsub_discipline_id={(e,id)=>this.setsub_discipline_id(e,id)}
-					settag_discipline_id={(e)=>this.settag_discipline_id(e)}
+					setdiscipline_id={(e) => this.setdiscipline_id(e)}
+					setsub_discipline_id={(e, id) => this.setsub_discipline_id(e, id)}
+					settag_discipline_id={(e) => this.settag_discipline_id(e)}
 				/>
 				{/*头部*/}
 				<Contentpart {...this.state} {...this.props}
-										 Isitapopup={"false"}
-										 chakanjiexiboolindex={this.state.chakanjiexiboolindex}
-										 chakanjiexibool={(e)=>this.chakanjiexibool(e)}
-										 getitem_basketss={(id)=>this.getitem_basketss(id)}
-										 selectallquestionsonthispage={()=>this.selectallquestionsonthispage()}
-										 getitem_baskets={(e)=>this.getitem_baskets(e)}
-										 setdatafuns={(e) => this.setdatafuns(e)}
-										 setdatafunsval={(e) => this.setdatafunsval(e)}
-										 handleVisibleChanges={(e) => this.handleVisibleChanges(e)}
-										 handleVisibleChange={(e) => this.handleVisibleChange(e)}
-										 showmodels={(e) => this.showmodels(e)}
-										 showmodelysl={(e) => this.showmodelysl(e)}
-										 callback={(e) => this.callback(e)}
-				             setoj_status={(e)=>this.setoj_status(e)}></Contentpart>
+					pages={this.state.page}
+					Isitapopup={"false"}
+					Datacount={Datacount}
+					Datacountbool={true}
+					chakanjiexiboolindex={this.state.chakanjiexiboolindex}
+					chakanjiexibool={(e) => this.chakanjiexibool(e)}
+					getitem_basketss={(id) => this.getitem_basketss(id)}
+					selectallquestionsonthispage={(bool) => this.selectallquestionsonthispage(bool)}
+					getitem_baskets={(e) => this.getitem_baskets(e)}
+					setdatafuns={(e) => this.setdatafuns(e)}
+					setdatafunsval={(e) => this.setdatafunsval(e)}
+					handleVisibleChanges={(e) => this.handleVisibleChanges(e)}
+					handleVisibleChange={(e) => this.handleVisibleChange(e)}
+					showmodels={(e) => this.showmodels(e)}
+					showmodelysl={(e) => this.showmodelysl(e)}
+					callback={(e) => this.callback(e)}
+					setoj_status={(e) => this.setoj_status(e)}
+					showmodelsInaudit={(e) => this.showmodelsInaudit(e)}
+					setasprivates={(e) => this.setasprivates(e)}
+				></Contentpart>
 
 				{
-					items_count&&items_count>10?
-						<div className="mb30 clearfix educontent mt40 intermediatecenter">
+					items_count && items_count > 10 ?
+						<div className="mb60 clearfix educontent mt40 intermediatecenter">
 							<Pagination showQuickJumper current={page} onChange={this.paginationonChange}
-													pageSize={per_page}
-													total={items_count}></Pagination>
+								pageSize={per_page}
+								total={items_count}></Pagination>
 						</div>
-						:<div className="h30 clearfix educontent mt40 intermediatecenter">
+						: <div className="h30 clearfix educontent mt40 intermediatecenter">
 
 						</div>
 				}
@@ -940,7 +1142,7 @@ class Question extends Component {
 					{
 						`
 						 .ant-drawer-content-wrapper{
-						width: 200px !important;
+						width: 160px !important;
 						overflow：hidden;
 						margin-top: 62px;
 						}
@@ -988,9 +1190,9 @@ class Question extends Component {
 									""
 									: <div className="sortinxdirection "  >
 										<p
-											className="w50s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">单选题{'('}{single_questions_count}{')'}</p>
-										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
-											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("SINGLE")}></i></p>
+											className="w80s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">单选题{'('}{single_questions_count}{')'}</p>
+										<p className="w20s intermediatecenterysls xaxisreverseorder"><i
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={() => this.showQuestionModals("SINGLE")}></i></p>
 									</div>
 							}
 							{
@@ -999,9 +1201,9 @@ class Question extends Component {
 									:
 									<div className="sortinxdirection" >
 										<p
-											className="w50s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">多选题{'('}{multiple_questions_count}{')'}</p>
-										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
-											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("MULTIPLE")}></i></p>
+											className="w80s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">多选题{'('}{multiple_questions_count}{')'}</p>
+										<p className="w20s intermediatecenterysls xaxisreverseorder"><i
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={() => this.showQuestionModals("MULTIPLE")}></i></p>
 									</div>
 							}
 							{
@@ -1010,9 +1212,9 @@ class Question extends Component {
 									:
 									<div className="sortinxdirection" >
 										<p
-											className="w50s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">判断题{'('}{judgement_questions_count}{')'}</p>
-										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
-											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("JUDGMENT")}></i></p>
+											className="w80s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">判断题{'('}{judgement_questions_count}{')'}</p>
+										<p className="w20s intermediatecenterysls xaxisreverseorder"><i
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={() => this.showQuestionModals("JUDGMENT")}></i></p>
 									</div>
 							}
 							{
@@ -1021,9 +1223,9 @@ class Question extends Component {
 									:
 									<div className="sortinxdirection" >
 										<p
-											className="w50s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">填空题{'('}{completion_questions_count}{')'}</p>
-										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
-											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("COMPLETION")}></i></p>
+											className="w80s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">填空题{'('}{completion_questions_count}{')'}</p>
+										<p className="w20s intermediatecenterysls xaxisreverseorder"><i
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={() => this.showQuestionModals("COMPLETION")}></i></p>
 									</div>
 							}
 							{
@@ -1032,9 +1234,9 @@ class Question extends Component {
 									:
 									<div className="sortinxdirection" >
 										<p
-											className="w50s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">简答题{'('}{subjective_questions_count}{')'}</p>
-										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
-											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("SUBJECTIVE")}></i></p>
+											className="w80s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">简答题{'('}{subjective_questions_count}{')'}</p>
+										<p className="w20s intermediatecenterysls xaxisreverseorder"><i
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={() => this.showQuestionModals("SUBJECTIVE")}></i></p>
 									</div>
 							}
 							{
@@ -1043,8 +1245,8 @@ class Question extends Component {
 									:
 									<div className="sortinxdirection">
 										<p
-											className="w50s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">实训题{'('}{practical_questions_count}{')'}</p>
-										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="w80s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">实训题{'('}{practical_questions_count}{')'}</p>
+										<p className="w20s intermediatecenterysls xaxisreverseorder"><i
 											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
 									</div>
 							}
@@ -1054,15 +1256,15 @@ class Question extends Component {
 									:
 									<div className="sortinxdirection" >
 										<p
-											className="w50s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">编程题{'('}{program_questions_count}{')'}</p>
-										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
-											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("PROGRAM")}></i></p>
+											className="w80s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">编程题{'('}{program_questions_count}{')'}</p>
+										<p className="w20s intermediatecenterysls xaxisreverseorder"><i
+											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={() => this.showQuestionModals("PROGRAM")}></i></p>
 									</div>
 							}
 
 							<div className="intermediatecenter verticallayout mt42">
 
-								<div className="drawerbutton xiaoshou" onClick={()=>this.gotopaperreview()}>
+								<div className="drawerbutton xiaoshou" onClick={() => this.gotopaperreview()}>
 									试卷预览
 								</div>
 							</div>
@@ -1075,8 +1277,6 @@ class Question extends Component {
 
 
 				</Drawer>
-
-
 			</div>
 		)
 
diff --git a/src/modules/question/Questionitem_banks.js b/src/modules/question/Questionitem_banks.js
index 549bcc5a..4ba33f55 100644
--- a/src/modules/question/Questionitem_banks.js
+++ b/src/modules/question/Questionitem_banks.js
@@ -1,17 +1,9 @@
 import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl} from 'educoder';
+import {Prompt} from 'react-router-dom';
+import { SnackbarHOC,queryString} from 'educoder';
 import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb
-} from "antd";
+import { Breadcrumb } from "antd";
+
 import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
 import Itembankstop from "./component/Itembankstop";
 import './questioncss/questioncom.css';
@@ -19,9 +11,10 @@ import '../tpm/newshixuns/css/Newshixuns.css';
 import SingleEditor from "./component/SingleEditor";
 import ChoquesEditor from "./component/ChoquesEditor"
 import JudquestionEditor from "./component/JudquestionEditor";
+import SubquestionEditor from './component/SubquestionEditor'
 import Bottomsubmit from "../../modules/modals/Bottomsubmit";
-import { connect } from 'react-redux';
-import actions from "../../redux/actions";
+import QuestionModalPicture from "./component/QuestionModalPicture";
+
 class Questionitem_banks extends Component {
 	constructor(props) {
 		super(props);
@@ -29,40 +22,34 @@ class Questionitem_banks extends Component {
 		this.answerMdRef = React.createRef();
 		this.Choques = React.createRef();
 		this.Judquestio = React.createRef();
+		this.SubQuestionRef = React.createRef();//问答题
 		this.state = {
 			item_type: null,
 			item_banksedit: [],
 			myquestion_choicesco: [],
 			disciplinesdata: [],
 			knowledgepoints: [],
-			disciplmy:[]
-		}
+			disciplmy:[],
+			pages:1,
+			url:''
+
+	}
 
 	}
 
 	//初始化
 	componentDidMount() {
-		// let {defaultActiveKey}= this.state;
-		// var data={
-		// 	public:defaultActiveKey
-		// };
-		// this.getdata(data);
-		//
-		// let url=`/users/get_navigation_info.json`;
-		// axios.get(url, {
-		//
-		// }).then((response) => {
-		// 	// ////////console.log("开始请求/get_navigation_info.json");
-		// 	// ////////console.log(response);
-		// 	if(response!=undefined){
-		// 		if(response.status===200){
-		// 			this.setState({
-		// 				Headertop:response.data.top,
-		// 				Footerdown:response.data.down
-		// 			})
-		// 		}
-		// 	}
-		// });
+		const query = this.props.location.search;
+		const parsed = queryString.parse(query);
+		console.log(parsed);
+		try {
+			this.setState({
+				pages:parsed.pages
+			})
+		}catch (e) {
+
+		}
+
 		const params = this.props && this.props.match && this.props.match.params;
 		if (JSON.stringify(params) === "{}") {
 			//新增
@@ -80,13 +67,14 @@ class Questionitem_banks extends Component {
 				} else {
 
 				}
-				////////console.log("item_banks");
-				////console.log("Questionitem_banks");
-				////console.log(response.data);
 
-				this.setState({
-					item_banksedit: response.data,
-				})
+			  try {
+					this.setState({
+						item_banksedit: response.data,
+					})
+				}catch (e) {
+
+				}
 			}).catch((error) => {
 				////////console.log(error)
 
@@ -94,11 +82,6 @@ class Questionitem_banks extends Component {
 
 		}
 
-		// this.props.setOjInitialValue({
-		// 	difficult: 1,
-		// 	sub_discipline_id: '3',
-		// 	tag_discipline_id: [3, 4]
-		// });
 		let urls = `/disciplines.json`;
 		axios.get(urls, {
 			params: {
@@ -160,6 +143,20 @@ class Questionitem_banks extends Component {
 
 	}
 
+	componentWillMount () {
+		// 拦截判断是否离开当前页面
+		window.addEventListener('beforeunload', this.beforeunload);
+	}
+	componentWillUnmount () {
+		// 销毁拦截判断是否离开当前页面
+		window.removeEventListener('beforeunload', this.beforeunload);
+	}
+	beforeunload (e) {
+		let confirmationMessage = '你确定离开此页面吗?';
+		(e || window.event).returnValue = confirmationMessage;
+		return confirmationMessage;
+	}
+
 
 	getdata = (data) => {
 		// const url=`/item_banks.json`;
@@ -195,6 +192,9 @@ class Questionitem_banks extends Component {
 	getChoquesEditor = (Ref) => {
 		this.Choques = Ref;
 	}
+	getSubQuestionRef = (Ref)=>{
+		this.SubQuestionRef = Ref
+	}
 	//跳转道描点的地方
 	scrollToAnchor = (anchorName) => {
 		try {
@@ -257,9 +257,6 @@ class Questionitem_banks extends Component {
 				}
 
 
-				// repertoire_id:1,
-				//  sub_repertoire_id:1,
-				//  tag_repertoire_id:[1,3],
 				var myrbkc=[];
 				var Getdatasdatas=Getdatasdata[2].rbzsd;
 				for(let myda of Getdatasdatas) {
@@ -282,24 +279,22 @@ class Questionitem_banks extends Component {
 					axios.post(url, data)
 						.then((result) => {
 							if (result.data.status == 0) {
-								// this.props.showNotification(`新增单选题成功`);
-								this.props.history.replace('/question');
+								this.restricte=true;
+								this.props.history.replace('/problemset');
 
 							}
 						}).catch((error) => {
-						////console.log(error);
 					})
 				} else {
 					axios.put(url, data)
 						.then((result) => {
 							if (result.data.status == 0) {
-								// this.props.showNotification(`编辑单选题成功`);
-								this.props.history.replace('/question');
+								this.restricte=true;
+								this.props.history.replace('/problemset');
 
 
 							}
 						}).catch((error) => {
-						////console.log(error);
 					})
 				}
 
@@ -319,8 +314,6 @@ class Questionitem_banks extends Component {
 				const choices = [];
 				// 1: [3]
 				// 2: (4) ["1", "2", "3", "4"]
-				////console.log("MULTIPLE");
-				////console.log(anserdata);
 				for (var k = 0; k < anserdata[2].length; k++) {
 
 					var bool = false
@@ -361,7 +354,8 @@ class Questionitem_banks extends Component {
 						.then((result) => {
 							if (result.data.status == 0) {
 								// this.props.showNotification(`新增多选题成功`);
-								this.props.history.replace('/question');
+								this.restricte=true;
+								this.props.history.replace('/problemset');
 
 
 							}
@@ -374,7 +368,8 @@ class Questionitem_banks extends Component {
 						.then((result) => {
 							if (result.data.status == 0) {
 								// this.props.showNotification(`编辑多选题成功`);
-								this.props.history.replace('/question');
+								this.restricte=true;
+								this.props.history.replace('/problemset');
 
 
 							}
@@ -428,7 +423,8 @@ class Questionitem_banks extends Component {
 						.then((result) => {
 							if (result.data.status == 0) {
 								// this.props.showNotification(`新增判断题成功`);
-								this.props.history.replace('/question');
+								this.restricte=true;
+								this.props.history.replace('/problemset');
 
 							}
 						}).catch((error) => {
@@ -440,7 +436,8 @@ class Questionitem_banks extends Component {
 						.then((result) => {
 							if (result.data.status == 0) {
 								// this.props.showNotification(`编辑判断题成功`);
-								this.props.history.replace('/question');
+								this.restricte=true;
+								this.props.history.replace('/problemset');
 
 							}
 						}).catch((error) => {
@@ -460,14 +457,28 @@ class Questionitem_banks extends Component {
 				myrbkc.push(myda.id);
 			}
 
-			this.props.setOjInitialValue({
-				difficult: Getdatasdata[0].rbnd,
-				sub_discipline_id: Getdatasdata[3].rbkc[1],
-				tag_discipline_id: myrbkc,
-			});
-			this.props.history.replace('/problems/new');
+			let arrays=myrbkc.join(',');
+			this.restricte=true;
+	    window.open(`/problems/new?difficult=${Getdatasdata[0].rbnd}&sub_discipline_id=${Getdatasdata[3].rbkc[1]}&tag_discipline_id=${arrays}&newoj=1&pages=${this.state.pages}`);
+			setTimeout(() => {
+				this.restricte=true;
+			}, 1000);
+		}
+		if (this.state.item_type === "SUBJECTIVE") {
+			const mdData = this.SubQuestionRef.onSave();
+			console.log(mdData)
+			const  data = {
+				discipline_id: Getdatasdata[3].rbkc[0],
+				sub_discipline_id:   Getdatasdata[3].rbkc[1],
+				tag_discipline_id: Getdatasdata[2].rbzsd.map(item=>item.id),
+				name: mdData.question_title,
+				item_type: Getdatasdata[1].rbtx,
+				difficulty:Getdatasdata[0].rbnd,
+				analysis:mdData.question_analysis,
+				standard_answers:mdData.standard_answers
+			};
+			console.log(data)
 		}
-
 
 	}
 
@@ -479,19 +490,50 @@ class Questionitem_banks extends Component {
 		this.scrollToAnchor("Itembankstopid");
 	}
 
+	handleShowUploadImage=(url)=>{
+		
+		this.setState({
+			url:url
+		})
+	}
+	handleClose=()=>{
+		this.setState({
+			url:'',
+		})
+	}
+
+
 	render() {
-		let {page, limit, count, Headertop, visible, placement, modalsType, item_type} = this.state;
+		let {page, limit, count, Headertop, visible, placement, modalsType, item_type,restricte,url} = this.state;
 		const params = this.props && this.props.match && this.props.match.params;
-		// ////console.log(params);
 		return (
 			<div>
 				<div id={"Itembankstopid"} className="newMain clearfix intermediatecenter "
 				>
 
+					{url?
+						<QuestionModalPicture url={url} {...this.props} {...this.state} handleClose={()=>this.handleClose()}></QuestionModalPicture>
+						:
+						""
+					}
+					{
+						restricte===false?
+							<Prompt
+								when={true}
+								message={() => '你确定离开此页面吗?'}
+							/>
+							:
+							""
+					}
+
+
 					<style>
 						{
 							`
-					
+					 body{
+            width: 100%!important;
+
+          }
 						.newFooter{
 						display: none;
 						}
@@ -501,7 +543,7 @@ class Questionitem_banks extends Component {
 					<div className="w1200mss">
 						<div className="w100s mt30">
 							<Breadcrumb separator=">">
-								<Breadcrumb.Item href="/question">试题库</Breadcrumb.Item>
+								<Breadcrumb.Item href="/problemset">试题库</Breadcrumb.Item>
 								<Breadcrumb.Item>{JSON.stringify(params) === "{}" ? "新增" : "编辑"}试题</Breadcrumb.Item>
 							</Breadcrumb>
 						</div>
@@ -524,6 +566,7 @@ class Questionitem_banks extends Component {
 										{...this.state}
 										{...this.props}
 										getanswerMdRef={(ref) => this.getanswerMdRef(ref)}
+										handleShowUploadImage={(url)=>this.handleShowUploadImage(url)}
 									>
 
 									</SingleEditor>
@@ -534,6 +577,7 @@ class Questionitem_banks extends Component {
 										{...this.state}
 										{...this.props}
 										getanswerMdRef={(ref) => this.getChoquesEditor(ref)}
+										handleShowUploadImage={(url)=>this.handleShowUploadImage(url)}
 									>
 
 									</ChoquesEditor>
@@ -551,7 +595,18 @@ class Questionitem_banks extends Component {
 
 										</JudquestionEditor>
 									</div>
+									: item_type && item_type === "SUBJECTIVE" ?
 
+									<div className=" clearfix  educontent  w100s w1200fpx mt19">
+										<SubquestionEditor
+											{...this.state}
+											{...this.props}
+											getanswerMdRef={(ref) => this.getSubQuestionRef(ref)}
+										>
+
+										</SubquestionEditor>
+									</div>
+		
 
 									: item_type && item_type === "PROGRAM" ?
 										""
@@ -567,24 +622,15 @@ class Questionitem_banks extends Component {
 						""
 						:
 						<Bottomsubmit {...this.props} {...this.state} bottomvalue={item_type === "PROGRAM" ? "创建" : "保存"}
-													onSubmits={() => this.preservation()} url={item_type === "PROGRAM" ?'/problems':'/question'}></Bottomsubmit>
+													onSubmits={() => this.preservation()} url={'/problemset'}></Bottomsubmit>
 				}
 			</div>
 		)
 
 	}
 
-
 }
 
-const mapStateToProps = (state) => ({});
-const mapDispatchToProps = (dispatch) => ({
-	setOjInitialValue: (params) => dispatch(actions.setOjInitialValue(params))
-});
-
-export default connect(
-	mapStateToProps,
-	mapDispatchToProps
-)(SnackbarHOC()(TPMIndexHOC(Questionitem_banks)));
 
+export default SnackbarHOC()(TPMIndexHOC(Questionitem_banks));
 
diff --git a/src/modules/question/animation/parabola.js b/src/modules/question/animation/parabola.js
deleted file mode 100644
index 439babd9..00000000
--- a/src/modules/question/animation/parabola.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * 抛物线动画函数
- * @param ballWrapper 小球的父容器
- * @param origin 动画起点DOM
- * @param target 动画目标DOM
- * @param time 持续时间
- * @param a 抛物线参数
- * @param offset 动画尺寸
- * @param callback 回调
- */
-
-export function parabola(config) {
-	const {
-		ballWrapper,
-		origin,
-		target,
-		time = 1000,
-		a = 0.004,
-		callback,
-		finish,
-		offset = 0
-	} =
-	config || {};
-	const ballWrapperDimension = ballWrapper.getBoundingClientRect();
-	const originDimension = origin.getBoundingClientRect();
-	const targetDimension = target.getBoundingClientRect();
-	const x1 = originDimension.left + 0.5 * originDimension.width;
-	const y1 = originDimension.top + 0.5 * originDimension.height;
-	const x2 = targetDimension.left + 0.5 * targetDimension.width;
-	const y2 = targetDimension.top + 0.5 * targetDimension.height;
-	const diffx = x2 - x1;
-	const diffy = y2 - y1;
-	const speedx = diffx / time;
-	const b = (diffy - a * diffx * diffx) / diffx;
-
-	const refPoint_x = x1 - ballWrapperDimension.left - 0.5 * offset;
-	const refPoint_y = y1 - ballWrapperDimension.top - 0.5 * offset;
-
-	const start = Date.now();
-	const timer = setInterval(() => {
-		if (Date.now() - start > time) {
-			finish();
-			clearInterval(timer);
-			return;
-		}
-
-		const x = speedx * (Date.now() - start);
-		const y = a * x * x + b * x;
-		callback && callback(refPoint_x + x, refPoint_y + y);
-	}, 15);
-}
diff --git a/src/modules/question/component/ChoquesEditor.js b/src/modules/question/component/ChoquesEditor.js
index 3637fad3..0bd9772f 100644
--- a/src/modules/question/component/ChoquesEditor.js
+++ b/src/modules/question/component/ChoquesEditor.js
@@ -1,20 +1,12 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 
-import {
-	Form, Input, InputNumber, Switch, Radio,
-	Slider, Button, Upload, Icon, Rate, Checkbox, message,
-	Row, Col, Select, Modal, Tooltip
-} from 'antd';
+import { Tooltip } from 'antd';
 import TPMMDEditor from '../../../modules/tpm/challengesnew/TPMMDEditor';
-import axios from 'axios'
 import update from 'immutability-helper'
 import './../questioncss/questioncom.css';
-import {getUrl, ActionBtn, DMDEditor, ConditionToolTip} from 'educoder';
-import QuillForEditor from '../../../common/quillForEditor';
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
+import '../questioncss/font.css';
+import { ConditionToolTip } from 'educoder';
+import RenderHtml from "../../../components/render-html";
 
 const tagArray = [
 	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
@@ -23,8 +15,8 @@ const tagArray = [
 ]
 
 //题库的试卷  多选题  组件
-class ChoquesEditor extends Component{
-	constructor(props){
+class ChoquesEditor extends Component {
+	constructor(props) {
 		super(props);
 		/**
 		 choice_id: 32076
@@ -32,7 +24,7 @@ class ChoquesEditor extends Component{
 		 choice_text: "1"
 		 standard_boolean: true
 		 */
-		const {question_choices} = this.props;
+		const { question_choices } = this.props;
 		let _standard_answers = undefined;
 		let _question_choices = undefined;
 		if (question_choices) {
@@ -44,15 +36,15 @@ class ChoquesEditor extends Component{
 				_question_choices.push(item.choice_text)
 			})
 		}
-		const choicescomy=[];
+		const choicescomy = [];
 		try {
-			if(this.props.item_banksedit){
-				if(this.props.item_banksedit.choices){
+			if (this.props.item_banksedit) {
+				if (this.props.item_banksedit.choices) {
 
 					this.props.item_banksedit.choices.forEach((item, index) => {
 						choicescomy.push({
-							choice_text:item.choice_text,
-							standard_boolean:item.is_answer,
+							choice_text: item.choice_text,
+							standard_boolean: item.is_answer,
 						})
 					})
 
@@ -65,19 +57,23 @@ class ChoquesEditor extends Component{
 				}
 
 			}
-		}catch (e) {
+		} catch (e) {
 
 		}
 		this.state = {
 			question_choices: _question_choices || ['', '', '', ''],
 			standard_answers: _standard_answers || [false, false, false, false],
-			question_title: this.props.question_title!==undefined?JSON.parse(this.props.question_title):"",
+			question_title: this.props.question_title !== undefined ? this.props.question_title : "",
 			question_type: this.props.question_type || 0,
 			question_score: this.props.question_score || this.props.init_question_score,
-			question_titles: this.props.question_titles!==undefined?JSON.parse(this.props.question_titles):"",
-			question_titlesysl:this.props.question_titlesysl||'',
-			question_titleysl:this.props.question_title || '',
-			item_banksedit:[],
+			question_titles: this.props.question_titles !== undefined ? this.props.question_titles : "",
+			question_titlesysl: this.props.question_titlesysl || '',
+			question_titleysl: this.props.question_title || '',
+			item_banksedit: [],
+			bindinginputs: null,
+			url: "",
+			paramstype: "edit",
+
 		}
 	}
 	addOption = () => {
@@ -93,59 +89,59 @@ class ChoquesEditor extends Component{
 		this.setState({ question_choices, standard_answers })
 	}
 	deleteOption = (index) => {
-		let {question_choices}=this.state;
+		let { question_choices } = this.state;
 
 		// //////console.log("deleteOption");
 		// //////console.log(question_choices);
 
-		if(question_choices[index]===""){
+		if (question_choices[index] === "") {
 			// repeat code
 			this.toMDMode(null)
 			this.setState(
 				(prevState) => ({
-					question_choices : update(prevState.question_choices, {$splice: [[index, 1]]}),
-					standard_answers : update(prevState.standard_answers, {$splice: [[index, 1]]})
+					question_choices: update(prevState.question_choices, { $splice: [[index, 1]] }),
+					standard_answers: update(prevState.standard_answers, { $splice: [[index, 1]] })
 				})
 			)
-		}else{
+		} else {
 			// this.props.confirm({
 			// 	content: `确认要删除这个选项吗？`,
 			// 	onOk: () => {
 
-					this.toMDMode(null)
-					this.setState(
-						(prevState) => ({
-							question_choices : update(prevState.question_choices, {$splice: [[index, 1]]}),
-							standard_answers : update(prevState.standard_answers, {$splice: [[index, 1]]})
-						})
-					)
+			this.toMDMode(null)
+			this.setState(
+				(prevState) => ({
+					question_choices: update(prevState.question_choices, { $splice: [[index, 1]] }),
+					standard_answers: update(prevState.standard_answers, { $splice: [[index, 1]] })
+				})
+			)
 
 			// 	}
 			// })
 		}
 	}
 	onSave = () => {
-		var editordata=[];
-		const {question_title, question_score,question_titleysl,question_titlesysl, question_type,question_titles, question_choices, standard_answers } = this.state;
+		var editordata = [];
+		const { question_title, question_score, question_titleysl, question_titlesysl, question_type, question_titles, question_choices, standard_answers } = this.state;
 		const { question_id_to_insert_after, question_id } = this.props
 		// TODO check
-		const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
-		if(!question_titleysl) {
+		const answerArray = standard_answers.map((item, index) => { return item == true ? index + 1 : -1 }).filter(item => item != -1);
+		if (!question_titleysl) {
 			this.props.showNotification('请您输入题干');
 			return editordata;
 		}
 
-		for(let i = 0; i < question_choices.length; i++) {
+		for (let i = 0; i < question_choices.length; i++) {
 			if (!question_choices[i]) {
 				this.props.showNotification(`请先输入 ${tagArray[i]} 选项的内容`);
 				return editordata;
 			}
 		}
-		if(!answerArray || answerArray.length == 0) {
-			this.props.showNotification('请先点击选择本选择题的正确选项');
+		if (!answerArray || answerArray.length == 0) {
+			this.props.showNotification('请设置本题的正确答案，点击选项A/B...即可完成设置');
 			return editordata;
 		}
-		if(!answerArray || answerArray.length < 2) {
+		if (!answerArray || answerArray.length < 2) {
 			this.props.showNotification('多选题最小正确选项为2个');
 			return editordata;
 		}
@@ -161,7 +157,7 @@ class ChoquesEditor extends Component{
         "question_choices":["a答案","b答案","c答案","d答案"],
         "standard_answers":[1]
     }*/
-		editordata=[question_titleysl,answerArray,question_choices,question_titlesysl];
+		editordata = [question_titleysl, answerArray, question_choices, question_titlesysl];
 		// question_title,
 		// question_type: answerArray.length > 1 ? 1 : 0,
 		// question_score,
@@ -173,28 +169,53 @@ class ChoquesEditor extends Component{
 	onCancel = () => {
 		this.props.onEditorCancel()
 	}
+	handleShowUploadImages = (url) => {
+		this.setState({
+			url: url,
+		})
+		try {
+			this.props.handleShowUploadImage(url)
+		} catch (e) {
 
+		}
+	}
+	handleShowUploadImage = (url, i) => {
 
+		this.setState({
+			url: url,
+			bindinginputs: i
+		})
+
+		try {
+			this.props.handleShowUploadImage(url)
+		} catch (e) {
+
+		}
+
+	}
 
 	componentDidMount = () => {
+		this.setState({
+			paramstype: this.props.match.params.type,
+		})
 		try {
 			this.props.getanswerMdRef(this);
-		}catch (e) {
+		} catch (e) {
 
 		}
 		try {
 			this.setState({
-				item_banksedit:this.props.item_banksedit,
-				question_title: this.props.item_banksedit.name!==undefined?JSON.parse(this.props.item_banksedit.name):"",
-				question_titleysl:this.props.item_banksedit.name|| '',
-				question_titles: this.props.item_banksedit.analysis!==undefined?JSON.parse(this.props.item_banksedit.analysis):"",
-				question_titlesysl:this.props.item_banksedit.analysis||'',
-				mychoicess:this.props.item_banksedit.choices,
+				item_banksedit: this.props.item_banksedit,
+				question_title: this.props.item_banksedit.name !== undefined ? this.props.item_banksedit.name : "",
+				question_titleysl: this.props.item_banksedit.name || '',
+				question_titles: this.props.item_banksedit.analysis !== undefined ? this.props.item_banksedit.analysis : "",
+				question_titlesysl: this.props.item_banksedit.analysis || '',
+				mychoicess: this.props.item_banksedit.choices,
 
 			})
 
 
-		}catch (e) {
+		} catch (e) {
 
 		}
 	}
@@ -203,13 +224,13 @@ class ChoquesEditor extends Component{
 		// ////console.log(prevProps);
 		// ////console.log(this.props.item_banksedit);
 
-		if(prevProps.item_banksedit !== this.props.item_banksedit) {
+		if (prevProps.item_banksedit !== this.props.item_banksedit) {
 			this.setState({
 				item_banksedit: this.props.item_banksedit,
-				question_title: this.props.item_banksedit.name!==undefined?JSON.parse(this.props.item_banksedit.name):"",
-				question_titleysl:this.props.item_banksedit.name|| '',
-				question_titles: this.props.item_banksedit.analysis!==undefined?JSON.parse(this.props.item_banksedit.analysis):"",
-				question_titlesysl:this.props.item_banksedit.analysis||'',
+				question_title: this.props.item_banksedit.name !== undefined ? this.props.item_banksedit.name : "",
+				question_titleysl: this.props.item_banksedit.name || '',
+				question_titles: this.props.item_banksedit.analysis !== undefined ? this.props.item_banksedit.analysis : "",
+				question_titlesysl: this.props.item_banksedit.analysis || '',
 				mychoicess: this.props.item_banksedit.choices,
 
 			})
@@ -220,31 +241,13 @@ class ChoquesEditor extends Component{
 		standard_answers[index] = !standard_answers[index]
 		this.setState({ standard_answers })
 	}
-	onOptionContentChange = (value,quill,index) => {
+	onOptionContentChange = (value, index) => {
 		if (index >= this.state.question_choices.length) {
 			// TODO 新建，然后删除CD选项，再输入题干，会调用到这里，且index是3
 			return;
 		}
-		var texts;
-		const _text = quill.getText();
-		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
-		if (!reg.test(_text)) {
-			// 处理编辑器内容为空
-			texts="";
-		} else {
-			if(_text.length>=301){
-				var result = _text.substring(0,300);
-				texts={"ops":[{"insert":result}]};
-				texts=JSON.stringify(texts);
-			}else {
-				// 提交到后台的内容需要处理一下;
-				value =  JSON.stringify(value);
-				texts=value;
-			}
-		}
 		let question_choices = this.state.question_choices.slice(0);
-		question_choices[index] = texts;
-		//console.log(question_choices);
+		question_choices[index] = value;
 		this.setState({ question_choices });
 	}
 
@@ -263,81 +266,45 @@ class ChoquesEditor extends Component{
 	toShowMode = () => {
 
 	}
+	isNull = (str) => {
+		if (str == "") return true;
+		var regu = "^[ ]+$";
+		var re = new RegExp(regu);
+		//为空或纯空格为 true    有值为false
+		console.log(re.test(str))
+		return re.test(str);
 
-	onContentChange=(value,quill)=>{
-		const _text = quill.getText();
-		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
-		if (!reg.test(_text)) {
-			// 处理编辑器内容为空
-			this.setState({
-				question_titleysl:""
-			})
-		} else {
-			// 提交到后台的内容需要处理一下;
-			var texts="";
-			if(_text.length>=1001){
-				var result = _text.substring(0,1000);
-				texts={"ops":[{"insert":result}]};
-				texts=JSON.stringify(texts);
-			}else {
-				value =  JSON.stringify(value)
-				texts=value;
-			}
-			this.setState({
-				question_titleysl:texts
-			})
-		}
 	}
-	onContentChanges=(value,quill)=>{
-		const _text = quill.getText();
-		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
-		if (!reg.test(_text)) {
-			// 处理编辑器内容为空
-			this.setState({
-				question_titlesysl:""
-			})
-		} else {
-			// 提交到后台的内容需要处理一下;
-			var texts="";
-			if(_text.length>=1001){
-				var result = _text.substring(0,1000);
-				texts={"ops":[{"insert":result}]};
-				texts=JSON.stringify(texts);
-			}else {
-				value =  JSON.stringify(value)
-				texts=value;
-			}
-			this.setState({
-				question_titlesysl:texts
-			})
-		}
+	onContentChange = (html) => {
+
+		this.setState({
+			question_titleysl: html
+		})
 	}
 
+	bindinginputs = (i) => {
+		this.setState({
+			bindinginputs: i
+		})
+
+	}
+	onContentChanges = (html) => {
+
+		this.setState({
+			question_titlesysl: html
+		})
+	}
 
 	render() {
-		let { question_title, question_score, question_type, question_choices, standard_answers,question_titles} = this.state;
+		let { paramstype, question_title, question_titleysl, question_score, question_type, question_choices, standard_answers, question_titles, question_titlesysl, bindinginputs } = this.state;
 		let { question_id, index, exerciseIsPublish,
-			// question_title,
-			// question_type,
-			// question_score,
 			isNew } = this.props;
 
-		// const { getFieldDecorator } = this.props.form;
-
-		// const isAdmin = this.props.isAdmin()
-		// const courseId=this.props.match.params.coursesId;
-		// const isEdit = !!this.props.question_id
 		const qNumber = `question_`;
-		// TODO show模式  isNew为false isEdit为false
-
-		// [true, false, true] -> [0, 2]
 
 		const answerTagArray = standard_answers.map((item, index) => { return item == true ? tagArray[index] : -1 }).filter(item => item != -1);
-		// //////console.log("xuanzheshijuan");
-		// //////console.log(answerTagArray);
-		// //////console.log(!exerciseIsPublish);
-
-		return(
+		const options = ['code-block', 'image', 'formula', 'clean']
+		return (
 			<div className="padding20-30  signleEditor duoxuano" id={qNumber}>
 				<style>{`
               .optionMdEditor {
@@ -357,6 +324,30 @@ class ChoquesEditor extends Component{
               #e_tips_mdEditor_question_undefined4{
                display: none;
               }
+               .signleEditor .quill_editor_for_react_area  .ql-toolbar .ql-formats .ql-size {
+              line-height: 20px;
+              }
+               .signleEditor .quill_editor_for_react_area  .ql-toolbar .ql-formats .ql-font {
+              line-height: 20px;
+               min-width: 150px;
+              }
+               .signleEditor .quill_editor_for_react_area  .ql-container .ql-editor p{
+                  font-family: MicrosoftYaHei;
+              }
+              
+              .content_editorMd_show{
+                display: flex !important;
+                margin-top:0px !important;
+                border-radius:2px !important;
+                max-width: 1056px !important;
+                word-break:break-all !important;
+                border:1px solid rgba(221,221,221,1) !important;
+              }
+              .contestedtext{
+              font-size:14px;
+							font-family:MicrosoftYaHei;
+							color:rgba(172,172,172,1);
+              }
             `}</style>
 				<p className="mb10 clearfix">
 					{/* {!question_id ? '新建' : '编辑'} */}
@@ -364,15 +355,12 @@ class ChoquesEditor extends Component{
 					<span className="xingtigan  fl">题干：</span>
 				</p>
 
-				<QuillForEditor
-					autoFocus={true}
-					imgAttrs={{width: '146px', height: '136px'}}
-					style={{ height: '155px'}}
+				<TPMMDEditor
+					initValue={question_titleysl}
+					height={155}
+					mdID='single-question-title'
+					onChange={this.onContentChange}
 					placeholder="请您输入题干"
-					options={['code-block', 'image', 'formula']}
-					value={question_title}
-					onContentChange={this.onContentChange}
-
 				/>
 
 				<div className="mb10 sortinxdirection">
@@ -381,59 +369,80 @@ class ChoquesEditor extends Component{
 					<span className="xingtigans  fl"><span className="xingtigan">答案选项：</span>点击选项可设置正确答案</span>
 				</div>
 
-				{question_choices.map( (item, index) => {
+				{question_choices.map((item, index) => {
+					// console.log("question_choices");
+					// console.log(item);
+					let itemss = item;
+					if (itemss) {
+						try {
+							itemss = JSON.parse(itemss);
+						} catch (e) {
+							itemss = itemss;
+						}
+					}
 					const bg = standard_answers[index] ? 'check-option-bg' : ''
-					return <div key={index} className={index>0?"df optionRow mt15": "df optionRow"}  >
+					return <div key={index} className={index > 0 ? "df optionRow mt15" : "df optionRow"}  >
 						{/* 点击设置答案 */}
-						{/* TODO 加了tooltip后，会丢失掉span的class */}
-						{/* <Tooltip title={standard_answers[index] ? '点击取消标准答案设置' : '点击设置为标准答案'}> */}
 						<span className={`option-item fr mr10 color-grey select-choice ${bg} `}
-									name="option_span" onClick={() => this.onOptionClick(index)} style={{flex: '0 0 38px'}}>
-                      <ConditionToolTip title={standard_answers[index] ? '点击取消标准答案设置' : '点击设置为标准答案'} placement="left" condition={true}>
-                        <div style={{width: '100%', height: '100%'}}>{tagArray[index]}</div>
-                      </ConditionToolTip>
-                  </span>
-						{/* </Tooltip> */}
-						<div style={{ flex: '0 0 1038px'}}>
+							name="option_span" onClick={() => this.onOptionClick(index)} style={{ flex: '0 0 38px' }}>
+							<ConditionToolTip title={standard_answers[index] ? '点击取消标准答案设置' : '点击设置为标准答案'} placement="left" condition={true}>
+								<div style={{ width: '100%', height: '100%' }}>{tagArray[index]}</div>
+							</ConditionToolTip>
+						</span>
+						<div style={{ flex: '0 0 1038px' }}>
 
 							{
-								item===undefined||item===null||item===""?
-									<QuillForEditor
-										 autoFocus={false}
-										imgAttrs={{width: '146px', height: '136px'}}
-										style={{ height: '166px'}}
-										placeholder="请您输入题干"
-										options={['code-block', 'image', 'formula']}
-										value={item}
-										onContentChange={(value,quill) => this.onOptionContentChange(value,quill,index)}
-									/>
+								item === undefined || item === null || item === "" ?
+									<div style={{ width: '100%' }}>
+										{
+											bindinginputs === null || bindinginputs !== index ?
+												<div className="content_editorMd_show" onClick={() => this.bindinginputs(index)}>
+													{/*<p className="contestedtext">请您输入选项</p>*/}
+												</div> :
+												<TPMMDEditor
+													initValue={item}
+													height={155}
+													mdID='single-question-option'
+													onChange={value => this.onOptionContentChange(value, index)}
+													placeholder="请您输入选项"
+												/>
+										}
+									</div>
 									:
-									<QuillForEditor
-										autoFocus={false}
-										imgAttrs={{width: '146px', height: '136px'}}
-										style={{ height: '166px'}}
-										placeholder="请您输入题干"
-										options={['code-block', 'image', 'formula']}
-										value={JSON.parse(item)}
-										onContentChange={(value,quill) => this.onOptionContentChange(value,quill,index)}
-									/>
+									<div style={{ width: '100%' }}>
+										{
+											bindinginputs === null || bindinginputs !== index ?
+												<div className="content_editorMd_show" onClick={() => this.bindinginputs(index)}>
+													<RenderHtml  value={itemss} />
+
+												</div>
+												:
+												<TPMMDEditor
+													initValue={item}
+													height={155}
+													mdID='single-question-option'
+													onChange={value => this.onOptionContentChange(value, index)}
+													placeholder="请您输入选项"
+												/>
+										}
+									</div>
 
 							}
 						</div>
-						{exerciseIsPublish || index<=2?
+						{exerciseIsPublish || index <= 2 ?
 							<i className=" font-18  ml15 mr20"></i>
-							:<Tooltip title="删除">
+							: <Tooltip title="删除">
 								<i className="iconfont icon-htmal5icon19 font-18 color-grey-c ml15" onClick={() => this.deleteOption(index)}></i>
-							</Tooltip> }
-						{ !exerciseIsPublish && index<7 && <Tooltip title={`新增参考答案`}>
+							</Tooltip>}
+						{!exerciseIsPublish && index < 7 && <Tooltip title={`新增参考答案`}>
 							<i className="color-green font-16 iconfont icon-roundaddfill ml6"
-								 onClick={() => this.addOption()}
-								 style={{float: 'right', visibility: index == question_choices.length - 1 ? '' : 'hidden', marginTop: '2px'}}
+								onClick={() => this.addOption()}
+								style={{ float: 'right', visibility: index == question_choices.length - 1 ? '' : 'hidden', marginTop: '2px' }}
 							></i>
 						</Tooltip>}
 
 					</div>
-				}) }
+				})}
 
 
 
@@ -442,19 +451,17 @@ class ChoquesEditor extends Component{
 
 
 					<p className="mb10 mt10 clearfix">
-						{/* {!question_id ? '新建' : '编辑'} */}
 						<span className="xingcolor font-16 fl mr4"></span>
 						<span className="xingtigan  fl">题目解析：</span>
 					</p>
 					<div className="mt10"></div>
-					<QuillForEditor
-						autoFocus={false}
-						imgAttrs={{width: '146px', height: '136px'}}
-						style={{height: '166px' }}
+
+					<TPMMDEditor
+						initValue={question_titlesysl}
+						height={155}
+						mdID='single-question-answer'
+						onChange={this.onContentChanges}
 						placeholder="请您输入题目解析"
-						options={['code-block', 'image', 'formula']}
-						value={question_titles}
-						onContentChange={this.onContentChanges}
 					/>
 
 				</div>
diff --git a/src/modules/question/component/ComquestionEditor.js b/src/modules/question/component/ComquestionEditor.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/modules/question/component/Contentpart.js b/src/modules/question/component/Contentpart.js
index 96ac6415..5119e3e5 100644
--- a/src/modules/question/component/Contentpart.js
+++ b/src/modules/question/component/Contentpart.js
@@ -1,146 +1,226 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn,SnackbarHOC,getImageUrl} from 'educoder';
-import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Tabs,
-	Input,
-	Popover,
-	Tooltip
-} from "antd";
+import React, { Component } from "react";
+import { Tabs, Input, } from "antd";
 import './../questioncss/questioncom.css';
 import NoneDatas from '../component/NoneDatas';
 import LoadingSpin from '../../../common/LoadingSpin';
 import Contentquestionbank from "./Contentquestionbank";
 import Listjihe from "./Listjihe";
+import Certifiedprofessional from "../../modals/Certifiedprofessional";
+import QuestionModalPicture from '../component/QuestionModalPicture'
 const { TabPane } = Tabs;
 const Search = Input.Search;
 class Contentpart extends Component {
 	constructor(props) {
 		super(props);
 		this.state = {
-			page:1,
-			chakanjiexibool:false,
+			page: 1,
+			chakanjiexibool: false,
+			mydisplay: false,
+			occupation: 2,
+			url: "",
+			isysladmins: false,
 		}
 	}
 	//初始化
-	componentDidMount(){
-
+	componentDidMount() {
 
+		let isysladmins = false;
+		if (this.props) {
+			if (this.props.current_user) {
+				if (this.props.current_user.admin) {
+					isysladmins = true;
+				}
+				else if (this.props.current_user.business) {
+					isysladmins = true;
+				}
+			}
+		}
+		this.setState({
+			isysladmins: isysladmins
+		})
+		this.props.callback(this.props.defaultActiveKey);
+	}
+	handleShowUploadImage = (url) => {
+		this.setState({
+			url: url
+		})
+	}
+	handleClose = () => {
+		this.setState({
+			url: '',
+		})
 	}
 
-	chakanjiexibool=(index)=>{
-   this.props.chakanjiexibool(index);
+	chakanjiexibool = (index) => {
+		//查看解析
+		this.props.chakanjiexibool(index);
 	}
+
+	showmodels = (e) => {
+		//设为公开
+		this.props.showmodels(e)
+	}
+
+	showmodelsInaudit = (e) => {
+		this.props.showmodelsInaudit(e)
+	}
+
+	showmodelysl = (e) => {
+		this.props.showmodelysl(e)
+	}
+
 	componentDidUpdate(prevProps) {
-		if(prevProps.current_user !== this.props.current_user) {
-			debugger
-			const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-			const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
-			const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
-			let {defaultActiveKey} = this.props;
-			var defaultActiveKeys=defaultActiveKey;
-			if(isysladmins===true||(is_teacher===true&&professional_certification===true)){
-				defaultActiveKeys="0"
-			}else{
-				defaultActiveKeys="1"
+		if (prevProps.current_user !== this.props.current_user) {
+
+			let isysladmins = false;
+			let is_teacher = this.props && this.props.current_user && this.props.current_user.is_teacher ? this.props.current_user.is_teacher : false;
+			const professional_certification = this.props && this.props.current_user && this.props.current_user.professional_certification ? this.props.current_user.professional_certification : false;
+			let { defaultActiveKey } = this.props;
+			var defaultActiveKeys = defaultActiveKey;
+			try {
+				if (this.props) {
+					if (this.props.current_user) {
+						if (this.props.current_user.admin) {
+							isysladmins = true;
+						}
+						else if (this.props.current_user.business) {
+							isysladmins = true;
+						}
+					}
+				}
+
+				if (is_teacher === false) {
+					if (this.props.current_user.user_identity !== "学生") {
+						//专业人士
+						is_teacher = true
+					}
+				}
+			} catch (e) {
+
 			}
-			this.props.callback(defaultActiveKeys);
+			this.setState({
+				isysladmins: isysladmins
+			})
 		}
 	}
-	xinzenw=(e)=>{
-		var urls="?";
-		 if(this.props.discipline_id){
-			 if(urls==="?"){
-				 urls=urls+`discipline_id=${this.props.discipline_id}`
-			 }else {
-				 urls=urls+`&discipline_id=${this.props.discipline_id}`
-			 }
-		 }
-		if(this.props.sub_discipline_id){
-			if(urls==="?"){
-				urls=urls+`sub_discipline_id=${this.props.sub_discipline_id}`
-			}else {
-				urls=urls+`&sub_discipline_id=${this.props.sub_discipline_id}`
-			}
+	HideAddcoursestypess = (i) => {
+		console.log("调用了");
+		this.setState({
+			mydisplay: true,
+			occupation: i,
+		})
+	}
+
+	mydisplayHidedel = () => {
+		this.setState({
+			mydisplay: false,
+		})
+	}
+
+	xinzenw = (e) => {
+		// //只限制了教师
+		// if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+		// 	this.HideAddcoursestypess(2);
+		// 	return
+		// }
+		var urls = "";
+		if (this.props.discipline_id) {
+			// if(urls==="?"){
+			//  urls=urls+`discipline_id=${this.props.discipline_id}`
+			// }else {
+			urls = urls + `&discipline_id=${this.props.discipline_id}`
+			// }
 		}
-		if(this.props.tag_discipline_id){
-			if(urls==="?"){
-				urls=urls+`sub_discipline_id=${this.props.tag_discipline_id}`
-			}else {
-				urls=urls+`&sub_discipline_id=${this.props.tag_discipline_id}`
-			}
+		if (this.props.sub_discipline_id) {
+			// if(urls==="?"){
+			// 	urls=urls+`sub_discipline_id=${this.props.sub_discipline_id}`
+			// }else {
+			urls = urls + `&sub_discipline_id=${this.props.sub_discipline_id}`
+			// }
 		}
-		if(this.props.difficulty){
-			if(urls==="?"){
-				urls=urls+`difficulty=${this.props.difficulty}&`
-			}else {
-				urls=urls+`&difficulty=${this.props.difficulty}`
-			}
+		if (this.props.tag_discipline_id) {
+			// if(urls==="?"){
+			// 	urls=urls+`sub_discipline_id=${this.props.tag_discipline_id}`
+			// }else {
+			urls = urls + `&sub_discipline_id=${this.props.tag_discipline_id}`
+			// }
 		}
-		if(this.props.item_type){
-			if(urls==="?"){
-				urls=urls+`item_type=${this.props.item_type}`
-			}else {
-				urls=urls+`&item_type=${this.props.item_type}`
-			}
+		if (this.props.difficulty) {
+			// if(urls==="?"){
+			// 	urls=urls+`difficulty=${this.props.difficulty}&`
+			// }else {
+			urls = urls + `&difficulty=${this.props.difficulty}`
+			// }
+		}
+		if (this.props.item_type) {
+			// if(urls==="?"){
+			// 	urls=urls+`item_type=${this.props.item_type}`
+			// }else {
+			urls = urls + `&item_type=${this.props.item_type}`
+			// }
 
 		}
 
+		this.props.history.push("/problemset/newitem?pages=" + this.props.pages + urls);
 
-		this.props.history.push("/question/newitem"+urls);
 	}
 	render() {
-		let {page}=this.state;
-		let {defaultActiveKey,item_type,booljupyterurls}=this.props;
-		const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-		const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
-		const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
+		let { page, mydisplay, url } = this.state;
+		let { defaultActiveKey, item_type, booljupyterurls } = this.props;
+		const defaultActiveKeys = defaultActiveKey + '';
+		let isysladmins = false;
+		let is_teacher = this.props && this.props.current_user && this.props.current_user.is_teacher ? this.props.current_user.is_teacher : false;
+		const professional_certification = this.props && this.props.current_user && this.props.current_user.professional_certification ? this.props.current_user.professional_certification : false;
+		try {
+			if (is_teacher === false) {
+				if (this.props.current_user.user_identity !== "学生") {
+					//专业人士
+					is_teacher = true
+				}
+			}
+			if (this.props) {
+				if (this.props.current_user) {
+					if (this.props.current_user.admin) {
+						isysladmins = true;
+					}
+					else if (this.props.current_user.business) {
+						isysladmins = true;
+					}
+				}
+			}
+		} catch (e) {
 
-
-		const content = (
-			<div className="questiontypes" style={{
-				width:'93px',
-				height:'200px',
-			}}>
-				<p className="questiontype " onClick={()=>this.props.setitem_types(null)}>全部</p>
-				<p className="questiontypeheng" ></p>
-				<p className="questiontype " onClick={()=>this.props.setitem_types("SINGLE")}>单选题</p>
-				<p className="questiontypeheng" ></p>
-				<p className="questiontype "  onClick={()=>this.props.setitem_types("MULTIPLE")}>多选题</p>
-				<p className="questiontypeheng"></p>
-				<p className="questiontype "  onClick={()=>this.props.setitem_types("JUDGMENT")}>判断题</p>
-				<p className="questiontypeheng"></p>
-				<p className="questiontype "  onClick={()=>this.props.setitem_types("PROGRAM")}>编程题</p>
-				<p className="questiontypeheng"></p>
-
-			</div>
-		);
-		const contents = (
-			<div  className="questiontypes" style={{
-				width:'93px',
-				height:'120px',
-			}}>
-				<p className="questiontype " onClick={()=>this.props.setoj_status(null)}>全部</p>
-				<p className="questiontypeheng"></p>
-				<p className="questiontype " onClick={()=>this.props.setoj_status(0)}>未发布</p>
-				<p className="questiontypeheng"></p>
-				<p className="questiontype " onClick={()=>this.props.setoj_status(1)}>已发布</p>
-				<p className="questiontypeheng"></p>
-			</div>
-		);
-
-
-		//console.log("Contentpart.js");
-		//console.log(this.props.defaultActiveKey);
+		}
 
 		return (
 			<div className=" clearfix mt25">
 				<div className="educontent mt10 pb20 w1200s">
+					{url ?
+						<QuestionModalPicture  {...this.props} {...this.state} handleClose={() => this.handleClose()}></QuestionModalPicture>
+						:
+						""
+					}
+					{
+						mydisplay === true ?
+							<Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.mydisplayHidedel} />
+
+							: ""
+					}
+					{
+						mydisplay === true ?
+							<style>
+								{
+									`
+									  body{
+            overflow:hidden!important;
+          }
+
+									`
+								}
+							</style>
+
+							: ""
+					}
 					<div className="w1200ms contentparttit" style={{
 						position: "relative",
 					}}>
@@ -163,27 +243,17 @@ class Contentpart extends Component {
 							}
 						</style>
 
-
-						{
-							isysladmins===true||(is_teacher===true&&professional_certification===true)?
-									<Tabs activeKey={defaultActiveKey} onChange={(e)=>this.props.callback(e)}>
-										<TabPane tab="公共" key="1">
-										</TabPane>
-										<TabPane tab="我的" key="0">
-										</TabPane>
-									</Tabs>
-								:
-								<Tabs activeKey={1} onChange={(e)=>this.props.callback(e)}>
-									<TabPane tab="公共" key="1">
-									</TabPane>
-								</Tabs>
-						}
-
+						<Tabs activeKey={defaultActiveKeys} onChange={(e) => this.props.callback(e)}>
+							<TabPane tab="公共" key="1">
+							</TabPane>
+							<TabPane tab="我的" key="0">
+							</TabPane>
+						</Tabs>
 
 						<div className=" mt19" style={{
-							position:"absolute",
+							position: "absolute",
 							top: "0px",
-							right:" 0px",
+							right: " 0px",
 							paddingRight: "20px",
 						}}>
 							<style>
@@ -191,13 +261,13 @@ class Contentpart extends Component {
 									`
 									
 									.xaxisreverseorder .ant-input-group-addon{
-									width: 60px !important;
-									
+									width: 48px !important;
+									}
+									.xaxisreverseorder .ant-input-group-addon .ant-btn-lg {
+									 height: 38px !important;
+								 border: 1px solid #d9d9d9!important;
 									}
 									
-									.xaxisreverseorder .ant-input-lg {
-    height: 41px !important;}
-                 
                   .xaxisreverseorder .ant-popover{
                        top: 30px !important;
                    }
@@ -206,149 +276,112 @@ class Contentpart extends Component {
                   .xaxisreverseorder .ant-popover-inner-content {
                    padding:0px !important;
                    }
-   
+                   
+                   
+									 
 									`
 								}
 							</style>
-						 <div className="xaxisreverseorder">
-							 {
-								 defaultActiveKey===0||defaultActiveKey==="0"?
-									 isysladmins===true||(is_teacher===true&&professional_certification===true)?
-											 this.props.Isitapopup&&this.props.Isitapopup==="true"?
-												 ""
-												 :
-												 <a onClick={(e)=>this.xinzenw(e)}>
-													 <div className="newbutoon">
-														 <p className="newbutoontes" >新增</p>
-													 </div>
-												 </a>
-											 :""
-									 :""
-							 }
-
-							 {item_type==="PROGRAM"?
-								 defaultActiveKey===0||defaultActiveKey==="0"?
-									<Popover getPopupContainer={trigger => trigger.parentNode}  placement="bottom" trigger="hover" content={contents}   onVisibleChange={()=>this.props.handleVisibleChange(true)}>
-										<div className=" sortinxdirection mr30">
-
-											<div className="subjecttit">
-												全部
+							<div className="xaxisreverseorder">
+								{
+									this.props.Isitapopup && this.props.Isitapopup === "true" ?
+										""
+										:
+										<a onClick={(e) => this.xinzenw(e)}>
+											<div className="newbutoon">
+												<p className="newbutoontes" >新增</p>
 											</div>
-											<i className="iconfont icon-sanjiaoxing-down font-12 lg ml7 icondowncolor"></i>
-										</div>
-									</Popover>
-									:
-									"":""
-							 }
+										</a>
+								}
 
+								{
+									this.props.Isitapopup && this.props.Isitapopup === "true" ?
+										<Search
+											style={{ marginRight: "0px" }}
+											className={"xaxisreverseorder searchwidth"}
+											placeholder="请输入题目名称、内容"
+											enterButton
+											size="large"
+											onInput={(e) => this.props.setdatafunsval(e)}
+											onSearch={(value) => this.props.setdatafuns(value)} />
+										:
+										<Search
+											style={{ marginRight: "30px" }}
+											className={"xaxisreverseorder searchwidth"}
+											placeholder="请输入题目名称、内容"
+											enterButton
+											size="large"
+											onInput={(e) => this.props.setdatafunsval(e)}
+											onSearch={(value) => this.props.setdatafuns(value)} />
+								}
 
-							 {
-								 defaultActiveKey===0||defaultActiveKey==="0"?
-									 this.props.Isitapopup&&this.props.Isitapopup==="true"?
-										 <Search
-											 style={isysladmins===true||(is_teacher===true&&professional_certification)?{ marginRight:"0px"}:{marginRight:"0px"}}
-											 className={"xaxisreverseorder searchwidth"}
-											 placeholder="请输入题目名称、内容"
-											 enterButton
-											 size="large"
-											 onInput={(e)=>this.props.setdatafunsval(e)}
-											 onSearch={ (value)=>this.props.setdatafuns(value)} />
-										 :
-									 <Search
-										 style={isysladmins===true||(is_teacher===true&&professional_certification)?{ marginRight:"30px"}:{marginRight:"0px"}}
-										 className={"xaxisreverseorder searchwidth"}
-										 placeholder="请输入题目名称、内容"
-										 enterButton
-										 size="large"
-										 onInput={(e)=>this.props.setdatafunsval(e)}
-										 onSearch={ (value)=>this.props.setdatafuns(value)} />
-									 :
-									 <Search
-										 className={"xaxisreverseorder searchwidth"}
-										 placeholder="请输入题目名称、内容"
-										 enterButton
-										 size="large"
-										 onInput={(e)=>this.props.setdatafunsval(e)}
-										 onSearch={ (value)=>this.props.setdatafuns(value)} />
-							 }
-
-						 </div>
+							</div>
 
 						</div>
 					</div>
 					{/*内容*/}
 					{
-						this.props.Contentdata.items === undefined ||this.props.Contentdata.items === null||this.props.Contentdata.items.length===0 ?
+						this.props.Contentdata.items === undefined || this.props.Contentdata.items === null || this.props.Contentdata.items.length === 0 ?
 							<div className=" w100s mb10"></div>
 							:
 							<div className=" w100s mb10">
 								{
-							defaultActiveKey===1||defaultActiveKey==="1"?
-										<Contentquestionbank {...this.props} {...this.state}  selectallquestionsonthispage={()=>this.props.selectallquestionsonthispage()} ></Contentquestionbank>
-										:""
+									defaultActiveKey === 1 || defaultActiveKey === "1" ?
+										<Contentquestionbank {...this.props} {...this.state} selectallquestionsonthispages={this.props.selectallquestionsonthispages} selectallquestionsonthispage={(bool) => this.props.selectallquestionsonthispage(bool)} ></Contentquestionbank>
+										: ""
 								}
 								{
-									defaultActiveKey===0||defaultActiveKey==="0"?
-										<Contentquestionbank {...this.props} {...this.state} selectallquestionsonthispage={()=>this.props.selectallquestionsonthispage()}></Contentquestionbank>
-										:""
+									defaultActiveKey === 0 || defaultActiveKey === "0" ?
+										<Contentquestionbank {...this.props} {...this.state} selectallquestionsonthispages={this.props.selectallquestionsonthispages} selectallquestionsonthispage={(bool) => this.props.selectallquestionsonthispage(bool)}></Contentquestionbank>
+										: ""
 								}
 							</div>
 					}
 
 					<div className="minheight">
-					{/*列表集合*/}
-					<div className=" w100s">
-						{
-							this.props.booljupyterurls===true?
-								<LoadingSpin></LoadingSpin>
-								:
-							this.props.Contentdata.items === undefined ||this.props.Contentdata.items === null||this.props.Contentdata.items.length===0?
-							 <NoneDatas></NoneDatas>
+						{/*列表集合*/}
+						<div className=" w100s">
+							{
+								this.props.booljupyterurls === true ?
+									<LoadingSpin></LoadingSpin>
+									:
+									this.props.Contentdata.items === undefined || this.props.Contentdata.items === null || this.props.Contentdata.items.length === 0 ?
+										<NoneDatas></NoneDatas>
 
 
-							: this.props.Contentdata.items.map((object, index) => {
-							return (
-								<Listjihe {...this.state} {...this.props}
+										: this.props.Contentdata.items.map((object, index) => {
+											return (
+												<Listjihe {...this.state} {...this.props}
+													defaultActiveKeys={defaultActiveKeys}
+													Datacountbool={this.props.Datacountbool}
+													Datacount={this.props.Datacount}
 													Isitapopup={this.props.Isitapopup}
 													chakanjiexiboolindex={this.props.chakanjiexiboolindex}
-													chakanjiexibool={(keindex)=>this.chakanjiexibool(keindex)}
-													listjihe={index+1}
+													chakanjiexibool={(keindex) => this.chakanjiexibool(keindex)}
+													listjihe={index + 1}
 													keindex={index}
 													items={object}
 													key={index}
-													getitem_basketss={(id)=>this.props.getitem_basketss(id)}
-													getitem_baskets={(e)=>this.props.getitem_baskets(e)}
-													showmodels={(e)=>this.props.showmodels(e)}
-													showmodelysl={(e)=>this.props.showmodelysl(e)}>
-
-								</Listjihe>
-							)
-						})}
-
-
+													pages={this.props.pages}
+													getitem_basketss={(id) => this.props.getitem_basketss(id)}
+													getitem_baskets={(e) => this.props.getitem_baskets(e)}
+													showmodels={(e) => this.showmodels(e)}
+													showmodelysl={(e) => this.showmodelysl(e)}
+													showmodelsInaudit={(e) => this.showmodelsInaudit(e)}
+													handleShowUploadImage={(e) => this.handleShowUploadImage(e)}
+													handleClose={() => this.handleClose()}
+													setasprivates={(e) => this.props.setasprivates(e)}
+												>
 
+												</Listjihe>
+											)
+										})
+							}
+						</div>
 					</div>
-
-					</div>
-
-
-
-
-
-
-
-
-
-
 				</div>
-
-
 			</div>
 		)
-
 	}
-
-
-
 }
 export default Contentpart
diff --git a/src/modules/question/component/Contentquestionbank.js b/src/modules/question/component/Contentquestionbank.js
index 79e8bbb8..a6bd028c 100644
--- a/src/modules/question/component/Contentquestionbank.js
+++ b/src/modules/question/component/Contentquestionbank.js
@@ -41,23 +41,50 @@ class Contentquestionbank extends Component {
 	render() {
 		let {page}=this.state;
 		let {selectionbools}=this.props;
+		let Periofters = false;
+		if (this.props) {
+			if (this.props.current_user) {
+				if (this.props.current_user.admin) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.business) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.is_shixun_marker) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.is_teacher) {
+					Periofters = true;
+				} else if (this.props.current_user.user_identity !== "学生") {
+					Periofters = true;
+				}
+			}
+		}
 
 		return (
 
-			<div className=" clearfix mt5 Contentquestionbankstyle">
+			<div className=" clearfix mt10 Contentquestionbankstyle">
 				<div className="educontent   w100s">
 					<div className="sortinxdirection w100s" >
-						<div className="sortinxdirection w50s">
-							{
-								selectionbools===true?
-									<Checkbox checked={this.props.selectallquestionsonthispages} onChange={()=>this.props.selectallquestionsonthispage()} disabled></Checkbox>
-									:
-									<Checkbox checked={this.props.selectallquestionsonthispages} onChange={()=>this.props.selectallquestionsonthispage()}></Checkbox>
+						{
+							Periofters===false?
+								<div className="sortinxdirection w50s pl5">
 
-							}
-							<p className="setequesbank ml20">选用本页全部试题</p>
-						</div>
-						<div className="xaxisreverseorder testpaper w50s">
+								</div>
+								:
+								<div className="sortinxdirection w50s pl5">
+									{
+										selectionbools===true?
+											<Checkbox checked={this.props.selectallquestionsonthispages} onChange={()=>this.props.selectallquestionsonthispage(this.props.selectallquestionsonthispages)} ></Checkbox>
+											:
+											<Checkbox checked={this.props.selectallquestionsonthispages} onChange={()=>this.props.selectallquestionsonthispage(this.props.selectallquestionsonthispages)}></Checkbox>
+
+									}
+									<p className="setequesbank ml20">选用本页全部试题</p>
+								</div>
+
+						}
+						<div className="xaxisreverseorder testpaper w50s pr5">
 							共{this.props.items_count?this.props.items_count:0}个试题
 						</div>
 					</div>
diff --git a/src/modules/question/component/Headplugselections.js b/src/modules/question/component/Headplugselections.js
index 643729ec..caa0ac94 100644
--- a/src/modules/question/component/Headplugselections.js
+++ b/src/modules/question/component/Headplugselections.js
@@ -1,28 +1,12 @@
 import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn,SnackbarHOC,getImageUrl} from 'educoder';
-import axios from 'axios';
 import './../questioncss/questioncom.css';
-import { Select, Input,Menu, Dropdown,notification,
-	Spin,
-	Table,
-	Pagination} from 'antd';
+import { Menu, Dropdown } from 'antd';
 
 import 'antd/lib/style/index.css';
-
 import 'antd/lib/select/style/index.css';
-
 import 'antd/lib/input/style/index.css';
-
 import '../../tpm/shixuns/shixunCss/ShixunSearchBar.css';
 
-
-const $ = window.$;
-
-const Option = Select.Option;
-
-const Search = Input.Search;
-
 class Headplugselections extends Component {
 	constructor(props) {
 		super(props);
@@ -80,10 +64,36 @@ class Headplugselections extends Component {
 		}catch (e) {
 
 		}
+
+
+	}
+
+	shixunserdchAlls=(itme,id)=>{
+		if(id!=undefined){
+			this.setState({
+				shixunsearchAllvalue:id,
+			})
+			try {
+				this.props.setdiscipline_id(id);
+			}catch (e) {
+
+			}
+
+		}
+		//   console.log(itme);
+		// console.log(itme[0]);
+		if(itme!=undefined){
+			try {
+				this.props.setsub_discipline_id(id,itme[0].id);
+			}catch (e) {
+
+			}
+		}
 	}
 
 	//获取方向
 	shixunsearchAll = (id) => {
+		//大写A
 		//console.log("获取方向");
 		//console.log(id);
 		if(id!=undefined){
@@ -128,8 +138,9 @@ class Headplugselections extends Component {
 
 	getshixunchildValue = (id,ids) => {
 		// //console.log("getshixunchildValue");
-		// //console.log(id);
-		// debugger
+		// console.log(id);
+		// console.log(ids);
+		
 		if(id!=undefined ||ids!=undefined){
 			this.setState({
 				shixunsearchAllvalue:ids
@@ -141,6 +152,7 @@ class Headplugselections extends Component {
 
 			}
 		}
+
 	}
 	render() {
 		let {shixunhoverData, shixunchildValues, shixunsearchAllvalue, InputValue,openStatus,openLevel} = this.state;
@@ -231,11 +243,16 @@ class Headplugselections extends Component {
 											{
 												disciplinesdata&&disciplinesdata.map((item,key)=>{
 													return(
-														<Dropdown getPopupContainer={trigger => trigger.parentNode} overlay={overlaymenu(item.sub_disciplines,item.id)} key={key} placement={item.id<4?"bottomRight":item.id>=8?"bottomLeft":"bottomCenter"}>
+														item.sub_disciplines.length>0?
+															<Dropdown overlayStyle={{width:600}} getPopupContainer={trigger => trigger.parentNode} overlay={	overlaymenu(item.sub_disciplines,item.id)} key={key} placement="bottomLeft">
+																<li  key={key} className={parseInt(shixunsearchAllvalue)===item.id?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value={item.id}  onClick={()=>this.shixunserdchAlls(item.sub_disciplines,item.id)}>
+																	{item.name}
+																</li>
+															</Dropdown>
+														:
 															<li  key={key} className={parseInt(shixunsearchAllvalue)===item.id?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value={item.id}  onClick={()=>this.shixunsearchAll(item.id)}>
 																{item.name}
 															</li>
-														</Dropdown>
 													)
 												})
 											}
@@ -276,6 +293,8 @@ class Headplugselections extends Component {
 											<li className={this.state.tixing==="SINGLE"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("SINGLE")}>单选题</li>
 											<li className={this.state.tixing==="MULTIPLE"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("MULTIPLE")}>多选题</li>
 											<li className={this.state.tixing==="JUDGMENT"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("JUDGMENT")}>判断题</li>
+											<li className={this.state.tixing==="COMPLETION"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("COMPLETION")}>填空题</li>
+											<li className={this.state.tixing==="SUBJECTIVE"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("SUBJECTIVE")}>问答题</li>
 										</div>
 
 									</div>
@@ -316,24 +335,11 @@ class Headplugselections extends Component {
 								</div>
 							</div>
 						</div>
-
-
-
-
-
-
-
-
-
 						{/*课程尾巴*/}
 					</div>
 				</div>
 			</div>
 		)
-
 	}
-
-
-
 }
 export default  Headplugselections ;
diff --git a/src/modules/question/component/Itembankstop.js b/src/modules/question/component/Itembankstop.js
index b7143f6a..46133e35 100644
--- a/src/modules/question/component/Itembankstop.js
+++ b/src/modules/question/component/Itembankstop.js
@@ -58,7 +58,7 @@ class Itembankstop extends Component {
 			NewknTypedel:false,
 			boolred:false,
 			boolnews:false,
-
+			sub_disciplineslength:1,
 		}
 	}
 
@@ -463,15 +463,22 @@ class Itembankstop extends Component {
 
 		const didata = this.props.disciplinesdata;
 		const knowledgepointsdata = [];
-
+		var sub_disciplineslength=0;
 		for (var i = 0; i < didata.length; i++) {
 			//方向
 			if (value[0] === didata[i].id) {
 				const fxdidata = didata[i].sub_disciplines;
+				  try {
+						sub_disciplineslength=fxdidata.length;
+					}catch (e) {
+
+					}
 				for (var j = 0; j < fxdidata.length; j++) {
 					//课程
 					if (value[1] === fxdidata[j].id) {
+
 						const zsddata = fxdidata[j].tag_disciplines;
+
 						for (var k = 0; k < zsddata.length; k++) {
 							//知识点
 							knowledgepointsdata.push(zsddata[k]);
@@ -491,6 +498,7 @@ class Itembankstop extends Component {
 			Knowpoints: [],
 			knowledgepoints: knowledgepointsdata,
 			knowledgepoints2:knowledgepointsdata,
+			sub_disciplineslength:sub_disciplineslength,
 		})
 
 		this.props.form.setFieldsValue({
@@ -559,10 +567,15 @@ class Itembankstop extends Component {
 	}
 
 	NewknTypedeldel=(bool)=>{
+
 		if(this.state.rbkc===undefined || this.state.rbkc===null || this.state.rbkc===""){
 			this.props.showNotification(`请选择课程方向`);
 			return;
 		}
+		// if(this.state.sub_disciplineslength===undefined || this.state.sub_disciplineslength===null || this.state.sub_disciplineslength===0){
+		// 	this.props.showNotification(`无二级课程时没有新建入口`);
+		// 	return;
+		// }
 		this.setState({
 			NewknTypedel:bool
 		})
@@ -668,6 +681,9 @@ class Itembankstop extends Component {
 				<style>
 					{
 						`
+						 body{
+            width: 100%!important;
+          }
 						.ant-form-item{
 						 margin-bottom: 0px !important;
 						
@@ -723,20 +739,22 @@ class Itembankstop extends Component {
 					)}
 				</Form.Item>
 					</div>
-					<Form.Item
+					{
+						this.state.sub_disciplineslength===null || this.state.sub_disciplineslength===undefined||this.state.sub_disciplineslength===0?"":
+						<Form.Item
 						label="知识点"
-					>
+						>
 						{getFieldDecorator("rbzsd"
 						)(
 							<div className="sortinxdirection">
-									<Select style={{width: '270px'}} value={undefined} onChange={this.handleFormkechen}
-													placeholder="请选择...">
-										{knowledgepoints2 && knowledgepoints2.map((object, index) => {
-											return (
-												<Option key={object.id} value={object.id}>{object.name}</Option>
-											)
-										})}
-									</Select>
+								<Select style={{width: '270px'}} value={undefined} onChange={this.handleFormkechen}
+												placeholder="请选择...">
+									{knowledgepoints2 && knowledgepoints2.map((object, index) => {
+										return (
+											<Option key={object.id} value={object.id}>{object.name}</Option>
+										)
+									})}
+								</Select>
 
 
 
@@ -746,7 +764,10 @@ class Itembankstop extends Component {
 
 							</div>
 						)}
-					</Form.Item>
+						</Form.Item>
+
+					}
+
 					{
 						this.state.Knowpoints===undefined||this.state.Knowpoints===null?"":
 							this.state.Knowpoints.length>0?
@@ -788,6 +809,8 @@ class Itembankstop extends Component {
 									<Option value="SINGLE">单选题</Option>
 									<Option value="MULTIPLE">多选题</Option>
 									<Option value="JUDGMENT">判断题</Option>
+									<Option value="COMPLETION">填空题</Option>
+									<Option value="SUBJECTIVE">问答题</Option>
 								</Select>
 						)}
 					</Form.Item>
diff --git a/src/modules/question/component/JudquestionEditor.js b/src/modules/question/component/JudquestionEditor.js
index 0ab6176b..0517c5e8 100644
--- a/src/modules/question/component/JudquestionEditor.js
+++ b/src/modules/question/component/JudquestionEditor.js
@@ -1,21 +1,10 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 
-import {
-	Form, Input, InputNumber, Switch, Radio,
-	Slider, Button, Upload, Icon, Rate, Checkbox, message,
-	Row, Col, Select, Modal, Tooltip
-} from 'antd';
+import { Radio } from 'antd';
 import TPMMDEditor from '../../../modules/tpm/challengesnew/TPMMDEditor';
-import axios from 'axios'
 import update from 'immutability-helper'
 import './../questioncss/questioncom.css';
-import {getUrl, ActionBtn, DMDEditor, ConditionToolTip} from 'educoder';
-import QuillForEditor from '../../../common/quillForEditor';
-
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
+import '../questioncss/font.css';
 
 const tagArray = [
 	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
@@ -24,8 +13,8 @@ const tagArray = [
 ]
 
 //题库的试卷  判断题  组件
-class JudquestionEditor extends Component{
-	constructor(props){
+class JudquestionEditor extends Component {
+	constructor(props) {
 		super(props);
 		/**
 		 choice_id: 32076
@@ -33,7 +22,7 @@ class JudquestionEditor extends Component{
 		 choice_text: "1"
 		 standard_boolean: true
 		 */
-		const {question_choices} = this.props;
+		const { question_choices } = this.props;
 		let _standard_answers = undefined;
 		let _question_choices = undefined;
 		if (question_choices) {
@@ -48,15 +37,17 @@ class JudquestionEditor extends Component{
 		this.state = {
 			question_choices: _question_choices || ['', '', '', ''],
 			standard_answers: _standard_answers || [false, false, false, false],
-			question_title: this.props.question_title!==undefined?JSON.parse(this.props.question_title):"",
+			question_title: this.props.question_title !== undefined ? this.props.question_title : "",
 			question_type: this.props.question_type || 0,
 			question_score: this.props.question_score || this.props.init_question_score,
-			question_titles: this.props.question_titles!==undefined?JSON.parse(this.props.question_titles):"",
-			question_titlesysl:this.props.question_titlesysl||'',
-			question_titleysl:this.props.question_title || '',
-			zqda:null,
-			item_banksedit:[],
-			mychoicess:[],
+			question_titles: this.props.question_titles !== undefined ? this.props.question_titles : "",
+			question_titlesysl: this.props.question_titlesysl || '',
+			question_titleysl: this.props.question_title || '',
+			zqda: null,
+			item_banksedit: [],
+			mychoicess: [],
+			url: '',
+			paramstype: "edit",
 		}
 	}
 	addOption = () => {
@@ -72,29 +63,29 @@ class JudquestionEditor extends Component{
 		this.setState({ question_choices, standard_answers })
 	}
 	deleteOption = (index) => {
-		let {question_choices}=this.state;
+		let { question_choices } = this.state;
 
 		// ////////console.log("deleteOption");
 		// ////////console.log(question_choices);
 
-		if(question_choices[index]===""){
+		if (question_choices[index] === "") {
 			// repeat code
 			this.toMDMode(null)
 			this.setState(
 				(prevState) => ({
-					question_choices : update(prevState.question_choices, {$splice: [[index, 1]]}),
-					standard_answers : update(prevState.standard_answers, {$splice: [[index, 1]]})
+					question_choices: update(prevState.question_choices, { $splice: [[index, 1]] }),
+					standard_answers: update(prevState.standard_answers, { $splice: [[index, 1]] })
 				})
 			)
-		}else{
+		} else {
 			this.props.confirm({
 				content: `确认要删除这个选项吗？`,
 				onOk: () => {
 					this.toMDMode(null)
 					this.setState(
 						(prevState) => ({
-							question_choices : update(prevState.question_choices, {$splice: [[index, 1]]}),
-							standard_answers : update(prevState.standard_answers, {$splice: [[index, 1]]})
+							question_choices: update(prevState.question_choices, { $splice: [[index, 1]] }),
+							standard_answers: update(prevState.standard_answers, { $splice: [[index, 1]] })
 						})
 					)
 				}
@@ -102,17 +93,17 @@ class JudquestionEditor extends Component{
 		}
 	}
 	onSave = () => {
-		var editordata=[];
-		const {question_title, question_score,question_titleysl,question_titlesysl, question_type,question_titles, zqda,question_choices, standard_answers } = this.state;
+		var editordata = [];
+		const { question_title, question_score, question_titleysl, question_titlesysl, question_type, question_titles, zqda, question_choices, standard_answers } = this.state;
 		const { question_id_to_insert_after, question_id } = this.props
 		// TODO check
-		const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
-		if(!question_titleysl) {
+		const answerArray = standard_answers.map((item, index) => { return item == true ? index + 1 : -1 }).filter(item => item != -1);
+		if (!question_titleysl) {
 			this.props.showNotification('请您输入题干');
 			return editordata;
 		}
 
-		if(zqda===null) {
+		if (zqda === null) {
 			this.props.showNotification('请先点击选择本选择题的正确选项');
 			return editordata;
 		}
@@ -134,7 +125,7 @@ class JudquestionEditor extends Component{
     }*/
 
 
-		editordata=[question_titleysl,zqda,question_titlesysl];
+		editordata = [question_titleysl, zqda, question_titlesysl];
 		// question_title,
 		// question_type: answerArray.length > 1 ? 1 : 0,
 		// question_score,
@@ -150,76 +141,86 @@ class JudquestionEditor extends Component{
 
 
 	componentDidMount = () => {
+		this.setState({
+			paramstype: this.props.match.params.type,
+		})
 		try {
 			this.props.getanswerMdRef(this);
-		}catch (e) {
+		} catch (e) {
 
 		}
 		try {
 			this.setState({
-				item_banksedit:this.props.item_banksedit,
-				question_title: this.props.item_banksedit.name!==undefined?JSON.parse(this.props.item_banksedit.name):"",
-				question_titles: this.props.item_banksedit.analysis!==undefined?JSON.parse(this.props.item_banksedit.analysis):"",
-				mychoicess:this.props.item_banksedit.choices,
-				question_titleysl:this.props.item_banksedit.name|| '',
-				question_titlesysl:this.props.item_banksedit.analysis||'',
+				item_banksedit: this.props.item_banksedit,
+				question_title: this.props.item_banksedit.name !== undefined ? this.props.item_banksedit.name : "",
+				question_titles: this.props.item_banksedit.analysis !== undefined ? this.props.item_banksedit.analysis : "",
+				mychoicess: this.props.item_banksedit.choices,
+				question_titleysl: this.props.item_banksedit.name || '',
+				question_titlesysl: this.props.item_banksedit.analysis || '',
 			})
-			if(this.props.item_banksedit){
-				if(this.props.item_banksedit.choices){
-					for(var ik=0;ik<this.props.item_banksedit.choices.length;ik++ ){
-						if( this.props.item_banksedit.choices[ik].choice_text==="正确"){
-							if( this.props.item_banksedit.choices[ik].is_answer===true){
+			if (this.props.item_banksedit) {
+				if (this.props.item_banksedit.choices) {
+					for (var ik = 0; ik < this.props.item_banksedit.choices.length; ik++) {
+						if (this.props.item_banksedit.choices[ik].choice_text === "正确") {
+							if (this.props.item_banksedit.choices[ik].is_answer === true) {
 								this.setState({
-									zqda:"0"
+									zqda: "0"
 								})
 							}
 
-						}else{
-							if( this.props.item_banksedit.choices[ik].is_answer===true){
+						} else {
+							if (this.props.item_banksedit.choices[ik].is_answer === true) {
 								this.setState({
-									zqda:"1"
+									zqda: "1"
 								})
 							}
 						}
 					}
 				}
 			}
-		}catch (e) {
+		} catch (e) {
 
 		}
+		const params = this.props && this.props.match && this.props.match.params;
+		if (JSON.stringify(params) === "{}") {
+			//新增
+			this.setState({
+				zqda: "0"
+			})
+		}
 	}
 
 	componentDidUpdate(prevProps) {
-		 ////console.log("componentDidUpdate");
+		////console.log("componentDidUpdate");
 		////console.log(prevProps);
 		////console.log(this.props.item_banksedit);
 
-		if(prevProps.item_banksedit !== this.props.item_banksedit){
+		if (prevProps.item_banksedit !== this.props.item_banksedit) {
 			this.setState({
-				item_banksedit:this.props.item_banksedit,
-				question_title: this.props.item_banksedit.name!==undefined?JSON.parse(this.props.item_banksedit.name):"",
-				question_titles: this.props.item_banksedit.analysis!==undefined?JSON.parse(this.props.item_banksedit.analysis):"",
-				mychoicess:this.props.item_banksedit.choices,
-				question_titleysl:this.props.item_banksedit.name|| '',
-				question_titlesysl:this.props.item_banksedit.analysis||'',
+				item_banksedit: this.props.item_banksedit,
+				question_title: this.props.item_banksedit.name !== undefined ? this.props.item_banksedit.name : "",
+				question_titles: this.props.item_banksedit.analysis !== undefined ? this.props.item_banksedit.analysis : "",
+				mychoicess: this.props.item_banksedit.choices,
+				question_titleysl: this.props.item_banksedit.name || '',
+				question_titlesysl: this.props.item_banksedit.analysis || '',
 
 			})
-			if(this.props.item_banksedit){
-				if(this.props.item_banksedit.choices){
-					for(var ik=0;ik<this.props.item_banksedit.choices.length;ik++ ){
-						 if( this.props.item_banksedit.choices[ik].choice_text==="正确"){
-						 	if( this.props.item_banksedit.choices[ik].is_answer===true){
-                  this.setState({
-										zqda:"0"
-									})
+			if (this.props.item_banksedit) {
+				if (this.props.item_banksedit.choices) {
+					for (var ik = 0; ik < this.props.item_banksedit.choices.length; ik++) {
+						if (this.props.item_banksedit.choices[ik].choice_text === "正确") {
+							if (this.props.item_banksedit.choices[ik].is_answer === true) {
+								this.setState({
+									zqda: "0"
+								})
 							}
 
-						 }else{
-							 if( this.props.item_banksedit.choices[ik].is_answer===true){
-								 this.setState({
-									 zqda:"1"
-								 })
-							 }
+						} else {
+							if (this.props.item_banksedit.choices[ik].is_answer === true) {
+								this.setState({
+									zqda: "1"
+								})
+							}
 						}
 					}
 				}
@@ -234,10 +235,10 @@ class JudquestionEditor extends Component{
 		// ////////console.log(standard_answers);
 		// ////////console.log(standard_answers[index]);
 		// ////////console.log(!standard_answers[index]);
-		for (var i=0;i<standard_answers.length;i++){
-			if(index===i){
+		for (var i = 0; i < standard_answers.length; i++) {
+			if (index === i) {
 				standard_answers[index] = true;
-			}else{
+			} else {
 				standard_answers[i] = false;
 			}
 
@@ -271,88 +272,53 @@ class JudquestionEditor extends Component{
 	}
 
 
-	handleFormLayoutChange=(e)=>{
-		////////console.log("难度塞选");
-		////////console.log(value);
-	 this.setState({
-		 zqda:e.target.value,
+	handleFormLayoutChange = (e) => {
+		this.setState({
+			zqda: e.target.value,
 
-	 })
+		})
 
 	}
+	isNull = (str) => {
+		if (str == "") return true;
+		var regu = "^[ ]+$";
+		var re = new RegExp(regu);
+		//为空或纯空格为 true    有值为false
+		console.log(re.test(str))
+		return re.test(str);
+
+	}
+	onContentChange = (value) => {
+		this.setState({
+			question_titleysl: value
+		})
+	}
+
+	handleShowUploadImages = (url) => {
+		this.setState({
+			url: url,
+		})
+		try {
+			this.props.handleShowUploadImage(url)
+		} catch (e) {
 
-	onContentChange=(value,quill)=>{
-		const _text = quill.getText();
-		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
-		if (!reg.test(_text)) {
-			// 处理编辑器内容为空
-			this.setState({
-				question_titleysl:""
-			})
-		} else {
-			// 提交到后台的内容需要处理一下;
-			var texts="";
-			if(_text.length>=1001){
-				var result = _text.substring(0,1000);
-				texts={"ops":[{"insert":result}]};
-				texts=JSON.stringify(texts);
-			}else {
-				value =  JSON.stringify(value)
-				texts=value;
-			}
-			this.setState({
-				question_titleysl:texts
-			})
 		}
 	}
-	onContentChanges=(value,quill)=>{
-		const _text = quill.getText();
-		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
-		if (!reg.test(_text)) {
-			// 处理编辑器内容为空
-			this.setState({
-				question_titlesysl:""
-			})
-		} else {
-			// 提交到后台的内容需要处理一下;
-			var texts="";
-			if(_text.length>=1001){
-				var result = _text.substring(0,1000);
-				texts={"ops":[{"insert":result}]};
-				texts=JSON.stringify(texts);
-			}else {
-				value =JSON.stringify(value);
-				texts=value;
-			}
-			this.setState({
-				question_titlesysl:texts
-			})
-		}
+	onContentChanges = (html) => {
+		this.setState({
+			question_titlesysl: html
+		})
 	}
+
+
 	render() {
-		let { question_title, question_score, question_type, question_choices, standard_answers,question_titles} = this.state;
-		let { question_id, index, exerciseIsPublish,
-			// question_title,
-			// question_type,
-			// question_score,
-			isNew } = this.props;
-
-		// const { getFieldDecorator } = this.props.form;
-
-		// const isAdmin = this.props.isAdmin()
-		// const courseId=this.props.match.params.coursesId;
-		// const isEdit = !!this.props.question_id
+		let { paramstype, question_title, question_titleysl, question_score, question_type, question_choices, standard_answers, question_titles, question_titlesysl } = this.state;
 		const qNumber = `question_`;
 		// TODO show模式  isNew为false isEdit为false
-
-		// [true, false, true] -> [0, 2]
-
 		const answerTagArray = standard_answers.map((item, index) => { return item == true ? tagArray[index] : -1 }).filter(item => item != -1);
-		// ////////console.log("xuanzheshijuan");
-		// ////////console.log(answerTagArray);
-		// ////////console.log(!exerciseIsPublish);
-		const params= this.props&&this.props.match&&this.props.match.params;
-		return(
+		const params = this.props && this.props.match && this.props.match.params;
+		const options = ['code-block', 'image', 'formula', 'clean']
+		return (
 			<div className="padding20-30  signleEditor danxuano" id={qNumber}>
 				<style>{`
               .optionMdEditor {
@@ -372,6 +338,16 @@ class JudquestionEditor extends Component{
               #e_tips_mdEditor_question_undefined4{
                display: none;
               }
+               .signleEditor .quill_editor_for_react_area  .ql-toolbar .ql-formats .ql-size {
+              line-height: 20px;
+              }
+               .signleEditor .quill_editor_for_react_area  .ql-toolbar .ql-formats .ql-font {
+              line-height: 20px;
+               min-width: 150px;
+              }
+               .signleEditor .quill_editor_for_react_area  .ql-container .ql-editor p{
+                  font-family: MicrosoftYaHei;
+              }
             `}</style>
 				<p className="mb10 clearfix">
 					{/* {!question_id ? '新建' : '编辑'} */}
@@ -379,19 +355,14 @@ class JudquestionEditor extends Component{
 					<span className="xingtigan  fl">题干：</span>
 				</p>
 
-				<QuillForEditor
-					autoFocus={true}
-					imgAttrs={{width: '146px', height: '136px'}}
-					style={{ height: '155px'}}
+				<TPMMDEditor
+					initValue={question_titleysl}
+					mdID='jud-question-title'
+					onChange={this.onContentChange}
+					height={155}
 					placeholder="请您输入题干"
-					options={['code-block', 'image', 'formula']}
-					value={question_title}
-					onContentChange={this.onContentChange}
-
 				/>
-
 				<div className="mb10 sortinxdirection">
-					{/* {!question_id ? '新建' : '编辑'} */}
 					<span className="xingcolor font-16 fl mr4">*</span>
 					<span className="xingtigans  fl"><span className="xingtigan">答案选项：</span>点击选项可设置正确答案</span>
 				</div>
@@ -410,11 +381,11 @@ class JudquestionEditor extends Component{
 					}
 				</style>
 				<div className="mb15 sortinxdirection ">
-						<Radio.Group buttonStyle="solid"  value={this.state.zqda} onChange={this.handleFormLayoutChange}>
-							<Radio.Button value="0" className={"choice_textcsss"}>正确</Radio.Button>
-							<Radio.Button value="1" className={"choice_textcss"}>错误</Radio.Button>
+					<Radio.Group buttonStyle="solid" value={this.state.zqda} onChange={this.handleFormLayoutChange}>
+						<Radio.Button value="0" className={"choice_textcsss"}>正确</Radio.Button>
+						<Radio.Button value="1" className={"choice_textcss"}>错误</Radio.Button>
 
-						</Radio.Group>
+					</Radio.Group>
 
 				</div>
 
@@ -423,23 +394,19 @@ class JudquestionEditor extends Component{
 
 
 					<div className="mt10">
-					<p className="mb10 clearfix">
-						{/* {!question_id ? '新建' : '编辑'} */}
-						<span className="xingcolor font-16 fl mr4"></span>
-						<span className="xingtigan  fl">题目解析：</span>
-					</p>
+						<p className="mb10 clearfix">
+							<span className="xingcolor font-16 fl mr4"></span>
+							<span className="xingtigan  fl">题目解析：</span>
+						</p>
 
-					<QuillForEditor
-						autoFocus={false}
-						imgAttrs={{width: '146px', height: '136px'}}
-						style={{height: '166px' }}
-						placeholder="请您输入题目解析"
-						options={['code-block', 'image', 'formula']}
-						value={question_titles}
-						onContentChange={this.onContentChanges}
-					/>
-
-				</div>
+						<TPMMDEditor
+							initValue={question_titlesysl}
+							height={166}
+							mdID='jud-question-titles'
+							onChange={this.onContentChanges}
+							placeholder="请您输入题目解析"
+						/>
+					</div>
 				</div>
 
 			</div>
diff --git a/src/modules/question/component/Listjihe.js b/src/modules/question/component/Listjihe.js
index 92a5a9e3..f4b74057 100644
--- a/src/modules/question/component/Listjihe.js
+++ b/src/modules/question/component/Listjihe.js
@@ -1,17 +1,13 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl, markdownToHTML} from 'educoder';
+import React, { Component } from "react";
 import axios from 'axios';
 import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
 	Radio,
-	Tooltip
+	Tooltip,
 } from "antd";
 import './../questioncss/questioncom.css';
-import QuillForEditor from "../../../common/quillForEditor";
+import Certifiedprofessional from "../../modals/Certifiedprofessional";
+import './list-jihe.scss'
+import RenderHtml from "../../../components/render-html";
 
 const tagArray = [
 	'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．',
@@ -23,7 +19,30 @@ const tagArrays = [
 	'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
 	'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
+const questionType = [
+	{
+		type: 'SINGLE',
+		color: 'typeGreen',
+		name: '单选题'
+	},
+	{
+		type: 'MULTIPLE',
+		color: 'typeBlue',
+		name: '多选题'
+	},
+	{
+		type: 'JUDGMENT',
+		color: 'typeRed',
+		name: '判断题'
+	},
+	{
+		type: 'PROGRAM',
+		color: 'typeYellow',
+		name: '编程题'
+	}
+]
 
+//Paperreview_single.js Paperlibraryseeid_items.js
 class Listjihe extends Component {
 	constructor(props) {
 		super(props);
@@ -31,17 +50,60 @@ class Listjihe extends Component {
 			page: 1,
 			name: "单选题",
 			nd: "简单",
+			url: "",
+			mydisplay: false,
+			occupation: 2,
+			isysladmins: false,
 		}
 	}
 
 	//初始化
 	componentDidMount() {
-
+		let isysladmins = false;
+		if (this.props) {
+			if (this.props.current_user) {
+				if (this.props.current_user.admin) {
+					isysladmins = true;
+				} else if (this.props.current_user.business) {
+					isysladmins = true;
+				}
+			}
+		}
+		this.setState({
+			isysladmins: isysladmins
+		})
 
 	}
 
+	handleShowUploadImage = (url) => {
+		try {
+			this.props.handleShowUploadImage(url);
+		} catch (e) {
+
+		}
+
+	}
+	handleClose = () => {
+		try {
+			this.props.handleClose();
+		} catch (e) {
+
+		}
+	}
 	//选用
 	Selectingpracticaltraining = (id) => {
+		try {
+			if (this.props.Datacountbool) {
+				if (this.props.Datacount === 100) {
+					this.props.showNotification(`已选100个试题（不能在选用更多试题）`);
+					return;
+				}
+			}
+		} catch (e) {
+
+		}
+
+
 		let data = {}
 		if (this.props.exam_id === undefined) {
 			data = {
@@ -53,8 +115,11 @@ class Listjihe extends Component {
 				exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 			}
 		}
-
+		this.getitem_baskets(data);
+	}
+	getitem_baskets = (data) => {
 		this.props.getitem_baskets(data);
+
 	}
 	//撤销
 	Selectingpracticaltrainings = (id) => {
@@ -63,9 +128,43 @@ class Listjihe extends Component {
 	}
 
 
+	seturls(url) {
+		let newOpenWindow = window.open('about:blank');  // 在ajax外部先打开空白新窗口
+		newOpenWindow.location = url;
+	}
+
+	seturlsbc(id) {
+		let url = `/problems/${id}/start.json`;
+		axios.get(url, {}).then((response) => {
+			if (response) {
+				if (response.data.status === 0) {
+					let newOpenWindow = window.open('about:blank');  // 在ajax外部先打开空白新窗口
+					let identifiers = response.data.identifier;
+					newOpenWindow.location = `/myproblems/${identifiers}`;
+				} else {
+					this.props.showNotification(response.data.message);
+				}
+			}
+		});
+	}
+
+	HideAddcoursestypess = (i) => {
+		console.log("调用了");
+		this.setState({
+			mydisplay: true,
+			occupation: i,
+		})
+	}
+
+	mydisplayHidedel = () => {
+		this.setState({
+			mydisplay: false,
+		})
+	}
+
 	render() {
-		let {page, name, nd} = this.state;
-		let {defaultActiveKey, items, listjihe, chakanjiexiboolindex, keindex} = this.props;
+		let { mydisplay } = this.state;
+		let { defaultActiveKey, items, listjihe, chakanjiexiboolindex, keindex } = this.props;
 
 		// 编程答案
 		var rightkey = null
@@ -76,7 +175,7 @@ class Listjihe extends Component {
 
 				} else {
 					if (items.item_type === "JUDGMENT") {
-             //多选题
+						//多选题
 						if (items.choices) {
 							if (items.choices.length > 0) {
 								var arr = items.choices;
@@ -90,17 +189,17 @@ class Listjihe extends Component {
 						}
 					} else {
 						// 单选题和判断题
-						if(items.item_type === "MULTIPLE"){
+						if (items.item_type === "MULTIPLE") {
 							if (items.choices) {
 								if (items.choices.length > 0) {
 									var arr = items.choices;
 									for (var i = 0; i < arr.length; i++) {
 										if (arr[i].is_answer === true) {
-											if(MULTIPLEkey===null){
+											if (MULTIPLEkey === null) {
 												MULTIPLEkey = tagArrays[i];
 
-											}else{
-												MULTIPLEkey =MULTIPLEkey+ tagArrays[i];
+											} else {
+												MULTIPLEkey = MULTIPLEkey + tagArrays[i];
 											}
 
 										}
@@ -108,7 +207,7 @@ class Listjihe extends Component {
 								}
 							}
 
-						}else{
+						} else {
 							if (items.choices) {
 								if (items.choices.length > 0) {
 									var arr = items.choices;
@@ -126,89 +225,279 @@ class Listjihe extends Component {
 			}
 
 		}
-		var itemssname="";
-		try {
-			itemssname= JSON.parse(items.name);
-		}catch (e) {
+		var itemssname = items.name + "";
+
+		var itemsnamesy = items && items.program_attr && items.program_attr.description + "";
+		var analysisnames = items && items.analysis + "";
+
+		const types = questionType.filter(item => item.type === items.item_type);
+		let rightkeyy = tagArrays[rightkey] ? tagArrays[rightkey] : "无";
+		let MULTIPLEkeys = MULTIPLEkey ? MULTIPLEkey : "无";
+		let rightkeys = rightkey ? rightkey : "无";
+		let Periofters = false;
+		if (this.props) {
+			if (this.props.current_user) {
+				if (this.props.current_user.admin) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.business) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.is_shixun_marker) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.is_teacher) {
+					Periofters = true;
+				} else if (this.props.current_user.user_identity !== "学生") {
+					Periofters = true;
+				}
+			}
 		}
-		if(itemssname===undefined){
-			itemssname=items.name
-		}
-
-
-		var itemsnamesy="";
-		try {
-			itemsnamesy= JSON.parse(items&&items.program_attr&&items.program_attr.description);
-
-		}catch (e) {
-			itemsnamesy=items&&items.program_attr&&items.program_attr.description;
-		}
-
-		var analysisnames="";
-		try {
-			analysisnames= JSON.parse(items&&items.analysis);
-
-		}catch (e) {
-			analysisnames=items&&items.analysis;
-		}
-
 		return (
 			<div key={keindex}
-					 className={chakanjiexiboolindex === keindex ? "w100s borderwds283  pd20 mb20 listjihecolors" : "w100s borderwds  pd20 mb20 listjihecolors"}>
-				{/*顶部*/}
-				<style>
-					{
-						`	.markdown-body .ql-editor{
-								padding-left: 0px !important;
-								padding-top: 0px !important;
+				className={chakanjiexiboolindex === keindex ? "w100s borderwds283 pd20 mb20 listjihecolors" : "borderwds pd20 mb20 listjihecolors"}>
+				{
+					mydisplay === true ?
+						<Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.mydisplayHidedel} />
+						: null
+				}
+				{
+					mydisplay === true ?
+						<style>
+							{` body{ overflow:hidden!important; } `}
+						</style>
+						: null
+				}
+				<div className="w100s sortinxdirection plpr pb5">
+					<div className="w50s listjihetixingstit sortinxdirection ">
+
+						<span className={`typeBlue lh26s  xiaoshout`}>{types[0] && types[0].name}</span>
+						{defaultActiveKey === 0 || defaultActiveKey === "0" ?
+							(
+								items.public === false ?
+									items.item_type === "PROGRAM" ?
+										(
+											items.program_attr.status === 0 ?
+												""
+												:
+												items.apply === false ?
+													<span className={`  typeRed typesBtn`}>私有</span>
+													:
+													(
+														items.public == true ?
+															<span className={`typeGreen typesBtn`}>已公开</span>
+															:
+															""
+													)
+										)
+										: items.apply === false ?
+											<span className={` typeRed typesBtn`}>私有</span>
+											:
+											""
+									:
+									<span className={`typeGreen typesBtn`}>已公开</span>
+
+
+							) : ""
 						}
-						
-						.programquill .ql-editor{
-								padding-left: 0px !important;
-								padding-top: 0px !important;
-						}
-						
-						
-						`
-					}
-				</style>
-				<div className="w100s sortinxdirection">
-					<div className="listjihetixingstitsy">
-						{
-							this.props.listjihe
-						}.
 					</div>
+					<div className="w50s xaxisreverseorder">
+						{
+							defaultActiveKey === 0 || defaultActiveKey === "0" ?
+								<div className="xaxisreverseorder">
+									<p className="viewparsings  xiaoshou" onClick={() => this.props.showmodelysl(items.id)}>
+										<i className="iconfont icon-shanchu1 font-17 lg ml7 lh26 icontianjiadaohangcolors mr5"></i>
+										<span>删除</span>
+									</p>
+									{
+										items.item_type === "PROGRAM" ?
+											this.props.Isitapopup && this.props.Isitapopup === "true" ?
+												""
+												:
+												<a target="_blank" href={`/problems/${items.program_attr.identifier}/edit`}>
+													<p className="viewparsings  xiaoshou mr25">
+														<i className="iconfont icon-bianji2 font-17 lg ml7 lh26 icontianjiadaohangcolors mr5"></i>
+														<span>编辑</span>
+													</p>
+												</a>
+											:
+											this.props.Isitapopup && this.props.Isitapopup === "true" ?
+												""
+												:
+												<a target="_blank" href={`/problemset/edit/${items.id}`}>
+													<p className="viewparsings  xiaoshou mr25">
+														<i className="iconfont icon-bianji2 font-17 lg ml7 lh26 icontianjiadaohangcolors mr5"></i>
+														<span>编辑</span>
+													</p>
+												</a>
+									}
+									{
+										items.public === false ?
+											items.item_type === "PROGRAM" ?
+												(
+													items.program_attr.status === 0 ?
+														""
+														:
+														items.apply === false ?
+															<p className="viewparsings  xiaoshou mr25"
+																onClick={() => this.props.showmodels(items.id)}>
+																<i
+																	className="iconfont icon-gongkai font-17 lg ml7 lh26 icontianjiadaohangcolors mr5"></i>
+																<span>设为公开</span>
+															</p>
+															:
+															(
+																items.public == true ?
+																	<p className="viewparsings  xiaoshou mr25"
+																		onClick={() => this.props.setasprivates(items.id)}
+																	>
+																		<i
+																			className="iconfont icon-dianjiliang font-13 lg ml7 lh26 icontianjiadaohangcolors mr5"></i>
+																		<span>设为私有</span>
+																	</p>
+																	:
+																	<p className="viewparsings  xiaoshou mr25"
+																		onClick={(e) => this.props.showmodelsInaudit(e)}>
+																		<i
+																			className="iconfont icon-gongkai font-17 lg ml7 lh26 icontianjiadaohangcolors mr5"></i>
+																		<span>公开审核中</span>
+																	</p>
+															)
+												)
+												: items.apply === false ?
+													<p className="viewparsings  xiaoshou mr25" onClick={() => this.props.showmodels(items.id)}>
+														<i className="iconfont icon-gongkai font-17 lg ml7 lh26 icontianjiadaohangcolors mr5"></i>
+														<span>设为公开</span>
+													</p>
+													:
+													(
+														items.public == true ?
+															""
+															:
+															<p className="viewparsings  xiaoshou mr25" onClick={(e) => this.props.showmodelsInaudit(e)}>
+																<i className="iconfont icon-gongkai font-17 lg ml7 lh26 icontianjiadaohangcolors mr5"></i>
+																<span>公开审核中</span>
+															</p>
+													)
+											:
+											<p className="viewparsings xiaoshou mr25" onClick={() => this.props.setasprivates(items.id)}>
+												<i className="iconfont icon-dianjiliang font-13 lg ml7 lh26 icontianjiadaohangcolors mr5"></i>
+												<span>设为私有</span>
+											</p>
+									}
+
+								</div>
+								:
+								//公开
+								<div className="xaxisreverseorder">
+									{
+										items.edit_role === true ?
+											<p className="viewparsings  xiaoshou" onClick={() => this.props.showmodelysl(items.id)}>
+												<i className="iconfont icon-shanchu1 font-17 lg ml7 lh26 icontianjiadaohangcolors mr5"></i>
+												<span>删除</span>
+											</p>
+											: ""
+									}
+
+									{
+										items.item_type === "PROGRAM" ?
+											this.props.Isitapopup && this.props.Isitapopup === "true" ?
+												""
+												:
+												(
+													items.edit_role === true ?
+														<a target="_blank" href={`/problems/${items.program_attr.identifier}/edit`}>
+															<p className="viewparsings  xiaoshou mr25">
+																<i className="iconfont icon-bianji2 font-17 lg ml7 lh26 icontianjiadaohangcolors mr5"></i>
+																<span>编辑</span>
+															</p>
+														</a>
+														: ""
+												)
+											:
+											this.props.Isitapopup && this.props.Isitapopup === "true" ?
+												""
+												:
+												(
+													items.edit_role === true ?
+														<a target="_blank" href={`/problemset/edit/${items.id}`}>
+															<p className="viewparsings  xiaoshou mr25">
+																<i className="iconfont icon-bianji2 font-17 lg ml7 lh26 icontianjiadaohangcolors mr5"></i>
+																<span>编辑</span>
+															</p>
+														</a>
+														: ""
+												)
+									}
+								</div>
+						}
+						{
+							items.item_type === "PROGRAM" ?
+								""
+								:
+
+								(
+									items.edit_role === true && items.check_answer_role === true ?
+										<p className="viewparsings xiaoshou  mr25" onClick={() => this.props.chakanjiexibool(keindex)}>
+											<i className="iconfont icon-jiexi font-17 lg ml7 lh26 icontianjiadaohangcolors mr5"></i>
+											查看解析</p>
+										: items.check_answer_role === true ?
+											<p className="viewparsings xiaoshou " onClick={() => this.props.chakanjiexibool(keindex)}>
+												<i className="iconfont icon-jiexi font-17 lg ml7 lh26 icontianjiadaohangcolors mr5"></i>
+											查看解析</p>
+											: ""
+								)
+
+						}
+
+					</div>
+
+				</div>
+				{/*//题干标题*/}
+				<div className="w100s sortinxdirection plpr">
+					<div className="listjihetixingstitsmy  xiaoshout" style={{
+						fontWeight: "bold"
+					}}>
+						{this.props.listjihe}
+					</div>
+
 					{
-						items.item_type==="PROGRAM"?
-							<a href={`/problems/${items.program_attr.identifier}/edit`}>
-							<div className="ml10 w100s  "  style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}></div>
-							</a>
-						:
-							<div className="ml10 w100s  markdown-body" style={{wordBreak: "break-word"}}>
-								{	items===undefined||items===null||items===""?"":
+						items.item_type === "PROGRAM" ?
+							(
+								this.props.defaultActiveKeys && this.props.defaultActiveKeys === "0" ?
+									<a onClick={() => this.seturls(`/problems/${items.program_attr.identifier}/edit`)} >
+										<RenderHtml className="marpres marpresys titequestion" value={itemssname} />
+									</a>
+									:
+									<a onClick={() => this.seturlsbc(items.program_attr.identifier)}>
+										<RenderHtml className="marpres marpresys titequestion" value={itemssname} />
+									</a>
+							)
+
+							:
+							<div>
+								{items === undefined || items === null || items === "" ? "" :
 									items.name === undefined || items.name === null || items.name === "" ?
 										""
 										:
-										items.name.length>0?
-											<QuillForEditor
-												readOnly={true}
-												value={itemssname}
-											/>
-											:""
+										items.name.length > 0 ?
+											itemssname === null || itemssname === undefined ? "" :
+												<RenderHtml className="marpres marpresys titequestion" value={itemssname} />
+											: ""
 								}
 							</div>
 					}
 
 				</div>
 				{/*内容*/}
-				<div className="w100s sortinxdirection ">
+				<div className="w100s sortinxdirection plpr">
 					{items.item_type === "JUDGMENT" ?
 						<p className="w100s listjihetixingstitsp sortinxdirection ">
 							{
 								items === undefined || items === null ? "" : items.choices.map((object, index) => {
 									return (
 										<p className={index === 1 ? "sortinxdirection  ml10" : "sortinxdirection  "}>
-											<Radio disabled={true} >
+											<Radio disabled={true}>
 												{object.choice_text}
 											</Radio>
 										</p>
@@ -217,186 +506,106 @@ class Listjihe extends Component {
 							}
 						</p> :
 						items.item_type === "PROGRAM" ?
-							<p className="w100s listjihetixingstitssy sortinxdirection ">
-								<p className={"sortinxdirection  mt15"}>
-									{
-										items&&items.program_attr&&items.program_attr.description?
-											<p className="programquill" style={{wordBreak: "break-word"}}
-											>
-												<QuillForEditor
-													readOnly={true}
-													value={itemsnamesy}
-												/>
-
-											</p>
-											:""
-									}
-
-
-
-								</p>
-							</p>
+							<div className="w100s listjihetixingstitssy sortinxdirection ">
+								{itemsnamesy === null || itemsnamesy === undefined ? null : <RenderHtml value={itemsnamesy} className="marpres" />}
+							</div>
 							:
-							<p className="w100s listjihetixingstitsp verticallayout ">
+							<div className="w100s listjihetixingstitsppy verticallayout ">
 								{
 									items === undefined || items === null ? "" : items.choices.map((object, index) => {
-										var string=""
-										try {
-											string=JSON.parse(object.choice_text);
-										}catch (e) {
-											string=object.choice_text;
-										}
+										var string = ""
+										string = object.choice_text;
 										return (
-											<p className={index === 0 ? "sortinxdirection " : "sortinxdirection  mt15 "}>
-												<p className="lh20s">{tagArray[index]}</p>
-												<p className="programquill" style={{wordBreak: "break-word"}}>
-													{object ?
-														object.choice_text === undefined || object.choice_text=== null || object.choice_text === "" ?
-
-															""
-															:
-															object.choice_text.length>0?
-																<QuillForEditor
-																	readOnly={true}
-																	value={string}
-																/>
-																:""
-
-
+											<div className={index === 0 ? "sortinxdirection " : "sortinxdirection "}>
+												<p className="">{tagArray[index]}</p>
+												{object ?
+													object.choice_text === undefined || object.choice_text === null || object.choice_text === "" ?
+														null
 														:
-														""
-													}
-												</p>
-											</p>
+														object.choice_text.length > 0 ? <RenderHtml className="marpres optionquestion" value={string} /> : null
+													:
+													null
+												}
+											</div>
 										)
 									})
 								}
-							</p>
+							</div>
 					}
 				</div>
 
-
-				<div className="w100s sortinxdirection mt10">
+				<div className="w100s sortinxdirection mt10 plpr">
 					<p
 						className="listjihetixing">难度：<span>{items.difficulty === 1 ? "简单" : items.difficulty === 2 ? "适中" : items.difficulty === 3 ? "困难" : ""}</span>
 					</p>
-					<p
-						className="ml30 listjihetixing">题型：<span>{items.item_type === "SINGLE" ? "单选题" : items.item_type === "MULTIPLE" ? "多选题" : items.item_type === "JUDGMENT" ? "判断题" : items.item_type === "PROGRAM" ? "编程题" : ""}</span>
-					</p>
 				</div>
 				{/*更新时间*/}
-				<div className="w100s sortinxdirection">
+				<div className="w100s sortinxdirection plpr">
 					<div className="w50s listjihetixingstit sortinxdirection">
 						<p className="updatetimes lh30">更新时间：{items.update_time}</p>
-						{
-							this.props.defaultActiveKey === "0" || this.props.defaultActiveKey === 0 ?
-								""
-								:
-								<p className="updatetimes lh30 ml45">创建者：{items.author.name}</p>
-						}
 						{
 							items.item_type === "PROGRAM" ?
-								<p className="updatetimes lh30 ml45">编程语言：{items.program_attr.language}</p>
-								: ""
-						}
-						{
-							items.item_type === "PROGRAM" ?
-								items.program_attr.status === 0 ?
-									<p className="updatetimes lh30 ml45 nofabu mt5">未发布</p>
-									: ""
+								<p className="updatetimes lh30 ml25 tknamelengs">编程语言：{items.program_attr.language}</p>
 								: ""
 						}
+						{items.item_type === "PROGRAM" ? items.program_attr.status === 0 ? <p className="updatetimes  ml25 nofabu mt5">未发布</p> : "" : ""}
 					</div>
 					<div className="w50s xaxisreverseorder">
 						{
 							items.choosed === true ?
-								<p className="selectionss  xiaoshou" onClick={() => this.Selectingpracticaltrainings(items.id)}>
-									<i className="iconfont icon-jianhao font-12 lg ml7 lh30 icontianjiadaohangcolor mr5"></i>
-									<span className="mr15 lh30">撤销</span></p>
+								<p className="selectionssradiu  xiaoshou" onClick={() => this.Selectingpracticaltrainings(items.id)}>
+									{/*<i className="iconfont icon-jianhao font-12 lg ml7 lh30 icontianjiadaohangcolor mr5"></i>*/}
+									<span className=" lh30">撤销</span></p>
 								:
 								items.item_type === "PROGRAM" ?
 									items.program_attr.status === 0 ?
 										<Tooltip placement="top" title={"编程题未发布，不能选用！"}>
-											<p className="selectionys  jinzhixiaoshou">
-												<i className="iconfont icon-tianjiadaohang font-12 lg ml7 lh30 icontianjiadaohangcolor mr5"></i>
-												<span className="mr15 lh30">选用</span>
-											</p>
+											{
+												Periofters === false ? "" :
+													<p className="selectionys  jinzhixiaoshou">
+														<i
+															className="iconfont icon-tianjiadaohang font-12  ml7 lh17 icontianjiadaohangcolor mr5 lh20ss"></i>
+														<span className="mr15 lh16 lh20ss">选用</span>
+													</p>
+											}
+
 										</Tooltip>
 
 										:
-										<p className="selection  xiaoshou" onClick={() => this.Selectingpracticaltraining(items.id)}>
-											<i className="iconfont icon-tianjiadaohang font-12 lg ml7 lh30 icontianjiadaohangcolor mr5"></i>
-											<span className="mr15 lh30">选用</span>
-										</p>
-									:
-									<p className="selection  xiaoshou" onClick={() => this.Selectingpracticaltraining(items.id)}>
-										<i className="iconfont icon-tianjiadaohang font-12 lg ml7 lh30 icontianjiadaohangcolor mr5"></i>
-										<span className="mr15 lh30">选用</span>
-									</p>
-						}
-						{
-							defaultActiveKey === 0 || defaultActiveKey === "0" ?
-								<div className="xaxisreverseorder">
-									<p className="viewparsings  xiaoshou mr25" onClick={() => this.props.showmodelysl(items.id)}>
-										<i className="iconfont icon-shanchu1 font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
-										<span>删除</span>
-									</p>
-									{
-										items.item_type === "PROGRAM" ?
-											this.props.Isitapopup&&this.props.Isitapopup==="true"?
-												""
-												:
-											<a href={`/problems/${items.program_attr.identifier}/edit`}>
-												<p className="viewparsings  xiaoshou mr25">
-													<i className="iconfont icon-bianji2 font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
-													<span>编辑</span>
+										(
+											Periofters === false ? "" :
+												<p className="selection  xiaoshou" onClick={() => this.Selectingpracticaltraining(items.id)}>
+													<i
+														className="iconfont icon-tianjiadaohang font-12  ml7 lh17 icontianjiadaohangcolor mr5 lh20ss"></i>
+													<span className="mr15 lh16 lh20ss">选用</span>
 												</p>
-											</a>
-											:
-												this.props.Isitapopup&&this.props.Isitapopup==="true"?
-													""
-													:
-											<a href={`/question/edit/${items.id}`}>
-												<p className="viewparsings  xiaoshou mr25">
-													<i className="iconfont icon-bianji2 font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
-													<span>编辑</span>
-												</p>
-											</a>
-									}
-									{
-										items.public === false ?
-											items.item_type === "PROGRAM" ?
-												items.program_attr.status === 0 ?
-													""
-													:
-													items.apply===false?
-													<p className="viewparsings  xiaoshou mr25" onClick={() => this.props.showmodels(items.id)}>
-														<i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
-														<span>公开</span>
-													</p>
-														:
-														""
-												:items.apply===false?
-												<p className="viewparsings  xiaoshou mr25" onClick={() => this.props.showmodels(items.id)}>
-													<i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
-													<span>公开</span>
-												</p>
-												:
-												""
-											:
-											""
-									}
+										)
+
+									:
+									(
+										Periofters === false ? "" :
+											<p className="selection  xiaoshou" onClick={() => this.Selectingpracticaltraining(items.id)}>
+												<i
+													className="iconfont icon-tianjiadaohang font-12  ml7 lh17 icontianjiadaohangcolor mr5 lh20ss"></i>
+												<span className="mr15 lh16 lh20ss">选用</span>
+											</p>
+									)
 
-								</div>
-								: ""
 						}
+
 						{
 							items.item_type === "PROGRAM" ?
-								""
-								:
-								<p className="viewparsings  xiaoshou mr25" onClick={() => this.props.chakanjiexibool(keindex)}>
-									<i className="iconfont icon-jiexi font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
-									查看解析</p>
+								(
+									Periofters === false ?
+										<p className="selection typeBlues xiaoshou" onClick={() => this.seturlsbc(items.program_attr.identifier)}>
+											<span className=" lh16 lh20ss">开始体验</span>
+										</p>
+										:
+										<p className="selection typeBlues xiaoshou mr35" onClick={() => this.seturlsbc(items.program_attr.identifier)}>
+											<span className=" lh16 lh20ss">开始体验</span>
+										</p>
+								)
+								: ""
 						}
 
 
@@ -405,50 +614,43 @@ class Listjihe extends Component {
 				{
 					chakanjiexiboolindex === keindex ? <div>
 						<div className="w100s questiontypeheng mt23">
-
 						</div>
 						<div className=" sortinxdirection mt15 yldxtit">
-
 							{
-								items.item_type === "SINGLE"  ?
-									<p className=" testfondex yldxtit"
-										 style={{wordBreak: "break-word"}}
-										 dangerouslySetInnerHTML={{__html: markdownToHTML("答案：" + tagArrays[rightkey]).replace(/▁/g, "▁▁▁")}}
-									>
-									</p>
-									: items.item_type === "MULTIPLE"?
-									<p className=" testfondex yldxtit"
-										 style={{wordBreak: "break-word"}}
-										 dangerouslySetInnerHTML={{__html: markdownToHTML("答案：" + MULTIPLEkey).replace(/▁/g, "▁▁▁")}}
-									>
-
-									</p>
-									:
-									<p className=" testfondex yldxtit"
-										 style={{wordBreak: "break-word"}}
-										 dangerouslySetInnerHTML={{__html: markdownToHTML("答案：" + rightkey).replace(/▁/g, "▁▁▁")}}
-									>
-									</p>
+								items.item_type === "SINGLE" ?
+									<RenderHtml className=" testfondex yldxtit" value={"答案：" + rightkeyy} />
+									: items.item_type === "MULTIPLE" ? <RenderHtml className=" testfondex yldxtit" value={"答案：" + MULTIPLEkeys} />
+										:
+										<RenderHtml className=" testfondex yldxtit" value={"答案：" + rightkeys} />
 							}
 
 						</div>
-						<div className=" sortinxdirection mt15 yldxtit">
-							<p className=" testfondex yldxtit programquill"
-								 style={{wordBreak: "break-word"}}
+						<div className=" sortinxdirection mt5 yldxtit">
+							<p className=" testfondex yldxtit "
+								style={{ wordBreak: "break-word" }}
+							>
+								解析：
+							</p>
+							<p id={"analysisnamesid"} className="wt930px testfondex yldxtit programquill"
+								style={{ wordBreak: "break-word" }}
 							>
 								{items ?
-									items.analysis=== undefined || items.analysis=== null || items.analysis === "" ?
-
-										""
+									items.analysis === undefined || items.analysis === null || items.analysis === "" ?
+										<p className=" testfondex yldxtit "
+											style={{ wordBreak: "break-word" }}
+										>
+											暂无解析
+										</p>
 										:
-										items.analysis.length>0?
-											<QuillForEditor
-												imgAttrs={{width: '60px', height: '30px'}}
-												readOnly={true}
-												value={analysisnames}
-											/>
+										items.analysis.length > 0 ?
+											analysisnames === null || analysisnames === undefined ? "" :
+												<RenderHtml className="marpres optionquestion" value={analysisnames} />
 											:
-									""
+											<p className=" testfondex yldxtit "
+												style={{ wordBreak: "break-word" }}
+											>
+												暂无解析
+											</p>
 									:
 									""
 								}
diff --git a/src/modules/question/component/Newknledpots.js b/src/modules/question/component/Newknledpots.js
index 36dd88e1..6149835b 100644
--- a/src/modules/question/component/Newknledpots.js
+++ b/src/modules/question/component/Newknledpots.js
@@ -9,10 +9,21 @@ class PaperDeletModel extends Component {
 	constructor(props) {
 		super(props);
 		this.state={
-			newkntypeinput:""
+			newkntypeinput:"",
+			errores:false,
+			errorestit:'',
+			addonAfteronelens3:0,
 		}
 	}
+	isNull=( str )=>{
+		if ( str == "" ) return true;
+		var regu = "^[ ]+$";
+		var re = new RegExp(regu);
+		//为空或纯空格为 true    有值为false
+		console.log(re.test(str))
+		return re.test(str);
 
+	}
 	handleChange=(e)=>{
 
 		// this.setState({
@@ -20,12 +31,17 @@ class PaperDeletModel extends Component {
 		// 			})
 		// //console.log(e.target.value);
 		// //console.log(e.target.value.length);
+
 						this.setState({
-							newkntypeinput:	e.target.value
+							newkntypeinput:	e.target.value,
+							addonAfteronelens3:e.target.value.length,
+							errorestit:'',
+							errores:false,
+							boolred:false,
 						})
 		 this.props.setboolred(false);
 		//
-		// debugger
+		
 		// //console.log(e);
 		//
 		// if(e.target.value.length>0){
@@ -36,7 +52,8 @@ class PaperDeletModel extends Component {
 		// 		})
 		// 	}
 		// }
-	}
+	};
+
 	mysinputOnBlur=(e)=>{
 		//console.log("失去焦点了");
 	}
@@ -45,8 +62,28 @@ class PaperDeletModel extends Component {
 		//console.log("获取焦点");
 	}
 
-	render() {
+	NewknTypedeltyoedels=()=>{
 
+		if(this.state.newkntypeinput.length===0){
+			this.setState({
+				errorestit:'请输入知识点',
+				errores:true,
+				boolred:true,
+			})
+			return
+		}
+		if(this.isNull(this.state.newkntypeinput)===true){
+			this.setState({
+				errorestit:'不能输入空格',
+				errores:true,
+				boolred:true,
+			})
+			return
+		}
+		this.props.NewknTypedeltyoedel(this.state.newkntypeinput)
+	}
+	render() {
+    let{errores,errorestit,addonAfteronelens3}=this.state;
 		return(
 			<Modal
 				keyboard={false}
@@ -59,12 +96,32 @@ class PaperDeletModel extends Component {
 				width="442px"
 			>
 				<div className="educouddiv">
-					<div className={this.props.boolred===true?"tabeltext-alignleft mt10 inpustred":"tabeltext-alignleft mt10"}>
-						<Input onInput={this.handleChange}  maxLength={16} onBlur={this.mysinputOnBlur } onFocus={this.inputOnFocus }/>
+					<style>
+						{
+							`
+							.eduinpus .ant-input{
+							  width: 310px !important;
+							   border-right: 0px solid #FFFFff !important;
+							}
+							
+							 body{
+            width: 100%!important;
+          }
+							
+							`
+						}
+					</style>
+					<div className={this.props.boolred===true?"tabeltext-alignleft mt10 inpustred inpustredysl eduinpus":errores===true?"tabeltext-alignleft mt10 inpustred inpustredysl eduinpus":"tabeltext-alignleft mt10  eduinpus"}>
+						<Input className={"eduinpus"} onInput={this.handleChange}  maxLength={15} onBlur={this.mysinputOnBlur } addonAfter={String(addonAfteronelens3)+"/15"} onFocus={this.inputOnFocus }/>
 					</div>
-					<div className="clearfix mt30 edu-txt-center">
+					{
+						errores===true?
+							<p className={"xingcolor"}>{errorestit}</p>
+							:""
+					}
+					<div className={errores===true?"clearfix mt10 edu-txt-center":"clearfix mt30 edu-txt-center"}>
 						<a className="task-btn mr30 w80" onClick={()=>this.props.NewknTypedeldel(false)}>取消</a>
-						<a className="task-btn task-btn-orange w80" onClick={()=>this.props.NewknTypedeltyoedel(this.state.newkntypeinput)}>确定</a>
+						<a className="task-btn task-btn-orange w80" onClick={	()=>this.NewknTypedeltyoedels()}>确定</a>
 					</div>
 				</div>
 			</Modal>
diff --git a/src/modules/question/component/PaperDeletModel.js b/src/modules/question/component/PaperDeletModel.js
index aa8a1d44..1c225975 100644
--- a/src/modules/question/component/PaperDeletModel.js
+++ b/src/modules/question/component/PaperDeletModel.js
@@ -1,19 +1,9 @@
 import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
 import { Modal} from 'antd';
-import axios from 'axios';
 import './../questioncss/questioncom.css'
 //立即申请试用
 class PaperDeletModel extends Component {
 
-	constructor(props) {
-		super(props);
-		this.state={
-
-		}
-	}
-
-
 	render() {
 
 		return(
diff --git a/src/modules/question/component/PaperDeletModels.js b/src/modules/question/component/PaperDeletModels.js
index f39fbcfa..ca48ffdc 100644
--- a/src/modules/question/component/PaperDeletModels.js
+++ b/src/modules/question/component/PaperDeletModels.js
@@ -1,19 +1,9 @@
 import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
 import { Modal} from 'antd';
-import axios from 'axios';
 import './../questioncss/questioncom.css'
 //立即申请试用
 class PaperDeletModel extends Component {
 
-	constructor(props) {
-		super(props);
-		this.state={
-
-		}
-	}
-
-
 	render() {
 
 		return(
diff --git a/src/modules/question/component/Paperreview_itemModel.js b/src/modules/question/component/Paperreview_itemModel.js
index b4ceacc0..2449c846 100644
--- a/src/modules/question/component/Paperreview_itemModel.js
+++ b/src/modules/question/component/Paperreview_itemModel.js
@@ -1,7 +1,5 @@
 import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
 import { Modal,InputNumber} from 'antd';
-import axios from 'axios';
 import './../questioncss/questioncom.css'
 class Paperreview_itemModel extends Component {
 
@@ -13,13 +11,30 @@ class Paperreview_itemModel extends Component {
 	}
 
 	onChange=(value)=>{
-		//console.log("设置批量得分");
-		//console.log(value);
     this.setState({
 			value:value,
 		})
 	}
 
+	setDownloadysl=()=>{
+		var re = /^[0-9]+.?[0-9]*$/; //判断字符串是否为数字 //判断正整数 /^[1-9]+[0-9]*]*$/
+		var nubmer = this.state.value;
+
+		if (!re.test(nubmer)) {
+			this.props.showNotification(`必须为数值`);
+			return;
+		}
+
+		try {
+			if(nubmer<1){
+				this.props.showNotification(`不能小于0`);
+				return;
+			}
+		}catch (e) {
+
+		}
+		this.props.setDownloady(this.state.value)
+	}
 	render() {
 
 		return(
@@ -56,7 +71,7 @@ width: 124px !important;
 					</div>
 					<div className="clearfix mt30 edu-txt-center">
 						<a className="task-btn mr30 w80" onClick={()=>this.props.Singlemagazine("",false)}>取消</a>
-						<a className="task-btn task-btn-orange w80" onClick={()=>this.props.setDownloady(this.state.value)}>确定</a>
+						<a className="task-btn task-btn-orange w80" onClick={()=>this.setDownloadysl()}>确定</a>
 					</div>
 				</div>
 			</Modal>
diff --git a/src/modules/question/component/Paperreview_itemModels.js b/src/modules/question/component/Paperreview_itemModels.js
index ba7978af..ce1a0721 100644
--- a/src/modules/question/component/Paperreview_itemModels.js
+++ b/src/modules/question/component/Paperreview_itemModels.js
@@ -1,7 +1,5 @@
 import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
 import { Modal,InputNumber} from 'antd';
-import axios from 'axios';
 import './../questioncss/questioncom.css'
 //立即申请试用
 class Paperreview_itemModels extends Component {
@@ -21,6 +19,28 @@ class Paperreview_itemModels extends Component {
 		})
 	}
 
+	setDownloadysl=()=>{
+		var re = /^[0-9]+.?[0-9]*$/; //判断字符串是否为数字 //判断正整数 /^[1-9]+[0-9]*]*$/
+		var nubmer = this.state.value;
+
+		if (!re.test(nubmer)) {
+			this.props.showNotification(`必须为数值`);
+			return;
+		}
+
+		try {
+			if(nubmer<1){
+				this.props.showNotification(`不能小于0`);
+				return;
+			}
+		}catch (e) {
+
+		}
+		console.log("必须为数值s");
+
+		this.props.setDownloadys(this.state.value);
+	}
+
 	render() {
 
 		return(
@@ -57,7 +77,7 @@ width: 124px !important;
 					</div>
 					<div className="clearfix mt30 edu-txt-center">
 						<a className="task-btn mr30 w80" onClick={()=>this.props.Singlemagazines(false,null)}>取消</a>
-						<a className="task-btn task-btn-orange w80" onClick={()=>this.props.setDownloadys(this.state.value)}>确定</a>
+						<a className="task-btn task-btn-orange w80" onClick={()=>this.setDownloadysl()}>确定</a>
 					</div>
 				</div>
 			</Modal>
diff --git a/src/modules/question/component/QuestionModal.js b/src/modules/question/component/QuestionModal.js
index de7614f3..ee71c14d 100644
--- a/src/modules/question/component/QuestionModal.js
+++ b/src/modules/question/component/QuestionModal.js
@@ -1,22 +1,13 @@
 import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
-import { Modal} from 'antd';
-import axios from 'axios';
+import { Modal } from 'antd';
 import './../questioncss/questioncom.css'
 //立即申请试用
 class QuestionModal extends Component {
 
-	constructor(props) {
-		super(props);
-		this.state={
-
-		}
-	}
-
 
 	render() {
 
-		return(
+		return (
 			<Modal
 				keyboard={false}
 				closable={false}
@@ -24,15 +15,31 @@ class QuestionModal extends Component {
 				destroyOnClose={true}
 				title="提示"
 				centered={true}
-				visible={this.props.modalsType===undefined?false:this.props.modalsType}
+				visible={this.props.modalsType === undefined ? false : this.props.modalsType}
 				width="442px"
 			>
 				<div className="educouddiv">
-					<div className={"tabeltext-alignleft mt10"}><p className="titiles">{this.props.titilesm}</p></div>
-					<div className={"tabeltext-alignleft mt10"}><p className="titiles">{this.props.titiless}</p></div>
+					{this.props.titilesm ?
+						<div className={"tabeltext-alignleft mt10"}><p className="titiles">{this.props.titilesm}</p></div>
+
+						:
+						""
+					}
+					{
+						this.props.titiless ?
+							<div className={"tabeltext-alignleft mt10"}><p className="titiles">{this.props.titiless}</p></div>
+							:
+							""
+					}
 					<div className="clearfix mt30 edu-txt-center">
-						<a className="task-btn mr30 w80" onClick={()=>this.props.modalCancel()}>取消</a>
-						<a className="task-btn task-btn-orange w80" onClick={()=>this.props.setDownload()}>确定</a>
+						{
+							this.props.titilesm && this.props.titilesm === "功能正在内测中，敬请期待" ?
+								""
+								:
+								<a className="task-btn mr30 w80" onClick={() => this.props.modalCancel()}>取消</a>
+						}
+
+						<a className="task-btn task-btn-orange w80" onClick={() => this.props.setDownload()}>{this.props.boolok ? this.props.boolok : "确定"}</a>
 					</div>
 				</div>
 			</Modal>
diff --git a/src/modules/question/component/QuestionModalPicture.js b/src/modules/question/component/QuestionModalPicture.js
new file mode 100644
index 00000000..bd556e33
--- /dev/null
+++ b/src/modules/question/component/QuestionModalPicture.js
@@ -0,0 +1,58 @@
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { Modal,Icon} from 'antd';
+import axios from 'axios';
+import './../questioncss/questioncom.css'
+import './../../../common/components/comment/index.scss';
+
+//立即申请试用
+class QuestionModalPicture extends Component {
+
+	constructor(props) {
+		super(props);
+		this.state={
+
+		}
+	}
+
+
+	render() {
+
+		return(
+			<Modal
+				keyboard={false}
+				closable={true}
+				footer={null}
+				destroyOnClose={true}
+				title=""
+				centered={true}
+				visible={this.props.url?true:false}
+				onCancel={this.props.handleClose}
+			>
+				{/* 显示上传的图片信息 */}
+				<style>
+					{
+						`
+						.intermediatecenter{
+							display: flex;
+							flex-direction: column;
+							align-items: center;
+							justify-content: center;
+							}
+						`
+					}
+				</style>
+				<div className="show_upload_image intermediatecenter" style={{ display: this.props.url ? 'block' : 'none'}}>
+					{/*<Icon type="close" className="image_close" onClick={this.props.handleClose}/>*/}
+					<div className="image_info intermediatecenter">
+						<img className="image" style={{
+							width:"100%"
+						}} src={ this.props.url} alt=""/>
+					</div>
+				</div>
+			</Modal>
+		)
+	}
+}
+
+export default QuestionModalPicture;
diff --git a/src/modules/question/component/QuestionModalys.js b/src/modules/question/component/QuestionModalys.js
new file mode 100644
index 00000000..29482e46
--- /dev/null
+++ b/src/modules/question/component/QuestionModalys.js
@@ -0,0 +1,42 @@
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { Modal} from 'antd';
+import axios from 'axios';
+import './../questioncss/questioncom.css'
+//立即申请试用
+class QuestionModalys extends Component {
+
+	constructor(props) {
+		super(props);
+		this.state={
+
+		}
+	}
+
+
+	render() {
+
+		return(
+			<Modal
+				keyboard={false}
+				closable={false}
+				footer={null}
+				destroyOnClose={true}
+				title="提示"
+				centered={true}
+				visible={this.props.modalsType===undefined?false:this.props.modalsType}
+				width="442px"
+			>
+				<div className="educouddiv">
+					<div className={"tabeltext-alignleft mt10"}><p className="titiles">{this.props.titilesm}</p></div>
+					<div className={"tabeltext-alignleft mt10"}><p className="titiles">{this.props.titiless}</p></div>
+					<div className="clearfix mt30 edu-txt-center">
+						<a className="task-btn task-btn-orange w80" onClick={()=>this.props.setDownload()}>知道啦</a>
+					</div>
+				</div>
+			</Modal>
+		)
+	}
+}
+
+export default QuestionModalys;
diff --git a/src/modules/question/component/SiderBars.js b/src/modules/question/component/SiderBars.js
index 78674068..d62cb5f6 100644
--- a/src/modules/question/component/SiderBars.js
+++ b/src/modules/question/component/SiderBars.js
@@ -1,80 +1,39 @@
 import React, { Component } from 'react';
-import { getImageUrl} from 'educoder';
-import {Tooltip} from 'antd';
+import { getImageUrl } from 'educoder';
+import { Tooltip } from 'antd';
 import '../../tpm/TPMIndex.css';
 
 const $ = window.$;
-const poiindex=0;
-$(window).resize(function(){
+const poiindex = 0;
+$(window).resize(function () {
 	rightSlider();
 });
 
-$(window).scroll(function(){
-	if($(".gotop").length>0){
-		if($(document).scrollTop()>0){
+$(window).scroll(function () {
+	if ($(".gotop").length > 0) {
+		if ($(document).scrollTop() > 0) {
 			$(".-task-sidebar .gotop").show();
-			$(".gotop").click(function(){
+			$(".gotop").click(function () {
 				$("html,body").scrollTop(0);
 			});
 		}
-		if($(document).scrollTop()==0){
+		if ($(document).scrollTop() == 0) {
 			$(".-task-sidebar .gotop").hide();
 		}
 	}
 });
 
-function rightSlider(){
-	var poi=parseInt((parseInt($(window).width())- 1200 )/2)-81;
+function rightSlider() {
+	var poi = parseInt((parseInt($(window).width()) - 1200) / 2) - 81;
 	// //console.log(parseInt($(window).width())+"  "+poi);
-	if(poi>0){
-		$(".-task-sidebar").css("right",poi);
-	}else{
-		$(".-task-sidebar").css("right","0px");
+	if (poi > 0) {
+		$(".-task-sidebar").css("right", poi);
+	} else {
+		$(".-task-sidebar").css("right", "0px");
 	}
 	$(".-task-sidebar").show();
 }
 
-
-function _initSider() {
-	var $descSide = $("<div class='-task-desc'></div>").appendTo("body");
-	$(".-task-sidebar>div").hover(function(){
-		//移入显示二维码
-		if($(this).hasClass("scan")){
-			$(".scan_ewm").show().css({right:"75px",opacity:0}).stop().animate({
-				right:"45px",opacity:1
-			})
-			return;
-		}
-		var $tool = $(this).attr("tooltips");
-		$descSide.html($tool+"<div><img src='/images/edu_user/jt.png'></div>");
-		$descSide.data('_dom', this)
-		$descSide.show().css({
-			left:$(this).offset().left - $descSide.width()-30,
-			opacity:0,
-			top:$(this).offset().top
-		}).stop().animate({
-			left:$(this).offset().left - $descSide.width()-5,
-			opacity:1
-		},400);
-	},function(){
-		if($(this).hasClass("scan")){
-			$(".scan_ewm").stop().animate({right:"75px",opacity:0},200).hide();
-		}
-		$descSide.stop().animate({
-			left:$(this).offset().left - $descSide.width()-30,
-			opacity:0
-		},200).hide();
-	});
-	rightSlider();
-
-	$(window).scroll(function() {
-		if ($descSide.height()) {
-			var hoverIcon = $descSide.data('_dom')
-			$descSide.css('top', $(hoverIcon).offset().top)
-		}
-	})
-}
-
 class SiderBars extends Component {
 	constructor(props) {
 		super(props)
@@ -82,45 +41,55 @@ class SiderBars extends Component {
 	}
 
 	componentDidMount() {
-		// _initSider()
 
 	}
 
 	render() {
-
-
-		// //console.log("SiderBar");
-		// //console.log(this.props);
-
-		var mypath= this.props&&this.props.match&&this.props.match.path;
-		let{myvisible,Datacount,animateStyle}=this.props;
+		var mypath = this.props && this.props.match && this.props.match.path;
+		let { myvisible, Datacount, animateStyle } = this.props;
+		let swsilan = false;
+		if (this.props) {
+			if (this.props.current_user) {
+				if (this.props.current_user.admin) {
+					swsilan = true;
+				}
+				else if (this.props.current_user.business) {
+					swsilan = true;
+				}
+				else if (this.props.current_user.is_teacher) {
+					swsilan = true;
+				} else if (this.props.current_user.user_identity !== "学生") {
+					swsilan = true;
+				}
+			}
+		}
 		return (
 
-			<div className={myvisible===true?"-task-sidebar mystask-sidebar":Datacount&&Datacount>0?"-task-sidebar mystask-sidebars":"-task-sidebar mystask-sidebarss"} >
+			<div className={myvisible === true ? "-task-sidebar mystask-sidebar" : Datacount && Datacount > 0 ? "-task-sidebar mystask-sidebars" : "-task-sidebar mystask-sidebarss"} >
 
-				{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?<div>
+				{this.props.mygetHelmetapi && this.props.mygetHelmetapi.main_site === true ? <div>
 
 					{
-						mypath&&mypath==="/question"?
-							<Tooltip placement="left" title={"试题库"}>
+						mypath && mypath === "/problemset" ?
+							<Tooltip placement="left" title={"试题篮"}>
 
-								<div className="feedback feedbackdivcolor xiaoshou shitikus"  onClick={()=>this.props.showDrawer()} >
+								<div className="feedback feedbackdivcolor xiaoshou shitikus" onClick={() => this.props.showDrawer()} >
 
 									{
-										Datacount&&Datacount>0?
+										Datacount && Datacount > 0 ?
 											<div className="shitikussmys maxnamewidth30">
 												{Datacount}
 											</div>
-											:""
+											: ""
 									}
 
-									<a target="_blank" className="color_white xiaoshou" >
+									<a className="color_white xiaoshou" >
 										<i className="iconfont icon-shitilan color-white xiaoshou"></i>
 									</a>
-									<p className="color-white font-12 xiaoshou">试题库</p>
+									<p className="color-white font-12 xiaoshou">试题篮</p>
 								</div>
 							</Tooltip>
-							:""
+							: ""
 
 					}
 
@@ -146,23 +115,23 @@ class SiderBars extends Component {
 					<div className="scan pr">
 						<Tooltip placement="right" title={
 							<pre>
-                    <p className="scan_ewm">
-                        <p className="pr padding10">
-                          <style>
-                            {
-															`
+								<p className="scan_ewm">
+									<p className="pr padding10">
+										<style>
+											{
+												`
                             .WeChatstyle{
                                margin-bottom: 0 !important;
                             }
                             `
-														}
-                          </style>
-                          <img src={getImageUrl("images/educoder/EWM.jpg")} width="158px" height="158px" />
-                          <p className={"WeChatstyle wechatcenter"}>微信扫一扫</p>
-                          <p className={"WeChatstyle wechatcenter"}>关注公众号</p>
-                        </p>
-                      </p>
-                    </pre>
+											}
+										</style>
+										<img src={getImageUrl("images/educoder/EWM.jpg")} width="158px" height="158px" />
+										<p className={"WeChatstyle wechatcenter"}>微信扫一扫</p>
+										<p className={"WeChatstyle wechatcenter"}>关注公众号</p>
+									</p>
+								</p>
+							</pre>
 						}>
 							<span className="inline erweima"><i className="iconfont icon-erweima color-white font-22 fl"></i></span>
 						</Tooltip>
@@ -176,7 +145,7 @@ class SiderBars extends Component {
 						</div>
 					</Tooltip>
 
-				</div>:""}
+				</div> : ""}
 			</div>
 		);
 	}
diff --git a/src/modules/question/component/SingleEditor.js b/src/modules/question/component/SingleEditor.js
index dffbf620..48baae0e 100644
--- a/src/modules/question/component/SingleEditor.js
+++ b/src/modules/question/component/SingleEditor.js
@@ -1,30 +1,21 @@
-import React,{ Component } from "react";
+import React, { Component } from "react";
 
-import {
-	Form, Input, InputNumber, Switch, Radio,
-	Slider, Button, Upload, Icon, Rate, Checkbox, message,
-	Row, Col, Select, Modal, Tooltip
-} from 'antd';
-import QuillForEditor from '../../../common/quillForEditor';
+import { Tooltip } from 'antd';
 import TPMMDEditor from '../../../modules/tpm/challengesnew/TPMMDEditor';
-import axios from 'axios'
 import update from 'immutability-helper'
 import './../questioncss/questioncom.css';
-import {getUrl, ActionBtn, DMDEditor, ConditionToolTip} from 'educoder';
-const { TextArea } = Input;
-const confirm = Modal.confirm;
-const $ = window.$
-const { Option } = Select;
+import '../questioncss/font.css';
+import { ConditionToolTip } from 'educoder';
+import RenderHtml from "../../../components/render-html";
 
 const tagArray = [
 	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
 	'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
 	'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
-
 //题库的试卷  单选题  组件
-class SingleEditor extends Component{
-	constructor(props){
+class SingleEditor extends Component {
+	constructor(props) {
 		super(props);
 		/**
 		 choice_id: 32076
@@ -33,7 +24,7 @@ class SingleEditor extends Component{
 		 standard_boolean: true
 		 */
 
-		const {question_choices} = this.props;
+		const { question_choices } = this.props;
 		let _standard_answers = undefined;
 		let _question_choices = undefined;
 		if (question_choices) {
@@ -46,17 +37,17 @@ class SingleEditor extends Component{
 			})
 		}
 
-		const choicescomy=[];
+		const choicescomy = [];
 		try {
-			if(this.props.item_banksedit){
-				if(this.props.item_banksedit.choices){
+			if (this.props.item_banksedit) {
+				if (this.props.item_banksedit.choices) {
 
 					this.props.item_banksedit.choices.forEach((item, index) => {
 						////console.log("SingleEditor");
 						////console.log(item);
 						choicescomy.push({
-							choice_text:item.choice_text,
-							standard_boolean:item.is_answer,
+							choice_text: item.choice_text,
+							standard_boolean: item.is_answer,
 						})
 					})
 
@@ -69,19 +60,22 @@ class SingleEditor extends Component{
 				}
 
 			}
-		}catch (e) {
+		} catch (e) {
 
 		}
 		this.state = {
 			question_choices: _question_choices || ['', '', '', ''],
 			standard_answers: _standard_answers || [false, false, false, false],
-			question_title: this.props.question_title!==undefined?JSON.parse(this.props.question_title):"",
+			question_title: this.props.question_title !== undefined ? this.props.question_title : "",
 			question_type: this.props.question_type || 0,
 			question_score: this.props.question_score || this.props.init_question_score,
-			question_titles: this.props.question_titles!==undefined?JSON.parse(this.props.question_titles):"",
-			question_titlesysl:this.props.question_titlesysl||'',
-			question_titleysl:this.props.question_title || '',
-			item_banksedit:[],
+			question_titles: this.props.question_titles !== undefined ? this.props.question_titles : "",
+			question_titlesysl: this.props.question_titlesysl || '',
+			question_titleysl: this.props.question_title || '',
+			item_banksedit: [],
+			url: "",
+			bindinginputs: null,
+			paramstype: "edit",
 		}
 	}
 	addOption = () => {
@@ -97,60 +91,56 @@ class SingleEditor extends Component{
 		this.setState({ question_choices, standard_answers })
 	}
 	deleteOption = (index) => {
-		let {question_choices}=this.state;
+		let { question_choices } = this.state;
 
 		// //////console.log("deleteOption");
 		// //////console.log(question_choices);
 
-		if(question_choices[index]===""){
+		if (question_choices[index] === "") {
 			// repeat code
 			this.toMDMode(null)
 			this.setState(
 				(prevState) => ({
-					question_choices : update(prevState.question_choices, {$splice: [[index, 1]]}),
-					standard_answers : update(prevState.standard_answers, {$splice: [[index, 1]]})
+					question_choices: update(prevState.question_choices, { $splice: [[index, 1]] }),
+					standard_answers: update(prevState.standard_answers, { $splice: [[index, 1]] })
+				})
+			)
+		} else {
+			this.toMDMode(null)
+			this.setState(
+				(prevState) => ({
+					question_choices: update(prevState.question_choices, { $splice: [[index, 1]] }),
+					standard_answers: update(prevState.standard_answers, { $splice: [[index, 1]] })
 				})
 			)
-		}else{
-					this.toMDMode(null)
-					this.setState(
-						(prevState) => ({
-							question_choices : update(prevState.question_choices, {$splice: [[index, 1]]}),
-							standard_answers : update(prevState.standard_answers, {$splice: [[index, 1]]})
-						})
-					)
 		}
 	}
 	onSave = () => {
-		var editordata=[];
-		const {question_title, question_titleysl,question_score, question_type,question_titles,question_titlesysl, question_choices, standard_answers } = this.state;
+		var editordata = [];
+		const { question_title, question_titleysl, question_score, question_type, question_titles, question_titlesysl, question_choices, standard_answers } = this.state;
 		const { question_id_to_insert_after, question_id } = this.props
 		// TODO check
-		const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
+		const answerArray = standard_answers.map((item, index) => { return item == true ? index + 1 : -1 }).filter(item => item != -1);
 
-		// const _text = quill.getText();
-		// const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
-		// if (!reg.test(_text)) {
-		// 	// 处理编辑器内容为空
-		// } else {
-		// 	// 提交到后台的内容需要处理一下;
-		// 	value =  JSON.stringify(value)
-		// }
-		if(!question_titleysl) {
-			// this.refs['titleEditor'].showError()
+		if (!question_titleysl) {
 			this.props.showNotification('请您输入题干');
 			return editordata;
+		} else {
+			console.log("question_titleysl");
+			console.log(question_titleysl);
 		}
-		for(let i = 0; i < question_choices.length; i++) {
+
+
+
+		for (let i = 0; i < question_choices.length; i++) {
 			if (!question_choices[i]) {
-				// this.refs[`optionEditor${i}`].showError()
 				this.props.showNotification(`请先输入 ${tagArray[i]} 选项的内容`);
 				return editordata;
 			}
 		}
 
-		if(!answerArray || answerArray.length == 0) {
-			this.props.showNotification('请先点击选择本选择题的正确选项');
+		if (!answerArray || answerArray.length == 0) {
+			this.props.showNotification('请设置本题的正确答案，点击选项A/B...即可完成设置');
 			return editordata;
 		}
 
@@ -169,14 +159,14 @@ class SingleEditor extends Component{
         "question_choices":["a答案","b答案","c答案","d答案"],
         "standard_answers":[1]
     }*/
-		editordata=[question_titleysl,answerArray,question_choices,question_titlesysl];
-				// question_title,
-				// question_type: answerArray.length > 1 ? 1 : 0,
-				// question_score,
-				// question_choices,
-				// standard_answers: answerArray,
-				// insert_id: question_id_to_insert_after || undefined
-		 return editordata;
+		editordata = [question_titleysl, answerArray, question_choices, question_titlesysl];
+		// question_title,
+		// question_type: answerArray.length > 1 ? 1 : 0,
+		// question_score,
+		// question_choices,
+		// standard_answers: answerArray,
+		// insert_id: question_id_to_insert_after || undefined
+		return editordata;
 	}
 	onCancel = () => {
 		this.props.onEditorCancel()
@@ -185,26 +175,30 @@ class SingleEditor extends Component{
 
 
 	componentDidMount = () => {
+
+		this.setState({
+			paramstype: this.props.match.params.type,
+		})
 		try {
 			this.props.getanswerMdRef(this);
-		}catch (e) {
+		} catch (e) {
 
 		}
 
 
 		try {
 			this.setState({
-				item_banksedit:this.props.item_banksedit,
-				question_title: this.props.item_banksedit.name!==undefined?JSON.parse(this.props.item_banksedit.name):"",
-				question_titleysl:this.props.item_banksedit.name|| '',
-				question_titles: this.props.item_banksedit.analysis!==undefined?JSON.parse(this.props.item_banksedit.analysis):"",
-				question_titlesysl:this.props.item_banksedit.analysis||'',
-				mychoicess:this.props.item_banksedit.choices,
+				item_banksedit: this.props.item_banksedit,
+				question_title: this.props.item_banksedit.name !== undefined ? this.props.item_banksedit.name : "",
+				question_titleysl: this.props.item_banksedit.name || '',
+				question_titles: this.props.item_banksedit.analysis !== undefined ? this.props.item_banksedit.analysis : "",
+				question_titlesysl: this.props.item_banksedit.analysis || '',
+				mychoicess: this.props.item_banksedit.choices,
 
 			})
 
 
-		}catch (e) {
+		} catch (e) {
 
 		}
 	}
@@ -213,13 +207,14 @@ class SingleEditor extends Component{
 		// ////console.log(prevProps);
 		// ////console.log(this.props.item_banksedit);
 
-		if(prevProps.item_banksedit !== this.props.item_banksedit) {
+		if (prevProps.item_banksedit !== this.props.item_banksedit) {
+			console.log("刷新了")
 			this.setState({
 				item_banksedit: this.props.item_banksedit,
-				question_title: this.props.item_banksedit.name!==undefined?JSON.parse(this.props.item_banksedit.name):"",
-				question_titleysl:this.props.item_banksedit.name|| '',
-				question_titles: this.props.item_banksedit.analysis!==undefined?JSON.parse(this.props.item_banksedit.analysis):"",
-				question_titlesysl:this.props.item_banksedit.analysis||'',
+				question_title: this.props.item_banksedit.name !== undefined ? this.props.item_banksedit.name : "",
+				question_titleysl: this.props.item_banksedit.name || '',
+				question_titles: this.props.item_banksedit.analysis !== undefined ? this.props.item_banksedit.analysis : "",
+				question_titlesysl: this.props.item_banksedit.analysis || '',
 				mychoicess: this.props.item_banksedit.choices,
 
 			})
@@ -232,41 +227,52 @@ class SingleEditor extends Component{
 		// //////console.log(standard_answers);
 		// //////console.log(standard_answers[index]);
 		// //////console.log(!standard_answers[index]);
-		for (var i=0;i<standard_answers.length;i++){
-			  if(index===i){
-					standard_answers[index] = true;
-				}else{
-					standard_answers[i] = false;
-				}
+		for (var i = 0; i < standard_answers.length; i++) {
+			if (index === i) {
+				standard_answers[index] = true;
+			} else {
+				standard_answers[i] = false;
+			}
 
 		}
 		// standard_answers[index] = !standard_answers[index];
 		this.setState({ standard_answers })
 	}
-	onOptionContentChange = (value,quill,index) => {
+	handleShowUploadImages = (url) => {
+		this.setState({
+			url: url,
+		})
+		try {
+			this.props.handleShowUploadImage(url)
+		} catch (e) {
+
+		}
+	}
+
+	handleShowUploadImage = (url, i) => {
+
+		this.setState({
+			url: url,
+			bindinginputs: i
+		})
+		try {
+			this.props.handleShowUploadImage(url)
+		} catch (e) {
+
+		}
+	}
+	bindinginputs = (i) => {
+		this.setState({
+			bindinginputs: i
+		})
+
+	}
+	onOptionContentChange = (value, index) => {
 		if (index >= this.state.question_choices.length) {
-			// TODO 新建，然后删除CD选项，再输入题干，会调用到这里，且index是3
 			return;
 		}
-    var texts;
-		const _text = quill.getText();
-		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
-		if (!reg.test(_text)) {
-			// 处理编辑器内容为空
-			texts="";
-		} else {
-			if(_text.length>=301){
-				var result = _text.substring(0,300);
-				texts={"ops":[{"insert":result}]};
-				texts=JSON.stringify(texts);
-			}else {
-				// 提交到后台的内容需要处理一下;
-				value =  JSON.stringify(value)
-				texts=value;
-			}
-		}
 		let question_choices = this.state.question_choices.slice(0);
-		question_choices[index] = texts;
+		question_choices[index] = value;
 		this.setState({ question_choices });
 	}
 	on_question_score_change = (e) => {
@@ -284,70 +290,34 @@ class SingleEditor extends Component{
 	toShowMode = () => {
 
 	}
+	isNull = (str) => {
+		if (str == "") return true;
+		var regu = "^[ ]+$";
+		var re = new RegExp(regu);
+		//为空或纯空格为 true    有值为false
+		console.log(re.test(str))
+		return re.test(str);
 
-	onContentChange=(value,quill)=>{
-		var _text = quill.getText();
-
-		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
-		if (!reg.test(_text)) {
-			// 处理编辑器内容为空
-			this.setState({
-				question_titleysl:""
-			})
-		} else {
-			// 提交到后台的内容需要处理一下;
-
-			var texts="";
-			if(_text.length>=1001){
-				var result = _text.substring(0,1000);
-				texts={"ops":[{"insert":result}]};
-				texts=JSON.stringify(texts);
-			}else {
-				value =  JSON.stringify(value)
-				texts=value;
-			}
-			this.setState({
-				question_titleysl:texts
-			})
-			try {
-				//console.log("onContentChange");
-				//console.log(quill.getText().length);
-			}catch (e) {
-
-			}
-		}
 	}
-	onContentChanges=(value,quill)=>{
-		const _text = quill.getText();
-		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
-		if (!reg.test(_text)) {
-			// 处理编辑器内容为空
-			this.setState({
-				question_titlesysl:""
-			})
-		} else {
-			var texts="";
-			if(_text.length>=1001){
-				var result = _text.substring(0,1000);
-				texts={"ops":[{"insert":result}]};
-				texts=JSON.stringify(texts);
-			}else {
-				value =  JSON.stringify(value)
-				texts=value;
-			}
-			this.setState({
-				question_titlesysl:texts
-			})
-		}
+	onContentChange = (html) => {
+		this.setState({
+			question_titleysl: html
+		})
 	}
+
+
+	onContentChanges = (html) => {
+		this.setState({
+			question_titlesysl: html
+		})
+	}
+
 	handleShowImage = (url) => {
-		//console.log("点击了图片放大");
-		//console.log(url);
 		alert(url);
 	}
 
 	render() {
-		let { question_title, question_score, question_type, question_choices, standard_answers,question_titles,question_titlesysl} = this.state;
+		let { paramstype, question_title, question_titleysl, question_score, question_type, question_choices, standard_answers, question_titles, question_titlesysl, bindinginputs } = this.state;
 		let { question_id, index, exerciseIsPublish,
 			// question_title,
 			// question_type,
@@ -368,7 +338,12 @@ class SingleEditor extends Component{
 		// //////console.log("xuanzheshijuan");
 		// //////console.log(answerTagArray);
 		// //////console.log(!exerciseIsPublish);
-		return(
+		// console.log("question_titles");
+		// console.log(question_titles);
+		// console.log(paramstype);
+		const options = ['code-block', 'image', 'formula', 'clean'
+		]
+		return (
 			<div className="padding20-30  signleEditor danxuano" id={qNumber}>
 
 				<style>{`
@@ -389,6 +364,29 @@ class SingleEditor extends Component{
               #e_tips_mdEditor_question_undefined4{
                display: none;
               }
+              .signleEditor .quill_editor_for_react_area  .ql-toolbar .ql-formats .ql-size {
+              line-height: 20px;
+              }
+               .signleEditor .quill_editor_for_react_area  .ql-toolbar .ql-formats .ql-font {
+              line-height: 20px;
+               min-width: 150px;
+              }
+               .signleEditor .quill_editor_for_react_area  .ql-container .ql-editor p{
+                  font-family: MicrosoftYaHei;
+              }
+                .content_editorMd_show{
+                display: flex !important;
+                margin-top:0px !important;
+                border-radius:2px !important;
+                max-width: 1056px !important;
+                word-break:break-all !important;
+                border:1px solid rgba(221,221,221,1) !important;
+              }
+              .contestedtext{
+              font-size:14px;
+							font-family:MicrosoftYaHei;
+							color:rgba(172,172,172,1);
+              }
             `}</style>
 				<p className="mb10 clearfix">
 					{/* {!question_id ? '新建' : '编辑'} */}
@@ -396,99 +394,108 @@ class SingleEditor extends Component{
 					<span className="xingtigan  fl">题干：</span>
 				</p>
 
-				<QuillForEditor
-					autoFocus={true}
-					imgAttrs={{width: '146px', height: '136px'}}
-					style={{ height: '155px'}}
+				<TPMMDEditor
+					initValue={question_titleysl}
+					height={155}
+					mdID='single-question-title'
+					onChange={this.onContentChange}
 					placeholder="请您输入题干"
-					options={['code-block', 'image', 'formula']}
-					value={question_title}
-					onContentChange={this.onContentChange}
 				/>
-
 				<div className="mb10 mt10 sortinxdirection">
-					{/* {!question_id ? '新建' : '编辑'} */}
 					<span className="xingcolor font-16 fl mr4">*</span>
 					<span className="xingtigans  fl"><span className="xingtigan">答案选项：</span>点击选项可设置正确答案</span>
 				</div>
 
-				{question_choices.map( (item, index) => {
+				{question_choices.map((item, index) => {
+					let itemss = item;
+					if (itemss) {
+						try {
+							itemss = JSON.parse(itemss);
+						} catch (e) {
+							itemss = itemss;
+						}
+					}
 					const bg = standard_answers[index] ? 'check-option-bg' : ''
-					return <div className={index>0?"df optionRow mt15": "df optionRow"} key={index} >
+					return <div className={index > 0 ? "df optionRow mt15" : "df optionRow"} key={index} >
 						{/* 点击设置答案 */}
 						{/* TODO 加了tooltip后，会丢失掉span的class */}
 						{/* <Tooltip title={standard_answers[index] ? '点击取消标准答案设置' : '点击设置为标准答案'}> */}
 						<span className={`option-item fr mr10 color-grey select-choice ${bg} `}
-									name="option_span" onClick={() => this.onOptionClick(index)} style={{flex: '0 0 38px'}}>
-                      <ConditionToolTip key={index} title={'点击设置为标准答案'} placement="left" condition={true}>
-                        <div style={{width: '100%', height: '100%'}}>{tagArray[index]}</div>
-                      </ConditionToolTip>
-                  </span>
+							name="option_span" onClick={() => this.onOptionClick(index)} style={{ flex: '0 0 38px' }}>
+							<ConditionToolTip key={index} title={'点击设置为标准答案'} placement="left" condition={true}>
+								<div style={{ width: '100%', height: '100%' }}>{tagArray[index]}</div>
+							</ConditionToolTip>
+						</span>
 						{/* </Tooltip> */}
-						<div style={{ flex: '0 0 1038px'}}>
+						<div style={{ flex: '0 0 1038px' }}>
 							{
-								item===undefined||item===null||item===""?
-									<QuillForEditor
-										autoFocus={false}
-										imgAttrs={{width: '146px', height: '136px'}}
-										style={{ height: '166px'}}
-										placeholder="请您输入题干"
-										options={['code-block', 'image', 'formula']}
-										value={item}
-										onContentChange={(value,quill) => this.onOptionContentChange(value,quill,index)}
-									/>
+								item === undefined || item === null || item === "" ?
+									<div style={{ width: '100%' }}>
+										{
+											bindinginputs === null || bindinginputs !== index ?
+												<div className="content_editorMd_show" onClick={() => this.bindinginputs(index)}>
+													{/*<p className="contestedtext">请您输入选项</p>*/}
+												</div> :
+
+												<TPMMDEditor
+													initValue={item}
+													height={155}
+													mdID='single-question-option'
+													onChange={value => this.onOptionContentChange(value, index)}
+													placeholder="请您输入选项"
+												/>
+
+										}
+									</div>
 									:
-									<QuillForEditor
-										autoFocus={false}
-										imgAttrs={{width: '146px', height: '136px'}}
-										style={{ height: '166px'}}
-										placeholder="请您输入题干"
-										options={['code-block', 'image', 'formula']}
-										value={JSON.parse(item)}
-										onContentChange={(value,quill) => this.onOptionContentChange(value,quill,index)}
-									/>
+									<div style={{ width: '100%' }}>
+										{
+											bindinginputs === null || bindinginputs !== index ?
+												<div className="content_editorMd_show" onClick={() => this.bindinginputs(index)}>
+													<RenderHtml value={itemss} />
+												</div>
+												:
 
+												<TPMMDEditor
+													initValue={item}
+													height={155}
+													mdID='single-question-option'
+													onChange={value => this.onOptionContentChange(value, index)}
+													placeholder="请您输入选项"
+												/>
+										}
+
+									</div>
 							}
-
-
-
-
-
 						</div>
-						{exerciseIsPublish || index<=1?
+						{exerciseIsPublish || index <= 1 ?
 							<i className=" font-18  ml15 mr20"></i>
-							:<Tooltip title="删除">
+							: <Tooltip title="删除">
 								<i className="iconfont icon-htmal5icon19 font-18 color-grey-c ml15" onClick={() => this.deleteOption(index)}></i>
-							</Tooltip> }
-						{ !exerciseIsPublish && index<7 && <Tooltip title={`新增参考答案`}>
+							</Tooltip>}
+						{!exerciseIsPublish && index < 7 && <Tooltip title={`新增参考答案`}>
 							<i className="color-green font-16 iconfont icon-roundaddfill ml6"
-								 onClick={() => this.addOption()}
-								 style={{float: 'right', visibility: index == question_choices.length - 1 ? '' : 'hidden', marginTop: '2px'}}
+								onClick={() => this.addOption()}
+								style={{ float: 'right', visibility: index == question_choices.length - 1 ? '' : 'hidden', marginTop: '2px' }}
 							></i>
 						</Tooltip>}
 
 					</div>
-				}) }
-
-
+				})}
 
 				<div className="mt10">
 					<p className="mb10  clearfix">
-						{/* {!question_id ? '新建' : '编辑'} */}
 						<span className="xingcolor font-16 fl mr4"></span>
 						<span className="xingtigan  fl">题目解析：</span>
 					</p>
 					<div className="mt10"></div>
-					<QuillForEditor
-						autoFocus={false}
-						imgAttrs={{width: '146px', height: '136px'}}
-						style={{height: '166px' }}
+					<TPMMDEditor
+						initValue={question_titlesysl}
+						height={155}
+						mdID='single-question-answer'
+						onChange={this.onContentChanges}
 						placeholder="请您输入题目解析"
-						options={['code-block', 'image', 'formula']}
-						value={question_titles}
-						onContentChange={this.onContentChanges}
 					/>
-
 				</div>
 
 
diff --git a/src/modules/question/component/SubquestionEditor.js b/src/modules/question/component/SubquestionEditor.js
new file mode 100644
index 00000000..f4d55cdc
--- /dev/null
+++ b/src/modules/question/component/SubquestionEditor.js
@@ -0,0 +1,81 @@
+import React, { Component } from "react";
+import TPMMDEditor from "../../../modules/tpm/challengesnew/TPMMDEditor";
+import "./../questioncss/questioncom.css";
+import "../questioncss/font.css";
+
+//题库的试卷  简答题
+class SubquestionEditor extends Component {
+  state = {
+    question_title: this.props.question_title || "",
+    standard_answers: this.props.standard_answers || "",
+    question_analysis: this.props.question_analysis || "",
+  };
+  componentDidMount() {
+    if (this.props.getanswerMdRef) {
+      this.props.getanswerMdRef(this);
+    }
+  }
+  onContentChange = (label, value) => {
+    this.setState({
+      [label]: value,
+    });
+  };
+  onSave = () => {
+    return this.state;
+  };
+  render() {
+    let { question_title, standard_answers, question_analysis } = this.state;
+    return (
+      <div className="padding20-30  signleEditor">
+        <p className="mb10 clearfix">
+          <span className="xingcolor font-16 fl mr4">*</span>
+          <span className="xingtigan  fl">题干：</span>
+        </p>
+
+        <TPMMDEditor
+          initValue={question_title}
+          mdID="subjective-question-title"
+          onChange={(value) => this.onContentChange("question_title", value)}
+          height={155}
+          placeholder="请您输入题干"
+        />
+        <div className="mt10">
+          <p className="mb10 clearfix">
+            <span className="xingcolor font-16 fl mr4">*</span>
+            <span className="xingtigan  fl">参考答案：</span>
+          </p>
+
+          <TPMMDEditor
+            initValue={standard_answers}
+            height={166}
+            mdID="subjective-question-answer"
+            onChange={(value) =>
+              this.onContentChange("standard_answers", value)
+            }
+            placeholder="请您输入参考答案"
+          />
+        </div>
+
+        <div>
+          <div className="mt10">
+            <p className="mb10 clearfix">
+              <span className="xingcolor font-16 fl mr4"></span>
+              <span className="xingtigan  fl">题目解析：</span>
+            </p>
+
+            <TPMMDEditor
+              initValue={question_analysis}
+              height={166}
+              mdID="subjective-question-analysis"
+              onChange={(value) =>
+                this.onContentChange("question_analysis", value)
+              }
+              placeholder="请您输入题目解析"
+            />
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
+export default SubquestionEditor;
diff --git a/src/modules/question/component/list-jihe.scss b/src/modules/question/component/list-jihe.scss
new file mode 100644
index 00000000..3814d946
--- /dev/null
+++ b/src/modules/question/component/list-jihe.scss
@@ -0,0 +1,72 @@
+.marpres {
+  line-height: 28px;
+  font-size: 14px;
+  p,
+  li {
+    line-height: 28px;
+    font-size: 14px;
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    font-size: 16px;
+  }
+
+  .linenums {
+    font-family: times new roman;
+  }
+}
+
+.listjihecolors {
+  p {
+    line-height: 28px;
+    font-size: 14px;
+  }
+}
+
+.listjihetixingstitsmy {
+  font-size: 16px;
+  line-height: 28px;
+  font-weight: bold;
+}
+
+.titequestion {
+  font-size: 16px;
+  color: #333333;
+
+  p {
+    font-size: 16px;
+    line-height: 28px;
+    font-weight: bold;
+  }
+}
+
+.optionquestion {
+  font-size: 16px !important;
+  color: #565656 !important;
+}
+
+.programquill .ql-editor {
+  padding-left: 0px !important;
+  padding-top: 0px !important;
+}
+
+.ql-editor {
+  display: inline-block;
+  text-align: justify;
+}
+
+.marpres pre {
+  margin-bottom: 10px !important;
+}
+
+.tknamelengs {
+  max-width: 120px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
\ No newline at end of file
diff --git a/src/modules/question/comthetestpaper/Comthetestpaperst.js b/src/modules/question/comthetestpaper/Comthetestpaperst.js
index bc1e8cd0..8751c331 100644
--- a/src/modules/question/comthetestpaper/Comthetestpaperst.js
+++ b/src/modules/question/comthetestpaper/Comthetestpaperst.js
@@ -1,47 +1,20 @@
 import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl} from 'educoder';
+import { getImageUrl} from 'educoder';
 import axios from 'axios';
 import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
 	Radio,
-	Checkbox,
 	Form,
 	Input,
 	Select,
 	Cascader,
-	Col, Row, InputNumber, DatePicker, AutoComplete, Button, Tag
+	InputNumber, AutoComplete,
 } from "antd";
 import './../questioncss/questioncom.css';
 import Newknledpots from '../component/Newknledpots'
 const InputGroup = Input.Group;
 const {Option} = Select;
-const options = [
-	{
-		value: '方向',
-		label: '方向',
-		children: [
-			{
-				value: '课程',
-				label: '课程',
-			},
-		],
-	},
-	{
-		value: 'jiangsu',
-		label: 'Jiangsu',
-		children: [
-			{
-				value: 'nanjing',
-				label: 'Nanjing',
-			},
-		],
-	},
-];
-//Itembankstop 题库的
+
+//Itembankstop Intelligentcomponents 题库的
 class Comthetestpaperst extends Component {
 	constructor(props) {
 		super(props);
@@ -56,6 +29,7 @@ class Comthetestpaperst extends Component {
 			options: [],
 			NewknTypedel:false,
 			boolred:false,
+			sub_disciplineslength:1,
 		}
 	}
 	setboolred=(bool)=>{
@@ -413,11 +387,16 @@ class Comthetestpaperst extends Component {
 
 		const didata = this.props.disciplinesdata;
 		const knowledgepointsdata = [];
-
+		var sub_disciplineslength=0;
 		for (var i = 0; i < didata.length; i++) {
 			//方向
 			if (value[0] === didata[i].id) {
 				const fxdidata = didata[i].sub_disciplines;
+				try {
+					sub_disciplineslength=fxdidata.length;
+				}catch (e) {
+
+				}
 				for (var j = 0; j < fxdidata.length; j++) {
 					//课程
 					if (value[1] === fxdidata[j].id) {
@@ -441,6 +420,7 @@ class Comthetestpaperst extends Component {
 			Knowpoints: [],
 			knowledgepoints: knowledgepointsdata,
 			knowledgepoints2:knowledgepointsdata,
+			sub_disciplineslength:sub_disciplineslength,
 		})
 
 		this.props.form.setFieldsValue({
@@ -468,7 +448,7 @@ class Comthetestpaperst extends Component {
 		//////console.log('Clicked! But prevent default.');
 	}
 	deletesobject = (item, index) => {
-    debugger
+
 		var tmp = this.state.Knowpoints;
 		for (var i = 0; i < tmp.length; i++) {
 			if (i ===index) {
@@ -614,6 +594,9 @@ class Comthetestpaperst extends Component {
 				<style>
 					{
 						`
+						 body{
+            width: 100%!important;
+          }
 						.ant-form-item{
 						 margin-bottom: 0px !important;
 						
@@ -686,34 +669,39 @@ class Comthetestpaperst extends Component {
 					</Form.Item>
 						</div>
 				</div>
-					<div className="zsdd">
-					<Form.Item
-						label="知识点"
-					>
-						{getFieldDecorator("rbzsd"
-						)(
-							<div className="sortinxdirection">
-								<InputGroup compact>
-									<Select style={{width: '258px'}} value={undefined} onChange={this.handleFormkechen}
-													placeholder="请选择...">
-										{knowledgepoints2 && knowledgepoints2.map((object, index) => {
-											return (
-												<Option key={object.id} value={object.id}>{object.name}</Option>
-											)
-										})}
-									</Select>
-								</InputGroup>
+					{
+						this.state.sub_disciplineslength===null || this.state.sub_disciplineslength===undefined||this.state.sub_disciplineslength===0?"":
+
+							<div className="zsdd">
+								<Form.Item
+									label="知识点"
+								>
+									{getFieldDecorator("rbzsd"
+									)(
+										<div className="sortinxdirection">
+											<InputGroup compact>
+												<Select style={{width: '258px'}} value={undefined} onChange={this.handleFormkechen}
+																placeholder="请选择...">
+													{knowledgepoints2 && knowledgepoints2.map((object, index) => {
+														return (
+															<Option key={object.id} value={object.id}>{object.name}</Option>
+														)
+													})}
+												</Select>
+											</InputGroup>
 
 
 
-								<img className=" ml22 zjzsdian xiaoshou"  src={getImageUrl("images/educoder/zjzsd.png")} onClick={()=>this.NewknTypedeldel(true)}/>
+											<img className=" ml22 zjzsdian xiaoshou"  src={getImageUrl("images/educoder/zjzsd.png")} onClick={()=>this.NewknTypedeldel(true)}/>
 
 
 
+										</div>
+									)}
+								</Form.Item>
 							</div>
-						)}
-					</Form.Item>
-					</div>
+					}
+
 					{
 						this.state.Knowpoints===undefined||this.state.Knowpoints===null?"":
 							this.state.Knowpoints.length>0?
diff --git a/src/modules/question/comthetestpaper/Intelligentcomponents.js b/src/modules/question/comthetestpaper/Intelligentcomponents.js
index 64d57e45..d3f7f624 100644
--- a/src/modules/question/comthetestpaper/Intelligentcomponents.js
+++ b/src/modules/question/comthetestpaper/Intelligentcomponents.js
@@ -20,7 +20,9 @@ import Newknledpots from '../component/Newknledpots';
 import Ldanxuan from './lntlligentpone';
 const InputGroup = Input.Group;
 const {Option} = Select;
-//Itembankstop Comthetestpaperst 题库的
+// Comthetestpaperst 题库的
+// Itembankstop 题库的
+
 class Intelligentcomponents extends Component {
 	constructor(props) {
 		super(props);
@@ -35,7 +37,8 @@ class Intelligentcomponents extends Component {
 			options: [],
 			NewknTypedel:false,
 			boolred:false,
-			rbly:"1"
+			rbly:"1",
+			sub_disciplineslength:1,
 		}
 	}
 	setboolred=(bool)=>{
@@ -220,7 +223,7 @@ class Intelligentcomponents extends Component {
 	handleFormLayoutChanges = (e) => {
 		// //console.log("handleFormLayoutChanges");
 		// //console.log(value);
-		// debugger
+		
 		//来源
 		this.props.form.setFieldsValue({
 			rbly: e.target.value + "",
@@ -239,7 +242,7 @@ class Intelligentcomponents extends Component {
 	handleFormLayoutChange = (e) => {
 		// //console.log("handleFormLayoutChange");
 		// //console.log(value);
-		// debugger
+		
 		//难度塞选
 		this.props.form.setFieldsValue({
 			rbnd: e.target.value + "",
@@ -310,11 +313,16 @@ class Intelligentcomponents extends Component {
 
 		const didata = this.props.disciplinesdata;
 		const knowledgepointsdata = [];
-
+		var sub_disciplineslength=0;
 		for (var i = 0; i < didata.length; i++) {
 			//方向
 			if (value[0] === didata[i].id) {
 				const fxdidata = didata[i].sub_disciplines;
+				try {
+					sub_disciplineslength=fxdidata.length;
+				}catch (e) {
+
+				}
 				for (var j = 0; j < fxdidata.length; j++) {
 					//课程
 					if (value[1] === fxdidata[j].id) {
@@ -525,6 +533,9 @@ class Intelligentcomponents extends Component {
 				<style>
 					{
 						`
+						 body{
+            width: 100%!important;
+          }
 						.ant-form-item{
 						 margin-bottom: 0px !important;
 						
@@ -597,34 +608,38 @@ class Intelligentcomponents extends Component {
 							</Form.Item>
 						</div>
 					</div>
-					<div className="zsdd">
-						<Form.Item
-							label="知识点"
-						>
-							{getFieldDecorator("rbzsd"
-							)(
-								<div className="sortinxdirection">
-									<InputGroup compact>
-										<Select style={{width: '258px'}} value={undefined} onChange={this.handleFormkechen}
-														placeholder="请选择...">
-											{knowledgepoints2 && knowledgepoints2.map((object, index) => {
-												return (
-													<Option key={object.id} value={object.id}>{object.name}</Option>
-												)
-											})}
-										</Select>
-									</InputGroup>
+					{
+						this.state.sub_disciplineslength === null || this.state.sub_disciplineslength === undefined || this.state.sub_disciplineslength === 0 ? "" :
+							<div className="zsdd">
+								<Form.Item
+									label="知识点"
+								>
+									{getFieldDecorator("rbzsd"
+									)(
+										<div className="sortinxdirection">
+											<InputGroup compact>
+												<Select style={{width: '258px'}} value={undefined} onChange={this.handleFormkechen}
+																placeholder="请选择...">
+													{knowledgepoints2 && knowledgepoints2.map((object, index) => {
+														return (
+															<Option key={object.id} value={object.id}>{object.name}</Option>
+														)
+													})}
+												</Select>
+											</InputGroup>
 
 
 
-									<img className=" ml22 zjzsdian xiaoshou"  src={getImageUrl("images/educoder/zjzsd.png")} onClick={()=>this.NewknTypedeldel(true)}/>
+											<img className=" ml22 zjzsdian xiaoshou"  src={getImageUrl("images/educoder/zjzsd.png")} onClick={()=>this.NewknTypedeldel(true)}/>
 
 
 
-								</div>
-							)}
-						</Form.Item>
-					</div>
+										</div>
+									)}
+								</Form.Item>
+							</div>
+					}
+
 					{
 						this.state.Knowpoints===undefined||this.state.Knowpoints===null?"":
 							this.state.Knowpoints.length>0?
diff --git a/src/modules/question/questioncss/font.css b/src/modules/question/questioncss/font.css
new file mode 100644
index 00000000..1f2cd838
--- /dev/null
+++ b/src/modules/question/questioncss/font.css
@@ -0,0 +1,67 @@
+@charset "utf-8";
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimSun]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimSun]::before {
+    content: "宋体";
+    font-family:SimSun !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimHei]::before {
+    content: "黑体";
+    font-family:SimHei !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Microsoft-YaHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Microsoft-YaHei]::before {
+    content: "微软雅黑";
+    font-family:Microsoft YaHei !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=KaiTi]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=KaiTi]::before {
+    content: "楷体";
+    font-family:KaiTi !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=FangSong]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=FangSong]::before {
+    content: "仿宋";
+    font-family:FangSong !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Arial]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Arial]::before {
+    content: "Arial";
+    font-family:Arial !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Times-New-Roman]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Times-New-Roman]::before {
+    content: "Times New Roman";
+    font-family:Times New Roman !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=sans-serif]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=sans-serif]::before {
+    content: "sans-serif";
+    font-family:sans-serif !important;
+}
+
+
+.ql-font-SimSun {
+    font-family:SimSun !important;
+}
+.ql-font-SimHei {
+    font-family:SimHei !important;
+}
+.ql-font-Microsoft-YaHei {
+    font-family:Microsoft YaHei !important;
+}
+.ql-font-KaiTi {
+    font-family:KaiTi !important;
+}
+.ql-font-FangSong {
+    font-family:FangSong !important;
+}
+.ql-font-Arial {
+    font-family:Arial !important;
+}
+.ql-font-Times-New-Roman {
+    font-family:Times New Roman   !important;
+}
+.ql-font-sans-serif {
+    font-family:sans-serif  !important;
+}
diff --git a/src/modules/question/questioncss/questioncom.css b/src/modules/question/questioncss/questioncom.css
index dcfdff84..2748f852 100644
--- a/src/modules/question/questioncss/questioncom.css
+++ b/src/modules/question/questioncss/questioncom.css
@@ -102,6 +102,9 @@
 .w100{
     width: 100px;
 }
+.mt5{
+    margin-top: 5px;
+}
 .mt21{
     margin-top: 21px;
 }
@@ -271,6 +274,12 @@
     width:30%;
 }
 
+.w80s{
+    width:80%;
+}
+.w20s{
+    width:20%;
+}
 
 .w50s{
     width: 50%;
@@ -323,9 +332,15 @@
 .listjihetixingstitsy {
     color: #333333;
     font-size: 14px;
-    line-height: 20px !important;
+    line-height: 25px !important;
     height: 25px !important;
 }
+.listjihetixingstitsmy {
+    color: #333333;
+    font-size: 14px;
+    line-height: 28px !important;
+    padding-right: 5px !important;
+}
 
 .listjihetixingstits{
     color: #333333;
@@ -339,6 +354,11 @@
     line-height:19px;
     margin-top: 10px;
 }
+.listjihetixingstitsppy{
+    color: #333333;
+    font-size: 14px;
+    line-height:19px;
+}
 .listjihetixingstitssy{
     color: #333333;
     font-size: 14px;
@@ -349,13 +369,18 @@
     color: #BBBBBB;
     font-size: 12px;
 }
+
 .mt22{
     margin-top: 22px;
 }
+.mb60{
+    margin-bottom: 60px !important;
+}
+
 .viewparsings{
     color:#4CACFF;
     font-size:12px;
-    line-height: 30px;
+    line-height: 26px;
 }
 
 .selection{
@@ -385,11 +410,53 @@
     line-height: 30px;
     color: #FFFFFF;
 }
+.selectionssradiu{
+    width:88px;
+    height:30px;
+    background:#ffffff;
+    border: 1px solid #33BD8C;
+    border-radius:4px;
+    text-align: center;
+    line-height: 30px;
+    color: #32BD8C;
+}
 .lh30{
     line-height: 30px;
 
 
 }
+.lh26{
+    line-height: 26px !important;
+
+
+}
+.lh16{
+    line-height: 16px !important;
+
+}
+
+.lh17{
+    line-height: 17px !important;
+}
+
+.lh20ss{
+    height: 20px !important;
+    display: inline-block;
+}
+
+.lh30s{
+    height: 30px !important;
+    display: inline-block;
+}
+.lh25s{
+    height: 25px !important;
+    line-height: 25px !important;
+}
+.lh26s{
+    height: 26px !important;
+    line-height: 26px !important;
+}
+
 
 .analysis{
     height:19px;
@@ -413,10 +480,10 @@
     color: #4CACFF;
 }
 .xiaoshou{
-    cursor:pointer;
+    cursor:pointer !important;
 }
 .xiaoshout{
-    cursor:default;
+    cursor:default !important;
 }
 .mt40{
     margin-top: 40px;
@@ -705,6 +772,9 @@
     font-size: 14px;
 
 }
+.testfondexsysl{
+    width:5% !important;
+}
 .yldxtits{
     color: #888888;
     font-size: 14px;
@@ -712,7 +782,9 @@
 .mt25{
     margin-top: 25px;
 }
-
+.wt930px{
+    width: 930px !important;
+}
 .postitonrelati{
     position: relative;
 }
@@ -807,6 +879,9 @@
 .lh20s{
     line-height: 20px;
 }
+.lh33s{
+    line-height: 33px !important;
+}
 
 .backgroudwhites{
     background-color: #fff;
@@ -876,11 +951,12 @@
 
     width:46px;
     height: 20px;
-    line-height: 20px;
+    line-height: 20px !important;
     background:rgba(255,102,1,1);
     border-radius:10px;
     color: #ffffff;
     text-align: center;
+    font-size: 12px !important;
 }
 
 .jinzhixiaoshou{
@@ -908,7 +984,7 @@
     width: 40px !important;
     position: absolute;
     border-radius: 4px;
-    top: -50%;
+    top: -79%;
 }
 .shitikussmys{
     width:29px !important;
@@ -950,6 +1026,12 @@
 .mr15{
     margin-right: 15px;
 }
+/*.ant-modal-mask{*/
+/*    z-index: 6000 !important;*/
+/*}*/
+/*.ant-modal-wrap{*/
+/*    z-index: 6000 !important;*/
+/*}*/
 .fangdatwo{
     background: #fefefe;
     background-color: #fefefe;
@@ -960,7 +1042,7 @@
     top:0px;
     bottom: 0px;
     left: 0px;
-    z-index: 999999;
+    z-index: 999;
     right: 0px;
 }
 
@@ -985,8 +1067,28 @@
 }
 
 .inpustred .ant-input{
-    border: 1px solid #f30707;
-    border-radius: 5px;
+    border: 1px solid #f30707 !important;
+    border-right: 0px solid #FFFFff !important;
+}
+.inpustredysl .ant-input:hover{
+    border: 1px solid #f30707 !important;
+    border-right: 0px solid #FFFFff !important;
+}
+.inpustredysl .ant-input:active{
+    border: 1px solid #f30707 !important;
+    border-right: 0px solid #FFFFff !important;
+}
+.inpustredysl .ant-input-group-addon{
+    border: 1px solid #f30707 !important;
+    border-left: 0px solid #FFFFff !important;
+}
+.inpustredysl .ant-input-group-addon:hover{
+    border: 1px solid #f30707 !important;
+    border-left: 0px solid #FFFFff !important;
+}
+.inpustredysl .ant-input-group-addon:active{
+    border: 1px solid #f30707 !important;
+    border-left: 0px solid #FFFFff !important;
 }
 
 .mt15{
@@ -1066,3 +1168,71 @@
 .lh34{
     line-height: 34px !important;
 }
+.titesstwos{
+    position: relative;
+}
+.titesstwostest{
+    position: absolute;
+}
+.text-indents40{
+    text-indent:40px
+}
+.text-indents44{
+    text-indent:44px
+}
+.text-indents50{
+    text-indent: 50px
+}
+.typesBtn{
+    line-height:25px;
+    width:60px;
+    height:26px;
+    border-radius:13px;
+    margin-right:10px;
+    font-size: 13px;
+    margin-left: 12px;
+    cursor:default !important;
+    text-align: center;
+}
+
+.typeGreen{
+    color:#15DB7A;
+    border: 1px solid #15DB7A;
+}
+.typeBlue{
+    color:#4CACFF;
+}
+.typeBlues{
+    background:#4CACFF;
+    color: #ffffff;
+}
+.typeRed{
+    color:#FB6822;
+    border: 1px solid #FB6822;
+}
+.typeYellow{
+    color:#FFB538;
+}
+.ml20{
+    margin-left: 20px !important;
+}
+.ml25{
+    margin-left: 25px !important;
+}
+.mr35{
+    margin-right: 35px !important;
+}
+
+.plpr{
+    padding-left: 5px;
+    padding-right: 5px;
+}
+
+.pb10{
+    padding-bottom: 10px !important;
+}
+
+
+.pb5{
+    padding-bottom: 5px !important;
+}
diff --git a/src/modules/question/questioncss/quill.core.css b/src/modules/question/questioncss/quill.core.css
new file mode 100644
index 00000000..516e388b
--- /dev/null
+++ b/src/modules/question/questioncss/quill.core.css
@@ -0,0 +1,18 @@
+.ql-editor .ql-font-Microsoft-YaHei {
+    font-family: "Microsoft YaHei";
+}
+.ql-editor .ql-font-SimSun {
+    font-family: "SimSun";
+}
+.ql-editor .ql-font-SimHei {
+    font-family: "SimHei";
+}
+.ql-editor .ql-font-KaiTi {
+    font-family: "KaiTi";
+}
+.ql-editor .ql-font-Arial {
+    font-family: "Arial";
+}
+.ql-editor .Times-New-Roman {
+    font-family: "Times New Roman";
+}
diff --git a/src/modules/question/questioncss/quill.snow.css b/src/modules/question/questioncss/quill.snow.css
new file mode 100644
index 00000000..962b40f9
--- /dev/null
+++ b/src/modules/question/questioncss/quill.snow.css
@@ -0,0 +1,28 @@
+.ql-snow .ql-picker.ql-font .ql-picker-label::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item::before {
+    content: '微软雅黑';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Microsoft-YaHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Microsoft-YaHei]::before {
+    content: "微软雅黑";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimSun]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimSun]::before {
+    content: "宋体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimHei]::before {
+    content: "黑体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=KaiTi]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=KaiTi]::before {
+    content: "楷体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Arial]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Arial]::before {
+    content: "Arial";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Times-New-Roman]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Times-New-Roman]::before {
+    content: "Times New Roman";
+}
diff --git a/src/modules/recruitment/EditResume.js b/src/modules/recruitment/EditResume.js
new file mode 100644
index 00000000..259767e5
--- /dev/null
+++ b/src/modules/recruitment/EditResume.js
@@ -0,0 +1,410 @@
+import React, { Component } from 'react';
+import { SnackbarHOC ,CNotificationHOC} from 'educoder';
+import {Route,Switch} from 'react-router-dom';
+import Loadable from 'react-loadable';
+import Loading from '../../Loading';
+import axios from 'axios';
+import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
+import locale from 'antd/lib/date-picker/locale/zh_CN';
+import Bottomsubmit from "../modals/Bottomsubmit";
+import Educationitem from "./Resume/Educationitem"
+import WorkItem from "./Resume/WorkItem"
+
+
+
+import { Input ,Form,Radio,Upload,DatePicker,Select,Button,Icon} from 'antd';
+
+const Option = Select.Option;
+const RadioGroup=Radio.Group;
+const  TextArea = Input.TextArea;
+class EditResume extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+
+    }
+  }
+
+  componentDidMount=()=>{
+
+  }
+
+
+  submit=()=>{
+    this.props.form.validateFieldsAndScroll((err, values) => {
+      if(!err){
+        console.log(values)
+      }
+    })
+  }
+
+  cancel=()=>{
+    if(this.Educationitem){
+      this.Educationitem.cancel() //调用子组件的dream方法
+    }
+  }
+
+  education=(educationarray)=>{
+    console.log(educationarray)
+  }
+
+  workcancel=()=>{
+    if(this.WorkItem){
+      this.WorkItem.cancel() //调用子组件的dream方法
+    }
+  }
+
+  workeducation=(educationarray)=>{
+    console.log(educationarray)
+  }
+  
+
+  render(){
+    const {getFieldDecorator} = this.props.form;
+    const uploadButton = (
+      <div>
+        <div className="ant-upload-text">上传照片</div>
+      </div>
+    );
+    const formItemLayout = {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 3 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 21 },
+      },
+    };
+    
+    const props = {
+      name: 'file',
+      action: 'https://www.mocky.io/v2/5cc8019d300000980a055e76',
+      headers: {
+        authorization: 'authorization-text',
+      },
+      onChange(info) {
+        if (info.file.status !== 'uploading') {
+          console.log(info.file, info.fileList);
+        }
+        if (info.file.status === 'done') {
+          //message.success(`${info.file.name} file uploaded successfully`);
+        } else if (info.file.status === 'error') {
+          //message.error(`${info.file.name} file upload failed.`);
+        }
+      },
+    };
+    // const formItemLayoutWithOutLabel = {
+    //   wrapperCol: {
+    //     xs: { span: 2, offset: 0 },
+    //     sm: { span: 22, offset: 4 },
+    //   },
+    // };
+    return(
+      <div className="clearfix mt25">
+        <div className="educontent mt10 pb20 w1200s">
+             <Form 
+             {...formItemLayout}
+             className="edu-back-white" style={{padding:20,marginBottom:180}}>
+              <Form.Item style={{display:'flex'}} label="姓名">
+                 {getFieldDecorator('name', {
+                  rules: [{required: true, message: "姓名不能为空"}],
+              })(
+                 <Input placeholder="请输入姓名" onChange={this.handleChange} style={{width:400}}  maxLength={60} />
+              )}
+              </Form.Item>
+              <Form.Item
+                label="性别"
+                style={{display:'flex'}}
+              >
+                {getFieldDecorator('sex', {
+                  rules: [{
+                    required: true,
+                    message: '请选择性别',
+                  }],
+                })(
+                  <RadioGroup>
+                      <Radio value="0" >男</Radio>
+                      <Radio value="1" >女</Radio>
+                  </RadioGroup>
+                )}
+              </Form.Item>
+              <Form.Item
+               label="照片上传"
+               style={{display:'flex'}}
+
+                >
+                <div>
+                  <div>只支持JPG格式,大小不要超过500k</div>
+                  <Upload
+                  action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
+                  listType="picture-card"
+                  style={{display:'flex'}}
+                  onPreview={this.handlePreview}
+                  onChange={this.handleChange}
+                >
+                  {uploadButton}
+                </Upload>
+                </div>
+              </Form.Item>  
+
+              <Form.Item
+                label="出生日期"
+                style={{display:'flex'}}
+              >
+                {getFieldDecorator('birth_on', {
+                  rules: [{
+                    required: true,
+                    message: '请选择出生日期',
+                  }],
+                })(
+                    <DatePicker
+                      showToday={false}
+                      placeholder="请选择出生日期"
+                      // showTime={{format: 'HH:mm'}}
+                      locale={locale}
+                      onChange={this.onChangeTimepublishs}
+                    />
+                )}
+              </Form.Item>
+              <Form.Item style={{display:'flex'}} label="手机号">
+                 {getFieldDecorator('mobile', {
+                  rules: [{required: true, message: "不能为空"}],
+              })(
+                 <Input placeholder="请输入手机号" style={{width:400}} onChange={this.handleChange}  maxLength={60} />
+              )}
+              </Form.Item>
+              <Form.Item style={{display:'flex'}} label="求职意向">
+                 {getFieldDecorator('job_position', {
+                  rules: [{required: true, message: "请选择期望职位"}],
+              })(
+                <Select style={{ width: 400 }} onChange={this.handleChange}>
+                  <Option value="jack">请选择期望职位</Option>
+                </Select>
+              )}
+              </Form.Item>
+              <Form.Item style={{display:'flex'}} label="工作城市">
+                 {getFieldDecorator('city', {
+                  rules: [{required: true, message: "请选择期望工作城市"}],
+              })(
+                <Select  style={{ width: 400 }} onChange={this.handleChange}>
+                  <Option value="jack">请选择期望工作城市</Option>
+                </Select>
+              )}
+              </Form.Item>
+              <Form.Item style={{display:'flex'}} label="期望薪资">
+                 {getFieldDecorator('salary', {
+                  rules: [{required: true, message: "请选择期望薪资"}],
+              })(
+                <Select style={{ width: 400 }} onChange={this.handleChange}>
+                  <Option value="lucy">请选择期望薪资</Option>
+                </Select>
+              )}
+              </Form.Item>
+
+              <Form.Item style={{display:'flex'}} label="工作性质">
+                 {getFieldDecorator('job_category', {
+                  rules: [{required: true}],
+              })(
+                <RadioGroup>
+                <Radio value="0" >全职</Radio>
+                <Radio value="1" >兼职</Radio>
+                <Radio value="2" >实习</Radio>
+
+            </RadioGroup>
+              )}
+            </Form.Item>
+            <Form.Item
+              label='教育经历'
+              style={{ marginBottom: 0 }}
+            >
+              <div  style={{ display: 'inline-block', width: 'calc(100%)' }}>
+          <Form.Item
+            style={{ display: 'inline-block', width: 'calc(20% - 12px)' }}
+          >
+            {getFieldDecorator('edu_bg', {
+                  rules: [{required: true, message: "学历不能为空"}],
+              })(
+                 <Input placeholder="请输入学历" style={{width:180}} onChange={this.handleChange}  maxLength={60} />
+              )}              
+         
+          </Form.Item>
+          <Form.Item 
+          style={{ display: 'inline-block', width: 'calc(20% - 12px)' }}>
+               {getFieldDecorator('edu_category', {
+                  rules: [{required: true, message: "学历类型不能为空"}],
+              })(
+                 <Input placeholder="请输入学历类型" style={{width:180}} onChange={this.handleChange}  maxLength={60} />
+              )}     
+          </Form.Item>
+        </div>
+            <Form.Item
+                style={{ display: 'inline-block', width: 'calc(20% - 12px)' }}
+              >
+                {getFieldDecorator('begin_on', {
+                  rules: [{
+                    required: true,
+                    message: '请选择开始日期',
+                  }],
+                })(
+                    <DatePicker
+                      showToday={false}
+                      placeholder="请选择开始日期"
+                      // showTime={{format: 'HH:mm'}}
+                        style={{width:180}}
+                      locale={locale}
+                      onChange={this.onChangeTimepublishs}
+                    />
+                )}
+            </Form.Item>
+         
+            <Form.Item
+                style={{ display: 'inline-block', width: 'calc(20% - 12px)' }}
+              >
+                {getFieldDecorator('end_on', {
+                  rules: [{
+                    required: true,
+                    message: '请选择结束日期',
+                  }],
+                })(
+                    <DatePicker
+                      showToday={false}
+                      placeholder="请选择结束日期"
+                      // showTime={{format: 'HH:mm'}}
+                        style={{width:180}}
+                      locale={locale}
+                      onChange={this.onChangeTimepublishs}
+                    />
+                )}
+            </Form.Item>
+
+            <Form.Item>
+            {getFieldDecorator(`school`, {
+              validateTrigger: ['onChange', 'onBlur'],
+              rules: [
+                {
+                  required: true, message: "不能为空"
+                },
+              ],
+            })(<Input placeholder="请输入学校名称" style={{ width:'60%',marginRight:8 }} />)}
+            </Form.Item> 
+              <Educationitem  {...this.props} {...this.state} education={this.education} onRef={c=>this.Educationitem=c}/>
+                <Button type="dashed" onClick={this.cancel} style={{ width: '30%' }}>
+                  添加教育经历
+                </Button>
+              </Form.Item>
+             
+              <Form.Item
+                label='工作/实习经历'
+                style={{ marginBottom: 0 }}
+              >
+              <Form.Item
+                  style={{ display: 'inline-block', width: 'calc(20% - 12px)' }}
+                >
+                  {getFieldDecorator('begin_on', {
+                    rules: [{
+                      required: true,
+                      message: '请选择开始日期',
+                    }],
+                  })(
+                      <DatePicker
+                        showToday={false}
+                        placeholder="请选择开始日期"
+                        // showTime={{format: 'HH:mm'}}
+                          style={{width:180}}
+                        locale={locale}
+                        onChange={this.onChangeTimepublishs}
+                      />
+                  )}
+              </Form.Item>
+          
+              <Form.Item
+                  style={{ display: 'inline-block', width: 'calc(20% - 12px)' }}
+                >
+                  {getFieldDecorator('end_on', {
+                    rules: [{
+                      required: true,
+                      message: '请选择结束日期',
+                    }],
+                  })(
+                      <DatePicker
+                        showToday={false}
+                        placeholder="请选择结束日期"
+                        // showTime={{format: 'HH:mm'}}
+                          style={{width:180}}
+                        locale={locale}
+                        onChange={this.onChangeTimepublishs}
+                      />
+                  )}
+              </Form.Item>
+
+              <Form.Item>
+              {getFieldDecorator(`school`, {
+                validateTrigger: ['onChange', 'onBlur'],
+                rules: [
+                  {
+                    required: true, message: "不能为空"
+                  },
+                ],
+              })(<Input placeholder="请输入公司名称" style={{ width:'60%',marginRight:8 }} />)}
+              </Form.Item> 
+
+              <Form.Item>
+              {getFieldDecorator(`des`, {
+                validateTrigger: ['onChange', 'onBlur'],
+                rules: [
+                  {
+                    required: true, message: "不能为空"
+                  },
+                ],
+              })(<TextArea placeholder="请输入公司描述" rows={4} style={{ width:'60%',marginRight:8 }} />)}
+              </Form.Item> 
+                <WorkItem  {...this.props} {...this.state} workeducation={this.workeducation} onRef={c=>this.WorkItem=c}/>
+
+                {/* <WorkItem  {...this.props} {...this.state} workeducation={this.workeducation} onRef={c=>this.WorkItem=c}/> */}
+              
+                <Button type="dashed" onClick={this.workcancel} style={{ width: '30%' }}>
+                  添加工作经历
+                </Button> 
+                </Form.Item>
+                <Form.Item
+                label='自我评价'
+                >
+                {getFieldDecorator(`school`, {
+                  validateTrigger: ['onChange', 'onBlur'],
+                  rules: [
+                    {
+              
+                    },
+                  ],
+                })(<TextArea   rows={4} placeholder="请输入自我评价" style={{ width:'60%',marginRight:8 }} />)}
+                </Form.Item> 
+
+                <Form.Item
+               label="简历上传"
+               style={{display:'flex'}}
+
+                >
+                <div>
+                  <div>（上传简历可以提高应聘成功率）</div>
+                  <Upload {...props} className="upload_1 upload_under_markdown_editor">
+                  <Button className="uploadBtn">
+                    <Icon type="upload" /> 上传简历
+                  </Button>
+                  <span style={{color:'#E77234',}}>(提示：不超过10MB，扩展名为pdf、doc、docx、ppt、pptx、png、jpg、jpeg)</span>
+                </Upload>
+                </div>
+              </Form.Item>  
+
+            </Form>
+        </div>
+        <Bottomsubmit {...this.props} {...this.state} bottomvalue={"确定"}
+											Cohetepaperbool={true}
+											setCohetepaperbool={() => this.props.setnewmyshixunmodelbool(false)}
+											onSubmits={() => this.props.setnewmyshixunmodelbool(false)} url={'/paperlibrary'}></Bottomsubmit>
+    </div>
+    )
+  }
+}
+const EditResumeForm = Form.create({ name: 'EditResumeForm' })(EditResume);
+export default CNotificationHOC() (SnackbarHOC() ( TPMIndexHOC(EditResumeForm) )) ;
\ No newline at end of file
diff --git a/src/modules/recruitment/Resume/EduExperienceItem.js b/src/modules/recruitment/Resume/EduExperienceItem.js
new file mode 100644
index 00000000..b6821130
--- /dev/null
+++ b/src/modules/recruitment/Resume/EduExperienceItem.js
@@ -0,0 +1,52 @@
+import React, { Component } from "react";
+import { Tabs, Divider } from "antd";
+const dateSplit = (date) => {
+  if (!date) {
+    return "";
+  } else {
+    const dateArr = date.split("-");
+    return `${dateArr[0]}.${dateArr[1]}`;
+  }
+};
+class EduExperienceItem extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {};
+  }
+
+  render() {
+    const {
+      edu_bg,
+      edu_category,
+      begin_on,
+      end_on,
+      school,
+      major,
+    } = this.props.data;
+    return (
+      <div className="clearfix mt25">
+        <div style={{ background: "#ffffff" }}>
+          <div style={{ display: "flex" }}>
+            <p style={{ color: "#888888", width: "15%" }}>
+              {dateSplit(begin_on)}——{dateSplit(end_on)}
+            </p>
+            <p style={{ color: "#333333", marginLeft: 120, width: "10%" }}>
+              {school}
+            </p>
+            <p style={{ color: "#333333", marginLeft: 120, width: "10%" }}>
+              {major}
+            </p>
+            <p style={{ color: "#333333", marginLeft: 120, width: "10%" }}>
+              {edu_bg}
+            </p>
+            <p style={{ color: "#333333", marginLeft: 120, width: "10%" }}>
+              {edu_category}
+            </p>
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default EduExperienceItem;
diff --git a/src/modules/recruitment/Resume/Educationitem.js b/src/modules/recruitment/Resume/Educationitem.js
new file mode 100644
index 00000000..e447ee54
--- /dev/null
+++ b/src/modules/recruitment/Resume/Educationitem.js
@@ -0,0 +1,173 @@
+import React , { Component } from 'react';
+import { Link } from 'react-router-dom';
+import { Form,Input,Icon,DatePicker,Button} from 'antd'
+import locale from 'antd/lib/date-picker/locale/zh_CN';
+class Educationitem extends Component{
+    
+  constructor(props){
+    super(props);
+    this.state={
+      //显示 隐藏
+      isdisplay:false,
+      orderid:'',
+    }
+    if(props.onRef){//如果父组件传来该方法 则调用方法将子组件this指针传过去
+        props.onRef(this)
+      }  
+  }
+
+  education=(educationarray)=>{ 
+    this.props.education(educationarray);
+  }
+
+  cancel=()=>{
+    //隐藏列表
+    const isdisplay=this.state.isdisplay;
+    this.setState({
+        isdisplay:!isdisplay   
+    }) 
+  }
+
+  CreateFormManFun=()=>{
+ 
+    // 创建Form表单
+ 
+    const CreateFormMan = Form.create()(props => {
+ 
+         const { dispatch,form} = props;
+ 
+         const { getFieldDecorator } = form;
+
+         const formItemLayout = {
+            labelCol: {
+              xs: { span: 24 },
+              sm: { span: 0 },
+            },
+            wrapperCol: {
+              xs: { span: 24 },
+              sm: { span: 24 },
+            },
+          };
+ 
+         // 提交事件
+ 
+         const searchMan = () => {
+ 
+               const {dispatch}=this.props;
+ 
+               form.validateFields((err, fieldsValue) => {
+ 
+                   if (err) return;
+                   this.education(fieldsValue);
+                   //console.log(values)
+                //    const values = {...};
+ 
+             })
+ 
+     };
+ 
+     return (
+        <div>
+       <Form.Item
+        {...formItemLayout}
+        label={'教育经历'}
+      >
+        <div  style={{ display: 'inline-block', width: 'calc(100%)' }}>
+          <Form.Item
+            style={{ display: 'inline-block', width: 'calc(20% - 12px)' }}
+          >
+            {getFieldDecorator('edu_bg', {
+                  rules: [{required: true, message: "学历不能为空"}],
+              })(
+                 <Input placeholder="请输入学历" style={{width:180}} onChange={this.handleChange}  maxLength={60} />
+              )}              
+         
+          </Form.Item>
+          <Form.Item 
+          style={{ display: 'inline-block', width: 'calc(20% - 12px)' }}>
+               {getFieldDecorator('edu_category', {
+                  rules: [{required: true, message: "学历类型不能为空"}],
+              })(
+                 <Input placeholder="请输入学历类型" style={{width:180}} onChange={this.handleChange}  maxLength={60} />
+              )}     
+          </Form.Item>
+        </div>
+            <Form.Item
+                style={{ display: 'inline-block', width: 'calc(20% - 12px)' }}
+              >
+                {getFieldDecorator('begin_on', {
+                  rules: [{
+                    required: true,
+                    message: '请选择开始日期',
+                  }],
+                })(
+                    <DatePicker
+                      showToday={false}
+                      placeholder="请选择开始日期"
+                      // showTime={{format: 'HH:mm'}}
+                        style={{width:180}}
+                      locale={locale}
+                      onChange={this.onChangeTimepublishs}
+                    />
+                )}
+            </Form.Item>
+         
+            <Form.Item
+                style={{ display: 'inline-block', width: 'calc(20% - 12px)' }}
+              >
+                {getFieldDecorator('end_on', {
+                  rules: [{
+                    required: true,
+                    message: '请选择结束日期',
+                  }],
+                })(
+                    <DatePicker
+                      showToday={false}
+                      placeholder="请选择结束日期"
+                      // showTime={{format: 'HH:mm'}}
+                        style={{width:180}}
+                      locale={locale}
+                      onChange={this.onChangeTimepublishs}
+                    />
+                )}
+            </Form.Item>
+
+            <Form.Item>
+            {getFieldDecorator(`school`, {
+              validateTrigger: ['onChange', 'onBlur'],
+              rules: [
+                {
+                  required: true, message: "不能为空"
+                },
+              ],
+            })(<Input placeholder="请输入学校名称" style={{ width:'60%',marginRight:8 }} />)}
+            </Form.Item> 
+            <div style={{width:'100%',margin:'auto',marginLeft:200}}>
+                <Button type="primary" onClick={searchMan} >
+                    保存
+                </Button>
+                <Button type="danger" style={{marginLeft:15}} onClick={this.cancel}>
+                    取消
+                </Button>
+            </div>
+        </Form.Item>
+       
+    
+      </div>
+        );
+ 
+});
+ 
+return <CreateFormMan />
+ 
+}
+
+  render(){
+    return(
+        <div style={{display:this.state.isdisplay?'':'none'}}>
+             {this.CreateFormManFun()}
+        </div>
+    )
+  }
+}
+export default Educationitem;
\ No newline at end of file
diff --git a/src/modules/recruitment/Resume/ResumeDetails.js b/src/modules/recruitment/Resume/ResumeDetails.js
new file mode 100644
index 00000000..ddf72fdf
--- /dev/null
+++ b/src/modules/recruitment/Resume/ResumeDetails.js
@@ -0,0 +1,426 @@
+import React, { Component } from "react";
+import { Divider, Button, Modal, message } from "antd";
+import EduExperienceItem from "./EduExperienceItem";
+import WorkExperience from "./WorkExperience";
+import axios from "axios";
+import { getImageUrl, getUploadActionUrl } from "educoder";
+import qs from "qs";
+import { Link } from "react-router-dom";
+import Nav from "../util/Nav";
+class ResumeDetails extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      resumeData: {
+        name: "",
+        sex: "",
+        user_name: "",
+        logo_url: "",
+        mobile: "",
+        age: 0,
+        last_edu_1: "",
+        last_edu_2: "",
+        job_position: [],
+        job_city: [],
+        city: [],
+        salary: "",
+        job_category: "",
+        education: [],
+        experience: [],
+        evaluate: "",
+        attachment_url: "",
+        attachment_name: "",
+        work_year: "",
+      },
+      modalVisible: false,
+    };
+  }
+  componentDidMount() {
+    const { user } = this.props;
+    if (user && !user.profile_completed) {
+      this.setState({
+        modalVisible: true,
+        okText: "立即完善",
+        modalContent: "您需要去完善您的个人资料，才能使用此功能",
+        onOk: () => {
+          this.props.history.push("/account/profile/edit");
+        },
+        // cancelText: "稍后完善",
+        // onCancel:()=>{
+        //   this.props.history.push("/");
+        // }
+      });
+    } else {
+      this.fetchResumeDetail();
+    }
+  }
+  fetchResumeDetail = () => {
+    let url;
+    const { id } = qs.parse(this.props.location.search.substr(1));
+    // 带ID的为招聘者查看求职者详情，请求不同的接口，不带id的直接请求用户的简历详情
+    if (id) {
+      url = `/resumes/${id}/preview.json`;
+    } else {
+      url = `/users/resume.json`;
+    }
+    axios
+      .get(url)
+      .then((response) => {
+        if (response.data.status === -2) {
+          this.setState({
+            modalVisible: true,
+            okText: "创建简历",
+            modalContent: "暂无简历，请新建简历",
+            onOk: () => {
+              this.props.history.push("/recruitment/addresume");
+            },
+            cancelText: "取消",
+            onCancel:()=>{
+              this.props.history.push("/");
+            }
+          });
+          // Modal.info({
+        } else {
+          if (url === `/users/resume.json`) {
+            this.setState({
+              resumeData: response.data,
+            });
+          } else {
+            this.setState({
+              resumeData: response.data.user,
+            });
+          }
+        }
+      })
+      .catch((error) => {
+        console.log(error);
+      });
+  };
+  updateResume = (attachmentId) => {
+    const url = "/users/update_resume.json";
+    const data = {
+      attachment_id: attachmentId,
+    };
+    axios
+      .put(url, data)
+      .then((response) => {
+        console.log(response);
+        if (response.status === 200) {
+          this.fetchResumeDetail();
+        }
+      })
+      .catch((error) => {
+        console.log(error);
+      });
+  };
+  render() {
+    //发布职位权限 跟招聘列表的一样
+    let authJobs = false;
+    if (this.props.user) {
+      const { admin, business, is_teacher, identity } = this.props.user;
+      authJobs = admin || business || is_teacher || identity === "professional";
+    }
+    const search = this.props.location.search.substr(1);
+    const { id, from } = qs.parse(search);
+    //有权限且是跳转过来查看详情的，hasAuth=true ，展示查看简历按钮和职位名称
+    this.hasAuth = authJobs && id;
+    const { resumeData } = this.state;
+    const {
+      name,
+      sex,
+      user_name,
+      logo_url,
+      age,
+      mobile,
+      last_edu_1,
+      last_edu_2,
+      job_position,
+      job_city,
+      city,
+      salary,
+      job_category,
+      education,
+      experience,
+      evaluate,
+      attachment_name,
+      attachment_url,
+      work_year,
+    } = resumeData;
+    const props = {
+      accept: ".pdf,.doc,.docx,.ppt,.pptx,.png,.jpg,.jpeg",
+      name: "file",
+      action: `${getUploadActionUrl()}`,
+      headers: {
+        authorization: "authorization-text",
+      },
+      onChange: (info) => {
+        if (info.file.status !== "uploading") {
+          console.log(info.file, info.fileList);
+        }
+        if (info.file.status === "done") {
+          message.success("上传成功");
+          const { id } = info.file.response;
+          this.updateResume(id);
+        } else if (info.file.status === "error") {
+          //message.error(`${info.file.name} file upload failed.`);
+        }
+      },
+      beforeUpload: (file) => {
+        const isLt10M = file.size / 1024 / 1024 < 10;
+        if (!isLt10M) {
+          message.error("简历大小超过10MB!");
+        }
+        return isLt10M;
+      },
+    };
+    const myNav = (
+      <Nav
+        breadcrunmb={[<Link to="/recruitment">求职招聘</Link>, "我的简历"]}
+        history={this.props.history}
+        back={() => this.props.history.goBack()}
+      />
+    );
+    return (
+      <div className="clearfix mt25" style={{ marginBottom: 120 }}>
+        {this.hasAuth && (
+          <div>
+            <Nav
+              breadcrunmb={[
+                <Link to="/recruitment?tab=1">职位管理</Link>,
+                <Link
+                  to="/"
+                  onClick={() => {
+                    this.props.history.goBack();
+                  }}
+                >
+                  投递列表
+                </Link>,
+                "投递者详情",
+              ]}
+              history={this.props.history}
+              back={() => this.props.history.goBack()}
+            />
+            <div
+              className="educontent mt10 pb20 w1200s"
+              style={{ background: "#ffffff", padding: 30 }}
+            >
+              职位名称：{name}
+            </div>
+          </div>
+        )}
+        {from && myNav}
+        <div
+          className="educontent pb20 w1200s"
+          style={{ background: "#ffffff", padding: 30, marginTop: 1 }}
+        >
+          <div className="clearfix color-white">
+            {/* src={data && `${getImageUrl('images/'+data.avatar_url)}`} */}
+            <p className="myPhoto mr20 fl">
+              <img
+                alt="头像"
+                src={getImageUrl(logo_url)}
+                style={{ width: 110, height: 110, borderRadius: "50%" }}
+              />
+            </p>
+            <div className="fl">
+              <p className="clearfix mt20">
+                {/* {data && data.name} */}
+                <span
+                  className="task-hide"
+                  style={{ maxWidth: "370px", color: "#000000", fontSize: 20 }}
+                >
+                  {name || user_name}
+                </span>
+                <span
+                  className="task-hide ml30"
+                  style={{ maxWidth: "370px", color: "#000000" }}
+                >
+                  {mobile}
+                </span>
+                {/*{*/}
+                {/*data && is_current == false && data.identity =="学生" ? "" : */}
+                {/*<span className="userpost"><label>{data && data.identity}</label></span>*/}
+                {/*}*/}
+              </p>
+              <div
+                className="mt20"
+                style={{ display: "flex", color: "#888888" }}
+              >
+                <div className="mr5">{sex}</div>|
+                <div className="ml5 mr5">{age}岁</div>|
+                <div className="ml5 mr5">{last_edu_1}</div>
+                <div className="ml5 mr5">
+                  {work_year ? `| ${work_year}年工作经验` : ""}
+                </div>
+              </div>
+            </div>
+            <div className="fr">
+              <span className="fl mt35 ml60">
+                {this.hasAuth ? (
+                  <div>
+                    <Button
+                      style={{
+                        backgroundColor: "#4CADFF",
+                        color: "#ffffff",
+                        display: attachment_url ? "block" : "none",
+                      }}
+                      size="large"
+                      href={attachment_url}
+                      target="_blank"
+                    >
+                      下载附件简历
+                    </Button>
+                    <div
+                      onMouseOver={() => this.setState({ mouseover: true })}
+                      onMouseLeave={() => this.setState({ mouseover: false })}
+                      style={{
+                        display: !attachment_url ? "inline-block" : "none",
+                        marginRight: 30,
+                        color: this.state.mouseover ? "#a5a5a5" : null,
+                        cursor: "default",
+                      }}
+                    >
+                      求职者未上传简历
+                    </div>
+                  </div>
+                ) : (
+                  <Link
+                    style={{ color: "#4CADFF", marginRight: 30 }}
+                    to="/recruitment/editresume"
+                  >
+                    <i
+                      className="iconfont icon-bianji3  mr5"
+                      style={{ color: "#4CACFF" }}
+                    ></i>
+                    编辑
+                  </Link>
+                )}
+              </span>
+            </div>
+          </div>
+        </div>
+        <div
+          className="educontent mt10 pb20 w1200s"
+          style={{ background: "#ffffff", padding: 30 }}
+        >
+          <div style={{ fontSize: 16, fontWeight: "700", color: "#333333" }}>
+            求职意向
+          </div>
+          <div style={{ display: "flex", marginTop: 30 }}>
+            <p style={{ color: "#888888" }}>期望职位：</p>
+            <p style={{ color: "#333333", width: 300 }}>
+              {job_position ? job_position.join("、") : ""}
+            </p>
+            <p style={{ color: "#888888", marginLeft: 120 }}>工作城市：</p>
+            <p style={{ color: "#333333" }}>
+              {job_city ? job_city.join("、") : city ? city.join("、") : ""}
+            </p>
+          </div>
+          <div style={{ display: "flex", marginTop: 15 }}>
+            <p style={{ color: "#888888" }}>薪资要求：</p>
+            <p style={{ color: "#333333", width: 300 }}>{salary}</p>
+            <p style={{ color: "#888888", marginLeft: 120 }}>工作性质：</p>
+            <p style={{ color: "#333333" }}>
+              {job_category ? job_category.join("、") : ""}
+            </p>
+          </div>
+          <Divider />
+          <div style={{ fontSize: 16, fontWeight: "700", color: "#333333" }}>
+            教育经历
+          </div>
+          {education.map((item, index) => (
+            <EduExperienceItem
+              {...this.props}
+              data={item}
+              key={item.begin_on + item.end_on + index}
+            />
+          ))}
+          <Divider />
+          <div style={{ fontSize: 16, fontWeight: "700", color: "#333333" }}>
+            工作经历
+          </div>
+          {experience.map((item, index) => (
+            <WorkExperience
+              {...this.props}
+              data={item}
+              key={item.begin_on + item.end_on + index}
+            />
+          ))}
+          <Divider />
+          <div style={{ fontSize: 16, fontWeight: "700", color: "#333333" }}>
+            自我评价
+          </div>
+          <div
+            className="mt25 mb25"
+            style={{ whiteSpace: "pre-wrap", lineHeight: "2" }}
+          >
+            {evaluate}
+          </div>
+          {!this.hasAuth && (
+            <div>
+              <Divider />
+              <div
+                style={{
+                  width: "100%",
+                  fontSize: 16,
+                  fontWeight: "700",
+                  color: "#333333",
+                }}
+              >
+                附件简历
+              </div>
+              <div className="mt25">
+                {attachment_name ? (
+                  <a href={attachment_url} target="_blank" style={{ color: "#4CACFF" }}>
+                    <i
+                      className="iconfont icon-lianjie"
+                      style={{ fontSize: 12, marginRight: 5 }}
+                    ></i>
+                    {attachment_name}
+                  </a>
+                ) : (
+                  "暂无"
+                )}
+              </div>
+            </div>
+          )}
+        </div>
+        <Modal
+          keyboard={false}
+          title="提示"
+          visible={this.state.modalVisible}
+          closable={false}
+          footer={null}
+          destroyOnClose={true}
+          centered={true}
+          width="530px"
+        >
+          <div className="task-popup-content">
+            <p className="task-popup-text-center font-16">
+              {this.state.modalContent}
+            </p>
+            <div className="clearfix mt30 edu-txt-center">
+             
+                <a
+                  className="task-btn mr30"
+                  onClick={this.state.onCancel}
+                  style={{display:this.state.cancelText?'inline-block':'none'}}
+                >
+                  { this.state.cancelText}
+                </a>
+              
+              <a
+                className="task-btn task-btn-orange"
+                onClick={this.state.onOk}
+              >
+                {this.state.okText}
+              </a>
+            </div>
+          </div>
+        </Modal>
+      </div>
+    );
+  }
+}
+
+export default ResumeDetails;
diff --git a/src/modules/recruitment/Resume/WorkExperience.js b/src/modules/recruitment/Resume/WorkExperience.js
new file mode 100644
index 00000000..f1f7e7cf
--- /dev/null
+++ b/src/modules/recruitment/Resume/WorkExperience.js
@@ -0,0 +1,49 @@
+import React, { Component } from "react";
+import { Tabs, Divider } from "antd";
+const dateSplit = (date) => {
+  if (!date) {
+    return "";
+  } else {
+    const dateArr = date.split("-");
+    return `${dateArr[0]}.${dateArr[1]}`;
+  }
+};
+class WorkExperience extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {};
+  }
+  render() {
+    const { company, begin_on, end_on, desc } = this.props.data;
+    return (
+      <div className="clearfix mt25">
+        <div style={{ background: "#ffffff" }}>
+          <div style={{ display: "flex" }}>
+            <p style={{ color: "#888888" }}>
+              {dateSplit(begin_on)}——{dateSplit(end_on)}
+            </p>
+            <p style={{ color: "#333333", marginLeft: 120, fontWeight: "700" }}>
+              {company}
+            </p>
+          </div>
+
+          <div style={{ display: "flex", marginTop: 30 }}>
+            <p style={{ color: "#888888" }}>工作描述：</p>
+          </div>
+          <div
+            style={{
+              color: "#333333",
+              marginTop: 15,
+              whiteSpace: "pre-wrap",
+              lineHeight: "2",
+            }}
+          >
+            {desc}
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default WorkExperience;
diff --git a/src/modules/recruitment/Resume/WorkItem.js b/src/modules/recruitment/Resume/WorkItem.js
new file mode 100644
index 00000000..b0732786
--- /dev/null
+++ b/src/modules/recruitment/Resume/WorkItem.js
@@ -0,0 +1,164 @@
+import React , { Component } from 'react';
+import { Link } from 'react-router-dom';
+import { Form,Input,Icon,DatePicker,Button} from 'antd'
+import locale from 'antd/lib/date-picker/locale/zh_CN';
+const  TextArea = Input.TextArea;
+class WorkItem extends Component{
+    
+  constructor(props){
+    super(props);
+    this.state={
+      //显示 隐藏
+      isdisplay:false,
+      orderid:'',
+    }
+    if(props.onRef){//如果父组件传来该方法 则调用方法将子组件this指针传过去
+        props.onRef(this)
+      }  
+  }
+
+  workeducation=(educationarray)=>{ 
+    this.props.workeducation(educationarray);
+  }
+
+  cancel=()=>{
+    //隐藏列表
+    const isdisplay=this.state.isdisplay;
+    this.setState({
+        isdisplay:!isdisplay   
+    }) 
+  }
+
+  CreateFormManFun=()=>{
+ 
+    // 创建Form表单
+ 
+    const CreateFormMan = Form.create()(props => {
+ 
+         const { dispatch,form} = props;
+ 
+         const { getFieldDecorator } = form;
+
+         const formItemLayout = {
+            labelCol: {
+              xs: { span: 24 },
+              sm: { span: 0 },
+            },
+            wrapperCol: {
+              xs: { span: 24 },
+              sm: { span: 24 },
+            },
+          };
+ 
+         // 提交事件
+ 
+         const searchMan = () => {
+ 
+               const {dispatch}=this.props;
+ 
+               form.validateFields((err, fieldsValue) => {
+ 
+                   if (err) return;
+                   this.workeducation(fieldsValue);
+                   //console.log(values)
+                //    const values = {...};
+ 
+             })
+ 
+     };
+ 
+     return (
+        <div>
+       <Form.Item
+        {...formItemLayout}
+      >
+        <Form.Item
+                  style={{ display: 'inline-block', width: 'calc(20% - 12px)' }}
+                >
+                  {getFieldDecorator('begin_on', {
+                    rules: [{
+                      required: true,
+                      message: '请选择开始日期',
+                    }],
+                  })(
+                      <DatePicker
+                        showToday={false}
+                        placeholder="请选择开始日期"
+                        // showTime={{format: 'HH:mm'}}
+                          style={{width:180}}
+                        locale={locale}
+                        onChange={this.onChangeTimepublishs}
+                      />
+                  )}
+              </Form.Item>
+          
+              <Form.Item
+                  style={{ display: 'inline-block', width: 'calc(20% - 12px)' }}
+                >
+                  {getFieldDecorator('end_on', {
+                    rules: [{
+                      required: true,
+                      message: '请选择结束日期',
+                    }],
+                  })(
+                      <DatePicker
+                        showToday={false}
+                        placeholder="请选择结束日期"
+                        // showTime={{format: 'HH:mm'}}
+                          style={{width:180}}
+                        locale={locale}
+                        onChange={this.onChangeTimepublishs}
+                      />
+                  )}
+              </Form.Item>
+
+              <Form.Item>
+              {getFieldDecorator(`school`, {
+                validateTrigger: ['onChange', 'onBlur'],
+                rules: [
+                  {
+                    required: true, message: "不能为空"
+                  },
+                ],
+              })(<Input placeholder="请输入公司名称" style={{ width:'60%',marginRight:8 }} />)}
+              </Form.Item> 
+
+              <Form.Item>
+              {getFieldDecorator(`des`, {
+                validateTrigger: ['onChange', 'onBlur'],
+                rules: [
+                  {
+                    required: true, message: "不能为空"
+                  },
+                ],
+              })(<TextArea placeholder="请输入公司描述" rows={4} style={{ width:'60%',marginRight:8 }} />)}
+              </Form.Item> 
+            <div style={{width:'100%',margin:'auto',marginLeft:200}}>
+                <Button type="primary" onClick={searchMan} >
+                    保存
+                </Button>
+                <Button type="danger" style={{marginLeft:15}} onClick={this.cancel}>
+                    取消
+                </Button>
+            </div>
+        </Form.Item>
+       
+    
+      </div>
+        );
+ 
+});
+ 
+return <CreateFormMan />
+ 
+}
+
+  render(){
+    return(
+        <div style={{display:this.state.isdisplay?'':'none'}}>
+             {this.CreateFormManFun()}
+        </div>
+    )
+  }
+}
+export default WorkItem;
\ No newline at end of file
diff --git a/src/modules/recruitment/Route-shoyushen.js b/src/modules/recruitment/Route-shoyushen.js
new file mode 100644
index 00000000..c9ff7555
--- /dev/null
+++ b/src/modules/recruitment/Route-shoyushen.js
@@ -0,0 +1,23 @@
+import { Route, Switch } from 'react-router-dom';
+import React from 'react';
+import ApplierPage from './routePage/ApplierPage';
+import JobDetailPage from './routePage/JobDetailPage';
+import AddJobPage from './routePage/AddJobPage';
+import EditJobPage from './routePage/EditJobPage';
+
+
+const Widget = (props) => {
+    return (<Switch>
+        <Route path="addjob">
+            <AddJobPage {...props} />
+        </Route>
+        <Route path="editjob/:jobid"
+            render={({ match }) => <EditJobPage {...props} jobId={match.params.jobid} />} />
+        <Route path="applier/:jobid"
+            render={({ match }) => <ApplierPage {...props} jobId={match.params.jobid} />} />
+        <Route path="jobdetail/:jobid"
+            render={({ match }) => <JobDetailPage {...props} jobId={match.params.jobid} />} />
+    </Switch>);
+}
+
+export default Widget;
\ No newline at end of file
diff --git a/src/modules/recruitment/Tecruitment.js b/src/modules/recruitment/Tecruitment.js
new file mode 100644
index 00000000..277eacdb
--- /dev/null
+++ b/src/modules/recruitment/Tecruitment.js
@@ -0,0 +1,119 @@
+import React, { Component } from "react";
+import { SnackbarHOC, CNotificationHOC } from "educoder";
+import { Route, Switch } from "react-router-dom";
+import Loadable from "react-loadable";
+import Loading from "../../Loading";
+import { TPMIndexHOC } from "../tpm/TPMIndexHOC";
+
+
+const RecruitList = Loadable({
+  loader: () => import("./tablist/RecruitList"),
+  loading: Loading,
+});
+
+//简历详情
+const ResumeDetails = Loadable({
+  loader: () => import("./Resume/ResumeDetails"),
+  loading: Loading,
+});
+
+const AddJobPage = Loadable({
+  loader: () => import("./routePage/AddJobPage"),
+  loading: Loading,
+});
+const EditJobPage = Loadable({
+  loader: () => import("./routePage/EditJobPage"),
+  loading: Loading,
+});
+const JobDetailPage = Loadable({
+  loader: () => import("./routePage/JobDetailPage"),
+  loading: Loading,
+});
+const ApplierPage = Loadable({
+  loader: () => import("./routePage/ApplierPage"),
+  loading: Loading,
+});
+const AddResumePage = Loadable({
+  loader: () => import("./routePage/AddResumePage"),
+  loading: Loading,
+});
+const EditResumePage = Loadable({
+  loader: () => import("./routePage/EditResumePage"),
+  loading: Loading,
+});
+//test
+const DetailAddResumePage = Loadable({
+  loader: () => import("./routePage/DetailAddResumePage"),
+  loading: Loading,
+});
+class Tecruitment extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {};
+  }
+
+  render() {
+    return (
+      <div>
+        <Switch {...this.props}>
+          {/* 简历详情*  ResumeDetails*/}
+          <Route
+            path={"/recruitment/resumedetails"}
+            render={(props) => {
+              return (
+                <ResumeDetails {...this.props} {...props} {...this.state} />
+              );
+            }}
+          ></Route>
+          {/* 新增职位 */}
+          <Route path="/recruitment/addjob">
+            <AddJobPage {...this.props} />
+          </Route>
+          {/* 编辑职位 */}
+          <Route
+            path="/recruitment/editjob/:jobid"
+            render={({ match }) => (
+              <EditJobPage {...this.props} jobId={match.params.jobid} />
+            )}
+          />
+          {/* 职位详情 */}
+          <Route
+            path="/recruitment/jobdetail/addresume/:jobid"
+            render={({ match }) => (
+              <DetailAddResumePage {...this.props} jobId={match.params.jobid} />
+            )}
+          />
+          <Route
+            path="/recruitment/jobdetail/:jobid"
+            render={({ match }) => (
+              <JobDetailPage {...this.props} jobId={match.params.jobid} />
+            )}
+          />
+
+          {/* 应聘者列表 */}
+          <Route
+            path="/recruitment/applier/:jobid"
+            render={({ match }) => (
+              <ApplierPage {...this.props} jobId={match.params.jobid} />
+            )}
+          />
+          <Route path="/recruitment/addresume" >
+            <AddResumePage {...this.props}/>
+          </Route>
+          <Route path="/recruitment/editresume" >
+            <EditResumePage {...this.props}/>
+          </Route>
+          {/*招聘链接*/}
+          <Route
+            path="/recruitment"
+            render={(props) => (
+              <RecruitList {...this.props} {...props} {...this.state} />
+            )}
+          ></Route>
+        </Switch>
+      </div>
+    );
+  }
+}
+
+export default CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Tecruitment)));
diff --git a/src/modules/recruitment/data/genUuid.js b/src/modules/recruitment/data/genUuid.js
new file mode 100644
index 00000000..d4379f72
--- /dev/null
+++ b/src/modules/recruitment/data/genUuid.js
@@ -0,0 +1,13 @@
+export function genUuid() {  
+    var s = [];  
+    var hexDigits = "0123456789abcdef";  
+    for (var i = 0; i < 36; i++) {  
+        s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);  
+    }  
+    s[14] = "4";  // bits 12-15 of the time_hi_and_version field to 0010  
+    s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);  // bits 6-7 of the clock_seq_hi_and_reserved to 01  
+    s[8] = s[13] = s[18] = s[23] = "-";  
+    
+    var uuid = s.join("");  
+    return uuid;  
+}  
\ No newline at end of file
diff --git a/src/modules/recruitment/data/getAppliers.js b/src/modules/recruitment/data/getAppliers.js
new file mode 100644
index 00000000..777d0f1f
--- /dev/null
+++ b/src/modules/recruitment/data/getAppliers.js
@@ -0,0 +1,51 @@
+import axios from "axios";
+
+function transf(json, history) {
+  return {
+    id: json.id,
+    name: json.user_name,
+    job: json.job_name,
+    sex: json.sex,
+    age: json.age,
+    exp: json.work_year,
+    edu_1: json.last_edu_1,
+    edu_2: json.last_edu_2,
+    dlFunc: json.attachment_url
+      ? () => {
+          window.open(json.attachment_url);
+        }
+      : null,
+    time: json.created_at,
+    pfFunc: () => {
+      history.push(`/recruitment/resumedetails?id=${json.id}`);
+    },
+  };
+}
+
+export async function getAppliers(jobID, page, history) {
+  const res = await axios.get(`/jobs/${jobID}/applyed_users.json`, {
+    params: {
+      page,
+      per_page: 10,
+    },
+  });
+  return [res.data.data.map((json) => transf(json, history)),res.data.count];
+}
+
+const applier = {
+  id: 1,
+  name: "张三",
+  job: "开发",
+  sex: "男",
+  age: 20,
+  exp: "1",
+  edu_1: "硕士",
+  edu_2: "统招全日制",
+  dlFunc: () => {
+    window.open("/api/attachments/392664");
+  },
+  time: "2020-01-10",
+  pfFunc: () => {},
+};
+
+export const mock = [applier, applier, applier, applier, applier, applier];
diff --git a/src/modules/recruitment/data/getCurrCity.js b/src/modules/recruitment/data/getCurrCity.js
new file mode 100644
index 00000000..61b374bb
--- /dev/null
+++ b/src/modules/recruitment/data/getCurrCity.js
@@ -0,0 +1,26 @@
+export const getCurrCity = () => {
+  return new Promise((resolve, reject) => {
+    let script = document.createElement("script");
+    const url = `https://apis.map.qq.com/tools/geolocation/min?key=RPZBZ-CJE3D-YN24W-POI53-IAHPE-5HBB4&referer=educoder`;
+    script.id = url;
+    script.src = url;
+    script.onload = script.onreadystatechange = () => {
+      if (
+        !script.readyState || //这是FF的判断语句，因为ff下没有readyState这个值，IE的readyState肯定有值
+        script.readyState === "loaded" ||
+        script.readyState === "complete" // 这是IE的判断语句
+      ) {
+        const geolocation = new window.qq.maps.Geolocation();
+        geolocation.getIpLocation(
+          (position) => {
+            resolve(position.city.replace("市",""));
+          },
+          (err) => {
+            reject("fail");
+          }
+        );
+      }
+    };
+    document.body.appendChild(script);
+  });
+};
diff --git a/src/modules/recruitment/data/getHotCity.js b/src/modules/recruitment/data/getHotCity.js
new file mode 100644
index 00000000..6fbf5a84
--- /dev/null
+++ b/src/modules/recruitment/data/getHotCity.js
@@ -0,0 +1,5 @@
+import axios from "axios";
+
+export const getHotCity = async ()=>{
+    return (await axios.get("/job_data/hot_city")).data.data;
+}
\ No newline at end of file
diff --git a/src/modules/recruitment/data/getJobCate.js b/src/modules/recruitment/data/getJobCate.js
new file mode 100644
index 00000000..75208d87
--- /dev/null
+++ b/src/modules/recruitment/data/getJobCate.js
@@ -0,0 +1,51 @@
+import axios from "axios";
+
+function transf(json) {
+  let map = new Map();
+  for (const v of json) {
+    let set = new Set();
+    for (const c of v.children) {
+      set.add(c.name);
+    }
+    map.set(v.name, set);
+  }
+  return map;
+}
+
+export async function getJobCate() {
+  const res = await axios.get(`/job_classifies.json`);
+  return transf(res.data.data);
+}
+export async function getJobCate2() {
+  const json = (await axios.get(`/job_classifies.json`)).data.data;
+  let map = new Map();
+  for (const v of json) {
+    let innerMap = new Map();
+    for (const c of v.children) {
+      innerMap.set(c.name, { job_classify_root: v.name, job_classify: c.name });
+    }
+    map.set(v.name, innerMap);
+  }
+  return map;
+}
+
+export const mock = transf([
+  {
+    name: "后端开发",
+    children: [
+      { name: "Java" },
+      { name: "C++" },
+      { name: "Php" },
+      { name: "Go" },
+    ],
+  },
+  {
+    name: "前端开发",
+    children: [
+      { name: "web前端" },
+      { name: "html5" },
+      { name: "Php" },
+      { name: "JavaScript" },
+    ],
+  },
+]);
\ No newline at end of file
diff --git a/src/modules/recruitment/data/getJobInfo.js b/src/modules/recruitment/data/getJobInfo.js
new file mode 100644
index 00000000..d9a78e1b
--- /dev/null
+++ b/src/modules/recruitment/data/getJobInfo.js
@@ -0,0 +1,46 @@
+import axios from 'axios';
+
+function transf(json) {
+    return {
+        name: json.name,
+        salary: json.salary,
+        company: json.company,
+        city: json.city,
+        exp: json.work_year,
+        class: json.job_category,
+        edu: json.education,
+        num: json.num,
+        time: json.updated_at,
+        address: json.address,
+        desc: json.description,
+        intro: json.introduce
+    };
+}
+
+export async function getJobInfo(jobID) {
+    const res = await axios.get(`/jobs/${jobID}.json`);
+    return transf(res.data.job);
+}
+
+export async function getJobPlain(jobID){
+    return (await axios.get(`/jobs/${jobID}.json`)).data.job;
+}
+
+export async function applyProfile(JobID) {
+    await axios.post(`/jobs/${JobID}/apply`)
+    return;
+}
+
+export const mock = {
+    intro: "big comp",
+    address: "开瓶器",
+    desc: "need someone",
+    name: "Java开发",
+    salary: "10-12k",
+    company: "Tencent",
+    city: "Shanghai",
+    class: "全职",
+    edu: "本科",
+    num: 1,
+    time: "2020-2-2"
+};
\ No newline at end of file
diff --git a/src/modules/recruitment/data/getProfileLoc.js b/src/modules/recruitment/data/getProfileLoc.js
new file mode 100644
index 00000000..f6363767
--- /dev/null
+++ b/src/modules/recruitment/data/getProfileLoc.js
@@ -0,0 +1,8 @@
+import axios from 'axios';
+
+export async function getProfileLoc(user){
+    if(user){
+        return (await axios.get(`/users/accounts/${user.login}.json`)).data.location_city;
+    }
+    return "长沙";
+}
\ No newline at end of file
diff --git a/src/modules/recruitment/data/getResume.js b/src/modules/recruitment/data/getResume.js
new file mode 100644
index 00000000..474a081f
--- /dev/null
+++ b/src/modules/recruitment/data/getResume.js
@@ -0,0 +1,6 @@
+import axios from 'axios';
+
+export async function getResume(){
+    const data = (await axios.get(`/users/resume.json`)).data;
+    return data;
+}
\ No newline at end of file
diff --git a/src/modules/recruitment/data/ifHaveResume.js b/src/modules/recruitment/data/ifHaveResume.js
new file mode 100644
index 00000000..1e8bcd35
--- /dev/null
+++ b/src/modules/recruitment/data/ifHaveResume.js
@@ -0,0 +1,10 @@
+import axios from "axios";
+
+export async function ifHaveResume() {
+  const resp = (await axios.get(`/users/resume.json`)).data;
+  if (resp.status === -2) {
+    return false;
+  } else {
+    return true;
+  }
+}
diff --git a/src/modules/recruitment/data/locData.js b/src/modules/recruitment/data/locData.js
new file mode 100644
index 00000000..483e199f
--- /dev/null
+++ b/src/modules/recruitment/data/locData.js
@@ -0,0 +1,5332 @@
+const data = {
+    "110000": {
+        "code": "110000",
+        "name": "北京",
+        "cities": {
+            "110000": {
+                "code": "110000",
+                "name": "北京",
+                "districts": {
+                    "110101": "东城区",
+                    "110102": "西城区",
+                    "110105": "朝阳区",
+                    "110106": "丰台区",
+                    "110107": "石景山区",
+                    "110108": "海淀区",
+                    "110109": "门头沟区",
+                    "110111": "房山区",
+                    "110112": "通州区",
+                    "110113": "顺义区",
+                    "110114": "昌平区",
+                    "110115": "大兴区",
+                    "110116": "怀柔区",
+                    "110117": "平谷区",
+                    "110118": "密云区",
+                    "110119": "延庆区"
+                }
+            }
+        }
+    },
+    "120000": {
+        "code": "120000",
+        "name": "天津",
+        "cities": {
+            "120000": {
+                "code": "120000",
+                "name": "天津",
+                "districts": {
+                    "120101": "和平区",
+                    "120102": "河东区",
+                    "120103": "河西区",
+                    "120104": "南开区",
+                    "120105": "河北区",
+                    "120106": "红桥区",
+                    "120110": "东丽区",
+                    "120111": "西青区",
+                    "120112": "津南区",
+                    "120113": "北辰区",
+                    "120114": "武清区",
+                    "120115": "宝坻区",
+                    "120116": "滨海新区",
+                    "120117": "宁河区",
+                    "120118": "静海区",
+                    "120119": "蓟州区"
+                }
+            }
+        }
+    },
+    "130000": {
+        "code": "130000",
+        "name": "河北省",
+        "cities": {
+            "130100": {
+                "code": "130100",
+                "name": "石家庄",
+                "districts": {
+                    "130102": "长安区",
+                    "130104": "桥西区",
+                    "130105": "新华区",
+                    "130107": "井陉矿区",
+                    "130108": "裕华区",
+                    "130109": "藁城区",
+                    "130110": "鹿泉区",
+                    "130111": "栾城区",
+                    "130121": "井陉县",
+                    "130123": "正定县",
+                    "130125": "行唐县",
+                    "130126": "灵寿县",
+                    "130127": "高邑县",
+                    "130128": "深泽县",
+                    "130129": "赞皇县",
+                    "130130": "无极县",
+                    "130131": "平山县",
+                    "130132": "元氏县",
+                    "130133": "赵县",
+                    "130181": "辛集",
+                    "130183": "晋州",
+                    "130184": "新乐"
+                }
+            },
+            "130200": {
+                "code": "130200",
+                "name": "唐山",
+                "districts": {
+                    "130202": "路南区",
+                    "130203": "路北区",
+                    "130204": "古冶区",
+                    "130205": "开平区",
+                    "130207": "丰南区",
+                    "130208": "丰润区",
+                    "130209": "曹妃甸区",
+                    "130224": "滦南县",
+                    "130225": "乐亭县",
+                    "130227": "迁西县",
+                    "130229": "玉田县",
+                    "130281": "遵化",
+                    "130283": "迁安",
+                    "130284": "滦州"
+                }
+            },
+            "130300": {
+                "code": "130300",
+                "name": "秦皇岛",
+                "districts": {
+                    "130302": "海港区",
+                    "130303": "山海关区",
+                    "130304": "北戴河区",
+                    "130306": "抚宁区",
+                    "130321": "青龙满族自治县",
+                    "130322": "昌黎县",
+                    "130324": "卢龙县"
+                }
+            },
+            "130400": {
+                "code": "130400",
+                "name": "邯郸",
+                "districts": {
+                    "130402": "邯山区",
+                    "130403": "丛台区",
+                    "130404": "复兴区",
+                    "130406": "峰峰矿区",
+                    "130407": "肥乡区",
+                    "130408": "永年区",
+                    "130423": "临漳县",
+                    "130424": "成安县",
+                    "130425": "大名县",
+                    "130426": "涉县",
+                    "130427": "磁县",
+                    "130430": "邱县",
+                    "130431": "鸡泽县",
+                    "130432": "广平县",
+                    "130433": "馆陶县",
+                    "130434": "魏县",
+                    "130435": "曲周县",
+                    "130481": "武安"
+                }
+            },
+            "130500": {
+                "code": "130500",
+                "name": "邢台",
+                "districts": {
+                    "130502": "桥东区",
+                    "130503": "桥西区",
+                    "130521": "邢台县",
+                    "130522": "临城县",
+                    "130523": "内丘县",
+                    "130524": "柏乡县",
+                    "130525": "隆尧县",
+                    "130526": "任县",
+                    "130527": "南和县",
+                    "130528": "宁晋县",
+                    "130529": "巨鹿县",
+                    "130530": "新河县",
+                    "130531": "广宗县",
+                    "130532": "平乡县",
+                    "130533": "威县",
+                    "130534": "清河县",
+                    "130535": "临西县",
+                    "130581": "南宫",
+                    "130582": "沙河"
+                }
+            },
+            "130600": {
+                "code": "130600",
+                "name": "保定",
+                "districts": {
+                    "130602": "竞秀区",
+                    "130606": "莲池区",
+                    "130607": "满城区",
+                    "130608": "清苑区",
+                    "130609": "徐水区",
+                    "130623": "涞水县",
+                    "130624": "阜平县",
+                    "130626": "定兴县",
+                    "130627": "唐县",
+                    "130628": "高阳县",
+                    "130629": "容城县",
+                    "130630": "涞源县",
+                    "130631": "望都县",
+                    "130632": "安新县",
+                    "130633": "易县",
+                    "130634": "曲阳县",
+                    "130635": "蠡县",
+                    "130636": "顺平县",
+                    "130637": "博野县",
+                    "130638": "雄县",
+                    "130681": "涿州",
+                    "130682": "定州",
+                    "130683": "安国",
+                    "130684": "高碑店"
+                }
+            },
+            "130700": {
+                "code": "130700",
+                "name": "张家口",
+                "districts": {
+                    "130702": "桥东区",
+                    "130703": "桥西区",
+                    "130705": "宣化区",
+                    "130706": "下花园区",
+                    "130708": "万全区",
+                    "130709": "崇礼区",
+                    "130722": "张北县",
+                    "130723": "康保县",
+                    "130724": "沽源县",
+                    "130725": "尚义县",
+                    "130726": "蔚县",
+                    "130727": "阳原县",
+                    "130728": "怀安县",
+                    "130730": "怀来县",
+                    "130731": "涿鹿县",
+                    "130732": "赤城县"
+                }
+            },
+            "130800": {
+                "code": "130800",
+                "name": "承德",
+                "districts": {
+                    "130802": "双桥区",
+                    "130803": "双滦区",
+                    "130804": "鹰手营子矿区",
+                    "130821": "承德县",
+                    "130822": "兴隆县",
+                    "130824": "滦平县",
+                    "130825": "隆化县",
+                    "130826": "丰宁满族自治县",
+                    "130827": "宽城满族自治县",
+                    "130828": "围场满族蒙古族自治县",
+                    "130881": "平泉"
+                }
+            },
+            "130900": {
+                "code": "130900",
+                "name": "沧州",
+                "districts": {
+                    "130902": "新华区",
+                    "130903": "运河区",
+                    "130921": "沧县",
+                    "130922": "青县",
+                    "130923": "东光县",
+                    "130924": "海兴县",
+                    "130925": "盐山县",
+                    "130926": "肃宁县",
+                    "130927": "南皮县",
+                    "130928": "吴桥县",
+                    "130929": "献县",
+                    "130930": "孟村回族自治县",
+                    "130981": "泊头",
+                    "130982": "任丘",
+                    "130983": "黄骅",
+                    "130984": "河间"
+                }
+            },
+            "131000": {
+                "code": "131000",
+                "name": "廊坊",
+                "districts": {
+                    "131002": "安次区",
+                    "131003": "广阳区",
+                    "131022": "固安县",
+                    "131023": "永清县",
+                    "131024": "香河县",
+                    "131025": "大城县",
+                    "131026": "文安县",
+                    "131028": "大厂回族自治县",
+                    "131081": "霸州",
+                    "131082": "三河"
+                }
+            },
+            "131100": {
+                "code": "131100",
+                "name": "衡水",
+                "districts": {
+                    "131102": "桃城区",
+                    "131103": "冀州区",
+                    "131121": "枣强县",
+                    "131122": "武邑县",
+                    "131123": "武强县",
+                    "131124": "饶阳县",
+                    "131125": "安平县",
+                    "131126": "故城县",
+                    "131127": "景县",
+                    "131128": "阜城县",
+                    "131182": "深州"
+                }
+            }
+        }
+    },
+    "140000": {
+        "code": "140000",
+        "name": "山西省",
+        "cities": {
+            "140100": {
+                "code": "140100",
+                "name": "太原",
+                "districts": {
+                    "140105": "小店区",
+                    "140106": "迎泽区",
+                    "140107": "杏花岭区",
+                    "140108": "尖草坪区",
+                    "140109": "万柏林区",
+                    "140110": "晋源区",
+                    "140121": "清徐县",
+                    "140122": "阳曲县",
+                    "140123": "娄烦县",
+                    "140181": "古交"
+                }
+            },
+            "140200": {
+                "code": "140200",
+                "name": "大同",
+                "districts": {
+                    "140212": "新荣区",
+                    "140213": "平城区",
+                    "140214": "云冈区",
+                    "140215": "云州区",
+                    "140221": "阳高县",
+                    "140222": "天镇县",
+                    "140223": "广灵县",
+                    "140224": "灵丘县",
+                    "140225": "浑源县",
+                    "140226": "左云县"
+                }
+            },
+            "140300": {
+                "code": "140300",
+                "name": "阳泉",
+                "districts": {
+                    "140302": "城区",
+                    "140303": "矿区",
+                    "140311": "郊区",
+                    "140321": "平定县",
+                    "140322": "盂县"
+                }
+            },
+            "140400": {
+                "code": "140400",
+                "name": "长治",
+                "districts": {
+                    "140403": "潞州区",
+                    "140404": "上党区",
+                    "140405": "屯留区",
+                    "140406": "潞城区",
+                    "140423": "襄垣县",
+                    "140425": "平顺县",
+                    "140426": "黎城县",
+                    "140427": "壶关县",
+                    "140428": "长子县",
+                    "140429": "武乡县",
+                    "140430": "沁县",
+                    "140431": "沁源县"
+                }
+            },
+            "140500": {
+                "code": "140500",
+                "name": "晋城",
+                "districts": {
+                    "140502": "城区",
+                    "140521": "沁水县",
+                    "140522": "阳城县",
+                    "140524": "陵川县",
+                    "140525": "泽州县",
+                    "140581": "高平"
+                }
+            },
+            "140600": {
+                "code": "140600",
+                "name": "朔州",
+                "districts": {
+                    "140602": "朔城区",
+                    "140603": "平鲁区",
+                    "140621": "山阴县",
+                    "140622": "应县",
+                    "140623": "右玉县",
+                    "140681": "怀仁"
+                }
+            },
+            "140700": {
+                "code": "140700",
+                "name": "晋中",
+                "districts": {
+                    "140702": "榆次区",
+                    "140721": "榆社县",
+                    "140722": "左权县",
+                    "140723": "和顺县",
+                    "140724": "昔阳县",
+                    "140725": "寿阳县",
+                    "140726": "太谷县",
+                    "140727": "祁县",
+                    "140728": "平遥县",
+                    "140729": "灵石县",
+                    "140781": "介休"
+                }
+            },
+            "140800": {
+                "code": "140800",
+                "name": "运城",
+                "districts": {
+                    "140802": "盐湖区",
+                    "140821": "临猗县",
+                    "140822": "万荣县",
+                    "140823": "闻喜县",
+                    "140824": "稷山县",
+                    "140825": "新绛县",
+                    "140826": "绛县",
+                    "140827": "垣曲县",
+                    "140828": "夏县",
+                    "140829": "平陆县",
+                    "140830": "芮城县",
+                    "140881": "永济",
+                    "140882": "河津"
+                }
+            },
+            "140900": {
+                "code": "140900",
+                "name": "忻州",
+                "districts": {
+                    "140902": "忻府区",
+                    "140921": "定襄县",
+                    "140922": "五台县",
+                    "140923": "代县",
+                    "140924": "繁峙县",
+                    "140925": "宁武县",
+                    "140926": "静乐县",
+                    "140927": "神池县",
+                    "140928": "五寨县",
+                    "140929": "岢岚县",
+                    "140930": "河曲县",
+                    "140931": "保德县",
+                    "140932": "偏关县",
+                    "140981": "原平"
+                }
+            },
+            "141000": {
+                "code": "141000",
+                "name": "临汾",
+                "districts": {
+                    "141002": "尧都区",
+                    "141021": "曲沃县",
+                    "141022": "翼城县",
+                    "141023": "襄汾县",
+                    "141024": "洪洞县",
+                    "141025": "古县",
+                    "141026": "安泽县",
+                    "141027": "浮山县",
+                    "141028": "吉县",
+                    "141029": "乡宁县",
+                    "141030": "大宁县",
+                    "141031": "隰县",
+                    "141032": "永和县",
+                    "141033": "蒲县",
+                    "141034": "汾西县",
+                    "141081": "侯马",
+                    "141082": "霍州"
+                }
+            },
+            "141100": {
+                "code": "141100",
+                "name": "吕梁",
+                "districts": {
+                    "141102": "离石区",
+                    "141121": "文水县",
+                    "141122": "交城县",
+                    "141123": "兴县",
+                    "141124": "临县",
+                    "141125": "柳林县",
+                    "141126": "石楼县",
+                    "141127": "岚县",
+                    "141128": "方山县",
+                    "141129": "中阳县",
+                    "141130": "交口县",
+                    "141181": "孝义",
+                    "141182": "汾阳"
+                }
+            }
+        }
+    },
+    "150000": {
+        "code": "150000",
+        "name": "内蒙古自治区",
+        "cities": {
+            "150100": {
+                "code": "150100",
+                "name": "呼和浩特",
+                "districts": {
+                    "150102": "新城区",
+                    "150103": "回民区",
+                    "150104": "玉泉区",
+                    "150105": "赛罕区",
+                    "150121": "土默特左旗",
+                    "150122": "托克托县",
+                    "150123": "和林格尔县",
+                    "150124": "清水河县",
+                    "150125": "武川县"
+                }
+            },
+            "150200": {
+                "code": "150200",
+                "name": "包头",
+                "districts": {
+                    "150202": "东河区",
+                    "150203": "昆都仑区",
+                    "150204": "青山区",
+                    "150205": "石拐区",
+                    "150206": "白云鄂博矿区",
+                    "150207": "九原区",
+                    "150221": "土默特右旗",
+                    "150222": "固阳县",
+                    "150223": "达尔罕茂明安联合旗"
+                }
+            },
+            "150300": {
+                "code": "150300",
+                "name": "乌海",
+                "districts": {
+                    "150302": "海勃湾区",
+                    "150303": "海南区",
+                    "150304": "乌达区"
+                }
+            },
+            "150400": {
+                "code": "150400",
+                "name": "赤峰",
+                "districts": {
+                    "150402": "红山区",
+                    "150403": "元宝山区",
+                    "150404": "松山区",
+                    "150421": "阿鲁科尔沁旗",
+                    "150422": "巴林左旗",
+                    "150423": "巴林右旗",
+                    "150424": "林西县",
+                    "150425": "克什克腾旗",
+                    "150426": "翁牛特旗",
+                    "150428": "喀喇沁旗",
+                    "150429": "宁城县",
+                    "150430": "敖汉旗"
+                }
+            },
+            "150500": {
+                "code": "150500",
+                "name": "通辽",
+                "districts": {
+                    "150502": "科尔沁区",
+                    "150521": "科尔沁左翼中旗",
+                    "150522": "科尔沁左翼后旗",
+                    "150523": "开鲁县",
+                    "150524": "库伦旗",
+                    "150525": "奈曼旗",
+                    "150526": "扎鲁特旗",
+                    "150581": "霍林郭勒"
+                }
+            },
+            "150600": {
+                "code": "150600",
+                "name": "鄂尔多斯",
+                "districts": {
+                    "150602": "东胜区",
+                    "150603": "康巴什区",
+                    "150621": "达拉特旗",
+                    "150622": "准格尔旗",
+                    "150623": "鄂托克前旗",
+                    "150624": "鄂托克旗",
+                    "150625": "杭锦旗",
+                    "150626": "乌审旗",
+                    "150627": "伊金霍洛旗"
+                }
+            },
+            "150700": {
+                "code": "150700",
+                "name": "呼伦贝尔",
+                "districts": {
+                    "150702": "海拉尔区",
+                    "150703": "扎赉诺尔区",
+                    "150721": "阿荣旗",
+                    "150722": "莫力达瓦达斡尔族自治旗",
+                    "150723": "鄂伦春自治旗",
+                    "150724": "鄂温克族自治旗",
+                    "150725": "陈巴尔虎旗",
+                    "150726": "新巴尔虎左旗",
+                    "150727": "新巴尔虎右旗",
+                    "150781": "满洲里",
+                    "150782": "牙克石",
+                    "150783": "扎兰屯",
+                    "150784": "额尔古纳",
+                    "150785": "根河"
+                }
+            },
+            "150800": {
+                "code": "150800",
+                "name": "巴彦淖尔",
+                "districts": {
+                    "150802": "临河区",
+                    "150821": "五原县",
+                    "150822": "磴口县",
+                    "150823": "乌拉特前旗",
+                    "150824": "乌拉特中旗",
+                    "150825": "乌拉特后旗",
+                    "150826": "杭锦后旗"
+                }
+            },
+            "150900": {
+                "code": "150900",
+                "name": "乌兰察布",
+                "districts": {
+                    "150902": "集宁区",
+                    "150921": "卓资县",
+                    "150922": "化德县",
+                    "150923": "商都县",
+                    "150924": "兴和县",
+                    "150925": "凉城县",
+                    "150926": "察哈尔右翼前旗",
+                    "150927": "察哈尔右翼中旗",
+                    "150928": "察哈尔右翼后旗",
+                    "150929": "四子王旗",
+                    "150981": "丰镇"
+                }
+            },
+            "152200": {
+                "code": "152200",
+                "name": "兴安盟",
+                "districts": {
+                    "152201": "乌兰浩特",
+                    "152202": "阿尔山",
+                    "152221": "科尔沁右翼前旗",
+                    "152222": "科尔沁右翼中旗",
+                    "152223": "扎赉特旗",
+                    "152224": "突泉县"
+                }
+            },
+            "152500": {
+                "code": "152500",
+                "name": "锡林郭勒盟",
+                "districts": {
+                    "152501": "二连浩特",
+                    "152502": "锡林浩特",
+                    "152522": "阿巴嘎旗",
+                    "152523": "苏尼特左旗",
+                    "152524": "苏尼特右旗",
+                    "152525": "东乌珠穆沁旗",
+                    "152526": "西乌珠穆沁旗",
+                    "152527": "太仆寺旗",
+                    "152528": "镶黄旗",
+                    "152529": "正镶白旗",
+                    "152530": "正蓝旗",
+                    "152531": "多伦县"
+                }
+            },
+            "152900": {
+                "code": "152900",
+                "name": "阿拉善盟",
+                "districts": {
+                    "152921": "阿拉善左旗",
+                    "152922": "阿拉善右旗",
+                    "152923": "额济纳旗"
+                }
+            }
+        }
+    },
+    "210000": {
+        "code": "210000",
+        "name": "辽宁省",
+        "cities": {
+            "210100": {
+                "code": "210100",
+                "name": "沈阳",
+                "districts": {
+                    "210102": "和平区",
+                    "210103": "沈河区",
+                    "210104": "大东区",
+                    "210105": "皇姑区",
+                    "210106": "铁西区",
+                    "210111": "苏家屯区",
+                    "210112": "浑南区",
+                    "210113": "沈北新区",
+                    "210114": "于洪区",
+                    "210115": "辽中区",
+                    "210123": "康平县",
+                    "210124": "法库县",
+                    "210181": "新民"
+                }
+            },
+            "210200": {
+                "code": "210200",
+                "name": "大连",
+                "districts": {
+                    "210202": "中山区",
+                    "210203": "西岗区",
+                    "210204": "沙河口区",
+                    "210211": "甘井子区",
+                    "210212": "旅顺口区",
+                    "210213": "金州区",
+                    "210214": "普兰店区",
+                    "210224": "长海县",
+                    "210281": "瓦房店",
+                    "210283": "庄河"
+                }
+            },
+            "210300": {
+                "code": "210300",
+                "name": "鞍山",
+                "districts": {
+                    "210302": "铁东区",
+                    "210303": "铁西区",
+                    "210304": "立山区",
+                    "210311": "千山区",
+                    "210321": "台安县",
+                    "210323": "岫岩满族自治县",
+                    "210381": "海城"
+                }
+            },
+            "210400": {
+                "code": "210400",
+                "name": "抚顺",
+                "districts": {
+                    "210402": "新抚区",
+                    "210403": "东洲区",
+                    "210404": "望花区",
+                    "210411": "顺城区",
+                    "210421": "抚顺县",
+                    "210422": "新宾满族自治县",
+                    "210423": "清原满族自治县"
+                }
+            },
+            "210500": {
+                "code": "210500",
+                "name": "本溪",
+                "districts": {
+                    "210502": "平山区",
+                    "210503": "溪湖区",
+                    "210504": "明山区",
+                    "210505": "南芬区",
+                    "210521": "本溪满族自治县",
+                    "210522": "桓仁满族自治县"
+                }
+            },
+            "210600": {
+                "code": "210600",
+                "name": "丹东",
+                "districts": {
+                    "210602": "元宝区",
+                    "210603": "振兴区",
+                    "210604": "振安区",
+                    "210624": "宽甸满族自治县",
+                    "210681": "东港",
+                    "210682": "凤城"
+                }
+            },
+            "210700": {
+                "code": "210700",
+                "name": "锦州",
+                "districts": {
+                    "210702": "古塔区",
+                    "210703": "凌河区",
+                    "210711": "太和区",
+                    "210726": "黑山县",
+                    "210727": "义县",
+                    "210781": "凌海",
+                    "210782": "北镇"
+                }
+            },
+            "210800": {
+                "code": "210800",
+                "name": "营口",
+                "districts": {
+                    "210802": "站前区",
+                    "210803": "西区",
+                    "210804": "鲅鱼圈区",
+                    "210811": "老边区",
+                    "210881": "盖州",
+                    "210882": "大石桥"
+                }
+            },
+            "210900": {
+                "code": "210900",
+                "name": "阜新",
+                "districts": {
+                    "210902": "海州区",
+                    "210903": "新邱区",
+                    "210904": "太平区",
+                    "210905": "清河门区",
+                    "210911": "细河区",
+                    "210921": "阜新蒙古族自治县",
+                    "210922": "彰武县"
+                }
+            },
+            "211000": {
+                "code": "211000",
+                "name": "辽阳",
+                "districts": {
+                    "211002": "白塔区",
+                    "211003": "文圣区",
+                    "211004": "宏伟区",
+                    "211005": "弓长岭区",
+                    "211011": "太子河区",
+                    "211021": "辽阳县",
+                    "211081": "灯塔"
+                }
+            },
+            "211100": {
+                "code": "211100",
+                "name": "盘锦",
+                "districts": {
+                    "211102": "双台子区",
+                    "211103": "兴隆台区",
+                    "211104": "大洼区",
+                    "211122": "盘山县"
+                }
+            },
+            "211200": {
+                "code": "211200",
+                "name": "铁岭",
+                "districts": {
+                    "211202": "银州区",
+                    "211204": "清河区",
+                    "211221": "铁岭县",
+                    "211223": "西丰县",
+                    "211224": "昌图县",
+                    "211281": "调兵山",
+                    "211282": "开原"
+                }
+            },
+            "211300": {
+                "code": "211300",
+                "name": "朝阳",
+                "districts": {
+                    "211302": "双塔区",
+                    "211303": "龙城区",
+                    "211321": "朝阳县",
+                    "211322": "建平县",
+                    "211324": "喀喇沁左翼蒙古族自治县",
+                    "211381": "北票",
+                    "211382": "凌源"
+                }
+            },
+            "211400": {
+                "code": "211400",
+                "name": "葫芦岛",
+                "districts": {
+                    "211402": "连山区",
+                    "211403": "龙港区",
+                    "211404": "南票区",
+                    "211421": "绥中县",
+                    "211422": "建昌县",
+                    "211481": "兴城"
+                }
+            }
+        }
+    },
+    "220000": {
+        "code": "220000",
+        "name": "吉林省",
+        "cities": {
+            "220100": {
+                "code": "220100",
+                "name": "长春",
+                "districts": {
+                    "220102": "南关区",
+                    "220103": "宽城区",
+                    "220104": "朝阳区",
+                    "220105": "二道区",
+                    "220106": "绿园区",
+                    "220112": "双阳区",
+                    "220113": "九台区",
+                    "220122": "农安县",
+                    "220182": "榆树",
+                    "220183": "德惠"
+                }
+            },
+            "220200": {
+                "code": "220200",
+                "name": "吉林",
+                "districts": {
+                    "220202": "昌邑区",
+                    "220203": "龙潭区",
+                    "220204": "船营区",
+                    "220211": "丰满区",
+                    "220221": "永吉县",
+                    "220281": "蛟河",
+                    "220282": "桦甸",
+                    "220283": "舒兰",
+                    "220284": "磐石"
+                }
+            },
+            "220300": {
+                "code": "220300",
+                "name": "四平",
+                "districts": {
+                    "220302": "铁西区",
+                    "220303": "铁东区",
+                    "220322": "梨树县",
+                    "220323": "伊通满族自治县",
+                    "220381": "公主岭",
+                    "220382": "双辽"
+                }
+            },
+            "220400": {
+                "code": "220400",
+                "name": "辽源",
+                "districts": {
+                    "220402": "龙山区",
+                    "220403": "西安区",
+                    "220421": "东丰县",
+                    "220422": "东辽县"
+                }
+            },
+            "220500": {
+                "code": "220500",
+                "name": "通化",
+                "districts": {
+                    "220502": "东昌区",
+                    "220503": "二道江区",
+                    "220521": "通化县",
+                    "220523": "辉南县",
+                    "220524": "柳河县",
+                    "220581": "梅河口",
+                    "220582": "集安"
+                }
+            },
+            "220600": {
+                "code": "220600",
+                "name": "白山",
+                "districts": {
+                    "220602": "浑江区",
+                    "220605": "江源区",
+                    "220621": "抚松县",
+                    "220622": "靖宇县",
+                    "220623": "长白朝鲜族自治县",
+                    "220681": "临江"
+                }
+            },
+            "220700": {
+                "code": "220700",
+                "name": "松原",
+                "districts": {
+                    "220702": "宁江区",
+                    "220721": "前郭尔罗斯蒙古族自治县",
+                    "220722": "长岭县",
+                    "220723": "乾安县",
+                    "220781": "扶余"
+                }
+            },
+            "220800": {
+                "code": "220800",
+                "name": "白城",
+                "districts": {
+                    "220802": "洮北区",
+                    "220821": "镇赉县",
+                    "220822": "通榆县",
+                    "220881": "洮南",
+                    "220882": "大安"
+                }
+            },
+            "222400": {
+                "code": "222400",
+                "name": "延边朝鲜族自治州",
+                "districts": {
+                    "222401": "延吉",
+                    "222402": "图们",
+                    "222403": "敦化",
+                    "222404": "珲春",
+                    "222405": "龙井",
+                    "222406": "和龙",
+                    "222424": "汪清县",
+                    "222426": "安图县"
+                }
+            }
+        }
+    },
+    "230000": {
+        "code": "230000",
+        "name": "黑龙江省",
+        "cities": {
+            "230100": {
+                "code": "230100",
+                "name": "哈尔滨",
+                "districts": {
+                    "230102": "道里区",
+                    "230103": "南岗区",
+                    "230104": "道外区",
+                    "230108": "平房区",
+                    "230109": "松北区",
+                    "230110": "香坊区",
+                    "230111": "呼兰区",
+                    "230112": "阿城区",
+                    "230113": "双城区",
+                    "230123": "依兰县",
+                    "230124": "方正县",
+                    "230125": "宾县",
+                    "230126": "巴彦县",
+                    "230127": "木兰县",
+                    "230128": "通河县",
+                    "230129": "延寿县",
+                    "230183": "尚志",
+                    "230184": "五常"
+                }
+            },
+            "230200": {
+                "code": "230200",
+                "name": "齐齐哈尔",
+                "districts": {
+                    "230202": "龙沙区",
+                    "230203": "建华区",
+                    "230204": "铁锋区",
+                    "230205": "昂昂溪区",
+                    "230206": "富拉尔基区",
+                    "230207": "碾子山区",
+                    "230208": "梅里斯达斡尔族区",
+                    "230221": "龙江县",
+                    "230223": "依安县",
+                    "230224": "泰来县",
+                    "230225": "甘南县",
+                    "230227": "富裕县",
+                    "230229": "克山县",
+                    "230230": "克东县",
+                    "230231": "拜泉县",
+                    "230281": "讷河"
+                }
+            },
+            "230300": {
+                "code": "230300",
+                "name": "鸡西",
+                "districts": {
+                    "230302": "鸡冠区",
+                    "230303": "恒山区",
+                    "230304": "滴道区",
+                    "230305": "梨树区",
+                    "230306": "城子河区",
+                    "230307": "麻山区",
+                    "230321": "鸡东县",
+                    "230381": "虎林",
+                    "230382": "密山"
+                }
+            },
+            "230400": {
+                "code": "230400",
+                "name": "鹤岗",
+                "districts": {
+                    "230402": "向阳区",
+                    "230403": "工农区",
+                    "230404": "南山区",
+                    "230405": "兴安区",
+                    "230406": "东山区",
+                    "230407": "兴山区",
+                    "230421": "萝北县",
+                    "230422": "绥滨县"
+                }
+            },
+            "230500": {
+                "code": "230500",
+                "name": "双鸭山",
+                "districts": {
+                    "230502": "尖山区",
+                    "230503": "岭东区",
+                    "230505": "四方台区",
+                    "230506": "宝山区",
+                    "230521": "集贤县",
+                    "230522": "友谊县",
+                    "230523": "宝清县",
+                    "230524": "饶河县"
+                }
+            },
+            "230600": {
+                "code": "230600",
+                "name": "大庆",
+                "districts": {
+                    "230602": "萨尔图区",
+                    "230603": "龙凤区",
+                    "230604": "让胡路区",
+                    "230605": "红岗区",
+                    "230606": "大同区",
+                    "230621": "肇州县",
+                    "230622": "肇源县",
+                    "230623": "林甸县",
+                    "230624": "杜尔伯特蒙古族自治县"
+                }
+            },
+            "230700": {
+                "code": "230700",
+                "name": "伊春",
+                "districts": {
+                    "230702": "伊春区",
+                    "230703": "南岔区",
+                    "230704": "友好区",
+                    "230705": "西林区",
+                    "230706": "翠峦区",
+                    "230707": "新青区",
+                    "230708": "美溪区",
+                    "230709": "金山屯区",
+                    "230710": "五营区",
+                    "230711": "乌马河区",
+                    "230712": "汤旺河区",
+                    "230713": "带岭区",
+                    "230714": "乌伊岭区",
+                    "230715": "红星区",
+                    "230716": "上甘岭区",
+                    "230722": "嘉荫县",
+                    "230781": "铁力"
+                }
+            },
+            "230800": {
+                "code": "230800",
+                "name": "佳木斯",
+                "districts": {
+                    "230803": "向阳区",
+                    "230804": "前进区",
+                    "230805": "东风区",
+                    "230811": "郊区",
+                    "230822": "桦南县",
+                    "230826": "桦川县",
+                    "230828": "汤原县",
+                    "230881": "同江",
+                    "230882": "富锦",
+                    "230883": "抚远"
+                }
+            },
+            "230900": {
+                "code": "230900",
+                "name": "七台河",
+                "districts": {
+                    "230902": "新兴区",
+                    "230903": "桃山区",
+                    "230904": "茄子河区",
+                    "230921": "勃利县"
+                }
+            },
+            "231000": {
+                "code": "231000",
+                "name": "牡丹江",
+                "districts": {
+                    "231002": "东安区",
+                    "231003": "阳明区",
+                    "231004": "爱民区",
+                    "231005": "西安区",
+                    "231025": "林口县",
+                    "231081": "绥芬河",
+                    "231083": "海林",
+                    "231084": "宁安",
+                    "231085": "穆棱",
+                    "231086": "东宁"
+                }
+            },
+            "231100": {
+                "code": "231100",
+                "name": "黑河",
+                "districts": {
+                    "231102": "爱辉区",
+                    "231121": "嫩江县",
+                    "231123": "逊克县",
+                    "231124": "孙吴县",
+                    "231181": "北安",
+                    "231182": "五大连池"
+                }
+            },
+            "231200": {
+                "code": "231200",
+                "name": "绥化",
+                "districts": {
+                    "231202": "北林区",
+                    "231221": "望奎县",
+                    "231222": "兰西县",
+                    "231223": "青冈县",
+                    "231224": "庆安县",
+                    "231225": "明水县",
+                    "231226": "绥棱县",
+                    "231281": "安达",
+                    "231282": "肇东",
+                    "231283": "海伦"
+                }
+            },
+            "232700": {
+                "code": "232700",
+                "name": "大兴安岭地区",
+                "districts": {
+                    "232701": "漠河",
+                    "232721": "呼玛县",
+                    "232722": "塔河县"
+                }
+            }
+        }
+    },
+    "310000": {
+        "code": "310000",
+        "name": "上海",
+        "cities": {
+            "310000": {
+                "code": "310000",
+                "name": "上海",
+                "districts": {
+                    "310101": "黄浦区",
+                    "310104": "徐汇区",
+                    "310105": "长宁区",
+                    "310106": "静安区",
+                    "310107": "普陀区",
+                    "310109": "虹口区",
+                    "310110": "杨浦区",
+                    "310112": "闵行区",
+                    "310113": "宝山区",
+                    "310114": "嘉定区",
+                    "310115": "浦东新区",
+                    "310116": "金山区",
+                    "310117": "松江区",
+                    "310118": "青浦区",
+                    "310120": "奉贤区",
+                    "310151": "崇明区"
+                }
+            }
+        }
+    },
+    "320000": {
+        "code": "320000",
+        "name": "江苏省",
+        "cities": {
+            "320100": {
+                "code": "320100",
+                "name": "南京",
+                "districts": {
+                    "320102": "玄武区",
+                    "320104": "秦淮区",
+                    "320105": "建邺区",
+                    "320106": "鼓楼区",
+                    "320111": "浦口区",
+                    "320113": "栖霞区",
+                    "320114": "雨花台区",
+                    "320115": "江宁区",
+                    "320116": "六合区",
+                    "320117": "溧水区",
+                    "320118": "高淳区"
+                }
+            },
+            "320200": {
+                "code": "320200",
+                "name": "无锡",
+                "districts": {
+                    "320205": "锡山区",
+                    "320206": "惠山区",
+                    "320211": "滨湖区",
+                    "320213": "梁溪区",
+                    "320214": "新吴区",
+                    "320281": "江阴",
+                    "320282": "宜兴"
+                }
+            },
+            "320300": {
+                "code": "320300",
+                "name": "徐州",
+                "districts": {
+                    "320302": "鼓楼区",
+                    "320303": "云龙区",
+                    "320305": "贾汪区",
+                    "320311": "泉山区",
+                    "320312": "铜山区",
+                    "320321": "丰县",
+                    "320322": "沛县",
+                    "320324": "睢宁县",
+                    "320381": "新沂",
+                    "320382": "邳州"
+                }
+            },
+            "320400": {
+                "code": "320400",
+                "name": "常州",
+                "districts": {
+                    "320402": "天宁区",
+                    "320404": "钟楼区",
+                    "320411": "新北区",
+                    "320412": "武进区",
+                    "320413": "金坛区",
+                    "320481": "溧阳"
+                }
+            },
+            "320500": {
+                "code": "320500",
+                "name": "苏州",
+                "districts": {
+                    "320505": "虎丘区",
+                    "320506": "吴中区",
+                    "320507": "相城区",
+                    "320508": "姑苏区",
+                    "320509": "吴江区",
+                    "320581": "常熟",
+                    "320582": "张家港",
+                    "320583": "昆山",
+                    "320585": "太仓"
+                }
+            },
+            "320600": {
+                "code": "320600",
+                "name": "南通",
+                "districts": {
+                    "320602": "崇川区",
+                    "320611": "港闸区",
+                    "320612": "通州区",
+                    "320623": "如东县",
+                    "320681": "启东",
+                    "320682": "如皋",
+                    "320684": "海门",
+                    "320685": "海安"
+                }
+            },
+            "320700": {
+                "code": "320700",
+                "name": "连云港",
+                "districts": {
+                    "320703": "连云区",
+                    "320706": "海州区",
+                    "320707": "赣榆区",
+                    "320722": "东海县",
+                    "320723": "灌云县",
+                    "320724": "灌南县"
+                }
+            },
+            "320800": {
+                "code": "320800",
+                "name": "淮安",
+                "districts": {
+                    "320803": "淮安区",
+                    "320804": "淮阴区",
+                    "320812": "清江浦区",
+                    "320813": "洪泽区",
+                    "320826": "涟水县",
+                    "320830": "盱眙县",
+                    "320831": "金湖县"
+                }
+            },
+            "320900": {
+                "code": "320900",
+                "name": "盐城",
+                "districts": {
+                    "320902": "亭湖区",
+                    "320903": "盐都区",
+                    "320904": "大丰区",
+                    "320921": "响水县",
+                    "320922": "滨海县",
+                    "320923": "阜宁县",
+                    "320924": "射阳县",
+                    "320925": "建湖县",
+                    "320981": "东台"
+                }
+            },
+            "321000": {
+                "code": "321000",
+                "name": "扬州",
+                "districts": {
+                    "321002": "广陵区",
+                    "321003": "邗江区",
+                    "321012": "江都区",
+                    "321023": "宝应县",
+                    "321081": "仪征",
+                    "321084": "高邮"
+                }
+            },
+            "321100": {
+                "code": "321100",
+                "name": "镇江",
+                "districts": {
+                    "321102": "京口区",
+                    "321111": "润州区",
+                    "321112": "丹徒区",
+                    "321181": "丹阳",
+                    "321182": "扬中",
+                    "321183": "句容"
+                }
+            },
+            "321200": {
+                "code": "321200",
+                "name": "泰州",
+                "districts": {
+                    "321202": "海陵区",
+                    "321203": "高港区",
+                    "321204": "姜堰区",
+                    "321281": "兴化",
+                    "321282": "靖江",
+                    "321283": "泰兴"
+                }
+            },
+            "321300": {
+                "code": "321300",
+                "name": "宿迁",
+                "districts": {
+                    "321302": "宿城区",
+                    "321311": "宿豫区",
+                    "321322": "沭阳县",
+                    "321323": "泗阳县",
+                    "321324": "泗洪县"
+                }
+            }
+        }
+    },
+    "330000": {
+        "code": "330000",
+        "name": "浙江省",
+        "cities": {
+            "330100": {
+                "code": "330100",
+                "name": "杭州",
+                "districts": {
+                    "330102": "上城区",
+                    "330103": "下城区",
+                    "330104": "江干区",
+                    "330105": "拱墅区",
+                    "330106": "西湖区",
+                    "330108": "滨江区",
+                    "330109": "萧山区",
+                    "330110": "余杭区",
+                    "330111": "富阳区",
+                    "330112": "临安区",
+                    "330122": "桐庐县",
+                    "330127": "淳安县",
+                    "330182": "建德"
+                }
+            },
+            "330200": {
+                "code": "330200",
+                "name": "宁波",
+                "districts": {
+                    "330203": "海曙区",
+                    "330205": "江北区",
+                    "330206": "北仑区",
+                    "330211": "镇海区",
+                    "330212": "鄞州区",
+                    "330213": "奉化区",
+                    "330225": "象山县",
+                    "330226": "宁海县",
+                    "330281": "余姚",
+                    "330282": "慈溪"
+                }
+            },
+            "330300": {
+                "code": "330300",
+                "name": "温州",
+                "districts": {
+                    "330302": "鹿城区",
+                    "330303": "龙湾区",
+                    "330304": "瓯海区",
+                    "330305": "洞头区",
+                    "330324": "永嘉县",
+                    "330326": "平阳县",
+                    "330327": "苍南县",
+                    "330328": "文成县",
+                    "330329": "泰顺县",
+                    "330381": "瑞安",
+                    "330382": "乐清"
+                }
+            },
+            "330400": {
+                "code": "330400",
+                "name": "嘉兴",
+                "districts": {
+                    "330402": "南湖区",
+                    "330411": "秀洲区",
+                    "330421": "嘉善县",
+                    "330424": "海盐县",
+                    "330481": "海宁",
+                    "330482": "平湖",
+                    "330483": "桐乡"
+                }
+            },
+            "330500": {
+                "code": "330500",
+                "name": "湖州",
+                "districts": {
+                    "330502": "吴兴区",
+                    "330503": "南浔区",
+                    "330521": "德清县",
+                    "330522": "长兴县",
+                    "330523": "安吉县"
+                }
+            },
+            "330600": {
+                "code": "330600",
+                "name": "绍兴",
+                "districts": {
+                    "330602": "越城区",
+                    "330603": "柯桥区",
+                    "330604": "上虞区",
+                    "330624": "新昌县",
+                    "330681": "诸暨",
+                    "330683": "嵊州"
+                }
+            },
+            "330700": {
+                "code": "330700",
+                "name": "金华",
+                "districts": {
+                    "330702": "婺城区",
+                    "330703": "金东区",
+                    "330723": "武义县",
+                    "330726": "浦江县",
+                    "330727": "磐安县",
+                    "330781": "兰溪",
+                    "330782": "义乌",
+                    "330783": "东阳",
+                    "330784": "永康"
+                }
+            },
+            "330800": {
+                "code": "330800",
+                "name": "衢州",
+                "districts": {
+                    "330802": "柯城区",
+                    "330803": "衢江区",
+                    "330822": "常山县",
+                    "330824": "开化县",
+                    "330825": "龙游县",
+                    "330881": "江山"
+                }
+            },
+            "330900": {
+                "code": "330900",
+                "name": "舟山",
+                "districts": {
+                    "330902": "定海区",
+                    "330903": "普陀区",
+                    "330921": "岱山县",
+                    "330922": "嵊泗县"
+                }
+            },
+            "331000": {
+                "code": "331000",
+                "name": "台州",
+                "districts": {
+                    "331002": "椒江区",
+                    "331003": "黄岩区",
+                    "331004": "路桥区",
+                    "331022": "三门县",
+                    "331023": "天台县",
+                    "331024": "仙居县",
+                    "331081": "温岭",
+                    "331082": "临海",
+                    "331083": "玉环"
+                }
+            },
+            "331100": {
+                "code": "331100",
+                "name": "丽水",
+                "districts": {
+                    "331102": "莲都区",
+                    "331121": "青田县",
+                    "331122": "缙云县",
+                    "331123": "遂昌县",
+                    "331124": "松阳县",
+                    "331125": "云和县",
+                    "331126": "庆元县",
+                    "331127": "景宁畲族自治县",
+                    "331181": "龙泉"
+                }
+            }
+        }
+    },
+    "340000": {
+        "code": "340000",
+        "name": "安徽省",
+        "cities": {
+            "340100": {
+                "code": "340100",
+                "name": "合肥",
+                "districts": {
+                    "340102": "瑶海区",
+                    "340103": "庐阳区",
+                    "340104": "蜀山区",
+                    "340111": "包河区",
+                    "340121": "长丰县",
+                    "340122": "肥东县",
+                    "340123": "肥西县",
+                    "340124": "庐江县",
+                    "340181": "巢湖"
+                }
+            },
+            "340200": {
+                "code": "340200",
+                "name": "芜湖",
+                "districts": {
+                    "340202": "镜湖区",
+                    "340203": "弋江区",
+                    "340207": "鸠江区",
+                    "340208": "三山区",
+                    "340221": "芜湖县",
+                    "340222": "繁昌县",
+                    "340223": "南陵县",
+                    "340225": "无为县"
+                }
+            },
+            "340300": {
+                "code": "340300",
+                "name": "蚌埠",
+                "districts": {
+                    "340302": "龙子湖区",
+                    "340303": "蚌山区",
+                    "340304": "禹会区",
+                    "340311": "淮上区",
+                    "340321": "怀远县",
+                    "340322": "五河县",
+                    "340323": "固镇县"
+                }
+            },
+            "340400": {
+                "code": "340400",
+                "name": "淮南",
+                "districts": {
+                    "340402": "大通区",
+                    "340403": "田家庵区",
+                    "340404": "谢家集区",
+                    "340405": "八公山区",
+                    "340406": "潘集区",
+                    "340421": "凤台县",
+                    "340422": "寿县"
+                }
+            },
+            "340500": {
+                "code": "340500",
+                "name": "马鞍山",
+                "districts": {
+                    "340503": "花山区",
+                    "340504": "雨山区",
+                    "340506": "博望区",
+                    "340521": "当涂县",
+                    "340522": "含山县",
+                    "340523": "和县"
+                }
+            },
+            "340600": {
+                "code": "340600",
+                "name": "淮北",
+                "districts": {
+                    "340602": "杜集区",
+                    "340603": "相山区",
+                    "340604": "烈山区",
+                    "340621": "濉溪县"
+                }
+            },
+            "340700": {
+                "code": "340700",
+                "name": "铜陵",
+                "districts": {
+                    "340705": "铜官区",
+                    "340706": "义安区",
+                    "340711": "郊区",
+                    "340722": "枞阳县"
+                }
+            },
+            "340800": {
+                "code": "340800",
+                "name": "安庆",
+                "districts": {
+                    "340802": "迎江区",
+                    "340803": "大观区",
+                    "340811": "宜秀区",
+                    "340822": "怀宁县",
+                    "340825": "太湖县",
+                    "340826": "宿松县",
+                    "340827": "望江县",
+                    "340828": "岳西县",
+                    "340881": "桐城",
+                    "340882": "潜山"
+                }
+            },
+            "341000": {
+                "code": "341000",
+                "name": "黄山",
+                "districts": {
+                    "341002": "屯溪区",
+                    "341003": "黄山区",
+                    "341004": "徽州区",
+                    "341021": "歙县",
+                    "341022": "休宁县",
+                    "341023": "黟县",
+                    "341024": "祁门县"
+                }
+            },
+            "341100": {
+                "code": "341100",
+                "name": "滁州",
+                "districts": {
+                    "341102": "琅琊区",
+                    "341103": "南谯区",
+                    "341122": "来安县",
+                    "341124": "全椒县",
+                    "341125": "定远县",
+                    "341126": "凤阳县",
+                    "341181": "天长",
+                    "341182": "明光"
+                }
+            },
+            "341200": {
+                "code": "341200",
+                "name": "阜阳",
+                "districts": {
+                    "341202": "颍州区",
+                    "341203": "颍东区",
+                    "341204": "颍泉区",
+                    "341221": "临泉县",
+                    "341222": "太和县",
+                    "341225": "阜南县",
+                    "341226": "颍上县",
+                    "341282": "界首"
+                }
+            },
+            "341300": {
+                "code": "341300",
+                "name": "宿州",
+                "districts": {
+                    "341302": "埇桥区",
+                    "341321": "砀山县",
+                    "341322": "萧县",
+                    "341323": "灵璧县",
+                    "341324": "泗县"
+                }
+            },
+            "341500": {
+                "code": "341500",
+                "name": "六安",
+                "districts": {
+                    "341502": "金安区",
+                    "341503": "裕安区",
+                    "341504": "叶集区",
+                    "341522": "霍邱县",
+                    "341523": "舒城县",
+                    "341524": "金寨县",
+                    "341525": "霍山县"
+                }
+            },
+            "341600": {
+                "code": "341600",
+                "name": "亳州",
+                "districts": {
+                    "341602": "谯城区",
+                    "341621": "涡阳县",
+                    "341622": "蒙城县",
+                    "341623": "利辛县"
+                }
+            },
+            "341700": {
+                "code": "341700",
+                "name": "池州",
+                "districts": {
+                    "341702": "贵池区",
+                    "341721": "东至县",
+                    "341722": "石台县",
+                    "341723": "青阳县"
+                }
+            },
+            "341800": {
+                "code": "341800",
+                "name": "宣城",
+                "districts": {
+                    "341802": "宣州区",
+                    "341821": "郎溪县",
+                    "341822": "广德县",
+                    "341823": "泾县",
+                    "341824": "绩溪县",
+                    "341825": "旌德县",
+                    "341881": "宁国"
+                }
+            }
+        }
+    },
+    "350000": {
+        "code": "350000",
+        "name": "福建省",
+        "cities": {
+            "350100": {
+                "code": "350100",
+                "name": "福州",
+                "districts": {
+                    "350102": "鼓楼区",
+                    "350103": "台江区",
+                    "350104": "仓山区",
+                    "350105": "马尾区",
+                    "350111": "晋安区",
+                    "350112": "长乐区",
+                    "350121": "闽侯县",
+                    "350122": "连江县",
+                    "350123": "罗源县",
+                    "350124": "闽清县",
+                    "350125": "永泰县",
+                    "350128": "平潭县",
+                    "350181": "福清"
+                }
+            },
+            "350200": {
+                "code": "350200",
+                "name": "厦门",
+                "districts": {
+                    "350203": "思明区",
+                    "350205": "海沧区",
+                    "350206": "湖里区",
+                    "350211": "集美区",
+                    "350212": "同安区",
+                    "350213": "翔安区"
+                }
+            },
+            "350300": {
+                "code": "350300",
+                "name": "莆田",
+                "districts": {
+                    "350302": "城厢区",
+                    "350303": "涵江区",
+                    "350304": "荔城区",
+                    "350305": "秀屿区",
+                    "350322": "仙游县"
+                }
+            },
+            "350400": {
+                "code": "350400",
+                "name": "三明",
+                "districts": {
+                    "350402": "梅列区",
+                    "350403": "三元区",
+                    "350421": "明溪县",
+                    "350423": "清流县",
+                    "350424": "宁化县",
+                    "350425": "大田县",
+                    "350426": "尤溪县",
+                    "350427": "沙县",
+                    "350428": "将乐县",
+                    "350429": "泰宁县",
+                    "350430": "建宁县",
+                    "350481": "永安"
+                }
+            },
+            "350500": {
+                "code": "350500",
+                "name": "泉州",
+                "districts": {
+                    "350502": "鲤城区",
+                    "350503": "丰泽区",
+                    "350504": "洛江区",
+                    "350505": "泉港区",
+                    "350521": "惠安县",
+                    "350524": "安溪县",
+                    "350525": "永春县",
+                    "350526": "德化县",
+                    "350527": "金门县",
+                    "350581": "石狮",
+                    "350582": "晋江",
+                    "350583": "南安"
+                }
+            },
+            "350600": {
+                "code": "350600",
+                "name": "漳州",
+                "districts": {
+                    "350602": "芗城区",
+                    "350603": "龙文区",
+                    "350622": "云霄县",
+                    "350623": "漳浦县",
+                    "350624": "诏安县",
+                    "350625": "长泰县",
+                    "350626": "东山县",
+                    "350627": "南靖县",
+                    "350628": "平和县",
+                    "350629": "华安县",
+                    "350681": "龙海"
+                }
+            },
+            "350700": {
+                "code": "350700",
+                "name": "南平",
+                "districts": {
+                    "350702": "延平区",
+                    "350703": "建阳区",
+                    "350721": "顺昌县",
+                    "350722": "浦城县",
+                    "350723": "光泽县",
+                    "350724": "松溪县",
+                    "350725": "政和县",
+                    "350781": "邵武",
+                    "350782": "武夷山",
+                    "350783": "建瓯"
+                }
+            },
+            "350800": {
+                "code": "350800",
+                "name": "龙岩",
+                "districts": {
+                    "350802": "新罗区",
+                    "350803": "永定区",
+                    "350821": "长汀县",
+                    "350823": "上杭县",
+                    "350824": "武平县",
+                    "350825": "连城县",
+                    "350881": "漳平"
+                }
+            },
+            "350900": {
+                "code": "350900",
+                "name": "宁德",
+                "districts": {
+                    "350902": "蕉城区",
+                    "350921": "霞浦县",
+                    "350922": "古田县",
+                    "350923": "屏南县",
+                    "350924": "寿宁县",
+                    "350925": "周宁县",
+                    "350926": "柘荣县",
+                    "350981": "福安",
+                    "350982": "福鼎"
+                }
+            }
+        }
+    },
+    "360000": {
+        "code": "360000",
+        "name": "江西省",
+        "cities": {
+            "360100": {
+                "code": "360100",
+                "name": "南昌",
+                "districts": {
+                    "360102": "东湖区",
+                    "360103": "西湖区",
+                    "360104": "青云谱区",
+                    "360105": "湾里区",
+                    "360111": "青山湖区",
+                    "360112": "新建区",
+                    "360121": "南昌县",
+                    "360123": "安义县",
+                    "360124": "进贤县"
+                }
+            },
+            "360200": {
+                "code": "360200",
+                "name": "景德镇",
+                "districts": {
+                    "360202": "昌江区",
+                    "360203": "珠山区",
+                    "360222": "浮梁县",
+                    "360281": "乐平"
+                }
+            },
+            "360300": {
+                "code": "360300",
+                "name": "萍乡",
+                "districts": {
+                    "360302": "安源区",
+                    "360313": "湘东区",
+                    "360321": "莲花县",
+                    "360322": "上栗县",
+                    "360323": "芦溪县"
+                }
+            },
+            "360400": {
+                "code": "360400",
+                "name": "九江",
+                "districts": {
+                    "360402": "濂溪区",
+                    "360403": "浔阳区",
+                    "360404": "柴桑区",
+                    "360423": "武宁县",
+                    "360424": "修水县",
+                    "360425": "永修县",
+                    "360426": "德安县",
+                    "360428": "都昌县",
+                    "360429": "湖口县",
+                    "360430": "彭泽县",
+                    "360481": "瑞昌",
+                    "360482": "共青城",
+                    "360483": "庐山"
+                }
+            },
+            "360500": {
+                "code": "360500",
+                "name": "新余",
+                "districts": {
+                    "360502": "渝水区",
+                    "360521": "分宜县"
+                }
+            },
+            "360600": {
+                "code": "360600",
+                "name": "鹰潭",
+                "districts": {
+                    "360602": "月湖区",
+                    "360603": "余江区",
+                    "360681": "贵溪"
+                }
+            },
+            "360700": {
+                "code": "360700",
+                "name": "赣州",
+                "districts": {
+                    "360702": "章贡区",
+                    "360703": "南康区",
+                    "360704": "赣县区",
+                    "360722": "信丰县",
+                    "360723": "大余县",
+                    "360724": "上犹县",
+                    "360725": "崇义县",
+                    "360726": "安远县",
+                    "360727": "龙南县",
+                    "360728": "定南县",
+                    "360729": "全南县",
+                    "360730": "宁都县",
+                    "360731": "于都县",
+                    "360732": "兴国县",
+                    "360733": "会昌县",
+                    "360734": "寻乌县",
+                    "360735": "石城县",
+                    "360781": "瑞金"
+                }
+            },
+            "360800": {
+                "code": "360800",
+                "name": "吉安",
+                "districts": {
+                    "360802": "吉州区",
+                    "360803": "青原区",
+                    "360821": "吉安县",
+                    "360822": "吉水县",
+                    "360823": "峡江县",
+                    "360824": "新干县",
+                    "360825": "永丰县",
+                    "360826": "泰和县",
+                    "360827": "遂川县",
+                    "360828": "万安县",
+                    "360829": "安福县",
+                    "360830": "永新县",
+                    "360881": "井冈山"
+                }
+            },
+            "360900": {
+                "code": "360900",
+                "name": "宜春",
+                "districts": {
+                    "360902": "袁州区",
+                    "360921": "奉新县",
+                    "360922": "万载县",
+                    "360923": "上高县",
+                    "360924": "宜丰县",
+                    "360925": "靖安县",
+                    "360926": "铜鼓县",
+                    "360981": "丰城",
+                    "360982": "樟树",
+                    "360983": "高安"
+                }
+            },
+            "361000": {
+                "code": "361000",
+                "name": "抚州",
+                "districts": {
+                    "361002": "临川区",
+                    "361003": "东乡区",
+                    "361021": "南城县",
+                    "361022": "黎川县",
+                    "361023": "南丰县",
+                    "361024": "崇仁县",
+                    "361025": "乐安县",
+                    "361026": "宜黄县",
+                    "361027": "金溪县",
+                    "361028": "资溪县",
+                    "361030": "广昌县"
+                }
+            },
+            "361100": {
+                "code": "361100",
+                "name": "上饶",
+                "districts": {
+                    "361102": "信州区",
+                    "361103": "广丰区",
+                    "361121": "上饶县",
+                    "361123": "玉山县",
+                    "361124": "铅山县",
+                    "361125": "横峰县",
+                    "361126": "弋阳县",
+                    "361127": "余干县",
+                    "361128": "鄱阳县",
+                    "361129": "万年县",
+                    "361130": "婺源县",
+                    "361181": "德兴"
+                }
+            }
+        }
+    },
+    "370000": {
+        "code": "370000",
+        "name": "山东省",
+        "cities": {
+            "370100": {
+                "code": "370100",
+                "name": "济南",
+                "districts": {
+                    "370102": "历下区",
+                    "370103": "中区",
+                    "370104": "槐荫区",
+                    "370105": "天桥区",
+                    "370112": "历城区",
+                    "370113": "长清区",
+                    "370114": "章丘区",
+                    "370115": "济阳区",
+                    "370116": "莱芜区",
+                    "370117": "钢城区",
+                    "370124": "平阴县",
+                    "370126": "商河县"
+                }
+            },
+            "370200": {
+                "code": "370200",
+                "name": "青岛",
+                "districts": {
+                    "370202": "南区",
+                    "370203": "北区",
+                    "370211": "黄岛区",
+                    "370212": "崂山区",
+                    "370213": "李沧区",
+                    "370214": "城阳区",
+                    "370215": "即墨区",
+                    "370281": "胶州",
+                    "370283": "平度",
+                    "370285": "莱西"
+                }
+            },
+            "370300": {
+                "code": "370300",
+                "name": "淄博",
+                "districts": {
+                    "370302": "淄川区",
+                    "370303": "张店区",
+                    "370304": "博山区",
+                    "370305": "临淄区",
+                    "370306": "周村区",
+                    "370321": "桓台县",
+                    "370322": "高青县",
+                    "370323": "沂源县"
+                }
+            },
+            "370400": {
+                "code": "370400",
+                "name": "枣庄",
+                "districts": {
+                    "370402": "中区",
+                    "370403": "薛城区",
+                    "370404": "峄城区",
+                    "370405": "台儿庄区",
+                    "370406": "山亭区",
+                    "370481": "滕州"
+                }
+            },
+            "370500": {
+                "code": "370500",
+                "name": "东营",
+                "districts": {
+                    "370502": "东营区",
+                    "370503": "河口区",
+                    "370505": "垦利区",
+                    "370522": "利津县",
+                    "370523": "广饶县"
+                }
+            },
+            "370600": {
+                "code": "370600",
+                "name": "烟台",
+                "districts": {
+                    "370602": "芝罘区",
+                    "370611": "福山区",
+                    "370612": "牟平区",
+                    "370613": "莱山区",
+                    "370614": "蓬莱区",
+                    "370681": "龙口",
+                    "370682": "莱阳",
+                    "370683": "莱州",
+                    "370684": "蓬莱",
+                    "370685": "招远",
+                    "370686": "栖霞",
+                    "370687": "海阳"
+                }
+            },
+            "370700": {
+                "code": "370700",
+                "name": "潍坊",
+                "districts": {
+                    "370702": "潍城区",
+                    "370703": "寒亭区",
+                    "370704": "坊子区",
+                    "370705": "奎文区",
+                    "370724": "临朐县",
+                    "370725": "昌乐县",
+                    "370781": "青州",
+                    "370782": "诸城",
+                    "370783": "寿光",
+                    "370784": "安丘",
+                    "370785": "高密",
+                    "370786": "昌邑"
+                }
+            },
+            "370800": {
+                "code": "370800",
+                "name": "济宁",
+                "districts": {
+                    "370811": "任城区",
+                    "370812": "兖州区",
+                    "370826": "微山县",
+                    "370827": "鱼台县",
+                    "370828": "金乡县",
+                    "370829": "嘉祥县",
+                    "370830": "汶上县",
+                    "370831": "泗水县",
+                    "370832": "梁山县",
+                    "370881": "曲阜",
+                    "370883": "邹城"
+                }
+            },
+            "370900": {
+                "code": "370900",
+                "name": "泰安",
+                "districts": {
+                    "370902": "泰山区",
+                    "370911": "岱岳区",
+                    "370921": "宁阳县",
+                    "370923": "东平县",
+                    "370982": "新泰",
+                    "370983": "肥城"
+                }
+            },
+            "371000": {
+                "code": "371000",
+                "name": "威海",
+                "districts": {
+                    "371002": "环翠区",
+                    "371003": "文登区",
+                    "371082": "荣成",
+                    "371083": "乳山"
+                }
+            },
+            "371100": {
+                "code": "371100",
+                "name": "日照",
+                "districts": {
+                    "371102": "东港区",
+                    "371103": "岚山区",
+                    "371121": "五莲县",
+                    "371122": "莒县"
+                }
+            },
+            "371300": {
+                "code": "371300",
+                "name": "临沂",
+                "districts": {
+                    "371302": "兰山区",
+                    "371311": "罗庄区",
+                    "371312": "河东区",
+                    "371321": "沂南县",
+                    "371322": "郯城县",
+                    "371323": "沂水县",
+                    "371324": "兰陵县",
+                    "371325": "费县",
+                    "371326": "平邑县",
+                    "371327": "莒南县",
+                    "371328": "蒙阴县",
+                    "371329": "临沭县"
+                }
+            },
+            "371400": {
+                "code": "371400",
+                "name": "德州",
+                "districts": {
+                    "371402": "德城区",
+                    "371403": "陵城区",
+                    "371422": "宁津县",
+                    "371423": "庆云县",
+                    "371424": "临邑县",
+                    "371425": "齐河县",
+                    "371426": "平原县",
+                    "371427": "夏津县",
+                    "371428": "武城县",
+                    "371481": "乐陵",
+                    "371482": "禹城"
+                }
+            },
+            "371500": {
+                "code": "371500",
+                "name": "聊城",
+                "districts": {
+                    "371502": "东昌府区",
+                    "371521": "阳谷县",
+                    "371522": "莘县",
+                    "371523": "茌平县",
+                    "371524": "东阿县",
+                    "371525": "冠县",
+                    "371526": "高唐县",
+                    "371581": "临清"
+                }
+            },
+            "371600": {
+                "code": "371600",
+                "name": "滨州",
+                "districts": {
+                    "371602": "滨城区",
+                    "371603": "沾化区",
+                    "371621": "惠民县",
+                    "371622": "阳信县",
+                    "371623": "无棣县",
+                    "371625": "博兴县",
+                    "371681": "邹平"
+                }
+            },
+            "371700": {
+                "code": "371700",
+                "name": "菏泽",
+                "districts": {
+                    "371702": "牡丹区",
+                    "371703": "定陶区",
+                    "371721": "曹县",
+                    "371722": "单县",
+                    "371723": "成武县",
+                    "371724": "巨野县",
+                    "371725": "郓城县",
+                    "371726": "鄄城县",
+                    "371728": "东明县"
+                }
+            }
+        }
+    },
+    "410000": {
+        "code": "410000",
+        "name": "河南省",
+        "cities": {
+            "410100": {
+                "code": "410100",
+                "name": "郑州",
+                "districts": {
+                    "410102": "中原区",
+                    "410103": "二七区",
+                    "410104": "管城回族区",
+                    "410105": "金水区",
+                    "410106": "上街区",
+                    "410108": "惠济区",
+                    "410122": "中牟县",
+                    "410181": "巩义",
+                    "410182": "荥阳",
+                    "410183": "新密",
+                    "410184": "新郑",
+                    "410185": "登封"
+                }
+            },
+            "410200": {
+                "code": "410200",
+                "name": "开封",
+                "districts": {
+                    "410202": "龙亭区",
+                    "410203": "顺河回族区",
+                    "410204": "鼓楼区",
+                    "410205": "禹王台区",
+                    "410212": "祥符区",
+                    "410221": "杞县",
+                    "410222": "通许县",
+                    "410223": "尉氏县",
+                    "410225": "兰考县"
+                }
+            },
+            "410300": {
+                "code": "410300",
+                "name": "洛阳",
+                "districts": {
+                    "410302": "老城区",
+                    "410303": "西工区",
+                    "410304": "瀍河回族区",
+                    "410305": "涧西区",
+                    "410306": "吉利区",
+                    "410311": "洛龙区",
+                    "410322": "孟津县",
+                    "410323": "新安县",
+                    "410324": "栾川县",
+                    "410325": "嵩县",
+                    "410326": "汝阳县",
+                    "410327": "宜阳县",
+                    "410328": "洛宁县",
+                    "410329": "伊川县",
+                    "410381": "偃师"
+                }
+            },
+            "410400": {
+                "code": "410400",
+                "name": "平顶山",
+                "districts": {
+                    "410402": "新华区",
+                    "410403": "卫东区",
+                    "410404": "石龙区",
+                    "410411": "湛河区",
+                    "410421": "宝丰县",
+                    "410422": "叶县",
+                    "410423": "鲁山县",
+                    "410425": "郏县",
+                    "410481": "舞钢",
+                    "410482": "汝州"
+                }
+            },
+            "410500": {
+                "code": "410500",
+                "name": "安阳",
+                "districts": {
+                    "410502": "文峰区",
+                    "410503": "北关区",
+                    "410505": "殷都区",
+                    "410506": "龙安区",
+                    "410522": "安阳县",
+                    "410523": "汤阴县",
+                    "410526": "滑县",
+                    "410527": "内黄县",
+                    "410581": "林州"
+                }
+            },
+            "410600": {
+                "code": "410600",
+                "name": "鹤壁",
+                "districts": {
+                    "410602": "鹤山区",
+                    "410603": "山城区",
+                    "410611": "淇滨区",
+                    "410621": "浚县",
+                    "410622": "淇县"
+                }
+            },
+            "410700": {
+                "code": "410700",
+                "name": "新乡",
+                "districts": {
+                    "410702": "红旗区",
+                    "410703": "卫滨区",
+                    "410704": "凤泉区",
+                    "410711": "牧野区",
+                    "410721": "新乡县",
+                    "410724": "获嘉县",
+                    "410725": "原阳县",
+                    "410726": "延津县",
+                    "410727": "封丘县",
+                    "410728": "长垣县",
+                    "410781": "卫辉",
+                    "410782": "辉县"
+                }
+            },
+            "410800": {
+                "code": "410800",
+                "name": "焦作",
+                "districts": {
+                    "410802": "解放区",
+                    "410803": "中站区",
+                    "410804": "马村区",
+                    "410811": "山阳区",
+                    "410821": "修武县",
+                    "410822": "博爱县",
+                    "410823": "武陟县",
+                    "410825": "温县",
+                    "410882": "沁阳",
+                    "410883": "孟州"
+                }
+            },
+            "410900": {
+                "code": "410900",
+                "name": "濮阳",
+                "districts": {
+                    "410902": "华龙区",
+                    "410922": "清丰县",
+                    "410923": "南乐县",
+                    "410926": "范县",
+                    "410927": "台前县",
+                    "410928": "濮阳县"
+                }
+            },
+            "411000": {
+                "code": "411000",
+                "name": "许昌",
+                "districts": {
+                    "411002": "魏都区",
+                    "411003": "建安区",
+                    "411024": "鄢陵县",
+                    "411025": "襄城县",
+                    "411081": "禹州",
+                    "411082": "长葛"
+                }
+            },
+            "411100": {
+                "code": "411100",
+                "name": "漯河",
+                "districts": {
+                    "411102": "源汇区",
+                    "411103": "郾城区",
+                    "411104": "召陵区",
+                    "411121": "舞阳县",
+                    "411122": "临颍县"
+                }
+            },
+            "411200": {
+                "code": "411200",
+                "name": "三门峡",
+                "districts": {
+                    "411202": "湖滨区",
+                    "411203": "陕州区",
+                    "411221": "渑池县",
+                    "411224": "卢氏县",
+                    "411281": "义马",
+                    "411282": "灵宝"
+                }
+            },
+            "411300": {
+                "code": "411300",
+                "name": "南阳",
+                "districts": {
+                    "411302": "宛城区",
+                    "411303": "卧龙区",
+                    "411321": "南召县",
+                    "411322": "方城县",
+                    "411323": "西峡县",
+                    "411324": "镇平县",
+                    "411325": "内乡县",
+                    "411326": "淅川县",
+                    "411327": "社旗县",
+                    "411328": "唐河县",
+                    "411329": "新野县",
+                    "411330": "桐柏县",
+                    "411381": "邓州"
+                }
+            },
+            "411400": {
+                "code": "411400",
+                "name": "商丘",
+                "districts": {
+                    "411402": "梁园区",
+                    "411403": "睢阳区",
+                    "411421": "民权县",
+                    "411422": "睢县",
+                    "411423": "宁陵县",
+                    "411424": "柘城县",
+                    "411425": "虞城县",
+                    "411426": "夏邑县",
+                    "411481": "永城"
+                }
+            },
+            "411500": {
+                "code": "411500",
+                "name": "信阳",
+                "districts": {
+                    "411502": "浉河区",
+                    "411503": "平桥区",
+                    "411521": "罗山县",
+                    "411522": "光山县",
+                    "411523": "新县",
+                    "411524": "商城县",
+                    "411525": "固始县",
+                    "411526": "潢川县",
+                    "411527": "淮滨县",
+                    "411528": "息县"
+                }
+            },
+            "411600": {
+                "code": "411600",
+                "name": "周口",
+                "districts": {
+                    "411602": "川汇区",
+                    "411621": "扶沟县",
+                    "411622": "西华县",
+                    "411623": "商水县",
+                    "411624": "沈丘县",
+                    "411625": "郸城县",
+                    "411626": "淮阳县",
+                    "411627": "太康县",
+                    "411628": "鹿邑县",
+                    "411681": "项城"
+                }
+            },
+            "411700": {
+                "code": "411700",
+                "name": "驻马店",
+                "districts": {
+                    "411702": "驿城区",
+                    "411721": "西平县",
+                    "411722": "上蔡县",
+                    "411723": "平舆县",
+                    "411724": "正阳县",
+                    "411725": "确山县",
+                    "411726": "泌阳县",
+                    "411727": "汝南县",
+                    "411728": "遂平县",
+                    "411729": "新蔡县"
+                }
+            }
+        }
+    },
+    "420000": {
+        "code": "420000",
+        "name": "湖北省",
+        "cities": {
+            "420100": {
+                "code": "420100",
+                "name": "武汉",
+                "districts": {
+                    "420102": "江岸区",
+                    "420103": "江汉区",
+                    "420104": "硚口区",
+                    "420105": "汉阳区",
+                    "420106": "武昌区",
+                    "420107": "青山区",
+                    "420111": "洪山区",
+                    "420112": "东西湖区",
+                    "420113": "汉南区",
+                    "420114": "蔡甸区",
+                    "420115": "江夏区",
+                    "420116": "黄陂区",
+                    "420117": "新洲区"
+                }
+            },
+            "420200": {
+                "code": "420200",
+                "name": "黄石",
+                "districts": {
+                    "420202": "黄石港区",
+                    "420203": "西塞山区",
+                    "420204": "下陆区",
+                    "420205": "铁山区",
+                    "420222": "阳新县",
+                    "420281": "大冶"
+                }
+            },
+            "420300": {
+                "code": "420300",
+                "name": "十堰",
+                "districts": {
+                    "420302": "茅箭区",
+                    "420303": "张湾区",
+                    "420304": "郧阳区",
+                    "420322": "郧西县",
+                    "420323": "竹山县",
+                    "420324": "竹溪县",
+                    "420325": "房县",
+                    "420381": "丹江口"
+                }
+            },
+            "420500": {
+                "code": "420500",
+                "name": "宜昌",
+                "districts": {
+                    "420502": "西陵区",
+                    "420503": "伍家岗区",
+                    "420504": "点军区",
+                    "420505": "猇亭区",
+                    "420506": "夷陵区",
+                    "420525": "远安县",
+                    "420526": "兴山县",
+                    "420527": "秭归县",
+                    "420528": "长阳土家族自治县",
+                    "420529": "五峰土家族自治县",
+                    "420581": "宜都",
+                    "420582": "当阳",
+                    "420583": "枝江"
+                }
+            },
+            "420600": {
+                "code": "420600",
+                "name": "襄阳",
+                "districts": {
+                    "420602": "襄城区",
+                    "420606": "樊城区",
+                    "420607": "襄州区",
+                    "420624": "南漳县",
+                    "420625": "谷城县",
+                    "420626": "保康县",
+                    "420682": "老河口",
+                    "420683": "枣阳",
+                    "420684": "宜城"
+                }
+            },
+            "420700": {
+                "code": "420700",
+                "name": "鄂州",
+                "districts": {
+                    "420702": "梁子湖区",
+                    "420703": "华容区",
+                    "420704": "鄂城区"
+                }
+            },
+            "420800": {
+                "code": "420800",
+                "name": "荆门",
+                "districts": {
+                    "420802": "东宝区",
+                    "420804": "掇刀区",
+                    "420822": "沙洋县",
+                    "420881": "钟祥",
+                    "420882": "京山"
+                }
+            },
+            "420900": {
+                "code": "420900",
+                "name": "孝感",
+                "districts": {
+                    "420902": "孝南区",
+                    "420921": "孝昌县",
+                    "420922": "大悟县",
+                    "420923": "云梦县",
+                    "420981": "应城",
+                    "420982": "安陆",
+                    "420984": "汉川"
+                }
+            },
+            "421000": {
+                "code": "421000",
+                "name": "荆州",
+                "districts": {
+                    "421002": "沙区",
+                    "421003": "荆州区",
+                    "421022": "公安县",
+                    "421023": "监利县",
+                    "421024": "江陵县",
+                    "421081": "石首",
+                    "421083": "洪湖",
+                    "421087": "松滋"
+                }
+            },
+            "421100": {
+                "code": "421100",
+                "name": "黄冈",
+                "districts": {
+                    "421102": "黄州区",
+                    "421121": "团风县",
+                    "421122": "红安县",
+                    "421123": "罗田县",
+                    "421124": "英山县",
+                    "421125": "浠水县",
+                    "421126": "蕲春县",
+                    "421127": "黄梅县",
+                    "421181": "麻城",
+                    "421182": "武穴"
+                }
+            },
+            "421200": {
+                "code": "421200",
+                "name": "咸宁",
+                "districts": {
+                    "421202": "咸安区",
+                    "421221": "嘉鱼县",
+                    "421222": "通城县",
+                    "421223": "崇阳县",
+                    "421224": "通山县",
+                    "421281": "赤壁"
+                }
+            },
+            "421300": {
+                "code": "421300",
+                "name": "随州",
+                "districts": {
+                    "421303": "曾都区",
+                    "421321": "随县",
+                    "421381": "广水"
+                }
+            },
+            "422800": {
+                "code": "422800",
+                "name": "恩施土家族苗族自治州",
+                "districts": {
+                    "422801": "恩施",
+                    "422802": "利川",
+                    "422822": "建始县",
+                    "422823": "巴东县",
+                    "422825": "宣恩县",
+                    "422826": "咸丰县",
+                    "422827": "来凤县",
+                    "422828": "鹤峰县"
+                }
+            }
+        }
+    },
+    "430000": {
+        "code": "430000",
+        "name": "湖南省",
+        "cities": {
+            "430100": {
+                "code": "430100",
+                "name": "长沙",
+                "districts": {
+                    "430102": "芙蓉区",
+                    "430103": "天心区",
+                    "430104": "岳麓区",
+                    "430105": "开福区",
+                    "430111": "雨花区",
+                    "430112": "望城区",
+                    "430121": "长沙县",
+                    "430181": "浏阳",
+                    "430182": "宁乡"
+                }
+            },
+            "430200": {
+                "code": "430200",
+                "name": "株洲",
+                "districts": {
+                    "430202": "荷塘区",
+                    "430203": "芦淞区",
+                    "430204": "石峰区",
+                    "430211": "天元区",
+                    "430212": "渌口区",
+                    "430223": "攸县",
+                    "430224": "茶陵县",
+                    "430225": "炎陵县",
+                    "430281": "醴陵"
+                }
+            },
+            "430300": {
+                "code": "430300",
+                "name": "湘潭",
+                "districts": {
+                    "430302": "雨湖区",
+                    "430304": "岳塘区",
+                    "430321": "湘潭县",
+                    "430381": "湘乡",
+                    "430382": "韶山"
+                }
+            },
+            "430400": {
+                "code": "430400",
+                "name": "衡阳",
+                "districts": {
+                    "430405": "珠晖区",
+                    "430406": "雁峰区",
+                    "430407": "石鼓区",
+                    "430408": "蒸湘区",
+                    "430412": "南岳区",
+                    "430421": "衡阳县",
+                    "430422": "衡南县",
+                    "430423": "衡山县",
+                    "430424": "衡东县",
+                    "430426": "祁东县",
+                    "430481": "耒阳",
+                    "430482": "常宁"
+                }
+            },
+            "430500": {
+                "code": "430500",
+                "name": "邵阳",
+                "districts": {
+                    "430502": "双清区",
+                    "430503": "大祥区",
+                    "430511": "北塔区",
+                    "430521": "邵东县",
+                    "430522": "新邵县",
+                    "430523": "邵阳县",
+                    "430524": "隆回县",
+                    "430525": "洞口县",
+                    "430527": "绥宁县",
+                    "430528": "新宁县",
+                    "430529": "城步苗族自治县",
+                    "430581": "武冈"
+                }
+            },
+            "430600": {
+                "code": "430600",
+                "name": "岳阳",
+                "districts": {
+                    "430602": "岳阳楼区",
+                    "430603": "云溪区",
+                    "430611": "君山区",
+                    "430621": "岳阳县",
+                    "430623": "华容县",
+                    "430624": "湘阴县",
+                    "430626": "平江县",
+                    "430681": "汨罗",
+                    "430682": "临湘"
+                }
+            },
+            "430700": {
+                "code": "430700",
+                "name": "常德",
+                "districts": {
+                    "430702": "武陵区",
+                    "430703": "鼎城区",
+                    "430721": "安乡县",
+                    "430722": "汉寿县",
+                    "430723": "澧县",
+                    "430724": "临澧县",
+                    "430725": "桃源县",
+                    "430726": "石门县",
+                    "430781": "津"
+                }
+            },
+            "430800": {
+                "code": "430800",
+                "name": "张家界",
+                "districts": {
+                    "430802": "永定区",
+                    "430811": "武陵源区",
+                    "430821": "慈利县",
+                    "430822": "桑植县"
+                }
+            },
+            "430900": {
+                "code": "430900",
+                "name": "益阳",
+                "districts": {
+                    "430902": "资阳区",
+                    "430903": "赫山区",
+                    "430921": "南县",
+                    "430922": "桃江县",
+                    "430923": "安化县",
+                    "430981": "沅江"
+                }
+            },
+            "431000": {
+                "code": "431000",
+                "name": "郴州",
+                "districts": {
+                    "431002": "北湖区",
+                    "431003": "苏仙区",
+                    "431021": "桂阳县",
+                    "431022": "宜章县",
+                    "431023": "永兴县",
+                    "431024": "嘉禾县",
+                    "431025": "临武县",
+                    "431026": "汝城县",
+                    "431027": "桂东县",
+                    "431028": "安仁县",
+                    "431081": "资兴"
+                }
+            },
+            "431100": {
+                "code": "431100",
+                "name": "永州",
+                "districts": {
+                    "431102": "零陵区",
+                    "431103": "冷水滩区",
+                    "431121": "祁阳县",
+                    "431122": "东安县",
+                    "431123": "双牌县",
+                    "431124": "道县",
+                    "431125": "江永县",
+                    "431126": "宁远县",
+                    "431127": "蓝山县",
+                    "431128": "新田县",
+                    "431129": "江华瑶族自治县"
+                }
+            },
+            "431200": {
+                "code": "431200",
+                "name": "怀化",
+                "districts": {
+                    "431202": "鹤城区",
+                    "431221": "中方县",
+                    "431222": "沅陵县",
+                    "431223": "辰溪县",
+                    "431224": "溆浦县",
+                    "431225": "会同县",
+                    "431226": "麻阳苗族自治县",
+                    "431227": "新晃侗族自治县",
+                    "431228": "芷江侗族自治县",
+                    "431229": "靖州苗族侗族自治县",
+                    "431230": "通道侗族自治县",
+                    "431281": "洪江"
+                }
+            },
+            "431300": {
+                "code": "431300",
+                "name": "娄底",
+                "districts": {
+                    "431302": "娄星区",
+                    "431321": "双峰县",
+                    "431322": "新化县",
+                    "431381": "冷水江",
+                    "431382": "涟源"
+                }
+            },
+            "433100": {
+                "code": "433100",
+                "name": "湘西土家族苗族自治州",
+                "districts": {
+                    "433101": "吉首",
+                    "433122": "泸溪县",
+                    "433123": "凤凰县",
+                    "433124": "花垣县",
+                    "433125": "保靖县",
+                    "433126": "古丈县",
+                    "433127": "永顺县",
+                    "433130": "龙山县"
+                }
+            }
+        }
+    },
+    "440000": {
+        "code": "440000",
+        "name": "广东省",
+        "cities": {
+            "440100": {
+                "code": "440100",
+                "name": "广州",
+                "districts": {
+                    "440103": "荔湾区",
+                    "440104": "越秀区",
+                    "440105": "海珠区",
+                    "440106": "天河区",
+                    "440111": "白云区",
+                    "440112": "黄埔区",
+                    "440113": "番禺区",
+                    "440114": "花都区",
+                    "440115": "南沙区",
+                    "440117": "从化区",
+                    "440118": "增城区"
+                }
+            },
+            "440200": {
+                "code": "440200",
+                "name": "韶关",
+                "districts": {
+                    "440203": "武江区",
+                    "440204": "浈江区",
+                    "440205": "曲江区",
+                    "440222": "始兴县",
+                    "440224": "仁化县",
+                    "440229": "翁源县",
+                    "440232": "乳源瑶族自治县",
+                    "440233": "新丰县",
+                    "440281": "乐昌",
+                    "440282": "南雄"
+                }
+            },
+            "440300": {
+                "code": "440300",
+                "name": "深圳",
+                "districts": {
+                    "440303": "罗湖区",
+                    "440304": "福田区",
+                    "440305": "南山区",
+                    "440306": "宝安区",
+                    "440307": "龙岗区",
+                    "440308": "盐田区",
+                    "440309": "龙华区",
+                    "440310": "坪山区",
+                    "440311": "光明区"
+                }
+            },
+            "440400": {
+                "code": "440400",
+                "name": "珠海",
+                "districts": {
+                    "440402": "香洲区",
+                    "440403": "斗门区",
+                    "440404": "金湾区"
+                }
+            },
+            "440500": {
+                "code": "440500",
+                "name": "汕头",
+                "districts": {
+                    "440507": "龙湖区",
+                    "440511": "金平区",
+                    "440512": "濠江区",
+                    "440513": "潮阳区",
+                    "440514": "潮南区",
+                    "440515": "澄海区",
+                    "440523": "南澳县"
+                }
+            },
+            "440600": {
+                "code": "440600",
+                "name": "佛山",
+                "districts": {
+                    "440604": "禅城区",
+                    "440605": "南海区",
+                    "440606": "顺德区",
+                    "440607": "三水区",
+                    "440608": "高明区"
+                }
+            },
+            "440700": {
+                "code": "440700",
+                "name": "江门",
+                "districts": {
+                    "440703": "蓬江区",
+                    "440704": "江海区",
+                    "440705": "新会区",
+                    "440781": "台山",
+                    "440783": "开平",
+                    "440784": "鹤山",
+                    "440785": "恩平"
+                }
+            },
+            "440800": {
+                "code": "440800",
+                "name": "湛江",
+                "districts": {
+                    "440802": "赤坎区",
+                    "440803": "霞山区",
+                    "440804": "坡头区",
+                    "440811": "麻章区",
+                    "440823": "遂溪县",
+                    "440825": "徐闻县",
+                    "440881": "廉江",
+                    "440882": "雷州",
+                    "440883": "吴川"
+                }
+            },
+            "440900": {
+                "code": "440900",
+                "name": "茂名",
+                "districts": {
+                    "440902": "茂南区",
+                    "440904": "电白区",
+                    "440981": "高州",
+                    "440982": "化州",
+                    "440983": "信宜"
+                }
+            },
+            "441200": {
+                "code": "441200",
+                "name": "肇庆",
+                "districts": {
+                    "441202": "端州区",
+                    "441203": "鼎湖区",
+                    "441204": "高要区",
+                    "441223": "广宁县",
+                    "441224": "怀集县",
+                    "441225": "封开县",
+                    "441226": "德庆县",
+                    "441284": "四会"
+                }
+            },
+            "441300": {
+                "code": "441300",
+                "name": "惠州",
+                "districts": {
+                    "441302": "惠城区",
+                    "441303": "惠阳区",
+                    "441322": "博罗县",
+                    "441323": "惠东县",
+                    "441324": "龙门县"
+                }
+            },
+            "441400": {
+                "code": "441400",
+                "name": "梅州",
+                "districts": {
+                    "441402": "梅江区",
+                    "441403": "梅县区",
+                    "441422": "大埔县",
+                    "441423": "丰顺县",
+                    "441424": "五华县",
+                    "441426": "平远县",
+                    "441427": "蕉岭县",
+                    "441481": "兴宁"
+                }
+            },
+            "441500": {
+                "code": "441500",
+                "name": "汕尾",
+                "districts": {
+                    "441502": "城区",
+                    "441521": "海丰县",
+                    "441523": "陆河县",
+                    "441581": "陆丰"
+                }
+            },
+            "441600": {
+                "code": "441600",
+                "name": "河源",
+                "districts": {
+                    "441602": "源城区",
+                    "441621": "紫金县",
+                    "441622": "龙川县",
+                    "441623": "连平县",
+                    "441624": "和平县",
+                    "441625": "东源县"
+                }
+            },
+            "441700": {
+                "code": "441700",
+                "name": "阳江",
+                "districts": {
+                    "441702": "江城区",
+                    "441704": "阳东区",
+                    "441721": "阳西县",
+                    "441781": "阳春"
+                }
+            },
+            "441800": {
+                "code": "441800",
+                "name": "清远",
+                "districts": {
+                    "441802": "清城区",
+                    "441803": "清新区",
+                    "441821": "佛冈县",
+                    "441823": "阳山县",
+                    "441825": "连山壮族瑶族自治县",
+                    "441826": "连南瑶族自治县",
+                    "441881": "英德",
+                    "441882": "连州"
+                }
+            },
+            "441900": {
+                "code": "441900",
+                "name": "东莞",
+                "districts": {}
+            },
+            "442000": {
+                "code": "442000",
+                "name": "中山",
+                "districts": {}
+            },
+            "445100": {
+                "code": "445100",
+                "name": "潮州",
+                "districts": {
+                    "445102": "湘桥区",
+                    "445103": "潮安区",
+                    "445122": "饶平县"
+                }
+            },
+            "445200": {
+                "code": "445200",
+                "name": "揭阳",
+                "districts": {
+                    "445202": "榕城区",
+                    "445203": "揭东区",
+                    "445222": "揭西县",
+                    "445224": "惠来县",
+                    "445281": "普宁"
+                }
+            },
+            "445300": {
+                "code": "445300",
+                "name": "云浮",
+                "districts": {
+                    "445302": "云城区",
+                    "445303": "云安区",
+                    "445321": "新兴县",
+                    "445322": "郁南县",
+                    "445381": "罗定"
+                }
+            }
+        }
+    },
+    "450000": {
+        "code": "450000",
+        "name": "广西壮族自治区",
+        "cities": {
+            "450100": {
+                "code": "450100",
+                "name": "南宁",
+                "districts": {
+                    "450102": "兴宁区",
+                    "450103": "青秀区",
+                    "450105": "江南区",
+                    "450107": "西乡塘区",
+                    "450108": "良庆区",
+                    "450109": "邕宁区",
+                    "450110": "武鸣区",
+                    "450123": "隆安县",
+                    "450124": "马山县",
+                    "450125": "上林县",
+                    "450126": "宾阳县",
+                    "450127": "横县"
+                }
+            },
+            "450200": {
+                "code": "450200",
+                "name": "柳州",
+                "districts": {
+                    "450202": "城中区",
+                    "450203": "鱼峰区",
+                    "450204": "柳南区",
+                    "450205": "柳北区",
+                    "450206": "柳江区",
+                    "450222": "柳城县",
+                    "450223": "鹿寨县",
+                    "450224": "融安县",
+                    "450225": "融水苗族自治县",
+                    "450226": "三江侗族自治县"
+                }
+            },
+            "450300": {
+                "code": "450300",
+                "name": "桂林",
+                "districts": {
+                    "450302": "秀峰区",
+                    "450303": "叠彩区",
+                    "450304": "象山区",
+                    "450305": "七星区",
+                    "450311": "雁山区",
+                    "450312": "临桂区",
+                    "450321": "阳朔县",
+                    "450323": "灵川县",
+                    "450324": "全州县",
+                    "450325": "兴安县",
+                    "450326": "永福县",
+                    "450327": "灌阳县",
+                    "450328": "龙胜各族自治县",
+                    "450329": "资源县",
+                    "450330": "平乐县",
+                    "450332": "恭城瑶族自治县",
+                    "450381": "荔浦"
+                }
+            },
+            "450400": {
+                "code": "450400",
+                "name": "梧州",
+                "districts": {
+                    "450403": "万秀区",
+                    "450405": "长洲区",
+                    "450406": "龙圩区",
+                    "450421": "苍梧县",
+                    "450422": "藤县",
+                    "450423": "蒙山县",
+                    "450481": "岑溪"
+                }
+            },
+            "450500": {
+                "code": "450500",
+                "name": "北海",
+                "districts": {
+                    "450502": "海城区",
+                    "450503": "银海区",
+                    "450512": "铁山港区",
+                    "450521": "合浦县"
+                }
+            },
+            "450600": {
+                "code": "450600",
+                "name": "防城港",
+                "districts": {
+                    "450602": "港口区",
+                    "450603": "防城区",
+                    "450621": "上思县",
+                    "450681": "东兴"
+                }
+            },
+            "450700": {
+                "code": "450700",
+                "name": "钦州",
+                "districts": {
+                    "450702": "钦南区",
+                    "450703": "钦北区",
+                    "450721": "灵山县",
+                    "450722": "浦北县"
+                }
+            },
+            "450800": {
+                "code": "450800",
+                "name": "贵港",
+                "districts": {
+                    "450802": "港北区",
+                    "450803": "港南区",
+                    "450804": "覃塘区",
+                    "450821": "平南县",
+                    "450881": "桂平"
+                }
+            },
+            "450900": {
+                "code": "450900",
+                "name": "玉林",
+                "districts": {
+                    "450902": "玉州区",
+                    "450903": "福绵区",
+                    "450921": "容县",
+                    "450922": "陆川县",
+                    "450923": "博白县",
+                    "450924": "兴业县",
+                    "450981": "北流"
+                }
+            },
+            "451000": {
+                "code": "451000",
+                "name": "百色",
+                "districts": {
+                    "451002": "右江区",
+                    "451021": "田阳县",
+                    "451022": "田东县",
+                    "451023": "平果县",
+                    "451024": "德保县",
+                    "451026": "那坡县",
+                    "451027": "凌云县",
+                    "451028": "乐业县",
+                    "451029": "田林县",
+                    "451030": "西林县",
+                    "451031": "隆林各族自治县",
+                    "451081": "靖西"
+                }
+            },
+            "451100": {
+                "code": "451100",
+                "name": "贺州",
+                "districts": {
+                    "451102": "八步区",
+                    "451103": "平桂区",
+                    "451121": "昭平县",
+                    "451122": "钟山县",
+                    "451123": "富川瑶族自治县"
+                }
+            },
+            "451200": {
+                "code": "451200",
+                "name": "河池",
+                "districts": {
+                    "451202": "金城江区",
+                    "451203": "宜州区",
+                    "451221": "南丹县",
+                    "451222": "天峨县",
+                    "451223": "凤山县",
+                    "451224": "东兰县",
+                    "451225": "罗城仫佬族自治县",
+                    "451226": "环江毛南族自治县",
+                    "451227": "巴马瑶族自治县",
+                    "451228": "都安瑶族自治县",
+                    "451229": "大化瑶族自治县"
+                }
+            },
+            "451300": {
+                "code": "451300",
+                "name": "来宾",
+                "districts": {
+                    "451302": "兴宾区",
+                    "451321": "忻城县",
+                    "451322": "象州县",
+                    "451323": "武宣县",
+                    "451324": "金秀瑶族自治县",
+                    "451381": "合山"
+                }
+            },
+            "451400": {
+                "code": "451400",
+                "name": "崇左",
+                "districts": {
+                    "451402": "江州区",
+                    "451421": "扶绥县",
+                    "451422": "宁明县",
+                    "451423": "龙州县",
+                    "451424": "大新县",
+                    "451425": "天等县",
+                    "451481": "凭祥"
+                }
+            }
+        }
+    },
+    "460000": {
+        "code": "460000",
+        "name": "海南省",
+        "cities": {
+            "460100": {
+                "code": "460100",
+                "name": "海口",
+                "districts": {
+                    "460105": "秀英区",
+                    "460106": "龙华区",
+                    "460107": "琼山区",
+                    "460108": "美兰区"
+                }
+            },
+            "460200": {
+                "code": "460200",
+                "name": "三亚",
+                "districts": {
+                    "460202": "海棠区",
+                    "460203": "吉阳区",
+                    "460204": "天涯区",
+                    "460205": "崖州区"
+                }
+            },
+            "460300": {
+                "code": "460300",
+                "name": "三沙",
+                "districts": {
+                    "460321": "西沙群岛",
+                    "460322": "南沙群岛",
+                    "460323": "中沙群岛的岛礁及其海域",
+                    "460324": "永乐群岛"
+                }
+            },
+            "460400": {
+                "code": "460400",
+                "name": "儋州",
+                "districts": {}
+            }
+        }
+    },
+    "500000": {
+        "code": "500000",
+        "name": "重庆",
+        "cities": {
+            "500000": {
+                "code": "500000",
+                "name": "重庆",
+                "districts": {
+                    "500101": "万州区",
+                    "500102": "涪陵区",
+                    "500103": "渝中区",
+                    "500104": "大渡口区",
+                    "500105": "江北区",
+                    "500106": "沙坪坝区",
+                    "500107": "九龙坡区",
+                    "500108": "南岸区",
+                    "500109": "北碚区",
+                    "500110": "綦江区",
+                    "500111": "大足区",
+                    "500112": "渝北区",
+                    "500113": "巴南区",
+                    "500114": "黔江区",
+                    "500115": "长寿区",
+                    "500116": "江津区",
+                    "500117": "合川区",
+                    "500118": "永川区",
+                    "500119": "南川区",
+                    "500120": "璧山区",
+                    "500151": "铜梁区",
+                    "500152": "潼南区",
+                    "500153": "荣昌区",
+                    "500154": "开州区",
+                    "500155": "梁平区",
+                    "500156": "武隆区",
+                    "500229": "城口县",
+                    "500230": "丰都县",
+                    "500231": "垫江县",
+                    "500233": "忠县",
+                    "500235": "云阳县",
+                    "500236": "奉节县",
+                    "500237": "巫山县",
+                    "500238": "巫溪县",
+                    "500240": "石柱土家族自治县",
+                    "500241": "秀山土家族苗族自治县",
+                    "500242": "酉阳土家族苗族自治县",
+                    "500243": "彭水苗族土家族自治县"
+                }
+            }
+        }
+    },
+    "510000": {
+        "code": "510000",
+        "name": "四川省",
+        "cities": {
+            "510100": {
+                "code": "510100",
+                "name": "成都",
+                "districts": {
+                    "510104": "锦江区",
+                    "510105": "青羊区",
+                    "510106": "金牛区",
+                    "510107": "武侯区",
+                    "510108": "成华区",
+                    "510112": "龙泉驿区",
+                    "510113": "青白江区",
+                    "510114": "新都区",
+                    "510115": "温江区",
+                    "510116": "双流区",
+                    "510117": "郫都区",
+                    "510121": "金堂县",
+                    "510129": "大邑县",
+                    "510131": "蒲江县",
+                    "510132": "新津县",
+                    "510181": "都江堰",
+                    "510182": "彭州",
+                    "510183": "邛崃",
+                    "510184": "崇州",
+                    "510185": "简阳"
+                }
+            },
+            "510300": {
+                "code": "510300",
+                "name": "自贡",
+                "districts": {
+                    "510302": "自流井区",
+                    "510303": "贡井区",
+                    "510304": "大安区",
+                    "510311": "沿滩区",
+                    "510321": "荣县",
+                    "510322": "富顺县"
+                }
+            },
+            "510400": {
+                "code": "510400",
+                "name": "攀枝花",
+                "districts": {
+                    "510402": "东区",
+                    "510403": "西区",
+                    "510411": "仁和区",
+                    "510421": "米易县",
+                    "510422": "盐边县"
+                }
+            },
+            "510500": {
+                "code": "510500",
+                "name": "泸州",
+                "districts": {
+                    "510502": "江阳区",
+                    "510503": "纳溪区",
+                    "510504": "龙马潭区",
+                    "510521": "泸县",
+                    "510522": "合江县",
+                    "510524": "叙永县",
+                    "510525": "古蔺县"
+                }
+            },
+            "510600": {
+                "code": "510600",
+                "name": "德阳",
+                "districts": {
+                    "510603": "旌阳区",
+                    "510604": "罗江区",
+                    "510623": "中江县",
+                    "510681": "广汉",
+                    "510682": "什邡",
+                    "510683": "绵竹"
+                }
+            },
+            "510700": {
+                "code": "510700",
+                "name": "绵阳",
+                "districts": {
+                    "510703": "涪城区",
+                    "510704": "游仙区",
+                    "510705": "安州区",
+                    "510722": "三台县",
+                    "510723": "盐亭县",
+                    "510725": "梓潼县",
+                    "510726": "北川羌族自治县",
+                    "510727": "平武县",
+                    "510781": "江油"
+                }
+            },
+            "510800": {
+                "code": "510800",
+                "name": "广元",
+                "districts": {
+                    "510802": "利州区",
+                    "510811": "昭化区",
+                    "510812": "朝天区",
+                    "510821": "旺苍县",
+                    "510822": "青川县",
+                    "510823": "剑阁县",
+                    "510824": "苍溪县"
+                }
+            },
+            "510900": {
+                "code": "510900",
+                "name": "遂宁",
+                "districts": {
+                    "510903": "船山区",
+                    "510904": "安居区",
+                    "510921": "蓬溪县",
+                    "510922": "射洪县",
+                    "510923": "大英县"
+                }
+            },
+            "511000": {
+                "code": "511000",
+                "name": "内江",
+                "districts": {
+                    "511002": "中区",
+                    "511011": "东兴区",
+                    "511024": "威远县",
+                    "511025": "资中县",
+                    "511083": "隆昌"
+                }
+            },
+            "511100": {
+                "code": "511100",
+                "name": "乐山",
+                "districts": {
+                    "511102": "中区",
+                    "511111": "沙湾区",
+                    "511112": "五通桥区",
+                    "511113": "金口河区",
+                    "511123": "犍为县",
+                    "511124": "井研县",
+                    "511126": "夹江县",
+                    "511129": "沐川县",
+                    "511132": "峨边彝族自治县",
+                    "511133": "马边彝族自治县",
+                    "511181": "峨眉山"
+                }
+            },
+            "511300": {
+                "code": "511300",
+                "name": "南充",
+                "districts": {
+                    "511302": "顺庆区",
+                    "511303": "高坪区",
+                    "511304": "嘉陵区",
+                    "511321": "南部县",
+                    "511322": "营山县",
+                    "511323": "蓬安县",
+                    "511324": "仪陇县",
+                    "511325": "西充县",
+                    "511381": "阆中"
+                }
+            },
+            "511400": {
+                "code": "511400",
+                "name": "眉山",
+                "districts": {
+                    "511402": "东坡区",
+                    "511403": "彭山区",
+                    "511421": "仁寿县",
+                    "511423": "洪雅县",
+                    "511424": "丹棱县",
+                    "511425": "青神县"
+                }
+            },
+            "511500": {
+                "code": "511500",
+                "name": "宜宾",
+                "districts": {
+                    "511502": "翠屏区",
+                    "511503": "南溪区",
+                    "511504": "叙州区",
+                    "511523": "江安县",
+                    "511524": "长宁县",
+                    "511525": "高县",
+                    "511526": "珙县",
+                    "511527": "筠连县",
+                    "511528": "兴文县",
+                    "511529": "屏山县"
+                }
+            },
+            "511600": {
+                "code": "511600",
+                "name": "广安",
+                "districts": {
+                    "511602": "广安区",
+                    "511603": "前锋区",
+                    "511621": "岳池县",
+                    "511622": "武胜县",
+                    "511623": "邻水县",
+                    "511681": "华蓥"
+                }
+            },
+            "511700": {
+                "code": "511700",
+                "name": "达州",
+                "districts": {
+                    "511702": "通川区",
+                    "511703": "达川区",
+                    "511722": "宣汉县",
+                    "511723": "开江县",
+                    "511724": "大竹县",
+                    "511725": "渠县",
+                    "511781": "万源"
+                }
+            },
+            "511800": {
+                "code": "511800",
+                "name": "雅安",
+                "districts": {
+                    "511802": "雨城区",
+                    "511803": "名山区",
+                    "511822": "荥经县",
+                    "511823": "汉源县",
+                    "511824": "石棉县",
+                    "511825": "天全县",
+                    "511826": "芦山县",
+                    "511827": "宝兴县"
+                }
+            },
+            "511900": {
+                "code": "511900",
+                "name": "巴中",
+                "districts": {
+                    "511902": "巴州区",
+                    "511903": "恩阳区",
+                    "511921": "通江县",
+                    "511922": "南江县",
+                    "511923": "平昌县"
+                }
+            },
+            "512000": {
+                "code": "512000",
+                "name": "资阳",
+                "districts": {
+                    "512002": "雁江区",
+                    "512021": "安岳县",
+                    "512022": "乐至县"
+                }
+            },
+            "513200": {
+                "code": "513200",
+                "name": "阿坝藏族羌族自治州",
+                "districts": {
+                    "513201": "马尔康",
+                    "513221": "汶川县",
+                    "513222": "理县",
+                    "513223": "茂县",
+                    "513224": "松潘县",
+                    "513225": "九寨沟县",
+                    "513226": "金川县",
+                    "513227": "小金县",
+                    "513228": "黑水县",
+                    "513230": "壤塘县",
+                    "513231": "阿坝县",
+                    "513232": "若尔盖县",
+                    "513233": "红原县"
+                }
+            },
+            "513300": {
+                "code": "513300",
+                "name": "甘孜藏族自治州",
+                "districts": {
+                    "513301": "康定",
+                    "513322": "泸定县",
+                    "513323": "丹巴县",
+                    "513324": "九龙县",
+                    "513325": "雅江县",
+                    "513326": "道孚县",
+                    "513327": "炉霍县",
+                    "513328": "甘孜县",
+                    "513329": "新龙县",
+                    "513330": "德格县",
+                    "513331": "白玉县",
+                    "513332": "石渠县",
+                    "513333": "色达县",
+                    "513334": "理塘县",
+                    "513335": "巴塘县",
+                    "513336": "乡城县",
+                    "513337": "稻城县",
+                    "513338": "得荣县"
+                }
+            },
+            "513400": {
+                "code": "513400",
+                "name": "凉山彝族自治州",
+                "districts": {
+                    "513401": "西昌",
+                    "513422": "木里藏族自治县",
+                    "513423": "盐源县",
+                    "513424": "德昌县",
+                    "513425": "会理县",
+                    "513426": "会东县",
+                    "513427": "宁南县",
+                    "513428": "普格县",
+                    "513429": "布拖县",
+                    "513430": "金阳县",
+                    "513431": "昭觉县",
+                    "513432": "喜德县",
+                    "513433": "冕宁县",
+                    "513434": "越西县",
+                    "513435": "甘洛县",
+                    "513436": "美姑县",
+                    "513437": "雷波县"
+                }
+            }
+        }
+    },
+    "520000": {
+        "code": "520000",
+        "name": "贵州省",
+        "cities": {
+            "520100": {
+                "code": "520100",
+                "name": "贵阳",
+                "districts": {
+                    "520102": "南明区",
+                    "520103": "云岩区",
+                    "520111": "花溪区",
+                    "520112": "乌当区",
+                    "520113": "白云区",
+                    "520115": "观山湖区",
+                    "520121": "开阳县",
+                    "520122": "息烽县",
+                    "520123": "修文县",
+                    "520181": "清镇"
+                }
+            },
+            "520200": {
+                "code": "520200",
+                "name": "六盘水",
+                "districts": {
+                    "520201": "钟山区",
+                    "520203": "六枝特区",
+                    "520221": "水城县",
+                    "520281": "盘州"
+                }
+            },
+            "520300": {
+                "code": "520300",
+                "name": "遵义",
+                "districts": {
+                    "520302": "红花岗区",
+                    "520303": "汇川区",
+                    "520304": "播州区",
+                    "520322": "桐梓县",
+                    "520323": "绥阳县",
+                    "520324": "正安县",
+                    "520325": "道真仡佬族苗族自治县",
+                    "520326": "务川仡佬族苗族自治县",
+                    "520327": "凤冈县",
+                    "520328": "湄潭县",
+                    "520329": "余庆县",
+                    "520330": "习水县",
+                    "520381": "赤水",
+                    "520382": "仁怀"
+                }
+            },
+            "520400": {
+                "code": "520400",
+                "name": "安顺",
+                "districts": {
+                    "520402": "西秀区",
+                    "520403": "平坝区",
+                    "520422": "普定县",
+                    "520423": "镇宁布依族苗族自治县",
+                    "520424": "关岭布依族苗族自治县",
+                    "520425": "紫云苗族布依族自治县"
+                }
+            },
+            "520500": {
+                "code": "520500",
+                "name": "毕节",
+                "districts": {
+                    "520502": "七星关区",
+                    "520521": "大方县",
+                    "520522": "黔西县",
+                    "520523": "金沙县",
+                    "520524": "织金县",
+                    "520525": "纳雍县",
+                    "520526": "威宁彝族回族苗族自治县",
+                    "520527": "赫章县"
+                }
+            },
+            "520600": {
+                "code": "520600",
+                "name": "铜仁",
+                "districts": {
+                    "520602": "碧江区",
+                    "520603": "万山区",
+                    "520621": "江口县",
+                    "520622": "玉屏侗族自治县",
+                    "520623": "石阡县",
+                    "520624": "思南县",
+                    "520625": "印江土家族苗族自治县",
+                    "520626": "德江县",
+                    "520627": "沿河土家族自治县",
+                    "520628": "松桃苗族自治县"
+                }
+            },
+            "522300": {
+                "code": "522300",
+                "name": "黔西南布依族苗族自治州",
+                "districts": {
+                    "522301": "兴义",
+                    "522302": "兴仁",
+                    "522323": "普安县",
+                    "522324": "晴隆县",
+                    "522325": "贞丰县",
+                    "522326": "望谟县",
+                    "522327": "册亨县",
+                    "522328": "安龙县"
+                }
+            },
+            "522600": {
+                "code": "522600",
+                "name": "黔东南苗族侗族自治州",
+                "districts": {
+                    "522601": "凯里",
+                    "522622": "黄平县",
+                    "522623": "施秉县",
+                    "522624": "三穗县",
+                    "522625": "镇远县",
+                    "522626": "岑巩县",
+                    "522627": "天柱县",
+                    "522628": "锦屏县",
+                    "522629": "剑河县",
+                    "522630": "台江县",
+                    "522631": "黎平县",
+                    "522632": "榕江县",
+                    "522633": "从江县",
+                    "522634": "雷山县",
+                    "522635": "麻江县",
+                    "522636": "丹寨县"
+                }
+            },
+            "522700": {
+                "code": "522700",
+                "name": "黔南布依族苗族自治州",
+                "districts": {
+                    "522701": "都匀",
+                    "522702": "福泉",
+                    "522722": "荔波县",
+                    "522723": "贵定县",
+                    "522725": "瓮安县",
+                    "522726": "独山县",
+                    "522727": "平塘县",
+                    "522728": "罗甸县",
+                    "522729": "长顺县",
+                    "522730": "龙里县",
+                    "522731": "惠水县",
+                    "522732": "三都水族自治县"
+                }
+            }
+        }
+    },
+    "530000": {
+        "code": "530000",
+        "name": "云南省",
+        "cities": {
+            "530100": {
+                "code": "530100",
+                "name": "昆明",
+                "districts": {
+                    "530102": "五华区",
+                    "530103": "盘龙区",
+                    "530111": "官渡区",
+                    "530112": "西山区",
+                    "530113": "东川区",
+                    "530114": "呈贡区",
+                    "530115": "晋宁区",
+                    "530124": "富民县",
+                    "530125": "宜良县",
+                    "530126": "石林彝族自治县",
+                    "530127": "嵩明县",
+                    "530128": "禄劝彝族苗族自治县",
+                    "530129": "寻甸回族彝族自治县",
+                    "530181": "安宁"
+                }
+            },
+            "530300": {
+                "code": "530300",
+                "name": "曲靖",
+                "districts": {
+                    "530302": "麒麟区",
+                    "530303": "沾益区",
+                    "530304": "马龙区",
+                    "530322": "陆良县",
+                    "530323": "师宗县",
+                    "530324": "罗平县",
+                    "530325": "富源县",
+                    "530326": "会泽县",
+                    "530381": "宣威"
+                }
+            },
+            "530400": {
+                "code": "530400",
+                "name": "玉溪",
+                "districts": {
+                    "530402": "红塔区",
+                    "530403": "江川区",
+                    "530422": "澄江县",
+                    "530423": "通海县",
+                    "530424": "华宁县",
+                    "530425": "易门县",
+                    "530426": "峨山彝族自治县",
+                    "530427": "新平彝族傣族自治县",
+                    "530428": "元江哈尼族彝族傣族自治县"
+                }
+            },
+            "530500": {
+                "code": "530500",
+                "name": "保山",
+                "districts": {
+                    "530502": "隆阳区",
+                    "530521": "施甸县",
+                    "530523": "龙陵县",
+                    "530524": "昌宁县",
+                    "530581": "腾冲"
+                }
+            },
+            "530600": {
+                "code": "530600",
+                "name": "昭通",
+                "districts": {
+                    "530602": "昭阳区",
+                    "530621": "鲁甸县",
+                    "530622": "巧家县",
+                    "530623": "盐津县",
+                    "530624": "大关县",
+                    "530625": "永善县",
+                    "530626": "绥江县",
+                    "530627": "镇雄县",
+                    "530628": "彝良县",
+                    "530629": "威信县",
+                    "530681": "水富"
+                }
+            },
+            "530700": {
+                "code": "530700",
+                "name": "丽江",
+                "districts": {
+                    "530702": "古城区",
+                    "530721": "玉龙纳西族自治县",
+                    "530722": "永胜县",
+                    "530723": "华坪县",
+                    "530724": "宁蒗彝族自治县"
+                }
+            },
+            "530800": {
+                "code": "530800",
+                "name": "普洱",
+                "districts": {
+                    "530802": "思茅区",
+                    "530821": "宁洱哈尼族彝族自治县",
+                    "530822": "墨江哈尼族自治县",
+                    "530823": "景东彝族自治县",
+                    "530824": "景谷傣族彝族自治县",
+                    "530825": "镇沅彝族哈尼族拉祜族自治县",
+                    "530826": "江城哈尼族彝族自治县",
+                    "530827": "孟连傣族拉祜族佤族自治县",
+                    "530828": "澜沧拉祜族自治县",
+                    "530829": "西盟佤族自治县"
+                }
+            },
+            "530900": {
+                "code": "530900",
+                "name": "临沧",
+                "districts": {
+                    "530902": "临翔区",
+                    "530921": "凤庆县",
+                    "530922": "云县",
+                    "530923": "永德县",
+                    "530924": "镇康县",
+                    "530925": "双江拉祜族佤族布朗族傣族自治县",
+                    "530926": "耿马傣族佤族自治县",
+                    "530927": "沧源佤族自治县"
+                }
+            },
+            "532300": {
+                "code": "532300",
+                "name": "楚雄彝族自治州",
+                "districts": {
+                    "532301": "楚雄",
+                    "532322": "双柏县",
+                    "532323": "牟定县",
+                    "532324": "南华县",
+                    "532325": "姚安县",
+                    "532326": "大姚县",
+                    "532327": "永仁县",
+                    "532328": "元谋县",
+                    "532329": "武定县",
+                    "532331": "禄丰县"
+                }
+            },
+            "532500": {
+                "code": "532500",
+                "name": "红河哈尼族彝族自治州",
+                "districts": {
+                    "532501": "个旧",
+                    "532502": "开远",
+                    "532503": "蒙自",
+                    "532504": "弥勒",
+                    "532523": "屏边苗族自治县",
+                    "532524": "建水县",
+                    "532525": "石屏县",
+                    "532527": "泸西县",
+                    "532528": "元阳县",
+                    "532529": "红河县",
+                    "532530": "金平苗族瑶族傣族自治县",
+                    "532531": "绿春县",
+                    "532532": "河口瑶族自治县"
+                }
+            },
+            "532600": {
+                "code": "532600",
+                "name": "文山壮族苗族自治州",
+                "districts": {
+                    "532601": "文山",
+                    "532622": "砚山县",
+                    "532623": "西畴县",
+                    "532624": "麻栗坡县",
+                    "532625": "马关县",
+                    "532626": "丘北县",
+                    "532627": "广南县",
+                    "532628": "富宁县"
+                }
+            },
+            "532800": {
+                "code": "532800",
+                "name": "西双版纳傣族自治州",
+                "districts": {
+                    "532801": "景洪",
+                    "532822": "勐海县",
+                    "532823": "勐腊县"
+                }
+            },
+            "532900": {
+                "code": "532900",
+                "name": "大理白族自治州",
+                "districts": {
+                    "532901": "大理",
+                    "532922": "漾濞彝族自治县",
+                    "532923": "祥云县",
+                    "532924": "宾川县",
+                    "532925": "弥渡县",
+                    "532926": "南涧彝族自治县",
+                    "532927": "巍山彝族回族自治县",
+                    "532928": "永平县",
+                    "532929": "云龙县",
+                    "532930": "洱源县",
+                    "532931": "剑川县",
+                    "532932": "鹤庆县"
+                }
+            },
+            "533100": {
+                "code": "533100",
+                "name": "德宏傣族景颇族自治州",
+                "districts": {
+                    "533102": "瑞丽",
+                    "533103": "芒",
+                    "533122": "梁河县",
+                    "533123": "盈江县",
+                    "533124": "陇川县"
+                }
+            },
+            "533300": {
+                "code": "533300",
+                "name": "怒江傈僳族自治州",
+                "districts": {
+                    "533301": "泸水",
+                    "533323": "福贡县",
+                    "533324": "贡山独龙族怒族自治县",
+                    "533325": "兰坪白族普米族自治县"
+                }
+            },
+            "533400": {
+                "code": "533400",
+                "name": "迪庆藏族自治州",
+                "districts": {
+                    "533401": "香格里拉",
+                    "533422": "德钦县",
+                    "533423": "维西傈僳族自治县"
+                }
+            }
+        }
+    },
+    "540000": {
+        "code": "540000",
+        "name": "西藏自治区",
+        "cities": {
+            "540100": {
+                "code": "540100",
+                "name": "拉萨",
+                "districts": {
+                    "540102": "城关区",
+                    "540103": "堆龙德庆区",
+                    "540104": "达孜区",
+                    "540121": "林周县",
+                    "540122": "当雄县",
+                    "540123": "尼木县",
+                    "540124": "曲水县",
+                    "540127": "墨竹工卡县"
+                }
+            },
+            "540200": {
+                "code": "540200",
+                "name": "日喀则",
+                "districts": {
+                    "540202": "桑珠孜区",
+                    "540221": "南木林县",
+                    "540222": "江孜县",
+                    "540223": "定日县",
+                    "540224": "萨迦县",
+                    "540225": "拉孜县",
+                    "540226": "昂仁县",
+                    "540227": "谢通门县",
+                    "540228": "白朗县",
+                    "540229": "仁布县",
+                    "540230": "康马县",
+                    "540231": "定结县",
+                    "540232": "仲巴县",
+                    "540233": "亚东县",
+                    "540234": "吉隆县",
+                    "540235": "聂拉木县",
+                    "540236": "萨嘎县",
+                    "540237": "岗巴县"
+                }
+            },
+            "540300": {
+                "code": "540300",
+                "name": "昌都",
+                "districts": {
+                    "540302": "卡若区",
+                    "540321": "江达县",
+                    "540322": "贡觉县",
+                    "540323": "类乌齐县",
+                    "540324": "丁青县",
+                    "540325": "察雅县",
+                    "540326": "八宿县",
+                    "540327": "左贡县",
+                    "540328": "芒康县",
+                    "540329": "洛隆县",
+                    "540330": "边坝县"
+                }
+            },
+            "540400": {
+                "code": "540400",
+                "name": "林芝",
+                "districts": {
+                    "540402": "巴宜区",
+                    "540421": "工布江达县",
+                    "540422": "米林县",
+                    "540423": "墨脱县",
+                    "540424": "波密县",
+                    "540425": "察隅县",
+                    "540426": "朗县"
+                }
+            },
+            "540500": {
+                "code": "540500",
+                "name": "山南",
+                "districts": {
+                    "540502": "乃东区",
+                    "540521": "扎囊县",
+                    "540522": "贡嘎县",
+                    "540523": "桑日县",
+                    "540524": "琼结县",
+                    "540525": "曲松县",
+                    "540526": "措美县",
+                    "540527": "洛扎县",
+                    "540528": "加查县",
+                    "540529": "隆子县",
+                    "540530": "错那县",
+                    "540531": "浪卡子县"
+                }
+            },
+            "540600": {
+                "code": "540600",
+                "name": "那曲",
+                "districts": {
+                    "540602": "色尼区",
+                    "540621": "嘉黎县",
+                    "540622": "比如县",
+                    "540623": "聂荣县",
+                    "540624": "安多县",
+                    "540625": "申扎县",
+                    "540626": "索县",
+                    "540627": "班戈县",
+                    "540628": "巴青县",
+                    "540629": "尼玛县",
+                    "540630": "双湖县"
+                }
+            },
+            "542500": {
+                "code": "542500",
+                "name": "阿里地区",
+                "districts": {
+                    "542521": "普兰县",
+                    "542522": "札达县",
+                    "542523": "噶尔县",
+                    "542524": "日土县",
+                    "542525": "革吉县",
+                    "542526": "改则县",
+                    "542527": "措勤县"
+                }
+            }
+        }
+    },
+    "610000": {
+        "code": "610000",
+        "name": "陕西省",
+        "cities": {
+            "610100": {
+                "code": "610100",
+                "name": "西安",
+                "districts": {
+                    "610102": "新城区",
+                    "610103": "碑林区",
+                    "610104": "莲湖区",
+                    "610111": "灞桥区",
+                    "610112": "未央区",
+                    "610113": "雁塔区",
+                    "610114": "阎良区",
+                    "610115": "临潼区",
+                    "610116": "长安区",
+                    "610117": "高陵区",
+                    "610118": "鄠邑区",
+                    "610122": "蓝田县",
+                    "610124": "周至县"
+                }
+            },
+            "610200": {
+                "code": "610200",
+                "name": "铜川",
+                "districts": {
+                    "610202": "王益区",
+                    "610203": "印台区",
+                    "610204": "耀州区",
+                    "610222": "宜君县"
+                }
+            },
+            "610300": {
+                "code": "610300",
+                "name": "宝鸡",
+                "districts": {
+                    "610302": "渭滨区",
+                    "610303": "金台区",
+                    "610304": "陈仓区",
+                    "610322": "凤翔县",
+                    "610323": "岐山县",
+                    "610324": "扶风县",
+                    "610326": "眉县",
+                    "610327": "陇县",
+                    "610328": "千阳县",
+                    "610329": "麟游县",
+                    "610330": "凤县",
+                    "610331": "太白县"
+                }
+            },
+            "610400": {
+                "code": "610400",
+                "name": "咸阳",
+                "districts": {
+                    "610402": "秦都区",
+                    "610403": "杨陵区",
+                    "610404": "渭城区",
+                    "610422": "三原县",
+                    "610423": "泾阳县",
+                    "610424": "乾县",
+                    "610425": "礼泉县",
+                    "610426": "永寿县",
+                    "610428": "长武县",
+                    "610429": "旬邑县",
+                    "610430": "淳化县",
+                    "610431": "武功县",
+                    "610481": "兴平",
+                    "610482": "彬州"
+                }
+            },
+            "610500": {
+                "code": "610500",
+                "name": "渭南",
+                "districts": {
+                    "610502": "临渭区",
+                    "610503": "华州区",
+                    "610522": "潼关县",
+                    "610523": "大荔县",
+                    "610524": "合阳县",
+                    "610525": "澄城县",
+                    "610526": "蒲城县",
+                    "610527": "白水县",
+                    "610528": "富平县",
+                    "610581": "韩城",
+                    "610582": "华阴"
+                }
+            },
+            "610600": {
+                "code": "610600",
+                "name": "延安",
+                "districts": {
+                    "610602": "宝塔区",
+                    "610603": "安塞区",
+                    "610621": "延长县",
+                    "610622": "延川县",
+                    "610623": "子长县",
+                    "610625": "志丹县",
+                    "610626": "吴起县",
+                    "610627": "甘泉县",
+                    "610628": "富县",
+                    "610629": "洛川县",
+                    "610630": "宜川县",
+                    "610631": "黄龙县",
+                    "610632": "黄陵县"
+                }
+            },
+            "610700": {
+                "code": "610700",
+                "name": "汉中",
+                "districts": {
+                    "610702": "汉台区",
+                    "610703": "南郑区",
+                    "610722": "城固县",
+                    "610723": "洋县",
+                    "610724": "西乡县",
+                    "610725": "勉县",
+                    "610726": "宁强县",
+                    "610727": "略阳县",
+                    "610728": "镇巴县",
+                    "610729": "留坝县",
+                    "610730": "佛坪县"
+                }
+            },
+            "610800": {
+                "code": "610800",
+                "name": "榆林",
+                "districts": {
+                    "610802": "榆阳区",
+                    "610803": "横山区",
+                    "610822": "府谷县",
+                    "610824": "靖边县",
+                    "610825": "定边县",
+                    "610826": "绥德县",
+                    "610827": "米脂县",
+                    "610828": "佳县",
+                    "610829": "吴堡县",
+                    "610830": "清涧县",
+                    "610831": "子洲县",
+                    "610881": "神木"
+                }
+            },
+            "610900": {
+                "code": "610900",
+                "name": "安康",
+                "districts": {
+                    "610902": "汉滨区",
+                    "610921": "汉阴县",
+                    "610922": "石泉县",
+                    "610923": "宁陕县",
+                    "610924": "紫阳县",
+                    "610925": "岚皋县",
+                    "610926": "平利县",
+                    "610927": "镇坪县",
+                    "610928": "旬阳县",
+                    "610929": "白河县"
+                }
+            },
+            "611000": {
+                "code": "611000",
+                "name": "商洛",
+                "districts": {
+                    "611002": "商州区",
+                    "611021": "洛南县",
+                    "611022": "丹凤县",
+                    "611023": "商南县",
+                    "611024": "山阳县",
+                    "611025": "镇安县",
+                    "611026": "柞水县"
+                }
+            }
+        }
+    },
+    "620000": {
+        "code": "620000",
+        "name": "甘肃省",
+        "cities": {
+            "620100": {
+                "code": "620100",
+                "name": "兰州",
+                "districts": {
+                    "620102": "城关区",
+                    "620103": "七里河区",
+                    "620104": "西固区",
+                    "620105": "安宁区",
+                    "620111": "红古区",
+                    "620121": "永登县",
+                    "620122": "皋兰县",
+                    "620123": "榆中县"
+                }
+            },
+            "620200": {
+                "code": "620200",
+                "name": "嘉峪关",
+                "districts": {}
+            },
+            "620300": {
+                "code": "620300",
+                "name": "金昌",
+                "districts": {
+                    "620302": "金川区",
+                    "620321": "永昌县"
+                }
+            },
+            "620400": {
+                "code": "620400",
+                "name": "白银",
+                "districts": {
+                    "620402": "白银区",
+                    "620403": "平川区",
+                    "620421": "靖远县",
+                    "620422": "会宁县",
+                    "620423": "景泰县"
+                }
+            },
+            "620500": {
+                "code": "620500",
+                "name": "天水",
+                "districts": {
+                    "620502": "秦州区",
+                    "620503": "麦积区",
+                    "620521": "清水县",
+                    "620522": "秦安县",
+                    "620523": "甘谷县",
+                    "620524": "武山县",
+                    "620525": "张家川回族自治县"
+                }
+            },
+            "620600": {
+                "code": "620600",
+                "name": "武威",
+                "districts": {
+                    "620602": "凉州区",
+                    "620621": "民勤县",
+                    "620622": "古浪县",
+                    "620623": "天祝藏族自治县"
+                }
+            },
+            "620700": {
+                "code": "620700",
+                "name": "张掖",
+                "districts": {
+                    "620702": "甘州区",
+                    "620721": "肃南裕固族自治县",
+                    "620722": "民乐县",
+                    "620723": "临泽县",
+                    "620724": "高台县",
+                    "620725": "山丹县"
+                }
+            },
+            "620800": {
+                "code": "620800",
+                "name": "平凉",
+                "districts": {
+                    "620802": "崆峒区",
+                    "620821": "泾川县",
+                    "620822": "灵台县",
+                    "620823": "崇信县",
+                    "620825": "庄浪县",
+                    "620826": "静宁县",
+                    "620881": "华亭"
+                }
+            },
+            "620900": {
+                "code": "620900",
+                "name": "酒泉",
+                "districts": {
+                    "620902": "肃州区",
+                    "620921": "金塔县",
+                    "620922": "瓜州县",
+                    "620923": "肃北蒙古族自治县",
+                    "620924": "阿克塞哈萨克族自治县",
+                    "620981": "玉门",
+                    "620982": "敦煌"
+                }
+            },
+            "621000": {
+                "code": "621000",
+                "name": "庆阳",
+                "districts": {
+                    "621002": "西峰区",
+                    "621021": "庆城县",
+                    "621022": "环县",
+                    "621023": "华池县",
+                    "621024": "合水县",
+                    "621025": "正宁县",
+                    "621026": "宁县",
+                    "621027": "镇原县"
+                }
+            },
+            "621100": {
+                "code": "621100",
+                "name": "定西",
+                "districts": {
+                    "621102": "安定区",
+                    "621121": "通渭县",
+                    "621122": "陇西县",
+                    "621123": "渭源县",
+                    "621124": "临洮县",
+                    "621125": "漳县",
+                    "621126": "岷县"
+                }
+            },
+            "621200": {
+                "code": "621200",
+                "name": "陇南",
+                "districts": {
+                    "621202": "武都区",
+                    "621221": "成县",
+                    "621222": "文县",
+                    "621223": "宕昌县",
+                    "621224": "康县",
+                    "621225": "西和县",
+                    "621226": "礼县",
+                    "621227": "徽县",
+                    "621228": "两当县"
+                }
+            },
+            "622900": {
+                "code": "622900",
+                "name": "临夏回族自治州",
+                "districts": {
+                    "622901": "临夏",
+                    "622921": "临夏县",
+                    "622922": "康乐县",
+                    "622923": "永靖县",
+                    "622924": "广河县",
+                    "622925": "和政县",
+                    "622926": "东乡族自治县",
+                    "622927": "积石山保安族东乡族撒拉族自治县"
+                }
+            },
+            "623000": {
+                "code": "623000",
+                "name": "甘南藏族自治州",
+                "districts": {
+                    "623001": "合作",
+                    "623021": "临潭县",
+                    "623022": "卓尼县",
+                    "623023": "舟曲县",
+                    "623024": "迭部县",
+                    "623025": "玛曲县",
+                    "623026": "碌曲县",
+                    "623027": "夏河县"
+                }
+            }
+        }
+    },
+    "630000": {
+        "code": "630000",
+        "name": "青海省",
+        "cities": {
+            "630100": {
+                "code": "630100",
+                "name": "西宁",
+                "districts": {
+                    "630102": "城东区",
+                    "630103": "城中区",
+                    "630104": "城西区",
+                    "630105": "城北区",
+                    "630121": "大通回族土族自治县",
+                    "630122": "湟中县",
+                    "630123": "湟源县"
+                }
+            },
+            "630200": {
+                "code": "630200",
+                "name": "海东",
+                "districts": {
+                    "630202": "乐都区",
+                    "630203": "平安区",
+                    "630222": "民和回族土族自治县",
+                    "630223": "互助土族自治县",
+                    "630224": "化隆回族自治县",
+                    "630225": "循化撒拉族自治县"
+                }
+            },
+            "632200": {
+                "code": "632200",
+                "name": "海北藏族自治州",
+                "districts": {
+                    "632221": "门源回族自治县",
+                    "632222": "祁连县",
+                    "632223": "海晏县",
+                    "632224": "刚察县"
+                }
+            },
+            "632300": {
+                "code": "632300",
+                "name": "黄南藏族自治州",
+                "districts": {
+                    "632321": "同仁县",
+                    "632322": "尖扎县",
+                    "632323": "泽库县",
+                    "632324": "河南蒙古族自治县"
+                }
+            },
+            "632500": {
+                "code": "632500",
+                "name": "海南藏族自治州",
+                "districts": {
+                    "632521": "共和县",
+                    "632522": "同德县",
+                    "632523": "贵德县",
+                    "632524": "兴海县",
+                    "632525": "贵南县"
+                }
+            },
+            "632600": {
+                "code": "632600",
+                "name": "果洛藏族自治州",
+                "districts": {
+                    "632621": "玛沁县",
+                    "632622": "班玛县",
+                    "632623": "甘德县",
+                    "632624": "达日县",
+                    "632625": "久治县",
+                    "632626": "玛多县"
+                }
+            },
+            "632700": {
+                "code": "632700",
+                "name": "玉树藏族自治州",
+                "districts": {
+                    "632701": "玉树",
+                    "632722": "杂多县",
+                    "632723": "称多县",
+                    "632724": "治多县",
+                    "632725": "囊谦县",
+                    "632726": "曲麻莱县"
+                }
+            },
+            "632800": {
+                "code": "632800",
+                "name": "海西蒙古族藏族自治州",
+                "districts": {
+                    "632801": "格尔木",
+                    "632802": "德令哈",
+                    "632803": "茫崖",
+                    "632821": "乌兰县",
+                    "632822": "都兰县",
+                    "632823": "天峻县"
+                }
+            }
+        }
+    },
+    "640000": {
+        "code": "640000",
+        "name": "宁夏回族自治区",
+        "cities": {
+            "640100": {
+                "code": "640100",
+                "name": "银川",
+                "districts": {
+                    "640104": "兴庆区",
+                    "640105": "西夏区",
+                    "640106": "金凤区",
+                    "640121": "永宁县",
+                    "640122": "贺兰县",
+                    "640181": "灵武"
+                }
+            },
+            "640200": {
+                "code": "640200",
+                "name": "石嘴山",
+                "districts": {
+                    "640202": "大武口区",
+                    "640205": "惠农区",
+                    "640221": "平罗县"
+                }
+            },
+            "640300": {
+                "code": "640300",
+                "name": "吴忠",
+                "districts": {
+                    "640302": "利通区",
+                    "640303": "红寺堡区",
+                    "640323": "盐池县",
+                    "640324": "同心县",
+                    "640381": "青铜峡"
+                }
+            },
+            "640400": {
+                "code": "640400",
+                "name": "固原",
+                "districts": {
+                    "640402": "原州区",
+                    "640422": "西吉县",
+                    "640423": "隆德县",
+                    "640424": "泾源县",
+                    "640425": "彭阳县"
+                }
+            },
+            "640500": {
+                "code": "640500",
+                "name": "中卫",
+                "districts": {
+                    "640502": "沙坡头区",
+                    "640521": "中宁县",
+                    "640522": "海原县"
+                }
+            }
+        }
+    },
+    "650000": {
+        "code": "650000",
+        "name": "新疆维吾尔自治区",
+        "cities": {
+            "650100": {
+                "code": "650100",
+                "name": "乌鲁木齐",
+                "districts": {
+                    "650102": "天山区",
+                    "650103": "沙依巴克区",
+                    "650104": "新区",
+                    "650105": "水磨沟区",
+                    "650106": "头屯河区",
+                    "650107": "达坂城区",
+                    "650109": "米东区",
+                    "650121": "乌鲁木齐县"
+                }
+            },
+            "650200": {
+                "code": "650200",
+                "name": "克拉玛依",
+                "districts": {
+                    "650202": "独山子区",
+                    "650203": "克拉玛依区",
+                    "650204": "白碱滩区",
+                    "650205": "乌尔禾区"
+                }
+            },
+            "650400": {
+                "code": "650400",
+                "name": "吐鲁番",
+                "districts": {
+                    "650402": "高昌区",
+                    "650421": "鄯善县",
+                    "650422": "托克逊县"
+                }
+            },
+            "650500": {
+                "code": "650500",
+                "name": "哈密",
+                "districts": {
+                    "650502": "伊州区",
+                    "650521": "巴里坤哈萨克自治县",
+                    "650522": "伊吾县"
+                }
+            },
+            "652300": {
+                "code": "652300",
+                "name": "昌吉回族自治州",
+                "districts": {
+                    "652301": "昌吉",
+                    "652302": "阜康",
+                    "652323": "呼图壁县",
+                    "652324": "玛纳斯县",
+                    "652325": "奇台县",
+                    "652327": "吉木萨尔县",
+                    "652328": "木垒哈萨克自治县"
+                }
+            },
+            "652700": {
+                "code": "652700",
+                "name": "博尔塔拉蒙古自治州",
+                "districts": {
+                    "652701": "博乐",
+                    "652702": "阿拉山口",
+                    "652722": "精河县",
+                    "652723": "温泉县"
+                }
+            },
+            "652800": {
+                "code": "652800",
+                "name": "巴音郭楞蒙古自治州",
+                "districts": {
+                    "652801": "库尔勒",
+                    "652822": "轮台县",
+                    "652823": "尉犁县",
+                    "652824": "若羌县",
+                    "652825": "且末县",
+                    "652826": "焉耆回族自治县",
+                    "652827": "和静县",
+                    "652828": "和硕县",
+                    "652829": "博湖县"
+                }
+            },
+            "652900": {
+                "code": "652900",
+                "name": "阿克苏地区",
+                "districts": {
+                    "652901": "阿克苏",
+                    "652922": "温宿县",
+                    "652923": "库车县",
+                    "652924": "沙雅县",
+                    "652925": "新和县",
+                    "652926": "拜城县",
+                    "652927": "乌什县",
+                    "652928": "阿瓦提县",
+                    "652929": "柯坪县"
+                }
+            },
+            "653000": {
+                "code": "653000",
+                "name": "克孜勒苏柯尔克孜自治州",
+                "districts": {
+                    "653001": "阿图什",
+                    "653022": "阿克陶县",
+                    "653023": "阿合奇县",
+                    "653024": "乌恰县"
+                }
+            },
+            "653100": {
+                "code": "653100",
+                "name": "喀什地区",
+                "districts": {
+                    "653101": "喀什",
+                    "653121": "疏附县",
+                    "653122": "疏勒县",
+                    "653123": "英吉沙县",
+                    "653124": "泽普县",
+                    "653125": "莎车县",
+                    "653126": "叶城县",
+                    "653127": "麦盖提县",
+                    "653128": "岳普湖县",
+                    "653129": "伽师县",
+                    "653130": "巴楚县",
+                    "653131": "塔什库尔干塔吉克自治县"
+                }
+            },
+            "653200": {
+                "code": "653200",
+                "name": "和田地区",
+                "districts": {
+                    "653201": "和田",
+                    "653221": "和田县",
+                    "653222": "墨玉县",
+                    "653223": "皮山县",
+                    "653224": "洛浦县",
+                    "653225": "策勒县",
+                    "653226": "于田县",
+                    "653227": "民丰县"
+                }
+            },
+            "654000": {
+                "code": "654000",
+                "name": "伊犁哈萨克自治州",
+                "districts": {
+                    "654002": "伊宁",
+                    "654003": "奎屯",
+                    "654004": "霍尔果斯",
+                    "654021": "伊宁县",
+                    "654022": "察布查尔锡伯自治县",
+                    "654023": "霍城县",
+                    "654024": "巩留县",
+                    "654025": "新源县",
+                    "654026": "昭苏县",
+                    "654027": "特克斯县",
+                    "654028": "尼勒克县"
+                }
+            },
+            "654200": {
+                "code": "654200",
+                "name": "塔城地区",
+                "districts": {
+                    "654201": "塔城",
+                    "654202": "乌苏",
+                    "654221": "额敏县",
+                    "654223": "沙湾县",
+                    "654224": "托里县",
+                    "654225": "裕民县",
+                    "654226": "和布克赛尔蒙古自治县"
+                }
+            },
+            "654300": {
+                "code": "654300",
+                "name": "阿勒泰地区",
+                "districts": {
+                    "654301": "阿勒泰",
+                    "654321": "布尔津县",
+                    "654322": "富蕴县",
+                    "654323": "福海县",
+                    "654324": "哈巴河县",
+                    "654325": "青河县",
+                    "654326": "吉木乃县"
+                }
+            }
+        }
+    },
+    "810000": {
+        "code": "810000",
+        "name": "香港特别行政区",
+        "cities": {
+            "810000": {
+                "code": "810000",
+                "name": "香港特别行政区",
+                "districts": {
+                    "810101": "中西区",
+                    "810102": "湾仔区",
+                    "810103": "东区",
+                    "810104": "南区",
+                    "810105": "油尖旺区",
+                    "810106": "深水埗区",
+                    "810107": "九龙城区",
+                    "810108": "黄大仙区",
+                    "810109": "观塘区",
+                    "810110": "北区",
+                    "810111": "大埔区",
+                    "810112": "沙田区",
+                    "810113": "西贡区",
+                    "810114": "荃湾区",
+                    "810115": "屯门区",
+                    "810116": "元朗区",
+                    "810117": "葵青区",
+                    "810118": "离岛区"
+                }
+            }
+        }
+    },
+    "820000": {
+        "code": "820000",
+        "name": "澳门特别行政区",
+        "cities": {
+            "820000": {
+                "code": "820000",
+                "name": "澳门特别行政区",
+                "districts": {
+                    "820101": "花地玛堂区",
+                    "820102": "圣安多尼堂区",
+                    "820103": "大堂区",
+                    "820104": "望德堂区",
+                    "820105": "风顺堂区",
+                    "820106": "嘉模堂区",
+                    "820107": "圣方济各堂区",
+                    "820108": "路氹城",
+                    "820109": "澳门新城"
+                }
+            }
+        }
+    },
+    "830000": {
+        "code": "830000",
+        "name": "台湾省",
+        "cities": {
+            "830100": {
+                "code": "830100",
+                "name": "台北",
+                "districts": {
+                    "830101": "中正区",
+                    "830102": "大同区",
+                    "830103": "中山区",
+                    "830104": "万华区",
+                    "830105": "信义区",
+                    "830106": "松山区",
+                    "830107": "大安区",
+                    "830108": "南港区",
+                    "830109": "北投区",
+                    "830110": "内湖区",
+                    "830111": "士林区",
+                    "830112": "文山区"
+                }
+            },
+            "830200": {
+                "code": "830200",
+                "name": "新北",
+                "districts": {
+                    "830201": "板桥区",
+                    "830202": "土城区",
+                    "830203": "新庄区",
+                    "830204": "新店区",
+                    "830205": "深坑区",
+                    "830206": "石碇区",
+                    "830207": "坪林区",
+                    "830208": "乌来区",
+                    "830209": "五股区",
+                    "830210": "八里区",
+                    "830211": "林口区",
+                    "830212": "淡水区",
+                    "830213": "中和区",
+                    "830214": "永和区",
+                    "830215": "三重区",
+                    "830216": "芦洲区",
+                    "830217": "泰山区",
+                    "830218": "树林区",
+                    "830219": "莺歌区",
+                    "830220": "三峡区",
+                    "830221": "汐止区",
+                    "830222": "金山区",
+                    "830223": "万里区",
+                    "830224": "三芝区",
+                    "830225": "石门区",
+                    "830226": "瑞芳区",
+                    "830227": "贡寮区",
+                    "830228": "双溪区",
+                    "830229": "平溪区"
+                }
+            },
+            "830300": {
+                "code": "830300",
+                "name": "桃园",
+                "districts": {
+                    "830301": "桃园区",
+                    "830302": "中坜区",
+                    "830303": "平镇区",
+                    "830304": "八德区",
+                    "830305": "杨梅区",
+                    "830306": "芦竹区",
+                    "830307": "大溪区",
+                    "830308": "龙潭区",
+                    "830309": "龟山区",
+                    "830310": "大园区",
+                    "830311": "观音区",
+                    "830312": "新屋区",
+                    "830313": "复兴区"
+                }
+            },
+            "830400": {
+                "code": "830400",
+                "name": "台中",
+                "districts": {
+                    "830401": "中区",
+                    "830402": "东区",
+                    "830403": "西区",
+                    "830404": "南区",
+                    "830405": "北区",
+                    "830406": "西屯区",
+                    "830407": "南屯区",
+                    "830408": "北屯区",
+                    "830409": "丰原区",
+                    "830410": "大里区",
+                    "830411": "太平区",
+                    "830412": "东势区",
+                    "830413": "大甲区",
+                    "830414": "清水区",
+                    "830415": "沙鹿区",
+                    "830416": "梧栖区",
+                    "830417": "后里区",
+                    "830418": "神冈区",
+                    "830419": "潭子区",
+                    "830420": "大雅区",
+                    "830421": "新小区",
+                    "830422": "石冈区",
+                    "830423": "外埔区",
+                    "830424": "大安区",
+                    "830425": "乌日区",
+                    "830426": "大肚区",
+                    "830427": "龙井区",
+                    "830428": "雾峰区",
+                    "830429": "和平区"
+                }
+            },
+            "830500": {
+                "code": "830500",
+                "name": "台南",
+                "districts": {
+                    "830501": "中西区",
+                    "830502": "东区",
+                    "830503": "南区",
+                    "830504": "北区",
+                    "830505": "安平区",
+                    "830506": "安南区",
+                    "830507": "永康区",
+                    "830508": "归仁区",
+                    "830509": "新化区",
+                    "830510": "左镇区",
+                    "830511": "玉井区",
+                    "830512": "楠西区",
+                    "830513": "南化区",
+                    "830514": "仁德区",
+                    "830515": "关庙区",
+                    "830516": "龙崎区",
+                    "830517": "官田区",
+                    "830518": "麻豆区",
+                    "830519": "佳里区",
+                    "830520": "西港区",
+                    "830521": "七股区",
+                    "830522": "将军区",
+                    "830523": "学甲区",
+                    "830524": "北门区",
+                    "830525": "新营区",
+                    "830526": "后壁区",
+                    "830527": "白河区",
+                    "830528": "东山区",
+                    "830529": "六甲区",
+                    "830530": "下营区",
+                    "830531": "柳营区",
+                    "830532": "盐水区",
+                    "830533": "善化区",
+                    "830534": "大内区",
+                    "830535": "山上区",
+                    "830536": "新区",
+                    "830537": "安定区"
+                }
+            },
+            "830600": {
+                "code": "830600",
+                "name": "高雄",
+                "districts": {
+                    "830601": "楠梓区",
+                    "830602": "左营区",
+                    "830603": "鼓山区",
+                    "830604": "三民区",
+                    "830605": "盐埕区",
+                    "830606": "前金区",
+                    "830607": "新兴区",
+                    "830608": "苓雅区",
+                    "830609": "前镇区",
+                    "830610": "旗津区",
+                    "830611": "小港区",
+                    "830612": "凤山区",
+                    "830613": "大寮区",
+                    "830614": "鸟松区",
+                    "830615": "林园区",
+                    "830616": "仁武区",
+                    "830617": "大树区",
+                    "830618": "大社区",
+                    "830619": "冈山区",
+                    "830620": "路竹区",
+                    "830621": "桥头区",
+                    "830622": "梓官区",
+                    "830623": "弥陀区",
+                    "830624": "永安区",
+                    "830625": "燕巢区",
+                    "830626": "阿莲区",
+                    "830627": "茄萣区",
+                    "830628": "湖内区",
+                    "830629": "旗山区",
+                    "830630": "美浓区",
+                    "830631": "内门区",
+                    "830632": "杉林区",
+                    "830633": "甲仙区",
+                    "830634": "六龟区",
+                    "830635": "茂林区",
+                    "830636": "桃源区",
+                    "830637": "那玛夏区"
+                }
+            },
+            "830700": {
+                "code": "830700",
+                "name": "基隆",
+                "districts": {
+                    "830701": "中正区",
+                    "830702": "七堵区",
+                    "830703": "暖暖区",
+                    "830704": "仁爱区",
+                    "830705": "中山区",
+                    "830706": "安乐区",
+                    "830707": "信义区"
+                }
+            },
+            "830800": {
+                "code": "830800",
+                "name": "新竹",
+                "districts": {
+                    "830801": "东区",
+                    "830802": "北区",
+                    "830803": "香山区"
+                }
+            },
+            "830900": {
+                "code": "830900",
+                "name": "嘉义",
+                "districts": {
+                    "830901": "东区",
+                    "830902": "西区"
+                }
+            }
+        }
+    }
+}
+const province = new Map();
+export const city2province = new Map();
+for (const code in data) {
+    let pn = data[code].name;
+    province.set(pn, new Set());
+    for (const citycode in data[code].cities) {
+        let cn = data[code].cities[citycode].name;
+        province.get(pn).add(cn);
+        city2province.set(cn,pn);
+    }
+}
+
+export const locData = Array.from(province.keys()).map(p=>({
+    value:p,
+    label:p,
+    children:Array.from(province.get(p).keys()).map(c=>({
+        value:c,
+        label:c
+    }))
+}));
\ No newline at end of file
diff --git a/src/modules/recruitment/data/mapJobData.js b/src/modules/recruitment/data/mapJobData.js
new file mode 100644
index 00000000..7e52843f
--- /dev/null
+++ b/src/modules/recruitment/data/mapJobData.js
@@ -0,0 +1,64 @@
+import { Form } from "antd";
+import { city2province } from './locData';
+
+export function mapPropsToFields(props) {
+    return {
+        name: Form.createFormField({
+            value: props.name
+        }),
+        class: Form.createFormField({
+            value: { father: props.job_classify_root, son: props.job_classify }
+        }),
+        num: Form.createFormField({
+            value: props.num
+        }),
+        prop: Form.createFormField({
+            value: props.job_category
+        }),
+        city: Form.createFormField({
+            value: [city2province.get(props.city), props.city]
+        }),
+        address: Form.createFormField({
+            value: props.address
+        }),
+        max: Form.createFormField({
+            value: props.max_salary
+        }),
+        min: Form.createFormField({
+            value: props.min_salary
+        }),
+        edu: Form.createFormField({
+            value: props.education
+        }),
+        exp: Form.createFormField({
+            value: props.work_year
+        }),
+        desc: Form.createFormField({
+            value: props.description
+        }),
+        intro: Form.createFormField({
+            value: props.introduce
+        })
+    };
+}
+
+export const mock = {
+    id: 21,
+    name: "招开发人员", //职位
+    salary: "2-10k", //薪资范围
+    min_salary: 2000, //最低薪资
+    max_salary: 10000, // 最高薪资
+    job_classify_root: "前端", // 职位类别一级
+    job_classify: "react 开发", // 职位类别二级
+    company: "长沙智擎",
+    city: "长沙市", //工作地点
+    work_year: "1-3年", // 年限
+    job_category: "全职", //工作性质
+    education: "本科", //学历要求
+    num: 2, //招聘人数
+    updated_at: "2020-04-02", //发布时间
+    address: "长沙岳麓区", //公司地址
+    description: "开发岗位", // 岗位描述
+    introduce: "公司介绍", //公司简介
+    is_applyed: false // 是否已投递过该职位
+}
\ No newline at end of file
diff --git a/src/modules/recruitment/data/mapResumeData.js b/src/modules/recruitment/data/mapResumeData.js
new file mode 100644
index 00000000..4a24d764
--- /dev/null
+++ b/src/modules/recruitment/data/mapResumeData.js
@@ -0,0 +1,34 @@
+import { Form } from "antd";
+import _ from "lodash";
+import moment from "moment";
+
+function helper(v, verify = _.identity, mapper = _.identity) {
+  if (!v) {
+    return undefined;
+  } else if (!verify(v)) {
+    return undefined;
+  } else {
+    return Form.createFormField({
+      value: mapper(v),
+    });
+  }
+}
+
+export function mapPropsToFields(props) {
+  return {
+    name: helper(props.name),
+    sex: helper(props.sex),
+    birth_on: helper(props.birth_on, _.identity, (v) =>
+      moment(v)
+    ),
+    logo_url: helper(props.logo_url),
+    job_year: helper(props.job_year, _.identity, (v) => moment(v)),
+    job_position: helper(props.job_position, (v) => v.size != 0),
+    city: helper(props.city, (v) => v.size != 0),
+    salary: helper(props.salary),
+    job_category: helper(props.job_category, (v) => v.size != 0),
+    evaluate: helper(props.evaluate),
+    mobile: helper(props.mobile),
+    attachment_id: helper(props.attachment_id)
+  };
+}
diff --git a/src/modules/recruitment/data/submitData.js b/src/modules/recruitment/data/submitData.js
new file mode 100644
index 00000000..8cd85431
--- /dev/null
+++ b/src/modules/recruitment/data/submitData.js
@@ -0,0 +1,32 @@
+import axios from "axios";
+
+function filed2json(value) {
+  return {
+    job: {
+      name: value.name.trim(),
+      job_classify_root: value.class.father.trim(),
+      job_classify: value.class.son.trim(),
+      num: value.num,
+      job_category: value.prop,
+      city: value.city[1],
+      address: value.address.trim(),
+      max_salary: Number(value.max),
+      min_salary: Number(value.min),
+      education: value.edu,
+      work_year: value.exp,
+      description: value.desc.trim(),
+      introduce: value.intro ? value.intro.trim() : "",
+    },
+  };
+}
+export async function submitJobInfo(value) {
+  await axios.post(`/jobs.json`, filed2json(value));
+  return;
+}
+export async function updateJobInfo(jobID, value) {
+  return (await axios.put(`/jobs/${jobID}.json`, filed2json(value))).data;
+}
+
+export async function applyProfile(JobID) {
+  return (await axios.post(`/jobs/${JobID}/apply.json`)).data;
+}
diff --git a/src/modules/recruitment/data/sumitResume.js b/src/modules/recruitment/data/sumitResume.js
new file mode 100644
index 00000000..2970f385
--- /dev/null
+++ b/src/modules/recruitment/data/sumitResume.js
@@ -0,0 +1,42 @@
+import axios from "axios";
+import moment from "moment";
+ 
+export function processValue(v) {
+  const education = [];
+  const experience = [];
+  const birth_on = v.birth_on.format("YYYY-MM-DD");
+  const job_year = !v.job_year
+    ? undefined
+    : v.job_year.format("YYYY-MM-DD");
+  for (const key in v.education) {
+    const obj = { ...v.education[key] };
+    obj.begin_on = obj.begin_on.format("YYYY-MM-DD");
+    obj.end_on = obj.end_on.format("YYYY-MM-DD");
+    obj.major=obj.major.trim();
+    obj.school=obj.school.trim();
+    education.push(obj);
+  }
+  for (const key in v.experience) {
+    const obj = { ...v.experience[key] };
+    obj.begin_on = obj.begin_on.format("YYYY-MM-DD");
+    obj.end_on = obj.end_on.format("YYYY-MM-DD");
+    obj.company = obj.company.trim();
+    obj.desc = obj.desc.trim();
+    experience.push(obj);
+  }
+  const name = !v.name
+  ? undefined
+  : v.name.trim();  
+  const evaluate = !v.evaluate
+  ? undefined
+  : v.evaluate.trim();
+  return {
+    resume: { ...v,evaluate, name,education, experience, birth_on, job_year },
+  };
+}
+
+export async function sumitResume(v) {
+  const json = processValue(v);
+  await axios.post(`/resumes.json`, json);
+  return;
+}
diff --git a/src/modules/recruitment/data/updateResume.js b/src/modules/recruitment/data/updateResume.js
new file mode 100644
index 00000000..f62aa357
--- /dev/null
+++ b/src/modules/recruitment/data/updateResume.js
@@ -0,0 +1,8 @@
+import axios from "axios";
+import { processValue } from "./sumitResume";
+
+export async function updateResume(v) {
+  const json = processValue(v);
+  await axios.put("/users/update_resume.json", json);
+  return;
+}
diff --git a/src/modules/recruitment/jobAppliers/Header.js b/src/modules/recruitment/jobAppliers/Header.js
new file mode 100644
index 00000000..3e2bbfec
--- /dev/null
+++ b/src/modules/recruitment/jobAppliers/Header.js
@@ -0,0 +1,28 @@
+import React from "react";
+import styled from "styled-components";
+import { Row, Col } from "antd";
+import { config } from "./config";
+
+const Box = styled(Row)`
+  width: 100%;
+  height: 57px;
+  background: #fafafa;
+  font-size: 16px;
+  font-family: MicrosoftYaHeiSemibold;
+  color: rgba(51, 51, 51, 1);
+  text-align: center;
+`;
+
+const FlexBox = ({ children }) => (
+  <Box type="flex" justify="space-around" align="middle">
+    {children}
+  </Box>
+);
+
+export default () => (
+  <FlexBox>
+    {config.map((i) => (
+      <Col span={i[0]}>{i[1]}</Col>
+    ))}
+  </FlexBox>
+);
diff --git a/src/modules/recruitment/jobAppliers/Item.js b/src/modules/recruitment/jobAppliers/Item.js
new file mode 100644
index 00000000..7b61b4ee
--- /dev/null
+++ b/src/modules/recruitment/jobAppliers/Item.js
@@ -0,0 +1,71 @@
+import React from "react";
+import styled from "styled-components";
+import { Row, Col, Tooltip } from "antd";
+import { TextButton } from "../util/Button";
+
+const Box = styled(Row)`
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: rgba(51, 51, 51, 1);
+  text-align: center;
+  margin: 0 auto;
+`;
+const FlexBox = ({ children }) => (
+  <Box type="flex" justify="space-around" align="middle">
+    {children}
+  </Box>
+);
+const FlexRow = ({ children }) => (
+  <Row type="flex" justify="space-around" align="middle">
+    {children}
+  </Row>
+);
+
+const Edu = styled.div`
+  div {
+    font-size: 12px;
+    color: rgba(136, 136, 136, 1);
+  }
+`;
+
+const Download = ({ onClick }) => {
+  if (onClick) {
+    return (
+      <TextButton color="rgba(66,179,102,1)" onClick={onClick}>
+        下载简历
+      </TextButton>
+    );
+  }
+  return (
+    <Tooltip title="求职者未上传简历">
+      <TextButton color="rgba(136,136,136,1)">下载简历</TextButton>
+    </Tooltip>
+  );
+};
+
+export default ({ data }) => {
+  return (
+    <FlexBox>
+      <Col span={3}>{data.name}</Col>
+      <Col span={3}>{data.job}</Col>
+      <Col span={2}>{data.sex}</Col>
+      <Col span={2}>{data.age}</Col>
+      <Col span={2}>{data.exp ? data.exp + "年" : "-"}</Col>
+      <Col span={4}>
+        <Edu>
+          {data.edu_1}
+          <div>({data.edu_2})</div>
+        </Edu>
+      </Col>
+      <Col span={4}>{data.time}</Col>
+      <Col span={4}>
+        <FlexRow>
+          <TextButton color="rgba(76,172,255,1)" onClick={data.pfFunc}>
+            查看
+          </TextButton>
+          <Download onClick={data.dlFunc}></Download>
+        </FlexRow>
+      </Col>
+    </FlexBox>
+  );
+};
\ No newline at end of file
diff --git a/src/modules/recruitment/jobAppliers/List.js b/src/modules/recruitment/jobAppliers/List.js
new file mode 100644
index 00000000..92307a0d
--- /dev/null
+++ b/src/modules/recruitment/jobAppliers/List.js
@@ -0,0 +1,36 @@
+import React, { useCallback } from "react";
+import Item from "./Item";
+import styled from "styled-components";
+
+const Divider = styled.div`
+  width: 100%;
+  height: 1px;
+  border-top: 1px solid #EEEEEE;
+  margin-bottom: 6px;
+  margin-top: 6px;
+`;
+const Margin = styled.div`
+  height: 6px;
+`;
+const Widget = ({ data }) => {
+  let isFirst = true;
+  const isEnd = useCallback((idx) => idx === data.length - 1, [data]);
+  const lst = [];
+  data.forEach((item, idx) => {
+    if (isEnd(idx)) {
+      lst.push(<Item data={item} />);
+      lst.push(<Margin />);
+    } else if (isFirst) {
+      lst.push(<Margin />);
+      lst.push(<Item data={item} />);
+      lst.push(<Divider />);
+    } else {
+      lst.push(<Item data={item} />);
+      lst.push(<Divider />);
+    }
+    isFirst = false;
+  });
+  return <React.Fragment>{lst}</React.Fragment>;
+};
+
+export default Widget;
diff --git a/src/modules/recruitment/jobAppliers/config.js b/src/modules/recruitment/jobAppliers/config.js
new file mode 100644
index 00000000..d596b636
--- /dev/null
+++ b/src/modules/recruitment/jobAppliers/config.js
@@ -0,0 +1,10 @@
+export const config = [
+    [3, "姓名"],
+    [3, "职位名称"],
+    [2, "性别"],
+    [2, "年龄"],
+    [2, "工作年限"],
+    [4, "文化程度"],
+    [4, "投递时间"],
+    [4, "操作"]
+];
\ No newline at end of file
diff --git a/src/modules/recruitment/jobDetail/Address.js b/src/modules/recruitment/jobDetail/Address.js
new file mode 100644
index 00000000..584ce45d
--- /dev/null
+++ b/src/modules/recruitment/jobDetail/Address.js
@@ -0,0 +1,22 @@
+import React from "react";
+import ItemBase from "./ItemBase";
+import loc from "./icon/loc.png";
+import Icon from "./icon/Icon";
+import styled from "styled-components";
+
+const Address = styled.div`
+  font-size: 16px;
+  font-family: MicrosoftYaHei;
+  color: rgba(51, 51, 51, 1);
+  overflow-wrap: anywhere;
+`;
+
+const Widget = ({ address }) => {
+  const icon = <Icon src={loc} width="26px" height="24px" />;
+  return (
+    <ItemBase icon={icon} title="公司地址">
+      <Address>{address}</Address>
+    </ItemBase>
+  );
+};
+export default Widget;
diff --git a/src/modules/recruitment/jobDetail/Comp.js b/src/modules/recruitment/jobDetail/Comp.js
new file mode 100644
index 00000000..6e8eda47
--- /dev/null
+++ b/src/modules/recruitment/jobDetail/Comp.js
@@ -0,0 +1,31 @@
+import React from "react";
+import com from "./icon/com.png";
+import ItemBase from "./ItemBase";
+import Icon from "./icon/Icon";
+import styled from "styled-components";
+
+const Name = styled.div`
+  font-size: 16px;
+  font-family: MicrosoftYaHei;
+  color: rgba(51, 51, 51, 1);
+  margin-bottom:10px;
+`;
+
+const Intro = styled.div`
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: rgba(51, 51, 51, 1);
+  white-space: pre;
+  line-height:20px;
+  overflow-wrap: anywhere;
+`;
+
+export default ({ company, intro }) => {
+  const icon = <Icon src={com} width="28px" height="21px" />;
+  return (
+    <ItemBase icon={icon} title="公司介绍">
+      <Name>{company}</Name>
+      <Intro>{intro}</Intro>
+    </ItemBase>
+  );
+};
diff --git a/src/modules/recruitment/jobDetail/ConfirmModal.js b/src/modules/recruitment/jobDetail/ConfirmModal.js
new file mode 100644
index 00000000..2305a0ab
--- /dev/null
+++ b/src/modules/recruitment/jobDetail/ConfirmModal.js
@@ -0,0 +1,26 @@
+import React, { useCallback } from "react";
+import Modal from "../util/Modal";
+import { CenterBtnGrp, OkBtn, CancelBtn } from "../util/GeneralButton";
+import styled from "styled-components";
+
+const Tip = styled.div`
+  font-size: 16px;
+  margin: 40px auto;
+  text-align: center;
+`;
+
+export default ({ onCancel, history, jobId, ...props }) => {
+  const onOk = useCallback(() => {
+    onCancel();
+    history.push(`/recruitment/jobdetail/addresume/${jobId}`);
+  }, []);
+  return (
+    <Modal title="提示" {...props} getContainer={false}>
+      <Tip>你没有简历，是否前往创建简历？</Tip>
+      <CenterBtnGrp>
+        <CancelBtn onClick={onCancel} />
+        <OkBtn onClick={onOk} />
+      </CenterBtnGrp>
+    </Modal>
+  );
+};
diff --git a/src/modules/recruitment/jobDetail/Header.js b/src/modules/recruitment/jobDetail/Header.js
new file mode 100644
index 00000000..9b6a6c4a
--- /dev/null
+++ b/src/modules/recruitment/jobDetail/Header.js
@@ -0,0 +1,69 @@
+import React from "react";
+import styled from 'styled-components';
+import { Divider } from 'antd';
+import { BtnBase } from "../util/Button";
+import { betweenMixin } from "../util/cssMixin";
+
+const BetweenBox = styled.div`
+    ${betweenMixin}
+    padding-bottom:30px;
+`;
+const Button = styled(BtnBase)`
+    width:150px;
+    border-radius:5px;
+    background:rgba(76,172,255,1);
+    color:rgba(255,255,255,1);
+    font-size:16px;
+    font-family:MicrosoftYaHeiSemibold;
+    margin-top:60px;
+`;
+const ApplyBtn = (props) => <Button {...props} height="50px" />;
+
+const Title = styled.div`
+    font-size:28px;
+    font-family:MicrosoftYaHeiSemibold;
+    color:rgba(51,51,51,1);
+    margin-bottom:15px;
+`;
+const Salary = styled.div`
+    font-size:20px;
+    font-family:MicrosoftYaHeiSemibold;
+    color:rgba(251,72,72,1);
+    margin-bottom:10px;
+`;
+const Company = styled.div`
+    font-size:16px;
+    font-family:MicrosoftYaHei;
+    color:rgba(51,51,51,1);
+    margin-bottom:10px;
+`;
+const Detail = styled.span`
+    font-size:14px;
+    font-family:MicrosoftYaHeiLight;
+    color:rgba(136,136,136,1);
+`;
+
+const Widget = ({ data, apply }) => {
+    return <BetweenBox>
+        <div>
+            <Title>{data.name}</Title>
+            <Salary>{data.salary}/月</Salary>
+            <Company>{data.company}</Company>
+            <div>
+                <Detail>{data.city}</Detail>
+                <Divider type="vertical" />
+                <Detail>{data.class}</Detail>
+                <Divider type="vertical" />
+                <Detail>{data.edu}</Detail>
+                <Divider type="vertical" />
+                <Detail>招{data.num}人</Detail>
+                <Divider type="vertical" />
+                <Detail>{data.time}发布</Detail>
+            </div>
+        </div>
+        <ApplyBtn onClick={apply}>申请职位</ApplyBtn>
+    </BetweenBox>;
+}
+
+
+export default Widget;
diff --git a/src/modules/recruitment/jobDetail/ItemBase.js b/src/modules/recruitment/jobDetail/ItemBase.js
new file mode 100644
index 00000000..01b8d075
--- /dev/null
+++ b/src/modules/recruitment/jobDetail/ItemBase.js
@@ -0,0 +1,42 @@
+import React from "react";
+import styled from 'styled-components';
+
+const Divider = styled.div`
+    height:1px;
+    border-top:1px solid #FAFAFA;
+    flex-grow:1;
+`;
+const Title = styled.div`
+    font-size:18px;
+    font-family:MicrosoftYaHeiSemibold;
+    color:rgba(51,51,51,1);
+    margin-right:20px;
+`;
+const IconBox = styled.div`
+    width:28px;
+    height:24px;
+    margin-right:5px;
+    display:flex;
+    justify-content:start;
+    align-items:center;
+`;
+const Header = styled.div`
+    display:flex;
+    margin:10px auto;
+    align-items:center;
+`;
+const Box = styled.div`
+    margin-top:40px;
+    margin-bottom:40px;
+`;
+
+export default ({ icon, title, children }) => {
+    return <Box>
+        <Header>
+            <IconBox>{icon}</IconBox>
+            <Title>{title}</Title>
+            <Divider/>
+        </Header>
+        {children}
+    </Box>;
+};
\ No newline at end of file
diff --git a/src/modules/recruitment/jobDetail/JobInfo.js b/src/modules/recruitment/jobDetail/JobInfo.js
new file mode 100644
index 00000000..3d700833
--- /dev/null
+++ b/src/modules/recruitment/jobDetail/JobInfo.js
@@ -0,0 +1,22 @@
+import React from "react";
+import job from "./icon/job.png";
+import styled from "styled-components";
+import ItemBase from "./ItemBase";
+import Icon from "./icon/Icon";
+
+const Info = styled.div`
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: rgba(51, 51, 51, 1);
+  white-space: pre;
+  line-height:25px;
+  overflow-wrap: anywhere;
+`;
+export default ({ desc }) => {
+  const icon = <Icon src={job} width="20px" height="23px" />;
+  return (
+    <ItemBase icon={icon} title="职位要求">
+      <Info>{desc}</Info>
+    </ItemBase>
+  );
+};
diff --git a/src/modules/recruitment/jobDetail/icon/Icon.js b/src/modules/recruitment/jobDetail/icon/Icon.js
new file mode 100644
index 00000000..504a13c2
--- /dev/null
+++ b/src/modules/recruitment/jobDetail/icon/Icon.js
@@ -0,0 +1,7 @@
+import styled from 'styled-components';
+
+export default styled.img`
+    display:block;
+    width:${p=>p.width};
+    height:${p=>p.height};
+`;
\ No newline at end of file
diff --git a/src/modules/recruitment/jobDetail/icon/com.png b/src/modules/recruitment/jobDetail/icon/com.png
new file mode 100644
index 00000000..bcb02618
Binary files /dev/null and b/src/modules/recruitment/jobDetail/icon/com.png differ
diff --git a/src/modules/recruitment/jobDetail/icon/job.png b/src/modules/recruitment/jobDetail/icon/job.png
new file mode 100644
index 00000000..a8e26b2c
Binary files /dev/null and b/src/modules/recruitment/jobDetail/icon/job.png differ
diff --git a/src/modules/recruitment/jobDetail/icon/loc.png b/src/modules/recruitment/jobDetail/icon/loc.png
new file mode 100644
index 00000000..59adbfab
Binary files /dev/null and b/src/modules/recruitment/jobDetail/icon/loc.png differ
diff --git a/src/modules/recruitment/jobForm/FormPage.js b/src/modules/recruitment/jobForm/FormPage.js
new file mode 100644
index 00000000..5829d3b9
--- /dev/null
+++ b/src/modules/recruitment/jobForm/FormPage.js
@@ -0,0 +1,47 @@
+import React, { useRef, useCallback } from "react";
+import styled from "styled-components";
+import JobForm from "./JobForm";
+import { CenterBtnGrp, SaveBtn, CancelBtn } from "../util/GeneralButton";
+
+const Background = styled.div`
+  width: 100%;
+  background: rgba(245, 246, 249, 1);
+  min-height: 100vh;
+  padding: 20px;
+  padding-bottom: 70px;
+`;
+const Content = styled.div`
+  width: 1200px;
+  padding: 40px;
+  background: rgba(255, 255, 255, 1);
+  border-radius: 2px;
+  margin: 0 auto;
+  margin-bottom: 40px;
+`;
+const Margin = styled.div`
+  height:80px;
+`;
+
+export default ({ data, submit, back }) => {
+  const formRef = useRef(null);
+  const onOk = useCallback(() => {
+    formRef.current.validateFieldsAndScroll((e, v) => {
+      if (e) {
+        return;
+      }
+      submit(v);
+    });
+  }, []);
+  return (
+    <Background>
+      <Content>
+        <JobForm ref={formRef} {...data}></JobForm>
+      </Content>
+      <CenterBtnGrp>
+        <CancelBtn onClick={back} />
+        <SaveBtn onClick={onOk} />
+      </CenterBtnGrp>
+      <Margin/>
+    </Background>
+  );
+};
diff --git a/src/modules/recruitment/jobForm/JobForm.js b/src/modules/recruitment/jobForm/JobForm.js
new file mode 100644
index 00000000..4ff34a3c
--- /dev/null
+++ b/src/modules/recruitment/jobForm/JobForm.js
@@ -0,0 +1,196 @@
+import React, { useCallback } from "react";
+import { Form, Input, InputNumber, Radio, Row, Select, Cascader } from "antd";
+import InputWithLen from "./widget/InputWithLen";
+import TextArea from "./widget/TextArea";
+import CateSelect from "./widget/CateSelect";
+import { locData } from "../data/locData";
+import { mapPropsToFields } from "../data/mapJobData";
+import styled from "styled-components";
+
+const Divider = styled.div`
+  position: relative;
+  top: 20px;
+  border: 1px solid #bbbbbb;
+  width: 30px;
+  height: 1px;
+  margin: 0 10px;
+`;
+const Label = styled.div`
+  &::before{
+    content:${p=>p.required?'"*"':'""'};
+    color:${p=>p.required?"red":"black"};
+  }
+  &::after{
+    content:"：";
+  }
+  margin-bottom:5px;
+  font-size: 16px;
+  font-family: MicrosoftYaHeiSemibold;
+  color: rgba(51, 51, 51, 1);
+`;
+
+export default Form.create({ mapPropsToFields })(({ form }) => {
+  const { getFieldDecorator } = form;
+  const helper = useCallback(
+    (label, name, rules, widget, isRequired = true) => (
+      <React.Fragment>
+        <Label required={isRequired}>{label}</Label>
+        <Form.Item>
+          {getFieldDecorator(name, { rules, validateFirst: true })(widget)}
+        </Form.Item>
+      </React.Fragment>
+    ),
+    []
+  );
+  const jobValidator = useCallback((r, v, cb) => {
+    if (!v) {
+      cb("请选择职位类别");
+    } else if (!v.father || !v.son) {
+      cb("请选择职位类别");
+    } else {
+      cb();
+    }
+  }, []);
+  const greatValidator = useCallback((r, v, cb) => {
+    if (Number(v) >= Number(form.getFieldValue("min"))) {
+      cb();
+    } else {
+      cb("薪酬范围不正确");
+    }
+  }, []);
+  const cityValidator = useCallback((r, v, cb) => {
+    if (!v[1]) {
+      cb("请选择城市");
+    } else {
+      cb();
+    }
+  }, []);
+  return (
+    <Form>
+      {helper(
+        "职位名称",
+        "name",
+        [
+          { required: true, message: "请输入职位名称" },
+          { max: 60, message: "超过60字符" },
+        ],
+        <InputWithLen maxLen={60} placeholder="请输入职位名称" />
+      )}
+      {helper(
+        "职位类别",
+        "class",
+        [{ validator: jobValidator }],
+        <CateSelect />
+      )}
+      {helper(
+        "招聘人数",
+        "num",
+        [],
+        <InputNumber placeholder="请输入招聘人数" min={0} style={{width:"252px"}}/>,
+        false
+      )}
+      {helper(
+        "工作性质",
+        "prop",
+        [{ required: true, message: "请选择工作性质" }],
+        <Radio.Group>
+          {["全职", "兼职", "实习"].map((s) => (
+            <Radio value={s}>{s}</Radio>
+          ))}
+        </Radio.Group>
+      )}
+      <Label required>工作地址</Label>
+      <Row type="flex">
+        <Form.Item>
+          {getFieldDecorator("city", {
+            rules: [{ validator: cityValidator }],
+          })(<Cascader placeholder="请选择城市" options={locData} style={{width:"191px",marginRight:"15px"}}/>)}
+        </Form.Item>
+        <Form.Item sty>
+          {getFieldDecorator("address", {
+            rules: [
+              { required: true, message: "请输入详细地址" },
+              { max: 60, message: "超过60字符" },
+            ],
+            validateFirst: true,
+          })(<Input placeholder="请输入详细地址" style={{width:"910px"}}/>)}
+        </Form.Item>
+      </Row>
+      <Label>月薪范围</Label>
+      <Row type="flex">
+        <Form.Item>
+          {getFieldDecorator("min", {
+            rules: [
+              { pattern: /^\s*\d+\s*$/, message: "请输入数字" },
+              { required: true, message: "请输入最低薪酬" },
+            ],
+            validateFirst: true,
+          })(<Input placeholder="最低" suffix="元" style={{width:"252px"}}/>)}
+        </Form.Item>
+        <Divider />
+        <Form.Item>
+          {getFieldDecorator("max", {
+            rules: [
+              { pattern: /^\s*\d+\s*$/, message: "请输入数字" },
+              { required: true, message: "请输入最高薪酬" },
+              { validator: greatValidator },
+            ],
+            validateFirst: true,
+          })(<Input placeholder="最高" suffix="元" style={{width:"252px"}}/>)}
+        </Form.Item>
+      </Row>
+      {helper(
+        "最低学历",
+        "edu",
+        [{ required: true, message: "请选择最低学历" }],
+        <Select style={{width:"252px"}}>
+          {[
+            "学历不限",
+            "本科",
+            "硕士",
+            "博士",
+            "大专",
+            "中技",
+            "中专",
+            "高中",
+          ].map((s) => (
+            <Select.Option value={s}>{s}</Select.Option>
+          ))}
+        </Select>
+      )}
+      {helper(
+        "工作年限",
+        "exp",
+        [{ required: true, message: "请选择工作年限" }],
+        <Select style={{width:"252px"}}>
+          {["经验不限", "1年以下", "1-3年", "3-5年", "5-10年", "10年以上"].map(
+            (s) => (
+              <Select.Option value={s}>{s}</Select.Option>
+            )
+          )}
+        </Select>
+      )}
+      {helper(
+        "职位描述",
+        "desc",
+        [
+          { required: true, message: "请输入职位描述" },
+          { max: 5000, message: "超过5000字符" },
+        ],
+        <TextArea
+          placeholder="请输入职位描述"
+          autoSize={{ minRows: 6, maxRows: 6 }}
+        ></TextArea>
+      )}
+      {helper(
+        "公司介绍",
+        "intro",
+        [{ max: 5000, message: "超过5000字符" }],
+        <TextArea
+          placeholder="请输入公司介绍"
+          autoSize={{ minRows: 6, maxRows: 6 }}
+        ></TextArea>
+      )}
+    </Form>
+  );
+});
diff --git a/src/modules/recruitment/jobForm/popup/AddClass.js b/src/modules/recruitment/jobForm/popup/AddClass.js
new file mode 100644
index 00000000..5924188a
--- /dev/null
+++ b/src/modules/recruitment/jobForm/popup/AddClass.js
@@ -0,0 +1,51 @@
+import React, { useCallback } from "react";
+import { Input, Form } from "antd";
+import Modal from "../../util/Modal";
+import { CenterBtnGrp, OkBtn, CancelBtn } from "../../util/GeneralButton";
+
+const InnerForm = Form.create()(({ form, onCancel, setValue }) => {
+  const { getFieldDecorator, validateFields } = form;
+  const rules = [
+    { required: true, message: "请输入职业分类" },
+    { max: 10, message: "超过10字符" },
+    { whitespace: true, message: "不能全空" },
+  ];
+  const formLayout = {
+    labelCol: { span: 5 },
+    wrapperCol: { span: 17 },
+  };
+  const onOk = useCallback(() => {
+    validateFields((e, v) => {
+      if (e) {
+        return;
+      }
+      setValue(v);
+      onCancel();
+    });
+  }, []);
+  return (
+    <Form {...formLayout} style={{ marginTop: "20px" }}>
+      <Form.Item label="父级分类">
+        {getFieldDecorator("father", { rules })(
+          <Input placeholder="请输入父级分类" />
+        )}
+      </Form.Item>
+      <Form.Item label="子级别分类">
+        {getFieldDecorator("son", { rules })(
+          <Input placeholder="请输入子级分类" />
+        )}
+      </Form.Item>
+      <CenterBtnGrp>
+        <CancelBtn onClick={onCancel} />
+        <OkBtn onClick={onOk} />
+      </CenterBtnGrp>
+    </Form>
+  );
+});
+
+//visible, setValue, onCancel
+export default ({ setValue, ...props }) => (
+  <Modal {...props} width="600px" title="新增职业类别" getContainer={false}>
+    <InnerForm setValue={setValue} onCancel={props.onCancel} />
+  </Modal>
+);
diff --git a/src/modules/recruitment/jobForm/popup/SelectClass.js b/src/modules/recruitment/jobForm/popup/SelectClass.js
new file mode 100644
index 00000000..3252a777
--- /dev/null
+++ b/src/modules/recruitment/jobForm/popup/SelectClass.js
@@ -0,0 +1,66 @@
+import { Row, Col } from 'antd';
+import React, { useState, useCallback, useRef, useEffect } from 'react';
+import Loading from '../../util/Loading';
+import { getJobCate } from '../../data/getJobCate';
+import Modal from '../../util/Modal';
+import { CenterBtnGrp, OkBtn, CancelBtn } from '../../util/GeneralButton';
+import FatherNav from './selectWidget/FatherNav';
+import SonArea from './selectWidget/SonArea';
+
+
+//visible, setValue, onCancel
+export default ({ setValue, ...props }) => {
+    const [isloaded, setLoaded] = useState(false);
+    const dataRef = useRef(null);
+    useEffect(() => {
+        const f = async () => {
+            const map = await getJobCate();
+            //const map = mock;
+            dataRef.current = map;
+            setLoaded(true);
+        }
+        f();
+        return () => { setLoaded(false); };
+    }, []);
+    const [selectedCate, setCate] = useState(null);
+    const [selectedJob, setJob] = useState(null);
+    const selectCate = useCallback(text => {
+        if (text === selectedCate) {
+            return;
+        }
+        setCate(text);
+        setJob(null);
+    }, []);
+    const selectJob = useCallback(text => {
+        if (text === selectedJob) {
+            return;
+        }
+        setJob(text);
+    }, []);
+    const onOk = useCallback(() => {
+        if (selectedJob === null) {
+            return;
+        }
+        props.onCancel();
+        setValue({ father: selectedCate, son: selectedJob });
+    }, [selectedCate, selectedJob]);
+    const Content = <Row style={{ height: "572px" }}>
+        <Col span={6} style={{ height: "100%" }}>
+            <FatherNav data={dataRef.current} selectCate={selectCate} selectedCate={selectedCate}></FatherNav>
+        </Col>
+        <Col span={18} style={{ height: "100%" }}>
+            <div style={{ height: "490px" }}>
+                <SonArea data={selectedCate ? dataRef.current.get(selectedCate) : new Set()}
+                    selectedJob={selectedJob}
+                    selectJob={selectJob} />
+            </div>
+            <CenterBtnGrp>
+                <CancelBtn onClick={props.onCancel} />
+                <OkBtn onClick={onOk} />
+            </CenterBtnGrp>
+        </Col>
+    </Row>;
+    return <Modal title="选择职位类别" width="846px" {...props} getContainer={false}>
+        {!isloaded ? <Loading /> : Content}
+    </Modal>;
+};
\ No newline at end of file
diff --git a/src/modules/recruitment/jobForm/popup/selectWidget/FatherItem.js b/src/modules/recruitment/jobForm/popup/selectWidget/FatherItem.js
new file mode 100644
index 00000000..3455e387
--- /dev/null
+++ b/src/modules/recruitment/jobForm/popup/selectWidget/FatherItem.js
@@ -0,0 +1,29 @@
+import styled from 'styled-components';
+import React from 'react';
+import { Icon as AdIcon } from "antd";
+import { pointerMixin, betweenMixin } from "../../../util/cssMixin";
+
+const Item = styled.div`
+    height:57px;
+    background:${p => p.isSelected ? "rgba(241,241,241,1)" : "transparent"};
+    ${pointerMixin}
+    ${betweenMixin}
+`;
+const Name = styled.div`
+    color:rgba(51,51,51,1);
+    font-size:16px;
+    font-family:MicrosoftYaHei;
+    margin-left:30px;
+`;
+const Icon = styled(AdIcon)`
+    display:block;
+    color:rgba(187,187,187,1);
+    margin-right:20px;
+`;
+
+//onClick, isSelected
+export default ({ children, ...props }) =>
+    <Item {...props}>
+        <Name>{children}</Name>
+        <Icon type="right" />
+    </Item>;
\ No newline at end of file
diff --git a/src/modules/recruitment/jobForm/popup/selectWidget/FatherNav.js b/src/modules/recruitment/jobForm/popup/selectWidget/FatherNav.js
new file mode 100644
index 00000000..5d492d9f
--- /dev/null
+++ b/src/modules/recruitment/jobForm/popup/selectWidget/FatherNav.js
@@ -0,0 +1,14 @@
+import styled from 'styled-components';
+import React from 'react';
+import Item from './FatherItem';
+
+const Column = styled.div`
+    background:rgba(250,250,250,1);
+    height:100%;
+    overflow:auto;
+`;
+
+export default ({ data, selectCate, selectedCate }) => //data is a map
+    <Column>
+        {Array.from(data.keys()).map(i => <Item onClick={() => { selectCate(i); }} isSelected={selectedCate === i}>{i}</Item>)}
+    </Column>;
\ No newline at end of file
diff --git a/src/modules/recruitment/jobForm/popup/selectWidget/SonArea.js b/src/modules/recruitment/jobForm/popup/selectWidget/SonArea.js
new file mode 100644
index 00000000..facb25ad
--- /dev/null
+++ b/src/modules/recruitment/jobForm/popup/selectWidget/SonArea.js
@@ -0,0 +1,19 @@
+import { Row } from "antd";
+import React from "react";
+import { JobBtn } from "../../../util/GeneralButton";
+
+export default ({ data, selectedJob, selectJob }) => (
+  <Row type="flex">
+    {Array.from(data.keys()).map((i) => (
+      <JobBtn
+        key={i}
+        onClick={() => {
+          selectJob(i);
+        }}
+        isSelected={selectedJob === i}
+      >
+        {i}
+      </JobBtn>
+    ))}
+  </Row>
+);
diff --git a/src/modules/recruitment/jobForm/widget/CateSelect.js b/src/modules/recruitment/jobForm/widget/CateSelect.js
new file mode 100644
index 00000000..55b8d570
--- /dev/null
+++ b/src/modules/recruitment/jobForm/widget/CateSelect.js
@@ -0,0 +1,61 @@
+import React, { forwardRef } from "react";
+import { Icon, Row } from "antd";
+import { useToggle } from "../../util/hooks";
+import styled from "styled-components";
+import { BtnBase } from "../../util/Button";
+import AddClassPopup from "../popup/AddClass";
+import SelectClassPopup from "../popup/SelectClass";
+
+const SimulateInput = styled(BtnBase)`
+  border-radius: 4px;
+  border: 1px solid rgba(221, 221, 221, 1);
+  width: 252px;
+  padding-left: 10px;
+  padding-right: 10px;
+  margin-bottom: 5px;
+  &:hover {
+    border: 1px solid #40a9ff;
+  }
+  &.has-error {
+    border: 1px solid #f5222d;
+  }
+`;
+
+const SI = ({ children }) => (
+  <SimulateInput height="33px">{children}</SimulateInput>
+);
+
+const Value = styled.span`
+  font-size: 14px;
+  color: rgba(51, 51, 51, 1);
+  font-family: MicrosoftYaHei;
+`;
+const Placeholder = styled(Value)`
+  color: rgba(187, 187, 187, 1);
+`;
+
+export default forwardRef(({ onChange, value, placeholder }, ref) => {
+  const [v1, sv1] = useToggle();
+  const [v2, sv2] = useToggle();
+  return (
+    <Row type="flex" align="middle" ref={ref}>
+      <SI classname="simulateinput">
+        <Row type="flex" justify="space-between" align="middle" onClick={sv2}>
+          {!value || !value.father || !value.son ? (
+            <Placeholder>请选择职位类别</Placeholder>
+          ) : (
+            <Value>{`${value.father}/${value.son}`}</Value>
+          )}
+          <Icon type="down" style={{ color: "#979797" }} />
+        </Row>
+      </SI>
+      <Icon
+        type="plus-circle"
+        onClick={sv1}
+        style={{ color: "#42B366", marginLeft: "15px", display: "none" }}
+      />
+      <AddClassPopup setValue={onChange} visible={v1} onCancel={sv1} />
+      <SelectClassPopup setValue={onChange} visible={v2} onCancel={sv2} />
+    </Row>
+  );
+});
diff --git a/src/modules/recruitment/jobForm/widget/InputWithLen.js b/src/modules/recruitment/jobForm/widget/InputWithLen.js
new file mode 100644
index 00000000..dfa26f02
--- /dev/null
+++ b/src/modules/recruitment/jobForm/widget/InputWithLen.js
@@ -0,0 +1,7 @@
+import React, { forwardRef } from "react";
+import { Input } from "antd";
+
+export default forwardRef(({ maxLen, ...props }, ref) => {
+    const len = !props.value ? 0 : props.value.length;
+    return <Input {...props} suffix={<span>{`${len}/${maxLen}`}</span>} ref={ref} />
+});
\ No newline at end of file
diff --git a/src/modules/recruitment/jobForm/widget/TextArea.js b/src/modules/recruitment/jobForm/widget/TextArea.js
new file mode 100644
index 00000000..de4e1423
--- /dev/null
+++ b/src/modules/recruitment/jobForm/widget/TextArea.js
@@ -0,0 +1,6 @@
+import styled from 'styled-components';
+import { Input } from "antd";
+
+export default styled(Input.TextArea)`
+    resize:none;
+`;
\ No newline at end of file
diff --git a/src/modules/recruitment/recrulistcss/recrulistcss.scss b/src/modules/recruitment/recrulistcss/recrulistcss.scss
new file mode 100644
index 00000000..8540ab4c
--- /dev/null
+++ b/src/modules/recruitment/recrulistcss/recrulistcss.scss
@@ -0,0 +1,260 @@
+
+.IntermediateCenter {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+
+}
+
+.JianDcentered {
+  display: flex;
+  align-items: center;
+}
+
+.spacearound {
+  display: flex;
+  justify-content: space-around;
+
+}
+
+.spacebetween {
+  display: flex;
+  justify-content: space-between;
+}
+
+.topcenter {
+  display: -webkit-flex;
+  flex-direction: column;
+  align-items: center;
+
+}
+
+.sortinxdirection {
+  display: flex;
+  flex-direction: row;
+}
+
+.xaxisreverseorder {
+  display: flex;
+  flex-direction: row-reverse;
+}
+
+.verticallayout {
+  display: flex;
+  flex-direction: column;
+}
+
+.reversedirection {
+  display: flex;
+  flex-direction: column-reverse;
+}
+
+.color88 {
+  color: #888888;
+}
+
+.mr7 {
+  margin-right: 7px;
+}
+.ml21{
+  margin-left: 21px;
+}
+
+.mt22 {
+  margin-top: 22px;
+}
+
+.w50s {
+  width: 50%;
+}
+.w70s {
+  width: 70%;
+}
+.w80s {
+  width: 80%;
+}
+
+.w20s {
+  width: 20%;
+}
+
+.w83s {
+  width: 83%;
+}
+
+.w17s {
+  width: 17%;
+}
+
+.iconcolor {
+  color: #4CADFF !important;
+}
+
+.lh45s {
+  line-height: 45px;
+}
+
+.lh48s {
+  line-height: 48px;
+
+}
+
+.lh40s {
+  line-height: 40px;
+}
+
+.titless100 {
+  max-width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+}
+
+.w1199dbl {
+  width: 1200px;
+  min-height: 60px;
+  background: rgba(255, 255, 255, 1);
+  -webkit-box-shadow: 0px 6px 8px 0px rgba(0, 0, 0, 0.03);
+  box-shadow: 0px 6px 8px 0px rgba(0, 0, 0, 0.03);
+  border-radius: 2px;
+}
+.divgreens{
+  color: #42B366;
+  background: #D8F7E2 !important;
+  border: 1px solid #D8F7E2 !important;
+}
+.divViolets{
+  color: #5B36D1;
+  border: 1px solid #E8E1FF !important;
+  background: #E8E1FF !important;
+
+}
+.divoranges{
+  color: #E65A18;
+  border: 1px solid #FFF2EC  !important;
+  background: #FFF2EC!important;
+
+}
+.divreds{
+  color: #F30F0F;
+  border: 1px solid #FFE6E6 !important;
+  background: #FFE6E6 !important;
+}
+
+.xiaoshou {
+  cursor: pointer !important;
+}
+
+.xiaoshout {
+  cursor: default !important;
+}
+
+.pdtop30 {
+  padding-top: 30px !important;
+}
+.pd30{
+  padding: 30px;
+}
+.ptabo{
+  .ant-input-wrapper {
+    .ant-input {
+      height: 48px !important;
+      line-height: 46px !important;
+    }
+  }
+
+  .ant-input-group-addon {
+    width: 48px !important;
+
+    .ant-btn-lg {
+      height: 46px !important;
+      width: 108px;
+      border-left: 1px solid #1890ff !important;
+      border-bottom: 1px solid #1890ff !important;
+      border-right: 1px solid #1890ff !important;
+      border-top: 1px solid #1890ff !important;
+    }
+  }
+
+  .ant-popover-inner-content {
+    padding: 0px !important;
+  }
+
+}
+.tabone {
+  border-bottom: 1px solid #EEEEEE;
+
+  .pdtab {
+    padding-top: 15px;
+    padding-left: 15px;
+    padding-right: 30px;
+
+
+    .ant-tabs {
+      width: 50% !important;
+
+      .ant-tabs-bar {
+        border-bottom: 1px solid #ffffff;
+
+        .ant-tabs-tab {
+          font-size: 16px;
+        }
+      }
+
+    }
+  }
+
+  .pdtabs {
+
+    .searchwidth {
+      width: 100%;
+    }
+  }
+
+  .pdtabss {
+    .divgreen{
+      color: #42B366;
+      border: 1px solid #42B366;
+
+
+    }
+    .divViolet{
+      color: #5B36D1;
+      border: 1px solid #5B36D1;
+
+
+
+    }
+    .divorange{
+      color: #E65A18;
+      border: 1px solid #E65A18;
+
+
+    }
+    .divred{
+      color: #F30F0F;
+      border: 1px solid #F30F0F;
+
+
+    }
+    .brodersdiv{
+
+      background: #ffffff;
+      border-radius:25px;
+      min-width: 170px;
+      text-align: center;
+      height: 46px;
+      line-height: 46px;
+    }
+
+
+    .searchwidth {
+      width:347px;
+    }
+  }
+  .pdtabsss {
+    padding: 30px;
+  }
+}
diff --git a/src/modules/recruitment/resumeForm/CompanyHeader.js b/src/modules/recruitment/resumeForm/CompanyHeader.js
new file mode 100644
index 00000000..32ed9232
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/CompanyHeader.js
@@ -0,0 +1,38 @@
+import React from "react";
+import styled from "styled-components";
+import { Divider, Row } from "antd";
+
+const Header = styled.div`
+  width: 1200px;
+  height: 145px;
+  background: rgba(255, 255, 255, 1);
+  border-radius: 2px;
+  padding: 40px;
+  margin:0 auto;
+  margin-bottom: 20px;
+`;
+const Job = styled.div`
+  font-size: 20px;
+  font-family: MicrosoftYaHeiSemibold;
+  color: rgba(51, 51, 51, 1);
+  margin-bottom:15px;
+`;
+
+const Item = styled.span`
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: rgba(51, 51, 51, 1);
+`;
+
+export default ({ jobName, company, city }) => {
+  return (
+    <Header>
+      <Job>{jobName}</Job>
+      <div>
+        <Item>{company}</Item>
+        <Divider type="vertical" />
+        <Item>{city}</Item>
+      </div>
+    </Header>
+  );
+};
diff --git a/src/modules/recruitment/resumeForm/Form.js b/src/modules/recruitment/resumeForm/Form.js
new file mode 100644
index 00000000..f22a4a53
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/Form.js
@@ -0,0 +1,7 @@
+import React, {
+    createContext,
+    forwardRef,
+    useImperativeHandle,
+    useCallback,
+  } from "react";
+export const FormCtx = createContext();
\ No newline at end of file
diff --git a/src/modules/recruitment/resumeForm/NormalForm.js b/src/modules/recruitment/resumeForm/NormalForm.js
new file mode 100644
index 00000000..3a4cb636
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/NormalForm.js
@@ -0,0 +1,240 @@
+import _ from "lodash";
+import React, { forwardRef, useImperativeHandle, useCallback } from "react";
+import { Form, Input, Radio, Row, DatePicker, Icon } from "antd";
+import styled from "styled-components";
+import ImageUploader from "./widget/ImageUploader";
+import ResumesUploader from "./widget/ResumesUploader";
+import JobExpect from "./widget/JobExpect";
+import EduItem from "./widget/EduItem";
+import WorkItem from "./widget/WorkItem";
+import { FormCtx } from "./Form";
+import { AddButton } from "./widget/Button";
+import { useSet } from "../util/hooks";
+import { genUuid } from "../data/genUuid";
+import { mapPropsToFields } from "../data/mapResumeData";
+import moment from "moment";
+
+const Label = styled.div`
+  &::before {
+    content: ${(p) => (p.required ? '"*"' : '""')};
+    color: ${(p) => (p.required ? "red" : "black")};
+  }
+  &::after {
+    content: "：";
+  }
+  margin-bottom: 5px;
+  font-size: 16px;
+  font-family: MicrosoftYaHeiSemibold;
+  color: rgba(51, 51, 51, 1);
+`;
+const Tip = styled.div`
+  font-size: 12px;
+  font-family: MicrosoftYaHei;
+  color: rgba(136, 136, 136, 1);
+  margin-left: 10px;
+`;
+
+export default Form.create({ mapPropsToFields })(
+  forwardRef(({ form, attachment_name, logo_url, attachment_url, attachment_id }, ref) => {
+    const {
+      getFieldDecorator,
+      validateFields,
+      getFieldValue,
+      setFields,
+      getFieldsValue
+    } = form;
+    const { set: eduSet, add: eduAdd, remove: eduRm } = useSet();
+    const { set: wkSet, add: wkAdd, remove: wkRm } = useSet();
+    const addEdu = useCallback(() => {
+      const uuid = genUuid();
+      eduAdd(uuid);
+      return uuid;
+    }, []);
+    const addWk = useCallback(() => {
+      const uuid = genUuid();
+      wkAdd(uuid);
+      return uuid;
+    }, []);
+    const set = useCallback((education, experience) => {
+      const object = {};
+      if (experience !== undefined) {
+        experience.forEach((exp) => {
+          const id = addWk();
+          ["company", "desc"].forEach((k) => {
+            object[`experience[${id}].${k}`] = { value: exp[k] };
+          });
+          ["begin_on", "end_on"].forEach((k) => {
+            object[`experience[${id}].${k}`] = { value: moment(exp[k]) };
+          });
+        });
+      }
+      if (education !== undefined) {
+        let isFirst = true;
+        education.forEach((edu) => {
+          const id = isFirst ? "base" : addEdu();
+          ["edu_bg", "edu_category", "major", "school"].forEach((k) => {
+            object[`education[${id}].${k}`] = { value: edu[k] };
+          });
+          ["begin_on", "end_on"].forEach((k) => {
+            object[`education[${id}].${k}`] = { value: moment(edu[k]) };
+          });
+          isFirst = false;
+        });
+      }
+      setTimeout(() => {
+        setFields(object);
+      }, 1000);
+    }, []);
+    const genVerArr = useCallback(() => {
+      const genWk = (key) =>
+        ["begin_on", "end_on", "company", "desc"].map(
+          (k) => `experience[${key}].${k}`
+        );
+      const genEdu = (key) =>
+        ["begin_on", "end_on", "edu_bg", "edu_category", "major", "school"].map(
+          (k) => `education[${key}].${k}`
+        );
+      const field = [
+        "name",
+        "sex",
+        "logo",
+        "birth_on",
+        "mobile",
+        "evaluate",
+        "attachment_id",
+        "job_position",
+        "city",
+        "salary",
+        "job_category",
+        "job_year",
+      ];
+      const baseEdu = genEdu("base");
+      const wk = _.flatten(Array.from(wkSet.keys()).map(genWk));
+      const edu = _.flatten(Array.from(eduSet.keys()).map(genEdu));
+      return _.concat(wk, edu, field, baseEdu);
+    }, []);
+    useImperativeHandle(ref, () => ({
+      verify: (callback) => {
+        validateFields(genVerArr(), callback);
+      },
+      set,
+    }));
+    const helper = useCallback(
+      (label, name, rules, widget, isRequired = true) => (
+        <React.Fragment>
+          <Label required={isRequired}>{label}</Label>
+          <Form.Item>
+            {getFieldDecorator(name, { rules, validateFirst: true })(widget)}
+          </Form.Item>
+        </React.Fragment>
+      ),
+      []
+    );
+    return (
+      <FormCtx.Provider value={{ getFieldDecorator, getFieldValue }}>
+        <Form>
+          {helper(
+            "姓名",
+            "name",
+            [
+              { max: 60, message: "超过60字符" },
+              { required: true, message: "请输入姓名" },
+              { whitespace: true, message: "不能全空" },
+            ],
+            <Input placeholder="请输入姓名" style={{ width: "534px" }} />
+          )}
+          {helper(
+            "性别",
+            "sex",
+            [{ required: true, message: "请选择性别" }],
+            <Radio.Group>
+              <Radio value="男">男</Radio>
+              <Radio value="女">女</Radio>
+            </Radio.Group>
+          )}
+          <Row type="flex" justify="start" align="middle">
+            <Label>照片上传</Label>
+            <Tip>只支持JPG,JPEG格式,大小不要超过2MB，建议使用证件照</Tip>
+          </Row>
+          {getFieldDecorator("logo", {})(<ImageUploader logo_url={logo_url} />)}
+          {helper(
+            "出生日期",
+            "birth_on",
+            [{ required: true, message: "请选择日期" }],
+            <DatePicker placeholder="请选择日期" disabledDate={(m) => m > moment()} />
+          )}
+          {helper(
+            "手机号",
+            "mobile",
+            [
+              { required: true, message: "请输入手机号" },
+              { min: 11, message: "号码不正确" },
+              { max: 11, message: "号码不正确" },
+              { pattern: /^\d+$/, message: "请输入数字" },
+            ],
+            <Input placeholder="请输入手机号" style={{ width: "534px" }} />
+          )}
+          {helper(
+            "参加工作时间",
+            "job_year",
+            [],
+            <DatePicker.MonthPicker placeholder="请选择日期" />,
+            false
+          )}
+          <Label required>求职意向</Label>
+          <JobExpect />
+          <Label required>教育经历</Label>
+          <EduItem nameKey="base" />
+          {Array.from(eduSet.values()).map((k) => (
+            <EduItem
+              nameKey={k}
+              key={k}
+              onDelete={() => {
+                eduRm(k);
+              }}
+            />
+          ))}
+          <AddButton onClick={addEdu}>
+            <Icon type="plus" />
+            添加教育经历
+          </AddButton>
+          <Label>工作/实习经历</Label>
+          {Array.from(wkSet.values()).map((k) => (
+            <WorkItem
+              nameKey={k}
+              key={k}
+              onDelete={() => {
+                wkRm(k);
+              }}
+            />
+          ))}
+          <AddButton onClick={addWk}>
+            <Icon type="plus" />
+            添加工作经验
+          </AddButton>
+          {helper(
+            "自我评价",
+            "evaluate",
+            [{ max: 5000, message: "超过5000字符" }],
+            <Input.TextArea
+              placeholder="请输入自我评价"
+              autoSize={{ minRows: 4, maxRows: 4 }}
+            />,
+            false
+          )}
+          <Row type="flex" justify="start" align="middle">
+            <Label>简历上传</Label>
+            <Tip>（上传简历可以提高应聘成功率）</Tip>
+          </Row>
+          {getFieldDecorator("attachment_id", { rules: [] })(
+            <ResumesUploader
+              attachment_name={attachment_name}
+              attachment_url={attachment_url}
+              attachment_id={attachment_id}
+            />
+          )}
+        </Form>
+      </FormCtx.Provider>
+    );
+  })
+);
diff --git a/src/modules/recruitment/resumeForm/popup/CityPopup.js b/src/modules/recruitment/resumeForm/popup/CityPopup.js
new file mode 100644
index 00000000..e5ba5983
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/popup/CityPopup.js
@@ -0,0 +1,51 @@
+import React, { useEffect,useCallback } from "react";
+import {message} from 'antd';
+import Modal from "./Modal";
+import { useLoaded, useMap } from "../../util/hooks";
+import { getCurrCity } from "../../data/getCurrCity";
+import { CenterBtnGrp, OkBtn, CancelBtn } from "../../util/GeneralButton";
+import CityList from "./city/CityList";
+import SelectedCity from "./city/SelectedCity";
+import { getHotCity } from "../../data/getHotCity";
+import Loading from "../../util/Loading";
+
+//visible, setValue, onCancel
+export default ({ setValue, ...props }) => {
+  const { isLoaded: isCurrCityLoaded, data: currCity } = useLoaded(
+    getCurrCity,
+    []
+  );
+  const { isLoaded: isCityLoaded, data: cityLst } = useLoaded(getHotCity, []);
+  const { map, add, remove } = useMap((m) => {
+    if (m.size >= 5) {
+      message.error("最多选择5项");
+      return false;
+    }
+    return true;
+  });
+  useEffect(() => {
+    if (isCurrCityLoaded) {
+      add(currCity, true);
+    }
+  }, [isCurrCityLoaded]);
+  const onOk = useCallback(() => {
+    props.onCancel();
+    setValue(Array.from(map.keys()));
+  }, []);
+  const content =
+    !isCurrCityLoaded || !isCityLoaded ? (
+      <Loading />
+    ) : (
+      <React.Fragment>
+        <SelectedCity selected={map} remove={remove} />
+        <CityList select={add} data={cityLst} />
+        <CenterBtnGrp style={{marginBottom:"20px"}}>
+          <CancelBtn onClick={props.onCancel} />
+          <OkBtn onClick={onOk} />
+        </CenterBtnGrp>
+      </React.Fragment>
+    );
+  return <Modal width="680px" {...props} getContainer={false}>
+    {content}
+  </Modal>;
+};
diff --git a/src/modules/recruitment/resumeForm/popup/JobPopup.js b/src/modules/recruitment/resumeForm/popup/JobPopup.js
new file mode 100644
index 00000000..29781b60
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/popup/JobPopup.js
@@ -0,0 +1,68 @@
+import React, { useCallback, useState,useEffect } from "react";
+import { Row, Col, message } from "antd";
+import Modal from "../../util/Modal";
+import Nav from "./jobClass/FatherNav";
+import SonNav from "./jobClass/SonArea";
+import Tiltle from "./jobClass/Tiltle";
+import Loading from "../../util/Loading";
+import { useLoaded, useSet } from "../../util/hooks";
+import { CenterBtnGrp, OkBtn, CancelBtn } from "../../util/GeneralButton";
+import { getJobCate } from "../../data/getJobCate";
+
+//visible, setValue, onCancel
+export default ({ setValue, initArr, ...props }) => {
+  const { isLoaded, data } = useLoaded(getJobCate, []);
+  const { set, add, remove } = useSet((s) => {
+    if (s.size >= 5) {
+      message.error("最多选择5项");
+      return false;
+    }
+    return true;
+  });
+  const [selectedCate, selectCate] = useState(null);
+  const onOk = useCallback(() => {
+    props.onCancel();
+    setValue(Array.from(set.values()));
+  }, []);
+  useEffect(() => {
+    if (Array.isArray(initArr)) {
+      initArr.forEach((i) => add(i));
+    }
+  }, []);
+  const content = !isLoaded ? (
+    <Loading />
+  ) : (
+    <React.Fragment>
+      <Row style={{ height: "572px" }}>
+        <Col span={6} style={{ height: "100%" }}>
+          <Nav
+            data={data}
+            selectCate={selectCate}
+            selectedCate={selectedCate}
+          ></Nav>
+        </Col>
+        <Col span={18} style={{ height: "100%" }}>
+          <div style={{ height: "490px" }}>
+            <SonNav
+              data={selectedCate ? data.get(selectedCate) : new Set()}
+              select={add}
+            ></SonNav>
+          </div>
+          <CenterBtnGrp>
+            <CancelBtn onClick={props.onCancel} />
+            <OkBtn onClick={onOk} />
+          </CenterBtnGrp>
+        </Col>
+      </Row>
+    </React.Fragment>
+  );
+  return (
+    <Modal
+      width="850px"
+      title={<Tiltle selected={set} remove={remove} />}
+      {...props} getContainer={false}
+    >
+      {content}
+    </Modal>
+  );
+};
diff --git a/src/modules/recruitment/resumeForm/popup/Modal.js b/src/modules/recruitment/resumeForm/popup/Modal.js
new file mode 100644
index 00000000..da5972e2
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/popup/Modal.js
@@ -0,0 +1,15 @@
+import React from "react";
+import { Modal } from 'antd';
+import styled from 'styled-components';
+
+const Box = styled.div`
+    width:clac(100%+80px);
+    margin:-24px -24px;
+`;
+
+//visible,title,onCancel,width
+export default ({ children, ...props }) => {
+    return <Modal footer={null} centered title={null} closable={false} {...props} maskClosable={false} keyboard={false}>
+        <Box>{children}</Box>
+    </Modal>;
+};
diff --git a/src/modules/recruitment/resumeForm/popup/city/CityList.js b/src/modules/recruitment/resumeForm/popup/city/CityList.js
new file mode 100644
index 00000000..c0ba7303
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/popup/city/CityList.js
@@ -0,0 +1,49 @@
+import styled from "styled-components";
+import React from "react";
+import { Row } from "antd";
+
+const Button = styled.div`
+  width: 100px;
+  height: 46px;
+  background: rgba(255, 255, 255, 1);
+  border-radius: 2px;
+  border: 1px solid rgba(221, 221, 221, 1);
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: rgba(51, 51, 51, 1);
+  margin-left: 30px;
+  margin-top: 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  &:hover {
+    cursor: pointer;
+  }
+`;
+const Title = styled.div`
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  color: rgba(51, 51, 51, 1);
+  margin:15px 30px;
+  margin-bottom:5px;
+`;
+
+export default ({ select, data }) => {
+  return (
+    <React.Fragment>
+      <Title>热门城市：</Title>
+      <Row type="flex" style={{marginBottom:"40px"}}>
+        {data.map((city) => (
+          <Button
+            key={city}
+            onClick={() => {
+              select(city, false);
+            }}
+          >
+            <div>{city}</div>
+          </Button>
+        ))}
+      </Row>
+    </React.Fragment>
+  );
+};
diff --git a/src/modules/recruitment/resumeForm/popup/city/SelectedCity.js b/src/modules/recruitment/resumeForm/popup/city/SelectedCity.js
new file mode 100644
index 00000000..c12d802b
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/popup/city/SelectedCity.js
@@ -0,0 +1,47 @@
+import styled from "styled-components";
+import React, { useCallback } from "react";
+import { Tag, Tooltip, Icon } from "antd";
+
+const Title = styled.div`
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  color: rgba(51, 51, 51, 1);
+  margin: 15px 30px;
+  margin-top:30px;
+`;
+const Tip = styled.span`
+  font-size: 12px;
+  
+`;
+const tagConfig = {
+  color: "blue",
+  closable: true,
+  style:{border:"0"},
+};
+
+export default ({ selected, remove }) => {
+  return (
+    <React.Fragment>
+      <Title>选择期望工作城市:</Title>
+      <div style={{ marginLeft: "30px" }}>
+        {Array.from(selected.entries()).map(([key, isCurrCity]) => {
+          if (isCurrCity) {
+            return (
+              <Tag {...tagConfig} key={key} onClose={() => remove(key)}>
+                <Icon type="home" color="blue" />
+                {key}
+                <Tip>(当前定位城市)</Tip>
+              </Tag>
+            );
+          } else {
+            return (
+              <Tag {...tagConfig} key={key} onClose={() => remove(key)}>
+                {key}
+              </Tag>
+            );
+          }
+        })}
+      </div>
+    </React.Fragment>
+  );
+};
diff --git a/src/modules/recruitment/resumeForm/popup/jobClass/FatherItem.js b/src/modules/recruitment/resumeForm/popup/jobClass/FatherItem.js
new file mode 100644
index 00000000..dcb47cc9
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/popup/jobClass/FatherItem.js
@@ -0,0 +1,32 @@
+import styled from 'styled-components';
+import React from 'react';
+import { Icon as AdIcon } from "antd";
+
+const Item = styled.div`
+    height:57px;
+    background:${p => p.isSelected ? "rgba(241,241,241,1)" : "transparent"};
+    &:hover{
+        cursor:pointer;
+    }
+    display:flex;
+    justify-content:space-between;
+    align-items:center;
+`;
+const Name = styled.div`
+    color:rgba(51,51,51,1);
+    font-size:16px;
+    font-family:MicrosoftYaHei;
+    margin-left:30px;
+`;
+const Icon = styled(AdIcon)`
+    display:block;
+    color:rgba(187,187,187,1);
+    margin-right:20px;
+`;
+
+//onClick, isSelected
+export default ({ children, ...props }) =>
+    <Item {...props}>
+        <Name>{children}</Name>
+        <Icon type="right" />
+    </Item>;
\ No newline at end of file
diff --git a/src/modules/recruitment/resumeForm/popup/jobClass/FatherNav.js b/src/modules/recruitment/resumeForm/popup/jobClass/FatherNav.js
new file mode 100644
index 00000000..5d492d9f
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/popup/jobClass/FatherNav.js
@@ -0,0 +1,14 @@
+import styled from 'styled-components';
+import React from 'react';
+import Item from './FatherItem';
+
+const Column = styled.div`
+    background:rgba(250,250,250,1);
+    height:100%;
+    overflow:auto;
+`;
+
+export default ({ data, selectCate, selectedCate }) => //data is a map
+    <Column>
+        {Array.from(data.keys()).map(i => <Item onClick={() => { selectCate(i); }} isSelected={selectedCate === i}>{i}</Item>)}
+    </Column>;
\ No newline at end of file
diff --git a/src/modules/recruitment/resumeForm/popup/jobClass/SonArea.js b/src/modules/recruitment/resumeForm/popup/jobClass/SonArea.js
new file mode 100644
index 00000000..0ad4f99f
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/popup/jobClass/SonArea.js
@@ -0,0 +1,13 @@
+import { Row } from "antd";
+import React from "react";
+import { JobBtn } from "../../../util/GeneralButton";
+
+export default ({ data, select }) => (
+  <Row type="flex">
+    {Array.from(data.values()).map((v) => (
+      <JobBtn key={v} onClick={() => select(v)}>
+        {v}
+      </JobBtn>
+    ))}
+  </Row>
+);
diff --git a/src/modules/recruitment/resumeForm/popup/jobClass/Tiltle.js b/src/modules/recruitment/resumeForm/popup/jobClass/Tiltle.js
new file mode 100644
index 00000000..cff7ffca
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/popup/jobClass/Tiltle.js
@@ -0,0 +1,41 @@
+import styled from "styled-components";
+import React from "react";
+import { Tag, Tooltip } from "antd";
+
+const Header = styled.div`
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+`;
+
+const Title = styled.div`
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  color: rgba(51, 51, 51, 1);
+`;
+const tagConfig = {
+  color: "blue",
+  closable: true,
+  style:{border:"0"},
+};
+export default ({ selected, remove }) => {
+  const tag = (key) => (
+    <Tag {...tagConfig} key={key} onClose={() => remove(key)}>
+      {key.length >= 4 ? `${key.substring(0, 4)}...` : key}
+    </Tag>
+  );
+  const wrapper = (key) => {
+    if (key.length >= 4) {
+      return <Tooltip title={key} key={key}>{tag(key)}</Tooltip>;
+    } else {
+      return tag(key);
+    }
+  };
+  return (
+    <Header>
+      <Title>选择职位类别</Title>
+      <div>{Array.from(selected.keys()).map((key) => wrapper(key))}</div>
+    </Header>
+  );
+};
diff --git a/src/modules/recruitment/resumeForm/widget/Button.js b/src/modules/recruitment/resumeForm/widget/Button.js
new file mode 100644
index 00000000..89c36481
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/widget/Button.js
@@ -0,0 +1,37 @@
+import styled from "styled-components";
+
+export const AddButton = styled.div`
+    display:flex;
+    justify-content:center;
+    align-items:center;
+    width:169px;
+    height:40px;
+    background:rgba(236,246,255,1);
+    border-radius:20px;
+    border:1px solid rgba(76,172,255,1);
+    font-size:14px;
+    font-family:MicrosoftYaHeiSemibold;
+    color:rgba(76,172,255,1);
+    margin-bottom:20px;
+    &:hover{
+        cursor:pointer;
+    }
+`;
+
+export const UploadButton = styled.div`
+    display:flex;
+    justify-content:center;
+    align-items:center;
+    width:87px;
+    height:40px;
+    background:rgba(236,246,255,1);
+    border-radius:2px;
+    border:1px solid rgba(76,172,255,1);
+    font-size:14px;
+    font-family:MicrosoftYaHeiSemibold;
+    color:rgba(76,172,255,1);
+    margin-right:20px;
+    &:hover{
+        cursor:pointer;
+    }
+`;
diff --git a/src/modules/recruitment/resumeForm/widget/EduItem.js b/src/modules/recruitment/resumeForm/widget/EduItem.js
new file mode 100644
index 00000000..e028bbb5
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/widget/EduItem.js
@@ -0,0 +1,101 @@
+import React, { useContext, useCallback } from "react";
+import { FormCtx } from "../Form";
+import { Row, Col, Form, Select, Input, Icon } from "antd";
+import MonthPicker from "./MothPicker";
+
+const edu_bg = ["本科", "硕士", "博士", "大专", "其他"];
+const edu_category = ["统招全日制", "统招非全日制", "自考", "其他"];
+
+export default ({ nameKey, onDelete }) => {
+  const { getFieldDecorator, getFieldValue } = useContext(FormCtx);
+  const greatValidater = useCallback((r, v, cb) => {
+    if (v >= getFieldValue(`education[${nameKey}].begin_on`)) {
+      cb();
+    } else {
+      cb("时间范围不正确");
+    }
+  }, []);
+  return (
+    <div>
+      <Row>
+        <Col span={7}>
+          <Form.Item>
+            {getFieldDecorator(`education[${nameKey}].begin_on`, {
+              rules: [{ required: true, message: "请选择开始日期" }],
+            })(<MonthPicker placeholder="请选择开始日期" />)}
+          </Form.Item>
+        </Col>
+        <Col span={7}>
+          <Form.Item>
+            {getFieldDecorator(`education[${nameKey}].end_on`, {
+              rules: [
+                { required: true, message: "请选择结束日期" },
+                { validator: greatValidater },
+              ],
+              validateFirst: true,
+            })(<MonthPicker placeholder="请选择结束日期" />)}
+          </Form.Item>
+        </Col>
+        <Col>
+          {onDelete ? (
+            <Icon
+              type="close-circle"
+              onClick={onDelete}
+              style={{ color: "red", marginTop: "15px" }}
+            />
+          ) : null}
+        </Col>
+      </Row>
+      <Row>
+        <Col span={6}>
+          <Form.Item>
+            {getFieldDecorator(`education[${nameKey}].edu_bg`, {
+              rules: [{ required: true, message: "请选择学历" }],
+            })(
+              <Select placeholder="请选择学历">
+                {edu_bg.map((i) => (
+                  <Select.Option value={i}>{i}</Select.Option>
+                ))}
+              </Select>
+            )}
+          </Form.Item>
+        </Col>
+        <Col span={6} push={1}>
+          <Form.Item>
+            {getFieldDecorator(`education[${nameKey}].edu_category`, {
+              rules: [{ required: true, message: "请选择学历类型" }],
+            })(
+              <Select placeholder="请选择学历类型">
+                {edu_category.map((i) => (
+                  <Select.Option value={i}>{i}</Select.Option>
+                ))}
+              </Select>
+            )}
+          </Form.Item>
+        </Col>
+        <Col span={6} push={2}>
+          <Form.Item>
+            {getFieldDecorator(`education[${nameKey}].major`, {
+              rules: [
+                { required: true, message: "请输入专业" },
+                { max: 60, message: "超过60字符" },
+                { whitespace: true, message: "不能全空" },
+              ],
+              validateFirst: true,
+            })(<Input placeholder="请输入专业" />)}
+          </Form.Item>
+        </Col>
+      </Row>
+      <Form.Item>
+        {getFieldDecorator(`education[${nameKey}].school`, {
+          rules: [
+            { required: true, message: "请输入学校名称" },
+            { max: 60, message: "超过60字符" },
+            { whitespace: true, message: "不能全空" },
+          ],
+          validateFirst: true,
+        })(<Input placeholder="请输入学校名称" />)}
+      </Form.Item>
+    </div>
+  );
+};
diff --git a/src/modules/recruitment/resumeForm/widget/ImageUploader.js b/src/modules/recruitment/resumeForm/widget/ImageUploader.js
new file mode 100644
index 00000000..eb0e6557
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/widget/ImageUploader.js
@@ -0,0 +1,73 @@
+import React, { useState, useRef, useCallback } from "react";
+import { getUploadLogoActionUrl, getUrl } from "educoder";
+import { Upload, Icon, message } from "antd";
+import axios from 'axios';
+
+export default ({ logo_url, onChange }) => {
+  const base64Ref = useRef(null);
+  const getBase64 = useCallback((file) => {
+    return new Promise((resolve) => {
+      const reader = new FileReader();
+      reader.addEventListener("load", () => {
+        base64Ref.current = reader.result;
+        resolve(reader.result);
+      });
+      reader.readAsDataURL(file);
+    });
+  }, []);
+  const [isLoading, setLoading] = useState(() => {
+    if (logo_url) {
+      return true;
+    }
+    return false;
+  });
+  const [imageUrl, setUrl] = useState(() => {
+    if (logo_url) {
+      return getUrl("/"+logo_url);
+    }
+    return undefined;
+  });
+  const handleChange = useCallback(({ file }) => {
+    if (file.status === "uploading") {
+      setLoading(true);
+      return;
+    }else if (file.status === "done") {
+      onChange("t");
+      setLoading(false);
+      setUrl(base64Ref.current);
+    }else if (file.size > 2 ** 20 * 2) {
+      setLoading(false);
+      setUrl("");
+    }
+  }, []);
+  const verifyFile = useCallback((f) => {
+    if(imageUrl){
+      axios.post('/resumes/destroy_logo.json');
+    }
+    const isProperSize = f.size / 1024 / 1024 < 2; //2MB
+    if (!isProperSize) {
+      message.error("照片超过2MB");
+    }
+    return isProperSize;
+  },[imageUrl]);
+  return (
+    <React.Fragment>
+      <Upload
+        accept=".jpg,.jpeg"
+        listType="picture-card"
+        showUploadList={false}
+        name="image"
+        action={getUploadLogoActionUrl()}
+        beforeUpload={verifyFile}
+        transformFile={getBase64}
+        onChange={handleChange}
+      >
+        {imageUrl ? (
+          <img src={imageUrl} alt="avatar" style={{ width: "100%" }} />
+        ) : (
+          <Icon type={isLoading ? "loading" : "plus"} />
+        )}
+      </Upload>
+    </React.Fragment>
+  );
+};
diff --git a/src/modules/recruitment/resumeForm/widget/JobExpect.js b/src/modules/recruitment/resumeForm/widget/JobExpect.js
new file mode 100644
index 00000000..6581db0c
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/widget/JobExpect.js
@@ -0,0 +1,138 @@
+import React, { forwardRef, useContext } from "react";
+import { Row,  Icon, Form, Select, Checkbox } from "antd";
+import styled from "styled-components";
+import { useToggle } from "../../util/hooks";
+import JobPopup from "../popup/JobPopup";
+import CityPopup from "../popup/CityPopup";
+import { FormCtx } from "../Form";
+
+const Input = styled.div`
+  border-radius: 4px;
+  border: 1px solid rgba(221, 221, 221, 1);
+  width: 534px;
+  height: 33px;
+  padding-left: 10px;
+  padding-right: 10px;
+  margin-bottom: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  &:hover {
+    cursor: pointer;
+    border: 1px solid #40a9ff;
+  }
+  & .has-error {
+    border: 1px solid #f5222d;
+  }
+`;
+
+const Value = styled.div`
+  font-size: 14px;
+  color: rgba(51, 51, 51, 1);
+  font-family: MicrosoftYaHei;
+`;
+const Placeholder = styled(Value)`
+  color: rgba(187, 187, 187, 1);
+`;
+const Content = ({ placeholder, value, onClick }) => (
+  <Row
+    type="flex"
+    justify="space-between"
+    align="middle"
+    onClick={onClick}
+    style={{ width: "100%" }}
+  >
+    {!value ? <Placeholder>{placeholder}</Placeholder> : <Value>{value}</Value>}
+    <Icon type="down" style={{ color: "#979797" }} />
+  </Row>
+);
+
+const ExpJob = forwardRef(({ onChange, value }, ref) => {
+  const [jobVis, setJobVis] = useToggle();
+  return (
+    <React.Fragment>
+      <JobPopup setValue={onChange} visible={jobVis} onCancel={setJobVis} initArr={value}/>
+      <Input ref={ref} onClick={setJobVis}>
+        <Content
+          placeholder="请选择期望职位"
+          value={value && value.join(" ")}
+        />
+      </Input>
+    </React.Fragment>
+  );
+});
+const ExpCity = forwardRef(({ onChange, value }, ref) => {
+  const [cityVis, setCityVis] = useToggle();
+  return (
+    <React.Fragment>
+      <CityPopup setValue={onChange} visible={cityVis} onCancel={setCityVis} />
+      <Input ref={ref} onClick={setCityVis}>
+        <Content
+          placeholder="请选择期望工作城市"
+          value={value && value.join(" ")}
+        />
+      </Input>
+    </React.Fragment>
+  );
+});
+
+const salary = [
+  "1000元/月以下",
+  "1000—2000元/月",
+  "2001—4000元/月",
+  "4001—6000元/月",
+  "6001—8000元/月",
+  "8001—10000元/月",
+  "10001—15000元/月",
+  "15001—25000元/月",
+  "25001—35000元/月",
+  "35001—50000元/月",
+  "50001—70000元/月",
+  "70001—100000元/月",
+  "100000元/月以上",
+];
+const job_category = ["全职", "兼职", "实习"];
+
+export default () => {
+  const { getFieldDecorator } = useContext(FormCtx);
+  return (
+    <div>
+      <Form.Item>
+        {getFieldDecorator("job_position", {
+          rules: [{ required: true, message: "请选择期望职位" }],
+        })(<ExpJob />)}
+      </Form.Item>
+      <Form.Item>
+        {getFieldDecorator("city", {
+          rules: [{ required: true, message: "请选择期望工作城市" }],
+        })(<ExpCity />)}
+      </Form.Item>
+      <Form.Item>
+        {getFieldDecorator("salary", {
+          rules: [{ required: true, message: "请选择期望薪资" }],
+        })(
+          <Select placeholder="请选择期望薪资" style={{ width: "534px" }}>
+            {salary.map((s) => (
+              <Select.Option key={s} value={s}>
+                {s}
+              </Select.Option>
+            ))}
+          </Select>
+        )}
+      </Form.Item>
+      <Form.Item>
+        {getFieldDecorator("job_category", {
+          rules: [{ required: true, message: "请选择求职类型" }],
+        })(
+          <Checkbox.Group>
+            {job_category.map((j) => (
+              <Checkbox value={j} key={j}>
+                {j}
+              </Checkbox>
+            ))}
+          </Checkbox.Group>
+        )}
+      </Form.Item>
+    </div>
+  );
+};
diff --git a/src/modules/recruitment/resumeForm/widget/MothPicker.js b/src/modules/recruitment/resumeForm/widget/MothPicker.js
new file mode 100644
index 00000000..d87144e4
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/widget/MothPicker.js
@@ -0,0 +1,16 @@
+import React from "react";
+import { DatePicker } from "antd";
+import styled from "styled-components";
+
+const Box = styled.div`
+  position: relative;
+  z-index: 1;
+`;
+
+export default ({ ...props }) => {
+  return (
+    <Box>
+      <DatePicker.MonthPicker {...props} />
+    </Box>
+  );
+};
diff --git a/src/modules/recruitment/resumeForm/widget/ResumesUploader.js b/src/modules/recruitment/resumeForm/widget/ResumesUploader.js
new file mode 100644
index 00000000..44124a6a
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/widget/ResumesUploader.js
@@ -0,0 +1,82 @@
+import React, { useCallback, useState } from "react";
+import { Upload, Row, message } from "antd";
+import styled from "styled-components";
+import { UploadButton } from "./Button";
+import { getUploadActionUrl } from "educoder";
+
+const Info = styled.div`
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: rgba(231, 114, 52, 1);
+  margin-top: 10px;
+`;
+
+const verifyFile = (f, fLst) => {
+  if (fLst.length === 1 && fLst[0].status === "uploading") {
+    message.error("请等待上传完成");
+    return false;
+  }
+  const isProperSize = f.size / (2 ** 20 * 10);
+  if (!isProperSize) {
+    message.error("简历超过10MB");
+    return false;
+  }
+  return true;
+};
+export default ({
+  attachment_name,
+  attachment_url,
+  attachment_id,
+  onChange,
+}) => {
+  const [fileLst, setFlieLst] = useState(() => {
+    if (attachment_name) {
+      return [
+        {
+          uid: "-1",
+          status: "done",
+          name: attachment_name,
+          url: attachment_url,
+        },
+      ];
+    }
+    return [];
+  });
+  const handleChange = useCallback(async ({ file }) => {
+    if (file.status === "removed") {
+      setFlieLst([]);
+      const id = file.response ? file.response.id : attachment_id;
+      //axios.delete(`/attachments/${id}.json`);
+      onChange("");
+    } else if (file.size > 2 ** 20 * 10) {
+      setFlieLst([]);
+    } else {
+      setFlieLst([file]);
+      if (file.status === "done") {
+        onChange(file.response.id);
+      }
+    }
+  }, []);
+  return (
+    <React.Fragment>
+      <Row type="flex">
+        <Upload
+          accept=".pdf,.doc,.docx,.ppt,.pptx,.png,.jpg,.jpeg"
+          action={getUploadActionUrl()}
+          beforeUpload={verifyFile}
+          onChange={handleChange}
+          fileList={fileLst}
+        >
+          <Row type="flex">
+            <UploadButton>
+              {fileLst.length === 1 ? "重新上传" : "上传"}
+            </UploadButton>
+            <Info>
+              提示：不超过10MB，扩展名为pdf、doc、docx、ppt、pptx、png、jpg、jpeg
+            </Info>
+          </Row>
+        </Upload>
+      </Row>
+    </React.Fragment>
+  );
+};
diff --git a/src/modules/recruitment/resumeForm/widget/WorkItem.js b/src/modules/recruitment/resumeForm/widget/WorkItem.js
new file mode 100644
index 00000000..541b0ad6
--- /dev/null
+++ b/src/modules/recruitment/resumeForm/widget/WorkItem.js
@@ -0,0 +1,72 @@
+import React, { useContext, useCallback } from "react";
+import { FormCtx } from "../Form";
+import { Row, Col, Form, Input, Icon } from "antd";
+import MonthPicker from "./MothPicker";
+
+export default ({ nameKey, onDelete }) => {
+  const { getFieldDecorator, getFieldValue } = useContext(FormCtx);
+  const greatValidater = useCallback((r, v, cb) => {
+    if (v >= getFieldValue(`experience[${nameKey}].begin_on`)) {
+      cb();
+    } else {
+      cb("时间范围不正确");
+    }
+  }, []);
+  return (
+    <div>
+      <Row>
+        <Col span={7}>
+          <Form.Item>
+            {getFieldDecorator(`experience[${nameKey}].begin_on`, {
+              rules: [{ required: true, message: "请选择开始日期" }],
+            })(<MonthPicker placeholder="请选择开始日期" />)}
+          </Form.Item>
+        </Col>
+        <Col span={7}>
+          <Form.Item>
+            {getFieldDecorator(`experience[${nameKey}].end_on`, {
+              rules: [
+                { required: true, message: "请选择结束日期" },
+                { validator: greatValidater },
+              ],
+              validateFirst: true,
+            })(<MonthPicker placeholder="请选择结束日期" />)}
+          </Form.Item>
+        </Col>
+        <Col>
+          {onDelete ? (
+            <Icon
+              type="close-circle"
+              onClick={onDelete}
+              style={{ color: "red", marginTop: "15px" }}
+            />
+          ) : null}
+        </Col>
+      </Row>
+      <Form.Item>
+        {getFieldDecorator(`experience[${nameKey}].company`, {
+          rules: [
+            { max: 60, message: "超过60字符" },
+            { required: true, message: "请输入公司名称" },
+            { whitespace: true, message: "不能全空" },
+          ],
+          validateFirst: true,
+        })(<Input placeholder="请输入公司名称" />)}
+      </Form.Item>
+      <Form.Item>
+        {getFieldDecorator(`experience[${nameKey}].desc`, {
+          rules: [
+            { max: 5000, message: "超过5000字符" },
+            { required: true, message: "请输入工作描述" },
+          ],
+          validateFirst: true,
+        })(
+          <Input.TextArea
+            placeholder="请输入工作描述"
+            autoSize={{ minRows: 4, maxRows: 4 }}
+          />
+        )}
+      </Form.Item>
+    </div>
+  );
+};
diff --git a/src/modules/recruitment/routePage/AddJobPage.js b/src/modules/recruitment/routePage/AddJobPage.js
new file mode 100644
index 00000000..84209889
--- /dev/null
+++ b/src/modules/recruitment/routePage/AddJobPage.js
@@ -0,0 +1,52 @@
+import React, { useCallback } from "react";
+import FormPage from "../jobForm/FormPage";
+import { submitJobInfo } from "../data/submitData";
+import { useLoaded } from "../util/hooks";
+import { getProfileLoc } from "../data/getProfileLoc";
+import Loading from "../util/Loading";
+import styled from "styled-components";
+import { FullScreen } from "../util/Layout";
+import { notification } from "antd";
+
+const Backgroud = styled(FullScreen)`
+  background: rgba(245, 246, 249, 1);
+`;
+
+export default ({ history, user }) => {
+  console.log(user);
+  const { isLoaded, data: city } = useLoaded(getProfileLoc, [user]);
+  const submit = useCallback((v) => {
+    const f = async () => {
+      await submitJobInfo(v);
+      notification.open({
+        message: "成功",
+        description: "提交职位成功，请耐心等待审核",
+      });
+      const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+      await wait(1000);
+      history.push("/recruitment?tab=1&jobstate=drafted");
+    };
+    f();
+  }, []);
+  const data = {
+    education: "学历不限",
+    work_year: "经验不限",
+    city,
+  };
+  if (!isLoaded) {
+    return (
+      <Backgroud>
+        <Loading />
+      </Backgroud>
+    );
+  }
+  return (
+    <FormPage
+      submit={submit}
+      data={data}
+      back={() => {
+        history.goBack();
+      }}
+    ></FormPage>
+  );
+};
diff --git a/src/modules/recruitment/routePage/AddResumePage.js b/src/modules/recruitment/routePage/AddResumePage.js
new file mode 100644
index 00000000..58c2b9e0
--- /dev/null
+++ b/src/modules/recruitment/routePage/AddResumePage.js
@@ -0,0 +1,63 @@
+import React, { useRef, useCallback } from "react";
+import styled from "styled-components";
+import Form from "../resumeForm/NormalForm";
+import { CenterBtnGrp, SaveBtn, CancelBtn } from "../util/GeneralButton";
+import { sumitResume } from "../data/sumitResume";
+import Nav from "../util/Nav";
+
+const Background = styled.div`
+  width: 100%;
+  background: rgba(245, 246, 249, 1);
+  min-height: 100vh;
+  padding: 20px;
+  padding-bottom: 70px;
+`;
+const Content = styled.div`
+  width: 1200px;
+  padding: 40px;
+  background: rgba(255, 255, 255, 1);
+  border-radius: 2px;
+  margin: 0 auto;
+  margin-bottom: 40px;
+`;
+const Margin = styled.div`
+  height: 80px;
+`;
+
+export default ({ history }) => {
+  console.log(history[0]);
+  const validator = useRef(null);
+  const submit = useCallback((v) => {
+    const f = async () => {
+      await sumitResume(v);
+      history.goBack();
+    };
+    f();
+  }, []);
+  const onOk = useCallback(() => {
+    validator.current.verify((e, v) => {
+      if (e) {
+        return;
+      }
+      submit(v);
+    });
+  }, []);
+  return (
+    <React.Fragment>
+      <Background>
+        <Content>
+          <Form wrappedComponentRef={validator}></Form>
+        </Content>
+        <CenterBtnGrp>
+          <CancelBtn
+            onClick={() => {
+              history.push("/recruitment");
+            }}
+          />
+          <SaveBtn onClick={onOk} />
+        </CenterBtnGrp>
+        <Margin />
+      </Background>
+    </React.Fragment>
+  );
+};
diff --git a/src/modules/recruitment/routePage/ApplierPage.js b/src/modules/recruitment/routePage/ApplierPage.js
new file mode 100644
index 00000000..99d18805
--- /dev/null
+++ b/src/modules/recruitment/routePage/ApplierPage.js
@@ -0,0 +1,63 @@
+import React, { useState, useCallback } from "react";
+import styled from "styled-components";
+import { Pagination } from "antd";
+import Header from "../jobAppliers/Header";
+import List from "../jobAppliers/List";
+import Loading from "../util/Loading";
+import { getAppliers } from "../data/getAppliers";
+import Nav from "../util/Nav";
+import { useLoaded } from "../util/hooks";
+import { Link } from "react-router-dom";
+
+const GreyBg = styled.div`
+  width: 100%;
+  background: rgba(245, 246, 249, 1);
+  min-height: 100vh;
+`;
+const Paper = styled.div`
+  width: 1200px;
+  padding: 30px;
+  background: rgba(255, 255, 255, 1);
+  border-radius: 2px;
+  margin: 0 auto;
+  min-height:500px;
+`;
+
+export default ({ jobId, history }) => {
+  console.log("render");
+  const [page, setPage] = useState(1);
+  const { isLoaded, data } = useLoaded(getAppliers, [jobId, page, history]);
+  const back = useCallback(() => {
+    history.push("/recruitment?tab=1&jobstate=published");
+  }, []);
+  let appliers, count;
+  if (data) {
+    [appliers, count] = data;
+  }
+  return (
+    <React.Fragment>
+      <GreyBg>
+        <Nav breadcrunmb={[<Link to="/recruitment">职位管理</Link>, "投递详情"]} back={back} />
+        <Paper>
+          <Header></Header>
+          {!isLoaded ? (
+            <div style={{ height: "300px" }}>
+              <Loading />
+            </div>
+          ) : (
+              <List data={appliers}></List>
+            )}
+        </Paper>
+        {!isLoaded ? null : (count <= 10 ? null : <Pagination
+          current={page}
+          pageSize={10}
+          onChange={setPage}
+          total={count}
+          style={{ textAlign: "center", margin: "20px auto" }}
+        />)
+        }
+
+      </GreyBg>
+    </React.Fragment>
+  );
+};
diff --git a/src/modules/recruitment/routePage/DetailAddResumePage.js b/src/modules/recruitment/routePage/DetailAddResumePage.js
new file mode 100644
index 00000000..680be65e
--- /dev/null
+++ b/src/modules/recruitment/routePage/DetailAddResumePage.js
@@ -0,0 +1,74 @@
+import React, { useRef, useCallback } from "react";
+import styled from "styled-components";
+import Form from "../resumeForm/NormalForm";
+import CompanyHeader from "../resumeForm/CompanyHeader";
+import { CenterBtnGrp, SaveBtn, CancelBtn } from "../util/GeneralButton";
+import { sumitResume } from "../data/sumitResume";
+import { useLoaded } from "../util/hooks";
+import { getJobInfo } from "../data/getJobInfo";
+import Nav from "../util/Nav";
+
+const Background = styled.div`
+  width: 100%;
+  background: rgba(245, 246, 249, 1);
+  min-height: 100vh;
+  padding: 20px;
+  padding-bottom: 70px;
+`;
+const Content = styled.div`
+  width: 1200px;
+  padding: 40px;
+  background: rgba(255, 255, 255, 1);
+  border-radius: 2px;
+  margin: 0 auto;
+  margin-bottom: 40px;
+`;
+const Margin = styled.div`
+  height: 80px;
+`;
+
+export default ({ history, jobId }) => {
+  const { isLoaded, data } = useLoaded(getJobInfo, [jobId]);
+  const validator = useRef(null);
+  const submit = useCallback((v) => {
+    const f = async () => {
+      await sumitResume(v);
+      history.goBack();
+    };
+    f();
+  }, []);
+  const onOk = useCallback(() => {
+    validator.current.verify((e, v) => {
+      if (e) {
+        return;
+      }
+      submit(v);
+    });
+  }, []);
+  const header = isLoaded ? (
+    <CompanyHeader
+      jobName={data.name}
+      company={data.company}
+      city={data.city}
+    />
+  ) : null;
+  return (
+    <React.Fragment>
+      <Background>
+        {header}
+        <Content>
+          <Form wrappedComponentRef={validator}></Form>
+        </Content>
+        <CenterBtnGrp>
+          <CancelBtn
+            onClick={() => {
+              history.goBack();
+            }}
+          />
+          <SaveBtn onClick={onOk} />
+        </CenterBtnGrp>
+        <Margin />
+      </Background>
+    </React.Fragment>
+  );
+};
diff --git a/src/modules/recruitment/routePage/EditJobPage.js b/src/modules/recruitment/routePage/EditJobPage.js
new file mode 100644
index 00000000..af1cc03e
--- /dev/null
+++ b/src/modules/recruitment/routePage/EditJobPage.js
@@ -0,0 +1,48 @@
+import React, { useCallback } from "react";
+import styled from "styled-components";
+import FormPage from "../jobForm/FormPage";
+import Loading from "../util/Loading";
+import { FullScreen } from "../util/Layout";
+import { updateJobInfo } from "../data/submitData";
+import { getJobPlain } from "../data/getJobInfo";
+import { useLoaded } from "../util/hooks";
+import { notification } from "antd";
+
+const Backgroud = styled(FullScreen)`
+  background: rgba(245, 246, 249, 1);
+`;
+
+export default ({ jobId, history }) => {
+  const submit = useCallback((v) => {
+    const f = async () => {
+      const changed = (await updateJobInfo(jobId, v)).changed;
+      if (changed) {
+        notification.open({
+          message: "成功",
+          description: "编辑职位成功，请耐心等待审核",
+        });
+        const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+        await wait(1000);
+      }
+      history.push("/recruitment?tab=1&jobstate=drafted");
+    };
+    f();
+  }, []);
+  const { isLoaded, data } = useLoaded(getJobPlain, [jobId]);
+  if (!isLoaded) {
+    return (
+      <Backgroud>
+        <Loading />
+      </Backgroud>
+    );
+  }
+  return (
+    <FormPage
+      submit={submit}
+      data={data}
+      back={() => {
+        history.push("/recruitment?tab=1&jobstate=drafted");
+      }}
+    ></FormPage>
+  );
+};
diff --git a/src/modules/recruitment/routePage/EditResumePage.js b/src/modules/recruitment/routePage/EditResumePage.js
new file mode 100644
index 00000000..c26b2682
--- /dev/null
+++ b/src/modules/recruitment/routePage/EditResumePage.js
@@ -0,0 +1,82 @@
+import React, { useCallback, useRef, useEffect } from "react";
+import styled from "styled-components";
+import Loading from "../util/Loading";
+import { FullScreen } from "../util/Layout";
+import Form from "../resumeForm/NormalForm";
+import { CenterBtnGrp, SaveBtn, CancelBtn } from "../util/GeneralButton";
+import { useLoaded } from "../util/hooks";
+import { updateResume } from "../data/updateResume";
+import { getResume } from "../data/getResume";
+import Nav from "../util/Nav";
+
+const Backgroud = styled(FullScreen)`
+  background: rgba(245, 246, 249, 1);
+`;
+
+const Background = styled.div`
+  width: 100%;
+  background: rgba(245, 246, 249, 1);
+  min-height: 100vh;
+  padding: 20px;
+  padding-bottom: 70px;
+`;
+const Content = styled.div`
+  width: 1200px;
+  padding: 40px;
+  background: rgba(255, 255, 255, 1);
+  border-radius: 2px;
+  margin: 0 auto;
+  margin-bottom: 40px;
+`;
+const Margin = styled.div`
+  height: 80px;
+`;
+
+export default ({ history }) => {
+  const submit = useCallback((v) => {
+    const f = async () => {
+      await updateResume(v);
+      history.goBack();
+    };
+    f();
+  }, []);
+  const ref = useRef(null);
+  const onOk = useCallback(() => {
+    ref.current.verify((e, v) => {
+      if (e) {
+        return;
+      }
+      submit(v);
+    });
+  }, []);
+  const { isLoaded, data } = useLoaded(getResume, []);
+  useEffect(() => {
+    if (ref.current) {
+      ref.current.set(data.education, data.experience);
+    }
+  }, [data]);
+
+  if (!isLoaded) {
+    return (
+      <Backgroud>
+        <Loading />
+      </Backgroud>
+    );
+  }
+  return (
+    <Background>
+      <Content>
+        <Form wrappedComponentRef={ref} {...data}></Form>
+      </Content>
+      <CenterBtnGrp>
+        <CancelBtn
+          onClick={() => {
+            history.push("/recruitment/resumedetails");
+          }}
+        />
+        <SaveBtn onClick={onOk} />
+      </CenterBtnGrp>
+      <Margin />
+    </Background>
+  );
+};
diff --git a/src/modules/recruitment/routePage/JobDetailPage.js b/src/modules/recruitment/routePage/JobDetailPage.js
new file mode 100644
index 00000000..58b43f8f
--- /dev/null
+++ b/src/modules/recruitment/routePage/JobDetailPage.js
@@ -0,0 +1,107 @@
+import React, { useCallback } from "react";
+import styled from "styled-components";
+import Header from "../jobDetail/Header";
+import JobInfo from "../jobDetail/JobInfo";
+import Address from "../jobDetail/Address";
+import Comp from "../jobDetail/Comp";
+import Loading from "../util/Loading";
+import Nav from "../util/Nav";
+import { FullScreen } from "../util/Layout";
+import { applyProfile } from "../data/submitData";
+import { getJobInfo } from "../data/getJobInfo";
+import { ifHaveResume } from "../data/ifHaveResume";
+import { notification } from "antd";
+import { useLoaded, useToggle } from "../util/hooks";
+import ConfirmModal from "../jobDetail/ConfirmModal";
+import { Link } from "react-router-dom";
+
+const BuleBgHeader = styled.div`
+  width: 100%;
+  background: rgba(245, 250, 255, 1);
+`;
+const Content = styled.div`
+  width: 1200px;
+  margin: 0 auto;
+`;
+const WBg = styled.div`
+  width: 100%;
+  background: white;
+  min-height: 1000px;
+`;
+
+export default ({
+  jobId,
+  checkIfLogin,
+  history,
+  showLoginDialog,
+  showProfileCompleteDialog,
+  user,
+}) => {
+  const { isLoaded, data } = useLoaded(getJobInfo, [jobId]);
+  const [vis, setVis] = useToggle();
+  const apply = useCallback(() => {
+    if (checkIfLogin() === false) {
+      showLoginDialog();
+      return;
+    } else {
+      const f = async () => {
+        if (user && !user.profile_completed) {
+          showProfileCompleteDialog();
+        } else if (await ifHaveResume()) {
+          const resp = await applyProfile(jobId);
+          if (resp.status === 0) {
+            notification.open({
+              message: "成功",
+              description: "投递简历成功",
+            });
+          } else {
+            notification.open({
+              message: "失败",
+              description: resp.message,
+            });
+          }
+        } else {
+          setVis();
+        }
+      };
+      f();
+    }
+  }, []);
+  const back = useCallback(() => {
+    history.push('/recruitment');
+  }, []);
+  if (!isLoaded) {
+    return (
+      <FullScreen>
+        <Loading />
+      </FullScreen>
+    );
+  }
+  return (
+    <WBg>
+      <BuleBgHeader>
+        <Nav
+          breadcrunmb={[<Link to="/recruitment">职位</Link>, "职位详情"]}
+          back={back}
+        />
+        <Content>
+          <Header data={data} apply={apply}></Header>
+        </Content>
+      </BuleBgHeader>
+      <Content>
+        <JobInfo {...data} />
+        <Comp {...data} />
+        <Address {...data} />
+      </Content>
+      <ConfirmModal
+        visible={vis}
+        onCancel={() => {
+          setVis();
+          history.push("/recruitment");
+        }}
+        history={history}
+        jobId={jobId}
+      />
+    </WBg>
+  );
+};
diff --git a/src/modules/recruitment/tablist/RecruitList.js b/src/modules/recruitment/tablist/RecruitList.js
new file mode 100644
index 00000000..8e214af0
--- /dev/null
+++ b/src/modules/recruitment/tablist/RecruitList.js
@@ -0,0 +1,400 @@
+import React, { Component } from "react";
+import { Link } from "react-router-dom";
+import { getImageUrl } from "educoder";
+import Tabrecru from "./component/Tabrecru";
+import Tabhead from "./component/Tabhead";
+import TabheadSekinds from "./component/TabheadSekinds";
+import Tablereacts from "./component/Tablereacts";
+import "../recrulistcss/recrulistcss.scss";
+import { Tooltip, Button, Modal, message } from "antd";
+import axios from "axios";
+import { ThemeConsumer } from "styled-components";
+import columnsConfig from "./tableColumnsConfig";
+import qs from "qs";
+import InfoModal from "./component/InfoModal";
+
+const stateCof = {
+  off: "下线",
+  online: "上线",
+  del: "删除",
+};
+class RecruitList extends Component {
+  constructor(props) {
+    super(props);
+    const { tab, jobstate } = qs.parse(this.props.location.search.substr(1));
+    this.state = {
+      qukey: tab || "0",
+      //全部表格
+      dataSource: [], //数据
+      page: 1, //起始页 改变页
+      limit: 10, //总条数
+      count: 1, //数组总长度
+      loading: true, // 刷新参数
+      keywords: "",
+      city: "",
+      jobState: jobstate || "published",
+      modalVisible: false,
+      stateCount: {
+        published_count: 0,
+        rejected_count: 0,
+        drafted_count: 0,
+        offline_count: 0,
+      },
+    };
+  }
+  componentDidMount() {
+    // this.fetchJobsData();
+  }
+  fetchJobsData = () => {
+    const { page, limit, qukey, keywords, city, jobState } = this.state;
+    const urlcof = {
+      "0": "/jobs.json",
+      "1": "/users/jobs.json",
+      "2": "/users/applyed_jobs.json",
+    };
+    const url = urlcof[qukey];
+    this.setState({ loading: true });
+    axios
+      .get(url, {
+        params: {
+          q: keywords,
+          per_page: limit,
+          page,
+          city: city === "全国" ? "" : city,
+          state: jobState,
+        },
+      })
+      .then((response) => {
+        this.setState({ loading: false });
+        if (response.status === 200) {
+          const { state_count, data, count } = response.data;
+          this.setState({
+            dataSource: data,
+            count,
+          });
+          if (state_count) {
+            this.setState({ stateCount: state_count });
+          }
+        }
+      })
+      .catch((error) => {
+        console.log(error);
+      });
+  };
+
+  callbacks = (key) => {
+    this.setState(
+      {
+        qukey: key,
+      },
+      this.fetchJobsData
+    );
+  };
+  paginationonChange = (pageNumber) => {
+    this.setState(
+      {
+        page: pageNumber,
+      },
+      this.fetchJobsData
+    );
+  };
+  keywordCallback = (value) => {
+    this.setState(
+      {
+        keywords: value,
+      },
+      this.fetchJobsData
+    );
+  };
+  cityCallback = (city) => {
+    if (!city) {
+      this.fetchJobsData();
+      message.error("获取定位城市失败!");
+    } else {
+      this.setState(
+        {
+          city,
+        },
+        this.fetchJobsData
+      );
+    }
+  };
+  jobStateCallback = (state) => {
+    this.setState(
+      {
+        jobState: state,
+      },
+      this.fetchJobsData
+    );
+  };
+  handleJobStateChange = (record, state) => {
+    this.setState({
+      record,
+      changeState: state,
+      modalVisible: true,
+    });
+  };
+  handleJobStateSubmit = () => {
+    const { record, changeState } = this.state;
+    const url = `/jobs/${record.id}/change.json`;
+    axios
+      .put(url, {
+        id: record.id,
+        change: changeState,
+      })
+      .then((response) => {
+        if (response.status === 200) {
+          this.setState({ modalVisible: false });
+          this.fetchJobsData();
+        }
+      })
+      .catch((error) => {
+        console.log(error);
+      });
+  };
+  render() {
+    let {
+      qukey,
+      dataSource,
+      page,
+      count,
+      loading,
+      limit,
+      jobState,
+      stateCount,
+      modalVisible,
+      changeState,
+    } = this.state;
+    let pages = 0;
+    let limits = 0;
+    let counts = 0;
+    let loadings = true;
+    pages = page;
+    limits = limit;
+    counts = count;
+    loadings = loading;
+
+    const DetailBtn = (record) => (
+      <Button type="link">
+        <Link
+          to={`/recruitment/jobdetail/${record.id}`}
+          style={{ color: "#4CADFF" }}
+        >
+          查看
+        </Link>
+      </Button>
+    );
+
+    const EditBtn = (record) => (
+      <Button type="link">
+        <Link
+          to={`/recruitment/editjob/${record.id}`}
+          style={{ color: "#4CADFF" }}
+        >
+          编辑
+        </Link>
+      </Button>
+    );
+    const OnlineBtn = (record) => (
+      <Button
+        type="link"
+        style={{ color: "#2BB84A" }}
+        onClick={() => this.handleJobStateChange(record, "online")}
+      >
+        上线
+      </Button>
+    );
+
+    const OfflienBtn = (record) => (
+      <Button
+        type="link"
+        style={{ color: "#2BB84A" }}
+        onClick={() => this.handleJobStateChange(record, "off")}
+      >
+        下线
+      </Button>
+    );
+
+    const DeleteBtn = (record) => (
+      <Button
+        type="link"
+        style={{ color: "#F31010" }}
+        onClick={() => this.handleJobStateChange(record, "del")}
+      >
+        删除
+      </Button>
+    );
+
+    const defaultOperationProp = {
+      title: "操作",
+      dataIndex: "operation",
+      key: "operation",
+      align: "center",
+      className: "edu-txt-center font-14",
+    };
+    const operationConf = {
+      "0": {
+        ...defaultOperationProp,
+        render: (text, record) => DetailBtn(record),
+      },
+      "1": {
+        drafted: {
+          ...defaultOperationProp,
+          render: (text, record) => (
+            <div>
+              {EditBtn(record)}
+              {DeleteBtn(record)}
+            </div>
+          ),
+        },
+        published: {
+          ...defaultOperationProp,
+          render: (text, record) => (
+            <div>
+              {EditBtn(record)}
+              {OfflienBtn(record)}
+            </div>
+          ),
+        },
+        rejected: {
+          ...defaultOperationProp,
+          render: (text, record) => (
+            <div>
+              {EditBtn(record)}
+              {DeleteBtn(record)}
+            </div>
+          ),
+        },
+        offline: {
+          ...defaultOperationProp,
+          render: (text, record) => (
+            <div>
+              {EditBtn(record)}
+              {OnlineBtn(record)}
+              {DeleteBtn(record)}
+            </div>
+          ),
+        },
+      },
+      "2": {
+        ...defaultOperationProp,
+        render: (text, record) => <div>{DetailBtn(record)}</div>,
+      },
+    };
+    let columns;
+    if (qukey && qukey !== "1") {
+      columns = [...columnsConfig[qukey], operationConf[qukey]];
+    } else {
+      columns = [
+        ...columnsConfig[qukey][jobState],
+        operationConf[qukey][jobState],
+      ];
+    }
+    return (
+      <div className="newMain clearfix  ">
+        <style>
+          {`    ::-webkit-scrollbar {
+                      width: 0px !important;
+                    }
+										.recruitment-head{
+												width: 100%;
+												height: 240px;
+												background-image: url(${getImageUrl(
+                          this.props.mygetHelmetapi &&
+                            this.props.mygetHelmetapi.job_banner_url === null
+                            ? `images/educoder/courses/courses.jpg`
+                            : this.props.mygetHelmetapi &&
+                                this.props.mygetHelmetapi.job_banner_url
+                        )});
+											  background-color: #0734B8;
+												background-position: center;
+												background-repeat: no-repeat;
+										}
+
+									`}
+        </style>
+        {this.props.mygetHelmetapi &&
+        this.props.mygetHelmetapi.job_banner_url ? (
+          <div className="recruitment-head pr">
+            <div className="edu-txt-center pathNavLine">
+              <div className="inline path-nav"></div>
+            </div>
+          </div>
+        ) : (
+          ""
+        )}
+        {/*内容区*/}
+        <Tabrecru
+          {...this.props}
+          {...this.state}
+          callbacks={(e) => this.callbacks(e)}
+        ></Tabrecru>
+        <div style={{ display: qukey === "1" ? "block" : "none" }}>
+          <TabheadSekinds
+            {...this.props}
+            {...this.state}
+            keywordCallback={this.keywordCallback}
+            jobStateCallback={this.jobStateCallback}
+            stateCount={stateCount}
+            jobState={jobState}
+          ></TabheadSekinds>
+        </div>
+        <div style={{ display: qukey === "1" ? "none" : "block" }}>
+          <Tabhead
+            {...this.props}
+            {...this.state}
+            keywordCallback={this.keywordCallback}
+            cityCallback={this.cityCallback}
+          ></Tabhead>
+        </div>
+        <div style={{ minHeight: 520 }}>
+          {/*表格*/}
+          <Tablereacts
+            {...this.state}
+            {...this.props}
+            columns={columns} //表格数组
+            dataSource={dataSource.map((item) => {
+              return { ...item, key: item.id };
+            })} //数据
+            page={pages} //起始页 改变页
+            limit={limits} //总条数
+            count={counts} //数组总长度
+            loading={loadings} // 刷新参数
+            paginationonChange={(e) => this.paginationonChange(e)}
+          ></Tablereacts>
+        </div>
+
+        <InfoModal
+          visible={modalVisible}
+          onCancel={() => this.setState({ modalVisible: false })}
+          content={`确定要${stateCof[changeState]}该职位?`}
+          footer={
+            <div style={{ textAlign: "center", padding: "10px 0px" }}>
+              <Button
+                onClick={() => {
+                  this.setState({ modalVisible: false });
+                }}
+                style={{
+                  backgroundColor: "#cccccc",
+                  color: "#ffffff",
+                }}
+              >
+                取消
+              </Button>
+              <Button
+                type="primary"
+                onClick={() => {
+                  this.handleJobStateSubmit();
+                }}
+              >
+                确定
+              </Button>
+            </div>
+          }
+        ></InfoModal>
+      </div>
+    );
+  }
+}
+
+export default RecruitList;
diff --git a/src/modules/recruitment/tablist/component/InfoModal.js b/src/modules/recruitment/tablist/component/InfoModal.js
new file mode 100644
index 00000000..d951ae83
--- /dev/null
+++ b/src/modules/recruitment/tablist/component/InfoModal.js
@@ -0,0 +1,21 @@
+import React, { Component } from "react";
+import { Modal } from "antd";
+
+class InfoModal extends Component {
+  render() {
+    const { title, visible, onCancel, footer, content } = this.props;
+    return (
+      <Modal
+        centered
+        visible={visible}
+        title={title || <span style={{ fontSize: 18 }}>提示</span>}
+        onCancel={onCancel}
+        footer={footer}
+      >
+        <div style={{ textAlign: "center" }}>{content}</div>
+      </Modal>
+    );
+  }
+}
+
+export default InfoModal;
diff --git a/src/modules/recruitment/tablist/component/Tabhead.js b/src/modules/recruitment/tablist/component/Tabhead.js
new file mode 100644
index 00000000..e5e5e135
--- /dev/null
+++ b/src/modules/recruitment/tablist/component/Tabhead.js
@@ -0,0 +1,218 @@
+import React, { Component } from "react";
+import "../../recrulistcss/recrulistcss.scss";
+import { Tabs, Input, Modal, Button } from "antd";
+import axios from "axios";
+const Search = Input.Search;
+class Tabhead extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      city: "", //modal选择的高亮城市
+      locationCity: "", //定位城市
+      chosedCity: "", //已选择的城市
+      modalVisible: false,
+      hotCity: [],
+    };
+  }
+  componentDidMount() {
+    const { city, hotCity } = this.state;
+    if (!city) {
+      this.initUserCity();
+    }
+    if (!hotCity.length) {
+      this.fetcHotCitys();
+    }
+  }
+  fetcHotCitys = () => {
+    const url = `/job_data/hot_city`;
+    axios
+      .get(url)
+      .then((response) => {
+        if (response.status === 200) {
+          this.setState({
+            hotCity: response.data.data,
+          });
+        }
+      })
+      .catch((error) => {
+        console.log(error);
+      });
+  };
+  initUserCity = () => {
+    //动态script获取用户城市 腾讯地图API  https://lbs.qq.com/webApi/component/componentGuide/componentGeolocation
+    let script = document.createElement("script");
+    const url = `https://apis.map.qq.com/tools/geolocation/min?key=RPZBZ-CJE3D-YN24W-POI53-IAHPE-5HBB4&referer=educoder`;
+    script.id = url;
+    script.src = url;
+    script.onload = script.onreadystatechange = () => {
+      if (script.ready) {
+        return false;
+      }
+      if (
+        !script.readyState || //这是FF的判断语句，因为ff下没有readyState这个值，IE的readyState肯定有值
+        script.readyState === "loaded" ||
+        script.readyState === "complete" // 这是IE的判断语句
+      ) {
+        script.ready = true;
+        const geolocation = new window.qq.maps.Geolocation();
+        geolocation.getIpLocation(
+          (position) => {
+            const city = position.city.replace("市", "");
+            this.props.cityCallback(city);
+            this.setState({
+              city,
+              locationCity: city,
+              chosedCity: city,
+            });
+          },
+          (err) =>
+            this.setState({
+              city: "无法获取当前位置",
+            })
+        );
+      }
+    };
+    document.body.appendChild(script);
+  };
+  setdatafunsval = (e) => {
+    this.setState({
+      keyword: e.target.value,
+    });
+    console.log("e.target.value" + e.target.value);
+  };
+
+  setdatafuns = (value) => {
+    this.setState({
+      keyword: value,
+    });
+    this.props.keywordCallback(value);
+    console.log("value" + value);
+  };
+  handleCityChange = (city) => {
+    this.setState({ city });
+  };
+  render() {
+    const {
+      city,
+      locationCity,
+      chosedCity,
+      hotCity,
+      modalVisible,
+    } = this.state;
+    return (
+      <div className="educontent  tabone">
+        <div className="edu-back-white pdtabs sortinxdirection pd30 ptabo">
+          <div className="w17s  sortinxdirection iconcolor">
+            <i className="iconfont icon-gongsidizhi font-22  mr7 lh40s"></i>
+            <p className="lh48s font-16 mr7 titless100 ">{chosedCity}</p>
+            <p
+              className="font-14 color88 lh48s xiaoshou"
+              onClick={() => this.setState({ modalVisible: true })}
+            >
+              [切换城市]
+            </p>
+          </div>
+          <div className="w83s ">
+            <Search
+              className={"xaxisreverseorder searchwidth"}
+              placeholder="请输入职位或单位"
+              enterButton="搜索"
+              size="large"
+              maxLength={60}
+              onInput={(e) => this.setdatafunsval(e)}
+              onSearch={(value) => this.setdatafuns(value)}
+            />
+          </div>
+        </div>
+        <Modal
+          getContainer={false}
+          visible={modalVisible}
+          title={<span style={{ fontSize: 18 }}>选择地区</span>}
+          onCancel={() => this.setState({ modalVisible: false })}
+          footer={
+            <div style={{ textAlign: "center", padding: "10px 0px" }}>
+              <Button
+                onClick={() => {
+                  this.setState({ modalVisible: false, city: chosedCity });
+                }}
+                style={{
+                  backgroundColor: "#cccccc",
+                  color: "#ffffff",
+                }}
+              >
+                取消
+              </Button>
+              <Button
+                type="primary"
+                onClick={() => {
+                  this.handleCityChange(city);
+                  this.setState({ modalVisible: false, chosedCity: city });
+                  this.props.cityCallback(city);
+                }}
+              >
+                确定
+              </Button>
+            </div>
+          }
+        >
+          <div>
+            <span
+              style={{ color: "#333333", fontFamily: "MicrosoftYaHeiSemibold" }}
+            >
+              当前定位城市：
+            </span>
+            <div style={{ marginTop: 21 }}>
+              <Button
+                type={city === locationCity ? "primary" : "default"}
+                ghost={city === locationCity}
+                onClick={() => this.handleCityChange(locationCity)}
+              >
+                <i className="iconfont icon-gongsidizhi font-14  mr10 "></i>
+                {locationCity}
+              </Button>
+              <Button
+                type={city === "全国" ? "primary" : "default"}
+                ghost={city === "全国"}
+                style={{ marginLeft: 25 }}
+                onClick={() => this.handleCityChange("全国")}
+              >
+                全国
+              </Button>
+            </div>
+          </div>
+          <div style={{ marginTop: 32 }}>
+            <span
+              style={{
+                color: "#333333",
+                fontFamily: "MicrosoftYaHeiSemibold",
+              }}
+            >
+              热门城市：
+            </span>
+            <div
+              style={{
+                marginTop: 21,
+                display: "flex",
+                flexWrap: "wrap",
+              }}
+            >
+              {hotCity.map((item) => (
+                <div style={{ paddingRight: 20, paddingBottom: 20 }} key={item}>
+                  <Button
+                    type={city === item ? "primary" : "default"}
+                    ghost={city === item}
+                    onClick={() => this.handleCityChange(item)}
+                  >
+                    {item}
+                  </Button>
+                </div>
+              ))}
+            </div>
+          </div>
+        </Modal>
+      </div>
+    );
+  }
+}
+
+export default Tabhead;
diff --git a/src/modules/recruitment/tablist/component/TabheadSekinds.js b/src/modules/recruitment/tablist/component/TabheadSekinds.js
new file mode 100644
index 00000000..5fb97e80
--- /dev/null
+++ b/src/modules/recruitment/tablist/component/TabheadSekinds.js
@@ -0,0 +1,106 @@
+import React, { Component } from "react";
+import "../../recrulistcss/recrulistcss.scss";
+import { Tabs, Input } from "antd";
+const Search = Input.Search;
+class TabheadSekinds extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      Choice: props.jobState || "published",
+    };
+  }
+
+  setdatafunsval = (e) => {
+    this.setState({
+      keyword: e.target.value,
+    });
+    console.log("e.target.value" + e.target.value);
+  };
+
+  setdatafuns = (value) => {
+    this.setState({
+      keyword: value,
+    });
+    console.log("value" + value);
+    this.props.keywordCallback(value);
+  };
+
+  setChoice = (i) => {
+    this.setState({
+      Choice: i,
+    });
+    this.props.jobStateCallback(i);
+  };
+
+  render() {
+    let { Choice } = this.state;
+    const { stateCount } = this.props;
+    const {
+      published_count,
+      rejected_count,
+      drafted_count,
+      offline_count,
+    } = stateCount;
+    return (
+      <div className="educontent  tabone">
+        <div className="edu-back-white pdtabss sortinxdirection pd30 ptabo">
+          <div className="sortinxdirection w70s">
+            <div
+              className={
+                Choice === "published"
+                  ? "divgreens brodersdiv xiaoshou"
+                  : "divgreen brodersdiv xiaoshou"
+              }
+              onClick={() => this.setChoice("published")}
+            >
+              {`在线中的职位 ${published_count}`}
+            </div>
+            <div
+              className={
+                Choice === "offline"
+                  ? "divViolets brodersdiv ml21 xiaoshou"
+                  : "divViolet brodersdiv ml21 xiaoshou"
+              }
+              onClick={() => this.setChoice("offline")}
+            >
+              {`已下线的职位 ${offline_count}`}
+            </div>
+            <div
+              className={
+                Choice === "drafted"
+                  ? "divoranges brodersdiv ml21 xiaoshou"
+                  : "divorange brodersdiv ml21 xiaoshou"
+              }
+              onClick={() => this.setChoice("drafted")}
+            >
+              {`审核中的职位 ${drafted_count}`}
+            </div>
+            <div
+              className={
+                Choice === "rejected"
+                  ? "divreds brodersdiv ml21 xiaoshou"
+                  : "divred brodersdiv ml21 xiaoshou"
+              }
+              onClick={() => this.setChoice("rejected")}
+            >
+              {`未通过的职位 ${rejected_count}`}
+            </div>
+          </div>
+          <div>
+            <Search
+              className={"searchwidth"}
+              placeholder="请输入职位"
+              enterButton="搜索"
+              size="large"
+              maxLength={60}
+              onInput={(e) => this.setdatafunsval(e)}
+              onSearch={(value) => this.setdatafuns(value)}
+            />
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default TabheadSekinds;
diff --git a/src/modules/recruitment/tablist/component/Tablereacts.js b/src/modules/recruitment/tablist/component/Tablereacts.js
new file mode 100644
index 00000000..b0cf2854
--- /dev/null
+++ b/src/modules/recruitment/tablist/component/Tablereacts.js
@@ -0,0 +1,67 @@
+import React, { Component } from "react";
+import "../../recrulistcss/recrulistcss.scss";
+import LoadingSpin from "../../../../common/LoadingSpin";
+import NoneDatas from "../../../courses/signin/component/NoneDatas";
+
+import { Table, Pagination } from "antd";
+class Tablereacts extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      loading: false,
+    };
+  }
+
+  render() {
+    let {
+      columns, //表格数组
+      dataSource, //数据
+      page, //起始页 改变页
+      limit, //总条数
+      count, //数组总长度
+      loading, // 刷新参数
+    } = this.props;
+
+    return (
+      <div className="educontent   edu-back-white  ">
+        {loading === true ? (
+          <div
+            style={{
+              minHeight: "500px",
+            }}
+          >
+            <LoadingSpin></LoadingSpin>
+          </div>
+        ) : dataSource && dataSource.length === 0 ? (
+          <div
+            style={{
+              minHeight: "500px",
+            }}
+          >
+            <NoneDatas></NoneDatas>
+          </div>
+        ) : (
+          <Table columns={columns} dataSource={dataSource} pagination={false} />
+        )}
+
+        <div className="mb30 clearfix educontent mt40 intermediatecenter">
+          {dataSource && dataSource.length > 0 ? (
+            <Pagination
+              hideOnSinglePage
+              showQuickJumper
+              current={page}
+              onChange={(e) => this.props.paginationonChange(e)}
+              pageSize={limit}
+              total={count}
+              style={{ marginTop: 30, marginBottom: 20 }}
+            ></Pagination>
+          ) : (
+            ""
+          )}
+        </div>
+      </div>
+    );
+  }
+}
+
+export default Tablereacts;
diff --git a/src/modules/recruitment/tablist/component/Tabrecru.js b/src/modules/recruitment/tablist/component/Tabrecru.js
new file mode 100644
index 00000000..f8d63dd1
--- /dev/null
+++ b/src/modules/recruitment/tablist/component/Tabrecru.js
@@ -0,0 +1,199 @@
+import React, { Component, Fragment } from "react";
+import { Link } from "react-router-dom";
+import "../../recrulistcss/recrulistcss.scss";
+import { Tabs } from "antd";
+import axios from "axios";
+import qs from "qs";
+import Certifiedprofessional from "../../../modals/Certifiedprofessional";
+const { TabPane } = Tabs;
+class Tabrecru extends Component {
+  constructor(props) {
+    super(props);
+    const { tab } = qs.parse(this.props.location.search.substr(1));
+    this.state = {
+      defaultActiveKeys: tab || 0,
+      certifiedprofessionalModalVisible: false,
+    };
+  }
+  componentDidMount() {
+    this.fetchResumeDetail();
+  }
+  callback = (key) => {
+    this.setState({
+      defaultActiveKeys: key + "",
+    });
+    this.props.callbacks(key + "");
+  };
+  fetchResumeDetail = () => {
+    const url = `/users/resume.json`;
+    axios
+      .get(url)
+      .then((response) => {
+        if (response.data.status !== -2 && response.data) {
+          this.setState({ hasResume: true });
+        }
+      })
+      .catch((error) => {
+        console.log(error);
+      });
+  };
+  handleCertifiedprofessionalModalVisible = (flag) => {
+    this.setState({ certifiedprofessionalModalVisible: flag });
+  };
+  render() {
+    let { defaultActiveKeys } = this.state;
+    let tabs = defaultActiveKeys + "";
+    //发布职位权限
+    let authJobs = false;
+    let user = {
+      admin: false,
+      business: false,
+      is_teacher: false,
+      professional_certification: false,
+      identity: "", //专业人士 identity=professional
+    };
+
+    const {
+      admin,
+      business,
+      is_teacher,
+      professional_certification,
+      identity,
+    } = this.props.user || user;
+
+    authJobs = admin || business || is_teacher || identity === "professional";
+
+    const GoResumeButton = () => {
+      return (
+        <div className="sortinxdirection iconcolor lh45s xiaoshou">
+          <i className="iconfont icon-xinjianjianliwodejianli font-16  mr7"></i>
+          <p className="lh45s font-16">
+            {this.state.hasResume ? (
+              <a
+                onClick={() => {
+                  if (!this.props.checkIfLogin()) {
+                    this.props.showLoginDialog();
+                  } else if (
+                    this.props.user &&
+                    !this.props.user.profile_completed
+                  ) {
+                    this.props.showProfileCompleteDialog();
+                  } else {
+                    this.props.history.push(
+                      "/recruitment/resumedetails?from=recruitment"
+                    );
+                  }
+                }}
+                style={{ color: "#4CADFF" }}
+              >
+                我的简历
+              </a>
+            ) : (
+              <a
+                onClick={() => {
+                  if (!this.props.checkIfLogin()) {
+                    this.props.showLoginDialog();
+                  } else if (
+                    this.props.user &&
+                    !this.props.user.profile_completed
+                  ) {
+                    this.props.showProfileCompleteDialog();
+                  } else {
+                    this.props.history.push("/recruitment/addresume");
+                  }
+                }}
+                style={{ color: "#4CADFF" }}
+              >
+                新建简历
+              </a>
+            )}
+          </p>
+        </div>
+      );
+    };
+    const AddJobButton = () => {
+      return (
+        <div className="sortinxdirection iconcolor lh45s xiaoshou">
+          <i className="iconfont icon-fabuzhiwei font-16  mr7"></i>
+          <p className="lh45s font-16">
+            <a
+              style={{ color: "#4CADFF" }}
+              onClick={() => {
+                if (
+                  (is_teacher && !professional_certification) ||
+                  (identity === "professional" && !professional_certification)
+                ) {
+                  this.setState({
+                    certifiedprofessionalModalVisible: true,
+                  });
+                } else {
+                  this.props.history.push("/recruitment/addjob");
+                }
+              }}
+            >
+              发布职位
+            </a>
+          </p>
+        </div>
+      );
+    };
+    return (
+      <div className="educontent  tabone mt22">
+        {tabs === "0" ? (
+          <style>
+            {`
+								.pdtab .ant-tabs-nav .ant-tabs-ink-bar{
+								width: 37px !important;
+								left: 14px;
+								}
+							`}
+          </style>
+        ) : (
+          <style>
+            {`
+								.pdtab .ant-tabs-nav .ant-tabs-ink-bar{
+							  width: 69px !important;
+                	left: 14px;
+								}
+							`}
+          </style>
+        )}
+        <div className="edu-back-white pdtab sortinxdirection">
+          <Tabs activeKey={tabs} onChange={this.callback}>
+            <TabPane tab="全部" key="0"></TabPane>
+            {authJobs ? <TabPane tab="我发布的" key="1"></TabPane> : null}
+            <TabPane tab="我投递的" key="2"></TabPane>
+          </Tabs>
+          <div className="w50s xaxisreverseorder">
+            {tabs === "0" ? (
+              authJobs ? (
+                <Fragment>
+                  <GoResumeButton />
+                  <div style={{ marginRight: 50 }}>
+                    <AddJobButton />
+                  </div>
+                </Fragment>
+              ) : (
+                <GoResumeButton />
+              )
+            ) : tabs === "1" ? (
+              <AddJobButton />
+            ) : (
+              <GoResumeButton />
+            )}
+          </div>
+        </div>
+        <Certifiedprofessional
+          {...this.props}
+          mydisplay={this.state.certifiedprofessionalModalVisible}
+          occupation={2}
+          ModalCancelsy={() => {
+            this.handleCertifiedprofessionalModalVisible(false);
+          }}
+        />
+      </div>
+    );
+  }
+}
+
+export default Tabrecru;
diff --git a/src/modules/recruitment/tablist/tableColumnsConfig.js b/src/modules/recruitment/tablist/tableColumnsConfig.js
new file mode 100644
index 00000000..e1cd6278
--- /dev/null
+++ b/src/modules/recruitment/tablist/tableColumnsConfig.js
@@ -0,0 +1,406 @@
+import React from "react";
+import { Tooltip, Button, Modal } from "antd";
+import { Link } from "react-router-dom";
+
+const oncell = () => {
+  return {
+    style: {
+      maxWidth: 150,
+      overflow: "hidden",
+      whiteSpace: "nowrap",
+      textOverflow: "ellipsis",
+    },
+  };
+};
+
+export const columnsConfig = {
+  "0": [
+    {
+      title: "职位名称",
+      dataIndex: "name",
+      key: "name",
+      align: "center",
+      className: "edu-txt-center font-14",
+      onCell: oncell,
+      render: (text, record) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+    },
+    {
+      title: "发布者单位",
+      dataIndex: "department",
+      key: "department",
+      align: "center",
+      className: "edu-txt-center font-14",
+      onCell: oncell,
+      render: (text, record) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+    },
+    {
+      title: "工作地点",
+      dataIndex: "city",
+      key: "city",
+      align: "center",
+      className: "edu-txt-center font-14",
+      onCell: oncell,
+      render: (text, record) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+    },
+    {
+      title: "薪资范围",
+      dataIndex: "salary",
+      key: "salary",
+      align: "center",
+      className: "edu-txt-center font-14",
+      onCell: oncell,
+      render: (text, record) => (
+        <Tooltip placement="topLeft" title={text}>
+          <span style={{ color: "#FB4848" }}>{text}</span>
+        </Tooltip>
+      ),
+    },
+    {
+      title: "发布时间",
+      dataIndex: "updated_at",
+      key: "updated_at",
+      align: "center",
+      className: "edu-txt-center font-14",
+      onCell: oncell,
+      render: (text, record) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+    },
+  ],
+  "1": {
+    drafted: [
+      {
+        title: "职位名称",
+        dataIndex: "name",
+        key: "name",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: "发布者",
+        dataIndex: "user_name",
+        key: "user_name",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: "创建时间",
+        dataIndex: "created_at",
+        key: "created_at",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+    ],
+    published: [
+      {
+        title: "职位名称",
+        dataIndex: "name",
+        key: "name",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: "发布者",
+        dataIndex: "user_name",
+        key: "user_name",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: "更新时间",
+        dataIndex: "updated_at",
+        key: "updated_at",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: "投递人数",
+        dataIndex: "apply_count",
+        key: "apply_count",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            <Link
+              to={`/recruitment/applier/${record.id}`}
+              style={{ color: "#4CADFF" }}
+            >
+              {text}
+            </Link>
+          </Tooltip>
+        ),
+      },
+    ],
+    rejected: [
+      {
+        title: "职位名称",
+        dataIndex: "name",
+        key: "name",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: "发布者",
+        dataIndex: "user_name",
+        key: "user_name",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: "创建时间",
+        dataIndex: "created_at",
+        key: "created_at",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: "未通过原因",
+        dataIndex: "reject_reason",
+        key: "reject_reason",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+    ],
+    offline: [
+      {
+        title: "职位名称",
+        dataIndex: "name",
+        key: "name",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: "发布者",
+        dataIndex: "user_name",
+        key: "user_name",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: "创建时间",
+        dataIndex: "created_at",
+        key: "created_at",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: "下线时间",
+        dataIndex: "updated_at",
+        key: "updated_at",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: "投递人数",
+        dataIndex: "apply_count",
+        key: "apply_count",
+        align: "center",
+        className: "edu-txt-center font-14",
+        onCell: oncell,
+        render: (text, record) => (
+          <Tooltip placement="topLeft" title={text}>
+            <Link
+              to={`/recruitment/applier/${record.id}`}
+              style={{ color: "#4CADFF" }}
+            >
+              {text}
+            </Link>
+          </Tooltip>
+        ),
+      },
+    ],
+  },
+  "2": [
+    {
+      title: "职位名称",
+      dataIndex: "name",
+      key: "name",
+      align: "center",
+      className: "edu-txt-center font-14",
+      onCell: oncell,
+      render: (text, record) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+    },
+    {
+      title: "发布者单位",
+      dataIndex: "company",
+      key: "company",
+      align: "center",
+      className: "edu-txt-center font-14",
+      onCell: oncell,
+      render: (text, record) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+    },
+    {
+      title: "工作地点",
+      dataIndex: "city",
+      key: "city",
+      align: "center",
+      className: "edu-txt-center font-14",
+      onCell: oncell,
+      render: (text, record) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+    },
+    {
+      title: "薪资范围",
+      dataIndex: "salary",
+      key: "salary",
+      align: "center",
+      className: "edu-txt-center font-14",
+      onCell: oncell,
+      render: (text, record) => (
+        <Tooltip placement="topLeft" title={text}>
+          <span style={{ color: "#FB4848" }}>{text}</span>
+        </Tooltip>
+      ),
+    },
+    {
+      title: "发布时间",
+      dataIndex: "publish_at",
+      key: "publish_at",
+      align: "center",
+      className: "edu-txt-center font-14",
+      onCell: oncell,
+      render: (text, record) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+    },
+    {
+      title: "投递时间",
+      dataIndex: "apply_at",
+      key: "apply_at",
+      align: "center",
+      className: "edu-txt-center font-14",
+      onCell: oncell,
+      render: (text, record) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+    },
+    {
+      title: "是否看简历",
+      dataIndex: "is_viewd",
+      key: "is_viewd",
+      align: "center",
+      className: "edu-txt-center font-14",
+      onCell: oncell,
+      render: (text, record) => (
+        <Tooltip placement="topLeft" title={text ? "是" : "否"}>
+          {text ? "是" : "否"}
+        </Tooltip>
+      ),
+    },
+  ],
+};
+export default columnsConfig;
diff --git a/src/modules/recruitment/util/Button.js b/src/modules/recruitment/util/Button.js
new file mode 100644
index 00000000..5c43fdb3
--- /dev/null
+++ b/src/modules/recruitment/util/Button.js
@@ -0,0 +1,14 @@
+import styled from 'styled-components';
+import { pointerMixin, alignTextMixin } from './cssMixin';
+
+export const TextButton = styled.div`
+    color:${p => p.color};
+    font-size:14px;
+    font-family:MicrosoftYaHei;
+    ${pointerMixin}
+`;
+
+export const BtnBase = styled.div`
+    ${alignTextMixin}
+    ${pointerMixin}
+`;
\ No newline at end of file
diff --git a/src/modules/recruitment/util/GeneralButton.js b/src/modules/recruitment/util/GeneralButton.js
new file mode 100644
index 00000000..6fda2e32
--- /dev/null
+++ b/src/modules/recruitment/util/GeneralButton.js
@@ -0,0 +1,53 @@
+import { BtnBase } from "./Button";
+import styled from 'styled-components';
+import React from "react";
+
+const Button = styled(BtnBase)`
+    width:90px;
+    border-radius:5px;
+    font-size:16px;
+    font-family:MicrosoftYaHei;
+    color:rgba(255,255,255,1);
+    margin-left:20px;
+    margin-right:20px;
+`;
+const Ok = styled(Button)`
+    background:rgba(76,172,255,1);
+`;
+export const OkBtn = (props) => <Ok height="38px" {...props}>确定</Ok>;
+const Cancel = styled(Button)`
+    background:rgba(204,204,204,1);
+`;
+export const SaveBtn = (props) => <Ok height="38px" {...props}>保存</Ok>;
+
+export const CancelBtn = (props) => <Cancel height="38px" {...props}>取消</Cancel>;
+export const CenterBtnGrp = styled.div`
+    margin:10px auto;
+    display:flex;
+    justify-content: center;
+`;
+
+const OutlineBtn = styled.div`
+  min-width: 150px;
+  height: 46px;
+  border-radius: 28px;
+  border:1px solid ${p => p.isSelected ? "rgba(76,172,255,1)" : "rgba(221,221,221,1)"};
+  color:${p => p.isSelected ? "rgba(76,172,255,1)" : "rgba(51,51,51,1)"};
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  margin-top: 20px;
+  margin-left: 47.5px;
+  &:hover {
+    cursor: pointer;
+  }
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  text-align:center;
+  padding-left:15px;
+  padding-right:15px;
+`;
+
+export const JobBtn = ({ children, ...props }) => {
+    return <OutlineBtn {...props}>{children}</OutlineBtn>;
+}
diff --git a/src/modules/recruitment/util/Layout.js b/src/modules/recruitment/util/Layout.js
new file mode 100644
index 00000000..d6165702
--- /dev/null
+++ b/src/modules/recruitment/util/Layout.js
@@ -0,0 +1,7 @@
+import styled from "styled-components";
+import React from "react";
+
+export const FullScreen = styled.div`
+  min-width: 100vw;
+  min-height: 100vh;
+`;
diff --git a/src/modules/recruitment/util/Loading.js b/src/modules/recruitment/util/Loading.js
new file mode 100644
index 00000000..4a233f35
--- /dev/null
+++ b/src/modules/recruitment/util/Loading.js
@@ -0,0 +1,12 @@
+import React from 'react';
+import { Spin } from 'antd';
+import styled from 'styled-components';
+import { allCenterMixin } from './cssMixin';
+
+const Mid = styled.div`
+    width:100%;
+    height:100%;
+    ${allCenterMixin}
+`;
+
+export default () => <Mid><Spin size="large" /></Mid>;
diff --git a/src/modules/recruitment/util/Modal.js b/src/modules/recruitment/util/Modal.js
new file mode 100644
index 00000000..7841152c
--- /dev/null
+++ b/src/modules/recruitment/util/Modal.js
@@ -0,0 +1,22 @@
+import React from "react";
+import { Modal } from 'antd';
+import styled from 'styled-components';
+
+const Box = styled.div`
+    width:clac(100%+80px);
+    margin:-24px -24px;
+`;
+const Title = styled.div`
+    font-size:18px;
+    width:100%;
+    font-family:MicrosoftYaHeiSemibold;
+    color:rgba(51,51,51,1);
+    text-align:center;
+`;
+
+//visible,title,onCancel,width
+export default ({ children, title, ...props }) => {
+    return <Modal footer={null} centered title={<Title>{title}</Title>} closable={false} {...props} maskClosable={false} keyboard={false}>
+        <Box>{children}</Box>
+    </Modal>;
+};
diff --git a/src/modules/recruitment/util/Nav.js b/src/modules/recruitment/util/Nav.js
new file mode 100644
index 00000000..ed26ef20
--- /dev/null
+++ b/src/modules/recruitment/util/Nav.js
@@ -0,0 +1,22 @@
+import styled from 'styled-components';
+import React from "react";
+import { Breadcrumb } from 'antd';
+import { betweenMixin } from "./cssMixin";
+import { TextButton } from './Button';
+
+const Nav = styled.div`
+    width:1200px;
+    margin:0 auto;
+    font-size:12px;
+    font-family:MicrosoftYaHei;
+    padding-top:20px;
+    padding-bottom:20px;
+    ${betweenMixin}
+`;
+export default ({ breadcrunmb, back }) => <Nav>
+    <Breadcrumb separator=">">
+        {breadcrunmb.map(i => <Breadcrumb.Item>{i}</Breadcrumb.Item>)}
+    </Breadcrumb>
+    <TextButton color="rgba(51,51,51,1)" onClick={back}>返回</TextButton>
+</Nav>;
+
diff --git a/src/modules/recruitment/util/cssMixin.js b/src/modules/recruitment/util/cssMixin.js
new file mode 100644
index 00000000..027e0cc8
--- /dev/null
+++ b/src/modules/recruitment/util/cssMixin.js
@@ -0,0 +1,24 @@
+import { css } from 'styled-components';
+
+export const pointerMixin = css`
+    &:hover{
+        cursor:pointer;
+    }
+`;
+export const betweenMixin = css`
+    display:flex;
+    justify-content:space-between;
+    align-items:center;
+`;
+
+export const alignTextMixin = css`
+    height:${p => p.height};
+    text-align:center;
+    line-height:${p => p.height};
+`;
+
+export const allCenterMixin = css`
+    display:flex;
+    justify-content:center;
+    align-items:center;
+`;
\ No newline at end of file
diff --git a/src/modules/recruitment/util/hooks.js b/src/modules/recruitment/util/hooks.js
new file mode 100644
index 00000000..1c315318
--- /dev/null
+++ b/src/modules/recruitment/util/hooks.js
@@ -0,0 +1,65 @@
+import { useState, useCallback, useEffect, useRef } from "react";
+
+export function useToggle(init = false) {
+  const [bool, setBool] = useState(init);
+  const toggle = useCallback(() => {
+    setBool((old) => !old);
+  }, []);
+  return [bool, toggle];
+}
+
+export function useForceUpdate() {
+  const [_, setVer] = useState(0);
+  return useCallback(() => {
+    setVer((v) => v + 1);
+  }, []);
+}
+
+export function useMap(canAdd, canRemove = () => true) {
+  const mapRef = useRef(new Map());
+  const forceUpdate = useForceUpdate();
+  const add = useCallback((key, item) => {
+    if (!canAdd(mapRef.current)) {
+      return;
+    }
+    mapRef.current.set(key, item);
+    forceUpdate();
+  }, []);
+  const remove = useCallback((key) => {
+    mapRef.current.delete(key);
+    forceUpdate();
+  }, []);
+  return { map: mapRef.current, add, remove };
+}
+
+export function useLoaded(promiseFac, dependsLst) {
+  const [isLoaded, setLoaded] = useState(false);
+  const dataRef = useRef(null);
+  useEffect(() => {
+    const f = async () => {
+      dataRef.current = await promiseFac(...dependsLst);
+      setLoaded(true);
+    };
+    f();
+    return () => {
+      setLoaded(false);
+    };
+  }, dependsLst);
+  return { isLoaded, data: dataRef.current };
+}
+
+export function useSet(canAdd = () => true) {
+  const setRef = useRef(new Set());
+  const forceUpdate = useForceUpdate();
+  const add = useCallback((key) => {
+    if(canAdd(setRef.current)){
+      setRef.current.add(key);
+      forceUpdate();
+    }
+  }, []);
+  const remove = useCallback((key) => {
+    setRef.current.delete(key);
+    forceUpdate();
+  }, []);
+  return { set: setRef.current, add, remove };
+}
diff --git a/src/modules/test/TestCrop.js b/src/modules/test/TestCrop.js
deleted file mode 100644
index b539ef2b..00000000
--- a/src/modules/test/TestCrop.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React, { Component } from 'react';
-
-import Cropper from '../../common/components/Cropper'
-import ChangeHeaderPicModal from '../user/account/ChangeHeaderPicModal'
-class TestCrop extends Component {
-  state = {
-  };
-
-  handleChange = (info) => {
-  }
-
-  render() {
-    
-    const props = this.props;
-    return (
-      <div>
-        <button onClick={() => { this.refs['changeHeaderPicModal'].setVisible(true)}}>open</button>
-        <ChangeHeaderPicModal ref="changeHeaderPicModal"></ChangeHeaderPicModal>
-        <Cropper></Cropper>
-      </div>
-    );
-  }
-}
-
-export default  (TestCrop);
diff --git a/src/modules/test/codemirror/TestCodeMirror.js b/src/modules/test/codemirror/TestCodeMirror.js
index 08ca32f1..f451bc35 100644
--- a/src/modules/test/codemirror/TestCodeMirror.js
+++ b/src/modules/test/codemirror/TestCodeMirror.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 
-import CodeMirror from 'react-codemirror'
+import CodeMirror from 'react-codeMirror'
 
 require('codemirror/lib/codemirror.css');
 require('codemirror/mode/javascript/javascript');
@@ -28,13 +28,13 @@ class TestCodeMirror extends Component {
 
 	componentDidMount() {
 		var readOnlyLines = [0,1,2,3,8];
-
+		
 		this.refs.editor.getCodeMirror().on('beforeChange',function(cm,change) {
 			console.log('change.from.line', change.from.line)
-		    if ( readOnlyLines.indexOf(change.from.line) !== -1
+		    if ( readOnlyLines.indexOf(change.from.line) !== -1 
 					// 有问题：如果用回车将有内容的行挤到不可编辑的行，那么无法删除掉不可编辑行里的内容了
 					// 解决办法：将所需的行数固定写好，禁用掉回车键。
-		    		// || change.from.line > ( readOnlyLines[readOnlyLines.length -1] + 1 )
+		    		// || change.from.line > ( readOnlyLines[readOnlyLines.length -1] + 1 ) 
 		    		) {
 		        change.cancel();
 		    }
@@ -60,4 +60,4 @@ class TestCodeMirror extends Component {
 	}
 }
 
-export default TestCodeMirror;
+export default TestCodeMirror;
\ No newline at end of file
diff --git a/src/modules/test/md/TestMaterialDesign.js b/src/modules/test/md/TestMaterialDesign.js
index be2fef5d..57a9bc4d 100644
--- a/src/modules/test/md/TestMaterialDesign.js
+++ b/src/modules/test/md/TestMaterialDesign.js
@@ -1,123 +1,7 @@
 import React, { Component } from 'react';
 
-
-// import Divider from 'material-ui/Divider';
-// import Dialog, {
-//   DialogActions,
-//   DialogContent,
-//   DialogContentText,
-//   DialogTitle,
-// } from 'material-ui/Dialog';
-
-// import AppBar from 'material-ui/AppBar';
-
-// import getMuiTheme from 'material-ui/styles/getMuiTheme'
-
-
-// import MobileTearSheet from '../../../MobileTearSheet';
-
-// import ActionGrade from 'material-ui/svg-icons/action/grade';
-// import Divider from 'material-ui/Divider';
-// import Avatar from 'material-ui/Avatar';
-
-
-// import PropTypes from 'prop-types';
-
-// import Tabs, { Tab } from 'material-ui/Tabs';
-
-// import Input, { InputLabel } from 'material-ui/Input';
-// import { FormControl, FormHelperText } from 'material-ui/Form';
-
-
 import { IIHOC as DebuggerHOC, stringify } from './ii_debug'
 
-const style = {
-  paper: {
-    display: 'inline-block',
-    float: 'left',
-    margin: '16px 32px 16px 0',
-  },
-  rightIcon: {
-    textAlign: 'center',
-    lineHeight: '24px',
-  },
-};
-/*
-<AppBar
-    title="Title"
-    iconClassNameRight="muidocs-icon-navigation-expand-more"
-  />
-*/
-
-//  https://material-ui-next.com/discover-more/showcase/
-// class TestMaterialDesign extends Component {
-
-// 	// ------------------------------------------------
-// 	// static childContextTypes = {
-//  //        muiTheme: PropTypes.object
-//  //    }
-
-//  //    getChildContext() {
-//  //        return {
-//  //            muiTheme: getMuiTheme()
-//  //        }
-//  //    }
-//     // ------------------------------------------------
-
-//   state = {
-//     open: false,
-//     value: 0,
-//   };
-
-//   handleOpen = () => {
-//     this.setState({open: true});
-//   };
-
-//   handleClose = () => {
-//     this.setState({open: false});
-//   };
-
-//   handleChange = (event, value) => {
-//     this.setState({ value });
-//   };
-//   onGoldRewardInputChange(event) {
-//      this.setState({ goldRewardInput: event.target.value });
-//   }
-//   render() {
-
-//     const {value} = this.state
-
-//     return (
-
-//                   <Dialog
-//                 open={true}
-//                 onClose={this.handleGoldRewardDialogClose}
-//             >
-//               <DialogTitle id="alert-dialog-title">{"奖励设置"}</DialogTitle>
-//                 <DialogContent>
-
-//                       <FormControl aria-describedby="name-error-text">
-//                       <InputLabel htmlFor="goldReward">1请输入奖励的金币数量</InputLabel>
-//                       <Input id="goldReward"  type="number" value={this.state.goldRewardInput} onChange={(e) => this.onGoldRewardInputChange(e)} />
-
-//                     </FormControl>
-//                 </DialogContent>
-//                 <DialogActions>
-//                 </DialogActions>
-//             </Dialog>
-//     );
-//   }
-// }
-// const TestMaterialDesign = () => (
-
-//   <FlatButton label="Primary" primary={true} />
-// );
-
-// export default TestMaterialDesign;
-
-
-
-// --------------------------------------------------------
 // Props Proxy and state abstraction demonstration
 function PPHOC(WrappedComponent) {
   return class PP extends React.Component {
@@ -158,7 +42,7 @@ function PPHOC(WrappedComponent) {
             PP HOC
           </h2>
           <p>Im a Props Proxy HOC that abstracts controlled inputs</p>
-          <WrappedComponent {...props}/>
+          <WrappedComponent {...props} />
         </div>
       )
     }
@@ -181,7 +65,7 @@ class Example extends React.Component {
         <pre>{stringify(this.props)}</pre>
         <form>
           <label>Automatically controlled input!</label>
-          <input type="email" {...this.props.fields('email')}/>
+          <input type="email" {...this.props.fields('email')} />
         </form>
       </div>
     )
@@ -190,6 +74,4 @@ class Example extends React.Component {
 
 const EnhancedExample = DebuggerHOC(PPHOC(Example))
 
-// module.exports = EnhancedExample;
-
 export default EnhancedExample
\ No newline at end of file
diff --git a/src/modules/test/md/ii_debug.js b/src/modules/test/md/ii_debug.js
index 8e015198..5f013a8d 100644
--- a/src/modules/test/md/ii_debug.js
+++ b/src/modules/test/md/ii_debug.js
@@ -23,7 +23,7 @@ export function IIHOC(WrappedComponent) {
       return (
         <div>
           <h2>
-            HOC Debugger Component
+            HOC  Component
           </h2>
           <p>
             Props
diff --git a/src/modules/testpaper/Intecomponents.js b/src/modules/testpaper/Intecomponents.js
index 8776b6a9..3b4f7858 100644
--- a/src/modules/testpaper/Intecomponents.js
+++ b/src/modules/testpaper/Intecomponents.js
@@ -1,18 +1,8 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl} from 'educoder';
+import React, { Component } from "react";
+import { SnackbarHOC } from 'educoder';
 import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb
-} from "antd";
-import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
+import { Breadcrumb } from "antd";
+import { TPMIndexHOC } from "../tpm/TPMIndexHOC";
 import './testioncss/testioncss.css';
 import '../tpm/newshixuns/css/Newshixuns.css';
 import Bottomsubmit from "../../modules/modals/Bottomsubmit";
@@ -29,11 +19,11 @@ class Intecomponents extends Component {
 			knowledgepoints: [],
 			disciplmy: [],
 			item_banksedit: [],
-			newmyshixunmodelbool:false,
-			single_question_count:0,
-			multiple_question_count:0,
-			judgement_question_count:0,
-			program_question_count:0,
+			newmyshixunmodelbool: false,
+			single_question_count: 0,
+			multiple_question_count: 0,
+			judgement_question_count: 0,
+			program_question_count: 0,
 		}
 
 
@@ -111,107 +101,107 @@ class Intecomponents extends Component {
 
 	}
 	//难度
- getdatas=()=>{
-	 if (this.Judquestio.Getdatas().length === 0) {
-		 this.scrollToAnchor("Itembankstopid");
-		 return false;
-	 }
-	 //console.log(this.Judquestio.Getdatas());
-	 var myrbkc=[];
-	 var Getdatasdatas=this.Judquestio.Getdatas()[1].rbzsd;
-	 for(let myda of Getdatasdatas) {
-		 myrbkc.push(myda.id);
-	 }
-	 const url="/examination_intelligent_settings/optinal_items.json";
-    var data={
-			sub_discipline_id:this.Judquestio.Getdatas()[2].rbkc[1],
-			tag_discipline_id:myrbkc,
-	    source:this.Judquestio.Getdatas()[7].rbly,
-			difficulty:this.Judquestio.Getdatas()[0].rbnd,
+	getdatas = () => {
+		if (this.Judquestio.Getdatas().length === 0) {
+			this.scrollToAnchor("Itembankstopid");
+			return false;
+		}
+		//console.log(this.Judquestio.Getdatas());
+		var myrbkc = [];
+		var Getdatasdatas = this.Judquestio.Getdatas()[1].rbzsd;
+		for (let myda of Getdatasdatas) {
+			myrbkc.push(myda.id);
+		}
+		const url = "/examination_intelligent_settings/optinal_items.json";
+		var data = {
+			sub_discipline_id: this.Judquestio.Getdatas()[2].rbkc[1],
+			tag_discipline_id: myrbkc,
+			source: this.Judquestio.Getdatas()[7].rbly,
+			difficulty: this.Judquestio.Getdatas()[0].rbnd,
 		}
 
-	 this.getwangluodata(url,data);
+		this.getwangluodata(url, data);
 
 	}
 	//课程
-	getdatasss=(kech)=>{
+	getdatasss = (kech) => {
 		if (this.Judquestio.Getdatas().length === 0) {
 			this.scrollToAnchor("Itembankstopid");
 			return false;
 		}
 		//console.log(this.Judquestio.Getdatas());
-		var myrbkc=[];
-		var Getdatasdatas=this.Judquestio.Getdatas()[1].rbzsd;
-		for(let myda of Getdatasdatas) {
+		var myrbkc = [];
+		var Getdatasdatas = this.Judquestio.Getdatas()[1].rbzsd;
+		for (let myda of Getdatasdatas) {
 			myrbkc.push(myda.id);
 		}
-		const url="/examination_intelligent_settings/optinal_items.json";
-		var data={
-			sub_discipline_id:kech,
-			tag_discipline_id:myrbkc,
-			source:this.Judquestio.Getdatas()[7].rbly,
-			difficulty:this.Judquestio.Getdatas()[0].rbnd,
+		const url = "/examination_intelligent_settings/optinal_items.json";
+		var data = {
+			sub_discipline_id: kech,
+			tag_discipline_id: myrbkc,
+			source: this.Judquestio.Getdatas()[7].rbly,
+			difficulty: this.Judquestio.Getdatas()[0].rbnd,
 		}
 
-    this.getwangluodata(url,data);
+		this.getwangluodata(url, data);
 
 	}
 	//知识点
-	getdatassss=(zhishidian)=>{
+	getdatassss = (zhishidian) => {
 		if (this.Judquestio.Getdatas().length === 0) {
 			this.scrollToAnchor("Itembankstopid");
 			return false;
 		}
 		//console.log(this.Judquestio.Getdatas());
-		var myrbkc=[];
-		var Getdatasdatas=zhishidian;
-		for(let myda of Getdatasdatas) {
+		var myrbkc = [];
+		var Getdatasdatas = zhishidian;
+		for (let myda of Getdatasdatas) {
 			myrbkc.push(myda.id);
 		}
-		const url="/examination_intelligent_settings/optinal_items.json";
-		var data={
-			sub_discipline_id:this.Judquestio.Getdatas()[2].rbkc[1],
-			tag_discipline_id:myrbkc,
-			source:this.Judquestio.Getdatas()[7].rbly,
-			difficulty:this.Judquestio.Getdatas()[0].rbnd,
+		const url = "/examination_intelligent_settings/optinal_items.json";
+		var data = {
+			sub_discipline_id: this.Judquestio.Getdatas()[2].rbkc[1],
+			tag_discipline_id: myrbkc,
+			source: this.Judquestio.Getdatas()[7].rbly,
+			difficulty: this.Judquestio.Getdatas()[0].rbnd,
 		}
-		this.getwangluodata(url,data);
+		this.getwangluodata(url, data);
 	}
 
 	//来源
-	getdatassssy=(rbly)=>{
+	getdatassssy = (rbly) => {
 		if (this.Judquestio.Getdatas().length === 0) {
 			this.scrollToAnchor("Itembankstopid");
 			return false;
 		}
 		//console.log(this.Judquestio.Getdatas());
-		var myrbkc=[];
-		var Getdatasdatas=this.Judquestio.Getdatas()[1].rbzsd;
-		for(let myda of Getdatasdatas) {
+		var myrbkc = [];
+		var Getdatasdatas = this.Judquestio.Getdatas()[1].rbzsd;
+		for (let myda of Getdatasdatas) {
 			myrbkc.push(myda.id);
 		}
-		const url="/examination_intelligent_settings/optinal_items.json";
-		var data={
-			sub_discipline_id:this.Judquestio.Getdatas()[2].rbkc[1],
-			tag_discipline_id:myrbkc,
-			source:rbly,
-			difficulty:this.Judquestio.Getdatas()[0].rbnd,
+		const url = "/examination_intelligent_settings/optinal_items.json";
+		var data = {
+			sub_discipline_id: this.Judquestio.Getdatas()[2].rbkc[1],
+			tag_discipline_id: myrbkc,
+			source: rbly,
+			difficulty: this.Judquestio.Getdatas()[0].rbnd,
 		}
-		this.getwangluodata(url,data);
+		this.getwangluodata(url, data);
 	}
 
 
-	getwangluodata=(url,data)=>{
-		axios.post(url,data).then((response) => {
+	getwangluodata = (url, data) => {
+		axios.post(url, data).then((response) => {
 			if (response) {
 				//console.log("智能组卷");
 				//console.log(response);
-				if(response.data){
+				if (response.data) {
 					this.setState({
-						single_question_count:response.data.single_question_count,
-						multiple_question_count:response.data.multiple_question_count,
-						judgement_question_count:response.data.judgement_question_count,
-						program_question_count:response.data.program_question_count,
+						single_question_count: response.data.single_question_count,
+						multiple_question_count: response.data.multiple_question_count,
+						judgement_question_count: response.data.judgement_question_count,
+						program_question_count: response.data.program_question_count,
 					})
 
 				}
@@ -220,35 +210,35 @@ class Intecomponents extends Component {
 		});
 	}
 	//难度
-	getdatass=(nandu)=>{
+	getdatass = (nandu) => {
 		if (this.Judquestio.Getdatas().length === 0) {
 			this.scrollToAnchor("Itembankstopid");
 			return false;
 		}
 		//console.log(this.Judquestio.Getdatas());
-		var myrbkc=[];
-		var Getdatasdatas=this.Judquestio.Getdatas()[1].rbzsd;
-		for(let myda of Getdatasdatas) {
+		var myrbkc = [];
+		var Getdatasdatas = this.Judquestio.Getdatas()[1].rbzsd;
+		for (let myda of Getdatasdatas) {
 			myrbkc.push(myda.id);
 		}
-		const url="/examination_intelligent_settings/optinal_items.json";
-		var data={
-			sub_discipline_id:this.Judquestio.Getdatas()[2].rbkc[1],
-			tag_discipline_id:myrbkc,
-			source:this.Judquestio.Getdatas()[7].rbly,
-			difficulty:nandu,
+		const url = "/examination_intelligent_settings/optinal_items.json";
+		var data = {
+			sub_discipline_id: this.Judquestio.Getdatas()[2].rbkc[1],
+			tag_discipline_id: myrbkc,
+			source: this.Judquestio.Getdatas()[7].rbly,
+			difficulty: nandu,
 		}
 
-		axios.post(url,data).then((response) => {
+		axios.post(url, data).then((response) => {
 			if (response) {
 				//console.log("智能组卷");
 				//console.log(response);
-				if(response.data){
+				if (response.data) {
 					this.setState({
-						single_question_count:response.data.single_question_count,
-						multiple_question_count:response.data.multiple_question_count,
-						judgement_question_count:response.data.judgement_question_count,
-						program_question_count:response.data.program_question_count,
+						single_question_count: response.data.single_question_count,
+						multiple_question_count: response.data.multiple_question_count,
+						judgement_question_count: response.data.judgement_question_count,
+						program_question_count: response.data.program_question_count,
 					})
 
 				}
@@ -282,13 +272,41 @@ class Intecomponents extends Component {
 
 	}
 	preservation = () => {
+
+		let mylistcour = 1;
+		try {
+			mylistcour = this.state.single_question_count + this.state.multiple_question_count + this.state.judgement_question_count + this.state.program_question_count
+		} catch (e) {
+
+		}
+		if (mylistcour === 0) {
+			this.props.showNotification(`没有题不能组卷`);
+			return;
+		}
+
+		let arraycour = 1;
+		try {
+			arraycour = this.Judquestio.Getdatas()[3].rbdxt + this.Judquestio.Getdatas()[4].rbdxtx + this.Judquestio.Getdatas()[5].rbpdt + this.Judquestio.Getdatas()[6].rbbct
+
+		} catch (e) {
+
+		}
+
+		if (arraycour === 0) {
+			this.props.showNotification(`没有设置题型及数量不能组卷`);
+			return;
+		}
+
+
+
+
 		if (this.Judquestio.Getdatas().length === 0) {
 			this.scrollToAnchor("Itembankstopid");
 			return;
 		}
-		var myrbkc=[];
-		var Getdatasdatas=this.Judquestio.Getdatas()[1].rbzsd;
-		for(let myda of Getdatasdatas) {
+		var myrbkc = [];
+		var Getdatasdatas = this.Judquestio.Getdatas()[1].rbzsd;
+		for (let myda of Getdatasdatas) {
 			myrbkc.push(myda.id);
 		}
 		// //console.log(myrbkc);
@@ -296,7 +314,7 @@ class Intecomponents extends Component {
 		// //console.log(this.Judquestio.Getdatas());
 
 
-		var question_settings =[
+		var question_settings = [
 			{
 				"item_type": "SINGLE",
 				"count": this.Judquestio.Getdatas()[3].rbdxt
@@ -316,14 +334,14 @@ class Intecomponents extends Component {
 		]
 
 
-    const url="/examination_intelligent_settings.json"
+		const url = "/examination_intelligent_settings.json"
 		var data = {
 			discipline_id: this.Judquestio.Getdatas()[2].rbkc[0],
-			sub_discipline_id:this.Judquestio.Getdatas()[2].rbkc[1],
-			tag_discipline_id:myrbkc,
-		  source:this.Judquestio.Getdatas()[7].rbly,
-			difficulty:this.Judquestio.Getdatas()[0].rbnd,
-			question_settings:question_settings,
+			sub_discipline_id: this.Judquestio.Getdatas()[2].rbkc[1],
+			tag_discipline_id: myrbkc,
+			source: this.Judquestio.Getdatas()[7].rbly,
+			difficulty: this.Judquestio.Getdatas()[0].rbnd,
+			question_settings: question_settings,
 		}
 		axios.post(url, data)
 			.then((result) => {
@@ -332,8 +350,8 @@ class Intecomponents extends Component {
 					this.props.history.push(`/Integeneration/Intelligence/${result.data.exam_setting_id}`);
 				}
 			}).catch((error) => {
-			//console.log(error);
-		})
+				//console.log(error);
+			})
 
 	}
 
@@ -350,12 +368,12 @@ class Intecomponents extends Component {
 		this.contentMdRef = Ref;
 	}
 
-	setnewmyshixunmodelbool=()=>{
+	setnewmyshixunmodelbool = () => {
 
 	}
 
 	render() {
-		let {paperlibrartdata,newmyshixunmodelbool,single_question_count,multiple_question_count,judgement_question_count,program_question_count} = this.state;
+		let { paperlibrartdata, newmyshixunmodelbool, single_question_count, multiple_question_count, judgement_question_count, program_question_count } = this.state;
 		const params = this.props && this.props.match && this.props.match.params;
 		return (
 			<div>
@@ -379,16 +397,16 @@ class Intecomponents extends Component {
 							</Breadcrumb>
 						</div>
 						<Intelligentcomponents {...this.state} {...this.props}
-																	 single_question_count={this.state.single_question_count}
-																	 multiple_question_count={this.state.multiple_question_count}
-																	 judgement_question_count={this.state.judgement_question_count}
-																	 program_question_count={this.state.program_question_count}
-																	 getdatas={()=>this.getdatas()}
-																	 getdatass={(nd)=>this.getdatass(nd)}
-															     getJudquestio={(ref) => this.getJudquestio(ref)}
-																	 getdatasss={(e)=>this.getdatasss(e)}
-																	 getdatassss={(e)=>this.getdatassss(e)}
-																	 getdatassssy={(e)=>this.getdatassssy(e)}
+							single_question_count={this.state.single_question_count}
+							multiple_question_count={this.state.multiple_question_count}
+							judgement_question_count={this.state.judgement_question_count}
+							program_question_count={this.state.program_question_count}
+							getdatas={() => this.getdatas()}
+							getdatass={(nd) => this.getdatass(nd)}
+							getJudquestio={(ref) => this.getJudquestio(ref)}
+							getdatasss={(e) => this.getdatasss(e)}
+							getdatassss={(e) => this.getdatassss(e)}
+							getdatassssy={(e) => this.getdatassssy(e)}
 						></Intelligentcomponents>
 
 
@@ -401,9 +419,9 @@ class Intecomponents extends Component {
 				{
 					newmyshixunmodelbool === true ? "" :
 						<Bottomsubmit {...this.props} {...this.state} bottomvalue={"保存"}
-													Cohetepaperbool={false}
-													setCohetepaperbool={(bool) => this.setCohetepaperbool(bool)}
-													onSubmits={() => this.preservation()} url={'/paperlibrary'}></Bottomsubmit>
+							Cohetepaperbool={false}
+							setCohetepaperbool={(bool) => this.setCohetepaperbool(bool)}
+							onSubmits={() => this.preservation()} url={'/paperlibrary'}></Bottomsubmit>
 				}
 			</div>
 		)
diff --git a/src/modules/testpaper/Paperlibraryeditid.js b/src/modules/testpaper/Paperlibraryeditid.js
index c65191e9..831e84e6 100644
--- a/src/modules/testpaper/Paperlibraryeditid.js
+++ b/src/modules/testpaper/Paperlibraryeditid.js
@@ -1,27 +1,15 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl} from 'educoder';
+import React, { Component } from "react";
+import { SnackbarHOC, queryString } from 'educoder';
 import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb
-} from "antd";
-import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
-import NoneData from './component/NoneData';
+import { Breadcrumb } from "antd";
+
+import { TPMIndexHOC } from "../tpm/TPMIndexHOC";
 import './testioncss/testioncss.css';
 import '../tpm/newshixuns/css/Newshixuns.css';
 import Bottomsubmit from "../../modules/modals/Bottomsubmit";
 import Seeoagertits from "./component/Seeoagertits";
-import Paperlibraryseeid_item from './component/Paperlibraryseeid_item';
 import Comthetestpaperst from '../question/comthetestpaper/Comthetestpaperst';
 import Paperlibraryseeid_itemss from './component/Paperlibraryseeid_itemss';
-import JudquestionEditor from "../question/component/JudquestionEditor";
 import NewMyShixunModel from "../question/NewMyShixunModel";
 
 
@@ -31,12 +19,13 @@ class Paperlibraryeditid extends Component {
 		super(props);
 		this.Judquestio = React.createRef();
 		this.state = {
-			paperlibrartdata: [],
+			Contentdata: [],
 			disciplinesdata: [],
 			knowledgepoints: [],
 			disciplmy: [],
 			item_banksedit: [],
-			newmyshixunmodelbool:false,
+			newmyshixunmodelbool: false,
+			defaultActiveKey: "0",
 		}
 
 
@@ -110,6 +99,26 @@ class Paperlibraryeditid extends Component {
 			}
 		});
 
+		const query = this.props.location.search;
+		const parsed = queryString.parse(query);
+		if (JSON.stringify(parsed) === "{}") {
+			this.setState({
+				defaultActiveKey: "0",
+			})
+		} else {
+			if (parsed.defaultActiveKey === "0") {
+				this.setState({
+					defaultActiveKey: "0",
+				})
+			} else {
+				this.setState({
+					defaultActiveKey: "1",
+				})
+			}
+
+		}
+
+
 	}
 
 
@@ -118,7 +127,7 @@ class Paperlibraryeditid extends Component {
 		axios.get(urls).then((response) => {
 			if (response) {
 				this.setState({
-					paperlibrartdata: response.data,
+					Contentdata: response.data,
 					item_banksedit: response.data.exam,
 				})
 			}
@@ -149,16 +158,16 @@ class Paperlibraryeditid extends Component {
 			this.scrollToAnchor("Itembankstopid");
 			return;
 		}
-		var myrbkc=[];
-		var Getdatasdatas=this.Judquestio.Getdatas()[2].rbzsd;
-		for(let myda of Getdatasdatas) {
+		var myrbkc = [];
+		var Getdatasdatas = this.Judquestio.Getdatas()[2].rbzsd;
+		for (let myda of Getdatasdatas) {
 			myrbkc.push(myda.id);
 		}
 		const url = `/examination_banks/${this.props.match.params.id}.json`;
-		var data={
-			difficulty:this.Judquestio.Getdatas()[0].rbnd,
-			name:this.Judquestio.Getdatas()[4].classroom,
-			duration:this.Judquestio.Getdatas()[5].kssc,
+		var data = {
+			difficulty: this.Judquestio.Getdatas()[0].rbnd,
+			name: this.Judquestio.Getdatas()[4].classroom,
+			duration: this.Judquestio.Getdatas()[5].kssc,
 			discipline_id: this.Judquestio.Getdatas()[3].rbkc[0],
 			sub_discipline_id: this.Judquestio.Getdatas()[3].rbkc[1],
 			tag_discipline_id: myrbkc,
@@ -167,11 +176,11 @@ class Paperlibraryeditid extends Component {
 			.then((result) => {
 				if (result.data.status === 0) {
 					// this.props.showNotification(`试卷更新成功`);
-					this.props.history.push('/paperlibrary');
+					this.props.history.push('/paperlibrary/see/' + this.props.match.params.id);
 				}
 			}).catch((error) => {
-			//console.log(error);
-		})
+				//console.log(error);
+			})
 
 	}
 
@@ -188,46 +197,46 @@ class Paperlibraryeditid extends Component {
 		this.contentMdRef = Ref;
 	}
 
-	setnewmyshixunmodelbool=(bool)=>{
-		if(bool===true){
-			let scrollToTop = window.setInterval(function() {
+	setnewmyshixunmodelbool = (bool) => {
+		if (bool === true) {
+			let scrollToTop = window.setInterval(function () {
 				let pos = window.pageYOffset;
-				if ( pos > 0 ) {
-					window.scrollTo( 0, pos - 20 ); // how far to scroll on each step
+				if (pos > 0) {
+					window.scrollTo(0, pos - 20); // how far to scroll on each step
 				} else {
-					window.clearInterval( scrollToTop );
+					window.clearInterval(scrollToTop);
 				}
 			}, 2);
 		}
 		this.setState({
-			newmyshixunmodelbool:bool
+			newmyshixunmodelbool: bool
 		})
 		this.getdata();
 	}
 
 	render() {
-		let {paperlibrartdata,newmyshixunmodelbool} = this.state;
+		let { Contentdata, newmyshixunmodelbool, defaultActiveKey } = this.state;
 		const params = this.props && this.props.match && this.props.match.params;
-	// //console.log("newmyshixunmodelbool");
-	// //console.log(newmyshixunmodelbool);
+		let urlsysl = `/paperlibrary?defaultActiveKey=${defaultActiveKey}`;
+
 		return (
 			<div>
 				<div id={"Itembankstopid"} className="newMain clearfix intermediatecenter "
 				>
 					{
-						newmyshixunmodelbool===true?
+						newmyshixunmodelbool === true ?
 							<style>{
 								`
 								body{  overflow: hidden !important; }
 								`
 							}</style>
-							:""
+							: ""
 					}
 
 					{
-						newmyshixunmodelbool===true?
+						newmyshixunmodelbool === true ?
 							<div className="fangdatwo">
-							<NewMyShixunModel {...this.state} {...this.props} exam_id={this.props.match.params.id} 	setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}></NewMyShixunModel>
+								<NewMyShixunModel {...this.state} {...this.props} Contentdata={this.state.Contentdata} exam_id={this.props.match.params.id} setnewmyshixunmodelbool={(e) => this.setnewmyshixunmodelbool(e)}></NewMyShixunModel>
 							</div>
 							:
 							""
@@ -246,14 +255,14 @@ class Paperlibraryeditid extends Component {
 					<div className="w1200ms">
 						<div className="w100s mt30">
 							<Breadcrumb separator=">">
-								<Breadcrumb.Item href="/paperlibrary">试卷库</Breadcrumb.Item>
-								<Breadcrumb.Item className={"shubiao"}>公告试卷库</Breadcrumb.Item>
+								<Breadcrumb.Item className={"shubiao"}  >试卷库</Breadcrumb.Item>
+								<Breadcrumb.Item href={urlsysl}>{defaultActiveKey === "1" ? "公开试卷库" : "我的试卷库"}</Breadcrumb.Item>
 								<Breadcrumb.Item className={"shubiao"}>试卷编辑</Breadcrumb.Item>
 							</Breadcrumb>
 						</div>
 						<Comthetestpaperst {...this.state} {...this.props}
-															 item_banksedit={this.state.item_banksedit}
-															 getJudquestio={(ref) => this.getJudquestio(ref)}
+							item_banksedit={this.state.item_banksedit}
+							getJudquestio={(ref) => this.getJudquestio(ref)}
 						></Comthetestpaperst>
 
 
@@ -268,27 +277,27 @@ class Paperlibraryeditid extends Component {
 								}
 							</style>
 							<div className={"seeoagertitscss"}>
-							<Seeoagertits
-								setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}
-								all_score={paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.all_questions_count}
-								all_questions_count={paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.all_score}
-								difficulty={paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.difficulty}
-							>
-							</Seeoagertits>
+								<Seeoagertits
+									setnewmyshixunmodelbool={(e) => this.setnewmyshixunmodelbool(e)}
+									all_score={Contentdata && Contentdata.exam && Contentdata.exam.all_questions_count}
+									all_questions_count={Contentdata && Contentdata.exam && Contentdata.exam.all_score}
+									difficulty={Contentdata && Contentdata.exam && Contentdata.exam.difficulty}
+								>
+								</Seeoagertits>
 							</div>
 							<Paperlibraryseeid_itemss
 								{...this.state}
 								{...this.props}
 								getdata={() => this.getdata()}
-								single_questions={paperlibrartdata && paperlibrartdata.single_questions && paperlibrartdata.single_questions.questions.length > 0 ? paperlibrartdata.single_questions : null}
-								multiple_questions={paperlibrartdata && paperlibrartdata.multiple_questions
-								&& paperlibrartdata.multiple_questions.questions.length > 0 ? paperlibrartdata.multiple_questions : null
+								single_questions={Contentdata && Contentdata.single_questions && Contentdata.single_questions.questions.length > 0 ? Contentdata.single_questions : null}
+								multiple_questions={Contentdata && Contentdata.multiple_questions
+									&& Contentdata.multiple_questions.questions.length > 0 ? Contentdata.multiple_questions : null
 								}
-								judgement_questions={paperlibrartdata && paperlibrartdata.judgement_questions
-								&& paperlibrartdata.judgement_questions.questions.length > 0 ? paperlibrartdata.judgement_questions : null
+								judgement_questions={Contentdata && Contentdata.judgement_questions
+									&& Contentdata.judgement_questions.questions.length > 0 ? Contentdata.judgement_questions : null
 								}
-								program_questions={paperlibrartdata && paperlibrartdata.program_questions
-								&& paperlibrartdata.program_questions.questions.length > 0 ? paperlibrartdata.program_questions : null
+								program_questions={Contentdata && Contentdata.program_questions
+									&& Contentdata.program_questions.questions.length > 0 ? Contentdata.program_questions : null
 								}
 							></Paperlibraryseeid_itemss>
 
@@ -303,8 +312,8 @@ class Paperlibraryeditid extends Component {
 				{
 					newmyshixunmodelbool === true ? "" :
 						<Bottomsubmit {...this.props} {...this.state} bottomvalue={"保存"}
-													setCohetepaperbool={(bool) => this.setCohetepaperbool(bool)}
-													onSubmits={() => this.preservation()} url={'/paperlibrary'}></Bottomsubmit>
+							setCohetepaperbool={(bool) => this.setCohetepaperbool(bool)}
+							onSubmits={() => this.preservation()} url={urlsysl}></Bottomsubmit>
 				}
 			</div>
 		)
diff --git a/src/modules/testpaper/Paperlibraryseeid.js b/src/modules/testpaper/Paperlibraryseeid.js
index aa9263e6..bfecf0cc 100644
--- a/src/modules/testpaper/Paperlibraryseeid.js
+++ b/src/modules/testpaper/Paperlibraryseeid.js
@@ -1,33 +1,30 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl} from 'educoder';
+import React, { Component } from "react";
+import { SnackbarHOC, queryString } from 'educoder';
 import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb
-} from "antd";
-import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
-import NoneData from './component/NoneData';
+import { Breadcrumb } from "antd";
+import { TPMIndexHOC } from "../tpm/TPMIndexHOC";
 import './testioncss/testioncss.css';
 import '../tpm/newshixuns/css/Newshixuns.css';
 import Bottomsubmit from "../../modules/modals/Bottomsubmit";
 import Seeoagertit from "./component/Seeoagertit";
 import Paperlibraryseeid_item from './component/Paperlibraryseeid_item';
+import QuestionModal from "../question/component/QuestionModal";
+import SendTopicsModel from "./component/SendTopicsModel";
 //人工组卷预览
 class Paperlibraryseeid extends Component {
 	constructor(props) {
 		super(props);
 		this.contentMdRef = React.createRef();
 		this.state = {
-			paperlibrartdata:[],
-
-
+			paperlibrartdata: [],
+			defaultActiveKey: "0",
+			modalsType: false,
+			titilesm: "",
+			titiless: "",
+			boolok: "知道了",
+			exercise_id: 0,
+			SendTop: false,
+			paramsid: null,
 		}
 
 
@@ -35,9 +32,25 @@ class Paperlibraryseeid extends Component {
 
 	//初始化
 	componentDidMount() {
-		////console.log("Paperlibraryseeid");
 		this.getdata();
+		const query = this.props.location.search;
+		const parsed = queryString.parse(query);
+		if (JSON.stringify(parsed) === "{}") {
+			this.setState({
+				defaultActiveKey: "0",
+			})
+		} else {
+			if (parsed.defaultActiveKey === "0") {
+				this.setState({
+					defaultActiveKey: "0",
+				})
+			} else {
+				this.setState({
+					defaultActiveKey: "1",
+				})
+			}
 
+		}
 
 	}
 
@@ -73,30 +86,48 @@ class Paperlibraryseeid extends Component {
 	}
 	preservation = () => {
 		//保存试卷
-
-
-
-
+		this.submitInfos(true);
 	}
 
 
-	setitem_type = (item_type) => {
-
-
-	}
-
-	setCohetepaperbool =(bool)=>{
-
-	}
 	getcontentMdRef = (Ref) => {
 		this.contentMdRef = Ref;
 	}
+
+	modalCancel = () => {
+		this.setState({
+			modalsType: false,
+		})
+
+	}
+
+	setDownload = () => {
+		this.setState({
+			modalsType: false,
+		})
+
+	}
+	submitInfos = (bool) => {
+		this.setState({
+			SendTop: bool,
+			paramsid: this.props.match.params.id
+		})
+	}
+
 	render() {
-		let {paperlibrartdata} = this.state;
-		const params = this.props && this.props.match && this.props.match.params;
-		// ////console.log(params);
+		let { paperlibrartdata, defaultActiveKey, modalsType, SendTop, paramsid } = this.state;
+		let urlsysl = `/paperlibrary?defaultActiveKey=${defaultActiveKey}`;
 		return (
 			<div>
+				{SendTop === true ?
+					<SendTopicsModel paramsid={paramsid} visible={SendTop} mypaper={true} {...this.state} {...this.props} submitInfos={(b) => this.submitInfos(b)}></SendTopicsModel> : ""
+				}
+				{
+					modalsType === true ?
+						<QuestionModal {...this.props}{...this.state} modalsType={modalsType} modalCancel={() => this.modalCancel()}
+							setDownload={() => this.setDownload()}></QuestionModal>
+						: ""
+				}
 				<div id={"Itembankstopid"} className="newMain clearfix intermediatecenter "
 				>
 
@@ -112,21 +143,21 @@ class Paperlibraryseeid extends Component {
 					</style>
 					<div className="w1200ms">
 						<div className="w100s mt30">
-									<Breadcrumb separator=">">
-										<Breadcrumb.Item href="/paperlibrary">试卷库</Breadcrumb.Item>
-										<Breadcrumb.Item className={"shubiao"}>公告试卷库</Breadcrumb.Item>
-										<Breadcrumb.Item className={"shubiao"}>试卷查看</Breadcrumb.Item>
-									</Breadcrumb>
+							<Breadcrumb separator=">">
+								<Breadcrumb.Item className={"shubiao"} >试卷库</Breadcrumb.Item>
+								<Breadcrumb.Item href={urlsysl}>{defaultActiveKey === "1" ? "公开试卷库" : "我的试卷库"}</Breadcrumb.Item>
+								<Breadcrumb.Item className={"shubiao"}>试卷查看</Breadcrumb.Item>
+							</Breadcrumb>
 						</div>
 
 						<div className="seesjtit intermediatecenter mt16">
-							{paperlibrartdata&&paperlibrartdata.exam&&paperlibrartdata.exam.name}
+							{paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.name}
 						</div>
 
 						<div className=" clearfix  educontent Contentquestionbankstyle w100s w1200wuh mt19">
 
-							<Seeoagertit all_score={paperlibrartdata&&paperlibrartdata.exam&&paperlibrartdata.exam.all_questions_count}
-													 all_questions_count={paperlibrartdata&&paperlibrartdata.exam&&paperlibrartdata.exam.all_score}
+							<Seeoagertit all_score={paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.all_questions_count}
+								all_questions_count={paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.all_score}
 							>
 
 
@@ -135,17 +166,17 @@ class Paperlibraryseeid extends Component {
 							<Paperlibraryseeid_item
 								{...this.state}
 								{...this.props}
-								getdata={()=>this.getdata()}
-								single_questions={paperlibrartdata&&paperlibrartdata.single_questions&&paperlibrartdata.single_questions.questions.length>0?paperlibrartdata.single_questions:null}
-																			multiple_questions={paperlibrartdata&&paperlibrartdata.multiple_questions
-																			&&paperlibrartdata.multiple_questions.questions.length>0?paperlibrartdata.multiple_questions:null
-																			}
-																			judgement_questions={paperlibrartdata&&paperlibrartdata.judgement_questions
-																			&&paperlibrartdata.judgement_questions.questions.length>0?paperlibrartdata.judgement_questions:null
-																			}
-																			program_questions={paperlibrartdata&&paperlibrartdata.program_questions
-																			&&paperlibrartdata.program_questions.questions.length>0?paperlibrartdata.program_questions:null
-																			}
+								getdata={() => this.getdata()}
+								single_questions={paperlibrartdata && paperlibrartdata.single_questions && paperlibrartdata.single_questions.questions.length > 0 ? paperlibrartdata.single_questions : null}
+								multiple_questions={paperlibrartdata && paperlibrartdata.multiple_questions
+									&& paperlibrartdata.multiple_questions.questions.length > 0 ? paperlibrartdata.multiple_questions : null
+								}
+								judgement_questions={paperlibrartdata && paperlibrartdata.judgement_questions
+									&& paperlibrartdata.judgement_questions.questions.length > 0 ? paperlibrartdata.judgement_questions : null
+								}
+								program_questions={paperlibrartdata && paperlibrartdata.program_questions
+									&& paperlibrartdata.program_questions.questions.length > 0 ? paperlibrartdata.program_questions : null
+								}
 							>
 
 
@@ -169,9 +200,9 @@ class Paperlibraryseeid extends Component {
 
 				</div>
 
-				<Bottomsubmit {...this.props} {...this.state} bottomvalue={"发起考试"}
-											setCohetepaperbool={(bool)=>this.setCohetepaperbool(bool)}
-											onSubmits={() => this.preservation()} url={'/paperlibrary'}></Bottomsubmit>
+				<Bottomsubmit {...this.props} {...this.state} bottomvalue={"发送至课堂"}
+					setCohetepaperbool={(bool) => this.setCohetepaperbool(bool)}
+					onSubmits={() => this.preservation()} url={urlsysl}></Bottomsubmit>
 			</div>
 		)
 
diff --git a/src/modules/testpaper/Testpaperlibrary.js b/src/modules/testpaper/Testpaperlibrary.js
index fe244b9c..6d5de8d9 100644
--- a/src/modules/testpaper/Testpaperlibrary.js
+++ b/src/modules/testpaper/Testpaperlibrary.js
@@ -1,45 +1,40 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl} from 'educoder';
+import React, { Component } from "react";
+import { SnackbarHOC } from 'educoder';
 import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input
-} from "antd";
-import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
-import NoneData from './component/NoneData';
+import { Pagination, } from "antd";
+import { TPMIndexHOC } from "../tpm/TPMIndexHOC";
 import './testioncss/testioncss.css';
 import Contentpart from "./component/Contentpart";
 import SiderBar from "../tpm/SiderBar";
 import Headplugselections from "../question/component/Headplugselections";
 import QuestionModal from "./component/QuestionModal";
 import QuestionModals from "./component/QuestionModals";
+import QuestionModalys from "./component/QuestionModalys";
 class Testpaperlibrary extends Component {
 	constructor(props) {
 		super(props);
 		this.state = {
 			Headertop: "",
-			disciplinesdata:null,
-			discipline_id:null,
-			sub_discipline_id:null,
-			tag_discipline_id:null,
-			public:null,
-			difficulty:null,
-			item_type:null,
-			keywords:null,
-			page:1,
-			per_page:10,
-			booljupyterurls:false,
-			Contentdata:[],
-			items_count:0,
-			defaultActiveKey:"1",
-			modalsTypes:false,
-			modalsType:false,
-			timuid:0,
+			disciplinesdata: null,
+			discipline_id: null,
+			sub_discipline_id: null,
+			tag_discipline_id: null,
+			public: null,
+			difficulty: null,
+			item_type: null,
+			keyword: null,
+			page: 1,
+			per_page: 10,
+			booljupyterurls: false,
+			Contentdata: [],
+			items_count: 0,
+			defaultActiveKey: "1",
+			modalsTypes: false,
+			modalsType: false,
+			timuid: 0,
+			modalsTypeInaudit: false,
+			defaultActiveKeybool: false,
+			auth_role: false,
 		}
 	}
 	getContainer = () => {
@@ -66,89 +61,106 @@ class Testpaperlibrary extends Component {
 		});
 		//获取题库筛选资料
 		let urls = `/disciplines.json`;
-		axios.get(urls, {params: {
-				source:"question"
-			}}).then((response) => {
+		axios.get(urls, {
+			params: {
+				source: "question"
+			}
+		}).then((response) => {
 			if (response) {
 				this.setState({
 					disciplinesdata: response.data.disciplines,
 				})
 			}
 		});
+
+
+
 	}
 
-	paginationonChange=(pages)=>{
+	paginationonChange = (pages) => {
 		this.setState({
-			page:pages
+			page: pages
 		})
-		var data={
-			page:pages,
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+		var data = {
+			page: pages,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
-			keywords: null,
-			per_page:10,
+			keyword: null,
+			per_page: 10,
 		}
 		this.getdata(data);
 	}
 
 	setdatafunsval = (e) => {
 		this.setState({
-			keywords: e.target.value
+			keyword: e.target.value
 		})
 
 	}
 
 	setdatafuns = (value) => {
 		this.setState({
-			keywords: value,
+			keyword: value,
 		})
-		var data={
-			page:this.state.page,
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+		var data = {
+			page: this.state.page,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
-			keywords: value,
-			per_page:10,
+			keyword: value,
+			per_page: 10,
 		}
 		this.getdata(data);
 	}
-	callback = (key) => {
+	callback = (key, bool) => {
+		try {
+			var currenturl = window.location.href;
+			var newUrl = (currenturl.split("?"))[0];
+			window.history.pushState('', '', newUrl + '?defaultActiveKey=' + key);
+		} catch (e) {
+
+		}
+
 		this.setState({
 			defaultActiveKey: key,
-			difficulty:null,
-			keywords:null,
-			page:1,
+			difficulty: null,
+			keyword: null,
+			page: 1,
+			defaultActiveKeybool: bool,
 		})
-		var data={
-			page:1,
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+		var data = {
+			page: 1,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: key,
-			difficulty:null,
-			keywords: null,
-			per_page:10,
+			difficulty: null,
+			keyword: null,
+			per_page: 10,
 		}
 		this.getdata(data);
 	}
 
 	//获取数据
-	getdata=(data)=>{
+	getdata = (data, bool) => {
 		const url = `/examination_banks.json`;
-		this.setState({
-			booljupyterurls:true,
-		})
-		axios.get((url), {params: data}).then((response) => {
-			setTimeout(()=>{
-				this.setState({
-					booljupyterurls:false,
-				})
-			},1000);
+		if (bool) {
+
+		} else {
+			this.setState({
+				booljupyterurls: true,
+			})
+		}
+
+		axios.get((url), { params: data }).then((response) => {
+			this.setState({
+				booljupyterurls: false,
+			})
 			if (response === null || response === undefined) {
 
 				return
@@ -163,92 +175,93 @@ class Testpaperlibrary extends Component {
 			this.setState({
 				Contentdata: response.data,
 				items_count: response.data.exam_count,
+				auth_role: response.data.auth_role,
 			})
 		}).catch((error) => {
 			//////console.log(error)
 			this.setState({
-				booljupyterurls:false,
+				booljupyterurls: false,
 			})
 		});
 
 	}
-	setdiscipline_id=(discipline_id)=>{
+	setdiscipline_id = (discipline_id) => {
 		this.setState({
-			discipline_id:discipline_id,
-			sub_discipline_id:null,
-			tag_discipline_id:null,
-			keywords:null,
+			discipline_id: discipline_id,
+			sub_discipline_id: null,
+			tag_discipline_id: null,
+			keyword: null,
 			page: 1,
-			per_page:10,
+			per_page: 10,
 		})
 		var data = {
-			discipline_id:discipline_id,
-			sub_discipline_id:null,
-			tag_discipline_id:null,
+			discipline_id: discipline_id,
+			sub_discipline_id: null,
+			tag_discipline_id: null,
 			public: this.state.defaultActiveKey,
 			difficulty: this.props.difficulty,
-			keywords: null,
+			keyword: null,
 			page: 1,
-			per_page:10,
+			per_page: 10,
 		};
 		this.getdata(data);
 
 	}
-	setsub_discipline_id=(discipline_id,sub_discipline_id)=>{
+	setsub_discipline_id = (discipline_id, sub_discipline_id) => {
 		this.setState({
-			sub_discipline_id:sub_discipline_id,
-			tag_discipline_id:null,
-			keywords:null,
-			page:1,
-			per_page:10,
+			sub_discipline_id: sub_discipline_id,
+			tag_discipline_id: null,
+			keyword: null,
+			page: 1,
+			per_page: 10,
 		})
 		var data = {
-			discipline_id:discipline_id,
-			sub_discipline_id:sub_discipline_id,
-			tag_discipline_id:null,
+			discipline_id: discipline_id,
+			sub_discipline_id: sub_discipline_id,
+			tag_discipline_id: null,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
-			keywords: null,
-			page:1,
-			per_page:10,
+			keyword: null,
+			page: 1,
+			per_page: 10,
 		};
 		this.getdata(data);
 	}
 
-	settag_discipline_id=(tag_discipline_id)=>{
+	settag_discipline_id = (tag_discipline_id) => {
 		this.setState({
-			tag_discipline_id:tag_discipline_id,
-			keywords:null,
-			page:1,
-			per_page:10,
+			tag_discipline_id: tag_discipline_id,
+			keyword: null,
+			page: 1,
+			per_page: 10,
 		})
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
-			keywords: null,
+			keyword: null,
 			page: 1,
-			per_page:10,
+			per_page: 10,
 		};
 		this.getdata(data);
 	}
 
 
-	modalCancels=()=>{
+	modalCancels = () => {
 		this.setState({
 			modalsTypes: false
 		})
 	}
-	setDownloads=(item_type)=>{
+	setDownloads = (item_type) => {
 		this.Deletebigquestiontype(item_type);
 		this.setState({
 			modalsTypes: false
 		})
 	}
 	//删除大题型
-	Deletebigquestiontype =(item_type)=>{
+	Deletebigquestiontype = (item_type) => {
 
 	}
 	modalCancel = () => {
@@ -279,20 +292,20 @@ class Testpaperlibrary extends Component {
 				if (result.data.status == 0) {
 					// this.props.showNotification(`公开试卷成功`);
 					var data = {
-						discipline_id:this.state.discipline_id,
-						sub_discipline_id:this.state.sub_discipline_id,
-						tag_discipline_id:this.state.tag_discipline_id,
+						discipline_id: this.state.discipline_id,
+						sub_discipline_id: this.state.sub_discipline_id,
+						tag_discipline_id: this.state.tag_discipline_id,
 						public: this.state.defaultActiveKey,
 						difficulty: this.state.difficulty,
-						keywords: this.state.keywords,
+						keyword: this.state.keyword,
 						page: this.state.page,
-						per_page:10,
+						per_page: 10,
 					};
-					this.getdata(data);
+					this.getdata(data, true);
 				}
 			}).catch((error) => {
-			////console.log(error);
-		})
+				////console.log(error);
+			})
 	}
 
 	//删除试卷
@@ -305,16 +318,16 @@ class Testpaperlibrary extends Component {
 					// this.props.showNotification('删除试卷成功');
 					// props.history.push(response.data.right_url)
 					var data = {
-						discipline_id:this.state.discipline_id,
-						sub_discipline_id:this.state.sub_discipline_id,
-						tag_discipline_id:this.state.tag_discipline_id,
+						discipline_id: this.state.discipline_id,
+						sub_discipline_id: this.state.sub_discipline_id,
+						tag_discipline_id: this.state.tag_discipline_id,
 						public: this.state.defaultActiveKey,
 						difficulty: this.state.difficulty,
-						keywords: this.state.keywords,
+						keyword: this.state.keyword,
 						page: this.state.page,
-						per_page:10,
+						per_page: 10,
 					};
-					this.getdata(data);
+					this.getdata(data, true);
 				}
 			})
 			.catch(function (error) {
@@ -325,19 +338,35 @@ class Testpaperlibrary extends Component {
 	showmodels = (id) => {
 		this.setState({
 			modalsType: true,
-			titilesm: "设为公开后，所有成员均可使用试卷",
-			titiless: "是否设置为公开？",
+			titilesm: "在平台审核后，所有成员均可使用试卷",
+			titiless: "是否设置为公开",
 			titbool: true,
 			timuid: id
 		})
 	};
 
-	Testpapereditor=(id)=>{
-		this.props.history.push(`/paperlibrary/edit/${id}`);
+	Testpapereditor = (id) => {
+		try {
+			window.open(`/paperlibrary/edit/${id}?defaultActiveKey=${this.state.defaultActiveKey}`)//试卷新开页
+		} catch (e) {
+			this.props.history.push(`/paperlibrary/edit/${id}?defaultActiveKey=${this.state.defaultActiveKey}`);
+		}
 	}
 
 
+	showmodelsInaudit = (e) => {
+		this.setState({
+			modalsTypeInaudit: true,
+			titilesm: "公开申请已提交，请等待管理员的审核",
+			titiless: "我们将在1-2个工作日内完成审核",
+		})
+	};
 
+	modalsTypeInauditbool = () => {
+		this.setState({
+			modalsTypeInaudit: false,
+		})
+	}
 
 	showmodelysl = (id) => {
 		this.setState({
@@ -349,24 +378,24 @@ class Testpaperlibrary extends Component {
 		})
 	};
 
-	setdifficulty=(difficulty)=>{
+	setdifficulty = (difficulty) => {
 		this.setState({
 			difficulty: difficulty,
 			visiblemys: false,
-			keywords:"",
+			keyword: "",
 			page: 1,
-			per_page:10,
+			per_page: 10,
 		})
 
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: difficulty,
-			keywords:null,
-			page:1,
-			per_page:10,
+			keyword: null,
+			page: 1,
+			per_page: 10,
 		};
 
 		this.getdata(data);
@@ -379,21 +408,21 @@ class Testpaperlibrary extends Component {
 		this.setState({
 			item_type: item_type,
 			visiblemyss: false,
-			keywords:null,
+			keyword: null,
 			page: 1,
-			per_page:10,
+			per_page: 10,
 		})
 
 		var data = {
-			discipline_id:this.state.discipline_id,
-			sub_discipline_id:this.state.sub_discipline_id,
-			tag_discipline_id:this.state.tag_discipline_id,
+			discipline_id: this.state.discipline_id,
+			sub_discipline_id: this.state.sub_discipline_id,
+			tag_discipline_id: this.state.tag_discipline_id,
 			public: this.state.defaultActiveKey,
 			difficulty: this.state.difficulty,
 			item_type: item_type,
-			keywords:"",
+			keyword: "",
 			page: 1,
-			per_page:10,
+			per_page: 10,
 		};
 
 		this.getdata(data);
@@ -403,55 +432,59 @@ class Testpaperlibrary extends Component {
 
 
 	render() {
-		let{Headertop,items_count,page,per_page,modalsTypes,modalsType}=this.state;
-
-		const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-		const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
-		const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
-
+		let { Headertop, items_count, page, per_page, modalsTypes, modalsType, modalsTypeInaudit, auth_role } = this.state;
 
 		return (
 			<div className="newMain clearfix" ref={this.saveContainer}>
 				{
-					modalsTypes===true?
+					modalsTypes === true ?
 						<QuestionModals {...this.props}{...this.state} modalsTypes={modalsTypes} modalCancels={() => this.modalCancels()}
-														setDownloads={(e) => this.setDownloads(e)}></QuestionModals>
-						:""
+							setDownloads={(e) => this.setDownloads(e)}></QuestionModals>
+						: ""
 				}
 				{
-					modalsType===true?
+					modalsType === true ?
 						<QuestionModal {...this.props}{...this.state} modalsType={modalsType} modalCancel={() => this.modalCancel()}
-													 setDownload={() => this.setDownload()}></QuestionModal>
-						:""
+							setDownload={() => this.setDownload()}></QuestionModal>
+						: ""
+				}
+				{
+					modalsTypeInaudit === true ?
+						<QuestionModalys {...this.props}{...this.state} modalsType={modalsTypeInaudit} modalCancel={() => this.modalsTypeInauditbool()}
+							setDownload={() => this.modalsTypeInauditbool()}></QuestionModalys>
+						: ""
 				}
 				{/*试卷库*/}
 				<SiderBar
 					{...this.props}
 					{...this.state}
 					showDrawer={() => this.showDrawer()}
-					Headertop={Headertop}/>
+					Headertop={Headertop} />
 				{/*顶部*/}
 				<Headplugselections {...this.props} {...this.state}
-													 disciplinesdata={this.state.disciplinesdata}
-													 setdiscipline_id={(e)=>this.setdiscipline_id(e)}
-													 setsub_discipline_id={(e,id)=>this.setsub_discipline_id(e,id)}
-													 settag_discipline_id={(e)=>this.settag_discipline_id(e)}
-													 setitem_types={(e) => this.setitem_types(e)}
-													 setdifficulty={(e) => this.setdifficulty(e)}
+					disciplinesdata={this.state.disciplinesdata}
+					setdiscipline_id={(e) => this.setdiscipline_id(e)}
+					setsub_discipline_id={(e, id) => this.setsub_discipline_id(e, id)}
+					settag_discipline_id={(e) => this.settag_discipline_id(e)}
+					setitem_types={(e) => this.setitem_types(e)}
+					setdifficulty={(e) => this.setdifficulty(e)}
 				></Headplugselections>
 				{/*头部*/}
 				<Contentpart
 					{...this.props}
 					{...this.state}
 					Isitapopup={"false"}
-					Testpapereditor={(e)=>this.Testpapereditor(e)}
-					setdifficulty={(e)=>this.setdifficulty(e)}
-					showmodels={(e)=>this.showmodels(e)}
-					showmodelysl={(e)=>this.showmodelysl(e)}
-					setdatafuns={(key)=>this.setdatafuns(key)}
-					callback={(key)=>this.callback(key)}
-					setdatafunsval={(key)=>this.setdatafunsval(key)}
-					setdifficulty={(bool)=>this.setdifficulty(bool)}
+					Testpapereditor={(e) => this.Testpapereditor(e)}
+					setdifficulty={(e) => this.setdifficulty(e)}
+					showmodels={(e) => this.showmodels(e)}
+					showmodelysl={(e) => this.showmodelysl(e)}
+					setdatafuns={(key) => this.setdatafuns(key)}
+					callback={(key, bool) => this.callback(key, bool)}
+					setdatafunsval={(key) => this.setdatafunsval(key)}
+					setdifficulty={(bool) => this.setdifficulty(bool)}
+					showmodelsInaudit={(e) => this.showmodelsInaudit(e)}
+					auth_role={auth_role}
+
 				>
 
 				</Contentpart>
@@ -460,11 +493,11 @@ class Testpaperlibrary extends Component {
 
 
 				{
-					items_count&&items_count>10?
+					items_count && items_count > 10 ?
 						<div className="mb30 clearfix educontent mt40 intermediatecenter">
 							<Pagination showQuickJumper current={page} onChange={this.paginationonChange}
-													pageSize={per_page}
-													total={items_count}></Pagination>
+								pageSize={per_page}
+								total={items_count}></Pagination>
 						</div>
 						:
 						<div className="h30 clearfix educontent mt40 intermediatecenter">
diff --git a/src/modules/testpaper/component/Contentpart.js b/src/modules/testpaper/component/Contentpart.js
index 7df1997c..b122a02f 100644
--- a/src/modules/testpaper/component/Contentpart.js
+++ b/src/modules/testpaper/component/Contentpart.js
@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn,SnackbarHOC,getImageUrl} from 'educoder';
+import {WordsBtn, ActionBtn,SnackbarHOC,getImageUrl,queryString} from 'educoder';
 import axios from 'axios';
 import {
 	notification,
@@ -17,6 +17,8 @@ import NoneDatas from '../component/NoneDatas';
 import Contentquestionbank from "./Contentquestionbank";
 import LoadingSpin from '../../../common/LoadingSpin';
 import Listjihe from "./Listjihe";
+import Certifiedprofessional from "../../modals/Certifiedprofessional";
+import SendTopicsModel from "./SendTopicsModel";
 const { TabPane } = Tabs;
 const Search = Input.Search;
 class Contentpart extends Component {
@@ -24,44 +26,258 @@ class Contentpart extends Component {
 		super(props);
 		this.state = {
 			page:1,
-
+			defaultActiveKeyss:"0",
+			mydisplay:false,
+			occupation:2,
+			isysladmins:false,
+			SendTop:false,
+			paramsid:null,
+			mysauth_roles:false,
+			myPeriofters:false,
 		}
 	}
 	//初始化
 	componentDidMount(){
+		const query = this.props.location.search;
+		const parsed = queryString.parse(query);
+		console.log("Contentpart");
+		console.log(parsed);
+		if(JSON.stringify(parsed)==="{}"){
+			this.setState({
+				defaultActiveKeyss:"0",
+			})
+		}else {
+			if(parsed.defaultActiveKey==="0"){
+				this.setState({
+					defaultActiveKeyss:"0",
+				})
+			}else{
+				this.setState({
+					defaultActiveKeyss:"1",
+				})
+			}
 
+		}
+		let isysladmins=false;
+		if(this.props){
+			if(this.props.current_user){
+				if(this.props.current_user.admin){
+					isysladmins=true;
+				}
+				else if(this.props.current_user.business){
+					isysladmins=true;
+				}
+			}
+		}
+
+
+
+		let auth_roles =this.props.auth_role;
+		let Periofters = false;
+		if (this.props) {
+			if (this.props.current_user) {
+				if (this.props.current_user.admin) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.business) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.is_shixun_marker) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.is_teacher) {
+					Periofters = true;
+				} else if (this.props.current_user.user_identity !== "学生") {
+					Periofters = true;
+				}
+			}
+		}
+
+		this.setState({
+			mysauth_roles:auth_roles,
+			myPeriofters:Periofters,
+		})
 
 	}
 	//跳转人工组卷
 	Mantegeneration=()=>{
-		this.props.history.push('/question');
+		this.props.history.push('/problemset');
 	}
 
 
 	componentDidUpdate(prevProps) {
 		if(prevProps.current_user !== this.props.current_user) {
-			const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-			const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
+			let isysladmins=false;
+			let is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
 			const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
 			let {defaultActiveKey} = this.props;
-			var defaultActiveKeys=defaultActiveKey;
+			let defaultActiveKeys=defaultActiveKey;
+		try {
+			if(this.props){
+				if(this.props.current_user){
+					if(this.props.current_user.admin){
+						isysladmins=true;
+					}
+					else if(this.props.current_user.business){
+						isysladmins=true;
+					}
+				}
+			}
+
+			if(is_teacher===false){
+				if(this.props.current_user.user_identity !=="学生"){
+					//专业人士
+					is_teacher=true
+				}
+			}
+		}catch (e) {
+
+		}
 			if(isysladmins===true||(is_teacher===true&&professional_certification===true)){
 				defaultActiveKeys="0"
 			}else{
 				defaultActiveKeys="1"
 			}
-			this.props.callback(defaultActiveKeys);
+			try {
+				if(this.props.defaultActiveKeybool===false){
+					if (this.state.defaultActiveKeyss==="0"){
+						defaultActiveKeys="0"
+					} else {
+						defaultActiveKeys="1"
+					}
+				}
+			}catch (e) {
+
+			}
+
+
+			this.props.callback(defaultActiveKeys,false);
 		}
 	}
+	HideAddcoursestypess=(i)=>{
+	 try {
+		 if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+			 this.setState({
+				 mydisplay:true,
+				 occupation:i,
+			 })
+		 }
+	 }catch (e) {
+
+	 }
+
+	}
+
+	mydisplayHidedel=()=>{
+		this.setState({
+			mydisplay:false,
+		})
+	}
+	xinzenw=(url,b)=>{
+		if(b===false){
+			//只限制了教师
+				this.HideAddcoursestypess(2);
+				return
+		}
+
+
+		this.props.history.push(url);
+
+	}
+	HideAddcoursestypess=(i)=>{
+		console.log("调用了");
+		this.setState({
+			mydisplay:true,
+			occupation:i,
+		})
+	}
+
+	mydisplayHidedel=()=>{
+		this.setState({
+			mydisplay:false,
+		})
+	}
+
+	Testpapereditor=(e)=>{
+
+
+    	if(this.props.auth_role===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+		this.props.Testpapereditor(e)
+
+	}
+
+	showmodels=(e)=>{
+
+		if(this.props.auth_role===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+		this.props.showmodels(e)
+
+	}
+
+
+	showmodelysl=(e)=>{
+
+		if(this.props.auth_role===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+		this.props.showmodelysl(e)
+
+	}
+
+
+	showmodelsInaudit=(e)=>{
+
+		if(this.props.auth_role===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+		this.props.showmodelsInaudit(e)
+
+	}
+
+	submitInfos=(bool,id)=>{
+		this.setState({
+			SendTop:bool,
+			paramsid:id
+		})
+	}
 
 	render() {
-		let {page}=this.state;
-		let {defaultActiveKey}=this.props;
+		let {page,defaultActiveKeyss,mydisplay,SendTop,paramsid}=this.state;
+		let {defaultActiveKey,defaultActiveKeybool}=this.props;
+    let defaultActiveKeys=defaultActiveKey+'';
 
-
-		const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-		const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
+		let isysladmins=false;
+		let is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
 		const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
+	  try {
+			if(this.props){
+				if(this.props.current_user){
+					if(this.props.current_user.admin){
+						isysladmins=true;
+					}
+					else if(this.props.current_user.business){
+						isysladmins=true;
+					}
+				}
+			}
+
+
+			if(is_teacher===false){
+				if(this.props.current_user.user_identity !=="学生"){
+					//专业人士
+					is_teacher=true
+				}
+			}
+		}catch (e) {
+
+		}
 
 		const contents = (
 			<div  className="questiontypes" style={{
@@ -79,10 +295,61 @@ class Contentpart extends Component {
 			</div>
 		);
 
+		if(defaultActiveKeybool===false){
+			if(defaultActiveKeyss==="0"){
+				defaultActiveKeys="0";
+			}else {
+				defaultActiveKeys="1";
+			}
+		}
+    let auth_roles =this.props.auth_role;
+		let Periofters = false;
+		if (this.props) {
+			if (this.props.current_user) {
+				if (this.props.current_user.admin) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.business) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.is_shixun_marker) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.is_teacher) {
+					Periofters = true;
+				} else if (this.props.current_user.user_identity !== "学生") {
+					Periofters = true;
+				}
+			}
+		}
 
 		return (
 			<div className=" clearfix mt25">
 				<div className="educontent mt10 pb20 w1200s">
+					{
+						mydisplay===true?
+							<Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.mydisplayHidedel} />
+
+							:""
+					}
+					{
+						mydisplay===true||SendTop===true?
+							<style>
+								{
+									`
+									  body{
+            overflow:hidden!important;
+          }
+
+									`
+								}
+							</style>
+
+							:""
+					}
+					{SendTop===true?
+						<SendTopicsModel paramsid={paramsid}  visible={SendTop} mypaper={false} {...this.state} {...this.props} submitInfos={(b,id)=>this.submitInfos(b,id)}></SendTopicsModel>:""
+					}
 					<div className="w1200ms contentparttit" style={{
 						position: "relative",
 					}}>
@@ -106,20 +373,14 @@ class Contentpart extends Component {
 							}
 						</style>
 
-						{
-							isysladmins===true||(is_teacher===true&&professional_certification===true)?
-									<Tabs activeKey={defaultActiveKey} onChange={(e)=>this.props.callback(e)}>
+
+									<Tabs activeKey={defaultActiveKeys} onChange={(e)=>this.props.callback(e,true)}>
 										<TabPane tab="公共" key="1">
 										</TabPane>
 										<TabPane tab="我的" key="0">
 										</TabPane>
 									</Tabs>
-								:
-								<Tabs activeKey={1} onChange={(e)=>this.props.callback(e)}>
-									<TabPane tab="公共" key="1">
-									</TabPane>
-								</Tabs>
-						}
+
 						<div className=" mt19" style={{
 							position:"absolute",
 							top: "0px",
@@ -129,8 +390,20 @@ class Contentpart extends Component {
 							<style>
 								{
 									`
+										
+									
+									.xaxisreverseorder .ant-input-wrapper .ant-input-group-addon .ant-input-lg {
+								 height: 39px !important;
+								 border: 1px solid #d9d9d9!important;
+									 }
+                 .sortinxdirection .ant-input-wrapper .ant-input-group-addon .ant-btn-lg  {
+								 height: 39px !important;
+								 border: 1px solid #d9d9d9!important;
+									 }
+                 
+               
 									.sortinxdirection .ant-input-group-addon{
-									width: 60px !important;
+									width: 48px !important;
 									
 									}
 									
@@ -144,7 +417,7 @@ class Contentpart extends Component {
 									`
 								}
 							</style>
-							<div className={isysladmins===true||(is_teacher===true&&professional_certification===true)?"sortinxdirection":"xaxisreverseorder"}>
+							<div className={Periofters===true?"sortinxdirection":"xaxisreverseorder"}>
 								<Search
 									style={{ width: "347px",marginRight:"60px",}}
 									placeholder="请输入题目名称、内容"
@@ -152,30 +425,34 @@ class Contentpart extends Component {
 									size="large"
 									onInput={(e)=>this.props.setdatafunsval(e)}
 									onSearch={ (value)=>this.props.setdatafuns(value)}
-									value={this.props.keywords}
+									value={this.props.keyword}
 								/>
 
-								{
-									isysladmins===true||(is_teacher===true&&professional_certification===true)?
+								{Periofters===true&&auth_roles===true?
 										<div className="xaxisreverseorder" style={{
 											width:"50%"
 										}}>
-
-											<a href={'/Integeneration'}>
+											<a  onClick={()=>this.xinzenw('/problemset',auth_roles)}>
 												<div className="newbutoonss">
-													<p className="newbutoontess" >智能组卷</p>
-												</div>
-											</a>
-
-											<a href={'/question'} >
-												<div className="newbutoons mr39">
 													<p className="newbutoontess" >人工组卷</p>
 												</div>
 											</a>
-										</div>
-										:""
-								}
 
+											{/*<a  onClick={()=>this.xinzenw('/Integeneration')}>*/}
+											{/*	<div className="newbutoonss">*/}
+											{/*		<p className="newbutoontess" >智能组卷</p>*/}
+											{/*	</div>*/}
+											{/*</a>*/}
+
+											{/*<a  onClick={()=>this.xinzenw('/problemset')}>*/}
+											{/*	<div className="newbutoons mr39">*/}
+											{/*		<p className="newbutoontess" >人工组卷</p>*/}
+											{/*	</div>*/}
+											{/*</a>*/}
+										</div>
+									:
+									""
+								}
 							</div>
 
 						</div>
@@ -218,10 +495,13 @@ class Contentpart extends Component {
 										: this.props.Contentdata.exams.map((object, index) => {
 											return (
 												<Listjihe {...this.state} {...this.props} items={object} key={index}
-																	Testpapereditor={(e)=>this.props.Testpapereditor(e)}
-																	showmodels={(e)=>this.props.showmodels(e)}
-																	showmodelysl={(e)=>this.props.showmodelysl(e)}
+																	Testpapereditor={(e)=>this.Testpapereditor(e)}
+																	showmodels={(e)=>this.showmodels(e)}
+																	showmodelysl={(e)=>this.showmodelysl(e)}
 																	Isitapopup={this.props.Isitapopup}
+																	showmodelsInaudit={(e)=>this.props.showmodelsInaudit(e)}
+																	submitInfos={(b,id)=>this.submitInfos(b,id)}
+																	auth_role={this.props.auth_role}
 												>
 
 												</Listjihe>
diff --git a/src/modules/testpaper/component/Listjihe.js b/src/modules/testpaper/component/Listjihe.js
index 53fc7181..60d608fb 100644
--- a/src/modules/testpaper/component/Listjihe.js
+++ b/src/modules/testpaper/component/Listjihe.js
@@ -1,20 +1,10 @@
 import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn,SnackbarHOC,getImageUrl,markdownToHTML} from 'educoder';
-import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Radio
-} from "antd";
+
+import { getImageUrl} from 'educoder';
+
 import './../testioncss/testioncss.css';
-const tagArray = [
-	'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．',
-	'J．', 'K．', 'L．', 'M．', 'N．', 'O．', 'P．', 'Q．', 'R．',
-	'S．', 'T．', 'U．', 'V．', 'W．', 'X．', 'Y．', 'Z．'
-]
+import Certifiedprofessional from "../../modals/Certifiedprofessional";
+
 class Listjihe extends Component {
 	constructor(props) {
 		super(props);
@@ -23,12 +13,27 @@ class Listjihe extends Component {
 			name:"单选题",
 			nd:"简单",
 			chakanjiexibool:false,
+			mydisplay:false,
+			occupation:2,
+			isysladmins:false,
 		}
 	}
 	//初始化
 	componentDidMount(){
-
-
+		let isysladmins=false;
+		if(this.props){
+			if(this.props.current_user){
+				if(this.props.current_user.admin){
+					isysladmins=true;
+				}
+				else if(this.props.current_user.business){
+					isysladmins=true;
+				}
+			}
+		}
+		this.setState({
+			isysladmins:isysladmins
+		})
 	}
 
 	chakanjiexibool=()=>{
@@ -55,15 +60,38 @@ class Listjihe extends Component {
 
 		this.props.getitem_basketss(id);
 	}
+	HideAddcoursestypess=(i)=>{
+		try {
+			if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false) {
+				this.setState({
+					mydisplay:true,
+					occupation:i,
+				})
+			}
 
+		}catch (e) {
+
+		}
+
+	}
+
+	mydisplayHidedel=()=>{
+		this.setState({
+			mydisplay:false,
+		})
+	}
 
 	gotoseesj=(id)=>{
-		this.props.history.push(`/paperlibrary/see/${id}`);
+		if(this.props.auth_role===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+		this.props.history.push(`/paperlibrary/see/${id}?defaultActiveKey=${this.props.defaultActiveKey}`);
 	}
 
 
 	render() {
-		let {page,name,nd,chakanjiexibool}=this.state;
+		let {page,name,nd,chakanjiexibool,mydisplay}=this.state;
 		let {defaultActiveKey,items}=this.props;
 
 	   const names=	items&&items.name&&items.name;
@@ -73,32 +101,90 @@ class Listjihe extends Component {
 		 const update_times=items&&items.update_time&&items.update_time;
 	   const quotess =items&&items.quotes&&items.quotes;
 	   const authors=items&&items.author&&items.author.name;
+
+		let Periofters = false;
+		let Perioftersbols=false;
+		if (this.props) {
+			if (this.props.current_user) {
+				if (this.props.current_user.admin) {
+					Periofters = true;
+				}
+				else if (this.props.current_user.business) {
+					Perioftersbols = true;
+				}
+			}
+		}
+
+		let auth_roless=false;
+		if(this.props.auth_role){
+			if(this.props.auth_role===true){
+				auth_roless=true;
+			}else{
+				auth_roless=false;
+
+			}
+		}else{
+			auth_roless=false;
+
+		}
 		return (
 			<div className={" borderwdsst  pd20 mb20 intermediatecenter  listjihecolor "} >
+				{
+					mydisplay===true?
+						<Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.mydisplayHidedel} />
+
+						:""
+				}
+				{
+					mydisplay===true?
+						<style>
+							{
+								`
+									  body{
+            overflow:hidden!important;
+          }
+
+									`
+							}
+						</style>
+
+						:""
+				}
         <div className="sortinxdirection w100s">
            <div className="sjimg intermediatecenter">
 						 <img src={getImageUrl("images/educoder/shijuans.png")}  className="imgtp"/>
 					 </div>
            <div className="w100s  verticallayout ml20" >
-						 <div className="w100s " > <p className="sjtitle xiaoshou" onClick={()=>this.gotoseesj(items.id)}>{names}</p></div>
+						 {
+							 auth_roless ?
+								 <div className="w100s " > <a className="sjtitle xiaoshou " title={names} onClick={()=>this.gotoseesj(items.id)}><p className="maxnamewidth100s xiaoshou">{names}</p></a></div>
+								 :
+								 <div className="w100s " > <a className="sjtitle xiaoshout " title={names} ><p className="maxnamewidth100s xiaoshout">{names}</p></a></div>
+						 }
 						 <div className="w100s sortinxdirection mt9">
 							 <p className="sjtitles">试题数：<span >{question_counts}</span></p>
-							 <p className="sjtitles ml48">总分：<span >{total_scores}</span></p>
-							 <p className="sjtitles ml48">难度：<span >{difficultys}</span></p>
+							 <p className="sjtitles ml10">总分：<span >{total_scores}</span></p>
+							 <p className="sjtitles ml10">难度：<span >{difficultys}</span></p>
 						 </div>
 						 <div className="w100s sortinxdirection mt11">
-						 <div  className="w65s  sortinxdirection">
+						 <div  className="w50s  sortinxdirection">
 							 <p className='sjtitlesysl'>
 								 更新时间：<span>{update_times}</span>
 
 							 </p>
-							 <p className='sjtitlesysl ml30'>
-								 使用次数：<span>{quotess}</span>
-							 </p>
+							 {
+								 quotess===null||quotess===undefined||quotess===0?
+									 ""
+									 :
+									 <p className='sjtitlesysl ml20 tknamelengs'>
+										 使用次数：<span className="tknamelengs">{quotess}</span>
+									 </p>
+							 }
+
 							 {
 								 defaultActiveKey===1||defaultActiveKey==="1"?
-									 <p className='sjtitlesysl ml30'>
-										 创建者：<span>{authors}</span>
+									 <p className='sjtitlesysl ml20 tknamelengs'>
+										 创建者：<span className="tknamelengs">{authors}</span>
 									 </p>
 									 :
 									 ""
@@ -109,40 +195,98 @@ class Listjihe extends Component {
 
 							 {
 								 defaultActiveKey===0||defaultActiveKey==="0"?
-							 <div  className="w35s  xaxisreverseorder">
-									 <p className="viewparsings  xiaoshou mr25 "  onClick={()=>this.props.showmodelysl(items.id)}>
-										 <i className="iconfont icon-shanchu1 font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
-										 <span>删除</span>
-									 </p>
+							 <div  className="w50s  xaxisreverseorder">
+								 {
+									 auth_roless?
+										 <p className="selection  xiaoshou" onClick={()=>this.props.submitInfos(true,items.id)}>
+											 <span className=" lh30">发送至课堂</span>
+										 </p>
+										 :""
+								 }
+								 {
+									 items&&items.edit_role&&items.edit_role===true?
+										 <p className={auth_roless?"viewparsings  xiaoshou mr25 ":"viewparsings  xiaoshou  "}  onClick={()=>this.props.showmodelysl(items.id)}>
+											 <i className="iconfont icon-shanchu1 font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+											 <span>删除</span>
+										 </p>
+										 :""
+								 }
 								 {
 									 this.props.Isitapopup&&this.props.Isitapopup==="true"?
 										""
 										:
-										<a >
-											<p className="viewparsings  xiaoshou mr25 "  onClick={()=>this.props.Testpapereditor(items.id)}>
-												<i className="iconfont icon-bianji2 font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
-												<span>编辑</span>
-											</p>
-										</a>
+										 (
+											 items&&items.edit_role&&items.edit_role===true?
+												 <p className="viewparsings  xiaoshou mr25 "  onClick={()=>this.props.Testpapereditor(items.id)}>
+													 <i className="iconfont icon-bianji2 font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+													 <span>编辑</span>
+												 </p>
+												 :""
+										 )
 								 }
 
 								 {
-									 items.public === false ?
-										 <p className="viewparsings  xiaoshou mr25 " onClick={() => this.props.showmodels(items.id)}>
-											 <i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
-											 <span>公开</span>
-										 </p>
-										 :""
+											 items.public==true?
+												 <p className="viewparsings   mr25 ">
+													 <i className="iconfont  icon-dianjiliang font-13 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+													 <span>已公开</span>
+												 </p>
+												 :
+												 items.apply===false?
+													 <p className="viewparsings  xiaoshou mr25 " onClick={() => this.props.showmodels(items.id)}>
+														 <i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+														 <span>公开</span>
+													 </p>
+													 :
+													 <p className="viewparsings  xiaoshou mr25" onClick={(e) => this.props.showmodelsInaudit(e)}>
+														 <i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+														 <span>公开审核中</span>
+													 </p>
 								 }
 							 </div>
-						 :""}
+						    :
+									 <div  className="w50s  xaxisreverseorder">
+										 {
+											 auth_roless?
+												 <p className="selection  xiaoshou" onClick={()=>this.props.submitInfos(true,items.id)}>
+													 <span className=" lh30">发送至课堂</span>
+												 </p>
+												 :''
+										 }
+										 {
+										 items&&items.edit_role&&items.edit_role===true?
+										 <p className={auth_roless?"viewparsings  xiaoshou mr25 ":"viewparsings  xiaoshou  "} onClick={()=>this.props.showmodelysl(items.id)}>
+											 <i className="iconfont icon-shanchu1 font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+											 <span>删除</span>
+										 </p>:
+										 ""
+										 }
+										 {
+											 this.props.Isitapopup && this.props.Isitapopup === "true" ?
+												 ""
+												 :
+												 (
+												  items&&items.edit_role&&items.edit_role===true?
+														 <a >
+															 <p className="viewparsings  xiaoshou mr25 "  onClick={()=>this.props.Testpapereditor(items.id)}>
+																 <i className="iconfont icon-bianji2 font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+																 <span>编辑</span>
+															 </p>
+														 </a>
+														 :""
+												 )
+										 }
+									 </div>
+							 }
 
 
 
 						 </div>
 					 </div>
 
-					 <div className="sjfqks reversedirection">
+					 <div className="sjfqks reversedirection" style={{
+						 display: "none"
+					 }}>
 						 <div className="newbutoonss">
 							 <p className="newbutoontess" >发起考试</p>
 						 </div>
diff --git a/src/modules/testpaper/component/Paperlibraryseeid_item.js b/src/modules/testpaper/component/Paperlibraryseeid_item.js
index 06298299..21b43244 100644
--- a/src/modules/testpaper/component/Paperlibraryseeid_item.js
+++ b/src/modules/testpaper/component/Paperlibraryseeid_item.js
@@ -1,31 +1,9 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, getImageUrl} from 'educoder';
-import {DragDropContext, Draggable, Droppable} from 'react-beautiful-dnd';
+import React, { Component } from "react";
+import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
 import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb
-} from "antd";
 import '../testioncss/testioncss.css';
 import '../../tpm/newshixuns/css/Newshixuns.css';
 import Paperlibraryseeid_items from './Paperlibraryseeid_items';
-
-
-const reorder = (list, startIndex, endIndex) => {
-	const result = Array.from(list);
-	const [removed] = result.splice(startIndex, 1);
-	result.splice(endIndex, 0, removed);
-
-	return result;
-};
-
 class Paperreview_item extends Component {
 	constructor(props) {
 		super(props);
@@ -45,32 +23,14 @@ class Paperreview_item extends Component {
 			judgmentbool: false,
 			programbool: false,
 			paperreviewsingleindex: "无",
-			set_scoreid:null,
-			item_bank_id:null
+			set_scoreid: null,
+			item_bank_id: null
 		}
 
 	}
 
 	//初始化
-	componentDidMount() {
-
-
-	}
-
-
-	preservation = () => {
-
-
-	}
-
-
-	setitem_type = (item_type) => {
-
-
-	}
 	onDragEnd = (result) => {
-		//console.log("单选题");
-		//console.log(result);
 		const ids = this.props.single_questions.questions[result.source.index].id;
 		const positions = this.props.single_questions.questions[result.destination.index].position;
 
@@ -85,8 +45,8 @@ class Paperreview_item extends Component {
 					this.props.getdata();
 				}
 			}).catch((error) => {
-			//console.log(error);
-		})
+				//console.log(error);
+			})
 	}
 
 	onDragEnds = (result) => {
@@ -105,8 +65,8 @@ class Paperreview_item extends Component {
 					this.props.getdata();
 				}
 			}).catch((error) => {
-			//console.log(error);
-		})
+				//console.log(error);
+			})
 
 
 	}
@@ -123,14 +83,14 @@ class Paperreview_item extends Component {
 		}
 		axios.post(url, data)
 			.then((result) => {
-				debugger
+
 				if (result.data.status == 0) {
 					// this.props.showNotification(`拖动成功`);
 					this.props.getdata();
 				}
 			}).catch((error) => {
-			//console.log(error);
-		})
+				//console.log(error);
+			})
 
 	}
 
@@ -151,8 +111,8 @@ class Paperreview_item extends Component {
 					this.props.getdata();
 				}
 			}).catch((error) => {
-			//console.log(error);
-		})
+				//console.log(error);
+			})
 
 	}
 	Singlemagazine = (name, bool) => {
@@ -186,11 +146,11 @@ class Paperreview_item extends Component {
 					this.Singlemagazine("", false);
 				}
 			}).catch((error) => {
-			//console.log(error);
-		})
+				//console.log(error);
+			})
 	}
 
-	setDownloadys=(value)=>{
+	setDownloadys = (value) => {
 		const url = `/item_baskets/${this.state.set_scoreid}/set_score.json`;
 		var data = {
 			score: value,
@@ -203,21 +163,21 @@ class Paperreview_item extends Component {
 					this.Singlemagazines(false);
 				}
 			}).catch((error) => {
-			//console.log(error);
-		})
+				//console.log(error);
+			})
 	}
 
-	Singlemagazines=(bool,id,name)=>{
-		if(bool===true){
+	Singlemagazines = (bool, id, name) => {
+		if (bool === true) {
 			this.setState({
-				set_scoreid:id,
-				modalsTypeys:bool,
+				set_scoreid: id,
+				modalsTypeys: bool,
 				titilesm: name
 			})
-		}else{
+		} else {
 			this.setState({
-				modalsTypeys:bool,
-				set_scoreid:null,
+				modalsTypeys: bool,
+				set_scoreid: null,
 				titilesm: null
 			})
 		}
@@ -245,8 +205,8 @@ class Paperreview_item extends Component {
 				multiplebool: false,
 				judgmentbool: false,
 				programbool: false,
-				paperreviewsingleindex:"无",
-				paperreviewsinglename:"",
+				paperreviewsingleindex: "无",
+				paperreviewsinglename: "",
 
 			})
 
@@ -256,8 +216,8 @@ class Paperreview_item extends Component {
 				multiplebool: true,
 				judgmentbool: false,
 				programbool: false,
-				paperreviewsingleindex:"无",
-				paperreviewsinglename:"",
+				paperreviewsingleindex: "无",
+				paperreviewsinglename: "",
 
 
 			})
@@ -267,8 +227,8 @@ class Paperreview_item extends Component {
 				multiplebool: false,
 				judgmentbool: true,
 				programbool: false,
-				paperreviewsingleindex:"无",
-				paperreviewsinglename:"",
+				paperreviewsingleindex: "无",
+				paperreviewsinglename: "",
 
 			})
 		} else if (name === "PROGRAM") {
@@ -277,8 +237,8 @@ class Paperreview_item extends Component {
 				multiplebool: false,
 				judgmentbool: false,
 				programbool: true,
-				paperreviewsingleindex:"无",
-				paperreviewsinglename:"",
+				paperreviewsingleindex: "无",
+				paperreviewsinglename: "",
 
 			})
 
@@ -286,15 +246,15 @@ class Paperreview_item extends Component {
 	}
 
 	jixuxuantioncli = () => {
-		this.props.history.replace("/question");
+		this.props.history.replace("/problemset");
 	}
 
-	showparagraphs = (e,name) => {
+	showparagraphs = (e, name) => {
 		// //console.log("showparagraphs");
 		// //console.log(e);
 		this.setState({
 			paperreviewsingleindex: e,
-			paperreviewsinglename:name,
+			paperreviewsinglename: name,
 			singlebool: false,
 			multiplebool: false,
 			judgmentbool: false,
@@ -302,7 +262,7 @@ class Paperreview_item extends Component {
 		})
 	}
 
-	Setscore=(id)=>{
+	Setscore = (id) => {
 
 
 	}
@@ -319,7 +279,7 @@ class Paperreview_item extends Component {
 			paperreviewsingleindex,
 			modalsTypeys
 		} = this.state;
-		let {single_questions, multiple_questions, judgement_questions, program_questions, all_score} = this.props;
+		let { single_questions, multiple_questions, judgement_questions, program_questions, all_score } = this.props;
 		return (
 			<div className=" w100s">
 
@@ -334,10 +294,10 @@ class Paperreview_item extends Component {
 
 								<div className="w100s mt20 mb20 postitonrelati">
 									<div
-										className={ "w100s sortinxdirection  intermediatecenterysls mb20"}
-							>
+										className={"w100s sortinxdirection  intermediatecenterysls mb20"}
+									>
 										<p className={"yldxtit"}>一、单选题</p> <p
-										className="ml15 yldxtits">（共{single_questions && single_questions.questions_count}题；共{single_questions && single_questions.questions_score}分）</p>
+											className="ml15 yldxtits">（共{single_questions && single_questions.questions_count}题；共{single_questions && single_questions.questions_score}分）</p>
 									</div>
 
 									<DragDropContext onDragEnd={this.onDragEnd}>
@@ -371,7 +331,7 @@ class Paperreview_item extends Component {
 																				typenamesn={"单选题"}
 																				key={index}
 																				indexs={index}
-																				indexx={index+1}
+																				indexx={index + 1}
 																				indexxy={index}
 																				objectsingle={object}
 																			>
@@ -448,7 +408,7 @@ class Paperreview_item extends Component {
 																				typenamesn={"多选题"}
 																				key={index}
 																				indexs={index}
-																				indexx={index+1}
+																				indexx={index + 1}
 																				indexxy={index}
 																				objectsingle={object}
 																			>
@@ -475,7 +435,7 @@ class Paperreview_item extends Component {
 
 					{
 						judgement_questions && judgement_questions ?
-							<div className={ "backgroudwhites"} style={{
+							<div className={"backgroudwhites"} style={{
 								position: "relative",
 							}}>
 								<div className="w100s  mb20 postitonrelati">
@@ -483,10 +443,10 @@ class Paperreview_item extends Component {
 										className={"w100s sortinxdirection   intermediatecenterysls mb20 "}
 									>
 										<p
-											className={ "yldxtit"}>{single_questions === null && multiple_questions === null ? "一" : single_questions === null && multiple_questions !== null ? "二"
-											: single_questions !== null && multiple_questions === null ? "二"
-												: "三"}、判断题</p> <p
-										className="ml15 yldxtits">（共{judgement_questions && judgement_questions.questions_count}题；共{judgement_questions && judgement_questions.questions_score}分）</p>
+											className={"yldxtit"}>{single_questions === null && multiple_questions === null ? "一" : single_questions === null && multiple_questions !== null ? "二"
+												: single_questions !== null && multiple_questions === null ? "二"
+													: "三"}、判断题</p> <p
+														className="ml15 yldxtits">（共{judgement_questions && judgement_questions.questions_count}题；共{judgement_questions && judgement_questions.questions_score}分）</p>
 									</div>
 
 
@@ -522,7 +482,7 @@ class Paperreview_item extends Component {
 																				typenamesn={"判断题"}
 																				key={index}
 																				indexs={index}
-																				indexx={index+1}
+																				indexx={index + 1}
 																				indexxy={index}
 																				objectsingle={object}
 																			>
@@ -547,7 +507,7 @@ class Paperreview_item extends Component {
 
 					{
 						program_questions && program_questions ?
-							<div className={ "backgroudwhites"} style={{
+							<div className={"backgroudwhites"} style={{
 								position: "relative",
 							}}>
 
@@ -555,7 +515,7 @@ class Paperreview_item extends Component {
 									<div
 										className={"w100s sortinxdirection intermediatecenterysls mb20"}
 									>
-										<p className={ "yldxtit"}>
+										<p className={"yldxtit"}>
 											{single_questions === null && multiple_questions === null && program_questions === null ? "一"
 												: single_questions === null && multiple_questions === null && program_questions !== null ? "二"
 													: single_questions !== null && multiple_questions === null && program_questions === null ? "二"
@@ -565,7 +525,7 @@ class Paperreview_item extends Component {
 																	: single_questions !== null && multiple_questions == null && program_questions !== null ? "三" :
 																		"四"}
 											、编程题</p> <p
-										className="ml15 yldxtits">（共{program_questions && program_questions.questions_count}题；共{program_questions && program_questions.questions_score}分）</p>
+											className="ml15 yldxtits">（共{program_questions && program_questions.questions_count}题；共{program_questions && program_questions.questions_score}分）</p>
 									</div>
 
 
@@ -599,7 +559,7 @@ class Paperreview_item extends Component {
 																			<Paperlibraryseeid_items
 																				key={index}
 																				indexs={index}
-																				indexx={index+1}
+																				indexx={index + 1}
 																				indexxy={index}
 																				typenames={"PROGRAM"}
 																				typenamesn={"编程题"}
diff --git a/src/modules/testpaper/component/Paperlibraryseeid_items.js b/src/modules/testpaper/component/Paperlibraryseeid_items.js
index 7d66a19c..038a838e 100644
--- a/src/modules/testpaper/component/Paperlibraryseeid_items.js
+++ b/src/modules/testpaper/component/Paperlibraryseeid_items.js
@@ -1,21 +1,9 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, getImageUrl, markdownToHTML} from 'educoder';
-import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb,
-	Radio
-} from "antd";
+import React, { Component } from "react";
+import { Radio } from "antd";
 import '../testioncss/testioncss.css';
 import '../../tpm/newshixuns/css/Newshixuns.css';
-import QuillForEditor from "../../../common/quillForEditor";
+import QuestionModalPicture from "../../question/component/QuestionModalPicture";
+import RenderHtml from "../../../components/render-html";
 
 const tagArray = [
 	'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．',
@@ -24,6 +12,7 @@ const tagArray = [
 ]
 
 //单选题
+//Paperreview_single.js Listjihe.js
 class Paperlibraryseeid_items extends Component {
 	constructor(props) {
 		super(props);
@@ -32,66 +21,60 @@ class Paperlibraryseeid_items extends Component {
 			questions: 0,
 			totalscore: 0,
 			total: 0,
+			url: ""
 		}
 
 	}
 
 	//初始化
-	componentDidMount() {
-
-
+	handleShowUploadImage = (url) => {
+		// setUrl(url);
+		this.setState({
+			url: url
+		})
 	}
-
-
-	getdata = (data) => {
-
+	handleClose = () => {
+		this.setState({
+			url: '',
+		})
 	}
-
-	preservation = () => {
-
-
-	}
-
-
-	setitem_type = (item_type) => {
-
-
-	}
-	showparagraph = (indexx) => {
-
-
-	}
-	Singlemagaziness = () => {
-
-	}
-
 	render() {
-		let {questions, totalscore, total, items} = this.state;
-		let {objectsingle, indexx, paperreviewsingleindex, indexxy,name} = this.props;
+		let { questions, totalscore, total, items, url } = this.state;
+		let { objectsingle, indexx, paperreviewsingleindex, indexxy, name } = this.props;
 
 
-		var itemssname="";
-		try {
-			itemssname= JSON.parse(objectsingle.name);
-		}catch (e) {
-		}
-		if(itemssname===undefined){
-			itemssname=objectsingle.name
+		var itemssname = objectsingle.name
+
+		if (itemssname) {
+			try {
+				itemssname = JSON.parse(itemssname);
+			} catch (e) {
+				itemssname = objectsingle.name
+			}
 		}
 
-		var itemsnamesy="";
-		try {
-			itemsnamesy= JSON.parse(objectsingle&&objectsingle.program_attr&&objectsingle.program_attr.description);
 
-		}catch (e) {
-			itemsnamesy=objectsingle&&objectsingle.program_attr&&objectsingle.program_attr.description;
+		var itemsnamesy = objectsingle && objectsingle.program_attr && objectsingle.program_attr.description;
+		if (itemsnamesy) {
+			try {
+				itemsnamesy = JSON.parse(itemsnamesy);
+			} catch (e) {
+				itemsnamesy = objectsingle && objectsingle.program_attr && objectsingle.program_attr.description;
+			}
+
 		}
+
 		return (
 			<div key={indexxy}
-					 className={ "w100s borderwdswuh   mb20  pd20 "}
-					 style={{
-				minHeight: "114px",
-			}}>
+				className={"w100s borderwdswuh   mb20  pd20 "}
+				style={{
+					minHeight: "114px",
+				}}>
+				{url ?
+					<QuestionModalPicture  {...this.props} {...this.state} handleClose={() => this.handleClose()}></QuestionModalPicture>
+					:
+					""
+				}
 				<style>{
 					`
 						.programquill .ql-editor{
@@ -117,55 +100,63 @@ class Paperlibraryseeid_items extends Component {
 				{/*顶部*/}
 				<div className="w100s sortinxdirection ">
 					<div className=" sortinxdirection ">
-						<p className="cretitlecolrlis lh28">{indexx}</p>、
+						<p className="cretitlecolrlis lh28" style={{ fontWeight: "bold" }}>{indexx}</p>、
 					</div>
 					<style>
 						{
 							`
-					.markdown-body{
+					.listjihetixingstit{
 					   color: #333333;
              font-size: 14px !important;
                  line-height: 28px;
 
 					}
-					.markdown-body p {
+					.listjihetixingstit p {
 					 color: #333333;
 					 font-size: 14px !important;
 					     line-height: 28px;
+					     font-weight: bold;
 
 					}
+					
+						.bodyysls .ql-editor p span{
+							    font-weight: bold;
+						}
+					.markdown-body .ql-editor p {
+							     font-weight: bold;
+						}
 					`
 						}
 					</style>
 					{
-						objectsingle.item_type==="PROGRAM"?
-							<div className="w100s sortinxdirection">
-								<div className=" tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word",
-									minWidth:"32px"
+						objectsingle.item_type === "PROGRAM" ?
+							<div className="w100s sortinxdirection ">
+								<div className=" tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{
+									wordBreak: "break-word",
+									minWidth: "32px", fontWeight: "bold"
 								}}
 								>
 									({objectsingle.score}分)
 								</div>
-								<div className="ml10 lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word"}}
-										 dangerouslySetInnerHTML={{__html: markdownToHTML(objectsingle.name).replace(/▁/g, "▁▁▁")}}>
-
-								</div>
+								<RenderHtml className="ml10 lh28 listjihetixingstit cretitlecolrlist " value={itemssname} />
 							</div>
 							:
 							<div className="w100s sortinxdirection">
-								<div className="tites  lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word",
-									minWidth:"32px"}}
+								<div className="tites  lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{
+									wordBreak: "break-word",
+									minWidth: "32px", fontWeight: "bold"
+								}}
 								>
 									({objectsingle.score}分)
 								</div>
-								<div className="ml10 lh28 listjihetixingstit  cretitlecolrlist programquill" style={{wordBreak: "break-word"}}
-								>
-									<QuillForEditor
-										readOnly={true}
-										value={itemssname}
-									/>
+								{
+									itemssname === null || itemssname === undefined ?
+										""
+										:
+										<RenderHtml className="ml10 lh28 listjihetixingstit cretitlecolrlist " value={itemssname} />
+								}
+
 
-								</div>
 							</div>
 					}
 
@@ -180,7 +171,7 @@ class Paperlibraryseeid_items extends Component {
 									objectsingle === undefined || objectsingle === null ? "" : objectsingle.choices.map((object, index) => {
 										return (
 											<p className={index === 1 ? "sortinxdirection  ml10" : "sortinxdirection  "}>
-												<Radio  disabled={true} >
+												<Radio disabled={true} >
 													{object.choice_text}
 												</Radio>
 											</p>
@@ -193,42 +184,45 @@ class Paperlibraryseeid_items extends Component {
 								<p className="w100s listjihetixingstitssy sortinxdirection ">
 									<p className={"sortinxdirection  mt15"}>
 										{
-											objectsingle&&objectsingle.program_attr&&objectsingle.program_attr.description?
-												<p className="programquill" style={{wordBreak: "break-word"}}
+											objectsingle && objectsingle.program_attr && objectsingle.program_attr.description ?
+												<p className="programquill" style={{ wordBreak: "break-word" }}
 												>
-													<QuillForEditor
-														readOnly={true}
-														value={itemsnamesy}
-													/>
+													{
+														itemsnamesy === null || itemsnamesy === undefined ?
+															null
+															:
+															<RenderHtml value={itemsnamesy} />
+													}
 												</p>
 												:
-												""}
+												null}
 									</p>
 								</p>
 								:
 								<p className="w100s listjihetixingstits verticallayout ">
 									{
 										objectsingle === undefined || objectsingle === null ? "" : objectsingle.choices.map((object, index) => {
-											var string=""
-											try {
-												string=JSON.parse(object.choice_text);
-											}catch (e) {
-												string=object.choice_text;
+											var string = object.choice_text;
+
+											if (string) {
+												try {
+													string = JSON.parse(string);
+												} catch (e) {
+													string = object.choice_text;
+												}
+
 											}
 											return (
 												<p className={index === 0 ? "sortinxdirection" : "sortinxdirection  mt15"}>
 													{tagArray[index]}
-													<p className="programquills" style={{wordBreak: "break-word"}}>
+													<p className="programquills" style={{ wordBreak: "break-word" }}>
 														{object ?
-															object.choice_text === undefined || object.choice_text=== null || object.choice_text === "" ?
-																""
+															object.choice_text === undefined || object.choice_text === null || object.choice_text === "" ?
+																null
 																:
-																object.choice_text.length>0?
-																	<QuillForEditor
-																		readOnly={true}
-																		value={string}
-																	/>
-																	:""
+																object.choice_text.length > 0 ?
+																	<RenderHtml value={string} />
+																	: ""
 															:
 															""
 														}
diff --git a/src/modules/testpaper/component/Paperlibraryseeid_itemss.js b/src/modules/testpaper/component/Paperlibraryseeid_itemss.js
index b725b4e5..2abe8c8b 100644
--- a/src/modules/testpaper/component/Paperlibraryseeid_itemss.js
+++ b/src/modules/testpaper/component/Paperlibraryseeid_itemss.js
@@ -1,20 +1,8 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, getImageUrl} from 'educoder';
+import React, { Component } from "react";
 import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb
-} from "antd";
 import '../../question/questioncss/questioncom.css';
 import '../../tpm/newshixuns/css/Newshixuns.css';
-import {DragDropContext, Draggable, Droppable} from 'react-beautiful-dnd';
+import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
 import PaperDeletModel from '../../question/component/PaperDeletModel';
 import PaperDeletModels from '../../question/component/PaperDeletModels';
 import Paperreview_itemModel from '../../question/component/Paperreview_itemModel';
@@ -22,14 +10,6 @@ import Paperreview_itemModels from '../../question/component/Paperreview_itemMod
 import Paperlibraryseeid_itemsss from './Paperlibraryseeid_itemsss';
 
 
-const reorder = (list, startIndex, endIndex) => {
-	const result = Array.from(list);
-	const [removed] = result.splice(startIndex, 1);
-	result.splice(endIndex, 0, removed);
-
-	return result;
-};
-
 //这不是唯一的 试题库还有 Paperreview_item.js
 class Paperlibraryseeid_itemss extends Component {
 	constructor(props) {
@@ -50,8 +30,8 @@ class Paperlibraryseeid_itemss extends Component {
 			judgmentbool: false,
 			programbool: false,
 			paperreviewsingleindex: "无",
-			set_scoreid:null,
-			item_bank_id:null
+			set_scoreid: null,
+			item_bank_id: null
 		}
 
 	}
@@ -93,15 +73,15 @@ class Paperlibraryseeid_itemss extends Component {
 					this.props.getdata({});
 				}
 			}).catch((error) => {
-			//console.log(error);
-		})
+				//console.log(error);
+			})
 	}
 
 	onDragEnds = (result) => {
 
 		const ids = this.props.multiple_questions.questions[result.source.index].id;
 		const positions = this.props.multiple_questions.questions[result.destination.index].position;
-		const url =`/examination_items/${ids}/adjust_position.json`;
+		const url = `/examination_items/${ids}/adjust_position.json`;
 		var data = {
 			position: positions
 		}
@@ -112,8 +92,8 @@ class Paperlibraryseeid_itemss extends Component {
 					this.props.getdata({});
 				}
 			}).catch((error) => {
-			//console.log(error);
-		})
+				//console.log(error);
+			})
 
 
 	}
@@ -133,8 +113,8 @@ class Paperlibraryseeid_itemss extends Component {
 					this.props.getdata({});
 				}
 			}).catch((error) => {
-			//console.log(error);
-		})
+				//console.log(error);
+			})
 
 	}
 
@@ -153,8 +133,8 @@ class Paperlibraryseeid_itemss extends Component {
 					this.props.getdata({});
 				}
 			}).catch((error) => {
-			//console.log(error);
-		})
+				//console.log(error);
+			})
 
 	}
 	Singlemagazine = (name, bool) => {
@@ -176,7 +156,7 @@ class Paperlibraryseeid_itemss extends Component {
 	setDownloady = (fenshu) => {
 		const url = "/examination_items/batch_set_score.json";
 		var data = {
-			exam_id:this.props.match.params.id,
+			exam_id: this.props.match.params.id,
 			score: fenshu,
 			item_type: this.state.titilesm === "单选题" ? "SINGLE" : this.state.titilesm === "多选题" ? "MULTIPLE" : this.state.titilesm === "判断题" ? "JUDGMENT" : this.state.titilesm === "编程题" ? "PROGRAM" : '',
 
@@ -189,11 +169,11 @@ class Paperlibraryseeid_itemss extends Component {
 					this.Singlemagazine("", false);
 				}
 			}).catch((error) => {
-			//console.log(error);
-		})
+				//console.log(error);
+			})
 	}
 
-	setDownloadys=(value)=>{
+	setDownloadys = (value) => {
 		const url = `/examination_items/${this.state.set_scoreid}/set_score.json`;
 		var data = {
 			score: value,
@@ -206,21 +186,21 @@ class Paperlibraryseeid_itemss extends Component {
 					this.Singlemagazines(false);
 				}
 			}).catch((error) => {
-			//console.log(error);
-		})
+				//console.log(error);
+			})
 	}
 
-	Singlemagazines=(bool,id,name)=>{
-		if(bool===true){
+	Singlemagazines = (bool, id, name) => {
+		if (bool === true) {
 			this.setState({
-				set_scoreid:id,
-				modalsTypeys:bool,
+				set_scoreid: id,
+				modalsTypeys: bool,
 				titilesm: name
 			})
-		}else{
+		} else {
 			this.setState({
-				modalsTypeys:bool,
-				set_scoreid:null,
+				modalsTypeys: bool,
+				set_scoreid: null,
 				titilesm: null
 			})
 		}
@@ -240,11 +220,11 @@ class Paperlibraryseeid_itemss extends Component {
 			})
 			const url = `/examination_items/delete_item_type.json`;
 			axios.delete((url), {
-					data: {
-						exam_id:this.props.match.params.id,
-						item_type: names
-					}
-				})
+				data: {
+					exam_id: this.props.match.params.id,
+					item_type: names
+				}
+			})
 				.then((response) => {
 					if (response.data.status == 0) {
 						// this.props.showNotification('大题删除成功');
@@ -269,7 +249,7 @@ class Paperlibraryseeid_itemss extends Component {
 			this.setState({
 				modalsTypedels: bool,
 			})
-		}else {
+		} else {
 			//确定
 			const url = `/examination_items/${this.state.item_bank_id}.json`;
 			axios.delete((url))
@@ -290,12 +270,13 @@ class Paperlibraryseeid_itemss extends Component {
 
 	}
 
-	showsetmodalsTypedels=(id,bool,type)=>{
-		debugger
+	showsetmodalsTypedels = (id, bool, type) => {
+		console.log("Paperlibraryseeid_itemss");
+
 		this.setState({
-			item_bank_id:id,
+			item_bank_id: id,
 		})
-		this.setmodalsTypedels(bool,type);
+		this.setmodalsTypedels(bool, type);
 	}
 
 	hideparagraph = (name) => {
@@ -319,8 +300,8 @@ class Paperlibraryseeid_itemss extends Component {
 				multiplebool: false,
 				judgmentbool: false,
 				programbool: false,
-				paperreviewsingleindex:"无",
-				paperreviewsinglename:"",
+				paperreviewsingleindex: "无",
+				paperreviewsinglename: "",
 
 			})
 
@@ -330,8 +311,8 @@ class Paperlibraryseeid_itemss extends Component {
 				multiplebool: true,
 				judgmentbool: false,
 				programbool: false,
-				paperreviewsingleindex:"无",
-				paperreviewsinglename:"",
+				paperreviewsingleindex: "无",
+				paperreviewsinglename: "",
 
 
 			})
@@ -341,8 +322,8 @@ class Paperlibraryseeid_itemss extends Component {
 				multiplebool: false,
 				judgmentbool: true,
 				programbool: false,
-				paperreviewsingleindex:"无",
-				paperreviewsinglename:"",
+				paperreviewsingleindex: "无",
+				paperreviewsinglename: "",
 
 			})
 		} else if (name === "PROGRAM") {
@@ -351,8 +332,8 @@ class Paperlibraryseeid_itemss extends Component {
 				multiplebool: false,
 				judgmentbool: false,
 				programbool: true,
-				paperreviewsingleindex:"无",
-				paperreviewsinglename:"",
+				paperreviewsingleindex: "无",
+				paperreviewsinglename: "",
 
 			})
 
@@ -360,15 +341,15 @@ class Paperlibraryseeid_itemss extends Component {
 	}
 
 	jixuxuantioncli = () => {
-		this.props.history.replace("/question");
+		this.props.history.replace("/problemset");
 	}
 
-	showparagraphs = (e,name) => {
+	showparagraphs = (e, name) => {
 		// //console.log("showparagraphs");
 		// //console.log(e);
 		this.setState({
 			paperreviewsingleindex: e,
-			paperreviewsinglename:name,
+			paperreviewsinglename: name,
 			singlebool: false,
 			multiplebool: false,
 			judgmentbool: false,
@@ -376,7 +357,7 @@ class Paperlibraryseeid_itemss extends Component {
 		})
 	}
 
-	Setscore=(id)=>{
+	Setscore = (id) => {
 
 
 	}
@@ -393,32 +374,32 @@ class Paperlibraryseeid_itemss extends Component {
 			paperreviewsingleindex,
 			modalsTypeys
 		} = this.state;
-		let {single_questions, multiple_questions, judgement_questions, program_questions, all_score} = this.props;
+		let { single_questions, multiple_questions, judgement_questions, program_questions, all_score } = this.props;
 		return (
 			<div className=" w100s  ">
 				{
 					modalsTypedel === true ?
 						<PaperDeletModel {...this.state} {...this.props}
-														 setmodalsTypedel={(bool, type, name) => this.setmodalsTypedel(bool, type, name)}></PaperDeletModel>
+							setmodalsTypedel={(bool, type, name) => this.setmodalsTypedel(bool, type, name)}></PaperDeletModel>
 						: ""
 				}
 				{
 					modalsTypey === true ?
 						<Paperreview_itemModel {...this.state} {...this.props} setDownloady={(fs) => this.setDownloady(fs)}
-																	 Singlemagazine={(name, bool) => this.Singlemagazine(name, bool)}></Paperreview_itemModel>
+							Singlemagazine={(name, bool) => this.Singlemagazine(name, bool)}></Paperreview_itemModel>
 						: ""
 				}
 
 				{
 					modalsTypeys === true ?
 						<Paperreview_itemModels {...this.state} {...this.props} setDownloadys={(value) => this.setDownloadys(value)}
-																		Singlemagazines={(bool,id,name) => this.Singlemagazines(bool,id,name)}></Paperreview_itemModels>
+							Singlemagazines={(bool, id, name) => this.Singlemagazines(bool, id, name)}></Paperreview_itemModels>
 						: ""
 				}
 				{
 					modalsTypedels === true ?
 						<PaperDeletModels {...this.state} {...this.props}
-															setmodalsTypedels={(id,bool, type) => this.setmodalsTypedels(id,bool, type)}></PaperDeletModels>
+							setmodalsTypedels={(id, bool, type) => this.setmodalsTypedels(id, bool, type)}></PaperDeletModels>
 						: ""
 				}
 				<div className="w100s mt20 mb20 backgroudwhites" style={{
@@ -436,7 +417,7 @@ class Paperlibraryseeid_itemss extends Component {
 										className={singlebool === true ? "w100s sortinxdirection borderwdswuhques intermediatecenterysls" : "w100s sortinxdirection  intermediatecenterysls"}
 										onMouseEnter={() => this.showparagraph("SINGLE")} onMouseLeave={() => this.hideparagraph("SINGLE")}>
 										<p className={singlebool === true ? "ml18 yldxtit" : "yldxtit"}>一、单选题</p> <p
-										className="ml15 yldxtits">（共{single_questions && single_questions.questions_count}题；共{single_questions && single_questions.questions_score}分）</p>
+											className="ml15 yldxtits">（共{single_questions && single_questions.questions_count}题；共{single_questions && single_questions.questions_score}分）</p>
 									</div>
 									{
 										singlebool === true ?
@@ -478,9 +459,9 @@ class Paperlibraryseeid_itemss extends Component {
 																				indexs={index}
 																				typenames={"SINGLE"}
 																				typenamesn={"单选题"}
-																				showsetmodalsTypedels={(id,bool,type)=>this.showsetmodalsTypedels(id,bool,type)}
-																				Singlemagazines={(bool,id,name)=>this.Singlemagazines(bool,id,name)}
-																				showparagraphs={(e,name) => this.showparagraphs(e,name)}
+																				showsetmodalsTypedels={(id, bool, type) => this.showsetmodalsTypedels(id, bool, type)}
+																				Singlemagazines={(bool, id, name) => this.Singlemagazines(bool, id, name)}
+																				showparagraphs={(e, name) => this.showparagraphs(e, name)}
 																				object={object}
 																				hideparagraphs={() => this.hideparagraphs()}
 																			>
@@ -570,9 +551,9 @@ class Paperlibraryseeid_itemss extends Component {
 																				indexs={index}
 																				typenames={"MULTIPLE"}
 																				typenamesn={"多选题"}
-																				showsetmodalsTypedels={(id,bool,type)=>this.showsetmodalsTypedels(id,bool,type)}
-																				Singlemagazines={(bool,id,name)=>this.Singlemagazines(bool,id,name)}
-																				showparagraphs={(e,name) => this.showparagraphs(e,name)}
+																				showsetmodalsTypedels={(id, bool, type) => this.showsetmodalsTypedels(id, bool, type)}
+																				Singlemagazines={(bool, id, name) => this.Singlemagazines(bool, id, name)}
+																				showparagraphs={(e, name) => this.showparagraphs(e, name)}
 																				object={object}
 																				hideparagraphs={() => this.hideparagraphs()}
 																			>
@@ -610,9 +591,9 @@ class Paperlibraryseeid_itemss extends Component {
 										onMouseLeave={() => this.hideparagraph("JUDGMENT")}>
 										<p
 											className={judgmentbool === true ? "ml18 yldxtit" : "yldxtit"}>{single_questions === null && multiple_questions === null ? "一" : single_questions === null && multiple_questions !== null ? "二"
-											: single_questions !== null && multiple_questions === null ? "二"
-												: "三"}、判断题</p> <p
-										className="ml15 yldxtits">（共{judgement_questions && judgement_questions.questions_count}题；共{judgement_questions && judgement_questions.questions_score}分）</p>
+												: single_questions !== null && multiple_questions === null ? "二"
+													: "三"}、判断题</p> <p
+														className="ml15 yldxtits">（共{judgement_questions && judgement_questions.questions_count}题；共{judgement_questions && judgement_questions.questions_score}分）</p>
 									</div>
 									{
 										judgmentbool === true ?
@@ -657,9 +638,9 @@ class Paperlibraryseeid_itemss extends Component {
 																				indexs={index}
 																				typenames={"JUDGMENT"}
 																				typenamesn={"判断题"}
-																				showsetmodalsTypedels={(id,bool,type)=>this.showsetmodalsTypedels(id,bool,type)}
-																				Singlemagazines={(bool,id,name)=>this.Singlemagazines(bool,id,name)}
-																				showparagraphs={(e,name) => this.showparagraphs(e,name)}
+																				showsetmodalsTypedels={(id, bool, type) => this.showsetmodalsTypedels(id, bool, type)}
+																				Singlemagazines={(bool, id, name) => this.Singlemagazines(bool, id, name)}
+																				showparagraphs={(e, name) => this.showparagraphs(e, name)}
 																				object={object}
 																				hideparagraphs={() => this.hideparagraphs()}
 																			>
@@ -704,7 +685,7 @@ class Paperlibraryseeid_itemss extends Component {
 																	: single_questions !== null && multiple_questions == null && program_questions !== null ? "三" :
 																		"四"}
 											、编程题</p> <p
-										className="ml15 yldxtits">（共{program_questions && program_questions.questions_count}题；共{program_questions && program_questions.questions_score}分）</p>
+											className="ml15 yldxtits">（共{program_questions && program_questions.questions_count}题；共{program_questions && program_questions.questions_score}分）</p>
 									</div>
 									{
 										programbool === true ?
@@ -749,9 +730,9 @@ class Paperlibraryseeid_itemss extends Component {
 																				indexs={index}
 																				typenames={"PROGRAM"}
 																				typenamesn={"编程题"}
-																				showsetmodalsTypedels={(id,bool,type)=>this.showsetmodalsTypedels(id,bool,type)}
-																				Singlemagazines={(bool,id,name)=>this.Singlemagazines(bool,id,name)}
-																				showparagraphs={(e,name) => this.showparagraphs(e,name)}
+																				showsetmodalsTypedels={(id, bool, type) => this.showsetmodalsTypedels(id, bool, type)}
+																				Singlemagazines={(bool, id, name) => this.Singlemagazines(bool, id, name)}
+																				showparagraphs={(e, name) => this.showparagraphs(e, name)}
 																				object={object}
 																				hideparagraphs={() => this.hideparagraphs()}
 																			>
diff --git a/src/modules/testpaper/component/Paperlibraryseeid_itemsss.js b/src/modules/testpaper/component/Paperlibraryseeid_itemsss.js
index 4ec68c8a..b9a06bef 100644
--- a/src/modules/testpaper/component/Paperlibraryseeid_itemsss.js
+++ b/src/modules/testpaper/component/Paperlibraryseeid_itemsss.js
@@ -1,17 +1,4 @@
-import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn, getImageUrl,markdownToHTML} from 'educoder';
-import axios from 'axios';
-import {
-	notification,
-	Spin,
-	Table,
-	Pagination,
-	Drawer,
-	Input,
-	Button,
-	Breadcrumb
-} from "antd";
+import React, { Component } from "react";
 import '../../question/questioncss/questioncom.css';
 import '../../tpm/newshixuns/css/Newshixuns.css';
 import Paperreview_single from "../../question/Paperreview_single";
@@ -19,62 +6,28 @@ import Paperreview_single from "../../question/Paperreview_single";
 //判断题
 //这不是唯一的 试题库还有Paperreview_items
 class Paperlibraryseeid_itemsss extends Component {
-	constructor(props) {
-		super(props);
-
-		this.state = {
-
-		}
-
-	}
-
-	//初始化
-	componentDidMount() {
-
-
-
-
-	}
-
-
-	getdata = (data) => {
-
-	}
-
-	preservation = () => {
-
-
-
-
-	}
-
-
-	setitem_type = (item_type) => {
-
-
-	}
 
 	render() {
-		let {paperreviewsingleindex,paperreviewsinglename,typenames,indexs,object,typenamesn}=this.props;
+		let { paperreviewsingleindex, paperreviewsinglename, typenames, indexs, object, typenamesn } = this.props;
 
 		return (
 			<div>
 				{
-					paperreviewsingleindex===indexs&&paperreviewsinglename===typenames?
-						<div 	 className="xaxisreverseorder mt25 mr2">
-							<div className="scd xiaoshou" onClick={()=>this.props.showsetmodalsTypedels(object.id,true,1)}>删除</div>
-							<div className="szdfd xiaoshou" onClick={()=>this.props.Singlemagazines(true,object.id,typenamesn)}>设置得分</div>
+					paperreviewsingleindex === indexs && paperreviewsinglename === typenames ?
+						<div className="xaxisreverseorder mt25 mr2">
+							<div className="scd xiaoshou" onClick={() => this.props.showsetmodalsTypedels(object.id, true, 1)}>删除</div>
+							<div className="szdfd xiaoshou" onClick={() => this.props.Singlemagazines(true, object.id, typenamesn)}>设置得分</div>
 						</div>
-						:	<div  className="xaxisreverseorder mt25 ">
+						: <div className="xaxisreverseorder mt25 ">
 						</div>
 				}
 				<Paperreview_single paperreviewsingleindex={paperreviewsingleindex}
-														name={typenames}
-														key={indexs}
-														showparagraphs={(e,name) => this.props.showparagraphs(e,name)}
-														objectsingle={object} key={indexs} indexx={indexs + 1}
-														indexxy={indexs}
-														hideparagraphs={() => this.props.hideparagraphs()}></Paperreview_single>
+					name={typenames}
+					key={indexs}
+					showparagraphs={(e, name) => this.props.showparagraphs(e, name)}
+					objectsingle={object} key={indexs} indexx={indexs + 1}
+					indexxy={indexs}
+					hideparagraphs={() => this.props.hideparagraphs()}></Paperreview_single>
 			</div>
 		)
 
diff --git a/src/modules/testpaper/component/QuestionModalys.js b/src/modules/testpaper/component/QuestionModalys.js
new file mode 100644
index 00000000..7bd70488
--- /dev/null
+++ b/src/modules/testpaper/component/QuestionModalys.js
@@ -0,0 +1,42 @@
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { Modal} from 'antd';
+import axios from 'axios';
+import './../../question/questioncss/questioncom.css'
+//立即申请试用
+class QuestionModalys extends Component {
+
+	constructor(props) {
+		super(props);
+		this.state={
+
+		}
+	}
+
+
+	render() {
+
+		return(
+			<Modal
+				keyboard={false}
+				closable={false}
+				footer={null}
+				destroyOnClose={true}
+				title="提示"
+				centered={true}
+				visible={this.props.modalsType===undefined?false:this.props.modalsType}
+				width="442px"
+			>
+				<div className="educouddiv">
+					<div className={"tabeltext-alignleft mt10"}><p className="titiles">{this.props.titilesm}</p></div>
+					<div className={"tabeltext-alignleft mt10"}><p className="titiles">{this.props.titiless}</p></div>
+					<div className="clearfix mt30 edu-txt-center">
+						<a className="task-btn task-btn-orange w80" onClick={()=>this.props.setDownload()}>知道啦</a>
+					</div>
+				</div>
+			</Modal>
+		)
+	}
+}
+
+export default QuestionModalys;
diff --git a/src/modules/testpaper/component/Seeoagertits.js b/src/modules/testpaper/component/Seeoagertits.js
index a983bd67..573655a6 100644
--- a/src/modules/testpaper/component/Seeoagertits.js
+++ b/src/modules/testpaper/component/Seeoagertits.js
@@ -26,7 +26,7 @@ class Seeoagertit extends Component {
 	onChange=(e)=> {
 	}
 	jixuxuantioncli = () => {
-		this.props.history.replace("/question");
+		this.props.history.replace("/problemset");
 	}
 
 	render() {
diff --git a/src/modules/testpaper/component/SendTopicsModel.js b/src/modules/testpaper/component/SendTopicsModel.js
new file mode 100644
index 00000000..4b6ea2a9
--- /dev/null
+++ b/src/modules/testpaper/component/SendTopicsModel.js
@@ -0,0 +1,202 @@
+import React, {Component} from "react";
+import {Modal, Radio, Input, Tooltip, Checkbox, Select, Row, Col, Spin} from "antd";
+import axios from 'axios';
+
+const {Search} = Input;
+
+class SendTopicsModel extends Component {
+	constructor(props) {
+		super(props);
+		this.state = {
+			courses: [],
+			search: null,
+			Radiolist: undefined,
+			showcheck: false,
+			smallisSpin: false,
+			yslbanksMenu: undefined,
+			exercise_id: null,
+		}
+	}
+
+
+	componentDidMount() {
+		// console.log("SendTopicssssssssssss");
+		// console.log(this.props);
+		let {search} = this.state;
+		this.onupdatalist(search)
+		this.setState({
+			yslbanksMenu: this.props.banksMenu,
+		})
+	}
+
+	//获取的课堂
+	onupdatalist = (search) => {
+		let url = "/question_banks/my_courses.json";
+		axios.get(url, {
+			params: {
+				search
+			}
+		}).then((result) => {
+			this.setState({
+				courses: result.data.courses
+			})
+		}).catch((error) => {
+			console.log(error);
+		})
+	}
+
+	onSearchChange = (e) => {
+		this.setState({
+			search: e.target.value
+		})
+		// this.onupdatalist(e.target.value)
+	}
+
+	onSearch = (search) => {
+		this.onupdatalist(search)
+	}
+
+
+	onChange = (e) => {
+		console.log("SendTopics");
+		console.log(e);
+		this.setState({
+			Radiolist: e.target.value
+		})
+	}
+
+	submitInfo = () => {
+		if(this.state.Radiolist){
+				let url = `/examination_banks/${this.props.paramsid}/send_to_course.json`;
+				var data = {
+					course_id: this.state.Radiolist
+				};
+				this.getwangluodata(url, data);
+		}else{
+			this.props.showNotification(`您需要创建课堂，才能发送`);
+			this.setState({
+				showcheck: true,
+				smallisSpin: false
+			})
+		}
+	}
+	getwangluodata = (url, data) => {
+		this.setState({
+			smallisSpin: true
+		})
+		var newOpenWindow=window.open('about:blank');  // 在ajax外部先打开空白新窗口
+
+		axios.post(url, data).then((response) => {
+			if (response) {
+				if (response.data) {
+					if (response.data.status === 0) {
+						this.setState({
+							exercise_id: response.data.exercise_id
+						})
+						try {
+							newOpenWindow.location=response.data.first_category_url;
+						}catch (e) {
+
+						}
+						this.props.submitInfos(false, null);
+					}
+				}
+			}
+			this.setState({
+				smallisSpin: false
+			})
+		}).catch((error) => {
+			console.log(error)
+			this.setState({
+				smallisSpin: false
+			})
+		});
+	}
+
+	render() {
+		let {courses, Radiolist, showcheck, smallisSpin} = this.state;
+
+		const radioStyle = {
+			display: 'block',
+			height: '30px',
+			lineHeight: '30px',
+		};
+
+		return (
+			<div>
+
+
+				<style>
+					{
+						`
+						.ant-modal-body{
+						 padding:20px 40px;
+						}
+						.onSearchtopics input{
+						  height:40px;
+						}
+						.over221{
+						  height:221px;
+						  overflow-y: auto;
+						}
+
+						`
+					}
+				</style>
+				<Modal
+					keyboard={false}
+					title="发送至课堂"
+					visible={this.props.visible}
+					closable={false}
+					footer={null}
+					destroyOnClose={true}
+					width={600}
+				>
+					<div className="newupload_conbox">
+						<div className="mb15 font-14 edu-txt-center color-orange-tip">
+							{this.props&&this.props.mypaper===true?
+								"温馨提示：当前试卷将会发送到指定课堂"
+								:
+							  "温馨提示：选择的试卷将会发送到指定课堂"
+							}
+						</div>
+						<div className="mb5"
+							// onMouseLeave={this.closeList}
+						>
+							<Search
+								className="mb14 onSearchtopics"
+								placeholder="请输入课堂名称进行搜索"
+								onChange={this.onSearchChange}
+								onSearch={this.onSearch}
+							></Search>
+						</div>
+						<div className="edu-back-skyblue pl15 pr15 clearfix over221 pt5">
+							<Radio.Group onChange={this.onChange} value={Radiolist}>
+								{
+									courses && courses.map((item, key) => {
+										return (
+											<div className="mt5" key={key}>
+												<Radio style={radioStyle} value={item.course_id} key={item.course_id}>
+													{item.course_name}
+												</Radio>
+											</div>
+										)
+									})
+								}
+							</Radio.Group>
+
+						</div>
+						{showcheck === true ? <div className={"color-red mt10"}>请先选择课堂</div> : ""}
+						<div className="mt20 clearfix edu-txt-center">
+							<a onClick={() => this.props.submitInfos(false, null)} className="pop_close task-btn mr30 ">取消</a>
+							<a className="task-btn task-btn-orange" onClick={() => this.submitInfo()}>确定</a>
+						</div>
+					</div>
+				</Modal>
+			</div>
+		)
+	}
+
+}
+
+export default SendTopicsModel;
diff --git a/src/modules/testpaper/testioncss/testioncss.css b/src/modules/testpaper/testioncss/testioncss.css
index 2025779a..e9253e9b 100644
--- a/src/modules/testpaper/testioncss/testioncss.css
+++ b/src/modules/testpaper/testioncss/testioncss.css
@@ -265,7 +265,7 @@
 }
 
 .w100s{
-    width:100% !important;
+    width:100%;
 }
 .stestcen{
     text-align: center;
@@ -400,13 +400,13 @@
     color: #4CACFF;
 }
 .xiaoshou{
-    cursor:pointer;
+    cursor:pointer !important;
 }
 .xiaoshout{
-    cursor:default;
+    cursor:default !important;
 }
 .shubiao{
-    cursor:default;
+    cursor:default !important;
 }
 .mt40{
     margin-top: 40px;
@@ -544,7 +544,7 @@
     margin-top: 19px;
 }
 .mytags{
-    width:106px;
+    min-width:106px;
     height:32px;
     border-radius:2px;
     border:1px solid #DDDDDD;
@@ -820,7 +820,7 @@
 }
 
 .sjtitles{
-    width:64px;
+    width:89px;
     height:17px;
     font-size:12px;
     color:#888888;
@@ -834,7 +834,6 @@
     margin-left: 48px;
 }
 .sjtitlesysl{
-    height:17px;
     font-size:12px;
     color:#BBBBBB;
     line-height:30px;
@@ -927,3 +926,16 @@
     color:rgba(51,51,51,1);
     line-height:19px;
 }
+.maxnamewidth100s{
+    max-width: 774px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
+.tknamelengs {
+    max-width: 110px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
diff --git a/src/modules/tpm/1.js b/src/modules/tpm/1.js
deleted file mode 100644
index 1a1494e0..00000000
--- a/src/modules/tpm/1.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import PropTypes from 'prop-types';
-
-import Comments from '../comment/Comments'
-
-import { commentHOC } from '../comment/CommentsHOC'
-import { CircularProgress } from 'material-ui/Progress';
-
-import './TPMShixunDiscuss.css'
-
-import TPMRightSection from './component/TPMRightSection'
-import TPMNav from './component/TPMNav'
-
-class TPMShixunDiscuss extends Component {
-    constructor(props) {
-      super(props)
-
-    }
-
-    componentWillReceiveProps(newProps, newContext) {
-      if (newProps.shixun && newProps.shixun.id && (!this.props || !this.props.shixun || this.props.shixun.id != newProps.shixun.id) ) {
-        window.document.title = newProps.shixun.name
-        // this.props.fetchCommentIfNotFetched &&
-        // this.props.fetchCommentIfNotFetched();
-      }
-    }
-
-    componentDidMount() {
-      // TODO 加了HOC后 mount了两次
-      this.props.fetchCommentIfNotFetched &&
-      this.props.fetchCommentIfNotFetched();
-    }
-    //
-
-    onPaginationChange = (page) => {
-      window.$("html,body").animate({"scrollTop":160})
-      this.props.onPaginationChange(page)
-    }
-
-    render() {
-      const { loadingComments, creator, shixun, myshixun, recommend_shixuns, current_user, watched,
-        aboutFocus, user, match
-       } = this.props;
-
-      let _user = user;
-      if (user) {
-        _user = Object.assign({}, user);
-        _user.user_url = `/users/${user.login}`
-      }
-      return (
-        <React.Fragment>
-        <div className="tpmComment educontent clearfix mt30 mb80">
-
-          <div className="with65 fl edu-back-white commentsDelegateParent" >
-              <TPMNav
-                  match={match}
-                  user={user}
-                  shixun={shixun}
-                  {...this.props}
-              ></TPMNav>
-          { loadingComments ?
-            <CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '200px', display: 'block' }}/> :
-            <Comments
-              {...this.props}
-              user={_user}
-              onPaginationChange={this.onPaginationChange}
-            ></Comments>
-          }
-          </div>
-
-          <div className="with35 fr pl20">
-            <TPMRightSection {...this.props}></TPMRightSection>
-          </div>
-        </div>
-        </React.Fragment>
-
-      );
-    }
-}
-
-export default commentHOC( TPMShixunDiscuss );
diff --git a/src/modules/tpm/Audit_situationComponent.js b/src/modules/tpm/Audit_situationComponent.js
index 3739cd6d..1057bc48 100644
--- a/src/modules/tpm/Audit_situationComponent.js
+++ b/src/modules/tpm/Audit_situationComponent.js
@@ -106,7 +106,7 @@ class Audit_situationComponent extends Component {
 	}
 
 	showModal = (id,status) => {
-		debugger
+
 		this.setState({
 			visible: true,
 			editid:id,
diff --git a/src/modules/tpm/SiderBar.js b/src/modules/tpm/SiderBar.js
index ebc71d11..8f0faac6 100644
--- a/src/modules/tpm/SiderBar.js
+++ b/src/modules/tpm/SiderBar.js
@@ -1,162 +1,79 @@
 import React, { Component } from 'react';
-import { getImageUrl} from 'educoder';
-import {Tooltip} from 'antd';
 import './TPMIndex.css';
 
 const $ = window.$;
 
-$(window).resize(function(){
+$(window).resize(function () {
   rightSlider();
 });
 
-$(window).scroll(function(){
-  if($(".gotop").length>0){
-    if($(document).scrollTop()>0){
+$(window).scroll(function () {
+  if ($(".gotop").length > 0) {
+    if ($(document).scrollTop() > 0) {
       $(".-task-sidebar .gotop").show();
-      $(".gotop").click(function(){
+      $(".gotop").click(function () {
         $("html,body").scrollTop(0);
       });
     }
-    if($(document).scrollTop()==0){
+    if ($(document).scrollTop() == 0) {
       $(".-task-sidebar .gotop").hide();
     }
   }
 });
 
-function rightSlider(){
-  var poi=parseInt((parseInt($(window).width())- 1200 )/2)-81;
+function rightSlider() {
+  var poi = parseInt((parseInt($(window).width()) - 1200) / 2) - 81;
   // console.log(parseInt($(window).width())+"  "+poi);
-  if(poi>0){
-    $(".-task-sidebar").css("right",poi);
-  }else{
-    $(".-task-sidebar").css("right","0px");
+  if (poi > 0) {
+    $(".-task-sidebar").css("right", poi);
+  } else {
+    $(".-task-sidebar").css("right", "0px");
   }
   $(".-task-sidebar").show();
 }
 
 
-function _initSider() {
-  var $descSide = $("<div class='-task-desc'></div>").appendTo("body");
-  $(".-task-sidebar>div").hover(function(){
-    //移入显示二维码
-    if($(this).hasClass("scan")){
-      $(".scan_ewm").show().css({right:"75px",opacity:0}).stop().animate({
-        right:"45px",opacity:1
-      })
-      return;
-    }
-    var $tool = $(this).attr("tooltips");
-    $descSide.html($tool+"<div><img src='/images/edu_user/jt.png'></div>");
-    $descSide.data('_dom', this)
-    $descSide.show().css({
-      left:$(this).offset().left - $descSide.width()-30,
-      opacity:0,
-      top:$(this).offset().top
-    }).stop().animate({
-      left:$(this).offset().left - $descSide.width()-5,
-      opacity:1
-    },400);
-  },function(){
-    if($(this).hasClass("scan")){
-      $(".scan_ewm").stop().animate({right:"75px",opacity:0},200).hide();
-    }
-    $descSide.stop().animate({
-      left:$(this).offset().left - $descSide.width()-30,
-      opacity:0
-    },200).hide();
-  });
-  rightSlider();
-
-  $(window).scroll(function() {
-    if ($descSide.height()) {
-      var hoverIcon = $descSide.data('_dom')
-      $descSide.css('top', $(hoverIcon).offset().top)
-    }
-  })
-}
-
 class SiderBar extends Component {
-    constructor(props) {
-        super(props)
+  constructor(props) {
+    super(props)
 
-    }
+  }
 
-    componentDidMount() {
-      _initSider()
+  render() {
+    return (
 
-    }
+      <div className={"-task-sidebar"} >
 
-    render() {
+        {this.props.mygetHelmetapi && this.props.mygetHelmetapi.main_site === true ? <div>
+
+          <div className="gotop" title="返回顶部">
+            <a>
+              <i className="iconfont icon-shangjiantou color-white"></i>
+            </a>
+          </div>
+
+          <div className="feedback" title="意见反馈">
+            <a target="_blank" className="color_white" href="/help/feedback">
+              <i className="iconfont icon-yijianfankui color-white font-22"></i>
+            </a>
+          </div>
+
+          <div className="scan pr" title="微信扫一扫">
+            <span className="inline erweima"><i className="iconfont icon-erweima color-white font-22 fl"></i></span>
+          </div>
 
 
-     // console.log("SiderBar");
-			// console.log(this.props);
-
-			  var mypath= this.props&&this.props.match&&this.props.match.path;
-        return (
-
-						<div className={"-task-sidebar"} >
-
-							{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?<div>
+          <div className="consult" title='在线咨询'>
+            <a target="_blank" className="color_white" href="//shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd">
+              <i className="iconfont icon-qqzaixianzixun color-white font-22"></i>
+            </a>
+          </div>
 
 
-
-                <Tooltip placement="right" title={"返回顶部"}>
-                  <div className="gotop">
-                    <a>
-                      <i className="iconfont icon-shangjiantou color-white"></i>
-                    </a>
-                  </div>
-                </Tooltip>
-
-
-
-                <Tooltip placement="right" title={"意见反馈"}>
-                  <div className="feedback">
-                    <a target="_blank" className="color_white" href="/help/feedback">
-                      <i className="iconfont icon-yijianfankui color-white font-22"></i>
-                    </a>
-                  </div>
-                </Tooltip>
-
-
-								<div className="scan pr">
-                  <Tooltip placement="right" title={
-                    <pre>
-                    <p className="scan_ewm">
-                        <p className="pr padding10">
-                          <style>
-                            {
-                              `
-                            .WeChatstyle{
-                               margin-bottom: 0 !important;
-                            }
-                            `
-                            }
-                          </style>
-                          <img src={getImageUrl("images/educoder/EWM.jpg")} width="158px" height="158px" />
-                          <p className={"WeChatstyle wechatcenter"}>微信扫一扫</p>
-                          <p className={"WeChatstyle wechatcenter"}>关注公众号</p>
-                        </p>
-                      </p>
-                    </pre>
-                  }>
-                    <span className="inline erweima"><i className="iconfont icon-erweima color-white font-22 fl"></i></span>
-                  </Tooltip>
-								</div>
-
-                <Tooltip placement="right" title={"在线咨询"}>
-                  <div className="consult">
-                    <a target="_blank" className="color_white" href="//shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd">
-                      <i className="iconfont icon-qqzaixianzixun color-white font-22"></i>
-                    </a>
-                  </div>
-                </Tooltip>
-
-							</div>:""}
-            </div>
-				);
-    }
+        </div> : ""}
+      </div>
+    );
+  }
 }
 
 export default SiderBar;
diff --git a/src/modules/tpm/TPMBanner.js b/src/modules/tpm/TPMBanner.js
index 9ba75282..3f591a40 100644
--- a/src/modules/tpm/TPMBanner.js
+++ b/src/modules/tpm/TPMBanner.js
@@ -1,28 +1,13 @@
-import React, {Component} from 'react';
-
-import {Link} from "react-router-dom";
-
-import {Rating, Progress} from "@icedesign/base";
-
-import {Modal, Input, Radio, Pagination, message, Spin, Icon, Tooltip, Button,Popover} from 'antd';
-
+import React, { Component } from 'react';
+import { Link } from "react-router-dom";
+import { Modal, Input, Radio, Rate, Pagination, message, Spin, Icon, Tooltip, Button, Popover, Progress } from 'antd';
 import AccountProfile from "../user/AccountProfile";
-
-import 'antd/lib/pagination/style/index.css';
-
 import axios from 'axios'
-
 import Modals from '../modals/Modals';
-
 import './shixuns/css/TPMBanner.css';
-import types from "../../redux/actions/actionTypes";
-
-let $ = window.$;
 
 const Search = Input.Search;
-
 const RadioGroup = Radio.Group;
-
 const { TextArea } = Input;
 
 class TPMBanner extends Component {
@@ -56,11 +41,12 @@ class TPMBanner extends Component {
       isSpin: false,
       Senttothevcaluetype: false,
       jupyterbool: false,
-      openknow:false,
-      openshowpublictype:false,
-      Radiovalue:1,
-      TextAreaintshow:false,
-
+      openknow: false,
+      openshowpublictype: false,
+      Radiovalue: 1,
+      TextAreaintshow: false,
+      cancelText: undefined,
+      okText: undefined,
     }
   }
 
@@ -94,81 +80,81 @@ class TPMBanner extends Component {
     }
   }
 
-  openknow=()=>{
-    let storage=window.localStorage;
+  openknow = () => {
+    let storage = window.localStorage;
     this.setState({
-      openknow:false
+      openknow: false
     })
-    let shixunopenprocess=this.props.user&&this.props.user.user_id+'shixunopenprocess';
-    storage.setItem(shixunopenprocess,true);
+    let shixunopenprocess = this.props.user && this.props.user.user_id + 'shixunopenprocess';
+    storage.setItem(shixunopenprocess, true);
   }
 
-  openshowpublic=()=>{
-    let storage=window.localStorage;
+  openshowpublic = () => {
+    let storage = window.localStorage;
     this.setState({
-      openshowpublictype:false
+      openshowpublictype: false
     })
-    let openopenpublictype=this.props.user&&this.props.user.user_id+'openopenpublictype';
-    storage.setItem(openopenpublictype,true);
+    let openopenpublictype = this.props.user && this.props.user.user_id + 'openopenpublictype';
+    storage.setItem(openopenpublictype, true);
   }
 
 
   componentDidUpdate(prevProps, prevState) {
     if (prevProps != this.props) {
 
-      if(prevProps.user != this.props.user){
-        if(this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.business===true){
+      if (prevProps.user != this.props.user) {
+        if (this.props.user && this.props.user.admin === true || this.props.user && this.props.user.business === true) {
           this.setState({
-            TextArea:"云上实验室使用"
+            TextArea: "云上实验室使用"
           })
         }
       }
-      let getshixunopenprocess=this.props.user&&this.props.user.user_id+'shixunopenprocess';
-      let getopenopenpublictype=this.props.user&&this.props.user.user_id+'openopenpublictype';
-      let shixunopenprocess=window.localStorage.getItem(getshixunopenprocess)
-      let openopenpublictype=window.localStorage.getItem(getopenopenpublictype)
-      if(this.props.status===0&&this.props.openknows===false){
+      let getshixunopenprocess = this.props.user && this.props.user.user_id + 'shixunopenprocess';
+      let getopenopenpublictype = this.props.user && this.props.user.user_id + 'openopenpublictype';
+      let shixunopenprocess = window.localStorage.getItem(getshixunopenprocess)
+      let openopenpublictype = window.localStorage.getItem(getopenopenpublictype)
+      if (this.props.status === 0 && this.props.openknows === false) {
 
-        if(this.props.shixunsDetails&&this.props.shixunsDetails.shixun_status === 0 && this.props.identity < 5){
-          if(this.props.user&&this.props.user.user_id){
-            if(shixunopenprocess===undefined||shixunopenprocess===false||shixunopenprocess===null){
+        if (this.props.shixunsDetails && this.props.shixunsDetails.shixun_status === 0 && this.props.identity < 5) {
+          if (this.props.user && this.props.user.user_id) {
+            if (shixunopenprocess === undefined || shixunopenprocess === false || shixunopenprocess === null) {
               this.setState({
-                openknow:true
+                openknow: true
               })
-              setTimeout(()=>{
+              setTimeout(() => {
                 this.openknow()
                 this.setState({
-                  openknow:false
+                  openknow: false
                 })
               }, 10000);
 
-            }else{
+            } else {
               this.setState({
-                openknow:false
+                openknow: false
               })
             }
           }
-          }
+        }
 
-      }else{
+      } else {
         this.setState({
-          openknow:false
+          openknow: false
         })
       }
 
 
 
-      if(this.props.public===0&&this.props.status>1&&this.props.openknows===false){
-        if(this.props.shixunsDetails&&this.props.shixunsDetails.shixun_status === 2 && this.props.shixunsDetails&&this.props.shixunsDetails.public===0 && this.props.identity < 5){
-          if(this.props.user&&this.props.user.user_id) {
+      if (this.props.public === 0 && this.props.status > 1 && this.props.openknows === false) {
+        if (this.props.shixunsDetails && this.props.shixunsDetails.shixun_status === 2 && this.props.shixunsDetails && this.props.shixunsDetails.public === 0 && this.props.identity < 5) {
+          if (this.props.user && this.props.user.user_id) {
             if (openopenpublictype === undefined || openopenpublictype === false || openopenpublictype === null) {
               this.setState({
                 openshowpublictype: true
               })
-              setTimeout(()=>{
+              setTimeout(() => {
                 this.openshowpublic()
                 this.setState({
-                  openshowpublictype:false
+                  openshowpublictype: false
                 })
               }, 10000);
             } else {
@@ -178,9 +164,9 @@ class TPMBanner extends Component {
             }
           }
         }
-      }else{
+      } else {
         this.setState({
-          openshowpublictype:false
+          openshowpublictype: false
         })
       }
 
@@ -214,7 +200,7 @@ class TPMBanner extends Component {
   * Fork
   * */
   copyForkvisible = () => {
-    let {shixunsDetails} = this.props;
+    let { shixunsDetails } = this.props;
     if (shixunsDetails.can_fork === null) {
       this.setState({
         Forkvisible: true
@@ -237,9 +223,9 @@ class TPMBanner extends Component {
     })
   }
 
-  changeTextArea=(e)=>{
+  changeTextArea = (e) => {
     this.setState({
-      TextArea:e.target.value
+      TextArea: e.target.value
     })
   }
 
@@ -247,35 +233,35 @@ class TPMBanner extends Component {
     let reason;
     switch (this.state.Radiovalue) {
       case 1:
-        reason="Shixun";
+        reason = "Shixun";
         break;
       case 2:
-        reason="Course";
+        reason = "Course";
         break;
       case 3:
-        reason="Subject";
+        reason = "Subject";
         break;
       case 4:
-        reason=this.state.TextArea;
+        reason = this.state.TextArea;
     }
 
-   if(this.state.Radiovalue===4){
-     if(this.state.TextArea===null||this.state.TextArea===undefined||this.state.TextArea=== ""){
-       this.setState({
-         TextAreaintshow:true
-       })
-       return
-     }
-   }
+    if (this.state.Radiovalue === 4) {
+      if (this.state.TextArea === null || this.state.TextArea === undefined || this.state.TextArea === "") {
+        this.setState({
+          TextAreaintshow: true
+        })
+        return
+      }
+    }
 
     this.setState({
-      Forkvisibletype:true,
+      Forkvisibletype: true,
     })
 
     let id = this.props.match.params.shixunId;
     let url = "/shixuns/" + id + "/copy.json";
     axios.post(url, {
-      reason:reason,
+      reason: reason,
     }).then((response) => {
       if (response.data.status === 401) {
 
@@ -302,19 +288,6 @@ class TPMBanner extends Component {
       return
     }
 
-    // if(this.props.checkIfProfileCompleted()===false){
-    // 	this.setState({
-    // 		AccountProfiletype:true
-    // 	})
-    // 	return
-    // }
-    //
-    // if(this.props.checkIfProfessionalCertification()===false){
-    // 	this.setState({
-    // 		AccountProfiletype:true
-    // 	})
-    // 	return
-    // }
     let id = this.props.match.params.shixunId;
     let url = "/shixuns/" + id + "/search_user_courses.json";
     this.setState({
@@ -362,7 +335,7 @@ class TPMBanner extends Component {
     })
   }
   onChangesendeSenttothe = (pageNumber) => {
-    let {Searchvalue} = this.state;
+    let { Searchvalue } = this.state;
     let id = this.props.match.params.shixunId;
     let url = "/shixuns/" + id + "/search_user_courses.json?search=" + Searchvalue;
     axios.get(url, {
@@ -383,7 +356,7 @@ class TPMBanner extends Component {
   }
   sendeSenttothevcalue = () => {
 
-    let {Senttothevcalue} = this.state;
+    let { Senttothevcalue } = this.state;
 
     if (Senttothevcalue === undefined) {
       this.setState({
@@ -403,8 +376,6 @@ class TPMBanner extends Component {
         Searchvalue: "",
         pages: 1
       })
-      // window.location.href = response.data.url;
-      // response.data.course_id
       this.props.history.replace(response.data.first_category_url);
 
     }).catch((error) => {
@@ -431,9 +402,12 @@ class TPMBanner extends Component {
     this.setState({
       Modalstype: false,
       Modalstopval: "",
-      modalsMidval:undefined,
-      ModalsBottomval:"",
-      modalstyles:"",
+      modalsMidval: undefined,
+      ModalsBottomval: "",
+      modalstyles: "",
+      cancelText: undefined,
+      okText: undefined,
+      Loadtype: false,
     })
   }
   ModalSave = () => {
@@ -441,7 +415,9 @@ class TPMBanner extends Component {
     let url = "/shixuns/" + id + "/cancel_publish.json";
     axios.get(url).then((response) => {
       this.props.showSnackbar(response.data.message);
-      window.location.reload()
+      this.ModalCancel()
+      this.props.getcomponentdidmount()
+
     }).catch((error) => {
       console.log(error)
     });
@@ -451,58 +427,61 @@ class TPMBanner extends Component {
     this.setState({
       Modalstype: true,
       Modalstopval: "是否确认撤销发布？",
-      modalsMidval:"撤销发布后，学员将无法进行练习，若您新增关",
-      ModalsBottomval:"卡，学员需要重新体验实训",
+      modalsMidval: "撤销发布后，学员将无法进行练习，若您新增关",
+      ModalsBottomval: "卡，学员需要重新体验实训",
       ModalCancel: this.ModalCancel,
       ModalSave: this.ModalSave,
-      modalstyles:"848282"
+      modalstyles: "848282"
     })
   }
-  ModalSaveopenpublic= () => {
+  ModalSaveopenpublic = () => {
     this.setState({
       Modalstype: true,
-      Modalstopval: "公开申请已提交，请等待管理员的审核",
-      modalsMidval:"• 我们将在1-2个工作日内完成审核",
-      ModalCancel: this.eopenpublicupdatadata,
+      Modalstopval: "公开实训需经过平台标准化审核，审核周期为1-2天，",
+      modalsMidval: "公开的实训将对平台所有人可见。若仅本人教学使用",
+      ModalsBottomval: "则无需申请公开, 直接发送到课堂即可。",
+      cancelText: "取消申请",
+      okText: "确定申请",
+      ModalCancel: this.ModalCancel,
       ModalSave: this.eopenpublicupdatadata,
-      Loadtype:true,
-      modalstyles:"848282"
     })
   }
-  eopenpublicupdatadata=()=>{
-    window.location.reload()
+  eopenpublicupdatadata = () => {
+    this.ModalCancel()
+    this.props.getcomponentdidmount()
   }
-  openpublic=()=>{
+  openpublic = () => {
     let id = this.props.match.params.shixunId;
     let url = `/shixuns/${id}/apply_public.json`;
     axios.get(url).then((response) => {
-     if(response.data.status===0){
-       this.ModalSaveopenpublic()
+      if (response.data.status === 0) {
+        this.ModalSaveopenpublic()
 
-     }
-    }).catch((error) => {
-      console.log(error)
-    });
-  }
-
-  ModalhidenpublicSave=()=>{
-    let id = this.props.match.params.shixunId;
-    let url = `/shixuns/${id}/cancel_apply_public.json`;
-    axios.get(url).then((response) => {
-      if(response.data.status===0){
-         window.location.reload()
       }
     }).catch((error) => {
       console.log(error)
     });
   }
 
-  hidenpublic=()=>{
+  ModalhidenpublicSave = () => {
+    let id = this.props.match.params.shixunId;
+    let url = `/shixuns/${id}/cancel_apply_public.json`;
+    axios.get(url).then((response) => {
+      if (response.data.status === 0) {
+        this.ModalCancel()
+        this.props.getcomponentdidmount()
+      }
+    }).catch((error) => {
+      console.log(error)
+    });
+  }
+
+  hidenpublic = () => {
     this.setState({
       Modalstype: true,
       Modalstopval: "是否确认撤销申请公开？",
-      modalsMidval:" ",
-      ModalsBottomval:" ",
+      modalsMidval: " ",
+      ModalsBottomval: " ",
       ModalCancel: this.ModalCancel,
       ModalSave: this.ModalhidenpublicSave,
     })
@@ -521,9 +500,11 @@ class TPMBanner extends Component {
       } else {
         evaluation_set_position = response.data.evaluation_set_position
       }
-      if(response.data.status===0){
-        window.location.reload()
-      }else{
+      if (response.data.status === 0) {
+        this.applyreleaseopen()
+        // this.ModalCancel()
+        this.props.getcomponentdidmount()
+      } else {
         this.setState({
           Issuevisible: true,
           tag_position: response.data.tag_position,
@@ -536,48 +517,41 @@ class TPMBanner extends Component {
       console.log(error)
     });
   };
+  applyreleaseopen = () => {
 
+    this.setState({
+      Modalstype: true,
+      Loadtype: true,
+      Modalstopval: "实训发布后即可发送课堂使用",
+      ModalSave: this.ModalCancel,
+    })
+  }
   hiddenIssuevisible = (val) => {
     this.setState({
       Issuevisible: false
     })
     if (val === 0 || val === 1) {
-      window.location.reload()
+      this.ModalCancel()
+      this.props.getcomponentdidmount()
     }
 
   }
 
-  //重置按钮
-  // resetshixunCombat=(id)=>{
-  //     let zrl="/myshixuns/"+id+"/reset_my_game.json";
-  //     axios.get(zrl).then((response) => {
-  //         window.location.href = "/shixuns/" + response.data.shixun_identifier + "/challenges";
-  //         message.success('重置成功');
-  //     }).catch((error) => {
-  //         console.log(error)
-  //     });
-  // }
-
   // reset_my_game
   hidestartshixunsreplace = (url) => {
     this.setState({
       isSpin: true,
     })
     axios.get(url).then((response) => {
-        if (response.status === 200) {
-          // let path="/shixuns/"+response.data.shixun_identifier+"/challenges";
-          // this.props.history.push(path);
-          message.success('重置成功，正在进入实训！');
-          this.startshixunCombat(response.data.shixun_identifier, 1);
-          this.setState({
-            shixunsreplace: false,
-            isSpin: false,
-          })
-
-          // message.success('重置成功，正在进入实训！');
-          // this.startshixunCombat();
-        }
+      if (response.status === 200) {
+        message.success('重置成功，正在进入实训！');
+        this.startshixunCombat(response.data.shixun_identifier, 1);
+        this.setState({
+          shixunsreplace: false,
+          isSpin: false,
+        })
       }
+    }
     ).catch((error) => {
       this.setState({
         startbtn: false,
@@ -592,7 +566,7 @@ class TPMBanner extends Component {
   //开始实战按钮
   startshixunCombat = (id, reset) => {
 
-    if(this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter===true){
+    if (this.props.shixunsDetails && this.props.shixunsDetails.is_jupyter === true) {
       if (this.props.checkIfLogin() === false) {
         this.props.showLoginDialog()
         return
@@ -605,14 +579,7 @@ class TPMBanner extends Component {
         return
       }
 
-      // if(this.props.checkIfProfessionalCertification()===false){
-      // 	this.setState({
-      // 		AccountProfiletype:true
-      // 	})
-      // 	return
-      // }
-
-      let {shixunsDetails} = this.props
+      let { shixunsDetails } = this.props
       if (shixunsDetails.shixun_status > 1) {
         this.setState({
           startbtn: true,
@@ -648,13 +615,8 @@ class TPMBanner extends Component {
               startbtn: false
             })
           } else {
-            // let path="/tasks/"+response.data.game_identifier;
-            // this.props.history.push(path);
-
-
-            // this.context.router.history.push(path);
             if (response.data.status != 401) {
-              window.location.href = "/tasks/" + response.data.identifier+`/jupyter`;
+              window.location.href = "/tasks/" + response.data.identifier + `/jupyter`;
             }
 
           }
@@ -664,7 +626,7 @@ class TPMBanner extends Component {
           startbtn: false
         })
       });
-    }else{
+    } else {
       if (this.props.checkIfLogin() === false) {
         this.props.showLoginDialog()
         return
@@ -677,14 +639,7 @@ class TPMBanner extends Component {
         return
       }
 
-      // if(this.props.checkIfProfessionalCertification()===false){
-      // 	this.setState({
-      // 		AccountProfiletype:true
-      // 	})
-      // 	return
-      // }
-
-      let {shixunsDetails} = this.props
+      let { shixunsDetails } = this.props
       if (shixunsDetails.shixun_status > 1) {
         this.setState({
           startbtn: true,
@@ -720,11 +675,6 @@ class TPMBanner extends Component {
               startbtn: false
             })
           } else {
-            // let path="/tasks/"+response.data.game_identifier;
-            // this.props.history.push(path);
-
-
-            // this.context.router.history.push(path);
             if (response.data.status != 401) {
               window.location.href = "/tasks/" + response.data.game_identifier;
             }
@@ -742,7 +692,7 @@ class TPMBanner extends Component {
   }
 
   tocertification = () => {
-    let {certi_url} = this.state;
+    let { certi_url } = this.state;
     this.setState({
       Forkauthentication: false
     })
@@ -768,17 +718,54 @@ class TPMBanner extends Component {
   }
 
 
-  onChangeRadiovalue=(e)=>{
+  onChangeRadiovalue = (e) => {
     this.setState({
-      Radiovalue:e.target.value
+      Radiovalue: e.target.value
     })
-    if(e.target.value!=4){
+    if (e.target.value != 4) {
       this.setState({
-        TextAreaintshow:false
+        TextAreaintshow: false
       })
     }
   }
 
+
+  setCollect = () => {
+    let { shixunsDetails } = this.props;
+    let url = "/collections.json";
+    axios.post(url, {
+      container_id: shixunsDetails.id,
+      container_type: "Shixun"
+    }).then((result) => {
+      const status = result.data.status
+      if (status === 0) {
+        this.props.getcomponentdidmount()
+        this.props.showNotification(result.data.message);
+      }
+    }).catch((error) => {
+      console.log(error);
+    })
+  }
+
+  cancelCollect = () => {
+    let { shixunsDetails } = this.props;
+    let url = `/collections/cancel.json`;
+    axios.delete(url, {
+      data: {
+        container_id: shixunsDetails.id,
+        container_type: "Shixun"
+      }
+    }).then((response) => {
+      const status = response.data.status
+      if (status === 0) {
+        this.props.getcomponentdidmount()
+        this.props.showNotification(response.data.message);
+      }
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+
   render() {
     let {
       Forkvisible,
@@ -787,13 +774,11 @@ class TPMBanner extends Component {
       evaluation_set_position,
       Forkauthentication,
       can_fork,
-      certi_url,
       tag_position,
       courses_count,
       course_list,
       Issuevisible,
       publishboxstatus,
-      showradios,
       startbtn,
       Searchvalue,
       startshixunCombattype,
@@ -803,72 +788,21 @@ class TPMBanner extends Component {
       hidestartshixunsreplacevalue,
       Forkvisibletype,
       AccountProfiletype,
-      isIE
     } = this.state;
-    let {shixunsDetails, shixunId, star_info, star_infos} = this.props;
-    let challengeBtnTipText = '';
-    let challengeBtnText = '模拟实战';
-    // let star_info=[]
-    // 	if (shixunsDetails.status === 0) {
-    //
-    // 	} else if (shixunsDetails.status === 1) {
-    //
-    // 	} else if (shixunsDetails.status === 2) {
-    // 		challengeBtnTipText = '开始学习并完成实战任务'
-    //
-    // }
-    if (shixunsDetails != undefined) {
-      if (shixunsDetails.shixun_status === 0) {
-        challengeBtnText = '继续实战'
-      } else if (shixunsDetails.shixun_status === 1) {
-        challengeBtnText = '查看实战'
-      } else if (shixunsDetails.shixun_status === 3) {
-        challengeBtnText = '继续实战'
-      } else {
-        challengeBtnText = "开始实战"
-      }
-    }
-
-
-    // let list=shixunsDetails.task_operation;
-    // if(list!=undefined){
-    //     if (shixunsDetails.status === 0 ) {
-    //         for(var i=0; i<list.length; i++){
-    //             challengeBtnText =list[0]
-    //         }
-    //     } else if (shixunsDetails.status === 1) {
-    //         for(var i=0; i<list.length; i++){
-    //             challengeBtnText =list[0]
-    //         }
-    //     } else if (shixunsDetails.status === 3) {
-    //         for(var i=0; i<list.length; i++){
-    //             challengeBtnText =list[0]
-    //         }
-    //     }else{
-    //         for(var i=0; i<list.length; i++){
-    //             challengeBtnText =list[0]
-    //         }
-    //     }
-    // }
+    let { shixunsDetails, shixunId, star_info, star_infos } = this.props;
     const radioStyle = {
       display: 'block',
       height: '30px',
       lineHeight: '30px',
     };
 
-    const antIcon = <Icon type="loading" style={{fontSize: 24}} spin/>;
-    const MyRate = ({defaultValue, ...rest}) => {
-      let myValue = defaultValue;
-      return <Rating {...rest} value={myValue}/>;
+    const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
+    const MyRate = ({ defaultValue, ...rest }) => {
+      return <Rate {...rest} value={defaultValue} className='simple-rate' />;
     };
-    //
-    // console.log(this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter)
-
-    // console.log(this.state)
     return (
-
-      shixunsDetails === undefined ? "" :
-        <div className="shixunDetail" id={"shixunDetail"}>
+      shixunsDetails === undefined ? null :
+        <div className="shixunDetail" id="shixunDetail">
           <style>
             {
               `
@@ -900,18 +834,20 @@ class TPMBanner extends Component {
               modalsMidval={this.state.modalsMidval}
               loadtype={this.state.Loadtype}
               modalstyles={this.state.modalstyles}
+              cancelText={this.state.cancelText}
+              okText={this.state.okText}
             /> : ""}
 
             <div className="educontent clearfix">
               <p className="clearfix">
                 <a href={"/shixuns/" + shixunsDetails.identifier + "/challenges"}
-                   className="font-28 color-white mr10 fl">{shixunsDetails.name}</a>
+                  className="font-28 color-white mr10 fl">{shixunsDetails.name}</a>
                 {
                   shixunsDetails.fork_from === undefined || shixunsDetails.fork_from === null ? "" :
                     <a href={"/shixuns/" + shixunsDetails.fork_from.fork_identifier + "/challenges"}
-                       className="fl mt5"
-                       target="_blank"
-                       data-tip-right={"forked from " + shixunsDetails.fork_from.username + " / " + shixunsDetails.fork_from.name}>
+                      className="fl mt5"
+                      target="_blank"
+                      data-tip-right={"forked from " + shixunsDetails.fork_from.username + " / " + shixunsDetails.fork_from.name}>
                       <i className="iconfont icon-fork color-grey-74 font-20 fl"></i>
                     </a>
                 }
@@ -920,83 +856,77 @@ class TPMBanner extends Component {
               <div className="clearfix mt10">
 
                 <ul className="fl color-grey-c pathInfo mt20">
-                  {shixunsDetails&&shixunsDetails.stu_num===0?"":<li>
+                  {shixunsDetails && shixunsDetails.stu_num === 0 ? "" : <li>
                     <span>学习人数</span>
                     <span className="mt3">{shixunsDetails.stu_num}</span>
                   </li>}
-                  {/*<li>*/}
-                  {/*<span>经验值</span>*/}
-                  {/*<span className="mt10">{shixunsDetails.experience}</span>*/}
-                  {/*</li>*/}
                   <li>
                     <span>难度级别</span>
                     <span className="shixunsdiffcult mt3">{shixunsDetails.diffcult}</span>
-
                   </li>
                 </ul>
-								{ this.props.is_jupyter===true?"":
-                      <Popover placement="right" content={
-                        <div style={{"width": "530px"}} >
-                          <div className="pr">
-                            <span className="rateTrangle"></span>
-                            <div className="pr clearfix" style={{height: '177px'}}>
-                              <div className="fl totalScore ml10">
-                                <div>
-                                  <span className="font-24 color-yellow-ff lineh-20 mb10 mlbanner36">{star_infos[0]}分</span>
-                                  <span className="displayblock mt20">总评分</span>
-                                  <div className="rateYo">
-                                      <MyRate allowHalf defaultValue={star_info[0]} disabled/>
-                                  </div>
-                                </div>
-                              </div>
-                              <div className="fr mt20 mr20" style={{width: '375px'}}>
-                                <div className="clearfix">
-                                  <div className="rateYo fl mt3">
-                                      <MyRate allowHalf defaultValue={5} disabled/>
-                                  </div>
-                                  <Progress percent={star_infos[1]} showInfo={false}></Progress>
-                                  <span className="fr ml10 color-grey-6 font-12 mt4">{star_infos[1]}%</span>
-                                </div>
-                                <div className="clearfix">
-                                  <div className="rateYo fl mt3">
-                                      <MyRate allowHalf defaultValue={4} disabled/>
-                                  </div>
-                                  <Progress percent={star_infos[2]} showInfo={false}></Progress>
-                                  <span className="fr ml10 color-grey-6 font-12 mt4">{star_infos[2]}%</span>
-                                </div>
-                                <div className="clearfix">
-                                  <div className="rateYo fl mt3">
-                                      <MyRate allowHalf defaultValue={3} disabled/>
-                                  </div>
-                                  <Progress percent={star_infos[3]} showInfo={false}></Progress>
-                                  <span className="fr ml10 color-grey-6 font-12 mt4">{star_infos[3]}%</span>
-                                </div>
-                                <div className="clearfix">
-                                  <div className="rateYo fl mt3">
-                                      <MyRate allowHalf defaultValue={2} disabled/>
-                                  </div>
-                                  <Progress percent={star_infos[4]} showInfo={false}></Progress>
-                                  <span className="fr ml10 color-grey-6 font-12 mt4">{star_infos[4]}%</span>
-                                </div>
-                                <div className="clearfix">
-                                  <div className="rateYo fl mt3">
-                                      <MyRate allowHalf defaultValue={1} disabled/>
-                                  </div>
-                                  <Progress percent={star_infos[5]} showInfo={false}></Progress>
-                                  <span className="fr ml10 color-grey-6 font-12 mt4">{star_infos[5]}%</span>
-                                </div>
+                {this.props.is_jupyter === true ? "" :
+                  <Popover placement="right" content={
+                    <div style={{ "width": "530px" }} >
+                      <div className="pr">
+                        <span className="rateTrangle"></span>
+                        <div className="pr clearfix" style={{ height: '177px' }}>
+                          <div className="fl totalScore ml10">
+                            <div>
+                              <span className="font-24 color-yellow-ff lineh-20 mb10 mlbanner36">{star_infos[0]}分</span>
+                              <span className="displayblock mt20">总评分</span>
+                              <div className="rateYo">
+                                <MyRate allowHalf defaultValue={star_info[0]} disabled />
                               </div>
                             </div>
                           </div>
-                        </div>
-                      }>
-                        <div className="pr fl mt15" id="commentsStar">
-                          <div className={"color-grey-c  ml15"} style={{color: "#fff", textAlign: "center"}}>学员评分</div>
-                          <div className="rateYo">
-                            <MyRate allowHalf defaultValue={star_info[0]} disabled/>
+                          <div className="fr mt20 mr20" style={{ width: '375px' }}>
+                            <div className='flex-container'>
+                              <MyRate allowHalf defaultValue={5} disabled />
+                              <div className='progress-container'>
+                                <Progress percent={star_infos[1]} type='line'  ></Progress>
+                              </div>
+                            </div>
+                            <div className='flex-container'>
+                              <MyRate allowHalf defaultValue={4} disabled />
+                              <div className='progress-container'>
+                                <Progress percent={star_infos[2]} type='line'  ></Progress>
+                              </div>
+                            </div>
+
+                            <div className='flex-container'>
+                              <MyRate allowHalf defaultValue={3} disabled />
+                              <div className='progress-container'>
+                                <Progress percent={star_infos[3]} type='line'  ></Progress>
+                              </div>
+                            </div>
+
+                            <div className='flex-container'>
+                              <MyRate allowHalf defaultValue={2} disabled />
+                              <div className='progress-container'>
+                                <Progress percent={star_infos[4]} type='line'  ></Progress>
+                              </div>
+                            </div>
+
+                            <div className='flex-container'>
+                              <MyRate allowHalf defaultValue={1} disabled />
+                              <div className='progress-container'>
+                                <Progress percent={star_infos[5]} type='line'  ></Progress>
+                              </div>
+                            </div>
+
                           </div>
                         </div>
-                      </Popover>}
+                      </div>
+                    </div>
+                  }>
+                    <div className="pr fl mt15" id="commentsStar">
+                      <div className={"color-grey-c  ml15"} style={{ color: "#fff", textAlign: "center" }}>学员评分</div>
+                      <div className="rateYo">
+                        <MyRate allowHalf defaultValue={star_info[0]} disabled />
+                      </div>
+                    </div>
+                  </Popover>}
 
 
                 {
@@ -1007,8 +937,8 @@ class TPMBanner extends Component {
                           shixunsDetails.task_operation[0] === "模拟实战" ? "模拟完成实战任务" : shixunsDetails.task_operation[0] === "开启挑战" ? "开始学习并完成实战任务" : ""
                     }>
                       <a onClick={() => this.startshixunCombat(this.props.match.params.shixunId)}
-                         className="fr user_default_btn task-btn-orange font-18"
-                         id="shixun_operation" data-remote="true"
+                        className="fr user_default_btn task-btn-orange font-18"
+                        id="shixun_operation" data-remote="true"
                       >
                         {shixunsDetails.task_operation === undefined ? "" : shixunsDetails.shixun_status > 1 ? shixunsDetails.task_operation[0] : "模拟实战"}
                       </a>
@@ -1027,12 +957,8 @@ class TPMBanner extends Component {
                     <p className="task-popup-text-center font-16 pb20">目前该实训项目尚在内测中，将于{shixunsmessage}之后开放，谢谢！</p>
                   </div>
                   <div className="task-popup-submit clearfix">
-                    {/*<a onClick={this.hidestartshixunCombattype} className="task-btn fl">取消</a>*/}
                     <a className="task-btn task-btn-orange fr mr51" onClick={this.hidestartshixunCombattype}>知道啦</a>
                   </div>
-                  {/*<p className="inviteTipbtn with100 fl">*/}
-                  {/*<a onClick={this.hidestartshixunCombattype}>知道了</a>*/}
-                  {/*</p>*/}
                 </Modal>
 
                 <Modal
@@ -1048,7 +974,7 @@ class TPMBanner extends Component {
                     </div>
                     <div className="task-popup-submit clearfix">
                       <a className="task-btn task-btn-orange fr mr51"
-                         onClick={() => this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了</a>
+                        onClick={() => this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了</a>
                     </div>
                   </Spin>
                 </Modal>
@@ -1060,40 +986,31 @@ class TPMBanner extends Component {
                   footer={null}
                   className="startbtnModal"
                 >
-                  <Spin size="large"/>
+                  <Spin size="large" />
                 </Modal>
 
                 {
                   startbtn === true ?
                     <a className="fr kaike kkbths mr15 font-18">开启中</a> : ""
                 }
-
-                {/*{*/}
-                {/*shixunsDetails.status=== 3 && shixunsDetails.task_operation[0]==="开始实战"?*/}
-                {/*<a onClick={this.startshixunCombat} className="fr user_default_btn task-btn-orange font-18"*/}
-                {/*data-tip-down="开始学习并完成实战任务"*/}
-                {/*id="shixun_operation" data-remote="true"*/}
-                {/*>{shixunsDetails.task_operation===undefined?"":shixunsDetails.task_operation[0]}</a>:""*/}
-                {/*}*/}
-
                 {shixunsDetails.shixun_status === 0 && this.props.identity < 5 ?
                   <Popover
                     content={
-                       <pre className={"bannerpd201"}>
-                          <div>点击发布后，可以马上应用到自</div>
-                          <div className={"wechatcenter mt10"}>己的课堂和课程</div>
-                          <div className={"wechatcenter mt15"}><Button  type="primary" onClick={this.openknow} >我知道了</Button></div>
-                       </pre>
+                      <pre className={"bannerpd201"}>
+                        <div>点击发布后，可以马上应用到自</div>
+                        <div className={"wechatcenter mt10"}>己的课堂和课程</div>
+                        <div className={"wechatcenter mt15"}><Button type="primary" onClick={this.openknow} >我知道了</Button></div>
+                      </pre>
                     }
                     trigger="click"
                     placement="bottom"
                     visible={this.state.openknow}
                   >
                     <Tooltip placement="bottom" title={"发布后，可以使用到自己的课堂和课程"}>
-                    <a onClick={this.applyrelease} className="fr kaike kkbths mr20 font-18 height39"
-                       id="challenge_begin">发布</a>
+                      <a onClick={this.applyrelease} className="fr kaike kkbths mr20 font-18 height39"
+                        id="challenge_begin">发布</a>
                     </Tooltip>
-                  </Popover>: ""
+                  </Popover> : ""
                 }
 
                 <Modal
@@ -1106,105 +1023,122 @@ class TPMBanner extends Component {
                   {
                     publishboxstatus === 0 ? <div className="task-popup-content">
                       <p className="task-popup-text-center font-16 mt10 mb10">
-                        发布申请已提交，请等待管理员的审核<br/>
+                        发布申请已提交，请等待管理员的审核<br />
                       </p>
                     </div> : publishboxstatus === 1 ?
-                      <div className="task-popup-content">
-                        <p className="task-popup-text-center font-16 mt10 mb10">
-                          发布申请已提交，请等待管理员的审核<br/>
-                          <span className="font-12 color-grey-8"> • 我们将在1-2个工作日内完成审核</span>
-                        </p>
-                      </div> : publishboxstatus === 2 ? <div className="task-popup-content">
-                        <p className="task-popup-text-center font-16  mt10 mb10">
-                          第
-                          {
-                            evaluation_set_position.map((item, key) => {
-                              return (
-                                <span key={key}>{item}<span
-                                  style={{display: key != evaluation_set_position.length - 1 ? "inline-block" : 'none'}}>,</span></span>
-                              )
-                            })
-                          }
-                          关评测设置尚未完成，无法申请发布
-                        </p>
-                      </div> : publishboxstatus === 3 ?
                         <div className="task-popup-content">
                           <p className="task-popup-text-center font-16 mt10 mb10">
-                            每一个关卡至少需要一个技能标签<br/>
+                            发布申请已提交，请等待管理员的审核<br />
+                            <span className="font-12 color-grey-8"> • 我们将在1-2个工作日内完成审核</span>
+                          </p>
+                        </div> : publishboxstatus === 2 ? <div className="task-popup-content">
+                          <p className="task-popup-text-center font-16  mt10 mb10">
                             第
-                            {
-                              tag_position.map((item, key) => {
+                          {
+                              evaluation_set_position.map((item, key) => {
                                 return (
                                   <span key={key}>{item}<span
-                                    style={{display: key != tag_position.length - 1 ? "inline-block" : 'none'}}>,</span></span>
+                                    style={{ display: key != evaluation_set_position.length - 1 ? "inline-block" : 'none' }}>,</span></span>
                                 )
                               })
                             }
+                          关评测设置尚未完成，无法申请发布
+                        </p>
+                        </div> : publishboxstatus === 3 ?
+                            <div className="task-popup-content">
+                              <p className="task-popup-text-center font-16 mt10 mb10">
+                                每一个关卡至少需要一个技能标签<br />
+                            第
+                            {
+                                  tag_position.map((item, key) => {
+                                    return (
+                                      <span key={key}>{item}<span
+                                        style={{ display: key != tag_position.length - 1 ? "inline-block" : 'none' }}>,</span></span>
+                                    )
+                                  })
+                                }
                             关尚未设置技能标签，请补充
                           </p>
-                        </div> :
-                        <div className="task-popup-content">
-                          <p className="task-popup-text-center font-16  mt10 mb10">
-                            尚未创建任务的实训，不能申请发布
+                            </div> :
+                            <div className="task-popup-content">
+                              <p className="task-popup-text-center font-16  mt10 mb10">
+                                尚未创建任务的实训，不能申请发布
                           </p>
-                        </div>
+                            </div>
                   }
                   <div className="mb15 clearfix edu-txt-center">
                     <a onClick={() => this.hiddenIssuevisible(publishboxstatus)}
-                       className="task-btn task-btn-orange pop_close">知道啦</a>
+                      className="task-btn task-btn-orange pop_close">知道啦</a>
                   </div>
 
                 </Modal>
 
-                {shixunsDetails.shixun_status === 2 && shixunsDetails.public===0 && this.props.identity < 5 ?
+                {shixunsDetails.shixun_status === 2 && shixunsDetails.public === 0 && this.props.identity < 5 ?
                   <Popover
-                  content={
-                  <pre className={"bannerpd201"}>
-                  <div>平台审核完成后，您的实训将会录入到平台的公共实训项目列表</div>
-                  <div className={"wechatcenter mt10"}>您将获得实训<span className={"FF6802"}>对应的经验值和金币</span>～ </div>
-                  <div className={"wechatcenter mt15"}><Button  type="primary" onClick={this.openshowpublic} >我知道了</Button></div>
-                  </pre>
-                }
-                  trigger="click"
-                  placement="bottom"
-                  visible={this.state.openshowpublictype}
+                    content={
+                      <pre className={"bannerpd201"}>
+                        <div>平台审核完成后，您的实训将会录入到平台的公共实训项目列表</div>
+                        <div className={"wechatcenter mt10"}>您将获得实训<span className={"FF6802"}>对应的经验值和金币</span>～ </div>
+                        <div className={"wechatcenter mt15"}><Button type="primary" onClick={this.openshowpublic} >我知道了</Button></div>
+                      </pre>
+                    }
+                    trigger="click"
+                    placement="bottom"
+                    visible={this.state.openshowpublictype}
                   >
                     <Tooltip placement="bottom" title={"审核通过后，平台用户可以查看实训"}>
                       <Button type="primary" ghost id="challenge_begin" onClick={this.openpublic} className="fr kaike kkbths mr20 font-18 height39">
                         申请公开
                       </Button>
                     </Tooltip>
-                  </Popover>: ""
+                  </Popover> : ""
                 }
 
-                {shixunsDetails.shixun_status === 2 && shixunsDetails.public===1 && this.props.identity < 5 ?
+                {shixunsDetails.shixun_status === 2 && shixunsDetails.public === 1 && this.props.identity < 5 ?
                   <Tooltip placement="bottom" title={"撤销后，仅可以使用到自己的课堂和课程"}>
-                    <Button type="primary" ghost id="challenge_begin" onClick={this.hidenpublic} className="fr kaike kkbths mr20 font-18 height39" style={{'width': '140px'}}>
+                    <Button type="primary" ghost id="challenge_begin" onClick={this.hidenpublic} className="fr kaike kkbths mr20 font-18 height39" style={{ 'width': '140px' }}>
                       撤销申请公开
                     </Button>
-                  </Tooltip>: ""
+                  </Tooltip> : ""
                 }
 
-                {shixunsDetails.shixun_status === 2 && shixunsDetails.public===0 && this.props.identity < 5 ?
+                {shixunsDetails.shixun_status === 2 && shixunsDetails.public === 0 && this.props.identity < 5 ?
                   <Tooltip placement="bottom" title={"撤销发布后，学员将无法进行练习"}>
-                  <a onClick={this.cancel_publish} className="fr kaike kkbths mr20 font-18 height39"
-                     id="challenge_begin">撤销发布</a>
+                    <a onClick={this.cancel_publish} className="fr kaike kkbths mr20 font-18 height39"
+                      id="challenge_begin">撤销发布</a>
                   </Tooltip>
                   : ""
                 }
 
                 {
-                  this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter===true?"":<a onClick={this.Senttothe}
-                     className="fr kaike kkbths mr20 font-18"
-                     data-tip-down=""
-                     style={{display: shixunsDetails.shixun_status === 0 || shixunsDetails.shixun_status === 3 || shixunsDetails.shixun_status === 1 || shixunsDetails.shixun_status === -1 ? "none" : "block"}}
-                     data-remote="true">
+                  this.props.shixunsDetails && this.props.shixunsDetails.is_jupyter === true ? "" : <a onClick={this.Senttothe}
+                    className="fr kaike kkbths mr20 font-18"
+                    data-tip-down=""
+                    style={{ display: shixunsDetails.shixun_status === 0 || shixunsDetails.shixun_status === 3 || shixunsDetails.shixun_status === 1 || shixunsDetails.shixun_status === -1 ? "none" : "block" }}
+                    data-remote="true">
                     <Tooltip placement="bottom" title={"以实训作业的形式发送到我的课堂"}>
                       发送至
                     </Tooltip>
                   </a>
                 }
 
+                {this.props && this.props.user && this.props.user.login === "" ? "" : shixunsDetails && shixunsDetails.is_collect === false ?
+                  <a onClick={() => this.setCollect()}
+                    className="fr kaike kkbths mr20 font-18"
+                  // style={{'width':'65px'}}
+                  >
+                    收藏
+                  </a> : ""
+                }
+
+                {this.props && this.props.user && this.props.user.login === "" ? "" : shixunsDetails && shixunsDetails.is_collect === true ?
+                  <a onClick={() => this.cancelCollect()}
+                    className="fr kaike kkbths mr20 font-18"
+                  >
+                    取消收藏
+                  </a> : ""
+                }
+
                 <Modal
                   keyboard={false}
                   title="发送实训"
@@ -1225,7 +1159,7 @@ class TPMBanner extends Component {
                           value={Searchvalue}
                           onInput={this.SenttotheValue}
                           onSearch={(value) => this.SenttotheSearch(value)}
-                          style={{width: '100%'}}
+                          style={{ width: '100%' }}
                         />
                       </div>
                       <style>
@@ -1245,7 +1179,7 @@ class TPMBanner extends Component {
                                 course_list === undefined ? "" : course_list.map((item, key) => {
                                   return (
                                     <Radio style={radioStyle} value={item.course_id}
-                                           key={key}>{item.name}</Radio>
+                                      key={key}>{item.name}</Radio>
                                   )
                                 })
                               }
@@ -1254,10 +1188,10 @@ class TPMBanner extends Component {
                         </div>
                       </div>
                       {this.state.Senttothevcaluetype === true ? <div className={"color-red"}>请选择你要发送的课堂</div> : ""}
-                      <div className="mt10 marginauto" style={{display: courses_count > 12 ? "block" : "none"}}>
+                      <div className="mt10 marginauto" style={{ display: courses_count > 12 ? "block" : "none" }}>
                         <Pagination size="small" className="mb20"
-                                    showQuickJumper defaultCurrent={1} current={pages} pageSize={10}
-                                    total={courses_count} onChange={this.onChangesendeSenttothe}/>
+                          showQuickJumper defaultCurrent={1} current={pages} pageSize={10}
+                          total={courses_count} onChange={this.onChangesendeSenttothe} />
                       </div>
 
                       <div className="mt10 marginauto flexbannerright">
@@ -1265,10 +1199,10 @@ class TPMBanner extends Component {
                         <div className={"-flex"}></div>
                         <div className={"-flex"}>
                           <a onClick={this.hideSenttothevcalue}
-                             className="pop_close task-btn mr10 ml25 margin-tp26">取消</a>
+                            className="pop_close task-btn mr10 ml25 margin-tp26">取消</a>
                           <a className="task-btn task-btn-orange margin-tp26"
-                             onClick={this.sendeSenttothevcalue}
-                             id="submit_send_shixun">确定</a>
+                            onClick={this.sendeSenttothevcalue}
+                            id="submit_send_shixun">确定</a>
                         </div>
 
 
@@ -1279,28 +1213,28 @@ class TPMBanner extends Component {
                 </Modal>
 
                 {shixunsDetails.shixun_status === 3 &&
-                <a className="fr kaike kkbths mr15 font-18">已关闭</a>
+                  <a className="fr kaike kkbths mr15 font-18">已关闭</a>
                 }
 
                 {shixunsDetails.shixun_status === -1 &&
-                <a className="fr kaike kkbths mr15 font-18">已删除</a>
+                  <a className="fr kaike kkbths mr15 font-18">已删除</a>
                 }
 
 
-                {this.props.identity < 8 && shixunsDetails.shixun_status != -1 && shixunsDetails.shixun_status != 0?
+                {this.props.identity < 8 && shixunsDetails.shixun_status != -1 && shixunsDetails.shixun_status != 0 ?
                   <div className="fr kaike kkbth mr20"
-                       style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "flex"}}>
+                    style={{ display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "flex" }}>
                     <Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}>
-                       <span className="flex1 edu-txt-center fl font-18"
-                             onClick={this.copyForkvisible}
-                             style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "inline-block"}}
-                       >
-                              Fork
+                      <span className="flex1 edu-txt-center fl font-18"
+                        onClick={this.copyForkvisible}
+                        style={{ display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "inline-block" }}
+                      >
+                        复制
                         </span>
                     </Tooltip>
 
 
-                    {Forkvisible===true?<style>
+                    {Forkvisible === true ? <style>
                       {
                         `
                         .ant-modal-body{ 
@@ -1308,10 +1242,10 @@ class TPMBanner extends Component {
                         }
                         `
                       }
-                    </style>:""}
+                    </style> : ""}
 
                     {
-                      this.state.TextAreaintshow===true?<style>
+                      this.state.TextAreaintshow === true ? <style>
                         {
                           `
                           .ant-input:hover {
@@ -1322,11 +1256,11 @@ class TPMBanner extends Component {
                           }
                           `
                         }
-                      </style>:""
+                      </style> : ""
                     }
-                    {Forkvisible===true?<Modal
+                    {Forkvisible === true ? <Modal
                       keyboard={false}
-                      title="Fork原因"
+                      title="复制原因"
                       visible={Forkvisible}
                       closable={false}
                       footer={null}
@@ -1334,12 +1268,12 @@ class TPMBanner extends Component {
                       {Forkvisibletype === true ?
                         <Spin
                           tip="请等待正在复制中..."
-                          style={{marginLeft: '38%'}}
+                          style={{ marginLeft: '38%' }}
                         >
                         </Spin> :
                         <div>
                           <div className="task-popup-content">
-                            <div className={"forkfactors"}>请根据实际情况，填写fork本实训的原因</div>
+                            <div className={"forkfactors"}>请根据实际情况，填写复制本实训的原因</div>
                             <Radio.Group onChange={this.onChangeRadiovalue} value={this.state.Radiovalue} className={"ml20 mt20 mb20"} style={{ width: "100%" }}>
                               <Radio style={radioStyle} value={1}>
                                 实训内容升级
@@ -1354,13 +1288,13 @@ class TPMBanner extends Component {
                                 其它原因
                               </Radio>
                               {this.state.Radiovalue === 4 ?
-                                <TextArea className={this.state.TextAreaintshow===true?"bor-red mt10":"mt10"}
-                                          placeholder="请填写fork原因（60字以内)"
-                                          value={this.state.TextArea}
-                                          rows={4} style={{ width: '85%', marginLeft: '30px' }} onInput={this.changeTextArea}
-                                          maxlength={60}
-                                />: null}
-                              {this.state.TextAreaintshow===true?<div className={"color-red ml30"}>不能为空</div>:""}
+                                <TextArea className={this.state.TextAreaintshow === true ? "bor-red mt10" : "mt10"}
+                                  placeholder="请填写fork原因（60字以内)"
+                                  value={this.state.TextArea}
+                                  rows={4} style={{ width: '85%', marginLeft: '30px' }} onInput={this.changeTextArea}
+                                  maxlength={60}
+                                /> : null}
+                              {this.state.TextAreaintshow === true ? <div className={"color-red ml30"}>不能为空</div> : ""}
                             </Radio.Group>
                           </div>
                           <div className="task-popup-submit clearfix">
@@ -1371,7 +1305,7 @@ class TPMBanner extends Component {
                       }
 
 
-                    </Modal>:""}
+                    </Modal> : ""}
 
                     <Modal
                       keyboard={false}
@@ -1381,7 +1315,7 @@ class TPMBanner extends Component {
                       footer={null}
                     >
                       <div className="task-popup-content"><p
-                        className="task-popup-text-center font-16 pb20">{can_fork}<br/>请问是否前往进行认证？</p>
+                        className="task-popup-text-center font-16 pb20">{can_fork}<br />请问是否前往进行认证？</p>
                       </div>
                       <div className="task-popup-submit clearfix">
                         <a onClick={this.hideForkvisible} className="task-btn fl">取消</a>
@@ -1389,9 +1323,9 @@ class TPMBanner extends Component {
                       </div>
                     </Modal>
                     {!!shixunsDetails.fork_num &&
-                    <Link to={"/shixuns/" + shixunId + "/fork_list"} className="forkNumst" data-tip-down="Fork实训列表">
-                      {shixunsDetails.fork_num}
-                    </Link>
+                      <Link to={"/shixuns/" + shixunId + "/fork_list"} className="forkNumst" data-tip-down="复制实训列表">
+                        {shixunsDetails.fork_num}
+                      </Link>
                     }
 
                   </div> : ""}
@@ -1402,7 +1336,7 @@ class TPMBanner extends Component {
 
           </div>
           <div className="alert alert-orange mb15 mt15 clearfix"
-               style={{display: shixunsDetails.shixun_status === 1 ? "block" : "none"}}
+            style={{ display: shixunsDetails.shixun_status === 1 ? "block" : "none" }}
           >正在等待管理员的审核。在审核通过前，可以随时撤销发布
           </div>
         </div>
diff --git a/src/modules/tpm/TPMChallenge.js b/src/modules/tpm/TPMChallenge.js
index 7835fc9f..88a4bdf7 100644
--- a/src/modules/tpm/TPMChallenge.js
+++ b/src/modules/tpm/TPMChallenge.js
@@ -1,63 +1,44 @@
 import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import PropTypes from 'prop-types';
-
-import { CircularProgress } from 'material-ui/Progress';
-
 import './TPMShixunDiscuss.css'
 
 import Challenges from './shixunchild/Challenges/Challenges'
 import Challengesjupyter from './shixunchild/Challenges/Challengesjupyter'
 import TPMRightSection from './component/TPMRightSection'
 
-import TPMNav from './component/TPMNav'
 
 class TPMChallenge extends Component {
-    constructor(props) {
-      super(props)
+  constructor(props) {
+    super(props)
 
-    }
+  }
 
-    render() {
-      const { loadingContent, shixun, user, match,jupyterbool,is_jupyter
-       } = this.props;
-      return (
-        <React.Fragment>
-          <div className="educontent clearfix mt30 mb80">
-
-            <div className="with65 fl " >
-                <TPMNav
-                    match={match}
-                    user={user}
-                    shixun={shixun}
-                    {...this.props}
-										is_jupyter={this.props.is_jupyter}
-                ></TPMNav>
-							{
-								is_jupyter===true?
-									<Challengesjupyter
-										{...this.props}
-									/>
-									:
-									<Challenges
-										{...this.props}
-									/>
-							}
-
-
-            </div>
-
-            <div className="with35 fr pl20">
-                  <TPMRightSection
-                      {...this.props}
-                  />
-            </div>
+  render() {
+    const { is_jupyter } = this.props;
+    return (
+      <React.Fragment>
+        <div className="educontent clearfix mt30 mb80">
+          <div className="with65 fl " >
+            {
+              is_jupyter === true ?
+                <Challengesjupyter
+                  {...this.props}
+                />
+                :
+                <Challenges
+                  {...this.props}
+                />
+            }
           </div>
-        </React.Fragment>
+          <div className="with35 fr pl20">
+            <TPMRightSection
+              {...this.props}
+            />
+          </div>
+        </div>
+      </React.Fragment>
 
-      );
-    }
+    );
+  }
 }
 
 export default TPMChallenge;
diff --git a/src/modules/tpm/TPMChallengeContainer.js b/src/modules/tpm/TPMChallengeContainer.js
index 9fc1f44f..a76c109a 100644
--- a/src/modules/tpm/TPMChallengeContainer.js
+++ b/src/modules/tpm/TPMChallengeContainer.js
@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import { Redirect } from 'react-router';
 import TPMChallenge from './TPMChallenge';
 class TPMChallengeContainer extends Component {
   constructor(props) {
@@ -12,26 +11,22 @@ class TPMChallengeContainer extends Component {
     }
   }
 
-    render() {
-        const { tpmLoading } = this.props;
-        const user = this.props.current_user;
-        // console.log("TPMChallengeContainerTPMChallengeContainer");
-			  // console.log(this.props);
+  render() {
+    const { tpmLoading } = this.props;
+    return (
+      <React.Fragment>
 
-			return (
-          <React.Fragment>
+        {tpmLoading ? <div style={{ minHeight: '886px' }}></div> :
+          <TPMChallenge
+            {...this.props}
+            is_jupyter={this.props.is_jupyter}
+          >
+          </TPMChallenge>
+        }
 
-              { tpmLoading ? <div style={{ minHeight: '886px'}}></div> :
-              <TPMChallenge
-                  {...this.props}
-									is_jupyter={this.props.is_jupyter}
-              >
-              </TPMChallenge>
-              }
-
-          </React.Fragment>
-        );
-    }
+      </React.Fragment>
+    );
+  }
 }
 
 export default TPMChallengeContainer;
diff --git a/src/modules/tpm/TPMDataset.js b/src/modules/tpm/TPMDataset.js
index 3515d99d..9b119c9c 100644
--- a/src/modules/tpm/TPMDataset.js
+++ b/src/modules/tpm/TPMDataset.js
@@ -347,7 +347,7 @@ class TPMDataset extends Component {
 	handleChange = (info) => {
 		// console.log("handleChange123123");
 		// console.log(info);
-     //debugger
+     
 		this.setState({
 			Buttonloading:true
 		})
@@ -414,7 +414,7 @@ class TPMDataset extends Component {
 
 
 	onAttachmentRemove = (file) => {
-		// debugger
+		
 		if(!file.percent || file.percent == 100){
 			confirm({
 				title: '确定要删除这个附件吗?',
diff --git a/src/modules/tpm/TPMFork/TPMForklist.js b/src/modules/tpm/TPMFork/TPMForklist.js
index 59d9d23b..a167cda7 100644
--- a/src/modules/tpm/TPMFork/TPMForklist.js
+++ b/src/modules/tpm/TPMFork/TPMForklist.js
@@ -1,38 +1,18 @@
-import React, {Component} from 'react';
-
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Pagination,Tooltip,Spin} from 'antd';
-
-import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
-
-// import "antd/dist/antd.css";
-
-import { Rating } from "@icedesign/base";
-
+import React, { Component } from 'react';
+import { Pagination, Tooltip, Spin, Rate } from 'antd';
 import axios from 'axios';
 
-import {getImageUrl, toPath, getUrl} from 'educoder'
+import { getImageUrl } from 'educoder'
 
 import './shixunCss/fork.css';
 
-let origin = getUrl();
-
-let path = getUrl("/editormd/lib/")
-
-const $ = window.$;
-
-let timeout;
-
-let currentValue;
-
-
-
 export default class TPMFork_listComponent extends Component {
   constructor(props) {
     super(props)
     this.state = {
-      shixuns:undefined,
-      total_count:0,
-      shixunsID:undefined,
+      shixuns: undefined,
+      total_count: 0,
+      shixunsID: undefined,
       Forkvisible: true,
       Forkcurrent: 1
     }
@@ -42,73 +22,73 @@ export default class TPMFork_listComponent extends Component {
   componentDidMount() {
     let id = this.props.match.params.shixunId;
 
-    let Url="/shixuns/"+id+"/fork_list.json";
+    let Url = "/shixuns/" + id + "/fork_list.json";
     axios.get(Url, {
       params: {
-        page:1,
-        limit:8
+        page: 1,
+        limit: 8
       }
-    }).then((response)=> {
+    }).then((response) => {
       this.setState({
-        shixunsID:id,
-        shixuns:response.data.shixuns,
-        total_count:response.data.total_count,
-        Forkvisible:false
+        shixunsID: id,
+        shixuns: response.data.shixuns,
+        total_count: response.data.total_count,
+        Forkvisible: false
       })
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error)
     });
   }
 
 
-  TPMForkonChange=(pageNumber)=>{
+  TPMForkonChange = (pageNumber) => {
     let id = this.props.match.params.shixunId;
     this.setState({
-      Forkvisible:true
+      Forkvisible: true
     })
-    let Url="/shixuns/"+id+"/fork_list.json";
+    let Url = "/shixuns/" + id + "/fork_list.json";
     axios.get(Url, {
       params: {
-        page:pageNumber,
-        limit:8
+        page: pageNumber,
+        limit: 8
       }
-    }).then((response)=> {
+    }).then((response) => {
       this.setState({
-        shixunsID:id,
-        shixuns:response.data.shixuns,
-        total_count:response.data.total_count,
+        shixunsID: id,
+        shixuns: response.data.shixuns,
+        total_count: response.data.total_count,
         Forkvisible: false,
         Forkcurrent: pageNumber
       })
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error)
     });
   }
   render() {
 
-    let {shixuns, total_count, shixunsID, Forkvisible, Forkcurrent} = this.state;
+    let { shixuns, total_count, shixunsID, Forkvisible, Forkcurrent } = this.state;
 
-		const MyRate = ({ defaultValue, ...rest }) => {
-			let myValue = defaultValue;
-			// console.log(myValue-Math.floor(myValue))
-			// if (myValue < Math.ceil(myValue)) {
-			// 	myValue = Math.floor(myValue) + 0.5;
-			// }
+    const MyRate = ({ defaultValue, ...rest }) => {
+      let myValue = defaultValue;
+      // console.log(myValue-Math.floor(myValue))
+      // if (myValue < Math.ceil(myValue)) {
+      // 	myValue = Math.floor(myValue) + 0.5;
+      // }
 
-			return <Rating {...rest} value={myValue} />;
-		};
+      return <Rate {...rest} value={myValue} />;
+    };
     return (
       <React.Fragment>
         <div className="educontent mb20">
 
           <div className="edu-back-white padding20 clearfix mt30">
             <span className="fl font-16">Fork实训列表</span>
-            <a href={"/shixuns/"+shixunsID+"/challenges"} className="font-16 color-grey-9 fr">返回</a>
+            <a href={"/shixuns/" + shixunsID + "/challenges"} className="font-16 color-grey-9 fr">返回</a>
           </div>
 
-					<style>
-						{
-							`
+          <style>
+            {
+              `
 							.taglistleft{
 								position: absolute;
 								left: 10px;
@@ -116,14 +96,14 @@ export default class TPMFork_listComponent extends Component {
 							}
 
 							`
-						}
-					</style>
+            }
+          </style>
           {/*<Loading visible={Forkvisible} shape="dot-circle" style={{width:'100%'}}color='#4AC7FF'>*/}
-					<Spin spinning={Forkvisible}  size="large" style={{marginTop:'15%'}}>
+          <Spin spinning={Forkvisible} size="large" style={{ marginTop: '15%' }}>
             <div className="mt30 square-list clearfix mh320">
 
-              { shixuns===undefined?" ":shixuns.map((item,key)=>{
-                return(
+              {shixuns === undefined ? " " : shixuns.map((item, key) => {
+                return (
                   <div className="square-Item" key={key} id={item.id}>
 
                     <div className="tag-green taglistleft">
@@ -133,46 +113,46 @@ export default class TPMFork_listComponent extends Component {
 
                     <div className={item.power === false ? "closeSquare" : "none"}>
                       <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
-                           className="mt80 mb25"/>
+                        className="mt80 mb25" />
                       <p className="font-14 color-white">非试用内容，需要授权</p>
                     </div>
 
-                    <a href={"/shixuns/"+item.identifier+"/challenges"} className="square-img" target="_blank">
-                      <img  src={'/'+item.pic}/>
+                    <a href={"/shixuns/" + item.identifier + "/challenges"} className="square-img" target="_blank">
+                      <img src={'/' + item.pic} />
                     </a>
 
                     <div className="square-main">
                       <p className="task-hide">
-                        <a href={"/shixuns/"+item.identifier+"/challenges"} target="_blank" className="justify color-grey-name">
+                        <a href={"/shixuns/" + item.identifier + "/challenges"} target="_blank" className="justify color-grey-name">
                           {item.name}
                         </a>
                       </p>
 
                       <p className="clearfix mt8 ml-3">
-												<span className="rateYoStar fl" style={{padding: '0px',height: '20px',lineHeight: '19px',cursor: 'default'}} title="">
-															<MyRate key={key} allowHalf defaultValue={item.score_info===null?5:item.score_info} disabled/>
-												</span>
-                        <span className="fl ml25 font-12 color-grey-9 lineh-12 mt4">{item.score_info===null?"5分":item.score_info+"分"}</span>
+                        <span className="rateYoStar fl" style={{ padding: '0px', height: '20px', lineHeight: '19px', cursor: 'default' }} title="">
+                          <MyRate key={key} allowHalf defaultValue={item.score_info === null ? 5 : item.score_info} disabled />
+                        </span>
+                        <span className="fl ml25 font-12 color-grey-9 lineh-12 mt4">{item.score_info === null ? "5分" : item.score_info + "分"}</span>
                       </p>
 
                       <p className="clearfix mt8 font-12 color-grey-B4">
 
                         <Tooltip placement="bottom" title={"关卡"}>
-                            <span className="mr10 fl squareIconSpan">
-                                  <i className="iconfont icon-shixunguanqia fl mr3"></i>{item.challenges_count}
-                            </span>
+                          <span className="mr10 fl squareIconSpan">
+                            <i className="iconfont icon-shixunguanqia fl mr3"></i>{item.challenges_count}
+                          </span>
                         </Tooltip>
 
                         {/*<Tooltip placement="bottom" title={"经验值"}>*/}
-                            {/*<span className="mr10 fl squareIconSpan">*/}
-                                  {/*<i className="iconfont icon-jingyan fl mr3"></i>{item.exp}*/}
-                            {/*</span>*/}
+                        {/*<span className="mr10 fl squareIconSpan">*/}
+                        {/*<i className="iconfont icon-jingyan fl mr3"></i>{item.exp}*/}
+                        {/*</span>*/}
                         {/*</Tooltip>*/}
 
                         <Tooltip placement="bottom" title={"学习人数"}>
-                            <span className="mr10 fl squareIconSpan" style={{display:item.stu_num===0?"none":'block'}}>
-                                  <i className="iconfont icon-chengyuan fl mr3"></i>{item.stu_num}
-                            </span>
+                          <span className="mr10 fl squareIconSpan" style={{ display: item.stu_num === 0 ? "none" : 'block' }}>
+                            <i className="iconfont icon-chengyuan fl mr3"></i>{item.stu_num}
+                          </span>
                         </Tooltip>
 
 
@@ -187,8 +167,8 @@ export default class TPMFork_listComponent extends Component {
             </div>
 
             {/*<div>{total_count}</div>*/}
-            <div className="educontent mb80 edu-txt-center mt10" style={{display: total_count > 8 ? "block" : "none"}}>
-            {/*<div className={total_count < 9 ? " ml32" : "ml105"}>*/}
+            <div className="educontent mb80 edu-txt-center mt10" style={{ display: total_count > 8 ? "block" : "none" }}>
+              {/*<div className={total_count < 9 ? " ml32" : "ml105"}>*/}
               <Pagination
                 showQuickJumper
                 defaultCurrent={1}
@@ -200,9 +180,9 @@ export default class TPMFork_listComponent extends Component {
                     display: total_count < 9 ? 'none' : 'block'
                   }
                 }
-                onChange={this.TPMForkonChange}/>
+                onChange={this.TPMForkonChange} />
             </div>
-					</Spin>
+          </Spin>
           {/*</Loading>*/}
         </div>
       </React.Fragment>
diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css
index 4f19260a..7ced4806 100644
--- a/src/modules/tpm/TPMIndex.css
+++ b/src/modules/tpm/TPMIndex.css
@@ -1,299 +1,378 @@
-/* html{
-    height: 100%;
-    overflow: hidden;
-} */
-body {
-  overflow: auto !important;
-    font-family: "Microsoft YaHei";
+#root {
+  /* ie兼容性 */
+  position: relative;
+  min-height: 100%;
 }
 
-#root {
-	/* ie兼容性 */
-	position: relative;
-    min-height: 100%;
+body {
+  overflow: auto !important;
 }
+
 body>.-task-title {
-	opacity: 1 !important;
+  opacity: 1 !important;
 }
-/*�����Ŵ󾵵�����·Ŵ󾵵�λ��*/
+
 #root .search-all {
-	width: 219px;
+  width: 219px;
 }
 
 /*Header START*/
 .newHeader .logoimg {
-    margin-top: 16px;
-    float: left;
-    width: 97px;
+  margin-top: 16px;
+  float: left;
+  width: 97px;
 }
+
 .head-right i {
-	font-size: 20px;
-	float: none !important;
+  font-size: 20px;
+  float: none !important;
 }
-.headIcon, #header_keyword_search {
-    padding-top: 13px !important;
+
+.headIcon,
+#header_keyword_search {
+  padding-top: 13px !important;
 }
+
 .search-icon {
-	height: 30px !important;
+  height: 30px !important;
 }
+
 .search-icon i {
-	font-size: 20px;
+  font-size: 20px;
 }
+
 #header_keyword_search i {
-	color: #4cacff;
-}
-.ant-select-selection--multiple{
-	padding-bottom: 0px!important;
-    padding-top:3px;
-}
-/* 先注释掉下面2个样式，这样写影响范围太广了，并不是所有的select都需要40px高 */
-/* .ant-select-selection--single{
-	height:40px!important;
-}
-.ant-select-selection__rendered{
-	line-height: 40px!important;
-} */
-.ant-select-selection--multiple .ant-select-selection__rendered>ul>li, .ant-select-selection--multiple>ul>li{
-	height: 25px!important;
-    line-height: 23px!important;
-    margin-bottom:3px;
-    margin-top:0px;
-}
-/*Main START*/
-
-
-.newContainer{
-  background: #fafafa!important;
+  color: #4cacff;
 }
 
-.ant-modal-title{
-	font-size: 16px;
-	font-weight: bold !important;
-	color: #333;
+.ant-select-selection--multiple {
+  padding-bottom: 0px !important;
+  padding-top: 3px;
 }
 
-.ant-modal-title{
-	text-align: center;
+.ant-select-selection--multiple .ant-select-selection__rendered>ul>li,
+.ant-select-selection--multiple>ul>li {
+  height: 25px !important;
+  line-height: 23px !important;
+  margin-bottom: 3px;
+  margin-top: 0px;
+}
+
+.newContainer {
+  background: #fafafa !important;
+}
+
+.ant-modal-title {
+  font-size: 16px;
+  font-weight: bold !important;
+  color: #333;
+}
+
+.ant-modal-title {
+  text-align: center;
 }
-/*.ant-modal{*/
-	/*top:10rem !important;*/
-/*}*/
 
 @-moz-document url-prefix() {
-    .ant-radio-inner {
-        width: 17px !important;
-        height: 17px !important;
-    }
+  .ant-radio-inner {
+    width: 17px !important;
+    height: 17px !important;
+  }
 }
+
 /* IE只能用padding，不能用上下居中 */
-.shixunDetail_top{
-	display: block!important;
-	padding-top: 48px;
-}
-.totalScore{
-	display: block!important;
-	padding-top: 40px;
-}
-.head-nav ul#header-nav li{
-	/*font-weight: 600;*/
+.shixunDetail_top {
+  display: block !important;
+  padding-top: 48px;
 }
 
-/*.newFooter{*/
-	/*position: fixed  !important;*/
-/*}*/
-
-.edu-menu-panel .edu-menu-listnew:hover .careersiconfont{
-	color: #000 !important;
+.totalScore {
+  display: block !important;
+  padding-top: 40px;
 }
 
+.edu-menu-panel .edu-menu-listnew:hover .careersiconfont {
+  color: #000 !important;
+}
 
 .newHeader {
-    background: #24292D !important;
-    height: 60px !important;
+  background: #24292D !important;
+  height: 60px !important;
 }
 
-
 /*-------------------个人主页：右侧提示区域--------------------------*/
-.-task-sidebar{position:fixed;width:40px;height:180px;right:0;bottom:80px !important;z-index: 10;}
-.-task-sidebar>div{height: 40px;line-height: 40px;box-sizing: border-box;width:40px;background:#4CACFF;color:#fff;font-size:20px;text-align:center;margin-bottom:5px;border-radius: 4px;}
-.-task-sidebar>div i{ color:#fff;}
-.-task-sidebar>div i:hover{color: #fff!important;}
-.gotop{background-color: rgba(208,207,207,0.5)!important;padding: 0px!important;}
-.-task-desc{background:#494949;width:90px;line-height: 36px;text-align: center;
-    position: absolute;color: #fff;font-size: 13px;z-index: 999999;opacity: 0;}
-.-task-desc div{position: absolute;top:10px;right: -7px;height: 13px;}
-.-task-desc div img{float: left}
-.-task-sidebar  .scan_ewm{
-    position: absolute !important;
-    right: 45px !important;
-    bottom: 0px !important;
-    background-color: #494949 !important;
-    -webkit-box-sizing: border-box !important;
-    box-sizing: border-box !important;
-    font-size: 14px !important;
-    line-height: 16px !important;
-    display: none;
-    height: 213px !important;
+.-task-sidebar {
+  position: fixed;
+  width: 40px;
+  height: 180px;
+  right: 0;
+  bottom: 20px !important;
+  z-index: 10;
 }
-.trangle_right{position: absolute;right: -5px;bottom: 15px;width: 0;height: 0px;border-top: 6px solid transparent;border-left: 5px solid #494949;border-bottom: 6px solid transparent}
 
-.HeaderSearch{
-    margin-top: 18px;
-    margin-right: 20px;
+.-task-sidebar>div {
+  height: 40px;
+  line-height: 40px;
+  box-sizing: border-box;
+  width: 40px;
+  background: #4CACFF;
+  color: #fff;
+  font-size: 20px;
+  text-align: center;
+  margin-bottom: 5px;
+  border-radius: 4px;
 }
-.HeaderSearch .ant-input-search .ant-input{
-    /*height:30px;*/
-    background: #373e3f !important;
-    border: 1px solid #373e3f !important;
+
+.-task-sidebar>div i {
+  color: #fff;
+}
+
+.-task-sidebar>div i:hover {
+  color: #fff !important;
+}
+
+.gotop {
+  background-color: rgba(208, 207, 207, 0.5) !important;
+  padding: 0px !important;
+}
+
+.-task-desc {
+  background: #494949;
+  width: 90px;
+  line-height: 36px;
+  text-align: center;
+  position: absolute;
+  color: #fff;
+  font-size: 13px;
+  z-index: 999999;
+  opacity: 0;
+}
+
+.-task-desc div {
+  position: absolute;
+  top: 10px;
+  right: -7px;
+  height: 13px;
+}
+
+.-task-desc div img {
+  float: left
+}
+
+.-task-sidebar .scan_ewm {
+  position: absolute !important;
+  right: 45px !important;
+  bottom: 0px !important;
+  background-color: #494949 !important;
+  -webkit-box-sizing: border-box !important;
+  box-sizing: border-box !important;
+  font-size: 14px !important;
+  line-height: 16px !important;
+  display: none;
+  height: 213px !important;
+}
+
+.trangle_right {
+  position: absolute;
+  right: -5px;
+  bottom: 15px;
+  width: 0;
+  height: 0px;
+  border-top: 6px solid transparent;
+  border-left: 5px solid #494949;
+  border-bottom: 6px solid transparent
+}
+
+.HeaderSearch {
+  margin-top: 18px;
+  margin-right: 20px;
+}
+
+.HeaderSearch .ant-input-search .ant-input {
+  /*height:30px;*/
+  background: #373e3f !important;
+  border: 1px solid #373e3f !important;
 
 }
-.ant-input-search .ant-input-affix-wrapper{
-    border:transparent;
+
+.ant-input-search .ant-input-affix-wrapper {
+  border: transparent;
 }
+
 .ant-input-affix-wrapper:hover .ant-input:not(.ant-input-disabled) {
-    /* 比较奇怪的需求，先注释掉了，如果需要启用，麻烦增加class限制，别影响别的地方的使用 */
-    /* border-color: transparent; */
+  /* 比较奇怪的需求，先注释掉了，如果需要启用，麻烦增加class限制，别影响别的地方的使用 */
+  /* border-color: transparent; */
 }
 
 .ant-input:focus {
-    /*border-color: transparent;*/
-    border-right-width: 1px !important;
-    outline: 0;
-    -webkit-box-shadow: 0 0 0 2px transparent;
-    box-shadow: 0 0 0 2px transparent;
-    border: 1px solid #d9d9d9;
+  /*border-color: transparent;*/
+  border-right-width: 1px !important;
+  outline: 0;
+  -webkit-box-shadow: 0 0 0 2px transparent;
+  box-shadow: 0 0 0 2px transparent;
+  border: 1px solid #d9d9d9;
 }
 
-.HeaderSearch .ant-input-search .ant-input::-webkit-input-placeholder{
-    color: #999;
-    font-size: 14px;
+.HeaderSearch .ant-input-search .ant-input::-webkit-input-placeholder {
+  color: #999;
+  font-size: 14px;
 }
 
 .HeaderSearch .ant-input-search .ant-input:-moz-placeholder {
-    color: #999;
-    font-size: 14px;
+  color: #999;
+  font-size: 14px;
 }
 
-.HeaderSearch .ant-input-search .ant-input::-moz-placeholder{
-    color: #999;
-    font-size: 14px;
+.HeaderSearch .ant-input-search .ant-input::-moz-placeholder {
+  color: #999;
+  font-size: 14px;
 }
 
-.HeaderSearch .ant-input-search .ant-input:-ms-input-placeholder{
-    color: #999;
-    font-size: 14px;
+.HeaderSearch .ant-input-search .ant-input:-ms-input-placeholder {
+  color: #999;
+  font-size: 14px;
 }
 
 .HeaderSearch .ant-input-search .ant-input-suffix .anticon-search {
-    color: #999;
+  color: #999;
 }
 
-.HeaderSearch .ant-input-search .ant-input{
-    color: #fff;
+.HeaderSearch .ant-input-search .ant-input {
+  color: #fff;
 }
 
-.HeaderSearch .ant-input-search .ant-input-suffix{
-    background: transparent !important;
+.HeaderSearch .ant-input-search .ant-input-suffix {
+  background: transparent !important;
 }
 
-.roundedRectangles{
-    position: absolute;
-    top: 10px;
-    right: -22px;
+.roundedRectangles {
+  position: absolute;
+  top: 10px;
+  right: -22px;
 }
 
-.HeaderSearch{
-    width: 325px;
-    /*right: 20px;*/
-}
-.HeaderSearch .ant-input-search{
-    right: 20px;
-}
-.mainheighs{
- height: 100%;
- display: block;
+.HeaderSearch {
+  width: 325px;
+  /*right: 20px;*/
 }
 
-.ml18a{
-    margin-left:18%;
+.HeaderSearch .ant-input-search {
+  right: 20px;
 }
 
-.logoimg{
-    float: left;
-    min-width: 40px;
-    height:40px;
+.mainheighs {
+  height: 100%;
+  display: block;
 }
 
-.headwith100b{
-    width: 100%;
-}
-.wechatcenter{
-    text-align: center;
+.ml18a {
+  margin-left: 18%;
 }
 
-.myrigthsiderbar{
-    right: 9% !important;
+.logoimg {
+  float: left;
+  min-width: 40px;
+  height: 40px;
 }
 
-.feedbackdivcolor{
-    background: #33BD8C !important;
-    height: 49px !important;
-    line-height: 24px !important;
+.headwith100b {
+  width: 100%;
 }
-.xiaoshou{
-    cursor:pointer
+
+.wechatcenter {
+  text-align: center;
 }
-.questiontypes{
-    width:37px;
-    height:17px;
-    font-size:12px;
-    color:rgba(51,51,51,1);
-    line-height:17px;
-    cursor:pointer;
+
+.myrigthsiderbar {
+  right: 9% !important;
+}
+
+.feedbackdivcolor {
+  background: #33BD8C !important;
+  height: 49px !important;
+  line-height: 24px !important;
+}
+
+.xiaoshou {
+  cursor: pointer
+}
+
+.questiontypes {
+  width: 37px;
+  height: 17px;
+  font-size: 12px;
+  color: rgba(51, 51, 51, 1);
+  line-height: 17px;
+  cursor: pointer;
 
 }
-.questiontype{
-    width: 100%;
-    font-size: 12px;
-    color: #333333;
-    line-height: 17px;
-    text-align: center;
-    padding: 11px;
-    cursor:pointer;
+
+.questiontype {
+  width: 100%;
+  font-size: 12px;
+  color: #333333;
+  line-height: 17px;
+  text-align: center;
+  padding: 11px;
+  cursor: pointer;
 
 }
-.questiontypeheng{
-    width:100%;
-    height:1px;
-    background: #EEEEEE;
+
+.questiontypeheng {
+  width: 100%;
+  height: 1px;
+  background: #EEEEEE;
 }
-.mystask-sidebar{
-    right: 220px !important;
+
+.mystask-sidebar {
+  right: 181px !important;
 }
-.mystask-sidebars{
-    right: 20px !important;
+
+.mystask-sidebars {
+  right: 20px !important;
 }
-.shitikussmys{
-    width:29px !important;
-    height:20px!important;
-    background:#FF6601 !important;
-    border-radius:10px !important;
-    position: absolute !important;
-    font-size:11px !important;
-    color:#ffffff !important;
-    line-height:20px !important;
-    top: -13px !important;
-    right: -10px !important;
+
+.shitikussmys {
+  width: 29px !important;
+  height: 20px !important;
+  background: #FF6601 !important;
+  border-radius: 10px !important;
+  position: absolute !important;
+  font-size: 11px !important;
+  color: #ffffff !important;
+  line-height: 20px !important;
+  top: -13px !important;
+  right: -10px !important;
 }
 
 
-.maxnamewidth30{
-    max-width: 30px;
-    overflow:hidden;
-    text-overflow:ellipsis;
-    white-space:nowrap;
-    cursor: default;
+.maxnamewidth30 {
+  max-width: 30px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
 }
-.mystask-sidebarss{
-    right: 5px !important;
+
+.mystask-sidebarss {
+  right: 5px !important;
 }
+
+.simple-rate {
+  font-size: 16px !important;
+}
+
+.ant-rate-star:not(:last-child) {
+  margin-right: 2px !important;
+}
+
+.flex-container {
+  display: flex;
+  flex-flow: row nowrap;
+  margin-bottom: 4px;
+  align-items: center;
+}
+
+.progress-container {
+  flex: 1 0 0;
+  margin-left: 20px;
+}
\ No newline at end of file
diff --git a/src/modules/tpm/TPMIndex.js b/src/modules/tpm/TPMIndex.js
index 654e2735..c4d5c663 100644
--- a/src/modules/tpm/TPMIndex.js
+++ b/src/modules/tpm/TPMIndex.js
@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
 
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+import { Route, Link, Switch } from "react-router-dom";
 
-import { Row, Col ,Menu,Popover,Button} from 'antd';
+import { Menu } from 'antd';
 
 import Loading from '../../Loading';
 
@@ -30,381 +30,289 @@ import TPMRanking_listComponent from './TPMRanking_listContainer';
 import TPMCollaboratorsComponent from './TPMCollaboratorsContainer';
 import Audit_situationComponent from './Audit_situationComponent';
 import TPMDataset from './TPMDataset';
-import TPMNav from './component/TPMNav';
 
 import '../page/tpiPage.css';
 
-//任务
-// const TPMChallengeComponent = Loadable({
-//   loader: () => import('./TPMChallengeContainer'),
-//   loading: Loading,
-//   })
-
-//背景知识
-// const TPMPropaedeuticsComponent = Loadable({
-//   loader: () => import('./TPMPropaedeuticsComponent'),
-//   loading: Loading,
-//   })
-
-//版本库
-// const TPMRepositoryComponent = Loadable({
-//   loader: () => import('./TPMRepositoryComponent'),
-//   loading: Loading,
-//   })
-
-// const TPMRepositoryComponent = Loadable({
-//   loader: () => import('./TPMRepositoryComponent'),
-//   loading: Loading,
-//   })
-
-//合作
-// const TPMCollaboratorsComponent = Loadable({
-// loader: () => import('./TPMCollaboratorsContainer'),
-// loading: Loading,
-// })
-
-
-//评论
-// const TPMShixunDiscussComponent = Loadable({
-//   loader: () => import('./TPMShixunDiscussContainer'),
-//   loading: Loading,
-//   })
-
-//排行版
-// const TPMRanking_listComponent = Loadable({
-// loader: () => import('./TPMRanking_listContainer'),
-// loading: Loading,
-// })
-
-// //编辑实训
-// const TPMModifysettings = Loadable({
-//   loader: () =>import('./modules/tpm/TPMsettings/TPMsettings'),
-//   loading: Loading,
-//   })
-
 //新建实训
 const TPMchallengesnew = Loadable({
-    loader: () => import('./challengesnew/TPMchallengesnew'),
-    loading: Loading,
+  loader: () => import('./challengesnew/TPMchallengesnew'),
+  loading: Loading,
 })
-//新建实训
-// const TPMchallengesnew = Loadable({
-//   loader: () => import('./challengesnew/TpmTask/TpmTaskIndex'),
-//   loading: Loading,
-// })
 
 //新建tab2
 const TPMevaluation = Loadable({
-    loader: () => import('./challengesnew/TPMevaluation'),
-    loading: Loading,
+  loader: () => import('./challengesnew/TPMevaluation'),
+  loading: Loading,
 })
 
-//新建tab3答案
-// const TPManswer = Loadable({
-//     loader: () => import('./challengesnew/TPManswer'),
-//     loading: Loading,
-// })
 const TPManswer = Loadable({
-    loader: () => import('./challengesnew/TPManswer2'),
-    loading: Loading,
+  loader: () => import('./challengesnew/TPManswer2'),
+  loading: Loading,
 })
 
 //选择题
 const TPMquestion = Loadable({
-    loader: () => import('./challengesnew/TPMquestion'),
-    loading: Loading,
+  loader: () => import('./challengesnew/TPMquestion'),
+  loading: Loading,
 })
 
 //fork列表
 const TPMFork_listComponent = Loadable({
-    loader: () => import('./TPMFork/TPMForklist'),
-    loading: Loading,
+  loader: () => import('./TPMFork/TPMForklist'),
+  loading: Loading,
 })
 //背景知识修改
 const TPMUpdatepropaede = Loadable({
-    loader: () => import('./TPMUpdatepropaede/TPMUpdatepropaede'),
-    loading: Loading,
+  loader: () => import('./TPMUpdatepropaede/TPMUpdatepropaede'),
+  loading: Loading,
 })
 
-
-
 // 版本库添加文件
 const AddFile = Loadable({
-	loader: () => import('./shixunchild/Repository/RepositoryAddFile'),
-	loading: Loading,
+  loader: () => import('./shixunchild/Repository/RepositoryAddFile'),
+  loading: Loading,
+})
+// 版本库上传文件
+const Uploadfile = Loadable({
+  loader: () => import('./shixunchild/Repository/RepositoryAddFileupload_file'),
+  loading: Loading,
 })
 
-const interceptorUrlArray = ['repository.json', 'commits.json', 'propaedeutics.json'
-    , 'challenges.json', 'discusses.json', 'ranking_list.json', 'collaborators.json']
 const cacheInterceptorUrlMap = {}
 class TPMIndex extends Component {
-    constructor(props) {
-      super(props)
-      this.state = {
-          loadingContent: false,
-          power: false,
-          shixunsDetails: {},
-          shixunId: undefined,
-          star_info: [0, 0, 0, 0, 0, 0],
-          star_infos: [0, 0, 0, 0, 0, 0],
-          identity:undefined,
-          TPMRightSectionData:undefined,
-          PropaedeuticsList: undefined,
-				  tpmindexjupyterbool:false,
-				  is_jupyter:false,
-          selectedKeys:"",
-          openknows:false
-      }
+  constructor(props) {
+    super(props)
+    this.state = {
+      loadingContent: false,
+      power: false,
+      shixunsDetails: {},
+      shixunId: undefined,
+      star_info: [0, 0, 0, 0, 0, 0],
+      star_infos: [0, 0, 0, 0, 0, 0],
+      identity: undefined,
+      TPMRightSectionData: undefined,
+      PropaedeuticsList: undefined,
+      tpmindexjupyterbool: false,
+      is_jupyter: false,
+      selectedKeys: "",
+      openknows: false,
+      newathArray: []
     }
+  }
 
-    openknow=()=>{
-      let storage=window.localStorage;
-      this.setState({
-        openknows:false
-      })
-      let newTPMsettings=this.props.user&&this.props.user.user_id+'newTPMsettings'
-      storage.setItem(newTPMsettings,false);
-    }
+  openknow = () => {
+    let storage = window.localStorage;
+    this.setState({
+      openknows: false
+    })
+    let newTPMsettings = this.props.user && this.props.user.user_id + 'newTPMsettings'
+    storage.setItem(newTPMsettings, false);
+  }
 
 
   componentDidUpdate(prevProps, prevState) {
-    if (prevProps!=this.props) {
-        if(this.props.user&&this.props.user.user_id){
-          let getnewTPMsettings=this.props.user&&this.props.user.user_id+'newTPMsettings';
-          let newTPMsettings=window.localStorage.getItem(getnewTPMsettings)
-          if(newTPMsettings===undefined||newTPMsettings===false||newTPMsettings===null){
-            this.setState({
-              openknows:false
-            })
-          }else{
-            this.setState({
-              openknows:false
-            })
-          }
+    if (prevProps != this.props) {
+      if (this.props.user && this.props.user.user_id) {
+        let getnewTPMsettings = this.props.user && this.props.user.user_id + 'newTPMsettings';
+        let newTPMsettings = window.localStorage.getItem(getnewTPMsettings)
+        if (newTPMsettings === undefined || newTPMsettings === false || newTPMsettings === null) {
+          this.setState({
+            openknows: false
+          })
+        } else {
+          this.setState({
+            openknows: false
+          })
         }
       }
     }
+  }
 
-    getcomponentdidmount=()=>{
-      let userid=this.props.user&&this.props.user.user_id;
-      let getnewTPMsettings=this.props.user&&this.props.user.user_id+'newTPMsettings';
-      let newTPMsettings=window.localStorage.getItem(getnewTPMsettings)
-      let id = this.props.match.params.shixunId;
-      // console.log('props', this.props);
-      // let collaborators = `/shixuns/` + id + `/propaedeutics.json`;
-      //
-      // axios.get(collaborators).then((response) => {
-      //     if (response.status === 200) {
-      //         if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
-      //
-      //         }else{
-      //             this.setState({
-      //                 PropaedeuticsList: response.data,
-      //                 shixunId: id
-      //             });
-      //         }
-      //
-      //     }
-      // }).catch((error) => {
-      //     console.log(error)
-      // });
-      let Url = `/shixuns/` + id + `.json`;
-      axios.get(Url).then((response) => {
-        if (response.status === 200) {
-          document.title=response.data.name;
-          let newstar_info = [];
-          // let start1=
-          for (var i = 0; i < response.data.score_info.length; i++) {
+  getcomponentdidmount = () => {
 
-            if (i === 0) {
-              newstar_info.push(response.data.score_info[i])
+    let userid = this.props.user && this.props.user.user_id;
+    let getnewTPMsettings = this.props.user && this.props.user.user_id + 'newTPMsettings';
+    let newTPMsettings = window.localStorage.getItem(getnewTPMsettings)
+    let id = this.props.match.params.shixunId;
+    let Url = `/shixuns/` + id + `.json`;
+    axios.get(Url).then((response) => {
+      if (response.status === 200) {
+        document.title = response.data.name;
+        let newstar_info = [];
+        // let start1=
+        for (var i = 0; i < response.data.score_info.length; i++) {
+
+          if (i === 0) {
+            newstar_info.push(response.data.score_info[i])
+          } else {
+            newstar_info.push((response.data.score_info[i] / 100) * 5)
+          }
+        }
+        let newstar_infos = response.data.score_info;
+        this.setState({
+          shixunsDetails: response.data,
+          shixunId: id,
+          star_info: newstar_info,
+          star_infos: newstar_infos,
+          power: response.data.power,
+          identity: response.data.identity,
+          propaedeutics: response.data.propaedeutics,
+          status: response.data.shixun_status,
+          secret_repository: response.data.secret_repository,
+          public: response.data.public,
+          is_jupyter: response.data.is_jupyter === undefined || response.data.is_jupyter === null ? false : response.data.is_jupyter,
+        });
+
+        if (userid) {
+          if (response.data.identity < 4) {
+            if (newTPMsettings === undefined || newTPMsettings === false || newTPMsettings === null) {
+              console.log()
+              this.setState({
+                openknows: true
+              })
             } else {
-              newstar_info.push((response.data.score_info[i] / 100) * 5)
+              this.setState({
+                openknows: false
+              })
             }
           }
-          let newstar_infos = response.data.score_info;
-          this.setState({
-            shixunsDetails: response.data,
-            shixunId: id,
-            star_info: newstar_info,
-            star_infos: newstar_infos,
-            power: response.data.power,
-            identity: response.data.identity,
-            propaedeutics:response.data.propaedeutics,
-            status: response.data.shixun_status,
-            secret_repository: response.data.secret_repository,
-            public:response.data.public,
-            is_jupyter:response.data.is_jupyter=== undefined||response.data.is_jupyter===null?false:response.data.is_jupyter,
-          });
-
-          if(userid){
-            if(response.data.identity <4){
-              if(newTPMsettings===undefined||newTPMsettings===false||newTPMsettings===null){
-                console.log()
-                this.setState({
-                  openknows:true
-                })
-              }else{
-                this.setState({
-                  openknows:false
-                })
-              }
-            }
-          }
-
         }
-      }).catch((error) => {
-        this.setState({
-          shixunsDetails: undefined,
-          shixunId:  undefined,
-          star_info:  undefined,
-          star_infos:  undefined,
-          power:  undefined,
-          identity:  undefined,
-          status: undefined,
-          propaedeutics:undefined,
-          is_jupyter:false,
-        });
+
+      }
+    }).catch((error) => {
+      this.setState({
+        shixunsDetails: undefined,
+        shixunId: undefined,
+        star_info: undefined,
+        star_infos: undefined,
+        power: undefined,
+        identity: undefined,
+        status: undefined,
+        propaedeutics: undefined,
+        is_jupyter: false,
       });
+    });
+    this.tpmContentResponseInterceptor = axios.interceptors.response.use((response) => {
+      // TODO 依赖了api这个前缀
+      let url = response.config.url.split('api')[1];
+      url = url.split('?')[0]
+      if (cacheInterceptorUrlMap[url]) {
 
-      this.tpmContentRequestInterceptor = axios.interceptors.request.use((config) => {
-        let url = config.url;
-        // console.log('tpmContentRequestInterceptor:', url)
-        for ( let i = 0; i < interceptorUrlArray.length; i++ ) {
-          if (url.indexOf(interceptorUrlArray[i]) != -1) {
-            url = url.split('?')[0]
-            console.log('loadingContent, url:', url)
+        this.setState({ loadingContent: false })
+        delete cacheInterceptorUrlMap[response.url]
+      }
+      return response;
+    }, function (error) {
+      // Do something with response error
+      return Promise.reject(error);
+    });
+    //右侧数据
+    let shixunsDetailsURL = `/shixuns/` + id + `/show_right.json`;
+    axios.get(shixunsDetailsURL).then((response) => {
+      if (response.data) {
 
-            this.setState({ loadingContent: false })
-
-            cacheInterceptorUrlMap[url] = true
-          }
-        }
-        return config;
-      }, function (error) {
-        return Promise.reject(error);
-      });
-
-      // Add a response interceptor
-      this.tpmContentResponseInterceptor = axios.interceptors.response.use((response) => {
-        // console.log('loadingContent finished, url:', response.config.url)
-        // TODO 依赖了api这个前缀
-        let url = response.config.url.split('api')[1];
-        url = url.split('?')[0]
-        if (cacheInterceptorUrlMap[url]) {
-
-          this.setState({ loadingContent: false })
-          delete cacheInterceptorUrlMap[response.url]
-        }
-        return response;
-      }, function (error) {
-        // Do something with response error
-        return Promise.reject(error);
-      });
-      //右侧数据
-      let shixunsDetailsURL=`/shixuns/`+id+`/show_right.json`;
-      axios.get(shixunsDetailsURL).then((response)=> {
-        if(response.data){
-
-        }
-        this.setState({
-          TPMRightSectionData: response.data
-        });
-      })
-      this.getnavdatas()
-    }
-    componentDidMount = () => {
-        this.getcomponentdidmount()
-
-    }
-
-    componentWillUnmount = () => {
-      axios.interceptors.request.eject(this.tpmContentRequestInterceptor);
-      this.tpmContentRequestInterceptor = null;
-      axios.interceptors.request.eject(this.tpmContentResponseInterceptor);
-      this.tpmContentResponseInterceptor = null;
-      // this.getnavdatas()
-    }
-
-    setLoadingContent = (isLoadingContent) => {
-        // this.setState({ loadingContent: isLoadingContent })
-    }
-
-
-    getnavdatas=()=>{
-      let selectedKeys;
-      const {location} = this.props;
-      if(location.pathname.indexOf('/challenges')!=-1){
-        selectedKeys="1"
-      }else if(location.pathname.indexOf('/propaedeutics')!=-1){
-        selectedKeys="2"
-      }else if(location.pathname.indexOf('/repository')!=-1){
-        selectedKeys="3"
-      }else if(location.pathname.indexOf('/secret_repository')!=-1){
-        selectedKeys="4"
-      } else if(location.pathname.indexOf('/collaborators')!=-1){
-        selectedKeys="5"
-      }else if(location.pathname.indexOf('/dataset')!=-1){
-        selectedKeys="6"
-      }else if(location.pathname.indexOf('/shixun_discuss')!=-1){
-        selectedKeys="7"
-      }else if(location.pathname.indexOf('/ranking_list')!=-1){
-        selectedKeys="8"
-      }else if(location.pathname.indexOf('/settings')!=-1){
-        selectedKeys="9"
       }
       this.setState({
-        selectedKeys:selectedKeys
-      })
-    }
+        TPMRightSectionData: response.data
+      });
+    })
+    this.getnavdatas()
+  }
+  componentDidMount = () => {
+    this.getcomponentdidmount()
 
-  handleClick=(e)=>{
+  }
+
+  componentWillUnmount = () => {
+    axios.interceptors.request.eject(this.tpmContentRequestInterceptor);
+    this.tpmContentRequestInterceptor = null;
+    axios.interceptors.request.eject(this.tpmContentResponseInterceptor);
+    this.tpmContentResponseInterceptor = null;
+    // this.getnavdatas()
+  }
+
+  setLoadingContent = (isLoadingContent) => {
+  }
+
+
+  getnavdatas = () => {
+    let selectedKeys;
+    const { location } = this.props;
+    if (location.pathname.indexOf('/challenges') != -1) {
+      selectedKeys = "1"
+    } else if (location.pathname.indexOf('/propaedeutics') != -1) {
+      selectedKeys = "2"
+    } else if (location.pathname.indexOf('/repository') != -1) {
+      selectedKeys = "3"
+    } else if (location.pathname.indexOf('/secret_repository') != -1) {
+      selectedKeys = "4"
+    } else if (location.pathname.indexOf('/collaborators') != -1) {
+      selectedKeys = "5"
+    } else if (location.pathname.indexOf('/dataset') != -1) {
+      selectedKeys = "6"
+    } else if (location.pathname.indexOf('/shixun_discuss') != -1) {
+      selectedKeys = "7"
+    } else if (location.pathname.indexOf('/ranking_list') != -1) {
+      selectedKeys = "8"
+    } else if (location.pathname.indexOf('/settings') != -1) {
+      selectedKeys = "9"
+    }
+    this.setState({
+      selectedKeys: selectedKeys
+    })
+  }
+
+  handleClick = (e) => {
 
     this.setState({
       selectedKeys: e.key,
     });
     let id = this.props.match.params.shixunId;
-    if(e.key==="1"){
+    if (e.key === "1") {
       this.props.history.replace(`/shixuns/${id}/challenges`);
-    }else if(e.key==="2"){
+    } else if (e.key === "2") {
       this.props.history.replace(`/shixuns/${id}/propaedeutics`);
-    }else if(e.key==="3"){
-      this.props.history.replace(`/shixuns/${id}/repository`);
-    }else if(e.key==="4"){
-      this.props.history.replace(`/shixuns/${id}/secret_repository`);
-    }else if(e.key==="5"){
+    } else if (e.key === "3") {
+      // window.location.href=`/shixuns/${id}/repository`;
+      this.props.history.push(`/shixuns/${id}/repository`);
+    } else if (e.key === "4") {
+      // window.location.href=`/shixuns/${id}/secret_repository`;
+      this.props.history.push(`/shixuns/${id}/secret_repository`);
+    } else if (e.key === "5") {
       this.props.history.replace(`/shixuns/${id}/collaborators`);
-    }else if(e.key==="6"){
+    } else if (e.key === "6") {
       this.props.history.replace(`/shixuns/${id}/dataset`);
-    }else if(e.key==="7"){
+    } else if (e.key === "7") {
       this.props.history.replace(`/shixuns/${id}/shixun_discuss`);
-    }else if(e.key==="8"){
+    } else if (e.key === "8") {
       this.props.history.replace(`/shixuns/${id}/ranking_list`);
-    }else if(e.key==="9"){
+    } else if (e.key === "9") {
       this.props.history.replace(`/shixuns/${id}/settings`);
     }
   }
-  	render() {
-
-        let url = window.location.href;
-        let flag = url.indexOf("add_file")>-1;
-
-        return (
-            <div className="newMain clearfix">
-							  {/*头部*/}
-                {
-                    !flag &&
-                    <TPMBanner
-                        {...this.props}
-                        {...this.state}
-												is_jupyter={this.state. is_jupyter}
-                    ></TPMBanner>
-                }
+  setpathArray = (list) => {
+    this.setState({
+      newathArray: list
+    })
+  }
+  render() {
+    let flag = false;
+    return (
+      <div className="newMain clearfix">
+        {
+          !flag &&
+          <TPMBanner
+            {...this.props}
+            {...this.state}
+            is_jupyter={this.state.is_jupyter}
+            getcomponentdidmount={() => this.getcomponentdidmount()}
+          ></TPMBanner>
+        }
 
 
-                <style>
-                  {
-                    `
+        <style>
+          {
+            `
                      .ant-menu-item{
                          margin:0 40px 0 0;
                          padding:0px;
@@ -413,220 +321,223 @@ class TPMIndex extends Component {
                        z-index:1000 !important;
                       }
                     `
-                  }
-                </style>
-              <Row type="flex" className={"backgroudwhite"}>
-                  <div className={"educontent clearfix"}>
-                    <Col span={24}>
+          }
+        </style>
+        <div className={"educontent clearfix"}>
 
-                      <Menu onClick={this.handleClick} selectedKeys={[this.state.selectedKeys]} mode="horizontal">
+          <Menu onClick={this.handleClick} selectedKeys={[this.state.selectedKeys]} mode="horizontal">
 
-                        <Menu.Item key="1" className={"competitionmr50"}>
-                          <span className={"tpmbannernavstyler"}>任务</span>
-                        </Menu.Item>
+            <Menu.Item key="1" className={"competitionmr50"}>
+              <span className={"tpmbannernavstyler"}>任务</span>
+            </Menu.Item>
 
-                        {	this.state.propaedeutics===undefined?"":this.state.propaedeutics===false?"":<Menu.Item key="2" className={"competitionmr50"}>
-                          <span className={"tpmbannernavstyler"}>背景知识</span>
-                        </Menu.Item>}
+            {this.state.propaedeutics === undefined ? "" : this.state.propaedeutics === false ? "" : <Menu.Item key="2" className={"competitionmr50"}>
+              <span className={"tpmbannernavstyler"}>背景知识</span>
+            </Menu.Item>}
 
-                        { this.state.identity >4||this.state.identity===undefined ?"":
-                          this.state.is_jupyter===false?<Menu.Item key="3" className={"competitionmr50"}>
-                            <span className={"tpmbannernavstyler"}>版本库</span>
-                          </Menu.Item>:""}
+            {this.state.identity > 4 || this.state.identity === undefined ? "" :
+              this.state.is_jupyter === false ? <Menu.Item key="3" className={"competitionmr50"}>
+                <span className={"tpmbannernavstyler"}>版本库</span>
+              </Menu.Item> : ""}
 
-                        {this.state.identity >4||this.state.identity===undefined ?"":	this.state.secret_repository && <Menu.Item key="4" className={"competitionmr50"}>
-                          <span className={"tpmbannernavstyler"}>私密版本库</span>
-                        </Menu.Item>}
+            {this.state.identity > 4 || this.state.identity === undefined ? "" : this.state.secret_repository && <Menu.Item key="4" className={"competitionmr50"}>
+              <span className={"tpmbannernavstyler"}>私密版本库</span>
+            </Menu.Item>}
 
-                        <Menu.Item key="5" className={"competitionmr50"}>
-                          <span className={"tpmbannernavstyler"}>合作者</span>
-                        </Menu.Item>
+            <Menu.Item key="5" className={"competitionmr50"}>
+              <span className={"tpmbannernavstyler"}>合作者</span>
+            </Menu.Item>
 
-                        {	this.state.identity >4||this.state.identity===undefined ? "":this.state.is_jupyter===true?<Menu.Item key="6" className={"competitionmr50"}>
-                          <span className={"tpmbannernavstyler"}>数据集</span>
-                        </Menu.Item>:""}
+            {this.state.identity > 4 || this.state.identity === undefined ? "" : this.state.is_jupyter === true ? <Menu.Item key="6" className={"competitionmr50"}>
+              <span className={"tpmbannernavstyler"}>数据集</span>
+            </Menu.Item> : ""}
 
-                        {	this.state.is_jupyter===false?<Menu.Item key="7" className={"competitionmr50"}>
-                          <span className={"tpmbannernavstyler"}>评论</span>
-                        </Menu.Item>:""}
+            {this.state.is_jupyter === false ? <Menu.Item key="7" className={"competitionmr50"}>
+              <span className={"tpmbannernavstyler"}>评论</span>
+            </Menu.Item> : ""}
 
-                        {	this.state.is_jupyter===false? <Menu.Item key="8" className={"competitionmr50"}>
-                          <span className={"tpmbannernavstyler"}>排行榜</span>
-                        </Menu.Item>:""}
-                        {/*{this.state.identity >4||this.state.identity===undefined ? "":this.state.openknows===true?<span>*/}
-                        {/* <Popover*/}
-                        {/*      content={*/}
-                        {/*        <pre className={"bannerpd201"}>*/}
-                        {/*          <div>更多设置在这里，点击“配置”看一看~</div>*/}
-                        {/*          <div className={"wechatcenter mt15"}><Button  type="primary" onClick={this.openknow} >我知道了</Button></div>*/}
-                        {/*        </pre>*/}
-                        {/*      }*/}
-                        {/*      trigger="click"*/}
-                        {/*      placement="top"*/}
-                        {/*      visible={this.state.openknows}*/}
-                        {/*    >*/}
-                        {/*  </Popover>*/}
-                        {/*</span>:""}*/}
+            {this.state.is_jupyter === false ? <Menu.Item key="8" className={"competitionmr50"}>
+              <span className={"tpmbannernavstyler"}>排行榜</span>
+            </Menu.Item> : ""}
+            {this.state.identity > 4 || this.state.identity === undefined ? "" :
+              <Menu.Item key="9" className={"competitionmr50"}>
+                <span className={"tpmbannernavstyler"}>配置</span>
+              </Menu.Item>
+            }
 
-                        {this.state.identity >4||this.state.identity===undefined ? "":
-                          <Menu.Item key="9" className={"competitionmr50"}>
-                              <span className={"tpmbannernavstyler"}>配置</span>
-                          </Menu.Item>
-                        }
+            {this.state.identity > 2 || this.state.identity === undefined ? "" :
+              <div className={"fr"}>
+                <Link to={`/shixuns/${this.props.match.params.shixunId}/audit_situation`}
+                  className={`${this.props.match.url.indexOf('audit_situation') != -1 ? 'font-16 audit_situationactive' : 'font-16 audit_situationactive'} fl`}>审核情况</Link>
+              </div>
+            }
+          </Menu>
 
-                        {this.state.identity >2||this.state.identity===undefined?"":
-                          <div className={"fr"}>
-                            <Link to={`/shixuns/${this.props.match.params.shixunId}/audit_situation`}
-                                  className={`${this.props.match.url.indexOf('audit_situation') != -1 ? 'font-16 audit_situationactive' : 'font-16 audit_situationactive'} fl`}>审核情况</Link>
-                          </div>
-                        }
-                      </Menu>
-                    </Col>
-                  </div>
-              </Row>
+        </div>
 
-                   {/*筛选*/}
-							  {/*{*/}
-								{/*	tpmindexjupyterbool===false?*/}
+        <Switch {...this.props}>
 
-								{/*		:""*/}
-								{/*}*/}
-							{/*	*/}
+          <Route path="/shixuns/:shixunId/repository/:repoId/commits" render={
+            (props) => (<TPMRepositoryCommits {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
+            />)
+          }></Route>
+          <Route path="/shixuns/:shixunId/secret_repository/:repoId/commits" render={
+            (props) => (<TPMRepositoryCommits {...this.props} {...this.state} {...props} secret_repository_tab={true} is_jupyter={this.state.is_jupyter}
+            />)
+          }></Route>
+          {/*任务*/}
+          <Route exact path="/shixuns/:shixunId/challenges" render={
+            (props) => (<TPMChallengeComponent {...this.props}  {...this.state} {...props} is_jupyter={this.state.is_jupyter}
+            />)
+          }></Route>
 
-                  <Switch {...this.props}>
+          <Route path="/shixuns/:shixunId/repository/upload_file" render={
+            (props) => (<Uploadfile {...this.props} {...this.state} {...props}
+            />)
+          }></Route>
 
-                  <Route path="/shixuns/:shixunId/repository/:repoId/commits" render={
-                      (props) => (<TPMRepositoryCommits {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
-                        />)
-                    }></Route>
-                 <Route path="/shixuns/:shixunId/secret_repository/:repoId/commits" render={
-                      (props) => (<TPMRepositoryCommits {...this.props} {...this.state} {...props} secret_repository_tab={true} is_jupyter={this.state.is_jupyter}
-                        />)
-                    }></Route>
-                    {/*任务*/}
-                    <Route exact path="/shixuns/:shixunId/challenges" render={
-                      (props) => (<TPMChallengeComponent {...this.props}  {...this.state} {...props} is_jupyter={this.state.is_jupyter}
-                        />)
-                    }></Route>
+          <Route path="/shixuns/:shixunId/repository/add_file" render={
+            (props) => (<AddFile {...this.props} {...this.state} {...props}
+            />)
+          }></Route>
 
-                    <Route path="/shixuns/:shixunId/repository/add_file" render={
-                            (props) => (<AddFile {...this.props} {...this.state} {...props}
-                            />)
-                    }></Route>
+          <Route path="/shixuns/:shixunId/secret_repository/upload_file" render={
+            (props) => (<Uploadfile {...this.props} {...this.state} {...props}
+            />)
+          }></Route>
 
-                    <Route path="/shixuns/:shixunId/repository" render={
-                        (props) => (<TPMRepositoryComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
-                        />)
-                    }></Route>
-                    <Route path="/shixuns/:shixunId/secret_repository" render={
-                        (props) => (<TPMRepositoryComponent {...this.props} {...this.state} {...props} secret_repository_tab={true} is_jupyter={this.state.is_jupyter}
-                        />)
-                    }></Route>
-
-                    {/* <Route exact path="/shixuns/:shixunId/propaedeutics" component={TPMPropaedeuticsComponent}></Route> */}
-
-                    <Route exact path="/shixuns/:shixunId/propaedeutics" render={
-                      (props) => (<TPMPropaedeuticsComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
-                        />)
-                    }></Route>
+          <Route path="/shixuns/:shixunId/secret_repository/add_file" render={
+            (props) => (<AddFile {...this.props} {...this.state} {...props}
+            />)
+          }></Route>
 
 
-                    <Route exact path="/shixuns/:shixunId/collaborators" render={
-                      (props) => (<TPMCollaboratorsComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
-                        />)
-                    }></Route>
+          <Route path="/shixuns/:shixunId/repository/master/shixun_show/:fileId" render={
+            (props) => (<TPMRepositoryComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter} setpathArray={(value) => this.setpathArray(value)}
+            />)
+          }></Route>
+
+          <Route path="/shixuns/:shixunId/secret_repository/master/shixun_show/:fileId" render={
+            (props) => (<TPMRepositoryComponent {...this.props} {...this.state} {...props} secret_repository_tab={true} is_jupyter={this.state.is_jupyter} setpathArray={(value) => this.setpathArray(value)}
+            />)
+          }></Route>
 
 
-                    {/* <Route exact path="/shixuns/:shixunId/repository/:shixunId/" component={TPMRepositoryComponent}></Route> */}
+          <Route path="/shixuns/:shixunId/repository" render={
+            (props) => (<TPMRepositoryComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter} setpathArray={(value) => this.setpathArray(value)}
+            />)
+          }></Route>
 
 
-                    <Route path="/shixuns/:shixunId/shixun_discuss" render={
-                      (props) => (<TPMShixunDiscussContainer {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
-                        initForumState={(data)=>this.initForumState(data)}
-                        setSearchValue={this.setSearchValue}
-                        setHotLabelIndex={this.setHotLabelIndex}
-                        />)
-                    }></Route>
+          <Route path="/shixuns/:shixunId/secret_repository" render={
+            (props) => (<TPMRepositoryComponent {...this.props} {...this.state} {...props} secret_repository_tab={true} is_jupyter={this.state.is_jupyter} setpathArray={(value) => this.setpathArray(value)}
+            />)
+          }></Route>
 
 
-                    <Route path="/shixuns/:shixunId/settings" render={
-                      (props) => (<TPMsettings {...this.props} {...this.state} {...props} />)
-                    }></Route>
+          {/* <Route exact path="/shixuns/:shixunId/propaedeutics" component={TPMPropaedeuticsComponent}></Route> */}
 
-                     {/*实训项目条目塞选*/}
-                    <Route exact path="/shixuns/:shixunId/ranking_list" render={
-                      (props) => (<TPMRanking_listComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
-                        />)
-                    }></Route>
-                    {/*合作者*/}
-										<Route exact path="/shixuns/:shixunId/dataset" render={
-											(props) => (<TPMDataset {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
-											/>)
-										}></Route>
-
-										<Route exact path="/shixuns/:shixunId/audit_situation" render={
-											(props) => (<Audit_situationComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
-											/>)
-										}></Route>
-
-                  <Route exact path="/shixuns/:shixunId/fork_list" render={
-                      (props) => (<TPMFork_listComponent {...this.props} {...props}
-                      />)
-                  }></Route>
-
-                  <Route exact path="/shixuns/:shixunId/update_propaedeutics" render={
-                      (props) => (<TPMUpdatepropaede {...this.props} {...props}
-                      />)
-                  }></Route>
-
-                  {/*评测设置*/}
-                  <Route path="/shixuns/:shixunId/challenges/:checkpointId/tab=2" render={
-                      (props) => (<TPMevaluation {...this.props}  {...props} {...this.state}/>)
-                  }></Route>
+          <Route exact path="/shixuns/:shixunId/propaedeutics" render={
+            (props) => (<TPMPropaedeuticsComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
+            />)
+          }></Route>
 
 
-                  {/*参考答案*/}
-                  <Route path="/shixuns/:shixunId/challenges/:checkpointId/tab=3" render={
-                      (props) => (<TPManswer {...this.props}  {...props} {...this.state}/>)
-                  }></Route>
-
-                  {/*新建关卡*/}
-                  <Route path="/shixuns/:shixunId/challenges/new" render={
-                      (props) => (<TPMchallengesnew {...this.props} {...props}  {...this.state}/>)
-                  }></Route>
-
-                  {/*编辑关卡*/}
-                  <Route path="/shixuns/:shixunId/challenges/:checkpointId/editcheckpoint" render={
-                      (props) => (<TPMchallengesnew {...this.props} {...props} {...this.state} />)
-                  }></Route>
-
-                  {/*新建选择题*/}
-                  <Route path="/shixuns/:shixunId/challenges/newquestion" render={
-                      (props) => (<TPMquestion {...this.props}  {...props} {...this.state} />)
-                  }></Route>
-
-                  {/*修改选择题*/}
-                  <Route path="/shixuns/:shixunId/challenges/:checkpointId/editquestion/:choose_id" render={
-                      (props) => (<TPMquestion {...this.props}  {...props} {...this.state}/>)
-                  }></Route>
-
-                  {/*修改选择题*/}
-                  <Route path="/shixuns/:shixunId/challenges/:checkpointId/editquestion" render={
-                      (props) => (<TPMquestion {...this.props}  {...props} {...this.state}/>)
-                  }></Route>
-
-									<Route exact path="/shixuns/:shixunId" render={
-											(props) => (<TPMChallengeComponent {...this.props} {...this.state} {...props} 	is_jupyter={this.state.is_jupyter}
-											/>)
-									}></Route>
+          <Route exact path="/shixuns/:shixunId/collaborators" render={
+            (props) => (<TPMCollaboratorsComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
+            />)
+          }></Route>
 
 
-                      {/*<Route exact path="/shixuns/:shixunId" component={TPMChallengeComponent}></Route>*/}
-                  </Switch>
+          {/* <Route exact path="/shixuns/:shixunId/repository/:shixunId/" component={TPMRepositoryComponent}></Route> */}
 
-            </div>
-	    );
-  	}
+
+          <Route path="/shixuns/:shixunId/shixun_discuss" render={
+            (props) => (<TPMShixunDiscussContainer {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
+              initForumState={(data) => this.initForumState(data)}
+              setSearchValue={this.setSearchValue}
+              setHotLabelIndex={this.setHotLabelIndex}
+            />)
+          }></Route>
+
+
+          <Route path="/shixuns/:shixunId/settings" render={
+            (props) => (<TPMsettings {...this.props} {...this.state} {...props} getcomponentdidmount={() => this.getcomponentdidmount()} />)
+          }></Route>
+
+          {/*实训项目条目塞选*/}
+          <Route exact path="/shixuns/:shixunId/ranking_list" render={
+            (props) => (<TPMRanking_listComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
+            />)
+          }></Route>
+          {/*合作者*/}
+          <Route exact path="/shixuns/:shixunId/dataset" render={
+            (props) => (<TPMDataset {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
+            />)
+          }></Route>
+
+          <Route exact path="/shixuns/:shixunId/audit_situation" render={
+            (props) => (<Audit_situationComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
+            />)
+          }></Route>
+
+          <Route exact path="/shixuns/:shixunId/fork_list" render={
+            (props) => (<TPMFork_listComponent {...this.props} {...props}
+            />)
+          }></Route>
+
+          <Route exact path="/shixuns/:shixunId/update_propaedeutics" render={
+            (props) => (<TPMUpdatepropaede {...this.props} {...props}
+            />)
+          }></Route>
+
+          {/*评测设置*/}
+          <Route path="/shixuns/:shixunId/challenges/:checkpointId/tab=2" render={
+            (props) => (<TPMevaluation {...this.props}  {...props} {...this.state} />)
+          }></Route>
+
+
+          {/*参考答案*/}
+          <Route path="/shixuns/:shixunId/challenges/:checkpointId/tab=3" render={
+            (props) => (<TPManswer {...this.props}  {...props} {...this.state} />)
+          }></Route>
+
+          {/*新建关卡*/}
+          <Route path="/shixuns/:shixunId/challenges/new" render={
+            (props) => (<TPMchallengesnew {...this.props} {...props}  {...this.state} />)
+          }></Route>
+
+          {/*编辑关卡*/}
+          <Route path="/shixuns/:shixunId/challenges/:checkpointId/editcheckpoint" render={
+            (props) => (<TPMchallengesnew {...this.props} {...props} {...this.state} />)
+          }></Route>
+
+          {/*新建选择题*/}
+          <Route path="/shixuns/:shixunId/challenges/newquestion" render={
+            (props) => (<TPMquestion {...this.props}  {...props} {...this.state} />)
+          }></Route>
+
+          {/*修改选择题*/}
+          <Route path="/shixuns/:shixunId/challenges/:checkpointId/editquestion/:choose_id" render={
+            (props) => (<TPMquestion {...this.props}  {...props} {...this.state} />)
+          }></Route>
+
+          {/*修改选择题*/}
+          <Route path="/shixuns/:shixunId/challenges/:checkpointId/editquestion" render={
+            (props) => (<TPMquestion {...this.props}  {...props} {...this.state} />)
+          }></Route>
+
+          <Route exact path="/shixuns/:shixunId" render={
+            (props) => (<TPMChallengeComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
+            />)
+          }></Route>
+
+
+        </Switch>
+
+      </div>
+    );
+  }
 }
 
-export default SnackbarHOC() (TPMIndexHOC  ( TPMIndex ));
+export default SnackbarHOC()(TPMIndexHOC(TPMIndex));
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index ea1ef7a5..d395d89c 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -1,734 +1,678 @@
-import React, { Component } from 'react';
-
-// import PropTypes from 'prop-types';
-
+import React from 'react';
 import NewHeader from './NewHeader'
 import NewFooter from './NewFooter'
 import SiderBar from './SiderBar'
-import {  downloadFile } from 'educoder'
+import { downloadFile } from 'educoder'
 import axios from 'axios';
 import { Spin } from 'antd';
 import './TPMIndex.css';
 import LoginDialog from '../login/LoginDialog';
 import AccountProfile from '../user/AccountProfile';
 import AccountPhoneemail from '../user/AccountPhoneemail';
-// import Trialapplication from "../login/Trialapplication";
-// import "antd/dist/antd.css";
-// import '../../css/educoder/edu-common.css'
-// import '../../css/educoder/edu-all.css'
-// import '../../css/educoder/edu-main.css'
-
 const $ = window.$;
-const versionNum = '0001';
-let _url_origin=''; 
-if(window.location.port === "3007"){
-	_url_origin="https://testforgeplus.trustie.net";
-}
-if (!window['indexHOCLoaded']) {
-  window.indexHOCLoaded = true;
-  //解决首屏加载问题
-  $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css`));
-	$('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css`));
-  $("script").append('<script></script>')
-    .attr('src', `${_url_origin}/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js?_t=${versionNum}`);
-}
-// TODO css加载完成后再打开页面，行为和tpm其他页面一致
+
 export function TPMIndexHOC(WrappedComponent) {
 	// 这里如果extends WrappedComponent 会出现 WrappedComponent mount twice的问题
-  	return class II extends React.Component {
-	    constructor(props) {
-	      super(props)
-        window.$('#root').css('position', 'relative')
+	return class II extends React.Component {
+		constructor(props) {
+			super(props)
+			window.$('#root').css('position', 'relative')
 
-	      this.state = {
-            tpmLoading: true,
-            resLoading: true,
-            Headertop:undefined,
-            Footerdown:undefined,
-            coursedata: {},
+			this.state = {
+				tpmLoading: true,
+				resLoading: true,
+				Headertop: undefined,
+				Footerdown: undefined,
+				coursedata: {},
 
-            isRender: false,
-            AccountProfiletype: false,
-				  	AccountPhoneemailtype:false,
-            globalLoading: false,
-					  dataquerys:{},
-					  isloginCancel:undefined,
-					mygetHelmetapi: null,
-	      }
-	    }
-
-      // header里面需要有user
-      initCommonState(user) {
-        // 更新头像后，需要改变参数，不然会被图片缓存影响到  --> 后台已加 ?t=${new Date().getTime()
-        const newUser = Object.assign({}, {...user}, { image_url: `${user.image_url}`});
-        this.setState({
-          user: newUser,
-          current_user: newUser
-        })
-      }
-      showShixun = () => {
-        const { shixunId } = this.props.match.params
-        const url = `/api/v1/shixuns/${shixunId}/show_shixun`
-
-        this.setState({ tpmLoading: true })
-        axios.get(url,
-            {
-              withCredentials: true
-            }
-          ).then((response) => {
-            if (response.data && response.data.shixun) {
-              this.initCommonState(response.data.current_user)
-              response.data.tpmLoading = false;
-              this.setState(response.data);
-            }
-
-          }).catch((error) => {
-            console.log(error)
-          })
-      }
-      aboutFocus = () => {
-        const { creator, watched } = this.state
-        /*http://localhost:3000/api/v1/users/155/watch?object_id=156&object_type=user*/
-
-        const focusUrl = `/api/v1/users/${creator.owner_id}/${watched ? 'unwatch' : 'watch'}?object_id=${creator.owner_id}&object_type=user`
-
-        axios.get(focusUrl,{
-        })
-        .then((response) => {
-            const status = response.data.status;
-            if(status == 1){
-                const new_author_info = Object.assign({}, creator)
-                this.setState({
-                  watched: !watched
-                })
-            }
-        }).catch((error) => {
-            console.log(error)
-        })
-      }
-
-      keyupListener = (e) => {
-        if (e.key === "Escape") {
-          this.setState({ globalLoading: false })
-        }
-      }
-      componentWillUnmount() {
-        window.removeEventListener('keyup', this.keyupListener)
-      }
-
-	    componentDidMount() {
-	    	// console.log("TPMIndexHOC========");
-	    	// console.log("match",this.props);
-        window.addEventListener('keyup', this.keyupListener);
-
-				if(this.props.match.path==="/"){
-					document.title="Forge";
-				}else if(this.props.match.path==="/403"){
-					document.title="你没有权限访问";
-				}else if(this.props.match.path==="/nopage"){
-					document.title="没有找到该页面";
-				}else if(this.props.match.path==="/shixuns"){
-					document.title="实训项目";
-				}else if(this.props.match.path==="/paths"){
-					document.title="实践课程";
-				}else if(this.props.match.path==="/courses"){
-					document.title="翻转课堂";
-				}else if(this.props.match.path==="/projects"){
-					document.title="开源项目";
-				}
-
-        $.ajaxSetup({
-	        cache: true
-	      });
-
-        //帮助后台传参数
-				const query = this.props.location.search;
-				var dataqueryss={}
-				try {
-					var foqus=this.foo(query);
-					if(JSON.stringify(foqus) ==="{}"){
-						this.setState({
-							dataquerys:{},
-						});
-					}else{
-						this.setState({
-							dataquerys:foqus,
-						});
-						dataqueryss=foqus;
-					}
-				}catch (e) {
-					this.setState({
-						dataquerys:{},
-					})
-				}
-        this.fetchUsers(dataqueryss);
-
-            // let url=`/users/get_navigation_info.json`;
-            // axios.get(url, {
-
-            // }).then((response) => {
-            // 	    // console.log("开始请求/get_navigation_info.json");
-            // 	    // console.log(response);
-            //       if(response!=undefined){
-            //         if(response.status===200){
-            //           this.setState({
-            //             Headertop:response.data.top,
-            //             Footerdown:response.data.down
-            //           })
-            //         }
-            //       }
-            //     });
-       ///请求定制化的信息
-      //  this.getAppdata();
-      }
-      /**
-        课堂权限相关方法，暂时写这里了 ----------------------------------------START
-        ADMIN = 0       # 超级管理员
-        CREATOR = 1     # 课程创建者
-        PROFESSOR = 2     # 课程老师
-        ASSISTANT_PROFESSOR = 3  # 课程助教
-        STUDENT = 4     # 学生
-        NORMAL = 5      # 普通用户
-
-        v2
-        # 课程权限判断
-        ADMIN = 0       # 超级管理员
-        BUSINESS = 1    # 运营人员
-        CREATOR = 2     # 课程创建者   课堂管理员
-        PROFESSOR = 3     # 课程老师
-        ASSISTANT_PROFESSOR = 4  # 课程助教
-        STUDENT = 5     # 学生
-        NORMAL = 6      # 普通用户
-        Anonymous = 7      # 普未登录
-      */
-      //超管0
-      isSuperAdmin = () => {
-        // return false
-        return this.state.coursedata&&this.state.coursedata.course_identity === 0
-      }
-      isCourseAdmin = () => {
-        return this.state.coursedata&&this.state.coursedata.course_identity === 2
-      }
-			//超管、运维0-1
-			isClassManagement = () => {
-				return  this.state.coursedata&&this.state.coursedata.course_identity < 2
+				isRender: false,
+				AccountProfiletype: false,
+				AccountPhoneemailtype: false,
+				globalLoading: false,
+				dataquerys: {},
+				isloginCancel: undefined,
+				mygetHelmetapi: null,
 			}
-			//超管、运维、课堂管理0-2
-      isAdminOrCreator = () => {
-        return  this.state.coursedata&&this.state.coursedata.course_identity < 3
-      }
-			//超管、运维、课堂管理、老师0-3
-      isAdminOrTeacher = () => {
-        return this.state.coursedata&&this.state.coursedata.course_identity < 4
-      }
-      // 超管、运维、课堂管理、老师、助教0-4
-      isAdmin = () => {
-        return this.state.coursedata&&this.state.coursedata.course_identity < 5
-      }
-      // 学生5
-      isStudent = () => {
-        return this.state.coursedata&&this.state.coursedata.course_identity === 5
-      }
-			// 超管、运维、课堂管理、老师、助教、学生0-5
-      isAdminOrStudent = () => {
-        return this.state.coursedata&&this.state.coursedata.course_identity <= 5
-      }
-			// 游客未登录/非课堂成员6>
-      isNotMember = () => {
-        return this.state.coursedata&&this.state.coursedata.course_identity >= 6
-      }
-      //课堂是否已结束
-      isCourseEnd = () => {
-        return this.state.current_user ? this.state.current_user.course_is_end : false
-      }
+		}
 
-      // setTrialapplication = ()=>{
-      //     this.setState({
-      //       isRenders:true
-      //     })
-      //
-      // }
+		// header里面需要有user
+		initCommonState(user) {
+			// 更新头像后，需要改变参数，不然会被图片缓存影响到  --> 后台已加 ?t=${new Date().getTime()
+			const newUser = Object.assign({}, { ...user }, { image_url: `${user.image_url}` });
+			this.setState({
+				user: newUser,
+				current_user: newUser
+			})
+		}
+		showShixun = () => {
+			const { shixunId } = this.props.match.params
+			const url = `/api/v1/shixuns/${shixunId}/show_shixun`
 
-			//获取数据为空的时候
-			gettablogourlnull = () => {
-				this.setState({
-					mygetHelmetapi: undefined
-				});
-				// document.title = "Forge";
-				var link = document.createElement('link'),
-					oldLink = document.getElementById('dynamic-favicon');
-				link.id = 'dynamic-favicon';
-				link.rel = 'shortcut icon';
-				link.href = "/react/build/./favicon.ico";
-				if (oldLink) {
-					document.head.removeChild(oldLink);
+			this.setState({ tpmLoading: true })
+			axios.get(url,
+				{
+					withCredentials: true
 				}
-				document.head.appendChild(link);
-			};
-
-			//获取数据的时候
-			gettablogourldata = (response) => {
-				document.title = response.data.setting.name;
-				var link = document.createElement('link'),
-					oldLink = document.getElementById('dynamic-favicon');
-				link.id = 'dynamic-favicon';
-				link.rel = 'shortcut icon';
-				link.href = '/' + response.data.setting.tab_logo_url;
-				if (oldLink) {
-					document.head.removeChild(oldLink);
+			).then((response) => {
+				if (response.data && response.data.shixun) {
+					this.initCommonState(response.data.current_user)
+					response.data.tpmLoading = false;
+					this.setState(response.data);
 				}
-				document.head.appendChild(link);
-			}
-			//获取当前定制信息
-			// getAppdata = () => {
-			// 	try {
-			// 		var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
-			// 		var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
-			// 		// console.log("TPMLNdexHOC");
-			// 		// console.log(chromesettingArray);
-			// 		// console.log(chromesettingresponseArray);
-			// 			this.setState({
-			// 				mygetHelmetapi:chromesettingArray
-			// 			});
-			// 				if (chromesettingArray.tab_logo_url) {
-			// 					this.gettablogourldata(chromesettingresponseArray);
-			// 				} else {
-			// 					this.gettablogourlnull();
-			// 				}
-			// 	}catch (e) {
-			// 		console.log("hoc获取游览器配置失败 重新请求开始读取配置");
-      //     this.getAppdatausr();
-			// 	}
 
-			// };
-			// getAppdatausr=()=>{
-			// 	let url = "/setting.json";
-			// 	axios.get(url).then((response) => {
-			// 		// console.log("app.js开始请求/setting.json");
-			// 		// console.log("获取当前定制信息");
-			// 		if (response) {
-			// 			if (response.data) {
-			// 				this.setState({
-			// 					mygetHelmetapi: response.data.setting
-			// 				});
-			// 				localStorage.setItem('chromesetting',JSON.stringify(response.data.setting));
-			// 				localStorage.setItem('chromesettingresponse',JSON.stringify(response));
-			// 				try {
-			// 					if (response.data.setting.tab_logo_url) {
-			// 						this.gettablogourldata(response);
-			// 					} else {
-			// 						this.gettablogourlnull();
-			// 					}
-			// 				} catch (e) {
-			// 					this.gettablogourlnull();
-			// 				}
+			}).catch((error) => {
+				console.log(error)
+			})
+		}
+		aboutFocus = () => {
+			const { creator, watched } = this.state
+			/*http://localhost:3000/api/v1/users/155/watch?object_id=156&object_type=user*/
 
+			const focusUrl = `/api/v1/users/${creator.owner_id}/${watched ? 'unwatch' : 'watch'}?object_id=${creator.owner_id}&object_type=user`
 
-			// 			} else {
-
-			// 				this.gettablogourlnull();
-
-			// 			}
-
-			// 		} else {
-			// 			this.gettablogourlnull();
-
-			// 		}
-
-			// 	}).catch((error) => {
-			// 		this.gettablogourlnull();
-
-			// 	});
-
-			// }
-
-      fetchUser = () => {
-        let url = `/users/get_user_info.json`
-        let courseId;
-        let query = this.props.location.pathname;
-        const type = query.split('/');
-        if (type[1] == 'courses' && type[2]) {
-          courseId = parseInt(type[2])
-          // url += `?course_id=${courseId}`
-        }
-				var datay={};
-				if(JSON.stringify(this.state.dataquerys) ==="{}"){
-					datay={
-						course_id:isNaN(courseId)?undefined:courseId,
-						school:1
-					}
-				}else{
-					datay={
-						course_id:isNaN(courseId)?undefined:courseId,
-						school:1,
-						chinaoocTimestamp:this.state.dataquerys.chinaoocTimestamp,
-						websiteName:this.state.dataquerys.websiteName,
-						chinaoocKey:this.state.dataquerys.chinaoocKey,
-					}
-				}
-        axios.get(url,{params:
-							datay
-        },
-            {
-              // withCredentials: true
-            }
-          ).then((response) => {
-            /*
-              {
-                  "username": "黄井泉",
-                  "login": "Hjqreturn",
-                  "user_id": 12,
-                  "image_url": "avatar/User/12",
-                  "admin": true,
-                  "is_teacher": false,
-                  "tidding_count": 0
-              }
-            */
-            if(response=== undefined){
-            	return
-						}
-            if (response.data) {
-              this.initCommonState(response.data)
-              this.setState({
-                tpmLoading: false,
-                coursedata: {
-                  course_identity: response.data.course_identity >= 0 ? response.data.course_identity : undefined,
-                  course_public: response.data.course_public,
-                  name: response.data.course_name,
-                  userid:response.data.user_id
-                },
-
-               })
-
-            }
-
-          }).catch((error) => {
-            console.log(error)
-          })
-      };
-			fetchUsers = (yslurlobject) => {
-				let url = `/users/get_user_info.json`
-				let courseId;
-				let query = this.props.location.pathname;
-				const type = query.split('/');
-				if (type[1] == 'courses' && type[2]) {
-					courseId = parseInt(type[2])
-					// url += `?course_id=${courseId}`
-				}
-				var datay={};
-				if(JSON.stringify(yslurlobject) ==="{}"){
-					  datay={
-							course_id:isNaN(courseId)?undefined:courseId,
-							school:1
-						}
-				}else{
-					datay={
-						course_id:isNaN(courseId)?undefined:courseId,
-						school:1,
-						chinaoocTimestamp:yslurlobject.chinaoocTimestamp,
-						websiteName:yslurlobject.websiteName,
-						chinaoocKey:yslurlobject.chinaoocKey,
-					}
-				}
-				axios.get(url,{params:
-							datay
-					},
-					{
-						// withCredentials: true
-					}
-				).then((response) => {
-					/*
-						{
-								"username": "黄井泉",
-								"login": "Hjqreturn",
-								"user_id": 12,
-								"image_url": "avatar/User/12",
-								"admin": true,
-								"is_teacher": false,
-								"tidding_count": 0
-						}
-					*/
-					if(response=== undefined){
-						return
-					}
-					if (response.data) {
-						this.initCommonState(response.data)
+			axios.get(focusUrl, {
+			})
+				.then((response) => {
+					const status = response.data.status;
+					if (status == 1) {
+						const new_author_info = Object.assign({}, creator)
 						this.setState({
-							tpmLoading: false,
-							coursedata: {
-								course_identity: response.data.course_identity >= 0 ? response.data.course_identity : undefined,
-								course_public: response.data.course_public,
-								name: response.data.course_name,
-								userid:response.data.user_id
-							},
-
+							watched: !watched
 						})
-
 					}
-
 				}).catch((error) => {
 					console.log(error)
 				})
-			};
-			//截取url 数据的
-			foo=(url)=> {
-				var json = {};
-				var regExp = /[\?\&](\w+)(=?)(\w*)/g;
-				var arr;
-				do {
-					arr = regExp.exec(url);
-					// console.log(arr); // arr = [完整的字符串, key, 等号或'', value或'']
+		}
 
-					if (arr) {
-						var key = arr[1];
-						var value = arr[3];
-						// arr[2] === ''时, value = undefined
-						if (!arr[2])
-							value = undefined;
-
-						json[key] = value;
-					}
-				} while (arr);
-
-				return json;
-			};
-      hideLoginDialog = () => {
-        this.setState({
-          isRender: false,
-					isloginCancel:undefined
-        })
-      }
-      showLoginDialog = () => {
-        this.setState({
-          isRender: true,
-					isloginCancel:"iscancel"
-        })
-      }
-			//验证登录是否成功方法
-      checkIfLogin = () => {
-        return this.state.current_user && this.state.current_user.login != ''
-      }
-
-      hideAccountProfile = () => {
-        this.setState({
-          AccountProfiletype: false
-        })
-      }
-      showProfileCompleteDialog = () => {
-        this.dialogObj = {}
-        this.setState({
-          AccountProfiletype: true
-        })
-      }
-			showhideAccountPhoneemailDialog = () => {
-				this.dialogObj = {}
-				this.setState({
-					AccountPhoneemailtype: true
-				})
-			}
-      hideAccountPhoneemailtype=()=>{
-      	this.setState({
-					AccountPhoneemailtype:false
-				})
-			}
-			//验证是否完善资料
-      checkIfProfileCompleted = () => {
-        return this.state.current_user && this.state.current_user.profile_completed
-      }
-
-			showaccountprofileDialog = () => {
-				this.dialogObj = {
-					content: '您需要去完成您的个人资料，才能使用此功能',
-					okText: '立即完成',
-					okHref: '/account/profile'
-				}
-				this.setState({
-					AccountProfiletype: true,
-				})
-			}
-      showProfessionalCertificationDialog = () => {
-        this.dialogObj = {
-          content: '您需要去完成您的职业认证，才能使用此功能',
-          okText: '立即完成',
-          okHref: '/account/certification'
-        }
-        this.setState({
-          AccountProfiletype: true,
-        })
-      }
-      checkIfProfessionalCertification = () => {
-        return this.state.current_user && this.state.current_user.professional_certification
-      }
-
-
-			ShowOnlinePdf = (url) => {
-				return  axios({
-										method:'get',
-										url:url,
-										responseType: 'arraybuffer',
-									}).then((result)=>{
-										var binaryData = [];
-										binaryData.push(result.data);
-										this.url =window.URL.createObjectURL(new Blob(binaryData, {type:"application/pdf"}));
-										window.open(this.url);
-									})
-			}
-			DownloadFileA=(title,url)=>{
-				let link = document.createElement('a');
-				document.body.appendChild(link);
-				link.href =url;
-				link.download = title;
-				//兼容火狐浏览器
-				let evt = document.createEvent("MouseEvents");
-				evt.initEvent("click", false, false);
-				link.dispatchEvent(evt);
-				document.body.removeChild(link);
-			}
-
-			DownloadOpenPdf=(type,url)=>{
-				type===true?window.open(url):window.location.href=url;
-			}
-      slowDownload = (url, tip) => {
-        this._gLoadingTip = tip || '正在生成文件，请稍后...';
-        this.setState({ globalLoading: true })
-        const fileUrl = url;
-        downloadFile({
-          url: fileUrl,
-          successCallback: (url) => {
-            this.setState({ globalLoading: false })
-            console.log('successCallback')
-          },
-          failCallback: (responseHtml, url) => {
-            this.setState({ globalLoading: false })
-            console.log('failCallback')
-          }
-        })
-      }
-      yslslowCheckresults =(tip) =>{
-				this._gLoadingTip = tip || '成绩计算中，请稍候...';
-				this.setState({ globalLoading: true })
-			}
-			yslslowCheckresultsNo =() =>{
+		keyupListener = (e) => {
+			if (e.key === "Escape") {
 				this.setState({ globalLoading: false })
 			}
+		}
+		componentWillUnmount() {
+			window.removeEventListener('keyup', this.keyupListener)
+		}
 
-			showGlobalLoading = (tip) => {
-        this._gLoadingTip = tip || '加载中，请稍后...';
-        this.setState({ globalLoading: true })
-      }
-      hideGlobalLoading = () => {
-        this.setState({ globalLoading: false })
-      }
+		componentDidMount() {
+			// console.log("TPMIndexHOC========");
+			// console.log(this.props);
+			window.addEventListener('keyup', this.keyupListener)
 
-			MdifHasAnchorJustScorll=()=>{
-				//mdhash滚动
-				let anchor = decodeURI(this.props.location.hash).replace('#', '');
-				// 对应id的话, 滚动到相应位置
-				if (!!anchor) {
-					let anchorElement = document.getElementsByName(anchor);
-					if (anchorElement) {
-						if (anchorElement.length>0){
-							anchorElement[anchorElement.length-1].scrollIntoView();
-						}
-					}
-				}
+			if (this.props.match.path === "/") {
+				// document.title="创新源于实践";
+			} else if (this.props.match.path === "/403") {
+				document.title = "你没有权限访问";
+			} else if (this.props.match.path === "/nopage") {
+				document.title = "没有找到该页面";
+			} else if (this.props.match.path === "/shixuns") {
+				document.title = "实训项目";
+			} else if (this.props.match.path === "/paths") {
+				document.title = "实践课程";
+			} else if (this.props.match.path === "/classrooms") {
+				document.title = "教学课堂";
 			}
 
-			//跳转道描点的地方
-			scrollToAnchor = (anchorName) => {
-				if (anchorName) {
-					// 找到锚点
-					let anchorElement = document.getElementById(anchorName);
-					// 如果对应id的锚点存在，就跳转到锚点
-					if (anchorElement) {
-						anchorElement.scrollIntoView();
-					}
+			$.ajaxSetup({
+				cache: true
+			});
+
+			//帮助后台传参数
+			const query = this.props.location.search;
+			var dataqueryss = {}
+			try {
+				var foqus = this.foo(query);
+				if (JSON.stringify(foqus) === "{}") {
+					this.setState({
+						dataquerys: {},
+					});
+				} else {
+					this.setState({
+						dataquerys: foqus,
+					});
+					dataqueryss = foqus;
 				}
+			} catch (e) {
+				this.setState({
+					dataquerys: {},
+				})
+			}
+			this.fetchUsers(dataqueryss);
+
+			///请求定制化的信息
+			this.getAppdata();
+		}
+		/**
+			课堂权限相关方法，暂时写这里了 ----------------------------------------START
+			ADMIN = 0       # 超级管理员
+			CREATOR = 1     # 课程创建者
+			PROFESSOR = 2     # 课程老师
+			ASSISTANT_PROFESSOR = 3  # 课程助教
+			STUDENT = 4     # 学生
+			NORMAL = 5      # 普通用户
+
+			v2
+			# 课程权限判断
+			ADMIN = 0       # 超级管理员
+			BUSINESS = 1    # 运营人员
+			CREATOR = 2     # 课程创建者   课堂管理员
+			PROFESSOR = 3     # 课程老师
+			ASSISTANT_PROFESSOR = 4  # 课程助教
+			STUDENT = 5     # 学生
+			NORMAL = 6      # 普通用户
+			Anonymous = 7      # 普未登录
+		*/
+		//超管0
+		isSuperAdmin = () => {
+			// return false
+			return this.state.coursedata && this.state.coursedata.course_identity === 0
+		}
+		isCourseAdmin = () => {
+			return this.state.coursedata && this.state.coursedata.course_identity === 2
+		}
+		//超管、运维0-1
+		isClassManagement = () => {
+			return this.state.coursedata && this.state.coursedata.course_identity < 2
+		}
+		//超管、运维、课堂管理0-2
+		isAdminOrCreator = () => {
+			return this.state.coursedata && this.state.coursedata.course_identity < 3
+		}
+		//超管、运维、课堂管理、老师0-3
+		isAdminOrTeacher = () => {
+			return this.state.coursedata && this.state.coursedata.course_identity < 4
+		}
+		// 助教===4
+		isAssistant = () => {
+			return this.state.coursedata && this.state.coursedata.course_identity === 4
+		}
+		// 超管、运维、课堂管理、老师、助教0-4
+		isAdmin = () => {
+			return this.state.coursedata && this.state.coursedata.course_identity < 5
+		}
+		// 学生5
+		isStudent = () => {
+			return this.state.coursedata && this.state.coursedata.course_identity === 5
+		}
+		// 超管、运维、课堂管理、老师、助教、学生0-5
+		isAdminOrStudent = () => {
+			return this.state.coursedata && this.state.coursedata.course_identity <= 5
+		}
+		// 游客未登录/非课堂成员6>
+		isNotMember = () => {
+			return this.state.coursedata && this.state.coursedata.course_identity >= 6
+		}
+		//课堂是否已结束
+		isCourseEnd = () => {
+			return this.state.current_user ? this.state.current_user.course_is_end : false
+		}
+
+
+		//获取数据为空的时候
+		gettablogourlnull = () => {
+			this.setState({
+				mygetHelmetapi: undefined
+			});
+			document.title = "EduCoder";
+			var link = document.createElement('link'),
+				oldLink = document.getElementById('dynamic-favicon');
+			link.id = 'dynamic-favicon';
+			link.rel = 'shortcut icon';
+			link.href = "/react/build/./favicon.ico";
+			if (oldLink) {
+				document.head.removeChild(oldLink);
+			}
+			document.head.appendChild(link);
+		};
+
+		//获取数据的时候
+		gettablogourldata = (response) => {
+			document.title = response.data.setting.name;
+			var link = document.createElement('link'),
+				oldLink = document.getElementById('dynamic-favicon');
+			link.id = 'dynamic-favicon';
+			link.rel = 'shortcut icon';
+			link.href = '/' + response.data.setting.tab_logo_url;
+			if (oldLink) {
+				document.head.removeChild(oldLink);
+			}
+			document.head.appendChild(link);
+		}
+		//获取当前定制信息
+		getAppdata = () => {
+			try {
+				var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
+				var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
+				this.setState({
+					mygetHelmetapi: chromesettingArray
+				});
+				if (chromesettingArray.tab_logo_url) {
+					this.gettablogourldata(chromesettingresponseArray);
+				} else {
+					this.gettablogourlnull();
+				}
+			} catch (e) {
+				console.log("hoc获取游览器配置失败 重新请求开始读取配置");
+				this.getAppdatausr();
 			}
 
-	  	render() {
-          let{Headertop,Footerdown, isRender, AccountProfiletype,AccountPhoneemailtype}=this.state;
-          const common = {
-            isSuperAdmin:this.isSuperAdmin,
-            isAdminOrCreator:this.isAdminOrCreator,
-						isClassManagement:this.isClassManagement,
-						isCourseAdmin:this.isCourseAdmin,
-
-            isAdmin: this.isAdmin,
-            isAdminOrTeacher: this.isAdminOrTeacher,
-            isStudent: this.isStudent,
-            isAdminOrStudent: this.isAdminOrStudent,
-            isNotMember: this.isNotMember,
-            isCourseEnd: this.isCourseEnd,
-
-            isUserid:this.state.coursedata&&this.state.coursedata.userid,
-            fetchUser: this.fetchUser,
-
-            showLoginDialog: this.showLoginDialog,
-            checkIfLogin: this.checkIfLogin,
-            showProfileCompleteDialog: this.showProfileCompleteDialog,
-						showhideAccountPhoneemailDialog:this.showhideAccountPhoneemailDialog,
-            checkIfProfileCompleted: this.checkIfProfileCompleted,
-						showaccountprofileDialog:this.showaccountprofileDialog,
-            checkIfProfessionalCertification: this.checkIfProfessionalCertification,
-            showProfessionalCertificationDialog: this.showProfessionalCertificationDialog,
-
-						ShowOnlinePdf:(url)=>this.ShowOnlinePdf(url),
-						DownloadFileA:(title,url)=>this.DownloadFileA(title,url),
-						DownloadOpenPdf:(type,url)=>this.DownloadOpenPdf(type,url),
-
-            slowDownload: this.slowDownload,
-            showGlobalLoading: this.showGlobalLoading,
-            hideGlobalLoading: this.hideGlobalLoading,
-						yslslowCheckresults:this.yslslowCheckresults,
-						yslslowCheckresultsNo:this.yslslowCheckresultsNo,
-						MdifHasAnchorJustScorll:this.MdifHasAnchorJustScorll,
-						scrollToAnchor:this.scrollToAnchor
-
-          };
-          // console.log("this.props.mygetHelmetapi");
-          // console.log(this.props.mygetHelmetapi);
-				// console.log("WrappedComponent");
-				// console.log(this.props);
-				// console.log(this.props.match.path);
-				var mypath= this.props&&this.props.match&&this.props.match.path;
-		    return (
-		    	<div className="indexHOC">
-						{isRender===true ? <LoginDialog
-              Modifyloginvalue={()=>this.hideLoginDialog()}
-              {...this.props}
-              {...this.state}
-            /> : ""}
-            {/* AccountProfile 也用作职业认证 */}
-            {AccountProfiletype===true ? <AccountProfile
-              hideAccountProfile={()=>this.hideAccountProfile()}
-              {...this.props}
-              {...this.state}
-              {...this.dialogObj}
-            />:""}
-            {/*验证是否注册手机邮箱*/}
-						{AccountPhoneemailtype===true?<AccountPhoneemail
-							hideAccountProfile={()=>this.hideAccountPhoneemailtype()}
-							{...this.props}
-							{...this.state}
-							{...this.dialogObj}
-						/>:""}
-						{
-							mypath&&mypath==="/question"?
-                  ""
-								:
-								<SiderBar
-									{...this.props}
-									{...this.state}
-									Headertop={Headertop}/>
+		};
+		getAppdatausr = () => {
+			let url = "/setting.json";
+			axios.get(url).then((response) => {
+				if (response) {
+					if (response.data) {
+						this.setState({
+							mygetHelmetapi: response.data.setting
+						});
+						localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
+						localStorage.setItem('chromesettingresponse', JSON.stringify(response));
+						try {
+							if (response.data.setting.tab_logo_url) {
+								this.gettablogourldata(response);
+							} else {
+								this.gettablogourlnull();
+							}
+						} catch (e) {
+							this.gettablogourlnull();
 						}
 
 
-            {/* 注释掉了1440 影响到了手机屏幕的展示 */}
-						<style>{
-							`
+					} else {
+
+						this.gettablogourlnull();
+
+					}
+
+				} else {
+					this.gettablogourlnull();
+
+				}
+
+			}).catch((error) => {
+				this.gettablogourlnull();
+
+			});
+
+		}
+
+		fetchUser = () => {
+			let url = `/users/get_user_info.json`
+			let courseId;
+			let query = this.props.location.pathname;
+			const type = query.split('/');
+			if (type[1] == 'classrooms' && type[2]) {
+				courseId = parseInt(type[2])
+				// url += `?course_id=${courseId}`
+			}
+			var datay = {};
+			if (JSON.stringify(this.state.dataquerys) === "{}") {
+				datay = {
+					course_id: isNaN(courseId) ? undefined : courseId,
+					school: 1
+				}
+			} else {
+				datay = {
+					course_id: isNaN(courseId) ? undefined : courseId,
+					school: 1,
+					chinaoocTimestamp: this.state.dataquerys.chinaoocTimestamp,
+					websiteName: this.state.dataquerys.websiteName,
+					chinaoocKey: this.state.dataquerys.chinaoocKey,
+				}
+			}
+			axios.get(url, {
+				params:
+					datay
+			}).then((response) => {
+				/*
+					{
+							"username": "黄井泉",
+							"login": "Hjqreturn",
+							"user_id": 12,
+							"image_url": "avatar/User/12",
+							"admin": true,
+							"is_teacher": false,
+							"tidding_count": 0
+					}
+				*/
+				if (response === undefined) {
+					return
+				}
+				if (response.data) {
+					this.initCommonState(response.data)
+					this.setState({
+						tpmLoading: false,
+						coursedata: {
+							course_identity: response.data.course_identity >= 0 ? response.data.course_identity : undefined,
+							course_public: response.data.course_public,
+							name: response.data.course_name,
+							userid: response.data.user_id
+						},
+
+					})
+
+				}
+
+			}).catch((error) => {
+				console.log(error)
+			})
+		};
+		fetchUsers = (yslurlobject) => {
+			let url = `/users/get_user_info.json`
+			let courseId;
+			let query = this.props.location.pathname;
+			const type = query.split('/');
+			if (type[1] == 'classrooms' && type[2]) {
+				courseId = parseInt(type[2])
+				// url += `?course_id=${courseId}`
+			}
+			var datay = {};
+			if (JSON.stringify(yslurlobject) === "{}") {
+				datay = {
+					course_id: isNaN(courseId) ? undefined : courseId,
+					school: 1
+				}
+			} else {
+				datay = {
+					course_id: isNaN(courseId) ? undefined : courseId,
+					school: 1,
+					chinaoocTimestamp: yslurlobject.chinaoocTimestamp,
+					websiteName: yslurlobject.websiteName,
+					chinaoocKey: yslurlobject.chinaoocKey,
+				}
+			}
+			axios.get(url, {
+				params:
+					datay
+			},
+				{
+					// withCredentials: true
+				}
+			).then((response) => {
+				/*
+					{
+							"username": "黄井泉",
+							"login": "Hjqreturn",
+							"user_id": 12,
+							"image_url": "avatar/User/12",
+							"admin": true,
+							"is_teacher": false,
+							"tidding_count": 0
+					}
+				*/
+				if (response === undefined) {
+					return
+				}
+				if (response.data) {
+					this.initCommonState(response.data)
+					this.setState({
+						tpmLoading: false,
+						coursedata: {
+							course_identity: response.data.course_identity >= 0 ? response.data.course_identity : undefined,
+							course_public: response.data.course_public,
+							name: response.data.course_name,
+							userid: response.data.user_id
+						},
+
+					})
+
+				}
+
+			}).catch((error) => {
+				console.log(error)
+			})
+		};
+		//截取url 数据的
+		foo = (url) => {
+			var json = {};
+			var regExp = /[\?\&](\w+)(=?)(\w*)/g;
+			var arr;
+			do {
+				arr = regExp.exec(url);
+				// console.log(arr); // arr = [完整的字符串, key, 等号或'', value或'']
+
+				if (arr) {
+					var key = arr[1];
+					var value = arr[3];
+					// arr[2] === ''时, value = undefined
+					if (!arr[2])
+						value = undefined;
+
+					json[key] = value;
+				}
+			} while (arr);
+
+			return json;
+		};
+		hideLoginDialog = () => {
+			this.setState({
+				isRender: false,
+				isloginCancel: undefined
+			})
+		}
+		showLoginDialog = () => {
+			this.setState({
+				isRender: true,
+				isloginCancel: "iscancel"
+			})
+		}
+		//验证登录是否成功方法
+		checkIfLogin = () => {
+			return this.state.current_user && this.state.current_user.login != ''
+		}
+
+		hideAccountProfile = () => {
+			this.setState({
+				AccountProfiletype: false
+			})
+		}
+		showProfileCompleteDialog = () => {
+			this.dialogObj = {}
+			this.setState({
+				AccountProfiletype: true
+			})
+		}
+		showhideAccountPhoneemailDialog = () => {
+			this.dialogObj = {}
+			this.setState({
+				AccountPhoneemailtype: true
+			})
+		}
+		hideAccountPhoneemailtype = () => {
+			this.setState({
+				AccountPhoneemailtype: false
+			})
+		}
+		//验证是否完善资料
+		checkIfProfileCompleted = () => {
+			return this.state.current_user && this.state.current_user.profile_completed
+		}
+
+		showaccountprofileDialog = () => {
+			this.dialogObj = {
+				content: '您需要去完成您的个人资料，才能使用此功能',
+				okText: '立即完成',
+				okHref: '/account/profile'
+			}
+			this.setState({
+				AccountProfiletype: true,
+			})
+		}
+		showProfessionalCertificationDialog = () => {
+			this.dialogObj = {
+				content: '您需要去完成您的职业认证，才能使用此功能',
+				okText: '立即完成',
+				okHref: '/account/certification'
+			}
+			this.setState({
+				AccountProfiletype: true,
+			})
+		}
+		checkIfProfessionalCertification = () => {
+			return this.state.current_user && this.state.current_user.professional_certification
+		}
+
+
+		ShowOnlinePdf = (url) => {
+			return axios({
+				method: 'get',
+				url: url,
+				responseType: 'arraybuffer',
+			}).then((result) => {
+				var binaryData = [];
+				binaryData.push(result.data);
+				this.url = window.URL.createObjectURL(new Blob(binaryData, { type: "application/pdf" }));
+				window.open(this.url);
+			})
+		}
+		DownloadFileA = (title, url) => {
+			let link = document.createElement('a');
+			document.body.appendChild(link);
+			link.href = url;
+			link.download = title;
+			//兼容火狐浏览器
+			let evt = document.createEvent("MouseEvents");
+			evt.initEvent("click", false, false);
+			link.dispatchEvent(evt);
+			document.body.removeChild(link);
+		}
+
+		DownloadOpenPdf = (type, url) => {
+			type === true ? window.open(url) : window.location.href = url;
+		}
+		slowDownload = (url, tip) => {
+			this._gLoadingTip = tip || '正在生成文件，请稍后...';
+			this.setState({ globalLoading: true })
+			const fileUrl = url;
+			downloadFile({
+				url: fileUrl,
+				successCallback: (url) => {
+					this.setState({ globalLoading: false })
+					console.log('successCallback')
+				},
+				failCallback: (responseHtml, url) => {
+					this.setState({ globalLoading: false })
+					console.log('failCallback')
+				}
+			})
+		}
+		yslslowCheckresults = (tip) => {
+			this._gLoadingTip = tip || '成绩计算中，请稍候...';
+			this.setState({ globalLoading: true })
+		}
+		yslslowCheckresultsNo = () => {
+			this.setState({ globalLoading: false })
+		}
+
+		showGlobalLoading = (tip) => {
+			this._gLoadingTip = tip || '加载中，请稍后...';
+			this.setState({ globalLoading: true })
+		}
+		hideGlobalLoading = () => {
+			this.setState({ globalLoading: false })
+		}
+
+		MdifHasAnchorJustScorll = () => {
+			//mdhash滚动
+			let anchor = decodeURI(this.props.location.hash).replace('#', '');
+			// 对应id的话, 滚动到相应位置
+			if (!!anchor) {
+				let anchorElement = document.getElementsByName(anchor);
+				if (anchorElement) {
+					if (anchorElement.length > 0) {
+						anchorElement[anchorElement.length - 1].scrollIntoView();
+					}
+				}
+			}
+		}
+
+		//跳转道描点的地方
+		scrollToAnchor = (anchorName) => {
+			if (anchorName) {
+				// 找到锚点
+				let anchorElement = document.getElementById(anchorName);
+				// 如果对应id的锚点存在，就跳转到锚点
+				if (anchorElement) {
+					anchorElement.scrollIntoView();
+				}
+			}
+		}
+
+		render() {
+			let { Headertop, Footerdown, isRender, AccountProfiletype, AccountPhoneemailtype } = this.state;
+			const common = {
+				isSuperAdmin: this.isSuperAdmin,
+				isAdminOrCreator: this.isAdminOrCreator,
+				isClassManagement: this.isClassManagement,
+				isCourseAdmin: this.isCourseAdmin,
+
+				isAdmin: this.isAdmin,
+				isAdminOrTeacher: this.isAdminOrTeacher,
+				isAssistant: this.isAssistant,
+				isStudent: this.isStudent,
+				isAdminOrStudent: this.isAdminOrStudent,
+				isNotMember: this.isNotMember,
+				isCourseEnd: this.isCourseEnd,
+
+				isUserid: this.state.coursedata && this.state.coursedata.userid,
+				fetchUser: this.fetchUser,
+
+				showLoginDialog: this.showLoginDialog,
+				checkIfLogin: this.checkIfLogin,
+				showProfileCompleteDialog: this.showProfileCompleteDialog,
+				showhideAccountPhoneemailDialog: this.showhideAccountPhoneemailDialog,
+				checkIfProfileCompleted: this.checkIfProfileCompleted,
+				showaccountprofileDialog: this.showaccountprofileDialog,
+				checkIfProfessionalCertification: this.checkIfProfessionalCertification,
+				showProfessionalCertificationDialog: this.showProfessionalCertificationDialog,
+
+				ShowOnlinePdf: (url) => this.ShowOnlinePdf(url),
+				DownloadFileA: (title, url) => this.DownloadFileA(title, url),
+				DownloadOpenPdf: (type, url) => this.DownloadOpenPdf(type, url),
+
+				slowDownload: this.slowDownload,
+				showGlobalLoading: this.showGlobalLoading,
+				hideGlobalLoading: this.hideGlobalLoading,
+				yslslowCheckresults: this.yslslowCheckresults,
+				yslslowCheckresultsNo: this.yslslowCheckresultsNo,
+				MdifHasAnchorJustScorll: this.MdifHasAnchorJustScorll,
+				scrollToAnchor: this.scrollToAnchor
+
+			};
+			var mypath = this.props && this.props.match && this.props.match.path;
+			return (
+				<div className="indexHOC">
+					{isRender === true ? <LoginDialog
+						Modifyloginvalue={() => this.hideLoginDialog()}
+						{...this.props}
+						{...this.state}
+					/> : ""}
+					{/* AccountProfile 也用作职业认证 */}
+					{AccountProfiletype === true ? <AccountProfile
+						hideAccountProfile={() => this.hideAccountProfile()}
+						{...this.props}
+						{...this.state}
+						{...this.dialogObj}
+					/> : ""}
+					{/*验证是否注册手机邮箱*/}
+					{AccountPhoneemailtype === true ? <AccountPhoneemail
+						hideAccountProfile={() => this.hideAccountPhoneemailtype()}
+						{...this.props}
+						{...this.state}
+						{...this.dialogObj}
+					/> : ""}
+					{
+						mypath && mypath === "/problemset" ?
+							""
+							:
+							<SiderBar
+								{...this.props}
+								{...this.state}
+								Headertop={Headertop} />
+					}
+
+					<style>{
+						`
 							.newContainers{
 							  min-width: 1200px;
                 max-width: unset;
@@ -767,33 +711,33 @@ export function TPMIndexHOC(WrappedComponent) {
                 background-color: #fff;
               }
 							`
-						}</style>
+					}</style>
 
 
-						<NewHeader {...this.state} {...this.props}></NewHeader>
-            <Spin spinning={this.state.globalLoading} delay={0} className="globalSpin"
-              size="large"
-              tip= {this._gLoadingTip || "加载中..."}
-            >
+					<NewHeader {...this.state} {...this.props}></NewHeader>
+					<Spin spinning={this.state.globalLoading} delay={0} className="globalSpin"
+						size="large"
+						tip={this._gLoadingTip || "加载中..."}
+					>
 						<div className="newContainer newContainers">
-								<WrappedComponent initCommonState={(user)=>this.initCommonState(user)}
-									{...this.props} {...this.state}
-									showShixun={this.showShixun} aboutFocus={this.aboutFocus}
-									{...common}
-								>
+							<WrappedComponent initCommonState={(user) => this.initCommonState(user)}
+								{...this.props} {...this.state}
+								showShixun={this.showShixun} aboutFocus={this.aboutFocus}
+								{...common}
+							>
 							</WrappedComponent>
 
 						</div>
 
-            </Spin>
+					</Spin>
 
-						<NewFooter
-							{...this.state} {...this.props}
-								Footerdown={Footerdown}
-						/>
+					<NewFooter
+						{...this.state} {...this.props}
+						Footerdown={Footerdown}
+					/>
 
-		        </div>
-		    );
-	  	}
+				</div>
+			);
+		}
 	}
 }
diff --git a/src/modules/tpm/TPMRepository.js b/src/modules/tpm/TPMRepository.js
index 5db8100b..d6a1df9b 100644
--- a/src/modules/tpm/TPMRepository.js
+++ b/src/modules/tpm/TPMRepository.js
@@ -20,24 +20,17 @@ class TPMRepository extends Component {
 
 
     render() {
-      const { loadingContent, creator, shixun, myshixun, recommend_shixuns, current_user, watched,
-        aboutFocus, user, match, isContentWidth100
+      const { loadingContent, listItemtypes, shixun, myshixun, recommend_shixuns, current_user, watched,
+        aboutFocus, user, match, isContentWidth100,isflag
        } = this.props;
 
       return (
       <React.Fragment>
       <div className="tpmComment educontent clearfix mt30 mb80">
         {/* 可能会影响到其他页面的样式，需要测试、协商 */}
-        <div className={`${isContentWidth100 ? 'width100': 'with65'} fl edu-back-white`}
+        <div className={`${listItemtypes===true ? 'width100': 'with65'} fl edu-back-white`}
             style={{background: 'transparent'}}>
-            <TPMNav
-                match={match}
-                user={user}
-                shixun={shixun}
-                {...this.props}
-								is_jupyter={this.props.is_jupyter}
-            ></TPMNav>
-            {/* <RepositoryChooseModal {...this.props}></RepositoryChooseModal> */}
+
         { loadingContent ?
           <CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '200px', display: 'block' }}/> :
           <Repository
@@ -46,9 +39,9 @@ class TPMRepository extends Component {
         }
         </div>
 
-        { !isContentWidth100 && <div className="with35 fr pl20">
+        { listItemtypes===false? <div className="with35 fr pl20">
           <TPMRightSection {...this.props}></TPMRightSection>
-        </div>}
+        </div>:""}
       </div>
       </React.Fragment>
 
diff --git a/src/modules/tpm/TPMRepositoryComponent.js b/src/modules/tpm/TPMRepositoryComponent.js
index af3930b7..190a8cbe 100644
--- a/src/modules/tpm/TPMRepositoryComponent.js
+++ b/src/modules/tpm/TPMRepositoryComponent.js
@@ -19,27 +19,32 @@ class TPMRepositoryComponent extends Component {
       let pathArray = []
       var splitArray = window.location.pathname.split('shixun_show/');
       if (splitArray[1]) {
-        pathArray = splitArray[1].split('/')
+        // pathArray = splitArray[1].split('/')
+        pathArray = decodeURIComponent(splitArray[1]).split('/')
         if (pathArray[pathArray.length - 1] == '') {
           // 有可能是这么访问的： http://localhost:3007/shixuns/3ozvy5f8/repository/fsu7tkaw/master/shixun_show/src/
           pathArray.length = pathArray.length - 1;
         }
       }
       this.state = {
+        listItemtypes:false,
         repositoryLoading: true,
         pathArray: pathArray,
         isContentWidth100: this._isFileInPathArray(pathArray)
       }
+      this.props.setpathArray(pathArray)
     }
     componentDidUpdate(prevProps, prevState) {
       if (this.props.secret_repository_tab != prevProps.secret_repository_tab) {
-        this.fetchRepo()
+        this.setState({
+          listItemtypes:false,
+        })
+        this.fetchRepo(0)
       }
     }
 
 
     componentDidMount = () => {
-
       this.fetchRepo()
     }
     setContentWidth100 = (flag) => {
@@ -65,41 +70,60 @@ class TPMRepositoryComponent extends Component {
             });
           }
           trace_collapse('tpm save code res: ', response)
-          this.props.showSnackbar('文件保存成功')
+          this.props.showNotification('文件保存成功')
 
         }).catch((error)=>{
           console.log(error)
         });
     }
-    fetchCode = (newPathArray) => {
+    fetchCode = (newPathArray) =>{
+
       const path = newPathArray.join('/')
 
       // https://testeduplus2.educoder.net/shixuns/3ozvy5f8/file_content.json
       this.setContentWidth100(true)
-      this.setState({ repositoryLoading: true, pathArray: newPathArray })
+      //
       let id = this.props.match.params.shixunId;
       let url = `/shixuns/${id}/file_content.json`;
       axios.post(url, {
         path: path,
-        secret_repository: this.props.secret_repository_tab
+        secret_repository: this.props.secret_repository_tab===false?undefined:this.props.secret_repository_tab
       }).then((response) => {
         trace_collapse('repository res: ', response)
 
         if (response.data.status == -1) {
-          this.props.showSnackbar('无法找到对应的资源，请变更地址或联系管理员！')
+          //this.props.showNotification('无法找到对应的资源，请变更地址或联系管理员！')
           return;
         }
+
+        if (response.data.status == -2) {
+
+          this.props.showNotification(response.data.message)
+          return;
+        }
+
         if(response.status === 200){
           this.setState({
+            listItemtypes:true
+          })
+
+            this.setState({ repositoryLoading: true, pathArray: newPathArray })
+          this.props.setpathArray(newPathArray)
+            this.setState({
               fileContent: response.data.content,
               repositoryLoading: false
-          });
-          this.props.history
-            .replace(`${this.props.match.url}/master/shixun_show/${newPathArray.join('/')}`)
+            });
+
+            if(response.data.content){
+              this.props.history
+                .replace(`/shixuns/${id}/${this.props.secret_repository_tab ? 'secret_repository' : 'repository'}` +
+                  (newPathArray.length ? `/master/shixun_show/${newPathArray.join('/')}` : ''))
+              // this.props.history.replace(`${this.props.match.url}/master/shixun_show/${newPathArray.join('/')}`)
+            }
         }
 
       }).catch((error)=>{
-        this.props.showSnackbar('无法找到对应的资源，请变更地址或联系管理员！')
+       // this.props.showNotification('无法找到对应的资源，请变更地址或联系管理员！')
         console.log(error)
       });
     }
@@ -113,34 +137,57 @@ class TPMRepositoryComponent extends Component {
       return this.nameTypeMap[array[array.length - 1]] !== 'tree' &&  this._isFileName( array[array.length - 1] )
     }
     // listItem 如果是num，则是通过面包屑点击过来的，取pathArray的子集
-    fetchRepo = (listItem) => {
+    fetchRepo = (listItem,type) => {
+      // if(listItem === "main"||listItem){
+      //   this.props.history.replace(`/shixuns/${this.props.match.params.shixunId}/repository`)
+      //   return;
+      // }
       const { pathArray } = this.state;
       let newPathArray = pathArray.slice(0)
 
       if (listItem === 0 || listItem) {
+
         this.setContentWidth100(false)
         this.nameTypeMap[listItem.name] = listItem.type
         if (typeof listItem == 'number') {  // 参数是数字的话，做截取
           // if (this._isFileName(newPathArray[listItem])) { // 面包屑中的文件不让点击了
           //   listItem--;
           // }
+          this.setState({
+            listItemtypes:false
+          })
           newPathArray = newPathArray.slice(0, listItem)
         } else if (listItem.type === 'tree') {
+          this.setState({
+            listItemtypes:false
+          })
           newPathArray.push(listItem.name)
         } else if (listItem.type === 'blob') {
+
           newPathArray.push(listItem.name)
-          this.setState({ pathArray: newPathArray })
+          // this.setState({ pathArray: newPathArray })
           this.fetchCode(newPathArray)
           return;
         }
+      }else{
+        this.setState({
+          listItemtypes:false
+        })
       }
+
       // https://testeduplus2.educoder.net/shixuns/3ozvy5f8/repository.json
       this.setState({ repositoryLoading: true, pathArray: newPathArray })
+      this.props.setpathArray(newPathArray)
       let urlNewPathArray = newPathArray;
       let fileInPathArray = false;
-      if (newPathArray.length) {
+
+
+      if (newPathArray.length&&!type&&typeof listItem != 'number') {
+
+
         fileInPathArray = this.nameTypeMap[newPathArray[newPathArray.length - 1]] ? this.nameTypeMap[newPathArray[newPathArray.length - 1]] !== 'tree'
             : (listItem ? listItem.type !== 'tree' : this._isFileName( newPathArray[newPathArray.length - 1] ))
+
         if ( fileInPathArray ) {
           urlNewPathArray = newPathArray.slice(0, newPathArray.length - 1)
         }
@@ -149,16 +196,18 @@ class TPMRepositoryComponent extends Component {
 
       let id = this.props.match.params.shixunId;
       let url = `/shixuns/${id}/${this.props.secret_repository_tab ? 'secret_repository' : 'repository'}.json`;
+
       // this.props.setLoadingContent(true)
       axios.post(url, {
         path: path ? path : ''
       }).then((response) => {
+
         // this.props.setLoadingContent(false)
 
         const trees = response.data.trees
         const treeIsFileMap = {}
         if (!trees || !Array.isArray(trees)) {
-          // this.props.showSnackbar('无法找到对应的资源，请变更地址或联系管理员！')
+          // this.props.showNotification('无法找到对应的资源，请变更地址或联系管理员！')
             // return;
         } else {
           trees.forEach(item => {
@@ -167,17 +216,21 @@ class TPMRepositoryComponent extends Component {
         }
         if(response.status === 200){
           this.setState({
+
               treeIsFileMap,
               ...response.data,
               repositoryLoading: false
           });
           this.props.history
-            .replace(`${this.props.match.url}` +
+            .replace(`/shixuns/${id}/${this.props.secret_repository_tab ? 'secret_repository' : 'repository'}` +
               (newPathArray.length ? `/master/shixun_show/${newPathArray.join('/')}` : ''))
+
         }
 
         // 初始化时，repo接口完毕后需要看是否需要fetchCode
-        if (fileInPathArray) {
+
+        if (fileInPathArray&&!type) {
+          //
           this.fetchCode(newPathArray)
         }
         // info(response)
@@ -188,36 +241,35 @@ class TPMRepositoryComponent extends Component {
       });
     }
 
-
+    oncodechanner=(sum)=>{
+      this.fetchRepo(sum,true)
+    }
     render() {
-      const { isContentWidth100 } = this.state;
-
-      // 需要重构
+      const { listItemtypes } = this.state;
       return (
         <React.Fragment>
-          { !isContentWidth100 ? <TPMRepository
+          { listItemtypes===false? <TPMRepository
               {...this.props}
               {...this.state}
               nameTypeMap={this.nameTypeMap}
               fetchRepo={this.fetchRepo}
 							is_jupyter={this.props.is_jupyter}
+              listItemtypes={listItemtypes}
           >
           </TPMRepository>
-          :
-          <div className="tpmComment educontent clearfix mt30 mb80">
-            {/* 可能会影响到其他页面的样式，需要测试、协商 */}
-            <div className={`width100 fl edu-back-white`}
-                style={{background: 'transparent'}}>
-              <RepositoryCodeEditor
-                {...this.state}
-                {...this.props}
-                fetchRepo={this.fetchRepo}
-                saveCode={this.saveCode}
-                nameTypeMap={this.nameTypeMap}
-
-              ></RepositoryCodeEditor>
+          :  <div>
+              {/* 可能会影响到其他页面的样式，需要测试、协商 */}
+              <div>
+                <RepositoryCodeEditor
+                  {...this.state}
+                  {...this.props}
+                  fetchRepo={this.fetchRepo}
+                  saveCode={this.saveCode}
+                  nameTypeMap={this.nameTypeMap}
+                  oncodechanner={(sum)=>this.oncodechanner(sum)}
+                ></RepositoryCodeEditor>
+              </div>
             </div>
-          </div>
           }
 
         </React.Fragment>
diff --git a/src/modules/tpm/TPMRepositoryComponentdetails.js b/src/modules/tpm/TPMRepositoryComponentdetails.js
new file mode 100644
index 00000000..0b4c9f70
--- /dev/null
+++ b/src/modules/tpm/TPMRepositoryComponentdetails.js
@@ -0,0 +1,232 @@
+import React, { Component } from 'react';
+import axios from 'axios';
+import { trace_collapse, info } from 'educoder';
+import RepositoryCodeEditor from './shixunchild/Repository/RepositoryCodeEditor';
+import {debuggerCode} from "../../redux/actions/ojForUser";
+
+class TPMRepositoryComponentdetails extends Component {
+    constructor(props) {
+      super(props)
+      this.nameTypeMap = {}
+      let pathArray = []
+      var splitArray = window.location.pathname.split('shixun_show/');
+      if (splitArray[1]) {
+        pathArray = decodeURIComponent(splitArray[1]).split('/')
+
+        if (pathArray[pathArray.length - 1] == '') {
+          // 有可能是这么访问的： http://localhost:3007/shixuns/3ozvy5f8/repository/fsu7tkaw/master/shixun_show/src/
+          pathArray.length = pathArray.length - 1;
+        }
+      }
+      this.state = {
+        repositoryLoading: true,
+        pathArray: pathArray,
+        isContentWidth100: this._isFileInPathArray(pathArray)
+      }
+    }
+    componentDidUpdate(prevProps, prevState) {
+      if (this.props.secret_repository_tab != prevProps.secret_repository_tab) {
+        this.fetchRepo()
+      }
+    }
+
+
+    componentDidMount = () => {
+        this.fetchRepo()
+    }
+    setContentWidth100 = (flag) => {
+      const newFileContent = flag === false ? '' : this.state.fileContent
+      this.setState({
+        // isCodeFile
+        isContentWidth100: flag,
+        fileContent: newFileContent
+      })
+    }
+    saveCode = (content) => {
+      const path = this.state.pathArray.join('/')
+      let id = this.props.match.params.shixunId;
+      let url = `/shixuns/${id}/update_file.json`;
+      axios.post(url, {
+        path: path,
+        content
+      }).then((response) => {
+          if(response.status === 200){
+              this.setState({
+                fileContent: response.data.content,
+                repositoryLoading: false
+            });
+          }
+          trace_collapse('tpm save code res: ', response)
+          this.props.showNotification('文件保存成功')
+
+        }).catch((error)=>{
+          console.log(error)
+        });
+    }
+    fetchCode = (newPathArray) => {
+      const path = newPathArray.join('/')
+
+      // https://testeduplus2.educoder.net/shixuns/3ozvy5f8/file_content.json
+      this.setContentWidth100(true)
+      this.setState({ repositoryLoading: true, pathArray: newPathArray })
+      let id = this.props.match.params.shixunId;
+      let url = `/shixuns/${id}/file_content.json`;
+      axios.post(url, {
+        path: path,
+        secret_repository: this.props.secret_repository_tab===false?undefined:this.props.secret_repository_tab
+      }).then((response) => {
+        trace_collapse('repository res: ', response)
+
+        if (response.data.status == -1) {
+         // this.props.showNotification('无法找到对应的资源，请变更地址或联系管理员！')
+          return;
+        }
+        if (response.data.status == -2) {
+          this.props.showNotification(response.data.message)
+          // this.props.showNotification('无法找到对应的资源，请变更地址或联系管理员！')
+          return;
+        }
+        if(response.status === 200){
+          this.setState({
+              fileContent: response.data.content,
+              repositoryLoading: false
+          });
+          // this.props.history
+          //   .replace(`${this.props.match.url}/master/shixun_show/${newPathArray.join('/')}`)
+        }
+
+      }).catch((error)=>{
+        // this.props.showNotification('无法找到对应的资源，请变更地址或联系管理员！')
+        console.log(error)
+      });
+    }
+    _isFileName = (name) => {
+      return name.indexOf('.') !== -1
+    }
+    _isFileInPathArray = (array) => {
+      if (!array || array.length === 0) {
+        return false
+      }
+      return this.nameTypeMap[array[array.length - 1]] !== 'tree' &&  this._isFileName( array[array.length - 1] )
+    }
+    // listItem 如果是num，则是通过面包屑点击过来的，取pathArray的子集
+    fetchRepo = (listItem) => {
+
+      if(listItem === "main"||listItem){
+        this.props.history.replace(`/shixuns/${this.props.match.params.shixunId}/repository`)
+        return;
+      }
+
+      const { pathArray } = this.state;
+      let newPathArray = pathArray.slice(0)
+
+      if (listItem === 0 || listItem) {
+        this.setContentWidth100(false)
+        this.nameTypeMap[listItem.name] = listItem.type
+        if (typeof listItem == 'number') {  // 参数是数字的话，做截取
+          // if (this._isFileName(newPathArray[listItem])) { // 面包屑中的文件不让点击了
+          //   listItem--;
+          // }
+          newPathArray = newPathArray.slice(0, listItem)
+        } else if (listItem.type === 'tree') {
+          newPathArray.push(listItem.name)
+        } else if (listItem.type === 'blob') {
+          newPathArray.push(listItem.name)
+          this.setState({ pathArray: newPathArray })
+          //this.fetchCode(newPathArray)
+          return;
+        }
+      }
+      // https://testeduplus2.educoder.net/shixuns/3ozvy5f8/repository.json
+      this.setState({ repositoryLoading: true, pathArray: newPathArray })
+      let urlNewPathArray = newPathArray;
+      let fileInPathArray = false;
+      if (newPathArray.length) {
+        fileInPathArray = this.nameTypeMap[newPathArray[newPathArray.length - 1]] ? this.nameTypeMap[newPathArray[newPathArray.length - 1]] !== 'tree'
+            : (listItem ? listItem.type !== 'tree' : this._isFileName( newPathArray[newPathArray.length - 1] ))
+        if ( fileInPathArray ) {
+          urlNewPathArray = newPathArray.slice(0, newPathArray.length - 1)
+        }
+      }
+      const path = urlNewPathArray.join('/')
+
+      let id = this.props.match.params.shixunId;
+      let url = `/shixuns/${id}/${this.props.secret_repository_tab ? 'secret_repository' : 'repository'}.json`;
+      // this.props.setLoadingContent(true)
+      axios.post(url, {
+        path: path ? path : ''
+      }).then((response) => {
+        // this.props.setLoadingContent(false)
+
+        const trees = response.data.trees
+        const treeIsFileMap = {}
+        if (!trees || !Array.isArray(trees)) {
+          // this.props.showNotification('无法找到对应的资源，请变更地址或联系管理员！')
+            // return;
+        } else {
+          trees.forEach(item => {
+            treeIsFileMap[item.name] = item.type == 'blob'
+          })
+        }
+        if(response.status === 200){
+          this.setState({
+              treeIsFileMap,
+              ...response.data,
+              repositoryLoading: false
+          });
+          // this.props.history
+          //   .replace(`${this.props.match.url}` +
+          //     (newPathArray.length ? `/master/shixun_show/${newPathArray.join('/')}` : ''))
+        }
+
+        // 初始化时，repo接口完毕后需要看是否需要fetchCode
+        if (fileInPathArray&&listItem!=2) {
+          this.fetchCode(newPathArray)
+        }
+        // info(response)
+        trace_collapse('repository res: ', response)
+
+      }).catch((error)=>{
+        console.log(error)
+      });
+    }
+
+
+    render() {
+      const { isContentWidth100 } = this.state;
+      let matchpath =this.props.match.path;
+      let flag =false;
+      if(matchpath==="/shixuns/:shixunId/repository"){
+        flag =true;
+      }else if(matchpath==="/shixuns/:shixunId/secret_repository"){
+        flag =true;
+      }
+
+      // 需要重构
+      return (
+        <React.Fragment>
+          { flag ?  ""
+          :
+          <div>
+            {/* 可能会影响到其他页面的样式，需要测试、协商 */}
+            <div>
+              <RepositoryCodeEditor
+                {...this.state}
+                {...this.props}
+                fetchRepo={this.fetchRepo}
+                saveCode={this.saveCode}
+                nameTypeMap={this.nameTypeMap}
+
+              ></RepositoryCodeEditor>
+            </div>
+          </div>
+          }
+
+        </React.Fragment>
+
+
+      );
+    }
+}
+
+export default  TPMRepositoryComponentdetails ;
diff --git a/src/modules/tpm/TPMShixunDiscuss.js b/src/modules/tpm/TPMShixunDiscuss.js
index be084ebf..e12b20fd 100644
--- a/src/modules/tpm/TPMShixunDiscuss.js
+++ b/src/modules/tpm/TPMShixunDiscuss.js
@@ -1,13 +1,9 @@
 import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import PropTypes from 'prop-types';
 
 import { CircularProgress } from 'material-ui/Progress';
 
 import './TPMShixunDiscuss.css'
 
-import ShixunDiscuss from './shixunchild/ShixunDiscuss/ShixunDiscuss'
 import TPMRightSection from './component/TPMRightSection'
 import TPMNav from './component/TPMNav'
 
@@ -15,59 +11,52 @@ import Comments from '../comment/Comments'
 import { commentHOC } from '../comment/CommentsHOC'
 
 class TPMShixunDiscuss extends Component {
-    constructor(props) {
-      super(props)
+  constructor(props) {
+    super(props)
 
-    }
+  }
 
-    componentWillReceiveProps(newProps, newContext) {
-    }
-
-    componentDidMount() {
-      // TODO 加了HOC后 mount了两次
-      this.props.fetchCommentIfNotFetched &&
+  componentDidMount() {
+    // TODO 加了HOC后 mount了两次
+    this.props.fetchCommentIfNotFetched &&
       this.props.fetchCommentIfNotFetched();
-    }
+  }
 
-    render() {
-      const { loadingContent, creator, shixun, myshixun, recommend_shixuns, current_user, watched,
-        aboutFocus, user, match
-       } = this.props;
+  render() {
+    const { loadingContent, creator, shixun, myshixun, recommend_shixuns, current_user, watched,
+      aboutFocus, user, match
+    } = this.props;
 
-      return (
+    return (
       <React.Fragment>
-      <div className="tpmComment educontent clearfix mt30 mb80">
+        <div className="tpmComment educontent clearfix mt30 mb80">
 
-        <div className="with65 fl edu-back-white commentsDelegateParent" >
+          <div className="with65 fl edu-back-white commentsDelegateParent" >
             <TPMNav
-                match={match}
-                user={user}
-                shixun={shixun}
-                {...this.props}
-								is_jupyter={this.props.is_jupyter}
+              match={match}
+              user={user}
+              shixun={shixun}
+              {...this.props}
+              is_jupyter={this.props.is_jupyter}
             ></TPMNav>
-        { loadingContent ?
-          <CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '200px', display: 'block' }}/> :
-          <Comments
-            {...this.props}
-            user={user}
-            showHiddenButton={true}
-          ></Comments>
-          // onPaginationChange={this.onPaginationChange}
-          // <ShixunDiscuss
-          //  {...this.props}
-          // />
-        }
-        </div>
+            {loadingContent ?
+              <CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '200px', display: 'block' }} /> :
+              <Comments
+                {...this.props}
+                user={user}
+                showHiddenButton={true}
+              ></Comments>
+            }
+          </div>
 
-        <div className="with35 fr pl20">
-          <TPMRightSection {...this.props}></TPMRightSection>
+          <div className="with35 fr pl20">
+            <TPMRightSection {...this.props}></TPMRightSection>
+          </div>
         </div>
-      </div>
       </React.Fragment>
 
-      );
-    }
+    );
+  }
 }
 
-export default commentHOC ( TPMShixunDiscuss );
+export default commentHOC(TPMShixunDiscuss);
diff --git a/src/modules/tpm/TPMsettings/Configuration.js b/src/modules/tpm/TPMsettings/Configuration.js
index 5a61bba9..bdd2ceba 100644
--- a/src/modules/tpm/TPMsettings/Configuration.js
+++ b/src/modules/tpm/TPMsettings/Configuration.js
@@ -282,7 +282,14 @@ export default class Shixuninformation extends Component {
       scope_partment: datalist
     });
   }
-
+  deleteOldScopeInput = (key) => {
+    let {oldscope_partment} = this.state;
+    let datalist = oldscope_partment;
+    datalist.splice(key, 1);
+    this.setState({
+      oldscope_partment: datalist
+    });
+  }
   setopentime = (e) => {
     if(e.target.checked===false){
       this.setState({
@@ -359,11 +366,22 @@ export default class Shixuninformation extends Component {
                     <span className="color-grey-9 openrenyuan">（请通过搜索并选中单位名称进行添加）</span>
                   </div>
                 </div>
-
                 <div style={{width: '100%'}}>
                   <div className="mt20 clearfix" id="task_tag_content">
                     {
+                      this.props.user&&this.props.user.admin?
                       this.state.oldscope_partment.map((item, key) => {
+                        return (
+                          <li key={key} className={"fl mr20"}>
+                            <Badge count={"x"} onClick={(key) => this.deleteOldScopeInput(key)}>
+                              <Button type="primary" ghost className={"Permanentban "}>
+                                {item}
+                              </Button>
+                            </Badge>
+                          </li>
+                        )
+                      })
+                      :this.state.oldscope_partment.map((item, key) => {
                         return (
                           <li key={key} className={"fl mr20"}>
                             <Button type="primary" ghost className={"Permanentban "}>
diff --git a/src/modules/tpm/TPMsettings/LearningSettings.js b/src/modules/tpm/TPMsettings/LearningSettings.js
index e1316623..53f4b01b 100644
--- a/src/modules/tpm/TPMsettings/LearningSettings.js
+++ b/src/modules/tpm/TPMsettings/LearningSettings.js
@@ -331,7 +331,7 @@ export default class Shixuninformation extends Component {
               <Checkbox
                 checked={this.state.test_set_permission}
                 onChange={this.Checktest_set_permission}></Checkbox>
-              <label style={{top: '6px'}} className="color-grey-9 ml10">（选中则允许学员允许学员通过金币解锁查看隐藏测试集的内容）</label>
+              <label style={{top: '6px'}} className="color-grey-9 ml10">（选中则允许学员通过金币解锁查看隐藏测试集的内容）</label>
             </span>
           </div>
 
diff --git a/src/modules/tpm/TPMsettings/Shixuninformation.js b/src/modules/tpm/TPMsettings/Shixuninformation.js
index 6697ee47..262d3938 100644
--- a/src/modules/tpm/TPMsettings/Shixuninformation.js
+++ b/src/modules/tpm/TPMsettings/Shixuninformation.js
@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
 
 import MonacoEditor from 'react-monaco-editor';
 
@@ -20,7 +20,7 @@ import TPMMDEditor from "../challengesnew/TPMMDEditor";
 
 import Bottomsubmit from "../../modals/Bottomsubmit";
 
-import {getUploadActionUrl} from 'educoder';
+import { getUploadActionUrl } from 'educoder';
 
 import './css/TPMsettings.css';
 
@@ -44,17 +44,17 @@ class Shixuninformation extends Component {
       Executiveordervalue: "",
       Compilecommandvalue: "",
       shixun_service_configs: undefined,
-      fileList:[],
-      loading:false,
+      fileList: [],
+      loading: false,
     }
   }
 
   componentDidMount() {
-    let query=this.props.location.search
+    let query = this.props.location.search
     const types = query.split('?edit=')
-    if(types[1]==="1"){
+    if (types[1] === "1") {
       let anchorElement = document.getElementById("newcourseContentMD");
-      if(anchorElement){
+      if (anchorElement) {
         this.scrollToAnchor("newcourseContentMD");
       }
     }
@@ -64,67 +64,69 @@ class Shixuninformation extends Component {
   componentDidUpdate(prevProps, prevState) {
     if (prevProps.data != this.props.data) {
 
-      if (this.props.data ) {
-        if (this.props.data.shixun){
+      if (this.props.data) {
+        if (this.props.data.shixun) {
           this.setState({
-          shixunName: this.props.data && this.props.data.shixun.name,
-          trainee: this.props.data && this.props.data.shixun.trainee,
-          choice_main_type: this.props.data && this.props.data.shixun.choice_main_type,
-          choice_small_type: this.props.data && this.props.data.shixun.choice_small_type,
-          choice_standard_scripts: this.props.data && this.props.data.shixun.choice_standard_scripts,
-          shixunmemoMDvalue: this.props.data && this.props.data.shixun.evaluate_script,
-          simichecked: this.props.data && this.props.data.shixun.is_secret_repository,
-          shixun_service_configs: this.props.data && this.props.data.shixun.shixun_service_configs,
-          standard_scripts: this.props.data && this.props.data.shixun.standard_scripts,
-          shixun_service_configlist: this.props.data && this.props.data.shixun.shixun_service_configs,
-        })
+            shixunName: this.props.data && this.props.data.shixun.name,
+            trainee: this.props.data && this.props.data.shixun.trainee,
+            choice_main_type: this.props.data && this.props.data.shixun.choice_main_type,
+            choice_small_type: this.props.data && this.props.data.shixun.choice_small_type,
+            choice_standard_scripts: this.props.data && this.props.data.shixun.choice_standard_scripts,
+            shixunmemoMDvalue: this.props.data && this.props.data.shixun.evaluate_script,
+            simichecked: this.props.data && this.props.data.shixun.is_secret_repository,
+            shixun_service_configs: this.props.data && this.props.data.shixun.shixun_service_configs,
+            standard_scripts: this.props.data && this.props.data.shixun.standard_scripts,
+            shixun_service_configlist: this.props.data && this.props.data.shixun.shixun_service_configs,
+          })
 
-        if (this.props.data && this.props.data.shixun.choice_standard_scripts === null) {
-          this.setState({
-            choice_standard_scripts: {id: this.props.data && this.props.data.shixun.standard_scripts[0].id, value: ""},
-            choice_standard_scriptssum: this.props.data && this.props.data.shixun.standard_scripts[0].id
-          })
-          this.props.form.setFieldsValue({
-            selectscripts: this.props.data && this.props.data.shixun.standard_scripts[0].id
-          })
-          this.get_mirror_script(this.props.data && this.props.data.shixun.standard_scripts[0].id)
-        } else {
-          this.props.form.setFieldsValue({
-            selectscripts: this.props.data && this.props.data.shixun.choice_standard_scripts
-          })
-        }
-
-        let newlist = ""
-        this.props.data && this.props.data.shixun.choice_small_type.map((item, key) => {
-          this.props.data && this.props.data.shixun.small_type.map((i, k) => {
-            if (item === i.id) {
-              newlist = newlist + `${i.description}`
-            }
-          })
-        })
-        this.setState({
-          subvalues: newlist
-        })
-
-        this.props.data && this.props.data.shixun.main_type.map((item, key) => {
-          if (item.id === this.props.data && this.props.data.shixun.choice_main_type) {
+          if (this.props.data && this.props.data.shixun.choice_standard_scripts === null) {
             this.setState({
-              mainvalues: item.description,
+              choice_standard_scripts: { id: this.props.data && this.props.data.shixun.standard_scripts[0].id, value: "" },
+              choice_standard_scriptssum: this.props.data && this.props.data.shixun.standard_scripts[0].id
+            })
+            this.props.form.setFieldsValue({
+              selectscripts: this.props.data && this.props.data.shixun.standard_scripts[0].id
+            })
+            console.log(this.props);
+            ;
+            // this.get_mirror_script(this.props.data && this.props.data.shixun.standard_scripts[0].id)
+          } else {
+            this.props.form.setFieldsValue({
+              selectscripts: this.props.data && this.props.data.shixun.choice_standard_scripts
             })
           }
-        })
 
-        this.props.form.setFieldsValue({
-          name: this.props.data && this.props.data.shixun.name,
-          trainee: this.props.data && this.props.data.shixun.trainee,
-          selectleft: this.props.data && this.props.data.shixun.choice_main_type,
-          selectright: this.props.data && this.props.data.shixun.choice_small_type,
-        })
-        this.contentMdRef.current.setValue(this.props.data && this.props.data.shixun.description);
+          let newlist = ""
+          this.props.data && this.props.data.shixun.choice_small_type.map((item, key) => {
+            this.props.data && this.props.data.shixun.small_type.map((i, k) => {
+              if (item === i.id) {
+                newlist = newlist + `${i.description}`
+              }
+            })
+          })
+          this.setState({
+            subvalues: newlist
+          })
 
+          this.props.data && this.props.data.shixun.main_type.map((item, key) => {
+            if (item.id === this.props.data && this.props.data.shixun.choice_main_type) {
+              this.setState({
+                mainvalues: item.description,
+              })
+            }
+          })
+
+          this.props.form.setFieldsValue({
+            name: this.props.data && this.props.data.shixun.name,
+            trainee: this.props.data && this.props.data.shixun.trainee,
+            selectleft: this.props.data && this.props.data.shixun.choice_main_type,
+            selectright: this.props.data && this.props.data.shixun.choice_small_type,
+          })
+          this.contentMdRef.current.setValue(this.props.data && this.props.data.shixun.description);
+
+        }
       }
     }
-    }
   }
 
   getshixunmemoMDvalue = (value, e) => {
@@ -181,7 +183,7 @@ class Shixuninformation extends Component {
 
 
   sendsure_apply = () => {
-    let {language, runtime, run_method} = this.state;
+    let { language, runtime, run_method } = this.state;
 
     if (!language || language === "") {
       // this.props.showNotification(`请填写该镜像是基于什么语言`);
@@ -303,7 +305,7 @@ class Shixuninformation extends Component {
   // 附件相关 START
   handleChange = (info) => {
     if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
-      let {fileList} = this.state;
+      let { fileList } = this.state;
 
       if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
         console.log("handleChange1");
@@ -346,7 +348,7 @@ class Shixuninformation extends Component {
     axios.delete(url, {})
       .then((response) => {
         if (response.data) {
-          const {status} = response.data;
+          const { status } = response.data;
           if (status == 0) {
             // console.log('--- success')
 
@@ -370,9 +372,9 @@ class Shixuninformation extends Component {
 
 
 
-  bigClass = (value,e) => {
+  bigClass = (value, e) => {
     this.setState({
-      mainvalues:e.props.name
+      mainvalues: e.props.name
     })
     let list = []
     list.push(this.state.choice_main_type)
@@ -395,18 +397,18 @@ class Shixuninformation extends Component {
 
 
     this.props.data.shixun.main_type.some((item, key) => {
-        if (item.id === value) {
-          newshixun_service_configsagin[0] = {
-            mirror_repository_id: value,
-            name: item.type_name,
-            cpu_limit: 1,
-            lower_cpu_limit: 0.1,
-            memory_limit: 1024,
-            request_limit: 10
-          }
-          return true
+      if (item.id === value) {
+        newshixun_service_configsagin[0] = {
+          mirror_repository_id: value,
+          name: item.type_name,
+          cpu_limit: 1,
+          lower_cpu_limit: 0.1,
+          memory_limit: 1024,
+          request_limit: 10
         }
+        return true
       }
+    }
     )
 
 
@@ -420,20 +422,20 @@ class Shixuninformation extends Component {
     axios.get(url).then((response) => {
       if (response.status === 200) {
         this.setState({
-          choice_standard_scripts:{id: response.data[0].id, value: ""},
-          choice_standard_scriptssum:response.data[0].id
+          choice_standard_scripts: { id: response.data[0].id, value: "" },
+          choice_standard_scriptssum: response.data[0].id
         })
         this.props.form.setFieldsValue({
-          selectscripts:response.data[0].id
+          selectscripts: response.data[0].id
         })
         this.get_mirror_script(response.data[0].id)
 
-        if(e.props.mirror_name===null){
+        if (e.props.mirror_name === null) {
           this.setState({
             choice_main_type: value,
             standard_scripts: response.data,
           })
-        }else{
+        } else {
           this.setState({
             choice_main_type: value,
             standard_scripts: response.data,
@@ -448,26 +450,26 @@ class Shixuninformation extends Component {
       console.log(error)
     });
   }
-  Deselectlittle = (value,e) => {
+  Deselectlittle = (value, e) => {
 
-    let {shixun_service_configs, choice_small_type} = this.state;
+    let { shixun_service_configs, choice_small_type } = this.state;
     let newshixun_service_configs = shixun_service_configs;
     let newchoice_small_type = choice_small_type;
 
     newshixun_service_configs.some((item, key) => {
-        if (item.mirror_repository_id === value) {
-          newshixun_service_configs.splice(key, 1)
-          return true
-        }
+      if (item.mirror_repository_id === value) {
+        newshixun_service_configs.splice(key, 1)
+        return true
       }
+    }
     )
 
     newchoice_small_type.some((item, key) => {
-        if (item === value) {
-          newchoice_small_type.splice(key, 1)
-          return true
-        }
+      if (item === value) {
+        newchoice_small_type.splice(key, 1)
+        return true
       }
+    }
     )
 
 
@@ -478,7 +480,7 @@ class Shixuninformation extends Component {
     })
   }
 
-  showlittleClass=(value,e)=>{
+  showlittleClass = (value, e) => {
     let newlist = ""
     e.map((item, key) => {
       if (item.props.name != "") {
@@ -493,60 +495,60 @@ class Shixuninformation extends Component {
       selectright: value,
     })
   }
-  littleClass = (value,e) => {
+  littleClass = (value, e) => {
 
-     let newshixun_service_configs = this.state.shixun_service_configs;
-     let newchoice_small_type = this.state.choice_small_type;
-     let list = []
-     list.push(this.state.choice_main_type)
-     newchoice_small_type.map((item, key) => {
-       list.push(item)
-     })
+    let newshixun_service_configs = this.state.shixun_service_configs;
+    let newchoice_small_type = this.state.choice_small_type;
+    let list = []
+    list.push(this.state.choice_main_type)
+    newchoice_small_type.map((item, key) => {
+      list.push(item)
+    })
 
-     let newshixun_service_configsagin = []
+    let newshixun_service_configsagin = []
 
-     newshixun_service_configs.map((item, key) => {
-       list.map((its, index) => {
-         if (item.mirror_repository_id === its) {
-           newshixun_service_configsagin.push(item)
-         }
-       })
-     })
+    newshixun_service_configs.map((item, key) => {
+      list.map((its, index) => {
+        if (item.mirror_repository_id === its) {
+          newshixun_service_configsagin.push(item)
+        }
+      })
+    })
 
-     this.props.data.shixun.small_type.some((items, keys) => {
-         if (items.id === value) {
-           newshixun_service_configsagin.push({
-             mirror_repository_id: value,
-             name: items.type_name,
-             cpu_limit: 1,
-             lower_cpu_limit: 0.1,
-             memory_limit: 1024,
-             request_limit: 10
-           })
-           return true
-         }
-       }
-     )
-
-     newchoice_small_type.push(value)
-      if(e.props.mirror_name===null){
-       this.setState({
-         choice_small_type: newchoice_small_type,
-       })
-     }else{
-        this.setState({
-          choice_small_type: newchoice_small_type,
-          shixun_service_configs: newshixun_service_configsagin,
-          shixun_service_configlist: newshixun_service_configsagin,
+    this.props.data.shixun.small_type.some((items, keys) => {
+      if (items.id === value) {
+        newshixun_service_configsagin.push({
+          mirror_repository_id: value,
+          name: items.type_name,
+          cpu_limit: 1,
+          lower_cpu_limit: 0.1,
+          memory_limit: 1024,
+          request_limit: 10
         })
+        return true
       }
+    }
+    )
+
+    newchoice_small_type.push(value)
+    if (e.props.mirror_name === null) {
+      this.setState({
+        choice_small_type: newchoice_small_type,
+      })
+    } else {
+      this.setState({
+        choice_small_type: newchoice_small_type,
+        shixun_service_configs: newshixun_service_configsagin,
+        shixun_service_configlist: newshixun_service_configsagin,
+      })
+    }
   }
 
   SelectScput = (value, e) => {
     this.setState({
       choice_standard_scriptssum: value,
       language: e.props.name,
-      choice_standard_scripts: {id: e.props.value, value: ""},
+      choice_standard_scripts: { id: e.props.value, value: "" },
       standard_scriptsModal: true
     })
   }
@@ -559,15 +561,17 @@ class Shixuninformation extends Component {
   }
 
   get_mirror_script = (ids) => {
-    let {choice_standard_scriptssum} = this.state;
+    let { choice_standard_scriptssum } = this.state;
     let id = this.props.match.params.shixunId;
     let url = `/shixuns/${id}/get_script_contents.json`;
-    axios.get((url),{params:{
-        script_id:ids?ids:choice_standard_scriptssum
-      }}).then((response) => {
+    axios.get((url), {
+      params: {
+        script_id: ids ? ids : choice_standard_scriptssum
+      }
+    }).then((response) => {
       if (response.status === 200) {
         // this.evaluate_scriptMD(response.data.content, "shixunmemoMD");
-        if(ids==undefined){
+        if (ids == undefined) {
           this.setState({
             standard_scriptsModal: false,
             standard_scriptsModals: true,
@@ -606,7 +610,7 @@ class Shixuninformation extends Component {
 
   hideModalTemplate = (e) => {
     let id = this.props.match.params.shixunId;
-    let {Executiveordervalue, Compilecommandvalue} = this.state;
+    let { Executiveordervalue, Compilecommandvalue } = this.state;
 
     if (Executiveordervalue === "" || Executiveordervalue === undefined) {
       this.setState({
@@ -614,11 +618,8 @@ class Shixuninformation extends Component {
       });
       return
     }
-    // Executiveordervalue=String(Executiveordervalue);
-    // Compilecommandvalue=String(Compilecommandvalue);
     let trl = `/shixuns/${id}/get_custom_script.json?compile=${Executiveordervalue}&excutive=${Compilecommandvalue}`
     axios.get(trl).then((response) => {
-      // this.evaluate_scriptMD(response.data.shixun_script, "shixunmemoMD");
       this.setState({
         shixunmemoMDvalue: response.data.shixun_script
       })
@@ -642,32 +643,32 @@ class Shixuninformation extends Component {
     })
   }
 
-  setConfigsInputs=(e,keys,str)=>{
+  setConfigsInputs = (e, keys, str) => {
 
-    let {shixun_service_configs}=this.state;
-    let newshixun_service_configs=shixun_service_configs;
-    newshixun_service_configs.map((item,key)=>{
-      if(key===keys){
+    let { shixun_service_configs } = this.state;
+    let newshixun_service_configs = shixun_service_configs;
+    newshixun_service_configs.map((item, key) => {
+      if (key === keys) {
         switch (str) {
           case 1:
-            item.cpu_limit=e.target.value
+            item.cpu_limit = e.target.value
             break;
           case 2:
-            item.lower_cpu_limit=e.target.value
+            item.lower_cpu_limit = e.target.value
             break;
           case 3:
-            item.memory_limit=e.target.value
+            item.memory_limit = e.target.value
             break;
           case 4:
-            item.request_limit=e.target.value
+            item.request_limit = e.target.value
             break;
         }
       }
     })
 
     this.setState({
-      shixun_service_configs:newshixun_service_configs,
-      shixun_service_configlist:newshixun_service_configs,
+      shixun_service_configs: newshixun_service_configs,
+      shixun_service_configlist: newshixun_service_configs,
     })
 
   }
@@ -682,60 +683,60 @@ class Shixuninformation extends Component {
       }
     }
   }
-  onSubmits=()=>{
+  onSubmits = () => {
     this.setState({
-      loading:true
+      loading: true
     })
     const mdContnet = this.contentMdRef.current.getValue().trim();
-    let{choice_standard_scriptssum,choice_standard_scripts}=this.state;
+    let { choice_standard_scriptssum, choice_standard_scripts } = this.state;
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         console.log('Received values of form: ', values);
         let url = `/shixuns/${this.props.match.params.shixunId}.json`;
         let newshixun_service_configlist = this.state.shixun_service_configlist.map(v => {
-          let v1 = Object.assign({},v);
+          let v1 = Object.assign({}, v);
           delete v1.name;
           return v1
         });
 
-        let data={
-          main_type:this.state.choice_main_type,
-          sub_type:this.state.choice_small_type,
-          is_secret_repository:this.state.simichecked,
-          shixun:{
+        let data = {
+          main_type: this.state.choice_main_type,
+          sub_type: this.state.choice_small_type,
+          is_secret_repository: this.state.simichecked,
+          shixun: {
             name: values.name,
             trainee: this.state.trainee,
             is_jupyter: this.props.shixunsDetails.is_jupyter,
-            mirror_script_id: this.props.shixunsDetails.is_jupyter===true?null:this.state.choice_standard_scriptssum===undefined?this.state.choice_standard_scripts:this.state.choice_standard_scriptssum,
+            mirror_script_id: this.props.shixunsDetails.is_jupyter === true ? null : this.state.choice_standard_scriptssum === undefined ? this.state.choice_standard_scripts : this.state.choice_standard_scriptssum,
           },
           shixun_info: {
             description: mdContnet,
-            evaluate_script: this.props.shixunsDetails.is_jupyter===true?"":this.state.shixunmemoMDvalue
-         },
-         shixun_service_configs:newshixun_service_configlist
-      }
+            evaluate_script: this.props.shixunsDetails.is_jupyter === true ? "" : this.state.shixunmemoMDvalue
+          },
+          shixun_service_configs: newshixun_service_configlist
+        }
 
         axios.put(url, data).then((result) => {
           if (result) {
             if (result.data) {
-                  this.props.getdatas()
-              if(result.data.shixun_identifier){
+              this.props.getdatas()
+              if (result.data.shixun_identifier) {
                 this.props.showNotification("基本信息更新成功!")
                 this.scrollToAnchor("head-navpre1");
                 this.setState({
-                  loading:false
+                  loading: false
                 })
               }
             }
           }
         }).catch((error) => {
           this.setState({
-            loading:false
+            loading: false
           })
         });
-      }else{
+      } else {
         this.setState({
-          loading:false
+          loading: false
         })
       }
     });
@@ -747,34 +748,21 @@ class Shixuninformation extends Component {
     })
   }
   render() {
-
-
-    // console.log(operateauthority)
-    const {getFieldDecorator} = this.props.form;
-    const { fileList, choice_standard_scripts, postapplyvisible, shixunmemoMDvalue} = this.state;
-
-    // console.log("1222")
-    // console.log(choice_standard_scripts)
-
+    const { getFieldDecorator } = this.props.form;
+    const { fileList, choice_standard_scripts, postapplyvisible, shixunmemoMDvalue } = this.state;
     const uploadProps = {
       width: 600,
       fileList,
       multiple: true,
-      // https://github.com/ant-design/ant-design/issues/15505
-      // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
-      // showUploadList: false,
       action: `${getUploadActionUrl()}`,
       onChange: this.handleChange,
       onRemove: this.onAttachmentRemove,
       beforeUpload: (file, fileList) => {
-
         if (this.state.fileList.length >= 1) {
           return false
         }
-        // console.log('beforeUpload', file.name);
         const isLt150M = file.size / 1024 / 1024 < 50;
         if (!isLt150M) {
-          // this.props.showNotification(`文件大小必须小于50MB`);
           this.props.showNotification("文件大小必须小于50MB")
         }
         if (this.state.file !== undefined) {
@@ -789,14 +777,14 @@ class Shixuninformation extends Component {
         return isLt150M;
       },
     }
-    let operateauthority = this.props.identity === 1 ? true : this.props.identity < 5 && this.props.data&&this.props.data.shixun.status == 0 ? true : false;
+    let operateauthority = this.props.identity === 1 ? true : this.props.identity < 5 && this.props.data && this.props.data.shixun.status == 0 ? true : false;
     return (
       <div>
         <div className="educontent mb50 edu-back-white padding10-20">
           <Form>
             <Form.Item
               label="名称"
-              style={{"borderBottom": 'none'}}
+              style={{ "borderBottom": 'none' }}
               className="mt15"
             >
               {getFieldDecorator('name', {
@@ -809,25 +797,24 @@ class Shixuninformation extends Component {
                 }],
               })(
                 <Input placeholder="请输入名称，最大限制60个字符"
-                       className={"input-100-45 greyInput"}
-                       onInput={this.shixunNameInput} autoComplete="off"
-                       addonAfter={`${String(!this.state.shixunName ? 0 : this.state.shixunName.length)}/${this.state.NAME_COUNT}`}
-                       className="newViewAfter"/>
+                  className={"input-100-45 greyInput"}
+                  onInput={this.shixunNameInput} autoComplete="off"
+                  addonAfter={`${String(!this.state.shixunName ? 0 : this.state.shixunName.length)}/${this.state.NAME_COUNT}`}
+                  className="newViewAfter" />
               )}
             </Form.Item>
 
             <span id={"newcourseContentMD"}></span>
             <Form.Item
               label="简介"
-              style={{"borderBottom": 'none', 'marginBottom': '0px'}}
+              style={{ "borderBottom": 'none', 'marginBottom': '0px' }}
               className="chooseDes pr"
 
             >
 
               <TPMMDEditor ref={this.contentMdRef} placeholder="请输入简介" mdID={'courseContentMD'}
-                           refreshTimeout={1500}
-                           className="courseMessageMD"
-                // initValue={this.state.description === null ? "" : this.state.description}
+                refreshTimeout={1500}
+                className="courseMessageMD"
               ></TPMMDEditor>
 
             </Form.Item>
@@ -835,17 +822,17 @@ class Shixuninformation extends Component {
 
             <Form.Item
               label={"难易度"}
-              style={{"borderBottom": 'none'}}
+              style={{ "borderBottom": 'none' }}
               className="chooseDes pr"
             >
               {getFieldDecorator('trainee', {
-                rules: [{required: true, message: '请选择难易度'}],
+                rules: [{ required: true, message: '请选择难易度' }],
               })(
                 <div className="with15 fl pr">
                   <Select placeholder="请选择难易度"
-                          style={{width: 180}}
-                          onChange={this.Selectthestudent}
-                          value={this.state.trainee}
+                    style={{ width: 180 }}
+                    onChange={this.Selectthestudent}
+                    value={this.state.trainee}
                   >
                     <Option value={1}>初级</Option>
                     <Option value={2}>中级</Option>
@@ -860,29 +847,29 @@ class Shixuninformation extends Component {
 
             <Form.Item
               label={"实验环境"}
-              style={{"borderBottom": 'none', 'width': '18%', 'float': 'left'}}
+              style={{ "borderBottom": 'none', 'width': '18%', 'float': 'left' }}
               className="chooseDes pr"
             >
               <div>
 
                 {getFieldDecorator('selectleft', {
-                  rules: [{required: true, message: '请选择主类别'}],
+                  rules: [{ required: true, message: '请选择主类别' }],
                 })(
                   <div className="width100 fl mr20">
                     <Select placeholder="请选择主类别"
-                            value={this.state.choice_main_type === "" ? undefined : this.state.choice_main_type}
-                            style={{width: 180}}
-                            onChange={operateauthority ? this.bigClass : ""}
-                            optionFilterProp="children"
-                            filterOption={(input, option) =>
-                              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                            }
+                      value={this.state.choice_main_type === "" ? undefined : this.state.choice_main_type}
+                      style={{ width: 180 }}
+                      onChange={operateauthority ? this.bigClass : ""}
+                      optionFilterProp="children"
+                      filterOption={(input, option) =>
+                        option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                      }
                     >
 
                       {
-                        this.props.data === undefined ? "" : this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter === true?this.props.data.shixun&&this.props.data.shixun.main_type.map((item, key) => {
-                          let itemtype=item.type_name.toLowerCase().indexOf('jupyter'.toLowerCase())
-                          if(itemtype>-1) {
+                        this.props.data === undefined ? "" : this.props.shixunsDetails && this.props.shixunsDetails.is_jupyter === true ? this.props.data.shixun && this.props.data.shixun.main_type.map((item, key) => {
+                          let itemtype = item.type_name.toLowerCase().indexOf('jupyter'.toLowerCase())
+                          if (itemtype > -1) {
                             return (
                               <Option value={item.id} key={key} name={item.description} mirror_name={item.mirror_name}>
                                 <Tooltip placement="right" title={item.description === "" ? "无描述" : item.description}>
@@ -891,13 +878,13 @@ class Shixuninformation extends Component {
                               </Option>
                             )
                           }
-                        }):""
+                        }) : ""
                       }
 
                       {
-                        this.props.data === undefined ? "" : this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter === false?this.props.data.shixun&&this.props.data.shixun.main_type.map((item, key) => {
-                          let itemtype=item.type_name.toLowerCase().indexOf('jupyter'.toLowerCase())
-                          if(itemtype===-1) {
+                        this.props.data === undefined ? "" : this.props.shixunsDetails && this.props.shixunsDetails.is_jupyter === false ? this.props.data.shixun && this.props.data.shixun.main_type.map((item, key) => {
+                          let itemtype = item.type_name.toLowerCase().indexOf('jupyter'.toLowerCase())
+                          if (itemtype === -1) {
                             return (
                               <Option value={item.id} key={key} name={item.description}>
                                 <Tooltip placement="right" title={item.description === "" ? "无描述" : item.description}>
@@ -906,7 +893,7 @@ class Shixuninformation extends Component {
                               </Option>
                             )
                           }
-                        }):""
+                        }) : ""
                       }
                     </Select>
 
@@ -917,26 +904,26 @@ class Shixuninformation extends Component {
 
 
             <Form.Item
-              style={{"borderBottom": 'none', 'width': '81%', 'float': 'left', 'marginTop': '40px'}}
+              style={{ "borderBottom": 'none', 'width': '81%', 'float': 'left', 'marginTop': '40px' }}
               className="chooseDes pr"
             >
               <div className=" fl pr mr20">
                 {getFieldDecorator('selectright', {
-                  rules: [{required: false, message: '请选择小类别'}],
+                  rules: [{ required: false, message: '请选择小类别' }],
                 })(
                   <div className=" fl pr mr20">
                     <Select placeholder="请选择小类别"
-                            mode="multiple"
-                            value={!this.state.choice_small_type?undefined:this.state.choice_small_type.length === 0 || this.state.choice_small_type[0] === "" || this.state.choice_small_type === [] ? undefined : this.state.choice_small_type}
-                            style={{width: 200}}
-                            disabled={operateauthority ? false : true}
-                            onDeselect={operateauthority ? this.Deselectlittle : ""}
-                            onSelect={operateauthority ? this.littleClass : ""}
-                            onChange={this.showlittleClass}
-                            defaultOpen={false}
+                      mode="multiple"
+                      value={!this.state.choice_small_type ? undefined : this.state.choice_small_type.length === 0 || this.state.choice_small_type[0] === "" || this.state.choice_small_type === [] ? undefined : this.state.choice_small_type}
+                      style={{ width: 200 }}
+                      disabled={operateauthority ? false : true}
+                      onDeselect={operateauthority ? this.Deselectlittle : ""}
+                      onSelect={operateauthority ? this.littleClass : ""}
+                      onChange={this.showlittleClass}
+                      defaultOpen={false}
                     >
                       {
-                        this.props.data === undefined ? "" : this.props.data.shixun&&this.props.data.shixun.small_type.map((item, key) => {
+                        this.props.data === undefined ? "" : this.props.data.shixun && this.props.data.shixun.small_type.map((item, key) => {
                           return (
                             <Option value={item.id} key={key} name={item.description} mirror_name={item.mirror_name}>
                               <Tooltip placement="right" title={item.description === "" ? "无描述" : item.description}>
@@ -950,15 +937,15 @@ class Shixuninformation extends Component {
                   </div>
                 )}
                 <span className="fl ml20 color-grey lineh-20">
-                      <div>
-                           {this.state.mainvalues === undefined && this.state.subvalues === undefined || this.state.mainvalues === "" && this.state.subvalues === "" ? "" :
-                             <div className={"font-12"} style={{'max-width': '600px'}}>
-                               {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : this.state.mainvalues}`}
-                               {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.mainvalues === undefined || this.state.mainvalues === "" ? this.state.subvalues : this.state.subvalues}`}
-                               {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" :  this.state.mainvalues}${this.state.subvalues === undefined || this.state.subvalues === "" ? "" :
-                                 this.state.mainvalues === undefined || this.state.mainvalues === "" ? this.state.subvalues : this.state.subvalues}`}
-                             </div>}
-                      </div>
+                  <div>
+                    {this.state.mainvalues === undefined && this.state.subvalues === undefined || this.state.mainvalues === "" && this.state.subvalues === "" ? "" :
+                      <div className={"font-12"} style={{ 'max-width': '600px' }}>
+                        {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : this.state.mainvalues}`}
+                        {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.mainvalues === undefined || this.state.mainvalues === "" ? this.state.subvalues : this.state.subvalues}`}
+                        {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : ""}${this.state.subvalues === undefined || this.state.subvalues === "" ? "" :
+                          this.state.mainvalues === undefined || this.state.mainvalues === "" ? this.state.subvalues : this.state.subvalues}`}
+                      </div>}
+                  </div>
                 </span>
               </div>
             </Form.Item>
@@ -970,23 +957,23 @@ class Shixuninformation extends Component {
             </div>
 
 
-            { this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter===true?"":<Form.Item
+            {this.props.shixunsDetails && this.props.shixunsDetails.is_jupyter === true ? "" : <Form.Item
               label={"评测脚本"}
-              style={{"borderBottom": 'none'}}
+              style={{ "borderBottom": 'none' }}
               className="chooseDes pr"
             >
               {getFieldDecorator('selectscripts', {
-                rules: [{required: true, message: '请选择评测脚本'}],
+                rules: [{ required: true, message: '请选择评测脚本' }],
               })(
                 <div className="with15 fl pr">
                   <Select placeholder="请选择选择脚本"
-                          style={{width: 180}}
-                          className="fl"
-                          disabled={operateauthority ? false : true}
-                          value={choice_standard_scripts === undefined || choice_standard_scripts === null ? undefined : choice_standard_scripts.id === undefined ? choice_standard_scripts : choice_standard_scripts.id}
-                          onChange={operateauthority ? this.SelectScput : ""}>
+                    style={{ width: 180 }}
+                    className="fl"
+                    disabled={operateauthority ? false : true}
+                    value={choice_standard_scripts === undefined || choice_standard_scripts === null ? undefined : choice_standard_scripts.id === undefined ? choice_standard_scripts : choice_standard_scripts.id}
+                    onChange={operateauthority ? this.SelectScput : ""}>
                     {
-                      this.state.standard_scripts=== undefined ? "" : this.state.standard_scripts.map((item, key) => {
+                      this.state.standard_scripts === undefined ? "" : this.state.standard_scripts.map((item, key) => {
                         return (
                           <Option value={parseInt(item.id)} name={item.scptname} key={key}>{item.scptname}</Option>
                         )
@@ -996,19 +983,19 @@ class Shixuninformation extends Component {
                   </Select>
                 </div>
               )}
-              <span className="fl ml20 color-blue" style={{'line-height': '30px'}}>
+              <span className="fl ml20 color-blue" style={{ 'line-height': '30px' }}>
                 <span onClick={() => this.showModal()}>使用自定义脚本</span>
-              <span className={"color-grey ml10"} onClick={() => this.testscripttip(0)}>
-                     <Icon type="exclamation-circle"/>
-              </span>
-              	<div className="invite-tip clearfix none " id="test_script_tip"
-                     style={{
-                       top: '33px',
-                       left: '-15px',
-                       width: '450px',
-                       zIndex: '10',
-                       display: this.state.testscripttiptype === true ? 'block' : "none"
-                     }}>
+                <span className={"color-grey ml10"} onClick={() => this.testscripttip(0)}>
+                  <Icon type="exclamation-circle" />
+                </span>
+                <div className="invite-tip clearfix none " id="test_script_tip"
+                  style={{
+                    top: '33px',
+                    left: '-15px',
+                    width: '450px',
+                    zIndex: '10',
+                    display: this.state.testscripttiptype === true ? 'block' : "none"
+                  }}>
                   <style>
                     {
                       `
@@ -1019,41 +1006,41 @@ class Shixuninformation extends Component {
                       `
                     }
                   </style>
-										<span className="top-black-trangle"></span>
-										<div className="padding20 invitecontent clearfix">
-											<p className="font-12 edu-txt-left">
-												使用自定义模板，平台无法自动更新脚本，请在关卡创建完后手动更新脚本中的必填参<br/>
-												数和以下2个数组元素：<br/>
-												challengeProgramNames<br/>
-												sourceClassNames<br/><br/>
-												示例：有2个关卡的实训<br/><br/>
-												各关卡的待编译文件为：<br/>
-												src/step1/HelloWorld.java<br/>
-												src/step2/Other.java<br/><br/>
-												各关卡的编译后生成的执行文件为：<br/>
-												step1.HelloWorld<br/>
-												step2.Other<br/><br/>
-												则数组元素更新如下：<br/>
-												challengeProgramNames=("src/step1/<br/>
-												HelloWorld.java" "src/step2/Other.java")<br/>
-												sourceClassNames=("step1.HelloWorld<br/>
-												" "step2.Other")<br/><br/>
+                  <span className="top-black-trangle"></span>
+                  <div className="padding20 invitecontent clearfix">
+                    <p className="font-12 edu-txt-left">
+                      使用自定义模板，平台无法自动更新脚本，请在关卡创建完后手动更新脚本中的必填参<br />
+												数和以下2个数组元素：<br />
+												challengeProgramNames<br />
+												sourceClassNames<br /><br />
+												示例：有2个关卡的实训<br /><br />
+												各关卡的待编译文件为：<br />
+												src/step1/HelloWorld.java<br />
+												src/step2/Other.java<br /><br />
+												各关卡的编译后生成的执行文件为：<br />
+												step1.HelloWorld<br />
+												step2.Other<br /><br />
+												则数组元素更新如下：<br />
+												challengeProgramNames=("src/step1/<br />
+												HelloWorld.java" "src/step2/Other.java")<br />
+												sourceClassNames=("step1.HelloWorld<br />
+												" "step2.Other")<br /><br />
 												其它参数可按实际需求定制
 											</p>
-										</div>
-										<p className="inviteTipbtn with100 fl">
-											<a onClick={() => this.testscripttip(1)}>知道了</a>
-										</p>
-									</div>
-            </span>
+                  </div>
+                  <p className="inviteTipbtn with100 fl">
+                    <a onClick={() => this.testscripttip(1)}>知道了</a>
+                  </p>
+                </div>
+              </span>
             </Form.Item>}
 
-            { this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter===true?"": <div className="mt30 clearfix df">
+            {this.props.shixunsDetails && this.props.shixunsDetails.is_jupyter === true ? "" : <div className="mt30 clearfix df">
               <div
                 className={operateauthority === false ? 'nonemodel' : ""}
               ></div>
               <div className="flex1">
-                <div className="fl" style={{border: '1px solid #ccc'}}>
+                <div className="fl" style={{ border: '1px solid #ccc' }}>
                   <MonacoEditor
                     height="450"
                     width="1150"
@@ -1063,7 +1050,7 @@ class Shixuninformation extends Component {
                       selectOnLineNumbers: true
                     }}
                     onChange={this.getshixunmemoMDvalue}
-                    // onChange={this.getshixunmemoMDvalue}
+                  // onChange={this.getshixunmemoMDvalue}
                   />
                 </div>
               </div>
@@ -1071,11 +1058,11 @@ class Shixuninformation extends Component {
           </Form>
 
 
-          { this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter===true?"": <span className="ant-form-text mt20">私密版本库：
+          {this.props.shixunsDetails && this.props.shixunsDetails.is_jupyter === true ? "" : <span className="ant-form-text mt20">私密版本库：
             <Checkbox onChange={this.simionChange}
-                      checked={this.state.simichecked}>
-              {this.state.simichecked===false?"（若需要对学员隐藏部分版本库内容时，请选中；选中保存后表示启用私密版本库，请将需要对学员隐藏的文件存储在私密版本库）":"已创建的私密版本库及其内容，将在“保存”时被删除"}</Checkbox>
-        </span>}
+              checked={this.state.simichecked}>
+              {this.state.simichecked === false ? "（若需要对学员隐藏部分版本库内容时，请选中；选中保存后表示启用私密版本库，请将需要对学员隐藏的文件存储在私密版本库）" : "已创建的私密版本库及其内容，将在“保存”时被删除"}</Checkbox>
+          </span>}
 
           {this.props.identity < 3 ? <div className="edu-back-white padding40-20 mb20">
             <p className="color-grey-6 font-16 mb30">服务配置</p>
@@ -1092,7 +1079,7 @@ class Shixuninformation extends Component {
                       <label className="panel-form-label fl">CPU(核)：</label>
                       <div className="pr fl with80 status_con">
                         <input type="text" value={item.cpu_limit} onInput={(e) => this.setConfigsInputs(e, key, 1)}
-                               className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称"/>
+                          className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
                       </div>
                       <div className="cl"></div>
                     </div>
@@ -1100,8 +1087,8 @@ class Shixuninformation extends Component {
                       <label className="panel-form-label fl">最低CPU(核)：</label>
                       <div className="pr fl with80 status_con">
                         <input type="text" value={item.lower_cpu_limit}
-                               onInput={(e) => this.setConfigsInputs(e, key, 2)}
-                               className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称"/>
+                          onInput={(e) => this.setConfigsInputs(e, key, 2)}
+                          className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
                       </div>
                       <div className="cl"></div>
                     </div>
@@ -1109,7 +1096,7 @@ class Shixuninformation extends Component {
                       <label className="panel-form-label fl">内存限制(M)：</label>
                       <div className="pr fl with80 status_con">
                         <input type="text" value={item.memory_limit} onInput={(e) => this.setConfigsInputs(e, key, 3)}
-                               className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称"/>
+                          className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
                       </div>
                       <div className="cl"></div>
                     </div>
@@ -1117,10 +1104,10 @@ class Shixuninformation extends Component {
                       <label className="panel-form-label fl">内存要求(M)：</label>
                       <div className="pr fl with20 status_con">
                         <input type="text" value={item.request_limit} onInput={(e) => this.setConfigsInputs(e, key, 4)}
-                               className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称"/>
+                          className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
                       </div>
                       <label className="panel-form-label fl"
-                             style={{width: '48%'}}>温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
+                        style={{ width: '48%' }}>温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
                       <div className="cl"></div>
                     </div>
                   </div>
@@ -1141,24 +1128,6 @@ class Shixuninformation extends Component {
             }
           </style> : ""}
 
-          {/*<Modal*/}
-          {/*  keyboard={false}*/}
-          {/*  title="提示"*/}
-          {/*  visible={this.state.simicheckedtype}*/}
-          {/*  closable={false}*/}
-          {/*  footer={null}*/}
-          {/*>*/}
-          {/*  <div className="task-popup-content">*/}
-          {/*    <p className="task-popup-text-center font-16">已创建的私密版本库及其内容，将在“保存”时被删除</p>*/}
-          {/*    <p className="task-popup-text-center font-16">是否确认取消选择？</p>*/}
-          {/*  </div>*/}
-
-          {/*  <div className="task-popup-submit clearfix mt10">*/}
-          {/*    <a onClick={() => this.hidesimichecked()} className="task-btn fl">取消</a>*/}
-          {/*    <a className="task-btn task-btn-orange fr" onClick={() => this.getsimichecked()}>确定</a>*/}
-          {/*  </div>*/}
-          {/*</Modal>*/}
-
           <Modal
             keyboard={false}
             title="提示"
@@ -1186,8 +1155,6 @@ class Shixuninformation extends Component {
             footer={null}
           >
             <div className="task-popup-content">
-              {/*<p className="task-popup-text-center font-16">已根据您的选择，生成新的评测脚本！</p>*/}
-              {/*<p className="task-popup-text-center font-16 mt10">您之前使用的脚本已复制到剪贴板，可通过Ctrl+C贴贴</p>*/}
               <p className="task-popup-text-center font-16">评测脚本生成成功！</p>
             </div>
             <div className="task-popup-sure clearfix">
@@ -1209,27 +1176,27 @@ class Shixuninformation extends Component {
                 <label className="panel-form-label fl"><span
                   className="color-orange mr5">*</span>执行命令：</label>
                 <textarea className="task-form-80 task-height-150 panel-box-sizing fl mt10"
-                          onInput={this.Executiveorder}
-                          value={this.state.Executiveordervalue}
-                          style={{width: '100%'}}
-                          id="executive_command"
+                  onInput={this.Executiveorder}
+                  value={this.state.Executiveordervalue}
+                  style={{ width: '100%' }}
+                  id="executive_command"
                 >
-														</textarea>
+                </textarea>
                 <p className="-text-danger fl mt5"
-                   id="executive_command_notice"
-                   style={{display: this.state.Executivetyoe === false ? "none" : "block"}}
+                  id="executive_command_notice"
+                  style={{ display: this.state.Executivetyoe === false ? "none" : "block" }}
                 >执行命令不能为空</p>
               </li>
 
               <li className="clearfix mb15">
                 <label className="panel-form-label fl">编译命令：</label>
                 <textarea className="task-form-80 task-height-150 panel-box-sizing fl mt10"
-                          value={this.state.Compilecommandvalue}
-                          onInput={this.Compilecommand}
-                          id="compile_command"
-                          style={{width: '100%'}}
+                  value={this.state.Compilecommandvalue}
+                  onInput={this.Compilecommand}
+                  id="compile_command"
+                  style={{ width: '100%' }}
                 >
-														</textarea>
+                </textarea>
               </li>
             </div>
           </Modal>
@@ -1249,7 +1216,7 @@ class Shixuninformation extends Component {
                   className="color-red fl mt3">*</span>语言：&nbsp;&nbsp;</label>
                 <textarea
                   className={this.state.languagewritetype === true ? "fl task-form-80 task-height-150 bor-reds" : "fl task-form-80 task-height-150"}
-                  style={{width: '89%', height: '100px'}}
+                  style={{ width: '89%', height: '100px' }}
                   onInput={this.setlanguage}
                   value={this.state.language}
                   placeholder="请填写该镜像是基于什么语言：示例：Python"
@@ -1263,7 +1230,7 @@ class Shixuninformation extends Component {
                 <textarea
                   className={this.state.systemenvironmenttype === true ? "fl task-form-80 task-height-150 bor-reds" : "fl task-form-80 task-height-150"}
                   onInput={this.setruntime}
-                  style={{height: '100px'}}
+                  style={{ height: '100px' }}
                   value={this.state.runtime}
                   placeholder="请填写该镜像是基于什么linux系统环境,代码运行环境"
                   id="demand_info"></textarea>
@@ -1278,7 +1245,7 @@ class Shixuninformation extends Component {
                   className={this.state.testcoderunmodetype === true ? "fl task-form-80 task-height-150 bor-reds" : "fl task-form-80 task-height-150"}
                   onInput={this.setrun_method}
                   value={this.state.run_method}
-                  style={{height: '100px'}}
+                  style={{ height: '100px' }}
                   placeholder="请填写该镜像中测试代码运行方式"
                   id="demand_info"></textarea>
               </li>
@@ -1304,10 +1271,10 @@ class Shixuninformation extends Component {
               </div>
               <li className="edu-txt-center clearfix ">
                 <a className="pop_close task-btn  mr30"
-                   onClick={() => this.sendhideModaly()}
+                  onClick={() => this.sendhideModaly()}
                 >取消</a>
                 <Button type="primary" onClick={() => this.sendsure_apply()}
-                        className="task-btn task-btn-orange">确定</Button>
+                  className="task-btn task-btn-orange">确定</Button>
               </li>
               <div className="cl"></div>
             </div>
@@ -1315,14 +1282,14 @@ class Shixuninformation extends Component {
         </div>
         {this.props.identity < 5 ?
           <Bottomsubmit {...this.props} {...this.state} url={`/shixuns/${this.props.match.params.shixunId}/challenges`}
-                        onSubmits={this.onSubmits} loadings={this.state.loading}/> : ""}
+            onSubmits={this.onSubmits} loadings={this.state.loading} /> : ""}
       </div>
 
     );
   }
 }
 
-const TopShixuninformation = Form.create({name: 'newshixun'})(Shixuninformation);
+const TopShixuninformation = Form.create({ name: 'newshixun' })(Shixuninformation);
 
 export default TopShixuninformation;
 
diff --git a/src/modules/tpm/TPMsettings/TPMsettings.js b/src/modules/tpm/TPMsettings/TPMsettings.js
index 86079872..e1bd9cb5 100644
--- a/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
 
 import {
   Button,
@@ -16,7 +16,7 @@ import LearningSettings from './LearningSettings';
 
 import axios from 'axios';
 
-const {TabPane} = Tabs;
+const { TabPane } = Tabs;
 
 // 处理整点 半点
 
@@ -25,7 +25,8 @@ export default class TPMsettings extends Component {
   constructor(props) {
     super(props)
     this.state = {
-      activeKeys:"1"
+      activeKeys: "1",
+      ShixunQuotes: []
     }
   }
 
@@ -39,14 +40,13 @@ export default class TPMsettings extends Component {
     let id = this.props.match.params.shixunId;
     let Url = `/shixuns/` + id + `/settings.json`;
     axios.get(Url).then((response) => {
-      // alert(response.data.shixun.choice_standard_scripts)
       if (response.status === 200) {
-        if(response.data){
-            if (response.data.shixun&&response.data.shixun.scope_partment.length > 0) {
-              this.setState({
-                scopetype: true
-              })
-            }
+        if (response.data) {
+          if (response.data.shixun && response.data.shixun.scope_partment.length > 0) {
+            this.setState({
+              scopetype: true
+            })
+          }
         }
         this.setState({
           data: response.data
@@ -54,23 +54,14 @@ export default class TPMsettings extends Component {
       }
 
     });
-    //
-    // if(key==="3"&&this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter === true){
-    //   window.location.href =`/shixuns/${this.props.match.params.shixunId}/challenges`;
-    // }else{
-    //   if(key){
-    //     this.setState({
-    //       activeKeys:key
-    //     })
-    //   }else{
-    //     window.location.href =`/shixuns/${this.props.match.params.shixunId}/challenges`;
-    //   }
-    //
-    // }
-
+    this.props.getcomponentdidmount()
   }
 
   operateshixuns = (value) => {
+    if (value === 1) {
+      this.getshixun_quotes();
+    }
+
     this.setState({
       operateshixunstype: true,
       delType: value
@@ -83,6 +74,20 @@ export default class TPMsettings extends Component {
     })
   }
 
+  //调用接口 获取实训使用情况
+  getshixun_quotes = () => {
+    let identifier = this.props.match.params.shixunId;
+    let url = `/shixuns/${identifier}/shixun_quotes.json`
+    axios.get(url).then((result) => {
+      if (result) {
+        this.setState({
+          ShixunQuotes: result.data
+        })
+      }
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
 
   shixunsdel = () => {
     let id = this.props.match.params.shixunId;
@@ -114,29 +119,21 @@ export default class TPMsettings extends Component {
         });
 
         window.location.href = "/shixuns/" + id + "/challenges";
-        // this.props.history.replace( "/shixuns/" + id + "/challenges");
       }
     }).catch((error) => {
       console.log(error)
     })
   }
 
-  callback = (key) =>  {
+  callback = (key) => {
     this.setState({
-      activeKeys:key
+      activeKeys: key
     })
   }
 
   render() {
-
-    let showtabs = this.props.shixunsDetails === undefined ? "" : this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter === true ? "" : "学习页面设置"
-
-    // let a="isvnc";
-    // let b="isVNC";
-    // console.log(a.indexOf("vnc"))
-    // console.log(b.indexOf("vnc"))
-
-    // console.log( this.props.shixunsDetails === undefined ? "" : this.props.shixunsDetails.is_jupyter === false ? "学习页面设置" : "")
+    const { ShixunQuotes } = this.state;
+    let showtabs = this.props.shixunsDetails === undefined ? "" : this.props.shixunsDetails && this.props.shixunsDetails.is_jupyter === true ? "" : "学习页面设置"
     return (
 
       <div id={"TPMsettings"}>
@@ -160,7 +157,7 @@ export default class TPMsettings extends Component {
           }
         </style>
 
-        <Tabs  activeKey={this.state.activeKeys}  onChange={this.callback} animated={false} tabBarExtraContent={
+        <Tabs activeKey={this.state.activeKeys} onChange={this.callback} animated={false} tabBarExtraContent={
           <div className={"mb20 mr20"}>
 
             {
@@ -198,14 +195,14 @@ export default class TPMsettings extends Component {
               getdatas={(key) => this.getdatas(key)}
             />
           </TabPane>
-          {this.props.shixunsDetails === undefined ? "" : this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter === false ?
+          {this.props.shixunsDetails === undefined ? "" : this.props.shixunsDetails && this.props.shixunsDetails.is_jupyter === false ?
             <TabPane tab={showtabs} key="3">
               <LearningSettings
                 {...this.state}
                 {...this.props}
                 getdatas={(key) => this.getdatas(key)}
               />
-            </TabPane>:"" }
+            </TabPane> : ""}
         </Tabs>
         <Modal
           keyboard={false}
@@ -215,8 +212,34 @@ export default class TPMsettings extends Component {
           footer={null}
         >
           <div className="task-popup-content">
-            {this.state.delType === 1 ? <p className="task-popup-text-center font-16 pb20">是否确认删除 ？</p> :
-              <p className="task-popup-text-center font-16 pb20">关闭后,<br/>用户不能再开始挑战了是否确认关闭 ？</p>}
+            {this.state.delType === 1 ? <p className="task-popup-text-center font-8 pb20">
+              {/* 修改删除确认样式 修改为大的提示框 */}
+              {ShixunQuotes && ShixunQuotes.subjects_count > 0 ? <div className="towhide" style={{ WebkitBoxOrient: 'vertical' }} >该实训已被应用到<span style={{ color: '#4CACFF' }}>{ShixunQuotes && ShixunQuotes.subjects_count}个实训课程：</span>
+                {/*遍历数组 获取数据来显示 */}
+                {
+                  ShixunQuotes && ShixunQuotes.subjects && ShixunQuotes.subjects.length > 0 && ShixunQuotes.subjects.map((item, index) => {
+                    return (
+                      <span>《{item}》</span>
+
+                    )
+                  })
+                }
+              </div> : ''}
+              {ShixunQuotes && ShixunQuotes.courses_count > 0 ?
+                <div className="towhide" style={{ WebkitBoxOrient: 'vertical', marginTop: 30 }} >该实训已被应用到<span style={{ color: '#4CACFF' }}>{ShixunQuotes && ShixunQuotes.courses_count}个教学课堂:</span>
+                  {/*遍历数组 获取数据来显示 */}
+                  {
+                    ShixunQuotes && ShixunQuotes.courses && ShixunQuotes.courses.length > 0 && ShixunQuotes.courses.map((item, index) => {
+                      return (
+                        <span>《{item}》</span>
+
+                      )
+                    })
+                  }
+                </div> : ''}
+              <p style={{ color: '#E6A23C', fontSize: 8, marginTop: 30 }} >删除实训将影响课程及课堂对改实训的使用！请谨慎操作！</p>
+            </p> :
+              <p className="task-popup-text-center font-16 pb20">关闭后,<br />用户不能再开始挑战了是否确认关闭 ？</p>}
           </div>
           <div className="task-popup-submit clearfix">
             <a onClick={this.hideoperateshixuns} className="task-btn fl">取消</a>
diff --git a/src/modules/tpm/TPMsettings/css/TPMsettings.css b/src/modules/tpm/TPMsettings/css/TPMsettings.css
index 7abf2c70..b000af21 100644
--- a/src/modules/tpm/TPMsettings/css/TPMsettings.css
+++ b/src/modules/tpm/TPMsettings/css/TPMsettings.css
@@ -150,4 +150,17 @@ a.newuse_scope-btn {
 
 .ml160{
     margin-left: 160px;
+}
+/*设置超过2行不行*/
+.towhide{
+    overflow : hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+}
+/*设置超过10个字符 隐藏*/
+.texthide{
+  max-width:150px;
+  display:block;
+  float: left;
 }
\ No newline at end of file
diff --git a/src/modules/tpm/TPMsettings/oldTPMsettings.js b/src/modules/tpm/TPMsettings/oldTPMsettings.js
index 3c42b38d..91b3bbd7 100644
--- a/src/modules/tpm/TPMsettings/oldTPMsettings.js
+++ b/src/modules/tpm/TPMsettings/oldTPMsettings.js
@@ -2,10 +2,7 @@ import React, { Component } from 'react';
 
 import MonacoEditor from 'react-monaco-editor';
 
-//MonacoDiffEditor  对比模式
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Icon,DatePicker,Breadcrumb,Upload,Button,notification, Tooltip} from 'antd';
-
-// import "antd/dist/antd.css";
+import { Input, Select, Radio, Checkbox, Popconfirm, message, Modal, Icon, DatePicker, Breadcrumb, Upload, Button, notification, Tooltip } from 'antd';
 
 import locale from 'antd/lib/date-picker/locale/zh_CN';
 
@@ -15,7 +12,7 @@ import axios from 'axios';
 
 import './css/TPMsettings.css';
 
-import { getImageUrl, toPath, getUrl ,getUploadActionUrl} from 'educoder';
+import { getImageUrl, toPath, getUrl, getUploadActionUrl } from 'educoder';
 
 let origin = getUrl();
 
@@ -56,39 +53,39 @@ export function handleDateStrings(dateString) {
 }
 
 // 恢复数据
-function md_rec_data(k,mdu,id, editor){
-  if(window.sessionStorage.getItem(k+mdu) !== null){
-    editor.setValue(window.sessionStorage.getItem(k+mdu));
-    md_clear_data(k,mdu,id);
+function md_rec_data(k, mdu, id, editor) {
+  if (window.sessionStorage.getItem(k + mdu) !== null) {
+    editor.setValue(window.sessionStorage.getItem(k + mdu));
+    md_clear_data(k, mdu, id);
   }
 }
 
 // 保存数据
-function md_add_data(k,mdu,d){
-  window.sessionStorage.setItem(k+mdu,d);
+function md_add_data(k, mdu, d) {
+  window.sessionStorage.setItem(k + mdu, d);
 }
 
 // 清空保存的数据
-function md_clear_data(k,mdu,id){
-  window.sessionStorage.removeItem(k+mdu);
-  var id1 = "#e_tip_"+id;
-  var id2 = "#e_tips_"+id;
-  if(k == 'content'){
+function md_clear_data(k, mdu, id) {
+  window.sessionStorage.removeItem(k + mdu);
+  var id1 = "#e_tip_" + id;
+  var id2 = "#e_tips_" + id;
+  if (k == 'content') {
     $(id2).html("");
-  }else{
+  } else {
     $(id1).html("");
   }
 }
 
-function md_elocalStorage(editor,mdu,id){
-  if (window.sessionStorage){
-    var oc = window.sessionStorage.getItem('content'+mdu);
-    if(oc !== null ){
-      $("#e_tips_"+id).data('editor', editor);
-      var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" className="link-color-blue" onclick="md_rec_data(\'content\',\''+ mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" className="link-color-blue" onclick="md_clear_data(\'content\',\''+ mdu + '\',\'' + id + '\')">不恢复</a>';
-      $("#e_tips_"+id).html(h);
+function md_elocalStorage(editor, mdu, id) {
+  if (window.sessionStorage) {
+    var oc = window.sessionStorage.getItem('content' + mdu);
+    if (oc !== null) {
+      $("#e_tips_" + id).data('editor', editor);
+      var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" className="link-color-blue" onclick="md_rec_data(\'content\',\'' + mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" className="link-color-blue" onclick="md_clear_data(\'content\',\'' + mdu + '\',\'' + id + '\')">不恢复</a>';
+      $("#e_tips_" + id).html(h);
     }
-    setInterval(function() {
+    setInterval(function () {
       var d = new Date();
       var h = d.getHours();
       var m = d.getMinutes();
@@ -96,27 +93,27 @@ function md_elocalStorage(editor,mdu,id){
       h = h < 10 ? '0' + h : h;
       m = m < 10 ? '0' + m : m;
       s = s < 10 ? '0' + s : s;
-      if(editor.getValue().trim() != ""){
-        md_add_data("content",mdu,editor.getValue());
-        var id1 = "#e_tip_"+id;
-        var id2 = "#e_tips_"+id;
+      if (editor.getValue().trim() != "") {
+        md_add_data("content", mdu, editor.getValue());
+        var id1 = "#e_tip_" + id;
+        var id2 = "#e_tips_" + id;
 
-        $(id1).html(" 数据已于 " + h + ':' + m + ':' + s +" 保存   ");
+        $(id1).html(" 数据已于 " + h + ':' + m + ':' + s + " 保存   ");
         $(id2).html("");
       }
-    },10000);
+    }, 10000);
 
-  }else{
-    $("#e_tip_"+id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
+  } else {
+    $("#e_tip_" + id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
   }
 }
 
-function create_editorMD(id, width, high, placeholder, imageUrl,initValue, callback) {
+function create_editorMD(id, width, high, placeholder, imageUrl, initValue, callback) {
   var editorName = window.editormd(id, {
     width: width,
     height: high,
     path: path,   // "/editormd/lib/"
-    markdown : initValue,
+    markdown: initValue,
     syncScrolling: "single",
     tex: true,
     tocm: true,
@@ -171,8 +168,8 @@ function create_editorMD(id, width, high, placeholder, imageUrl,initValue, callb
 }
 
 
-function updatamakedown(id){
-  setTimeout(()=>{
+function updatamakedown(id) {
+  setTimeout(() => {
     var shixunDescr = window.editormd.markdownToHTML(id, {
       htmlDecode: "style,script,iframe",
       taskList: true,
@@ -180,7 +177,7 @@ function updatamakedown(id){
       flowChart: true,
       sequenceDiagram: true
     });
-    $("#"+id+" p:first").addClass("ReactMarkdown");
+    $("#" + id + " p:first").addClass("ReactMarkdown");
     $('#collaborators_list_info').show()
   }, 200)
 }
@@ -230,11 +227,11 @@ export default class TPMsettings extends Component {
       scopetype: false,
       departmentslist: undefined,
       description: '',
-      evaluate_script:undefined,
+      evaluate_script: undefined,
       standard_scripts: undefined,
       choice_main_type: "",
       choice_small_type: [],
-      choice_standard_scripts:undefined,
+      choice_standard_scripts: undefined,
       editordescriptios: undefined,
       editorevaluate_scripts: undefined,
       choice_standard_scriptssum: undefined,
@@ -250,40 +247,40 @@ export default class TPMsettings extends Component {
       evaluate_scripttype: false,
       exec_timetype: false,
       traineetype: false,
-      standard_scriptsModal:false,
-      standard_scriptsModals:false,
-      SelectTheCommandtype:false,
-      multi_webssh:false,
-      status:0,
-      opers:false,
-      operss:false,
-      testscripttiptype:false,
-      opersss:false,
-      operateshixunstype:false,
-      opening_time:"",
-      opensmail:false,
-      scope_partmenttype:false,
-      newuse_scope:undefined,
-      scope_partments:0,
-      shixun_service_configs:undefined,
-      shixun_service_configlist:undefined,
+      standard_scriptsModal: false,
+      standard_scriptsModals: false,
+      SelectTheCommandtype: false,
+      multi_webssh: false,
+      status: 0,
+      opers: false,
+      operss: false,
+      testscripttiptype: false,
+      opersss: false,
+      operateshixunstype: false,
+      opening_time: "",
+      opensmail: false,
+      scope_partmenttype: false,
+      newuse_scope: undefined,
+      scope_partments: 0,
+      shixun_service_configs: undefined,
+      shixun_service_configlist: undefined,
       pod_exist_time: undefined,
       pod_exist_timetype: false,
-      shixunmemoMDvalue:"",
-      language:"",
-      deleteisnot:true
+      shixunmemoMDvalue: "",
+      language: "",
+      deleteisnot: true
     }
   }
-  descriptionMD=(initValue, id)=> {
+  descriptionMD = (initValue, id) => {
 
     this.contentChanged = false;
     const placeholder = "";
-// amp;
-// 编辑时要传memoId
+    // amp;
+    // 编辑时要传memoId
     const imageUrl = `${getUploadActionUrl()}`;
-// 创建editorMd
+    // 创建editorMd
 
-    const description_editormd =create_editorMD(id, '100%', 400, placeholder, imageUrl,  initValue,()=> {
+    const description_editormd = create_editorMD(id, '100%', 400, placeholder, imageUrl, initValue, () => {
       setTimeout(() => {
         description_editormd.resize()
         description_editormd.cm && description_editormd.cm.refresh()
@@ -302,15 +299,15 @@ export default class TPMsettings extends Component {
     window.description_editormd = description_editormd;
   }
 
-  evaluate_scriptMD=(initValue, id)=> {
+  evaluate_scriptMD = (initValue, id) => {
     this.contentChanged = false;
     const placeholder = "";
-// amp;
-// 编辑时要传memoId
+    // amp;
+    // 编辑时要传memoId
     const imageUrl = `${getUploadActionUrl()}`;
-// 创建editorMd
+    // 创建editorMd
 
-    const evaluate_script_editormd =create_editorMD(id, '100%', 400, placeholder, imageUrl,  initValue,()=> {
+    const evaluate_script_editormd = create_editorMD(id, '100%', 400, placeholder, imageUrl, initValue, () => {
       setTimeout(() => {
         evaluate_script_editormd.resize()
         evaluate_script_editormd.cm && evaluate_script_editormd.cm.refresh()
@@ -334,13 +331,13 @@ export default class TPMsettings extends Component {
 
   componentDidMount() {
 
-    let id=this.props.match.params.shixunId;
+    let id = this.props.match.params.shixunId;
 
-    let Url=`/shixuns/`+id+`/settings.json`;
+    let Url = `/shixuns/` + id + `/settings.json`;
 
-    axios.get(Url).then((response)=> {
+    axios.get(Url).then((response) => {
       // alert(response.data.shixun.choice_standard_scripts)
-      if(response.status===200){
+      if (response.status === 200) {
         this.setState({
           shixunsID: id,
           settingsData: response.data,
@@ -367,15 +364,15 @@ export default class TPMsettings extends Component {
           choice_main_type: response.data.shixun.choice_main_type,
           choice_small_type: response.data.shixun.choice_small_type,
           choice_standard_scripts: response.data.shixun.choice_standard_scripts,
-          standard_scripts:response.data.shixun.standard_scripts,
-          multi_webssh:response.data.shixun.multi_webssh,
-          status:response.data.shixun.status,
-          opening_time:response.data.shixun.opening_time,
-          newuse_scope:response.data.shixun.use_scope,
+          standard_scripts: response.data.shixun.standard_scripts,
+          multi_webssh: response.data.shixun.multi_webssh,
+          status: response.data.shixun.status,
+          opening_time: response.data.shixun.opening_time,
+          newuse_scope: response.data.shixun.use_scope,
           scope_partments: response.data.shixun.scope_partment.length,
-          shixunmemoMDvalue:response.data.shixun.evaluate_script,
-          shixun_service_configs:response.data.shixun.shixun_service_configs,
-          shixun_service_configlist:response.data.shixun.shixun_service_configs,
+          shixunmemoMDvalue: response.data.shixun.evaluate_script,
+          shixun_service_configs: response.data.shixun.shixun_service_configs,
+          shixun_service_configlist: response.data.shixun.shixun_service_configs,
         })
 
         // if(response.data.status===403){
@@ -387,13 +384,13 @@ export default class TPMsettings extends Component {
         // }
 
 
-        if(response.data.shixun.multi_webssh===true){
+        if (response.data.shixun.multi_webssh === true) {
           this.setState({
-            SelectTheCommandtype:true
+            SelectTheCommandtype: true
           })
-        }else{
+        } else {
           this.setState({
-            SelectTheCommandtype:false
+            SelectTheCommandtype: false
           })
         }
         if (response.data.shixun.scope_partment.length > 0) {
@@ -441,14 +438,14 @@ export default class TPMsettings extends Component {
 
   }
 
-  SelectshixunCommand=(e)=>{
+  SelectshixunCommand = (e) => {
     // console.log( e.target.value)
     const webssh = e.target.value
     if (webssh == 2) {
       this.setState({
         webssh: webssh,
         SelectTheCommandtype: true,
-        multi_webssh:false
+        multi_webssh: false
       });
     } else {
       if (this.state.init_is_secret_repository && !this.state.vnc && this.state.is_secret_repository == true) {
@@ -457,7 +454,7 @@ export default class TPMsettings extends Component {
             this.setState({
               webssh: webssh,
               SelectTheCommandtype: false,
-              multi_webssh:false
+              multi_webssh: false
             });
           }
         })
@@ -470,7 +467,7 @@ export default class TPMsettings extends Component {
         this.setState({
           webssh: webssh,
           SelectTheCommandtype: false,
-          multi_webssh:false
+          multi_webssh: false
         });
       }
     }
@@ -491,13 +488,13 @@ export default class TPMsettings extends Component {
     // }
   }
 
-  SelectOpenpublic=(e)=>{
+  SelectOpenpublic = (e) => {
     this.setState({
       Openpublic: e.target.value
     });
   }
 
-  can_copy=(e)=>{
+  can_copy = (e) => {
     let sum = ""
     if (e.target.checked === false) {
       sum = 0
@@ -510,7 +507,7 @@ export default class TPMsettings extends Component {
 
   }
 
-  task_pass=(e)=>{
+  task_pass = (e) => {
 
     let sum = ""
     if (e.target.checked === false) {
@@ -523,7 +520,7 @@ export default class TPMsettings extends Component {
     });
   }
 
-  test_set_permission=(e)=>{
+  test_set_permission = (e) => {
     let sum = ""
     if (e.target.checked === false) {
       sum = 0
@@ -536,7 +533,7 @@ export default class TPMsettings extends Component {
 
   }
 
-  hide_code=(e)=>{
+  hide_code = (e) => {
     let sum = ""
     if (e.target.checked === false) {
       sum = 0
@@ -553,7 +550,7 @@ export default class TPMsettings extends Component {
       code_edit_permission: e.target.checked
     })
   }
-  code_hidden=(e)=>{
+  code_hidden = (e) => {
     let sum = ""
     if (e.target.checked === false) {
       sum = 0
@@ -565,7 +562,7 @@ export default class TPMsettings extends Component {
     });
 
   }
-  confirmDeleteSecretRepo = ({title, onOk}) => {
+  confirmDeleteSecretRepo = ({ title, onOk }) => {
     confirm({
       title: title || <div>
         <div>已创建的私密版本库及其内容，将在“保存”时被删除。</div>
@@ -605,14 +602,14 @@ export default class TPMsettings extends Component {
       forbid_copy: sum,
     });
   }
-  shixun_vnc_evaluate=(e) => {
+  shixun_vnc_evaluate = (e) => {
     this.setState({
       vnc_evaluate: e.target.checked,
     });
 
   }
 
-  shixun_vnc=(e)=>{
+  shixun_vnc = (e) => {
     // let sum = ""
     // if (e.target.checked === false) {
     //   sum = 0
@@ -655,58 +652,58 @@ export default class TPMsettings extends Component {
     // }
     this.setState({
       name: e.target.value,
-      shixunnametype:false
+      shixunnametype: false
     })
   }
 
   bigClass = (value) => {
     // choice_main_type
     // 	choice_small_type
-    let {settingsData,shixun_service_configs,choice_main_type,choice_small_type}=this.state;
+    let { settingsData, shixun_service_configs, choice_main_type, choice_small_type } = this.state;
 
-    let list=[]
+    let list = []
     list.push(choice_main_type)
-    choice_small_type.map((item,key)=>{
+    choice_small_type.map((item, key) => {
       list.push(item)
     })
 
-    let newshixun_service_configs=shixun_service_configs;
+    let newshixun_service_configs = shixun_service_configs;
 
-    let newshixun_service_configsagin=[]
+    let newshixun_service_configsagin = []
 
-    newshixun_service_configs.map((item,key)=>{
-      list.map((its,index)=>{
-        if(item.mirror_repository_id===its){
+    newshixun_service_configs.map((item, key) => {
+      list.map((its, index) => {
+        if (item.mirror_repository_id === its) {
           newshixun_service_configsagin.push(item)
         }
       })
     })
 
 
-    settingsData.shixun.main_type.some((item,key)=> {
-        if (item.id === value) {
-          newshixun_service_configsagin[0]={
-            mirror_repository_id:value,
-            name:item.type_name,
-            cpu_limit:1,
-            lower_cpu_limit:0.1,
-            memory_limit:1024,
-            request_limit:10
-          }
-          return true
+    settingsData.shixun.main_type.some((item, key) => {
+      if (item.id === value) {
+        newshixun_service_configsagin[0] = {
+          mirror_repository_id: value,
+          name: item.type_name,
+          cpu_limit: 1,
+          lower_cpu_limit: 0.1,
+          memory_limit: 1024,
+          request_limit: 10
         }
+        return true
       }
+    }
     )
-    let url = `/shixuns/get_mirror_script.json?mirror_id=`+value;
+    let url = `/shixuns/get_mirror_script.json?mirror_id=` + value;
     axios.get(url).then((response) => {
       if (response.status === 200) {
         // console.log(response.data)
         this.setState({
           choice_main_type: value,
-          standard_scripts:response.data,
-          choice_standard_scripts:null,
-          shixun_service_configs:newshixun_service_configsagin,
-          shixun_service_configlist:newshixun_service_configsagin,
+          standard_scripts: response.data,
+          choice_standard_scripts: null,
+          shixun_service_configs: newshixun_service_configsagin,
+          shixun_service_configlist: newshixun_service_configsagin,
         })
       }
     }).catch((error) => {
@@ -716,40 +713,40 @@ export default class TPMsettings extends Component {
 
 
   }
-  Deselectlittle=(value)=>{
+  Deselectlittle = (value) => {
 
-    let {shixun_service_configs,choice_small_type}=this.state;
-    let newshixun_service_configs=shixun_service_configs;
-    let newchoice_small_type=choice_small_type;
+    let { shixun_service_configs, choice_small_type } = this.state;
+    let newshixun_service_configs = shixun_service_configs;
+    let newchoice_small_type = choice_small_type;
 
-    newshixun_service_configs.some((item,key)=> {
-        if (item.mirror_repository_id === value) {
-          newshixun_service_configs.splice(key, 1)
-          return true
-        }
+    newshixun_service_configs.some((item, key) => {
+      if (item.mirror_repository_id === value) {
+        newshixun_service_configs.splice(key, 1)
+        return true
       }
+    }
     )
 
-    newchoice_small_type.some((item,key)=> {
-        if (item === value) {
-          newchoice_small_type.splice(key, 1)
-          return true
-        }
+    newchoice_small_type.some((item, key) => {
+      if (item === value) {
+        newchoice_small_type.splice(key, 1)
+        return true
       }
+    }
     )
 
 
     this.setState({
       choice_small_type: newchoice_small_type,
-      shixun_service_configs:newshixun_service_configs,
-      shixun_service_configlist:newshixun_service_configs,
+      shixun_service_configs: newshixun_service_configs,
+      shixun_service_configlist: newshixun_service_configs,
     })
   }
   littleClass = (value) => {
 
-    let {settingsData,shixun_service_configs,choice_small_type,choice_main_type}=this.state;
-    let newshixun_service_configs=shixun_service_configs;
-    let newchoice_small_type=choice_small_type;
+    let { settingsData, shixun_service_configs, choice_small_type, choice_main_type } = this.state;
+    let newshixun_service_configs = shixun_service_configs;
+    let newchoice_small_type = choice_small_type;
     // if(Array.isArray(value)===true){
     // 	value.map((item,key)=>{
     // 		settingsData.shixun.small_type.some((items,keys)=> {
@@ -769,43 +766,43 @@ export default class TPMsettings extends Component {
     // 	})
     // }
 
-    let list=[]
+    let list = []
     list.push(choice_main_type)
-    choice_small_type.map((item,key)=>{
+    choice_small_type.map((item, key) => {
       list.push(item)
     })
 
-    let newshixun_service_configsagin=[]
+    let newshixun_service_configsagin = []
 
-    newshixun_service_configs.map((item,key)=>{
-      list.map((its,index)=>{
-        if(item.mirror_repository_id===its){
+    newshixun_service_configs.map((item, key) => {
+      list.map((its, index) => {
+        if (item.mirror_repository_id === its) {
           newshixun_service_configsagin.push(item)
         }
       })
     })
 
-    settingsData.shixun.small_type.some((items,keys)=> {
-        if (items.id === value) {
-          newshixun_service_configsagin.push({
-            mirror_repository_id:value,
-            name:items.type_name,
-            cpu_limit:1,
-            lower_cpu_limit:0.1,
-            memory_limit:1024,
-            request_limit:10
-          })
-          return true
-        }
+    settingsData.shixun.small_type.some((items, keys) => {
+      if (items.id === value) {
+        newshixun_service_configsagin.push({
+          mirror_repository_id: value,
+          name: items.type_name,
+          cpu_limit: 1,
+          lower_cpu_limit: 0.1,
+          memory_limit: 1024,
+          request_limit: 10
+        })
+        return true
       }
+    }
     )
 
     newchoice_small_type.push(value)
 
     this.setState({
       choice_small_type: newchoice_small_type,
-      shixun_service_configs:newshixun_service_configsagin,
-      shixun_service_configlist:newshixun_service_configsagin,
+      shixun_service_configs: newshixun_service_configsagin,
+      shixun_service_configlist: newshixun_service_configsagin,
     })
   }
   onPodExistTimeChange = (e) => {
@@ -832,7 +829,7 @@ export default class TPMsettings extends Component {
 
   }
   deleteScopeInput = (key) => {
-    let {scope_partment} = this.state;
+    let { scope_partment } = this.state;
     let datalist = scope_partment;
     datalist.splice(key, 1);
     this.setState({
@@ -841,10 +838,10 @@ export default class TPMsettings extends Component {
   }
 
   shixunScopeInput = (e) => {
-    let {scope_partment} = this.state;
+    let { scope_partment } = this.state;
     let datalist = scope_partment;
-    if (datalist===undefined) {
-      datalist=[]
+    if (datalist === undefined) {
+      datalist = []
     }
 
     datalist.push(e)
@@ -867,19 +864,19 @@ export default class TPMsettings extends Component {
   submit_edit_shixun = () => {
     if (this.saving == true) return;
     this.saving = true;
-    if(this.state.status===-1){
+    if (this.state.status === -1) {
       this.props.showSnackbar("该实训已被删除，保存失败！");
       return
     }
 
     let {
       name, choice_main_type, choice_small_type, choice_standard_scripts, scope_partment, choice_standard_scriptssum, vnc_evaluate,
-      evaluate_script, webssh, use_scope, trainee, can_copy, task_pass, test_set_permission, hide_code, code_hidden, forbid_copy, vnc,multi_webssh,
-      opening_time,shixunmemoMDvalue,shixun_service_configlist, is_secret_repository, code_edit_permission
+      evaluate_script, webssh, use_scope, trainee, can_copy, task_pass, test_set_permission, hide_code, code_hidden, forbid_copy, vnc, multi_webssh,
+      opening_time, shixunmemoMDvalue, shixun_service_configlist, is_secret_repository, code_edit_permission
     } = this.state;
 
     let newshixun_service_configlist = shixun_service_configlist.map(v => {
-      let v1 = Object.assign({},v);
+      let v1 = Object.assign({}, v);
       delete v1.name;
       return v1
     });
@@ -892,10 +889,10 @@ export default class TPMsettings extends Component {
 
     let evaluate_script_editormd;
 
-    if(this.state.status==0||this.state.status==1||this.state.status==2&&this.props.identity===1){
+    if (this.state.status == 0 || this.state.status == 1 || this.state.status == 2 && this.props.identity === 1) {
       // evaluate_script_editormd = this.evaluate_script_editormd.getValue();
       evaluate_script_editormd = shixunmemoMDvalue
-    }else{
+    } else {
       evaluate_script_editormd = evaluate_script;
     }
 
@@ -928,9 +925,9 @@ export default class TPMsettings extends Component {
       }, 1000);
       return
     }
-    if(use_scope===1){
+    if (use_scope === 1) {
 
-      if(scope_partment===undefined||scope_partment.length===0){
+      if (scope_partment === undefined || scope_partment.length === 0) {
         this.setState({
           scope_partmenttype: true
         })
@@ -968,24 +965,24 @@ export default class TPMsettings extends Component {
 
     let id = this.props.match.params.shixunId;
 
-    let newmulti_webssh=multi_webssh;
+    let newmulti_webssh = multi_webssh;
 
 
-    if(newmulti_webssh===null){
-      newmulti_webssh=false
+    if (newmulti_webssh === null) {
+      newmulti_webssh = false
     }
 
     //exec_time: exec_time,
     let Url = `/shixuns/` + id + `.json`;
     let data = {
-      shixun:{
+      shixun: {
 
         name: name,
         webssh: webssh,
         use_scope: use_scope,
         can_copy: can_copy,
-        vnc: vnc===null?undefined:vnc,
-        vnc_evaluate: vnc_evaluate===null?undefined:vnc_evaluate,
+        vnc: vnc === null ? undefined : vnc,
+        vnc_evaluate: vnc_evaluate === null ? undefined : vnc_evaluate,
         test_set_permission: test_set_permission,
         code_hidden: code_hidden,
         code_edit_permission: code_edit_permission,
@@ -993,11 +990,11 @@ export default class TPMsettings extends Component {
         task_pass: task_pass,
         hide_code: hide_code,
         forbid_copy: forbid_copy,
-        multi_webssh:newmulti_webssh,
-        opening_time:opening_time,
-        mirror_script_id:choice_standard_scriptssum===undefined?choice_standard_scripts:choice_standard_scriptssum,
+        multi_webssh: newmulti_webssh,
+        opening_time: opening_time,
+        mirror_script_id: choice_standard_scriptssum === undefined ? choice_standard_scripts : choice_standard_scriptssum,
       },
-      shixun_info:{
+      shixun_info: {
         description: description_editormd,
         evaluate_script: evaluate_script_editormd,
       },
@@ -1005,13 +1002,13 @@ export default class TPMsettings extends Component {
       main_type: choice_main_type,
       small_type: choice_small_type,
       scope_partment: scope_partment,
-      shixun_service_configs:newshixun_service_configlist
+      shixun_service_configs: newshixun_service_configlist
     }
 
     axios.put(Url, data).then((response) => {
       // console.log(response)
       this.saving = false;
-      if(response.status){
+      if (response.status) {
         if (response.data.status === -1) {
           this.props.showSnackbar(response.data.message);
           return
@@ -1046,7 +1043,7 @@ export default class TPMsettings extends Component {
     timeout = setTimeout(fake, 300);
   }
   shixunHandleSearch = (value) => {
-    this.shixunsfetch(value, departmentslist => this.setState({departmentslist}));
+    this.shixunsfetch(value, departmentslist => this.setState({ departmentslist }));
   }
 
 
@@ -1056,7 +1053,7 @@ export default class TPMsettings extends Component {
     let id = this.props.match.params.shixunId;
     let cul = `/shixuns/` + id + `/close.json`;
     axios.post(cul).then((response) => {
-      if(response.data.status===1){
+      if (response.data.status === 1) {
         this.props.showSnackbar("操作成功");
         this.setState({
           operateshixunstype: false,
@@ -1069,12 +1066,12 @@ export default class TPMsettings extends Component {
     })
   }
 
-  shixunsdel= () => {
+  shixunsdel = () => {
     let id = this.props.match.params.shixunId;
-    let cul = `/shixuns/` + id +`.json`;
+    let cul = `/shixuns/` + id + `.json`;
 
     axios.delete(cul).then((response) => {
-      if(response.data.status===1){
+      if (response.data.status === 1) {
         this.props.showSnackbar("操作成功");
         this.setState({
           operateshixunstype: false,
@@ -1109,7 +1106,7 @@ export default class TPMsettings extends Component {
 
   hideModalTemplate = (e) => {
     let id = this.props.match.params.shixunId;
-    let {Executiveordervalue, Compilecommandvalue} = this.state;
+    let { Executiveordervalue, Compilecommandvalue } = this.state;
 
     if (Executiveordervalue === "") {
       this.setState({
@@ -1123,7 +1120,7 @@ export default class TPMsettings extends Component {
     axios.get(trl).then((response) => {
       // this.evaluate_scriptMD(response.data.shixun_script, "shixunmemoMD");
       this.setState({
-        shixunmemoMDvalue:response.data.shixun_script
+        shixunmemoMDvalue: response.data.shixun_script
       })
     }).catch((error) => {
       console.log(error)
@@ -1156,7 +1153,7 @@ export default class TPMsettings extends Component {
     })
   }
 
-  setlanguagewrite = (e)=>{
+  setlanguagewrite = (e) => {
     this.setState({
       languagewrite: e.target.value
     })
@@ -1176,7 +1173,7 @@ export default class TPMsettings extends Component {
   }
 
   sendsure_apply = () => {
-    let {languagewrite,systemenvironment,testcoderunmode} = this.state;
+    let { languagewrite, systemenvironment, testcoderunmode } = this.state;
     // console.log("点击确定")
     // console.log("languagewrite"+languagewrite);
     // console.log("systemenvironment"+systemenvironment);
@@ -1188,36 +1185,36 @@ export default class TPMsettings extends Component {
     //         return item.response ? item.response.id : item.id
     //     })
     // }
-    if(languagewrite === undefined || languagewrite === "" ){
+    if (languagewrite === undefined || languagewrite === "") {
       // this.props.showNotification(`请填写该镜像是基于什么语言`);
       this.setState({
-        languagewritetype:true
+        languagewritetype: true
       })
       return
     }
-    if(systemenvironment === undefined || systemenvironment === ""){
+    if (systemenvironment === undefined || systemenvironment === "") {
       // this.props.showNotification(`请填写该镜像是基于什么语言系统环境`);
       this.setState({
-        systemenvironmenttype:true
+        systemenvironmenttype: true
       })
       return;
 
     }
-    if(testcoderunmode === undefined ||  testcoderunmode === "") {
+    if (testcoderunmode === undefined || testcoderunmode === "") {
       // this.props.showNotification(`请填写该镜像中测试代码运行方式`);
       this.setState({
-        testcoderunmodetype:true
+        testcoderunmodetype: true
       })
       return;
     }
-    var  attachment_ids=undefined;
+    var attachment_ids = undefined;
     if (this.state.fileList) {
       attachment_ids = this.state.fileList.map(item => {
         return item.response ? item.response.id : item.id
       })
     }
 
-    if( attachment_ids === undefined ||  attachment_ids.length===0){
+    if (attachment_ids === undefined || attachment_ids.length === 0) {
 
       // notification.open(
       // 	{
@@ -1228,7 +1225,7 @@ export default class TPMsettings extends Component {
       // 	}
       // )
       this.setState({
-        attachmentidstype:true
+        attachmentidstype: true
       })
       return;
     }
@@ -1236,39 +1233,39 @@ export default class TPMsettings extends Component {
 
     // alert(languagewrite +"  "+systemenvironment +"   "+testcoderunmode + "   "+attachment_ids);
 
-    var data={
-      language:languagewrite,
-      runtime:systemenvironment,
-      run_method:testcoderunmode,
-      attachment_id:attachment_ids[0],
+    var data = {
+      language: languagewrite,
+      runtime: systemenvironment,
+      run_method: testcoderunmode,
+      attachment_id: attachment_ids[0],
     }
-    var url =`/shixuns/apply_shixun_mirror.json`;
-    axios.post(url,data
+    var url = `/shixuns/apply_shixun_mirror.json`;
+    axios.post(url, data
     ).then((response) => {
 
       try {
         if (response.data) {
           // const { id } = response.data;
           // if (id) {
-          if(this.state.file !== undefined){
+          if (this.state.file !== undefined) {
             console.log("549");
             // this.deleteAttachment(this.state.file);
             this.setState({
-              file:undefined,
-              deleteisnot:true,
-              languagewrite:"",
-              systemenvironment:"",
-              testcoderunmode:"",
-              fileList:[]
+              file: undefined,
+              deleteisnot: true,
+              languagewrite: "",
+              systemenvironment: "",
+              testcoderunmode: "",
+              fileList: []
             })
-          }else {
+          } else {
             this.setState({
-              file:undefined,
-              deleteisnot:true,
-              languagewrite:"",
-              systemenvironment:"",
-              testcoderunmode:"",
-              fileList:[]
+              file: undefined,
+              deleteisnot: true,
+              languagewrite: "",
+              systemenvironment: "",
+              testcoderunmode: "",
+              fileList: []
             })
           }
           // this.props.showNotification('提交成功！');
@@ -1284,7 +1281,7 @@ export default class TPMsettings extends Component {
           // this.props.history.push(`/courses/${cid}/graduation_topics`);
           // }
         }
-      }catch (e) {
+      } catch (e) {
 
       }
 
@@ -1296,25 +1293,25 @@ export default class TPMsettings extends Component {
     this.setState({
       postapplyvisible: false,
     })
-    if(this.state.file !== undefined){
+    if (this.state.file !== undefined) {
       console.log("580");
       // this.deleteAttachment(this.state.file);
       this.setState({
-        file:undefined,
-        deleteisnot:true,
-        languagewrite:"",
-        systemenvironment:"",
-        testcoderunmode:"",
-        fileList:[]
+        file: undefined,
+        deleteisnot: true,
+        languagewrite: "",
+        systemenvironment: "",
+        testcoderunmode: "",
+        fileList: []
       })
-    }else {
+    } else {
       this.setState({
-        file:undefined,
-        deleteisnot:true,
-        languagewrite:"",
-        systemenvironment:"",
-        testcoderunmode:"",
-        fileList:[]
+        file: undefined,
+        deleteisnot: true,
+        languagewrite: "",
+        systemenvironment: "",
+        testcoderunmode: "",
+        fileList: []
       })
     }
   }
@@ -1328,30 +1325,30 @@ export default class TPMsettings extends Component {
   SelectScput = (value, e) => {
     this.setState({
       choice_standard_scriptssum: value,
-      language:e.props.name,
-      choice_standard_scripts: {id:e.props.value,value:""},
-      standard_scriptsModal:true
+      language: e.props.name,
+      choice_standard_scripts: { id: e.props.value, value: "" },
+      standard_scriptsModal: true
     })
   }
 
-  hidestandard_scriptsModal=()=>{
+  hidestandard_scriptsModal = () => {
     this.setState({
-      standard_scriptsModal:false,
-      standard_scriptsModals:false
+      standard_scriptsModal: false,
+      standard_scriptsModals: false
     })
   }
 
-  get_mirror_script=()=>{
-    let {choice_standard_scriptssum}=this.state;
+  get_mirror_script = () => {
+    let { choice_standard_scriptssum } = this.state;
     let id = this.props.match.params.shixunId;
     let pul = "/shixuns/" + id + "/get_script_contents.json?script_id=" + choice_standard_scriptssum;
     axios.get(pul).then((response) => {
-      if(response.status===200){
+      if (response.status === 200) {
         // this.evaluate_scriptMD(response.data.content, "shixunmemoMD");
         this.setState({
-          standard_scriptsModal:false,
-          standard_scriptsModals:true,
-          shixunmemoMDvalue:response.data.content
+          standard_scriptsModal: false,
+          standard_scriptsModals: true,
+          shixunmemoMDvalue: response.data.content
         })
       }
 
@@ -1361,141 +1358,143 @@ export default class TPMsettings extends Component {
   }
 
 
-  SelectTheCommandonChange=(e)=>{
+  SelectTheCommandonChange = (e) => {
     this.setState({
-      multi_webssh:e.target.checked
+      multi_webssh: e.target.checked
     })
   }
 
-  bigopen=()=>{
+  bigopen = () => {
     this.setState({
-      opers:true
+      opers: true
     })
 
   }
 
-  bigopens=()=>{
+  bigopens = () => {
     this.setState({
-      opers:false,
-      operss:false,
-      opersss:false,
-      opensmail:false
+      opers: false,
+      operss: false,
+      opersss: false,
+      opensmail: false
     })
 
   }
-  bigopensmal=(e)=>{
+  bigopensmal = (e) => {
     this.setState({
-      opensmail:true
+      opensmail: true
     })
 
   }
-  sbigopen=(e)=>{
+  sbigopen = (e) => {
     this.setState({
-      operss:true
+      operss: true
     })
 
   }
 
-  sbigopens=()=>{
+  sbigopens = () => {
     this.setState({
-      operss:false
+      operss: false
     })
   }
-  sbigopenss=(e)=>{
+  sbigopenss = (e) => {
     this.setState({
-      opersss:true
+      opersss: true
     })
 
   }
 
-  sbigopensss=()=>{
+  sbigopensss = () => {
     this.setState({
-      opersss:false
+      opersss: false
     })
   }
-  testscripttip=(val)=>{
-    if(val===0){
+  testscripttip = (val) => {
+    if (val === 0) {
       this.setState({
-        testscripttiptype:true
+        testscripttiptype: true
       })
-    }else if(val===1){
+    } else if (val === 1) {
       this.setState({
-        testscripttiptype:false
+        testscripttiptype: false
       })
     }
   }
 
-  operateshixuns=(value)=>{
+  operateshixuns = (value) => {
     this.setState({
-      operateshixunstype:true,
-      delType:value
+      operateshixunstype: true,
+      delType: value
     })
   }
 
-  hideoperateshixuns=()=>{
+  hideoperateshixuns = () => {
     this.setState({
-      operateshixunstype:false
+      operateshixunstype: false
     })
   }
-  onChangeTimePicker =(value, dateString)=> {
+  onChangeTimePicker = (value, dateString) => {
     this.setState({
-      opening_time: dateString=== ""?"":moment(handleDateStrings(dateString))
+      opening_time: dateString === "" ? "" : moment(handleDateStrings(dateString))
     })
   }
 
-  getshixunmemoMDvalue=(value, e)=>{
+  getshixunmemoMDvalue = (value, e) => {
 
     this.setState({
-      shixunmemoMDvalue:value
+      shixunmemoMDvalue: value
     })
   }
 
-  setConfigsInputs=(e,keys,str)=>{
+  setConfigsInputs = (e, keys, str) => {
 
-    let {shixun_service_configs}=this.state;
-    let newshixun_service_configs=shixun_service_configs;
-    newshixun_service_configs.map((item,key)=>{
-      if(key===keys){
+    let { shixun_service_configs } = this.state;
+    let newshixun_service_configs = shixun_service_configs;
+    newshixun_service_configs.map((item, key) => {
+      if (key === keys) {
         switch (str) {
           case 1:
-            item.cpu_limit=e.target.value
+            item.cpu_limit = e.target.value
             break;
           case 2:
-            item.lower_cpu_limit=e.target.value
+            item.lower_cpu_limit = e.target.value
             break;
           case 3:
-            item.memory_limit=e.target.value
+            item.memory_limit = e.target.value
             break;
           case 4:
-            item.request_limit=e.target.value
+            item.request_limit = e.target.value
             break;
         }
       }
     })
 
     this.setState({
-      shixun_service_configs:newshixun_service_configs,
-      shixun_service_configlist:newshixun_service_configs,
+      shixun_service_configs: newshixun_service_configs,
+      shixun_service_configlist: newshixun_service_configs,
     })
 
   }
 
   handleChange = (info) => {
-    let {fileList}=this.state;
+    let { fileList } = this.state;
 
     if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
       console.log("handleChange1");
 
       // if(fileList.length===0){
       let fileLists = info.fileList;
-      this.setState({ fileList:fileLists,
-        deleteisnot:false});
+      this.setState({
+        fileList: fileLists,
+        deleteisnot: false
+      });
       // }
     }
   }
 
   onAttachmentRemove = (file) => {
-    if(!file.percent || file.percent == 100){
+    if (!file.percent || file.percent == 100) {
       confirm({
         title: '确定要删除这个附件吗?',
         okText: '确定',
@@ -1516,7 +1515,7 @@ export default class TPMsettings extends Component {
 
   deleteAttachment = (file) => {
     console.log(file);
-    let id=file.response ==undefined ? file.id : file.response.id
+    let id = file.response == undefined ? file.id : file.response.id
     const url = `/attachments/${id}.json`
     axios.delete(url, {
     })
@@ -1533,7 +1532,7 @@ export default class TPMsettings extends Component {
               newFileList.splice(index, 1);
               return {
                 fileList: newFileList,
-                deleteisnot:true
+                deleteisnot: true
               };
             });
           }
@@ -1589,7 +1588,7 @@ export default class TPMsettings extends Component {
       scope_partmenttype,
       newuse_scope,
       scope_partments,
-      shixunmemoMDvalue,delType,
+      shixunmemoMDvalue, delType,
       shixun_service_configs,
       fileList,
     } = this.state;
@@ -1610,7 +1609,7 @@ export default class TPMsettings extends Component {
       // https://github.com/ant-design/ant-design/issues/15505
       // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
       // showUploadList: false,
-      action:  `${getUploadActionUrl()}`,
+      action: `${getUploadActionUrl()}`,
       onChange: this.handleChange,
       onRemove: this.onAttachmentRemove,
       beforeUpload: (file, fileList) => {
@@ -1630,14 +1629,14 @@ export default class TPMsettings extends Component {
             }
           )
         }
-        if(this.state.file !== undefined){
+        if (this.state.file !== undefined) {
           console.log("763")
           this.setState({
-            file:file
+            file: file
           })
-        }else {
+        } else {
           this.setState({
-            file:file
+            file: file
           })
         }
 
@@ -1646,12 +1645,12 @@ export default class TPMsettings extends Component {
       },
     }
     const dateFormat = 'YYYY-MM-DD HH:mm:ss';
-    let operateauthority=this.props.identity===1?true:this.props.identity<5&&this.state.status==0?true:false;
+    let operateauthority = this.props.identity === 1 ? true : this.props.identity < 5 && this.state.status == 0 ? true : false;
 
     return (
       <div className="educontent mt30 mb50" id="shixun_settings_show" onClick={this.bigopens}>
         <Breadcrumb separator=">" className={"mb20"}>
-          <Breadcrumb.Item href={"/shixuns/"+this.props.match.params.shixunId+"/challenges"}>实训详情</Breadcrumb.Item>
+          <Breadcrumb.Item href={"/shixuns/" + this.props.match.params.shixunId + "/challenges"}>实训详情</Breadcrumb.Item>
           <Breadcrumb.Item>配置</Breadcrumb.Item>
         </Breadcrumb>
 
@@ -1659,25 +1658,25 @@ export default class TPMsettings extends Component {
           <div className="padding30 bor-bottom-greyE clearfix">
             <span className="fl font-16">配置</span>
             {
-              this.props.identity===1&&this.state.status==2?
+              this.props.identity === 1 && this.state.status == 2 ?
                 <a className="edu-default-btn edu-blueline-btn ml20 fr"
-                   onClick={()=>this.operateshixuns(2)}>
+                  onClick={() => this.operateshixuns(2)}>
                   永久关闭
-                </a>:""
+                </a> : ""
             }
             {
-              this.props.identity < 5 && this.state.status==0?
+              this.props.identity < 5 && this.state.status == 0 ?
                 <a className="edu-default-btn edu-blueline-btn ml20 fr"
-                   onClick={()=>this.operateshixuns(1)}>
+                  onClick={() => this.operateshixuns(1)}>
                   删除实训
-                </a>:""
+                </a> : ""
             }
             {
               this.props.identity == 1 && this.state.status == 2 ?
                 <a className="edu-default-btn edu-blueline-btn ml20 fr"
-                   onClick={()=>this.operateshixuns(1)}>
+                  onClick={() => this.operateshixuns(1)}>
                   删除实训
-                </a>:""
+                </a> : ""
             }
 
             <Modal
@@ -1688,11 +1687,11 @@ export default class TPMsettings extends Component {
               footer={null}
             >
               <div className="task-popup-content">
-                {delType===1?<p className="task-popup-text-center font-16 pb20">是否确认删除 ？</p>:<p className="task-popup-text-center font-16 pb20">关闭后,<br/>用户不能再开始挑战了是否确认关闭 ？</p>}
+                {delType === 1 ? <p className="task-popup-text-center font-16 pb20">是否确认删除 ？</p> : <p className="task-popup-text-center font-16 pb20">关闭后,<br />用户不能再开始挑战了是否确认关闭 ？</p>}
               </div>
               <div className="task-popup-submit clearfix">
                 <a onClick={this.hideoperateshixuns} className="task-btn fl">取消</a>
-                {delType===1?<a className="task-btn task-btn-orange fr" onClick={this.shixunsdel}>确定</a>:<a className="task-btn task-btn-orange fr" onClick={this.shixunsclose}>确定</a>}
+                {delType === 1 ? <a className="task-btn task-btn-orange fr" onClick={this.shixunsdel}>确定</a> : <a className="task-btn task-btn-orange fr" onClick={this.shixunsclose}>确定</a>}
               </div>
             </Modal>
 
@@ -1708,9 +1707,9 @@ export default class TPMsettings extends Component {
                 <div>
                   {settingsData === undefined ? "" :
                     <Input placeholder="请输入实训名称，最多60个字符" className={shixunnametype === true ? "input-100-45 greyInput bor-red" : "input-100-45 greyInput"} maxLength="60" value={name}
-                           onInput={this.shixunsname}/>}
+                      onInput={this.shixunsname} />}
                 </div>
-                <div  className={shixunnametype === true ? "color-orange fl" : "color-orange fl none"}>
+                <div className={shixunnametype === true ? "color-orange fl" : "color-orange fl none"}>
                   <span id="shixun_name_notice"><i className="fa fa-exclamation-circle mr3"></i>必填项</span>
                 </div>
               </div>
@@ -1726,7 +1725,7 @@ export default class TPMsettings extends Component {
           <p className="color-grey-6 font-16 mb30">简介</p>
 
           <div className="padding10-20 edu-back-greyf5 radius4" id="shixundescription">
-            <textarea style={{display: 'none'}} id="evaluate_script_shows" name="content"> </textarea>
+            <textarea style={{ display: 'none' }} id="evaluate_script_shows" name="content"> </textarea>
             <div className="CodeMirror cm-s-defualt">
             </div>
           </div>
@@ -1742,28 +1741,28 @@ export default class TPMsettings extends Component {
             <div className="clearfix mb20">
               <span className="color-orange fl mr20">*</span>
               <div className="width15 fl mr20"
-                // onMouseLeave={operateauthority?this.bigopens:""}
+              // onMouseLeave={operateauthority?this.bigopens:""}
               >
                 <Select placeholder="请选择主类别" value={choice_main_type === "" ? undefined : choice_main_type}
-                        style={{width: 180}}
-                        onChange={operateauthority?this.bigClass:""}
+                  style={{ width: 180 }}
+                  onChange={operateauthority ? this.bigClass : ""}
                   // onMouseEnter={this.bigopen}
                   // onMouseLeave={this.bigopens}
-                        disabled={operateauthority?false:true}
+                  disabled={operateauthority ? false : true}
                   // onMouseEnter={operateauthority?this.bigopen:""}
-                        onSelect={operateauthority?this.bigopens:""}
+                  onSelect={operateauthority ? this.bigopens : ""}
                   // open={opers}
-                        optionFilterProp="children"
-                        filterOption={(input, option) =>
-                          option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                        }
+                  optionFilterProp="children"
+                  filterOption={(input, option) =>
+                    option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                  }
                 >
 
                   {
                     settingsData === undefined ? "" : settingsData.shixun.main_type.map((item, key) => {
                       return (
                         <Option value={item.id} key={key} >
-                          <Tooltip placement="right" title={item.description=== ""?"无描述":item.description} >
+                          <Tooltip placement="right" title={item.description === "" ? "无描述" : item.description} >
                             {item.type_name}
                           </Tooltip>
                         </Option>
@@ -1773,7 +1772,7 @@ export default class TPMsettings extends Component {
                 </Select>
                 <p
                   className="edu-txt-left font-12"
-                  style={{display:operateauthority?"block":'none'}}
+                  style={{ display: operateauthority ? "block" : 'none' }}
                 >
                   列表中没有？
                   <a className="color-blue" onClick={this.post_apply}>申请新建</a>
@@ -1793,58 +1792,58 @@ export default class TPMsettings extends Component {
                       <label className="fl mt10 "><span
                         className="color-red fl mt3">*</span>语言：&nbsp;&nbsp;</label>
                       <textarea className="fl task-form-80 task-height-150"
-                                style={{width:'89%',height:'100px'}}
-                                onInput={this.setlanguagewrite}
-                                value={this.state.languagewrite}
-                                placeholder="请填写该镜像是基于什么语言：示例：Python"
-                                id="demand_info"></textarea>
+                        style={{ width: '89%', height: '100px' }}
+                        onInput={this.setlanguagewrite}
+                        value={this.state.languagewrite}
+                        placeholder="请填写该镜像是基于什么语言：示例：Python"
+                        id="demand_info"></textarea>
                     </li>
-                    <div className={"color-red shixunspanred"}>{this.state.languagewritetype===true?"请填写该镜像语言":""}</div>
+                    <div className={"color-red shixunspanred"}>{this.state.languagewritetype === true ? "请填写该镜像语言" : ""}</div>
                     <li className="clearfix ml1">
                       <label className="panel-form-label fl ml50"><span
                         className="color-red fl mt3">*</span>系统环境：&nbsp;&nbsp;</label>
                       <textarea className="fl task-form-80 task-height-150 "
-                                onInput={this.setsystemenvironment}
-                                style={{height:'100px'}}
-                                value={this.state.systemenvironment}
-                                placeholder="请填写该镜像是基于什么linux系统环境,代码运行环境"
-                                id="demand_info"></textarea>
+                        onInput={this.setsystemenvironment}
+                        style={{ height: '100px' }}
+                        value={this.state.systemenvironment}
+                        placeholder="请填写该镜像是基于什么linux系统环境,代码运行环境"
+                        id="demand_info"></textarea>
                     </li>
-                    <div className={"color-red shixunspanred"}>{this.state.systemenvironmenttype===true?"请填写该镜像语言系统环境":""}</div>
+                    <div className={"color-red shixunspanred"}>{this.state.systemenvironmenttype === true ? "请填写该镜像语言系统环境" : ""}</div>
                     <li className="clearfix">
                       <label className="fl mt10" ><span
                         className="color-red fl mt3">*</span>测试代码运行方式：&nbsp;&nbsp;</label>
 
                       <textarea className="fl task-form-80 task-height-150 "
-                                onInput={this.settestcoderunmode}
-                                value={this.state.testcoderunmode}
-                                style={{height:'100px'}}
-                                placeholder="请填写该镜像中测试代码运行方式"
-                                id="demand_info"></textarea>
+                        onInput={this.settestcoderunmode}
+                        value={this.state.testcoderunmode}
+                        style={{ height: '100px' }}
+                        placeholder="请填写该镜像中测试代码运行方式"
+                        id="demand_info"></textarea>
                     </li>
-                    <div className={"color-red shixunspanred"}>{this.state.testcoderunmodetype===true?"请填写该镜像测试代码运行方式":""}</div>
+                    <div className={"color-red shixunspanred"}>{this.state.testcoderunmodetype === true ? "请填写该镜像测试代码运行方式" : ""}</div>
                     <li className="clearfix ml50">
                       <label className="panel-form-label fl mt-5"><span
                         className="color-red fl">*</span>测试代码：&nbsp;&nbsp;</label>
-                      <div  className="mt10" style={{
+                      <div className="mt10" style={{
                         display: "inline-block"
                       }}>
                         <Upload {...uploadProps} >
-                          <Icon type="upload"  className="fl mt3" > </Icon>
+                          <Icon type="upload" className="fl mt3" > </Icon>
                           <span className="color-blue fl cdefault">上传附件</span>
                           <span className="color-grey-c fl ml10 ">(单个文件50M以内)</span>
                         </Upload>
                       </div>
                     </li>
                     <div className={"color-red shixunspanred"}>
-                      {this.state.attachmentidstype===true?"请上传附件":""}
+                      {this.state.attachmentidstype === true ? "请上传附件" : ""}
                     </div>
                     <li className="edu-txt-center clearfix ">
                       <a className="pop_close task-btn  mr30"
-                         onClick={() => this.sendhideModaly()}
+                        onClick={() => this.sendhideModaly()}
                       >取消</a>
-                      <Button type="primary"  onClick={()=>this.sendsure_apply()}
-                              className="task-btn task-btn-orange">确定</Button>
+                      <Button type="primary" onClick={() => this.sendsure_apply()}
+                        className="task-btn task-btn-orange">确定</Button>
                     </li>
                     <div className="cl"></div>
                   </div>
@@ -1864,7 +1863,7 @@ export default class TPMsettings extends Component {
                   <div>
                     <div className="task-popup-content"><p
                       className="task-popup-text-center font-16"><span
-                      className="font-17 mt10">新建申请已提交，请等待管理员的审核</span></p>
+                        className="font-17 mt10">新建申请已提交，请等待管理员的审核</span></p>
                       <li className="font-14 mt15 color-grey-6 edu-txt-center">我们将在1-2个工作日内与您联系
                       </li>
                     </div>
@@ -1876,24 +1875,24 @@ export default class TPMsettings extends Component {
               </div>
 
               <div className="width15 fl pr mr20"
-                // onMouseLeave={operateauthority?this.bigopens:""}
+              // onMouseLeave={operateauthority?this.bigopens:""}
               >
                 <Select mode="multiple" placeholder="请选择小类别"
-                        value={choice_small_type.length===0||choice_small_type[0]===""||choice_small_type===[]?undefined:choice_small_type}
-                        style={{width: 180,height:30}}
-                        disabled={operateauthority?false:true}
+                  value={choice_small_type.length === 0 || choice_small_type[0] === "" || choice_small_type === [] ? undefined : choice_small_type}
+                  style={{ width: 180, height: 30 }}
+                  disabled={operateauthority ? false : true}
                   // onChange={operateauthority?this.littleClass:""}
-                        onDeselect={operateauthority?this.Deselectlittle:""}
+                  onDeselect={operateauthority ? this.Deselectlittle : ""}
                   // onMouseEnter={operateauthority?this.bigopensmal:""}
-                        onSelect={operateauthority?this.littleClass:""}
-                        defaultOpen={false}
-                  // open={opensmail}
+                  onSelect={operateauthority ? this.littleClass : ""}
+                  defaultOpen={false}
+                // open={opensmail}
                 >
                   {
                     settingsData === undefined ? "" : settingsData.shixun.small_type.map((item, key) => {
-                      return(
+                      return (
                         <Option value={item.id} key={key}>
-                          <Tooltip placement="right" title={item.description=== ""?"无描述":item.description} >
+                          <Tooltip placement="right" title={item.description === "" ? "无描述" : item.description} >
                             {item.type_name}
                           </Tooltip>
                         </Option>
@@ -1902,10 +1901,10 @@ export default class TPMsettings extends Component {
                   }
                 </Select>
               </div>
-              <div style={{width: ' 57px '}} className="fl">
-												<span className={shixunmaintype === true ? "color-orange mt8" : "color-orange mt8 none"}
-                              id="shixun_name_notice"><i
-                          className="fa fa-exclamation-circle mr3"></i>必填项</span>
+              <div style={{ width: ' 57px ' }} className="fl">
+                <span className={shixunmaintype === true ? "color-orange mt8" : "color-orange mt8 none"}
+                  id="shixun_name_notice"><i
+                    className="fa fa-exclamation-circle mr3"></i>必填项</span>
               </div>
               {/*<p className="fl ml10 color-grey-9 mt5">请在配置页面完成后续的评测脚本设置操作</p>*/}
 
@@ -1914,19 +1913,19 @@ export default class TPMsettings extends Component {
           {/*</div>*/}
           {/*<div className="edu-back-white mb10 padding40-20 clearfix" >*/}
           <div className="clearfix"
-            // onMouseLeave={operateauthority?this.bigopens:""}
+          // onMouseLeave={operateauthority?this.bigopens:""}
           >
             <p className="color-grey-6 font-16 mb30">评测脚本</p>
             <div className="pl35">
               <Select placeholder="请选择选择脚本"
-                      style={{width: 180}}
-                      className="fl"
-                      disabled={operateauthority?false:true}
+                style={{ width: 180 }}
+                className="fl"
+                disabled={operateauthority ? false : true}
                 // onMouseEnter={operateauthority?this.sbigopen:""}
-                      onSelect={operateauthority?this.bigopens:""}
+                onSelect={operateauthority ? this.bigopens : ""}
                 // open={operss}
-                      value={choice_standard_scripts === undefined||choice_standard_scripts === null ? undefined :choice_standard_scripts.id===undefined?choice_standard_scripts:choice_standard_scripts.id}
-                      onChange={operateauthority?this.SelectScput:""}>
+                value={choice_standard_scripts === undefined || choice_standard_scripts === null ? undefined : choice_standard_scripts.id === undefined ? choice_standard_scripts : choice_standard_scripts.id}
+                onChange={operateauthority ? this.SelectScput : ""}>
                 {
                   standard_scripts === undefined ? "" : standard_scripts.map((item, key) => {
                     return (
@@ -1949,8 +1948,8 @@ export default class TPMsettings extends Component {
                 </div>
 
                 <div className="task-popup-submit clearfix mt10">
-                  <a onClick={()=>this.hidestandard_scriptsModal()} className="task-btn fl">取消</a>
-                  <a className="task-btn task-btn-orange fr" onClick={()=>this.get_mirror_script()}>确定</a>
+                  <a onClick={() => this.hidestandard_scriptsModal()} className="task-btn fl">取消</a>
+                  <a className="task-btn task-btn-orange fr" onClick={() => this.get_mirror_script()}>确定</a>
                 </div>
               </Modal>
 
@@ -1963,47 +1962,47 @@ export default class TPMsettings extends Component {
               >
                 <div className="task-popup-content"><p className="task-popup-text-center font-16">评测脚本生成成功！</p></div>
                 <div className="task-popup-sure clearfix">
-                  <a className="task-btn task-btn-orange" onClick={()=>this.hidestandard_scriptsModal()} >确定</a>
+                  <a className="task-btn task-btn-orange" onClick={() => this.hidestandard_scriptsModal()} >确定</a>
                 </div>
               </Modal>
 
               {
-                this.props.identity<5||this.props.power==true?
+                this.props.identity < 5 || this.props.power == true ?
                   <a onClick={this.showModal} id="define_template"
-                     className="color-orange-tip ml20 mt1 fl">使用自定义脚本</a> : ""
+                    className="color-orange-tip ml20 mt1 fl">使用自定义脚本</a> : ""
               }
               <div className="ml6 fl pr"
-                   style={{display:operateauthority?'block':"none"}}
+                style={{ display: operateauthority ? 'block' : "none" }}
               >
-                <a onClick={()=>this.testscripttip(0)}><img
-                  src={getImageUrl("images/educoder/problem.png") }/></a>
+                <a onClick={() => this.testscripttip(0)}><img
+                  src={getImageUrl("images/educoder/problem.png")} /></a>
                 <div className="invite-tip clearfix none " id="test_script_tip"
-                     style={{top: '33px', right: '-6px',width: '322px',zIndex: '10',display: testscripttiptype===true?'block':"none"}}>
+                  style={{ top: '33px', right: '-6px', width: '322px', zIndex: '10', display: testscripttiptype === true ? 'block' : "none" }}>
                   <span className="top-black-trangle"></span>
                   <div className="padding20 invitecontent clearfix">
                     <p className="font-12 edu-txt-left">
-                      使用自定义模板，平台无法自动更新脚本，<br/>
-                      请在关卡创建完后手动更新脚本中的必填参<br/>
-                      数和以下2个数组元素：<br/>
-                      challengeProgramNames<br/>
-                      sourceClassNames<br/><br/>
-                      示例：有2个关卡的实训<br/><br/>
-                      各关卡的待编译文件为：<br/>
-                      src/step1/HelloWorld.java<br/>
-                      src/step2/Other.java<br/><br/>
-                      各关卡的编译后生成的执行文件为：<br/>
-                      step1.HelloWorld<br/>
-                      step2.Other<br/><br/>
-                      则数组元素更新如下：<br/>
-                      challengeProgramNames=("src/step1/<br/>
-                      HelloWorld.java" "src/step2/Other.java")<br/>
-                      sourceClassNames=("step1.HelloWorld<br/>
-                      " "step2.Other")<br/><br/>
+                      使用自定义模板，平台无法自动更新脚本，<br />
+                      请在关卡创建完后手动更新脚本中的必填参<br />
+                      数和以下2个数组元素：<br />
+                      challengeProgramNames<br />
+                      sourceClassNames<br /><br />
+                      示例：有2个关卡的实训<br /><br />
+                      各关卡的待编译文件为：<br />
+                      src/step1/HelloWorld.java<br />
+                      src/step2/Other.java<br /><br />
+                      各关卡的编译后生成的执行文件为：<br />
+                      step1.HelloWorld<br />
+                      step2.Other<br /><br />
+                      则数组元素更新如下：<br />
+                      challengeProgramNames=("src/step1/<br />
+                      HelloWorld.java" "src/step2/Other.java")<br />
+                      sourceClassNames=("step1.HelloWorld<br />
+                      " "step2.Other")<br /><br />
                       其它参数可按实际需求定制
                     </p>
                   </div>
                   <p className="inviteTipbtn with100 fl">
-                    <a onClick={()=>this.testscripttip(1)}>知道了</a>
+                    <a onClick={() => this.testscripttip(1)}>知道了</a>
                   </p>
                 </div>
               </div>
@@ -2022,27 +2021,27 @@ export default class TPMsettings extends Component {
                     <label className="panel-form-label fl"><span
                       className="color-orange mr5">*</span>执行命令：</label>
                     <textarea className="task-form-80 task-height-150 panel-box-sizing fl mt10"
-                              onInput={this.Executiveorder}
-                              value={Executiveordervalue}
-                              style={{width:'100%'}}
-                              id="executive_command"
+                      onInput={this.Executiveorder}
+                      value={Executiveordervalue}
+                      style={{ width: '100%' }}
+                      id="executive_command"
                     >
-														</textarea>
+                    </textarea>
                     <p className="-text-danger fl mt5"
-                       id="executive_command_notice"
-                       style={{display: Executivetyoe === false ? "none" : "block"}}
+                      id="executive_command_notice"
+                      style={{ display: Executivetyoe === false ? "none" : "block" }}
                     >执行命令不能为空</p>
                   </li>
 
                   <li className="clearfix mb15">
                     <label className="panel-form-label fl">编译命令：</label>
                     <textarea className="task-form-80 task-height-150 panel-box-sizing fl mt10"
-                              value={Compilecommandvalue}
-                              onInput={this.Compilecommand}
-                              id="compile_command"
-                              style={{width:'100%'}}
+                      value={Compilecommandvalue}
+                      onInput={this.Compilecommand}
+                      id="compile_command"
+                      style={{ width: '100%' }}
                     >
-														</textarea>
+                    </textarea>
                   </li>
                 </div>
               </Modal>
@@ -2051,13 +2050,13 @@ export default class TPMsettings extends Component {
 
           <div className="mt30 clearfix df">
             <div
-              className={operateauthority===false?'nonemodel':""}
+              className={operateauthority === false ? 'nonemodel' : ""}
             ></div>
             <span className="color-orange fl mr30">*</span>
             <div className="flex1">
 
 
-              <div className="fl"  style={{border:'1px solid #ccc'}}>
+              <div className="fl" style={{ border: '1px solid #ccc' }}>
                 {/*<textarea className={"shixunmemoMDdiv"} value={shixunmemoMDvalue} onInput={this.getshixunmemoMDvalue}  name="content">*/}
                 {/*</textarea>*/}
                 <MonacoEditor
@@ -2065,11 +2064,11 @@ export default class TPMsettings extends Component {
                   width="1100"
                   language={this.state.language}
                   value={shixunmemoMDvalue}
-                  options={ {
+                  options={{
                     selectOnLineNumbers: true
                   }}
-                  onChange={operateauthority===true?this.getshixunmemoMDvalue:""}
-                  // onChange={this.getshixunmemoMDvalue}
+                  onChange={operateauthority === true ? this.getshixunmemoMDvalue : ""}
+                // onChange={this.getshixunmemoMDvalue}
                 />
               </div>
 
@@ -2088,17 +2087,17 @@ export default class TPMsettings extends Component {
 
           </div>
           <div className="clearfix"
-               style={{display:operateauthority?'block':"none"}}
+            style={{ display: operateauthority ? 'block' : "none" }}
           >
             <div className="fl">
-															<span className={evaluate_scripttype === true ? "color-orange fl" : "color-orange fl none"} id="shixun_name_notice">
-															<i className="fa fa-exclamation-circle mr3"></i>必填项</span>
+              <span className={evaluate_scripttype === true ? "color-orange fl" : "color-orange fl none"} id="shixun_name_notice">
+                <i className="fa fa-exclamation-circle mr3"></i>必填项</span>
             </div>
             <p id="e_tip_shixunmemoMDQuestion" className="edu-txt-right color-grey-cd font-12 pdr20 fr"
-               style={{display:operateauthority?'block':"none"}}
+              style={{ display: operateauthority ? 'block' : "none" }}
             ></p>
             <p id="e_tips_shixunmemoMDQuestion" className="edu-txt-right color-grey-cd font-12 pdr20 fr"
-               style={{display:operateauthority?'block':"none"}}
+              style={{ display: operateauthority ? 'block' : "none" }}
             ></p>
           </div>
         </div>
@@ -2139,39 +2138,39 @@ export default class TPMsettings extends Component {
         <div className="edu-back-white mb10 padding40-20">
           <p className="color-grey-6 font-16 mb30">命令行</p>
           <RadioGroup onChange={this.SelectshixunCommand} value={webssh}>
-            <Radio className="radioStyle" value={0}><span>无命令行窗口</span> <span  className="color-grey-9">（选中则不给学员的实践任务提供命令窗口）</span></Radio>
-            <Radio className="radioStyle" value={1}><span>命令行练习窗口</span> <span  className="color-grey-9">（选中则给学员提供用于练习操作的命令行窗口）</span></Radio>
-            <Radio className="radioStyle" value={2}><span>命令行评测窗口</span> <span  className="color-grey-9">（选中则给学员提供用于关卡评测的命令行窗口）</span></Radio>
-            <Checkbox style={{display:SelectTheCommandtype||webssh===2?"block":"none"}} className={"ml36"} checked={this.state.multi_webssh} onChange={this.SelectTheCommandonChange}>
+            <Radio className="radioStyle" value={0}><span>无命令行窗口</span> <span className="color-grey-9">（选中则不给学员的实践任务提供命令窗口）</span></Radio>
+            <Radio className="radioStyle" value={1}><span>命令行练习窗口</span> <span className="color-grey-9">（选中则给学员提供用于练习操作的命令行窗口）</span></Radio>
+            <Radio className="radioStyle" value={2}><span>命令行评测窗口</span> <span className="color-grey-9">（选中则给学员提供用于关卡评测的命令行窗口）</span></Radio>
+            <Checkbox style={{ display: SelectTheCommandtype || webssh === 2 ? "block" : "none" }} className={"ml36"} checked={this.state.multi_webssh} onChange={this.SelectTheCommandonChange}>
               多个命令行窗口<span className="color-grey-9">（选中则允许学员同时开启多个命令行窗口）</span>
             </Checkbox>
           </RadioGroup>
         </div>
 
-        <div className="edu-back-white mb10 padding40-20" style={{display:this.props.identity===1?"block":this.state.status===2&&newuse_scope===0||this.state.status===1&&newuse_scope===0?"none":"block"}}>
+        <div className="edu-back-white mb10 padding40-20" style={{ display: this.props.identity === 1 ? "block" : this.state.status === 2 && newuse_scope === 0 || this.state.status === 1 && newuse_scope === 0 ? "none" : "block" }}>
           <p className="color-grey-6 font-16 mb30">公开程度</p>
           <RadioGroup onChange={this.SelectOpenpublic} value={use_scope}>
-            <Radio className="radioStyle" value={0}><span>对所有公开</span> <span  className="color-grey-9">(选中则所有已被试用授权的用户可以学习)</span></Radio>
-            <Radio className="radioStyle" value={1}><span>对指定单位公开</span> <span  className="color-grey-9">(选中则下方指定单位的已被试用授权的用户可以学习)</span></Radio>
+            <Radio className="radioStyle" value={0}><span>对所有公开</span> <span className="color-grey-9">(选中则所有已被试用授权的用户可以学习)</span></Radio>
+            <Radio className="radioStyle" value={1}><span>对指定单位公开</span> <span className="color-grey-9">(选中则下方指定单位的已被试用授权的用户可以学习)</span></Radio>
           </RadioGroup>
 
-          <div className="clearfix none" id="unit-all" style={{display: scopetype === false ? 'none' : 'block'}}>
+          <div className="clearfix none" id="unit-all" style={{ display: scopetype === false ? 'none' : 'block' }}>
             <div className="fl ml25">
-              <div className="fl" id="unit-input-part"  style={{width:'100%'}}>
+              <div className="fl" id="unit-input-part" style={{ width: '100%' }}>
                 <div id="person-unit" className="fl pr mr10">
                   <div className="shixunScopeInput fl" >
                     <Select
-                      style={{width:'200px'}}
+                      style={{ width: '200px' }}
                       placeholder="请输入并选择单位名称"
-                      onChange={(value)=>this.shixunScopeInput(value)}
+                      onChange={(value) => this.shixunScopeInput(value)}
                       onSearch={this.shixunHandleSearch}
                       showSearch
                       defaultActiveFirstOption={false}
                       showArrow={false}
                       filterOption={false}
                       notFoundContent={null}
-                      className={scope_partmenttype===true?"bor-red":""}
-                      // ifd={key}
+                      className={scope_partmenttype === true ? "bor-red" : ""}
+                    // ifd={key}
                     >
                       {options}
                     </Select>
@@ -2183,18 +2182,18 @@ export default class TPMsettings extends Component {
                 {/*添加</a>*/}
               </div>
 
-              <div style={{width:'100%'}}>
+              <div style={{ width: '100%' }}>
                 <div className="mt20 clearfix" id="task_tag_content">
                   {
-                    scope_partment===undefined?"":scope_partment.map((item,key)=>{
+                    scope_partment === undefined ? "" : scope_partment.map((item, key) => {
 
-                      return(
+                      return (
                         <li className="task_tag_span" key={key}><span>{item}</span>
-                          <a  style={{ color: 'rgba(0,0,0,.25)' }}
-                              onClick={(key)=>this.deleteScopeInput(key)}
-                            // style={{display:this.props.status===2&&this.props.identity>1||this.props.status===1&&this.props.identity>1===true?"none":"block"}}
+                          <a style={{ color: 'rgba(0,0,0,.25)' }}
+                            onClick={(key) => this.deleteScopeInput(key)}
+                          // style={{display:this.props.status===2&&this.props.identity>1||this.props.status===1&&this.props.identity>1===true?"none":"block"}}
                           >
-                            {this.props.identity===1?"x":this.state.status===2&&scope_partment===scope_partments||this.state.status===1&&scope_partment===scope_partments?"":"×"}
+                            {this.props.identity === 1 ? "x" : this.state.status === 2 && scope_partment === scope_partments || this.state.status === 1 && scope_partment === scope_partments ? "" : "×"}
                           </a>
                         </li>
                       )
@@ -2218,8 +2217,8 @@ export default class TPMsettings extends Component {
                 {/*})*/}
                 {/*}*/}
               </div>
-              <span className={scope_partmenttype===true?"color-orange ml20 fl":"color-orange ml20 fl none"} id="public_unit_notice">
-																			<i className="fa fa-exclamation-circle mr3"></i>
+              <span className={scope_partmenttype === true ? "color-orange ml20 fl" : "color-orange ml20 fl none"} id="public_unit_notice">
+                <i className="fa fa-exclamation-circle mr3"></i>
 																	请选择需要公开的单位
 													</span>
             </div>
@@ -2230,19 +2229,19 @@ export default class TPMsettings extends Component {
           <p className="color-grey-6 font-16 mb30">发布信息</p>
 
           <div className="clearfix"
-            // onMouseLeave={this.bigopens}
+          // onMouseLeave={this.bigopens}
           >
             <span className="color-orange fl mr20">*</span>
-            <span className="color-grey-6 fl" style={{minWidth: '95px'}}>面向学员：</span>
+            <span className="color-grey-6 fl" style={{ minWidth: '95px' }}>面向学员：</span>
 
             <div className="with15 fl pr ">
               <Select placeholder="请选择学员类别"
-                      style={{width: 180}}
-                      value={trainee}
-                      onChange={this.Selecttrainee}
+                style={{ width: 180 }}
+                value={trainee}
+                onChange={this.Selecttrainee}
                 // onMouseEnter={this.sbigopenss}
-                      onSelect={this.sbigopensss}
-                // open={opersss}
+                onSelect={this.sbigopensss}
+              // open={opersss}
               >
                 <Option value={1}>初级学员</Option>
                 <Option value={2}>中级学员</Option>
@@ -2251,125 +2250,125 @@ export default class TPMsettings extends Component {
               </Select>
             </div>
             <span className="fl ml20 color-grey">实训难易度定位，不限定用户群体</span>
-            <div style={{width: ' 57px '}} className="fl ml15">
-												<span className={traineetype === true ? "color-orange mt8" : "color-orange mt8 none"}
-                              id="shixun_name_notice"><i
-                          className="fa fa-exclamation-circle mr3"></i>必填项</span>
+            <div style={{ width: ' 57px ' }} className="fl ml15">
+              <span className={traineetype === true ? "color-orange mt8" : "color-orange mt8 none"}
+                id="shixun_name_notice"><i
+                  className="fa fa-exclamation-circle mr3"></i>必填项</span>
             </div>
 
           </div>
           <div className="clearfix mt20 ml30">
-            <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>复制:</span>
+            <span className="color-grey-6 mt5 fl" style={{ minWidth: '95px' }}>复制:</span>
             <span className="fl mt5">
-															<Checkbox checked={can_copy === undefined ? false : can_copy} onChange={this.can_copy}></Checkbox>
-															<label style={{top:'6px'}} className="color-grey-9 ml10">(勾选则允许已认证的教师复制该实训)</label>
-														</span>
+              <Checkbox checked={can_copy === undefined ? false : can_copy} onChange={this.can_copy}></Checkbox>
+              <label style={{ top: '6px' }} className="color-grey-9 ml10">(勾选则允许已认证的教师复制该实训)</label>
+            </span>
           </div>
 
           <div className="clearfix mt20 ml30">
-            <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>跳关:</span>
+            <span className="color-grey-6 mt5 fl" style={{ minWidth: '95px' }}>跳关:</span>
             <span className="fl mt5">
-															<Checkbox checked={task_pass === undefined ? false : task_pass} onChange={this.task_pass}></Checkbox>
-															<label style={{top:'6px'}} className="color-grey-9  ml10">(勾选则允许学员跳关挑战实训)</label>
-														</span>
+              <Checkbox checked={task_pass === undefined ? false : task_pass} onChange={this.task_pass}></Checkbox>
+              <label style={{ top: '6px' }} className="color-grey-9  ml10">(勾选则允许学员跳关挑战实训)</label>
+            </span>
           </div>
           <div className="clearfix mt20 ml30">
-            <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>测试集解锁:</span>
+            <span className="color-grey-6 mt5 fl" style={{ minWidth: '95px' }}>测试集解锁:</span>
             <span className="fl mt5">
-															<Checkbox checked={test_set_permission === undefined ? false : test_set_permission}
-                                        onChange={this.test_set_permission}></Checkbox>
-															<label style={{top:'6px'}} className="color-grey-9 ml10">勾选则允许学员通过金币解锁查看测试集内容</label>
-													</span>
+              <Checkbox checked={test_set_permission === undefined ? false : test_set_permission}
+                onChange={this.test_set_permission}></Checkbox>
+              <label style={{ top: '6px' }} className="color-grey-9 ml10">勾选则允许学员通过金币解锁查看测试集内容</label>
+            </span>
           </div>
 
           {!code_hidden && !hide_code && <div className="clearfix mt20 ml30">
-            <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>代码开放修改:</span>
+            <span className="color-grey-6 mt5 fl" style={{ minWidth: '95px' }}>代码开放修改:</span>
             <span className="fl mt5">
-															<Checkbox checked={code_edit_permission === undefined ? false : code_edit_permission}
-                                        onChange={this.code_edit_permission}></Checkbox>
-															<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则学员可以修改版本库目录中的任意文件内容</label>
-													</span>
+              <Checkbox checked={code_edit_permission === undefined ? false : code_edit_permission}
+                onChange={this.code_edit_permission}></Checkbox>
+              <label style={{ top: '6px' }} className="color-grey-9 ml10" >勾选则学员可以修改版本库目录中的任意文件内容</label>
+            </span>
           </div>}
 
           <div className="clearfix mt20 ml30">
-            <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>隐藏代码窗口:</span>
+            <span className="color-grey-6 mt5 fl" style={{ minWidth: '95px' }}>隐藏代码窗口:</span>
             <span className="fl mt5">
-															<Checkbox checked={hide_code === undefined ? false : hide_code} onChange={this.hide_code}></Checkbox>
-															<label style={{top:'6px'}} className="color-grey-9 ml10">勾选则对学员隐藏代码窗口</label>
-													</span>
+              <Checkbox checked={hide_code === undefined ? false : hide_code} onChange={this.hide_code}></Checkbox>
+              <label style={{ top: '6px' }} className="color-grey-9 ml10">勾选则对学员隐藏代码窗口</label>
+            </span>
           </div>
 
           <div className="clearfix mt20 ml30">
-            <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>代码目录隐藏:</span>
+            <span className="color-grey-6 mt5 fl" style={{ minWidth: '95px' }}>代码目录隐藏:</span>
             <span className="fl mt5">
-															<Checkbox checked={code_hidden === undefined ? false : code_hidden}
-                                        onChange={this.code_hidden}></Checkbox>
-															<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则对学员隐藏版本库目录</label>
-													</span>
+              <Checkbox checked={code_hidden === undefined ? false : code_hidden}
+                onChange={this.code_hidden}></Checkbox>
+              <label style={{ top: '6px' }} className="color-grey-9 ml10" >勾选则对学员隐藏版本库目录</label>
+            </span>
           </div>
 
-          { (vnc || webssh == 2) && <div className="clearfix mt20 ml30">
-            <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>私密版本库:</span>
+          {(vnc || webssh == 2) && <div className="clearfix mt20 ml30">
+            <span className="color-grey-6 mt5 fl" style={{ minWidth: '95px' }}>私密版本库:</span>
             <span className="fl mt5">
-															<Checkbox checked={is_secret_repository === undefined ? false : is_secret_repository}
-                                        onChange={this.is_secret_repository}></Checkbox>
-															<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则启用私密版本库，学员页面不能查看该版本库目录</label>
-													</span>
+              <Checkbox checked={is_secret_repository === undefined ? false : is_secret_repository}
+                onChange={this.is_secret_repository}></Checkbox>
+              <label style={{ top: '6px' }} className="color-grey-9 ml10" >勾选则启用私密版本库，学员页面不能查看该版本库目录</label>
+            </span>
           </div>}
 
           <div className="clearfix mt20 ml30">
-            <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>禁用复制粘贴:</span>
+            <span className="color-grey-6 mt5 fl" style={{ minWidth: '95px' }}>禁用复制粘贴:</span>
             <span className="fl mt5">
-															<Checkbox checked={forbid_copy === undefined ? false : forbid_copy}
-                                        onChange={this.forbid_copy}></Checkbox>
-															<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则对学员页面不能使用复制和粘贴功能</label>
-													</span>
+              <Checkbox checked={forbid_copy === undefined ? false : forbid_copy}
+                onChange={this.forbid_copy}></Checkbox>
+              <label style={{ top: '6px' }} className="color-grey-9 ml10" >勾选则对学员页面不能使用复制和粘贴功能</label>
+            </span>
           </div>
 
           <div className="clearfix mt20 ml30">
-            <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>开启时间:</span>
+            <span className="color-grey-6 mt5 fl" style={{ minWidth: '95px' }}>开启时间:</span>
             <span className="fl mt5">
-														<DatePicker
-                              showToday={false}
-                              showTime={{ format: 'HH:mm' }}
-                              format="YYYY-MM-DD HH:mm"
-                              width={178}
-                              locale={locale}
-                              disabledTime={disabledDateTime}
-                              disabledDate={disabledDate}
-                              placeholder="请选择开启时间"
-                              value={opening_time===null||opening_time===""?"":moment(opening_time, dateFormat)}
-                              onChange={this.onChangeTimePicker}
-                              dropdownClassName="hideDisable"
-                            />
-															<label style={{top:'6px'}} className="color-grey-9 ml10" >（为空，则学员在实训发布后，能随时开启实训挑战；否则，学员在开启时间后，才能开启实训挑战）</label>
-													</span>
+              <DatePicker
+                showToday={false}
+                showTime={{ format: 'HH:mm' }}
+                format="YYYY-MM-DD HH:mm"
+                width={178}
+                locale={locale}
+                disabledTime={disabledDateTime}
+                disabledDate={disabledDate}
+                placeholder="请选择开启时间"
+                value={opening_time === null || opening_time === "" ? "" : moment(opening_time, dateFormat)}
+                onChange={this.onChangeTimePicker}
+                dropdownClassName="hideDisable"
+              />
+              <label style={{ top: '6px' }} className="color-grey-9 ml10" >（为空，则学员在实训发布后，能随时开启实训挑战；否则，学员在开启时间后，才能开启实训挑战）</label>
+            </span>
           </div>
 
-          {this.props.identity<3?<div className="clearfix mt20 ml30">
-            <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>VNC图形化:</span>
+          {this.props.identity < 3 ? <div className="clearfix mt20 ml30">
+            <span className="color-grey-6 mt5 fl" style={{ minWidth: '95px' }}>VNC图形化:</span>
             <span className="fl mt5">
-								<Checkbox checked={vnc === undefined ? false : vnc} onChange={this.shixun_vnc}></Checkbox>
-								<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则给学员的实践任务提供Ubuntu系统图形化实践窗口，否则不提供</label>
-							</span>
-          </div>:""}
-          {this.props.identity<3 && vnc ?<div className="clearfix mt20 ml30">
-            <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>VNC图形化评测:</span>
+              <Checkbox checked={vnc === undefined ? false : vnc} onChange={this.shixun_vnc}></Checkbox>
+              <label style={{ top: '6px' }} className="color-grey-9 ml10" >勾选则给学员的实践任务提供Ubuntu系统图形化实践窗口，否则不提供</label>
+            </span>
+          </div> : ""}
+          {this.props.identity < 3 && vnc ? <div className="clearfix mt20 ml30">
+            <span className="color-grey-6 mt5 fl" style={{ minWidth: '95px' }}>VNC图形化评测:</span>
             <span className="fl mt5 ml5">
-								<Checkbox checked={vnc_evaluate === undefined ? false : vnc_evaluate} onChange={this.shixun_vnc_evaluate}></Checkbox>
-								<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则在学员的VNC图形化页面中，开启评测功能</label>
-							</span>
-          </div>:""}
+              <Checkbox checked={vnc_evaluate === undefined ? false : vnc_evaluate} onChange={this.shixun_vnc_evaluate}></Checkbox>
+              <label style={{ top: '6px' }} className="color-grey-9 ml10" >勾选则在学员的VNC图形化页面中，开启评测功能</label>
+            </span>
+          </div> : ""}
 
 
 
         </div>
 
-        {this.props.identity<3?<div className="edu-back-white padding40-20 mb20">
+        {this.props.identity < 3 ? <div className="edu-back-white padding40-20 mb20">
           <p className="color-grey-6 font-16 mb30">服务配置</p>
-          { shixun_service_configs&&shixun_service_configs.map((item,key)=>{
+          {shixun_service_configs && shixun_service_configs.map((item, key) => {
 
-            return(
+            return (
               <div key={key}>
                 <div id="5">
                   <div className="color-grey-6 font-16 mt30 mb20" id="shixun_scenario_type_name">
@@ -2379,34 +2378,34 @@ export default class TPMsettings extends Component {
                   <div className="clearfix mb5">
                     <label className="panel-form-label fl">CPU(核)：</label>
                     <div className="pr fl with80 status_con">
-                      <input type="text"  value={item.cpu_limit} onInput={(e)=>this.setConfigsInputs(e,key,1)}
-                             className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
+                      <input type="text" value={item.cpu_limit} onInput={(e) => this.setConfigsInputs(e, key, 1)}
+                        className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
                     </div>
                     <div className="cl"></div>
                   </div>
                   <div className="clearfix mb5">
                     <label className="panel-form-label fl">最低CPU(核)：</label>
                     <div className="pr fl with80 status_con">
-                      <input type="text" value={item.lower_cpu_limit}  onInput={(e)=>this.setConfigsInputs(e,key,2)}
-                             className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
+                      <input type="text" value={item.lower_cpu_limit} onInput={(e) => this.setConfigsInputs(e, key, 2)}
+                        className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
                     </div>
                     <div className="cl"></div>
                   </div>
                   <div className="clearfix mb5">
                     <label className="panel-form-label fl">内存限制(M)：</label>
                     <div className="pr fl with80 status_con">
-                      <input type="text"  value={item.memory_limit}  onInput={(e)=>this.setConfigsInputs(e,key,3)}
-                             className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
+                      <input type="text" value={item.memory_limit} onInput={(e) => this.setConfigsInputs(e, key, 3)}
+                        className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
                     </div>
                     <div className="cl"></div>
                   </div>
                   <div className="clearfix mb5">
                     <label className="panel-form-label fl">内存要求(M)：</label>
                     <div className="pr fl with20 status_con">
-                      <input type="text" value={item.request_limit}   onInput={(e)=>this.setConfigsInputs(e,key,4)}
-                             className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
+                      <input type="text" value={item.request_limit} onInput={(e) => this.setConfigsInputs(e, key, 4)}
+                        className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" />
                     </div>
-                    <label className="panel-form-label fl" style={{width: '48%'}}>温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
+                    <label className="panel-form-label fl" style={{ width: '48%' }}>温馨提示：纯编程类型实训建议使用默认值，对于大数据等建议使用最大内存的30%</label>
                     <div className="cl"></div>
                   </div>
                 </div>
@@ -2414,17 +2413,17 @@ export default class TPMsettings extends Component {
             )
 
           })}
-        </div>	:""}
+        </div> : ""}
 
         <p>
           {
             // this.props.identity<4&&this.props.status==0?
-            this.props.identity<5?
+            this.props.identity < 5 ?
               <div className="clearfix mt30">
                 <a className="defalutSubmitbtn fl mr20"
-                   onClick={this.submit_edit_shixun}>保存</a>
+                  onClick={this.submit_edit_shixun}>保存</a>
                 <a href={"/shixuns/" + shixunsID + "/challenges"} className="defalutCancelbtn fl">取消</a>
-              </div> :""
+              </div> : ""
           }
 
         </p>
diff --git a/src/modules/tpm/challengesnew/TPMMDEditor.js b/src/modules/tpm/challengesnew/TPMMDEditor.js
index 64cc373d..2536ede1 100644
--- a/src/modules/tpm/challengesnew/TPMMDEditor.js
+++ b/src/modules/tpm/challengesnew/TPMMDEditor.js
@@ -1,355 +1,333 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
 
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
-
-import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
-
-// import "antd/dist/antd.css";
-
-import { getImageUrl, getUploadActionUrl, getUrl } from 'educoder';
+import { getUploadActionUrl, getUrl } from 'educoder';
 import '../../courses/css/Courses.css'
 
-import axios from 'axios';
-
 import './css/TPMchallengesnew.css';
+import mediator from '../../../common/mediator';
 require('codemirror/lib/codemirror.css');
 
-let origin = getUrl();
-
-let path = '/editormd/lib/'
-    path = getUrl("/editormd/lib/")
 const $ = window.$;
 
-let timeout;
-
-let currentValue;
-
-const Option = Select.Option;
-
-const RadioGroup = Radio.Group;
-
-
 
 // 保存数据
-function md_add_data(k,mdu,d){
-    window.sessionStorage.setItem(k+mdu,d);
+function md_add_data(k, mdu, d) {
+  window.sessionStorage.setItem(k + mdu, d);
 }
 
 // 清空保存的数据
-function md_clear_data(k,mdu,id){
-    window.sessionStorage.removeItem(k+mdu);
-    var id1 = "#e_tip_"+id;
-    var id2 = "#e_tips_"+id;
-    if(k == 'content'){
-        $(id2).html("　");
-    }else{
-        $(id1).html("　");
-    }
+function md_clear_data(k, mdu, id) {
+  window.sessionStorage.removeItem(k + mdu);
+  var id1 = "#e_tip_" + id;
+  var id2 = "#e_tips_" + id;
+  if (k == 'content') {
+    $(id2).html("　");
+  } else {
+    $(id1).html("　");
+  }
 }
 window.md_clear_data = md_clear_data
 // editor 存在了jquery对象上，应用不需要自己写md_rec_data方法了
 function md_rec_data(k, mdu, id) {
-    if (window.sessionStorage.getItem(k + mdu) !== null) {
-        var editor = $("#e_tips_" + id).data('editor');
-        editor.setValue(window.sessionStorage.getItem(k + mdu));
-        // debugger;
-        // /shixuns/b5hjq9zm/challenges/3977/tab=3  setValue可能导致editor样式问题
-        md_clear_data(k, mdu, id);
-    }
+  if (window.sessionStorage.getItem(k + mdu) !== null) {
+    var editor = $("#e_tips_" + id).data('editor');
+    editor.setValue(window.sessionStorage.getItem(k + mdu));
+    ;
+    // /shixuns/b5hjq9zm/challenges/3977/tab=3  setValue可能导致editor样式问题
+    md_clear_data(k, mdu, id);
+  }
 }
 window.md_rec_data = md_rec_data;
 
-function md_elocalStorage(editor,mdu,id){
-    if (window.sessionStorage){
-        var oc = window.sessionStorage.getItem('content'+mdu);
-        if(oc !== null && oc != editor.getValue()){
-            console.log("#e_tips_"+id)
-            $("#e_tips_"+id).data('editor', editor);
-            var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" class="link-color-blue" onclick="md_rec_data(\'content\',\''+ mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="link-color-blue" onclick="md_clear_data(\'content\',\''+ mdu + '\',\'' + id + '\')">不恢复</a>';
-            $("#e_tips_"+id).html(h);
-        }
-        setInterval(function() {
-            var d = new Date();
-            var h = d.getHours();
-            var m = d.getMinutes();
-            var s = d.getSeconds();
-            h = h < 10 ? '0' + h : h;
-            m = m < 10 ? '0' + m : m;
-            s = s < 10 ? '0' + s : s;
-            if(editor.getValue().trim() != ""){
-                md_add_data("content",mdu,editor.getValue());
-                var id1 = "#e_tip_"+id;
-                var id2 = "#e_tips_"+id;
-                
-                var textStart = " 数据已于 "
-                var text = textStart + h + ':' + m + ':' + s +" 保存 ";
-                // 占位符   
-                var oldHtml = $(id2).html();
-                if (oldHtml && oldHtml != '　' && oldHtml.startsWith(textStart) == false) {
-                    $(id2).html( oldHtml.split('　(')[0] + `　(${text})`);
-                } else {
-                    $(id2).html(text);
-                }
-                // $(id2).html("");
-            }
-        },10000);
-
-    }else{
-        $("#e_tip_"+id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
+function md_elocalStorage(editor, mdu, id) {
+  if (window.sessionStorage) {
+    var oc = window.sessionStorage.getItem('content' + mdu);
+    if (oc !== null && oc != editor.getValue()) {
+      console.log("#e_tips_" + id)
+      $("#e_tips_" + id).data('editor', editor);
+      var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" class="link-color-blue" onclick="md_rec_data(\'content\',\'' + mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="link-color-blue" onclick="md_clear_data(\'content\',\'' + mdu + '\',\'' + id + '\')">不恢复</a>';
+      $("#e_tips_" + id).html(h);
     }
+    setInterval(function () {
+      var d = new Date();
+      var h = d.getHours();
+      var m = d.getMinutes();
+      var s = d.getSeconds();
+      h = h < 10 ? '0' + h : h;
+      m = m < 10 ? '0' + m : m;
+      s = s < 10 ? '0' + s : s;
+      if (editor.getValue().trim() != "") {
+        md_add_data("content", mdu, editor.getValue());
+        var id2 = "#e_tips_" + id;
+
+        var textStart = " 数据已于 "
+        var text = textStart + h + ':' + m + ':' + s + " 保存 ";
+        // 占位符   
+        var oldHtml = $(id2).html();
+        if (oldHtml && oldHtml != '　' && oldHtml.startsWith(textStart) == false) {
+          $(id2).html(oldHtml.split('　(')[0] + `　(${text})`);
+        } else {
+          $(id2).html(text);
+        }
+        // $(id2).html("");
+      }
+    }, 10000);
+
+  } else {
+    $("#e_tip_" + id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
+  }
 }
 
 
-function create_editorMD(id, width, high, placeholder, imageUrl, callback, initValue, 
-        onchange, watch, { noStorage, showNullButton, emoji }, that) {
-    // 还是出现了setting只有一份，被共用的问题
-    
-    var editorName = window.editormd(id, {
-        width: width,
-        height: high===undefined?400:high,
-        path: path,   // "/editormd/lib/"
-        markdown : initValue,
+function create_editorMD(id, width, high, placeholder, imageUrl, callback, initValue,
+  onchange, watch, { noStorage = false, showNullButton, emoji }, that) {
+  // 还是出现了setting只有一份，被共用的问题
 
-        dialogLockScreen: false,
-        watch:watch===undefined?true:watch,
-        syncScrolling: "single",
-        tex: true,
-        tocm: true,
-        emoji: !!emoji ,
-        taskList: true,
-        codeFold: true,
-        searchReplace: true,
-        htmlDecode: "style,script,iframe",
-        sequenceDiagram: true,
-        autoFocus: false,
+  var editorName = window.editormd(id, {
+    width: width,
+    height: high === undefined ? 400 : high,
+    path: getUrl("/editormd/lib/"),   // "/editormd/lib/"
+    markdown: initValue,
 
-        // mine
-        
-        toolbarIcons: function (mdEditor) {
-            let react_id = `react_${mdEditor.id}`;
-            const __that = window[react_id]
+    dialogLockScreen: false,
+    watch: watch === undefined ? true : watch,
+    syncScrolling: "single",
+    tex: true,
+    tocm: true,
+    emoji: !!emoji,
+    taskList: true,
+    codeFold: true,
+    searchReplace: true,
+    htmlDecode: "style,script,iframe",
+    sequenceDiagram: true,
+    autoFocus: false,
 
-            // Or return editormd.toolbarModes[name]; // full, simple, mini
-            // Using "||" set icons align right.
-            const icons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"];
-            // 试卷处用到的填空题新增按钮
-            if (__that.props.showNullButton) {
-                icons.push('nullBtton')
-            }
-            return icons
-        },
-        toolbarCustomIcons: {
-            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>",
-            nullBtton: "<a type=\"nullBtton\" class='pr' title='增加填空'><div class='border-left'><span></span></div><span class='fillTip'>点击插入填空项</span><i class=\"iconfont icon-edit font-16\"></i></a>",
-        },
-        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
-        saveHTMLToTextarea: true,
-        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-        dialogMaskOpacity: 0.6,
-        placeholder: placeholder,
-        imageUpload: true,
-        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-        imageUploadURL: imageUrl,//url
-        onchange: onchange,
-        onload: function() {
-            let _id = this.id   // 如果要使用this，这里不能使用箭头函数
-            let _editorName = this;
-            let react_id = `react_${_editorName.id}`;
-            const __that = window[react_id]
-            
-            // this.previewing();
-            // let _id = id;
-            $("#" + _id + " [type=\"latex\"]").bind("click", function () {
-                _editorName.cm.replaceSelection("```latex");
-                _editorName.cm.replaceSelection("\n");
-                _editorName.cm.replaceSelection("\n");
-                _editorName.cm.replaceSelection("```");
-                var __Cursor = _editorName.cm.getDoc().getCursor();
-                _editorName.cm.setCursor(__Cursor.line - 1, 0);
-            });
+    toolbarIcons: function () {
+      let react_id = `react_${id}`;
+      const __that = window[react_id]
+      // Using "||" set icons align right.
+      const icons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "line-break", "watch", "clear"];
+      // 试卷处用到的填空题新增按钮
+      if (__that.props.showNullButton) {
+        icons.push('nullBtton')
+      }
+      return icons
+    },
+    toolbarIconsClass: {
+      "line-break": "fa-minus"
+    },
+    toolbarHandlers: {
+      /**
+       * @param {Object}      cm         CodeMirror对象
+       * @param {Object}      icon       图标按钮jQuery元素对象
+       * @param {Object}      cursor     CodeMirror的光标对象，可获取光标所在行和位置
+       * @param {String}      selection  编辑器选中的文本
+       */
+      "line-break": function (cm, icon, cursor, selection) {
+        // 如果当前没有选中的文本，将光标移到要输入的位置
+        cm.replaceSelection("<hr/>");
+      }
+    },
+    lang: {
+      toolbar: {
+        "line-break": "换行"
+      }
+    },
+    toolbarCustomIcons: {
+      testIcon: "<a type=\"inline\" class=\"latex\" ><i name='inline-latex' class='fa iconfont icon-hangneigongshi font-14'></i></a>",
+      testIcon1: "<a type=\"latex\" class=\"latex\" ><i name='latex' class='fa iconfont icon-duohanggongshi font-16'></i></a>",
+      nullBtton: "<a type=\"nullBtton\" class='pr' title='增加填空'><div class='border-left'><span></span></div><span class='fillTip'>点击插入填空项</span><i class=\"iconfont icon-edit font-16\"></i></a>",
+    },
+    //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
+    saveHTMLToTextarea: true,
+    // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
+    dialogMaskOpacity: 0.6,
+    placeholder: placeholder,
+    imageUpload: true,
+    imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
+    imageUploadURL: imageUrl,//url
+    // onchange: onchange,
+    onload: function () {
+      let _id = this.id   // 如果要使用this，这里不能使用箭头函数
+      let _editorName = this;
+      let react_id = `react_${_editorName.id}`;
+      const __that = window[react_id]
+      $("#" + _id + " [type=\"latex\"]").bind("click", function () {
+        _editorName.cm.replaceSelection("```latex");
+        _editorName.cm.replaceSelection("\n");
+        _editorName.cm.replaceSelection("\n");
+        _editorName.cm.replaceSelection("```");
+        var __Cursor = _editorName.cm.getDoc().getCursor();
+        _editorName.cm.setCursor(__Cursor.line - 1, 0);
+      });
 
-            $("#" + _id + " [type=\"inline\"]").bind("click", function () {
-                _editorName.cm.replaceSelection("`$$$$`");
-                var __Cursor = _editorName.cm.getDoc().getCursor();
-                _editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 3);
-                _editorName.cm.focus();
-            });
-            $("[type=\"inline\"]").attr("title", "行内公式");
-            $("[type=\"latex\"]").attr("title", "多行公式");
+      $("#" + _id + " [type=\"inline\"]").bind("click", function () {
+        _editorName.cm.replaceSelection("$$$$");
+        var __Cursor = _editorName.cm.getDoc().getCursor();
+        _editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+        _editorName.cm.focus();
+      });
+      $("[type=\"inline\"]").attr("title", "行内公式");
+      $("[type=\"latex\"]").attr("title", "多行公式");
 
-            if (__that.props.showNullButton) {
-                const NULL_CH = '▁'
-                // const NULL_CH = '〇'
-                // const NULL_CH = '🈳'
-                
-                $("#" + _id + " [type=\"nullBtton\"]").bind("click", function () {
-                    _editorName.cm.replaceSelection(NULL_CH);
-                    // var __Cursor = _editorName.cm.getDoc().getCursor();
-                    // _editorName.cm.setCursor(__Cursor.line - 1, 0);
-                });
-            }
+      if (__that.props.showNullButton) {
+        const NULL_CH = '▁'
+        $("#" + _id + " [type=\"nullBtton\"]").bind("click", function () {
+          _editorName.cm.replaceSelection(NULL_CH);
+        });
+      }
 
-            if (noStorage == true) {
+      if (!noStorage == true) {
+        md_elocalStorage(_editorName, `MDEditor__${_id}`, _id);
+      }
 
-            } else {
-                md_elocalStorage(_editorName, `MDEditor__${_id}`, _id);
-            }
-
-            callback && callback(_editorName)
-        }
-    });
-    return editorName;
+      callback && callback(_editorName)
+    }
+  });
+  return editorName;
 }
 
 
 export default class TPMMDEditor extends Component {
-    constructor(props) {
-        super(props)
-        this.state = {
-            initValue: ''
-        }
-    }
-    componentDidUpdate(prevProps, prevState) {
-        // 不能加，影响了试卷填空题
-        // if (this.props.initValue != prevProps.initValue) {
-        //     this.answers_editormd.setValue(this.props.initValue)
-        // }
-    }
-    
-    // react_mdEditor_
-    componentDidMount = () => {
-        const { mdID, initValue, placeholder, showNullButton} = this.props;
-        
-        let _id = `mdEditor_${mdID}`
-        this.contentChanged = false;
-        const _placeholder = placeholder || "";
-        // amp;
-        // 编辑时要传memoId
-        const imageUrl = `${getUploadActionUrl()}`;
-        // 创建editorMd
-        let react_id = `react_${_id}`;
-        // 将实例存到了window
-        window[react_id] = this
-        const answers_editormd = create_editorMD(_id, '100%', this.props.height, _placeholder, imageUrl, (_editorName) => {
-            const __editorName = _editorName;
-            react_id = `react_${__editorName.id}`;
-            const that = window[react_id]
-            
-            // 一个延迟的recreate或resize，不加这段代码，md初始化可能会出现样式问题
-            setTimeout(() => {
-                if (that.props.needRecreate == true) {
-                    __editorName.recreate() // 注意 必须在setValue之前触发，不然会清空
-                } else {
-                    __editorName.resize()
-                }
-                console.log('timeout', __editorName.id)
-                __editorName.cm && __editorName.cm.refresh()
-            }, that.props.refreshTimeout || 500)
-            if (this.props.noSetValueOnInit) {
-                that.onEditorChange()
-            } else {
-                if (that.props.initValue != undefined && that.props.initValue != '') {
-                    __editorName.setValue(that.props.initValue)
-                }
-                if (that.state.initValue) {
-                    __editorName.setValue(that.state.initValue)
-                }
-            }
-            
-            __editorName.cm.on("change", (_cm, changeObj) => {
-                that.contentChanged = true;
-                if (that.state.showError) {
-                    that.setState({showError: false})
-                }
-                that.onEditorChange()
-            })
-            that.props.onCMBlur && __editorName.cm.on('blur', () => {
-                that.props.onCMBlur()
-            })
-            that.props.onCMBeforeChange && __editorName.cm.on('beforeChange', (cm,change) => {
-                that.props.onCMBeforeChange(cm,change)
-            })
-            that.answers_editormd = __editorName;
-            // 这里应该可以去掉了，方便调试加的
-            window[__editorName.id+'_'] = __editorName;
-        }, initValue, this.onEditorChange,this.props.watch, {
-            noStorage: this.props.noStorage,
-            showNullButton: this.props.showNullButton,
-            emoji: this.props.emoji
-        }, this);
-        
-    }
-    // 用在form里时，validate失败时出现一个红色边框
-    showError = () => {
-        this.setState({showError: true})
-    }
-    onEditorChange = () => {
-        if (!this.answers_editormd) return;
-        const val = this.answers_editormd.getValue();
-        //console.log('onEditorChange', this.props.id, val)
-        try {
-            this.props.onChange && this.props.onChange(val)
-        } catch(e) {
-            // http://localhost:3007/courses/1309/common_homeworks/6566/setting 
-            // 从这个页面，跳转到编辑页面，再在编辑页面点击返回的时候，这里会报错
-            console.error('出错')
-            console.error(e)
-        }
-    }
-    resize = () => {
-        if (!this.answers_editormd) { // 还未初始化
-            return;
-        }
-        this.answers_editormd.resize()
-        this.answers_editormd.cm && this.answers_editormd.cm.refresh()
-        this.answers_editormd.cm.focus()
+  constructor(props) {
+    super(props)
+    this.state = {
+      initValue: ''
     }
+  }
+  // react_mdEditor_
+  componentDidMount = () => {
+    const { mdID, initValue, placeholder, showNullButton } = this.props;
 
-    getValue = () => {
-        try {
-            return this.answers_editormd.getValue()
-        } catch (e) {
-            return ''
-        }
-    }
-    setValue = (val) => {
-        try {
-            this.answers_editormd.setValue(val)
-        } catch (e) {
-            // TODO 这里多实例的时候，前一个实例的state会被后面这个覆盖 参考NewWork.js    http://localhost:3007/courses/1309/homework/9300/edit/1
-            // 未初始化
-            this.setState({ initValue: val })
-        }
-    }
-    
-    render() {
+    let _id = `mdEditor_${mdID}`
+    this.contentChanged = false;
+    const _placeholder = placeholder || "";
+    // amp;
+    // 编辑时要传memoId
+    const imageUrl = `${getUploadActionUrl()}`;
+    // 创建editorMd
+    let react_id = `react_${_id}`;
+    // 将实例存到了window
+    window[react_id] = this
+    const answers_editormd = create_editorMD(_id, '100%', this.props.height, _placeholder, imageUrl, (_editorName) => {
+      const __editorName = _editorName;
+      react_id = `react_${__editorName.id}`;
+      const that = window[react_id]
 
-        let {
-            showError
-        } = this.state;
-        let { mdID, className, noStorage, imageExpand } = this.props;
-        let _style = {}
-        if (showError) {
-            _style.border = '1px solid red'
+      // 一个延迟的recreate或resize，不加这段代码，md初始化可能会出现样式问题
+      setTimeout(() => {
+        if (that.props.needRecreate == true) {
+          __editorName.recreate() // 注意 必须在setValue之前触发，不然会清空
+        } else {
+          __editorName.resize()
         }
-        return (
-            <React.Fragment>
-                <div className={`df ${className} ${imageExpand && 'editormd-image-click-expand' }`} >
-                {/* padding10-20  */}
-                    <div className="edu-back-greyf5 radius4" id={`mdEditor_${mdID}`} style={{..._style}}>
-                        <textarea style={{display: 'none'}}   id={`mdEditors_${mdID}`} name="content"></textarea>
-                        <div className="CodeMirror cm-s-defualt">
-                        </div>
-                    </div>
-                </div>
-                <div className={"fr rememberTip"}>
-                    {noStorage == true ? '　' : <div id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12">　</div>}
-                    {/* {noStorage == true ? '　' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12">　</p>} */}
-                </div>
-            </React.Fragment>
-        )
+        __editorName.cm && __editorName.cm.refresh()
+      }, that.props.refreshTimeout || 500)
+      if (this.props.noSetValueOnInit) {
+        that.onEditorChange()
+      } else {
+        if (that.props.initValue != undefined && that.props.initValue != '') {
+          __editorName.setValue(that.props.initValue)
+        }
+        if (that.state.initValue) {
+          __editorName.setValue(that.state.initValue)
+        }
+      }
+
+      __editorName.cm.on("change", (_cm, changeObj) => {
+        that.contentChanged = true;
+        if (that.state.showError) {
+          that.setState({ showError: false })
+        }
+        that.onEditorChange()
+      })
+      that.props.onCMBlur && __editorName.cm.on('blur', () => {
+        that.props.onCMBlur()
+      })
+      that.props.onCMBeforeChange && __editorName.cm.on('beforeChange', (cm, change) => {
+        that.props.onCMBeforeChange(cm, change)
+      })
+      that.answers_editormd = __editorName;
+      mediator.publish('markdown-editor-loaded')
+      // 这里应该可以去掉了，方便调试加的
+      window[__editorName.id + '_'] = __editorName;
+    }, initValue, this.onEditorChange, this.props.watch, {
+      noStorage: this.props.noStorage,
+      showNullButton: this.props.showNullButton,
+      emoji: this.props.emoji
+    }, this);
+
+  }
+  // 用在form里时，validate失败时出现一个红色边框
+  showError = () => {
+    this.setState({ showError: true })
+  }
+  onEditorChange = () => {
+    if (!this.answers_editormd) return;
+    const val = this.answers_editormd.getValue();
+    //console.log('onEditorChange', this.props.id, val)
+    try {
+      this.props.onChange && this.props.onChange(val)
+    } catch (e) {
+      // http://localhost:3007/courses/1309/common_homeworks/6566/setting 
+      // 从这个页面，跳转到编辑页面，再在编辑页面点击返回的时候，这里会报错
+      console.error('出错')
+      console.error(e)
     }
+  }
+  resize = () => {
+    if (!this.answers_editormd) { // 还未初始化
+      return;
+    }
+    this.answers_editormd.resize()
+    this.answers_editormd.cm && this.answers_editormd.cm.refresh()
+    this.answers_editormd.cm.focus()
+  }
+
+  getValue = () => {
+    try {
+      return this.answers_editormd.getValue()
+    } catch (e) {
+      return ''
+    }
+  }
+  setValue = (val) => {
+    try {
+      this.answers_editormd.setValue(val)
+    } catch (e) {
+      // TODO 这里多实例的时候，前一个实例的state会被后面这个覆盖 参考NewWork.js    http://localhost:3007/courses/1309/homework/9300/edit/1
+      // 未初始化
+      this.setState({ initValue: val })
+    }
+  }
+
+  render() {
+
+    let {
+      showError
+    } = this.state;
+    let { mdID, className, noStorage, imageExpand } = this.props;
+    let _style = {}
+    if (showError) {
+      _style.border = '1px solid red'
+    }
+    return (
+      <React.Fragment>
+        <div className={`df ${className} ${imageExpand && 'editormd-image-click-expand'}`} >
+          {/* padding10-20  */}
+          <div className="edu-back-greyf5 radius4" id={`mdEditor_${mdID}`} style={{ ..._style }}>
+            <textarea style={{ display: 'none' }} id={`mdEditors_${mdID}`} name="content"></textarea>
+            <div className="CodeMirror cm-s-defualt">
+            </div>
+          </div>
+        </div>
+        <div className={"fr rememberTip"}>
+          {noStorage == true ? '　' : <div id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12">　</div>}
+          {/* {noStorage == true ? '　' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12">　</p>} */}
+        </div>
+      </React.Fragment>
+    )
+  }
 }
 
 
diff --git a/src/modules/tpm/challengesnew/TPMchallengesnew.js b/src/modules/tpm/challengesnew/TPMchallengesnew.js
index b0deafd9..f25184e0 100644
--- a/src/modules/tpm/challengesnew/TPMchallengesnew.js
+++ b/src/modules/tpm/challengesnew/TPMchallengesnew.js
@@ -1,16 +1,17 @@
-import React, {Component} from 'react';
+import React, { Component } from "react";
 
-import {Input, Select, Radio, Badge, message, Button} from 'antd';
+import { Input, Select, Radio, Badge, message, Button } from "antd";
 
-import {Link} from "react-router-dom";
+import { Link } from "react-router-dom";
 
-import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
+import TPMMDEditor from "../../tpm/challengesnew/TPMMDEditor";
 
 import Bottomsubmit from "../../modals/Bottomsubmit";
 
-import axios from 'axios';
+import axios from "axios";
+
+import "./css/TPMchallengesnew.css";
 
-import './css/TPMchallengesnew.css';
 
 const $ = window.$;
 
@@ -18,623 +19,789 @@ const Option = Select.Option;
 
 const RadioGroup = Radio.Group;
 
-function isNulltpm( str ){
-    if ( str == "" ) return true;
-    var regu = "^[ ]+$";
-    var re = new RegExp(regu);
-    return re.test(str);
+function isNulltpm(str) {
+  if (str == "") return true;
+  var regu = "^[ ]+$";
+  var re = new RegExp(regu);
+  return re.test(str);
 }
 
 export default class TPMchallengesnew extends Component {
-    constructor(props) {
-        super(props)
-			  this.exercisememoMDRef=React.createRef();
-        this.state = {
-            choice_url: undefined,
-            practice_url: undefined,
-            go_back_url: undefined,
-            task_pass_default: undefined,
-            submit_url: undefined,
-            shixunCreatePracticeGroup: undefined,
-            optionsums:[100,200],
-            activetype:0,
-            setopen: false,
-            shixunCreatePractice: undefined,
-            onshixunsmarkvalue: undefined,
-            shixunsskillvalue: undefined,
-            shixunsskillvaluelist: [],
-            tab2url: "",
-            tab3url: "",
-            prev_challenge:undefined,
-            next_challenge:undefined,
-            power: false,
-            shixunCreatePracticetype: false,
-            shixunsskillvaluelisttype: false,
-            marktype:false,
-            editPracticesendtype:false,
-            CreatePracticesendtype:false,
-					  exec_time:20,
-					  shixunExec_timeType:false,
-            onshixunsmarkvaluetype:false,
-            shixunCreatePracticeGrouptype:false
-        }
-    }
+  constructor(props) {
+    super(props);
+    this.exercisememoMDRef = React.createRef();
+    this.state = {
+      choice_url: undefined,
+      practice_url: undefined,
+      go_back_url: undefined,
+      task_pass_default: undefined,
+      submit_url: undefined,
+      shixunCreatePracticeGroup: undefined,
+      optionsums: [100, 200],
+      activetype: 0,
+      setopen: false,
+      shixunCreatePractice: undefined,
+      onshixunsmarkvalue: undefined,
+      shixunsskillvalue: undefined,
+      shixunsskillvaluelist: [],
+      tab2url: "",
+      tab3url: "",
+      prev_challenge: undefined,
+      next_challenge: undefined,
+      power: false,
+      shixunCreatePracticetype: false,
+      shixunsskillvaluelisttype: false,
+      marktype: false,
+      editPracticesendtype: false,
+      CreatePracticesendtype: false,
+      exec_time: 20,
+      shixunExec_timeType: false,
+      onshixunsmarkvaluetype: false,
+      shixunCreatePracticeGrouptype: false,
+    };
+  }
 
-    getdatas=()=>{
-        let id = this.props.match.params.shixunId;
-        let checkpointId=this.props.match.params.checkpointId;
+  getdatas = () => {
+    let id = this.props.match.params.shixunId;
+    let checkpointId = this.props.match.params.checkpointId;
 
-        let newchoice_url= "/shixuns/"+id+"/challenges/newquestion";
-        let newpractice_url= "/shixuns/"+id+"/challenges/new";
-        let newgo_back_url="/shixuns/"+id+"/challenges"
-        if(checkpointId===undefined){
-            //新建模式
-            let url = "/shixuns/" + id + "/challenges/new.json"
-            axios.get(url).then((response) => {
-                this.setState({
-                    choice_url: newchoice_url,
-                    practice_url: newpractice_url,
-                    go_back_url: newgo_back_url,
-                    position: response.data.position,
-                    task_pass_default: response.data.task_pass_default,
-                    submit_url: response.data.submit_url,
-                    checkpointId:checkpointId,
-                    exercisememoMDRefval:response.data.task_pass_default,
-                    responsedata:response.data
-                })
+    let newchoice_url = "/shixuns/" + id + "/challenges/newquestion";
+    let newpractice_url = "/shixuns/" + id + "/challenges/new";
+    let newgo_back_url = "/shixuns/" + id + "/challenges";
+    if (checkpointId === undefined) {
+      //新建模式
+      let url = "/shixuns/" + id + "/challenges/new.json";
+      axios
+        .get(url)
+        .then((response) => {
+          this.setState({
+            choice_url: newchoice_url,
+            practice_url: newpractice_url,
+            go_back_url: newgo_back_url,
+            position: response.data.position,
+            task_pass_default: response.data.task_pass_default,
+            submit_url: response.data.submit_url,
+            checkpointId: checkpointId,
+            exercisememoMDRefval: response.data.task_pass_default,
+            responsedata: response.data,
+          });
 
-                this.exercisememoMDRef.current.setValue(response.data.task_pass_default||'')
-            }).catch((error) => {
-                console.log(error)
-            });
-        }else{
-            //编辑模式
-            let url="/shixuns/"+id+"/challenges/"+checkpointId+".json?tab=0";
-            axios.get(url).then((response) => {
-
-                let optionsum;
-                if(response.data.difficulty===1){
-                    optionsum=[100,200];
-                }else if(response.data.difficulty===2){
-                    optionsum=[300,400,500,600];
-                }else if(response.data.difficulty===3){
-                    optionsum=[700,800,900,1000]
-                }
-                let newprev_challenge=response.data.prev_challenge;
-                let next_challenge=response.data.next_challenge;
-                if (newprev_challenge != undefined) {
-                    if(newprev_challenge.st===0){
-                        newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id + "/editcheckpoint";
-                    }else{
-                        newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id  + "/editquestion";
-                    }
-                }
-                if (next_challenge != undefined) {
-                    if(next_challenge.st===0){
-                        next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editcheckpoint";
-                    }else{
-                        next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editquestion";
-                    }
-                }
-                this.setState({
-                    power: response.data.power,
-                    prev_challenge:newprev_challenge,
-                    next_challenge:next_challenge,
-                    choice_url: newchoice_url,
-                    practice_url: newpractice_url,
-                    go_back_url: newgo_back_url,
-                    shixunCreatePractice:response.data.subject,
-                    position:response.data.position,
-                    shixunCreatePracticeGroup:response.data.difficulty,
-                    optionsums:optionsum,
-                    onshixunsmarkvalue:response.data.score,
-                    shixunsskillvaluelist:response.data.tags,
-                    checkpointId:checkpointId,
-                    tab2url: "/shixuns/" + id + "/challenges/"+checkpointId+"/tab=2",
-                    tab3url: "/shixuns/" + id + "/challenges/"+checkpointId+"/tab=3",
-                    exercisememoMDRefval:response.data.task_pass,
-                    responsedata:response.data
-                })
-                // exec_time:response.data.exec_time,
-                if(response.data.power===false){
-                    this.props.showNotification("你没有权限修改");
-
-                }
-
-                this.exercisememoMDRef.current.setValue(response.data.task_pass||'')
-            }).catch((error) => {
-                console.log(error)
-            });
-
-        }
-
-    }
-    componentDidUpdate=(prevProps, prevState)=>{
-        if(prevProps!=this.props){
-            this.getdatas()
-        }
-    }
-    componentDidMount() {
-      this.getdatas()
-    }
-
-    onshixunCreatePracticeChange = (e) => {
-        if(e.target.value===undefined||e.target.value=== ""||e.target.value=== null){
-
-        }else{
-            this.setState({
-                shixunCreatePracticeGrouptype:false,
-                onshixunsmarkvaluetype:false
-            })
-        }
-        let optionsum;
-        let onshixunsmark;
-        if(e.target.value===1){
-            optionsum=[100,200];
-            onshixunsmark=100;
-        }else if(e.target.value===2){
-            optionsum=[300,400,500,600];
-            onshixunsmark=300;
-        }else if(e.target.value===3){
-            optionsum=[700,800,900,1000]
-            onshixunsmark=700;
-        }
-        this.setState({
-            shixunCreatePracticeGroup: e.target.value,
-            optionsums:optionsum,
-            onshixunsmarkvalue:onshixunsmark
+          this.exercisememoMDRef.current.setValue(
+            response.data.task_pass_default || ""
+          );
         })
-    }
+        .catch((error) => {
+          console.log(error);
+        });
+    } else {
+      //编辑模式
+      let url =
+        "/shixuns/" + id + "/challenges/" + checkpointId + ".json?tab=0";
+      axios
+        .get(url)
+        .then((response) => {
+          let optionsum;
+          if (response.data.difficulty === 1) {
+            optionsum = [100, 200];
+          } else if (response.data.difficulty === 2) {
+            optionsum = [300, 400, 500, 600];
+          } else if (response.data.difficulty === 3) {
+            optionsum = [700, 800, 900, 1000];
+          }
+          let newprev_challenge = response.data.prev_challenge;
+          let next_challenge = response.data.next_challenge;
+          if (newprev_challenge != undefined) {
+            if (newprev_challenge.st === 0) {
+              newprev_challenge =
+                "/shixuns/" +
+                id +
+                "/challenges/" +
+                newprev_challenge.id +
+                "/editcheckpoint";
+            } else {
+              newprev_challenge =
+                "/shixuns/" +
+                id +
+                "/challenges/" +
+                newprev_challenge.id +
+                "/editquestion";
+            }
+          }
+          if (next_challenge != undefined) {
+            if (next_challenge.st === 0) {
+              next_challenge =
+                "/shixuns/" +
+                id +
+                "/challenges/" +
+                next_challenge.id +
+                "/editcheckpoint";
+            } else {
+              next_challenge =
+                "/shixuns/" +
+                id +
+                "/challenges/" +
+                next_challenge.id +
+                "/editquestion";
+            }
+          }
+          this.setState({
+            power: response.data.power,
+            prev_challenge: newprev_challenge,
+            next_challenge: next_challenge,
+            choice_url: newchoice_url,
+            practice_url: newpractice_url,
+            go_back_url: newgo_back_url,
+            shixunCreatePractice: response.data.subject,
+            position: response.data.position,
+            shixunCreatePracticeGroup: response.data.difficulty,
+            optionsums: optionsum,
+            onshixunsmarkvalue: response.data.score,
+            shixunsskillvaluelist: response.data.tags,
+            checkpointId: checkpointId,
+            tab2url:
+              "/shixuns/" + id + "/challenges/" + checkpointId + "/tab=2",
+            tab3url:
+              "/shixuns/" + id + "/challenges/" + checkpointId + "/tab=3",
+            exercisememoMDRefval: response.data.task_pass,
+            responsedata: response.data,
+          });
+          // exec_time:response.data.exec_time,
+          if (response.data.power === false) {
+            this.props.showNotification("你没有权限修改");
+          }
 
-    shixunCreatePractice = (e) => {
-
-        if (e.target.value === undefined|| e.target.value== ""){
-
-        }else{
-            this.setState({
-                shixunCreatePracticetype:false
-            })
-        }
-        this.setState({
-            shixunCreatePractice: e.target.value
+          this.exercisememoMDRef.current.setValue(
+            response.data.task_pass || ""
+          );
         })
+        .catch((error) => {
+          console.log(error);
+        });
+    }
+  };
+  componentDidUpdate = (prevProps, prevState) => {
+    if (prevProps != this.props) {
+      this.getdatas();
+    }
+  };
+  componentDidMount() {
+    this.getdatas();
+  }
 
+  onshixunCreatePracticeChange = (e) => {
+    if (
+      e.target.value === undefined ||
+      e.target.value === "" ||
+      e.target.value === null
+    ) {
+    } else {
+      this.setState({
+        shixunCreatePracticeGrouptype: false,
+        onshixunsmarkvaluetype: false,
+      });
+    }
+    let optionsum;
+    let onshixunsmark;
+    if (e.target.value === 1) {
+      optionsum = [100, 200];
+      onshixunsmark = 100;
+    } else if (e.target.value === 2) {
+      optionsum = [300, 400, 500, 600];
+      onshixunsmark = 300;
+    } else if (e.target.value === 3) {
+      optionsum = [700, 800, 900, 1000];
+      onshixunsmark = 700;
+    }
+    this.setState({
+      shixunCreatePracticeGroup: e.target.value,
+      optionsums: optionsum,
+      onshixunsmarkvalue: onshixunsmark,
+    });
+  };
+
+  shixunCreatePractice = (e) => {
+    if (e.target.value === undefined || e.target.value == "") {
+    } else {
+      this.setState({
+        shixunCreatePracticetype: false,
+      });
+    }
+    this.setState({
+      shixunCreatePractice: e.target.value,
+    });
+  };
+
+  CreatePracticesend = () => {
+    const exercise_editormdvalue = this.exercisememoMDRef.current
+      .getValue()
+      .trim();
+
+    this.setState({
+      CreatePracticesendtype: true,
+    });
+
+    if (this.props.status === 2) {
+      this.props.showNotification("该实训已经发布不能新建");
+      this.setState({
+        CreatePracticesendtype: false,
+      });
+      return;
+    }
+    let {
+      shixunCreatePractice,
+      shixunCreatePracticeGroup,
+      onshixunsmarkvalue,
+      shixunsskillvaluelist,
+      exec_time,
+    } = this.state;
+
+    if (shixunCreatePractice === undefined || shixunCreatePractice == "") {
+      this.setState({
+        shixunCreatePracticetype: true,
+        CreatePracticesendtype: false,
+      });
+
+      $("html").animate(
+        {
+          scrollTop: 10,
+        },
+        1000
+      );
+
+      return;
     }
 
-    CreatePracticesend = () => {
-       const exercise_editormdvalue = this.exercisememoMDRef.current.getValue().trim();
+    if (shixunCreatePractice.match(/^[ ]*$/)) {
+      this.props.showNotification("任务名称为空，请勿输入空格");
+      this.setState({
+        shixunCreatePracticetype: true,
+        CreatePracticesendtype: false,
+      });
+      $("html").animate(
+        {
+          scrollTop: 10,
+        },
+        1000
+      );
+      return;
+    }
 
-			this.setState({
-        CreatePracticesendtype:true
+    if (
+      exercise_editormdvalue === undefined ||
+      exercise_editormdvalue == "" ||
+      exercise_editormdvalue === null
+    ) {
+      this.setState({
+        tpmcourseMessageMDType: true,
+        CreatePracticesendtype: false,
+      });
+      this.props.scrollToAnchor("tpmcourseMessageMD");
+      return;
+    }
+
+    if (isNulltpm(exercise_editormdvalue)) {
+      this.setState({
+        tpmcourseMessageMDType: true,
+        CreatePracticesendtype: false,
+      });
+      this.props.scrollToAnchor("tpmcourseMessageMD");
+      return;
+    }
+
+    if (shixunCreatePracticeGroup === undefined) {
+      this.setState({
+        shixunCreatePracticeGrouptype: true,
+        CreatePracticesendtype: false,
+      });
+      this.props.scrollToAnchor("shixunCreatePracticeGroupid");
+      return;
+    }
+
+    if (onshixunsmarkvalue === undefined) {
+      this.setState({
+        onshixunsmarkvaluetype: true,
+        CreatePracticesendtype: false,
+      });
+      this.props.scrollToAnchor("input_task_tag");
+      return;
+    }
+    if (shixunsskillvaluelist.length === 0) {
+      this.setState({
+        shixunsskillvaluelisttype: true,
+        CreatePracticesendtype: false,
+      });
+      // this.props.showNotification("技能标签为空")
+      this.props.scrollToAnchor("input_task_tag");
+      return;
+    }
+
+    // if(exec_time===null||exec_time===undefined||exec_time === ""){
+    // 	this.setState({
+    // 	  	shixunExec_timeType:true,
+    //       CreatePracticesendtype:false
+    // 	})
+    //   this.props.scrollToAnchor("exec_time");
+    // 	return
+    // }
+
+    // if (exec_time.match(/^[ ]*$/)) {
+    //     this.props.showNotification("评测时限，请勿输入空格");
+    //     this.setState({
+    //         shixunExec_timeType:true,
+    //         CreatePracticesendtype:false
+    //     })
+    //     this.props.scrollToAnchor("exec_time");
+    //     return
+    // }
+
+    let id = this.props.match.params.shixunId;
+    let url = "/shixuns/" + id + "/challenges.json";
+    // exec_time:exec_time
+    axios
+      .post(url, {
+        identifier: id,
+        subject: shixunCreatePractice,
+        task_pass: exercise_editormdvalue,
+        difficulty: shixunCreatePracticeGroup,
+        score: onshixunsmarkvalue,
+        challenge_tag: shixunsskillvaluelist,
+        st: 0,
       })
-
-        if(this.props.status===2){
-            this.props.showNotification("该实训已经发布不能新建")
-            this.setState({
-              CreatePracticesendtype:false
-            })
-            return
+      .then((response) => {
+        if (response.data.status === 1) {
+          // $("html").animate({ scrollTop: 0 })
+          //window.location.href=`/shixuns/${id}/challenges/${response.data.challenge_id}/editcheckpoint?tab=2`;
+          // 	window.location.href=`/shixuns/${id}/challenges/${response.data.challenge_id}/tab=2`;
+          this.props.history.replace(
+            `/shixuns/${id}/challenges/${response.data.challenge_id}/tab=2`
+          );
+          // this.setState({
+          // 		setopen: true,
+          // 		CreatePracticesendtype:false,
+          // 		tab2url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=2",
+          // 		tab3url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=3",
+          // })
         }
-        let {shixunCreatePractice, shixunCreatePracticeGroup, onshixunsmarkvalue, shixunsskillvaluelist,exec_time} = this.state;
-
-
-        if (shixunCreatePractice === undefined||shixunCreatePractice=="") {
-            this.setState({
-                shixunCreatePracticetype: true,
-                CreatePracticesendtype:false
-            })
-
-           $('html').animate({
-                scrollTop: 10
-            }, 1000);
-
-            return
-        }
-
-        if (shixunCreatePractice.match(/^[ ]*$/)) {
-            this.props.showNotification("任务名称为空，请勿输入空格");
-            this.setState({
-                shixunCreatePracticetype: true,
-                CreatePracticesendtype:false
-            })
-            $('html').animate({
-                scrollTop: 10
-            }, 1000);
-            return
-        }
-
-
-        if (exercise_editormdvalue === undefined||exercise_editormdvalue==""||exercise_editormdvalue===null) {
-            this.setState({
-                tpmcourseMessageMDType:true,
-                CreatePracticesendtype:false
-            })
-            this.props.scrollToAnchor("tpmcourseMessageMD");
-            return
-        }
-
-        if(isNulltpm(exercise_editormdvalue)){
-            this.setState({
-                tpmcourseMessageMDType:true,
-                CreatePracticesendtype:false
-            })
-            this.props.scrollToAnchor("tpmcourseMessageMD");
-            return
-        }
-
-
-        if(shixunCreatePracticeGroup===undefined){
-            this.setState({
-                shixunCreatePracticeGrouptype:true,
-                CreatePracticesendtype:false
-            })
-            this.props.scrollToAnchor("shixunCreatePracticeGroupid");
-            return
-        }
-
-        if(onshixunsmarkvalue===undefined){
-            this.setState({
-                onshixunsmarkvaluetype:true,
-                CreatePracticesendtype:false
-            })
-            this.props.scrollToAnchor("input_task_tag");
-            return
-        }
-        if (shixunsskillvaluelist.length === 0) {
-            this.setState({
-                shixunsskillvaluelisttype: true,
-                CreatePracticesendtype:false
-            })
-            // this.props.showNotification("技能标签为空")
-            this.props.scrollToAnchor("input_task_tag");
-            return
-        }
-
-
-			// if(exec_time===null||exec_time===undefined||exec_time === ""){
-			// 	this.setState({
-			// 	  	shixunExec_timeType:true,
-      //       CreatePracticesendtype:false
-			// 	})
-      //   this.props.scrollToAnchor("exec_time");
-			// 	return
-			// }
-
-        // if (exec_time.match(/^[ ]*$/)) {
-        //     this.props.showNotification("评测时限，请勿输入空格");
-        //     this.setState({
-        //         shixunExec_timeType:true,
-        //         CreatePracticesendtype:false
-        //     })
-        //     this.props.scrollToAnchor("exec_time");
-        //     return
-        // }
-
-
-
-        let id = this.props.match.params.shixunId;
-        let url = "/shixuns/" + id + "/challenges.json";
-        // exec_time:exec_time
-        axios.post(url, {
-            identifier:id,
-            subject: shixunCreatePractice,
-            task_pass: exercise_editormdvalue,
-            difficulty: shixunCreatePracticeGroup,
-            score: onshixunsmarkvalue,
-            challenge_tag: shixunsskillvaluelist,
-            st: 0,
-        }).then((response) => {
-            if (response.data.status === 1) {
-						// $("html").animate({ scrollTop: 0 })
-						//window.location.href=`/shixuns/${id}/challenges/${response.data.challenge_id}/editcheckpoint?tab=2`;
-						// 	window.location.href=`/shixuns/${id}/challenges/${response.data.challenge_id}/tab=2`;
-                this.props.history.replace(`/shixuns/${id}/challenges/${response.data.challenge_id}/tab=2`);
-							// this.setState({
-							// 		setopen: true,
-							// 		CreatePracticesendtype:false,
-							// 		tab2url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=2",
-							// 		tab3url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=3",
-							// })
-
-            }
-					// this.props.showNotification(response.data.messages);
-        }).catch((error) => {
-            console.log(error)
-        });
+        // this.props.showNotification(response.data.messages);
+      })
+      .catch((error) => {
+        console.log(error);
+      });
+  };
 
+  onshixunsmark = (value) => {
+    this.setState({
+      onshixunsmarkvalue: value,
+    });
+  };
 
+  shixunsskill = (e) => {
+    this.setState({
+      shixunsskillvalue: e.target.value,
+    });
+  };
 
+  clickshixunsskill = () => {
+    let { shixunsskillvalue, shixunsskillvaluelist } = this.state;
+    if (shixunsskillvalue === "") {
+      return;
+    } else if (shixunsskillvalue === undefined) {
+      return;
     }
 
-    onshixunsmark = (value) => {
-        this.setState({
-            onshixunsmarkvalue: value
-        })
+    if (
+      shixunsskillvalue == "" ||
+      shixunsskillvalue == undefined ||
+      shixunsskillvalue == null ||
+      (shixunsskillvalue.length > 0 && shixunsskillvalue.trim().length == 0)
+    ) {
+      message.error("输入为空，不能保存！");
+      return;
     }
 
-    shixunsskill = (e) => {
-        this.setState({
-            shixunsskillvalue: e.target.value
-        })
+    let list = shixunsskillvaluelist;
+    list.push(shixunsskillvalue);
+
+    if (list.length > 0) {
+      this.setState({
+        shixunsskillvaluelisttype: false,
+      });
+    }
+    this.setState({
+      shixunsskillvaluelist: list,
+      shixunsskillvalue: "",
+    });
+  };
+
+  delshixunsskilllist = (key) => {
+    let { shixunsskillvaluelist } = this.state;
+    let newshixunsskillvaluelist = shixunsskillvaluelist;
+    newshixunsskillvaluelist.splice(key, 1);
+    this.setState({
+      shixunsskillvaluelist: newshixunsskillvaluelist,
+    });
+  };
+
+  editPracticesend = () => {
+    this.setState({
+      editPracticesendtype: true,
+    });
+    let {
+      shixunCreatePractice,
+      shixunCreatePracticeGroup,
+      onshixunsmarkvalue,
+      shixunsskillvaluelist,
+      checkpointId,
+      exec_time,
+    } = this.state;
+    let id = this.props.match.params.shixunId;
+    let url = "/shixuns/" + id + "/challenges/" + checkpointId + ".json";
+    const exercise_editormdvalue = this.exercisememoMDRef.current
+      .getValue()
+      .trim();
+
+    if (shixunCreatePractice === undefined || shixunCreatePractice == "") {
+      this.setState({
+        shixunCreatePracticetype: true,
+        editPracticesendtype: false,
+      });
+      // this.props.showNotification("任务名称为空")
+      $("html").animate(
+        {
+          scrollTop: 10,
+        },
+        1000
+      );
+
+      return;
     }
 
-    clickshixunsskill = () => {
-
-        let {shixunsskillvalue, shixunsskillvaluelist} = this.state;
-        if (shixunsskillvalue === "") {
-            return
-        } else if (shixunsskillvalue === undefined) {
-            return
-        }
-
-        if(shixunsskillvalue == "" || shixunsskillvalue == undefined || shixunsskillvalue == null || (shixunsskillvalue.length>0 && shixunsskillvalue.trim().length == 0)){
-            message.error("输入为空，不能保存！");
-            return
-        }
-
-         let list = shixunsskillvaluelist;
-        list.push(shixunsskillvalue);
-
-        if (list.length> 0) {
-            this.setState({
-                shixunsskillvaluelisttype: false,
-            })
-        }
-        this.setState({
-            shixunsskillvaluelist: list,
-            shixunsskillvalue: ""
-        })
+    if (shixunCreatePractice.match(/^[ ]*$/)) {
+      this.props.showNotification("任务名称为空，请勿输入空格");
+      this.setState({
+        shixunCreatePracticetype: true,
+        editPracticesendtype: false,
+      });
+      $("html").animate(
+        {
+          scrollTop: 10,
+        },
+        1000
+      );
+      return;
     }
 
-    delshixunsskilllist = (key) => {
-        let {shixunsskillvaluelist} = this.state;
-        let newshixunsskillvaluelist = shixunsskillvaluelist;
-        newshixunsskillvaluelist.splice(key, 1);
-        this.setState({
-            shixunsskillvaluelist: newshixunsskillvaluelist
-        })
+    if (
+      exercise_editormdvalue === undefined ||
+      exercise_editormdvalue == "" ||
+      exercise_editormdvalue === null
+    ) {
+      this.setState({
+        tpmcourseMessageMDType: true,
+        editPracticesendtype: false,
+      });
+      this.props.scrollToAnchor("tpmcourseMessageMD");
+      return;
     }
 
-    editPracticesend=()=>{
-        this.setState({
-          editPracticesendtype:true
-        })
-        let {shixunCreatePractice, shixunCreatePracticeGroup, onshixunsmarkvalue, shixunsskillvaluelist,checkpointId,exec_time} = this.state;
-        let id = this.props.match.params.shixunId;
-        let url = "/shixuns/"+id+"/challenges/"+checkpointId+".json";
-		  	const exercise_editormdvalue = this.exercisememoMDRef.current.getValue().trim();
-
-        if (shixunCreatePractice === undefined||shixunCreatePractice=="") {
-            this.setState({
-                shixunCreatePracticetype: true,
-                editPracticesendtype:false
-              })
-            // this.props.showNotification("任务名称为空")
-            $('html').animate({
-                scrollTop: 10
-            }, 1000);
-
-            return
-        }
-
-        if (shixunCreatePractice.match(/^[ ]*$/)) {
-            this.props.showNotification("任务名称为空，请勿输入空格");
-            this.setState({
-                shixunCreatePracticetype: true,
-                editPracticesendtype:false
-            })
-            $('html').animate({
-                scrollTop: 10
-            }, 1000);
-            return
-        }
-
-        if (exercise_editormdvalue === undefined||exercise_editormdvalue==""||exercise_editormdvalue===null) {
-            this.setState({
-                tpmcourseMessageMDType:true,
-                editPracticesendtype:false
-            })
-            this.props.scrollToAnchor("tpmcourseMessageMD");
-            return
-        }
-
-        if(isNulltpm(exercise_editormdvalue)){
-            this.setState({
-                tpmcourseMessageMDType:true,
-                editPracticesendtype:false
-            })
-            this.props.scrollToAnchor("tpmcourseMessageMD");
-            this.props.showNotification("过关任务，请勿输入空格");
-            return
-        }
-
-        if(shixunCreatePracticeGroup===undefined){
-            this.setState({
-                shixunCreatePracticeGrouptype:true,
-                editPracticesendtype:false
-            })
-            this.props.scrollToAnchor("shixunCreatePracticeGroupid");
-            return
-        }
-        if(onshixunsmarkvalue===undefined){
-            this.setState({
-                onshixunsmarkvaluetype:true,
-                editPracticesendtype:false
-            })
-            this.props.scrollToAnchor("input_task_tag");
-            return
-        }
-
-        if (shixunsskillvaluelist.length === 0) {
-            this.setState({
-               shixunsskillvaluelisttype: true,
-               editPracticesendtype:false,
-            })
-            this.props.scrollToAnchor("input_task_tag");
-            return
-        }
-
-        // if(exec_time===null||exec_time===undefined||exec_time === ""){
-				// 	this.setState({
-				// 		shixunExec_timeType:true,
-        //     editPracticesendtype:false
-				// 	})
-        //   this.props.scrollToAnchor("exec_time");
-				// 	return
-				// }
-
-        // if (exec_time.match(/^[ ]*$/)) {
-        //     this.props.showNotification("评测时限，请勿输入空格");
-        //     this.setState({
-        //         shixunExec_timeType:true,
-        //         editPracticesendtype:false
-        //     })
-        //     this.props.scrollToAnchor("exec_time");
-        //     return
-        // }
-        //					  exec_time:exec_time
-        axios.put(url, {
-            tab:0,
-            identifier:id,
-            id:checkpointId,
-            challenge:{
-                subject: shixunCreatePractice,
-                task_pass: exercise_editormdvalue,
-                difficulty: shixunCreatePracticeGroup,
-                score: onshixunsmarkvalue,
-            },
-            challenge_tag:shixunsskillvaluelist
-        }).then((response) => {
-            this.props.showNotification(response.data.messages);
-            if (response.data.status === 1) {
-						  	// window.location.href=`/shixuns/${id}/challenges/${checkpointId}/tab=2`;
-                this.setState({
-                    setopen: true,
-								  	editPracticesendtype:false,
-                    tab2url: "/shixuns/" + id + "/challenges/"+checkpointId+"/tab=2",
-                    tab3url: "/shixuns/" + id + "/challenges/"+checkpointId+"/tab=3",
-                })
-                this.props.history.replace(`/shixuns/${id}/challenges/${checkpointId}/tab=2`);
-                // window.location.href = "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=2"
-            }
-        }).catch((error) => {
-            console.log(error)
-        });
-
-
+    if (isNulltpm(exercise_editormdvalue)) {
+      this.setState({
+        tpmcourseMessageMDType: true,
+        editPracticesendtype: false,
+      });
+      this.props.scrollToAnchor("tpmcourseMessageMD");
+      this.props.showNotification("过关任务，请勿输入空格");
+      return;
     }
 
-    onshixunsmarks=()=> {
-        this.setState({
-            marktype:true
-        })
+    if (shixunCreatePracticeGroup === undefined) {
+      this.setState({
+        shixunCreatePracticeGrouptype: true,
+        editPracticesendtype: false,
+      });
+      this.props.scrollToAnchor("shixunCreatePracticeGroupid");
+      return;
+    }
+    if (onshixunsmarkvalue === undefined) {
+      this.setState({
+        onshixunsmarkvaluetype: true,
+        editPracticesendtype: false,
+      });
+      this.props.scrollToAnchor("input_task_tag");
+      return;
     }
 
-    onshixunsmarkss=()=> {
-        this.setState({
-            marktype:false
-        })
+    if (shixunsskillvaluelist.length === 0) {
+      this.setState({
+        shixunsskillvaluelisttype: true,
+        editPracticesendtype: false,
+      });
+      this.props.scrollToAnchor("input_task_tag");
+      return;
     }
 
-		setexec_time=(e)=>{
-				this.setState({
-					exec_time:e.target.value
-				})
-		}
+    // if(exec_time===null||exec_time===undefined||exec_time === ""){
+    // 	this.setState({
+    // 		shixunExec_timeType:true,
+    //     editPracticesendtype:false
+    // 	})
+    //   this.props.scrollToAnchor("exec_time");
+    // 	return
+    // }
 
-    gotocheckpoint=(url)=>{
-        this.props.history.replace(url);
+    // if (exec_time.match(/^[ ]*$/)) {
+    //     this.props.showNotification("评测时限，请勿输入空格");
+    //     this.setState({
+    //         shixunExec_timeType:true,
+    //         editPracticesendtype:false
+    //     })
+    //     this.props.scrollToAnchor("exec_time");
+    //     return
+    // }
+    //					  exec_time:exec_time
+    axios
+      .put(url, {
+        tab: 0,
+        identifier: id,
+        id: checkpointId,
+        challenge: {
+          subject: shixunCreatePractice,
+          task_pass: exercise_editormdvalue,
+          difficulty: shixunCreatePracticeGroup,
+          score: onshixunsmarkvalue,
+        },
+        challenge_tag: shixunsskillvaluelist,
+      })
+      .then((response) => {
+        this.props.showNotification(response.data.messages);
+        if (response.data.status === 1) {
+          // window.location.href=`/shixuns/${id}/challenges/${checkpointId}/tab=2`;
+          this.setState({
+            setopen: true,
+            editPracticesendtype: false,
+            tab2url:
+              "/shixuns/" + id + "/challenges/" + checkpointId + "/tab=2",
+            tab3url:
+              "/shixuns/" + id + "/challenges/" + checkpointId + "/tab=3",
+          });
+          this.props.history.replace(
+            `/shixuns/${id}/challenges/${checkpointId}/tab=2`
+          );
+          // window.location.href = "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=2"
+        }
+      })
+      .catch((error) => {
+        console.log(error);
+      });
+  };
+
+  onshixunsmarks = () => {
+    this.setState({
+      marktype: true,
+    });
+  };
+
+  onshixunsmarkss = () => {
+    this.setState({
+      marktype: false,
+    });
+  };
+
+  setexec_time = (e) => {
+    this.setState({
+      exec_time: e.target.value,
+    });
+  };
+
+  gotocheckpoint = (url) => {
+    this.props.history.replace(url);
+  };
+  render() {
+    let shixuntype = this.props.match.params.type;
+
+    let {
+      responsedata,
+      shixunCreatePracticetype,
+      shixunsskillvaluelisttype,
+      choice_url,
+      practice_url,
+      go_back_url,
+      position,
+      task_pass_default,
+      submit_url,
+      setopen,
+      checkpointId,
+      prev_challenge,
+      next_challenge,
+      power,
+      shixunCreatePractice,
+      shixunCreatePracticeGroup,
+      onshixunsmarkvalue,
+      shixunsskillvalue,
+      shixunsskillvaluelist,
+      tab2url,
+      tab3url,
+      optionsums,
+      CreatePracticesendtype,
+      editPracticesendtype,
+    } = this.state;
+
+    let options;
+    if (optionsums != undefined) {
+      options = optionsums.map((d, k) => {
+        return (
+          <Option key={d} id={k}>
+            {d}
+          </Option>
+        );
+      });
     }
-    render() {
 
-        let shixuntype = this.props.match.params.type;
-
-
-        let {responsedata,
-            shixunCreatePracticetype, shixunsskillvaluelisttype,
-            choice_url, practice_url, go_back_url, position, task_pass_default, submit_url, setopen,checkpointId,prev_challenge,next_challenge,power,
-            shixunCreatePractice, shixunCreatePracticeGroup, onshixunsmarkvalue, shixunsskillvalue, shixunsskillvaluelist, tab2url, tab3url,optionsums,
-            CreatePracticesendtype,editPracticesendtype
-        } = this.state;
-
-        let options;
-        if(optionsums!=undefined){
-					options = optionsums.map((d, k) => {
-						return (
-							<Option key={d} id={k}>{d}</Option>
-						)
-					})
-				}
-
-        // console.log(this.props)
-        // console.log(this.state)
+    // console.log(this.props)
+    // console.log(this.state)
     //a console.log(shixunCreatePractice)
 
-        return (
-            <React.Fragment>
-                <div className="educontent mt30 mb30">
-                    <div className="TPMchallengesnewtitles edu-back-white clearfix borderbottomf4">
-                        <span className="font-16 task-hide fl TPMtaskName">第{position}关：{responsedata&&responsedata.st === 0 ?"实践题":responsedata&&responsedata.st === 1?"选择题":""}</span>
-                        {this.props.identity>4||this.props.identity===undefined||this.props.status===2||this.props.status===1?"":<a href={practice_url === undefined ? "" : practice_url} className="fr ml15 mt13">
-                            <Button type="primary" className="edu-default-btn edu-greenback-btn  "
-                            >新增实践任务</Button></a>}
-                        {this.props.identity>4||this.props.identity===undefined||this.props.status===2||this.props.status===1?"":<Link to={choice_url === undefined ? "" : choice_url}
-                           className="fr ml15 mt13">
-                            <Button type="primary"
-                               className="edu-default-btn edu-greenback-btn  mr5"
-                            >新增选择题任务</Button></Link>}
-                        {next_challenge===undefined?"":
-                            <Button type="primary" ghost onClick={()=>this.gotocheckpoint(next_challenge)}
-                                    className="edu-default-btn edu-greenback-btn  mr5 fr ml15 mt13"
-                            >下一关</Button> }
-                        {prev_challenge===undefined?"":
-                            <Button type="primary" ghost onClick={()=>this.gotocheckpoint(prev_challenge)}
-                                    className="edu-default-btn edu-greenback-btn  mr5 fr ml15 mt13"
-                            >上一关</Button>}
-                    </div>
+    return (
+      <React.Fragment>
+        <div className="educontent mt30 mb30">
+          <div className="TPMchallengesnewtitles edu-back-white clearfix borderbottomf4">
+            <span className="font-16 task-hide fl TPMtaskName">
+              第{position}关：
+              {responsedata && responsedata.st === 0
+                ? "实践题"
+                : responsedata && responsedata.st === 1
+                ? "选择题"
+                : ""}
+            </span>
+            {this.props.identity > 4 ||
+            this.props.identity === undefined ||
+            this.props.status === 2 ||
+            this.props.status === 1 ? (
+              ""
+            ) : (
+              <a
+                href={practice_url === undefined ? "" : practice_url}
+                className="fr ml15 mt13"
+              >
+                <Button
+                  type="primary"
+                  className="edu-default-btn edu-greenback-btn  "
+                >
+                  新增实践任务
+                </Button>
+              </a>
+            )}
+            {this.props.identity > 4 ||
+            this.props.identity === undefined ||
+            this.props.status === 2 ||
+            this.props.status === 1 ? (
+              ""
+            ) : (
+              <Link
+                to={choice_url === undefined ? "" : choice_url}
+                className="fr ml15 mt13"
+              >
+                <Button
+                  type="primary"
+                  className="edu-default-btn edu-greenback-btn  mr5"
+                >
+                  新增选择题任务
+                </Button>
+              </Link>
+            )}
+            {next_challenge === undefined ? (
+              ""
+            ) : (
+              <Button
+                type="primary"
+                ghost
+                onClick={() => this.gotocheckpoint(next_challenge)}
+                className="edu-default-btn edu-greenback-btn  mr5 fr ml15 mt13"
+              >
+                下一关
+              </Button>
+            )}
+            {prev_challenge === undefined ? (
+              ""
+            ) : (
+              <Button
+                type="primary"
+                ghost
+                onClick={() => this.gotocheckpoint(prev_challenge)}
+                className="edu-default-btn edu-greenback-btn  mr5 fr ml15 mt13"
+              >
+                上一关
+              </Button>
+            )}
+          </div>
 
-                    <div className="challenge_nav clearfix edu-back-white">
+          <div className="challenge_nav clearfix edu-back-white">
+            <li className="active">
+              <a className={"color-blue"}>1、本关任务 </a>
+            </li>
+            {tab2url === "" ? "" : <li> > </li>}
+            <li className="">
+              {tab2url === "" ? (
+                <span></span>
+              ) : (
+                <Link to={tab2url}>2、评测设置</Link>
+              )}
+            </li>
+            {tab3url === "" ? "" : <li> > </li>}
+            <li className="">
+              {tab3url === "" ? (
+                <span></span>
+              ) : (
+                <Link to={tab3url}> 3、参考答案</Link>
+              )}
+            </li>
+          </div>
 
-                        <li className="active">
-                            <a className={"color-blue"}>1、本关任务 </a>
-                        </li>
-                        {tab2url === "" ? "":<li> > </li>}
-                        <li className="">
-                            {tab2url === "" ? <span></span> : <Link to={tab2url}>2、评测设置</Link>}
-                        </li>
-                        {tab3url === "" ? "":<li> > </li>}
-                        <li className="">
-                            {tab3url === "" ? <span></span> : <Link to={tab3url}>  3、参考答案</Link>}
-                        </li>
-                    </div>
+          <div className="edu-back-white clearfix">
+            <div className="newpadding1020">
+              <p className="color-grey-6 font-16 mb10">
+                {" "}
+                <span className="mr5 color-red">*</span>名称
+              </p>
+              <div>
+                <div className="flex1">
+                  <Input
+                    placeholder="请输入任务名称，最大限制60个字符；此信息将在实训发布后展示给学员，例：计算学生的课程成绩绩点"
+                    maxLength="60"
+                    className={
+                      shixunCreatePracticetype === true
+                        ? "bor-red"
+                        : "newViewAfter"
+                    }
+                    onInput={this.shixunCreatePractice}
+                    value={shixunCreatePractice}
+                    addonAfter={`${String(
+                      !shixunCreatePractice ? 0 : shixunCreatePractice.length
+                    )}/${60}`}
+                  />
+                </div>
+                <div>
+                  <span
+                    className={
+                      shixunCreatePracticetype === true
+                        ? "color-red mt8 fl  block"
+                        : "color-red mt8 fl none"
+                    }
+                    id="new_shixun_name"
+                  >
+                    必填项：不能为空
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
 
-                    <div className="edu-back-white clearfix">
-                        <div className="newpadding1020">
-                            <p className="color-grey-6 font-16 mb10">  <span className="mr5 color-red">*</span>名称</p>
-                            <div>
-                                <div className="flex1">
-                                    <Input placeholder="请输入任务名称，最大限制60个字符；此信息将在实训发布后展示给学员，例：计算学生的课程成绩绩点"
-                                           maxLength="60"
-                                           className={shixunCreatePracticetype === true ? "bor-red":"newViewAfter"}
-                                           onInput={this.shixunCreatePractice}
-                                           value={shixunCreatePractice}
-                                           addonAfter={`${String(!shixunCreatePractice? 0 : shixunCreatePractice.length)}/${60}`}
-                                            />
-                                </div>
-                                <div>
-                                <span className={shixunCreatePracticetype === true ? "color-red mt8 fl  block" : "color-red mt8 fl none"}  id="new_shixun_name">必填项：不能为空</span>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-
-                    <div className="edu-back-white newpadding02020">
-
-                        <p className="color-grey-6 font-16 mb10"  id={"tpmcourseMessageMD"}><span className="mr5 color-red">*</span>过关任务</p>
-                        <style>
-                            {
-                                `
+          <div className="edu-back-white newpadding02020">
+            <p className="color-grey-6 font-16 mb10" id={"tpmcourseMessageMD"}>
+              <span className="mr5 color-red">*</span>过关任务
+            </p>
+            <style>
+              {`
                            .markdown-body img {
                                     max-width: 80%; 
                                     margin: 0 auto;
@@ -643,132 +810,219 @@ export default class TPMchallengesnew extends Component {
                                     height: auto;  
                                     max-height: 80%;
                                 }
-                                `
-                            }
-                        </style>
-											  <TPMMDEditor ref={this.exercisememoMDRef} placeholder="请输入选择题的题干内容" mdID={'exercisememoMD'} refreshTimeout={1500}
+                                .courseMessageMD a{
+                                    color:#40a9ff;
+                                }
+                                `}
+            </style>
+            <TPMMDEditor
+              ref={this.exercisememoMDRef}
+              placeholder="请输入选择题的题干内容"
+              mdID={"exercisememoMD"}
+              refreshTimeout={1500}
+              watch={true}
+              className="courseMessageMD"
+              initValue={this.state.exercisememoMDRefval}
+              height={800}
+            ></TPMMDEditor>
+            <p
+              id="e_tip_Memochallengesnew"
+              className="edu-txt-right color-grey-cd font-12"
+            ></p>
+            ???
+            <p
+              id="e_tips_Memochallengesnew"
+              className="edu-txt-right color-grey-cd font-12"
+            ></p>
+            {this.state.tpmcourseMessageMDType === true ? (
+              <div className="color-red mt7 ml5 font-14">必填项：不能为空</div>
+            ) : (
+              ""
+            )}
+          </div>
 
-																	 watch={true}  className="courseMessageMD" initValue={this.state.exercisememoMDRefval} height={800}></TPMMDEditor>
-
-                        <p id="e_tip_Memochallengesnew" className="edu-txt-right color-grey-cd font-12"></p>
-                        <p id="e_tips_Memochallengesnew" className="edu-txt-right color-grey-cd font-12"></p>
-
-                        {this.state.tpmcourseMessageMDType===true?<div className="color-red mt7 ml5 font-14" >必填项：不能为空</div>:""}
-                    </div>
-
-
-                    <div className="edu-back-white newpadding02020">
-                        <p className="color-grey-6 font-16 mb20">
-                            <span className="fl color-red mr5">*</span>
-                            难度系数：
-                            <RadioGroup value={shixunCreatePracticeGroup}
-                                        className={"ml10"}
-                                  id={"shixunCreatePracticeGroupid"}
-                                  disabled={this.props.status===2?true:false}
-                                  onChange={this.props.status===2?"":this.onshixunCreatePracticeChange}>
-                                <Radio value={1}>简单</Radio>
-                                <Radio value={2}>中等</Radio>
-                                <Radio value={3}>困难</Radio>
-                            </RadioGroup>
-                            {this.state.shixunCreatePracticeGrouptype===true?<div className="color-red mt7 ml5 font-14" id="ex_value_notice">
-                                必选项：不能为空</div>:""}
-                        </p>
-                        <p className="color-grey-6 font-16 mb10"> <span className="fl mr5 color-red">*</span> 奖励经验值：<span className={"color-grey-8 font-14"}> (如果学员答题正确，将获得相应的经验值；如果学员成功得到经验值，那么将同时获得等值的金币奖励，如：+100经验值、+100金币)</span></p>
-                        <div className="clearfix">
-                            {this.state.onshixunsmarkvaluetype===true?<style>
-                                {
-                                    `
+          <div className="edu-back-white newpadding02020">
+            <p className="color-grey-6 font-16 mb20">
+              <span className="fl color-red mr5">*</span>
+              难度系数：
+              <RadioGroup
+                value={shixunCreatePracticeGroup}
+                className={"ml10"}
+                id={"shixunCreatePracticeGroupid"}
+                disabled={this.props.status === 2 ? true : false}
+                onChange={
+                  this.props.status === 2
+                    ? ""
+                    : this.onshixunCreatePracticeChange
+                }
+              >
+                <Radio value={1}>简单</Radio>
+                <Radio value={2}>中等</Radio>
+                <Radio value={3}>困难</Radio>
+              </RadioGroup>
+              {this.state.shixunCreatePracticeGrouptype === true ? (
+                <div className="color-red mt7 ml5 font-14" id="ex_value_notice">
+                  必选项：不能为空
+                </div>
+              ) : (
+                ""
+              )}
+            </p>
+            <p className="color-grey-6 font-16 mb10">
+              {" "}
+              <span className="fl mr5 color-red">*</span> 奖励经验值：
+              <span className={"color-grey-8 font-14"}>
+                {" "}
+                (如果学员答题正确，将获得相应的经验值；如果学员成功得到经验值，那么将同时获得等值的金币奖励，如：+100经验值、+100金币)
+              </span>
+            </p>
+            <div className="clearfix">
+              {this.state.onshixunsmarkvaluetype === true ? (
+                <style>
+                  {`
                                    .ant-select-selection{
                                         border:1px solid red;
                                    }
-                                    `
-                                }
-                            </style>:""}
-                            <Select style={{width: 252}}
-                                    className={"winput-240-40 ml3"}
-                                    id="challenge_score"
-                                    onChange={this.props.status===2?"":this.onshixunsmark}
-                                    disabled={this.props.status===2?true:false}
-                                    value={onshixunsmarkvalue}
-                                    getPopupContainer={triggerNode => triggerNode.parentNode}
-                            >
-                                {options}
-                            </Select>
-                            {this.state.onshixunsmarkvaluetype===true?<div className="color-red mt7 ml5" id="ex_value_notice">
-                                必选项：不能为空</div>:""}
-                        </div>
-                    </div>
-
-
-                    <div className="edu-back-white newpadding02020">
-                        <p className="color-grey-6 font-16 mb10"><span className="mr5 color-red">*</span>技能标签：<span className={"color-grey-8 font-14"}> (学员答题正确将获得技能，否则不能获得技能)</span></p>
-                        <div className="clearfix">
-                            <div className="flex1">
-                                <Input type="text"
-                                       className={shixunsskillvaluelisttype === true ?"winput-240-40 fl mr20 winput-240-40s ml10 bor-red":"winput-240-40 fl mr20 winput-240-40s ml10"}
-                                       id="input_task_tag"
-                                       placeholder="添加标签"
-                                       onInput={this.shixunsskill}
-                                       value={shixunsskillvalue}
-                                       onPressEnter={this.clickshixunsskill}
-                                       onBlur={this.clickshixunsskill}
-                                />
-                                <div className="ml15 color-grey-9 pt5 font-14">(回车添加标签)</div>
-                                <div className="mt20 clearfix" id="task_tag_content">
-                                    {
-																			shixunsskillvaluelist===undefined?"":shixunsskillvaluelist.length === 0 ? "" : shixunsskillvaluelist.map((itme, key) => {
-                                            return (
-                                              <li key={key} className={"fl ml10 mr10"}>
-                                                <Badge className={"tpmpointer"} count={"x"} onClick={() => this.delshixunsskilllist(key)}>
-                                                    <Button type="primary" ghost className={"Permanentban "}>
-                                                     {itme}
-                                                    </Button>
-                                                </Badge>
-                                            </li>
-                                            )
-                                        })
-                                    }
-                                </div>
-                            </div>
-                            <div className={shixunsskillvaluelisttype === true ? "color-red ml10 mt5 block" : "none"}
-                                id="stage_name_notice">必选项：不能为空</div>
-                        </div>
-                    </div>
-
-										{/*<div className="edu-back-white newpadding02020">*/}
-										{/*	<p className="color-grey-6 font-16 mb20"> <span className="color-orange mr5 fl">*</span> 服务配置：评测时限(S)</p>*/}
-										{/*	<div className="clearfix mb5 ml10">*/}
-										{/*		<div className="pr status_con" id={"exec_timeid"}>*/}
-                    {/*        /!*<label className="panel-form-label fl"></label>*!/*/}
-										{/*		   	<input  value={this.state.exec_time}*/}
-                    {/*                className={this.state.shixunExec_timeType === true ?"panel-box-sizing task-form-100 task-height-40 bor-red":"panel-box-sizing task-form-100 task-height-40" }*/}
-                    {/*                placeholder="请输入类别名称" onInput={this.setexec_time}/>*/}
-										{/*		</div>*/}
-										{/*		<div*/}
-										{/*			className={this.state.shixunExec_timeType === true ? "color-red mt8  block ml5" : " none"}*/}
-										{/*			id="new_shixun_name">必填项：不能为空</div>*/}
-										{/*	</div>*/}
-										{/*</div>*/}
-
-
+                                    `}
+                </style>
+              ) : (
+                ""
+              )}
+              <Select
+                style={{ width: 252 }}
+                className={"winput-240-40 ml3"}
+                id="challenge_score"
+                onChange={this.props.status === 2 ? "" : this.onshixunsmark}
+                disabled={this.props.status === 2 ? true : false}
+                value={onshixunsmarkvalue}
+                getPopupContainer={(triggerNode) => triggerNode.parentNode}
+              >
+                {options}
+              </Select>
+              {this.state.onshixunsmarkvaluetype === true ? (
+                <div className="color-red mt7 ml5" id="ex_value_notice">
+                  必选项：不能为空
                 </div>
-                {this.props.identity>4||this.props.identity===undefined?"":<div className="clearfix mt30"
-                     // style={{display:this.props.identity>4||this.props.identity===undefined?"none":'block'}}
-                >
-                    {/*{checkpointId===undefined?<a className="defalutSubmitbtn fl mr20" onClick={CreatePracticesendtype===true?"":this.CreatePracticesend}>提交</a>:*/}
-                    {/*<a className="defalutSubmitbtn fl mr20" onClick={editPracticesendtype===true?"":this.editPracticesend}>提交</a>}*/}
-                    {/*<a href={go_back_url === undefined ? "" : go_back_url} className="defalutCancelbtn fl">取消</a>*/}
-                    {/*<Link to={go_back_url === undefined ? "" : go_back_url} className={"defalutCancelbtn fl"}>取消</Link>*/}
-                    <Bottomsubmit url={go_back_url === undefined ? "" : go_back_url}
-                                  {...this.props}
-                                  {...this.state}
-                                  bottomvalue={"提交"}
-                                  onSubmits={checkpointId===undefined?()=>this.CreatePracticesend():()=>this.editPracticesend()}
-                                  loadings={CreatePracticesendtype===true?true:editPracticesendtype===true?true:false}/>
-                </div>}
-            </React.Fragment>
-        )
-    }
+              ) : (
+                ""
+              )}
+            </div>
+          </div>
+
+          <div className="edu-back-white newpadding02020">
+            <p className="color-grey-6 font-16 mb10">
+              <span className="mr5 color-red">*</span>技能标签：
+              <span className={"color-grey-8 font-14"}>
+                {" "}
+                (学员答题正确将获得技能，否则不能获得技能)
+              </span>
+            </p>
+            <div className="clearfix">
+              <div className="flex1">
+                <Input
+                  type="text"
+                  className={
+                    shixunsskillvaluelisttype === true
+                      ? "winput-240-40 fl mr20 winput-240-40s ml10 bor-red"
+                      : "winput-240-40 fl mr20 winput-240-40s ml10"
+                  }
+                  id="input_task_tag"
+                  placeholder="添加标签"
+                  onInput={this.shixunsskill}
+                  value={shixunsskillvalue}
+                  onPressEnter={this.clickshixunsskill}
+                  onBlur={this.clickshixunsskill}
+                  style={{width:"252px"}}
+                />
+                <div className="ml15 color-grey-9 pt5 font-14">
+                  (回车添加标签)
+                </div>
+                <div className="mt20 clearfix" id="task_tag_content">
+                  {shixunsskillvaluelist === undefined
+                    ? ""
+                    : shixunsskillvaluelist.length === 0
+                    ? ""
+                    : shixunsskillvaluelist.map((itme, key) => {
+                        return (
+                          <li key={key} className={"fl ml10 mr10"}>
+                            <Badge
+                              className={"tpmpointer"}
+                              count={"x"}
+                              onClick={() => this.delshixunsskilllist(key)}
+                            >
+                              <Button
+                                type="primary"
+                                ghost
+                                className={"Permanentban "}
+                              >
+                                {itme}
+                              </Button>
+                            </Badge>
+                          </li>
+                        );
+                      })}
+                </div>
+              </div>
+              <div
+                className={
+                  shixunsskillvaluelisttype === true
+                    ? "color-red ml10 mt5 block"
+                    : "none"
+                }
+                id="stage_name_notice"
+              >
+                必选项：不能为空
+              </div>
+            </div>
+          </div>
+
+          {/*<div className="edu-back-white newpadding02020">*/}
+          {/*	<p className="color-grey-6 font-16 mb20"> <span className="color-orange mr5 fl">*</span> 服务配置：评测时限(S)</p>*/}
+          {/*	<div className="clearfix mb5 ml10">*/}
+          {/*		<div className="pr status_con" id={"exec_timeid"}>*/}
+          {/*        /!*<label className="panel-form-label fl"></label>*!/*/}
+          {/*		   	<input  value={this.state.exec_time}*/}
+          {/*                className={this.state.shixunExec_timeType === true ?"panel-box-sizing task-form-100 task-height-40 bor-red":"panel-box-sizing task-form-100 task-height-40" }*/}
+          {/*                placeholder="请输入类别名称" onInput={this.setexec_time}/>*/}
+          {/*		</div>*/}
+          {/*		<div*/}
+          {/*			className={this.state.shixunExec_timeType === true ? "color-red mt8  block ml5" : " none"}*/}
+          {/*			id="new_shixun_name">必填项：不能为空</div>*/}
+          {/*	</div>*/}
+          {/*</div>*/}
+        </div>
+        {this.props.identity > 4 || this.props.identity === undefined ? (
+          ""
+        ) : (
+          <div
+            className="clearfix mt30"
+            // style={{display:this.props.identity>4||this.props.identity===undefined?"none":'block'}}
+          >
+            {/*{checkpointId===undefined?<a className="defalutSubmitbtn fl mr20" onClick={CreatePracticesendtype===true?"":this.CreatePracticesend}>提交</a>:*/}
+            {/*<a className="defalutSubmitbtn fl mr20" onClick={editPracticesendtype===true?"":this.editPracticesend}>提交</a>}*/}
+            {/*<a href={go_back_url === undefined ? "" : go_back_url} className="defalutCancelbtn fl">取消</a>*/}
+            {/*<Link to={go_back_url === undefined ? "" : go_back_url} className={"defalutCancelbtn fl"}>取消</Link>*/}
+            <Bottomsubmit
+              url={go_back_url === undefined ? "" : go_back_url}
+              {...this.props}
+              {...this.state}
+              bottomvalue={"提交"}
+              onSubmits={
+                checkpointId === undefined
+                  ? () => this.CreatePracticesend()
+                  : () => this.editPracticesend()
+              }
+              loadings={
+                CreatePracticesendtype === true
+                  ? true
+                  : editPracticesendtype === true
+                  ? true
+                  : false
+              }
+            />
+          </div>
+        )}
+      </React.Fragment>
+    );
+  }
 }
-
-
diff --git a/src/modules/tpm/challengesnew/TPMevaluation.js b/src/modules/tpm/challengesnew/TPMevaluation.js
index 7ff0942c..901d3997 100644
--- a/src/modules/tpm/challengesnew/TPMevaluation.js
+++ b/src/modules/tpm/challengesnew/TPMevaluation.js
@@ -63,7 +63,8 @@ export default class TPMevaluation extends Component {
 			markvalue:true,
 			scoretype:undefined,
 			web_route:null,
-			exec_time:undefined
+			exec_time:undefined,
+			ignore_space:false
 		}
 	}
 
@@ -126,6 +127,7 @@ export default class TPMevaluation extends Component {
 				markvalue:response.data.test_set_average,
 				web_route:response.data.web_route,
 				has_web_route:response.data.has_web_route,
+				ignore_space:response.data.ignore_space,
 				responsedata:response.data,
 				exec_time:response.data.exec_time,
 			})
@@ -362,7 +364,13 @@ export default class TPMevaluation extends Component {
 		this.setState({
 			evaluationlist:newevaluationlist
 		})
-		this.setevaluationlist(newevaluationlist);
+		// this.setevaluationlist(newevaluationlist);
+	}
+
+	ignore_spaceChange=(type)=>{
+		this.setState({
+			ignore_space:!type
+		})
 	}
 
 	//  填写分数百分比
@@ -443,7 +451,7 @@ export default class TPMevaluation extends Component {
 		$('textarea[autoHeight]').autoHeight();
 	}
 	submitarbitrationevaluation=()=>{
-		let{exec_time,evaluationlist,shixunfilepath,shixunfilepathplay,shixunfileexpectpicturepath,shixunfilestandardpicturepath,shixunfilepicturepath,pathoptionvalue,scorevalue,markvalue,web_route}=this.state;
+		let{exec_time,evaluationlist,shixunfilepath,shixunfilepathplay,shixunfileexpectpicturepath,shixunfilestandardpicturepath,shixunfilepicturepath,pathoptionvalue,scorevalue,markvalue,web_route,ignore_space}=this.state;
 
 
 		let newscorevalue;
@@ -527,7 +535,8 @@ export default class TPMevaluation extends Component {
 			test_set_score:newscorevalue,
 			test_set_average:markvalue,
 			web_route:web_route===null?undefined:web_route,
-			exec_time:exec_time
+			exec_time:exec_time,
+			ignore_space:ignore_space
 		}
 		axios.put(url,{
 				tab:1,
@@ -672,7 +681,8 @@ export default class TPMevaluation extends Component {
 			markvalue,
 			scoretype,
 			has_web_route,
-			responsedata
+			responsedata,
+			ignore_space
 		} = this.state;
 
 		let tab1url="/shixuns/" + shixunId + "/challenges/"+checkpointId+"/editcheckpoint";
@@ -979,9 +989,10 @@ export default class TPMevaluation extends Component {
 										通过部分测试集
 										<span className={"color979797"}>（学员评测，当至少有一组测试集正确时，即可获得其对应比例的奖励）</span></Radio>
 								</RadioGroup>
+
 							</p>
 
-							<p className="color-grey-9  mb20"
+							<p className="color-grey-9"
 								 style={{width:'100%',height:'20px',display:scorevalue===true?'block':'none'}}
 							>
 								<span className={"headdfgf color979797"} style={{width:'500px'}} >
@@ -996,8 +1007,25 @@ export default class TPMevaluation extends Component {
 								</span>
 
 							</p>
-
+							<p className={scorevalue===true?"color-grey-9  mt15":"color-grey-9  mt10"}
+								 style={{width:'100%'}}
+							>
+								<span className={"color979797"}>空格处理：</span>
+								<Checkbox onChange={()=>this.ignore_spaceChange(ignore_space)}  checked={ignore_space} className={"ml28"}><span className={"font-14 "}>忽略首尾空格</span></Checkbox>
+							</p>
 							<div>
+								<style>
+									{
+										`
+										.ml19{
+										  margin-left: 19px !important;
+										}
+										.ml23{
+											 margin-left: 23px !important;
+										 }
+										`
+									}
+								</style>
 								<div className="flex1 mr20">
 
 									<div id="test_array_set">
@@ -1008,7 +1036,7 @@ export default class TPMevaluation extends Component {
 													<p className="clearfix pr mb20">
 														<span className="fl mr10 color-red">*</span>
 														<span className="color-blue font-16 fl" name="sample_inputs_label">组{key+1}</span>
-														<span className="fl ml20 color-grey-6">
+														<span className="fl ml20 color-grey-6" 	 style={{width: '80%'}}>
                                                             {/*checked={item.is_public===1?false:true}*/}
 
 															<input className={scoretype===key?"bor-red fl martopf4":"fl martopf4"}
@@ -1020,7 +1048,8 @@ export default class TPMevaluation extends Component {
 																												>%</span>
 
 
-                                                    <Checkbox onChange={()=>this.evaluationonChange(item.hidden,key)}  checked={item.hidden===1?true:false}>隐藏<span className={"color-grey-8 font-14"}>（选中则对学员隐藏本测试集内容）</span></Checkbox>
+                                                    <Checkbox onChange={()=>this.evaluationonChange(item.hidden,key)}  checked={item.hidden===1?true:false} className={"ml19"}>隐藏<span className={"color-grey-8 font-14 "}>（选中则对学员隐藏本测试集内容）</span></Checkbox>
+
                                                   </span>
 
 														<Tooltip placement="bottom" title={"删除"}>
@@ -1048,7 +1077,7 @@ export default class TPMevaluation extends Component {
 													></TextArea>
 													<div className="clearfix lineh-30 mt20">
 														<span className="fl mr10 color-grey-6">匹配规则：</span>
-														<RadioGroup className="fl" value={item.match_rule} onChange={(e)=>this.changeEvaluationRule(e,key)}>
+														<RadioGroup className="fl mt4" value={item.match_rule} onChange={(e)=>this.changeEvaluationRule(e,key)}>
 															<Radio value='full'>完全匹配<span className={"color-grey-8 font-14"}>（实际输出与预期输出完全相同）</span></Radio>
 															<Radio value='last'>末尾匹配<span className={"color-grey-8 font-14"}>（实际输出的末尾内容与预期输出完全相同）</span></Radio>
 														</RadioGroup>
@@ -1064,7 +1093,7 @@ export default class TPMevaluation extends Component {
 										<Button type="primary" ghost className="edu-default-btn edu-greenback-btn mt20 mb20">新增测试集</Button>
 								</p>
 
-								<p className="color-grey-9">温馨提示：公开测试集和隐藏测试集结合使用，可以降低作弊的几率；隐藏测试集，在“提交评测”时也将被系统自动检测</p>
+								<p className="color-grey-9">温馨提示：公开测试集和隐藏测试集结合使用，可以降低作弊的机率；隐藏测试集，在“提交评测”时也将被系统自动检测</p>
 							</div>
 						</div>
 					</div>
diff --git a/src/modules/tpm/challengesnew/TPMquestion.js b/src/modules/tpm/challengesnew/TPMquestion.js
index b76e17b1..f25e344f 100644
--- a/src/modules/tpm/challengesnew/TPMquestion.js
+++ b/src/modules/tpm/challengesnew/TPMquestion.js
@@ -1,34 +1,25 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
 
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Tooltip,notification} from 'antd';
+import { Select, Popconfirm, message, Tooltip, notification } from 'antd';
 
-import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
-
-// import "antd/dist/antd.css";
+import { Link } from "react-router-dom";
 
 import axios from 'axios';
 
-import { getImageUrl, toPath } from 'educoder';
+import { getImageUrl } from 'educoder';
 
 import './css/TPMchallengesnew.css';
 
-import {getUrl} from 'educoder';
-
 import TpmQuestionMain from './TpmQuestionMain';
 
 import TpmQuestionNew from './TpmQuestionNew';
 
 import TpmQuestionEdit from './TpmQuestionEdit';
 
-let origin = getUrl();
-
-let path = getUrl("/editormd/lib/")
-
 const $ = window.$;
 
 const Option = Select.Option;
 
-const RadioGroup = Radio.Group;
 
 var letterArr = [];
 for (var i = 65, j = 0; i < 91; i++, j++) {
@@ -39,11 +30,11 @@ for (var i = 65, j = 0; i < 91; i++, j++) {
 export default class TPMquestion extends Component {
     constructor(props) {
         super(props)
-			this.contentMdRef = React.createRef();
-			this.newquestioMDMdRef = React.createRef();
-			this.newquestioMDMdCont=React.createRef();
-			this.neweditanswerRef=React.createRef();
-			this.editanswersRef=React.createRef();
+        this.contentMdRef = React.createRef();
+        this.newquestioMDMdRef = React.createRef();
+        this.newquestioMDMdCont = React.createRef();
+        this.neweditanswerRef = React.createRef();
+        this.editanswersRef = React.createRef();
         this.state = {
             choice_url: undefined,
             practice_url: undefined,
@@ -51,72 +42,72 @@ export default class TPMquestion extends Component {
             position: undefined,
             task_pass_default: undefined,
             submit_url: undefined,
-					questionsInputvalue:undefined,
-            questionaddsum:0,
-            questionaddarray:[],
-            questionaddtype:true,
-            activetype:"",
-            questionlists:[{str:"A",val:"",type:false},{str:"B",val:"",type:false},{str:"C",val:"",type:false},{str:"D",val:"",type:false}],
+            questionsInputvalue: undefined,
+            questionaddsum: 0,
+            questionaddarray: [],
+            questionaddtype: true,
+            activetype: "",
+            questionlists: [{ str: "A", val: "", type: false }, { str: "B", val: "", type: false }, { str: "C", val: "", type: false }, { str: "D", val: "", type: false }],
             answeshixunsGroup: 1,
-            answeoptions:[10,20],
-            answeonshixunsmark:10,
-            shixunssanswerkillvalue:"",
-            shixunsskillanswerlist:[],
-            challenge_id:"",
-            challenge_choose_id:undefined,
-            questionlistss:[],
-            newcnttype:false,
-            newquestioMDvaluetype:false,
-            challenge_tagtype:false,
-            editquestionaddtype:false,
-            mancheckpointId:undefined,
-            power:false,
-            questionInputvaluetype:false,
-            questioMD:"",
-            standard_answer:"",
-            subject:"",
-            newquestioMDvaluetypes:false,
-            questionInputvaluetypes:false,
-            prev_challenge:undefined,
-            next_challenge:undefined,
-            newcnttypesum:1,
-            marktype:false,
-            answer:"",
-            sumittype:false
+            answeoptions: [10, 20],
+            answeonshixunsmark: 10,
+            shixunssanswerkillvalue: "",
+            shixunsskillanswerlist: [],
+            challenge_id: "",
+            challenge_choose_id: undefined,
+            questionlistss: [],
+            newcnttype: false,
+            newquestioMDvaluetype: false,
+            challenge_tagtype: false,
+            editquestionaddtype: false,
+            mancheckpointId: undefined,
+            power: false,
+            questionInputvaluetype: false,
+            questioMD: "",
+            standard_answer: "",
+            subject: "",
+            newquestioMDvaluetypes: false,
+            questionInputvaluetypes: false,
+            prev_challenge: undefined,
+            next_challenge: undefined,
+            newcnttypesum: 1,
+            marktype: false,
+            answer: "",
+            sumittype: false
         }
     }
 
 
-    questionInputvalue=(e)=>{
+    questionInputvalue = (e) => {
         this.setState({
-					questionsInputvalue: e.target.value
+            questionsInputvalue: e.target.value
         })
     }
 
     componentDidMount() {
-        if(this.props.status===2){
+        if (this.props.status === 2) {
 
         }
         let id = this.props.match.params.shixunId;
-        let checkpointId=this.props.match.params.checkpointId;
+        let checkpointId = this.props.match.params.checkpointId;
 
         this.setState({
-            mancheckpointId:id,
+            mancheckpointId: id,
         })
 
-        let newchoice_url= "/shixuns/"+id+"/challenges/newquestion";
-        let newpractice_url= "/shixuns/"+id+"/challenges/new";
-        let newgo_back_url="/shixuns/"+id+"/challenges";
+        let newchoice_url = "/shixuns/" + id + "/challenges/newquestion";
+        let newpractice_url = "/shixuns/" + id + "/challenges/new";
+        let newgo_back_url = "/shixuns/" + id + "/challenges";
 
-        if(this.props.match.params.choose_id===undefined){
-            if(checkpointId===undefined){
+        if (this.props.match.params.choose_id === undefined) {
+            if (checkpointId === undefined) {
                 //新建模式
                 let nurl = "/shixuns/" + id + "/challenges/new.json"
                 axios.get(nurl).then((response) => {
 
-                    if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+                    if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
 
-                    }else {
+                    } else {
                         this.setState({
                             choice_url: newchoice_url,
                             practice_url: newpractice_url,
@@ -124,20 +115,20 @@ export default class TPMquestion extends Component {
                             position: response.data.position,
                             task_pass_default: response.data.task_pass_default,
                             submit_url: response.data.submit_url,
-                            power:true,
-                            activetype:"first",
+                            power: true,
+                            activetype: "first",
 
                         })
-                        if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+                        if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
                             this.setState({
-															contentMdRefval:""
+                                contentMdRefval: ""
                             })
                         } else {
 
                             this.setState({
-															contentMdRefval:response.data.task_pass_default
+                                contentMdRefval: response.data.task_pass_default
                             })
-												   	this.contentMdRef.current.setValue(response.data.task_pass_default || '')
+                            this.contentMdRef.current.setValue(response.data.task_pass_default || '')
                         }
                         this.shixunsautoHeight()
                     }
@@ -146,54 +137,54 @@ export default class TPMquestion extends Component {
                     console.log(error)
                 });
 
-            }else{
+            } else {
                 //编辑模式
-                let url = "/shixuns/"+ id +"/challenges/"+checkpointId+"/edit.json?st=1"
+                let url = "/shixuns/" + id + "/challenges/" + checkpointId + "/edit.json?st=1"
                 axios.get(url).then((response) => {
-                    if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+                    if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
 
-                    }else {
-                        let newprev_challenge=response.data.prev_challenge;
-                        let next_challenge=response.data.next_challenge;
+                    } else {
+                        let newprev_challenge = response.data.prev_challenge;
+                        let next_challenge = response.data.next_challenge;
                         if (newprev_challenge != undefined) {
-                            if(newprev_challenge.st===0){
+                            if (newprev_challenge.st === 0) {
                                 newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id + "/editcheckpoint";
-                            }else{
-                                newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id  + "/editquestion";
+                            } else {
+                                newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id + "/editquestion";
                             }
                         }
                         if (next_challenge != undefined) {
-                            if(next_challenge.st===0){
-                                next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editcheckpoint";
-                            }else{
-                                next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editquestion";
+                            if (next_challenge.st === 0) {
+                                next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id + "/editcheckpoint";
+                            } else {
+                                next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id + "/editquestion";
                             }
                         }
                         this.setState({
-                            questionaddtype:false,
-                            newquestionaddtype:false,
-                            activetype:"first",
-                            prev_challenge:newprev_challenge,
-                            next_challenge:next_challenge,
-													questionsInputvalue:response.data.subject,
-                            questionaddarray:response.data.chooses,
-                            challenge_id:response.data.id,
-                            mancheckpointId:checkpointId,
+                            questionaddtype: false,
+                            newquestionaddtype: false,
+                            activetype: "first",
+                            prev_challenge: newprev_challenge,
+                            next_challenge: next_challenge,
+                            questionsInputvalue: response.data.subject,
+                            questionaddarray: response.data.chooses,
+                            challenge_id: response.data.id,
+                            mancheckpointId: checkpointId,
                             position: response.data.position,
                             choice_url: newchoice_url,
                             practice_url: newpractice_url,
                             go_back_url: newgo_back_url,
-                            power:response.data.power,
+                            power: response.data.power,
                             // questioMD:response.data.task_pass,
-                            answer:response.data.answer
+                            answer: response.data.answer
 
                         })
 
-												this.setState({
-													contentMdRefval:response.data.task_pass
-												})
-										  	// this.contentMdRef.current.setValue(response.data.task_pass || '')
-                        if(response.data.chooses.length===0){
+                        this.setState({
+                            contentMdRefval: response.data.task_pass
+                        })
+                        // this.contentMdRef.current.setValue(response.data.task_pass || '')
+                        if (response.data.chooses.length === 0) {
                             // 新建选择题时，没法切回 ‘本关任务’ tab
                             // this.questionadd()
                         }
@@ -206,58 +197,58 @@ export default class TPMquestion extends Component {
                 });
             }
 
-        }else{
+        } else {
             $('html').animate({
-                scrollTop:10
+                scrollTop: 10
             }, 500);
 
-            let{challenge_id} =this.state;
+            let { challenge_id } = this.state;
 
             let id = this.props.match.params.shixunId;
-            let url = "/shixuns/"+ id +"/challenges/"+checkpointId+"/edit.json?st=1"
+            let url = "/shixuns/" + id + "/challenges/" + checkpointId + "/edit.json?st=1"
             axios.get(url).then((response) => {
-                if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+                if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
 
-                }else {
-                    let newprev_challenge=response.data.prev_challenge;
-                    let next_challenge=response.data.next_challenge;
+                } else {
+                    let newprev_challenge = response.data.prev_challenge;
+                    let next_challenge = response.data.next_challenge;
                     if (newprev_challenge != undefined) {
-                        if(newprev_challenge.st===0){
+                        if (newprev_challenge.st === 0) {
                             newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id + "/editcheckpoint";
-                        }else{
-                            newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id  + "/editquestion";
+                        } else {
+                            newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id + "/editquestion";
                         }
                     }
                     if (next_challenge != undefined) {
-                        if(next_challenge.st===0){
-                            next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editcheckpoint";
-                        }else{
-                            next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editquestion";
+                        if (next_challenge.st === 0) {
+                            next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id + "/editcheckpoint";
+                        } else {
+                            next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id + "/editquestion";
                         }
                     }
                     this.setState({
-                        questionaddtype:false,
-                        newquestionaddtype:false,
-                        prev_challenge:newprev_challenge,
-                        next_challenge:next_challenge,
-											questionsInputvalue:response.data.subject,
-                        questionaddarray:response.data.chooses,
-                        challenge_id:response.data.id,
-                        mancheckpointId:checkpointId,
+                        questionaddtype: false,
+                        newquestionaddtype: false,
+                        prev_challenge: newprev_challenge,
+                        next_challenge: next_challenge,
+                        questionsInputvalue: response.data.subject,
+                        questionaddarray: response.data.chooses,
+                        challenge_id: response.data.id,
+                        mancheckpointId: checkpointId,
                         position: response.data.position,
                         choice_url: newchoice_url,
                         practice_url: newpractice_url,
                         go_back_url: newgo_back_url,
-                        power:response.data.power,
+                        power: response.data.power,
                         // questioMD:response.data.task_pass,
 
                     })
 
-										this.setState({
-											contentMdRefval:response.data.task_pass
-										})
-										// this.contentMdRef.current.setValue(response.data.task_pass || '')
-                    if(response.data.chooses.length===0){
+                    this.setState({
+                        contentMdRefval: response.data.task_pass
+                    })
+                    // this.contentMdRef.current.setValue(response.data.task_pass || '')
+                    if (response.data.chooses.length === 0) {
                         this.questionadd()
                     }
                     this.shixunsautoHeight()
@@ -267,35 +258,35 @@ export default class TPMquestion extends Component {
                 console.log(error)
             });
 
-        let zrl ='/shixuns/'+this.props.match.params.shixunId+'/challenges/'+this.props.match.params.checkpointId+'/edit_choose_question.json?choose_id='+this.props.match.params.choose_id;
+            let zrl = '/shixuns/' + this.props.match.params.shixunId + '/challenges/' + this.props.match.params.checkpointId + '/edit_choose_question.json?choose_id=' + this.props.match.params.choose_id;
             axios.get(zrl).then((response) => {
-                if(response.status===200){
-                    let choose_contents=response.data.choose_contents;
-                    let newchoose_contentslist=[]
-                    for(var i=0; i<choose_contents.length; i++){
-                        let a=choose_contents[i];
-                        newchoose_contentslist.push({str:letterArr[a.position],val:a.option_name,type:a.right_key})
+                if (response.status === 200) {
+                    let choose_contents = response.data.choose_contents;
+                    let newchoose_contentslist = []
+                    for (var i = 0; i < choose_contents.length; i++) {
+                        let a = choose_contents[i];
+                        newchoose_contentslist.push({ str: letterArr[a.position], val: a.option_name, type: a.right_key })
                     }
                     this.setState({
-                        activetype:this.props.match.params.choose_id,
-                        editquestionaddtype:true,
-                        questionaddtype:false,
-                        newquestionaddtype:false,
-                        editlist:response.data,
-                        questionlists:newchoose_contentslist,
-                        answeshixunsGroup:response.data.difficult,
-                        answeonshixunsmark:response.data.score,
-                        shixunsskillanswerlist:response.data.tags,
-                        challenge_choose_id:this.props.match.params.choose_id,
-                        standard_answer:response.data.standard_answer,
-                        subject:response.data.subject,
-                        answer:response.data.answer,
-										  	neweditanswerRefval:response.data.subject,
-											editanswersRefval:response.data.answer,
+                        activetype: this.props.match.params.choose_id,
+                        editquestionaddtype: true,
+                        questionaddtype: false,
+                        newquestionaddtype: false,
+                        editlist: response.data,
+                        questionlists: newchoose_contentslist,
+                        answeshixunsGroup: response.data.difficult,
+                        answeonshixunsmark: response.data.score,
+                        shixunsskillanswerlist: response.data.tags,
+                        challenge_choose_id: this.props.match.params.choose_id,
+                        standard_answer: response.data.standard_answer,
+                        subject: response.data.subject,
+                        answer: response.data.answer,
+                        neweditanswerRefval: response.data.subject,
+                        editanswersRefval: response.data.answer,
                     })
 
-								  	this.neweditanswerRef.current.setValue(response.data.subject||'')
-									  this.editanswersRef.current.setValue(response.data.answer||'')
+                    this.neweditanswerRef.current.setValue(response.data.subject || '')
+                    this.editanswersRef.current.setValue(response.data.answer || '')
 
                     this.shixunsautoHeight()
                 }
@@ -307,55 +298,55 @@ export default class TPMquestion extends Component {
         }
     }
 
-    clickquestionsumit=()=>{
-      this.setState({
-        sumittype:true
-      })
-        let checkpointId=this.props.match.params.checkpointId;
-        if(this.props.status===2&&checkpointId===undefined){
+    clickquestionsumit = () => {
+        this.setState({
+            sumittype: true
+        })
+        let checkpointId = this.props.match.params.checkpointId;
+        if (this.props.status === 2 && checkpointId === undefined) {
             this.props.showSnackbar("该实训已经发布不能新建")
             this.setState({
-              sumittype:false
+                sumittype: false
             })
             return
         }
-        let {questionsInputvalue} =this.state;
+        let { questionsInputvalue } = this.state;
         // const exercise_editormdvalue = this.questio_editormd.getValue();
-			const exercise_editormdvalue = this.contentMdRef.current.getValue().trim();
+        const exercise_editormdvalue = this.contentMdRef.current.getValue().trim();
         let id = this.props.match.params.shixunId;
 
-        if(questionsInputvalue===undefined||questionsInputvalue===null||questionsInputvalue===""){
+        if (questionsInputvalue === undefined || questionsInputvalue === null || questionsInputvalue === "") {
             this.setState({
-                questionInputvaluetype:true
+                questionInputvaluetype: true
             })
             $('html').animate({
                 scrollTop: 10
             }, 1000);
             this.setState({
-              sumittype:false
+                sumittype: false
             })
             return
         }
 
 
-        if(exercise_editormdvalue===null ||exercise_editormdvalue===""){
+        if (exercise_editormdvalue === null || exercise_editormdvalue === "") {
             this.setState({
-                questionInputvaluetypes:true
+                questionInputvaluetypes: true
             })
             $('html').animate({
                 scrollTop: 500
             }, 1000);
             this.setState({
-              sumittype:false
+                sumittype: false
             })
             return
         }
-        if(checkpointId===undefined){
+        if (checkpointId === undefined) {
 
             let url = "/shixuns/" + id + "/challenges.json";
 
             axios.post(url, {
-                identifier:id,
+                identifier: id,
                 subject: questionsInputvalue,
                 task_pass: exercise_editormdvalue,
                 st: 1
@@ -370,29 +361,29 @@ export default class TPMquestion extends Component {
                 //
                 //     this.questionadd()
                 // }
-                window.location.href = '/shixuns/'+id+'/challenges/'+response.data.challenge_id+'/editquestion';
+                window.location.href = '/shixuns/' + id + '/challenges/' + response.data.challenge_id + '/editquestion';
 
             }).catch((error) => {
                 console.log(error)
             });
-        }else{
-            let url ="/shixuns/"+id+"/challenges/"+checkpointId+".json";
+        } else {
+            let url = "/shixuns/" + id + "/challenges/" + checkpointId + ".json";
             axios.put(url, {
-                tab:0,
+                tab: 0,
                 subject: questionsInputvalue,
                 task_pass: exercise_editormdvalue,
             }).then((response) => {
-                if(response.data.status===1){
+                if (response.data.status === 1) {
                     this.setState({
-                        questionaddtype:false,
-                        challenge_id:response.data.challenge_id
+                        questionaddtype: false,
+                        challenge_id: response.data.challenge_id
                     })
                 }
                 $('html').animate({
                     scrollTop: 10
                 }, 200);
                 this.props.showSnackbar(response.data.messages);
-                window.location.href = '/shixuns/'+id+'/challenges/'+response.data.challenge_id+'/editquestion';
+                window.location.href = '/shixuns/' + id + '/challenges/' + response.data.challenge_id + '/editquestion';
             }).catch((error) => {
                 console.log(error)
             });
@@ -400,126 +391,126 @@ export default class TPMquestion extends Component {
 
     }
 
-    questionall=()=>{
+    questionall = () => {
         // this.setState({
         //     activetype:"first",
         //     newquestionaddtype:false,
         //     editquestionaddtype:false,
-				// 	  questionaddtype:false
+        // 	  questionaddtype:false
         // })
 
-			window.location.href = '/shixuns/'+this.props.match.params.shixunId+'/challenges/'+this.props.match.params.checkpointId+'/editquestion';
+        window.location.href = '/shixuns/' + this.props.match.params.shixunId + '/challenges/' + this.props.match.params.checkpointId + '/editquestion';
     }
-    questionadd=()=>{
+    questionadd = () => {
 
-        let{questionaddarray}=this.state;
+        let { questionaddarray } = this.state;
 
-        let questionaddsums=questionaddarray.length;
+        let questionaddsums = questionaddarray.length;
 
-        if(questionaddsums-1>9){
-					this.props.showSnackbar("选择题目最大支持设置9道题")
+        if (questionaddsums - 1 > 9) {
+            this.props.showSnackbar("选择题目最大支持设置9道题")
             return
         }
 
-        let questionaddarrays=questionaddarray;
+        let questionaddarrays = questionaddarray;
 
-					questionaddarrays.map((item,key)=>{
-							if(item.choose_id===0){
-								questionaddarrays.splice(key,1)
-							}
-					})
+        questionaddarrays.map((item, key) => {
+            if (item.choose_id === 0) {
+                questionaddarrays.splice(key, 1)
+            }
+        })
 
-        questionaddarrays.push({type:0,choose_id:0});
+        questionaddarrays.push({ type: 0, choose_id: 0 });
         this.setState({
-            activetype:0,
-            questionaddarray:questionaddarrays,
-            questionaddtype:true,
-					  editquestionaddtype:false,
-            newquestionaddtype:true,
-            questionlists:[{str:"A",val:"",type:false},{str:"B",val:"",type:false},{str:"C",val:"",type:false},{str:"D",val:"",type:false}],
+            activetype: 0,
+            questionaddarray: questionaddarrays,
+            questionaddtype: true,
+            editquestionaddtype: false,
+            newquestionaddtype: true,
+            questionlists: [{ str: "A", val: "", type: false }, { str: "B", val: "", type: false }, { str: "C", val: "", type: false }, { str: "D", val: "", type: false }],
             answeshixunsGroup: 1,
-            answeoptions:[10,20],
-            answeonshixunsmark:10,
-            shixunssanswerkillvalue:"",
-            shixunsskillanswerlist:[],
-					  contentMdRefval:"",
-					  newquestioMDMdContval:"",
+            answeoptions: [10, 20],
+            answeonshixunsmark: 10,
+            shixunssanswerkillvalue: "",
+            shixunsskillanswerlist: [],
+            contentMdRefval: "",
+            newquestioMDMdContval: "",
         })
 
 
-			setTimeout(() => {
-				this.newquestioMDMdRef.current.setValue('')
-			}, 1000)
-			setTimeout(() => {
-				this.newquestioMDMdCont.current.setValue('')
-			}, 1500)
-			// this.shixunsautoHeight()
+        setTimeout(() => {
+            this.newquestioMDMdRef.current.setValue('')
+        }, 1000)
+        setTimeout(() => {
+            this.newquestioMDMdCont.current.setValue('')
+        }, 1500)
+        // this.shixunsautoHeight()
     }
 
-    editquestionlists=(newquestionlists)=>{
-        let newlist=newquestionlists;
-        let list=[]
-        for(var i=0; i<newlist.length; i++){
-            if(newlist[i].type===true){
+    editquestionlists = (newquestionlists) => {
+        let newlist = newquestionlists;
+        let list = []
+        for (var i = 0; i < newlist.length; i++) {
+            if (newlist[i].type === true) {
                 list.push(newlist[i].str)
             }
         }
         this.setState({
-            questionlists:newquestionlists,
-            questionlistss:list
+            questionlists: newquestionlists,
+            questionlistss: list
         })
     }
 
 
-    addquestionlists=()=>{
-    let{questionlists} = this.state;
-    let newquestionlists=questionlists;
-    let newli={str:letterArr[questionlists.length],val:"",type:false};
+    addquestionlists = () => {
+        let { questionlists } = this.state;
+        let newquestionlists = questionlists;
+        let newli = { str: letterArr[questionlists.length], val: "", type: false };
         newquestionlists.push(newli);
         this.editquestionlists(newquestionlists);
     }
 
 
-    delquestionlists=(key)=>{
-        let{questionlists} = this.state;
-        let newquestionlists=questionlists;
-        newquestionlists.splice(key,1);
-        for(var i=0; i<newquestionlists.length; i++){
-            newquestionlists[i].str=letterArr[i];
+    delquestionlists = (key) => {
+        let { questionlists } = this.state;
+        let newquestionlists = questionlists;
+        newquestionlists.splice(key, 1);
+        for (var i = 0; i < newquestionlists.length; i++) {
+            newquestionlists[i].str = letterArr[i];
         }
         this.editquestionlists(newquestionlists);
     }
 
 
-    selquestionlists=(key)=>{
-        let{questionlists} = this.state;
-        let newquestionlists=questionlists;
-        if(newquestionlists[key].type===true){
-            newquestionlists[key].type=false;
-        }else if(newquestionlists[key].type===false){
-            newquestionlists[key].type=true;
+    selquestionlists = (key) => {
+        let { questionlists } = this.state;
+        let newquestionlists = questionlists;
+        if (newquestionlists[key].type === true) {
+            newquestionlists[key].type = false;
+        } else if (newquestionlists[key].type === false) {
+            newquestionlists[key].type = true;
         }
 
         this.editquestionlists(newquestionlists);
     }
 
-    onshixunGroupanswe=(e)=> {
+    onshixunGroupanswe = (e) => {
         let optionsum;
         let onshixunsmark;
-        if(e.target.value===1){
-            optionsum=[10,20];
-            onshixunsmark=10;
-        }else if(e.target.value===2){
-            optionsum=[30,40,50,60];
-            onshixunsmark=30;
-        }else if(e.target.value===3){
-            optionsum=[70,80,90,100]
-            onshixunsmark=70;
+        if (e.target.value === 1) {
+            optionsum = [10, 20];
+            onshixunsmark = 10;
+        } else if (e.target.value === 2) {
+            optionsum = [30, 40, 50, 60];
+            onshixunsmark = 30;
+        } else if (e.target.value === 3) {
+            optionsum = [70, 80, 90, 100]
+            onshixunsmark = 70;
         }
         this.setState({
             answeshixunsGroup: e.target.value,
-            answeoptions:optionsum,
-            answeonshixunsmark:onshixunsmark
+            answeoptions: optionsum,
+            answeonshixunsmark: onshixunsmark
         })
     }
     shixunssanswerkill = (e) => {
@@ -530,14 +521,14 @@ export default class TPMquestion extends Component {
     }
     clickshixunsanswerskill = () => {
 
-        let {shixunssanswerkillvalue, shixunsskillanswerlist} = this.state;
+        let { shixunssanswerkillvalue, shixunsskillanswerlist } = this.state;
         if (shixunssanswerkillvalue === "") {
             return
         } else if (shixunssanswerkillvalue === undefined) {
             return
         }
 
-        if(shixunssanswerkillvalue == "" || shixunssanswerkillvalue == undefined || shixunssanswerkillvalue == null || (shixunssanswerkillvalue.length>0 && shixunssanswerkillvalue.trim().length == 0)){
+        if (shixunssanswerkillvalue == "" || shixunssanswerkillvalue == undefined || shixunssanswerkillvalue == null || (shixunssanswerkillvalue.length > 0 && shixunssanswerkillvalue.trim().length == 0)) {
             message.error("输入为空，不能保存！");
             return
         }
@@ -549,129 +540,129 @@ export default class TPMquestion extends Component {
             shixunssanswerkillvalue: ""
         })
     }
-    delshixunssnswerllist=(key)=>{
-        let {shixunsskillanswerlist} = this.state;
+    delshixunssnswerllist = (key) => {
+        let { shixunsskillanswerlist } = this.state;
         let newshixunsskillanswerlist = shixunsskillanswerlist;
         newshixunsskillanswerlist.splice(key, 1);
-         this.setState({
+        this.setState({
             shixunsskillanswerlist: newshixunsskillanswerlist
         })
     }
-    onInputoquestionption=(e,key)=>{
+    onInputoquestionption = (e, key) => {
 
-        $.fn.autoHeight = function(){
-            function autoHeight(elem){
+        $.fn.autoHeight = function () {
+            function autoHeight(elem) {
                 elem.style.height = 'auto';
                 elem.style.maxHeight = '140px';
                 elem.scrollTop = 0; //防抖动
                 elem.style.height = elem.scrollHeight + 'px';
             }
-            this.each(function(){
+            this.each(function () {
                 autoHeight(this);
-                $(this).on('keyup', function(){
+                $(this).on('keyup', function () {
                     autoHeight(this);
                 });
             });
         }
-        $("#"+e.target.id).autoHeight();
+        $("#" + e.target.id).autoHeight();
 
-        let {questionlists}=this.state;
-        let newquestionlists=questionlists;
-        newquestionlists[key].val=e.target.value;
+        let { questionlists } = this.state;
+        let newquestionlists = questionlists;
+        newquestionlists[key].val = e.target.value;
         this.editquestionlists(newquestionlists);
     }
 
-    onshixunsansweSelect=(value)=>{
+    onshixunsansweSelect = (value) => {
         this.setState({
             answeonshixunsmark: value
         })
     }
 
-    answer_subit=(sumtype,challenge_choose_id)=>{
-			$('html').animate({
-				scrollTop:10
-			}, 500);
+    answer_subit = (sumtype, challenge_choose_id) => {
+        $('html').animate({
+            scrollTop: 10
+        }, 500);
 
-        let {challenge_id,questionlists,shixunsskillanswerlist,answeonshixunsmark,answeshixunsGroup,questionaddarray} =this.state;
-        if(challenge_id===undefined){
+        let { challenge_id, questionlists, shixunsskillanswerlist, answeonshixunsmark, answeshixunsGroup, questionaddarray } = this.state;
+        if (challenge_id === undefined) {
             message.error("关卡id为空");
             return
         }
-        let newquestionlists=questionlists;
-        let newlist="";
-        let newtype=[];
-        let newcnt=[];
-        let list=0;
-        for(var i=0; i<newquestionlists.length; i++){
+        let newquestionlists = questionlists;
+        let newlist = "";
+        let newtype = [];
+        let newcnt = [];
+        let list = 0;
+        for (var i = 0; i < newquestionlists.length; i++) {
 
-            if(newquestionlists[i].type===true){
-                newlist=newlist+newquestionlists[i].str;
-            }else{
-                list=list+1
+            if (newquestionlists[i].type === true) {
+                newlist = newlist + newquestionlists[i].str;
+            } else {
+                list = list + 1
             }
             newtype.push(newquestionlists[i].type)
             newcnt.push(newquestionlists[i].val)
         }
 
-       if(list===newquestionlists.length){
-           this.setState({
-               newcnttype:true,
-               newcnttypesum:0
-           })
-           message.error("没有选择答案");
-           $('html').animate({
-               scrollTop:700
-           }, 1000);
-           return
-       }
-        for(var z=0; z<newcnt.length; z++){
+        if (list === newquestionlists.length) {
+            this.setState({
+                newcnttype: true,
+                newcnttypesum: 0
+            })
+            message.error("没有选择答案");
+            $('html').animate({
+                scrollTop: 700
+            }, 1000);
+            return
+        }
+        for (var z = 0; z < newcnt.length; z++) {
 
-            if(newcnt.length===0){
+            if (newcnt.length === 0) {
                 this.setState({
-                    newcnttype:true,
-                    newcnttypesum:1
+                    newcnttype: true,
+                    newcnttypesum: 1
                 })
                 message.error("新增选项为空");
                 $('html').animate({
-                    scrollTop:700
+                    scrollTop: 700
                 }, 1000);
                 return
             }
-            if(newcnt[z]===" "||newcnt[z]===""){
+            if (newcnt[z] === " " || newcnt[z] === "") {
                 this.setState({
-                    newcnttype:true,
-                    newcnttypesum:1
+                    newcnttype: true,
+                    newcnttypesum: 1
                 })
                 message.error("新增选项为空");
                 $('html').animate({
-                    scrollTop:700
+                    scrollTop: 700
                 }, 1000);
                 return
             }
         }
 
 
-        if(shixunsskillanswerlist.length===0){
+        if (shixunsskillanswerlist.length === 0) {
             this.setState({
-                challenge_tagtype:true,
+                challenge_tagtype: true,
             })
             message.error("技能标签为空");
             return
-        }else{
+        } else {
             this.setState({
-                challenge_tagtype:false,
+                challenge_tagtype: false,
             })
         }
-        for(var l=0; l<shixunsskillanswerlist.length; l++){
-            if(shixunsskillanswerlist[l]===""){
+        for (var l = 0; l < shixunsskillanswerlist.length; l++) {
+            if (shixunsskillanswerlist[l] === "") {
                 this.setState({
-                    challenge_tagtype:true,
+                    challenge_tagtype: true,
                 })
                 message.error("技能标签为空");
                 return
-            }else{
+            } else {
                 this.setState({
-                    challenge_tagtype:false,
+                    challenge_tagtype: false,
                 })
             }
         }
@@ -679,112 +670,112 @@ export default class TPMquestion extends Component {
 
 
         let id = this.props.match.params.shixunId;
-        let checkpointId=this.props.match.params.checkpointId
+        let checkpointId = this.props.match.params.checkpointId
         let url;
-        if(sumtype==="edit"){
-					let newquestioMDvalue = this.neweditanswerRef.current.getValue().trim();
-            if(newquestioMDvalue===""||newquestioMDvalue==="请输入选择题的题干内容"){
+        if (sumtype === "edit") {
+            let newquestioMDvalue = this.neweditanswerRef.current.getValue().trim();
+            if (newquestioMDvalue === "" || newquestioMDvalue === "请输入选择题的题干内容") {
                 this.setState({
-                    newquestioMDvaluetype:true,
+                    newquestioMDvaluetype: true,
                 })
                 $('html').animate({
-                    scrollTop:100
+                    scrollTop: 100
                 }, 200);
                 message.error("题干为空");
                 return
             }
 
 
-					  let newnewanswerMDvalue = this.editanswersRef.current.getValue().trim();
+            let newnewanswerMDvalue = this.editanswersRef.current.getValue().trim();
             console.log(newnewanswerMDvalue)
-            if(newnewanswerMDvalue===""||newnewanswerMDvalue===" "){
-                newnewanswerMDvalue=undefined
+            if (newnewanswerMDvalue === "" || newnewanswerMDvalue === " ") {
+                newnewanswerMDvalue = undefined
             }
 
-            url="/shixuns/" + id + "/challenges/" + challenge_id + "/update_choose_question.json?choose_id="+challenge_choose_id;
-            axios.post(url,  {
-                challenge_choose: {subject: newquestioMDvalue, answer: newnewanswerMDvalue, standard_answer:newlist, score: answeonshixunsmark, difficult: answeshixunsGroup},
+            url = "/shixuns/" + id + "/challenges/" + challenge_id + "/update_choose_question.json?choose_id=" + challenge_choose_id;
+            axios.post(url, {
+                challenge_choose: { subject: newquestioMDvalue, answer: newnewanswerMDvalue, standard_answer: newlist, score: answeonshixunsmark, difficult: answeshixunsGroup },
                 challenge_tag: shixunsskillanswerlist,
-                question: {cnt: newcnt},
-                choice: {answer: newtype}
+                question: { cnt: newcnt },
+                choice: { answer: newtype }
             }).then((response) => {
                 // $('html').animate({
                 //     scrollTop: 10
                 // }, 200);
-							$('html').animate({
-								scrollTop: 10
-							}, 200);
+                $('html').animate({
+                    scrollTop: 10
+                }, 200);
 
-							notification.open({
-								message: '提示',
-								description:
-									'修改成功，请点击右侧加号继续添加',
-							});
+                notification.open({
+                    message: '提示',
+                    description:
+                        '修改成功，请点击右侧加号继续添加',
+                });
 
                 this.setState({
-                    questionaddtype:false,
-                    newquestioMDvaluetype:false,
-                    newquestioMDvaluetypes:false,
+                    questionaddtype: false,
+                    newquestioMDvaluetype: false,
+                    newquestioMDvaluetypes: false,
                 })
                 // setTimeout(window.location.href="/shixuns/"+this.props.match.params.shixunId+"/challenges/"+this.props.match.params.checkpointId+"/editquestion"+"/"+response.data.challenge_choose_id,1000)
                 // this.gochooseid()
             }).catch((error) => {
                 console.log(error)
             });
-        }else{
+        } else {
 
-					let newquestioMDvalue = this.newquestioMDMdRef.current.getValue().trim();
-            if(newquestioMDvalue===""||newquestioMDvalue==="请输入选择题的题干内容"){
+            let newquestioMDvalue = this.newquestioMDMdRef.current.getValue().trim();
+            if (newquestioMDvalue === "" || newquestioMDvalue === "请输入选择题的题干内容") {
                 this.setState({
-                    newquestioMDvaluetype:true,
+                    newquestioMDvaluetype: true,
                 })
                 $('html').animate({
-                    scrollTop:100
+                    scrollTop: 100
                 }, 200);
                 message.error("题干为空");
                 return
             }
             let newnewanswerMDvalue = this.newquestioMDMdCont.current.getValue().trim();
 
-            if(newnewanswerMDvalue===""||newnewanswerMDvalue===" "){
-                newnewanswerMDvalue=undefined
+            if (newnewanswerMDvalue === "" || newnewanswerMDvalue === " ") {
+                newnewanswerMDvalue = undefined
             }
-            url="/shixuns/" + id + "/challenges/" + challenge_id + "/create_choose_question.json";
-            axios.post(url,  {
-                challenge_choose: {subject: newquestioMDvalue, answer: newnewanswerMDvalue, standard_answer:newlist , score: answeonshixunsmark, difficult: answeshixunsGroup},
+            url = "/shixuns/" + id + "/challenges/" + challenge_id + "/create_choose_question.json";
+            axios.post(url, {
+                challenge_choose: { subject: newquestioMDvalue, answer: newnewanswerMDvalue, standard_answer: newlist, score: answeonshixunsmark, difficult: answeshixunsGroup },
                 challenge_tag: shixunsskillanswerlist,
-                question: {cnt: newcnt},
-                choice: {answer: newtype}
+                question: { cnt: newcnt },
+                choice: { answer: newtype }
             }).then((response) => {
 
-                let questionaddsums=questionaddarray.length;
-                let questionaddarrays=questionaddarray;
-                questionaddarrays[questionaddsums-1].choose_id=response.data.challenge_choose_id;
-                if(newlist.length===1){
-                    questionaddarrays[questionaddsums-1].type=1;
-                }else if(newlist.length>1){
-                    questionaddarrays[questionaddsums-1].type=2;
+                let questionaddsums = questionaddarray.length;
+                let questionaddarrays = questionaddarray;
+                questionaddarrays[questionaddsums - 1].choose_id = response.data.challenge_choose_id;
+                if (newlist.length === 1) {
+                    questionaddarrays[questionaddsums - 1].type = 1;
+                } else if (newlist.length > 1) {
+                    questionaddarrays[questionaddsums - 1].type = 2;
                 }
                 this.setState({
-                    challenge_choose_id:response.data.challenge_choose_id,
-                    questionaddtype:false,
-                    editquestionaddtype:false,
-                    newquestioMDvaluetype:false,
-                    newquestioMDvaluetypes:false,
-                    questionaddarray:questionaddarrays
+                    challenge_choose_id: response.data.challenge_choose_id,
+                    questionaddtype: false,
+                    editquestionaddtype: false,
+                    newquestioMDvaluetype: false,
+                    newquestioMDvaluetypes: false,
+                    questionaddarray: questionaddarrays
                 })
                 $('html').animate({
                     scrollTop: 10
                 }, 200);
 
-								notification.open({
-									message: '提示',
-									description:
-										'新建成功，请点击右侧加号继续添加',
-								});
-							window.location.href=`/shixuns/${id}/challenges/${checkpointId}/editquestion/${response.data.challenge_choose_id}`;
+                notification.open({
+                    message: '提示',
+                    description:
+                        '新建成功，请点击右侧加号继续添加',
+                });
+                window.location.href = `/shixuns/${id}/challenges/${checkpointId}/editquestion/${response.data.challenge_choose_id}`;
 
-							// this.getanswer_subitlist()
+                // this.getanswer_subitlist()
                 // this.gochooseid("/shixuns/"+this.props.match.params.shixunId+"/challenges/"+this.props.match.params.checkpointId+"/editquestion"+"/"+response.data.challenge_choose_id)
             }).catch((error) => {
                 console.log(error)
@@ -794,65 +785,65 @@ export default class TPMquestion extends Component {
 
     }
 
-    questionlist=(key,challenge_choose_id,type)=>{
+    questionlist = (key, challenge_choose_id, type) => {
         $('html').animate({
-            scrollTop:10
+            scrollTop: 10
         }, 500);
 
-        let{challenge_id} =this.state;
+        let { challenge_id } = this.state;
 
-        if(challenge_choose_id===""||type===0){
+        if (challenge_choose_id === "" || type === 0) {
 
 
-					  // this.neweditanswerRef.current.setValue('')
-				  	// this.editanswersRef.current.setValue('')
+            // this.neweditanswerRef.current.setValue('')
+            // this.editanswersRef.current.setValue('')
             this.setState({
-                activetype:challenge_choose_id,
-                editquestionaddtype:true,
-                questionaddtype:true,
-                newquestionaddtype:false,
-                questionlists:[{str:"A",val:"",type:false},{str:"B",val:"",type:false},{str:"C",val:"",type:false},{str:"D",val:"",type:false}],
+                activetype: challenge_choose_id,
+                editquestionaddtype: true,
+                questionaddtype: true,
+                newquestionaddtype: false,
+                questionlists: [{ str: "A", val: "", type: false }, { str: "B", val: "", type: false }, { str: "C", val: "", type: false }, { str: "D", val: "", type: false }],
                 answeshixunsGroup: 1,
-                answeoptions:[10,20],
-                answeonshixunsmark:10,
-                shixunssanswerkillvalue:"",
-                shixunsskillanswerlist:[],
-						  	neweditanswerRefval:'',
-						  	editanswersRefval:''
+                answeoptions: [10, 20],
+                answeonshixunsmark: 10,
+                shixunssanswerkillvalue: "",
+                shixunsskillanswerlist: [],
+                neweditanswerRefval: '',
+                editanswersRefval: ''
             })
-					this.newquestioMDMdRef.current.setValue('')
-					this.newquestioMDMdCont.current.setValue('')
-        }else{
+            this.newquestioMDMdRef.current.setValue('')
+            this.newquestioMDMdCont.current.setValue('')
+        } else {
             let id = this.props.match.params.shixunId;
-            let url ='/shixuns/'+id+'/challenges/'+challenge_id+'/edit_choose_question.json?choose_id='+challenge_choose_id;
+            let url = '/shixuns/' + id + '/challenges/' + challenge_id + '/edit_choose_question.json?choose_id=' + challenge_choose_id;
             axios.get(url).then((response) => {
-                if(response.status===200){
-                    let choose_contents=response.data.choose_contents;
-                    let newchoose_contentslist=[]
-                    for(var i=0; i<choose_contents.length; i++){
-                        let a=choose_contents[i];
-                        newchoose_contentslist.push({str:letterArr[a.position],val:a.option_name,type:a.right_key})
+                if (response.status === 200) {
+                    let choose_contents = response.data.choose_contents;
+                    let newchoose_contentslist = []
+                    for (var i = 0; i < choose_contents.length; i++) {
+                        let a = choose_contents[i];
+                        newchoose_contentslist.push({ str: letterArr[a.position], val: a.option_name, type: a.right_key })
                     }
                     this.setState({
-                        activetype:challenge_choose_id,
-                        editquestionaddtype:true,
-                        questionaddtype:false,
-                        newquestionaddtype:false,
-                        editlist:response.data,
-                        questionlists:newchoose_contentslist,
-                        answeshixunsGroup:response.data.difficult,
-                        answeonshixunsmark:response.data.score,
-                        shixunsskillanswerlist:response.data.tags,
-                        challenge_choose_id:challenge_choose_id,
-                        standard_answer:response.data.standard_answer,
-                        subject:response.data.subject,
-                        answer:response.data.answer,
-										  	neweditanswerRefval:response.data.subject,
-											  editanswersRefval:response.data.subject
+                        activetype: challenge_choose_id,
+                        editquestionaddtype: true,
+                        questionaddtype: false,
+                        newquestionaddtype: false,
+                        editlist: response.data,
+                        questionlists: newchoose_contentslist,
+                        answeshixunsGroup: response.data.difficult,
+                        answeonshixunsmark: response.data.score,
+                        shixunsskillanswerlist: response.data.tags,
+                        challenge_choose_id: challenge_choose_id,
+                        standard_answer: response.data.standard_answer,
+                        subject: response.data.subject,
+                        answer: response.data.answer,
+                        neweditanswerRefval: response.data.subject,
+                        editanswersRefval: response.data.subject
                     })
 
-								  	this.neweditanswerRef.current.setValue(response.data.subject||'')
-								  	this.editanswersRef.current.setValue(response.data.answer||'')
+                    this.neweditanswerRef.current.setValue(response.data.subject || '')
+                    this.editanswersRef.current.setValue(response.data.answer || '')
                     this.shixunsautoHeight()
                 }
 
@@ -864,42 +855,42 @@ export default class TPMquestion extends Component {
 
     }
 
-    shixunsautoHeight=()=>{
-    $.fn.autoHeight = function(){
-        function autoHeight(elem){
-            elem.style.height = 'auto';
-            elem.style.maxHeight = '140px';
-            elem.scrollTop = 0; //防抖动
-            if(elem.scrollHeight===0){
-                elem.style.height = 62 + 'px';
-            }else{
+    shixunsautoHeight = () => {
+        $.fn.autoHeight = function () {
+            function autoHeight(elem) {
+                elem.style.height = 'auto';
+                elem.style.maxHeight = '140px';
+                elem.scrollTop = 0; //防抖动
+                if (elem.scrollHeight === 0) {
+                    elem.style.height = 62 + 'px';
+                } else {
+
+                    elem.style.height = elem.scrollHeight + 'px';
+                }
 
-                elem.style.height = elem.scrollHeight + 'px';
             }
-
-        }
-        this.each(function(){
-            autoHeight(this);
-            $(this).on('keyup', function(){
+            this.each(function () {
                 autoHeight(this);
+                $(this).on('keyup', function () {
+                    autoHeight(this);
+                });
             });
-        });
-    }
-    $('textarea[autoHeight]').autoHeight();
+        }
+        $('textarea[autoHeight]').autoHeight();
     }
 
-    gochooseid=(url)=>{
-     window.location.href =url
-			// window.location.Reload(url)
-			// this.props.history.replace( url );
-			// this.props.history.push( url );
-		//	返回
-		// 	this.props.history.goBack();
+    gochooseid = (url) => {
+        window.location.href = url
+        // window.location.Reload(url)
+        // this.props.history.replace( url );
+        // this.props.history.push( url );
+        //	返回
+        // 	this.props.history.goBack();
     }
 
     render() {
 
-        let {choice_url,
+        let { choice_url,
             practice_url,
             go_back_url,
             position,
@@ -914,7 +905,7 @@ export default class TPMquestion extends Component {
             next_challenge,
             answer,
 
-             } = this.state;
+        } = this.state;
 
         let options;
 
@@ -929,51 +920,51 @@ export default class TPMquestion extends Component {
             <React.Fragment>
                 <div className="educontent mt30 mb30">
                     <div className="padding10-20 mb10 edu-back-white clearfix">
-                    <span className="fl ring-blue mr10 mt7" style={{lineHeight:"15px"}}>
-                        <img src={getImageUrl("images/educoder/icon/choose.svg")} data-tip-down="实训任务"/>
-                    </span>
+                        <span className="fl ring-blue mr10 mt7" style={{ lineHeight: "15px" }}>
+                            <img src={getImageUrl("images/educoder/icon/choose.svg")} data-tip-down="实训任务" />
+                        </span>
                         <span className="font-16 task-hide fl TPMtaskName">第{position}关</span>
                         <Link to={go_back_url === undefined ? "" : go_back_url}
-                              className="color-grey-6 fr font-15 mt3">返回</Link>
-                        { prev_challenge===undefined?"":
+                            className="color-grey-6 fr font-15 mt3">返回</Link>
+                        {prev_challenge === undefined ? "" :
                             <a href={prev_challenge} className="fr color-blue mr15 mt4">上一关</a>
                         }
 
-                        { next_challenge===undefined?"":
-                            <a href={next_challenge}className="fr color-blue mr15 mt4">下一关</a>
+                        {next_challenge === undefined ? "" :
+                            <a href={next_challenge} className="fr color-blue mr15 mt4">下一关</a>
                         }
 
                         <a href={practice_url === undefined ? "" : practice_url}
-                           className="fr color-blue mr15 mt4"
-                           style={{display:this.props.identity>4||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
-                           data-tip-down="新增代码编辑类型的任务">+&nbsp;实践类型</a>
+                            className="fr color-blue mr15 mt4"
+                            style={{ display: this.props.identity > 4 || this.props.identity === undefined || this.props.status === 2 || this.props.status === 1 ? "none" : 'block' }}
+                            data-tip-down="新增代码编辑类型的任务">+&nbsp;实践类型</a>
                         <a href={choice_url === undefined ? "" : choice_url} className="fr color-blue mr15 mt4"
-                           style={{display:this.props.identity>4||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
-                           data-tip-down="新增选择题类型的任务">+&nbsp;选择题类型</a>
+                            style={{ display: this.props.identity > 4 || this.props.identity === undefined || this.props.status === 2 || this.props.status === 1 ? "none" : 'block' }}
+                            data-tip-down="新增选择题类型的任务">+&nbsp;选择题类型</a>
 
                     </div>
 
                     <div className="challenge_nav clearfix edu-back-white question_nav">
 
-											<Popconfirm title="切换前请确认当前选择题已提交，否则不会保存你当前所有输入！" okText="确定" cancelText="取消" onConfirm={this.questionall}>
-												<li className={activetype==="first"?"click_active active":""}>
-													<a>本关任务</a>
-												</li>
-											</Popconfirm>
+                        <Popconfirm title="切换前请确认当前选择题已提交，否则不会保存你当前所有输入！" okText="确定" cancelText="取消" onConfirm={this.questionall}>
+                            <li className={activetype === "first" ? "click_active active" : ""}>
+                                <a>本关任务</a>
+                            </li>
+                        </Popconfirm>
 
                         {
-                            questionaddarray.length===0?"":questionaddarray.map((item,key)=>{
-                                return(
+                            questionaddarray.length === 0 ? "" : questionaddarray.map((item, key) => {
+                                return (
                                     <li key={key}
-                                        className={parseInt(activetype)===item.choose_id?"click_active active":""}
-                                        onClick={parseInt(activetype)===item.choose_id?()=>this.questionlist(key,item.choose_id,item.type):""}
+                                        className={parseInt(activetype) === item.choose_id ? "click_active active" : ""}
+                                        onClick={parseInt(activetype) === item.choose_id ? () => this.questionlist(key, item.choose_id, item.type) : ""}
                                     >
 
                                         {
-                                             item.choose_id!=0?
-                                                <Popconfirm title="切换前请确认当前选择题已提交，否则不会保存你当前所有输入！" okText="确定" cancelText="取消" onConfirm={()=>this.gochooseid("/shixuns/"+this.props.match.params.shixunId+"/challenges/"+this.props.match.params.checkpointId+"/editquestion"+"/"+item.choose_id)}>
-                                                    <a>{key+1}.{item.type===2?"多选题":item.type===1?"单选题":'选择题'}</a>
-                                                </Popconfirm>:activetype==="first"?"":<a>{key+1}.{item.type===2?"多选题":item.type===1?"单选题":'选择题'}</a>
+                                            item.choose_id != 0 ?
+                                                <Popconfirm title="切换前请确认当前选择题已提交，否则不会保存你当前所有输入！" okText="确定" cancelText="取消" onConfirm={() => this.gochooseid("/shixuns/" + this.props.match.params.shixunId + "/challenges/" + this.props.match.params.checkpointId + "/editquestion" + "/" + item.choose_id)}>
+                                                    <a>{key + 1}.{item.type === 2 ? "多选题" : item.type === 1 ? "单选题" : '选择题'}</a>
+                                                </Popconfirm> : activetype === "first" ? "" : <a>{key + 1}.{item.type === 2 ? "多选题" : item.type === 1 ? "单选题" : '选择题'}</a>
                                         }
 
                                     </li>
@@ -983,66 +974,66 @@ export default class TPMquestion extends Component {
 
 
                         <li onClick={this.questionadd}
-                            style={{display:questionaddtype===true||this.props.status===2?"none":"block"}}>
+                            style={{ display: questionaddtype === true || this.props.status === 2 ? "none" : "block" }}>
                             <Tooltip placement="bottom" title={"新增选择题"}>
-                                <a className="add_choose_type" style={{width:'50px'}}>+</a>
+                                <a className="add_choose_type" style={{ width: '50px' }}>+</a>
                             </Tooltip>
                         </li>
 
                     </div>
 
-									{/*x选择题首页*/}
-									{activetype==="first"?<TpmQuestionMain
-										{...this.props}
-										{...this.state}
-										contentMdRef={this.contentMdRef}
-										questionInputvalue={(e)=>this.questionInputvalue(e)}
-										clickquestionsumit={(e)=>this.clickquestionsumit(e)}
+                    {/*x选择题首页*/}
+                    {activetype === "first" ? <TpmQuestionMain
+                        {...this.props}
+                        {...this.state}
+                        contentMdRef={this.contentMdRef}
+                        questionInputvalue={(e) => this.questionInputvalue(e)}
+                        clickquestionsumit={(e) => this.clickquestionsumit(e)}
 
-									/>:""}
+                    /> : ""}
 
                     {/*新建*/}
 
-                    {newquestionaddtype===true?
-											<TpmQuestionNew
-												{...this.props}
-												{...this.state}
-												newquestioMDMdRef={this.newquestioMDMdRef}
-												newquestioMDMdCont={this.newquestioMDMdCont}
-												options={options}
-												selquestionlists={(key)=>this.selquestionlists(key)}
-												onInputoquestionption={(e,key)=>this.onInputoquestionption(e,key)}
-												delquestionlists={(key)=>this.delquestionlists(key)}
-												addquestionlists={(e)=>this.addquestionlists(e)}
-												onshixunGroupanswe={(e)=>this.onshixunGroupanswe(e)}
-												onshixunsansweSelect={(e)=>this.onshixunsansweSelect(e)}
-												shixunssanswerkill={(e)=>this.shixunssanswerkill(e)}
-												clickshixunsanswerskill={(e)=>this.clickshixunsanswerskill(e)}
-												delshixunssnswerllist={(key)=>this.delshixunssnswerllist(key)}
-												answer_subit={()=>this.answer_subit()}
-											/>:""}
+                    {newquestionaddtype === true ?
+                        <TpmQuestionNew
+                            {...this.props}
+                            {...this.state}
+                            newquestioMDMdRef={this.newquestioMDMdRef}
+                            newquestioMDMdCont={this.newquestioMDMdCont}
+                            options={options}
+                            selquestionlists={(key) => this.selquestionlists(key)}
+                            onInputoquestionption={(e, key) => this.onInputoquestionption(e, key)}
+                            delquestionlists={(key) => this.delquestionlists(key)}
+                            addquestionlists={(e) => this.addquestionlists(e)}
+                            onshixunGroupanswe={(e) => this.onshixunGroupanswe(e)}
+                            onshixunsansweSelect={(e) => this.onshixunsansweSelect(e)}
+                            shixunssanswerkill={(e) => this.shixunssanswerkill(e)}
+                            clickshixunsanswerskill={(e) => this.clickshixunsanswerskill(e)}
+                            delshixunssnswerllist={(key) => this.delshixunssnswerllist(key)}
+                            answer_subit={() => this.answer_subit()}
+                        /> : ""}
 
 
-                        {/*修改*/}
-                    {editquestionaddtype===true?
-											<TpmQuestionEdit
-												{...this.props}
-												{...this.state}
-												neweditanswerRef={this.neweditanswerRef}
-												editanswersRef={this.editanswersRef}
-												options={options}
-												selquestionlists={(key)=>this.selquestionlists(key)}
-												onInputoquestionption={(e,key)=>this.onInputoquestionption(e,key)}
-												delquestionlists={(key)=>this.delquestionlists(key)}
-												addquestionlists={(e)=>this.addquestionlists(e)}
-												onshixunGroupanswe={(e)=>this.onshixunGroupanswe(e)}
-												onshixunsansweSelect={(e)=>this.onshixunsansweSelect(e)}
-												shixunssanswerkill={(e)=>this.shixunssanswerkill(e)}
-												clickshixunsanswerskill={(e)=>this.clickshixunsanswerskill(e)}
-												delshixunssnswerllist={(key)=>this.delshixunssnswerllist(key)}
-												answer_subit={()=>this.answer_subit("edit",challenge_choose_id)}
-											/>
-                    :""}
+                    {/*修改*/}
+                    {editquestionaddtype === true ?
+                        <TpmQuestionEdit
+                            {...this.props}
+                            {...this.state}
+                            neweditanswerRef={this.neweditanswerRef}
+                            editanswersRef={this.editanswersRef}
+                            options={options}
+                            selquestionlists={(key) => this.selquestionlists(key)}
+                            onInputoquestionption={(e, key) => this.onInputoquestionption(e, key)}
+                            delquestionlists={(key) => this.delquestionlists(key)}
+                            addquestionlists={(e) => this.addquestionlists(e)}
+                            onshixunGroupanswe={(e) => this.onshixunGroupanswe(e)}
+                            onshixunsansweSelect={(e) => this.onshixunsansweSelect(e)}
+                            shixunssanswerkill={(e) => this.shixunssanswerkill(e)}
+                            clickshixunsanswerskill={(e) => this.clickshixunsanswerskill(e)}
+                            delshixunssnswerllist={(key) => this.delshixunssnswerllist(key)}
+                            answer_subit={() => this.answer_subit("edit", challenge_choose_id)}
+                        />
+                        : ""}
 
                 </div>
             </React.Fragment>
diff --git a/src/modules/tpm/challengesnew/css/TPMchallengesnew.css b/src/modules/tpm/challengesnew/css/TPMchallengesnew.css
index a65c3b7f..d09ef1e3 100644
--- a/src/modules/tpm/challengesnew/css/TPMchallengesnew.css
+++ b/src/modules/tpm/challengesnew/css/TPMchallengesnew.css
@@ -1,331 +1,408 @@
 .CodeMirror-scroll {
-    overflow: auto !important;
-    margin-bottom: -30px;
-    margin-right: -30px;
-    padding-bottom: 30px;
-    height: 100%;
-    outline: none;
-    position: relative;
+  overflow: auto !important;
+  margin-bottom: -30px;
+  margin-right: -30px;
+  padding-bottom: 30px;
+  height: 100%;
+  outline: none;
+  position: relative;
 }
+
 a.white-btn.orange-btn:hover {
-    border: 1px solid #F06200;
-    color: #FFF !important;
+  border: 1px solid #F06200;
+  color: #FFF !important;
 }
+
 .flex1 a.white-btn.orange-btn:hover {
-    border: 1px solid #F06200;
-    color: #FFF !important;
+  border: 1px solid #F06200;
+  color: #FFF !important;
 }
 
 /*.challenge_nav li a{*/
-    /*color:#000 !important;*/
+/*color:#000 !important;*/
 /*}*/
 
-.questionli{
-    width: 95%;
-    margin-left: 37px;
-}
-#directory_file{
-    height:200px;
-    overflow-y:auto;
-    background:#f5f5f5;
-    padding:10px;
-}
-.directory_filepath{
-    width:120px;
-    text-align:left;
+.questionli {
+  width: 95%;
+  margin-left: 37px;
 }
 
-a{
-    text-decoration: none;
-    color: #05101a;
+#directory_file {
+  height: 200px;
+  overflow-y: auto;
+  background: #f5f5f5;
+  padding: 10px;
 }
-.repository_url_tippostion{
-    position: absolute;
-    left: 22%;
-    width: 500px;
-    top: 100%;
+
+.directory_filepath {
+  width: 120px;
+  text-align: left;
+}
+
+a {
+  text-decoration: none;
+  color: #05101a;
+}
+
+.repository_url_tippostion {
+  position: absolute;
+  left: 22%;
+  width: 500px;
+  top: 100%;
 }
 
 .top-black-trangleft {
-    display: block;
-    border-width: 8px;
-    position: absolute;
-    top: -16px;
-    /* right: 4px; */
-    border-style: dashed solid dashed dashed;
-    border-color: transparent transparent rgba(5,16,26,0.6) transparent;
-    font-size: 0;
-    line-height: 0;
+  display: block;
+  border-width: 8px;
+  position: absolute;
+  top: -16px;
+  /* right: 4px; */
+  border-style: dashed solid dashed dashed;
+  border-color: transparent transparent rgba(5, 16, 26, 0.6) transparent;
+  font-size: 0;
+  line-height: 0;
 }
 
 #exercisememoMD .CodeMirror {
-    margin-top: 31px !important;
-    height: 370px !important;
-    /*width: 579px !important;*/
+  margin-top: 31px !important;
+  height: 370px !important;
+  /*width: 579px !important;*/
 }
 
 #exercisememoMD .editormd-preview {
-    top: 40px !important;
-    height: 370px !important;
-    width: 578px !important;
+  top: 40px !important;
+  height: 370px !important;
+  width: 578px !important;
 }
-#exercisememoMD{
-    /*height: 700px !important;*/
+
+#exercisememoMD {
+  /*height: 700px !important;*/
 }
-#questioMD{
-    /*width: 95% !important;*/
-    height: 417px !important;
-    margin-left: 0% !important;
+
+#questioMD {
+  /*width: 95% !important;*/
+  height: 417px !important;
+  margin-left: 0% !important;
 }
 
 
 #questioMD .CodeMirror {
-    /*width: 550.5px !important;*/
-    margin-top: 31px !important;
-    height: 374px !important;
+  /*width: 550.5px !important;*/
+  margin-top: 31px !important;
+  height: 374px !important;
 }
 
 #questioMD .editormd-preview {
-    top: 40px !important;
-    height: 375px !important;
-    width: 550px !important;
+  top: 40px !important;
+  height: 375px !important;
+  width: 550px !important;
 }
 
 #newquestioMD .CodeMirror {
-    /*width: 549px !important;*/
-    margin-top: 31px !important;
-    height: 364px !important;
+  /*width: 549px !important;*/
+  margin-top: 31px !important;
+  height: 364px !important;
 }
 
 #newquestioMD .editormd-preview {
-    top: 40px !important;
-    height: 364px !important;
-    width: 578px !important;
+  top: 40px !important;
+  height: 364px !important;
+  width: 578px !important;
 }
 
 #challenge_choose_answer .CodeMirror {
-    margin-top: 31px !important;
-    height: 364px !important;
-    /*width: 578px !important;*/
+  margin-top: 31px !important;
+  height: 364px !important;
+  /*width: 578px !important;*/
 }
 
 
 #challenge_choose_answer .editormd-preview {
-    top: 40px !important;
-    height: 364px !important;
-    width: 578px !important;
+  top: 40px !important;
+  height: 364px !important;
+  width: 578px !important;
 }
 
 #neweditanswer .CodeMirror {
-    margin-top: 31px !important;
-    height: 364px !important;
-    /*width: 549.5px !important;*/
+  margin-top: 31px !important;
+  height: 364px !important;
+  /*width: 549.5px !important;*/
 }
 
 #neweditanswer .editormd-preview {
-    top: 40px !important;
-    height: 364px !important;
-    width: 551px !important;
+  top: 40px !important;
+  height: 364px !important;
+  width: 551px !important;
 }
 
 #repository_url_tip {
-    top: 30px !important;
-    left: 249px !important;
-    width: 292px !important;
+  top: 30px !important;
+  left: 249px !important;
+  width: 292px !important;
 }
 
-#editanswers .CodeMirror{
-    /*width: 548px !important;*/
-    height: 358px !important;
-    margin-top: 30px !important;
-}
-#editanswers .editormd-preview{
-    width: 578px !important;
-    height: 358px !important;
-
-}
-#newquestioMDs .CodeMirror{
-    /*width: 510px !important;*/
-    height: 358px !important;
-    margin-top: 30px !important;
+#editanswers .CodeMirror {
+  /*width: 548px !important;*/
+  height: 358px !important;
+  margin-top: 30px !important;
 }
 
-#newquestioMDs .editormd-preview{
-    width: 578px !important;
-    height: 358px !important;
+#editanswers .editormd-preview {
+  width: 578px !important;
+  height: 358px !important;
+
 }
 
-.choose_names{
-    width: 80px;
-    margin-left: 20px;
+#newquestioMDs .CodeMirror {
+  /*width: 510px !important;*/
+  height: 358px !important;
+  margin-top: 30px !important;
 }
 
-#answerMD .CodeMirror{
-    /*width: 569px !important;*/
-    height: 600px !important;
-    margin-top: 30px !important;
+#newquestioMDs .editormd-preview {
+  width: 578px !important;
+  height: 358px !important;
 }
 
-#answerMD .editormd-preview{
-    width: 578px !important;
-    height: 600px !important;
+.choose_names {
+  width: 80px;
+  margin-left: 20px;
+}
+
+#answerMD .CodeMirror {
+  /*width: 569px !important;*/
+  height: 600px !important;
+  margin-top: 30px !important;
+}
+
+#answerMD .editormd-preview {
+  width: 578px !important;
+  height: 600px !important;
 }
 
 #answerMD {
-    height: 600px !important;
+  height: 600px !important;
 }
 
-.textareavalue{
-    width: 100%;
-    padding: 5px;
+.textareavalue {
+  width: 100%;
+  padding: 5px;
 
-    box-sizing: border-box;
-}
-.greyInput{
-    width: 107%;
-}
-.greyInpus{
-    width: 100%;
+  box-sizing: border-box;
 }
 
-.pdr20{
-    padding-right:20px;
+.greyInput {
+  width: 107%;
+}
+
+.greyInpus {
+  width: 100%;
+}
+
+.pdr20 {
+  padding-right: 20px;
 }
 
 .winput-240-40s {
-    background-color: #F5F5F5;
+  background-color: #F5F5F5;
 }
 
 
-.winput-240-40s:focus{
-    background-color: #fff;
+.winput-240-40s:focus {
+  background-color: #fff;
 }
-.input-100-45{
-    background-color: #F5F5F5;
-}
-.input-100-45:focus{
-     background-color: #fff;
- }
 
-.wind100{
-    width:100% !important;
+.input-100-45 {
+  background-color: #F5F5F5;
+}
+
+.input-100-45:focus {
+  background-color: #fff;
+}
+
+.wind100 {
+  width: 100% !important;
 }
 
 .color-bule-tip {
-    color: #5485f7 !important;
-}
-.martopf4{
-    margin-top:-4px;
+  color: #5485f7 !important;
 }
 
-.headdfgf{
-    display: block;
-    width: 100px;
-    height: 30px;
-    line-height: 30px;
-    float: left;
+.martopf4 {
+  margin-top: -4px;
 }
 
-.color979797{
-    color: #979797 !important;
+.headdfgf {
+  display: block;
+  width: 100px;
+  height: 30px;
+  line-height: 30px;
+  float: left;
 }
 
-.border-left{
-    width: 0;
-    height: 0;
-    border-bottom: 6px solid transparent;
-    border-right: 6px solid #cccbcb;
-    border-top: 6px solid transparent;
-    position: absolute;
-    left: 30px;
-    top: 12px;
-}
-.border-left span{
-    display: block;
-    width: 0;
-    height: 0;
-    border-bottom: 6px solid transparent;
-    border-right: 6px solid #fff;
-    border-top: 6px solid transparent;
-    position: absolute;
-    left: 1px;
-    top: -6px;
-    z-index: 10;
-}
-.fillTip{
-    position: absolute;
-    left: 36px;
-    top: 2px;
-    width: 125px;
-    font-size: 12px;
-    display: block;
-    padding: 5px;
-    border: 1px solid #eaeaea;
-    border-radius: 5px;
-    box-sizing: border-box;
-    height: 32px;
-    line-height: 20px;
-    font-family: "微软雅黑","宋体";
+.color979797 {
+  color: #979797 !important;
 }
 
-.borderbottomf4{
-    border-bottom:1px solid #F4F4F4;
+.border-left {
+  width: 0;
+  height: 0;
+  border-bottom: 6px solid transparent;
+  border-right: 6px solid #cccbcb;
+  border-top: 6px solid transparent;
+  position: absolute;
+  left: 30px;
+  top: 12px;
 }
 
-.TPMchallengesnewtitles{
-    height: 76px;
-    line-height: 56px;
-    padding: 10px 20px;
+.border-left span {
+  display: block;
+  width: 0;
+  height: 0;
+  border-bottom: 6px solid transparent;
+  border-right: 6px solid #fff;
+  border-top: 6px solid transparent;
+  position: absolute;
+  left: 1px;
+  top: -6px;
+  z-index: 10;
 }
 
-.newpadding1020{
-    padding: 20px 20px 20px;
-    box-sizing: border-box;
+.fillTip {
+  position: absolute;
+  left: 36px;
+  top: 2px;
+  width: 125px;
+  font-size: 12px;
+  display: block;
+  padding: 5px;
+  border: 1px solid #eaeaea;
+  border-radius: 5px;
+  box-sizing: border-box;
+  height: 32px;
+  line-height: 20px;
+  font-family: "微软雅黑", "宋体";
 }
-.newpadding02020{
-    padding: 0px 20px 20px;
+
+.borderbottomf4 {
+  border-bottom: 1px solid #F4F4F4;
 }
+
+.TPMchallengesnewtitles {
+  height: 76px;
+  line-height: 56px;
+  padding: 10px 20px;
+}
+
+.newpadding1020 {
+  padding: 20px 20px 20px;
+  box-sizing: border-box;
+}
+
+.newpadding02020 {
+  padding: 0px 20px 20px;
+}
+
 .mb10 {
-    margin-bottom: 10px !important;
+  margin-bottom: 10px !important;
 }
 
-.tpmpointer{
-    cursor: pointer;
-}
-.text-centers{text-align:center}
-.bor25510211{
-    width: 1180px;
-    height: 34px;
-    border: 1px solid rgba(255,102,1,1);
-    line-height: 34px;
+.tpmpointer {
+  cursor: pointer;
 }
 
-.padding1020tpms{
-    padding: 10px 20px;
-    box-sizing: border-box;
+.text-centers {
+  text-align: center
 }
 
-.bortopeeetpm{
-    border-top: 1px solid #eee;
+.bor25510211 {
+  width: 1180px;
+  height: 34px;
+  border: 1px solid rgba(255, 102, 1, 1);
+  line-height: 34px;
+}
+
+.padding1020tpms {
+  padding: 10px 20px;
+  box-sizing: border-box;
+}
+
+.bortopeeetpm {
+  border-top: 1px solid #eee;
 }
 
 .borbottomeeetpm {
-    border-bottom: 1px solid #eee;
+  border-bottom: 1px solid #eee;
 }
 
-.height40pxtpm{
-    height:40px
+.height40pxtpm {
+  height: 40px
 }
 
-.ml41{
-    margin-left: 41px;
+.ml41 {
+  margin-left: 41px;
 }
 
-.wind500height45{
-    width: 500px;
-    height: 45px;
+.wind500height45 {
+  width: 500px;
+  height: 45px;
 }
 
-.newaddswermargin{
-    margin: 0 auto;
+.newaddswermargin {
+  margin: 0 auto;
+}
+
+.editor-resize {
+  display: block;
+  width: 120px;
+  height: 4px;
+  left: 54%;
+  transform: translateX(-50%);
+  margin-top: 2px;
+  border-top: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
+  cursor: row-resize;
+  white-space: nowrap;
+  overflow: hidden;
+  text-transform: capitalize;
+  box-sizing: border-box;
+  margin: 0 auto;
+}
+
+.mini .editormd-toolbar li {
+  padding: 0;
+}
+
+.mini .editormd-toolbar {
+  min-height: 28px;
+
+}
+
+.mini .editormd-toolbar .editormd-toolbar-container {
+  min-height: 28px;
+}
+
+.mini .editormd-toolbar i {
+  margin-left: 0px;
+}
+
+
+.mini .editormd-preview {
+  top: 30px;
+}
+
+.mini .CodeMirror {
+  margin-top: 30px;
+}
+
+.zbg {
+  background: url("/images/edu_user/richEditer.png") -195px -2px no-repeat;
+  height: 18px;
+  cursor: pointer
+}
+
+.zbg_latex {
+  background: url("/images/edu_user/richEditer.png") -315px -3px no-repeat;
+  height: 18px;
+  cursor: pointer;
 }
\ No newline at end of file
diff --git a/src/modules/tpm/challengesnew/editorMD.js b/src/modules/tpm/challengesnew/editorMD.js
deleted file mode 100644
index 26d21d86..00000000
--- a/src/modules/tpm/challengesnew/editorMD.js
+++ /dev/null
@@ -1,122 +0,0 @@
-import React, {Component} from 'react';
-
-import {getUrl,getUploadActionUrl} from 'educoder';
-
-let path = getUrl("/editormd/lib/");
-
-const $ = window.$;
-
-function create_editorMD(id, width, high, placeholder, imageUrl, callback) {
-    var editorName = window.editormd(id, {
-        width: width,
-        height: high,
-        path: path,   // "/editormd/lib/"
-
-        syncScrolling: "single",
-        tex: true,
-        tocm: true,
-        emoji: true,
-        taskList: true,
-        codeFold: true,
-        searchReplace: true,
-        htmlDecode: "style,script,iframe",
-        sequenceDiagram: true,
-        autoFocus: false,
-        toolbarIcons: function () {
-            // Or return editormd.toolbarModes[name]; // full, simple, mini
-            // Using "||" set icons align right.
-            return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
-        },
-        toolbarCustomIcons: {
-            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
-        },
-        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
-        saveHTMLToTextarea: true,
-        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-        dialogMaskOpacity: 0.6,
-        placeholder: placeholder,
-        imageUpload: true,
-        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-        imageUploadURL: imageUrl,//url
-        onload: function () {
-            // this.previewing();
-            $("#" + id + " [type=\"latex\"]").bind("click", function () {
-                editorName.cm.replaceSelection("```latex");
-                editorName.cm.replaceSelection("\n");
-                editorName.cm.replaceSelection("\n");
-                editorName.cm.replaceSelection("```");
-                var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line - 1, 0);
-            });
-
-            $("#" + id + " [type=\"inline\"]").bind("click", function () {
-                editorName.cm.replaceSelection("`$$$$`");
-                var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 3);
-                editorName.cm.focus();
-            });
-            $("[type=\"inline\"]").attr("title", "行内公式");
-            $("[type=\"latex\"]").attr("title", "多行公式");
-
-            window.md_elocalStorage(editorName, `MemoQuestion_${id}`, `${id}Question`);
-
-            callback && callback()
-        }
-    });
-    return editorName;
-}
-
-
-export default class TPMeditorMD extends Component {
-    constructor(props) {
-        super(props)
-
-    }
-    componentDidMount() {
-
-
-    }
-
-    questioMD=(initValue, id)=> {
-
-        this.contentChanged = false;
-        const placeholder = "";
-// amp;
-// 编辑时要传memoId
-        // const imageUrl = `/upload_with_markdown?container_id=&container_type=Memo`;
-        const imageUrl = `${getUploadActionUrl()}`;
-// 创建editorMd
-
-        let questio_editormd = create_editorMD(id, '100%', 400, placeholder, imageUrl, () => {
-            setTimeout(() => {
-                questio_editormd.resize()
-                questio_editormd.cm && questio_editormd.cm.refresh()
-            }, 500)
-
-            if (initValue != undefined) {
-                questio_editormd.setValue(initValue)
-            }
-            questio_editormd.cm.on("change", (_cm, changeObj) => {
-                console.log('....contentChanged')
-                this.contentChanged = true;
-            })
-        });
-        this.questio_editormd = questio_editormd;
-        window.questio_editormd = questio_editormd;
-
-    }
-
-    componentWillReceiveProps(newProps) {
-        this.questioMD(newProps.value,newProps.id)
-    }
-    render() {
-          return (
-            <div className="padding10-20 edu-back-greyf5 radius4" id="questioMD">
-                <textarea style={{display: 'none'}} id="questioadd" name="content"> </textarea>
-                <div className="CodeMirror cm-s-defualt">
-                </div>
-            </div>
-        )
-    }
-}
diff --git a/src/modules/tpm/challengesnew/old/TPManswer.js b/src/modules/tpm/challengesnew/old/TPManswer.js
deleted file mode 100644
index 350a5ca8..00000000
--- a/src/modules/tpm/challengesnew/old/TPManswer.js
+++ /dev/null
@@ -1,367 +0,0 @@
-import React, {Component} from 'react';
-
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
-
-import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
-
-// import "antd/dist/antd.css";
-
-import { getImageUrl, getUploadActionUrl, getUrl } from 'educoder';
-
-import axios from 'axios';
-
-import '../css/TPMchallengesnew.css';
-
-let origin = getUrl();
-
-let path = getUrl("/editormd/lib/")
-
-const $ = window.$;
-
-let timeout;
-
-let currentValue;
-
-const Option = Select.Option;
-
-const RadioGroup = Radio.Group;
-
-
-// 恢复数据
-function md_rec_data(k,mdu,id, editor){
-    if(window.sessionStorage.getItem(k+mdu) !== null){
-        editor.setValue(window.sessionStorage.getItem(k+mdu));
-        md_clear_data(k,mdu,id);
-    }
-}
-
-// 保存数据
-function md_add_data(k,mdu,d){
-    window.sessionStorage.setItem(k+mdu,d);
-}
-
-// 清空保存的数据
-function md_clear_data(k,mdu,id){
-    window.sessionStorage.removeItem(k+mdu);
-    var id1 = "#e_tip_"+id;
-    var id2 = "#e_tips_"+id;
-    if(k == 'content'){
-        $(id2).html("");
-    }else{
-        $(id1).html("");
-    }
-}
-
-function md_elocalStorage(editor,mdu,id){
-    if (window.sessionStorage){
-        var oc = window.sessionStorage.getItem('content'+mdu);
-        if(oc !== null ){
-            console.log("#e_tips_"+id)
-            $("#e_tips_"+id).data('editor', editor);
-            var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" class="link-color-blue" onclick="md_rec_data(\'content\',\''+ mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="link-color-blue" onclick="md_clear_data(\'content\',\''+ mdu + '\',\'' + id + '\')">不恢复</a>';
-            $("#e_tips_"+id).html(h);
-        }
-        setInterval(function() {
-            var d = new Date();
-            var h = d.getHours();
-            var m = d.getMinutes();
-            var s = d.getSeconds();
-            h = h < 10 ? '0' + h : h;
-            m = m < 10 ? '0' + m : m;
-            s = s < 10 ? '0' + s : s;
-            if(editor.getValue().trim() != ""){
-                md_add_data("content",mdu,editor.getValue());
-                var id1 = "#e_tip_"+id;
-                var id2 = "#e_tips_"+id;
-
-                $(id1).html(" 数据已于 " + h + ':' + m + ':' + s +" 保存   ");
-                $(id2).html("");
-            }
-        },10000);
-
-    }else{
-        $("#e_tip_"+id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
-    }
-}
-
-
-function create_editorMD(id, width, high, placeholder, imageUrl, callback) {
-    var editorName = window.editormd(id, {
-        width: width,
-        height: high,
-        path: path,   // "/editormd/lib/"
-
-        syncScrolling: "single",
-        tex: true,
-        tocm: true,
-        emoji: true,
-        taskList: true,
-        codeFold: true,
-        searchReplace: true,
-        htmlDecode: "style,script,iframe",
-        sequenceDiagram: true,
-        autoFocus: false,
-        toolbarIcons: function () {
-            // Or return editormd.toolbarModes[name]; // full, simple, mini
-            // Using "||" set icons align right.
-            return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
-        },
-        toolbarCustomIcons: {
-            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
-        },
-        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
-        saveHTMLToTextarea: true,
-        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-        dialogMaskOpacity: 0.6,
-        placeholder: placeholder,
-        imageUpload: true,
-        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-        imageUploadURL: imageUrl,//url
-        onload: function () {
-            // this.previewing();
-            $("#" + id + " [type=\"latex\"]").bind("click", function () {
-                editorName.cm.replaceSelection("```latex");
-                editorName.cm.replaceSelection("\n");
-                editorName.cm.replaceSelection("\n");
-                editorName.cm.replaceSelection("```");
-                var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line - 1, 0);
-            });
-
-            $("#" + id + " [type=\"inline\"]").bind("click", function () {
-                editorName.cm.replaceSelection("`$$$$`");
-                var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 3);
-                editorName.cm.focus();
-            });
-            $("[type=\"inline\"]").attr("title", "行内公式");
-            $("[type=\"latex\"]").attr("title", "多行公式");
-
-            md_elocalStorage(editorName, `answers__${id}`, "Memoanswers");
-
-            callback && callback()
-        }
-    });
-    return editorName;
-}
-
-
-export default class TPManswer extends Component {
-    constructor(props) {
-        super(props)
-        this.state = {
-            choice_url: undefined,
-            practice_url: undefined,
-            go_back_url: undefined,
-            value: 1,
-            answer:"",
-            id:undefined,
-            checkpointId:undefined,
-            power: false,
-            prev_challenge: undefined,
-            next_challenge: undefined,
-        }
-    }
-
-    answerMD(initValue, id) {
-
-        this.contentChanged = false;
-        const placeholder = "";
-        // amp;
-        // 编辑时要传memoId
-        const imageUrl = `${getUploadActionUrl()}`;
-        // 创建editorMd
-
-        const answers_editormd = create_editorMD(id, '100%', 400, placeholder, imageUrl, () => {
-            setTimeout(() => {
-                answers_editormd.resize()
-                answers_editormd.cm && answers_editormd.cm.refresh()
-            }, 500)
-
-            if (initValue != undefined) {
-                answers_editormd.setValue(initValue)
-            }
-            answers_editormd.cm.on("change", (_cm, changeObj) => {
-                console.log('....contentChanged')
-                this.contentChanged = true;
-            })
-        });
-        this.answers_editormd = answers_editormd;
-        window.answers_editormd = answers_editormd;
-
-    }
-
-    componentDidMount() {
-        let id = this.props.match.params.shixunId;
-        let checkpointId=this.props.match.params.checkpointId;
-
-        let newchoice_url= "/shixuns/"+id+"/challenges/newquestion";
-        let newpractice_url= "/shixuns/"+id+"/challenges/new";
-        let newgo_back_url="/shixuns/"+id+"/challenges";
-        this.setState({
-            shixunId:id,
-            checkpointId:checkpointId
-        })
-
-
-        let url = "/shixuns/" + id + "/challenges/" + checkpointId + "/edit.json?tab=2";
-        axios.get(url).then((response) => {
-            let newprev_challenge = response.data.prev_challenge;
-            let next_challenge = response.data.next_challenge;
-            if (newprev_challenge != undefined) {
-                if(newprev_challenge.st===0){
-                    newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id + "/editcheckpoint";
-                }else{
-                    newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id  + "/editquestion";
-                }
-            }
-            if (next_challenge != undefined) {
-
-                if(next_challenge.st===0){
-                    next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editcheckpoint";
-                }else{
-                    next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editquestion";
-                }
-            }
-            this.setState({
-                answer:response.data.answer,
-                power: response.data.power,
-                choice_url: newchoice_url,	//	导航中的新建选择题url
-                practice_url: newpractice_url,	//string	导航中新建实践题url
-                go_back_url: newgo_back_url,	//string	导航中的返回url
-                position: response.data.position,	//int	关卡位置，导航栏中的第几关
-                prev_challenge: newprev_challenge,
-                next_challenge: next_challenge,
-             })
-
-            if(response.data.power===false){
-                this.props.showSnackbar("没有权限修改");
-            }
-            if(response.data.answer===undefined||response.data.answer===null){
-                this.answerMD("", "answerMD");
-            }else{
-                this.answerMD(response.data.answer, "answerMD");
-            }
-
-        }).catch((error) => {
-            console.log(error)
-        });
-    }
-
-    challenge_answer_submit=()=> {
-        let id = this.props.match.params.shixunId;
-        let{checkpointId}=this.state;
-        let url = "/shixuns/"+id+"/challenges/"+checkpointId+".json";
-        const answer_editormdvalue = this.answers_editormd.getValue();
-
-        axios.put(url,{
-            tab:2,
-            identifier:id,
-            id:checkpointId,
-            challenge:{
-                answer:answer_editormdvalue
-            }
-            }
-        ).then((response) => {
-            this.props.showSnackbar(response.data.messages);
-
-        }).catch((error) => {
-            console.log(error)
-        });
-    }
-
-    render() {
-
-        let {
-            choice_url,
-            practice_url,
-            go_back_url,
-            position,
-            task_pass_default,
-            submit_url,
-            shixunId,
-            checkpointId,
-            power,
-            prev_challenge,
-            next_challenge,
-        } = this.state;
-        let tab1url="/shixuns/" + shixunId + "/challenges/"+checkpointId+"/editcheckpoint";
-        let tab2url="/shixuns/" + shixunId + "/challenges/"+checkpointId+"/tab=2";
-        let tab3url="/shixuns/" + shixunId + "/challenges/"+checkpointId+"/tab=3";
-        // console.log(this.props)
-        return (
-            <React.Fragment>
-                <div className="educontent mt30 mb30">
-                    <div className="padding10-20 mb10 edu-back-white clearfix">
-                        <span className="fl ring-blue mr10 mt7">
-                            <img src={getImageUrl("images/educoder/icon/code.svg")} data-tip-down="实训任务" className="fl mt2 ml2"/>
-                        </span>
-                        <span className="font-16 task-hide fl TPMtaskName">第{position}关</span>
-                        <Link to={go_back_url === undefined ? "" : go_back_url}
-                              className="color-grey-6 fr font-15 mt3">返回</Link>
-
-                        {prev_challenge === undefined ? "" :
-                            <a href={prev_challenge} className="fr color-blue mr15 mt4">上一关</a>
-                        }
-
-                        {next_challenge === undefined ? "" :
-                            <a href={next_challenge} className="fr color-blue mr15 mt4">下一关</a>
-                        }
-
-                        <a href={practice_url === undefined ? "" : practice_url}
-                              className="fr color-blue mr15 mt4"
-                              style={{display:this.props.status===2||this.props.status===1?'none':'block'}}
-                              data-tip-down="新增代码编辑类型的任务">+&nbsp;实践类型</a>
-                        <a href={choice_url === undefined ? "" : choice_url}
-                              className="fr color-blue mr15 mt4"
-                              style={{display:this.props.status===2||this.props.status===1?'none':'block'}}
-                              data-tip-down="新增选择题类型的任务">+&nbsp;选择题类型</a>
-
-                    </div>
-
-                    <div className="challenge_nav clearfix edu-back-white">
-
-                        <li>
-                            <Link to={tab1url}>本关任务</Link>
-                        </li>
-
-                        <li >
-                            <Link to={tab2url}>评测设置</Link>
-                        </li>
-
-                        <li className="active">
-                            <Link to={tab3url}>参考答案</Link>
-                        </li>
-                    </div>
-
-                    <div className="edu-back-white mb10 clearfix">
-
-                        <div className="padding40-20">
-                            <p className="color-grey-6 font-16 mb30">参考答案</p>
-                            <div className="df">
-                                <div className="padding10-20 edu-back-greyf5 radius4" id="answerMD">
-                                 <textarea style={{display: 'none'}}  id="evaluate_script_show" name="content"> </textarea>
-                                    <div className="CodeMirror cm-s-defualt">
-                                    </div>
-                                </div>
-                            </div>
-                            <p id="e_tip_Memoanswers" className="edu-txt-right color-grey-cd font-12"></p>
-                            <p id="e_tips_Memoanswers" className="edu-txt-right color-grey-cd font-12"></p>
-                        </div>
-
-                    </div>
-
-                    <div className="clearfix mt20" style={{display:this.props.identity>4||this.props.identity===undefined||power===false?"none":"block"}}>
-                        <a className="defalutSubmitbtn fl mr20"
-                           onClick={this.challenge_answer_submit}>提交</a>
-                        {/*<a href={"/shixuns/" + shixunId + "/challenges"} className="defalutCancelbtn fl">取消</a>*/}
-                        <Link to={"/shixuns/" + shixunId + "/challenges"} className={"defalutCancelbtn fl"}>取消</Link>
-                    </div>
-                </div>
-            </React.Fragment>
-        )
-    }
-}
-
-
diff --git a/src/modules/tpm/challengesnew/old/TPMchallengesnew.js b/src/modules/tpm/challengesnew/old/TPMchallengesnew.js
deleted file mode 100644
index 6dfc04ee..00000000
--- a/src/modules/tpm/challengesnew/old/TPMchallengesnew.js
+++ /dev/null
@@ -1,617 +0,0 @@
-import React, {Component} from 'react';
-
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
-
-import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
-
-// import "antd/dist/antd.css";
-
-import TPMMDEditor from '../TPMMDEditor';
-
-import axios from 'axios';
-
-import '../css/TPMchallengesnew.css';
-
-import { getImageUrl, toPath } from 'educoder';
-
-import {getUrl} from 'educoder';
-
-let origin = getUrl();
-
-let path = getUrl("/editormd/lib/")
-
-const $ = window.$;
-
-let timeout;
-
-let currentValue;
-
-const Option = Select.Option;
-
-const RadioGroup = Radio.Group;
-
-export default class TPMchallengesnew extends Component {
-    constructor(props) {
-        super(props)
-			  this.exercisememoMDRef=React.createRef();
-        this.state = {
-            choice_url: undefined,
-            practice_url: undefined,
-            go_back_url: undefined,
-            task_pass_default: undefined,
-            submit_url: undefined,
-            shixunCreatePracticeGroup: 1,
-            optionsums:[100,200],
-            activetype:0,
-            setopen: false,
-            shixunCreatePractice: undefined,
-            onshixunsmarkvalue: 100,
-            shixunsskillvalue: undefined,
-            shixunsskillvaluelist: [],
-            tab2url: "",
-            tab3url: "",
-            prev_challenge:undefined,
-            next_challenge:undefined,
-            power: false,
-            shixunCreatePracticetype: false,
-            shixunsskillvaluelisttype: false,
-            marktype:false,
-            editPracticesendtype:false,
-            CreatePracticesendtype:false,
-					  exec_time:20,
-					  shixunExec_timeType:false
-        }
-    }
-
-
-    componentDidMount() {
-        let id = this.props.match.params.shixunId;
-        let checkpointId=this.props.match.params.checkpointId;
-
-        let newchoice_url= "/shixuns/"+id+"/challenges/newquestion";
-        let newpractice_url= "/shixuns/"+id+"/challenges/new";
-        let newgo_back_url="/shixuns/"+id+"/challenges"
-        if(checkpointId===undefined){
-            //新建模式
-            let url = "/shixuns/" + id + "/challenges/new.json"
-            axios.get(url).then((response) => {
-                this.setState({
-                    choice_url: newchoice_url,
-                    practice_url: newpractice_url,
-                    go_back_url: newgo_back_url,
-                    position: response.data.position,
-                    task_pass_default: response.data.task_pass_default,
-                    submit_url: response.data.submit_url,
-                    checkpointId:checkpointId,
-									exercisememoMDRefval:response.data.task_pass_default
-                })
-
-							this.exercisememoMDRef.current.setValue(response.data.task_pass_default||'')
-            }).catch((error) => {
-                console.log(error)
-            });
-        }else{
-            //编辑模式
-            let url="/shixuns/"+id+"/challenges/"+checkpointId+".json?tab=0";
-            axios.get(url).then((response) => {
-
-                let optionsum;
-                if(response.data.difficulty===1){
-                    optionsum=[100,200];
-                }else if(response.data.difficulty===2){
-                    optionsum=[300,400,500,600];
-                }else if(response.data.difficulty===3){
-                    optionsum=[700,800,900,1000]
-                }
-                let newprev_challenge=response.data.prev_challenge;
-                let next_challenge=response.data.next_challenge;
-                if (newprev_challenge != undefined) {
-                    if(newprev_challenge.st===0){
-                        newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id + "/editcheckpoint";
-                    }else{
-                        newprev_challenge = "/shixuns/" + id + "/challenges/" + newprev_challenge.id  + "/editquestion";
-                    }
-                }
-                if (next_challenge != undefined) {
-                    if(next_challenge.st===0){
-                        next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editcheckpoint";
-                    }else{
-                        next_challenge = "/shixuns/" + id + "/challenges/" + next_challenge.id+ "/editquestion";
-                    }
-                }
-                this.setState({
-                    power: response.data.power,
-                    prev_challenge:newprev_challenge,
-                    next_challenge:next_challenge,
-                    choice_url: newchoice_url,
-                    practice_url: newpractice_url,
-                    go_back_url: newgo_back_url,
-                    shixunCreatePractice:response.data.subject,
-                    position:response.data.position,
-                    shixunCreatePracticeGroup:response.data.difficulty,
-                    optionsums:optionsum,
-                    onshixunsmarkvalue:response.data.score,
-                    shixunsskillvaluelist:response.data.tags,
-                    checkpointId:checkpointId,
-									  exec_time:response.data.exec_time,
-                    tab2url: "/shixuns/" + id + "/challenges/"+checkpointId+"/tab=2",
-                    tab3url: "/shixuns/" + id + "/challenges/"+checkpointId+"/tab=3",
-									exercisememoMDRefval:response.data.task_pass
-                })
-                if(response.data.power===false){
-                    this.props.showSnackbar("你没有权限修改");
-                }
-
-							this.exercisememoMDRef.current.setValue(response.data.task_pass||'')
-            }).catch((error) => {
-                console.log(error)
-            });
-
-        }
-
-    }
-
-    onshixunCreatePracticeChange = (e) => {
-        let optionsum;
-        let onshixunsmark;
-        if(e.target.value===1){
-            optionsum=[100,200];
-            onshixunsmark=100;
-        }else if(e.target.value===2){
-            optionsum=[300,400,500,600];
-            onshixunsmark=300;
-        }else if(e.target.value===3){
-            optionsum=[700,800,900,1000]
-            onshixunsmark=700;
-        }
-        this.setState({
-            shixunCreatePracticeGroup: e.target.value,
-            optionsums:optionsum,
-            onshixunsmarkvalue:onshixunsmark
-        })
-    }
-
-    shixunCreatePractice = (e) => {
-        this.setState({
-            shixunCreatePractice: e.target.value
-        })
-    }
-
-    CreatePracticesend = () => {
-
-
-			this.setState({
-        CreatePracticesendtype:true
-      })
-
-        if(this.props.status===2){
-            this.props.showSnackbar("该实训已经发布不能新建")
-            this.setState({
-              CreatePracticesendtype:false
-            })
-            return
-        }
-        let {shixunCreatePractice, shixunCreatePracticeGroup, onshixunsmarkvalue, shixunsskillvaluelist,exec_time} = this.state;
-        if (shixunCreatePractice === undefined||shixunCreatePractice=="") {
-            this.setState({
-                shixunCreatePracticetype: true
-            })
-            this.props.showSnackbar("任务名称为空")
-                $('html').animate({
-                scrollTop: 10
-            }, 1000);
-
-          this.setState({
-            CreatePracticesendtype:false
-          })
-            return
-        }
-
-        if (shixunsskillvaluelist.length === 0) {
-            this.setState({
-                shixunsskillvaluelisttype: true,
-              CreatePracticesendtype:false
-            })
-            this.props.showSnackbar("技能标签为空")
-            return
-        }
-			if(exec_time===null||exec_time===undefined||exec_time===""){
-
-				this.setState({
-					shixunExec_timeType:false
-				})
-				return
-			}
-
-        const exercise_editormdvalue = this.exercisememoMDRef.current.getValue().trim();
-        let id = this.props.match.params.shixunId;
-
-        let url = "/shixuns/" + id + "/challenges.json";
-
-        axios.post(url, {
-            identifier:id,
-            subject: shixunCreatePractice,
-            task_pass: exercise_editormdvalue,
-            difficulty: shixunCreatePracticeGroup,
-            score: onshixunsmarkvalue,
-            challenge_tag: shixunsskillvaluelist,
-            st: 0,
-					  exec_time:exec_time
-        }).then((response) => {
-            if (response.data.status === 1) {
-						// $("html").animate({ scrollTop: 0 })
-						//window.location.href=`/shixuns/${id}/challenges/${response.data.challenge_id}/editcheckpoint?tab=2`;
-							window.location.href=`/shixuns/${id}/challenges/${response.data.challenge_id}/tab=2`;
-							// this.setState({
-							// 		setopen: true,
-							// 		CreatePracticesendtype:false,
-							// 		tab2url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=2",
-							// 		tab3url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=3",
-							// })
-
-            }
-					// this.props.showSnackbar(response.data.messages);
-        }).catch((error) => {
-            console.log(error)
-        });
-
-
-
-    }
-
-    onshixunsmark = (value) => {
-        this.setState({
-            onshixunsmarkvalue: value
-        })
-    }
-
-    shixunsskill = (e) => {
-        this.setState({
-            shixunsskillvalue: e.target.value
-        })
-    }
-
-    clickshixunsskill = () => {
-
-        let {shixunsskillvalue, shixunsskillvaluelist} = this.state;
-        if (shixunsskillvalue === "") {
-            return
-        } else if (shixunsskillvalue === undefined) {
-            return
-        }
-
-        if(shixunsskillvalue == "" || shixunsskillvalue == undefined || shixunsskillvalue == null || (shixunsskillvalue.length>0 && shixunsskillvalue.trim().length == 0)){
-            message.error("输入为空，不能保存！");
-            return
-        }
-
-         let list = shixunsskillvaluelist;
-        list.push(shixunsskillvalue);
-        this.setState({
-            shixunsskillvaluelist: list,
-            shixunsskillvalue: ""
-        })
-    }
-
-    delshixunsskilllist = (key) => {
-        let {shixunsskillvaluelist} = this.state;
-        let newshixunsskillvaluelist = shixunsskillvaluelist;
-        newshixunsskillvaluelist.splice(key, 1);
-        this.setState({
-            shixunsskillvaluelist: newshixunsskillvaluelist
-        })
-    }
-
-    editPracticesend=()=>{
-
-        this.setState({
-          editPracticesendtype:true
-        })
-
-        let {shixunCreatePractice, shixunCreatePracticeGroup, onshixunsmarkvalue, shixunsskillvaluelist,checkpointId,exec_time} = this.state;
-
-			const exercise_editormdvalue = this.exercisememoMDRef.current.getValue().trim();
-
-        let id = this.props.match.params.shixunId;
-
-        let url = "/shixuns/"+id+"/challenges/"+checkpointId+".json";
-
-        if (shixunCreatePractice === undefined||shixunCreatePractice=="") {
-            // this.setState({
-            //     shixunCreatePracticetype: true
-            // })
-            this.props.showSnackbar("任务名称为空")
-            $('html').animate({
-                scrollTop: 10
-            }, 1000);
-            this.setState({
-              editPracticesendtype:false
-            })
-            return
-        }
-
-        if (shixunsskillvaluelist.length === 0) {
-            // this.setState({
-            //     shixunsskillvaluelisttype: true
-            // })
-            this.props.showSnackbar("技能标签为空")
-            this.setState({
-              editPracticesendtype:false
-            })
-            return
-        }
-
-        if(exec_time===null||exec_time===undefined||exec_time===""){
-
-					this.setState({
-						shixunExec_timeType:false
-					})
-					return
-				}
-        axios.put(url, {
-            tab:0,
-            identifier:id,
-            id:checkpointId,
-            challenge:{
-                subject: shixunCreatePractice,
-                task_pass: exercise_editormdvalue,
-                difficulty: shixunCreatePracticeGroup,
-                score: onshixunsmarkvalue,
-							  exec_time:exec_time
-            },
-            challenge_tag:shixunsskillvaluelist
-        }).then((response) => {
-            this.props.showSnackbar(response.data.messages);
-            if (response.data.status === 1) {
-						  	window.location.href=`/shixuns/${id}/challenges/${checkpointId}/tab=2`;
-                this.setState({
-                    setopen: true,
-								  	editPracticesendtype:false,
-                    tab2url: "/shixuns/" + id + "/challenges/"+checkpointId+"/tab=2",
-                    tab3url: "/shixuns/" + id + "/challenges/"+checkpointId+"/tab=3",
-                })
-                // window.location.href = "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=2"
-            }
-        }).catch((error) => {
-            console.log(error)
-        });
-
-
-    }
-
-    onshixunsmarks=()=> {
-        this.setState({
-            marktype:true
-        })
-    }
-
-    onshixunsmarkss=()=> {
-        this.setState({
-            marktype:false
-        })
-    }
-
-		setexec_time=(e)=>{
-				this.setState({
-					exec_time:e.target.value
-				})
-		}
-    render() {
-
-        let shixuntype = this.props.match.params.type;
-
-
-        let {marktype,
-            shixunCreatePracticetype, shixunsskillvaluelisttype,
-            choice_url, practice_url, go_back_url, position, task_pass_default, submit_url, setopen,checkpointId,prev_challenge,next_challenge,power,
-            shixunCreatePractice, shixunCreatePracticeGroup, onshixunsmarkvalue, shixunsskillvalue, shixunsskillvaluelist, tab2url, tab3url,optionsums,
-            CreatePracticesendtype,editPracticesendtype
-        } = this.state;
-
-        let options;
-        if(optionsums!=undefined){
-					options = optionsums.map((d, k) => {
-						return (
-							<Option key={d} id={k}>{d}</Option>
-						)
-					})
-				}
-
-        return (
-            <React.Fragment>
-                <div className="educontent mt30 mb30">
-                    <div className="padding10-20 mb10 edu-back-white clearfix">
-                        <span className="fl ring-blue mr10 mt7">
-                            <img src={getImageUrl("images/educoder/icon/code.svg")} data-tip-down="实训任务" className="fl mt2 ml2"/>
-                        </span>
-                        <span className="font-16 task-hide fl TPMtaskName">第{position}关</span>
-
-                        <Link to={go_back_url === undefined ? "" : go_back_url}
-                              className="color-grey-6 fr font-15 mt3">返回</Link>
-											  { next_challenge===undefined?"":
-													<a href={next_challenge}className="fr color-blue mr15 mt4">下一关</a>
-												}
-                        { prev_challenge===undefined?"":
-                            <a href={prev_challenge} className="fr color-blue mr15 mt4">上一关</a>
-                        }
-
-
-
-
-                        <a href={practice_url === undefined ? "" : practice_url}
-                           className="fr color-blue mr15 mt4"
-                           style={{display:this.props.identity>4||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
-                           data-tip-down="新增代码编辑类型的任务">+&nbsp;实践类型</a>
-
-                        <a href={choice_url === undefined ? "" : choice_url}
-                           className="fr color-blue mr15 mt4"
-                           style={{display:this.props.identity>4||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
-                           data-tip-down="新增选择题类型的任务">+&nbsp;选择题类型</a>
-
-                    </div>
-
-                    <div className="challenge_nav clearfix edu-back-white">
-
-                        <li className="active">
-                            <a>本关任务</a>
-                        </li>
-
-                        <li className="">
-                            {tab2url === "" ? <span>评测设置</span> : <Link to={tab2url}>评测设置</Link>}
-                        </li>
-
-                        <li className="">
-                            {tab3url === "" ? <span>参考答案</span> : <Link to={tab3url}>参考答案</Link>}
-
-                        </li>
-                    </div>
-
-                    <div className="edu-back-white mb10 clearfix">
-                        <div className="padding40-20">
-                            <p className="color-grey-6 font-16 mb30">任务名称</p>
-                            <div className="df">
-                                <span className="mr30 color-orange pt10">*</span>
-                                <div className="flex1 mr20">
-                                    <input type="text"
-                                           // className="input-100-45 greyInput"
-                                           className={shixunCreatePracticetype===true?"input-100-45 greyInpus wind100":"input-100-45 greyInput "}
-                                           maxLength="50"
-                                           name="challenge[subject]"
-                                           value={shixunCreatePractice}
-                                           onInput={this.shixunCreatePractice}
-                                           placeholder="请输入任务名称（此信息将提前展示给学员）,例：计算学生的课程成绩绩点"/>
-                                </div>
-                                <div style={{width: '57px'}}>
-                                <span
-                                className={shixunCreatePracticetype === true ? "color-orange mt8 fl  block" : "color-orange mt8 fl none"}
-                                id="new_shixun_name"><i
-                                className="fa fa-exclamation-circle mr3"></i>必填项</span>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-
-                    <div className="edu-back-white padding40-20 mb20">
-
-                        <p className="color-grey-6 font-16 mb30">过关任务</p>
-
-											<TPMMDEditor ref={this.exercisememoMDRef} placeholder="请输入选择题的题干内容" mdID={'exercisememoMD'} refreshTimeout={1500}
-																	 watch={true}  className="courseMessageMD" initValue={this.state.exercisememoMDRefval} height={700}></TPMMDEditor>
-
-                        <p id="e_tip_Memochallengesnew" className="edu-txt-right color-grey-cd font-12"></p>
-                        <p id="e_tips_Memochallengesnew" className="edu-txt-right color-grey-cd font-12"></p>
-                    </div>
-
-
-                    <div className="edu-back-white padding40-20 mb20">
-                        <p className="color-grey-6 font-16 mb30">难度系数</p>
-                        <div className="clearfix mb40">
-
-                            <RadioGroup value={shixunCreatePracticeGroup} className="fl mr40"
-                                        disabled={this.props.status===2?true:false}
-                                        onChange={this.props.status===2?"":this.onshixunCreatePracticeChange}>
-                                <Radio value={1}>简单</Radio>
-                                <Radio value={2}>中等</Radio>
-                                <Radio value={3}>困难</Radio>
-                            </RadioGroup>
-
-                        </div>
-                        <p className="color-grey-6 font-16 mb30">奖励经验值</p>
-                        <div className="clearfix"
-														 // onMouseLeave={this.props.status===2?"":this.onshixunsmarkss}
-												>
-                            <span className="fl mr30 color-orange pt10">*</span>
-
-                            <Select style={{width: 120}} className="winput-240-40 fl"
-                                    id="challenge_score"
-                                    onChange={this.props.status===2?"":this.onshixunsmark}
-                                    // onMouseEnter={this.props.status===2?"":this.onshixunsmarks}
-                                    disabled={this.props.status===2?true:false}
-                                    // open={marktype}
-                                    value={onshixunsmarkvalue}
-                                    getPopupContainer={triggerNode => triggerNode.parentNode}
-                            >
-                                {options}
-                            </Select>
-
-                            <p className="fl color-grey-9 font-12 ml20">
-                                如果学员答题错误，则不能得到相应的经验值<br/>
-                                如果学员成功得到经验值，那么将同时获得等值的金币奖励，如：+10经验值、+10金币
-                            </p>
-
-                            <span className="color-orange mt7 fl ml20 none" id="ex_value_notice"><i
-                                className="fa fa-exclamation-circle mr3"></i>必填项</span>
-                        </div>
-                    </div>
-
-
-                    <div className="edu-back-white padding40-20 mb20">
-                        <p className="color-grey-6 font-16 mb30">技能标签</p>
-                        <div className="clearfix df">
-                            <span className="mr30 color-orange pt10">*</span>
-                            <div className="flex1">
-                                <Input type="text"
-                                       className="winput-240-40 fl mr20 winput-240-40s"
-                                       id="input_task_tag"
-                                       placeholder="添加标签"
-                                       onInput={this.shixunsskill}
-                                       value={shixunsskillvalue}
-                                       onPressEnter={this.clickshixunsskill}
-                                       onBlur={this.clickshixunsskill}
-                                />
-                                {/*<a className="white-btn orange-btn fl mt1 use_scope-btn ml20 mt5 mr20"*/}
-                                   {/*onClick={this.clickshixunsskill}>+ 添加</a>*/}
-                                <div className="ml15 color-grey-9 mt5">学员答题正确将获得技能，否则不能获得技能</div>
-                                <div className="mt20 clearfix" id="task_tag_content">
-
-                                    {
-																			shixunsskillvaluelist===undefined?"":shixunsskillvaluelist.length === 0 ? "" : shixunsskillvaluelist.map((itme, key) => {
-                                            return (
-                                                <li className="task_tag_span" key={key}><span>{itme}</span>
-                                                    <a onClick={() => this.delshixunsskilllist(key)}>×</a>
-                                                </li>
-                                            )
-                                        })
-                                    }
-
-
-                                </div>
-                            </div>
-                            <span
-                                className={shixunsskillvaluelisttype === true ? "color-orange mt7 fl ml20 block" : " color-orange mt7 fl ml20 none"}
-                                id="stage_name_notice">
-                        <i className="fa fa-exclamation-circle mr3"></i>必填项</span>
-                        </div>
-                    </div>
-
-										<div className="edu-back-white padding40-20 mb20">
-											<p className="color-grey-6 font-16 mb30">服务配置</p>
-											<div className="clearfix mb5">
-												<span className="color-orange pt10 fl">*</span>
-												<label className="panel-form-label fl">评测时限(S)：</label>
-												<div className="pr fl with80 status_con">
-													<input  value={this.state.exec_time} className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" onInput={this.setexec_time}/>
-												</div>
-												<span
-													className={this.state.shixunExec_timeType === true ? "color-orange mt8 fl block ml20" : "color-orange mt8 fl none"}
-													id="new_shixun_name"><i className="fa fa-exclamation-circle mr3"></i>必填项</span>
-												<div className="cl"></div>
-											</div>
-										</div>
-
-                    <div className="clearfix mt30"
-                         style={{display:this.props.identity>4||this.props.identity===undefined?"none":'block'}}
-                    >
-                       {checkpointId===undefined?<a className="defalutSubmitbtn fl mr20" onClick={CreatePracticesendtype===true?"":this.CreatePracticesend}>提交</a>:
-                       <a className="defalutSubmitbtn fl mr20" onClick={editPracticesendtype===true?"":this.editPracticesend}>提交</a>}
-                       {/*<a href={go_back_url === undefined ? "" : go_back_url} className="defalutCancelbtn fl">取消</a>*/}
-                       <Link to={go_back_url === undefined ? "" : go_back_url} className={"defalutCancelbtn fl"}>取消</Link>
-                    </div>
-                </div>
-            </React.Fragment>
-        )
-    }
-}
-
-
diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js
new file mode 100644
index 00000000..53956ff1
--- /dev/null
+++ b/src/modules/tpm/challengesnew/tpm-md-editor.js
@@ -0,0 +1,273 @@
+
+import React, { Fragment, useEffect, useRef, useState } from 'react'
+import { getUploadActionUrl, getUrl } from 'educoder'
+import ResizeObserver from 'resize-observer-polyfill';
+
+import '../../courses/css/Courses.css'
+import './css/TPMchallengesnew.css'
+import 'codemirror/lib/codemirror.css'
+const $ = window.$
+
+const mdIcons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "inline-latex", "latex", '|', "image", "table", '|', "line-break", "watch", "clear"]
+
+const NULL_CH = '▁'
+
+function md_add_data(k, mdu, d) {
+  window.sessionStorage.setItem(k + mdu, d);
+}
+
+// 清空保存的数据
+function md_clear_data(k, mdu, id) {
+  window.sessionStorage.removeItem(k + mdu);
+  var id1 = "#e_tip_" + id;
+  var id2 = "#e_tips_" + id;
+  if (k == 'content') {
+    $(id2).html("　");
+  } else {
+    $(id1).html("　");
+  }
+}
+
+window.md_clear_data = md_clear_data
+function md_rec_data(k, mdu, id) {
+  if (window.sessionStorage.getItem(k + mdu) !== null) {
+    var editor = $("#e_tips_" + id).data('editor');
+    editor.setValue(window.sessionStorage.getItem(k + mdu));
+    // /shixuns/b5hjq9zm/challenges/3977/tab=3  setValue可能导致editor样式问题
+    md_clear_data(k, mdu, id);
+  }
+}
+window.md_rec_data = md_rec_data;
+
+
+function md_elocalStorage(editor, mdu, id) {
+  let oc = window.sessionStorage.getItem('content' + mdu)
+  if (oc !== null && oc != editor.getValue()) {
+    $("#e_tips_" + id).data('editor', editor);
+    let h = '您上次有已保存的数据，是否<a style="cursor: pointer;" class="link-color-blue" onclick="md_rec_data(\'content\',\'' + mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="link-color-blue" onclick="md_clear_data(\'content\',\'' + mdu + '\',\'' + id + '\')">不恢复</a>';
+    $("#e_tips_" + id).html(h)
+  }
+  let tid = setInterval(function () {
+    let d = new Date();
+    let h = d.getHours();
+    let m = d.getMinutes();
+    let s = d.getSeconds();
+    h = h < 10 ? '0' + h : h;
+    m = m < 10 ? '0' + m : m;
+    s = s < 10 ? '0' + s : s;
+
+    if (editor.getValue().trim() != "") {
+      md_add_data("content", mdu, editor.getValue());
+      let id2 = "#e_tips_" + id;
+
+      let textStart = " 数据已于 "
+      let text = textStart + h + ':' + m + ':' + s + " 保存 ";
+      // 占位符   
+      let oldHtml = $(id2).html();
+      if (oldHtml && oldHtml != '　' && oldHtml.startsWith(textStart) == false) {
+        $(id2).html(oldHtml.split('　(')[0] + `　(${text})`);
+      } else {
+        $(id2).html(text);
+      }
+    }
+  }, 10000)
+  return tid
+}
+
+
+export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, className = '', noStorage = false, imageExpand = true, placeholder = '', width = '100%', height = 400, initValue = '', emoji, watch, showNullButton = false, showResizeBar = false, startInit = true }) => {
+
+  const editorEl = useRef()
+  const resizeBarEl = useRef()
+  const [editorInstance, setEditorInstance] = useState()
+  const containerId = `mdEditor_${mdID}`
+  const editorBodyId = `mdEditors_${mdID}`
+  const tipId = `e_tips_mdEditor_${mdID}`
+
+  function onLayout() {
+    let ro
+    if (editorEl.current) {
+      ro = new ResizeObserver(entries => {
+        for (let entry of entries) {
+          if (entry.target.offsetHeight > 0 || entry.target.offsetWidth > 0) {
+            editorInstance.resize()
+            editorInstance.cm.refresh()
+            editorInstance.cm.focus()
+          }
+        }
+      })
+      ro.observe(editorEl.current)
+    }
+    return ro
+  }
+
+  useEffect(() => {
+    if (editorInstance) {
+      return
+    }
+    if (!startInit) { return }
+    const editor_instance = window.editormd(containerId, {
+      width,
+      height,
+      path: getUrl("/editormd/lib/"),
+      markdown: initValue,
+      syncScrolling: "single",
+      tex: true,
+      tocm: true,
+      emoji: !!emoji,
+      taskList: true,
+      codeFold: true,
+      searchReplace: true,
+      htmlDecode: "style,script,iframe",
+      sequenceDiagram: true,
+      autoFocus: false,
+      watch: watch === undefined ? true : watch,
+
+      saveHTMLToTextarea: true,
+      dialogMaskOpacity: 0.6,
+      placeholder: placeholder,
+      imageUpload: true,
+      imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
+      imageUploadURL: getUploadActionUrl(),
+      toolbarIcons: function () {
+        return showNullButton ? [...mdIcons, 'null-button'] : mdIcons
+      },
+      toolbarIconsClass: {
+        "line-break": "fa-minus",
+      },
+      toolbarCustomIcons: {
+        "inline-latex": "<a title='行内公式' class='latex' ><i name='inline-latex' class='fa iconfont icon-hangneigongshi font-14'></i></a>",
+        "latex": "<a title='多行公式'  class='latex' ><i name='latex' class='fa iconfont icon-duohanggongshi font-16'></i></a>",
+        "null-button": "<a class='pr' title='增加填空'><i class='border-left'><span></span></i><span name='null-button' class='fa fillTip'>点击插入填空项</span><i class='iconfont fa icon-edit font-16' name='null-button'></i></a>",
+      },
+      toolbarHandlers: {
+        "line-break": function (cm, icon, cursor, selection) {
+          cm.replaceSelection("<br/>")
+        },
+        "null-button": function (cm, icon, cursor, selection) {
+          if (selection === "") {
+            cm.setCursor(cursor.line, cursor.ch + 1)
+          }
+          cm.replaceSelection(NULL_CH)
+        },
+        "inline-latex": function (cm, icon, cursor, selection) {
+          cm.replaceSelection("$$" + selection + "$$");
+          cm.setCursor(cursor.line, cursor.ch + 2);
+          cm.focus()
+        },
+        "latex": function (cm, icon, cursor, selection) {
+          cm.replaceSelection("```latex\n\n" + selection + "```");
+          cm.setCursor(cursor.line + 1, 0);
+          cm.focus()
+        },
+      },
+      lang: {
+        toolbar: {
+          "latex": "多行公式",
+          "line-break": "换行"
+        }
+      },
+      onload: function () {
+        setEditorInstance(editor_instance)
+      }
+    })
+
+
+  }, [containerId, editorInstance, startInit])
+
+  const cmEl = editorInstance && editorInstance.cm
+
+  useEffect(() => {
+    if (cmEl) {
+      let tid = null
+      let ro
+      if (onCMBlur) {
+        editorInstance.cm.on('blur', () => { onCMBlur(editorInstance.getValue()) })
+      }
+      if (onCMBeforeChange) {
+        editorInstance.cm.on('beforeChange', (cm, change) => {
+          onCMBeforeChange(cm, change)
+        })
+      }
+      if (!noStorage) {
+        tid = md_elocalStorage(editorInstance, `MDEditor__${containerId}`, containerId)
+      }
+      if (onChange) {
+        editorInstance.cm.on('change', (cm) => {
+          onChange(cm.getValue())
+        })
+      }
+      ro = onLayout()
+      return () => {
+        if (!noStorage) {
+          clearInterval(tid)
+        }
+        if (ro) {
+          ro.unobserve(editorEl.current)
+        }
+      }
+    }
+  }, [cmEl])
+
+  useEffect(() => {
+    if (editorInstance && initValue !== undefined) {
+      if (initValue && initValue != editorInstance.getValue()) {
+        console.log(initValue)
+        editorInstance.setValue(initValue.toString())
+      }
+    }
+  }, [editorInstance, initValue, containerId])
+
+  useEffect(() => {
+    if (resizeBarEl.current) {
+      let el = resizeBarEl.current
+      let dragging = false
+      let startY = 0
+      function onMouseDown(e) {
+        dragging = true
+        startY = e.pageY
+      }
+      function onMouseUp() {
+        dragging = false
+      }
+      function onMouseMove(e) {
+        if (dragging) {
+          let delta = e.pageY - startY
+          if (delta < 0) {
+            delta = 0
+          }
+          if (delta > 300) {
+            delta = 300
+          }
+          let resizeH = height + delta + 'px'
+          editorInstance.resize('', resizeH)
+        }
+      }
+      el.addEventListener('mousedown', onMouseDown)
+      document.addEventListener('mousemove', onMouseMove)
+      document.addEventListener('mouseup', onMouseUp)
+      return () => {
+        el.removeEventListener('mousedown', onMouseDown)
+        document.removeEventListener('mousemove', onMouseMove)
+        document.removeEventListener('mouseup', onMouseUp)
+      }
+    }
+  }, [
+    editorInstance, resizeBarEl
+  ])
+
+  return (
+    <Fragment>
+      <div ref={editorEl} className={`df ${className} ${imageExpand && 'editormd-image-click-expand'}`} >
+        <div className={`edu-back-greyf5 radius4 ${error ? 'error' : ''}`} id={containerId} >
+          <textarea style={{ display: 'none' }} id={editorBodyId} name="content"></textarea>
+          <div className="CodeMirror cm-s-defualt"></div>
+        </div>
+      </div>
+      {showResizeBar ? <a ref={resizeBarEl} className='editor-resize'></a> : null}
+      <div className={"fr rememberTip"}>
+        {noStorage == true ? null : <div id={tipId} className="edu-txt-right color-grey-cd font-12"></div>}
+      </div>
+    </Fragment>
+  )
+}
\ No newline at end of file
diff --git a/src/modules/tpm/component/TPMNav.js b/src/modules/tpm/component/TPMNav.js
index 24de62f1..41299d73 100644
--- a/src/modules/tpm/component/TPMNav.js
+++ b/src/modules/tpm/component/TPMNav.js
@@ -4,87 +4,24 @@ import { BrowserRouter as Router, Route, Link } from "react-router-dom";
 
 class TPMNav extends Component {
 
-  	render() {
-			// console.log("componentDidMount");
-			// console.log("TPMNavTPMNavTPMNavTPMNav");
-			// console.log(this.props);
-
-      const { user, match, shixun, secret_repository,is_jupyter} = this.props;
-  		let isAdminOrCreator = false;
-      	if (user) {
-	        isAdminOrCreator = user.admin || user.manager
-      	}
-  		const shixunId = match.params.shixunId;
-  		// const challengesPath = `/shixuns/${shixunId}/challenges`;
-		// console.log(this.props.propaedeutics)
+	render() {
+		const { user, match, shixun, secret_repository, is_jupyter } = this.props;
+		let isAdminOrCreator = false;
+		if (user) {
+			isAdminOrCreator = user.admin || user.manager
+		}
+		const shixunId = match.params.shixunId;
 		const challengesPath = `/shixuns/${shixunId}/challenges`;
-		// console.log(match.path)
-		// 	console.log("TPMNavTPMNavTPMNav");
-		// 	console.log(is_jupyter);
-			const  is_teacher = this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:"";
-			const isfalse=true;
-	    return (
+		const is_teacher = this.props && this.props.current_user && this.props.current_user.is_teacher ? this.props.current_user.is_teacher : "";
+		const isfalse = true;
+		return (
 
 
-					isfalse?"":
+			isfalse ? "" :
 
-	      	<div className="bor-bottom-greyE clearfix pl20 pr20 pt40 pb20 edu-back-white challengeNav">
-		        <Link
-							to={challengesPath}
-		        	className={match.path === "/shixuns/:shixunId"|| match.path ==="/shixuns/:shixunId/challenges"?  " active fl mr40": 'fl mr40'}>任务</Link>
-
-				{
-					this.props.propaedeutics===undefined?"":this.props.propaedeutics===false?"":<Link to={`/shixuns/${shixunId}/propaedeutics`}
-								 className={`${match.url.indexOf('propaedeutics') != -1 ? 'active' : ''} fl mr40 `}
-								 id={"knowledge"}
-						>背景知识</Link>
-				}
-
-						{ this.props.identity >4||this.props.identity===undefined ?"":
-							(this.props.is_jupyter===false?
-								<Link to={`/shixuns/${shixunId}/repository`}
-											className={`${match.url.indexOf('/repository') != -1 ? 'active' : ''} fl mr40`}>版本库</Link>
-							:"")
-						}
-
-
-
-						{this.props.identity >4||this.props.identity===undefined ?"":	secret_repository && <Link to={`/shixuns/${shixunId}/secret_repository`}
-                      className={`${match.url.indexOf('secret_repository') != -1 ? 'active' : ''} fl mr40`}>私密版本库</Link>}
-
-		        <Link to={`/shixuns/${shixunId}/collaborators`}
-		        	className={`${match.url.indexOf('collaborators') != -1 ? 'active' : ''} fl mr40`}>合作者</Link>
-
-						 {/*jupyter*/}
-						{
-							this.props.is_jupyter===true?
-										<Link to={`/shixuns/${shixunId}/dataset`}
-													className={`${match.url.indexOf('dataset') != -1 ? 'active' : ''} fl mr40`}>数据集</Link>
-								:""
-						}
-
-						{
-							this.props.is_jupyter === false ?
-								<Link to={`/shixuns/${shixunId}/shixun_discuss`}
-											className={`${match.url.indexOf('shixun_discuss') != -1 ? 'active' : ''} fl mr40`}>评论</Link>
-								:""
-						}
-						{
-							this.props.is_jupyter === false ?
-		        <Link to={`/shixuns/${shixunId}/ranking_list`}
-		        	className={`${match.url.indexOf('ranking_list') != -1 ? 'active' : ''} fl mr40`}>排行榜</Link>:""
-						}
-
-						{this.props.identity >2||this.props.identity===undefined?"":
-									<Link to={`/shixuns/${shixunId}/audit_situation`}
-												className={`${match.url.indexOf('audit_situation') != -1 ? 'active' : ''} fl`}>审核情况</Link>
-						}
-
-						{this.props.identity >4||this.props.identity===undefined ? "":<Link  to={`/shixuns/${shixunId}/settings`} className="edu-default-btn edu-blueline-btn ml20 fr"
-                >配置</Link>}
-	      	</div>
-	    );
-  	}
+				null
+		);
+	}
 }
 
 export default TPMNav;
diff --git a/src/modules/tpm/component/TPMRightSection.js b/src/modules/tpm/component/TPMRightSection.js
index 6b25635c..b148f857 100644
--- a/src/modules/tpm/component/TPMRightSection.js
+++ b/src/modules/tpm/component/TPMRightSection.js
@@ -1,16 +1,12 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
 
-import {BrowserRouter as Router, Route, Link} from "react-router-dom";
 
-import axios from 'axios';
-
-import {getImageUrl,} from "educoder";
+import { getImageUrl, } from "educoder";
 
 import './TPMright.css';
 
-import {Progress, Tooltip} from 'antd';
+import { Progress, Tooltip } from 'antd';
 
-// import "antd/dist/antd.css";
 
 class TPMRightSection extends Component {
   constructor(props) {
@@ -22,25 +18,6 @@ class TPMRightSection extends Component {
     }
   }
 
-  // componentDidMount() {
-  //   let id=this.props.match.params.shixunId;
-  //
-  //   let shixunsDetailsURL=`/shixuns/`+id+`/show_right.json`;
-  //
-  //   axios.get(shixunsDetailsURL).then((response)=> {
-  //         if(response.status===200){
-  //             this.setState({
-  //               TPMRightSectionData: response.data
-  //           });
-  //         }
-  //     }).catch((error)=>{
-  //       console.log(error)
-  //     });
-  // }
-
-  // shouldComponentUpdate(nextProps, nextState) {
-  //      return nextProps.TPMRightSectionData !== this.state.TPMRightSectionData
-  // }
   clickNewsubscript = (val) => {
     if (val === 0) {
       this.setState({
@@ -57,14 +34,13 @@ class TPMRightSection extends Component {
   }
 
   render() {
-    let {TPMRightSection, clickNewsubscripttype} = this.state;
-    let {TPMRightSectionData} = this.props
+    let { TPMRightSection, clickNewsubscripttype } = this.state;
+    let { TPMRightSectionData } = this.props
     let Progresssum;
-    if(TPMRightSectionData&&TPMRightSectionData.complete_count!=null){
-      Progresssum=(parseInt(TPMRightSectionData&&TPMRightSectionData.complete_count) / parseInt(TPMRightSectionData&&TPMRightSectionData.challenge_count))*100;
+    if (TPMRightSectionData && TPMRightSectionData.complete_count != null) {
+      Progresssum = (parseInt(TPMRightSectionData && TPMRightSectionData.complete_count) / parseInt(TPMRightSectionData && TPMRightSectionData.challenge_count)) * 100;
     }
 
-    // console.log(this.props&&this.props.is_jupyter===true)
     return (
       <div>
         <style>
@@ -86,10 +62,10 @@ class TPMRightSection extends Component {
                 <p className="font-16 mb20"><i className={"iconfont icon-chuangjianzhe1 audit_situationactive font-14"}></i>  创建者</p>
                 <div className="df">
                   <a
-                    href={TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : `/users/${TPMRightSectionData.creator.login}/courses`}>
+                    href={TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : `/users/${TPMRightSectionData.creator.login}/classrooms`}>
                     <img alt="头像" className="radius mr10" height="36"
-                         src={getImageUrl(TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : 'images/' + TPMRightSectionData.creator.image_url + "?1532489442")}
-                         width="36"/>
+                      src={getImageUrl(TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : 'images/' + TPMRightSectionData.creator.image_url + "?1532489442")}
+                      width="36" />
                   </a>
                   <div className="flex1">
 
@@ -101,22 +77,17 @@ class TPMRightSection extends Component {
                         <span className={"color888hezuo  font-14"}>共发布实训</span> <span className={"color-grey-3"}>{TPMRightSectionData.user_shixuns_count}</span> <span className={"color888hezuo"}>个</span>
                       </div>
                     </div>
-                    {/*<div className="clearfix">*/}
-                    {/*  <span className={"fr color888hezuo"}>发布实训项目</span>*/}
-                    {/*  /!*<span className="ml20">粉丝 <span id="user_h_fan_count">{TPMRightSectionData.fans_count}</span></span>*!/*/}
-                    {/*  /!* <a href="/watchers/unwatch?className=fr+user_watch_btn+edu-default-btn+edu-focus-btn&amp;object_id=3039&amp;object_type=user&amp;shixun_id=61&amp;target_id=3039" className="fr edu-default-btn user_watch_btn edu-focus-btn" data-method="post" data-remote="true" id="cancel_watch" rel="nofollow">取消关注</a> *!/*/}
-                    {/*</div>*/}
 
                   </div>
                 </div>
               </div>
 
-              {this.props&&this.props.is_jupyter===true?"":this.props&&this.props.status>1?<div className="edu-back-white padd252020px relative borderbottomf4">
+              {this.props && this.props.is_jupyter === true ? "" : this.props && this.props.status > 1 ? <div className="edu-back-white padd252020px relative borderbottomf4">
                 <div className="font-16 mb5">
                   <span><i className={"iconfont icon-jilu1 audit_situationactive font-14"}></i>  学习统计</span>
                   <span className={"sortinxdirection space-between fr"}>
-												<span className="color888hezuo font-14">已完成 {TPMRightSectionData&&TPMRightSectionData.complete_count===null?0:TPMRightSectionData&&TPMRightSectionData.complete_count} 关 / 共 {TPMRightSectionData&&TPMRightSectionData.challenge_count} 关</span>
-											</span>
+                    <span className="color888hezuo font-14">已完成 {TPMRightSectionData && TPMRightSectionData.complete_count === null ? 0 : TPMRightSectionData && TPMRightSectionData.complete_count} 关 / 共 {TPMRightSectionData && TPMRightSectionData.challenge_count} 关</span>
+                  </span>
 
                 </div>
 
@@ -124,15 +95,15 @@ class TPMRightSection extends Component {
                   '0%': '#29BD8B',
                   '100%': '#29BD8B',
                 }} />
-              </div>:""}
+              </div> : ""}
               {
                 TPMRightSectionData === undefined ? "" : TPMRightSectionData.tags === undefined ? "" : TPMRightSectionData.tags.length === 0 ? "" :
                   <div className="edu-back-white padd252020px mb10 relative">
                     <p className="font-16 mb20">
-											<span><i className={"iconfont icon-biaoqian2 audit_situationactive font-14"}></i>  技能标签</span>
+                      <span><i className={"iconfont icon-biaoqian2 audit_situationactive font-14"}></i>  技能标签</span>
                       <span className={"sortinxdirection space-between fr"}>
-												<span className="color888hezuo  font-14">已获得 {TPMRightSectionData&&TPMRightSectionData.user_tag_count} 个 / 共 {TPMRightSectionData&&TPMRightSectionData.tag_count} 个</span>
-											</span>
+                        <span className="color888hezuo  font-14">已获得 {TPMRightSectionData && TPMRightSectionData.user_tag_count} 个 / 共 {TPMRightSectionData && TPMRightSectionData.tag_count} 个</span>
+                      </span>
 
                     </p>
                     <div className={TPMRightSection === false ? "newedbox newedboxheight" : "newedbox newminheight"}>
@@ -140,8 +111,8 @@ class TPMRightSection extends Component {
                         {TPMRightSectionData.tags.map((item, key) => {
                           return (
                             <span className={item.status === false ? "newedu-filter-btn fl" : "edu-filter-btn29BD8B fl"}
-                                  style={{display: item.tag_name === " " || item.tag_name === "" ? "none" : ""}}
-                                  key={key}>{item.tag_name}</span>
+                              style={{ display: item.tag_name === " " || item.tag_name === "" ? "none" : "" }}
+                              key={key}>{item.tag_name}</span>
                           )
                         })
                         }
@@ -154,8 +125,8 @@ class TPMRightSection extends Component {
                       onClick={() => this.clickNewsubscript(0)}>
                       <span className="mr8">
                         <div>
-                           <p className={"font-12"}>展开全部</p>
-                           <p className={"font-12"}><i className={"iconfont icon-jiantou9 font-12"}></i></p>
+                          <p className={"font-12"}>展开全部</p>
+                          <p className={"font-12"}><i className={"iconfont icon-jiantou9 font-12"}></i></p>
                         </div>
                       </span>
                     </div>
@@ -165,8 +136,8 @@ class TPMRightSection extends Component {
                       onClick={() => this.clickNewsubscript(1)}>
                       <span className="mr8">
                         <div>
-                           <p className={"font-12"}><i className={"iconfont icon-changyongtubiao-xianxingdaochu-zhuanqu- font-12"}></i></p>
-                           <p className={"font-12"}>收起全部</p>
+                          <p className={"font-12"}><i className={"iconfont icon-changyongtubiao-xianxingdaochu-zhuanqu- font-12"}></i></p>
+                          <p className={"font-12"}>收起全部</p>
                         </div>
                       </span>
                     </div>
@@ -184,26 +155,26 @@ class TPMRightSection extends Component {
                 <div className="recommend-list">
                   {
                     TPMRightSectionData === undefined ? "" : TPMRightSectionData.paths === undefined ? "" : TPMRightSectionData.paths.map((i, k) => {
-                      if(k>2){
+                      if (k > 2) {
 
-                      }else{
+                      } else {
                         return (
 
                           <div className="recomments clearfix df" key={k}>
 
                             <a href={"/paths/" + i.id} height="96" width="128" target="_blank">
 
-                              <img alt="实训" height="96" src={"/" + i.image_url} width="128" className={"altimgs"}/>
+                              <img alt="实训" height="96" src={"/" + i.image_url} width="128" className={"altimgs"} />
                             </a>
 
                             <div className="ml10 flex1">
                               <a href={"/paths/" + i.id} target="_blank" data-tip-down={i.name}
-                                 className="color-grey-6 task-hide mb12 recomment-name">{i.name}</a>
+                                className="color-grey-6 task-hide mb12 recomment-name">{i.name}</a>
                               <p className="clearfix mt8 font-12 color-grey-B4">
 
                                 <Tooltip placement="bottom" title={"章节"}>
-                                <span className="mr10 fl squareIconSpan"><i
-                                  className="iconfont icon-shixun fl mr3"></i>{i.stages_count}</span>
+                                  <span className="mr10 fl squareIconSpan"><i
+                                    className="iconfont icon-shixun fl mr3"></i>{i.stages_count}</span>
                                 </Tooltip>
 
                                 {/*<Tooltip placement="bottom" title={"经验值"}>*/}
@@ -211,8 +182,8 @@ class TPMRightSection extends Component {
                                 {/*</Tooltip>*/}
 
                                 <Tooltip placement="bottom" title={"学习人数"}>
-                                <span className="mr10 fl squareIconSpan"><i
-                                  className="iconfont icon-chengyuan fl mr3"></i>{i.members_count}</span>
+                                  <span className="mr10 fl squareIconSpan"><i
+                                    className="iconfont icon-chengyuan fl mr3"></i>{i.members_count}</span>
                                 </Tooltip>
 
                               </p>
@@ -230,27 +201,27 @@ class TPMRightSection extends Component {
 
               {TPMRightSectionData === undefined ? "" : TPMRightSectionData.paths === undefined ? "" : TPMRightSectionData.paths.length === 0 ? "" :
                 this.props.user && this.props.user.main_site === true ? <div className="padding20 edu-back-white"
-                                                                             style={{
-                                                                               display:
-                                                                                 TPMRightSectionData === undefined ? "none" : TPMRightSectionData.recommands === undefined ? "none" : TPMRightSectionData.recommands.length === 0 ? "none" : "block"
-                                                                             }}
+                  style={{
+                    display:
+                      TPMRightSectionData === undefined ? "none" : TPMRightSectionData.recommands === undefined ? "none" : TPMRightSectionData.recommands.length === 0 ? "none" : "block"
+                  }}
                 >
                   <p className="mb20 font-16 clearfix"><i className={"iconfont icon-tuijian audit_situationactive font-14"}></i>  推荐实训</p>
                   <div className="recommend-list">
                     {
                       TPMRightSectionData === undefined ? "" : TPMRightSectionData.recommands === undefined ? "" : TPMRightSectionData.recommands.map((item, key) => {
-                        if(key>2){
+                        if (key > 2) {
 
-                        }else{
+                        } else {
                           return (
                             <div className="recomments clearfix df" key={key}>
                               <a href={"/shixuns/" + item.identifier + "/challenges"} target="_blank">
-                                <img alt="69?1526971094" height="96" src={"/" + item.pic} width="128" className={"altimgs"}/>
+                                <img alt="69?1526971094" height="96" src={"/" + item.pic} width="128" className={"altimgs"} />
                               </a>
                               <div className="ml10 flex1">
                                 <Tooltip placement="bottom" title={item.name}>
                                   <a href={"/shixuns/" + item.identifier + "/challenges"} target="_blank"
-                                     className="color-grey-6 task-hide mb12 recomment-name">{item.name}</a>
+                                    className="color-grey-6 task-hide mb12 recomment-name">{item.name}</a>
                                 </Tooltip>
                                 <p className="clearfix mt8 font-12 color-grey-B4">
                                   <span className="fl">{item.stu_num} 人学习</span>
diff --git a/src/modules/tpm/newshixuns/Newshixuns.js b/src/modules/tpm/newshixuns/Newshixuns.js
index 361ed324..54ef17c3 100644
--- a/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/src/modules/tpm/newshixuns/Newshixuns.js
@@ -1,14 +1,14 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
 
-import {TPMIndexHOC} from '../TPMIndexHOC';
+import { TPMIndexHOC } from '../TPMIndexHOC';
 
-import {SnackbarHOC} from 'educoder';
+import { SnackbarHOC } from 'educoder';
 
-import {Select, Radio, Input, Modal, Button, Form, Tooltip, Upload, Icon, notification} from 'antd';
+import { Select, Radio, Input, Modal, Button, Form, Tooltip, Upload, Icon, notification } from 'antd';
 
 import axios from 'axios';
 
-import {getUploadActionUrl} from 'educoder';
+import { getUploadActionUrl } from 'educoder';
 
 import './css/Newshixuns.css';
 
@@ -32,7 +32,7 @@ class Newshixuns extends Component {
       run_method: undefined,
       postapplyvisible: undefined,
       fileList: [],
-      Radiovalue:"1"
+      Radiovalue: "1"
     }
   }
 
@@ -97,21 +97,21 @@ class Newshixuns extends Component {
     })
     const mdContnet = this.contentMdRef.current.getValue().trim();
     this.props.form.validateFieldsAndScroll((err, values) => {
-      debugger
+
       if (!err) {
         console.log('Received values of form: ', values);
 
         let Url = `/shixuns.json`;
         axios.post(Url, {
-            description: mdContnet,
-            main_type: values.main_type,
-            sub_type: values.sub_type,
-            shixun: {
-              name: values.name,
-              trainee: values.select,
-              is_jupyter: values.is_jupyter === "2" ? true : false,
-            }
+          description: mdContnet,
+          main_type: values.main_type,
+          sub_type: values.sub_type,
+          shixun: {
+            name: values.name,
+            trainee: values.select,
+            is_jupyter: values.is_jupyter === "2" ? true : false,
           }
+        }
         ).then((response) => {
           if (response.status === 200) {
             window.location.href = "/shixuns/" + response.data.shixun_identifier + "/challenges";
@@ -126,7 +126,7 @@ class Newshixuns extends Component {
             loading: false
           })
         })
-      }else{
+      } else {
         this.setState({
           loading: false
         })
@@ -198,7 +198,7 @@ class Newshixuns extends Component {
 
 
   sendsure_apply = () => {
-    let {language, runtime, run_method} = this.state;
+    let { language, runtime, run_method } = this.state;
 
     if (!language || language === "") {
       // this.props.showNotification(`请填写该镜像是基于什么语言`);
@@ -326,7 +326,7 @@ class Newshixuns extends Component {
   // 附件相关 START
   handleChange = (info) => {
     if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
-      let {fileList} = this.state;
+      let { fileList } = this.state;
 
       if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
         console.log("handleChange1");
@@ -369,7 +369,7 @@ class Newshixuns extends Component {
     axios.delete(url, {})
       .then((response) => {
         if (response.data) {
-          const {status} = response.data;
+          const { status } = response.data;
           if (status == 0) {
             // console.log('--- success')
 
@@ -392,8 +392,8 @@ class Newshixuns extends Component {
   }
 
   render() {
-    const {getFieldDecorator} = this.props.form;
-    const {newshixunlist, fileList, postapplytitle, postapplyvisible} = this.state;
+    const { getFieldDecorator } = this.props.form;
+    const { newshixunlist, fileList, postapplytitle, postapplyvisible } = this.state;
     const uploadProps = {
       width: 600,
       fileList,
@@ -432,6 +432,8 @@ class Newshixuns extends Component {
       },
     }
 
+
+
     return (
       <div className="newMain clearfix">
         <style>
@@ -452,11 +454,11 @@ class Newshixuns extends Component {
                 <span className="fl font-18 lineh-35">新建实训项目</span>
                 {this.props.user && this.props.user.main_site === true ?
                   <a className="fr font-16 mt3 color-blue" href="/forums/2943"
-                     target="_blank">实训制作指南</a> : ""}
+                    target="_blank">实训制作指南</a> : ""}
               </div>
               <div className="padding10-20  color-grey-3 clearfix">
                 <Form>
-              <Form.Item label="实训类型">
+                  <Form.Item label="实训类型">
                     {getFieldDecorator('is_jupyter')(
                       <Radio.Group onChange={this.RadiovalueonChange} value={this.state.Radiovalue}>
                         <Radio value="1">普通实训</Radio>
@@ -478,37 +480,37 @@ class Newshixuns extends Component {
                       }],
                     })(
                       <Input placeholder="请输入名称，最大限制60个字符"
-                             className={"input-100-45 greyInput"}
-                             onInput={this.shixunNameInput} autoComplete="off"
-                             addonAfter={`${String(!this.state.shixunName ? 0 : this.state.shixunName.length)}/${this.state.NAME_COUNT}`}
-                             className="newViewAfter"/>
+                        className={"input-100-45 greyInput"}
+                        onInput={this.shixunNameInput} autoComplete="off"
+                        addonAfter={`${String(!this.state.shixunName ? 0 : this.state.shixunName.length)}/${this.state.NAME_COUNT}`}
+                        className="newViewAfter" />
                     )}
                   </Form.Item>
 
                   <Form.Item
                     label="简介"
-                    style={{"borderBottom": 'none'}}
+                    style={{ "borderBottom": 'none' }}
                     className="chooseDes pr"
                   >
                     <TPMMDEditor ref={this.contentMdRef} placeholder="请输入简介" mdID={'courseContentMD'}
-                                 refreshTimeout={1500}
-                                 className="courseMessageMD"
-                      // initValue={this.state.description === null ? "" : this.state.description}
+                      refreshTimeout={1500}
+                      className="courseMessageMD"
+                    // initValue={this.state.description === null ? "" : this.state.description}
                     ></TPMMDEditor>
                   </Form.Item>
 
                   <Form.Item
                     label={"难易度"}
-                    style={{"borderBottom": 'none'}}
+                    style={{ "borderBottom": 'none' }}
                     className="chooseDes pr"
                   >
                     {getFieldDecorator('select', {
-                      rules: [{required: true, message: '请选择难易度'}],
+                      rules: [{ required: true, message: '请选择难易度' }],
                     })(
                       <div className="with15 fl pr">
                         <Select placeholder="请选择难易度"
-                                style={{width: 180}}
-                                onChange={this.Selectthestudent}
+                          style={{ width: 180 }}
+                          onChange={this.Selectthestudent}
                         >
                           <Option value={1}>初级</Option>
                           <Option value={2}>中级</Option>
@@ -524,52 +526,52 @@ class Newshixuns extends Component {
 
                   <Form.Item
                     label={"实验环境"}
-                    style={{"borderBottom": 'none', 'width': '18%', 'float': 'left'}}
+                    style={{ "borderBottom": 'none', 'width': '18%', 'float': 'left' }}
                     className="chooseDes pr"
                   >
                     <div>
 
                       {getFieldDecorator('main_type', {
-                        rules: [{required: true, message: '请选择主类别'}],
+                        rules: [{ required: true, message: '请选择主类别' }],
                       })(
                         <div className="width100 fl mr20">
 
                           <Select placeholder="请选择主类别"
-                                  style={{width: 180}}
-                                  onChange={this.main_type}
-                                  defaultOpen={false}
+                            style={{ width: 180 }}
+                            onChange={this.main_type}
+                            defaultOpen={false}
                           >
                             {
-                              newshixunlist === undefined ? "" :  this.state.Radiovalue==="2"?newshixunlist.main_type.map((item, key) => {
-                                let itemtype=item.type_name.toLowerCase().indexOf('jupyter'.toLowerCase())
-                                if(itemtype>-1){
+                              newshixunlist === undefined ? "" : this.state.Radiovalue === "2" ? newshixunlist.main_type.map((item, key) => {
+                                let itemtype = item.type_name.toLowerCase().indexOf('jupyter'.toLowerCase())
+                                if (itemtype > -1) {
                                   return (
                                     <Option value={item.id} key={key} name={item.description}>
                                       <Tooltip placement="right"
-                                               title={item.description === "" ? "无描述" : item.description}>
+                                        title={item.description === "" ? "无描述" : item.description}>
                                         {item.type_name}
                                       </Tooltip>
                                     </Option>
                                   )
                                 }
 
-                              }):""
+                              }) : ""
                             }
                             {
-                              newshixunlist === undefined ? "" : this.state.Radiovalue==="1"?newshixunlist.main_type.map((item, key) => {
-                                let itemtype=item.type_name.toLowerCase().indexOf('jupyter'.toLowerCase())
-                                if(itemtype===-1){
+                              newshixunlist === undefined ? "" : this.state.Radiovalue === "1" ? newshixunlist.main_type.map((item, key) => {
+                                let itemtype = item.type_name.toLowerCase().indexOf('jupyter'.toLowerCase())
+                                if (itemtype === -1) {
                                   return (
                                     <Option value={item.id} key={key} name={item.description}>
                                       <Tooltip placement="right"
-                                               title={item.description === "" ? "无描述" : item.description}>
+                                        title={item.description === "" ? "无描述" : item.description}>
                                         {item.type_name}
                                       </Tooltip>
                                     </Option>
                                   )
                                 }
 
-                              }):""
+                              }) : ""
                             }
                           </Select>
 
@@ -588,25 +590,25 @@ class Newshixuns extends Component {
                     }
                   </style>
                   <Form.Item
-                    style={{"borderBottom": 'none', 'width': '82%', 'float': 'left', 'marginTop': '40px'}}
+                    style={{ "borderBottom": 'none', 'width': '82%', 'float': 'left', 'marginTop': '40px' }}
                     className="chooseDes pr"
                   >
                     <div className=" fl pr mr20">
                       {getFieldDecorator('sub_type')(
                         <div className=" fl pr mr20">
                           <Select placeholder="请选择小类别"
-                                  mode="multiple"
-                                  style={{width: 280}}
-                                  onChange={this.sub_type}
-                                  defaultOpen={false}
-                                  className={"Selectlittle"}
+                            mode="multiple"
+                            style={{ width: 280 }}
+                            onChange={this.sub_type}
+                            defaultOpen={false}
+                            className={"Selectlittle"}
                           >
                             {
                               newshixunlist === undefined ? "" : newshixunlist.small_type.map((item, key) => {
                                 return (
                                   <Option value={item.id} key={key} name={item.description}>
                                     <Tooltip placement="right"
-                                             title={item.description === "" ? "无描述" : item.description}>
+                                      title={item.description === "" ? "无描述" : item.description}>
                                       {item.type_name}
                                     </Tooltip>
                                   </Option>
@@ -617,17 +619,18 @@ class Newshixuns extends Component {
                         </div>
                       )}
                       <span className="fl ml20 color-grey lineh-20">
-                              <div>
-                                {this.state.mainvalues === undefined && this.state.subvalues === undefined || this.state.mainvalues === "" && this.state.subvalues === "" ? "" :
-                                  <div className={"font-12"} style={{'max-width': '600px'}}>
-                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : this.state.mainvalues}`}
-                                    {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.mainvalues === undefined || this.state.mainvalues === "" ?  this.state.subvalues : this.state.subvalues}`}
-                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" :   this.state.mainvalues}${this.state.subvalues === undefined || this.state.subvalues === "" ? "" :
-                                      this.state.mainvalues === undefined || this.state.mainvalues === "" ?  this.state.subvalues : this.state.subvalues}`}
-                                  </div>}
+                        <div>
+                          {this.state.mainvalues === undefined && this.state.subvalues === undefined || this.state.mainvalues === "" && this.state.subvalues === "" ? "" :
+                            <div className={"font-12"} style={{ 'max-width': '600px' }}>
+                              {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : this.state.mainvalues}`}
+                              {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.subvalues}`}
 
-                              </div>
-                        </span>
+
+
+                            </div>}
+
+                        </div>
+                      </span>
                     </div>
                   </Form.Item>
 
@@ -663,7 +666,7 @@ class Newshixuns extends Component {
                         className="color-red fl mt3">*</span>语言：&nbsp;&nbsp;</label>
                       <textarea
                         className={this.state.languagewritetype === true ? "fl task-form-80 task-height-150 bor-reds" : "fl task-form-80 task-height-150"}
-                        style={{width: '89%', height: '100px'}}
+                        style={{ width: '89%', height: '100px' }}
                         onInput={this.setlanguage}
                         value={this.state.language}
                         placeholder="请填写该镜像是基于什么语言：示例：Python"
@@ -677,7 +680,7 @@ class Newshixuns extends Component {
                       <textarea
                         className={this.state.systemenvironmenttype === true ? "fl task-form-80 task-height-150 bor-reds" : "fl task-form-80 task-height-150"}
                         onInput={this.setruntime}
-                        style={{height: '100px'}}
+                        style={{ height: '100px' }}
                         value={this.state.runtime}
                         placeholder="请填写该镜像是基于什么linux系统环境,代码运行环境"
                         id="demand_info"></textarea>
@@ -692,7 +695,7 @@ class Newshixuns extends Component {
                         className={this.state.testcoderunmodetype === true ? "fl task-form-80 task-height-150 bor-reds" : "fl task-form-80 task-height-150"}
                         onInput={this.setrun_method}
                         value={this.state.run_method}
-                        style={{height: '100px'}}
+                        style={{ height: '100px' }}
                         placeholder="请填写该镜像中测试代码运行方式"
                         id="demand_info"></textarea>
                     </li>
@@ -718,10 +721,10 @@ class Newshixuns extends Component {
                     </div>
                     <li className="edu-txt-center clearfix ">
                       <a className="pop_close task-btn  mr30"
-                         onClick={() => this.sendhideModaly()}
+                        onClick={() => this.sendhideModaly()}
                       >取消</a>
                       <Button type="primary" onClick={() => this.sendsure_apply()}
-                              className="task-btn task-btn-orange">确定</Button>
+                        className="task-btn task-btn-orange">确定</Button>
                     </li>
                     <div className="cl"></div>
                   </div>
@@ -733,19 +736,13 @@ class Newshixuns extends Component {
             </div>
           </div>
         </div>
-        <Bottomsubmit {...this.props} {...this.state} url={"/shixuns"} onSubmits={() => this.handleSubmit()} loadings={this.state.loading}/>
+        <Bottomsubmit {...this.props} {...this.state} url={"/shixuns"} onSubmits={() => this.handleSubmit()} loadings={this.state.loading} />
       </div>
 
     );
   }
 }
 
-const NewshixunsNew = Form.create({name: 'newshixun'})(Newshixuns);
-
-export default SnackbarHOC()(TPMIndexHOC(NewshixunsNew));
-
-
-
-
-
+const NewshixunsNew = Form.create({ name: 'newshixun' })(Newshixuns);
 
+export default SnackbarHOC()(TPMIndexHOC(NewshixunsNew));
\ No newline at end of file
diff --git a/src/modules/tpm/newshixuns/css/Newshixuns.css b/src/modules/tpm/newshixuns/css/Newshixuns.css
index 00300274..7dc811d0 100644
--- a/src/modules/tpm/newshixuns/css/Newshixuns.css
+++ b/src/modules/tpm/newshixuns/css/Newshixuns.css
@@ -675,7 +675,6 @@ a.white-btn.use_scope-btn:hover{
     width: 100%;
     height: 63px;
     background: rgba(255,255,255,1);
-    -webkit-box-shadow: 0px -4px 4px 0px rgba(0,0,0,0.05);
     box-shadow: 0px -4px 4px 0px rgba(0,0,0,0.05);
 }
 
diff --git a/src/modules/tpm/newshixuns/oldNewshixuns.js b/src/modules/tpm/newshixuns/oldNewshixuns.js
deleted file mode 100644
index 4904219b..00000000
--- a/src/modules/tpm/newshixuns/oldNewshixuns.js
+++ /dev/null
@@ -1,1356 +0,0 @@
-import React, {Component} from 'react';
-
-import {TPMIndexHOC} from '../TPMIndexHOC';
-
-import {SnackbarHOC,appendFileSizeToUploadFileAll, getUploadActionUrl} from 'educoder';
-
-import {Input, Select, Radio, Checkbox, Modal, Icon, DatePicker,Upload,Button,message,Form,notification,Tooltip} from 'antd';
-
-// import "antd/dist/antd.css";
-
-import locale from 'antd/lib/date-picker/locale/zh_CN';
-
-import axios from 'axios';
-
-import './css/Newshixuns.css';
-
-import {getUrl} from 'educoder'
-
-import moment from 'moment';
-
-let path = getUrl("/editormd/lib/")
-
-const $ = window.$;
-
-let timeout;
-
-let currentValue;
-
-const Option = Select.Option;
-
-const RadioGroup = Radio.Group;
-const confirm = Modal.confirm;
-
-
-// 处理整点 半点
-// 取传入时间往后的第一个半点
-export function handleDateStrings(dateString) {
-	if (!dateString) return dateString;
-	const ar = dateString.split(':')
-	if (ar[1] == '00' || ar[1] == '30') {
-		return dateString
-	}
-	const miniute = parseInt(ar[1]);
-	if (miniute < 30 || miniute == 60) {
-		return [ar[0], '30'].join(':')
-	}
-	if (miniute < 60) {
-		// 加一个小时
-		const tempStr = [ar[0], '00'].join(':');
-		const format = "YYYY-MM-DD HH:mm";
-		const _moment = moment(tempStr, format)
-		_moment.add(1, 'hours')
-		return _moment.format(format)
-	}
-
-	return dateString
-}
-
-
-
-// 恢复数据
-function md_rec_data(k, mdu, id, editor) {
-    if (window.sessionStorage.getItem(k + mdu) !== null) {
-        editor.setValue(window.sessionStorage.getItem(k + mdu));
-        md_clear_data(k, mdu, id);
-    }
-}
-
-// 保存数据
-function md_add_data(k, mdu, d) {
-    window.sessionStorage.setItem(k + mdu, d);
-}
-
-// 清空保存的数据
-function md_clear_data(k, mdu, id) {
-    window.sessionStorage.removeItem(k + mdu);
-    var id1 = "#e_tip_" + id;
-    var id2 = "#e_tips_" + id;
-    if (k == 'content') {
-        $(id2).html("");
-    } else {
-        $(id1).html("");
-    }
-}
-
-function md_elocalStorage(editor, mdu, id) {
-    if (window.sessionStorage) {
-        var oc = window.sessionStorage.getItem('content' + mdu);
-        if (oc !== null) {
-            $("#e_tips_" + id).data('editor', editor);
-            var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" class="link-color-blue" onclick="md_rec_data(\'content\',\'' + mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="link-color-blue" onclick="md_clear_data(\'content\',\'' + mdu + '\',\'' + id + '\')">不恢复</a>';
-            $("#e_tips_" + id).html(h);
-        }
-        setInterval(function () {
-            var d = new Date();
-            var h = d.getHours();
-            var m = d.getMinutes();
-            var s = d.getSeconds();
-            h = h < 10 ? '0' + h : h;
-            m = m < 10 ? '0' + m : m;
-            s = s < 10 ? '0' + s : s;
-            if (editor.getValue().trim() != "") {
-                md_add_data("content", mdu, editor.getValue());
-                var id1 = "#e_tip_" + id;
-                var id2 = "#e_tips_" + id;
-
-                $(id1).html(" 数据已于 " + h + ':' + m + ':' + s + " 保存   ");
-                $(id2).html("");
-            }
-        }, 10000);
-
-    } else {
-        $("#e_tip_" + id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
-    }
-}
-
-
-function create_editorMD(id, width, high, placeholder, imageUrl, callback) {
-    var editorName = window.editormd(id, {
-        width: width,
-        height: high,
-        path: path,   // "/editormd/lib/"
-
-        syncScrolling: "single",
-        tex: true,
-        tocm: true,
-        emoji: true,
-        taskList: true,
-        codeFold: true,
-        searchReplace: true,
-        htmlDecode: "style,script,iframe",
-        sequenceDiagram: true,
-        autoFocus: false,
-        toolbarIcons: function () {
-            // Or return editormd.toolbarModes[name]; // full, simple, mini
-            // Using "||" set icons align right.
-            return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
-        },
-        toolbarCustomIcons: {
-            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
-        },
-        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
-        saveHTMLToTextarea: true,
-        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-        dialogMaskOpacity: 0.6,
-        placeholder: placeholder,
-        imageUpload: true,
-        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-        imageUploadURL: imageUrl,//url
-        onload: function () {
-            // this.previewing();
-            $("#" + id + " [type=\"latex\"]").bind("click", function () {
-                editorName.cm.replaceSelection("```latex");
-                editorName.cm.replaceSelection("\n");
-                editorName.cm.replaceSelection("\n");
-                editorName.cm.replaceSelection("```");
-                var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line - 1, 0);
-            });
-
-            $("#" + id + " [type=\"inline\"]").bind("click", function () {
-                editorName.cm.replaceSelection("`$$$$`");
-                var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 3);
-                editorName.cm.focus();
-            });
-            $("[type=\"inline\"]").attr("title", "行内公式");
-            $("[type=\"latex\"]").attr("title", "多行公式");
-
-            md_elocalStorage(editorName, `memoNew_${id}`, "memoNew");
-
-            callback && callback()
-        }
-    });
-    return editorName;
-}
-
-function range(start, end) {
-	const result = [];
-	for (let i = start; i < end; i++) {
-		result.push(i);
-	}
-	return result;
-}
-function disabledDateTime() {
-	return {
-		// disabledHours: () => range(0, 24).splice(4, 20),
-		disabledMinutes: () => range(1, 30).concat(range(31, 60)),
-		// disabledSeconds: () => [0, 60],
-	};
-}
-
-function disabledDate(current) {
-	return current && current < moment().endOf('day').subtract(1, 'days');
-}
-class Newshixuns extends Component {
-    constructor(props) {
-        super(props)
-        this.state = {
-            fileList: [],
-            newshixunlist: undefined,
-            departmentslist: undefined,
-            name: "",
-            main_type: "",
-            small_type: "",
-            trainee: "",
-            webssh: 0,
-            use_scope: 0,
-            can_copy: "",
-            scope_partment: undefined,
-            vnc: "",
-            scopetype: false,
-            postapplyvisible: false,
-            sendsure_applyvalue: undefined,
-            postapplytitle: false,
-            shixun_nametype: false,
-            main_types: false,
-            trainee_types: false,
-            SelectTheCommandtype: false,
-            opers: false,
-            operss: false,
-            TimePickervalue: "",
-            opensmail: false,
-            onSearchvalue: "",
-            scope_partmenttype: false,
-            languagewrite: undefined,
-            systemenvironment:undefined,
-            testcoderunmode:undefined,
-            file:undefined,
-            deleteisnot:true,
-						languagewritetype:false,
-						systemenvironmenttype:false,
-						testcoderunmodetype:false,
-					  attachmentidstype:false,
-				  	datalisttype:false,
-					  bottonloading:false
-        }
-    }
-
-    initMD(initValue) {
-        this.contentChanged = false;
-        const placeholder = "";
-        // amp;
-        // 编辑时要传memoId
-        const imageUrl = `getUploadActionUrl`;
-        // 创建editorMd
-
-        const taskpass_editormd = create_editorMD("memoMD", '100%', 400, placeholder, imageUrl, () => {
-            setTimeout(() => {
-                taskpass_editormd.resize()
-                taskpass_editormd.cm && taskpass_editormd.cm.refresh()
-            }, 500)
-
-            if (initValue) {
-                taskpass_editormd.setValue(initValue)
-            }
-            taskpass_editormd.cm.on("change", (_cm, changeObj) => {
-                // console.log('....contentChanged')
-                this.contentChanged = true;
-            })
-        });
-        this.taskpass_editormd = taskpass_editormd;
-        window.taskpass_editormd = taskpass_editormd;
-
-    }
-
-    componentDidMount() {
-        let newshixunUrl = `/shixuns/new.json`;
-        axios.get(newshixunUrl).then((response) => {
-            if (response.status === 200) {
-                if (response.data.message===undefined) {
-                    this.setState({
-                        newshixunlist: response.data
-                    });
-                    this.initMD(response.data.sample[0][1]);
-                }
-
-            }
-        }).catch((error) => {
-            console.log(error)
-        });
-
-        let departmentsUrl = `/shixuns/departments.json`;
-        axios.get(departmentsUrl).then((response) => {
-            if (response.status === 200) {
-							if (response.data.message===undefined) {
-								this.setState({
-									departmentslist: response.data.shools_name
-								});
-							}
-            }
-        }).catch((error) => {
-            console.log(error)
-        });
-    }
-
-    setlanguagewrite = (e)=>{
-        this.setState({
-            languagewrite: e.target.value
-        })
-    }
-
-    setsystemenvironment = (e) => {
-        this.setState({
-            systemenvironment: e.target.value
-        })
-    }
-    settestcoderunmode = (e) => {
-        this.setState({
-            testcoderunmode: e.target.value
-        })
-
-    }
-    shixunname = (e) => {
-        this.setState({
-            name: e.target.value,
-            shixun_nametype: false
-        });
-    }
-
-    bigClass = (value) => {
-        this.setState({
-            main_type: value
-        })
-    }
-
-    littleClass = (value) => {
-        this.setState({
-            small_type: value
-        })
-    }
-
-    Selectthestudent = (value) => {
-        this.setState({
-            trainee: value
-        })
-    }
-
-    SelectTheCommand = (e) => {
-        this.setState({
-            webssh: e.target.value,
-        });
-
-        if (e.target.value === 2) {
-            this.setState({
-                SelectTheCommandtype: true,
-                multi_webssh: false
-            });
-        } else {
-            this.setState({
-                SelectTheCommandtype: false,
-                multi_webssh: false
-            });
-        }
-    }
-
-    Selectpublic = (e) => {
-        this.setState({
-            scopetype: false,
-            use_scope: e.target.value,
-        });
-        if (e.target.value === 1) {
-            this.setState({
-                scopetype: true
-            });
-        }
-
-    }
-
-    Teacherscopy = (e) => {
-        let sum = ""
-        if (e.target.checked === false) {
-            sum = 0
-        } else if (e.target.checked === true) {
-            sum = 1
-        }
-        this.setState({
-            can_copy: sum,
-        });
-    }
-
-    TeachersUbuntu = (e) => {
-        let sum = ""
-        if (e.target.checked === false) {
-            sum = 0
-        } else if (e.target.checked === true) {
-            sum = 1
-        }
-        this.setState({
-            vnc: sum,
-        });
-    }
-
-    adduse_scopeinput = () => {
-        let {scope_partment} = this.state;
-        let array = scope_partment;
-        let newarray = ""
-        array.push(newarray)
-        this.setState({
-            scope_partment: array,
-        });
-    }
-
-    shixunScopeInput = (e, id) => {
-       let types=false
-        let {scope_partment} = this.state;
-        let datalist = scope_partment;
-        if (datalist === undefined) {
-            datalist = []
-        }
-
-				datalist.map((item,key)=>{
-					if(e===item){
-						types=true
-						 this.setState({
-							 datalisttype:true
-						 })
-						return
-					}
-				})
-
-			 if(types===false){
-				 datalist.push(e)
-				 this.setState({
-					 scope_partment: datalist,
-					 onSearchvalue: ""
-				 });
-			 }
-
-
-    }
-
-    deleteScopeInput = (key) => {
-        let {scope_partment} = this.state;
-        let datalist = scope_partment;
-        datalist.splice(key, 1);
-        this.setState({
-            scope_partment: datalist
-        });
-    }
-
-    //提交数据
-    submit_new_shixun = () => {
-        const mdVal = this.taskpass_editormd.getValue();
-        let {can_copy, main_type, name, scope_partment, small_type, trainee, use_scope, vnc, webssh, multi_webssh, TimePickervalue} = this.state;
-        let Url = `/shixuns.json`
-        if (name === "") {
-            this.setState({
-                shixun_nametype: true
-            })
-            this.props.showSnackbar("实训名称为空");
-            $('html').animate({
-                scrollTop: 10
-            }, 1000);
-            return
-        }
-        if (main_type === "") {
-            this.setState({
-                main_types: true
-            })
-            $('html').animate({
-                scrollTop: 700
-            }, 1000);
-            this.props.showSnackbar("请选择技术平台大类别");
-
-            return
-        }
-
-        if (use_scope === 1) {
-            if (scope_partment === undefined || scope_partment.length === 0) {
-                this.setState({
-                    scope_partmenttype: true
-                })
-                $('html').animate({
-                    scrollTop: 900
-                }, 1000);
-                this.props.showSnackbar("公开程度，指定单位为空");
-                return
-            }
-        }
-        if (trainee === "") {
-            this.setState({
-                trainee_types: true
-            })
-            // $('html').animate({
-            //     scrollTop: 700
-            // }, 1000);
-            this.props.showSnackbar("请选择发布信息");
-            return
-        }
-        let newmulti_webssh = multi_webssh;
-        if (newmulti_webssh === true) {
-            newmulti_webssh = 1
-        } else {
-            newmulti_webssh = ""
-        }
-			this.setState({
-				bottonloading:true
-			})
-        axios.post(Url, {
-                name: name,
-                can_copy: can_copy,
-                description: mdVal,
-                main_type: main_type,
-                scope_partment: scope_partment,
-                small_type: small_type,
-                trainee: trainee,
-                use_scope: use_scope,
-                vnc: vnc,
-                webssh: webssh,
-                multi_webssh: newmulti_webssh,
-                task_pass: 1,
-                opening_time: TimePickervalue
-            }
-        ).then((response) => {
-            if (response.status === 200) {
-                window.location.href = "/shixuns/" + response.data.shixun_identifier + "/challenges";
-                // window.open("/shixuns/"+response.data.shixun_identifier+"/challenges");
-            }else{
-            	this.setState({
-								bottonloading:false
-							})
-						}
-        }).catch((error) => {
-            console.log(error)
-					this.setState({
-						bottonloading:false
-					})
-        })
-    }
-
-
-    shixunsfetch = (value, callback) => {
-        if (timeout) {
-            clearTimeout(timeout);
-            timeout = null;
-        }
-        currentValue = value;
-
-        function fake() {
-            let departmentsUrl = `/shixuns/departments.json?q=` + currentValue;
-            axios.get(departmentsUrl).then((response) => {
-							if (response.data.message===undefined) {
-								callback(response.data.shools_name);
-							}
-            }).catch((error) => {
-                console.log(error)
-            });
-        }
-
-        timeout = setTimeout(fake, 300);
-    }
-
-    shixunHandleSearch = (value) => {
-
-        this.shixunsfetch(value, departmentslist => this.setState({departmentslist}));
-
-        this.setState({
-            onSearchvalue: ""
-        })
-    }
-
-    post_apply = () => {
-        this.setState({
-            postapplyvisible: true
-        })
-    }
-    sendsure_apply = () => {
-        let {languagewrite,systemenvironment,testcoderunmode} = this.state;
-        // console.log("点击确定")
-        // console.log("languagewrite"+languagewrite);
-        // console.log("systemenvironment"+systemenvironment);
-        // console.log("testcoderunmode"+testcoderunmode);
-
-        // let attachment_ids = undefined
-        // if (this.state.fileList) {
-        //     attachment_ids = this.state.fileList.map(item => {
-        //         return item.response ? item.response.id : item.id
-        //     })
-        // }
-        if(languagewrite === undefined || languagewrite === "" ){
-            // this.props.showNotification(`请填写该镜像是基于什么语言`);
-            this.setState({
-							languagewritetype:true
-						})
-            return
-        }
-        if(systemenvironment === undefined || systemenvironment === ""){
-            // this.props.showNotification(`请填写该镜像是基于什么语言系统环境`);
-					this.setState({
-						systemenvironmenttype:true
-					})
-            return;
-
-        }
-        if(testcoderunmode === undefined ||  testcoderunmode === "") {
-            // this.props.showNotification(`请填写该镜像中测试代码运行方式`);
-					this.setState({
-						testcoderunmodetype:true
-					})
-            return;
-        }
-        var  attachment_ids=undefined;
-        if (this.state.fileList) {
-            attachment_ids = this.state.fileList.map(item => {
-                return item.response ? item.response.id : item.id
-            })
-        }
-
-        if( attachment_ids === undefined ||  attachment_ids.length===0){
-
-					// notification.open(
-					// 	{
-					// 		message: '提示',
-					// 		description:
-					// 			'请上传附件！',
-					//
-					// 	}
-					// )
-					this.setState({
-						attachmentidstype:true
-					})
-            return;
-        }
-        // console.log("attachment_ids"+attachment_ids);
-
-        // alert(languagewrite +"  "+systemenvironment +"   "+testcoderunmode + "   "+attachment_ids);
-
-        var data={
-            language:languagewrite,
-            runtime:systemenvironment,
-            run_method:testcoderunmode,
-            attachment_id:attachment_ids[0],
-        }
-        var url =`/shixuns/apply_shixun_mirror.json`;
-        axios.post(url,data
-        ).then((response) => {
-
-            try {
-                if (response.data) {
-                    // const { id } = response.data;
-                    // if (id) {
-                    if(this.state.file !== undefined){
-                        console.log("549");
-                        // this.deleteAttachment(this.state.file);
-                        this.setState({
-                            file:undefined,
-													  deleteisnot:true,
-                            languagewrite:"",
-                            systemenvironment:"",
-                            testcoderunmode:"",
-														fileList:[]
-                        })
-                    }else {
-                        this.setState({
-                            file:undefined,
-												  	deleteisnot:true,
-                            languagewrite:"",
-                            systemenvironment:"",
-                            testcoderunmode:"",
-													  fileList:[]
-                        })
-                    }
-                    // this.props.showNotification('提交成功！');
-										notification.open(
-											{
-												message: '提示',
-												description:
-													'提交成功！',
-
-											}
-										)
-									   this.sendhideModaly()
-                    // this.props.history.push(`/courses/${cid}/graduation_topics`);
-                    // }
-                }
-            }catch (e) {
-
-            }
-
-        })
-
-    }
-    sendhideModaly = () => {
-        this.setState({
-            postapplyvisible: false,
-        })
-        if(this.state.file !== undefined){
-            console.log("580");
-            // this.deleteAttachment(this.state.file);
-            this.setState({
-                file:undefined,
-							  deleteisnot:true,
-                languagewrite:"",
-                systemenvironment:"",
-                testcoderunmode:"",
-								fileList:[]
-            })
-        }else {
-            this.setState({
-                file:undefined,
-						  	deleteisnot:true,
-                languagewrite:"",
-                systemenvironment:"",
-                testcoderunmode:"",
-								fileList:[]
-            })
-        }
-    }
-    sendsure_applyvalues = (e) => {
-        this.setState({
-            sendsure_applyvalue: e.target.value
-        })
-    }
-    yeshidemodel = () => {
-        this.setState({
-            postapplytitle: false
-        })
-    }
-
-    SelectTheCommandonChange = (e) => {
-        this.setState({
-            multi_webssh: e.target.checked
-        })
-    }
-
-
-    bigopen = (e) => {
-        this.setState({
-            opers: true
-        })
-
-    }
-
-    bigopens = (e) => {
-        this.setState({
-            opers: false,
-            operss: false,
-            opensmail: false
-        })
-
-    }
-
-    bigopensmal = (e) => {
-        this.setState({
-            opensmail: true
-        })
-
-    }
-
-    sbigopen = (e) => {
-        this.setState({
-            operss: true
-        })
-
-    }
-
-    // sbigopens=()=>{
-    //     this.setState({
-    //         operss:false
-    //     })
-    // }
-
-    onChangeTimePicker = (value, dateString) => {
-        this.setState({
-            TimePickervalue: dateString=== ""?"":moment(handleDateStrings(dateString))
-        })
-    }
-
-	// 附件相关 START
-    handleChange = (info) => {
-			if(info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
-				let {fileList} = this.state;
-
-				if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
-					console.log("handleChange1");
-					// if(fileList.length===0){
-					let fileLists = info.fileList;
-					this.setState({
-						// fileList:appendFileSizeToUploadFileAll(fileList),
-						fileList: fileLists,
-						deleteisnot: false
-					});
-					// }
-				}
-			}
-    }
-    onAttachmentRemove = (file) => {
-			if(!file.percent || file.percent == 100){
-				confirm({
-					title: '确定要删除这个附件吗?',
-					okText: '确定',
-					cancelText: '取消',
-					// content: 'Some descriptions',
-					onOk: () => {
-						console.log("665")
-						this.deleteAttachment(file)
-					},
-					onCancel() {
-						console.log('Cancel');
-					},
-				});
-				return false;
-			}
-
-    }
-    deleteAttachment = (file) => {
-         console.log(file);
-        let id=file.response ==undefined ? file.id : file.response.id
-        const url = `/attachments/${id}.json`
-        axios.delete(url, {
-        })
-            .then((response) => {
-                if (response.data) {
-                    const { status } = response.data;
-                    if (status == 0) {
-                        // console.log('--- success')
-
-                        this.setState((state) => {
-
-                            const index = state.fileList.indexOf(file);
-                            const newFileList = state.fileList.slice();
-                            newFileList.splice(index, 1);
-                            return {
-                                fileList: newFileList,
-                                deleteisnot:true
-                            };
-                        });
-                    }
-                }
-            })
-            .catch(function (error) {
-                console.log(error);
-            });
-    }
-
-
-    handleSubmit=()=>{
-        // console.log(this.state.languagewrite)
-        // console.log(this.state.systemenvironment)
-        // console.log(this.state.testcoderunmode)
-        var  attachment_ids;
-        if (this.state.fileList) {
-            attachment_ids = this.state.fileList.map(item => {
-                return item.response ? item.response.id : item.id
-            })
-        }
-        // console.log(attachment_ids);
-        // var data={
-        //     language:"",
-        //     runtime:"",
-        //     run_method:"",
-        //     attachment_id:"",
-        // }
-        // axios.post(url,data
-        // ).then((response) => {
-        //     if (response.data) {
-        //         // const { id } = response.data;
-        //         // if (id) {
-        //             this.props.showNotification('提交成功！');
-        //             // this.props.history.push(`/courses/${cid}/graduation_topics`);
-        //         // }
-        //     }
-        // })
-
-
-
-    }
-    render() {
-        const { getFieldDecorator } = this.props.form;
-        let {testcoderunmode ,systemenvironment,languagewrite,deleteisnot, fileList,TimePickervalue, scope_partmenttype, opensmail, newshixunlist, name, scope_partment, departmentslist, postapplyvisible, sendsure_applyvalue, postapplytitle, shixun_nametype, main_types, trainee_types, SelectTheCommandtype, opers, datalisttype, onSearchvalue} = this.state;
-        let options
-        if (departmentslist != undefined) {
-            options = this.state.departmentslist.map((d, k) => {
-                return (
-                    <Option key={d} id={k}>{d}</Option>
-                )
-            })
-        }
-        const uploadProps = {
-            width: 600,
-            fileList,
-            multiple: true,
-            // https://github.com/ant-design/ant-design/issues/15505
-            // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
-            // showUploadList: false,
-            action:  `${getUploadActionUrl()}`,
-            onChange: this.handleChange,
-            onRemove: this.onAttachmentRemove,
-            beforeUpload: (file, fileList) => {
-
-                if (this.state.fileList.length >= 1) {
-                    return false
-                }
-                // console.log('beforeUpload', file.name);
-                const isLt150M = file.size / 1024 / 1024 < 50;
-                if (!isLt150M) {
-                    // this.props.showNotification(`文件大小必须小于50MB`);
-									notification.open(
-										{
-											message: '提示',
-											description:
-												'文件大小必须小于50MB',
-
-										}
-									)
-                }
-                if(this.state.file !== undefined){
-                    console.log("763")
-									this.setState({
-                        file:file
-                    })
-                }else {
-									this.setState({
-                        file:file
-                    })
-                }
-
-                console.log("handleChange2");
-                return isLt150M;
-            },
-        }
-        // const uploadProps = {
-        //     width: 600,
-        //     fileList,
-        //     multiple: true,
-        //     // https://github.com/ant-design/ant-design/issues/15505
-        //     // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
-        //     // showUploadList: false,
-        //     action:  `${getUrl()}/api/attachments.json`,
-        //     onChange: this.handleChange,
-        //     onRemove: this.onAttachmentRemove,
-        //     beforeUpload: (file) => {
-        //         // console.log('beforeUpload', file.name);
-        //         const isLt50M = file.size / 1024 / 1024 < 50;
-        //         if (!isLt50M) {
-        //             this.props.showNotification('文件大小必须小于150MB!');
-        //         }
-        //         return isLt50M;
-        //     },
-        // };
-
-        return (
-
-            <div className="newMain clearfix" onClick={this.bigopens}>
-                <div className="educontent mt20 mb60 clearfix">
-                    <div className="new_shixun">
-
-                        <div className="mb10 edu-back-white">
-                            <p className="padding10-20 bor-bottom-greyE color-grey-3 clearfix">
-                                <span className="fl font-18 lineh-35">创建实训</span>
-															{this.props.user&&this.props.user.main_site===true?<a className="fr font-16 mt3 color-blue" href="/forums/2943"
-                                   target="_blank">实训制作指南</a>:""}
-                            </p>
-
-                            <div className="padding30-20">
-                                <p className="color-grey-6 font-16 mb15">实训名称</p>
-                                <div className="df">
-                                    <span className="mr30 color-orange pt10">*</span>
-                                    <div className="flex1">
-                                        <input
-                                            className={shixun_nametype === true ? "input-100-45 greyInput bor-red" : "input-100-45 greyInput"}
-                                            id="shixun_name" maxLength="60"
-                                            name="shixun[name]"
-                                            value={name}
-                                            onInput={this.shixunname}
-                                            placeholder="请输入实训名称，最多60个字符"
-                                            size="60"
-                                            type="text"
-                                            style={{width: shixun_nametype === false ? '1123px' : '93%'}}
-                                        />
-                                        <span
-                                            className={shixun_nametype === true ? "color-orange fr mt10" : "color-orange fr none"}
-                                            id="shixun_name_notice">
-                                                <i className="fa fa-exclamation-circle mr3"></i>必填项
-                                            </span>
-                                    </div>
-
-                                </div>
-                            </div>
-
-                        </div>
-
-
-                        <div className="mb10 edu-back-white padding30-20">
-
-                            <p className="color-grey-6 font-16 mb15">简介</p>
-
-                            <div className="df">
-                                <div className="flex1 break_word show_content_grey new_li" id="memoMD">
-                                    <textarea style={{display: 'none'}} id="evaluate_script_shows"
-                                              name="content"></textarea>
-                                </div>
-                            </div>
-                            <p id="e_tip_memoNew" className="edu-txt-right color-grey-cd font-12"></p>
-                            <p id="e_tips_memoNew" className="edu-txt-right color-grey-cd font-12"></p>
-                        </div>
-
-                        <div className="mb10 edu-back-white padding30-20">
-                            <p className="color-grey-6 font-16 mb15">技术平台</p>
-                            <div className="clearfix mb20">
-                                <span className="mr30 color-orange pt5 fl">*</span>
-                                <div className="width15 fl mr20"
-																		 // onMouseLeave={this.bigopens}
-																>
-                                    <Select placeholder="请选择主类别"
-                                            style={{width: 180}}
-                                            onChange={this.bigClass}
-                                            // onMouseEnter={this.bigopen}
-                                            onSelect={this.bigopens}
-                                            defaultOpen={false}
-                                            // open={opers}
-                                    >
-                                        {
-                                            newshixunlist === undefined ? "" : newshixunlist.main_type.map((item, key) => {
-                                                return (
-																										<Option value={item.id} key={key} >
-																											 <Tooltip placement="right" title={item.description=== ""?"无描述":item.description} >
-																															{item.type_name}
-																											 </Tooltip>
-																										</Option>
-                                                )
-                                            })
-                                        }
-                                    </Select>
-                                    <p className="edu-txt-left font-12">
-                                        列表中没有？
-                                        <a className="color-blue" onClick={this.post_apply}> 申请新建</a>
-                                    </p>
-
-                                    <Modal
-                                        keyboard={false}
-                                        title="申请新建"
-                                        visible={postapplyvisible}
-                                        closable={false}
-                                        footer={null}
-                                        width={850}
-                                        heigth={720}
-                                    >
-                                        {/*<Form  onSubmit={this.handleSubmit}>*/}
-                                        <div>
-                                            <li className="clearfix ml82" >
-                                                <label className="fl mt10 "><span
-                                                    className="color-red fl mt3">*</span>语言：&nbsp;&nbsp;</label>
-                                                <textarea className="fl task-form-80 task-height-150"
-																													style={{width:'89%',height:'100px'}}
-                                                          onInput={this.setlanguagewrite}
-                                                          value={languagewrite}
-                                                          placeholder="请填写该镜像是基于什么语言：示例：Python"
-                                                          id="demand_info"></textarea>
-                                            </li>
-																					<div className={"color-red shixunspanred"}>{this.state.languagewritetype===true?"请填写该镜像语言":""}</div>
-                                            <li className="clearfix ml1">
-                                                <label className="panel-form-label fl ml50"><span
-                                                    className="color-red fl mt3">*</span>系统环境：&nbsp;&nbsp;</label>
-                                                <textarea className="fl task-form-80 task-height-150 "
-                                                          onInput={this.setsystemenvironment}
-																													style={{height:'100px'}}
-                                                          value={systemenvironment}
-                                                          placeholder="请填写该镜像是基于什么linux系统环境,代码运行环境"
-                                                          id="demand_info"></textarea>
-                                            </li>
-																					<div className={"color-red shixunspanred"}>{this.state.systemenvironmenttype===true?"请填写该镜像语言系统环境":""}</div>
-                                            <li className="clearfix">
-                                                <label className="fl mt10" ><span
-                                                    className="color-red fl mt3">*</span>测试代码运行方式：&nbsp;&nbsp;</label>
-
-                                                <textarea className="fl task-form-80 task-height-150 "
-                                                          onInput={this.settestcoderunmode}
-                                                          value={testcoderunmode}
-																													style={{height:'100px'}}
-                                                          placeholder="请填写该镜像中测试代码运行方式"
-                                                          id="demand_info"></textarea>
-                                            </li>
-																					<div className={"color-red shixunspanred"}>{this.state.testcoderunmodetype===true?"请填写该镜像测试代码运行方式":""}</div>
-                                            <li className="clearfix ml50">
-                                                <label className="panel-form-label fl mt-5"><span
-                                                    className="color-red fl">*</span>测试代码：&nbsp;&nbsp;</label>
-                                                <div  className="mt10" style={{
-                                                    display: "inline-block"
-                                                }}>
-																									<Upload {...uploadProps}>
-																										<Icon type="upload"  className="fl mt3" > </Icon>
-																										<span className="color-blue fl cdefault">上传附件</span>
-																										<span className="color-grey-c fl ml10 ">(单个文件50M以内)</span>
-
-																									</Upload>
-                                        </div>
-
-                                            </li>
-																					<div className={"color-red shixunspanred"}>
-																						{this.state.attachmentidstype===true?"请上传附件":""}
-																					</div>
-                                            <li className="edu-txt-center clearfix ">
-                                                <a className="pop_close task-btn  mr30"
-                                                   onClick={() => this.sendhideModaly()}
-                                                >取消</a>
-                                                <Button type="primary"  onClick={()=>this.sendsure_apply()}
-                                                   className="task-btn task-btn-orange">确定</Button>
-                                            </li>
-                                            <div className="cl"></div>
-                                        </div>
-                                        {/*</Form>*/}
-                                    </Modal>
-
-
-
-                                    <Modal
-                                        keyboard={false}
-                                        title="提示"
-                                        visible={postapplytitle}
-                                        closable={false}
-                                        footer={null}
-                                    >
-                                        <div>
-                                            <div className="task-popup-content"><p
-                                                className="task-popup-text-center font-16"><span
-                                                className="font-17 mt10">新建申请已提交，请等待管理员的审核</span></p>
-                                                <li className="font-14 mt15 color-grey-6 edu-txt-center">我们将在1-2个工作日内与您联系
-                                                </li>
-                                            </div>
-                                            <div className="task-popup-OK clearfix">
-                                                <a className="task-btn task-btn-orange"
-                                                   onClick={this.yeshidemodel}>知道啦</a>
-                                            </div>
-                                        </div>
-                                    </Modal>
-                                </div>
-                                <div className=" fl pr mr20"
-																		 // onMouseLeave={this.bigopens}
-																>
-                                    <Select mode="multiple" placeholder="请选择小类别"
-                                            style={{minWidth: 180}}
-                                            onChange={this.littleClass}
-                                            // onMouseEnter={this.bigopensmal}
-                                            onSelect={this.bigopens}
-                                            defaultOpen={false}
-                                            // open={opensmail}
-                                    >
-                                        {
-                                            newshixunlist === undefined ? "" : newshixunlist.small_type.map((item, key) => {
-                                                return (
-                                                    <Option value={item.id} key={key}>
-																											<Tooltip placement="right" title={item.description=== ""?"无描述":item.description} >
-																												{item.type_name}
-																											</Tooltip>
-                                                    </Option>
-                                                )
-                                            })
-                                        }
-                                    </Select>
-                                </div>
-                                <p className="fl ml10 color-grey-9 mt5">请在配置页面完成后续的评测脚本设置操作</p>
-                                <div style={{width: '57px'}} className="ml20 fl">
-                                    <span className={main_types === true ? "color-orange fl" : "color-orange fl none"}
-                                          id="shixun_tech_platform_notice"><i
-                                        className="fa fa-exclamation-circle mr3"></i>必填项</span>
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <div className="mb10 edu-back-white padding30-20">
-                            <p className="color-grey-6 font-16 mb20">命令行</p>
-                            <div className="pl25">
-                                <RadioGroup onChange={this.SelectTheCommand} value={this.state.webssh}>
-                                    <Radio className="radioStyle" value={0}><span>无命令行窗口</span> <span
-                                      className="color-grey-9">（选中则不给学员的实践任务提供命令窗口）</span></Radio>
-                                    <Radio className="radioStyle" value={1}><span>命令行练习窗口</span> <span
-                                      className="color-grey-9">（选中则给学员提供用于练习操作的命令行窗口）</span></Radio>
-                                    <Radio className="radioStyle" value={2}><span>命令行评测窗口</span> <span
-                                      className="color-grey-9">（选中则给学员提供用于关卡评测的命令行窗口）</span></Radio>
-                                    <Checkbox style={{display: SelectTheCommandtype ? "block" : "none"}}
-                                              className={"ml36"} checked={this.state.multi_webssh}
-                                              onChange={this.SelectTheCommandonChange}>
-                                        多个命令行窗口<span className="color-grey-9">（选中则允许学员同时开启多个命令行窗口）</span>
-                                    </Checkbox>
-                                </RadioGroup>
-                            </div>
-                        </div>
-
-
-                        <div className="mb10 edu-back-white padding30-20">
-                            <p className="color-grey-6 font-16 mb20">公开程度</p>
-                            <div className="pl25">
-                                <RadioGroup onChange={this.Selectpublic} value={this.state.use_scope}>
-                                    <Radio className="radioStyle" value={0}><span>对所有公开</span> <span
-                                      className="color-grey-9">(选中则所有已被试用授权的用户可以学习)</span></Radio>
-                                    <Radio className="radioStyle" value={1}><span>对指定单位公开</span> <span
-                                      className="color-grey-9">(选中则下方指定单位的已被试用授权的用户可以学习)</span></Radio>
-                                </RadioGroup>
-
-                                <div className="clearfix none" id="unit-all"
-                                     style={{display: this.state.scopetype === false ? 'none' : 'block'}}>
-                                    <div className="fl ml25">
-                                        <div className="fl" id="unit-input-part" style={{width: '100%'}}>
-                                            <div id="person-unit" className="fl pr mr10">
-                                                <div className="shixunScopeInput fl">
-                                                    <Select
-                                                        style={{width: '200px'}}
-                                                        placeholder="请输入并选择单位名称"
-                                                        onChange={(value) => this.shixunScopeInput(value)}
-                                                        onSearch={this.shixunHandleSearch}
-                                                        showSearch
-                                                        defaultActiveFirstOption={false}
-                                                        showArrow={false}
-                                                        filterOption={false}
-                                                        notFoundContent={null}
-                                                        value={onSearchvalue}
-                                                        className={scope_partmenttype === true ? "bor-red" : ""}
-                                                        // ifd={key}
-                                                    >
-                                                        {options}
-                                                    </Select>
-                                                </div>
-                                                <span className="color-grey-9">(搜索选中添加单位名称)</span>
-																							{this.state.datalisttype===true?<span className="color-red ml10">请勿选择重复单位</span>:""}
-                                                {/*<a className="white-btn orange-btn fl mt1 use_scope-btn" onClick={this.adduse_scopeinput}>+ 添加</a>*/}
-                                            </div>
-                                        </div>
-
-                                        <div style={{width: '100%'}}>
-                                            <div className="mt20 clearfix" id="task_tag_content">
-                                                {
-                                                    scope_partment === undefined ? "" : scope_partment.map((item, key) => {
-                                                        return (
-                                                            <li className="task_tag_span" key={key}><span>{item}</span>
-                                                                <a style={{color: 'rgba(0,0,0,.25)'}}
-                                                                   onClick={() => this.deleteScopeInput(key)}>×</a>
-                                                            </li>
-                                                        )
-                                                    })
-                                                }
-                                            </div>
-                                            {/*{*/}
-                                            {/*scope_partment===undefined?"":scope_partment.map((item,key)=>{*/}
-                                            {/*return(*/}
-                                            {/*<div className="shixunScopeInput fl" key={key}>*/}
-                                            {/*<Input*/}
-                                            {/*style={{width:'200px'}}*/}
-                                            {/*key={key}*/}
-                                            {/*className=""*/}
-                                            {/*suffix={<Icon type="close-circle" onClick={(key)=>this.deleteScopeInput(key)} style={{ color: 'rgba(0,0,0,.25)' }} />}*/}
-                                            {/*value={item}*/}
-                                            {/*/>*/}
-                                            {/*</div>*/}
-
-                                            {/*)*/}
-                                            {/*})*/}
-                                            {/*}*/}
-                                        </div>
-
-                                        <span className={scope_partmenttype === true ? "color-orange ml20 fl" : "none"}
-                                              id="public_unit_notice">
-                                        <i className="fa fa-exclamation-circle mr3"></i>
-                                    请选择需要公开的单位
-                                    </span>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <div className="mb10 edu-back-white padding30-20">
-                            <p className="color-grey-6 font-16 mb20">发布信息</p>
-                            <div className="clearfix"
-																 // onMouseLeave={this.bigopens}
-														>
-                                <div className="clearfix mb20 pl25">
-                                    <span className="fl color-grey-6 lineh-30 mr20"><span
-                                        className="mr10 color-orange mt2 fl">*</span>面向学员：</span>
-                                    <div className="with15 fl pr">
-                                        <Select placeholder="请选择学员类别"
-                                                style={{width: 180}}
-                                                onChange={this.Selectthestudent}
-                                                // onMouseEnter={this.sbigopen}
-                                                onSelect={this.bigopens}
-                                                // open={operss}
-                                        >
-                                            <Option value={1}>初级学员</Option>
-                                            <Option value={2}>中级学员</Option>
-                                            <Option value={3}>高级学员</Option>
-                                            <Option value={4}>顶级学员</Option>
-                                        </Select>
-                                    </div>
-                                    <span className="fl ml20 mt3 color-grey">实训难易度定位，不限定用户群体</span>
-                                    <div style={{width: '57px'}} className="ml20 mt2 fl">
-                                        <span
-                                            className={trainee_types === true ? "color-orange fl" : "color-orange fl none"}
-                                            id="shixun_tech_platform_notice"><i
-                                            className="fa fa-exclamation-circle mr3"></i>必填项</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <li className="mb20 pl25">
-                                <span className="fl edu-txt-right color-grey-6 mr20"
-                                      style={{"width": "86px"}}>复制：</span>
-                                <Checkbox onChange={this.Teacherscopy}></Checkbox>
-                                <label style={{top: '6px'}} className="color-grey-6 ml10">勾选则允许已认证的教师复制该实训</label>
-                            </li>
-                            <div className="clearfix pl25">
-                                <span className="fl edu-txt-right color-grey-6 lineh-30 mr20"
-                                      style={{"width": "86px"}}>开启时间：</span>
-                                <li className="fl">
-                                    <DatePicker
-                                        showToday={false}
-                                        locale={locale}
-																				showTime={{ format: 'HH:mm' }}
-																				style={{"width": "184px"}}
-																				format="YYYY-MM-DD HH:mm"
-                                        placeholder="请选择开启时间"
-                                        onChange={this.onChangeTimePicker}
-																				value={TimePickervalue && moment(TimePickervalue, "YYYY-MM-DD HH:mm")}
-																				disabledDate={disabledDate}
-																				disabledTime={disabledDateTime}
-																				dropdownClassName="hideDisable"
-                                    />
-                                    <label style={{top: '6px'}} className="color-grey-6 ml10">
-                                        （为空，则学员在实训发布后，能随时开启实训挑战；否则，学员在开启时间后，才能开启实训挑战）
-                                    </label>
-                                </li>
-                            </div>
-                        </div>
-                        {/*<div className="mb10 edu-back-white padding30-20">*/}
-                        {/*<p className="color-grey-6 font-16 mb10">VNC图形化</p>*/}
-                        {/*<li className="mb20">*/}
-                        {/*<Checkbox onChange={this.TeachersUbuntu}></Checkbox>*/}
-                        {/*<label style={{top:'6px'}}  className="color-grey-6 ml10">勾选则给学员的实践任务提供Ubuntu系统图形化实践窗口，否则不提供</label>*/}
-                        {/*</li>*/}
-                        {/*</div>*/}
-
-
-                        <div className="clearfix mt30">
-														<Button className="defalutSubmitbtn fl mr20" loading={this.state.bottonloading}  onClick={this.submit_new_shixun}>
-															提交
-														</Button>
-                            <a href="/shixuns" className="defalutCancelbtn fl">取消</a>
-                        </div>
-
-
-                    </div>
-                </div>
-            </div>
-
-        );
-    }
-}
-const NewshixunsNew = Form.create({ name: 'newshixunsnew' })(Newshixuns);
-export default SnackbarHOC()(TPMIndexHOC(NewshixunsNew));
-
-
-
-
-
-
diff --git a/src/modules/tpm/shixunchild/Challenges/Challenges.js b/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 0e701c00..68c6f47c 100644
--- a/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -2,19 +2,17 @@ import React, { Component } from 'react';
 
 import { Link } from "react-router-dom";
 
-import { getImageUrl ,markdownToHTML, configShareForCustom} from 'educoder';
-
+import { getImageUrl, configShareForCustom } from 'educoder';
 import { CircularProgress } from 'material-ui/Progress';
 
-import { Modal, Spin, Tooltip ,message,Icon,Button,Divider} from 'antd';
+import { Modal, Spin, Tooltip, message, Icon, Button, Divider } from 'antd';
 
 import axios from 'axios';
 
 import '../shixunchildCss/Challenges.css';
 
-import AccountProfile from"../../../user/AccountProfile";
-
-const $ = window.$;
+import AccountProfile from "../../../user/AccountProfile";
+import RenderHtml from '../../../../components/render-html';
 
 class Challenges extends Component {
   constructor(props) {
@@ -25,15 +23,15 @@ class Challenges extends Component {
       startbtns: false,
       sumid: "",
       sumidtype: false,
-      startshixunCombattype:false,
-      shixunsreplace:false,
-      shixunsmessage:"",
-      hidestartshixunsreplacevalue:"",
-      operationstrue:false,
-			isSpin:false,
-      boxoffsetHeigh:0,
-      opentitletype:true,
-      isopentitletype:"Less",
+      startshixunCombattype: false,
+      shixunsreplace: false,
+      shixunsmessage: "",
+      hidestartshixunsreplacevalue: "",
+      operationstrue: false,
+      isSpin: false,
+      boxoffsetHeigh: 0,
+      opentitletype: true,
+      isopentitletype: "Less"
     }
   }
 
@@ -43,18 +41,18 @@ class Challenges extends Component {
 
     axios.get(ChallengesURL).then((response) => {
       if (response.status === 200) {
-        if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+        if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
 
-        }else{
+        } else {
           configShareForCustom(this.props.shixunsDetails.name, response.data.description)
           this.setState({
             ChallengesDataList: response.data,
             sumidtype: false,
           });
 
-          if(response.data.description=== ""||response.data.description===null||response.data.description===undefined){
+          if (response.data.description === "" || response.data.description === null || response.data.description === undefined) {
             this.setState({
-              isopentitletype:"Less",
+              isopentitletype: "Less",
             })
           }
           this.getjianjiesize()
@@ -65,29 +63,29 @@ class Challenges extends Component {
     });
   }
 
-  getjianjiesize=()=>{
-    let {ChallengesDataList}=this.state;
+  getjianjiesize = () => {
+    let { ChallengesDataList } = this.state;
     let boxoffsetHeigh;
-    let box=document.getElementById("shixunchallengesid");
+    let box = document.getElementById("shixunchallengesid");
 
-    if(box){
-      boxoffsetHeigh=box.offsetHeight
-      if(ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined){
+    if (box) {
+      boxoffsetHeigh = box.offsetHeight
+      if (ChallengesDataList === undefined || ChallengesDataList && ChallengesDataList.description === "" || ChallengesDataList && ChallengesDataList.description === null || ChallengesDataList && ChallengesDataList.description === undefined) {
 
-      }else{
-        if(this.state.isopentitletype==="greater"){
+      } else {
+        if (this.state.isopentitletype === "greater") {
 
-        }else{
-          if(boxoffsetHeigh>=300){
+        } else {
+          if (boxoffsetHeigh >= 300) {
             this.setState({
-              opentitletype:true,
-              isopentitletype:"greater",
-              boxoffsetHeigh:boxoffsetHeigh
+              opentitletype: true,
+              isopentitletype: "greater",
+              boxoffsetHeigh: boxoffsetHeigh
             })
-          }else{
+          } else {
             this.setState({
-              isopentitletype:"Less",
-              boxoffsetHeigh:boxoffsetHeigh
+              isopentitletype: "Less",
+              boxoffsetHeigh: boxoffsetHeigh
             })
           }
         }
@@ -98,42 +96,29 @@ class Challenges extends Component {
   }
 
   componentDidMount() {
-    if(this.state.isopentitletype==="greater"){
+    if (this.state.isopentitletype === "greater") {
 
-    }else {
+    } else {
       this.ChallengesList()
     }
 
   }
-  componentDidUpdate = (prevProps,prevState) => {
+  componentDidUpdate = (prevProps, prevState) => {
+    //防止陷入无限循环
+    if (prevState.ChallengesDataList != this.state.ChallengesDataList) {
+      if (this.state.isopentitletype === "greater") {
 
-      //防止陷入无限循环
-    if(prevState.ChallengesDataList!=this.state.ChallengesDataList){
-      if(this.state.isopentitletype==="greater"){
-
-      }else{
+      } else {
         this.getjianjiesize()
       }
     }
 
   }
-  updatamakedown = (id) => {
-    setTimeout(() => {
-      var shixunDescr = window.editormd.markdownToHTML(id, {
-        htmlDecode: "style,script,iframe",
-        taskList: true,
-        tex: true,
-        flowChart: true,
-        sequenceDiagram: true
-      });
-      $("#" + id + " p:first").addClass("ReactMarkdown");
-    }, 200)
-  }
 
   // 关卡的上移下移操作
   operations = (sumid, type) => {
     this.setState({
-      operationstrue:true
+      operationstrue: true
     })
     let { ChallengesDataList } = this.state;
     let operationUrl;
@@ -151,7 +136,7 @@ class Challenges extends Component {
         if (response.status === 200) {
           this.setState({
             operate: true,
-            operationstrue:false
+            operationstrue: false
           });
           this.ChallengesList();
 
@@ -160,7 +145,7 @@ class Challenges extends Component {
         console.log(error);
         this.setState({
           operate: true,
-          operationstrue:false
+          operationstrue: false
         });
         this.ChallengesList()
       })
@@ -180,7 +165,7 @@ class Challenges extends Component {
   }
   delOperationss = () => {
     let { ChallengesDataList, sumid } = this.state;
-    let operationUrl = "/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + sumid+".json"
+    let operationUrl = "/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + sumid + ".json"
 
     if (this.state.operate) {
       this.setState({
@@ -209,170 +194,181 @@ class Challenges extends Component {
     }
   }
 
-	startgameid=(id)=>{
+  startgameid = (id) => {
 
-		let url = "/shixuns/" + id + "/shixun_exec.json";
-		axios.get(url).then((response) => {
+    let url = "/shixuns/" + id + "/shixun_exec.json";
+    axios.get(url).then((response) => {
 
-			if (response.data.status === -2) {
-				this.setState({
-					shixunsreplace:true,
-					hidestartshixunsreplacevalue:response.data.message+".json"
-				})
-			} else if (response.data.status === -1) {
-				console.log(response)
-			}else if(response.data.status===-3){
-				this.setState({
-					shixunsmessage:response.data.message,
-					startshixunCombattype:true,
-				})
-			} else {
-				window.location.href = "/tasks/" + response.data.game_identifier;
-				// window.location.href = path
-				// let path="/tasks/"+response.data.game_identifier;
-				// this.props.history.push(path);
-			}
-		}).catch((error) => {
+      if (response.data.status === -2) {
+        this.setState({
+          shixunsreplace: true,
+          hidestartshixunsreplacevalue: response.data.message + ".json"
+        })
+      } else if (response.data.status === -1) {
+        console.log(response)
+      } else if (response.data.status === -3) {
+        this.setState({
+          shixunsmessage: response.data.message,
+          startshixunCombattype: true,
+        })
+      } else {
+        window.location.href = "/tasks/" + response.data.game_identifier;
+      }
+    }).catch((error) => {
 
-		});
+    });
 
 
-	}
+  }
 
-	hidestartshixunsreplace=(url)=>{
-		this.setState({
-			isSpin:true,
-		})
-		axios.get(url).then((response) => {
-			if(response.status===200){
-				// let path="/shixuns/"+response.data.shixun_identifier+"/challenges";
-				// this.props.history.push(path);
-				message.success('重置成功，正在进入实训！');
-				this.startgameid(response.data.shixun_identifier);
-				this.setState({
-					shixunsreplace:false,
-					isSpin:false,
-				})
+  hidestartshixunsreplace = (url) => {
+    this.setState({
+      isSpin: true,
+    })
+    axios.get(url).then((response) => {
+      if (response.status === 200) {
+        message.success('重置成功，正在进入实训！');
+        this.startgameid(response.data.shixun_identifier);
+        this.setState({
+          shixunsreplace: false,
+          isSpin: false,
+        })
 
-				// message.success('重置成功，正在进入实训！');
-				// this.startshixunCombat();
-			}}
-		).catch((error) => {
+      }
+    }
+    ).catch((error) => {
 
-		});
+    });
 
-	}
+  }
 
   //编辑实训题目选择题
-	EditTraining=(type, ids, path)=>{
-		let { ChallengesDataList } = this.state;
-		window.location.href = "/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + ids + path;
-	}
+  EditTraining = (type, ids, path) => {
+    let { ChallengesDataList } = this.state;
+    window.location.href = "/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + ids + path;
+  }
 
   //开始实战按钮
   startshixunCombat = (type, ids, id) => {
 
-		if(this.props.checkIfLogin()===false){
-			this.props.showLoginDialog()
-			return
-		}
+    if (this.props.checkIfLogin() === false) {
+      this.props.showLoginDialog()
+      return
+    }
 
-		if(this.props.checkIfProfileCompleted()===false){
-			this.setState({
-				AccountProfiletype:true
-			})
-			return
-		}
+    if (this.props.checkIfProfileCompleted() === false) {
+      this.setState({
+        AccountProfiletype: true
+      })
+      return
+    }
+    let { ChallengesDataList } = this.state;
+    this.setState({
+      startbtns: true
+    })
+    let url = "/shixuns/" + ChallengesDataList.shixun_identifier + "/shixun_exec.json?challenge_id=" + id;
+    axios.get(url).then((response) => {
 
-		// if(this.props.checkIfProfessionalCertification()===false){
-		// 	this.setState({
-		// 		AccountProfiletype:true
-		// 	})
-		// 	return
-		// }
-
-
-		let { ChallengesDataList } = this.state;
-			// let id = this.props.match.params.shixunId;
-				this.setState({
-					startbtns: true
-				})
-				let url = "/shixuns/" + ChallengesDataList.shixun_identifier + "/shixun_exec.json?challenge_id="+id;
-				axios.get(url).then((response) => {
-
-					if (response.data.status === -2) {
-						this.setState({
-							startbtns:false,
-							shixunsreplace:true,
-							hidestartshixunsreplacevalue:response.data.message+".json"
-						})
-					} else if (response.data.status === -1) {
-						this.setState({
-							startbtns: false
-						})
-						console.log(response)
-					}else if(response.data.status===-3){
-						this.setState({
-							shixunsmessage:response.data.message,
-							startshixunCombattype:true,
-							startbtns:false
-						})
-					} else {
-						window.location.href = "/tasks/" + response.data.game_identifier;
-						// window.location.href = path
-						// let path="/tasks/"+response.data.game_identifier;
-						// this.props.history.push(path);
-					}
-				}).catch((error) => {
-
-				});
-
-
-		// if(path===null){
-		// }else{
-		// 	if (type > 4 || type === false) {
-		// 		window.location.href = path;
-		// 	} else {
-		//
-		// 	}
-		// }
+      if (response.data.status === -2) {
+        this.setState({
+          startbtns: false,
+          shixunsreplace: true,
+          hidestartshixunsreplacevalue: response.data.message + ".json"
+        })
+      } else if (response.data.status === -1) {
+        this.setState({
+          startbtns: false
+        })
+        console.log(response)
+      } else if (response.data.status === -3) {
+        this.setState({
+          shixunsmessage: response.data.message,
+          startshixunCombattype: true,
+          startbtns: false
+        })
+      } else {
+        window.location.href = "/tasks/" + response.data.game_identifier;
+      }
+    }).catch((error) => {
 
+    });
 
   }
-  hidestartshixunCombattype=()=>{
+  hidestartshixunCombattype = () => {
     this.setState({
-      startshixunCombattype:false
+      startshixunCombattype: false
     })
   }
 
-	hideAccountProfile=()=>{
-		this.setState({
-			AccountProfiletype:false
-		})
-	}
-
-  opentitle=()=>{
+  hideAccountProfile = () => {
     this.setState({
-      opentitletype:!this.state.opentitletype,
+      AccountProfiletype: false
     })
   }
 
+  opentitle = () => {
+    this.setState({
+      opentitletype: !this.state.opentitletype,
+    })
+  }
+
+  // 开启挑战
+  beginChallenge = (url) => {
+    if (this.props.checkIfLogin() === false) {
+      this.props.showLoginDialog()
+      return;
+    }
+    if (this.props.checkIfProfileCompleted() === false) {
+      this.setState({
+        AccountProfiletype: true
+      })
+      return;
+    }
+    this.setState({
+      startbtns: true
+    })
+    if (url.indexOf(".json") > -1) {
+      axios.get(url).then((response) => {
+        if (response.data.status === -2) {
+          this.setState({
+            startbtns: false,
+            shixunsreplace: true,
+            hidestartshixunsreplacevalue: response.data.message + ".json"
+          })
+        } else if (response.data.status === -1) {
+          this.setState({
+            startbtns: false
+          })
+        } else if (response.data.status === -3) {
+          this.setState({
+            shixunsmessage: response.data.message,
+            startshixunCombattype: true,
+            startbtns: false
+          })
+        } else {
+          window.location.href = "/tasks/" + response.data.game_identifier;
+        }
+      }).catch((error) => {
+
+      });
+    } else {
+      window.location.href = url;
+    }
+  }
+
   render() {
-    let { ChallengesDataList, startbtns, sumidtype ,startshixunCombattype,shixunsreplace,shixunsmessage,hidestartshixunsreplacevalue,operationstrue,AccountProfiletype} = this.state;
+    let { ChallengesDataList, startbtns, sumidtype, startshixunCombattype, shixunsreplace, shixunsmessage, hidestartshixunsreplacevalue, operationstrue, AccountProfiletype } = this.state;
     let { loadingContent } = this.props;
-    if (ChallengesDataList != undefined) {
-      this.updatamakedown("ReactMarkdown")
-    }
     let id = this.props.match.params.shixunId;
-		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
+    const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 
     return (
       <React.Fragment>
-				{AccountProfiletype===true?<AccountProfile
-					hideAccountProfile={()=>this.hideAccountProfile()}
-					{...this.props}
-					{...this.state}
-				/>:""}
+        {AccountProfiletype === true ? <AccountProfile
+          hideAccountProfile={() => this.hideAccountProfile()}
+          {...this.props}
+          {...this.state}
+        /> : ""}
 
         {loadingContent ?
           <CircularProgress size={40} thickness={3} style={{
@@ -383,34 +379,6 @@ class Challenges extends Component {
           }} /> :
 
           <div>
-						{/*<p className="clearfix mb20">*/}
-						{/*	{this.props.identity < 5 && ChallengesDataList&&ChallengesDataList.shixun_status=== 0 ?*/}
-						{/*		<Link to={"/shixuns/" + id + "/challenges/new"}*/}
-						{/*					className="white-btn edu-greenline-btn fr addshixuns"*/}
-						{/*			// data-tip-down="新增代码编辑类型任务"*/}
-						{/*		>*/}
-						{/*			<Tooltip placement="bottom" title={"新增代码编辑类型任务"}>*/}
-						{/*				<img src={getImageUrl("images/educoder/icon/addsmallgreen.svg")}*/}
-						{/*						 className="fl mr5 mt6" />*/}
-						{/*				实践任务*/}
-						{/*			</Tooltip>*/}
-
-						{/*		</Link> : ""*/}
-						{/*	}*/}
-						{/*	{this.props.identity < 5 && ChallengesDataList&&ChallengesDataList.shixun_status=== 0 ?*/}
-						{/*		<Link to={"/shixuns/" + id + "/challenges/newquestion"}*/}
-						{/*					className="white-btn edu-greenline-btn fr mr20 addshixuns"*/}
-						{/*			// data-tip-down="新增选择题类型任务"*/}
-						{/*		>*/}
-						{/*			<Tooltip placement="bottom" title={"新增选择题类型任务"}>*/}
-						{/*				<img src={getImageUrl("images/educoder/icon/addsmallgreen.svg")}*/}
-						{/*						 className="fl mr5 mt5" />*/}
-						{/*				选择题任务*/}
-						{/*			</Tooltip>*/}
-						{/*		</Link> : ""*/}
-						{/*	}*/}
-						{/*</p>*/}
-
             <style>
               {
                 `
@@ -426,30 +394,23 @@ class Challenges extends Component {
               <div className={"shixunjianjie"}>
                 <span className="font-16 fl">简介</span>
 
-                {this.props.identity < 5 && ChallengesDataList&&ChallengesDataList.shixun_status < 3 ?
+                {this.props.identity < 5 && ChallengesDataList && ChallengesDataList.shixun_status < 3 ?
                   <a href={"/shixuns/" + id + "/settings?edit=1"} className="fr color-blue font-14">
-                  {/*<img src={getImageUrl("images/educoder/icon/edit.svg")} className="fl mt3 ml2" />*/}
-                  编辑
-                </a>:""}
+                    编辑
+                </a> : ""}
                 {this.props.user && this.props.user.main_site === true ?
-                  this.props.identity < 5?<a className="fr font-14 color-blue mr20" href="/forums/2943"
-                     target="_blank">实训制作指南</a> : "":""}
+                  this.props.identity < 5 ? <a className="fr font-14 color-blue mr20" href="/forums/2943"
+                    target="_blank">实训制作指南</a> : "" : ""}
               </div>
 
               <div>
                 <div className={"pd20"} id={"shixunchallengesid"}>
-                <style>
-                  {
-                    `
-                    .editormd-html-preview, .editormd-preview-container {
-                          width: 100% !important;
-                      }
-                    `
-                  }
-                </style>
                   <style>
                     {
                       `
+                    .editormd-html-preview, .editormd-preview-container {
+                          width: 100% !important;
+                      }
                     .markdown-body img{
                       min-height: 200px;
                     }
@@ -457,7 +418,8 @@ class Challenges extends Component {
                     }
                   </style>
 
-                  {ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?<style>
+
+                  {ChallengesDataList === undefined || ChallengesDataList && ChallengesDataList.description === "" || ChallengesDataList && ChallengesDataList.description === null || ChallengesDataList && ChallengesDataList.description === undefined ? <style>
                     {
                       `
 									#shixunchallengesid{
@@ -466,37 +428,35 @@ class Challenges extends Component {
 									}
 									`
                     }
-                  </style>:""}
+                  </style> : ""}
 
 
-                  {ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?"":this.state.isopentitletype==="greater"&&this.state.opentitletype===true?
-                  <style>
-                    {
-                      `
+                  {ChallengesDataList === undefined || ChallengesDataList && ChallengesDataList.description === "" || ChallengesDataList && ChallengesDataList.description === null || ChallengesDataList && ChallengesDataList.description === undefined ? "" : this.state.isopentitletype === "greater" && this.state.opentitletype === true ?
+                    <style>
+                      {
+                        `
                       #shixunchallengesid{
                           max-height:260px;
                           overflow: hidden;
                       }
                       `
-                    }
-                  </style>:""}
+                      }
+                    </style> : ""}
 
 
-                <div className="justify break_full_word new_li "
-                     id="challenge_editorMd_description">
-                  {ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?
-                    <div className="edu-tab-con-box clearfix edu-txt-center">
-                      {this.props.identity < 5?<img className="newedu-nodata-img mb20"
-                                                    src={getImageUrl("images/educoder/shixunnodata.png")} />:<img className="edu-nodata-img mb20"
-                                                                                                                  src={getImageUrl("images/educoder/nodata.png")} />}
-                      <p className="edu-nodata-p mb80">暂时还没有相关数据哦！</p>
-                    </div>
-                    :<p id="ReactMarkdown" style={{overflow:'hidden'}}>
-                    {ChallengesDataList === undefined ? "" :ChallengesDataList&&ChallengesDataList.description===null?"":
-                      <div className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML(ChallengesDataList.description).replace(/▁/g,"▁▁▁")}}></div>
+                  <div className="justify break_full_word new_li"
+                    id="challenge_editorMd_description">
+                    {ChallengesDataList === undefined || ChallengesDataList && ChallengesDataList.description === "" || ChallengesDataList && ChallengesDataList.description === null || ChallengesDataList && ChallengesDataList.description === undefined ?
+                      <div className="edu-tab-con-box clearfix edu-txt-center">
+                        {this.props.identity < 5 ? <img className="newedu-nodata-img mb20"
+                          src={getImageUrl("images/educoder/shixunnodata.png")} /> : <img className="edu-nodata-img mb20"
+                            src={getImageUrl("images/educoder/nodata.png")} />}
+                        <p className="edu-nodata-p mb80">暂时还没有相关数据哦！</p>
+                      </div>
+                      : ChallengesDataList === undefined ? "" : ChallengesDataList && ChallengesDataList.description === null ? "" :
+                        <RenderHtml value={ChallengesDataList.description} />
                     }
-                  </p>}
-                </div>
+                  </div>
                 </div>
                 <style>
                   {
@@ -510,11 +470,11 @@ class Challenges extends Component {
                     `
                   }
                 </style>
-                {this.state.isopentitletype==="Less"?"":this.state.opentitletype===true?<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
+                {this.state.isopentitletype === "Less" ? "" : this.state.opentitletype === true ? <Divider dashed={true} onClick={() => this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
                   <a className={"font-14  color-grey-9"}>阅读全文 <i className={"iconfont icon-jiantou9 font-14"}></i></a>
-                </Divider>:<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
-                  <a className={"font-14  color-grey-9"}>收起全文 <i className={"iconfont icon-changyongtubiao-xianxingdaochu-zhuanqu- font-14"}></i></a>
-                </Divider>}
+                </Divider> : <Divider dashed={true} onClick={() => this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
+                    <a className={"font-14  color-grey-9"}>收起全文 <i className={"iconfont icon-changyongtubiao-xianxingdaochu-zhuanqu- font-14"}></i></a>
+                  </Divider>}
 
               </div>
             </p>
@@ -522,34 +482,20 @@ class Challenges extends Component {
             <div className={"shixunjianjiecballenges edu-back-white boreee"}>
               <span className="font-16 fl">全部任务</span>
               <span className="fr mt2">
-                {/*                      <img src={getImageUrl("images/educoder/icon/addsmallgreen.svg")}
-                           className="fl mr5 mt6" />*/}
-                {/*<Tooltip placement="bottom" title={"新增代码编辑类型任务"}>*/}
-                {/*                </Tooltip>*/}
-                {this.props.identity < 5 && ChallengesDataList&&ChallengesDataList.shixun_status=== 0 ?
-                  <Link to={"/shixuns/" + id + "/challenges/new"}
-                        className="fr"
-                    // data-tip-down="新增代码编辑类型任务"
-                  >
+                {this.props.identity < 5 && ChallengesDataList && ChallengesDataList.shixun_status === 0 ?
+                  <Link to={"/shixuns/" + id + "/challenges/new"} className="fr" >
                     <Button type="primary"
-                            className="edu-default-btn edu-greenback-btn"
+                      className="edu-default-btn edu-greenback-btn"
                     >新增实践任务</Button>
                   </Link> : ""
                 }
-                {this.props.identity < 5 && ChallengesDataList&&ChallengesDataList.shixun_status=== 0 ?
-                  <Link to={"/shixuns/" + id + "/challenges/newquestion"}
-                        className="fr mr20"
-                    // data-tip-down="新增选择题类型任务"
-                  >
-                      <Button type="primary"
-                              className="edu-default-btn edu-greenback-btn"
-                      >新增选择题任务</Button>
+                {this.props.identity < 5 && ChallengesDataList && ChallengesDataList.shixun_status === 0 ?
+                  <Link to={"/shixuns/" + id + "/challenges/newquestion"} className="fr mr20" >
+                    <Button type="primary"
+                      className="edu-default-btn edu-greenback-btn"
+                    >新增选择题任务</Button>
                   </Link> : ""
                 }
-                {/*<Tooltip placement="bottom" title={"新增选择题类型任务"}>*/}
-                {/*  </Tooltip>*/}
-              {/*         <img src={getImageUrl("images/educoder/icon/addsmallgreen.svg")}
-                           className="fl mr5 mt5" />*/}
               </span>
             </div>
 
@@ -557,192 +503,162 @@ class Challenges extends Component {
 
               {ChallengesDataList === undefined ? <div className="alltask">
                 <div className="edu-tab-con-box clearfix edu-txt-center">
-                  {this.props.identity < 5?<img className="newedu-nodata-img mb20"
-                       src={getImageUrl("images/educoder/shixunnodata.png")} />:<img className="edu-nodata-img mb20"
-                                                                                     src={getImageUrl("images/educoder/nodata.png")} />}
+                  {this.props.identity < 5 ? <img className="newedu-nodata-img mb20"
+                    src={getImageUrl("images/educoder/shixunnodata.png")} /> : <img className="edu-nodata-img mb20"
+                      src={getImageUrl("images/educoder/nodata.png")} />}
                   <p className="edu-nodata-p mb80">暂时还没有相关数据哦！</p>
                 </div>
               </div> : ChallengesDataList.challenge_list === undefined ?
-                <div className="alltask">
-                  <div className="edu-tab-con-box clearfix edu-txt-center">
-                    {this.props.identity < 5?<img className="newedu-nodata-img mb20"
-                         src={getImageUrl("images/educoder/shixunnodata.png")} />:<img className="edu-nodata-img mb20"
-                                                                                       src={getImageUrl("images/educoder/nodata.png")} />}
-                    <p className="edu-nodata-p mb80">暂时还没有相关数据哦！</p>
-                  </div>
-                </div>
-                : ChallengesDataList.challenge_list.length === 0 ?
                   <div className="alltask">
                     <div className="edu-tab-con-box clearfix edu-txt-center">
-                      {this.props.identity < 5?<img className="newedu-nodata-img mb20"
-                           src={getImageUrl("images/educoder/shixunnodata.png")} />:<img className="edu-nodata-img mb20"
-                                                                                         src={getImageUrl("images/educoder/nodata.png")} />}
+                      {this.props.identity < 5 ? <img className="newedu-nodata-img mb20"
+                        src={getImageUrl("images/educoder/shixunnodata.png")} /> : <img className="edu-nodata-img mb20"
+                          src={getImageUrl("images/educoder/nodata.png")} />}
                       <p className="edu-nodata-p mb80">暂时还没有相关数据哦！</p>
                     </div>
                   </div>
-                  : ChallengesDataList.challenge_list.map((item, key) => {
-                    return (
-                      <div className="task-item" key={key} id={"shixun_index_" + item.position}>
-                        <div className="clearfix mb5">
-                          <div className="mr15 font-16 fl shixunstartbutton666666">第{key+1}关：{item.st === 0 ?"实践题":"选择题"}
+                  : ChallengesDataList.challenge_list.length === 0 ?
+                    <div className="alltask">
+                      <div className="edu-tab-con-box clearfix edu-txt-center">
+                        {this.props.identity < 5 ? <img className="newedu-nodata-img mb20"
+                          src={getImageUrl("images/educoder/shixunnodata.png")} /> : <img className="edu-nodata-img mb20"
+                            src={getImageUrl("images/educoder/nodata.png")} />}
+                        <p className="edu-nodata-p mb80">暂时还没有相关数据哦！</p>
+                      </div>
+                    </div>
+                    : ChallengesDataList.challenge_list.map((item, key) => {
+                      return (
+                        <div className="task-item" key={key} id={"shixun_index_" + item.position}>
+                          <div className="clearfix mb5">
+                            <div className="mr15 font-16 fl shixunstartbutton666666">第{key + 1}关：{item.st === 0 ? "实践题" : "选择题"}
+                              {item.status === 2 ?
+                                <Button type="primary" shape="round" size={"small"} className={"ml30 shixunstartbutton33BD8C"}>已完成</Button>
+                                : ""
+                              }
 
-                            {/*<a className={"edu-default-btn edu-blueline-btn fr Finish_button mtf3"}*/}
-                            {/*   onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}*/}
-                            {/*  // onClick={() => this.startshixunCombat(false)}*/}
-                            {/*   title={"查看挑战关卡"}*/}
-                            {/*>已完成</a>*/}
-                            {/*判断比较复杂 有排第一不能是灰色按钮*/}
-                            {item.status === 2 ?
-                              <Button  type="primary" shape="round" size={"small"} className={"ml30 shixunstartbutton33BD8C"}>已完成</Button>
-                              : ""
-                            }
+                              {
+                                ChallengesDataList.allow_skip === true && item.status === 1 ?
+                                  <Button type="primary" shape="round" size={"small"} className={"ml30 shixunstartbuttonFF6601"}>未完成</Button>
+                                  : ""
+                              }
+                              {
+                                ChallengesDataList.allow_skip === false ? item.status === 1 ?
+                                  <Button type="primary" shape="round" size={"small"} className={"ml30 shixunstartbuttonFF6601"}>未完成</Button>
+                                  : "" : ""
 
-                            {/*    <a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
-                                   title={"直接挑战"}
-                                   style={{marginTop: '-2px'}}
-                                   onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
-                                  // onClick={() => this.startshixunCombat(false)}
-                                >直接挑战</a> */}
-                            {
-                              ChallengesDataList.allow_skip === true && item.status === 1?
-                                <Button  type="primary" shape="round" size={"small"} className={"ml30 shixunstartbuttonFF6601"}>未完成</Button>
-                            : ""
-                            }
+                              }
 
-                            {/*    <Tooltip placement="bottom" title={"直接挑战"}>
-                                  <a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
-                                     onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
-                                     style={{marginTop: '-2px'}}>直接挑战</a>
-                                </Tooltip>
-                            */}
-                            {
-                              ChallengesDataList.allow_skip === false ? item.status === 1?
-                                <Button  type="primary" shape="round" size={"small"} className={"ml30 shixunstartbuttonFF6601"}>未完成</Button>
-                            :"":""
+                              {
+                                item.status === 0 ?
+                                  <Button type="primary" shape="round" size={"small"} className={"ml30 shixunstartbuttonFF6601"}>未完成</Button>
+                                  : ""
+                              }
+                            </div>
 
-                            }
-
-                            {/*<Tooltip placement="bottom" title={"请先完成前序关卡"}>*/}
-                            {/*  <a className={"edu-default-btn edu-greyback-btn fr Finish_button"}*/}
-                            {/*    // onClick={this.props.identity<5&&item.open_game!=""?()=>this.startshixunCombat(false,undefined, item.challenge_id):""}*/}
-                            {/*     style={{marginTop: '-2px'}}>直接挑战</a>*/}
-                            {/*</Tooltip>*/}
-
-                            {
-                              item.status === 0 ?
-                                <Button  type="primary" shape="round" size={"small"} className={"ml30 shixunstartbuttonFF6601"}>未完成</Button>
-                          :""
-                            }
-                          </div>
-
-                          <span className="fr">
+                            <span className="fr">
                               {item.delete_url != undefined &&
-                              <Tooltip placement="bottom" title={"删除"}>
-                                <a onClick={() => this.delOperations(item.challenge_id)}
-                                   style={{ display:this.props.user.admin===true?"block":this.props.identity < 5 && ChallengesDataList.shixun_status === 0 ? "block" : 'none' }}
-                                   className="fl mr25">
-                                  {/*<img src={getImageUrl("images/educoder/icon/close.svg")}*/}
-                                  {/*     className="fl mt5 ml5" />*/}
-                                  <i className={"iconfont icon-shanchu_Hover"}></i>
-                                </a>
-                              </Tooltip>
+                                <Tooltip placement="bottom" title={"删除"}>
+                                  <a onClick={() => this.delOperations(item.challenge_id)}
+                                    style={{ display: this.props.user.admin === true ? "block" : this.props.identity < 5 && ChallengesDataList.shixun_status === 0 ? "block" : 'none' }}
+                                    className="fl mr25">
+                                    <i className={"iconfont icon-shanchu_Hover"}></i>
+                                  </a>
+                                </Tooltip>
                               }
 
 
-                            {item.up_url != undefined &&
-                            <Tooltip placement="bottom" title={"向上移动"}>
-                              <a onClick={operationstrue===true?"":() => this.operations(item.challenge_id, "up")}
-                                 style={{ display:this.props.user.admin===true?"block":this.props.identity < 5 && ChallengesDataList.shixun_status === 0 ? "block" : 'none' }}
-                                 className="fl mr25">
-                                {/*<img src={getImageUrl("images/educoder/icon/moveup.svg")}*/}
-                                {/*     className="fl mt2 ml4" />*/}
-                                <i className={"iconfont icon-shangyi_Hover"}></i>
-                              </a>
-                            </Tooltip>
-                            }
-                            {item.down_url != undefined &&
-                            <Tooltip placement="bottom" title={"向下移动"}>
-                              <a onClick={operationstrue===true?"":() => this.operations(item.challenge_id, "down")}
-                                 style={{ display: this.props.user.admin===true?"block":this.props.identity < 5 && ChallengesDataList.shixun_status=== 0 ? "block" : 'none' }}
-                                 className="fl mr25">
-                                {/*<img src={getImageUrl("images/educoder/icon/movedown.svg")} className="fl mt2 ml4" />*/}
-                                <i className={"iconfont icon-xiayi_Hover"}></i>
-                              </a>
-                            </Tooltip>
-
-                            }
-
-                            {
-                              item.st === 1 ?
-                                <Tooltip placement="bottom" title={"编辑"}>
-                                  <Link
-                                    style={{ display:this.props.user.admin===true?"block":this.props.identity < 5 && ChallengesDataList.shixun_status< 3 ? "block" : 'none' }}
-                                    to={"/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + item.challenge_id + "/editquestion"}
-                                    className="fl">
-                                    {/*<img src={getImageUrl("images/educoder/icon/edit.svg")}*/}
-                                    {/*     className="fl mt3 ml2" />*/}
-                                    <i className={"iconfont icon-bianji_Hover"}></i>
-                                  </Link>
+                              {item.up_url != undefined &&
+                                <Tooltip placement="bottom" title={"向上移动"}>
+                                  <a onClick={operationstrue === true ? "" : () => this.operations(item.challenge_id, "up")}
+                                    style={{ display: this.props.user.admin === true ? "block" : this.props.identity < 5 && ChallengesDataList.shixun_status === 0 ? "block" : 'none' }}
+                                    className="fl mr25">
+                                    <i className={"iconfont icon-shangyi_Hover"}></i>
+                                  </a>
                                 </Tooltip>
-                                :
-                                <Tooltip placement="bottom" title={"编辑"}>
-                                  <Link
-                                    style={{ display:this.props.user.admin===true?"block":this.props.identity < 5 && ChallengesDataList.shixun_status < 3 ? "block" : 'none' }}
-                                    to={"/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + item.challenge_id + "/editcheckpoint"}
-                                    className="fl">
-                                    {/*<img src={getImageUrl("images/educoder/icon/edit.svg")}*/}
-                                    {/*     className="fl mt3 ml2" />*/}
-                                    <i className={"iconfont icon-bianji_Hover"}></i>
-                                  </Link>
+                              }
+                              {item.down_url != undefined &&
+                                <Tooltip placement="bottom" title={"向下移动"}>
+                                  <a onClick={operationstrue === true ? "" : () => this.operations(item.challenge_id, "down")}
+                                    style={{ display: this.props.user.admin === true ? "block" : this.props.identity < 5 && ChallengesDataList.shixun_status === 0 ? "block" : 'none' }}
+                                    className="fl mr25">
+                                    <i className={"iconfont icon-xiayi_Hover"}></i>
+                                  </a>
                                 </Tooltip>
-                            }
+
+                              }
+
+                              {
+                                item.st === 1 ?
+                                  <Tooltip placement="bottom" title={"编辑"}>
+                                    <Link
+                                      style={{ display: this.props.user.admin === true ? "block" : this.props.identity < 5 && ChallengesDataList.shixun_status < 3 ? "block" : 'none' }}
+                                      to={"/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + item.challenge_id + "/editquestion"}
+                                      className="fl">
+                                      <i className={"iconfont icon-bianji_Hover"}></i>
+                                    </Link>
+                                  </Tooltip>
+                                  :
+                                  <Tooltip placement="bottom" title={"编辑"}>
+                                    <Link
+                                      style={{ display: this.props.user.admin === true ? "block" : this.props.identity < 5 && ChallengesDataList.shixun_status < 3 ? "block" : 'none' }}
+                                      to={"/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + item.challenge_id + "/editcheckpoint"}
+                                      className="fl">
+                                      <i className={"iconfont icon-bianji_Hover"}></i>
+                                    </Link>
+                                  </Tooltip>
+                              }
 
                             </span>
-                        </div>
+                          </div>
 
-
-                        <div className="clearfix mb5">
-                          {/*onClick={() => this.EditTraining(this.props.identity, item.challenge_id, "/editquestion")}*/}
-                          {this.props.identity<5?
-                            item.st === 1 ?
-                              <div className="font-16 color05101a fonthiddens">{item.name}</div>
-                              :
-                              <div className="font-16 color05101a fonthiddens">{item.name}</div>:<div
-                              // onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editcheckpoint")}
-                              className="font-16 color05101a fonthiddens">{item.name}</div>
-                          }
-                          {/* onClick={() => this.EditTraining(this.props.identity, item.challenge_id, "/editcheckpoint")}*/}
-
-                          <Modal
-                            keyboard={false}
-                            visible={startbtns}
-                            closable={false}
-                            footer={null}
-                            className="startbtnModal"
-                          >
-                            <Spin size="large" />
-                          </Modal>
-
-                        </div>
-                        <div className="clearfix">
-                          <style>
-                            {
-                              `
-                              .task-colspan {
-                                min-width: 18% !important;
+                          <div className="challengtes_Item">
+                            <div className="flex1 width0">
+                              <div className="clearfix mb5">
+                                {this.props.identity < 5 ?
+                                  item.st === 1 ?
+                                    <div className="font-16 color05101a fonthiddens">{item.name}</div>
+                                    :
+                                    <div className="font-16 color05101a fonthiddens">{item.name}</div> : <div
+                                      className="font-16 color05101a fonthiddens">{item.name}</div>
                                 }
-                              `
-                            }
-                          </style>
-                          <span className="task-colspan"><span className={"shixunbingbaocun12"}>正在挑战： </span><span className={"shixunbingbaocun33312"}>{item.playing_count}人</span></span>
-													<span className="task-colspan"><span className={"shixunbingbaocun12"}>完成挑战： </span><span className={"shixunbingbaocun33312"}>{item.passed_count}人</span></span>
-													<span className="task-colspan"><span className={"shixunbingbaocun12"}>可获经验： </span><span className={"shixunbingbaocun33312"}>{item.score}点</span></span>
+                              </div>
+                              <div className="clearfix">
+                                <style>
+                                  {
+                                    `
+                                .task-colspan {
+                                  min-width: 18% !important;
+                                  }
+                                `
+                                  }
+                                </style>
+                                <span className="task-colspan"><span className={"shixunbingbaocun12"}>正在挑战： </span><span className={"shixunbingbaocun33312"}>{item.playing_count}人</span></span>
+                                <span className="task-colspan"><span className={"shixunbingbaocun12"}>完成挑战： </span><span className={"shixunbingbaocun33312"}>{item.passed_count}人</span></span>
+                                <span className="task-colspan"><span className={"shixunbingbaocun12"}>可获经验： </span><span className={"shixunbingbaocun33312"}>{item.score}点</span></span>
 
+                              </div>
+                            </div>
+                            {
+                              item.open_game ?
+                                <a onClick={() => this.beginChallenge(item.open_game)} className="challengeBtn blue">开启挑战</a>
+                                :
+                                <span className="challengeBtn">开启挑战</span>
+                            }
+                          </div>
                         </div>
-                      </div>
-                    )
-                  })}
+                      )
+                    })}
             </div>
+            <Modal
+              keyboard={false}
+              visible={startbtns}
+              closable={false}
+              footer={null}
+              className="startbtnModal"
+              centered={true}
+            >
+              <Spin size="large" />
+            </Modal>
             <Modal
               keyboard={false}
               title="提示"
@@ -756,16 +672,15 @@ class Challenges extends Component {
                 </p>
                 <p className="task-popup-text-center font-16 mt30">
                   <a className="pop_close task-btn mr20"
-                     onClick={() => this.clonedelOperationss()}
+                    onClick={() => this.clonedelOperationss()}
                   >取消</a>
                   <a onClick={() => this.delOperationss()}
-                     className="task-btn task-btn-orange ">确定</a>
+                    className="task-btn task-btn-orange ">确定</a>
 
                 </p>
               </div>
 
             </Modal>
-
             <Modal
               keyboard={false}
               title="提示"
@@ -792,15 +707,15 @@ class Challenges extends Component {
               closable={false}
               footer={null}
             >
-							<Spin indicator={antIcon} spinning={this.state.isSpin}>
-								<div className="task-popup-content">
-									<p className="task-popup-text-center font-16 pb20">实训已经更新了，正在为您重置!</p>
-								</div>
-								<div className="task-popup-submit clearfix">
-									<a className="task-btn task-btn-orange fr mr51"
-										 onClick={() => this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了</a>
-								</div>
-							</Spin>
+              <Spin indicator={antIcon} spinning={this.state.isSpin}>
+                <div className="task-popup-content">
+                  <p className="task-popup-text-center font-16 pb20">实训已经更新了，正在为您重置!</p>
+                </div>
+                <div className="task-popup-submit clearfix">
+                  <a className="task-btn task-btn-orange fr mr51"
+                    onClick={() => this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了</a>
+                </div>
+              </Spin>
             </Modal>
           </div>
         }
@@ -810,20 +725,4 @@ class Challenges extends Component {
   }
 }
 
-export default Challenges;
-    // {
-		// 				ChallengesDataList.allow_skip === false ? item.status === 1 && newstatus === 2 ?
-		// 					<Tooltip placement="bottom" title={"直接挑战"}>
-		// 						<a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
-		// 							 onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
-		// 						style={{marginTop: '-2px'}}>直接挑战</a>
-		// 					</Tooltip>
-		//
-		// 					: item.status === 1 && newstatus === 1 ?
-		// 						<Tooltip placement="bottom" title={"直接挑战"}>
-		// 							<a className={"edu-default-btn edu-blueback-btn fr Finish_button"}
-		// 								 onClick={()=>this.startshixunCombat(false,undefined, item.challenge_id)}
-		// 								 style={{marginTop: '-2px'}}>直接挑战</a>
-		// 						</Tooltip> : "" : ""
-		//
-		// 			}
\ No newline at end of file
+export default Challenges;
\ No newline at end of file
diff --git a/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 9e50e44d..391d9aa3 100644
--- a/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -1,13 +1,13 @@
 import React, { Component } from 'react';
-import { Link } from "react-router-dom";
-import { markdownToHTML, configShareForCustom,getImageUrl,getUploadActionUrlthree,appendFileSizeToUploadFileAll} from 'educoder'
-import { Divider, Tooltip,Upload,Modal,Statistic} from 'antd';
+
+import { MarkdownToHtml, configShareForCustom,getImageUrl,getUploadActionUrlthree,appendFileSizeToUploadFileAll} from 'educoder'
+import { Tooltip,Upload,Modal,Statistic} from 'antd';
 import LoadingSpin from '../../../../common/LoadingSpin';
 import 'antd/lib/pagination/style/index.css';
 import '../shixunchildCss/Challenges.css';
 import axios from 'axios';
-import {addjypertime} from "../../../../redux/actions/jupyter";
-const $ = window.$;
+
+
 const { Countdown } = Statistic;
 class Challengesjupyter extends Component {
 	constructor(props) {
@@ -613,7 +613,7 @@ class Challengesjupyter extends Component {
 								</style>:""}
 
 							<div className={"pd20"} id={"shixunchallengesid"}>
-								<p id="ReactMarkdown" style={{overflow:'hidden'}}>
+								<p  style={{overflow:'hidden'}}>
 									{/*{ChallengesDataList === undefined ? "" :ChallengesDataList&&ChallengesDataList.description===null?"":*/}
 									{/*	<div className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML(ChallengesDataList.description).replace(/▁/g,"▁▁▁")}}></div>*/}
 									{/*}*/}
@@ -625,9 +625,13 @@ class Challengesjupyter extends Component {
 																																																									src={getImageUrl("images/educoder/nodata.png")} />}
 											<p className="edu-nodata-p mb80">暂时还没有相关数据哦！</p>
 										</div>
-										:<p id="ReactMarkdown" style={{overflow:'hidden'}}>
+										:<p className={"markdown-body"} style={{overflow:'hidden'}}>
 											{ChallengesDataList === undefined ? "" :ChallengesDataList&&ChallengesDataList.description===null?"":
-												<div className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML(ChallengesDataList.description).replace(/▁/g,"▁▁▁")}}></div>
+												<MarkdownToHtml
+												//className="answers newcontent_editorMd_show"
+												content={`${ChallengesDataList.description}`}
+												selector={'Challenges'}
+												></MarkdownToHtml>
 											}
 										</p>}
 								</p>
diff --git a/src/modules/tpm/shixunchild/Challenges/Showmarkdown.js b/src/modules/tpm/shixunchild/Challenges/Showmarkdown.js
new file mode 100644
index 00000000..0997c8f5
--- /dev/null
+++ b/src/modules/tpm/shixunchild/Challenges/Showmarkdown.js
@@ -0,0 +1,37 @@
+import React, { Component } from 'react';
+
+class Showmarkdown extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+
+    }
+  }
+  componentDidMount() {
+
+    if (this.props.descriptions) {
+
+      window.editormd.markdownToHTML("memo_content_editorMd", {
+        htmlDecode: "style,script,iframe",  // you can filter tags decode
+        taskList: true,
+        tex: true,  // 默认不解析
+        flowChart: true,  // 默认不解析
+        sequenceDiagram: true // 默认不解析
+      });
+
+    }
+  }
+
+  render() {
+
+    return (
+      <div id="memo_content_editorMd" className="new_li">
+        <textarea style={{ 'display': 'none' }}>
+          {this.props.descriptions}
+        </textarea>
+      </div>
+    )
+  }
+}
+
+export default Showmarkdown;
\ No newline at end of file
diff --git a/src/modules/tpm/shixunchild/Collaborators/Collaborators.js b/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
index eceb6c5d..edfa26a0 100644
--- a/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
+++ b/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
@@ -1,8 +1,8 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
 
-import {Modal, Button, Radio, Input, Checkbox, message, Spin, Icon, Pagination} from 'antd';
+import { Modal, Button, Radio, Input, Checkbox, message, Spin, Icon, Pagination } from 'antd';
 
-import {getImageUrl, toPath} from 'educoder'
+import { getImageUrl, toPath } from 'educoder'
 
 import axios from 'axios';
 
@@ -66,9 +66,11 @@ class Collaborators extends Component {
     let id = this.props.match.params.shixunId;
 
     let collaborators = `/shixuns/` + id + `/collaborators.json`;
-    axios.get((collaborators),{params:{
-        page:pageNumber?pageNumber:undefined
-      }}).then((response) => {
+    axios.get((collaborators), {
+      params: {
+        page: pageNumber ? pageNumber : undefined
+      }
+    }).then((response) => {
       if (response.status === 200) {
         if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
 
@@ -89,19 +91,19 @@ class Collaborators extends Component {
         Collaboratorsvisibleadmin: false,
         Collaboratorslist: [],
         Searchadmin: [],
-        addadminrediovalue:undefined
+        addadminrediovalue: undefined
       });
     } else if (type === "admin") {
       this.setState({
         Collaboratorsvisible: false,
         Collaboratorslist: [],
         Searchadmin: [],
-        addadminrediovalue:undefined
+        addadminrediovalue: undefined
       });
     } else if (type === "collaborators_deletetype") {
       this.setState({
         collaborators_deletetype: false,
-        addadminrediovalue:undefined
+        addadminrediovalue: undefined
       });
     }
   }
@@ -160,7 +162,7 @@ class Collaborators extends Component {
   }
   onSearchadmin = (value) => {
 
-    let {collaboratorList, user_name, school_name} = this.state;
+    let { collaboratorList, user_name, school_name } = this.state;
     this.setState({
       // Searchadmin: undefined,
       spinnings: true,
@@ -204,7 +206,7 @@ class Collaborators extends Component {
 
   selectChangenickname = (e, key) => {
 
-    let {Searchadmin} = this.state;
+    let { Searchadmin } = this.state;
     let newlist = Searchadmin;
     for (var i = 0; i < newlist.length; i++) {
       newlist[key].checked = e.target.checked
@@ -241,7 +243,7 @@ class Collaborators extends Component {
   }
   allChange = (e) => {
 
-    let {Searchadmin} = this.state;
+    let { Searchadmin } = this.state;
     let newlist = Searchadmin;
     for (var i = 0; i < newlist.length; i++) {
       newlist[i].checked = e.target.checked
@@ -254,7 +256,7 @@ class Collaborators extends Component {
   submit_add_collaborators_form = () => {
 
     let id = this.props.match.params.shixunId;
-    let {Searchadmin, collaboratorList} = this.state;
+    let { Searchadmin, collaboratorList } = this.state;
     let newlist = Searchadmin;
     let user_ids = []
     if (newlist.length === 0) {
@@ -308,20 +310,16 @@ class Collaborators extends Component {
   }
   submit_addadminredio = () => {
 
-    let {addadminrediovalue} = this.state;
+    let { addadminrediovalue } = this.state;
 
     let id = this.props.match.params.shixunId;
 
     let url = "/shixuns/" + id + "/change_manager.json";
     if (addadminrediovalue === undefined) {
       this.setState({
-        // Collaboratorsvisible: false,
-        // Collaboratorslist: [],
-        // Searchadmin: [],
-        addadminrediovalue:undefined
+        addadminrediovalue: undefined
       });
       this.props.showNotification("所选人员为空，没有更换成功");
-      // this.CollaboratorsshowModal("admin")
       return
     }
 
@@ -333,11 +331,10 @@ class Collaborators extends Component {
         Collaboratorsvisible: false,
         Collaboratorslist: [],
         Searchadmin: [],
-        addadminrediovalue:undefined
+        addadminrediovalue: undefined
       });
       this.updatacomponentDiddata();
       this.props.showNotification(response.data.message);
-      // window.location.reload();
     }).catch((error) => {
       console.log(error)
     });
@@ -351,7 +348,7 @@ class Collaborators extends Component {
 
   }
   collaborators_deletes = () => {
-    let {collaborators_deletevalue} = this.state;
+    let { collaborators_deletevalue } = this.state;
     if (collaborators_deletevalue === null) {
       return
     }
@@ -373,7 +370,7 @@ class Collaborators extends Component {
   }
 
   loadMore = () => {
-    let {collaboratorList} = this.state;
+    let { collaboratorList } = this.state;
     this.setState({
       collaboratorListsum: collaboratorList.length,
       collaboratorListsumtype: false
@@ -388,7 +385,7 @@ class Collaborators extends Component {
     let allclientHeight = e.currentTarget.clientHeight + newscrollTop;
 
     if (e.currentTarget.scrollHeight - allclientHeight === 0 || e.currentTarget.scrollHeight - allclientHeight === 1 || e.currentTarget.scrollHeight - allclientHeight === -1) {
-      let {page, collaboratorList, user_name, school_name, Searchadmin} = this.state;
+      let { page, collaboratorList, user_name, school_name, Searchadmin } = this.state;
       let newpage = page + 1;
       let newSearchadmin = Searchadmin
       let id = this.props.match.params.shixunId;
@@ -423,13 +420,13 @@ class Collaborators extends Component {
     }
 
   }
-  onChangepageNumber=(pageNumber)=>{
+  onChangepageNumber = (pageNumber) => {
     this.updatacomponentDiddata(pageNumber);
   }
-  toggleHover=(type,key)=>{
+  toggleHover = (type, key) => {
     this.setState({
-      hovertype:type,
-      hoverkey:type===false?undefined:key
+      hovertype: type,
+      hoverkey: type === false ? undefined : key
     })
   }
   render() {
@@ -452,14 +449,14 @@ class Collaborators extends Component {
       page,
       limit
     } = this.state;
-    let {loadingContent} = this.props;
+    let { loadingContent } = this.props;
     const radioStyle = {
       display: 'block',
       height: '30px',
       lineHeight: '30px',
     };
 
-    const antIcon = <Icon type="loading" style={{fontSize: 24}} spin/>;
+    const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 
     // console.log(collaboratorList)
     return (
@@ -478,192 +475,192 @@ class Collaborators extends Component {
           }
         </style>
         <div className={"edu-back-white"}>
-        <p className="sortinxdirection sortinxdirectionbox"
-           style={{display: this.props.identity < 5 ? "flex" : "none"}}
-        >
-          <div className="yslwushiwidth">
-            <p
-              className="edu-default-btn edu-greenback-btn  ml20 height28 mt25 color333hezuo">{collaboratorList && collaboratorList.member_count}人</p>
-          </div>
+          <p className="sortinxdirection sortinxdirectionbox"
+            style={{ display: this.props.identity < 5 ? "flex" : "none" }}
+          >
+            <div className="yslwushiwidth">
+              <p
+                className="edu-default-btn edu-greenback-btn  ml20 height28 mt25 color333hezuo">{collaboratorList && collaboratorList.member_count}人</p>
+            </div>
 
-          <div className="yslwushiwidth xaxisreverseorder pt25">
-            {/*<a onClick={() => this.showCollaboratorsvisible("cooperation")}*/}
-            {/*	 className="edu-default-btn edu-greenback-btn  mr20 height40 yslwushiwidthbuton"*/}
-            {/*	 data-remote="true">*/}
-            {/*	<span className={"line27"}>+ </span>添加合作者*/}
-            {/*</a>*/}
-            {/*<a onClick={() => this.showCollaboratorsvisible("admin")}*/}
-            {/*	 style={{display:this.props.identity===1?"flex":"none"}}*/}
-            {/*	 data-remote="true"*/}
-            {/*	 className="edu-default-btn edu-greenback-btn  mr20 height40 yslwushiwidthbuton">*/}
-            {/*	<p style={{*/}
-            {/*		textAlign: "center",*/}
-            {/*		width:'100%',*/}
-            {/*		lineHeight: "29px",*/}
-            {/*	}}>更换管理员</p>*/}
-            {/*</a>*/}
-            <Button type="primary"
-                    onClick={() => this.showCollaboratorsvisible("cooperation")}
-                    className="edu-default-btn edu-greenback-btn  mr20 heighthezuo34 yslwushiwidthbuton"
-            >添加合作者</Button>
-            <Button type="primary" ghost
-                    style={{display: this.props.identity === 1 ? "flex" : "none"}}
-                    onClick={() => this.showCollaboratorsvisible("admin")}
-                    className="edu-default-btn  mr20 heighthezuo34">
-              更换管理员
+            <div className="yslwushiwidth xaxisreverseorder pt25">
+              {/*<a onClick={() => this.showCollaboratorsvisible("cooperation")}*/}
+              {/*	 className="edu-default-btn edu-greenback-btn  mr20 height40 yslwushiwidthbuton"*/}
+              {/*	 data-remote="true">*/}
+              {/*	<span className={"line27"}>+ </span>添加合作者*/}
+              {/*</a>*/}
+              {/*<a onClick={() => this.showCollaboratorsvisible("admin")}*/}
+              {/*	 style={{display:this.props.identity===1?"flex":"none"}}*/}
+              {/*	 data-remote="true"*/}
+              {/*	 className="edu-default-btn edu-greenback-btn  mr20 height40 yslwushiwidthbuton">*/}
+              {/*	<p style={{*/}
+              {/*		textAlign: "center",*/}
+              {/*		width:'100%',*/}
+              {/*		lineHeight: "29px",*/}
+              {/*	}}>更换管理员</p>*/}
+              {/*</a>*/}
+              <Button type="primary"
+                onClick={() => this.showCollaboratorsvisible("cooperation")}
+                className="edu-default-btn edu-greenback-btn  mr20 heighthezuo34 yslwushiwidthbuton"
+              >添加合作者</Button>
+              <Button type="primary" ghost
+                style={{ display: this.props.identity === 1 ? "flex" : "none" }}
+                onClick={() => this.showCollaboratorsvisible("admin")}
+                className="edu-default-btn  mr20 heighthezuo34">
+                更换管理员
             </Button>
 
-          </div>
+            </div>
 
-        </p>
-
-        <Modal
-          keyboard={false}
-          title="更换管理员"
-          visible={Collaboratorsvisible}
-          closable={false}
-          footer={null}
-        >
-          <div className="mb15 font-14 edu-txt-center color-orange-tip">
-            选择的成员将会成为新的管理员<br/> 您将不再拥有管理员的权限，但您仍是合作团队的一员
-          </div>
-          <div className="clearfix mb15 edu-bg-light-blue edu-max-h200">
-            <ul className="">
-              <li className={Collaboratorslist&&Collaboratorslist.length===0?"centertop20 clearfix":"clearfix"}>
-                {Collaboratorslist&&Collaboratorslist.length===0?<span>
-                  请先将新的管理员通过 <a className={"color-blue"} onClick={() => this.showCollaboratorsvisible("cooperation")}>"添加合作者"</a> 加入合作者列表
-                </span>:""}
-                <RadioGroup onChange={this.onChange}>
-                  {
-                    Collaboratorslist.length === 0 ? "" : Collaboratorslist.map((item, key) => {
-                      return (
-                        <Radio key={key} style={radioStyle} value={item.user_id} defaultChecked={false}
-                               onClick={() => this.addadminredio(item.user_id)}>{item.name}</Radio>
-                      )
-                    })
-                  }
-                </RadioGroup>
-              </li>
-            </ul>
-          </div>
-
-          <div className="clearfix edu-txt-center mt20">
-            <a className="pop_close task-btn mb10 mr40 colorFFF"
-               onClick={() => this.CollaboratorsshowModal("admin")}>取消</a>
-            <a className="task-btn task-btn-orange"
-               onClick={this.submit_addadminredio}>确定</a>
-          </div>
-
-        </Modal>
-
-        {Collaboratorsvisibleadmin === true ? <Modal
-          keyboard={false}
-          title="添加合作者"
-          visible={Collaboratorsvisibleadmin}
-          closable={false}
-          footer={null}
-          width={800}
-        >
-          {/*<Search*/}
-          {/*placeholder="输入用户的姓名、昵称、邮箱进行搜索"*/}
-          {/*value={onSearchcalue}*/}
-          {/*onSearch={(value) => this.onSearchadmin(value)}*/}
-          {/*onInput={this.onSearchadmins}*/}
-          {/*style={{width: '100%'}}*/}
-          {/*/>*/}
-          <span className="mr10">姓名或手机号:</span>
-
-          <Input placeholder="请输入姓名或手机号码搜索" value={user_name} onInput={(e) => {
-            this.setState({user_name: e.target.value})
-          }}
-                 style={{width: '215px'}}
-          ></Input>
-          <span className="label ml10 " style={{minWidth: '36px'}}>单位:</span>
-          <Input placeholder="请输入单位名称" className="ml10" value={school_name} onInput={(e) => {
-            this.setState({school_name: e.target.value})
-          }}
-                 style={{width: '215px'}}
-          >
-          </Input>
-
-          <a className="task-btn task-btn-orange ml20" onClick={() => this.onSearchadmin()}
-             style={{height: '30px', lineHeight: '30px', width: '70px'}}
-          >搜索</a>
-          <p className="clearfix pl35 mt20">
-            <span className="fl edu-txt-w100 task-hide font-bd ml10 edu-txt-left">姓名</span>
-            <span className="fl edu-txt-w100 task-hide font-bd">职业</span>
-            <span className="fl edu-txt-w180 task-hide font-bd ml80">单位</span>
           </p>
 
+          <Modal
+            keyboard={false}
+            title="更换管理员"
+            visible={Collaboratorsvisible}
+            closable={false}
+            footer={null}
+          >
+            <div className="mb15 font-14 edu-txt-center color-orange-tip">
+              选择的成员将会成为新的管理员<br /> 您将不再拥有管理员的权限，但您仍是合作团队的一员
+          </div>
+            <div className="clearfix mb15 edu-bg-light-blue edu-max-h200">
+              <ul className="">
+                <li className={Collaboratorslist && Collaboratorslist.length === 0 ? "centertop20 clearfix" : "clearfix"}>
+                  {Collaboratorslist && Collaboratorslist.length === 0 ? <span>
+                    请先将新的管理员通过 <a className={"color-blue"} onClick={() => this.showCollaboratorsvisible("cooperation")}>"添加合作者"</a> 加入合作者列表
+                </span> : ""}
+                  <RadioGroup onChange={this.onChange}>
+                    {
+                      Collaboratorslist.length === 0 ? "" : Collaboratorslist.map((item, key) => {
+                        return (
+                          <Radio key={key} style={radioStyle} value={item.user_id} defaultChecked={false}
+                            onClick={() => this.addadminredio(item.user_id)}>{item.name}</Radio>
+                        )
+                      })
+                    }
+                  </RadioGroup>
+                </li>
+              </ul>
+            </div>
 
-          <div className="mt5" style={{background: '#f7f9fd'}}>
-            <Spin indicator={antIcon} spinning={this.state.spinnings}>
-              <div className="clearfix">
-                <ul className="upload_select_box fl" id="search_not_teachers_list"
+            <div className="clearfix edu-txt-center mt20">
+              <a className="pop_close task-btn mb10 mr40 colorFFF"
+                onClick={() => this.CollaboratorsshowModal("admin")}>取消</a>
+              <a className="task-btn task-btn-orange"
+                onClick={this.submit_addadminredio}>确定</a>
+            </div>
+
+          </Modal>
+
+          {Collaboratorsvisibleadmin === true ? <Modal
+            keyboard={false}
+            title="添加合作者"
+            visible={Collaboratorsvisibleadmin}
+            closable={false}
+            footer={null}
+            width={800}
+          >
+            {/*<Search*/}
+            {/*placeholder="输入用户的姓名、昵称、邮箱进行搜索"*/}
+            {/*value={onSearchcalue}*/}
+            {/*onSearch={(value) => this.onSearchadmin(value)}*/}
+            {/*onInput={this.onSearchadmins}*/}
+            {/*style={{width: '100%'}}*/}
+            {/*/>*/}
+            <span className="mr10">姓名或手机号:</span>
+
+            <Input placeholder="请输入姓名或手机号码搜索" value={user_name} onInput={(e) => {
+              this.setState({ user_name: e.target.value })
+            }}
+              style={{ width: '215px' }}
+            ></Input>
+            <span className="label ml10 " style={{ minWidth: '36px' }}>单位:</span>
+            <Input placeholder="请输入单位名称" className="ml10" value={school_name} onInput={(e) => {
+              this.setState({ school_name: e.target.value })
+            }}
+              style={{ width: '215px' }}
+            >
+            </Input>
+
+            <a className="task-btn task-btn-orange ml20" onClick={() => this.onSearchadmin()}
+              style={{ height: '30px', lineHeight: '30px', width: '70px' }}
+            >搜索</a>
+            <p className="clearfix pl35 mt20">
+              <span className="fl edu-txt-w100 task-hide font-bd ml10 edu-txt-left">姓名</span>
+              <span className="fl edu-txt-w100 task-hide font-bd">职业</span>
+              <span className="fl edu-txt-w180 task-hide font-bd ml80">单位</span>
+            </p>
+
+
+            <div className="mt5" style={{ background: '#f7f9fd' }}>
+              <Spin indicator={antIcon} spinning={this.state.spinnings}>
+                <div className="clearfix">
+                  <ul className="upload_select_box fl" id="search_not_teachers_list"
                     onScroll={this.contentViewScrolledit}>
-                  {Searchadmin === undefined ? <li style={{textAlign: 'center'}}>
-                    <span>请试试搜索一下</span>
-                  </li> : Searchadmin.length === 0 ? <NoneData/> : Searchadmin.map((item, key) => {
-                    return (
-                      <li key={key} style={{display: item.identify === "专业人士" ? "none" : "block"}}>
-                        <Checkbox className="fl mr20" checked={item.checked}
-                                  onChange={(e) => this.selectChangenickname(e, key)}
-                                  id={item.user_id}></Checkbox>
-                        <a className="task-hide color-grey3  fl span1 edu-txt-w80 edu-txt-left">{item.nickname}</a>
-                        <span className="task-hide fl color-grey edu-txt-w80 span2">{item.identify}</span>
-                        <span
-                          title={item.school_name}
-                          style={{width: '150px'}}
-                          className="span3 color-grey fl edu-txt-w260 task-hide ml50 task-hide">{item.school_name}</span>
-                      </li>
-                    )
-                  })
+                    {Searchadmin === undefined ? <li style={{ textAlign: 'center' }}>
+                      <span>请试试搜索一下</span>
+                    </li> : Searchadmin.length === 0 ? <NoneData /> : Searchadmin.map((item, key) => {
+                      return (
+                        <li key={key} style={{ display: item.identify === "专业人士" ? "none" : "block" }}>
+                          <Checkbox className="fl mr20" checked={item.checked}
+                            onChange={(e) => this.selectChangenickname(e, key)}
+                            id={item.user_id}></Checkbox>
+                          <a className="task-hide color-grey3  fl span1 edu-txt-w80 edu-txt-left">{item.nickname}</a>
+                          <span className="task-hide fl color-grey edu-txt-w80 span2">{item.identify}</span>
+                          <span
+                            title={item.school_name}
+                            style={{ width: '150px' }}
+                            className="span3 color-grey fl edu-txt-w260 task-hide ml50 task-hide">{item.school_name}</span>
+                        </li>
+                      )
+                    })
 
-                  }
-                </ul>
-              </div>
-            </Spin>
-          </div>
-          <div className="mt10 clearfix">
+                    }
+                  </ul>
+                </div>
+              </Spin>
+            </div>
+            <div className="mt10 clearfix">
 
-          <span className="fl mr15">
-              <Checkbox className="fl" checked={allChangechecked} onChange={this.allChange}>全选</Checkbox>
-              <div className="fl" style={{height: '27px'}}>
+              <span className="fl mr15">
+                <Checkbox className="fl" checked={allChangechecked} onChange={this.allChange}>全选</Checkbox>
+                <div className="fl" style={{ height: '27px' }}>
                   <span className="color-orange fl" id="add_teacher_notice"
-                        style={{display: Collaboratorslisttype === true ? 'inline' : 'none'}}>请至少选择一个用户</span>
-              </div>
-          </span>
+                    style={{ display: Collaboratorslisttype === true ? 'inline' : 'none' }}>请至少选择一个用户</span>
+                </div>
+              </span>
 
 
-          </div>
-          {useristrue === true ? <span className={"color-red"}>请先选择用户</span> : ""}
-          <div className="clearfix edu-txt-center mt20">
-            <a className="pop_close task-btn mb10 mr40 colorFFF"
-               onClick={() => this.CollaboratorsshowModal("cooperation")}>取消</a>
-            <a className="task-btn task-btn-orange"
-               onClick={() => this.submit_add_collaborators_form()}>确定</a>
-          </div>
-        </Modal> : ""}
-        <style>
-          {
-            `
+            </div>
+            {useristrue === true ? <span className={"color-red"}>请先选择用户</span> : ""}
+            <div className="clearfix edu-txt-center mt20">
+              <a className="pop_close task-btn mb10 mr40 colorFFF"
+                onClick={() => this.CollaboratorsshowModal("cooperation")}>取消</a>
+              <a className="task-btn task-btn-orange"
+                onClick={() => this.submit_add_collaborators_form()}>确定</a>
+            </div>
+          </Modal> : ""}
+          <style>
+            {
+              `
 									.collaborators-item-middles{width: 100% !important;}
 									.ysltithead{
 									    padding-bottom: 20px;
 									}
 									`
-          }
-        </style>
-        <div className="pl20" id="collaborators_list_info">
-          {
-            collaboratorList === undefined || collaboratorList.length === 0 ? "" : collaboratorList.members.map((item, key) => {
+            }
+          </style>
+          <div className="pl20" id="collaborators_list_info">
+            {
+              collaboratorList === undefined || collaboratorList.length === 0 ? "" : collaboratorList.members.map((item, key) => {
                 return (
                   <div className="collaborators-item clearfix sortinxdirection ysltithead" key={key}>
                     <a href={item.user.user_url} target="_blank" className="mr20 fl edu-position">
                       <img alt="用户头像" className="radius" height="48" src={getImageUrl("images/" + item.user.image_url)}
-                           width="48"/>
-                      <span className={item && item.user && item.user.shixun_manager === true? "ml20 yslusercjz  newyslusercjz" : "none "}
-                        // style={{display: this.props.power === false ? "none" : "inline-block"}}
+                        width="48" />
+                      <span className={item && item.user && item.user.shixun_manager === true ? "ml20 yslusercjz  newyslusercjz" : "none "}
+                      // style={{display: this.props.power === false ? "none" : "inline-block"}}
                       >
                         <p className="yslusercjztest newyslusercjztest">{item.user.shixun_manager === true ? "创建者" : ""}</p></span>
                     </a>
@@ -672,13 +669,13 @@ class Collaborators extends Component {
                     <div className="fl collaborators-item-middles">
                       <p className="mb10 sortinxdirection space-between hezuozhe655">
                         <a href={item.user.user_url} target="_blank" className="yslusername">{item.user.name}</a>
-                          {item.user.shixun_manager === true ? "" : <span>
-                            <i className={this.state.hovertype===true&&key===this.state.hoverkey?"fontnewreds iconfont icon-shanchu_Hover":"fontneweees iconfont icon-shanchu_moren"}
-                               style={{display: this.props.power === false ? "none" : "block"}}
-                               onClick={() => this.collaborators_delete(item.user.user_id)}
-                               onMouseEnter={()=>this.toggleHover(true,key)}
-                               onMouseLeave={()=>this.toggleHover(false,key)}
-                          ></i></span> }
+                        {item.user.shixun_manager === true ? "" : <span>
+                          <i className={this.state.hovertype === true && key === this.state.hoverkey ? "fontnewreds iconfont icon-shanchu_Hover" : "fontneweees iconfont icon-shanchu_moren"}
+                            style={{ display: this.props.power === false ? "none" : "block" }}
+                            onClick={() => this.collaborators_delete(item.user.user_id)}
+                            onMouseEnter={() => this.toggleHover(true, key)}
+                            onMouseLeave={() => this.toggleHover(false, key)}
+                          ></i></span>}
                         {/*<span*/}
                         {/*  className={item && item.user && item.user.shixun_manager === true ? "ml20 yslusercjz " : "ml20"}*/}
                         {/*  style={{display: this.props.power === false ? "none" : "inline-block"}}><p*/}
@@ -716,48 +713,48 @@ class Collaborators extends Component {
                     {/*<a href="/watchers/unwatch?object_id=3039&amp;object_type=user&amp;shixun_id=61&amp;target_id=3039" className="fr user_default_btn user_private_btn mt30 font-16 mr20" data-method="post" data-remote="true" rel="nofollow">取消关注</a>*/}
                   </div>
                 )
-            })
-          }
-          <Modal
-            keyboard={false}
-            title="提示"
-            visible={collaborators_deletetype}
-            closable={false}
-            footer={null}
-          >
-            <div className="task-popup-content">
-              <div className="task-popup-text-center font-14">确定要删除吗？</div>
-            </div>
-            <div className="task-popup-submit clearfix">
-              <a className="pop_close task-btn mb10 mr40 colorFFF"
-                 onClick={() => this.CollaboratorsshowModal("collaborators_deletetype")}>取消</a>
-              <a className="task-btn task-btn-orange fr" onClick={this.collaborators_deletes}>确定</a>
-            </div>
+              })
+            }
+            <Modal
+              keyboard={false}
+              title="提示"
+              visible={collaborators_deletetype}
+              closable={false}
+              footer={null}
+            >
+              <div className="task-popup-content">
+                <div className="task-popup-text-center font-14">确定要删除吗？</div>
+              </div>
+              <div className="task-popup-submit clearfix">
+                <a className="pop_close task-btn mb10 mr40 colorFFF"
+                  onClick={() => this.CollaboratorsshowModal("collaborators_deletetype")}>取消</a>
+                <a className="task-btn task-btn-orange fr" onClick={this.collaborators_deletes}>确定</a>
+              </div>
 
-          </Modal>
+            </Modal>
+          </div>
+
+          {/*<div*/}
+          {/*  className={collaboratorList.length > 10 && collaboratorListsumtype === true ? "" : "none"}*/}
+          {/*  style={{textAlign: 'center', borderTop: '1px solid #eee'}}>*/}
+          {/*  <a className="loadMore" onClick={this.loadMore}>加载更多</a>*/}
+          {/*  /!*{*!/*/}
+          {/*  /!*	mylistansum>5?*!/*/}
+          {/*  /!*		<div className="edu-txt-center mt40 mb40">*!/*/}
+          {/*  /!*			<Pagination showQuickJumper current={page}*!/*/}
+          {/*  /!*									onChange={this.paginationonChanges} pageSize={limit}*!/*/}
+          {/*  /!*									total={mylistansum}*!/*/}
+          {/*  /!*			></Pagination>*!/*/}
+          {/*  /!*		</div>*!/*/}
+          {/*  /!*		:""*!/*/}
+          {/*  /!*}*!/*/}
+
+          {/*</div>*/}
         </div>
 
-        {/*<div*/}
-        {/*  className={collaboratorList.length > 10 && collaboratorListsumtype === true ? "" : "none"}*/}
-        {/*  style={{textAlign: 'center', borderTop: '1px solid #eee'}}>*/}
-        {/*  <a className="loadMore" onClick={this.loadMore}>加载更多</a>*/}
-        {/*  /!*{*!/*/}
-        {/*  /!*	mylistansum>5?*!/*/}
-        {/*  /!*		<div className="edu-txt-center mt40 mb40">*!/*/}
-        {/*  /!*			<Pagination showQuickJumper current={page}*!/*/}
-        {/*  /!*									onChange={this.paginationonChanges} pageSize={limit}*!/*/}
-        {/*  /!*									total={mylistansum}*!/*/}
-        {/*  /!*			></Pagination>*!/*/}
-        {/*  /!*		</div>*!/*/}
-        {/*  /!*		:""*!/*/}
-        {/*  /!*}*!/*/}
-
-        {/*</div>*/}
-        </div>
-
-        {collaboratorList && collaboratorList.member_count>10?<div className={"edu-txt-center mt30 "}>
-            <Pagination showQuickJumper defaultCurrent={1} total={collaboratorList && collaboratorList.member_count} onChange={this.onChangepageNumber} />
-        </div>:""}
+        {collaboratorList && collaboratorList.member_count > 10 ? <div className={"edu-txt-center mt30 "}>
+          <Pagination showQuickJumper defaultCurrent={1} total={collaboratorList && collaboratorList.member_count} onChange={this.onChangepageNumber} />
+        </div> : ""}
 
 
       </React.Fragment>
diff --git a/src/modules/tpm/shixunchild/Repository/Repository.css b/src/modules/tpm/shixunchild/Repository/Repository.css
new file mode 100644
index 00000000..94daae68
--- /dev/null
+++ b/src/modules/tpm/shixunchild/Repository/Repository.css
@@ -0,0 +1,75 @@
+.copy_rep_contentbox{
+    width: 310px;
+    background: rgba(250,250,250,1);
+    border-radius: 4px;
+    padding: 10px;
+}
+#copy_rep_content{
+    background: rgba(250,250,250,1);
+}
+.padding16-20{
+    padding: 16px 20px;
+    box-sizing: border-box;
+}
+.Websiteclone{
+    font-size: 14px;
+    font-family: MicrosoftYaHei;
+    color: rgba(51,51,51,1);
+    line-height: 40px;
+}
+
+.colorbe{
+ color:#bebebe
+}
+
+.borbotF4{
+    border-bottom: 1px solid #F4F4F4;
+}
+
+.padding16{
+    padding: 16px;
+    box-sizing: border-box;
+}
+
+.width490Repository{
+    width: 490px;
+    margin: 0 auto;
+    text-align: left;
+    color:#888888
+}
+
+.color5091FF{
+    color:#5091FF !important;
+}
+
+.height7052pxRepositor{
+    height: 70px;
+    line-height: 45px;
+}
+
+.padding020Repository{
+    padding: 0px 20px 0px 20px;
+}
+
+.colorFF6601{
+  color:#FF6601
+}
+
+.padding040pxRepository{
+    padding: 40px 20px 0px 20px;
+}
+
+.color888{
+    color:#888888
+}
+
+.padding0-12{
+    padding: 12px 0px;
+}
+
+.pointer{
+    cursor: pointer;
+}
+.pl23{
+    padding-left: 23px !important;
+}
\ No newline at end of file
diff --git a/src/modules/tpm/shixunchild/Repository/Repository.js b/src/modules/tpm/shixunchild/Repository/Repository.js
index c477422e..ddf40dd9 100644
--- a/src/modules/tpm/shixunchild/Repository/Repository.js
+++ b/src/modules/tpm/shixunchild/Repository/Repository.js
@@ -1,23 +1,16 @@
 import React, { Component } from 'react';
-
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames';
-
+import {getImageUrl} from "educoder";
+import RepositoryDirectories from './RepositoryDirectories';
+import { Button ,Tree,Icon,Modal,Tooltip} from "antd";
 import axios from 'axios';
-
-import { trace, trace_collapse ,getImageUrl, toPath} from "educoder";
-
-import RepositoryDirectories from './RepositoryDirectories'
-
-import { ActionBtn , NoneData } from 'educoder'
-import RepositoryCombinePath from './RepositoryCombinePath'
+import {Link} from 'react-router-dom';
+import RepositoryCombinePath from './RepositoryCombinePath';
+import RepositoryNoneData from './RepositoryNoneData';
+import Repositoryfile from './Repositoryfile';
+import './Repository.css';
+const { confirm } = Modal;
 const $ = window.$;
-
+const { TreeNode, DirectoryTree } = Tree;
 // 点击按钮复制功能
 function jsCopy(){
   var e = document.getElementById("copy_rep_content");
@@ -32,18 +25,184 @@ class Repository extends Component {
   constructor(props) {
     super(props);
     this.state={
-
+      evaluationvisible:false,
+      ischecke:false,
+      ischeckevalue:"",
+      trees:undefined,
+      treesdelecttype:true
 		}
   }
+
   componentDidMount() {
+    this.setState({
+      trees:this.props.trees
+    })
+  }
+  componentDidUpdate(prevProps, prevState) {
+    if(prevProps!=this.props){
+      this.setState({
+        trees:this.props.trees,
+        ischecke:false,
+        ischeckevalue:""
+      })
+
+    }
   }
   onRepoFileClick = (item) => {
-
     this.props.fetchRepo(item)
+  }
+
+  NewFolder=()=>{
+    this.setState({
+      evaluationvisible:true
+    })
+  }
+
+  hideNewFolder=()=>{
+    this.setState({
+      evaluationvisible:false
+    })
+  }
+
+  onSelectDirectoryTree=(selectedKeys, info)=>{
+    this.setState({
+      ischecke:false,
+      ischeckevalue:""
+    })
+    this.onRepoFileClick(info.node.props.item)
+  }
+
+   showDeleteConfirm =()=>{
+
+    let that=this;
+    if(this.state.ischeckevalue===""){
+      this.props.showNotification("请选择要删除的文件")
+      return
+    }else{
+      confirm({
+        title: '确认需要删除该文件?',
+        centered:true,
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          that.onAttachmentRemove()
+        }
+      });
+    }
 
   }
+  onAttachmentRemove=()=>{
+
+    let shixunId = this.props.match.params.shixunId;
+    let matchpath =this.props.match.path;
+    let Repositoryflag =undefined;
+
+    if( matchpath.indexOf("repository")>-1){
+      Repositoryflag =undefined;
+    }
+    if(matchpath.indexOf("secret_repository")>-1){
+      Repositoryflag =true;
+    }
+
+    let newfilspath=this.state.ischeckevalue;
+
+    let path="";
+
+    if(this.props.pathArray.length>0){
+      this.props.pathArray.map((item,key)=>{
+        if(key===0){
+          path=item
+        }else{
+          path=path+"/"+item
+        }
+      })
+    }
+    let pathtype=path;
+    if(path===undefined||path===""){
+      path=newfilspath
+    }else{
+      path=path+"/"+newfilspath
+    }
+    let gototype;
+    if(pathtype){
+      gototype=1
+    }else{
+      gototype=2
+    }
+
+    const url = `/shixuns//${shixunId}/delete_git_file.json`;
+
+    axios.delete(url, { data: {
+        path:path,
+        message:"删除"+newfilspath,
+        secret_repository:Repositoryflag
+      }})
+      .then((response) => {
+        if(response.data.status == 0) {
+          this.setState({
+            treesdelecttype:false
+          })
+           this.props.showNotification("删除成功")
+           if(gototype===1){
+             if(this.state.trees.length>1){
+               this.state.trees.map((item,key)=>{
+                 if(item.name===newfilspath){
+                   this.state.trees.splice(key,1)
+                 }
+               })
+             }else{
+               this.props.fetchRepo(this.props.pathArray.length-1)
+             }
+           }else{
+             this.state.trees.map((item,key)=>{
+               if(item.name===newfilspath){
+                 this.state.trees.splice(key,1)
+               }
+             })
+           }
+            this.setState({
+              ischecke:false,
+              ischeckevalue:"",
+              treesdelecttype:true
+            })
+
+        }
+      })
+      .catch(function (error) {
+        console.log(error)
+      });
+  }
+  onCheck = (checkedKeys, info) => {
+
+    if(checkedKeys.length===0){
+
+      this.setState({
+        ischecke:false,
+        ischeckevalue:""
+      })
+    }
+
+     if(info.node.props.title&&checkedKeys.length!=0){
+
+       this.setState({
+           ischecke:true,
+           ischeckevalue:info.node.props.title
+       })
+     }
+   };
   render() {
-    let { match, author, git_url, lastest_commit,repositoryLoading, commits,trees,pathArray , TPMRightSectionData } = this.props;
+    let { match, author, git_url, lastest_commit,repositoryLoading, commits,pathArray , TPMRightSectionData } = this.props;
+    let{trees,treesdelecttype}= this.state;
+    let matchpath =this.props.match.path;
+    let Repositoryflag ="";
+
+    if( matchpath.indexOf("repository")>-1){
+      Repositoryflag ="repository";
+    }
+
+    if(matchpath.indexOf("secret_repository")>-1){
+      Repositoryflag ="secret_repository";
+    }
 
     if (!author) {
       author = {}
@@ -52,60 +211,33 @@ class Repository extends Component {
     if(this.props.author!=undefined){
       userauthority=this.props.author.login===""||this.props.author.user_id===""||this.props.author.login===null||this.props.author.user_id===null;
     }
+
     return (
       <React.Fragment>
-        {/* jfinalshop/WebRoot */}
-        {/* <div className="pt30 pl20 pr20 pb30 mb10 clearfix" style={{background: '#fff'}}>
-          <span className="fl color-grey-6 font-16 cdefault mt1">
-            <i className="iconfont icon-fenzhi fl mr5"></i>
-            <span className="fl mt2">分支&nbsp;1</span>
-          </span>
-          <a href="https://www.educoder.net/forums/2784" target="_blank" 
-            className="fr edu-default-btn edu-greenback-btn">Git使用指南</a>
-        </div> */}
-
+        {this.state.evaluationvisible===true?<Repositoryfile
+          {...this.state}
+          {...this.props}
+          Repositoryflag={Repositoryflag}
+          hideNewFolder={()=>this.hideNewFolder()}
+        />:""}
         { repositoryLoading ? <div style={{ minHeight: '500px'}}></div> :
-
-          <div  className="" id="collaborators_list_info">
+          <div  className="mb10" id="collaborators_list_info">
             <div className="clearfix edu-back-white">
-              <div className="padding30-20 clearfix">
+              <div className="padding16-20 clearfix borbotF4">
                 <div className="fl1 clearfix1 mr201">
                   <div className="repositorytitle">
-                    {/* <form acceptCharset="UTF-8" action="/shixuns/uznmbg54/repository/uznmbg54"
-                    id="revision_selector" method="get">
-
-                    <div style={{margin:0, padding:0, display:'inline'}}>
-                      <input name="utf8" type="hidden" value="✓"></input>
-                    </div>
-                    <label className="font-16 fl mr5">分支:</label>
-                    <select className="winput-120-35 fl" id="branch" name="branch" defaultValue="master">
-                      <option value="master">master</option>
-                    </select> 
-                    <input id="rev" name="rev" size="8" type="hidden" value=""></input>
-                  </form> */}
-
-                    <a href="/forums/2784" target="_blank"
-                       className=" guideBtn" >Git使用指南</a>
-                    {
-                      this.props.current_user && (this.props.current_user.admin ==true || (TPMRightSectionData && TPMRightSectionData.creator && TPMRightSectionData.creator.login == this.props.current_user.login)) ?
-                      !this.props.secret_repository_tab && 
-                        <ActionBtn style="orangeLine" className="ml20" to={`/shixuns/${match.params.shixunId}/repository/add_file`}>+添加文件</ActionBtn>
-                      :""
-                    }
-                    
-                    
-                    
-                    <div className="fr font-12 color-grey-9 pr">
-                      <label className="fl mt2">网址克隆：</label>
+                    <div className="fl font-12 color-grey-9 pr">
+                      <label className="fl Websiteclone">网址克隆：</label>
+                      <div className={"fl copy_rep_contentbox"}>
                       <input type="text" id="copy_rep_content" className="fl url-input mt2"
-                             defaultValue={ git_url } style={{width: 313}}/>
-                      <a onClick={() => {
-                        jsCopy()
-                      }} data-tip-down="点击复制版本库地址"
-                         className="fl ml5">
-                        <i className="iconfont icon-wangzhikelong color-orange-tip" style={{lineHeight: '18px'}}></i>
-                      </a>
+                             defaultValue={ git_url } style={{width: 266}}/>
+                        <Tooltip placement="topLeft" title={"点击复制版本库"}>
+                          <a onClick={() => {jsCopy()}} className="fl ml5">
+                            <i className="iconfont icon-fuzhi2 colorbe" style={{lineHeight: '18px'}}></i>
+                          </a>
+                        </Tooltip>
 
+                      </div>
                       <style>
                         {`
                       .top-black-trangle {
@@ -122,7 +254,7 @@ class Repository extends Component {
 
                       #repository_url_tip {
 											top: 30px !important;
-										  left:132px !important;
+										  left:111px !important;
 											width: 292px !important;
                       }
                       `}
@@ -135,19 +267,19 @@ class Repository extends Component {
                         onClick={() => { $('#repository_url_tip').css('display') === 'none'
                           ? $('#repository_url_tip').show()
                           : $('#repository_url_tip').hide() }}
-                        className="fl ml6 mt1">
-                        <img src={getImageUrl("images/educoder/problem.png")}/>
+                        className="fl ml6 mt4">
+                        {/*<img src={getImageUrl("images/educoder/problem.png")}/>*/}
+                        <i className="iconfont icon-tishi2 colorbe"></i>
 												<div className="invite-tip clearfix none" id="repository_url_tip"
-														 style={{top: '33px', right: '-10px', width: '300px', display: 'none'}}>
-													<span className="top-black-trangle" style={{"right":"9px"}}></span>
-													<div className="padding20 invitecontent clearfix">
+														 style={{  width: '300px', display: 'none'}}>
+													<span className="top-black-trangle" style={{"right":"0px"}}></span>
+													<div className="padding16 invitecontent clearfix">
 														<p className="font-12 edu-txt-left">请上传当前实训中各个关卡涉及的所有文件<br/>
 															包括任务文件、执行文件，以及其他的必须文件<br/><br/>
 															提交代码的方法：<br/>
-															1、在电脑上安装Git tortoise客户端，<br/>
-															&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;或者其它熟悉的Git客户端<br/>
-															2、在Git客户端上向左侧的地址提交代码<br/><br/>
-															注意：<br/>
+															1、在电脑上安装Git tortoise客户端，或者其它熟悉的Git客户端,在Git客户端上向左侧的地址提交代码<br/>
+                              2.直接在平台上新建文件/文件夹，或者拖拽上传相关代码文件<br/><br/>
+															注意:<br/>
 															请在Git客户端要求填写时，按照如下说明填写：<br/>
 															* 用户名：使用您在本平台绑定的邮箱<br/>
 															* 口令：使用您在本平台的登录口令
@@ -159,11 +291,37 @@ class Repository extends Component {
                       </a>
 
                     </div>
+
+                    {
+                      this.props.current_user && ( this.props.identity<5||this.props.current_user.business==true || this.props.current_user.admin==true || (TPMRightSectionData && TPMRightSectionData.creator && TPMRightSectionData.creator.login == this.props.current_user.login)) ?
+                        // !this.props.secret_repository_tab &&
+                        (
+                          <div>
+                            <Button type="primary"
+                                    onClick={this.NewFolder}
+                                    className="edu-default-btn edu-greenback-btn  mt5 fr"
+                            >新建文件夹</Button>
+
+                            <Link to={`/shixuns/${match.params.shixunId}/${Repositoryflag}/add_file`}>
+                              <Button type="primary"
+                                      className="edu-default-btn edu-greenback-btn  mt5 mr10 fr"
+                              >新建文件</Button>
+                            </Link>
+
+                            <Link to={`/shixuns/${match.params.shixunId}/${Repositoryflag}/upload_file`}>
+                            <Button type="primary"
+                                    className="edu-default-btn edu-greenback-btn  mt5 mr10 fr"
+                            >上传文件</Button>
+                            </Link>
+                          </div>
+                        )
+
+                        :""
+                    }
+
                   </div>
 
-                  {this.props.secret_repository_tab && <RepositoryCombinePath {...this.props}>
 
-                  </RepositoryCombinePath>}
 
                 </div>
               </div>
@@ -175,92 +333,114 @@ class Repository extends Component {
               }
             `}
               </style>
+
+              {/*私密版本库*/}
+              {this.props.secret_repository_tab && (
+                <div className={"combinePathEditRow padding040pxRepository"}>
+                  <div className={"colorFF6601"}>私密版本库的文件对学员始终隐藏，无法访问查看。 </div>
+                  <div className={"colorFF6601"}>若评测学员任务需要使用私密版本库的文件，请指定将私密版本库合并到常规版本库的目标路径，以确保评测时能访问私密版本库的文件。</div>
+                </div>
+              )}
+            {  trees === undefined || trees === null ||trees.length===0? "":this.props.secret_repository_tab && <div className={"padding020Repository mt20"}>
+                  <RepositoryCombinePath {...this.props}></RepositoryCombinePath>
+              </div> }
+
+
               {/* 用户、最近提交时间 */}
               {
-                trees === undefined || trees === null ||trees.length===0? <NoneData></NoneData>:
-                  <div>
-										{commits===undefined?"":commits===null||commits.length===0?"":<div className="edu-back-skyblue padding10-20 clearfix">
-                      <img alt={author.name} className="radius fl mr10"
-                           height="30"
+                trees === undefined || trees === null ||trees.length===0? <RepositoryNoneData></RepositoryNoneData>:
+                  <div className={"padding020Repository"}>
+										{commits===undefined?"":commits===null||commits.length===0?"":<div className="padding0-12 clearfix height7052pxRepositor borbotF4">
+                      <img alt={author.name} className="radius fl mr10 mt5"
+                           height="35"
                            src={getImageUrl(`images/`+commits[0].author.image_url)}
                            style={{display:userauthority===true?"none":"block"}}
-                           width="30"/>
-                      <a href={author.user_url} className="mr5 va_sub" target="_blank">{commits[0].author.name}</a>
-                      <span className="color-grey-6 va_sub">提交于
+                           width="35"/>
+                      <a href={author.user_url} className="mr5 va_sub color-grey-8" target="_blank">{commits[0].author.name}</a>
+                      <span className="color-grey-8 va_sub">提交于
                                 <acronym title={commits[0].time}>
                                   {commits===undefined?"":commits[0].time}
                                 </acronym> ：{commits===undefined?"":commits[0].title}
                               </span>
-                      <a href={`/shixuns/${match.params.shixunId}/${this.props.secret_repository_tab ? 'secret_repository' : 'repository'}/${match.params.shixunId}/commits`}
-                         className="color-grey-6 fr font-16 ">
+                      <Link to={`/shixuns/${match.params.shixunId}/${this.props.secret_repository_tab ? 'secret_repository' : 'repository'}/${match.params.shixunId}/commits`}
+                         className="color-grey-8 fr font-16 mt3">
                         <i className="iconfont icon-tijiaojilu font-18 fl mr5"></i>
-                        <span className="fl mt2">提交记录</span>
-                      </a>
+                        <span className="fl color-grey-8 ">提交记录</span>
+                      </Link>
                     </div>}
 
-                    <div className="padding20" style={{minHeight: '372px'}}>
-                      <div className="bor-grey-e">
-                        {/* 当前目录位置 */}
-                        <RepositoryDirectories {...this.props}></RepositoryDirectories>
 
-                        <div className="versionFileList">
-                          { trees === undefined ?"": trees === null || trees.length===0?"":trees.map((item, index) => {
-                            return (
-                              <li id={`file${index}`} key={index} className=" file padding5-10">
-                                                <span style={{marginLeft: '0px'}} className="task-hide">
-                                                  <i className={`${item.type === 'tree' ? 'icon-wenjianjia' : 'icon-zuoye'}
-                                                    iconfont color-blue`}></i>
-                                                  <a
-                                                    onClick={() => this.onRepoFileClick(item)}>
-                                                    &nbsp;{item.name}
-                                                  </a>
-                                                </span>
-                              </li>
-                            )
-                          })}
+                    {/*className="padding20" */}
+                    <div style={{minHeight: '372px'}}>
+                      <div>
+                        {/* 当前目录位置 */}
+                        <div className={"mb10"}>
+                          <RepositoryDirectories {...this.props}></RepositoryDirectories>
                         </div>
+
+                        {/*<div className="versionFileList">*/}
+                        {/*  { trees === undefined ?"": trees === null || trees.length===0?"":trees.map((item, index) => {*/}
+                        {/*    return (*/}
+                        {/*      <li id={`file${index}`} key={index} className=" file padding5-10">*/}
+                        {/*                        <span style={{marginLeft: '0px'}} className="task-hide">*/}
+                        {/*                          <i className={`${item.type === 'tree' ? 'icon-wenjianjia' : 'icon-zuoye'}*/}
+                        {/*                            iconfont color-blue`}></i>*/}
+                        {/*                          <a*/}
+                        {/*                            onClick={() => this.onRepoFileClick(item)}>*/}
+                        {/*                            &nbsp;{item.name}*/}
+                        {/*                          </a>*/}
+                        {/*                        </span>*/}
+                        {/*      </li>*/}
+                        {/*    )*/}
+                        {/*  })}*/}
+                        {/*</div>*/}
+
+                        { this.props.current_user && (this.props.identity<5||this.props.current_user.business==true || this.props.current_user.admin ==true || (TPMRightSectionData && TPMRightSectionData.creator && TPMRightSectionData.creator.login == this.props.current_user.login)) ?
+                          <Button size={"small"} className={"fr"} type="link" onClick={this.showDeleteConfirm}>删除</Button>:""}
+                        <div className={"both"}></div>
+
+                        <style>
+                          {
+                            `
+                            .reposanttreeswitcher .ant-tree-switcher{
+                                display: none !important;
+                             }
+                            `
+                          }
+                        </style>
+
+
+                        <DirectoryTree
+                          className={"reposanttreeswitcher"}
+                          multiple
+                          defaultExpandAll
+                          checkable={ this.props.current_user && (this.props.identity<5||this.props.current_user.business==true ||this.props.current_user.admin ==true || (TPMRightSectionData && TPMRightSectionData.creator && TPMRightSectionData.creator.login == this.props.current_user.login)) ?true:false}
+                          onSelect={this.onSelectDirectoryTree}
+                          onCheck={this.onCheck}
+                        >
+                          {treesdelecttype===false || trees === undefined ?"": trees === null || trees.length===0?"":trees.map((item, index) => {
+                            return (
+                                <TreeNode className={item.type==='tree'?"pl23":""} checkable={item.type==='tree'?false:true} disableCheckbox={this.state.ischeckevalue===item.name?false:this.state.ischecke?true:item.type==='tree'?true:false} item={item} title={`${item.name}`} key={item.type==='tree'?"0-0":`0-0-${index}`} icon={item.type==='tree'?<i className="iconfont icon-xingzhuangjiehebeifen color-blue font-12" />:<i className="iconfont icon-xingzhuangjiehe color-blue font-12"/>} id={`file${index}`}  key={index}>
+
+                                </TreeNode>
+                            )})}
+                        </DirectoryTree>
                       </div>
                     </div>
+
                   </div>
               }
-
-              {/* 当前分支的文件 */}
-
             </div>
           </div>
         }
+        {    trees === undefined || trees === null ||trees.length===0?"":<a href="/forums/2784" target="_blank"
+           className=" guideBtn" >Git使用指南</a>}
+        {/* 当前分支的文件 */}
       </React.Fragment>
 
     );
   }
 }
-/*
- 提交记录
- <div  className="pl20" id="collaborators_list_info">
-    { RepositoryList===undefined?"":RepositoryList.commits.map((item,key)=>{
-      // {"email":"李暾","title":"2\n","id":"80cb6fc55a14bdd64a9c99913f416966238ed3de","time":"49年前"}
-      return(
-        <div>
-            <div>{item.email}</div>
-            <div>{item.title}</div>
-            <div>{item.id}</div>
-            <div>{item.time}</div>
-        </div>
-      )
-    }) }
-  </div>
 
 
-
-                  <li id="dd422c22b14b69b3452f4953ff33bb67" className=" file padding5-10">
-                    <span style={{marginLeft: '0px'}} className="task-hide">
-                    <i className="iconfont icon-zuoye color-blue"></i>
-                    <a href="/shixuns/uznmbg54/repository/uznmbg54/master/shixun_entry/1-1.py">1-1.py</a>
-                    </span>
-                  </li>
-
-
-
-*/
-
 export default Repository;
diff --git a/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js b/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js
index e074908e..757f1222 100644
--- a/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js
+++ b/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js
@@ -6,6 +6,7 @@ import { Form , Modal , Input , Breadcrumb , Button } from 'antd'
 import { Link } from 'react-router-dom'
 
 import axios from 'axios'
+import Bottomsubmit from "../../../modals/Bottomsubmit";
 
 /**
         ---------------------------- START
@@ -72,9 +73,35 @@ const mirrorNameModeMap = {
 class RepositoryAddFile extends Component {
   constructor(props) {
     super(props);
+    this.state = {
+      path:"",
+      gotppath:""
+    }
   }
 
   componentDidMount(){
+
+    if(this.props.newathArray){
+      if(this.props.newathArray.length>0){
+        let newfilspath="";
+        let list=this.props.newathArray;
+        list.map((item,key)=>{
+          if(key===0){
+            newfilspath=item;
+          }else{
+            newfilspath=newfilspath+'/'+item;
+          }
+        })
+        this.setState({
+          path:newfilspath,
+          gotppath:newfilspath
+        })
+
+        this.props.form.setFieldsValue({
+          path: newfilspath,
+        });
+      }
+    }
     let cmOptions = createCMOptions(this.props.mirror_name)
     const extend_editor = window.CodeMirror.fromTextArea(window.$('#codemirror-file-edit')[0]
         , cmOptions);
@@ -87,7 +114,7 @@ class RepositoryAddFile extends Component {
     window.editor_tempCodeMirror = extend_editor;
     this.extend_editor = extend_editor;
   }
-  
+
   checkPath= (rule, value, callback) =>{
     if(!value){
       callback('文件名不能为空');
@@ -99,6 +126,16 @@ class RepositoryAddFile extends Component {
   }
 
   handleSubmit = () =>{
+    let matchpath =this.props.match.path;
+
+    let Repositoryflag =false;
+
+    if( matchpath.indexOf("repository")>-1){
+      Repositoryflag =false;
+    }
+    if(matchpath.indexOf("secret_repository")>-1){
+      Repositoryflag =true;
+    }
     this.props.form.validateFieldsAndScroll((err, values) => {
       if(!err){
         let shixunId = this.props.match.params.shixunId;
@@ -106,10 +143,11 @@ class RepositoryAddFile extends Component {
         axios.post(url,{
           path:values.path,
           message:values.message,
-          content:this.extend_editor.getValue()
+          content:this.extend_editor.getValue(),
+          secret_repository:Repositoryflag===false?undefined:Repositoryflag
         }).then((result)=>{
           if(result){
-            this.props.history.push(`${result.data.url}`)
+            this.props.history.replace(`${Repositoryflag===true?`/shixuns/${shixunId}/secret_repository`:`/shixuns/${shixunId}/repository`}${this.state.gotppath===""?"":"/master/shixun_show/"+this.state.gotppath}`)
           }
         }).catch((error)=>{
           console.log(error);
@@ -117,11 +155,30 @@ class RepositoryAddFile extends Component {
       }
     })
   }
+  setinput=(e)=>{
+    this.setState({
+      path:e.target.value
+    })
+    this.props.form.setFieldsValue({
+      path:e.target.value,
+    });
+  }
   render(){
     const {getFieldDecorator} = this.props.form;
     let { shixunId } = this.props.match.params;
+
+    let matchpath =this.props.match.path;
+    let Repositoryflag ="";
+    if( matchpath.indexOf("repository")>-1){
+      Repositoryflag ="repository";
+    }
+    if(matchpath.indexOf("secret_repository")>-1){
+      Repositoryflag ="secret_repository";
+    }
+
     return(
-      <div className="educontent">
+      <div>
+        <div className="educontent mt30">
         <style>
           {`
             .formStyle .ant-form-item{
@@ -135,9 +192,9 @@ class RepositoryAddFile extends Component {
             .breadcrumb .ant-breadcrumb-separator{
               margin:0px 2px;
             }
-            .backgroudwhite{
-             display:none;
-            }
+            // .backgroudwhite{
+            //  display:none;
+            // }
             /*.filecode .CodeMirror.cm-s-railscasts{
               border:1px solid #E5E5E5;
             }
@@ -149,49 +206,95 @@ class RepositoryAddFile extends Component {
             }*/
           `}
         </style>
-        <p className="mt10 mb10">
-          <Breadcrumb separator='>' className="breadcrumb">
-            <Breadcrumb.Item href='/shixuns'>实训项目</Breadcrumb.Item>
-            <Breadcrumb.Item href={`/shixuns/${shixunId}/repository`}>版本库</Breadcrumb.Item>
-            <Breadcrumb.Item>添加新文件</Breadcrumb.Item>
-          </Breadcrumb>
-        </p>
+        {/*<p className="mt10 mb10">*/}
+        {/*  <Breadcrumb separator='>' className="breadcrumb">*/}
+        {/*    <Breadcrumb.Item href='/shixuns'>实训项目</Breadcrumb.Item>*/}
+        {/*    <Breadcrumb.Item href={`/shixuns/${shixunId}/repository`}>版本库</Breadcrumb.Item>*/}
+        {/*    <Breadcrumb.Item>添加新文件</Breadcrumb.Item>*/}
+        {/*  </Breadcrumb>*/}
+        {/*</p>*/}
         <Form onSubmit={this.handleSubmit} className="formStyle">
-          <div className="edu-back-white padding20-30 mb10">
-            <Form.Item label="文件名">
+          <style>
+            {
+              `
+              .padding20-30{
+                padding:20px 30px 60px 30px;
+              }
+              .formStyle .ant-form-item{
+                margin-bottom:0px !important;
+                height:60px;
+              }
+              `
+            }
+          </style>
+          <div className="edu-back-white padding20-30">
+            <p className="ant-form-item-label">
+              <div className={"font-20 color-black"}>新建文件</div>
+            </p>
+
+
+            <div className={" mb50"}>
+              <Form.Item  label="文件名称或文件路径">
               {getFieldDecorator('path', {
-                rules: [
-                  {
-                    validator:this.checkPath
-                  }]
+                rules: [{
+                  required: true, message: '请输入文件名称或文件路径',
+                },{
+                  whitespace: true, message: '请勿输入空格'
+                }],
               })(
-                <Input placeholder="输入文件路径名，如：src/HelloWorld.java" className="winput-300-35 fl"/>
+                <span>
+                      <span> </span><span><Input value={this.state.path} placeholder="请输入文件名称或文件路径" className="fl"  style={{ width: 240 }} size="large" onInput={(e)=>this.setinput(e)}/></span><span className={" ml10 fl"}>
+                  提示：1.输入文件名可以创建一个新文件；2.输入新文件夹名/新文件名可以创建新文件夹和新文件。（如：step1/HelloWorld.java）</span>
+                </span>
               )}
             </Form.Item>
-          </div>
-          <div className="edu-back-white padding30">
-            <p className="ant-form-item-label">
-              <label>内容</label>
-            </p>
+
+            </div>
+
+          <style>
+            {
+              `
+              .padding30{
+                padding:0px 30px 30px 30px;
+              }
+              `
+            }
+          </style>
+
 
             <div className="mt10 mb25 repoCMWrapper filecode">
               <textarea className="" id="codemirror-file-edit" style={{display:'none'}} name="content"></textarea>
             </div>
-
             <Form.Item label="提交信息">
+
               {getFieldDecorator('message', {
-                rules: [{required: true, message: "请输入提交信息"}],
+                rules: [{
+                  required: true, message: '请输入提交信息',
+                },{
+                  whitespace: true, message: '请勿输入空格'
+                }],
               })(
-                <textarea className="winput-100-130 fl"></textarea>
+                <Input placeholder="请输入本次提交的主要信息，合理的描述信息有利于代码历史记录的管理" size="large" className="winput-300-35 fl "/>
               )}
             </Form.Item>
+            {/*<Form.Item label="提交信息">*/}
+            {/*  {getFieldDecorator('message', {*/}
+            {/*    rules: [{required: true, message: "请输入提交信息"}],*/}
+            {/*  })(*/}
+            {/*    <textarea className="winput-100-130 fl"></textarea>*/}
+            {/*  )}*/}
+            {/*</Form.Item>*/}
           </div>
           <div className="clearfix mt30 edu-txt-right mb30">
-            <Button type="primary" className="defalutSubmitbtn fr ml20" onClick={this.handleSubmit}>提交</Button>
-            <Link className="defalutCancelbtn fr" to={`/shixuns/${shixunId}/repository`}>取消</Link>
+            {/*<Button type="primary" className="defalutSubmitbtn fr ml20" onClick={this.handleSubmit}>提交</Button>*/}
+            {/*<Link className="defalutCancelbtn fr" to={`/shixuns/${shixunId}/repository`}>取消</Link>*/}
+
           </div>
         </Form>
-        
+        </div>
+        <Bottomsubmit {...this.props} {...this.state} url={`/shixuns/${shixunId}/${Repositoryflag}${this.state.gotppath===""?"":"/master/shixun_show/"+this.state.gotppath}`}  onSubmits={() => this.handleSubmit()}/>
+
+        {/*<Bottomsubmit {...this.props} {...this.state} url={`/shixuns/${shixunId}/${Repositoryflag}`} onSubmits={() => this.handleSubmit()}/>*/}
       </div>
     )
   }
diff --git a/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js b/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js
new file mode 100644
index 00000000..59486230
--- /dev/null
+++ b/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js
@@ -0,0 +1,326 @@
+import React, { Component } from 'react';
+import { Form , Upload , Input} from 'antd';
+import axios from 'axios';
+import {  getupload_git_file } from 'educoder';
+import Repositoryfile from './Repositoryfile';
+import Bottomsubmit from "../../../modals/Bottomsubmit";
+import "./Repository.css"
+const { Dragger } = Upload;
+class RepositoryAddFileupload_files extends Component {
+  constructor(props) {
+    super(props);
+    this.state={
+      filspath:"",
+      visibles:false,
+      message:undefined,
+      fileList: [
+        // {
+        //   uid: '-1',
+        //   name: 'xxx.png',
+        //   status: 'done',
+        //   url: 'http://www.baidu.com/xxx.png',
+        // },
+      ]
+    }
+  }
+
+  componentDidMount(){
+    if(this.props.newathArray){
+      if(this.props.newathArray.length>0){
+        let newfilspath="";
+        let list=this.props.newathArray;
+        list.map((item,key)=>{
+          if(key===0){
+            newfilspath=item;
+          }else{
+            newfilspath=newfilspath+'/'+item;
+          }
+        })
+        this.setState({
+          filspath:newfilspath
+        })
+      }
+    }
+
+
+  }
+
+  handleChange = (info) => {
+
+    if (info.file.status === 'done'||info.file.status === "uploading") {
+
+      let fileList = [...info.fileList];
+
+      if(info.file.response){
+        if(info.file.response.status===-1) {
+          this.props.showNotification(info.file.response.message);
+          return
+        }else{
+          this.props.showNotification("上传成功！");
+          return;
+        }
+      }
+
+      fileList = fileList.slice(-2);
+      fileList = fileList.map(file => {
+        if (file.response) {
+          if (file.response.status===0) {
+          }
+        }
+        return file;
+      });
+
+      this.setState({ fileList });
+    }
+  };
+
+  onAttachmentRemove=(info)=>{
+    console.log(info);
+    if(info.response){
+      let shixunId = this.props.match.params.shixunId;
+      let {message,filspath}=this.state;
+      if(message===""||message===undefined){
+        this.props.showNotification('删除文件请先填写提交信息');
+        return;
+      }
+
+      let matchpath =this.props.match.path;
+
+      let Repositoryflag =undefined;
+
+      if( matchpath.indexOf("repository")>-1){
+        Repositoryflag =undefined;
+      }
+      if(matchpath.indexOf("secret_repository")>-1){
+        Repositoryflag =true;
+      }
+
+      let newfilspath=filspath;
+
+      if(newfilspath===""){
+        newfilspath=info.name
+      }else{
+        newfilspath=filspath+"/"+info.name
+      }
+      const url = `/shixuns//${shixunId}/delete_git_file.json`;
+      axios.delete(url, { data: {
+        path:newfilspath,
+        message:message,
+        secret_repository:Repositoryflag
+      }})
+      .then((response) => {
+        if (response.data.status === 0) {
+          let fileList = this.state.fileList.filter(item=>item.uid !== info.uid);
+          this.setState({
+            fileList
+          })
+          this.props.showNotification("删除成功");
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+    }else{
+      this.props.showNotification("还未上传完成，无法进行删除操作！");
+    }
+  }
+
+  FormInput=(e)=>{
+    this.setState({
+      message:e.target.value
+    })
+  }
+
+  Selectfiledirectory=()=>{
+    this.setState({
+      visibles:true
+    })
+  }
+
+  hideNewFolder=()=>{
+    this.setState({
+      visibles:false
+    })
+  }
+
+  selectupfilspath=(value)=>{
+   this.setState({
+     filspath:value
+   })
+  }
+  render(){
+    const {getFieldDecorator} = this.props.form;
+    let { shixunId } = this.props.match.params;
+    // const props = {
+    //   height:300,
+    //   // name: 'file',
+    //   multiple: true,
+    //
+    //   action: `${getUploadActionUrl()}`,
+    //   onChange: this.handleChange,
+    //   onRemove: this.onAttachmentRemove,
+    //   // beforeUpload: (file) => {
+    //   //   console.log('beforeUpload', file.name);
+    //   //   const isLt150M = file.size / 1024 / 1024 < 150;
+    //   //   if (!isLt150M) {
+    //   //     this.props.showNotification('文件大小必须小于150MB!');
+    //   //   }
+    //   //   return isLt150M;
+    //   // },
+    // };
+    let matchpath =this.props.match.path;
+
+    let Repositoryflag ="";
+    let newdata;
+
+    if( matchpath.indexOf("repository")>-1){
+      Repositoryflag ="repository";
+      newdata={
+        path:this.state.filspath,
+        message:this.state.message,
+      }
+    }
+
+    if(matchpath.indexOf("secret_repository")>-1){
+      Repositoryflag ="secret_repository";
+      newdata={
+        path:this.state.filspath,
+        message:this.state.message,
+        secret_repository:true
+      }
+    }
+
+    const props = {
+      height:300,
+      multiple: true,
+      data:newdata,
+      fileList:this.state.fileList,
+      // showUploadList:false,
+      action: `${getupload_git_file(shixunId)}`,
+      onChange: this.handleChange,
+      onRemove: this.onAttachmentRemove,
+      beforeUpload: (file) => {
+        let {message}=this.state;
+        if(message===""||message===undefined){
+          this.props.showNotification("上传文件请先填写提交信息")
+          return  false
+        }
+
+        // this.props.showNotification("上传成功");
+      },
+    };
+
+    return(
+      <div>
+        {this.state.visibles===true?<Repositoryfile
+          titles={"选择文件上传目录"}
+          evaluationvisible={this.state.visibles}
+          hideNewFolder={this.hideNewFolder}
+          {...this.state}
+          {...this.props}
+          selectupfils={true}
+          selectupfilspath={(value)=>this.selectupfilspath(value)}
+        />:""}
+        <div className="educontent mt30">
+          <style>
+            {`
+            .formStyle .ant-form-item{
+              margin-bottom:10px!important;
+            }
+            // .formStyle .ant-col.ant-form-item-label{
+            //   margin-left:-10px;
+            //   line-height:30px;
+            //   margin-bottom:10px;
+            // }
+            .breadcrumb .ant-breadcrumb-separator{
+              margin:0px 2px;
+            }
+            .ant-upload ant-upload-drag{
+              height: 300px;
+            }
+            // .backgroudwhite{
+            //  display:none;
+            // }
+            /*.filecode .CodeMirror.cm-s-railscasts{
+              border:1px solid #E5E5E5;
+            }
+            .filecode .CodeMirror.cm-s-railscasts .CodeMirror-sizer,.filecode .CodeMirror-gutters,.filecode .CodeMirror-scroll{
+              background:#fff;
+            }
+            .filecode .CodeMirror-linenumber{
+              text-align:center
+            }*/
+          `}
+          </style>
+          {/*<p className="mt10 mb10">*/}
+          {/*  <Breadcrumb separator='>' className="breadcrumb">*/}
+          {/*    <Breadcrumb.Item href='/shixuns'>实训项目</Breadcrumb.Item>*/}
+          {/*    <Breadcrumb.Item href={`/shixuns/${shixunId}/repository`}>版本库</Breadcrumb.Item>*/}
+          {/*    <Breadcrumb.Item>添加新文件</Breadcrumb.Item>*/}
+          {/*  </Breadcrumb>*/}
+          {/*</p>*/}
+          <Form className="formStyle">
+            <div className="edu-back-white padding20-30 mb10">
+
+              <p className="ant-form-item-label">
+                <div className={"font-20 color-black"}>上传文件</div>
+              </p>
+
+
+
+              <div>
+                <p className="ant-form-item-label">
+                  <div className={"color888 font-16"}>当前目录：{this.state.filspath===""?"/":"/"+this.state.filspath}   <span className={"color-blue pointer"} onClick={this.Selectfiledirectory}>选择文件目录</span></div>
+                </p>
+              </div>
+
+
+              {/*<div className="mt10 mb25 repoCMWrapper filecode">*/}
+
+              {/*  <textarea className="" id="codemirror-file-edit" style={{display:'none'}} name="content"></textarea>*/}
+              {/*</div>*/}
+
+
+
+                <Dragger {...props}  >
+                  <p className="ant-upload-drag-icon">
+                    <i className="iconfont icon-shangchuan font-50 color-blue" />
+                  </p>
+
+                  <p className="ant-upload-hint mt30">
+                    拖拽文件或  <span className="color-blue" >点击此处上传</span>
+                  </p>
+                </Dragger>
+
+              {/*<Form.Item label="提交信息">*/}
+              {/*  {getFieldDecorator('message', {*/}
+              {/*    rules: [{required: true, message: "请输入提交信息"}],*/}
+              {/*  })(*/}
+              {/*    <textarea className="winput-100-130 fl"></textarea>*/}
+              {/*  )}*/}
+              {/*</Form.Item>*/}
+              <Form.Item label="提交信息">
+
+                {getFieldDecorator('message', {
+                  rules: [{
+                    required: true, message: '请输入提交信息',
+                  },{
+                    whitespace: true, message: '请勿输入空格'
+                  }],
+                })(
+                  <Input placeholder="必填，描述主要修改内容（相当于Git Commit message的Header）" onInput={this.FormInput} className="winput-300-35 fl"/>
+                )}
+              </Form.Item>
+            </div>
+          </Form>
+        </div>
+        <Bottomsubmit {...this.props} {...this.state} url={`/shixuns/${shixunId}/${Repositoryflag}${this.state.filspath===""?"":"/master/shixun_show/"+this.state.filspath}`} bottomvalue={"确定"}/>
+        {/*<Bottomsubmit {...this.props} {...this.state} url={`/shixuns/${shixunId}/${Repositoryflag}`} bottomvalue={"确定"}/>*/}
+
+      </div>
+    )
+  }
+}
+const RepositoryAddFileupload_file = Form.create({name: 'RepositoryAddFileupload_files'})(RepositoryAddFileupload_files);
+// RouteHOC()
+export default (RepositoryAddFileupload_file);
\ No newline at end of file
diff --git a/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js b/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js
index 51f6e35f..1f90ff28 100644
--- a/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js
+++ b/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js
@@ -18,6 +18,7 @@ import Popconfirm from 'antd/lib/popconfirm';
 import 'antd/lib/popconfirm/style/css';
 
 import { message } from 'antd';
+import Bottomsubmit from "../../../modals/Bottomsubmit";
 
 require('codemirror/lib/codemirror.css');
 
@@ -94,7 +95,7 @@ class RepositoryCodeEditor extends Component {
         }
 	}
     componentDidUpdate = (prevProps, prevState) => {
-        
+
         if (this.props.fileContent && this.props.fileContent != prevProps.fileContent) {
             // window.setTimeout(() => {
                 this.extend_editor.setValue(this.props.fileContent)
@@ -102,6 +103,7 @@ class RepositoryCodeEditor extends Component {
         }
     }
     componentDidMount(){
+
         let cmOptions = createCMOptions(this.props.mirror_name)
         const extend_editor = window.CodeMirror.fromTextArea(window.$('#codemirror-file-edit')[0]
             , cmOptions);
@@ -121,62 +123,84 @@ class RepositoryCodeEditor extends Component {
         const path = pathArray.join('/')
         this.setState({ codeSaving: true })
         axios.post(url, {
-                secret_repository: this.props.secret_repository_tab,
+                secret_repository: this.props.secret_repository_tab===false?undefined:this.props.secret_repository_tab,
                 content: this.extend_editor.getValue(),
                 // type: forTest === true ? 1 : 0,
-                path: path
+                path: path,
             }
         ).then((response) => {
             if (response.data.content) {
                 message.success('保存成功');
+                this.setCohetepaperbool(this.props.pathArray.length===0?0:this.props.pathArray.length-1)
                 this.setState({ codeSaving: false })
             }
         })
     }
+    setCohetepaperbool=(sum)=>{
+        // console.log(sum)
+        // console.log(this.props.pathArray)
+        this.props.oncodechanner(sum)
+    }
     render() {
-        const { fileContent, match, saveCode } = this.props;
+        const { fileContent, shixunId, saveCode } = this.props;
         const { codeSaving } = this.state;
+        let matchpath =this.props.match.path;
+        let Repositoryflag ="";
+        if( matchpath.indexOf("repository")>-1){
+            Repositoryflag ="repository";
+        }
+        if(matchpath.indexOf("secret_repository")>-1){
+            Repositoryflag ="secret_repository";
+        }
         return (
             <React.Fragment>
+                <div className={" tpmComment educontent clearfix mt30 mb80"}>
+                    <div className={`width100 fl edu-back-white`} >
+                        <div className="tpmComment educontent clearfix mt20">
+                            <RepositoryDirectories {...this.props} tpmComment={true}></RepositoryDirectories>
 
-                <div className="tpmComment educontent clearfix mt30">
-                    <RepositoryDirectories {...this.props}></RepositoryDirectories>
+                            {/*<div className="edu-back-skyblue padding5-10 clearfix">*/}
+                            {/*    <div className="fl">*/}
+                            {/*    </div>*/}
+                            {/*    <div id="file_action" className="recordBanner fr">*/}
+                            {/*        { codeSaving ?*/}
+                            {/*          <a href="javascript:void(0);"*/}
+                            {/*             className="fr mt12 mr20 color-grey">保存中...</a>*/}
+                            {/*          : <Popconfirm title="确定要保存修改后的代码吗?"*/}
+                            {/*                        placement="bottom"*/}
+                            {/*                        onConfirm={() => this.saveCode(this.extend_editor.getValue())}*/}
+                            {/*                        okText="确定" cancelText="取消">*/}
+                            {/*              /!* onClick={this.saveCode}*/}
+                            {/*        onClick={() => saveCode(this.extend_editor.getValue())}*/}
+                            {/*    *!/*/}
+                            {/*              <a href="javascript:void(0);"*/}
+                            {/*                 className="fr mt12 mr20 color-blue">保存</a>*/}
+                            {/*          </Popconfirm> }*/}
+                            {/*    </div>*/}
+                            {/*    <div className="cl"></div>*/}
+                            {/*</div>*/}
 
-                    <div className="edu-back-skyblue padding5-10 clearfix">
-                        <div className="fl">
-                        </div>
-                        <div id="file_action" className="recordBanner fr">
-                            { codeSaving ? 
-                                <a href="javascript:void(0);"
-                                    className="fr mt12 mr20 color-grey">保存中...</a>
-                            : <Popconfirm title="确定要保存修改后的代码吗?"
-                                placement="bottom"
-                                onConfirm={() => this.saveCode(this.extend_editor.getValue())}
-                                okText="确定" cancelText="取消">
-                                {/* onClick={this.saveCode}
-                                    onClick={() => saveCode(this.extend_editor.getValue())}
-                                */}
-                                <a href="javascript:void(0);"
-                                    className="fr mt12 mr20 color-blue">保存</a>
-                            </Popconfirm> }
-                        </div>
-                        <div className="cl"></div>
-                    </div>
-
-                    <style>
-                    {`
+                            <style>
+                                {`
                         .repoCMWrapper .CodeMirror {
                             height: 500px;
                         }
                     `}
-                    </style>
-                    <div className="padding10-20 repoCMWrapper">
+                            </style>
+                            <div className="padding10-20 repoCMWrapper">
                         <textarea className="" id="codemirror-file-edit"
-                            style={{display:'none'}}
-                            name="content">{fileContent}</textarea>
+                                  style={{display:'none'}}
+                                  name="content">{fileContent}</textarea>
+                            </div>
+                        </div>
+
                     </div>
                 </div>
-
+                <Bottomsubmit
+                  Cohetepaperbool={true}
+                  {...this.props} {...this.state} url={`/shixuns/${shixunId}/${Repositoryflag}`}
+                  setCohetepaperbool={() => this.setCohetepaperbool(this.props.pathArray.length===0?0:this.props.pathArray.length-1)}
+                  onSubmits={() => this.saveCode(this.extend_editor.getValue())}/>
             </React.Fragment>
 
     );
diff --git a/src/modules/tpm/shixunchild/Repository/RepositoryCombinePath.js b/src/modules/tpm/shixunchild/Repository/RepositoryCombinePath.js
index aba008e2..b3268573 100644
--- a/src/modules/tpm/shixunchild/Repository/RepositoryCombinePath.js
+++ b/src/modules/tpm/shixunchild/Repository/RepositoryCombinePath.js
@@ -1,18 +1,11 @@
 import React, { Component } from 'react';
 
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames';
-
 import axios from 'axios';
 
 import { trace_collapse, WordsBtn } from 'educoder'
 
 import { message, Input } from 'antd';
+import Repositoryfile from "./Repositoryfile";
 
 
 const $ = window.$;
@@ -23,40 +16,57 @@ class RepositoryCombinePath extends Component {
         super(props)
         this.state = {
             value: this.props.secret_dir_path || '',
+            newvalue:'',
             isEdit: false,
         }
 	}
     
-    onSave = () => {
+    onSave = (value) => {
         const { shixunId, pathArray } = this.props;
         const url = `/shixuns/${shixunId}/set_secret_dir.json`
-        
-        this.setState({ codeSaving: true })
+
         axios.post(url, {
-            secret_dir_path: this.state.value
+            secret_dir_path:value
         }
         ).then((response) => {
             if (response.data) {
-                message.success('保存成功');
-                this.setState({isEdit: false})
+                this.setState({
+                    newvalue:value
+                })
+                // message.success('保存成功');
+
             }
         })
     }
-    onChange = (e) => {
-        const { value } = e.target;
-        this.setState({ value })
+    // onChange = (e) => {
+    //     const { value } = e.target;
+    //     this.setState({ value })
+    // }
+    // onEdit = () => {
+    //     this.setState({isEdit: true}, () => {
+    //         window.$('.combinePathEditRow input')[0].focus()
+    //     });
+    // }
+
+    Selectfiledirectory=()=>{
+        this.setState({
+            visibles:true
+        })
     }
-    onEdit = () => {
-        this.setState({isEdit: true}, () => {
-            window.$('.combinePathEditRow input')[0].focus()
-        });
+
+
+    hideNewFolder=()=>{
+        this.setState({
+            visibles:false
+        })
     }
+
     render() {
         const { fileContent, match, saveCode } = this.props;
-        const { isEdit, value } = this.state;
+        const { newvalue, value } = this.state;
         return (
             
-            <div className="df combinePathEditRow">
+            <div className="combinePathEditRow">
                 <style>{`
                     .combinePathEditRow {
                         margin: 4px 0;
@@ -69,10 +79,24 @@ class RepositoryCombinePath extends Component {
                         margin-left: 24px;
                     }
                 `}</style>
-                <span>第一版本库合并路径：</span>
-                <Input disabled={!isEdit} value={value} onChange={this.onChange}></Input>
-                {!isEdit && <WordsBtn className="wordsBtn" onClick={this.onEdit} style="blue">修改</WordsBtn>}
-                {isEdit && <WordsBtn className="wordsBtn" onClick={this.onSave} style="blue">保存</WordsBtn>}
+                {this.state.visibles===true?<Repositoryfile
+                  titles={"选择文件目录"}
+                  evaluationvisible={this.state.visibles}
+                  hideNewFolder={this.hideNewFolder}
+                  {...this.state}
+                  {...this.props}
+                  RepositoryCombinePath={true}
+                  selectupfilspath={(value)=>this.onSave(value)}
+                />:""}
+                <div className={"mt2"}>合并版本库路径：</div>
+                <div className={"df"}>
+                    {/*<span className={"mt2"}> {!isEdit?"源路径：":"目标路径："}</span><span><Input disabled={!isEdit} value={value} onChange={this.onChange}></Input></span>*/}
+                    <span className={"mt3"}>  <span>源路径：</span><span>{value}</span></span> <span><i className={"iconfont icon-youjiang color-grey-8 ml20"}></i></span>
+                    <span className={"mt4 ml20"}>   <span>目标路径：</span><span>{newvalue}</span></span>
+                     <WordsBtn className="wordsBtn mt4" onClick={this.Selectfiledirectory} style="blue">选择文件目录</WordsBtn>
+                    {/*{isEdit && <WordsBtn className="wordsBtn" onClick={this.onSave} style="blue">保存</WordsBtn>}*/}
+                </div>
+
             </div>
 
 
diff --git a/src/modules/tpm/shixunchild/Repository/RepositoryDirectories.js b/src/modules/tpm/shixunchild/Repository/RepositoryDirectories.js
index 7c6eca37..b97d96cc 100644
--- a/src/modules/tpm/shixunchild/Repository/RepositoryDirectories.js
+++ b/src/modules/tpm/shixunchild/Repository/RepositoryDirectories.js
@@ -1,65 +1,131 @@
 import React, { Component } from 'react';
 
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames';
+import { Button ,Modal } from "antd";
 
 import axios from 'axios';
 
 import { trace_collapse } from 'educoder'
 const $ = window.$;
 
-
+const { confirm } = Modal;
 class RepositoryDirectories extends Component {
     constructor(props) {
         super(props)
         this.state = {
-            
+
         }
 	}
   componentDidMount() {
   }
+
+  showDeleteConfirm =()=>{
+
+    let that=this;
+
+      confirm({
+        title: '确认需要要删除该文件?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk() {
+          that.onAttachmentRemove()
+        }
+      });
+
+  }
+  onAttachmentRemove=()=>{
+
+    let shixunId = this.props.match.params.shixunId;
+    let matchpath =this.props.match.path;
+    let Repositoryflag =undefined;
+
+    if( matchpath.indexOf("repository")>-1){
+      Repositoryflag =undefined;
+    }
+    if(matchpath.indexOf("secret_repository")>-1){
+      Repositoryflag =true;
+    }
+
+    let newfilspath=this.state.ischeckevalue;
+
+    let path="";
+
+    if(this.props.pathArray.length>0){
+      this.props.pathArray.map((item,key)=>{
+        if(key===0){
+          path=item
+        }else{
+          path=path+"/"+item
+        }
+      })
+    }
+
+    if(path===undefined||path===""){
+      path=newfilspath
+    }else{
+      path=path
+    }
+
+    const url = `/shixuns//${shixunId}/delete_git_file.json`;
+
+    axios.delete(url, { data: {
+        path:path,
+        message:"删除"+path,
+        secret_repository:Repositoryflag
+      }})
+      .then((response) => {
+        if(response.data.status == 0) {
+          this.props.showNotification("删除成功")
+          this.props.oncodechanner()
+        }
+      })
+      .catch(function (error) {
+
+      });
+  }
   render() {
-    const { match, pathArray, fetchRepo
+    const { match, pathArray, fetchRepo,TPMRightSectionData
        } = this.props;
     let { RepositoryList } = this.state;
     return (
       <React.Fragment>
-      
-        { pathArray.length !== 0 && 
-        <div className="bor-bottom-greyE padding5-10 font-14 ">
-            <a className="color-blue"
-            onClick={() => fetchRepo(0)} 
+
+        { pathArray.length !== 0 &&
+        <div className={this.props.tpmComment===true?" padding5-10 font-14 mb10":" bor-bottom-greyE padding5-10 font-14"}>
+            <a className={this.props.tpmComment===true?"ml10 color888":"color-blue"}
+            onClick={() => fetchRepo(0)}
             >
             {match.params.shixunId}
             </a>
-            <span className="ml3 mr3">/</span>
+            <span className={this.props.tpmComment===true?"color888 ml3 mr3":"ml3 mr3"}></span>
             { pathArray.map((item, index) => {
-                // /shixuns/3ozvy5f8/repository/3ozvy5f8/master/shixun_show/src
+
                 return (
-                <React.Fragment>
-                    { this.props.nameTypeMap[item] === 'tree' || item.indexOf('.') === -1 
-                    ? <a
-                        onClick={() => fetchRepo(index + 1)} 
-                        className="color-blue">
-                        {item}</a>  
-                        :
-                        <a >
-                        {item}</a>
+                  <React.Fragment>
+                    { index===pathArray.length-1 && item.indexOf('.') === -1?<span className={"color888"}>
+                      / {item} </span>:this.props.nameTypeMap[item] === 'tree' || item.indexOf('.') === -1
+                      ? <a
+                        onClick={() => fetchRepo(index + 1)}
+                        className={this.props.tpmComment===true?"color888":"color-blue"}
+                      >
+                        / {item}</a>
+                      :
+                      <span  className={this.props.tpmComment===true?"color888":""}>
+                       / {item}</span>
                     }
-                    {index !== pathArray.length - 1 && <span className="ml3 mr3">/</span>}
-                </React.Fragment>
+                    {index !== pathArray.length - 1 && <span className={this.props.tpmComment===true?"color888 ml3 mr3":"ml3 mr3"}></span>}
+                  </React.Fragment>
                 )
+
             })
             }
+          {/*{ this.props.current_user && (this.props.current_user.admin ==true || (TPMRightSectionData && TPMRightSectionData.creator && TPMRightSectionData.creator.login == this.props.current_user.login)) ?*/}
+          {/*  <Button size={"small"} className={"fr"} type="link" onClick={this.showDeleteConfirm}>删除</Button>:""}*/}
+          <div className={"both"}></div>
+
         </div> }
-        
+
       </React.Fragment>
-      
+
     );
   }
 }
diff --git a/src/modules/tpm/shixunchild/Repository/RepositoryNoneData.js b/src/modules/tpm/shixunchild/Repository/RepositoryNoneData.js
new file mode 100644
index 00000000..969d6c11
--- /dev/null
+++ b/src/modules/tpm/shixunchild/Repository/RepositoryNoneData.js
@@ -0,0 +1,44 @@
+import React, { Component } from 'react';
+import { getImageUrl , getUrl } from 'educoder';
+import './Repository.css';
+class RepositoryNoneData extends Component{
+  constructor(props) {
+    super(props)
+  }
+  render(){
+    const { style } = this.props;
+    return(
+      <div className="mt20 clearfix edu-txt-center" style={ style || { width:"100%" }}>
+        <style>
+          {`
+            .edu-tab-con-box{
+              padding:100px 0px;
+            }
+            .ant-modal-body .edu-tab-con-box{
+              padding:0px!important;
+            }
+            img.edu-nodata-img{
+              margin: 40px auto 20px;
+            }
+            .RepositoryNoneDataimg{
+                width: 90%;
+                height: 100%;
+            }
+          `}
+        </style>
+        <img className="RepositoryNoneDataimg mb30" src={getUrl("/images/educoder/RepositoryNoneData.png")}/>
+
+        <div className="edu-nodata-p  font-14">
+            <div>此处存放本实训所需的所有代码等相关文件，你可以通过以下两种方式来使用：</div>
+        </div>
+        <div className="edu-nodata-p  font-14">
+            <div className={"width490Repository"}>1、<span><a className={"color5091FF"} href="/forums/2784" target="_blank">Git客户端</a></span>上传已有文件来开始使用。</div>
+        </div>
+        <div className="edu-nodata-p mb50 font-14">
+            <div className={"width490Repository"}>2、直接在平台上创建文件目录以及相关代码文件。</div>
+        </div>
+      </div>
+    )
+  }
+}
+export default RepositoryNoneData;
\ No newline at end of file
diff --git a/src/modules/tpm/shixunchild/Repository/Repositoryfile.js b/src/modules/tpm/shixunchild/Repository/Repositoryfile.js
new file mode 100644
index 00000000..3476dfa3
--- /dev/null
+++ b/src/modules/tpm/shixunchild/Repository/Repositoryfile.js
@@ -0,0 +1,333 @@
+import React, { Component } from 'react';
+import {Modal,Input,Form} from "antd";
+import axios from 'axios';
+class Repositoryfile extends Component{
+  constructor(props) {
+    super(props)
+    this.state={
+      selectpath:"",
+      trees:[],
+      main:[],
+      path:""
+    }
+  }
+
+  evaluationhideModal=()=>{
+    this.props.hideNewFolder();
+  }
+
+  componentDidMount() {
+
+    let pathArrays;
+    if(this.props.pathArray){
+      pathArrays=this.props.pathArray;
+    }else{
+      pathArrays=this.props.newathArray;
+    }
+
+    let path='';
+    let ary=[];
+    if(pathArrays){
+      if(pathArrays.length>0){
+        pathArrays.map((item,key)=>{
+          if(key===0){
+            path=item;
+            ary.push({val:"根目录",path:""},{val:"/"+item,path:path});
+          }else{
+            path=path+'/'+item;
+            ary.push({val:"/"+item,path:path});
+          }
+        })
+      }
+    }
+
+    this.getdata(path,ary)
+
+  }
+
+  getdata(path,ary){
+
+    let matchpath =this.props.match.path;
+    let id = this.props.match.params.shixunId;
+
+    let url ="";
+    if( matchpath.indexOf("repository")>-1){
+      url ="/shixuns/"+id+"/repository.json";
+    }
+    if(matchpath.indexOf("secret_repository")>-1){
+      url ="/shixuns/"+id+"/secret_repository.json";
+    }
+
+    axios.post(url,{
+      path: path
+    }).then((response) => {
+      if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+
+      }else {
+        this.setState({
+          trees: response.data.trees,
+          path: path,
+          main: ary,
+        })
+      }
+    }).catch((error) => {
+      console.log(error)
+    });
+
+  }
+
+  goblakepath=(path,key)=>{
+    let {main} =this.state;
+    let matchpath =this.props.match.path;
+    let id = this.props.match.params.shixunId;
+
+    let url ="";
+    if( matchpath.indexOf("repository")>-1){
+      url ="/shixuns/"+id+"/repository.json";
+    }
+    if(matchpath.indexOf("secret_repository")>-1){
+      url ="/shixuns/"+id+"/secret_repository.json";
+    }
+    let newmain=[]
+    for(var i=0;i<=key;i++){
+      newmain.push(main[i])
+    }
+
+    axios.post(url,{
+      path: path
+    }).then((response) => {
+      if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+
+      }else {
+        this.setState({
+          trees: response.data.trees,
+          path: path,
+          main: newmain,
+        })
+      }
+    }).catch((error) => {
+      console.log(error)
+    });
+
+
+  }
+
+  sendgetfilepath=(newpath,type)=>{
+
+    let id = this.props.match.params.shixunId;
+    let{path,main}=this.state;
+
+    let matchpath =this.props.match.path;
+    let url ="";
+
+    if( matchpath.indexOf("repository")>-1){
+      url ="/shixuns/"+id+"/repository.json";
+    }
+    if(matchpath.indexOf("secret_repository")>-1){
+      url ="/shixuns/"+id+"/secret_repository.json";
+    }
+    let ary=main;
+    let paths=path;
+    let  mainpath;
+    this.setState({
+      selectpatharr:[],
+    })
+     mainpath=newpath;
+
+    if(paths===""&&type==="tree"){
+      if(main.length===0){
+        ary.push({val:"根目录",path:""},{val:"/"+mainpath,path:mainpath});
+      }else{
+        ary.push({val:"/"+mainpath,path:mainpath});
+      }
+    }else if(paths!=""&&type==="tree"){
+      newpath=paths+"/"+newpath;
+      ary.push({val:"/"+mainpath,path:mainpath});
+    }
+
+      axios.post(url,{
+        path: newpath
+      }).then((response) => {
+        if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+
+        }else{
+          this.setState({
+            trees:response.data.trees,
+            path:newpath,
+            main:ary,
+            // selectpath:""
+          })
+        }
+
+      }).catch((error) => {
+        console.log(error)
+      });
+  }
+
+  handleSubmit = (e) => {
+    let {path,trees}=this.state;
+
+    let matchpath =this.props.match.path;
+    let flag =undefined;
+
+    if( matchpath.indexOf("repository")>-1){
+      flag =undefined;
+    }
+    if(matchpath.indexOf("secret_repository")>-1){
+      flag =true;
+    }
+
+    if(this.props.selectupfils===true){
+      this.props.selectupfilspath(path);
+      this.props.showNotification("选择文件目录成功")
+      this.props.hideNewFolder();
+    }else if(this.props.RepositoryCombinePath===true){
+      this.props.form.validateFieldsAndScroll((err, values) => {
+        if (!err) {
+          if(path===""){
+            this.props.selectupfilspath(values.name);
+          }else{
+            this.props.selectupfilspath(path+"/"+values.name);
+          }
+          this.props.showNotification("保存成功")
+          this.props.hideNewFolder();
+        }
+      });
+    }else{
+      let url=`/shixuns/${this.props.match.params.shixunId}/upload_git_folder.json`;
+      this.props.form.validateFieldsAndScroll((err, values) => {
+        if (!err) {
+          let types=false;
+          if(trees){
+            trees.map((item,key)=>{
+              if(item.type==="tree"){
+                if(item.name===values.name){
+                  types=true
+                  return
+                }
+              }
+            })
+          }
+
+
+          if(types===true){
+            this.props.showNotification("请勿新建相同名字的文件夹")
+            return
+          }
+          let paths;
+          if(path===""){
+            paths=values.name;
+          }else{
+            paths=path+"/"+values.name;
+          }
+          axios.post(url,{
+            path: paths,
+            secret_repository:flag===false?undefined:flag,
+          }).then((result)=>{
+            if(result){
+              if(result.data.status===0){
+                this.props.fetchRepo(this.props.pathArray.length)
+                this.props.showNotification("新建成功")
+                this.props.hideNewFolder();
+
+              }
+            }
+          }).catch((error)=>{
+            console.log(error);
+          })
+        }
+      });
+    }
+  }
+
+  render(){
+    const {getFieldDecorator} = this.props.form;
+    const {evaluationvisible} = this.props;
+    const {selectpath,trees,main,path}=this.state;
+
+
+    return(
+      evaluationvisible===true?<Modal
+        keyboard={false}
+        title={this.props.titles?this.props.titles:"新建文件夹"}
+        visible={evaluationvisible}
+        closable={false}
+        footer={false}
+      >
+        <div className="task_popup_con">
+          <style>
+            {
+              `
+              .ant-form-explain{
+                  padding-left: 0px;
+                  margin-top:5px;
+              }
+              body{
+                   width: calc(100%) !important;
+              }
+              `
+            }
+          </style>
+          <div className="newupload_conbox clearfix">
+            <ul id="directory_file">
+              {
+                main.length===0?"":main.map((item,key)=>{
+                  return(
+                    <a className="f14 fb"  key={key} onClick={()=>this.goblakepath(item.path,key,item)}>{item.val}</a>
+                  )
+                })
+              }
+              {/*文件*/}
+              {trees === undefined || trees === null ? "" : trees.map((item, key) => {
+                return(
+                  <li className="entry" key={key}>
+                    <div className="filename_no_report hidden">{
+                      item.type==="tree"?<a onClick={()=>this.sendgetfilepath(item.name,item.type)} data-remote="true">
+                        <i className="iconfont icon-wenjianjia color-blue mr2"></i>
+                        {item.name}</a>:""
+                    }
+                    </div>
+                  </li>
+                )
+              })}
+            </ul>
+           <div className="clearfix mt5">
+              <label className=" mt5">选中的新建文件夹目录：</label>
+              <div className={"mt5 mb5"}  >{path}</div>
+             {this.props.selectupfils===true?"": <Form>
+                <Form.Item
+                  className="mt15"
+                >
+                  {getFieldDecorator('name', {
+                    rules: [{
+                      required: true, message: '请输入名称',
+                    },{
+                      whitespace: true, message: '请勿输入空格'
+                    }],
+                  })(
+                    <Input id="points_tusi" placeholder="请输入新文件夹名/子文件夹名。（如：src/step1）" className="input-60-40"
+                           style={{width:"400px"}}
+                        />
+                  )}
+                </Form.Item>
+              </Form>}
+            </div>
+
+            <div className={"clearfix edu-txt-center mt20"}>
+               <a className="task-btn task-btn-orange fr"
+                  style={{marginTop: '20px',marginLeft:'20px'}} id="add_path"
+                  onClick={() => this.handleSubmit()}>确定</a>
+               <a  className="pop_close task-btn mb10 fr"
+                   style={{marginTop: '20px'}} id="back_page" onClick={()=>this.evaluationhideModal()}>取消</a>
+             </div>
+
+          </div>
+        </div>
+      </Modal>:""
+    )
+  }
+}
+
+const newRepositoryfile = Form.create({name: 'newRepositoryfile'})(Repositoryfile);
+
+export default newRepositoryfile;
\ No newline at end of file
diff --git a/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js b/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js
index 37a4217a..6d3ee347 100644
--- a/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js
+++ b/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js
@@ -35,7 +35,7 @@ class TPMRepositoryCommits extends Component {
 
     let collaborators=`/shixuns/`+id+`/commits.json`;
     axios.post(collaborators, {
-        secret_repository: this.props.secret_repository_tab
+        secret_repository: this.props.secret_repository_tab===false?undefined:this.props.secret_repository_tab
     }).then((response)=> {
 
         if(response.status===200){
diff --git a/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css b/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
index abfafc46..3350a5ad 100644
--- a/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
+++ b/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
@@ -178,23 +178,23 @@
     white-space: nowrap;
 }
 
-.icon-bianji_Hover,.icon-xiayi_Hover,.icon-shangyi_Hover,.icon-shanchu_Hover{
-    color:#BBBBBB !important;
-}
+/* .icon-bianji_Hover,.icon-xiayi_Hover,.icon-shangyi_Hover,.icon-shanchu_Hover{
+    color: rgb(80, 145, 255) !important;
+} */
 
-.icon-bianji_Hover:hover{
+.icon-bianji_Hover{
     color: rgb(80, 145, 255) !important;
 }
 
-.icon-xiayi_Hover:hover{
+.icon-xiayi_Hover{
     color: rgb(51, 189, 140)  !important;
 }
 
-.icon-shangyi_Hover:hover{
+.icon-shangyi_Hover{
     color: rgb(51, 189, 140)  !important;
 }
 
-.icon-shanchu_Hover:hover{
+.icon-shanchu_Hover{
     color:rgb(255, 85, 85)  !important;
 }
 .ysliconfont{
@@ -262,4 +262,28 @@
 
 .boreee{
     border-bottom: 1px solid #F4F4F4;
+}
+.challengtes_Item{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.flex1.width0{
+    flex: 1;
+    width: 0;
+}
+.challengeBtn{
+    height:40px;
+    line-height: 38px;
+    padding:0px 27px;
+    color: #C0C4CC!important;
+    font-size: 16px;
+    border:1px solid rgba(235,235,235,1);
+    border-radius:4px;
+    margin-left: 15px;
+}
+.challengeBtn.blue{
+    background: #F2F8FE;
+    border:1px solid rgba(64,158,255,1);
+    color: #409EFF!important;
 }
\ No newline at end of file
diff --git a/src/modules/tpm/shixuns/ShixunCard.js b/src/modules/tpm/shixuns/ShixunCard.js
deleted file mode 100644
index a292f4d8..00000000
--- a/src/modules/tpm/shixuns/ShixunCard.js
+++ /dev/null
@@ -1,244 +0,0 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames';
-
-import { Rating ,Pagination} from "@icedesign/base";
-
-import {getImageUrl,setImagesUrl, toPath,getUrl} from 'educoder';
-
-import { Spin,Icon,Tooltip ,Rate} from 'antd';
-import LoadingSpin from '../../../common/LoadingSpin';
-import './shixunCss/shixunCard.css';
-
-// 引入业务组件样式
-
-import axios from 'axios';
-
-const $ = window.$;
-
-class ShixunCard extends Component {
-  constructor(props) {
-    super(props)
-
-    this.state = {
-      startValue:[],
-      order_by:"",
-      page:1,
-      limit:16,
-      keyword:"",
-      status:0,
-      diff:0,
-      hideme:false,
-      tag_level:3,
-      tag_id:''
-    }
-
-  }
-
-  PaginationonChange=(pageNumber)=> {
-    this.props.shixunsPage(pageNumber);
-  }
-
-  render() {
-    let {middleshixundata, pagination, typepvisible, pages, totalcount} = this.props;
-		const MyRate = ({ defaultValue, ...rest }) => {
-			let myValue = defaultValue;
-			// console.log(myValue-Math.floor(myValue))
-			// if (myValue < Math.ceil(myValue)) {
-			// 	myValue = Math.floor(myValue) + 0.5;
-			// }
-
-			return <Rating {...rest} value={myValue} />;
-		};
-    return (
-      <div className="educontent mb80">
-
-				<Spin spinning={typepvisible} tip="正在获取相关数据..."  size="large" style={{marginTop:'15%'}}>
-
-					{ middleshixundata === undefined?"":middleshixundata.length === 0 ?<div className="edu-tab-con-box clearfix edu-txt-center">
-						<style>
-							{`
-            .edu-tab-con-box{
-              padding:100px 0px;
-            }
-            .ant-modal-body .edu-tab-con-box{
-              padding:0px!important;
-            }
-            img.edu-nodata-img{
-              margin: 40px auto 20px;
-            }
-          `}
-						</style>
-						<img className="edu-nodata-img mb20" src={getUrl("/images/educoder/nodata.png")}/>
-						<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
-					</div>:""}
-
-
-					<div className="mb20 clearfix"
-             // style={{display: middleshixundata === undefined || middleshixundata.length === 0 ? "none" : "block"}}
-				>
-            <style>
-              {
-                `
-                .square-list{
-                  margin-top:5px;
-                }
-                `
-              }
-            </style>
-          <div className="shixun_list_content">
-            <div className="square-list clearfix">
-              {middleshixundata === undefined || middleshixundata.length === 0?" ":middleshixundata.map((item,key)=>{
-                return(
-                  <div className="square-Item" key={key} id={item.id}>
-										<style>
-											{
-												`
-											.tag-green {
-														position: absolute;
-														left: 10px;
-														bottom: 125px;
-												}
-												.tag-org{
-													position: absolute;
-														left: 0px;
-														top: 20px;
-												}
-												.tag-org-name{
-												width:66px;
-												height:28px;
-												background:#FF6802;
-												width:66px;
-												height:28px;
-												border-radius:0px 20px 20px 0px;
-												}
-												.tag-org-name-test{
-												width:45px;
-												height:23px;
-												font-size:14px;
-												color:#FFFFFF;
-												line-height:19px;
-                        margin-right: 6px;
-												}
-												.intermediatecenter{
-														display: flex;
-														flex-direction: column;
-														align-items: center;
-														justify-content: center;
-												}
-												`
-											}
-										</style>
-                    {
-                      item.tag_name === null ? "":
-                        <div className="tag-green">
-                          <span className="tag-name"> {item.tag_name}</span>
-                          {/*<img style={{display:'block',height: '28px'}} src={require(`./shixunCss/tag2.png`)}/>*/}
-                        </div>
-                    }
-                    {
-										item.is_jupyter===true?
-										<div className="tag-org">
-											<p className="tag-org-name intermediatecenter"> <span className="tag-org-name-test">Jupyter</span></p>
-											{/*<img style={{display:'block',height: '28px'}} src={require(`./shixunCss/tag2.png`)}/>*/}
-										</div>
-											:""}
-
-                    <div className={item.power === false ? "closeSquare" : "none"}>
-                      <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
-                           className="mt80 mb25"/>
-                      <p className="font-14 color-white">非试用内容，需要授权</p>
-                    </div>
-
-                    <a href={"/shixuns/"+item.identifier+"/challenges"}  className="square-img" target="_blank">
-                      {/*<img  src={getImageUrl("images/"+item.pic+"?1540534846")}/>*/}
-                      <img  src={setImagesUrl(`${item.pic}`)}/>
-                    </a>
-										{/*target="_blank"*/}
-
-                    <div className="square-main">
-                      <p className="task-hide">
-                        <a href={"/shixuns/"+item.identifier+"/challenges"} className="justify color-grey-name" title={item.name} target="_blank">
-                          {item.name}
-                        </a>
-                      </p>
-
-											{/*target="_blank"*/}
-											{/*<style>*/}
-												{/*{*/}
-													{/*`*/}
-													{/*.anticon-star{*/}
-														{/*font-size:16px;*/}
-													{/*}*/}
-													{/*.pathInfo{*/}
-														{/*margin-right:-5px;*/}
-													{/*}*/}
-													{/*.ant-rate{*/}
-														{/*color: #FFA800;*/}
-													{/*}*/}
-													{/*`*/}
-												{/*}*/}
-											{/*</style>*/}
-                      <p className="clearfix mt8 ml-3">
-                        <span className="rateYoStar fl" style={{padding: '0px',height: '20px',lineHeight: '19px',cursor: 'default'}} title="">
-                              {/*<Rate allowHalf value={item.score_info===null?5:item.score_info} disabled key={key} />*/}
-                                <MyRate key={key} allowHalf defaultValue={item.score_info===null?5:item.score_info} disabled/>
-                        </span>
-                        <span className="fl ml25 font-12 color-grey-9 lineh-12 mt5">{item.score_info===null?"5分":item.score_info+"分"}</span>
-                      </p>
-
-                      <p className="clearfix mt8 font-12 color-grey-B4">
-                        {item.is_jupyter===false?<Tooltip placement="bottom" title={"关卡"}>
-                            <span className="mr10 fl squareIconSpan">
-                              <i className="iconfont icon-shixunguanqia fl mr3"></i>{item.challenges_count}
-                            </span>
-                        </Tooltip>:""}
-
-                        {/*<Tooltip placement="bottom" title={"经验值"}>*/}
-                            {/*<span className="mr10 fl squareIconSpan">*/}
-                                {/*<i className="iconfont icon-jingyan fl mr3"></i>{item.exp}*/}
-                            {/*</span>*/}
-                        {/*</Tooltip>*/}
-
-                        <Tooltip placement="bottom" title={"学习人数"}>
-                            <span className="mr10 fl squareIconSpan" style={{display:item.stu_num===0?"none":"block"}}>
-                               <i className="iconfont icon-chengyuan fl mr3"></i>{item.stu_num}
-                            </span>
-                        </Tooltip>
-
-                        <span className="fr color-grey-B3 squareIconSpan">{item.level}</span>
-                      </p>
-
-                    </div>
-                  </div>
-                )
-              })
-              }
-
-            </div>
-
-            <div className="both"></div>
-            {/*totalcount*/}
-            <div className={"ml425"}
-              //className={totalcount < 22 ? "ml425" : "ml425"}
-                 style={{display: pagination ? "block" : "none"}}>
-              {/*<Pagination showQuickJumper defaultCurrent={1} current={pages} total={totalcount} pageSize={12} onChange={this.PaginationonChange} />*/}
-              {/* 不加参数请求的时候，没返回总数了。加了个比较大的数字，让他可以翻页 */}
-              <Pagination defaultCurrent={1} current={pages} total={ totalcount || 1299 } type="mini" pageSize={16}  onChange={this.PaginationonChange} />
-            </div>
-
-          </div>
-
-        </div>
-        </Spin>
-      </div>
-    )
-  }
-}
-
-export default ShixunCard;
diff --git a/src/modules/tpm/shixuns/ShixunCardList.js b/src/modules/tpm/shixuns/ShixunCardList.js
deleted file mode 100644
index 235b1132..00000000
--- a/src/modules/tpm/shixuns/ShixunCardList.js
+++ /dev/null
@@ -1,316 +0,0 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route} from "react-router-dom";
-
-import { Switch ,Input,Tooltip,Icon} from 'antd';
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames'
-
-import 'antd/lib/switch/style/index.css'
-
-import './shixunCss/ShixunCardList.css';
-import GotoQQgroup from '../../../modal/GotoQQgroup'
-
-import { on, off } from 'educoder'
-
-const $ = window.$;
-
-const Search = Input.Search;
-
-class ShixunCardList extends Component {
-
-	constructor(props) {
-		super(props);
-		this.state={
-			allevent:"desc",
-			mine:0,
-			InputValue: props.keyword || "",
-			typemy:0,
-			hots:0,
-			news:0,
-			shixunid:"",
-			upcircle:false,
-      typekeyid:undefined,
-			goshowqqgtounp:false,
-		}
-	}
-
-	componentDidUpdate = (prevProps, prevState) => {
-	  if (this.props.keyword != prevProps.keyword) {
-		  this.setState({
-			  InputValue: this.props.keyword
-		  })
-	  }
-	}
-	componentDidMount = () => {
-	  on('searchKeywordChange', (event, data) => {
-		  // console.log(data)
-		  this.Input_search(data)
-	  })
-	}
-	componentWillUnmount = () => {
-	  off('searchKeywordChange')
-	}
-
-
-	latestHot=(e,key)=>{
-
-    let{upcircle,typekeyid}=this.state;
-
-		let id = e.target.id;
-		$("#"+id).siblings().removeClass("active");
-		$("#"+id).addClass("active");
-
-		let type;
-
-		// if(id==="all"){
-	  //   	type="publish_time";
-		// }
-		if(id==="hot"){
-			type="hot";
-		}else if(id==="new"){
-			type="new";
-
-		}
-
-		if(typekeyid===key){
-      if(upcircle===true){
-        this.setState({
-          upcircle:false,
-        })
-        // this.props.Shixunsupcircles("desc")
-      }else if(upcircle===false){
-        this.setState({
-          upcircle:true,
-        })
-		  // this.props.Shixunsupcircles("desc")
-      }
-    }else{
-		  this.setState({
-        typekeyid:key
-      })
-    }
-
-
-		this.props.ShixunsState(false,type,"desc");
-	}
-
-
-	onSwitchChange=(e,key)=>{
-		let id=e.target.id
-		$("#"+id).siblings().removeClass("active");
-		$("#"+id).addClass("active");
-		let {typemy,upcircle,typekeyid}=this.state;
-
-		if(typekeyid===key){
-      if(upcircle===true){
-        this.setState({
-          upcircle:false,
-        })
-        this.props.Shixunsupcircles("desc")
-      }else if(upcircle===false){
-        this.setState({
-          upcircle:true
-        })
-        this.props.Shixunsupcircles("asc")
-      }
-    }else{
-      this.setState({
-        typekeyid:key
-      })
-    }
-
-
-		if(typemy===0){
-			this.setState({
-				typemy:1
-			})
-		}else{
-			this.setState({
-				typemy:0
-			})
-		}
-		// allevent
-		this.props.ShixunsSwitch();
-	}
-	//输入框搜索
-	Input_search = (value) => {
-		this.setState({
-			InputValue: value
-		})
-		this.props.OnSearchInput(value,true);
-	}
-
-	Input_searchs = (e) => {
-		this.setState({
-			InputValue: e.target.value
-		})
-    this.props.OnSearchInput(e.target.value,false);
-	}
-	upcircles=(val)=>{
-  		if(val==="asc"){
-  			this.setState({
-				upcircle:false,
-			})
-			this.props.Shixunsupcircles("desc")
-		}else if(val==="desc"){
-			this.setState({
-				upcircle:true
-			})
-			this.props.Shixunsupcircles("asc")
-		}
-	}
-
-	//头部获取是否已经登录了
-	getUser=(url,type)=>{
-		if(this.props.checkIfLogin()===false){
-			this.props.showLoginDialog()
-			return
-		}
-		if(this.props.checkIfProfileCompleted()===false){
-			this.props.showProfileCompleteDialog()
-			return
-		}
-		if(this.props&&this.props.current_user&&this.props.current_user.is_shixun_marker===false){
-			this.setgoshowqqgtounp(true);
-			return;
-		}
-
-		if(url !== undefined || url!==""){
-			window.location.href = url;
-		}
-
-
-	}
-
-	// 处理弹框
-	setgoshowqqgtounp=(bool)=>{
-		this.setState({
-			goshowqqgtounp:bool
-		})
-	}
-	render(){
-		let {mine,InputValue,upcircle,goshowqqgtounp}=this.state;
-
-		// console.log("NewHeadermygetHelmetapi123123123123");
-		let shixuntype=false;
-		if(this.props&&this.props.mygetHelmetapi!=null){
-			let shixun="/shixuns";
-			let paths="/paths";
-			let courses="/courses";
-			this.props.mygetHelmetapi.navbar.map((item,key)=>{
-				var reg = RegExp(item.link);
-				if(shixun.match(reg)){
-					if(item.hidden===true){
-						shixuntype=true
-					}
-				}
-			})
-		}
-
-    console.log(this.props.middleshixundata.search_tags)
-		return (
-			<div className="educontent mt20">
-				<div className="clearfix">
-
-					{
-						goshowqqgtounp===true?
-							<GotoQQgroup {...this.state} {...this.props} setgoshowqqgtounp={(bool)=>this.setgoshowqqgtounp(bool)}></GotoQQgroup>
-							:
-							""
-					}
-
-					{/*<div className="fl mr20 font-16 bestChoose shixun_repertoire active"*/}
-						 {/*id={"all"}*/}
-						 {/*onClick={(e)=>this.latestHot(e,1)}>全部*/}
-					{/*</div>*/}
-					{/*<div className="fl mr20 font-16 bestChoose shixun_repertoire"*/}
-						 {/*id={mine}*/}
-						 {/*onClick={(e)=>this.onSwitchChange(e,2)}>我的*/}
-					{/*</div>*/}
-
-					<div className="fl mr20 font-16 bestChoose shixun_repertoire active"
-							 id="new"
-							 onClick={(e)=>this.latestHot(e,4)}>最新
-					</div>
-
-					<div className="fl font-16 bestChoose shixun_repertoire"
-						 id="hot"
-						 onClick={(e)=>this.latestHot(e,3)}>最热
-					</div>
-
-					{shixuntype===true?"":<span className={  "fr font-16 bestChoose color-blue"  }  onClick={(url)=>this.getUser("/shixuns/new")}>+新建实训项目</span>}
-
-					<div className="fr mr20 mt3">
-						{
-							this.props.middleshixundata&&this.props.middleshixundata.search_tags
-						}
-					</div>
-					{/*<div className="fl font-16 bestChoose shixun_repertoire ml20 mt1"*/}
-					    {/*style={{display:upcircle===true?"block":"none"}}*/}
-						 {/*// onClick={()=>this.upcircles("asc")}*/}
-					{/*>*/}
-						{/*<Tooltip placement="bottom" title={"升序"}>*/}
-							{/*<Icon type="up-circle" theme="twoTone" />*/}
-              {/*/!*<Icon type="sort-descending" />*!/*/}
-						{/*</Tooltip>*/}
-					{/*</div>*/}
-					{/*<div className="fl font-16 bestChoose shixun_repertoire ml20 mt1"*/}
-						 {/*// onClick={()=>this.upcircles("desc")}*/}
-						 {/*style={{display:upcircle===true?"none":"block"}}*/}
-					{/*>*/}
-						{/*<Tooltip placement="bottom" title={"降序"}>*/}
-							{/*<Icon type="down-circle" theme="twoTone"  />*/}
-              {/*/!*<Icon type="sort-ascending" />*!/*/}
-						{/*</Tooltip>*/}
-					{/*</div>*/}
-
-					{/*<div className="fr mt3">*/}
-						{/*<Search*/}
-							{/*style={{ width: 300 }}*/}
-							{/*className="search-new-input fl"*/}
-							{/*placeholder="请输入创建者/实训/关卡名称进行搜索"*/}
-							{/*value={InputValue}*/}
-							{/*onInput={this.Input_searchs}*/}
-							{/*onSearch={value => this.Input_search(value)}*/}
-							{/*enterButton*/}
-						{/*/>*/}
-
-            {/* <Search
-              style={{ width: 300 }}
-              className="fl"
-              placeholder="请输入创建者/实训/关卡名称进行搜索"
-              value={InputValue}
-              onInput={this.Input_searchs}
-              onSearch={value => this.Input_search(value)}
-              autoComplete="off"
-            ></Search> */}
-					{/*</div>*/}
-					{/*<div className="fr">*/}
-						{/*<span className="fl color-grey-6 mr30 font-16 mt5" id="search_name">{*/}
-							{/*this.props.search_tags === null ? "" : this.props.search_tags*/}
-						{/*}</span>*/}
-						{/*<div className="fl mr5" style={{marginTop:'1px'}}>*/}
-						{/*/!* <div className="controlblue"></div>*/}
-						{/*<span className="controlring"></span> *!/*/}
-						{/*<Switch*/}
-						{/*className="controlbtn mr10 mt10 pr"*/}
-						{/*size="small"*/}
-						{/*style={{marginTop:'1px'}}*/}
-						{/*onChange={this.onSwitchChange}*/}
-						{/*/>*/}
-						{/*</div>*/}
-						{/*<span className="fl font-16 cdefault" data-tip-down="隐藏我学习的实训">隐藏我的</span>*/}
-
-					{/*</div>*/}
-					{/*<span className="fr color-grey-6 mr30 font-16" id="search_name"></span>*/}
-				</div>
-			</div>
-		);
-	}
-}
-
-export default ShixunCardList;
diff --git a/src/modules/tpm/shixuns/ShixunSearchBar.js b/src/modules/tpm/shixuns/ShixunSearchBar.js
deleted file mode 100644
index b884d7bf..00000000
--- a/src/modules/tpm/shixuns/ShixunSearchBar.js
+++ /dev/null
@@ -1,290 +0,0 @@
-import React, { Component } from 'react';
-
-import { Select, Input,Menu, Dropdown } from 'antd';
-
-import 'antd/lib/style/index.css';
-
-import 'antd/lib/select/style/index.css';
-
-import 'antd/lib/input/style/index.css';
-
-import './shixunCss/ShixunSearchBar.css';
-
-import axios from 'axios';
-
-const $ = window.$;
-
-const Option = Select.Option;
-
-const Search = Input.Search;
-
-
-class ShixunSearchBar extends Component {
-
- constructor(props) {
-      super(props)
-      this.state = {
-            status: undefined,
-            diff: 0,
-            InputValue: undefined,
-            shixunhoverData: [],
-            shixunchildValues:'',
-          shixunsearchAllvalue:"a",
-          openStatus:false,
-          openLevel:false
-      }
-}
-
-      //状态筛选
-    status_search = (value) => {
-        let newvalue = value;
-        if (newvalue === "0") {
-            newvalue = " "
-        } else if (newvalue === "1") {
-            newvalue = 2
-        } else if (newvalue === "2") {
-            newvalue = 1
-        } else if (newvalue === "3") {
-            newvalue = 3
-        }
-
-      this.setState({
-          status: newvalue,
-          openStatus:false
-      })
-        let list = [{'type': 1}, {'value': newvalue}];
-      this.props.StatusEnquiry(list);
-}
-
-      //难度筛选
-diff_search = (value) => {
-      this.setState({
-        diff: value,
-        openLevel:false
-      })
-      let list=[{'type':2},{'value':value}];
-      this.props.StatusEnquiry(list);
-}
-
-      //输入框搜索
-Input_search = (value) => {
-      this.setState({
-          InputValue: value
-      })
-      this.props.OnSearchInput(value);
-}
-      //查询
-shixunsearchAll = (e) => {
-     let{shixunsearchAllvalue}=this.state;
-    let id = e.target.value;
-
-    if(shixunsearchAllvalue===id){
-        return
-    }
-    if(id===0){
-        id=" "
-        this.setState({
-            InputValue: " "
-        })
-        this.props.OnSearchInput("");
-    }
-    let list=[{'tag_level':1},{'tag_id':id}];
-    if(id!=undefined){
-        this.setState({
-            shixunsearchAllvalue:id,
-            shixunchildValues:""
-        })
-        this.props.Updatasearchlist(list);
-    }
-
-}
-
-    shixunsearchall=(e)=>{
-        let{shixunsearchAllvalue}=this.state;
-        let id = "a";
-
-        if(shixunsearchAllvalue===id){
-            return
-        }
-        this.setState({
-            shixunsearchAllvalue:"a",
-            shixunchildValues:""
-        })
-        this.props.allUpdatashixunlist();
-    }
-
-					//选择Tab页详情
-		getshixunchildValue = (e) => {
-					 let id = e.target.name;
-					 let newid=e.target.id;
-					 let list=[{'tag_level':2},{'tag_id':id}];
-					 if(id!=undefined||newid!=undefined){
-						this.setState({
-								shixunsearchAllvalue:newid
-						})
-						this.props.Updatasearchlist(list);
-				}
-		}
-
-getshixunchildValues = (e) => {
-    let id = e.target.id;
-    let newid=e.target.name;
-    let list=[{'tag_level':3},{'tag_id':id}];
-    if(id!=undefined||newid!=undefined){
-        this.setState({
-            shixunchildValues:id,
-            shixunsearchAllvalue:newid
-        })
-        this.props.Updatasearchlist(list);
-    }
-
-}
-
-componentDidMount() {
-      let hoverUrlArr = [];
-      let hoverUrl = `/shixuns/menus.json`;
-      axios.get(hoverUrl
-      ).then((response) => {
-            hoverUrlArr = response.data;
-            // hoverUrlArr.reverse();
-            this.setState({
-                  shixunhoverData: hoverUrlArr
-            })
-      }).catch((error) => {
-            console.log(error)
-      })
-}
-
-render() {
-    let {shixunhoverData, shixunchildValues, shixunsearchAllvalue, InputValue,openStatus,openLevel} = this.state;
-    let {typepvisible} = this.props;
-     // //实训首页筛选的移入和点击事件
-     // $(".shaiItem").hover(function(){
-     //      var hei=parseInt($(".shaiAllItem").height())-2;
-     //     $(this).find(".subshaicontent").css("top", '34px');
-     //      $(this).find(".subshaicontent").show();
-     //  },function(){
-     //      $(this).find(".subshaicontent").hide();
-     //  });
-		 //
-     //  $(".shaiItem").live("click",function(){
-     //      $(".shaiItem").removeClass("active");
-     //      $(this).addClass("active");
-     //      $(".subshaicontent").hide();
-     //  });
-		 //
-     //  $(".subshaicontent").live("click", function(event){
-     //      $(".subshaicontent").hide();
-     //      event.stopPropagation();
-     //  });
-
-		 let overlaymenu=(item,id)=>(
-				 <Menu>
-					{
-						item.map((list,k)=>{
-							return(
-								<Menu.Item>
-								<div className="mt5 subshaicontent-part" key={k}>
-									<a style={{ height: '20px' }} className={ "mb15 shixun_repertoire color-dark"}  name={list.id} id={id} onClick={this.getshixunchildValue}>{list.name}</a>
-									<div className="sub-Item clearfix">
-										{
-											list.tags.map((tag,e)=>{
-												return(
-													<a className={parseInt(shixunchildValues)===tag.id?"shixun_repertoire active":"shixun_repertoire"} key={e} id={tag.id} name={id} rel="subshaicontent" onClick={this.getshixunchildValues}>{tag.name}</a>
-												)
-											})
-										}
-									</div>
-								</div>
-								</Menu.Item>
-							)
-						})
-					}
-				 </Menu>
-		)
-
-    return (
-        <div className="edu-back-white" >
-            <div className="educontent">
-                <div className="pt40 pb40">
-                    <div className="clearfix mb30 shaiContent">
-                        <span className="shaiTitle fl mt3">方向：</span>
-                        <div className="fl pr shaiAllItem">
-                        <li className={shixunsearchAllvalue==="a"?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value= "a"    onClick={this.shixunsearchall}>全部</li>
-													<style>
-														{
-															`
-															.ant-dropdown{
-														     width: 800px;
-															}
-															.shixun_repertoire{
-																	cursor: pointer;
-																	float: left;
-																	margin-right: 20px;
-																	color: #999;
-																	cursor: pointer;
-																	margin-bottom: 10px;
-															}
-															.ant-dropdown-menu-item, .ant-dropdown-menu-submenu-title{
-    															padding: 0px 12px;
-															}
-															.ant-dropdown-menu-item:hover, .ant-dropdown-menu-submenu-title:hover{
-													      background:transparent !important;
-															}
-															`
-														}
-													</style>
-													{
-														shixunhoverData.map((item,key)=>{
-															return(
-																	<Dropdown overlay={overlaymenu(item.sub_repertoires,item.id)} key={key} placement=	{item.id<4?"bottomRight":item.id>=8?"bottomLeft":"bottomCenter"}>
-																		<li  key={key} className={parseInt(shixunsearchAllvalue)===item.id?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value={item.id}  onClick={this.shixunsearchAll}>
-																			{item.name}
-																		</li>
-																	</Dropdown>
-															)
-														})
-													}
-
-
-                        </div>
-                        </div>
-                        <div className="clearfix">
-                        <span className="shaiTitle fl mt6">筛选：</span>
-													{
-														<style>
-															{`
-															  .shaiItems{
-																		padding: 3px 15px;
-																		float: left;
-																		border-radius: 4px;
-																		color: #4C4C4C;
-																		cursor: pointer;
-																		margin-right: 15px;
-																		display: block;
-																		float:left;
-																	}
-																	.shaiItems.active {
-																			background-color: #4CACFF!important;
-																			color: #fff!important;
-																	}
-															`}
-														</style>
-													}
-													<div className="fl pr shaiAllItem mt1">
-														<li className={this.state.diff===0?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(0)}>全部难度</li>
-														<li className={this.state.diff===1?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(1)}>初级</li>
-														<li className={this.state.diff===2?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(2)}>中级</li>
-														<li className={this.state.diff===3?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(3)}>中高级</li>
-														<li className={this.state.diff===4?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(4)}>高级</li>
-													</div>
-
-                    </div>
-                </div>
-        </div>
-    </div>
-      );
-}
-}
-
-export default ShixunSearchBar;
diff --git a/src/modules/tpm/shixuns/ShixunsIndex.js b/src/modules/tpm/shixuns/ShixunsIndex.js
index 82fa6a3f..2613fc1c 100644
--- a/src/modules/tpm/shixuns/ShixunsIndex.js
+++ b/src/modules/tpm/shixuns/ShixunsIndex.js
@@ -1,115 +1,102 @@
 import React, { Component } from 'react';
-
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
 import axios from 'axios';
-
-import { Spin } from 'antd';
-
 import { TPMIndexHOC } from '../TPMIndexHOC';
-
-import { SnackbarHOC } from 'educoder';
-
-import ShixunCardList from './ShixunCardList';
-
-import ShixunSearchBar from './ShixunSearchBar';
-
-import ShixunCard from './ShixunCard';
-
+import { SnackbarHOC, getImageUrl } from 'educoder';
+import ShixunCardList from './shixun-keyword-list';
+import ShixunSearchBar from './shixun-search-bar';
+import ShixunCard from './shixun-card';
 import UpgradeModals from '../../modals/UpgradeModals';
-
+import GotoQQgroup from '../../../modal/GotoQQgroup'
+import btnUrl from './btn-new.png'
 const queryString = require('query-string');
 
-const $ = window.$;
-
 class ShixunsIndex extends Component {
     constructor(props) {
         super(props)
-        this.state={
+        this.state = {
             order_by: "new",
-            page:1,
-            limit:16,
-            keyword:"",
-            status:0,
-            diff:0,
+            showQQ: false,
+            page: 1,
+            limit: 16,
+            keyword: "",
+            status: 0,
+            diff: 0,
             tag_level: 1,
-            tag_id:'',
-            middleshixundata:[],
-            typepvisible:true,
-            pages:1,
-            search_tags:null,
-            parsedid:undefined,
-            newtag_level:undefined,
-            newpalce:undefined,
-            sort:"desc"
+            tag_id: '',
+            middleshixundata: [],
+            typepvisible: true,
+            pages: 1,
+            search_tags: null,
+            parsedid: undefined,
+            newtag_level: undefined,
+            newpalce: undefined,
+            sort: "desc"
         }
     }
-    componentDidMount(){
+    componentDidMount() {
 
-			const upsystem=`/users/system_update.json`;
-			axios.get(upsystem).then((response)=>{
-				let updata=response.data;
-				this.setState({
-					updata:updata
-				})
-			}).catch((error)=>{
-				console.log(error);
-			})
+        const upsystem = `/users/system_update.json`;
+        axios.get(upsystem).then((response) => {
+            let updata = response.data;
+            this.setState({
+                updata: updata
+            })
+        }).catch((error) => {
+            console.log(error);
+        })
 
 
 
-			let _keyword;
+        let _keyword;
         if (window.__headSearchKeyword) {
             this.setState({ keyword: window.__headSearchKeyword })
             _keyword = window.__headSearchKeyword
             delete window.__headSearchKeyword
         }
         const parsed = queryString.parse(this.props.location.search);
-        if(parsed.id===undefined&&parsed.type===undefined){
-            let {order_by, tag_level, tag_id, page, limit, keyword, status, diff} = this.state;
-            let params={
-                order_by:order_by,
-                tag_level:tag_level,
-                tag_id:tag_id,
-                page:page,
-                limit:limit,
-                keyword: _keyword || keyword ,
-                status:status,
-                diff:diff,
+        if (parsed.id === undefined && parsed.type === undefined) {
+            let { order_by, tag_level, tag_id, page, limit, keyword, status, diff } = this.state;
+            let params = {
+                order_by: order_by,
+                tag_level: tag_level,
+                tag_id: tag_id,
+                page: page,
+                limit: limit,
+                keyword: _keyword || keyword,
+                status: status,
+                diff: diff,
                 sort: "desc"
             }
             this.shixunresultend(params);
-        }else{
-            let {order_by,page, limit, keyword, status, diff} = this.state;
-            let nawparsed=parsed.type;
-            let newpalce=parsed.palce;
-            if(nawparsed==="rep"){
-                nawparsed=1
+        } else {
+            let { order_by, page, limit, keyword, status, diff } = this.state;
+            let nawparsed = parsed.type;
+            let newpalce = parsed.palce;
+            if (nawparsed === "rep") {
+                nawparsed = 1
             }
-            else if(nawparsed==="sub"){
-                nawparsed=2
-            }else if(nawparsed==="tag"){
-                nawparsed=3
+            else if (nawparsed === "sub") {
+                nawparsed = 2
+            } else if (nawparsed === "tag") {
+                nawparsed = 3
             }
-            let params={
-                order_by:order_by,
-                tag_level:nawparsed,
-                tag_id:parsed.id,
-                page:page,
-                limit:limit,
+            let params = {
+                order_by: order_by,
+                tag_level: nawparsed,
+                tag_id: parsed.id,
+                page: page,
+                limit: limit,
                 keyword: _keyword || keyword,
-                status:status,
-                diff:diff,
+                status: status,
+                diff: diff,
                 sort: "desc"
             }
             this.setState({
-                parsedid:parsed.id,
-                newtag_level:nawparsed,
-                tag_level:nawparsed,
-                newpalce:newpalce,
-                tag_id:parsed.id,
+                parsedid: parsed.id,
+                newtag_level: nawparsed,
+                tag_level: nawparsed,
+                newpalce: newpalce,
+                tag_id: parsed.id,
                 keyword: _keyword || keyword,
             })
             this.shixunresultend(params);
@@ -117,221 +104,219 @@ class ShixunsIndex extends Component {
 
     }
 
-    allUpdatashixunlist=()=>{
-			let{sort,order_by}=this.state;
+    allUpdatashixunlist = () => {
+        let { sort, order_by } = this.state;
 
         this.setState({
             tag_level: 1,
-            tag_id:'',
+            tag_id: '',
             page: 1,
             limit: 16,
-            keyword:'',
+            keyword: '',
             status: 0,
             diff: 0,
         })
 
-        let params={
-            order_by:order_by,
+        let params = {
+            order_by: order_by,
             tag_level: 1,
-            tag_id:'',
+            tag_id: '',
             page: 1,
             limit: 16,
-            keyword:'',
+            keyword: '',
             status: 0,
             diff: 0,
-				  	sort:sort
+            sort: sort
         }
         this.shixunresultend(params)
     }
-    Updatasearchlist=(value)=>{
+    Updatasearchlist = (value) => {
         if (value[1].tag_id === " ") {
             this.setState({
                 keyword: ""
             })
         }
         this.setState({
-            tag_level:value[0].tag_level,
-            tag_id:value[1].tag_id,
-            typepvisible:true
+            tag_level: value[0].tag_level,
+            tag_id: value[1].tag_id,
+            typepvisible: true
         })
 
-        let {order_by, sort, limit, keyword, status, diff} = this.state;
+        let { order_by, sort, limit, keyword, status, diff } = this.state;
 
-        let params={
-            order_by:order_by,
-            tag_level:value[0].tag_level,
-            tag_id:value[1].tag_id,
-            page:1,
-            limit:limit,
-            keyword:keyword,
-            status:status,
-            diff:diff,
-					  sort:sort
+        let params = {
+            order_by: order_by,
+            tag_level: value[0].tag_level,
+            tag_id: value[1].tag_id,
+            page: 1,
+            limit: limit,
+            keyword: keyword,
+            status: status,
+            diff: diff,
+            sort: sort
         }
 
         this.shixunresultend(params)
     }
 
-    StatusEnquiry=(key)=>{
-
-        let Vrl=`/shixuns.json`;
+    StatusEnquiry = (key) => {
         let newstatus;
         let newdiff;
-        if(key[0].type===1){
+        if (key[0].type === 1) {
             this.setState({
                 status: key[1].value,
-                typepvisible:true
+                typepvisible: true
             })
-            newstatus=key[1].value;
-            newdiff=this.state.diff;
-        }else if(key[0].type===2){
+            newstatus = key[1].value;
+            newdiff = this.state.diff;
+        } else if (key[0].type === 2) {
             this.setState({
                 diff: key[1].value,
-                typepvisible:true
+                typepvisible: true
             })
-            newdiff=key[1].value;
-            newstatus=this.state.status;
+            newdiff = key[1].value;
+            newstatus = this.state.status;
         }
-        let params= {
-            order_by:this.state.order_by,
-            tag_level:this.state.tag_level,
-            tag_id:this.state.tag_id,
-            page:1,
-            limit:this.state.limit,
-            keyword:this.state.keyword,
-            status:newstatus,
-            diff:newdiff,
+        let params = {
+            order_by: this.state.order_by,
+            tag_level: this.state.tag_level,
+            tag_id: this.state.tag_id,
+            page: 1,
+            limit: this.state.limit,
+            keyword: this.state.keyword,
+            status: newstatus,
+            diff: newdiff,
         }
         this.shixunresultend(params)
 
     }
 
-    OnSearchInput=(value,type)=>{
-      if(type===true){
-        this.setState({
-            keyword:value,
-            typepvisible:true,
-            pages:1
-        })
-        let {order_by, tag_level, tag_id, sort, limit, status, diff} = this.state;
-        let params= {
-            order_by:order_by,
-            tag_level:tag_level,
-            tag_id:tag_id,
-            page:1,
-            limit:limit,
-            keyword:value,
-            status:status,
-            diff:diff,
-					  sort:sort
+    OnSearchInput = (value, type) => {
+        if (type === true) {
+            this.setState({
+                keyword: value,
+                typepvisible: true,
+                pages: 1
+            })
+            let { order_by, tag_level, tag_id, sort, limit, status, diff } = this.state;
+            let params = {
+                order_by: order_by,
+                tag_level: tag_level,
+                tag_id: tag_id,
+                page: 1,
+                limit: limit,
+                keyword: value,
+                status: status,
+                diff: diff,
+                sort: sort
+            }
+            this.shixunresultend(params)
+        } else {
+            this.setState({
+                keyword: value,
+                pages: 1
+            })
         }
-          this.shixunresultend(params)
-        }else{
-        this.setState({
-          keyword:value,
-          pages:1
-        })
-      }
 
 
     }
 
-    ShixunsSwitch=()=>{
+    ShixunsSwitch = () => {
         //types
         this.setState({
-            order_by:"mine",
-            typepvisible:true,
-            pages:1,
+            order_by: "mine",
+            typepvisible: true,
+            pages: 1,
         })
-        let{tag_level,tag_id,page,limit,keyword,status,diff,sort}=this.state;
-        let newsort=sort;
-        if(newsort===undefined){
-            newsort="desc"
+        let { tag_level, tag_id, page, limit, keyword, status, diff, sort } = this.state;
+        let newsort = sort;
+        if (newsort === undefined) {
+            newsort = "desc"
         }
-        let params= {
-            order_by:"mine",
-            tag_level:tag_level,
-            tag_id:tag_id,
-            page:1,
-            limit:limit,
-            keyword:keyword,
-            status:status,
-            diff:diff,
-            sort:newsort
+        let params = {
+            order_by: "mine",
+            tag_level: tag_level,
+            tag_id: tag_id,
+            page: 1,
+            limit: limit,
+            keyword: keyword,
+            status: status,
+            diff: diff,
+            sort: newsort
         }
         this.shixunresultend(params)
     }
 
 
-    shixunsPage=(value)=>{
+    shixunsPage = (value) => {
         this.setState({
-            page:value,
-            typepvisible:true,
-            pages:value
+            page: value,
+            typepvisible: true,
+            pages: value
         })
-        let {order_by, tag_level, tag_id, limit, keyword, status, diff,sort} = this.state;
-        let params= {
-            order_by:order_by,
-            tag_level:tag_level,
-            tag_id:tag_id,
-            page:value,
-            limit:limit,
-            keyword:keyword,
-            status:status,
-            diff:diff,
-			  		sort:sort
+        let { order_by, tag_level, tag_id, limit, keyword, status, diff, sort } = this.state;
+        let params = {
+            order_by: order_by,
+            tag_level: tag_level,
+            tag_id: tag_id,
+            page: value,
+            limit: limit,
+            keyword: keyword,
+            status: status,
+            diff: diff,
+            sort: sort
         }
 
-        let Url=`/shixuns.json`;
-        axios.get(Url,{
+        let Url = `/shixuns.json`;
+        axios.get(Url, {
             params
-        }).then((response)=> {
-            if(response.status===200){
+        }).then((response) => {
+            if (response.status === 200) {
                 this.setState({
                     middleshixundata: response.data,
-                    typepvisible:false,
+                    typepvisible: false,
                 });
             }
-        }).catch((error)=>{
+        }).catch((error) => {
             console.log(error)
         });
     }
-    ShixunsState=(val,type,sorts)=>{
+    ShixunsState = (type, sorts) => {
         // sort,
-        let {tag_level, tag_id, page, limit, keyword, status, diff,sort} = this.state;
-        let newsort=sorts?sorts:sort;
+        let { tag_level, tag_id, page, limit, keyword, status, diff, sort } = this.state;
+        let newsort = sorts ? sorts : sort;
         this.setState({
-            order_by:type,
-            typepvisible:true,
-            pages:1,
-            sort:sorts?sorts:sort
+            order_by: type,
+            typepvisible: true,
+            pages: 1,
+            sort: sorts ? sorts : sort
         })
 
         let params
         // let vals=false
-          if(newsort===undefined){
-              newsort="desc"
-          }else{
-              newsort=sorts?sorts:sort
-          }
-        params= {
-            order_by:type,
-            tag_level:tag_level,
-            tag_id:tag_id,
-            page:1,
-            limit:limit,
-            keyword:keyword,
-            status:status,
-            diff:diff,
-            sort:newsort
+        if (newsort === undefined) {
+            newsort = "desc"
+        } else {
+            newsort = sorts ? sorts : sort
+        }
+        params = {
+            order_by: type,
+            tag_level: tag_level,
+            tag_id: tag_id,
+            page: 1,
+            limit: limit,
+            keyword: keyword,
+            status: status,
+            diff: diff,
+            sort: newsort
         }
         this.shixunresultend(params)
     }
 
-    Shixunsupcircles=(sort)=>{
+    Shixunsupcircles = (sort) => {
         console.log(sort)
         this.setState({
-            sort:sort
+            sort: sort
         })
         let {
             order_by,
@@ -345,86 +330,139 @@ class ShixunsIndex extends Component {
 
 
 
-        let params= {
-            order_by:order_by,
-            tag_level:tag_level,
-            tag_id:tag_id,
-            page:1,
-            limit:limit,
-            keyword:keyword,
-            status:status,
-            diff:diff,
-            sort:sort
+        let params = {
+            order_by: order_by,
+            tag_level: tag_level,
+            tag_id: tag_id,
+            page: 1,
+            limit: limit,
+            keyword: keyword,
+            status: status,
+            diff: diff,
+            sort: sort
         }
         this.shixunresultend(params)
     }
 
+    onNewHandler() {
+        const { checkIfLogin, showLoginDialog, checkIfProfileCompleted, showProfileCompleteDialog, current_user } = this.props
+        if (!checkIfLogin()) {
+            showLoginDialog()
+            return
+        }
+        if (!checkIfProfileCompleted()) {
+            showProfileCompleteDialog()
+            return
+        }
+        if (current_user && current_user.is_shixun_marker === false) {
+            this.setState(
+                { showQQ: true }
+            )
+            return
+        }
+        window.location.href = '/shixuns/new'
+    }
 
+    setShowQQ(v) {
+        this.setState({
+            showQQ: v
+        })
+    }
 
-
-    shixunresultend=(params)=>{
-        let Url=`/shixuns.json`;
-        axios.get(Url,{
+    shixunresultend = (params) => {
+        let Url = `/shixuns.json`;
+        axios.get(Url, {
             params
-        }).then((response)=> {
+        }).then((response) => {
             // TODO 有keyword返回值时 显示一共有多少条记录
-            if(response.status===200){
+            if (response.status === 200) {
                 this.setState({
-                    search_tags:response.data.search_tags,
+                    search_tags: response.data.search_tags,
                     middleshixundata: response.data,
-                    typepvisible:false,
-                    pages:1
+                    typepvisible: false,
+                    pages: 1
                 });
             }
-        }).catch((error)=>{
+        }).catch((error) => {
             console.log(error)
         });
     }
     render() {
-        let {middleshixundata, typepvisible, pages, search_tags, keyword,parsedid,newtag_level,newpalce} = this.state;
+        let { middleshixundata, typepvisible, pages, search_tags, keyword, parsedid, newtag_level, newpalce, showQQ } = this.state;
 
         // console.log(this.state.updata)
         return (
-            <div className="newMain clearfix  backFAFAFA">
-							{this.state.updata===undefined?"":<UpgradeModals
-								{...this.state}
-							/>}
-                {/*<Spin spinning={typepvisible}  size="large" style={{marginTop:'15%'}}>*/}
-                    <ShixunSearchBar
-                        Updatasearchlist={this.Updatasearchlist.bind(this)}
-                        allUpdatashixunlist={this.allUpdatashixunlist}
-                        StatusEnquiry={this.StatusEnquiry.bind(this)}
-                        OnSearchInput={this.OnSearchInput.bind(this)}
-                        keyword={keyword}
-                        parsedid={parsedid}
-                        newtag_level={newtag_level}
-                        newpalce={newpalce}
-                        {...this.props}
-                        {...this.state}
-                    />
+            <div className="newMain clearfix  backFAFAFA shi-xun-index">
+                {this.state.updata === undefined ? "" : <UpgradeModals
+                    {...this.state}
+                />}
+                <style>
+                    {
+                        `    ::-webkit-scrollbar {
+                      width: 0px !important;
+                    }
+										.myshixin-head{
+												width: 100%;
+												height: 240px;
+												background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.shixun_banner_url === null ? `images/educoder/courses/courses.jpg` : this.props.mygetHelmetapi && this.props.mygetHelmetapi.shixun_banner_url)});
+											  background-color: #081C4B;
+												background-position: center;
+												background-repeat: no-repeat;
+										}
 
-                    <ShixunCardList
-                        ShixunsState={this.ShixunsState.bind(this)}
-                        ShixunsSwitch={this.ShixunsSwitch.bind(this)}
-                        Shixunsupcircles={this.Shixunsupcircles.bind(this)}
-                        allUpdatashixunlist={this.allUpdatashixunlist}
-                        {...this.props}
-                        {...this.state}
-                        OnSearchInput={this.OnSearchInput.bind(this)}
-                    />
-                     {/*下方图片*/}
-                    <ShixunCard
-                        typepvisible={typepvisible}
-                        middleshixundata={middleshixundata.shixuns}
-                        totalcount={middleshixundata.total_count}
-                        pagination={middleshixundata.pagination}
-                        pages={pages}
-                        shixunsPage={this.shixunsPage.bind(this)}
-                    />
+									`
+                    }
+                </style>
+                {
+                    this.props.mygetHelmetapi && this.props.mygetHelmetapi.shixun_banner_url ?
+                        <div className="myshixin-head pr" >
+                            <div className="edu-txt-center pathNavLine">
+                                <div className="inline path-nav">
+                                </div>
+                            </div>
+                        </div>
+                        :
+                        ""
+                }
+
+                <ShixunSearchBar
+                    Updatasearchlist={this.Updatasearchlist.bind(this)}
+                    allUpdatashixunlist={this.allUpdatashixunlist}
+                    StatusEnquiry={this.StatusEnquiry.bind(this)}
+                    OnSearchInput={this.OnSearchInput.bind(this)}
+                    keyword={keyword}
+                    parsedid={parsedid}
+                    newtag_level={newtag_level}
+                    newpalce={newpalce}
+                    {...this.props}
+                    {...this.state}
+                />
+
+                {
+                    showQQ ? <GotoQQgroup goshowqqgtounp={showQQ} setgoshowqqgtounp={this.setShowQQ.bind(this)}></GotoQQgroup> :
+                        ""
+                }
+                <ShixunCardList
+                    onChangeLabel={this.ShixunsState.bind(this)}
+                    ShixunsSwitch={this.ShixunsSwitch.bind(this)}
+                    Shixunsupcircles={this.Shixunsupcircles.bind(this)}
+                    onNewHandler={this.onNewHandler.bind(this)}
+                    btnUrl={btnUrl}
+                    OnSearchInput={this.OnSearchInput.bind(this)}
+                />
+                {/*下方图片*/}
+                <ShixunCard
+                    typepvisible={typepvisible}
+                    middleshixundata={middleshixundata.shixuns}
+                    totalcount={middleshixundata.total_count}
+                    pagination={middleshixundata.pagination}
+                    pages={pages}
+                    shixunsPage={this.shixunsPage.bind(this)}
+                />
                 {/*</Spin>*/}
             </div>
         );
     }
 }
 
-export default SnackbarHOC() (TPMIndexHOC  ( ShixunsIndex ));
+export default SnackbarHOC()(TPMIndexHOC(ShixunsIndex));
diff --git a/src/modules/tpm/shixuns/btn-new.png b/src/modules/tpm/shixuns/btn-new.png
new file mode 100644
index 00000000..4b584c54
Binary files /dev/null and b/src/modules/tpm/shixuns/btn-new.png differ
diff --git a/src/modules/tpm/shixuns/css/TPMBanner.css b/src/modules/tpm/shixuns/css/TPMBanner.css
index 32fab5b4..b7a371d9 100644
--- a/src/modules/tpm/shixuns/css/TPMBanner.css
+++ b/src/modules/tpm/shixuns/css/TPMBanner.css
@@ -165,4 +165,8 @@ a:active{text-decoration:none;}
 .forkfactors{
     text-align: center;
     color: #999999;
+}
+
+.width155{
+    width:150px !important;
 }
\ No newline at end of file
diff --git a/src/modules/tpm/shixuns/shixun-card.js b/src/modules/tpm/shixuns/shixun-card.js
new file mode 100644
index 00000000..51618aef
--- /dev/null
+++ b/src/modules/tpm/shixuns/shixun-card.js
@@ -0,0 +1,98 @@
+import React from 'react';
+import { getImageUrl, setImagesUrl, getUrl } from 'educoder';
+import { Spin, Tooltip, Rate } from 'antd';
+import './shixunCss/shixunCard.scss';
+import Pagination from '../../../components/mini-pagination'
+
+export default ({ middleshixundata, pagination, typepvisible, pages, totalcount, shixunsPage }) => {
+  function onPageChange(number) {
+    shixunsPage(number)
+  }
+
+  return (
+    <div className="educontent mb80 shixun-card">
+      <Spin spinning={typepvisible} tip="正在获取相关数据..." size="large" style={{ marginTop: '15%' }}>
+        {middleshixundata === undefined ? "" : middleshixundata.length === 0 ? <div className="edu-tab-con-box clearfix edu-txt-center">
+          <img className="edu-nodata-img mb20" src={getUrl("/images/educoder/nodata.png")} />
+          <p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
+        </div> : ""}
+
+        <div className="mb20 clearfix">
+          <div className="shixun_list_content">
+            <div className="square-list clearfix">
+              {middleshixundata === undefined || middleshixundata.length === 0 ? " " : middleshixundata.map((item, key) => {
+                return (
+                  <div className="square-Item" key={item.id} id={item.id}>
+                    {
+                      item.tag_name === null ? "" :
+                        <div className="tag-green">
+                          <span className="tag-name"> {item.tag_name}</span>
+                        </div>
+                    }
+                    {
+                      item.is_jupyter === true ?
+                        <div className="tag-org">
+                          <p className="tag-org-name intermediatecenter"> <span className="tag-org-name-test">Jupyter</span></p>
+                        </div>
+                        : ""}
+
+                    <div className={item.power === false ? "closeSquare" : "none"}>
+                      <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
+                        className="mt80 mb25" />
+                      <p className="font-14 color-white">非试用内容，需要授权</p>
+                    </div>
+
+                    <a href={"/shixuns/" + item.identifier + "/challenges"} className="square-img" target="_blank">
+                      <img src={setImagesUrl(`${item.pic}`)} />
+                    </a>
+
+                    <div className="square-main">
+                      <p className="task-hide">
+                        <a href={"/shixuns/" + item.identifier + "/challenges"} className="justify color-grey-name" title={item.name} target="_blank">
+                          {item.name}
+                        </a>
+                      </p>
+
+                      <p className="clearfix mt8 ml-3">
+                        <span className="rateYoStar fl" style={{ padding: '0px', height: '20px', lineHeight: '19px', cursor: 'default' }} title="">
+                          <Rate key={key} allowHalf defaultValue={item.score_info === null ? 5 : item.score_info} disabled />
+                        </span>
+                        <span className="fl ml25 font-12 color-grey-9 lineh-12 mt5">{item.score_info === null ? "5分" : item.score_info + "分"}</span>
+                      </p>
+
+                      <p className="clearfix mt8 font-12 color-grey-B4">
+                        {item.is_jupyter === false ? <Tooltip placement="bottom" title={"关卡"}>
+                          <span className="mr10 fl squareIconSpan">
+                            <i className="iconfont icon-shixunguanqia fl mr3"></i>{item.challenges_count}
+                          </span>
+                        </Tooltip> : ""}
+
+                        <Tooltip placement="bottom" title={"学习人数"}>
+                          <span className="mr10 fl squareIconSpan" style={{ display: item.stu_num === 0 ? "none" : "block" }}>
+                            <i className="iconfont icon-chengyuan fl mr3"></i>{item.stu_num}
+                          </span>
+                        </Tooltip>
+
+                        <span className="fr color-grey-B3 squareIconSpan">{item.level}</span>
+                      </p>
+
+                    </div>
+                  </div>
+                )
+              })
+              }
+
+            </div>
+            <div className="both"></div>
+            <div className={"educontent edu-txt-center mt10"}
+              style={{ display: pagination ? "block" : "none" }}>
+              <Pagination defaultCurrent={1} current={pages} total={totalcount || 1299} type="mini" pageSize={16} onChange={onPageChange} />
+            </div>
+
+          </div>
+
+        </div>
+      </Spin>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/src/modules/tpm/shixuns/shixun-keyword-list.jsx b/src/modules/tpm/shixuns/shixun-keyword-list.jsx
new file mode 100644
index 00000000..8f3ebf33
--- /dev/null
+++ b/src/modules/tpm/shixuns/shixun-keyword-list.jsx
@@ -0,0 +1,61 @@
+import React, { useState, Fragment } from 'react';
+import { Input, Icon } from 'antd'
+import './shixun-keyword-list.scss'
+
+function AddonAfter({ callback }) {
+	return <a className='btn-search' onClick={callback}>
+		<Icon type='search' />
+		<span>搜索</span>
+	</a>
+}
+export default ({ onChangeLabel, btnUrl, OnSearchInput, onNewHandler, btnStyle =
+	{} }) => {
+	const [data, setData] = useState({
+		type: 'new',
+		keyword: '',
+	})
+
+	function onChangeTag(e) {
+		const id = e.target.id
+		setData({ ...data, type: id })
+		onChangeLabel(id, "desc")
+	}
+	function onSetKeyword(e) {
+		setData({ ...data, keyword: e.target.value })
+	}
+
+	function callback() {
+		if (keyword) {
+			OnSearchInput(keyword, true)
+		}
+	}
+
+	function onNewShiXun() {
+		if (onNewHandler) {
+			onNewHandler()
+			return
+		}
+	}
+
+	const { type, keyword } = data
+	return (
+		<Fragment>
+			<div className="wrapper">
+				<div className="educontent  search-keyword-container">
+					<div className="btn-groups">
+						<a id='new' className={type === 'new' ? 'active' : ''} onClick={onChangeTag} title='最新'>最新</a>
+						<a id='hot' className={type === 'hot' ? 'active' : ''} onClick={onChangeTag} title='最热'>最热</a>
+					</div>
+					<div className='search-container'>
+						<Input onChange={onSetKeyword} value={keyword} addonAfter={<AddonAfter callback={callback} />} defaultValue="" placeholder='请输入课程名称进行搜索' />
+					</div>
+				</div>
+				<a className="btn-new" onClick={onNewShiXun} style={btnStyle}>
+					<img src={btnUrl} width={40} alt="创建实训" />
+				</a>
+			</div>
+
+		</Fragment>
+
+	)
+}
diff --git a/src/modules/tpm/shixuns/shixun-keyword-list.scss b/src/modules/tpm/shixuns/shixun-keyword-list.scss
new file mode 100644
index 00000000..d74f54e0
--- /dev/null
+++ b/src/modules/tpm/shixuns/shixun-keyword-list.scss
@@ -0,0 +1,82 @@
+.shi-xun-index .search-keyword-container {
+  padding: 20px 0 15px 0;
+}
+
+.search-keyword-container {
+  display: flex;
+  flex-flow: row nowrap;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20px 0;
+
+  .ant-input-group-addon {
+    background-color: #4CACFF;
+  }
+
+  .ant-input:focus+.ant-input-group-addon {
+    background-color: #4CACFF !important;
+  }
+
+  .search-container {
+    width: 320px;
+  }
+
+  .btn-search {
+    display: block;
+    text-align: center;
+    color: #fff;
+
+    span {
+      margin-left: 5px;
+    }
+  }
+
+
+  .btn-groups {
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
+    justify-content: start;
+
+    a {
+      display: block;
+      width: 60px;
+      border-radius: 14px;
+      text-align: center;
+      height: 28px;
+      line-height: 28px;
+
+      &:first-child {
+        margin-right: 20px;
+      }
+
+      color: #999;
+      background-color: #eee;
+
+      &.active {
+        color: #fff;
+        background-color: #4CACFF;
+      }
+    }
+  }
+}
+
+.wrapper {
+  position: relative;
+}
+
+.btn-new {
+  position: absolute;
+  width: 40px;
+  right: 39px;
+  top: 77px;
+  z-index: 10;
+}
+
+.btn-join {
+  position: absolute;
+  width: 40px;
+  right: 39px;
+  top: 133px;
+  z-index: 10;
+}
\ No newline at end of file
diff --git a/src/modules/tpm/shixuns/shixun-search-bar/A.jsx b/src/modules/tpm/shixuns/shixun-search-bar/A.jsx
new file mode 100644
index 00000000..4757cfec
--- /dev/null
+++ b/src/modules/tpm/shixuns/shixun-search-bar/A.jsx
@@ -0,0 +1,11 @@
+import React from 'react'
+export default ({
+  activeId, id, callback, text
+}) => {
+  function onClickHandler() {
+    callback(id)
+  }
+  return (
+    <a className={id == activeId ? "shaiItems shixun_repertoire active" : "shaiItems shixun_repertoire"} onClick={onClickHandler}>{text}</a>
+  )
+}
\ No newline at end of file
diff --git a/src/modules/tpm/shixuns/shixun-search-bar/index.jsx b/src/modules/tpm/shixuns/shixun-search-bar/index.jsx
new file mode 100644
index 00000000..0430149a
--- /dev/null
+++ b/src/modules/tpm/shixuns/shixun-search-bar/index.jsx
@@ -0,0 +1,130 @@
+import React, { useState, useEffect } from 'react'
+import { Menu, Dropdown } from 'antd'
+import 'antd/lib/style/index.css';
+import '../shixunCss/shixun-search-bar.scss'
+import axios from 'axios'
+import A from './A.jsx'
+
+const DiffObject = [
+    { id: 0, text: '全部难度' },
+    { id: 1, text: '初级' },
+    { id: 2, text: '中级' },
+    { id: 3, text: '中高级' },
+    { id: 4, text: '高级' }
+]
+export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist,parsedid,newpalce }) => {
+    const [data, setData] = useState({
+        diff: 0,
+        searchValue: newpalce || 'a',
+        navs: [],
+        searchKey: '',
+        childValue:parsedid
+    })
+    const { diff, searchValue, navs, childValue, searchKey } = data
+    function diffSearch(diff) {
+        setData({
+            ...data,
+            diff
+        })
+        StatusEnquiry([{ 'type': 2 }, { 'value': diff }])
+    }
+    useEffect(() => {
+        setData({
+            ...data,
+            searchValue: newpalce || 'a',
+            childValue: parsedid
+        })
+    },[
+        newpalce,navs,parsedid
+    ])
+    function onSearchAll() {
+        if (searchValue !== 'a') {
+            setData({ ...data, searchValue: 'a', childValue: '' })
+            allUpdatashixunlist()
+        }
+    }
+    function getChildValue(e) {
+        let id = e.target.name
+        let newid = e.target.id
+        if (id || newid) {
+            setData({ ...data, searchValue: newid })
+            Updatasearchlist([{ 'tag_level': 2 }, { 'tag_id': id }])
+        }
+    }
+    function getChildValues(e) {
+        let id = e.target.id;
+        let newid = e.target.name;
+        if (id || newid) {
+            setData({ ...data, searchValue: newid, childValue: id })
+            Updatasearchlist([{ 'tag_level': 3 }, { 'tag_id': id }])
+        }
+    }
+    function onSearchBranch(e) {
+        const id = e.target.value
+        if (id != searchValue) {
+            setData({ ...data, searchValue: id, childValue: '' })
+            Updatasearchlist([{ 'tag_level': 1 }, { 'tag_id': id }])
+        }
+
+    }
+    function overlayMenu(item, id) {
+        return <Menu>
+            {
+                item.map((list, k) => <Menu.Item key={list.id}>
+                    <div className="mt5 subshaicontent-part"   >
+                        <a style={{ height: '20px' }} className={"mb15 shixun_repertoire color-dark"} name={list.id} id={id} onClick={getChildValue}>{list.name}</a>
+                        <div className="sub-Item clearfix">
+                            {
+                                list.tags.map((tag, e) => <a className={childValue == tag.id ? "shixun_repertoire color-blue" : "shixun_repertoire"} key={e} id={tag.id} name={id} rel="subshaicontent" onClick={getChildValues}>{tag.name}</a>
+                                )
+                            }
+                        </div>
+                    </div>
+                </Menu.Item>
+                )
+            }
+        </Menu>
+
+    }
+    useEffect(() => {
+        async function init() {
+            const response = await axios.get('/shixuns/menus.json')
+            setData({ ...data, navs: response.data })
+        }
+        init()
+    }, [])
+    return (
+        <div className="edu-back-white shixun-search-bar" >
+            <div className="educontent">
+                <div className="pt_b_26">
+                    <div className="clearfix mb20 shaiContent">
+                        <span className="shaiTitle fl">方向：</span>
+                        <div className="fl pr shaiAllItem">
+                            <li className={searchValue === "a" ? "shaiItem shixun_repertoire active" : "shaiItem shixun_repertoire"} value="a" onClick={onSearchAll}>全部</li>
+                            {
+                                navs.map((item, key) => {
+                                    return (
+                                        <Dropdown overlayStyle={{width:400}} overlay={overlayMenu(item.sub_repertoires, item.id)} key={key} placement={"bottomLeft"}>
+                                            <li key={item.id} className={searchValue == item.id ? "shaiItem shixun_repertoire active" : "shaiItem shixun_repertoire"} value={item.id} onClick={onSearchBranch}>
+                                                {item.name}
+                                            </li>
+                                        </Dropdown>
+                                    )
+                                })
+                            }
+
+
+                        </div>
+                    </div>
+                    <div className="clearfix">
+                        <span className="shaiTitle fl">筛选：</span>
+                        <div className="fl pr shaiAllItem mt1">
+                            {DiffObject.map(item => <A key={item.id} {...item} callback={diffSearch} activeId={diff} />)}
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    )
+}
diff --git a/src/modules/tpm/shixuns/shixunCss/ShixunSearchBar.css b/src/modules/tpm/shixuns/shixunCss/ShixunSearchBar.css
index 9fba271c..433bd469 100644
--- a/src/modules/tpm/shixuns/shixunCss/ShixunSearchBar.css
+++ b/src/modules/tpm/shixuns/shixunCss/ShixunSearchBar.css
@@ -1,20 +1,26 @@
-.iconfontShixunSearchBar{
-    z-index: 1000;
-    position: absolute;
-    right: 3px;
-    top: 0px;
+.iconfontShixunSearchBar {
+  z-index: 1000;
+  position: absolute;
+  right: 3px;
+  top: 0px;
 }
 
-.diffSelect{
-    margin-left:20px !important;
- }
- .ant-input-search-button{
-     /*margin-right: 10px;*/
-    border: 1px solid transparent;
- }
-.Mousebox{
-    width: 800px !important;
+.pt_b_26 {
+  padding: 26px 0px;
 }
-.subshaicontent a{
-  height:30px;
+
+.diffSelect {
+  margin-left: 20px !important;
+}
+
+.ant-input-search-button {
+  border: 1px solid transparent;
+}
+
+.Mousebox {
+  width: 800px !important;
+}
+
+.subshaicontent a {
+  height: 30px;
 }
\ No newline at end of file
diff --git a/src/modules/tpm/shixuns/shixunCss/shixun-search-bar.scss b/src/modules/tpm/shixuns/shixunCss/shixun-search-bar.scss
new file mode 100644
index 00000000..1195598c
--- /dev/null
+++ b/src/modules/tpm/shixuns/shixunCss/shixun-search-bar.scss
@@ -0,0 +1,78 @@
+.iconfontShixunSearchBar {
+  z-index: 1000;
+  position: absolute;
+  right: 3px;
+  top: 0px;
+}
+
+.pt_b_26 {
+  padding: 26px 0px;
+}
+
+.diffSelect {
+  margin-left: 20px !important;
+}
+
+.ant-input-search-button {
+  border: 1px solid transparent;
+}
+
+.Mousebox {
+  width: 800px !important;
+}
+
+.subshaicontent a {
+  height: 30px;
+}
+
+.ant-dropdown {
+  width: 800px;
+}
+
+.shixun_repertoire {
+  cursor: pointer;
+  float: left;
+  margin-right: 20px;
+  color: #999;
+  cursor: pointer;
+  margin-bottom: 10px;
+}
+
+.ant-dropdown-menu-item,
+.ant-dropdown-menu-submenu-title {
+  padding: 0px 12px;
+}
+
+.ant-dropdown-menu-item:hover,
+.ant-dropdown-menu-submenu-title:hover {
+  background: transparent !important;
+}
+
+.shaiContent li.shaiItem {
+  padding: 0px 15px;
+  line-height: 32px;
+  height: 32px
+}
+
+.shaiTitle {
+  height: 32px;
+  line-height: 32px;
+}
+
+.shaiItems {
+  padding: 0px 15px;
+  line-height: 32px;
+  height: 32px;
+  float: left;
+  border-radius: 4px;
+  color: #4C4C4C;
+  cursor: pointer;
+  margin-right: 15px;
+  display: block;
+  float: left;
+}
+
+.shaiItems.active {
+  background-color: #4CACFF !important;
+  color: #fff !important;
+}
\ No newline at end of file
diff --git a/src/modules/tpm/shixuns/shixunCss/shixunCard.css b/src/modules/tpm/shixuns/shixunCss/shixunCard.css
index 1ec00a26..ccb51ed1 100644
--- a/src/modules/tpm/shixuns/shixunCss/shixunCard.css
+++ b/src/modules/tpm/shixuns/shixunCss/shixunCard.css
@@ -6,29 +6,32 @@
   margin-left: 32%;
 }
 
-.square-img{
-    min-height: 210px;
+.square-img {
+  min-height: 210px;
 }
-.task-hide{
+
+.task-hide {
   margin-bottom: 0em;
 }
-.backFAFAFA{
-  background:#FAFAFA;
+
+.backFAFAFA {
+  background: #FAFAFA;
 }
 
 .demo {
   width: 500px;
   background-color: #0dcecb;
   text-align: center;
-  padding:50px;
-}
-.next-loading {
-  margin-bottom: 5px;
-  width:100%;
+  padding: 50px;
 }
 
-.next-rating-overlay .next-icon{
-  color: #FFA800!important;
+.next-loading {
+  margin-bottom: 5px;
+  width: 100%;
+}
+
+.next-rating-overlay .next-icon {
+  color: #FFA800 !important;
 }
 
 .custom-pagination {
@@ -36,7 +39,7 @@
   margin-left: 10px;
 }
 
-.ml425{
-  margin-left:42.5%;
-  margin-top:20px;
+.ml425 {
+  margin-left: 42.5%;
+  margin-top: 20px;
 }
\ No newline at end of file
diff --git a/src/modules/tpm/shixuns/shixunCss/shixunCard.scss b/src/modules/tpm/shixuns/shixunCss/shixunCard.scss
new file mode 100644
index 00000000..8ff3390a
--- /dev/null
+++ b/src/modules/tpm/shixuns/shixunCss/shixunCard.scss
@@ -0,0 +1,101 @@
+.ml350 {
+  margin-left: 40%;
+}
+
+.ml32 {
+  margin-left: 32%;
+}
+
+.square-img {
+  min-height: 210px;
+}
+
+.task-hide {
+  margin-bottom: 0em;
+}
+
+.backFAFAFA {
+  background: #FAFAFA;
+}
+
+.demo {
+  width: 500px;
+  background-color: #0dcecb;
+  text-align: center;
+  padding: 50px;
+}
+
+.next-loading {
+  margin-bottom: 5px;
+  width: 100%;
+}
+
+.next-rating-overlay .next-icon {
+  color: #FFA800 !important;
+}
+
+.custom-pagination {
+  display: inline-block;
+  margin-left: 10px;
+}
+
+.ml425 {
+  margin-left: 42.5%;
+  margin-top: 20px;
+}
+
+.shixun-card {
+
+  .edu-tab-con-box {
+    padding: 100px 0px;
+  }
+
+  .ant-modal-body .edu-tab-con-box {
+    padding: 0px !important;
+  }
+
+  img.edu-nodata-img {
+    margin: 40px auto 20px;
+  }
+
+  .square-list {
+    margin-top: 5px;
+  }
+
+  .tag-green {
+    position: absolute;
+    left: 10px;
+    bottom: 125px;
+  }
+
+  .tag-org {
+    position: absolute;
+    left: 0px;
+    top: 20px;
+  }
+
+  .tag-org-name {
+    width: 66px;
+    height: 28px;
+    background: #FF6802;
+    width: 66px;
+    height: 28px;
+    border-radius: 0px 20px 20px 0px;
+  }
+
+  .tag-org-name-test {
+    width: 45px;
+    height: 23px;
+    font-size: 14px;
+    color: #FFFFFF;
+    line-height: 19px;
+    margin-right: 6px;
+  }
+
+  .intermediatecenter {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+}
\ No newline at end of file
diff --git a/src/modules/tpm/shixuns/shixusFunction/ShixunSearchBar.js b/src/modules/tpm/shixuns/shixusFunction/ShixunSearchBar.js
index 4211e319..53bea074 100644
--- a/src/modules/tpm/shixuns/shixusFunction/ShixunSearchBar.js
+++ b/src/modules/tpm/shixuns/shixusFunction/ShixunSearchBar.js
@@ -1,142 +1,142 @@
-const $ = window.$;
-
-
-$(function(){
-    //实训首页筛选的移入和点击事件
-    $(".shaiItem").hover(function(){
-        var hei=parseInt($(".shaiAllItem").height())-2;
-        $(this).find(".subshaicontent").css("top",hei);
-        $(this).find(".subshaicontent").show();
-    },function(){
-        $(this).find(".subshaicontent").hide();
-    });
-
-    $(".shaiItem").live("click",function(){
-        $(".shaiItem").removeClass("active");
-        $(this).addClass("active");
-        $(".subshaicontent").hide();
-    });
-
-    $(".subshaicontent").live("click", function(event){
-        $(".subshaicontent").hide();
-        event.stopPropagation();
-    });
-
-    //最新、最热
-    $(".bestChoose").click(function(){
-        $(".bestChoose").removeClass("active");
-        $(this).addClass("active");
-    })
-
-    //实训路径选择导航条
-    $(".path-nav li a").live("click",function(){
-        $(".path-nav li").removeClass("active");
-        $(this).parent().addClass("active");
-    })
-});
-
-//隐藏我的学习
- function clickControl(item, type){
-    var wid=$(item).width();
-    var wid1=$(".controlring").width();
-    var hidden_course = 1;
-    if($(".controlring").css("left")=="1px"){
-        $(".controlring").animate({left:parseInt(wid-wid1-1)+"px"});
-        $(".controlblue").animate({width:wid+"px"});
-        $("input[name='hidden_learn']").val('1');
-    }else{
-        $(".controlring").animate({left:"1px"});
-        $(".controlblue").animate({width:"0px"});
-        $("input[name='hidden_learn']").val('');
-        hidden_course = 0;
-    }
-    if(type == "l_shixun"){
-        $("#shixun_search_condition").submit();
-    } else{
-        $.get("/courses?select="+$("#select_type").val()+"&order="+$("#select_order").val()+"&hidden="+hidden_course);
-    }
-}
-
-// 清空条件
- function clear_style(){
-    $("#shixun_search_condition").find('input[type=hidden]').each(function() {
-        $(this).val('');
-    });
-}
-
-// 精选实训的搜索 #type参数( status：实训状态； diff：实训难度； search：实训搜索； order：最新最热排序)
-function filter_search(values, type){
-    switch(type){
-        case "status":
-            $("input[name='status']").val(values);
-            break;
-        case "diff":
-            $("input[name='diff']").val(values);
-            break;
-        case "search":
-            $("input[name='search']").val(values);
-            break;
-    }
-    $("#shixun_search_condition").submit();
-}
-
-// 点击实训体系名称 # type参数（rep：体系大类别； sub：体系子类别； tags 实训标签； order: 排序）
-//               # name参数： 列表显示使用
-//               # values参数： 赋值给表单的值
-$(".shixun_repertoire").live("click", function(event){
-    var type = $(this).attr("data-type");
-    var name = $(this).attr("data-name");
-    var values = $(this).attr("data-values");
-    if(type != 'order'){
-        $(".subshaicontent a").removeClass("active");
-        $(".shaiItem").removeClass("active");
-        $("input[name='repertoire'], input[name='sub_repertoire'], input[name='tag_repertoire']").val('');
-    }
-    $(this).closest(".shaiItem").addClass("active");
-    $(".subshaicontent").hide();
-    $("#search_name").html(name);
-
-    switch(type){
-        case "rep":
-            $("input[name='repertoire']").val(values);
-            $("#shixun_search_input").val("");
-            $("input[name='search']").val("");
-            break;
-        case "sub":
-            $("input[name='sub_repertoire']").val(values);
-            break;
-        case "tag":
-            $("input[name='tag_repertoire']").val(values);
-            break;
-        case "order":
-            var $sort = $("input[name='sort']");
-            var oldValue = $("input[name='order']").val();
-            $("input[name='order']").val(values);
-            var newValue = $("input[name='order']").val();
-            if(oldValue != newValue){
-                $("input[name='sort']").val("desc");
-            }else {
-                if($sort.val() == "desc"){
-                    $sort.val("asc");
-                }else{
-                    $sort.val("desc");
-                }
-            }
-            break;
-    }
-    $(this).addClass("active"); // 因为order需要判断样式因此写在switch之后
-    $("#shixun_search_condition").submit();
-    event.stopPropagation();
-});
-
-
-// 实训首页回车搜索
-$("#shixun_search_input").live("keyup", function(e){
-    // 兼容FF和IE和Opera
-    var theEvent = e || window.event;
-    var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
-    if (code == 13) {
-        //回车执行查询
-        filter_search($(this).val(), "search");
-    }
-});
\ No newline at end of file
+const $ = window.$;
+
+
+$(function(){
+    //实训首页筛选的移入和点击事件
+    $(".shaiItem").hover(function(){
+        var hei=parseInt($(".shaiAllItem").height())-2;
+        $(this).find(".subshaicontent").css("top",hei);
+        $(this).find(".subshaicontent").show();
+    },function(){
+        $(this).find(".subshaicontent").hide();
+    });
+
+    $(".shaiItem").live("click",function(){
+        $(".shaiItem").removeClass("active");
+        $(this).addClass("active");
+        $(".subshaicontent").hide();
+    });
+
+    $(".subshaicontent").live("click", function(event){
+        $(".subshaicontent").hide();
+        event.stopPropagation();
+    });
+
+    //最新、最热
+    $(".bestChoose").click(function(){
+        $(".bestChoose").removeClass("active");
+        $(this).addClass("active");
+    })
+
+    //实训路径选择导航条
+    $(".path-nav li a").live("click",function(){
+        $(".path-nav li").removeClass("active");
+        $(this).parent().addClass("active");
+    })
+});
+
+//隐藏我的学习
+ function clickControl(item, type){
+    var wid=$(item).width();
+    var wid1=$(".controlring").width();
+    var hidden_course = 1;
+    if($(".controlring").css("left")=="1px"){
+        $(".controlring").animate({left:parseInt(wid-wid1-1)+"px"});
+        $(".controlblue").animate({width:wid+"px"});
+        $("input[name='hidden_learn']").val('1');
+    }else{
+        $(".controlring").animate({left:"1px"});
+        $(".controlblue").animate({width:"0px"});
+        $("input[name='hidden_learn']").val('');
+        hidden_course = 0;
+    }
+    if(type == "l_shixun"){
+        $("#shixun_search_condition").submit();
+    } else{
+        $.get("/classrooms?select="+$("#select_type").val()+"&order="+$("#select_order").val()+"&hidden="+hidden_course);
+    }
+}
+
+// 清空条件
+ function clear_style(){
+    $("#shixun_search_condition").find('input[type=hidden]').each(function() {
+        $(this).val('');
+    });
+}
+
+// 精选实训的搜索 #type参数( status：实训状态； diff：实训难度； search：实训搜索； order：最新最热排序)
+function filter_search(values, type){
+    switch(type){
+        case "status":
+            $("input[name='status']").val(values);
+            break;
+        case "diff":
+            $("input[name='diff']").val(values);
+            break;
+        case "search":
+            $("input[name='search']").val(values);
+            break;
+    }
+    $("#shixun_search_condition").submit();
+}
+
+// 点击实训体系名称 # type参数（rep：体系大类别； sub：体系子类别； tags 实训标签； order: 排序）
+//               # name参数： 列表显示使用
+//               # values参数： 赋值给表单的值
+$(".shixun_repertoire").live("click", function(event){
+    var type = $(this).attr("data-type");
+    var name = $(this).attr("data-name");
+    var values = $(this).attr("data-values");
+    if(type != 'order'){
+        $(".subshaicontent a").removeClass("active");
+        $(".shaiItem").removeClass("active");
+        $("input[name='repertoire'], input[name='sub_repertoire'], input[name='tag_repertoire']").val('');
+    }
+    $(this).closest(".shaiItem").addClass("active");
+    $(".subshaicontent").hide();
+    $("#search_name").html(name);
+
+    switch(type){
+        case "rep":
+            $("input[name='repertoire']").val(values);
+            $("#shixun_search_input").val("");
+            $("input[name='search']").val("");
+            break;
+        case "sub":
+            $("input[name='sub_repertoire']").val(values);
+            break;
+        case "tag":
+            $("input[name='tag_repertoire']").val(values);
+            break;
+        case "order":
+            var $sort = $("input[name='sort']");
+            var oldValue = $("input[name='order']").val();
+            $("input[name='order']").val(values);
+            var newValue = $("input[name='order']").val();
+            if(oldValue != newValue){
+                $("input[name='sort']").val("desc");
+            }else {
+                if($sort.val() == "desc"){
+                    $sort.val("asc");
+                }else{
+                    $sort.val("desc");
+                }
+            }
+            break;
+    }
+    $(this).addClass("active"); // 因为order需要判断样式因此写在switch之后
+    $("#shixun_search_condition").submit();
+    event.stopPropagation();
+});
+
+
+// 实训首页回车搜索
+$("#shixun_search_input").live("keyup", function(e){
+    // 兼容FF和IE和Opera
+    var theEvent = e || window.event;
+    var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+    if (code == 13) {
+        //回车执行查询
+        filter_search($(this).val(), "search");
+    }
+});
diff --git a/src/modules/user/FindPasswordComponent.js b/src/modules/user/FindPasswordComponent.js
index baf09990..85f0285a 100644
--- a/src/modules/user/FindPasswordComponent.js
+++ b/src/modules/user/FindPasswordComponent.js
@@ -94,7 +94,7 @@ class LoginRegisterComponent extends Component {
 	}
 	//倒计时
 	getverificationcode = () => {
-		debugger
+
 		if(this.state.login === undefined || this.state.login.length===0){
 			this.openNotification("请输入手机号或邮箱");
 			return;
diff --git a/src/modules/user/LoginRegisterComponent.js b/src/modules/user/LoginRegisterComponent.js
index b480b8a0..786fd135 100644
--- a/src/modules/user/LoginRegisterComponent.js
+++ b/src/modules/user/LoginRegisterComponent.js
@@ -352,7 +352,7 @@ class LoginRegisterComponent extends Component {
             login: this.state.login,
             password: this.state.password,
         }).then((response) => {
-            debugger
+
             if (response === undefined) {
                 return
             }
@@ -893,7 +893,7 @@ class LoginRegisterComponent extends Component {
 
         }
 
-        // this.props.history.push(`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/student_exercise_list?tab=`+e.key)
+        // this.props.history.push(`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/student_exercise_list?tab=`+e.key)
 
     }
     loginonkeyup =(e)=>{
@@ -995,10 +995,7 @@ class LoginRegisterComponent extends Component {
               <div>
 								{weixinlogin===false&&this.props.weixinlogin===undefined?<Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab} className="mt20">
                       <Menu.Item key="0" className={tab===0?"active font-18":"font-18"}   > 登录</Menu.Item>
-                      <Menu.Item key="1" className={tab===1?"active font-18 ":"font-18 "} style={{marginLeft:"10px"}}>
-                          <a href="https://www.trustie.net/login?login=false" target={"_blank"}>注册</a>
-                          {/*注册*/}
-                      </Menu.Item>
+                      <Menu.Item key="1" className={tab===1?"active font-18 ":"font-18 "} style={{marginLeft:"10px"}}  >注册</Menu.Item>
                   </Menu>:""}
 
 								{
@@ -1081,9 +1078,9 @@ class LoginRegisterComponent extends Component {
 
                           <div className="left_right  font-12 " style={{color: '#676767'}}>
                               <Checkbox onChange={this.onAutoLoginChange} checked={autoLogin}>下次自动登录</Checkbox>
-                              <a href="https://www.trustie.net/account/lost_password" className="mr3 color-grey-9 mt3 font-12" target={"_blank"}>找回密码</a>
-                              {/*<a onClick={()=>this.StudyMakeMoney()}*/}
-                                 {/*className="mr3 color-grey-9 mt3 font-12">找回密码</a>*/}
+
+                              <a onClick={()=>this.StudyMakeMoney()}
+                                 className="mr3 color-grey-9 mt3 font-12">找回密码</a>
                           </div>
 
                           <Button className="login_btn font-16" type="primary" style={{height:"46px"}} onClick={() => this.postLogin()}
diff --git a/src/modules/user/account/AccountBasicEdit.js b/src/modules/user/account/AccountBasicEdit.js
index 7d6fc13d..3d8d24ec 100644
--- a/src/modules/user/account/AccountBasicEdit.js
+++ b/src/modules/user/account/AccountBasicEdit.js
@@ -1,16 +1,17 @@
 import React, { Component } from 'react';
 
-import { SnackbarHOC, getImageUrl, City, ConditionToolTip } from 'educoder';
-import { Form, Button, Input, Radio, Select, Tooltip, Icon, AutoComplete  } from 'antd'
+import { City, ConditionToolTip } from 'educoder';
+import { Form, Button, Input, Radio, Tooltip, Modal  } from 'antd'
 import ApplyForAddOrgModal from '../modal/ApplyForAddOrgModal'
 import ApplyForAddChildOrgModal from '../modal/ApplyForAddChildOrgModal'
 import AccountBasicEditItem from './AccountBasicEditItem';
 import axios from 'axios'
-import { identityMap } from './AccountBasic'
+// import { identityMap } from './AccountBasic'
 const RadioGroup = Radio.Group;
-const Option = Select.Option;
+const { confirm } = Modal;
 
-const map = identityMap // {"teacher":"教师", "student":"学生", "professional":"专业人士"}
+
+// const map = identityMap // {"teacher":"教师", "student":"学生", "professional":"专业人士"}
 export function getHiddenName(name) {
   if (!name) return ''
   let len=parseInt(name.length)-1;
@@ -48,6 +49,7 @@ class AccountBasic extends Component {
 
   componentDidMount = () =>{
     if(this.props.basicInfo){
+      console.log(this.props)
       this.setValue(this.props.basicInfo);
       this.getSchoolList(this.props.basicInfo);
     }
@@ -137,7 +139,7 @@ class AccountBasic extends Component {
 
   handleSubmit = () => {
     this.props.form.validateFieldsAndScroll({ force: true }, (err, values) => {
-      console.log(values);
+
       let {basicInfo}=this.props;
       if(!err ){
         if (!this.state.school_id) {
@@ -283,7 +285,7 @@ class AccountBasic extends Component {
 
   getDepartments=(e,flag)=>{
     let arr=this.state.schoolList.filter(function(item){
-      if(item.name.indexOf(e) > -1){
+      if(item.name===e){
         return item.name;
       }
     });
@@ -455,6 +457,61 @@ class AccountBasic extends Component {
 		}
 		callback();
 	}
+  upadeditname=(type)=>{
+    // console.log(this.props.coursedata.userid)
+    let url;
+    if(type===1){
+      url = `/users/${this.props.coursedata.userid}/cancel_authentication.json`
+    }else{
+      url =`/users/${this.props.coursedata.userid}/cancel_professional_certification.json`
+    }
+    axios.post(url)
+      .then((response) => {
+        if (response.data) {
+          if(type===1){
+            this.props.showNotification("撤销实名认证成功");
+          }else{
+            this.props.showNotification("撤销职业认证成功");
+          }
+          this.props.getBasicInfo();
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+  }
+
+  editname=()=>{
+    let that=this;
+    confirm({
+      title: '您已通过实名认证，修改姓名需要撤销实名认证，是否确定撤销?',
+      // content: 'Some descriptions',
+      // centered:true,
+      onOk() {
+        that.upadeditname(1)
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  }
+
+  editprofessional=()=>{
+    let that=this;
+    confirm({
+      title: '您已通过职业认证，修改信息需要撤销职业认证，是否确定撤销?',
+      // content: 'Some descriptions',
+      // centered:true,
+      onOk() {
+        that.upadeditname(2)
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  }
+
+
   render() {
     let{
       nameLength,
@@ -465,7 +522,7 @@ class AccountBasic extends Component {
       school_id,
       departments,
       departmentsName,
-      identity
+      identity,
     }=this.state;
     const { getFieldDecorator } = this.props.form;
     let{ basicInfo }=this.props
@@ -480,12 +537,20 @@ class AccountBasic extends Component {
     }
     // 已职业认证的账户不能修改职业，学校/单位，院系/部门（true为disable）
     const professionalFlag = basicInfo && basicInfo.professional_certification == "certified" ;
-
     // form合并了
     const propsWithoutForm = Object.assign({}, this.props)
     delete propsWithoutForm.form
     return (
       <div>
+        <style>
+          {
+            `
+            body{
+                  width: calc(100%) !important;
+            }
+            `
+          }
+        </style>
         <ApplyForAddOrgModal ref="applyForAddOrgModal" wrappedComponentRef={(form) => this.applyForAddOrgForm = form}  schoolName={school}
         {...propsWithoutForm} addOrgSuccess={this.addOrgSuccess}
         ></ApplyForAddOrgModal>
@@ -607,16 +672,20 @@ class AccountBasic extends Component {
                   ],
 									validateTrigger: 'onSubmit', // 设置进行表单验证的时机为onSubmit
 								})(
-                  <Input placeholder={`请输入真实姓名，最大限制${MAX_NAME_LENGTH}个字符`} className="yslgraduainputedit"  disabled={!showRealName && this.state.forDisable == true } addonAfter={
+                  <Input placeholder={`请输入真实姓名，最大限制${MAX_NAME_LENGTH}个字符`} className="yslgraduainputedit"
+                         // onClick={basicInfo.authentication == 'uncertified'?"":()=>this.editname()}
+                         //disabled={showRealName}
+                         defaultValue={this.props.basicInfo.name}
+                         addonAfter={
                     <i className={showRealName?"iconfont icon-xianshi font-18 color-blue":"iconfont icon-yincang font-18 color-blue"}
                           onClick={()=>this.showOrHide(showRealName)}></i>
                   }></Input>
                 )}
                 <span>{ showRealName ? '（显示：平台将显示您的真实姓名）' : '（隐藏：平台将显示你的昵称）' }</span>
                 </React.Fragment> :
-                <div className="df" style={{}}>
-                  <Tooltip title="已完成实名认证，不能修改">
-                    <span className="mr8" >{showRealName ? this.props.basicInfo.name : getHiddenName(this.props.basicInfo.name)}</span>
+                <div className="df" style={{}} >
+                  <Tooltip title="已完成实名认证">
+                  <span className="mr8" onClick={()=>this.editname()} >{showRealName ? this.props.basicInfo.name : getHiddenName(this.props.basicInfo.name)}</span>
                   </Tooltip>
                   <i className={showRealName?"iconfont icon-xianshi font-18 color-blue":"iconfont icon-yincang font-18 color-blue"}
                        onClick={()=>this.showOrHide(showRealName)}></i>
@@ -636,7 +705,7 @@ class AccountBasic extends Component {
                 }],
               })(
                 <RadioGroup>
-                  <ConditionToolTip title="已完成实名认证，不能修改" condition={basicInfo.authentication != 'uncertified'} >
+                  <ConditionToolTip  title="已完成实名认证" condition={basicInfo.authentication != 'uncertified'}>
                     <Radio value="0" disabled={basicInfo.authentication != 'uncertified'}>男</Radio>
                     <Radio value="1" disabled={basicInfo.authentication != 'uncertified'}>女</Radio>
                   </ConditionToolTip>
@@ -674,6 +743,7 @@ class AccountBasic extends Component {
                 school={school}
                 department_id={this.state.department_id}
                 departments={departments}
+                editprofessional={()=>this.editprofessional()}
               ></AccountBasicEditItem>
                 {/* htmlType="submit"  */}
             {/* <Form.Item>
diff --git a/src/modules/user/account/AccountBasicEditItem.js b/src/modules/user/account/AccountBasicEditItem.js
index 9f362d97..74dcd054 100644
--- a/src/modules/user/account/AccountBasicEditItem.js
+++ b/src/modules/user/account/AccountBasicEditItem.js
@@ -8,10 +8,10 @@ class AccountBasicEditItem extends Component {
   constructor(props){
     super(props);
   }
-  
+
   render(){
-    let { 
-      professionalFlag , 
+    let {
+      professionalFlag ,
       getFieldDecorator ,
       identity ,
       filterSchoolList ,
@@ -27,12 +27,13 @@ class AccountBasicEditItem extends Component {
           <Form.Item
             label="职业"
             className="formItemInline fl"
+            onClick={professionalFlag?()=>this.props.editprofessional():""}
           >
           <ConditionToolTip title={() => (<div><p>已提交职业认证</p><p>可在<a href="/account/certification" className="color-blue">认证信息</a>中通过“重新认证”进行修改</p></div>)} condition= { professionalFlag }>
             {getFieldDecorator('job', {
               rules: [{
                 initialValue:"teacher",
-                required: true, 
+                required: true,
                 message: '请先选择职业',
               }],
             })(
@@ -45,17 +46,18 @@ class AccountBasicEditItem extends Component {
             </ConditionToolTip>
           </Form.Item>
           {
-            identity && identity=="student" && 
+            identity && identity=="student" &&
             <Form.Item
             label=""
             className="formItemInline fl"
             style={{ 'margin-top': '3px'}}
+            onClick={professionalFlag?()=>this.props.editprofessional():""}
             // style={{display:identity && identity=="student" ? "block":"none"}}
           >
           <ConditionToolTip title={() => (<div><p>已提交职业认证</p><p>可在<a href="/account/certification" className="color-blue">认证信息</a>中通过“重新认证”进行修改</p></div>)} condition= { professionalFlag }>
             {getFieldDecorator('student_No', {
               rules: [{
-                required: true, 
+                required: true,
                 message: '请先输入学号',
               }],
             })(
@@ -65,17 +67,18 @@ class AccountBasicEditItem extends Component {
           </Form.Item>
           }
           {
-            identity && identity=="teacher" && 
+            identity && identity=="teacher" &&
             <Form.Item
               label=""
               className="formItemInline fl"
+              onClick={professionalFlag?()=>this.props.editprofessional():""}
               // style={{display:identity && identity=="teacher" ? "block":"none"}}
             >
             <ConditionToolTip title={() => (<div><p>已提交职业认证</p><p>可在<a href="/account/certification" className="color-blue">认证信息</a>中通过“重新认证”进行修改</p></div>)} condition= { professionalFlag }>
               {getFieldDecorator('job1', {
                 rules: [{
                   initialValue:"教授",
-                  required: true, 
+                  required: true,
                   message: '请先选择职称',
                 }],
               })(
@@ -90,17 +93,18 @@ class AccountBasicEditItem extends Component {
             </Form.Item>
           }
           {
-            identity && identity=="professional" && 
+            identity && identity=="professional" &&
             <Form.Item
               label=""
               className="formItemInline fl mb0"
+              onClick={professionalFlag?()=>this.props.editprofessional():""}
               // style={{display:identity && identity=="professional" ? "block":"none"}}
             >
               <ConditionToolTip title={() => (<div><p>已提交职业认证</p><p>可在<a href="/account/certification" className="color-blue">认证信息</a>中通过“重新认证”进行修改</p></div>)} condition= { professionalFlag }>
               {getFieldDecorator('job2', {
                 rules: [{
                   initialValue:"企业管理者",
-                  required: true, 
+                  required: true,
                   message: '请先选择职称',
                 }],
               })(
@@ -119,13 +123,14 @@ class AccountBasicEditItem extends Component {
         <Form.Item
           label="学校/单位"
           className="formItemInline mb0"
+          onClick={professionalFlag?()=>this.props.editprofessional():""}
         >
           <ConditionToolTip title={() => (<div><p>已提交职业认证</p><p>可在<a href="/account/certification" className="color-blue">认证信息</a>中通过“重新认证”进行修改</p></div>)} condition= { professionalFlag }>
           {getFieldDecorator('org', {
             rules: [{
               // initialValue: this.state.cityDefaultValue,
               // type: 'array',
-              required: true, 
+              required: true,
               message: '请先选择学校/单位',
 
               // 做不了，输入时和submit时都会执行这里
@@ -136,20 +141,21 @@ class AccountBasicEditItem extends Component {
               //   }
               //   callback('请先选择学校/单位');
               // }
-              
+
             }],
           })(
-            <AutoComplete width={400} showSearch onSearch={this.props.filterList} onChange={this.props.changeList} disabled={professionalFlag}>
+            <AutoComplete width={400} showSearch onSearch={this.props.filterList} onChange={this.props.changeList}
+                          disabled={professionalFlag}>
               {
                 filterSchoolList && filterSchoolList.map((item,key)=>{
-                  return(<Option value={item.name} key={item.id}>{item.name}</Option>)
+                  return(<Option value={item.name} key={key} id={item.id}>{item.name}</Option>)
                 })
               }
             </AutoComplete>
           )}
           </ConditionToolTip>
         </Form.Item>
-        
+
           {!filterSchoolList || (filterSchoolList && filterSchoolList.length==0 )&& school &&
             <div style={{marginLeft: '113px',height:"20px",lineHeight:"20px"}}>
               <span>
@@ -158,18 +164,19 @@ class AccountBasicEditItem extends Component {
               </span>
             </div>
           }
-        
+
           <Form.Item
             label="院系/部门"
             className="formItemInline mb0"
             style={{ 'margin-top': '10px'}}
+            onClick={professionalFlag?()=>this.props.editprofessional():""}
           >
             <ConditionToolTip title={() => (<div><p>已提交职业认证</p><p>可在<a href="/account/certification" className="color-blue">认证信息</a>中通过“重新认证”进行修改</p></div>)} condition= { professionalFlag }>
               {getFieldDecorator('org2', {
                 rules: [{
                   // initialValue: this.state.cityDefaultValue,
                   // type: 'array',
-                  required: true, 
+                  required: true,
                   message: '请先选择院系/部门',
                   // validator: (rule, value, callback) => {
                   //   if (this.this_department_id) {
@@ -188,14 +195,14 @@ class AccountBasicEditItem extends Component {
                       )
                     })
                   }
-                </AutoComplete> 
+                </AutoComplete>
               )}
             </ConditionToolTip>
           </Form.Item>
           {
-            filterDepartments != undefined && ( (filterDepartments && filterDepartments.length==0 ) 
-                || (departmentsName == '' && ! department_id 
-                    && (!departments || departments.length == 0) ))  && 
+            filterDepartments != undefined && ( (filterDepartments && filterDepartments.length==0 )
+                || (departmentsName == '' && ! department_id
+                    && (!departments || departments.length == 0) ))  &&
             <div style={{marginLeft: '113px',height:"20px",lineHeight:"20px"}}>
               <span>
                 <span style={{color: '#CDCDCD'}}>{departmentsName ? `未找到包含“${departmentsName}”的院系/部门` : '未找到院系'}，</span>
diff --git a/src/modules/user/account/AccountImg.js b/src/modules/user/account/AccountImg.js
index b8e06075..595ba7ba 100644
--- a/src/modules/user/account/AccountImg.js
+++ b/src/modules/user/account/AccountImg.js
@@ -10,9 +10,10 @@ class AccountImg extends Component {
       const picUrl = getImageUrl("images/"+this.props.src)
       return (
         <div className="headphoto mt14">
-          <ChangeHeaderPicModal 
+          <ChangeHeaderPicModal
             {...this.props} ref="picModal" imageSrc={picUrl} userLogin={this.props.current_user ? this.props.current_user.login : '' }></ChangeHeaderPicModal>
           <style>{`
+          
             /*
             .headphoto {
               text-align: center;
@@ -26,11 +27,13 @@ class AccountImg extends Component {
               margin-top: 19px;
               box-sizing: border-box;
             }
+            
             .headphoto img {
               width: 109px;
               border-radius: 50%;
               height: 109px;
             }
+            
             .headphoto-black {
               display: none;
               cursor: pointer;
@@ -45,12 +48,37 @@ class AccountImg extends Component {
               background-color: rgba(0,0,0,0.3);
               color: #fff;
             } */
+            
             .headphoto:hover .headphoto-black {
               display: block;
             }
+            
+             .newheadphotoblack{       
+                position: absolute;
+                top: 45px;
+                left: 0px;
+                text-align: center;
+                color: #fff;
+                width: 110px;
+                height: 23px;
+                line-height: 23px;
+                background: rgba(76,172,255,0.7);
+            } 
+            
+            .relativeRadiusbox{
+              overflow: hidden;
+              position: relative;
+              width: 109px;
+              border-radius: 50%;
+              height: 109px;
+            } 
+            
           `}</style>
-          <img alt="头像" id="user_avatar_show" nhname="avatar_image" src={`${picUrl}`}></img>
-          <p className="headphoto-black" onClick={this.editImg} >修改头像</p>
+          <div className={"relativeRadiusbox"}>
+            <img alt="头像" id="user_avatar_show" nhname="avatar_image" className={"xiaoshou"} src={`${picUrl}`} onClick={this.editImg} ></img>
+            <div className="newheadphotoblack xiaoshou" onClick={this.editImg} >修改头像</div>
+          </div>
+
         </div>
       );
     }
diff --git a/src/modules/user/account/ChangeHeaderPicModal.js b/src/modules/user/account/ChangeHeaderPicModal.js
index 0a220526..703f1357 100644
--- a/src/modules/user/account/ChangeHeaderPicModal.js
+++ b/src/modules/user/account/ChangeHeaderPicModal.js
@@ -9,10 +9,10 @@ const previewId = 'changeHeader_imagePreview'
 let uploadedImageType;
 let uploadedImageName;
 let uploadedImageURL;
-class ChangeHeaderPicModal extends Component{
-  constructor(props){
+class ChangeHeaderPicModal extends Component {
+  constructor(props) {
     super(props);
-    this.state={
+    this.state = {
       uploading: false
     }
   }
@@ -29,7 +29,7 @@ class ChangeHeaderPicModal extends Component{
 
         if (/^image\/\w+/.test(file.type)) {
           if (file.size > 2 * 1024 * 1024) {
-            this.props.showNotification && this.props.showNotification("仅支持文件大小小于2M的文件")  
+            this.props.showNotification && this.props.showNotification("仅支持文件大小小于2M的文件")
             return;
           }
           uploadedImageType = file.type;
@@ -38,28 +38,28 @@ class ChangeHeaderPicModal extends Component{
           if (uploadedImageURL) {
             URL.revokeObjectURL(uploadedImageURL);
           }
-          const image = document.getElementById( imageId );
+          const image = document.getElementById(imageId);
 
           // base64
           var reader = new FileReader();
           reader.readAsBinaryString(file);
 
           reader.onload = () => {
-              let base64_content = btoa(reader.result);
-              console.log();
-              
-              image.src = `data:${file.type};base64,${base64_content}` // uploadedImageURL = URL.createObjectURL(file);
-              that.fileUploaded = true;
-              that.refs['cropper'].renew(image)
-              // cropper.destroy();
-              // cropper = new Cropper(image, options);
-              inputImage.value = null;
+            let base64_content = btoa(reader.result);
+            console.log();
+
+            image.src = `data:${file.type};base64,${base64_content}` // uploadedImageURL = URL.createObjectURL(file);
+            that.fileUploaded = true;
+            that.refs['cropper'].renew(image)
+            // cropper.destroy();
+            // cropper = new Cropper(image, options);
+            inputImage.value = null;
           };
-          reader.onerror = function() {
-              console.log('there are some problems');
+          reader.onerror = function () {
+            console.log('there are some problems');
           };
 
-          
+
         } else {
           this.props.showNotification && this.props.showNotification("请选择一个图片格式的文件")
           // window.alert('Please choose an image file.');
@@ -82,7 +82,7 @@ class ChangeHeaderPicModal extends Component{
   }
 
   onSendOk = () => {
-   
+
 
   }
   onOk = () => {
@@ -97,44 +97,44 @@ class ChangeHeaderPicModal extends Component{
         console.log(new Date().getTime())
         this._onOk()
       }, 10)
-      
+
     })
   }
   _onOk = () => {
-    
-    var img_lg = document.getElementById(previewId);      
+
+    var img_lg = document.getElementById(previewId);
     // https://github.com/niklasvh/html2canvas/issues/1908     
     // 截图小的显示框内的内容          
     window.html2canvas(img_lg).then((canvas) => {
-      var dataUrl = canvas.toDataURL("image/jpeg");    
-      console.log(dataUrl)   
+      var dataUrl = canvas.toDataURL("image/jpeg");
+      console.log(dataUrl)
 
       const url = `/users/accounts/${this.props.userLogin}/avatar.json`
-      axios.put(url, { 
+      axios.put(url, {
         image: dataUrl
       })
-      .then((response) => {
-        // {"status":0,"message":"success","avatar_url":"avatars/User/15739"}
-        if (response.data.status == 0) {
-          // this.props.getBasicInfo()
-          // https://www.trustie.net/issues/22461          
-          if ( this.props.current_user.image_url.indexOf('avatars/User/b') != -1 
-              || this.props.current_user.image_url.indexOf('avatars/User/g') != -1 ) {
-            window.setTimeout(() => {
-              this.doAfterUpdated()
-            }, 1000)    
-          } else {
-            this.doAfterUpdated();
+        .then((response) => {
+          // {"status":0,"message":"success","avatar_url":"avatars/User/15739"}
+          if (response.data.status == 0) {
+            // this.props.getBasicInfo()
+            // https://www.trustie.net/issues/22461          
+            if (this.props.current_user.image_url.indexOf('avatars/User/b') != -1
+              || this.props.current_user.image_url.indexOf('avatars/User/g') != -1) {
+              window.setTimeout(() => {
+                this.doAfterUpdated()
+              }, 1000)
+            } else {
+              this.doAfterUpdated();
+            }
+            this.setState({ uploading: false })
           }
+        })
+        .catch(function (error) {
           this.setState({ uploading: false })
-        }
-      })
-      .catch(function (error) {
-        this.setState({ uploading: false })
 
-        console.log(error);
-      });    
-    });  
+          console.log(error);
+        });
+    });
   }
   doAfterUpdated = () => {
     this.props.fetchUser()
@@ -143,15 +143,15 @@ class ChangeHeaderPicModal extends Component{
     this.setVisible(false)
   }
 
-  render(){
+  render() {
     const { course_lists } = this.state
     const { moduleName, current_user } = this.props
     const userHeaderImgUrl = current_user ? `${getUrl()}/images/${current_user.image_url}` : ''
-    return(
+    return (
       <ModalWrapper
         ref="modalWrapper"
         title={`上传头像`}
-        {...this.props }
+        {...this.props}
         onOk={this.onOk}
         okText="保存"
         width={552}
@@ -195,31 +195,31 @@ class ChangeHeaderPicModal extends Component{
             }
         `}</style>
         <div className="df">
-            <div className="cropperWrap">
-              <Cropper
-                  imageSrc={''}
-                  initPreviewUrl={userHeaderImgUrl}
-                  ref="cropper"
-                  imageId={imageId}
-                  previewId="changeHeader_imagePreview"
-                  width={320} height={320}
-              ></Cropper>
-              <span className="tip">仅支持JPG、GIF、PNG，且文件小于2M</span>
+          <div className="cropperWrap">
+            <Cropper
+              imageSrc={''}
+              initPreviewUrl={userHeaderImgUrl}
+              ref="cropper"
+              imageId={imageId}
+              previewId="changeHeader_imagePreview"
+              width={320} height={320}
+            ></Cropper>
+            <span className="tip">仅支持JPG、GIF、PNG，且文件小于2M</span>
+          </div>
+          <div
+            className="df previewWrap" style={{ flexDirection: 'column' }}
+          >
+            <div>
+              <div id="changeHeader_imagePreview">
+                {userHeaderImgUrl && <img src={userHeaderImgUrl}></img>}
+              </div>
+              <div className="tip">头像预览</div>
             </div>
-            <div
-                className="df previewWrap" style ={{flexDirection: 'column'}}
-            >   
-                <div>
-                  <div id="changeHeader_imagePreview">
-                    {userHeaderImgUrl && <img src={userHeaderImgUrl}></img>}
-                  </div>
-                  <div className="tip">头像预览</div>
-                </div>
-                <label id="uploadBtn" for="inputImage">
-                  <input type="file" class="sr-only" id="inputImage" name="file" accept="image/*"></input>
+            <label id="uploadBtn" for="inputImage">
+              <input type="file" className="sr-only" id="inputImage" name="file" accept="image/*"></input>
                   点击上传
                 </label>
-            </div>
+          </div>
         </div>
       </ModalWrapper>
     )
diff --git a/src/modules/user/modal/RealNameCertificationModal.js b/src/modules/user/modal/RealNameCertificationModal.js
index b24a743a..2a6f1562 100644
--- a/src/modules/user/modal/RealNameCertificationModal.js
+++ b/src/modules/user/modal/RealNameCertificationModal.js
@@ -1,8 +1,8 @@
 import React, { Component } from "react";
-import { message, Icon, Input, Form, Upload,Radio ,Tooltip} from "antd";
+import { message, Icon, Input, Form, Upload, Radio, Tooltip } from "antd";
 import axios from 'axios'
 import ModalWrapper from "../../courses/common/ModalWrapper"
-import { getUploadActionUrl, ImageLayer2 ,ConditionToolTip } from 'educoder'
+import { getUploadActionUrl, ImageLayer2, ConditionToolTip } from 'educoder'
 import '../account/common.css'
 import AccountBasicEditItem from '../account/AccountBasicEditItem'
 import ApplyForAddOrgModal from './ApplyForAddOrgModal'
@@ -32,87 +32,87 @@ function beforeUpload(file) {
 }
 export function getHiddenName(name) {
   if (!name) return ''
-  let len=parseInt(name.length)-1;
-  let str="";
-  for(var i = 0; i < len; i++){ str += "*"; }
-  const newName = name.substr(0,1)+str;
+  let len = parseInt(name.length) - 1;
+  let str = "";
+  for (var i = 0; i < len; i++) { str += "*"; }
+  const newName = name.substr(0, 1) + str;
   return newName
 }
-class RealNameCertificationModal extends Component{
-  constructor(props){
+class RealNameCertificationModal extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      identity:"teacher",
-      departmentsName:undefined,
-      fileID:undefined,
-      filterSchoolList:undefined,
-      filterDepartments :undefined,
-      school:undefined,
-      school_id:undefined,
-      department_id:undefined,
-      schoolList:undefined,
-      departments:undefined,
-      showRealName:true,
-      realName:undefined,
-      imageUrl2:undefined
+    this.state = {
+      identity: "teacher",
+      departmentsName: undefined,
+      fileID: undefined,
+      filterSchoolList: undefined,
+      filterDepartments: undefined,
+      school: undefined,
+      school_id: undefined,
+      department_id: undefined,
+      schoolList: undefined,
+      departments: undefined,
+      showRealName: true,
+      realName: undefined,
+      imageUrl2: undefined
     }
   }
 
-// 弹框出现（visible==true）时给formitem赋值
+  // 弹框出现（visible==true）时给formitem赋值
   setVisible = (visible) => {
     this.refs.modalWrapper.setVisible(visible);
     this.setState({
-      imageUrl2:undefined
+      imageUrl2: undefined
     })
-    if(visible && this.props.basicInfo){
+    if (visible && this.props.basicInfo) {
       this.setValue(this.props.basicInfo);
       this.getSchoolList(this.props.basicInfo);
     }
   }
 
 
-  setValue=(basicInfo)=>{
-    // debugger;
-    if(basicInfo){
+  setValue = (basicInfo) => {
+    ;
+    if (basicInfo) {
       this.props.form.setFieldsValue({
-        nickname:basicInfo.nickname,
-        name:!basicInfo.show_realname ? this.hideRealName(basicInfo.name) : basicInfo.name,
-        job:basicInfo.identity,
-        org:basicInfo.school_name
+        nickname: basicInfo.nickname,
+        name: !basicInfo.show_realname ? this.hideRealName(basicInfo.name) : basicInfo.name,
+        job: basicInfo.identity,
+        org: basicInfo.school_name
       })
       setTimeout(() => {
         // 等显示后再set
         this.props.form.setFieldsValue({
-          job:basicInfo.identity,
-          sex:String(basicInfo.gender),
-          student_No:basicInfo.student_id,
-          org2:basicInfo.department_name,
-          job1:basicInfo && basicInfo.identity=="teacher" ? basicInfo.technical_title:"教授",
-          job2:basicInfo && basicInfo.identity=="professional" ? basicInfo.technical_title:"企业管理者",
+          job: basicInfo.identity,
+          sex: String(basicInfo.gender),
+          student_No: basicInfo.student_id,
+          org2: basicInfo.department_name,
+          job1: basicInfo && basicInfo.identity == "teacher" ? basicInfo.technical_title : "教授",
+          job2: basicInfo && basicInfo.identity == "professional" ? basicInfo.technical_title : "企业管理者",
         })
       }, 100)
       this.setState({
         forDisable: true,
-        nameLength:basicInfo.nickname?basicInfo.nickname.length:0,
-        showRealName:basicInfo.show_realname,
+        nameLength: basicInfo.nickname ? basicInfo.nickname.length : 0,
+        showRealName: basicInfo.show_realname,
         realName: basicInfo.name,
-        identity:basicInfo.identity,
-        school_id:basicInfo.school_id,
-        department_id:basicInfo.department_id
+        identity: basicInfo.identity,
+        school_id: basicInfo.school_id,
+        department_id: basicInfo.department_id
       })
     }
   }
 
-  getSchoolList=(basicInfo, selectedName)=>{
-    let url=`/schools/for_option.json`;
-    axios.get(url).then((result)=>{
-      if(result){
+  getSchoolList = (basicInfo, selectedName) => {
+    let url = `/schools/for_option.json`;
+    axios.get(url).then((result) => {
+      if (result) {
         this.setState({
-          schoolList:result.data.schools
+          schoolList: result.data.schools
         })
         if (selectedName) {
           let school_id
-          result.data.schools.reverse().some( item => {
+          result.data.schools.reverse().some(item => {
             if (item.name == selectedName) {
               school_id = item.id
               return true;
@@ -127,26 +127,26 @@ class RealNameCertificationModal extends Component{
           }, () => {
             this.filterList(selectedName)
           })
-        } else if(basicInfo && basicInfo.school_name){
+        } else if (basicInfo && basicInfo.school_name) {
           this.setState({
-            school:basicInfo.school_name,
-            filterSchoolList:this.state.schoolList.filter(function(item){
-              return item.name.indexOf(basicInfo.school_name)>-1;
+            school: basicInfo.school_name,
+            filterSchoolList: this.state.schoolList.filter(function (item) {
+              return item.name.indexOf(basicInfo.school_name) > -1;
             })
           })
-          this.getDepartments(basicInfo.school_name,false);
+          this.getDepartments(basicInfo.school_name, false);
         }
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
 
 
 
-  getDepartments=(e,flag)=>{
-    let arr=this.state.schoolList.filter(function(item){
-      if(item.name.indexOf(e) > -1){
+  getDepartments = (e, flag) => {
+    let arr = this.state.schoolList.filter(function (item) {
+      if (item.name === e) {
         return item.name;
       }
     });
@@ -178,21 +178,21 @@ class RealNameCertificationModal extends Component{
     this.this_school_id = arr[0].id
     this.setState({
       school_id: arr[0].id,
-      school:e,
+      school: e,
     })
     this._getDepartments(arr[0].id, flag)
   }
   _getDepartments = (schoolId, flag, selectedName) => {
-    let url=`/schools/${schoolId || this.state.school_id}/departments/for_option.json`;
-    axios.get(url).then((result)=>{
-      if(result){
+    let url = `/schools/${schoolId || this.state.school_id}/departments/for_option.json`;
+    axios.get(url).then((result) => {
+      if (result) {
         this.setState({
-          departments:result.data.departments,
-          filterDepartments:result.data.departments
+          departments: result.data.departments,
+          filterDepartments: result.data.departments
         })
         if (selectedName) {
           let department_id
-          result.data.departments.reverse().some( item => {
+          result.data.departments.reverse().some(item => {
             if (item.name == selectedName) {
               department_id = item.id
               return true;
@@ -205,31 +205,31 @@ class RealNameCertificationModal extends Component{
             department_id,
             // school: selectedName
           })
-        } else if(result.data.departments && result.data.departments.length>0 && flag==true){
-           // 切换学校后，部门默认选择第一个
+        } else if (result.data.departments && result.data.departments.length > 0 && flag == true) {
+          // 切换学校后，部门默认选择第一个
           this.props.form.setFieldsValue({
-            org2:result.data.departments[0].name
+            org2: result.data.departments[0].name
           })
           this.setState({
             department_id: result.data.departments[0].id
           })
-        }else if(result.data.departments && result.data.departments.length == 0 && flag==true){
+        } else if (result.data.departments && result.data.departments.length == 0 && flag == true) {
           this.props.form.setFieldsValue({
-            org2:''
+            org2: ''
           })
         }
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
 
-  filterList =(e)=>{
+  filterList = (e) => {
     const inputVal = e.trim()
-    let arr=[];
-    if(inputVal){
-      arr= this.state.schoolList.filter(function(item){
-        return item.name.indexOf(inputVal)>-1;
+    let arr = [];
+    if (inputVal) {
+      arr = this.state.schoolList.filter(function (item) {
+        return item.name.indexOf(inputVal) > -1;
       });
       this.props.form.setFieldsValue({
         org: inputVal
@@ -256,29 +256,29 @@ class RealNameCertificationModal extends Component{
       console.log(values);
       console.log(this.state.showRealName ? values.name : this.state.realName);
       // return;
-      if(!err){
-        let{ imageUrl2 , showRealName , realName }=this.state;
-        let{ current_user , basicInfo }=this.props;
-        if(imageUrl2){
+      if (!err) {
+        let { imageUrl2, showRealName, realName } = this.state;
+        let { current_user, basicInfo } = this.props;
+        if (imageUrl2) {
           let { certification } = this.props;
-          if(certification == 1){
+          if (certification == 1) {
             // 实名认证
-            let url="";
-            if( basicInfo===undefined){
+            let url = "";
+            if (basicInfo === undefined) {
               url = `/users/accounts/${current_user && current_user.login}/authentication_apply.json`;
 
-            }else {
+            } else {
               url = `/users/accounts/${basicInfo && basicInfo.id}/authentication_apply.json`;
             }
 
-            axios.post((url),{
-              name:this.state.showRealName ? values.name : realName,
-              gender:parseInt(values.sex),
-              id_number:values.credentials,
-              show_realname:showRealName,
-              attachment_ids:[this.state.fileID]
-            }).then((result)=>{
-              if(result){
+            axios.post((url), {
+              name: this.state.showRealName ? values.name : realName,
+              gender: parseInt(values.sex),
+              id_number: values.credentials,
+              show_realname: showRealName,
+              attachment_ids: [this.state.fileID]
+            }).then((result) => {
+              if (result) {
                 this.props.showNotification("申请已提交，请等待审核!");
                 try {
                   this.props.getBasicInfo();
@@ -291,27 +291,27 @@ class RealNameCertificationModal extends Component{
                 }
                 this.setVisible(false);
               }
-            }).catch((error)=>{
+            }).catch((error) => {
               console.log(error);
             })
-          }else{
+          } else {
             // 职业认证
             // console.log(values.job == "student" ? values.student_No : values.job == "teacher" ? values.job1 : values.job2);
-            let url="";
-            if( basicInfo===undefined){
+            let url = "";
+            if (basicInfo === undefined) {
               url = `/users/accounts/${current_user && current_user.login}/professional_auth_apply.json`;
-            }else {
+            } else {
               url = `/users/accounts/${basicInfo && basicInfo.id}/professional_auth_apply.json`;
 
             }
-            axios.post((url),{
-              school_id:this.state.school_id,
-              department_id:this.state.department_id,
-              identity:this.state.identity,
+            axios.post((url), {
+              school_id: this.state.school_id,
+              department_id: this.state.department_id,
+              identity: this.state.identity,
               extra: values.job == "student" ? values.student_No : values.job == "teacher" ? values.job1 : values.job2,
-              attachment_ids:[this.state.fileID]
-            }).then((result)=>{
-              if(result){
+              attachment_ids: [this.state.fileID]
+            }).then((result) => {
+              if (result) {
                 this.props.showNotification("申请已提交，请等待审核!");
                 try {
                   this.props.getBasicInfo();
@@ -326,11 +326,11 @@ class RealNameCertificationModal extends Component{
                 this.setVisible(false);
 
               }
-            }).catch((error)=>{
+            }).catch((error) => {
               console.log(error);
             })
           }
-        }else{
+        } else {
           this.props.showNotification("请先上传照片！");
         }
       }
@@ -353,39 +353,39 @@ class RealNameCertificationModal extends Component{
       getBase64(info.file.originFileObj, imageUrl2 => this.setState({
         imageUrl2,
         loading: false,
-        fileID:info.file.response && info.file.response.id
+        fileID: info.file.response && info.file.response.id
       }));
     }
   }
   // 切换职称
-  changeJob=(e)=>{
+  changeJob = (e) => {
     this.setState({
-      identity:e
+      identity: e
     })
-    let {basicInfo}=this.props;
-    if(basicInfo){
+    let { basicInfo } = this.props;
+    if (basicInfo) {
       this.props.form.setFieldsValue({
-        job1:basicInfo && basicInfo.identity=="teacher" ? basicInfo.technical_title:"教授",
-        job2:basicInfo && basicInfo.identity=="professional" ? basicInfo.technical_title:"企业管理者",
+        job1: basicInfo && basicInfo.identity == "teacher" ? basicInfo.technical_title : "教授",
+        job2: basicInfo && basicInfo.identity == "professional" ? basicInfo.technical_title : "企业管理者",
       })
     }
   }
   // 选择学校(获取对应学校的学院、部门)
-  changeList=(e)=>{
-    this.getDepartments(e.trim(),true);
+  changeList = (e) => {
+    this.getDepartments(e.trim(), true);
   }
 
   showApplyForAddOrgModal = () => {
     this.applyForAddOrgForm.setVisible(true)
   }
   showApplyForAddChildOrgModal = () => {
-    let{school,schoolList}=this.state;
-    let arr=schoolList.filter(function(item){
+    let { school, schoolList } = this.state;
+    let arr = schoolList.filter(function (item) {
       return item.name == school;
     });
-    if(arr.length > 0){
+    if (arr.length > 0) {
       this.applyForAddChildOrgForm.setVisible(true)
-    }else{
+    } else {
       this.props.showNotification("请先选择正确的单位或者学校！");
     }
   }
@@ -396,7 +396,7 @@ class RealNameCertificationModal extends Component{
 
     this.getSchoolList(this.props.basicInfo, name);
     this.props.form.setFieldsValue({
-        org: name
+      org: name
     })
   }
 
@@ -407,21 +407,21 @@ class RealNameCertificationModal extends Component{
   }
 
   // 隐藏或显示真实姓名
-  showOrHide=(flag)=>{
+  showOrHide = (flag) => {
     const name = this.props.form.getFieldsValue().name || this.props.basicInfo.name
     this.setState({
-      showRealName:flag==true?false:true
+      showRealName: flag == true ? false : true
     })
-    if(flag==true){ // 隐藏真实姓名
+    if (flag == true) { // 隐藏真实姓名
       this.hideRealName(name);
-    }else{  // 显示
+    } else {  // 显示
       this.props.form.setFieldsValue({
         name: this.state.realName
       })
     }
   }
-   // 将名字隐藏起来
-   hideRealName=(name)=>{
+  // 将名字隐藏起来
+  hideRealName = (name) => {
     this.setState({ realName: name })
     const newName = getHiddenName(name)
 
@@ -431,8 +431,8 @@ class RealNameCertificationModal extends Component{
     return newName
   }
   // 选择部门、学院
-  changeDepartment=(e)=>{
-    let arr = this.state.departments && this.state.departments.filter ? this.state.departments.filter(function(item){
+  changeDepartment = (e) => {
+    let arr = this.state.departments && this.state.departments.filter ? this.state.departments.filter(function (item) {
       return item.name == e;
     }) : [];
     if (!arr[0]) {
@@ -446,66 +446,66 @@ class RealNameCertificationModal extends Component{
     }
     this.this_department_id = arr[0].id
     this.setState({
-      departmentsName:e,
+      departmentsName: e,
       department_id: arr[0].id,
     })
   }
-	// 姓名
-	handleSubmitNames(rule, value, callback){
-		if (value) {
-				let iconRule1 = /[`~!@#$%^&()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
-// 判断是否含有emoji表情
-				let iconRule2 = /[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF][\u200D|\uFE0F]|[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF]|[0-9|*|#]\uFE0F\u20E3|[0-9|#]\u20E3|[\u203C-\u3299]\uFE0F\u200D|[\u203C-\u3299]\uFE0F|[\u2122-\u2B55]|\u303D|[\A9|\AE]\u3030|\uA9|\uAE|\u3030/ig;
-// 如果为true，字符串含有emoji表情 ，false不含
-				const iconRule2s =iconRule2.test(value);
-// 如果为true，字符串含有特殊符号 ，false不
-				const iconRule1s =iconRule1.test(value);
+  // 姓名
+  handleSubmitNames(rule, value, callback) {
+    if (value) {
+      let iconRule1 = /[`~!@#$%^&()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
+      // 判断是否含有emoji表情
+      let iconRule2 = /[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF][\u200D|\uFE0F]|[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF]|[0-9|*|#]\uFE0F\u20E3|[0-9|#]\u20E3|[\u203C-\u3299]\uFE0F\u200D|[\u203C-\u3299]\uFE0F|[\u2122-\u2B55]|\u303D|[\A9|\AE]\u3030|\uA9|\uAE|\u3030/ig;
+      // 如果为true，字符串含有emoji表情 ，false不含
+      const iconRule2s = iconRule2.test(value);
+      // 如果为true，字符串含有特殊符号 ，false不
+      const iconRule1s = iconRule1.test(value);
 
-				if (iconRule2s===true|| iconRule1s===true) {
-					callback('2-10位中英文、数字');
-				}
-				else if(value.length<2){
-					callback('2-10位中英文、数字');
-				}else if(value.length>=11){
-					callback('2-10位中英文、数字');
-				}
-		}
-		callback();
-	}
+      if (iconRule2s === true || iconRule1s === true) {
+        callback('2-10位中英文、数字');
+      }
+      else if (value.length < 2) {
+        callback('2-10位中英文、数字');
+      } else if (value.length >= 11) {
+        callback('2-10位中英文、数字');
+      }
+    }
+    callback();
+  }
 
-  render(){
+  render() {
     const { course_lists, checkBoxValues, searchValue, loading, imageUrl, imageUrl2,
-    identity,
-    departmentsName ,
-    filterSchoolList ,
-    filterDepartments ,
-    school,
-    department_id,
-    departments,
-    school_id,
+      identity,
+      departmentsName,
+      filterSchoolList,
+      filterDepartments,
+      school,
+      department_id,
+      departments,
+      school_id,
 
-    showRealName
+      showRealName
     } = this.state
     const { moduleName } = this.props
     const { getFieldDecorator } = this.props.form;
-    let {certification}=this.props;
+    let { certification } = this.props;
     // /api/users/accounts/${this.props.current_user.login}/auth_attachment.json
 
     // 已职业认证的账户不能修改职业，学校/单位，院系/部门（true为disable）
     // const professionalFlag = basicInfo && basicInfo.professional_certification == "certified" ;
 
-    let{ basicInfo }=this.props
-    let common={
-      changeJob:this.changeJob,
-      filterList:this.filterList,
-      changeList:this.changeList,
-      changeDepartment:this.changeDepartment,
-      showApplyForAddOrgModal:this.showApplyForAddOrgModal,
-      showApplyForAddChildOrgModal:this.showApplyForAddChildOrgModal
+    let { basicInfo } = this.props
+    let common = {
+      changeJob: this.changeJob,
+      filterList: this.filterList,
+      changeList: this.changeList,
+      changeDepartment: this.changeDepartment,
+      showApplyForAddOrgModal: this.showApplyForAddOrgModal,
+      showApplyForAddChildOrgModal: this.showApplyForAddChildOrgModal
     }
     const uploadProps2 = {
       // name: 'image',
-      data: {type: certification == 1 ? "real_name" : "professional"},
+      data: { type: certification == 1 ? "real_name" : "professional" },
       multiple: true,
       showUploadList: false,
       // https://newweb.educoder.net
@@ -524,70 +524,70 @@ class RealNameCertificationModal extends Component{
     // form合并了
     const propsWithoutForm = Object.assign({}, this.props)
     delete propsWithoutForm.form
-    return(
+    return (
       <div>
-          <ApplyForAddOrgModal ref="applyForAddOrgModal" wrappedComponentRef={(form) => this.applyForAddOrgForm = form}  schoolName={school}
+        <ApplyForAddOrgModal ref="applyForAddOrgModal" wrappedComponentRef={(form) => this.applyForAddOrgForm = form} schoolName={school}
           {...propsWithoutForm} addOrgSuccess={this.addOrgSuccess}
-          ></ApplyForAddOrgModal>
-          <ApplyForAddChildOrgModal ref="applyForAddChildOrgModal" schoolName={school} schoolId={school_id} departmentName={departmentsName}
-                                    {...propsWithoutForm}
-                                    wrappedComponentRef={(form) => this.applyForAddChildOrgForm = form}
-                                    addChildOrgSuccess={this.addChildOrgSuccess}
-          ></ApplyForAddChildOrgModal>
+        ></ApplyForAddOrgModal>
+        <ApplyForAddChildOrgModal ref="applyForAddChildOrgModal" schoolName={school} schoolId={school_id} departmentName={departmentsName}
+          {...propsWithoutForm}
+          wrappedComponentRef={(form) => this.applyForAddChildOrgForm = form}
+          addChildOrgSuccess={this.addChildOrgSuccess}
+        ></ApplyForAddChildOrgModal>
         <ModalWrapper
           ref="modalWrapper"
           title={
             certification && certification == 1 ?
-            <span><i className="iconfont icon-shenfenrenzheng font-18 color-blue mr5" style={{fontWeight:"normal"}}></i>实名认证</span>:
-            <span><i className="iconfont icon-zhiyerenzheng font-18 color-blue mr5" style={{fontWeight:"normal"}}></i>职业认证</span>
+              <span><i className="iconfont icon-shenfenrenzheng font-18 color-blue mr5" style={{ fontWeight: "normal" }}></i>实名认证</span> :
+              <span><i className="iconfont icon-zhiyerenzheng font-18 color-blue mr5" style={{ fontWeight: "normal" }}></i>职业认证</span>
           }
-          {...this.props }
+          {...this.props}
           {...this.state}
           onOk={this.onOk}
           okText="保存"
           className="applyForModal certificationModal courseNormalForm autoModal"
           width="660px"
           bottomRender={
-            certification && certification == 1?
-            <div className="bottomRender">
-              <p>认证须知：</p>
-              <p>
-                1.你需要准备有效的身份证正面（人像面）的证件照照片，请确保证件照片清晰可见，严禁PS；
+            certification && certification == 1 ?
+              <div className="bottomRender">
+                <p>认证须知：</p>
+                <p>
+                  1.你需要准备有效的身份证正面（人像面）的证件照照片，请确保证件照片清晰可见，严禁PS；
               </p><p>
-              2.我们将在你提交认证信息后的24小时（不包含节假日）内完成审核，审核结果将会以系统消息的形式发送给你；
+                  2.我们将在你提交认证信息后的24小时（不包含节假日）内完成审核，审核结果将会以系统消息的形式发送给你；
               </p><p>
-                3.实名认证审核完成后，无法删除，请谨慎填写；
+                  3.实名认证审核完成后，无法删除，请谨慎填写；
               </p><p>
-                4.实名认证审核完成后，系统将自动发放500个金币作为奖励；
+                  4.实名认证审核完成后，系统将自动发放500个金币作为奖励；
               </p><p>
-                5.我们会确保你所提供的信息均处于严格的保密状态，不会泄露；
+                  5.我们会确保你所提供的信息均处于严格的保密状态，不会泄露；
               </p><p>
-                6.如存在恶意乱填写姓名，证件号，及上传与实名认证证件无关图片者，一经发现将冻结EduCoder账号。
+                  6.如存在恶意乱填写姓名，证件号，及上传与实名认证证件无关图片者，一经发现将冻结EduCoder账号。
               </p><p>
-                7.提交实名认证后系统会自动将状态改为已认证，你将可以体验平台需要实名认证的功能；如果在认证后的使用过程中未通过审核，你将不能继续体验需要认证的功能。
+                  7.提交实名认证后系统会自动将状态改为已认证，你将可以体验平台需要实名认证的功能；如果在认证后的使用过程中未通过审核，你将不能继续体验需要认证的功能。
               </p>
-            </div>:
-            <div className="bottomRender">
-              <p>认证须知：</p>
-              <p>
-              1.根据职业上传相应的证件照：教师（教师证），专业人士（员工证）、学生（学生证），请确保证件照内容完整并且清晰可见，严禁PS；
+              </div> :
+              <div className="bottomRender">
+                <p>认证须知：</p>
+                <p>
+                  1.根据职业上传相应的证件照：教师（教师证），专业人士（员工证）、学生（学生证），请确保证件照内容完整并且清晰可见，严禁PS；
               </p><p>
-              2.我们将在你提交职业证信息后的24小时（不包含节假日）内完成审核，审核结果将会以系统消息的形式发送给你；
+                  2.我们将在你提交职业证信息后的24小时（不包含节假日）内完成审核，审核结果将会以系统消息的形式发送给你；
               </p><p>
-              3.职业认证审核完成后，无法删除，请谨慎填写；职业变更请选择重新认证；
+                  3.职业认证审核完成后，无法删除，请谨慎填写；职业变更请选择重新认证；
               </p><p>
-              4.职业认证审核完成后，系统将自动发放500个金币作为奖励；
+                  4.职业认证审核完成后，系统将自动发放500个金币作为奖励；
               </p><p>
-              5.我们会确保你所提供的信息均处于严格的保密状态，不会泄露；
+                  5.我们会确保你所提供的信息均处于严格的保密状态，不会泄露；
               </p><p>
-              6.如存在恶意乱填写姓名，学号，及上传与职业证件无关图片者，一经发现将冻结EduCoder账号。
+                  6.如存在恶意乱填写姓名，学号，及上传与职业证件无关图片者，一经发现将冻结EduCoder账号。
               </p>
-              <p>
-              7.非老师身份提交职业认证后系统会自动将状态改为已认证，你将可以体验平台需要职业认证的功能；如果在认证后的使用过程中未通过审核，你将不能继续体验需要认证的功能。
+                <p>
+                  7.非老师身份提交职业认证后系统会自动将状态改为已认证，你将可以体验平台需要职业认证的功能；如果在认证后的使用过程中未通过审核，你将不能继续体验需要认证的功能。
               </p>
-            </div>
-            }
-          >
+              </div>
+          }
+        >
           <style>{`
             .applyForModal .ant-form-item{
               margin-bottom:18px;
@@ -681,27 +681,27 @@ class RealNameCertificationModal extends Component{
 
           <Form onSubmit={this.handleSubmit}>
             {certification && certification == 1 ?
-            <div>
-              <Form.Item
-                label="姓名"
-                className="formItemInline"
-              >
-                <React.Fragment>{getFieldDecorator('name', {
+              <div>
+                <Form.Item
+                  label="姓名"
+                  className="formItemInline"
+                >
+                  <React.Fragment>{getFieldDecorator('name', {
                     rules: [{
                       // initialValue: this.state.cityDefaultValue,
                       required: true,
                       message: `请输入真实姓名，最大限制${MAX_NAME_LENGTH}个字符`,
 
                     },
-											{ validator: this.handleSubmitNames },
+                    { validator: this.handleSubmitNames },
                     ],
                   })(
-                    <Input placeholder={`请输入真实姓名，最大限制${MAX_NAME_LENGTH}个字符`} className="yslgraduainputedit"  disabled={!showRealName && this.state.forDisable == true } addonAfter={
-                      <i className={showRealName?"iconfont icon-xianshi font-18 color-blue":"iconfont icon-yincang font-18 color-blue"}
-                            onClick={()=>this.showOrHide(showRealName)}></i>
+                    <Input placeholder={`请输入真实姓名，最大限制${MAX_NAME_LENGTH}个字符`} className="yslgraduainputedit" disabled={!showRealName && this.state.forDisable == true} addonAfter={
+                      <i className={showRealName ? "iconfont icon-xianshi font-18 color-blue" : "iconfont icon-yincang font-18 color-blue"}
+                        onClick={() => this.showOrHide(showRealName)}></i>
                     }></Input>
                   )}
-                  <span>{ showRealName ? '（显示：平台将显示您的真实姓名）' : '（隐藏：平台将显示你的昵称）' }</span>
+                    <span>{showRealName ? '（显示：平台将显示您的真实姓名）' : '（隐藏：平台将显示你的昵称）'}</span>
                   </React.Fragment>
                   {/* // <div className="df" style={{}}>
                   //   <Tooltip title="已完成实名认证，不能修改">
@@ -712,40 +712,40 @@ class RealNameCertificationModal extends Component{
                   //   <span>{ showRealName ? '（显示：平台将显示您的真实姓名）' : '（隐藏：平台将显示你的昵称）' }</span>
                   // </div> */}
 
-              </Form.Item>
+                </Form.Item>
 
-              <Form.Item
-                label="性别"
-                className="formItemInline resetSexStyle"
-              >
-                {getFieldDecorator('sex', {
-                  rules: [{
-                    required: true,
-                    message: '请选择性别',
-                  }],
-                })(
-                  <RadioGroup>
+                <Form.Item
+                  label="性别"
+                  className="formItemInline resetSexStyle"
+                >
+                  {getFieldDecorator('sex', {
+                    rules: [{
+                      required: true,
+                      message: '请选择性别',
+                    }],
+                  })(
+                    <RadioGroup>
                       <Radio value="0">男</Radio>
                       <Radio value="1">女</Radio>
-                  </RadioGroup>
-                )}
-              </Form.Item>
-              <Form.Item
-                label="证件号："
-                className="formItemInline"
-              >
-                {getFieldDecorator('credentials', {
-                  rules: [{
-                    // initialValue: this.state.cityDefaultValue,
-                    required: true,
-                    message: '请输入证件号',
-                  }],
-                })(
-                  <Input placeholder="请输入证件号" ></Input>
-                )}
-              </Form.Item>
-            </div>
-            :
+                    </RadioGroup>
+                  )}
+                </Form.Item>
+                <Form.Item
+                  label="证件号："
+                  className="formItemInline"
+                >
+                  {getFieldDecorator('credentials', {
+                    rules: [{
+                      // initialValue: this.state.cityDefaultValue,
+                      required: true,
+                      message: '请输入证件号',
+                    }],
+                  })(
+                    <Input placeholder="请输入证件号" ></Input>
+                  )}
+                </Form.Item>
+              </div>
+              :
               <AccountBasicEditItem
                 identity={identity}
                 getFieldDecorator={getFieldDecorator}
@@ -765,21 +765,21 @@ class RealNameCertificationModal extends Component{
             }
             <div className="mt15" style={{ marginLeft: '18px' }}>
               <div className="df">
-                <span style={{color: '#999999'}}>{ certification && certification == 1 ? "身份证上传:":"职业证上传:" }</span>
+                <span style={{ color: '#999999' }}>{certification && certification == 1 ? "身份证上传:" : "职业证上传:"}</span>
                 <div className="df ml10" style={{ justifyContent: 'center' }} >
                   <span className="idPic-uploader demoImg">
-                    <img src={`${certification == 1 ? authImg : jobImg}`} alt="avatar" style={{ maxHeight: '110px'}}/>
+                    <img src={`${certification == 1 ? authImg : jobImg}`} alt="avatar" style={{ maxHeight: '110px' }} />
                   </span>
                   <Dragger {...uploadProps2}
                     accept=".png,.jpg,.bmp,.jpeg"
                   >
                     {imageUrl2 ?
                       // <a href={imageUrl2} target="_blank" title="点击重新上传图片"></a>
-                        <img src={imageUrl2} alt="avatar" style={{ maxHeight: '110px'}}/>
+                      <img src={imageUrl2} alt="avatar" style={{ maxHeight: '110px' }} />
                       :
                       <React.Fragment>
                         <p className="ant-upload-drag-icon">
-                          <i className="iconfont icon-cuban2shangchuanyunduan" style={{color:"#4B667F",font:"42px"}}></i>
+                          <i className="iconfont icon-cuban2shangchuanyunduan" style={{ color: "#4B667F", font: "42px" }}></i>
                         </p>
                         <p className="ant-upload-text mt20"><a>点击或拖拽上传图片</a></p>
                         {/* <p className="ant-upload-hint">Support for a single or bulk upload. Strictly prohibit from uploading company data or other band files</p> */}
@@ -789,15 +789,15 @@ class RealNameCertificationModal extends Component{
                 </div>
               </div>
               <div className="df mt10 color-grey-9">
-                <span className="fl edu-txt-center" style={{width:"200px",marginLeft:"65px"}}>
+                <span className="fl edu-txt-center" style={{ width: "200px", marginLeft: "65px" }}>
                   <p>示例图片</p>
-                  <p className="font-12" style={{color: '#FF6800'}}>（png/jpg/bmp格式，不超过2MB）</p>
+                  <p className="font-12" style={{ color: '#FF6800' }}>（png/jpg/bmp格式，不超过2MB）</p>
                 </span>
-                <span className="fl edu-txt-center" style={{width:"160px"}}>
+                <span className="fl edu-txt-center" style={{ width: "160px" }}>
                   <ImageLayer2 parentSel={'#imageLayerBtn'} parentSel={'#imageLayerBtn'}
                   ></ImageLayer2>
-                  <a href="javascript:void(0)" id="imageLayerBtn" src={imageUrl || imageUrl2} className="color-orange" style={{borderBottom:"1px solid #ff6800"}}>查看大图</a>
-                  </span>
+                  <a id="imageLayerBtn" src={imageUrl || imageUrl2} className="color-orange" style={{ borderBottom: "1px solid #ff6800" }}>查看大图</a>
+                </span>
               </div>
             </div>
           </Form>
diff --git a/src/modules/user/usersInfo/Infos.js b/src/modules/user/usersInfo/Infos.js
index bda24aa7..376721d8 100644
--- a/src/modules/user/usersInfo/Infos.js
+++ b/src/modules/user/usersInfo/Infos.js
@@ -47,10 +47,6 @@ const InfosTopics=Loadable({
 	loader: () => import('./InfosTopics'),
 	loading:Loading,
 })
-const UserProjects = Loadable({
-  loader: () => import('./Projects'),
-  loading: Loading,
-})
 
 const $ = window.$;
 class Infos extends Component{
@@ -64,7 +60,7 @@ class Infos extends Component{
       type:0,
       login:undefined,
       isRenders:false,
-      moduleName:"projects",
+      moduleName:"classrooms",
       next_gold:undefined
     }
   }
@@ -113,8 +109,8 @@ class Infos extends Component{
 						data:result.data,
 						followed:result.data.followed,
 						sign:result.data.brief_introduction,
-						// id:result.data.id,
-						// next_gold:result.data.tomorrow_attendance_gold
+						id:result.data.id,
+						next_gold:result.data.tomorrow_attendance_gold
 					})
 				}
       }
@@ -278,7 +274,7 @@ class Infos extends Component{
 
             {/* 课堂 */}
             {/* http://localhost:3007/courses/1309/homework/9300/setting */}
-          <Route exact path="/users/:username/courses"
+          <Route exact path="/users/:username/classrooms"
                  render={
                 (props) => (<InfosCourse {...this.props} {...props} {...this.state} {..._commonProps}/>)
               }
@@ -299,16 +295,11 @@ class Infos extends Component{
             ></Route>
 
           {/* 开发项目 */}
-            {/*<Route exact path="/users/:username/projects"*/}
-              {/*render={*/}
-                {/*(props) => (<InfosProject {...this.props} {...props} {...this.state} {..._commonProps}/>)*/}
-              {/*}*/}
-            {/*></Route>*/}
-          <Route exact path="/users/:username/projects"
-                 render={
-                   (props) => (<UserProjects {...this.props} {...props} {...this.state} {..._commonProps}/>)
-                 }
-          ></Route>
+            <Route exact path="/users/:username/projects"
+              render={
+                (props) => (<InfosProject {...this.props} {...props} {...this.state} {..._commonProps}/>)
+              }
+            ></Route>
 
 						{/* 众包 */}
 						{/* http://localhost:3007/courses/1309/homework/9300/setting */}
diff --git a/src/modules/user/usersInfo/InfosBank.js b/src/modules/user/usersInfo/InfosBank.js
index f776b75e..50104b46 100644
--- a/src/modules/user/usersInfo/InfosBank.js
+++ b/src/modules/user/usersInfo/InfosBank.js
@@ -1,142 +1,144 @@
 import React, { Component } from 'react';
-import {Pagination,Spin,Checkbox,Modal} from 'antd';
+import { Pagination, Spin, Checkbox, Modal } from 'antd';
 import moment from 'moment';
 import axios from 'axios';
 import NoneData from '../../courses/coursesPublic/NoneData'
-import {getImageUrl} from 'educoder';
+import { getImageUrl } from 'educoder';
 import "./usersInfo.css"
 import Modals from '../../modals/Modals'
 
-const dateFormat ="YYYY-MM-DD HH:mm"
-class InfosBank extends Component{
-  constructor(props){
+const dateFormat = "YYYY-MM-DD HH:mm"
+class InfosBank extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      category:"common",
-      type:"publicly",
-      page:1,
-      per_page:16,
-      sort_by:"updated_at",
-      CoursesId:undefined,
+    this.state = {
+      category: "common",
+      type: "publicly",
+      page: 1,
+      per_page: 16,
+      sort_by: "updated_at",
+      CoursesId: undefined,
 
-      totalCount:undefined,
-      data:undefined,
-      isSpin:false,
+      totalCount: undefined,
+      data: undefined,
+      isSpin: false,
 
-      dialogOpen:false,
-      modalsTopval:undefined,
-      modalsBottomval:undefined,
-      modalSave:undefined
+      dialogOpen: false,
+      modalsTopval: undefined,
+      modalsBottomval: undefined,
+      modalSave: undefined
     }
   }
 
-  componentDidMount=()=>{
+  componentDidMount = () => {
     this.setState({
-      isSpin:true
+      isSpin: true
     })
-    let{category,type,page,sort_by,CoursesId}=this.state;
-    this.getCourses(category,type,page,sort_by,CoursesId);
+    let { category, type, page, sort_by, CoursesId } = this.state;
+    this.getCourses(category, type, page, sort_by, CoursesId);
   }
 
-  getCourses=(category,type,page,sort_by,CoursesId)=>{
-    let url=`/users/${this.props.match.params.username}/question_banks.json`;
-    axios.get((url),{params:{
-      category,
-      type,
-      page,
-      sort_by,
-      per_page:category && page ==1?17:16,
-      course_list_id:CoursesId
-    }}).then((result)=>{
-      if(result){
+  getCourses = (category, type, page, sort_by, CoursesId) => {
+    let url = `/users/${this.props.match.params.username}/question_banks.json`;
+    axios.get((url), {
+      params: {
+        category,
+        type,
+        page,
+        sort_by,
+        per_page: category && page == 1 ? 17 : 16,
+        course_list_id: CoursesId
+      }
+    }).then((result) => {
+      if (result) {
         this.setState({
-          totalCount:result.data.count,
-          data:result.data,
-          isSpin:false
+          totalCount: result.data.count,
+          data: result.data,
+          isSpin: false
         })
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
 
   //切换种类
-  changeCategory=(cate)=>{
+  changeCategory = (cate) => {
     this.setState({
-      category:cate,
-      page:1,
-      isSpin:true
+      category: cate,
+      page: 1,
+      isSpin: true
     })
-    let{type,sort_by,CoursesId}=this.state;
-    this.getCourses(cate,type,1,sort_by,CoursesId);
+    let { type, sort_by, CoursesId } = this.state;
+    this.getCourses(cate, type, 1, sort_by, CoursesId);
   }
   //切换状态
-  changeType=(type)=>{
+  changeType = (type) => {
     this.setState({
-      type:type,
-      page:1,
-      isSpin:true
+      type: type,
+      page: 1,
+      isSpin: true
     })
-    let{category,sort_by,CoursesId}=this.state;
-    this.getCourses(category,type,1,sort_by,CoursesId);
+    let { category, sort_by, CoursesId } = this.state;
+    this.getCourses(category, type, 1, sort_by, CoursesId);
   }
   //切换页数
-  changePage=(page)=>{
+  changePage = (page) => {
     this.setState({
       page,
-      isSpin:true
+      isSpin: true
     })
-    let{category,type,sort_by,CoursesId}=this.state;
-    this.getCourses(category,type,page,sort_by,CoursesId);
+    let { category, type, sort_by, CoursesId } = this.state;
+    this.getCourses(category, type, page, sort_by, CoursesId);
   }
 
   // 进入课堂
-  turnToCourses=(url)=>{
+  turnToCourses = (url) => {
     this.props.history.push(url);
   }
 
   // 切换排序方式
-  changeOrder= (sort)=>{
+  changeOrder = (sort) => {
     this.setState({
-      sort_by:sort,
-      isSpin:true
+      sort_by: sort,
+      isSpin: true
     })
-    let{category,type,page,CoursesId}=this.state;
-    this.getCourses(category,type,page,sort,CoursesId);
+    let { category, type, page, CoursesId } = this.state;
+    this.getCourses(category, type, page, sort, CoursesId);
   }
 
-  changeCourseListId =(CoursesId)=>{
+  changeCourseListId = (CoursesId) => {
     this.setState({
       CoursesId,
-      isSpin:true
+      isSpin: true
     })
-    let{category,type,sort,page}=this.state;
-    this.getCourses(category,type,page,sort,CoursesId);
+    let { category, type, sort, page } = this.state;
+    this.getCourses(category, type, page, sort, CoursesId);
   }
 
   //设为公开/删除
-  setPublic=(index)=>{
+  setPublic = (index) => {
     this.setState({
-      dialogOpen:true,
-      modalsTopval:index==1?"您确定要公开吗？":"确定要删除该题吗？",
-      modalsBottomval:index==1?"公开后不能重设为私有":"",
-      modalSave:()=>this.sureOperation(index)
+      dialogOpen: true,
+      modalsTopval: index == 1 ? "您确定要公开吗？" : "确定要删除该题吗？",
+      modalsBottomval: index == 1 ? "公开后不能重设为私有" : "",
+      modalSave: () => this.sureOperation(index)
     })
   }
   // 确定--设为公开/删除
-  sureOperation=()=>{
+  sureOperation = () => {
 
   }
 
   //弹框隐藏
-  handleDialogClose=()=>{
+  handleDialogClose = () => {
     this.setState({
-      dialogOpen:false
+      dialogOpen: false
     })
   }
 
-  render(){
-    let{
+  render() {
+    let {
       category,
       type,
       page,
@@ -147,11 +149,11 @@ class InfosBank extends Component{
       CoursesId,
       dialogOpen,
       modalsTopval,
-      modalsBottomval,modalSave
+      modalsBottomval, modalSave
     } = this.state;
     let isStudent = this.props.isStudent();
-    let  is_current=this.props.is_current;
-    return(
+    let is_current = this.props.is_current;
+    return (
       <div className="educontent">
         <Modals
           modalsType={dialogOpen}
@@ -161,86 +163,86 @@ class InfosBank extends Component{
           modalSave={modalSave}
         ></Modals>
         <Spin size="large" spinning={isSpin}>
-        <div className="white-panel edu-back-white pt20 pb20 clearfix ">
-          <li className={type=="publicly" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeType("publicly")}>{is_current ? "我":"TA"}的题库</a></li>
-          <li className={type=="personal" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeType("personal")}>公共题库</a></li>
-        </div>
-        <div className="edu-back-white padding10-30 bor-top-greyE">
-          <ul className="clearfix secondNav">
-            <li className={category=="common" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("common")}>普通作业</a></li>
-            <li className={category=="group" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("group")}>分组作业</a></li>
-            <li className={category=="exercise" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("exercise")}>试卷</a></li>
-            <li className={category=="poll" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("poll")}>问卷</a></li>
-          </ul>
-          <div className="edu-txt-left mt10 bankTag">
-          <ul className="inline" id="sourceTag">
-            <li className={ CoursesId ? "" : "active" } onClick={()=>this.changeCourseListId()}>
-              <a href="javascript:void(0)">全部</a>
-            </li>
+          <div className="white-panel edu-back-white pt20 pb20 clearfix ">
+            <li className={type == "publicly" ? "active" : ""}><a onClick={() => this.changeType("publicly")}>{is_current ? "我" : "TA"}的题库</a></li>
+            <li className={type == "personal" ? "active" : ""}><a onClick={() => this.changeType("personal")}>公共题库</a></li>
+          </div>
+          <div className="edu-back-white padding10-30 bor-top-greyE">
+            <ul className="clearfix secondNav">
+              <li className={category == "common" ? "active" : ""}><a onClick={() => this.changeCategory("common")}>普通作业</a></li>
+              <li className={category == "group" ? "active" : ""}><a onClick={() => this.changeCategory("group")}>分组作业</a></li>
+              <li className={category == "exercise" ? "active" : ""}><a onClick={() => this.changeCategory("exercise")}>试卷</a></li>
+              <li className={category == "poll" ? "active" : ""}><a onClick={() => this.changeCategory("poll")}>问卷</a></li>
+            </ul>
+            <div className="edu-txt-left mt10 bankTag">
+              <ul className="inline" id="sourceTag">
+                <li className={CoursesId ? "" : "active"} onClick={() => this.changeCourseListId()}>
+                  <a  >全部</a>
+                </li>
+                {
+                  data && data.course_list && data.course_list.map((item, key) => {
+                    return (
+                      <li className={CoursesId == item.id ? "active" : ""} key={key} onClick={() => this.changeCourseListId(`${item.id}`)}>
+                        <a  >{item.name}</a>
+                      </li>
+                    )
+                  })
+                }
+              </ul>
+            </div>
+          </div>
+          <p className="pl25 pr25 clearfix font-12 mb20 mt20">
+            <span className="fl color-grey-9">共参与{totalCount}个题库</span>
+            <div className="fr">
+              <li className="drop_down">
+                <span className="color-grey-9 font-12">{sort_by == "updated_at" ? "时间最新" : sort_by == "name" ? "作业名称" : "贡献者"}</span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i>
+                <ul className="drop_down_normal">
+                  <li onClick={() => this.changeOrder("updated_at")}>时间最新</li>
+                  <li onClick={() => this.changeOrder("name")}>作业名称</li>
+                  <li onClick={() => this.changeOrder("contributor")}>贡献者</li>
+                </ul>
+              </li>
+            </div>
+          </p>
+          <div className="dataBank_list edu-back-white educontent">
             {
-              data && data.course_list && data.course_list.map((item,key)=>{
-                return(
-                  <li className={CoursesId==item.id?"active":""} key={key} onClick={()=>this.changeCourseListId(`${item.id}`)}>
-                    <a href="javascript:void(0)">{item.name}</a>
-                  </li>
+              !data || data.question_banks.length == 0 && <NoneData></NoneData>
+            }
+            {
+              data && data.question_banks && data.question_banks.map((item, key) => {
+                return (
+                  <div className="dataBank_Item clearfix" key={key}>
+                    <div className="fl dataItemLeft">
+                      <Checkbox value={item.id} key={item.id}></Checkbox>
+                    </div>
+                    <div className="fr dataItemRight bank_item">
+                      <p className="mb10 clearfix">
+                        <span className="dataTitle fl mr80">{item.name}</span>
+                        <a data-object="2599" className="bank_send fr">发送</a>
+                        {
+                          item.is_public == false ?
+                            <a onClick={() => this.setPublic(1)} className="bank_public color-blue_4C fr mr60">设为公开</a> : ""
+                        }
+                      </p>
+                      <p className="itembottom clearfix">
+                        <span className="fl bottomspan color-grey-9">{item.quotes_count}次引用</span>
+                        <span className="fl bottomspan color-grey-9">{item.solve_count}次答题</span>
+                        <span className="fl bottomspan color-grey-9">{moment(item.updated_at).format('YYYY-MM-DD HH:mm')}</span>
+                        <span className="fr"><a className="bank_delete color-grey-9" onClick={() => this.setPublic(2)}>删除</a></span>
+                        <span className="bank_list_Tag">{item.course_list_name}</span>
+                      </p>
+                    </div>
+                  </div>
                 )
               })
             }
-          </ul>
-        </div>
-        </div>
-        <p className="pl25 pr25 clearfix font-12 mb20 mt20">
-          <span className="fl color-grey-9">共参与{totalCount}个题库</span>
-          <div className="fr">
-            <li className="drop_down">
-              <span className="color-grey-9 font-12">{sort_by=="updated_at"?"时间最新":sort_by=="name"?"作业名称":"贡献者"}</span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i>
-              <ul className="drop_down_normal">
-                <li onClick={()=>this.changeOrder("updated_at")}>时间最新</li>
-                <li onClick={()=>this.changeOrder("name")}>作业名称</li>
-                <li onClick={()=>this.changeOrder("contributor")}>贡献者</li>
-              </ul>
-            </li>
           </div>
-        </p>
-        <div className="dataBank_list edu-back-white educontent">
           {
-            !data || data.question_banks.length==0 && <NoneData></NoneData>
+            totalCount > 15 &&
+            <div className="mt30 mb50 edu-txt-center">
+              <Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page} />
+            </div>
           }
-          {
-            data && data.question_banks && data.question_banks.map((item,key)=>{
-              return(
-                <div className="dataBank_Item clearfix" key={key}>
-                  <div className="fl dataItemLeft">
-                    <Checkbox value={item.id} key={item.id}></Checkbox>
-                  </div>
-                  <div className="fr dataItemRight bank_item">
-                    <p className="mb10 clearfix">
-                      <span className="dataTitle fl mr80">{item.name}</span>
-                      <a href="javascript:void(0)" data-object="2599" className="bank_send fr">发送</a>
-                      {
-                        item.is_public ==false ?
-                        <a href="javascript:void(0)" onClick={()=>this.setPublic(1)} className="bank_public color-blue_4C fr mr60">设为公开</a>:""
-                      }
-                    </p>
-                    <p className="itembottom clearfix">
-                      <span className="fl bottomspan color-grey-9">{item.quotes_count}次引用</span>
-                      <span className="fl bottomspan color-grey-9">{item.solve_count}次答题</span>
-                      <span className="fl bottomspan color-grey-9">{moment(item.updated_at).format('YYYY-MM-DD HH:mm')}</span>
-                      <span className="fr"><a href="javascript:void(0)" className="bank_delete color-grey-9" onClick={()=>this.setPublic(2)}>删除</a></span>
-                      <span className="bank_list_Tag">{item.course_list_name}</span>
-                    </p>
-                  </div>
-                </div>
-              )
-            })
-          }
-        </div>
-        {
-          totalCount > 15 && 
-          <div className="mt30 mb50 edu-txt-center">
-            <Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page}/>
-          </div>
-        }
         </Spin>
       </div>
     )
diff --git a/src/modules/user/usersInfo/InfosBanner.js b/src/modules/user/usersInfo/InfosBanner.js
index f4326759..e84612d7 100644
--- a/src/modules/user/usersInfo/InfosBanner.js
+++ b/src/modules/user/usersInfo/InfosBanner.js
@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
 
-import {Link} from 'react-router-dom';
-import {Tooltip,Menu} from 'antd';
-import {getImageUrl} from 'educoder';
+import { Link } from 'react-router-dom';
+import { Tooltip, Menu } from 'antd';
+import { getImageUrl } from 'educoder';
 
 import "./usersInfo.css"
 import "../../courses/css/members.css"
@@ -10,153 +10,152 @@ import "../../courses/css/Courses.css"
 
 import { LinkAfterLogin } from 'educoder'
 
-class InfosBanner extends Component{
-  constructor(props){
+class InfosBanner extends Component {
+  constructor(props) {
     super(props);
   }
-  render(){
-    let { 
-      data ,
+  render() {
+    let {
+      data,
       id,
       login,
       moduleName,
       current_user,
-     }=this.props;
-     let  is_current=this.props.is_current;
-     let {username}= this.props.match.params;
-     let {pathname}=this.props.location;
-     moduleName=pathname.split("/")[3];
+    } = this.props;
+    let is_current = this.props.is_current;
+    let { username } = this.props.match.params;
+    let { pathname } = this.props.location;
+    moduleName = pathname.split("/")[3];
 
-    // let user_id=this.props.current_user&&this.props.current_user.user_id;
-		// let user_type=this.props.current_user&&this.props.current_user.user_identity;
-		// let targetuserid=this.props.data&&this.props.data.id;
+    let user_id = this.props.current_user && this.props.current_user.user_id;
+    let user_type = this.props.current_user && this.props.current_user.user_identity;
+    let targetuserid = this.props.data && this.props.data.id;
 
-		 // console.log(is_current)
-		 // console.log(current_user)
-		// console.log(current_user.is_teacher)
-		// let shixuntype=false;
-		// let pathstype=false;
-		// let coursestypes=false;
-		// let projectstypes=false;
+    // console.log(is_current)
+    // console.log(current_user)
+    // console.log(current_user.is_teacher)
+    let shixuntype = false;
+    let pathstype = false;
+    let coursestypes = false;
+    if (this.props && this.props.mygetHelmetapi != null) {
+      let shixun = "/shixuns";
+      let paths = "/paths";
+      let courses = "/classrooms";
+      this.props.mygetHelmetapi.navbar.map((item, key) => {
+        var reg = RegExp(item.link);
+        if (shixun.match(reg)) {
+          if (item.hidden === true) {
+            shixuntype = true
+          }
+        }
+        if (paths.match(reg)) {
+          if (item.hidden === true) {
+            pathstype = true
+          }
+        }
+        if (courses.match(reg)) {
+          if (item.hidden === true) {
+            coursestypes = true
+          }
+        }
+      })
+    }
 
-		// if(this.props&&this.props.mygetHelmetapi!=null){
-    //   console.log("this.props", this.props.mygetHelmetapi)
-		// 	let shixun="/shixuns";
-		// 	let paths="/paths";
-		// 	let courses="/courses";
-		// 	let projects = "/projects";
-		// 	this.props.mygetHelmetapi.navbar.map((item,key)=>{
-		// 		var reg = RegExp(item.link);
-		// 		if(shixun.match(reg)){
-		// 			if(item.hidden===true){
-		// 				shixuntype=true
-		// 			}
-		// 		}
-		// 		if(paths.match(reg)){
-		// 			if(item.hidden===true){
-		// 				pathstype=true
-		// 			}
-		// 		}
-		// 		if(courses.match(reg)){
-		// 			if(item.hidden===true){
-		// 				coursestypes=true
-		// 			}
-		// 		}
-    //     if(projects.match(reg)){
-    //       if(item.hidden===true){
-    //         projectstypes=true
-    //       }
-    //     }
-		// 	})
-		// }
-
-    return(
+    return (
       <div className="bannerPanel mb60">
         <div className="educontent">
           <div className="clearfix color-white mb25">
-            <p className="myPhoto mr20 fl"><img alt="头像" src={data && `${getImageUrl('images/'+data.avatar_url)}`}/></p>
+            <p className="myPhoto mr20 fl"><img alt="头像" src={data && `${getImageUrl('images/' + data.avatar_url)}`} /></p>
             <div className="fl">
               <p className="clearfix mt20">
-                <span className="username task-hide" style={{"maxWidth":'370px'}}>
-                  {data && data.name}
-                </span>
+                <span className="username task-hide" style={{ "maxWidth": '370px' }}>{data && data.name}</span>
                 {/*{*/}
-                  {/*data && data.identity &&*/}
-                  {/*<span className="userpost"><label>{data && data.identity}</label></span>*/}
+                {/*data && is_current == false && data.identity =="学生" ? "" : */}
+                {/*<span className="userpost"><label>{data && data.identity}</label></span>*/}
                 {/*}*/}
               </p>
-              {/*{*/}
-                {/*data && data.brief_introduction &&*/}
-                {/*<p className="mt15 text-grey-e">{data.brief_introduction}</p>*/}
-              {/*}*/}
-              {/*<p className="mt15">*/}
-                {/*<Tooltip placement='bottom' title={ data && data.professional_certification ?"已职业认证":"未职业认证"}>*/}
-                  {/*<i className={ data && data.professional_certification ? "iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-blue mr20 ml2":"iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-B8 mr20 ml2"}></i>*/}
-                {/*</Tooltip>*/}
-                {/*<Tooltip placement='bottom' title={ data && data.authentication ?"已实名认证":"未实名认证"}>*/}
-                  {/*<i className={ data && data.authentication ? "iconfont icon-renzhengshangjia font-18 user-colorgrey-blue":"iconfont icon-renzhengshangjia font-18 user-colorgrey-B8"}></i>*/}
-                {/*</Tooltip>*/}
-              {/*</p>*/}
+              <p className="mt15">
+                <Tooltip placement='bottom' title={data && data.professional_certification ? "已职业认证" : "未职业认证"}>
+                  <i className={data && data.professional_certification ? "iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-blue mr20 ml2" : "iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-B8 mr20 ml2"}></i>
+                </Tooltip>
+                <Tooltip placement='bottom' title={data && data.authentication ? "已实名认证" : "未实名认证"}>
+                  <i className={data && data.authentication ? "iconfont icon-renzhengshangjia font-18 user-colorgrey-blue" : "iconfont icon-renzhengshangjia font-18 user-colorgrey-B8"}></i>
+                </Tooltip>
+              </p>
             </div>
             <div className="fr">
               <div className="fl headtab mt20">
-                <span>全部项目数</span>
-                <a style={{"cursor": "default"}}>{data && data.projects_count}</a>
+                <span>{is_current ? "我" : "TA"}的经验值</span>
+                <a style={{ "cursor": "default" }}>{data && data.experience}</a>
               </div>
-              {/*<div class="fl headtab mt20">*/}
-                {/*<span>{is_current ? "我":"TA"}的经验值</span>*/}
-                {/*<a style={{"cursor":"default"}}>{data && data.experience}</a>*/}
-              {/*</div> */}
-              {/*<div class="fl headtab mt20 pr leftTransform pl20">*/}
-                {/*<span>{is_current ? "我":"TA"}的金币</span>*/}
-                {/*<a style={{"cursor":"default"}}>{data && data.grade}</a>*/}
-              {/*</div> */}
-              {/*{*/}
-                {/*is_current ? */}
-                {/*<span className="fl mt35 ml60">*/}
-                  {/*{*/}
-                    {/*data && data.attendance_signed ? */}
-                    {/*<span className="user_default_btn user_grey_btn font-18">已签到</span>*/}
-                    {/*:*/}
-                    {/*<a herf="javascript:void(0);" onClick={this.props.signFor} className="user_default_btn user_yellow_btn fl font-18">签到</a>*/}
-                  {/*}*/}
-                {/*</span> */}
-                {/*:*/}
-                {/*<span className="fl mt35 ml60">*/}
-                  {/*<LinkAfterLogin */}
-                    {/*{...this.props} */}
-                    {/*{...this.state} */}
-                    {/*className="user_default_btn user_yellow_btn fl font-18" */}
-                    {/*to={`/messages/${login}/message_detail?target_ids=${id}`}*/}
-                  {/*>*/}
-                  {/*私信*/}
-                  {/*</LinkAfterLogin>*/}
-                {/*</span>*/}
-              {/*}*/}
+              <div className="fl headtab mt20 pr leftTransform pl20">
+                <span>{is_current ? "我" : "TA"}的金币</span>
+                <a style={{ "cursor": "default" }}>{data && data.grade}</a>
+              </div>
+              {
+                is_current ?
+                  <span className="fl mt35 ml60">
+                    {
+                      data && data.attendance_signed ?
+                        <span className="user_default_btn user_grey_btn font-18">已签到</span>
+                        :
+                        <a herf="javascript:void(0);" onClick={this.props.signFor} className="user_default_btn user_yellow_btn fl font-18">签到</a>
+                    }
+                  </span>
+                  :
+                  <span className="fl mt35 ml60">
+                    <LinkAfterLogin
+                      {...this.props}
+                      {...this.state}
+                      className="user_default_btn user_yellow_btn fl font-18"
+                      to={`/messages/${login}/message_detail?target_ids=${id}`}
+                    >
+                      私信
+                  </LinkAfterLogin>
+                  </span>
+              }
             </div>
           </div>
           <div className="userNav">
-						{/*{coursestypes===true?"":<li className={`${moduleName == 'courses' ||moduleName == undefined ? 'active' : '' }`}>*/}
-              {/*<Link*/}
-                {/*onClick={() => this.setState({moduleName: 'courses'})}*/}
-                {/*to={`/users/${username}/courses`}>翻转课堂</Link>*/}
-            {/*</li>}*/}
-						{/*{shixuntype===true?"":<li className={`${moduleName == 'shixuns' ? 'active' : '' }`}>*/}
-              {/*<Link*/}
-                {/*onClick={() => this.setState({moduleName: 'shixuns'})}*/}
-                {/*to={`/users/${username}/shixuns`}>实训项目</Link>*/}
-            {/*</li>}*/}
-						{/*{pathstype===true?"":<li className={`${moduleName == 'paths' ? 'active' : '' }`}>*/}
-              {/*<Link */}
-                {/*onClick={() => this.setState({moduleName: 'paths'})}*/}
-                {/*to={`/users/${username}/paths`}>实践课程</Link>*/}
-            {/*</li>}*/}
-            <li className={`${moduleName === 'projects' ? 'active' : '' }`}>
+            {coursestypes === true ? "" : <li className={`${moduleName == 'classrooms' || moduleName == undefined ? 'active' : ''}`}>
               <Link
-                onClick={() => this.setState({moduleName: 'projects'})}
+                onClick={() => this.setState({ moduleName: 'classrooms' })}
+                to={`/users/${username}/classrooms`}>教学课堂</Link>
+            </li>}
+            {shixuntype === true ? "" : <li className={`${moduleName == 'shixuns' ? 'active' : ''}`}>
+              <Link
+                onClick={() => this.setState({ moduleName: 'shixuns' })}
+                to={`/users/${username}/shixuns`}>实训项目</Link>
+            </li>}
+            {pathstype === true ? "" : <li className={`${moduleName == 'paths' ? 'active' : ''}`}>
+              <Link
+                onClick={() => this.setState({ moduleName: 'paths' })}
+                to={`/users/${username}/paths`}>实践课程</Link>
+            </li>}
+            {this.props.user && this.props.user.main_site === true ? <li className={`${moduleName == 'projects' ? 'active' : ''}`}>
+              <Link
+                onClick={() => this.setState({ moduleName: 'projects' })}
                 to={`/users/${username}/projects`}>开发项目</Link>
-            </li>
+            </li> : ""}
+            {/*<li className={`${moduleName == 'package' ? 'active' : '' }`}>*/}
+            {/*  <Link*/}
+            {/*    onClick={() => this.setState({moduleName: 'package'})}*/}
+            {/*    to={`/users/${username}/package`}>众包</Link>*/}
+            {/*</li>*/}
+            {this.props.user && this.props.user.main_site === true ? ((is_current && current_user && current_user.is_teacher) || current_user && current_user.admin)
+              && <li className={`${moduleName == 'videos' ? 'active' : ''}`}>
+                <Link
+                  onClick={() => this.setState({ moduleName: 'videos' })}
+                  to={`/users/${username}/videos`}>视频</Link>
+              </li> : ""}
 
+            {/*自己的主页且不是学生显示题库按钮*/}
+            {this.props.user && this.props.user.main_site === true ? (is_current && current_user && current_user.is_teacher)
+              && <li className={`${moduleName == 'topics' ? 'active' : ''}`}>
+                <Link
+                  onClick={() => this.setState({ moduleName: 'topics' })}
+                  to={`/users/${username}/topics/personal`}>题库</Link>
+              </li> : ""}
 
           </div>
         </div>
@@ -164,4 +163,4 @@ class InfosBanner extends Component{
     )
   }
 }
-export default InfosBanner;
\ No newline at end of file
+export default InfosBanner;
diff --git a/src/modules/user/usersInfo/InfosCourse.js b/src/modules/user/usersInfo/InfosCourse.js
index 50d9e730..eba1ee15 100644
--- a/src/modules/user/usersInfo/InfosCourse.js
+++ b/src/modules/user/usersInfo/InfosCourse.js
@@ -1,62 +1,58 @@
 import React, { Component } from 'react';
-import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-import {Tooltip, Menu, Pagination, Spin, Dropdown} from 'antd';
-import Loadable from 'react-loadable';
-import Loading from '../../../Loading';
+import { Tooltip, Menu, Pagination, Spin, Dropdown } from 'antd';
 import axios from 'axios';
 import NoneData from '../../courses/coursesPublic/NoneData'
-import {getImageUrl} from 'educoder';
-import { TPMIndexHOC } from '../../tpm/TPMIndexHOC';
-import { CNotificationHOC } from '../../courses/common/CNotificationHOC'
+import { getImageUrl } from 'educoder';
 import "./usersInfo.css"
 import Create from './publicCreatNew'
 
-class InfosCourse extends Component{
-  constructor(props){
+class InfosCourse extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      category:undefined,
-      status:undefined,
-      page:1,
-      per_page:16,
+    this.state = {
+      category: undefined,
+      status: undefined,
+      page: 1,
+      per_page: 16,
       sort_by: "updated_at",
       sort_direction: "desc",
-      totalCount:undefined,
-      data:undefined,
-      isSpin:false
+      totalCount: undefined,
+      data: undefined,
+      isSpin: false
     }
   }
 
-  componentDidMount=()=>{
+  componentDidMount = () => {
     this.setState({
-      isSpin:true
+      isSpin: true
     })
-    let {category, status, page, sort_by, sort_direction} = this.state;
+    let { category, status, page, sort_by, sort_direction } = this.state;
     this.getCourses(category, status, page, sort_by, sort_direction);
   }
 
   getCourses = (category, status, page, sort_by, sort_direction) => {
-    let url=`/users/${this.props.match.params.username}/courses.json`;
-    axios.get((url),{params:{
-      category,
-      status,
-      page,
+    let url = `/users/${this.props.match.params.username}/courses.json`;
+    axios.get((url), {
+      params: {
+        category,
+        status,
+        page,
         sort_by,
         sort_direction,
-      per_page: this.props.is_current && category && page ==1?17:16
-    }}).then((result)=>{
-      if(result){
-        console.log("请求成功");
+        per_page: this.props.is_current && category && page == 1 ? 17 : 16
+      }
+    }).then((result) => {
+      if (result) {
+
         this.setState({
-          totalCount:result.data.count,
-          data:result.data,
+          totalCount: result.data.count,
+          data: result.data,
           sort_direction: sort_direction,
           sort_by: sort_by,
-          isSpin:false
+          isSpin: false
         })
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
       this.setState({
         isSpin: false
@@ -65,38 +61,38 @@ class InfosCourse extends Component{
   }
 
   //切换种类
-  changeCategory=(cate)=>{
+  changeCategory = (cate) => {
     this.setState({
-      category:cate,
-      page:1,
-      isSpin:true
+      category: cate,
+      page: 1,
+      isSpin: true
     })
-    let {status, sort_by, sort_direction} = this.state;
+    let { status, sort_by, sort_direction } = this.state;
     this.getCourses(cate, status, 1, sort_by, sort_direction);
   }
   //切换状态
-  changeStatus=(status)=>{
+  changeStatus = (status) => {
     this.setState({
-      status:status,
-      page:1,
-      isSpin:true
+      status: status,
+      page: 1,
+      isSpin: true
     })
-    let {category, sort_by, sort_direction} = this.state;
+    let { category, sort_by, sort_direction } = this.state;
     this.getCourses(category, status, 1, sort_by, sort_direction);
   }
   //切换页数
-  changePage=(page)=>{
+  changePage = (page) => {
     this.setState({
       page,
-      isSpin:true
+      isSpin: true
     })
-    let {category, status, sort_by, sort_direction} = this.state;
+    let { category, status, sort_by, sort_direction } = this.state;
     this.getCourses(category, status, page, sort_by, sort_direction);
   }
 
   // 进入课堂
-  turnToCourses=(url,flag)=>{
-    if(flag){
+  turnToCourses = (url, flag) => {
+    if (flag) {
       this.props.history.push(url);
     }
   }
@@ -106,20 +102,16 @@ class InfosCourse extends Component{
     this.setState({
       isSpin: true
     });
-    let {category, status, page, sort_direction} = this.state;
+    let { category, status } = this.state;
     this.getCourses(category, status, 1, sort_by, "desc");
   }
 
   updatedlists(sort_directions, i) {
-    // console.log("updatedlistssort_direction");
-    // console.log(sort_direction);
-    // console.log(i);
-    //是否是倒序
     this.setState({
       isSpin: true
     });
 
-    let {category, status, page, sort_by, sort_direction} = this.state;
+    let { category, status, page, sort_by, sort_direction } = this.state;
     let sort_directiony = sort_directions;
     if (sort_directions === "asc") {
       if (sort_directions === sort_direction) {
@@ -134,8 +126,8 @@ class InfosCourse extends Component{
     this.getCourses(category, status, page, sort_by, sort_directiony);
   }
 
-  render(){
-    let{
+  render() {
+    let {
       category,
       status,
       page,
@@ -145,9 +137,8 @@ class InfosCourse extends Component{
       sort_by,
       sort_direction
     } = this.state;
-    let  is_current=this.props.is_current;
+    let is_current = this.props.is_current;
 
-      // console.log(this.props.current_user&&this.props.current_user.user_identity==="学生")
     const menu = (
       <Menu>
         <Menu.Item onClick={() => this.updatedlist("updated_at")}>
@@ -159,9 +150,8 @@ class InfosCourse extends Component{
 
       </Menu>
     );
-    console.log("InfosCourse");
-    console.log(status);
-    return(
+
+    return (
       <div className="educontent">
         <Spin size="large" spinning={isSpin}>
           <style>
@@ -209,16 +199,16 @@ class InfosCourse extends Component{
               `
             }
           </style>
-        <div className="white-panel edu-back-white pt20 pb20 clearfix ">
-          <li className={category ? " font-16 whitepanelyslli" : "active font-16 whitepanelyslli"}><a
-            href="javascript:void(0)" onClick={() => this.changeCategory()} className="font-16 w32">全部</a></li>
-          <li className={category == "manage" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
-						href="javascript:void(0)" onClick={() => this.changeCategory("manage")}
-						className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}管理的</a></li>
-          <li className={category == "study" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
-						href="javascript:void(0)" onClick={() => this.changeCategory("study")}
-						className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}学习的</a></li>
-        </div>
+          <div className="white-panel edu-back-white pt20 pb20 clearfix ">
+            <li className={category ? " font-16 whitepanelyslli" : "active font-16 whitepanelyslli"}><a
+              onClick={() => this.changeCategory()} className="font-16 w32">全部</a></li>
+            <li className={category == "manage" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
+              onClick={() => this.changeCategory("manage")}
+              className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}管理的</a></li>
+            <li className={category == "study" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
+              onClick={() => this.changeCategory("study")}
+              className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}学习的</a></li>
+          </div>
 
           <style>
             {
@@ -236,46 +226,46 @@ class InfosCourse extends Component{
              `
             }
           </style>
-        {
-          is_current &&
-          <div className="edu-back-white padding10-30 clearfix secondNavs  bor-top-greyE">
-            <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a href="javascript:void(0)"
-                                                                                         onClick={() => this.changeStatus()}
-                                                                                         className="w32">全部</a></li>
-            <li className={status == "processing" ? "active whitepanelysllis" : "whitepanelysllis"}><a
-              href="javascript:void(0)" onClick={() => this.changeStatus("processing")} className="w66">正在进行</a></li>
-            <li className={status == "end" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-              href="javascript:void(0)" onClick={() => this.changeStatus("end")} className="w66">已结束</a></li>
-          </div>
-        }
-					<p className=" clearfix font-12 " style={{
+          {
+            is_current &&
+            <div className="edu-back-white padding10-30 clearfix secondNavs  bor-top-greyE">
+              <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a
+                onClick={() => this.changeStatus()}
+                className="w32">全部</a></li>
+              <li className={status == "processing" ? "active whitepanelysllis" : "whitepanelysllis"}><a
+                onClick={() => this.changeStatus("processing")} className="w66">正在进行</a></li>
+              <li className={status == "end" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("end")} className="w66">已结束</a></li>
+            </div>
+          }
+          <p className=" clearfix font-12 " style={{
             lineHeight: "41px",
-						marginTop: "10px",
+            marginTop: "10px",
           }}>
-          <span className="fl color-grey-9">共参与{totalCount}个{category?category=="manage"?"发布":"学习":"课堂"}</span>
+            <span className="fl color-grey-9">共参与{totalCount}个{category ? category == "manage" ? "发布" : "学习" : "课堂"}</span>
             <sapn className="relativef color-grey-9 fr"
-                  style={{
-                    display: "flex",
-                    flexDirection: "column",
-                    height: "40px",
-                    lineHeight: "40px",
-                  }}
-            >
-            <span
               style={{
+                display: "flex",
                 flexDirection: "column",
-                textAlign: "center",
-                height: "10px",
-                lineHeight: "10px",
-                display: "table",
-                marginTop: "9px",
+                height: "40px",
+                lineHeight: "40px",
               }}
             >
-                 <i className={sort_direction === "asc" ?
-                   "iconfont icon-sanjiaoxing-up font-12  color-blue h10 " : "iconfont icon-sanjiaoxing-up font-12 h10"}
-                    onClick={() => this.updatedlists("asc", 1)}></i>
+              <span
+                style={{
+                  flexDirection: "column",
+                  textAlign: "center",
+                  height: "10px",
+                  lineHeight: "10px",
+                  display: "table",
+                  marginTop: "9px",
+                }}
+              >
+                <i className={sort_direction === "asc" ?
+                  "iconfont icon-sanjiaoxing-up font-12  color-blue h10 " : "iconfont icon-sanjiaoxing-up font-12 h10"}
+                  onClick={() => this.updatedlists("asc", 1)}></i>
 
-            </span>
+              </span>
 
               <span
                 style={{
@@ -286,22 +276,22 @@ class InfosCourse extends Component{
                   display: "table",
                 }}
               >
-                          <i className={sort_direction === "desc" ?
-                            "iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue h10" : "iconfont icon-sanjiaoxing-down font-12 yslbottomsj h10"}
-                             onClick={() => this.updatedlists("desc", 2)}></i>
-            </span>
+                <i className={sort_direction === "desc" ?
+                  "iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue h10" : "iconfont icon-sanjiaoxing-down font-12 yslbottomsj h10"}
+                  onClick={() => this.updatedlists("desc", 2)}></i>
+              </span>
             </sapn>
             <Dropdown overlay={menu}>
-										<span className="fr color-grey-9 mr10 pointer " style={{
-                      display: "flex",
-                      flexDirection: "initial",
-                    }}>
-											<span>{sort_by === "updated_at" ? '最新动态' : sort_by === "created_at" ? '最新创建' : ""}</span>
+              <span className="fr color-grey-9 mr10 pointer " style={{
+                display: "flex",
+                flexDirection: "initial",
+              }}>
+                <span>{sort_by === "updated_at" ? '最新动态' : sort_by === "created_at" ? '最新创建' : ""}</span>
 
-										</span>
+              </span>
             </Dropdown>
 
-        </p>
+          </p>
           <style>
             {
               `
@@ -309,87 +299,93 @@ class InfosCourse extends Component{
               `
             }
           </style>
-        <div className="square-list clearfix">
-          {/* 289 */}
-          {
-            page == 1 && is_current && !category &&
-						this.props.current_user && this.props.current_user.user_identity != "学生" ? 
-              <Create href={"/courses/new"} name={"新建课堂"} index="1"></Create> : ""
-          }
-          {
-            (!data || (data && data.courses.length === 0)) && (category || (!category && this.props.current_user && this.props.current_user.user_identity == "学生")) && <NoneData></NoneData>
-          }
-          {
-            data && data.courses && data.courses.map((item,key)=>{
-              return(
-                <div className="square-Item" onClick={()=>this.turnToCourses(`${item.first_category_url}`,item.can_visited)} style={{"cursor": "pointer",height:"289px"}}>
-                  {
-                    item.is_public == 1 &&
-                    <React.Fragment>
-                      <div className={key == 0 ?"publicpart orangeBlack":"publicpart"}></div>
-                      <span className="smalltrangle"></span>
-                      <span className="publicword">公开</span>
-                    </React.Fragment>
-                  }
-                  {
-                    item.can_visited ==false?
-                    <div className="closeSquare">
-                      <img src={getImageUrl("images/educoder/icon/lockclose.svg")} className="mt80 mb25"/>
-                      <p className="font-14 color-white">非成员不能访问</p>
-                    </div>:""
-                  }
+          <div className="square-list clearfix">
+            {/* 289 */}
+            {
+              page == 1 && is_current && !category &&
+                this.props.current_user && this.props.current_user.user_identity != "学生" ?
+                <Create href={"/classrooms/new"} name={"新建课堂"} index="1"></Create> : ""
+            }
+            {
+              (!data || (data && data.courses.length === 0)) && (category || (!category && this.props.current_user && this.props.current_user.user_identity == "学生")) && <NoneData></NoneData>
+            }
+            {
+              data && data.courses && data.courses.map((item, key) => {
+                return (
+                  <div className="square-Item" key={key} onClick={() => this.turnToCourses(`${item.first_category_url}`, item.can_visited)} style={{ "cursor": "pointer" }}>
+                    {
+                      item.is_public == 1 &&
+                      <React.Fragment>
+                        <div className={key == 0 ? "publicpart orangeBlack" : "publicpart"}></div>
+                        <span className="smalltrangle"></span>
+                        <span className="publicword">公开</span>
+                      </React.Fragment>
+                    }
+                    {
+                      item.can_visited == false ?
+                        <div className="closeSquare">
+                          <img src={getImageUrl("images/educoder/icon/lockclose.svg")} className="mt80 mb25" />
+                          <p className="font-14 color-white">非成员不能访问</p>
+                        </div> : ""
+                    }
 
-                  <div className="substance">
-                    <p className="subName font-16">
-                      <span>{item.name}</span>
-                    </p>
-                    <span><img alt="用户" className="radius mt15" height="60" src={getImageUrl('images/'+`${item.teacher && item.teacher.avatar_url}`)} width="60"/></span>
-                    <p className="font-14 mt10 task-hide"><span>{item.teacher && item.teacher.real_name}</span></p>
-                    <p className="font-16 mb15 task-hide mt10"><span className="color-grey-98">{item&&item.school}</span></p>
-                  </div>
-                  <div className="edu-txt-center course-bottom">
-                    <div className="inline color-grey-6">
-											{item.visits>0?<span  className="fl ml10 mr10 squareIconSpan">
-                                  <Tooltip placement="bottom" title="访问量">
-                                        <i className="iconfont icon-liulanyan fl mr3"></i>{item.visits}
-                                  </Tooltip>
+                    <div className="substance">
+                      <p className="subName font-16">
+                        <span>{item.name}</span>
+                      </p>
+                      <span><img alt="用户" className="radius mt15" height="50" src={getImageUrl('images/' + `${item.teacher && item.teacher.avatar_url}`)} width="50" /></span>
+                      <p className="font-14 mt10 task-hide"><span>{item.teacher && item.teacher.real_name}</span></p>
+                      <p className="font-16 mb15 task-hide mt10"><span className="color-grey-98">{item && item.school}</span></p>
+                      <div className="task-hide" style={{ height: 30 }}>
+                        {item.teacher_users.length === 0 ? '' :
+                          <span className="color-grey-98">协作老师：
+                                {item.teacher_users.map((iem, idx) => {
+                            return (
+                              <span v-if={idx < 3} style={{ marginLeft: 5 }}>{iem} </span>
+                            )
+                          })
+                            }
+                          </span>
+                        }
+                      </div>
 
-                                </span>:""}
+                    </div>
+                    <div className="edu-txt-center course-bottom">
+                      <div className="inline color-grey-6">
+                        {item.visits > 0 ? <span className="fl ml10 mr10 squareIconSpan">
+                          <Tooltip placement="bottom" title="访问量">
+                            <i className="iconfont icon-liulanyan fl mr3"></i>{item.visits}
+                          </Tooltip>
 
-                      {
-                        item.members_count > 0 &&
-                        <Tooltip placement="bottom" title="成员">
-                          <span className="fl ml10 mr10 squareIconSpan">
-                          <i className="iconfont icon-chengyuan fl mr3" data-tip-down="成员"></i>{item.members_count}</span>
-                        </Tooltip>
-                      }
-                      {
-                        item.homework_commons_count > 0 &&
-                        <Tooltip placement="bottom" title="作业">
-                          <span className="fl ml10 mr10 squareIconSpan">
-                          <i className="iconfont icon-zuoye fl mr3" data-tip-down="作业"></i>{item.homework_commons_count}</span>
-                        </Tooltip>
-                      }
-                      {/*{*/}
-                        {/*item.attachments_count > 0 && */}
-                        {/*<Tooltip placement="bottom" title="资源">*/}
-                          {/*<span className="fl ml10 mr10 squareIconSpan">*/}
-                          {/*<i className="iconfont icon-ziyuan fl mr3" data-tip-down="资源"></i>{item.attachments_count}</span>*/}
-                        {/*</Tooltip>*/}
-                      {/*}*/}
+                        </span> : ""}
+
+                        {
+                          item.members_count > 0 &&
+                          <Tooltip placement="bottom" title="成员">
+                            <span className="fl ml10 mr10 squareIconSpan">
+                              <i className="iconfont icon-chengyuan fl mr3" data-tip-down="成员"></i>{item.members_count}</span>
+                          </Tooltip>
+                        }
+                        {
+                          item.homework_commons_count > 0 &&
+                          <Tooltip placement="bottom" title="作业">
+                            <span className="fl ml10 mr10 squareIconSpan">
+                              <i className="iconfont icon-zuoye fl mr3" data-tip-down="作业"></i>{item.homework_commons_count}</span>
+                          </Tooltip>
+                        }
+                      </div>
                     </div>
                   </div>
-                </div>
-              )
-            })
-          }
-        </div>
-        {
-          totalCount > 15 &&
-          <div className="mt30 mb50 edu-txt-center">
-            <Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page}/>
+                )
+              })
+            }
           </div>
-        }
+          {
+            totalCount > 15 &&
+            <div className="mt30 mb50 edu-txt-center">
+              <Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page} />
+            </div>
+          }
         </Spin>
       </div>
     )
diff --git a/src/modules/user/usersInfo/InfosPackage.js b/src/modules/user/usersInfo/InfosPackage.js
index bb263715..903353e2 100644
--- a/src/modules/user/usersInfo/InfosPackage.js
+++ b/src/modules/user/usersInfo/InfosPackage.js
@@ -1,153 +1,155 @@
 import React, { Component } from 'react';
 import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-import {Tooltip,Menu,Pagination,Spin} from 'antd';
+import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
+import { Tooltip, Menu, Pagination, Spin } from 'antd';
 import axios from 'axios';
-import {getImageUrl} from 'educoder';
+import { getImageUrl } from 'educoder';
 import Modals from '../../modals/Modals';
 import NoneData from '../../courses/coursesPublic/NoneData';
 import "./usersInfo.css"
 import moment from 'moment';
-let categorylist=[
-	{name:"全部",value:undefined},
-	{name:"前端开发",value:"front"},
-	{name:"后端开发",value:"backend"},
-	{name:"移动开发",value:"mobile"},
-	{name:"数据库",value:"database"},
-	{name:"云计算和大数据",value:"cloud_compute_and_big_data"},
-	{name:"人工智能",value:"ai"},
-	{name:"运维与测试",value:"devops_and_test"},
-	{name:"其他",value:"other"},
+let categorylist = [
+	{ name: "全部", value: undefined },
+	{ name: "前端开发", value: "front" },
+	{ name: "后端开发", value: "backend" },
+	{ name: "移动开发", value: "mobile" },
+	{ name: "数据库", value: "database" },
+	{ name: "云计算和大数据", value: "cloud_compute_and_big_data" },
+	{ name: "人工智能", value: "ai" },
+	{ name: "运维与测试", value: "devops_and_test" },
+	{ name: "其他", value: "other" },
 ]
 //
-function setcategorylist(val){
-	let vals=""
-	categorylist.some((item,key)=> {
-			if (item.name === val) {
-				vals=item.value
-				return true
-			}
+function setcategorylist(val) {
+	let vals = ""
+	categorylist.some((item, key) => {
+		if (item.name === val) {
+			vals = item.value
+			return true
 		}
+	}
 	)
 
 	return vals
 }
-class InfosPackage extends Component{
-	constructor(props){
+class InfosPackage extends Component {
+	constructor(props) {
 		super(props);
-		this.state={
-			category:undefined,
-			status:undefined,
-			page:1,
-			per_page:20,
-			sort_direction:'desc',
-			totalCount:undefined,
-			data:undefined,
-			isSpin:false
+		this.state = {
+			category: undefined,
+			status: undefined,
+			page: 1,
+			per_page: 20,
+			sort_direction: 'desc',
+			totalCount: undefined,
+			data: undefined,
+			isSpin: false
 		}
 	}
 
-	componentDidMount=()=>{
+	componentDidMount = () => {
 		this.setState({
-			isSpin:true
+			isSpin: true
 		})
-		let{category,status,page}=this.state;
-		this.getCourses(category,status,page);
+		let { category, status, page } = this.state;
+		this.getCourses(category, status, page);
 	}
 
-	getCourses=(category,status,page)=>{
-		let url=`/users/${this.props.match.params.username}/project_packages.json`;
-		axios.get((url),{params:{
+	getCourses = (category, status, page) => {
+		let url = `/users/${this.props.match.params.username}/project_packages.json`;
+		axios.get((url), {
+			params: {
 				category,
 				status,
 				page,
-				sort_by:"published_at",
-				sort_direction:'desc',
-				per_page:20
-			}}).then((result)=>{
-			if(result){
+				sort_by: "published_at",
+				sort_direction: 'desc',
+				per_page: 20
+			}
+		}).then((result) => {
+			if (result) {
 				this.setState({
-					totalCount:result.data.count,
-					data:result.data,
-					isSpin:false
+					totalCount: result.data.count,
+					data: result.data,
+					isSpin: false
 				})
 			}
-		}).catch((error)=>{
+		}).catch((error) => {
 			console.log(error);
 		})
 	}
 
 	//切换种类
-	changeCategory=(cate)=>{
+	changeCategory = (cate) => {
 		this.setState({
-			category:cate,
-			page:1,
-			isSpin:true
+			category: cate,
+			page: 1,
+			isSpin: true
 		})
-		let{status}=this.state;
-		this.getCourses(cate,status,1);
+		let { status } = this.state;
+		this.getCourses(cate, status, 1);
 	}
 	//切换状态
-	changeStatus=(status)=>{
+	changeStatus = (status) => {
 		this.setState({
-			status:status,
-			page:1,
-			isSpin:true
+			status: status,
+			page: 1,
+			isSpin: true
 		})
-		let{category}=this.state;
-		this.getCourses(category,status,1);
+		let { category } = this.state;
+		this.getCourses(category, status, 1);
 	}
 	//切换页数
-	changePage=(page)=>{
+	changePage = (page) => {
 		this.setState({
 			page,
-			isSpin:true
+			isSpin: true
 		})
-		let{category,status}=this.state;
-		this.getCourses(category,status,page);
+		let { category, status } = this.state;
+		this.getCourses(category, status, page);
 	}
 
 	// 进入课堂
-	turnToCourses=(url,flag)=>{
-		if(flag){
+	turnToCourses = (url, flag) => {
+		if (flag) {
 			this.props.history.push(url);
 		}
 	}
 
 
-	delectprojectModal=(id)=>{
-			this.setState({
-				Modalstype: true,
-				Modalstopval: '是否确认删除?',
-				ModalSave: () => this.delectproject(id),
-				ModalCancel: this.cancelProject
-			})
+	delectprojectModal = (id) => {
+		this.setState({
+			Modalstype: true,
+			Modalstopval: '是否确认删除?',
+			ModalSave: () => this.delectproject(id),
+			ModalCancel: this.cancelProject
+		})
 	}
 
-	cancelProject=()=>{
+	cancelProject = () => {
 		this.setState({
 			Modalstype: false,
 		})
 	}
 
-	delectproject=(id)=>{
+	delectproject = (id) => {
 
-		let {category,status}=this.state;
-		debugger
-		let url=`/project_packages/${id}.json`
+		let { category, status } = this.state;
+
+		let url = `/project_packages/${id}.json`
 
 		axios.delete(url).then((response) => {
-				if (response.data.status == 0) {
-					this.getCourses(category,status,1);
-				}
-			})
+			if (response.data.status == 0) {
+				this.getCourses(category, status, 1);
+			}
+		})
 			.catch(function (error) {
 				console.log(error);
 			});
 		this.cancelProject();
 	}
-	render(){
-		let{
+	render() {
+		let {
 			category,
 			status,
 			page,
@@ -155,10 +157,10 @@ class InfosPackage extends Component{
 			totalCount,
 			isSpin
 		} = this.state;
-		let  is_current=this.props.is_current;
+		let is_current = this.props.is_current;
 
 		// console.log(data)
-		return(
+		return (
 			<div className="educontent mb50">
 				{/*提示*/}
 				<Modals
@@ -201,12 +203,12 @@ class InfosPackage extends Component{
 					</style>
 					<div className="white-panel edu-back-white pt20 pb20 clearfix ">
 						<li className={category ? " font-16 whitepanelyslli" : "active font-16 whitepanelyslli"}><a
-							href="javascript:void(0)" onClick={() => this.changeCategory()} className="font-16 w32">全部</a></li>
+							onClick={() => this.changeCategory()} className="font-16 w32">全部</a></li>
 						<li className={category == "manage" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
-							href="javascript:void(0)" onClick={() => this.changeCategory("manage")}
+							onClick={() => this.changeCategory("manage")}
 							className="font-16 w66">{is_current ? "我" : "TA"}管理的</a></li>
 						<li className={category == "study" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
-							href="javascript:void(0)" onClick={() => this.changeCategory("study")}
+							onClick={() => this.changeCategory("study")}
 							className="font-16 w66">{is_current ? "我" : "TA"}学习的</a></li>
 					</div>
 					<style>
@@ -226,7 +228,7 @@ class InfosPackage extends Component{
 						}
 					</style>
 					{
-						category=="manage"?
+						category == "manage" ?
 							<div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
 								<li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a
 									onClick={() => this.changeStatus()} className="w32">全部</a></li>
@@ -236,15 +238,15 @@ class InfosPackage extends Component{
 									onClick={() => this.changeStatus("bidding")} className="w60">竞标中</a></li>
 								<li className={status == "finished" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
 									onClick={() => this.changeStatus("finished")} className="w60">已完成</a></li>
-						</div>:	category=="bidden"?
-							<div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
-								<li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a
-									onClick={() => this.changeStatus()} className="w32">全部</a></li>
-								<li className={status == "bidding_lost" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-									onClick={() => this.changeStatus("bidding_lost")} className="w60">未中标</a></li>
-								<li className={status == "bidding_won" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-									onClick={() => this.changeStatus("bidding_won")} className="w60">已中标</a></li>
-							</div>:""
+							</div> : category == "bidden" ?
+								<div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
+									<li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a
+										onClick={() => this.changeStatus()} className="w32">全部</a></li>
+									<li className={status == "bidding_lost" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+										onClick={() => this.changeStatus("bidding_lost")} className="w60">未中标</a></li>
+									<li className={status == "bidding_won" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+										onClick={() => this.changeStatus("bidding_won")} className="w60">已中标</a></li>
+								</div> : ""
 					}
 					<p className="pl25 pr25 clearfix font-12 mb20 mt20">
 						<span className="fl color-grey-9">共{totalCount}个</span>
@@ -259,87 +261,88 @@ class InfosPackage extends Component{
 
 					{/*type: "bidden"*/}
 
-					{data===undefined?<NoneData></NoneData>:data.project_packages.length===0?<NoneData></NoneData>:data.project_packages.map((item,key)=>{
-					return(
-						<div className="educontent project-packages-list" key={key}>
-							<div className="project-package-item with-operator project-package-11">
+					{data === undefined ? <NoneData></NoneData> : data.project_packages.length === 0 ? <NoneData></NoneData> : data.project_packages.map((item, key) => {
+						return (
+							<div className="educontent project-packages-list" key={key}>
+								<div className="project-package-item with-operator project-package-11">
+
+									<div className="item-image">
+										<img alt="图片" src={`/images/educoder/project_packages/${setcategorylist(item.category_name)}.png`} />
+									</div>
+
+									<div className="item-body">
+										<div className="item-head">
+											<div className="item-head-title" title={item.title}>
+												<a href={`/crowdsourcing/${item.id}`}>{item.title}</a>
+											</div>
+
+											<div className="item-head-tags">
+												{item.bidden_status === "pending" ? <span className="pending">竞标中</span> : ""}
+												{item.bidden_status === "bidding_won" ? <span className="bidding_won">已中标</span> : ""}
+												{item.bidden_status === "bidding_lost" ? <span className="bidding_lost">未中标</span> : ""}
+											</div>
+
+											<div className="item-head-blank"></div>
+											<div className="item-head-price mtf15">
+												{item.min_price === null ? "" : <span>￥{item.min_price}</span>}
+												{item.max_price === null || item.min_price === null ? "" : <span>~</span>}
+												{item.max_price === null ? "" : <span>￥{item.max_price}</span>}
+												{item.min_price === null && item.max_price === null ? <span>可议价</span> : ""}
+											</div>
+										</div>
+										<div className="item-category">
+											<div className="item-category-item">{item.category_name}</div>
+										</div>
+										<div className="item-other">
+											<div className="item-group item-other-visit">
+												<span className="item-group-icon mr10"><i className="fa fa-eye"></i></span>
+												<span className="item-group-text">{item.visit_count}人浏览</span>
+											</div>
+											<div className="item-group item-other-deadline">
+												<span className="item-group-icon mr10"><i className="fa fa-clock-o"></i></span>
+												<span className="item-group-text">{moment(item.deadline_at).format("YYYY-MM-DD HH:mm")}竞标截止</span>
+											</div>
+											<div className="item-group item-other-bidding pagemancenter">
+												<span className="item-group-icon mr10"><i className="fa fa-user"></i></span>
+												<span className="item-group-text">{item.bidding_users_count}人竞标</span>
+											</div>
+											<div className="item-group item-other-publish-at">
+												{item.published_at === null ? <span className="item-group-text">更新于：{moment(item.updated_at).format("YYYY-MM-DD HH:mm")} </span> :
+													<span className=" item-group-text">发布于：{moment(item.published_at).format("YYYY-MM-DD HH:mm")} </span>}
+											</div>
+										</div>
+									</div>
+
+									{category == "manage" ? item.operation.can_edit === true && item.operation.can_delete === true ?
+										<div className="item-operator none">
+
+											<a href={`/crowdsourcing/${item.id}/edit`} title="编辑">
+												<i className="fa fa-pencil"></i>
+											</a>
+
+											<a className="delete-project-package-btn" onClick={() => this.delectprojectModal(item.id)} data-id="10" title="删除">
+												<i className="fa fa-trash-o"></i>
+											</a>
+
+										</div> : "" : ""}
+
+									{category == "manage" ? item.operation.can_edit === true && item.operation.can_delete === false ?
+										<div className="item-operator none">
+											<a href={`/crowdsourcing/${item.id}/edit`} title="编辑">
+												<i className="fa fa-pencil"></i>
+											</a>
+										</div> : "" : ""}
+
 
-								<div className="item-image">
-									<img alt="图片" src={`/images/educoder/project_packages/${setcategorylist(item.category_name)}.png`} />
 								</div>
-
-								<div className="item-body">
-									<div className="item-head">
-										<div className="item-head-title" title={item.title}>
-											<a href={`/crowdsourcing/${item.id}`}>{item.title}</a>
-										</div>
-
-										<div className="item-head-tags">
-											{item.bidden_status==="pending"?<span className="pending">竞标中</span>:""}
-											{item.bidden_status==="bidding_won"?<span className="bidding_won">已中标</span>:""}
-											{item.bidden_status==="bidding_lost"?<span className="bidding_lost">未中标</span>:""}
-										</div>
-
-										<div className="item-head-blank"></div>
-										<div className="item-head-price mtf15">
-											{item.min_price===null?"":<span>￥{item.min_price}</span>}
-											{item.max_price===null||item.min_price===null?"":<span>~</span>}
-											{item.max_price===null?"":<span>￥{item.max_price}</span>}
-											{item.min_price===null&&item.max_price===null?<span>可议价</span>:""}
-										</div>
-									</div>
-									<div className="item-category">
-										<div className="item-category-item">{item.category_name}</div>
-									</div>
-									<div className="item-other">
-										<div className="item-group item-other-visit">
-											<span className="item-group-icon mr10"><i className="fa fa-eye"></i></span>
-											<span className="item-group-text">{item.visit_count}人浏览</span>
-										</div>
-										<div className="item-group item-other-deadline">
-											<span className="item-group-icon mr10"><i className="fa fa-clock-o"></i></span>
-											<span className="item-group-text">{moment(item.deadline_at).format("YYYY-MM-DD HH:mm")}竞标截止</span>
-										</div>
-										<div className="item-group item-other-bidding pagemancenter">
-											<span className="item-group-icon mr10"><i className="fa fa-user"></i></span>
-											<span className="item-group-text">{item.bidding_users_count}人竞标</span>
-										</div>
-									  <div className="item-group item-other-publish-at">
-											{item.published_at===null?<span className="item-group-text">更新于：{moment(item.updated_at).format("YYYY-MM-DD HH:mm")} </span>:
-												<span className=" item-group-text">发布于：{moment(item.published_at).format("YYYY-MM-DD HH:mm")} </span>}
-										</div>
-									</div>
-								</div>
-
-								{category=="manage"?item.operation.can_edit===true&&item.operation.can_delete===true?
-								<div className="item-operator none">
-
-									<a href={`/crowdsourcing/${item.id}/edit`} title="编辑">
-										<i className="fa fa-pencil"></i>
-									</a>
-
-									<a className="delete-project-package-btn" onClick={()=>this.delectprojectModal(item.id)} data-id="10" title="删除">
-										<i className="fa fa-trash-o"></i>
-									</a>
-
-								</div>:"":""}
-
-								{category=="manage"?item.operation.can_edit===true&&item.operation.can_delete===false?
-									<div className="item-operator none">
-										<a href={`/crowdsourcing/${item.id}/edit`} title="编辑">
-											<i className="fa fa-pencil"></i>
-										</a>
-									</div>:"":""}
-
-
 							</div>
-						</div>
-					)})}
+						)
+					})}
 
 					{
-						totalCount >20 &&
+						totalCount > 20 &&
 						<div className="mt30 mb50 edu-txt-center">
-							<Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={20} current={page}/>
+							<Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={20} current={page} />
 						</div>
 					}
 
diff --git a/src/modules/user/usersInfo/InfosPath.js b/src/modules/user/usersInfo/InfosPath.js
index c3a1aaa2..37d1a569 100644
--- a/src/modules/user/usersInfo/InfosPath.js
+++ b/src/modules/user/usersInfo/InfosPath.js
@@ -1,62 +1,64 @@
 import React, { Component } from 'react';
 import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-import {Tooltip, Menu, Pagination, Spin, Dropdown} from 'antd';
+import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
+import { Tooltip, Menu, Pagination, Spin, Dropdown } from 'antd';
 import Loadable from 'react-loadable';
 import Loading from '../../../Loading';
 import NoneData from '../../courses/coursesPublic/NoneData'
 import axios from 'axios';
-import {getImageUrl,setImagesUrl} from 'educoder';
+import { getImageUrl, setImagesUrl } from 'educoder';
 import { TPMIndexHOC } from '../../tpm/TPMIndexHOC';
 import { CNotificationHOC } from '../../courses/common/CNotificationHOC'
 import "./usersInfo.css"
 
 import Create from './publicCreatNew'
 
-class InfosPath extends Component{
-  constructor(props){
+class InfosPath extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      category:undefined,
-      page:1,
-      status:undefined,
-      per_page:16,
-      isSpin:false,
+    this.state = {
+      category: undefined,
+      page: 1,
+      status: undefined,
+      per_page: 16,
+      isSpin: false,
       sort_by: "updated_at",
       sort_direction: "desc",
-      totalCount:undefined,
-      data:undefined
+      totalCount: undefined,
+      data: undefined
     }
   }
 
-  componentDidMount=()=>{
+  componentDidMount = () => {
     this.setState({
-      isSpin:true
+      isSpin: true
     })
-    let {category, status, sort_by, page, per_page, sort_direction} = this.state;
+    let { category, status, sort_by, page, per_page, sort_direction } = this.state;
     this.getCourses(category, status, sort_by, page, sort_direction);
   }
 
   getCourses = (category, status, sort_by, page, sort_direction) => {
-    let url=`/users/${this.props.match.params.username}/subjects.json`;
-    axios.get((url),{params:{
-      category,
-      status,
-      sort_by,
-      page,
+    let url = `/users/${this.props.match.params.username}/subjects.json`;
+    axios.get((url), {
+      params: {
+        category,
+        status,
+        sort_by,
+        page,
         sort_direction,
-      per_page:this.props.is_current && category && page ==1?17:16
-    }}).then((result)=>{
-      if(result){
+        per_page: this.props.is_current && category && page == 1 ? 17 : 16
+      }
+    }).then((result) => {
+      if (result) {
         this.setState({
-          totalCount:result.data.count,
-          data:result.data,
+          totalCount: result.data.count,
+          data: result.data,
           sort_by: sort_by,
           sort_direction: sort_direction,
-          isSpin:false
+          isSpin: false
         })
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
       this.setState({
         isSpin: false
@@ -65,49 +67,49 @@ class InfosPath extends Component{
   }
 
   //切换种类
-  changeCategory=(cate)=>{
+  changeCategory = (cate) => {
     this.setState({
-      category:cate,
-      status:undefined,
-      page:1,
-      isSpin:true
+      category: cate,
+      status: undefined,
+      page: 1,
+      isSpin: true
     })
-    let {sort_by, sort_direction} = this.state;
+    let { sort_by, sort_direction } = this.state;
     this.getCourses(cate, undefined, sort_by, 1, sort_direction);
   }
   // 切换状态
-  changeStatus=(status)=>{
-    let {category, sort_by, sort_direction} = this.state;
+  changeStatus = (status) => {
+    let { category, sort_by, sort_direction } = this.state;
     this.setState({
       status,
-      page:1,
-      isSpin:true
+      page: 1,
+      isSpin: true
     })
     this.getCourses(category, status, sort_by, 1, sort_direction);
   }
   //切换页数
-  changePage=(page)=>{
+  changePage = (page) => {
     this.setState({
       page,
-      isSpin:true
+      isSpin: true
     })
-    let {category, sort_by, status, sort_direction} = this.state;
+    let { category, sort_by, status, sort_direction } = this.state;
     this.getCourses(category, status, sort_by, page, sort_direction);
   }
 
   // 进入课堂
-  turnToCourses=(url)=>{
+  turnToCourses = (url) => {
     this.props.history.push(url);
   }
 
 
   // 切换排序方式
-  changeOrder= (sort)=>{
+  changeOrder = (sort) => {
     this.setState({
-      sort_by:sort,
-      isSpin:true
+      sort_by: sort,
+      isSpin: true
     })
-    let {category, status, page, sort_direction} = this.state;
+    let { category, status, page, sort_direction } = this.state;
     this.getCourses(category, status, sort, page, sort_direction);
   }
 
@@ -118,7 +120,7 @@ class InfosPath extends Component{
     this.setState({
       isSpin: true
     });
-    let {category, status, page, sort_direction} = this.state;
+    let { category, status, page, sort_direction } = this.state;
     this.getCourses(category, status, sort_by, 1, "desc");
   }
 
@@ -128,7 +130,7 @@ class InfosPath extends Component{
     this.setState({
       isSpin: true
     });
-    let {category, status, page, sort_by, sort_direction} = this.state;
+    let { category, status, page, sort_by, sort_direction } = this.state;
     let sort_directiony = sort_directions;
     if (sort_directions === "asc") {
       if (sort_directions === sort_direction) {
@@ -144,8 +146,8 @@ class InfosPath extends Component{
   }
 
 
-  render(){
-    let{
+  render() {
+    let {
       category,
       status,
       sort_by,
@@ -156,7 +158,7 @@ class InfosPath extends Component{
       isSpin
     } = this.state;
     let isStudent = this.props.isStudent();
-    let  is_current=this.props.is_current;
+    let is_current = this.props.is_current;
     const menu = (
       <Menu>
         <Menu.Item onClick={() => this.updatedlist("updated_at")}>
@@ -170,7 +172,7 @@ class InfosPath extends Component{
     );
 
     // console.log(this.props.user&&this.props.user.main_site)
-    return(
+    return (
       <div className="educontent">
         <Spin size="large" spinning={isSpin}>
           <style>
@@ -215,13 +217,16 @@ class InfosPath extends Component{
           </style>
           <div className="white-panel edu-back-white pt20 pb20 clearfix ">
             <li className={category ? " font-16 whitepanelyslli" : "active font-16 whitepanelyslli"}><a
-              href="javascript:void(0)" onClick={() => this.changeCategory()} className="font-16 w32">全部</a></li>
+              onClick={() => this.changeCategory()} className="font-16 w32">全部</a></li>
             <li className={category == "manage" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
-              href="javascript:void(0)" onClick={() => this.changeCategory("manage")}
+              onClick={() => this.changeCategory("manage")}
               className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}管理的</a></li>
             <li className={category == "study" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
-              href="javascript:void(0)" onClick={() => this.changeCategory("study")}
+              onClick={() => this.changeCategory("study")}
               className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}学习的</a></li>
+            <li className={category == "collect" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
+              onClick={() => this.changeCategory("collect")}
+              className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}收藏的</a></li>
           </div>
 
           <style>
@@ -240,62 +245,76 @@ class InfosPath extends Component{
              `
             }
           </style>
-        {
-          category && category == "manage" && is_current &&
-          <div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
-            <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a href="javascript:void(0)"
-                                                                                         onClick={() => this.changeStatus()}
-                                                                                         className="w32">全部</a></li>
-            <li className={status == "editing" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-              href="javascript:void(0)" onClick={() => this.changeStatus("editing")} className="w60">编辑中</a></li>
-            <li className={status == "applying" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-              href="javascript:void(0)" onClick={() => this.changeStatus("applying")} className="w60">待审核</a></li>
-            <li className={status == "published" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-              href="javascript:void(0)" onClick={() => this.changeStatus("published")} className="w60">已发布</a></li>
-            <li className={status == "publiced" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-              onClick={() => this.changeStatus("publiced")} className="w60" href="javascript:void(0)">已公开</a></li>
-          </div>
-        }
-        {
-          category && category == "study" && is_current &&
-          <div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
-            <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a href="javascript:void(0)"
-                                                                                         onClick={() => this.changeStatus()}
-                                                                                         className="w32">全部</a></li>
-            <li className={status == "unfinished" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-              href="javascript:void(0)" onClick={() => this.changeStatus("unfinished")} className="w60">未完成</a></li>
-            <li className={status == "finished" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-              href="javascript:void(0)" onClick={() => this.changeStatus("finished")} className="w60">已完成</a></li>
-          </div>
-        }
+          {
+            category && category == "manage" && is_current &&
+            <div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
+              <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a
+                onClick={() => this.changeStatus()}
+                className="w32">全部</a></li>
+              <li className={status == "editing" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("editing")} className="w60">编辑中</a></li>
+              <li className={status == "applying" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("applying")} className="w60">待审核</a></li>
+              <li className={status == "published" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("published")} className="w60">已发布</a></li>
+              <li className={status == "publiced" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("publiced")} className="w60"  >已公开</a></li>
+            </div>
+          }
+          {
+            category && category == "study" && is_current &&
+            <div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
+              <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a
+                onClick={() => this.changeStatus()}
+                className="w32">全部</a></li>
+              <li className={status == "unfinished" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("unfinished")} className="w60">未完成</a></li>
+              <li className={status == "finished" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("finished")} className="w60">已完成</a></li>
+            </div>
+          }
+
+          {
+            category && category == "collect" && is_current &&
+            <div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
+              <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a
+                onClick={() => this.changeStatus()}
+                className="w32">全部</a></li>
+              <li className={status == "unfinished" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("unfinished")} className="w60">未完成</a></li>
+              <li className={status == "finished" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("finished")} className="w60">已完成</a></li>
+            </div>
+          }
+
           <div className="clearfix font-12 " style={{
             lineHeight: "41px",
             marginTop: "10px",
           }}>
-          <span className="fl color-grey-9">共参与{totalCount}个{category?category=="manage"?"发布":"学习":"实践课程"}</span>
+            <span className="fl color-grey-9">{category && category == "collect" ? "共收藏" : "共参与"}{totalCount}个{category && category == "collect" ? "" : category ? category == "manage" ? "发布" : "学习" : "实践课程"}</span>
             <sapn className="relativef color-grey-9 fr"
-                  style={{
-                    display: "flex",
-                    flexDirection: "column",
-                    height: "40px",
-                    lineHeight: "40px",
-                  }}
-            >
-            <span
               style={{
+                display: "flex",
                 flexDirection: "column",
-                textAlign: "center",
-                height: "10px",
-                lineHeight: "10px",
-                display: "table",
-                marginTop: "9px",
+                height: "40px",
+                lineHeight: "40px",
               }}
             >
-                 <i className={sort_direction === "asc" ?
-                   "iconfont icon-sanjiaoxing-up font-12  color-blue h10 " : "iconfont icon-sanjiaoxing-up font-12 h10"}
-                    onClick={() => this.updatedlists("asc")}></i>
+              <span
+                style={{
+                  flexDirection: "column",
+                  textAlign: "center",
+                  height: "10px",
+                  lineHeight: "10px",
+                  display: "table",
+                  marginTop: "9px",
+                }}
+              >
+                <i className={sort_direction === "asc" ?
+                  "iconfont icon-sanjiaoxing-up font-12  color-blue h10 " : "iconfont icon-sanjiaoxing-up font-12 h10"}
+                  onClick={() => this.updatedlists("asc")}></i>
 
-            </span>
+              </span>
 
               <span
                 style={{
@@ -306,21 +325,21 @@ class InfosPath extends Component{
                   display: "table",
                 }}
               >
-                          <i className={sort_direction === "desc" ?
-                            "iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue h10" : "iconfont icon-sanjiaoxing-down font-12 yslbottomsj h10"}
-                             onClick={() => this.updatedlists("desc")}></i>
-            </span>
+                <i className={sort_direction === "desc" ?
+                  "iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue h10" : "iconfont icon-sanjiaoxing-down font-12 yslbottomsj h10"}
+                  onClick={() => this.updatedlists("desc")}></i>
+              </span>
             </sapn>
             <Dropdown overlay={menu}>
-										<span className="fr color-grey-9 mr10 pointer " style={{
-                      display: "flex",
-                      flexDirection: "initial",
-                    }}>
-											<span>{sort_by === "updated_at" ? '最近更新' : sort_by === "created_at" ? '最新创建' : ""}</span>
+              <span className="fr color-grey-9 mr10 pointer " style={{
+                display: "flex",
+                flexDirection: "initial",
+              }}>
+                <span>{sort_by === "updated_at" ? '最近更新' : sort_by === "created_at" ? '最新创建' : ""}</span>
 
-										</span>
+              </span>
             </Dropdown>
-        </div>
+          </div>
           <style>
             {
               `
@@ -328,57 +347,57 @@ class InfosPath extends Component{
 							`
             }
           </style>
-        <div className="square-list clearfix">
-          {/* 295 */}
-          {
-            this.props.user&&this.props.user.main_site===true?page == 1 && is_current && !category ? <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create>:"":""
-          }
-          {
-            this.props.user&&this.props.user.main_site===false?this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.is_teacher===true||this.props.user&&this.props.user.business===true?page == 1 && is_current && !category ? <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create>:"":"":""
-          }
-          {
-            (!data || (data && data.subjects.length==0)) && category && <NoneData></NoneData>
-          }
-          {
-            data && data.subjects && data.subjects.map((item,key)=>{
-              return(
-                <div className="square-Item" style={{height:"295px"}} onClick={()=>this.turnToCourses(`/paths/${item.id}`)}>
-                  {
-                    item.tag && <div className="tag-green"><span className="tag-name">{item.tag}</span>
-											{/*<img src={setImagesUrl("images/educoder/tag2.png")} className="fl"/>*/}
-                    </div>
-                  }
-                  <a href="javascript:void(0)" className="square-img"><img alt="Subject12" src={getImageUrl(`${item.image_url}`)}/></a>
-                  <div className="square-main">
-                    <p className="task-hide">
-                      <a href="javascript:void(0)" className="justify color-grey-name "
-                      >{item.name}</a>
-                    </p>
-                    <div className="mt10">
-                      <p className="color-grey-6 clearfix">
-                        <a href="javascript:void(0)" className="fl color-grey-9 overflowHidden1"
-                            title={item.owner_name.length > 12 ? item.owner_name : ''}  style={{ maxWidth: '175px'}}
-                        >{item.owner_name}</a>
-                        <span className="fr squareIconSpan">
-                          <Tooltip placement='bottom' title="访问量">
-                            <i className="iconfont icon-liulanyan fl mr5"></i>
-                          </Tooltip>
-                          {item.visits_count}
-                        </span>
+          <div className="square-list clearfix">
+            {/* 295 */}
+            {
+              this.props.user && this.props.user.main_site === true ? page == 1 && is_current && !category ? <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create> : "" : ""
+            }
+            {
+              this.props.user && this.props.user.main_site === false ? this.props.user && this.props.user.admin === true || this.props.user && this.props.user.is_teacher === true || this.props.user && this.props.user.business === true ? page == 1 && is_current && !category ? <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create> : "" : "" : ""
+            }
+            {
+              (!data || (data && data.subjects.length == 0)) && category && <NoneData></NoneData>
+            }
+            {
+              data && data.subjects && data.subjects.map((item, key) => {
+                return (
+                  <div className="square-Item" style={{ height: "295px" }} onClick={() => this.turnToCourses(`/paths/${item.id}`)}>
+                    {
+                      item.tag && <div className="tag-green"><span className="tag-name">{item.tag}</span>
+                        {/*<img src={setImagesUrl("images/educoder/tag2.png")} className="fl"/>*/}
+                      </div>
+                    }
+                    <a className="square-img"><img alt="Subject12" src={getImageUrl(`${item.image_url}`)} /></a>
+                    <div className="square-main">
+                      <p className="task-hide">
+                        <a className="justify color-grey-name "
+                        >{item.name}</a>
                       </p>
+                      <div className="mt10">
+                        <p className="color-grey-6 clearfix">
+                          <a className="fl color-grey-9 overflowHidden1"
+                            title={item.owner_name.length > 12 ? item.owner_name : ''} style={{ maxWidth: '175px' }}
+                          >{item.owner_name}</a>
+                          <span className="fr squareIconSpan">
+                            <Tooltip placement='bottom' title="访问量">
+                              <i className="iconfont icon-liulanyan fl mr5"></i>
+                            </Tooltip>
+                            {item.visits_count}
+                          </span>
+                        </p>
+                      </div>
                     </div>
                   </div>
-                </div>
-              )
-            })
-          }
-        </div>
-        {
-          totalCount > 15 &&
-          <div className="mt30 mb50 edu-txt-center">
-            <Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page}/>
+                )
+              })
+            }
           </div>
-        }
+          {
+            totalCount > 15 &&
+            <div className="mt30 mb50 edu-txt-center">
+              <Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page} />
+            </div>
+          }
         </Spin>
       </div>
     )
diff --git a/src/modules/user/usersInfo/InfosProject.js b/src/modules/user/usersInfo/InfosProject.js
index 9dccd1c3..4e436b34 100644
--- a/src/modules/user/usersInfo/InfosProject.js
+++ b/src/modules/user/usersInfo/InfosProject.js
@@ -1,65 +1,67 @@
 import React, { Component } from 'react';
 import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-import {Tooltip, Pagination, Spin, Dropdown, Menu} from 'antd';
+import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
+import { Tooltip, Pagination, Spin, Dropdown, Menu } from 'antd';
 import axios from 'axios';
 import NoneData from '../../courses/coursesPublic/NoneData'
-import {getImageUrl} from 'educoder';
+import { getImageUrl } from 'educoder';
 import "./usersInfo.css"
 import Create from './publicCreatNew'
 
-class InfosProject extends Component{
-  constructor(props){
+class InfosProject extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      category:undefined,
-      status:undefined,
-      page:1,
-      per_page:16,
+    this.state = {
+      category: undefined,
+      status: undefined,
+      page: 1,
+      per_page: 16,
       sort_by: "updated_on",
       sort_direction: "desc",
-      totalCount:undefined,
-      data:undefined,
-      isSpin:false
+      totalCount: undefined,
+      data: undefined,
+      isSpin: false
     }
   }
 
-  componentDidMount=()=>{
+  componentDidMount = () => {
     this.setState({
-      isSpin:true
+      isSpin: true
     })
-    let {category, status, page, sort_by, sort_direction} = this.state;
+    let { category, status, page, sort_by, sort_direction } = this.state;
     this.getCourses(category, status, page, sort_by, sort_direction);
   }
 
   getCourses = (category, status, page, sort_by, sort_direction) => {
-    let url=`/users/${this.props.match.params.username}/projects.json`;
-    axios.get((url),{params:{
-      category,
-      status,
-      page,
+    let url = `/users/${this.props.match.params.username}/projects.json`;
+    axios.get((url), {
+      params: {
+        category,
+        status,
+        page,
         sort_by,
         sort_direction,
-      per_page:this.props.is_current && category && page ==1?17:16
-    }}).then((result)=>{
-      if(result){
-				if (result.data.status === 403||result.data.status === 401||result.data.status === 500||result.data.status === 404) {
-					this.setState({
-						isSpin:false,
-						totalCount:0
-					})
-				}else{
-					this.setState({
-						totalCount:result.data.count,
-						data:result.data,
+        per_page: this.props.is_current && category && page == 1 ? 17 : 16
+      }
+    }).then((result) => {
+      if (result) {
+        if (result.data.status === 403 || result.data.status === 401 || result.data.status === 500 || result.data.status === 404) {
+          this.setState({
+            isSpin: false,
+            totalCount: 0
+          })
+        } else {
+          this.setState({
+            totalCount: result.data.count,
+            data: result.data,
             sort_by: sort_by,
             sort_direction: sort_direction,
-						isSpin:false
-					})
-				}
+            isSpin: false
+          })
+        }
 
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
       this.setState({
         isSpin: false
@@ -68,22 +70,22 @@ class InfosProject extends Component{
   }
 
   //切换种类
-  changeCategory=(cate)=>{
+  changeCategory = (cate) => {
     this.setState({
-      category:cate,
-      page:1,
-      isSpin:true
+      category: cate,
+      page: 1,
+      isSpin: true
     })
-    let {status, sort_by, sort_direction} = this.state;
+    let { status, sort_by, sort_direction } = this.state;
     this.getCourses(cate, status, 1, sort_by,
       sort_direction);
   }
   //切换状态
-  changeStatus=(status)=>{
+  changeStatus = (status) => {
     this.setState({
-      status:status,
-      page:1,
-      isSpin:true
+      status: status,
+      page: 1,
+      isSpin: true
     })
     let {
       category, sort_by,
@@ -93,10 +95,10 @@ class InfosProject extends Component{
       sort_direction);
   }
   //切换页数
-  changePage=(page)=>{
+  changePage = (page) => {
     this.setState({
       page,
-      isSpin:true
+      isSpin: true
     })
     let {
       category, status, sort_by,
@@ -107,9 +109,9 @@ class InfosProject extends Component{
   }
 
   // 进入项目
-  turnToCourses=(url,flag)=>{
-    if(flag){
-			window.location.href=url;
+  turnToCourses = (url, flag) => {
+    if (flag) {
+      window.location.href = url;
     }
   }
 
@@ -120,7 +122,7 @@ class InfosProject extends Component{
     this.setState({
       isSpin: true
     });
-    let {category, status, page, sort_direction} = this.state;
+    let { category, status, page, sort_direction } = this.state;
     this.getCourses(category, status, 1, sort_by, "desc");
   }
 
@@ -130,7 +132,7 @@ class InfosProject extends Component{
     this.setState({
       isSpin: true
     });
-    let {category, status, page, sort_by, sort_direction} = this.state;
+    let { category, status, page, sort_by, sort_direction } = this.state;
     let sort_directiony = sort_directions;
     if (sort_directions === "asc") {
       if (sort_directions === sort_direction) {
@@ -144,8 +146,8 @@ class InfosProject extends Component{
     this.getCourses(category, status, page, sort_by, sort_directiony);
   }
 
-  render(){
-    let{
+  render() {
+    let {
       category,
       status,
       page,
@@ -156,7 +158,7 @@ class InfosProject extends Component{
       sort_direction
     } = this.state;
     let isStudent = this.props.isStudent();
-    let  is_current=this.props.is_current;
+    let is_current = this.props.is_current;
 
     const menu = (
       <Menu>
@@ -169,7 +171,7 @@ class InfosProject extends Component{
 
       </Menu>
     );
-    return(
+    return (
       <div className="educontent">
         <Spin size="large" spinning={isSpin}>
           <style>
@@ -214,12 +216,12 @@ class InfosProject extends Component{
           </style>
           <div className="white-panel edu-back-white pt20 pb20  clearfix ">
             <li className={category ? " font-16 whitepanelyslli" : "active font-16 whitepanelyslli"}><a
-              href="javascript:void(0)" onClick={() => this.changeCategory()} className="font-16 w32">全部</a></li>
+              onClick={() => this.changeCategory()} className="font-16 w32">全部</a></li>
             <li className={category == "manage" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
-              href="javascript:void(0)" onClick={() => this.changeCategory("manage")}
+              onClick={() => this.changeCategory("manage")}
               className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}管理的</a></li>
             <li className={category == "study" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
-              href="javascript:void(0)" onClick={() => this.changeCategory("study")}
+              onClick={() => this.changeCategory("study")}
               className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}学习的</a></li>
           </div>
           <style>
@@ -238,46 +240,46 @@ class InfosProject extends Component{
              `
             }
           </style>
-        {
-          is_current &&
-          <div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
-            <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a href="javascript:void(0)"
-                                                                                         onClick={() => this.changeStatus()}
-                                                                                         className=" w32">全部</a></li>
-            <li className={status == "publicly" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-              href="javascript:void(0)" onClick={() => this.changeStatus("publicly")} className=" w60">公开</a></li>
-            <li className={status == "personal" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-              href="javascript:void(0)" onClick={() => this.changeStatus("personal")} className=" w60">私有</a></li>
-          </div>
-        }
+          {
+            is_current &&
+            <div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
+              <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a
+                onClick={() => this.changeStatus()}
+                className=" w32">全部</a></li>
+              <li className={status == "publicly" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("publicly")} className=" w60">公开</a></li>
+              <li className={status == "personal" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("personal")} className=" w60">私有</a></li>
+            </div>
+          }
           <p className="clearfix font-12 " style={{
             lineHeight: "41px",
             marginTop: "10px",
           }}>
-          <span className="fl color-grey-9">共参与{totalCount}个{category?category=="manage"?"发布":"学习":"项目"}</span>
+            <span className="fl color-grey-9">共参与{totalCount}个{category ? category == "manage" ? "发布" : "学习" : "项目"}</span>
             <sapn className="relativef color-grey-9  fr"
-                  style={{
-                    display: "flex",
-                    flexDirection: "column",
-                    height: "40px",
-                    lineHeight: "40px",
-                  }}
-            >
-            <span
               style={{
+                display: "flex",
                 flexDirection: "column",
-                textAlign: "center",
-                height: "10px",
-                lineHeight: "10px",
-                display: "table",
-                marginTop: "9px",
+                height: "40px",
+                lineHeight: "40px",
               }}
             >
-                 <i className={sort_direction === "asc" ?
-                   "iconfont icon-sanjiaoxing-up font-12  color-blue h10 " : "iconfont icon-sanjiaoxing-up font-12 h10"}
-                    onClick={() => this.updatedlists("asc")}></i>
+              <span
+                style={{
+                  flexDirection: "column",
+                  textAlign: "center",
+                  height: "10px",
+                  lineHeight: "10px",
+                  display: "table",
+                  marginTop: "9px",
+                }}
+              >
+                <i className={sort_direction === "asc" ?
+                  "iconfont icon-sanjiaoxing-up font-12  color-blue h10 " : "iconfont icon-sanjiaoxing-up font-12 h10"}
+                  onClick={() => this.updatedlists("asc")}></i>
 
-            </span>
+              </span>
 
               <span
                 style={{
@@ -288,21 +290,21 @@ class InfosProject extends Component{
                   display: "table",
                 }}
               >
-                          <i className={sort_direction === "desc" ?
-                            "iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue h10" : "iconfont icon-sanjiaoxing-down font-12 yslbottomsj h10"}
-                             onClick={() => this.updatedlists("desc")}></i>
-            </span>
+                <i className={sort_direction === "desc" ?
+                  "iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue h10" : "iconfont icon-sanjiaoxing-down font-12 yslbottomsj h10"}
+                  onClick={() => this.updatedlists("desc")}></i>
+              </span>
             </sapn>
             <Dropdown overlay={menu}>
-										<span className="fr color-grey-9 mr10 pointer " style={{
-                      display: "flex",
-                      flexDirection: "initial",
-                    }}>
-											<span>{sort_by === "updated_on" ? '最近更新' : sort_by === "created_on" ? '最新创建' : ""}</span>
+              <span className="fr color-grey-9 mr10 pointer " style={{
+                display: "flex",
+                flexDirection: "initial",
+              }}>
+                <span>{sort_by === "updated_on" ? '最近更新' : sort_by === "created_on" ? '最新创建' : ""}</span>
 
-										</span>
+              </span>
             </Dropdown>
-        </p>
+          </p>
           <style>
             {
               `
@@ -310,78 +312,78 @@ class InfosProject extends Component{
 							`
             }
           </style>
-        <div className="square-list clearfix">
-          {/* 289 */}
-          {
-            page == 1 && is_current ?
-            <Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={"新建开发项目"} index="4" Createtype={"projects"}
-										{...this.props} {...this.state}
-						></Create>:""
-          }
-          {
-            (!data || (data && data.projects.length==0)) && category && <NoneData></NoneData>
+          <div className="square-list clearfix">
+            {/* 289 */}
+            {
+              page == 1 && is_current ?
+                <Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={"新建开发项目"} index="4" Createtype={"projects"}
+                  {...this.props} {...this.state}
+                ></Create> : ""
+            }
+            {
+              (!data || (data && data.projects.length == 0)) && category && <NoneData></NoneData>
 
-          }
-					{
-						data===undefined||data.projects.length===0?category=="manage"||category=="study"?"":<NoneData></NoneData>:""
-					}
-          {
-            data && data.projects && data.projects.map((item,key)=>{
-              return(
-                <div className="square-Item" onClick={()=>this.turnToCourses(`/projects/${item.id}`,item.can_visited)} style={{"cursor": "pointer","height":"289px"}}>
-                  {
-                    item.is_public==1 &&
-                    <React.Fragment>
-                      <div className="publicpart"></div>
-                      <span className="smalltrangle"></span>
-                      <span className="publicword">公开</span>
-                    </React.Fragment>
-                  }
-                  {
-                    item.can_visited ==false?
-                    <div className="closeSquare">
-                      <img src={getImageUrl("images/educoder/icon/lockclose.svg")} className="mt80 mb25"/>
-                      <p className="font-14 color-white">非成员不能访问</p>
-                    </div>:""
-                  }
-                  <div className="substance">
-                    <p className="subName font-16">
-                      <span>{item.name}</span>
-                    </p>
-                    <span><img alt="用户" className="radius mt15" height="60" src={getImageUrl(`images/${item.owner.avatar_url}`)} width="60"/></span>
-                    <p className="font-14 mt10 task-hide"><span>{item.owner.real_name}</span></p>
-                    <p className="font-16 mb15 mt10 task-hide"><span className="color-grey-9">{item.owner.school_name}</span></p>
-                  </div>
-                  <div className="edu-txt-center course-bottom">
-                    <div className="inline color-grey-6">
-                      {
-                        item.members_count > 0 &&
-                        <span className="mr10 ml10 fl squareIconSpan">
-                          <i className="iconfont icon-chengyuan fl mr3" data-tip-down="成员"></i>{item.members_count}</span>
-                      }
-                      {
-                        item.issues_count > 0 &&
-                        <span className="mr10 ml10 fl squareIconSpan">
+            }
+            {
+              data === undefined || data.projects.length === 0 ? category == "manage" || category == "study" ? "" : <NoneData></NoneData> : ""
+            }
+            {
+              data && data.projects && data.projects.map((item, key) => {
+                return (
+                  <div className="square-Item" onClick={() => this.turnToCourses(`/projects/${item.id}`, item.can_visited)} style={{ "cursor": "pointer", "height": "289px" }}>
+                    {
+                      item.is_public == 1 &&
+                      <React.Fragment>
+                        <div className="publicpart"></div>
+                        <span className="smalltrangle"></span>
+                        <span className="publicword">公开</span>
+                      </React.Fragment>
+                    }
+                    {
+                      item.can_visited == false ?
+                        <div className="closeSquare">
+                          <img src={getImageUrl("images/educoder/icon/lockclose.svg")} className="mt80 mb25" />
+                          <p className="font-14 color-white">非成员不能访问</p>
+                        </div> : ""
+                    }
+                    <div className="substance">
+                      <p className="subName font-16">
+                        <span>{item.name}</span>
+                      </p>
+                      <span><img alt="用户" className="radius mt15" height="60" src={getImageUrl(`images/${item.owner.avatar_url}`)} width="60" /></span>
+                      <p className="font-14 mt10 task-hide"><span>{item.owner.real_name}</span></p>
+                      <p className="font-16 mb15 mt10 task-hide"><span className="color-grey-9">{item.owner.school_name}</span></p>
+                    </div>
+                    <div className="edu-txt-center course-bottom">
+                      <div className="inline color-grey-6">
+                        {
+                          item.members_count > 0 &&
+                          <span className="mr10 ml10 fl squareIconSpan">
+                            <i className="iconfont icon-chengyuan fl mr3" data-tip-down="成员"></i>{item.members_count}</span>
+                        }
+                        {
+                          item.issues_count > 0 &&
+                          <span className="mr10 ml10 fl squareIconSpan">
                             <i className="iconfont icon-issue fl mr3" data-tip-down="issues数"></i>{item.issues_count}</span>
-                      }
-                      {
-                        item.changesets_count > 0 &&
-                        <span className="mr10 ml10 fl squareIconSpan">
-                          <i className="iconfont icon-banbenku fl mr3" data-tip-down="版本库"></i>{item.changesets_count}</span>
-                      }
+                        }
+                        {
+                          item.changesets_count > 0 &&
+                          <span className="mr10 ml10 fl squareIconSpan">
+                            <i className="iconfont icon-banbenku fl mr3" data-tip-down="版本库"></i>{item.changesets_count}</span>
+                        }
+                      </div>
                     </div>
                   </div>
-                </div>
-              )
-            })
-          }
-        </div>
-        {
-          totalCount > 15 &&
-          <div className="mt30 mb50 edu-txt-center">
-            <Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page}/>
+                )
+              })
+            }
           </div>
-        }
+          {
+            totalCount > 15 &&
+            <div className="mt30 mb50 edu-txt-center">
+              <Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page} />
+            </div>
+          }
         </Spin>
       </div>
     )
diff --git a/src/modules/user/usersInfo/InfosShixun.js b/src/modules/user/usersInfo/InfosShixun.js
index 80a19baa..86bf4fe1 100644
--- a/src/modules/user/usersInfo/InfosShixun.js
+++ b/src/modules/user/usersInfo/InfosShixun.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 
-import {Pagination, Spin, Dropdown, Menu} from 'antd';
+import { Pagination, Spin, Dropdown, Menu } from 'antd';
 
 import NoneData from '../../courses/coursesPublic/NoneData'
 import axios from 'axios';
@@ -11,28 +11,28 @@ import "./usersInfo.css"
 import Create from './publicCreatNew'
 import GotoQQgroup from "../../../modal/GotoQQgroup";
 
-class InfosShixun extends Component{
-  constructor(props){
+class InfosShixun extends Component {
+  constructor(props) {
     super(props);
-    this.state={
-      category:undefined,
-      page:1,
-      status:undefined,
-      per_page:16,
-      isSpin:false,
+    this.state = {
+      category: undefined,
+      page: 1,
+      status: undefined,
+      per_page: 16,
+      isSpin: false,
       sort_by: "updated_at",
       sort_direction: "desc",
-      totalCount:undefined,
-      data:undefined,
-			goshowqqgtounp:false,
+      totalCount: undefined,
+      data: undefined,
+      goshowqqgtounp: false,
     }
   }
 
-  componentDidMount=()=>{
+  componentDidMount = () => {
     this.setState({
-      isSpin:true
+      isSpin: true
     })
-    let {category, status, sort_by, page, sort_direction} = this.state;
+    let { category, status, sort_by, page, sort_direction } = this.state;
     this.getCourses(category, status, sort_by, page, sort_direction);
   }
 
@@ -41,27 +41,29 @@ class InfosShixun extends Component{
     // console.log("getCourses");
     // console.log(sort_by);
     // console.log(sort_direction);
-    let url=`/users/${this.props.match.params.username}/shixuns.json`;
-    axios.get((url),{params:{
-      category,
-      status,
-      sort_by,
-      page,
+    let url = `/users/${this.props.match.params.username}/shixuns.json`;
+    axios.get((url), {
+      params: {
+        category,
+        status,
+        sort_by,
+        page,
         sort_direction,
-      per_page:this.props.is_current && category && page ==1?17:16
-    }}).then((result)=>{
-      if(result){
+        per_page: this.props.is_current && category && page == 1 ? 17 : 16
+      }
+    }).then((result) => {
+      if (result) {
         console.log("请求数据成功");
         console.log(sort_by);
         this.setState({
-          totalCount:result.data.count,
-          data:result.data,
+          totalCount: result.data.count,
+          data: result.data,
           sort_by: sort_by,
           sort_direction: sort_direction,
-          isSpin:false
+          isSpin: false
         })
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
       this.setState({
         isSpin: false
@@ -70,49 +72,49 @@ class InfosShixun extends Component{
   }
 
   //切换种类
-  changeCategory=(cate)=>{
+  changeCategory = (cate) => {
     this.setState({
-      category:cate,
-      status:undefined,
-      page:1,
-      isSpin:true
+      category: cate,
+      status: undefined,
+      page: 1,
+      isSpin: true
     })
-    let {sort_by, sort_direction} = this.state;
+    let { sort_by, sort_direction } = this.state;
     this.getCourses(cate, undefined, sort_by, 1, sort_direction);
   }
   // 切换状态
-  changeStatus=(status)=>{
+  changeStatus = (status) => {
     this.setState({
       status,
-      page:1,
-      isSpin:true
+      page: 1,
+      isSpin: true
     })
-    let {category, sort_by, sort_direction} = this.state;
+    let { category, sort_by, sort_direction } = this.state;
     this.getCourses(category, status, sort_by, 1, sort_direction);
   }
   //切换页数
-  changePage=(page)=>{
+  changePage = (page) => {
     this.setState({
       page,
-      isSpin:true
+      isSpin: true
     })
-    let {category, sort_by, status, sort_direction} = this.state;
+    let { category, sort_by, status, sort_direction } = this.state;
     this.getCourses(category, status, sort_by, page, sort_direction);
   }
 
   // 进入课堂
-  turnToCourses=(url)=>{
+  turnToCourses = (url) => {
     this.props.history.push(url);
   }
 
 
   // 切换排序方式
-  changeOrder= (sort)=>{
+  changeOrder = (sort) => {
     this.setState({
-      sort_by:sort,
-      isSpin:true
+      sort_by: sort,
+      isSpin: true
     })
-    let {category, status, page, sort_direction} = this.state;
+    let { category, status, page, sort_direction } = this.state;
     this.getCourses(category, status, sort, page, sort_direction);
   }
 
@@ -122,7 +124,7 @@ class InfosShixun extends Component{
     this.setState({
       isSpin: true
     });
-    let {category, status, page, sort_direction} = this.state;
+    let { category, status, page, sort_direction } = this.state;
     this.getCourses(category, status, sort_by, 1, "desc");
   }
 
@@ -132,7 +134,7 @@ class InfosShixun extends Component{
     this.setState({
       isSpin: true
     });
-    let {category, status, page, sort_by, sort_direction} = this.state;
+    let { category, status, page, sort_by, sort_direction } = this.state;
     let sort_directiony = sort_directions;
     if (sort_directions === "asc") {
       if (sort_directions === sort_direction) {
@@ -146,16 +148,16 @@ class InfosShixun extends Component{
 
     this.getCourses(category, status, sort_by, page, sort_directiony);
   }
-	// 处理弹框
-	setgoshowqqgtounp=(bool)=>{
-		this.setState({
-			goshowqqgtounp:bool
-		})
-	}
+  // 处理弹框
+  setgoshowqqgtounp = (bool) => {
+    this.setState({
+      goshowqqgtounp: bool
+    })
+  }
 
 
-  render(){
-    let{
+  render() {
+    let {
       category,
       status,
       sort_by,
@@ -164,10 +166,10 @@ class InfosShixun extends Component{
       totalCount,
       sort_direction,
       isSpin,
-			goshowqqgtounp
+      goshowqqgtounp
     } = this.state;
 
-    let  is_current=this.props.is_current;
+    let is_current = this.props.is_current;
     const menu = (
       <Menu>
         <Menu.Item onClick={() => this.updatedlist("updated_at")}>
@@ -179,14 +181,14 @@ class InfosShixun extends Component{
 
       </Menu>
     );
-    return(
+    return (
       <div className="educontent">
-				{
-					goshowqqgtounp===true?
-						<GotoQQgroup {...this.state} {...this.props} setgoshowqqgtounp={(bool)=>this.setgoshowqqgtounp(bool)}></GotoQQgroup>
-						:
-						""
-				}
+        {
+          goshowqqgtounp === true ?
+            <GotoQQgroup {...this.state} {...this.props} setgoshowqqgtounp={(bool) => this.setgoshowqqgtounp(bool)}></GotoQQgroup>
+            :
+            ""
+        }
         <Spin size="large" spinning={isSpin}>
           <style>
             {
@@ -230,16 +232,20 @@ class InfosShixun extends Component{
           </style>
           <div className="white-panel edu-back-white pt20 pb20 clearfix ">
             <li className={category ? " font-16 whitepanelyslli" : "active font-16 whitepanelyslli"}><a
-               href="javascript:void(0)"
-               onClick={() => this.changeCategory()} className="font-16 w32">全部</a></li>
+
+              onClick={() => this.changeCategory()} className="font-16 w32">全部</a></li>
             <li className={category == "manage" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
-               onClick={() => this.changeCategory("manage")}
-               href="javascript:void(0)"
+              onClick={() => this.changeCategory("manage")}
+
               className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}管理的</a></li>
             <li className={category == "study" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
-               onClick={() => this.changeCategory("study")}
-               href="javascript:void(0)"
+              onClick={() => this.changeCategory("study")}
+
               className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}学习的</a></li>
+            <li className={category == "collect" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
+              onClick={() => this.changeCategory("collect")}
+
+              className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}收藏的</a></li>
           </div>
           <style>
             {
@@ -258,63 +264,77 @@ class InfosShixun extends Component{
             }
           </style>
 
-        {
-          category && category == "manage" && is_current &&
-          <div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
-            <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}>
-              <a onClick={() => this.changeStatus()} className="w32" href="javascript:void(0)">全部</a></li>
-            <li className={status == "editing" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-               onClick={() => this.changeStatus("editing")} className="w60" href="javascript:void(0)">编辑中</a></li>
-            <li className={status == "applying" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-              onClick={() => this.changeStatus("applying")} className="w60" href="javascript:void(0)">待审核</a></li>
-            <li className={status == "published" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-              onClick={() => this.changeStatus("published")} className="w60" href="javascript:void(0)">已发布</a></li>
-            <li className={status == "publiced" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-              onClick={() => this.changeStatus("publiced")} className="w60" href="javascript:void(0)">已公开</a></li>
-            <li className={status == "closed" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-               onClick={() => this.changeStatus("closed")} className="w60" href="javascript:void(0)">已关闭</a></li>
-          </div>
-        }
-        {
-          category && category == "study" && is_current &&
-          <div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
-            <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a href="javascript:void(0)"
-                                                                                         onClick={() => this.changeStatus()}
-                                                                                         className="w32">全部</a></li>
-            <li className={status == "processing" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-               onClick={() => this.changeStatus("processing")} className="w60" href="javascript:void(0)">未通关</a></li>
-            <li className={status == "passed" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-               onClick={() => this.changeStatus("passed")} className="w60" href="javascript:void(0)">已通关</a></li>
-          </div>
-        }
+          {
+            category && category == "manage" && is_current &&
+            <div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
+              <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}>
+                <a onClick={() => this.changeStatus()} className="w32"  >全部</a></li>
+              <li className={status == "editing" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("editing")} className="w60"  >编辑中</a></li>
+              <li className={status == "applying" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("applying")} className="w60"  >待审核</a></li>
+              <li className={status == "published" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("published")} className="w60"  >已发布</a></li>
+              <li className={status == "publiced" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("publiced")} className="w60"  >已公开</a></li>
+              <li className={status == "closed" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("closed")} className="w60"  >已关闭</a></li>
+            </div>
+          }
+
+          {
+            category && category == "study" && is_current &&
+            <div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
+              <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a
+                onClick={() => this.changeStatus()}
+                className="w32">全部</a></li>
+              <li className={status == "processing" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("processing")} className="w60"  >未通关</a></li>
+              <li className={status == "passed" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("passed")} className="w60"  >已通关</a></li>
+            </div>
+          }
+
+          {
+            category && category == "collect" && is_current &&
+            <div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
+              <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a
+                onClick={() => this.changeStatus()}
+                className="w32">全部</a></li>
+              <li className={status == "processing" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("processing")} className="w60"  >未通关</a></li>
+              <li className={status == "passed" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
+                onClick={() => this.changeStatus("passed")} className="w60"  >已通关</a></li>
+            </div>
+          }
           <div className=" clearfix font-12 " style={{
             lineHeight: "41px",
             marginTop: "10px",
           }}>
-          <span className="fl color-grey-9">共参与{totalCount}个{category?category=="manage"?"发布":"学习":"实训"}</span>
+            <span className="fl color-grey-9">{category && category == "collect" ? "共收藏" : "共参与"}{totalCount}个{category && category == "collect" ? "" : category ? category == "manage" ? "发布" : "学习" : "实训"}</span>
             <sapn className="relativef color-grey-9 fr"
-                  style={{
-                    display: "flex",
-                    flexDirection: "column",
-                    height: "40px",
-                    lineHeight: "40px",
-                  }}
-            >
-            <span
               style={{
+                display: "flex",
                 flexDirection: "column",
-                textAlign: "center",
-                height: "10px",
-                lineHeight: "10px",
-                display: "table",
-                marginTop: "9px",
+                height: "40px",
+                lineHeight: "40px",
               }}
             >
-                 <i className={sort_direction === "asc" ?
-                   "iconfont icon-sanjiaoxing-up font-12  color-blue h10 " : "iconfont icon-sanjiaoxing-up font-12 h10"}
-                    onClick={() => this.updatedlists("asc")}></i>
+              <span
+                style={{
+                  flexDirection: "column",
+                  textAlign: "center",
+                  height: "10px",
+                  lineHeight: "10px",
+                  display: "table",
+                  marginTop: "9px",
+                }}
+              >
+                <i className={sort_direction === "asc" ?
+                  "iconfont icon-sanjiaoxing-up font-12  color-blue h10 " : "iconfont icon-sanjiaoxing-up font-12 h10"}
+                  onClick={() => this.updatedlists("asc")}></i>
 
-            </span>
+              </span>
 
               <span
                 style={{
@@ -325,24 +345,24 @@ class InfosShixun extends Component{
                   display: "table",
                 }}
               >
-                          <i className={sort_direction === "desc" ?
-                            "iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue h10" : "iconfont icon-sanjiaoxing-down font-12 yslbottomsj h10"}
-                             onClick={() => this.updatedlists("desc")}></i>
-            </span>
+                <i className={sort_direction === "desc" ?
+                  "iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue h10" : "iconfont icon-sanjiaoxing-down font-12 yslbottomsj h10"}
+                  onClick={() => this.updatedlists("desc")}></i>
+              </span>
             </sapn>
             <Dropdown overlay={menu}>
-										<span className="fr color-grey-9 mr10 pointer " style={{
-                      display: "flex",
-                      flexDirection: "initial",
-                    }}>
-											<span>{sort_by === "updated_at" ? '最新动态' : sort_by === "created_at" ? '语言类别' : ""}</span>
+              <span className="fr color-grey-9 mr10 pointer " style={{
+                display: "flex",
+                flexDirection: "initial",
+              }}>
+                <span>{sort_by === "updated_at" ? '最新动态' : sort_by === "created_at" ? '语言类别' : ""}</span>
 
-										</span>
+              </span>
             </Dropdown>
-        </div>
-					<style>
-						{
-							`
+          </div>
+          <style>
+            {
+              `
 							.tag-green {
 									position: absolute;
 									left: 10px;
@@ -378,60 +398,60 @@ class InfosShixun extends Component{
 																					justify-content: center;
 																			}
 							`
-						}
-					</style>
-        <div className="square-list clearfix">
-          {/* 298 */}
-          {
-            page == 1 && is_current && !category ?
-            <Create href={"/shixuns/new"} name={"新建实训"} index="2" {...this.props} {...this.state} setgoshowqqgtounp={(bool)=>this.setgoshowqqgtounp(bool)}></Create>:""
-          }
-          {
-            (!data || (data && data.shixuns.length==0)) && category && <NoneData></NoneData>
-          }
-          {
-            data && data.shixuns && data.shixuns.map((item,key)=>{
-              return(
-                <div className="square-Item" style={{"height":"298px"}} onClick={()=>this.turnToCourses(`/shixuns/${item.identifier}/challenges`)}>
-                  {
-                    item.tag && <div className="tag-green"><span className="tag-name">{item.tag}</span>
-											{/*<img className="fl" src={setImagesUrl("images/educoder/tag2.png")}/>*/}
-                    </div>
-                  }
-									{
-										item.is_jupyter===true?
-											<div className="tag-org">
-												<p className="tag-org-name intermediatecenter"> <span className="tag-org-name-test">Jupyter</span></p>
-												{/*<img style={{display:'block',height: '28px'}} src={require(`./shixunCss/tag2.png`)}/>*/}
-											</div>
-											:""}
+            }
+          </style>
+          <div className="square-list clearfix">
+            {/* 298 */}
+            {
+              page == 1 && is_current && !category ?
+                <Create href={"/shixuns/new"} name={"新建实训"} index="2" {...this.props} {...this.state} setgoshowqqgtounp={(bool) => this.setgoshowqqgtounp(bool)}></Create> : ""
+            }
+            {
+              (!data || (data && data.shixuns.length == 0)) && category && <NoneData></NoneData>
+            }
+            {
+              data && data.shixuns && data.shixuns.map((item, key) => {
+                return (
+                  <div className="square-Item" style={{ "height": "298px" }} onClick={() => this.turnToCourses(`/shixuns/${item.identifier}/challenges`)}>
+                    {
+                      item.tag && <div className="tag-green"><span className="tag-name">{item.tag}</span>
+                        {/*<img className="fl" src={setImagesUrl("images/educoder/tag2.png")}/>*/}
+                      </div>
+                    }
+                    {
+                      item.is_jupyter === true ?
+                        <div className="tag-org">
+                          <p className="tag-org-name intermediatecenter"> <span className="tag-org-name-test">Jupyter</span></p>
+                          {/*<img style={{display:'block',height: '28px'}} src={require(`./shixunCss/tag2.png`)}/>*/}
+                        </div>
+                        : ""}
 
 
-                  <a  className="square-img">
-                    <img src={setImagesUrl(`${item.image_url}`)}/>
-                  </a>
-                  <div className="square-main">
-                    <p className="task-hide">
-                      <a  className="justify color-grey-name">{item.name}</a>
-                    </p>
-                    <div className="user-bar mt10">
-                      <p style={{'width': `${parseFloat(parseInt(item.finished_challenges_count)/parseInt(item.challenges_count)).toFixed(2)*100}%`}}></p>
-                    </div>
-                    <p className="color-blue font-14 clearfix">
+                    <a className="square-img">
+                      <img src={setImagesUrl(`${item.image_url}`)} />
+                    </a>
+                    <div className="square-main">
+                      <p className="task-hide">
+                        <a className="justify color-grey-name">{item.name}</a>
+                      </p>
+                      <div className="user-bar mt10">
+                        <p style={{ 'width': `${parseFloat(parseInt(item.finished_challenges_count) / parseInt(item.challenges_count)).toFixed(2) * 100}%` }}></p>
+                      </div>
+                      <p className="color-blue font-14 clearfix">
                         已完成 {item.finished_challenges_count} / {item.challenges_count}
-                    </p>
+                      </p>
+                    </div>
                   </div>
-                </div>
-              )
-            })
-          }
-        </div>
-        {
-          totalCount > 15 &&
-          <div className="mt30 mb50 edu-txt-center">
-            <Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page}/>
+                )
+              })
+            }
           </div>
-        }
+          {
+            totalCount > 15 &&
+            <div className="mt30 mb50 edu-txt-center">
+              <Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page} />
+            </div>
+          }
         </Spin>
       </div>
     )
diff --git a/src/modules/user/usersInfo/Projects.js b/src/modules/user/usersInfo/Projects.js
deleted file mode 100644
index 5f52d79f..00000000
--- a/src/modules/user/usersInfo/Projects.js
+++ /dev/null
@@ -1,408 +0,0 @@
-import React, { Component } from 'react';
-import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-import {Tooltip, Pagination, Spin, Dropdown, Menu} from 'antd';
-import axios from 'axios';
-import NoneData from '../../courses/coursesPublic/NoneData'
-import {getImageUrl} from 'educoder';
-import "./usersInfo.css"
-import Create from './publicCreatNew'
-
-class Projects extends Component{
-  constructor(props){
-    super(props);
-    this.state={
-      category:undefined,
-      status:undefined,
-      page:1,
-      per_page:16,
-      sort_by: "updated_on",
-      sort_direction: "desc",
-      totalCount:undefined,
-      data:undefined,
-      isSpin:false
-    }
-  }
-
-  componentDidMount=()=>{
-    this.setState({
-      isSpin:true
-    })
-    let {category, status, page, sort_by, sort_direction} = this.state;
-    this.getCourses(category, status, page, sort_by, sort_direction);
-  }
-
-  getCourses = (category, status, page, sort_by, sort_direction) => {
-    let url=`/users/${this.props.match.params.username}/projects.json`;
-    axios.get((url),{params:{
-        category,
-        status,
-        page,
-        sort_by,
-        sort_direction,
-        per_page:this.props.is_current && category && page ==1?17:16
-      }}).then((result)=>{
-      if(result){
-        if (result.data.status === 403||result.data.status === 401||result.data.status === 500||result.data.status === 404) {
-          this.setState({
-            isSpin:false,
-            totalCount:0
-          })
-        }else{
-          this.setState({
-            totalCount:result.data.count,
-            data:result.data,
-            sort_by: sort_by,
-            sort_direction: sort_direction,
-            isSpin:false
-          })
-        }
-
-      }
-    }).catch((error)=>{
-      console.log(error);
-      this.setState({
-        isSpin: false
-      })
-    })
-  }
-
-  //切换种类
-  changeCategory=(cate)=>{
-    this.setState({
-      category:cate,
-      page:1,
-      isSpin:true
-    })
-    let {status, sort_by, sort_direction} = this.state;
-    this.getCourses(cate, status, 1, sort_by,
-      sort_direction);
-  }
-  //切换状态
-  changeStatus=(status)=>{
-    this.setState({
-      status:status,
-      page:1,
-      isSpin:true
-    })
-    let {
-      category, sort_by,
-      sort_direction
-    } = this.state;
-    this.getCourses(category, status, 1, sort_by,
-      sort_direction);
-  }
-  //切换页数
-  changePage=(page)=>{
-    this.setState({
-      page,
-      isSpin:true
-    })
-    let {
-      category, status, sort_by,
-      sort_direction
-    } = this.state;
-    this.getCourses(category, status, page, sort_by,
-      sort_direction);
-  }
-
-  // 进入项目
-  turnToCourses=(url,flag)=>{
-    if(flag){
-      window.location.href=url;
-    }
-  }
-
-
-  //切换种类
-  updatedlist(sort_by) {
-    //按照什么样子排序
-    this.setState({
-      isSpin: true
-    });
-    let {category, status, page, sort_direction} = this.state;
-    this.getCourses(category, status, 1, sort_by, "desc");
-  }
-
-  //排序
-  updatedlists(sort_directions) {
-    //是否是倒序
-    this.setState({
-      isSpin: true
-    });
-    let {category, status, page, sort_by, sort_direction} = this.state;
-    let sort_directiony = sort_directions;
-    if (sort_directions === "asc") {
-      if (sort_directions === sort_direction) {
-        sort_directiony = "desc"
-      }
-    } else if (sort_directions === "desc") {
-      if (sort_directions === sort_direction) {
-        sort_directiony = "asc"
-      }
-    }
-    this.getCourses(category, status, page, sort_by, sort_directiony);
-  }
-
-  render(){
-    let{
-      category,
-      status,
-      page,
-      data,
-      totalCount,
-      isSpin,
-      sort_by,
-      sort_direction
-    } = this.state;
-    let isStudent = this.props.isStudent();
-    let  is_current=this.props.is_current;
-    const {current_user} = this.props
-
-    const menu = (
-      <Menu>
-        <Menu.Item onClick={() => this.updatedlist("updated_on")}>
-          最新动态
-        </Menu.Item>
-        <Menu.Item onClick={() => this.updatedlist("created_on")}>
-          最新创建
-        </Menu.Item>
-
-      </Menu>
-    );
-    return(
-      <div className="educontent">
-        <Spin size="large" spinning={isSpin}>
-          <style>
-            {
-              `
-             .whitepanelyslli {
-                width: 32px !important;
-             height: 48px !important;
-              line-height: 46px !important;
-             }
-              .whitepanelyslliss {
-                width: 32px !important;
-                  height: 48px !important;
-              line-height: 46px !important;
-             }
-
-              .whitepanelysllis {
-             width: 66px !important;
-              height: 48px !important;
-              line-height: 46px !important;
-              margin-left: 40px !important;
-              }
-
-                 .whitepanelysllisyt {
-             width: 60px !important;
-              height: 48px !important;
-              line-height: 46px !important;
-              margin-left: 40px !important;
-              }
-
-
-              .white-panel li.active {
-                  border-radius: 24px;
-                  border: none !important;
-                  color: #4CACFF;
-              }
-
-
-
-              `
-            }
-          </style>
-          <div className="white-panel edu-back-white pt20 pb20  clearfix ">
-            <li className={category ? " font-16 whitepanelyslli" : "active font-16 whitepanelyslli"}><a
-              href="javascript:void(0)" onClick={() => this.changeCategory()} className="font-16 w32">全部</a></li>
-            <li className={category == "manage" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
-              href="javascript:void(0)" onClick={() => this.changeCategory("manage")}
-              className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}管理的</a></li>
-            <li className={category == "study" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
-              href="javascript:void(0)" onClick={() => this.changeCategory("study")}
-              className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}参与的</a></li>
-          </div>
-          <style>
-            {
-              `  .secondNavs li {
-                color: #676767;
-                /* margin: 0px 20px; */
-                float: left;
-             }
-             .secondNavs li a:hover{
-             color: #4CACFF
-             }
-             .secondNavs li.active a{
-             color: #4CACFF
-             }
-             `
-            }
-          </style>
-          {
-            is_current &&
-            <div className="edu-back-white padding10-30 clearfix secondNavs bor-top-greyE">
-              <li className={status ? "whitepanelyslliss" : "active whitepanelyslliss"}><a href="javascript:void(0)"
-                                                                                           onClick={() => this.changeStatus()}
-                                                                                           className=" w32">全部</a></li>
-              <li className={status == "publicly" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-                href="javascript:void(0)" onClick={() => this.changeStatus("publicly")} className=" w60">公开</a></li>
-              <li className={status == "personal" ? "active whitepanelysllisyt" : "whitepanelysllisyt"}><a
-                href="javascript:void(0)" onClick={() => this.changeStatus("personal")} className=" w60">私有</a></li>
-            </div>
-          }
-          <p className="clearfix font-12 " style={{
-            lineHeight: "41px",
-            marginTop: "10px",
-          }}>
-            <span className="fl color-grey-9">共参与{totalCount}个{category?category=="manage"?"发布":"学习":"项目"}</span>
-            <sapn className="relativef color-grey-9  fr"
-                  style={{
-                    display: "flex",
-                    flexDirection: "column",
-                    height: "40px",
-                    lineHeight: "40px",
-                  }}
-            >
-            <span
-              style={{
-                flexDirection: "column",
-                textAlign: "center",
-                height: "10px",
-                lineHeight: "10px",
-                display: "table",
-                marginTop: "9px",
-              }}
-            >
-                 <i className={sort_direction === "asc" ?
-                   "iconfont icon-sanjiaoxing-up font-12  color-blue h10 " : "iconfont icon-sanjiaoxing-up font-12 h10"}
-                    onClick={() => this.updatedlists("asc")}></i>
-
-            </span>
-
-              <span
-                style={{
-                  flexDirection: "column",
-                  height: "10px",
-                  lineHeight: "10px",
-                  textAlign: "center",
-                  display: "table",
-                }}
-              >
-                          <i className={sort_direction === "desc" ?
-                            "iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue h10" : "iconfont icon-sanjiaoxing-down font-12 yslbottomsj h10"}
-                             onClick={() => this.updatedlists("desc")}></i>
-            </span>
-            </sapn>
-            <Dropdown overlay={menu}>
-										<span className="fr color-grey-9 mr10 pointer " style={{
-                      display: "flex",
-                      flexDirection: "initial",
-                    }}>
-											<span>{sort_by === "updated_on" ? '最近更新' : sort_by === "created_on" ? '最新创建' : ""}</span>
-
-										</span>
-            </Dropdown>
-          </p>
-          <style>
-            {
-              `
-							.square-list{width: 100%;box-sizing: border-box;margin-top:10px}
-							`
-            }
-          </style>
-          <div className="square-list clearfix">
-            {/* 289 */}
-            {
-              page == 1 && is_current ?
-                <Create href={`/projects/deposit/new`} name={"新建开发项目"} index="4" Createtype={"projects"}
-                        {...this.props} {...this.state}
-                ></Create>:""
-            }
-            {
-              (!data || (data && data.projects.length==0)) && category && <NoneData></NoneData>
-
-            }
-            {
-              data===undefined||data.projects.length===0?category=="manage"||category=="study"?"":<NoneData></NoneData>:""
-            }
-            {
-              data && data.projects && data.projects.map((item,key)=>{
-                return(
-                  <div className="square-Item" onClick={()=>this.turnToCourses(`/projects/${item.id}`,item.can_visited)} style={{"cursor": "pointer","height":"289px"}}>
-                    {
-                      item.is_public==1 &&
-                      <React.Fragment>
-                        <div className="publicpart"></div>
-                        <span className="smalltrangle"></span>
-                        <span className="publicword">公开</span>
-                      </React.Fragment>
-                    }
-                    {
-                      item.can_visited ==false?
-                        <div className="closeSquare">
-                          <img src={getImageUrl("images/educoder/icon/lockclose.svg")} className="mt80 mb25"/>
-                          <p className="font-14 color-white">非成员不能访问</p>
-                        </div>:""
-                    }
-                    <div className="substance">
-                      <p className="subName font-16">
-                        <span>{item.name}</span>
-                      </p>
-                      <span><img alt="用户" className="radius mt15" height="60" src={getImageUrl(`images/${item.owner.avatar_url}`)} width="60"/></span>
-                      <p className="font-14 mt10 task-hide"><span>{item.owner.real_name}</span></p>
-                      <p className="font-16 mb15 mt10 task-hide">
-                        {
-                          item.category && item.category.name && <span className="projectTag categoryTag">{item.category.name}</span>
-                        }
-                        {
-                          item.language && item.language.name && <span className="projectTag languageTag">{item.language.name}</span>
-                        }
-                        {/*<span className="color-grey-9">{item.category.school_name}</span>*/}
-                      </p>
-                    </div>
-                    <div className="edu-txt-center course-bottom">
-                      <div className="inline color-grey-6">
-                        {
-                          item.members_count > 0 &&
-                          <Tooltip placement="bottom" title={"成员数"}>
-                            <span className="mr10 ml10 fl squareIconSpan">
-                            <i className="iconfont icon-chengyuan fl mr3"></i>{item.members_count}</span>
-                          </Tooltip>
-
-                        }
-                        {
-                          item.issues_count > 0 &&
-                          <Tooltip placement="bottom" title={"任务数"}>
-                            <span className="mr10 ml10 fl squareIconSpan">
-                            <i className="iconfont icon-issue fl mr3"></i>{item.issues_count}</span>
-                          </Tooltip>
-
-                        }
-                        {
-                          item.changesets_count > 0 &&
-                          <Tooltip placement="bottom" title={"版本库"}>
-                            <span className="mr10 ml10 fl squareIconSpan">
-                          <i className="iconfont icon-banbenku fl mr3"></i>{item.changesets_count}</span>
-                          </Tooltip>
-
-                        }
-                      </div>
-                    </div>
-                  </div>
-                )
-              })
-            }
-          </div>
-          {
-            totalCount > 15 &&
-            <div className="mt30 mb50 edu-txt-center">
-              <Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page}/>
-            </div>
-          }
-        </Spin>
-      </div>
-    )
-  }
-}
-export default Projects;
diff --git a/src/modules/user/usersInfo/banks/BanksTabIndex.js b/src/modules/user/usersInfo/banks/BanksTabIndex.js
index e38bb5de..9e12dc4a 100644
--- a/src/modules/user/usersInfo/banks/BanksTabIndex.js
+++ b/src/modules/user/usersInfo/banks/BanksTabIndex.js
@@ -40,23 +40,21 @@ class BanksTabIndex extends Component{
 
   render(){
     let{
-      banksMenu      
+      banksMenu
     }=this.state
 
     const common={
       initPublic:this.initPublic,
     };
-    console.log("BanksTabIndex");
-    console.log(banksMenu);
-    console.log(this.props);
+
     return(
       <React.Fragment>
         {
-          banksMenu && 
-          <BanksMenu 
+          banksMenu &&
+          <BanksMenu
             banksMenu={banksMenu}
             {...this.props}
-            {...this.state} 
+            {...this.state}
             {...common}
           ></BanksMenu>
         }
@@ -67,7 +65,7 @@ class BanksTabIndex extends Component{
                 return (<ExerciseBanksDetail {...this.props} {...props} {...this.state} {...common}
                 />)
               }
-          }></Route>  
+          }></Route>
 
           <Route path={`/banks/gtopic/:bankId/:type`}
             render={
diff --git a/src/modules/user/usersInfo/banks/PollBanksContent.js b/src/modules/user/usersInfo/banks/PollBanksContent.js
index 5c08b124..5bdd9d69 100644
--- a/src/modules/user/usersInfo/banks/PollBanksContent.js
+++ b/src/modules/user/usersInfo/banks/PollBanksContent.js
@@ -12,8 +12,7 @@ class PollBanksContent extends Component{
   }
 
   componentDidMount = () =>{
-    console.log("PollBanksContent");
-    console.log(this.props)
+
     let bankId=this.props.match.params.bankId;
     let url = `/exercise_banks/${bankId}.json`
     axios.get(url).then((result)=>{
diff --git a/src/modules/user/usersInfo/banner_out.js b/src/modules/user/usersInfo/banner_out.js
index 986a66cd..1f693f1e 100644
--- a/src/modules/user/usersInfo/banner_out.js
+++ b/src/modules/user/usersInfo/banner_out.js
@@ -1,190 +1,190 @@
-import React, { Component } from 'react';
-
-import {Link} from 'react-router-dom';
-import {Tooltip,Menu} from 'antd';
-import {getImageUrl} from 'educoder';
-
-import "./usersInfo.css"
-import "../../courses/css/members.css"
-import "../../courses/css/Courses.css"
-class banner_out extends Component{
-  constructor(props){
-    super(props);
-  }
-  render(){
-    let { 
-      data ,
-      is_current,
-      is_edit,
-      sign,
-      type,
-      followed,
-      id,
-      login,
-      moduleName,
-      next_gold
-     }=this.props;
-     let {username}= this.props.match.params;
-    return(
-      <div className="user-main-half">
-          <div className="user-headImg"></div>
-          <div className="user-headCon">
-            <div className="pr" style={{"min-height": "465px"}}>
-              <div className="educontent pt80 clearfix edu-txt-center">
-                <div className="inline">
-                  <div className="fl headtab">
-                    <span>{is_current ? "我":"TA"}的经验值</span>
-                    <a style={{ cursor: 'default' }}
-											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_experience`}
-										>{data && data.experience}</a>
-                  </div>
-                  <em className="v-h-line fl"></em>
-                  <div className="fl headtab">
-                    <span>{is_current ? "我":"TA"}的金币</span>
-                    <a style={{ cursor: 'default' }}
-											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_grade`}
-											id="user_code">{data && data.grade}</a>
-                  </div>
-                  <div className="headphoto mt14">
-                    <img alt="头像" id="user_avatar_show" nhname="avatar_image" src={data && `${getImageUrl('images/'+data.avatar_url)}`}/>
-                  </div>
-                  <div className="fl headtab">
-                    <span>{is_current ? "我":"TA"}的粉丝</span>
-                    <a style={{ cursor: 'default' }}
-											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_fanslist`}
-											id="user_h_fan_count">{data && data.fan_count}</a>
-                  </div>
-                  <em className="v-h-line fl"></em>
-                  <div className="fl headtab">
-                    <span>{is_current ? "我":"TA"}的关注</span>
-                    <a style={{ cursor: 'default' }}
-											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_watchlist`}
-										>{data && data.follow_count}</a>
-                  </div>
-                  <span className="clearfix"></span>
-                  <span className="myName">{data && data.name}</span>
-                </div>
-              </div>
-              <div className="educontent mt10 clearfix edu-txt-center">
-                <div className="inline">
-                  {
-                    data && is_current == false && data.identity =="学生" ? "" : <span className="mypost fl mr10">{data && data.identity}</span>
-                  }
-                  <a
-										 // href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/account/authentication` :"javascript:void(0)"}
-										 // target="_blank"
-										 className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
-                    <Tooltip placement='bottom' title={ data && data.authentication ?"已实名认证":"未实名认证"}>
-                      <i className={ data && data.authentication ? "iconfont icon-shenfenrenzheng font-13 color-blue":"iconfont icon-shenfenrenzheng font-13 color-grey-9"}></i>
-                    </Tooltip>
-                  </a>
-                  <a
-										// href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/account/professional_certification` :"javascript:void(0)"}
-										// target="_blank"
-										className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
-                    <Tooltip placement='bottom' title={ data && data.professional_certification ?"已职业认证":"未职业认证"}>
-                      <i className={ data && data.professional_certification ? "iconfont icon-zhiyerenzheng font-13 color-blue":"iconfont icon-zhiyerenzheng font-13 color-grey-9"}></i>
-                    </Tooltip>
-                  </a>
-                  <a
-										// href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/account/change_or_bind?type=phone` :"javascript:void(0)"}
-										// target="_blank"
-										className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
-                    <Tooltip placement='bottom' title={ data && data.phone_binded ?"已手机认证":"未手机认证"}>
-                      <i className={ data && data.phone_binded ? "iconfont icon-shoujirenzheng font-13 color-blue":"iconfont icon-shoujirenzheng font-13 color-grey-9"}></i>
-                    </Tooltip>
-                  </a>
-                  <a
-										// href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/my/account` :"javascript:void(0)"}
-										// target="_blank"
-										className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
-                    <Tooltip placement='bottom' title={ data && data.email_binded ?"已邮箱认证":"未邮箱认证"}>
-                      <i className={ data && data.email_binded ? "iconfont icon-youxiangrenzheng font-13 color-blue":"iconfont icon-youxiangrenzheng font-13 color-grey-9"}></i>
-                    </Tooltip>
-                  </a>
-                  {/* <!--学院管理员身份--> */}
-                  {
-                    data && data.college_identifier &&
-                    <a
-											// href={`${this.props.Headertop && this.props.Headertop.old_url}/colleges/${data.college_identifier}/statistics`} target="_blank"
-											className={is_current ? "ringauto fl" :"ringauto fl cdefault"}>
-                      <Tooltip placement='bottom' title="学院管理员">
-                        <i className="iconfont icon-chengyuanguanli font-12 color-blue" data-tip-down="学院管理员"></i>
-                      </Tooltip>
-                    </a>
-                  }
-                </div>
-              </div>
-              <div className="mt15 educontent clearfix edu-txt-center">
-                <p className="mb20" style={{"height": "28px"}}>
-                  {
-                    is_edit && is_current ? 
-                    <input type="text" id="mysign" class="mysign-input" placeholder="请输入您的个性签名" style={{height:"20px"}} value={sign} onInput={this.inputSign} onBlur={this.savemysign}/>
-                    :
-                    is_current ? 
-                    <a className="mysign-span" onClick={this.editmysign} style={{"display": "block"}}>{sign || "这家伙很懒，什么都没留下~"}</a>
-                    :
-                    <span className="mysign-span" style={{"display": "block","cursor":"default"}}>{sign || "这家伙很懒，什么都没留下~"}</span>
-                  }
-                </p>
-                {
-                  is_current ? 
-                  <div className="inline">
-                    {
-                      data && data.attendance_signed ? 
-                      <React.Fragment>
-                        <span className="user_default_btn user_grey_btn mb5">已签到</span>
-                        <p id="attendance_notice" className="none font-12 color-grey-6" style={{"display":"block"}}>明日签到&nbsp;<font className="color-orange">+{next_gold}</font>&nbsp;金币</p>
-                      </React.Fragment>
-                      :
-                      <a herf="javascript:void(0);" onClick={this.props.signFor} id="attendance" className="user_default_btn user_orange_btn fl mb15">签到</a>
-                      // <a herf="javascript:void(0);" onClick={this.trialapplications} id="authentication_apply" className="user_default_btn user_private_btn fl ml15">试用申请</a>
-                    }
-                  </div> 
-                  :
-                  <div className="inline">
-                    <a href="javascript:void(0);" onClick={this.props.followPerson} className="user_default_btn user_watch_btn user_private_btn fl mr20">{followed ? "取消关注":"关注"}</a>
-                    <a href={`${this.props.Headertop && this.props.Headertop.old_url}/messages/${login}/message_detail?target_ids=${id}`} className="user_default_btn user_private_btn fl">私信</a>
-                  </div>
-                }
-              </div>
-              <div className="edu-txt-center navInfo">
-                <div className="inline">
-                  <li className={`${moduleName == 'courses' ||moduleName == undefined ? 'active' : '' }`}>
-                    <Link
-                      onClick={() => this.setState({moduleName: 'courses'})}
-                      to={`/users/${username}/courses`}>课堂</Link>
-                  </li>
-                  <li className={`${moduleName == 'shixuns' ? 'active' : '' }`}>
-                    <Link
-                      onClick={() => this.setState({moduleName: 'shixuns'})}
-                      to={`/users/${username}/shixuns`}>实训</Link>
-                  </li>
-                  <li className={`${moduleName == 'paths' ? 'active' : '' }`}>
-                    <Link 
-                      onClick={() => this.setState({moduleName: 'paths'})}
-                      to={`/users/${username}/paths`}>实践课程</Link>
-                  </li>
-                  <li className={`${moduleName == 'projects' ? 'active' : '' }`}>
-                 <Link
-                      onClick={() => this.setState({moduleName: 'projects'})}
-                      to={`/users/${username}/projects`}>开发项目</Link>
-                  </li>
-
-									<li className={`${moduleName == 'package' ? 'active' : '' }`}>
-										<Link
-											onClick={() => this.setState({moduleName: 'package'})}
-											to={`/users/${username}/package`}>众包</Link>
-									</li>
-
-                  {/*{ data && data.identity!="学生" && <li> <a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}?type=m_bank`}>题库</a></li>}*/}
-                  
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-    )
-  }
-}
-export default banner_out;
\ No newline at end of file
+import React, { Component } from 'react';
+
+import { Link } from 'react-router-dom';
+import { Tooltip, Menu } from 'antd';
+import { getImageUrl } from 'educoder';
+
+import "./usersInfo.css"
+import "../../courses/css/members.css"
+import "../../courses/css/Courses.css"
+class banner_out extends Component {
+  constructor(props) {
+    super(props);
+  }
+  render() {
+    let {
+      data,
+      is_current,
+      is_edit,
+      sign,
+      type,
+      followed,
+      id,
+      login,
+      moduleName,
+      next_gold
+    } = this.props;
+    let { username } = this.props.match.params;
+    return (
+      <div className="user-main-half">
+        <div className="user-headImg"></div>
+        <div className="user-headCon">
+          <div className="pr" style={{ "min-height": "465px" }}>
+            <div className="educontent pt80 clearfix edu-txt-center">
+              <div className="inline">
+                <div className="fl headtab">
+                  <span>{is_current ? "我" : "TA"}的经验值</span>
+                  <a style={{ cursor: 'default' }}
+                  // href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_experience`}
+                  >{data && data.experience}</a>
+                </div>
+                <em className="v-h-line fl"></em>
+                <div className="fl headtab">
+                  <span>{is_current ? "我" : "TA"}的金币</span>
+                  <a style={{ cursor: 'default' }}
+                    // href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_grade`}
+                    id="user_code">{data && data.grade}</a>
+                </div>
+                <div className="headphoto mt14">
+                  <img alt="头像" id="user_avatar_show" nhname="avatar_image" src={data && `${getImageUrl('images/' + data.avatar_url)}`} />
+                </div>
+                <div className="fl headtab">
+                  <span>{is_current ? "我" : "TA"}的粉丝</span>
+                  <a style={{ cursor: 'default' }}
+                    // href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_fanslist`}
+                    id="user_h_fan_count">{data && data.fan_count}</a>
+                </div>
+                <em className="v-h-line fl"></em>
+                <div className="fl headtab">
+                  <span>{is_current ? "我" : "TA"}的关注</span>
+                  <a style={{ cursor: 'default' }}
+                  // href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_watchlist`}
+                  >{data && data.follow_count}</a>
+                </div>
+                <span className="clearfix"></span>
+                <span className="myName">{data && data.name}</span>
+              </div>
+            </div>
+            <div className="educontent mt10 clearfix edu-txt-center">
+              <div className="inline">
+                {
+                  data && is_current == false && data.identity == "学生" ? "" : <span className="mypost fl mr10">{data && data.identity}</span>
+                }
+                <a
+                  // href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/account/authentication` :"javascript:void(0)"}
+                  // target="_blank"
+                  className={is_current ? "ringauto fl" : "ringauto fl cdefault"}>
+                  <Tooltip placement='bottom' title={data && data.authentication ? "已实名认证" : "未实名认证"}>
+                    <i className={data && data.authentication ? "iconfont icon-shenfenrenzheng font-13 color-blue" : "iconfont icon-shenfenrenzheng font-13 color-grey-9"}></i>
+                  </Tooltip>
+                </a>
+                <a
+                  // href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/account/professional_certification` :"javascript:void(0)"}
+                  // target="_blank"
+                  className={is_current ? "ringauto fl" : "ringauto fl cdefault"}>
+                  <Tooltip placement='bottom' title={data && data.professional_certification ? "已职业认证" : "未职业认证"}>
+                    <i className={data && data.professional_certification ? "iconfont icon-zhiyerenzheng font-13 color-blue" : "iconfont icon-zhiyerenzheng font-13 color-grey-9"}></i>
+                  </Tooltip>
+                </a>
+                <a
+                  // href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/account/change_or_bind?type=phone` :"javascript:void(0)"}
+                  // target="_blank"
+                  className={is_current ? "ringauto fl" : "ringauto fl cdefault"}>
+                  <Tooltip placement='bottom' title={data && data.phone_binded ? "已手机认证" : "未手机认证"}>
+                    <i className={data && data.phone_binded ? "iconfont icon-shoujirenzheng font-13 color-blue" : "iconfont icon-shoujirenzheng font-13 color-grey-9"}></i>
+                  </Tooltip>
+                </a>
+                <a
+                  // href={is_current ? `${this.props.Headertop && this.props.Headertop.old_url}/my/account` :"javascript:void(0)"}
+                  // target="_blank"
+                  className={is_current ? "ringauto fl" : "ringauto fl cdefault"}>
+                  <Tooltip placement='bottom' title={data && data.email_binded ? "已邮箱认证" : "未邮箱认证"}>
+                    <i className={data && data.email_binded ? "iconfont icon-youxiangrenzheng font-13 color-blue" : "iconfont icon-youxiangrenzheng font-13 color-grey-9"}></i>
+                  </Tooltip>
+                </a>
+                {/* <!--学院管理员身份--> */}
+                {
+                  data && data.college_identifier &&
+                  <a
+                    // href={`${this.props.Headertop && this.props.Headertop.old_url}/colleges/${data.college_identifier}/statistics`} target="_blank"
+                    className={is_current ? "ringauto fl" : "ringauto fl cdefault"}>
+                    <Tooltip placement='bottom' title="学院管理员">
+                      <i className="iconfont icon-chengyuanguanli font-12 color-blue" data-tip-down="学院管理员"></i>
+                    </Tooltip>
+                  </a>
+                }
+              </div>
+            </div>
+            <div className="mt15 educontent clearfix edu-txt-center">
+              <p className="mb20" style={{ "height": "28px" }}>
+                {
+                  is_edit && is_current ?
+                    <input type="text" id="mysign" className="mysign-input" placeholder="请输入您的个性签名" style={{ height: "20px" }} value={sign} onInput={this.inputSign} onBlur={this.savemysign} />
+                    :
+                    is_current ?
+                      <a className="mysign-span" onClick={this.editmysign} style={{ "display": "block" }}>{sign || "这家伙很懒，什么都没留下~"}</a>
+                      :
+                      <span className="mysign-span" style={{ "display": "block", "cursor": "default" }}>{sign || "这家伙很懒，什么都没留下~"}</span>
+                }
+              </p>
+              {
+                is_current ?
+                  <div className="inline">
+                    {
+                      data && data.attendance_signed ?
+                        <React.Fragment>
+                          <span className="user_default_btn user_grey_btn mb5">已签到</span>
+                          <p id="attendance_notice" className="none font-12 color-grey-6" style={{ "display": "block" }}>明日签到&nbsp;<font className="color-orange">+{next_gold}</font>&nbsp;金币</p>
+                        </React.Fragment>
+                        :
+                        <a herf="javascript:void(0);" onClick={this.props.signFor} id="attendance" className="user_default_btn user_orange_btn fl mb15">签到</a>
+                      // <a herf="javascript:void(0);" onClick={this.trialapplications} id="authentication_apply" className="user_default_btn user_private_btn fl ml15">试用申请</a>
+                    }
+                  </div>
+                  :
+                  <div className="inline">
+                    <a href="javascript:void(0);" onClick={this.props.followPerson} className="user_default_btn user_watch_btn user_private_btn fl mr20">{followed ? "取消关注" : "关注"}</a>
+                    <a href={`${this.props.Headertop && this.props.Headertop.old_url}/messages/${login}/message_detail?target_ids=${id}`} className="user_default_btn user_private_btn fl">私信</a>
+                  </div>
+              }
+            </div>
+            <div className="edu-txt-center navInfo">
+              <div className="inline">
+                <li className={`${moduleName == 'classrooms' || moduleName == undefined ? 'active' : ''}`}>
+                  <Link
+                    onClick={() => this.setState({ moduleName: 'classrooms' })}
+                    to={`/users/${username}/classrooms`}>课堂</Link>
+                </li>
+                <li className={`${moduleName == 'shixuns' ? 'active' : ''}`}>
+                  <Link
+                    onClick={() => this.setState({ moduleName: 'shixuns' })}
+                    to={`/users/${username}/shixuns`}>实训</Link>
+                </li>
+                <li className={`${moduleName == 'paths' ? 'active' : ''}`}>
+                  <Link
+                    onClick={() => this.setState({ moduleName: 'paths' })}
+                    to={`/users/${username}/paths`}>实践课程</Link>
+                </li>
+                <li className={`${moduleName == 'projects' ? 'active' : ''}`}>
+                  <Link
+                    onClick={() => this.setState({ moduleName: 'projects' })}
+                    to={`/users/${username}/projects`}>开发项目</Link>
+                </li>
+
+                <li className={`${moduleName == 'package' ? 'active' : ''}`}>
+                  <Link
+                    onClick={() => this.setState({ moduleName: 'package' })}
+                    to={`/users/${username}/package`}>众包</Link>
+                </li>
+
+                {/*{ data && data.identity!="学生" && <li> <a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}?type=m_bank`}>题库</a></li>}*/}
+
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    )
+  }
+}
+export default banner_out;
diff --git a/src/modules/user/usersInfo/common/HeadlessModal.js b/src/modules/user/usersInfo/common/HeadlessModal.js
index b208cb95..c5a6e39a 100644
--- a/src/modules/user/usersInfo/common/HeadlessModal.js
+++ b/src/modules/user/usersInfo/common/HeadlessModal.js
@@ -1,22 +1,14 @@
-import React, { useState, useEffect, useContext, useRef, memo } from 'react';
-import {Link} from 'react-router-dom';
+import React, { useContext } from 'react';
 
-import { getUrl2, isDev, ThemeContext } from 'educoder'
+import { ThemeContext } from 'educoder'
 import { Modal } from 'antd'
 
 
-function HeadlessModal (props) { 
-    // const [ visible, setVisible ] = useState(false)
+function HeadlessModal(props) {
     const theme = useContext(ThemeContext);
-    const { category, visible, setVisible, className, width } = props;
-    
-    
-    useEffect(() => {
-
-    }, [])
-
+    const { visible, setVisible, className, width } = props;
     return (
-        <Modal 
+        <Modal
             visible={visible}
             className={`headless ${className}`}
             title={null}
@@ -48,7 +40,7 @@ function HeadlessModal (props) {
                     top: -13px;
                 }
             `}</style>
-            <i className="iconfont icon-htmal5icon19 closeBtn" onClick={ () => setVisible(false) }></i>
+            <i className="iconfont icon-htmal5icon19 closeBtn" onClick={() => setVisible(false)}></i>
             {props.children}
         </Modal>
     )
diff --git a/src/modules/user/usersInfo/common/InfoTab.js b/src/modules/user/usersInfo/common/InfoTab.js
index bb076144..7af1a22d 100644
--- a/src/modules/user/usersInfo/common/InfoTab.js
+++ b/src/modules/user/usersInfo/common/InfoTab.js
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useContext, useRef, memo } from 'react';
-import {Link} from 'react-router-dom';
+import { Link } from 'react-router-dom';
 
 import { getUrl2, isDev, ThemeContext } from 'educoder'
 import axios from 'axios'
@@ -7,38 +7,38 @@ import axios from 'axios'
 
 function InfoTab(props) {
 
-    const theme = useContext(ThemeContext);
-    const { category, changeCategory, categories, right } = props;
-    const username = props.match.params.username
+  const theme = useContext(ThemeContext);
+  const { category, changeCategory, categories, right } = props;
+  const username = props.match.params.username
 
-    useEffect(() => {
+  useEffect(() => {
 
-    }, [])
+  }, [])
 
-    return (
-        <div className="white-panel edu-back-white pt20 pb20 clearfix ">
-          {categories && categories.map(item => {
-            return (
-							item.id === 1 ?
-								<li key={item.key}
-										className={category == item.key ? "active whitepanelysllisyt" : 'whitepanelysllisyt'}><a
-									href="javascript:void(0)" onClick={() => changeCategory(item.key)}
-									style={{width: "70px"}}>{item.name}</a></li>
-								:
-								<li key={item.key}
-										className={category == item.key ? "active whitepanelysllisyts" : 'whitepanelysllisyts'}><a
-									href="javascript:void(0)" onClick={() => changeCategory(item.key)}
-									style={{width: "80px"}}>{item.name}</a></li>
-            )
-          })}
-          {/* <li className={category ? "" : "active"}><a href="javascript:void(0)" onClick={()=>this.changeCategory()}>全部</a></li>
-          <li className={category=="manage" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的</a></li>
-          <li className={category=="study" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("study")}>{is_current ? "我":"TA"}学习的</a></li> */}
-          <div className="fr">
-          {right}
-          </div>
-        </div>
-    )
+  return (
+    <div className="white-panel edu-back-white pt20 pb20 clearfix ">
+      {categories && categories.map(item => {
+        return (
+          item.id === 1 ?
+            <li key={item.key}
+              className={category == item.key ? "active whitepanelysllisyt" : 'whitepanelysllisyt'}><a
+                onClick={() => changeCategory(item.key)}
+                style={{ width: "70px" }}>{item.name}</a></li>
+            :
+            <li key={item.key}
+              className={category == item.key ? "active whitepanelysllisyts" : 'whitepanelysllisyts'}><a
+                onClick={() => changeCategory(item.key)}
+                style={{ width: "80px" }}>{item.name}</a></li>
+        )
+      })}
+      {/* <li className={category ? "" : "active"}><a   onClick={()=>this.changeCategory()}>全部</a></li>
+          <li className={category=="manage" ? "active" : ""}><a   onClick={()=>this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的</a></li>
+          <li className={category=="study" ? "active" : ""}><a   onClick={()=>this.changeCategory("study")}>{is_current ? "我":"TA"}学习的</a></li> */}
+      <div className="fr">
+        {right}
+      </div>
+    </div>
+  )
 }
 
 export default InfoTab
diff --git a/src/modules/user/usersInfo/usersInfo.css b/src/modules/user/usersInfo/usersInfo.css
index 97df7fb3..4755c6c7 100644
--- a/src/modules/user/usersInfo/usersInfo.css
+++ b/src/modules/user/usersInfo/usersInfo.css
@@ -1,470 +1,555 @@
-.navInfo{
-  border:none!important;
+.navInfo {
+  border: none !important;
   position: absolute;
   width: 100%;
   bottom: -8px;
 }
+
 .navInfo li {
   float: left;
   margin: 0px 40px;
-  padding:0px;
+  padding: 0px;
   height: 45px;
   line-height: 40px;
   font-size: 16px;
   position: relative;
 }
-.navInfo li.active::after{
+
+.navInfo li.active::after {
   position: absolute;
   left: 0px;
   height: 2px;
   width: 100%;
   content: '';
   bottom: 0px;
-  background: #05101A!important;
-  color: #666!important;
+  background: #05101A !important;
+  color: #666 !important;
 }
-.navInfo li,.navInfo li.ant-menu-item-active{
-  border-bottom: none!important;
-  color: #666!important;
-}
-.navInfo li.ant-menu-item-selected{
-  border-bottom: 2px solid #05101A!important;
-  color: #05101A!important;
-}
-.navInfo ul.ant-menu{float: left!important;border:none!important;}
 
-.substancenenew{
+.navInfo li,
+.navInfo li.ant-menu-item-active {
+  border-bottom: none !important;
+  color: #666 !important;
+}
+
+.navInfo li.ant-menu-item-selected {
+  border-bottom: 2px solid #05101A !important;
+  color: #05101A !important;
+}
+
+.navInfo ul.ant-menu {
+  float: left !important;
+  border: none !important;
+}
+
+.substancenenew {
   width: 236px;
   height: 206px;
-  background: rgba(248,248,248,1);
-  border: 2px dotted rgba(225,225,225,1);
+  background: rgba(248, 248, 248, 1);
+  border: 2px dotted rgba(225, 225, 225, 1);
   opacity: 1;
   border-radius: 4px;
   padding-top: 50px;
   position: inherit;
 }
 
-.substancepad{
+.substancepad {
   padding: 20px 20px 0px 20px;
   border-bottom: 1px solid transparent;
 }
-.substancefont{
-  height:24px;
-  font-size:18px;
-  font-family:Microsoft YaHei;
-  font-weight:400;
-  line-height:21px;
-  color:rgba(153,153,153,1);
-  opacity:1;
+
+.substancefont {
+  height: 24px;
+  font-size: 18px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  line-height: 21px;
+  color: rgba(153, 153, 153, 1);
+  opacity: 1;
   margin-top: -8px;
 }
-.topten{
+
+.topten {
   width: 1px;
   height: 100px;
-  border: 2px soild rgba(225,225,225,1);
-  background: rgba(225,225,225,1);
-  border: 1px solid rgba(225,225,225,1);
+  border: 2px soild rgba(225, 225, 225, 1);
+  background: rgba(225, 225, 225, 1);
+  border: 1px solid rgba(225, 225, 225, 1);
   margin: 0 auto;
 }
-.leftten{
+
+.leftten {
   width: 100px;
   height: 1px;
-  background: rgba(225,225,225,1);
-  border: 1px solid rgba(225,225,225,1);
+  background: rgba(225, 225, 225, 1);
+  border: 1px solid rgba(225, 225, 225, 1);
   margin: 0px auto;
   position: absolute;
   top: 120px;
   left: 88px;
 }
-.squarebox{
+
+.squarebox {
   position: absolute;
   top: 0px;
   left: 0px;
 }
 
 /*题库的标签--和资源标签样式相似*/
-.bankTag{max-height: 82px;overflow-y: auto}
-.bankTag #sourceTag li{margin-left: 0px;margin-right: 5px;}
-.bank_list_Tag{cursor: default}
-/*资源标签*/
-#sourceTag li,.bank_list_Tag{font-size: 12px;color: #4E7A9B;background-color: #E5F3FF;padding: 0px 4px;height: 20px;line-height: 20px; margin-left: 5px;display: inline-block;cursor: pointer;margin-bottom: 5px;}
-#sourceTag li a{color: #4e7a9b!important;}
-#sourceTag li.active{background-color: #4CACFF;color: #fff;}
-#sourceTag li.active a{background-color: #4CACFF;color: #fff!important;}
+.bankTag {
+  max-height: 82px;
+  overflow-y: auto
+}
 
-.mtf15{
-    margin-top:-15px;
+.bankTag #sourceTag li {
+  margin-left: 0px;
+  margin-right: 5px;
+}
+
+.bank_list_Tag {
+  cursor: default
+}
+
+/*资源标签*/
+#sourceTag li,
+.bank_list_Tag {
+  font-size: 12px;
+  color: #4E7A9B;
+  background-color: #E5F3FF;
+  padding: 0px 4px;
+  height: 20px;
+  line-height: 20px;
+  margin-left: 5px;
+  display: inline-block;
+  cursor: pointer;
+  margin-bottom: 5px;
+}
+
+#sourceTag li a {
+  color: #4e7a9b !important;
+}
+
+#sourceTag li.active {
+  background-color: #4CACFF;
+  color: #fff;
+}
+
+#sourceTag li.active a {
+  background-color: #4CACFF;
+  color: #fff !important;
+}
+
+.mtf15 {
+  margin-top: -15px;
 }
 
 .project-package-item.with-operator .item-operator {
-    width: 0;
-    transition: width .2s;
-    -moz-transition: width .2s; /* Firefox 4 */
-    -webkit-transition: width .2s; /* Safari 和 Chrome */
-    -o-transition: width .2s; /* Opera */
+  width: 0;
+  transition: width .2s;
+  -moz-transition: width .2s;
+  /* Firefox 4 */
+  -webkit-transition: width .2s;
+  /* Safari 和 Chrome */
+  -o-transition: width .2s;
+  /* Opera */
 }
+
 .project-package-item.with-operator:hover .item-operator {
-    margin: -20px -20px -20px 20px;
-    padding: 20px 0;
-    width: 100px;
-    display: flex;
-    justify-content: space-around;
-    flex-direction: column;
-    align-items: center;
-    background: #f0f0f0;
+  margin: -20px -20px -20px 20px;
+  padding: 20px 0;
+  width: 100px;
+  display: flex;
+  justify-content: space-around;
+  flex-direction: column;
+  align-items: center;
+  background: #f0f0f0;
 }
+
 .project-package-item.with-operator .item-operator a {
-    display: none;
+  display: none;
 }
+
 .project-package-item.with-operator:hover .item-operator a {
-    display: block;
-    font-size: 20px;
+  display: block;
+  font-size: 20px;
 }
 
 /* 个人主页头部改版 */
-.bannerPanel{
-  width:100%;
-  top:0px;
-  left:0px;
-  height:186px;
-  padding-top:25px;
+.bannerPanel {
+  width: 100%;
+  top: 0px;
+  left: 0px;
+  height: 186px;
+  padding-top: 25px;
   box-sizing: border-box;
   background: url('../../../images/account/infobanner.png') no-repeat top center;
   background-color: #0d4473
-
 }
-.username{
-  font-size:26px;
-  margin-right:15px;
+
+.username {
+  font-size: 26px;
+  margin-right: 15px;
   height: 30px;
   line-height: 30px;
   float: left;
-  color:#fff;
+  color: #fff;
 }
-.myPhoto img{
+
+.myPhoto img {
   border-radius: 50%;
-  width:100%;
-  height:100%
+  width: 100%;
+  height: 100%
 }
-.myPhoto{
+
+.myPhoto {
   border-radius: 50%;
-  border:2px solid #fff;
-  width:110px;
-  height:110px;
+  border: 2px solid #fff;
+  width: 110px;
+  height: 110px;
 }
-.userpost{
-  padding:0px 10px;
-  border:1px solid #fff;
+
+.userpost {
+  padding: 0px 10px;
+  border: 1px solid #fff;
   border-radius: 2px;
-  color:#fff!important;
+  color: #fff !important;
   display: inline;
   margin-top: 6px;
-  float:left;
+  float: left;
 }
-.userpost label{
-    display: block;
+
+.userpost label {
+  display: block;
   height: 18px;
-  line-height:18px;
+  line-height: 18px;
 }
-.user-colorgrey-B8{color:#B8B8B8}
-.user-colorgrey-green{color:#7ED321}
-.user-colorgrey-blue{color:#98EBFF}
+
+.user-colorgrey-B8 {
+  color: #B8B8B8
+}
+
+.user-colorgrey-green {
+  color: #7ED321
+}
+
+.user-colorgrey-blue {
+  color: #98EBFF
+}
+
 .user_yellow_btn {
-  color: #fff!important;
+  color: #fff !important;
   background-color: #FF8E02;
 }
+
 .headtab span {
   color: #e8e8e8;
   font-size: 14px;
 }
-.headtab span, .headtab a {
+
+.headtab span,
+.headtab a {
   display: block;
   width: 100%;
   text-align: center;
 }
+
 .headtab {
   width: 140px;
   height: 70px;
   text-align: center;
 }
-.leftTransform:before{
+
+.leftTransform:before {
   position: absolute;
-  content:'';
-  left:0px;
-  top:6px;
-  width:1px;
-  height:84%;
+  content: '';
+  left: 0px;
+  top: 6px;
+  width: 1px;
+  height: 84%;
   background: #fff;
   transform: rotate(18deg);
 }
-.userNav{
+
+.userNav {
   height: 54px;
   line-height: 54px;
   background: #fff;
-  box-shadow:0px 9px 16px -1px #e6e6e6;
-  border-radius:7px;
-  padding:0px 10px;
+  box-shadow: 0px 9px 16px -1px #e6e6e6;
+  border-radius: 7px;
+  padding: 0px 10px;
 }
-.userNav li{
+
+.userNav li {
   display: inline-block;
-  padding:0px 30px;
+  padding: 0px 30px;
   box-sizing: border-box
 }
-.userNav li a{
-  color:#333333;
+
+.userNav li a {
+  color: #333333;
   font-size: 16px;
   display: block
 }
-.userNav li.active a{
+
+.userNav li.active a {
   position: relative;
-  color:#4CACFF;
+  color: #4CACFF;
 }
-.userNav li.active a:after{
+
+.userNav li.active a:after {
   position: absolute;
   bottom: 0px;
   height: 4px;
-  width:100%;
+  width: 100%;
   content: '';
-  left:0px;
+  left: 0px;
   background: #4CACFF;
 }
+
 /* 题库相关 */
-.breadcrumb{
+.breadcrumb {
   height: 18px;
   line-height: 18px;
-  margin:10px 0px 0px;
+  margin: 10px 0px 0px;
 }
-.breadcrumb .ant-breadcrumb a:hover{
+
+.breadcrumb .ant-breadcrumb a:hover {
   color: #459BE5 !important;
 }
-.breadcrumb .ant-breadcrumb-separator{
-  margin:0px 2px!important;
+
+.breadcrumb .ant-breadcrumb-separator {
+  margin: 0px 2px !important;
 }
-.breadcrumb span.ant-breadcrumb-link{
+
+.breadcrumb span.ant-breadcrumb-link {
   cursor: default;
 }
-.bank_is_public{
+
+.bank_is_public {
   background: #84B6EB;
   float: left;
   height: 24px;
   line-height: 24px;
-  padding:0px 20px;
+  padding: 0px 20px;
   color: #fff;
   font-size: 16px;
   margin-left: 10px;
-  border-radius:20px;
-  margin-top:3px;
+  border-radius: 20px;
+  margin-top: 3px;
 }
-.breadcrumb.ant-breadcrumb > span:last-child a{
+
+.breadcrumb.ant-breadcrumb>span:last-child a {
   color: #05101A
 }
-.breadcrumb.ant-breadcrumb a{
-  color:#999;
+
+.breadcrumb.ant-breadcrumb a {
+  color: #999;
 }
-.bank_is_private{
+
+.bank_is_private {
   background: #56B998;
   float: left;
   height: 24px;
   line-height: 24px;
-  padding:0px 20px;
+  padding: 0px 20px;
   color: #fff;
   font-size: 16px;
   margin-left: 10px;
-  border-radius:20px;
-  margin-top:3px;
-}
-.topicsbox{
-    width: 1200px;
-    /*min-height: 216px;*/
-    background: rgba(255,255,255,1);
-    padding: 0px 30px 0px 40px;
+  border-radius: 20px;
+  margin-top: 3px;
 }
 
-.topicstopfont{
-    width:64px;
-    height:16px;
-    font-size:16px;
-    font-weight:400;
-    color: #666 !important;
+.topicsbox {
+  width: 1200px;
+  /*min-height: 216px;*/
+  background: rgba(255, 255, 255, 1);
+  padding: 0px 30px 0px 40px;
 }
 
-.topcschild{
-    width:1128px;
-    height:55px;
-    line-height: 54px;
-    border-bottom:1px solid rgba(235,235,235,1);
+.topicstopfont {
+  width: 64px;
+  height: 16px;
+  font-size: 16px;
+  font-weight: 400;
+  color: #666 !important;
 }
 
-.topcsmid{
-    width:1128px;
-    height:55px;
-    line-height: 55px;
+.topcschild {
+  width: 1128px;
+  height: 55px;
+  line-height: 54px;
+  border-bottom: 1px solid rgba(235, 235, 235, 1);
 }
 
-.topcsactive{
-    color: #4CACFF !important;
-    cursor: pointer;
+.topcsmid {
+  width: 1128px;
+  height: 55px;
+  line-height: 55px;
 }
 
-.topicsmidfont{
-    max-width: 56px;
-    height: 55px;
-    font-size: 14px;
-    font-weight: 400;
-    cursor: pointer;
-    line-height: 55px;
-    color: #666;
+.topcsactive {
+  color: #4CACFF !important;
+  cursor: pointer;
 }
 
-.alltopisc{
-    width:230px;
-    height:20px;
-    font-size:14px;
-    font-weight:400;
-    color:rgba(153,153,153,1);
-    line-height:20px;
+.topicsmidfont {
+  max-width: 56px;
+  height: 55px;
+  font-size: 14px;
+  font-weight: 400;
+  cursor: pointer;
+  line-height: 55px;
+  color: #666;
 }
 
-.alltopiscright{
-    /* width: 141px; */
-    height: 20px;
-    font-size: 14px;
-    font-weight: 400;
-    color: rgba(153,153,153,1);
-    line-height: 20px;
+.alltopisc {
+  width: 230px;
+  height: 20px;
+  font-size: 14px;
+  font-weight: 400;
+  color: rgba(153, 153, 153, 1);
+  line-height: 20px;
 }
 
-.topicsbtn{
-    padding: 0px 15px;
-    border-radius: 2px;
-    /*color: #4C4C4C;*/
-    cursor: pointer;
-    display: inline-block;
-    /*background-color: #4CACFF!important;*/
-    /*color: #fff!important;*/
-    border-radius: 11px;
-    border: 1px solid rgba(76,172,255,1);
-    color: rgba(76,172,255,1);
+.alltopiscright {
+  /* width: 141px; */
+  height: 20px;
+  font-size: 14px;
+  font-weight: 400;
+  color: rgba(153, 153, 153, 1);
+  line-height: 20px;
 }
 
-.pd1323{
-    padding: 10px 6px 25px 40px;
-    /*cursor: pointer;*/
+.topicsbtn {
+  padding: 0px 15px;
+  border-radius: 2px;
+  /*color: #4C4C4C;*/
+  cursor: pointer;
+  display: inline-block;
+  /*background-color: #4CACFF!important;*/
+  /*color: #fff!important;*/
+  border-radius: 11px;
+  border: 1px solid rgba(76, 172, 255, 1);
+  color: rgba(76, 172, 255, 1);
 }
+
+.pd1323 {
+  padding: 10px 6px 25px 40px;
+  /*cursor: pointer;*/
+}
+
 .pd1323:hover {
-    box-shadow: 0px 2px 6px rgba(51,51,51,0.09);
-    opacity: 1;
-    border-radius: 2px;
-}
-.topicswidth600{
-    mac-width: 600px;
-    display: inline-block;
-}
-.topicswidth300{
-    width: 300px;
-    display: inline-block;
-}
-.topiscfilterbtn{
-    font-size: 14px;
-    color: #4CACFF !important;
-    border-radius: 5px;
-    border: 1px solid #4CACFF !important;
-    line-height: 23px !important;
+  box-shadow: 0px 2px 6px rgba(51, 51, 51, 0.09);
+  opacity: 1;
+  border-radius: 2px;
 }
 
-.topscisright{
-    right: 0px;
-    top: 45px;
-    display: block;
-    position: absolute;
+.topicswidth600 {
+  mac-width: 600px;
+  display: inline-block;
 }
 
-.topsics135{
-    max-width: 135px;
-    display: inline-block;
+.topicswidth300 {
+  width: 300px;
+  display: inline-block;
 }
 
-.professional_certificationbox{
-    height:431px;
-    background:rgba(255,255,255,1);
+.topiscfilterbtn {
+  font-size: 14px;
+  color: #4CACFF !important;
+  border-radius: 5px;
+  border: 1px solid #4CACFF !important;
+  line-height: 23px !important;
 }
 
-.pd115200{
-    padding: 55px 200px 0px 200px;
+.topscisright {
+  right: 0px;
+  top: 45px;
+  display: block;
+  position: absolute;
 }
 
-.topicsItemimg{
-    width:150px;
+.topsics135 {
+  max-width: 135px;
+  display: inline-block;
 }
 
-.topicsItemfont{
-    font-size: 18px;
-    font-family: PingFang-SC;
-    font-weight: 400;
-    color: rgba(51,51,51,1);
-    line-height: 35px;
+.professional_certificationbox {
+  height: 431px;
+  background: rgba(255, 255, 255, 1);
 }
 
-.topicsItem{
-    max-width: 1068px;
-    max-height: 115px;
-    overflow-y: auto;
+.pd115200 {
+  padding: 55px 200px 0px 200px;
 }
 
-.mb45{
-    margin-bottom: 45px!important;
+.topicsItemimg {
+  width: 150px;
 }
 
-.topsicsmax550{
-    max-width: 550px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    position: absolute;
-    top: -16px;
+.topicsItemfont {
+  font-size: 18px;
+  font-family: PingFang-SC;
+  font-weight: 400;
+  color: rgba(51, 51, 51, 1);
+  line-height: 35px;
 }
 
-.topsicrelative{
-    position: relative;
+.topicsItem {
+  max-width: 1068px;
+  max-height: 115px;
+  overflow-y: auto;
 }
 
-.topsicinline{
-    display: inline-block;
+.mb45 {
+  margin-bottom: 45px !important;
 }
+
+.topsicsmax550 {
+  max-width: 550px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  position: absolute;
+  top: -16px;
+}
+
+.topsicrelative {
+  position: relative;
+}
+
+.topsicinline {
+  display: inline-block;
+}
+
 /* 防抖 */
 .educontent .square-list {
   min-height: 400px;
-  flex-wrap:wrap;
-  display:flex;
+  flex-wrap: wrap;
+  display: flex;
 }
 
 .h10 {
-    height: 10px;
+  height: 10px;
 }
 
 .w32 {
-    width: 32px !important;
+  width: 32px !important;
 }
 
 .w66 {
-    width: 66px !important;
+  width: 66px !important;
 }
 
 .w60 {
-    width: 60px !important;
+  width: 60px !important;
 }
 
 .w80 {
-    width: 80px !important;
+  width: 80px !important;
 }
-.projectTag{
-    padding: 3px 10px;
-    border-radius: 15px;
-    color: #333;
-    height: 24px;
-    line-height: 24px;
-    font-size: 12px;
-}
-.categoryTag{background: #FFF3DC;}
-.languageTag{margin-left: 10px;background: #EBF4FE}
-.text-grey-e{color: #eee;}
+
+.course-bottom {
+  padding: 5px 0;
+  height: auto;
+}
\ No newline at end of file
diff --git a/src/modules/user/usersInfo/video/AliyunUploaderManager.js b/src/modules/user/usersInfo/video/AliyunUploaderManager.js
index 58afe363..61f159ef 100644
--- a/src/modules/user/usersInfo/video/AliyunUploaderManager.js
+++ b/src/modules/user/usersInfo/video/AliyunUploaderManager.js
@@ -6,7 +6,7 @@ let _path = isDev() ? 'public' : 'build'
 
 let _testHost =  '' ;  // 'http://192.168.2.63:3001/api' ; // '' ; 
 let login = 'innov'
-// 任务注释
+// 工单注释
 // https://workorder.console.aliyun.com/console.htm#/ticket/detail/?ticketId=FLASELR
 // https://workorder.console.aliyun.com/console.htm#/ticket/detail/?ticketId=1FB4APN
 // https://help.aliyun.com/document_detail/52204.html?spm=5176.2020520165.120.d52204.19a47029YWhro7#%E4%B8%8A%E4%BC%A0%E5%9C%B0%E5%9D%80%E5%92%8C%E5%87%AD%E8%AF%81%E6%96%B9%E5%BC%8F(%E6%8E%A8%E8%8D%90%E4%BD%BF%E7%94%A8)
@@ -73,7 +73,7 @@ function doCreateUploader (options) {
                 const _random = '' // Math.random().toString().substring(3, 6)+'-'
                 axios.post(createUrl, {
                     title: _random+fileName,
-                    file_name: _random+fileName
+                    file_name: _random+fileName,
                 }).then((response) => {
                     // if (response.data.status == )
                     if(response){
@@ -82,7 +82,7 @@ function doCreateUploader (options) {
                         var uploadAddress = data.UploadAddress
                         var videoId = data.VideoId
                         uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId)
-    
+                      
                     }
                 }).catch((error) => {
                     // 删除当前出错的，并执行下一个任务
@@ -106,7 +106,7 @@ function doCreateUploader (options) {
                     if (response.data.status == -1) {
                         options.onUploadError && options.onUploadError(uploadInfo)
                         return;
-                    }
+                    } 
                     const data = response.data.data
                     var uploadAuth = data.UploadAuth
                     var uploadAddress = data.UploadAddress
diff --git a/src/modules/user/usersInfo/video/EditVideoModal.js b/src/modules/user/usersInfo/video/EditVideoModal.js
index 25aadd11..052939d1 100644
--- a/src/modules/user/usersInfo/video/EditVideoModal.js
+++ b/src/modules/user/usersInfo/video/EditVideoModal.js
@@ -1,6 +1,6 @@
-import React, { useState, useEffect, useContext, useRef, memo } from 'react';
-import { Progress, Input, Tooltip, Form } from 'antd'
-import { getUrl2, isDev, CBreadcrumb, ActionBtn, ThemeContext, ModalWrapper } from 'educoder'
+import React, { useEffect, useContext, useRef} from 'react';
+import { Input,  Form } from 'antd'
+import { ThemeContext, ModalWrapper } from 'educoder'
 import axios from 'axios'
 const MAX_LENGTH = 30
 
@@ -8,10 +8,12 @@ function EditVideoModal (props) {
     const modalEl = useRef(null);
     const theme = useContext(ThemeContext);
     const { history, videoId, cover_url, title, created_at, isReview, onEditVideo, visible, setVisible,
-            form, editSuccess } = props;
+            form, editSuccess , link } = props;
     const getFieldDecorator = form.getFieldDecorator
     let username = props.match.params.username
     const _title = form.getFieldsValue().title;
+    const _link = form.getFieldsValue().link;
+
 
     if(props.CourseUser){
         username = props.CourseUser;
@@ -27,9 +29,14 @@ function EditVideoModal (props) {
         form.validateFieldsAndScroll((err, values) => {
             
             if (!err) {
-                const url = `/users/${username}/videos/${videoId}.json`
-                axios.put(url, {
-                    title: _title
+                const url = link?`/course_videos/${videoId}.json`:`/users/${username}/videos/${videoId}.json`;
+               
+                axios.put(url, link ? {
+                    name:_title,
+                    link:_link
+                }:{
+                    title: _title,
+                    link:_link
                 }).then((response) => {
                     if (response.data) {
                         onCancel()
@@ -54,7 +61,7 @@ function EditVideoModal (props) {
     }, [visible])
     useEffect(() => {
         visible && form.setFieldsValue({
-            title,
+            title,link
         })
     }, [visible])
     return (
@@ -71,10 +78,9 @@ function EditVideoModal (props) {
             {
                 `
                 .exercicenewinputysl .ant-input{
-																		border-right: none !important;
-																		height: 40px !important;
-																		}
-                
+                    border-right: none !important;
+                    height: 40px !important;
+                }
                 `
             }
         </style>
@@ -93,7 +99,24 @@ function EditVideoModal (props) {
                     <Input placeholder="" className="titleInput exercicenewinputysl" maxLength={MAX_LENGTH}
                            addonAfter={String(_title ? `${String(_title.length)}/${MAX_LENGTH}` : 0)} />
                 )}
-            </Form.Item>
+                </Form.Item>
+                {
+                link ?
+                <Form.Item
+                    label="视频链接"
+                    className="title formItemInline"
+                >
+                
+                    {getFieldDecorator('link', {
+                        rules: [{
+                            required: true, message: '请输入视频链接',
+                        }],
+                    })(
+                        <Input placeholder="请输入视频链接" className="titleInput exercicenewinputysl" />
+                    )}
+                </Form.Item>
+                :""
+            }
         </ModalWrapper>
     )
 }
diff --git a/src/modules/user/usersInfo/video/InfosVideo.css b/src/modules/user/usersInfo/video/InfosVideo.css
index fd17ac49..a03a2c6f 100644
--- a/src/modules/user/usersInfo/video/InfosVideo.css
+++ b/src/modules/user/usersInfo/video/InfosVideo.css
@@ -14,6 +14,7 @@
     margin-right: 26px;
     margin-bottom: 26px;
     position: relative;
+    max-height: 258px;
 }
 .videoItem:nth-child(4n+0) {
     margin-right: 0px;
@@ -65,13 +66,11 @@
 .videoItem .square-main .title{
     max-width: 256px;
     line-height: 18px;
-
+    
 }
 
-.videoInReviewItem .square-main {
-    background: #EAEAEA;
-}
 .videoItem .time {
+    height: 15px;
     color: #C0C4CC;
 }
 .videoItem .square-main .buttonRow .dianjilianicon{
@@ -142,4 +141,26 @@
 .videoItem:hover{
     box-shadow:0px 4px 10px 0px rgba(3,7,45,0.1);
     border-radius:12px;
+}
+.otherLink{
+    position: absolute;
+    height:30px;
+    line-height: 30px;
+    padding:0px 18px;
+    background:rgba(249,117,26,1);
+    border-radius:0px 100px 100px 0px;
+    display: block;
+    left: 0;
+    top:32px;
+    color: #fff;
+    z-index:2;
+}
+.otherLinkPanel{
+    display: block;
+    position: absolute;
+    width: 100%;
+    top:0px;
+    left:0px;
+    height: 220px;
+    z-index: 1;
 }
\ No newline at end of file
diff --git a/src/modules/user/usersInfo/video/InfosVideo.js b/src/modules/user/usersInfo/video/InfosVideo.js
index a3678e56..daf974cd 100644
--- a/src/modules/user/usersInfo/video/InfosVideo.js
+++ b/src/modules/user/usersInfo/video/InfosVideo.js
@@ -1,16 +1,17 @@
 import React, { useState, useEffect, useContext, useRef, memo } from 'react';
-import {Link} from 'react-router-dom';
-import {Pagination, Input, Button} from 'antd'
-import { getUrl2, isDev, ThemeContext, ActionBtn, NoneData } from 'educoder'
+import { Pagination, Input, Button } from 'antd'
+import { ThemeContext, ActionBtn, NoneData } from 'educoder'
 import axios from 'axios'
 import VideoInReviewItem from './VideoInReviewItem'
 import EditVideoModal from './EditVideoModal'
 import './InfosVideo.css'
 import InfoTab from '../common/InfoTab'
 import HeadlessModal from '../common/HeadlessModal'
-import CRoundSelect from '../common/CRoundSelect'
 
 import ClipboardJS from 'clipboard'
+import VideoPlay from '../../../courses/Video/video-play';
+import { logWatchHistory } from '../../../../services/video-service';
+import { Base64 } from 'js-base64';
 
 function useModal(initValue) {
     const [visible, setVisible] = useState(initValue)
@@ -45,11 +46,11 @@ const DEFAULT_VIDEO_WIDTH_IN_MD = "90%" // 400
 const DEFAULT_VIDEO_HEIGHT_IN_MD = "55%" // 400
 let videoId = {};
 let _clipboard = null;
-const _items=[
-    {key: 'published_at-desc', name: '最新上传'},
-    {key: 'published_at-asc', name: '最早上传'},
+const _items = [
+    { key: 'published_at-desc', name: '最新上传' },
+    { key: 'published_at-asc', name: '最早上传' },
 ]
-function InfoVideo (props) {
+function InfoVideo(props) {
     const [videos, setvideos] = useState(undefined)
     const [reviewvideos, setReviewvideos] = useState(undefined)
     const [count, setCount] = useState(0)
@@ -66,7 +67,8 @@ function InfoVideo (props) {
     const videoEl = useRef(null);
 
     const { showNotification, history } = props;
-    const username = props.match.params.username
+    const username = props.match.params.username;
+    const { user } = props;
 
     function toUpload() {
         if (props.current_user.admin || (props.current_user.is_teacher && props.checkIfProfessionalCertification())) {
@@ -80,30 +82,29 @@ function InfoVideo (props) {
         const fetchUrl = `/users/${username}/videos.json`
         const sorts = sortKey.split('-')
         setLoading(true)
-			axios.get(fetchUrl, {
+        axios.get(fetchUrl, {
             params: {
                 page: pageObj.current,
                 per_page: PAGE_SIZE,
                 sort_by: sorts[0],
                 sort_direction: sorts[1],
-							//
+                //
             }
-        })
-        .then((response) => {
+        }).then((response) => {
             setLoading(false)
             if (response.data.videos) {
                 setvideos(response.data.videos)
                 setCount(response.data.count)
             }
         }).catch(() => {
-				setLoading(false)
+            setLoading(false)
         })
     }
     function fetchReviewvideos() {
         const fetchUrl = `/users/${username}/videos/review.json`
         const sorts = sortKey.split('-')
         setLoading(true)
-			axios.get(fetchUrl, {
+        axios.get(fetchUrl, {
             params: {
                 page: pageObj.current,
                 per_page: PAGE_SIZE,
@@ -111,15 +112,15 @@ function InfoVideo (props) {
                 sort_direction: sorts[1],
             }
         })
-        .then((response) => {
-            setLoading(false)
-            if (response.data.videos) {
-                setReviewvideos(response.data.videos)
-                setCount(response.data.count)
-            }
-        }).catch(() => {
+            .then((response) => {
+                setLoading(false)
+                if (response.data.videos) {
+                    setReviewvideos(response.data.videos)
+                    setCount(response.data.count)
+                }
+            }).catch(() => {
 
-        })
+            })
     }
 
     useEffect(() => {
@@ -130,7 +131,7 @@ function InfoVideo (props) {
                 fetchReviewvideos()
             }
         } else {
-             pageObj.onChange(1)
+            pageObj.onChange(1)
         }
     }, [categoryObj.category])
 
@@ -140,12 +141,13 @@ function InfoVideo (props) {
         } else {
             fetchReviewvideos()
         }
-    }, [ pageObj.current, sortKey ])
+    }, [pageObj.current, sortKey])
 
     useEffect(() => {
         if (videoModalObj.visible == false) {
             // 关闭视频
-            videoEl.current && videoEl.current.pause()
+            videoEl.current && videoEl.current.pause();
+            videoId = {};
             if (_clipboard) {
                 _clipboard.destroy();
                 _clipboard = null;
@@ -158,9 +160,9 @@ function InfoVideo (props) {
                     _clipboard = new ClipboardJS('.copybtn');
                     _clipboard.on('success', (e) => {
                         showNotification('复制成功')
-										});
+                    });
                 }
-						}, 200)
+            }, 200)
         }
     }, [videoModalObj.visible])
 
@@ -173,7 +175,7 @@ function InfoVideo (props) {
     }
 
     function onEditVideo(item) {
-			videoId = {
+        videoId = {
             videoId: item.id,
             title: item.title
         }
@@ -182,12 +184,11 @@ function InfoVideo (props) {
         // this.refs['editVideoModal'].setVisible(true, video);
     }
     function onMaskClick(item) {
-			videoId = {
+        videoId = {
             videoId: item.id,
             title: item.title,
-            file_url: item.file_url,
+            file_url: item.play_url || item.file_url,
             cover_url: item.cover_url
-
         }
         videoModalObj.setVisible(true)
     }
@@ -218,13 +219,45 @@ function InfoVideo (props) {
         }
 
 
-    }
-    function getCopyText (file_url, cover_url) {
-        return `<video src="${file_url}" controls="true" controlslist="nodownload" width="${DEFAULT_VIDEO_WIDTH_IN_MD}" height="${DEFAULT_VIDEO_HEIGHT_IN_MD}" poster="${cover_url}">您的浏览器不支持 video 标签。</video>`
     }
 
-	const _inputValue = getCopyText(videoId.file_url, videoId.cover_url);
-	const sorts = sortKey.split('-')
+    function deleteVideo(item) {
+        props.confirm({
+            content: '该视频将被删除，不可恢复',
+            subContent: '是否确认删除?',
+
+            onOk: () => {
+                const url = `/users/${user && user.login}/videos/${item.id}.json`;
+                axios.delete(url).then(result => {
+                    if (result) {
+                        props.showNotification(`视频删除成功!`);
+                        if (pageObj.current === 1) {
+                            if (categoryObj.category === 'all') {
+                                fetchvideos()
+                            } else {
+                                fetchReviewvideos()
+                            }
+                        } else {
+                            pageObj.onChange(1)
+                        }
+                    }
+                }).catch(error => {
+                    console.log(error);
+                })
+            },
+            onCancel() {
+                console.log('Cancel');
+            },
+        });
+    }
+    function getCopyText(file_url, cover_url) {
+        if(file_url){
+            return `<video src="${Base64.decode(file_url)}" controls="true" controlslist="nodownload" width="${DEFAULT_VIDEO_WIDTH_IN_MD}" height="${DEFAULT_VIDEO_HEIGHT_IN_MD}" poster="${cover_url}">您的浏览器不支持 video 标签。</video>`
+        }
+          }
+
+    const _inputValue = getCopyText(videoId.file_url, videoId.cover_url);
+    const sorts = sortKey.split('-')
 
     return (
         <div className="educontent infoVideo">
@@ -238,12 +271,7 @@ function InfoVideo (props) {
                 className="showVideoModal"
                 width={800 - 1}
             >
-							<video
-                    autoplay="true"
-                    ref={videoEl}
-                    src={videoId.file_url} controls="true" controlslist="nodownload">
-                    您的浏览器不支持 video 标签。
-                </video>
+                {videoModalObj.visible && <VideoPlay src={Base64.decode(videoId.file_url)} videoId={videoId.videoId} logWatchHistory={logWatchHistory} />}
                 <div className="df copyLine">
                     <Input value={_inputValue}
                         className="dark"
@@ -318,130 +346,131 @@ function InfoVideo (props) {
                         onClick={() => { toUpload() }}
                         className="toUploadBtn"
 
-										>
+                    >
                         上传视频
                     </Button>
                 }
             ></InfoTab>
 
-					<div className="toolbarRow  df" style={{
-						lineHeight: "40px",
-					}}>
+            <div className="toolbarRow  df" style={{
+                lineHeight: "40px",
+            }}>
                 <span>
                     共
-                    <span style={{color: theme.foreground_orange1}}> {count} </span>
+                    <span style={{ color: theme.foreground_orange1 }}> {count} </span>
                     个视频
                 </span>
 
                 {/*{categoryObj.category == 'all' && <CRoundSelect {...props}*/}
-                    {/*width={'90px'}*/}
-                    {/*items={_items}*/}
-                    {/*onSortChange={onSortChange}*/}
-                    {/*sortKey={sortKey }*/}
+                {/*width={'90px'}*/}
+                {/*items={_items}*/}
+                {/*onSortChange={onSortChange}*/}
+                {/*sortKey={sortKey }*/}
                 {/*></CRoundSelect>}*/}
 
-							{categoryObj.category == 'all' &&<div className="fr">
-								<li className="drop_down">
-									<span className="color-grey-9 font-12" style={{
-										marginRight: " 5px",
-									}}>{"最新上传"}</span>
+                {categoryObj.category == 'all' && <div className="fr">
+                    <li className="drop_down">
+                        <span className="color-grey-9 font-12" style={{
+                            marginRight: " 5px",
+                        }}>{"最新上传"}</span>
 
-                    <sapn className="relativef color-grey-9 fr"
-                          style={{
-													display: "flex",
-													flexDirection: "column",
-													height: "40px",
-													lineHeight: "40px",
-												}}
-									>
-            <span
-							style={{
-								flexDirection: "column",
-								textAlign: "center",
-								height: "10px",
-								lineHeight: "10px",
-								display: "table",
-								marginTop: "9px",
-							}}
-						>
-                 <i className={sorts[1] === "asc" ?
-									 "iconfont icon-sanjiaoxing-up font-12  color-blue h10 " : "iconfont icon-sanjiaoxing-up font-12 h10"}
-										onClick={() => onSortChange("published_at-asc", 0)}></i>
+                        <sapn className="relativef color-grey-9 fr"
+                            style={{
+                                display: "flex",
+                                flexDirection: "column",
+                                height: "40px",
+                                lineHeight: "40px",
+                            }}
+                        >
+                            <span
+                                style={{
+                                    flexDirection: "column",
+                                    textAlign: "center",
+                                    height: "10px",
+                                    lineHeight: "10px",
+                                    display: "table",
+                                    marginTop: "9px",
+                                }}
+                            >
+                                <i className={sorts[1] === "asc" ?
+                                    "iconfont icon-sanjiaoxing-up font-12  color-blue h10 " : "iconfont icon-sanjiaoxing-up font-12 h10"}
+                                    onClick={() => onSortChange("published_at-asc", 0)}></i>
 
-            </span>
+                            </span>
 
-										<span
-											style={{
-												flexDirection: "column",
-												height: "10px",
-												lineHeight: "10px",
-												textAlign: "center",
-												display: "table",
-											}}
-										>
-                          <i className={sorts[1] === "desc" ?
-														"iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue h10" : "iconfont icon-sanjiaoxing-down font-12 yslbottomsj h10"}
-														 onClick={() => onSortChange("published_at-desc", 0)}></i>
-            </span>
-									</sapn>
-								</li>
-							</div>}
+                            <span
+                                style={{
+                                    flexDirection: "column",
+                                    height: "10px",
+                                    lineHeight: "10px",
+                                    textAlign: "center",
+                                    display: "table",
+                                }}
+                            >
+                                <i className={sorts[1] === "desc" ?
+                                    "iconfont icon-sanjiaoxing-down font-12 yslbottomsj color-blue h10" : "iconfont icon-sanjiaoxing-down font-12 yslbottomsj h10"}
+                                    onClick={() => onSortChange("published_at-desc", 0)}></i>
+                            </span>
+                        </sapn>
+                    </li>
+                </div>}
             </div>
 
 
-					{categoryObj.category == 'all' ?
-             <div className="itemWrap">
-                {
-									videos == undefined ? '' :
-										videos.length ?
-                 videos.map((item, index) => {
-                    return (<VideoInReviewItem
-                        {...props}
+            {categoryObj.category == 'all' ?
+                <div className="itemWrap">
+                    {
+                        videos == undefined ? '' :
+                            videos.length ?
+                                videos.map((item, index) => {
+                                    return (<VideoInReviewItem
+                                        {...props}
 
-                        {...item}
-                        key={item.id}
-                        onEditVideo={onEditVideo}
-                        onMaskClick={onMaskClick}
-                        getCopyText={getCopyText}
+                                        {...item}
+                                        key={item.id}
+                                        onEditVideo={onEditVideo}
+                                        onMaskClick={onMaskClick}
+                                        getCopyText={getCopyText}
+                                        deleteVideo={user && ((user.login === item.user_login) || user.admin) ? deleteVideo : undefined}
+                                    >
+                                    </VideoInReviewItem>)
+                                })
+                                : <NoneData style={{ width: '100%' }}></NoneData>
+                    }
+                </div>
+                :
+                <div className="itemWrap">
+                    {
+                        reviewvideos == undefined ? '' :
+                            reviewvideos.length ?
+                                reviewvideos.map((item, index) => {
+                                    return (<VideoInReviewItem
+                                        {...props}
 
-										>
-                    </VideoInReviewItem>)
-                })
-                : <NoneData style={{width: '100%'}}></NoneData>
-                }
-            </div>
-            :
-            <div className="itemWrap">
-                {
-                reviewvideos == undefined ? '' :
-									reviewvideos.length ?
-                reviewvideos.map((item, index) => {
-                    return (<VideoInReviewItem
-                        {...props}
-
-                        {...item}
-                        key={item.id}
-                        isReview={true}
-                    >
-                    </VideoInReviewItem>)
-                })
-                : <NoneData style={{width: '100%'}}></NoneData>
-                }
-            </div>
+                                        {...item}
+                                        key={item.id}
+                                        isReview={true}
+                                        deleteVideo={user && ((user.login === item.user_login) || user.admin) ? deleteVideo : undefined}
+                                    >
+                                    </VideoInReviewItem>)
+                                })
+                                : <NoneData style={{ width: '100%' }}></NoneData>
+                    }
+                </div>
             }
 
 
-					{/*  categoryObj.category == 'all' &&  */}
+            {/*  categoryObj.category == 'all' &&  */}
             {
-							count > PAGE_SIZE &&
+                count > PAGE_SIZE &&
                 <div className="mt30 mb50 edu-txt-center">
-									<Pagination showQuickJumper total={count} pageSize={PAGE_SIZE}
-															{...pageObj}
+                    <Pagination showQuickJumper total={count} pageSize={PAGE_SIZE}
+                        {...pageObj}
                     />
                 </div>
             }
 
-				</div>
+        </div>
     )
 }
 
diff --git a/src/modules/user/usersInfo/video/VideoInReviewItem.js b/src/modules/user/usersInfo/video/VideoInReviewItem.js
index 5c0647ea..1494d070 100644
--- a/src/modules/user/usersInfo/video/VideoInReviewItem.js
+++ b/src/modules/user/usersInfo/video/VideoInReviewItem.js
@@ -1,11 +1,12 @@
 import React, { useState, useEffect, useContext, memo } from 'react';
-import { Progress, Input, Tooltip } from 'antd'
-import { getUrl2, isDev, CBreadcrumb, ActionBtn, ThemeContext } from 'educoder'
+import { Progress, Input, Tooltip , Spin } from 'antd'
+import { getUrl2, isDev, CBreadcrumb, ActionBtn, ThemeContext,formatSeconds} from 'educoder'
 import axios from 'axios'
 import moment from 'moment'
 import playIcon from './images/play.png'
 import ClipboardJS from 'clipboard'
-
+import defaultImg from './images/default.png';
+import './InfosVideo.css';
 /**
 cover_url: "http://video.educoder.net/f6ba49c3944b43ee98736898e31b7d88/snapshots/12da3f7df07c499b8f0fc6dc410094e9-00005.jpg"
 created_at: "2019-08-12 13:48:26"
@@ -19,8 +20,8 @@ let _clipboard = null;
 const clipboardMap = {}
 function VideoInReviewItem (props) {
     const theme = useContext(ThemeContext);
-    const { history, file_url, cover_url, title, created_at, published_at, isReview, id
-        , onEditVideo, onMaskClick, getCopyText, showNotification,vv,play_duration,operation , deleteVideo} = props;
+    const { history, file_url , play_url , cover_url , transcoded , title, created_at, published_at, isReview, id
+        , onEditVideo, onMaskClick, getCopyText, showNotification,vv,play_duration,operation , deleteVideo , moveVideo ,link, people_num,total_time,Setmyktid} = props;
     useEffect(()=> {
         if (!isReview) {
             _clipboard = new ClipboardJS(`.copybtn_item_${id}`);
@@ -36,6 +37,9 @@ function VideoInReviewItem (props) {
             }
         }
     }, [])
+
+
+
     const username = props.match.params.username
     function toList() {
         history.push(`/users/${username}/videos`)
@@ -43,57 +47,95 @@ function VideoInReviewItem (props) {
     function toUpload() {
         history.push(`/users/${username}/videos/upload`)
     }
+    const imgUrl = (!transcoded && !link) ? defaultImg : (cover_url || defaultImg);
     return (
         <div className={`${isReview ? 'videoInReviewItem' : 'nItem'} videoItem`}>
+            <Spin tip="正在转码，请稍等..." spinning={!transcoded && !link}>
+                <img className="cover" src={imgUrl} alt=""></img>
+                { link ?
+                    <a href={link} target='_blank' className="otherLinkPanel">
+                        <span className="otherLink">外链</span>
+                    </a>
+                    : ""
+                }
 
-            <img className="cover" src={cover_url || "http://video.educoder.net/e7d18970482a46d2a6f0e951b504256c/snapshots/491e113950d74f1dab276097dae287dd-00005.jpg"}
-            ></img>
-            {!isReview && <div className="mask" onClick={() => onMaskClick(props)}>
-
-            </div>}
-            {!isReview &&
-            <div className="playWrap" onClick={() => onMaskClick(props)}>
-                <img className="play mp23" src={playIcon}></img>
-                {play_duration===0?"":<div className={"play_duration"}>累计学习时长：{play_duration} h</div>}
-            </div>
-            }
+                {!isReview && <div className="mask" onClick={() => onMaskClick(props)}></div>}
+                {!isReview && !link && transcoded &&
+                <div className="playWrap" onClick={() => onMaskClick(props)}>
+                    <img className="play mp23" src={playIcon}></img>
+                    {/* {play_duration===0?"":<div className={"play_duration"}>累计学习时长：{play_duration} h</div>} */}
+                </div>
+                }
+            </Spin>
             <div className="square-main">
                 <div className="title overflowHidden1"
                     title={title && title.length > 20 ? title : ''}
                 >{title}</div>
                 <div className="df buttonRow mb10">
+                {/* <div className={"play_duration"}>累计学习时长：{play_duration} h</div> */}
+                {/* <span className="time">{moment(published_at || created_at).format('YYYY-MM-DD HH:mm:ss')}{people_num}</span> */}
 
-                    <span className="time">{moment(published_at || created_at).format('YYYY-MM-DD HH:mm:ss')}</span>
+                {link||total_time===undefined?<span className="time"> </span>:<span className="time">累计学习时长：{
+                    formatSeconds(total_time)}
+                {/* total_time<60?total_time+' s':total_time/60<60?(total_time/60).toFixed(0)+' min':(total_time/3600).toFixed(1)+ ' h' */}
+                </span>}
                 </div>
                 <div className="df buttonRow">
                     {/* 2019-09-01 10:00:22 */}
                     <span className={"dianjilianicon"}>
-                         {vv===0?"":<Tooltip title="播放次数" placement="bottom">
-                             <i className={`icon-dianjiliang iconfont dianjilianicon`}></i>
-                         </Tooltip> } {vv===0?"":vv}
+                         {total_time===undefined?'':!people_num || (people_num && people_num)===0 ? "" : <Tooltip title="观看人数" placement="bottom">
+                             <i className={`icon-dianjiliang iconfont dianjilianicon font-12`}>   {!people_num || (people_num && people_num)===0?"":people_num}</i>
+                         </Tooltip> }
                     </span>
-                    { isReview != true && <div>
+
+
+                    <div>
+
                         {
-                            deleteVideo && 
-                            <Tooltip title="删除" placement="bottom">
-                                <i className="icon-shanchu iconfont" onClick={() => deleteVideo(props)}
-                                    style={{    marginTop: '1px', display: 'inline-block'}}
+                            isReview !== true && moveVideo &&
+                            <Tooltip title="移动" placement="bottom">
+                                <i className="icon-yidong iconfont font-15" onClick={() => moveVideo(props)}
+                                   style={{    marginTop: '1px', display: 'inline-block'}}
                                 ></i>
                             </Tooltip>
                         }
-                        
+
+
                         {
-                            operation &&
+                            props&&props.mykt!=undefined? isReview !== true && !link ?
+                            <Tooltip title="统计" placement="bottom">
+                                <i className="icon-tongji1 iconfont font-15" onClick={() => Setmyktid(props.newcourse_video_id,props.newtitle)}
+                                   style={{    marginTop: '1px', display: 'inline-block'}}
+                                ></i>
+                            </Tooltip>:"":""
+                        }
+
+
+                        {
+                            isReview !== true && operation &&
                             <Tooltip title="编辑" placement="bottom">
                                 <i className="icon-bianji1 iconfont" onClick={() => onEditVideo(props)}
                                 style={{    marginTop: '1px', display: 'inline-block'}}
                                 ></i>
                             </Tooltip>
                         }
-                        <Tooltip title="复制视频地址" placement="bottom">
-                            <i className={`icon-fuzhi iconfont copybtn_item_${id}`} data-clipboard-text={getCopyText(file_url, cover_url)}></i>
-                        </Tooltip>
-                    </div> }
+
+                        {
+                            isReview !== true && !link ?
+                            <Tooltip title="复制链接" placement="bottom">
+                                <i className={`icon-fuzhi iconfont copybtn_item_${id}`} data-clipboard-text={getCopyText((play_url || file_url), cover_url)}></i>
+                            </Tooltip>:""
+                        }
+
+                        {
+                            deleteVideo &&
+                            <Tooltip title="删除" placement="bottom">
+                                <i className="icon-shanchu iconfont" onClick={() => deleteVideo(props)}
+                                   style={{    marginTop: '1px', display: 'inline-block'}}
+                                ></i>
+                            </Tooltip>
+                        }
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/src/modules/user/usersInfo/video/VideoProtocol.js b/src/modules/user/usersInfo/video/VideoProtocol.js
index a3b9ed2b..7e1ea5fb 100644
--- a/src/modules/user/usersInfo/video/VideoProtocol.js
+++ b/src/modules/user/usersInfo/video/VideoProtocol.js
@@ -6,7 +6,7 @@ import okIcon from './images/ok_border.png'
 
 function VideoProtocol (props) {
     const username = props.match.params.username
-    const { search } = props.history.location;    
+    const { search } = props.history.location;
     const courseId = search && search.split("=")[1];
     return (
         <div className={`educontent videoProtocol`}>
@@ -14,7 +14,7 @@ function VideoProtocol (props) {
                 className="mb26 mt16"
                 separator=" > "
                 items={[
-                    { to: `${courseId?`/courses/${courseId}/course_videos?open=new`:`/users/${username}/videos/upload`}`, name:  '视频上传'},
+                    { to: `${courseId?`/classrooms/${courseId}/course_videos?open=new`:`/users/${username}/videos/upload`}`, name:  '视频上传'},
                     { name: '内容上传协议'}
                 ]}
             ></CBreadcrumb>
@@ -128,7 +128,7 @@ function VideoProtocol (props) {
                     <p className="p_child_paragraph">
                         4.6.5 其他EduCoder平台认为是符合整体服务需求的特殊情形。
                     </p>
-                
+
                 <div className="subTitle">
                     五、违约视频的处理原则 　　
                 </div>
@@ -141,7 +141,7 @@ function VideoProtocol (props) {
                 <p className="p_paragraph">
                     5.3 EduCoder平台有权启动必要的刑事及民事法律程序，维护EduCoder平台的合法权益，追究违法用户的法律责任。
                 </p>
-                
+
                 <div className="subTitle">
                     六、协议修改 　　
                 </div>
diff --git a/src/modules/user/usersInfo/video/VideoUploadList.js b/src/modules/user/usersInfo/video/VideoUploadList.js
index ecea2a07..8920c1e7 100644
--- a/src/modules/user/usersInfo/video/VideoUploadList.js
+++ b/src/modules/user/usersInfo/video/VideoUploadList.js
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useReducer, useContext, memo } from 'react';
-import {  Link, Prompt } from "react-router-dom";
+import { Link, Prompt } from "react-router-dom";
 import { getUrl2, isDev, CBreadcrumb, ActionBtn, ThemeContext } from 'educoder'
 import axios from 'axios'
 
@@ -18,13 +18,13 @@ const MAX_FILE_COUNT = 3
 const MAX_FILE_SIZE = 500
 let noUploads = true
 
-function VideoUploadList (props) {
-    
+function VideoUploadList(props) {
+
     // const [videos, setvideos] = useState([]);
     const [state, dispatch] = useReducer(reducer, initialState);
     const theme = useContext(ThemeContext)
     const [couldRouteNav, setCouldRouteNav] = useState(false);
-    const [loading,setLoading] = useState(false);
+    const [loading, setLoading] = useState(false);
 
     useEffect(() => {
         setCouldRouteNav(false);
@@ -54,29 +54,37 @@ function VideoUploadList (props) {
     const username = props.match.params.username || props.CourseUser;
     const { showNotification, history } = props;
     const uploaderOptions = {
-            
+
     }
-    function onUploadChange (e) {
-        var file = e.target.files[0]
+    function onUploadChange(e) {
+        var file = e.target.files[0];
+        setLoading(true);
+
         if (!file) {
             // alert("请先选择需要上传的文件!")
+            setLoading(false);
             return
         }
-        // avi、flv、f4v、m4v、mov、mp4、rmvb、swf、webm
-        if (file.name 
-            && file.name.indexOf('.avi') == -1 && file.name.indexOf('.flv') == -1 
-            && file.name.indexOf('.f4v') == -1 && file.name.indexOf('.m4v') == -1 
-            && file.name.indexOf('.mov') == -1 && file.name.indexOf('.mp4') == -1 
-            && file.name.indexOf('.rmvb') == -1 && file.name.indexOf('.swf') == -1 
-            && file.name.indexOf('.webm') == -1 
+        // avi、flv、f4v、m4v、mov、mp4、rmvb、swf、webm、wmv
+        if (file.name
+            && file.name.indexOf('.avi') == -1 && file.name.indexOf('.flv') == -1
+            && file.name.indexOf('.f4v') == -1 && file.name.indexOf('.m4v') == -1
+            && file.name.indexOf('.mov') == -1 && file.name.indexOf('.mp4') == -1
+            && file.name.indexOf('.rmvb') == -1 && file.name.indexOf('.swf') == -1
+            && file.name.indexOf('.webm') == -1 && file.name.indexOf('.wmv') == -1
         ) {
             showNotification(`不支持的视频格式`)
+            setLoading(false);
             clearInput()
             return;
         }
-        if (file.size >(parseInt(MAX_FILE_SIZE) * 1024 * 1024)) {
+
+        if (props && props.user.admin === true || props && props.user.business === true) {
+
+        } else if (file.size > (parseInt(MAX_FILE_SIZE) * 1024 * 1024)) {
             // 超过500m TODO
-            clearInput()
+            clearInput();
+            setLoading(false);
             showNotification(`视频大小超过${MAX_FILE_SIZE}M`)
             return;
         }
@@ -88,105 +96,104 @@ function VideoUploadList (props) {
             }
         })
         if (gotTheSameFileName) {
-            clearInput()
+            clearInput();
+            setLoading(false);
             showNotification(`你不能上传同一个视频文件名称，请重新选择。`)
             return;
         }
 
         var Title = file.name
         var userData = '{"Vod":{}}'
-        
+
         if (!uploader) {
-            
-            getUploader(username, 
-            {   
-                // 重新创建  才会用最新的 dispatch
-                create: !uploader,
-                addFileSuccess: (uploadInfo) => {
-                    setLoading(true);
-                    const file = uploadInfo.file;
-                    console.log('addFileSuccess', uploadInfo)
-                    // const newvideos = [...videos, {
-                    //     name: file.name,
-                    //     size: file.size,
-                    //     type: file.type,
 
-                    //     fileHash: uploadInfo.fileHash, // "ba1bbc53fdecd9eaaae479fbd9518442"
-                    //     state: uploadInfo.state, //  "Uploading"  "Ready"
-                    //     videoId: uploadInfo.videoId, //   "719b82c875c34ac39f94feb145d25ad2"
-                    //     loaded: 0
-                    // }]
-                    // setvideos(newvideos)
+            getUploader(username,
+                {
+                    // 重新创建  才会用最新的 dispatch
+                    create: !uploader,
+                    addFileSuccess: (uploadInfo) => {
+                        const file = uploadInfo.file;
+                        console.log('addFileSuccess', uploadInfo)
+                        // const newvideos = [...videos, {
+                        //     name: file.name,
+                        //     size: file.size,
+                        //     type: file.type,
 
-                    // files.push(file)
-                    clearInput()
-                    dispatch({type: 'addVideo', uploadInfo})
-                },
-                onUploadProgress: (uploadInfo, totalSize, progress) => {
-                    setLoading(false);
-                    console.log("upload",uploadInfo);
-                    var progressPercent = Math.ceil(progress * 100)
+                        //     fileHash: uploadInfo.fileHash, // "ba1bbc53fdecd9eaaae479fbd9518442"
+                        //     state: uploadInfo.state, //  "Uploading"  "Ready"
+                        //     videoId: uploadInfo.videoId, //   "719b82c875c34ac39f94feb145d25ad2"
+                        //     loaded: 0
+                        // }]
+                        // setvideos(newvideos)
 
-                    // let _index = -1;
-                    // videos.some((item, index) => {
-                    //     // addFileSuccess的时候没有fileHash
-                    //     // if (uploadInfo.fileHash == item.fileHash) {
-                    //     if (uploadInfo.file.name == item.name) {
-                    //         _index = index
-                    //         return true;
-                    //     }
-                    // })
+                        // files.push(file)
+                        clearInput()
+                        dispatch({ type: 'addVideo', uploadInfo })
+                    },
+                    onUploadProgress: (uploadInfo, totalSize, progress) => {
+                        console.log("upload", uploadInfo);
+                        var progressPercent = Math.ceil(progress * 100)
 
-                    // TODO 这里不用reducer，会出现state被重置的问题
+                        // let _index = -1;
+                        // videos.some((item, index) => {
+                        //     // addFileSuccess的时候没有fileHash
+                        //     // if (uploadInfo.fileHash == item.fileHash) {
+                        //     if (uploadInfo.file.name == item.name) {
+                        //         _index = index
+                        //         return true;
+                        //     }
+                        // })
 
-                    // if (_index == -1) {
-                    //     const newvideos = [...videos, {
-                    //         name: file.name,
-                    //         size: file.size,
-                    //         type: file.type,
+                        // TODO 这里不用reducer，会出现state被重置的问题
 
-                    //         fileHash: uploadInfo.fileHash, // "ba1bbc53fdecd9eaaae479fbd9518442"
-                    //         state: uploadInfo.state, //  "Uploading"  "Ready"
-                    //         videoId: uploadInfo.videoId, //   "719b82c875c34ac39f94feb145d25ad2"
-                    //         loaded: progressPercent
-                    //     }]
-                    //     setvideos(newvideos)
-                    //     return;
-                    // }
+                        // if (_index == -1) {
+                        //     const newvideos = [...videos, {
+                        //         name: file.name,
+                        //         size: file.size,
+                        //         type: file.type,
 
-                    // //           exercise_questions : update(prevState.exercise_questions, {[index]: { isNew: {$set: false}}})
-                    // setvideos(update(videos, {[_index]: { loaded: {$set: progressPercent}}}))
+                        //         fileHash: uploadInfo.fileHash, // "ba1bbc53fdecd9eaaae479fbd9518442"
+                        //         state: uploadInfo.state, //  "Uploading"  "Ready"
+                        //         videoId: uploadInfo.videoId, //   "719b82c875c34ac39f94feb145d25ad2"
+                        //         loaded: progressPercent
+                        //     }]
+                        //     setvideos(newvideos)
+                        //     return;
+                        // }
 
-                    dispatch({type: 'updateProgress', uploadInfo, progressPercent})
-                },
+                        // //           exercise_questions : update(prevState.exercise_questions, {[index]: { isNew: {$set: false}}})
+                        // setvideos(update(videos, {[_index]: { loaded: {$set: progressPercent}}}))
 
-                onUploadFailed: (uploadInfo) => {
-                    console.log('onUploadFailed', uploadInfo)
-                    props.showNotification('视频云服务出现异常，请重新上传。')
-                },
-                onUploadEnd: (uploadInfo) => {
-                    console.log('onUploadEnd', uploadInfo)
+                        dispatch({ type: 'updateProgress', uploadInfo, progressPercent })
+                    },
 
-                },
+                    onUploadFailed: (uploadInfo) => {
+                        console.log('onUploadFailed', uploadInfo)
+                        props.showNotification('视频云服务出现异常，请重新上传。')
+                    },
+                    onUploadEnd: (uploadInfo) => {
+                        console.log('onUploadEnd', uploadInfo)
+                        setLoading(false);
+                    },
 
-                onUploadSucceed: (uploadInfo) => {
-                    console.log('onUploadSucceed', uploadInfo)
+                    onUploadSucceed: (uploadInfo) => {
+                        console.log('onUploadSucceed', uploadInfo)
+                        setLoading(false);
+                    },
+                    onUploadError: (uploadInfo) => {
+                        setLoading(false);
+                    },
+                    // 可能需要等lib加载完毕才能执行
+                    gotUploader: (_uploader) => {
+                        // 首先调用 uploader.addFile(event.target.files[i], null, null, null, userData)
+                        console.log(_uploader)
+                        let result = _uploader.addFile(file, null, null, null, userData)
+                        uploader = _uploader;
 
-                },
-                onUploadError: (uploadInfo) => {
-                    
-                },
-                // 可能需要等lib加载完毕才能执行
-                gotUploader: (_uploader) => {
-                    // 首先调用 uploader.addFile(event.target.files[i], null, null, null, userData)
-                    console.log(_uploader)
-                    let result = _uploader.addFile(file, null, null, null, userData)
-                    uploader = _uploader;
-
-                    window.uploader = uploader;
+                        window.uploader = uploader;
+                    }
                 }
-            }
-            // )
+                // )
             )
         } else {
             let result = uploader.addFile(file, null, null, null, userData)
@@ -204,9 +211,9 @@ function VideoUploadList (props) {
         } else {
             // uploader.cancelFile(index)
         }
-            
+
         clearInput()
-        dispatch({type: 'removeVideo', index}) 
+        dispatch({ type: 'removeVideo', index })
         // setvideos([...videos.splice(index, 1)])
     }
     //  uploader.deleteFile(index);
@@ -219,34 +226,35 @@ function VideoUploadList (props) {
                 doDelete(index, isSuccess)
             }
         })
-        
+
     }
     function onPublish() {
         // 下列这些参数只有是课堂里面上传视频才会有
-        const { CourseId , CourseUser ,flag , successFunc } = props;
+        const { CourseId, CourseUser, flag, successFunc, videoId } = props;
         if (state.videos.length == 0) {
             showNotification('请先上传视频')
             return;
         }
-        const publishUrl = `/users/${ flag ? CourseUser : username }/videos/batch_publish.json`
+        const publishUrl = `/users/${flag ? CourseUser : username}/videos/batch_publish.json`
         axios.post(publishUrl, {
             videos: state.videos.map(item => {
                 return {
                     video_id: item.videoId,
                     // todo
                     title: item.title,
-                    course_id:CourseId
+                    course_id: CourseId,
+                    category_id: videoId
                 }
             })
         }).then((response) => {
-           // to success page
-            if(response){
+            // to success page
+            if (response) {
                 if (response.data.status == 0) {
-                    dispatch({type: 'removeAll'})
-                    if(flag){
+                    dispatch({ type: 'removeAll' })
+                    if (flag) {
                         successFunc(false)
-                    }else{
-                    history.push(`/users/${username}/videos/success`)
+                    } else {
+                        history.push(`/users/${username}/videos/success`)
                     }
                 }
             }
@@ -255,21 +263,20 @@ function VideoUploadList (props) {
         })
     }
     function onTitleChange(title, index) {
-        dispatch({type: 'updateTitle', title, index})
+        dispatch({ type: 'updateTitle', title, index })
     }
     // login
-    const { flag , CourseId } = props;
-    const urls = 
-    flag ? 
-    <Link to={`/users/${username}/videos/protocol?course=${CourseId}`} target="_blank" style={{color: theme.foreground_select}}>上传内容协议</Link>
-    :
-    <Link to={`/users/${username}/videos/protocol`} style={{color: theme.foreground_select}}>上传内容协议</Link>
+    const { flag, CourseId } = props;
+    const urls =
+        flag ?
+            <Link to={`/users/${username}/videos/protocol?course=${CourseId}`} target="_blank" style={{ color: theme.foreground_select }}>上传内容协议</Link>
+            :
+            <Link to={`/users/${username}/videos/protocol`} style={{ color: theme.foreground_select }}>上传内容协议</Link>
     const protocolLine = <div>上传视频，即表示您已同意{urls}，不得上传未经他人授权的作品</div>
-    
     return (
-        <div className={flag?"edu-back-white pb100 videoUploadList":"educontent videoUploadList"} style={{ marginBottom: `${flag?"0px":"200px"}` }}>
+        <div className={flag ? "edu-back-white pb100 videoUploadList" : "educontent videoUploadList"} style={{ marginBottom: `${flag ? "0px" : "200px"}` }}>
             <Prompt
-                when={state.videos.length }
+                when={state.videos.length}
                 message='确认要离开当前页面，当前数据不可恢复'
             />
             <style>{`
@@ -380,8 +387,8 @@ function VideoUploadList (props) {
                         className="mb26"
                         separator=" > "
                         items={[
-                            { to: `/users/${username}/videos`, name:  '视频'},
-                            { name: '上传'}
+                            { to: `/users/${username}/videos`, name: '视频' },
+                            { name: '上传' }
                         ]}
                     ></CBreadcrumb>
 
@@ -391,16 +398,16 @@ function VideoUploadList (props) {
                     </div>
                 </React.Fragment>
             }
-            
+
             <div className="section">
                 {/* noUploads */}
-                {noUploads && <div className="noUploads" style={{paddingTop: '72px'}} >
+                {noUploads && <div className="noUploads" style={{ paddingTop: '72px' }} >
                     <div className="imgWrap" onClick={() => document.getElementById('fileUpload').click()}>
                         <img className="uploadIcon" src={uploadIcon} ></img>
                         <img className="uploadHoverIcon" src={uploadHoverIcon} ></img>
                     </div>
 
-                    
+
                     <div style={{
                         color: '#000000',
                         fontSize: '18px',
@@ -423,41 +430,42 @@ function VideoUploadList (props) {
                         })}
                     </div>
                 </Spin>
-                {state.videos && state.videos.length === MAX_FILE_COUNT && 
-                <div className="uploadTip">
-                    {/* <i className="iconfont icon-tishi" style={{color: '#FF6F6F', verticalAlign: 'text-bottom'}}></i> */}
-                    <span>提示：单次最多支持3个视频文件上传</span> 
-                </div>}
+                {state.videos && state.videos.length === MAX_FILE_COUNT &&
+                    <div className="uploadTip">
+                        {/* <i className="iconfont icon-tishi" style={{color: '#FF6F6F', verticalAlign: 'text-bottom'}}></i> */}
+                        <span>提示：单次最多支持3个视频文件上传</span>
+                    </div>}
 
                 {(!noUploads && state.videos.length < MAX_FILE_COUNT) && <ActionBtn className="publishBtn" onClick={() => document.getElementById('fileUpload').click()}
                 >继续添加</ActionBtn>}
 
                 <div className={`description ${noUploads ? 'noUploads' : ''}`}>
-                    <div className="">视频大小：不支持断点续传，单个视频文件最大500M；单次最多支持3个视频文件上传 </div>
-                    <div className="">视频规格：avi、flv、f4v、m4v、mov、mp4、rmvb、swf、webm </div>
-                    <div className="">温馨提示：请勿上传违法视频。平台将为每一个视频分配一个地址，您可以通过引用该地址将视频使用在实训项目等模块</div>
+                    <div className="description ">
+                        <div>上传说明：目前不支持断点续传，单个视频文件最大限制500M，单次最多支持3个视频文件上传 </div>
+                        <div>视频规格：avi、flv、f4v、m4v、mov、mp4、rmvb、swf、webm、wmv </div>
+                        <div>温馨提示：<span className="color-orange-tip">为了更好的播放体验，建议您优先上传MP4格式。如果您是自己录制视频，建议您保存的时候将视频编码设置为AVC(H264)</span></div></div>
                 </div>
 
                 {!noUploads && <React.Fragment>
 
-                {/* {(state.videos.length < MAX_FILE_COUNT) && <Button type="primary" icon="plus-square"
+                    {/* {(state.videos.length < MAX_FILE_COUNT) && <Button type="primary" icon="plus-square"
                     onClick={() => { document.getElementById('fileUpload').click()}}
                     className="fr addVideoBtn"
                 >
                     添加更多视频
                 </Button>} */}
-                
-                <div style={{}} className="publishRow">
-                    <ActionBtn className="publishBtn" onClick={() => onPublish()}
-                    >立即发布</ActionBtn>
 
-                    {protocolLine}
-                </div>
+                    <div style={{}} className="publishRow">
+                        <ActionBtn className="publishBtn" onClick={() => onPublish()}
+                        >立即发布</ActionBtn>
+
+                        {protocolLine}
+                    </div>
 
                 </React.Fragment>}
             </div>
             {/* windows video/* 不管用 TODO */}
-            <input type="file" id="fileUpload" style={{display: 'none'}} onChange={onUploadChange}
+            <input type="file" id="fileUpload" style={{ display: 'none' }} onChange={onUploadChange}
                 accept=".mkv, .flv, .f4v, .rmvb, .swf, video/mp4,video/x-m4v,video/flv,video/f4v,video/rmvb,video/swf,video/*"
             ></input>
         </div>
diff --git a/src/modules/user/usersInfo/video/images/default.png b/src/modules/user/usersInfo/video/images/default.png
new file mode 100644
index 00000000..66a54bc6
Binary files /dev/null and b/src/modules/user/usersInfo/video/images/default.png differ
diff --git a/src/public-path.js b/src/public-path.js
index 548a1f73..8fa3e5c4 100644
--- a/src/public-path.js
+++ b/src/public-path.js
@@ -1,6 +1,7 @@
-/*global __webpack_public_path__ */
-if ( window.location.host == 'pre-newweb.educoder.net') {
-    __webpack_public_path__ = 'https://testali-cdn.educoder.net/react/build/'
-} else if ( window.location.host == 'www.educoder.net') {
-    __webpack_public_path__ = 'https://ali-cdn.educoder.net/react/build/'
+if (window.location.host == 'test-newweb.educoder.net') {
+  __webpack_public_path__ = 'https://testali-cdn.educoder.net/react/build/' // eslint-disable-line
+} else if (window.location.host == 'www.educoder.net') {
+  __webpack_public_path__ = 'https://ali-cdn.educoder.net/react/build/' // eslint-disable-line
+} else if (window.location.host == 'pre-newweb.educoder.net') {
+  __webpack_public_path__ = 'https://preali-cdn.educoder.net/react/build/' // eslint-disable-line
 }
\ No newline at end of file
diff --git a/src/redux/actions/actionTypes.js b/src/redux/actions/actionTypes.js
index 22dfa5b7..c35d054e 100644
--- a/src/redux/actions/actionTypes.js
+++ b/src/redux/actions/actionTypes.js
@@ -1,7 +1,7 @@
 /*
- * @Description: action类型 
- * @Author: tangjiang 
- * @Date: 2019-11-13 20:05:39 
+ * @Description: action类型
+ * @Author: tangjiang
+ * @Date: 2019-11-13 20:05:39
  * @Last Modified by: tangjiang
  * @Last Modified time: 2019-11-14 09:29:45
  */
@@ -15,6 +15,9 @@ const types = {
   VALIDATE_OJ_NAME: 'VALIDATE_OJ_NAME', // 任务名称
   VALIDATE_OJ_LANGUAGE: 'VALIDATE_OJ_LANGUAGE', // 编程语言
   VALIDATE_OJ_DESCRIPTION: 'VALIDATE_OJ_DESCRIPTION', // 描述
+  VALIDATE_OJ_TEST_SET_SCORE: 'VALIDATE_OJ_TEST_SET_SCORE', // 测试集得分规则
+  VALIDATE_OJ_TEST_SET_AVERAGE:'VALIDATE_OJ_TEST_SET_AVERAGE',
+  CHANGE_EQUAL:'CHANGE_EQUAL',//均分
   VALIDATE_OJ_DIFFICULT: 'VALIDATE_OJ_DIFFICULT', // 难易度
   VALIDATE_OJ_TIMELIMIT: 'VALIDATE_OJ_TIMELIMIT', // 时间限制
   VALIDATE_OJ_CATEGORY: 'VALIDATE_OJ_CATEGORY', // 分类
@@ -33,10 +36,12 @@ const types = {
   VALIDATE_TEST_CODE_ARRS: 'VALIDATE_TEST_CODE_ARRS', // 更改测试用例验证结果
   TEST_CASE_INPUT_CHANGE: 'TEST_CASE_INPUT_CHANGE', // 测试用例输入值改变时
   TEST_CASE_OUTPUT_CHANGE: 'TEST_CASE_OUTPUT_CHANGE', // 测试用例输出值改变时
+  TEST_CASE_SCORE_CHANGE: 'TEST_CASE_SCORE_CHANGE', // 占比
   DEBUGGER_CODE: 'DEBUGGER_CODE', // 调试代码
   GET_COURSE_QUESTION: 'GET_COURSE_QUESTION', // 获取编辑题
   CHANGE_KNOWLEDGES: 'CHANGE_KNOWLEDGES', // 保存所选择的知识点
   SET_OJ_INITIAL_VALUE: 'SET_OJ_INITIAL_VALUE', // 设置初始值
+  SET_SEARCH_PARAMS: 'SET_SEARCH_PARAMS', // 只在地址栏参数
   // study
   SAVE_USER_PROGRAM_ID: 'SAVE_USER_PROGRAM_ID',// 保存用户编程题id值
   USER_PROGRAM_DETAIL: 'USER_PROGRAM_DETAIL', // 用户编程题详情
diff --git a/src/redux/actions/index.js b/src/redux/actions/index.js
index 663e9402..5f95d2b8 100644
--- a/src/redux/actions/index.js
+++ b/src/redux/actions/index.js
@@ -1,14 +1,14 @@
 /*
- * @Description: 全局导出 action 类型 
- * @Author: tangjiang 
- * @Date: 2019-11-13 20:12:23 
+ * @Description: 全局导出 action 类型
+ * @Author: tangjiang
+ * @Date: 2019-11-13 20:12:23
  * @Last Modified by: tangjiang
  * @Last Modified time: 2019-11-14 09:55:47
  */
 
 import toggleTodo from './testAction.js';
 import {
-  getOJList, 
+  getOJList,
   changePaginationInfo,
   deleteItem
 } from './ojList';
@@ -22,6 +22,9 @@ import {
   validateOJName,
   validateOjLanguage,
   validateOjDescription,
+  validateOjTest_set_score,
+  validateOjtest_set_average,
+  validateOjequal,
   validateOjDifficult,
   validateOjTimeLimit,
   validateOjCategory,
@@ -32,13 +35,15 @@ import {
   deleteTestCase,
   testCaseInputChange,
   testCaseOutputChange,
+  testCaseOutputChangeScore,
   updateTestAndValidate,
   updateOpenTestCaseIndex,
   handleClickCancelPublish,
   getQuestion,
   saveKnowledge,
   setOjInitialValue,
-  tagDisciplines
+  tagDisciplines,
+  saveSearchParams
 } from './ojForm';
 
 import {
@@ -134,6 +139,9 @@ export default {
   validateOJName,
   validateOjLanguage,
   validateOjDescription,
+  validateOjTest_set_score,
+  validateOjtest_set_average,
+  validateOjequal,
   validateOjDifficult,
   validateOjTimeLimit,
   validateOjCategory,
@@ -145,11 +153,13 @@ export default {
   saveKnowledge,
   setOjInitialValue,
   tagDisciplines,
-  // 
+  saveSearchParams,
+  //
   addTestCase,
   deleteTestCase,
   testCaseInputChange,
   testCaseOutputChange,
+  testCaseOutputChangeScore,
   debuggerCode,
   startProgramQuestion,
   changeShowOrHideControl,
@@ -203,7 +213,7 @@ export default {
   // 统计
   staticList,
   changeParams,
-  initTotal, 
+  initTotal,
   // 微信
   getWXCode,
   getWXCodeTestCase,
diff --git a/src/redux/actions/ojForUser.js b/src/redux/actions/ojForUser.js
index e7520c53..23636793 100644
--- a/src/redux/actions/ojForUser.js
+++ b/src/redux/actions/ojForUser.js
@@ -1,17 +1,17 @@
 /*
- * @Description: 
+ * @Description:
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-27 13:42:11
  * @LastEditors  : tangjiang
- * @LastEditTime : 2020-01-09 14:14:47
+ * @LastEditTime : 2020-02-10 18:17:00
  */
 import types from "./actionTypes";
 import { Base64 } from 'js-base64';
-import { 
+import {
   fetchStartProgram,
   fetchUserProgramDetail,
-  fetchDebuggerCode, 
+  fetchDebuggerCode,
   fetchCodeSubmit,
   fetchUserCommitRecord,
   fetchUserCommitRecordDetail,
@@ -24,11 +24,11 @@ import { notification } from "antd";
 
 // 进入编程页面时，首先调用开启编程题接口
 export const startProgramQuestion = (id, props) => {
-  return (dispatch) => {
+  return (dispatch, getState) => {
     fetchStartProgram(id).then(res => {
       const { status, data } = res;
       if (status === 200) {
-        const {identifier} = data;
+        const { identifier } = data;
         dispatch({
           type: types.SAVE_USER_PROGRAM_ID,
           payload: identifier
@@ -40,13 +40,6 @@ export const startProgramQuestion = (id, props) => {
         });
         // 跳转至开启编程
         if (identifier) {
-          // let data = Object.assign({}, props);
-          // const path = {
-          //   pathname: `/myproblems/${identifier}`,
-          //   state: data
-          // }
-          // console.log(path);
-          // props.history.push(`/myproblems/${identifier}`);
           props.history.push({
             pathname: `/myproblems/${identifier}`,
           });
@@ -88,7 +81,7 @@ export const getUserProgramDetail = (identifier, type) => {
           type: types.SAVE_USE_TEST_CASE_VALUE,
           payload: data.test_case || {}
         });
-        // 代码是否更新 
+        // 代码是否更新
         let _modify_code = false;
         if (data.hack) {
           _modify_code = data.hack.modify_code;
@@ -109,29 +102,22 @@ export const getUserProgramDetail = (identifier, type) => {
 
 export const saveUserCodeForInterval = (identifier, code) => {
   return (dispatch, getState) => {
-    const { userCode } = getState().ojForUserReducer;
     dispatch({
       type: types.AUTO_UPDATE_CODE,
       payload: true
     });
-    // console.log('+++', userCode);
     fetchUpdateCode(identifier, {
-      code: Base64.encode(userCode)
+      code: Base64.encode(code)
     }).then(res => {
       if (res.data.status === 401) {
         return;
       };
-      // dispatch({
-      //   type: types.RESTORE_INITIAL_CODE,
-      //   payload: userCode
-      // });
       setTimeout(() => {
         dispatch({
           type: types.AUTO_UPDATE_CODE,
           payload: false
         })
       }, 1000);
-      // console.log('代码保存成功', res);
     }).catch(() => {
       dispatch({
         type: types.AUTO_UPDATE_CODE,
@@ -143,20 +129,18 @@ export const saveUserCodeForInterval = (identifier, code) => {
 
 /**
  * @description 保存或更新之前先更新代码
- * @param {*} identifier 
+ * @param {*} identifier
  * @param {*} inputValue 输入值: 自定义 | 系统返回的
  * @param {*} type 测评类型 debug | submit
  */
+//原来的方法未能区分从编辑入口进来的情况，这时代码也是更新了的。以及ctrl+z undo未能触发chnage事件 monaco-editor的bug。 这里去除isUpdateCode
 export const updateCode = (identifier, inputValue, type) => {
-  console.log(1111);
   return (dispatch, getState) => {
-    const { userCode, isUpdateCode } = getState().ojForUserReducer;
-    if (isUpdateCode) {
-      fetchUpdateCode(identifier, {
-        code: Base64.encode(userCode)
-      }).then(res => {
-        // 是否更新了代码, 目的是当代码没有更新时不调用更新代码接口，目录没有实现 
-        // TODO 需要优化
+    const { editor_code } = getState().ojForUserReducer;
+    fetchUpdateCode(identifier, {
+      code: Base64.encode(editor_code)
+    }).then(res => {
+      if (res) {
         if (res.data.status === 401) {
           dispatch({ // 改变 loading 值
             type: types.LOADING_STATUS,
@@ -168,13 +152,10 @@ export const updateCode = (identifier, inputValue, type) => {
           type: types.IS_UPDATE_CODE,
           flag: false
         });
-        // debuggerCode(identifier, inputValue);
         dispatch(debuggerCode(identifier, inputValue, type));
-      });
-    } else {
-      // 没有更新时，直接调用调试接口
-      dispatch(debuggerCode(identifier, inputValue, type));
-    }
+      }
+    });
+
   }
 }
 
@@ -185,11 +166,11 @@ export const codeEvaluate = (dispatch, identifier, type, time_limit, hackStatus,
   let count = 1;
   /**
    * @param {*} excuteTime 执行时间
-   * @param {*} finalTime  总时间 
+   * @param {*} finalTime  总时间
    * @param {*} count  执行次数
    * @param {*} timer  定时器
    */
-  function getCodeSubmit (intervalTime, finalTime, count, timer){
+  function getCodeSubmit(intervalTime, finalTime, count, timer) {
     const excuteTime = (count++) * intervalTime; // 当前执行时间
     fetchCodeSubmit(identifier, { mode: type }).then(res => {
       const { status } = res.data; // 评测返回结果
@@ -197,7 +178,7 @@ export const codeEvaluate = (dispatch, identifier, type, time_limit, hackStatus,
       if (+status === 0 || (excuteTime / 1000) > (finalTime + 1)) {
         clearInterval(timer); // 清除定时器
         timer = null;
-        let returnData = null;      
+        let returnData = null;
         if (status === 1) { // 结果没有返回
           returnData = {
             error_line: -1,
@@ -219,7 +200,7 @@ export const codeEvaluate = (dispatch, identifier, type, time_limit, hackStatus,
           payload: {
             type,
             data: returnData
-          } 
+          }
         });
         if (!type || type === 'debug') {
           dispatch({ // 改变 loading 值
@@ -285,15 +266,13 @@ export const codeEvaluate = (dispatch, identifier, type, time_limit, hackStatus,
 
 /**
  * @description 调试代码
- * @param {*} identifier 
+ * @param {*} identifier
  * @param {*} inputValue 输入值: 自定义 | 系统返回的
  * @param {*} type 测评类型 debug | submit
  */
-export const debuggerCode = (identifier,value, type) => {
+export const debuggerCode = (identifier, value, type) => {
   return (dispatch, getState) => {
-    // 调用之前 先保存 code 
     // TODO
-    // console.log(identifier, value);
     const { hack } = getState().ojForUserReducer;
     if (!type || type === 'debug') {
       dispatch({ // 加载中...
@@ -336,19 +315,26 @@ export const debuggerCode = (identifier,value, type) => {
 // 获取提交记录
 export const getUserCommitRecord = (identifier) => {
   return (dispatch, getState) => {
-    const { pages: { limit, page } } = getState().ojForUserReducer;
-    fetchUserCommitRecord(identifier, {
-      limit,
-      page
-    }).then(res => {
-      const {status, data} = res;
-      if (status === 200) {
-        dispatch({
-          type: types.COMMIT_RECORD,
-          payload: data
-        })
-      }
-    });
+    try {
+      const { pages: { limit, page } } = getState().ojForUserReducer;
+      fetchUserCommitRecord(identifier, {
+        limit,
+        page
+      }).then(res => {
+        if (res) {
+          const { status, data } = res;
+          if (status === 200) {
+            dispatch({
+              type: types.COMMIT_RECORD,
+              payload: data
+            })
+          }
+        }
+      })
+    } catch (error) {
+      console.log(error, '-------')
+    }
+    ;
   }
 }
 // 获取提交记录详情
@@ -378,14 +364,6 @@ export const saveUserInputCode = (code) => {
   }
 }
 
-// 监听是否更新代码块内容
-// export const isUpdateCodeCtx = (flag) => {
-//   return {
-//     type: types.IS_UPDATE_CODE,
-//     payload: flag
-//   };
-// }
-
 // 改变学员测评 tab 值
 export const changeUserCodeTab = (key) => {
   return {
@@ -396,15 +374,13 @@ export const changeUserCodeTab = (key) => {
 
 /**
  * @description 用户提交代码， 先调用保存代码接口，再调提交接口，成功后调用调试接口
- * @param {*} identifier 
+ * @param {*} identifier
  */
 export const submitUserCode = (identifier, inputValue, type) => {
   return (dispatch, getState) => {
-    const { userCode, isUpdateCode, hack} = getState().ojForUserReducer;
-
-    function userCodeSubmit () {
+    const { editor_code, hack } = getState().ojForUserReducer;
+    function userCodeSubmit() {
       fetchUserCodeSubmit(identifier).then(res => {
-        // console.log('用户提交代码成功======》》》》》', res);
         if (res.status === 200) {
           if (res.data.status === 401) {
             dispatch({
@@ -414,7 +390,6 @@ export const submitUserCode = (identifier, inputValue, type) => {
             return;
           };
           // 测评
-          console.log('hack=====', hack);
           codeEvaluate(dispatch, identifier, type, hack.time_limit, hack.status, hack.score, hack.passed);
         }
       }).catch(() => {
@@ -424,33 +399,29 @@ export const submitUserCode = (identifier, inputValue, type) => {
         });
       });
     }
-    if (isUpdateCode) {
-      fetchUpdateCode(identifier, {
-        code: userCode
-      }).then(res => {
-        // 是否更新了代码, 目的是当代码没有更新时不调用更新代码接口，目录没有实现 
-        // TODO 需要优化
-        if (res.data.status === 401) {
-          dispatch({
-            type: types.SUBMIT_LOADING_STATUS,
-            payload: false
-          });
-          return;
-        };
-        dispatch({
-          type: types.IS_UPDATE_CODE,
-          flag: false
-        });
-        userCodeSubmit();
-      }).catch(() => {
+    fetchUpdateCode(identifier, {
+      code: Base64.encode(editor_code)
+    }).then(res => {
+      // 是否更新了代码, 目的是当代码没有更新时不调用更新代码接口，目录没有实现
+      if (res.data.status === 401) {
         dispatch({
           type: types.SUBMIT_LOADING_STATUS,
           payload: false
-        })
+        });
+        return;
+      };
+      dispatch({
+        type: types.IS_UPDATE_CODE,
+        flag: false
       });
-    } else {
       userCodeSubmit();
-    }
+    }).catch(() => {
+      dispatch({
+        type: types.SUBMIT_LOADING_STATUS,
+        payload: false
+      })
+    });
+
   }
 }
 
@@ -459,8 +430,7 @@ export const restoreInitialCode = (identifier, msg) => {
   return (dispatch) => {
     fetchRestoreInitialCode(identifier).then(res => {
       if (res.data.status === 401) return;
-      // console.log('恢复初始代码====》》》》', res);
-      const {status, data} = res;
+      const { status, data } = res;
       if (status === 200) {
         dispatch({
           type: types.RESTORE_INITIAL_CODE,
@@ -493,7 +463,7 @@ export const saveOpacityType = (type) => {
     type: types.CLICK_OPERATE_TYPE,
     payload: type
   }
-} 
+}
 
 
 export const clearOjForUserReducer = () => {
@@ -514,7 +484,6 @@ export const changeRecordPagination = (page) => {
 export const addNotes = (identifier, params, cb) => {
   return (dispatch) => {
     fetchAddNotes(identifier, params).then(res => {
-      // console.log('添加笔记成功===>>', res);
       dispatch({
         type: types.LOADING_STATUS,
         payload: false
diff --git a/src/redux/actions/ojForm.js b/src/redux/actions/ojForm.js
index aa8a7f50..c038ac28 100644
--- a/src/redux/actions/ojForm.js
+++ b/src/redux/actions/ojForm.js
@@ -1,14 +1,14 @@
 /*
  * @Description: 开发者社区编辑模块
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-20 16:35:46
  * @LastEditors  : tangjiang
- * @LastEditTime : 2020-01-07 16:45:34
+ * @LastEditTime : 2020-02-11 16:29:32
  */
 import types from './actionTypes';
 import CONST from '../../constants';
-import { 
+import {
   fetchPostOjForm,
   fetchGetOjById,
   publishTask,
@@ -18,7 +18,7 @@ import {
 } from '../../services/ojService';
 import { Base64 } from 'js-base64';
 import { notification } from 'antd';
-import { toStore } from 'educoder'; 
+import { toStore } from 'educoder';
 // import { startProgramQuestion } from ''
 const { jcLabel } = CONST;
 // 表单字段映射
@@ -35,6 +35,14 @@ const maps = {
     label: jcLabel['description'],
     type: types.VALIDATE_OJ_DESCRIPTION
   },
+  test_set_score: {
+    label: jcLabel['test_set_score'],
+    type: types.VALIDATE_OJ_TEST_SET_SCORE
+  },
+  test_set_average: {
+    label: jcLabel['test_set_average'],
+    type: types.VALIDATE_OJ_TEST_SET_AVERAGE
+  },
   difficult: {
     label: jcLabel['difficult'],
     type: types.VALIDATE_OJ_DIFFICULT
@@ -108,7 +116,7 @@ const payloadInfo = (key, value, errMsg, validateInfo) => ({
 // 表单提交验证
 export const validateOjForm = (props, type, cb) => {
   return (dispatch, getState) => {
-    const {ojForm, testCases, identifier, code } = getState().ojFormReducer;
+    const { ojForm, testCases, identifier, code } = getState().ojFormReducer;
     // console.log('code', code);
     /** 表单验证开始  */
     // let keys = Object.keys(ojForm).filter(k => k !== '');
@@ -124,7 +132,7 @@ export const validateOjForm = (props, type, cb) => {
           hasSuccess = false;
           dispatch(
             {
-              type: maps[key].type, 
+              type: maps[key].type,
               payload: payloadInfo(key, value, errMsg, validateResult[key])
             }
           )
@@ -132,6 +140,7 @@ export const validateOjForm = (props, type, cb) => {
       }
     });
     // 验证测试用例中的数组是否都有对应的值
+    let tcbool = false;
     const tcValidResult = [];
     // 验证测试用例： 1.必须要有输出值 2. 输入值与输出值必须唯一
     testCases.forEach((obj, i) => {
@@ -141,8 +150,25 @@ export const validateOjForm = (props, type, cb) => {
         // 非空校验
         let validateResult = emptyValidate(key, value);
         const errMsg = validateResult[key].errMsg;
+        // console.log("-------");
+        // console.log(errMsg);
+        //  console.log(key);
+        // console.log(value);
+
         if (errMsg) {
-          hasSuccess = false;
+          if (key === "output") {
+            hasSuccess = false;
+            if (tcbool === false) {
+              tcbool = true
+              notification['error']({
+                message: '提示',
+                description: '测试用例必须填写输出!'
+              });
+
+            }
+          }
+
+
         } else {
           // 唯一性校验
           const bool = testCases.some((item, j) => {
@@ -154,7 +180,7 @@ export const validateOjForm = (props, type, cb) => {
           });
 
           if (bool) {
-            hasSuccess = false;
+            // hasSuccess = false;
             validateResult = {
               [key]: {
                 validateStatus: 'error',
@@ -168,14 +194,15 @@ export const validateOjForm = (props, type, cb) => {
       tcValidResult.push(tempObj);
     });
 
-    if (testCases.length === 0) {
-      hasSuccess = false;
-      notification['error']({
-        message: '提示',
-        description: '测试用例必须输入!'
-      });
-    }
-    
+
+    // if (testCases.length === 0) {
+    //   hasSuccess = false;
+    //   notification['error']({
+    //     message: '提示',
+    //     description: '测试用例必须输入!'
+    //   });
+    // }
+
     // if (!code) {
     //   hasSuccess = false;
     //   notification['error']({
@@ -201,26 +228,128 @@ export const validateOjForm = (props, type, cb) => {
         payload: false
       });
     }
+
+
+    let boolflad = false;
+    try {
+      if (ojForm.sub_discipline_id.length === 0) {
+        hasSuccess = false;
+        notification['error']({
+          message: '提示',
+          description: '课程必须选择!'
+        });
+        boolflad = true;
+      } else if (ojForm.timeLimit === null) {
+        hasSuccess = false;
+        notification['error']({
+          message: '提示',
+          description: '时间限制必须输入!'
+        });
+        boolflad = true;
+
+      } else if (ojForm.name.length === 0) {
+        hasSuccess = false;
+        notification['error']({
+          message: '提示',
+          description: '任务名称必须输入!'
+        });
+        boolflad = true;
+      } else if (ojForm.description.length === 0) {
+        hasSuccess = false;
+        notification['error']({
+          message: '提示',
+          description: '描述必须输入!'
+        });
+        boolflad = true;
+      }
+
+    } catch (e) {
+
+    }
+    try {
+      if (hasSuccess === false) {
+        if (boolflad === true) {
+          props.changeSubmitLoadingStatus(false);
+        }
+      }
+    } catch (e) {
+
+    }
+    try {
+      if (hasSuccess === false) {
+        if (boolflad === true) {
+          props.changePublishLoadingStatus(false);
+        }
+      }
+    } catch (e) {
+
+    }
+
+
     /** 表单验证结束 */
     /** 表单验证通过后，调用保存 or 更新 or 发布  */
     if (hasSuccess) {
+      let newhasSuccess = false;
       // console.log('表单保存的数据为: ', getState());
-      const {ojFormReducer} = getState();
-      const {code, score, ojForm, testCases = [], tag_discipline_id = []} = ojFormReducer;
-      const {category, description, difficult, language, name, openOrNot, timeLimit, sub_discipline_id} = ojForm;
+      const { ojFormReducer } = getState();
+      const { code, score, ojForm, testCases = [], tag_discipline_id = [], curPage = 1 } = ojFormReducer;
+      const { category, description, difficult, language, name, openOrNot, timeLimit, sub_discipline_id, test_set_score, test_set_average } = ojForm;
       let paramsObj = {};
       const hack = { // 编程题干
         name,
-        description: JSON.stringify(description),
+        description,
         difficult,
         category,
         'open_or_not': openOrNot,
         'time_limit': timeLimit,
+        test_set_score,
+        test_set_average,
         sub_discipline_id,
         // tag_discipline_id,
         score
       };
 
+      try {
+        if (test_set_score === true) {
+          let sum = 0;
+          testCases.map((item, key) => {
+            if (item.score > 100) {
+              notification.warning({
+                message: '提示',
+                description: "测试集的评分占比不能大于100"
+              });
+              props.changeSubmitLoadingStatus(false);
+              props.changePublishLoadingStatus(false);
+              newhasSuccess = true
+              return
+            }
+            sum = sum + item.score
+          })
+          if (newhasSuccess === false) {
+            if (sum > 100 || sum < 100) {
+              notification.warning({
+                message: '提示',
+                description: "测试集的评分占比之和必须等于100"
+              });
+              props.changeSubmitLoadingStatus(false);
+              props.changePublishLoadingStatus(false);
+              newhasSuccess = true
+              return
+            }
+          }
+
+
+        }
+
+      } catch (e) {
+
+      }
+
+      if (newhasSuccess) {
+        return;
+      }
+
+
       const hack_codes = { // 代码区域参数
         code: Base64.encode(code),
         language
@@ -299,8 +428,8 @@ export const validateOjForm = (props, type, cb) => {
             } else if (type === 'challenge') {
               cb && cb();
             } else {
-              const {identifier} = res.data;
-              
+              const { identifier } = res.data;
+
               // message.success(paramsObj['submitType'] === 'update' ? '更新成功' : '保存成功');
               notification.success({
                 message: '提示',
@@ -311,21 +440,27 @@ export const validateOjForm = (props, type, cb) => {
                 type: types.SAVE_OJ_FORM_ID,
                 payload: identifier
               });
-              
-              console.log(identifier , props.identifier);
+
+              // console.log(identifier , props.identifier);
               if (identifier || props.identifier) {
                 dispatch(getOJFormById(identifier || props.identifier));
               }
               // 保存成功后，调用编辑接口并改变路
               if (paramsObj['submitType'] === 'add' && identifier) {
-                
-                props.history.push(`/problems/${identifier}/edit`);
+                //更改查询参数
+                dispatch({
+                  type: types.SET_SEARCH_PARAMS,
+                  searchParams: `editoj=1&pages=${curPage}`,
+                  curPage: curPage
+                });
+                props.history.push(`/problems/${identifier}/edit?editoj=1&pages=${curPage}`);
               };
             }
             // 保存或更新后，调用start接口
             // linkToDev(dispatch, props);
           }
-        }}
+        }
+      }
       ).catch(err => {
         dispatch({
           type: types.SUBMIT_LOADING_STATUS,
@@ -336,66 +471,6 @@ export const validateOjForm = (props, type, cb) => {
           payload: false
         });
       });
-      // 调用保存或更新
-      // if (type === 'publish') {
-      //   // 提示发布信息
-      //   publishTask(identifier).then(res => {
-      //     dispatch({
-      //       type: types.PUBLISH_LOADING_STATUS,
-      //       payload: false
-      //     });
-
-      //     if (res.data.status === 0) {
-      //       // message.success('发布成功!');
-      //       notification.success({
-      //         message: '提示',
-      //         description: '发布成功!'
-      //       });
-      //       // linkToDev(dispatch, props);
-      //       // 改变发布状态值 0 => 1
-      //       dispatch({
-      //         type: types.CHANGE_PUBLISH_VALUE,
-      //         payload: 1
-      //       });
-      //     }
-      //   }).catch(() => {
-      //     dispatch({
-      //       type: types.PUBLISH_LOADING_STATUS,
-      //       payload: false
-      //     });
-      //   });
-      // } else {
-      //   // 调用更新
-      //   fetchPostOjForm(paramsObj).then(res => {
-      //     if (res.status === 200) { // 保存成功后，重新跳转至列表页
-      //       if (res.data.status === 0) {
-      //         // 改变按钮loading状态
-      //         dispatch({
-      //           type: types.SUBMIT_LOADING_STATUS,
-      //           payload: false
-      //         });
-      //         // message.success(paramsObj['submitType'] === 'update' ? '更新成功' : '保存成功');
-      //         notification.success({
-      //           message: '提示',
-      //           description: paramsObj['submitType'] === 'update' ? '更新成功' : '保存成功'
-      //         });
-      //         const {identifier} = res.data;
-      //         // 保存成功后的identifier
-      //         identifier && dispatch({
-      //           type: types.SAVE_OJ_FORM_ID,
-      //           payload: identifier
-      //         });
-      //         // 保存或更新后，调用start接口
-      //         // linkToDev(dispatch, props);
-      //       }
-      //     }}
-      //   ).catch(err => {
-      //     dispatch({
-      //       type: types.SUBMIT_LOADING_STATUS,
-      //       payload: false
-      //     });
-      //   });
-      // }
     }
   }
 };
@@ -408,19 +483,16 @@ export const handleClickCancelPublish = (props, identifier) => {
         payload: false
       });
       if (res.status = 200) {
-        const { data} = res;
+        const { data } = res;
         if (data.status === 0) {
-          // message.success('撤销发布成功!');
           notification.success({
             message: '提示',
             description: '撤销发布成功!'
           });
-          // 改变发布状态值
           dispatch({
             type: types.CHANGE_PUBLISH_VALUE,
             payload: 0
           });
-          // linkToDev(dispatch, props);
         }
       }
     }).catch(() => {
@@ -438,7 +510,7 @@ export const saveOjFormCode = (value) => {
     payload: value
   };
 }
-// 验证任务名称 
+// 验证任务名称
 export const validateOJName = (value) => {
   const validate = emptyValidate('name', value)['name'];
   const errMsg = validate.errMsg;
@@ -466,6 +538,32 @@ export const validateOjDescription = (value) => {
     payload: payloadInfo('description', value, errMsg, validate)
   }
 };
+
+export const validateOjTest_set_score = (value) => {
+  const validate = emptyValidate('test_set_score', value)['test_set_score'];
+  const errMsg = validate.errMsg;
+  return {
+    type: types.VALIDATE_OJ_TEST_SET_SCORE,
+    payload: payloadInfo('test_set_score', value, errMsg, validate)
+  }
+}
+
+export const validateOjtest_set_average = (value) => {
+  const validate = emptyValidate('test_set_average', value)['test_set_average'];
+  const errMsg = validate.errMsg;
+  return {
+    type: types.VALIDATE_OJ_TEST_SET_AVERAGE,
+    payload: payloadInfo('test_set_average', value, errMsg, validate)
+  }
+}
+
+export const validateOjequal = () => {
+  return {
+    type: types.CHANGE_EQUAL,
+    payload: true
+  }
+}
+
 // 验证难易度
 export const validateOjDifficult = (value) => {
   // createAction('difficult', value, types.VALIDATE_OJ_DIFFICULT);
@@ -575,11 +673,11 @@ export const testCaseInputChange = (value, index) => {
     if (!validate.errMsg) {
       // 唯一性校验
       let _errMsg = '';
-      const {testCases} = getState().ojFormReducer;
+      const { testCases } = getState().ojFormReducer;
       const bool = testCases.some((item, i) => {
         if (i !== index) {
           if (item['input'] === value) {
-            _errMsg=`与测试用例${i + 1}的输入值重复了，请重新填写`;
+            _errMsg = `与测试用例${i + 1}的输入值重复了，请重新填写`;
           }
           return item['input'] === value;
         } else {
@@ -587,7 +685,7 @@ export const testCaseInputChange = (value, index) => {
         }
       });
       if (bool) {
-        validate =  {
+        validate = {
           validateStatus: 'error',
           errMsg: _errMsg
         };
@@ -604,6 +702,21 @@ export const testCaseInputChange = (value, index) => {
   }
 }
 
+export const testCaseOutputChangeScore = (value, index) => {
+  let sum = parseInt(value);
+  if (isNaN(sum)) {
+    sum = 0
+  }
+
+  return {
+    type: types.TEST_CASE_SCORE_CHANGE,
+    payload: {
+      score: "",
+      sum,
+      index
+    }
+  }
+}
 // 测试用例输出值改变时
 export const testCaseOutputChange = (value, index) => {
   const validate = emptyValidate('output', value)['output'];
@@ -677,7 +790,7 @@ export const updateOpenTestCaseIndex = (value) => {
 // 获取课程题库
 export const getQuestion = (params) => {
   return (dispatch, getState) => {
-    const {ojForm: {sub_discipline_id}} = getState().ojFormReducer;
+    const { ojForm: { sub_discipline_id } } = getState().ojFormReducer;
     fetchQuestion(params).then(res => {
       const { data = {} } = res;
       const { disciplines = [] } = data;
@@ -691,7 +804,7 @@ export const getQuestion = (params) => {
         disciplines.forEach(c => {
           if (sub_discipline_id && c.sub_disciplines) {
             c.sub_disciplines.forEach(sub => {
-              if (+sub.id === sub_discipline_id) {
+              if (+sub.id === +sub_discipline_id) {
                 temp_knowledges = sub.tag_disciplines || [];
               }
             });
@@ -730,9 +843,9 @@ export const saveKnowledge = (values) => {
 }
 
 /**
- * 新增时跳转到OJ时带的默认参数: 
- * @param {}} params 
- * { 
+ * 新增时跳转到OJ时带的默认参数:
+ * @param {}} params
+ * {
  *  difficult: '',  // 难易度
  *  sub_discipline_id: '' // 课程方向
  *  tag_discipline_id： [] 知识点
@@ -762,4 +875,12 @@ export const tagDisciplines = (params) => {
       }
     });
   }
-} 
+}
+
+// 保存地址栏参数
+export const saveSearchParams = (params) => {
+  return {
+    type: types.SET_SEARCH_PARAMS,
+    payload: params
+  }
+}
diff --git a/src/redux/actions/static.js b/src/redux/actions/static.js
index 3159d35c..2c57479f 100644
--- a/src/redux/actions/static.js
+++ b/src/redux/actions/static.js
@@ -12,14 +12,15 @@ import { fetchStaticList } from "../../services/staticService";
 export const staticList = (id) => {
   return (dispatch, getState) => {
     const { params, total_count, other_info } = getState().staticReducer;
-
-    if (total_count !== 0 && total_count === other_info.length) return;
+        console.log('统计数据=====>>>>>', params);
+    //  if (total_count !== 0 && total_count === other_info.length) return;
     fetchStaticList(id, params).then(res => {
       // console.log('统计数据=====>>>>>', res);
       const {data} = res;
       if (data.status === 0) {
         dispatch({
           type: types.GET_STATIC_INFO,
+          other_info:data.data.other_info,
           payload: data.data
         });
       }
diff --git a/src/redux/reducers/ojForUserReducer.js b/src/redux/reducers/ojForUserReducer.js
index 8a751f86..60c3dc7a 100644
--- a/src/redux/reducers/ojForUserReducer.js
+++ b/src/redux/reducers/ojForUserReducer.js
@@ -17,7 +17,6 @@ const initialState = {
   commitTestRecordDetail: {}, // 调试代码执行结果
   commitRecordDetail: {}, // 提交成功后记录提交的详情
   commitRecord: [], // 提交记录
-  userCode: '', // 保存当前用户输入的代码
   isUpdateCode: false, // 是否更新了代码内容
   userCodeTab: 'task', // 学员测评tab位置: task | record | comment 
   userTestInput: '', // 用户自定义输入值 
@@ -45,7 +44,7 @@ const ojForUserReducer = (state = initialState, action) => {
       }
     case types.USER_PROGRAM_DETAIL:
       const { hack, test_case } = action.payload;
-      const { code }= hack;
+      const { code } = hack;
       let tempCode = Base64.decode(code)
       let tempDesc;
       try {
@@ -53,13 +52,13 @@ const ojForUserReducer = (state = initialState, action) => {
       } catch (error) {
         tempDesc = hack.description;
       }
-      Object.assign(hack, {code: tempCode, description: tempDesc});
+      Object.assign(hack, { code: tempCode, description: tempDesc });
       return {
         ...state,
         hack: Object.assign({}, hack),
         test_case: Object.assign({}, test_case),
         comment_identifier: hack.identifier,
-        userCode: tempCode
+        editor_code: tempCode
       }
     case types.COMMIT_RECORD_DETAIL:
       let result = action.payload.data;
@@ -73,21 +72,21 @@ const ojForUserReducer = (state = initialState, action) => {
         result['error_msg'] = Base64.decode(result['error_msg']);
       } catch (e) {
         console.log('错误信息:', e);
-      } 
+      }
       if (action.payload.type === 'submit') {
-        return { 
+        return {
           ...state,
           commitRecordDetail: Object.assign({}, result)
         }
       } else {
-        return { 
+        return {
           ...state,
           commitTestRecordDetail: Object.assign({}, result)
         }
       }
-      
+
     case types.COMMIT_RECORD:
-      const {records, records_count} = action.payload;
+      const { records, records_count } = action.payload;
       return {
         ...state,
         commitRecord: records,
@@ -98,7 +97,7 @@ const ojForUserReducer = (state = initialState, action) => {
       // let curCode = Base64.encode(action.payload);
       return {
         ...state,
-        userCode: action.payload,
+        editor_code: action.payload,
         isUpdateCode: true,
       }
     case types.IS_UPDATE_CODE:
@@ -115,7 +114,7 @@ const ojForUserReducer = (state = initialState, action) => {
       tempDetail = action.payload.data;
       if (tempDetail['error_msg']) {
         tempDetail['error_msg'] = Base64.decode(tempDetail['error_msg']);
-      } 
+      }
       if (tempDetail['expected_output']) {
         tempDetail['expected_output'] = Base64.decode(tempDetail['expected_output']);
       }
@@ -127,7 +126,8 @@ const ojForUserReducer = (state = initialState, action) => {
       }
       return {
         ...state,
-        recordDetail: tempDetail
+        recordDetail: tempDetail,
+        editor_code: tempDetail['code']
       }
     case types.RESTORE_INITIAL_CODE:
       const curHack = state.hack;
@@ -137,6 +137,7 @@ const ojForUserReducer = (state = initialState, action) => {
       } else {
         curHack['code'] = '';
       }
+      curHack['modify_code'] = false
       return {
         ...state,
         hack: Object.assign({}, state.hack, curHack),
@@ -150,7 +151,8 @@ const ojForUserReducer = (state = initialState, action) => {
     case types.SAVE_EDITOR_CODE:
       return {
         ...state,
-        editor_code: action.payload
+        editor_code: action.payload,
+        isUpdateCode: true
       }
     case types.SAVE_USE_TEST_CASE_VALUE:
       return {
@@ -167,9 +169,9 @@ const ojForUserReducer = (state = initialState, action) => {
         ...state,
         hadCodeUpdate: action.payload
       };
-    case types.CLICK_OPERATE_TYPE: 
+    case types.CLICK_OPERATE_TYPE:
       return {
-        ...state, 
+        ...state,
         operateType: action.payload
       }
     case types.CLEAR_OJ_FOR_USER_REDUCER:
@@ -204,18 +206,18 @@ const ojForUserReducer = (state = initialState, action) => {
       let _user_praise = state.hack.user_praise;
       _count = +action.payload > 0 ? _count + 1 : _count - 1;
       _user_praise = +action.payload > 0 ? true : false;
-      const _hack = Object.assign({}, state.hack, {praises_count: _count, user_praise: _user_praise});
+      const _hack = Object.assign({}, state.hack, { praises_count: _count, user_praise: _user_praise });
       return {
         ...state,
         hack: _hack
       }
-    case types.CHANGE_RECORD_PAGINATION_PAGE: 
+    case types.CHANGE_RECORD_PAGINATION_PAGE:
       return {
         ...state,
-        pages: Object.assign({}, state.pages, { page: action.payload})
+        pages: Object.assign({}, state.pages, { page: action.payload })
       }
     case types.UPDATE_OJ_FOR_USER_COMMENT_COUNT:
-      const {comments_count} = state.hack;
+      const { comments_count } = state.hack;
       const _comments_count = action.payload === 'add' ? comments_count + 1 : comments_count - 1;
       return {
         ...state,
@@ -223,18 +225,18 @@ const ojForUserReducer = (state = initialState, action) => {
       }
     // 修改笔记内容
     case types.UPDATE_NOTE_CONTENT:
-      const _hack1 = Object.assign({}, state.hack, {notes: action.payload });
+      const _hack1 = Object.assign({}, state.hack, { notes: action.payload });
       return {
         ...state,
         hack: _hack1
       }
     // 修改 hack passed值
     case types.UPDATE_HACK_PASSED:
-        const _hack2 = Object.assign({}, state.hack, {passed: action.payload });
-        return {
-          ...state,
-          hack: _hack2
-        }
+      const _hack2 = Object.assign({}, state.hack, { passed: action.payload });
+      return {
+        ...state,
+        hack: _hack2
+      }
     default:
       return state;
   }
diff --git a/src/redux/reducers/ojFormReducer.js b/src/redux/reducers/ojFormReducer.js
index 0da4d415..54a221e9 100644
--- a/src/redux/reducers/ojFormReducer.js
+++ b/src/redux/reducers/ojFormReducer.js
@@ -1,10 +1,10 @@
 /*
- * @Description: 
+ * @Description:
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-20 16:40:32
  * @LastEditors  : tangjiang
- * @LastEditTime : 2020-01-03 17:38:50
+ * @LastEditTime : 2020-02-10 17:59:55
  */
 import { Base64 } from 'js-base64';
 import types from '../actions/actionTypes';
@@ -12,10 +12,12 @@ import types from '../actions/actionTypes';
 const init = {
   ojForm: {
     name: '', // 任务名称
-    language: '',
+    language: 'C',
     description: '',
-    difficult: '',
-    sub_discipline_id: '', // 方向 
+    difficult: '1',
+    sub_discipline_id: '', // 方向
+    test_set_score:false,
+    test_set_average: true,
     // category: '',
     // openOrNot: 1,
     timeLimit: 3
@@ -67,7 +69,7 @@ const init = {
   position: 1, // TODO 每次加载信息时同步指定positio值
   score: 200, // 分值： 选择难易度后自动计算分值  200 | 500 | 1000
   code: '', // 提交的代码
-  showCode: '', // 编辑器显示的代码 
+  showCode: '', // 编辑器显示的代码
   identifier: '', // OJ表单id
   loading: false, // 僵尸loading标志
   testCodeStatus: 'default', // 调试代码状态  default(默认值) | loading(加载中) | loaded(加载完成) | userCase(用户自定义测试用例) | finish(测试完成)
@@ -75,6 +77,8 @@ const init = {
   isPublish: 0, // 是否是发布状态: 0 未发布 1 已发布
   courseQuestions: [], // 课程题库
   knowledges: [], // 知识点下拉值
+  searchParams: '', // 地址栏参数
+  curPage: 1, // 当前页数
 }
 
 const tcValidateObj = {
@@ -112,7 +116,7 @@ const ojFormReducer = (state = initialState, action) => {
     };
   }
   switch (action.type) {
-    case types.VALIDATE_OJ_FORM:      
+    case types.VALIDATE_OJ_FORM:
       // 验证成功后，调用后台接口
       return returnState(state, ojForm, ojFormValidate);
     case types.SAVE_OJ_FORM_CODE:
@@ -125,6 +129,12 @@ const ojFormReducer = (state = initialState, action) => {
       return returnState(state, ojForm, ojFormValidate);
     case types.VALIDATE_OJ_DESCRIPTION:
       return returnState(state, ojForm, ojFormValidate);
+    case types.VALIDATE_OJ_TEST_SET_SCORE:
+      // 测试集得分规则
+      return returnState(state, ojForm, ojFormValidate);
+    case types.VALIDATE_OJ_TEST_SET_AVERAGE:
+      // 测试集得分规则
+      return returnState(state, ojForm, ojFormValidate);
     case types.VALIDATE_OJ_LANGUAGE:
       return returnState(state, ojForm, ojFormValidate);
     case types.VALIDATE_OJ_DIFFICULT:
@@ -146,12 +156,52 @@ const ojFormReducer = (state = initialState, action) => {
         ...state,
         tag_discipline_id: action.payload
       }
+    case types.CHANGE_EQUAL:
+      let CHANGE_EQUAL = state.testCases;
+      let sum=parseInt(100/CHANGE_EQUAL.length);
+      CHANGE_EQUAL.map((tc, i) => {
+        if(i+1!=CHANGE_EQUAL.length){
+          tc.score=sum
+        }else{
+          tc.score=sum+100%CHANGE_EQUAL.length
+        }
+      })
+      return {
+        ...state,
+        testCases: [...CHANGE_EQUAL]
+      }
     case types.ADD_TEST_CASE:
       const { testCase, tcValidate } = action.payload;
+      const newojForm = state.ojForm;
       const tcArrs = state.testCases.concat([testCase]);
       const tcValidateArrs = state.testCasesValidate.concat([tcValidate]);
       state.position++; // 位置递增
       const len = tcArrs.length - 1;
+
+      try {
+        if(newojForm.test_set_score===true){
+           if(newojForm.test_set_average===true){
+             let sum=parseInt(100/tcArrs.length);
+             tcArrs.map((tc, i) => {
+               if(i+1!=tcArrs.length){
+                 tc.score=sum
+               }else{
+                 tc.score=sum+100%tcArrs.length
+               }
+             })
+          }else{
+             tcArrs.map((tc, i) => {
+                if(tc.score===null){
+                  tc.score=0
+                }
+             })
+           }
+
+        }
+      }catch (e) {
+
+      }
+
       return {
         ...state,
         testCases: [...tcArrs],
@@ -189,7 +239,7 @@ const ojFormReducer = (state = initialState, action) => {
        * 6. 更改测试用例状态
        * 7. 添加测试用例验证
        */
-      const { code = '', description, language, name, hack_sets = [], time_limit, difficult, category, status, sub_discipline_id, tag_discipline_id } = action.payload;
+      const { code = '', description, language, name, hack_sets = [], time_limit, difficult, category, status, sub_discipline_id, tag_discipline_id,test_set_score,test_set_average } = action.payload;
       const { courseQuestions } = state;
       let desc = null;
       try {
@@ -205,6 +255,8 @@ const ojFormReducer = (state = initialState, action) => {
         category,
         openOrNot: 1,
         timeLimit: time_limit,
+        test_set_score: test_set_score,
+        test_set_average: test_set_average,
         sub_discipline_id
       };
       // state.code = code; // 保存代码块值
@@ -261,7 +313,7 @@ const ojFormReducer = (state = initialState, action) => {
       return {
         ...state
       }
-    // case types.TEST_CODE_STATUS: 
+    // case types.TEST_CODE_STATUS:
     //   return {
     //     ...state,
     //     testCodeStatus: action.payload // 当前状态值
@@ -276,7 +328,7 @@ const ojFormReducer = (state = initialState, action) => {
       // 更新验证消息
       const curIOjTestValidate = state.testCasesValidate.map((tc, i) => {
         if (i === action.payload.index) {
-          return Object.assign({}, tc, {input});
+          return Object.assign({}, tc, { input });
         }
         return tc;
       });
@@ -291,21 +343,33 @@ const ojFormReducer = (state = initialState, action) => {
         testCasesValidate: [...curIOjTestValidate],
         testCases: [...curITestValues]
       }
+    case  types.TEST_CASE_SCORE_CHANGE:
+
+      let newSCORE = state.testCases.map((tc, i) => {
+        if (i === action.payload.index) {
+          return Object.assign({}, tc, { score: action.payload.sum })
+        }
+        return tc;
+      });
+      return {
+        ...state,
+        testCases: [...newSCORE]
+      }
     case types.TEST_CASE_OUTPUT_CHANGE:
-        const { output } = action.payload;
-        // 更新验证消息
-        const curOOjTestValidate = state.testCasesValidate.map((tc, i) => {
-          if (i === action.payload.index) {
-            return Object.assign({}, tc, {output});
-          }
-          return tc;
-        });
-        let curOTestValues = state.testCases.map((tc, i) => {
-          if (i === action.payload.index) {
-            return Object.assign({}, tc, { output: action.payload.value })
-          }
-          return tc;
-        });
+      const { output } = action.payload;
+      // 更新验证消息
+      const curOOjTestValidate = state.testCasesValidate.map((tc, i) => {
+        if (i === action.payload.index) {
+          return Object.assign({}, tc, { output });
+        }
+        return tc;
+      });
+      let curOTestValues = state.testCases.map((tc, i) => {
+        if (i === action.payload.index) {
+          return Object.assign({}, tc, { output: action.payload.value })
+        }
+        return tc;
+      });
       return {
         ...state,
         testCasesValidate: [...curOOjTestValidate],
@@ -350,11 +414,18 @@ const ojFormReducer = (state = initialState, action) => {
     }
     case types.SET_OJ_INITIAL_VALUE:
       const _p = action.payload;
+
       return {
         ...state,
-        ojForm: Object.assign({}, state.ojForm, {difficult: _p.difficult, sub_discipline_id: _p.sub_discipline_id}),
+        ojForm: Object.assign({}, state.ojForm, { difficult: _p.difficult, sub_discipline_id: _p.sub_discipline_id }),
         tag_discipline_id: _p.tag_discipline_id || []
       }
+    case types.SET_SEARCH_PARAMS:
+      return {
+        ...state,
+        searchParams: action.payload.searchParams,
+        curPage: action.payload.curPage
+      }
     default:
       return state;
   }
diff --git a/src/redux/reducers/staticReducer.js b/src/redux/reducers/staticReducer.js
index 7d2202d0..82f86af2 100644
--- a/src/redux/reducers/staticReducer.js
+++ b/src/redux/reducers/staticReducer.js
@@ -19,8 +19,8 @@ const initalState = {
   total_count: 0,
   total: {},
   params: {
-    // sort_by: '',
-    // sort_direction: 'desc', // desc || asc
+    sort_by: '',
+    sort_direction: '', 
     limit: 20, // 一页多少条
     page: 1, // 第几页
     type: 'subject_info' // 类型: 实训 shixun_info,
@@ -43,10 +43,11 @@ const staticReducer = (state = initalState, action) => {
       return {
         ...state,
         subject_info,
-        other_info: state.other_info.concat(other_info),
+        other_info,
+        // other_info: state.other_info.concat(other_info),
         total,
         total_count,
-        params: Object.assign({}, state.params, { page: state.params.page + 1 })
+        // params: Object.assign({}, state.params, { page: state.params.page + 1 })
       }
     case types.CHANGE_STATIC_PARAMS: {
       return {
diff --git a/src/search/SearchPage.js b/src/search/SearchPage.js
index e2582955..fc50bcbf 100644
--- a/src/search/SearchPage.js
+++ b/src/search/SearchPage.js
@@ -158,7 +158,7 @@ class SearchPage extends Component{
 					<div className="tabtitles2">
 					<Menu  mode="horizontal" className="tabtitless"  selectedKeys={tab} onClick={this.changeTab}>
 						<Menu.Item className={"tabtitle1"} key="1">实践课程</Menu.Item>
-						<Menu.Item className={"tabtitle2"} key="2">翻转课堂</Menu.Item>
+						<Menu.Item className={"tabtitle2"} key="2">教学课堂</Menu.Item>
 						<Menu.Item className={"tabtitle2"} key="0">实训项目</Menu.Item>
 						<Menu.Item className={"tabtitle2"}  key="3">交流问答</Menu.Item>
 					</Menu>
diff --git a/src/services/ojService.js b/src/services/ojService.js
index d0d0ae0a..53d55f3f 100644
--- a/src/services/ojService.js
+++ b/src/services/ojService.js
@@ -1,7 +1,7 @@
 /*
  * @Description: 开发者社区接口
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-20 10:55:38
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-01-07 15:23:19
@@ -34,7 +34,7 @@ export async function fetchPostOjForm (paramsObj) {
   // if (identifier) {
   //   return axios.post(url, params);
   // } else {
-  //   return 
+  //   return
   // }
   return identifier ? axios.put(url, params) : axios.post(url, params);
 }
@@ -136,7 +136,7 @@ export async function fetchUploadImage (file) {
 export async function fetchUploadImageUrl (id) {
   const url = `/attachments/${id}`;
   return axios.get(url);
-} 
+}
 
 // 添加笔记
 export async function fetchAddNotes (identifier, params) {
@@ -154,4 +154,4 @@ export async function fetchQuestion (params) {
 export async function fetchTagDisciplines (params) {
   const url = `/tag_disciplines.json`;
   return axios.post(url, params);
-}
\ No newline at end of file
+}
diff --git a/src/services/video-service.js b/src/services/video-service.js
new file mode 100644
index 00000000..33a1a8b7
--- /dev/null
+++ b/src/services/video-service.js
@@ -0,0 +1,11 @@
+import axios from 'axios'
+
+export async function logWatchHistory(params) {
+  try {
+    const response = await axios.post('/watch_video_histories.json', params)
+    return response.data.log_id
+  } catch (error) {
+    console.log(error)
+  }
+  return 0
+}
\ No newline at end of file
diff --git a/src/test/md.jsx b/src/test/md.jsx
new file mode 100644
index 00000000..431c39e3
--- /dev/null
+++ b/src/test/md.jsx
@@ -0,0 +1,11 @@
+import React from 'react'
+import TPMMDEditor from '../modules/tpm/challengesnew/TPMMDEditor'
+
+export default () => {
+  function onMdContentChangeHandler(value) {
+    console.log(value, '--------------')
+  }
+  return (
+    <TPMMDEditor mdID='demo-id' noStorage={false} showNullButton={true} onChange={onMdContentChangeHandler} />
+  )
+}
\ No newline at end of file
diff --git a/src/test/monaco.jsx b/src/test/monaco.jsx
new file mode 100644
index 00000000..44384e40
--- /dev/null
+++ b/src/test/monaco.jsx
@@ -0,0 +1,49 @@
+import React, { useState, Fragment } from 'react'
+import MonacoEditor from '../components/monaco-editor'
+
+const code1 = `
+  #coding=utf-8
+# 创建并读入range函数的相应参数
+lower = int(input())
+upper = int(input())
+step = int(input()
+
+# 请在此添加代码，实现编程要求
+###### Begin ######
+print('-------')
+
+####### End #######`
+
+const code2 = `
+import java.util.Scanner;
+
+public class Educode {
+    public static void main(String[] args) {
+        Scanner sc = new Scanner(System.in);
+        int nDisks = sc.nextInt();
+        String from = sc.next();
+        String inter = sc.next();
+        String to = sc.next();
+        doTowers(nDisks, from, inter, to);
+    }
+    
+    // 实现汉诺塔算
+    public static void doTowers(int topN, String from, String inter, String to) {
+        
+        
+    }
+}
+`
+
+export default () => {
+  const [code, setCode] = useState(code2)
+  const [language, setLanguage] = useState(['java'])
+  return (
+    <Fragment >
+      <MonacoEditor width='100%' height='600' value={code} language={language} />
+      <a onClick={() => { setCode(code1) }}>code1</a>
+      <a onClick={() => { setLanguage(['ruby']) }}>lang ruby</a>
+    </Fragment>
+
+  )
+}
\ No newline at end of file